Slackware 13.37slackware-13.37

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

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

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

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

Have fun!

2027 files changed, 202683 insertions, 230524 deletions

diff --git a/ANNOUNCE.13_1 b/ANNOUNCE.13_1
deleted file mode 100644
index b6468658..00000000
--- a/ANNOUNCE.13_1
+++ /dev/null
@@ -1,212 +0,0 @@
-
-    Yes, it's that time again!  After many months of development and 
-careful testing, we are proud to announce the release of Slackware 
-version 13.1!
-
-    We are sure you'll enjoy the many improvements.  We've done our best 
-to bring the latest technology to Slackware while still maintaining the 
-stability and security that you have come to expect.  Slackware is well 
-known for its simplicity and the fact that we try to bring software to 
-you in the condition that the authors intended.
-
-    Slackware 13.1 brings many updates and enhancements, among which 
-you'll find two of the most advanced desktop environments available 
-today: Xfce 4.6.1, a fast and lightweight but visually appealing and 
-easy to use desktop environment, and KDE 4.4.3, a recent stable release 
-of the new 4.4.x series of the award-winning KDE desktop environment.  
-We continue to make use of HAL (Hardware Abstraction Layer) and udev, 
-which allow the system administrator to grant use of various hardware 
-devices according to users' group membership so that they will be able 
-to use items such as USB flash sticks, USB cameras that appear like USB 
-storage, portable hard drives, CD and DVD media, MP3 players, and more, 
-all without requiring sudo, the mount or umount command.  Just plug and 
-play.  Properly set up, Slackware's desktop should be suitable for any 
-level of Linux experience.  New to the desktop framework are ConsoleKit 
-and PolicyKit.  ConsoleKit handles "seats", things like dealing with 
-devices when switching from one user to another.  PolicyKit is a system 
-for fine-grained access control, allowing a non-root user to run certain 
-tasks with elevated privilege, but more securely than if the entire task 
-were simply run as root.
-
-    Slackware uses the 2.6.33.4 kernel bringing you advanced performance 
-features such as journaling filesystems, SCSI and ATA RAID volume 
-support, SATA support, Software RAID, LVM (the Logical Volume Manager), 
-and encrypted filesystems.  Kernel support for X DRI (the Direct 
-Rendering Interface) brings high-speed hardware accelerated 3D graphics 
-to Linux.
-
-    There are two kinds of kernels in Slackware.  First there are the 
-huge kernels, which contain support for just about every driver in the 
-Linux kernel. These are primarily intended to be used for installation, 
-but there's no real reason that you couldn't continue to run them after 
-you have installed.  The other type of kernel is the generic kernel, in 
-which nearly every driver is built as a module.  To use a generic kernel 
-you'll need to build an initrd to load your filesystem module and 
-possibly your drive controller or other drivers needed at boot time, 
-configure LILO to load the initrd at boot, and reinstall LILO.  See the 
-docs in /boot after installing for more information.  Slackware's Linux 
-kernels come in both SMP and non-SMP types now.  The SMP kernel supports 
-multiple processors, multi-core CPUs, HyperThreading, and about every 
-other optimization available.  In our own testing this kernel has proven 
-to be fast, stable, and reliable.  We recommend using the SMP kernel 
-even on single processor machines if it will run on them.
-
-
-Here are some of the advanced features of Slackware 13.1:
-
-- Runs the 2.6.33.4 version of the Linux kernel from ftp.kernel.org.
-  Also included is a kernel patched with Speakup to support speech
-  synthesizers providing access to Linux for the visually impaired
-  community.  The 2.6.x kernel series has matured into a stable
-  kernel, and provides reliable performance for your desktop or
-  your production server.
-
-- System binaries are linked with the GNU C Library, version 2.11.1.
-  This version of glibc also has excellent compatibility with
-  existing binaries.
-
-- X11 based on the X.Org Foundation's modular X Window System.
-  There's been much activity in the X development world, and the
-  improvements in terms of performance and hardware support are
-  too numerous to mention them all here.
-
-- Installs gcc-4.4.4 as the default C, C++, Objective-C, 
-  Fortran-77/95, and Ada 95 compiler.
-
-- Support for fully encrypted network connections with OpenSSL,
-  OpenSSH, OpenVPN, and GnuPG.
-
-- Apache (httpd) 2.2.15 web server with Dynamic Shared Object 
-  support, SSL, and PHP 5.2.13.
-
-- PCMCIA, CardBus, USB, IEE1394 (FireWire) and ACPI support.  This
-  makes Slackware a great operating system for your laptop.
-
-- The udev dynamic device management system for Linux 2.6.x.
-  This locates and configures most hardware automatically as it
-  is added (or removed) from the system, and creates the access
-  nodes in /dev.  It also loads the kernel modules required by
-  sound cards and other hardware at boot time.
-
-- New development tools, including Perl 5.10.1, Python 2.6.4,
-  Ruby 1.9.1-p378, Subversion 1.6.11, git-1.7.1, mercurial-1.5.2,
-  graphical tools like Qt designer and KDevelop, and much more.
-
-- Updated versions of the Slackware package management tools make it
-  easy to add, remove, upgrade, and make your own Slackware packages.
-  Package tracking makes it easy to upgrade from Slackware 13.0 to 
-  Slackware 13.1 (see CHANGES_AND_HINTS.TXT).  The slackpkg tool can
-  also help update from an older version of Slackware to a newer one,
-  and keep your Slackware system up to date.  In addition, the
-  slacktrack utility (in extra/) will help you build and maintain
-  your own packages.
-
-- Web browsers galore!  Includes KDE's Konqueror 4.4.3, 
-  SeaMonkey 2.0.4 (this is the replacement for the Mozilla
-  Suite), and the immensely popular Firefox 3.6.3, as well as
-  the Thunderbird 3.0.4 email and news client with advanced
-  junk mail filtering.
-
-- The KDE Software Compilation 4.4.3, a complete desktop environment.
-  This includes the KOffice productivity suite, networking tools, GUI
-  development with KDevelop, multimedia tools (including the amazing
-  Amarok music player and K3B disc burning software), the Konqueror web
-  browser and file manager, dozens of games and utilities,
-  international language support, and more.
-
-- A collection of GTK+ based applications including pidgin-2.7.0,
-   gimp-2.6.8, gkrellm-2.3.4, gxine-0.5.903, xchat-2.8.6, xsane-0.996,
-   and pan-0.133.
-
-- A repository of extra software packages compiled and ready to run.
-  This includes the Java(TM) 2 Software Development Kit Standard
-  Edition, an MPlayer browser plugin, and more (see the /extra directory).
-  
-- Many more improved and upgraded packages than we can list here.  For
-  a complete list of core packages in Slackware 13.1, see this file:
-
-    ftp://ftp.slackware.com/pub/slackware/slackware-13.1/PACKAGES.TXT
-
-     
-Downloading Slackware 13.1:
----------------------------
-
-    The full version of Slackware Linux 13.1 is available for download 
-from the central Slackware FTP sites hosted by our friends at 
-www.cwo.com and osuosl.org:
-
-   ftp://slackware.osuosl.org/pub/slackware/slackware-13.1/
-   ftp://ftp.slackware.com/pub/slackware/slackware-13.1/
-
-If the sites are busy, see the list of official mirror sites here:
-
-   http://slackware.com/getslack/
-
-    We will be setting up BitTorrent downloads for the official ISO 
-images.  Stay tuned to http://slackware.com for the latest updates.
-
-    Instructions for burning the Slackware tree onto install discs may 
-be found in the isolinux directory.
-
-
-Purchasing Slackware on CD-ROM or DVD:
---------------------------------------
-
-    Or, please consider purchasing the Slackware Linux 13.1 six CD-ROM 
-set or deluxe dual-sided DVD release directly from Slackware Linux, and 
-you'll be helping to support the continued development of Slackware 
-Linux!
-
-    The DVD release has the 32-bit x86 Slackware 13.1 release on one 
-side, and the 64-bit x86_64 Slackware 13.1 release on the other.  Both 
-sides are bootable for easy installation, and includes everything from 
-both releases of Slackware 13.1, including the complete source code 
-trees.
-
-    The 6 CD-ROM release of Slackware 13.1 is the 32-bit x86 edition.  
-It includes a bootable first CD-ROM for easy installation.  The 6 
-CD-ROMs are labeled for easy reference.
-
-
-    The Slackware 13.1 x86 6 CD-ROM set is $49.95 plus shipping, or 
-choose the Slackware 13.1 x86/x86_64 dual-sided DVD (also $49.95 plus 
-shipping).
-
-
-    Slackware Linux is also available by subscription.  When we release 
-a new version of Slackware (which is normally once or twice a year) we 
-ship it to you and bill your credit card for a reduced subscription 
-price ($32.99 for the CD-ROM set, or $39.95 for the DVD) plus shipping.
-
-    For shipping options, see the Slackware store website.  Before 
-ordering express shipping, you may wish to check that we have the 
-product in stock. We make releases to the net at the same time as disc 
-production begins, so there is a lag between the online release and the 
-shipping of media. But, even if you download now you can still buy the 
-official media later. You'll feel good, be helping the project, and have 
-a great decorative item perfect for any computer room shelf.  :-)
-
-
-Ordering Information:
----------------------
-
-    You can order online at the Slackware Linux store:
-
-        http://store.slackware.com
-
-    Other Slackware items like t-shirts, caps, pins, and stickers can 
-also be found here.  These will help you find and identify yourself to 
-your fellow Slackware users.  :-)
-
-    Order inquiries (including questions about becoming a Slackware 
-reseller) may be directed to this address:  info@slackware.com
-   
-
-Have fun! :^)  I hope you find Slackware to be useful, and thanks
-very much for your support of this project over the years.
-
----
-Patrick J. Volkerding    <volkerdi@slackware.com>
-
-Visit us on the web at:  http://slackware.com
-
diff --git a/ANNOUNCE.13_37 b/ANNOUNCE.13_37
new file mode 100644
index 00000000..c066834d
--- /dev/null
+++ b/ANNOUNCE.13_37
@@ -0,0 +1,215 @@
+
+    Yes, it's that time again!  After many months of development and 
+careful testing, we are proud to announce the release of Slackware 
+version 13.37!
+
+    We are sure you'll enjoy the many improvements.  We've done our best 
+to bring the latest technology to Slackware while still maintaining the 
+stability and security that you have come to expect.  Slackware is well 
+known for its simplicity and the fact that we try to bring software to 
+you in the condition that the authors intended.
+
+    Slackware 13.37 brings many updates and enhancements, among which 
+you'll find two of the most advanced desktop environments available 
+today: Xfce 4.6.2, a fast and lightweight but visually appealing and 
+easy to use desktop environment, and KDE 4.5.5, a recent stable release 
+of the 4.5.x series of the award-winning KDE desktop environment.  
+We continue to make use of HAL (Hardware Abstraction Layer) and udev, 
+which allow the system administrator to grant use of various hardware 
+devices according to users' group membership so that they will be able 
+to use items such as USB flash sticks, USB cameras that appear like USB 
+storage, portable hard drives, CD and DVD media, MP3 players, and more, 
+all without requiring sudo, the mount or umount command.  Just plug and 
+play.  Properly set up, Slackware's desktop should be suitable for any 
+level of Linux experience.  New to the desktop framework are ConsoleKit 
+and PolicyKit.  ConsoleKit handles "seats", things like dealing with 
+devices when switching from one user to another.  PolicyKit is a system 
+for fine-grained access control, allowing a non-root user to run certain 
+tasks with elevated privilege, but more securely than if the entire task 
+were simply run as root.
+
+    Slackware uses the 2.6.37.6 kernel bringing you advanced performance 
+features such as journaling filesystems, SCSI and ATA RAID volume 
+support, SATA support, Software RAID, LVM (the Logical Volume Manager), 
+and encrypted filesystems.  Kernel support for X DRI (the Direct 
+Rendering Interface) brings high-speed hardware accelerated 3D graphics 
+to Linux.
+
+    There are two kinds of kernels in Slackware.  First there are the 
+huge kernels, which contain support for just about every driver in the 
+Linux kernel. These are primarily intended to be used for installation, 
+but there's no real reason that you couldn't continue to run them after 
+you have installed.  The other type of kernel is the generic kernel, in 
+which nearly every driver is built as a module.  To use a generic kernel 
+you'll need to build an initrd to load your filesystem module and 
+possibly your drive controller or other drivers needed at boot time, 
+configure LILO to load the initrd at boot, and reinstall LILO.  See the 
+docs in /boot after installing for more information.  Slackware's Linux 
+kernels come in both SMP and non-SMP types now.  The SMP kernel supports 
+multiple processors, multi-core CPUs, HyperThreading, and about every 
+other optimization available.  In our own testing this kernel has proven 
+to be fast, stable, and reliable.  We recommend using the SMP kernel 
+even on single processor machines if it will run on them.  Note that on
+x86_64 (64-bit), all the kernels are SMP capable.
+
+
+Here are some of the advanced features of Slackware 13.37:
+
+- Runs the 2.6.37.6 version of the Linux kernel from ftp.kernel.org.
+  Alternate 2.6.38.4 Linux kernels are also provided, as well as
+  suggested configurations for using a 2.6.39-rc4 kernel, or the
+  2.6.35.12 kernel which is supposed to be longterm supported.  These
+  kernels will provide reliable performance for your desktop or your
+  production server.  By the way, the Speakup driver, used to support
+  speech synthesizers providing access to Linux for the visually impaired
+  community, has now been merged into all of the provided kernels.
+
+- System binaries are linked with the GNU C Library, version 2.13.
+  This version of glibc also has excellent compatibility with
+  existing binaries.
+
+- X11 based on the X.Org Foundation's modular X Window System.
+  There's been much activity in the X development world, and the
+  improvements in terms of performance and hardware support are
+  too numerous to mention them all here.
+
+- Installs gcc-4.5.2 as the default C, C++, Objective-C, 
+  Fortran-77/95, and Ada 95 compiler.
+
+- Support for fully encrypted network connections with OpenSSL,
+  OpenSSH, OpenVPN, and GnuPG.
+
+- Apache (httpd) 2.2.17 web server with Dynamic Shared Object 
+  support, SSL, and PHP 5.3.6.
+
+- PCMCIA, CardBus, USB, FireWire and ACPI support.  This
+  makes Slackware a great operating system for your laptop.
+
+- The udev dynamic device management system for Linux 2.6.x.
+  This locates and configures most hardware automatically as it
+  is added (or removed) from the system, and creates the access
+  nodes in /dev.  It also loads the kernel modules required by
+  sound cards and other hardware at boot time.
+
+- New development tools, including Perl 5.12.3, Python 2.6.6,
+  Ruby 1.9.1-p431, Subversion 1.6.16, git-1.7.4.4, mercurial-1.8.2,
+  graphical tools like Qt designer and KDevelop, and much more.
+
+- Updated versions of the Slackware package management tools make it
+  easy to add, remove, upgrade, and make your own Slackware packages.
+  Package tracking makes it easy to upgrade from Slackware 13.1 to 
+  Slackware 13.37 (see UPGRADE.TXT and CHANGES_AND_HINTS.TXT).
+  The slackpkg tool can also help update from an older version of
+  Slackware to a newer one, and keep your Slackware system up to date.
+  In addition, the slacktrack utility will help you build and maintain
+  your own packages.
+
+- Web browsers galore!  Includes KDE's Konqueror 4.5.5, SeaMonkey 2.1b3
+  (this is the replacement for the Mozilla Suite), and the eagerly
+  anticipated update to Mozilla's immensely popular Firefox browser,
+  Firefox 4.0, as well as the Thunderbird 3.1.9 email and news client
+  with advanced junk mail filtering.
+
+- The KDE Software Compilation 4.5.5, a complete desktop environment.
+  This includes the KOffice productivity suite, networking tools, GUI
+  development with KDevelop, multimedia tools (including the amazing
+  Amarok music player and K3B disc burning software), the Konqueror web
+  browser and file manager, dozens of games and utilities,
+  international language support, and more.
+
+- A collection of GTK+ based applications including pidgin-2.7.11,
+   gimp-2.6.11, gkrellm-2.3.5, xchat-2.8.8, xsane-0.998, and pan-0.134.
+
+- A repository of extra software packages compiled and ready to run.
+  This includes the Java(TM) 2 Software Development Kit Standard
+  Edition, an MPlayer browser plugin, and more (see the /extra directory).
+  
+- Many more improved and upgraded packages than we can list here.  For
+  a complete list of core packages in Slackware 13.37, see this file:
+
+    ftp://ftp.slackware.com/pub/slackware/slackware-13.37/PACKAGES.TXT
+
+     
+Downloading Slackware 13.37:
+---------------------------
+
+    The full version of Slackware Linux 13.37 is available for download 
+from the central Slackware FTP sites hosted by our friends at 
+www.cwo.com and osuosl.org:
+
+   ftp://slackware.osuosl.org/pub/slackware/slackware-13.37/
+   ftp://ftp.slackware.com/pub/slackware/slackware-13.37/
+
+If the sites are busy, see the list of official mirror sites here:
+
+   http://slackware.com/getslack/
+
+    We will be setting up BitTorrent downloads for the official ISO 
+images.  Stay tuned to http://slackware.com for the latest updates.
+
+    Instructions for burning the Slackware tree onto install discs may 
+be found in the isolinux directory.
+
+
+Purchasing Slackware on CD-ROM or DVD:
+--------------------------------------
+
+    Or, please consider purchasing the Slackware Linux 13.37 six CD-ROM 
+set or deluxe dual-sided DVD release directly from Slackware Linux, and 
+you'll be helping to support the continued development of Slackware 
+Linux!
+
+    The DVD release has the 32-bit x86 Slackware 13.37 release on one 
+side, and the 64-bit x86_64 Slackware 13.37 release on the other.  Both 
+sides are bootable for easy installation, and includes everything from 
+both releases of Slackware 13.37, including the complete source code 
+trees.
+
+    The 6 CD-ROM release of Slackware 13.37 is the 32-bit x86 edition.  
+It includes a bootable first CD-ROM for easy installation.  The 6 
+CD-ROMs are labeled for easy reference.
+
+    The Slackware 13.37 x86 6 CD-ROM set is $49.95 plus shipping, or 
+choose the Slackware 13.37 x86/x86_64 dual-sided DVD (also $49.95 plus 
+shipping).
+
+    Slackware Linux is also available by subscription.  When we release 
+a new version of Slackware (which is normally once or twice a year) we 
+ship it to you and bill your credit card for a reduced subscription 
+price ($32.99 for the CD-ROM set, or $39.95 for the DVD) plus shipping.
+
+    For shipping options, see the Slackware store website.  Before 
+ordering express shipping, you may wish to check that we have the 
+product in stock. We make releases to the net at the same time as disc 
+production begins, so there is a lag between the online release and the 
+shipping of media. But, even if you download now you can still buy the 
+official media later. You'll feel good, be helping the project, and have 
+a great decorative item perfect for any computer room shelf.  :-)
+
+
+Ordering Information:
+---------------------
+
+    You can order online at the Slackware Linux store:
+
+        http://store.slackware.com
+
+    Other Slackware items like t-shirts, caps, pins, and stickers can 
+also be found here.  These will help you find and identify yourself to 
+your fellow Slackware users.  Check out the new limited edition 1337
+black Slackware T-shirt with the classic logo on the front and a custom
+LILO boot screen on the back (with references to a few famous fictional
+computers!  :-)
+
+    Order inquiries (including questions about becoming a Slackware 
+reseller) may be directed to this address:  info@slackware.com
+   
+
+Have fun! :^)  I hope you find Slackware to be useful, and thanks
+very much for your support of this project over the years.
+
+---
+Patrick J. Volkerding    <volkerdi@slackware.com>
+
+Visit us on the web at:  http://slackware.com
+
diff --git a/CHANGES_AND_HINTS.TXT b/CHANGES_AND_HINTS.TXT
index 2f980b8f..fdbf3c43 100644
--- a/CHANGES_AND_HINTS.TXT
+++ b/CHANGES_AND_HINTS.TXT
@@ -1,153 +1,88 @@
-This file documents the instructions for upgrading to Slackware 13.1, the 

-packages added, removed, renamed, and/or split  during the development cycle 

-from Slackware 13.0 through 13.1, and some potential "gotchas" that users 

+This file documents the instructions for upgrading to Slackware 13.37, the 

+packages added, removed, renamed, and/or split during the development cycle 

+from Slackware 13.1 through 13.37, and some potential "gotchas" that users 

 can avoid by arming themselves with a little knowledge.

 

 

-*** INSTRUCTIONS FOR UPGRADING FROM 13.0 ***

+*** INSTRUCTIONS FOR UPGRADING FROM 13.1 ***

 

 Follow the instructions detailed in the UPGRADE.TXT located in this

-  directory.  You will also need to read the "LIBATA SWITCHOVER" section

-  later in this document.

+  directory.  

 

-Note that upgrading from a Slackware version earlier than 13.0 is NOT 

+Note that upgrading from a Slackware version earlier than 13.1 is NOT 

   supported at all and will most likely not work.

 

 

-*** PACKAGE ADDITIONS SINCE 13.0 ***

-

-a/cpufrequtils

-a/usb_modeswitch

-ap/mpg123 (moved from /extra)

-ap/powertop

-kde/kdepim-runtime

-kde/kopete-cryptography

-kde/oxygen-icons

-kde/polkit-kde-1

-kde/polkit-qt-1

-l/ConsoleKit

-l/QScintilla

-l/attica

-l/ebook-tools

+*** PACKAGE ADDITIONS SINCE 13.1 ***

+

+a/btrfs-progs

+a/gdisk

+a/libcgroup

+a/lrzip

+a/mcelog

+a/util-linux (renamed from util-linux-ng)

+ap/ddrescue

+ap/lxc

+ap/moc

+d/slacktrack (moved from /extra)

+d/yasm (moved from /extra)

+kde/libktorrent

+l/gdk-pixbuf2

+l/libdbusmenu-qt

+l/libelf

+l/libmpc

+l/liboggz

+l/libpcap (split from tcpdump package)

+l/libplist

+l/libsndfile

+l/phonon-mplayer

+n/ca-certificates

+n/idnkit

+n/iptraf-ng (replaced iptraf)

+n/iwlwifi-100-ucode

+n/iwlwifi-6xxx-ucode

+n/rfkill

+x/radeon_ucode

+x/xdg-user-dirs

+x/xf86-video-nouveau

+xap/xaos

+

+extra/google-chrome/*

+/testing/ includes the following:

+  2.6.38.4 kernel

+  mesa-7.10.2

+  libdrm-2.4.25

+  xf86-video-nouveau-git_20110417_8378443

+

+

+*** PACKAGE REMOVALS SINCE 13.1 ***

+

+a/util-linux-ng (renamed to util-linux)

+kde/guidance-power-manager

 l/eggdbus

-l/fftw

-l/giflib

-l/gst-plugins-good

-l/hunspell

-l/libdiscid

-l/libiodbc

-l/liblastfm

-l/libnotify

-l/libsamplerate

-l/v4l-utils

-l/loudmouth

-l/notify-python

-l/polkit

-l/polkit-gnome

-l/shared-desktop-ontologies

-l/system-config-printer

-l/virtuoso-ose

-n/epic5 (replaces epic4)

-n/iwlwifi-1000-ucode

-n/iwlwifi-6000-ucode

-n/bluez

-n/obex-data-server

-n/obexfs

-n/rt2860-firmware

-n/rt2870-firmware

-x/xf86-input-wacom

-x/xf86-video-nouveau-blacklist

-xap/blueman

-xap/geeqie

-xap/xfce4-notifyd

-/testing/btrfs-progs

-

-

-*** PACKAGE REMOVALS SINCE 13.0 ***

-

-a/device-mapper (part of lvm2 now)

-a/loadlin (mostly unneeded now)

-ap/cupsddk (part of cups now)

-ap/mpg321 (replaced by mpg123)

-l/libgtkhtml (obsolete)

-l/libungif (replaced by giflib)

-n/bluez-libs (part of bluez now)

-n/bluez-utils (part of bluez now)

-n/epic4 (replaced by epic5)

-x/lbxproxy (obsolete)

-x/liblbxutil (obsolete)

-x/proxymngr (obsolete)

-x/xf86-input-citron (does not compile)

-x/xf86-input-elographics (does not compile)

-x/xf86-input-fpit (does not compile)

-x/xf86-input-hyperpen (does not compile)

-x/xf86-input-mutouch (does not compile)

-x/xf86-video-newport (unneeded)

-x/xf86-video-xgixp (at least partially breaks X)

-xap/gqview (replaced with geeqie)

-kde/mplayerthumbs (part of kdemultimedia now)

-extra/mpg123 (moved to AP series)

-

-

-*** LIBATA SWITCHOVER ***

-

-The "old" ide subsystem in the the linux kernel is now deprecated in favor

-  of the newer libata subsystem, and this affects the naming of device nodes

-  for almost all types of disk drives -- hard drives in particular will now

-  have an "sd" named node.  The following information should allow you to

-  handle that changeover gracefully.

-

-  1. Upgrade the kernel and kernel-modules packages normally.

-     

-  2. Edit /etc/fstab to reflect the change from hd* to sd*.

-    

-     If you have multiple SATA devices, and especially if you have some of

-     both hd* and sd* devices present already, then you're basically going

-     to be playing a guessing game right now, and you probably want to

-     consider using some of the persistent symlinks in the /dev/disk/by-*/

-     directories instead of raw device nodes -- for example, the links in

-     /dev/disk/by-id/ should always point to the same device, even if its

-     raw device node changes from e.g. sda1 to sdc1 or some such across

-     reboots.

- 

-     * If you are using one of the generic kernels (requiring an initrd),

-       then use the sd* name for the root device when creating the image.

-     

-     * You will almost surely want to remove the udev rules file for cdrom

-       devices (it will be regenerated on the next boot with correct

-       information reflecting the new libata stuff):  

-         # rm -f /etc/udev/rules.d/70-persistent-cd.rules 

-

-     * Speaking of optical devices, if you have multiple disk drives and an

-       optical drive using the old ide subsystem, then be aware that the

-       optical drive will get a /dev/sr* name instead of /dev/sd* -- this is

-       relevant because you might see something like this (if your optical

-       drive is currently /dev/hdb):

- 

-         Old Name --> New Name 

-         /dev/hda     /dev/sda

-         /dev/hdb     /dev/sr0

-         /dev/hdc     /dev/sdb

- 

-  3. Run lilo.  Note that you have made no edits at all to it yet, unless

-     you needed to edit it for the new kernel.  Specifically, do not make

-     any changes with respect to hd* --> sd*.

- 

-  4. Reboot.  At the lilo prompt, press <TAB> and add an append for the

-     real root device (which will no longer be /dev/hd*).  For example, if

-     the old root device was /dev/hda1, and it will now be /dev/sda1, and

-     the name of your kernel image is "Linux" then you would do this:

-

-       Linux root=/dev/sda1

-

-  5. Once the system comes back up, then fix /etc/lilo.conf, run lilo, and 

-     reboot again to be sure everything is correct.

+n/iptraf (replaced by iptraf-ng)

+x/libXTrap

+x/libXprintAppUtil

+x/libXprintUtil

+x/libxkbui

+x/rstart

+x/trapproto

+x/xf86rushproto

+x/xfindproxy

+x/xfwp

+x/xplsprinters

+x/xprehashprinterlist

+x/xproxymanagementprotocol

+x/xsetmode

+x/xsetpointer

+x/xtrap

+extra/kde3-compat/

 

 

 *** OTHER NOTABLE CHANGES AND HINTS ***

 

-The Slackware installer now uses udev to initialize your hardware, including 

-  the network interface card(s).  This has positive consequences for network 

+The Slackware installer uses udev to initialize your hardware, including the

+  network interface card(s).  This has positive consequences for network 

   installations (using NFS, FTP, HTTP or SMB).  You no longer have to run the 

   'pcmcia' and 'network' scripts prior to running 'setup' - the network 

   interface will be created and intialized by udev.  If a DHCP server is 

@@ -182,22 +117,21 @@ Use one of the provided generic kernels for daily use.  Do not report
   ATI proprietary drivers) if you use the SMP kernel.

 

   If you decide to use one of the non-SMP kernels, you will need to follow the

-  instructions in /extra/linux-2.6.33.4-nosmp-sdk/README.TXT to modify your

+  instructions in /extra/linux-2.6.37.6-nosmp-sdk/README.TXT to modify your

   kernel sources for non-SMP usage.  Note that this only applies if you are

   using the Slackware-provided non-SMP kernel - if you build a custom kernel,

   the symlinks at /lib/modules/$(uname -r)/{build,source} will point to the

   correct kernel source so long as you don't (re)move it.

 

-As usual, there are changes in udev packaging that need mentioning...

-  As with 13.0, the system udev rules now reside in /lib/udev/rules.d/ 

-  instead of /etc/udev/rules.d/ in older versions.  There should never be 

-  a reason to edit anything in /lib/udev/rules.d/, so if you think you have 

-  a case where this is required, either you're wrong or it needs to be 

-  addressed in the upstream source.  However, you can override default rules 

-  by placing one with an identical name inside /etc/udev/rules.d/  The rules 

-  files in /etc/udev/rules.d/ are still intended to (maybe) be edited as 

-  needed by local system administrators, and as such, the rules for optical 

-  and network devices will still be placed there.

+As with 13.1, the system udev rules now reside in /lib/udev/rules.d/ instead

+  of /etc/udev/rules.d/ in older versions.  There should never be a reason 

+  to edit anything in /lib/udev/rules.d/, so if you think you have a case 

+  where this is required, either you're wrong or it needs to be addressed in 

+  the upstream source.  However, you can override default rules by placing 

+  one with an identical name inside /etc/udev/rules.d/  The rules files in 

+  /etc/udev/rules.d/ are still intended to (maybe) be edited as needed by 

+  local system administrators, and as such, the rules for optical and network 

+  devices will still be placed there.

 

 Speaking of udev, pay particular attention to 70-persistent-net.rules and

   70-persistent-cd.rules in /etc/udev/rules.d/ -- these two are automatically

@@ -216,70 +150,77 @@ HAL is not new anymore, but here are a few notes related to it:
   2. User accounts with permission to do power-management tasks, such as 

      suspend, hibernate, reboot, and shutdown, via HAL methods should be in

      the "power" group.

-  3. HAL will honor settings in /etc/fstab if a device is present there, so

+  3. User accounts with permission to use network devices, such as with the

+     wicd package in /extra, should be in the "netdev" group.

+  4. User accounts with permission to use devices that "dial out" or connect

+     over a serial port (serial console connections to plug computers, sync

+     with a palm device, etcetera) will need to be in the "dialout" group.

+  5. HAL will honor settings in /etc/fstab if a device is present there, so

      you could technically have removable devices defined in /etc/fstab, but 

      if the fstab settings do not allow normal users to mount them (with the

      "user" or "users" option), then HAL/dbus will not allow them to be 

      mounted either.  In other words, for example, if your fstab line for the

      cdrom/dvd drive includes the "owner" option, you will not be able to 

      mount it as a normal user.

-  4. If you find a need for modified fdi files, those should be placed in the

+  6. If you find a need for modified fdi files, those should be placed in the

      relevant directories in /etc/hal/fdi/ instead of /usr/share/hal/fdi/

 

-If you notice Xfce's Terminal and perhaps some other applications being drawn

-  very slowly in X, then you should try explicitly disabling the Composite

-  extension in /etc/X11/xorg.conf, or set XLIB_SKIP_ARGB_VISUALS=1 in your

-  environment prior to starting X.  For more information on this, see:

-    http://bugzilla.xfce.org/show_bug.cgi?id=2792

-  We've also gotten a report of some other things (such as VirtualBox) that

-  might benefit from this.

-

-Speaking of Xorg, the version of Xorg shipped with Slackware 13.1 will not

-  (in most cases) require an /etc/X11/xorg.conf file at all.  Configuration of

-  input devices and such is handled by HAL, and the X server autoconfigures 

-  everything else.  You can still create an xorg.conf file if you wish, or you

-  can create a minimal xorg.conf with only the specific contents that you wish

-  to override (as an example, to use a binary-only video driver). 

-  Due to removed drivers and other such changes, it's quite possible that your

-  old xorg.conf will not work correctly with this version of Xorg.

-

-If you need to use a non-US keyboard layout, then copy the file located at

-  /usr/share/hal/fdi/policy/10osvendor/10-keymap.fdi to /etc/hal/fdi/policy

-  and edit it to suit your needs.  Have a look at the contents of that file

-  for an example and more information.  If you prefer to do this the "old" way

-  using /etc/X11/xorg.conf, then you can use "X -configure" or "xorgsetup" to

-  generate an xorg.conf, then add the following lines to the "ServerFlags"

-  section to disable input device hotplugging via HAL:

-    Option   "AllowEmptyInput"     "false"

-    Option   "AutoAddDevices"      "false"

-    Option   "AutoEnableDevices"   "false"

-  This is also relevant if you prefer to disable HAL completely for whatever

-  reason.

-

-If you are using input hotplugging via HAL and a synaptics touchpad, then you 

-  might need to copy /usr/share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi

-  to /etc/hal/fdi/policy/ and edit it to suit your needs.  You can also use

-  synclient(1) to make changes "on the fly."  

-Also note that any touchpads that include actual buttons as part of the 

-  touchpad hardware will not have tap-to-click enabled by default.

-

-In KDE, you can access the "System Settings" menu in Administrator mode by 

-  running "kdesu systemsettings" as your normal user.

-

-If you see errors like this related to alsa during boot:

-    Loading ALSA mixer settings:  /usr/sbin/alsactl restore

-    Unknown hardware: "HDA-Intel" ...

-    Hardware is initialized using a guess method

-    /usr/sbin/alsactl: set_control:1256: failed to obtain info for control #31

-    /usr/sbin/alsactl: set_control:1256: failed to obtain info for control #32

- then you will need to remove /etc/asound.state, reboot (so that it is 

- regenerated with correct information), and reset the volume and such.

-

-If you see warnings like this when logging in:

-    configuration error - unknown item 'DIALUPS_CHECK_ENAB' (notify administrator)

-    configuration error - unknown item 'NOLOGIN_STR' (notify administrator)

-  then you need to move/merge /etc/login.defs.new with /etc/login.defs (and

-  also move/merge the other .new files that you have obviously neglected).

+The version of Xorg in Slackware 13.37 will not (in most cases) require an 

+  /etc/X11/xorg.conf file.  Input hotplugging is no longer done using hal; 

+  instead, it now uses udev for input device detection and keyboard mapping.

+

+  /usr/share/X11/xorg.conf.d/ is the "packaged" configuration directory; all

+  files ending with ".conf" in this directory are used by the X server 

+  unless there is an identically-named file in the local sysadmin directory.

+  The local sysadmin config directory is /etc/X11/xorg.conf.d/ - all files

+  ending with ".conf" in this directory are parsed.  

+

+  There are several default config files in /usr/share/X11/xorg.conf.d/:

+    * 10-evdev.conf

+        a "catchall" file for input devices using the evdev driver; this 

+        should work for most hardware in the absence of a better driver

+    * 50-synaptics.conf

+        overrides the earlier 10-evdev.conf file and uses the synaptics 

+        driver for all touchpads

+    * 50-wacom.conf

+        overrides the earlier 10-evdev.conf file and uses the wacom driver 

+        for Wacom tablets

+    * 90-keyboard-layout.conf

+        this sample ("normal" en layout) keeps the "old" default of 

+        allowing Zap'ing the Xserver.

+  If you need to modify any of these defaults, then copy the relevant file

+  from /usr/share/X11/xorg.conf.d/ to /etc/X11/xorg.conf.d/ and edit the

+  copy.

+ 

+  You can still create an xorg.conf file if you wish, or you can create some

+  minimal xorg.conf snippets with only the specific contents that you wish

+  to override (as an example, to use a binary-only video driver) as separate

+  files in the /etc/X11/xorg.conf.d/ directory.

+

+  Regardless of your chipset (though it seems more common with intel), if KDE

+  crashes on startup, try disabling the Composite extension (which will also

+  disable all of the fancy desktop effects).  Place the following content in

+  a file at /etc/X11/xorg.conf.d/disable-composite.conf:

+    Section "Extensions"

+      Option "Composite" "Disable"

+    EndSection

+

+Now that KMS (Kernel Mode Setting) for graphics cards has (mostly) stabilized,

+  it is enabled by default for intel, ati, and nvidia graphics chipsets.  It

+  is possible to disable it use "nomodeset" as a kernel append in lilo.conf,

+  but Xorg will not work at all on intel and ati chips if you do that.

+  

+  If you want to change the resolution of the KMS console, that can be done

+  with something like this as a kernel append in lilo.conf:

+    append="video=1024x768"

+

+  Speaking of lilo.conf and KMS, make sure you use either vga=normal or 

+  vga=extended -- some of the framebuffers don't like KMS very much...

+

+The (formerly) patented bytecode interpreter is now enabled in the freetype

+  package, so your fonts might look a bit different.  If this is undesirable,

+  you can restore the previous default with this line:

+   # ln -s ../conf.avail/10-autohint.conf /etc/fonts/conf.d/

 

 If you are using a KVM switch, you might experience problems with the mouse

   when switching from one system to another.  If so, you probably need to be

@@ -312,14 +253,6 @@ If you have permission errors when attempting to burn a cdrom or dvd image,
   recommended by k3b), use it instead of 'cdrom' in the line above, and add

   to it only the users you wish to have access to cdrecord and cdrdao.

 

-If you have compilation errors that look something like this:

-  /usr/include/asm-generic/fcntl.h:117: error: redefinition of 'struct flock'

-  /usr/include/bits/fcntl.h:142: error: previous definition of 'struct flock'

-  /usr/include/asm-generic/fcntl.h:140: error: redefinition of 'struct flock64'

-  /usr/include/bits/fcntl.h:157: error: previous definition of 'struct flock64'

-  See the following link for some pointers on fixing it:

-    http://www.mail-archive.com/blfs-dev@linuxfromscratch.org/msg08942.html

-

 Input methods for complex characters (CJK, which is shorthand for Chinese,

   Japanese, Korean) and other non-latin character sets have been added. These

   input methods use the SCIM (Smart Common Input Method) platform.

@@ -351,13 +284,11 @@ Input methods for complex characters (CJK, which is shorthand for Chinese,
   an overview of applicable character glyphs (if you are inputting complex

   characters like Japanese).

 

-If you are using the pinentry-gtk2 interface (for entering passphrases with

-  gpg-agent), be aware that there is a bug in the way scim-bridge and the

-  pinentry-gtk2 interact.  The result is that keyboard input does not register

-  with pinentry-gtk2.  For the time being, either change the /usr/bin/pinentry

-  symlink to use the qt or curses frontend, or don't use scim.

-

 If you have an older machine (with a BIOS released prior to 2001) and it will

   not power off on shutdown, try adding this to your kernel's lilo stanza:

     append = "acpi=force"

 

+If you have a Thinkpad T400 or T500, you probably want to append "pci=reboot" 

+  to the kernel boot parameters.  For more information about this issue, see

+  https://encrypted.google.com/search?hl=&q=t400+%22pci%3Dreboot%22

+

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 478a419d..adb32302 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,1999 +1,2808 @@
-Wed May 19 08:58:23 UTC 2010
-Slackware 13.1 x86_64 stable is released!
-Lots of thanks are due -- see the RELEASE_NOTES and the rest of the
-ChangeLog for credits.  The ISOs are on their way to replication,
-a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD.
-We are taking pre-orders now at store.slackware.com, and offering 
-a discount if you sign up for a subscription.  Consider picking up
-a copy to help support the project.  Thanks again to the Slackware
-community for testing, contributing, and generally holding us to a
-high level of quality.  :-)
-Enjoy!
+Mon Apr 25 13:37:00 UTC 2011
+Slackware 13.37 x86_64 stable is released!
+
+Thanks to everyone who pitched in on this release: the Slackware team,
+the folks producing upstream code, and linuxquestions.org for providing
+a great forum for collaboration and testing.
+
+The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided
+32-bit/64-bit x86/x86_64 DVD.  Please consider supporting the Slackware
+project by picking up a copy from store.slackware.com.  We're taking
+pre-orders now, and offer a discount if you sign up for a subscription.
+
+As always, thanks to the Slackware community for testing, suggestions,
+and feedback.  :-)
+
+Have fun!
++--------------------------+
+Mon Apr 25 05:36:47 UTC 2011
+l/sdl-1.2.14-x86_64-5.txz:  Rebuilt.
+  Patched to fix a crash related to a changed struct in the Linux kernel.
+  Thanks to wadsworth.
++--------------------------+
+Sun Apr 24 03:20:33 UTC 2011
+I'd best start wrapping this up or I'm likely to be eaten by a grue.
+a/sysvinit-scripts-1.2-noarch-43.txz:  Rebuilt.
+  The block loop device has long been built into the Slackware kernel (since
+  1993, in fact), but we plan to make it modular in future kernels in the main
+  tree, and it already is modular in the /testing kernels.  To avoid surprises,
+  we'll load it at boot time if it is modular and not loaded already.
+  /etc/rc.d/rc.loop:  Added a simple script to load the loop device module.
+  /etc/rc.d/rc.S:  Run the rc.loop script if it is executable.
+l/jre-6u25-x86_64-1.txz:  Upgraded.
+extra/fvwm-2.6.1/fvwm-2.6.1-x86_64-1.txz:  Added.
+  The location for the system config file moves to /etc, and there isn't one
+  included yet for fvwm-2.6.x.  But that makes it more fun, right?  :-)
+extra/jdk-6/jdk-6u25-x86_64-1.txz:  Upgraded.
+isolinux/initrd.img:  Rebuilt.
+usb-and-pxe-installers/usbboot.img:  Rebuilt.
++--------------------------+
+Fri Apr 22 21:48:38 UTC 2011
+The sepulchral voice intones, "The cave is now closed."
+a/pkgtools-13.37-noarch-9.tgz:  Rebuilt.
+  Clear locale environment variables and then export LANG=C.
+  Thanks to guanx and rg3.
+isolinux/initrd.img:  Rebuilt.
+usb-and-pxe-installers/usbboot.img:  Rebuilt.
++--------------------------+
+Fri Apr 22 18:38:01 UTC 2011
+Cave closing soon.  All adventurers exit immediately through Main Office.
+a/aaa_elflibs-13.37-x86_64-7.txz:  Rebuilt.
+ap/mpg123-1.13.3-x86_64-1.txz:  Upgraded.
+l/glib2-2.28.6-x86_64-1.txz:  Upgraded.
+  Thanks to Steve Kennedy for pointing this out, as it fixes a possible crash.
+testing/source/linux-2.6.35.12-configs/:  Added.
+  Just in case anyone is intending to follow the longterm branch of the Linux
+  kernel, here are some sample .config files that may be a useful starting
+  point.  I imagine most people who would want to run this would be using it
+  on a server, so a few options were tweaked to optimize it for that.
+  Some of the highlights versus the previous 2.6.35.11 configs:
+    BLK_DEV_LOOP y -> m
+    FIREWIRE n -> m
+    HZ 1000 -> 100
+    MOUSE_PS2_ELANTECH n -> y
+    PHONET m -> n
+    PREEMPT_NONE n -> y
+    PREEMPT_VOLUNTARY y -> n
++--------------------------+
+Fri Apr 22 04:29:56 UTC 2011
+a/pkgtools-13.37-noarch-8.tgz:  Rebuilt.
+  Set LC_MESSAGES=C in installpkg.
+  Thanks to guanx.
+isolinux/initrd.img:  Rebuilt.
+  Fixed GPT support for {amiraid,ataraid,cciss,ida,rd} controllers.
+  Thanks again to Greg Chandler for quick testing.
+testing/packages/kernel-firmware-2.6.38.4-noarch-1.txz:  Upgraded.
+testing/packages/kernel-generic-2.6.38.4-x86_64-1.txz:  Upgraded.
+testing/packages/kernel-headers-2.6.38.4-x86-1.txz:  Upgraded.
+testing/packages/kernel-huge-2.6.38.4-x86_64-1.txz:  Upgraded.
+testing/packages/kernel-modules-2.6.38.4-x86_64-1.txz:  Upgraded.
+testing/packages/kernel-source-2.6.38.4-noarch-1.txz:  Upgraded.
+  BLK_DEV_LOOP y -> m
+  MOUSE_PS2_ELANTECH n -> y
+usb-and-pxe-installers/usbboot.img:  Rebuilt.
 +--------------------------+
-Wed May 19 02:59:47 UTC 2010
-a/acpid-2.0.5-x86_64-1.txz:  Upgraded.
-n/slrn-0.9.9p1-x86_64-3.txz:  Rebuilt.
-  Fixed hardcoded spool directory path in slrnpull.  Thanks to Andrew.
-+--------------------------+
-Tue May 18 22:17:13 UTC 2010
-Slackware 13.1 RC2.  Expect a stable release when it's ready.
-l/system-config-printer-1.2.2-x86_64-1.txz:  Upgraded.
-xap/pidgin-2.7.0-x86_64-1.txz:  Upgraded.
-  Upgraded to pidgin-2.7.0 and pidgin-encryption-3.1.
-  The msn_emoticon_msg function in slp.c in the MSN protocol plugin in
-  libpurple in Pidgin before 2.7.0 allows remote attackers to cause
-  a denial of service (application crash) via a custom emoticon in a
-  malformed SLP message.
+Thu Apr 21 03:13:14 UTC 2011
+xap/rdesktop-1.6.0-x86_64-2.txz:  Rebuilt.
+  Patched a traversal vulnerability (disallow /.. requests).
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-1595
+  (* Security fix *)
+isolinux/initrd.img:  Rebuilt.
+  Support GPT on RAID devices.
+  Thanks to Greg Chandler.
+usb-and-pxe-installers/usbboot.img:  Rebuilt.
+  Support GPT on RAID devices.
++--------------------------+
+Wed Apr 20 04:26:15 UTC 2011
+l/polkit-0.101-x86_64-2.txz:  Rebuilt.
+  Patched to fix a race condition that could allow a local user to execute
+  arbitrary code as root.  Thanks to Neel Mehta of Google.
+  For more information, see:
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-1485
+  (* Security fix *)
+extra/bash-completion/bash-completion-1.3-noarch-4.txz:  Rebuilt.
+  Fixed slapt file and added --terse support for pkgtools.
+  Thanks to _GArik_.
+testing/source/linux-2.6.39-rc4-configs/:  Upgraded.
++--------------------------+
+Mon Apr 18 19:13:18 UTC 2011
+a/aaa_elflibs-13.37-x86_64-6.txz:  Rebuilt.
+a/acl-2.2.50-x86_64-1.txz:  Upgraded.
+  Fix the --physical option in setfacl and getfacl to prevent symlink attacks.
+  Thanks to Martijn Dekker for the notification.
   For more information, see:
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-1624
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-4411
   (* Security fix *)
-testing/packages/btrfs-progs-20100518-x86_64-1.txz:  Upgraded.
+a/attr-2.4.45-x86_64-1.txz:  Upgraded.
+isolinux/initrd.img:  Rebuilt.
+usb-and-pxe-installers/usbboot.img:  Rebuilt.
 +--------------------------+
-Tue May 18 06:48:06 UTC 2010
-d/mercurial-1.5.2-x86_64-1.txz:  Upgraded.
-  Added hgk extension, bash and zsh completion, and Emacs .el files.
-  Thanks to Qun-Ying.
+Sun Apr 17 23:04:51 UTC 2011
+a/lrzip-0.602-x86_64-1.txz:  Added.
+  This seems like a safe little last-minute addition.
+l/libsndfile-1.0.24-x86_64-1.txz:  Upgraded.
+  Bugfix release.  The diff from .23 appears safe.
+testing/packages/libdrm-2.4.25-x86_64-1.txz:  Added.
+testing/packages/xf86-video-nouveau-git_20110417_8378443-x86_64-1.txz:  Added.
+  Thanks to Didier Spaier.
++--------------------------+
+Sun Apr 17 02:01:57 UTC 2011
+a/sysvinit-scripts-1.2-noarch-42.txz:  Rebuilt.
+  In rc.6 and rc.K, wait no more than 5 seconds for processes holding an NFS
+  mount open to exit.  Use both -l (lazy) and -f (force) when unmounting
+  remote filesystems.
+isolinux/initrd.img:  Rebuilt.
+usb-and-pxe-installers/usbboot.img:  Rebuilt.
+usb-and-pxe-installers/usbimg2disk.sh:  Upgraded.
 +--------------------------+
-Tue May 18 02:41:17 UTC 2010
-kde/kdegraphics-4.4.3-x86_64-2.txz:  Rebuilt.
-  Patched gwenview for libjpeg8 (fixes save after rotate).
-  Thanks to V'yacheslav Stetskevych.
+Sat Apr 16 04:20:33 UTC 2011
+a/acpid-2.0.9-x86_64-1.txz:  Upgraded.
+a/coreutils-8.11-x86_64-1.txz:  Upgraded.
+  Thanks to Cal Peake for DIR_COLORS fixes and updates.
+a/less-443-x86_64-1.txz:  Upgraded.
+a/tar-1.26-x86_64-1.tgz:  Upgraded.
+ap/dvd+rw-tools-7.1-x86_64-2.txz:  Rebuilt.
+ap/mc-4.7.5.2-x86_64-1.txz:  Upgraded.
+d/git-1.7.4.4-x86_64-1.txz:  Upgraded.
+l/gst-plugins-good-0.10.28-x86_64-2.txz:  Rebuilt.
+  Applied upstream patch to fix capture from interlaced video devices.
+  Thanks to Virgil Bucoci.
+n/lftp-4.2.2-x86_64-1.txz:  Upgraded.
+n/php-5.3.6-x86_64-6.txz:  Rebuilt.
+  Patched php.ini-development and php.ini-production to set
+  session.save_path = "/var/lib/php"
+  Thanks to jrecortel, ponce, and Matteo Bernardini.
+x/libX11-1.4.3-x86_64-2.txz:  Rebuilt.
+  Restored XKeysymDB.
+x/xaw3d-20110415git-x86_64-1.txz:  Upgraded.
+  Thanks to Markus Steinborn and winfried.
+x/xf86-video-intel-2.15.0-x86_64-1.txz:  Upgraded.
+xap/gv-3.7.1-x86_64-2.txz:  Rebuilt.
+  Patched to fix key bindings when XKeysymDB is not present.
+  Thanks to Iain M Hall.
+isolinux/initrd.img:  Rebuilt.
+pasture/xf86-video-intel-2.14.0-x86_64-1.txz:  Moved from x/.
+testing/packages/kernel-firmware-2.6.38.3-noarch-1.txz:  Upgraded.
+testing/packages/kernel-generic-2.6.38.3-x86_64-1.txz:  Upgraded.
+testing/packages/kernel-headers-2.6.38.3-x86-1.txz:  Upgraded.
+testing/packages/kernel-huge-2.6.38.3-x86_64-1.txz:  Upgraded.
+testing/packages/kernel-modules-2.6.38.3-x86_64-1.txz:  Upgraded.
+testing/packages/kernel-source-2.6.38.3-noarch-1.txz:  Upgraded.
+testing/source/linux-2.6.38.3-configs/:  Upgraded.
+testing/source/linux-2.6.39-rc3-configs/:  Upgraded.
+usb-and-pxe-installers/usbboot.img:  Rebuilt.
 +--------------------------+
-Mon May 17 23:19:08 UTC 2010
-a/minicom-2.1-x86_64-4.txz:  Rebuilt.
-  Fixed zero length lrz.  Thanks to Todd Aiken for the bug report.
-  Patched to fix compiling against newer glibc. Thanks to alienBOB.
-n/epic4-2.8-x86_64-2.txz:  Removed.
-n/epic5-1.1.2-x86_64-1.txz:  Added.
-t/tetex-3.0-x86_64-8.txz:  Rebuilt.
-  Fix fmtutil so that it doesn't quit working after an arbitrary date.
-  Thanks to Markus M.
-t/tetex-doc-3.0-x86_64-8.txz:  Rebuilt.
-+--------------------------+
-Mon May 17 07:54:23 UTC 2010
-a/cups-1.4.3-x86_64-3.txz:  Rebuilt.
-  Merged Till Kamppeter's patch to restore the ability to use usblp with
-  the USB backend (in addition to the libusb method).  This package will
-  remove any cups.blacklist.usblp.conf from a previous installation.
-  Thanks to Martin on linuxquestions.org for pointing out the patch.
-+--------------------------+
-Mon May 17 04:28:49 UTC 2010
-a/aaa_base-13.1-x86_64-2.txz:  Rebuilt.
-a/mdadm-2.6.9-x86_64-1.txz:  Upgraded.
-  At this point it's probably best to stick with the 2.6.x branch for
-  Slackware 13.1.  We will switch to the 3.x mdadm branch in the next
-  devel cycle -- it's going to take some init script changes, new udev
-  rules, and lots of testing.
-n/rt2860-firmware-26-fw-1.txz:  Added.
-n/rt2870-firmware-22-fw-1.txz:  Added.
-xap/xfce-4.6.1-x86_64-8.txz:  Rebuilt.
-  Patched Terminal to fix a bug with the preferences dialog.
-  Thanks to Jesse Allen for pointing out the problem and a patch in git.
+Wed Apr 13 03:07:00 UTC 2011
+a/kernel-firmware-2.6.37.6-noarch-2.txz:  Rebuilt.
+a/kernel-generic-2.6.37.6-x86_64-2.txz:  Rebuilt.
+a/kernel-huge-2.6.37.6-x86_64-2.txz:  Rebuilt.
+a/kernel-modules-2.6.37.6-x86_64-2.txz:  Rebuilt.
+d/kernel-headers-2.6.37.6-x86-2.txz:  Rebuilt.
+k/kernel-source-2.6.37.6-noarch-2.txz:  Rebuilt.
+  Added patch 4da9484bdece39ab0b098fa711e095e3e9fc8684 from Linus' git tree:
+    [PATCH] x86, hibernate: Initialize mmu_cr4_features during boot
+  This fixes resume from hibernate.
+testing/packages/kernel-firmware-2.6.38.2-noarch-2.txz:  Rebuilt.
+testing/packages/kernel-generic-2.6.38.2-x86_64-2.txz:  Rebuilt.
+testing/packages/kernel-headers-2.6.38.2-x86-2.txz:  Rebuilt.
+testing/packages/kernel-huge-2.6.38.2-x86_64-2.txz:  Rebuilt.
+testing/packages/kernel-modules-2.6.38.2-x86_64-2.txz:  Rebuilt.
+testing/packages/kernel-source-2.6.38.2-noarch-2.txz:  Rebuilt.
+  Added patch 4da9484bdece39ab0b098fa711e095e3e9fc8684 from Linus' git tree:
+    [PATCH] x86, hibernate: Initialize mmu_cr4_features during boot
+  This fixes resume from hibernate.
+kernels/*:  Rebuilt.
 isolinux/initrd.img:  Rebuilt.
-  Upgraded to mdadm-2.6.9.
 usb-and-pxe-installers/usbboot.img:  Rebuilt.
 +--------------------------+
-Sun May 16 06:00:06 UTC 2010
-a/bash-4.1.007-x86_64-1.txz:  Upgraded.
-ap/slackpkg-2.81.1-noarch-1.tgz:  Upgraded.
-  Thanks to Piter Punk.
-n/fetchmail-6.3.17-x86_64-1.txz:  Upgraded.
-  A crafted header or POP3 UIDL list could cause a memory leak and crash
-  leading to a denial of service.
+Mon Apr 11 07:01:40 UTC 2011
+a/apmd-3.2.2-x86_64-3.txz:  Rebuilt.
+  Removed obsolete /usr/bin/on_ac_power script.
+a/pkgtools-13.37-noarch-7.tgz:  Rebuilt.
+  Fixed installpkg where the pathname contains whitespace.
+  Thanks to Corrado Franco.
+a/shadow-4.1.4.3-x86_64-2.txz:  Rebuilt.
+  Corrected a packaging error where incorrect permissions on /usr/sbin/lastlog
+  and /usr/sbin/faillog allow any user to set login failure limits on any
+  other user (including root), potentially leading to a denial of service.
+  Thanks to pyllyukko for discovering and reporting this vulnerability.
+  (* Security fix *)
+a/sysvinit-scripts-1.2-noarch-41.txz:  Rebuilt.
+  In rc.6 and rc.K, use umount -l when unmounting remote filesystems.
+  Thanks to crocket.
+l/gdk-pixbuf2-2.23.3-x86_64-1.txz:  Upgraded.
+l/seamonkey-solibs-2.1b3-x86_64-2.txz:  Rebuilt.
+l/v4l-utils-0.8.3-x86_64-2.txz:  Rebuilt.
+  Moved 70-infrared.rules to /lib/udev/rules.d/.
+  Thanks to Robby Workman.
+xap/seamonkey-2.1b3-x86_64-2.txz:  Rebuilt.
+  Rebuilt from fixed upstream sources to install into the correct moz_libdir.
+isolinux/initrd.img:  Rebuilt.
+  Allow adjusting user filesystem access level for FAT partitions.
+  Thanks to Andrzej Szelachowski.
+usb-and-pxe-installers/usbboot.img:  Rebuilt.
+  Allow adjusting user filesystem access level for FAT partitions.
+  Thanks to Andrzej Szelachowski.
+testing/packages/mesa-7.10.2-x86_64-1.txz:  Upgraded.
++--------------------------+
+Fri Apr  8 06:58:48 UTC 2011
+Hi folks,
+One more.  We'll call this 13.37 RC 4.6692.  Thanks to Nicola for suggesting
+the first Feigenbaum constant could be useful since we used pi, and it's too
+late for e.  This is pretty much it, but last call for any showstoppers.
+a/dosfstools-3.0.11-x86_64-2.txz:  Rebuilt.
+  Added /sbin/fsck.* symlinks.
+  Thanks to Andrzej Szelachowski.
+a/kernel-firmware-2.6.37.6-noarch-1.txz:  Upgraded.
+a/kernel-generic-2.6.37.6-x86_64-1.txz:  Upgraded.
+a/kernel-huge-2.6.37.6-x86_64-1.txz:  Upgraded.
+a/kernel-modules-2.6.37.6-x86_64-1.txz:  Upgraded.
+a/pkgtools-13.37-noarch-6.tgz:  Rebuilt.
+  Corrected the cutoff points for converting uncompressed package size
+  from kilobytes to megabytes in installpkg.
+  Thanks to Audrius Kazukauskas for pointing out the bug.
+  Get correct size when installing a symlink to a package.
+  Thanks to chrisretusn on LQ for the bug report and analysis.
+d/gdb-7.2-x86_64-2.txz:  Rebuilt.
+  Disabled --with-python (not yet working).
+  Thanks to Thorsten Mühlfelder.
+d/kernel-headers-2.6.37.6-x86-1.txz:  Upgraded.
+k/kernel-source-2.6.37.6-noarch-1.txz:  Upgraded.
+l/djvulibre-3.5.24-x86_64-1.txz:  Upgraded.
+  Thanks to Mikhail Zotov.
+l/libtiff-3.9.4-x86_64-2.txz:  Rebuilt.
+  Patched overflows that could lead to arbitrary code execution when parsing
+  a malformed image file.
   For more information, see:
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-1167
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-0192
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-1167
   (* Security fix *)
-y/bsd-games-2.13-x86_64-11.txz:  Rebuilt.
+l/seamonkey-solibs-2.1b3-x86_64-1.txz:  Upgraded.
+x/xkeyboard-config-2.2.1-noarch-1.txz:  Upgraded.
+  Thanks to Didier Spaier for getting this in under the wire.
+xap/seamonkey-2.1b3-x86_64-1.txz:  Upgraded.
 isolinux/initrd.img:  Rebuilt.
+kernels/*:  Upgraded.
 usb-and-pxe-installers/usbboot.img:  Rebuilt.
+testing/packages/kernel-firmware-2.6.38.2-noarch-1.txz:  Added.
+testing/packages/kernel-generic-2.6.38.2-x86_64-1.txz:  Added.
+testing/packages/kernel-headers-2.6.38.2-x86-1.txz:  Added.
+testing/packages/kernel-huge-2.6.38.2-x86_64-1.txz:  Added.
+testing/packages/kernel-modules-2.6.38.2-x86_64-1.txz:  Added.
+testing/packages/kernel-source-2.6.38.2-noarch-1.txz:  Added.
+testing/source/linux-2.6.38.2-configs/:  Rebuilt.
+  PREEMPT_VOLUNTARY y -> n
+testing/source/linux-2.6.39-rc2-configs/:  Rebuilt.
+  PREEMPT_VOLUNTARY y -> n
++--------------------------+
+Thu Apr  7 04:07:29 UTC 2011
+a/mdadm-3.1.5-x86_64-1.txz:  Upgraded.
+a/pkgtools-13.37-noarch-5.tgz:  Rebuilt.
+  Use du -sh to calculate package sizes.
+l/pango-1.28.4-x86_64-1.txz:  Upgraded.
+n/dhcp-4.2.1_P1-x86_64-1.txz:  Upgraded.
+  In dhclient, check the data for some string options for reasonableness
+  before passing it along to the script that interfaces with the OS.
+  This prevents some possible attacks by a hostile DHCP server.
+  For more information, see:
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-0997
+  (* Security fix *)
+testing/source/linux-2.6.38.2-configs/:  Upgraded.
+testing/source/linux-2.6.39-rc2-configs/:  Upgraded.
++--------------------------+
+Wed Apr  6 05:43:45 UTC 2011
+a/pkgtools-13.37-noarch-4.tgz:  Rebuilt.
+  Patched to work around a possible bug calculating package size.
+a/xz-5.0.2-x86_64-1.tgz:  Upgraded.
+ap/mysql-5.1.56-x86_64-1.txz:  Upgraded.
+kde/kdevelop-4.2.2-x86_64-1.txz:  Upgraded.
+kde/kdevplatform-1.2.2-x86_64-1.txz:  Upgraded.
+l/poppler-0.16.4-x86_64-1.txz:  Upgraded.
+x/libX11-1.4.3-x86_64-1.txz:  Upgraded.
+x/util-macros-1.13.0-noarch-1.txz:  Upgraded.
+x/xorg-sgml-doctools-1.7-x86_64-1.txz:  Upgraded.
+x/xrdb-1.0.9-x86_64-1.txz:  Upgraded.
+  This fixes a security issue where improperly sanitized input could lead to
+  privilege escalation or arbitrary command execution as root.
+  For more information, see:
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-0465
+  (* Security fix *)
 +--------------------------+
-Fri May 14 19:37:13 UTC 2010
-Good hello!  We will call this update Slackware 13.1 RC1.  With this, the
-  kernel, compiler, and glibc versions are "golden", and everything is
-  pretty much ready to release.  Last call for bug reports...
-a/aaa_base-13.1-x86_64-1.txz:  Bumped version number to 13.1, and updated
-  root's initial email.
-a/aaa_elflibs-13.1-x86_64-1.txz:  Upgraded.
-a/coreutils-8.5-x86_64-3.txz:  Rebuilt.
-  Patched /etc/profile.d/coreutils-dircolors.sh to work with ash.
-  Thanks to Gary Langshaw.
-a/cups-1.4.3-x86_64-2.txz:  Rebuilt.
-  Blacklist the kernel usblp module which interferes with CUPS 1.4.x.
-a/cxxlibs-6.0.13-x86_64-2.txz:  Rebuilt.
-  Rebuilt from gcc-4.4.4 sources.
-a/gawk-3.1.8-x86_64-1.txz:  Upgraded.
-a/glibc-solibs-2.11.1-x86_64-3.txz:  Rebuilt.
-a/glibc-zoneinfo-2.11.1-noarch-3.txz:  Rebuilt.
-  Upgraded to tzcode2010j and tzdata2010j.
-a/kernel-firmware-2.6.33.4-x86_64-1.txz:  Upgraded.
-a/kernel-generic-2.6.33.4-x86_64-1.txz:  Upgraded.
-a/kernel-huge-2.6.33.4-x86_64-1.txz:  Upgraded.
-a/kernel-modules-2.6.33.4-x86_64-1.txz:  Upgraded.
-a/pkgtools-13.1-noarch-1.tgz:  Upgraded.
-  Bumped version number in pkgtool to 13.1.
-  Changed pkgtool hard drive example from /dev/hda to /dev/sda.
-  Changed explodepkg usage to not show incorrect tar 'z' flag.
-  Patched upgradepkg to use /sbin/{install,remove}pkg.  Thanks to Endre Hajas.
-ap/diffutils-3.0-x86_64-1.txz:  Upgraded.
-ap/mc-20100509_git-x86_64-1.txz:  Upgraded.
-ap/vim-7.2.416-x86_64-1.txz:  Upgraded.
-d/gcc-4.4.4-x86_64-1.txz:  Upgraded.
-d/gcc-g++-4.4.4-x86_64-1.txz:  Upgraded.
-d/gcc-gfortran-4.4.4-x86_64-1.txz:  Upgraded.
-d/gcc-gnat-4.4.4-x86_64-1.txz:  Upgraded.
-d/gcc-java-4.4.4-x86_64-1.txz:  Upgraded.
-d/gcc-objc-4.4.4-x86_64-1.txz:  Upgraded.
-d/kernel-headers-2.6.33.4-x86-1.txz:  Upgraded.
-d/libtool-2.2.6b-x86_64-2.txz:  Rebuilt.
-  Recompiled to fix references to the previous GCC.  Thanks to Max.
-k/kernel-source-2.6.33.4-noarch-1.txz:  Upgraded.
-kde/kdebindings-4.4.3-x86_64-2.txz:  Rebuilt.
-  Enabled libsmokephonon build.
-kde/kdenetwork-4.4.3-x86_64-2.txz:  Rebuilt.
-  Patched vulnerabilities in kget where it could be tricked into creating or
-  overwriting arbitrary files, as well as an issue where a download would
-  proceed without user authorization after a timeout.
+Tue Apr  5 06:35:07 UTC 2011
+a/aaa_elflibs-13.37-x86_64-5.txz:  Rebuilt.
+a/mkinitrd-1.4.6-x86_64-11.txz:  Rebuilt.
+  Copy kernel modules even if they already exist in the initrd-tree.
+ap/slackpkg-2.82.0-noarch-5.tgz:  Rebuilt.
+  Patched a couple of regex bugs.
+  Thanks to David Somero and Piter Punk.
+kde/kdebase-4.5.5-x86_64-3.txz:  Rebuilt.
+  Patched kconsole to fix closing tabs.
+  Thanks to Vincent Batts.
+kde/kdevelop-4.2.1-x86_64-1.txz:  Upgraded.
+kde/kdevplatform-1.2.1-x86_64-1.txz:  Upgraded.
+l/mpfr-3.0.1-x86_64-1.txz:  Upgraded.
+l/ncurses-5.9-x86_64-1.txz:  Upgraded.
+n/fetchmail-6.3.19-x86_64-1.txz:  Upgraded.
+n/getmail-4.20.0-x86_64-1.txz:  Upgraded.
+n/proftpd-1.3.3e-x86_64-1.txz:  Upgraded.
+  Fixes CVE-2011-1137 (badly formed SSH messages cause DoS).
   For more information, see:
-    http://kde.org/info/security/advisory-20100513-1.txt
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-1000
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-1511
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-1137
   (* Security fix *)
-l/desktop-file-utils-0.16-x86_64-2.txz:  Rebuilt.
-  Quiet down some obnoxious warnings generated by the latest version.
+n/stunnel-4.35-x86_64-1.txz:  Upgraded.
+  Thanks to Cal Peake for the last minute reminder.
+xap/xxgdb-1.12-x86_64-3.txz:  Rebuilt.
+  Merged many bugfix patches.
   Thanks to Stuart Winter.
-l/glibc-2.11.1-x86_64-3.txz:  Rebuilt.
-l/glibc-i18n-2.11.1-x86_64-3.txz:  Rebuilt.
-l/glibc-profile-2.11.1-x86_64-3.txz:  Rebuilt.
-l/libaio-0.3.109-x86_64-1.txz:  Upgraded.
-l/libraw1394-2.0.5-x86_64-1.txz:  Upgraded.
-l/libv4l-0.6.1-x86_64-1.txz:  Removed.
-l/v4l-utils-0.8.0-x86_64-1.txz:  Added.
-  This replaces the libv4l package.
-n/iputils-s20100418-x86_64-1.txz:  Upgraded.
-n/traceroute-2.0.14-x86_64-1.txz:  Upgraded.
-x/xf86-video-siliconmotion-1.7.4-x86_64-1.txz:  Upgraded.
-xap/gv-3.6.9-x86_64-1.txz:  Upgraded.
-xap/pidgin-2.6.6-x86_64-2.txz:  Rebuilt.
-  Removed empty /usr/lib/perl5/ directories.
-xap/vim-gvim-7.2.416-x86_64-1.txz:  Upgraded.
-y/bsd-games-2.13-x86_64-10.txz:  Rebuilt.
-  Patched to fix collisions with glibc's getline().  Thanks to Vincent Batts.
-  Patched bsd-games-login-fortune.sh to work properly with ash.
-  Thanks to Gary Langshaw.
-extra/bittornado/bittornado-0.3.18-noarch-2.txz:  Added.
-extra/brltty/brltty-4.2-x86_64-1.txz:  Upgraded.
-extra/emacspeak/emacspeak-32.0-x86_64-1.txz:  Added.
++--------------------------+
+Mon Apr  4 06:35:15 UTC 2011
+a/dialog-1.1_20100428-x86_64-2.txz:  Rebuilt.
+ap/vim-7.3.154-x86_64-1.txz:  Upgraded.
+d/git-1.7.4.3-x86_64-1.txz:  Upgraded.
+d/mercurial-1.8.2-x86_64-1.txz:  Upgraded.
+l/glib2-2.28.5-x86_64-1.txz:  Upgraded.
+l/libgsf-1.14.20-x86_64-1.txz:  Upgraded.
+l/v4l-utils-0.8.3-x86_64-1.txz:  Upgraded.
+xap/vim-gvim-7.3.154-x86_64-1.txz:  Upgraded.
++--------------------------+
+Sun Apr  3 05:50:28 UTC 2011
+ap/madplay-0.15.2b-x86_64-3.txz:  Rebuilt.
+  Patched to fix crash on x86_64.
+  Thanks to Kris Karas.
+ap/sox-14.3.2-x86_64-1.txz:  Upgraded.
+l/gtk+2-2.24.4-x86_64-1.txz:  Upgraded.
+n/php-5.3.6-x86_64-5.txz:  Rebuilt.
+  Added --with-sqlite3=shared.
+  Thanks to Stuart Winter.
+x/compiz-0.8.8-x86_64-1.txz:  Upgraded.
+extra/google-chrome/google-chrome-pam-solibs-1.1.3-x86_64-1.txz:  Added.
+  This is libpam.so.0, needed to make beta and unstable builds of Chrome happy.
+  PAM's first appearance here.  I should have had this ready on Friday, sorry.
+testing/source/linux-2.6.39-rc1-configs/:  Added.
++--------------------------+
+Fri Apr  1 03:32:38 UTC 2011
+ap/slackpkg-2.82.0-noarch-4.tgz:  Rebuilt.
+  Updated mirrors, allow blank lines in blacklist, better regex docs.
+  Thanks to Piter Punk.
+ap/sqlite-3.7.5-x86_64-1.txz:  Upgraded.
+xap/xpdf-3.02pl6-x86_64-3.txz:  Rebuilt.
+  Added --without-t1-library.
+  Thanks to Petri Kaukasoina.
++--------------------------+
+Thu Mar 31 04:49:05 UTC 2011
+kde/polkit-kde-1-r1145544-x86_64-2.txz:  Rebuilt.
+  Patched to prevent an annoying crash report at logout/shutdown.
+l/t1lib-5.1.2-x86_64-2.txz:  Added.
+  Well, it looks as if this library is less obsolete than was rumored, so
+  we've added it back for the time being.  Eventually most things will be
+  converted to use Freetype or other libraries, but until then...
+n/bluez-4.91-x86_64-1.txz:  Upgraded.
+n/php-5.3.6-x86_64-4.txz:  Rebuilt.
+  Restored --with-t1lib=/usr.
+xap/xpdf-3.02pl6-x86_64-2.txz:  Rebuilt.
+  Removed t1lib mention from slack-desc.
++--------------------------+
+Tue Mar 29 22:58:09 UTC 2011
+a/aaa_elflibs-13.37-x86_64-4.txz:  Rebuilt.
+a/jfsutils-1.1.15-x86_64-1.txz:  Upgraded.
+a/mkinitrd-1.4.6-x86_64-10.txz:  Rebuilt.
+  Fixed unify_libs() function and loop.
+  Thanks to Francisco Ambrozio and zux for the bug report,
+  and Eric Hameleers for the patch.
+a/procps-3.2.8-x86_64-3.txz:  Rebuilt.
+  Patched to avoid "Unknown HZ value!" at boot.
+  Thanks to Audrius Kazukauskas.
+l/t1lib-5.1.2-x86_64-1.txz:  Removed.
+  There is little use these days for Type 1 fonts and the library is not
+  maintained.  If anyone really needs this, fetch it from Slackware 13.1.
+n/curl-7.21.4-x86_64-1.txz:  Upgraded.
+  Fixes PHP curl extension.
+  Thanks to Korneliusz Jarzebski.
+n/openvpn-2.1.4-x86_64-2.txz:  Rebuilt.
+  Added --enable-iproute2.  Thanks to crocket.
+n/php-5.3.6-x86_64-3.txz:  Rebuilt.
+  Removed --with-t1lib=/usr.
+xap/xfce-4.6.2-x86_64-5.txz:  Rebuilt.
+  In Thunar, do not consider files ending in ~ to be hidden.
+  Thanks to Robby Workman.
+xap/xpdf-3.02pl6-x86_64-1.txz:  Upgraded.
+  Rebuilt without t1lib.
+  Thanks to Petri Kaukasoina.
++--------------------------+
+Tue Mar 29 05:46:13 UTC 2011
+a/btrfs-progs-20110327-x86_64-1.txz:  Upgraded.
+  In fsck.btrfs script, don't check a filesystem that's mounted as /, even if
+  it is mounted read-only.  This fix allows using btrfs as a root filesystem,
+  but /boot will still need to be on another partition using ext2 (or some
+  other filesystem) as btrfs is tricky to boot directly.
+  Thanks to gerasimos_h.
+a/mkinitrd-1.4.6-x86_64-9.txz:  Rebuilt.
+  Avoid an infinite loop copying libraries to the initrd-tree in the case that
+  preload or LD_PRELOAD are used.
+  Thanks to David Somero and Ozan Türkyilmaz for the bug report.
+  Thanks to Eric Hameleers for the patch.
+a/procps-3.2.8-x86_64-2.txz:  Rebuilt.
+  Patched to support cgroups.
+  Upgraded to psmisc-22.13.
+ap/vim-7.3.146-x86_64-1.txz:  Upgraded.
+  Updated runtime syntax.
+d/git-1.7.4.2-x86_64-1.txz:  Upgraded.
+kde/kdelibs-4.5.5-x86_64-2.txz:  Rebuilt.
+  Patched CVE-2011-1168.
+  For more information, see:
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-1168
+  (* Security fix *)
+l/chmlib-0.40-x86_64-2.txz:  Rebuilt.
+  Enabled building the example programs.
+l/glib2-2.28.4-x86_64-1.txz:  Upgraded.
+  Fixed setenv syntax in /etc/profile.d/libglib2.csh.
+  Thanks to crocket.
+xap/vim-gvim-7.3.146-x86_64-1.txz:  Upgraded.
++--------------------------+
+Sun Mar 27 08:28:47 UTC 2011
+There have been quite a few changes so we will have one more release
+candidate:  Slackware 13.37 RC 3.14159265358979323846264338327950288419716.
+Very close now!  But we'll likely hold out for 2.6.37.6.
+a/aaa_base-13.37-x86_64-3.txz:  Rebuilt.
+  Fixed a dangling /var/X11 symlink on a fresh installation.
+  Thanks to Joerg Germeroth.
+a/aaa_elflibs-13.37-x86_64-3.txz:  Rebuilt.
+a/btrfs-progs-20110322-x86_64-1.txz:  Upgraded.
+  Added fsck.btrfs script to fix problem with fsck at boot.
+  Thanks to gerasimos_h for the bug report.
+a/glibc-solibs-2.13-x86_64-4.txz:  Rebuilt.
+a/glibc-zoneinfo-2.13-noarch-4.txz:  Rebuilt.
+a/kernel-firmware-2.6.37.5-noarch-1.txz:  Upgraded.
+a/kernel-generic-2.6.37.5-x86_64-1.txz:  Upgraded.
+a/kernel-huge-2.6.37.5-x86_64-1.txz:  Upgraded.
+a/kernel-modules-2.6.37.5-x86_64-1.txz:  Upgraded.
+a/lilo-22.8-x86_64-16.txz:  Rebuilt.
+  In liloconfig, make vga=normal the default choice, and add vga=ask.
+  Use a menu rather than an inputbox to choose Linux partitions in expert mode.
+  Thanks to bukhansky.
+a/mkinitrd-1.4.6-x86_64-8.txz:  Rebuilt.
+  Allow relative paths for -s option.
+  Thanks to GazL on LQ.
+  Upgraded to busybox-1.18.4.
+a/openssl-solibs-0.9.8r-x86_64-3.txz:  Rebuilt.
+a/shadow-4.1.4.3-x86_64-1.txz:  Upgraded.
+  This release fixes a security issue where local users may be able to add
+  themselves to NIS groups through chfn and chsh.
+  For more information, see:
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-0721
+  (* Security fix *)
+  Thanks to Gary Langshaw for collecting important additional patches from svn.
+a/sysvinit-scripts-1.2-noarch-40.txz:  Rebuilt.
+  In /etc/inittab.new open tty1-6 for all of runlevels 1-5.
+a/xfsprogs-3.1.4-x86_64-1.txz:  Upgraded.
+ap/hplip-3.11.3a-x86_64-1.txz:  Upgraded.
+ap/man-1.6g-x86_64-1.txz:  Upgraded.
+ap/slackpkg-2.82.0-noarch-2.tgz:  Upgraded.
+  Added Slackware 13.37 mirrors.
+  Thanks to Piter Punk.
+ap/vim-7.3.143-x86_64-1.txz:  Upgraded.
+d/kernel-headers-2.6.37.5-x86-1.txz:  Upgraded.
+k/kernel-source-2.6.37.5-noarch-1.txz:  Upgraded.
+kde/kdegraphics-4.5.5-x86_64-3.txz:  Rebuilt.
+  Recompiled against poppler-0.16.3.
+kde/koffice-2.3.3-x86_64-2.txz:  Rebuilt.
+  Recompiled against poppler-0.16.3.
+l/QScintilla-2.4.5-x86_64-2.txz:  Rebuilt.
+  Recompiled to update the sip module API.
+  Thanks to David Somero.
+l/akonadi-1.4.1-x86_64-3.txz:  Rebuilt.
+  Fixed sqlite3 plugin path.
+  Thanks to Kris Karas.
+l/glibc-2.13-x86_64-4.txz:  Rebuilt.
+l/glibc-i18n-2.13-x86_64-4.txz:  Rebuilt.
+l/glibc-profile-2.13-x86_64-4.txz:  Rebuilt.
+l/gst-plugins-good-0.10.28-x86_64-1.txz:  Upgraded.
+l/libelf-0.8.13-x86_64-2.txz:  Rebuilt.
+  Enabled the static library.
+  Thanks to Ozan Türkyilmaz.
+l/libusb-1.0.8-x86_64-2.txz:  Rebuilt.
+  Patched debug log level.
+  Thanks to Heinz Wiesinger for a link to a patch.
+l/pcre-8.12-x86_64-1.txz:  Upgraded.
+l/poppler-0.16.3-x86_64-1.txz:  Upgraded.
+  This (again) bumps the major number of the library requiring everything that
+  uses it to be recompiled.  :/  Probably a good idea to upgrade though.
+l/qt-4.7.0_7abde40-x86_64-3.txz:  Rebuilt.
+  Fixed .la and .pc files to remove incorrect references to -ljscore and
+  -L../JavaScriptCore/release.
+  Thanks to Niels Horn.
+  Blacklisted several invalid HTTPS certificates.
+  For more information, see:
+    http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html
+  (* Security fix *)
+l/seamonkey-solibs-2.1b2-x86_64-2.txz:  Rebuilt.
+n/bind-9.7.3-x86_64-2.txz:  Rebuilt.
+  Recompiled to link with idnkit.
+  Thanks to Tobias Poschwatta.
+n/bluez-4.90-x86_64-1.txz:  Upgraded.
+n/dhcp-4.2.1-x86_64-2.txz:  Rebuilt.
+  Create empty leases files in the package.
+  Thanks to Stéphane Berthelot.
+n/ethtool-2.6.36-x86_64-1.txz:  Upgraded.
+  Thanks to Luiz Gustavo Zuliani for testing ethtool, iputils, mtr, and
+  traceroute updates and making sure they were bumped in time for 13.37.
+n/idnkit-1.0-x86_64-1.txz:  Added.
+  The idnkit package supports internationalized domain names.
+n/iputils-s20101006-x86_64-1.txz:  Upgraded.
+n/mtr-0.80-x86_64-1.txz:  Upgraded.
+n/openssl-0.9.8r-x86_64-3.txz:  Rebuilt.
+  Fixed installation of certwatch.new.
+  Thanks to Thom1b on LQ.
+n/rsync-3.0.8-x86_64-1.txz:  Upgraded.
+n/traceroute-2.0.17-x86_64-1.txz:  Upgraded.
+n/whois-5.0.11-x86_64-1.txz:  Upgraded.
+x/libXi-1.4.2-x86_64-1.txz:  Upgraded.
+x/liberation-fonts-ttf-1.06.0.20100721-noarch-3.txz:  Rebuilt.
+  Brought back the 60-liberation.conf with Courier New added.
+x/xproto-7.0.21-noarch-1.txz:  Upgraded.
+xap/gimp-2.6.11-x86_64-3.txz:  Rebuilt.
+  Recompiled against poppler-0.16.3.
+xap/mozilla-firefox-4.0-x86_64-2.txz:  Rebuilt.
+  Use --enable-startup-notification.
+  Thanks to V'yacheslav Stetskevych.
+xap/mozilla-thunderbird-3.1.9-x86_64-2.txz:  Rebuilt.
+  Use --enable-startup-notification.
+  Thanks to V'yacheslav Stetskevych.
+xap/seamonkey-2.1b2-x86_64-2.txz:  Rebuilt.
+  This patches a security vulnerability by blacklisting several invalid
+  HTTPS certificates.
+  For more information, see:
+    http://www.mozilla.org/security/announce/2011/mfsa2011-11.html
+  (* Security fix *)
+xap/vim-gvim-7.3.143-x86_64-1.txz:  Upgraded.
 isolinux/initrd.img:  Rebuilt.
-  Fixed Apple USB keyboard support.  Thanks to Alan Hicks.
-  Added missing BCM57* firmware.  Thanks to Kees Theunissen.
-  Scan /dev/sr0 first when looking for CD/DVD, not the old IDE device.
+  Added memtest86+.  Thanks to Harka Jinen.
+  Improved RAID partition scanning.
+  Thanks to Sander de Jong and Csaba Biegl.
+  Added virtio kernel modules.
+  Thanks to Mario De Chenno.
 kernels/*:  Upgraded.
 usb-and-pxe-installers/usbboot.img:  Rebuilt.
+  Added memtest86+.  Thanks to Harka Jinen.
+  Improved RAID partition scanning.
+  Thanks to Sander de Jong and Csaba Biegl.
+  Added virtio kernel modules.
+  Thanks to Mario De Chenno.
+testing/source/linux-2.6.38.1-configs/:  Upgraded.
++--------------------------+
+Tue Mar 22 06:59:13 UTC 2011
+We'll call this Slackware 13.37 release candidate 3.  It seems like most of the
+important pieces are in place now.  :-)
+a/mkinitrd-1.4.6-x86_64-7.txz:  Rebuilt.
+  Use "mdadm -S -s" in the init script to fix device numbers.
+  Thanks to Eric Hameleers.
+  Poke the kernel with fdisk after assembling RAID.
+  Thanks to Csaba Biegl.
+a/sysvinit-scripts-1.2-noarch-39.txz:  Rebuilt.
+  In rc.6 and rc.6, use -f when unmounting remote filesystems to avoid getting
+  stuck in the case of a dead server.
+  In rc.M, start /etc/rc.d/rc.autofs if it is executable.
+  Thanks to Csaba Biegl.
+ap/linuxdoc-tools-0.9.66-x86_64-8.txz:  Rebuilt.
+ Upgraded to gnome-doc-utils-0.20.4.
+kde/polkit-qt-1-r1145513-x86_64-2.txz:  Rebuilt.
+  Patched to fix a crash at logout.
+l/gdk-pixbuf2-2.23.1-x86_64-1.txz:  Upgraded.
+l/system-config-printer-1.2.7-x86_64-1.txz:  Upgraded.
+l/pycups-1.9.55-x86_64-1.txz:  Upgraded.
+n/nfs-utils-1.2.3-x86_64-3.txz:  Rebuilt.
+  Added /etc/nfsmount.conf set to protocol version 3 by default.
+  Thanks to Niels Horn.
+x/libhangul-0.0.12-x86_64-1.txz:  Upgraded.
+xap/gnuchess-5.08-x86_64-2.txz:  Rebuilt.
+  Upgraded to xboard-4.5.1.
+  Fixed xboard.desktop.  Thanks to Eric Hameleers.
+xap/mozilla-firefox-4.0-x86_64-1.txz:  Upgraded.
+  Thanks to the Mozilla Foundation for all the hard work on Firefox 4.0!
+extra/bash-completion/bash-completion-1.3-noarch-3.txz:  Rebuilt.
+  Complete on 'sh' the same as stock bash.  Thanks to Robby Workman.
+extra/google-chrome/*:  Added.
+  Added a google-chrome.SlackBuild to convert the Google Chrome .deb
+  packages for Slackware.  Thanks to Erik Hanson.
+  Also added GConf and ORBit2 packages for Google Chrome in this directory.
++--------------------------+
+Sun Mar 20 20:27:34 UTC 2011
+xap/mozilla-firefox-4.0rc2-x86_64-1.txz:  Upgraded.
+xap/xgames-0.3-x86_64-4.txz:  Rebuilt.
++--------------------------+
+Sun Mar 20 04:19:27 UTC 2011
+a/mkinitrd-1.4.6-x86_64-6.txz:  Rebuilt.
+  Use --resolve-names=never when starting udevd in the initrd.
+  Thanks to crocket.
+a/openssl-solibs-0.9.8r-x86_64-2.txz:  Rebuilt.
+a/pkgtools-13.37-noarch-3.tgz:  Rebuilt.
+  Accept non-standard slack-desc for installpkg --terse.
+ap/dmidecode-2.11-x86_64-1.txz:  Upgraded.
+ap/zsh-4.3.11-x86_64-1.txz:  Upgraded.
+d/mercurial-1.8.1-x86_64-1.txz:  Upgraded.
+l/cairo-1.10.2-x86_64-2.txz:  Rebuilt.
+  Added configure option --enable-tee for Firefox.
+n/net-snmp-5.6.1-x86_64-1.txz:  Upgraded.
+n/openssl-0.9.8r-x86_64-2.txz:  Rebuilt.
+  Make sure that the fixed certwatch script gets installed.
+n/php-5.3.6-x86_64-2.txz:  Rebuilt.
+  Added configure option --with-mysql-sock=/var/run/mysql/mysql.sock
+  which is needed since changing to the mysqlnd connector (the compile-
+  time default is no longer read from /usr/bin/mysql_config).
+  Thanks to Gregory J. L. Tourte.
+n/wpa_supplicant-0.7.3-x86_64-3.txz:  Rebuilt.
+  Included a patch from git that will be needed by NetworkManager-0.9.
+  Thanks to Robby Workman.
+x/scim-1.4.9-x86_64-5.txz:  Rebuilt.
+  Address stability issues with Firefox and other applications.
+  Thanks to Bruce Hill for the patches.
+x/scim-bridge-0.4.16-x86_64-5.txz:  Rebuilt.
+  Address stability issues with Firefox and other applications.
+  Thanks to Bruce Hill for the patches.
+x/xf86-input-keyboard-1.6.0-x86_64-1.txz:  Upgraded.
+x/xf86-input-mouse-1.7.0-x86_64-1.txz:  Upgraded.
+xap/gucharmap-2.33.2-x86_64-1.txz:  Upgraded.
+xap/mozilla-firefox-4.0rc1-x86_64-2.txz:  Rebuilt.
+  "checking for cairo-tee >= 1.10... yes"
+xap/xgames-0.3-x86_64-3.txz:  Rebuilt.
+  Upgraded to xsnow-1.42.  :)
+isolinux/initrd.img:  Rebuilt.
+usb-and-pxe-installers/usbboot.img:  Rebuilt.
 +--------------------------+
-Sun May  9 03:22:17 UTC 2010
-a/inotify-tools-3.14-x86_64-1.txz:  Upgraded.
-e/emacs-23.2-x86_64-1.txz:  Upgraded.
-kde/koffice-2.1.2-x86_64-2.txz:  Rebuilt.
-  Krita needed to be recompiled against the new libkdcraw.so.8.
-  Thanks to Jurgen Van Ham for the bug report.
-l/jre-6u20-x86_64-1.txz:  Upgraded.
-  Upgraded to Java(TM) 2 Platform Standard Edition Runtime Environment
-  Version 6.0 update 20.
-extra/jdk-6/jdk-6u20-x86_64-1.txz:  Upgraded.
-  Upgraded to Java(TM) 2 Platform Standard Edition Development Kit
-  Version 6.0 update 20.
-+--------------------------+
-Sat May  8 06:45:05 UTC 2010
-a/mkinitrd-1.4.5-x86_64-2.txz:  Rebuilt.
-  Fixed a bug in the init script.  Thanks to bonaire.
-l/libpng-1.4.2-x86_64-1.txz:  Upgraded.
-l/pcre-8.02-x86_64-1.txz:  Upgraded.
-l/polkit-gnome-0.96-x86_64-1.txz:  Upgraded.
-+--------------------------+
-Thu May  6 21:02:02 UTC 2010
-Hi folks!  We have some pretty big changes today, with an update to the latest
-KDE SC 4.4.3, and the addition of support for ConsoleKit and PolicyKit which
-have been enhanced to use shadow authentication.  Thanks to Andrew Psaltis for
-doing some great work on polkit-1, and to Robby Workman for spending months
-following the sometimes random developments coming from the CK/PK camp.  :-)
-Thanks to Eric Hameleers for leading the KDE 4.4.x Slackware development and
-handling the out-of-tree testing through http://alien.slackbook.org/blog/.
-And with that, we're calling this Slackware 13.1 BETA1.  A stable release
-should be just around the corner...
-ap/mysql-5.1.46-x86_64-2.txz:  Rebuilt.
-  Added some headers that are needed to compile external database engines.
+Sat Mar 19 04:37:14 UTC 2011
+a/pkgtools-13.37-noarch-2.tgz:  Rebuilt.
+  Add --terse one-line output mode to installpkg.
+f/linux-howtos-20110210-noarch-1.txz:  Upgraded.
+n/nfs-utils-1.2.3-x86_64-2.txz:  Rebuilt.
+  In rc.nfsd, test for nfsd support in the kernel before trying to modprobe.
+  Thanks to Vincent Batts.
+x/dejavu-fonts-ttf-2.33-noarch-1.txz:  Upgraded.
+x/liberation-fonts-ttf-1.06.0.20100721-noarch-2.txz:  Rebuilt.
+  Removed obsolete /etc/fonts/conf.avail/60-liberation.conf.
+  Thanks to Dugan Chen.
+xap/sane-1.0.22-x86_64-2.txz:  Rebuilt.
+  Configured backends with --enable-libusb_1_0.
   Thanks to Heinz Wiesinger.
-kde/guidance-power-manager-4.4.0-x86_64-1.txz:  Upgraded.
-kde/k3b-1.91.0-x86_64-3.txz:  Upgraded.
-kde/kaudiocreator-r1118889-x86_64-1.txz:  Upgraded.
-kde/kdeaccessibility-4.4.3-x86_64-1.txz:  Upgraded.
-kde/kdeadmin-4.4.3-x86_64-1.txz:  Upgraded.
-kde/kdeartwork-4.4.3-x86_64-1.txz:  Upgraded.
-kde/kdebase-4.4.3-x86_64-1.txz:  Upgraded.
-kde/kdebase-runtime-4.4.3-x86_64-1.txz:  Upgraded.
-kde/kdebase-workspace-4.4.3-x86_64-1.txz:  Upgraded.
-kde/kdebindings-4.4.3-x86_64-1.txz:  Upgraded.
-kde/kdeedu-4.4.3-x86_64-1.txz:  Upgraded.
-kde/kdegames-4.4.3-x86_64-1.txz:  Upgraded.
-kde/kdegraphics-4.4.3-x86_64-1.txz:  Upgraded.
-kde/kdelibs-4.4.3-x86_64-1.txz:  Upgraded.
-kde/kdelibs-experimental-4.3.5-x86_64-1.txz:  Removed.
-kde/kdemultimedia-4.4.3-x86_64-1.txz:  Upgraded.
-kde/kdenetwork-4.4.3-x86_64-1.txz:  Upgraded.
-kde/kdepim-4.4.3-x86_64-1.txz:  Upgraded.
-kde/kdepim-runtime-4.4.3-x86_64-1.txz:  Upgraded.
-kde/kdepimlibs-4.4.3-x86_64-1.txz:  Upgraded.
-kde/kdeplasma-addons-4.4.3-x86_64-1.txz:  Upgraded.
-kde/kdesdk-4.4.3-x86_64-1.txz:  Upgraded.
-kde/kdetoys-4.4.3-x86_64-1.txz:  Upgraded.
-kde/kdeutils-4.4.3-x86_64-1.txz:  Upgraded.
-kde/kdevelop-4.0.0-x86_64-1.txz:  Upgraded.
-kde/kdevplatform-1.0.0-x86_64-1.txz:  Upgraded.
-kde/kdewebdev-4.4.3-x86_64-1.txz:  Upgraded.
-kde/konq-plugins-4.4.0-x86_64-1.txz:  Upgraded.
-kde/kopete-cryptography-1.3.0_kde4.4.0-x86_64-1.txz:  Upgraded.
-kde/oxygen-icons-4.4.3-x86_64-1.txz:  Upgraded.
-kde/polkit-kde-1-r1120537-x86_64-1.txz:  Added.
-kde/polkit-qt-1-r1118744-x86_64-1.txz:  Added.
-kde/skanlite-0.4_kde4.4.0-x86_64-1.txz:  Upgraded.
-l/ConsoleKit-20100129-x86_64-1.txz:  Added.
-l/PyQt-4.7.3-x86_64-1.txz:  Upgraded.
-l/QScintilla-2.4.3-x86_64-1.txz:  Upgraded.
-l/akonadi-1.3.1-x86_64-1.txz:  Upgraded.
-l/attica-0.1.3-x86_64-1.txz:  Added.
-l/boost-1.42.0-x86_64-1.txz:  Upgraded.
-l/ebook-tools-0.1.1-x86_64-2.txz:  Added.
-l/eggdbus-0.6-x86_64-1.txz:  Added.
-l/hunspell-1.2.9-x86_64-1.txz:  Added.
-l/libdiscid-0.2.2-x86_64-1.txz:  Added.
-l/libiodbc-3.52.7-x86_64-2.txz:  Added.
-l/libmsn-4.1-x86_64-1.txz:  Upgraded.
-l/libspectre-0.2.5-x86_64-1.txz:  Upgraded.
-l/phonon-4.4.1-x86_64-1.txz:  Upgraded.
-l/polkit-1_14bdfd8-x86_64-1.txz:  Added.
-l/polkit-gnome-0.95-x86_64-1.txz:  Added.
-l/qt-4.6.2_2d3d3e5-x86_64-1.txz:  Upgraded.
-l/rasqal-0.9.19-x86_64-1.txz:  Upgraded.
-l/redland-1.0.10-x86_64-1.txz:  Upgraded.
-l/shared-desktop-ontologies-0.3-x86_64-1.txz:  Added.
-l/sip-4.10.2-x86_64-1.txz:  Upgraded.
-l/soprano-2.4.3-x86_64-1.txz:  Upgraded.
-l/system-config-printer-1.2.1-x86_64-1.txz:  Added.
-l/virtuoso-ose-6.1.1-x86_64-1.txz:  Added.
-x/xdg-utils-1.0.2-noarch-4.txz:  Upgraded.
-  Upgraded to 20100506 cvs snapshot.
-x/xterm-258-x86_64-1.txz:  Upgraded.
-xap/xfce-4.6.1-x86_64-7.txz:  Rebuilt.
-  In xinitrc.xfce, launch xfce4-session with ck-launch-session.
-testing/packages/amarok-2.3.0.90-x86_64-1.txz:  Added.
-+--------------------------+
-Wed May  5 07:17:07 UTC 2010
-a/lvm2-2.02.64-x86_64-1.txz:  Upgraded.
-  Fixed dangling .so symlinks.  Thanks to oneforall for the bug report.
-ap/powertop-1.11-x86_64-1.txz:  Added.
-n/libgcrypt-1.4.5-x86_64-2.txz:  Rebuilt.
-  Moved shared library to /lib{,64} for cryptsetup.
-n/libgpg-error-1.7-x86_64-2.txz:  Rebuilt.
-  Moved shared library to /lib{,64} for cryptsetup.
-l/libcap-2.19-x86_64-1.txz:  Upgraded.
-l/libmtp-1.0.1-x86_64-2.txz:  Rebuilt.
-  Restored some missing symlinks.
-x/xorg-server-1.7.7-x86_64-1.txz:  Upgraded.
-x/xorg-server-xephyr-1.7.7-x86_64-1.txz:  Upgraded.
-x/xorg-server-xnest-1.7.7-x86_64-1.txz:  Upgraded.
-x/xorg-server-xvfb-1.7.7-x86_64-1.txz:  Upgraded.
 isolinux/initrd.img:  Rebuilt.
-  Fixed the cryptsetup binary, and changed the NFS mount command in the
-  installer script to work with the new nfs-utils.
-  Thanks to Robby Workman, Eric Hameleers, Stuart Winter, and Piter Punk.
+  Added "terse" installer prompting mode.  This does the same thing as the
+  "full" install mode, but outputs a single description line (with size info)
+  as each package is installed.  I liked this from Slackware versions 1.00
+  through 1.1.1 and it's nice to see it make a comeback!  I'm betting this
+  will work better for Speakup installs, too.  Thanks to Skaperen on LQ.
+usb-and-pxe-installers/usbboot.img:  Rebuilt.
+  Added "terse" installer prompting mode.
++--------------------------+
+Fri Mar 18 05:49:19 UTC 2011
+a/kernel-firmware-2.6.37.4-noarch-2.txz:  Rebuilt.
+a/kernel-generic-2.6.37.4-x86_64-2.txz:  Rebuilt.
+a/kernel-huge-2.6.37.4-x86_64-2.txz:  Rebuilt.
+a/kernel-modules-2.6.37.4-x86_64-2.txz:  Rebuilt.
+a/usbutils-002-x86_64-1.txz:  Upgraded.
+d/cmake-2.8.4-x86_64-1.txz:  Upgraded.
+d/kernel-headers-2.6.37.4-x86-2.txz:  Rebuilt.
+k/kernel-source-2.6.37.4-noarch-2.txz:  Rebuilt.
+  Reconfigured to add Firewire and FireDTV modules.
+  Thanks to Gregory J. L. Tourte for pointing out that the old IEEE1394
+  firewire stack is gone in 2.6.37.
+l/libraw1394-2.0.7-x86_64-1.txz:  Upgraded.
+n/php-5.3.6-x86_64-1.txz:  Upgraded.
+  This release of PHP fixes several security issues:
+  Enforce security in the fastcgi protocol parsing with fpm SAPI.
+  Fixed bug #54247 (format-string vulnerability on Phar). (CVE-2011-1153)
+  Fixed bug #54193 (Integer overflow in shmop_read()). (CVE-2011-1092)
+  Fixed bug #54055 (buffer overrun with high values for precision ini setting).
+  Fixed bug #54002 (crash on crafted tag in exif). (CVE-2011-0708)
+  Fixed bug #53885 (ZipArchive segfault with FL_UNCHANGED on empty archive).
+  (CVE-2011-0421)
+  For more information, see:
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-0421
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-0708
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-1092
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-1153
+  (* Security fix *)
+x/libX11-1.4.2-x86_64-1.txz:  Upgraded.
+x/xf86-input-wacom-0.10.11-x86_64-1.txz:  Upgraded.
+x/xf86-video-ati-6.14.1-x86_64-1.txz:  Upgraded.
+x/xorg-server-1.9.5-x86_64-1.txz:  Upgraded.
+x/xorg-server-xephyr-1.9.5-x86_64-1.txz:  Upgraded.
+x/xorg-server-xnest-1.9.5-x86_64-1.txz:  Upgraded.
+x/xorg-server-xvfb-1.9.5-x86_64-1.txz:  Upgraded.
+xap/gnuplot-4.4.3-x86_64-1.txz:  Upgraded.
+xap/mozilla-firefox-4.0rc1-x86_64-1.txz:  Upgraded.
+  It is time to push this into the main tree.  It's unlikely that we'll see
+  significant changes prior to Firefox 4.0 final.  Probably the first security
+  fixes for the Firefox 4.0 branch will come with Firefox 4.0.1, which is the
+  branch that we'll want to be tracking in Slackware 13.37's /patches.  If for
+  some reason you want to stick with Firefox 3.6.x, it will be tracked in
+  Slackware 13.1's /patches for as long as they support it upstream.
+isolinux/initrd.img:  Rebuilt.
+kernels/*:  Rebuilt.
+testing/source/linux-2.6.38-configs/:  Added some example .config files.
 usb-and-pxe-installers/usbboot.img:  Rebuilt.
-extra/xf86-video-intel-alternate/*:  Removed.
-+--------------------------+
-Mon May  3 08:46:55 UTC 2010
-a/aaa_elflibs-13.013-x86_64-5.txz:  Rebuilt.
-ap/lm_sensors-3.1.2-x86_64-1.txz:  Upgraded.
-d/clisp-2.48-x86_64-1.txz:  Upgraded.
-  Upgraded to clisp-2.48 and libsigsegv-2.8.
-d/cscope-15.7a-x86_64-1.txz:  Upgraded.
-d/mercurial-1.5.1-x86_64-1.txz:  Upgraded.
-l/cairo-1.8.8-x86_64-3.txz:  Reverted.
-  Gecko based applications running against cairo-1.8.10 are crashing with a
-  "RenderBadPicture" error.  Research indicates that this may be a Gecko bug
-  exposed by recent changes to cairo, but in any case the best fix for now
-  is to go back to 1.8.8.  Thanks to Jesse Allen for the heads-up.
-n/crda-1.1.1-x86_64-1.txz:  Upgraded.
-n/ethtool-2.6.33-x86_64-1.txz:  Upgraded.
-n/fetchmail-6.3.16-x86_64-1.txz:  Upgraded.
-n/getmail-4.17.0-x86_64-1.txz:  Upgraded.
-n/ipw2200-fw-3.1-fw-1.txz:  Upgraded.
-n/iwlwifi-1000-ucode-128.50.3.1-fw-1.txz:  Added.
-n/iwlwifi-6000-ucode-9.193.4.1-fw-1.txz:  Added.
-n/mtr-0.75-x86_64-1.txz:  Upgraded.
-n/ncftp-3.2.4-x86_64-1.txz:  Upgraded.
-n/nfs-utils-1.2.2-x86_64-1.txz:  Upgraded.
-n/nmap-5.21-x86_64-1.txz:  Upgraded.
-n/openvpn-2.1.1-x86_64-1.txz:  Upgraded.
-n/pssh-2.1.1-noarch-1.txz:  Upgraded.
-n/snownews-1.5.12-x86_64-1.txz:  Upgraded.
-n/stunnel-4.33-x86_64-1.txz:  Upgraded.
-n/tftp-hpa-0.49-x86_64-1.txz:  Upgraded.
-n/yptools-2.12-x86_64-1.txz:  Upgraded.
-  Upgraded to yp-tools-2.12, ypbind-mt-1.31, and ypserv-2.23.
-xap/xscreensaver-5.11-x86_64-1.txz:  Upgraded.
-extra/partitionmanager/partitionmanager-1.0.2-x86_64-1.txz:  Upgraded.
-+--------------------------+
-Sun May  2 21:53:27 UTC 2010
-l/pilot-link-0.12.5-x86_64-1.txz:  Upgraded.
-n/bluez-hcidump-1.42-x86_64-3.txz:  Rebuilt.
-n/bluez-4.64-x86_64-1.txz:  Added.
-  It's been about a year since we last tried the Bluez 4.x branch, and support
-  for it has greatly improved since then.  Thanks to Robby Workman for getting
-  all this stuff to play together nicely.
-n/bluez-libs-3.36-x86_64-2.txz:  Removed.
-n/bluez-utils-3.36-x86_64-8.txz:  Removed.
-n/obex-data-server-0.4.5-x86_64-1.txz:  Added.
-n/obexfs-0.12-x86_64-1.txz:  Added.
-n/obexftp-0.23-x86_64-3.txz:  Rebuilt.
-n/openobex-1.5-x86_64-1.txz:  Upgraded.
-xap/blueman-1.21-x86_64-1.txz:  Added.
-  This is a graphical configuration manager for Bluetooth.
-+--------------------------+
-Sun May  2 01:04:42 UTC 2010
-a/kernel-firmware-2.6.33.3-x86_64-1.txz:  Upgraded.
-a/kernel-generic-2.6.33.3-x86_64-1.txz:  Upgraded.
-a/kernel-huge-2.6.33.3-x86_64-1.txz:  Upgraded.
-a/kernel-modules-2.6.33.3-x86_64-1.txz:  Upgraded.
-d/kernel-headers-2.6.33.3-x86-1.txz:  Upgraded.
-f/linux-howtos-20100501-noarch-1.txz:  Upgraded.
-k/kernel-source-2.6.33.3-noarch-1.txz:  Upgraded.
-x/xf86-input-vmmouse-12.6.9-x86_64-2.txz:  Rebuilt.
-  Added --with-udev-rules-dir=none option.
++--------------------------+
+Wed Mar 16 06:20:03 UTC 2011
+Slackware 13.37 release candidate 2 is ready for testing.
+Are we almost there?
+a/aaa_elflibs-13.37-x86_64-2.txz:  Rebuilt.
+a/glibc-solibs-2.13-x86_64-3.txz:  Rebuilt.
+a/glibc-zoneinfo-2.13-noarch-3.txz:  Rebuilt.
+  Upgraded to tzcode2011d and tzdata2011d.
+a/kernel-firmware-2.6.37.4-noarch-1.txz:  Upgraded.
+a/kernel-generic-2.6.37.4-x86_64-1.txz:  Upgraded.
+a/kernel-huge-2.6.37.4-x86_64-1.txz:  Upgraded.
+a/kernel-modules-2.6.37.4-x86_64-1.txz:  Upgraded.
+ap/lxc-0.7.4-x86_64-2.txz:  Rebuilt.
+  Rebuilt with --localstatedir=/var and added /var/lib/lxc.
+  Thanks to Audrius Kazukauskas.
+ap/mc-4.7.5.1-x86_64-2.txz:  Rebuilt.
+  Fixed smb (cifs?) filesystem ./configure options.
+  Thanks to Ferenc Deak.
+d/kernel-headers-2.6.37.4-x86-1.txz:  Upgraded.
+k/kernel-source-2.6.37.4-noarch-1.txz:  Upgraded.
+l/gamin-0.1.10-x86_64-3.txz:  Rebuilt.
+  Install a /etc/gamin/gaminrc with reasonable defaults.
+  Thanks to Niels Horn.
+l/glib2-2.28.3-x86_64-1.txz:  Upgraded.
+l/glibc-2.13-x86_64-3.txz:  Rebuilt.
+l/glibc-i18n-2.13-x86_64-3.txz:  Rebuilt.
+l/glibc-profile-2.13-x86_64-3.txz:  Rebuilt.
+l/gtk+2-2.24.3-x86_64-1.txz:  Upgraded.
+n/dnsmasq-2.57-x86_64-1.txz:  Upgraded.
+n/iproute2-2.6.37-x86_64-1.txz:  Upgraded.
+x/mesa-7.9.2-x86_64-1.txz:  Upgraded.
+xap/xlockmore-5.32-x86_64-1.txz:  Upgraded.
+xap/xscreensaver-5.12-x86_64-1.txz:  Upgraded.
 isolinux/initrd.img:  Rebuilt.
 kernels/*:  Upgraded.
 usb-and-pxe-installers/usbboot.img:  Rebuilt.
 +--------------------------+
-Sat May  1 18:27:52 UTC 2010
-a/cryptsetup-1.1.0-x86_64-2.txz:  Rebuilt.
-  Moved /usr/sbin/cryptsetup to /sbin/cryptsetup.
-a/dbus-1.2.24-x86_64-2.txz:  Rebuilt.
-  Removed $LOCKFILE creation from rc.messagebus.new.
-a/rpm2tgz-1.2.1-x86_64-1.txz:  Upgraded.
-  Thanks to Igor Murzov for the bugfixes and improvements.
-+--------------------------+
-Fri Apr 30 07:37:25 UTC 2010
-a/coreutils-8.5-x86_64-2.txz:  Upgraded.
-  Thanks to Angelo Brigante, Jr for fixing a long-standing bug
-  in the csh profile script.
-a/cryptsetup-1.1.0-x86_64-1.txz:  Upgraded.
-  Moved the libraries to /lib{,64}, and removed the static binary,
-  which wasn't working right anyway.
-a/dbus-1.2.24-x86_64-1.txz:  Upgraded.
-a/e2fsprogs-1.41.11-x86_64-1.txz:  Upgraded.
-a/gawk-3.1.7-x86_64-1.txz:  Upgraded.
-a/kbd-1.15.2-x86_64-1.txz:  Upgraded.
-a/lvm2-2.02.63-x86_64-1.txz:  Upgraded.
-a/sysvinit-scripts-1.2-noarch-32.txz:  Upgraded.
-  Fixed rc.S to use cryptsetup instead of cryptsetup.static.
-a/tar-1.23-x86_64-1.tgz:  Upgraded.
-a/udev-153-x86_64-1.txz:  Upgraded.
-  Thanks to Robby Workman for major updates on udev and friends.
-a/usb_modeswitch-1.1.2-x86_64-1.txz:  Added.
-  This is a utility to switch some USB devices out of a "here's the Windows
-  driver" USB storage mode.
-a/usbutils-0.87-x86_64-1.txz:  Upgraded.
-a/util-linux-ng-2.17.2-x86_64-1.txz:  Upgraded.
-ap/alsa-utils-1.0.23-x86_64-1.txz:  Upgraded.
-ap/cdrtools-2.01.01a78-x86_64-1.txz:  Upgraded.
-ap/diffutils-2.9-x86_64-1.txz:  Upgraded.
-ap/gphoto2-2.4.9-x86_64-1.txz:  Upgraded.
-ap/hplip-3.10.2-x86_64-2.txz:  Rebuilt.
-  Recompiled with --enable-hpijs-install.  Thanks to R. Andrew Bailey.
-ap/mysql-5.1.46-x86_64-1.txz:  Upgraded.
-ap/pm-utils-1.3.0-x86_64-1.txz:  Upgraded.
-ap/sqlite-3.6.23.1-x86_64-1.txz:  Upgraded.
-d/bison-2.4.2-x86_64-1.txz:  Upgraded.
-d/gdb-7.1-x86_64-1.txz:  Upgraded.
-d/git-1.7.1-x86_64-1.txz:  Upgraded.
-d/intltool-0.40.6-x86_64-1.txz:  Upgraded.
-d/m4-1.4.14-x86_64-1.txz:  Upgraded.
-d/subversion-1.6.11-x86_64-1.txz:  Upgraded.
-l/alsa-lib-1.0.23-x86_64-1.txz:  Upgraded.
-l/atk-1.30.0-x86_64-1.txz:  Upgraded.
-l/cairo-1.8.10-x86_64-1.txz:  Upgraded.
-l/dbus-glib-0.86-x86_64-1.txz:  Upgraded.
-l/dbus-python-0.83.1-x86_64-1.txz:  Upgraded.
-l/desktop-file-utils-0.16-x86_64-1.txz:  Upgraded.
-l/glib2-2.22.5-x86_64-1.txz:  Upgraded.
-l/gnome-icon-theme-2.30.2-x86_64-1.txz:  Upgraded.
-l/gst-plugins-base-0.10.29-x86_64-1.txz:  Upgraded.
-l/gst-plugins-good-0.10.22-x86_64-1.txz:  Upgraded.
-l/gstreamer-0.10.29-x86_64-1.txz:  Upgraded.
-l/gtk+2-2.18.9-x86_64-1.txz:  Upgraded.
-l/hicolor-icon-theme-0.12-noarch-1.txz:  Upgraded.
-l/libgphoto2-2.4.9-x86_64-1.txz:  Upgraded.
-l/popt-1.7-x86_64-3.txz:  Rebuilt.
-  Library moved for cryptsetup, which might need it before /usr is mounted.
-l/shared-mime-info-0.71-x86_64-1.txz:  Upgraded.
-l/vte-0.24.1-x86_64-1.txz:  Upgraded.
-n/curl-7.20.1-x86_64-1.txz:  Upgraded.
-n/dhcpcd-5.2.2-x86_64-1.txz:  Upgraded.
-n/lftp-4.0.7-x86_64-1.txz:  Upgraded.
-n/openssh-5.5p1-x86_64-1.txz:  Upgraded.
-n/whois-5.0.2-x86_64-1.txz:  Upgraded.
-x/xorg-server-1.7.6-x86_64-2.txz:  Rebuilt.
-  Patched a bug that could cause the X server to crash.
-x/xorg-server-xephyr-1.7.6-x86_64-2.txz:  Rebuilt.
-x/xorg-server-xnest-1.7.6-x86_64-2.txz:  Rebuilt.
-x/xorg-server-xvfb-1.7.6-x86_64-2.txz:  Rebuilt.
-xap/sane-1.0.21-x86_64-1.txz:  Upgraded.
-  Upgraded to sane-backends-1.0.21.
-extra/wicd/wicd-1.7.0-x86_64-2.txz:  Rebuilt.
-  Added a couple patches recommended by upstream.
-+--------------------------+
-Tue Apr 27 22:37:30 UTC 2010
-Thanks to Robby Workman for this huge batch of X updates!
-ap/radeontool-1.6.1-x86_64-1.txz:  Upgraded.
-x/compiz-0.8.6-x86_64-1.txz:  Upgraded.
-x/imake-1.0.3-x86_64-1.txz:  Upgraded.
-x/libdrm-2.4.20-x86_64-1.txz:  Upgraded.
-x/libxcb-1.6-x86_64-1.txz:  Upgraded.
-x/mesa-7.8.1-x86_64-1.txz:  Upgraded.
-x/util-macros-1.7.0-noarch-1.txz:  Upgraded.
-x/xdm-1.1.10-x86_64-1.txz:  Upgraded.
-x/xf86-input-evdev-2.3.3-x86_64-1.txz:  Upgraded.
-x/xf86-input-vmmouse-12.6.9-x86_64-1.txz:  Upgraded.
-x/xf86-input-wacom-0.10.5-x86_64-1.txz:  Upgraded.
-x/xf86-video-ati-6.13.0-x86_64-1.txz:  Upgraded.
-x/xf86-video-intel-2.11.0-x86_64-1.txz:  Upgraded.
-x/xf86-video-newport-0.2.3-x86_64-1.txz:  Removed.
-  This driver supports a video chipset used only on MIPS hardware.
-x/xf86-video-nouveau-blacklist-noarch-1.txz:  Added.
-  This is NOT the nouveau driver!  It installs a file in /etc/modprobe.d/
-  to prevent the kernel module from autoloading.  We don't want the nouveau
-  loaded since we do not ship the nouveau driver (yet), and having the
-  module loaded prevents the nv and binary nVidia drivers from working.
-x/xf86-video-xgixp-1.7.99.4-x86_64-1.txz:  Removed.
-  This driver breaks X -configure and running X.Org without a config file.
-  Besides that, x.x.99.x is not a stable release version.
-  If anyone actually uses this driver, please let us know.
-x/xorg-server-1.7.6-x86_64-1.txz:  Upgraded.
-x/xorg-server-xephyr-1.7.6-x86_64-1.txz:  Upgraded.
-x/xorg-server-xnest-1.7.6-x86_64-1.txz:  Upgraded.
-x/xorg-server-xvfb-1.7.6-x86_64-1.txz:  Upgraded.
-x/xorg-sgml-doctools-1.4-noarch-1.txz:  Upgraded.
-x/xterm-257-x86_64-1.txz:  Upgraded.
-+--------------------------+
-Mon Apr 26 05:15:14 UTC 2010
-a/acpid-2.0.4-x86_64-1.txz:  Upgraded.
-a/bash-4.1.005-x86_64-1.txz:  Upgraded.
-a/cups-1.4.3-x86_64-1.txz:  Upgraded.
-a/mkinitrd-1.4.5-x86_64-1.txz:  Upgraded.
-  Thanks to Eric Hameleers, and thanks to GazL for contributing improvements
-  that allow unlocking multiple LUKS/LVM volumes at boot.
-a/smartmontools-5.39.1-x86_64-1.txz:  Upgraded.
-ap/ash-0.4.0-x86_64-2.txz:  Rebuilt.
-  Patched to fix a crash backspacing on the command line.
-  Thanks to Gary Langshaw.
-ap/ghostscript-8.71-x86_64-2.txz:  Rebuilt.
-  Patched to fix problems with PDF processing.  Thanks to Ken L.
-ap/slackpkg-2.81-noarch-2.tgz:  Upgraded.
-  Thanks to Piter Punk.
-ap/sysstat-9.0.6.1-x86_64-1.txz:  Upgraded.
-d/binutils-2.20.51.0.8-x86_64-1.txz:  Upgraded.
-d/oprofile-0.9.6-x86_64-2.txz:  Rebuilt.
-d/ruby-1.9.1_p378-x86_64-1.txz:  Upgraded.
-l/libglade-2.6.4-x86_64-4.txz:  Rebuilt.
-  Restored libglade-2.0.la (generally we would like to see .la files go).
-n/irssi-0.8.15-x86_64-1.txz:  Upgraded.
-  From the NEWS file:
-    - Check if an SSL certificate matches the hostname of the server we are
-      connecting to.
-    - Fix crash when checking for fuzzy nick match when not on the channel.
-      Reported by Aurelien Delaitre (SATE 2009).
+Mon Mar 14 05:32:14 UTC 2011
+a/aaa_base-13.37-x86_64-2.txz:  Rebuilt.
+  Fixed a bug that creates /usr/X11R6.bak/ on a fresh installation.
+  Thanks to Cal Peake.
+a/mkinitrd-1.4.6-x86_64-5.txz:  Rebuilt.
+  Updated mkinitrd_command_generator.sh.  Thanks to Eric Hameleers.
+  Search for libraries in /lib and /lib64, not /lib*.
+a/pciutils-3.1.7-x86_64-1.txz:  Upgraded.
+a/usbutils-001-x86_64-2.txz:  Rebuilt.
+  Updated usb.ids.
+kde/guidance-power-manager-4.4.0-x86_64-1.txz:  Removed.
+  This is obsolete, and was probably what was causing the
+  "X11: maximum number to clients reached" issues.
+  Thanks to specialized and Eric Hameleers.
+kde/kdeadmin-4.5.5-x86_64-2.txz:  Rebuilt.
+  Patched knetworkconf for Slackware 13.37.0.
+l/sdl-1.2.14-x86_64-4.txz:  Rebuilt.
+  Removed bogus libmikmod dep from libSDL_mixer.la.  Thanks to Niels Horn.
+  Upgraded to SDL_ttf-2.0.10.
+n/mcabber-0.10.1-x86_64-1.txz:  Upgraded.
+  Thanks to Melvin Xavier for the reminder.
+x/x11-skel-7.4-x86_64-2.txz:  Rebuilt.
+  Fixed a bug that creates /usr/X11R6.bak/ on a fresh installation.
+  Thanks to Cal Peake.
+x/xf86-video-radeonhd-1.3.0-x86_64-2.txz:  Rebuilt.
+  Recompiled to fix unresolved symbol.  Thanks to Luigi Genoni.
++--------------------------+
+Sat Mar 12 21:07:12 UTC 2011
+ap/lxc-0.7.4-x86_64-1.txz:  Upgraded.
+e/emacs-23.3-x86_64-1.txz:  Upgraded.
+n/iptraf-ng-1.0.2-x86_64-2.txz:  Rebuilt.
+  Created the /var/lib/iptraf/ working directory.
+extra/emacspeak/emacspeak-33.0-x86_64-1.txz:  Upgraded.
++--------------------------+
+Sat Mar 12 01:38:17 UTC 2011
+a/sysvinit-scripts-1.2-noarch-38.txz:  Rebuilt.
+  In rc.M, set permissions of /var/log/dmesg according to
+  /proc/sys/kernel/dmesg_restrict.  Thanks to Robby Workman.
+xap/audacious-2.4.4-x86_64-1.txz:  Upgraded.
+xap/audacious-plugins-2.4.4-x86_64-1.txz:  Upgraded.
+xap/geeqie-1.0-x86_64-3.txz:  Rebuilt.
+  Recompiled with -D_FILE_OFFSET_BITS=64 to fix reading from CIFS shares.
+  Thanks to Bartosz Oudekerk.
+xap/pidgin-2.7.11-x86_64-1.txz:  Upgraded.
+  Fixed denials of service caused by NULL pointer dereferences due to
+  improper handling of malformed YMSG packets.
   For more information, see:
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-1155
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-1156
-  (* Security fix *)
-n/mcabber-0.10.0-x86_64-1.txz:  Upgraded.
-n/ntp-4.2.6p1-x86_64-1.txz:  Upgraded.
-n/samba-3.5.2-x86_64-1.txz:  Upgraded.
-n/sendmail-8.14.4-x86_64-1.txz:  Upgraded.
-n/sendmail-cf-8.14.4-noarch-1.txz:  Upgraded.
-x/xf86-input-synaptics-1.2.2-x86_64-1.txz:  Upgraded.
-  Enabled tap-to-click (thanks to Piter Punk).
-xap/audacious-2.3-x86_64-1.txz:  Upgraded.
-  Thanks to Robby Workman.
-xap/audacious-plugins-2.3-x86_64-1.txz:  Upgraded.
-  Thanks to Robby Workman.
-+--------------------------+
-Tue Apr 20 14:45:24 UTC 2010
-a/kernel-firmware-2.6.33.2-x86_64-1.txz:  Upgraded.
-a/kernel-generic-2.6.33.2-x86_64-1.txz:  Upgraded.
-a/kernel-huge-2.6.33.2-x86_64-1.txz:  Upgraded.
-a/kernel-modules-2.6.33.2-x86_64-1.txz:  Upgraded.
-ap/mpg123-1.12.1-x86_64-1.txz:  Upgraded.
-ap/mysql-5.1.45-x86_64-1.txz:  Upgraded.
-ap/nano-2.2.4-x86_64-1.txz:  Upgraded.
-ap/sudo-1.7.2p6-x86_64-1.txz:  Upgraded.
-  This update fixes security issues that may give a user with permission
-  to run sudoedit the ability to run arbitrary commands.
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-1091
+  (* Security fix *)
+testing/packages/mesa-7.10.1-x86_64-1.txz:  Upgraded.
++--------------------------+
+Fri Mar 11 06:34:03 UTC 2011
+a/aaa_base-13.37-x86_64-1.txz:  Upgraded.
+  Bump /etc/slackware-version.
+a/bash-4.1.010-x86_64-1.txz:  Upgraded.
+a/cpio-2.11-x86_64-1.txz:  Upgraded.
+ap/flac-1.2.1-x86_64-3.txz:  Rebuilt.
+  Recompiled to add XMMS plugin.
+ap/mc-4.7.5.1-x86_64-1.txz:  Upgraded.
+ap/mpg123-1.13.2-x86_64-1.txz:  Upgraded.
+d/subversion-1.6.16-x86_64-1.txz:  Upgraded.
+  Fixed a remotely triggerable NULL-pointer dereference in mod_dav_svn.
   For more information, see:
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-0426
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-1163
-    http://www.gratisoft.us/sudo/alerts/sudoedit_escalate.html
-    http://www.gratisoft.us/sudo/alerts/sudoedit_escalate2.html
-  (* Security fix *)
-d/cmake-2.8.1-x86_64-1.txz:  Upgraded.
-d/kernel-headers-2.6.33.2-x86-1.txz:  Upgraded.
-d/git-1.7.0.5-x86_64-1.txz:  Upgraded.
-e/emacs-23.1-x86_64-3.txz:  Rebuilt.
-  Fixed a broken icon and updated to the upstream .desktop file.
-kde/amarok-2.3.0-x86_64-1.txz:  Upgraded.
-kde/kdebase-workspace-4.3.5-x86_64-2.txz:  Rebuilt.
-  Patched a security issue with KDM.
+    http://subversion.apache.org/security/CVE-2011-0715-advisory.txt
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-0715
+  (* Security fix *)
+kde/kdebase-4.5.5-x86_64-2.txz:  Rebuilt.
+  Patched a bug where the right click context menu would be broken after
+  closing a Konsole tab.  Thanks to Vincent Batts.
+l/libao-1.1.0-x86_64-1.txz:  Upgraded.
+l/libogg-1.2.2-x86_64-1.txz:  Upgraded.
+l/liboggz-1.1.1-x86_64-1.txz:  Added.
+  This is a library and tools to edit, inspect, and validate OGG files.
+n/gnupg-1.4.11-x86_64-1.txz:  Upgraded.
+  Thanks to Markus Reichelt for the reminder.
+n/iptraf-3.0.0-x86_64-4.txz:  Removed.
+n/iptraf-ng-1.0.2-x86_64-1.txz:  Added.
+n/nmap-5.51-x86_64-1.txz:  Upgraded.
+n/openvpn-2.1.4-x86_64-1.txz:  Upgraded.
+x/libXt-1.1.1-x86_64-1.txz:  Upgraded.
+x/radeon_ucode-20110302-noarch-1.txz:  Upgraded.
+  Thanks to Gérard Monpontet for the reminder.
+xap/xfce-4.6.2-x86_64-4.txz:  Rebuilt.
+  Start kde4 services instead of kde3.
+  Load $HOME/.Xmodmap after /etc/X11/xinit/.Xmodmap.  Thanks to Niels Horn.
+testing/packages/mozilla-firefox-4.0rc1-x86_64-1.txz:  Upgraded.
++--------------------------+
+Wed Mar  9 05:52:06 UTC 2011
+Hey folks, I think it's time for Slackware 13.37 (hopefully this helps
+make up for our lack of code names) release candidate 1!
+After a lot of testing and consideration, we've decided to go with the
+recently released 2.6.37.3 Linux kernel which seems to work best for X,
+contains support for Speakup, and looks like a better kernel branch to
+be using as we move forward.
+Please test so we can have a stable release soon.  :-)
+a/aaa_elflibs-13.37-x86_64-1.txz:  Rebuilt.
+a/aaa_terminfo-5.8-x86_64-1.txz:  Upgraded.
+a/gdisk-0.6.14-x86_64-1.txz:  Added.
+  GPT fdisk is used to partition disks using GPT instead of MBR.
+a/glibc-solibs-2.13-x86_64-2.txz:  Rebuilt.
+a/glibc-zoneinfo-2.13-noarch-2.txz:  Rebuilt.
+  Upgraded to tzcode2011c and tzdata2011c.
+a/kernel-firmware-2.6.37.3-noarch-1.txz:  Upgraded.
+a/kernel-generic-2.6.37.3-x86_64-1.txz:  Upgraded.
+a/kernel-huge-2.6.37.3-x86_64-1.txz:  Upgraded.
+a/kernel-modules-2.6.37.3-x86_64-1.txz:  Upgraded.
+a/libcgroup-0.37.1-x86_64-1.txz:  Upgraded.
+  Fixed a heap-based buffer overflow that could allow privilege escalation.
   For more information, see:
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-0436
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-1006
+ (* Security fix *)
+a/pkgtools-13.37-noarch-1.tgz:  Upgraded.
+  Provide a better mount example in pkgtool.
+  Changed the output of installpkg's --warn option to be useful for making
+  a backup and documented this usage in the man page.  Thanks to Oda.
+ap/vim-7.3.138-x86_64-1.txz:  Upgraded.
+d/kernel-headers-2.6.37.3-x86-1.txz:  Upgraded.
+d/m4-1.4.16-x86_64-1.txz:  Upgraded.
+d/ruby-1.9.1_p431-x86_64-1.txz:  Upgraded.
+k/kernel-source-2.6.37.3-noarch-1.txz:  Upgraded.
+l/glib2-2.28.2-x86_64-1.txz:  Upgraded.
+l/glibc-2.13-x86_64-2.txz:  Rebuilt.
+l/glibc-i18n-2.13-x86_64-2.txz:  Rebuilt.
+  Recompiled against Linux 2.6.37.3 kernel headers.
+l/glibc-profile-2.13-x86_64-2.txz:  Rebuilt.
+l/iso-codes-3.24.2-noarch-1.txz:  Upgraded.
+l/jre-6u24-x86_64-1.txz:  Upgraded.
+l/ncurses-5.8-x86_64-1.txz:  Upgraded.
+l/polkit-0.101-x86_64-1.txz:  Upgraded.
+l/polkit-gnome-0.101-x86_64-1.txz:  Upgraded.
+l/raptor2-2.0.0-x86_64-1.txz:  Removed.
+  This was breaking some things that do not like the raptor2 interfaces.
+  Revert everything to versions using raptor1 for now.
+l/rasqal-0.9.21-x86_64-1.txz:  Reverted.
+  Backed away from newer rasqal versions that require raptor2 for now.
+l/redland-1.0.12-x86_64-1.txz:  Reverted.
+  Don't use 1.0.13 which links raptor2 and is causing compile problems.
+n/bluez-4.89-x86_64-1.txz:  Upgraded.
+n/bluez-hcidump-2.0-x86_64-1.txz:  Upgraded.
+n/dhcp-4.2.1-x86_64-1.txz:  Upgraded.
+n/dhcpcd-5.2.11-x86_64-1.txz:  Upgraded.
+n/dirmngr-1.1.0-x86_64-1.txz:  Upgraded.
+n/gnupg2-2.0.17-x86_64-1.txz:  Upgraded.
+n/gnutls-2.10.5-x86_64-1.txz:  Upgraded.
+n/gpgme-1.3.0-x86_64-1.txz:  Upgraded.
+n/iwlwifi-100-ucode-39.31.5.1-fw-1.txz:  Added.
+  Microcode to support the Intel Centrino Wireless-N chipset.
+n/iwlwifi-5000-ucode-8.83.5.1-fw-1.txz:  Upgraded.
+n/iwlwifi-6000-ucode-9.221.4.1-fw-1.txz:  Upgraded.
+n/iwlwifi-6xxx-ucode-41.28.5.1-fw-1.txz:  Added.
+  Microcode to support Intel 6000G2A, 6000G2B, 6150BGN, and 6250AGN wifi.
+n/libksba-1.2.0-x86_64-1.txz:  Upgraded.
+n/nfs-utils-1.2.3-x86_64-1.txz:  Upgraded.
+n/pinentry-0.8.1-x86_64-1.txz:  Upgraded.
+n/samba-3.5.8-x86_64-1.txz:  Upgraded.
+n/yptools-2.12-x86_64-2.txz:  Rebuilt.
+  Upgraded to ypbind-mt-1.32 and ypserv-2.24.
+x/compiz-50c061b29c-x86_64-1.txz:  Upgraded.
+x/fixesproto-5.0-x86_64-1.txz:  Upgraded.
+x/libXfixes-5.0-x86_64-1.txz:  Upgraded.
+x/libXt-1.1.0-x86_64-1.txz:  Upgraded.
+x/util-macros-1.12.0-noarch-1.txz:  Upgraded.
+x/xcompmgr-1.1.5-x86_64-2.txz:  Upgraded.
+  Merged transparency fix.  Thanks to Erik Jan Tromp.
+x/xextproto-7.2.0-x86_64-1.txz:  Upgraded.
+x/xf86-input-synaptics-1.4.0-x86_64-1.txz:  Upgraded.
+x/xf86-input-vmmouse-12.7.0-x86_64-1.txz:  Upgraded.
+x/xf86-video-chips-1.2.4-x86_64-1.txz:  Upgraded.
+x/xf86-video-siliconmotion-1.7.5-x86_64-1.txz:  Upgraded.
+x/xkbcomp-1.2.1-x86_64-1.txz:  Upgraded.
+x/xorg-server-1.9.4-x86_64-2.txz:  Rebuilt.
+  Applied upstream patch to fix EXA color tiling bug.
+x/xorg-server-xephyr-1.9.4-x86_64-2.txz:  Rebuilt.
+x/xorg-server-xnest-1.9.4-x86_64-2.txz:  Rebuilt.
+x/xorg-server-xvfb-1.9.4-x86_64-2.txz:  Rebuilt.
+xap/blueman-r708-x86_64-1.txz:  Upgraded.
+xap/mozilla-firefox-3.6.15-x86_64-1.txz:  Upgraded.
+  Firefox 3.6.15 is a security and stability update to Firefox 3.6.x.
   (* Security fix *)
-kde/koffice-2.1.2-x86_64-1.txz:  Upgraded.
-kdei/koffice-l10n-*:  Upgraded.
-k/kernel-source-2.6.33.2-noarch-1.txz:  Upgraded.
-l/lesstif-0.95.2-x86_64-1.txz:  Upgraded.
-l/libmtp-1.0.1-x86_64-1.txz:  Upgraded.
-l/loudmouth-1.4.3-x86_64-1.txz:  Added.
-  This is a Jabber library used by Amarok's mp3tunes service.
-  Thanks to Eric Hameleers.
-l/taglib-1.6.2-x86_64-1.txz:  Upgraded.
-n/gnutls-2.8.6-x86_64-1.txz:  Upgraded.
+xap/mozilla-thunderbird-3.1.9-x86_64-1.txz:  Upgraded.
+  Thunderbird 3.1.9 is a security and stability update.
+  (* Security fix *)
+xap/vim-gvim-7.3.138-x86_64-1.txz:  Upgraded.
+extra/jdk-6/jdk-6u24-x86_64-1.txz:  Upgraded.
+extra/source/flashplayer-plugin/:  Upgraded build to version 10_2.111710.
 isolinux/initrd.img:  Rebuilt.
 kernels/*:  Upgraded.
 usb-and-pxe-installers/usbboot.img:  Rebuilt.
 +--------------------------+
-Mon Apr  5 03:06:19 UTC 2010
-kde/k3b-1.91.0-x86_64-1.txz:  Upgraded.
-l/libjpeg-v8a-x86_64-1.txz:  Upgraded.
-l/seamonkey-solibs-2.0.4-x86_64-1.txz:  Upgraded.
-xap/mozilla-firefox-3.6.3-x86_64-1.txz:  Upgraded.
-  This fixes some security issues.
-  For more information, see:
-    http://www.mozilla.org/security/known-vulnerabilities/firefox36.html
+Wed Mar  2 03:13:56 UTC 2011
+a/btrfs-progs-20110301-x86_64-1.txz:  Added.
+ap/nano-2.3.0-x86_64-1.txz:  Upgraded.
+kde/koffice-2.3.3-x86_64-1.txz:  Upgraded.
+kde/kdevelop-4.2.0-x86_64-1.txz:  Upgraded.
+kde/kdevplatform-1.2.0-x86_64-1.txz:  Upgraded.
+kdei/koffice-l10n-*-2.3.2-noarch-1.txz:  Upgraded.
+l/neon-0.29.5-x86_64-1.txz:  Upgraded.
+xap/mozilla-firefox-3.6.14-x86_64-1.txz:  Upgraded.
+  Firefox 3.6.14 is a regular security and stability update to Firefox 3.6.x.
   (* Security fix *)
-xap/mozilla-thunderbird-3.0.4-x86_64-1.txz:  Upgraded.
-  This upgrade fixes some more security bugs.
++--------------------------+
+Mon Feb 28 22:19:08 UTC 2011
+n/samba-3.5.7-x86_64-1.txz:  Upgraded.
+  Fix memory corruption denial of service issue.
   For more information, see:
-    http://www.mozilla.org/security/known-vulnerabilities/thunderbird30.html
+    http://www.samba.org/samba/security/CVE-2011-0719
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-0719
   (* Security fix *)
-xap/seamonkey-2.0.4-x86_64-1.txz:  Upgraded.
-  This release fixes some more security vulnerabilities.
+extra/bash-completion/bash-completion-1.3-noarch-2.txz:  Rebuilt.
+  There have been reports of strange side effects from the contrib scripts
+  (as well as problems with a buggy script shipped with acroread, but
+  there's not much we can do about that).  It seems best to go vanilla on
+  this one and ship the contrib scripts in with the documentation.
++--------------------------+
+Mon Feb 28 04:13:27 UTC 2011
+a/mkinitrd-1.4.6-x86_64-4.txz:  Rebuilt.
+  Upgraded to busybox-1.18.3.
+  Blacklist some things in /lib/udev.
+  Thanks to Robby Workman.
+a/pcmciautils-017-x86_64-1.txz:  Upgraded.
+n/vsftpd-2.3.4-x86_64-1.txz:  Upgraded.
+xap/blackbox-0.70.1-x86_64-4.txz:  Rebuilt.
+  Support ConsoleKit.  Thanks to Robby Workman.
+xap/fluxbox-1.3.1-x86_64-1.txz:  Upgraded.
+  Support ConsoleKit.  Thanks to Robby Workman.
+xap/fvwm-2.4.20-x86_64-2.txz:  Rebuilt.
+  Support ConsoleKit.  Thanks to Robby Workman.
+xap/sane-1.0.22-x86_64-1.txz:  Upgraded.
+xap/windowmaker-20060427cvs-x86_64-4.txz:  Rebuilt.
+  Support ConsoleKit.  Thanks to Robby Workman.
+xap/xsane-0.998-x86_64-1.txz:  Upgraded.
+extra/kde3-compat/:  Removed.
++--------------------------+
+Sat Feb 26 04:53:24 UTC 2011
+a/cpufrequtils-008-x86_64-1.txz:  Upgraded.
+a/dosfstools-3.0.11-x86_64-1.txz:  Upgraded.
+ap/ddrescue-1.14-x86_64-1.txz:  Added.
+testing/packages/mozilla-firefox-4.0b12-x86_64-1.txz:  Upgraded.
++--------------------------+
+Fri Feb 25 01:10:49 UTC 2011
+l/glib2-2.28.1-x86_64-1.txz:  Upgraded.
+l/gtk+2-2.24.1-x86_64-1.txz:  Upgraded.
+l/libwnck-2.30.6-x86_64-1.txz:  Upgraded.
+l/mhash-0.9.9.9-x86_64-3.txz:  Rebuilt.
+  Patch in mhash.h reverted; it exchanged warnings for errors.
+n/bind-9.7.3-x86_64-1.txz:  Upgraded.
+  Fixes "Server Lockup Upon IXFR or DDNS Update Combined with High Query Rate".
   For more information, see:
-    http://www.mozilla.org/security/known-vulnerabilities/seamonkey20.html
+    http://www.isc.org/software/bind/advisories/cve-2011-0414
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-0414
   (* Security fix *)
+n/tin-1.8.3-x86_64-2.txz:  Rebuilt.
+  Fixed keyboard input for UTF-8 locales.  Thanks to Thomas Morper.
+n/wpa_supplicant-0.7.3-x86_64-2.txz:  Rebuilt.
+  Add options CONFIG_CTRL_IFACE_DBUS_NEW=y and CONFIG_CTRL_IFACE_DBUS_INTRO=y.
+  Use upstream dbus service file (with fixed paths).
+  Thanks to Andrew Brouwers.
+x/xterm-267-x86_64-1.txz:  Reverted.
+  Went back to version 267 since the Alt-Enter fullscreen feature introduced
+  in 268 is causing problems for mc and other programs.
+  Thanks to Mikhail Zotov.
+  This same issue is addressed in 269, but presently that does not compile.
+  It is probably a safer bet to just use 267 which had plenty of testing here.
+xap/pan-0.134-x86_64-1.txz:  Upgraded.
+xap/pidgin-2.7.10-x86_64-1.txz:  Upgraded.
+  Fixed potential information disclosure issue in libpurple.
+  (* Security fix *)
+xap/xfce-4.6.2-x86_64-3.txz:  Rebuilt.
+  Patch:  Don't make panel insensitive during plugin moves.
+  Thanks to Robby Workman.
 +--------------------------+
-Wed Mar 31 18:33:50 UTC 2010
-a/kernel-firmware-2.6.33.1-x86_64-1.txz:  Upgraded.
-a/kernel-generic-2.6.33.1-x86_64-1.txz:  Upgraded.
-a/kernel-huge-2.6.33.1-x86_64-1.txz:  Upgraded.
-a/kernel-modules-2.6.33.1-x86_64-1.txz:  Upgraded.
-a/openssl-solibs-0.9.8n-x86_64-1.txz:  Upgraded.
-ap/mpg123-1.11.0-x86_64-1.txz:  Upgraded.
-d/kernel-headers-2.6.33.1-x86-1.txz:  Upgraded.
-l/jre-6u19-x86_64-1.txz:  Upgraded.
-  Upgraded to Java(TM) 2 Platform Standard Edition Runtime Environment
-  Version 6.0 update 19.
-l/sdl-1.2.14-x86_64-2.txz:  Rebuilt.
-  Restored missing .mod support.  Thanks to Niels Horn.
-k/kernel-source-2.6.33.1-noarch-1.txz:  Upgraded.
-n/openssl-0.9.8n-x86_64-1.txz:  Upgraded.
-  This OpenSSL update contains some security related bugfixes.
+Wed Feb 16 08:05:44 UTC 2011
+a/lvm2-2.02.84-x86_64-1.txz:  Upgraded.
+a/util-linux-2.19-x86_64-1.txz:  Added.
+a/util-linux-ng-2.18-x86_64-2.txz:  Removed.
+d/git-1.7.4.1-x86_64-1.txz:  Upgraded.
+l/exiv2-0.21.1-x86_64-1.txz:  Upgraded.
+l/libxklavier-5.1-x86_64-1.txz:  Upgraded.
+l/mhash-0.9.9.9-x86_64-2.txz:  Rebuilt.
+  Do not #define MUTILS_USE_MHASH_CONFIG in mhash.h.  Thanks to guanx.
+l/seamonkey-solibs-2.1b2-x86_64-1.txz:  Upgraded.
+l/vte-0.26.2-x86_64-1.txz:  Upgraded.
+xap/seamonkey-2.1b2-x86_64-1.txz:  Upgraded.
+xap/xfce-4.6.2-x86_64-2.txz:  Rebuilt.
+  Upgraded to Terminal-0.4.6 and xfce4-dev-tools-4.8.0.
+  Recompiled against libxklavier-5.1.
+xap/xfce4-notifyd-0.1.1-x86_64-1.txz:  Upgraded.
+extra/bash-completion/bash-completion-1.3-noarch-1.txz:  Upgraded.
+isolinux/initrd.img:  Rebuilt.
+  Support GUID Partition Table (GPT).
+usb-and-pxe-installers/usbboot.img:  Rebuilt.
+  Support GUID Partition Table (GPT).
++--------------------------+
+Sun Feb 13 00:17:12 UTC 2011
+kde/kdebase-runtime-4.5.5-x86_64-2.txz:  Rebuilt.
+l/apr-1.4.2-x86_64-2.txz:  Rebuilt.
+  Patched to fix aliasing issue with gcc-4.5.1.
+  Thanks to Virgil-Adrian Teaca and Kirils Solovjovs.
+l/strigi-0.7.2-x86_64-2.txz:  Rebuilt.
+n/httpd-2.2.17-x86_64-3.txz:  Rebuilt.
+  Patched to fix aliasing issue with gcc-4.5.1.
+  Thanks to Virgil-Adrian Teaca and Kirils Solovjovs.
+xap/gkrellm-2.3.5-x86_64-1.txz:  Upgraded.
++--------------------------+
+Sat Feb 12 02:19:33 UTC 2011
+l/raptor-1.4.21-x86_64-1.txz:  Added.
+  It seems we were a bit hasty in getting rid of raptor1, as there are some
+  things (including soprano) that won't yet rebuild with raptor2.
+  We'll keep this around until everything has transitioned to the new raptor.
+  Thanks to Gérard Monpontet.
++--------------------------+
+Thu Feb 10 21:19:38 UTC 2011
+a/coreutils-8.10-x86_64-1.txz:  Upgraded.
+a/glibc-solibs-2.13-x86_64-1.txz:  Upgraded.
+a/glibc-zoneinfo-2.13-noarch-1.txz:  Upgraded.
+  Upgraded to tzcode2011b and tzdata2011b.
+a/kernel-firmware-2.6.35.11-noarch-1.txz:  Upgraded.
+a/kernel-generic-2.6.35.11-x86_64-1.txz:  Upgraded.
+a/kernel-huge-2.6.35.11-x86_64-1.txz:  Upgraded.
+a/kernel-modules-2.6.35.11-x86_64-1.txz:  Upgraded.
+a/lvm2-2.02.83-x86_64-1.txz:  Upgraded.
+  Fix permissions problem.  Thanks to Gary Langshaw.
+a/minicom-2.5-x86_64-1.txz:  Upgraded.
+a/mkinitrd-1.4.6-x86_64-3.txz:  Rebuilt.
+  Added udevadm settle to init in initrd to fix LVM issues.
+  Thanks to Gary Langshaw.
+a/openssl-solibs-0.9.8r-x86_64-1.txz:  Upgraded.
+  (* Security fix *)
+a/sharutils-4.11-x86_64-1.txz:  Upgraded.
+a/sysvinit-scripts-1.2-noarch-37.txz:  Rebuilt.
+  In rc.6 and rc.K, kill any processes holding NFS volumes open before
+  unmounting those volumes.  Thanks to Jonathan Woithe.
+  Mount Control Groups in rc.S.
+ap/alsa-utils-1.0.24.2-x86_64-1.txz:  Upgraded.
+ap/lxc-0.7.4_rc1-x86_64-1.txz:  Added.
+  Support for Linux Containers based on Control Groups.
+  Thanks to Johannes Schöpfer for assistance.
+ap/mysql-5.1.55-x86_64-1.txz:  Upgraded.
+ap/sudo-1.7.4p6-x86_64-1.txz:  Upgraded.
+  Fix Runas group password checking.
   For more information, see the included CHANGES and NEWS files, and:
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-0433
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-0740
- (* Security fix *)
-n/php-5.2.13-x86_64-2.txz:  Rebuilt.
-  Patched for libpng-1.4.x.
-  Thanks to Dan Church for the patch.
-n/proftpd-1.3.3-x86_64-2.txz:  Rebuilt.
-  Recompiled against openssl-0.9.8n.
-x/libXt-1.0.8-x86_64-1.txz:  Upgraded.
-x/util-macros-1.6.1-noarch-1.txz:  Upgraded.
-x/xf86-video-ati-6.12.6-x86_64-1.txz:  Upgraded.
-x/xf86-video-nv-2.1.17-x86_64-1.txz:  Upgraded.
-x/xinit-1.2.1-x86_64-1.txz:  Upgraded.
-x/xinput-1.5.1-x86_64-1.txz:  Upgraded.
-xap/gkrellm-2.3.4-x86_64-1.txz:  Upgraded.
-xap/mozilla-firefox-3.6.2-x86_64-1.txz:  Upgraded.
-  Upgraded to firefox-3.6.2.
-  This fixes some security issues.
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-0010
+  (* Security fix *)
+d/gcc-4.5.2-x86_64-2.txz:  Rebuilt.
+  Recompiled against mpfr-3.0.0p08.
+d/gcc-g++-4.5.2-x86_64-2.txz:  Rebuilt.
+d/gcc-gfortran-4.5.2-x86_64-2.txz:  Rebuilt.
+d/gcc-gnat-4.5.2-x86_64-2.txz:  Rebuilt.
+d/gcc-java-4.5.2-x86_64-2.txz:  Rebuilt.
+d/gcc-objc-4.5.2-x86_64-2.txz:  Rebuilt.
+d/kernel-headers-2.6.35.11-x86-1.txz:  Upgraded.
+k/kernel-source-2.6.35.11-noarch-1.txz:  Upgraded.
+kde/kdeartwork-4.5.5-x86_64-2.txz:  Rebuilt.
+kde/kdegraphics-4.5.5-x86_64-2.txz:  Rebuilt.
+kde/kdepim-4.4.10-x86_64-1.txz:  Upgraded.
+kde/kdepim-runtime-4.4.10-x86_64-1.txz:  Upgraded.
+kde/koffice-2.3.1-x86_64-1.txz:  Upgraded.
+kdei/koffice-l10n-*-2.3.1-noarch-1.txz:  Upgraded.
+l/alsa-lib-1.0.24.1-x86_64-1.txz:  Upgraded.
+l/apr-1.4.2-x86_64-1.txz:  Upgraded.
+l/apr-util-1.3.10-x86_64-1.txz:  Upgraded.
+  Fixes a memory leak and DoS in apr_brigade_split_line().
   For more information, see:
-    http://www.mozilla.org/security/known-vulnerabilities/firefox36.html
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-1623
   (* Security fix *)
-xap/xmms-1.2.11-x86_64-4.txz:  Rebuilt.
-  Added missing icon for the .desktop file.
-  Added .mod support.
-extra/jdk-6/jdk-6u19-x86_64-1.txz:  Upgraded.
-  Upgraded to Java(TM) 2 Platform Standard Edition Development Kit
-  Version 6.0 update 19.
+l/exiv2-0.21-x86_64-1.txz:  Upgraded.
+l/expat-2.0.1-x86_64-2.txz:  Rebuilt.
+  Fixed various crash and hang bugs.
+  For more information, see:
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-2625
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3560
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3720
+  (* Security fix *)
+l/glibc-2.13-x86_64-1.txz:  Upgraded.
+l/glibc-i18n-2.13-x86_64-1.txz:  Upgraded.
+l/glibc-profile-2.13-x86_64-1.txz:  Upgraded.
+l/libcap-2.20-x86_64-1.txz:  Upgraded.
+  Moved static library to /lib{64} to avoid linking libcap statically.
+  Include <sys/types.h> in <sys/capability.h>.  Thanks to Steve.
+l/libexif-0.6.20-x86_64-1.txz:  Upgraded.
+l/libid3tag-0.15.1b-x86_64-4.txz:  Rebuilt.
+  Fixed ${LIBDIRSUFFIX} in id3tag.pc.  Thanks to Mathieu Bouillaguet.
+l/libmpc-0.8.2-x86_64-2.txz:  Rebuilt.
+l/mpfr-3.0.0p08-x86_64-1.txz:  Upgraded.
+l/poppler-0.16.2-x86_64-1.txz:  Upgraded.
+l/raptor-1.4.21-x86_64-1.txz:  Removed.
+l/raptor2-2.0.0-x86_64-1.txz:  Added.
+l/rasqal-0.9.24-x86_64-1.txz:  Upgraded.
+l/redland-1.0.13-x86_64-1.txz:  Upgraded.
+l/zlib-1.2.5-x86_64-4.txz:  Rebuilt.
+n/httpd-2.2.17-x86_64-2.txz:  Rebuilt.
+  This fixes some denial of service bugs in the bundled libraries.
+  On Slackware we do not use the bundled expat or apr-util, so the
+  issues are also fixed in those external libraries.
+  For more information, see:
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3560
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3720
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-1623
+  (* Security fix *)
+n/openssh-5.8p1-x86_64-1.txz:  Upgraded.
+n/openssl-0.9.8r-x86_64-1.txz:  Upgraded.
+  This OpenSSL update fixes an "OCSP stapling vulnerability".
+  For more information, see the included CHANGES and NEWS files, and:
+    http://www.openssl.org/news/secadv_20110208.txt
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-0014
+  (* Security fix *)
+  Patched certwatch to work with recent versions of "file".
+  Thanks to Ulrich Schäfer and Jan Rafaj.
+x/libpciaccess-0.12.1-x86_64-1.txz:  Upgraded.
+x/mesa-7.9_ccc11aa-x86_64-1.txz:  Upgraded.
+  The Mesa 7.9 branch seems to be a little more stable, but feel free to
+  try out the 7.10 package in /testing.
+x/xf86-video-ati-6.14.0-x86_64-1.txz:  Upgraded.
+  This new driver requires KMS, which is set by default in the new kernel.
+  Otherwise, create /etc/modprobe.d/radeon.conf with this content:
+    options radeon modeset=1
+  Also, the kernel should be booted with vga=normal.
+  Problems have been observed when trying to use KMS after starting a VESA
+  framebuffer console.  Sorry about the penguins.
+x/xorg-server-1.9.4-x86_64-1.txz:  Upgraded.
+x/xorg-server-xephyr-1.9.4-x86_64-1.txz:  Upgraded.
+x/xorg-server-xnest-1.9.4-x86_64-1.txz:  Upgraded.
+x/xorg-server-xvfb-1.9.4-x86_64-1.txz:  Upgraded.
+x/xrdb-1.0.8-x86_64-1.txz:  Upgraded.
+x/xterm-268-x86_64-1.txz:  Upgraded.
+xap/geeqie-1.0-x86_64-2.txz:  Rebuilt.
+xap/gimp-2.6.11-x86_64-2.txz:  Rebuilt.
 isolinux/initrd.img:  Rebuilt.
 kernels/*:  Upgraded.
+pasture/mesa-7.8.2-x86_64-1.txz:  Added.
+  This might be more stable for certain older video chipsets.
+pasture/xf86-video-ati-6.13.2-x86_64-1.txz:  Added.
+  Provide an alternate ATI driver in case of problems with the latest one.
+testing/packages/mesa-7.10_92a619b-x86_64-1.txz:  Upgraded.
+  There have been some strange bugs reported with Mesa-7.10, and on my own
+  machine I have noticed occasional freezes when X is running, even at the
+  text console.  These effects are not happening when Mesa-7.9 is used
+  instead, so we'll put Mesa-7.10 in /testing for now.
+testing/packages/mozilla-firefox-4.0b11-x86_64-1.txz:  Upgraded.
 usb-and-pxe-installers/usbboot.img:  Rebuilt.
 +--------------------------+
-Tue Mar 16 19:16:29 UTC 2010
-e/emacs-23.1-x86_64-2.txz:  Rebuilt.
-+--------------------------+
-Tue Mar 16 04:59:28 UTC 2010
-e/emacs-23.1-x86_64-1.txz:  Upgraded.
-+--------------------------+
-Sat Mar 13 02:08:44 UTC 2010
-a/lvm2-2.02.62-x86_64-1.txz:  Upgraded.
-a/ntfs-3g-2010.3.6-x86_64-1.txz:  Upgraded.
-ap/lsof-4.83-x86_64-1.txz:  Upgraded.
-ap/sqlite-3.6.23-x86_64-1.txz:  Upgraded.
-d/git-1.7.0.2-x86_64-1.txz:  Upgraded.
-l/hal-0.5.14-x86_64-2.txz:  Rebuilt.
-l/parted-2.2-x86_64-1.txz:  Upgraded.
-n/dhcp-4.1.1-x86_64-2.txz:  Rebuilt.
-  Add PATH setting to /sbin/dhclient-script.
-n/dhcpcd-5.2.1-x86_64-1.txz:  Upgraded.
-n/iproute2-2.6.33-x86_64-1.txz:  Upgraded.
-n/iptables-1.4.7-x86_64-1.txz:  Upgraded.
-n/samba-3.5.1-x86_64-1.txz:  Upgraded.
-  This fixes a security flaw present in Samba 3.3.11, 3.4.6, and 3.5.0
-  that allows nmbd processes filesystem access when permissions should
-  have denied it.  For more information, see:
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-0728
-  (* Security fix *)
-xap/xfce4-power-manager-0.8.5-x86_64-1.txz:  Upgraded.
-+--------------------------+
-Fri Mar 12 05:57:50 UTC 2010
-a/cpufrequtils-007-x86_64-1.txz:  Added.
-ap/vim-7.2.394-x86_64-1.txz:  Upgraded.
-  Also updated the runtime syntax files.
-l/freetype-2.3.12-x86_64-1.txz:  Upgraded.
-l/gst-plugins-good-0.10.21-x86_64-1.txz:  Upgraded.
-l/gst-plugins-base-0.10.28-x86_64-1.txz:  Upgraded.
-l/gstreamer-0.10.28-x86_64-1.txz:  Upgraded.
-n/mcabber-0.9.10-x86_64-1.txz:  Upgraded.
-x/mesa-7.7-x86_64-3.txz:  Rebuilt.
-  Removed --enable-gallium-intel from ./configure.
-x/xdm-1.1.9-x86_64-2.txz:  Rebuilt.
-  Added missing /var/lib/xdm directory.
-xap/geeqie-1.0-x86_64-1.txz:  Added.
-  This fork of GQview is actively maintained, and seems improved.
-xap/gqview-2.1.5-x86_64-2.txz:  Removed.
-xap/vim-gvim-7.2.394-x86_64-1.txz:  Upgraded.
-extra/bash-completion/bash-completion-1.1-noarch-3.txz:  Rebuilt.
-  Fixed txz completion for pkgtools.
-+--------------------------+
-Wed Mar 10 22:38:18 UTC 2010
-xap/pidgin-2.6.6-x86_64-1.txz:  Upgraded.
-  This fixes a few denial-of-service flaws as well as other bugs.
-  For more information, see:
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-0277
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-0420
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-0423
-  (* Security fix *)
-+--------------------------+
-Tue Mar  9 21:31:21 UTC 2010
-a/openssl-solibs-0.9.8m-x86_64-2.txz:  Rebuilt.
-n/openssl-0.9.8m-x86_64-2.txz:  Rebuilt.
-  The OpenSSL package has been patched and recompiled to revert a change that
-  broke decrypting some files encrypted with previous versions of OpenSSL.
-  This same fix appears in the latest upstream snapshots.
-+--------------------------+
-Mon Mar  8 20:49:02 UTC 2010
-ap/cupsddk-1.2.3-x86_64-2.txz:  Removed.
-  The CUPS Driver Development Kit (DDK) is part of the main CUPS package now.
-ap/hplip-3.10.2-x86_64-1.txz:  Upgraded.
-n/httpd-2.2.15-x86_64-1.txz:  Upgraded.
-  This update addresses a few security issues.
-  mod_ssl: A partial fix for the TLS renegotiation prefix injection attack
-    by rejecting any client-initiated renegotiations.
-  mod_proxy_ajp: Respond with HTTP_BAD_REQUEST when the body is not sent
-    when request headers indicate a request body is incoming; not a case of
-    HTTP_INTERNAL_SERVER_ERROR.
-  mod_isapi: Do not unload an isapi .dll module until the request processing
-    is completed, avoiding orphaned callback pointers.
-    [This is the most serious flaw, but does not affect Linux systems]
+Tue Feb  1 07:24:07 UTC 2011
+x/dmxproto-2.3.1-noarch-1.txz:  Upgraded.
+x/evieext-1.1.1-noarch-1.txz:  Upgraded.
+x/libX11-1.4.1-x86_64-1.txz:  Upgraded.
+x/libXaw-1.0.9-x86_64-1.txz:  Upgraded.
+x/libXi-1.4.1-x86_64-1.txz:  Upgraded.
+x/libXp-1.0.1-x86_64-1.txz:  Upgraded.
+x/libXxf86misc-1.0.3-x86_64-1.txz:  Upgraded.
+x/pixman-0.20.2-x86_64-1.txz:  Upgraded.
+x/printproto-1.0.5-noarch-1.txz:  Upgraded.
+x/rendercheck-1.4-x86_64-1.txz:  Upgraded.
+x/resourceproto-1.1.1-noarch-1.txz:  Upgraded.
+x/twm-1.0.6-x86_64-1.txz:  Upgraded.
+x/x11perf-1.5.3-x86_64-1.txz:  Upgraded.
+x/xbacklight-1.1.2-x86_64-1.txz:  Upgraded.
+x/xbiff-1.0.3-x86_64-1.txz:  Upgraded.
+x/xbitmaps-1.1.1-x86_64-1.txz:  Upgraded.
+x/xcalc-1.0.4.1-x86_64-1.txz:  Upgraded.
+x/xdg-user-dirs-0.13-x86_64-1.txz:  Added.
+x/xeyes-1.1.1-x86_64-1.txz:  Upgraded.
+x/xf86-input-evdev-2.6.0-x86_64-1.txz:  Upgraded.
+x/xf86-input-synaptics-1.3.0-x86_64-2.txz:  Rebuilt.
+x/xf86-video-intel-2.14.0-x86_64-1.txz:  Upgraded.
+x/xf86-video-savage-2.3.2-x86_64-1.txz:  Upgraded.
+x/xf86driproto-2.1.1-noarch-1.txz:  Upgraded.
+x/xf86vidmodeproto-2.3.1-noarch-1.txz:  Upgraded.
+x/xineramaproto-1.2.1-noarch-1.txz:  Upgraded.
+x/xkbevd-1.1.2-x86_64-1.txz:  Upgraded.
+x/xkbprint-1.0.3-x86_64-1.txz:  Upgraded.
+x/xorg-cf-files-1.0.4-noarch-1.txz:  Upgraded.
+x/xorg-docs-1.6-noarch-1.txz:  Upgraded.
+x/xorg-server-1.9.3-x86_64-1.txz:  Upgraded.
+x/xorg-server-xephyr-1.9.3-x86_64-1.txz:  Upgraded.
+x/xorg-server-xnest-1.9.3-x86_64-1.txz:  Upgraded.
+x/xorg-server-xvfb-1.9.3-x86_64-1.txz:  Upgraded.
+x/xorg-sgml-doctools-1.6-x86_64-1.txz:  Upgraded.
+x/xproto-7.0.20-noarch-1.txz:  Upgraded.
+  Thanks to Robby Workman for these X updates!
+xap/x11-ssh-askpass-1.2.4.1-x86_64-2.txz:  Rebuilt.
+  Fixed manpage link.  Thanks to Mikhail Zotov.
++--------------------------+
+Mon Jan 31 06:06:45 UTC 2011
+a/file-5.05-x86_64-1.txz:  Upgraded.
+a/lvm2-2.02.82-x86_64-1.txz:  Upgraded.
+a/ntfs-3g-2011.1.15-x86_64-1.txz:  Upgraded.
+a/smartmontools-5.40-x86_64-1.txz:  Upgraded.
+a/usb_modeswitch-1.1.6-x86_64-1.txz:  Upgraded.
+ap/groff-1.21-x86_64-1.txz:  Upgraded.
+ap/hplip-3.11.1-x86_64-1.txz:  Upgraded.
+  Thanks to Robby Workman.
+l/cairo-1.10.2-x86_64-1.txz:  Upgraded.
+l/eggdbus-0.6-x86_64-1.txz:  Removed.
+  This is no longer used by anything.  Thanks to Andrew Brouwers.
+l/fuse-2.8.5-x86_64-1.txz:  Upgraded.
+l/gst-plugins-base-0.10.32-x86_64-1.txz:  Upgraded.
+l/gst-plugins-good-0.10.27-x86_64-1.txz:  Upgraded.
+l/gstreamer-0.10.32-x86_64-1.txz:  Upgraded.
+l/libpng-1.4.5-x86_64-1.txz:  Upgraded.
+l/seamonkey-solibs-2.1b1-x86_64-3.txz:  Rebuilt.
+  Added libnssdbm3.chk and libnssdbm3.so.  Thanks to crocket.
+n/openssh-5.7p1-x86_64-2.txz:  Rebuilt.
+  Generate ECSDA key in rc.sshd.  Thanks to ponce on LQ.
+x/libdrm-2.4.23-x86_64-1.txz:  Upgraded.
+x/mesa-7.10_84b857e-x86_64-1.txz:  Upgraded.
+x/xf86-video-nouveau-8bb82312-x86_64-1.txz:  Upgraded.
+  This is the actual nouveau driver, added to the main tree for the first time.
+  If you do not want to use this, use upgradepkg to switch to the blacklist
+  package in /extra.
+xap/gnuchess-5.08-x86_64-1.txz:  Upgraded.
+  Upgraded to gnuchess-5.08 and xboard-4.4.4.
+xap/seamonkey-2.1b1-x86_64-3.txz:  Rebuilt.
+extra/xf86-video-nouveau-blacklist/xf86-video-nouveau-blacklist-noarch-1.txz:
+  Moved from xap.
+  This package replaces the xf86-video-nouveau with a config file in
+  /etc/modprobe.d/ that prevents the kernel from loading the nouveau driver.
+  You'll want to use this instead of the xf86-video-nouveau package in xap/ if
+  you plan on using the proprietary X driver from nVidia.
++--------------------------+
+Thu Jan 27 01:53:26 UTC 2011
+a/hdparm-9.37-x86_64-1.txz:  Upgraded.
+ap/linuxdoc-tools-0.9.66-x86_64-7.txz:  Rebuilt.
+ap/sox-14.3.1-x86_64-2.txz:  Rebuilt.
+  Recompiled to link with libsndfile.  Thanks to David Somero.
+d/git-1.7.3.5-x86_64-2.txz:  Rebuilt.
+d/perl-5.12.3-x86_64-1.txz:  Upgraded.
+d/subversion-1.6.15-x86_64-2.txz:  Rebuilt.
+d/swig-1.3.38-x86_64-2.txz:  Rebuilt.
+kde/k3b-2.0.2-x86_64-2.txz:  Rebuilt.
+  Recompiled to include k3blibsndfiledecoder.so.  Thanks to David Somero.
+kde/kdebindings-4.5.5-x86_64-2.txz:  Rebuilt.
+kdei/kde-l10n-*-4.5.5-noarch-3.txz:  Rebuilt.
+  Fixed accidentally reverting the kdepimlibs translations from 4.5.5 to 4.4.5.
+  Thanks to Eric Hameleers for noticing this.
+l/libsamplerate-0.1.7-x86_64-2.txz:  Rebuilt.
+  Linked sndfile-resample with libsndfile.  Thanks to David Somero.
+l/pilot-link-0.12.5-x86_64-3.txz:  Rebuilt.
+n/bluez-4.87-x86_64-1.txz:  Upgraded.
+n/irssi-0.8.15-x86_64-3.txz:  Rebuilt.
+n/net-snmp-5.6-x86_64-2.txz:  Rebuilt.
+n/ntp-4.2.6p3-x86_64-1.txz:  Upgraded.
+  In the sample ntp.conf, correct and then comment out the lines for
+  multicast so that they do not interfere with normal use.
+  Improve the comments.
+  Thanks to Marin Glibic and Xavier Belanger.
+n/obexftp-0.23-x86_64-5.txz:  Rebuilt.
+n/openssh-5.7p1-x86_64-1.txz:  Upgraded.
+testing/packages/mozilla-firefox-4.0b10-x86_64-1.txz:  Upgraded.
+xap/imagemagick-6.6.6_10-x86_64-1.txz:  Upgraded.
+xap/pidgin-2.7.9-x86_64-3.txz:  Rebuilt.
+xap/xchat-2.8.8-x86_64-3.txz:  Rebuilt.
++--------------------------+
+Sun Jan 23 08:32:10 UTC 2011
+a/sysvinit-scripts-1.2-noarch-36.txz:  Rebuilt.
+  Fixed unlocking non-root encrypted partitions in rc.S.
+  Thanks to Mikhail Zotov.
+  Updated /sbin/rescan-scsi-bus.
+ap/moc-2.5.0_alpha4-x86_64-1.txz:  Added.
+  This is the MOC console audio player.
+l/aalib-1.4rc5-x86_64-3.txz:  Rebuilt.
+  Adjusted path to libtool scripts.  Thanks to Matteo Bernardini.
+l/libsndfile-1.0.23-x86_64-1.txz:  Added.
+  Needed for WAV support in audacious and moc.
+n/pssh-2.2-x86_64-1.txz:  Upgraded.
+  Install psshlib to proper directory.  Thanks to Matteo Bernardini.
+xap/audacious-2.4.3-x86_64-1.txz:  Upgraded.
+xap/audacious-plugins-2.4.3-x86_64-1.txz:  Upgraded.
++--------------------------+
+Sat Jan 22 23:12:20 UTC 2011
+a/util-linux-ng-2.18-x86_64-2.txz:  Rebuilt.
+  Fix partition type entry in cfdisk.  Thanks to Mario.
++--------------------------+
+Sat Jan 22 06:01:13 UTC 2011
+a/coreutils-8.9-x86_64-1.txz:  Upgraded.
+a/cryptsetup-1.2.0-x86_64-1.txz:  Upgraded.
+a/cups-1.4.6-x86_64-1.txz:  Upgraded.
+a/lvm2-2.02.81-x86_64-1.txz:  Upgraded.
+ap/pm-utils-1.4.1-x86_64-2.txz:  Rebuilt.
+  Set better performance after waking the hard drive.
+  Thanks to Robby Workman.
+d/binutils-2.21.51.0.6-x86_64-1.txz:  Upgraded.
+d/git-1.7.3.5-x86_64-1.txz:  Upgraded.
+d/oprofile-0.9.6-x86_64-5.txz:  Rebuilt.
+kde/kdepimlibs-4.5.5-x86_64-2.txz:  Rebuilt.
+  Patched imap4.cpp to avoid problems with glibc's new memcpy().
+l/shared-mime-info-0.90-x86_64-1.txz:  Upgraded.
+n/lftp-4.1.3-x86_64-1.txz:  Upgraded.
+n/ncftp-3.2.5-x86_64-1.txz:  Upgraded.
+n/rfkill-0.4-x86_64-1.txz:  Added.
+x/xdg-utils-1.1.0_rc1-noarch-1.txz:  Upgraded.
++--------------------------+
+Wed Jan 19 21:23:28 UTC 2011
+kdei/kde-l10n-*-4.5.5-noarch-2.txz:  Rebuilt.
+  Merged in missing kdepim translations taken from kde-l10n-4.4.5.
++--------------------------+
+Sun Jan 16 17:58:55 UTC 2011
+kde/k3b-2.0.2-x86_64-1.txz:  Upgraded.
+l/libgpod-0.8.0-x86_64-2.txz:  Rebuilt.
+  Fix bad /tmp permissions caused by a DESTDIR bug.
+  Disable HAL and use udev instead.
++--------------------------+
+Sat Jan 15 20:43:54 UTC 2011
+kde/amarok-2.4.0-x86_64-1.txz:  Upgraded.
+l/libgpod-0.8.0-x86_64-1.txz:  Upgraded.
+l/liblastfm-0.3.3_f0b3239-x86_64-1.txz:  Upgraded.
+l/libplist-1.3-x86_64-1.txz:  Added.
++--------------------------+
+Sat Jan 15 04:41:49 UTC 2011
+kde/kdevelop-4.1.2-x86_64-1.txz:  Upgraded.
+kde/kdevplatform-1.1.2-x86_64-1.txz:  Upgraded.
+testing/packages/mozilla-firefox-4.0b9-x86_64-1.txz:  Upgraded.
++--------------------------+
+Tue Jan 11 23:14:10 UTC 2011
+d/ccache-3.1.4-x86_64-1.txz:  Upgraded.
+d/doxygen-1.7.3-x86_64-1.txz:  Upgraded.
+d/guile-1.8.8-x86_64-1.txz:  Upgraded.
+d/intltool-0.41.1-x86_64-1.txz:  Upgraded.
+d/mercurial-1.7.3-x86_64-1.txz:  Upgraded.
+d/nasm-2.09.04-x86_64-1.txz:  Upgraded.
+d/yasm-1.1.0-x86_64-1.txz:  Added.
+  Moved from /extra.
++--------------------------+
+Mon Jan 10 21:41:43 UTC 2011
+a/cxxlibs-6.0.14-x86_64-1.txz:  Upgraded.
+a/glibc-solibs-2.12.2-x86_64-1.txz:  Upgraded.
+a/glibc-zoneinfo-2.12.2-noarch-1.txz:  Upgraded.
+a/kernel-firmware-2.6.35.10-noarch-1.txz:  Upgraded.
+a/kernel-generic-2.6.35.10-x86_64-1.txz:  Upgraded.
+a/kernel-huge-2.6.35.10-x86_64-1.txz:  Upgraded.
+a/kernel-modules-2.6.35.10-x86_64-1.txz:  Upgraded.
+a/libcgroup-0.37-x86_64-1.txz:  Added.
+a/udev-165-x86_64-2.txz:  Rebuilt.
+  Revert patch to use ata_id, not scsi_id, on ATAPI devices.
+  Using ata_id on ATAPI devices can crash the kernel when udev starts at boot.
+  Thanks to EdGr on LQ for tracking down the responsible commit.
+ap/powertop-1.13-x86_64-1.txz:  Upgraded.
+d/binutils-2.21.51.0.5-x86_64-1.txz:  Upgraded.
+  Ian Lance Taylor's new ELF linker called 'gold' is now included in the
+  binutils package.  The traditional GNU ld remains the default.  To use
+  the gold linker instead, change the /usr/bin/ld symlink to point to ld.gold.
+  Note that gold can not (yet) compile a working Linux kernel.
+d/cmake-2.8.3-x86_64-1.txz:  Upgraded.
+d/gcc-4.5.2-x86_64-1.txz:  Upgraded.
+d/gcc-g++-4.5.2-x86_64-1.txz:  Upgraded.
+d/gcc-gfortran-4.5.2-x86_64-1.txz:  Upgraded.
+d/gcc-gnat-4.5.2-x86_64-1.txz:  Upgraded.
+d/gcc-java-4.5.2-x86_64-1.txz:  Upgraded.
+d/gcc-objc-4.5.2-x86_64-1.txz:  Upgraded.
+d/kernel-headers-2.6.35.10-x86-1.txz:  Upgraded.
+d/oprofile-0.9.6-x86_64-4.txz:  Rebuilt.
+d/ruby-1.9.1_p430-x86_64-2.txz:  Rebuilt.
+  [note, the problem described below does not seem to affect x86_64 but the
+   package was rebuilt anyway to keep things consistent]
+  Forgot to do the magic dance.  Thanks to Vincent Batts.
+  The magic dance involves rebuilding ruby the exact same way until the
+  resulting package works for this test:  ruby -e 'require "dl"'
+  Eight tries were needed to obtain a working package.
+k/kernel-source-2.6.35.10-noarch-1.txz:  Upgraded.
+kde/kaudiocreator-r1212483-x86_64-1.txz:  Upgraded.
+kde/kdeaccessibility-4.5.5-x86_64-1.txz:  Upgraded.
+kde/kdeadmin-4.5.5-x86_64-1.txz:  Upgraded.
+kde/kdeartwork-4.5.5-x86_64-1.txz:  Upgraded.
+kde/kdebase-4.5.5-x86_64-1.txz:  Upgraded.
+kde/kdebase-runtime-4.5.5-x86_64-1.txz:  Upgraded.
+kde/kdebase-workspace-4.5.5-x86_64-1.txz:  Upgraded.
+kde/kdebindings-4.5.5-x86_64-1.txz:  Upgraded.
+kde/kdeedu-4.5.5-x86_64-1.txz:  Upgraded.
+kde/kdegames-4.5.5-x86_64-1.txz:  Upgraded.
+kde/kdegraphics-4.5.5-x86_64-1.txz:  Upgraded.
+kde/kdelibs-4.5.5-x86_64-1.txz:  Upgraded.
+kde/kdemultimedia-4.5.5-x86_64-1.txz:  Upgraded.
+kde/kdenetwork-4.5.5-x86_64-1.txz:  Upgraded.
+kde/kdepimlibs-4.5.5-x86_64-1.txz:  Upgraded.
+kde/kdeplasma-addons-4.5.5-x86_64-1.txz:  Upgraded.
+kde/kdesdk-4.5.5-x86_64-1.txz:  Upgraded.
+kde/kdetoys-4.5.5-x86_64-1.txz:  Upgraded.
+kde/kdeutils-4.5.5-x86_64-1.txz:  Upgraded.
+kde/kdewebdev-4.5.5-x86_64-1.txz:  Upgraded.
+kde/ktorrent-4.0.5-x86_64-1.txz:  Upgraded.
+kde/libktorrent-1.0.5_3-x86_64-1.txz:  Upgraded.
+kde/oxygen-icons-4.5.5-x86_64-1.txz:  Upgraded.
+kdei/*:  Upgraded.
+l/glibc-2.12.2-x86_64-1.txz:  Upgraded.
+l/glibc-i18n-2.12.2-x86_64-1.txz:  Upgraded.
+l/glibc-profile-2.12.2-x86_64-1.txz:  Upgraded.
+l/libxml2-2.7.8-x86_64-3.txz:  Rebuilt.
+l/qt-4.7.0_7abde40-x86_64-2.txz:  Rebuilt.
+  Added an upstream patch for QSortFilterProxyModel.
+l/zlib-1.2.5-x86_64-3.txz:  Rebuilt.
+  Moved from /testing.
+  Patched to address a problem with zlib/libxml2 interaction.
+n/php-5.3.5-x86_64-1.txz:  Upgraded.
+  This update fixes an infinite loop with conversions from string to double
+  that may result in a denial of service.
   For more information, see:
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3555
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-0408
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-0425
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-4645
   (* Security fix *)
-n/openssh-5.4p1-x86_64-1.txz:  Upgraded.
-+--------------------------+
-Sun Mar  7 21:44:07 UTC 2010
-a/kernel-huge-2.6.33-x86_64-2.txz:  Rebuilt.
-  Adjusted the config to improve kernel module compatibility.
-l/libarchive-2.8.0-x86_64-1.txz:  Upgraded.
+xap/audacious-2.4.2-x86_64-1.txz:  Upgraded.
+xap/audacious-plugins-2.4.2-x86_64-1.txz:  Upgraded.
+xap/xchat-2.8.8-x86_64-2.txz:  Rebuilt.
 isolinux/initrd.img:  Rebuilt.
-kernels/*:  Rebuilt.
+kernels/*:  Upgraded.
 usb-and-pxe-installers/usbboot.img:  Rebuilt.
 +--------------------------+
-Sat Mar  6 06:46:22 UTC 2010
-a/aaa_elflibs-13.013-x86_64-4.txz:  Rebuilt.
-  Updated libcurl.so.4.2.0.
-d/git-1.7.0.1-x86_64-1.txz:  Upgraded.
-l/apr-1.3.9-x86_64-1.txz:  Upgraded.
-l/apr-util-1.3.9-x86_64-2.txz:  Rebuilt.
-l/raptor-1.4.21-x86_64-1.txz:  Upgraded.
-n/alpine-2.00-x86_64-3.txz:  Rebuilt.
-n/autofs-5.0.5-x86_64-1.txz:  Upgraded.
-n/curl-7.20.0-x86_64-1.txz:  Upgraded.
-n/dirmngr-1.0.3-x86_64-2.txz:  Rebuilt.
-n/gnupg-1.4.10-x86_64-1.txz:  Upgraded.
-n/gnupg2-2.0.14-x86_64-2.txz:  Rebuilt.
-n/gpgme-1.2.0-x86_64-1.txz:  Upgraded.
-n/httpd-2.2.14-x86_64-2.txz:  Rebuilt.
-n/libassuan-1.0.5-x86_64-1.txz:  Upgraded.
-n/libgcrypt-1.4.5-x86_64-1.txz:  Upgraded.
-n/libksba-1.0.7-x86_64-1.txz:  Upgraded.
-n/php-5.2.13-x86_64-1.txz:  Upgraded.
-n/pinentry-0.8.0-x86_64-1.txz:  Upgraded.
-x/mesa-7.7-x86_64-2.txz:  Rebuilt.
-  Recompiled with an upstream fix for a crash in driNewRenderbuffer().
-  Thanks to David Houlden for the bug report.
-x/xf86-input-penmount-1.4.1-x86_64-1.txz:  Upgraded.
-x/xf86-video-ati-6.12.5-x86_64-1.txz:  Upgraded.
-xap/mozilla-thunderbird-3.0.3-x86_64-1.txz:  Upgraded.
-  This upgrade fixes some more security bugs.
+Sun Jan  2 05:11:14 UTC 2011
+ap/foomatic-filters-4.0.6-x86_64-1.txz:  Upgraded.
+ap/hplip-3.10.9-x86_64-2.txz:  Rebuilt.
+ap/linuxdoc-tools-0.9.66-x86_64-6.txz:  Rebuilt.
+ap/vim-7.3.094-x86_64-1.txz:  Upgraded.
+d/git-1.7.3.4-x86_64-2.txz:  Rebuilt.
+d/perl-5.12.2-x86_64-1.txz:  Upgraded.
+d/ruby-1.9.1_p430-x86_64-1.txz:  Upgraded.
+d/subversion-1.6.15-x86_64-1.txz:  Upgraded.
+kde/kdebindings-4.5.4-x86_64-4.txz:  Rebuilt.
+l/pilot-link-0.12.5-x86_64-2.txz:  Rebuilt.
+l/slang-2.2.3-x86_64-1.txz:  Upgraded.
+l/taglib-1.6.3-x86_64-1.txz:  Upgraded.
+n/gnutls-2.10.4-x86_64-1.txz:  Upgraded.
+n/irssi-0.8.15-x86_64-2.txz:  Rebuilt.
+n/net-snmp-5.6-x86_64-1.txz:  Upgraded.
+n/ntp-4.2.6p2-x86_64-1.txz:  Upgraded.
+n/obexftp-0.23-x86_64-4.txz:  Rebuilt.
+n/openldap-client-2.4.23-x86_64-1.txz:  Upgraded.
+xap/imagemagick-6.6.6_9-x86_64-1.txz:  Upgraded.
+xap/pidgin-2.7.9-x86_64-2.txz:  Rebuilt.
+xap/vim-gvim-7.3.094-x86_64-1.txz:  Upgraded.
++--------------------------+
+Fri Dec 31 20:27:47 UTC 2010
+a/coreutils-8.8-x86_64-1.txz:  Upgraded.
+a/e2fsprogs-1.41.14-x86_64-1.txz:  Upgraded.
+ap/gphoto2-2.4.10-x86_64-1.txz:  Upgraded.
+ap/lsscsi-0.24-x86_64-1.txz:  Upgraded.
+ap/mpg123-1.13.0-x86_64-1.txz:  Upgraded.
+kde/koffice-2.3.0-x86_64-1.txz:  Upgraded.
+kdei/koffice-l10n-*:  Upgraded.
+l/libgphoto2-2.4.10.1-x86_64-1.txz:  Upgraded.
+l/system-config-printer-1.2.5-x86_64-1.txz:  Upgraded.
+n/dhcpcd-5.2.9-x86_64-1.txz:  Upgraded.
++--------------------------+
+Wed Dec 29 04:04:59 UTC 2010
+kde/kdebindings-4.5.4-x86_64-3.txz:  Rebuilt.
+  Fixed pykdeuic4 compiler to work with PyQt 4.8.x.
+kde/kdepim-4.4.9-x86_64-1.txz:  Upgraded.
+kde/kdepim-runtime-4.4.9-x86_64-1.txz:  Upgraded.
+kde/skanlite-0.7-x86_64-1.txz:  Upgraded.
++--------------------------+
+Tue Dec 28 20:14:11 UTC 2010
+ap/ghostscript-9.00-x86_64-2.txz:  Rebuilt.
+  Added upstream patch to fix joining PDF files.
+  Thanks to rvdboom on LQ.
+n/bluez-4.84-x86_64-1.txz:  Upgraded.
++--------------------------+
+Mon Dec 27 18:47:35 UTC 2010
+a/mdadm-3.1.4-x86_64-1.txz:  Upgraded.
+xap/pidgin-2.7.9-x86_64-1.txz:  Upgraded.
+  Fixed denial-of-service flaw in the MSN protocol.
+  (* Security fix *)
++--------------------------+
+Fri Dec 24 00:53:19 UTC 2010
+a/acpid-2.0.7-x86_64-1.txz:  Upgraded.
+a/dbus-1.4.1-x86_64-1.txz:  Upgraded.
+a/lvm2-2.02.79-x86_64-1.txz:  Upgraded.
+a/mkinitrd-1.4.6-x86_64-2.txz:  Rebuilt.
+  Properly handle module options.  Thanks to crocket.
+l/freetype-2.4.4-x86_64-1.txz:  Upgraded.
+n/bluez-4.81-x86_64-1.txz:  Upgraded.
+n/php-5.3.4-x86_64-1.txz:  Upgraded.
+  This fixes many bugs, including some security issues.
+  For more information, see:
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-2950
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-3436
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-3710
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-4150
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-4409
+  (* Security fix *)
+n/proftpd-1.3.3d-x86_64-1.txz:  Upgraded.
+  This update fixes an unbounded copy operation in sql_prepare_where() that
+  could be exploited to execute arbitrary code.  However, this only affects
+  servers that use the sql_mod module (which Slackware does not ship), and
+  in addition the ability to exploit this depends on an SQL injection bug
+  that was already fixed in proftpd-1.3.2rc2 (this according to upstream).
+  So in theory, this fix should only be of academic interest.
+  But in practice, better safe than sorry.
+  (* Security fix *)
++--------------------------+
+Wed Dec 22 01:55:12 UTC 2010
+ap/cdrtools-3.01a02-x86_64-1.txz:  Upgraded.
+l/seamonkey-solibs-2.1b1-x86_64-2.txz:  Rebuilt.
+  Added libmozsqlite3.so, needed by rpm.
+xap/seamonkey-2.1b1-x86_64-2.txz:  Rebuilt.
+testing/packages/mozilla-firefox-4.0b8-x86_64-1.txz:  Upgraded.
++--------------------------+
+Sun Dec 19 05:22:46 UTC 2010
+a/udev-165-x86_64-1.txz:  Upgraded.
+d/git-1.7.3.4-x86_64-1.txz:  Upgraded.
+  Fixes XSS in gitweb.
   For more information, see:
-    http://www.mozilla.org/security/known-vulnerabilities/thunderbird30.html
-  (* Security fix *)
-extra/bash-completion/bash-completion-1.1-noarch-2.txz:  Rebuilt.
-  Patched to recognize bash-4.
-+--------------------------+
-Tue Mar  2 19:07:31 UTC 2010
-a/aaa_elflibs-13.013-x86_64-3.txz:  Rebuilt.
-a/coreutils-8.4-x86_64-2.txz:  Rebuilt.
-  Use --without-gmp, at least for now.  We don't want utilities in /bin
-  requiring a library in /usr/lib{,64} that may not be available.
-l/gtk+2-2.18.7-x86_64-2.txz:  Rebuilt.
-l/libpng-1.4.1-x86_64-2.txz:  Rebuilt.
-  Now with less rat.
-xap/xchat-2.8.6-x86_64-5.txz:  Rebuilt.
-+--------------------------+
-Mon Mar  1 22:43:53 UTC 2010
-Hey folks, we have a whole bunch of updates!  Huge thanks to Robby Workman,
-Eric Hameleers, and Piter Punk for all the help.  :-)
-a/aaa_elflibs-13.013-x86_64-2.txz:  Rebuilt.
-a/acpid-2.0.2-x86_64-1.txz:  Upgraded.
-a/bash-4.1.002-x86_64-1.txz:  Upgraded.
-a/coreutils-8.4-x86_64-1.txz:  Upgraded.
-a/cups-1.4.2-x86_64-1.txz:  Upgraded.
-  Patched for the new lvm2.  Thanks to Piter Punk.
-a/cxxlibs-6.0.13-x86_64-1.txz:  Upgraded.
-a/dbus-1.2.16-x86_64-1.txz:  Upgraded.
-a/dcron-4.4-x86_64-1.txz:  Upgraded.
-a/device-mapper-1.02.28-x86_64-1.txz:  Removed.
-  This is now included in lvm2.
-a/e2fsprogs-1.41.10-x86_64-1.txz:  Upgraded.
-a/etc-13.013-x86_64-1.txz:  Rebuilt.
-  Removed root from several groups in /etc/group where the group is only used
-  for root-owned files anyway.  Updated /etc/services.
-a/file-5.04-x86_64-1.txz:  Upgraded.
-a/glibc-solibs-2.11.1-x86_64-2.txz:  Rebuilt.
-a/glibc-zoneinfo-2.11.1-noarch-2.txz:  Rebuilt.
-  Upgraded to tzcode2010a and tzdata2010b.
-a/gzip-1.4-x86_64-1.tgz:  Upgraded.
-  gzip -d could segfault and/or clobber the stack, possibly leading to
-  arbitrary code execution.  This affects x86_64 but not 32-bit systems.
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-3906
+  (* Security fix *)
+l/ConsoleKit-0.4.3-x86_64-1.txz:  Upgraded.
+l/jre-6u23-x86_64-1.txz:  Upgraded.
+l/phonon-mplayer-20101213-x86_64-1.txz:  Added.
+  To use this, go into the KDE system settings > Multimedia > Phonon >
+  Backend, and move the mplayer phonon backend to the highest priority.
+  Thanks to Eric Hameleers.
+xap/MPlayer-20101218-x86_64-1.txz:  Upgraded.
+extra/jdk-6/jdk-6u23-x86_64-1.txz:  Upgraded.
++--------------------------+
+Thu Dec 16 18:57:05 UTC 2010
+a/aaa_elflibs-13.2-x86_64-5.txz:  Rebuilt.
+a/cups-1.4.5-x86_64-2.txz:  Rebuilt.
+  Patched a locking bug that could cause print dialog crashes in Firefox
+  if gnome-vfs is installed.
+a/e2fsprogs-1.41.13-x86_64-1.txz:  Upgraded.
+a/lvm2-2.02.78-x86_64-1.txz:  Upgraded.
+a/udev-164-x86_64-4.txz:  Rebuilt.
+  Fixed /dev/root creation in rc.udev.
+  Thanks to Corrado Franco and Emanuele Tomasi from slacky.eu.
+a/usbutils-001-x86_64-1.txz:  Upgraded.
+ap/man-pages-3.32-noarch-1.txz:  Upgraded.
+d/automake-1.11.1-noarch-2.txz:  Rebuilt.
+  Compress man pages.
+d/bison-2.4.3-x86_64-2.txz:  Rebuilt.
+  Compress yacc.1.
+l/glib2-2.26.1-x86_64-2.txz:  Rebuilt.
+  Add schema compilation to the install script.
+l/gtk+2-2.22.1-x86_64-3.txz:  Rebuilt.
+  Moved system gtkrc to /etc/gtk-2.0/.  This fixes some issues with KDE.
+l/libkarma-0.1.1-x86_64-2.txz:  Rebuilt.
+  Fix manpage perms.  Thanks to Mikhail Zotov.
+l/libnotify-0.5.2-x86_64-1.txz:  Upgraded.
+n/bind-9.7.2_P3-x86_64-1.txz:  Upgraded.
+  This update fixes some security issues.
+  For more information, see:
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-3613
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-3614
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-3615
+  (* Security fix *)
+n/dhcp-4.2.0_P2-x86_64-1.txz:  Upgraded.
+n/lftp-4.1.1-x86_64-1.txz:  Upgraded.
+xap/xfce-4.6.2-x86_64-1.txz:  Upgraded.
+  Thanks to Robby Workman.
+xap/xfce4-notifyd-0077b29e-x86_64-1.txz:  Upgraded.
++--------------------------+
+Fri Dec 10 03:57:27 UTC 2010
+kde/kdebindings-4.5.4-x86_64-2.txz:  Rebuilt.
+  Moved perl modules from site_perl to vendor_perl.
+l/soprano-2.5.2-x86_64-2.txz:  Rebuilt.
+  Recompiled against JDK to enable the sesame2 backend.
+  Thanks to Eric Hameleers.
+xap/mozilla-firefox-3.6.13-x86_64-1.txz:  Upgraded.
+  This fixes some security issues.
   For more information, see:
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-0001
-  (* Security fix *)
-a/kernel-firmware-2.6.33-x86_64-1.txz:  Upgraded.
-a/kernel-generic-2.6.33-x86_64-1.txz:  Upgraded.
-a/kernel-huge-2.6.33-x86_64-1.txz:  Upgraded.
-a/kernel-modules-2.6.33-x86_64-1.txz:  Upgraded.
-a/less-436-x86_64-1.txz:  Upgraded.
-a/lilo-22.8-x86_64-15.txz:  Rebuilt.
-a/logrotate-3.7.8-x86_64-1.txz:  Upgraded.
-a/lvm2-2.02.61-x86_64-1.txz:  Upgraded.
-a/mkinitrd-1.4.3-x86_64-1.txz:  Upgraded.
-a/module-init-tools-3.11.1-x86_64-1.txz:  Upgraded.
-a/ntfs-3g-2010.1.16-x86_64-1.txz:  Upgraded.
-a/openssl-solibs-0.9.8m-x86_64-1.txz:  Upgraded.
-a/pciutils-3.1.5-x86_64-1.txz:  Upgraded.
-a/rpm2tgz-1.2-x86_64-1.txz:  Upgraded.
-  Thanks to Vincent Batts for the improvements.
-a/sdparm-1.04-x86_64-1.txz:  Upgraded.
-a/shadow-4.1.4.2-x86_64-3.txz:  Rebuilt.
-  Fixed default user group in /etc/default/useradd (100).
-a/sysvinit-scripts-1.2-noarch-31.txz:  Rebuilt.
-  Don't warn about already mounted /proc, or already activated swap.
-  Look for either tmpfs or devtmpfs when starting rc.udev.
-a/udev-151-x86_64-1.txz:  Upgraded.
-a/usbutils-0.86-x86_64-1.txz:  Upgraded.
-a/util-linux-ng-2.17.1-x86_64-1.txz:  Upgraded.
-a/xfsprogs-3.1.1-x86_64-1.txz:  Upgraded.
-ap/alsa-utils-1.0.21-x86_64-1.txz:  Upgraded.
-ap/cdrtools-2.01.01a74-x86_64-1.txz:  Upgraded.
-ap/cupsddk-1.2.3-x86_64-2.txz:  Rebuilt.
-ap/foomatic-filters-4.0.4-x86_64-1.txz:  Upgraded.
-ap/ghostscript-8.71-x86_64-1.txz:  Upgraded.
-ap/gphoto2-2.4.8-x86_64-1.txz:  Upgraded.
-ap/gutenprint-5.2.4-x86_64-2.txz:  Rebuilt.
-ap/hplip-3.9.12-x86_64-1.txz:  Upgraded.
-ap/jed-0.99_19-x86_64-1.txz:  Upgraded.
-ap/linuxdoc-tools-0.9.66-x86_64-2.txz:  Rebuilt.
-  Patched a problem with gtk-doc-1.13.  Thanks to Stuart Winter.
-ap/man-pages-3.24-noarch-1.txz:  Upgraded.
-ap/mc-20100206_git-x86_64-1.txz:  Upgraded.
-ap/mpg123-1.10.1-x86_64-1.txz:  Upgraded.
-ap/mysql-5.1.42-x86_64-1.txz:  Upgraded.
-ap/nano-2.2.3-x86_64-1.txz:  Upgraded.
-ap/pm-utils-1.2.6.1-x86_64-1.txz:  Upgraded.
-ap/sox-14.3.0-x86_64-3.txz:  Rebuilt.
-ap/sqlite-3.6.22-x86_64-1.txz:  Upgraded.
-ap/xfsdump-3.0.4-x86_64-1.txz:  Upgraded.
-d/doxygen-1.6.3-x86_64-1.txz:  Upgraded.
-d/gcc-4.4.3-x86_64-2.txz:  Rebuilt.
-d/gcc-g++-4.4.3-x86_64-2.txz:  Rebuilt.
-d/gcc-gfortran-4.4.3-x86_64-2.txz:  Rebuilt.
-d/gcc-gnat-4.4.3-x86_64-2.txz:  Rebuilt.
-d/gcc-java-4.4.3-x86_64-2.txz:  Rebuilt.
-d/gcc-objc-4.4.3-x86_64-2.txz:  Rebuilt.
-d/git-1.7.0-x86_64-1.txz:  Upgraded.
-d/guile-1.8.7-x86_64-3.txz:  Rebuilt.
-d/kernel-headers-2.6.33-x86-1.txz:  Upgraded.
-d/mercurial-1.4.3-x86_64-1.txz:  Upgraded.
-d/oprofile-0.9.6-x86_64-1.txz:  Upgraded.
-d/subversion-1.6.9-x86_64-1.txz:  Upgraded.
-k/kernel-source-2.6.33-noarch-1.txz:  Upgraded.
-kde/amarok-2.2.2-x86_64-1.txz:  Upgraded.
-kde/guidance-power-manager-4.3.3-x86_64-1.txz:  Upgraded.
-kde/k3b-1.70.0-x86_64-1.txz:  Upgraded.
-kde/kaudiocreator-r1038308-x86_64-2.txz:  Rebuilt.
-kde/kdeaccessibility-4.3.5-x86_64-1.txz:  Upgraded.
-kde/kdeadmin-4.3.5-x86_64-1.txz:  Upgraded.
-kde/kdeartwork-4.3.5-x86_64-1.txz:  Upgraded.
-kde/kdebase-4.3.5-x86_64-1.txz:  Upgraded.
-kde/kdebase-runtime-4.3.5-x86_64-1.txz:  Upgraded.
-kde/kdebase-workspace-4.3.5-x86_64-1.txz:  Upgraded.
-kde/kdebindings-4.3.5-x86_64-1.txz:  Upgraded.
-kde/kdeedu-4.3.5-x86_64-1.txz:  Upgraded.
-kde/kdegames-4.3.5-x86_64-1.txz:  Upgraded.
-kde/kdegraphics-4.3.5-x86_64-1.txz:  Upgraded.
-kde/kdelibs-4.3.5-x86_64-1.txz:  Upgraded.
-kde/kdelibs-experimental-4.3.5-x86_64-1.txz:  Upgraded.
-kde/kdemultimedia-4.3.5-x86_64-1.txz:  Upgraded.
-kde/kdenetwork-4.3.5-x86_64-1.txz:  Upgraded.
-kde/kdepim-4.3.5-x86_64-1.txz:  Upgraded.
-kde/kdepim-runtime-4.3.5-x86_64-1.txz:  Upgraded.
-kde/kdepimlibs-4.3.5-x86_64-1.txz:  Upgraded.
-kde/kdeplasma-addons-4.3.5-x86_64-1.txz:  Upgraded.
-kde/kdesdk-4.3.5-x86_64-1.txz:  Upgraded.
-kde/kdetoys-4.3.5-x86_64-1.txz:  Upgraded.
-kde/kdeutils-4.3.5-x86_64-1.txz:  Upgraded.
-kde/kdevelop-3.9.98-x86_64-1.txz:  Upgraded.
-kde/kdevplatform-0.9.98-x86_64-1.txz:  Upgraded.
-kde/kdewebdev-4.3.5-x86_64-1.txz:  Upgraded.
-kde/koffice-2.1.1-x86_64-1.txz:  Upgraded.
-kde/konq-plugins-4.3.1-x86_64-2.txz:  Rebuilt.
-kde/kopete-cryptography-1.3.0_kde4.3.3-x86_64-1.txz:  Upgraded.
-kde/ktorrent-3.3.4-x86_64-1.txz:  Upgraded.
-kde/oxygen-icons-4.3.5-x86_64-1.txz:  Upgraded.
-kde/skanlite-0.3_kde4.3.1-x86_64-2.txz:  Rebuilt.
+    http://www.mozilla.org/security/known-vulnerabilities/firefox36.html
+  (* Security fix *)
+xap/mozilla-thunderbird-3.1.7-x86_64-1.txz:  Upgraded.
+  This upgrade fixes some more security bugs.
+  For more information, see:
+    http://www.mozilla.org/security/known-vulnerabilities/thunderbird31.html
+  (* Security fix *)
++--------------------------+
+Wed Dec  8 21:37:24 UTC 2010
+kdei/kde-l10n-ia-4.5.4-noarch-2.txz:  Rebuilt.
+  New slack-desc.  Thanks to Erik Jan Tromp.
+l/zlib-1.2.5-x86_64-2.txz:  Rebuilt.
+  Added zlib.pc.
+testing/packages/zlib-1.2.5-x86_64-3.txz:  Rebuilt.
+  This is a first attempt to patch an issue with the way libxml2 uses zlib.
+  Please test.
++--------------------------+
+Tue Dec  7 18:50:58 UTC 2010
+l/libxml2-2.7.8-x86_64-2.txz:  Rebuilt.
+  Disabled shared library versioning that broke the ABI.
++--------------------------+
+Tue Dec  7 05:01:53 UTC 2010
+a/aaa_elflibs-13.2-x86_64-4.txz:  Rebuilt.
+  Added libltdl.so.7.3.0.
+a/openssl-solibs-0.9.8q-x86_64-1.txz
+  (* Security fix *)
+kde/k3b-2.0.1-x86_64-2.txz:  Rebuilt.
+  Patched to fix a settings crash with Qt 4.7.x.
+  Thanks to Grigorios Bouzakis.
+l/libspectre-0.2.5-x86_64-2.txz:  Rebuilt.
+l/libxml2-2.7.8-x86_64-1.txz:  Upgraded.
+n/openssl-0.9.8q-x86_64-1.txz:  Upgraded.
+  This OpenSSL update contains some security related bugfixes.
+  For more information, see the included CHANGES and NEWS files, and:
+    http://www.openssl.org/news/secadv_20101202.txt
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-4180
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-4252
+  (* Security fix *)
++--------------------------+
+Sat Dec  4 06:49:42 UTC 2010
+a/sysvinit-scripts-1.2-noarch-35.txz:  Rebuilt.
+  In rc.M, try to start rc.consolekit.
+ap/rpm-4.8.1-x86_64-1.txz:  Upgraded.
+kde/amarok-2.3.2-x86_64-1.txz:  Upgraded.
+kde/kdeaccessibility-4.5.4-x86_64-1.txz:  Upgraded.
+kde/kdeadmin-4.5.4-x86_64-1.txz:  Upgraded.
+kde/kdeartwork-4.5.4-x86_64-1.txz:  Upgraded.
+kde/kdebase-4.5.4-x86_64-1.txz:  Upgraded.
+kde/kdebase-runtime-4.5.4-x86_64-1.txz:  Upgraded.
+kde/kdebase-workspace-4.5.4-x86_64-1.txz:  Upgraded.
+kde/kdebindings-4.5.4-x86_64-1.txz:  Upgraded.
+kde/kdeedu-4.5.4-x86_64-1.txz:  Upgraded.
+kde/kdegames-4.5.4-x86_64-1.txz:  Upgraded.
+kde/kdegraphics-4.5.4-x86_64-1.txz:  Upgraded.
+kde/kdelibs-4.5.4-x86_64-1.txz:  Upgraded.
+kde/kdemultimedia-4.5.4-x86_64-1.txz:  Upgraded.
+kde/kdenetwork-4.5.4-x86_64-1.txz:  Upgraded.
+kde/kdepim-4.4.7-x86_64-1.txz:  Upgraded.
+kde/kdepim-runtime-4.4.7-x86_64-1.txz:  Upgraded.
+kde/kdepimlibs-4.5.4-x86_64-1.txz:  Upgraded.
+kde/kdeplasma-addons-4.5.4-x86_64-1.txz:  Upgraded.
+kde/kdesdk-4.5.4-x86_64-1.txz:  Upgraded.
+kde/kdetoys-4.5.4-x86_64-1.txz:  Upgraded.
+kde/kdeutils-4.5.4-x86_64-1.txz:  Upgraded.
+kde/kdevelop-4.1.1-x86_64-1.txz:  Upgraded.
+kde/kdevplatform-1.1.1-x86_64-1.txz:  Upgraded.
+kde/kdewebdev-4.5.4-x86_64-1.txz:  Upgraded.
+kde/konq-plugins-4.4.0-x86_64-2.txz:  Rebuilt.
+kde/ktorrent-4.0.4-x86_64-1.txz:  Upgraded.
+kde/libktorrent-1.0.4-x86_64-1.txz:  Upgraded.
+kde/oxygen-icons-4.5.4-x86_64-1.txz:  Upgraded.
 kdei/*:  Upgraded.
-l/PyQt-4.6.2-x86_64-2.txz:  Rebuilt.
-l/QScintilla-2.4-x86_64-3.txz:  Rebuilt.
-l/alsa-lib-1.0.22-x86_64-1.txz:  Upgraded.
-l/cairo-1.8.8-x86_64-2.txz:  Rebuilt.
-  Recompiled against libpng-1.4.x.
-l/djvulibre-3.5.22-x86_64-2.txz:  Rebuilt.
-l/freetype-2.3.11-x86_64-1.txz:  Upgraded.
-l/fuse-2.8.1-x86_64-1.txz:  Upgraded.
-l/gd-2.0.35-x86_64-4.txz:  Rebuilt.
-  Recompiled against libpng-1.4.x.
-l/gegl-0.1.0-x86_64-2.txz:  Rebuilt.
-l/giflib-4.1.6-x86_64-1.txz:  Added.
-l/glib2-2.22.4-x86_64-1.txz:  Upgraded.
-l/glibc-2.11.1-x86_64-2.txz:  Rebuilt.
-l/glibc-i18n-2.11.1-x86_64-2.txz:  Rebuilt.
-l/glibc-profile-2.11.1-x86_64-2.txz:  Rebuilt.
-l/gmime-2.4.15-x86_64-1.txz:  Upgraded.
-l/gmp-5.0.1-x86_64-1.txz:  Upgraded.
-l/gnome-icon-theme-2.28.0-x86_64-1.txz:  Upgraded.
-l/gst-plugins-base-0.10.26-x86_64-1.txz:  Upgraded.
-l/gst-plugins-good-0.10.18-x86_64-1.txz:  Upgraded.
-l/gstreamer-0.10.26-x86_64-1.txz:  Upgraded.
-l/gtk+2-2.18.7-x86_64-1.txz:  Upgraded.
-l/hal-0.5.14-x86_64-1.txz:  Upgraded.
-l/hal-info-20091130-noarch-1.txz:  Upgraded.
-l/imlib-1.9.15-x86_64-6.txz:  Rebuilt.
-l/jasper-1.900.1-x86_64-3.txz:  Rebuilt.
-l/lcms-1.19-x86_64-1.txz:  Upgraded.
-l/libexif-0.6.19-x86_64-1.txz:  Upgraded.
-l/libglade-2.6.4-x86_64-3.txz:  Rebuilt.
-  Recompiled against libpng-1.4.x.
-l/libgphoto2-2.4.8-x86_64-1.txz:  Upgraded.
-l/libgsf-1.14.16-x86_64-1.txz:  Upgraded.
-l/libgtkhtml-2.11.1-x86_64-2.txz:  Removed.
-l/libjpeg-v8-x86_64-1.txz:  Upgraded.
-  This changes the soname to .so.8.
-l/libmng-1.0.10-x86_64-2.txz:  Rebuilt.
-l/libnotify-0.4.5-x86_64-2.txz:  Rebuilt.
-  Recompiled against libpng-1.4.x.
-l/libogg-1.1.4-x86_64-1.txz:  Upgraded.
-l/libpng-1.4.1-x86_64-1.txz:  Upgraded.
-  Includes libpng-1.2.43 and libpng-1.4.1.
-l/librsvg-2.26.0-x86_64-3.txz:  Rebuilt.
-  Recompiled against libpng-1.4.x.
-l/libtheora-1.1.1-x86_64-1.txz:  Upgraded.
-l/libtiff-3.9.2-x86_64-1.txz:  Upgraded.
-l/libungif-4.1.4-x86_64-4.txz:  Removed.
-  Replaced by giflib.
-l/libusb-1.0.6-x86_64-1.txz:  Upgraded.
-  Also added libusb-compat-0.1.3 to the package.
-l/libv4l-0.6.1-x86_64-1.txz:  Added.
-l/libvncserver-0.9.7-x86_64-2.txz:  Rebuilt.
-l/libvorbis-1.2.3-x86_64-1.txz:  Upgraded.
-l/libwmf-0.2.8.4-x86_64-5.txz:  Rebuilt.
-  Patched to compile with libpng-1.4.x.
-l/libwmf-docs-0.2.8.4-noarch-5.txz:  Rebuilt.
-l/libwnck-2.28.0-x86_64-1.txz:  Upgraded.
-l/libxklavier-5.0-x86_64-1.txz:  Upgraded.
-l/mpfr-2.4.2p03-x86_64-1.txz:  Upgraded.
-l/netpbm-10.49.02-x86_64-1.txz:  Upgraded.
-l/notify-python-0.1.1-x86_64-1.txz:  Added.
-l/pango-1.26.2-x86_64-1.txz:  Upgraded.
-l/parted-2.1-x86_64-1.txz:  Upgraded.
-l/pil-1.1.7-x86_64-1.txz:  Upgraded.
-l/pilot-link-0.12.3-x86_64-11.txz:  Rebuilt.
-  Patched to compile with libpng-1.4.x.
-l/poppler-0.12.4-x86_64-1.txz:  Upgraded.
-  Removed Qt3 support.
-l/poppler-data-0.4.0-noarch-1.txz:  Upgraded.
-l/pycairo-1.8.8-x86_64-1.txz:  Upgraded.
-l/pycups-1.9.48-x86_64-1.txz:  Upgraded.
-l/pygobject-2.20.0-x86_64-1.txz:  Upgraded.
-l/pygtk-2.16.0-x86_64-1.txz:  Upgraded.
-l/qt-4.5.3_063bded-x86_64-4.txz:  Rebuilt.
-  Patched to compile with libpng-1.4.x.
-l/qtscriptgenerator-0.1.0-x86_64-2.txz:  Rebuilt.
-l/sdl-1.2.14-x86_64-1.txz:  Upgraded.
-  Upgraded to SDL-1.2.14, SDL_image-1.2.10, and SDL_mixer-1.2.11.
-l/seamonkey-solibs-2.0.3-x86_64-1.txz:  Upgraded.
-l/slang-2.2.2-x86_64-1.txz:  Upgraded.
-l/startup-notification-0.10-x86_64-1.txz:  Upgraded.
-l/strigi-0.7.2-x86_64-1.txz:  Upgraded.
-l/vte-0.22.5-x86_64-1.txz:  Upgraded.
-n/bluez-utils-3.36-x86_64-8.txz:  Rebuilt.
-  This will quiet down udev until we figure out if we want bluez4 yet.
-n/dhcp-4.1.1-x86_64-1.txz:  Upgraded.
-n/dhcpcd-5.1.5-x86_64-1.txz:  Upgraded.
-n/dnsmasq-2.52-x86_64-1.txz:  Upgraded.
-n/gnupg2-2.0.14-x86_64-1.txz:  Upgraded.
-n/gnutls-2.8.5-x86_64-2.txz:  Rebuilt.
-n/iptables-1.4.6-x86_64-1.txz:  Upgraded.
-n/lftp-4.0.5-x86_64-1.txz:  Upgraded.
-n/links-2.3pre1-x86_64-1.txz:  Upgraded.
-n/lynx-2.8.7-x86_64-1.txz:  Upgraded.
-n/netatalk-2.0.5-x86_64-1.txz:  Upgraded.
-n/openldap-client-2.4.21-x86_64-1.txz:  Upgraded.
-n/openssl-0.9.8m-x86_64-1.txz:  Upgraded.
+l/ConsoleKit-0.4.2-x86_64-1.txz:  Upgraded.
+l/gstreamer-0.10.31-x86_64-1.txz:  Upgraded.
+l/gst-plugins-base-0.10.31-x86_64-1.txz:  Upgraded.
+l/libarchive-2.8.4-x86_64-1.txz:  Upgraded.
+l/libgsf-1.14.19-x86_64-1.txz:  Upgraded.
+l/polkit-0.99-x86_64-1.txz:  Upgraded.
+l/polkit-gnome-0.99-x86_64-1.txz:  Upgraded.
++--------------------------+
+Tue Nov 30 23:39:25 UTC 2010
+l/akonadi-1.4.1-x86_64-2.txz:  Rebuilt.
+  Recompiled against boost-1.45.0.
+l/jre-6u22-x86_64-1.txz:  Upgraded.
+n/wpa_supplicant-0.7.3-x86_64-1.txz:  Upgraded.
+xap/pidgin-2.7.7-x86_64-1.txz:  Upgraded.
+  This update fixes connection issues for AIM and MSN.
+extra/jdk-6/jdk-6u22-x86_64-1.txz:  Upgraded.
++--------------------------+
+Mon Nov 29 22:00:24 UTC 2010
+a/coreutils-8.7-x86_64-1.txz:  Upgraded.
+a/cups-1.4.5-x86_64-1.txz:  Upgraded.
+  Fixed a memory corruption bug that could lead to a denial of service
+  or possibly execution of arbitrary code through a crafted IPP request.
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-2941
+  (* Security fix *)
+a/sysvinit-scripts-1.2-noarch-34.txz:  Rebuilt.
+  Removed unnecessary (and broken) LVM umount section of rc.6.
+  Thanks to Gary Langshaw.
+ap/ghostscript-9.00-x86_64-1.txz:  Upgraded.
+ap/gutenprint-5.2.6-x86_64-1.txz:  Upgraded.
+ap/hplip-3.10.9-x86_64-1.txz:  Upgraded.
+ap/nano-2.2.6-x86_64-1.txz:  Upgraded.
+ap/sqlite-3.7.3-x86_64-1.txz:  Upgraded.
+d/gdb-7.2-x86_64-1.txz:  Upgraded.
+d/python-2.6.6-x86_64-1.txz:  Upgraded.
+l/PyQt-4.8.1-x86_64-1.txz:  Upgraded.
+l/QScintilla-2.4.5-x86_64-1.txz:  Upgraded.
+l/boost-1.45.0-x86_64-1.txz:  Upgraded.
+l/phonon-4.4.3-x86_64-1.txz:  Upgraded.
+l/rasqal-0.9.20-x86_64-1.txz:  Upgraded.
+l/redland-1.0.12-x86_64-1.txz:  Upgraded.
+l/seamonkey-solibs-2.1b1-x86_64-1.txz:  Upgraded.
+l/sip-4.11.2-x86_64-1.txz:  Upgraded.
+n/iproute2-2.6.35-x86_64-2.txz:  Rebuilt.
+  Patched to fix "ip route get x.x.x.x returns NULL".
+  Thanks to Alan Brantley.
+x/xterm-267-x86_64-1.txz:  Upgraded.
+xap/gv-3.7.1-x86_64-1.txz:  Upgraded.
+xap/imagemagick-6.6.6_1-x86_64-1.txz:  Upgraded.
+xap/seamonkey-2.1b1-x86_64-1.txz:  Upgraded.
+  It looks like we need this for the Gecko engine update.  It is beta,
+  but it works fine here.  Certainly it's better than sticking with a
+  stable version that's broken when run against our cairo/GTK+ versions.
+pasture/gxine-0.5.905-x86_64-1.txz:  Moved to /pasture.
+  Gxine uses some really old, long deprecated, and now finally dropped
+  features of libmozjs.so, and no longer runs or compiles.  Unless someone
+  wants to port it to the new Ja:gerMonkey engine, it might be dead.
++--------------------------+
+Mon Nov 22 04:11:40 UTC 2010
+a/openssl-solibs-0.9.8p-x86_64-1.txz:  Upgraded.
+ (* Security fix *)
+ap/mysql-5.1.53-x86_64-1.txz:  Upgraded.
+l/akonadi-1.4.1-x86_64-1.txz:  Upgraded.
+l/qt-4.7.0_7abde40-x86_64-1.txz:  Upgraded.
+l/soprano-2.5.2-x86_64-1.txz:  Upgraded.
+n/openssl-0.9.8p-x86_64-1.txz:  Upgraded.
   This OpenSSL update contains some security related bugfixes.
   For more information, see the included CHANGES and NEWS files, and:
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-1678
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-1378
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-1377
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-1379
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3245
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-4355
+    http://www.openssl.org/news/secadv_20101116.txt
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-2939
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-3864
  (* Security fix *)
-n/ppp-2.4.5-x86_64-1.txz:  Upgraded.
-n/proftpd-1.3.3-x86_64-1.txz:  Upgraded.
-n/rsync-3.0.7-x86_64-1.txz:  Upgraded.
-n/samba-3.4.6-x86_64-1.txz:  Upgraded.
-n/vsftpd-2.2.2-x86_64-1.txz:  Upgraded.
-n/wget-1.12-x86_64-1.txz:  Upgraded.
-n/wpa_supplicant-0.6.10-x86_64-1.txz:  Upgraded.
-t/tetex-3.0-x86_64-7.txz:  Rebuilt.
-t/tetex-doc-3.0-x86_64-7.txz:  Rebuilt.
-t/transfig-3.2.4-x86_64-3.txz:  Rebuilt.
-  Patched to compile with libpng-1.4.x.
-t/xfig-3.2.4-x86_64-5.txz:  Rebuilt.
-  Patched to compile with libpng-1.4.x.
-x/appres-1.0.2-x86_64-1.txz:  Upgraded.
-x/bdftopcf-1.0.2-x86_64-1.txz:  Upgraded.
-x/bigreqsproto-1.1.0-noarch-1.txz:  Upgraded.
-x/bitmap-1.0.4-x86_64-1.txz:  Upgraded.
-x/compiz-0.8.4-x86_64-1.txz:  Upgraded.
-x/compositeproto-0.4.1-noarch-1.txz:  Upgraded.
-x/damageproto-1.2.0-noarch-1.txz:  Upgraded.
-x/dmxproto-2.3-noarch-1.txz:  Upgraded.
-x/dri2proto-2.3-x86_64-1.txz:  Upgraded.
-x/editres-1.0.4-x86_64-1.txz:  Upgraded.
-x/encodings-1.0.3-noarch-1.txz:  Upgraded.
-x/evieext-1.1.0-noarch-1.txz:  Upgraded.
-x/fixesproto-4.1.1-noarch-1.txz:  Upgraded.
-x/font-adobe-100dpi-1.0.1-noarch-1.txz:  Upgraded.
-x/font-adobe-75dpi-1.0.1-noarch-1.txz:  Upgraded.
-x/font-adobe-utopia-100dpi-1.0.2-noarch-1.txz:  Upgraded.
-x/font-adobe-utopia-75dpi-1.0.2-noarch-1.txz:  Upgraded.
-x/font-adobe-utopia-type1-1.0.2-noarch-1.txz:  Upgraded.
-x/font-alias-1.0.2-noarch-1.txz:  Upgraded.
-x/font-arabic-misc-1.0.1-noarch-1.txz:  Upgraded.
-x/font-bh-100dpi-1.0.1-noarch-1.txz:  Upgraded.
-x/font-bh-75dpi-1.0.1-noarch-1.txz:  Upgraded.
-x/font-bh-lucidatypewriter-100dpi-1.0.1-noarch-1.txz:  Upgraded.
-x/font-bh-lucidatypewriter-75dpi-1.0.1-noarch-1.txz:  Upgraded.
-x/font-bh-ttf-1.0.1-noarch-1.txz:  Upgraded.
-x/font-bh-type1-1.0.1-noarch-1.txz:  Upgraded.
-x/font-bitstream-100dpi-1.0.1-noarch-1.txz:  Upgraded.
-x/font-bitstream-75dpi-1.0.1-noarch-1.txz:  Upgraded.
-x/font-bitstream-speedo-1.0.1-noarch-1.txz:  Upgraded.
-x/font-bitstream-type1-1.0.1-noarch-1.txz:  Upgraded.
-x/font-cronyx-cyrillic-1.0.1-noarch-1.txz:  Upgraded.
-x/font-cursor-misc-1.0.1-noarch-1.txz:  Upgraded.
-x/font-daewoo-misc-1.0.1-noarch-1.txz:  Upgraded.
-x/font-dec-misc-1.0.1-noarch-1.txz:  Upgraded.
-x/font-ibm-type1-1.0.1-noarch-1.txz:  Upgraded.
-x/font-isas-misc-1.0.1-noarch-1.txz:  Upgraded.
-x/font-jis-misc-1.0.1-noarch-1.txz:  Upgraded.
-x/font-micro-misc-1.0.1-noarch-1.txz:  Upgraded.
-x/font-misc-cyrillic-1.0.1-noarch-1.txz:  Upgraded.
-x/font-misc-ethiopic-1.0.1-noarch-1.txz:  Upgraded.
-x/font-misc-meltho-1.0.1-noarch-1.txz:  Upgraded.
-x/font-misc-misc-1.1.0-noarch-1.txz:  Upgraded.
-x/font-mutt-misc-1.0.1-noarch-1.txz:  Upgraded.
-x/font-schumacher-misc-1.1.0-noarch-1.txz:  Upgraded.
-x/font-screen-cyrillic-1.0.2-noarch-1.txz:  Upgraded.
-x/font-sony-misc-1.0.1-noarch-1.txz:  Upgraded.
-x/font-sun-misc-1.0.1-noarch-1.txz:  Upgraded.
-x/font-util-1.1.1-x86_64-1.txz:  Upgraded.
-x/font-winitzki-cyrillic-1.0.1-noarch-1.txz:  Upgraded.
-x/font-xfree86-type1-1.0.2-noarch-1.txz:  Upgraded.
-x/fontcacheproto-0.1.3-noarch-1.txz:  Upgraded.
-x/fontconfig-2.8.0-x86_64-1.txz:  Upgraded.
-x/fontconfig-2.8.0-x86_64-1.txz:  Upgraded.
-x/fontsproto-2.1.0-noarch-1.txz:  Upgraded.
-x/glproto-1.4.11-noarch-1.txz:  Upgraded.
-x/iceauth-1.0.3-x86_64-1.txz:  Upgraded.
-x/inputproto-2.0-noarch-1.txz:  Upgraded.
-x/intel-gpu-tools-1.0.2-x86_64-1.txz:  Upgraded.
-x/kbproto-1.0.4-noarch-1.txz:  Upgraded.
-x/lbxproxy-1.0.1-x86_64-2.txz:  Removed.
-x/libICE-1.0.6-x86_64-1.txz:  Upgraded.
-x/libSM-1.1.1-x86_64-1.txz:  Upgraded.
-x/libX11-1.3.3-x86_64-1.txz:  Upgraded.
-x/libXScrnSaver-1.2.0-x86_64-1.txz:  Upgraded.
-x/libXau-1.0.5-x86_64-1.txz:  Upgraded.
-x/libXaw-1.0.7-x86_64-1.txz:  Upgraded.
-x/libXcomposite-0.4.1-x86_64-1.txz:  Upgraded.
-x/libXcursor-1.1.10-x86_64-1.txz:  Upgraded.
-x/libXdamage-1.1.2-x86_64-1.txz:  Upgraded.
-x/libXdmcp-1.0.3-x86_64-1.txz:  Upgraded.
-x/libXext-1.1-x86_64-1.txz:  Upgraded.
-x/libXfixes-4.0.4-x86_64-1.txz:  Upgraded.
-x/libXfont-1.4.1-x86_64-1.txz:  Upgraded.
-x/libXfontcache-1.0.5-x86_64-1.txz:  Upgraded.
-x/libXft-2.1.14-x86_64-1.txz:  Upgraded.
-x/libXi-1.3-x86_64-1.txz:  Upgraded.
-x/libXinerama-1.1-x86_64-1.txz:  Upgraded.
-x/libXmu-1.0.5-x86_64-1.txz:  Upgraded.
-x/libXpm-3.5.8-x86_64-1.txz:  Upgraded.
-x/libXrender-0.9.5-x86_64-1.txz:  Upgraded.
-x/libXres-1.0.4-x86_64-1.txz:  Upgraded.
-x/libXt-1.0.7-x86_64-1.txz:  Upgraded.
-x/libXtst-1.1.0-x86_64-1.txz:  Upgraded.
-x/libXv-1.0.5-x86_64-1.txz:  Upgraded.
-x/libXvMC-1.0.5-x86_64-1.txz:  Upgraded.
-x/libXxf86dga-1.1.1-x86_64-1.txz:  Upgraded.
-x/libXxf86misc-1.0.2-x86_64-1.txz:  Upgraded.
-x/libXxf86vm-1.1.0-x86_64-1.txz:  Upgraded.
-x/libdmx-1.1.0-x86_64-1.txz:  Upgraded.
-x/libdrm-2.4.18-x86_64-1.txz:  Upgraded.
-x/libfontenc-1.0.5-x86_64-1.txz:  Upgraded.
-x/liblbxutil-1.0.1-x86_64-2.txz:  Removed.
-x/libpciaccess-0.11.0-x86_64-1.txz:  Upgraded.
-x/libpthread-stubs-0.3-noarch-1.txz:  Upgraded.
-x/libxcb-1.5-x86_64-1.txz:  Upgraded.
-x/libxkbfile-1.0.6-x86_64-1.txz:  Upgraded.
-x/listres-1.0.2-x86_64-1.txz:  Upgraded.
-x/luit-1.0.5-x86_64-1.txz:  Upgraded.
-x/makedepend-1.0.2-x86_64-1.txz:  Upgraded.
-x/mesa-7.7-x86_64-1.txz:  Upgraded.
-x/mkcomposecache-1.2.1-x86_64-1.txz:  Upgraded.
-x/mkfontdir-1.0.5-noarch-1.txz:  Upgraded.
-x/mkfontscale-1.0.7-x86_64-1.txz:  Upgraded.
-x/pixman-0.16.6-x86_64-1.txz:  Upgraded.
-x/proxymngr-1.0.1-x86_64-2.txz:  Removed.
-x/randrproto-1.3.1-noarch-1.txz:  Upgraded.
-x/recordproto-1.14-noarch-1.txz:  Upgraded.
-x/resourceproto-1.1.0-noarch-1.txz:  Upgraded.
-x/scrnsaverproto-1.2.0-noarch-1.txz:  Upgraded.
-x/sessreg-1.0.5-x86_64-1.txz:  Upgraded.
-x/smproxy-1.0.3-x86_64-1.txz:  Upgraded.
-x/twm-1.0.4-x86_64-3.txz:  Rebuilt.
-x/util-macros-1.6.0-noarch-1.txz:  Upgraded.
-x/videoproto-2.3.0-noarch-1.txz:  Upgraded.
-x/viewres-1.0.2-x86_64-1.txz:  Upgraded.
-x/x11perf-1.5.1-x86_64-1.txz:  Upgraded.
-x/xauth-1.0.4-x86_64-1.txz:  Upgraded.
-x/xbacklight-1.1.1-x86_64-1.txz:  Upgraded.
-x/xbiff-1.0.2-x86_64-1.txz:  Upgraded.
-x/xbitmaps-1.1.0-noarch-1.txz:  Upgraded.
-x/xcalc-1.0.3-x86_64-1.txz:  Upgraded.
-x/xcb-proto-1.6-noarch-1.txz:  Upgraded.
-x/xcb-util-0.3.6-x86_64-1.txz:  Upgraded.
-x/xclipboard-1.1.0-x86_64-1.txz:  Upgraded.
-x/xclock-1.0.4-x86_64-1.txz:  Upgraded.
-x/xcmiscproto-1.2.0-noarch-1.txz:  Upgraded.
-x/xcmsdb-1.0.2-x86_64-1.txz:  Upgraded.
-x/xcompmgr-1.1.5-x86_64-1.txz:  Upgraded.
-x/xcursor-themes-1.0.2-noarch-1.txz:  Upgraded.
-x/xcursorgen-1.0.3-x86_64-1.txz:  Upgraded.
-x/xdm-1.1.9-x86_64-1.txz:  Upgraded.
-x/xdpyinfo-1.1.0-x86_64-1.txz:  Upgraded.
-x/xdriinfo-1.0.3-x86_64-1.txz:  Upgraded.
-x/xev-1.0.4-x86_64-1.txz:  Upgraded.
-x/xextproto-7.1.1-noarch-1.txz:  Upgraded.
-x/xeyes-1.1.0-x86_64-1.txz:  Upgraded.
-x/xf86-input-acecad-1.4.0-x86_64-1.txz:  Upgraded.
-x/xf86-input-aiptek-1.3.0-x86_64-1.txz:  Upgraded.
-x/xf86-input-citron-2.2.2-x86_64-1.txz:  Removed.
-x/xf86-input-elographics-1.2.3-x86_64-2.txz:  Removed.
-x/xf86-input-evdev-2.3.2-x86_64-1.txz:  Upgraded.
-x/xf86-input-fpit-1.3.0-x86_64-1.txz:  Removed.
-x/xf86-input-hyperpen-1.3.0-x86_64-1.txz:  Removed.
-x/xf86-input-joystick-1.4.99.2-x86_64-1.txz:  Upgraded.
-x/xf86-input-keyboard-1.4.0-x86_64-1.txz:  Upgraded.
-x/xf86-input-mouse-1.5.0-x86_64-1.txz:  Upgraded.
-x/xf86-input-mutouch-1.2.1-x86_64-2.txz:  Removed.
-x/xf86-input-penmount-1.4.0-x86_64-2.txz:  Rebuilt.
-x/xf86-input-synaptics-1.2.1-x86_64-1.txz:  Upgraded.
-x/xf86-input-vmmouse-12.6.6-x86_64-1.txz:  Upgraded.
-x/xf86-input-void-1.3.0-x86_64-1.txz:  Upgraded.
-x/xf86-input-wacom-0.10.4-x86_64-1.txz:  Upgraded.
-x/xf86-video-apm-1.2.2-x86_64-2.txz:  Rebuilt.
-x/xf86-video-ark-0.7.2-x86_64-1.txz:  Upgraded.
-x/xf86-video-ast-0.89.9-x86_64-2.txz:  Rebuilt.
-x/xf86-video-ati-6.12.4-x86_64-1.txz:  Upgraded.
-x/xf86-video-chips-1.2.2-x86_64-1.txz:  Upgraded.
-x/xf86-video-cirrus-1.3.2-x86_64-2.txz:  Rebuilt.
-x/xf86-video-dummy-0.3.3-x86_64-1.txz:  Upgraded.
-x/xf86-video-glint-1.2.4-x86_64-2.txz:  Rebuilt.
-x/xf86-video-i128-1.3.3-x86_64-2.txz:  Rebuilt.
-x/xf86-video-i740-1.3.2-x86_64-2.txz:  Rebuilt.
-x/xf86-video-intel-2.10.0-x86_64-1.txz:  Upgraded.
-x/xf86-video-mach64-6.8.2-x86_64-2.txz:  Rebuilt.
-x/xf86-video-mga-1.4.11-x86_64-2.txz:  Rebuilt.
-x/xf86-video-neomagic-1.2.4-x86_64-2.txz:  Rebuilt.
-x/xf86-video-newport-0.2.3-x86_64-1.txz:  Upgraded.
-x/xf86-video-nv-2.1.16-x86_64-1.txz:  Upgraded.
-x/xf86-video-openchrome-0.2.904-x86_64-1.txz:  Upgraded.
-x/xf86-video-r128-6.8.1-x86_64-2.txz:  Rebuilt.
-x/xf86-video-radeonhd-1.3.0-x86_64-1.txz:  Upgraded.
-x/xf86-video-rendition-4.2.3-x86_64-1.txz:  Upgraded.
-x/xf86-video-s3-0.6.3-x86_64-2.txz:  Rebuilt.
-x/xf86-video-s3virge-1.10.4-x86_64-2.txz:  Rebuilt.
-x/xf86-video-savage-2.3.1-x86_64-2.txz:  Rebuilt.
-x/xf86-video-siliconmotion-1.7.3-x86_64-1.txz:  Upgraded.
-x/xf86-video-sis-0.10.2-x86_64-2.txz:  Rebuilt.
-x/xf86-video-sisusb-0.9.3-x86_64-2.txz:  Rebuilt.
-x/xf86-video-tdfx-1.4.3-x86_64-2.txz:  Rebuilt.
-x/xf86-video-tga-1.2.1-x86_64-1.txz:  Upgraded.
-x/xf86-video-trident-1.3.3-x86_64-1.txz:  Upgraded.
-x/xf86-video-tseng-1.2.3-x86_64-1.txz:  Upgraded.
-x/xf86-video-v4l-0.2.0-x86_64-3.txz:  Rebuilt.
-x/xf86-video-vesa-2.3.0-x86_64-2.txz:  Rebuilt.
-x/xf86-video-vmware-10.16.9-x86_64-2.txz:  Rebuilt.
-x/xf86-video-voodoo-1.2.3-x86_64-2.txz:  Rebuilt.
-x/xf86-video-xgi-1.5.1-x86_64-1.txz:  Upgraded.
-x/xf86-video-xgixp-1.7.99.4-x86_64-1.txz:  Upgraded.
-x/xf86bigfontproto-1.2.0-noarch-1.txz:  Upgraded.
-x/xf86dgaproto-2.1-noarch-1.txz:  Upgraded.
-x/xf86driproto-2.1.0-noarch-1.txz:  Upgraded.
-x/xf86miscproto-0.9.3-noarch-1.txz:  Upgraded.
-x/xf86vidmodeproto-2.3-noarch-1.txz:  Upgraded.
-x/xgamma-1.0.3-x86_64-1.txz:  Upgraded.
-x/xgc-1.0.2-x86_64-2.txz:  Rebuilt.
-x/xhost-1.0.3-x86_64-1.txz:  Upgraded.
-x/xineramaproto-1.2-noarch-1.txz:  Upgraded.
-x/xinit-1.2.0-x86_64-1.txz:  Upgraded.
-x/xinput-1.5.0-x86_64-1.txz:  Upgraded.
-x/xkbcomp-1.1.1-x86_64-1.txz:  Upgraded.
-x/xkbevd-1.1.0-x86_64-1.txz:  Upgraded.
-x/xkbprint-1.0.2-x86_64-1.txz:  Upgraded.
-x/xkbutils-1.0.2-x86_64-1.txz:  Upgraded.
-x/xkeyboard-config-1.8-noarch-1.txz:  Upgraded.
-x/xkill-1.0.2-x86_64-1.txz:  Upgraded.
-x/xlogo-1.0.2-x86_64-1.txz:  Upgraded.
-x/xlsatoms-1.0.2-x86_64-1.txz:  Upgraded.
-x/xlsclients-1.0.2-x86_64-1.txz:  Upgraded.
-x/xmag-1.0.3-x86_64-1.txz:  Upgraded.
-x/xman-1.1.0-x86_64-1.txz:  Upgraded.
-x/xmessage-1.0.3-x86_64-1.txz:  Upgraded.
-x/xmodmap-1.0.4-x86_64-1.txz:  Upgraded.
-x/xorg-cf-files-1.0.3-noarch-1.txz:  Upgraded.
-x/xorg-docs-1.5-noarch-1.txz:  Upgraded.
-x/xorg-server-1.7.5-x86_64-1.txz:  Upgraded.
-x/xorg-server-xephyr-1.7.5-x86_64-1.txz:  Upgraded.
-x/xorg-server-xnest-1.7.5-x86_64-1.txz:  Upgraded.
-x/xorg-server-xvfb-1.7.5-x86_64-1.txz:  Upgraded.
-x/xorg-sgml-doctools-1.3-noarch-1.txz:  Upgraded.
-x/xpr-1.0.3-x86_64-1.txz:  Upgraded.
-x/xprop-1.1.0-x86_64-1.txz:  Upgraded.
-x/xproto-7.0.16-noarch-1.txz:  Upgraded.
-x/xproxymanagementprotocol-1.0.3-noarch-1.txz:  Upgraded.
-x/xpyb-1.2-x86_64-1.txz:  Upgraded.
-x/xrandr-1.3.2-x86_64-1.txz:  Upgraded.
-x/xrdb-1.0.6-x86_64-1.txz:  Upgraded.
-x/xrefresh-1.0.3-x86_64-1.txz:  Upgraded.
-x/xscope-1.2-x86_64-1.txz:  Upgraded.
-x/xset-1.1.0-x86_64-1.txz:  Upgraded.
-x/xsetroot-1.0.3-x86_64-1.txz:  Upgraded.
-x/xterm-255-x86_64-1.txz:  Upgraded.
-x/xtrans-1.2.5-noarch-1.txz:  Upgraded.
-x/xvidtune-1.0.2-x86_64-1.txz:  Upgraded.
-x/xvinfo-1.1.0-x86_64-1.txz:  Upgraded.
-x/xwd-1.0.3-x86_64-1.txz:  Upgraded.
-x/xwininfo-1.0.5-x86_64-1.txz:  Upgraded.
-x/xwud-1.0.2-x86_64-1.txz:  Upgraded.
-xap/MPlayer-20100218-x86_64-1.txz:  Upgraded.
-xap/blackbox-0.70.1-x86_64-3.txz:  Upgraded.
-xap/electricsheep-20090306-x86_64-3.txz:  Rebuilt.
-xap/fluxbox-1.1.1-x86_64-2.txz:  Rebuilt.
-  Fixed paths in xinitrc.fluxbox.
-xap/gimp-2.6.8-x86_64-2.txz:  Rebuilt.
-  Patched to compile with libpng-1.4.x.
-xap/gnuchess-5.07-x86_64-5.txz:  Rebuilt.
-  Upgraded to eboard-1.1.1 and xboard-4.4.2.
-xap/gnuplot-4.2.6-x86_64-1.txz:  Upgraded.
-xap/gucharmap-2.28.2-x86_64-1.txz:  Upgraded.
-xap/imagemagick-6.5.9_6-x86_64-1.txz:  Upgraded.
-xap/pan-0.133-x86_64-2.txz:  Rebuilt.
-  Patched to use gmime-2.4.x.
-xap/sane-1.0.20-x86_64-3.txz:  Rebuilt.
-xap/seamonkey-2.0.3-x86_64-1.txz:  Upgraded.
+x/mesa-7.9-x86_64-2.txz:  Rebuilt.
+  Added --enable-xcb and --enable-gallium-nouveau.
+x/xorg-server-1.9.2-x86_64-3.txz:  Rebuilt.
+  Patched to try nouveau before nv.
+x/xorg-server-xephyr-1.9.2-x86_64-3.txz:  Rebuilt.
+x/xorg-server-xnest-1.9.2-x86_64-3.txz:  Rebuilt.
+x/xorg-server-xvfb-1.9.2-x86_64-3.txz:  Rebuilt.
++--------------------------+
+Sat Nov 20 22:28:56 UTC 2010
+l/libdbusmenu-qt-0.6.4-x86_64-1.txz:  Upgraded.
+xap/xpdf-3.02pl5-x86_64-1.txz:  Upgraded.
+  This update fixes security issues that could lead to an
+  application crash, or execution of arbitrary code.
+  For more information, see:
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-3702
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-3703
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-3704
+  (* Security fix *)
++--------------------------+
+Sat Nov 20 01:28:23 UTC 2010
+a/udev-164-x86_64-3.txz:  Rebuilt.
+  Restored a chunk of rc.udev to generate add events on coldplug.
+n/bluez-4.79-x86_64-1.txz:  Upgraded.
++--------------------------+
+Thu Nov 18 00:05:34 UTC 2010
+l/gtk+2-2.22.1-x86_64-2.txz:  Rebuilt.
+  Changed GTK2_RC_FILES to favor the settings in $HOME/.gtkrc-2.0.
+  Thanks to Fidori on LQ.
++--------------------------+
+Tue Nov 16 23:38:13 UTC 2010
+a/aaa_elflibs-13.2-x86_64-3.txz:  Rebuilt.
+  Upgraded libfreetype, libglib-2.0, libgmodule-2.0, libgobject-2.0,
+  and libgthread-2.0.
+a/lvm2-2.02.76-x86_64-1.txz:  Upgraded.
+a/module-init-tools-3.12-x86_64-2.txz:  Rebuilt.
+  Move deprecated /etc/modprobe.conf to /etc/modprobe.conf.obsolete, and
+  remove the symbolic link to /etc/modprobe.conf.
+a/sdparm-1.06-x86_64-1.txz:  Upgraded.
+a/sysvinit-scripts-1.2-noarch-33.txz:  Rebuilt.
+  Change crond log level to 'notice'.  Thanks to Michiel Broek.
+  Only mount usbfs if it is in /etc/fstab.  Thanks to David Somero.
+a/udev-164-x86_64-2.txz:  Rebuilt.
+  Set rfkill device writable by netdev group.
+l/gdk-pixbuf2-2.22.1-x86_64-2.txz:  Rebuilt.
+  Added some noise reduction to the install script.
+l/glib2-2.26.1-x86_64-1.txz:  Upgraded.
+l/gtk+2-2.22.1-x86_64-1.txz:  Upgraded.
+l/hal-0.5.14-x86_64-3.txz:  Rebuilt.
+  Applied upstream crash fix.  Thanks to Robby Workman.
+l/libvorbis-1.3.2-x86_64-1.txz:  Upgraded.
+n/ca-certificates-20090814-noarch-1.txz:  Added.
+n/httpd-2.2.17-x86_64-1.txz:  Upgraded.
+  Fixed logrotate script.  Thanks to allend on LQ.
+x/font-adobe-100dpi-1.0.3-noarch-1.txz:  Upgraded.
+x/font-adobe-75dpi-1.0.3-noarch-1.txz:  Upgraded.
+x/font-adobe-utopia-100dpi-1.0.4-noarch-1.txz:  Upgraded.
+x/font-adobe-utopia-75dpi-1.0.4-noarch-1.txz:  Upgraded.
+x/font-adobe-utopia-type1-1.0.4-noarch-1.txz:  Upgraded.
+x/font-arabic-misc-1.0.3-noarch-1.txz:  Upgraded.
+x/font-bh-100dpi-1.0.3-noarch-1.txz:  Upgraded.
+x/font-bh-75dpi-1.0.3-noarch-1.txz:  Upgraded.
+x/font-bh-lucidatypewriter-100dpi-1.0.3-noarch-1.txz:  Upgraded.
+x/font-bh-lucidatypewriter-75dpi-1.0.3-noarch-1.txz:  Upgraded.
+x/font-bh-type1-1.0.3-noarch-1.txz:  Upgraded.
+x/font-bitstream-100dpi-1.0.3-noarch-1.txz:  Upgraded.
+x/font-bitstream-75dpi-1.0.3-noarch-1.txz:  Upgraded.
+x/font-bitstream-speedo-1.0.2-noarch-1.txz:  Upgraded.
+x/font-bitstream-type1-1.0.3-noarch-1.txz:  Upgraded.
+x/font-cronyx-cyrillic-1.0.3-noarch-1.txz:  Upgraded.
+x/font-cursor-misc-1.0.3-noarch-1.txz:  Upgraded.
+x/font-daewoo-misc-1.0.3-noarch-1.txz:  Upgraded.
+x/font-dec-misc-1.0.3-noarch-1.txz:  Upgraded.
+x/font-ibm-type1-1.0.3-noarch-1.txz:  Upgraded.
+x/font-isas-misc-1.0.3-noarch-1.txz:  Upgraded.
+x/font-jis-misc-1.0.3-noarch-1.txz:  Upgraded.
+x/font-micro-misc-1.0.3-noarch-1.txz:  Upgraded.
+x/font-misc-cyrillic-1.0.3-noarch-1.txz:  Upgraded.
+x/font-misc-ethiopic-1.0.3-noarch-1.txz:  Upgraded.
+x/font-misc-meltho-1.0.3-noarch-1.txz:  Upgraded.
+x/font-misc-misc-1.1.2-noarch-1.txz:  Upgraded.
+x/font-mutt-misc-1.0.3-noarch-1.txz:  Upgraded.
+x/font-schumacher-misc-1.1.2-noarch-1.txz:  Upgraded.
+x/font-screen-cyrillic-1.0.4-noarch-1.txz:  Upgraded.
+x/font-sony-misc-1.0.3-noarch-1.txz:  Upgraded.
+x/font-sun-misc-1.0.3-noarch-1.txz:  Upgraded.
+x/font-winitzki-cyrillic-1.0.3-noarch-1.txz:  Upgraded.
+x/font-xfree86-type1-1.0.4-noarch-1.txz:  Upgraded.
+x/xorg-server-1.9.2-x86_64-2.txz:  Rebuilt.
+  Patched to fix a crash when using Xinerama.
+  Thanks to Jules Villard for pointing out the upstream patch.
+x/xorg-server-xephyr-1.9.2-x86_64-2.txz:  Rebuilt.
+x/xorg-server-xnest-1.9.2-x86_64-2.txz:  Rebuilt.
+x/xorg-server-xvfb-1.9.2-x86_64-2.txz:  Rebuilt.
++--------------------------+
+Sun Nov 14 23:58:42 UTC 2010
+Lots of updates, including a major X overhaul!
+Thanks to Robby Workman for a ton of help here.
+a/aaa_elflibs-13.2-x86_64-2.txz:  Rebuilt.
+  Added libtalloc.so.2.
+  Added liblzma.so.0.0.0 to ease the transition to xz-5.0.0.
+a/acpid-2.0.6-x86_64-1.txz:  Upgraded.
+a/coreutils-8.6-x86_64-1.txz:  Upgraded.
+a/cryptsetup-1.1.3-x86_64-1.txz:  Upgraded.
+a/dbus-1.4.0-x86_64-1.txz:  Upgraded.
+a/e2fsprogs-1.41.12-x86_64-1.txz:  Upgraded.
+a/gettext-0.18.1.1-x86_64-1.txz:  Upgraded.
+a/lvm2-2.02.75-x86_64-1.txz:  Upgraded.
+a/mkinitrd-1.4.6-x86_64-1.txz:  Upgraded.
+  Upgraded to busybox-1.17.3.
+  Use modprobe instead of insmod.
+  Enable udev on the initrd by default.
+  Copy /etc/modprobe.d/* to initrd (and add a new option to NOT do that).
+  Thanks to Robby Workman.
+a/module-init-tools-3.12-x86_64-1.txz:  Upgraded.
+a/ntfs-3g-2010.10.2-x86_64-1.txz:  Upgraded.
+a/tar-1.25-x86_64-1.tgz:  Upgraded.
+a/udev-164-x86_64-1.txz:  Upgraded.
+a/usbutils-0.90-x86_64-1.txz:  Upgraded.
+a/util-linux-ng-2.18-x86_64-1.txz:  Upgraded.
+a/xfsprogs-3.1.3-x86_64-1.txz:  Upgraded.
+a/xz-5.0.0-x86_64-1.tgz:  Upgraded.
+ap/cdrtools-3.00-x86_64-1.txz:  Upgraded.
+ap/linuxdoc-tools-0.9.66-x86_64-5.txz:  Rebuilt.
+  Upgraded to gnome-doc-utils-0.20.2 and asciidoc-8.6.2.
+  Thanks to Stuart Winter.
+  Patched a problem with gtk-doc and vim.
+  Thanks to Trev Carey-Smith and Robby Workman.
+  Patched asciidoc to fix a problem processing the git docs.
+ap/man-pages-3.30-noarch-1.txz:  Upgraded.
+ap/mc-4.7.0.10-x86_64-1.txz:  Upgraded.
+ap/pm-utils-1.4.1-x86_64-1.txz:  Upgraded.
+d/autoconf-2.68-noarch-1.txz:  Upgraded.
+d/bison-2.4.3-x86_64-1.txz:  Upgraded.
+d/doxygen-1.7.2-x86_64-1.txz:  Upgraded.
+d/gettext-tools-0.18.1.1-x86_64-1.txz:  Upgraded.
+d/git-1.7.3.2-x86_64-1.txz:  Upgraded.
+d/libtool-2.4-x86_64-1.txz:  Upgraded.
+d/m4-1.4.15-x86_64-1.txz:  Upgraded.
+d/slacktrack-2.08-x86_64-1.txz:  Upgraded.
+  Moved here from /extra.  Thanks to Stuart Winter.
+d/subversion-1.6.13-x86_64-1.txz:  Upgraded.
+l/atk-1.32.0-x86_64-1.txz:  Upgraded.
+l/babl-0.1.2-x86_64-1.txz:  Upgraded.
+l/cairo-1.10.0-x86_64-1.txz:  Upgraded.
+l/dbus-glib-0.88-x86_64-1.txz:  Upgraded.
+l/freetype-2.4.3-x86_64-1.txz:  Upgraded.
+l/gdk-pixbuf2-2.22.1-x86_64-1.txz:  Added.
+l/gegl-0.1.2-x86_64-1.txz:  Upgraded.
+l/glib2-2.26.0-x86_64-1.txz:  Upgraded.
+l/gnome-icon-theme-2.31.0-x86_64-1.txz:  Upgraded.
+l/gst-plugins-base-0.10.30.2-x86_64-1.txz:  Upgraded.
+l/gst-plugins-good-0.10.25-x86_64-1.txz:  Upgraded.
+l/gstreamer-0.10.30.2-x86_64-1.txz:  Upgraded.
+l/gtk+2-2.22.0-x86_64-1.txz:  Upgraded.
+l/librsvg-2.32.0-x86_64-1.txz:  Upgraded.
+l/libusb-1.0.8-x86_64-1.txz:  Upgraded.
+l/libwnck-2.30.5-x86_64-1.txz:  Upgraded.
+l/pango-1.28.3-x86_64-1.txz:  Upgraded.
+l/parted-2.3-x86_64-1.txz:  Upgraded.
+l/poppler-0.14.5-x86_64-1.txz:  Upgraded.
+l/poppler-data-0.4.4-noarch-1.txz:  Upgraded.
+l/pycairo-1.8.10-x86_64-1.txz:  Upgraded.
+l/pygobject-2.26.0-x86_64-1.txz:  Upgraded.
+  Thanks to alienBOB for the crash fix patch.
+l/pygtk-2.22.0-x86_64-1.txz:  Upgraded.
+l/v4l-utils-0.8.1-x86_64-1.txz:  Upgraded.
+l/vte-0.26.1-x86_64-1.txz:  Upgraded.
+n/bluez-4.78-x86_64-1.txz:  Upgraded.
+n/dhcp-4.2.0_P1-x86_64-1.txz:  Upgraded.
+n/iproute2-2.6.35-x86_64-1.txz:  Upgraded.
+n/iptables-1.4.10-x86_64-1.txz:  Upgraded.
+n/obex-data-server-0.4.5-x86_64-2.txz:  Rebuilt.
+n/openssh-5.6p1-x86_64-1.txz:  Upgraded.
+n/samba-3.5.6-x86_64-1.txz:  Upgraded.
+n/vsftpd-2.3.2-x86_64-1.txz:  Upgraded.
+tcl/tcl-8.5.9-x86_64-1.txz:  Upgraded.
+tcl/tk-8.5.9-x86_64-1.txz:  Upgraded.
+x/appres-1.0.3-x86_64-1.txz:  Upgraded.
+x/bdftopcf-1.0.3-x86_64-1.txz:  Upgraded.
+x/beforelight-1.0.4-x86_64-1.txz:  Upgraded.
+x/bigreqsproto-1.1.1-noarch-1.txz:  Upgraded.
+x/bitmap-1.0.5-x86_64-1.txz:  Upgraded.
+x/compositeproto-0.4.2-noarch-1.txz:  Upgraded.
+x/damageproto-1.2.1-noarch-1.txz:  Upgraded.
+x/editres-1.0.5-x86_64-1.txz:  Upgraded.
+x/encodings-1.0.4-noarch-1.txz:  Upgraded.
+x/fixesproto-4.1.2-noarch-1.txz:  Upgraded.
+x/font-adobe-100dpi-1.0.2-noarch-1.txz:  Upgraded.
+x/font-adobe-75dpi-1.0.2-noarch-1.txz:  Upgraded.
+x/font-adobe-utopia-100dpi-1.0.3-noarch-1.txz:  Upgraded.
+x/font-adobe-utopia-75dpi-1.0.3-noarch-1.txz:  Upgraded.
+x/font-adobe-utopia-type1-1.0.3-noarch-1.txz:  Upgraded.
+x/font-alias-1.0.3-noarch-1.txz:  Upgraded.
+x/font-arabic-misc-1.0.2-noarch-1.txz:  Upgraded.
+x/font-bh-100dpi-1.0.2-noarch-1.txz:  Upgraded.
+x/font-bh-75dpi-1.0.2-noarch-1.txz:  Upgraded.
+x/font-bh-lucidatypewriter-100dpi-1.0.2-noarch-1.txz:  Upgraded.
+x/font-bh-lucidatypewriter-75dpi-1.0.2-noarch-1.txz:  Upgraded.
+x/font-bh-ttf-1.0.3-noarch-1.txz:  Upgraded.
+x/font-bh-type1-1.0.2-noarch-1.txz:  Upgraded.
+x/font-bitstream-100dpi-1.0.2-noarch-1.txz:  Upgraded.
+x/font-bitstream-75dpi-1.0.2-noarch-1.txz:  Upgraded.
+x/font-bitstream-type1-1.0.2-noarch-1.txz:  Upgraded.
+x/font-cronyx-cyrillic-1.0.2-noarch-1.txz:  Upgraded.
+x/font-cursor-misc-1.0.2-noarch-1.txz:  Upgraded.
+x/font-daewoo-misc-1.0.2-noarch-1.txz:  Upgraded.
+x/font-dec-misc-1.0.2-noarch-1.txz:  Upgraded.
+x/font-ibm-type1-1.0.2-noarch-1.txz:  Upgraded.
+x/font-isas-misc-1.0.2-noarch-1.txz:  Upgraded.
+x/font-jis-misc-1.0.2-noarch-1.txz:  Upgraded.
+x/font-micro-misc-1.0.2-noarch-1.txz:  Upgraded.
+x/font-misc-cyrillic-1.0.2-noarch-1.txz:  Upgraded.
+x/font-misc-ethiopic-1.0.2-noarch-1.txz:  Upgraded.
+x/font-misc-meltho-1.0.2-noarch-1.txz:  Upgraded.
+x/font-misc-misc-1.1.1-noarch-1.txz:  Upgraded.
+x/font-mutt-misc-1.0.2-noarch-1.txz:  Upgraded.
+x/font-schumacher-misc-1.1.1-noarch-1.txz:  Upgraded.
+x/font-screen-cyrillic-1.0.3-noarch-1.txz:  Upgraded.
+x/font-sony-misc-1.0.2-noarch-1.txz:  Upgraded.
+x/font-sun-misc-1.0.2-noarch-1.txz:  Upgraded.
+x/font-util-1.2.0-x86_64-1.txz:  Upgraded.
+x/font-winitzki-cyrillic-1.0.2-noarch-1.txz:  Upgraded.
+x/font-xfree86-type1-1.0.3-noarch-1.txz:  Upgraded.
+x/fontsproto-2.1.1-noarch-1.txz:  Upgraded.
+x/fslsfonts-1.0.3-x86_64-1.txz:  Upgraded.
+x/fstobdf-1.0.4-x86_64-1.txz:  Upgraded.
+x/glew-1.5.7-x86_64-1.txz:  Upgraded.
+x/glproto-1.4.12-noarch-1.txz:  Upgraded.
+x/iceauth-1.0.4-x86_64-1.txz:  Upgraded.
+x/ico-1.0.3-x86_64-1.txz:  Upgraded.
+x/imake-1.0.4-x86_64-1.txz:  Upgraded.
+x/inputproto-2.0.1-noarch-1.txz:  Upgraded.
+x/kbproto-1.0.5-noarch-1.txz:  Upgraded.
+x/libFS-1.0.3-x86_64-1.txz:  Upgraded.
+x/libICE-1.0.7-x86_64-1.txz:  Upgraded.
+x/libSM-1.2.0-x86_64-1.txz:  Upgraded.
+x/libX11-1.3.6-x86_64-1.txz:  Upgraded.
+x/libXScrnSaver-1.2.1-x86_64-1.txz:  Upgraded.
+x/libXTrap-1.0.0-x86_64-2.txz:  Removed.
+x/libXau-1.0.6-x86_64-1.txz:  Upgraded.
+x/libXaw-1.0.8-x86_64-1.txz:  Upgraded.
+x/libXcomposite-0.4.3-x86_64-1.txz:  Upgraded.
+x/libXcursor-1.1.11-x86_64-1.txz:  Upgraded.
+x/libXdamage-1.1.3-x86_64-1.txz:  Upgraded.
+x/libXdmcp-1.1.0-x86_64-1.txz:  Upgraded.
+x/libXevie-1.0.3-x86_64-1.txz:  Upgraded.
+x/libXext-1.2.0-x86_64-1.txz:  Upgraded.
+x/libXfixes-4.0.5-x86_64-1.txz:  Upgraded.
+x/libXfont-1.4.3-x86_64-1.txz:  Upgraded.
+x/libXft-2.2.0-x86_64-1.txz:  Upgraded.
+x/libXi-1.4.0-x86_64-1.txz:  Upgraded.
+x/libXinerama-1.1.1-x86_64-1.txz:  Upgraded.
+x/libXmu-1.1.0-x86_64-1.txz:  Upgraded.
+x/libXpm-3.5.9-x86_64-1.txz:  Upgraded.
+x/libXprintAppUtil-1.0.1-x86_64-2.txz:  Removed.
+x/libXprintUtil-1.0.1-x86_64-2.txz:  Removed.
+x/libXrandr-1.3.1-x86_64-1.txz:  Upgraded.
+x/libXrender-0.9.6-x86_64-1.txz:  Upgraded.
+x/libXres-1.0.5-x86_64-1.txz:  Upgraded.
+x/libXt-1.0.9-x86_64-1.txz:  Upgraded.
+x/libXtst-1.2.0-x86_64-1.txz:  Upgraded.
+x/libXv-1.0.6-x86_64-1.txz:  Upgraded.
+x/libXvMC-1.0.6-x86_64-1.txz:  Upgraded.
+x/libXxf86dga-1.1.2-x86_64-1.txz:  Upgraded.
+x/libXxf86vm-1.1.1-x86_64-1.txz:  Upgraded.
+x/libdmx-1.1.1-x86_64-1.txz:  Upgraded.
+x/libdrm-2.4.22-x86_64-1.txz:  Upgraded.
+x/liberation-fonts-ttf-1.06.0.20100721-noarch-1.txz:  Upgraded.
+x/libfontenc-1.1.0-x86_64-1.txz:  Upgraded.
+x/libpciaccess-0.12.0-x86_64-1.txz:  Upgraded.
+x/libxcb-1.7-x86_64-1.txz:  Upgraded.
+x/libxkbfile-1.0.7-x86_64-1.txz:  Upgraded.
+x/libxkbui-1.0.2-x86_64-2.txz:  Removed.
+x/lndir-1.0.2-x86_64-1.txz:  Upgraded.
+x/luit-1.1.0-x86_64-1.txz:  Upgraded.
+x/makedepend-1.0.3-x86_64-1.txz:  Upgraded.
+x/mesa-7.9-x86_64-1.txz:  Upgraded.
+  I was on the fence with this upgrade, and in fact it sat in /testing for
+  days with mesa-7.8.2 queued instead.  But it seems the Intel driver really
+  does need this version of Mesa or there are major problems with compositing
+  (most of them leading to an X server crash).
+  If X crashes at start, try disabling compositing.  Create a file named
+  /etc/X11/xorg.conf.d/disable-composite.conf with this in it:
+    Section "Extensions"
+      Option "Composite" "Disable"
+    EndSection
+  The machine that had issues here was using an onboard nVidia 6150SE.
+  Using the nv, nouveau, or even the vesa driver, X crashed at start unless
+  compositing was disabled.  However, everything works perfectly when using
+  the binary nVidia drivers, and odds are that most users with decent nVidia
+  hardware are doing just that.  So, that's the situation with nVidia and
+  Mesa as observed here for now.  Hopefully the defaults will work better
+  soon, but meanwhile if you have nVidia hardware you may have to either
+  disable compositing or obtain and use nVidia's binary drivers.
+x/mkfontdir-1.0.6-noarch-1.txz:  Upgraded.
+x/mkfontscale-1.0.8-x86_64-1.txz:  Upgraded.
+x/oclock-1.0.2-x86_64-1.txz:  Upgraded.
+x/pixman-0.20.0-x86_64-1.txz:  Upgraded.
+x/radeon_ucode-20100902-noarch-1.txz:  Added.
+x/randrproto-1.3.2-noarch-1.txz:  Upgraded.
+x/recordproto-1.14.1-noarch-1.txz:  Upgraded.
+x/renderproto-0.11.1-noarch-1.txz:  Upgraded.
+x/rgb-1.0.4-x86_64-1.txz:  Upgraded.
+x/rstart-1.0.3-x86_64-1.txz:  Removed.
+x/scrnsaverproto-1.2.1-noarch-1.txz:  Upgraded.
+x/sessreg-1.0.6-x86_64-1.txz:  Upgraded.
+x/setxkbmap-1.2.0-x86_64-1.txz:  Upgraded.
+x/showfont-1.0.3-x86_64-1.txz:  Upgraded.
+x/smproxy-1.0.4-x86_64-1.txz:  Upgraded.
+x/tibmachuni-font-ttf-1.901b-noarch-1.txz:  Upgraded.
+x/trapproto-3.4.3-noarch-2.txz:  Removed.
+x/twm-1.0.5-x86_64-1.txz:  Upgraded.
+x/util-macros-1.11.0-noarch-1.txz:  Upgraded.
+x/videoproto-2.3.1-noarch-1.txz:  Upgraded.
+x/viewres-1.0.3-x86_64-1.txz:  Upgraded.
+x/x11perf-1.5.2-x86_64-1.txz:  Upgraded.
+x/xauth-1.0.5-x86_64-1.txz:  Upgraded.
+x/xclipboard-1.1.1-x86_64-1.txz:  Upgraded.
+x/xclock-1.0.5-x86_64-1.txz:  Upgraded.
+x/xcmiscproto-1.2.1-noarch-1.txz:  Upgraded.
+x/xcmsdb-1.0.3-x86_64-1.txz:  Upgraded.
+x/xconsole-1.0.4-x86_64-1.txz:  Upgraded.
+x/xcursor-themes-1.0.3-noarch-1.txz:  Upgraded.
+x/xcursorgen-1.0.4-x86_64-1.txz:  Upgraded.
+x/xdbedizzy-1.1.0-x86_64-1.txz:  Upgraded.
+x/xdg-utils-20101104cvs-noarch-1.txz:  Upgraded.
+x/xditview-1.0.2-x86_64-1.txz:  Upgraded.
+x/xdpyinfo-1.2.0-x86_64-1.txz:  Upgraded.
+x/xdriinfo-1.0.4-x86_64-1.txz:  Upgraded.
+x/xedit-1.2.0-x86_64-1.txz:  Upgraded.
+x/xev-1.1.0-x86_64-1.txz:  Upgraded.
+x/xextproto-7.1.2-noarch-1.txz:  Upgraded.
+x/xf86-input-acecad-1.4.0-x86_64-2.txz:  Rebuilt.
+x/xf86-input-aiptek-1.3.1-x86_64-1.txz:  Upgraded.
+x/xf86-input-evdev-2.5.0-x86_64-1.txz:  Upgraded.
+x/xf86-input-joystick-1.5.0-x86_64-1.txz:  Upgraded.
+x/xf86-input-keyboard-1.5.0-x86_64-1.txz:  Upgraded.
+x/xf86-input-mouse-1.6.0-x86_64-1.txz:  Upgraded.
+x/xf86-input-penmount-1.4.1-x86_64-2.txz:  Rebuilt.
+x/xf86-input-synaptics-1.3.0-x86_64-1.txz:  Upgraded.
+x/xf86-input-vmmouse-12.6.10-x86_64-1.txz:  Upgraded.
+x/xf86-input-void-1.3.1-x86_64-1.txz:  Upgraded.
+x/xf86-input-wacom-0.10.8-x86_64-1.txz:  Upgraded.
+x/xf86-video-apm-1.2.3-x86_64-1.txz:  Upgraded.
+x/xf86-video-ark-0.7.3-x86_64-1.txz:  Upgraded.
+x/xf86-video-ast-0.91.10-x86_64-1.txz:  Upgraded.
+x/xf86-video-ati-6.13.2-x86_64-1.txz:  Upgraded.
+x/xf86-video-chips-1.2.3-x86_64-1.txz:  Upgraded.
+x/xf86-video-cirrus-1.3.2-x86_64-3.txz:  Rebuilt.
+x/xf86-video-dummy-0.3.4-x86_64-1.txz:  Upgraded.
+x/xf86-video-glint-1.2.5-x86_64-1.txz:  Upgraded.
+x/xf86-video-i128-1.3.4-x86_64-1.txz:  Upgraded.
+x/xf86-video-i740-1.3.2-x86_64-3.txz:  Rebuilt.
+x/xf86-video-intel-2.13.0-x86_64-1.txz:  Upgraded.
+x/xf86-video-mach64-6.8.2-x86_64-3.txz:  Rebuilt.
+x/xf86-video-mga-1.4.13-x86_64-1.txz:  Upgraded.
+x/xf86-video-neomagic-1.2.5-x86_64-1.txz:  Upgraded.
+x/xf86-video-nv-2.1.18-x86_64-1.txz:  Upgraded.
+x/xf86-video-openchrome-0.2.904-x86_64-2.txz:  
+x/xf86-video-r128-6.8.1-x86_64-3.txz:  Rebuilt.
+x/xf86-video-rendition-4.2.4-x86_64-1.txz:  Upgraded.
+x/xf86-video-s3-0.6.3-x86_64-3.txz:  Rebuilt.
+x/xf86-video-s3virge-1.10.4-x86_64-3.txz:  Rebuilt.
+x/xf86-video-savage-2.3.1-x86_64-3.txz:  Rebuilt.
+x/xf86-video-siliconmotion-1.7.4-x86_64-2.txz:  
+x/xf86-video-sis-0.10.3-x86_64-1.txz:  Upgraded.
+x/xf86-video-sisusb-0.9.4-x86_64-1.txz:  Upgraded.
+x/xf86-video-tdfx-1.4.3-x86_64-3.txz:  Rebuilt.
+x/xf86-video-tga-1.2.1-x86_64-2.txz:  Rebuilt.
+x/xf86-video-trident-1.3.4-x86_64-1.txz:  Upgraded.
+x/xf86-video-tseng-1.2.4-x86_64-1.txz:  Upgraded.
+x/xf86-video-v4l-0.2.0-x86_64-4.txz:  Rebuilt.
+x/xf86-video-vesa-2.3.0-x86_64-3.txz:  Rebuilt.
+x/xf86-video-vmware-11.0.3-x86_64-1.txz:  Upgraded.
+x/xf86-video-voodoo-1.2.4-x86_64-1.txz:  Upgraded.
+x/xf86-video-xgi-1.6.0-x86_64-1.txz:  Upgraded.
+x/xf86dga-1.0.3-x86_64-1.txz:  Upgraded.
+x/xf86rushproto-1.1.2-noarch-2.txz:  Removed.
+x/xfd-1.1.0-x86_64-1.txz:  Upgraded.
+x/xfindproxy-1.0.1-x86_64-2.txz:  Removed.
+x/xfontsel-1.0.3-x86_64-1.txz:  Upgraded.
+x/xfs-1.1.1-x86_64-1.txz:  Upgraded.
+x/xfsinfo-1.0.3-x86_64-1.txz:  Upgraded.
+x/xfwp-1.0.1-x86_64-2.txz:  Removed.
+x/xgamma-1.0.4-x86_64-1.txz:  Upgraded.
+x/xgc-1.0.3-x86_64-1.txz:  Upgraded.
+x/xhost-1.0.4-x86_64-1.txz:  Upgraded.
+x/xinit-1.3.0-x86_64-1.txz:  Upgraded.
+x/xinput-1.5.3-x86_64-1.txz:  Upgraded.
+x/xkbcomp-1.2.0-x86_64-1.txz:  Upgraded.
+x/xkbevd-1.1.1-x86_64-1.txz:  Upgraded.
+x/xkbutils-1.0.3-x86_64-1.txz:  Upgraded.
+x/xkill-1.0.3-x86_64-1.txz:  Upgraded.
+x/xload-1.1.0-x86_64-1.txz:  Upgraded.
+x/xlogo-1.0.3-x86_64-1.txz:  Upgraded.
+x/xlsatoms-1.1.0-x86_64-1.txz:  Upgraded.
+x/xlsclients-1.1.1-x86_64-1.txz:  Upgraded.
+x/xlsfonts-1.0.3-x86_64-1.txz:  Upgraded.
+x/xmag-1.0.4-x86_64-1.txz:  Upgraded.
+x/xman-1.1.1-x86_64-1.txz:  Upgraded.
+x/xmh-1.0.2-x86_64-1.txz:  Upgraded.
+x/xmodmap-1.0.5-x86_64-1.txz:  Upgraded.
+x/xmore-1.0.2-x86_64-1.txz:  Upgraded.
+x/xorg-server-1.9.2-x86_64-1.txz:  Upgraded.
+x/xorg-server-xephyr-1.9.2-x86_64-1.txz:  Upgraded.
+x/xorg-server-xnest-1.9.2-x86_64-1.txz:  Upgraded.
+x/xorg-server-xvfb-1.9.2-x86_64-1.txz:  Upgraded.
+x/xorg-sgml-doctools-1.5-noarch-1.txz:  Upgraded.
+x/xplsprinters-1.0.1-x86_64-2.txz:  Removed.
+x/xprehashprinterlist-1.0.1-x86_64-2.txz:  Removed.
+x/xprop-1.2.0-x86_64-1.txz:  Upgraded.
+x/xproto-7.0.19-noarch-1.txz:  Upgraded.
+x/xproxymanagementprotocol-1.0.3-noarch-1.txz:  Removed.
+x/xrandr-1.3.4-x86_64-1.txz:  Upgraded.
+x/xrdb-1.0.7-x86_64-1.txz:  Upgraded.
+x/xrefresh-1.0.4-x86_64-1.txz:  Upgraded.
+x/xscope-1.3-x86_64-1.txz:  Upgraded.
+x/xset-1.2.1-x86_64-1.txz:  Upgraded.
+x/xsetmode-1.0.0-x86_64-2.txz:  Removed.
+x/xsetpointer-1.0.1-x86_64-2.txz:  Removed.
+x/xsetroot-1.1.0-x86_64-1.txz:  Upgraded.
+x/xsm-1.0.2-x86_64-1.txz:  Upgraded.
+x/xstdcmap-1.0.2-x86_64-1.txz:  Upgraded.
+x/xterm-266-x86_64-1.txz:  Upgraded.
+x/xtrans-1.2.6-noarch-1.txz:  Upgraded.
+x/xtrap-1.0.2-x86_64-2.txz:  Removed.
+x/xvinfo-1.1.1-x86_64-1.txz:  Upgraded.
+x/xwd-1.0.4-x86_64-1.txz:  Upgraded.
+x/xwininfo-1.1.1-x86_64-1.txz:  Upgraded.
+x/xwud-1.0.3-x86_64-1.txz:  Upgraded.
+xap/gimp-2.6.11-x86_64-1.txz:  Upgraded.
+xap/imagemagick-6.6.5_6-x86_64-1.txz:  Upgraded.
+xap/mozilla-thunderbird-3.1.6-x86_64-1.txz:  Upgraded.
+  This upgrade fixes some more security bugs.
+  For more information, see:
+    http://www.mozilla.org/security/known-vulnerabilities/thunderbird31.html
+  (* Security fix *)
+xap/xchat-2.8.8-x86_64-1.txz:  Upgraded.
+xap/xine-lib-1.1.19-x86_64-1.txz:  Upgraded.
+extra/xf86-video-nouveau/xf86-video-nouveau-git_065576d5df0d-x86_64-1.txz:  Added.
+testing/packages/mozilla-firefox-4.0b7-x86_64-1.txz:  Upgraded.
++--------------------------+
+Mon Nov  1 23:21:39 UTC 2010
+n/proftpd-1.3.3c-x86_64-1.txz:  Upgraded.
+  Fixed Telnet IAC stack overflow vulnerability (ZDI-CAN-925), which can
+  allow remote execution of arbitrary code as the user running the
+  ProFTPD daemon.  Thanks to TippingPoint and the Zero Day Initiative (ZDI).
+  For more information, see:
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-3867
+  (* Security fix *)
+xap/pidgin-2.7.5-x86_64-1.txz:  Upgraded.
+  This update addresses some denial of service bugs.
+  For more information, see:
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-3711
+  (* Security fix *)
++--------------------------+
+Sun Oct 31 20:25:05 UTC 2010
+d/oprofile-0.9.6-x86_64-3.txz:  Rebuilt.
+l/seamonkey-solibs-2.0.10-x86_64-1.txz:  Upgraded.
+xap/seamonkey-2.0.10-x86_64-1.txz:  Upgraded.
   This release fixes some more security vulnerabilities.
   For more information, see:
     http://www.mozilla.org/security/known-vulnerabilities/seamonkey20.html
   (* Security fix *)
-xap/windowmaker-20060427cvs-x86_64-3.txz:  Rebuilt.
-  Fixed paths in xinitrc.wmaker.  Patched to compile with libpng-1.4.x.
-xap/xchat-2.8.6-x86_64-4.txz:  Rebuilt.
-xap/xfce-4.6.1-x86_64-6.txz:  Rebuilt.
-  Upgraded to Terminal-0.4.4, exo-0.3.106, libxfcegui4-4.6.3,
-  xfce4-dev-tools-4.7.2, xfce4-panel-4.6.3, and xfce4-settings-4.6.4.
-xap/xfce4-notifyd-0.1.0-x86_64-1.txz:  Added.
-xap/xfce4-power-manager-0.8.4.2-x86_64-1.txz:  Upgraded.
-xap/xine-lib-1.1.17-x86_64-1.txz:  Upgraded.
-xap/xine-ui-0.99.5-x86_64-3.txz:  Rebuilt.
-  Patched to compile with libpng-1.4.x.
-xap/xpaint-2.8.16-x86_64-1.txz:  Upgraded.
-xap/xpdf-3.02pl4-x86_64-2.txz:  Rebuilt.
-  Moved the icon from the icons to the pixmaps directory, as the icons
-  directory should only be used for themed icons.
-  Thanks to mancha for the heads-up.
-xap/xsane-0.996-x86_64-2.txz:  Rebuilt.
-xap/xscreensaver-5.10-x86_64-1.txz:  Upgraded.
-xap/xv-3.10a-x86_64-6.txz:  Rebuilt.
-  More patches and enhancements via Greg Roelofs.
-extra/bash-completion/bash-completion-1.1-noarch-1.txz:  Upgraded.
-isolinux/initrd.img:  Rebuilt.
-kernels/*:  Upgraded.
-testing/packages/bash-4.0.024-x86_64-1.txz:  Removed.
-usb-and-pxe-installers/usbboot.img:  Rebuilt.
-usb-and-pxe-installers/usbimg2disk.sh:  Upgraded.
-  Thanks to Eric Hameleers.
 +--------------------------+
-Sun Jan 31 19:28:54 UTC 2010
-a/shadow-4.1.4.2-x86_64-2.txz:  Rebuilt.
-  Removed /etc/login.defs that was not supposed to be installed directly.
-  Thanks to sahko.
-ap/mpg123-1.10.0-x86_64-2.txz:  Rebuilt.
-+--------------------------+
-Sun Jan 31 00:14:48 UTC 2010
-Thanks to Robby Workman for most of the non-kernel updates below!
-a/kernel-firmware-2.6.32.7-noarch-1.txz:  Upgraded.
-a/kernel-generic-2.6.32.7-x86_64-1.txz:  Upgraded.
-a/kernel-huge-2.6.32.7-x86_64-1.txz:  Upgraded.
-a/kernel-modules-2.6.32.7-x86_64-1.txz:  Upgraded.
-a/shadow-4.1.4.2-x86_64-1.txz:  Upgraded.
-ap/linuxdoc-tools-0.9.66-x86_64-1.txz:  Upgraded.
-  Thanks to Stuart Winter.
-ap/mpg123-1.10.0-x86_64-1.txz:  Added.
-  Moved from /extra, and upgraded to the latest version.
-ap/mpg321-0.2.10-x86_64-2.txz:  Removed.
-d/git-1.6.6.1-x86_64-1.txz:  Upgraded.
-d/kernel-headers-2.6.32.7-x86-1.txz:  Upgraded.
-k/kernel-source-2.6.32.7-noarch-1.txz:  Upgraded.
-l/urwid-0.9.9.1-x86_64-1.txz:  Upgraded.
-extra/mpg123/mpg123-0.65-x86_64-1.txz:  Removed.
-isolinux/initrd.img:  Rebuilt.
-kernels/*:  Upgraded.
-usb-and-pxe-installers/usbboot.img:  Rebuilt.
+Thu Oct 28 22:13:53 UTC 2010
+a/glibc-solibs-2.12.1-x86_64-3.txz:  Rebuilt.
+  Patched "The GNU C library dynamic linker will dlopen arbitrary DSOs
+  during setuid loads."  This security issue allows a local attacker to
+  gain root by specifying an unsafe DSO in the library search path to be
+  used with a setuid binary in LD_AUDIT mode.
+  Bug found by Tavis Ormandy (with thanks to Ben Hawkes and Julien Tinnes).
+  For more information, see:
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-3856
+    http://seclists.org/fulldisclosure/2010/Oct/344
+  (* Security fix *)
+a/glibc-zoneinfo-2.12.1-noarch-3.txz:  Rebuilt.
+  Upgraded to tzcode2010n and tzdata2010n.
+a/grep-2.7-x86_64-1.txz:  Upgraded.
+ap/alsa-utils-1.0.23-x86_64-3.txz:  Rebuilt.
+  Don't try to load ALSA OSS modules if they aren't available.
+  Thanks to John Fitzgerald for the patch.
+l/glibc-2.12.1-x86_64-3.txz:  Rebuilt.
+  For more information, see:
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-3856
+    http://seclists.org/fulldisclosure/2010/Oct/344
+  (* Security fix *)
+l/glibc-i18n-2.12.1-x86_64-3.txz:  Rebuilt.
+l/glibc-profile-2.12.1-x86_64-3.txz:  Rebuilt.
+xap/mozilla-firefox-3.6.12-x86_64-1.txz:  Upgraded.
+  This fixes some security issues.
+  For more information, see:
+    http://www.mozilla.org/security/known-vulnerabilities/firefox36.html
+  (* Security fix *)
 +--------------------------+
-Mon Jan 25 23:13:23 UTC 2010
-a/eject-2.1.5-x86_64-2.txz:  Rebuilt.
-  Fixed a problem handling spaces within mount points.
-  Thanks to Andrea Amerini for the bug report.
-a/syslinux-3.84-x86_64-2.txz:  Rebuilt.
-  Fixed missing files.
-l/seamonkey-solibs-2.0.2-x86_64-2.txz:  Rebuilt.
-n/rdist-6.1.5-x86_64-2.txz:  Rebuilt.
-  Merged Fedora patches to fix symlink creation by rdistd.
-  Thanks to Vincent Liggio for the bug report.
-xap/seamonkey-2.0.2-x86_64-2.txz:  Rebuilt.
-  Added js.msg "header" needed to compile google-gadgets.
-  Thanks to Heinz Wiesinger for the bug report.
-+--------------------------+
-Sun Jan 24 20:22:46 UTC 2010
-a/aaa_elflibs-13.013-x86_64-1.txz:  Rebuilt.
-  Added libltdl.so.3.1.6.
-a/gettext-0.17-x86_64-3.txz:  Rebuilt.
-a/kernel-firmware-2.6.32.5-noarch-1.txz:  Upgraded.
-a/kernel-generic-2.6.32.5-x86_64-1.txz:  Upgraded.
-a/kernel-huge-2.6.32.5-x86_64-1.txz:  Upgraded.
-a/kernel-modules-2.6.32.5-x86_64-1.txz:  Upgraded.
-a/syslinux-3.84-x86_64-1.txz:  Upgraded.
-ap/gphoto2-2.4.7-x86_64-2.txz:  Rebuilt.
-  Recompiled against libtool-2.2.6b.
-ap/rpm-4.8.0-x86_64-1.txz:  Upgraded.
-ap/sox-14.3.0-x86_64-2.txz:  Rebuilt.
-  Recompiled against libtool-2.2.6b.
-d/autoconf-2.65-noarch-1.txz:  Upgraded.
-d/automake-1.11.1-noarch-1.txz:  Upgraded.
-d/cmake-2.8.0-x86_64-1.txz:  Upgraded.
-d/gcc-4.4.3-x86_64-1.txz:  Upgraded.
-d/gcc-g++-4.4.3-x86_64-1.txz:  Upgraded.
-d/gcc-gfortran-4.4.3-x86_64-1.txz:  Upgraded.
-d/gcc-gnat-4.4.3-x86_64-1.txz:  Upgraded.
-d/gcc-java-4.4.3-x86_64-1.txz:  Upgraded.
-d/gcc-objc-4.4.3-x86_64-1.txz:  Upgraded.
-d/gettext-tools-0.17-x86_64-4.txz:  Rebuilt.
-  Recompiled against libgcj.so.10.
-d/guile-1.8.7-x86_64-2.txz:  Rebuilt.
-  Recompiled against libtool-2.2.6b.
-d/kernel-headers-2.6.32.5-x86-1.txz:  Upgraded.
-d/libtool-2.2.6b-x86_64-1.txz:  Upgraded.
-d/nasm-2.07-x86_64-1.txz:  Upgraded.
-k/kernel-source-2.6.32.5-noarch-1.txz:  Upgraded.
-l/jre-6u18-x86_64-1.txz:  Upgraded.
-  Upgraded to Java(TM) 2 Platform Standard Edition Runtime Environment
-  Version 6.0 update 18.
-l/libgphoto2-2.4.7-x86_64-2.txz:  Rebuilt.
-  Recompiled against libtool-2.2.6b.
-l/libnotify-0.4.5-x86_64-1.txz:  Added.
-l/phonon-4.3.1-x86_64-3.txz:  Rebuilt.
-  Fixed problems with UTF8 filenames (noted with Amarok).
-  Thanks to Vincent Batts for tracking down the upstream patches.
-l/seamonkey-solibs-2.0.2-x86_64-1.txz:  Upgraded.
-l/urwid-0.9.9-x86_64-1.txz:  Upgraded.
-n/dhcpcd-5.1.4-x86_64-1.txz:  Upgraded.
-n/gnutls-2.8.5-x86_64-1.txz:  Upgraded.
-n/httpd-2.2.14-x86_64-1.txz:  Upgraded.
-  This fixes a couple of security bugs when using mod_proxy_ftp.
+Tue Oct 26 17:02:19 UTC 2010
+l/boost-1.42.0-x86_64-2.txz:  Rebuilt.
+  Patched to work with gcc-4.5.1.
+l/seamonkey-solibs-2.0.9-x86_64-1.txz
+n/mutt-1.5.21-x86_64-1.txz:  Upgraded.
+  Thanks to Audrius Kazukauskas for the gpgme patch.
+xap/seamonkey-2.0.9-x86_64-1.txz
+  This release fixes some more security vulnerabilities.
   For more information, see:
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3094
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3095
-  (* Security fix *)
-n/net-snmp-5.5-x86_64-2.txz:  Rebuilt.
-  It looks like net-snmp has to be compiled twice if the library sonames
-  are bumped, otherwise the perl module will remain linked against the
-  old library versions.
-n/network-scripts-13.0-noarch-3.txz:  Upgraded.
-  rc.inet1 is now compatible with dhcpcd-5.1.x.
-n/php-5.2.12-x86_64-1.txz:  Upgraded.
-  This fixes many bugs, including a few security issues.
+    http://www.mozilla.org/security/known-vulnerabilities/seamonkey20.html
+  (* Security fix *)
++--------------------------+
+Wed Oct 20 23:14:23 UTC 2010
+a/glibc-solibs-2.12.1-x86_64-2.txz:  Rebuilt.
+  Patched "dynamic linker expands $ORIGIN in setuid library search path".
+  This security issue allows a local attacker to gain root if they can create
+  a hard link to a setuid root binary.  Thanks to Tavis Ormandy.
   For more information, see:
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3557
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3558
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-4017
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-4142
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-4143
-  (* Security fix *)
-xap/mozilla-firefox-3.6-x86_64-1.txz:  Upgraded.
-xap/mozilla-thunderbird-3.0.1-x86_64-1.txz:  Upgraded.
-  This upgrade fixes some more security bugs.
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-3847
+    http://seclists.org/fulldisclosure/2010/Oct/257
+  (* Security fix *)
+a/glibc-zoneinfo-2.12.1-noarch-2.txz:  Rebuilt.
+a/sysklogd-1.5-x86_64-1.txz:  Upgraded.
+l/glibc-2.12.1-x86_64-2.txz:  Rebuilt.
+l/glibc-i18n-2.12.1-x86_64-2.txz:  Rebuilt.
+l/glibc-profile-2.12.1-x86_64-2.txz:  Rebuilt.
+xap/mozilla-firefox-3.6.11-x86_64-1.txz:  Upgraded.
+  This fixes some security issues.
   For more information, see:
-    http://www.mozilla.org/security/known-vulnerabilities/thunderbird30.html
+    http://www.mozilla.org/security/known-vulnerabilities/firefox36.html
   (* Security fix *)
-xap/pidgin-2.6.5-x86_64-1.txz:  Upgraded.
-  This fixes a directory traversal vulnerability in Pidgin's MSN protocol
-  handling that may allow attackers to download arbitrary files.
+xap/mozilla-thunderbird-3.1.5-x86_64-1.txz:  Upgraded.
+  This upgrade fixes some more security bugs.
   For more information, see:
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-0013
+    http://www.mozilla.org/security/known-vulnerabilities/thunderbird31.html
   (* Security fix *)
-xap/sane-1.0.20-x86_64-2.txz:  Rebuilt.
-  Recompiled against libtool-2.2.6b.
-xap/seamonkey-2.0.2-x86_64-1.txz:  Upgraded.
-extra/jdk-6/jdk-6u18-x86_64-1.txz:  Upgraded.
-  Upgraded to Java(TM) 2 Platform Standard Edition Development Kit
-  Version 6.0 update 18.
-extra/slacktrack/slacktrack-2.07-x86_64-1.txz:  Upgraded.
-  Thanks to Stuart Winter.
-extra/wicd/wicd-1.7.0-x86_64-1.txz:  Upgraded.
-isolinux/initrd.img:  Rebuilt.
-kernels/*:  Upgraded.
-testing/packages/btrfs-progs-20100120-x86_64-1.txz:  Added.
-usb-and-pxe-installers/usbboot.img:  Rebuilt.
 +--------------------------+
-Sat Jan  9 01:42:22 UTC 2010
-a/kernel-firmware-2.6.32.3-noarch-1.txz:  Upgraded.
-a/kernel-generic-2.6.32.3-x86_64-1.txz:  Upgraded.
-a/kernel-huge-2.6.32.3-x86_64-1.txz:  Upgraded.
-a/kernel-modules-2.6.32.3-x86_64-1.txz:  Upgraded.
-d/kernel-headers-2.6.32.3-x86-1.txz:  Upgraded.
-k/kernel-source-2.6.32.3-noarch-1.txz:  Upgraded.
-n/samba-3.4.4-x86_64-1.txz:  Upgraded.
-xap/mozilla-firefox-3.5.7-x86_64-1.txz:  Upgraded.
+Mon Oct 18 20:34:23 UTC 2010
+a/aaa_elflibs-13.2-x86_64-1.txz:  Upgraded.
+  Added libelf.so.0.8.13.
+d/gcc-4.5.1-x86_64-2.txz:  Rebuilt.
+  Added support for LTO (Link Time Optimization).
+d/gcc-g++-4.5.1-x86_64-2.txz:  Rebuilt.
+d/gcc-gfortran-4.5.1-x86_64-2.txz:  Rebuilt.
+d/gcc-gnat-4.5.1-x86_64-2.txz:  Rebuilt.
+d/gcc-java-4.5.1-x86_64-2.txz:  Rebuilt.
+d/gcc-objc-4.5.1-x86_64-2.txz:  Rebuilt.
+l/libelf-0.8.13-x86_64-1.txz:  Added.
+  This is needed to enable LTO support in GCC.
++--------------------------+
+Sat Oct 16 20:03:16 UTC 2010
+xap/xaos-3.5-x86_64-1.txz:  Added.
+  Added as a tribute to the late Dr. Benoit Mandelbrot.
++--------------------------+
+Wed Oct 13 20:30:44 UTC 2010
+a/glibc-solibs-2.12.1-x86_64-1.txz:  Upgraded.
+a/glibc-zoneinfo-2.12.1-noarch-1.txz:  Upgraded.
+  Upgraded to tzcode2010m and tzdata2010m.
+a/hdparm-9.33-x86_64-1.txz:  Upgraded.
+a/kernel-firmware-2.6.35.7-noarch-1.txz:  Upgraded.
+a/kernel-generic-2.6.35.7-x86_64-1.txz:  Upgraded.
+a/kernel-huge-2.6.35.7-x86_64-1.txz:  Upgraded.
+a/kernel-modules-2.6.35.7-x86_64-1.txz:  Upgraded.
+d/kernel-headers-2.6.35.7-x86-1.txz:  Upgraded.
+a/mcelog-1.0pre3-x86_64-1.txz:  Added.
+d/binutils-2.20.51.0.11-x86_64-1.txz:  Upgraded.
+d/gcc-4.5.1-x86_64-1.txz:  Upgraded.
+d/gcc-g++-4.5.1-x86_64-1.txz:  Upgraded.
+d/gcc-gfortran-4.5.1-x86_64-1.txz:  Upgraded.
+d/gcc-gnat-4.5.1-x86_64-1.txz:  Upgraded.
+d/gcc-java-4.5.1-x86_64-1.txz:  Upgraded.
+  Added fastjar-0.97 (previously bundled with gcc-java).
+d/gcc-objc-4.5.1-x86_64-1.txz:  Upgraded.
+k/kernel-source-2.6.35.7-noarch-1.txz:  Upgraded.
+l/glibc-2.12.1-x86_64-1.txz:  Upgraded.
+l/glibc-i18n-2.12.1-x86_64-1.txz:  Upgraded.
+l/glibc-profile-2.12.1-x86_64-1.txz:  Upgraded.
+x/dejavu-fonts-ttf-2.32-noarch-1.txz:  Upgraded.
 isolinux/initrd.img:  Rebuilt.
 kernels/*:  Upgraded.
+pasture/make-3.81-x86_64-3.txz:  Added.
+  This version of GNU make is still needed to build many things.
+  Added the --libdir patch for proper library searching on x86_64.
 usb-and-pxe-installers/usbboot.img:  Rebuilt.
 +--------------------------+
-Mon Jan  4 21:43:02 UTC 2010
-  New kernels...  and this deserves a mention/warning:  the last bits of the
-  "old" IDE/ATA system have been removed now.  Everything should be using
-  the libata based drivers now, so if you have any drives that are currently
-  running as /dev/hda, /dev/hdb, etc., when you reboot with these kernels all
-  drives will be renamed as /dev/sda, /dev/sdb, etc.  If you had any /dev/sd*
-  already, they might get renamed.  Adjustments may be required in
-  /etc/lilo.conf, /etc/fstab, the initrd, and elsewhere.  Good luck!
-a/glibc-solibs-2.11.1-x86_64-1.txz:  Upgraded.
-a/glibc-zoneinfo-2.11.1-noarch-1.txz:  Upgraded.
-a/kernel-firmware-2.6.32.2-noarch-1.txz:  Upgraded.
-a/kernel-generic-2.6.32.2-x86_64-1.txz:  Upgraded.
-a/kernel-huge-2.6.32.2-x86_64-1.txz:  Upgraded.
-a/kernel-modules-2.6.32.2-x86_64-1.txz:  Upgraded.
-d/gcc-4.4.2-x86_64-1.txz:  Moved from /testing.
-d/gcc-g++-4.4.2-x86_64-1.txz:  Moved from /testing.
-d/gcc-gfortran-4.4.2-x86_64-1.txz:  Moved from /testing.
-d/gcc-gnat-4.4.2-x86_64-1.txz:  Moved from /testing.
-d/gcc-java-4.4.2-x86_64-1.txz:  Moved from /testing.
-d/gcc-objc-4.4.2-x86_64-1.txz:  Moved from /testing.
-d/kernel-headers-2.6.32.2-x86-1.txz:  Upgraded.
-k/kernel-source-2.6.32.2-noarch-1.txz:  Upgraded.
-l/glibc-2.11.1-x86_64-1.txz:  Upgraded.
-l/glibc-i18n-2.11.1-x86_64-1.txz:  Upgraded.
-l/glibc-profile-2.11.1-x86_64-1.txz:  Upgraded.
-n/wireless-tools-29-x86_64-6.txz:  Rebuilt.
-  In rc.wireless, look for /sys/class/net/$dev/wireless rather than at the
-  contents of /proc/net/wireless to determine if an interface is wireless.
-  In recent kernels, interfaces that are not active will not appear in
-  /proc/net/wireless.  Thanks to Marin Glibic and Piter Punk.
-isolinux/initrd.img:  Rebuilt.
-kernels/*:  Upgraded.
+Wed Sep 22 19:17:42 UTC 2010
+testing/packages/mozilla-firefox-4.0b6-x86_64-2.txz:  Rebuilt.
+  Removed firefox 3.6.10 files.
++--------------------------+
+Wed Sep 22 03:03:58 UTC 2010
+a/kernel-firmware-2.6.33.4-noarch-2.txz:  Rebuilt.
+a/kernel-generic-2.6.33.4-x86_64-2.txz:  Rebuilt.
+  This kernel has been patched to fix security problems on x86_64:
+    64-bit Compatibility Mode Stack Pointer Underflow (CVE-2010-3081).
+    IA32 System Call Entry Point Vulnerability (CVE-2010-3301).
+  These vulnerabilities allow local users to gain root privileges.
+  For more information, see:
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-3081
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-3301
+  (* Security fix *)
+a/kernel-huge-2.6.33.4-x86_64-2.txz:  Rebuilt.
+  Patched for CVE-2010-3081 and CVE-2010-3301.
+  (* Security fix *)
+a/kernel-modules-2.6.33.4-x86_64-2.txz:  Rebuilt.
+d/kernel-headers-2.6.33.4-x86-2.txz:  Rebuilt.
+k/kernel-source-2.6.33.4-noarch-2.txz:  Rebuilt.
+  Patched for CVE-2010-3081 and CVE-2010-3301.
+  (* Security fix *)
+kernels/*:  Rebuilt.
+  Patched for CVE-2010-3081 and CVE-2010-3301.
+  (* Security fix *)
 usb-and-pxe-installers/usbboot.img:  Rebuilt.
+  Patched for CVE-2010-3081 and CVE-2010-3301.
+  (* Security fix *)
 +--------------------------+
-Sat Dec 19 00:09:53 UTC 2009
-l/akonadi-1.2.1-x86_64-2.txz:  Rebuilt.
-l/liblastfm-0.3.0-x86_64-2.txz:  Rebuilt.
-  Make sure that libraries are installed in /usr/lib64/.
-  Thanks to Heinz Wiesinger for the bug report.
-l/seamonkey-solibs-2.0.1-x86_64-1.txz:  Upgraded.
-  Upgraded to seamonkey-2.0.1 shared libraries.
-xap/seamonkey-2.0.1-x86_64-1.txz:  Upgraded.
-  Upgraded to seamonkey-2.0.1.
-  This release fixes some more security vulnerabilities.
+Mon Sep 20 18:39:57 UTC 2010
+a/bzip2-1.0.6-x86_64-1.txz:  Upgraded.
+  This update fixes an integer overflow that could allow a specially
+  crafted bzip2 archive to cause a crash (denial of service), or execute
+  arbitrary code.
   For more information, see:
-    http://www.mozilla.org/security/known-vulnerabilities/seamonkey20.html
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-0405
   (* Security fix *)
 +--------------------------+
-Thu Dec 17 20:51:37 UTC 2009
-d/ruby-1.9.1_p243-x86_64-4.txz:  Rebuilt.
-  Added deprecated headers needed to build kdebindings.
-kde/amarok-2.2.1-x86_64-1.txz:  Upgraded.
-kde/k3b-1.69.0-x86_64-2.txz:  Rebuilt.
-kde/kdeaccessibility-4.3.4-x86_64-1.txz:  Upgraded.
-kde/kdeadmin-4.3.4-x86_64-1.txz:  Upgraded.
-kde/kdeartwork-4.3.4-x86_64-1.txz:  Upgraded.
-kde/kdebase-4.3.4-x86_64-1.txz:  Upgraded.
-kde/kdebase-runtime-4.3.4-x86_64-1.txz:  Upgraded.
-kde/kdebase-workspace-4.3.4-x86_64-1.txz:  Upgraded.
-kde/kdebindings-4.3.4-x86_64-1.txz:  Upgraded.
-  Thanks to oneforall for the Ruby 1.9.1 compatibility patches.
-kde/kdeedu-4.3.4-x86_64-1.txz:  Upgraded.
-kde/kdegames-4.3.4-x86_64-1.txz:  Upgraded.
-kde/kdegraphics-4.3.4-x86_64-1.txz:  Upgraded.
-kde/kdelibs-4.3.4-x86_64-1.txz:  Upgraded.
-kde/kdelibs-experimental-4.3.4-x86_64-1.txz:  Upgraded.
-kde/kdemultimedia-4.3.4-x86_64-1.txz:  Upgraded.
-kde/kdenetwork-4.3.4-x86_64-1.txz:  Upgraded.
-kde/kdepim-4.3.4-x86_64-1.txz:  Upgraded.
-kde/kdepim-runtime-4.3.4-x86_64-1.txz:  Upgraded.
-kde/kdepimlibs-4.3.4-x86_64-1.txz:  Upgraded.
-kde/kdeplasma-addons-4.3.4-x86_64-1.txz:  Upgraded.
-kde/kdesdk-4.3.4-x86_64-1.txz:  Upgraded.
-kde/kdetoys-4.3.4-x86_64-1.txz:  Upgraded.
-kde/kdeutils-4.3.4-x86_64-1.txz:  Upgraded.
-kde/kdevelop-3.9.97-x86_64-1.txz:  Upgraded.
-kde/kdevplatform-0.9.97-x86_64-1.txz:  Upgraded.
-kde/kdewebdev-4.3.4-x86_64-1.txz:  Upgraded.
-kde/ktorrent-3.3.2-x86_64-1.txz:  Upgraded.
-kde/oxygen-icons-4.3.4-x86_64-1.txz:  Upgraded.
-kdei/kde-l10n-*:  Upgraded.
-l/PyQt-4.6.2-x86_64-1.txz:  Upgraded.
-l/boost-1.41.0-x86_64-1.txz:  Upgraded.
-l/cairo-1.8.8-x86_64-1.txz:  Upgraded.
-  Firefox 3.5.6 requires a new cairo to fix a bug on Windows.  :-/
-l/djvulibre-3.5.22-x86_64-1.txz:  Upgraded.
-l/eigen2-2.0.10-x86_64-1.txz:  Upgraded.
-l/enchant-1.5.0-x86_64-1.txz:  Upgraded.
-l/exiv2-0.18.2-x86_64-1.txz:  Upgraded.
-l/fftw-3.2.2-x86_64-1.txz:  Added.
-  Thanks to Kyle Guinn for the build script.
-l/liblastfm-0.3.0-x86_64-1.txz:  Added.
-  Thanks to Vincent Batts for the build script.
-l/libsamplerate-0.1.7-x86_64-1.txz:  Added.
-  Thanks to Paul Wisehart and Robby Workman for the build script.
-l/poppler-0.12.2-x86_64-1.txz:  Upgraded.
-l/poppler-data-0.3.1-noarch-1.txz:  Upgraded.
-l/raptor-1.4.20-x86_64-1.txz:  Upgraded.
-l/sip-4.9.3-x86_64-1.txz:  Upgraded.
-l/taglib-1.6.1-x86_64-1.txz:  Upgraded.
-l/wv2-0.4.2-x86_64-1.txz:  Upgraded.
-xap/mozilla-firefox-3.5.6-x86_64-1.txz:  Upgraded.
-  Upgraded to firefox-3.5.6.
-  This fixes some security issues.
+Fri Sep 17 23:34:42 UTC 2010
+l/seamonkey-solibs-2.0.8-x86_64-1.txz:  Upgraded.
+xap/mozilla-firefox-3.6.10-x86_64-1.txz:  Upgraded.
+xap/mozilla-thunderbird-3.1.4-x86_64-1.txz:  Upgraded.
+xap/seamonkey-2.0.8-x86_64-1.txz:  Upgraded.
+testing/packages/mozilla-firefox-4.0b6-x86_64-1.txz:  Upgraded.
++--------------------------+
+Wed Sep 15 18:51:21 UTC 2010
+ap/sudo-1.7.4p4-x86_64-3.txz:  Rebuilt.
+  Hi folks, since the patches for old systems (8.1 - 10.2) were briefly
+  available containing a /var/lib with incorrect permissions, I'm issuing
+  these again just to be 100% sure that no systems out there will be left
+  with problems due to that.  This should do it (third time's the charm).
++--------------------------+
+Wed Sep 15 05:58:55 UTC 2010
+ap/sudo-1.7.4p4-x86_64-2.txz:  Rebuilt.
+  The last sudo packages accidentally changed the permissions on /var from
+  755 to 700.  This build restores the proper permissions.
+  Thanks to Petri Kaukasoina for pointing this out.
++--------------------------+
+Wed Sep 15 00:41:13 UTC 2010
+ap/sudo-1.7.4p4-x86_64-1.txz:  Upgraded.
+  This fixes a flaw that could lead to privilege escalation.
   For more information, see:
-    http://www.mozilla.org/security/known-vulnerabilities/firefox35.html
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-2956
+  (* Security fix *)
+n/samba-3.5.5-x86_64-1.txz:  Upgraded.
+  This upgrade fixes a buffer overflow in the sid_parse() function.
+  For more information, see:
+    http://www.samba.org/samba/security/CVE-2010-3069
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-3069
   (* Security fix *)
-xap/pidgin-2.6.4-x86_64-1.txz:  Upgraded.
 +--------------------------+
-Mon Dec 14 18:57:37 UTC 2009
-kde/k3b-1.69.0-x86_64-1.txz:  Upgraded.
+Mon Sep 13 22:15:18 CDT 2010
+testing/packages/mozilla-firefox-4.0b5-x86_64-1.txz:  Upgraded.
 +--------------------------+
-Sat Dec 12 04:51:11 UTC 2009
-xap/gimp-2.6.8-x86_64-1.txz:  Upgraded.
-  This fixes integer overflows in the image handling plugins that could
-  lead to the execution of arbitrary code or an application crash if a
-  malicious image is loaded.
+Fri Sep 10 04:07:41 UTC 2010
+l/seamonkey-solibs-2.0.7-x86_64-1.txz:  Upgraded.
+xap/audacious-2.4.0-x86_64-1.txz:  Upgraded.
+xap/audacious-plugins-2.4.0-x86_64-1.txz:  Upgraded.
+xap/gnuplot-4.4.0-x86_64-1.txz:  Upgraded.
+xap/mozilla-firefox-3.6.9-x86_64-1.txz:  Upgraded.
+  This fixes some security issues.
   For more information, see:
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-1570
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3909
+    http://www.mozilla.org/security/known-vulnerabilities/firefox36.html
   (* Security fix *)
-xap/mozilla-thunderbird-3.0-x86_64-1.txz:  Upgraded.
-  Congrats to Mozilla Messaging on the great new Thunderbird release!
-+--------------------------+
-Thu Dec 10 00:12:58 UTC 2009
-n/ntp-4.2.4p8-x86_64-1.txz:  Upgraded.
-  Prevent a denial-of-service attack involving spoofed mode 7 packets.
+xap/mozilla-thunderbird-3.1.3-x86_64-1.txz:  Upgraded.
+  This upgrade fixes some more security bugs.
   For more information, see:
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3563
+    http://www.mozilla.org/security/known-vulnerabilities/thunderbird31.html
   (* Security fix *)
-+--------------------------+
-Tue Dec  8 20:44:44 UTC 2009
-a/kernel-firmware-2.6.29.6-noarch-3.txz:  Rebuilt.
-a/kernel-generic-2.6.29.6-x86_64-3.txz:  Rebuilt.
-  Patched a bug (CVE-2009-1298) where oversized IP packets cause a
-  NULL pointer dereference and immediate hang.
+xap/seamonkey-2.0.7-x86_64-1.txz:  Upgraded.
+  This release fixes some more security vulnerabilities.
   For more information, see:
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-1298
-    http://lkml.org/lkml/2009/11/25/104
+    http://www.mozilla.org/security/known-vulnerabilities/seamonkey20.html
   (* Security fix *)
-a/kernel-huge-2.6.29.6-x86_64-3.txz:  Rebuilt.
-  Patched CVE-2009-1298.
++--------------------------+
+Mon Sep  6 22:49:31 UTC 2010
+d/ccache-3.0.1-x86_64-1.txz:  Upgraded.
+d/make-3.82-x86_64-2.txz:  Rebuilt.
+  Added --libdir=/usr/lib${LIBDIRSUFFIX} to fix link problems on x86_64.
+  Thanks to Ed Martin.
+d/mercurial-1.6.3-x86_64-1.txz:  Upgraded.
+kde/k3b-2.0.1-x86_64-1.txz:  Upgraded.
+kde/kdeaccessibility-4.5.1-x86_64-1.txz:  Upgraded.
+kde/kdeadmin-4.5.1-x86_64-1.txz:  Upgraded.
+kde/kdeartwork-4.5.1-x86_64-1.txz:  Upgraded.
+kde/kdebase-4.5.1-x86_64-1.txz:  Upgraded.
+kde/kdebase-runtime-4.5.1-x86_64-1.txz:  Upgraded.
+kde/kdebase-workspace-4.5.1-x86_64-1.txz:  Upgraded.
+kde/kdebindings-4.5.1-x86_64-1.txz:  Upgraded.
+kde/kdeedu-4.5.1-x86_64-1.txz:  Upgraded.
+kde/kdegames-4.5.1-x86_64-1.txz:  Upgraded.
+kde/kdegraphics-4.5.1-x86_64-1.txz:  Upgraded.
+kde/kdelibs-4.5.1-x86_64-1.txz:  Upgraded.
+kde/kdemultimedia-4.5.1-x86_64-1.txz:  Upgraded.
+kde/kdenetwork-4.5.1-x86_64-1.txz:  Upgraded.
+kde/kdepim-4.4.5-x86_64-2.txz:  Rebuilt.
+kde/kdepim-runtime-4.4.5-x86_64-2.txz:  Rebuilt.
+kde/kdepimlibs-4.5.1-x86_64-1.txz:  Upgraded.
+kde/kdeplasma-addons-4.5.1-x86_64-1.txz:  Upgraded.
+kde/kdesdk-4.5.1-x86_64-1.txz:  Upgraded.
+kde/kdetoys-4.5.1-x86_64-1.txz:  Upgraded.
+kde/kdeutils-4.5.1-x86_64-1.txz:  Upgraded.
+kde/kdevelop-4.0.2-x86_64-1.txz:  Upgraded.
+kde/kdevplatform-1.0.2-x86_64-1.txz:  Upgraded.
+kde/kdewebdev-4.5.1-x86_64-1.txz:  Upgraded.
+kde/koffice-2.2.2-x86_64-1.txz:  Upgraded.
+kde/oxygen-icons-4.5.1-x86_64-1.txz:  Upgraded.
+kdei/*:  Upgraded.
+l/libdbusmenu-qt-0.6.1-x86_64-1.txz:  Added.
+extra/yasm/yasm-1.1.0-x86_64-1.txz:  Upgraded.
+testing/packages/mozilla-firefox-4.0b4-x86_64-1.txz:  Added.
++--------------------------+
+Sat Aug 28 21:25:51 UTC 2010
+ap/vim-7.3.003-x86_64-1.txz:  Upgraded.
+l/libxml2-2.7.7-x86_64-1.txz:  Upgraded.
+l/sdl-1.2.14-x86_64-3.txz:  Rebuilt.
+n/wpa_supplicant-0.6.10-x86_64-2.txz:  Rebuilt.
+  Added a missing [D-BUS Service] file.
+  Thanks to Robby Workman.
+x/glew-1.5.5-x86_64-2.txz:  Rebuilt.
+xap/vim-gvim-7.3.003-x86_64-1.txz:  Upgraded.
++--------------------------+
+Fri Aug 27 00:23:17 UTC 2010
+a/grep-2.6.3-x86_64-2.txz:  Rebuilt.
+  Restored -P option that went missing with the upgrade to 2.6.x.
+  Thanks to Rich.
+a/rpm2tgz-1.2.2-x86_64-1.txz:  Upgraded.
+  Add support for .txz packages and rpm2txz symlink.
+  Avoid (none) values in slack-desc.
+  Add -c option (this works similar to makepkg -c y).
+  Thanks to Igor Murzov for the bugfixes and improvements.
+ap/vim-7.2.446-x86_64-1.txz:  Upgraded.
+  Upgraded to ctags-5.8.
+l/M2Crypto-0.20.2-x86_64-1.txz:  Upgraded.
+l/aspell-0.60.6-x86_64-1.txz:  Upgraded.
+l/audiofile-0.2.7-x86_64-1.txz:  Upgraded.
+l/chmlib-0.40-x86_64-1.txz:  Upgraded.
+l/gtkspell-2.0.16-x86_64-1.txz:  Upgraded.
+l/ilmbase-1.0.2-x86_64-1.txz:  Upgraded.
+l/libart_lgpl-2.3.21-x86_64-1.txz:  Upgraded.
+l/libcddb-1.3.2-x86_64-1.txz:  Upgraded.
+l/libical-0.44-x86_64-1.txz:  Upgraded.
+l/libidl-0.8.14-x86_64-1.txz:  Upgraded.
+l/libidn-1.19-x86_64-1.txz:  Upgraded.
+l/libmcs-0.7.2-x86_64-1.txz:  Upgraded.
+l/libmowgli-0.7.1-x86_64-1.txz:  Upgraded.
+l/libmpc-0.8.2-x86_64-1.txz:  Added.
+l/libnjb-2.2.6-x86_64-5.txz:  Rebuilt.
+l/liboil-0.3.17-x86_64-1.txz:  Upgraded.
+l/libpcap-1.1.1-x86_64-1.txz:  Added.  (split from tcpdump package)
+l/libzip-0.9.3-x86_64-1.txz:  Upgraded.
+l/lzo-2.03-x86_64-1.txz:  Upgraded.
+l/mhash-0.9.9.9-x86_64-1.txz:  Upgraded.
+l/ncurses-5.7-x86_64-3.txz:  Rebuilt.
+l/openexr-1.7.0-x86_64-1.txz:  Upgraded.
+l/pyrex-0.9.9-x86_64-1.txz:  Upgraded.
+l/wavpack-4.60.1-x86_64-1.txz:  Upgraded.
+l/zlib-1.2.5-x86_64-1.txz:  Upgraded.
+n/bridge-utils-1.4-x86_64-1.txz:  Upgraded.
+n/dhcpcd-5.2.7-x86_64-1.txz:  Upgraded.
+n/gnupg2-2.0.16-x86_64-1.txz:  Upgraded.
+  Patched to fix "Realloc Bug with X.509 certificates in GnuPG".
+  For more information, see:
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-2547
   (* Security fix *)
-a/kernel-modules-2.6.29.6-x86_64-3.txz:  Rebuilt.
-d/kernel-headers-2.6.29.6-x86-3.txz:  Rebuilt.
-k/kernel-source-2.6.29.6-noarch-3.txz:  Rebuilt.
-  Patched CVE-2009-1298, and included the diff in /usr/src/linux-2.6.29.6.
+n/gnutls-2.10.1-x86_64-1.txz:  Upgraded.
+n/httpd-2.2.16-x86_64-1.txz:  Upgraded.
+  Fix Handling of requests without a path segment.
+  For more information, see:
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-1452
   (* Security fix *)
-kernels/*:  Rebuilt.
-  Patched CVE-2009-1298.
-  (* Security fix *)
-+--------------------------+
-Mon Dec  7 02:13:13 UTC 2009
-d/ruby-1.9.1_p243-x86_64-3.txz:  Rebuilt.
-  Added an explicit --enable-pthread.  This is mostly to make sure that we get
-  the expected option set from future releases of Ruby -- it appears that not
-  only is --enable-pthread the default in ruby-1.9.1, but trying to use
-  --disable-pthread doesn't work.  Furthermore, Ruby and Tcl/Tk no longer work
-  together unless both Ruby and Tcl/Tk are compiled with thread support.
-  Compiling Tcl/Tk with thread support has caused some problems in the past.
-  If a threaded Tcl app tries to fork(), it will hang, but by now most affected
-  Tcl apps (such as eggdrop) should have patches available.
-  Anyway, this should fix the issues with Ruby and Tk.  Please test it, and
-  report any other problems that arise.
-tcl/tcl-8.5.8-x86_64-1.txz:  Upgraded.
-  Compiled using --enable-threads, since Ruby requires it to work with Tk.
-tcl/tclx-8.4-x86_64-3.txz:  Rebuilt.
-  Recompiled using --enable-threads.
-tcl/tix-8.4.3-x86_64-2.txz:  Rebuilt.
-  Recompiled using --enable-threads.
-tcl/tk-8.5.8-x86_64-1.txz:  Upgraded.
-  Compiled using --enable-threads, since Ruby requires it to work with Tk.
-+--------------------------+
-Sun Dec  6 03:23:23 UTC 2009
-a/sed-4.2.1-x86_64-1.txz:  Upgraded.
-d/git-1.6.5.4-x86_64-1.txz:  Upgraded.
-d/python-2.6.4-x86_64-1.txz:  Upgraded.
-d/subversion-1.6.6-x86_64-1.txz:  Upgraded.
-l/libxml2-2.7.6-x86_64-1.txz:  Upgraded.
-l/libxslt-1.1.26-x86_64-1.txz:  Upgraded.
-l/neon-0.29.0-x86_64-1.txz:  Upgraded.
-+--------------------------+
-Fri Dec  4 20:02:12 UTC 2009
-d/ruby-1.9.1_p243-x86_64-2.txz:  Rebuilt.
-  Fixed /usr/include/ruby symlink.  Thanks to Francisco Ambrozio.
-+--------------------------+
-Fri Dec  4 05:03:50 UTC 2009
-kde/koffice-2.1.0-x86_64-2.txz:  Rebuilt.
-  Fixed compiling krita by wrapping jpeglib.h with 'extern "C" { }'.
-  Thanks to Heinz Wiesinger and Francisco Ambrozio.
-+--------------------------+
-Wed Dec  2 20:51:55 UTC 2009
-a/xz-4.999.9beta-x86_64-1.tgz:  Upgraded.
-ap/rpm-4.7.2-x86_64-1.txz:  Upgraded.
-ap/sudo-1.6.8p12-x86_64-2.txz:  Rebuilt.
-  Added --with-env-editor to ./configure flags so that users can do this:
-  VISUAL=/usr/bin/pico visudo   OR   EDITOR=/usr/bin/pico visudo
-d/ruby-1.9.1_p243-x86_64-1.txz:  Upgraded.
-kde/koffice-2.1.0-x86_64-1.txz:  Upgraded.
-  Note that there's a _really_ ugly patch that was used to make this compile,
-  otherwise it fails with this error:
-    kis_jpeg_source.cpp:(.text+0x79): undefined reference to
-    `jpeg_resync_to_restart(jpeg_decompress_struct*, int)'
-  I would welcome any hints about how to compile koffice without this patch.
-kdei/koffice-l10n-*:  Upgraded.
-n/bind-9.4.3_P4-x86_64-1.txz:  Upgraded.
-  BIND 9.4.3-P4 is a SECURITY PATCH for BIND 9.4.3-P3.  It addresses a
-  potential cache poisoning vulnerability, in which data in the additional
-  section of a response could be cached without proper DNSSEC validation.
+n/iptraf-3.0.0-x86_64-4.txz:  Rebuilt.
+n/iw-0.9.20-x86_64-1.txz:  Upgraded.
+n/lftp-4.0.9-x86_64-1.txz:  Upgraded.
+n/libassuan-2.0.1-x86_64-1.txz:  Upgraded.
+n/libgcrypt-1.4.6-x86_64-1.txz:  Upgraded.
+n/libgpg-error-1.9-x86_64-1.txz:  Upgraded.
+n/libksba-1.0.8-x86_64-1.txz:  Upgraded.
+n/metamail-2.7-x86_64-5.txz:  Rebuilt.
+n/mutt-1.5.20-x86_64-1.txz:  Upgraded.
+  Thanks to Chip Cuccio for help with the new ./configure options.
+n/net-tools-1.60-x86_64-3.txz:  Rebuilt.
+n/php-5.2.14-x86_64-1.txz:  Upgraded.
+  Fixed several security issues.
   For more information, see:
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-4022
-    http://www.kb.cert.org/vuls/id/418861
-  (* Security fix *)
-n/proftpd-1.3.2b-x86_64-1.txz:  Upgraded.
-n/tcpdump-4.0.0-x86_64-2.txz:  Rebuilt.
-  Patched to fix '-i any'.  Thanks to Laurence Darby and Kanedaaa Bohater
-  for the bug report.
-  Added shared libpcap (and .so.0 compatibility symlink).
-  Thanks to Niels Horn for suggesting this, and testing compatibility with
-  programs that expect libpcap.so.0.
-xap/sane-1.0.20-x86_64-1.txz:  Upgraded.
-+--------------------------+
-Mon Nov 16 18:56:26 UTC 2009
-a/openssl-solibs-0.9.8l-x86_64-1.txz:  Upgraded.
-  Disables SSL renegotiation.
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-1917
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-2225
+    http://www.php-security.org/2010/05/31/mops-2010-060-php-session-serializer-session-data-injection-vulnerability/index.html
+    http://www.php-security.org/2010/06/25/mops-2010-061-php-splobjectstorage-deserialization-use-after-free-vulnerability/index.html
+  (* Security fix *)
+n/tcpdump-4.1.1-x86_64-1.txz:  Upgraded.
+  This requires the new libpcap package.
+n/tin-1.8.3-x86_64-1.txz:  Upgraded.
+tcl/expect-5.44.1.15-x86_64-1.txz:  Upgraded.
+x/anthy-9100h-x86_64-1.txz:  Upgraded.
+x/glew-1.5.5-x86_64-1.txz:  Upgraded.
+x/libhangul-0.0.11-x86_64-1.txz:  Upgraded.
+x/m17n-lib-1.6.1-x86_64-1.txz:  Upgraded.
+x/xorg-server-1.7.7-x86_64-2.txz:  Rebuilt.
+  Patched to prevent overwriting stack memory and bypassing security mechanisms
+  on systems that use a 2.6 Linux kernel.  Reported by Rafal Wojtczuk.
   For more information, see:
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3555
-  (* Security fix *)
-kde/mplayerthumbs-1.2-x86_64-2.txz:  Removed.
-  mplayerthumbs has been merged into kdemultimedia in KDE 4.3.3.
-  It is recommended to reinstall kdemultimedia after removing this package.
-l/seamonkey-solibs-2.0-x86_64-3.txz:  Rebuilt.
-n/nn-6.7.3-x86_64-3.txz:  Rebuilt.
-  Patched to retrieve hostname from /etc/HOSTNAME, use gpg rather than pgp,
-  and to use correct sizeof(long) depending on the system architecture.
-  Thanks to Aaron W. Hsu.
-n/openssl-0.9.8l-x86_64-1.txz:  Upgraded.
-  Disables SSL renegotiation.
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-2240
+  (* Security fix *)
+x/xorg-server-xephyr-1.7.7-x86_64-2.txz:  Rebuilt.
+x/xorg-server-xnest-1.7.7-x86_64-2.txz:  Rebuilt.
+x/xorg-server-xvfb-1.7.7-x86_64-2.txz:  Rebuilt.
+xap/audacious-2.3-x86_64-2.txz:  Rebuilt.
+xap/gimp-2.6.10-x86_64-1.txz:  Upgraded.
+xap/mozilla-thunderbird-3.1.2-x86_64-1.txz:  Upgraded.
+  Added LDAP support which was missing from the x86_64 build.
+  Thanks to Andrew Psaltis for the suggestion.
+xap/pidgin-2.7.3-x86_64-1.txz:  Upgraded.
+  This fixes a crash due to malformed X-Status messages.
   For more information, see:
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3555
-  (* Security fix *)
-xap/seamonkey-2.0-x86_64-3.txz:  Rebuilt.
-  Restored header files needed to build vlc and other programs.
-+--------------------------+
-Wed Nov 11 21:17:19 UTC 2009
-l/seamonkey-solibs-2.0-x86_64-2.txz:  Rebuilt.
-xap/seamonkey-2.0-x86_64-2.txz:  Rebuilt.
-  As of version 2.0, SeaMonkey no longer includes a shared libgtkmozembed
-  library, so the pkgconfig and header files for this have been removed from
-  the package to avoid confusion over why trying to compile programs that
-  use it no longer works.  There's not really any way to avoid this issue --
-  it's either upgrade SeaMonkey and lose libgtkmozembed, or keep using version
-  1.1.18 and miss out on SeaMonkey security updates.  If you really need
-  libgtkmozembed, the seamonkey-1.1.18 packages will be retained in either
-  /patches or /pasture for Slackware versions 13.0 and earlier.
-+--------------------------+
-Sun Nov  8 04:14:58 UTC 2009
-l/seamonkey-solibs-2.0-x86_64-1.txz:  Upgraded.
-xap/mozilla-firefox-3.5.5-x86_64-1.txz:  Upgraded.
-  Upgraded to firefox-3.5.5.
-  This fixes some stability bugs.
-xap/seamonkey-2.0-x86_64-1.txz:  Upgraded.
-+--------------------------+
-Sat Nov  7 22:09:46 UTC 2009
-l/phonon-4.3.1-x86_64-2.txz:  Added.
-  Phonon in Qt is missing support files needed by KDE, so this package
-  restores the missing pieces.  The Phonon library, include files, and
-  pkgconfig files will remain in the Qt package, as those are the most
-  up-to-date versions.  This package will contain the xine and gstreamer
-  backends and other files needed by KDE.  The gstreamer backend source
-  is taken from the newer sources in Qt, not from the standalone Phonon.
-  Sorry about the misfire last time...  this stuff should work.  :-)
-l/qt-4.5.3_063bded-x86_64-3.txz:  Rebuilt.
-  Use -phonon -no-phonon-backend options.
-+--------------------------+
-Fri Nov  6 00:22:35 UTC 2009
-a/less-418-x86_64-4.txz:  Rebuilt.
-  Patched lesspipe.sh to handle files of the form *.{1,2,3,4,5,6,7,8,9,n}.gz
-  that are not gzipped *roff.  Thanks to Mark Post.
-kde/kdeaccessibility-4.3.3-x86_64-1.txz:  Upgraded.
-kde/kdeadmin-4.3.3-x86_64-1.txz:  Upgraded.
-kde/kdeartwork-4.3.3-x86_64-1.txz:  Upgraded.
-kde/kdebase-4.3.3-x86_64-1.txz:  Upgraded.
-kde/kdebase-runtime-4.3.3-x86_64-1.txz:  Upgraded.
-kde/kdebase-workspace-4.3.3-x86_64-1.txz:  Upgraded.
-kde/kdebindings-4.3.3-x86_64-1.txz:  Upgraded.
-kde/kdeedu-4.3.3-x86_64-1.txz:  Upgraded.
-kde/kdegames-4.3.3-x86_64-1.txz:  Upgraded.
-kde/kdegraphics-4.3.3-x86_64-1.txz:  Upgraded.
-kde/kdelibs-4.3.3-x86_64-1.txz:  Upgraded.
-kde/kdelibs-experimental-4.3.3-x86_64-1.txz:  Upgraded.
-kde/kdemultimedia-4.3.3-x86_64-1.txz:  Upgraded.
-kde/kdenetwork-4.3.3-x86_64-1.txz:  Upgraded.
-kde/kdepim-4.3.3-x86_64-1.txz:  Upgraded.
-kde/kdepim-runtime-4.3.3-x86_64-1.txz:  Upgraded.
-kde/kdepimlibs-4.3.3-x86_64-1.txz:  Upgraded.
-kde/kdeplasma-addons-4.3.3-x86_64-1.txz:  Upgraded.
-kde/kdesdk-4.3.3-x86_64-1.txz:  Upgraded.
-kde/kdetoys-4.3.3-x86_64-1.txz:  Upgraded.
-kde/kdeutils-4.3.3-x86_64-1.txz:  Upgraded.
-kde/kdevelop-3.9.96-x86_64-1.txz:  Upgraded.
-kde/kdevplatform-0.9.96-x86_64-1.txz:  Upgraded.
-kde/kdewebdev-4.3.3-x86_64-1.txz:  Upgraded.
-kde/koffice-2.0.91-x86_64-1.txz:  Upgraded.
-kde/oxygen-icons-4.3.3-x86_64-1.txz:  Upgraded.
-kdei/*:  Upgraded.
-l/gst-plugins-base-0.10.25-x86_64-1.txz:  Upgraded.
-l/gst-plugins-good-0.10.16-x86_64-1.txz:  Added.
-l/gstreamer-0.10.25-x86_64-1.txz:  Upgraded.
-l/jre-6u17-x86_64-1.txz:  Upgraded.
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-2528
+  (* Security fix *)
+xap/vim-gvim-7.2.446-x86_64-1.txz:  Upgraded.
++--------------------------+
+Sat Jul 31 17:37:45 UTC 2010
+l/akonadi-1.4.0-x86_64-1.txz:  Upgraded.
++--------------------------+
+Fri Jul 30 00:12:53 UTC 2010
+l/soprano-2.4.64-x86_64-1.txz:  Upgraded.
+l/virtuoso-ose-6.1.2-x86_64-1.txz:  Upgraded.
++--------------------------+
+Thu Jul 29 01:45:40 UTC 2010
+a/aaa_terminfo-5.7-x86_64-2.txz:  Rebuilt.
+a/dialog-1.1_20100428-x86_64-1.txz:  Upgraded.
+a/ed-1.4-x86_64-1.txz:  Upgraded.
+a/grep-2.6.3-x86_64-1.txz:  Upgraded.
+a/hdparm-9.29-x86_64-1.txz:  Upgraded.
+a/mtx-1.3.12-x86_64-1.txz:  Upgraded.
+a/ncompress-4.2.4.3-x86_64-1.txz:  Upgraded.
+a/patch-2.6.1-x86_64-1.txz:  Upgraded.
+a/procps-3.2.8-x86_64-1.txz:  Upgraded.
+a/sharutils-4.9-x86_64-1.txz:  Upgraded.
+a/tcsh-6.17.00-x86_64-1.txz:  Upgraded.
+a/tree-1.5.3-x86_64-1.txz:  Upgraded.
+a/utempter-1.1.5-x86_64-1.txz:  Upgraded.
+a/zoo-2.10_22-x86_64-1.txz:  Upgraded.
+ap/a2ps-4.14-x86_64-5.txz:  Rebuilt.
+ap/acct-6.5.4-x86_64-1.txz:  Upgraded.
+ap/at-3.1.12-x86_64-1.txz:  Upgraded.
+ap/aumix-2.9.1-x86_64-1.txz:  Upgraded.
+ap/cdrdao-1.2.3-x86_64-1.txz:  Upgraded.
+ap/diffstat-1.53-x86_64-1.txz:  Upgraded.
+ap/enscript-1.6.5.2-x86_64-1.txz:  Upgraded.
+ap/groff-1.20.1-x86_64-2.txz:  Rebuilt.
+  Patched a bug in doc.tmac.  Thanks to Willy Sudiarto Raharjo.
+ap/joe-3.7-x86_64-1.txz:  Upgraded.
+ap/jove-4.16.0.73-x86_64-1.txz:  Upgraded.
+ap/ksh93-2010_06_21-x86_64-1.txz:  Upgraded.
+ap/linuxdoc-tools-0.9.66-x86_64-3.txz:  Rebuilt.
+ap/lsscsi-0.24b1-x86_64-1.txz:  Upgraded.
+ap/sc-7.16-x86_64-3.txz:  Rebuilt.
+ap/texinfo-4.13a-x86_64-4.txz:  Rebuilt.
+ap/sox-14.3.1-x86_64-1.txz:  Upgraded.
+ap/vorbis-tools-1.4.0-x86_64-1.txz:  Upgraded.
+ap/workbone-2.40-x86_64-4.txz:  Rebuilt.
+d/gperf-3.0.4-x86_64-1.txz:  Upgraded.
+d/make-3.82-x86_64-1.txz:  Upgraded.
+d/pkg-config-0.25-x86_64-1.txz:  Upgraded.
+d/strace-4.5.20-x86_64-1.txz:  Upgraded.
+l/jre-6u21-x86_64-1.txz:  Upgraded.
   Upgraded to Java(TM) 2 Platform Standard Edition Runtime Environment
-  Version 6.0 update 17.
-l/phonon-4.3.1-x86_64-1.txz:  Removed.
-l/qca-2.0.2-x86_64-1.txz:  Upgraded.
-l/qt-4.5.3_063bded-x86_64-2.txz:  Rebuilt.
-  Recompiled to add the included version of the Phonon multimedia framework.
-l/strigi-0.7.0-x86_64-1.txz:  Upgraded.
-x/dejavu-fonts-ttf-2.30-noarch-1.txz:  Upgraded.
-extra/jdk-6/jdk-6u17-x86_64-1.txz:  Upgraded.
+  Version 6.0 update 21.
+l/libao-1.0.0-x86_64-1.txz:  Upgraded.
+l/libvorbis-1.3.1-x86_64-1.txz:  Upgraded.
+l/libogg-1.2.0-x86_64-1.txz:  Upgraded.
+n/samba-3.5.4-x86_64-1.txz:  Upgraded.
+extra/jdk-6/jdk-6u21-x86_64-1.txz:  Upgraded.
   Upgraded to Java(TM) 2 Platform Standard Edition Development Kit
-  Version 6.0 update 17.
+  Version 6.0 update 21.
 +--------------------------+
-Mon Nov  2 20:41:16 UTC 2009
-xap/mozilla-firefox-3.5.4-x86_64-1.txz:  Upgraded.
-  Upgraded to firefox-3.5.4.
-  This fixes some security issues.
+Sat Jul 24 03:02:29 UTC 2010
+xap/mozilla-firefox-3.6.8-x86_64-1.txz:  Upgraded.
+  This fixes a regression in Firefox 3.6.7.
   For more information, see:
-    http://www.mozilla.org/security/known-vulnerabilities/firefox35.html
-  (* Security fix *)
-+--------------------------+
-Sat Oct 31 21:40:29 UTC 2009
-l/PyQt-4.6.1-x86_64-1.txz:  Upgraded.
-l/sip-4.9.1-x86_64-1.txz:  Upgraded.
-+--------------------------+
-Fri Oct 30 23:37:47 UTC 2009
-testing/packages/gcc-4.4.2/gcc-4.4.2-x86_64-1.txz:  Upgraded.
-testing/packages/gcc-4.4.2/gcc-g++-4.4.2-x86_64-1.txz:  Upgraded.
-testing/packages/gcc-4.4.2/gcc-gfortran-4.4.2-x86_64-1.txz:  Upgraded.
-testing/packages/gcc-4.4.2/gcc-gnat-4.4.2-x86_64-1.txz:  Upgraded.
-testing/packages/gcc-4.4.2/gcc-java-4.4.2-x86_64-1.txz:  Upgraded.
-testing/packages/gcc-4.4.2/gcc-objc-4.4.2-x86_64-1.txz:  Upgraded.
-+--------------------------+
-Fri Oct 30 05:54:05 UTC 2009
-l/QScintilla-2.4-x86_64-2.txz:  Rebuilt.
-  This fixes missing PyQt bindings -- perhaps a compile order issue.
-  Thanks to Raffaele Sgarro and Grigorios Bouzakis.
-+--------------------------+
-Wed Oct 28 22:50:35 UTC 2009
-kde/kdegraphics-4.3.2-x86_64-2.txz:  Rebuilt.
-  Recompiled against new libpoppler.
-kde/koffice-2.0.83-x86_64-2.txz:  Rebuilt.
-  Recompiled against new libpoppler.
-l/babl-0.1.0-x86_64-1.txz:  Upgraded.
-l/gegl-0.1.0-x86_64-1.txz:  Upgraded.
-l/poppler-0.12.1-x86_64-1.txz:  Upgraded.
-  Security fixes based on xpdf 3.02pl4 were integrated.
+    http://www.mozilla.org/security/known-vulnerabilities/firefox36.html
+  (* Security fix *)
++--------------------------+
+Wed Jul 21 21:37:53 UTC 2010
+d/clisp-2.49-x86_64-1.txz:  Upgraded.
+l/seamonkey-solibs-2.0.6-x86_64-1.txz:  Upgraded.
+xap/mozilla-firefox-3.6.7-x86_64-1.txz:  Upgraded.
+  This fixes some security issues.
   For more information, see:
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3603
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3604
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3605
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3606
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3608
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3609
-  (* Security fix *)
-l/poppler-data-0.3.0-noarch-1.txz:  Upgraded.
-xap/gimp-2.6.7-x86_64-1.txz:  Upgraded.
-xap/xpdf-3.02pl4-x86_64-1.txz:  Upgraded.
-  This update fixes several security issues that could lead to an
-  application crash, or execution of arbitrary code.
+    http://www.mozilla.org/security/known-vulnerabilities/firefox36.html
+  (* Security fix *)
+xap/mozilla-thunderbird-3.1.1-x86_64-1.txz:  Upgraded.
+  This upgrade fixes some more security bugs.
+  (* Security fix *)
+xap/seamonkey-2.0.6-x86_64-1.txz:  Upgraded.
+  This release fixes some more security vulnerabilities.
   For more information, see:
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3603
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3604
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3605
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3606
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3608
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3609
-  (* Security fix *)
-+--------------------------+
-Thu Oct 22 22:09:40 UTC 2009
-New KDE and other updates.  Thanks to Vincent Batts, Robby Workman, Piter Punk,
-  and Eric Hameleers for the help!
-ap/gphoto2-2.4.7-x86_64-1.txz:  Upgraded.
-kde/guidance-power-manager-4.3.1-x86_64-1.txz:  Upgraded.
-kde/k3b-1.68.0-x86_64-1.txz:  Upgraded.
-kde/kaudiocreator-r1038308-x86_64-1.txz:  Upgraded.
-kde/kdeaccessibility-4.3.2-x86_64-1.txz:  Upgraded.
-kde/kdeadmin-4.3.2-x86_64-1.txz:  Upgraded.
-kde/kdeartwork-4.3.2-x86_64-1.txz:  Upgraded.
-kde/kdebase-4.3.2-x86_64-1.txz:  Upgraded.
-kde/kdebase-runtime-4.3.2-x86_64-1.txz:  Upgraded.
-kde/kdebase-workspace-4.3.2-x86_64-1.txz:  Upgraded.
-kde/kdebindings-4.3.2-x86_64-1.txz:  Upgraded.
-kde/kdeedu-4.3.2-x86_64-1.txz:  Upgraded.
-kde/kdegames-4.3.2-x86_64-1.txz:  Upgraded.
-kde/kdegraphics-4.3.2-x86_64-1.txz:  Upgraded.
-kde/kdelibs-4.3.2-x86_64-1.txz:  Upgraded.
-kde/kdelibs-experimental-4.3.2-x86_64-1.txz:  Added.
-kde/kdemultimedia-4.3.2-x86_64-1.txz:  Upgraded.
-kde/kdenetwork-4.3.2-x86_64-1.txz:  Upgraded.
-kde/kdepim-4.3.2-x86_64-1.txz:  Upgraded.
-kde/kdepim-runtime-4.3.2-x86_64-1.txz:  Added.
-kde/kdepimlibs-4.3.2-x86_64-1.txz:  Upgraded.
-kde/kdeplasma-addons-4.3.2-x86_64-1.txz:  Upgraded.
-kde/kdesdk-4.3.2-x86_64-1.txz:  Upgraded.
-kde/kdetoys-4.3.2-x86_64-1.txz:  Upgraded.
-kde/kdeutils-4.3.2-x86_64-1.txz:  Upgraded.
-kde/kdevelop-3.9.95-x86_64-1.txz:  Upgraded.
-kde/kdevplatform-0.9.95-x86_64-1.txz:  Upgraded.
-kde/kdewebdev-4.3.2-x86_64-1.txz:  Upgraded.
-kde/koffice-2.0.83-x86_64-1.txz:  Upgraded.
-kde/konq-plugins-4.3.1-x86_64-1.txz:  Upgraded.
-kde/kopete-cryptography-1.3.0_kde4.3.1-x86_64-1.txz:  Added.
-kde/ktorrent-3.2.3-x86_64-1.txz:  Upgraded.
-kde/oxygen-icons-4.3.2-x86_64-1.txz:  Added.
-kde/skanlite-0.3_kde4.3.1-x86_64-1.txz:  Upgraded.
+    http://www.mozilla.org/security/known-vulnerabilities/seamonkey20.html
+  (* Security fix *)
++--------------------------+
+Mon Jul 19 23:36:56 UTC 2010
+n/bind-9.7.1_P2-x86_64-1.txz:  Upgraded.
+  This reverses a change that was introduced in BIND 9.7.1 that could cause
+  cause the server to enter an endless query loop resulting in a denial of
+  service.  (-current only, does not affect any released Slackware)
+  Thanks to Grigorios Bouzakis for pointing out this BIND update.
+  (* Security fix *)
++--------------------------+
+Sun Jul 18 01:41:06 UTC 2010
+KDE 4.4.5 update -- thanks to Eric Hameleers!
+kde/amarok-2.3.1-x86_64-1.txz:  Upgraded.
+kde/k3b-2.0.0-x86_64-1.txz:  Upgraded.
+kde/kdeaccessibility-4.4.5-x86_64-1.txz:  Upgraded.
+kde/kdeadmin-4.4.5-x86_64-1.txz:  Upgraded.
+kde/kdeartwork-4.4.5-x86_64-1.txz:  Upgraded.
+kde/kdebase-4.4.5-x86_64-1.txz:  Upgraded.
+kde/kdebase-runtime-4.4.5-x86_64-1.txz:  Upgraded.
+kde/kdebase-workspace-4.4.5-x86_64-1.txz:  Upgraded.
+kde/kdebindings-4.4.5-x86_64-1.txz:  Upgraded.
+kde/kdeedu-4.4.5-x86_64-1.txz:  Upgraded.
+kde/kdegames-4.4.5-x86_64-1.txz:  Upgraded.
+kde/kdegraphics-4.4.5-x86_64-1.txz:  Upgraded.
+kde/kdelibs-4.4.5-x86_64-1.txz:  Upgraded.
+kde/kdemultimedia-4.4.5-x86_64-1.txz:  Upgraded.
+kde/kdenetwork-4.4.5-x86_64-1.txz:  Upgraded.
+kde/kdepim-4.4.5-x86_64-1.txz:  Upgraded.
+kde/kdepim-runtime-4.4.5-x86_64-1.txz:  Upgraded.
+kde/kdepimlibs-4.4.5-x86_64-1.txz:  Upgraded.
+kde/kdeplasma-addons-4.4.5-x86_64-1.txz:  Upgraded.
+kde/kdesdk-4.4.5-x86_64-1.txz:  Upgraded.
+kde/kdetoys-4.4.5-x86_64-1.txz:  Upgraded.
+kde/kdeutils-4.4.5-x86_64-1.txz:  Upgraded.
+kde/kdevelop-4.0.1-x86_64-1.txz:  Upgraded.
+kde/kdevplatform-1.0.1-x86_64-1.txz:  Upgraded.
+kde/kdewebdev-4.4.5-x86_64-1.txz:  Upgraded.
+kde/koffice-2.2.1-x86_64-1.txz:  Upgraded.
+kde/ktorrent-4.0.2-x86_64-1.txz:  Upgraded.
+  This now requires libktorrent.
+kde/libktorrent-1.0.2-x86_64-1.txz:  Added.
+kde/oxygen-icons-4.4.5-x86_64-1.txz:  Upgraded.
+kde/polkit-kde-1-r1145544-x86_64-1.txz:  Upgraded.
+kde/polkit-qt-1-r1145513-x86_64-1.txz:  Upgraded.
 kdei/*:  Upgraded.
-l/PyQt-4.6-x86_64-1.txz:  Upgraded.
-l/QScintilla-2.4-x86_64-1.txz:  Upgraded.
-l/akonadi-1.2.1-x86_64-1.txz:  Upgraded.
-l/alsa-lib-1.0.21a-x86_64-1.txz:  Upgraded.
-l/eigen2-2.0.6-x86_64-1.txz:  Upgraded.
-l/libgphoto2-2.4.7-x86_64-1.txz:  Upgraded.
-l/qt-4.5.3_063bded-x86_64-1.txz:  Upgraded.
-l/sip-4.9-x86_64-1.txz:  Upgraded.
-l/wv2-0.4.1-x86_64-1.txz:  Upgraded.
-xap/MPlayer-r29789-x86_64-1.txz:  Upgraded.
-extra/wicd/wicd-1.6.2.2-x86_64-1.txz:  Upgraded.
-+--------------------------+
-Sun Oct 18 23:09:03 UTC 2009
-l/shared-mime-info-0.70-x86_64-2.txz:  Rebuilt.
-  Fixed the install script to run update-mime-database for each user on the
-  system, fixing an issue with missing or broken icons.
-+--------------------------+
-Sat Oct 17 23:56:15 UTC 2009
-a/hdparm-9.27-x86_64-1.txz:  Upgraded.
-ap/hplip-3.9.4b-x86_64-3.txz:  Rebuilt.
-ap/linuxdoc-tools-0.9.56-x86_64-6.txz:  Rebuilt.
-  Recompiled against perl-5.10.1.
-ap/mysql-5.1.39-x86_64-2.txz:  Rebuilt.
-  Added --with-innodb option.  This was omitted from the last package version
-  since ./configure --help no longer lists --with-innodb or --without-innodb,
-  but evidently the option is still supported (and needed).
-  Thanks to Amritpal Bath.
-d/git-1.6.5-x86_64-1.txz:  Upgraded.
-  Compiled against perl-5.10.1.
-d/subversion-1.6.5-x86_64-1.txz:  Upgraded.
-  Compiled against perl-5.10.1.
-l/pilot-link-0.12.3-x86_64-10.txz:  Rebuilt.
-  Recompiled against perl-5.10.1.
-l/shared-mime-info-0.70-x86_64-1.txz:  Upgraded.
-n/gnutls-2.8.4-x86_64-1.txz:  Upgraded.
-  This contains a correct fix for the NUL in CN/SAN SSL vulnerability.
+l/polkit-1_a2edcef-x86_64-1.txz:  Upgraded.
+l/attica-0.1.4-x86_64-1.txz:  Upgraded.
+l/akonadi-1.3.90-x86_64-1.txz:  Upgraded.
+l/phonon-4.4.2-x86_64-1.txz:  Upgraded.
+l/soprano-2.4.63-x86_64-1.txz:  Upgraded.
+l/shared-desktop-ontologies-0.5-x86_64-1.txz:  Upgraded.
+l/qimageblitz-0.0.6-x86_64-1.txz:  Upgraded.
+l/qt-4.6.3_ef2e850-x86_64-1.txz:  Upgraded.
+testing/packages/btrfs-progs-20100717-x86_64-1.txz:  Upgraded.
++--------------------------+
+Wed Jun 30 04:51:49 UTC 2010
+l/libpng-1.4.3-x86_64-1.txz:  Upgraded.
+  Upgraded to libpng-1.2.44 and libpng-1.4.3.
+  This fixes out-of-bounds memory write bugs that could lead to crashes
+  or the execution of arbitrary code, and a memory leak bug which could
+  lead to application crashes.
   For more information, see:
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-2730
-  (* Security fix *)
-n/irssi-0.8.14-x86_64-2.txz:  Rebuilt.
-  Recompiled against perl-5.10.1.
-n/net-snmp-5.5-x86_64-1.txz:  Upgraded.
-n/obexftp-0.23-x86_64-2.txz:  Rebuilt.
-  Recompiled against perl-5.10.1.
-n/php-5.2.11-x86_64-2.txz:  Rebuilt.
-  Changed a ./configure option from --with-pdo-sqlite=shared to
-  --with-pdo-sqlite=shared,/usr to use the system sqlite library.
-  Thanks to Jeff MacLoue.
-n/samba-3.4.2-x86_64-2.txz:  Rebuilt.
-  Fixed missing libnss_winbind.so.2 and libnss_wins.so.2.
-  Thanks to oneforall.
-xap/imagemagick-6.5.6_10-x86_64-1.txz:  Upgraded.
-  Compiled against perl-5.10.1.
-xap/pidgin-2.6.3-x86_64-1.txz:  Upgraded.
-  This update fixes an issue where a remote user can cause libpurple-based
-  clients to crash.
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-1205
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-2249
+  (* Security fix *)
+l/libtiff-3.9.4-x86_64-1.txz:  Upgraded.
+  This fixes image structure handling bugs that could lead to crashes or
+  execution of arbitrary code if a specially-crafted TIFF image is loaded.
   For more information, see:
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3615
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-1411
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-2065
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-2067
   (* Security fix *)
 +--------------------------+
-Sun Oct  4 15:53:07 CDT 2009
-l/redland-1.0.9-x86_64-2.txz:  Fixed a bug that broke nepomuk.
-  Thanks to Heinz Wiesinger.
-+--------------------------+
-Sun Oct  4 00:17:50 CDT 2009
-ap/mysql-5.1.39-x86_64-1.txz:  Upgraded.
-  This bumps the version of the shared libraries to .so.16.0.0.
-d/perl-5.10.1-x86_64-1.txz:  Upgraded.
-  Compiled against mysql-5.1.39, upgraded to perl-5.10.1, DBD-mysql-4.013,
-  DBI-1.609, and URI-1.40.
-kde/amarok-2.2.0-x86_64-1.txz:  Upgraded.
-l/qt-4.5_0bd8418-x86_64-1.txz:  Upgraded.
-  This is the KDE Qt 4.5.2-patched git branch, compiled against mysql-5.1.39.
-l/redland-1.0.9-x86_64-1.txz:  Upgraded.
-  Compiled against mysql-5.1.39.
-l/soprano-2.3.1-x86_64-1.txz:  Upgraded.
-l/taglib-1.6-x86_64-1.txz:  Upgraded.
-l/taglib-extras-1.0.1-x86_64-1.txz:  Upgraded.
-n/openssh-5.3p1-x86_64-1.txz:  Upgraded.
-n/php-5.2.11-x86_64-1.txz:  Upgraded.
-  This release fixes some possible security issues, all of which have
-  "unknown impact and attack vectors".
+Sun Jun 27 17:25:18 UTC 2010
+xap/mozilla-firefox-3.6.6-x86_64-1.txz:  Upgraded.
+  This changes the crash protection feature to increase the timeout
+  before a plugin is considered non-responsive.
++--------------------------+
+Sun Jun 27 03:43:13 UTC 2010
+ap/ghostscript-8.71-x86_64-3.txz:  Rebuilt.
+  Merged an upstream patch from Till Kamppeter to fix printing black pages
+  with CUPS and certain printers.
++--------------------------+
+Fri Jun 25 05:28:02 UTC 2010
+a/cups-1.4.4-x86_64-1.txz:  Upgraded.
+  Fixed a memory allocation error in texttops.
+  Fixed a Cross-Site Request Forgery (CSRF) that could allow a remote
+  attacker to reconfigure or disable CUPS if a CUPS admin logged into the
+  web interface visited a specially-crafted website.
+  Fixed a bug where uninitialized memory from the cupsd process could
+  reveal sensitive information.
   For more information, see:
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3291
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3292
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3293
-  (* Security fix *)
-  Also, thanks to Frank Gingras and Rich Bowen for helping to improve the
-  syntax in mod_php.conf.
-n/samba-3.4.2-x86_64-1.txz:  Upgraded.
-  This update fixes the following security issues.
-  A misconfigured /etc/passwd with no defined home directory could allow
-  security restrictions to be bypassed.
-  mount.cifs could allow a local user to read the first line of an arbitrary
-  file if installed setuid.  (On Slackware, it was not installed setuid)
-  Specially crafted SMB requests could cause a denial of service.
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-0540
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-0542
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-1748
+  (* Security fix *)
+d/ccache-3.0-x86_64-1.txz:  Upgraded.
+d/gdb-7.1-x86_64-2.txz:  Rebuilt.
+  Added --with-python=no to fix errors about missing backtrace.py, which is
+  not yet in stable glib.  Thanks to David Woodfall.
+l/imlib-1.9.15-x86_64-7.txz:  Rebuilt.
+  This fixes problems linking with libpng.
+l/seamonkey-solibs-2.0.5-x86_64-1.txz:  Upgraded.
+n/bind-9.7.1-x86_64-1.txz:  Upgraded.
+  This fixes possible DNS cache poisoning attacks when DNSSEC is enabled
+  and checking is disabled (CD).
   For more information, see:
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-2813
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-2948
-    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-2906
-  (* Security fix *)
-testing/packages/gcc-4.4.1/gcc-4.4.1-x86_64-1.txz:  Added.
-testing/packages/gcc-4.4.1/gcc-g++-4.4.1-x86_64-1.txz:  Added.
-testing/packages/gcc-4.4.1/gcc-gfortran-4.4.1-x86_64-1.txz:  Added.
-testing/packages/gcc-4.4.1/gcc-gnat-4.4.1-x86_64-1.txz:  Added.
-testing/packages/gcc-4.4.1/gcc-java-4.4.1-x86_64-1.txz:  Added.
-testing/packages/gcc-4.4.1/gcc-objc-4.4.1-x86_64-1.txz:  Added.
-+--------------------------+
-Sat Sep 19 17:16:06 CDT 2009
-x/mesa-7.5.1-x86_64-1.txz:  Upgraded.
-  Fixed install script to add glxinfo and other programs that were part
-  of previous Mesa patches.  I was under the impression that these no longer
-  built, and had been deprecated upstream.  Thanks to Adam Kirchhoff for
-  setting me straight on that.
-+--------------------------+
-Mon Sep 14 01:38:35 CDT 2009
-xap/mozilla-firefox-3.5.3-x86_64-1.txz:  Upgraded.
-  Upgraded to firefox-3.5.3.
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-4022
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-0097
+  (* Security fix *)
+  Thanks to Rob McGee for help with the upgrade to BIND 9.7.x.
+xap/mozilla-firefox-3.6.4-x86_64-1.txz:  Upgraded.
   This fixes some security issues.
   For more information, see:
-    http://www.mozilla.org/security/known-vulnerabilities/firefox35.html
+    http://www.mozilla.org/security/known-vulnerabilities/firefox36.html
   (* Security fix *)
-+--------------------------+
-Fri Sep 11 20:17:06 CDT 2009
-l/seamonkey-solibs-1.1.18-x86_64-2.txz:  Rebuilt.
-  Added libnssutil3.so, as several other libraries in the package depend
-  on it, and otherwise it is found only in the main seamonkey package
-  (which sort of defeats the purpose of this one).
-  Thanks to Grigorios Bouzakis for the bug report.
-+--------------------------+
-Mon Sep  7 20:58:42 CDT 2009
-ap/sysstat-9.0.4-x86_64-1.txz:  Upgraded.
-l/seamonkey-solibs-1.1.18-x86_64-1.txz:
-  Upgraded to seamonkey-1.1.18 shared libraries.
+xap/mozilla-thunderbird-3.1-x86_64-1.txz:  Upgraded.
   (* Security fix *)
-xap/seamonkey-1.1.18-x86_64-1.txz:  Upgraded.
-  Upgraded to seamonkey-1.1.18.
+xap/seamonkey-2.0.5-x86_64-1.txz:  Upgraded.
   This release fixes some more security vulnerabilities.
   For more information, see:
-    http://www.mozilla.org/security/known-vulnerabilities/seamonkey11.html
-  (* Security fix *)
-+--------------------------+
-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.
-a/aaa_base-13.0-x86_64-2.txz:  Rebuilt.
-  Updated the initial email to root.
-extra/xf86-video-intel-alternate/xf86-video-intel-2.8.1-x86_64-1.txz:
-  Added.
-extra/wicd/wicd-1.6.2.1-x86_64-1.txz:  Upgraded.
-  Thanks to Adam Blackburn of the Wicd team working with us on this,
-  and to macavity for testing the hidden network changes.
+    http://www.mozilla.org/security/known-vulnerabilities/seamonkey20.html
+  (* Security fix *)
++--------------------------+
+Sat Jun 19 00:59:41 UTC 2010
+testing/packages/btrfs-progs-20100618-x86_64-1.txz:
+  Added btrfs-convert.  Thanks to mancha.
++--------------------------+
+Fri Jun 18 18:12:04 UTC 2010
+ap/alsa-utils-1.0.23-x86_64-2.txz:  Rebuilt.
+  Patched alsaconf to generate /etc/modprobe.d/sound.conf.
+  Thanks to Alan Hicks.
+kde/kdebase-workspace-4.4.3-x86_64-2.txz:  Rebuilt.
+  Patched xinitrc.kde to launch with ck-launch-session only if the
+  DESKTOP_SESSION variable is empty.  This fixes a bug where a ck-aware
+  login manager such as KDM may have already launched a ConsoleKit
+  session, causing the xinitrc to launch another one and marking the
+  first one inactive.  This can lead to auth failures.
+  Thanks to Robby Workman.
+n/samba-3.5.3-x86_64-1.txz:  Upgraded.
+xap/xfce-4.6.1-x86_64-9.txz:  Rebuilt.
+  Patched xinitrc.xfce to launch with ck-launch-session only if the
+  DESKTOP_SESSION variable is empty.  Thanks to Robby Workman.
++--------------------------+
+Wed May 19 08:58:23 UTC 2010
+Slackware 13.1 x86_64 stable is released!
+Lots of thanks are due -- see the RELEASE_NOTES and the rest of the
+ChangeLog for credits.  The ISOs are on their way to replication,
+a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD.
+We are taking pre-orders now at store.slackware.com, and offering 
+a discount if you sign up for a subscription.  Consider picking up
+a copy to help support the project.  Thanks again to the Slackware
+community for testing, contributing, and generally holding us to a
+high level of quality.  :-)
+Enjoy!
diff --git a/FILELIST.TXT b/FILELIST.TXT
index 63a903b6..87994e49 100644
--- a/FILELIST.TXT
+++ b/FILELIST.TXT
@@ -1,9356 +1,9458 @@
-Wed May 19 18:54:09 UTC 2010
+Mon Apr 25 17:03:04 UTC 2011
 
 Here is the file list for this directory.  If you are using a 
 mirror site and find missing or extra files in the disk 
 subdirectories, please have the archive administrator refresh
 the mirror.
 
-drwxr-xr-x 12 root root     4096 2010-05-19 18:53 .
--rw-r--r--  1 root root     9697 2010-05-19 08:00 ./ANNOUNCE.13_1
--rw-r--r--  1 root root    20933 2006-10-02 04:36 ./BOOTING.TXT
--rw-r--r--  1 root root    18599 2010-05-17 23:07 ./CHANGES_AND_HINTS.TXT
--rw-r--r--  1 root root   648880 2010-05-19 09:04 ./CHECKSUMS.md5
--rw-r--r--  1 root root      198 2010-05-19 09:04 ./CHECKSUMS.md5.asc
--rw-r--r--  1 root root    17976 1994-06-10 02:28 ./COPYING
--rw-r--r--  1 root root    35147 2007-06-30 04:21 ./COPYING3
--rw-r--r--  1 root root    19531 2009-08-26 02:07 ./COPYRIGHT.TXT
--rw-r--r--  1 root root      616 2006-10-02 04:37 ./CRYPTO_NOTICE.TXT
--rw-r--r--  1 root root    91096 2010-05-19 08:58 ./ChangeLog.txt
--rw-r--r--  1 root root   851093 2010-05-19 09:02 ./FILELIST.TXT
--rw-r--r--  1 root root     1565 2003-02-26 23:34 ./GPG-KEY
--rw-r--r--  1 root root   534446 2010-05-19 03:18 ./PACKAGES.TXT
--rw-r--r--  1 root root     9025 2010-05-19 00:45 ./README.TXT
--rw-r--r--  1 root root     3650 2010-05-18 21:50 ./README.initrd
--rw-r--r--  1 root root    33350 2010-05-18 21:22 ./README_CRYPT.TXT
--rw-r--r--  1 root root     9068 2010-05-18 21:20 ./README_LVM.TXT
--rw-r--r--  1 root root    17384 2009-08-25 06:31 ./README_RAID.TXT
--rw-r--r--  1 root root     5190 2010-05-19 08:02 ./RELEASE_NOTES
--rw-r--r--  1 root root    13855 2008-12-08 18:13 ./SPEAKUP_DOCS.TXT
--rw-r--r--  1 root root    17294 2008-12-08 18:13 ./SPEAK_INSTALL.TXT
--rw-r--r--  1 root root    58732 2010-05-18 21:47 ./Slackware-HOWTO
--rw-r--r--  1 root root     6934 2010-05-18 03:08 ./UPGRADE.TXT
-drwxr-xr-x 18 root root     4096 2010-05-14 19:51 ./extra
--rw-r--r--  1 root root    32963 2010-05-14 19:51 ./extra/CHECKSUMS.md5
--rw-r--r--  1 root root      198 2010-05-14 19:51 ./extra/CHECKSUMS.md5.asc
--rw-r--r--  1 root root    42083 2010-05-14 19:51 ./extra/FILE_LIST
--rw-r--r--  1 root root   298193 2010-05-14 19:51 ./extra/MANIFEST.bz2
--rw-r--r--  1 root root    34532 2010-05-14 19:51 ./extra/PACKAGES.TXT
--rw-r--r--  1 root root      149 2002-02-09 00:18 ./extra/README.TXT
-drwxr-xr-x  2 root root    20480 2009-08-14 20:40 ./extra/aspell-word-lists
--rw-r--r--  1 root root      171 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-af-0.50_0-noarch-4.txt
--rw-r--r--  1 root root   868976 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-af-0.50_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-af-0.50_0-noarch-4.txz.asc
--rw-r--r--  1 root root      190 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-am-0.03_1-noarch-4.txt
--rw-r--r--  1 root root   106700 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-am-0.03_1-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-am-0.03_1-noarch-4.txz.asc
--rw-r--r--  1 root root      195 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-az-0.02_0-noarch-4.txt
--rw-r--r--  1 root root   126472 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-az-0.02_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-az-0.02_0-noarch-4.txz.asc
--rw-r--r--  1 root root      199 2008-10-03 20:57 ./extra/aspell-word-lists/aspell-be-0.01-noarch-4.txt
--rw-r--r--  1 root root  9455764 2008-10-03 20:57 ./extra/aspell-word-lists/aspell-be-0.01-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:57 ./extra/aspell-word-lists/aspell-be-0.01-noarch-4.txz.asc
--rw-r--r--  1 root root      171 2008-10-03 20:57 ./extra/aspell-word-lists/aspell-bg-4.0_0-noarch-4.txt
--rw-r--r--  1 root root  5413300 2008-10-03 20:57 ./extra/aspell-word-lists/aspell-bg-4.0_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:57 ./extra/aspell-word-lists/aspell-bg-4.0_0-noarch-4.txz.asc
--rw-r--r--  1 root root      193 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-bn-0.01.1_1-noarch-4.txt
--rw-r--r--  1 root root   582408 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-bn-0.01.1_1-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-bn-0.01.1_1-noarch-4.txz.asc
--rw-r--r--  1 root root      168 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-br-0.50_2-noarch-4.txt
--rw-r--r--  1 root root   308936 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-br-0.50_2-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-br-0.50_2-noarch-4.txz.asc
--rw-r--r--  1 root root      185 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-ca-20040130_1-noarch-4.txt
--rw-r--r--  1 root root  1052772 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-ca-20040130_1-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-ca-20040130_1-noarch-4.txz.asc
--rw-r--r--  1 root root      185 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-cs-20040614_1-noarch-4.txt
--rw-r--r--  1 root root  2049648 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-cs-20040614_1-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-cs-20040614_1-noarch-4.txz.asc
--rw-r--r--  1 root root      203 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-csb-0.02_0-noarch-4.txt
--rw-r--r--  1 root root    42324 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-csb-0.02_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-csb-0.02_0-noarch-4.txz.asc
--rw-r--r--  1 root root      167 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-cy-0.50_3-noarch-4.txt
--rw-r--r--  1 root root  1745716 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-cy-0.50_3-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-cy-0.50_3-noarch-4.txz.asc
--rw-r--r--  1 root root      182 2008-10-03 20:57 ./extra/aspell-word-lists/aspell-da-1.4.42_1-noarch-4.txt
--rw-r--r--  1 root root  3045652 2008-10-03 20:57 ./extra/aspell-word-lists/aspell-da-1.4.42_1-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:57 ./extra/aspell-word-lists/aspell-da-1.4.42_1-noarch-4.txz.asc
--rw-r--r--  1 root root      186 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-de-20030222_1-noarch-4.txt
--rw-r--r--  1 root root  2872868 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-de-20030222_1-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-de-20030222_1-noarch-4.txz.asc
--rw-r--r--  1 root root      167 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-el-0.50_3-noarch-4.txt
--rw-r--r--  1 root root  3216592 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-el-0.50_3-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-el-0.50_3-noarch-4.txz.asc
--rw-r--r--  1 root root      171 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-eo-0.50_2-noarch-4.txt
--rw-r--r--  1 root root  3797376 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-eo-0.50_2-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-eo-0.50_2-noarch-4.txz.asc
--rw-r--r--  1 root root      169 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-es-0.50_2-noarch-4.txt
--rw-r--r--  1 root root  2958592 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-es-0.50_2-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-es-0.50_2-noarch-4.txz.asc
--rw-r--r--  1 root root      176 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-et-0.1.21_1-noarch-4.txt
--rw-r--r--  1 root root   877160 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-et-0.1.21_1-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-et-0.1.21_1-noarch-4.txz.asc
--rw-r--r--  1 root root      188 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-fa-0.02_0-noarch-4.txt
--rw-r--r--  1 root root  1488308 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-fa-0.02_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-fa-0.02_0-noarch-4.txz.asc
--rw-r--r--  1 root root      175 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-fi-0.7_0-noarch-4.txt
--rw-r--r--  1 root root   606924 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-fi-0.7_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-fi-0.7_0-noarch-4.txz.asc
--rw-r--r--  1 root root      186 2008-10-03 20:57 ./extra/aspell-word-lists/aspell-fo-0.2.16_1-noarch-4.txt
--rw-r--r--  1 root root   997552 2008-10-03 20:57 ./extra/aspell-word-lists/aspell-fo-0.2.16_1-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:57 ./extra/aspell-word-lists/aspell-fo-0.2.16_1-noarch-4.txz.asc
--rw-r--r--  1 root root      168 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-fr-0.50_3-noarch-4.txt
--rw-r--r--  1 root root  4365324 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-fr-0.50_3-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-fr-0.50_3-noarch-4.txz.asc
--rw-r--r--  1 root root      183 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-ga-3.6_0-noarch-4.txt
--rw-r--r--  1 root root  2144676 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-ga-3.6_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-ga-3.6_0-noarch-4.txz.asc
--rw-r--r--  1 root root      194 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-gd-0.1.1_1-noarch-4.txt
--rw-r--r--  1 root root   131084 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-gd-0.1.1_1-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-gd-0.1.1_1-noarch-4.txz.asc
--rw-r--r--  1 root root      170 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-gl-0.50_0-noarch-4.txt
--rw-r--r--  1 root root  2981948 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-gl-0.50_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-gl-0.50_0-noarch-4.txz.asc
--rw-r--r--  1 root root      200 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-gu-0.02_0-noarch-4.txt
--rw-r--r--  1 root root    59216 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-gu-0.02_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-gu-0.02_0-noarch-4.txz.asc
--rw-r--r--  1 root root      173 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-gv-0.50_0-noarch-4.txt
--rw-r--r--  1 root root   218880 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-gv-0.50_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-gv-0.50_0-noarch-4.txz.asc
--rw-r--r--  1 root root      187 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-he-1.0_0-noarch-4.txt
--rw-r--r--  1 root root  1991800 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-he-1.0_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-he-1.0_0-noarch-4.txz.asc
--rw-r--r--  1 root root      191 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-hi-0.01_0-noarch-4.txt
--rw-r--r--  1 root root   116448 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-hi-0.01_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-hi-0.01_0-noarch-4.txz.asc
--rw-r--r--  1 root root      190 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-hil-0.11_0-noarch-4.txt
--rw-r--r--  1 root root   114780 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-hil-0.11_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-hil-0.11_0-noarch-4.txz.asc
--rw-r--r--  1 root root      170 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-hr-0.51_0-noarch-4.txt
--rw-r--r--  1 root root  1945240 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-hr-0.51_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-hr-0.51_0-noarch-4.txz.asc
--rw-r--r--  1 root root      209 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-hsb-0.01_1-noarch-4.txt
--rw-r--r--  1 root root   318392 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-hsb-0.01_1-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-hsb-0.01_1-noarch-4.txz.asc
--rw-r--r--  1 root root      177 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-hu-0.99.4.2_0-noarch-4.txt
--rw-r--r--  1 root root  1586716 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-hu-0.99.4.2_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-hu-0.99.4.2_0-noarch-4.txz.asc
--rw-r--r--  1 root root      173 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-ia-0.50_1-noarch-4.txt
--rw-r--r--  1 root root   549808 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-ia-0.50_1-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-ia-0.50_1-noarch-4.txz.asc
--rw-r--r--  1 root root      197 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-id-1.2_0-noarch-4.txt
--rw-r--r--  1 root root   213320 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-id-1.2_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-id-1.2_0-noarch-4.txz.asc
--rw-r--r--  1 root root      171 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-is-0.51.1_0-noarch-4.txt
--rw-r--r--  1 root root  1505496 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-is-0.51.1_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:55 ./extra/aspell-word-lists/aspell-is-0.51.1_0-noarch-4.txz.asc
--rw-r--r--  1 root root      186 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-it-2.2_20050523_0-noarch-4.txt
--rw-r--r--  1 root root   643296 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-it-2.2_20050523_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-it-2.2_20050523_0-noarch-4.txz.asc
--rw-r--r--  1 root root      182 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-ku-0.12_0-noarch-4.txt
--rw-r--r--  1 root root    55296 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-ku-0.12_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-ku-0.12_0-noarch-4.txz.asc
--rw-r--r--  1 root root      173 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-la-20020503_0-noarch-4.txt
--rw-r--r--  1 root root   122204 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-la-20020503_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-la-20020503_0-noarch-4.txz.asc
--rw-r--r--  1 root root      190 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-lt-1.1+cvs20060103_0-noarch-4.txt
--rw-r--r--  1 root root   567968 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-lt-1.1+cvs20060103_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-lt-1.1+cvs20060103_0-noarch-4.txz.asc
--rw-r--r--  1 root root      175 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-lv-0.5.5_1-noarch-4.txt
--rw-r--r--  1 root root   186808 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-lv-0.5.5_1-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-lv-0.5.5_1-noarch-4.txz.asc
--rw-r--r--  1 root root      176 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-mg-0.03_0-noarch-4.txt
--rw-r--r--  1 root root   116888 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-mg-0.03_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-mg-0.03_0-noarch-4.txz.asc
--rw-r--r--  1 root root      167 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-mi-0.50_0-noarch-4.txt
--rw-r--r--  1 root root   144836 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-mi-0.50_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-mi-0.50_0-noarch-4.txz.asc
--rw-r--r--  1 root root      172 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-mk-0.50_0-noarch-4.txt
--rw-r--r--  1 root root  1250820 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-mk-0.50_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-mk-0.50_0-noarch-4.txz.asc
--rw-r--r--  1 root root      192 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-mn-0.01_0-noarch-4.txt
--rw-r--r--  1 root root    68124 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-mn-0.01_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-mn-0.01_0-noarch-4.txz.asc
--rw-r--r--  1 root root      193 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-mr-0.10_0-noarch-4.txt
--rw-r--r--  1 root root   474624 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-mr-0.10_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-mr-0.10_0-noarch-4.txz.asc
--rw-r--r--  1 root root      167 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-ms-0.50_0-noarch-4.txt
--rw-r--r--  1 root root   116524 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-ms-0.50_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-ms-0.50_0-noarch-4.txz.asc
--rw-r--r--  1 root root      169 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-mt-0.50_0-noarch-4.txt
--rw-r--r--  1 root root  5060516 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-mt-0.50_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-mt-0.50_0-noarch-4.txz.asc
--rw-r--r--  1 root root      178 2009-08-13 02:40 ./extra/aspell-word-lists/aspell-nb-0.50.1_0-noarch-4.txt
--rw-r--r--  1 root root  3039436 2009-08-13 02:40 ./extra/aspell-word-lists/aspell-nb-0.50.1_0-noarch-4.txz
--rw-r--r--  1 root root      197 2009-08-13 02:40 ./extra/aspell-word-lists/aspell-nb-0.50.1_0-noarch-4.txz.asc
--rw-r--r--  1 root root      206 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-nds-0.01_0-noarch-4.txt
--rw-r--r--  1 root root    39836 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-nds-0.01_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-nds-0.01_0-noarch-4.txz.asc
--rw-r--r--  1 root root      167 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-nl-0.50_2-noarch-4.txt
--rw-r--r--  1 root root  1495132 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-nl-0.50_2-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-nl-0.50_2-noarch-4.txz.asc
--rw-r--r--  1 root root      179 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-nn-0.50.1_1-noarch-4.txt
--rw-r--r--  1 root root  1907332 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-nn-0.50.1_1-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-nn-0.50.1_1-noarch-4.txz.asc
--rw-r--r--  1 root root      171 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-no-0.50_2-noarch-4.txt
--rw-r--r--  1 root root  1250336 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-no-0.50_2-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-no-0.50_2-noarch-4.txz.asc
--rw-r--r--  1 root root      176 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-ny-0.01_0-noarch-4.txt
--rw-r--r--  1 root root    40792 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-ny-0.01_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-ny-0.01_0-noarch-4.txz.asc
--rw-r--r--  1 root root      191 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-or-0.03_1-noarch-4.txt
--rw-r--r--  1 root root    14948 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-or-0.03_1-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-or-0.03_1-noarch-4.txz.asc
--rw-r--r--  1 root root      196 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-pa-0.01_1-noarch-4.txt
--rw-r--r--  1 root root    21904 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-pa-0.01_1-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-pa-0.01_1-noarch-4.txz.asc
--rw-r--r--  1 root root      168 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-pl-0.51_0-noarch-4.txt
--rw-r--r--  1 root root 13943900 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-pl-0.51_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-pl-0.51_0-noarch-4.txz.asc
--rw-r--r--  1 root root      172 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-pt-0.50_2-noarch-4.txt
--rw-r--r--  1 root root  2279084 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-pt-0.50_2-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-pt-0.50_2-noarch-4.txz.asc
--rw-r--r--  1 root root      246 2009-06-22 22:05 ./extra/aspell-word-lists/aspell-pt_BR-20080707_0-noarch-4.txt
--rw-r--r--  1 root root  2450800 2009-06-22 22:05 ./extra/aspell-word-lists/aspell-pt_BR-20080707_0-noarch-4.txz
--rw-r--r--  1 root root      197 2009-06-22 22:05 ./extra/aspell-word-lists/aspell-pt_BR-20080707_0-noarch-4.txz.asc
--rw-r--r--  1 root root      196 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-qu-0.02_0-noarch-4.txt
--rw-r--r--  1 root root   303040 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-qu-0.02_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-qu-0.02_0-noarch-4.txz.asc
--rw-r--r--  1 root root      170 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-ro-0.50_2-noarch-4.txt
--rw-r--r--  1 root root   281784 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-ro-0.50_2-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-ro-0.50_2-noarch-4.txz.asc
--rw-r--r--  1 root root      192 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-ru-0.99f7_1-noarch-4.txt
--rw-r--r--  1 root root  1425980 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-ru-0.99f7_1-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-ru-0.99f7_1-noarch-4.txz.asc
--rw-r--r--  1 root root      173 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-rw-0.50_0-noarch-4.txt
--rw-r--r--  1 root root    37644 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-rw-0.50_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-rw-0.50_0-noarch-4.txz.asc
--rw-r--r--  1 root root      171 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-sc-1.0-noarch-4.txt
--rw-r--r--  1 root root  4911444 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-sc-1.0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-sc-1.0-noarch-4.txz.asc
--rw-r--r--  1 root root      168 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-sk-0.52_0-noarch-4.txt
--rw-r--r--  1 root root  4641936 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-sk-0.52_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:56 ./extra/aspell-word-lists/aspell-sk-0.52_0-noarch-4.txz.asc
--rw-r--r--  1 root root      171 2008-10-03 20:57 ./extra/aspell-word-lists/aspell-sl-0.50_0-noarch-4.txt
--rw-r--r--  1 root root  5272152 2008-10-03 20:57 ./extra/aspell-word-lists/aspell-sl-0.50_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:57 ./extra/aspell-word-lists/aspell-sl-0.50_0-noarch-4.txz.asc
--rw-r--r--  1 root root      190 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-sr-0.02-noarch-4.txt
--rw-r--r--  1 root root  3705620 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-sr-0.02-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-sr-0.02-noarch-4.txz.asc
--rw-r--r--  1 root root      169 2008-10-03 20:57 ./extra/aspell-word-lists/aspell-sv-0.51_0-noarch-4.txt
--rw-r--r--  1 root root   985180 2008-10-03 20:57 ./extra/aspell-word-lists/aspell-sv-0.51_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:57 ./extra/aspell-word-lists/aspell-sv-0.51_0-noarch-4.txz.asc
--rw-r--r--  1 root root      169 2008-10-03 20:57 ./extra/aspell-word-lists/aspell-sw-0.50_0-noarch-4.txt
--rw-r--r--  1 root root   301120 2008-10-03 20:57 ./extra/aspell-word-lists/aspell-sw-0.50_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:57 ./extra/aspell-word-lists/aspell-sw-0.50_0-noarch-4.txz.asc
--rw-r--r--  1 root root      191 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-ta-20040424_1-noarch-4.txt
--rw-r--r--  1 root root    99988 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-ta-20040424_1-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-ta-20040424_1-noarch-4.txz.asc
--rw-r--r--  1 root root      195 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-te-0.01_2-noarch-4.txt
--rw-r--r--  1 root root   906648 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-te-0.01_2-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-te-0.01_2-noarch-4.txz.asc
--rw-r--r--  1 root root      179 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-tet-0.1.1-noarch-4.txt
--rw-r--r--  1 root root    65792 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-tet-0.1.1-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-tet-0.1.1-noarch-4.txz.asc
--rw-r--r--  1 root root      175 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-tl-0.02_1-noarch-4.txt
--rw-r--r--  1 root root    97512 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-tl-0.02_1-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-tl-0.02_1-noarch-4.txz.asc
--rw-r--r--  1 root root      176 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-tn-1.0.1_0-noarch-4.txt
--rw-r--r--  1 root root    42928 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-tn-1.0.1_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:58 ./extra/aspell-word-lists/aspell-tn-1.0.1_0-noarch-4.txz.asc
--rw-r--r--  1 root root      169 2008-10-03 20:57 ./extra/aspell-word-lists/aspell-tr-0.50_0-noarch-4.txt
--rw-r--r--  1 root root   494344 2008-10-03 20:57 ./extra/aspell-word-lists/aspell-tr-0.50_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:57 ./extra/aspell-word-lists/aspell-tr-0.50_0-noarch-4.txz.asc
--rw-r--r--  1 root root      171 2008-10-03 20:57 ./extra/aspell-word-lists/aspell-uk-0.51_0-noarch-4.txt
--rw-r--r--  1 root root  4719068 2008-10-03 20:57 ./extra/aspell-word-lists/aspell-uk-0.51_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:57 ./extra/aspell-word-lists/aspell-uk-0.51_0-noarch-4.txz.asc
--rw-r--r--  1 root root      200 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-uk-1.1_0-noarch-4.txt
--rw-r--r--  1 root root   527632 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-uk-1.1_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-uk-1.1_0-noarch-4.txz.asc
--rw-r--r--  1 root root      190 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-uz-0.5_0-noarch-4.txt
--rw-r--r--  1 root root   235116 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-uz-0.5_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-uz-0.5_0-noarch-4.txz.asc
--rw-r--r--  1 root root      193 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-vi-0.01.1_1-noarch-4.txt
--rw-r--r--  1 root root    42408 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-vi-0.01.1_1-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-vi-0.01.1_1-noarch-4.txz.asc
--rw-r--r--  1 root root      169 2008-10-03 20:57 ./extra/aspell-word-lists/aspell-wa-0.50_0-noarch-4.txt
--rw-r--r--  1 root root   647916 2008-10-03 20:57 ./extra/aspell-word-lists/aspell-wa-0.50_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:57 ./extra/aspell-word-lists/aspell-wa-0.50_0-noarch-4.txz.asc
--rw-r--r--  1 root root      190 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-yi-0.01.1_1-noarch-4.txt
--rw-r--r--  1 root root   396496 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-yi-0.01.1_1-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:59 ./extra/aspell-word-lists/aspell-yi-0.01.1_1-noarch-4.txz.asc
--rw-r--r--  1 root root      166 2008-10-03 20:57 ./extra/aspell-word-lists/aspell-zu-0.50_0-noarch-4.txt
--rw-r--r--  1 root root   489764 2008-10-03 20:57 ./extra/aspell-word-lists/aspell-zu-0.50_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:57 ./extra/aspell-word-lists/aspell-zu-0.50_0-noarch-4.txz.asc
-drwxr-xr-x  2 root root     4096 2010-03-12 05:30 ./extra/bash-completion
--rw-r--r--  1 root root      669 2010-03-12 00:35 ./extra/bash-completion/bash-completion-1.1-noarch-3.txt
--rw-r--r--  1 root root    95012 2010-03-12 00:35 ./extra/bash-completion/bash-completion-1.1-noarch-3.txz
--rw-r--r--  1 root root      198 2010-03-12 00:35 ./extra/bash-completion/bash-completion-1.1-noarch-3.txz.asc
-drwxr-xr-x  2 root root     4096 2010-05-14 19:51 ./extra/bittornado
--rw-r--r--  1 root root      444 2010-05-13 22:08 ./extra/bittornado/bittornado-0.3.18-noarch-2.txt
--rw-r--r--  1 root root   235960 2010-05-13 22:08 ./extra/bittornado/bittornado-0.3.18-noarch-2.txz
--rw-r--r--  1 root root      198 2010-05-13 22:08 ./extra/bittornado/bittornado-0.3.18-noarch-2.txz.asc
-drwxr-xr-x  2 root root     4096 2009-05-19 20:54 ./extra/bittorrent
--rw-r--r--  1 root root     1279 2006-02-08 01:38 ./extra/bittorrent/README
--rw-r--r--  1 root root      613 2009-05-01 11:16 ./extra/bittorrent/bittorrent-4.4.0-noarch-3.txt
--rw-r--r--  1 root root   336536 2009-05-01 11:16 ./extra/bittorrent/bittorrent-4.4.0-noarch-3.txz
--rw-r--r--  1 root root      197 2009-05-01 11:16 ./extra/bittorrent/bittorrent-4.4.0-noarch-3.txz.asc
-drwxr-xr-x  2 root root     4096 2010-05-14 19:51 ./extra/brltty
--rw-r--r--  1 root root      326 2010-05-11 05:18 ./extra/brltty/brltty-4.2-x86_64-1.txt
--rw-r--r--  1 root root   973460 2010-05-11 05:18 ./extra/brltty/brltty-4.2-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-11 05:18 ./extra/brltty/brltty-4.2-x86_64-1.txz.asc
-drwxr-xr-x  2 root root     4096 2010-05-14 19:51 ./extra/emacspeak
--rw-r--r--  1 root root      665 2010-05-14 00:04 ./extra/emacspeak/emacspeak-32.0-x86_64-1.txt
--rw-r--r--  1 root root  5489232 2010-05-14 00:04 ./extra/emacspeak/emacspeak-32.0-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-14 00:04 ./extra/emacspeak/emacspeak-32.0-x86_64-1.txz.asc
-lrwxrwxrwx  1 root root       25 2009-08-23 23:37 ./extra/flashplayer-plugin -> source/flashplayer-plugin
-drwxr-xr-x  2 root root     4096 2010-05-09 03:46 ./extra/jdk-6
--rw-r--r--  1 root root      402 2010-05-09 01:49 ./extra/jdk-6/jdk-6u20-x86_64-1.txt
--rw-r--r--  1 root root 68713432 2010-05-09 01:49 ./extra/jdk-6/jdk-6u20-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-09 01:49 ./extra/jdk-6/jdk-6u20-x86_64-1.txz.asc
-drwxr-xr-x  2 root root     4096 2009-06-19 23:56 ./extra/kde3-compat
--rw-r--r--  1 root root      422 2009-06-19 01:27 ./extra/kde3-compat/arts-1.5.10-x86_64-opt1.txt
--rw-r--r--  1 root root   941508 2009-06-19 01:27 ./extra/kde3-compat/arts-1.5.10-x86_64-opt1.txz
--rw-r--r--  1 root root      197 2009-06-19 01:27 ./extra/kde3-compat/arts-1.5.10-x86_64-opt1.txz.asc
--rw-r--r--  1 root root      408 2009-06-19 20:29 ./extra/kde3-compat/k3b3-1.0.5-x86_64-opt1.txt
--rw-r--r--  1 root root  4592952 2009-06-19 20:29 ./extra/kde3-compat/k3b3-1.0.5-x86_64-opt1.txz
--rw-r--r--  1 root root      197 2009-06-19 20:29 ./extra/kde3-compat/k3b3-1.0.5-x86_64-opt1.txz.asc
--rw-r--r--  1 root root      199 2009-06-19 20:24 ./extra/kde3-compat/kdelibs3-3.5.10-x86_64-opt1.txt
--rw-r--r--  1 root root 15596720 2009-06-19 20:24 ./extra/kde3-compat/kdelibs3-3.5.10-x86_64-opt1.txz
--rw-r--r--  1 root root      197 2009-06-19 20:24 ./extra/kde3-compat/kdelibs3-3.5.10-x86_64-opt1.txz.asc
--rw-r--r--  1 root root      557 2009-06-19 18:43 ./extra/kde3-compat/qt3-3.3.8b-x86_64-opt2.txt
--rw-r--r--  1 root root  6269156 2009-06-19 18:43 ./extra/kde3-compat/qt3-3.3.8b-x86_64-opt2.txz
--rw-r--r--  1 root root      197 2009-06-19 18:43 ./extra/kde3-compat/qt3-3.3.8b-x86_64-opt2.txz.asc
-drwxr-xr-x  2 root root     4096 2009-05-19 20:54 ./extra/mplayerplug-in
--rw-r--r--  1 root root      534 2009-05-19 19:32 ./extra/mplayerplug-in/mplayerplug-in-3.55-x86_64-1.txt
--rw-r--r--  1 root root   176148 2009-05-19 19:32 ./extra/mplayerplug-in/mplayerplug-in-3.55-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-05-19 19:32 ./extra/mplayerplug-in/mplayerplug-in-3.55-x86_64-1.txz.asc
-drwxr-xr-x  2 root root     4096 2010-05-03 08:59 ./extra/partitionmanager
--rw-r--r--  1 root root      391 2010-05-03 08:42 ./extra/partitionmanager/partitionmanager-1.0.2-x86_64-1.txt
--rw-r--r--  1 root root   423800 2010-05-03 08:42 ./extra/partitionmanager/partitionmanager-1.0.2-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-03 08:42 ./extra/partitionmanager/partitionmanager-1.0.2-x86_64-1.txz.asc
-drwxr-xr-x  2 root root     4096 2009-05-19 20:54 ./extra/recordmydesktop
--rw-r--r--  1 root root      675 2009-05-12 22:09 ./extra/recordmydesktop/recordmydesktop-0.3.8.1-x86_64-2.txt
--rw-r--r--  1 root root   128724 2009-05-12 22:09 ./extra/recordmydesktop/recordmydesktop-0.3.8.1-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-05-12 22:09 ./extra/recordmydesktop/recordmydesktop-0.3.8.1-x86_64-2.txz.asc
-drwxr-xr-x  2 root root     4096 2010-01-24 20:57 ./extra/slacktrack
--rw-r--r--  1 root root    27340 2009-05-15 22:42 ./extra/slacktrack/OVERVIEW
--rw-r--r--  1 root root      464 2010-01-10 19:28 ./extra/slacktrack/slacktrack-2.07-x86_64-1.txt
--rw-r--r--  1 root root    94708 2010-01-10 19:28 ./extra/slacktrack/slacktrack-2.07-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-01-10 19:28 ./extra/slacktrack/slacktrack-2.07-x86_64-1.txz.asc
-drwxr-xr-x 18 root root     4096 2010-05-14 00:06 ./extra/source
-drwxr-xr-x  2 root root     4096 2010-03-08 18:50 ./extra/source/bash-completion
--rw-r--r--  1 root root      369 2010-03-08 03:05 ./extra/source/bash-completion/bash-completion-1.1-pkgtools_tgxz.diff.gz
--rw-r--r--  1 root root   135741 2009-10-10 14:47 ./extra/source/bash-completion/bash-completion-1.1.tar.bz2
--rwxr-xr-x  1 root root     2687 2010-03-08 18:50 ./extra/source/bash-completion/bash-completion.SlackBuild
--rw-r--r--  1 root root      226 2010-03-05 20:08 ./extra/source/bash-completion/bash_completion.sh.gz
--rw-r--r--  1 root root     1135 2009-07-15 06:04 ./extra/source/bash-completion/slack-desc
-drwxr-xr-x  2 root root     4096 2007-02-10 02:08 ./extra/source/bittornado
--rw-r--r--  1 root root   159270 2006-12-23 20:52 ./extra/source/bittornado/BitTornado-0.3.18.tar.bz2
--rwxr-xr-x  1 root root     1026 2010-05-13 22:08 ./extra/source/bittornado/bittornado.SlackBuild
--rw-r--r--  1 root root      913 2005-07-14 22:53 ./extra/source/bittornado/btdownloadxterm.sh.gz
--rw-r--r--  1 root root      283 2006-02-08 01:28 ./extra/source/bittornado/doinst.sh.gz
--rw-r--r--  1 root root      905 2005-01-04 06:25 ./extra/source/bittornado/slack-desc
-drwxr-xr-x  2 root root     4096 2009-05-19 19:16 ./extra/source/bittorrent
--rw-r--r--  1 root root   678768 2006-01-31 20:24 ./extra/source/bittorrent/BitTorrent-4.4.0.tar.bz2
--rw-r--r--  1 root root      940 2006-02-08 01:07 ./extra/source/bittorrent/bittorrent-xterm.sh.gz
--rwxr-xr-x  1 root root     2473 2009-05-19 20:11 ./extra/source/bittorrent/bittorrent.SlackBuild
--rw-r--r--  1 root root      270 2006-02-08 01:08 ./extra/source/bittorrent/doinst.sh.gz
--rw-r--r--  1 root root     1074 2003-09-21 04:50 ./extra/source/bittorrent/slack-desc
-drwxr-xr-x  2 root root     4096 2010-05-11 05:15 ./extra/source/brltty
--rw-r--r--  1 root root  1328272 2010-05-10 10:24 ./extra/source/brltty/brltty-4.2.tar.xz
--rwxr-xr-x  1 root root     4010 2010-05-11 05:18 ./extra/source/brltty/brltty.SlackBuild
--rw-r--r--  1 root root      783 2002-06-07 04:09 ./extra/source/brltty/slack-desc
-drwxr-xr-x  2 root root     4096 2010-05-14 01:14 ./extra/source/emacspeak
--rw-r--r--  1 root root  5606552 2010-05-12 22:35 ./extra/source/emacspeak/emacspeak-32.0.tar.xz
--rw-r--r--  1 root root      534 2010-05-13 22:18 ./extra/source/emacspeak/emacspeak-32.0.tcl8.5.diff.gz
--rwxr-xr-x  1 root root     4437 2010-05-14 01:14 ./extra/source/emacspeak/emacspeak.SlackBuild
--rw-r--r--  1 root root     1125 2002-06-07 01:43 ./extra/source/emacspeak/slack-desc
-drwxr-xr-x  2 root root     4096 2009-05-19 19:25 ./extra/source/flashplayer-plugin
--rwxr-xr--  1 root root     5825 2009-12-14 20:27 ./extra/source/flashplayer-plugin/flashplayer-plugin.SlackBuild
--rw-r--r--  1 root root     1017 2008-12-16 13:11 ./extra/source/flashplayer-plugin/slack-desc
-drwxr-xr-x  2 root root     4096 2009-05-19 21:29 ./extra/source/grub
--rw-r--r--  1 root root     7697 2009-03-14 03:58 ./extra/source/grub/grub-0.97-x86_64.patch.gz
--rw-r--r--  1 root root   971783 2005-07-31 00:45 ./extra/source/grub/grub-0.97.tar.gz
--rw-r--r--  1 root root       65 2005-05-08 03:16 ./extra/source/grub/grub-0.97.tar.gz.sig
--rwxr-xr-x  1 root root     3549 2009-05-19 20:11 ./extra/source/grub/grub.SlackBuild
--rw-r--r--  1 root root     1746 2008-03-05 06:43 ./extra/source/grub/grub_support_256byte_inode.patch.gz
--rw-r--r--  1 root root    11715 2006-03-25 17:05 ./extra/source/grub/grubconfig-1.28.tar.gz
--rw-r--r--  1 root root      466 2007-06-06 03:32 ./extra/source/grub/grubconfig_localefix.patch.gz
--rw-r--r--  1 root root      959 2005-09-01 15:26 ./extra/source/grub/slack-desc
-drwxr-xr-x  3 root root     4096 2010-05-09 04:39 ./extra/source/jdk-6
--r--r--r--  1 root root     3767 2010-04-12 21:24 ./extra/source/jdk-6/COPYRIGHT
--rw-r--r--  1 root root      270 2010-05-09 01:46 ./extra/source/jdk-6/HOWTO-BUILD-TXZ
--r--r--r--  1 root root    17179 2010-04-12 21:24 ./extra/source/jdk-6/LICENSE
--r--r--r--  1 root root    28329 2010-04-12 21:24 ./extra/source/jdk-6/README.html
--r--r--r--  1 root root    25390 2010-04-12 21:24 ./extra/source/jdk-6/README_ja.html
--r--r--r--  1 root root    20768 2010-04-12 21:24 ./extra/source/jdk-6/README_zh_CN.html
--r--r--r--  1 root root   183173 2010-04-12 21:24 ./extra/source/jdk-6/THIRDPARTYLICENSEREADME.txt
--rwxr-xr-x  1 root root     3900 2010-05-09 01:43 ./extra/source/jdk-6/jdk.SlackBuild
-drwxr-xr-x  2 root root     4096 2007-09-01 23:13 ./extra/source/jdk-6/profile.d
--rwxr-xr-x  1 root root      143 2007-08-29 00:32 ./extra/source/jdk-6/profile.d/jdk.csh
--rwxr-xr-x  1 root root      146 2007-08-29 00:33 ./extra/source/jdk-6/profile.d/jdk.sh
--r--r--r--  1 root root     5284 2010-05-09 01:43 ./extra/source/jdk-6/register.html
--r--r--r--  1 root root     5716 2010-05-09 01:43 ./extra/source/jdk-6/register_ja.html
--r--r--r--  1 root root     4894 2010-05-09 01:43 ./extra/source/jdk-6/register_zh_CN.html
--rw-r--r--  1 root root      857 2010-05-09 01:43 ./extra/source/jdk-6/slack-desc
-drwxr-xr-x  6 root root     4096 2009-06-19 18:53 ./extra/source/kde3-compat
-drwxr-xr-x  2 root root     4096 2008-09-15 18:16 ./extra/source/kde3-compat/arts
--rw-r--r--  1 root root   973382 2008-08-21 18:32 ./extra/source/kde3-compat/arts/arts-1.5.10.tar.bz2
--rwxr-xr-x  1 root root     1333 2009-06-19 01:24 ./extra/source/kde3-compat/arts/arts.SlackBuild
--rw-r--r--  1 root root      320 2006-09-19 22:07 ./extra/source/kde3-compat/arts/arts.tmpdir.diff.gz
--rw-r--r--  1 root root      877 2002-03-29 01:31 ./extra/source/kde3-compat/arts/slack-desc
-drwxr-xr-x  2 root root     4096 2009-06-19 01:19 ./extra/source/kde3-compat/k3b3
--rw-r--r--  1 root root  5113060 2008-05-27 10:00 ./extra/source/kde3-compat/k3b3/k3b-1.0.5.tar.bz2
--rwxr-xr-x  1 root root     1777 2009-06-19 20:06 ./extra/source/kde3-compat/k3b3/k3b3.SlackBuild
--rw-r--r--  1 root root      863 2009-06-19 01:19 ./extra/source/kde3-compat/k3b3/slack-desc
-drwxr-xr-x  2 root root     4096 2009-06-19 00:33 ./extra/source/kde3-compat/kdelibs3
--rw-r--r--  1 root root      282 2009-06-19 00:33 ./extra/source/kde3-compat/kdelibs3/apply-patches.sh
--rw-r--r--  1 root root 15614607 2008-08-21 18:32 ./extra/source/kde3-compat/kdelibs3/kdelibs-3.5.10.tar.bz2
--rw-r--r--  1 root root      402 2007-06-10 13:12 ./extra/source/kde3-compat/kdelibs3/kdelibs-utempter.diff.gz
--rw-r--r--  1 root root      247 2009-06-19 00:28 ./extra/source/kde3-compat/kdelibs3/kdelibs.inotify.diff.gz
--rw-r--r--  1 root root      347 2009-06-19 00:33 ./extra/source/kde3-compat/kdelibs3/kdelibs.no.inotify.externs.diff.gz
--rwxr-xr-x  1 root root     1633 2009-06-19 01:24 ./extra/source/kde3-compat/kdelibs3/kdelibs3.SlackBuild
--rw-r--r--  1 root root       52 2009-06-19 17:54 ./extra/source/kde3-compat/kdelibs3/local.options
--rw-r--r--  1 root root      658 2008-08-10 22:27 ./extra/source/kde3-compat/kdelibs3/slack-desc
-drwxr-xr-x  3 root root     4096 2009-05-19 19:16 ./extra/source/kde3-compat/qt3
--rw-r--r--  1 root root      237 2008-09-14 21:49 ./extra/source/kde3-compat/qt3/doinst.sh.gz
-drwxr-xr-x  2 root root     4096 2002-03-26 03:53 ./extra/source/kde3-compat/qt3/profile.d
--rwxr-xr-x  1 root root      685 2008-09-14 21:24 ./extra/source/kde3-compat/qt3/profile.d/qt.csh
--rwxr-xr-x  1 root root      585 2008-09-14 21:24 ./extra/source/kde3-compat/qt3/profile.d/qt.sh
--rw-r--r--  1 root root 14345264 2008-01-18 08:12 ./extra/source/kde3-compat/qt3/qt-x11-free-3.3.8b.tar.bz2
--rw-r--r--  1 root root      199 2002-03-25 06:14 ./extra/source/kde3-compat/qt3/qt-x11.diff.gz
--rw-r--r--  1 root root      221 2002-10-14 21:59 ./extra/source/kde3-compat/qt3/qt.mysql.h.diff.gz
--rw-r--r--  1 root root      274 2006-01-19 22:12 ./extra/source/kde3-compat/qt3/qt.x86.cflags.diff.gz
--rwxr-xr-x  1 root root     6215 2009-06-19 18:39 ./extra/source/kde3-compat/qt3/qt3.SlackBuild
--rw-r--r--  1 root root     1011 2008-08-10 20:31 ./extra/source/kde3-compat/qt3/slack-desc
-drwxr-xr-x  2 root root     4096 2009-05-19 19:29 ./extra/source/mplayerplug-in
--rw-r--r--  1 root root   281845 2008-06-24 13:19 ./extra/source/mplayerplug-in/mplayerplug-in-3.55.tar.gz
--rwxr-xr--  1 root root     8298 2009-05-19 20:12 ./extra/source/mplayerplug-in/mplayerplug-in.SlackBuild
--rw-r--r--  1 root root      999 2006-11-06 21:20 ./extra/source/mplayerplug-in/slack-desc
-drwxr-xr-x  2 root root     4096 2010-05-03 07:40 ./extra/source/partitionmanager
--rw-r--r--  1 root root      118 2007-12-24 16:27 ./extra/source/partitionmanager/doinst.sh.gz
--rw-r--r--  1 root root   292808 2010-04-24 10:00 ./extra/source/partitionmanager/partitionmanager-1.0.2.tar.xz
--rwxr-xr-x  1 root root     3258 2010-05-03 07:41 ./extra/source/partitionmanager/partitionmanager.SlackBuild
--rw-r--r--  1 root root      852 2009-01-13 16:02 ./extra/source/partitionmanager/slack-desc
-drwxr-xr-x  2 root root     4096 2009-05-19 20:26 ./extra/source/recordmydesktop
--rw-r--r--  1 root root   185528 2008-11-23 15:35 ./extra/source/recordmydesktop/qt-recordmydesktop-0.3.8.tar.gz
--rw-r--r--  1 root root   198732 2008-12-13 17:56 ./extra/source/recordmydesktop/recordmydesktop-0.3.8.1.tar.gz
--rwxr-xr--  1 root root     8324 2009-05-19 20:26 ./extra/source/recordmydesktop/recordmydesktop.SlackBuild
--rw-r--r--  1 root root     1140 2010-02-19 15:58 ./extra/source/recordmydesktop/slack-desc
-drwxr-xr-x  2 root root     4096 2009-12-18 15:40 ./extra/source/slacktrack
--rw-r--r--  1 root root    98139 2009-12-18 15:30 ./extra/source/slacktrack/slacktrack-2.07-source.tar.gz
--rwxr-xr-x  1 root root      351 2009-12-18 15:37 ./extra/source/slacktrack/slacktrack.SlackBuild
-drwxr-xr-x  2 root root     4096 2009-06-03 00:11 ./extra/source/tightvnc
--rw-r--r--  1 root root     8109 2009-06-02 21:35 ./extra/source/tightvnc/_tightvnc.tar.gz
--rw-r--r--  1 root root      387 2009-06-02 22:04 ./extra/source/tightvnc/doinst.sh.gz
--rw-r--r--  1 root root      989 2008-12-04 21:29 ./extra/source/tightvnc/slack-desc
--rw-r--r--  1 root root  1549080 2009-03-06 05:15 ./extra/source/tightvnc/tightvnc-1.3.10_unixsrc.tar.xz
--rwxr-xr--  1 root root     4093 2009-06-14 18:18 ./extra/source/tightvnc/tightvnc.SlackBuild
--rw-r--r--  1 root root      728 2009-06-02 21:57 ./extra/source/tightvnc/tightvnc.paths-and-perms.diff.gz
-drwxr-xr-x  2 root root     4096 2010-04-02 19:47 ./extra/source/wicd
--rw-r--r--  1 root root      775 2009-06-21 04:34 ./extra/source/wicd/README.SLACKWARE
--rw-r--r--  1 root root      500 2009-05-30 01:47 ./extra/source/wicd/doinst.sh.gz
--rw-r--r--  1 root root      863 2009-06-05 15:22 ./extra/source/wicd/slack-desc
--rw-r--r--  1 root root      439 2010-04-02 19:47 ./extra/source/wicd/wicd-1.7.0-fix_EAP_fast_typo.diff.gz
--rw-r--r--  1 root root      475 2010-04-02 19:47 ./extra/source/wicd/wicd-1.7.0-fix_script_bug.diff.gz
--rw-r--r--  1 root root   411166 2010-01-15 00:55 ./extra/source/wicd/wicd-1.7.0.tar.bz2
--rwxr-xr-x  1 root root     3091 2010-04-02 19:46 ./extra/source/wicd/wicd.SlackBuild
-drwxr-xr-x  2 root root     4096 2009-05-19 19:16 ./extra/source/yasm
--rw-r--r--  1 root root     1047 2008-06-16 08:56 ./extra/source/yasm/slack-desc
--rw-r--r--  1 root root  1419273 2009-04-10 06:10 ./extra/source/yasm/yasm-0.8.0.tar.gz
--rwxr-xr--  1 root root     7082 2009-05-19 20:12 ./extra/source/yasm/yasm.SlackBuild
-drwxr-xr-x  2 root root     4096 2009-06-03 23:48 ./extra/tightvnc
--rw-r--r--  1 root root      530 2009-06-03 00:11 ./extra/tightvnc/tightvnc-1.3.10-x86_64-1.txt
--rw-r--r--  1 root root   777368 2009-06-03 00:11 ./extra/tightvnc/tightvnc-1.3.10-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-06-03 00:11 ./extra/tightvnc/tightvnc-1.3.10-x86_64-1.txz.asc
-drwxr-xr-x  2 root root     4096 2010-04-30 07:59 ./extra/wicd
--rw-r--r--  1 root root      775 2009-06-21 04:34 ./extra/wicd/README.SLACKWARE
--rw-r--r--  1 root root      407 2010-04-30 06:01 ./extra/wicd/wicd-1.7.0-x86_64-2.txt
--rw-r--r--  1 root root   356948 2010-04-30 06:01 ./extra/wicd/wicd-1.7.0-x86_64-2.txz
--rw-r--r--  1 root root      198 2010-04-30 06:01 ./extra/wicd/wicd-1.7.0-x86_64-2.txz.asc
-drwxr-xr-x  2 root root     4096 2009-05-19 20:54 ./extra/yasm
--rw-r--r--  1 root root      592 2009-05-19 19:50 ./extra/yasm/yasm-0.8.0-x86_64-1.txt
--rw-r--r--  1 root root   650504 2009-05-19 19:50 ./extra/yasm/yasm-0.8.0-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-05-19 19:50 ./extra/yasm/yasm-0.8.0-x86_64-1.txz.asc
-drwxr-xr-x  3 root root     4096 2010-05-17 02:11 ./isolinux
--rw-r--r--  1 root root     4739 2009-03-23 19:25 ./isolinux/README.TXT
--rw-r--r--  1 root root      788 2007-03-17 19:50 ./isolinux/README_SPLIT.TXT
--rw-r--r--  1 root root      653 2008-10-28 22:16 ./isolinux/f2.txt
--rw-r--r--  1 root root 13497671 2010-05-17 02:10 ./isolinux/initrd.img
--rw-r--r--  1 root root       50 2003-01-18 00:02 ./isolinux/iso.sort
--rw-r--r--  1 root root    14336 2010-01-19 19:58 ./isolinux/isolinux.bin
--rw-r--r--  1 root root      347 2008-10-28 22:13 ./isolinux/isolinux.cfg
--rw-r--r--  1 root root      568 2010-05-13 01:46 ./isolinux/message.txt
-drwxr-xr-x  2 root root     4096 2003-03-17 07:31 ./isolinux/sbootmgr
--rwxr-xr-x  1 root root    36064 1995-05-12 01:23 ./isolinux/sbootmgr/RAWRITE.EXE
--rw-r--r--  1 root root     2138 1997-12-01 01:21 ./isolinux/sbootmgr/RAWRITE12.DOC
--rwxr-xr-x  1 root root    13052 1997-12-01 01:21 ./isolinux/sbootmgr/RAWRITE12.EXE
-lrwxrwxrwx  1 root root       11 2009-08-23 23:37 ./isolinux/sbootmgr/RAWRITE13.EXE -> RAWRITE.EXE
--rw-r--r--  1 root root     6170 2000-08-29 08:23 ./isolinux/sbootmgr/RAWRITENT.DOC
--rwxr-xr-x  1 root root    24576 2000-08-29 08:26 ./isolinux/sbootmgr/RAWRITENT.EXE
--rw-r--r--  1 root root     1291 2003-03-17 07:31 ./isolinux/sbootmgr/README.TXT
--rw-r--r--  1 root root   110592 2003-03-16 08:38 ./isolinux/sbootmgr/sbootmgr.dsk
--rw-r--r--  1 root root     2823 2005-05-02 03:53 ./isolinux/setpkg
-drwxr-xr-x  4 root root     4096 2010-05-13 07:24 ./kernels
--rw-r--r--  1 root root       41 2010-05-13 07:23 ./kernels/VERSIONS.TXT
-drwxr-xr-x  2 root root     4096 2010-05-13 04:13 ./kernels/huge.s
--rw-r--r--  1 root root   538782 2010-05-13 04:13 ./kernels/huge.s/System.map.gz
--rw-r--r--  1 root root  5529440 2010-05-13 04:13 ./kernels/huge.s/bzImage
--rw-r--r--  1 root root   103629 2010-05-13 04:07 ./kernels/huge.s/config
-drwxr-xr-x  2 root root     4096 2010-05-01 05:07 ./kernels/speakup.s
--rw-r--r--  1 root root   544179 2010-05-13 04:16 ./kernels/speakup.s/System.map.gz
--rw-r--r--  1 root root  5569520 2010-05-13 04:16 ./kernels/speakup.s/bzImage
--rw-r--r--  1 root root   104113 2010-05-13 04:16 ./kernels/speakup.s/config
--rw-r--r--  1 root root    15231 2010-05-13 04:17 ./kernels/speakup.s/speakup_decpc.ko
-drwxr-xr-x  3 root root     4096 2007-07-02 01:04 ./misc
-drwxr-xr-x  3 root root     4096 2006-09-25 06:28 ./misc/slackbook
-drwxr-xr-x 11 root root     4096 2006-09-25 06:25 ./misc/slackbook/html
--rw-r--r--  1 root root     3259 2005-05-12 01:37 ./misc/slackbook/html/TRADEMARKS.html
--rw-r--r--  1 root root     4361 2005-04-23 19:49 ./misc/slackbook/html/archive-files-bzip2.html
--rw-r--r--  1 root root     9821 2005-05-10 15:25 ./misc/slackbook/html/archive-files-tar.html
--rw-r--r--  1 root root     3978 2005-04-23 19:49 ./misc/slackbook/html/archive-files-zip.html
--rw-r--r--  1 root root     5345 2005-04-23 19:49 ./misc/slackbook/html/archive-files.html
-drwxr-xr-x  2 root root     4096 2006-09-25 06:25 ./misc/slackbook/html/basic-network-commands
--rw-r--r--  1 root root     6838 2005-05-12 01:37 ./misc/slackbook/html/basic-network-commands-dns.html
--rw-r--r--  1 root root     9768 2005-05-05 12:47 ./misc/slackbook/html/basic-network-commands-email.html
--rw-r--r--  1 root root     4453 2005-05-05 12:47 ./misc/slackbook/html/basic-network-commands-finger.html
--rw-r--r--  1 root root     9338 2005-05-12 01:37 ./misc/slackbook/html/basic-network-commands-ftp.html
--rw-r--r--  1 root root     3890 2005-04-23 19:49 ./misc/slackbook/html/basic-network-commands-ssh.html
--rw-r--r--  1 root root     6210 2005-05-12 01:37 ./misc/slackbook/html/basic-network-commands-talk.html
--rw-r--r--  1 root root     6298 2005-05-12 01:37 ./misc/slackbook/html/basic-network-commands-telnet.html
--rw-r--r--  1 root root     4092 2005-05-05 12:47 ./misc/slackbook/html/basic-network-commands-traceroute.html
--rw-r--r--  1 root root     7857 2005-05-12 01:37 ./misc/slackbook/html/basic-network-commands-web.html
--rw-r--r--  1 root root     5418 2005-05-12 01:37 ./misc/slackbook/html/basic-network-commands.html
--rw-r--r--  1 root root     3421 2005-05-01 07:38 ./misc/slackbook/html/basic-network-commands/elm.png
--rw-r--r--  1 root root     5204 2005-05-01 07:38 ./misc/slackbook/html/basic-network-commands/links.png
--rw-r--r--  1 root root     7544 2005-05-01 07:38 ./misc/slackbook/html/basic-network-commands/lynx.png
--rw-r--r--  1 root root     2489 2005-05-01 07:38 ./misc/slackbook/html/basic-network-commands/mutt.png
--rw-r--r--  1 root root     4689 2005-05-01 07:38 ./misc/slackbook/html/basic-network-commands/pine.png
--rw-r--r--  1 root root      491 2005-05-01 07:38 ./misc/slackbook/html/basic-network-commands/talk.png
--rw-r--r--  1 root root      952 2005-05-01 07:38 ./misc/slackbook/html/basic-network-commands/ytalk.png
--rw-r--r--  1 root root    13925 2005-05-05 12:47 ./misc/slackbook/html/book-preface.html
--rw-r--r--  1 root root   517269 2005-05-12 01:38 ./misc/slackbook/html/book.html
-drwxr-xr-x  2 root root     4096 2006-09-25 06:25 ./misc/slackbook/html/booting
--rw-r--r--  1 root root    12607 2005-05-12 01:37 ./misc/slackbook/html/booting-dual.html
--rw-r--r--  1 root root     4110 2005-04-23 19:49 ./misc/slackbook/html/booting-loadlin.html
--rw-r--r--  1 root root     8952 2005-05-05 12:47 ./misc/slackbook/html/booting.html
--rw-r--r--  1 root root     6986 2005-05-01 10:05 ./misc/slackbook/html/booting/setup-lilo-expert-w.png
--rw-r--r--  1 root root     5824 2005-05-01 10:05 ./misc/slackbook/html/booting/setup-lilo-w.png
--rw-r--r--  1 root root     2950 2005-04-24 18:51 ./misc/slackbook/html/docbook.css
-drwxr-xr-x  2 root root     4096 2006-09-25 06:25 ./misc/slackbook/html/emacs
--rw-r--r--  1 root root     7301 2005-04-24 12:49 ./misc/slackbook/html/emacs-basic-editing.html
--rw-r--r--  1 root root     4989 2005-05-05 12:47 ./misc/slackbook/html/emacs-buffers.html
--rw-r--r--  1 root root     6305 2005-05-05 12:47 ./misc/slackbook/html/emacs-modes.html
--rw-r--r--  1 root root     4466 2005-05-05 12:47 ./misc/slackbook/html/emacs-saving-files.html
--rw-r--r--  1 root root     7785 2005-05-12 01:37 ./misc/slackbook/html/emacs.html
--rw-r--r--  1 root root     7842 2005-04-24 16:56 ./misc/slackbook/html/emacs/emacs.png
--rw-r--r--  1 root root     9989 2005-05-05 12:47 ./misc/slackbook/html/essential-sysadmin-hardusers.html
--rw-r--r--  1 root root    10340 2005-05-05 12:47 ./misc/slackbook/html/essential-sysadmin-shutdown.html
--rw-r--r--  1 root root    18830 2005-05-05 12:47 ./misc/slackbook/html/essential-sysadmin.html
--rw-r--r--  1 root root     5492 2005-05-12 01:37 ./misc/slackbook/html/file-commands-copymove.html
--rw-r--r--  1 root root     4959 2005-05-12 01:37 ./misc/slackbook/html/file-commands-creation.html
--rw-r--r--  1 root root     6218 2005-05-12 01:37 ./misc/slackbook/html/file-commands-deletion.html
--rw-r--r--  1 root root     4034 2005-04-25 16:19 ./misc/slackbook/html/file-commands-link.html
--rw-r--r--  1 root root     5596 2005-05-12 01:37 ./misc/slackbook/html/file-commands-output.html
--rw-r--r--  1 root root     5798 2005-05-12 01:37 ./misc/slackbook/html/file-commands-pagers.html
--rw-r--r--  1 root root    10160 2005-05-12 01:37 ./misc/slackbook/html/file-commands.html
--rw-r--r--  1 root root     4506 2005-04-25 15:47 ./misc/slackbook/html/filesystem-structure-links.html
--rw-r--r--  1 root root     8053 2005-05-12 01:37 ./misc/slackbook/html/filesystem-structure-mounting.html
--rw-r--r--  1 root root     3139 2005-04-15 07:18 ./misc/slackbook/html/filesystem-structure-nfs.html
--rw-r--r--  1 root root    10810 2005-05-12 01:37 ./misc/slackbook/html/filesystem-structure-permissions.html
--rw-r--r--  1 root root     6249 2005-05-05 12:47 ./misc/slackbook/html/filesystem-structure.html
--rw-r--r--  1 root root    18013 2005-05-05 12:47 ./misc/slackbook/html/glossary.html
--rw-r--r--  1 root root    21544 2005-05-12 01:37 ./misc/slackbook/html/gpl.html
--rw-r--r--  1 root root     9377 2006-06-20 20:42 ./misc/slackbook/html/help-online.html
--rw-r--r--  1 root root    10039 2005-05-12 01:37 ./misc/slackbook/html/help.html
-drwxr-xr-x  3 root root     4096 2006-09-25 06:25 ./misc/slackbook/html/imagelib
-drwxr-xr-x  2 root root     4096 2006-09-25 06:25 ./misc/slackbook/html/imagelib/admon
--rw-r--r--  1 root root      338 2005-04-24 14:04 ./misc/slackbook/html/imagelib/admon/note.png
--rw-r--r--  1 root root     1090 2005-04-24 14:04 ./misc/slackbook/html/imagelib/admon/warning.png
--rw-r--r--  1 root root    27647 2005-05-12 01:37 ./misc/slackbook/html/index.html
-drwxr-xr-x  2 root root     4096 2006-09-25 06:25 ./misc/slackbook/html/installation
--rw-r--r--  1 root root     9134 2005-04-24 14:04 ./misc/slackbook/html/installation-partitioning.html
--rw-r--r--  1 root root    13788 2005-05-12 01:37 ./misc/slackbook/html/installation-requirements.html
--rw-r--r--  1 root root    17913 2005-05-12 01:37 ./misc/slackbook/html/installation-setup.html
--rw-r--r--  1 root root     6196 2005-05-12 01:37 ./misc/slackbook/html/installation.html
--rw-r--r--  1 root root     4010 2005-05-01 09:28 ./misc/slackbook/html/installation/setup-bootdisk-w.png
--rw-r--r--  1 root root     3856 2005-05-01 09:28 ./misc/slackbook/html/installation/setup-font-w.png
--rw-r--r--  1 root root     3916 2005-05-01 09:28 ./misc/slackbook/html/installation/setup-hardware-clock-w.png
--rw-r--r--  1 root root     4715 2005-05-01 09:28 ./misc/slackbook/html/installation/setup-help-w.png
--rw-r--r--  1 root root     7100 2005-05-01 09:28 ./misc/slackbook/html/installation/setup-install-w.png
--rw-r--r--  1 root root     6442 2005-05-01 09:28 ./misc/slackbook/html/installation/setup-kernel-w.png
--rw-r--r--  1 root root     4526 2005-05-01 09:28 ./misc/slackbook/html/installation/setup-keymap-w.png
--rw-r--r--  1 root root     5824 2005-05-01 09:28 ./misc/slackbook/html/installation/setup-lilo-w.png
--rw-r--r--  1 root root     5356 2005-05-01 09:28 ./misc/slackbook/html/installation/setup-modem-w.png
--rw-r--r--  1 root root     6516 2005-05-01 09:28 ./misc/slackbook/html/installation/setup-mouse-w.png
--rw-r--r--  1 root root     5705 2005-05-01 09:28 ./misc/slackbook/html/installation/setup-program-w.png
--rw-r--r--  1 root root     6817 2005-05-01 09:28 ./misc/slackbook/html/installation/setup-select-w.png
--rw-r--r--  1 root root     3238 2005-05-01 09:28 ./misc/slackbook/html/installation/setup-source-w.png
--rw-r--r--  1 root root     3066 2005-05-01 09:28 ./misc/slackbook/html/installation/setup-swap-w.png
--rw-r--r--  1 root root     3153 2005-05-01 09:28 ./misc/slackbook/html/installation/setup-target-w.png
--rw-r--r--  1 root root     3593 2005-05-01 09:28 ./misc/slackbook/html/installation/setup-timezone-w.png
--rw-r--r--  1 root root     6767 2005-05-01 09:28 ./misc/slackbook/html/installation/setup-xwmconfig-w.png
--rw-r--r--  1 root root     6602 2005-05-05 12:47 ./misc/slackbook/html/introduction-opensource.html
--rw-r--r--  1 root root     4353 2005-04-15 07:18 ./misc/slackbook/html/introduction-slackware.html
--rw-r--r--  1 root root     5703 2005-05-05 12:47 ./misc/slackbook/html/introduction.html
--rw-r--r--  1 root root     9336 2005-05-07 01:34 ./misc/slackbook/html/network-configuration-hardware.html
--rw-r--r--  1 root root    13205 2005-05-07 01:34 ./misc/slackbook/html/network-configuration-nfs.html
--rw-r--r--  1 root root     5671 2005-05-12 01:37 ./misc/slackbook/html/network-configuration-ppp.html
--rw-r--r--  1 root root    14339 2005-05-07 01:34 ./misc/slackbook/html/network-configuration-tcpip.html
--rw-r--r--  1 root root     8762 2005-05-12 01:37 ./misc/slackbook/html/network-configuration-wireless.html
--rw-r--r--  1 root root     4503 2005-05-07 01:34 ./misc/slackbook/html/network-configuration.html
-drwxr-xr-x  2 root root     4096 2006-09-25 06:25 ./misc/slackbook/html/package-management
--rw-r--r--  1 root root     5411 2005-05-05 12:47 ./misc/slackbook/html/package-management-making-packages.html
--rw-r--r--  1 root root     4408 2005-05-12 01:37 ./misc/slackbook/html/package-management-making-tags-and-tagfiles.html
--rw-r--r--  1 root root    11962 2005-05-12 01:37 ./misc/slackbook/html/package-management-package-utilities.html
--rw-r--r--  1 root root     5784 2005-05-10 15:35 ./misc/slackbook/html/package-management.html
--rw-r--r--  1 root root     5817 2005-05-01 10:05 ./misc/slackbook/html/package-management/pkgtool-view-w.png
--rw-r--r--  1 root root     4784 2005-05-01 10:05 ./misc/slackbook/html/package-management/pkgtool-w.png
--rw-r--r--  1 root root     4873 2005-04-25 15:56 ./misc/slackbook/html/process-control-foregrounding.html
--rw-r--r--  1 root root     6934 2005-05-05 12:47 ./misc/slackbook/html/process-control-kill.html
--rw-r--r--  1 root root    11978 2005-05-09 18:46 ./misc/slackbook/html/process-control-ps.html
--rw-r--r--  1 root root     7703 2005-04-23 19:49 ./misc/slackbook/html/process-control-top.html
--rw-r--r--  1 root root     5264 2005-04-25 22:24 ./misc/slackbook/html/process-control.html
--rw-r--r--  1 root root     5421 2005-05-10 14:53 ./misc/slackbook/html/security-current.html
--rw-r--r--  1 root root     9659 2005-05-10 14:53 ./misc/slackbook/html/security-host.html
--rw-r--r--  1 root root     7349 2005-05-12 01:37 ./misc/slackbook/html/security.html
--rw-r--r--  1 root root     9018 2005-05-05 12:47 ./misc/slackbook/html/shell-bash.html
--rw-r--r--  1 root root    12375 2005-05-09 16:13 ./misc/slackbook/html/shell-command-line.html
--rw-r--r--  1 root root     6609 2005-05-12 01:37 ./misc/slackbook/html/shell-vt.html
--rw-r--r--  1 root root     6764 2005-05-12 01:37 ./misc/slackbook/html/shell.html
--rw-r--r--  1 root root     3675 2005-05-03 13:25 ./misc/slackbook/html/slackware_logo.png
-drwxr-xr-x  2 root root     4096 2006-09-25 06:25 ./misc/slackbook/html/system-configuration
--rw-r--r--  1 root root    14395 2005-05-12 01:37 ./misc/slackbook/html/system-configuration-kernel.html
--rw-r--r--  1 root root    21909 2005-05-12 01:37 ./misc/slackbook/html/system-configuration.html
--rw-r--r--  1 root root     6421 2005-05-01 10:05 ./misc/slackbook/html/system-configuration/make-menuconfig-w.png
-drwxr-xr-x  2 root root     4096 2006-09-25 06:25 ./misc/slackbook/html/vi
--rw-r--r--  1 root root     4292 2005-04-24 14:17 ./misc/slackbook/html/vi-configuration.html
--rw-r--r--  1 root root     6414 2005-05-12 01:37 ./misc/slackbook/html/vi-keys.html
--rw-r--r--  1 root root     9546 2005-05-12 01:37 ./misc/slackbook/html/vi-modes.html
--rw-r--r--  1 root root     4019 2005-04-24 14:17 ./misc/slackbook/html/vi-opening-files.html
--rw-r--r--  1 root root     3434 2005-04-23 21:44 ./misc/slackbook/html/vi-quitting-vi.html
--rw-r--r--  1 root root     3698 2005-04-23 19:49 ./misc/slackbook/html/vi-saving-files.html
--rw-r--r--  1 root root     7379 2005-05-05 12:47 ./misc/slackbook/html/vi.html
--rw-r--r--  1 root root     3515 2005-05-01 07:38 ./misc/slackbook/html/vi/vim-splitedit.png
-drwxr-xr-x  2 root root     4096 2006-09-25 06:25 ./misc/slackbook/html/x-window-system
--rw-r--r--  1 root root     7131 2005-04-23 19:49 ./misc/slackbook/html/x-window-system-xdm.html
--rw-r--r--  1 root root     5093 2005-05-05 12:47 ./misc/slackbook/html/x-window-system-xinitrc.html
--rw-r--r--  1 root root     3027 2005-04-23 19:49 ./misc/slackbook/html/x-window-system-xorgsetup.html
--rw-r--r--  1 root root     6352 2005-05-05 12:47 ./misc/slackbook/html/x-window-system-xwmconfig.html
--rw-r--r--  1 root root     9651 2005-05-09 14:36 ./misc/slackbook/html/x-window-system.html
--rw-r--r--  1 root root     4003 2005-05-01 10:05 ./misc/slackbook/html/x-window-system/xorgconfig1-w.png
--rw-r--r--  1 root root     6872 2005-05-01 10:05 ./misc/slackbook/html/x-window-system/xorgconfig2-w.png
--rw-r--r--  1 root root     3069 2005-05-01 10:05 ./misc/slackbook/html/x-window-system/xorgconfig3-w.png
--rw-r--r--  1 root root     5245 2005-05-01 10:05 ./misc/slackbook/html/x-window-system/xorgconfig4-w.png
--rw-r--r--  1 root root     6767 2005-05-01 10:05 ./misc/slackbook/html/x-window-system/xwmconfig-w.png
--rw-r--r--  1 root root     3839 2005-05-05 12:47 ./misc/slackbook/html/zipslack-booting.html
--rw-r--r--  1 root root     4577 2005-05-05 12:47 ./misc/slackbook/html/zipslack-getting.html
--rw-r--r--  1 root root     4260 2005-04-24 13:06 ./misc/slackbook/html/zipslack.html
--rw-r--r--  1 root root  1863038 2005-05-16 20:23 ./misc/slackbook/slackbook-2.0.pdf
--rw-r--r--  1 root root  3223923 2005-05-16 14:53 ./misc/slackbook/slackbook-2.0.ps
-drwxr-xr-x  3 root root     4096 2009-05-19 20:55 ./pasture
--rw-r--r--  1 root root        0 1993-07-11 05:00 ./pasture/CHECKSUMS.md5.asc
-drwxr-xr-x  2 root root     4096 2009-05-19 20:16 ./pasture/source
-drwxr-xr-x  2 root root     4096 2010-05-18 22:40 ./patches
--rw-r--r--  1 root root      531 2010-05-18 22:40 ./patches/CHECKSUMS.md5
--rw-r--r--  1 root root      198 2010-05-18 22:40 ./patches/CHECKSUMS.md5.asc
--rw-r--r--  1 root root      575 2010-05-18 22:40 ./patches/FILE_LIST
--rw-r--r--  1 root root       14 2010-05-18 22:40 ./patches/MANIFEST.bz2
--rw-r--r--  1 root root      224 2010-05-18 22:40 ./patches/PACKAGES.TXT
-drwxr-xr-x 17 root root     4096 2010-05-19 03:18 ./slackware64
--rw-r--r--  1 root root   212525 2010-05-19 03:18 ./slackware64/CHECKSUMS.md5
--rw-r--r--  1 root root      198 2010-05-19 03:18 ./slackware64/CHECKSUMS.md5.asc
--rw-r--r--  1 root root   262975 2010-05-19 03:15 ./slackware64/FILE_LIST
--rw-r--r--  1 root root  2311298 2010-05-19 03:17 ./slackware64/MANIFEST.bz2
-lrwxrwxrwx  1 root root       15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT
-drwxr-xr-x  2 root root    20480 2010-05-19 03:14 ./slackware64/a
--rw-r--r--  1 root root      327 2010-05-16 17:45 ./slackware64/a/aaa_base-13.1-x86_64-2.txt
--rw-r--r--  1 root root    10544 2010-05-16 17:45 ./slackware64/a/aaa_base-13.1-x86_64-2.txz
--rw-r--r--  1 root root      198 2010-05-16 17:45 ./slackware64/a/aaa_base-13.1-x86_64-2.txz.asc
--rw-r--r--  1 root root      568 2010-05-13 18:41 ./slackware64/a/aaa_elflibs-13.1-x86_64-1.txt
--rw-r--r--  1 root root  3796116 2010-05-13 18:41 ./slackware64/a/aaa_elflibs-13.1-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-13 18:41 ./slackware64/a/aaa_elflibs-13.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      505 2009-02-22 16:06 ./slackware64/a/aaa_terminfo-5.7-noarch-1.txt
--rw-r--r--  1 root root    42264 2009-02-22 16:06 ./slackware64/a/aaa_terminfo-5.7-noarch-1.txz
--rw-r--r--  1 root root      197 2009-02-22 16:06 ./slackware64/a/aaa_terminfo-5.7-noarch-1.txz.asc
--rw-r--r--  1 root root      365 2008-09-24 20:28 ./slackware64/a/acl-2.2.47_1-x86_64-1.txt
--rw-r--r--  1 root root   131136 2008-09-24 20:28 ./slackware64/a/acl-2.2.47_1-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-09-24 20:28 ./slackware64/a/acl-2.2.47_1-x86_64-1.txz.asc
--rw-r--r--  1 root root      411 2010-05-19 02:50 ./slackware64/a/acpid-2.0.5-x86_64-1.txt
--rw-r--r--  1 root root    38680 2010-05-19 02:50 ./slackware64/a/acpid-2.0.5-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-19 02:50 ./slackware64/a/acpid-2.0.5-x86_64-1.txz.asc
--rw-r--r--  1 root root      554 2009-06-10 01:19 ./slackware64/a/apmd-3.2.2-x86_64-2.txt
--rw-r--r--  1 root root    55280 2009-06-10 01:19 ./slackware64/a/apmd-3.2.2-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-06-10 01:19 ./slackware64/a/apmd-3.2.2-x86_64-2.txz.asc
--rw-r--r--  1 root root      556 2009-03-08 22:21 ./slackware64/a/attr-2.4.43_1-x86_64-1.txt
--rw-r--r--  1 root root    71360 2009-03-08 22:21 ./slackware64/a/attr-2.4.43_1-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-03-08 22:21 ./slackware64/a/attr-2.4.43_1-x86_64-1.txz.asc
--rw-r--r--  1 root root      510 2010-05-15 02:48 ./slackware64/a/bash-4.1.007-x86_64-1.txt
--rw-r--r--  1 root root   961464 2010-05-15 02:48 ./slackware64/a/bash-4.1.007-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-15 02:48 ./slackware64/a/bash-4.1.007-x86_64-1.txz.asc
--rw-r--r--  1 root root      227 2008-09-21 22:01 ./slackware64/a/bin-11.1-x86_64-1.txt
--rw-r--r--  1 root root    44196 2008-09-21 22:01 ./slackware64/a/bin-11.1-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-09-21 22:01 ./slackware64/a/bin-11.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      478 2008-09-21 16:05 ./slackware64/a/bzip2-1.0.5-x86_64-1.txt
--rw-r--r--  1 root root   125916 2008-09-21 16:05 ./slackware64/a/bzip2-1.0.5-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-09-21 16:05 ./slackware64/a/bzip2-1.0.5-x86_64-1.txz.asc
--rw-r--r--  1 root root      525 2010-05-11 20:53 ./slackware64/a/coreutils-8.5-x86_64-3.txt
--rw-r--r--  1 root root  2104624 2010-05-11 20:53 ./slackware64/a/coreutils-8.5-x86_64-3.txz
--rw-r--r--  1 root root      198 2010-05-11 20:53 ./slackware64/a/coreutils-8.5-x86_64-3.txz.asc
--rw-r--r--  1 root root      487 2009-03-16 10:50 ./slackware64/a/cpio-2.9-x86_64-2.txt
--rw-r--r--  1 root root   153068 2009-03-16 10:50 ./slackware64/a/cpio-2.9-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-03-16 10:50 ./slackware64/a/cpio-2.9-x86_64-2.txz.asc
--rw-r--r--  1 root root      620 2010-03-11 20:18 ./slackware64/a/cpufrequtils-007-x86_64-1.txt
--rw-r--r--  1 root root    35360 2010-03-11 20:18 ./slackware64/a/cpufrequtils-007-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-03-11 20:18 ./slackware64/a/cpufrequtils-007-x86_64-1.txz.asc
--rw-r--r--  1 root root      579 2010-04-30 21:56 ./slackware64/a/cryptsetup-1.1.0-x86_64-2.txt
--rw-r--r--  1 root root    79632 2010-04-30 21:56 ./slackware64/a/cryptsetup-1.1.0-x86_64-2.txz
--rw-r--r--  1 root root      198 2010-04-30 21:56 ./slackware64/a/cryptsetup-1.1.0-x86_64-2.txz.asc
--rw-r--r--  1 root root      644 2010-05-17 07:40 ./slackware64/a/cups-1.4.3-x86_64-3.txt
--rw-r--r--  1 root root  2043864 2010-05-17 07:40 ./slackware64/a/cups-1.4.3-x86_64-3.txz
--rw-r--r--  1 root root      198 2010-05-17 07:40 ./slackware64/a/cups-1.4.3-x86_64-3.txz.asc
--rw-r--r--  1 root root      280 2010-05-13 18:40 ./slackware64/a/cxxlibs-6.0.13-x86_64-2.txt
--rw-r--r--  1 root root   876964 2010-05-13 18:40 ./slackware64/a/cxxlibs-6.0.13-x86_64-2.txz
--rw-r--r--  1 root root      198 2010-05-13 18:40 ./slackware64/a/cxxlibs-6.0.13-x86_64-2.txz.asc
--rw-r--r--  1 root root      491 2010-05-01 02:31 ./slackware64/a/dbus-1.2.24-x86_64-2.txt
--rw-r--r--  1 root root   304824 2010-05-01 02:31 ./slackware64/a/dbus-1.2.24-x86_64-2.txz
--rw-r--r--  1 root root      198 2010-05-01 02:31 ./slackware64/a/dbus-1.2.24-x86_64-2.txz.asc
--rw-r--r--  1 root root      359 2010-02-11 23:27 ./slackware64/a/dcron-4.4-x86_64-1.txt
--rw-r--r--  1 root root    32528 2010-02-11 23:27 ./slackware64/a/dcron-4.4-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-11 23:27 ./slackware64/a/dcron-4.4-x86_64-1.txz.asc
--rw-r--r--  1 root root      311 2008-09-25 21:53 ./slackware64/a/devs-2.3.1-noarch-25.txt
--rw-r--r--  1 root root    98596 2008-09-25 21:53 ./slackware64/a/devs-2.3.1-noarch-25.txz
--rw-r--r--  1 root root      197 2008-09-25 21:53 ./slackware64/a/devs-2.3.1-noarch-25.txz.asc
--rw-r--r--  1 root root      513 2009-05-23 04:29 ./slackware64/a/dialog-1.1_20080819-x86_64-3.txt
--rw-r--r--  1 root root   125096 2009-05-23 04:29 ./slackware64/a/dialog-1.1_20080819-x86_64-3.txz
--rw-r--r--  1 root root      197 2009-05-23 04:29 ./slackware64/a/dialog-1.1_20080819-x86_64-3.txz.asc
--rw-r--r--  1 root root      281 2008-09-23 20:57 ./slackware64/a/dosfstools-2.11-x86_64-1.txt
--rw-r--r--  1 root root    48568 2008-09-23 20:57 ./slackware64/a/dosfstools-2.11-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-09-23 20:57 ./slackware64/a/dosfstools-2.11-x86_64-1.txz.asc
--rw-r--r--  1 root root      343 2010-04-30 04:19 ./slackware64/a/e2fsprogs-1.41.11-x86_64-1.txt
--rw-r--r--  1 root root   657044 2010-04-30 04:19 ./slackware64/a/e2fsprogs-1.41.11-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-30 04:19 ./slackware64/a/e2fsprogs-1.41.11-x86_64-1.txz.asc
--rw-r--r--  1 root root      352 2009-06-12 21:01 ./slackware64/a/ed-1.3-x86_64-1.txt
--rw-r--r--  1 root root    63748 2009-06-12 21:01 ./slackware64/a/ed-1.3-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-06-12 21:01 ./slackware64/a/ed-1.3-x86_64-1.txz.asc
--rw-r--r--  1 root root      430 2010-01-25 22:05 ./slackware64/a/eject-2.1.5-x86_64-2.txt
--rw-r--r--  1 root root    34532 2010-01-25 22:05 ./slackware64/a/eject-2.1.5-x86_64-2.txz
--rw-r--r--  1 root root      197 2010-01-25 22:05 ./slackware64/a/eject-2.1.5-x86_64-2.txz.asc
--rw-r--r--  1 root root      389 2008-09-23 19:35 ./slackware64/a/elvis-2.2_0-x86_64-2.txt
--rw-r--r--  1 root root   699236 2008-09-23 19:35 ./slackware64/a/elvis-2.2_0-x86_64-2.txz
--rw-r--r--  1 root root      197 2008-09-23 19:35 ./slackware64/a/elvis-2.2_0-x86_64-2.txz.asc
--rw-r--r--  1 root root      203 2010-02-05 23:32 ./slackware64/a/etc-13.013-x86_64-1.txt
--rw-r--r--  1 root root   207624 2010-02-05 23:32 ./slackware64/a/etc-13.013-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-05 23:32 ./slackware64/a/etc-13.013-x86_64-1.txz.asc
--rw-r--r--  1 root root      225 2010-02-06 03:08 ./slackware64/a/file-5.04-x86_64-1.txt
--rw-r--r--  1 root root   203388 2010-02-06 03:08 ./slackware64/a/file-5.04-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-06 03:08 ./slackware64/a/file-5.04-x86_64-1.txz.asc
--rw-r--r--  1 root root      368 2009-06-13 00:03 ./slackware64/a/findutils-4.4.2-x86_64-1.txt
--rw-r--r--  1 root root   414500 2009-06-13 00:03 ./slackware64/a/findutils-4.4.2-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-06-13 00:03 ./slackware64/a/findutils-4.4.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      271 2008-10-23 11:06 ./slackware64/a/floppy-5.4-x86_64-3.txt
--rw-r--r--  1 root root   350400 2008-10-23 11:06 ./slackware64/a/floppy-5.4-x86_64-3.txz
--rw-r--r--  1 root root      197 2008-10-23 11:06 ./slackware64/a/floppy-5.4-x86_64-3.txz.asc
--rw-r--r--  1 root root      588 2010-05-09 18:52 ./slackware64/a/gawk-3.1.8-x86_64-1.txt
--rw-r--r--  1 root root   796264 2010-05-09 18:52 ./slackware64/a/gawk-3.1.8-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-09 18:52 ./slackware64/a/gawk-3.1.8-x86_64-1.txz.asc
--rw-r--r--  1 root root      498 2008-12-13 17:25 ./slackware64/a/genpower-1.0.5-x86_64-2.txt
--rw-r--r--  1 root root    42648 2008-12-13 17:25 ./slackware64/a/genpower-1.0.5-x86_64-2.txz
--rw-r--r--  1 root root      197 2008-12-13 17:25 ./slackware64/a/genpower-1.0.5-x86_64-2.txz.asc
--rw-r--r--  1 root root      279 2010-01-13 00:52 ./slackware64/a/gettext-0.17-x86_64-3.txt
--rw-r--r--  1 root root   109788 2010-01-13 00:52 ./slackware64/a/gettext-0.17-x86_64-3.txz
--rw-r--r--  1 root root      197 2010-01-13 00:52 ./slackware64/a/gettext-0.17-x86_64-3.txz.asc
--rw-r--r--  1 root root      510 2008-10-02 14:18 ./slackware64/a/getty-ps-2.1.0b-x86_64-1.txt
--rw-r--r--  1 root root    64504 2008-10-02 14:18 ./slackware64/a/getty-ps-2.1.0b-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-02 14:18 ./slackware64/a/getty-ps-2.1.0b-x86_64-1.txz.asc
--rw-r--r--  1 root root      323 2010-05-13 06:23 ./slackware64/a/glibc-solibs-2.11.1-x86_64-3.txt
--rw-r--r--  1 root root  2404868 2010-05-13 06:23 ./slackware64/a/glibc-solibs-2.11.1-x86_64-3.txz
--rw-r--r--  1 root root      198 2010-05-13 06:23 ./slackware64/a/glibc-solibs-2.11.1-x86_64-3.txz.asc
--rw-r--r--  1 root root      500 2010-05-13 06:22 ./slackware64/a/glibc-zoneinfo-2.11.1-noarch-3.txt
--rw-r--r--  1 root root   158696 2010-05-13 06:22 ./slackware64/a/glibc-zoneinfo-2.11.1-noarch-3.txz
--rw-r--r--  1 root root      198 2010-05-13 06:22 ./slackware64/a/glibc-zoneinfo-2.11.1-noarch-3.txz.asc
--rw-r--r--  1 root root      511 2008-10-02 14:25 ./slackware64/a/gpm-1.20.1-x86_64-5.txt
--rw-r--r--  1 root root   190476 2008-10-02 14:25 ./slackware64/a/gpm-1.20.1-x86_64-5.txz
--rw-r--r--  1 root root      197 2008-10-02 14:25 ./slackware64/a/gpm-1.20.1-x86_64-5.txz.asc
--rw-r--r--  1 root root      292 2009-03-04 21:56 ./slackware64/a/grep-2.5.4-x86_64-1.txt
--rw-r--r--  1 root root   228932 2009-03-04 21:56 ./slackware64/a/grep-2.5.4-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-03-04 21:56 ./slackware64/a/grep-2.5.4-x86_64-1.txz.asc
--rw-r--r--  1 root root   127483 2010-02-09 03:01 ./slackware64/a/gzip-1.4-x86_64-1.tgz
--rw-r--r--  1 root root      197 2010-02-09 03:01 ./slackware64/a/gzip-1.4-x86_64-1.tgz.asc
--rw-r--r--  1 root root      315 2010-02-09 03:01 ./slackware64/a/gzip-1.4-x86_64-1.txt
--rw-r--r--  1 root root      348 2009-10-13 22:55 ./slackware64/a/hdparm-9.27-x86_64-1.txt
--rw-r--r--  1 root root    61772 2009-10-13 22:55 ./slackware64/a/hdparm-9.27-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-10-13 22:55 ./slackware64/a/hdparm-9.27-x86_64-1.txz.asc
--rw-r--r--  1 root root      466 2009-08-24 08:48 ./slackware64/a/infozip-6.0-x86_64-1.txt
--rw-r--r--  1 root root   405240 2009-08-24 08:48 ./slackware64/a/infozip-6.0-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-08-24 08:48 ./slackware64/a/infozip-6.0-x86_64-1.txz.asc
--rw-r--r--  1 root root      513 2010-05-08 07:59 ./slackware64/a/inotify-tools-3.14-x86_64-1.txt
--rw-r--r--  1 root root    43908 2010-05-08 07:59 ./slackware64/a/inotify-tools-3.14-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-08 07:59 ./slackware64/a/inotify-tools-3.14-x86_64-1.txz.asc
--rwxr-xr-x  1 root root     2897 2009-06-24 22:05 ./slackware64/a/install-packages
--rw-r--r--  1 root root      446 2006-09-18 10:41 ./slackware64/a/install.end
--rw-r--r--  1 root root      539 2009-06-12 23:20 ./slackware64/a/jfsutils-1.1.14-x86_64-1.txt
--rw-r--r--  1 root root   199652 2009-06-12 23:20 ./slackware64/a/jfsutils-1.1.14-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-06-12 23:20 ./slackware64/a/jfsutils-1.1.14-x86_64-1.txz.asc
--rw-r--r--  1 root root      465 2010-04-29 06:15 ./slackware64/a/kbd-1.15.2-x86_64-1.txt
--rw-r--r--  1 root root  1097948 2010-04-29 06:15 ./slackware64/a/kbd-1.15.2-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-29 06:15 ./slackware64/a/kbd-1.15.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      344 2010-05-13 03:31 ./slackware64/a/kernel-firmware-2.6.33.4-noarch-1.txt
--rw-r--r--  1 root root   830364 2010-05-13 03:31 ./slackware64/a/kernel-firmware-2.6.33.4-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-13 03:31 ./slackware64/a/kernel-firmware-2.6.33.4-noarch-1.txz.asc
--rw-r--r--  1 root root      626 2010-05-13 03:31 ./slackware64/a/kernel-generic-2.6.33.4-x86_64-1.txt
--rw-r--r--  1 root root  3054128 2010-05-13 03:31 ./slackware64/a/kernel-generic-2.6.33.4-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-13 03:31 ./slackware64/a/kernel-generic-2.6.33.4-x86_64-1.txz.asc
--rw-r--r--  1 root root      638 2010-05-13 04:13 ./slackware64/a/kernel-huge-2.6.33.4-x86_64-1.txt
--rw-r--r--  1 root root  5935792 2010-05-13 04:13 ./slackware64/a/kernel-huge-2.6.33.4-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-13 04:13 ./slackware64/a/kernel-huge-2.6.33.4-x86_64-1.txz.asc
--rw-r--r--  1 root root      520 2010-05-13 04:06 ./slackware64/a/kernel-modules-2.6.33.4-x86_64-1.txt
--rw-r--r--  1 root root 18307188 2010-05-13 04:06 ./slackware64/a/kernel-modules-2.6.33.4-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-13 04:06 ./slackware64/a/kernel-modules-2.6.33.4-x86_64-1.txz.asc
--rw-r--r--  1 root root      386 2010-02-09 01:05 ./slackware64/a/less-436-x86_64-1.txt
--rw-r--r--  1 root root   112032 2010-02-09 01:05 ./slackware64/a/less-436-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-09 01:05 ./slackware64/a/less-436-x86_64-1.txz.asc
--rw-r--r--  1 root root      152 2008-10-02 14:54 ./slackware64/a/lha-114i-x86_64-1.txt
--rw-r--r--  1 root root    47640 2008-10-02 14:54 ./slackware64/a/lha-114i-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-02 14:54 ./slackware64/a/lha-114i-x86_64-1.txz.asc
--rw-r--r--  1 root root      590 2010-02-15 02:09 ./slackware64/a/lilo-22.8-x86_64-15.txt
--rw-r--r--  1 root root   260752 2010-02-15 02:09 ./slackware64/a/lilo-22.8-x86_64-15.txz
--rw-r--r--  1 root root      197 2010-02-15 02:09 ./slackware64/a/lilo-22.8-x86_64-15.txz.asc
--rw-r--r--  1 root root      533 2010-02-12 00:20 ./slackware64/a/logrotate-3.7.8-x86_64-1.txt
--rw-r--r--  1 root root    36996 2010-02-12 00:20 ./slackware64/a/logrotate-3.7.8-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-12 00:20 ./slackware64/a/logrotate-3.7.8-x86_64-1.txz.asc
--rw-r--r--  1 root root      557 2010-05-04 07:28 ./slackware64/a/lvm2-2.02.64-x86_64-1.txt
--rw-r--r--  1 root root  1146288 2010-05-04 07:28 ./slackware64/a/lvm2-2.02.64-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 07:28 ./slackware64/a/lvm2-2.02.64-x86_64-1.txz.asc
--rw-r--r--  1 root root     7837 2010-05-13 07:21 ./slackware64/a/maketag
--rw-r--r--  1 root root     7837 2010-05-13 07:21 ./slackware64/a/maketag.ez
--rw-r--r--  1 root root      472 2010-05-17 01:57 ./slackware64/a/mdadm-2.6.9-x86_64-1.txt
--rw-r--r--  1 root root   406796 2010-05-17 01:57 ./slackware64/a/mdadm-2.6.9-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-17 01:57 ./slackware64/a/mdadm-2.6.9-x86_64-1.txz.asc
--rw-r--r--  1 root root      323 2010-05-17 22:12 ./slackware64/a/minicom-2.1-x86_64-4.txt
--rw-r--r--  1 root root   271284 2010-05-17 22:12 ./slackware64/a/minicom-2.1-x86_64-4.txz
--rw-r--r--  1 root root      198 2010-05-17 22:12 ./slackware64/a/minicom-2.1-x86_64-4.txz.asc
--rw-r--r--  1 root root      529 2010-05-08 05:29 ./slackware64/a/mkinitrd-1.4.5-x86_64-2.txt
--rw-r--r--  1 root root   551568 2010-05-08 05:29 ./slackware64/a/mkinitrd-1.4.5-x86_64-2.txz
--rw-r--r--  1 root root      198 2010-05-08 05:29 ./slackware64/a/mkinitrd-1.4.5-x86_64-2.txz.asc
--rw-r--r--  1 root root      388 2010-02-06 20:31 ./slackware64/a/module-init-tools-3.11.1-x86_64-1.txt
--rw-r--r--  1 root root   336044 2010-02-06 20:31 ./slackware64/a/module-init-tools-3.11.1-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-06 20:31 ./slackware64/a/module-init-tools-3.11.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      487 2008-10-02 19:42 ./slackware64/a/mt-st-0.9b-x86_64-2.txt
--rw-r--r--  1 root root    30000 2008-10-02 19:42 ./slackware64/a/mt-st-0.9b-x86_64-2.txz
--rw-r--r--  1 root root      197 2008-10-02 19:42 ./slackware64/a/mt-st-0.9b-x86_64-2.txz.asc
--rw-r--r--  1 root root      400 2008-10-02 19:48 ./slackware64/a/mtx-1.3.9-x86_64-2.txt
--rw-r--r--  1 root root    58860 2008-10-02 19:48 ./slackware64/a/mtx-1.3.9-x86_64-2.txz
--rw-r--r--  1 root root      197 2008-10-02 19:48 ./slackware64/a/mtx-1.3.9-x86_64-2.txz.asc
--rw-r--r--  1 root root      560 2008-09-21 20:07 ./slackware64/a/ncompress-4.2.4-x86_64-1.txt
--rw-r--r--  1 root root    16192 2008-09-21 20:07 ./slackware64/a/ncompress-4.2.4-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-09-21 20:07 ./slackware64/a/ncompress-4.2.4-x86_64-1.txz.asc
--rw-r--r--  1 root root      546 2010-03-13 00:51 ./slackware64/a/ntfs-3g-2010.3.6-x86_64-1.txt
--rw-r--r--  1 root root   257476 2010-03-13 00:51 ./slackware64/a/ntfs-3g-2010.3.6-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-03-13 00:51 ./slackware64/a/ntfs-3g-2010.3.6-x86_64-1.txz.asc
--rw-r--r--  1 root root      678 2010-03-29 22:38 ./slackware64/a/openssl-solibs-0.9.8n-x86_64-1.txt
--rw-r--r--  1 root root   725512 2010-03-29 22:38 ./slackware64/a/openssl-solibs-0.9.8n-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-03-29 22:38 ./slackware64/a/openssl-solibs-0.9.8n-x86_64-1.txz.asc
--rw-r--r--  1 root root      564 2008-09-23 17:41 ./slackware64/a/patch-2.5.4-x86_64-1.txt
--rw-r--r--  1 root root    58092 2008-09-23 17:41 ./slackware64/a/patch-2.5.4-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-09-23 17:41 ./slackware64/a/patch-2.5.4-x86_64-1.txz.asc
--rw-r--r--  1 root root      436 2010-02-09 03:45 ./slackware64/a/pciutils-3.1.5-x86_64-1.txt
--rw-r--r--  1 root root   236560 2010-02-09 03:45 ./slackware64/a/pciutils-3.1.5-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-09 03:45 ./slackware64/a/pciutils-3.1.5-x86_64-1.txz.asc
--rw-r--r--  1 root root      451 2009-04-21 18:56 ./slackware64/a/pcmciautils-015-x86_64-2.txt
--rw-r--r--  1 root root    27608 2009-04-21 18:56 ./slackware64/a/pcmciautils-015-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-04-21 18:56 ./slackware64/a/pcmciautils-015-x86_64-2.txz.asc
--rw-r--r--  1 root root    39364 2010-05-11 16:49 ./slackware64/a/pkgtools-13.1-noarch-1.tgz
--rw-r--r--  1 root root      198 2010-05-11 16:49 ./slackware64/a/pkgtools-13.1-noarch-1.tgz.asc
--rw-r--r--  1 root root      624 2010-05-11 16:49 ./slackware64/a/pkgtools-13.1-noarch-1.txt
--rw-r--r--  1 root root      282 2009-05-23 06:22 ./slackware64/a/procps-3.2.7-x86_64-3.txt
--rw-r--r--  1 root root   231048 2009-05-23 06:22 ./slackware64/a/procps-3.2.7-x86_64-3.txz
--rw-r--r--  1 root root      197 2009-05-23 06:22 ./slackware64/a/procps-3.2.7-x86_64-3.txz.asc
--rw-r--r--  1 root root      524 2009-06-22 20:00 ./slackware64/a/quota-3.17-x86_64-1.txt
--rw-r--r--  1 root root   167344 2009-06-22 20:00 ./slackware64/a/quota-3.17-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-06-22 20:00 ./slackware64/a/quota-3.17-x86_64-1.txz.asc
--rw-r--r--  1 root root      476 2009-03-04 20:34 ./slackware64/a/reiserfsprogs-3.6.21-x86_64-1.txt
--rw-r--r--  1 root root   224836 2009-03-04 20:34 ./slackware64/a/reiserfsprogs-3.6.21-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-03-04 20:34 ./slackware64/a/reiserfsprogs-3.6.21-x86_64-1.txz.asc
--rw-r--r--  1 root root      398 2010-04-30 22:47 ./slackware64/a/rpm2tgz-1.2.1-x86_64-1.txt
--rw-r--r--  1 root root     5260 2010-04-30 22:47 ./slackware64/a/rpm2tgz-1.2.1-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-30 22:47 ./slackware64/a/rpm2tgz-1.2.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      467 2010-02-12 02:13 ./slackware64/a/sdparm-1.04-x86_64-1.txt
--rw-r--r--  1 root root    92524 2010-02-12 02:13 ./slackware64/a/sdparm-1.04-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-12 02:13 ./slackware64/a/sdparm-1.04-x86_64-1.txz.asc
--rw-r--r--  1 root root      408 2009-12-06 02:15 ./slackware64/a/sed-4.2.1-x86_64-1.txt
--rw-r--r--  1 root root   173168 2009-12-06 02:15 ./slackware64/a/sed-4.2.1-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-12-06 02:15 ./slackware64/a/sed-4.2.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      536 2010-02-28 20:19 ./slackware64/a/shadow-4.1.4.2-x86_64-3.txt
--rw-r--r--  1 root root  1196168 2010-02-28 20:19 ./slackware64/a/shadow-4.1.4.2-x86_64-3.txz
--rw-r--r--  1 root root      197 2010-02-28 20:19 ./slackware64/a/shadow-4.1.4.2-x86_64-3.txz.asc
--rw-r--r--  1 root root      627 2009-06-22 18:50 ./slackware64/a/sharutils-4.7-x86_64-1.txt
--rw-r--r--  1 root root   166144 2009-06-22 18:50 ./slackware64/a/sharutils-4.7-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-06-22 18:50 ./slackware64/a/sharutils-4.7-x86_64-1.txz.asc
--rw-r--r--  1 root root      553 2009-07-18 00:43 ./slackware64/a/slocate-3.1-x86_64-3.txt
--rw-r--r--  1 root root    28148 2009-07-18 00:43 ./slackware64/a/slocate-3.1-x86_64-3.txz
--rw-r--r--  1 root root      197 2009-07-18 00:43 ./slackware64/a/slocate-3.1-x86_64-3.txz.asc
--rw-r--r--  1 root root      710 2010-04-25 23:34 ./slackware64/a/smartmontools-5.39.1-x86_64-1.txt
--rw-r--r--  1 root root   266680 2010-04-25 23:34 ./slackware64/a/smartmontools-5.39.1-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-25 23:34 ./slackware64/a/smartmontools-5.39.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      285 2008-10-02 20:57 ./slackware64/a/splitvt-1.6.5-x86_64-1.txt
--rw-r--r--  1 root root    28700 2008-10-02 20:57 ./slackware64/a/splitvt-1.6.5-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-02 20:57 ./slackware64/a/splitvt-1.6.5-x86_64-1.txz.asc
--rw-r--r--  1 root root      544 2008-09-25 22:00 ./slackware64/a/sysfsutils-2.1.0-x86_64-1.txt
--rw-r--r--  1 root root    39392 2008-09-25 22:00 ./slackware64/a/sysfsutils-2.1.0-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-09-25 22:00 ./slackware64/a/sysfsutils-2.1.0-x86_64-1.txz.asc
--rw-r--r--  1 root root      457 2008-09-23 17:49 ./slackware64/a/sysklogd-1.4.1-x86_64-10.txt
--rw-r--r--  1 root root    57760 2008-09-23 17:49 ./slackware64/a/sysklogd-1.4.1-x86_64-10.txz
--rw-r--r--  1 root root      197 2008-09-23 17:49 ./slackware64/a/sysklogd-1.4.1-x86_64-10.txz.asc
--rw-r--r--  1 root root      518 2010-01-25 20:40 ./slackware64/a/syslinux-3.84-x86_64-2.txt
--rw-r--r--  1 root root   450952 2010-01-25 20:40 ./slackware64/a/syslinux-3.84-x86_64-2.txz
--rw-r--r--  1 root root      197 2010-01-25 20:40 ./slackware64/a/syslinux-3.84-x86_64-2.txz.asc
--rw-r--r--  1 root root      513 2008-09-25 17:31 ./slackware64/a/sysvinit-2.86-x86_64-6.txt
--rw-r--r--  1 root root    60428 2008-09-25 17:31 ./slackware64/a/sysvinit-2.86-x86_64-6.txz
--rw-r--r--  1 root root      197 2008-09-25 17:31 ./slackware64/a/sysvinit-2.86-x86_64-6.txz.asc
--rw-r--r--  1 root root      695 2008-09-23 17:55 ./slackware64/a/sysvinit-functions-8.53-x86_64-2.txt
--rw-r--r--  1 root root    30356 2008-09-23 17:55 ./slackware64/a/sysvinit-functions-8.53-x86_64-2.txz
--rw-r--r--  1 root root      197 2008-09-23 17:55 ./slackware64/a/sysvinit-functions-8.53-x86_64-2.txz.asc
--rw-r--r--  1 root root      379 2010-04-30 03:13 ./slackware64/a/sysvinit-scripts-1.2-noarch-32.txt
--rw-r--r--  1 root root    17344 2010-04-30 03:13 ./slackware64/a/sysvinit-scripts-1.2-noarch-32.txz
--rw-r--r--  1 root root      198 2010-04-30 03:13 ./slackware64/a/sysvinit-scripts-1.2-noarch-32.txz.asc
--rw-r--r--  1 root root     1178 2010-05-13 07:21 ./slackware64/a/tagfile
--rw-r--r--  1 root root  1025407 2010-04-30 02:41 ./slackware64/a/tar-1.23-x86_64-1.tgz
--rw-r--r--  1 root root      198 2010-04-30 02:41 ./slackware64/a/tar-1.23-x86_64-1.tgz.asc
--rw-r--r--  1 root root      380 2010-04-30 02:41 ./slackware64/a/tar-1.23-x86_64-1.txt
--rw-r--r--  1 root root      431 2008-10-02 21:05 ./slackware64/a/tcsh-6.15.00-x86_64-1.txt
--rw-r--r--  1 root root   273964 2008-10-02 21:05 ./slackware64/a/tcsh-6.15.00-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-02 21:05 ./slackware64/a/tcsh-6.15.00-x86_64-1.txz.asc
--rw-r--r--  1 root root      432 2008-09-25 21:54 ./slackware64/a/time-1.7-x86_64-1.txt
--rw-r--r--  1 root root    18340 2008-09-25 21:54 ./slackware64/a/time-1.7-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-09-25 21:54 ./slackware64/a/time-1.7-x86_64-1.txz.asc
--rw-r--r--  1 root root      418 2009-04-11 20:16 ./slackware64/a/tree-1.5.2.2-x86_64-1.txt
--rw-r--r--  1 root root    29464 2009-04-11 20:16 ./slackware64/a/tree-1.5.2.2-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-04-11 20:16 ./slackware64/a/tree-1.5.2.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      369 2010-04-30 03:04 ./slackware64/a/udev-153-x86_64-1.txt
--rw-r--r--  1 root root   267032 2010-04-30 03:04 ./slackware64/a/udev-153-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-30 03:04 ./slackware64/a/udev-153-x86_64-1.txz.asc
--rw-r--r--  1 root root      392 2008-10-02 21:07 ./slackware64/a/unarj-265-x86_64-1.txt
--rw-r--r--  1 root root    16528 2008-10-02 21:07 ./slackware64/a/unarj-265-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-02 21:07 ./slackware64/a/unarj-265-x86_64-1.txz.asc
--rw-r--r--  1 root root      720 2010-04-30 04:04 ./slackware64/a/usb_modeswitch-1.1.2-x86_64-1.txt
--rw-r--r--  1 root root    37352 2010-04-30 04:04 ./slackware64/a/usb_modeswitch-1.1.2-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-30 04:04 ./slackware64/a/usb_modeswitch-1.1.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      322 2010-04-30 01:58 ./slackware64/a/usbutils-0.87-x86_64-1.txt
--rw-r--r--  1 root root   156160 2010-04-30 01:58 ./slackware64/a/usbutils-0.87-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-30 01:58 ./slackware64/a/usbutils-0.87-x86_64-1.txz.asc
--rw-r--r--  1 root root      350 2008-09-28 20:45 ./slackware64/a/utempter-1.1.4-x86_64-1.txt
--rw-r--r--  1 root root    13872 2008-09-28 20:45 ./slackware64/a/utempter-1.1.4-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-09-28 20:45 ./slackware64/a/utempter-1.1.4-x86_64-1.txz.asc
--rw-r--r--  1 root root      446 2010-04-30 04:17 ./slackware64/a/util-linux-ng-2.17.2-x86_64-1.txt
--rw-r--r--  1 root root  1341524 2010-04-30 04:17 ./slackware64/a/util-linux-ng-2.17.2-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-30 04:17 ./slackware64/a/util-linux-ng-2.17.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      582 2009-03-03 23:24 ./slackware64/a/which-2.20-x86_64-1.txt
--rw-r--r--  1 root root    28780 2009-03-03 23:24 ./slackware64/a/which-2.20-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-03-03 23:24 ./slackware64/a/which-2.20-x86_64-1.txz.asc
--rw-r--r--  1 root root      495 2010-02-09 21:23 ./slackware64/a/xfsprogs-3.1.1-x86_64-1.txt
--rw-r--r--  1 root root   652872 2010-02-09 21:23 ./slackware64/a/xfsprogs-3.1.1-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-09 21:23 ./slackware64/a/xfsprogs-3.1.1-x86_64-1.txz.asc
--rw-r--r--  1 root root   397239 2009-11-24 00:25 ./slackware64/a/xz-4.999.9beta-x86_64-1.tgz
--rw-r--r--  1 root root      197 2009-11-24 00:25 ./slackware64/a/xz-4.999.9beta-x86_64-1.tgz.asc
--rw-r--r--  1 root root      499 2009-11-24 00:25 ./slackware64/a/xz-4.999.9beta-x86_64-1.txt
--rw-r--r--  1 root root      542 2008-10-02 21:13 ./slackware64/a/zoo-2.10-x86_64-1.txt
--rw-r--r--  1 root root    54236 2008-10-02 21:13 ./slackware64/a/zoo-2.10-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-02 21:13 ./slackware64/a/zoo-2.10-x86_64-1.txz.asc
-drwxr-xr-x  2 root root    16384 2010-05-16 05:15 ./slackware64/ap
--rw-r--r--  1 root root      445 2009-05-23 04:17 ./slackware64/ap/a2ps-4.14-x86_64-4.txt
--rw-r--r--  1 root root   760096 2009-05-23 04:17 ./slackware64/ap/a2ps-4.14-x86_64-4.txz
--rw-r--r--  1 root root      197 2009-05-23 04:17 ./slackware64/ap/a2ps-4.14-x86_64-4.txz.asc
--rw-r--r--  1 root root      599 2008-11-30 13:17 ./slackware64/ap/acct-6.4pre1-x86_64-1.txt
--rw-r--r--  1 root root    87636 2008-11-30 13:17 ./slackware64/ap/acct-6.4pre1-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-11-30 13:17 ./slackware64/ap/acct-6.4pre1-x86_64-1.txz.asc
--rw-r--r--  1 root root      625 2010-04-29 23:48 ./slackware64/ap/alsa-utils-1.0.23-x86_64-1.txt
--rw-r--r--  1 root root   925836 2010-04-29 23:48 ./slackware64/ap/alsa-utils-1.0.23-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-29 23:48 ./slackware64/ap/alsa-utils-1.0.23-x86_64-1.txz.asc
--rw-r--r--  1 root root      275 2008-10-02 22:32 ./slackware64/ap/amp-0.7.6-x86_64-1.txt
--rw-r--r--  1 root root    44568 2008-10-02 22:32 ./slackware64/ap/amp-0.7.6-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-02 22:32 ./slackware64/ap/amp-0.7.6-x86_64-1.txz.asc
--rw-r--r--  1 root root      525 2010-04-25 21:36 ./slackware64/ap/ash-0.4.0-x86_64-2.txt
--rw-r--r--  1 root root    81548 2010-04-25 21:36 ./slackware64/ap/ash-0.4.0-x86_64-2.txz
--rw-r--r--  1 root root      198 2010-04-25 21:36 ./slackware64/ap/ash-0.4.0-x86_64-2.txz.asc
--rw-r--r--  1 root root      284 2008-10-21 13:01 ./slackware64/ap/at-3.1.10-x86_64-1.txt
--rw-r--r--  1 root root    38884 2008-10-21 13:01 ./slackware64/ap/at-3.1.10-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-21 13:01 ./slackware64/ap/at-3.1.10-x86_64-1.txz.asc
--rw-r--r--  1 root root      308 2009-05-23 04:18 ./slackware64/ap/aumix-2.8-x86_64-2.txt
--rw-r--r--  1 root root    56448 2009-05-23 04:18 ./slackware64/ap/aumix-2.8-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-05-23 04:18 ./slackware64/ap/aumix-2.8-x86_64-2.txz.asc
--rw-r--r--  1 root root      386 2009-05-23 04:18 ./slackware64/ap/bc-1.06.95-x86_64-2.txt
--rw-r--r--  1 root root   102072 2009-05-23 04:18 ./slackware64/ap/bc-1.06.95-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-05-23 04:18 ./slackware64/ap/bc-1.06.95-x86_64-2.txz.asc
--rw-r--r--  1 root root      335 2009-05-23 04:18 ./slackware64/ap/bpe-2.01.00-x86_64-2.txt
--rw-r--r--  1 root root    47880 2009-05-23 04:18 ./slackware64/ap/bpe-2.01.00-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-05-23 04:18 ./slackware64/ap/bpe-2.01.00-x86_64-2.txz.asc
--rw-r--r--  1 root root      595 2008-11-26 15:53 ./slackware64/ap/cdparanoia-III_10.2-x86_64-1.txt
--rw-r--r--  1 root root    97840 2008-11-26 15:53 ./slackware64/ap/cdparanoia-III_10.2-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-11-26 15:53 ./slackware64/ap/cdparanoia-III_10.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      296 2008-10-21 11:12 ./slackware64/ap/cdrdao-1.2.1-x86_64-1.txt
--rw-r--r--  1 root root   305140 2008-10-21 11:12 ./slackware64/ap/cdrdao-1.2.1-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-21 11:12 ./slackware64/ap/cdrdao-1.2.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      409 2010-04-29 01:19 ./slackware64/ap/cdrtools-2.01.01a78-x86_64-1.txt
--rw-r--r--  1 root root   813272 2010-04-29 01:19 ./slackware64/ap/cdrtools-2.01.01a78-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-29 01:19 ./slackware64/ap/cdrtools-2.01.01a78-x86_64-1.txz.asc
--rw-r--r--  1 root root      456 2009-07-22 22:13 ./slackware64/ap/dc3dd-6.12.3-x86_64-1.txt
--rw-r--r--  1 root root   116972 2009-07-22 22:13 ./slackware64/ap/dc3dd-6.12.3-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-07-22 22:13 ./slackware64/ap/dc3dd-6.12.3-x86_64-1.txz.asc
--rw-r--r--  1 root root      409 2008-10-21 13:20 ./slackware64/ap/diffstat-1.43-x86_64-1.txt
--rw-r--r--  1 root root    15012 2008-10-21 13:20 ./slackware64/ap/diffstat-1.43-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-21 13:20 ./slackware64/ap/diffstat-1.43-x86_64-1.txz.asc
--rw-r--r--  1 root root      283 2010-05-10 02:37 ./slackware64/ap/diffutils-3.0-x86_64-1.txt
--rw-r--r--  1 root root   313968 2010-05-10 02:37 ./slackware64/ap/diffutils-3.0-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-10 02:37 ./slackware64/ap/diffutils-3.0-x86_64-1.txz.asc
--rw-r--r--  1 root root      348 2009-06-13 04:42 ./slackware64/ap/dmapi-2.2.10-x86_64-1.txt
--rw-r--r--  1 root root    30804 2009-06-13 04:42 ./slackware64/ap/dmapi-2.2.10-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-06-13 04:42 ./slackware64/ap/dmapi-2.2.10-x86_64-1.txz.asc
--rw-r--r--  1 root root      473 2008-11-27 10:06 ./slackware64/ap/dmidecode-2.10-x86_64-1.txt
--rw-r--r--  1 root root    51512 2008-11-27 10:06 ./slackware64/ap/dmidecode-2.10-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-11-27 10:06 ./slackware64/ap/dmidecode-2.10-x86_64-1.txz.asc
--rw-r--r--  1 root root      360 2008-10-21 19:37 ./slackware64/ap/dvd+rw-tools-7.1-x86_64-1.txt
--rw-r--r--  1 root root   104856 2008-10-21 19:37 ./slackware64/ap/dvd+rw-tools-7.1-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-21 19:37 ./slackware64/ap/dvd+rw-tools-7.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      461 2008-11-04 22:16 ./slackware64/ap/enscript-1.6.3-x86_64-1.txt
--rw-r--r--  1 root root   331356 2008-11-04 22:16 ./slackware64/ap/enscript-1.6.3-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-11-04 22:16 ./slackware64/ap/enscript-1.6.3-x86_64-1.txz.asc
--rw-r--r--  1 root root      603 2008-10-21 20:53 ./slackware64/ap/flac-1.2.1-x86_64-2.txt
--rw-r--r--  1 root root   761720 2008-10-21 20:53 ./slackware64/ap/flac-1.2.1-x86_64-2.txz
--rw-r--r--  1 root root      197 2008-10-21 20:53 ./slackware64/ap/flac-1.2.1-x86_64-2.txz.asc
--rw-r--r--  1 root root      637 2010-02-16 08:54 ./slackware64/ap/foomatic-filters-4.0.4-x86_64-1.txt
--rw-r--r--  1 root root    77004 2010-02-16 08:54 ./slackware64/ap/foomatic-filters-4.0.4-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-16 08:54 ./slackware64/ap/foomatic-filters-4.0.4-x86_64-1.txz.asc
--rw-r--r--  1 root root      549 2010-04-25 21:16 ./slackware64/ap/ghostscript-8.71-x86_64-2.txt
--rw-r--r--  1 root root 10806596 2010-04-25 21:16 ./slackware64/ap/ghostscript-8.71-x86_64-2.txz
--rw-r--r--  1 root root      198 2010-04-25 21:16 ./slackware64/ap/ghostscript-8.71-x86_64-2.txz.asc
--rw-r--r--  1 root root      368 2008-10-01 19:55 ./slackware64/ap/ghostscript-fonts-std-8.11-noarch-1.txt
--rw-r--r--  1 root root  3517036 2008-10-01 19:55 ./slackware64/ap/ghostscript-fonts-std-8.11-noarch-1.txz
--rw-r--r--  1 root root      197 2008-10-01 19:55 ./slackware64/ap/ghostscript-fonts-std-8.11-noarch-1.txz.asc
--rw-r--r--  1 root root      303 2010-04-29 02:48 ./slackware64/ap/gphoto2-2.4.9-x86_64-1.txt
--rw-r--r--  1 root root   162768 2010-04-29 02:48 ./slackware64/ap/gphoto2-2.4.9-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-29 02:48 ./slackware64/ap/gphoto2-2.4.9-x86_64-1.txz.asc
--rw-r--r--  1 root root      431 2009-03-04 21:45 ./slackware64/ap/groff-1.20.1-x86_64-1.txt
--rw-r--r--  1 root root  1867680 2009-03-04 21:45 ./slackware64/ap/groff-1.20.1-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-03-04 21:45 ./slackware64/ap/groff-1.20.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      549 2010-02-16 09:02 ./slackware64/ap/gutenprint-5.2.4-x86_64-2.txt
--rw-r--r--  1 root root  2001944 2010-02-16 09:02 ./slackware64/ap/gutenprint-5.2.4-x86_64-2.txz
--rw-r--r--  1 root root      197 2010-02-16 09:02 ./slackware64/ap/gutenprint-5.2.4-x86_64-2.txz.asc
--rw-r--r--  1 root root      477 2010-04-29 18:51 ./slackware64/ap/hplip-3.10.2-x86_64-2.txt
--rw-r--r--  1 root root 12083844 2010-04-29 18:51 ./slackware64/ap/hplip-3.10.2-x86_64-2.txz
--rw-r--r--  1 root root      198 2010-04-29 18:51 ./slackware64/ap/hplip-3.10.2-x86_64-2.txz.asc
--rwxr-xr-x  1 root root     2897 2009-06-24 22:06 ./slackware64/ap/install-packages
--rw-r--r--  1 root root      446 2006-09-18 10:41 ./slackware64/ap/install.end
--rw-r--r--  1 root root      600 2009-03-16 21:02 ./slackware64/ap/ispell-3.2.06-x86_64-1.txt
--rw-r--r--  1 root root   347684 2009-03-16 21:02 ./slackware64/ap/ispell-3.2.06-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-03-16 21:02 ./slackware64/ap/ispell-3.2.06-x86_64-1.txz.asc
--rw-r--r--  1 root root      484 2010-02-18 23:13 ./slackware64/ap/jed-0.99_19-x86_64-1.txt
--rw-r--r--  1 root root   527460 2010-02-18 23:13 ./slackware64/ap/jed-0.99_19-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-18 23:13 ./slackware64/ap/jed-0.99_19-x86_64-1.txz.asc
--rw-r--r--  1 root root      145 2009-05-23 04:40 ./slackware64/ap/joe-3.5-x86_64-2.txt
--rw-r--r--  1 root root   288256 2009-05-23 04:40 ./slackware64/ap/joe-3.5-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-05-23 04:40 ./slackware64/ap/joe-3.5-x86_64-2.txz.asc
--rw-r--r--  1 root root      337 2009-06-16 18:40 ./slackware64/ap/jove-4.16.0.70-x86_64-2.txt
--rw-r--r--  1 root root   162100 2009-06-16 18:40 ./slackware64/ap/jove-4.16.0.70-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-06-16 18:40 ./slackware64/ap/jove-4.16.0.70-x86_64-2.txz.asc
--rw-r--r--  1 root root      540 2008-11-04 22:45 ./slackware64/ap/ksh93-2007_03_28-x86_64-2.txt
--rw-r--r--  1 root root   683104 2008-11-04 22:45 ./slackware64/ap/ksh93-2007_03_28-x86_64-2.txz
--rw-r--r--  1 root root      197 2008-11-04 22:45 ./slackware64/ap/ksh93-2007_03_28-x86_64-2.txz.asc
--rw-r--r--  1 root root      316 2008-12-12 21:14 ./slackware64/ap/libx86-1.1-x86_64-1.txt
--rw-r--r--  1 root root    59200 2008-12-12 21:14 ./slackware64/ap/libx86-1.1-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-12-12 21:14 ./slackware64/ap/libx86-1.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      701 2010-02-10 21:31 ./slackware64/ap/linuxdoc-tools-0.9.66-x86_64-2.txt
--rw-r--r--  1 root root  4816884 2010-02-10 21:31 ./slackware64/ap/linuxdoc-tools-0.9.66-x86_64-2.txz
--rw-r--r--  1 root root      197 2010-02-10 21:31 ./slackware64/ap/linuxdoc-tools-0.9.66-x86_64-2.txz.asc
--rw-r--r--  1 root root      644 2010-05-03 07:29 ./slackware64/ap/lm_sensors-3.1.2-x86_64-1.txt
--rw-r--r--  1 root root   127248 2010-05-03 07:29 ./slackware64/ap/lm_sensors-3.1.2-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-03 07:29 ./slackware64/ap/lm_sensors-3.1.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      333 2010-03-13 01:05 ./slackware64/ap/lsof-4.83-x86_64-1.txt
--rw-r--r--  1 root root   277000 2010-03-13 01:05 ./slackware64/ap/lsof-4.83-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-03-13 01:05 ./slackware64/ap/lsof-4.83-x86_64-1.txz.asc
--rw-r--r--  1 root root      367 2009-03-08 23:30 ./slackware64/ap/lsscsi-0.22-x86_64-1.txt
--rw-r--r--  1 root root    30620 2009-03-08 23:30 ./slackware64/ap/lsscsi-0.22-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-03-08 23:30 ./slackware64/ap/lsscsi-0.22-x86_64-1.txz.asc
--rw-r--r--  1 root root      339 2008-11-26 18:35 ./slackware64/ap/madplay-0.15.2b-x86_64-2.txt
--rw-r--r--  1 root root    60436 2008-11-26 18:35 ./slackware64/ap/madplay-0.15.2b-x86_64-2.txz
--rw-r--r--  1 root root      197 2008-11-26 18:35 ./slackware64/ap/madplay-0.15.2b-x86_64-2.txz.asc
--rw-r--r--  1 root root     5404 2010-05-05 07:06 ./slackware64/ap/maketag
--rw-r--r--  1 root root     5404 2010-05-05 07:06 ./slackware64/ap/maketag.ez
--rw-r--r--  1 root root      447 2009-08-09 02:17 ./slackware64/ap/man-1.6f-x86_64-2.txt
--rw-r--r--  1 root root   211888 2009-08-09 02:17 ./slackware64/ap/man-1.6f-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-08-09 02:17 ./slackware64/ap/man-1.6f-x86_64-2.txz.asc
--rw-r--r--  1 root root      490 2010-02-28 20:30 ./slackware64/ap/man-pages-3.24-noarch-1.txt
--rw-r--r--  1 root root  2447632 2010-02-28 20:30 ./slackware64/ap/man-pages-3.24-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-28 20:30 ./slackware64/ap/man-pages-3.24-noarch-1.txz.asc
--rw-r--r--  1 root root      451 2010-05-09 23:19 ./slackware64/ap/mc-20100509_git-x86_64-1.txt
--rw-r--r--  1 root root  1527984 2010-05-09 23:19 ./slackware64/ap/mc-20100509_git-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-09 23:19 ./slackware64/ap/mc-20100509_git-x86_64-1.txz.asc
--rw-r--r--  1 root root      378 2009-06-25 23:08 ./slackware64/ap/most-5.0.0a-x86_64-2.txt
--rw-r--r--  1 root root    45504 2009-06-25 23:08 ./slackware64/ap/most-5.0.0a-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-06-25 23:08 ./slackware64/ap/most-5.0.0a-x86_64-2.txz.asc
--rw-r--r--  1 root root      331 2010-04-14 20:23 ./slackware64/ap/mpg123-1.12.1-x86_64-1.txt
--rw-r--r--  1 root root   239336 2010-04-14 20:23 ./slackware64/ap/mpg123-1.12.1-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-14 20:23 ./slackware64/ap/mpg123-1.12.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      360 2010-05-05 19:34 ./slackware64/ap/mysql-5.1.46-x86_64-2.txt
--rw-r--r--  1 root root  8587140 2010-05-05 19:34 ./slackware64/ap/mysql-5.1.46-x86_64-2.txz
--rw-r--r--  1 root root      198 2010-05-05 19:34 ./slackware64/ap/mysql-5.1.46-x86_64-2.txz.asc
--rw-r--r--  1 root root      415 2010-04-20 10:53 ./slackware64/ap/nano-2.2.4-x86_64-1.txt
--rw-r--r--  1 root root   376072 2010-04-20 10:53 ./slackware64/ap/nano-2.2.4-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-20 10:53 ./slackware64/ap/nano-2.2.4-x86_64-1.txz.asc
--rw-r--r--  1 root root      514 2009-06-10 01:27 ./slackware64/ap/normalize-0.7.7-x86_64-1.txt
--rw-r--r--  1 root root    60608 2009-06-10 01:27 ./slackware64/ap/normalize-0.7.7-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-06-10 01:27 ./slackware64/ap/normalize-0.7.7-x86_64-1.txz.asc
--rw-r--r--  1 root root      604 2008-10-23 19:18 ./slackware64/ap/ntfsprogs-2.0.0-x86_64-2.txt
--rw-r--r--  1 root root   273544 2008-10-23 19:18 ./slackware64/ap/ntfsprogs-2.0.0-x86_64-2.txz
--rw-r--r--  1 root root      197 2008-10-23 19:18 ./slackware64/ap/ntfsprogs-2.0.0-x86_64-2.txz.asc
--rw-r--r--  1 root root      375 2010-04-30 04:15 ./slackware64/ap/pm-utils-1.3.0-x86_64-1.txt
--rw-r--r--  1 root root    64828 2010-04-30 04:15 ./slackware64/ap/pm-utils-1.3.0-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-30 04:15 ./slackware64/ap/pm-utils-1.3.0-x86_64-1.txz.asc
--rw-r--r--  1 root root      548 2010-05-04 04:42 ./slackware64/ap/powertop-1.11-x86_64-1.txt
--rw-r--r--  1 root root    58112 2010-05-04 04:42 ./slackware64/ap/powertop-1.11-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 04:42 ./slackware64/ap/powertop-1.11-x86_64-1.txz.asc
--rw-r--r--  1 root root      345 2010-04-27 21:20 ./slackware64/ap/radeontool-1.6.1-x86_64-1.txt
--rw-r--r--  1 root root    52080 2010-04-27 21:20 ./slackware64/ap/radeontool-1.6.1-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-27 21:20 ./slackware64/ap/radeontool-1.6.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      372 2009-05-23 06:26 ./slackware64/ap/rexima-1.4-x86_64-2.txt
--rw-r--r--  1 root root    16960 2009-05-23 06:26 ./slackware64/ap/rexima-1.4-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-05-23 06:26 ./slackware64/ap/rexima-1.4-x86_64-2.txz.asc
--rw-r--r--  1 root root      493 2010-01-13 20:37 ./slackware64/ap/rpm-4.8.0-x86_64-1.txt
--rw-r--r--  1 root root   804656 2010-01-13 20:37 ./slackware64/ap/rpm-4.8.0-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-01-13 20:37 ./slackware64/ap/rpm-4.8.0-x86_64-1.txz.asc
--rw-r--r--  1 root root      268 2008-10-23 19:33 ./slackware64/ap/rzip-2.1-x86_64-1.txt
--rw-r--r--  1 root root    20372 2008-10-23 19:33 ./slackware64/ap/rzip-2.1-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-23 19:33 ./slackware64/ap/rzip-2.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      123 2009-05-23 06:36 ./slackware64/ap/sc-7.16-x86_64-2.txt
--rw-r--r--  1 root root   195156 2009-05-23 06:36 ./slackware64/ap/sc-7.16-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-05-23 06:36 ./slackware64/ap/sc-7.16-x86_64-2.txz.asc
--rw-r--r--  1 root root      654 2009-05-23 06:38 ./slackware64/ap/screen-4.0.3-x86_64-2.txt
--rw-r--r--  1 root root   492712 2009-05-23 06:38 ./slackware64/ap/screen-4.0.3-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-05-23 06:38 ./slackware64/ap/screen-4.0.3-x86_64-2.txz.asc
--rw-r--r--  1 root root      455 2008-12-14 23:45 ./slackware64/ap/seejpeg-1.10-x86_64-1.txt
--rw-r--r--  1 root root    53832 2008-12-14 23:45 ./slackware64/ap/seejpeg-1.10-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-12-14 23:45 ./slackware64/ap/seejpeg-1.10-x86_64-1.txz.asc
--rw-r--r--  1 root root    57975 2010-05-14 23:21 ./slackware64/ap/slackpkg-2.81.1-noarch-1.tgz
--rw-r--r--  1 root root      198 2010-05-14 23:21 ./slackware64/ap/slackpkg-2.81.1-noarch-1.tgz.asc
--rw-r--r--  1 root root      441 2010-05-14 23:21 ./slackware64/ap/slackpkg-2.81.1-noarch-1.txt
--rw-r--r--  1 root root      256 2010-02-17 23:14 ./slackware64/ap/sox-14.3.0-x86_64-3.txt
--rw-r--r--  1 root root   355216 2010-02-17 23:14 ./slackware64/ap/sox-14.3.0-x86_64-3.txz
--rw-r--r--  1 root root      197 2010-02-17 23:14 ./slackware64/ap/sox-14.3.0-x86_64-3.txz.asc
--rw-r--r--  1 root root      484 2010-04-30 00:00 ./slackware64/ap/sqlite-3.6.23.1-x86_64-1.txt
--rw-r--r--  1 root root   320332 2010-04-30 00:00 ./slackware64/ap/sqlite-3.6.23.1-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-30 00:00 ./slackware64/ap/sqlite-3.6.23.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      414 2010-04-20 12:19 ./slackware64/ap/sudo-1.7.2p6-x86_64-1.txt
--rw-r--r--  1 root root   140844 2010-04-20 12:19 ./slackware64/ap/sudo-1.7.2p6-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-20 12:19 ./slackware64/ap/sudo-1.7.2p6-x86_64-1.txz.asc
--rw-r--r--  1 root root      444 2010-04-25 23:27 ./slackware64/ap/sysstat-9.0.6.1-x86_64-1.txt
--rw-r--r--  1 root root   185340 2010-04-25 23:27 ./slackware64/ap/sysstat-9.0.6.1-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-25 23:27 ./slackware64/ap/sysstat-9.0.6.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      783 2010-05-05 07:06 ./slackware64/ap/tagfile
--rw-r--r--  1 root root      616 2009-05-23 06:39 ./slackware64/ap/texinfo-4.13a-x86_64-3.txt
--rw-r--r--  1 root root   760236 2009-05-23 06:39 ./slackware64/ap/texinfo-4.13a-x86_64-3.txz
--rw-r--r--  1 root root      197 2009-05-23 06:39 ./slackware64/ap/texinfo-4.13a-x86_64-3.txz.asc
--rw-r--r--  1 root root      375 2008-12-12 21:18 ./slackware64/ap/vbetool-1.1-x86_64-1.txt
--rw-r--r--  1 root root    22748 2008-12-12 21:18 ./slackware64/ap/vbetool-1.1-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-12-12 21:18 ./slackware64/ap/vbetool-1.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      385 2010-05-10 23:04 ./slackware64/ap/vim-7.2.416-x86_64-1.txt
--rw-r--r--  1 root root  6277344 2010-05-10 23:04 ./slackware64/ap/vim-7.2.416-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-10 23:04 ./slackware64/ap/vim-7.2.416-x86_64-1.txz.asc
--rw-r--r--  1 root root      608 2008-10-23 20:24 ./slackware64/ap/vorbis-tools-1.2.0-x86_64-1.txt
--rw-r--r--  1 root root   138612 2008-10-23 20:24 ./slackware64/ap/vorbis-tools-1.2.0-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-23 20:24 ./slackware64/ap/vorbis-tools-1.2.0-x86_64-1.txz.asc
--rw-r--r--  1 root root      230 2008-10-23 20:36 ./slackware64/ap/workbone-2.40-x86_64-3.txt
--rw-r--r--  1 root root    11892 2008-10-23 20:36 ./slackware64/ap/workbone-2.40-x86_64-3.txz
--rw-r--r--  1 root root      197 2008-10-23 20:36 ./slackware64/ap/workbone-2.40-x86_64-3.txz.asc
--rw-r--r--  1 root root      525 2010-02-09 21:26 ./slackware64/ap/xfsdump-3.0.4-x86_64-1.txt
--rw-r--r--  1 root root   299376 2010-02-09 21:26 ./slackware64/ap/xfsdump-3.0.4-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-09 21:26 ./slackware64/ap/xfsdump-3.0.4-x86_64-1.txz.asc
--rw-r--r--  1 root root      508 2009-07-16 00:07 ./slackware64/ap/zsh-4.3.10-x86_64-1.txt
--rw-r--r--  1 root root  2252580 2009-07-16 00:07 ./slackware64/ap/zsh-4.3.10-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-07-16 00:07 ./slackware64/ap/zsh-4.3.10-x86_64-1.txz.asc
-drwxr-xr-x  2 root root    12288 2010-05-18 07:05 ./slackware64/d
--rw-r--r--  1 root root      631 2010-01-12 20:10 ./slackware64/d/autoconf-2.65-noarch-1.txt
--rw-r--r--  1 root root   685600 2010-01-12 20:10 ./slackware64/d/autoconf-2.65-noarch-1.txz
--rw-r--r--  1 root root      197 2010-01-12 20:10 ./slackware64/d/autoconf-2.65-noarch-1.txz.asc
--rw-r--r--  1 root root      627 2010-01-12 20:12 ./slackware64/d/automake-1.11.1-noarch-1.txt
--rw-r--r--  1 root root   571032 2010-01-12 20:12 ./slackware64/d/automake-1.11.1-noarch-1.txz
--rw-r--r--  1 root root      197 2010-01-12 20:12 ./slackware64/d/automake-1.11.1-noarch-1.txz.asc
--rw-r--r--  1 root root      443 2010-04-25 21:50 ./slackware64/d/binutils-2.20.51.0.8-x86_64-1.txt
--rw-r--r--  1 root root  2661424 2010-04-25 21:50 ./slackware64/d/binutils-2.20.51.0.8-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-25 21:50 ./slackware64/d/binutils-2.20.51.0.8-x86_64-1.txz.asc
--rw-r--r--  1 root root      471 2010-04-30 00:43 ./slackware64/d/bison-2.4.2-x86_64-1.txt
--rw-r--r--  1 root root   419344 2010-04-30 00:43 ./slackware64/d/bison-2.4.2-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-30 00:43 ./slackware64/d/bison-2.4.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      314 2008-10-31 22:57 ./slackware64/d/ccache-2.4-x86_64-1.txt
--rw-r--r--  1 root root    24380 2008-10-31 22:57 ./slackware64/d/ccache-2.4-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-31 22:57 ./slackware64/d/ccache-2.4-x86_64-1.txz.asc
--rw-r--r--  1 root root      665 2010-05-03 07:07 ./slackware64/d/clisp-2.48-x86_64-1.txt
--rw-r--r--  1 root root  4164440 2010-05-03 07:07 ./slackware64/d/clisp-2.48-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-03 07:07 ./slackware64/d/clisp-2.48-x86_64-1.txz.asc
--rw-r--r--  1 root root      397 2010-04-16 18:32 ./slackware64/d/cmake-2.8.1-x86_64-1.txt
--rw-r--r--  1 root root  3915892 2010-04-16 18:32 ./slackware64/d/cmake-2.8.1-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-16 18:32 ./slackware64/d/cmake-2.8.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      350 2010-05-03 07:16 ./slackware64/d/cscope-15.7a-x86_64-1.txt
--rw-r--r--  1 root root    98548 2010-05-03 07:16 ./slackware64/d/cscope-15.7a-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-03 07:16 ./slackware64/d/cscope-15.7a-x86_64-1.txz.asc
--rw-r--r--  1 root root      538 2008-10-15 23:21 ./slackware64/d/cvs-1.11.23-x86_64-1.txt
--rw-r--r--  1 root root   859048 2008-10-15 23:21 ./slackware64/d/cvs-1.11.23-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-15 23:21 ./slackware64/d/cvs-1.11.23-x86_64-1.txz.asc
--rw-r--r--  1 root root      412 2009-05-23 04:29 ./slackware64/d/dev86-0.16.17-x86_64-2.txt
--rw-r--r--  1 root root   287864 2009-05-23 04:29 ./slackware64/d/dev86-0.16.17-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-05-23 04:29 ./slackware64/d/dev86-0.16.17-x86_64-2.txz.asc
--rw-r--r--  1 root root      483 2008-11-04 11:53 ./slackware64/d/distcc-2.18.3-x86_64-2.txt
--rw-r--r--  1 root root   116144 2008-11-04 11:53 ./slackware64/d/distcc-2.18.3-x86_64-2.txz
--rw-r--r--  1 root root      197 2008-11-04 11:53 ./slackware64/d/distcc-2.18.3-x86_64-2.txz.asc
--rw-r--r--  1 root root      511 2010-02-23 21:40 ./slackware64/d/doxygen-1.6.3-x86_64-1.txt
--rw-r--r--  1 root root  2632292 2010-02-23 21:40 ./slackware64/d/doxygen-1.6.3-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-23 21:40 ./slackware64/d/doxygen-1.6.3-x86_64-1.txz.asc
--rw-r--r--  1 root root      331 2008-10-22 21:35 ./slackware64/d/flex-2.5.35-x86_64-1.txt
--rw-r--r--  1 root root   270228 2008-10-22 21:35 ./slackware64/d/flex-2.5.35-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-22 21:35 ./slackware64/d/flex-2.5.35-x86_64-1.txz.asc
--rw-r--r--  1 root root      302 2010-05-12 04:04 ./slackware64/d/gcc-4.4.4-x86_64-1.txt
--rw-r--r--  1 root root  7178776 2010-05-12 04:04 ./slackware64/d/gcc-4.4.4-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-12 04:04 ./slackware64/d/gcc-4.4.4-x86_64-1.txz.asc
--rw-r--r--  1 root root      295 2010-05-12 04:04 ./slackware64/d/gcc-g++-4.4.4-x86_64-1.txt
--rw-r--r--  1 root root  4482756 2010-05-12 04:04 ./slackware64/d/gcc-g++-4.4.4-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-12 04:04 ./slackware64/d/gcc-g++-4.4.4-x86_64-1.txz.asc
--rw-r--r--  1 root root      768 2010-05-12 04:04 ./slackware64/d/gcc-gfortran-4.4.4-x86_64-1.txt
--rw-r--r--  1 root root  3642748 2010-05-12 04:04 ./slackware64/d/gcc-gfortran-4.4.4-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-12 04:04 ./slackware64/d/gcc-gfortran-4.4.4-x86_64-1.txz.asc
--rw-r--r--  1 root root      384 2010-05-12 04:05 ./slackware64/d/gcc-gnat-4.4.4-x86_64-1.txt
--rw-r--r--  1 root root  9158420 2010-05-12 04:05 ./slackware64/d/gcc-gnat-4.4.4-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-12 04:05 ./slackware64/d/gcc-gnat-4.4.4-x86_64-1.txz.asc
--rw-r--r--  1 root root      358 2010-05-12 04:07 ./slackware64/d/gcc-java-4.4.4-x86_64-1.txt
--rw-r--r--  1 root root 34172304 2010-05-12 04:07 ./slackware64/d/gcc-java-4.4.4-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-12 04:07 ./slackware64/d/gcc-java-4.4.4-x86_64-1.txz.asc
--rw-r--r--  1 root root      503 2010-05-12 04:07 ./slackware64/d/gcc-objc-4.4.4-x86_64-1.txt
--rw-r--r--  1 root root  3101468 2010-05-12 04:07 ./slackware64/d/gcc-objc-4.4.4-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-12 04:07 ./slackware64/d/gcc-objc-4.4.4-x86_64-1.txz.asc
--rw-r--r--  1 root root      757 2010-04-29 04:05 ./slackware64/d/gdb-7.1-x86_64-1.txt
--rw-r--r--  1 root root  2291124 2010-04-29 04:05 ./slackware64/d/gdb-7.1-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-29 04:05 ./slackware64/d/gdb-7.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      629 2010-01-13 00:55 ./slackware64/d/gettext-tools-0.17-x86_64-4.txt
--rw-r--r--  1 root root  2285452 2010-01-13 00:55 ./slackware64/d/gettext-tools-0.17-x86_64-4.txz
--rw-r--r--  1 root root      197 2010-01-13 00:55 ./slackware64/d/gettext-tools-0.17-x86_64-4.txz.asc
--rw-r--r--  1 root root      397 2010-04-29 01:58 ./slackware64/d/git-1.7.1-x86_64-1.txt
--rw-r--r--  1 root root  2563024 2010-04-29 01:58 ./slackware64/d/git-1.7.1-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-29 01:58 ./slackware64/d/git-1.7.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      562 2008-10-14 21:07 ./slackware64/d/gperf-3.0.3-x86_64-1.txt
--rw-r--r--  1 root root    85320 2008-10-14 21:07 ./slackware64/d/gperf-3.0.3-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-14 21:07 ./slackware64/d/gperf-3.0.3-x86_64-1.txz.asc
--rw-r--r--  1 root root      438 2010-02-24 02:43 ./slackware64/d/guile-1.8.7-x86_64-3.txt
--rw-r--r--  1 root root  1534976 2010-02-24 02:43 ./slackware64/d/guile-1.8.7-x86_64-3.txz
--rw-r--r--  1 root root      197 2010-02-24 02:43 ./slackware64/d/guile-1.8.7-x86_64-3.txz.asc
--rw-r--r--  1 root root      432 2009-03-04 22:25 ./slackware64/d/indent-2.2.10-x86_64-1.txt
--rw-r--r--  1 root root   122708 2009-03-04 22:25 ./slackware64/d/indent-2.2.10-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-03-04 22:25 ./slackware64/d/indent-2.2.10-x86_64-1.txz.asc
--rwxr-xr-x  1 root root     2897 2009-06-24 22:06 ./slackware64/d/install-packages
--rw-r--r--  1 root root      446 2006-09-18 10:41 ./slackware64/d/install.end
--rw-r--r--  1 root root      233 2010-04-30 03:00 ./slackware64/d/intltool-0.40.6-x86_64-1.txt
--rw-r--r--  1 root root    61140 2010-04-30 03:00 ./slackware64/d/intltool-0.40.6-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-30 03:00 ./slackware64/d/intltool-0.40.6-x86_64-1.txz.asc
--rw-r--r--  1 root root      332 2010-05-13 03:23 ./slackware64/d/kernel-headers-2.6.33.4-x86-1.txt
--rw-r--r--  1 root root   535508 2010-05-13 03:23 ./slackware64/d/kernel-headers-2.6.33.4-x86-1.txz
--rw-r--r--  1 root root      198 2010-05-13 03:23 ./slackware64/d/kernel-headers-2.6.33.4-x86-1.txz.asc
--rw-r--r--  1 root root      500 2010-05-13 06:03 ./slackware64/d/libtool-2.2.6b-x86_64-2.txt
--rw-r--r--  1 root root   371720 2010-05-13 06:03 ./slackware64/d/libtool-2.2.6b-x86_64-2.txz
--rw-r--r--  1 root root      198 2010-05-13 06:03 ./slackware64/d/libtool-2.2.6b-x86_64-2.txz.asc
--rw-r--r--  1 root root      475 2010-04-30 00:03 ./slackware64/d/m4-1.4.14-x86_64-1.txt
--rw-r--r--  1 root root   239720 2010-04-30 00:03 ./slackware64/d/m4-1.4.14-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-30 00:03 ./slackware64/d/m4-1.4.14-x86_64-1.txz.asc
--rw-r--r--  1 root root      468 2008-09-21 20:43 ./slackware64/d/make-3.81-x86_64-1.txt
--rw-r--r--  1 root root   381000 2008-09-21 20:43 ./slackware64/d/make-3.81-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-09-21 20:43 ./slackware64/d/make-3.81-x86_64-1.txz.asc
--rw-r--r--  1 root root     3573 2010-05-13 07:21 ./slackware64/d/maketag
--rw-r--r--  1 root root     3573 2010-05-13 07:21 ./slackware64/d/maketag.ez
--rw-r--r--  1 root root      664 2010-05-18 06:45 ./slackware64/d/mercurial-1.5.2-x86_64-1.txt
--rw-r--r--  1 root root  1164736 2010-05-18 06:45 ./slackware64/d/mercurial-1.5.2-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-18 06:45 ./slackware64/d/mercurial-1.5.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      310 2010-01-19 19:56 ./slackware64/d/nasm-2.07-x86_64-1.txt
--rw-r--r--  1 root root   368952 2010-01-19 19:56 ./slackware64/d/nasm-2.07-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-01-19 19:56 ./slackware64/d/nasm-2.07-x86_64-1.txz.asc
--rw-r--r--  1 root root      506 2010-04-25 21:51 ./slackware64/d/oprofile-0.9.6-x86_64-2.txt
--rw-r--r--  1 root root   729852 2010-04-25 21:51 ./slackware64/d/oprofile-0.9.6-x86_64-2.txz
--rw-r--r--  1 root root      198 2010-04-25 21:51 ./slackware64/d/oprofile-0.9.6-x86_64-2.txz.asc
--rw-r--r--  1 root root      546 2008-11-04 12:43 ./slackware64/d/p2c-1.21alpha2-x86_64-3.txt
--rw-r--r--  1 root root   314736 2008-11-04 12:43 ./slackware64/d/p2c-1.21alpha2-x86_64-3.txz
--rw-r--r--  1 root root      197 2008-11-04 12:43 ./slackware64/d/p2c-1.21alpha2-x86_64-3.txz.asc
--rw-r--r--  1 root root      516 2009-10-02 19:55 ./slackware64/d/perl-5.10.1-x86_64-1.txt
--rw-r--r--  1 root root 13618736 2009-10-02 19:55 ./slackware64/d/perl-5.10.1-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-10-02 19:55 ./slackware64/d/perl-5.10.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      446 2009-06-06 21:19 ./slackware64/d/pkg-config-0.23-x86_64-3.txt
--rw-r--r--  1 root root    60320 2009-06-06 21:19 ./slackware64/d/pkg-config-0.23-x86_64-3.txz
--rw-r--r--  1 root root      197 2009-06-06 21:19 ./slackware64/d/pkg-config-0.23-x86_64-3.txz.asc
--rw-r--r--  1 root root      339 2008-09-21 20:59 ./slackware64/d/pmake-1.111-x86_64-3.txt
--rw-r--r--  1 root root    82500 2008-09-21 20:59 ./slackware64/d/pmake-1.111-x86_64-3.txz
--rw-r--r--  1 root root      197 2008-09-21 20:59 ./slackware64/d/pmake-1.111-x86_64-3.txz.asc
--rw-r--r--  1 root root      438 2009-12-06 02:01 ./slackware64/d/python-2.6.4-x86_64-1.txt
--rw-r--r--  1 root root 12032764 2009-12-06 02:01 ./slackware64/d/python-2.6.4-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-12-06 02:01 ./slackware64/d/python-2.6.4-x86_64-1.txz.asc
--rw-r--r--  1 root root      322 2008-10-15 23:23 ./slackware64/d/rcs-5.7-x86_64-2.txt
--rw-r--r--  1 root root   151448 2008-10-15 23:23 ./slackware64/d/rcs-5.7-x86_64-2.txz
--rw-r--r--  1 root root      197 2008-10-15 23:23 ./slackware64/d/rcs-5.7-x86_64-2.txz.asc
--rw-r--r--  1 root root      410 2010-04-25 23:05 ./slackware64/d/ruby-1.9.1_p378-x86_64-1.txt
--rw-r--r--  1 root root  3221056 2010-04-25 23:05 ./slackware64/d/ruby-1.9.1_p378-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-25 23:05 ./slackware64/d/ruby-1.9.1_p378-x86_64-1.txz.asc
--rw-r--r--  1 root root      550 2008-11-04 13:20 ./slackware64/d/strace-4.5.18-x86_64-1.txt
--rw-r--r--  1 root root    96832 2008-11-04 13:20 ./slackware64/d/strace-4.5.18-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-11-04 13:20 ./slackware64/d/strace-4.5.18-x86_64-1.txz.asc
--rw-r--r--  1 root root      597 2010-04-30 02:15 ./slackware64/d/subversion-1.6.11-x86_64-1.txt
--rw-r--r--  1 root root  3335196 2010-04-30 02:15 ./slackware64/d/subversion-1.6.11-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-30 02:15 ./slackware64/d/subversion-1.6.11-x86_64-1.txz.asc
--rw-r--r--  1 root root      561 2009-03-09 08:59 ./slackware64/d/swig-1.3.38-x86_64-1.txt
--rw-r--r--  1 root root  1980624 2009-03-09 08:59 ./slackware64/d/swig-1.3.38-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-03-09 08:59 ./slackware64/d/swig-1.3.38-x86_64-1.txz.asc
--rw-r--r--  1 root root      483 2010-05-13 07:21 ./slackware64/d/tagfile
-drwxr-xr-x  2 root root     4096 2010-05-09 03:47 ./slackware64/e
--rw-r--r--  1 root root      471 2010-05-08 21:26 ./slackware64/e/emacs-23.2-x86_64-1.txt
--rw-r--r--  1 root root 34941936 2010-05-08 21:26 ./slackware64/e/emacs-23.2-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-08 21:26 ./slackware64/e/emacs-23.2-x86_64-1.txz.asc
--rwxr-xr-x  1 root root     2897 2009-06-24 22:06 ./slackware64/e/install-packages
--rw-r--r--  1 root root      446 2006-09-18 10:41 ./slackware64/e/install.end
--rw-r--r--  1 root root      953 2010-05-08 22:51 ./slackware64/e/maketag
--rw-r--r--  1 root root      953 2010-05-08 22:51 ./slackware64/e/maketag.ez
--rw-r--r--  1 root root       10 2010-05-08 22:51 ./slackware64/e/tagfile
-drwxr-xr-x  2 root root     4096 2010-05-02 00:13 ./slackware64/f
--rwxr-xr-x  1 root root     2897 2009-06-24 22:06 ./slackware64/f/install-packages
--rw-r--r--  1 root root      446 2006-09-18 10:41 ./slackware64/f/install.end
--rw-r--r--  1 root root      502 2006-03-01 02:48 ./slackware64/f/linux-faqs-20060228-noarch-1.txt
--rw-r--r--  1 root root   287176 2006-03-01 02:48 ./slackware64/f/linux-faqs-20060228-noarch-1.txz
--rw-r--r--  1 root root      197 2006-03-01 02:48 ./slackware64/f/linux-faqs-20060228-noarch-1.txz.asc
--rw-r--r--  1 root root      341 2010-05-01 23:55 ./slackware64/f/linux-howtos-20100501-noarch-1.txt
--rw-r--r--  1 root root  6560784 2010-05-01 23:55 ./slackware64/f/linux-howtos-20100501-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-01 23:55 ./slackware64/f/linux-howtos-20100501-noarch-1.txz.asc
--rw-r--r--  1 root root     1064 2010-03-01 01:46 ./slackware64/f/maketag
--rw-r--r--  1 root root     1064 2010-03-01 01:46 ./slackware64/f/maketag.ez
--rw-r--r--  1 root root       32 2010-03-01 01:46 ./slackware64/f/tagfile
-drwxr-xr-x  2 root root     4096 2010-05-14 19:52 ./slackware64/k
--rwxr-xr-x  1 root root     2897 2009-06-24 22:06 ./slackware64/k/install-packages
--rw-r--r--  1 root root      446 2006-09-18 10:41 ./slackware64/k/install.end
--rw-r--r--  1 root root      317 2010-05-13 03:22 ./slackware64/k/kernel-source-2.6.33.4-noarch-1.txt
--rw-r--r--  1 root root 57174016 2010-05-13 03:22 ./slackware64/k/kernel-source-2.6.33.4-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-13 03:22 ./slackware64/k/kernel-source-2.6.33.4-noarch-1.txz.asc
--rw-r--r--  1 root root     1161 2010-05-13 07:21 ./slackware64/k/maketag
--rw-r--r--  1 root root     1161 2010-05-13 07:21 ./slackware64/k/maketag.ez
--rw-r--r--  1 root root       18 2010-05-13 07:21 ./slackware64/k/tagfile
-drwxr-xr-x  2 root root    12288 2010-05-18 02:53 ./slackware64/kde
--rw-r--r--  1 root root      322 2010-04-10 21:44 ./slackware64/kde/amarok-2.3.0-x86_64-1.txt
--rw-r--r--  1 root root  7428688 2010-04-10 21:44 ./slackware64/kde/amarok-2.3.0-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-10 21:44 ./slackware64/kde/amarok-2.3.0-x86_64-1.txz.asc
--rw-r--r--  1 root root      472 2010-05-04 06:18 ./slackware64/kde/guidance-power-manager-4.4.0-x86_64-1.txt
--rw-r--r--  1 root root    57684 2010-05-04 06:18 ./slackware64/kde/guidance-power-manager-4.4.0-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 06:18 ./slackware64/kde/guidance-power-manager-4.4.0-x86_64-1.txz.asc
--rwxr-xr-x  1 root root     2897 2009-06-24 22:06 ./slackware64/kde/install-packages
--rw-r--r--  1 root root      446 2006-09-18 10:41 ./slackware64/kde/install.end
--rw-r--r--  1 root root      382 2010-05-04 06:45 ./slackware64/kde/k3b-1.91.0-x86_64-3.txt
--rw-r--r--  1 root root  9801948 2010-05-04 06:45 ./slackware64/kde/k3b-1.91.0-x86_64-3.txz
--rw-r--r--  1 root root      198 2010-05-04 06:45 ./slackware64/kde/k3b-1.91.0-x86_64-3.txz.asc
--rw-r--r--  1 root root      295 2010-05-04 06:36 ./slackware64/kde/kaudiocreator-r1118889-x86_64-1.txt
--rw-r--r--  1 root root   130900 2010-05-04 06:36 ./slackware64/kde/kaudiocreator-r1118889-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 06:36 ./slackware64/kde/kaudiocreator-r1118889-x86_64-1.txz.asc
--rw-r--r--  1 root root      414 2010-05-04 03:15 ./slackware64/kde/kdeaccessibility-4.4.3-x86_64-1.txt
--rw-r--r--  1 root root  3687560 2010-05-04 03:15 ./slackware64/kde/kdeaccessibility-4.4.3-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 03:15 ./slackware64/kde/kdeaccessibility-4.4.3-x86_64-1.txz.asc
--rw-r--r--  1 root root      182 2010-05-04 03:31 ./slackware64/kde/kdeadmin-4.4.3-x86_64-1.txt
--rw-r--r--  1 root root  1369456 2010-05-04 03:31 ./slackware64/kde/kdeadmin-4.4.3-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 03:31 ./slackware64/kde/kdeadmin-4.4.3-x86_64-1.txz.asc
--rw-r--r--  1 root root      233 2010-05-04 03:33 ./slackware64/kde/kdeartwork-4.4.3-x86_64-1.txt
--rw-r--r--  1 root root 63109624 2010-05-04 03:33 ./slackware64/kde/kdeartwork-4.4.3-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 03:33 ./slackware64/kde/kdeartwork-4.4.3-x86_64-1.txz.asc
--rw-r--r--  1 root root      238 2010-05-04 02:15 ./slackware64/kde/kdebase-4.4.3-x86_64-1.txt
--rw-r--r--  1 root root  4466824 2010-05-04 02:15 ./slackware64/kde/kdebase-4.4.3-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 02:15 ./slackware64/kde/kdebase-4.4.3-x86_64-1.txz.asc
--rw-r--r--  1 root root      292 2010-05-04 02:28 ./slackware64/kde/kdebase-runtime-4.4.3-x86_64-1.txt
--rw-r--r--  1 root root  7692132 2010-05-04 02:28 ./slackware64/kde/kdebase-runtime-4.4.3-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 02:28 ./slackware64/kde/kdebase-runtime-4.4.3-x86_64-1.txz.asc
--rw-r--r--  1 root root      348 2010-05-04 04:26 ./slackware64/kde/kdebase-workspace-4.4.3-x86_64-1.txt
--rw-r--r--  1 root root 77989848 2010-05-04 04:26 ./slackware64/kde/kdebase-workspace-4.4.3-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 04:26 ./slackware64/kde/kdebase-workspace-4.4.3-x86_64-1.txz.asc
--rw-r--r--  1 root root      513 2010-05-14 18:56 ./slackware64/kde/kdebindings-4.4.3-x86_64-2.txt
--rw-r--r--  1 root root  8167900 2010-05-14 18:56 ./slackware64/kde/kdebindings-4.4.3-x86_64-2.txz
--rw-r--r--  1 root root      198 2010-05-14 18:56 ./slackware64/kde/kdebindings-4.4.3-x86_64-2.txz.asc
--rw-r--r--  1 root root      181 2010-05-06 05:37 ./slackware64/kde/kdeedu-4.4.3-x86_64-1.txt
--rw-r--r--  1 root root 47624488 2010-05-06 05:37 ./slackware64/kde/kdeedu-4.4.3-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-06 05:37 ./slackware64/kde/kdeedu-4.4.3-x86_64-1.txz.asc
--rw-r--r--  1 root root      187 2010-05-04 03:38 ./slackware64/kde/kdegames-4.4.3-x86_64-1.txt
--rw-r--r--  1 root root 60830096 2010-05-04 03:38 ./slackware64/kde/kdegames-4.4.3-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 03:38 ./slackware64/kde/kdegames-4.4.3-x86_64-1.txz.asc
--rw-r--r--  1 root root      345 2010-05-18 02:14 ./slackware64/kde/kdegraphics-4.4.3-x86_64-2.txt
--rw-r--r--  1 root root  4045832 2010-05-18 02:14 ./slackware64/kde/kdegraphics-4.4.3-x86_64-2.txz
--rw-r--r--  1 root root      198 2010-05-18 02:14 ./slackware64/kde/kdegraphics-4.4.3-x86_64-2.txz.asc
--rw-r--r--  1 root root      191 2010-05-05 18:25 ./slackware64/kde/kdelibs-4.4.3-x86_64-1.txt
--rw-r--r--  1 root root 13627284 2010-05-05 18:25 ./slackware64/kde/kdelibs-4.4.3-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-05 18:25 ./slackware64/kde/kdelibs-4.4.3-x86_64-1.txz.asc
--rw-r--r--  1 root root      513 2010-05-04 03:22 ./slackware64/kde/kdemultimedia-4.4.3-x86_64-1.txt
--rw-r--r--  1 root root  1505340 2010-05-04 03:22 ./slackware64/kde/kdemultimedia-4.4.3-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 03:22 ./slackware64/kde/kdemultimedia-4.4.3-x86_64-1.txz.asc
--rw-r--r--  1 root root      231 2010-05-14 03:03 ./slackware64/kde/kdenetwork-4.4.3-x86_64-2.txt
--rw-r--r--  1 root root  9145692 2010-05-14 03:03 ./slackware64/kde/kdenetwork-4.4.3-x86_64-2.txz
--rw-r--r--  1 root root      198 2010-05-14 03:03 ./slackware64/kde/kdenetwork-4.4.3-x86_64-2.txz.asc
--rw-r--r--  1 root root      417 2010-05-04 21:39 ./slackware64/kde/kdepim-4.4.3-x86_64-1.txt
--rw-r--r--  1 root root 12578520 2010-05-04 21:39 ./slackware64/kde/kdepim-4.4.3-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 21:39 ./slackware64/kde/kdepim-4.4.3-x86_64-1.txz.asc
--rw-r--r--  1 root root      508 2010-05-04 03:53 ./slackware64/kde/kdepim-runtime-4.4.3-x86_64-1.txt
--rw-r--r--  1 root root  1123480 2010-05-04 03:53 ./slackware64/kde/kdepim-runtime-4.4.3-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 03:53 ./slackware64/kde/kdepim-runtime-4.4.3-x86_64-1.txz.asc
--rw-r--r--  1 root root      274 2010-05-04 02:12 ./slackware64/kde/kdepimlibs-4.4.3-x86_64-1.txt
--rw-r--r--  1 root root  2735660 2010-05-04 02:12 ./slackware64/kde/kdepimlibs-4.4.3-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 02:12 ./slackware64/kde/kdepimlibs-4.4.3-x86_64-1.txz.asc
--rw-r--r--  1 root root      296 2010-05-04 04:07 ./slackware64/kde/kdeplasma-addons-4.4.3-x86_64-1.txt
--rw-r--r--  1 root root  2237988 2010-05-04 04:07 ./slackware64/kde/kdeplasma-addons-4.4.3-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 04:07 ./slackware64/kde/kdeplasma-addons-4.4.3-x86_64-1.txz.asc
--rw-r--r--  1 root root      322 2010-05-04 02:34 ./slackware64/kde/kdesdk-4.4.3-x86_64-1.txt
--rw-r--r--  1 root root  6709696 2010-05-04 02:34 ./slackware64/kde/kdesdk-4.4.3-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 02:34 ./slackware64/kde/kdesdk-4.4.3-x86_64-1.txz.asc
--rw-r--r--  1 root root      257 2010-05-04 03:39 ./slackware64/kde/kdetoys-4.4.3-x86_64-1.txt
--rw-r--r--  1 root root  1242360 2010-05-04 03:39 ./slackware64/kde/kdetoys-4.4.3-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 03:39 ./slackware64/kde/kdetoys-4.4.3-x86_64-1.txz.asc
--rw-r--r--  1 root root      330 2010-05-04 03:20 ./slackware64/kde/kdeutils-4.4.3-x86_64-1.txt
--rw-r--r--  1 root root  2903480 2010-05-04 03:20 ./slackware64/kde/kdeutils-4.4.3-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 03:20 ./slackware64/kde/kdeutils-4.4.3-x86_64-1.txz.asc
--rw-r--r--  1 root root      220 2010-05-04 06:16 ./slackware64/kde/kdevelop-4.0.0-x86_64-1.txt
--rw-r--r--  1 root root  1922064 2010-05-04 06:16 ./slackware64/kde/kdevelop-4.0.0-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 06:16 ./slackware64/kde/kdevelop-4.0.0-x86_64-1.txz.asc
--rw-r--r--  1 root root      247 2010-05-04 06:13 ./slackware64/kde/kdevplatform-1.0.0-x86_64-1.txt
--rw-r--r--  1 root root  2376416 2010-05-04 06:13 ./slackware64/kde/kdevplatform-1.0.0-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 06:13 ./slackware64/kde/kdevplatform-1.0.0-x86_64-1.txz.asc
--rw-r--r--  1 root root      260 2010-05-04 04:10 ./slackware64/kde/kdewebdev-4.4.3-x86_64-1.txt
--rw-r--r--  1 root root  1397500 2010-05-04 04:10 ./slackware64/kde/kdewebdev-4.4.3-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 04:10 ./slackware64/kde/kdewebdev-4.4.3-x86_64-1.txz.asc
--rw-r--r--  1 root root      493 2010-05-08 21:27 ./slackware64/kde/koffice-2.1.2-x86_64-2.txt
--rw-r--r--  1 root root 13855168 2010-05-08 21:27 ./slackware64/kde/koffice-2.1.2-x86_64-2.txz
--rw-r--r--  1 root root      198 2010-05-08 21:27 ./slackware64/kde/koffice-2.1.2-x86_64-2.txz.asc
--rw-r--r--  1 root root      519 2010-05-04 06:18 ./slackware64/kde/konq-plugins-4.4.0-x86_64-1.txt
--rw-r--r--  1 root root  1380872 2010-05-04 06:18 ./slackware64/kde/konq-plugins-4.4.0-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 06:18 ./slackware64/kde/konq-plugins-4.4.0-x86_64-1.txz.asc
--rw-r--r--  1 root root      340 2010-05-04 21:57 ./slackware64/kde/kopete-cryptography-1.3.0_kde4.4.0-x86_64-1.txt
--rw-r--r--  1 root root   113788 2010-05-04 21:57 ./slackware64/kde/kopete-cryptography-1.3.0_kde4.4.0-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 21:57 ./slackware64/kde/kopete-cryptography-1.3.0_kde4.4.0-x86_64-1.txz.asc
--rw-r--r--  1 root root      582 2010-02-24 05:01 ./slackware64/kde/ktorrent-3.3.4-x86_64-1.txt
--rw-r--r--  1 root root  2771600 2010-02-24 05:01 ./slackware64/kde/ktorrent-3.3.4-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-24 05:01 ./slackware64/kde/ktorrent-3.3.4-x86_64-1.txz.asc
--rw-r--r--  1 root root     3731 2010-05-16 18:19 ./slackware64/kde/maketag
--rw-r--r--  1 root root     3731 2010-05-16 18:19 ./slackware64/kde/maketag.ez
--rw-r--r--  1 root root      329 2010-05-04 03:30 ./slackware64/kde/oxygen-icons-4.4.3-x86_64-1.txt
--rw-r--r--  1 root root 21122280 2010-05-04 03:30 ./slackware64/kde/oxygen-icons-4.4.3-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 03:30 ./slackware64/kde/oxygen-icons-4.4.3-x86_64-1.txz.asc
--rw-r--r--  1 root root      225 2010-05-05 23:45 ./slackware64/kde/polkit-kde-1-r1120537-x86_64-1.txt
--rw-r--r--  1 root root    94300 2010-05-05 23:45 ./slackware64/kde/polkit-kde-1-r1120537-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-05 23:45 ./slackware64/kde/polkit-kde-1-r1120537-x86_64-1.txz.asc
--rw-r--r--  1 root root      442 2010-05-05 23:46 ./slackware64/kde/polkit-qt-1-r1118744-x86_64-1.txt
--rw-r--r--  1 root root    67692 2010-05-05 23:46 ./slackware64/kde/polkit-qt-1-r1118744-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-05 23:46 ./slackware64/kde/polkit-qt-1-r1118744-x86_64-1.txz.asc
--rw-r--r--  1 root root      207 2010-05-04 06:20 ./slackware64/kde/skanlite-0.4_kde4.4.0-x86_64-1.txt
--rw-r--r--  1 root root  1219164 2010-05-04 06:20 ./slackware64/kde/skanlite-0.4_kde4.4.0-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 06:20 ./slackware64/kde/skanlite-0.4_kde4.4.0-x86_64-1.txz.asc
--rw-r--r--  1 root root      543 2010-05-16 18:19 ./slackware64/kde/tagfile
-drwxr-xr-x  2 root root    20480 2010-05-06 21:24 ./slackware64/kdei
--rwxr-xr-x  1 root root     2897 2009-06-24 22:06 ./slackware64/kdei/install-packages
--rw-r--r--  1 root root      446 2006-09-18 10:41 ./slackware64/kdei/install.end
--rw-r--r--  1 root root      188 2010-05-05 00:56 ./slackware64/kdei/kde-l10n-ar-4.4.3-noarch-1.txt
--rw-r--r--  1 root root  2063644 2010-05-05 00:56 ./slackware64/kdei/kde-l10n-ar-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 00:56 ./slackware64/kdei/kde-l10n-ar-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      191 2010-05-05 00:56 ./slackware64/kdei/kde-l10n-bg-4.4.3-noarch-1.txt
--rw-r--r--  1 root root  1025384 2010-05-05 00:56 ./slackware64/kdei/kde-l10n-bg-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 00:56 ./slackware64/kdei/kde-l10n-bg-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      189 2010-05-05 01:00 ./slackware64/kdei/kde-l10n-ca-4.4.3-noarch-1.txt
--rw-r--r--  1 root root  4430640 2010-05-05 01:00 ./slackware64/kdei/kde-l10n-ca-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:00 ./slackware64/kdei/kde-l10n-ca-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      266 2010-05-05 01:00 ./slackware64/kdei/kde-l10n-ca@valencia-4.4.3-noarch-1.txt
--rw-r--r--  1 root root  1997504 2010-05-05 01:00 ./slackware64/kdei/kde-l10n-ca@valencia-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:00 ./slackware64/kdei/kde-l10n-ca@valencia-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      187 2010-05-05 01:01 ./slackware64/kdei/kde-l10n-cs-4.4.3-noarch-1.txt
--rw-r--r--  1 root root  2436612 2010-05-05 01:01 ./slackware64/kdei/kde-l10n-cs-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:01 ./slackware64/kdei/kde-l10n-cs-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      203 2010-05-05 01:01 ./slackware64/kdei/kde-l10n-csb-4.4.3-noarch-1.txt
--rw-r--r--  1 root root   375948 2010-05-05 01:01 ./slackware64/kdei/kde-l10n-csb-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:01 ./slackware64/kdei/kde-l10n-csb-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      188 2010-05-05 01:04 ./slackware64/kdei/kde-l10n-da-4.4.3-noarch-1.txt
--rw-r--r--  1 root root 16660808 2010-05-05 01:04 ./slackware64/kdei/kde-l10n-da-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:04 ./slackware64/kdei/kde-l10n-da-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      188 2010-05-05 01:10 ./slackware64/kdei/kde-l10n-de-4.4.3-noarch-1.txt
--rw-r--r--  1 root root 17824548 2010-05-05 01:10 ./slackware64/kdei/kde-l10n-de-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:10 ./slackware64/kdei/kde-l10n-de-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      187 2010-05-05 01:10 ./slackware64/kdei/kde-l10n-el-4.4.3-noarch-1.txt
--rw-r--r--  1 root root  1809404 2010-05-05 01:10 ./slackware64/kdei/kde-l10n-el-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:10 ./slackware64/kdei/kde-l10n-el-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      230 2010-05-05 01:12 ./slackware64/kdei/kde-l10n-en_GB-4.4.3-noarch-1.txt
--rw-r--r--  1 root root  3232252 2010-05-05 01:12 ./slackware64/kdei/kde-l10n-en_GB-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:12 ./slackware64/kdei/kde-l10n-en_GB-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      191 2010-05-05 01:13 ./slackware64/kdei/kde-l10n-eo-4.4.3-noarch-1.txt
--rw-r--r--  1 root root   825464 2010-05-05 01:13 ./slackware64/kdei/kde-l10n-eo-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:13 ./slackware64/kdei/kde-l10n-eo-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      189 2010-05-05 01:18 ./slackware64/kdei/kde-l10n-es-4.4.3-noarch-1.txt
--rw-r--r--  1 root root 26665308 2010-05-05 01:18 ./slackware64/kdei/kde-l10n-es-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:18 ./slackware64/kdei/kde-l10n-es-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      190 2010-05-05 01:24 ./slackware64/kdei/kde-l10n-et-4.4.3-noarch-1.txt
--rw-r--r--  1 root root  8264620 2010-05-05 01:24 ./slackware64/kdei/kde-l10n-et-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:24 ./slackware64/kdei/kde-l10n-et-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      188 2010-05-05 01:25 ./slackware64/kdei/kde-l10n-eu-4.4.3-noarch-1.txt
--rw-r--r--  1 root root  1359236 2010-05-05 01:25 ./slackware64/kdei/kde-l10n-eu-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:25 ./slackware64/kdei/kde-l10n-eu-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      189 2010-05-05 01:25 ./slackware64/kdei/kde-l10n-fi-4.4.3-noarch-1.txt
--rw-r--r--  1 root root  1484884 2010-05-05 01:25 ./slackware64/kdei/kde-l10n-fi-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:25 ./slackware64/kdei/kde-l10n-fi-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      188 2010-05-05 01:30 ./slackware64/kdei/kde-l10n-fr-4.4.3-noarch-1.txt
--rw-r--r--  1 root root 19389372 2010-05-05 01:30 ./slackware64/kdei/kde-l10n-fr-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:30 ./slackware64/kdei/kde-l10n-fr-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      191 2010-05-05 01:30 ./slackware64/kdei/kde-l10n-fy-4.4.3-noarch-1.txt
--rw-r--r--  1 root root   539820 2010-05-05 01:30 ./slackware64/kdei/kde-l10n-fy-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:30 ./slackware64/kdei/kde-l10n-fy-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      187 2010-05-05 01:31 ./slackware64/kdei/kde-l10n-ga-4.4.3-noarch-1.txt
--rw-r--r--  1 root root  2400540 2010-05-05 01:31 ./slackware64/kdei/kde-l10n-ga-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:31 ./slackware64/kdei/kde-l10n-ga-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      190 2010-05-05 01:32 ./slackware64/kdei/kde-l10n-gl-4.4.3-noarch-1.txt
--rw-r--r--  1 root root  3316472 2010-05-05 01:32 ./slackware64/kdei/kde-l10n-gl-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:32 ./slackware64/kdei/kde-l10n-gl-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      190 2010-05-05 01:33 ./slackware64/kdei/kde-l10n-gu-4.4.3-noarch-1.txt
--rw-r--r--  1 root root   436672 2010-05-05 01:33 ./slackware64/kdei/kde-l10n-gu-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:33 ./slackware64/kdei/kde-l10n-gu-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      188 2010-05-05 01:33 ./slackware64/kdei/kde-l10n-he-4.4.3-noarch-1.txt
--rw-r--r--  1 root root  1209312 2010-05-05 01:33 ./slackware64/kdei/kde-l10n-he-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:33 ./slackware64/kdei/kde-l10n-he-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      187 2010-05-05 01:33 ./slackware64/kdei/kde-l10n-hi-4.4.3-noarch-1.txt
--rw-r--r--  1 root root   898900 2010-05-05 01:33 ./slackware64/kdei/kde-l10n-hi-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:33 ./slackware64/kdei/kde-l10n-hi-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      190 2010-05-05 01:34 ./slackware64/kdei/kde-l10n-hr-4.4.3-noarch-1.txt
--rw-r--r--  1 root root   792424 2010-05-05 01:34 ./slackware64/kdei/kde-l10n-hr-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:34 ./slackware64/kdei/kde-l10n-hr-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      191 2010-05-05 01:35 ./slackware64/kdei/kde-l10n-hu-4.4.3-noarch-1.txt
--rw-r--r--  1 root root  3831752 2010-05-05 01:35 ./slackware64/kdei/kde-l10n-hu-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:35 ./slackware64/kdei/kde-l10n-hu-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      192 2010-05-05 01:35 ./slackware64/kdei/kde-l10n-id-4.4.3-noarch-1.txt
--rw-r--r--  1 root root   315192 2010-05-05 01:35 ./slackware64/kdei/kde-l10n-id-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:35 ./slackware64/kdei/kde-l10n-id-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      191 2010-05-05 01:35 ./slackware64/kdei/kde-l10n-is-4.4.3-noarch-1.txt
--rw-r--r--  1 root root   849688 2010-05-05 01:35 ./slackware64/kdei/kde-l10n-is-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:35 ./slackware64/kdei/kde-l10n-is-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      189 2010-05-05 01:41 ./slackware64/kdei/kde-l10n-it-4.4.3-noarch-1.txt
--rw-r--r--  1 root root 10171600 2010-05-05 01:41 ./slackware64/kdei/kde-l10n-it-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:41 ./slackware64/kdei/kde-l10n-it-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      190 2010-05-05 01:42 ./slackware64/kdei/kde-l10n-ja-4.4.3-noarch-1.txt
--rw-r--r--  1 root root  1882384 2010-05-05 01:42 ./slackware64/kdei/kde-l10n-ja-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:42 ./slackware64/kdei/kde-l10n-ja-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      188 2010-05-05 01:42 ./slackware64/kdei/kde-l10n-kk-4.4.3-noarch-1.txt
--rw-r--r--  1 root root  1024436 2010-05-05 01:42 ./slackware64/kdei/kde-l10n-kk-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:42 ./slackware64/kdei/kde-l10n-kk-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      187 2010-05-05 01:42 ./slackware64/kdei/kde-l10n-km-4.4.3-noarch-1.txt
--rw-r--r--  1 root root  1406516 2010-05-05 01:42 ./slackware64/kdei/kde-l10n-km-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:42 ./slackware64/kdei/kde-l10n-km-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      189 2010-05-05 01:43 ./slackware64/kdei/kde-l10n-kn-4.4.3-noarch-1.txt
--rw-r--r--  1 root root   320252 2010-05-05 01:43 ./slackware64/kdei/kde-l10n-kn-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:43 ./slackware64/kdei/kde-l10n-kn-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      188 2010-05-05 01:43 ./slackware64/kdei/kde-l10n-ko-4.4.3-noarch-1.txt
--rw-r--r--  1 root root  1002264 2010-05-05 01:43 ./slackware64/kdei/kde-l10n-ko-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:43 ./slackware64/kdei/kde-l10n-ko-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      192 2010-05-05 01:43 ./slackware64/kdei/kde-l10n-lt-4.4.3-noarch-1.txt
--rw-r--r--  1 root root  1186260 2010-05-05 01:43 ./slackware64/kdei/kde-l10n-lt-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:43 ./slackware64/kdei/kde-l10n-lt-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      189 2010-05-05 01:44 ./slackware64/kdei/kde-l10n-lv-4.4.3-noarch-1.txt
--rw-r--r--  1 root root  1439268 2010-05-05 01:44 ./slackware64/kdei/kde-l10n-lv-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:44 ./slackware64/kdei/kde-l10n-lv-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      202 2010-05-05 01:44 ./slackware64/kdei/kde-l10n-mai-4.4.3-noarch-1.txt
--rw-r--r--  1 root root   372136 2010-05-05 01:44 ./slackware64/kdei/kde-l10n-mai-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:44 ./slackware64/kdei/kde-l10n-mai-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      192 2010-05-05 01:44 ./slackware64/kdei/kde-l10n-mk-4.4.3-noarch-1.txt
--rw-r--r--  1 root root   769352 2010-05-05 01:44 ./slackware64/kdei/kde-l10n-mk-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:44 ./slackware64/kdei/kde-l10n-mk-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      191 2010-05-05 01:45 ./slackware64/kdei/kde-l10n-ml-4.4.3-noarch-1.txt
--rw-r--r--  1 root root 19133580 2010-05-05 01:45 ./slackware64/kdei/kde-l10n-ml-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:45 ./slackware64/kdei/kde-l10n-ml-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      201 2010-05-05 01:45 ./slackware64/kdei/kde-l10n-nb-4.4.3-noarch-1.txt
--rw-r--r--  1 root root  2212892 2010-05-05 01:45 ./slackware64/kdei/kde-l10n-nb-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:45 ./slackware64/kdei/kde-l10n-nb-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      203 2010-05-05 01:46 ./slackware64/kdei/kde-l10n-nds-4.4.3-noarch-1.txt
--rw-r--r--  1 root root  3158224 2010-05-05 01:46 ./slackware64/kdei/kde-l10n-nds-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:46 ./slackware64/kdei/kde-l10n-nds-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      187 2010-05-05 01:50 ./slackware64/kdei/kde-l10n-nl-4.4.3-noarch-1.txt
--rw-r--r--  1 root root 13205332 2010-05-05 01:50 ./slackware64/kdei/kde-l10n-nl-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:50 ./slackware64/kdei/kde-l10n-nl-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      201 2010-05-05 01:50 ./slackware64/kdei/kde-l10n-nn-4.4.3-noarch-1.txt
--rw-r--r--  1 root root  1767716 2010-05-05 01:50 ./slackware64/kdei/kde-l10n-nn-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:50 ./slackware64/kdei/kde-l10n-nn-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      189 2010-05-05 01:51 ./slackware64/kdei/kde-l10n-pa-4.4.3-noarch-1.txt
--rw-r--r--  1 root root   853152 2010-05-05 01:51 ./slackware64/kdei/kde-l10n-pa-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:51 ./slackware64/kdei/kde-l10n-pa-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      188 2010-05-05 01:54 ./slackware64/kdei/kde-l10n-pl-4.4.3-noarch-1.txt
--rw-r--r--  1 root root  5217844 2010-05-05 01:54 ./slackware64/kdei/kde-l10n-pl-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 01:54 ./slackware64/kdei/kde-l10n-pl-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      192 2010-05-05 02:00 ./slackware64/kdei/kde-l10n-pt-4.4.3-noarch-1.txt
--rw-r--r--  1 root root  5689424 2010-05-05 02:00 ./slackware64/kdei/kde-l10n-pt-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 02:00 ./slackware64/kdei/kde-l10n-pt-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      238 2010-05-05 02:06 ./slackware64/kdei/kde-l10n-pt_BR-4.4.3-noarch-1.txt
--rw-r--r--  1 root root 16869156 2010-05-05 02:06 ./slackware64/kdei/kde-l10n-pt_BR-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 02:06 ./slackware64/kdei/kde-l10n-pt_BR-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      190 2010-05-05 02:07 ./slackware64/kdei/kde-l10n-ro-4.4.3-noarch-1.txt
--rw-r--r--  1 root root  2471196 2010-05-05 02:07 ./slackware64/kdei/kde-l10n-ro-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 02:07 ./slackware64/kdei/kde-l10n-ro-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      189 2010-05-05 02:10 ./slackware64/kdei/kde-l10n-ru-4.4.3-noarch-1.txt
--rw-r--r--  1 root root  4728316 2010-05-05 02:10 ./slackware64/kdei/kde-l10n-ru-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 02:10 ./slackware64/kdei/kde-l10n-ru-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      189 2010-05-05 02:10 ./slackware64/kdei/kde-l10n-si-4.4.3-noarch-1.txt
--rw-r--r--  1 root root   322008 2010-05-05 02:10 ./slackware64/kdei/kde-l10n-si-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 02:10 ./slackware64/kdei/kde-l10n-si-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      188 2010-05-05 02:11 ./slackware64/kdei/kde-l10n-sk-4.4.3-noarch-1.txt
--rw-r--r--  1 root root  3472092 2010-05-05 02:11 ./slackware64/kdei/kde-l10n-sk-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 02:11 ./slackware64/kdei/kde-l10n-sk-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      191 2010-05-05 02:12 ./slackware64/kdei/kde-l10n-sl-4.4.3-noarch-1.txt
--rw-r--r--  1 root root  2790880 2010-05-05 02:12 ./slackware64/kdei/kde-l10n-sl-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 02:12 ./slackware64/kdei/kde-l10n-sl-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      189 2010-05-05 02:14 ./slackware64/kdei/kde-l10n-sr-4.4.3-noarch-1.txt
--rw-r--r--  1 root root  2962476 2010-05-05 02:14 ./slackware64/kdei/kde-l10n-sr-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 02:14 ./slackware64/kdei/kde-l10n-sr-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      189 2010-05-05 02:20 ./slackware64/kdei/kde-l10n-sv-4.4.3-noarch-1.txt
--rw-r--r--  1 root root 17603088 2010-05-05 02:20 ./slackware64/kdei/kde-l10n-sv-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 02:20 ./slackware64/kdei/kde-l10n-sv-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      187 2010-05-05 02:20 ./slackware64/kdei/kde-l10n-tg-4.4.3-noarch-1.txt
--rw-r--r--  1 root root   770408 2010-05-05 02:20 ./slackware64/kdei/kde-l10n-tg-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 02:20 ./slackware64/kdei/kde-l10n-tg-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      189 2010-05-05 02:21 ./slackware64/kdei/kde-l10n-tr-4.4.3-noarch-1.txt
--rw-r--r--  1 root root  1794852 2010-05-05 02:21 ./slackware64/kdei/kde-l10n-tr-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 02:21 ./slackware64/kdei/kde-l10n-tr-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      191 2010-05-05 02:27 ./slackware64/kdei/kde-l10n-uk-4.4.3-noarch-1.txt
--rw-r--r--  1 root root 13292700 2010-05-05 02:27 ./slackware64/kdei/kde-l10n-uk-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 02:27 ./slackware64/kdei/kde-l10n-uk-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      189 2010-05-05 02:27 ./slackware64/kdei/kde-l10n-wa-4.4.3-noarch-1.txt
--rw-r--r--  1 root root  1247352 2010-05-05 02:27 ./slackware64/kdei/kde-l10n-wa-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 02:27 ./slackware64/kdei/kde-l10n-wa-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      236 2010-05-05 02:27 ./slackware64/kdei/kde-l10n-zh_CN-4.4.3-noarch-1.txt
--rw-r--r--  1 root root  3006908 2010-05-05 02:27 ./slackware64/kdei/kde-l10n-zh_CN-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 02:27 ./slackware64/kdei/kde-l10n-zh_CN-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      225 2010-05-05 02:28 ./slackware64/kdei/kde-l10n-zh_TW-4.4.3-noarch-1.txt
--rw-r--r--  1 root root  2036268 2010-05-05 02:28 ./slackware64/kdei/kde-l10n-zh_TW-4.4.3-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-05 02:28 ./slackware64/kdei/kde-l10n-zh_TW-4.4.3-noarch-1.txz.asc
--rw-r--r--  1 root root      241 2010-04-10 05:05 ./slackware64/kdei/koffice-l10n-ca-2.1.2-noarch-1.txt
--rw-r--r--  1 root root   424724 2010-04-10 05:05 ./slackware64/kdei/koffice-l10n-ca-2.1.2-noarch-1.txz
--rw-r--r--  1 root root      198 2010-04-10 05:05 ./slackware64/kdei/koffice-l10n-ca-2.1.2-noarch-1.txz.asc
--rw-r--r--  1 root root      370 2010-04-10 05:06 ./slackware64/kdei/koffice-l10n-ca@valencia-2.1.2-noarch-1.txt
--rw-r--r--  1 root root   213544 2010-04-10 05:06 ./slackware64/kdei/koffice-l10n-ca@valencia-2.1.2-noarch-1.txz
--rw-r--r--  1 root root      198 2010-04-10 05:06 ./slackware64/kdei/koffice-l10n-ca@valencia-2.1.2-noarch-1.txz.asc
--rw-r--r--  1 root root      240 2010-04-10 05:06 ./slackware64/kdei/koffice-l10n-da-2.1.2-noarch-1.txt
--rw-r--r--  1 root root   419592 2010-04-10 05:06 ./slackware64/kdei/koffice-l10n-da-2.1.2-noarch-1.txz
--rw-r--r--  1 root root      198 2010-04-10 05:06 ./slackware64/kdei/koffice-l10n-da-2.1.2-noarch-1.txz.asc
--rw-r--r--  1 root root      240 2010-04-10 05:06 ./slackware64/kdei/koffice-l10n-de-2.1.2-noarch-1.txt
--rw-r--r--  1 root root  1263624 2010-04-10 05:06 ./slackware64/kdei/koffice-l10n-de-2.1.2-noarch-1.txz
--rw-r--r--  1 root root      198 2010-04-10 05:06 ./slackware64/kdei/koffice-l10n-de-2.1.2-noarch-1.txz.asc
--rw-r--r--  1 root root      239 2010-04-10 05:06 ./slackware64/kdei/koffice-l10n-el-2.1.2-noarch-1.txt
--rw-r--r--  1 root root   206512 2010-04-10 05:06 ./slackware64/kdei/koffice-l10n-el-2.1.2-noarch-1.txz
--rw-r--r--  1 root root      198 2010-04-10 05:06 ./slackware64/kdei/koffice-l10n-el-2.1.2-noarch-1.txz.asc
--rw-r--r--  1 root root      282 2010-04-10 05:06 ./slackware64/kdei/koffice-l10n-en_GB-2.1.2-noarch-1.txt
--rw-r--r--  1 root root   144468 2010-04-10 05:06 ./slackware64/kdei/koffice-l10n-en_GB-2.1.2-noarch-1.txz
--rw-r--r--  1 root root      198 2010-04-10 05:06 ./slackware64/kdei/koffice-l10n-en_GB-2.1.2-noarch-1.txz.asc
--rw-r--r--  1 root root      241 2010-04-10 05:07 ./slackware64/kdei/koffice-l10n-es-2.1.2-noarch-1.txt
--rw-r--r--  1 root root  2771316 2010-04-10 05:07 ./slackware64/kdei/koffice-l10n-es-2.1.2-noarch-1.txz
--rw-r--r--  1 root root      198 2010-04-10 05:07 ./slackware64/kdei/koffice-l10n-es-2.1.2-noarch-1.txz.asc
--rw-r--r--  1 root root      242 2010-04-10 05:07 ./slackware64/kdei/koffice-l10n-et-2.1.2-noarch-1.txt
--rw-r--r--  1 root root   534504 2010-04-10 05:07 ./slackware64/kdei/koffice-l10n-et-2.1.2-noarch-1.txz
--rw-r--r--  1 root root      198 2010-04-10 05:07 ./slackware64/kdei/koffice-l10n-et-2.1.2-noarch-1.txz.asc
--rw-r--r--  1 root root      240 2010-04-10 18:27 ./slackware64/kdei/koffice-l10n-fr-2.1.2-noarch-1.txt
--rw-r--r--  1 root root  1095256 2010-04-10 18:27 ./slackware64/kdei/koffice-l10n-fr-2.1.2-noarch-1.txz
--rw-r--r--  1 root root      198 2010-04-10 18:27 ./slackware64/kdei/koffice-l10n-fr-2.1.2-noarch-1.txz.asc
--rw-r--r--  1 root root      243 2010-04-10 05:07 ./slackware64/kdei/koffice-l10n-fy-2.1.2-noarch-1.txt
--rw-r--r--  1 root root   165856 2010-04-10 05:07 ./slackware64/kdei/koffice-l10n-fy-2.1.2-noarch-1.txz
--rw-r--r--  1 root root      198 2010-04-10 05:07 ./slackware64/kdei/koffice-l10n-fy-2.1.2-noarch-1.txz.asc
--rw-r--r--  1 root root      242 2010-04-10 05:07 ./slackware64/kdei/koffice-l10n-gl-2.1.2-noarch-1.txt
--rw-r--r--  1 root root   235332 2010-04-10 05:07 ./slackware64/kdei/koffice-l10n-gl-2.1.2-noarch-1.txz
--rw-r--r--  1 root root      198 2010-04-10 05:07 ./slackware64/kdei/koffice-l10n-gl-2.1.2-noarch-1.txz.asc
--rw-r--r--  1 root root      259 2010-04-10 05:07 ./slackware64/kdei/koffice-l10n-hne-2.1.2-noarch-1.txt
--rw-r--r--  1 root root   143384 2010-04-10 05:07 ./slackware64/kdei/koffice-l10n-hne-2.1.2-noarch-1.txz
--rw-r--r--  1 root root      198 2010-04-10 05:07 ./slackware64/kdei/koffice-l10n-hne-2.1.2-noarch-1.txz.asc
--rw-r--r--  1 root root      241 2010-04-10 05:07 ./slackware64/kdei/koffice-l10n-it-2.1.2-noarch-1.txt
--rw-r--r--  1 root root   427280 2010-04-10 05:07 ./slackware64/kdei/koffice-l10n-it-2.1.2-noarch-1.txz
--rw-r--r--  1 root root      198 2010-04-10 05:07 ./slackware64/kdei/koffice-l10n-it-2.1.2-noarch-1.txz.asc
--rw-r--r--  1 root root      242 2010-04-10 05:07 ./slackware64/kdei/koffice-l10n-ja-2.1.2-noarch-1.txt
--rw-r--r--  1 root root   165316 2010-04-10 05:07 ./slackware64/kdei/koffice-l10n-ja-2.1.2-noarch-1.txz
--rw-r--r--  1 root root      198 2010-04-10 05:07 ./slackware64/kdei/koffice-l10n-ja-2.1.2-noarch-1.txz.asc
--rw-r--r--  1 root root      240 2010-04-10 05:07 ./slackware64/kdei/koffice-l10n-kk-2.1.2-noarch-1.txt
--rw-r--r--  1 root root   200552 2010-04-10 05:07 ./slackware64/kdei/koffice-l10n-kk-2.1.2-noarch-1.txz
--rw-r--r--  1 root root      198 2010-04-10 05:07 ./slackware64/kdei/koffice-l10n-kk-2.1.2-noarch-1.txz.asc
--rw-r--r--  1 root root      253 2010-04-10 05:08 ./slackware64/kdei/koffice-l10n-nb-2.1.2-noarch-1.txt
--rw-r--r--  1 root root   213444 2010-04-10 05:08 ./slackware64/kdei/koffice-l10n-nb-2.1.2-noarch-1.txz
--rw-r--r--  1 root root      198 2010-04-10 05:08 ./slackware64/kdei/koffice-l10n-nb-2.1.2-noarch-1.txz.asc
--rw-r--r--  1 root root      255 2010-04-10 05:08 ./slackware64/kdei/koffice-l10n-nds-2.1.2-noarch-1.txt
--rw-r--r--  1 root root   212696 2010-04-10 05:08 ./slackware64/kdei/koffice-l10n-nds-2.1.2-noarch-1.txz
--rw-r--r--  1 root root      198 2010-04-10 05:08 ./slackware64/kdei/koffice-l10n-nds-2.1.2-noarch-1.txz.asc
--rw-r--r--  1 root root      239 2010-04-10 05:08 ./slackware64/kdei/koffice-l10n-nl-2.1.2-noarch-1.txt
--rw-r--r--  1 root root  1564424 2010-04-10 05:08 ./slackware64/kdei/koffice-l10n-nl-2.1.2-noarch-1.txz
--rw-r--r--  1 root root      198 2010-04-10 05:08 ./slackware64/kdei/koffice-l10n-nl-2.1.2-noarch-1.txz.asc
--rw-r--r--  1 root root      240 2010-04-10 05:08 ./slackware64/kdei/koffice-l10n-pl-2.1.2-noarch-1.txt
--rw-r--r--  1 root root   176872 2010-04-10 05:08 ./slackware64/kdei/koffice-l10n-pl-2.1.2-noarch-1.txz
--rw-r--r--  1 root root      198 2010-04-10 05:08 ./slackware64/kdei/koffice-l10n-pl-2.1.2-noarch-1.txz.asc
--rw-r--r--  1 root root      244 2010-04-10 05:09 ./slackware64/kdei/koffice-l10n-pt-2.1.2-noarch-1.txt
--rw-r--r--  1 root root   847732 2010-04-10 05:09 ./slackware64/kdei/koffice-l10n-pt-2.1.2-noarch-1.txz
--rw-r--r--  1 root root      198 2010-04-10 05:09 ./slackware64/kdei/koffice-l10n-pt-2.1.2-noarch-1.txz.asc
--rw-r--r--  1 root root      287 2010-04-10 05:09 ./slackware64/kdei/koffice-l10n-pt_BR-2.1.2-noarch-1.txt
--rw-r--r--  1 root root   659048 2010-04-10 05:09 ./slackware64/kdei/koffice-l10n-pt_BR-2.1.2-noarch-1.txz
--rw-r--r--  1 root root      198 2010-04-10 05:09 ./slackware64/kdei/koffice-l10n-pt_BR-2.1.2-noarch-1.txz.asc
--rw-r--r--  1 root root      241 2010-04-10 05:09 ./slackware64/kdei/koffice-l10n-sv-2.1.2-noarch-1.txt
--rw-r--r--  1 root root  3992956 2010-04-10 05:09 ./slackware64/kdei/koffice-l10n-sv-2.1.2-noarch-1.txz
--rw-r--r--  1 root root      198 2010-04-10 05:09 ./slackware64/kdei/koffice-l10n-sv-2.1.2-noarch-1.txz.asc
--rw-r--r--  1 root root      241 2010-04-10 05:09 ./slackware64/kdei/koffice-l10n-tr-2.1.2-noarch-1.txt
--rw-r--r--  1 root root   151140 2010-04-10 05:09 ./slackware64/kdei/koffice-l10n-tr-2.1.2-noarch-1.txz
--rw-r--r--  1 root root      198 2010-04-10 05:09 ./slackware64/kdei/koffice-l10n-tr-2.1.2-noarch-1.txz.asc
--rw-r--r--  1 root root      243 2010-04-10 05:10 ./slackware64/kdei/koffice-l10n-uk-2.1.2-noarch-1.txt
--rw-r--r--  1 root root   463848 2010-04-10 05:10 ./slackware64/kdei/koffice-l10n-uk-2.1.2-noarch-1.txz
--rw-r--r--  1 root root      198 2010-04-10 05:10 ./slackware64/kdei/koffice-l10n-uk-2.1.2-noarch-1.txz.asc
--rw-r--r--  1 root root      241 2010-04-10 05:10 ./slackware64/kdei/koffice-l10n-wa-2.1.2-noarch-1.txt
--rw-r--r--  1 root root   143604 2010-04-10 05:10 ./slackware64/kdei/koffice-l10n-wa-2.1.2-noarch-1.txz
--rw-r--r--  1 root root      198 2010-04-10 05:10 ./slackware64/kdei/koffice-l10n-wa-2.1.2-noarch-1.txz.asc
--rw-r--r--  1 root root      288 2010-04-10 05:10 ./slackware64/kdei/koffice-l10n-zh_CN-2.1.2-noarch-1.txt
--rw-r--r--  1 root root   143680 2010-04-10 05:10 ./slackware64/kdei/koffice-l10n-zh_CN-2.1.2-noarch-1.txz
--rw-r--r--  1 root root      198 2010-04-10 05:10 ./slackware64/kdei/koffice-l10n-zh_CN-2.1.2-noarch-1.txz.asc
--rw-r--r--  1 root root      277 2010-04-10 05:10 ./slackware64/kdei/koffice-l10n-zh_TW-2.1.2-noarch-1.txt
--rw-r--r--  1 root root   207144 2010-04-10 05:10 ./slackware64/kdei/koffice-l10n-zh_TW-2.1.2-noarch-1.txz
--rw-r--r--  1 root root      198 2010-04-10 05:10 ./slackware64/kdei/koffice-l10n-zh_TW-2.1.2-noarch-1.txz.asc
--rw-r--r--  1 root root     7659 2010-05-16 18:19 ./slackware64/kdei/maketag
--rw-r--r--  1 root root     7659 2010-05-16 18:19 ./slackware64/kdei/maketag.ez
--rw-r--r--  1 root root     1515 2010-05-16 18:19 ./slackware64/kdei/tagfile
-drwxr-xr-x  2 root root    36864 2010-05-18 22:33 ./slackware64/l
--rw-r--r--  1 root root      330 2010-05-04 00:51 ./slackware64/l/ConsoleKit-20100129-x86_64-1.txt
--rw-r--r--  1 root root    96712 2010-05-04 00:51 ./slackware64/l/ConsoleKit-20100129-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 00:51 ./slackware64/l/ConsoleKit-20100129-x86_64-1.txz.asc
--rw-r--r--  1 root root      592 2009-04-30 21:19 ./slackware64/l/M2Crypto-0.19.1-x86_64-2.txt
--rw-r--r--  1 root root   212264 2009-04-30 21:19 ./slackware64/l/M2Crypto-0.19.1-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-04-30 21:19 ./slackware64/l/M2Crypto-0.19.1-x86_64-2.txz.asc
--rw-r--r--  1 root root      276 2010-05-04 00:58 ./slackware64/l/PyQt-4.7.3-x86_64-1.txt
--rw-r--r--  1 root root  8095348 2010-05-04 00:58 ./slackware64/l/PyQt-4.7.3-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 00:58 ./slackware64/l/PyQt-4.7.3-x86_64-1.txz.asc
--rw-r--r--  1 root root      670 2010-05-04 01:01 ./slackware64/l/QScintilla-2.4.3-x86_64-1.txt
--rw-r--r--  1 root root  1153356 2010-05-04 01:01 ./slackware64/l/QScintilla-2.4.3-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 01:01 ./slackware64/l/QScintilla-2.4.3-x86_64-1.txz.asc
--rw-r--r--  1 root root      995 2008-10-23 12:12 ./slackware64/l/aalib-1.4rc5-x86_64-2.txt
--rw-r--r--  1 root root   148996 2008-10-23 12:12 ./slackware64/l/aalib-1.4rc5-x86_64-2.txz
--rw-r--r--  1 root root      197 2008-10-23 12:12 ./slackware64/l/aalib-1.4rc5-x86_64-2.txz.asc
--rw-r--r--  1 root root      383 2010-05-06 05:32 ./slackware64/l/akonadi-1.3.1-x86_64-1.txt
--rw-r--r--  1 root root   535736 2010-05-06 05:32 ./slackware64/l/akonadi-1.3.1-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-06 05:32 ./slackware64/l/akonadi-1.3.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      402 2010-04-29 23:46 ./slackware64/l/alsa-lib-1.0.23-x86_64-1.txt
--rw-r--r--  1 root root   371452 2010-04-29 23:46 ./slackware64/l/alsa-lib-1.0.23-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-29 23:46 ./slackware64/l/alsa-lib-1.0.23-x86_64-1.txz.asc
--rw-r--r--  1 root root      503 2008-10-03 21:46 ./slackware64/l/alsa-oss-1.0.17-x86_64-1.txt
--rw-r--r--  1 root root    31944 2008-10-03 21:46 ./slackware64/l/alsa-oss-1.0.17-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-03 21:46 ./slackware64/l/alsa-oss-1.0.17-x86_64-1.txz.asc
--rw-r--r--  1 root root      275 2010-03-05 21:07 ./slackware64/l/apr-1.3.9-x86_64-1.txt
--rw-r--r--  1 root root   203908 2010-03-05 21:07 ./slackware64/l/apr-1.3.9-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-03-05 21:07 ./slackware64/l/apr-1.3.9-x86_64-1.txz.asc
--rw-r--r--  1 root root      483 2010-03-05 21:20 ./slackware64/l/apr-util-1.3.9-x86_64-2.txt
--rw-r--r--  1 root root   115492 2010-03-05 21:20 ./slackware64/l/apr-util-1.3.9-x86_64-2.txz
--rw-r--r--  1 root root      198 2010-03-05 21:20 ./slackware64/l/apr-util-1.3.9-x86_64-2.txz.asc
--rw-r--r--  1 root root      251 2008-10-03 20:52 ./slackware64/l/aspell-0.60.5-x86_64-2.txt
--rw-r--r--  1 root root   598772 2008-10-03 20:52 ./slackware64/l/aspell-0.60.5-x86_64-2.txz
--rw-r--r--  1 root root      197 2008-10-03 20:52 ./slackware64/l/aspell-0.60.5-x86_64-2.txz.asc
--rw-r--r--  1 root root      175 2008-10-03 20:58 ./slackware64/l/aspell-en-6.0_0-noarch-4.txt
--rw-r--r--  1 root root  1090944 2008-10-03 20:58 ./slackware64/l/aspell-en-6.0_0-noarch-4.txz
--rw-r--r--  1 root root      197 2008-10-03 20:58 ./slackware64/l/aspell-en-6.0_0-noarch-4.txz.asc
--rw-r--r--  1 root root      173 2010-04-30 00:35 ./slackware64/l/atk-1.30.0-x86_64-1.txt
--rw-r--r--  1 root root   232352 2010-04-30 00:35 ./slackware64/l/atk-1.30.0-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-30 00:35 ./slackware64/l/atk-1.30.0-x86_64-1.txz.asc
--rw-r--r--  1 root root      373 2010-05-04 01:02 ./slackware64/l/attica-0.1.3-x86_64-1.txt
--rw-r--r--  1 root root   112608 2010-05-04 01:02 ./slackware64/l/attica-0.1.3-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 01:02 ./slackware64/l/attica-0.1.3-x86_64-1.txz.asc
--rw-r--r--  1 root root      315 2008-10-13 20:08 ./slackware64/l/audiofile-0.2.6-x86_64-2.txt
--rw-r--r--  1 root root   118384 2008-10-13 20:08 ./slackware64/l/audiofile-0.2.6-x86_64-2.txz
--rw-r--r--  1 root root      197 2008-10-13 20:08 ./slackware64/l/audiofile-0.2.6-x86_64-2.txz.asc
--rw-r--r--  1 root root      454 2009-01-22 19:43 ./slackware64/l/automoc4-0.9.88-x86_64-1.txt
--rw-r--r--  1 root root    25480 2009-01-22 19:43 ./slackware64/l/automoc4-0.9.88-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-01-22 19:43 ./slackware64/l/automoc4-0.9.88-x86_64-1.txz.asc
--rw-r--r--  1 root root      517 2009-10-28 19:59 ./slackware64/l/babl-0.1.0-x86_64-1.txt
--rw-r--r--  1 root root    65988 2009-10-28 19:59 ./slackware64/l/babl-0.1.0-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-10-28 19:59 ./slackware64/l/babl-0.1.0-x86_64-1.txz.asc
--rw-r--r--  1 root root      433 2010-05-06 05:24 ./slackware64/l/boost-1.42.0-x86_64-1.txt
--rw-r--r--  1 root root  4773520 2010-05-06 05:24 ./slackware64/l/boost-1.42.0-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-06 05:24 ./slackware64/l/boost-1.42.0-x86_64-1.txz.asc
--rw-r--r--  1 root root      394 2010-05-03 05:13 ./slackware64/l/cairo-1.8.8-x86_64-3.txt
--rw-r--r--  1 root root   378188 2010-05-03 05:13 ./slackware64/l/cairo-1.8.8-x86_64-3.txz
--rw-r--r--  1 root root      198 2010-05-03 05:13 ./slackware64/l/cairo-1.8.8-x86_64-3.txz.asc
--rw-r--r--  1 root root      472 2008-12-16 19:11 ./slackware64/l/chmlib-0.39-x86_64-1.txt
--rw-r--r--  1 root root    24700 2008-12-16 19:11 ./slackware64/l/chmlib-0.39-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-12-16 19:11 ./slackware64/l/chmlib-0.39-x86_64-1.txz.asc
--rw-r--r--  1 root root      279 2009-01-20 15:20 ./slackware64/l/clucene-0.9.21b-x86_64-1.txt
--rw-r--r--  1 root root   382268 2009-01-20 15:20 ./slackware64/l/clucene-0.9.21b-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-01-20 15:20 ./slackware64/l/clucene-0.9.21b-x86_64-1.txz.asc
--rw-r--r--  1 root root      364 2008-09-29 19:55 ./slackware64/l/db42-4.2.52-x86_64-3.txt
--rw-r--r--  1 root root   380400 2008-09-29 19:55 ./slackware64/l/db42-4.2.52-x86_64-3.txz
--rw-r--r--  1 root root      197 2008-09-29 19:55 ./slackware64/l/db42-4.2.52-x86_64-3.txz.asc
--rw-r--r--  1 root root      363 2008-09-29 20:01 ./slackware64/l/db44-4.4.20-x86_64-2.txt
--rw-r--r--  1 root root   705520 2008-09-29 20:01 ./slackware64/l/db44-4.4.20-x86_64-2.txz
--rw-r--r--  1 root root      197 2008-09-29 20:01 ./slackware64/l/db44-4.4.20-x86_64-2.txz.asc
--rw-r--r--  1 root root      222 2010-04-30 04:13 ./slackware64/l/dbus-glib-0.86-x86_64-1.txt
--rw-r--r--  1 root root   117560 2010-04-30 04:13 ./slackware64/l/dbus-glib-0.86-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-30 04:13 ./slackware64/l/dbus-glib-0.86-x86_64-1.txz.asc
--rw-r--r--  1 root root      246 2010-04-30 04:14 ./slackware64/l/dbus-python-0.83.1-x86_64-1.txt
--rw-r--r--  1 root root   106608 2010-04-30 04:14 ./slackware64/l/dbus-python-0.83.1-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-30 04:14 ./slackware64/l/dbus-python-0.83.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      655 2010-05-11 14:02 ./slackware64/l/desktop-file-utils-0.16-x86_64-2.txt
--rw-r--r--  1 root root    45080 2010-05-11 14:02 ./slackware64/l/desktop-file-utils-0.16-x86_64-2.txz
--rw-r--r--  1 root root      198 2010-05-11 14:02 ./slackware64/l/desktop-file-utils-0.16-x86_64-2.txz.asc
--rw-r--r--  1 root root      561 2010-02-14 23:33 ./slackware64/l/djvulibre-3.5.22-x86_64-2.txt
--rw-r--r--  1 root root   935108 2010-02-14 23:33 ./slackware64/l/djvulibre-3.5.22-x86_64-2.txz
--rw-r--r--  1 root root      197 2010-02-14 23:33 ./slackware64/l/djvulibre-3.5.22-x86_64-2.txz.asc
--rw-r--r--  1 root root      323 2010-05-04 01:02 ./slackware64/l/ebook-tools-0.1.1-x86_64-2.txt
--rw-r--r--  1 root root    20544 2010-05-04 01:02 ./slackware64/l/ebook-tools-0.1.1-x86_64-2.txz
--rw-r--r--  1 root root      198 2010-05-04 01:02 ./slackware64/l/ebook-tools-0.1.1-x86_64-2.txz.asc
--rw-r--r--  1 root root      230 2010-05-04 01:04 ./slackware64/l/eggdbus-0.6-x86_64-1.txt
--rw-r--r--  1 root root   276116 2010-05-04 01:04 ./slackware64/l/eggdbus-0.6-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 01:04 ./slackware64/l/eggdbus-0.6-x86_64-1.txz.asc
--rw-r--r--  1 root root      257 2009-12-17 02:23 ./slackware64/l/eigen2-2.0.10-x86_64-1.txt
--rw-r--r--  1 root root   161064 2009-12-17 02:23 ./slackware64/l/eigen2-2.0.10-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-12-17 02:23 ./slackware64/l/eigen2-2.0.10-x86_64-1.txz.asc
--rw-r--r--  1 root root      346 2009-12-17 03:02 ./slackware64/l/enchant-1.5.0-x86_64-1.txt
--rw-r--r--  1 root root   137616 2009-12-17 03:02 ./slackware64/l/enchant-1.5.0-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-12-17 03:02 ./slackware64/l/enchant-1.5.0-x86_64-1.txz.asc
--rw-r--r--  1 root root      505 2009-04-08 20:17 ./slackware64/l/esound-0.2.41-x86_64-1.txt
--rw-r--r--  1 root root    98952 2009-04-08 20:17 ./slackware64/l/esound-0.2.41-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-04-08 20:17 ./slackware64/l/esound-0.2.41-x86_64-1.txz.asc
--rw-r--r--  1 root root      257 2009-12-17 02:22 ./slackware64/l/exiv2-0.18.2-x86_64-1.txt
--rw-r--r--  1 root root   729632 2009-12-17 02:22 ./slackware64/l/exiv2-0.18.2-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-12-17 02:22 ./slackware64/l/exiv2-0.18.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      264 2008-09-28 21:05 ./slackware64/l/expat-2.0.1-x86_64-1.txt
--rw-r--r--  1 root root   109568 2008-09-28 21:05 ./slackware64/l/expat-2.0.1-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-09-28 21:05 ./slackware64/l/expat-2.0.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      506 2009-12-17 01:50 ./slackware64/l/fftw-3.2.2-x86_64-1.txt
--rw-r--r--  1 root root  1060684 2009-12-17 01:50 ./slackware64/l/fftw-3.2.2-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-12-17 01:50 ./slackware64/l/fftw-3.2.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      344 2010-03-12 00:34 ./slackware64/l/freetype-2.3.12-x86_64-1.txt
--rw-r--r--  1 root root   415240 2010-03-12 00:34 ./slackware64/l/freetype-2.3.12-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-03-12 00:34 ./slackware64/l/freetype-2.3.12-x86_64-1.txz.asc
--rw-r--r--  1 root root      353 2008-10-08 20:29 ./slackware64/l/fribidi-0.10.9-x86_64-2.txt
--rw-r--r--  1 root root    45716 2008-10-08 20:29 ./slackware64/l/fribidi-0.10.9-x86_64-2.txz
--rw-r--r--  1 root root      197 2008-10-08 20:29 ./slackware64/l/fribidi-0.10.9-x86_64-2.txz.asc
--rw-r--r--  1 root root      391 2010-02-09 21:37 ./slackware64/l/fuse-2.8.1-x86_64-1.txt
--rw-r--r--  1 root root   122084 2010-02-09 21:37 ./slackware64/l/fuse-2.8.1-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-09 21:37 ./slackware64/l/fuse-2.8.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      297 2009-04-30 20:22 ./slackware64/l/gamin-0.1.10-x86_64-2.txt
--rw-r--r--  1 root root    98416 2009-04-30 20:22 ./slackware64/l/gamin-0.1.10-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-04-30 20:22 ./slackware64/l/gamin-0.1.10-x86_64-2.txz.asc
--rw-r--r--  1 root root      469 2010-02-18 03:20 ./slackware64/l/gd-2.0.35-x86_64-4.txt
--rw-r--r--  1 root root   145516 2010-02-18 03:20 ./slackware64/l/gd-2.0.35-x86_64-4.txz
--rw-r--r--  1 root root      197 2010-02-18 03:20 ./slackware64/l/gd-2.0.35-x86_64-4.txz.asc
--rw-r--r--  1 root root      186 2008-09-28 22:46 ./slackware64/l/gdbm-1.8.3-x86_64-4.txt
--rw-r--r--  1 root root    43824 2008-09-28 22:46 ./slackware64/l/gdbm-1.8.3-x86_64-4.txz
--rw-r--r--  1 root root      197 2008-09-28 22:46 ./slackware64/l/gdbm-1.8.3-x86_64-4.txz.asc
--rw-r--r--  1 root root      405 2010-02-16 04:20 ./slackware64/l/gegl-0.1.0-x86_64-2.txt
--rw-r--r--  1 root root   299344 2010-02-16 04:20 ./slackware64/l/gegl-0.1.0-x86_64-2.txz
--rw-r--r--  1 root root      197 2010-02-16 04:20 ./slackware64/l/gegl-0.1.0-x86_64-2.txz.asc
--rw-r--r--  1 root root      320 2010-02-06 22:20 ./slackware64/l/giflib-4.1.6-x86_64-1.txt
--rw-r--r--  1 root root   171608 2010-02-06 22:20 ./slackware64/l/giflib-4.1.6-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-06 22:20 ./slackware64/l/giflib-4.1.6-x86_64-1.txz.asc
--rw-r--r--  1 root root      302 2008-09-28 19:59 ./slackware64/l/glib-1.2.10-x86_64-3.txt
--rw-r--r--  1 root root   146248 2008-09-28 19:59 ./slackware64/l/glib-1.2.10-x86_64-3.txz
--rw-r--r--  1 root root      197 2008-09-28 19:59 ./slackware64/l/glib-1.2.10-x86_64-3.txz.asc
--rw-r--r--  1 root root      235 2010-04-30 00:14 ./slackware64/l/glib2-2.22.5-x86_64-1.txt
--rw-r--r--  1 root root  2018660 2010-04-30 00:14 ./slackware64/l/glib2-2.22.5-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-30 00:14 ./slackware64/l/glib2-2.22.5-x86_64-1.txz.asc
--rw-r--r--  1 root root      389 2010-05-13 06:24 ./slackware64/l/glibc-2.11.1-x86_64-3.txt
--rw-r--r--  1 root root 11927760 2010-05-13 06:24 ./slackware64/l/glibc-2.11.1-x86_64-3.txz
--rw-r--r--  1 root root      198 2010-05-13 06:24 ./slackware64/l/glibc-2.11.1-x86_64-3.txz.asc
--rw-r--r--  1 root root      333 2010-05-13 06:23 ./slackware64/l/glibc-i18n-2.11.1-x86_64-3.txt
--rw-r--r--  1 root root  6605844 2010-05-13 06:23 ./slackware64/l/glibc-i18n-2.11.1-x86_64-3.txz
--rw-r--r--  1 root root      198 2010-05-13 06:23 ./slackware64/l/glibc-i18n-2.11.1-x86_64-3.txz.asc
--rw-r--r--  1 root root      508 2010-05-13 06:22 ./slackware64/l/glibc-profile-2.11.1-x86_64-3.txt
--rw-r--r--  1 root root  1125268 2010-05-13 06:22 ./slackware64/l/glibc-profile-2.11.1-x86_64-3.txz
--rw-r--r--  1 root root      198 2010-05-13 06:22 ./slackware64/l/glibc-profile-2.11.1-x86_64-3.txz.asc
--rw-r--r--  1 root root      297 2010-02-03 23:45 ./slackware64/l/gmime-2.4.15-x86_64-1.txt
--rw-r--r--  1 root root   245244 2010-02-03 23:45 ./slackware64/l/gmime-2.4.15-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-03 23:45 ./slackware64/l/gmime-2.4.15-x86_64-1.txz.asc
--rw-r--r--  1 root root      579 2008-12-16 19:49 ./slackware64/l/gmm-3.1-noarch-1.txt
--rw-r--r--  1 root root   110636 2008-12-16 19:49 ./slackware64/l/gmm-3.1-noarch-1.txz
--rw-r--r--  1 root root      197 2008-12-16 19:49 ./slackware64/l/gmm-3.1-noarch-1.txz.asc
--rw-r--r--  1 root root      312 2010-02-24 02:23 ./slackware64/l/gmp-5.0.1-x86_64-1.txt
--rw-r--r--  1 root root   469224 2010-02-24 02:23 ./slackware64/l/gmp-5.0.1-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-24 02:23 ./slackware64/l/gmp-5.0.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      299 2010-04-30 05:13 ./slackware64/l/gnome-icon-theme-2.30.2-x86_64-1.txt
--rw-r--r--  1 root root  7996060 2010-04-30 05:13 ./slackware64/l/gnome-icon-theme-2.30.2-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-30 05:13 ./slackware64/l/gnome-icon-theme-2.30.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      609 2010-04-30 05:50 ./slackware64/l/gst-plugins-base-0.10.29-x86_64-1.txt
--rw-r--r--  1 root root   992124 2010-04-30 05:50 ./slackware64/l/gst-plugins-base-0.10.29-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-30 05:50 ./slackware64/l/gst-plugins-base-0.10.29-x86_64-1.txz.asc
--rw-r--r--  1 root root      444 2010-04-30 05:52 ./slackware64/l/gst-plugins-good-0.10.22-x86_64-1.txt
--rw-r--r--  1 root root   807236 2010-04-30 05:52 ./slackware64/l/gst-plugins-good-0.10.22-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-30 05:52 ./slackware64/l/gst-plugins-good-0.10.22-x86_64-1.txz.asc
--rw-r--r--  1 root root      602 2010-04-30 05:35 ./slackware64/l/gstreamer-0.10.29-x86_64-1.txt
--rw-r--r--  1 root root  1065376 2010-04-30 05:35 ./slackware64/l/gstreamer-0.10.29-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-30 05:35 ./slackware64/l/gstreamer-0.10.29-x86_64-1.txz.asc
--rw-r--r--  1 root root      351 2009-06-09 02:23 ./slackware64/l/gtk+-1.2.10-x86_64-5.txt
--rw-r--r--  1 root root  1046588 2009-06-09 02:23 ./slackware64/l/gtk+-1.2.10-x86_64-5.txz
--rw-r--r--  1 root root      197 2009-06-09 02:23 ./slackware64/l/gtk+-1.2.10-x86_64-5.txz.asc
--rw-r--r--  1 root root      335 2010-04-30 01:54 ./slackware64/l/gtk+2-2.18.9-x86_64-1.txt
--rw-r--r--  1 root root  6534268 2010-04-30 01:54 ./slackware64/l/gtk+2-2.18.9-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-30 01:54 ./slackware64/l/gtk+2-2.18.9-x86_64-1.txz.asc
--rw-r--r--  1 root root      330 2009-06-09 05:28 ./slackware64/l/gtkspell-2.0.15-x86_64-1.txt
--rw-r--r--  1 root root    32692 2009-06-09 05:28 ./slackware64/l/gtkspell-2.0.15-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-06-09 05:28 ./slackware64/l/gtkspell-2.0.15-x86_64-1.txz.asc
--rw-r--r--  1 root root      464 2010-03-13 00:58 ./slackware64/l/hal-0.5.14-x86_64-2.txt
--rw-r--r--  1 root root   487564 2010-03-13 00:58 ./slackware64/l/hal-0.5.14-x86_64-2.txz
--rw-r--r--  1 root root      198 2010-03-13 00:58 ./slackware64/l/hal-0.5.14-x86_64-2.txz.asc
--rw-r--r--  1 root root      297 2010-02-09 03:17 ./slackware64/l/hal-info-20091130-noarch-1.txt
--rw-r--r--  1 root root    47520 2010-02-09 03:17 ./slackware64/l/hal-info-20091130-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-09 03:17 ./slackware64/l/hal-info-20091130-noarch-1.txz.asc
--rw-r--r--  1 root root      445 2010-04-30 00:40 ./slackware64/l/hicolor-icon-theme-0.12-noarch-1.txt
--rw-r--r--  1 root root    11776 2010-04-30 00:40 ./slackware64/l/hicolor-icon-theme-0.12-noarch-1.txz
--rw-r--r--  1 root root      198 2010-04-30 00:40 ./slackware64/l/hicolor-icon-theme-0.12-noarch-1.txz.asc
--rw-r--r--  1 root root      509 2010-05-04 01:04 ./slackware64/l/hunspell-1.2.9-x86_64-1.txt
--rw-r--r--  1 root root   234676 2010-05-04 01:04 ./slackware64/l/hunspell-1.2.9-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 01:04 ./slackware64/l/hunspell-1.2.9-x86_64-1.txz.asc
--rw-r--r--  1 root root      464 2009-08-22 19:44 ./slackware64/l/icon-naming-utils-0.8.90-x86_64-2.txt
--rw-r--r--  1 root root    14068 2009-08-22 19:44 ./slackware64/l/icon-naming-utils-0.8.90-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-08-22 19:44 ./slackware64/l/icon-naming-utils-0.8.90-x86_64-2.txz.asc
--rw-r--r--  1 root root      371 2008-12-16 19:54 ./slackware64/l/ilmbase-1.0.1-x86_64-1.txt
--rw-r--r--  1 root root   108700 2008-12-16 19:54 ./slackware64/l/ilmbase-1.0.1-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-12-16 19:54 ./slackware64/l/ilmbase-1.0.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      401 2010-02-11 21:11 ./slackware64/l/imlib-1.9.15-x86_64-6.txt
--rw-r--r--  1 root root   466824 2010-02-11 21:11 ./slackware64/l/imlib-1.9.15-x86_64-6.txz
--rw-r--r--  1 root root      197 2010-02-11 21:11 ./slackware64/l/imlib-1.9.15-x86_64-6.txz.asc
--rwxr-xr-x  1 root root     2897 2009-06-24 22:06 ./slackware64/l/install-packages
--rw-r--r--  1 root root      446 2006-09-18 10:41 ./slackware64/l/install.end
--rw-r--r--  1 root root      392 2009-04-03 19:12 ./slackware64/l/iso-codes-3.8-noarch-1.txt
--rw-r--r--  1 root root  1042596 2009-04-03 19:12 ./slackware64/l/iso-codes-3.8-noarch-1.txz
--rw-r--r--  1 root root      197 2009-04-03 19:12 ./slackware64/l/iso-codes-3.8-noarch-1.txz.asc
--rw-r--r--  1 root root      382 2010-02-11 20:19 ./slackware64/l/jasper-1.900.1-x86_64-3.txt
--rw-r--r--  1 root root   158076 2010-02-11 20:19 ./slackware64/l/jasper-1.900.1-x86_64-3.txz
--rw-r--r--  1 root root      197 2010-02-11 20:19 ./slackware64/l/jasper-1.900.1-x86_64-3.txz.asc
--rw-r--r--  1 root root      554 2010-05-09 01:28 ./slackware64/l/jre-6u20-x86_64-1.txt
--rw-r--r--  1 root root 19618716 2010-05-09 01:28 ./slackware64/l/jre-6u20-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-09 01:28 ./slackware64/l/jre-6u20-x86_64-1.txz.asc
--rw-r--r--  1 root root      210 2010-02-20 05:52 ./slackware64/l/lcms-1.19-x86_64-1.txt
--rw-r--r--  1 root root   178476 2010-02-20 05:52 ./slackware64/l/lcms-1.19-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-20 05:52 ./slackware64/l/lcms-1.19-x86_64-1.txz.asc
--rw-r--r--  1 root root      526 2010-04-19 20:13 ./slackware64/l/lesstif-0.95.2-x86_64-1.txt
--rw-r--r--  1 root root  1397028 2010-04-19 20:13 ./slackware64/l/lesstif-0.95.2-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-19 20:13 ./slackware64/l/lesstif-0.95.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      505 2010-05-11 01:13 ./slackware64/l/libaio-0.3.109-x86_64-1.txt
--rw-r--r--  1 root root    13524 2010-05-11 01:13 ./slackware64/l/libaio-0.3.109-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-11 01:13 ./slackware64/l/libaio-0.3.109-x86_64-1.txz.asc
--rw-r--r--  1 root root      428 2008-10-08 21:22 ./slackware64/l/libao-0.8.8-x86_64-1.txt
--rw-r--r--  1 root root    35288 2008-10-08 21:22 ./slackware64/l/libao-0.8.8-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-08 21:22 ./slackware64/l/libao-0.8.8-x86_64-1.txz.asc
--rw-r--r--  1 root root      415 2010-03-06 19:41 ./slackware64/l/libarchive-2.8.0-x86_64-1.txt
--rw-r--r--  1 root root   230844 2010-03-06 19:41 ./slackware64/l/libarchive-2.8.0-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-03-06 19:41 ./slackware64/l/libarchive-2.8.0-x86_64-1.txz.asc
--rw-r--r--  1 root root      361 2008-10-08 21:23 ./slackware64/l/libart_lgpl-2.3.20-x86_64-1.txt
--rw-r--r--  1 root root    74044 2008-10-08 21:23 ./slackware64/l/libart_lgpl-2.3.20-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-08 21:23 ./slackware64/l/libart_lgpl-2.3.20-x86_64-1.txz.asc
--rw-r--r--  1 root root      359 2009-06-09 01:22 ./slackware64/l/libcaca-0.99.beta16-x86_64-3.txt
--rw-r--r--  1 root root   433140 2009-06-09 01:22 ./slackware64/l/libcaca-0.99.beta16-x86_64-3.txz
--rw-r--r--  1 root root      197 2009-06-09 01:22 ./slackware64/l/libcaca-0.99.beta16-x86_64-3.txz.asc
--rw-r--r--  1 root root      380 2010-05-05 05:58 ./slackware64/l/libcap-2.19-x86_64-1.txt
--rw-r--r--  1 root root    52292 2010-05-05 05:58 ./slackware64/l/libcap-2.19-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-05 05:58 ./slackware64/l/libcap-2.19-x86_64-1.txz.asc
--rw-r--r--  1 root root      328 2008-10-08 21:31 ./slackware64/l/libcddb-1.3.0-x86_64-1.txt
--rw-r--r--  1 root root    64056 2008-10-08 21:31 ./slackware64/l/libcddb-1.3.0-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-08 21:31 ./slackware64/l/libcddb-1.3.0-x86_64-1.txz.asc
--rw-r--r--  1 root root      554 2008-10-08 21:33 ./slackware64/l/libcdio-0.79-x86_64-1.txt
--rw-r--r--  1 root root   280832 2008-10-08 21:33 ./slackware64/l/libcdio-0.79-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-08 21:33 ./slackware64/l/libcdio-0.79-x86_64-1.txz.asc
--rw-r--r--  1 root root      480 2010-05-04 01:04 ./slackware64/l/libdiscid-0.2.2-x86_64-1.txt
--rw-r--r--  1 root root    19936 2010-05-04 01:04 ./slackware64/l/libdiscid-0.2.2-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 01:04 ./slackware64/l/libdiscid-0.2.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      398 2009-03-09 11:04 ./slackware64/l/libdvdread-4.1.3-x86_64-1.txt
--rw-r--r--  1 root root    69700 2009-03-09 11:04 ./slackware64/l/libdvdread-4.1.3-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-03-09 11:04 ./slackware64/l/libdvdread-4.1.3-x86_64-1.txz.asc
--rw-r--r--  1 root root      397 2010-02-07 23:29 ./slackware64/l/libexif-0.6.19-x86_64-1.txt
--rw-r--r--  1 root root   280152 2010-02-07 23:29 ./slackware64/l/libexif-0.6.19-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-07 23:29 ./slackware64/l/libexif-0.6.19-x86_64-1.txz.asc
--rw-r--r--  1 root root      349 2010-04-25 20:44 ./slackware64/l/libglade-2.6.4-x86_64-4.txt
--rw-r--r--  1 root root    89064 2010-04-25 20:44 ./slackware64/l/libglade-2.6.4-x86_64-4.txz
--rw-r--r--  1 root root      198 2010-04-25 20:44 ./slackware64/l/libglade-2.6.4-x86_64-4.txz.asc
--rw-r--r--  1 root root      293 2010-04-29 02:46 ./slackware64/l/libgphoto2-2.4.9-x86_64-1.txt
--rw-r--r--  1 root root  1026504 2010-04-29 02:46 ./slackware64/l/libgphoto2-2.4.9-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-29 02:46 ./slackware64/l/libgphoto2-2.4.9-x86_64-1.txz.asc
--rw-r--r--  1 root root      518 2009-06-07 20:32 ./slackware64/l/libgpod-0.7.2-x86_64-1.txt
--rw-r--r--  1 root root   270828 2009-06-07 20:32 ./slackware64/l/libgpod-0.7.2-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-06-07 20:32 ./slackware64/l/libgpod-0.7.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      336 2010-02-07 03:26 ./slackware64/l/libgsf-1.14.16-x86_64-1.txt
--rw-r--r--  1 root root   198844 2010-02-07 03:26 ./slackware64/l/libgsf-1.14.16-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-07 03:26 ./slackware64/l/libgsf-1.14.16-x86_64-1.txz.asc
--rw-r--r--  1 root root      466 2009-04-03 19:34 ./slackware64/l/libical-0.43-x86_64-1.txt
--rw-r--r--  1 root root   242064 2009-04-03 19:34 ./slackware64/l/libical-0.43-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-04-03 19:34 ./slackware64/l/libical-0.43-x86_64-1.txz.asc
--rw-r--r--  1 root root      318 2009-03-24 10:29 ./slackware64/l/libid3tag-0.15.1b-x86_64-3.txt
--rw-r--r--  1 root root    35808 2009-03-24 10:29 ./slackware64/l/libid3tag-0.15.1b-x86_64-3.txz
--rw-r--r--  1 root root      197 2009-03-24 10:29 ./slackware64/l/libid3tag-0.15.1b-x86_64-3.txz.asc
--rw-r--r--  1 root root      338 2008-10-09 13:08 ./slackware64/l/libidl-0.8.10-x86_64-1.txt
--rw-r--r--  1 root root    81336 2008-10-09 13:08 ./slackware64/l/libidl-0.8.10-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-09 13:08 ./slackware64/l/libidl-0.8.10-x86_64-1.txz.asc
--rw-r--r--  1 root root      336 2008-10-09 13:10 ./slackware64/l/libidn-1.5-x86_64-1.txt
--rw-r--r--  1 root root   262696 2008-10-09 13:10 ./slackware64/l/libidn-1.5-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-09 13:10 ./slackware64/l/libidn-1.5-x86_64-1.txz.asc
--rw-r--r--  1 root root      380 2009-04-30 20:35 ./slackware64/l/libieee1284-0.2.11-x86_64-2.txt
--rw-r--r--  1 root root    75032 2009-04-30 20:35 ./slackware64/l/libieee1284-0.2.11-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-04-30 20:35 ./slackware64/l/libieee1284-0.2.11-x86_64-2.txz.asc
--rw-r--r--  1 root root      438 2010-05-04 01:05 ./slackware64/l/libiodbc-3.52.7-x86_64-2.txt
--rw-r--r--  1 root root   260652 2010-05-04 01:05 ./slackware64/l/libiodbc-3.52.7-x86_64-2.txz
--rw-r--r--  1 root root      198 2010-05-04 01:05 ./slackware64/l/libiodbc-3.52.7-x86_64-2.txz.asc
--rw-r--r--  1 root root      662 2010-04-05 02:34 ./slackware64/l/libjpeg-v8a-x86_64-1.txt
--rw-r--r--  1 root root   178868 2010-04-05 02:34 ./slackware64/l/libjpeg-v8a-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-05 02:34 ./slackware64/l/libjpeg-v8a-x86_64-1.txz.asc
--rw-r--r--  1 root root      357 2009-06-07 20:28 ./slackware64/l/libkarma-0.1.1-x86_64-1.txt
--rw-r--r--  1 root root    56268 2009-06-07 20:28 ./slackware64/l/libkarma-0.1.1-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-06-07 20:28 ./slackware64/l/libkarma-0.1.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      204 2009-12-19 00:06 ./slackware64/l/liblastfm-0.3.0-x86_64-2.txt
--rw-r--r--  1 root root   152816 2009-12-19 00:06 ./slackware64/l/liblastfm-0.3.0-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-12-19 00:06 ./slackware64/l/liblastfm-0.3.0-x86_64-2.txz.asc
--rw-r--r--  1 root root      600 2008-10-09 14:07 ./slackware64/l/libmad-0.15.1b-x86_64-3.txt
--rw-r--r--  1 root root    70860 2008-10-09 14:07 ./slackware64/l/libmad-0.15.1b-x86_64-3.txz
--rw-r--r--  1 root root      197 2008-10-09 14:07 ./slackware64/l/libmad-0.15.1b-x86_64-3.txz.asc
--rw-r--r--  1 root root      552 2009-04-05 13:37 ./slackware64/l/libmcrypt-2.5.8-x86_64-1.txt
--rw-r--r--  1 root root    81464 2009-04-05 13:37 ./slackware64/l/libmcrypt-2.5.8-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-04-05 13:37 ./slackware64/l/libmcrypt-2.5.8-x86_64-1.txz.asc
--rw-r--r--  1 root root      509 2009-03-08 23:26 ./slackware64/l/libmcs-0.7.1-x86_64-1.txt
--rw-r--r--  1 root root    16104 2009-03-08 23:26 ./slackware64/l/libmcs-0.7.1-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-03-08 23:26 ./slackware64/l/libmcs-0.7.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      484 2010-02-14 23:25 ./slackware64/l/libmng-1.0.10-x86_64-2.txt
--rw-r--r--  1 root root   211592 2010-02-14 23:25 ./slackware64/l/libmng-1.0.10-x86_64-2.txz
--rw-r--r--  1 root root      197 2010-02-14 23:25 ./slackware64/l/libmng-1.0.10-x86_64-2.txz.asc
--rw-r--r--  1 root root      399 2008-10-09 13:37 ./slackware64/l/libmowgli-0.6.0-x86_64-1.txt
--rw-r--r--  1 root root    28444 2008-10-09 13:37 ./slackware64/l/libmowgli-0.6.0-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-09 13:37 ./slackware64/l/libmowgli-0.6.0-x86_64-1.txz.asc
--rw-r--r--  1 root root      315 2010-05-04 01:05 ./slackware64/l/libmsn-4.1-x86_64-1.txt
--rw-r--r--  1 root root   264324 2010-05-04 01:05 ./slackware64/l/libmsn-4.1-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 01:05 ./slackware64/l/libmsn-4.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      602 2010-05-03 18:41 ./slackware64/l/libmtp-1.0.1-x86_64-2.txt
--rw-r--r--  1 root root   244572 2010-05-03 18:41 ./slackware64/l/libmtp-1.0.1-x86_64-2.txz
--rw-r--r--  1 root root      198 2010-05-03 18:41 ./slackware64/l/libmtp-1.0.1-x86_64-2.txz.asc
--rw-r--r--  1 root root      540 2009-05-23 04:43 ./slackware64/l/libnjb-2.2.6-x86_64-4.txt
--rw-r--r--  1 root root   219696 2009-05-23 04:43 ./slackware64/l/libnjb-2.2.6-x86_64-4.txz
--rw-r--r--  1 root root      197 2009-05-23 04:43 ./slackware64/l/libnjb-2.2.6-x86_64-4.txz.asc
--rw-r--r--  1 root root      330 2009-03-31 10:18 ./slackware64/l/libnl-1.1-x86_64-1.txt
--rw-r--r--  1 root root   119472 2009-03-31 10:18 ./slackware64/l/libnl-1.1-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-03-31 10:18 ./slackware64/l/libnl-1.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      251 2010-02-12 19:52 ./slackware64/l/libnotify-0.4.5-x86_64-2.txt
--rw-r--r--  1 root root    42680 2010-02-12 19:52 ./slackware64/l/libnotify-0.4.5-x86_64-2.txz
--rw-r--r--  1 root root      197 2010-02-12 19:52 ./slackware64/l/libnotify-0.4.5-x86_64-2.txz.asc
--rw-r--r--  1 root root      305 2010-02-06 21:41 ./slackware64/l/libogg-1.1.4-x86_64-1.txt
--rw-r--r--  1 root root    66736 2010-02-06 21:41 ./slackware64/l/libogg-1.1.4-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-06 21:41 ./slackware64/l/libogg-1.1.4-x86_64-1.txz.asc
--rw-r--r--  1 root root      576 2009-06-02 22:11 ./slackware64/l/liboil-0.3.16-x86_64-1.txt
--rw-r--r--  1 root root   159048 2009-06-02 22:11 ./slackware64/l/liboil-0.3.16-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-06-02 22:11 ./slackware64/l/liboil-0.3.16-x86_64-1.txz.asc
--rw-r--r--  1 root root      492 2010-05-08 03:25 ./slackware64/l/libpng-1.4.2-x86_64-1.txt
--rw-r--r--  1 root root   530920 2010-05-08 03:25 ./slackware64/l/libpng-1.4.2-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-08 03:25 ./slackware64/l/libpng-1.4.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      351 2010-05-11 01:18 ./slackware64/l/libraw1394-2.0.5-x86_64-1.txt
--rw-r--r--  1 root root    63360 2010-05-11 01:18 ./slackware64/l/libraw1394-2.0.5-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-11 01:18 ./slackware64/l/libraw1394-2.0.5-x86_64-1.txz.asc
--rw-r--r--  1 root root      174 2010-02-12 21:37 ./slackware64/l/librsvg-2.26.0-x86_64-3.txt
--rw-r--r--  1 root root   142780 2010-02-12 21:37 ./slackware64/l/librsvg-2.26.0-x86_64-3.txz
--rw-r--r--  1 root root      197 2010-02-12 21:37 ./slackware64/l/librsvg-2.26.0-x86_64-3.txz.asc
--rw-r--r--  1 root root      653 2009-12-17 01:35 ./slackware64/l/libsamplerate-0.1.7-x86_64-1.txt
--rw-r--r--  1 root root   988712 2009-12-17 01:35 ./slackware64/l/libsamplerate-0.1.7-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-12-17 01:35 ./slackware64/l/libsamplerate-0.1.7-x86_64-1.txz.asc
--rw-r--r--  1 root root      413 2010-05-04 01:05 ./slackware64/l/libspectre-0.2.5-x86_64-1.txt
--rw-r--r--  1 root root    38076 2010-05-04 01:05 ./slackware64/l/libspectre-0.2.5-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 01:05 ./slackware64/l/libspectre-0.2.5-x86_64-1.txz.asc
--rw-r--r--  1 root root      477 2008-09-28 22:17 ./slackware64/l/libtermcap-1.2.3-x86_64-7.txt
--rw-r--r--  1 root root    59224 2008-09-28 22:17 ./slackware64/l/libtermcap-1.2.3-x86_64-7.txz
--rw-r--r--  1 root root      197 2008-09-28 22:17 ./slackware64/l/libtermcap-1.2.3-x86_64-7.txz.asc
--rw-r--r--  1 root root      625 2010-02-17 23:33 ./slackware64/l/libtheora-1.1.1-x86_64-1.txt
--rw-r--r--  1 root root   183020 2010-02-17 23:33 ./slackware64/l/libtheora-1.1.1-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-17 23:33 ./slackware64/l/libtheora-1.1.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      394 2010-02-19 19:46 ./slackware64/l/libtiff-3.9.2-x86_64-1.txt
--rw-r--r--  1 root root   467312 2010-02-19 19:46 ./slackware64/l/libtiff-3.9.2-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-19 19:46 ./slackware64/l/libtiff-3.9.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      387 2010-02-06 21:52 ./slackware64/l/libusb-1.0.6-x86_64-1.txt
--rw-r--r--  1 root root    64240 2010-02-06 21:52 ./slackware64/l/libusb-1.0.6-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-06 21:52 ./slackware64/l/libusb-1.0.6-x86_64-1.txz.asc
--rw-r--r--  1 root root      544 2008-10-10 08:57 ./slackware64/l/libvisual-0.4.0-x86_64-2.txt
--rw-r--r--  1 root root   127060 2008-10-10 08:57 ./slackware64/l/libvisual-0.4.0-x86_64-2.txz
--rw-r--r--  1 root root      197 2008-10-10 08:57 ./slackware64/l/libvisual-0.4.0-x86_64-2.txz.asc
--rw-r--r--  1 root root      722 2009-06-10 01:25 ./slackware64/l/libvisual-plugins-0.4.0-x86_64-2.txt
--rw-r--r--  1 root root   220752 2009-06-10 01:25 ./slackware64/l/libvisual-plugins-0.4.0-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-06-10 01:25 ./slackware64/l/libvisual-plugins-0.4.0-x86_64-2.txz.asc
--rw-r--r--  1 root root      374 2010-02-15 01:27 ./slackware64/l/libvncserver-0.9.7-x86_64-2.txt
--rw-r--r--  1 root root   198772 2010-02-15 01:27 ./slackware64/l/libvncserver-0.9.7-x86_64-2.txz
--rw-r--r--  1 root root      197 2010-02-15 01:27 ./slackware64/l/libvncserver-0.9.7-x86_64-2.txz.asc
--rw-r--r--  1 root root      560 2010-02-06 03:12 ./slackware64/l/libvorbis-1.2.3-x86_64-1.txt
--rw-r--r--  1 root root   275416 2010-02-06 03:12 ./slackware64/l/libvorbis-1.2.3-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-06 03:12 ./slackware64/l/libvorbis-1.2.3-x86_64-1.txz.asc
--rw-r--r--  1 root root      288 2010-02-15 00:25 ./slackware64/l/libwmf-0.2.8.4-x86_64-5.txt
--rw-r--r--  1 root root   752556 2010-02-15 00:25 ./slackware64/l/libwmf-0.2.8.4-x86_64-5.txz
--rw-r--r--  1 root root      197 2010-02-15 00:25 ./slackware64/l/libwmf-0.2.8.4-x86_64-5.txz.asc
--rw-r--r--  1 root root      305 2010-02-15 00:25 ./slackware64/l/libwmf-docs-0.2.8.4-noarch-5.txt
--rw-r--r--  1 root root   207316 2010-02-15 00:25 ./slackware64/l/libwmf-docs-0.2.8.4-noarch-5.txz
--rw-r--r--  1 root root      197 2010-02-15 00:25 ./slackware64/l/libwmf-docs-0.2.8.4-noarch-5.txz.asc
--rw-r--r--  1 root root      475 2010-02-12 08:17 ./slackware64/l/libwnck-2.28.0-x86_64-1.txt
--rw-r--r--  1 root root   339736 2010-02-12 08:17 ./slackware64/l/libwnck-2.28.0-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-12 08:17 ./slackware64/l/libwnck-2.28.0-x86_64-1.txz.asc
--rw-r--r--  1 root root      316 2008-10-20 20:14 ./slackware64/l/libwpd-0.8.14-x86_64-1.txt
--rw-r--r--  1 root root   198748 2008-10-20 20:14 ./slackware64/l/libwpd-0.8.14-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-20 20:14 ./slackware64/l/libwpd-0.8.14-x86_64-1.txz.asc
--rw-r--r--  1 root root      292 2010-02-12 00:23 ./slackware64/l/libxklavier-5.0-x86_64-1.txt
--rw-r--r--  1 root root    76000 2010-02-12 00:23 ./slackware64/l/libxklavier-5.0-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-12 00:23 ./slackware64/l/libxklavier-5.0-x86_64-1.txz.asc
--rw-r--r--  1 root root      522 2009-12-05 22:11 ./slackware64/l/libxml2-2.7.6-x86_64-1.txt
--rw-r--r--  1 root root  1390800 2009-12-05 22:11 ./slackware64/l/libxml2-2.7.6-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-12-05 22:11 ./slackware64/l/libxml2-2.7.6-x86_64-1.txz.asc
--rw-r--r--  1 root root      220 2009-12-05 22:16 ./slackware64/l/libxslt-1.1.26-x86_64-1.txt
--rw-r--r--  1 root root   408116 2009-12-05 22:16 ./slackware64/l/libxslt-1.1.26-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-12-05 22:16 ./slackware64/l/libxslt-1.1.26-x86_64-1.txz.asc
--rw-r--r--  1 root root      429 2009-08-16 22:11 ./slackware64/l/libzip-0.9-x86_64-2.txt
--rw-r--r--  1 root root    89568 2009-08-16 22:11 ./slackware64/l/libzip-0.9-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-08-16 22:11 ./slackware64/l/libzip-0.9-x86_64-2.txz.asc
--rw-r--r--  1 root root      440 2010-04-10 20:56 ./slackware64/l/loudmouth-1.4.3-x86_64-1.txt
--rw-r--r--  1 root root    76796 2010-04-10 20:56 ./slackware64/l/loudmouth-1.4.3-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-10 20:56 ./slackware64/l/loudmouth-1.4.3-x86_64-1.txz.asc
--rw-r--r--  1 root root      273 2008-10-10 09:38 ./slackware64/l/lzo-2.02-x86_64-1.txt
--rw-r--r--  1 root root    70632 2008-10-10 09:38 ./slackware64/l/lzo-2.02-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-10 09:38 ./slackware64/l/lzo-2.02-x86_64-1.txz.asc
--rw-r--r--  1 root root    13664 2010-05-14 04:09 ./slackware64/l/maketag
--rw-r--r--  1 root root    13664 2010-05-14 04:09 ./slackware64/l/maketag.ez
--rw-r--r--  1 root root      468 2008-10-10 09:43 ./slackware64/l/mhash-0.9.9-x86_64-1.txt
--rw-r--r--  1 root root   112176 2008-10-10 09:43 ./slackware64/l/mhash-0.9.9-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-10 09:43 ./slackware64/l/mhash-0.9.9-x86_64-1.txz.asc
--rw-r--r--  1 root root      550 2008-10-10 09:58 ./slackware64/l/mm-1.4.2-x86_64-2.txt
--rw-r--r--  1 root root    32612 2008-10-10 09:58 ./slackware64/l/mm-1.4.2-x86_64-2.txz
--rw-r--r--  1 root root      197 2008-10-10 09:58 ./slackware64/l/mm-1.4.2-x86_64-2.txz.asc
--rw-r--r--  1 root root      587 2010-02-24 02:36 ./slackware64/l/mpfr-2.4.2p03-x86_64-1.txt
--rw-r--r--  1 root root   267756 2010-02-24 02:36 ./slackware64/l/mpfr-2.4.2p03-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-24 02:36 ./slackware64/l/mpfr-2.4.2p03-x86_64-1.txz.asc
--rw-r--r--  1 root root      446 2009-05-23 03:58 ./slackware64/l/ncurses-5.7-x86_64-2.txt
--rw-r--r--  1 root root  1152080 2009-05-23 03:58 ./slackware64/l/ncurses-5.7-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-05-23 03:58 ./slackware64/l/ncurses-5.7-x86_64-2.txz.asc
--rw-r--r--  1 root root      343 2009-12-05 22:17 ./slackware64/l/neon-0.29.0-x86_64-1.txt
--rw-r--r--  1 root root   192576 2009-12-05 22:17 ./slackware64/l/neon-0.29.0-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-12-05 22:17 ./slackware64/l/neon-0.29.0-x86_64-1.txz.asc
--rw-r--r--  1 root root      231 2010-02-15 01:22 ./slackware64/l/netpbm-10.49.02-x86_64-1.txt
--rw-r--r--  1 root root  1629468 2010-02-15 01:22 ./slackware64/l/netpbm-10.49.02-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-15 01:22 ./slackware64/l/netpbm-10.49.02-x86_64-1.txz.asc
--rw-r--r--  1 root root      354 2010-02-20 18:25 ./slackware64/l/notify-python-0.1.1-x86_64-1.txt
--rw-r--r--  1 root root    18960 2010-02-20 18:25 ./slackware64/l/notify-python-0.1.1-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-20 18:25 ./slackware64/l/notify-python-0.1.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      457 2009-05-23 06:03 ./slackware64/l/openexr-1.6.1-x86_64-2.txt
--rw-r--r--  1 root root  2948284 2009-05-23 06:03 ./slackware64/l/openexr-1.6.1-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-05-23 06:03 ./slackware64/l/openexr-1.6.1-x86_64-2.txz.asc
--rw-r--r--  1 root root      429 2010-02-12 07:15 ./slackware64/l/pango-1.26.2-x86_64-1.txt
--rw-r--r--  1 root root   493356 2010-02-12 07:15 ./slackware64/l/pango-1.26.2-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-12 07:15 ./slackware64/l/pango-1.26.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      384 2010-03-13 00:56 ./slackware64/l/parted-2.2-x86_64-1.txt
--rw-r--r--  1 root root   508568 2010-03-13 00:56 ./slackware64/l/parted-2.2-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-03-13 00:56 ./slackware64/l/parted-2.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      364 2010-05-08 03:22 ./slackware64/l/pcre-8.02-x86_64-1.txt
--rw-r--r--  1 root root   401796 2010-05-08 03:22 ./slackware64/l/pcre-8.02-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-08 03:22 ./slackware64/l/pcre-8.02-x86_64-1.txz.asc
--rw-r--r--  1 root root      304 2010-05-04 01:22 ./slackware64/l/phonon-4.4.1-x86_64-1.txt
--rw-r--r--  1 root root   345140 2010-05-04 01:22 ./slackware64/l/phonon-4.4.1-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 01:22 ./slackware64/l/phonon-4.4.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      419 2010-02-14 23:52 ./slackware64/l/pil-1.1.7-x86_64-1.txt
--rw-r--r--  1 root root   365828 2010-02-14 23:52 ./slackware64/l/pil-1.1.7-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-14 23:52 ./slackware64/l/pil-1.1.7-x86_64-1.txz.asc
--rw-r--r--  1 root root      416 2010-05-02 08:12 ./slackware64/l/pilot-link-0.12.5-x86_64-1.txt
--rw-r--r--  1 root root   552880 2010-05-02 08:12 ./slackware64/l/pilot-link-0.12.5-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-02 08:12 ./slackware64/l/pilot-link-0.12.5-x86_64-1.txz.asc
--rw-r--r--  1 root root      450 2010-05-04 01:06 ./slackware64/l/polkit-1_14bdfd8-x86_64-1.txt
--rw-r--r--  1 root root   391808 2010-05-04 01:06 ./slackware64/l/polkit-1_14bdfd8-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 01:06 ./slackware64/l/polkit-1_14bdfd8-x86_64-1.txz.asc
--rw-r--r--  1 root root      367 2010-05-08 05:27 ./slackware64/l/polkit-gnome-0.96-x86_64-1.txt
--rw-r--r--  1 root root    85816 2010-05-08 05:27 ./slackware64/l/polkit-gnome-0.96-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-08 05:27 ./slackware64/l/polkit-gnome-0.96-x86_64-1.txz.asc
--rw-r--r--  1 root root      494 2010-02-18 22:46 ./slackware64/l/poppler-0.12.4-x86_64-1.txt
--rw-r--r--  1 root root   946936 2010-02-18 22:46 ./slackware64/l/poppler-0.12.4-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-18 22:46 ./slackware64/l/poppler-0.12.4-x86_64-1.txz.asc
--rw-r--r--  1 root root      601 2010-02-19 05:29 ./slackware64/l/poppler-data-0.4.0-noarch-1.txt
--rw-r--r--  1 root root  1492848 2010-02-19 05:29 ./slackware64/l/poppler-data-0.4.0-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-19 05:29 ./slackware64/l/poppler-data-0.4.0-noarch-1.txz.asc
--rw-r--r--  1 root root      592 2010-04-30 02:44 ./slackware64/l/popt-1.7-x86_64-3.txt
--rw-r--r--  1 root root    41380 2010-04-30 02:44 ./slackware64/l/popt-1.7-x86_64-3.txz
--rw-r--r--  1 root root      198 2010-04-30 02:44 ./slackware64/l/popt-1.7-x86_64-3.txz.asc
--rw-r--r--  1 root root      286 2010-02-16 05:05 ./slackware64/l/pycairo-1.8.8-x86_64-1.txt
--rw-r--r--  1 root root    44292 2010-02-16 05:05 ./slackware64/l/pycairo-1.8.8-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-16 05:05 ./slackware64/l/pycairo-1.8.8-x86_64-1.txz.asc
--rw-r--r--  1 root root      239 2010-02-17 20:51 ./slackware64/l/pycups-1.9.48-x86_64-1.txt
--rw-r--r--  1 root root    55492 2010-02-17 20:51 ./slackware64/l/pycups-1.9.48-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-17 20:51 ./slackware64/l/pycups-1.9.48-x86_64-1.txz.asc
--rw-r--r--  1 root root      398 2010-02-07 01:45 ./slackware64/l/pygobject-2.20.0-x86_64-1.txt
--rw-r--r--  1 root root   369704 2010-02-07 01:45 ./slackware64/l/pygobject-2.20.0-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-07 01:45 ./slackware64/l/pygobject-2.20.0-x86_64-1.txz.asc
--rw-r--r--  1 root root      320 2010-02-23 19:48 ./slackware64/l/pygtk-2.16.0-x86_64-1.txt
--rw-r--r--  1 root root  1659324 2010-02-23 19:48 ./slackware64/l/pygtk-2.16.0-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-23 19:48 ./slackware64/l/pygtk-2.16.0-x86_64-1.txz.asc
--rw-r--r--  1 root root      392 2009-04-30 21:22 ./slackware64/l/pyrex-0.9.8.5-x86_64-2.txt
--rw-r--r--  1 root root   234088 2009-04-30 21:22 ./slackware64/l/pyrex-0.9.8.5-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-04-30 21:22 ./slackware64/l/pyrex-0.9.8.5-x86_64-2.txz.asc
--rw-r--r--  1 root root      567 2009-11-03 22:37 ./slackware64/l/qca-2.0.2-x86_64-1.txt
--rw-r--r--  1 root root   543344 2009-11-03 22:37 ./slackware64/l/qca-2.0.2-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-11-03 22:37 ./slackware64/l/qca-2.0.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      280 2008-12-16 15:26 ./slackware64/l/qca-cyrus-sasl-2.0.0_beta3-x86_64-1.txt
--rw-r--r--  1 root root    25916 2008-12-16 15:26 ./slackware64/l/qca-cyrus-sasl-2.0.0_beta3-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-12-16 15:26 ./slackware64/l/qca-cyrus-sasl-2.0.0_beta3-x86_64-1.txz.asc
--rw-r--r--  1 root root      200 2008-12-16 15:29 ./slackware64/l/qca-gnupg-2.0.0_beta3-x86_64-1.txt
--rw-r--r--  1 root root    83252 2008-12-16 15:29 ./slackware64/l/qca-gnupg-2.0.0_beta3-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-12-16 15:29 ./slackware64/l/qca-gnupg-2.0.0_beta3-x86_64-1.txz.asc
--rw-r--r--  1 root root      493 2008-12-16 15:39 ./slackware64/l/qca-ossl-2.0.0_beta3-x86_64-1.txt
--rw-r--r--  1 root root    92288 2008-12-16 15:39 ./slackware64/l/qca-ossl-2.0.0_beta3-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-12-16 15:39 ./slackware64/l/qca-ossl-2.0.0_beta3-x86_64-1.txz.asc
--rw-r--r--  1 root root      395 2009-04-03 19:40 ./slackware64/l/qimageblitz-r948358-x86_64-1.txt
--rw-r--r--  1 root root    70036 2009-04-03 19:40 ./slackware64/l/qimageblitz-r948358-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-04-03 19:40 ./slackware64/l/qimageblitz-r948358-x86_64-1.txz.asc
--rw-r--r--  1 root root      266 2010-05-04 01:40 ./slackware64/l/qt-4.6.2_2d3d3e5-x86_64-1.txt
--rw-r--r--  1 root root 50348364 2010-05-04 01:40 ./slackware64/l/qt-4.6.2_2d3d3e5-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 01:40 ./slackware64/l/qt-4.6.2_2d3d3e5-x86_64-1.txz.asc
--rw-r--r--  1 root root      488 2010-02-19 01:59 ./slackware64/l/qtscriptgenerator-0.1.0-x86_64-2.txt
--rw-r--r--  1 root root  3635940 2010-02-19 01:59 ./slackware64/l/qtscriptgenerator-0.1.0-x86_64-2.txz
--rw-r--r--  1 root root      197 2010-02-19 01:59 ./slackware64/l/qtscriptgenerator-0.1.0-x86_64-2.txz.asc
--rw-r--r--  1 root root      545 2010-03-05 21:45 ./slackware64/l/raptor-1.4.21-x86_64-1.txt
--rw-r--r--  1 root root   319968 2010-03-05 21:45 ./slackware64/l/raptor-1.4.21-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-03-05 21:45 ./slackware64/l/raptor-1.4.21-x86_64-1.txz.asc
--rw-r--r--  1 root root      428 2010-05-04 01:40 ./slackware64/l/rasqal-0.9.19-x86_64-1.txt
--rw-r--r--  1 root root   218312 2010-05-04 01:40 ./slackware64/l/rasqal-0.9.19-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 01:40 ./slackware64/l/rasqal-0.9.19-x86_64-1.txz.asc
--rw-r--r--  1 root root      559 2009-02-22 15:40 ./slackware64/l/readline-5.2-x86_64-4.txt
--rw-r--r--  1 root root   280136 2009-02-22 15:40 ./slackware64/l/readline-5.2-x86_64-4.txz
--rw-r--r--  1 root root      197 2009-02-22 15:40 ./slackware64/l/readline-5.2-x86_64-4.txz.asc
--rw-r--r--  1 root root      528 2010-05-04 01:41 ./slackware64/l/redland-1.0.10-x86_64-1.txt
--rw-r--r--  1 root root   269104 2010-05-04 01:41 ./slackware64/l/redland-1.0.10-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 01:41 ./slackware64/l/redland-1.0.10-x86_64-1.txz.asc
--rw-r--r--  1 root root      487 2010-03-25 21:52 ./slackware64/l/sdl-1.2.14-x86_64-2.txt
--rw-r--r--  1 root root   663140 2010-03-25 21:52 ./slackware64/l/sdl-1.2.14-x86_64-2.txz
--rw-r--r--  1 root root      198 2010-03-25 21:52 ./slackware64/l/sdl-1.2.14-x86_64-2.txz.asc
--rw-r--r--  1 root root      782 2010-04-02 20:02 ./slackware64/l/seamonkey-solibs-2.0.4-x86_64-1.txt
--rw-r--r--  1 root root  1213436 2010-04-02 20:02 ./slackware64/l/seamonkey-solibs-2.0.4-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-02 20:02 ./slackware64/l/seamonkey-solibs-2.0.4-x86_64-1.txz.asc
--rw-r--r--  1 root root      642 2010-05-05 23:33 ./slackware64/l/shared-desktop-ontologies-0.3-x86_64-1.txt
--rw-r--r--  1 root root    89836 2010-05-05 23:33 ./slackware64/l/shared-desktop-ontologies-0.3-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-05 23:33 ./slackware64/l/shared-desktop-ontologies-0.3-x86_64-1.txz.asc
--rw-r--r--  1 root root      512 2010-04-30 05:10 ./slackware64/l/shared-mime-info-0.71-x86_64-1.txt
--rw-r--r--  1 root root   314792 2010-04-30 05:10 ./slackware64/l/shared-mime-info-0.71-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-30 05:10 ./slackware64/l/shared-mime-info-0.71-x86_64-1.txz.asc
--rw-r--r--  1 root root      395 2010-05-04 01:41 ./slackware64/l/sip-4.10.2-x86_64-1.txt
--rw-r--r--  1 root root   314336 2010-05-04 01:41 ./slackware64/l/sip-4.10.2-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 01:41 ./slackware64/l/sip-4.10.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      538 2010-02-18 23:07 ./slackware64/l/slang-2.2.2-x86_64-1.txt
--rw-r--r--  1 root root   393412 2010-02-18 23:07 ./slackware64/l/slang-2.2.2-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-18 23:07 ./slackware64/l/slang-2.2.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      549 2008-10-13 21:08 ./slackware64/l/slang1-1.4.9-x86_64-1.txt
--rw-r--r--  1 root root   191920 2008-10-13 21:08 ./slackware64/l/slang1-1.4.9-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-13 21:08 ./slackware64/l/slang1-1.4.9-x86_64-1.txz.asc
--rw-r--r--  1 root root      389 2010-05-04 01:42 ./slackware64/l/soprano-2.4.3-x86_64-1.txt
--rw-r--r--  1 root root   595504 2010-05-04 01:42 ./slackware64/l/soprano-2.4.3-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 01:42 ./slackware64/l/soprano-2.4.3-x86_64-1.txz.asc
--rw-r--r--  1 root root      359 2010-02-06 03:36 ./slackware64/l/startup-notification-0.10-x86_64-1.txt
--rw-r--r--  1 root root    29620 2010-02-06 03:36 ./slackware64/l/startup-notification-0.10-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-06 03:36 ./slackware64/l/startup-notification-0.10-x86_64-1.txz.asc
--rw-r--r--  1 root root      509 2010-02-08 23:15 ./slackware64/l/strigi-0.7.2-x86_64-1.txt
--rw-r--r--  1 root root   675980 2010-02-08 23:15 ./slackware64/l/strigi-0.7.2-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-08 23:15 ./slackware64/l/strigi-0.7.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      344 2009-03-10 11:44 ./slackware64/l/svgalib-1.9.25-x86_64-2.txt
--rw-r--r--  1 root root   596412 2009-03-10 11:44 ./slackware64/l/svgalib-1.9.25-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-03-10 11:44 ./slackware64/l/svgalib-1.9.25-x86_64-2.txz.asc
--rw-r--r--  1 root root      745 2010-05-18 20:25 ./slackware64/l/system-config-printer-1.2.2-x86_64-1.txt
--rw-r--r--  1 root root   572004 2010-05-18 20:25 ./slackware64/l/system-config-printer-1.2.2-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-18 20:25 ./slackware64/l/system-config-printer-1.2.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      357 2009-06-09 00:44 ./slackware64/l/t1lib-5.1.2-x86_64-1.txt
--rw-r--r--  1 root root   932020 2009-06-09 00:44 ./slackware64/l/t1lib-5.1.2-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-06-09 00:44 ./slackware64/l/t1lib-5.1.2-x86_64-1.txz.asc
--rw-r--r--  1 root root     2394 2010-05-14 04:09 ./slackware64/l/tagfile
--rw-r--r--  1 root root      340 2010-04-10 19:53 ./slackware64/l/taglib-1.6.2-x86_64-1.txt
--rw-r--r--  1 root root   234272 2010-04-10 19:53 ./slackware64/l/taglib-1.6.2-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-10 19:53 ./slackware64/l/taglib-1.6.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      521 2009-10-03 00:39 ./slackware64/l/taglib-extras-1.0.1-x86_64-1.txt
--rw-r--r--  1 root root    28432 2009-10-03 00:39 ./slackware64/l/taglib-extras-1.0.1-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-10-03 00:39 ./slackware64/l/taglib-extras-1.0.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      523 2009-03-06 09:44 ./slackware64/l/tango-icon-theme-0.8.90-noarch-1.txt
--rw-r--r--  1 root root  1245240 2009-03-06 09:44 ./slackware64/l/tango-icon-theme-0.8.90-noarch-1.txz
--rw-r--r--  1 root root      197 2009-03-06 09:44 ./slackware64/l/tango-icon-theme-0.8.90-noarch-1.txz.asc
--rw-r--r--  1 root root      541 2008-10-23 08:28 ./slackware64/l/tango-icon-theme-extras-0.1.0-noarch-1.txt
--rw-r--r--  1 root root    55540 2008-10-23 08:28 ./slackware64/l/tango-icon-theme-extras-0.1.0-noarch-1.txz
--rw-r--r--  1 root root      197 2008-10-23 08:28 ./slackware64/l/tango-icon-theme-extras-0.1.0-noarch-1.txz.asc
--rw-r--r--  1 root root      386 2010-01-27 20:40 ./slackware64/l/urwid-0.9.9.1-x86_64-1.txt
--rw-r--r--  1 root root   251080 2010-01-27 20:40 ./slackware64/l/urwid-0.9.9.1-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-01-27 20:40 ./slackware64/l/urwid-0.9.9.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      571 2010-05-14 03:56 ./slackware64/l/v4l-utils-0.8.0-x86_64-1.txt
--rw-r--r--  1 root root   212436 2010-05-14 03:56 ./slackware64/l/v4l-utils-0.8.0-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-14 03:56 ./slackware64/l/v4l-utils-0.8.0-x86_64-1.txz.asc
--rw-r--r--  1 root root      427 2010-05-04 01:44 ./slackware64/l/virtuoso-ose-6.1.1-x86_64-1.txt
--rw-r--r--  1 root root  6960216 2010-05-04 01:44 ./slackware64/l/virtuoso-ose-6.1.1-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-04 01:44 ./slackware64/l/virtuoso-ose-6.1.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      256 2010-04-30 04:20 ./slackware64/l/vte-0.24.1-x86_64-1.txt
--rw-r--r--  1 root root   374572 2010-04-30 04:20 ./slackware64/l/vte-0.24.1-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-30 04:20 ./slackware64/l/vte-0.24.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      381 2008-10-13 21:17 ./slackware64/l/wavpack-4.41.0-x86_64-1.txt
--rw-r--r--  1 root root   100568 2008-10-13 21:17 ./slackware64/l/wavpack-4.41.0-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-13 21:17 ./slackware64/l/wavpack-4.41.0-x86_64-1.txz.asc
--rw-r--r--  1 root root      422 2009-12-17 02:12 ./slackware64/l/wv2-0.4.2-x86_64-1.txt
--rw-r--r--  1 root root   263140 2009-12-17 02:12 ./slackware64/l/wv2-0.4.2-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-12-17 02:12 ./slackware64/l/wv2-0.4.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      359 2008-09-21 08:11 ./slackware64/l/zlib-1.2.3-x86_64-2.txt
--rw-r--r--  1 root root    83180 2008-09-21 08:11 ./slackware64/l/zlib-1.2.3-x86_64-2.txz
--rw-r--r--  1 root root      197 2008-09-21 08:11 ./slackware64/l/zlib-1.2.3-x86_64-2.txz.asc
-drwxr-xr-x  2 root root    24576 2010-05-19 03:14 ./slackware64/n
--rw-r--r--  1 root root      645 2010-03-06 03:08 ./slackware64/n/alpine-2.00-x86_64-3.txt
--rw-r--r--  1 root root  1937736 2010-03-06 03:08 ./slackware64/n/alpine-2.00-x86_64-3.txz
--rw-r--r--  1 root root      198 2010-03-06 03:08 ./slackware64/n/alpine-2.00-x86_64-3.txz.asc
--rw-r--r--  1 root root      416 2010-03-05 23:03 ./slackware64/n/autofs-5.0.5-x86_64-1.txt
--rw-r--r--  1 root root   304952 2010-03-05 23:03 ./slackware64/n/autofs-5.0.5-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-03-05 23:03 ./slackware64/n/autofs-5.0.5-x86_64-1.txz.asc
--rw-r--r--  1 root root      686 2008-10-23 23:09 ./slackware64/n/biff+comsat-0.17-x86_64-1.txt
--rw-r--r--  1 root root    10972 2008-10-23 23:09 ./slackware64/n/biff+comsat-0.17-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-23 23:09 ./slackware64/n/biff+comsat-0.17-x86_64-1.txz.asc
--rw-r--r--  1 root root      336 2009-11-27 20:56 ./slackware64/n/bind-9.4.3_P4-x86_64-1.txt
--rw-r--r--  1 root root  1679348 2009-11-27 20:56 ./slackware64/n/bind-9.4.3_P4-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-11-27 20:56 ./slackware64/n/bind-9.4.3_P4-x86_64-1.txz.asc
--rw-r--r--  1 root root      347 2010-05-02 08:11 ./slackware64/n/bluez-4.64-x86_64-1.txt
--rw-r--r--  1 root root   452308 2010-05-02 08:11 ./slackware64/n/bluez-4.64-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-02 08:11 ./slackware64/n/bluez-4.64-x86_64-1.txz.asc
--rw-r--r--  1 root root      367 2008-10-23 23:26 ./slackware64/n/bluez-firmware-1.2-x86_64-1.txt
--rw-r--r--  1 root root    71980 2008-10-23 23:26 ./slackware64/n/bluez-firmware-1.2-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-23 23:26 ./slackware64/n/bluez-firmware-1.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      445 2010-05-02 08:11 ./slackware64/n/bluez-hcidump-1.42-x86_64-3.txt
--rw-r--r--  1 root root    85692 2010-05-02 08:11 ./slackware64/n/bluez-hcidump-1.42-x86_64-3.txz
--rw-r--r--  1 root root      198 2010-05-02 08:11 ./slackware64/n/bluez-hcidump-1.42-x86_64-3.txz.asc
--rw-r--r--  1 root root      420 2008-10-14 11:45 ./slackware64/n/bootp-2.4.3-x86_64-2.txt
--rw-r--r--  1 root root    49328 2008-10-14 11:45 ./slackware64/n/bootp-2.4.3-x86_64-2.txz
--rw-r--r--  1 root root      197 2008-10-14 11:45 ./slackware64/n/bootp-2.4.3-x86_64-2.txz.asc
--rw-r--r--  1 root root      591 2008-11-30 11:29 ./slackware64/n/bridge-utils-1.2-x86_64-2.txt
--rw-r--r--  1 root root    28392 2008-11-30 11:29 ./slackware64/n/bridge-utils-1.2-x86_64-2.txz
--rw-r--r--  1 root root      197 2008-11-30 11:29 ./slackware64/n/bridge-utils-1.2-x86_64-2.txz.asc
--rw-r--r--  1 root root      613 2008-10-25 11:36 ./slackware64/n/bsd-finger-0.17-x86_64-1.txt
--rw-r--r--  1 root root    18984 2008-10-25 11:36 ./slackware64/n/bsd-finger-0.17-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-25 11:36 ./slackware64/n/bsd-finger-0.17-x86_64-1.txz.asc
--rw-r--r--  1 root root      415 2010-05-03 01:19 ./slackware64/n/crda-1.1.1-x86_64-1.txt
--rw-r--r--  1 root root    13484 2010-05-03 01:19 ./slackware64/n/crda-1.1.1-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-03 01:19 ./slackware64/n/crda-1.1.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      555 2010-04-29 01:30 ./slackware64/n/curl-7.20.1-x86_64-1.txt
--rw-r--r--  1 root root   665452 2010-04-29 01:30 ./slackware64/n/curl-7.20.1-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-29 01:30 ./slackware64/n/curl-7.20.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      375 2009-05-15 17:09 ./slackware64/n/cyrus-sasl-2.1.23-x86_64-1.txt
--rw-r--r--  1 root root   413528 2009-05-15 17:09 ./slackware64/n/cyrus-sasl-2.1.23-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-05-15 17:09 ./slackware64/n/cyrus-sasl-2.1.23-x86_64-1.txz.asc
--rw-r--r--  1 root root      644 2010-03-13 00:20 ./slackware64/n/dhcp-4.1.1-x86_64-2.txt
--rw-r--r--  1 root root   617572 2010-03-13 00:20 ./slackware64/n/dhcp-4.1.1-x86_64-2.txz
--rw-r--r--  1 root root      198 2010-03-13 00:20 ./slackware64/n/dhcp-4.1.1-x86_64-2.txz.asc
--rw-r--r--  1 root root      443 2010-04-30 01:55 ./slackware64/n/dhcpcd-5.2.2-x86_64-1.txt
--rw-r--r--  1 root root    60212 2010-04-30 01:55 ./slackware64/n/dhcpcd-5.2.2-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-30 01:55 ./slackware64/n/dhcpcd-5.2.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      494 2010-03-05 20:25 ./slackware64/n/dirmngr-1.0.3-x86_64-2.txt
--rw-r--r--  1 root root   211600 2010-03-05 20:25 ./slackware64/n/dirmngr-1.0.3-x86_64-2.txz
--rw-r--r--  1 root root      198 2010-03-05 20:25 ./slackware64/n/dirmngr-1.0.3-x86_64-2.txz.asc
--rw-r--r--  1 root root      396 2010-02-11 21:47 ./slackware64/n/dnsmasq-2.52-x86_64-1.txt
--rw-r--r--  1 root root   210924 2010-02-11 21:47 ./slackware64/n/dnsmasq-2.52-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-11 21:47 ./slackware64/n/dnsmasq-2.52-x86_64-1.txz.asc
--rw-r--r--  1 root root      224 2009-08-13 19:06 ./slackware64/n/elm-2.5.8-x86_64-3.txt
--rw-r--r--  1 root root   254788 2009-08-13 19:06 ./slackware64/n/elm-2.5.8-x86_64-3.txz
--rw-r--r--  1 root root      197 2009-08-13 19:06 ./slackware64/n/elm-2.5.8-x86_64-3.txz.asc
--rw-r--r--  1 root root      321 2010-05-17 19:25 ./slackware64/n/epic5-1.1.2-x86_64-1.txt
--rw-r--r--  1 root root   706312 2010-05-17 19:25 ./slackware64/n/epic5-1.1.2-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-17 19:25 ./slackware64/n/epic5-1.1.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      441 2010-05-03 01:28 ./slackware64/n/ethtool-2.6.33-x86_64-1.txt
--rw-r--r--  1 root root    61900 2010-05-03 01:28 ./slackware64/n/ethtool-2.6.33-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-03 01:28 ./slackware64/n/ethtool-2.6.33-x86_64-1.txz.asc
--rw-r--r--  1 root root      607 2010-05-16 05:40 ./slackware64/n/fetchmail-6.3.17-x86_64-1.txt
--rw-r--r--  1 root root   570892 2010-05-16 05:40 ./slackware64/n/fetchmail-6.3.17-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-16 05:40 ./slackware64/n/fetchmail-6.3.17-x86_64-1.txz.asc
--rw-r--r--  1 root root      363 2010-05-03 01:46 ./slackware64/n/getmail-4.17.0-x86_64-1.txt
--rw-r--r--  1 root root   144744 2010-05-03 01:46 ./slackware64/n/getmail-4.17.0-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-03 01:46 ./slackware64/n/getmail-4.17.0-x86_64-1.txz.asc
--rw-r--r--  1 root root      371 2010-03-05 23:42 ./slackware64/n/gnupg-1.4.10-x86_64-1.txt
--rw-r--r--  1 root root  1129148 2010-03-05 23:42 ./slackware64/n/gnupg-1.4.10-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-03-05 23:42 ./slackware64/n/gnupg-1.4.10-x86_64-1.txz.asc
--rw-r--r--  1 root root      601 2010-03-06 01:05 ./slackware64/n/gnupg2-2.0.14-x86_64-2.txt
--rw-r--r--  1 root root  1629912 2010-03-06 01:05 ./slackware64/n/gnupg2-2.0.14-x86_64-2.txz
--rw-r--r--  1 root root      198 2010-03-06 01:05 ./slackware64/n/gnupg2-2.0.14-x86_64-2.txz.asc
--rw-r--r--  1 root root      493 2010-04-10 20:15 ./slackware64/n/gnutls-2.8.6-x86_64-1.txt
--rw-r--r--  1 root root  1520468 2010-04-10 20:15 ./slackware64/n/gnutls-2.8.6-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-10 20:15 ./slackware64/n/gnutls-2.8.6-x86_64-1.txz.asc
--rw-r--r--  1 root root      287 2008-10-20 21:14 ./slackware64/n/gpa-0.7.5-x86_64-1.txt
--rw-r--r--  1 root root   185464 2008-10-20 21:14 ./slackware64/n/gpa-0.7.5-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-20 21:14 ./slackware64/n/gpa-0.7.5-x86_64-1.txz.asc
--rw-r--r--  1 root root      539 2010-03-06 01:03 ./slackware64/n/gpgme-1.2.0-x86_64-1.txt
--rw-r--r--  1 root root   251412 2010-03-06 01:03 ./slackware64/n/gpgme-1.2.0-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-03-06 01:03 ./slackware64/n/gpgme-1.2.0-x86_64-1.txz.asc
--rw-r--r--  1 root root      435 2008-10-15 16:36 ./slackware64/n/htdig-3.2.0b6-x86_64-3.txt
--rw-r--r--  1 root root   939096 2008-10-15 16:36 ./slackware64/n/htdig-3.2.0b6-x86_64-3.txz
--rw-r--r--  1 root root      197 2008-10-15 16:36 ./slackware64/n/htdig-3.2.0b6-x86_64-3.txz.asc
--rw-r--r--  1 root root      514 2010-03-08 19:37 ./slackware64/n/httpd-2.2.15-x86_64-1.txt
--rw-r--r--  1 root root  1468228 2010-03-08 19:37 ./slackware64/n/httpd-2.2.15-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-03-08 19:37 ./slackware64/n/httpd-2.2.15-x86_64-1.txz.asc
--rw-r--r--  1 root root      366 2008-10-25 12:08 ./slackware64/n/icmpinfo-1.11-x86_64-1.txt
--rw-r--r--  1 root root     9396 2008-10-25 12:08 ./slackware64/n/icmpinfo-1.11-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-25 12:08 ./slackware64/n/icmpinfo-1.11-x86_64-1.txz.asc
--rw-r--r--  1 root root      293 2009-05-23 04:11 ./slackware64/n/imapd-2.00-x86_64-2.txt
--rw-r--r--  1 root root   466172 2009-05-23 04:11 ./slackware64/n/imapd-2.00-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-05-23 04:11 ./slackware64/n/imapd-2.00-x86_64-2.txz.asc
--rw-r--r--  1 root root      454 2008-10-14 15:47 ./slackware64/n/inetd-1.79s-x86_64-8.txt
--rw-r--r--  1 root root    20976 2008-10-14 15:47 ./slackware64/n/inetd-1.79s-x86_64-8.txz
--rw-r--r--  1 root root      197 2008-10-14 15:47 ./slackware64/n/inetd-1.79s-x86_64-8.txz.asc
--rwxr-xr-x  1 root root     2897 2009-06-24 22:06 ./slackware64/n/install-packages
--rw-r--r--  1 root root      446 2006-09-18 10:41 ./slackware64/n/install.end
--rw-r--r--  1 root root      478 2010-03-13 00:52 ./slackware64/n/iproute2-2.6.33-x86_64-1.txt
--rw-r--r--  1 root root   381976 2010-03-13 00:52 ./slackware64/n/iproute2-2.6.33-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-03-13 00:52 ./slackware64/n/iproute2-2.6.33-x86_64-1.txz.asc
--rw-r--r--  1 root root      670 2010-03-13 00:21 ./slackware64/n/iptables-1.4.7-x86_64-1.txt
--rw-r--r--  1 root root   276548 2010-03-13 00:21 ./slackware64/n/iptables-1.4.7-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-03-13 00:21 ./slackware64/n/iptables-1.4.7-x86_64-1.txz.asc
--rw-r--r--  1 root root      549 2009-05-23 04:39 ./slackware64/n/iptraf-3.0.0-x86_64-3.txt
--rw-r--r--  1 root root   280608 2009-05-23 04:39 ./slackware64/n/iptraf-3.0.0-x86_64-3.txz
--rw-r--r--  1 root root      197 2009-05-23 04:39 ./slackware64/n/iptraf-3.0.0-x86_64-3.txz.asc
--rw-r--r--  1 root root      423 2010-05-10 08:07 ./slackware64/n/iputils-s20100418-x86_64-1.txt
--rw-r--r--  1 root root    76096 2010-05-10 08:07 ./slackware64/n/iputils-s20100418-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-10 08:07 ./slackware64/n/iputils-s20100418-x86_64-1.txz.asc
--rw-r--r--  1 root root      479 2008-11-04 11:29 ./slackware64/n/ipw2100-fw-1.3-fw-1.txt
--rw-r--r--  1 root root   119440 2008-11-04 11:29 ./slackware64/n/ipw2100-fw-1.3-fw-1.txz
--rw-r--r--  1 root root      197 2008-11-04 11:29 ./slackware64/n/ipw2100-fw-1.3-fw-1.txz.asc
--rw-r--r--  1 root root      532 2010-05-03 03:32 ./slackware64/n/ipw2200-fw-3.1-fw-1.txt
--rw-r--r--  1 root root   118824 2010-05-03 03:32 ./slackware64/n/ipw2200-fw-3.1-fw-1.txz
--rw-r--r--  1 root root      198 2010-05-03 03:32 ./slackware64/n/ipw2200-fw-3.1-fw-1.txz.asc
--rw-r--r--  1 root root      333 2010-04-22 03:51 ./slackware64/n/irssi-0.8.15-x86_64-1.txt
--rw-r--r--  1 root root  1107648 2010-04-22 03:51 ./slackware64/n/irssi-0.8.15-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-22 03:51 ./slackware64/n/irssi-0.8.15-x86_64-1.txz.asc
--rw-r--r--  1 root root      426 2009-06-12 23:55 ./slackware64/n/iw-0.9.14-x86_64-1.txt
--rw-r--r--  1 root root    24904 2009-06-12 23:55 ./slackware64/n/iw-0.9.14-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-06-12 23:55 ./slackware64/n/iw-0.9.14-x86_64-1.txz.asc
--rw-r--r--  1 root root      484 2010-05-03 03:38 ./slackware64/n/iwlwifi-1000-ucode-128.50.3.1-fw-1.txt
--rw-r--r--  1 root root   115892 2010-05-03 03:38 ./slackware64/n/iwlwifi-1000-ucode-128.50.3.1-fw-1.txz
--rw-r--r--  1 root root      198 2010-05-03 03:38 ./slackware64/n/iwlwifi-1000-ucode-128.50.3.1-fw-1.txz.asc
--rw-r--r--  1 root root      518 2009-07-01 18:12 ./slackware64/n/iwlwifi-3945-ucode-15.32.2.9-fw-1.txt
--rw-r--r--  1 root root    65720 2009-07-01 18:12 ./slackware64/n/iwlwifi-3945-ucode-15.32.2.9-fw-1.txz
--rw-r--r--  1 root root      197 2009-07-01 18:12 ./slackware64/n/iwlwifi-3945-ucode-15.32.2.9-fw-1.txz.asc
--rw-r--r--  1 root root      518 2009-07-16 00:54 ./slackware64/n/iwlwifi-4965-ucode-228.61.2.24-fw-1.txt
--rw-r--r--  1 root root    77788 2009-07-16 00:54 ./slackware64/n/iwlwifi-4965-ucode-228.61.2.24-fw-1.txz
--rw-r--r--  1 root root      197 2009-07-16 00:54 ./slackware64/n/iwlwifi-4965-ucode-228.61.2.24-fw-1.txz.asc
--rw-r--r--  1 root root      512 2009-07-01 18:12 ./slackware64/n/iwlwifi-5000-ucode-8.24.2.12-fw-1.txt
--rw-r--r--  1 root root   197848 2009-07-01 18:12 ./slackware64/n/iwlwifi-5000-ucode-8.24.2.12-fw-1.txz
--rw-r--r--  1 root root      197 2009-07-01 18:12 ./slackware64/n/iwlwifi-5000-ucode-8.24.2.12-fw-1.txz.asc
--rw-r--r--  1 root root      509 2009-07-15 01:51 ./slackware64/n/iwlwifi-5150-ucode-8.24.2.2-fw-1.txt
--rw-r--r--  1 root root   115588 2009-07-15 01:51 ./slackware64/n/iwlwifi-5150-ucode-8.24.2.2-fw-1.txz
--rw-r--r--  1 root root      197 2009-07-15 01:51 ./slackware64/n/iwlwifi-5150-ucode-8.24.2.2-fw-1.txz.asc
--rw-r--r--  1 root root      484 2010-05-03 03:43 ./slackware64/n/iwlwifi-6000-ucode-9.193.4.1-fw-1.txt
--rw-r--r--  1 root root   137572 2010-05-03 03:43 ./slackware64/n/iwlwifi-6000-ucode-9.193.4.1-fw-1.txz
--rw-r--r--  1 root root      198 2010-05-03 03:43 ./slackware64/n/iwlwifi-6000-ucode-9.193.4.1-fw-1.txz.asc
--rw-r--r--  1 root root      582 2010-04-30 00:21 ./slackware64/n/lftp-4.0.7-x86_64-1.txt
--rw-r--r--  1 root root   692932 2010-04-30 00:21 ./slackware64/n/lftp-4.0.7-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-30 00:21 ./slackware64/n/lftp-4.0.7-x86_64-1.txz.asc
--rw-r--r--  1 root root      252 2010-03-06 00:55 ./slackware64/n/libassuan-1.0.5-x86_64-1.txt
--rw-r--r--  1 root root    99256 2010-03-06 00:55 ./slackware64/n/libassuan-1.0.5-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-03-06 00:55 ./slackware64/n/libassuan-1.0.5-x86_64-1.txz.asc
--rw-r--r--  1 root root      245 2010-05-05 05:37 ./slackware64/n/libgcrypt-1.4.5-x86_64-2.txt
--rw-r--r--  1 root root   398748 2010-05-05 05:37 ./slackware64/n/libgcrypt-1.4.5-x86_64-2.txz
--rw-r--r--  1 root root      198 2010-05-05 05:37 ./slackware64/n/libgcrypt-1.4.5-x86_64-2.txz.asc
--rw-r--r--  1 root root      393 2010-05-05 05:42 ./slackware64/n/libgpg-error-1.7-x86_64-2.txt
--rw-r--r--  1 root root    69904 2010-05-05 05:42 ./slackware64/n/libgpg-error-1.7-x86_64-2.txz
--rw-r--r--  1 root root      198 2010-05-05 05:42 ./slackware64/n/libgpg-error-1.7-x86_64-2.txz.asc
--rw-r--r--  1 root root      332 2010-03-06 00:33 ./slackware64/n/libksba-1.0.7-x86_64-1.txt
--rw-r--r--  1 root root   129080 2010-03-06 00:33 ./slackware64/n/libksba-1.0.7-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-03-06 00:33 ./slackware64/n/libksba-1.0.7-x86_64-1.txz.asc
--rw-r--r--  1 root root      446 2010-02-18 20:46 ./slackware64/n/links-2.3pre1-x86_64-1.txt
--rw-r--r--  1 root root  1869348 2010-02-18 20:46 ./slackware64/n/links-2.3pre1-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-18 20:46 ./slackware64/n/links-2.3pre1-x86_64-1.txz.asc
--rw-r--r--  1 root root      498 2010-02-12 01:57 ./slackware64/n/lynx-2.8.7-x86_64-1.txt
--rw-r--r--  1 root root  1615412 2010-02-12 01:57 ./slackware64/n/lynx-2.8.7-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-12 01:57 ./slackware64/n/lynx-2.8.7-x86_64-1.txz.asc
--rw-r--r--  1 root root      567 2009-08-11 01:02 ./slackware64/n/mailx-12.4-x86_64-1.txt
--rw-r--r--  1 root root   240064 2009-08-11 01:02 ./slackware64/n/mailx-12.4-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-08-11 01:02 ./slackware64/n/mailx-12.4-x86_64-1.txz.asc
--rw-r--r--  1 root root    10104 2010-05-17 19:48 ./slackware64/n/maketag
--rw-r--r--  1 root root    10104 2010-05-17 19:48 ./slackware64/n/maketag.ez
--rw-r--r--  1 root root      418 2010-04-22 19:24 ./slackware64/n/mcabber-0.10.0-x86_64-1.txt
--rw-r--r--  1 root root   217856 2010-04-22 19:24 ./slackware64/n/mcabber-0.10.0-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-22 19:24 ./slackware64/n/mcabber-0.10.0-x86_64-1.txz.asc
--rw-r--r--  1 root root      468 2009-05-23 04:44 ./slackware64/n/metamail-2.7-x86_64-4.txt
--rw-r--r--  1 root root   125932 2009-05-23 04:44 ./slackware64/n/metamail-2.7-x86_64-4.txz
--rw-r--r--  1 root root      197 2009-05-23 04:44 ./slackware64/n/metamail-2.7-x86_64-4.txz.asc
--rw-r--r--  1 root root      325 2010-05-03 03:51 ./slackware64/n/mtr-0.75-x86_64-1.txt
--rw-r--r--  1 root root    53848 2010-05-03 03:51 ./slackware64/n/mtr-0.75-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-03 03:51 ./slackware64/n/mtr-0.75-x86_64-1.txz.asc
--rw-r--r--  1 root root      411 2009-05-23 04:45 ./slackware64/n/mutt-1.4.2.3-x86_64-2.txt
--rw-r--r--  1 root root   702520 2009-05-23 04:45 ./slackware64/n/mutt-1.4.2.3-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-05-23 04:45 ./slackware64/n/mutt-1.4.2.3-x86_64-2.txz.asc
--rw-r--r--  1 root root      628 2008-10-28 20:33 ./slackware64/n/nc-1.10-x86_64-1.txt
--rw-r--r--  1 root root    53592 2008-10-28 20:33 ./slackware64/n/nc-1.10-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-28 20:33 ./slackware64/n/nc-1.10-x86_64-1.txz.asc
--rw-r--r--  1 root root      337 2010-05-03 05:25 ./slackware64/n/ncftp-3.2.4-x86_64-1.txt
--rw-r--r--  1 root root   271316 2010-05-03 05:25 ./slackware64/n/ncftp-3.2.4-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-03 05:25 ./slackware64/n/ncftp-3.2.4-x86_64-1.txz.asc
--rw-r--r--  1 root root      451 2010-01-12 23:47 ./slackware64/n/net-snmp-5.5-x86_64-2.txt
--rw-r--r--  1 root root  1952068 2010-01-12 23:47 ./slackware64/n/net-snmp-5.5-x86_64-2.txz
--rw-r--r--  1 root root      197 2010-01-12 23:47 ./slackware64/n/net-snmp-5.5-x86_64-2.txz.asc
--rw-r--r--  1 root root      449 2008-09-28 16:04 ./slackware64/n/net-tools-1.60-x86_64-2.txt
--rw-r--r--  1 root root   120592 2008-09-28 16:04 ./slackware64/n/net-tools-1.60-x86_64-2.txz
--rw-r--r--  1 root root      197 2008-09-28 16:04 ./slackware64/n/net-tools-1.60-x86_64-2.txz.asc
--rw-r--r--  1 root root      581 2010-02-17 20:49 ./slackware64/n/netatalk-2.0.5-x86_64-1.txt
--rw-r--r--  1 root root   480208 2010-02-17 20:49 ./slackware64/n/netatalk-2.0.5-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-17 20:49 ./slackware64/n/netatalk-2.0.5-x86_64-1.txz.asc
--rw-r--r--  1 root root      649 2008-10-28 20:59 ./slackware64/n/netdate-bsd4-x86_64-1.txt
--rw-r--r--  1 root root     8812 2008-10-28 20:59 ./slackware64/n/netdate-bsd4-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-28 20:59 ./slackware64/n/netdate-bsd4-x86_64-1.txz.asc
--rw-r--r--  1 root root      518 2009-05-23 04:52 ./slackware64/n/netkit-bootparamd-0.17-x86_64-2.txt
--rw-r--r--  1 root root     9232 2009-05-23 04:52 ./slackware64/n/netkit-bootparamd-0.17-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-05-23 04:52 ./slackware64/n/netkit-bootparamd-0.17-x86_64-2.txz.asc
--rw-r--r--  1 root root      444 2008-09-23 22:37 ./slackware64/n/netkit-ftp-0.17-x86_64-1.txt
--rw-r--r--  1 root root    44944 2008-09-23 22:37 ./slackware64/n/netkit-ftp-0.17-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-09-23 22:37 ./slackware64/n/netkit-ftp-0.17-x86_64-1.txz.asc
--rw-r--r--  1 root root      478 2009-05-23 04:52 ./slackware64/n/netkit-ntalk-0.17-x86_64-3.txt
--rw-r--r--  1 root root    26168 2009-05-23 04:52 ./slackware64/n/netkit-ntalk-0.17-x86_64-3.txz
--rw-r--r--  1 root root      197 2009-05-23 04:52 ./slackware64/n/netkit-ntalk-0.17-x86_64-3.txz.asc
--rw-r--r--  1 root root      636 2008-09-23 22:51 ./slackware64/n/netkit-routed-0.17-x86_64-1.txt
--rw-r--r--  1 root root    25544 2008-09-23 22:51 ./slackware64/n/netkit-routed-0.17-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-09-23 22:51 ./slackware64/n/netkit-routed-0.17-x86_64-1.txz.asc
--rw-r--r--  1 root root      423 2008-09-23 22:52 ./slackware64/n/netkit-rsh-0.17-x86_64-1.txt
--rw-r--r--  1 root root    42092 2008-09-23 22:52 ./slackware64/n/netkit-rsh-0.17-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-09-23 22:52 ./slackware64/n/netkit-rsh-0.17-x86_64-1.txz.asc
--rw-r--r--  1 root root      696 2008-09-23 22:55 ./slackware64/n/netkit-rusers-0.17-x86_64-1.txt
--rw-r--r--  1 root root    17720 2008-09-23 22:55 ./slackware64/n/netkit-rusers-0.17-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-09-23 22:55 ./slackware64/n/netkit-rusers-0.17-x86_64-1.txz.asc
--rw-r--r--  1 root root      462 2008-09-23 22:56 ./slackware64/n/netkit-rwall-0.17-x86_64-1.txt
--rw-r--r--  1 root root    10388 2008-09-23 22:56 ./slackware64/n/netkit-rwall-0.17-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-09-23 22:56 ./slackware64/n/netkit-rwall-0.17-x86_64-1.txz.asc
--rw-r--r--  1 root root      691 2008-12-14 22:23 ./slackware64/n/netkit-rwho-0.17-x86_64-2.txt
--rw-r--r--  1 root root    17040 2008-12-14 22:23 ./slackware64/n/netkit-rwho-0.17-x86_64-2.txz
--rw-r--r--  1 root root      197 2008-12-14 22:23 ./slackware64/n/netkit-rwho-0.17-x86_64-2.txz.asc
--rw-r--r--  1 root root      407 2008-12-14 22:28 ./slackware64/n/netkit-timed-0.17-x86_64-1.txt
--rw-r--r--  1 root root    30900 2008-12-14 22:28 ./slackware64/n/netkit-timed-0.17-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-12-14 22:28 ./slackware64/n/netkit-timed-0.17-x86_64-1.txz.asc
--rw-r--r--  1 root root      560 2008-10-15 18:12 ./slackware64/n/netpipes-4.2-x86_64-1.txt
--rw-r--r--  1 root root    70156 2008-10-15 18:12 ./slackware64/n/netpipes-4.2-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-15 18:12 ./slackware64/n/netpipes-4.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      306 2009-05-23 04:52 ./slackware64/n/netwatch-1.3.0-x86_64-2.txt
--rw-r--r--  1 root root    95588 2009-05-23 04:52 ./slackware64/n/netwatch-1.3.0-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-05-23 04:52 ./slackware64/n/netwatch-1.3.0-x86_64-2.txz.asc
--rw-r--r--  1 root root      583 2010-01-18 23:53 ./slackware64/n/network-scripts-13.0-noarch-3.txt
--rw-r--r--  1 root root    19968 2010-01-18 23:53 ./slackware64/n/network-scripts-13.0-noarch-3.txz
--rw-r--r--  1 root root      197 2010-01-18 23:53 ./slackware64/n/network-scripts-13.0-noarch-3.txz.asc
--rw-r--r--  1 root root      560 2008-10-28 21:07 ./slackware64/n/netwrite-0.17-x86_64-1.txt
--rw-r--r--  1 root root     6836 2008-10-28 21:07 ./slackware64/n/netwrite-0.17-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-28 21:07 ./slackware64/n/netwrite-0.17-x86_64-1.txz.asc
--rw-r--r--  1 root root      511 2008-10-28 21:08 ./slackware64/n/newspost-2.1.1-x86_64-1.txt
--rw-r--r--  1 root root    42084 2008-10-28 21:08 ./slackware64/n/newspost-2.1.1-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-28 21:08 ./slackware64/n/newspost-2.1.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      322 2010-05-03 05:37 ./slackware64/n/nfs-utils-1.2.2-x86_64-1.txt
--rw-r--r--  1 root root   186516 2010-05-03 05:37 ./slackware64/n/nfs-utils-1.2.2-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-03 05:37 ./slackware64/n/nfs-utils-1.2.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      652 2010-05-03 05:47 ./slackware64/n/nmap-5.21-x86_64-1.txt
--rw-r--r--  1 root root  2743580 2010-05-03 05:47 ./slackware64/n/nmap-5.21-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-03 05:47 ./slackware64/n/nmap-5.21-x86_64-1.txz.asc
--rw-r--r--  1 root root      444 2009-11-12 00:31 ./slackware64/n/nn-6.7.3-x86_64-3.txt
--rw-r--r--  1 root root   303276 2009-11-12 00:31 ./slackware64/n/nn-6.7.3-x86_64-3.txz
--rw-r--r--  1 root root      197 2009-11-12 00:31 ./slackware64/n/nn-6.7.3-x86_64-3.txz.asc
--rw-r--r--  1 root root      532 2010-04-22 04:53 ./slackware64/n/ntp-4.2.6p1-x86_64-1.txt
--rw-r--r--  1 root root  1498840 2010-04-22 04:53 ./slackware64/n/ntp-4.2.6p1-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-22 04:53 ./slackware64/n/ntp-4.2.6p1-x86_64-1.txz.asc
--rw-r--r--  1 root root      430 2010-05-02 08:12 ./slackware64/n/obex-data-server-0.4.5-x86_64-1.txt
--rw-r--r--  1 root root    69992 2010-05-02 08:12 ./slackware64/n/obex-data-server-0.4.5-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-02 08:12 ./slackware64/n/obex-data-server-0.4.5-x86_64-1.txz.asc
--rw-r--r--  1 root root      419 2010-05-02 08:13 ./slackware64/n/obexfs-0.12-x86_64-1.txt
--rw-r--r--  1 root root    20300 2010-05-02 08:13 ./slackware64/n/obexfs-0.12-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-02 08:13 ./slackware64/n/obexfs-0.12-x86_64-1.txz.asc
--rw-r--r--  1 root root      466 2010-05-02 08:12 ./slackware64/n/obexftp-0.23-x86_64-3.txt
--rw-r--r--  1 root root    96804 2010-05-02 08:12 ./slackware64/n/obexftp-0.23-x86_64-3.txz
--rw-r--r--  1 root root      198 2010-05-02 08:12 ./slackware64/n/obexftp-0.23-x86_64-3.txz.asc
--rw-r--r--  1 root root      565 2010-02-12 04:06 ./slackware64/n/openldap-client-2.4.21-x86_64-1.txt
--rw-r--r--  1 root root   385660 2010-02-12 04:06 ./slackware64/n/openldap-client-2.4.21-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-12 04:06 ./slackware64/n/openldap-client-2.4.21-x86_64-1.txz.asc
--rw-r--r--  1 root root      538 2010-05-02 08:12 ./slackware64/n/openobex-1.5-x86_64-1.txt
--rw-r--r--  1 root root    52832 2010-05-02 08:12 ./slackware64/n/openobex-1.5-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-02 08:12 ./slackware64/n/openobex-1.5-x86_64-1.txz.asc
--rw-r--r--  1 root root      676 2010-04-30 01:29 ./slackware64/n/openssh-5.5p1-x86_64-1.txt
--rw-r--r--  1 root root   544756 2010-04-30 01:29 ./slackware64/n/openssh-5.5p1-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-30 01:29 ./slackware64/n/openssh-5.5p1-x86_64-1.txz.asc
--rw-r--r--  1 root root      561 2010-03-29 22:38 ./slackware64/n/openssl-0.9.8n-x86_64-1.txt
--rw-r--r--  1 root root  2405720 2010-03-29 22:38 ./slackware64/n/openssl-0.9.8n-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-03-29 22:38 ./slackware64/n/openssl-0.9.8n-x86_64-1.txz.asc
--rw-r--r--  1 root root      430 2010-05-03 05:59 ./slackware64/n/openvpn-2.1.1-x86_64-1.txt
--rw-r--r--  1 root root   319900 2010-05-03 05:59 ./slackware64/n/openvpn-2.1.1-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-03 05:59 ./slackware64/n/openvpn-2.1.1-x86_64-1.txz.asc
--rw-r--r--  1 root root      376 2010-03-21 21:05 ./slackware64/n/php-5.2.13-x86_64-2.txt
--rw-r--r--  1 root root  4455072 2010-03-21 21:05 ./slackware64/n/php-5.2.13-x86_64-2.txz
--rw-r--r--  1 root root      198 2010-03-21 21:05 ./slackware64/n/php-5.2.13-x86_64-2.txz.asc
--rw-r--r--  1 root root      578 2008-10-28 21:36 ./slackware64/n/pidentd-3.0.19-x86_64-1.txt
--rw-r--r--  1 root root    42368 2008-10-28 21:36 ./slackware64/n/pidentd-3.0.19-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-28 21:36 ./slackware64/n/pidentd-3.0.19-x86_64-1.txz.asc
--rw-r--r--  1 root root      322 2010-03-06 00:39 ./slackware64/n/pinentry-0.8.0-x86_64-1.txt
--rw-r--r--  1 root root   117340 2010-03-06 00:39 ./slackware64/n/pinentry-0.8.0-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-03-06 00:39 ./slackware64/n/pinentry-0.8.0-x86_64-1.txz.asc
--rw-r--r--  1 root root      545 2008-10-31 09:53 ./slackware64/n/popa3d-1.0.2-x86_64-2.txt
--rw-r--r--  1 root root    20584 2008-10-31 09:53 ./slackware64/n/popa3d-1.0.2-x86_64-2.txz
--rw-r--r--  1 root root      197 2008-10-31 09:53 ./slackware64/n/popa3d-1.0.2-x86_64-2.txz.asc
--rw-r--r--  1 root root      529 2008-10-14 18:37 ./slackware64/n/portmap-6.0-x86_64-1.txt
--rw-r--r--  1 root root    27588 2008-10-14 18:37 ./slackware64/n/portmap-6.0-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-14 18:37 ./slackware64/n/portmap-6.0-x86_64-1.txz.asc
--rw-r--r--  1 root root      451 2010-02-12 02:08 ./slackware64/n/ppp-2.4.5-x86_64-1.txt
--rw-r--r--  1 root root   367944 2010-02-12 02:08 ./slackware64/n/ppp-2.4.5-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-12 02:08 ./slackware64/n/ppp-2.4.5-x86_64-1.txz.asc
--rw-r--r--  1 root root      687 2008-10-31 11:09 ./slackware64/n/procmail-3.22-x86_64-2.txt
--rw-r--r--  1 root root   132440 2008-10-31 11:09 ./slackware64/n/procmail-3.22-x86_64-2.txz
--rw-r--r--  1 root root      197 2008-10-31 11:09 ./slackware64/n/procmail-3.22-x86_64-2.txz.asc
--rw-r--r--  1 root root      339 2010-03-29 23:43 ./slackware64/n/proftpd-1.3.3-x86_64-2.txt
--rw-r--r--  1 root root   779392 2010-03-29 23:43 ./slackware64/n/proftpd-1.3.3-x86_64-2.txz
--rw-r--r--  1 root root      198 2010-03-29 23:43 ./slackware64/n/proftpd-1.3.3-x86_64-2.txz.asc
--rw-r--r--  1 root root      534 2010-05-03 06:05 ./slackware64/n/pssh-2.1.1-noarch-1.txt
--rw-r--r--  1 root root    15736 2010-05-03 06:05 ./slackware64/n/pssh-2.1.1-noarch-1.txz
--rw-r--r--  1 root root      198 2010-05-03 06:05 ./slackware64/n/pssh-2.1.1-noarch-1.txz.asc
--rw-r--r--  1 root root      472 2008-10-14 13:00 ./slackware64/n/pth-2.0.7-x86_64-1.txt
--rw-r--r--  1 root root   101100 2008-10-14 13:00 ./slackware64/n/pth-2.0.7-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-14 13:00 ./slackware64/n/pth-2.0.7-x86_64-1.txz.asc
--rw-r--r--  1 root root      355 2010-01-25 21:41 ./slackware64/n/rdist-6.1.5-x86_64-2.txt
--rw-r--r--  1 root root    59660 2010-01-25 21:41 ./slackware64/n/rdist-6.1.5-x86_64-2.txz
--rw-r--r--  1 root root      197 2010-01-25 21:41 ./slackware64/n/rdist-6.1.5-x86_64-2.txz.asc
--rw-r--r--  1 root root      499 2008-10-31 11:43 ./slackware64/n/rp-pppoe-3.10-x86_64-1.txt
--rw-r--r--  1 root root    84764 2008-10-31 11:43 ./slackware64/n/rp-pppoe-3.10-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-31 11:43 ./slackware64/n/rp-pppoe-3.10-x86_64-1.txz.asc
--rw-r--r--  1 root root      494 2010-03-01 01:33 ./slackware64/n/rsync-3.0.7-x86_64-1.txt
--rw-r--r--  1 root root   270884 2010-03-01 01:33 ./slackware64/n/rsync-3.0.7-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-03-01 01:33 ./slackware64/n/rsync-3.0.7-x86_64-1.txz.asc
--rw-r--r--  1 root root      450 2010-05-16 23:04 ./slackware64/n/rt2860-firmware-26-fw-1.txt
--rw-r--r--  1 root root     4656 2010-05-16 23:04 ./slackware64/n/rt2860-firmware-26-fw-1.txz
--rw-r--r--  1 root root      198 2010-05-16 23:04 ./slackware64/n/rt2860-firmware-26-fw-1.txz.asc
--rw-r--r--  1 root root      341 2010-05-16 23:04 ./slackware64/n/rt2870-firmware-22-fw-1.txt
--rw-r--r--  1 root root     3692 2010-05-16 23:04 ./slackware64/n/rt2870-firmware-22-fw-1.txz
--rw-r--r--  1 root root      198 2010-05-16 23:04 ./slackware64/n/rt2870-firmware-22-fw-1.txz.asc
--rw-r--r--  1 root root      273 2008-11-04 11:37 ./slackware64/n/rt61-firmware-1.2-fw-1.txt
--rw-r--r--  1 root root     7224 2008-11-04 11:37 ./slackware64/n/rt61-firmware-1.2-fw-1.txz
--rw-r--r--  1 root root      197 2008-11-04 11:37 ./slackware64/n/rt61-firmware-1.2-fw-1.txz.asc
--rw-r--r--  1 root root      287 2008-11-04 11:49 ./slackware64/n/rt71w-firmware-1.8-fw-1.txt
--rw-r--r--  1 root root     2808 2008-11-04 11:49 ./slackware64/n/rt71w-firmware-1.8-fw-1.txz
--rw-r--r--  1 root root      197 2008-11-04 11:49 ./slackware64/n/rt71w-firmware-1.8-fw-1.txz.asc
--rw-r--r--  1 root root      555 2010-04-26 02:55 ./slackware64/n/samba-3.5.2-x86_64-1.txt
--rw-r--r--  1 root root 20139000 2010-04-26 02:55 ./slackware64/n/samba-3.5.2-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-26 02:55 ./slackware64/n/samba-3.5.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      503 2010-04-23 22:56 ./slackware64/n/sendmail-8.14.4-x86_64-1.txt
--rw-r--r--  1 root root   949108 2010-04-23 22:56 ./slackware64/n/sendmail-8.14.4-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-23 22:56 ./slackware64/n/sendmail-8.14.4-x86_64-1.txz.asc
--rw-r--r--  1 root root      588 2010-04-23 22:56 ./slackware64/n/sendmail-cf-8.14.4-noarch-1.txt
--rw-r--r--  1 root root   114172 2010-04-23 22:56 ./slackware64/n/sendmail-cf-8.14.4-noarch-1.txz
--rw-r--r--  1 root root      198 2010-04-23 22:56 ./slackware64/n/sendmail-cf-8.14.4-noarch-1.txz.asc
--rw-r--r--  1 root root      309 2010-05-19 02:27 ./slackware64/n/slrn-0.9.9p1-x86_64-3.txt
--rw-r--r--  1 root root   460120 2010-05-19 02:27 ./slackware64/n/slrn-0.9.9p1-x86_64-3.txz
--rw-r--r--  1 root root      198 2010-05-19 02:27 ./slackware64/n/slrn-0.9.9p1-x86_64-3.txz.asc
--rw-r--r--  1 root root      415 2010-05-03 01:12 ./slackware64/n/snownews-1.5.12-x86_64-1.txt
--rw-r--r--  1 root root   125584 2010-05-03 01:12 ./slackware64/n/snownews-1.5.12-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-03 01:12 ./slackware64/n/snownews-1.5.12-x86_64-1.txz.asc
--rw-r--r--  1 root root      510 2010-05-03 06:39 ./slackware64/n/stunnel-4.33-x86_64-1.txt
--rw-r--r--  1 root root   127456 2010-05-03 06:39 ./slackware64/n/stunnel-4.33-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-03 06:39 ./slackware64/n/stunnel-4.33-x86_64-1.txz.asc
--rw-r--r--  1 root root     1691 2010-05-17 19:48 ./slackware64/n/tagfile
--rw-r--r--  1 root root      649 2008-10-13 20:26 ./slackware64/n/tcp_wrappers-7.6-x86_64-1.txt
--rw-r--r--  1 root root    78592 2008-10-13 20:26 ./slackware64/n/tcp_wrappers-7.6-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-13 20:26 ./slackware64/n/tcp_wrappers-7.6-x86_64-1.txz.asc
--rw-r--r--  1 root root      374 2009-11-23 21:02 ./slackware64/n/tcpdump-4.0.0-x86_64-2.txt
--rw-r--r--  1 root root   491728 2009-11-23 21:02 ./slackware64/n/tcpdump-4.0.0-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-11-23 21:02 ./slackware64/n/tcpdump-4.0.0-x86_64-2.txz.asc
--rw-r--r--  1 root root      557 2009-05-23 06:39 ./slackware64/n/telnet-0.17-x86_64-2.txt
--rw-r--r--  1 root root    63900 2009-05-23 06:39 ./slackware64/n/telnet-0.17-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-05-23 06:39 ./slackware64/n/telnet-0.17-x86_64-2.txz.asc
--rw-r--r--  1 root root      555 2010-05-03 06:43 ./slackware64/n/tftp-hpa-0.49-x86_64-1.txt
--rw-r--r--  1 root root    49348 2010-05-03 06:43 ./slackware64/n/tftp-hpa-0.49-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-03 06:43 ./slackware64/n/tftp-hpa-0.49-x86_64-1.txz.asc
--rw-r--r--  1 root root      490 2009-05-23 06:40 ./slackware64/n/tin-1.8.2-x86_64-2.txt
--rw-r--r--  1 root root   523776 2009-05-23 06:40 ./slackware64/n/tin-1.8.2-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-05-23 06:40 ./slackware64/n/tin-1.8.2-x86_64-2.txz.asc
--rw-r--r--  1 root root      508 2010-05-10 08:27 ./slackware64/n/traceroute-2.0.14-x86_64-1.txt
--rw-r--r--  1 root root    47144 2010-05-10 08:27 ./slackware64/n/traceroute-2.0.14-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-10 08:27 ./slackware64/n/traceroute-2.0.14-x86_64-1.txz.asc
--rw-r--r--  1 root root      290 2009-05-23 06:43 ./slackware64/n/trn-3.6-x86_64-2.txt
--rw-r--r--  1 root root   188992 2009-05-23 06:43 ./slackware64/n/trn-3.6-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-05-23 06:43 ./slackware64/n/trn-3.6-x86_64-2.txz.asc
--rw-r--r--  1 root root      282 2008-10-31 13:45 ./slackware64/n/uucp-1.07-x86_64-1.txt
--rw-r--r--  1 root root   376540 2008-10-31 13:45 ./slackware64/n/uucp-1.07-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-10-31 13:45 ./slackware64/n/uucp-1.07-x86_64-1.txz.asc
--rw-r--r--  1 root root      433 2008-10-31 13:54 ./slackware64/n/vlan-1.9-x86_64-2.txt
--rw-r--r--  1 root root    24048 2008-10-31 13:54 ./slackware64/n/vlan-1.9-x86_64-2.txz
--rw-r--r--  1 root root      197 2008-10-31 13:54 ./slackware64/n/vlan-1.9-x86_64-2.txz.asc
--rw-r--r--  1 root root      496 2010-02-09 21:51 ./slackware64/n/vsftpd-2.2.2-x86_64-1.txt
--rw-r--r--  1 root root   118712 2010-02-09 21:51 ./slackware64/n/vsftpd-2.2.2-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-09 21:51 ./slackware64/n/vsftpd-2.2.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      398 2010-02-09 21:45 ./slackware64/n/wget-1.12-x86_64-1.txt
--rw-r--r--  1 root root   444808 2010-02-09 21:45 ./slackware64/n/wget-1.12-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-09 21:45 ./slackware64/n/wget-1.12-x86_64-1.txz.asc
--rw-r--r--  1 root root      385 2010-04-29 02:25 ./slackware64/n/whois-5.0.2-x86_64-1.txt
--rw-r--r--  1 root root    43972 2010-04-29 02:25 ./slackware64/n/whois-5.0.2-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-29 02:25 ./slackware64/n/whois-5.0.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      682 2010-01-03 00:15 ./slackware64/n/wireless-tools-29-x86_64-6.txt
--rw-r--r--  1 root root   130976 2010-01-03 00:15 ./slackware64/n/wireless-tools-29-x86_64-6.txz
--rw-r--r--  1 root root      197 2010-01-03 00:15 ./slackware64/n/wireless-tools-29-x86_64-6.txz.asc
--rw-r--r--  1 root root      603 2010-02-20 06:46 ./slackware64/n/wpa_supplicant-0.6.10-x86_64-1.txt
--rw-r--r--  1 root root   326792 2010-02-20 06:46 ./slackware64/n/wpa_supplicant-0.6.10-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-20 06:46 ./slackware64/n/wpa_supplicant-0.6.10-x86_64-1.txz.asc
--rw-r--r--  1 root root      407 2010-05-03 06:51 ./slackware64/n/yptools-2.12-x86_64-1.txt
--rw-r--r--  1 root root   178848 2010-05-03 06:51 ./slackware64/n/yptools-2.12-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-05-03 06:51 ./slackware64/n/yptools-2.12-x86_64-1.txz.asc
--rw-r--r--  1 root root      289 2009-05-23 06:55 ./slackware64/n/ytalk-3.3.0-x86_64-2.txt
--rw-r--r--  1 root root    49704 2009-05-23 06:55 ./slackware64/n/ytalk-3.3.0-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-05-23 06:55 ./slackware64/n/ytalk-3.3.0-x86_64-2.txz.asc
--rw-r--r--  1 root root      651 2008-11-04 11:50 ./slackware64/n/zd1211-firmware-1.4-fw-1.txt
--rw-r--r--  1 root root    33896 2008-11-04 11:50 ./slackware64/n/zd1211-firmware-1.4-fw-1.txz
--rw-r--r--  1 root root      197 2008-11-04 11:50 ./slackware64/n/zd1211-firmware-1.4-fw-1.txz.asc
-drwxr-xr-x  2 root root     4096 2010-05-17 23:32 ./slackware64/t
--rwxr-xr-x  1 root root     2897 2009-06-24 22:06 ./slackware64/t/install-packages
--rw-r--r--  1 root root      446 2006-09-18 10:41 ./slackware64/t/install.end
--rw-r--r--  1 root root     1157 2010-03-01 01:46 ./slackware64/t/maketag
--rw-r--r--  1 root root     1157 2010-03-01 01:46 ./slackware64/t/maketag.ez
--rw-r--r--  1 root root       46 2010-03-01 01:46 ./slackware64/t/tagfile
--rw-r--r--  1 root root      338 2010-05-17 19:37 ./slackware64/t/tetex-3.0-x86_64-8.txt
--rw-r--r--  1 root root 36585468 2010-05-17 19:37 ./slackware64/t/tetex-3.0-x86_64-8.txz
--rw-r--r--  1 root root      198 2010-05-17 19:37 ./slackware64/t/tetex-3.0-x86_64-8.txz.asc
--rw-r--r--  1 root root      524 2010-05-17 19:38 ./slackware64/t/tetex-doc-3.0-x86_64-8.txt
--rw-r--r--  1 root root 43929492 2010-05-17 19:38 ./slackware64/t/tetex-doc-3.0-x86_64-8.txz
--rw-r--r--  1 root root      198 2010-05-17 19:38 ./slackware64/t/tetex-doc-3.0-x86_64-8.txz.asc
--rw-r--r--  1 root root      444 2010-02-20 01:27 ./slackware64/t/transfig-3.2.4-x86_64-3.txt
--rw-r--r--  1 root root   209952 2010-02-20 01:27 ./slackware64/t/transfig-3.2.4-x86_64-3.txz
--rw-r--r--  1 root root      197 2010-02-20 01:27 ./slackware64/t/transfig-3.2.4-x86_64-3.txz.asc
--rw-r--r--  1 root root      431 2010-02-21 17:16 ./slackware64/t/xfig-3.2.4-x86_64-5.txt
--rw-r--r--  1 root root  3014444 2010-02-21 17:16 ./slackware64/t/xfig-3.2.4-x86_64-5.txz
--rw-r--r--  1 root root      197 2010-02-21 17:16 ./slackware64/t/xfig-3.2.4-x86_64-5.txz.asc
-drwxr-xr-x  2 root root     4096 2009-12-07 02:34 ./slackware64/tcl
--rw-r--r--  1 root root      533 2009-05-12 20:41 ./slackware64/tcl/expect-5.44.1.11-x86_64-3.txt
--rw-r--r--  1 root root   301320 2009-05-12 20:41 ./slackware64/tcl/expect-5.44.1.11-x86_64-3.txz
--rw-r--r--  1 root root      197 2009-05-12 20:41 ./slackware64/tcl/expect-5.44.1.11-x86_64-3.txz.asc
--rw-r--r--  1 root root      469 2008-11-06 11:59 ./slackware64/tcl/hfsutils-3.2.6-x86_64-4.txt
--rw-r--r--  1 root root   140068 2008-11-06 11:59 ./slackware64/tcl/hfsutils-3.2.6-x86_64-4.txz
--rw-r--r--  1 root root      197 2008-11-06 11:59 ./slackware64/tcl/hfsutils-3.2.6-x86_64-4.txz.asc
--rwxr-xr-x  1 root root     2897 2009-06-24 22:06 ./slackware64/tcl/install-packages
--rw-r--r--  1 root root      446 2006-09-18 10:41 ./slackware64/tcl/install.end
--rw-r--r--  1 root root     1285 2010-03-01 01:46 ./slackware64/tcl/maketag
--rw-r--r--  1 root root     1285 2010-03-01 01:46 ./slackware64/tcl/maketag.ez
--rw-r--r--  1 root root       56 2010-03-01 01:46 ./slackware64/tcl/tagfile
--rw-r--r--  1 root root      259 2009-12-07 00:44 ./slackware64/tcl/tcl-8.5.8-x86_64-1.txt
--rw-r--r--  1 root root  1712164 2009-12-07 00:44 ./slackware64/tcl/tcl-8.5.8-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-12-07 00:44 ./slackware64/tcl/tcl-8.5.8-x86_64-1.txz.asc
--rw-r--r--  1 root root      555 2009-12-07 00:52 ./slackware64/tcl/tclx-8.4-x86_64-3.txt
--rw-r--r--  1 root root   113312 2009-12-07 00:52 ./slackware64/tcl/tclx-8.4-x86_64-3.txz
--rw-r--r--  1 root root      197 2009-12-07 00:52 ./slackware64/tcl/tclx-8.4-x86_64-3.txz.asc
--rw-r--r--  1 root root      406 2009-12-07 00:50 ./slackware64/tcl/tix-8.4.3-x86_64-2.txt
--rw-r--r--  1 root root   538204 2009-12-07 00:50 ./slackware64/tcl/tix-8.4.3-x86_64-2.txz
--rw-r--r--  1 root root      197 2009-12-07 00:50 ./slackware64/tcl/tix-8.4.3-x86_64-2.txz.asc
--rw-r--r--  1 root root      198 2009-12-07 00:48 ./slackware64/tcl/tk-8.5.8-x86_64-1.txt
--rw-r--r--  1 root root  1654524 2009-12-07 00:48 ./slackware64/tcl/tk-8.5.8-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-12-07 00:48 ./slackware64/tcl/tk-8.5.8-x86_64-1.txz.asc
-drwxr-xr-x  2 root root    57344 2010-05-14 19:52 ./slackware64/x
--rw-r--r--  1 root root      258 2008-11-05 12:50 ./slackware64/x/anthy-9100e-x86_64-1.txt
--rw-r--r--  1 root root  4869552 2008-11-05 12:50 ./slackware64/x/anthy-9100e-x86_64-1.txz
--rw-r--r--  1 root root      197 2008-11-05 12:50 ./slackware64/x/anthy-9100e-x86_64-1.txz.asc
--rw-r--r--  1 root root      270 2010-02-22 20:09 ./slackware64/x/appres-1.0.2-x86_64-1.txt
--rw-r--r--  1 root root     8972 2010-02-22 20:09 ./slackware64/x/appres-1.0.2-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-22 20:09 ./slackware64/x/appres-1.0.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      296 2010-02-22 20:09 ./slackware64/x/bdftopcf-1.0.2-x86_64-1.txt
--rw-r--r--  1 root root     9056 2010-02-22 20:09 ./slackware64/x/bdftopcf-1.0.2-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-22 20:09 ./slackware64/x/bdftopcf-1.0.2-x86_64-1.txz.asc
--rw-r--r--  1 root root      335 2009-06-03 05:36 ./slackware64/x/beforelight-1.0.3-x86_64-1.txt
--rw-r--r--  1 root root     5568 2009-06-03 05:36 ./slackware64/x/beforelight-1.0.3-x86_64-1.txz
--rw-r--r--  1 root root      197 2009-06-03 05:36 ./slackware64/x/beforelight-1.0.3-x86_64-1.txz.asc
--rw-r--r--  1 root root      348 2010-02-22 19:59 ./slackware64/x/bigreqsproto-1.1.0-noarch-1.txt
--rw-r--r--  1 root root     4052 2010-02-22 19:59 ./slackware64/x/bigreqsproto-1.1.0-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-22 19:59 ./slackware64/x/bigreqsproto-1.1.0-noarch-1.txz.asc
--rw-r--r--  1 root root      270 2010-02-22 20:09 ./slackware64/x/bitmap-1.0.4-x86_64-1.txt
--rw-r--r--  1 root root    51764 2010-02-22 20:09 ./slackware64/x/bitmap-1.0.4-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-22 20:09 ./slackware64/x/bitmap-1.0.4-x86_64-1.txz.asc
--rw-r--r--  1 root root      270 2010-04-27 21:02 ./slackware64/x/compiz-0.8.6-x86_64-1.txt
--rw-r--r--  1 root root   805548 2010-04-27 21:02 ./slackware64/x/compiz-0.8.6-x86_64-1.txz
--rw-r--r--  1 root root      198 2010-04-27 21:02 ./slackware64/x/compiz-0.8.6-x86_64-1.txz.asc
--rw-r--r--  1 root root      374 2010-02-22 19:59 ./slackware64/x/compositeproto-0.4.1-noarch-1.txt
--rw-r--r--  1 root root    10188 2010-02-22 19:59 ./slackware64/x/compositeproto-0.4.1-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-22 19:59 ./slackware64/x/compositeproto-0.4.1-noarch-1.txz.asc
--rw-r--r--  1 root root      335 2010-02-22 19:59 ./slackware64/x/damageproto-1.2.0-noarch-1.txt
--rw-r--r--  1 root root     7500 2010-02-22 19:59 ./slackware64/x/damageproto-1.2.0-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-22 19:59 ./slackware64/x/damageproto-1.2.0-noarch-1.txz.asc
--rw-r--r--  1 root root      536 2009-11-05 22:11 ./slackware64/x/dejavu-fonts-ttf-2.30-noarch-1.txt
--rw-r--r--  1 root root  2049780 2009-11-05 22:11 ./slackware64/x/dejavu-fonts-ttf-2.30-noarch-1.txz
--rw-r--r--  1 root root      197 2009-11-05 22:11 ./slackware64/x/dejavu-fonts-ttf-2.30-noarch-1.txz.asc
--rw-r--r--  1 root root      296 2010-02-22 19:59 ./slackware64/x/dmxproto-2.3-noarch-1.txt
--rw-r--r--  1 root root     5132 2010-02-22 19:59 ./slackware64/x/dmxproto-2.3-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-22 19:59 ./slackware64/x/dmxproto-2.3-noarch-1.txz.asc
--rw-r--r--  1 root root      309 2010-02-22 20:00 ./slackware64/x/dri2proto-2.3-x86_64-1.txt
--rw-r--r--  1 root root    10420 2010-02-22 20:00 ./slackware64/x/dri2proto-2.3-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-22 20:00 ./slackware64/x/dri2proto-2.3-x86_64-1.txz.asc
--rw-r--r--  1 root root      283 2010-02-22 20:10 ./slackware64/x/editres-1.0.4-x86_64-1.txt
--rw-r--r--  1 root root    39848 2010-02-22 20:10 ./slackware64/x/editres-1.0.4-x86_64-1.txz
--rw-r--r--  1 root root      197 2010-02-22 20:10 ./slackware64/x/editres-1.0.4-x86_64-1.txz.asc
--rw-r--r--  1 root root      309 2010-02-22 20:25 ./slackware64/x/encodings-1.0.3-noarch-1.txt
--rw-r--r--  1 root root   574420 2010-02-22 20:25 ./slackware64/x/encodings-1.0.3-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-22 20:25 ./slackware64/x/encodings-1.0.3-noarch-1.txz.asc
--rw-r--r--  1 root root      283 2010-02-22 20:00 ./slackware64/x/evieext-1.1.0-noarch-1.txt
--rw-r--r--  1 root root     4576 2010-02-22 20:00 ./slackware64/x/evieext-1.1.0-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-22 20:00 ./slackware64/x/evieext-1.1.0-noarch-1.txz.asc
--rw-r--r--  1 root root      322 2010-02-22 20:00 ./slackware64/x/fixesproto-4.1.1-noarch-1.txt
--rw-r--r--  1 root root    11796 2010-02-22 20:00 ./slackware64/x/fixesproto-4.1.1-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-22 20:00 ./slackware64/x/fixesproto-4.1.1-noarch-1.txz.asc
--rw-r--r--  1 root root      413 2010-02-22 20:25 ./slackware64/x/font-adobe-100dpi-1.0.1-noarch-1.txt
--rw-r--r--  1 root root  6182516 2010-02-22 20:25 ./slackware64/x/font-adobe-100dpi-1.0.1-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-22 20:25 ./slackware64/x/font-adobe-100dpi-1.0.1-noarch-1.txz.asc
--rw-r--r--  1 root root      400 2010-02-22 20:25 ./slackware64/x/font-adobe-75dpi-1.0.1-noarch-1.txt
--rw-r--r--  1 root root  5470236 2010-02-22 20:25 ./slackware64/x/font-adobe-75dpi-1.0.1-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-22 20:25 ./slackware64/x/font-adobe-75dpi-1.0.1-noarch-1.txz.asc
--rw-r--r--  1 root root      504 2010-02-22 20:26 ./slackware64/x/font-adobe-utopia-100dpi-1.0.2-noarch-1.txt
--rw-r--r--  1 root root  1464476 2010-02-22 20:26 ./slackware64/x/font-adobe-utopia-100dpi-1.0.2-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-22 20:26 ./slackware64/x/font-adobe-utopia-100dpi-1.0.2-noarch-1.txz.asc
--rw-r--r--  1 root root      491 2010-02-22 20:26 ./slackware64/x/font-adobe-utopia-75dpi-1.0.2-noarch-1.txt
--rw-r--r--  1 root root  1217608 2010-02-22 20:26 ./slackware64/x/font-adobe-utopia-75dpi-1.0.2-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-22 20:26 ./slackware64/x/font-adobe-utopia-75dpi-1.0.2-noarch-1.txz.asc
--rw-r--r--  1 root root      491 2010-02-22 20:26 ./slackware64/x/font-adobe-utopia-type1-1.0.2-noarch-1.txt
--rw-r--r--  1 root root   169884 2010-02-22 20:26 ./slackware64/x/font-adobe-utopia-type1-1.0.2-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-22 20:26 ./slackware64/x/font-adobe-utopia-type1-1.0.2-noarch-1.txz.asc
--rw-r--r--  1 root root      322 2010-02-22 20:26 ./slackware64/x/font-alias-1.0.2-noarch-1.txt
--rw-r--r--  1 root root     5016 2010-02-22 20:26 ./slackware64/x/font-alias-1.0.2-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-22 20:26 ./slackware64/x/font-alias-1.0.2-noarch-1.txz.asc
--rw-r--r--  1 root root      400 2010-02-22 20:26 ./slackware64/x/font-arabic-misc-1.0.1-noarch-1.txt
--rw-r--r--  1 root root    17128 2010-02-22 20:26 ./slackware64/x/font-arabic-misc-1.0.1-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-22 20:26 ./slackware64/x/font-arabic-misc-1.0.1-noarch-1.txz.asc
--rw-r--r--  1 root root      374 2010-02-22 20:26 ./slackware64/x/font-bh-100dpi-1.0.1-noarch-1.txt
--rw-r--r--  1 root root  3781452 2010-02-22 20:26 ./slackware64/x/font-bh-100dpi-1.0.1-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-22 20:26 ./slackware64/x/font-bh-100dpi-1.0.1-noarch-1.txz.asc
--rw-r--r--  1 root root      361 2010-02-22 20:26 ./slackware64/x/font-bh-75dpi-1.0.1-noarch-1.txt
--rw-r--r--  1 root root  3247528 2010-02-22 20:26 ./slackware64/x/font-bh-75dpi-1.0.1-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-22 20:26 ./slackware64/x/font-bh-75dpi-1.0.1-noarch-1.txz.asc
--rw-r--r--  1 root root      595 2010-02-22 20:26 ./slackware64/x/font-bh-lucidatypewriter-100dpi-1.0.1-noarch-1.txt
--rw-r--r--  1 root root   854580 2010-02-22 20:26 ./slackware64/x/font-bh-lucidatypewriter-100dpi-1.0.1-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-22 20:26 ./slackware64/x/font-bh-lucidatypewriter-100dpi-1.0.1-noarch-1.txz.asc
--rw-r--r--  1 root root      582 2010-02-22 20:26 ./slackware64/x/font-bh-lucidatypewriter-75dpi-1.0.1-noarch-1.txt
--rw-r--r--  1 root root   745396 2010-02-22 20:26 ./slackware64/x/font-bh-lucidatypewriter-75dpi-1.0.1-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-22 20:26 ./slackware64/x/font-bh-lucidatypewriter-75dpi-1.0.1-noarch-1.txz.asc
--rw-r--r--  1 root root      335 2010-02-22 20:27 ./slackware64/x/font-bh-ttf-1.0.1-noarch-1.txt
--rw-r--r--  1 root root   279216 2010-02-22 20:27 ./slackware64/x/font-bh-ttf-1.0.1-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-22 20:27 ./slackware64/x/font-bh-ttf-1.0.1-noarch-1.txz.asc
--rw-r--r--  1 root root      361 2010-02-22 20:27 ./slackware64/x/font-bh-type1-1.0.1-noarch-1.txt
--rw-r--r--  1 root root   526492 2010-02-22 20:27 ./slackware64/x/font-bh-type1-1.0.1-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-22 20:27 ./slackware64/x/font-bh-type1-1.0.1-noarch-1.txz.asc
--rw-r--r--  1 root root      465 2010-02-22 20:27 ./slackware64/x/font-bitstream-100dpi-1.0.1-noarch-1.txt
--rw-r--r--  1 root root   164148 2010-02-22 20:27 ./slackware64/x/font-bitstream-100dpi-1.0.1-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-22 20:27 ./slackware64/x/font-bitstream-100dpi-1.0.1-noarch-1.txz.asc
--rw-r--r--  1 root root      452 2010-02-22 20:27 ./slackware64/x/font-bitstream-75dpi-1.0.1-noarch-1.txt
--rw-r--r--  1 root root   143880 2010-02-22 20:27 ./slackware64/x/font-bitstream-75dpi-1.0.1-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-22 20:27 ./slackware64/x/font-bitstream-75dpi-1.0.1-noarch-1.txz.asc
--rw-r--r--  1 root root      465 2010-02-22 20:27 ./slackware64/x/font-bitstream-speedo-1.0.1-noarch-1.txt
--rw-r--r--  1 root root   241008 2010-02-22 20:27 ./slackware64/x/font-bitstream-speedo-1.0.1-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-22 20:27 ./slackware64/x/font-bitstream-speedo-1.0.1-noarch-1.txz.asc
--rw-r--r--  1 root root      452 2010-02-22 20:27 ./slackware64/x/font-bitstream-type1-1.0.1-noarch-1.txt
--rw-r--r--  1 root root   303132 2010-02-22 20:27 ./slackware64/x/font-bitstream-type1-1.0.1-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-22 20:27 ./slackware64/x/font-bitstream-type1-1.0.1-noarch-1.txz.asc
--rw-r--r--  1 root root      452 2010-02-22 20:27 ./slackware64/x/font-cronyx-cyrillic-1.0.1-noarch-1.txt
--rw-r--r--  1 root root   305844 2010-02-22 20:27 ./slackware64/x/font-cronyx-cyrillic-1.0.1-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-22 20:27 ./slackware64/x/font-cronyx-cyrillic-1.0.1-noarch-1.txz.asc
--rw-r--r--  1 root root      400 2010-02-22 20:27 ./slackware64/x/font-cursor-misc-1.0.1-noarch-1.txt
--rw-r--r--  1 root root     8340 2010-02-22 20:27 ./slackware64/x/font-cursor-misc-1.0.1-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-22 20:27 ./slackware64/x/font-cursor-misc-1.0.1-noarch-1.txz.asc
--rw-r--r--  1 root root      400 2010-02-22 20:27 ./slackware64/x/font-daewoo-misc-1.0.1-noarch-1.txt
--rw-r--r--  1 root root   664104 2010-02-22 20:27 ./slackware64/x/font-daewoo-misc-1.0.1-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-22 20:27 ./slackware64/x/font-daewoo-misc-1.0.1-noarch-1.txz.asc
--rw-r--r--  1 root root      361 2010-02-22 20:27 ./slackware64/x/font-dec-misc-1.0.1-noarch-1.txt
--rw-r--r--  1 root root     6968 2010-02-22 20:27 ./slackware64/x/font-dec-misc-1.0.1-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-22 20:27 ./slackware64/x/font-dec-misc-1.0.1-noarch-1.txz.asc
--rw-r--r--  1 root root      374 2010-02-22 20:27 ./slackware64/x/font-ibm-type1-1.0.1-noarch-1.txt
--rw-r--r--  1 root root   279648 2010-02-22 20:27 ./slackware64/x/font-ibm-type1-1.0.1-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-22 20:27 ./slackware64/x/font-ibm-type1-1.0.1-noarch-1.txz.asc
--rw-r--r--  1 root root      374 2010-02-22 20:27 ./slackware64/x/font-isas-misc-1.0.1-noarch-1.txt
--rw-r--r--  1 root root   801296 2010-02-22 20:27 ./slackware64/x/font-isas-misc-1.0.1-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-22 20:27 ./slackware64/x/font-isas-misc-1.0.1-noarch-1.txz.asc
--rw-r--r--  1 root root      361 2010-02-22 20:27 ./slackware64/x/font-jis-misc-1.0.1-noarch-1.txt
--rw-r--r--  1 root root   539560 2010-02-22 20:27 ./slackware64/x/font-jis-misc-1.0.1-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-22 20:27 ./slackware64/x/font-jis-misc-1.0.1-noarch-1.txz.asc
--rw-r--r--  1 root root      387 2010-02-22 20:27 ./slackware64/x/font-micro-misc-1.0.1-noarch-1.txt
--rw-r--r--  1 root root     5036 2010-02-22 20:27 ./slackware64/x/font-micro-misc-1.0.1-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-22 20:27 ./slackware64/x/font-micro-misc-1.0.1-noarch-1.txz.asc
--rw-r--r--  1 root root      426 2010-02-22 20:27 ./slackware64/x/font-misc-cyrillic-1.0.1-noarch-1.txt
--rw-r--r--  1 root root    69684 2010-02-22 20:27 ./slackware64/x/font-misc-cyrillic-1.0.1-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-22 20:27 ./slackware64/x/font-misc-cyrillic-1.0.1-noarch-1.txz.asc
--rw-r--r--  1 root root      426 2010-02-22 20:27 ./slackware64/x/font-misc-ethiopic-1.0.1-noarch-1.txt
--rw-r--r--  1 root root   132084 2010-02-22 20:27 ./slackware64/x/font-misc-ethiopic-1.0.1-noarch-1.txz
--rw-r--r--  1 root root      197 2010-02-22 20:27 ./slackware64/x/font-misc-ethiopic-1.0.1-noarch-1.txz.asc
--rw-r--r--  1 root root      400 2010-02-22 20:27 ./slackware64/x/font-misc-meltho-1.0.1-noarch-1.txt
--rw-r--r--   1 root root    739524 2010-02-22 20:27 ./slackware64/x/font-misc-meltho-1.0.1-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:27 ./slackware64/x/font-misc-meltho-1.0.1-noarch-1.txz.asc
--rw-r--r--   1 root root       374 2010-02-22 20:28 ./slackware64/x/font-misc-misc-1.1.0-noarch-1.txt
--rw-r--r--   1 root root   3516952 2010-02-22 20:28 ./slackware64/x/font-misc-misc-1.1.0-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:28 ./slackware64/x/font-misc-misc-1.1.0-noarch-1.txz.asc
--rw-r--r--   1 root root       374 2010-02-22 20:28 ./slackware64/x/font-mutt-misc-1.0.1-noarch-1.txt
--rw-r--r--   1 root root    212312 2010-02-22 20:28 ./slackware64/x/font-mutt-misc-1.0.1-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:28 ./slackware64/x/font-mutt-misc-1.0.1-noarch-1.txz.asc
--rw-r--r--   1 root root       452 2010-02-22 20:28 ./slackware64/x/font-schumacher-misc-1.1.0-noarch-1.txt
--rw-r--r--   1 root root    157508 2010-02-22 20:28 ./slackware64/x/font-schumacher-misc-1.1.0-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:28 ./slackware64/x/font-schumacher-misc-1.1.0-noarch-1.txz.asc
--rw-r--r--   1 root root       452 2010-02-22 20:28 ./slackware64/x/font-screen-cyrillic-1.0.2-noarch-1.txt
--rw-r--r--   1 root root     13056 2010-02-22 20:28 ./slackware64/x/font-screen-cyrillic-1.0.2-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:28 ./slackware64/x/font-screen-cyrillic-1.0.2-noarch-1.txz.asc
--rw-r--r--   1 root root       374 2010-02-22 20:28 ./slackware64/x/font-sony-misc-1.0.1-noarch-1.txt
--rw-r--r--   1 root root     23476 2010-02-22 20:28 ./slackware64/x/font-sony-misc-1.0.1-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:28 ./slackware64/x/font-sony-misc-1.0.1-noarch-1.txz.asc
--rw-r--r--   1 root root       361 2010-02-22 20:28 ./slackware64/x/font-sun-misc-1.0.1-noarch-1.txt
--rw-r--r--   1 root root     29608 2010-02-22 20:28 ./slackware64/x/font-sun-misc-1.0.1-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:28 ./slackware64/x/font-sun-misc-1.0.1-noarch-1.txz.asc
--rw-r--r--   1 root root       309 2010-02-22 20:28 ./slackware64/x/font-util-1.1.1-x86_64-1.txt
--rw-r--r--   1 root root     30340 2010-02-22 20:28 ./slackware64/x/font-util-1.1.1-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:28 ./slackware64/x/font-util-1.1.1-x86_64-1.txz.asc
--rw-r--r--   1 root root       478 2010-02-22 20:28 ./slackware64/x/font-winitzki-cyrillic-1.0.1-noarch-1.txt
--rw-r--r--   1 root root      8272 2010-02-22 20:28 ./slackware64/x/font-winitzki-cyrillic-1.0.1-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:28 ./slackware64/x/font-winitzki-cyrillic-1.0.1-noarch-1.txz.asc
--rw-r--r--   1 root root       426 2010-02-22 20:28 ./slackware64/x/font-xfree86-type1-1.0.2-noarch-1.txt
--rw-r--r--   1 root root     31532 2010-02-22 20:28 ./slackware64/x/font-xfree86-type1-1.0.2-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:28 ./slackware64/x/font-xfree86-type1-1.0.2-noarch-1.txz.asc
--rw-r--r--   1 root root       374 2010-02-22 20:00 ./slackware64/x/fontcacheproto-0.1.3-noarch-1.txt
--rw-r--r--   1 root root      5180 2010-02-22 20:00 ./slackware64/x/fontcacheproto-0.1.3-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:00 ./slackware64/x/fontcacheproto-0.1.3-noarch-1.txz.asc
--rw-r--r--   1 root root       348 2010-02-20 20:56 ./slackware64/x/fontconfig-2.8.0-x86_64-1.txt
--rw-r--r--   1 root root    272112 2010-02-20 20:56 ./slackware64/x/fontconfig-2.8.0-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-20 20:56 ./slackware64/x/fontconfig-2.8.0-x86_64-1.txz.asc
--rw-r--r--   1 root root       322 2010-02-22 20:00 ./slackware64/x/fontsproto-2.1.0-noarch-1.txt
--rw-r--r--   1 root root     11360 2010-02-22 20:00 ./slackware64/x/fontsproto-2.1.0-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:00 ./slackware64/x/fontsproto-2.1.0-noarch-1.txz.asc
--rw-r--r--   1 root root       322 2009-06-03 05:38 ./slackware64/x/fonttosfnt-1.0.4-x86_64-1.txt
--rw-r--r--   1 root root     16584 2009-06-03 05:38 ./slackware64/x/fonttosfnt-1.0.4-x86_64-1.txz
--rw-r--r--   1 root root       197 2009-06-03 05:38 ./slackware64/x/fonttosfnt-1.0.4-x86_64-1.txz.asc
--rw-r--r--   1 root root       309 2009-06-03 05:38 ./slackware64/x/fslsfonts-1.0.2-x86_64-1.txt
--rw-r--r--   1 root root      7476 2009-06-03 05:38 ./slackware64/x/fslsfonts-1.0.2-x86_64-1.txz
--rw-r--r--   1 root root       197 2009-06-03 05:38 ./slackware64/x/fslsfonts-1.0.2-x86_64-1.txz.asc
--rw-r--r--   1 root root       283 2009-06-03 05:38 ./slackware64/x/fstobdf-1.0.3-x86_64-1.txt
--rw-r--r--   1 root root      6916 2009-06-03 05:38 ./slackware64/x/fstobdf-1.0.3-x86_64-1.txz
--rw-r--r--   1 root root       197 2009-06-03 05:38 ./slackware64/x/fstobdf-1.0.3-x86_64-1.txz.asc
--rw-r--r--   1 root root       322 2009-06-03 05:26 ./slackware64/x/gccmakedep-1.0.2-noarch-2.txt
--rw-r--r--   1 root root      3016 2009-06-03 05:26 ./slackware64/x/gccmakedep-1.0.2-noarch-2.txz
--rw-r--r--   1 root root       197 2009-06-03 05:26 ./slackware64/x/gccmakedep-1.0.2-noarch-2.txz.asc
--rw-r--r--   1 root root       385 2009-08-04 00:34 ./slackware64/x/glew-1.5.1-x86_64-1.txt
--rw-r--r--   1 root root    221688 2009-08-04 00:34 ./slackware64/x/glew-1.5.1-x86_64-1.txz
--rw-r--r--   1 root root       197 2009-08-04 00:34 ./slackware64/x/glew-1.5.1-x86_64-1.txz.asc
--rw-r--r--   1 root root       283 2010-02-22 20:00 ./slackware64/x/glproto-1.4.11-noarch-1.txt
--rw-r--r--   1 root root     27336 2010-02-22 20:00 ./slackware64/x/glproto-1.4.11-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:00 ./slackware64/x/glproto-1.4.11-noarch-1.txz.asc
--rw-r--r--   1 root root       283 2010-02-22 20:10 ./slackware64/x/iceauth-1.0.3-x86_64-1.txt
--rw-r--r--   1 root root     16684 2010-02-22 20:10 ./slackware64/x/iceauth-1.0.3-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:10 ./slackware64/x/iceauth-1.0.3-x86_64-1.txz.asc
--rw-r--r--   1 root root       231 2009-06-03 05:38 ./slackware64/x/ico-1.0.2-x86_64-2.txt
--rw-r--r--   1 root root     12316 2009-06-03 05:38 ./slackware64/x/ico-1.0.2-x86_64-2.txz
--rw-r--r--   1 root root       197 2009-06-03 05:38 ./slackware64/x/ico-1.0.2-x86_64-2.txz.asc
--rw-r--r--   1 root root       257 2010-04-27 20:52 ./slackware64/x/imake-1.0.3-x86_64-1.txt
--rw-r--r--   1 root root     38152 2010-04-27 20:52 ./slackware64/x/imake-1.0.3-x86_64-1.txz
--rw-r--r--   1 root root       198 2010-04-27 20:52 ./slackware64/x/imake-1.0.3-x86_64-1.txz.asc
--rw-r--r--   1 root root       322 2010-02-22 20:00 ./slackware64/x/inputproto-2.0-noarch-1.txt
--rw-r--r--   1 root root     22796 2010-02-22 20:00 ./slackware64/x/inputproto-2.0-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:00 ./slackware64/x/inputproto-2.0-noarch-1.txz.asc
--rwxr-xr-x   1 root root      2897 2009-06-24 22:06 ./slackware64/x/install-packages
--rw-r--r--   1 root root       446 2006-09-18 10:41 ./slackware64/x/install.end
--rw-r--r--   1 root root       420 2010-02-22 20:10 ./slackware64/x/intel-gpu-tools-1.0.2-x86_64-1.txt
--rw-r--r--   1 root root     34396 2010-02-22 20:10 ./slackware64/x/intel-gpu-tools-1.0.2-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:10 ./slackware64/x/intel-gpu-tools-1.0.2-x86_64-1.txz.asc
--rw-r--r--   1 root root       283 2010-02-22 20:00 ./slackware64/x/kbproto-1.0.4-noarch-1.txt
--rw-r--r--   1 root root     25024 2010-02-22 20:00 ./slackware64/x/kbproto-1.0.4-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:00 ./slackware64/x/kbproto-1.0.4-noarch-1.txz.asc
--rw-r--r--   1 root root       257 2009-07-16 22:27 ./slackware64/x/libFS-1.0.2-x86_64-1.txt
--rw-r--r--   1 root root     23296 2009-07-16 22:27 ./slackware64/x/libFS-1.0.2-x86_64-1.txz
--rw-r--r--   1 root root       197 2009-07-16 22:27 ./slackware64/x/libFS-1.0.2-x86_64-1.txz.asc
--rw-r--r--   1 root root       270 2010-02-22 20:02 ./slackware64/x/libICE-1.0.6-x86_64-1.txt
--rw-r--r--   1 root root     52056 2010-02-22 20:02 ./slackware64/x/libICE-1.0.6-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:02 ./slackware64/x/libICE-1.0.6-x86_64-1.txz.asc
--rw-r--r--   1 root root       257 2010-02-22 20:02 ./slackware64/x/libSM-1.1.1-x86_64-1.txt
--rw-r--r--   1 root root     25720 2010-02-22 20:02 ./slackware64/x/libSM-1.1.1-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:02 ./slackware64/x/libSM-1.1.1-x86_64-1.txz.asc
--rw-r--r--   1 root root       270 2010-02-22 20:04 ./slackware64/x/libX11-1.3.3-x86_64-1.txt
--rw-r--r--   1 root root   3198720 2010-02-22 20:04 ./slackware64/x/libX11-1.3.3-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:04 ./slackware64/x/libX11-1.3.3-x86_64-1.txz.asc
--rw-r--r--   1 root root       361 2010-02-22 20:04 ./slackware64/x/libXScrnSaver-1.2.0-x86_64-1.txt
--rw-r--r--   1 root root     17332 2010-02-22 20:04 ./slackware64/x/libXScrnSaver-1.2.0-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:04 ./slackware64/x/libXScrnSaver-1.2.0-x86_64-1.txz.asc
--rw-r--r--   1 root root       296 2009-06-03 05:30 ./slackware64/x/libXTrap-1.0.0-x86_64-2.txt
--rw-r--r--   1 root root     13612 2009-06-03 05:30 ./slackware64/x/libXTrap-1.0.0-x86_64-2.txz
--rw-r--r--   1 root root       197 2009-06-03 05:30 ./slackware64/x/libXTrap-1.0.0-x86_64-2.txz.asc
--rw-r--r--   1 root root       270 2010-02-22 20:04 ./slackware64/x/libXau-1.0.5-x86_64-1.txt
--rw-r--r--   1 root root     20456 2010-02-22 20:04 ./slackware64/x/libXau-1.0.5-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:04 ./slackware64/x/libXau-1.0.5-x86_64-1.txz.asc
--rw-r--r--   1 root root       270 2010-02-22 20:05 ./slackware64/x/libXaw-1.0.7-x86_64-1.txt
--rw-r--r--   1 root root    499568 2010-02-22 20:05 ./slackware64/x/libXaw-1.0.7-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:05 ./slackware64/x/libXaw-1.0.7-x86_64-1.txz.asc
--rw-r--r--   1 root root       361 2010-02-22 20:05 ./slackware64/x/libXcomposite-0.4.1-x86_64-1.txt
--rw-r--r--   1 root root     13500 2010-02-22 20:05 ./slackware64/x/libXcomposite-0.4.1-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:05 ./slackware64/x/libXcomposite-0.4.1-x86_64-1.txz.asc
--rw-r--r--   1 root root       322 2010-02-22 20:05 ./slackware64/x/libXcursor-1.1.10-x86_64-1.txt
--rw-r--r--   1 root root     34320 2010-02-22 20:05 ./slackware64/x/libXcursor-1.1.10-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:05 ./slackware64/x/libXcursor-1.1.10-x86_64-1.txz.asc
--rw-r--r--   1 root root       322 2010-02-22 20:05 ./slackware64/x/libXdamage-1.1.2-x86_64-1.txt
--rw-r--r--   1 root root      9708 2010-02-22 20:05 ./slackware64/x/libXdamage-1.1.2-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:05 ./slackware64/x/libXdamage-1.1.2-x86_64-1.txz.asc
--rw-r--r--   1 root root       296 2010-02-22 20:05 ./slackware64/x/libXdmcp-1.0.3-x86_64-1.txt
--rw-r--r--   1 root root     19764 2010-02-22 20:05 ./slackware64/x/libXdmcp-1.0.3-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:05 ./slackware64/x/libXdmcp-1.0.3-x86_64-1.txz.asc
--rw-r--r--   1 root root       296 2009-06-03 05:31 ./slackware64/x/libXevie-1.0.2-x86_64-2.txt
--rw-r--r--   1 root root      5852 2009-06-03 05:31 ./slackware64/x/libXevie-1.0.2-x86_64-2.txz
--rw-r--r--   1 root root       197 2009-06-03 05:31 ./slackware64/x/libXevie-1.0.2-x86_64-2.txz.asc
--rw-r--r--   1 root root       283 2010-02-22 20:05 ./slackware64/x/libXext-1.1-x86_64-1.txt
--rw-r--r--   1 root root     93096 2010-02-22 20:05 ./slackware64/x/libXext-1.1-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:05 ./slackware64/x/libXext-1.1-x86_64-1.txz.asc
--rw-r--r--   1 root root       309 2010-02-22 20:06 ./slackware64/x/libXfixes-4.0.4-x86_64-1.txt
--rw-r--r--   1 root root     15224 2010-02-22 20:06 ./slackware64/x/libXfixes-4.0.4-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:06 ./slackware64/x/libXfixes-4.0.4-x86_64-1.txz.asc
--rw-r--r--   1 root root       296 2010-02-22 20:06 ./slackware64/x/libXfont-1.4.1-x86_64-1.txt
--rw-r--r--   1 root root    131792 2010-02-22 20:06 ./slackware64/x/libXfont-1.4.1-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:06 ./slackware64/x/libXfont-1.4.1-x86_64-1.txz.asc
--rw-r--r--   1 root root       361 2010-02-22 20:06 ./slackware64/x/libXfontcache-1.0.5-x86_64-1.txt
--rw-r--r--   1 root root     14896 2010-02-22 20:06 ./slackware64/x/libXfontcache-1.0.5-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:06 ./slackware64/x/libXfontcache-1.0.5-x86_64-1.txz.asc
--rw-r--r--   1 root root       270 2010-02-22 20:06 ./slackware64/x/libXft-2.1.14-x86_64-1.txt
--rw-r--r--   1 root root     52548 2010-02-22 20:06 ./slackware64/x/libXft-2.1.14-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:06 ./slackware64/x/libXft-2.1.14-x86_64-1.txz.asc
--rw-r--r--   1 root root       257 2010-02-22 20:06 ./slackware64/x/libXi-1.3-x86_64-1.txt
--rw-r--r--   1 root root    106512 2010-02-22 20:06 ./slackware64/x/libXi-1.3-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:06 ./slackware64/x/libXi-1.3-x86_64-1.txz.asc
--rw-r--r--   1 root root       335 2010-02-22 20:06 ./slackware64/x/libXinerama-1.1-x86_64-1.txt
--rw-r--r--   1 root root     12448 2010-02-22 20:06 ./slackware64/x/libXinerama-1.1-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:06 ./slackware64/x/libXinerama-1.1-x86_64-1.txz.asc
--rw-r--r--   1 root root       270 2010-02-22 20:06 ./slackware64/x/libXmu-1.0.5-x86_64-1.txt
--rw-r--r--   1 root root     61300 2010-02-22 20:06 ./slackware64/x/libXmu-1.0.5-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:06 ./slackware64/x/libXmu-1.0.5-x86_64-1.txz.asc
--rw-r--r--   1 root root       257 2009-06-03 05:33 ./slackware64/x/libXp-1.0.0-x86_64-2.txt
--rw-r--r--   1 root root     77220 2009-06-03 05:33 ./slackware64/x/libXp-1.0.0-x86_64-2.txz
--rw-r--r--   1 root root       197 2009-06-03 05:33 ./slackware64/x/libXp-1.0.0-x86_64-2.txz.asc
--rw-r--r--   1 root root       270 2010-02-22 20:07 ./slackware64/x/libXpm-3.5.8-x86_64-1.txt
--rw-r--r--   1 root root     62692 2010-02-22 20:07 ./slackware64/x/libXpm-3.5.8-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:07 ./slackware64/x/libXpm-3.5.8-x86_64-1.txz.asc
--rw-r--r--   1 root root       400 2009-06-03 05:33 ./slackware64/x/libXprintAppUtil-1.0.1-x86_64-2.txt
--rw-r--r--   1 root root      7672 2009-06-03 05:33 ./slackware64/x/libXprintAppUtil-1.0.1-x86_64-2.txz
--rw-r--r--   1 root root       197 2009-06-03 05:33 ./slackware64/x/libXprintAppUtil-1.0.1-x86_64-2.txz.asc
--rw-r--r--   1 root root       361 2009-06-03 05:33 ./slackware64/x/libXprintUtil-1.0.1-x86_64-2.txt
--rw-r--r--   1 root root     15644 2009-06-03 05:33 ./slackware64/x/libXprintUtil-1.0.1-x86_64-2.txz
--rw-r--r--   1 root root       197 2009-06-03 05:33 ./slackware64/x/libXprintUtil-1.0.1-x86_64-2.txz.asc
--rw-r--r--   1 root root       309 2009-06-03 05:33 ./slackware64/x/libXrandr-1.3.0-x86_64-1.txt
--rw-r--r--   1 root root     20872 2009-06-03 05:33 ./slackware64/x/libXrandr-1.3.0-x86_64-1.txz
--rw-r--r--   1 root root       197 2009-06-03 05:33 ./slackware64/x/libXrandr-1.3.0-x86_64-1.txz.asc
--rw-r--r--   1 root root       322 2010-02-22 20:07 ./slackware64/x/libXrender-0.9.5-x86_64-1.txt
--rw-r--r--   1 root root     26120 2010-02-22 20:07 ./slackware64/x/libXrender-0.9.5-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:07 ./slackware64/x/libXrender-0.9.5-x86_64-1.txz.asc
--rw-r--r--   1 root root       283 2010-02-22 20:07 ./slackware64/x/libXres-1.0.4-x86_64-1.txt
--rw-r--r--   1 root root     14520 2010-02-22 20:07 ./slackware64/x/libXres-1.0.4-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:07 ./slackware64/x/libXres-1.0.4-x86_64-1.txz.asc
--rw-r--r--   1 root root       257 2010-03-18 21:45 ./slackware64/x/libXt-1.0.8-x86_64-1.txt
--rw-r--r--   1 root root    428064 2010-03-18 21:45 ./slackware64/x/libXt-1.0.8-x86_64-1.txz
--rw-r--r--   1 root root       198 2010-03-18 21:45 ./slackware64/x/libXt-1.0.8-x86_64-1.txz.asc
--rw-r--r--   1 root root       283 2010-02-22 20:08 ./slackware64/x/libXtst-1.1.0-x86_64-1.txt
--rw-r--r--   1 root root     19736 2010-02-22 20:08 ./slackware64/x/libXtst-1.1.0-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:08 ./slackware64/x/libXtst-1.1.0-x86_64-1.txz.asc
--rw-r--r--   1 root root       257 2010-02-22 20:08 ./slackware64/x/libXv-1.0.5-x86_64-1.txt
--rw-r--r--   1 root root     37304 2010-02-22 20:08 ./slackware64/x/libXv-1.0.5-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:08 ./slackware64/x/libXv-1.0.5-x86_64-1.txz.asc
--rw-r--r--   1 root root       283 2010-02-22 20:08 ./slackware64/x/libXvMC-1.0.5-x86_64-1.txt
--rw-r--r--   1 root root     24040 2010-02-22 20:08 ./slackware64/x/libXvMC-1.0.5-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:08 ./slackware64/x/libXvMC-1.0.5-x86_64-1.txz.asc
--rw-r--r--   1 root root       335 2010-02-22 20:08 ./slackware64/x/libXxf86dga-1.1.1-x86_64-1.txt
--rw-r--r--   1 root root     20708 2010-02-22 20:08 ./slackware64/x/libXxf86dga-1.1.1-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:08 ./slackware64/x/libXxf86dga-1.1.1-x86_64-1.txz.asc
--rw-r--r--   1 root root       348 2010-02-22 20:08 ./slackware64/x/libXxf86misc-1.0.2-x86_64-1.txt
--rw-r--r--   1 root root     11912 2010-02-22 20:08 ./slackware64/x/libXxf86misc-1.0.2-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:08 ./slackware64/x/libXxf86misc-1.0.2-x86_64-1.txz.asc
--rw-r--r--   1 root root       322 2010-02-22 20:08 ./slackware64/x/libXxf86vm-1.1.0-x86_64-1.txt
--rw-r--r--   1 root root     17528 2010-02-22 20:08 ./slackware64/x/libXxf86vm-1.1.0-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:08 ./slackware64/x/libXxf86vm-1.1.0-x86_64-1.txz.asc
--rw-r--r--   1 root root       270 2010-02-22 20:08 ./slackware64/x/libdmx-1.1.0-x86_64-1.txt
--rw-r--r--   1 root root     36392 2010-02-22 20:08 ./slackware64/x/libdmx-1.1.0-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:08 ./slackware64/x/libdmx-1.1.0-x86_64-1.txz.asc
--rw-r--r--   1 root root       260 2010-04-27 20:04 ./slackware64/x/libdrm-2.4.20-x86_64-1.txt
--rw-r--r--   1 root root    124076 2010-04-27 20:04 ./slackware64/x/libdrm-2.4.20-x86_64-1.txz
--rw-r--r--   1 root root       198 2010-04-27 20:04 ./slackware64/x/libdrm-2.4.20-x86_64-1.txz.asc
--rw-r--r--   1 root root       581 2008-11-06 15:32 ./slackware64/x/liberation-fonts-ttf-1.04-noarch-1.txt
--rw-r--r--   1 root root    683360 2008-11-06 15:32 ./slackware64/x/liberation-fonts-ttf-1.04-noarch-1.txz
--rw-r--r--   1 root root       197 2008-11-06 15:32 ./slackware64/x/liberation-fonts-ttf-1.04-noarch-1.txz.asc
--rw-r--r--   1 root root       322 2010-02-22 20:08 ./slackware64/x/libfontenc-1.0.5-x86_64-1.txt
--rw-r--r--   1 root root     17432 2010-02-22 20:08 ./slackware64/x/libfontenc-1.0.5-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:08 ./slackware64/x/libfontenc-1.0.5-x86_64-1.txz.asc
--rw-r--r--   1 root root       381 2008-11-05 14:32 ./slackware64/x/libhangul-0.0.7-x86_64-1.txt
--rw-r--r--   1 root root   1857876 2008-11-05 14:32 ./slackware64/x/libhangul-0.0.7-x86_64-1.txz
--rw-r--r--   1 root root       197 2008-11-05 14:32 ./slackware64/x/libhangul-0.0.7-x86_64-1.txz.asc
--rw-r--r--   1 root root       348 2010-02-22 20:08 ./slackware64/x/libpciaccess-0.11.0-x86_64-1.txt
--rw-r--r--   1 root root     32516 2010-02-22 20:08 ./slackware64/x/libpciaccess-0.11.0-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:08 ./slackware64/x/libpciaccess-0.11.0-x86_64-1.txz.asc
--rw-r--r--   1 root root       400 2010-02-22 20:01 ./slackware64/x/libpthread-stubs-0.3-noarch-1.txt
--rw-r--r--   1 root root      1904 2010-02-22 20:01 ./slackware64/x/libpthread-stubs-0.3-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:01 ./slackware64/x/libpthread-stubs-0.3-noarch-1.txz.asc
--rw-r--r--   1 root root       446 2010-04-27 20:53 ./slackware64/x/libxcb-1.6-x86_64-1.txt
--rw-r--r--   1 root root    221768 2010-04-27 20:53 ./slackware64/x/libxcb-1.6-x86_64-1.txz
--rw-r--r--   1 root root       198 2010-04-27 20:53 ./slackware64/x/libxcb-1.6-x86_64-1.txz.asc
--rw-r--r--   1 root root       322 2010-02-22 20:09 ./slackware64/x/libxkbfile-1.0.6-x86_64-1.txt
--rw-r--r--   1 root root     70656 2010-02-22 20:09 ./slackware64/x/libxkbfile-1.0.6-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:09 ./slackware64/x/libxkbfile-1.0.6-x86_64-1.txz.asc
--rw-r--r--   1 root root       296 2009-06-03 05:36 ./slackware64/x/libxkbui-1.0.2-x86_64-2.txt
--rw-r--r--   1 root root      8080 2009-06-03 05:36 ./slackware64/x/libxkbui-1.0.2-x86_64-2.txz
--rw-r--r--   1 root root       197 2009-06-03 05:36 ./slackware64/x/libxkbui-1.0.2-x86_64-2.txz.asc
--rw-r--r--   1 root root       283 2010-02-22 20:10 ./slackware64/x/listres-1.0.2-x86_64-1.txt
--rw-r--r--   1 root root     14712 2010-02-22 20:10 ./slackware64/x/listres-1.0.2-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:10 ./slackware64/x/listres-1.0.2-x86_64-1.txz.asc
--rw-r--r--   1 root root       257 2009-06-03 05:26 ./slackware64/x/lndir-1.0.1-x86_64-2.txt
--rw-r--r--   1 root root      6580 2009-06-03 05:26 ./slackware64/x/lndir-1.0.1-x86_64-2.txz
--rw-r--r--   1 root root       197 2009-06-03 05:26 ./slackware64/x/lndir-1.0.1-x86_64-2.txz.asc
--rw-r--r--   1 root root       244 2010-02-22 20:10 ./slackware64/x/luit-1.0.5-x86_64-1.txt
--rw-r--r--   1 root root     28828 2010-02-22 20:10 ./slackware64/x/luit-1.0.5-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:10 ./slackware64/x/luit-1.0.5-x86_64-1.txz.asc
--rw-r--r--   1 root root       416 2009-04-20 14:11 ./slackware64/x/m17n-lib-1.5.4-x86_64-1.txt
--rw-r--r--   1 root root   2163616 2009-04-20 14:11 ./slackware64/x/m17n-lib-1.5.4-x86_64-1.txz
--rw-r--r--   1 root root       197 2009-04-20 14:11 ./slackware64/x/m17n-lib-1.5.4-x86_64-1.txz.asc
--rw-r--r--   1 root root       322 2010-02-22 20:01 ./slackware64/x/makedepend-1.0.2-x86_64-1.txt
--rw-r--r--   1 root root     23500 2010-02-22 20:01 ./slackware64/x/makedepend-1.0.2-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:01 ./slackware64/x/makedepend-1.0.2-x86_64-1.txz.asc
--rw-r--r--   1 root root     23599 2010-04-27 21:56 ./slackware64/x/maketag
--rw-r--r--   1 root root     23599 2010-04-27 21:56 ./slackware64/x/maketag.ez
--rw-r--r--   1 root root       335 2010-04-27 20:25 ./slackware64/x/mesa-7.8.1-x86_64-1.txt
--rw-r--r--   1 root root   3862240 2010-04-27 20:25 ./slackware64/x/mesa-7.8.1-x86_64-1.txz
--rw-r--r--   1 root root       198 2010-04-27 20:25 ./slackware64/x/mesa-7.8.1-x86_64-1.txz.asc
--rw-r--r--   1 root root       374 2010-02-22 20:10 ./slackware64/x/mkcomposecache-1.2.1-x86_64-1.txt
--rw-r--r--   1 root root      9244 2010-02-22 20:10 ./slackware64/x/mkcomposecache-1.2.1-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:10 ./slackware64/x/mkcomposecache-1.2.1-x86_64-1.txz.asc
--rw-r--r--   1 root root       309 2010-02-22 20:10 ./slackware64/x/mkfontdir-1.0.5-noarch-1.txt
--rw-r--r--   1 root root      8476 2010-02-22 20:10 ./slackware64/x/mkfontdir-1.0.5-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:10 ./slackware64/x/mkfontdir-1.0.5-noarch-1.txz.asc
--rw-r--r--   1 root root       335 2010-02-22 20:10 ./slackware64/x/mkfontscale-1.0.7-x86_64-1.txt
--rw-r--r--   1 root root     20944 2010-02-22 20:10 ./slackware64/x/mkfontscale-1.0.7-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:10 ./slackware64/x/mkfontscale-1.0.7-x86_64-1.txz.asc
--rw-r--r--   1 root root       270 2009-06-03 05:38 ./slackware64/x/oclock-1.0.1-x86_64-2.txt
--rw-r--r--   1 root root      9056 2009-06-03 05:38 ./slackware64/x/oclock-1.0.1-x86_64-2.txz
--rw-r--r--   1 root root       197 2009-06-03 05:38 ./slackware64/x/oclock-1.0.1-x86_64-2.txz.asc
--rw-r--r--   1 root root       337 2010-02-22 20:09 ./slackware64/x/pixman-0.16.6-x86_64-1.txt
--rw-r--r--   1 root root    136520 2010-02-22 20:09 ./slackware64/x/pixman-0.16.6-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:09 ./slackware64/x/pixman-0.16.6-x86_64-1.txz.asc
--rw-r--r--   1 root root       322 2009-06-03 05:25 ./slackware64/x/printproto-1.0.4-noarch-2.txt
--rw-r--r--   1 root root      8176 2009-06-03 05:25 ./slackware64/x/printproto-1.0.4-noarch-2.txz
--rw-r--r--   1 root root       197 2009-06-03 05:25 ./slackware64/x/printproto-1.0.4-noarch-2.txz.asc
--rw-r--r--   1 root root       322 2010-02-22 20:00 ./slackware64/x/randrproto-1.3.1-noarch-1.txt
--rw-r--r--   1 root root     31216 2010-02-22 20:00 ./slackware64/x/randrproto-1.3.1-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:00 ./slackware64/x/randrproto-1.3.1-noarch-1.txz.asc
--rw-r--r--   1 root root       335 2010-02-22 20:00 ./slackware64/x/recordproto-1.14-noarch-1.txt
--rw-r--r--   1 root root      5704 2010-02-22 20:00 ./slackware64/x/recordproto-1.14-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:00 ./slackware64/x/recordproto-1.14-noarch-1.txz.asc
--rw-r--r--   1 root root       335 2009-06-03 05:38 ./slackware64/x/rendercheck-1.3-x86_64-2.txt
--rw-r--r--   1 root root     18748 2009-06-03 05:38 ./slackware64/x/rendercheck-1.3-x86_64-2.txz
--rw-r--r--   1 root root       197 2009-06-03 05:38 ./slackware64/x/rendercheck-1.3-x86_64-2.txz.asc
--rw-r--r--   1 root root       335 2009-08-04 00:35 ./slackware64/x/renderproto-0.11-noarch-1.txt
--rw-r--r--   1 root root     15320 2009-08-04 00:35 ./slackware64/x/renderproto-0.11-noarch-1.txz
--rw-r--r--   1 root root       197 2009-08-04 00:35 ./slackware64/x/renderproto-0.11-noarch-1.txz.asc
--rw-r--r--   1 root root       361 2010-02-22 20:00 ./slackware64/x/resourceproto-1.1.0-noarch-1.txt
--rw-r--r--   1 root root      4236 2010-02-22 20:00 ./slackware64/x/resourceproto-1.1.0-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:00 ./slackware64/x/resourceproto-1.1.0-noarch-1.txz.asc
--rw-r--r--   1 root root       231 2009-06-03 05:39 ./slackware64/x/rgb-1.0.3-x86_64-1.txt
--rw-r--r--   1 root root      7676 2009-06-03 05:39 ./slackware64/x/rgb-1.0.3-x86_64-1.txz
--rw-r--r--   1 root root       197 2009-06-03 05:39 ./slackware64/x/rgb-1.0.3-x86_64-1.txz.asc
--rw-r--r--   1 root root       270 2009-08-04 00:52 ./slackware64/x/rstart-1.0.3-x86_64-1.txt
--rw-r--r--   1 root root     16596 2009-08-04 00:52 ./slackware64/x/rstart-1.0.3-x86_64-1.txz
--rw-r--r--   1 root root       197 2009-08-04 00:52 ./slackware64/x/rstart-1.0.3-x86_64-1.txz.asc
--rw-r--r--   1 root root       403 2008-11-06 16:24 ./slackware64/x/sazanami-fonts-ttf-20040629-noarch-1.txt
--rw-r--r--   1 root root   5974804 2008-11-06 16:24 ./slackware64/x/sazanami-fonts-ttf-20040629-noarch-1.txz
--rw-r--r--   1 root root       197 2008-11-06 16:24 ./slackware64/x/sazanami-fonts-ttf-20040629-noarch-1.txz.asc
--rw-r--r--   1 root root       330 2009-06-09 00:28 ./slackware64/x/scim-1.4.9-x86_64-4.txt
--rw-r--r--   1 root root   1055072 2009-06-09 00:28 ./slackware64/x/scim-1.4.9-x86_64-4.txz
--rw-r--r--   1 root root       197 2009-06-09 00:28 ./slackware64/x/scim-1.4.9-x86_64-4.txz.asc
--rw-r--r--   1 root root       508 2009-06-10 01:43 ./slackware64/x/scim-anthy-1.2.4-x86_64-2.txt
--rw-r--r--   1 root root    250080 2009-06-10 01:43 ./slackware64/x/scim-anthy-1.2.4-x86_64-2.txz
--rw-r--r--   1 root root       197 2009-06-10 01:43 ./slackware64/x/scim-anthy-1.2.4-x86_64-2.txz.asc
--rw-r--r--   1 root root       505 2009-06-10 01:46 ./slackware64/x/scim-bridge-0.4.16-x86_64-4.txt
--rw-r--r--   1 root root    115348 2009-06-10 01:46 ./slackware64/x/scim-bridge-0.4.16-x86_64-4.txz
--rw-r--r--   1 root root       197 2009-06-10 01:46 ./slackware64/x/scim-bridge-0.4.16-x86_64-4.txz.asc
--rw-r--r--   1 root root       611 2009-06-10 01:52 ./slackware64/x/scim-hangul-0.3.2-x86_64-2.txt
--rw-r--r--   1 root root     44956 2009-06-10 01:52 ./slackware64/x/scim-hangul-0.3.2-x86_64-2.txz
--rw-r--r--   1 root root       197 2009-06-10 01:52 ./slackware64/x/scim-hangul-0.3.2-x86_64-2.txz.asc
--rw-r--r--   1 root root       356 2009-06-10 01:53 ./slackware64/x/scim-input-pad-0.1.2-x86_64-4.txt
--rw-r--r--   1 root root     69624 2009-06-10 01:53 ./slackware64/x/scim-input-pad-0.1.2-x86_64-4.txz
--rw-r--r--   1 root root       197 2009-06-10 01:53 ./slackware64/x/scim-input-pad-0.1.2-x86_64-4.txz.asc
--rw-r--r--   1 root root       402 2009-04-20 14:18 ./slackware64/x/scim-m17n-0.2.3-x86_64-1.txt
--rw-r--r--   1 root root     32356 2009-04-20 14:18 ./slackware64/x/scim-m17n-0.2.3-x86_64-1.txz
--rw-r--r--   1 root root       197 2009-04-20 14:18 ./slackware64/x/scim-m17n-0.2.3-x86_64-1.txz.asc
--rw-r--r--   1 root root       386 2009-06-10 01:55 ./slackware64/x/scim-pinyin-0.5.91-x86_64-2.txt
--rw-r--r--   1 root root   1670432 2009-06-10 01:55 ./slackware64/x/scim-pinyin-0.5.91-x86_64-2.txz
--rw-r--r--   1 root root       197 2009-06-10 01:55 ./slackware64/x/scim-pinyin-0.5.91-x86_64-2.txz.asc
--rw-r--r--   1 root root       289 2009-06-10 01:56 ./slackware64/x/scim-tables-0.5.9-x86_64-3.txt
--rw-r--r--   1 root root   3977628 2009-06-10 01:56 ./slackware64/x/scim-tables-0.5.9-x86_64-3.txz
--rw-r--r--   1 root root       197 2009-06-10 01:56 ./slackware64/x/scim-tables-0.5.9-x86_64-3.txz.asc
--rw-r--r--   1 root root       283 2009-06-03 05:39 ./slackware64/x/scripts-1.0.1-noarch-2.txt
--rw-r--r--   1 root root      6628 2009-06-03 05:39 ./slackware64/x/scripts-1.0.1-noarch-2.txz
--rw-r--r--   1 root root       197 2009-06-03 05:39 ./slackware64/x/scripts-1.0.1-noarch-2.txz.asc
--rw-r--r--   1 root root       374 2010-02-22 20:00 ./slackware64/x/scrnsaverproto-1.2.0-noarch-1.txt
--rw-r--r--   1 root root      5052 2010-02-22 20:00 ./slackware64/x/scrnsaverproto-1.2.0-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:00 ./slackware64/x/scrnsaverproto-1.2.0-noarch-1.txz.asc
--rw-r--r--   1 root root       283 2010-02-22 20:11 ./slackware64/x/sessreg-1.0.5-x86_64-1.txt
--rw-r--r--   1 root root     11724 2010-02-22 20:11 ./slackware64/x/sessreg-1.0.5-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:11 ./slackware64/x/sessreg-1.0.5-x86_64-1.txz.asc
--rw-r--r--   1 root root       309 2009-08-04 00:35 ./slackware64/x/setxkbmap-1.1.0-x86_64-1.txt
--rw-r--r--   1 root root     10400 2009-08-04 00:35 ./slackware64/x/setxkbmap-1.1.0-x86_64-1.txz
--rw-r--r--   1 root root       197 2009-08-04 00:35 ./slackware64/x/setxkbmap-1.1.0-x86_64-1.txz.asc
--rw-r--r--   1 root root       296 2009-06-03 05:39 ./slackware64/x/showfont-1.0.2-x86_64-1.txt
--rw-r--r--   1 root root      6660 2009-06-03 05:39 ./slackware64/x/showfont-1.0.2-x86_64-1.txz
--rw-r--r--   1 root root       197 2009-06-03 05:39 ./slackware64/x/showfont-1.0.2-x86_64-1.txz.asc
--rw-r--r--   1 root root       473 2008-11-06 18:22 ./slackware64/x/sinhala_lklug-font-ttf-20060929-noarch-1.txt
--rw-r--r--   1 root root     67728 2008-11-06 18:22 ./slackware64/x/sinhala_lklug-font-ttf-20060929-noarch-1.txz
--rw-r--r--   1 root root       197 2008-11-06 18:22 ./slackware64/x/sinhala_lklug-font-ttf-20060929-noarch-1.txz.asc
--rw-r--r--   1 root root       283 2010-02-22 20:11 ./slackware64/x/smproxy-1.0.3-x86_64-1.txt
--rw-r--r--   1 root root     13256 2010-02-22 20:11 ./slackware64/x/smproxy-1.0.3-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:11 ./slackware64/x/smproxy-1.0.3-x86_64-1.txz.asc
--rw-r--r--   1 root root      4756 2010-04-27 21:56 ./slackware64/x/tagfile
--rw-r--r--   1 root root       561 2008-11-06 18:23 ./slackware64/x/tibmachuni-font-ttf-1.901-noarch-1.txt
--rw-r--r--   1 root root    860064 2008-11-06 18:23 ./slackware64/x/tibmachuni-font-ttf-1.901-noarch-1.txz
--rw-r--r--   1 root root       197 2008-11-06 18:23 ./slackware64/x/tibmachuni-font-ttf-1.901-noarch-1.txz.asc
--rw-r--r--   1 root root       309 2009-06-03 05:25 ./slackware64/x/trapproto-3.4.3-noarch-2.txt
--rw-r--r--   1 root root     12824 2009-06-03 05:25 ./slackware64/x/trapproto-3.4.3-noarch-2.txz
--rw-r--r--   1 root root       197 2009-06-03 05:25 ./slackware64/x/trapproto-3.4.3-noarch-2.txz.asc
--rw-r--r--   1 root root       621 2008-11-06 18:24 ./slackware64/x/ttf-indic-fonts-0.4.7.4-noarch-1.txt
--rw-r--r--   1 root root   2183528 2008-11-06 18:24 ./slackware64/x/ttf-indic-fonts-0.4.7.4-noarch-1.txz
--rw-r--r--   1 root root       197 2008-11-06 18:24 ./slackware64/x/ttf-indic-fonts-0.4.7.4-noarch-1.txz.asc
--rw-r--r--   1 root root       231 2010-02-22 20:11 ./slackware64/x/twm-1.0.4-x86_64-3.txt
--rw-r--r--   1 root root     98568 2010-02-22 20:11 ./slackware64/x/twm-1.0.4-x86_64-3.txz
--rw-r--r--   1 root root       197 2010-02-22 20:11 ./slackware64/x/twm-1.0.4-x86_64-3.txz.asc
--rw-r--r--   1 root root       335 2010-04-27 20:52 ./slackware64/x/util-macros-1.7.0-noarch-1.txt
--rw-r--r--   1 root root     23128 2010-04-27 20:52 ./slackware64/x/util-macros-1.7.0-noarch-1.txz
--rw-r--r--   1 root root       198 2010-04-27 20:52 ./slackware64/x/util-macros-1.7.0-noarch-1.txz.asc
--rw-r--r--   1 root root       322 2010-02-22 20:00 ./slackware64/x/videoproto-2.3.0-noarch-1.txt
--rw-r--r--   1 root root      9452 2010-02-22 20:00 ./slackware64/x/videoproto-2.3.0-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:00 ./slackware64/x/videoproto-2.3.0-noarch-1.txz.asc
--rw-r--r--   1 root root       283 2010-02-22 20:11 ./slackware64/x/viewres-1.0.2-x86_64-1.txt
--rw-r--r--   1 root root     22048 2010-02-22 20:11 ./slackware64/x/viewres-1.0.2-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:11 ./slackware64/x/viewres-1.0.2-x86_64-1.txz.asc
--rw-r--r--   1 root root       686 2009-04-20 19:13 ./slackware64/x/wqy-zenhei-font-ttf-0.8.38_1-noarch-1.txt
--rw-r--r--   1 root root   5752036 2009-04-20 19:13 ./slackware64/x/wqy-zenhei-font-ttf-0.8.38_1-noarch-1.txz
--rw-r--r--   1 root root       197 2009-04-20 19:13 ./slackware64/x/wqy-zenhei-font-ttf-0.8.38_1-noarch-1.txz.asc
--rw-r--r--   1 root root       607 2009-06-08 20:29 ./slackware64/x/x11-skel-7.4-x86_64-1.txt
--rw-r--r--   1 root root     12176 2009-06-08 20:29 ./slackware64/x/x11-skel-7.4-x86_64-1.txz
--rw-r--r--   1 root root       197 2009-06-08 20:29 ./slackware64/x/x11-skel-7.4-x86_64-1.txz.asc
--rw-r--r--   1 root root       283 2010-02-22 20:11 ./slackware64/x/x11perf-1.5.1-x86_64-1.txt
--rw-r--r--   1 root root     60156 2010-02-22 20:11 ./slackware64/x/x11perf-1.5.1-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:11 ./slackware64/x/x11perf-1.5.1-x86_64-1.txz.asc
--rw-r--r--   1 root root       257 2010-02-22 20:11 ./slackware64/x/xauth-1.0.4-x86_64-1.txt
--rw-r--r--   1 root root     25428 2010-02-22 20:11 ./slackware64/x/xauth-1.0.4-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:11 ./slackware64/x/xauth-1.0.4-x86_64-1.txz.asc
--rw-r--r--   1 root root       519 2008-11-04 22:19 ./slackware64/x/xaw3d-1.5E-x86_64-1.txt
--rw-r--r--   1 root root    166100 2008-11-04 22:19 ./slackware64/x/xaw3d-1.5E-x86_64-1.txz
--rw-r--r--   1 root root       197 2008-11-04 22:19 ./slackware64/x/xaw3d-1.5E-x86_64-1.txz.asc
--rw-r--r--   1 root root       322 2010-02-22 20:11 ./slackware64/x/xbacklight-1.1.1-x86_64-1.txt
--rw-r--r--   1 root root      7612 2010-02-22 20:11 ./slackware64/x/xbacklight-1.1.1-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:11 ./slackware64/x/xbacklight-1.1.1-x86_64-1.txz.asc
--rw-r--r--   1 root root       257 2010-02-22 20:11 ./slackware64/x/xbiff-1.0.2-x86_64-1.txt
--rw-r--r--   1 root root     17920 2010-02-22 20:11 ./slackware64/x/xbiff-1.0.2-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:11 ./slackware64/x/xbiff-1.0.2-x86_64-1.txz.asc
--rw-r--r--   1 root root       296 2010-02-22 20:01 ./slackware64/x/xbitmaps-1.1.0-noarch-1.txt
--rw-r--r--   1 root root     20784 2010-02-22 20:01 ./slackware64/x/xbitmaps-1.1.0-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:01 ./slackware64/x/xbitmaps-1.1.0-noarch-1.txz.asc
--rw-r--r--   1 root root       257 2010-02-22 20:11 ./slackware64/x/xcalc-1.0.3-x86_64-1.txt
--rw-r--r--   1 root root     29876 2010-02-22 20:11 ./slackware64/x/xcalc-1.0.3-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:11 ./slackware64/x/xcalc-1.0.3-x86_64-1.txz.asc
--rw-r--r--   1 root root       309 2010-02-22 20:02 ./slackware64/x/xcb-proto-1.6-noarch-1.txt
--rw-r--r--   1 root root     51536 2010-02-22 20:02 ./slackware64/x/xcb-proto-1.6-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:02 ./slackware64/x/xcb-proto-1.6-noarch-1.txz.asc
--rw-r--r--   1 root root       296 2010-02-22 20:02 ./slackware64/x/xcb-util-0.3.6-x86_64-1.txt
--rw-r--r--   1 root root     45544 2010-02-22 20:02 ./slackware64/x/xcb-util-0.3.6-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:02 ./slackware64/x/xcb-util-0.3.6-x86_64-1.txz.asc
--rw-r--r--   1 root root       322 2010-02-22 20:11 ./slackware64/x/xclipboard-1.1.0-x86_64-1.txt
--rw-r--r--   1 root root     19048 2010-02-22 20:11 ./slackware64/x/xclipboard-1.1.0-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:11 ./slackware64/x/xclipboard-1.1.0-x86_64-1.txz.asc
--rw-r--r--   1 root root       270 2010-02-22 20:11 ./slackware64/x/xclock-1.0.4-x86_64-1.txt
--rw-r--r--   1 root root     31708 2010-02-22 20:11 ./slackware64/x/xclock-1.0.4-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:11 ./slackware64/x/xclock-1.0.4-x86_64-1.txz.asc
--rw-r--r--   1 root root       335 2010-02-22 20:00 ./slackware64/x/xcmiscproto-1.2.0-noarch-1.txt
--rw-r--r--   1 root root      4192 2010-02-22 20:00 ./slackware64/x/xcmiscproto-1.2.0-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:00 ./slackware64/x/xcmiscproto-1.2.0-noarch-1.txz.asc
--rw-r--r--   1 root root       270 2010-02-22 20:11 ./slackware64/x/xcmsdb-1.0.2-x86_64-1.txt
--rw-r--r--   1 root root     17004 2010-02-22 20:11 ./slackware64/x/xcmsdb-1.0.2-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:11 ./slackware64/x/xcmsdb-1.0.2-x86_64-1.txz.asc
--rw-r--r--   1 root root       296 2010-02-22 20:11 ./slackware64/x/xcompmgr-1.1.5-x86_64-1.txt
--rw-r--r--   1 root root     21896 2010-02-22 20:11 ./slackware64/x/xcompmgr-1.1.5-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:11 ./slackware64/x/xcompmgr-1.1.5-x86_64-1.txz.asc
--rw-r--r--   1 root root       296 2009-06-03 05:40 ./slackware64/x/xconsole-1.0.3-x86_64-2.txt
--rw-r--r--   1 root root      8736 2009-06-03 05:40 ./slackware64/x/xconsole-1.0.3-x86_64-2.txz
--rw-r--r--   1 root root       197 2009-06-03 05:40 ./slackware64/x/xconsole-1.0.3-x86_64-2.txz.asc
--rw-r--r--   1 root root       374 2010-02-22 20:01 ./slackware64/x/xcursor-themes-1.0.2-noarch-1.txt
--rw-r--r--   1 root root    315296 2010-02-22 20:01 ./slackware64/x/xcursor-themes-1.0.2-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:01 ./slackware64/x/xcursor-themes-1.0.2-noarch-1.txz.asc
--rw-r--r--   1 root root       322 2010-02-22 20:12 ./slackware64/x/xcursorgen-1.0.3-x86_64-1.txt
--rw-r--r--   1 root root     14080 2010-02-22 20:12 ./slackware64/x/xcursorgen-1.0.3-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:12 ./slackware64/x/xcursorgen-1.0.3-x86_64-1.txz.asc
--rw-r--r--   1 root root       309 2009-06-03 05:40 ./slackware64/x/xdbedizzy-1.0.2-x86_64-2.txt
--rw-r--r--   1 root root      8492 2009-06-03 05:40 ./slackware64/x/xdbedizzy-1.0.2-x86_64-2.txz
--rw-r--r--   1 root root       197 2009-06-03 05:40 ./slackware64/x/xdbedizzy-1.0.2-x86_64-2.txz.asc
--rw-r--r--   1 root root       550 2010-05-06 19:28 ./slackware64/x/xdg-utils-1.0.2-noarch-4.txt
--rw-r--r--   1 root root     46956 2010-05-06 19:28 ./slackware64/x/xdg-utils-1.0.2-noarch-4.txz
--rw-r--r--   1 root root       198 2010-05-06 19:28 ./slackware64/x/xdg-utils-1.0.2-noarch-4.txz.asc
--rw-r--r--   1 root root       296 2009-06-03 05:40 ./slackware64/x/xditview-1.0.1-x86_64-2.txt
--rw-r--r--   1 root root     21056 2009-06-03 05:40 ./slackware64/x/xditview-1.0.1-x86_64-2.txz
--rw-r--r--   1 root root       197 2009-06-03 05:40 ./slackware64/x/xditview-1.0.1-x86_64-2.txz.asc
--rw-r--r--   1 root root       231 2010-04-27 21:02 ./slackware64/x/xdm-1.1.10-x86_64-1.txt
--rw-r--r--   1 root root    117264 2010-04-27 21:02 ./slackware64/x/xdm-1.1.10-x86_64-1.txz
--rw-r--r--   1 root root       198 2010-04-27 21:02 ./slackware64/x/xdm-1.1.10-x86_64-1.txz.asc
--rw-r--r--   1 root root       296 2010-02-22 20:12 ./slackware64/x/xdpyinfo-1.1.0-x86_64-1.txt
--rw-r--r--   1 root root     26344 2010-02-22 20:12 ./slackware64/x/xdpyinfo-1.1.0-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:12 ./slackware64/x/xdpyinfo-1.1.0-x86_64-1.txz.asc
--rw-r--r--   1 root root       296 2010-02-22 20:12 ./slackware64/x/xdriinfo-1.0.3-x86_64-1.txt
--rw-r--r--   1 root root     10572 2010-02-22 20:12 ./slackware64/x/xdriinfo-1.0.3-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:12 ./slackware64/x/xdriinfo-1.0.3-x86_64-1.txz.asc
--rw-r--r--   1 root root       257 2009-06-03 05:40 ./slackware64/x/xedit-1.1.2-x86_64-1.txt
--rw-r--r--   1 root root    282684 2009-06-03 05:40 ./slackware64/x/xedit-1.1.2-x86_64-1.txz
--rw-r--r--   1 root root       197 2009-06-03 05:40 ./slackware64/x/xedit-1.1.2-x86_64-1.txz.asc
--rw-r--r--   1 root root       231 2010-02-22 20:12 ./slackware64/x/xev-1.0.4-x86_64-1.txt
--rw-r--r--   1 root root     14548 2010-02-22 20:12 ./slackware64/x/xev-1.0.4-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:12 ./slackware64/x/xev-1.0.4-x86_64-1.txz.asc
--rw-r--r--   1 root root       309 2010-02-22 20:00 ./slackware64/x/xextproto-7.1.1-noarch-1.txt
--rw-r--r--   1 root root     24472 2010-02-22 20:00 ./slackware64/x/xextproto-7.1.1-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:00 ./slackware64/x/xextproto-7.1.1-noarch-1.txz.asc
--rw-r--r--   1 root root       257 2010-02-22 20:12 ./slackware64/x/xeyes-1.1.0-x86_64-1.txt
--rw-r--r--   1 root root     13956 2010-02-22 20:12 ./slackware64/x/xeyes-1.1.0-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:12 ./slackware64/x/xeyes-1.1.0-x86_64-1.txz.asc
--rw-r--r--   1 root root       413 2010-02-22 20:15 ./slackware64/x/xf86-input-acecad-1.4.0-x86_64-1.txt
--rw-r--r--   1 root root     18124 2010-02-22 20:15 ./slackware64/x/xf86-input-acecad-1.4.0-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:15 ./slackware64/x/xf86-input-acecad-1.4.0-x86_64-1.txz.asc
--rw-r--r--   1 root root       413 2010-02-22 20:16 ./slackware64/x/xf86-input-aiptek-1.3.0-x86_64-1.txt
--rw-r--r--   1 root root     19348 2010-02-22 20:16 ./slackware64/x/xf86-input-aiptek-1.3.0-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:16 ./slackware64/x/xf86-input-aiptek-1.3.0-x86_64-1.txz.asc
--rw-r--r--   1 root root       400 2010-04-27 20:58 ./slackware64/x/xf86-input-evdev-2.3.3-x86_64-1.txt
--rw-r--r--   1 root root     32984 2010-04-27 20:58 ./slackware64/x/xf86-input-evdev-2.3.3-x86_64-1.txz
--rw-r--r--   1 root root       198 2010-04-27 20:58 ./slackware64/x/xf86-input-evdev-2.3.3-x86_64-1.txz.asc
--rw-r--r--   1 root root       439 2010-02-22 20:17 ./slackware64/x/xf86-input-joystick-1.4.99.2-x86_64-1.txt
--rw-r--r--   1 root root     33156 2010-02-22 20:17 ./slackware64/x/xf86-input-joystick-1.4.99.2-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:17 ./slackware64/x/xf86-input-joystick-1.4.99.2-x86_64-1.txz.asc
--rw-r--r--   1 root root       439 2010-02-22 20:17 ./slackware64/x/xf86-input-keyboard-1.4.0-x86_64-1.txt
--rw-r--r--   1 root root     24064 2010-02-22 20:17 ./slackware64/x/xf86-input-keyboard-1.4.0-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:17 ./slackware64/x/xf86-input-keyboard-1.4.0-x86_64-1.txz.asc
--rw-r--r--   1 root root       400 2010-02-22 20:17 ./slackware64/x/xf86-input-mouse-1.5.0-x86_64-1.txt
--rw-r--r--   1 root root     49512 2010-02-22 20:17 ./slackware64/x/xf86-input-mouse-1.5.0-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:17 ./slackware64/x/xf86-input-mouse-1.5.0-x86_64-1.txz.asc
--rw-r--r--   1 root root       439 2010-03-06 06:16 ./slackware64/x/xf86-input-penmount-1.4.1-x86_64-1.txt
--rw-r--r--   1 root root     12824 2010-03-06 06:16 ./slackware64/x/xf86-input-penmount-1.4.1-x86_64-1.txz
--rw-r--r--   1 root root       198 2010-03-06 06:16 ./slackware64/x/xf86-input-penmount-1.4.1-x86_64-1.txz.asc
--rw-r--r--   1 root root       452 2010-04-24 18:02 ./slackware64/x/xf86-input-synaptics-1.2.2-x86_64-1.txt
--rw-r--r--   1 root root     48688 2010-04-24 18:02 ./slackware64/x/xf86-input-synaptics-1.2.2-x86_64-1.txz
--rw-r--r--   1 root root       198 2010-04-24 18:02 ./slackware64/x/xf86-input-synaptics-1.2.2-x86_64-1.txz.asc
--rw-r--r--   1 root root       426 2010-05-02 00:52 ./slackware64/x/xf86-input-vmmouse-12.6.9-x86_64-2.txt
--rw-r--r--   1 root root     22632 2010-05-02 00:52 ./slackware64/x/xf86-input-vmmouse-12.6.9-x86_64-2.txz
--rw-r--r--   1 root root       198 2010-05-02 00:52 ./slackware64/x/xf86-input-vmmouse-12.6.9-x86_64-2.txz.asc
--rw-r--r--   1 root root       387 2010-02-22 20:18 ./slackware64/x/xf86-input-void-1.3.0-x86_64-1.txt
--rw-r--r--   1 root root     10148 2010-02-22 20:18 ./slackware64/x/xf86-input-void-1.3.0-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:18 ./slackware64/x/xf86-input-void-1.3.0-x86_64-1.txz.asc
--rw-r--r--   1 root root       400 2010-04-27 20:59 ./slackware64/x/xf86-input-wacom-0.10.5-x86_64-1.txt
--rw-r--r--   1 root root     59752 2010-04-27 20:59 ./slackware64/x/xf86-input-wacom-0.10.5-x86_64-1.txz
--rw-r--r--   1 root root       198 2010-04-27 20:59 ./slackware64/x/xf86-input-wacom-0.10.5-x86_64-1.txz.asc
--rw-r--r--   1 root root       374 2010-02-22 20:18 ./slackware64/x/xf86-video-apm-1.2.2-x86_64-2.txt
--rw-r--r--   1 root root     55460 2010-02-22 20:18 ./slackware64/x/xf86-video-apm-1.2.2-x86_64-2.txz
--rw-r--r--   1 root root       197 2010-02-22 20:18 ./slackware64/x/xf86-video-apm-1.2.2-x86_64-2.txz.asc
--rw-r--r--   1 root root       374 2010-02-22 20:18 ./slackware64/x/xf86-video-ark-0.7.2-x86_64-1.txt
--rw-r--r--   1 root root      9764 2010-02-22 20:18 ./slackware64/x/xf86-video-ark-0.7.2-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:18 ./slackware64/x/xf86-video-ark-0.7.2-x86_64-1.txz.asc
--rw-r--r--   1 root root       374 2010-02-22 20:18 ./slackware64/x/xf86-video-ast-0.89.9-x86_64-2.txt
--rw-r--r--   1 root root     22344 2010-02-22 20:18 ./slackware64/x/xf86-video-ast-0.89.9-x86_64-2.txz
--rw-r--r--   1 root root       197 2010-02-22 20:18 ./slackware64/x/xf86-video-ast-0.89.9-x86_64-2.txz.asc
--rw-r--r--   1 root root       374 2010-04-27 21:00 ./slackware64/x/xf86-video-ati-6.13.0-x86_64-1.txt
--rw-r--r--   1 root root    339860 2010-04-27 21:00 ./slackware64/x/xf86-video-ati-6.13.0-x86_64-1.txz
--rw-r--r--   1 root root       198 2010-04-27 21:00 ./slackware64/x/xf86-video-ati-6.13.0-x86_64-1.txz.asc
--rw-r--r--   1 root root       400 2010-02-22 20:19 ./slackware64/x/xf86-video-chips-1.2.2-x86_64-1.txt
--rw-r--r--   1 root root     79204 2010-02-22 20:19 ./slackware64/x/xf86-video-chips-1.2.2-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:19 ./slackware64/x/xf86-video-chips-1.2.2-x86_64-1.txz.asc
--rw-r--r--   1 root root       413 2010-02-22 20:19 ./slackware64/x/xf86-video-cirrus-1.3.2-x86_64-2.txt
--rw-r--r--   1 root root     35976 2010-02-22 20:19 ./slackware64/x/xf86-video-cirrus-1.3.2-x86_64-2.txz
--rw-r--r--   1 root root       197 2010-02-22 20:19 ./slackware64/x/xf86-video-cirrus-1.3.2-x86_64-2.txz.asc
--rw-r--r--   1 root root       400 2010-02-22 20:19 ./slackware64/x/xf86-video-dummy-0.3.3-x86_64-1.txt
--rw-r--r--   1 root root     12128 2010-02-22 20:19 ./slackware64/x/xf86-video-dummy-0.3.3-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:19 ./slackware64/x/xf86-video-dummy-0.3.3-x86_64-1.txz.asc
--rw-r--r--   1 root root       400 2010-02-22 20:20 ./slackware64/x/xf86-video-glint-1.2.4-x86_64-2.txt
--rw-r--r--   1 root root     77012 2010-02-22 20:20 ./slackware64/x/xf86-video-glint-1.2.4-x86_64-2.txz
--rw-r--r--   1 root root       197 2010-02-22 20:20 ./slackware64/x/xf86-video-glint-1.2.4-x86_64-2.txz.asc
--rw-r--r--   1 root root       387 2010-02-22 20:20 ./slackware64/x/xf86-video-i128-1.3.3-x86_64-2.txt
--rw-r--r--   1 root root     24116 2010-02-22 20:20 ./slackware64/x/xf86-video-i128-1.3.3-x86_64-2.txz
--rw-r--r--   1 root root       197 2010-02-22 20:20 ./slackware64/x/xf86-video-i128-1.3.3-x86_64-2.txz.asc
--rw-r--r--   1 root root       387 2010-02-22 20:20 ./slackware64/x/xf86-video-i740-1.3.2-x86_64-2.txt
--rw-r--r--   1 root root     24380 2010-02-22 20:20 ./slackware64/x/xf86-video-i740-1.3.2-x86_64-2.txz
--rw-r--r--   1 root root       197 2010-02-22 20:20 ./slackware64/x/xf86-video-i740-1.3.2-x86_64-2.txz.asc
--rw-r--r--   1 root root       400 2010-04-27 21:01 ./slackware64/x/xf86-video-intel-2.11.0-x86_64-1.txt
--rw-r--r--   1 root root    181460 2010-04-27 21:01 ./slackware64/x/xf86-video-intel-2.11.0-x86_64-1.txz
--rw-r--r--   1 root root       198 2010-04-27 21:01 ./slackware64/x/xf86-video-intel-2.11.0-x86_64-1.txz.asc
--rw-r--r--   1 root root       413 2010-02-22 20:21 ./slackware64/x/xf86-video-mach64-6.8.2-x86_64-2.txt
--rw-r--r--   1 root root     94504 2010-02-22 20:21 ./slackware64/x/xf86-video-mach64-6.8.2-x86_64-2.txz
--rw-r--r--   1 root root       197 2010-02-22 20:21 ./slackware64/x/xf86-video-mach64-6.8.2-x86_64-2.txz.asc
--rw-r--r--   1 root root       374 2010-02-22 20:21 ./slackware64/x/xf86-video-mga-1.4.11-x86_64-2.txt
--rw-r--r--   1 root root     87576 2010-02-22 20:21 ./slackware64/x/xf86-video-mga-1.4.11-x86_64-2.txz
--rw-r--r--   1 root root       197 2010-02-22 20:21 ./slackware64/x/xf86-video-mga-1.4.11-x86_64-2.txz.asc
--rw-r--r--   1 root root       439 2010-02-22 20:21 ./slackware64/x/xf86-video-neomagic-1.2.4-x86_64-2.txt
--rw-r--r--   1 root root     32852 2010-02-22 20:21 ./slackware64/x/xf86-video-neomagic-1.2.4-x86_64-2.txz
--rw-r--r--   1 root root       197 2010-02-22 20:21 ./slackware64/x/xf86-video-neomagic-1.2.4-x86_64-2.txz.asc
--rw-r--r--   1 root root       645 2010-04-27 21:47 ./slackware64/x/xf86-video-nouveau-blacklist-noarch-1.txt
--rw-r--r--   1 root root       880 2010-04-27 21:47 ./slackware64/x/xf86-video-nouveau-blacklist-noarch-1.txz
--rw-r--r--   1 root root       198 2010-04-27 21:47 ./slackware64/x/xf86-video-nouveau-blacklist-noarch-1.txz.asc
--rw-r--r--   1 root root       361 2010-03-18 21:53 ./slackware64/x/xf86-video-nv-2.1.17-x86_64-1.txt
--rw-r--r--   1 root root     85684 2010-03-18 21:53 ./slackware64/x/xf86-video-nv-2.1.17-x86_64-1.txz
--rw-r--r--   1 root root       198 2010-03-18 21:53 ./slackware64/x/xf86-video-nv-2.1.17-x86_64-1.txz.asc
--rw-r--r--   1 root root       465 2010-02-22 20:22 ./slackware64/x/xf86-video-openchrome-0.2.904-x86_64-1.txt
--rw-r--r--   1 root root    138452 2010-02-22 20:22 ./slackware64/x/xf86-video-openchrome-0.2.904-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:22 ./slackware64/x/xf86-video-openchrome-0.2.904-x86_64-1.txz.asc
--rw-r--r--   1 root root       387 2010-02-22 20:22 ./slackware64/x/xf86-video-r128-6.8.1-x86_64-2.txt
--rw-r--r--   1 root root     55604 2010-02-22 20:22 ./slackware64/x/xf86-video-r128-6.8.1-x86_64-2.txz
--rw-r--r--   1 root root       197 2010-02-22 20:22 ./slackware64/x/xf86-video-r128-6.8.1-x86_64-2.txz.asc
--rw-r--r--   1 root root       485 2010-02-22 20:22 ./slackware64/x/xf86-video-radeonhd-1.3.0-x86_64-1.txt
--rw-r--r--   1 root root    201316 2010-02-22 20:22 ./slackware64/x/xf86-video-radeonhd-1.3.0-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:22 ./slackware64/x/xf86-video-radeonhd-1.3.0-x86_64-1.txz.asc
--rw-r--r--   1 root root       452 2010-02-22 20:22 ./slackware64/x/xf86-video-rendition-4.2.3-x86_64-1.txt
--rw-r--r--   1 root root     43980 2010-02-22 20:22 ./slackware64/x/xf86-video-rendition-4.2.3-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:22 ./slackware64/x/xf86-video-rendition-4.2.3-x86_64-1.txz.asc
--rw-r--r--   1 root root       361 2010-02-22 20:22 ./slackware64/x/xf86-video-s3-0.6.3-x86_64-2.txt
--rw-r--r--   1 root root     30880 2010-02-22 20:22 ./slackware64/x/xf86-video-s3-0.6.3-x86_64-2.txz
--rw-r--r--   1 root root       197 2010-02-22 20:22 ./slackware64/x/xf86-video-s3-0.6.3-x86_64-2.txz.asc
--rw-r--r--   1 root root       426 2010-02-22 20:22 ./slackware64/x/xf86-video-s3virge-1.10.4-x86_64-2.txt
--rw-r--r--   1 root root     41328 2010-02-22 20:22 ./slackware64/x/xf86-video-s3virge-1.10.4-x86_64-2.txz
--rw-r--r--   1 root root       197 2010-02-22 20:22 ./slackware64/x/xf86-video-s3virge-1.10.4-x86_64-2.txz.asc
--rw-r--r--   1 root root       413 2010-02-22 20:23 ./slackware64/x/xf86-video-savage-2.3.1-x86_64-2.txt
--rw-r--r--   1 root root     61468 2010-02-22 20:23 ./slackware64/x/xf86-video-savage-2.3.1-x86_64-2.txz
--rw-r--r--   1 root root       197 2010-02-22 20:23 ./slackware64/x/xf86-video-savage-2.3.1-x86_64-2.txz.asc
--rw-r--r--   1 root root       504 2010-05-10 08:11 ./slackware64/x/xf86-video-siliconmotion-1.7.4-x86_64-1.txt
--rw-r--r--   1 root root     65448 2010-05-10 08:11 ./slackware64/x/xf86-video-siliconmotion-1.7.4-x86_64-1.txz
--rw-r--r--   1 root root       198 2010-05-10 08:11 ./slackware64/x/xf86-video-siliconmotion-1.7.4-x86_64-1.txz.asc
--rw-r--r--   1 root root       374 2010-02-22 20:23 ./slackware64/x/xf86-video-sis-0.10.2-x86_64-2.txt
--rw-r--r--   1 root root    234180 2010-02-22 20:23 ./slackware64/x/xf86-video-sis-0.10.2-x86_64-2.txz
--rw-r--r--   1 root root       197 2010-02-22 20:23 ./slackware64/x/xf86-video-sis-0.10.2-x86_64-2.txz.asc
--rw-r--r--   1 root root       413 2010-02-22 20:23 ./slackware64/x/xf86-video-sisusb-0.9.3-x86_64-2.txt
--rw-r--r--   1 root root     34996 2010-02-22 20:23 ./slackware64/x/xf86-video-sisusb-0.9.3-x86_64-2.txz
--rw-r--r--   1 root root       197 2010-02-22 20:23 ./slackware64/x/xf86-video-sisusb-0.9.3-x86_64-2.txz.asc
--rw-r--r--   1 root root       387 2010-02-22 20:23 ./slackware64/x/xf86-video-tdfx-1.4.3-x86_64-2.txt
--rw-r--r--   1 root root     31144 2010-02-22 20:23 ./slackware64/x/xf86-video-tdfx-1.4.3-x86_64-2.txz
--rw-r--r--   1 root root       197 2010-02-22 20:23 ./slackware64/x/xf86-video-tdfx-1.4.3-x86_64-2.txz.asc
--rw-r--r--   1 root root       374 2010-02-22 20:23 ./slackware64/x/xf86-video-tga-1.2.1-x86_64-1.txt
--rw-r--r--   1 root root     23720 2010-02-22 20:23 ./slackware64/x/xf86-video-tga-1.2.1-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:23 ./slackware64/x/xf86-video-tga-1.2.1-x86_64-1.txz.asc
--rw-r--r--   1 root root       426 2010-02-22 20:23 ./slackware64/x/xf86-video-trident-1.3.3-x86_64-1.txt
--rw-r--r--   1 root root     60292 2010-02-22 20:23 ./slackware64/x/xf86-video-trident-1.3.3-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:23 ./slackware64/x/xf86-video-trident-1.3.3-x86_64-1.txz.asc
--rw-r--r--   1 root root       400 2010-02-22 20:24 ./slackware64/x/xf86-video-tseng-1.2.3-x86_64-1.txt
--rw-r--r--   1 root root     24984 2010-02-22 20:24 ./slackware64/x/xf86-video-tseng-1.2.3-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:24 ./slackware64/x/xf86-video-tseng-1.2.3-x86_64-1.txz.asc
--rw-r--r--   1 root root       374 2010-02-22 20:24 ./slackware64/x/xf86-video-v4l-0.2.0-x86_64-3.txt
--rw-r--r--   1 root root     10052 2010-02-22 20:24 ./slackware64/x/xf86-video-v4l-0.2.0-x86_64-3.txz
--rw-r--r--   1 root root       197 2010-02-22 20:24 ./slackware64/x/xf86-video-v4l-0.2.0-x86_64-3.txz.asc
--rw-r--r--   1 root root       387 2010-02-22 20:24 ./slackware64/x/xf86-video-vesa-2.3.0-x86_64-2.txt
--rw-r--r--   1 root root     25556 2010-02-22 20:24 ./slackware64/x/xf86-video-vesa-2.3.0-x86_64-2.txz
--rw-r--r--   1 root root       197 2010-02-22 20:24 ./slackware64/x/xf86-video-vesa-2.3.0-x86_64-2.txz.asc
--rw-r--r--   1 root root       413 2010-02-22 20:24 ./slackware64/x/xf86-video-vmware-10.16.9-x86_64-2.txt
--rw-r--r--   1 root root     33008 2010-02-22 20:24 ./slackware64/x/xf86-video-vmware-10.16.9-x86_64-2.txz
--rw-r--r--   1 root root       197 2010-02-22 20:24 ./slackware64/x/xf86-video-vmware-10.16.9-x86_64-2.txz.asc
--rw-r--r--   1 root root       413 2010-02-22 20:24 ./slackware64/x/xf86-video-voodoo-1.2.3-x86_64-2.txt
--rw-r--r--   1 root root     15376 2010-02-22 20:24 ./slackware64/x/xf86-video-voodoo-1.2.3-x86_64-2.txz
--rw-r--r--   1 root root       197 2010-02-22 20:24 ./slackware64/x/xf86-video-voodoo-1.2.3-x86_64-2.txz.asc
--rw-r--r--   1 root root       374 2010-02-22 20:24 ./slackware64/x/xf86-video-xgi-1.5.1-x86_64-1.txt
--rw-r--r--   1 root root    103952 2010-02-22 20:24 ./slackware64/x/xf86-video-xgi-1.5.1-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:24 ./slackware64/x/xf86-video-xgi-1.5.1-x86_64-1.txz.asc
--rw-r--r--   1 root root       400 2010-02-22 20:00 ./slackware64/x/xf86bigfontproto-1.2.0-noarch-1.txt
--rw-r--r--   1 root root      4792 2010-02-22 20:00 ./slackware64/x/xf86bigfontproto-1.2.0-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:00 ./slackware64/x/xf86bigfontproto-1.2.0-noarch-1.txz.asc
--rw-r--r--   1 root root       283 2009-06-03 05:41 ./slackware64/x/xf86dga-1.0.2-x86_64-2.txt
--rw-r--r--   1 root root      4784 2009-06-03 05:41 ./slackware64/x/xf86dga-1.0.2-x86_64-2.txz
--rw-r--r--   1 root root       197 2009-06-03 05:41 ./slackware64/x/xf86dga-1.0.2-x86_64-2.txz.asc
--rw-r--r--   1 root root       348 2010-02-22 20:00 ./slackware64/x/xf86dgaproto-2.1-noarch-1.txt
--rw-r--r--   1 root root      7428 2010-02-22 20:00 ./slackware64/x/xf86dgaproto-2.1-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:00 ./slackware64/x/xf86dgaproto-2.1-noarch-1.txz.asc
--rw-r--r--   1 root root       348 2010-02-22 20:00 ./slackware64/x/xf86driproto-2.1.0-noarch-1.txt
--rw-r--r--   1 root root      5548 2010-02-22 20:00 ./slackware64/x/xf86driproto-2.1.0-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:00 ./slackware64/x/xf86driproto-2.1.0-noarch-1.txz.asc
--rw-r--r--   1 root root       361 2010-02-22 20:00 ./slackware64/x/xf86miscproto-0.9.3-noarch-1.txt
--rw-r--r--   1 root root      6148 2010-02-22 20:00 ./slackware64/x/xf86miscproto-0.9.3-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:00 ./slackware64/x/xf86miscproto-0.9.3-noarch-1.txz.asc
--rw-r--r--   1 root root       361 2009-06-03 05:25 ./slackware64/x/xf86rushproto-1.1.2-noarch-2.txt
--rw-r--r--   1 root root      2148 2009-06-03 05:25 ./slackware64/x/xf86rushproto-1.1.2-noarch-2.txz
--rw-r--r--   1 root root       197 2009-06-03 05:25 ./slackware64/x/xf86rushproto-1.1.2-noarch-2.txz.asc
--rw-r--r--   1 root root       400 2010-02-22 20:00 ./slackware64/x/xf86vidmodeproto-2.3-noarch-1.txt
--rw-r--r--   1 root root      5884 2010-02-22 20:00 ./slackware64/x/xf86vidmodeproto-2.3-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:00 ./slackware64/x/xf86vidmodeproto-2.3-noarch-1.txz.asc
--rw-r--r--   1 root root       231 2009-06-03 05:41 ./slackware64/x/xfd-1.0.1-x86_64-2.txt
--rw-r--r--   1 root root     14136 2009-06-03 05:41 ./slackware64/x/xfd-1.0.1-x86_64-2.txz
--rw-r--r--   1 root root       197 2009-06-03 05:41 ./slackware64/x/xfd-1.0.1-x86_64-2.txz.asc
--rw-r--r--   1 root root       322 2009-06-03 05:41 ./slackware64/x/xfindproxy-1.0.1-x86_64-2.txt
--rw-r--r--   1 root root      7372 2009-06-03 05:41 ./slackware64/x/xfindproxy-1.0.1-x86_64-2.txz
--rw-r--r--   1 root root       197 2009-06-03 05:41 ./slackware64/x/xfindproxy-1.0.1-x86_64-2.txz.asc
--rw-r--r--   1 root root       296 2009-06-03 05:41 ./slackware64/x/xfontsel-1.0.2-x86_64-2.txt
--rw-r--r--   1 root root     21676 2009-06-03 05:41 ./slackware64/x/xfontsel-1.0.2-x86_64-2.txz
--rw-r--r--   1 root root       197 2009-06-03 05:41 ./slackware64/x/xfontsel-1.0.2-x86_64-2.txz.asc
--rw-r--r--   1 root root       231 2009-08-04 00:38 ./slackware64/x/xfs-1.1.0-x86_64-1.txt
--rw-r--r--   1 root root     55536 2009-08-04 00:38 ./slackware64/x/xfs-1.1.0-x86_64-1.txz
--rw-r--r--   1 root root       197 2009-08-04 00:38 ./slackware64/x/xfs-1.1.0-x86_64-1.txz.asc
--rw-r--r--   1 root root       283 2009-06-03 05:41 ./slackware64/x/xfsinfo-1.0.2-x86_64-1.txt
--rw-r--r--   1 root root      4592 2009-06-03 05:41 ./slackware64/x/xfsinfo-1.0.2-x86_64-1.txz
--rw-r--r--   1 root root       197 2009-06-03 05:41 ./slackware64/x/xfsinfo-1.0.2-x86_64-1.txz.asc
--rw-r--r--   1 root root       244 2009-06-03 05:41 ./slackware64/x/xfwp-1.0.1-x86_64-2.txt
--rw-r--r--   1 root root     21568 2009-06-03 05:41 ./slackware64/x/xfwp-1.0.1-x86_64-2.txz
--rw-r--r--   1 root root       197 2009-06-03 05:41 ./slackware64/x/xfwp-1.0.1-x86_64-2.txz.asc
--rw-r--r--   1 root root       270 2010-02-22 20:13 ./slackware64/x/xgamma-1.0.3-x86_64-1.txt
--rw-r--r--   1 root root      9720 2010-02-22 20:13 ./slackware64/x/xgamma-1.0.3-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:13 ./slackware64/x/xgamma-1.0.3-x86_64-1.txz.asc
--rw-r--r--   1 root root       231 2010-02-22 20:13 ./slackware64/x/xgc-1.0.2-x86_64-2.txt
--rw-r--r--   1 root root     33236 2010-02-22 20:13 ./slackware64/x/xgc-1.0.2-x86_64-2.txz
--rw-r--r--   1 root root       197 2010-02-22 20:13 ./slackware64/x/xgc-1.0.2-x86_64-2.txz.asc
--rw-r--r--   1 root root       257 2010-02-22 20:13 ./slackware64/x/xhost-1.0.3-x86_64-1.txt
--rw-r--r--   1 root root     13376 2010-02-22 20:13 ./slackware64/x/xhost-1.0.3-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:13 ./slackware64/x/xhost-1.0.3-x86_64-1.txz.asc
--rw-r--r--   1 root root       361 2010-02-22 20:00 ./slackware64/x/xineramaproto-1.2-noarch-1.txt
--rw-r--r--   1 root root      5284 2010-02-22 20:00 ./slackware64/x/xineramaproto-1.2-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:00 ./slackware64/x/xineramaproto-1.2-noarch-1.txz.asc
--rw-r--r--   1 root root       257 2010-03-18 21:49 ./slackware64/x/xinit-1.2.1-x86_64-1.txt
--rw-r--r--   1 root root     30100 2010-03-18 21:49 ./slackware64/x/xinit-1.2.1-x86_64-1.txz
--rw-r--r--   1 root root       198 2010-03-18 21:49 ./slackware64/x/xinit-1.2.1-x86_64-1.txz.asc
--rw-r--r--   1 root root       468 2010-03-18 21:49 ./slackware64/x/xinput-1.5.1-x86_64-1.txt
--rw-r--r--   1 root root     29648 2010-03-18 21:49 ./slackware64/x/xinput-1.5.1-x86_64-1.txz
--rw-r--r--   1 root root       198 2010-03-18 21:49 ./slackware64/x/xinput-1.5.1-x86_64-1.txz.asc
--rw-r--r--   1 root root       283 2010-02-22 20:13 ./slackware64/x/xkbcomp-1.1.1-x86_64-1.txt
--rw-r--r--   1 root root     97124 2010-02-22 20:13 ./slackware64/x/xkbcomp-1.1.1-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:13 ./slackware64/x/xkbcomp-1.1.1-x86_64-1.txz.asc
--rw-r--r--   1 root root       270 2010-02-22 20:13 ./slackware64/x/xkbevd-1.1.0-x86_64-1.txt
--rw-r--r--   1 root root     21060 2010-02-22 20:13 ./slackware64/x/xkbevd-1.1.0-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:13 ./slackware64/x/xkbevd-1.1.0-x86_64-1.txz.asc
--rw-r--r--   1 root root       296 2010-02-22 20:13 ./slackware64/x/xkbprint-1.0.2-x86_64-1.txt
--rw-r--r--   1 root root     46224 2010-02-22 20:13 ./slackware64/x/xkbprint-1.0.2-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:13 ./slackware64/x/xkbprint-1.0.2-x86_64-1.txz.asc
--rw-r--r--   1 root root       296 2010-02-22 20:13 ./slackware64/x/xkbutils-1.0.2-x86_64-1.txt
--rw-r--r--   1 root root     20520 2010-02-22 20:13 ./slackware64/x/xkbutils-1.0.2-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:13 ./slackware64/x/xkbutils-1.0.2-x86_64-1.txz.asc
--rw-r--r--   1 root root       400 2010-02-22 20:01 ./slackware64/x/xkeyboard-config-1.8-noarch-1.txt
--rw-r--r--   1 root root    421464 2010-02-22 20:01 ./slackware64/x/xkeyboard-config-1.8-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:01 ./slackware64/x/xkeyboard-config-1.8-noarch-1.txz.asc
--rw-r--r--   1 root root       257 2010-02-22 20:13 ./slackware64/x/xkill-1.0.2-x86_64-1.txt
--rw-r--r--   1 root root     11460 2010-02-22 20:13 ./slackware64/x/xkill-1.0.2-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:13 ./slackware64/x/xkill-1.0.2-x86_64-1.txz.asc
--rw-r--r--   1 root root       257 2009-06-03 05:42 ./slackware64/x/xload-1.0.2-x86_64-2.txt
--rw-r--r--   1 root root      7856 2009-06-03 05:42 ./slackware64/x/xload-1.0.2-x86_64-2.txz
--rw-r--r--   1 root root       197 2009-06-03 05:42 ./slackware64/x/xload-1.0.2-x86_64-2.txz.asc
--rw-r--r--   1 root root       257 2010-02-22 20:13 ./slackware64/x/xlogo-1.0.2-x86_64-1.txt
--rw-r--r--   1 root root     19908 2010-02-22 20:13 ./slackware64/x/xlogo-1.0.2-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:13 ./slackware64/x/xlogo-1.0.2-x86_64-1.txz.asc
--rw-r--r--   1 root root       296 2010-02-22 20:13 ./slackware64/x/xlsatoms-1.0.2-x86_64-1.txt
--rw-r--r--   1 root root      8684 2010-02-22 20:13 ./slackware64/x/xlsatoms-1.0.2-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:13 ./slackware64/x/xlsatoms-1.0.2-x86_64-1.txz.asc
--rw-r--r--   1 root root       322 2010-02-22 20:13 ./slackware64/x/xlsclients-1.0.2-x86_64-1.txt
--rw-r--r--   1 root root      9412 2010-02-22 20:13 ./slackware64/x/xlsclients-1.0.2-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:13 ./slackware64/x/xlsclients-1.0.2-x86_64-1.txz.asc
--rw-r--r--   1 root root       296 2009-06-03 05:42 ./slackware64/x/xlsfonts-1.0.2-x86_64-2.txt
--rw-r--r--   1 root root     11372 2009-06-03 05:42 ./slackware64/x/xlsfonts-1.0.2-x86_64-2.txz
--rw-r--r--   1 root root       197 2009-06-03 05:42 ./slackware64/x/xlsfonts-1.0.2-x86_64-2.txz.asc
--rw-r--r--   1 root root       244 2010-02-22 20:13 ./slackware64/x/xmag-1.0.3-x86_64-1.txt
--rw-r--r--   1 root root     20976 2010-02-22 20:13 ./slackware64/x/xmag-1.0.3-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:13 ./slackware64/x/xmag-1.0.3-x86_64-1.txz.asc
--rw-r--r--   1 root root       244 2010-02-22 20:14 ./slackware64/x/xman-1.1.0-x86_64-1.txt
--rw-r--r--   1 root root     41132 2010-02-22 20:14 ./slackware64/x/xman-1.1.0-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:14 ./slackware64/x/xman-1.1.0-x86_64-1.txz.asc
--rw-r--r--   1 root root       296 2010-02-22 20:14 ./slackware64/x/xmessage-1.0.3-x86_64-1.txt
--rw-r--r--   1 root root     19764 2010-02-22 20:14 ./slackware64/x/xmessage-1.0.3-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:14 ./slackware64/x/xmessage-1.0.3-x86_64-1.txz.asc
--rw-r--r--   1 root root       231 2009-06-03 05:42 ./slackware64/x/xmh-1.0.1-x86_64-2.txt
--rw-r--r--   1 root root     71004 2009-06-03 05:42 ./slackware64/x/xmh-1.0.1-x86_64-2.txz
--rw-r--r--   1 root root       197 2009-06-03 05:42 ./slackware64/x/xmh-1.0.1-x86_64-2.txz.asc
--rw-r--r--   1 root root       283 2010-02-22 20:14 ./slackware64/x/xmodmap-1.0.4-x86_64-1.txt
--rw-r--r--   1 root root     27592 2010-02-22 20:14 ./slackware64/x/xmodmap-1.0.4-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:14 ./slackware64/x/xmodmap-1.0.4-x86_64-1.txz.asc
--rw-r--r--   1 root root       257 2009-06-03 05:42 ./slackware64/x/xmore-1.0.1-x86_64-2.txt
--rw-r--r--   1 root root      4936 2009-06-03 05:42 ./slackware64/x/xmore-1.0.1-x86_64-2.txz
--rw-r--r--   1 root root       197 2009-06-03 05:42 ./slackware64/x/xmore-1.0.1-x86_64-2.txz.asc
--rw-r--r--   1 root root       361 2010-02-22 20:01 ./slackware64/x/xorg-cf-files-1.0.3-noarch-1.txt
--rw-r--r--   1 root root    181092 2010-02-22 20:01 ./slackware64/x/xorg-cf-files-1.0.3-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:01 ./slackware64/x/xorg-cf-files-1.0.3-noarch-1.txz.asc
--rw-r--r--   1 root root       309 2010-02-22 20:15 ./slackware64/x/xorg-docs-1.5-noarch-1.txt
--rw-r--r--   1 root root    216004 2010-02-22 20:15 ./slackware64/x/xorg-docs-1.5-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:15 ./slackware64/x/xorg-docs-1.5-noarch-1.txz.asc
--rw-r--r--   1 root root       698 2010-05-05 07:01 ./slackware64/x/xorg-server-1.7.7-x86_64-1.txt
--rw-r--r--   1 root root   1917500 2010-05-05 07:01 ./slackware64/x/xorg-server-1.7.7-x86_64-1.txz
--rw-r--r--   1 root root       198 2010-05-05 07:01 ./slackware64/x/xorg-server-1.7.7-x86_64-1.txz.asc
--rw-r--r--   1 root root       370 2010-05-05 07:01 ./slackware64/x/xorg-server-xephyr-1.7.7-x86_64-1.txt
--rw-r--r--   1 root root    699440 2010-05-05 07:01 ./slackware64/x/xorg-server-xephyr-1.7.7-x86_64-1.txz
--rw-r--r--   1 root root       198 2010-05-05 07:01 ./slackware64/x/xorg-server-xephyr-1.7.7-x86_64-1.txz.asc
--rw-r--r--   1 root root       595 2010-05-05 07:01 ./slackware64/x/xorg-server-xnest-1.7.7-x86_64-1.txt
--rw-r--r--   1 root root    539280 2010-05-05 07:01 ./slackware64/x/xorg-server-xnest-1.7.7-x86_64-1.txz
--rw-r--r--   1 root root       198 2010-05-05 07:01 ./slackware64/x/xorg-server-xnest-1.7.7-x86_64-1.txz.asc
--rw-r--r--   1 root root       693 2010-05-05 07:01 ./slackware64/x/xorg-server-xvfb-1.7.7-x86_64-1.txt
--rw-r--r--   1 root root    628092 2010-05-05 07:01 ./slackware64/x/xorg-server-xvfb-1.7.7-x86_64-1.txz
--rw-r--r--   1 root root       198 2010-05-05 07:01 ./slackware64/x/xorg-server-xvfb-1.7.7-x86_64-1.txz.asc
--rw-r--r--   1 root root       426 2010-04-27 20:53 ./slackware64/x/xorg-sgml-doctools-1.4-noarch-1.txt
--rw-r--r--   1 root root      9100 2010-04-27 20:53 ./slackware64/x/xorg-sgml-doctools-1.4-noarch-1.txz
--rw-r--r--   1 root root       198 2010-04-27 20:53 ./slackware64/x/xorg-sgml-doctools-1.4-noarch-1.txz.asc
--rw-r--r--   1 root root       348 2009-06-03 05:42 ./slackware64/x/xplsprinters-1.0.1-x86_64-2.txt
--rw-r--r--   1 root root      5424 2009-06-03 05:42 ./slackware64/x/xplsprinters-1.0.1-x86_64-2.txz
--rw-r--r--   1 root root       197 2009-06-03 05:42 ./slackware64/x/xplsprinters-1.0.1-x86_64-2.txz.asc
--rw-r--r--   1 root root       231 2010-02-22 20:14 ./slackware64/x/xpr-1.0.3-x86_64-1.txt
--rw-r--r--   1 root root     33188 2010-02-22 20:14 ./slackware64/x/xpr-1.0.3-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:14 ./slackware64/x/xpr-1.0.3-x86_64-1.txz.asc
--rw-r--r--   1 root root       439 2009-06-03 05:42 ./slackware64/x/xprehashprinterlist-1.0.1-x86_64-2.txt
--rw-r--r--   1 root root      3848 2009-06-03 05:42 ./slackware64/x/xprehashprinterlist-1.0.1-x86_64-2.txz
--rw-r--r--   1 root root       197 2009-06-03 05:42 ./slackware64/x/xprehashprinterlist-1.0.1-x86_64-2.txz.asc
--rw-r--r--   1 root root       257 2010-02-22 20:14 ./slackware64/x/xprop-1.1.0-x86_64-1.txt
--rw-r--r--   1 root root     26740 2010-02-22 20:14 ./slackware64/x/xprop-1.1.0-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:14 ./slackware64/x/xprop-1.1.0-x86_64-1.txz.asc
--rw-r--r--   1 root root       270 2010-02-22 20:00 ./slackware64/x/xproto-7.0.16-noarch-1.txt
--rw-r--r--   1 root root     68844 2010-02-22 20:00 ./slackware64/x/xproto-7.0.16-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:00 ./slackware64/x/xproto-7.0.16-noarch-1.txz.asc
--rw-r--r--   1 root root       504 2010-02-22 20:01 ./slackware64/x/xproxymanagementprotocol-1.0.3-noarch-1.txt
--rw-r--r--   1 root root      5384 2010-02-22 20:01 ./slackware64/x/xproxymanagementprotocol-1.0.3-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:01 ./slackware64/x/xproxymanagementprotocol-1.0.3-noarch-1.txz.asc
--rw-r--r--   1 root root       244 2010-02-22 20:02 ./slackware64/x/xpyb-1.2-x86_64-1.txt
--rw-r--r--   1 root root    109120 2010-02-22 20:02 ./slackware64/x/xpyb-1.2-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:02 ./slackware64/x/xpyb-1.2-x86_64-1.txz.asc
--rw-r--r--   1 root root       270 2010-02-22 20:14 ./slackware64/x/xrandr-1.3.2-x86_64-1.txt
--rw-r--r--   1 root root     41344 2010-02-22 20:14 ./slackware64/x/xrandr-1.3.2-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:14 ./slackware64/x/xrandr-1.3.2-x86_64-1.txz.asc
--rw-r--r--   1 root root       244 2010-02-22 20:14 ./slackware64/x/xrdb-1.0.6-x86_64-1.txt
--rw-r--r--   1 root root     20984 2010-02-22 20:14 ./slackware64/x/xrdb-1.0.6-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:14 ./slackware64/x/xrdb-1.0.6-x86_64-1.txz.asc
--rw-r--r--   1 root root       296 2010-02-22 20:14 ./slackware64/x/xrefresh-1.0.3-x86_64-1.txt
--rw-r--r--   1 root root      9832 2010-02-22 20:14 ./slackware64/x/xrefresh-1.0.3-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:14 ./slackware64/x/xrefresh-1.0.3-x86_64-1.txz.asc
--rw-r--r--   1 root root       270 2010-02-22 20:14 ./slackware64/x/xscope-1.2-x86_64-1.txt
--rw-r--r--   1 root root     92964 2010-02-22 20:14 ./slackware64/x/xscope-1.2-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:14 ./slackware64/x/xscope-1.2-x86_64-1.txz.asc
--rw-r--r--   1 root root       244 2010-02-22 20:14 ./slackware64/x/xset-1.1.0-x86_64-1.txt
--rw-r--r--   1 root root     25348 2010-02-22 20:14 ./slackware64/x/xset-1.1.0-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:14 ./slackware64/x/xset-1.1.0-x86_64-1.txz.asc
--rw-r--r--   1 root root       296 2009-06-03 05:43 ./slackware64/x/xsetmode-1.0.0-x86_64-2.txt
--rw-r--r--   1 root root      3428 2009-06-03 05:43 ./slackware64/x/xsetmode-1.0.0-x86_64-2.txz
--rw-r--r--   1 root root       197 2009-06-03 05:43 ./slackware64/x/xsetmode-1.0.0-x86_64-2.txz.asc
--rw-r--r--   1 root root       335 2009-06-03 05:43 ./slackware64/x/xsetpointer-1.0.1-x86_64-2.txt
--rw-r--r--   1 root root      3908 2009-06-03 05:43 ./slackware64/x/xsetpointer-1.0.1-x86_64-2.txz
--rw-r--r--   1 root root       197 2009-06-03 05:43 ./slackware64/x/xsetpointer-1.0.1-x86_64-2.txz.asc
--rw-r--r--   1 root root       296 2010-02-22 20:14 ./slackware64/x/xsetroot-1.0.3-x86_64-1.txt
--rw-r--r--   1 root root     15556 2010-02-22 20:14 ./slackware64/x/xsetroot-1.0.3-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:14 ./slackware64/x/xsetroot-1.0.3-x86_64-1.txz.asc
--rw-r--r--   1 root root       231 2009-06-03 05:43 ./slackware64/x/xsm-1.0.1-x86_64-2.txt
--rw-r--r--   1 root root     41896 2009-06-03 05:43 ./slackware64/x/xsm-1.0.1-x86_64-2.txz
--rw-r--r--   1 root root       197 2009-06-03 05:43 ./slackware64/x/xsm-1.0.1-x86_64-2.txz.asc
--rw-r--r--   1 root root       296 2009-06-03 05:43 ./slackware64/x/xstdcmap-1.0.1-x86_64-2.txt
--rw-r--r--   1 root root      6512 2009-06-03 05:43 ./slackware64/x/xstdcmap-1.0.1-x86_64-2.txz
--rw-r--r--   1 root root       197 2009-06-03 05:43 ./slackware64/x/xstdcmap-1.0.1-x86_64-2.txz.asc
--rw-r--r--   1 root root       308 2010-05-06 07:57 ./slackware64/x/xterm-258-x86_64-1.txt
--rw-r--r--   1 root root    235540 2010-05-06 07:57 ./slackware64/x/xterm-258-x86_64-1.txz
--rw-r--r--   1 root root       198 2010-05-06 07:57 ./slackware64/x/xterm-258-x86_64-1.txz.asc
--rw-r--r--   1 root root       270 2010-02-22 20:09 ./slackware64/x/xtrans-1.2.5-noarch-1.txt
--rw-r--r--   1 root root     54176 2010-02-22 20:09 ./slackware64/x/xtrans-1.2.5-noarch-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:09 ./slackware64/x/xtrans-1.2.5-noarch-1.txz.asc
--rw-r--r--   1 root root       257 2009-06-03 05:43 ./slackware64/x/xtrap-1.0.2-x86_64-2.txt
--rw-r--r--   1 root root     16856 2009-06-03 05:43 ./slackware64/x/xtrap-1.0.2-x86_64-2.txz
--rw-r--r--   1 root root       197 2009-06-03 05:43 ./slackware64/x/xtrap-1.0.2-x86_64-2.txz.asc
--rw-r--r--   1 root root       296 2010-02-22 20:15 ./slackware64/x/xvidtune-1.0.2-x86_64-1.txt
--rw-r--r--   1 root root     26252 2010-02-22 20:15 ./slackware64/x/xvidtune-1.0.2-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:15 ./slackware64/x/xvidtune-1.0.2-x86_64-1.txz.asc
--rw-r--r--   1 root root       270 2010-02-22 20:15 ./slackware64/x/xvinfo-1.1.0-x86_64-1.txt
--rw-r--r--   1 root root      9636 2010-02-22 20:15 ./slackware64/x/xvinfo-1.1.0-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:15 ./slackware64/x/xvinfo-1.1.0-x86_64-1.txz.asc
--rw-r--r--   1 root root       231 2010-02-22 20:15 ./slackware64/x/xwd-1.0.3-x86_64-1.txt
--rw-r--r--   1 root root     19088 2010-02-22 20:15 ./slackware64/x/xwd-1.0.3-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:15 ./slackware64/x/xwd-1.0.3-x86_64-1.txz.asc
--rw-r--r--   1 root root       296 2010-02-22 20:15 ./slackware64/x/xwininfo-1.0.5-x86_64-1.txt
--rw-r--r--   1 root root     20464 2010-02-22 20:15 ./slackware64/x/xwininfo-1.0.5-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:15 ./slackware64/x/xwininfo-1.0.5-x86_64-1.txz.asc
--rw-r--r--   1 root root       244 2010-02-22 20:15 ./slackware64/x/xwud-1.0.2-x86_64-1.txt
--rw-r--r--   1 root root     17092 2010-02-22 20:15 ./slackware64/x/xwud-1.0.2-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-22 20:15 ./slackware64/x/xwud-1.0.2-x86_64-1.txz.asc
-drwxr-xr-x   2 root root     12288 2010-05-18 18:58 ./slackware64/xap
--rw-r--r--   1 root root       479 2010-02-19 07:06 ./slackware64/xap/MPlayer-20100218-x86_64-1.txt
--rw-r--r--   1 root root   8703252 2010-02-19 07:06 ./slackware64/xap/MPlayer-20100218-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-19 07:06 ./slackware64/xap/MPlayer-20100218-x86_64-1.txz.asc
--rw-r--r--   1 root root       615 2010-04-26 00:34 ./slackware64/xap/audacious-2.3-x86_64-1.txt
--rw-r--r--   1 root root    466092 2010-04-26 00:34 ./slackware64/xap/audacious-2.3-x86_64-1.txz
--rw-r--r--   1 root root       198 2010-04-26 00:34 ./slackware64/xap/audacious-2.3-x86_64-1.txz.asc
--rw-r--r--   1 root root       424 2010-04-26 00:45 ./slackware64/xap/audacious-plugins-2.3-x86_64-1.txt
--rw-r--r--   1 root root   1350388 2010-04-26 00:45 ./slackware64/xap/audacious-plugins-2.3-x86_64-1.txz
--rw-r--r--   1 root root       198 2010-04-26 00:45 ./slackware64/xap/audacious-plugins-2.3-x86_64-1.txz.asc
--rw-r--r--   1 root root       441 2010-02-08 00:06 ./slackware64/xap/blackbox-0.70.1-x86_64-3.txt
--rw-r--r--   1 root root    297156 2010-02-08 00:06 ./slackware64/xap/blackbox-0.70.1-x86_64-3.txz
--rw-r--r--   1 root root       197 2010-02-08 00:06 ./slackware64/xap/blackbox-0.70.1-x86_64-3.txz.asc
--rw-r--r--   1 root root       424 2010-05-02 21:48 ./slackware64/xap/blueman-1.21-x86_64-1.txt
--rw-r--r--   1 root root    467364 2010-05-02 21:48 ./slackware64/xap/blueman-1.21-x86_64-1.txz
--rw-r--r--   1 root root       198 2010-05-02 21:48 ./slackware64/xap/blueman-1.21-x86_64-1.txz.asc
--rw-r--r--   1 root root       652 2010-02-19 18:41 ./slackware64/xap/electricsheep-20090306-x86_64-3.txt
--rw-r--r--   1 root root   2598696 2010-02-19 18:41 ./slackware64/xap/electricsheep-20090306-x86_64-3.txz
--rw-r--r--   1 root root       197 2010-02-19 18:41 ./slackware64/xap/electricsheep-20090306-x86_64-3.txz.asc
--rw-r--r--   1 root root       229 2010-02-11 21:29 ./slackware64/xap/fluxbox-1.1.1-x86_64-2.txt
--rw-r--r--   1 root root    696160 2010-02-11 21:29 ./slackware64/xap/fluxbox-1.1.1-x86_64-2.txz
--rw-r--r--   1 root root       197 2010-02-11 21:29 ./slackware64/xap/fluxbox-1.1.1-x86_64-2.txz.asc
--rw-r--r--   1 root root       337 2008-10-25 22:52 ./slackware64/xap/fvwm-2.4.20-x86_64-1.txt
--rw-r--r--   1 root root   1000700 2008-10-25 22:52 ./slackware64/xap/fvwm-2.4.20-x86_64-1.txz
--rw-r--r--   1 root root       197 2008-10-25 22:52 ./slackware64/xap/fvwm-2.4.20-x86_64-1.txz.asc
--rw-r--r--   1 root root       319 2010-03-11 23:26 ./slackware64/xap/geeqie-1.0-x86_64-1.txt
--rw-r--r--   1 root root    718700 2010-03-11 23:26 ./slackware64/xap/geeqie-1.0-x86_64-1.txz
--rw-r--r--   1 root root       198 2010-03-11 23:26 ./slackware64/xap/geeqie-1.0-x86_64-1.txz.asc
--rw-r--r--   1 root root       444 2009-05-23 04:36 ./slackware64/xap/gftp-2.0.19-x86_64-2.txt
--rw-r--r--   1 root root    589988 2009-05-23 04:36 ./slackware64/xap/gftp-2.0.19-x86_64-2.txz
--rw-r--r--   1 root root       197 2009-05-23 04:36 ./slackware64/xap/gftp-2.0.19-x86_64-2.txz.asc
--rw-r--r--   1 root root       473 2010-02-16 05:01 ./slackware64/xap/gimp-2.6.8-x86_64-2.txt
--rw-r--r--   1 root root   9907780 2010-02-16 05:01 ./slackware64/xap/gimp-2.6.8-x86_64-2.txz
--rw-r--r--   1 root root       197 2010-02-16 05:01 ./slackware64/xap/gimp-2.6.8-x86_64-2.txz.asc
--rw-r--r--   1 root root       513 2010-03-31 04:46 ./slackware64/xap/gkrellm-2.3.4-x86_64-1.txt
--rw-r--r--   1 root root    524820 2010-03-31 04:46 ./slackware64/xap/gkrellm-2.3.4-x86_64-1.txz
--rw-r--r--   1 root root       198 2010-03-31 04:46 ./slackware64/xap/gkrellm-2.3.4-x86_64-1.txz.asc
--rw-r--r--   1 root root       337 2010-02-20 04:13 ./slackware64/xap/gnuchess-5.07-x86_64-5.txt
--rw-r--r--   1 root root   1002124 2010-02-20 04:13 ./slackware64/xap/gnuchess-5.07-x86_64-5.txz
--rw-r--r--   1 root root       197 2010-02-20 04:13 ./slackware64/xap/gnuchess-5.07-x86_64-5.txz.asc
--rw-r--r--   1 root root       647 2010-02-20 02:17 ./slackware64/xap/gnuplot-4.2.6-x86_64-1.txt
--rw-r--r--   1 root root   1056736 2010-02-20 02:17 ./slackware64/xap/gnuplot-4.2.6-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-20 02:17 ./slackware64/xap/gnuplot-4.2.6-x86_64-1.txz.asc
--rw-r--r--   1 root root       209 2010-02-16 04:12 ./slackware64/xap/gucharmap-2.28.2-x86_64-1.txt
--rw-r--r--   1 root root   1984852 2010-02-16 04:12 ./slackware64/xap/gucharmap-2.28.2-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-16 04:12 ./slackware64/xap/gucharmap-2.28.2-x86_64-1.txz.asc
--rw-r--r--   1 root root       370 2010-05-09 20:01 ./slackware64/xap/gv-3.6.9-x86_64-1.txt
--rw-r--r--   1 root root    197412 2010-05-09 20:01 ./slackware64/xap/gv-3.6.9-x86_64-1.txz
--rw-r--r--   1 root root       198 2010-05-09 20:01 ./slackware64/xap/gv-3.6.9-x86_64-1.txz.asc
--rw-r--r--   1 root root       336 2009-06-10 01:22 ./slackware64/xap/gxine-0.5.903-x86_64-2.txt
--rw-r--r--   1 root root    366732 2009-06-10 01:22 ./slackware64/xap/gxine-0.5.903-x86_64-2.txz
--rw-r--r--   1 root root       197 2009-06-10 01:22 ./slackware64/xap/gxine-0.5.903-x86_64-2.txz.asc
--rw-r--r--   1 root root       540 2010-02-17 21:16 ./slackware64/xap/imagemagick-6.5.9_6-x86_64-1.txt
--rw-r--r--   1 root root   4569860 2010-02-17 21:16 ./slackware64/xap/imagemagick-6.5.9_6-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-17 21:16 ./slackware64/xap/imagemagick-6.5.9_6-x86_64-1.txz.asc
--rwxr-xr-x   1 root root      2897 2009-06-24 22:06 ./slackware64/xap/install-packages
--rw-r--r--   1 root root       446 2006-09-18 10:41 ./slackware64/xap/install.end
--rw-r--r--   1 root root      4211 2010-05-02 08:24 ./slackware64/xap/maketag
--rw-r--r--   1 root root      4211 2010-05-02 08:24 ./slackware64/xap/maketag.ez
--rw-r--r--   1 root root       527 2010-04-02 20:38 ./slackware64/xap/mozilla-firefox-3.6.3-x86_64-1.txt
--rw-r--r--   1 root root   9151488 2010-04-02 20:38 ./slackware64/xap/mozilla-firefox-3.6.3-x86_64-1.txz
--rw-r--r--   1 root root       198 2010-04-02 20:38 ./slackware64/xap/mozilla-firefox-3.6.3-x86_64-1.txz.asc
--rw-r--r--   1 root root       702 2010-04-02 02:10 ./slackware64/xap/mozilla-thunderbird-3.0.4-x86_64-1.txt
--rw-r--r--   1 root root   9601492 2010-04-02 02:10 ./slackware64/xap/mozilla-thunderbird-3.0.4-x86_64-1.txz
--rw-r--r--   1 root root       198 2010-04-02 02:10 ./slackware64/xap/mozilla-thunderbird-3.0.4-x86_64-1.txz.asc
--rw-r--r--   1 root root       267 2010-02-04 00:11 ./slackware64/xap/pan-0.133-x86_64-2.txt
--rw-r--r--   1 root root    743532 2010-02-04 00:11 ./slackware64/xap/pan-0.133-x86_64-2.txz
--rw-r--r--   1 root root       197 2010-02-04 00:11 ./slackware64/xap/pan-0.133-x86_64-2.txz.asc
--rw-r--r--   1 root root       469 2010-05-18 16:55 ./slackware64/xap/pidgin-2.7.0-x86_64-1.txt
--rw-r--r--   1 root root   6853708 2010-05-18 16:55 ./slackware64/xap/pidgin-2.7.0-x86_64-1.txz
--rw-r--r--   1 root root       198 2010-05-18 16:55 ./slackware64/xap/pidgin-2.7.0-x86_64-1.txz.asc
--rw-r--r--   1 root root       395 2008-11-06 15:45 ./slackware64/xap/rdesktop-1.6.0-x86_64-1.txt
--rw-r--r--   1 root root    130948 2008-11-06 15:45 ./slackware64/xap/rdesktop-1.6.0-x86_64-1.txz
--rw-r--r--   1 root root       197 2008-11-06 15:45 ./slackware64/xap/rdesktop-1.6.0-x86_64-1.txz.asc
--rw-r--r--   1 root root       425 2009-06-09 19:32 ./slackware64/xap/rxvt-2.7.10-x86_64-4.txt
--rw-r--r--   1 root root    162500 2009-06-09 19:32 ./slackware64/xap/rxvt-2.7.10-x86_64-4.txz
--rw-r--r--   1 root root       197 2009-06-09 19:32 ./slackware64/xap/rxvt-2.7.10-x86_64-4.txz.asc
--rw-r--r--   1 root root       321 2010-04-30 04:22 ./slackware64/xap/sane-1.0.21-x86_64-1.txt
--rw-r--r--   1 root root   2434128 2010-04-30 04:22 ./slackware64/xap/sane-1.0.21-x86_64-1.txz
--rw-r--r--   1 root root       198 2010-04-30 04:22 ./slackware64/xap/sane-1.0.21-x86_64-1.txz.asc
--rw-r--r--   1 root root       434 2010-04-02 20:02 ./slackware64/xap/seamonkey-2.0.4-x86_64-1.txt
--rw-r--r--   1 root root  13964960 2010-04-02 20:02 ./slackware64/xap/seamonkey-2.0.4-x86_64-1.txz
--rw-r--r--   1 root root       198 2010-04-02 20:02 ./slackware64/xap/seamonkey-2.0.4-x86_64-1.txz.asc
--rw-r--r--   1 root root       609 2009-03-16 23:11 ./slackware64/xap/seyon-2.20c-x86_64-3.txt
--rw-r--r--   1 root root    113164 2009-03-16 23:11 ./slackware64/xap/seyon-2.20c-x86_64-3.txz
--rw-r--r--   1 root root       197 2009-03-16 23:11 ./slackware64/xap/seyon-2.20c-x86_64-3.txz.asc
--rw-r--r--   1 root root       618 2010-05-02 08:24 ./slackware64/xap/tagfile
--rw-r--r--   1 root root       488 2009-03-16 12:27 ./slackware64/xap/thunar-volman-0.3.80-x86_64-1.txt
--rw-r--r--   1 root root     70548 2009-03-16 12:27 ./slackware64/xap/thunar-volman-0.3.80-x86_64-1.txz
--rw-r--r--   1 root root       197 2009-03-16 12:27 ./slackware64/xap/thunar-volman-0.3.80-x86_64-1.txz.asc
--rw-r--r--   1 root root       505 2010-05-10 23:07 ./slackware64/xap/vim-gvim-7.2.416-x86_64-1.txt
--rw-r--r--   1 root root   1474512 2010-05-10 23:07 ./slackware64/xap/vim-gvim-7.2.416-x86_64-1.txz
--rw-r--r--   1 root root       198 2010-05-10 23:07 ./slackware64/xap/vim-gvim-7.2.416-x86_64-1.txz.asc
--rw-r--r--   1 root root       455 2010-02-11 21:41 ./slackware64/xap/windowmaker-20060427cvs-x86_64-3.txt
--rw-r--r--   1 root root   1799912 2010-02-11 21:41 ./slackware64/xap/windowmaker-20060427cvs-x86_64-3.txz
--rw-r--r--   1 root root       197 2010-02-11 21:41 ./slackware64/xap/windowmaker-20060427cvs-x86_64-3.txz.asc
--rw-r--r--   1 root root       308 2009-08-18 23:17 ./slackware64/xap/x11-ssh-askpass-1.2.4.1-x86_64-1.txt
--rw-r--r--   1 root root     20584 2009-08-18 23:17 ./slackware64/xap/x11-ssh-askpass-1.2.4.1-x86_64-1.txz
--rw-r--r--   1 root root       197 2009-08-18 23:17 ./slackware64/xap/x11-ssh-askpass-1.2.4.1-x86_64-1.txz.asc
--rw-r--r--   1 root root       310 2008-11-06 15:59 ./slackware64/xap/x3270-3.3.7p8-x86_64-1.txt
--rw-r--r--   1 root root    508772 2008-11-06 15:59 ./slackware64/xap/x3270-3.3.7p8-x86_64-1.txz
--rw-r--r--   1 root root       197 2008-11-06 15:59 ./slackware64/xap/x3270-3.3.7p8-x86_64-1.txz.asc
--rw-r--r--   1 root root       164 2010-03-02 18:56 ./slackware64/xap/xchat-2.8.6-x86_64-5.txt
--rw-r--r--   1 root root   1733504 2010-03-02 18:56 ./slackware64/xap/xchat-2.8.6-x86_64-5.txz
--rw-r--r--   1 root root       197 2010-03-02 18:56 ./slackware64/xap/xchat-2.8.6-x86_64-5.txz.asc
--rw-r--r--   1 root root       309 2010-05-17 03:52 ./slackware64/xap/xfce-4.6.1-x86_64-8.txt
--rw-r--r--   1 root root  12322520 2010-05-17 03:52 ./slackware64/xap/xfce-4.6.1-x86_64-8.txz
--rw-r--r--   1 root root       198 2010-05-17 03:52 ./slackware64/xap/xfce-4.6.1-x86_64-8.txz.asc
--rw-r--r--   1 root root       441 2010-02-20 18:15 ./slackware64/xap/xfce4-notifyd-0.1.0-x86_64-1.txt
--rw-r--r--   1 root root     51004 2010-02-20 18:15 ./slackware64/xap/xfce4-notifyd-0.1.0-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-20 18:15 ./slackware64/xap/xfce4-notifyd-0.1.0-x86_64-1.txz.asc
--rw-r--r--   1 root root       472 2010-03-13 01:00 ./slackware64/xap/xfce4-power-manager-0.8.5-x86_64-1.txt
--rw-r--r--   1 root root    478920 2010-03-13 01:00 ./slackware64/xap/xfce4-power-manager-0.8.5-x86_64-1.txz
--rw-r--r--   1 root root       198 2010-03-13 01:00 ./slackware64/xap/xfce4-power-manager-0.8.5-x86_64-1.txz.asc
--rw-r--r--   1 root root       411 2008-11-06 14:17 ./slackware64/xap/xfractint-20.04p09-x86_64-1.txt
--rw-r--r--   1 root root    837944 2008-11-06 14:17 ./slackware64/xap/xfractint-20.04p09-x86_64-1.txz
--rw-r--r--   1 root root       197 2008-11-06 14:17 ./slackware64/xap/xfractint-20.04p09-x86_64-1.txz.asc
--rw-r--r--   1 root root       239 2009-08-22 21:21 ./slackware64/xap/xgames-0.3-x86_64-2.txt
--rw-r--r--   1 root root    103428 2009-08-22 21:21 ./slackware64/xap/xgames-0.3-x86_64-2.txz
--rw-r--r--   1 root root       197 2009-08-22 21:21 ./slackware64/xap/xgames-0.3-x86_64-2.txz.asc
--rw-r--r--   1 root root       468 2010-02-18 23:00 ./slackware64/xap/xine-lib-1.1.17-x86_64-1.txt
--rw-r--r--   1 root root   3637788 2010-02-18 23:00 ./slackware64/xap/xine-lib-1.1.17-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-18 23:00 ./slackware64/xap/xine-lib-1.1.17-x86_64-1.txz.asc
--rw-r--r--   1 root root       374 2010-02-19 19:43 ./slackware64/xap/xine-ui-0.99.5-x86_64-3.txt
--rw-r--r--   1 root root   1281472 2010-02-19 19:43 ./slackware64/xap/xine-ui-0.99.5-x86_64-3.txz
--rw-r--r--   1 root root       197 2010-02-19 19:43 ./slackware64/xap/xine-ui-0.99.5-x86_64-3.txz.asc
--rw-r--r--   1 root root       462 2009-08-08 01:11 ./slackware64/xap/xlockmore-5.28-x86_64-1.txt
--rw-r--r--   1 root root    985268 2009-08-08 01:11 ./slackware64/xap/xlockmore-5.28-x86_64-1.txz
--rw-r--r--   1 root root       197 2009-08-08 01:11 ./slackware64/xap/xlockmore-5.28-x86_64-1.txz.asc
--rw-r--r--   1 root root       379 2010-03-25 21:58 ./slackware64/xap/xmms-1.2.11-x86_64-4.txt
--rw-r--r--   1 root root   1153728 2010-03-25 21:58 ./slackware64/xap/xmms-1.2.11-x86_64-4.txz
--rw-r--r--   1 root root       198 2010-03-25 21:58 ./slackware64/xap/xmms-1.2.11-x86_64-4.txz.asc
--rw-r--r--   1 root root       445 2010-02-20 01:05 ./slackware64/xap/xpaint-2.8.16-x86_64-1.txt
--rw-r--r--   1 root root    423688 2010-02-20 01:05 ./slackware64/xap/xpaint-2.8.16-x86_64-1.txz
--rw-r--r--   1 root root       197 2010-02-20 01:05 ./slackware64/xap/xpaint-2.8.16-x86_64-1.txz.asc
--rw-r--r--   1 root root       256 2010-02-11 22:00 ./slackware64/xap/xpdf-3.02pl4-x86_64-2.txt
--rw-r--r--   1 root root   1486652 2010-02-11 22:00 ./slackware64/xap/xpdf-3.02pl4-x86_64-2.txz
--rw-r--r--   1 root root       197 2010-02-11 22:00 ./slackware64/xap/xpdf-3.02pl4-x86_64-2.txz.asc
--rw-r--r--   1 root root       499 2010-02-20 00:47 ./slackware64/xap/xsane-0.996-x86_64-2.txt
--rw-r--r--   1 root root   1632152 2010-02-20 00:47 ./slackware64/xap/xsane-0.996-x86_64-2.txz
--rw-r--r--   1 root root       197 2010-02-20 00:47 ./slackware64/xap/xsane-0.996-x86_64-2.txz.asc
--rw-r--r--   1 root root       424 2010-05-03 07:24 ./slackware64/xap/xscreensaver-5.11-x86_64-1.txt
--rw-r--r--   1 root root   3477164 2010-05-03 07:24 ./slackware64/xap/xscreensaver-5.11-x86_64-1.txz
--rw-r--r--   1 root root       198 2010-05-03 07:24 ./slackware64/xap/xscreensaver-5.11-x86_64-1.txz.asc
--rw-r--r--   1 root root       235 2010-02-19 19:32 ./slackware64/xap/xv-3.10a-x86_64-6.txt
--rw-r--r--   1 root root    939688 2010-02-19 19:32 ./slackware64/xap/xv-3.10a-x86_64-6.txz
--rw-r--r--   1 root root       197 2010-02-19 19:32 ./slackware64/xap/xv-3.10a-x86_64-6.txz.asc
--rw-r--r--   1 root root       418 2008-11-06 22:42 ./slackware64/xap/xxgdb-1.12-x86_64-2.txt
--rw-r--r--   1 root root     50184 2008-11-06 22:42 ./slackware64/xap/xxgdb-1.12-x86_64-2.txz
--rw-r--r--   1 root root       197 2008-11-06 22:42 ./slackware64/xap/xxgdb-1.12-x86_64-2.txz.asc
-drwxr-xr-x   2 root root      4096 2010-05-16 05:15 ./slackware64/y
--rw-r--r--   1 root root       596 2010-05-15 18:03 ./slackware64/y/bsd-games-2.13-x86_64-11.txt
--rw-r--r--   1 root root   1759252 2010-05-15 18:03 ./slackware64/y/bsd-games-2.13-x86_64-11.txz
--rw-r--r--   1 root root       198 2010-05-15 18:03 ./slackware64/y/bsd-games-2.13-x86_64-11.txz.asc
--rwxr-xr-x   1 root root      2897 2009-06-24 22:06 ./slackware64/y/install-packages
--rw-r--r--   1 root root       446 2006-09-18 10:41 ./slackware64/y/install.end
--rw-r--r--   1 root root      1136 2010-03-01 01:46 ./slackware64/y/maketag
--rw-r--r--   1 root root      1136 2010-03-01 01:46 ./slackware64/y/maketag.ez
--rw-r--r--   1 root root        14 2010-03-01 01:46 ./slackware64/y/tagfile
-drwxr-xr-x  18 root root      4096 2010-05-19 03:22 ./source
--rw-r--r--   1 root root    326956 2010-05-19 03:22 ./source/CHECKSUMS.md5
--rw-r--r--   1 root root       198 2010-05-19 03:22 ./source/CHECKSUMS.md5.asc
--rw-r--r--   1 root root    460081 2010-05-19 03:21 ./source/FILE_LIST
--rw-r--r--   1 root root   6808866 2010-05-19 03:21 ./source/MANIFEST.bz2
-drwxr-xr-x  91 root root      4096 2010-05-17 07:36 ./source/a
-drwxr-xr-x   2 root root      4096 2010-05-14 05:48 ./source/a/aaa_base
--rw-r--r--   1 root root     11017 2010-05-14 05:48 ./source/a/aaa_base/_aaa_base.tar.gz
--rwxr-xr-x   1 root root      2087 2010-05-16 17:45 ./source/a/aaa_base/aaa_base.SlackBuild
--rw-r--r--   1 root root       786 2002-03-28 08:05 ./source/a/aaa_base/slack-desc
--rw-r--r--   1 root root        17 2010-05-13 18:52 ./source/a/aaa_base/slackware-version
-drwxr-xr-x   2 root root      4096 2009-05-23 00:41 ./source/a/aaa_elflibs
--rwxr-xr-x   1 root root      2610 2010-05-13 18:41 ./source/a/aaa_elflibs/aaa_elflibs.SlackBuild
--rw-r--r--   1 root root      1030 2004-06-14 04:14 ./source/a/aaa_elflibs/slack-desc
--rw-r--r--   1 root root      1441 2010-05-03 07:31 ./source/a/aaa_elflibs/symlinks-to-tracked-libs
--rw-r--r--   1 root root       170 2008-04-03 04:10 ./source/a/aaa_elflibs/tracked-files
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/a/aaa_terminfo
--rwxr-xr-x   1 root root      2183 2009-05-19 20:05 ./source/a/aaa_terminfo/aaa_terminfo.SlackBuild
--rw-r--r--   1 root root       968 2007-01-02 23:40 ./source/a/aaa_terminfo/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/a/acl
--rwxr-xr-x   1 root root      3474 2009-05-19 20:05 ./source/a/acl/acl.SlackBuild
--rw-r--r--   1 root root       507 2008-04-01 04:58 ./source/a/acl/acl.destdir.diff.gz
--rw-r--r--   1 root root    154823 2008-02-11 06:35 ./source/a/acl/acl_2.2.47-1.tar.gz
--rw-r--r--   1 root root       819 2006-02-21 04:39 ./source/a/acl/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-19 02:34 ./source/a/acpid
--rw-r--r--   1 root root       224 2004-02-05 01:54 ./source/a/acpid/acpi_handler.sh.gz
--rw-r--r--   1 root root     74405 2010-05-15 18:52 ./source/a/acpid/acpid-2.0.5.tar.gz
--rwxr-xr-x   1 root root      2939 2010-03-16 18:39 ./source/a/acpid/acpid.SlackBuild
--rw-r--r--   1 root root       399 2002-05-16 21:44 ./source/a/acpid/default.gz
--rw-r--r--   1 root root       271 2010-01-16 00:00 ./source/a/acpid/doinst.sh.gz
--rw-r--r--   1 root root       285 2010-02-16 22:57 ./source/a/acpid/rc.acpid.gz
--rw-r--r--   1 root root       867 2002-05-16 21:59 ./source/a/acpid/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/a/apmd
--rw-r--r--   1 root root     61686 2004-04-30 04:29 ./source/a/apmd/apmd-3.2.2.tar.bz2
--rwxr-xr-x   1 root root      3158 2009-06-10 01:19 ./source/a/apmd/apmd.SlackBuild
--rw-r--r--   1 root root      1009 2002-02-22 00:45 ./source/a/apmd/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/a/attr
--rwxr-xr-x   1 root root      3521 2009-05-19 20:05 ./source/a/attr/attr.SlackBuild
--rw-r--r--   1 root root       510 2008-04-01 04:54 ./source/a/attr/attr.destdir.diff.gz
--rw-r--r--   1 root root    116991 2008-07-03 07:41 ./source/a/attr/attr_2.4.43-1.tar.gz
--rw-r--r--   1 root root        88 2006-02-28 00:02 ./source/a/attr/build
--rw-r--r--   1 root root      1011 2006-02-21 04:44 ./source/a/attr/slack-desc
-drwxr-xr-x   3 root root      4096 2010-02-08 21:42 ./source/a/bash
-drwxr-xr-x   2 root root      4096 2010-05-15 02:47 ./source/a/bash/bash-4.1-patches
--rw-r--r--   1 root root      1445 2010-01-18 16:22 ./source/a/bash/bash-4.1-patches/bash41-001
--rw-r--r--   1 root root        65 2010-01-18 16:22 ./source/a/bash/bash-4.1-patches/bash41-001.sig
--rw-r--r--   1 root root      1799 2010-01-18 16:22 ./source/a/bash/bash-4.1-patches/bash41-002
--rw-r--r--   1 root root        65 2010-01-18 16:22 ./source/a/bash/bash-4.1-patches/bash41-002.sig
--rw-r--r--   1 root root      1407 2010-03-26 16:21 ./source/a/bash/bash-4.1-patches/bash41-003
--rw-r--r--   1 root root        65 2010-03-26 16:21 ./source/a/bash/bash-4.1-patches/bash41-003.sig
--rw-r--r--   1 root root      1705 2010-03-26 16:21 ./source/a/bash/bash-4.1-patches/bash41-004
--rw-r--r--   1 root root        65 2010-03-26 16:21 ./source/a/bash/bash-4.1-patches/bash41-004.sig
--rw-r--r--   1 root root      1626 2010-03-26 16:22 ./source/a/bash/bash-4.1-patches/bash41-005
--rw-r--r--   1 root root        65 2010-03-26 16:22 ./source/a/bash/bash-4.1-patches/bash41-005.sig
--rw-r--r--   1 root root      2166 2010-05-14 18:23 ./source/a/bash/bash-4.1-patches/bash41-006
--rw-r--r--   1 root root        65 2010-05-14 18:23 ./source/a/bash/bash-4.1-patches/bash41-006.sig
--rw-r--r--   1 root root      1610 2010-05-14 18:24 ./source/a/bash/bash-4.1-patches/bash41-007
--rw-r--r--   1 root root        65 2010-05-14 18:24 ./source/a/bash/bash-4.1-patches/bash41-007.sig
--rw-r--r--   1 root root   4012140 2010-01-01 02:51 ./source/a/bash/bash-4.1.tar.xz
--rwxr-xr-x   1 root root      4530 2010-02-08 21:48 ./source/a/bash/bash.SlackBuild
--rw-r--r--   1 root root       189 2009-02-23 21:59 ./source/a/bash/doinst.sh.gz
--rw-r--r--   1 root root       965 2002-03-23 21:47 ./source/a/bash/slack-desc
-drwxr-xr-x   3 root root      4096 2009-05-19 20:05 ./source/a/bin
--rw-r--r--   1 root root      7275 1994-12-30 09:11 ./source/a/bin/banners.tar.gz
--rwxr-xr-x   1 root root      4222 2009-05-19 20:05 ./source/a/bin/bin.SlackBuild
--rw-r--r--   1 root root       478 2004-02-24 17:32 ./source/a/bin/debianutils_2.7.dsc
--rw-r--r--   1 root root    165590 2004-02-24 17:32 ./source/a/bin/debianutils_2.7.tar.gz
--rw-r--r--   1 root root     27721 1999-10-07 14:42 ./source/a/bin/fbset-2.1.tar.gz
-drwxr-xr-x   2 root root      4096 2006-12-23 06:28 ./source/a/bin/scripts
--rw-r--r--   1 root root       195 2002-02-21 21:08 ./source/a/bin/scripts/diskcopy.gz
--rw-r--r--   1 root root       595 1993-05-02 00:04 ./source/a/bin/scripts/xx.gz
--rw-r--r--   1 root root       681 2006-12-21 20:40 ./source/a/bin/slack-desc
--rw-r--r--   1 root root      2403 1997-06-15 20:38 ./source/a/bin/todos.tar.gz
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/a/bzip2
--rw-r--r--   1 root root       280 2007-01-24 04:02 ./source/a/bzip2/bzip2-1.0.4.saneso.diff.gz
--rw-r--r--   1 root root    841402 2008-03-17 23:25 ./source/a/bzip2/bzip2-1.0.5.tar.gz
--rwxr-xr-x   1 root root      3679 2009-05-19 20:05 ./source/a/bzip2/bzip2.SlackBuild
--rw-r--r--   1 root root       934 2002-02-19 04:26 ./source/a/bzip2/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-11 19:37 ./source/a/coreutils
--rw-r--r--   1 root root      1723 2009-04-11 18:47 ./source/a/coreutils/DIR_COLORS.gz
--rw-r--r--   1 root root   4531488 2010-04-23 16:42 ./source/a/coreutils/coreutils-8.5.tar.xz
--rw-r--r--   1 root root       836 2010-04-23 16:42 ./source/a/coreutils/coreutils-8.5.tar.xz.sig
--rw-r--r--   1 root root       778 2010-04-28 05:16 ./source/a/coreutils/coreutils-dircolors.csh.gz
--rw-r--r--   1 root root       931 2010-05-11 19:37 ./source/a/coreutils/coreutils-dircolors.sh.gz
--rwxr-xr-x   1 root root      7045 2010-05-11 19:37 ./source/a/coreutils/coreutils.SlackBuild
--rw-r--r--   1 root root      1610 2009-09-15 13:55 ./source/a/coreutils/coreutils.uname.diff.gz
--rw-r--r--   1 root root       270 2009-02-23 03:00 ./source/a/coreutils/doinst.sh.gz
--rw-r--r--   1 root root       985 2003-05-20 21:33 ./source/a/coreutils/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-23 02:17 ./source/a/cpio
--rw-r--r--   1 root root       348 2009-03-15 20:17 ./source/a/cpio/cpio-2.9.gcc43.diff.gz
--rw-r--r--   1 root root    758195 2007-06-29 16:51 ./source/a/cpio/cpio-2.9.tar.bz2
--rwxr-xr-x   1 root root      3664 2009-05-19 20:05 ./source/a/cpio/cpio.SlackBuild
--rw-r--r--   1 root root       942 2002-03-23 21:52 ./source/a/cpio/slack-desc
-drwxr-xr-x   2 root root      4096 2010-03-11 20:17 ./source/a/cpufrequtils
--rw-r--r--   1 root root     51959 2010-01-16 16:42 ./source/a/cpufrequtils/cpufrequtils-007.tar.bz2
--rw-r--r--   1 root root       248 2010-01-16 16:42 ./source/a/cpufrequtils/cpufrequtils-007.tar.bz2.sign
--rwxr-xr-x   1 root root      3298 2010-03-11 20:10 ./source/a/cpufrequtils/cpufrequtils.SlackBuild
--rw-r--r--   1 root root      1083 2010-03-11 20:18 ./source/a/cpufrequtils/slack-desc
-drwxr-xr-x   2 root root      4096 2010-03-19 23:32 ./source/a/cryptsetup
--rw-r--r--   1 root root    465778 2010-01-17 11:01 ./source/a/cryptsetup/cryptsetup-1.1.0.tar.bz2
--rw-r--r--   1 root root       198 2010-01-17 11:02 ./source/a/cryptsetup/cryptsetup-1.1.0.tar.bz2.asc
--rwxr-xr-x   1 root root      4179 2010-04-30 22:02 ./source/a/cryptsetup/cryptsetup.SlackBuild
--rw-r--r--   1 root root      1042 2007-05-26 11:18 ./source/a/cryptsetup/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-17 07:39 ./source/a/cups
--rw-r--r--   1 root root   4461101 2010-03-30 20:46 ./source/a/cups/cups-1.4.3-source.tar.bz2
--rw-r--r--   1 root root    199167 2004-01-03 18:49 ./source/a/cups/cups-samba-5.0rc3.tar.gz
--rw-r--r--   1 root root     38284 2006-04-19 23:55 ./source/a/cups/cups-windows-6.0-source.tar.bz2
--rwxr-xr-x   1 root root      6603 2010-05-17 07:37 ./source/a/cups/cups.SlackBuild
--rw-r--r--   1 root root       565 2010-05-17 07:39 ./source/a/cups/doinst.sh.gz
--rw-r--r--   1 root root      1099 2002-02-01 20:47 ./source/a/cups/slack-desc
--rw-r--r--   1 root root      5324 2010-04-26 14:49 ./source/a/cups/usb-backend-both-usblp-and-libusb.dpatch.gz
-drwxr-xr-x   3 root root      4096 2009-07-24 23:40 ./source/a/cxxlibs
--rwxr-xr-x   1 root root      2099 2010-05-13 18:40 ./source/a/cxxlibs/cxxlibs.SlackBuild
-drwxr-xr-x   2 root root      4096 2009-07-24 21:14 ./source/a/cxxlibs/oldgcc
--rw-r--r--   1 root root  23972413 2007-05-31 19:07 ./source/a/cxxlibs/oldgcc/gcc-3.3.6.tar.bz2
--rw-r--r--   1 root root        65 2007-05-31 19:07 ./source/a/cxxlibs/oldgcc/gcc-3.3.6.tar.bz2.sig
--rwxr-xr-x   1 root root      2455 2009-07-24 21:15 ./source/a/cxxlibs/oldgcc/oldgcc.build
--rw-r--r--   1 root root       738 2002-03-23 21:52 ./source/a/cxxlibs/slack-desc
--rw-r--r--   1 root root       224 2008-04-03 05:03 ./source/a/cxxlibs/symlinks-to-tracked-libs
--rw-r--r--   1 root root        52 2009-07-24 23:39 ./source/a/cxxlibs/symlinks-to-tracked-libs64
-drwxr-xr-x   2 root root      4096 2010-05-01 02:31 ./source/a/dbus
--rw-r--r--   1 root root   1112192 2010-03-23 19:50 ./source/a/dbus/dbus-1.2.24.tar.xz
--rw-r--r--   1 root root       594 2009-10-31 05:49 ./source/a/dbus/dbus-1.2.x-allow_root_globally.diff.gz
--rwxr-xr-x   1 root root      4083 2010-05-01 02:31 ./source/a/dbus/dbus.SlackBuild
--rw-r--r--   1 root root       355 2008-09-23 18:06 ./source/a/dbus/doinst.sh.gz
--rw-r--r--   1 root root       773 2010-05-01 02:31 ./source/a/dbus/rc.messagebus.gz
--rw-r--r--   1 root root       945 2007-10-21 22:41 ./source/a/dbus/slack-desc
-drwxr-xr-x   2 root root      4096 2010-02-11 23:27 ./source/a/dcron
--rw-r--r--   1 root root       315 2010-02-11 22:38 ./source/a/dcron/crontab.c.O_EXCL.diff.gz
--rw-r--r--   1 root root       519 2009-05-30 01:25 ./source/a/dcron/crontab.root.gz
--rw-r--r--   1 root root     36404 2010-01-18 15:28 ./source/a/dcron/dcron-4.4.tar.gz
--rwxr-xr-x   1 root root      4105 2010-02-11 23:24 ./source/a/dcron/dcron.SlackBuild
--rw-r--r--   1 root root      1054 2010-02-11 23:23 ./source/a/dcron/dcron.manpage.paths.diff.gz
--rw-r--r--   1 root root       193 2010-02-11 22:39 ./source/a/dcron/defs.h.TMPDIR.diff.gz
--rw-r--r--   1 root root       104 2010-02-11 23:27 ./source/a/dcron/doinst.sh.gz
--rw-r--r--   1 root root       699 2009-05-30 01:25 ./source/a/dcron/run-parts.8.gz
--rw-r--r--   1 root root       567 2009-05-30 01:25 ./source/a/dcron/run-parts.gz
--rw-r--r--   1 root root       815 2009-05-30 01:25 ./source/a/dcron/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/a/devs
--rw-r--r--   1 root root     92572 2006-09-20 03:46 ./source/a/devs/_devs.tar.gz
--rwxr-xr-x   1 root root      2044 2009-05-19 20:05 ./source/a/devs/devs.SlackBuild
--rw-r--r--   1 root root       423 2002-06-09 19:32 ./source/a/devs/makedev.hd.diff.gz
--rw-r--r--   1 root root     27096 2000-11-11 19:33 ./source/a/devs/makedev_2.3.1-46.2.diff.gz
--rw-r--r--   1 root root       602 2003-09-02 20:00 ./source/a/devs/makedev_2.3.1.hd.diff.gz
--rw-r--r--   1 root root     10037 1998-09-07 17:52 ./source/a/devs/makedev_2.3.1.orig.tar.gz
--rw-r--r--   1 root root       262 2004-05-21 02:29 ./source/a/devs/makedev_2.3.1.slack.diff.gz
--rw-r--r--   1 root root       766 2002-03-20 01:10 ./source/a/devs/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-23 00:41 ./source/a/dialog
--rw-r--r--   1 root root    301393 2008-08-20 00:36 ./source/a/dialog/dialog-1.1-20080819.tar.bz2
--rwxr-xr-x   1 root root      3537 2009-05-23 00:41 ./source/a/dialog/dialog.SlackBuild
--rw-r--r--   1 root root       334 2009-04-23 01:28 ./source/a/dialog/dialog.smaller.min.height.diff.gz
--rw-r--r--   1 root root       970 2007-01-02 22:29 ./source/a/dialog/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/a/dosfstools
--rw-r--r--   1 root root     68346 2005-03-12 16:33 ./source/a/dosfstools/dosfstools-2.11.src.tar.gz
--rwxr-xr-x   1 root root      2605 2009-05-19 20:05 ./source/a/dosfstools/dosfstools.SlackBuild
--rw-r--r--   1 root root       742 2006-12-21 20:33 ./source/a/dosfstools/slack-desc
-drwxr-xr-x   2 root root      4096 2010-03-19 16:50 ./source/a/e2fsprogs
--rw-r--r--   1 root root       325 2009-05-30 01:25 ./source/a/e2fsprogs/doinst.sh.gz
--rw-r--r--   1 root root   3359344 2010-03-15 05:09 ./source/a/e2fsprogs/e2fsprogs-1.41.11.tar.xz
--rwxr-xr-x   1 root root      5191 2010-03-19 16:50 ./source/a/e2fsprogs/e2fsprogs.SlackBuild
--rw-r--r--   1 root root       803 2009-05-30 01:25 ./source/a/e2fsprogs/slack-desc
-drwxr-xr-x   2 root root      4096 2009-06-12 20:59 ./source/a/ed
--rw-r--r--   1 root root     69427 2009-05-23 22:58 ./source/a/ed/ed-1.3.tar.bz2
--rwxr-xr-x   1 root root      3177 2009-06-12 21:01 ./source/a/ed/ed.SlackBuild
--rw-r--r--   1 root root       805 2006-12-13 23:11 ./source/a/ed/slack-desc
-drwxr-xr-x   2 root root      4096 2010-01-25 21:58 ./source/a/eject
--rw-r--r--   1 root root    107301 2006-06-04 19:58 ./source/a/eject/eject-2.1.5.tar.bz2
--rwxr-xr-x   1 root root      3501 2010-01-25 22:00 ./source/a/eject/eject.SlackBuild
--rw-r--r--   1 root root       883 2010-01-25 21:57 ./source/a/eject/eject.spaces.diff.gz
--rw-r--r--   1 root root       886 2006-12-14 01:32 ./source/a/eject/slack-desc
-drwxr-xr-x   2 root root      4096 2010-01-27 18:31 ./source/a/elvis
--rw-r--r--   1 root root   1143603 2003-10-21 02:35 ./source/a/elvis/elvis-2.2_0.tar.bz2
--rwxr-xr-x   1 root root      4002 2010-01-27 18:32 ./source/a/elvis/elvis.SlackBuild
--rw-r--r--   1 root root      1633 2004-02-22 06:19 ./source/a/elvis/elvis.clr
--rw-r--r--   1 root root      1584 2003-10-21 02:32 ./source/a/elvis/elvis.clr.orig
--rw-r--r--   1 root root       673 2010-01-27 18:31 ./source/a/elvis/elvis.ref.c.getline.diff.gz
--rw-r--r--   1 root root       845 2008-02-11 03:44 ./source/a/elvis/slack-desc
-drwxr-xr-x   2 root root      4096 2010-02-05 23:31 ./source/a/etc
--rw-r--r--   1 root root     34612 2010-02-05 23:31 ./source/a/etc/_etc.tar.gz
--rwxr-xr-x   1 root root      2032 2010-02-05 23:32 ./source/a/etc/etc.SlackBuild
--rw-r--r--   1 root root       536 2002-10-11 20:17 ./source/a/etc/nsswitch.conf.gz
--rw-r--r--   1 root root       657 2002-03-23 21:54 ./source/a/etc/slack-desc
--rw-r--r--   1 root root    226973 2000-03-02 23:51 ./source/a/etc/termcap-BSD.gz
-drwxr-xr-x   2 root root      4096 2010-01-23 05:16 ./source/a/file
--rw-r--r--   1 root root    408264 2010-01-22 21:46 ./source/a/file/file-5.04.tar.xz
--rwxr-xr-x   1 root root      5048 2010-02-06 03:07 ./source/a/file/file.SlackBuild
--rw-r--r--   1 root root       195 2009-02-23 01:20 ./source/a/file/file.crdaregbin.magic.gz
--rw-r--r--   1 root root       212 2009-06-12 22:40 ./source/a/file/file.etc.file.diff.gz
--rw-r--r--   1 root root       336 2009-02-09 04:19 ./source/a/file/file.quiet.diff.gz
--rw-r--r--   1 root root       272 2009-02-09 04:17 ./source/a/file/file.short.diff.gz
--rw-r--r--   1 root root       248 2009-04-23 04:50 ./source/a/file/file.xz.magic.gz
--rw-r--r--   1 root root       214 2005-09-07 03:59 ./source/a/file/file.zisofs.magic.gz
--rw-r--r--   1 root root       680 2006-12-13 22:49 ./source/a/file/slack-desc
-drwxr-xr-x   2 root root      4096 2009-06-13 00:01 ./source/a/findutils
--rw-r--r--   1 root root   1114432 2009-06-06 14:38 ./source/a/findutils/findutils-4.4.2.tar.xz
--rwxr-xr-x   1 root root      3575 2009-06-13 00:02 ./source/a/findutils/findutils.SlackBuild
--rw-r--r--   1 root root       186 2009-02-21 21:50 ./source/a/findutils/findutils.no.default.options.warnings.diff.gz
--rw-r--r--   1 root root       359 2009-02-21 21:19 ./source/a/findutils/findutils.nolocate.diff.gz
--rw-r--r--   1 root root       828 2002-04-07 10:22 ./source/a/findutils/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-23 02:17 ./source/a/floppy
--rw-r--r--   1 root root     25310 2002-05-01 02:18 ./source/a/floppy/fdutils-5.4-20020222.diff.gz
--rw-r--r--   1 root root    190535 2001-02-04 04:36 ./source/a/floppy/fdutils-5.4.tar.gz
--rw-r--r--   1 root root       182 2001-02-04 05:02 ./source/a/floppy/fdutils.mediaprm.diff.gz
--rwxr-xr-x   1 root root      3386 2009-05-19 20:05 ./source/a/floppy/floppy.SlackBuild
--rw-r--r--   1 root root     11298 2002-05-01 02:21 ./source/a/floppy/mediaprm
--rw-r--r--   1 root root    286730 2001-05-27 12:42 ./source/a/floppy/mtools-3.9.8.tar.gz
--rw-r--r--   1 root root      1914 2001-02-04 04:50 ./source/a/floppy/mtools.conf
--rw-r--r--   1 root root       728 2002-03-23 21:55 ./source/a/floppy/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-09 18:52 ./source/a/gawk
--rw-r--r--   1 root root   1523944 2010-05-07 21:41 ./source/a/gawk/gawk-3.1.8.tar.xz
--rwxr-xr-x   1 root root      3742 2010-05-09 18:52 ./source/a/gawk/gawk.SlackBuild
--rw-r--r--   1 root root      1043 2002-03-23 21:56 ./source/a/gawk/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/a/genpower
--rw-r--r--   1 root root     66728 2005-01-04 22:32 ./source/a/genpower/genpower-1.0.5.tar.gz
--rwxr-xr-x   1 root root      3077 2009-05-19 20:05 ./source/a/genpower/genpower.SlackBuild
--rw-r--r--   1 root root       514 2008-12-03 00:22 ./source/a/genpower/genpower.halt.diff.gz
--rw-r--r--   1 root root       460 2002-04-11 03:18 ./source/a/genpower/genpower.var.diff.gz
--rw-r--r--   1 root root       957 2002-04-11 05:06 ./source/a/genpower/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/a/gettext
--rw-r--r--   1 root root   8236607 2007-11-07 03:14 ./source/a/gettext/gettext-0.17.tar.bz2
--rwxr-xr-x   1 root root      3584 2010-01-13 00:49 ./source/a/gettext/gettext-tools.SlackBuild
--rwxr-xr-x   1 root root      3416 2010-01-13 00:55 ./source/a/gettext/gettext.SlackBuild
--rw-r--r--   1 root root       737 2008-02-11 03:44 ./source/a/gettext/slack-desc
--rw-r--r--   1 root root      1093 2008-02-11 03:44 ./source/a/gettext/slack-desc.gettext-tools
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/a/getty-ps
--rwxr-xr-x   1 root root      2667 2009-05-19 20:05 ./source/a/getty-ps/getty-ps.SlackBuild
--rw-r--r--   1 root root      3609 2005-07-21 12:27 ./source/a/getty-ps/getty.bugfixes.diff.gz
--rw-r--r--   1 root root      1223 2002-10-04 05:00 ./source/a/getty-ps/getty_ps-2.1.0.lsm
--rw-r--r--   1 root root    117414 2005-07-21 12:27 ./source/a/getty-ps/getty_ps-2.1.0b.tar.gz
--rw-r--r--   1 root root       969 2008-02-11 03:44 ./source/a/getty-ps/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/a/gpm
--rw-r--r--   1 root root       344 2004-10-13 20:51 ./source/a/gpm/gpm-1.20.1-consolename.patch.gz
--rw-r--r--   1 root root       404 2004-09-09 05:52 ./source/a/gpm/gpm-1.20.1-gpmopen.patch.gz
--rw-r--r--   1 root root       274 2004-09-09 05:52 ./source/a/gpm/gpm-1.20.1-idie.patch.gz
--rw-r--r--   1 root root       289 2006-12-12 02:00 ./source/a/gpm/gpm-1.20.1-input-defines.diff.gz
--rw-r--r--   1 root root       301 2004-09-23 18:46 ./source/a/gpm/gpm-1.20.1-input.patch.gz
--rw-r--r--   1 root root       362 2006-01-18 12:07 ./source/a/gpm/gpm-1.20.1-lib-silent.patch.gz
--rw-r--r--   1 root root       294 2004-09-09 05:51 ./source/a/gpm/gpm-1.20.1-math.patch.gz
--rw-r--r--   1 root root       791 2004-10-20 21:28 ./source/a/gpm/gpm-1.20.1-multilib.patch.gz
--rw-r--r--   1 root root       356 2006-01-18 12:07 ./source/a/gpm/gpm-1.20.1-no-console-error.patch.gz
--rw-r--r--   1 root root       249 2004-10-13 20:03 ./source/a/gpm/gpm-1.20.1-nodebug.patch.gz
--rw-r--r--   1 root root       237 2004-09-09 05:52 ./source/a/gpm/gpm-1.20.1-subscript.patch.gz
--rw-r--r--   1 root root       515 2004-09-09 05:52 ./source/a/gpm/gpm-1.20.1-weak-wgetch.patch.gz
--rw-r--r--   1 root root       651 2006-08-20 19:46 ./source/a/gpm/gpm-1.20.1.send-noise-to-syslogs.diff.gz
--rw-r--r--   1 root root    565014 2004-06-25 18:13 ./source/a/gpm/gpm-1.20.1.tar.bz2
--rw-r--r--   1 root root     59408 2004-09-09 05:52 ./source/a/gpm/gpm-evdev-cumulative.patch.gz
--rwxr-xr-x   1 root root      5475 2009-05-19 20:05 ./source/a/gpm/gpm.SlackBuild
--rw-r--r--   1 root root       285 2006-02-07 21:26 ./source/a/gpm/gpm.evdevmakefile.patch.gz
--rw-r--r--   1 root root      4268 2004-09-09 05:52 ./source/a/gpm/inputattach.c.gz
--rw-r--r--   1 root root       168 2001-04-15 23:47 ./source/a/gpm/mouseconfig.gz
--rw-r--r--   1 root root      2117 2008-03-15 20:30 ./source/a/gpm/setup.mouse.gz
--rw-r--r--   1 root root       965 2002-05-29 01:05 ./source/a/gpm/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/a/grep
--rw-r--r--   1 root root    723181 2009-02-10 13:58 ./source/a/grep/grep-2.5.4.tar.bz2
--rwxr-xr-x   1 root root      3292 2009-05-19 20:05 ./source/a/grep/grep.SlackBuild
--rw-r--r--   1 root root       747 2002-04-02 08:53 ./source/a/grep/slack-desc
-drwxr-xr-x   2 root root      4096 2010-02-09 01:11 ./source/a/gzip
--rw-r--r--   1 root root    618124 2010-01-20 18:52 ./source/a/gzip/gzip-1.4.tar.xz
--rw-r--r--   1 root root       836 2010-01-20 18:52 ./source/a/gzip/gzip-1.4.tar.xz.sig
--rwxr-xr-x   1 root root      4934 2010-02-09 01:11 ./source/a/gzip/gzip.SlackBuild
--rw-r--r--   1 root root       770 2002-03-23 21:58 ./source/a/gzip/slack-desc
-drwxr-xr-x   2 root root      4096 2009-10-13 22:55 ./source/a/hdparm
--rw-r--r--   1 root root     97565 2009-10-02 13:18 ./source/a/hdparm/hdparm-9.27.tar.bz2
--rwxr-xr-x   1 root root      2227 2009-10-13 22:55 ./source/a/hdparm/hdparm.SlackBuild
--rw-r--r--   1 root root       805 2002-02-22 00:10 ./source/a/hdparm/slack-desc
-drwxr-xr-x   2 root root      4096 2009-08-24 08:47 ./source/a/infozip
--rwxr-xr-x   1 root root      3159 2009-08-24 08:48 ./source/a/infozip/infozip.SlackBuild
--rw-r--r--   1 root root       924 2002-03-29 01:12 ./source/a/infozip/slack-desc
--rw-r--r--   1 root root    882180 2009-01-02 16:33 ./source/a/infozip/unzip60.tar.xz
--rw-r--r--   1 root root    775420 2008-07-05 17:31 ./source/a/infozip/zip30.tar.xz
-drwxr-xr-x   2 root root      4096 2010-05-08 07:54 ./source/a/inotify-tools
--rw-r--r--   1 root root    243384 2010-03-14 13:56 ./source/a/inotify-tools/inotify-tools-3.14.tar.xz
--rwxr-xr-x   1 root root      3972 2010-05-08 07:55 ./source/a/inotify-tools/inotify-tools.SlackBuild
--rw-r--r--   1 root root       977 2008-02-11 03:44 ./source/a/inotify-tools/slack-desc
-drwxr-xr-x   2 root root      4096 2009-06-12 23:20 ./source/a/jfsutils
--rw-r--r--   1 root root    414662 2009-04-06 19:17 ./source/a/jfsutils/jfsutils-1.1.14.tar.bz2
--rwxr-xr-x   1 root root      3047 2009-06-12 23:20 ./source/a/jfsutils/jfsutils.SlackBuild
--rw-r--r--   1 root root       998 2003-02-16 21:43 ./source/a/jfsutils/slack-desc
-drwxr-xr-x   3 root root      4096 2010-04-29 06:02 ./source/a/kbd
--rwxr-xr-x   1 root root      7076 2010-04-29 06:13 ./source/a/kbd/kbd.SlackBuild
--rw-r--r--   1 root root     11717 2010-04-29 06:02 ./source/a/kbd/setconsolefont
--rw-r--r--   1 root root       283 2009-05-14 19:13 ./source/a/kbd/setup.setconsolefont
--rw-r--r--   1 root root       919 2003-02-27 23:42 ./source/a/kbd/slack-desc
-drwxr-xr-x   2 root root      4096 2010-04-29 05:19 ./source/a/kbd/sources
--rw-r--r--   1 root root     24797 2001-05-26 05:49 ./source/a/kbd/sources/extraf.tgz
--rw-r--r--   1 root root       960 2009-01-08 14:46 ./source/a/kbd/sources/kbd-1.15-keycodes-man.patch.gz
--rw-r--r--   1 root root       270 2009-01-08 14:46 ./source/a/kbd/sources/kbd-1.15-resizecon-x86_64.patch.gz
--rw-r--r--   1 root root       399 2009-08-25 01:23 ./source/a/kbd/sources/kbd-1.15-unicode_start.patch.gz
--rw-r--r--   1 root root       213 2010-04-29 05:19 ./source/a/kbd/sources/kbd-1.15.2-po.patch.gz
--rw-r--r--   1 root root   1040140 2010-04-10 21:35 ./source/a/kbd/sources/kbd-1.15.2.tar.bz2
--rw-r--r--   1 root root       248 2010-04-10 21:35 ./source/a/kbd/sources/kbd-1.15.2.tar.bz2.sign
--rw-r--r--   1 root root      4291 2007-10-15 12:16 ./source/a/kbd/sources/kbd-latarcyrheb-16-fixed.tar.bz2
--rw-r--r--   1 root root      6155 2006-09-29 11:13 ./source/a/kbd/sources/kbd-latsun-fonts.tar.bz2
--rw-r--r--   1 root root       224 2004-05-30 04:18 ./source/a/kbd/sources/nl.euro.diff.gz
--rw-r--r--   1 root root      2338 2007-11-14 11:41 ./source/a/kbd/sources/ro_maps.tar.bz2
--rw-r--r--   1 root root      3543 2002-05-24 21:22 ./source/a/kbd/sources/speakup-jfw.tar.gz
--rw-r--r--   1 root root      2246 2001-10-05 13:14 ./source/a/kbd/sources/speakupmap.map.gz
-drwxr-xr-x   2 root root      4096 2009-11-10 05:41 ./source/a/less
--rw-r--r--   1 root root    246126 2009-08-31 20:42 ./source/a/less/less-436.tar.bz2
--rwxr-xr-x   1 root root      3397 2010-02-09 01:05 ./source/a/less/less.SlackBuild
--rw-r--r--   1 root root       313 2002-05-28 00:15 ./source/a/less/less.sysconfdir.diff.gz
--rw-r--r--   1 root root      1355 2009-11-05 23:57 ./source/a/less/lesspipe.sh.gz
--rw-r--r--   1 root root       841 2002-03-23 22:00 ./source/a/less/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/a/lha
--rw-r--r--   1 root root     64608 2000-12-15 12:20 ./source/a/lha/lha-114i.tar.gz
--rwxr-xr-x   1 root root      2533 2009-05-19 20:05 ./source/a/lha/lha.SlackBuild
--rw-r--r--   1 root root     45132 2006-12-13 19:47 ./source/a/lha/lha_1.14i-10.1.diff.gz
--rw-r--r--   1 root root       606 2006-12-23 05:46 ./source/a/lha/slack-desc
-drwxr-xr-x   2 root root      4096 2010-02-15 01:58 ./source/a/lilo
--rw-r--r--   1 root root    437555 2007-02-19 18:18 ./source/a/lilo/lilo-22.8.src.tar.gz
--rw-r--r--   1 root root       536 2007-02-19 18:18 ./source/a/lilo/lilo-22.8.src.tar.gz.sig
--rwxr-xr-x   1 root root      3181 2010-02-15 02:09 ./source/a/lilo/lilo.SlackBuild
--rw-r--r--   1 root root       709 2009-12-18 05:12 ./source/a/lilo/lilo.use_major_minor_instead_lvm_name.diff.gz
--rw-r--r--   1 root root     38380 2009-02-23 11:00 ./source/a/lilo/liloconfig
--rw-r--r--   1 root root       105 2002-03-09 08:27 ./source/a/lilo/setup.liloconfig
--rw-r--r--   1 root root      1045 2002-03-23 22:00 ./source/a/lilo/slack-desc
--rw-r--r--   1 root root     14174 2010-02-15 01:57 ./source/a/lilo/slack.bmp
--rw-r--r--   1 root root       133 2008-02-22 00:08 ./source/a/lilo/slack.dat
--rw-r--r--   1 root root     17318 2008-12-09 00:56 ./source/a/lilo/slack64.bmp
--rw-r--r--   1 root root      3331 1994-07-08 18:55 ./source/a/lilo/text.lilohelp
-drwxr-xr-x   2 root root      4096 2010-02-12 00:19 ./source/a/logrotate
--rw-r--r--   1 root root       268 2009-05-30 01:28 ./source/a/logrotate/doinst.sh.gz
--rw-r--r--   1 root root     37716 2009-05-30 01:28 ./source/a/logrotate/logrotate-3.7.8.tar.xz
--rwxr-xr-x   1 root root      3243 2010-02-12 00:20 ./source/a/logrotate/logrotate.SlackBuild
--rw-r--r--   1 root root       645 2009-05-30 01:28 ./source/a/logrotate/logrotate.conf.gz
--rw-r--r--   1 root root       131 2009-05-30 01:28 ./source/a/logrotate/logrotate.cron.gz
--rw-r--r--   1 root root      1076 2009-05-30 01:28 ./source/a/logrotate/logrotate.slackware.diff.gz
--rw-r--r--   1 root root       993 2009-05-30 01:28 ./source/a/logrotate/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-04 07:13 ./source/a/lvm2
--rw-r--r--   1 root root    644304 2010-04-30 15:21 ./source/a/lvm2/LVM2.2.02.64.tar.xz
--rw-r--r--   1 root root       271 2008-10-06 12:21 ./source/a/lvm2/doinst.sh.gz
--rwxr-xr-x   1 root root      4375 2010-05-04 07:28 ./source/a/lvm2/lvm2.SlackBuild
--rw-r--r--   1 root root      1012 2008-02-08 17:26 ./source/a/lvm2/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-17 01:56 ./source/a/mdadm
--rw-r--r--   1 root root       261 2004-05-27 18:31 ./source/a/mdadm/doinst.sh.gz
--rw-r--r--   1 root root    156358 2009-03-10 06:01 ./source/a/mdadm/mdadm-2.6.9.tar.bz2
--rw-r--r--   1 root root       248 2009-03-10 06:01 ./source/a/mdadm/mdadm-2.6.9.tar.bz2.sign
--rwxr-xr-x   1 root root      2801 2010-05-17 01:57 ./source/a/mdadm/mdadm.SlackBuild
--rw-r--r--   1 root root       258 2010-05-17 01:56 ./source/a/mdadm/mdadm.static.diff.gz
--rw-r--r--   1 root root       928 2004-05-27 18:23 ./source/a/mdadm/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-23 00:41 ./source/a/minicom
--rw-r--r--   1 root root       503 2008-09-30 10:20 ./source/a/minicom/config.sub-x86_64.diff.gz
--rw-r--r--   1 root root       289 2004-09-04 21:22 ./source/a/minicom/doinst.sh.gz
--rw-r--r--   1 root root     16580 2001-03-25 19:17 ./source/a/minicom/lrzsz_0.12.21-4.diff.gz
--rw-r--r--   1 root root    287790 1999-09-19 19:01 ./source/a/minicom/lrzsz_0.12.21.orig.tar.gz
--rw-r--r--   1 root root    607939 2003-09-17 21:55 ./source/a/minicom/minicom-2.1.tar.gz
--rw-r--r--   1 root root       189 2003-09-17 21:54 ./source/a/minicom/minicom-2.1.tar.gz.asc
--rwxr-xr-x   1 root root      5033 2010-05-17 22:12 ./source/a/minicom/minicom.SlackBuild
--rw-r--r--   1 root root       570 2004-09-04 21:17 ./source/a/minicom/minicom.users.gz
--rw-r--r--   1 root root        92 2004-09-04 21:16 ./source/a/minicom/minirc.dfl.gz
--rw-r--r--   1 root root       781 2002-03-29 01:13 ./source/a/minicom/slack-desc
--rw-r--r--   1 root root       568 2008-10-02 19:18 ./source/a/minicom/wintcap.diff.gz
-drwxr-xr-x   2 root root      4096 2010-04-22 19:31 ./source/a/mkinitrd
--rw-r--r--   1 root root      3650 2010-01-09 05:40 ./source/a/mkinitrd/README.initrd
--rw-r--r--   1 root root      2589 2010-04-01 21:26 ./source/a/mkinitrd/_initrd-tree.tar.gz
--rw-r--r--   1 root root   1987727 2009-12-18 05:11 ./source/a/mkinitrd/busybox-1.15.3.tar.bz2
--rw-r--r--   1 root root     21604 2009-12-18 05:10 ./source/a/mkinitrd/busybox-dot-config
--rwxr-xr-x   1 root root     10439 2010-05-08 04:47 ./source/a/mkinitrd/init
--rw-r--r--   1 root root     29903 2009-12-18 05:10 ./source/a/mkinitrd/keymaps.tar.gz
--rw-r--r--   1 root root     20297 2010-03-27 15:49 ./source/a/mkinitrd/mkinitrd
--rw-r--r--   1 root root      7669 2010-03-27 16:18 ./source/a/mkinitrd/mkinitrd.8
--rwxr-xr-x   1 root root      4745 2010-05-08 04:47 ./source/a/mkinitrd/mkinitrd.SlackBuild
--rw-r--r--   1 root root      5333 2010-03-27 16:36 ./source/a/mkinitrd/mkinitrd.conf.5
--rw-r--r--   1 root root       402 2010-03-04 00:04 ./source/a/mkinitrd/mkinitrd.conf.sample
--rw-r--r--   1 root root     27270 2009-12-19 16:17 ./source/a/mkinitrd/mkinitrd_command_generator.sh
--rw-r--r--   1 root root       988 2009-12-18 05:07 ./source/a/mkinitrd/slack-desc
-drwxr-xr-x   2 root root      4096 2010-02-06 20:21 ./source/a/module-init-tools
--rw-r--r--   1 root root       669 2009-10-15 13:15 ./source/a/module-init-tools/modprobe.ignore_some_suffixes.diff.gz
--rw-r--r--   1 root root       295 2010-02-06 20:01 ./source/a/module-init-tools/modprobe.quit.whining.about.modprobe.conf.diff.gz
--rw-r--r--   1 root root    200815 2009-10-21 13:29 ./source/a/module-init-tools/module-init-tools-3.11.1.tar.bz2
--rwxr-xr-x   1 root root      3832 2010-02-06 20:29 ./source/a/module-init-tools/module-init-tools.SlackBuild
--rw-r--r--   1 root root       857 2009-05-30 01:28 ./source/a/module-init-tools/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/a/mt-st
--rw-r--r--   1 root root       375 2007-05-15 02:19 ./source/a/mt-st/_mt-st.tar.gz
--rw-r--r--   1 root root     36537 2005-08-21 19:14 ./source/a/mt-st/mt-st-0.9b.tar.gz
--rwxr-xr-x   1 root root      2702 2009-05-19 20:05 ./source/a/mt-st/mt-st.SlackBuild
--rw-r--r--   1 root root       949 2005-04-07 06:26 ./source/a/mt-st/mt-st.config.diff.gz
--rw-r--r--   1 root root       358 2005-10-25 10:17 ./source/a/mt-st/mt-st.man.diff.gz
--rw-r--r--   1 root root       236 2004-09-09 08:51 ./source/a/mt-st/mt-st.sdlt.diff.gz
--rw-r--r--   1 root root       943 2002-02-24 20:29 ./source/a/mt-st/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/a/mtx
--rw-r--r--   1 root root    220990 2007-01-25 23:16 ./source/a/mtx/mtx-1.3.9.tar.gz
--rwxr-xr-x   1 root root      2745 2009-05-19 20:05 ./source/a/mtx/mtx.SlackBuild
--rw-r--r--   1 root root       854 2007-01-25 23:21 ./source/a/mtx/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/a/ncompress
--rw-r--r--   1 root root       304 2006-08-11 11:44 ./source/a/ncompress/ncompress-4.2.4-bssUnderflow.patch.gz
--rw-r--r--   1 root root       207 2006-09-19 12:34 ./source/a/ncompress/ncompress-4.2.4-endians.patch.gz
--rw-r--r--   1 root root     32533 1996-12-24 07:00 ./source/a/ncompress/ncompress-4.2.4.tar.gz
--rw-r--r--   1 root root       220 2004-10-05 09:15 ./source/a/ncompress/ncompress.2GB.diff.gz
--rwxr-xr-x   1 root root      3100 2009-05-19 20:05 ./source/a/ncompress/ncompress.SlackBuild
--rw-r--r--   1 root root      1164 2004-09-09 09:01 ./source/a/ncompress/ncompress.filenamelen.diff.gz
--rw-r--r--   1 root root       773 2004-09-09 09:01 ./source/a/ncompress/ncompress.lfs2.diff.gz
--rw-r--r--   1 root root       952 2004-09-09 09:00 ./source/a/ncompress/ncompress.make.diff.gz
--rw-r--r--   1 root root       389 2006-04-21 12:20 ./source/a/ncompress/ncompress.zerobyteforce.diff.gz
--rw-r--r--   1 root root      1020 2006-12-14 01:48 ./source/a/ncompress/slack-desc
-drwxr-xr-x   2 root root      4096 2010-03-08 18:47 ./source/a/ntfs-3g
--rw-r--r--   1 root root      2067 2010-01-18 16:00 ./source/a/ntfs-3g/10-ntfs-3g-policy.fdi
--rw-r--r--   1 root root    539596 2010-03-06 20:41 ./source/a/ntfs-3g/ntfs-3g-2010.3.6.tar.xz
--rwxr-xr-x   1 root root      4086 2010-02-09 21:41 ./source/a/ntfs-3g/ntfs-3g.SlackBuild
--rw-r--r--   1 root root      1003 2008-03-15 03:46 ./source/a/ntfs-3g/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/a/patch
--rw-r--r--   1 root root    186879 1999-08-31 09:17 ./source/a/patch/patch-2.5.4.tar.gz
--rwxr-xr-x   1 root root      2191 2009-05-19 20:05 ./source/a/patch/patch.SlackBuild
--rw-r--r--   1 root root      1020 2006-12-14 02:21 ./source/a/patch/slack-desc
-drwxr-xr-x   2 root root      4096 2010-01-20 14:15 ./source/a/pciutils
--rw-r--r--   1 root root    284099 2010-01-19 09:40 ./source/a/pciutils/pciutils-3.1.5.tar.bz2
--rwxr-xr-x   1 root root      3525 2010-02-09 03:45 ./source/a/pciutils/pciutils.SlackBuild
--rw-r--r--   1 root root       306 2009-07-29 07:26 ./source/a/pciutils/pciutils.ids.dest.diff.gz
--rw-r--r--   1 root root        92 2008-04-01 21:00 ./source/a/pciutils/pciutils.url
--rw-r--r--   1 root root       895 2006-12-19 23:55 ./source/a/pciutils/slack-desc
-drwxr-xr-x   3 root root      4096 2009-05-23 02:18 ./source/a/pcmciautils
--rw-r--r--   1 root root      1429 2007-03-16 14:50 ./source/a/pcmciautils/cis-cs-3.2.8.tar.gz
-drwxr-xr-x   2 root root      4096 2008-09-12 04:35 ./source/a/pcmciautils/config
--rw-r--r--   1 root root       926 2007-03-16 20:00 ./source/a/pcmciautils/config/60-pcmcia.rules
--rw-r--r--   1 root root      2577 2008-03-05 03:14 ./source/a/pcmciautils/config/config.opts
--rwxr-xr-x   1 root root      1722 2007-03-16 21:09 ./source/a/pcmciautils/config/rc.pcmcia
--rw-r--r--   1 root root       277 2009-04-14 04:38 ./source/a/pcmciautils/doinst.sh.gz
--rw-r--r--   1 root root     43239 2008-07-15 04:16 ./source/a/pcmciautils/pcmciautils-015.tar.bz2
--rwxr-xr-x   1 root root      3555 2009-05-19 20:05 ./source/a/pcmciautils/pcmciautils.SlackBuild
--rw-r--r--   1 root root       914 2009-04-14 04:35 ./source/a/pcmciautils/slack-desc
-drwxr-xr-x   5 root root      4096 2009-05-19 20:05 ./source/a/pkgtools
-drwxr-xr-x   2 root root      4096 2009-04-11 21:15 ./source/a/pkgtools/manpages
--rw-r--r--   1 root root      1256 2009-04-11 20:54 ./source/a/pkgtools/manpages/explodepkg.8
--rw-r--r--   1 root root      2561 2009-04-11 20:52 ./source/a/pkgtools/manpages/installpkg.8
--rw-r--r--   1 root root      4557 2009-04-11 20:51 ./source/a/pkgtools/manpages/makepkg.8
--rw-r--r--   1 root root      2518 2009-04-11 21:11 ./source/a/pkgtools/manpages/pkgtool.8
--rw-r--r--   1 root root      3080 2009-04-11 21:15 ./source/a/pkgtools/manpages/removepkg.8
--rw-r--r--   1 root root      3199 2001-06-07 08:29 ./source/a/pkgtools/manpages/setup.8-deprecated
--rw-r--r--   1 root root      2665 2009-04-11 21:14 ./source/a/pkgtools/manpages/upgradepkg.8
-drwxr-xr-x   2 root root      4096 2008-04-19 23:44 ./source/a/pkgtools/obsolete-scripts
--rw-r--r--   1 root root       155 2008-04-19 23:44 ./source/a/pkgtools/obsolete-scripts/README
--rw-r--r--   1 root root      1326 2003-02-16 00:57 ./source/a/pkgtools/obsolete-scripts/setup.90.modem-device
--rwxr-xr-x   1 root root      2489 2010-05-11 16:49 ./source/a/pkgtools/pkgtools.SlackBuild
-drwxr-xr-x   2 root root      4096 2009-06-02 04:12 ./source/a/pkgtools/scripts
--rw-r--r--   1 root root      3169 2010-05-11 16:38 ./source/a/pkgtools/scripts/explodepkg
--rw-r--r--   1 root root     19653 2009-08-16 21:22 ./source/a/pkgtools/scripts/installpkg
--rw-r--r--   1 root root     13749 2009-04-06 02:14 ./source/a/pkgtools/scripts/makebootdisk
--rw-r--r--   1 root root     11315 2009-06-02 04:12 ./source/a/pkgtools/scripts/makepkg
--rw-r--r--   1 root root     22621 2010-05-11 16:31 ./source/a/pkgtools/scripts/pkgtool
--rw-r--r--   1 root root     14048 2009-04-28 20:44 ./source/a/pkgtools/scripts/removepkg
--rw-r--r--   1 root root       170 2003-02-16 00:56 ./source/a/pkgtools/scripts/setup.70.install-kernel
--rw-r--r--   1 root root      6356 2008-03-18 19:39 ./source/a/pkgtools/scripts/setup.80.make-bootdisk
--rw-r--r--   1 root root      1070 2007-06-27 00:28 ./source/a/pkgtools/scripts/setup.htmlview
--rw-r--r--   1 root root      7421 2008-03-19 08:13 ./source/a/pkgtools/scripts/setup.services
--rw-r--r--   1 root root     12135 2010-05-11 16:41 ./source/a/pkgtools/scripts/upgradepkg
--rw-r--r--   1 root root      1083 2002-03-23 04:15 ./source/a/pkgtools/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-23 00:41 ./source/a/procps
--rw-r--r--   1 root root     24365 2001-03-02 18:54 ./source/a/procps/procinfo-18.tar.gz
--rw-r--r--   1 root root       213 2003-02-07 21:39 ./source/a/procps/procinfo.gcc3.diff.gz
--rw-r--r--   1 root root       504 2001-03-02 18:54 ./source/a/procps/procinfo.lsm
--rw-r--r--   1 root root       824 2008-09-19 19:04 ./source/a/procps/procps-3.2.7-ps-eip64.diff.gz
--rw-r--r--   1 root root    281965 2006-06-25 06:14 ./source/a/procps/procps-3.2.7.tar.gz
--rwxr-xr-x   1 root root      6216 2009-05-23 00:41 ./source/a/procps/procps.SlackBuild
--rw-r--r--   1 root root       854 2004-08-17 01:30 ./source/a/procps/procps.nowarning.diff.gz
--rw-r--r--   1 root root       182 2003-02-02 19:47 ./source/a/procps/procps.w.showfrom.diff.gz
--rw-r--r--   1 root root    257325 2006-09-14 23:06 ./source/a/procps/psmisc-22.3.tar.gz
--rw-r--r--   1 root root       739 2004-05-27 21:01 ./source/a/procps/slack-desc
-drwxr-xr-x   2 root root      4096 2009-06-22 20:00 ./source/a/quota
--rw-r--r--   1 root root    216356 2009-01-05 14:29 ./source/a/quota/quota-3.17.tar.xz
--rwxr-xr-x   1 root root      3539 2009-06-22 19:58 ./source/a/quota/quota.SlackBuild
--rw-r--r--   1 root root       980 2002-03-31 08:30 ./source/a/quota/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/a/reiserfsprogs
--rw-r--r--   1 root root    324847 2009-01-12 22:13 ./source/a/reiserfsprogs/reiserfsprogs-3.6.21.tar.bz2
--rwxr-xr-x   1 root root      3507 2009-05-19 20:05 ./source/a/reiserfsprogs/reiserfsprogs.SlackBuild
--rw-r--r--   1 root root       940 2008-02-11 03:44 ./source/a/reiserfsprogs/slack-desc
-drwxr-xr-x   3 root root      4096 2010-04-30 22:39 ./source/a/rpm2tgz
--rw-r--r--   1 root root      1809 2002-11-27 21:47 ./source/a/rpm2tgz/getrpmtype.tar.gz
-drwxr-xr-x   2 root root      4096 2010-04-30 22:39 ./source/a/rpm2tgz/patches
--rw-r--r--   1 root root       567 2010-04-30 22:32 ./source/a/rpm2tgz/patches/0001-fix-d-handling.patch.gz
--rw-r--r--   1 root root       651 2010-04-30 22:32 ./source/a/rpm2tgz/patches/0002-fix-spurious-path-to-rpm-file-with-n-option.patch.gz
--rw-r--r--   1 root root       521 2010-04-30 22:32 ./source/a/rpm2tgz/patches/0003-allow-every-user-to-use-rpm2tgz.patch.gz
--rw-r--r--   1 root root       707 2010-04-30 22:32 ./source/a/rpm2tgz/patches/0004-produce-more-compliant-slack-desc.patch.gz
--rw-r--r--   1 root root       792 2010-04-30 22:32 ./source/a/rpm2tgz/patches/0005-gzip-man-info-pages.patch.gz
--rw-r--r--   1 root root       755 2010-04-30 22:32 ./source/a/rpm2tgz/patches/0006-should-we-use-.txz-format-in-slackware-current.patch.gz
--rw-r--r--   1 root root      7333 2010-02-18 02:37 ./source/a/rpm2tgz/rpm2targz
--rw-r--r--   1 root root       986 2006-12-23 06:51 ./source/a/rpm2tgz/rpm2targz.README
--rwxr-xr-x   1 root root      3353 2010-04-30 22:47 ./source/a/rpm2tgz/rpm2tgz.SlackBuild
--rw-r--r--   1 root root       854 2010-02-23 21:02 ./source/a/rpm2tgz/rpmoffset.c
--rw-r--r--   1 root root       856 2008-02-11 03:44 ./source/a/rpm2tgz/slack-desc
-drwxr-xr-x   2 root root      4096 2009-10-19 05:44 ./source/a/sdparm
--rw-r--r--   1 root root    226379 2009-10-03 05:04 ./source/a/sdparm/sdparm-1.04.tar.bz2
--rwxr-xr-x   1 root root      3879 2010-02-12 02:13 ./source/a/sdparm/sdparm.SlackBuild
--rw-r--r--   1 root root       924 2007-06-02 18:27 ./source/a/sdparm/slack-desc
-drwxr-xr-x   2 root root      4096 2009-12-06 02:13 ./source/a/sed
--rw-r--r--   1 root root    728284 2009-06-29 06:39 ./source/a/sed/sed-4.2.1.tar.xz
--rwxr-xr-x   1 root root      3342 2009-12-06 02:15 ./source/a/sed/sed.SlackBuild
--rw-r--r--   1 root root       862 2009-05-30 01:41 ./source/a/sed/slack-desc
-drwxr-xr-x   2 root root      4096 2010-02-28 20:14 ./source/a/shadow
--rw-r--r--   1 root root     15616 2010-01-13 15:22 ./source/a/shadow/adduser
--rw-r--r--   1 root root       290 2010-01-28 01:29 ./source/a/shadow/doinst.sh.gz
--rw-r--r--   1 root root      4551 2010-01-28 01:35 ./source/a/shadow/login.defs.gz
--rw-r--r--   1 root root   1295980 2009-07-24 03:08 ./source/a/shadow/shadow-4.1.4.2.tar.xz
--rwxr-xr-x   1 root root      4425 2010-02-28 20:15 ./source/a/shadow/shadow.SlackBuild
--rw-r--r--   1 root root       993 2002-04-30 23:51 ./source/a/shadow/slack-desc
--rw-r--r--   1 root root       142 2010-02-28 20:14 ./source/a/shadow/useradd.gz
-drwxr-xr-x   2 root root      4096 2009-06-22 18:47 ./source/a/sharutils
--rw-r--r--   1 root root    640932 2007-07-01 12:05 ./source/a/sharutils/sharutils-4.7.tar.bz2
--rw-r--r--   1 root root        65 2007-07-01 12:05 ./source/a/sharutils/sharutils-4.7.tar.bz2.sig
--rwxr-xr-x   1 root root      2632 2009-06-22 18:50 ./source/a/sharutils/sharutils.SlackBuild
--rw-r--r--   1 root root      1087 2006-05-19 01:57 ./source/a/sharutils/slack-desc
-drwxr-xr-x   2 root root      4096 2009-06-30 19:16 ./source/a/slocate
--rw-r--r--   1 root root       941 2009-07-18 00:05 ./source/a/slocate/_slocate.tar.gz
--rw-r--r--   1 root root      1011 2002-04-07 09:50 ./source/a/slocate/slack-desc
--rw-r--r--   1 root root     37748 2006-03-08 05:05 ./source/a/slocate/slocate-3.1.tar.gz
--rw-r--r--   1 root root       189 2006-03-08 05:05 ./source/a/slocate/slocate-3.1.tar.gz.sign
--rwxr-xr-x   1 root root      2430 2009-07-18 00:43 ./source/a/slocate/slocate.SlackBuild
-drwxr-xr-x   2 root root      4096 2010-04-25 23:29 ./source/a/smartmontools
--rw-r--r--   1 root root       270 2004-04-12 02:03 ./source/a/smartmontools/doinst.sh.gz
--rw-r--r--   1 root root      1174 2002-10-21 22:55 ./source/a/smartmontools/slack-desc
--rw-r--r--   1 root root    481648 2010-01-28 20:49 ./source/a/smartmontools/smartmontools-5.39.1.tar.xz
--rwxr-xr-x   1 root root      3011 2010-04-25 23:34 ./source/a/smartmontools/smartmontools.SlackBuild
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/a/splitvt
--rw-r--r--   1 root root       743 2006-12-13 23:26 ./source/a/splitvt/slack-desc
--rw-r--r--   1 root root     64301 2001-01-18 07:58 ./source/a/splitvt/splitvt-1.6.5.tar.gz
--rwxr-xr-x   1 root root      2281 2009-05-19 20:05 ./source/a/splitvt/splitvt.SlackBuild
--rw-r--r--   1 root root     10403 2005-07-19 22:17 ./source/a/splitvt/splitvt_1.6.5-9.diff.gz
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/a/sysfsutils
--rw-r--r--   1 root root      1005 2006-08-03 23:45 ./source/a/sysfsutils/slack-desc
--rw-r--r--   1 root root    288189 2006-12-12 01:33 ./source/a/sysfsutils/sysfsutils-2.1.0.tar.bz2
--rwxr-xr-x   1 root root      3195 2009-05-19 20:05 ./source/a/sysfsutils/sysfsutils.SlackBuild
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/a/sysklogd
--rw-r--r--   1 root root      2289 2007-04-09 23:11 ./source/a/sysklogd/_sysklogd.tar.gz
--rw-r--r--   1 root root       916 2002-03-23 22:05 ./source/a/sysklogd/slack-desc
--rw-r--r--   1 root root       862 2007-04-09 23:25 ./source/a/sysklogd/sysklogd-1.4.1-owl-syslogd-crunch_list.diff.gz
--rw-r--r--   1 root root      1197 2001-03-11 21:33 ./source/a/sysklogd/sysklogd-1.4.1.lsm
--rw-r--r--   1 root root     81784 2001-03-11 21:33 ./source/a/sysklogd/sysklogd-1.4.1.tar.gz
--rwxr-xr-x   1 root root      2850 2009-05-19 20:05 ./source/a/sysklogd/sysklogd.SlackBuild
--rw-r--r--   1 root root     26587 2006-09-28 21:52 ./source/a/sysklogd/sysklogd_1.4.1-20.diff.gz
-drwxr-xr-x   2 root root      4096 2010-01-25 20:32 ./source/a/syslinux
--rw-r--r--   1 root root       977 2002-03-22 08:06 ./source/a/syslinux/slack-desc
--rw-r--r--   1 root root   3383248 2009-12-18 23:36 ./source/a/syslinux/syslinux-3.84.tar.bz2
--rw-r--r--   1 root root       248 2009-12-18 23:36 ./source/a/syslinux/syslinux-3.84.tar.bz2.sign
--rwxr-xr-x   1 root root      3103 2010-01-25 20:34 ./source/a/syslinux/syslinux.SlackBuild
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/a/sysvinit
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/a/sysvinit-functions
--rw-r--r--   1 root root       832 2007-04-29 18:51 ./source/a/sysvinit-functions/README.functions
--rw-r--r--   1 root root       226 2007-05-15 02:38 ./source/a/sysvinit-functions/doinst.sh.gz
--rw-r--r--   1 root root     10001 2007-04-29 18:21 ./source/a/sysvinit-functions/function-src-8.53.tar.bz2
--rw-r--r--   1 root root     13913 2006-10-26 20:57 ./source/a/sysvinit-functions/functions
--rw-r--r--   1 root root      1164 2007-05-15 02:46 ./source/a/sysvinit-functions/slack-desc
--rwxr-xr-x   1 root root      3054 2009-05-19 20:05 ./source/a/sysvinit-functions/sysvinit-functions.SlackBuild
-drwxr-xr-x   3 root root      4096 2009-05-19 20:05 ./source/a/sysvinit-scripts
--rw-r--r--   1 root root       339 2008-03-19 08:28 ./source/a/sysvinit-scripts/doinst.sh.gz
-drwxr-xr-x   2 root root      4096 2008-03-31 03:07 ./source/a/sysvinit-scripts/scripts
--rw-r--r--   1 root root        60 2006-08-01 03:00 ./source/a/sysvinit-scripts/scripts/fetch-rescan-scsi-bus.sh
--rw-r--r--   1 root root      2467 2006-07-26 23:41 ./source/a/sysvinit-scripts/scripts/inittab
--rw-r--r--   1 root root      1282 2007-03-27 01:12 ./source/a/sysvinit-scripts/scripts/rc.4
--rw-r--r--   1 root root      7425 2010-03-20 00:14 ./source/a/sysvinit-scripts/scripts/rc.6
--rw-r--r--   1 root root      2425 2008-12-02 20:31 ./source/a/sysvinit-scripts/scripts/rc.K
--rw-r--r--   1 root root     10904 2010-02-07 03:01 ./source/a/sysvinit-scripts/scripts/rc.M
--rw-r--r--   1 root root     14238 2010-03-20 00:14 ./source/a/sysvinit-scripts/scripts/rc.S
--rw-r--r--   1 root root       272 2006-08-12 02:07 ./source/a/sysvinit-scripts/scripts/rc.local
--rw-r--r--   1 root root      1740 1999-09-11 20:48 ./source/a/sysvinit-scripts/scripts/rc.sysvinit
--rw-r--r--   1 root root     15654 2008-10-29 10:07 ./source/a/sysvinit-scripts/scripts/rescan-scsi-bus.sh
--rw-r--r--   1 root root       846 2007-05-15 02:47 ./source/a/sysvinit-scripts/slack-desc
--rwxr-xr-x   1 root root      2177 2010-03-20 00:13 ./source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
--rw-r--r--   1 root root       681 2007-04-16 19:42 ./source/a/sysvinit/doinst.sh.gz
--rw-r--r--   1 root root       972 2002-03-22 05:59 ./source/a/sysvinit/slack-desc
--rw-r--r--   1 root root       489 2008-09-22 09:55 ./source/a/sysvinit/sysvinit-2.86-timeval.patch.gz
--rw-r--r--   1 root root     99009 2006-12-08 20:10 ./source/a/sysvinit/sysvinit-2.86.tar.gz
--rwxr-xr-x   1 root root      3836 2009-05-19 20:05 ./source/a/sysvinit/sysvinit.SlackBuild
--rw-r--r--   1 root root      1729 2008-04-03 02:33 ./source/a/sysvinit/sysvinit.diff.gz
--rw-r--r--   1 root root      1107 2005-12-19 21:12 ./source/a/sysvinit/sysvinit.pidof.rhforkseverything.diff.gz
-drwxr-xr-x   2 root root      4096 2010-03-16 05:11 ./source/a/tar
--rw-r--r--   1 root root      2429 1995-01-07 08:18 ./source/a/tar/rmt.8.gz
--rw-r--r--   1 root root       834 2002-03-23 22:06 ./source/a/tar/slack-desc
--rw-r--r--   1 root root       949 2006-11-30 21:52 ./source/a/tar/tar-1.13.bzip2.diff.gz
--rw-r--r--   1 root root   1052531 1999-07-08 05:50 ./source/a/tar/tar-1.13.tar.gz
--rw-r--r--   1 root root       230 2010-03-16 05:10 ./source/a/tar/tar-1.23-support_txz.diff.gz
--rw-r--r--   1 root root   1647108 2010-03-10 12:14 ./source/a/tar/tar-1.23.tar.xz
--rw-r--r--   1 root root      2676 2002-02-22 03:24 ./source/a/tar/tar.1.gz
--rwxr-xr-x   1 root root      4820 2010-03-16 14:49 ./source/a/tar/tar.SlackBuild
--rw-r--r--   1 root root       563 2010-03-16 04:46 ./source/a/tar/tar.nolonezero.diff.gz
--rw-r--r--   1 root root       377 2010-03-16 04:47 ./source/a/tar/tar.norecordsizespam.diff.gz
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/a/tcsh
--rw-r--r--   1 root root       146 1995-08-06 23:12 ./source/a/tcsh/doinst.sh.gz
--rw-r--r--   1 root root       886 2002-03-23 22:06 ./source/a/tcsh/slack-desc
--rw-r--r--   1 root root    727440 2007-03-03 20:08 ./source/a/tcsh/tcsh-6.15.00.tar.bz2
--rwxr-xr-x   1 root root      3004 2009-05-19 20:05 ./source/a/tcsh/tcsh.SlackBuild
--rw-r--r--   1 root root       202 2006-02-09 20:33 ./source/a/tcsh/tcsh.nobuiltincolorls.diff.gz
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/a/time
--rw-r--r--   1 root root       887 2008-02-11 03:44 ./source/a/time/slack-desc
--rw-r--r--   1 root root    103066 1996-07-11 15:08 ./source/a/time/time-1.7.tar.gz
--rwxr-xr-x   1 root root      2263 2009-05-19 20:05 ./source/a/time/time.SlackBuild
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/a/tree
--rw-r--r--   1 root root       873 2006-12-23 06:19 ./source/a/tree/slack-desc
--rw-r--r--   1 root root     31732 2009-01-22 15:17 ./source/a/tree/tree-1.5.2.2.tar.bz2
--rwxr-xr-x   1 root root      2260 2009-05-19 20:05 ./source/a/tree/tree.SlackBuild
-drwxr-xr-x   3 root root      4096 2010-04-21 14:18 ./source/a/udev
-drwxr-xr-x   6 root root      4096 2009-08-14 14:06 ./source/a/udev/config
-drwxr-xr-x   2 root root      4096 2009-08-14 14:06 ./source/a/udev/config/modprobe.d
--rw-r--r--   1 root root      6251 2009-08-14 14:06 ./source/a/udev/config/modprobe.d/blacklist.conf.new
--rw-r--r--   1 root root       443 2009-05-30 01:25 ./source/a/udev/config/modprobe.d/isapnp.conf.new
--rw-r--r--   1 root root       265 2009-08-14 14:04 ./source/a/udev/config/modprobe.d/psmouse.conf.new
--rw-r--r--   1 root root       244 2009-05-30 01:25 ./source/a/udev/config/modprobe.d/usb-controller.conf.new
-drwxr-xr-x   2 root root      4096 2010-01-14 04:32 ./source/a/udev/config/rc.d
--rw-r--r--   1 root root      5380 2010-04-20 15:18 ./source/a/udev/config/rc.d/rc.udev.new
-drwxr-xr-x   2 root root      4096 2009-12-02 14:17 ./source/a/udev/config/rules.d
--rw-r--r--   1 root root       444 2009-11-25 07:13 ./source/a/udev/config/rules.d/40-slackware.rules
--rw-r--r--   1 root root      1847 2010-04-20 15:28 ./source/a/udev/config/rules.d/59-non-libata-devices.rules
--rw-r--r--   1 root root      1380 2010-04-20 15:25 ./source/a/udev/config/rules.d/65-permissions.rules
--rw-r--r--   1 root root       305 2009-05-30 01:25 ./source/a/udev/config/rules.d/90-network.rules
-drwxr-xr-x   2 root root      4096 2009-05-30 01:25 ./source/a/udev/config/scripts
--rwxr-xr-x   1 root root      1978 2009-05-30 01:25 ./source/a/udev/config/scripts/nethelper.sh
--rw-r--r--   1 root root       485 2009-05-30 01:25 ./source/a/udev/config/udev.conf
--rw-r--r--   1 root root       555 2009-05-30 01:25 ./source/a/udev/doinst.sh.gz
--rw-r--r--   1 root root       782 2009-05-30 01:25 ./source/a/udev/rule_generator.diff.gz
--rw-r--r--   1 root root       825 2009-05-30 01:25 ./source/a/udev/slack-desc
--rw-r--r--   1 root root       248 2010-04-21 06:51 ./source/a/udev/udev-153.tar.sign
--rw-r--r--   1 root root    448576 2010-04-21 06:51 ./source/a/udev/udev-153.tar.xz
--rw-r--r--   1 root root       438 2009-11-25 23:25 ./source/a/udev/udev-fixed-devices.tar.gz
--rwxr-xr-x   1 root root      4668 2010-04-26 02:49 ./source/a/udev/udev.SlackBuild
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/a/unarj
--rw-r--r--   1 root root       269 2006-12-23 05:36 ./source/a/unarj/Makefile.gz
--rw-r--r--   1 root root       848 2006-12-23 05:29 ./source/a/unarj/slack-desc
--rwxr-xr-x   1 root root      1993 2009-05-19 20:05 ./source/a/unarj/unarj.SlackBuild
--rw-r--r--   1 root root     23151 2002-06-05 05:00 ./source/a/unarj/unarj265.tar.gz
-drwxr-xr-x   2 root root      4096 2010-04-30 04:04 ./source/a/usb_modeswitch
--rw-r--r--   1 root root       272 2010-04-30 04:03 ./source/a/usb_modeswitch/doinst.sh.gz
--rw-r--r--   1 root root      1185 2010-04-30 03:24 ./source/a/usb_modeswitch/slack-desc
--rw-r--r--   1 root root     35001 2010-04-18 14:01 ./source/a/usb_modeswitch/usb-modeswitch-1.1.2.tar.bz2
--rw-r--r--   1 root root     13967 2010-04-18 13:11 ./source/a/usb_modeswitch/usb-modeswitch-data-20100418.tar.bz2
--rwxr-xr-x   1 root root      4145 2010-04-30 04:01 ./source/a/usb_modeswitch/usb_modeswitch.SlackBuild
-drwxr-xr-x   2 root root      4096 2010-03-21 01:59 ./source/a/usbutils
--rw-r--r--   1 root root       781 2009-05-30 01:47 ./source/a/usbutils/slack-desc
--rw-r--r--   1 root root    224509 2010-03-18 00:54 ./source/a/usbutils/usbutils-0.87.tar.bz2
--rwxr-xr-x   1 root root      4558 2010-03-21 01:59 ./source/a/usbutils/usbutils.SlackBuild
--rw-r--r--   1 root root       220 2009-05-30 01:47 ./source/a/usbutils/usbutils.ids.dest.gz
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/a/utempter
--rw-r--r--   1 root root       230 2006-12-12 23:47 ./source/a/utempter/doinst.sh.gz
--rw-r--r--   1 root root     14583 2005-12-11 13:16 ./source/a/utempter/libutempter-1.1.4.tar.bz2
--rw-r--r--   1 root root       189 2005-12-12 12:56 ./source/a/utempter/libutempter-1.1.4.tar.bz2.asc
--rw-r--r--   1 root root       809 2003-06-08 01:36 ./source/a/utempter/slack-desc
--rwxr-xr-x   1 root root      2843 2009-05-19 20:05 ./source/a/utempter/utempter.SlackBuild
-drwxr-xr-x   2 root root      4096 2010-03-30 04:06 ./source/a/util-linux-ng
--rw-r--r--   1 root root     43150 2009-05-30 01:25 ./source/a/util-linux-ng/adjtimex_1.23-1.diff.gz
--rw-r--r--   1 root root     56580 2009-05-30 01:25 ./source/a/util-linux-ng/adjtimex_1.23.orig.tar.gz
--rw-r--r--   1 root root      4513 2009-05-30 01:25 ./source/a/util-linux-ng/bsdstrings.tar.gz
--rw-r--r--   1 root root       337 2009-05-30 01:25 ./source/a/util-linux-ng/doinst.sh.gz
--rw-r--r--   1 root root    179192 2009-05-30 01:25 ./source/a/util-linux-ng/net-tools-1.60.tar.xz
--rw-r--r--   1 root root       650 2009-05-30 01:25 ./source/a/util-linux-ng/net-tools.diff.gz
--rw-r--r--   1 root root    173444 2009-05-30 01:25 ./source/a/util-linux-ng/net-tools_1.60-19.diff.gz
--rw-r--r--   1 root root      1266 2009-05-30 01:25 ./source/a/util-linux-ng/scsi_ioctl.h
--rw-r--r--   1 root root     52437 2009-05-30 01:25 ./source/a/util-linux-ng/setserial-2.17.tar.gz
--rw-r--r--   1 root root       729 2009-05-30 01:25 ./source/a/util-linux-ng/setserial-rc.serial.diff.gz
--rw-r--r--   1 root root       376 2010-03-30 04:06 ./source/a/util-linux-ng/setserial-undef_TIOCGHAYESESP.diff.gz
--rw-r--r--   1 root root       904 2009-05-30 01:25 ./source/a/util-linux-ng/slack-desc
--rw-r--r--   1 root root   2344032 2010-03-22 09:32 ./source/a/util-linux-ng/util-linux-ng-2.17.2.tar.xz
--rwxr-xr-x   1 root root      9368 2010-03-30 04:07 ./source/a/util-linux-ng/util-linux-ng.SlackBuild
--rw-r--r--   1 root root       266 2009-05-30 01:25 ./source/a/util-linux-ng/util-linux-ng.fdisk-no-solaris.diff.gz
--rw-r--r--   1 root root     10292 2009-05-30 01:25 ./source/a/util-linux-ng/ziptool-1.4.0.tar.xz
--rw-r--r--   1 root root       386 2009-05-30 01:25 ./source/a/util-linux-ng/ziptool-fix_build.patch.gz
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/a/which
--rw-r--r--   1 root root      1038 2006-12-14 02:00 ./source/a/which/slack-desc
--rw-r--r--   1 root root    135372 2008-08-06 15:21 ./source/a/which/which-2.20.tar.gz
--rw-r--r--   1 root root       152 2008-08-06 15:21 ./source/a/which/which-2.20.tar.gz.sig
--rwxr-xr-x   1 root root      2806 2009-05-19 20:05 ./source/a/which/which.SlackBuild
-drwxr-xr-x   2 root root      4096 2010-02-09 21:07 ./source/a/xfsprogs
--rw-r--r--   1 root root       954 2006-02-21 05:35 ./source/a/xfsprogs/slack-desc
--rw-r--r--   1 root root    919784 2010-01-29 21:24 ./source/a/xfsprogs/xfsprogs-3.1.1.tar.xz
--rwxr-xr-x   1 root root      4499 2010-02-09 21:23 ./source/a/xfsprogs/xfsprogs.SlackBuild
-drwxr-xr-x   2 root root      4096 2009-10-15 21:31 ./source/a/xz
--rw-r--r--   1 root root       952 2009-04-08 00:19 ./source/a/xz/slack-desc
--rw-r--r--   1 root root    849062 2009-10-15 21:30 ./source/a/xz/xz-4.999.9beta.tar.bz2
--rwxr-xr-x   1 root root      4428 2009-11-24 00:24 ./source/a/xz/xz.SlackBuild
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/a/zoo
--rw-r--r--   1 root root       996 2006-12-14 01:08 ./source/a/zoo/slack-desc
--rw-r--r--   1 root root    173607 1994-12-30 20:19 ./source/a/zoo/zoo-2.10.tar.gz
--rwxr-xr-x   1 root root      2565 2009-05-19 20:05 ./source/a/zoo/zoo.SlackBuild
--rw-r--r--   1 root root     12333 2006-05-29 21:19 ./source/a/zoo/zoo_2.10-18.diff.gz
-drwxr-xr-x  70 root root      4096 2010-05-10 02:36 ./source/ap
-drwxr-xr-x   2 root root      4096 2009-05-23 00:41 ./source/ap/a2ps
--rw-r--r--   1 root root   1814364 2007-12-29 03:53 ./source/ap/a2ps/a2ps-4.14.tar.bz2
--rwxr-xr-x   1 root root      4858 2009-05-23 00:41 ./source/ap/a2ps/a2ps.SlackBuild
--rw-r--r--   1 root root       298 2009-03-31 01:11 ./source/ap/a2ps/a2ps.a2ps_cfg.in.diff.gz
--rw-r--r--   1 root root       249 2001-01-19 05:15 ./source/ap/a2ps/a2ps.diff.gz
--rw-r--r--   1 root root     62039 1997-08-28 13:11 ./source/ap/a2ps/psutils-1.17.tar.gz
--rw-r--r--   1 root root       574 2009-03-04 01:22 ./source/ap/a2ps/psutils.destdir.diff.gz
--rw-r--r--   1 root root       471 2001-01-19 04:54 ./source/ap/a2ps/psutils.diff.gz
--rw-r--r--   1 root root       900 2002-03-29 03:05 ./source/ap/a2ps/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/ap/acct
--rw-r--r--   1 root root     23954 2008-03-08 08:47 ./source/ap/acct/acct-6.4pre1-6.diff.gz
--rw-r--r--   1 root root    261410 2006-11-04 12:47 ./source/ap/acct/acct-6.4pre1.tar.bz2
--rwxr-xr-x   1 root root      4051 2009-05-19 20:05 ./source/ap/acct/acct.SlackBuild
--rw-r--r--   1 root root       309 2008-11-12 18:52 ./source/ap/acct/acct.logdir.fhs.diff.gz
--rw-r--r--   1 root root      1054 2008-11-12 20:20 ./source/ap/acct/slack-desc
-drwxr-xr-x   2 root root      4096 2010-04-20 02:43 ./source/ap/alsa-utils
--rw-r--r--   1 root root   1076937 2010-04-16 11:22 ./source/ap/alsa-utils/alsa-utils-1.0.23.tar.bz2
--rwxr-xr-x   1 root root      4020 2010-02-07 19:09 ./source/ap/alsa-utils/alsa-utils.SlackBuild
--rw-r--r--   1 root root      1027 2009-11-12 05:45 ./source/ap/alsa-utils/alsa-utils.alsaconf.diff.gz
--rw-r--r--   1 root root      1090 2008-12-03 01:49 ./source/ap/alsa-utils/rc.alsa.gz
--rw-r--r--   1 root root      1086 2003-08-29 06:09 ./source/ap/alsa-utils/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/ap/amp
--rw-r--r--   1 root root       236 2002-02-24 19:46 ./source/ap/amp/_amp.tar.gz
--rw-r--r--   1 root root    100337 1999-03-17 18:11 ./source/ap/amp/amp-0.7.6.tar.gz
--rw-r--r--   1 root root       239 2008-10-01 07:38 ./source/ap/amp/amp-gcc34.diff.gz
--rwxr-xr-x   1 root root      2004 2009-05-19 20:05 ./source/ap/amp/amp.SlackBuild
--rw-r--r--   1 root root      1514 1999-03-17 18:33 ./source/ap/amp/license_excerpts
--rw-r--r--   1 root root       729 2002-03-29 01:09 ./source/ap/amp/slack-desc
-drwxr-xr-x   3 root root      4096 2010-04-25 21:36 ./source/ap/ash
--rw-r--r--   1 root root    121233 2001-01-12 16:50 ./source/ap/ash/ash-0.4.0.tar.gz
--rwxr-xr-x   1 root root      3066 2010-04-25 21:36 ./source/ap/ash/ash.SlackBuild
-drwxr-xr-x   2 root root      4096 2010-04-25 21:34 ./source/ap/ash/patches
--rw-r--r--   1 root root      6275 2002-06-02 18:57 ./source/ap/ash/patches/ash-builtin.patch.gz
--rw-r--r--   1 root root      6506 2002-06-02 18:57 ./source/ap/ash/patches/ash-debian.patch.gz
--rw-r--r--   1 root root       832 2002-06-02 18:57 ./source/ap/ash/patches/ash-echo.patch.gz
--rw-r--r--   1 root root       707 2002-06-02 18:57 ./source/ap/ash/patches/ash-freebsd.patch.gz
--rw-r--r--   1 root root       312 2002-06-02 18:57 ./source/ap/ash/patches/ash-getcwd.patch.gz
--rw-r--r--   1 root root      1585 2002-06-02 18:57 ./source/ap/ash/patches/ash-getopt.patch.gz
--rw-r--r--   1 root root      2937 2002-06-02 18:57 ./source/ap/ash/patches/ash-glob.patch.gz
--rw-r--r--   1 root root      4556 2010-04-25 21:34 ./source/ap/ash/patches/ash-hetio.patch.gz
--rw-r--r--   1 root root      1004 2002-06-02 18:57 ./source/ap/ash/patches/ash-jobs.patch.gz
--rw-r--r--   1 root root      5625 2002-06-02 18:57 ./source/ap/ash/patches/ash-kill.patch.gz
--rw-r--r--   1 root root      1338 2002-06-02 18:57 ./source/ap/ash/patches/ash-makefile.patch.gz
--rw-r--r--   1 root root       718 2002-06-02 18:57 ./source/ap/ash/patches/ash-manpage.patch.gz
--rw-r--r--   1 root root      2357 2002-06-02 18:57 ./source/ap/ash/patches/ash-memout.patch.gz
--rw-r--r--   1 root root      1499 2002-06-02 18:57 ./source/ap/ash/patches/ash-misc.patch.gz
--rw-r--r--   1 root root       388 2002-06-02 18:57 ./source/ap/ash/patches/ash-ppid.patch.gz
--rw-r--r--   1 root root      3928 2002-06-02 18:57 ./source/ap/ash/patches/ash-redir.patch.gz
--rw-r--r--   1 root root      4570 2002-06-02 18:57 ./source/ap/ash/patches/ash-setmode.patch.gz
--rw-r--r--   1 root root       261 2002-06-02 18:57 ./source/ap/ash/patches/ash-sighup.patch.gz
--rw-r--r--   1 root root      2215 2002-06-02 18:57 ./source/ap/ash/patches/ash-syntax.patch.gz
--rw-r--r--   1 root root      3668 2002-06-02 18:57 ./source/ap/ash/patches/ash-test.patch.gz
--rw-r--r--   1 root root       585 2002-06-02 18:57 ./source/ap/ash/patches/ash-times.patch.gz
--rw-r--r--   1 root root       979 2002-06-02 19:04 ./source/ap/ash/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/ap/at
--rw-r--r--   1 root root     86817 2006-01-03 07:32 ./source/ap/at/at-3.1.10.tar.bz2
--rwxr-xr-x   1 root root      3083 2009-05-19 20:05 ./source/ap/at/at.SlackBuild
--rw-r--r--   1 root root       414 2006-08-03 00:45 ./source/ap/at/doinst.sh.gz
--rw-r--r--   1 root root       737 2003-11-23 18:46 ./source/ap/at/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-23 00:41 ./source/ap/aumix
--rw-r--r--   1 root root    157503 2002-11-25 01:36 ./source/ap/aumix/aumix-2.8.tar.bz2
--rwxr-xr-x   1 root root      2149 2009-05-23 00:41 ./source/ap/aumix/aumix.SlackBuild
--rw-r--r--   1 root root       609 2003-08-29 06:17 ./source/ap/aumix/aumix.alsa.diff.gz
--rw-r--r--   1 root root       764 2002-06-05 04:41 ./source/ap/aumix/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-23 00:41 ./source/ap/bc
--rw-r--r--   1 root root    290069 2006-09-05 02:43 ./source/ap/bc/bc-1.06.95.tar.bz2
--rw-r--r--   1 root root       184 2006-09-05 02:43 ./source/ap/bc/bc-1.06.95.tar.bz2.sig
--rwxr-xr-x   1 root root      3270 2009-05-23 00:41 ./source/ap/bc/bc.SlackBuild
--rw-r--r--   1 root root       839 2002-05-13 17:58 ./source/ap/bc/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-23 00:41 ./source/ap/bpe
--rw-r--r--   1 root root    115498 2001-01-02 06:38 ./source/ap/bpe/bpe-2.01.00.tar.gz
--rwxr-xr-x   1 root root      2200 2009-05-23 00:41 ./source/ap/bpe/bpe.SlackBuild
--rw-r--r--   1 root root       789 2004-06-06 22:28 ./source/ap/bpe/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/ap/cdparanoia
--rw-r--r--   1 root root    183236 2008-09-11 21:36 ./source/ap/cdparanoia/cdparanoia-III-10.2.src.tar.gz
--rw-r--r--   1 root root      3327 2008-10-19 15:49 ./source/ap/cdparanoia/cdparanoia-III-10.2_cdda_private.patch.gz
--rwxr-xr-x   1 root root      3882 2009-05-19 20:05 ./source/ap/cdparanoia/cdparanoia.SlackBuild
--rw-r--r--   1 root root      1056 2007-11-17 04:37 ./source/ap/cdparanoia/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/ap/cdrdao
--rw-r--r--   1 root root   1384615 2005-11-24 07:55 ./source/ap/cdrdao/cdrdao-1.2.1.tar.bz2
--rwxr-xr-x   1 root root      2536 2009-05-19 20:05 ./source/ap/cdrdao/cdrdao.SlackBuild
--rw-r--r--   1 root root       753 2002-03-23 22:15 ./source/ap/cdrdao/slack-desc
-drwxr-xr-x   2 root root      4096 2010-04-28 19:28 ./source/ap/cdrtools
--rw-r--r--   1 root root   1928976 2010-04-27 10:05 ./source/ap/cdrtools/cdrtools-2.01.01a78.tar.bz2
--rwxr-xr-x   1 root root      5488 2010-02-06 01:53 ./source/ap/cdrtools/cdrtools.SlackBuild
--rw-r--r--   1 root root       269 2009-12-29 03:13 ./source/ap/cdrtools/doinst.sh.gz
--rw-r--r--   1 root root       868 2008-02-11 03:44 ./source/ap/cdrtools/slack-desc
--rw-r--r--   1 root root     52968 2007-05-17 05:50 ./source/ap/cdrtools/zisofs-tools-1.0.8.tar.bz2
--rw-r--r--   1 root root       248 2007-05-17 05:50 ./source/ap/cdrtools/zisofs-tools-1.0.8.tar.bz2.sign
-drwxr-xr-x   2 root root      4096 2009-07-22 21:58 ./source/ap/dc3dd
--rw-r--r--   1 root root   2138588 2009-03-19 19:59 ./source/ap/dc3dd/dc3dd-6.12.3.tar.xz
--rwxr-xr-x   1 root root      2910 2009-07-22 22:07 ./source/ap/dc3dd/dc3dd.SlackBuild
--rw-r--r--   1 root root       913 2009-02-14 22:30 ./source/ap/dc3dd/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/ap/diffstat
--rw-r--r--   1 root root     88470 2006-07-17 00:14 ./source/ap/diffstat/diffstat-1.43.tar.bz2
--rwxr-xr-x   1 root root      3016 2009-05-19 20:05 ./source/ap/diffstat/diffstat.SlackBuild
--rw-r--r--   1 root root       868 2006-09-20 05:07 ./source/ap/diffstat/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-10 01:14 ./source/ap/diffutils
--rw-r--r--   1 root root   1023932 2010-05-03 16:59 ./source/ap/diffutils/diffutils-3.0.tar.xz
--rw-r--r--   1 root root       373 2010-02-14 08:28 ./source/ap/diffutils/diffutils-sdiff-no-waitpid.patch.gz
--rwxr-xr-x   1 root root      3803 2010-05-10 01:14 ./source/ap/diffutils/diffutils.SlackBuild
--rw-r--r--   1 root root       321 2006-08-21 02:46 ./source/ap/diffutils/doinst.sh.gz
--rw-r--r--   1 root root       743 2002-03-23 22:17 ./source/ap/diffutils/slack-desc
-drwxr-xr-x   2 root root      4096 2009-06-13 04:41 ./source/ap/dmapi
--rw-r--r--   1 root root    196416 2009-05-05 17:24 ./source/ap/dmapi/dmapi-2.2.10.tar.xz
--rwxr-xr-x   1 root root      3523 2009-06-13 04:42 ./source/ap/dmapi/dmapi.SlackBuild
--rw-r--r--   1 root root       526 2008-04-01 05:05 ./source/ap/dmapi/dmapi.destdir.diff.gz
--rw-r--r--   1 root root       804 2006-02-21 05:56 ./source/ap/dmapi/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/ap/dmidecode
--rw-r--r--   1 root root     51904 2008-11-23 20:56 ./source/ap/dmidecode/dmidecode-2.10.tar.bz2
--rw-r--r--   1 root root        65 2008-11-23 20:56 ./source/ap/dmidecode/dmidecode-2.10.tar.bz2.sig
--rwxr-xr-x   1 root root      2905 2009-05-19 20:05 ./source/ap/dmidecode/dmidecode.SlackBuild
--rw-r--r--   1 root root       215 2007-05-02 19:54 ./source/ap/dmidecode/dmidecode.makefile.diff.gz
--rw-r--r--   1 root root       933 2007-05-02 20:04 ./source/ap/dmidecode/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/ap/dvd+rw-tools
--rw-r--r--   1 root root    140846 2008-03-05 08:44 ./source/ap/dvd+rw-tools/dvd+rw-tools-7.1.tar.gz
--rwxr-xr-x   1 root root      2462 2009-05-19 20:05 ./source/ap/dvd+rw-tools/dvd+rw-tools.SlackBuild
--rw-r--r--   1 root root       185 2008-04-07 04:06 ./source/ap/dvd+rw-tools/dvd+rw-tools.limits.h.diff.gz
--rw-r--r--   1 root root        49 2003-09-02 03:20 ./source/ap/dvd+rw-tools/dvd+rw-tools.url
--rw-r--r--   1 root root       823 2008-02-11 03:44 ./source/ap/dvd+rw-tools/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/ap/enscript
--rw-r--r--   1 root root    814308 2002-01-24 07:39 ./source/ap/enscript/enscript-1.6.3.tar.gz
--rwxr-xr-x   1 root root      2878 2009-05-19 20:05 ./source/ap/enscript/enscript.SlackBuild
--rw-r--r--   1 root root       920 2002-03-23 22:26 ./source/ap/enscript/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/ap/flac
--rw-r--r--   1 root root   1459486 2007-09-18 20:12 ./source/ap/flac/flac-1.2.1.tar.bz2
--rwxr-xr-x   1 root root      3497 2009-05-19 20:05 ./source/ap/flac/flac.SlackBuild
--rw-r--r--   1 root root       371 2008-03-08 21:48 ./source/ap/flac/flac.man.diff.gz
--rw-r--r--   1 root root      1058 2002-08-26 19:03 ./source/ap/flac/slack-desc
-drwxr-xr-x   2 root root      4096 2010-02-16 08:53 ./source/ap/foomatic-filters
--rw-r--r--   1 root root       275 2007-09-26 20:11 ./source/ap/foomatic-filters/doinst.sh.gz
--rw-r--r--   1 root root    241279 2010-02-15 12:57 ./source/ap/foomatic-filters/foomatic-filters-4.0.4.tar.gz
--rwxr-xr-x   1 root root      4353 2010-02-16 08:54 ./source/ap/foomatic-filters/foomatic-filters.SlackBuild
--rw-r--r--   1 root root      1104 2008-02-11 03:44 ./source/ap/foomatic-filters/slack-desc
-drwxr-xr-x   2 root root      4096 2010-04-25 21:08 ./source/ap/ghostscript
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/ap/ghostscript-fonts-std
--rw-r--r--   1 root root       165 2007-02-19 00:49 ./source/ap/ghostscript-fonts-std/doinst.sh.gz
--rw-r--r--   1 root root   3621829 2003-07-24 12:38 ./source/ap/ghostscript-fonts-std/ghostscript-fonts-std-8.11.tar.bz2
--rwxr-xr-x   1 root root      2267 2009-05-19 20:05 ./source/ap/ghostscript-fonts-std/ghostscript-fonts-std.SlackBuild
--rw-r--r--   1 root root       840 2007-02-19 00:47 ./source/ap/ghostscript-fonts-std/slack-desc
--rw-r--r--   1 root root      1436 2008-04-11 20:41 ./source/ap/ghostscript/cidfmap.gz
--rw-r--r--   1 root root  15698644 2010-02-10 23:24 ./source/ap/ghostscript/ghostscript-8.71.tar.xz
--rw-r--r--   1 root root       360 2010-02-20 16:10 ./source/ap/ghostscript/ghostscript-pdf2dsc.patch.gz
--rwxr-xr-x   1 root root      5439 2010-04-25 21:08 ./source/ap/ghostscript/ghostscript.SlackBuild
--rw-r--r--   1 root root      1011 2008-03-02 02:54 ./source/ap/ghostscript/slack-desc
-drwxr-xr-x   2 root root      4096 2010-04-16 20:42 ./source/ap/gphoto2
--rw-r--r--   1 root root    467484 2010-04-11 14:07 ./source/ap/gphoto2/gphoto2-2.4.9.tar.xz
--rwxr-xr-x   1 root root      3613 2010-02-14 22:59 ./source/ap/gphoto2/gphoto2.SlackBuild
--rw-r--r--   1 root root       762 2008-09-11 03:57 ./source/ap/gphoto2/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/ap/groff
--rw-r--r--   1 root root   2842508 2009-01-09 14:34 ./source/ap/groff/groff-1.20.1.tar.bz2
--rwxr-xr-x   1 root root      4105 2009-05-19 20:05 ./source/ap/groff/groff.SlackBuild
--rw-r--r--   1 root root       270 2009-01-14 04:15 ./source/ap/groff/groff.docdir.diff.gz
--rw-r--r--   1 root root       459 2005-06-23 01:46 ./source/ap/groff/groff.man.mdoc.local.gz
--rw-r--r--   1 root root       887 2002-03-23 22:27 ./source/ap/groff/slack-desc
-drwxr-xr-x   2 root root      4096 2009-08-22 02:33 ./source/ap/gutenprint
--rw-r--r--   1 root root   4017848 2009-07-30 01:49 ./source/ap/gutenprint/gutenprint-5.2.4.tar.xz
--rwxr-xr-x   1 root root      4103 2010-02-17 21:01 ./source/ap/gutenprint/gutenprint.SlackBuild
--rw-r--r--   1 root root      1010 2006-08-12 05:40 ./source/ap/gutenprint/slack-desc
-drwxr-xr-x   2 root root      4096 2010-04-29 18:50 ./source/ap/hplip
--rw-r--r--   1 root root       118 2009-03-05 16:38 ./source/ap/hplip/doinst.sh.gz
--rw-r--r--   1 root root  14626064 2010-02-26 03:16 ./source/ap/hplip/hplip-3.10.2.tar.xz
--rwxr-xr-x   1 root root      3866 2010-04-29 18:26 ./source/ap/hplip/hplip.SlackBuild
--rw-r--r--   1 root root       935 2009-03-05 17:13 ./source/ap/hplip/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/ap/ispell
--rw-r--r--   1 root root    580742 2001-08-01 22:17 ./source/ap/ispell/ispell-3.2.06.tar.gz
--rwxr-xr-x   1 root root      3076 2009-05-19 20:05 ./source/ap/ispell/ispell.SlackBuild
--rw-r--r--   1 root root      5808 2001-06-08 20:52 ./source/ap/ispell/ispell.diff.gz
--rw-r--r--   1 root root      1057 2002-03-23 22:27 ./source/ap/ispell/slack-desc
-drwxr-xr-x   2 root root      4096 2010-02-18 23:11 ./source/ap/jed
--rw-r--r--   1 root root    884198 2009-12-14 02:30 ./source/ap/jed/jed-0.99-19.tar.bz2
--rw-r--r--   1 root root       261 2009-12-14 02:33 ./source/ap/jed/jed-0.99-19.tar.bz2.asc
--rwxr-xr-x   1 root root      3136 2010-02-18 23:13 ./source/ap/jed/jed.SlackBuild
--rw-r--r--   1 root root       938 2002-03-23 22:28 ./source/ap/jed/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-23 00:41 ./source/ap/joe
--rw-r--r--   1 root root    492145 2006-07-20 19:45 ./source/ap/joe/joe-3.5.tar.bz2
--rwxr-xr-x   1 root root      2375 2009-05-23 00:41 ./source/ap/joe/joe.SlackBuild
--rw-r--r--   1 root root       599 2002-02-24 21:25 ./source/ap/joe/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/ap/jove
--rwxr-xr-x   1 root root      2850 2009-06-16 18:40 ./source/ap/jove/jove.SlackBuild
--rw-r--r--   1 root root      1709 2009-03-04 05:45 ./source/ap/jove/jove.makefile.diff.gz
--rw-r--r--   1 root root    451492 2009-03-04 05:45 ./source/ap/jove/jove4.16.0.70.tar.gz
--rw-r--r--   1 root root       792 2009-03-04 05:45 ./source/ap/jove/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/ap/ksh93
--rw-r--r--   1 root root     12885 2004-12-16 17:19 ./source/ap/ksh93/CPL
--rw-r--r--   1 root root    344670 2007-04-15 20:14 ./source/ap/ksh93/INIT.2007-03-28.tgz
--rw-r--r--   1 root root    611444 2007-04-15 20:15 ./source/ap/ksh93/ast-ksh-locale.2007-03-28.tgz
--rw-r--r--   1 root root   1646999 2007-04-15 20:15 ./source/ap/ksh93/ast-ksh.2007-03-28.tgz
--rwxr-xr-x   1 root root      4943 2009-05-19 20:05 ./source/ap/ksh93/ksh93.SlackBuild
--rw-r--r--   1 root root       996 2002-03-23 22:28 ./source/ap/ksh93/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/ap/libx86
--rw-r--r--   1 root root     87428 2008-05-19 09:30 ./source/ap/libx86/libx86-1.1.tar.gz
--rwxr-xr-x   1 root root      2627 2009-05-19 20:05 ./source/ap/libx86/libx86.SlackBuild
--rw-r--r--   1 root root       127 2008-11-24 18:21 ./source/ap/libx86/libx86.info
--rw-r--r--   1 root root       324 2008-11-24 08:27 ./source/ap/libx86/lrmi.c.diff.gz
--rw-r--r--   1 root root       769 2008-11-24 18:22 ./source/ap/libx86/slack-desc
-drwxr-xr-x   4 root root      4096 2010-02-10 22:05 ./source/ap/linuxdoc-tools
--rw-r--r--   1 root root      5157 2010-02-10 11:08 ./source/ap/linuxdoc-tools/ChangeLog.txt
-drwxr-xr-x   2 root root      4096 2005-10-04 18:51 ./source/ap/linuxdoc-tools/arm
--rwxr-xr-x   1 root root      1591 2010-02-10 10:02 ./source/ap/linuxdoc-tools/arm/build
--rwxr-xr-x   1 root root        28 2006-02-05 00:16 ./source/ap/linuxdoc-tools/linuxdoc-tools.SlackBuild
--rwxr-xr-x   1 root root     30341 2010-02-10 11:32 ./source/ap/linuxdoc-tools/linuxdoc-tools.build
--rwxr-xr-x   1 root root      2786 2010-02-10 11:36 ./source/ap/linuxdoc-tools/postbuildfixes.sh
--rw-r--r--   1 root root      1166 2006-06-26 15:17 ./source/ap/linuxdoc-tools/slack-desc
-drwxr-xr-x   2 root root      4096 2010-02-10 11:03 ./source/ap/linuxdoc-tools/sources
--rw-r--r--   1 root root    775124 2009-12-07 05:48 ./source/ap/linuxdoc-tools/sources/asciidoc-8.5.2.tar.xz
--rw-r--r--   1 root root    277650 2007-05-05 12:33 ./source/ap/linuxdoc-tools/sources/docbook-dsssl-1.79.tar.bz2
--rw-r--r--   1 root root    142278 2004-11-12 12:42 ./source/ap/linuxdoc-tools/sources/docbook-dsssl-doc-1.79.tar.bz2
--rw-r--r--   1 root root   2986142 2010-01-10 17:18 ./source/ap/linuxdoc-tools/sources/docbook-style-xsl-1.75.2-5.fc13.src.rpm
--rw-r--r--   1 root root    165666 2010-01-10 17:04 ./source/ap/linuxdoc-tools/sources/docbook-utils-0.6.14-23.fc13.src.rpm
--rw-r--r--   1 root root     98497 2006-10-26 17:17 ./source/ap/linuxdoc-tools/sources/docbook-xml-4.5.zip
--rw-r--r--   1 root root    476372 2007-04-11 01:17 ./source/ap/linuxdoc-tools/sources/docbook_4.5.orig.tar.gz
--rw-r--r--   1 root root    593420 2010-01-05 23:14 ./source/ap/linuxdoc-tools/sources/gnome-doc-utils-0.19.1.tar.xz
--rw-r--r--   1 root root    644297 2009-12-18 13:14 ./source/ap/linuxdoc-tools/sources/gtk-doc-1.13.tar.bz2
--rw-r--r--   1 root root       707 2010-01-06 23:01 ./source/ap/linuxdoc-tools/sources/gtkdoc-1.13-fixref.patch.bz2
--rw-r--r--   1 root root      8329 2008-01-04 17:02 ./source/ap/linuxdoc-tools/sources/libsgmls-perl_1.03ii-32.diff.gz
--rw-r--r--   1 root root     92130 2001-04-15 16:15 ./source/ap/linuxdoc-tools/sources/libsgmls-perl_1.03ii.orig.tar.gz
--rw-r--r--   1 root root    630326 2010-02-10 11:01 ./source/ap/linuxdoc-tools/sources/linuxdoc-tools-0.9.66-5.fc13.src.rpm
--rw-r--r--   1 root root    711620 2003-04-18 20:32 ./source/ap/linuxdoc-tools/sources/openjade-1.3.3-pre1.tar.xz
--rw-r--r--   1 root root   1525065 2009-08-12 14:39 ./source/ap/linuxdoc-tools/sources/opensp-1.5.2-12.fc12.src.rpm
--rw-r--r--   1 root root     95608 2010-01-10 17:01 ./source/ap/linuxdoc-tools/sources/sgml-common-0.6.3-31.fc13.src.rpm
--rwxr-xr-x   1 root root      4061 2010-02-10 10:06 ./source/ap/linuxdoc-tools/sources/source.download
--rw-r--r--   1 root root     96240 2009-09-21 13:27 ./source/ap/linuxdoc-tools/sources/xmlto-0.0.23.tar.xz
--rwxr-xr-x   1 root root      2774 2010-02-10 11:32 ./source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools
-drwxr-xr-x   2 root root      4096 2010-05-03 07:28 ./source/ap/lm_sensors
--rw-r--r--   1 root root    157644 2010-02-02 20:19 ./source/ap/lm_sensors/lm_sensors-3.1.2.tar.bz2
--rw-r--r--   1 root root        65 2010-02-02 20:19 ./source/ap/lm_sensors/lm_sensors-3.1.2.tar.bz2.sig
--rwxr-xr-x   1 root root      3728 2010-05-03 07:29 ./source/ap/lm_sensors/lm_sensors.SlackBuild
--rw-r--r--   1 root root       312 2008-10-26 01:06 ./source/ap/lm_sensors/lm_sensors.makefile.diff.gz
--rw-r--r--   1 root root      1105 2006-09-20 03:52 ./source/ap/lm_sensors/slack-desc
-drwxr-xr-x   2 root root      4096 2010-03-13 01:02 ./source/ap/lsof
--rwxr-xr-x   1 root root      2744 2010-03-13 01:05 ./source/ap/lsof/lsof.SlackBuild
--rw-r--r--   1 root root    753094 2010-01-18 19:11 ./source/ap/lsof/lsof_4.83.tar.bz2
--rw-r--r--   1 root root       152 2010-01-18 19:12 ./source/ap/lsof/lsof_4.83.tar.bz2.sig
--rw-r--r--   1 root root       789 2002-03-17 00:42 ./source/ap/lsof/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/ap/lsscsi
--rw-r--r--   1 root root    107376 2009-01-23 16:50 ./source/ap/lsscsi/lsscsi-0.22.tar.bz2
--rwxr-xr-x   1 root root      3183 2009-05-19 20:05 ./source/ap/lsscsi/lsscsi.SlackBuild
--rw-r--r--   1 root root        36 2008-11-29 19:46 ./source/ap/lsscsi/lsscsi.url
--rw-r--r--   1 root root       825 2007-05-02 19:26 ./source/ap/lsscsi/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/ap/madplay
--rw-r--r--   1 root root    590929 2004-02-23 23:28 ./source/ap/madplay/madplay-0.15.2b.tar.gz
--rw-r--r--   1 root root       174 2004-02-23 23:28 ./source/ap/madplay/madplay-0.15.2b.tar.gz.sign
--rwxr-xr-x   1 root root      2458 2009-05-19 20:05 ./source/ap/madplay/madplay.SlackBuild
--rw-r--r--   1 root root       797 2003-09-10 00:59 ./source/ap/madplay/slack-desc
-drwxr-xr-x   2 root root      4096 2009-08-09 01:53 ./source/ap/man
-drwxr-xr-x   2 root root      4096 2010-02-28 20:28 ./source/ap/man-pages
--rw-r--r--   1 root root       147 2008-07-17 17:25 ./source/ap/man-pages/doinst.sh.gz
--rw-r--r--   1 root root   1098770 2010-02-26 06:24 ./source/ap/man-pages/man-pages-3.24.tar.bz2
--rw-r--r--   1 root root    971300 2008-06-17 11:18 ./source/ap/man-pages/man-pages-posix-2003-a.tar.bz2
--rwxr-xr-x   1 root root      3752 2010-02-28 20:29 ./source/ap/man-pages/man-pages.SlackBuild
--rw-r--r--   1 root root       950 2008-07-17 17:29 ./source/ap/man-pages/slack-desc
--rw-r--r--   1 root root    156268 2009-06-14 02:57 ./source/ap/man-pages/whatis.sample.xz
--rw-r--r--   1 root root       274 2008-04-09 19:04 ./source/ap/man/doinst.sh.gz
--rw-r--r--   1 root root       215 2009-08-09 01:53 ./source/ap/man/man-1.6f.nroff.mandoc.diff.gz
--rw-r--r--   1 root root    223765 2007-12-31 22:38 ./source/ap/man/man-1.6f.tar.bz2
--rwxr-xr-x   1 root root      3000 2009-08-09 02:17 ./source/ap/man/man.SlackBuild
--rw-r--r--   1 root root       901 2002-03-23 22:29 ./source/ap/man/slack-desc
-drwxr-xr-x   3 root root      4096 2010-05-09 23:18 ./source/ap/mc
--rw-r--r--   1 root root   1534428 2010-05-09 23:15 ./source/ap/mc/mc-20100509_git.tar.xz
--rwxr-xr-x   1 root root      3631 2010-02-06 07:27 ./source/ap/mc/mc.SlackBuild
-drwxr-xr-x   2 root root      4096 2009-07-14 20:23 ./source/ap/mc/profile.d
--rwxr-xr-x   1 root root       389 2008-11-29 19:55 ./source/ap/mc/profile.d/mc-wrapper.csh
--rwxr-xr-x   1 root root       315 2008-11-29 19:55 ./source/ap/mc/profile.d/mc-wrapper.sh
--rwxr-xr-x   1 root root        51 2008-11-29 19:55 ./source/ap/mc/profile.d/mc.csh
--rwxr-xr-x   1 root root        45 2008-11-29 19:55 ./source/ap/mc/profile.d/mc.sh
--rw-r--r--   1 root root       904 2002-02-26 05:38 ./source/ap/mc/slack-desc
-drwxr-xr-x   2 root root      4096 2009-06-22 02:44 ./source/ap/most
--rw-r--r--   1 root root    131130 2007-09-09 16:16 ./source/ap/most/most-5.0.0a.tar.bz2
--rwxr-xr-x   1 root root      2651 2009-06-25 23:08 ./source/ap/most/most.SlackBuild
--rw-r--r--   1 root root       833 2003-06-06 00:54 ./source/ap/most/slack-desc
-drwxr-xr-x   2 root root      4096 2010-04-14 20:23 ./source/ap/mpg123
--rw-r--r--   1 root root    642436 2010-03-31 08:55 ./source/ap/mpg123/mpg123-1.12.1.tar.xz
--rwxr-xr-x   1 root root      5312 2010-03-22 03:20 ./source/ap/mpg123/mpg123.SlackBuild
--rw-r--r--   1 root root       788 2009-12-15 17:57 ./source/ap/mpg123/slack-desc
-drwxr-xr-x   2 root root      4096 2010-04-23 16:38 ./source/ap/mysql
--rw-r--r--   1 root root       330 2008-10-02 04:21 ./source/ap/mysql/doinst.sh.gz
--rw-r--r--   1 root root  12809872 2010-04-06 14:41 ./source/ap/mysql/mysql-5.1.46.tar.xz
--rwxr-xr-x   1 root root      1816 2010-04-10 21:17 ./source/ap/mysql/mysql-embedded.build
--rwxr-xr-x   1 root root      6493 2010-05-05 19:31 ./source/ap/mysql/mysql.SlackBuild
--rw-r--r--   1 root root      1208 2008-04-17 20:26 ./source/ap/mysql/rc.mysqld.gz
--rw-r--r--   1 root root       816 2002-03-23 22:31 ./source/ap/mysql/slack-desc
-drwxr-xr-x   2 root root      4096 2010-04-20 10:53 ./source/ap/nano
--rw-r--r--   1 root root    820844 2010-04-15 07:50 ./source/ap/nano/nano-2.2.4.tar.xz
--rwxr-xr-x   1 root root      3981 2010-02-16 05:51 ./source/ap/nano/nano.SlackBuild
--rw-r--r--   1 root root       870 2007-04-07 20:52 ./source/ap/nano/slack-desc
-drwxr-xr-x   2 root root      4096 2009-06-10 01:26 ./source/ap/normalize
--rw-r--r--   1 root root    388777 2005-09-14 18:46 ./source/ap/normalize/normalize-0.7.7.tar.bz2
--rwxr-xr-x   1 root root      2475 2009-06-10 01:26 ./source/ap/normalize/normalize.SlackBuild
--rw-r--r--   1 root root       971 2004-05-25 04:30 ./source/ap/normalize/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/ap/ntfsprogs
--rw-r--r--   1 root root    678114 2007-09-29 07:37 ./source/ap/ntfsprogs/ntfsprogs-2.0.0.tar.bz2
--rwxr-xr-x   1 root root      3560 2009-05-19 20:05 ./source/ap/ntfsprogs/ntfsprogs.SlackBuild
--rw-r--r--   1 root root      1064 2008-02-29 05:35 ./source/ap/ntfsprogs/slack-desc
-drwxr-xr-x   2 root root      4096 2010-03-20 04:19 ./source/ap/pm-utils
--rw-r--r--   1 root root      5733 2010-03-20 04:33 ./source/ap/pm-utils/README.SLACKWARE
--rw-r--r--   1 root root      8932 2010-03-17 03:36 ./source/ap/pm-utils/pm-quirks-20100316.tar.xz
--rw-r--r--   1 root root    145268 2010-03-17 03:22 ./source/ap/pm-utils/pm-utils-1.3.0.tar.xz
--rwxr-xr-x   1 root root      4076 2010-03-20 04:33 ./source/ap/pm-utils/pm-utils.SlackBuild
--rw-r--r--   1 root root        32 2009-04-14 04:05 ./source/ap/pm-utils/pm-utils.url
--rw-r--r--   1 root root       835 2009-04-14 04:05 ./source/ap/pm-utils/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-04 04:32 ./source/ap/powertop
--rw-r--r--   1 root root     73136 2009-01-05 18:53 ./source/ap/powertop/powertop-1.11.tar.gz
--rwxr-xr-x   1 root root      3152 2010-05-04 04:42 ./source/ap/powertop/powertop.SlackBuild
--rw-r--r--   1 root root      1007 2010-05-04 04:42 ./source/ap/powertop/slack-desc
-drwxr-xr-x   2 root root      4096 2010-03-25 23:07 ./source/ap/radeontool
--rw-r--r--   1 root root    338446 2010-03-24 03:21 ./source/ap/radeontool/radeontool-1.6.1.tar.bz2
--rwxr-xr-x   1 root root      2886 2010-04-27 21:20 ./source/ap/radeontool/radeontool.SlackBuild
--rw-r--r--   1 root root       802 2008-11-24 19:37 ./source/ap/radeontool/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-23 00:41 ./source/ap/rexima
--rw-r--r--   1 root root     15903 2003-07-01 08:56 ./source/ap/rexima/rexima-1.4.tar.gz
--rwxr-xr-x   1 root root      2106 2009-05-23 00:41 ./source/ap/rexima/rexima.SlackBuild
--rw-r--r--   1 root root       829 2002-05-29 20:44 ./source/ap/rexima/slack-desc
-drwxr-xr-x   2 root root      4096 2009-11-27 20:09 ./source/ap/rpm
--rw-r--r--   1 root root       133 2009-11-27 18:09 ./source/ap/rpm/Packages.gz
--rw-r--r--   1 root root       132 2009-11-27 18:09 ./source/ap/rpm/doinst.sh.gz
--rw-r--r--   1 root root   3033272 2010-01-13 17:29 ./source/ap/rpm/rpm-4.8.0.tar.xz
--rwxr-xr-x   1 root root      4020 2010-01-13 20:36 ./source/ap/rpm/rpm.SlackBuild
--rw-r--r--   1 root root       948 2009-11-27 18:09 ./source/ap/rpm/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/ap/rzip
--rw-r--r--   1 root root     46785 2006-02-14 00:41 ./source/ap/rzip/rzip-2.1.tar.gz
--rwxr-xr-x   1 root root      2451 2009-05-19 20:05 ./source/ap/rzip/rzip.SlackBuild
--rw-r--r--   1 root root       723 2004-06-03 03:13 ./source/ap/rzip/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-23 00:42 ./source/ap/sc
--rw-r--r--   1 root root       309 1999-08-03 23:52 ./source/ap/sc/_sc.tar.gz
--rw-r--r--   1 root root       636 2002-09-20 05:00 ./source/ap/sc/sc-7.16.lsm
--rw-r--r--   1 root root    210809 2002-09-20 05:00 ./source/ap/sc/sc-7.16.tar.gz
--rw-r--r--   1 root root       187 2008-10-23 19:40 ./source/ap/sc/sc-gcc34.diff.gz
--rw-r--r--   1 root root       208 2008-10-23 19:41 ./source/ap/sc/sc-malloc.diff.gz
--rwxr-xr-x   1 root root      2764 2009-05-23 00:42 ./source/ap/sc/sc.SlackBuild
--rw-r--r--   1 root root       576 2002-02-24 21:19 ./source/ap/sc/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-23 00:42 ./source/ap/screen
--rw-r--r--   1 root root    741741 2006-10-23 13:10 ./source/ap/screen/screen-4.0.3.tar.bz2
--rwxr-xr-x   1 root root      3756 2009-05-23 00:42 ./source/ap/screen/screen.SlackBuild
--rw-r--r--   1 root root      1111 2002-03-23 22:34 ./source/ap/screen/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/ap/seejpeg
--rw-r--r--   1 root root       227 2000-04-30 06:01 ./source/ap/seejpeg/_seejpeg.tar.gz
--rw-r--r--   1 root root    500701 1996-07-25 23:00 ./source/ap/seejpeg/libjpeg-6a.tar.gz
--rw-r--r--   1 root root       654 2000-04-30 05:52 ./source/ap/seejpeg/seejpeg-1.10.diff.gz
--rw-r--r--   1 root root       855 1999-11-09 00:03 ./source/ap/seejpeg/seejpeg-1.10.lsm
--rw-r--r--   1 root root     46550 1999-11-09 00:03 ./source/ap/seejpeg/seejpeg-1.10.tgz
--rwxr-xr-x   1 root root      2281 2009-05-19 20:05 ./source/ap/seejpeg/seejpeg.SlackBuild
--rw-r--r--   1 root root       913 2002-03-23 22:34 ./source/ap/seejpeg/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 19:16 ./source/ap/slackpkg
--rw-r--r--   1 root root        69 2008-11-21 19:07 ./source/ap/slackpkg/README
-drwxr-xr-x   2 root root      4096 2009-08-24 07:00 ./source/ap/sox
--rw-r--r--   1 root root       710 2002-03-23 22:35 ./source/ap/sox/slack-desc
--rw-r--r--   1 root root    688296 2009-06-21 20:05 ./source/ap/sox/sox-14.3.0.tar.xz
--rwxr-xr-x   1 root root      3446 2010-02-17 23:14 ./source/ap/sox/sox.SlackBuild
-drwxr-xr-x   2 root root      4096 2010-04-02 15:50 ./source/ap/sqlite
--rw-r--r--   1 root root      1684 2008-08-01 05:31 ./source/ap/sqlite/COPYRIGHT.gz
--rw-r--r--   1 root root       942 2008-08-01 01:21 ./source/ap/sqlite/slack-desc
--rw-r--r--   1 root root   2069148 2010-03-31 11:58 ./source/ap/sqlite/sqlite-3.6.23.1.tar.xz
--rwxr-xr-x   1 root root      3772 2010-02-11 21:52 ./source/ap/sqlite/sqlite.SlackBuild
-drwxr-xr-x   2 root root      4096 2010-04-20 12:17 ./source/ap/sudo
--rw-r--r--   1 root root       275 2004-09-19 00:25 ./source/ap/sudo/doinst.sh.gz
--rw-r--r--   1 root root       869 2002-03-23 22:36 ./source/ap/sudo/slack-desc
--rw-r--r--   1 root root    771148 2010-04-09 21:14 ./source/ap/sudo/sudo-1.7.2p6.tar.gz
--rw-r--r--   1 root root        72 2010-04-09 21:22 ./source/ap/sudo/sudo-1.7.2p6.tar.gz.sig
--rwxr-xr-x   1 root root      3737 2010-04-20 16:26 ./source/ap/sudo/sudo.SlackBuild
-drwxr-xr-x   2 root root      4096 2010-04-25 23:24 ./source/ap/sysstat
--rw-r--r--   1 root root       527 2009-08-30 05:02 ./source/ap/sysstat/doinst.sh.gz
--rw-r--r--   1 root root       902 2009-08-30 04:53 ./source/ap/sysstat/slack-desc
--rw-r--r--   1 root root    243939 2010-02-28 08:50 ./source/ap/sysstat/sysstat-9.0.6.1.tar.bz2
--rwxr-xr-x   1 root root      5157 2010-04-25 23:27 ./source/ap/sysstat/sysstat.SlackBuild
-drwxr-xr-x   2 root root      4096 2009-05-23 00:42 ./source/ap/texinfo
--rw-r--r--   1 root root      5853 2008-11-20 23:57 ./source/ap/texinfo/dir.gz
--rw-r--r--   1 root root       251 2008-11-21 00:01 ./source/ap/texinfo/doinst.sh.gz
--rw-r--r--   1 root root      1074 2002-03-22 20:41 ./source/ap/texinfo/slack-desc
--rw-r--r--   1 root root   1969110 2008-09-29 15:17 ./source/ap/texinfo/texinfo-4.13a.tar.bz2
--rwxr-xr-x   1 root root      2867 2009-05-23 00:42 ./source/ap/texinfo/texinfo.SlackBuild
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/ap/vbetool
--rw-r--r--   1 root root       833 2008-11-24 18:23 ./source/ap/vbetool/slack-desc
--rw-r--r--   1 root root    182826 2008-05-16 12:56 ./source/ap/vbetool/vbetool-1.1.tar.gz
--rwxr-xr-x   1 root root      2546 2009-05-19 20:05 ./source/ap/vbetool/vbetool.SlackBuild
--rw-r--r--   1 root root       129 2008-11-24 18:23 ./source/ap/vbetool/vbetool.info
-drwxr-xr-x   3 root root      4096 2010-05-10 23:01 ./source/ap/vim
--rw-r--r--   1 root root    287496 2007-09-05 04:42 ./source/ap/vim/ctags-5.7.tar.gz
--rw-r--r--   1 root root       118 2006-08-23 23:20 ./source/ap/vim/doinst.sh.gz
--rw-r--r--   1 root root      4203 2007-02-16 22:42 ./source/ap/vim/gvim.desktop
--rw-r--r--   1 root root      8249 2006-01-19 17:01 ./source/ap/vim/gvim.png
-drwxr-xr-x   2 root root     16384 2010-05-10 23:00 ./source/ap/vim/patches
--rw-r--r--   1 root root       972 2008-08-17 21:03 ./source/ap/vim/patches/7.2.001.gz
--rw-r--r--   1 root root       829 2008-08-17 21:45 ./source/ap/vim/patches/7.2.002.gz
--rw-r--r--   1 root root      1380 2008-08-25 02:14 ./source/ap/vim/patches/7.2.003.gz
--rw-r--r--   1 root root      1324 2008-08-25 02:36 ./source/ap/vim/patches/7.2.004.gz
--rw-r--r--   1 root root      1621 2008-08-25 02:51 ./source/ap/vim/patches/7.2.005.gz
--rw-r--r--   1 root root       871 2008-08-25 03:04 ./source/ap/vim/patches/7.2.006.gz
--rw-r--r--   1 root root      4921 2008-09-01 14:53 ./source/ap/vim/patches/7.2.007.gz
--rw-r--r--   1 root root       934 2008-09-01 15:33 ./source/ap/vim/patches/7.2.008.gz
--rw-r--r--   1 root root      1032 2008-09-01 15:56 ./source/ap/vim/patches/7.2.009.gz
--rw-r--r--   1 root root      2228 2008-09-06 14:45 ./source/ap/vim/patches/7.2.010.gz
--rw-r--r--   1 root root      1257 2008-09-07 11:55 ./source/ap/vim/patches/7.2.011.gz
--rw-r--r--   1 root root       739 2008-09-07 13:50 ./source/ap/vim/patches/7.2.012.gz
--rw-r--r--   1 root root      1726 2008-09-07 19:49 ./source/ap/vim/patches/7.2.013.gz
--rw-r--r--   1 root root       846 2008-09-10 13:39 ./source/ap/vim/patches/7.2.014.gz
--rw-r--r--   1 root root       936 2008-09-10 16:27 ./source/ap/vim/patches/7.2.015.gz
--rw-r--r--   1 root root      2018 2008-09-14 12:43 ./source/ap/vim/patches/7.2.016.gz
--rw-r--r--   1 root root      1895 2008-09-14 13:59 ./source/ap/vim/patches/7.2.017.gz
--rw-r--r--   1 root root       774 2008-09-14 19:42 ./source/ap/vim/patches/7.2.018.gz
--rw-r--r--   1 root root      1131 2008-09-18 10:45 ./source/ap/vim/patches/7.2.019.gz
--rw-r--r--   1 root root       822 2008-09-18 18:56 ./source/ap/vim/patches/7.2.020.gz
--rw-r--r--   1 root root      1689 2008-09-18 19:30 ./source/ap/vim/patches/7.2.021.gz
--rw-r--r--   1 root root      1596 2008-09-20 14:27 ./source/ap/vim/patches/7.2.022.gz
--rw-r--r--   1 root root       992 2008-10-01 19:10 ./source/ap/vim/patches/7.2.023.gz
--rw-r--r--   1 root root       800 2008-10-02 20:49 ./source/ap/vim/patches/7.2.024.gz
--rw-r--r--   1 root root       796 2008-10-02 20:56 ./source/ap/vim/patches/7.2.025.gz
--rw-r--r--   1 root root      1362 2008-11-01 12:53 ./source/ap/vim/patches/7.2.026.gz
--rw-r--r--   1 root root      1144 2008-11-06 09:24 ./source/ap/vim/patches/7.2.027.gz
--rw-r--r--   1 root root       788 2008-11-06 10:06 ./source/ap/vim/patches/7.2.028.gz
--rw-r--r--   1 root root       690 2008-11-06 16:16 ./source/ap/vim/patches/7.2.029.gz
--rw-r--r--   1 root root       834 2008-11-06 19:47 ./source/ap/vim/patches/7.2.030.gz
--rw-r--r--   1 root root     10923 2008-11-09 12:45 ./source/ap/vim/patches/7.2.031.gz
--rw-r--r--   1 root root       795 2008-11-09 16:21 ./source/ap/vim/patches/7.2.032.gz
--rw-r--r--   1 root root      1000 2008-11-11 20:57 ./source/ap/vim/patches/7.2.033.gz
--rw-r--r--   1 root root      1057 2008-11-12 11:52 ./source/ap/vim/patches/7.2.034.gz
--rw-r--r--   1 root root      1286 2008-11-12 12:09 ./source/ap/vim/patches/7.2.035.gz
--rw-r--r--   1 root root      2305 2008-11-12 12:36 ./source/ap/vim/patches/7.2.036.gz
--rw-r--r--   1 root root       822 2008-11-12 13:10 ./source/ap/vim/patches/7.2.037.gz
--rw-r--r--   1 root root       985 2008-11-12 13:52 ./source/ap/vim/patches/7.2.038.gz
--rw-r--r--   1 root root       776 2008-11-12 14:29 ./source/ap/vim/patches/7.2.039.gz
--rw-r--r--   1 root root       986 2008-11-12 15:06 ./source/ap/vim/patches/7.2.040.gz
--rw-r--r--   1 root root      5431 2008-11-15 13:11 ./source/ap/vim/patches/7.2.041.gz
--rw-r--r--   1 root root      1757 2008-11-15 15:07 ./source/ap/vim/patches/7.2.042.gz
--rw-r--r--   1 root root      1074 2008-11-20 09:28 ./source/ap/vim/patches/7.2.043.gz
--rw-r--r--   1 root root      1818 2008-11-20 09:37 ./source/ap/vim/patches/7.2.044.gz
--rw-r--r--   1 root root      1035 2008-11-20 10:04 ./source/ap/vim/patches/7.2.045.gz
--rw-r--r--   1 root root       892 2008-11-20 10:56 ./source/ap/vim/patches/7.2.046.gz
--rw-r--r--   1 root root      1196 2008-11-20 15:12 ./source/ap/vim/patches/7.2.047.gz
--rw-r--r--   1 root root      1681 2008-11-20 15:12 ./source/ap/vim/patches/7.2.048.gz
--rw-r--r--   1 root root      6742 2008-11-20 16:10 ./source/ap/vim/patches/7.2.049.gz
--rw-r--r--   1 root root      2154 2008-11-28 09:09 ./source/ap/vim/patches/7.2.050.gz
--rw-r--r--   1 root root      3820 2008-11-28 10:01 ./source/ap/vim/patches/7.2.051.gz
--rw-r--r--   1 root root      1066 2008-11-28 10:16 ./source/ap/vim/patches/7.2.052.gz
--rw-r--r--   1 root root       849 2008-11-28 10:48 ./source/ap/vim/patches/7.2.053.gz
--rw-r--r--   1 root root       879 2008-11-28 11:06 ./source/ap/vim/patches/7.2.054.gz
--rw-r--r--   1 root root      8518 2008-11-28 20:27 ./source/ap/vim/patches/7.2.055.gz
--rw-r--r--   1 root root       846 2008-11-29 19:11 ./source/ap/vim/patches/7.2.056.gz
--rw-r--r--   1 root root      1293 2008-11-29 19:19 ./source/ap/vim/patches/7.2.057.gz
--rw-r--r--   1 root root      1183 2008-11-30 11:15 ./source/ap/vim/patches/7.2.058.gz
--rw-r--r--   1 root root       904 2008-11-30 14:16 ./source/ap/vim/patches/7.2.059.gz
--rw-r--r--   1 root root      8301 2008-11-30 20:13 ./source/ap/vim/patches/7.2.060.gz
--rw-r--r--   1 root root       966 2008-12-03 08:53 ./source/ap/vim/patches/7.2.061.gz
--rw-r--r--   1 root root       842 2008-12-03 10:22 ./source/ap/vim/patches/7.2.062.gz
--rw-r--r--   1 root root      1095 2008-12-03 11:45 ./source/ap/vim/patches/7.2.063.gz
--rw-r--r--   1 root root       922 2008-12-03 12:21 ./source/ap/vim/patches/7.2.064.gz
--rw-r--r--   1 root root      1578 2008-12-03 17:50 ./source/ap/vim/patches/7.2.065.gz
--rw-r--r--   1 root root      1155 2008-12-09 09:57 ./source/ap/vim/patches/7.2.066.gz
--rw-r--r--   1 root root       774 2008-12-09 10:20 ./source/ap/vim/patches/7.2.067.gz
--rw-r--r--   1 root root      1138 2008-12-09 11:29 ./source/ap/vim/patches/7.2.068.gz
--rw-r--r--   1 root root       827 2008-12-09 21:35 ./source/ap/vim/patches/7.2.069.gz
--rw-r--r--   1 root root      4840 2008-12-21 12:04 ./source/ap/vim/patches/7.2.070.gz
--rw-r--r--   1 root root      1147 2008-12-24 11:44 ./source/ap/vim/patches/7.2.071.gz
--rw-r--r--   1 root root       790 2008-12-31 13:03 ./source/ap/vim/patches/7.2.072.gz
--rw-r--r--   1 root root      1423 2008-12-24 11:54 ./source/ap/vim/patches/7.2.073.gz
--rw-r--r--   1 root root       922 2008-12-24 11:57 ./source/ap/vim/patches/7.2.074.gz
--rw-r--r--   1 root root      1032 2008-12-24 12:11 ./source/ap/vim/patches/7.2.075.gz
--rw-r--r--   1 root root      1330 2008-12-30 15:17 ./source/ap/vim/patches/7.2.076.gz
--rw-r--r--   1 root root      1797 2008-12-31 15:22 ./source/ap/vim/patches/7.2.077.gz
--rw-r--r--   1 root root      1310 2009-01-06 14:03 ./source/ap/vim/patches/7.2.078.gz
--rw-r--r--   1 root root      2377 2009-01-06 15:15 ./source/ap/vim/patches/7.2.079.gz
--rw-r--r--   1 root root      2883 2009-01-13 11:30 ./source/ap/vim/patches/7.2.080.gz
--rw-r--r--   1 root root       908 2009-01-13 15:39 ./source/ap/vim/patches/7.2.081.gz
--rw-r--r--   1 root root      1085 2009-01-13 15:58 ./source/ap/vim/patches/7.2.082.gz
--rw-r--r--   1 root root       852 2009-01-13 16:28 ./source/ap/vim/patches/7.2.083.gz
--rw-r--r--   1 root root      1594 2009-01-13 17:12 ./source/ap/vim/patches/7.2.084.gz
--rw-r--r--   1 root root       934 2009-01-22 17:33 ./source/ap/vim/patches/7.2.085.gz
--rw-r--r--   1 root root      1244 2009-01-22 19:49 ./source/ap/vim/patches/7.2.086.gz
--rw-r--r--   1 root root       804 2009-01-22 20:32 ./source/ap/vim/patches/7.2.087.gz
--rw-r--r--   1 root root      1254 2009-01-22 20:50 ./source/ap/vim/patches/7.2.088.gz
--rw-r--r--   1 root root      1158 2009-01-28 13:18 ./source/ap/vim/patches/7.2.089.gz
--rw-r--r--   1 root root      1521 2009-01-28 14:43 ./source/ap/vim/patches/7.2.090.gz
--rw-r--r--   1 root root      1036 2009-01-28 15:05 ./source/ap/vim/patches/7.2.091.gz
--rw-r--r--   1 root root      1839 2009-01-28 18:09 ./source/ap/vim/patches/7.2.092.gz
--rw-r--r--   1 root root      2221 2009-01-28 20:23 ./source/ap/vim/patches/7.2.093.gz
--rw-r--r--   1 root root      1373 2009-02-04 10:21 ./source/ap/vim/patches/7.2.094.gz
--rw-r--r--   1 root root       907 2009-02-04 10:46 ./source/ap/vim/patches/7.2.095.gz
--rw-r--r--   1 root root       759 2009-02-04 12:15 ./source/ap/vim/patches/7.2.096.gz
--rw-r--r--   1 root root       933 2009-02-04 13:19 ./source/ap/vim/patches/7.2.097.gz
--rw-r--r--   1 root root       843 2009-02-04 15:27 ./source/ap/vim/patches/7.2.098.gz
--rw-r--r--   1 root root      1459 2009-02-04 16:29 ./source/ap/vim/patches/7.2.099.gz
--rw-r--r--   1 root root      1654 2009-02-04 16:51 ./source/ap/vim/patches/7.2.100.gz
--rw-r--r--   1 root root       755 2009-02-04 17:35 ./source/ap/vim/patches/7.2.101.gz
--rw-r--r--   1 root root       813 2009-02-05 19:48 ./source/ap/vim/patches/7.2.102.gz
--rw-r--r--   1 root root      1643 2009-02-11 10:35 ./source/ap/vim/patches/7.2.103.gz
--rw-r--r--   1 root root       881 2009-02-11 15:04 ./source/ap/vim/patches/7.2.104.gz
--rw-r--r--   1 root root      1034 2009-02-11 15:47 ./source/ap/vim/patches/7.2.105.gz
--rw-r--r--   1 root root      1380 2009-02-11 16:59 ./source/ap/vim/patches/7.2.106.gz
--rw-r--r--   1 root root       917 2009-02-11 17:48 ./source/ap/vim/patches/7.2.107.gz
--rw-r--r--   1 root root       891 2009-02-11 21:48 ./source/ap/vim/patches/7.2.108.gz
--rw-r--r--   1 root root      4064 2009-02-21 19:29 ./source/ap/vim/patches/7.2.109.gz
--rw-r--r--   1 root root       731 2009-02-21 19:38 ./source/ap/vim/patches/7.2.110.gz
--rw-r--r--   1 root root      1151 2009-02-21 20:12 ./source/ap/vim/patches/7.2.111.gz
--rw-r--r--   1 root root       827 2009-02-21 20:26 ./source/ap/vim/patches/7.2.112.gz
--rw-r--r--   1 root root      1079 2009-02-21 21:04 ./source/ap/vim/patches/7.2.113.gz
--rw-r--r--   1 root root      1001 2009-02-21 21:14 ./source/ap/vim/patches/7.2.114.gz
--rw-r--r--   1 root root      1192 2009-02-21 21:30 ./source/ap/vim/patches/7.2.115.gz
--rw-r--r--   1 root root       898 2009-02-21 21:58 ./source/ap/vim/patches/7.2.116.gz
--rw-r--r--   1 root root      1090 2009-02-21 23:03 ./source/ap/vim/patches/7.2.117.gz
--rw-r--r--   1 root root       979 2009-02-21 23:59 ./source/ap/vim/patches/7.2.118.gz
--rw-r--r--   1 root root       759 2009-02-22 00:15 ./source/ap/vim/patches/7.2.119.gz
--rw-r--r--   1 root root      2555 2009-02-22 01:38 ./source/ap/vim/patches/7.2.120.gz
--rw-r--r--   1 root root      1839 2009-02-22 05:54 ./source/ap/vim/patches/7.2.121.gz
--rw-r--r--   1 root root      1243 2009-02-22 20:14 ./source/ap/vim/patches/7.2.122.gz
--rw-r--r--   1 root root       874 2009-02-22 22:44 ./source/ap/vim/patches/7.2.123.gz
--rw-r--r--   1 root root      1315 2009-02-22 23:55 ./source/ap/vim/patches/7.2.124.gz
--rw-r--r--   1 root root      1454 2009-02-24 03:12 ./source/ap/vim/patches/7.2.125.gz
--rw-r--r--   1 root root      1784 2009-02-24 03:30 ./source/ap/vim/patches/7.2.126.gz
--rw-r--r--   1 root root       881 2009-02-24 03:38 ./source/ap/vim/patches/7.2.127.gz
--rw-r--r--   1 root root       815 2009-03-01 01:46 ./source/ap/vim/patches/7.2.128.gz
--rw-r--r--   1 root root      1012 2009-03-02 01:13 ./source/ap/vim/patches/7.2.129.gz
--rw-r--r--   1 root root      4075 2009-03-02 01:46 ./source/ap/vim/patches/7.2.130.gz
--rw-r--r--   1 root root      1138 2009-03-04 03:17 ./source/ap/vim/patches/7.2.131.gz
--rw-r--r--   1 root root      2826 2009-03-05 02:16 ./source/ap/vim/patches/7.2.132.gz
--rw-r--r--   1 root root       856 2009-03-11 11:47 ./source/ap/vim/patches/7.2.133.gz
--rw-r--r--   1 root root       960 2009-03-11 12:11 ./source/ap/vim/patches/7.2.134.gz
--rw-r--r--   1 root root       940 2009-03-11 14:10 ./source/ap/vim/patches/7.2.135.gz
--rw-r--r--   1 root root       740 2009-03-11 14:37 ./source/ap/vim/patches/7.2.136.gz
--rw-r--r--   1 root root      3549 2009-03-11 15:29 ./source/ap/vim/patches/7.2.137.gz
--rw-r--r--   1 root root      1347 2009-03-11 15:37 ./source/ap/vim/patches/7.2.138.gz
--rw-r--r--   1 root root       995 2009-03-11 16:29 ./source/ap/vim/patches/7.2.139.gz
--rw-r--r--   1 root root       984 2009-03-11 16:46 ./source/ap/vim/patches/7.2.140.gz
--rw-r--r--   1 root root      2187 2009-03-11 16:58 ./source/ap/vim/patches/7.2.141.gz
--rw-r--r--   1 root root       886 2009-03-18 11:22 ./source/ap/vim/patches/7.2.142.gz
--rw-r--r--   1 root root      2618 2009-03-18 11:52 ./source/ap/vim/patches/7.2.143.gz
--rw-r--r--   1 root root      1053 2009-03-18 13:22 ./source/ap/vim/patches/7.2.144.gz
--rw-r--r--   1 root root      1396 2009-03-18 13:34 ./source/ap/vim/patches/7.2.145.gz
--rw-r--r--   1 root root      1461 2009-03-18 14:41 ./source/ap/vim/patches/7.2.146.gz
--rw-r--r--   1 root root       791 2009-03-18 15:29 ./source/ap/vim/patches/7.2.147.gz
--rw-r--r--   1 root root      1566 2009-03-20 11:33 ./source/ap/vim/patches/7.2.148.gz
--rw-r--r--   1 root root      4591 2009-04-22 10:56 ./source/ap/vim/patches/7.2.149.gz
--rw-r--r--   1 root root      6762 2009-04-22 11:08 ./source/ap/vim/patches/7.2.150.gz
--rw-r--r--   1 root root       782 2009-04-22 11:52 ./source/ap/vim/patches/7.2.151.gz
--rw-r--r--   1 root root      1353 2009-04-22 12:44 ./source/ap/vim/patches/7.2.152.gz
--rw-r--r--   1 root root      1187 2009-04-22 13:39 ./source/ap/vim/patches/7.2.153.gz
--rw-r--r--   1 root root      1144 2009-04-22 13:58 ./source/ap/vim/patches/7.2.154.gz
--rw-r--r--   1 root root       710 2009-04-22 14:10 ./source/ap/vim/patches/7.2.155.gz
--rw-r--r--   1 root root      1842 2009-04-22 14:24 ./source/ap/vim/patches/7.2.156.gz
--rw-r--r--   1 root root      1572 2009-04-22 15:45 ./source/ap/vim/patches/7.2.157.gz
--rw-r--r--   1 root root       958 2009-04-22 15:45 ./source/ap/vim/patches/7.2.158.gz
--rw-r--r--   1 root root       918 2009-04-22 15:53 ./source/ap/vim/patches/7.2.159.gz
--rw-r--r--   1 root root       705 2009-04-22 16:45 ./source/ap/vim/patches/7.2.160.gz
--rw-r--r--   1 root root      1802 2009-04-29 09:03 ./source/ap/vim/patches/7.2.161.gz
--rw-r--r--   1 root root      1029 2009-04-29 09:53 ./source/ap/vim/patches/7.2.162.gz
--rw-r--r--   1 root root       962 2009-04-29 15:42 ./source/ap/vim/patches/7.2.163.gz
--rw-r--r--   1 root root      1471 2009-04-29 15:42 ./source/ap/vim/patches/7.2.164.gz
--rw-r--r--   1 root root       828 2009-04-29 16:04 ./source/ap/vim/patches/7.2.165.gz
--rw-r--r--   1 root root      3389 2009-04-29 16:47 ./source/ap/vim/patches/7.2.166.gz
--rw-r--r--   1 root root     13059 2009-05-13 12:09 ./source/ap/vim/patches/7.2.167.gz
--rw-r--r--   1 root root      1051 2009-05-13 12:50 ./source/ap/vim/patches/7.2.168.gz
--rw-r--r--   1 root root      8954 2009-05-13 16:56 ./source/ap/vim/patches/7.2.169.gz
--rw-r--r--   1 root root      1387 2009-05-13 18:48 ./source/ap/vim/patches/7.2.170.gz
--rw-r--r--   1 root root      1004 2009-05-14 19:52 ./source/ap/vim/patches/7.2.171.gz
--rw-r--r--   1 root root       983 2009-05-14 20:01 ./source/ap/vim/patches/7.2.172.gz
--rw-r--r--   1 root root      4735 2009-05-14 20:20 ./source/ap/vim/patches/7.2.173.gz
--rw-r--r--   1 root root      9716 2009-05-15 19:32 ./source/ap/vim/patches/7.2.174.gz
--rw-r--r--   1 root root       735 2009-05-16 14:16 ./source/ap/vim/patches/7.2.175.gz
--rw-r--r--   1 root root      2061 2009-05-16 14:37 ./source/ap/vim/patches/7.2.176.gz
--rw-r--r--   1 root root     10066 2009-05-16 15:31 ./source/ap/vim/patches/7.2.177.gz
--rw-r--r--   1 root root      1390 2009-05-16 19:07 ./source/ap/vim/patches/7.2.178.gz
--rw-r--r--   1 root root      1233 2009-05-17 09:59 ./source/ap/vim/patches/7.2.179.gz
--rw-r--r--   1 root root     25733 2009-05-17 11:31 ./source/ap/vim/patches/7.2.180.gz
--rw-r--r--   1 root root     11581 2009-05-17 14:24 ./source/ap/vim/patches/7.2.181.gz
--rw-r--r--   1 root root       988 2009-05-17 21:26 ./source/ap/vim/patches/7.2.182.gz
--rw-r--r--   1 root root      9233 2009-05-21 13:21 ./source/ap/vim/patches/7.2.183.gz
--rw-r--r--   1 root root     16204 2009-05-21 21:26 ./source/ap/vim/patches/7.2.184.gz
--rw-r--r--   1 root root      2598 2009-05-22 16:21 ./source/ap/vim/patches/7.2.185.gz
--rw-r--r--   1 root root      1610 2009-05-22 19:08 ./source/ap/vim/patches/7.2.186.gz
--rw-r--r--   1 root root      1211 2009-05-23 12:28 ./source/ap/vim/patches/7.2.187.gz
--rw-r--r--   1 root root      2785 2009-05-24 11:41 ./source/ap/vim/patches/7.2.188.gz
--rw-r--r--   1 root root      1195 2009-05-26 09:03 ./source/ap/vim/patches/7.2.189.gz
--rw-r--r--   1 root root      1894 2009-05-26 16:13 ./source/ap/vim/patches/7.2.190.gz
--rw-r--r--   1 root root     22827 2009-05-26 20:59 ./source/ap/vim/patches/7.2.191.gz
--rw-r--r--   1 root root      1455 2009-06-03 11:22 ./source/ap/vim/patches/7.2.192.gz
--rw-r--r--   1 root root       759 2009-06-03 12:26 ./source/ap/vim/patches/7.2.193.gz
--rw-r--r--   1 root root       741 2009-06-03 13:05 ./source/ap/vim/patches/7.2.194.gz
--rw-r--r--   1 root root      1054 2009-06-03 20:06 ./source/ap/vim/patches/7.2.195.gz
--rw-r--r--   1 root root      1474 2009-06-03 20:08 ./source/ap/vim/patches/7.2.196.gz
--rw-r--r--   1 root root       778 2009-06-10 16:16 ./source/ap/vim/patches/7.2.197.gz
--rw-r--r--   1 root root       967 2009-06-16 09:08 ./source/ap/vim/patches/7.2.198.gz
--rw-r--r--   1 root root       860 2009-06-16 12:32 ./source/ap/vim/patches/7.2.199.gz
--rw-r--r--   1 root root      3075 2009-06-16 13:12 ./source/ap/vim/patches/7.2.200.gz
--rw-r--r--   1 root root      4092 2009-06-16 13:23 ./source/ap/vim/patches/7.2.201.gz
--rw-r--r--   1 root root       996 2009-06-16 13:36 ./source/ap/vim/patches/7.2.202.gz
--rw-r--r--   1 root root      9493 2009-06-16 14:02 ./source/ap/vim/patches/7.2.203.gz
--rw-r--r--   1 root root      1525 2009-06-16 14:35 ./source/ap/vim/patches/7.2.204.gz
--rw-r--r--   1 root root      1150 2009-06-16 14:45 ./source/ap/vim/patches/7.2.205.gz
--rw-r--r--   1 root root       809 2009-06-16 15:23 ./source/ap/vim/patches/7.2.206.gz
--rw-r--r--   1 root root      1183 2009-06-16 15:23 ./source/ap/vim/patches/7.2.207.gz
--rw-r--r--   1 root root      1250 2009-06-16 15:51 ./source/ap/vim/patches/7.2.208.gz
--rw-r--r--   1 root root      1125 2009-06-16 16:16 ./source/ap/vim/patches/7.2.209.gz
--rw-r--r--   1 root root       914 2009-06-24 09:59 ./source/ap/vim/patches/7.2.210.gz
--rw-r--r--   1 root root       799 2009-06-24 14:26 ./source/ap/vim/patches/7.2.211.gz
--rw-r--r--   1 root root       846 2009-06-24 14:41 ./source/ap/vim/patches/7.2.212.gz
--rw-r--r--   1 root root       761 2009-06-24 14:51 ./source/ap/vim/patches/7.2.213.gz
--rw-r--r--   1 root root       888 2009-06-24 15:05 ./source/ap/vim/patches/7.2.214.gz
--rw-r--r--   1 root root      2692 2009-06-24 15:32 ./source/ap/vim/patches/7.2.215.gz
--rw-r--r--   1 root root      1668 2009-06-24 15:51 ./source/ap/vim/patches/7.2.216.gz
--rw-r--r--   1 root root       924 2009-06-24 16:08 ./source/ap/vim/patches/7.2.217.gz
--rw-r--r--   1 root root       765 2009-06-24 16:32 ./source/ap/vim/patches/7.2.218.gz
--rw-r--r--   1 root root       981 2009-07-01 14:13 ./source/ap/vim/patches/7.2.219.gz
--rw-r--r--   1 root root      1189 2009-07-01 15:13 ./source/ap/vim/patches/7.2.220.gz
--rw-r--r--   1 root root      2458 2009-07-01 16:02 ./source/ap/vim/patches/7.2.221.gz
--rw-r--r--   1 root root       980 2009-07-01 18:19 ./source/ap/vim/patches/7.2.222.gz
--rw-r--r--   1 root root      1935 2009-07-09 13:56 ./source/ap/vim/patches/7.2.223.gz
--rw-r--r--   1 root root      1164 2009-07-09 16:16 ./source/ap/vim/patches/7.2.224.gz
--rw-r--r--   1 root root      1237 2009-07-09 16:24 ./source/ap/vim/patches/7.2.225.gz
--rw-r--r--   1 root root      2108 2009-07-09 18:06 ./source/ap/vim/patches/7.2.226.gz
--rw-r--r--   1 root root       773 2009-07-09 18:14 ./source/ap/vim/patches/7.2.227.gz
--rw-r--r--   1 root root      4016 2009-07-09 19:22 ./source/ap/vim/patches/7.2.228.gz
--rw-r--r--   1 root root       776 2009-07-14 10:20 ./source/ap/vim/patches/7.2.229.gz
--rw-r--r--   1 root root       932 2009-07-14 11:45 ./source/ap/vim/patches/7.2.230.gz
--rw-r--r--   1 root root       827 2009-07-14 14:05 ./source/ap/vim/patches/7.2.231.gz
--rw-r--r--   1 root root      1232 2009-07-14 15:39 ./source/ap/vim/patches/7.2.232.gz
--rw-r--r--   1 root root      1228 2009-07-14 16:38 ./source/ap/vim/patches/7.2.233.gz
--rw-r--r--   1 root root      1397 2009-07-14 19:42 ./source/ap/vim/patches/7.2.234.gz
--rw-r--r--   1 root root      1129 2009-07-22 09:06 ./source/ap/vim/patches/7.2.235.gz
--rw-r--r--   1 root root      1016 2009-07-22 09:17 ./source/ap/vim/patches/7.2.236.gz
--rw-r--r--   1 root root       788 2009-07-22 11:28 ./source/ap/vim/patches/7.2.237.gz
--rw-r--r--   1 root root      1526 2009-07-22 12:28 ./source/ap/vim/patches/7.2.238.gz
--rw-r--r--   1 root root      1653 2009-07-22 14:23 ./source/ap/vim/patches/7.2.239.gz
--rw-r--r--   1 root root      1074 2009-07-29 09:11 ./source/ap/vim/patches/7.2.240.gz
--rw-r--r--   1 root root      2103 2009-07-29 10:11 ./source/ap/vim/patches/7.2.241.gz
--rw-r--r--   1 root root      1091 2009-07-29 13:42 ./source/ap/vim/patches/7.2.242.gz
--rw-r--r--   1 root root       954 2009-07-29 14:09 ./source/ap/vim/patches/7.2.243.gz
--rw-r--r--   1 root root      1843 2009-07-29 16:07 ./source/ap/vim/patches/7.2.244.gz
--rw-r--r--   1 root root      1759 2009-07-29 16:31 ./source/ap/vim/patches/7.2.245.gz
--rw-r--r--   1 root root       866 2009-09-11 10:57 ./source/ap/vim/patches/7.2.246.gz
--rw-r--r--   1 root root      1050 2009-09-11 10:21 ./source/ap/vim/patches/7.2.247.gz
--rw-r--r--   1 root root      1551 2009-09-11 10:49 ./source/ap/vim/patches/7.2.248.gz
--rw-r--r--   1 root root       816 2009-09-11 11:00 ./source/ap/vim/patches/7.2.249.gz
--rw-r--r--   1 root root       836 2009-09-11 11:27 ./source/ap/vim/patches/7.2.250.gz
--rw-r--r--   1 root root      1024 2009-09-11 11:45 ./source/ap/vim/patches/7.2.251.gz
--rw-r--r--   1 root root       829 2009-09-11 12:03 ./source/ap/vim/patches/7.2.252.gz
--rw-r--r--   1 root root      1394 2009-09-11 12:20 ./source/ap/vim/patches/7.2.253.gz
--rw-r--r--   1 root root       810 2009-09-11 13:04 ./source/ap/vim/patches/7.2.254.gz
--rw-r--r--   1 root root       881 2009-09-11 13:23 ./source/ap/vim/patches/7.2.255.gz
--rw-r--r--   1 root root       856 2009-09-11 13:47 ./source/ap/vim/patches/7.2.256.gz
--rw-r--r--   1 root root       994 2009-09-11 14:18 ./source/ap/vim/patches/7.2.257.gz
--rw-r--r--   1 root root       922 2009-09-11 14:48 ./source/ap/vim/patches/7.2.258.gz
--rw-r--r--   1 root root      1665 2009-09-11 15:24 ./source/ap/vim/patches/7.2.259.gz
--rw-r--r--   1 root root      1352 2009-09-18 12:59 ./source/ap/vim/patches/7.2.260.gz
--rw-r--r--   1 root root      1013 2009-09-18 13:18 ./source/ap/vim/patches/7.2.261.gz
--rw-r--r--   1 root root      1924 2009-09-19 14:06 ./source/ap/vim/patches/7.2.262.gz
--rw-r--r--   1 root root      1203 2009-09-23 15:36 ./source/ap/vim/patches/7.2.263.gz
--rw-r--r--   1 root root      1791 2009-09-23 16:15 ./source/ap/vim/patches/7.2.264.gz
--rw-r--r--   1 root root       919 2009-09-30 11:25 ./source/ap/vim/patches/7.2.265.gz
--rw-r--r--   1 root root      2306 2009-09-30 13:22 ./source/ap/vim/patches/7.2.266.gz
--rw-r--r--   1 root root       791 2009-10-07 14:21 ./source/ap/vim/patches/7.2.267.gz
--rw-r--r--   1 root root      1155 2009-11-03 10:44 ./source/ap/vim/patches/7.2.268.gz
--rw-r--r--   1 root root      2948 2009-11-03 11:12 ./source/ap/vim/patches/7.2.269.gz
--rw-r--r--   1 root root      1109 2009-11-03 11:42 ./source/ap/vim/patches/7.2.270.gz
--rw-r--r--   1 root root      1113 2009-11-03 11:56 ./source/ap/vim/patches/7.2.271.gz
--rw-r--r--   1 root root      1073 2009-11-03 12:07 ./source/ap/vim/patches/7.2.272.gz
--rw-r--r--   1 root root      1363 2009-11-03 13:27 ./source/ap/vim/patches/7.2.273.gz
--rw-r--r--   1 root root      1553 2009-11-03 13:47 ./source/ap/vim/patches/7.2.274.gz
--rw-r--r--   1 root root      1118 2009-11-03 14:34 ./source/ap/vim/patches/7.2.275.gz
--rw-r--r--   1 root root       960 2009-11-03 15:04 ./source/ap/vim/patches/7.2.276.gz
--rw-r--r--   1 root root       916 2009-11-03 15:24 ./source/ap/vim/patches/7.2.277.gz
--rw-r--r--   1 root root      1037 2009-11-03 15:30 ./source/ap/vim/patches/7.2.278.gz
--rw-r--r--   1 root root      1445 2009-11-03 15:44 ./source/ap/vim/patches/7.2.279.gz
--rw-r--r--   1 root root      2208 2009-11-03 16:37 ./source/ap/vim/patches/7.2.280.gz
--rw-r--r--   1 root root       986 2009-11-03 16:37 ./source/ap/vim/patches/7.2.281.gz
--rw-r--r--   1 root root       824 2009-11-03 17:05 ./source/ap/vim/patches/7.2.282.gz
--rw-r--r--   1 root root      1019 2009-11-03 17:14 ./source/ap/vim/patches/7.2.283.gz
--rw-r--r--   1 root root       850 2009-11-03 17:49 ./source/ap/vim/patches/7.2.284.gz
--rw-r--r--   1 root root       971 2009-11-11 12:23 ./source/ap/vim/patches/7.2.285.gz
--rw-r--r--   1 root root      2344 2009-11-11 13:22 ./source/ap/vim/patches/7.2.286.gz
--rw-r--r--   1 root root       838 2009-11-11 13:46 ./source/ap/vim/patches/7.2.287.gz
--rw-r--r--   1 root root       860 2009-11-11 14:07 ./source/ap/vim/patches/7.2.288.gz
--rw-r--r--   1 root root      1348 2009-11-11 15:23 ./source/ap/vim/patches/7.2.289.gz
--rw-r--r--   1 root root      1917 2009-11-11 16:10 ./source/ap/vim/patches/7.2.290.gz
--rw-r--r--   1 root root       737 2009-11-11 16:10 ./source/ap/vim/patches/7.2.291.gz
--rw-r--r--   1 root root       747 2009-11-11 16:23 ./source/ap/vim/patches/7.2.292.gz
--rw-r--r--   1 root root       919 2009-11-11 17:37 ./source/ap/vim/patches/7.2.293.gz
--rw-r--r--   1 root root      2962 2009-11-17 11:09 ./source/ap/vim/patches/7.2.294.gz
--rw-r--r--   1 root root      1503 2009-11-17 11:21 ./source/ap/vim/patches/7.2.295.gz
--rw-r--r--   1 root root       833 2009-11-17 11:32 ./source/ap/vim/patches/7.2.296.gz
--rw-r--r--   1 root root       943 2009-11-17 11:44 ./source/ap/vim/patches/7.2.297.gz
--rw-r--r--   1 root root       882 2009-11-17 13:57 ./source/ap/vim/patches/7.2.298.gz
--rw-r--r--   1 root root       856 2009-11-17 15:10 ./source/ap/vim/patches/7.2.299.gz
--rw-r--r--   1 root root      2194 2009-11-17 16:14 ./source/ap/vim/patches/7.2.300.gz
--rw-r--r--   1 root root      3357 2009-11-17 16:42 ./source/ap/vim/patches/7.2.301.gz
--rw-r--r--   1 root root      1083 2009-11-17 16:57 ./source/ap/vim/patches/7.2.302.gz
--rw-r--r--   1 root root      1086 2009-11-18 19:13 ./source/ap/vim/patches/7.2.303.gz
--rw-r--r--   1 root root       920 2009-11-25 11:39 ./source/ap/vim/patches/7.2.304.gz
--rw-r--r--   1 root root      1215 2009-11-25 12:07 ./source/ap/vim/patches/7.2.305.gz
--rw-r--r--   1 root root       863 2009-11-25 16:15 ./source/ap/vim/patches/7.2.306.gz
--rw-r--r--   1 root root      1948 2009-11-25 17:22 ./source/ap/vim/patches/7.2.307.gz
--rw-r--r--   1 root root      1849 2009-11-25 18:53 ./source/ap/vim/patches/7.2.308.gz
--rw-r--r--   1 root root       838 2009-11-26 19:41 ./source/ap/vim/patches/7.2.309.gz
--rw-r--r--   1 root root       968 2009-12-02 11:10 ./source/ap/vim/patches/7.2.310.gz
--rw-r--r--   1 root root       742 2009-12-02 12:32 ./source/ap/vim/patches/7.2.311.gz
--rw-r--r--   1 root root      2636 2009-12-02 14:03 ./source/ap/vim/patches/7.2.312.gz
--rw-r--r--   1 root root      1507 2009-12-02 16:14 ./source/ap/vim/patches/7.2.313.gz
--rw-r--r--   1 root root       862 2009-12-02 16:47 ./source/ap/vim/patches/7.2.314.gz
--rw-r--r--   1 root root      1220 2009-12-02 16:59 ./source/ap/vim/patches/7.2.315.gz
--rw-r--r--   1 root root      1101 2009-12-16 16:15 ./source/ap/vim/patches/7.2.316.gz
--rw-r--r--   1 root root      1790 2009-12-16 17:15 ./source/ap/vim/patches/7.2.317.gz
--rw-r--r--   1 root root      1161 2009-12-16 17:41 ./source/ap/vim/patches/7.2.318.gz
--rw-r--r--   1 root root       854 2009-12-16 17:50 ./source/ap/vim/patches/7.2.319.gz
--rw-r--r--   1 root root      2130 2009-12-16 18:05 ./source/ap/vim/patches/7.2.320.gz
--rw-r--r--   1 root root       999 2009-12-24 14:01 ./source/ap/vim/patches/7.2.321.gz
--rw-r--r--   1 root root       830 2009-12-24 14:47 ./source/ap/vim/patches/7.2.322.gz
--rw-r--r--   1 root root      1039 2009-12-24 15:12 ./source/ap/vim/patches/7.2.323.gz
--rw-r--r--   1 root root       923 2009-12-31 12:18 ./source/ap/vim/patches/7.2.324.gz
--rw-r--r--   1 root root       878 2009-12-31 13:53 ./source/ap/vim/patches/7.2.325.gz
--rw-r--r--   1 root root       834 2010-01-06 17:07 ./source/ap/vim/patches/7.2.326.gz
--rw-r--r--   1 root root      2491 2010-01-06 17:28 ./source/ap/vim/patches/7.2.327.gz
--rw-r--r--   1 root root       721 2010-01-12 12:19 ./source/ap/vim/patches/7.2.328.gz
--rw-r--r--   1 root root       775 2010-01-12 18:51 ./source/ap/vim/patches/7.2.329.gz
--rw-r--r--   1 root root     10262 2010-01-12 18:51 ./source/ap/vim/patches/7.2.330.gz
--rw-r--r--   1 root root       760 2010-01-19 12:01 ./source/ap/vim/patches/7.2.331.gz
--rw-r--r--   1 root root      1344 2010-01-19 12:08 ./source/ap/vim/patches/7.2.332.gz
--rw-r--r--   1 root root      3365 2010-01-19 13:59 ./source/ap/vim/patches/7.2.333.gz
--rw-r--r--   1 root root      2550 2010-01-19 14:13 ./source/ap/vim/patches/7.2.334.gz
--rw-r--r--   1 root root      1180 2010-01-19 14:24 ./source/ap/vim/patches/7.2.335.gz
--rw-r--r--   1 root root      7099 2010-01-19 14:52 ./source/ap/vim/patches/7.2.336.gz
--rw-r--r--   1 root root      1208 2010-01-19 15:13 ./source/ap/vim/patches/7.2.337.gz
--rw-r--r--   1 root root      1256 2010-01-19 15:22 ./source/ap/vim/patches/7.2.338.gz
--rw-r--r--   1 root root       878 2010-01-19 16:26 ./source/ap/vim/patches/7.2.339.gz
--rw-r--r--   1 root root       745 2010-01-19 16:26 ./source/ap/vim/patches/7.2.340.gz
--rw-r--r--   1 root root      1008 2010-01-19 16:58 ./source/ap/vim/patches/7.2.341.gz
--rw-r--r--   1 root root      1093 2010-01-19 17:06 ./source/ap/vim/patches/7.2.342.gz
--rw-r--r--   1 root root       699 2010-01-19 22:35 ./source/ap/vim/patches/7.2.343.gz
--rw-r--r--   1 root root       839 2010-01-20 20:42 ./source/ap/vim/patches/7.2.344.gz
--rw-r--r--   1 root root       727 2010-01-27 14:57 ./source/ap/vim/patches/7.2.345.gz
--rw-r--r--   1 root root      1139 2010-01-27 15:28 ./source/ap/vim/patches/7.2.346.gz
--rw-r--r--   1 root root      1462 2010-01-27 16:32 ./source/ap/vim/patches/7.2.347.gz
--rw-r--r--   1 root root      2407 2010-01-27 17:30 ./source/ap/vim/patches/7.2.348.gz
--rw-r--r--   1 root root       824 2010-01-27 19:27 ./source/ap/vim/patches/7.2.349.gz
--rw-r--r--   1 root root      1244 2010-01-27 20:06 ./source/ap/vim/patches/7.2.350.gz
--rw-r--r--   1 root root       944 2010-01-28 21:59 ./source/ap/vim/patches/7.2.351.gz
--rw-r--r--   1 root root       892 2010-02-03 11:24 ./source/ap/vim/patches/7.2.352.gz
--rw-r--r--   1 root root      1923 2010-02-03 14:14 ./source/ap/vim/patches/7.2.353.gz
--rw-r--r--   1 root root       988 2010-02-03 14:48 ./source/ap/vim/patches/7.2.354.gz
--rw-r--r--   1 root root      1081 2010-02-03 17:15 ./source/ap/vim/patches/7.2.355.gz
--rw-r--r--   1 root root      1036 2010-02-03 17:15 ./source/ap/vim/patches/7.2.356.gz
--rw-r--r--   1 root root       846 2010-02-11 16:04 ./source/ap/vim/patches/7.2.357.gz
--rw-r--r--   1 root root      1045 2010-02-11 17:21 ./source/ap/vim/patches/7.2.358.gz
--rw-r--r--   1 root root       918 2010-02-11 18:01 ./source/ap/vim/patches/7.2.359.gz
--rw-r--r--   1 root root      1212 2010-02-17 14:13 ./source/ap/vim/patches/7.2.360.gz
--rw-r--r--   1 root root      5554 2010-02-17 15:24 ./source/ap/vim/patches/7.2.361.gz
--rw-r--r--   1 root root      1346 2010-02-17 15:32 ./source/ap/vim/patches/7.2.362.gz
--rw-r--r--   1 root root      1031 2010-02-17 15:37 ./source/ap/vim/patches/7.2.363.gz
--rw-r--r--   1 root root      1180 2010-02-17 16:25 ./source/ap/vim/patches/7.2.364.gz
--rw-r--r--   1 root root       880 2010-02-17 16:35 ./source/ap/vim/patches/7.2.365.gz
--rw-r--r--   1 root root      1249 2010-02-17 17:21 ./source/ap/vim/patches/7.2.366.gz
--rw-r--r--   1 root root      1210 2010-02-17 17:28 ./source/ap/vim/patches/7.2.367.gz
--rw-r--r--   1 root root       825 2010-02-18 14:54 ./source/ap/vim/patches/7.2.368.gz
--rw-r--r--   1 root root       947 2010-02-24 13:00 ./source/ap/vim/patches/7.2.369.gz
--rw-r--r--   1 root root      1713 2010-02-24 13:35 ./source/ap/vim/patches/7.2.370.gz
--rw-r--r--   1 root root      2972 2010-02-24 13:47 ./source/ap/vim/patches/7.2.371.gz
--rw-r--r--   1 root root      3033 2010-02-24 14:08 ./source/ap/vim/patches/7.2.372.gz
--rw-r--r--   1 root root      1032 2010-02-24 14:26 ./source/ap/vim/patches/7.2.373.gz
--rw-r--r--   1 root root      1695 2010-02-24 14:49 ./source/ap/vim/patches/7.2.374.gz
--rw-r--r--   1 root root       862 2010-02-24 15:59 ./source/ap/vim/patches/7.2.375.gz
--rw-r--r--   1 root root       810 2010-02-24 16:22 ./source/ap/vim/patches/7.2.376.gz
--rw-r--r--   1 root root       957 2010-02-26 21:06 ./source/ap/vim/patches/7.2.377.gz
--rw-r--r--   1 root root      1251 2010-03-02 11:37 ./source/ap/vim/patches/7.2.378.gz
--rw-r--r--   1 root root       848 2010-03-02 11:48 ./source/ap/vim/patches/7.2.379.gz
--rw-r--r--   1 root root      1250 2010-03-02 14:15 ./source/ap/vim/patches/7.2.380.gz
--rw-r--r--   1 root root      2430 2010-03-02 14:56 ./source/ap/vim/patches/7.2.381.gz
--rw-r--r--   1 root root       875 2010-03-02 16:25 ./source/ap/vim/patches/7.2.382.gz
--rw-r--r--   1 root root      1207 2010-03-02 17:00 ./source/ap/vim/patches/7.2.383.gz
--rw-r--r--   1 root root       896 2010-03-02 17:00 ./source/ap/vim/patches/7.2.384.gz
--rw-r--r--   1 root root      1025 2010-03-02 17:16 ./source/ap/vim/patches/7.2.385.gz
--rw-r--r--   1 root root      1109 2010-03-10 11:26 ./source/ap/vim/patches/7.2.386.gz
--rw-r--r--   1 root root      2015 2010-03-10 11:47 ./source/ap/vim/patches/7.2.387.gz
--rw-r--r--   1 root root       980 2010-03-10 12:21 ./source/ap/vim/patches/7.2.388.gz
--rw-r--r--   1 root root      1730 2010-03-10 12:44 ./source/ap/vim/patches/7.2.389.gz
--rw-r--r--   1 root root      1125 2010-03-10 13:16 ./source/ap/vim/patches/7.2.390.gz
--rw-r--r--   1 root root      1312 2010-03-10 13:47 ./source/ap/vim/patches/7.2.391.gz
--rw-r--r--   1 root root      1884 2010-03-10 15:13 ./source/ap/vim/patches/7.2.392.gz
--rw-r--r--   1 root root      2666 2010-03-10 15:28 ./source/ap/vim/patches/7.2.393.gz
--rw-r--r--   1 root root      1228 2010-03-10 16:17 ./source/ap/vim/patches/7.2.394.gz
--rw-r--r--   1 root root       775 2010-03-17 12:08 ./source/ap/vim/patches/7.2.395.gz
--rw-r--r--   1 root root       721 2010-03-17 13:49 ./source/ap/vim/patches/7.2.396.gz
--rw-r--r--   1 root root       757 2010-03-17 15:46 ./source/ap/vim/patches/7.2.397.gz
--rw-r--r--   1 root root      1263 2010-03-17 15:55 ./source/ap/vim/patches/7.2.398.gz
--rw-r--r--   1 root root       798 2010-03-17 16:26 ./source/ap/vim/patches/7.2.399.gz
--rw-r--r--   1 root root      2753 2010-03-17 17:17 ./source/ap/vim/patches/7.2.400.gz
--rw-r--r--   1 root root       971 2010-03-17 18:14 ./source/ap/vim/patches/7.2.401.gz
--rw-r--r--   1 root root      1179 2010-03-17 18:57 ./source/ap/vim/patches/7.2.402.gz
--rw-r--r--   1 root root       747 2010-03-19 22:09 ./source/ap/vim/patches/7.2.403.gz
--rw-r--r--   1 root root       906 2010-03-23 12:58 ./source/ap/vim/patches/7.2.404.gz
--rw-r--r--   1 root root       811 2010-03-23 13:40 ./source/ap/vim/patches/7.2.405.gz
--rw-r--r--   1 root root      1683 2010-03-23 14:37 ./source/ap/vim/patches/7.2.406.gz
--rw-r--r--   1 root root       976 2010-03-23 15:28 ./source/ap/vim/patches/7.2.407.gz
--rw-r--r--   1 root root      1037 2010-03-23 16:37 ./source/ap/vim/patches/7.2.408.gz
--rw-r--r--   1 root root       951 2010-03-23 16:50 ./source/ap/vim/patches/7.2.409.gz
--rw-r--r--   1 root root      1148 2010-03-23 17:07 ./source/ap/vim/patches/7.2.410.gz
--rw-r--r--   1 root root       802 2010-03-23 17:23 ./source/ap/vim/patches/7.2.411.gz
--rw-r--r--   1 root root      1181 2010-05-07 13:53 ./source/ap/vim/patches/7.2.412.gz
--rw-r--r--   1 root root      2596 2010-05-07 14:07 ./source/ap/vim/patches/7.2.413.gz
--rw-r--r--   1 root root      1042 2010-05-07 14:19 ./source/ap/vim/patches/7.2.414.gz
--rw-r--r--   1 root root       975 2010-05-07 14:36 ./source/ap/vim/patches/7.2.415.gz
--rw-r--r--   1 root root      1023 2010-05-07 14:55 ./source/ap/vim/patches/7.2.416.gz
--rw-r--r--   1 root root       839 2006-07-21 04:09 ./source/ap/vim/slack-desc.vim
--rw-r--r--   1 root root       964 2006-07-21 06:24 ./source/ap/vim/slack-desc.vim-gvim
--rw-r--r--   1 root root    565740 2008-08-09 16:48 ./source/ap/vim/vim-7.2-lang.tar.xz
--rw-r--r--   1 root root   5866332 2008-09-06 14:35 ./source/ap/vim/vim-7.2.tar.xz
--rwxr-xr-x   1 root root      6581 2010-03-11 22:02 ./source/ap/vim/vim-gvim.SlackBuild
--rw-r--r--   1 root root     98451 2010-05-10 23:01 ./source/ap/vim/vim-runtime-syntax-20100510.diff.gz
--rwxr-xr-x   1 root root      6876 2010-03-11 22:02 ./source/ap/vim/vim.SlackBuild
--rw-r--r--   1 root root       303 2009-05-28 18:19 ./source/ap/vim/vim.vimrc.diff.gz
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/ap/vorbis-tools
--rw-r--r--   1 root root      1071 2003-12-19 00:21 ./source/ap/vorbis-tools/slack-desc
--rw-r--r--   1 root root    739539 2008-03-03 06:30 ./source/ap/vorbis-tools/vorbis-tools-1.2.0.tar.bz2
--rwxr-xr-x   1 root root      2426 2009-05-19 20:05 ./source/ap/vorbis-tools/vorbis-tools.SlackBuild
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/ap/workbone
--rw-r--r--   1 root root       689 2002-03-23 22:37 ./source/ap/workbone/slack-desc
--rw-r--r--   1 root root       262 2003-02-14 08:22 ./source/ap/workbone/workbone.1.diff.gz
--rwxr-xr-x   1 root root      2275 2009-05-19 20:05 ./source/ap/workbone/workbone.SlackBuild
--rw-r--r--   1 root root      3330 2002-04-24 15:17 ./source/ap/workbone/workbone_2.40-3.diff.gz
--rw-r--r--   1 root root     21877 1998-10-15 07:00 ./source/ap/workbone/workbone_2.40.orig.tar.gz
-drwxr-xr-x   2 root root      4096 2010-02-09 21:14 ./source/ap/xfsdump
--rw-r--r--   1 root root       983 2006-02-22 20:00 ./source/ap/xfsdump/slack-desc
--rw-r--r--   1 root root    560656 2010-01-13 01:53 ./source/ap/xfsdump/xfsdump-3.0.4.tar.xz
--rwxr-xr-x   1 root root      3906 2010-02-09 21:26 ./source/ap/xfsdump/xfsdump.SlackBuild
--rw-r--r--   1 root root       473 2010-02-09 21:18 ./source/ap/xfsdump/xfsdump.destdir.diff.gz
-drwxr-xr-x   2 root root      4096 2009-07-15 04:39 ./source/ap/zsh
--rw-r--r--   1 root root       140 2007-04-10 01:12 ./source/ap/zsh/doinst.sh.gz
--rw-r--r--   1 root root       962 2002-02-14 08:13 ./source/ap/zsh/slack-desc
--rw-r--r--   1 root root       560 2009-07-15 04:38 ./source/ap/zsh/zsh-4.3.10-add_new_pkg_completion.diff.gz
--rw-r--r--   1 root root   2533240 2009-07-15 04:33 ./source/ap/zsh/zsh-4.3.10-doc.tar.xz
--rw-r--r--   1 root root   2302728 2009-07-15 04:34 ./source/ap/zsh/zsh-4.3.10.tar.xz
--rwxr-xr-x   1 root root      3391 2009-07-16 00:05 ./source/ap/zsh/zsh.SlackBuild
-drwxr-xr-x  39 root root      4096 2010-05-18 06:45 ./source/d
-drwxr-xr-x   2 root root      4096 2010-01-12 20:09 ./source/d/autoconf
--rw-r--r--   1 root root   1132092 2009-11-21 14:51 ./source/d/autoconf/autoconf-2.65.tar.xz
--rw-r--r--   1 root root       256 2009-11-21 14:51 ./source/d/autoconf/autoconf-2.65.tar.xz.sig
--rwxr-xr-x   1 root root      2522 2010-01-12 20:10 ./source/d/autoconf/autoconf.SlackBuild
--rw-r--r--   1 root root       339 2001-05-30 01:40 ./source/d/autoconf/doinst.sh.gz
--rw-r--r--   1 root root      1090 2002-03-23 22:38 ./source/d/autoconf/slack-desc
-drwxr-xr-x   2 root root      4096 2010-01-12 20:12 ./source/d/automake
--rw-r--r--   1 root root    934172 2009-12-08 21:43 ./source/d/automake/automake-1.11.1.tar.xz
--rwxr-xr-x   1 root root      2852 2009-12-10 04:17 ./source/d/automake/automake.SlackBuild
--rw-r--r--   1 root root       348 2001-05-30 01:49 ./source/d/automake/doinst.sh.gz
--rw-r--r--   1 root root      1086 2002-03-23 22:39 ./source/d/automake/slack-desc
-drwxr-xr-x   2 root root      4096 2010-04-25 21:41 ./source/d/binutils
--rw-r--r--   1 root root       248 2010-04-13 13:33 ./source/d/binutils/binutils-2.20.51.0.8.tar.sign
--rw-r--r--   1 root root  11957216 2010-04-13 13:33 ./source/d/binutils/binutils-2.20.51.0.8.tar.xz
--rwxr-xr-x   1 root root      4653 2010-04-25 21:49 ./source/d/binutils/binutils.SlackBuild
--rw-r--r--   1 root root     16092 2010-04-13 22:23 ./source/d/binutils/release.binutils-2.20.51.0.8
--rw-r--r--   1 root root       902 2002-03-22 21:41 ./source/d/binutils/slack-desc
-drwxr-xr-x   2 root root      4096 2010-04-27 14:25 ./source/d/bison
--rw-r--r--   1 root root   1616117 2010-03-20 19:18 ./source/d/bison/bison-2.4.2.tar.bz2
--rw-r--r--   1 root root        65 2010-03-20 19:18 ./source/d/bison/bison-2.4.2.tar.bz2.sig
--rwxr-xr-x   1 root root      2894 2010-04-27 14:26 ./source/d/bison/bison.SlackBuild
--rw-r--r--   1 root root       927 2002-03-23 22:41 ./source/d/bison/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/d/ccache
--rw-r--r--   1 root root     86363 2004-09-13 20:14 ./source/d/ccache/ccache-2.4.tar.gz
--rwxr-xr-x   1 root root      2171 2009-05-19 20:05 ./source/d/ccache/ccache.SlackBuild
--rw-r--r--   1 root root       771 2003-03-18 06:44 ./source/d/ccache/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-03 07:00 ./source/d/clisp
--rw-r--r--   1 root root   7885098 2009-07-28 18:04 ./source/d/clisp/clisp-2.48.tar.bz2
--rw-r--r--   1 root root        72 2009-07-28 18:04 ./source/d/clisp/clisp-2.48.tar.bz2.sig
--rwxr-xr-x   1 root root      5799 2010-05-03 07:01 ./source/d/clisp/clisp.SlackBuild
--rw-r--r--   1 root root    898945 2008-09-11 09:39 ./source/d/clisp/ffcall-20080704cvs.tar.bz2
--rw-r--r--   1 root root    264500 2009-12-11 14:04 ./source/d/clisp/libsigsegv-2.8.tar.xz
--rw-r--r--   1 root root      1121 2003-07-17 21:01 ./source/d/clisp/slack-desc
--rwxr-xr-x   1 root root       242 2008-09-11 11:59 ./source/d/clisp/source.download
-drwxr-xr-x   2 root root      4096 2010-04-16 18:06 ./source/d/cmake
--rw-r--r--   1 root root   2525408 2010-04-06 18:37 ./source/d/cmake/cmake-2.8.1.tar.xz
--rwxr-xr-x   1 root root      3475 2010-04-16 18:31 ./source/d/cmake/cmake.SlackBuild
--rw-r--r--   1 root root       852 2008-04-09 20:37 ./source/d/cmake/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-03 07:14 ./source/d/cscope
--rw-r--r--   1 root root    361214 2009-04-30 20:14 ./source/d/cscope/cscope-15.7a.tar.bz2
--rwxr-xr-x   1 root root      2952 2010-05-03 07:16 ./source/d/cscope/cscope.SlackBuild
--rw-r--r--   1 root root       805 2003-08-20 00:37 ./source/d/cscope/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/d/cvs
--rw-r--r--   1 root root   2942652 2008-05-08 04:58 ./source/d/cvs/cvs-1.11.23.tar.bz2
--rw-r--r--   1 root root        65 2008-05-08 04:58 ./source/d/cvs/cvs-1.11.23.tar.bz2.sig
--rwxr-xr-x   1 root root      2850 2009-05-19 20:05 ./source/d/cvs/cvs.SlackBuild
--rw-r--r--   1 root root       992 2002-02-23 03:00 ./source/d/cvs/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-23 00:41 ./source/d/dev86
--rw-r--r--   1 root root    703028 2007-10-16 12:48 ./source/d/dev86/Dev86src-0.16.17.tar.gz
--rw-r--r--   1 root root       408 2008-03-28 23:59 ./source/d/dev86/README
--rw-r--r--   1 root root       361 2008-09-23 19:43 ./source/d/dev86/dev86-x86_64.noelks.patch.gz
--rw-r--r--   1 root root       342 2008-09-22 21:52 ./source/d/dev86/dev86-x86_64.patch.gz
--rwxr-xr-x   1 root root      3352 2009-05-23 00:41 ./source/d/dev86/dev86.SlackBuild
--rw-r--r--   1 root root       312 2008-03-29 05:05 ./source/d/dev86/dev86.info
--rw-r--r--   1 root root       490 2008-09-18 05:36 ./source/d/dev86/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/d/distcc
--rw-r--r--   1 root root    341601 2004-12-22 00:09 ./source/d/distcc/distcc-2.18.3.tar.bz2
--rw-r--r--   1 root root       189 2004-12-22 00:09 ./source/d/distcc/distcc-2.18.3.tar.bz2.asc
--rwxr-xr-x   1 root root      2645 2009-05-19 20:05 ./source/d/distcc/distcc.SlackBuild
--rw-r--r--   1 root root       940 2003-02-19 22:05 ./source/d/distcc/slack-desc
-drwxr-xr-x   2 root root      4096 2010-02-23 21:35 ./source/d/doxygen
--rw-r--r--   1 root root   2577476 2010-02-21 10:58 ./source/d/doxygen/doxygen-1.6.3.src.tar.xz
--rwxr-xr-x   1 root root      3332 2010-02-23 21:36 ./source/d/doxygen/doxygen.SlackBuild
--rw-r--r--   1 root root       969 2008-02-11 03:44 ./source/d/doxygen/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/d/flex
--rw-r--r--   1 root root   1256501 2008-02-26 21:40 ./source/d/flex/flex-2.5.35.tar.bz2
--rwxr-xr-x   1 root root      3290 2009-05-19 20:05 ./source/d/flex/flex.SlackBuild
--rw-r--r--   1 root root       786 2006-09-20 03:05 ./source/d/flex/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-12 03:20 ./source/d/gcc
--rw-r--r--   1 root root   1377431 2007-07-27 21:07 ./source/d/gcc/ecj-4.3.jar
--rw-r--r--   1 root root  48815220 2010-04-29 12:03 ./source/d/gcc/gcc-4.4.4.tar.xz
--rw-r--r--   1 root root       522 2009-01-29 07:18 ./source/d/gcc/gcc-no_fixincludes.diff.gz
--rwxr-xr-x   1 root root     22274 2010-05-12 03:00 ./source/d/gcc/gcc.SlackBuild
--rw-r--r--   1 root root       756 2002-02-21 23:00 ./source/d/gcc/slack-desc.gcc
--rw-r--r--   1 root root       753 2002-02-21 23:00 ./source/d/gcc/slack-desc.gcc-g++
--rw-r--r--   1 root root      1231 2007-11-08 22:00 ./source/d/gcc/slack-desc.gcc-gfortran
--rw-r--r--   1 root root       843 2006-07-30 03:26 ./source/d/gcc/slack-desc.gcc-gnat
--rw-r--r--   1 root root       817 2006-07-30 03:26 ./source/d/gcc/slack-desc.gcc-java
--rw-r--r--   1 root root       962 2006-07-30 03:27 ./source/d/gcc/slack-desc.gcc-objc
-drwxr-xr-x   2 root root      4096 2010-04-29 03:37 ./source/d/gdb
--rw-r--r--   1 root root  13575556 2010-03-18 21:27 ./source/d/gdb/gdb-7.1.tar.xz
--rwxr-xr-x   1 root root      3783 2010-04-29 04:03 ./source/d/gdb/gdb.SlackBuild
--rw-r--r--   1 root root      1211 2008-02-11 03:44 ./source/d/gdb/slack-desc
-drwxr-xr-x   2 root root      4096 2010-04-29 01:53 ./source/d/git
--rw-r--r--   1 root root       248 2010-04-24 02:38 ./source/d/git/git-1.7.1.tar.sign
--rw-r--r--   1 root root   2224728 2010-04-24 02:38 ./source/d/git/git-1.7.1.tar.xz
--rwxr-xr-x   1 root root      4738 2010-01-28 21:26 ./source/d/git/git.SlackBuild
--rw-r--r--   1 root root       851 2009-05-30 01:25 ./source/d/git/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/d/gperf
--rw-r--r--   1 root root    708380 2007-05-08 16:14 ./source/d/gperf/gperf-3.0.3.tar.bz2
--rwxr-xr-x   1 root root      3061 2009-05-19 20:05 ./source/d/gperf/gperf.SlackBuild
--rw-r--r--   1 root root      1018 2007-02-14 20:50 ./source/d/gperf/slack-desc
-drwxr-xr-x   2 root root      4096 2009-08-10 23:18 ./source/d/guile
--rw-r--r--   1 root root   2303124 2009-07-05 20:52 ./source/d/guile/guile-1.8.7.tar.xz
--rwxr-xr-x   1 root root      3359 2010-02-24 02:42 ./source/d/guile/guile.SlackBuild
--rw-r--r--   1 root root       894 2008-02-11 03:44 ./source/d/guile/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/d/indent
--rw-r--r--   1 root root    531879 2009-03-04 04:05 ./source/d/indent/indent-2.2.10.tar.bz2
--rwxr-xr-x   1 root root      3283 2009-05-19 20:05 ./source/d/indent/indent.SlackBuild
--rw-r--r--   1 root root       889 2009-03-04 04:05 ./source/d/indent/slack-desc
-drwxr-xr-x   2 root root      4096 2010-04-28 14:35 ./source/d/intltool
--rw-r--r--   1 root root    140340 2009-03-14 19:25 ./source/d/intltool/intltool-0.40.6.tar.bz2
--rwxr-xr-x   1 root root      3802 2010-04-30 03:00 ./source/d/intltool/intltool.SlackBuild
--rw-r--r--   1 root root       692 2008-09-18 04:58 ./source/d/intltool/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-29 19:19 ./source/d/kernel-headers
--rw-r--r--   1 root root       797 2003-09-04 03:56 ./source/d/kernel-headers/slack-desc
-drwxr-xr-x   2 root root      4096 2010-02-07 00:15 ./source/d/libtool
--rw-r--r--   1 root root       385 2009-05-30 01:28 ./source/d/libtool/doinst.sh.gz
--rw-r--r--   1 root root    739260 2009-11-17 14:03 ./source/d/libtool/libtool-2.2.6b.tar.xz
--rwxr-xr-x   1 root root      3089 2010-05-10 01:02 ./source/d/libtool/libtool.SlackBuild
--rw-r--r--   1 root root       499 2010-02-07 00:13 ./source/d/libtool/libtool.no.moved.warning.diff.gz
--rw-r--r--   1 root root       958 2009-05-30 01:28 ./source/d/libtool/slack-desc
-drwxr-xr-x   2 root root      4096 2010-04-27 16:17 ./source/d/m4
--rw-r--r--   1 root root    930092 2010-02-25 13:04 ./source/d/m4/m4-1.4.14.tar.xz
--rwxr-xr-x   1 root root      3729 2010-04-27 16:18 ./source/d/m4/m4.SlackBuild
--rw-r--r--   1 root root       928 2008-10-15 04:26 ./source/d/m4/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/d/make
--rw-r--r--   1 root root   1151445 2006-04-01 06:48 ./source/d/make/make-3.81.tar.bz2
--rw-r--r--   1 root root        65 2006-04-01 06:49 ./source/d/make/make-3.81.tar.bz2.sig
--rwxr-xr-x   1 root root      2696 2009-05-19 20:05 ./source/d/make/make.SlackBuild
--rw-r--r--   1 root root       923 2002-03-23 22:51 ./source/d/make/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-18 06:20 ./source/d/mercurial
--rw-r--r--   1 root root       279 2010-05-18 06:20 ./source/d/mercurial/doinst.sh.gz
--rw-r--r--   1 root root   1090712 2010-05-01 21:03 ./source/d/mercurial/mercurial-1.5.2.tar.xz
--rwxr-xr-x   1 root root      3734 2010-05-18 06:37 ./source/d/mercurial/mercurial.SlackBuild
--rw-r--r--   1 root root      1253 2006-05-14 00:35 ./source/d/mercurial/slack-desc
-drwxr-xr-x   2 root root      4096 2010-01-19 19:55 ./source/d/nasm
--rw-r--r--   1 root root    779934 2009-07-20 05:22 ./source/d/nasm/nasm-2.07.tar.bz2
--rwxr-xr-x   1 root root      2699 2010-01-19 19:56 ./source/d/nasm/nasm.SlackBuild
--rw-r--r--   1 root root       765 2002-05-28 01:27 ./source/d/nasm/slack-desc
-drwxr-xr-x   2 root root      4096 2010-02-12 00:09 ./source/d/oprofile
--rw-r--r--   1 root root    788892 2009-11-24 16:34 ./source/d/oprofile/oprofile-0.9.6.tar.xz
--rwxr-xr-x   1 root root      4153 2010-04-25 21:50 ./source/d/oprofile/oprofile.SlackBuild
--rw-r--r--   1 root root     14520 2009-06-29 10:07 ./source/d/oprofile/oprofile.qt4.diff.gz
--rw-r--r--   1 root root       965 2003-09-08 04:40 ./source/d/oprofile/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/d/p2c
--rw-r--r--   1 root root       409 2007-06-02 17:34 ./source/d/p2c/_p2c.tar.gz
--rw-r--r--   1 root root    423399 1996-07-04 13:29 ./source/d/p2c/p2c-1.21alpha2.tar.gz
--rwxr-xr-x   1 root root      4107 2009-05-19 20:05 ./source/d/p2c/p2c.SlackBuild
--rw-r--r--   1 root root       268 2007-06-02 17:54 ./source/d/p2c/p2c.examples.diff.gz
--rw-r--r--   1 root root      4450 2005-05-05 14:47 ./source/d/p2c/p2c_1.21alpha2-2.1.diff.gz
--rw-r--r--   1 root root       168 2008-10-31 22:43 ./source/d/p2c/p2c_time.diff.gz
--rw-r--r--   1 root root      1000 2002-03-23 22:52 ./source/d/p2c/slack-desc
-drwxr-xr-x   2 root root      4096 2009-10-02 19:15 ./source/d/perl
--rw-r--r--   1 root root    129065 2009-09-16 18:37 ./source/d/perl/DBD-mysql-4.013.tar.gz
--rw-r--r--   1 root root    510309 2009-06-08 10:29 ./source/d/perl/DBI-1.609.tar.gz
--rw-r--r--   1 root root     97180 2009-08-14 19:45 ./source/d/perl/URI-1.40.tar.gz
--rw-r--r--   1 root root    230002 2007-11-20 14:35 ./source/d/perl/XML-Parser-2.36.tar.gz
--rw-r--r--   1 root root     71129 2007-08-15 10:39 ./source/d/perl/XML-Simple-2.18.tar.gz
--rw-r--r--   1 root root   8839364 2009-08-23 14:21 ./source/d/perl/perl-5.10.1.tar.xz
--rwxr-xr-x   1 root root      8611 2009-10-02 19:39 ./source/d/perl/perl.SlackBuild
--rw-r--r--   1 root root       606 2008-09-21 00:04 ./source/d/perl/perl.configure.multilib.patch.gz
--rw-r--r--   1 root root       971 2002-07-23 05:23 ./source/d/perl/slack-desc
-drwxr-xr-x   3 root root      4096 2009-06-06 21:40 ./source/d/pkg-config
--rw-r--r--   1 root root       143 2008-04-09 21:47 ./source/d/pkg-config/doinst.sh.gz
--rw-r--r--   1 root root    749443 2008-01-16 22:54 ./source/d/pkg-config/pkg-config-0.23.tar.bz2
--rwxr-xr-x   1 root root      3092 2009-06-06 21:18 ./source/d/pkg-config/pkg-config.SlackBuild
-drwxr-xr-x   2 root root      4096 2006-08-20 04:13 ./source/d/pkg-config/scripts
--rwxr-xr-x   1 root root       194 2007-05-24 05:41 ./source/d/pkg-config/scripts/pkgconfig.csh
--rwxr-xr-x   1 root root       204 2007-05-24 05:41 ./source/d/pkg-config/scripts/pkgconfig.sh
--rw-r--r--   1 root root       907 2008-02-11 03:44 ./source/d/pkg-config/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/d/pmake
--rw-r--r--   1 root root    264383 2005-07-07 09:32 ./source/d/pmake/pmake-1.111.tar.gz
--rwxr-xr-x   1 root root      3801 2009-05-19 20:05 ./source/d/pmake/pmake.SlackBuild
--rw-r--r--   1 root root       265 2007-03-24 23:38 ./source/d/pmake/pmake.strerror.strdup.diff.gz
--rw-r--r--   1 root root     38071 2007-02-09 20:45 ./source/d/pmake/pmake.txt.gz
--rw-r--r--   1 root root     26675 2005-07-07 09:32 ./source/d/pmake/pmake_1.111-1.diff.gz
--rw-r--r--   1 root root       795 2007-02-09 21:04 ./source/d/pmake/slack-desc
-drwxr-xr-x   2 root root      4096 2009-12-06 01:57 ./source/d/python
--rw-r--r--   1 root root   9048464 2009-10-26 02:11 ./source/d/python/Python-2.6.4.tar.xz
--rw-r--r--   1 root root   1307820 2009-10-30 06:44 ./source/d/python/python-2.6.4-docs-text.tar.xz
--rwxr-xr-x   1 root root      4668 2009-12-06 01:57 ./source/d/python/python.SlackBuild
--rw-r--r--   1 root root       477 2009-04-29 20:18 ./source/d/python/python.pure64.diff.gz
--rw-r--r--   1 root root       325 2009-06-09 19:23 ./source/d/python/python.readline.set_pre_input_hook.diff.gz
--rw-r--r--   1 root root      2164 2009-04-29 20:12 ./source/d/python/python.x86_64.diff.gz
--rw-r--r--   1 root root       895 2002-03-23 22:54 ./source/d/python/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/d/rcs
--rw-r--r--   1 root root     10982 2007-06-27 22:53 ./source/d/rcs/_rcs.tar.gz
--rw-r--r--   1 root root       270 1995-08-12 19:26 ./source/d/rcs/rcs-5.7.diff.gz
--rw-r--r--   1 root root    282413 1995-06-16 14:53 ./source/d/rcs/rcs-5.7.tar.gz
--rwxr-xr-x   1 root root      3037 2010-01-25 22:14 ./source/d/rcs/rcs.SlackBuild
--rw-r--r--   1 root root       776 2002-03-23 22:58 ./source/d/rcs/slack-desc
-drwxr-xr-x   2 root root      4096 2010-04-25 23:01 ./source/d/ruby
--rw-r--r--   1 root root   5533480 2010-01-10 11:45 ./source/d/ruby/ruby-1.9.1-p378.tar.xz
--rwxr-xr-x   1 root root      4276 2010-04-25 23:00 ./source/d/ruby/ruby.SlackBuild
--rw-r--r--   1 root root       865 2006-07-20 06:49 ./source/d/ruby/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/d/strace
--rw-r--r--   1 root root      1007 2002-04-06 20:28 ./source/d/strace/slack-desc
--rw-r--r--   1 root root    480973 2008-08-29 00:40 ./source/d/strace/strace-4.5.18.tar.bz2
--rwxr-xr-x   1 root root      2446 2009-05-19 20:05 ./source/d/strace/strace.SlackBuild
-drwxr-xr-x   2 root root      4096 2010-04-30 02:09 ./source/d/subversion
--rwxr-xr-x   1 root root       185 2009-05-30 01:45 ./source/d/subversion/get-svn-book.sh
--rw-r--r--   1 root root      1058 2010-04-30 02:11 ./source/d/subversion/slack-desc
--rw-r--r--   1 root root   4426536 2010-04-20 15:30 ./source/d/subversion/subversion-1.6.11.tar.xz
--rwxr-xr-x   1 root root      5452 2010-02-20 19:24 ./source/d/subversion/subversion.SlackBuild
--rw-r--r--   1 root root    415029 2010-04-29 06:03 ./source/d/subversion/svn-book-html.tar.bz2
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/d/swig
--rw-r--r--   1 root root      1018 2009-03-08 02:10 ./source/d/swig/slack-desc
--rw-r--r--   1 root root   3888548 2009-01-31 23:59 ./source/d/swig/swig-1.3.38.tar.bz2
--rwxr-xr-x   1 root root      3231 2009-05-19 20:05 ./source/d/swig/swig.SlackBuild
--rw-r--r--   1 root root        61 2009-02-23 00:35 ./source/d/swig/swig.url
-drwxr-xr-x   3 root root      4096 2010-03-16 04:13 ./source/e
-drwxr-xr-x   2 root root      4096 2010-05-08 20:44 ./source/e/emacs
--rw-r--r--   1 root root       312 2008-04-06 03:10 ./source/e/emacs/doinst.sh.gz
--rw-r--r--   1 root root  29214952 2010-05-08 03:56 ./source/e/emacs/emacs-23.2.tar.xz
--rwxr-xr-x   1 root root      4899 2010-05-08 20:44 ./source/e/emacs/emacs.SlackBuild
--rw-r--r--   1 root root       267 2008-04-06 03:18 ./source/e/emacs/emacs.info
--rw-r--r--   1 root root       549 2008-04-06 03:11 ./source/e/emacs/slack-desc
-drwxr-xr-x   2 root root      4096 2009-03-16 21:18 ./source/f
--rw-r--r--   1 root root       963 2002-02-25 21:44 ./source/f/slack-desc.linux-faqs
--rw-r--r--   1 root root       804 2002-02-25 21:55 ./source/f/slack-desc.linux-howtos
-drwxr-xr-x   4 root root      4096 2010-01-20 21:17 ./source/installer
--rw-r--r--   1 root root   1987727 2009-12-12 21:25 ./source/installer/busybox-1.15.3.tar.bz2
--rw-r--r--   1 root root     23985 2009-12-31 02:02 ./source/installer/busybox-dot-config
--rw-r--r--   1 root root       275 2009-12-31 20:04 ./source/installer/busybox.2.6.32.2.diff.gz
--rwxr-xr-x   1 root root      2051 2009-12-31 20:06 ./source/installer/busybox.SlackBuild
-drwxr-xr-x   2 root root      4096 2010-01-20 15:49 ./source/installer/dhcpcd
--rw-r--r--   1 root root       311 2009-03-06 20:55 ./source/installer/dhcpcd/config.h.diff.gz
--rw-r--r--   1 root root     45030 2008-08-26 03:12 ./source/installer/dhcpcd/dhcpcd-3.2.3.tar.bz2
--rw-r--r--   1 root root       391 2009-03-07 01:24 ./source/installer/dhcpcd/dhcpcd.sh.diff.gz
-drwxr-xr-x   2 root root      4096 2008-03-13 13:43 ./source/installer/dropbear
--rw-r--r--   1 root root       372 2008-03-13 13:43 ./source/installer/dropbear/doinst.sh
--rw-r--r--   1 root root   1589729 2008-03-13 13:43 ./source/installer/dropbear/dropbear-0.50.tar.bz2
--rwxr-xr--   1 root root      4332 2008-03-13 13:43 ./source/installer/dropbear/dropbear.Slackbuild
--rw-r--r--   1 root root       414 2008-03-13 13:43 ./source/installer/dropbear/dropbear.xauth.patch
--rw-r--r--   1 root root       582 2008-03-13 13:43 ./source/installer/dropbear/dropbear_dbclientpath.patch
--rw-r--r--   1 root root      1887 2008-03-13 13:43 ./source/installer/dropbear/dropbear_emptypass.patch
--rw-r--r--   1 root root      1795 2008-03-13 13:43 ./source/installer/dropbear/rc.dropbear.new
--rw-r--r--   1 root root       890 2008-03-13 13:43 ./source/installer/dropbear/slack-desc
-drwxr-xr-x   6 root root      4096 2010-05-13 07:22 ./source/k
--rw-r--r--   1 root root      1208 2010-05-13 07:23 ./source/k/README.TXT
--rw-r--r--   1 root root      2712 2010-05-13 07:23 ./source/k/README_SPEAKUP_PATCH.TXT
--rw-r--r--   1 root root    103655 2010-05-13 03:00 ./source/k/config-generic-2.6.33.4
--rw-r--r--   1 root root    103629 2010-05-13 04:07 ./source/k/config-huge-2.6.33.4
--rw-r--r--   1 root root    104113 2010-05-13 04:16 ./source/k/config-speakup-2.6.33.4
-drwxr-xr-x   2 root root      4096 2010-05-13 03:31 ./source/k/kernel-firmware
--rwxr-xr-x   1 root root      1679 2010-05-13 03:31 ./source/k/kernel-firmware/kernel-firmware.SlackBuild
--rw-r--r--   1 root root       344 2008-10-16 03:59 ./source/k/kernel-firmware/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-13 03:31 ./source/k/kernel-generic
--rwxr-xr-x   1 root root      2909 2010-05-13 03:31 ./source/k/kernel-generic/kernel-generic.SlackBuild
--rw-r--r--   1 root root      1091 2009-06-18 17:37 ./source/k/kernel-generic/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-13 04:13 ./source/k/kernel-huge
--rwxr-xr-x   1 root root      2906 2010-05-13 04:13 ./source/k/kernel-huge/kernel-huge.SlackBuild
--rw-r--r--   1 root root      1100 2009-06-18 17:36 ./source/k/kernel-huge/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-13 03:31 ./source/k/kernel-modules
--rwxr-xr-x   1 root root      2872 2010-05-13 03:31 ./source/k/kernel-modules/kernel-modules.SlackBuild
--rwxr-xr-x   1 root root     35406 2009-06-04 22:36 ./source/k/kernel-modules/rc.modules.new
--rw-r--r--   1 root root       985 2009-06-18 17:37 ./source/k/kernel-modules/slack-desc
--rw-r--r--   1 root root       248 2010-05-12 22:09 ./source/k/linux-2.6.33.4.tar.sign
--rw-r--r--   1 root root  54296520 2010-05-12 22:09 ./source/k/linux-2.6.33.4.tar.xz
--rw-r--r--   1 root root    107428 2009-12-31 01:15 ./source/k/speakup-2009-12-30.tar.xz
-drwxr-xr-x  38 root root      4096 2010-05-06 07:09 ./source/kde
--rwxr-xr-x   1 root root      1853 2010-03-25 10:56 ./source/kde/KDE.SlackBuild
--rw-r--r--   1 root root      1598 2010-04-30 09:08 ./source/kde/KDE.options
--rwxr-xr-x   1 root root      1345 2010-05-04 21:56 ./source/kde/KDE_extra.SlackBuild
-drwxr-xr-x   2 root root      4096 2009-11-03 22:46 ./source/kde/amarok
--rwxr-xr-x   1 root root      3561 2009-11-03 22:46 ./source/kde/amarok/amarok.SlackBuild
--rw-r--r--   1 root root       118 2008-05-17 02:40 ./source/kde/amarok/doinst.sh.gz
--rw-r--r--   1 root root        14 2010-05-04 07:08 ./source/kde/amarok/local.options
--rw-r--r--   1 root root       779 2008-05-26 06:10 ./source/kde/amarok/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-04 00:31 ./source/kde/guidance-power-manager
--rwxr-xr-x   1 root root      2768 2010-04-30 11:00 ./source/kde/guidance-power-manager/guidance-power-manager.SlackBuild
--rw-r--r--   1 root root        14 2010-04-30 11:00 ./source/kde/guidance-power-manager/local.options
--rw-r--r--   1 root root       945 2010-05-04 01:42 ./source/kde/guidance-power-manager/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-04 00:31 ./source/kde/k3b
--rw-r--r--   1 root root       118 2008-05-17 02:40 ./source/kde/k3b/doinst.sh.gz
--rwxr-xr-x   1 root root      2876 2010-04-18 16:08 ./source/kde/k3b/k3b.SlackBuild
--rw-r--r--   1 root root        23 2010-04-30 10:59 ./source/kde/k3b/local.options
--rw-r--r--   1 root root       836 2004-06-15 19:08 ./source/kde/k3b/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-04 00:31 ./source/kde/kaudiocreator
--rw-r--r--   1 root root       118 2008-05-17 02:40 ./source/kde/kaudiocreator/doinst.sh.gz
--rwxr-xr-x   1 root root      2704 2010-04-30 11:01 ./source/kde/kaudiocreator/kaudiocreator.SlackBuild
--rw-r--r--   1 root root        25 2010-04-30 11:01 ./source/kde/kaudiocreator/local.options
--rw-r--r--   1 root root       752 2009-12-16 21:08 ./source/kde/kaudiocreator/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-04 00:31 ./source/kde/kdeaccessibility
--rw-r--r--   1 root root       118 2007-12-21 07:15 ./source/kde/kdeaccessibility/doinst.sh.gz
--rwxr-xr-x   1 root root      2935 2009-09-26 04:26 ./source/kde/kdeaccessibility/kdeaccessibility.SlackBuild
--rw-r--r--   1 root root       881 2010-05-04 00:25 ./source/kde/kdeaccessibility/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-04 01:55 ./source/kde/kdeadmin
--rw-r--r--   1 root root       118 2007-12-21 07:36 ./source/kde/kdeadmin/doinst.sh.gz
--rwxr-xr-x   1 root root      3028 2009-09-26 03:59 ./source/kde/kdeadmin/kdeadmin.SlackBuild
--rw-r--r--   1 root root      1235 2010-05-04 01:55 ./source/kde/kdeadmin/knetworkconf.diff.gz
--rw-r--r--   1 root root       639 2010-05-04 00:25 ./source/kde/kdeadmin/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-04 00:31 ./source/kde/kdeartwork
--rw-r--r--   1 root root       118 2007-12-21 07:45 ./source/kde/kdeartwork/doinst.sh.gz
--rwxr-xr-x   1 root root      2938 2009-09-26 04:07 ./source/kde/kdeartwork/kdeartwork.SlackBuild
--rw-r--r--   1 root root       689 2010-05-04 00:25 ./source/kde/kdeartwork/slack-desc
-drwxr-xr-x   4 root root      4096 2010-05-04 00:31 ./source/kde/kdebase
-drwxr-xr-x   2 root root      4096 2010-05-04 00:31 ./source/kde/kdebase-runtime
--rw-r--r--   1 root root       118 2007-12-21 04:58 ./source/kde/kdebase-runtime/doinst.sh.gz
--rwxr-xr-x   1 root root      3078 2010-03-01 23:05 ./source/kde/kdebase-runtime/kdebase-runtime.SlackBuild
--rw-r--r--   1 root root       757 2010-05-04 00:26 ./source/kde/kdebase-runtime/slack-desc
-drwxr-xr-x   4 root root      4096 2010-05-04 04:59 ./source/kde/kdebase-workspace
-drwxr-xr-x   2 root root      4096 2009-08-31 03:24 ./source/kde/kdebase-workspace/config
--rw-r--r--   1 root root      2551 2007-12-21 05:56 ./source/kde/kdebase-workspace/config/Xsession
--rw-r--r--   1 root root      1844 2007-12-21 05:53 ./source/kde/kdebase-workspace/config/Xsession.orig
--rw-r--r--   1 root root       361 2007-12-21 06:10 ./source/kde/kdebase-workspace/doinst.sh.gz
--rw-r--r--   1 root root      1551 2010-01-06 20:13 ./source/kde/kdebase-workspace/kcmshell_root_privilege.patch
--rwxr-xr-x   1 root root      4429 2010-05-04 01:49 ./source/kde/kdebase-workspace/kdebase-workspace.SlackBuild
--rw-r--r--   1 root root       239 2010-05-04 03:12 ./source/kde/kdebase-workspace/kdebase-workspace.kdm.server.timeout.diff.gz
--rw-r--r--   1 root root       438 2010-05-04 00:26 ./source/kde/kdebase-workspace/slack-desc
-drwxr-xr-x   2 root root      4096 2009-08-31 03:24 ./source/kde/kdebase-workspace/xinit
--rwxr-xr-x   1 root root       534 2010-03-31 17:34 ./source/kde/kdebase-workspace/xinit/xinitrc.kde
-drwxr-xr-x   2 root root      4096 2009-08-31 03:24 ./source/kde/kdebase/config
--rw-r--r--   1 root root        69 2006-08-23 21:34 ./source/kde/kdebase/config/kdeglobals
--rw-r--r--   1 root root       124 2009-01-21 23:18 ./source/kde/kdebase/doinst.sh.gz
--rwxr-xr-x   1 root root      3819 2010-02-05 13:25 ./source/kde/kdebase/kdebase.SlackBuild
--rw-r--r--   1 root root       487 2010-01-07 20:39 ./source/kde/kdebase/module_manager_include.diff
-drwxr-xr-x   2 root root      4096 2009-08-31 03:24 ./source/kde/kdebase/profile.d
--rwxr-xr-x   1 root root       274 2008-07-11 02:34 ./source/kde/kdebase/profile.d/kde.csh
--rwxr-xr-x   1 root root       261 2008-07-11 02:33 ./source/kde/kdebase/profile.d/kde.sh
--rw-r--r--   1 root root       696 2010-05-04 00:26 ./source/kde/kdebase/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-14 18:45 ./source/kde/kdebindings
--rw-r--r--   1 root root      1819 2009-12-16 01:49 ./source/kde/kdebindings/kdebindings-len-ptr-rfloat.diff.gz
--rw-r--r--   1 root root      1812 2009-12-16 01:49 ./source/kde/kdebindings/kdebindings-ruby-env.h.diff.gz
--rw-r--r--   1 root root       307 2009-12-16 01:49 ./source/kde/kdebindings/kdebindings-rubyconfig.h.diff.gz
--rwxr-xr-x   1 root root      3508 2010-05-14 18:45 ./source/kde/kdebindings/kdebindings.SlackBuild
--rw-r--r--   1 root root         8 2010-05-14 18:45 ./source/kde/kdebindings/local.options
--rw-r--r--   1 root root       975 2010-05-04 00:27 ./source/kde/kdebindings/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-04 00:31 ./source/kde/kdeedu
--rw-r--r--   1 root root       118 2007-12-21 12:20 ./source/kde/kdeedu/doinst.sh.gz
--rwxr-xr-x   1 root root      2880 2009-09-26 05:20 ./source/kde/kdeedu/kdeedu.SlackBuild
--rw-r--r--   1 root root       638 2010-05-04 00:27 ./source/kde/kdeedu/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-04 00:31 ./source/kde/kdegames
--rw-r--r--   1 root root       118 2007-12-21 12:16 ./source/kde/kdegames/doinst.sh.gz
--rwxr-xr-x   1 root root      2894 2009-09-26 05:20 ./source/kde/kdegames/kdegames.SlackBuild
--rw-r--r--   1 root root       646 2010-05-04 00:27 ./source/kde/kdegames/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-18 02:08 ./source/kde/kdegraphics
--rw-r--r--   1 root root       118 2007-12-21 13:11 ./source/kde/kdegraphics/doinst.sh.gz
--rwxr-xr-x   1 root root      3012 2010-05-18 02:10 ./source/kde/kdegraphics/kdegraphics.SlackBuild
--rw-r--r--   1 root root       309 2010-05-18 02:08 ./source/kde/kdegraphics/kdegraphics.gwenview.jpeg8.diff.gz
--rw-r--r--   1 root root         8 2010-05-18 02:09 ./source/kde/kdegraphics/local.options
--rw-r--r--   1 root root       807 2009-12-16 21:14 ./source/kde/kdegraphics/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-04 00:31 ./source/kde/kdelibs
--rw-r--r--   1 root root       142 2007-12-20 04:10 ./source/kde/kdelibs/doinst.sh.gz
--rwxr-xr-x   1 root root      3071 2010-03-30 20:35 ./source/kde/kdelibs/kdelibs.SlackBuild
--rw-r--r--   1 root root       766 2009-10-19 03:46 ./source/kde/kdelibs/kdesu-allow_NOPASS_in_suauth.patch.gz
--rw-r--r--   1 root root       649 2009-12-16 21:15 ./source/kde/kdelibs/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-04 00:31 ./source/kde/kdemultimedia
--rw-r--r--   1 root root       118 2007-12-21 07:19 ./source/kde/kdemultimedia/doinst.sh.gz
--rwxr-xr-x   1 root root      2937 2009-09-26 05:21 ./source/kde/kdemultimedia/kdemultimedia.SlackBuild
--rw-r--r--   1 root root       977 2010-05-04 00:27 ./source/kde/kdemultimedia/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-14 02:56 ./source/kde/kdenetwork
--rw-r--r--   1 root root       118 2007-12-21 07:33 ./source/kde/kdenetwork/doinst.sh.gz
--rwxr-xr-x   1 root root      3045 2010-05-14 02:57 ./source/kde/kdenetwork/kdenetwork.SlackBuild
--rw-r--r--   1 root root      2329 2010-05-14 02:51 ./source/kde/kdenetwork/kget.kde44.CVE-2010-1000-1511.diff.gz
--rw-r--r--   1 root root         8 2010-05-14 02:52 ./source/kde/kdenetwork/local.options
--rw-r--r--   1 root root       692 2010-05-04 00:27 ./source/kde/kdenetwork/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-04 19:59 ./source/kde/kdepim
-drwxr-xr-x   2 root root      4096 2010-05-04 00:31 ./source/kde/kdepim-runtime
--rw-r--r--   1 root root       118 2009-08-31 03:24 ./source/kde/kdepim-runtime/doinst.sh.gz
--rwxr-xr-x   1 root root      2914 2009-09-26 05:21 ./source/kde/kdepim-runtime/kdepim-runtime.SlackBuild
--rw-r--r--   1 root root       972 2010-05-04 00:28 ./source/kde/kdepim-runtime/slack-desc
--rw-r--r--   1 root root       118 2007-12-21 13:41 ./source/kde/kdepim/doinst.sh.gz
--rw-r--r--   1 root root      3880 2010-05-04 18:04 ./source/kde/kdepim/kdepim-4.4.0-install-headers.patch
--rwxr-xr-x   1 root root      3048 2010-05-04 20:00 ./source/kde/kdepim/kdepim.SlackBuild
--rw-r--r--   1 root root       873 2010-05-04 00:28 ./source/kde/kdepim/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-04 05:23 ./source/kde/kdepimlibs
--rwxr-xr-x   1 root root      2897 2009-09-26 04:07 ./source/kde/kdepimlibs/kdepimlibs.SlackBuild
--rw-r--r--   1 root root       735 2010-05-04 00:28 ./source/kde/kdepimlibs/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-04 00:31 ./source/kde/kdeplasma-addons
--rw-r--r--   1 root root       118 2007-12-21 12:17 ./source/kde/kdeplasma-addons/doinst.sh.gz
--rwxr-xr-x   1 root root      2935 2009-09-26 05:21 ./source/kde/kdeplasma-addons/kdeplasma-addons.SlackBuild
--rw-r--r--   1 root root       763 2009-12-16 21:16 ./source/kde/kdeplasma-addons/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-04 00:31 ./source/kde/kdesdk
--rw-r--r--   1 root root       118 2007-12-21 13:10 ./source/kde/kdesdk/doinst.sh.gz
--rwxr-xr-x   1 root root      2872 2009-09-26 05:21 ./source/kde/kdesdk/kdesdk.SlackBuild
--rw-r--r--   1 root root       778 2010-05-04 00:28 ./source/kde/kdesdk/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-04 00:31 ./source/kde/kdetoys
--rw-r--r--   1 root root       118 2007-12-21 12:17 ./source/kde/kdetoys/doinst.sh.gz
--rwxr-xr-x   1 root root      2887 2009-09-26 05:21 ./source/kde/kdetoys/kdetoys.SlackBuild
--rw-r--r--   1 root root       715 2010-05-04 00:29 ./source/kde/kdetoys/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-04 00:31 ./source/kde/kdeutils
--rw-r--r--   1 root root       118 2007-12-21 07:16 ./source/kde/kdeutils/doinst.sh.gz
--rwxr-xr-x   1 root root      2903 2009-11-03 22:44 ./source/kde/kdeutils/kdeutils.SlackBuild
--rw-r--r--   1 root root       786 2010-05-04 00:29 ./source/kde/kdeutils/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-04 00:31 ./source/kde/kdevelop
--rw-r--r--   1 root root       118 2007-12-24 16:27 ./source/kde/kdevelop/doinst.sh.gz
--rwxr-xr-x   1 root root      2905 2010-04-30 11:02 ./source/kde/kdevelop/kdevelop.SlackBuild
--rw-r--r--   1 root root        14 2010-04-30 11:02 ./source/kde/kdevelop/local.options
--rw-r--r--   1 root root       679 2009-12-16 21:21 ./source/kde/kdevelop/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-04 00:31 ./source/kde/kdevplatform
--rw-r--r--   1 root root       118 2007-12-24 16:27 ./source/kde/kdevplatform/doinst.sh.gz
--rwxr-xr-x   1 root root      2915 2010-04-30 11:03 ./source/kde/kdevplatform/kdevplatform.SlackBuild
--rw-r--r--   1 root root        14 2010-04-30 11:02 ./source/kde/kdevplatform/local.options
--rw-r--r--   1 root root       710 2009-01-13 15:04 ./source/kde/kdevplatform/slack-desc
-drwxr-xr-x   3 root root      4096 2010-05-04 00:31 ./source/kde/kdewebdev
--rw-r--r--   1 root root       118 2007-12-21 15:17 ./source/kde/kdewebdev/doinst.sh.gz
--rw-r--r--   1 root root       260 2009-09-03 15:03 ./source/kde/kdewebdev/include-tidy.patch.gz
--rw-r--r--   1 root root       391 2008-12-29 21:48 ./source/kde/kdewebdev/kde4-kdewebdev-findtidy.diff.gz
--rwxr-xr-x   1 root root      3391 2009-09-26 05:21 ./source/kde/kdewebdev/kdewebdev.SlackBuild
--rw-r--r--   1 root root       716 2010-05-04 00:31 ./source/kde/kdewebdev/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-04 04:10 ./source/kde/kdewebdev/tidy
--rwxr-xr-x   1 root root      1682 2009-05-07 03:57 ./source/kde/kdewebdev/tidy/get-tidy-cvs.sh
--rw-r--r--   1 root root    338924 2010-05-04 04:09 ./source/kde/kdewebdev/tidy/tidy-20100503T2309.tar.xz
--rwxr-xr-x   1 root root      3271 2010-05-04 04:09 ./source/kde/kdewebdev/tidy/tidy.SlackBuild
--rwxr-xr-x   1 root root      2907 2010-05-04 04:10 ./source/kde/kdewebdev/tidy/tidy.build
-drwxr-xr-x   2 root root      4096 2010-02-25 18:03 ./source/kde/koffice
--rw-r--r--   1 root root       118 2007-12-24 16:27 ./source/kde/koffice/doinst.sh.gz
--rwxr-xr-x   1 root root      2960 2010-02-25 18:09 ./source/kde/koffice/koffice.SlackBuild
--rw-r--r--   1 root root       267 2010-02-25 18:03 ./source/kde/koffice/koffice.krita.png14.diff.gz
--rw-r--r--   1 root root        22 2010-05-08 19:52 ./source/kde/koffice/local.options
--rw-r--r--   1 root root       951 2007-12-24 16:26 ./source/kde/koffice/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-04 00:31 ./source/kde/konq-plugins
--rwxr-xr-x   1 root root      2900 2009-09-26 05:22 ./source/kde/konq-plugins/konq-plugins.SlackBuild
--rw-r--r--   1 root root        14 2010-04-30 11:03 ./source/kde/konq-plugins/local.options
--rw-r--r--   1 root root       982 2008-11-24 21:25 ./source/kde/konq-plugins/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-04 00:31 ./source/kde/kopete-cryptography
--rw-r--r--   1 root root       118 2009-08-31 03:24 ./source/kde/kopete-cryptography/doinst.sh.gz
--rwxr-xr-x   1 root root      2900 2010-04-30 11:04 ./source/kde/kopete-cryptography/kopete-cryptography.SlackBuild
--rw-r--r--   1 root root        23 2010-04-30 11:03 ./source/kde/kopete-cryptography/local.options
--rw-r--r--   1 root root       810 2009-10-21 00:07 ./source/kde/kopete-cryptography/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-04 00:31 ./source/kde/ktorrent
--rw-r--r--   1 root root       118 2008-05-17 02:40 ./source/kde/ktorrent/doinst.sh.gz
--rwxr-xr-x   1 root root      2898 2009-12-16 22:30 ./source/kde/ktorrent/ktorrent.SlackBuild
--rw-r--r--   1 root root        14 2010-04-30 11:04 ./source/kde/ktorrent/local.options
--rw-r--r--   1 root root      1041 2009-12-16 21:20 ./source/kde/ktorrent/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-04 00:31 ./source/kde/oxygen-icons
--rwxr-xr-x   1 root root      2796 2009-10-21 03:14 ./source/kde/oxygen-icons/oxygen-icons.SlackBuild
--rw-r--r--   1 root root       792 2010-05-04 00:29 ./source/kde/oxygen-icons/slack-desc
-drwxr-xr-x   2 root root      4096 2010-03-24 11:41 ./source/kde/polkit-kde-1
--rw-r--r--   1 root root        33 2010-04-30 09:40 ./source/kde/polkit-kde-1/local.options
--rwxr-xr-x   1 root root      2899 2010-03-27 13:21 ./source/kde/polkit-kde-1/polkit-kde-1.SlackBuild
--rw-r--r--   1 root root       686 2010-05-05 23:45 ./source/kde/polkit-kde-1/slack-desc
-drwxr-xr-x   2 root root      4096 2010-03-24 11:41 ./source/kde/polkit-qt-1
--rw-r--r--   1 root root        33 2010-04-30 09:41 ./source/kde/polkit-qt-1/local.options
--rwxr-xr-x   1 root root      2855 2010-03-27 13:21 ./source/kde/polkit-qt-1/polkit-qt-1.SlackBuild
--rw-r--r--   1 root root       903 2010-05-05 23:45 ./source/kde/polkit-qt-1/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-04 00:31 ./source/kde/skanlite
--rw-r--r--   1 root root       118 2008-05-17 02:40 ./source/kde/skanlite/doinst.sh.gz
--rw-r--r--   1 root root        21 2010-04-30 11:05 ./source/kde/skanlite/local.options
--rwxr-xr-x   1 root root      2818 2010-04-30 11:05 ./source/kde/skanlite/skanlite.SlackBuild
--rw-r--r--   1 root root       666 2009-01-14 00:18 ./source/kde/skanlite/slack-desc
-drwxr-xr-x   3 root root      4096 2010-05-05 18:15 ./source/kde/src
-drwxr-xr-x   2 root root      4096 2010-05-04 06:55 ./source/kde/src/extragear
--rw-r--r--   1 root root   9748862 2010-04-15 22:07 ./source/kde/src/extragear/amarok-2.3.0.90.tar.bz2
--rw-r--r--   1 root root   7954852 2010-03-10 23:27 ./source/kde/src/extragear/amarok-2.3.0.tar.xz
--rw-r--r--   1 root root     77748 2010-04-30 10:54 ./source/kde/src/extragear/guidance-power-manager-4.4.0.tar.xz
--rw-r--r--   1 root root   9571500 2010-04-01 18:57 ./source/kde/src/extragear/k3b-1.91.0.tar.xz
--rw-r--r--   1 root root     61616 2010-04-30 10:51 ./source/kde/src/extragear/kaudiocreator-r1118889.tar.xz
--rw-r--r--   1 root root    995644 2010-02-12 07:11 ./source/kde/src/extragear/konq-plugins-4.4.0.tar.xz
--rw-r--r--   1 root root     73404 2010-02-12 07:11 ./source/kde/src/extragear/kopete-cryptography-1.3.0-kde4.4.0.tar.xz
--rw-r--r--   1 root root   2044036 2010-02-07 11:06 ./source/kde/src/extragear/ktorrent-3.3.4.tar.xz
--rw-r--r--   1 root root   1165884 2010-02-12 07:12 ./source/kde/src/extragear/skanlite-0.4-kde4.4.0.tar.xz
--rw-r--r--   1 root root   4316344 2010-04-30 07:32 ./source/kde/src/kdeaccessibility-4.4.3.tar.xz
--rw-r--r--   1 root root   1201792 2010-04-30 07:32 ./source/kde/src/kdeadmin-4.4.3.tar.xz
--rw-r--r--   1 root root  69121444 2010-04-30 07:33 ./source/kde/src/kdeartwork-4.4.3.tar.xz
--rw-r--r--   1 root root   3721428 2010-04-30 07:32 ./source/kde/src/kdebase-4.4.3.tar.xz
--rw-r--r--   1 root root   6930584 2010-04-30 07:32 ./source/kde/src/kdebase-runtime-4.4.3.tar.xz
--rw-r--r--   1 root root  70296068 2010-04-30 07:31 ./source/kde/src/kdebase-workspace-4.4.3.tar.xz
--rw-r--r--   1 root root   4223380 2010-04-30 07:31 ./source/kde/src/kdebindings-4.4.3.tar.xz
--rw-r--r--   1 root root  52930596 2010-04-30 07:32 ./source/kde/src/kdeedu-4.4.3.tar.xz
--rw-r--r--   1 root root  63724736 2010-04-30 07:33 ./source/kde/src/kdegames-4.4.3.tar.xz
--rw-r--r--   1 root root   3516376 2010-04-30 07:31 ./source/kde/src/kdegraphics-4.4.3.tar.xz
--rw-r--r--   1 root root  12280080 2010-05-05 08:49 ./source/kde/src/kdelibs-4.4.3.tar.xz
--rw-r--r--   1 root root   1299148 2010-04-30 07:31 ./source/kde/src/kdemultimedia-4.4.3.tar.xz
--rw-r--r--   1 root root   7341752 2010-04-30 07:31 ./source/kde/src/kdenetwork-4.4.3.tar.xz
--rw-r--r--   1 root root   8352620 2010-04-30 07:31 ./source/kde/src/kdepim-4.4.3.tar.xz
--rw-r--r--   1 root root    531976 2010-04-30 07:32 ./source/kde/src/kdepim-runtime-4.4.3.tar.xz
--rw-r--r--   1 root root   2098380 2010-04-30 07:31 ./source/kde/src/kdepimlibs-4.4.3.tar.xz
--rw-r--r--   1 root root   1389004 2010-04-30 07:31 ./source/kde/src/kdeplasma-addons-4.4.3.tar.xz
--rw-r--r--   1 root root   4910476 2010-04-30 07:32 ./source/kde/src/kdesdk-4.4.3.tar.xz
--rw-r--r--   1 root root   1173468 2010-04-30 07:32 ./source/kde/src/kdetoys-4.4.3.tar.xz
--rw-r--r--   1 root root   2465848 2010-04-30 07:36 ./source/kde/src/kdeutils-4.4.3.tar.xz
--rw-r--r--   1 root root   3458308 2010-04-28 19:38 ./source/kde/src/kdevelop-4.0.0.tar.xz
--rw-r--r--   1 root root   1261636 2010-04-28 19:38 ./source/kde/src/kdevplatform-1.0.0.tar.xz
--rw-r--r--   1 root root   2042408 2010-04-30 07:37 ./source/kde/src/kdewebdev-4.4.3.tar.xz
--rw-r--r--   1 root root  45992480 2010-03-29 18:35 ./source/kde/src/koffice-2.1.2.tar.xz
--rw-r--r--   1 root root 101250200 2010-04-30 07:32 ./source/kde/src/oxygen-icons-4.4.3.tar.xz
--rw-r--r--   1 root root     39196 2010-04-30 09:40 ./source/kde/src/polkit-kde-1-r1120537.tar.xz
--rw-r--r--   1 root root     61844 2010-04-30 09:34 ./source/kde/src/polkit-qt-1-r1118744.tar.xz
-drwxr-xr-x   4 root root      4096 2010-05-06 07:11 ./source/kdei
-drwxr-xr-x   4 root root      4096 2010-05-06 07:11 ./source/kdei/kde-l10n
--rw-r--r--   1 root root   3440264 2010-04-30 07:36 ./source/kdei/kde-l10n/kde-l10n-ar-4.4.3.tar.bz2
--rw-r--r--   1 root root   2112092 2010-04-30 07:34 ./source/kdei/kde-l10n/kde-l10n-bg-4.4.3.tar.bz2
--rw-r--r--   1 root root   4914654 2010-04-30 07:36 ./source/kdei/kde-l10n/kde-l10n-ca-4.4.3.tar.bz2
--rw-r--r--   1 root root   2385801 2010-04-30 07:36 ./source/kdei/kde-l10n/kde-l10n-ca@valencia-4.4.3.tar.bz2
--rw-r--r--   1 root root   3092753 2010-04-30 07:36 ./source/kdei/kde-l10n/kde-l10n-cs-4.4.3.tar.bz2
--rw-r--r--   1 root root    532953 2010-04-30 07:36 ./source/kdei/kde-l10n/kde-l10n-csb-4.4.3.tar.bz2
--rw-r--r--   1 root root  17862353 2010-04-30 07:34 ./source/kdei/kde-l10n/kde-l10n-da-4.4.3.tar.bz2
--rw-r--r--   1 root root  20981969 2010-04-30 07:36 ./source/kdei/kde-l10n/kde-l10n-de-4.4.3.tar.bz2
--rw-r--r--   1 root root   2619734 2010-04-30 07:34 ./source/kdei/kde-l10n/kde-l10n-el-4.4.3.tar.bz2
--rw-r--r--   1 root root   4081631 2010-04-30 07:34 ./source/kdei/kde-l10n/kde-l10n-en_GB-4.4.3.tar.bz2
--rw-r--r--   1 root root   2070108 2010-04-30 07:36 ./source/kdei/kde-l10n/kde-l10n-eo-4.4.3.tar.bz2
--rw-r--r--   1 root root  28802942 2010-04-30 07:34 ./source/kdei/kde-l10n/kde-l10n-es-4.4.3.tar.bz2
--rw-r--r--   1 root root   9250730 2010-04-30 07:34 ./source/kdei/kde-l10n/kde-l10n-et-4.4.3.tar.bz2
--rw-r--r--   1 root root   2166493 2010-04-30 07:36 ./source/kdei/kde-l10n/kde-l10n-eu-4.4.3.tar.bz2
--rw-r--r--   1 root root   2515513 2010-04-30 07:36 ./source/kdei/kde-l10n/kde-l10n-fi-4.4.3.tar.bz2
--rw-r--r--   1 root root  21936743 2010-04-30 07:36 ./source/kdei/kde-l10n/kde-l10n-fr-4.4.3.tar.bz2
--rw-r--r--   1 root root   1265952 2010-04-30 07:34 ./source/kdei/kde-l10n/kde-l10n-fy-4.4.3.tar.bz2
--rw-r--r--   1 root root   3365889 2010-04-30 07:34 ./source/kdei/kde-l10n/kde-l10n-ga-4.4.3.tar.bz2
--rw-r--r--   1 root root   3977029 2010-04-30 07:34 ./source/kdei/kde-l10n/kde-l10n-gl-4.4.3.tar.bz2
--rw-r--r--   1 root root    777392 2010-04-30 07:36 ./source/kdei/kde-l10n/kde-l10n-gu-4.4.3.tar.bz2
--rw-r--r--   1 root root   2288930 2010-04-30 07:35 ./source/kdei/kde-l10n/kde-l10n-he-4.4.3.tar.bz2
--rw-r--r--   1 root root   1903354 2010-04-30 07:35 ./source/kdei/kde-l10n/kde-l10n-hi-4.4.3.tar.bz2
--rw-r--r--   1 root root   2136475 2010-04-30 07:36 ./source/kdei/kde-l10n/kde-l10n-hr-4.4.3.tar.bz2
--rw-r--r--   1 root root   4674995 2010-04-30 07:36 ./source/kdei/kde-l10n/kde-l10n-hu-4.4.3.tar.bz2
--rw-r--r--   1 root root    352550 2010-04-30 07:35 ./source/kdei/kde-l10n/kde-l10n-id-4.4.3.tar.bz2
--rw-r--r--   1 root root   2007850 2010-04-30 07:36 ./source/kdei/kde-l10n/kde-l10n-is-4.4.3.tar.bz2
--rw-r--r--   1 root root  11326666 2010-04-30 07:35 ./source/kdei/kde-l10n/kde-l10n-it-4.4.3.tar.bz2
--rw-r--r--   1 root root   2301189 2010-04-30 07:36 ./source/kdei/kde-l10n/kde-l10n-ja-4.4.3.tar.bz2
--rw-r--r--   1 root root   1682156 2010-04-30 07:34 ./source/kdei/kde-l10n/kde-l10n-kk-4.4.3.tar.bz2
--rw-r--r--   1 root root   2251163 2010-04-30 07:36 ./source/kdei/kde-l10n/kde-l10n-km-4.4.3.tar.bz2
--rw-r--r--   1 root root    422819 2010-04-30 07:35 ./source/kdei/kde-l10n/kde-l10n-kn-4.4.3.tar.bz2
--rw-r--r--   1 root root   1658795 2010-04-30 07:35 ./source/kdei/kde-l10n/kde-l10n-ko-4.4.3.tar.bz2
--rw-r--r--   1 root root   2139994 2010-04-30 07:36 ./source/kdei/kde-l10n/kde-l10n-lt-4.4.3.tar.bz2
--rw-r--r--   1 root root   2199679 2010-04-30 07:36 ./source/kdei/kde-l10n/kde-l10n-lv-4.4.3.tar.bz2
--rw-r--r--   1 root root    923330 2010-04-30 07:35 ./source/kdei/kde-l10n/kde-l10n-mai-4.4.3.tar.bz2
--rw-r--r--   1 root root   1925598 2010-04-30 07:34 ./source/kdei/kde-l10n/kde-l10n-mk-4.4.3.tar.bz2
--rw-r--r--   1 root root  20301017 2010-04-30 07:35 ./source/kdei/kde-l10n/kde-l10n-ml-4.4.3.tar.bz2
--rw-r--r--   1 root root   2619697 2010-04-30 07:36 ./source/kdei/kde-l10n/kde-l10n-nb-4.4.3.tar.bz2
--rw-r--r--   1 root root   3877757 2010-04-30 07:35 ./source/kdei/kde-l10n/kde-l10n-nds-4.4.3.tar.bz2
--rw-r--r--   1 root root  13976048 2010-04-30 17:45 ./source/kdei/kde-l10n/kde-l10n-nl-4.4.3.tar.bz2
--rw-r--r--   1 root root   2201234 2010-04-30 07:36 ./source/kdei/kde-l10n/kde-l10n-nn-4.4.3.tar.bz2
--rw-r--r--   1 root root   1817894 2010-04-30 07:34 ./source/kdei/kde-l10n/kde-l10n-pa-4.4.3.tar.bz2
--rw-r--r--   1 root root   6148292 2010-04-30 07:36 ./source/kdei/kde-l10n/kde-l10n-pl-4.4.3.tar.bz2
--rw-r--r--   1 root root   6344021 2010-04-30 07:36 ./source/kdei/kde-l10n/kde-l10n-pt-4.4.3.tar.bz2
--rw-r--r--   1 root root  17653673 2010-04-30 07:35 ./source/kdei/kde-l10n/kde-l10n-pt_BR-4.4.3.tar.bz2
--rw-r--r--   1 root root   3498475 2010-04-30 07:36 ./source/kdei/kde-l10n/kde-l10n-ro-4.4.3.tar.bz2
--rw-r--r--   1 root root   6426237 2010-04-30 07:36 ./source/kdei/kde-l10n/kde-l10n-ru-4.4.3.tar.bz2
--rw-r--r--   1 root root    763924 2010-04-30 07:36 ./source/kdei/kde-l10n/kde-l10n-si-4.4.3.tar.bz2
--rw-r--r--   1 root root   4401374 2010-04-30 07:35 ./source/kdei/kde-l10n/kde-l10n-sk-4.4.3.tar.bz2
--rw-r--r--   1 root root   4500262 2010-04-30 07:36 ./source/kdei/kde-l10n/kde-l10n-sl-4.4.3.tar.bz2
--rw-r--r--   1 root root   4160415 2010-04-30 07:36 ./source/kdei/kde-l10n/kde-l10n-sr-4.4.3.tar.bz2
--rw-r--r--   1 root root  18796527 2010-04-30 07:34 ./source/kdei/kde-l10n/kde-l10n-sv-4.4.3.tar.bz2
--rw-r--r--   1 root root   2083603 2010-04-30 07:35 ./source/kdei/kde-l10n/kde-l10n-tg-4.4.3.tar.bz2
--rw-r--r--   1 root root   2534675 2010-04-30 07:34 ./source/kdei/kde-l10n/kde-l10n-tr-4.4.3.tar.bz2
--rw-r--r--   1 root root  13953579 2010-04-30 07:35 ./source/kdei/kde-l10n/kde-l10n-uk-4.4.3.tar.bz2
--rw-r--r--   1 root root   1822152 2010-04-30 07:36 ./source/kdei/kde-l10n/kde-l10n-wa-4.4.3.tar.bz2
--rw-r--r--   1 root root   3608445 2010-04-30 07:34 ./source/kdei/kde-l10n/kde-l10n-zh_CN-4.4.3.tar.bz2
--rw-r--r--   1 root root   2658669 2010-04-30 07:34 ./source/kdei/kde-l10n/kde-l10n-zh_TW-4.4.3.tar.bz2
--rwxr-xr-x   1 root root      4087 2010-04-30 09:11 ./source/kdei/kde-l10n/kde-l10n.SlackBuild
--rw-r--r--   1 root root       198 2010-05-04 22:29 ./source/kdei/kde-l10n/languages
-drwxr-xr-x   2 root root      4096 2008-05-26 07:17 ./source/kdei/kde-l10n/local.options
-drwxr-xr-x   2 root root      4096 2010-02-05 09:17 ./source/kdei/kde-l10n/slack-desc
--rw-r--r--   1 root root       188 2009-01-21 22:32 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ar
--rw-r--r--   1 root root       191 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-bg
--rw-r--r--   1 root root       225 2009-03-06 20:29 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-bn_IN
--rw-r--r--   1 root root       189 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ca
--rw-r--r--   1 root root       300 2010-01-21 09:24 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ca@valencia
--rw-r--r--   1 root root       187 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-cs
--rw-r--r--   1 root root       203 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-csb
--rw-r--r--   1 root root       188 2008-07-26 01:24 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-da
--rw-r--r--   1 root root       188 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-de
--rw-r--r--   1 root root       187 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-el
--rw-r--r--   1 root root       230 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-en_GB
--rw-r--r--   1 root root       191 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-eo
--rw-r--r--   1 root root       189 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-es
--rw-r--r--   1 root root       190 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-et
--rw-r--r--   1 root root       188 2009-03-06 22:05 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-eu
--rw-r--r--   1 root root       189 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-fi
--rw-r--r--   1 root root       188 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-fr
--rw-r--r--   1 root root       191 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-fy
--rw-r--r--   1 root root       187 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ga
--rw-r--r--   1 root root       190 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-gl
--rw-r--r--   1 root root       190 2009-01-21 22:33 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-gu
--rw-r--r--   1 root root       188 2009-01-21 22:34 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-he
--rw-r--r--   1 root root       187 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-hi
--rw-r--r--   1 root root       207 2009-10-21 03:40 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-hne
--rw-r--r--   1 root root       190 2009-10-21 03:42 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-hr
--rw-r--r--   1 root root       191 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-hu
--rw-r--r--   1 root root       192 2010-02-05 09:17 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-id
--rw-r--r--   1 root root       191 2009-03-06 22:06 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-is
--rw-r--r--   1 root root       189 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-it
--rw-r--r--   1 root root       190 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ja
--rw-r--r--   1 root root       188 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-kk
--rw-r--r--   1 root root       187 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-km
--rw-r--r--   1 root root       189 2009-03-06 20:30 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-kn
--rw-r--r--   1 root root       188 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ko
--rw-r--r--   1 root root       189 2008-07-26 01:59 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ku
--rw-r--r--   1 root root       192 2008-07-26 01:58 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-lt
--rw-r--r--   1 root root       189 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-lv
--rw-r--r--   1 root root       202 2009-01-27 05:28 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-mai
--rw-r--r--   1 root root       192 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-mk
--rw-r--r--   1 root root       191 2008-07-26 01:59 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ml
--rw-r--r--   1 root root       189 2009-03-06 20:31 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-mr
--rw-r--r--   1 root root       201 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-nb
--rw-r--r--   1 root root       203 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-nds
--rw-r--r--   1 root root       187 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-nl
--rw-r--r--   1 root root       201 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-nn
--rw-r--r--   1 root root       189 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-pa
--rw-r--r--   1 root root       188 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-pl
--rw-r--r--   1 root root       192 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-pt
--rw-r--r--   1 root root       238 2008-05-26 07:01 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-pt_BR
--rw-r--r--   1 root root       190 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ro
--rw-r--r--   1 root root       189 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ru
--rw-r--r--   1 root root       189 2010-01-21 09:25 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-si
--rw-r--r--   1 root root       188 2009-04-03 21:25 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-sk
--rw-r--r--   1 root root       191 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-sl
--rw-r--r--   1 root root       189 2008-07-26 01:58 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-sr
--rw-r--r--   1 root root       189 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-sv
--rw-r--r--   1 root root       187 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ta
--rw-r--r--   1 root root       187 2009-03-06 22:07 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-tg
--rw-r--r--   1 root root       186 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-th
--rw-r--r--   1 root root       189 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-tr
--rw-r--r--   1 root root       191 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-uk
--rw-r--r--   1 root root       189 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-wa
--rw-r--r--   1 root root       236 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-zh_CN
--rw-r--r--   1 root root       225 2008-05-26 06:46 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-zh_TW
-drwxr-xr-x   3 root root      4096 2010-04-10 18:21 ./source/kdei/koffice
--rw-r--r--   1 root root    471033 2010-03-29 15:05 ./source/kdei/koffice/koffice-l10n-ca-2.1.2.tar.bz2
--rw-r--r--   1 root root    256495 2010-03-29 15:08 ./source/kdei/koffice/koffice-l10n-ca@valencia-2.1.2.tar.bz2
--rw-r--r--   1 root root    492687 2010-03-29 15:09 ./source/kdei/koffice/koffice-l10n-da-2.1.2.tar.bz2
--rw-r--r--   1 root root   1391175 2010-03-29 15:07 ./source/kdei/koffice/koffice-l10n-de-2.1.2.tar.bz2
--rw-r--r--   1 root root    280045 2010-03-29 15:05 ./source/kdei/koffice/koffice-l10n-el-2.1.2.tar.bz2
--rw-r--r--   1 root root    295841 2010-03-29 15:07 ./source/kdei/koffice/koffice-l10n-en_GB-2.1.2.tar.bz2
--rw-r--r--   1 root root   6155059 2010-03-29 15:08 ./source/kdei/koffice/koffice-l10n-es-2.1.2.tar.bz2
--rw-r--r--   1 root root    594202 2010-03-29 15:06 ./source/kdei/koffice/koffice-l10n-et-2.1.2.tar.bz2
--rw-r--r--   1 root root   1273336 2010-03-29 18:42 ./source/kdei/koffice/koffice-l10n-fr-2.1.2.tar.bz2
--rw-r--r--   1 root root    281462 2010-03-29 15:05 ./source/kdei/koffice/koffice-l10n-fy-2.1.2.tar.bz2
--rw-r--r--   1 root root    310038 2010-03-29 15:05 ./source/kdei/koffice/koffice-l10n-gl-2.1.2.tar.bz2
--rw-r--r--   1 root root    232798 2010-03-29 15:05 ./source/kdei/koffice/koffice-l10n-hne-2.1.2.tar.bz2
--rw-r--r--   1 root root    579184 2010-03-29 15:07 ./source/kdei/koffice/koffice-l10n-it-2.1.2.tar.bz2
--rw-r--r--   1 root root    240406 2010-03-29 15:07 ./source/kdei/koffice/koffice-l10n-ja-2.1.2.tar.bz2
--rw-r--r--   1 root root    267748 2010-03-29 15:06 ./source/kdei/koffice/koffice-l10n-kk-2.1.2.tar.bz2
--rw-r--r--   1 root root    252913 2010-03-29 15:05 ./source/kdei/koffice/koffice-l10n-nb-2.1.2.tar.bz2
--rw-r--r--   1 root root    889184 2010-03-29 15:07 ./source/kdei/koffice/koffice-l10n-nds-2.1.2.tar.bz2
--rw-r--r--   1 root root   2653712 2010-03-29 15:05 ./source/kdei/koffice/koffice-l10n-nl-2.1.2.tar.bz2
--rw-r--r--   1 root root    283188 2010-03-29 15:07 ./source/kdei/koffice/koffice-l10n-pl-2.1.2.tar.bz2
--rw-r--r--   1 root root    932135 2010-03-29 15:09 ./source/kdei/koffice/koffice-l10n-pt-2.1.2.tar.bz2
--rw-r--r--   1 root root    736410 2010-03-29 15:05 ./source/kdei/koffice/koffice-l10n-pt_BR-2.1.2.tar.bz2
--rw-r--r--   1 root root   4174048 2010-03-29 15:07 ./source/kdei/koffice/koffice-l10n-sv-2.1.2.tar.bz2
--rw-r--r--   1 root root    247044 2010-03-29 15:05 ./source/kdei/koffice/koffice-l10n-tr-2.1.2.tar.bz2
--rw-r--r--   1 root root    502342 2010-03-29 15:09 ./source/kdei/koffice/koffice-l10n-uk-2.1.2.tar.bz2
--rw-r--r--   1 root root    254203 2010-03-29 15:05 ./source/kdei/koffice/koffice-l10n-wa-2.1.2.tar.bz2
--rw-r--r--   1 root root    228587 2010-03-29 15:07 ./source/kdei/koffice/koffice-l10n-zh_CN-2.1.2.tar.bz2
--rw-r--r--   1 root root    259043 2010-03-29 15:05 ./source/kdei/koffice/koffice-l10n-zh_TW-2.1.2.tar.bz2
--rwxr-xr-x   1 root root      4023 2010-04-10 05:02 ./source/kdei/koffice/koffice-l10n.SlackBuild
-drwxr-xr-x   2 root root      4096 2010-04-10 05:00 ./source/kdei/koffice/slack-desc
--rw-r--r--   1 root root       709 2005-06-23 22:46 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-af
--rw-r--r--   1 root root       240 2005-06-23 22:46 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-ar
--rw-r--r--   1 root root       711 2005-06-23 22:46 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-az
--rw-r--r--   1 root root       243 2007-06-11 08:45 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-bg
--rw-r--r--   1 root root       706 2005-06-23 22:46 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-br
--rw-r--r--   1 root root       241 2005-06-23 22:46 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-bs
--rw-r--r--   1 root root       241 2005-06-23 22:46 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-ca
--rw-r--r--   1 root root       370 2010-04-10 05:01 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-ca@valencia
--rw-r--r--   1 root root       705 2005-06-23 22:46 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-cs
--rw-r--r--   1 root root       239 2005-06-23 22:46 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-cy
--rw-r--r--   1 root root       706 2005-06-23 22:47 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-da
--rw-r--r--   1 root root       706 2005-06-23 22:47 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-de
--rw-r--r--   1 root root       239 2005-06-23 22:47 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-el
--rw-r--r--   1 root root       751 2005-06-23 22:47 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-en_GB
--rw-r--r--   1 root root       709 2005-06-23 22:47 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-eo
--rw-r--r--   1 root root       707 2005-06-23 22:47 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-es
--rw-r--r--   1 root root       708 2005-06-23 22:47 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-et
--rw-r--r--   1 root root       706 2006-01-29 02:25 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-eu
--rw-r--r--   1 root root       249 2005-06-23 22:47 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-fa
--rw-r--r--   1 root root       241 2005-06-23 22:47 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-fi
--rw-r--r--   1 root root       706 2005-06-23 22:47 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-fr
--rw-r--r--   1 root root       243 2008-11-24 22:47 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-fy
--rw-r--r--   1 root root       712 2006-04-17 05:24 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-ga
--rw-r--r--   1 root root       708 2007-02-16 22:10 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-gl
--rw-r--r--   1 root root       240 2005-06-23 22:47 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-he
--rw-r--r--   1 root root       239 2006-04-17 05:25 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-hi
--rw-r--r--   1 root root       259 2009-10-21 05:30 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-hne
--rw-r--r--   1 root root       259 2005-06-23 22:47 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-hsb
--rw-r--r--   1 root root       709 2005-06-23 22:47 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-hu
--rw-r--r--   1 root root       243 2005-06-23 22:47 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-is
--rw-r--r--   1 root root       707 2005-06-23 22:47 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-it
--rw-r--r--   1 root root       708 2005-06-23 22:47 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-ja
--rw-r--r--   1 root root       240 2008-11-24 22:48 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-kk
--rw-r--r--   1 root root       705 2007-04-22 20:28 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-km
--rw-r--r--   1 root root       237 2005-06-23 22:47 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-lo
--rw-r--r--   1 root root       710 2005-06-23 22:47 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-lt
--rw-r--r--   1 root root       241 2005-06-23 22:47 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-lv
--rw-r--r--   1 root root       244 2007-02-16 22:11 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-mk
--rw-r--r--   1 root root       705 2006-06-02 20:44 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-ms
--rw-r--r--   1 root root       707 2005-06-23 22:47 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-mt
--rw-r--r--   1 root root       253 2005-06-23 22:48 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-nb
--rw-r--r--   1 root root       255 2007-06-11 08:46 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-nds
--rw-r--r--   1 root root       240 2007-06-11 08:47 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-ne
--rw-r--r--   1 root root       705 2005-06-23 22:48 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-nl
--rw-r--r--   1 root root       253 2005-06-23 22:48 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-nn
--rw-r--r--   1 root root       719 2005-06-23 22:48 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-no
--rw-r--r--   1 root root       758 2005-06-23 22:48 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-no_NY
--rw-r--r--   1 root root       706 2005-06-23 22:48 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-pl
--rw-r--r--   1 root root       710 2005-06-23 22:48 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-pt
--rw-r--r--   1 root root       756 2005-06-23 22:48 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-pt_BR
--rw-r--r--   1 root root       708 2005-06-23 22:48 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-ro
--rw-r--r--   1 root root       707 2005-06-23 22:48 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-ru
--rw-r--r--   1 root root       713 2005-06-23 22:48 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-se
--rw-r--r--   1 root root       706 2005-06-23 22:48 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-sk
--rw-r--r--   1 root root       709 2005-06-23 22:48 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-sl
--rw-r--r--   1 root root       707 2005-06-23 22:48 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-sr
--rw-r--r--   1 root root       788 2005-07-27 22:46 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-sr@Latn
--rw-r--r--   1 root root       707 2005-06-23 22:48 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-sv
--rw-r--r--   1 root root       705 2005-06-23 22:48 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-ta
--rw-r--r--   1 root root       239 2005-06-23 22:48 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-tg
--rw-r--r--   1 root root       238 2005-06-23 22:48 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-th
--rw-r--r--   1 root root       707 2005-06-23 22:48 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-tr
--rw-r--r--   1 root root       709 2005-06-23 22:49 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-uk
--rw-r--r--   1 root root       239 2006-04-17 05:27 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-uz
--rw-r--r--   1 root root       251 2005-06-23 22:49 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-ven
--rw-r--r--   1 root root       707 2009-06-03 08:13 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-wa
--rw-r--r--   1 root root       239 2005-06-23 22:49 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-xh
--rw-r--r--   1 root root       288 2005-06-23 22:49 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-zh_CN
--rw-r--r--   1 root root       277 2005-06-23 22:49 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-zh_TW
--rw-r--r--   1 root root       238 2005-06-23 22:49 ./source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-zu
-drwxr-xr-x 186 root root      4096 2010-05-14 03:55 ./source/l
-drwxr-xr-x   3 root root      4096 2010-03-22 20:46 ./source/l/ConsoleKit
--rw-r--r--   1 root root     95698 2010-03-22 20:45 ./source/l/ConsoleKit/ConsoleKit-0.4.1.tar.bz2
--rw-r--r--   1 root root     95335 2010-03-22 20:42 ./source/l/ConsoleKit/ConsoleKit-20100129.tar.bz2
--rwxr-xr-x   1 root root      4687 2010-03-30 14:03 ./source/l/ConsoleKit/ConsoleKit.SlackBuild
--rw-r--r--   1 root root       299 2009-05-30 01:28 ./source/l/ConsoleKit/doinst.sh.gz
--rw-r--r--   1 root root       411 2009-07-07 17:18 ./source/l/ConsoleKit/pam-foreground-compat.ck
-drwxr-xr-x   2 root root      4096 2009-11-05 14:55 ./source/l/ConsoleKit/patches
--rw-r--r--   1 root root       854 2009-05-04 23:46 ./source/l/ConsoleKit/patches/consolekit-0.2.10-cleanup_console_tags.patch.gz
--rw-r--r--   1 root root       739 2009-05-04 23:46 ./source/l/ConsoleKit/patches/consolekit-dbus-permissions.patch.gz
--rw-r--r--   1 root root       413 2009-05-04 23:46 ./source/l/ConsoleKit/patches/consolekit-skipvalidation.patch.gz
--rw-r--r--   1 root root       790 2010-05-04 00:17 ./source/l/ConsoleKit/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/l/M2Crypto
--rw-r--r--   1 root root    309578 2009-02-23 00:48 ./source/l/M2Crypto/M2Crypto-0.19.1.tar.bz2
--rwxr-xr-x   1 root root      2428 2009-05-19 20:05 ./source/l/M2Crypto/M2Crypto.SlackBuild
--rw-r--r--   1 root root      1050 2009-03-31 01:47 ./source/l/M2Crypto/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-04 00:31 ./source/l/PyQt
--rw-r--r--   1 root root   6617224 2010-04-21 09:57 ./source/l/PyQt/PyQt-x11-gpl-4.7.3.tar.xz
--rwxr-xr-x   1 root root      3163 2010-04-21 09:53 ./source/l/PyQt/PyQt.SlackBuild
--rw-r--r--   1 root root       158 2009-11-28 04:35 ./source/l/PyQt/PyQt.info
--rw-r--r--   1 root root       254 2010-03-25 19:48 ./source/l/PyQt/PyQt.phonon.diff.gz
--rw-r--r--   1 root root       731 2010-05-04 00:18 ./source/l/PyQt/slack-desc
-drwxr-xr-x   2 root root      4096 2010-05-04 00:31 ./source/l/QScintilla
--rw-r--r--   1 root root   1101236 2010-03-24 11:01 ./source/l/QScintilla/QScintilla-gpl-2.4.3.tar.xz
--rwxr-xr-x   1 root root      3056 2010-03-24 10:59 ./source/l/QScintilla/QScintilla.SlackBuild
--rw-r--r--   1 root root      1127 2008-07-31 04:32 ./source/l/QScintilla/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/l/aalib
--rw-r--r--   1 root root    391028 2001-04-26 15:56 ./source/l/aalib/aalib-1.4rc5.tar.gz
--rwxr-xr-x   1 root root      3396 2009-05-19 20:05 ./source/l/aalib/aalib.SlackBuild
--rw-r--r--   1 root root      1451 2002-03-28 07:45 ./source/l/aalib/slack-desc
--rw-r--r--   1 root root      1305 2002-03-28 07:43 ./source/l/aalib/slack-desc.11line
-drwxr-xr-x   2 root root      4096 2010-02-09 13:15 ./source/l/akonadi
--rw-r--r--   1 root root       168 2009-09-01 21:14 ./source/l/akonadi/README.html
--rw-r--r--   1 root root    193500 2010-02-09 11:24 ./source/l/akonadi/akonadi-1.3.1.tar.bz2
--rwxr-xr-x   1 root root      3125 2010-02-09 13:15 ./source/l/akonadi/akonadi.SlackBuild
--rw-r--r--   1 root root       110 2009-08-31 03:24 ./source/l/akonadi/doinst.sh.gz
--rw-r--r--   1 root root       840 2010-05-04 00:18 ./source/l/akonadi/slack-desc
-drwxr-xr-x   2 root root      4096 2010-04-20 02:41 ./source/l/alsa-lib
--rw-r--r--   1 root root    808271 2010-04-16 11:22 ./source/l/alsa-lib/alsa-lib-1.0.23.tar.bz2
--rwxr-xr-x   1 root root      3309 2010-02-07 19:07 ./source/l/alsa-lib/alsa-lib.SlackBuild
--rw-r--r--   1 root root       861 2003-08-29 05:32 ./source/l/alsa-lib/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-19 20:05 ./source/l/alsa-oss
--rw-r--r--   1 root root    248726 2008-07-14 09:20 ./source/l/alsa-oss/alsa-oss-1.0.17.tar.bz2
--rwxr-xr-x   1 root root      2601 2009-05-19 20:05 ./source/l/alsa-oss/alsa-oss.SlackBuild
--rw-r--r--   1 root root       962 2003-08-29 06:30 ./source/l/alsa-oss/slack-desc
-drwxr-xr-x   2 root root      4096 2010-03-05 21:05 ./source/l/apr
-drwxr-xr-x   2 root root      4096 2009-08-06 20:38 ./source/l/apr-util
--rw-r--r--   1 root root    589942 2009-08-04 21:09 ./source/l/apr-util/apr-util-1.3.9.tar.bz2
--rw-r--r--   1 root root       835 2009-08-04 21:09 ./source/l/apr-util/apr-util-1.3.9.tar.bz2.asc
--rwxr-xr-x   1 root root      3868 2010-03-05 21:20 ./source/l/apr-util/apr-util.SlackBuild
--rw-r--r--   1 root root       942 2006-07-29 21:51 ./source/l/apr-util/slack-desc
--rw-r--r--   1 root root    927657 2009-10-03 20:13 ./source/l/apr/apr-1.3.9.tar.bz2
--rw-r--r--   1 root root       186 2009-10-03 20:13 ./source/l/apr/apr-1.3.9.tar.bz2.asc
--rwxr-xr-x   1 root root      3352 2010-03-05 21:07 ./source/l/apr/apr.SlackBuild
--rw-r--r--   1 root root       729 2006-07-29 07:49 ./source/l/apr/slack-desc
-drwxr-xr-x   2 root root      4096 2009-05-23 00:41 ./source/l/aspell
-drwxr-xr-x   2 root root      4096 2009-08-13 02:39 ./source/l/aspell-dict
--rw-r--r--   1 root root    256111 2004-03-15 00:39 ./source/l/aspell-dict/aspell-af-0.50-0.tar.bz2
--rw-r--r--   1 root root     68055 2003-04-17 02:03 ./source/l/aspell-dict/aspell-br-0.50-2.tar.bz2
--rw-r--r--   1 root root    117652 2003-04-17 02:03 ./source/l/aspell-dict/aspell-cy-0.50-3.tar.bz2
--rwxr-xr-x   1 root root      2446 2009-05-19 20:05 ./source/l/aspell-dict/aspell-dict.SlackBuild
--rw-r--r--   1 root root    328225 2003-04-17 02:03 ./source/l/aspell-dict/aspell-el-0.50-3.tar.bz2
--rw-r--r--   1 root root     89703 2003-04-17 02:03 ./source/l/aspell-dict/aspell-eo-0.50-2.tar.bz2
--rw-r--r--   1 root root    157809 2003-04-17 02:03 ./source/l/aspell-dict/aspell-es-0.50-2.tar.bz2
--rw-r--r--   1 root root    283086 2003-04-17 02:03 ./source/l/aspell-dict/aspell-fr-0.50-3.tar.bz2
--rw-r--r--   1 root root    112313 2004-03-10 09:57 ./source/l/aspell-dict/aspell-gl-0.50-0.tar.bz2
--rw-r--r--   1 root root     69462 2004-04-05 21:17 ./source/l/aspell-dict/aspell-gv-0.50-0.tar.bz2
--rw-r--r--   1 root root    208118 2004-03-30 08:07 ./source/l/aspell-dict/aspell-hr-0.51-0.tar.bz2
--rw-r--r--   1 root root     70883 2004-03-30 10:04 ./source/l/aspell-dict/aspell-ia-0.50-1.tar.bz2
--rw-r--r--   1 root root    323850 2004-03-13 11:17 ./source/l/aspell-dict/aspell-is-0.51.1-0.tar.bz2
--rw-r--r--   1 root root     57818 2004-03-15 00:40 ./source/l/aspell-dict/aspell-mi-0.50-0.tar.bz2
--rw-r--r--   1 root root    122690 2004-04-23 18:46 ./source/l/aspell-dict/aspell-mk-0.50-0.tar.bz2
--rw-r--r--   1 root root     50368 2004-03-15 00:40 ./source/l/aspell-dict/aspell-ms-0.50-0.tar.bz2
--rw-r--r--   1 root root    124114 2004-03-25 00:02 ./source/l/aspell-dict/aspell-mt-0.50-0.tar.bz2
--rw-r--r--   1 root root    423161 2009-07-21 19:10 ./source/l/aspell-dict/aspell-nb-0.50.1-0.tar.bz2
--rw-r--r--   1 root root    428365 2003-04-17 02:03 ./source/l/aspell-dict/aspell-nl-0.50-2.tar.bz2
--rw-r--r--   1 root root    335156 2004-04-05 07:11 ./source/l/aspell-dict/aspell-nn-0.50.1-1.tar.bz2
--rw-r--r--   1 root root    286696 2003-04-17 02:03 ./source/l/aspell-dict/aspell-no-0.50-2.tar.bz2
--rw-r--r--   1 root root    624458 2004-03-10 09:47 ./source/l/aspell-dict/aspell-pl-0.51-0.tar.bz2
--rw-r--r--   1 root root    201341 2003-04-17 02:03 ./source/l/aspell-dict/aspell-pt-0.50-2.tar.bz2
--rw-r--r--   1 root root     64110 2003-04-17 02:03 ./source/l/aspell-dict/aspell-ro-0.50-2.tar.bz2
--rw-r--r--   1 root root     21821 2004-05-19 18:04 ./source/l/aspell-dict/aspell-rw-0.50-0.tar.bz2
--rw-r--r--   1 root root    383840 2004-04-16 02:14 ./source/l/aspell-dict/aspell-sk-0.52-0.tar.bz2
--rw-r--r--   1 root root    215463 2004-03-15 00:40 ./source/l/aspell-dict/aspell-sl-0.50-0.tar.bz2
--rw-r--r--   1 root root     93942 2004-03-10 09:48 ./source/l/aspell-dict/aspell-sv-0.51-0.tar.bz2
--rw-r--r--   1 root root    102172 2004-03-29 12:07 ./source/l/aspell-dict/aspell-sw-0.50-0.tar.bz2
--rw-r--r--   1 root root     84846 2004-03-29 10:22 ./source/l/aspell-dict/aspell-tr-0.50-0.tar.bz2
--rw-r--r--   1 root root    382513 2004-03-10 09:48 ./source/l/aspell-dict/aspell-uk-0.51-0.tar.bz2
--rw-r--r--   1 root root     50363 2004-03-29 09:35 ./source/l/aspell-dict/aspell-wa-0.50-0.tar.bz2
--rw-r--r--   1 root root    168226 2004-03-29 12:07 ./source/l/aspell-dict/aspell-zu-0.50-0.tar.bz2
--rw-r--r--   1 root root    653405 2004-07-05 21:42 ./source/l/aspell-dict/aspell5-be-0.01.tar.bz2
--rw-r--r--   1 root root    176676 2004-05-28 15:49 ./source/l/aspell-dict/aspell5-bg-4.0-0.tar.bz2
--rw-r--r--   1 root root    317688 2004-08-13 02:35 ./source/l/aspell-dict/aspell5-da-1.4.42-1.tar.bz2
--rw-r--r--   1 root root    165901 2004-08-13 02:36 ./source/l/aspell-dict/aspell5-fo-0.2.16-1.tar.bz2
--rw-r--r--   1 root root    539910 2005-01-07 21:36 ./source/l/aspell-dict/aspell5-ga-3.6-0.tar.bz2
--rw-r--r--   1 root root     51167 2004-08-13 02:37 ./source/l/aspell-dict/aspell5-gd-0.1.1-1.tar.bz2
--rw-r--r--   1 root root     46288 2005-04-06 22:05 ./source/l/aspell-dict/aspell5-hil-0.11-0.tar.bz2
--rw-r--r--   1 root root     76958 2004-08-12 15:04 ./source/l/aspell-dict/aspell5-id-1.2-0.tar.bz2
--rw-r--r--   1 root root     23870 2004-09-22 17:27 ./source/l/aspell-dict/aspell5-ku-0.12-0.tar.bz2
--rw-r--r--   1 root root     45331 2004-09-10 23:38 ./source/l/aspell-dict/aspell5-mg-0.03-0.tar.bz2
--rw-r--r--   1 root root     22952 2004-08-10 14:49 ./source/l/aspell-dict/aspell5-ny-0.01-0.tar.bz2
--rw-r--r--   1 root root    281538 2004-06-01 13:33 ./source/l/aspell-dict/aspell5-sc-1.0.tar.bz2
--rw-r--r--   1 root root     33044 2004-06-02 14:11 ./source/l/aspell-dict/aspell5-tet-0.1.1.tar.bz2
--rw-r--r--   1 root root     40642 2004-08-06 15:21 ./source/l/aspell-dict/aspell5-tl-0.02-1.tar.bz2
--rw-r--r--   1 root root     22127 2004-08-13 02:38 ./source/l/aspell-dict/aspell5-tn-1.0.1-0.tar.bz2
--rw-r--r--   1 root root     40493 2004-12-28 14:21 ./source/l/aspell-dict/aspell6-am-0.03-1.tar.bz2
--rw-r--r--   1 root root     50588 2004-08-27 06:06 ./source/l/aspell-dict/aspell6-az-0.02-0.tar.bz2
--rw-r--r--   1 root root    117436 2004-08-27 06:06 ./source/l/aspell-dict/aspell6-bn-0.01.1-1.tar.bz2
--rw-r--r--   1 root root    222986 2004-08-27 06:06 ./source/l/aspell-dict/aspell6-ca-20040130-1.tar.bz2
--rw-r--r--   1 root root    451507 2004-08-27 06:06 ./source/l/aspell-dict/aspell6-cs-20040614-1.tar.bz2
--rw-r--r--   1 root root     32694 2005-03-11 20:40 ./source/l/aspell-dict/aspell6-csb-0.02-0.tar.bz2
--rw-r--r--   1 root root    274407 2004-11-04 02:48 ./source/l/aspell-dict/aspell6-de-20030222-1.tar.bz2
--rw-r--r--   1 root root   182442 2004-08-27 06:37 ./source/l/aspell-dict/aspell6-en-6.0-0.tar.bz2
--rw-r--r--   1 root root   338155 2004-08-27 06:11 ./source/l/aspell-dict/aspell6-et-0.1.21-1.tar.bz2
--rw-r--r--   1 root root    97168 2004-11-04 02:01 ./source/l/aspell-dict/aspell6-fa-0.02-0.tar.bz2
--rw-r--r--   1 root root   209249 2004-08-27 06:11 ./source/l/aspell-dict/aspell6-fi-0.7-0.tar.bz2
--rw-r--r--   1 root root    30949 2006-01-17 06:49 ./source/l/aspell-dict/aspell6-gu-0.02-0.tar.bz2
--rw-r--r--   1 root root   122781 2006-05-21 23:39 ./source/l/aspell-dict/aspell6-he-1.0-0.tar.bz2
--rw-r--r--   1 root root    51021 2005-01-27 13:35 ./source/l/aspell-dict/aspell6-hi-0.01-0.tar.bz2
--rw-r--r--   1 root root   109026 2004-08-27 06:11 ./source/l/aspell-dict/aspell6-hsb-0.01-1.tar.bz2
--rw-r--r--   1 root root   375949 2004-08-27 06:11 ./source/l/aspell-dict/aspell6-hu-0.99.4.2-0.tar.bz2
--rw-r--r--   1 root root   216189 2005-06-01 06:35 ./source/l/aspell-dict/aspell6-it-2.2_20050523-0.tar.bz2
--rw-r--r--   1 root root    42722 2004-08-27 06:11 ./source/l/aspell-dict/aspell6-la-20020503-0.tar.bz2
--rw-r--r--   1 root root   153912 2006-01-18 00:22 ./source/l/aspell-dict/aspell6-lt-1.1+cvs20060103-0.tar.bz2
--rw-r--r--   1 root root    72416 2004-08-27 06:11 ./source/l/aspell-dict/aspell6-lv-0.5.5-1.tar.bz2
--rw-r--r--   1 root root    35446 2004-08-27 06:11 ./source/l/aspell-dict/aspell6-mn-0.01-0.tar.bz2
--rw-r--r--   1 root root   151720 2005-05-25 15:58 ./source/l/aspell-dict/aspell6-mr-0.10-0.tar.bz2
--rw-r--r--   1 root root    32658 2004-12-28 02:31 ./source/l/aspell-dict/aspell6-nds-0.01-0.tar.bz2
--rw-r--r--   1 root root    20525 2005-01-25 14:21 ./source/l/aspell-dict/aspell6-or-0.03-1.tar.bz2
--rw-r--r--   1 root root    22143 2005-01-25 14:21 ./source/l/aspell-dict/aspell6-pa-0.01-1.tar.bz2
--rw-r--r--   1 root root   864887 2008-07-18 05:44 ./source/l/aspell-dict/aspell6-pt_BR-20080707-0.tar.bz2
--rw-r--r--   1 root root    85541 2004-08-27 06:11 ./source/l/aspell-dict/aspell6-qu-0.02-0.tar.bz2
--rw-r--r--   1 root root   427312 2004-08-27 06:37 ./source/l/aspell-dict/aspell6-ru-0.99f7-1.tar.bz2
--rw-r--r--   1 root root   574923 2005-11-11 02:14 ./source/l/aspell-dict/aspell6-sr-0.02.tar.bz2
--rw-r--r--   1 root root    44452 2004-08-27 06:11 ./source/l/aspell-dict/aspell6-ta-20040424-1.tar.bz2
--rw-r--r--   1 root root   310738 2005-09-29 06:21 ./source/l/aspell-dict/aspell6-te-0.01-2.tar.bz2
--rw-r--r--   1 root root   179098 2005-11-06 20:39 ./source/l/aspell-dict/aspell6-uk-1.1-0.tar.bz2
--rw-r--r--   1 root root    71160 2006-01-15 23:09 ./source/l/aspell-dict/aspell6-uz-0.5-0.tar.bz2
--rw-r--r--   1 root root    30843 2004-08-27 06:11 ./source/l/aspell-dict/aspell6-vi-0.01.1-1.tar.bz2
--rw-r--r--   1 root root    74382 2004-08-27 06:11 ./source/l/aspell-dict/aspell6-yi-0.01.1-1.tar.bz2
--rw-r--r--   1 root root  1139127 2006-12-19 13:26 ./source/l/aspell/aspell-0.60.5.tar.bz2
--rwxr-xr-x   1 root root     2950 2009-05-23 00:41 ./source/l/aspell/aspell.SlackBuild
--rw-r--r--   1 root root      708 2003-01-13 23:01 ./source/l/aspell/slack-desc
-drwxr-xr-x   2 root root     4096 2010-04-28 15:33 ./source/l/atk
--rw-r--r--   1 root root   746014 2010-03-30 01:02 ./source/l/atk/atk-1.30.0.tar.bz2
--rwxr-xr-x   1 root root     2896 2010-04-30 00:35 ./source/l/atk/atk.SlackBuild
--rw-r--r--   1 root root      627 2008-02-11 03:44 ./source/l/atk/slack-desc
-drwxr-xr-x   2 root root     4096 2010-04-21 20:56 ./source/l/attica
--rw-r--r--   1 root root    31790 2010-04-20 20:07 ./source/l/attica/attica-0.1.3.tar.bz2
--rwxr-xr-x   1 root root     3030 2010-04-20 20:09 ./source/l/attica/attica.SlackBuild
--rw-r--r--   1 root root      831 2010-05-04 00:18 ./source/l/attica/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/audiofile
--rw-r--r--   1 root root   278694 2004-04-21 19:32 ./source/l/audiofile/audiofile-0.2.6.tar.bz2
--rwxr-xr-x   1 root root     3309 2009-05-19 20:05 ./source/l/audiofile/audiofile.SlackBuild
--rw-r--r--   1 root root      775 2002-02-09 00:27 ./source/l/audiofile/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/automoc4
--rw-r--r--   1 root root     9153 2009-01-22 18:51 ./source/l/automoc4/automoc4-0.9.88.tar.bz2
--rwxr-xr-x   1 root root     2450 2009-05-19 20:05 ./source/l/automoc4/automoc4.SlackBuild
--rw-r--r--   1 root root      912 2009-01-03 21:13 ./source/l/automoc4/slack-desc
-drwxr-xr-x   2 root root     4096 2009-10-28 19:32 ./source/l/babl
--rw-r--r--   1 root root      372 2009-09-01 08:50 ./source/l/babl/babl-0.1.0-build-fixes.patch.gz
--rw-r--r--   1 root root   406488 2009-05-21 14:39 ./source/l/babl/babl-0.1.0.tar.bz2
--rwxr-xr-x   1 root root     2705 2009-10-28 19:59 ./source/l/babl/babl.SlackBuild
--rw-r--r--   1 root root      975 2008-10-02 04:36 ./source/l/babl/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-06 05:19 ./source/l/boost
--rwxr-xr-x   1 root root     4944 2010-05-06 04:42 ./source/l/boost/boost.SlackBuild
--rw-r--r--   1 root root 29398612 2010-02-02 12:09 ./source/l/boost/boost_1_42_0.tar.xz
--rw-r--r--   1 root root      889 2008-08-01 01:35 ./source/l/boost/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-03 05:12 ./source/l/cairo
--rw-r--r--   1 root root  4461032 2009-06-16 13:07 ./source/l/cairo/cairo-1.8.8.tar.xz
--rwxr-xr-x   1 root root     3070 2010-05-03 05:10 ./source/l/cairo/cairo.SlackBuild
--rw-r--r--   1 root root      250 2010-05-03 05:12 ./source/l/cairo/cairo.libpng14.diff.gz
--rw-r--r--   1 root root      851 2006-01-18 02:12 ./source/l/cairo/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/chmlib
--rw-r--r--   1 root root   263013 2007-01-25 02:26 ./source/l/chmlib/chmlib-0.39.tar.bz2
--rwxr-xr-x   1 root root     2626 2009-05-19 20:05 ./source/l/chmlib/chmlib.SlackBuild
--rw-r--r--   1 root root      164 2008-01-08 04:13 ./source/l/chmlib/chmlib.info
--rw-r--r--   1 root root      927 2008-08-01 05:34 ./source/l/chmlib/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/clucene
--rw-r--r--   1 root root  1539103 2008-10-23 18:18 ./source/l/clucene/clucene-core-0.9.21b.tar.bz2
--rwxr-xr-x   1 root root     2753 2009-05-19 20:05 ./source/l/clucene/clucene.SlackBuild
--rw-r--r--   1 root root      198 2007-12-20 00:45 ./source/l/clucene/clucene.info
--rw-r--r--   1 root root      357 2008-08-01 05:36 ./source/l/clucene/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/db42
--rw-r--r--   1 root root  3045196 2003-12-04 17:46 ./source/l/db42/db-4.2.52.tar.bz2
--rwxr-xr-x   1 root root     4435 2009-05-19 20:05 ./source/l/db42/db42.SlackBuild
--rw-r--r--   1 root root      544 2003-12-19 03:16 ./source/l/db42/patch.4.2.52.1.gz
--rw-r--r--   1 root root      466 2004-02-02 20:19 ./source/l/db42/patch.4.2.52.2.gz
--rw-r--r--   1 root root     1683 2005-12-09 11:17 ./source/l/db42/patch.4.2.52.3.gz
--rw-r--r--   1 root root      427 2005-12-09 11:17 ./source/l/db42/patch.4.2.52.4.gz
--rw-r--r--   1 root root      819 2006-03-04 22:50 ./source/l/db42/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/db44
--rw-r--r--   1 root root  6886251 2006-01-10 16:38 ./source/l/db44/db-4.4.20.tar.bz2
--rwxr-xr-x   1 root root     4029 2009-05-19 20:05 ./source/l/db44/db44.SlackBuild
--rw-r--r--   1 root root      515 2006-02-03 06:33 ./source/l/db44/patch.4.4.20.1.gz
--rw-r--r--   1 root root      392 2006-02-03 06:33 ./source/l/db44/patch.4.4.20.2.gz
--rw-r--r--   1 root root      818 2006-03-08 22:05 ./source/l/db44/slack-desc
-drwxr-xr-x   2 root root     4096 2010-04-27 00:52 ./source/l/dbus-glib
--rw-r--r--   1 root root   449664 2010-03-25 00:27 ./source/l/dbus-glib/dbus-glib-0.86.tar.xz
--rwxr-xr-x   1 root root     3064 2010-04-27 00:55 ./source/l/dbus-glib/dbus-glib.SlackBuild
--rw-r--r--   1 root root      681 2007-03-16 03:46 ./source/l/dbus-glib/slack-desc
-drwxr-xr-x   2 root root     4096 2010-04-27 00:56 ./source/l/dbus-python
--rw-r--r--   1 root root   533391 2010-02-18 17:43 ./source/l/dbus-python/dbus-python-0.83.1.tar.gz
--rwxr-xr-x   1 root root     3123 2010-04-27 00:56 ./source/l/dbus-python/dbus-python.SlackBuild
--rw-r--r--   1 root root      702 2008-04-04 16:21 ./source/l/dbus-python/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-11 14:02 ./source/l/desktop-file-utils
--rw-r--r--   1 root root   282640 2010-03-10 03:12 ./source/l/desktop-file-utils/desktop-file-utils-0.16.tar.bz2
--rwxr-xr-x   1 root root     4151 2010-05-11 14:02 ./source/l/desktop-file-utils/desktop-file-utils.SlackBuild
--rw-r--r--   1 root root      354 2010-05-11 14:01 ./source/l/desktop-file-utils/desktop-file-utils.quiet.warnings.diff.gz
--rw-r--r--   1 root root      128 2008-10-07 22:57 ./source/l/desktop-file-utils/doinst.sh.gz
--rw-r--r--   1 root root     1124 2006-09-17 22:26 ./source/l/desktop-file-utils/slack-desc
-drwxr-xr-x   2 root root     4096 2009-11-28 04:37 ./source/l/djvulibre
--rw-r--r--   1 root root  2431756 2009-05-21 15:48 ./source/l/djvulibre/djvulibre-3.5.22.tar.xz
--rwxr-xr-x   1 root root     4167 2010-02-14 23:31 ./source/l/djvulibre/djvulibre.SlackBuild
--rw-r--r--   1 root root      257 2009-11-28 04:37 ./source/l/djvulibre/djvulibre.info
--rw-r--r--   1 root root      140 2009-11-28 04:37 ./source/l/djvulibre/doinst.sh.gz
--rw-r--r--   1 root root     1019 2008-08-01 02:56 ./source/l/djvulibre/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-04 00:31 ./source/l/ebook-tools
--rw-r--r--   1 root root    37866 2010-01-29 11:38 ./source/l/ebook-tools/ebook-tools-0.1.1.tar.bz2
--rwxr-xr-x   1 root root     3475 2010-03-26 23:24 ./source/l/ebook-tools/ebook-tools.SlackBuild
--rw-r--r--   1 root root      742 2010-03-26 23:18 ./source/l/ebook-tools/ebook-tools.paths.diff
--rw-r--r--   1 root root      781 2010-05-04 00:18 ./source/l/ebook-tools/slack-desc
-drwxr-xr-x   2 root root     4096 2010-01-06 23:19 ./source/l/eggdbus
--rw-r--r--   1 root root   163804 2010-01-06 23:19 ./source/l/eggdbus/eggdbus-0.6.tar.bz2
--rwxr-xr-x   1 root root     3612 2010-03-25 07:56 ./source/l/eggdbus/eggdbus.SlackBuild
--rw-r--r--   1 root root      688 2010-05-04 00:19 ./source/l/eggdbus/slack-desc
-drwxr-xr-x   2 root root     4096 2009-11-28 04:16 ./source/l/eigen2
--rw-r--r--   1 root root   327460 2009-11-25 13:46 ./source/l/eigen2/eigen2-2.0.10.tar.xz
--rwxr-xr-x   1 root root     2874 2009-12-17 02:23 ./source/l/eigen2/eigen2.SlackBuild
--rw-r--r--   1 root root      712 2008-11-23 23:23 ./source/l/eigen2/slack-desc
-drwxr-xr-x   2 root root     4096 2009-12-05 17:48 ./source/l/enchant
--rw-r--r--   1 root root   359608 2009-12-05 17:48 ./source/l/enchant/enchant-1.5.0.tar.xz
--rwxr-xr-x   1 root root     3293 2009-12-17 03:01 ./source/l/enchant/enchant.SlackBuild
--rw-r--r--   1 root root      113 2009-12-05 17:48 ./source/l/enchant/enchant.info
--rw-r--r--   1 root root      802 2008-08-01 04:51 ./source/l/enchant/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/esound
--rw-r--r--   1 root root      262 2009-03-23 15:57 ./source/l/esound/doinst.sh.gz
--rw-r--r--   1 root root   396474 2009-03-23 15:10 ./source/l/esound/esound-0.2.41.tar.bz2
--rwxr-xr-x   1 root root     3254 2009-05-19 20:05 ./source/l/esound/esound.SlackBuild
--rw-r--r--   1 root root      962 2002-04-02 06:54 ./source/l/esound/slack-desc
-drwxr-xr-x   2 root root     4096 2009-11-28 04:35 ./source/l/exiv2
--rw-r--r--   1 root root  1216024 2009-06-24 13:41 ./source/l/exiv2/exiv2-0.18.2.tar.xz
--rwxr-xr-x   1 root root     3193 2009-12-17 02:21 ./source/l/exiv2/exiv2.SlackBuild
--rw-r--r--   1 root root      714 2008-08-01 04:53 ./source/l/exiv2/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/expat
--rw-r--r--   1 root root   446456 2007-06-07 02:37 ./source/l/expat/expat-2.0.1.tar.gz
--rwxr-xr-x   1 root root     2379 2009-05-19 20:05 ./source/l/expat/expat.SlackBuild
--rw-r--r--   1 root root      720 2008-02-11 03:44 ./source/l/expat/slack-desc
-drwxr-xr-x   2 root root     4096 2009-12-17 01:38 ./source/l/fftw
--rw-r--r--   1 root root  1937412 2009-07-14 10:31 ./source/l/fftw/fftw-3.2.2.tar.xz
--rwxr-xr-x   1 root root     3591 2009-12-17 01:48 ./source/l/fftw/fftw.SlackBuild
--rw-r--r--   1 root root      961 2009-09-27 01:12 ./source/l/fftw/slack-desc
-drwxr-xr-x   2 root root     4096 2010-03-12 00:33 ./source/l/freetype
--rw-r--r--   1 root root  1244664 2010-02-13 07:32 ./source/l/freetype/freetype-2.3.12.tar.xz
--rwxr-xr-x   1 root root     4247 2010-03-12 00:33 ./source/l/freetype/freetype.SlackBuild
--rw-r--r--   1 root root      302 2007-09-13 01:58 ./source/l/freetype/freetype.bytecode.interpreter.diff.gz
--rw-r--r--   1 root root      493 2004-06-05 20:44 ./source/l/freetype/freetype.illadvisederror.diff.gz
--rw-r--r--   1 root root      295 2007-04-21 20:07 ./source/l/freetype/freetype.subpixel.rendering.diff.gz
--rw-r--r--   1 root root      803 2006-07-22 01:26 ./source/l/freetype/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/fribidi
--rw-r--r--   1 root root   490862 2007-08-09 23:44 ./source/l/fribidi/fribidi-0.10.9.tar.bz2
--rwxr-xr-x   1 root root     2461 2009-05-19 20:05 ./source/l/fribidi/fribidi.SlackBuild
--rw-r--r--   1 root root      811 2008-04-08 03:40 ./source/l/fribidi/slack-desc
-drwxr-xr-x   2 root root     4096 2009-12-01 15:26 ./source/l/fuse
--rw-r--r--   1 root root      336 2007-12-07 22:12 ./source/l/fuse/doinst.sh.gz
--rw-r--r--   1 root root   492871 2009-12-01 15:24 ./source/l/fuse/fuse-2.8.1.tar.gz
--rwxr-xr-x   1 root root     4029 2010-02-09 21:37 ./source/l/fuse/fuse.SlackBuild
--rw-r--r--   1 root root      846 2008-03-08 01:51 ./source/l/fuse/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/gamin
--rw-r--r--   1 root root   438451 2009-03-09 18:58 ./source/l/gamin/gamin-0.1.10.tar.bz2
--rwxr-xr-x   1 root root     2866 2009-05-19 20:05 ./source/l/gamin/gamin.SlackBuild
--rw-r--r--   1 root root      753 2007-03-16 02:26 ./source/l/gamin/slack-desc
-drwxr-xr-x   2 root root     4096 2010-02-12 07:44 ./source/l/gd
--rw-r--r--   1 root root  1212730 2007-06-21 19:48 ./source/l/gd/gd-2.0.35.tar.bz2
--rwxr-xr-x   1 root root     3770 2010-02-12 07:38 ./source/l/gd/gd.SlackBuild
--rw-r--r--   1 root root     1088 2010-02-12 07:44 ./source/l/gd/gd.png14.diff.gz
--rw-r--r--   1 root root      366 2010-02-18 03:20 ./source/l/gd/gdlib.pc
--rw-r--r--   1 root root      922 2006-08-16 06:37 ./source/l/gd/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/gdbm
--rw-r--r--   1 root root   228695 2002-10-16 18:01 ./source/l/gdbm/gdbm-1.8.3.tar.gz
--rwxr-xr-x   1 root root     2893 2009-05-19 20:05 ./source/l/gdbm/gdbm.SlackBuild
--rw-r--r--   1 root root      641 2002-03-23 23:12 ./source/l/gdbm/slack-desc
-drwxr-xr-x   2 root root     4096 2009-10-27 19:55 ./source/l/gegl
--rw-r--r--   1 root root  1342198 2009-07-01 17:42 ./source/l/gegl/gegl-0.1.0.tar.bz2
--rwxr-xr-x   1 root root     3407 2010-02-16 04:20 ./source/l/gegl/gegl.SlackBuild
--rw-r--r--   1 root root      862 2008-10-02 04:29 ./source/l/gegl/slack-desc
-drwxr-xr-x   2 root root     4096 2010-02-06 22:20 ./source/l/giflib
--rw-r--r--   1 root root   403232 2009-07-01 15:42 ./source/l/giflib/giflib-4.1.6.tar.xz
--rwxr-xr-x   1 root root     3450 2010-02-06 22:19 ./source/l/giflib/giflib.SlackBuild
--rw-r--r--   1 root root      776 2009-07-01 15:44 ./source/l/giflib/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/glib
--rw-r--r--   1 root root   346080 2001-03-15 14:59 ./source/l/glib/glib-1.2.10.tar.bz2
--rwxr-xr-x   1 root root     3427 2009-05-19 20:05 ./source/l/glib/glib.SlackBuild
--rw-r--r--   1 root root   110117 2006-12-01 09:17 ./source/l/glib/glib1.2_1.2.10-17.diff.bz2
--rw-r--r--   1 root root      757 2007-03-08 16:59 ./source/l/glib/slack-desc
-drwxr-xr-x   2 root root     4096 2010-03-19 16:44 ./source/l/glib2
--rw-r--r--   1 root root      406 2008-04-10 04:31 ./source/l/glib2/doinst.sh.gz
--rw-r--r--   1 root root  3573316 2010-03-16 12:09 ./source/l/glib2/glib-2.22.5.tar.xz
--rwxr-xr-x   1 root root     3724 2010-02-06 23:54 ./source/l/glib2/glib2.SlackBuild
--rw-r--r--   1 root root      999 2008-03-18 07:10 ./source/l/glib2/libglib2.csh
--rw-r--r--   1 root root      982 2008-03-18 07:08 ./source/l/glib2/libglib2.sh
--rw-r--r--   1 root root      691 2003-01-11 05:50 ./source/l/glib2/slack-desc
-drwxr-xr-x   4 root root     4096 2010-05-12 05:29 ./source/l/glibc
--rw-r--r--   1 root root     7282 2009-12-31 00:26 ./source/l/glibc/doinst.sh-glibc
--rw-r--r--   1 root root     4542 2009-12-31 00:27 ./source/l/glibc/doinst.sh-glibc-solibs
--rw-r--r--   1 root root     1029 2007-02-18 04:26 ./source/l/glibc/doinst.sh-glibc-zoneinfo
--rw-r--r--   1 root root      652 2009-01-09 04:49 ./source/l/glibc/glibc-2.10-dns-no-gethostbyname4.diff.gz
--rw-r--r--   1 root root 10113940 2009-12-29 16:01 ./source/l/glibc/glibc-2.11.1.tar.xz
--rw-r--r--   1 root root      198 2009-12-29 16:01 ./source/l/glibc/glibc-2.11.1.tar.xz.sig
--rwxr-xr-x   1 root root      174 2004-08-09 06:21 ./source/l/glibc/glibc-cvs-checkout.sh
--rwxr-xr-x   1 root root    14965 2010-05-12 05:30 ./source/l/glibc/glibc.SlackBuild
--rw-r--r--   1 root root      183 2006-10-11 03:11 ./source/l/glibc/glibc.getcwd.max.macro.diff.gz
--rw-r--r--   1 root root      304 2004-08-04 00:21 ./source/l/glibc/glibc.locale.no-archive.diff.gz
--rw-r--r--   1 root root      325 2006-10-11 01:49 ./source/l/glibc/glibc.nis-netgroups.diff.gz
--rw-r--r--   1 root root      246 2009-02-24 23:39 ./source/l/glibc/glibc.revert.to.fix.build.breakages.diff.gz
--rw-r--r--   1 root root      213 2006-08-22 06:33 ./source/l/glibc/glibc.ru_RU.CP1251.diff.gz
--rw-r--r--   1 root root      254 2007-10-31 01:17 ./source/l/glibc/is_IS.diff.gz
-drwxr-xr-x   2 root root     4096 2006-09-14 06:32 ./source/l/glibc/profile.d
--rwxr-xr-x   1 root root      328 2006-09-14 08:26 ./source/l/glibc/profile.d/glibc.csh.new
--rwxr-xr-x   1 root root      325 2006-09-14 08:26 ./source/l/glibc/profile.d/glibc.sh.new
--rw-r--r--   1 root root      845 2002-10-11 19:15 ./source/l/glibc/slack-desc.glibc
--rw-r--r--   1 root root     1139 2002-10-12 04:15 ./source/l/glibc/slack-desc.glibc-debug
--rw-r--r--   1 root root      794 2002-05-01 00:01 ./source/l/glibc/slack-desc.glibc-i18n
--rw-r--r--   1 root root      972 2005-11-18 17:02 ./source/l/glibc/slack-desc.glibc-profile
--rw-r--r--   1 root root      786 2002-03-23 23:26 ./source/l/glibc/slack-desc.glibc-solibs
--rw-r--r--   1 root root     1227 2006-11-23 03:35 ./source/l/glibc/slack-desc.glibc-solibs-linuxthreads
--rw-r--r--   1 root root      965 2007-04-30 20:52 ./source/l/glibc/slack-desc.glibc-zoneinfo
-drwxr-xr-x   3 root root     4096 2009-02-25 00:09 ./source/l/glibc/timezone-scripts
--rw-r--r--   1 root root     2106 2006-12-04 00:32 ./source/l/glibc/timezone-scripts/output-updated-timeconfig.sh
-drwxr-xr-x   2 root root     4096 2006-12-03 23:10 ./source/l/glibc/timezone-scripts/parts
--rw-r--r--   1 root root     4398 2008-03-10 11:39 ./source/l/glibc/timezone-scripts/parts/00
--rw-r--r--   1 root root    44857 2007-09-18 00:33 ./source/l/glibc/timezone-scripts/parts/01
--rw-r--r--   1 root root      443 2006-12-03 22:53 ./source/l/glibc/timezone-scripts/parts/02
--rw-r--r--   1 root root    31601 2007-09-18 00:34 ./source/l/glibc/timezone-scripts/parts/03
--rw-r--r--   1 root root      857 2006-12-03 22:54 ./source/l/glibc/timezone-scripts/parts/04
--rw-r--r--   1 root root       87 2006-12-03 23:10 ./source/l/glibc/timezone-scripts/parts/README
--rw-r--r--   1 root root       66 2003-02-16 21:17 ./source/l/glibc/timezone-scripts/setup.timeconfig
--rw-r--r--   1 root root    84202 2009-02-25 00:09 ./source/l/glibc/timezone-scripts/timeconfig
--rw-r--r--   1 root root   191844 2010-05-10 13:07 ./source/l/glibc/tzcode2010j.tar.gz
--rw-r--r--   1 root root   189870 2010-05-10 13:07 ./source/l/glibc/tzdata2010j.tar.gz
-drwxr-xr-x   2 root root     4096 2010-02-03 23:41 ./source/l/gmime
--rw-r--r--   1 root root   719516 2010-02-02 15:00 ./source/l/gmime/gmime-2.4.15.tar.xz
--rwxr-xr-x   1 root root     3655 2010-02-04 00:12 ./source/l/gmime/gmime.SlackBuild
--rw-r--r--   1 root root      753 2007-03-14 03:39 ./source/l/gmime/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/gmm
--rw-r--r--   1 root root   333173 2008-09-09 18:47 ./source/l/gmm/gmm-3.1.tar.bz2
--rwxr-xr-x   1 root root     2111 2009-05-19 20:05 ./source/l/gmm/gmm.SlackBuild
--rw-r--r--   1 root root      117 2008-07-25 02:47 ./source/l/gmm/gmm.info
--rw-r--r--   1 root root     1035 2008-08-01 03:49 ./source/l/gmm/slack-desc
-drwxr-xr-x   2 root root     4096 2010-02-24 02:20 ./source/l/gmp
--rw-r--r--   1 root root  1656884 2010-02-06 12:51 ./source/l/gmp/gmp-5.0.1.tar.xz
--rwxr-xr-x   1 root root     3225 2010-02-24 02:23 ./source/l/gmp/gmp.SlackBuild
--rw-r--r--   1 root root      766 2003-06-24 00:14 ./source/l/gmp/slack-desc
-drwxr-xr-x   2 root root     4096 2010-04-28 15:29 ./source/l/gnome-icon-theme
--rw-r--r--   1 root root      138 2009-07-14 19:52 ./source/l/gnome-icon-theme/doinst.sh.gz
--rw-r--r--   1 root root 12171220 2010-04-27 16:32 ./source/l/gnome-icon-theme/gnome-icon-theme-2.30.2.tar.xz
--rwxr-xr-x   1 root root     3083 2010-02-12 00:52 ./source/l/gnome-icon-theme/gnome-icon-theme.SlackBuild
--rw-r--r--   1 root root      414 2010-04-28 15:29 ./source/l/gnome-icon-theme/gnome-icon-theme.pkgconfig.path.diff.gz
--rw-r--r--   1 root root      766 2008-02-11 03:44 ./source/l/gnome-icon-theme/slack-desc
-drwxr-xr-x   2 root root     4096 2010-04-28 16:13 ./source/l/gst-plugins-base
--rw-r--r--   1 root root  1861688 2010-04-28 01:14 ./source/l/gst-plugins-base/gst-plugins-base-0.10.29.tar.xz
--rwxr-xr-x   1 root root     3696 2010-02-11 21:17 ./source/l/gst-plugins-base/gst-plugins-base.SlackBuild
--rw-r--r--   1 root root     1067 2008-08-01 03:34 ./source/l/gst-plugins-base/slack-desc
-drwxr-xr-x   2 root root     4096 2010-04-28 16:21 ./source/l/gst-plugins-good
--rw-r--r--   1 root root  2217460 2010-04-28 01:56 ./source/l/gst-plugins-good/gst-plugins-good-0.10.22.tar.xz
--rwxr-xr-x   1 root root     3933 2010-04-28 16:21 ./source/l/gst-plugins-good/gst-plugins-good.SlackBuild
--rw-r--r--   1 root root      902 2009-11-03 21:04 ./source/l/gst-plugins-good/slack-desc
-drwxr-xr-x   2 root root     4096 2010-04-28 16:13 ./source/l/gstreamer
--rw-r--r--   1 root root  2675396 2010-04-27 22:30 ./source/l/gstreamer/gstreamer-0.10.29.tar.xz
--rwxr-xr-x   1 root root     4042 2010-02-11 21:09 ./source/l/gstreamer/gstreamer.SlackBuild
--rw-r--r--   1 root root     1060 2008-08-01 03:31 ./source/l/gstreamer/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/gtk+
--rw-r--r--   1 root root  2248773 2001-04-02 03:04 ./source/l/gtk+/gtk+-1.2.10.tar.bz2
--rwxr-xr-x   1 root root     3533 2009-06-09 02:22 ./source/l/gtk+/gtk+.SlackBuild
--rw-r--r--   1 root root   159953 2005-10-06 11:17 ./source/l/gtk+/gtk+1.2_1.2.10-18.diff.bz2
--rw-r--r--   1 root root      806 2007-03-08 17:07 ./source/l/gtk+/slack-desc
-drwxr-xr-x   3 root root     4096 2010-03-19 16:45 ./source/l/gtk+2
--rw-r--r--   1 root root      673 2009-04-06 00:28 ./source/l/gtk+2/doinst.sh.gz
--rw-r--r--   1 root root 11812004 2010-03-17 17:22 ./source/l/gtk+2/gtk+-2.18.9.tar.xz
--rwxr-xr-x   1 root root     6881 2010-03-16 19:13 ./source/l/gtk+2/gtk+2.SlackBuild
--rw-r--r--   1 root root      337 2010-02-12 06:48 ./source/l/gtk+2/gtk.png14.diff.gz
--rw-r--r--   1 root root      236 2009-12-04 03:57 ./source/l/gtk+2/gtk.pnglz.diff.gz
--rw-r--r--   1 root root      265 2010-02-08 20:43 ./source/l/gtk+2/gtk.xid.nowarningflood.diff.gz
-drwxr-xr-x   2 root root     4096 2003-01-11 06:27 ./source/l/gtk+2/profile.d
--rwxr-xr-x   1 root root       32 2003-01-11 06:27 ./source/l/gtk+2/profile.d/gtk+.csh
--rwxr-xr-x   1 root root       43 2003-01-11 06:28 ./source/l/gtk+2/profile.d/gtk+.sh
--rw-r--r--   1 root root      791 2008-02-11 03:44 ./source/l/gtk+2/slack-desc
--rw-r--r--   1 root root     2476 2009-08-11 18:04 ./source/l/gtk+2/update-gdk-pixbuf-loaders
--rw-r--r--   1 root root     2412 2009-08-11 18:04 ./source/l/gtk+2/update-gtk-immodules
-drwxr-xr-x   2 root root     4096 2009-06-09 05:27 ./source/l/gtkspell
--rw-r--r--   1 root root   277039 2008-12-03 21:24 ./source/l/gtkspell/gtkspell-2.0.15.tar.bz2
--rwxr-xr-x   1 root root     3288 2009-05-19 20:05 ./source/l/gtkspell/gtkspell.SlackBuild
--rw-r--r--   1 root root      789 2008-09-18 22:42 ./source/l/gtkspell/slack-desc
-drwxr-xr-x   3 root root     4096 2010-02-09 03:10 ./source/l/hal
-drwxr-xr-x   3 root root     4096 2009-12-31 22:04 ./source/l/hal-info
--rw-r--r--   1 root root   108915 2009-12-01 03:07 ./source/l/hal-info/hal-info-20091130.tar.bz2
--rwxr-xr-x   1 root root     2273 2010-02-09 03:15 ./source/l/hal-info/hal-info.SlackBuild
-drwxr-xr-x   2 root root     4096 2009-12-31 22:04 ./source/l/hal-info/patches
--rw-r--r--   1 root root      952 2009-12-31 22:04 ./source/l/hal-info/patches/quirk-LG_X110-keyboard.patch.gz
--rw-r--r--   1 root root      603 2009-12-31 22:02 ./source/l/hal-info/patches/quirk-acer_aspire_hotkey.patch.gz
--rw-r--r--   1 root root      757 2009-04-14 19:53 ./source/l/hal-info/slack-desc
--rw-r--r--   1 root root      346 2009-07-15 08:09 ./source/l/hal/doinst.sh.gz
--rw-r--r--   1 root root   762460 2009-11-30 22:28 ./source/l/hal/hal-0.5.14.tar.xz
--rwxr-xr-x   1 root root     5678 2010-03-04 00:22 ./source/l/hal/hal.SlackBuild
--rw-r--r--   1 root root      643 2009-09-09 06:02 ./source/l/hal/hal.conf.gz
-drwxr-xr-x   2 root root     4096 2010-03-04 00:20 ./source/l/hal/patches
--rw-r--r--   1 root root     1338 2009-12-12 06:06 ./source/l/hal/patches/10-keymap.fdi-restore_zap.diff.gz
--rw-r--r--   1 root root      679 2010-03-04 00:18 ./source/l/hal/patches/fix_ioperm_arguments.patch.gz
--rw-r--r--   1 root root      970 2009-12-12 06:04 ./source/l/hal/patches/fix_libusb_detection.diff.gz
--rw-r--r--   1 root root     1274 2010-03-04 00:16 ./source/l/hal/patches/fix_segfault-dbus_error_init.patch.gz
--rw-r--r--   1 root root     1037 2009-12-31 02:02 ./source/l/hal/patches/fix_segfault_in_LIBHAL_FREE_DBUS_ERROR.diff.gz
--rw-r--r--   1 root root     1009 2010-01-20 03:52 ./source/l/hal/patches/handle_input.touchpad_explicitly.diff.gz
--rw-r--r--   1 root root      641 2010-01-09 00:01 ./source/l/hal/patches/increase_HAL_PATH_MAX_to_4096.diff.gz
--rw-r--r--   1 root root      438 2009-09-09 05:38 ./source/l/hal/rc.hald.gz
--rw-r--r--   1 root root      918 2009-07-15 08:08 ./source/l/hal/slack-desc
-drwxr-xr-x   2 root root     4096 2010-04-27 20:39 ./source/l/hicolor-icon-theme
--rw-r--r--   1 root root      542 2008-03-18 01:10 ./source/l/hicolor-icon-theme/doinst.sh.gz
--rw-r--r--   1 root root    38008 2010-01-13 10:20 ./source/l/hicolor-icon-theme/hicolor-icon-theme-0.12.tar.gz
--rwxr-xr-x   1 root root     2277 2010-04-30 00:40 ./source/l/hicolor-icon-theme/hicolor-icon-theme.SlackBuild
--rw-r--r--   1 root root      522 2008-03-18 01:11 ./source/l/hicolor-icon-theme/setup.08.gtk-update-icon-cache
--rw-r--r--   1 root root      914 2006-08-11 03:58 ./source/l/hicolor-icon-theme/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-04 00:43 ./source/l/hunspell
--rw-r--r--   1 root root   505780 2010-03-03 20:36 ./source/l/hunspell/hunspell-1.2.9.tar.xz
--rwxr-xr-x   1 root root     3525 2010-03-26 21:52 ./source/l/hunspell/hunspell.SlackBuild
--rw-r--r--   1 root root      964 2010-03-21 22:20 ./source/l/hunspell/slack-desc
-drwxr-xr-x   2 root root     4096 2009-03-05 23:09 ./source/l/icon-naming-utils
--rw-r--r--   1 root root    70352 2009-02-21 03:41 ./source/l/icon-naming-utils/icon-naming-utils-0.8.90.tar.gz
--rwxr-xr-x   1 root root     2235 2009-08-22 19:44 ./source/l/icon-naming-utils/icon-naming-utils.SlackBuild
--rw-r--r--   1 root root      219 2009-03-05 22:05 ./source/l/icon-naming-utils/icon-naming-utils.pkgconfigdir.diff.gz
--rw-r--r--   1 root root      917 2009-03-05 22:59 ./source/l/icon-naming-utils/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/ilmbase
--rw-r--r--   1 root root   323959 2007-10-22 21:53 ./source/l/ilmbase/ilmbase-1.0.1.tar.bz2
--rwxr-xr-x   1 root root     2695 2009-05-19 20:05 ./source/l/ilmbase/ilmbase.SlackBuild
--rw-r--r--   1 root root      162 2008-04-29 21:14 ./source/l/ilmbase/ilmbase.info
--rw-r--r--   1 root root      829 2008-08-01 03:47 ./source/l/ilmbase/slack-desc
-drwxr-xr-x   2 root root     4096 2010-02-11 21:10 ./source/l/imlib
--rw-r--r--   1 root root   605220 2004-09-24 14:45 ./source/l/imlib/imlib-1.9.15.tar.xz
--rwxr-xr-x   1 root root     3193 2010-02-11 21:10 ./source/l/imlib/imlib.SlackBuild
--rw-r--r--   1 root root      799 2008-04-28 21:21 ./source/l/imlib/imlib.mitshm.render.diff.gz
--rw-r--r--   1 root root      857 2008-02-11 03:44 ./source/l/imlib/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/iso-codes
--rw-r--r--   1 root root  5323027 2009-04-02 14:23 ./source/l/iso-codes/iso-codes-3.8.tar.bz2
--rwxr-xr-x   1 root root     2137 2009-05-19 20:05 ./source/l/iso-codes/iso-codes.SlackBuild
--rw-r--r--   1 root root      212 2008-11-14 15:31 ./source/l/iso-codes/iso-codes.info
--rw-r--r--   1 root root      471 2008-11-14 15:29 ./source/l/iso-codes/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/jasper
--rw-r--r--   1 root root   958519 2009-04-03 00:58 ./source/l/jasper/jasper-1.900.1.tar.bz2
--rwxr-xr-x   1 root root     3513 2010-02-11 20:18 ./source/l/jasper/jasper.SlackBuild
--rw-r--r--   1 root root      839 2007-09-16 15:27 ./source/l/jasper/slack-desc
-drwxr-xr-x   3 root root     4096 2010-05-09 01:13 ./source/l/jre
--rw-r--r--   1 root root     3767 2010-04-12 21:23 ./source/l/jre/COPYRIGHT
--rw-r--r--   1 root root    12720 2010-04-12 21:23 ./source/l/jre/LICENSE
--rw-r--r--   1 root root    15906 2010-04-12 21:23 ./source/l/jre/README
--rw-r--r--   1 root root   183173 2010-04-12 21:23 ./source/l/jre/THIRDPARTYLICENSEREADME.txt
--rw-r--r--   1 root root      968 2010-04-12 21:23 ./source/l/jre/Welcome.html
--rw-r--r--   1 root root 20469462 2010-05-08 22:27 ./source/l/jre/jre-6u20-linux-x64.bin
--rwxr-xr-x   1 root root     4246 2010-05-09 01:13 ./source/l/jre/jre.SlackBuild
-drwxr-xr-x   2 root root     4096 2009-04-29 19:47 ./source/l/jre/profile.d
--rwxr-xr-x   1 root root      122 2009-04-29 17:28 ./source/l/jre/profile.d/jre.csh
--rwxr-xr-x   1 root root      125 2009-04-29 17:29 ./source/l/jre/profile.d/jre.sh
--rw-r--r--   1 root root     1007 2010-05-09 01:13 ./source/l/jre/slack-desc
-drwxr-xr-x   2 root root     4096 2010-02-20 05:51 ./source/l/lcms
--rw-r--r--   1 root root   608880 2009-10-30 15:57 ./source/l/lcms/lcms-1.19.tar.xz
--rwxr-xr-x   1 root root     3261 2010-02-20 05:52 ./source/l/lcms/lcms.SlackBuild
--rw-r--r--   1 root root      665 2004-02-22 08:32 ./source/l/lcms/slack-desc
-drwxr-xr-x   2 root root     4096 2010-04-19 20:00 ./source/l/lesstif
--rw-r--r--   1 root root      210 2007-02-07 06:18 ./source/l/lesstif/doinst.sh.gz
--rw-r--r--   1 root root  1821464 2009-05-27 14:10 ./source/l/lesstif/lesstif-0.95.2.tar.xz
--rw-r--r--   1 root root      507 2008-10-21 20:43 ./source/l/lesstif/lesstif.Makefile.in.patch.gz
--rw-r--r--   1 root root      737 2008-10-21 20:30 ./source/l/lesstif/lesstif.PutPixel32.patch.gz
--rwxr-xr-x   1 root root     4824 2010-04-19 20:12 ./source/l/lesstif/lesstif.SlackBuild
--rw-r--r--   1 root root      267 2009-03-23 21:35 ./source/l/lesstif/lesstif.rendertable.check.diff.gz
--rw-r--r--   1 root root      588 2008-10-17 20:29 ./source/l/lesstif/lesstif.x86_64.patch.gz
--rw-r--r--   1 root root      984 2002-03-23 23:35 ./source/l/lesstif/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-11 01:12 ./source/l/libaio
--rw-r--r--   1 root root    43579 2009-10-09 21:15 ./source/l/libaio/libaio-0.3.109.tar.bz2
--rw-r--r--   1 root root      248 2009-10-09 21:15 ./source/l/libaio/libaio-0.3.109.tar.sign
--rwxr-xr-x   1 root root     3782 2010-05-11 01:13 ./source/l/libaio/libaio.SlackBuild
--rw-r--r--   1 root root      962 2008-04-10 03:50 ./source/l/libaio/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/libao
--rw-r--r--   1 root root   405619 2007-05-24 11:20 ./source/l/libao/libao-0.8.8.tar.gz
--rwxr-xr-x   1 root root     2356 2009-05-19 20:05 ./source/l/libao/libao.SlackBuild
--rw-r--r--   1 root root      884 2003-12-19 00:27 ./source/l/libao/slack-desc
-drwxr-xr-x   2 root root     4096 2010-03-06 19:40 ./source/l/libarchive
--rw-r--r--   1 root root   952796 2010-02-05 05:01 ./source/l/libarchive/libarchive-2.8.0.tar.xz
--rwxr-xr-x   1 root root     3245 2010-03-06 19:41 ./source/l/libarchive/libarchive.SlackBuild
--rw-r--r--   1 root root      145 2008-07-24 14:59 ./source/l/libarchive/libarchive.info
--rw-r--r--   1 root root      872 2009-03-07 18:02 ./source/l/libarchive/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/libart_lgpl
--rw-r--r--   1 root root   302903 2008-01-30 10:10 ./source/l/libart_lgpl/libart_lgpl-2.3.20.tar.bz2
--rwxr-xr-x   1 root root     2476 2009-05-19 20:05 ./source/l/libart_lgpl/libart_lgpl.SlackBuild
--rw-r--r--   1 root root      823 2007-05-04 21:13 ./source/l/libart_lgpl/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-23 00:41 ./source/l/libcaca
--rw-r--r--   1 root root   750005 2008-10-18 12:58 ./source/l/libcaca/libcaca-0.99.beta16.tar.bz2
--rwxr-xr-x   1 root root     3330 2009-06-09 01:21 ./source/l/libcaca/libcaca.SlackBuild
--rw-r--r--   1 root root      817 2004-04-20 23:03 ./source/l/libcaca/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-05 05:54 ./source/l/libcap
--rw-r--r--   1 root root      553 2008-10-30 18:03 ./source/l/libcap/README.SLACKWARE
--rw-r--r--   1 root root    11907 2008-03-29 00:07 ./source/l/libcap/capfaq-0.2.txt
--rw-r--r--   1 root root    53099 2010-01-14 02:09 ./source/l/libcap/libcap-2.19.tar.bz2
--rw-r--r--   1 root root      248 2010-01-14 02:09 ./source/l/libcap/libcap-2.19.tar.bz2.sign
--rwxr-xr-x   1 root root     3957 2010-05-05 05:58 ./source/l/libcap/libcap.SlackBuild
--rw-r--r--   1 root root      194 2009-04-11 18:20 ./source/l/libcap/libcap.capability.h.fix.broken.includes.diff.gz
--rw-r--r--   1 root root      837 2008-10-30 18:03 ./source/l/libcap/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/libcddb
--rw-r--r--   1 root root   329319 2006-10-15 12:15 ./source/l/libcddb/libcddb-1.3.0.tar.bz2
--rwxr-xr-x   1 root root     3265 2009-05-19 20:05 ./source/l/libcddb/libcddb.SlackBuild
--rw-r--r--   1 root root      786 2008-03-10 09:31 ./source/l/libcddb/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-23 00:41 ./source/l/libcdio
--rw-r--r--   1 root root  1308090 2007-10-27 05:07 ./source/l/libcdio/libcdio-0.79.tar.bz2
--rwxr-xr-x   1 root root     3300 2010-03-11 20:01 ./source/l/libcdio/libcdio.SlackBuild
--rw-r--r--   1 root root     1012 2008-03-10 09:14 ./source/l/libcdio/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-04 00:31 ./source/l/libdiscid
--rw-r--r--   1 root root   347907 2008-08-06 19:46 ./source/l/libdiscid/libdiscid-0.2.2.tar.gz
--rwxr-xr-x   1 root root     3431 2010-04-30 21:49 ./source/l/libdiscid/libdiscid.SlackBuild
--rw-r--r--   1 root root      940 2010-05-04 00:19 ./source/l/libdiscid/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/libdvdread
--rw-r--r--   1 root root    96899 2008-09-07 14:22 ./source/l/libdvdread/libdvdread-4.1.3.tar.bz2
--rwxr-xr-x   1 root root     2533 2009-05-19 20:05 ./source/l/libdvdread/libdvdread.SlackBuild
--rw-r--r--   1 root root      858 2009-03-08 00:28 ./source/l/libdvdread/slack-desc
-drwxr-xr-x   2 root root     4096 2010-02-07 23:27 ./source/l/libexif
--rw-r--r--   1 root root   768076 2010-02-07 23:26 ./source/l/libexif/libexif-0.6.19.tar.xz
--rwxr-xr-x   1 root root     3336 2010-02-07 23:28 ./source/l/libexif/libexif.SlackBuild
--rw-r--r--   1 root root      190 2007-05-28 17:50 ./source/l/libexif/libexif.pc.diff.gz
--rw-r--r--   1 root root      855 2008-02-11 03:44 ./source/l/libexif/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/libglade
--rw-r--r--   1 root root   356119 2009-03-23 15:10 ./source/l/libglade/libglade-2.6.4.tar.bz2
--rwxr-xr-x   1 root root     3575 2010-04-25 20:44 ./source/l/libglade/libglade.SlackBuild
--rw-r--r--   1 root root      808 2008-02-11 03:44 ./source/l/libglade/slack-desc
-drwxr-xr-x   2 root root     4096 2010-04-16 20:42 ./source/l/libgphoto2
--rw-r--r--   1 root root  4542028 2010-04-11 13:47 ./source/l/libgphoto2/libgphoto2-2.4.9.tar.xz
--rwxr-xr-x   1 root root     5521 2010-02-14 22:52 ./source/l/libgphoto2/libgphoto2.SlackBuild
--rw-r--r--   1 root root      749 2008-04-27 02:39 ./source/l/libgphoto2/slack-desc
-drwxr-xr-x   2 root root     4096 2009-06-07 20:31 ./source/l/libgpod
--rw-r--r--   1 root root   594656 2009-04-15 21:41 ./source/l/libgpod/libgpod-0.7.2.tar.xz
--rwxr-xr-x   1 root root     3542 2009-06-07 20:32 ./source/l/libgpod/libgpod.SlackBuild
--rw-r--r--   1 root root      976 2006-09-06 23:53 ./source/l/libgpod/slack-desc
-drwxr-xr-x   2 root root     4096 2009-10-28 19:37 ./source/l/libgsf
--rw-r--r--   1 root root   599091 2009-10-28 19:35 ./source/l/libgsf/libgsf-1.14.16.tar.bz2
--rwxr-xr-x   1 root root     3953 2010-02-07 03:26 ./source/l/libgsf/libgsf.SlackBuild
--rw-r--r--   1 root root      793 2006-04-15 21:17 ./source/l/libgsf/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/libical
--rw-r--r--   1 root root      438 2008-11-02 11:50 ./source/l/libical/README
--rw-r--r--   1 root root   759128 2009-01-12 03:01 ./source/l/libical/libical-0.43.tar.bz2
--rwxr-xr-x   1 root root     3024 2009-05-19 20:05 ./source/l/libical/libical.SlackBuild
--rw-r--r--   1 root root      272 2008-11-02 20:27 ./source/l/libical/libical.info
--rw-r--r--   1 root root      923 2008-10-28 10:13 ./source/l/libical/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/libid3tag
--rw-r--r--   1 root root      222 2009-03-23 21:58 ./source/l/libid3tag/id3tag.pc
--rw-r--r--   1 root root   338143 2004-02-17 03:54 ./source/l/libid3tag/libid3tag-0.15.1b.tar.gz
--rw-r--r--   1 root root      189 2004-02-18 03:17 ./source/l/libid3tag/libid3tag-0.15.1b.tar.gz.sign
--rwxr-xr-x   1 root root     3529 2009-05-19 20:05 ./source/l/libid3tag/libid3tag.SlackBuild
--rw-r--r--   1 root root      778 2003-09-10 01:00 ./source/l/libid3tag/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/libidl
--rw-r--r--   1 root root   372665 2008-01-29 14:11 ./source/l/libidl/libIDL-0.8.10.tar.bz2
--rwxr-xr-x   1 root root     2617 2009-05-19 20:05 ./source/l/libidl/libidl.SlackBuild
--rw-r--r--   1 root root      795 2008-02-11 03:44 ./source/l/libidl/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/libidn
--rw-r--r--   1 root root  2174951 2008-02-19 19:29 ./source/l/libidn/libidn-1.5.tar.bz2
--rwxr-xr-x   1 root root     3075 2009-05-19 20:05 ./source/l/libidn/libidn.SlackBuild
--rw-r--r--   1 root root      793 2004-10-14 02:11 ./source/l/libidn/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/libieee1284
--rw-r--r--   1 root root   278804 2007-09-18 10:03 ./source/l/libieee1284/libieee1284-0.2.11.tar.bz2
--rwxr-xr-x   1 root root     3222 2009-05-19 20:05 ./source/l/libieee1284/libieee1284.SlackBuild
--rw-r--r--   1 root root      842 2008-02-11 03:44 ./source/l/libieee1284/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-04 00:44 ./source/l/libiodbc
--rw-r--r--   1 root root   658548 2009-12-24 21:16 ./source/l/libiodbc/libiodbc-3.52.7.tar.xz
--rwxr-xr-x   1 root root     3649 2010-05-04 00:44 ./source/l/libiodbc/libiodbc.SlackBuild
--rw-r--r--   1 root root      896 2009-12-24 21:39 ./source/l/libiodbc/slack-desc
-drwxr-xr-x   2 root root     4096 2010-04-05 02:32 ./source/l/libjpeg
--rw-r--r--   1 root root   648772 2010-02-28 10:24 ./source/l/libjpeg/jpegsrc.v8a.tar.xz
--rwxr-xr-x   1 root root     3238 2010-04-05 02:34 ./source/l/libjpeg/libjpeg.SlackBuild
--rw-r--r--   1 root root     1120 2002-03-23 23:37 ./source/l/libjpeg/slack-desc
-drwxr-xr-x   2 root root     4096 2009-06-07 20:28 ./source/l/libkarma
--rw-r--r--   1 root root    81330 2009-06-06 18:10 ./source/l/libkarma/libkarma-0.1.1.tar.gz
--rwxr-xr-x   1 root root     3275 2009-06-07 20:28 ./source/l/libkarma/libkarma.SlackBuild
--rw-r--r--   1 root root      816 2007-02-15 18:44 ./source/l/libkarma/slack-desc
-drwxr-xr-x   2 root root     4096 2009-12-19 00:05 ./source/l/liblastfm
--rw-r--r--   1 root root    92957 2009-10-07 02:59 ./source/l/liblastfm/liblastfm-0.3.0.tar.bz2
--rwxr-xr-x   1 root root     2712 2009-12-19 00:05 ./source/l/liblastfm/liblastfm.SlackBuild
--rw-r--r--   1 root root      663 2009-10-07 02:58 ./source/l/liblastfm/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/libmad
--rw-r--r--   1 root root   502379 2004-02-17 03:55 ./source/l/libmad/libmad-0.15.1b.tar.gz
--rw-r--r--   1 root root      189 2004-02-18 03:17 ./source/l/libmad/libmad-0.15.1b.tar.gz.sign
--rwxr-xr-x   1 root root     3493 2009-05-19 20:05 ./source/l/libmad/libmad.SlackBuild
--rw-r--r--   1 root root      207 2008-02-19 05:30 ./source/l/libmad/mad.pc
--rw-r--r--   1 root root     1055 2003-09-10 01:00 ./source/l/libmad/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/libmcrypt
--rw-r--r--   1 root root   875425 2007-02-19 06:56 ./source/l/libmcrypt/libmcrypt-2.5.8.tar.bz2
--rwxr-xr-x   1 root root     3302 2009-05-19 20:05 ./source/l/libmcrypt/libmcrypt.SlackBuild
--rw-r--r--   1 root root      634 2009-04-04 21:41 ./source/l/libmcrypt/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/libmcs
--rw-r--r--   1 root root    91540 2008-04-20 22:06 ./source/l/libmcs/libmcs-0.7.1.tar.bz2
--rwxr-xr-x   1 root root     3314 2009-05-19 20:05 ./source/l/libmcs/libmcs.SlackBuild
--rw-r--r--   1 root root      966 2008-02-27 02:02 ./source/l/libmcs/slack-desc
-drwxr-xr-x   2 root root     4096 2010-02-14 23:25 ./source/l/libmng
--rw-r--r--   1 root root   737812 2007-07-13 13:23 ./source/l/libmng/libmng-1.0.10.tar.xz
--rwxr-xr-x   1 root root     3759 2010-02-14 23:25 ./source/l/libmng/libmng.SlackBuild
--rw-r--r--   1 root root      941 2003-08-04 20:41 ./source/l/libmng/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/libmowgli
--rw-r--r--   1 root root    92904 2007-12-27 23:15 ./source/l/libmowgli/libmowgli-0.6.0.tar.bz2
--rwxr-xr-x   1 root root     3529 2009-05-19 20:05 ./source/l/libmowgli/libmowgli.SlackBuild
--rw-r--r--   1 root root      859 2008-01-30 06:50 ./source/l/libmowgli/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-04 00:31 ./source/l/libmsn
--rw-r--r--   1 root root   289614 2010-03-24 11:18 ./source/l/libmsn/libmsn-4.1.tar.bz2
--rwxr-xr-x   1 root root     2927 2010-03-24 11:18 ./source/l/libmsn/libmsn.SlackBuild
--rw-r--r--   1 root root      771 2010-05-04 00:20 ./source/l/libmsn/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-03 18:40 ./source/l/libmtp
--rw-r--r--   1 root root   408544 2009-09-12 06:41 ./source/l/libmtp/libmtp-1.0.1.tar.xz
--rwxr-xr-x   1 root root     4318 2010-05-03 18:41 ./source/l/libmtp/libmtp.SlackBuild
--rw-r--r--   1 root root     1059 2010-05-03 18:39 ./source/l/libmtp/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-23 00:41 ./source/l/libnjb
--rw-r--r--   1 root root     1674 2007-10-26 01:41 ./source/l/libnjb/80-libnjb.rules
--rw-r--r--   1 root root   404914 2007-09-05 21:38 ./source/l/libnjb/libnjb-2.2.6.tar.bz2
--rwxr-xr-x   1 root root     3829 2009-05-23 00:41 ./source/l/libnjb/libnjb.SlackBuild
--rw-r--r--   1 root root      997 2006-09-07 00:24 ./source/l/libnjb/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/libnl
--rw-r--r--   1 root root   217408 2008-06-08 22:23 ./source/l/libnl/libnl-1.1.tar.bz2
--rw-r--r--   1 root root      237 2009-02-23 00:09 ./source/l/libnl/libnl-include_limits.h.patch.gz
--rwxr-xr-x   1 root root     2778 2009-05-19 20:05 ./source/l/libnl/libnl.SlackBuild
--rw-r--r--   1 root root      112 2009-02-23 00:22 ./source/l/libnl/libnl.info
--rw-r--r--   1 root root      786 2008-06-08 22:23 ./source/l/libnl/slack-desc
-drwxr-xr-x   2 root root     4096 2010-01-21 22:41 ./source/l/libnotify
--rw-r--r--   1 root root   242600 2008-11-20 11:22 ./source/l/libnotify/libnotify-0.4.5.tar.xz
--rwxr-xr-x   1 root root     2768 2010-02-12 19:52 ./source/l/libnotify/libnotify.SlackBuild
--rw-r--r--   1 root root      707 2009-05-31 20:27 ./source/l/libnotify/slack-desc
-drwxr-xr-x   2 root root     4096 2010-02-06 21:32 ./source/l/libogg
--rw-r--r--   1 root root   257988 2009-06-23 16:12 ./source/l/libogg/libogg-1.1.4.tar.xz
--rwxr-xr-x   1 root root     2841 2010-02-06 21:40 ./source/l/libogg/libogg.SlackBuild
--rw-r--r--   1 root root      762 2003-12-19 00:28 ./source/l/libogg/slack-desc
-drwxr-xr-x   2 root root     4096 2009-06-02 22:03 ./source/l/liboil
--rw-r--r--   1 root root   481104 2009-03-19 21:12 ./source/l/liboil/liboil-0.3.16.tar.xz
--rwxr-xr-x   1 root root     2857 2009-06-02 22:10 ./source/l/liboil/liboil.SlackBuild
--rw-r--r--   1 root root     1033 2008-08-01 05:06 ./source/l/liboil/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-08 03:24 ./source/l/libpng
--rw-r--r--   1 root root   538832 2010-02-25 11:56 ./source/l/libpng/libpng-1.2.43.tar.xz
--rw-r--r--   1 root root   527736 2010-05-06 10:30 ./source/l/libpng/libpng-1.4.2.tar.xz
--rwxr-xr-x   1 root root     4389 2010-05-08 03:25 ./source/l/libpng/libpng.SlackBuild
--rw-r--r--   1 root root      949 2002-03-23 23:42 ./source/l/libpng/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-11 01:16 ./source/l/libraw1394
--rw-r--r--   1 root root      191 2007-12-09 17:25 ./source/l/libraw1394/README
--rw-r--r--   1 root root   320413 2009-12-27 01:09 ./source/l/libraw1394/libraw1394-2.0.5.tar.bz2
--rw-r--r--   1 root root      248 2009-12-27 01:09 ./source/l/libraw1394/libraw1394-2.0.5.tar.sign
--rwxr-xr-x   1 root root     3633 2010-05-11 01:18 ./source/l/libraw1394/libraw1394.SlackBuild
--rw-r--r--   1 root root      807 2010-05-11 01:16 ./source/l/libraw1394/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/librsvg
--rw-r--r--   1 root root   477499 2009-03-16 19:26 ./source/l/librsvg/librsvg-2.26.0.tar.bz2
--rwxr-xr-x   1 root root     3632 2010-02-12 21:37 ./source/l/librsvg/librsvg.SlackBuild
--rw-r--r--   1 root root      361 2008-10-05 22:10 ./source/l/librsvg/librsvg_seamonkey-config.diff.gz
--rw-r--r--   1 root root      632 2008-02-11 03:44 ./source/l/librsvg/slack-desc
-drwxr-xr-x   2 root root     4096 2009-12-17 01:34 ./source/l/libsamplerate
--rw-r--r--   1 root root  3268548 2009-02-14 11:56 ./source/l/libsamplerate/libsamplerate-0.1.7.tar.xz
--rwxr-xr-x   1 root root     1804 2009-12-17 03:03 ./source/l/libsamplerate/libsamplerate.SlackBuild
--rw-r--r--   1 root root     1117 2009-12-17 01:20 ./source/l/libsamplerate/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-04 00:31 ./source/l/libspectre
--rw-r--r--   1 root root   262053 2010-04-21 10:03 ./source/l/libspectre/libspectre-0.2.5.tar.bz2
--rwxr-xr-x   1 root root     3317 2010-04-20 20:15 ./source/l/libspectre/libspectre.SlackBuild
--rw-r--r--   1 root root      870 2008-10-09 06:04 ./source/l/libspectre/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-23 02:22 ./source/l/libtermcap
--rwxr-xr-x   1 root root     2588 2009-05-19 20:05 ./source/l/libtermcap/libtermcap.SlackBuild
--rw-r--r--   1 root root      938 2008-02-11 03:44 ./source/l/libtermcap/slack-desc
--rw-r--r--   1 root root      213 2002-02-15 01:11 ./source/l/libtermcap/termcap-compat_1.2.3.diff.gz
--rw-r--r--   1 root root      655 2000-02-04 13:21 ./source/l/libtermcap/termcap-compat_1.2.3.dsc
--rw-r--r--   1 root root   552156 2000-02-04 13:21 ./source/l/libtermcap/termcap-compat_1.2.3.tar.gz
--rw-r--r--   1 root root      233 2003-01-03 22:22 ./source/l/libtermcap/termcap.bufsize.diff.gz
--rw-r--r--   1 root root      365 2000-05-10 02:26 ./source/l/libtermcap/termcap.h.diff.gz
-drwxr-xr-x   2 root root     4096 2010-02-17 23:32 ./source/l/libtheora
--rw-r--r--   1 root root  1434496 2010-01-25 14:33 ./source/l/libtheora/libtheora-1.1.1.tar.xz
--rwxr-xr-x   1 root root     3783 2010-02-17 23:33 ./source/l/libtheora/libtheora.SlackBuild
--rw-r--r--   1 root root     1085 2006-09-16 06:01 ./source/l/libtheora/slack-desc
-drwxr-xr-x   2 root root     4096 2010-02-07 22:03 ./source/l/libtiff
--rwxr-xr-x   1 root root     3727 2010-02-07 22:09 ./source/l/libtiff/libtiff.SlackBuild
--rw-r--r--   1 root root      852 2004-10-28 01:28 ./source/l/libtiff/slack-desc
--rw-r--r--   1 root root   926148 2009-11-04 17:32 ./source/l/libtiff/tiff-3.9.2.tar.xz
-drwxr-xr-x   2 root root     4096 2009-12-01 05:09 ./source/l/libusb
--rw-r--r--   1 root root   322956 2009-12-01 04:56 ./source/l/libusb/libusb-1.0.6.tar.bz2
--rw-r--r--   1 root root   251218 2009-12-01 05:01 ./source/l/libusb/libusb-compat-0.1.3.tar.bz2
--rwxr-xr-x   1 root root     5051 2010-02-06 21:51 ./source/l/libusb/libusb.SlackBuild
--rw-r--r--   1 root root      844 2009-12-01 05:10 ./source/l/libusb/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/libvisual
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/libvisual-plugins
--rw-r--r--   1 root root   575514 2006-03-20 21:09 ./source/l/libvisual-plugins/libvisual-plugins-0.4.0.tar.bz2
--rwxr-xr-x   1 root root     3078 2009-06-10 01:24 ./source/l/libvisual-plugins/libvisual-plugins.SlackBuild
--rw-r--r--   1 root root      912 2008-09-12 05:08 ./source/l/libvisual-plugins/libvisual-plugins.gstreamer.diff.gz
--rw-r--r--   1 root root     1190 2008-09-12 05:35 ./source/l/libvisual-plugins/slack-desc
--rw-r--r--   1 root root   430496 2006-03-20 21:08 ./source/l/libvisual/libvisual-0.4.0.tar.bz2
--rwxr-xr-x   1 root root     3129 2009-05-19 20:05 ./source/l/libvisual/libvisual.SlackBuild
--rw-r--r--   1 root root     1004 2006-08-23 20:17 ./source/l/libvisual/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/libvncserver
--rw-r--r--   1 root root   797659 2009-01-31 04:21 ./source/l/libvncserver/LibVNCServer-0.9.7.tar.bz2
--rwxr-xr-x   1 root root     3473 2010-02-15 01:27 ./source/l/libvncserver/libvncserver.SlackBuild
--rw-r--r--   1 root root      211 2008-01-08 04:53 ./source/l/libvncserver/libvncserver.info
--rw-r--r--   1 root root      830 2008-08-01 05:11 ./source/l/libvncserver/slack-desc
-drwxr-xr-x   2 root root     4096 2009-12-03 21:30 ./source/l/libvorbis
--rw-r--r--   1 root root   948352 2009-12-02 21:53 ./source/l/libvorbis/libvorbis-1.2.3.tar.xz
--rwxr-xr-x   1 root root     2883 2010-02-06 03:12 ./source/l/libvorbis/libvorbis.SlackBuild
--rw-r--r--   1 root root     1020 2003-12-18 23:44 ./source/l/libvorbis/slack-desc
-drwxr-xr-x   2 root root     4096 2010-02-15 00:24 ./source/l/libwmf
--rw-r--r--   1 root root  1271924 2006-06-14 06:20 ./source/l/libwmf/libwmf-0.2.8.4.tar.xz
--rwxr-xr-x   1 root root     3438 2010-02-15 00:24 ./source/l/libwmf/libwmf.SlackBuild
--rw-r--r--   1 root root      340 2010-02-15 00:24 ./source/l/libwmf/libwmf.png14.diff.gz
--rw-r--r--   1 root root      745 2003-12-15 20:23 ./source/l/libwmf/slack-desc
--rw-r--r--   1 root root      767 2003-12-15 20:29 ./source/l/libwmf/slack-desc-docs
-drwxr-xr-x   2 root root     4096 2009-11-30 14:10 ./source/l/libwnck
--rw-r--r--   1 root root   712289 2009-11-30 14:10 ./source/l/libwnck/libwnck-2.28.0.tar.bz2
--rwxr-xr-x   1 root root     3580 2010-02-10 21:11 ./source/l/libwnck/libwnck.SlackBuild
--rw-r--r--   1 root root      933 2007-09-15 21:46 ./source/l/libwnck/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/libwpd
--rw-r--r--   1 root root   424176 2008-02-12 13:46 ./source/l/libwpd/libwpd-0.8.14.tar.bz2
--rwxr-xr-x   1 root root     2617 2009-05-19 20:05 ./source/l/libwpd/libwpd.SlackBuild
--rw-r--r--   1 root root      773 2006-04-15 21:37 ./source/l/libwpd/slack-desc
-drwxr-xr-x   2 root root     4096 2010-02-12 00:22 ./source/l/libxklavier
--rw-r--r--   1 root root   357862 2010-01-11 12:02 ./source/l/libxklavier/libxklavier-5.0.tar.bz2
--rwxr-xr-x   1 root root     3475 2010-02-12 00:23 ./source/l/libxklavier/libxklavier.SlackBuild
--rw-r--r--   1 root root      748 2008-08-01 05:15 ./source/l/libxklavier/slack-desc
-drwxr-xr-x   2 root root     4096 2009-12-05 22:06 ./source/l/libxml2
--rw-r--r--   1 root root  2710700 2009-10-06 16:42 ./source/l/libxml2/libxml2-2.7.6.tar.xz
--rwxr-xr-x   1 root root     3350 2009-12-05 22:07 ./source/l/libxml2/libxml2.SlackBuild
--rw-r--r--   1 root root      980 2008-01-08 23:42 ./source/l/libxml2/slack-desc
-drwxr-xr-x   2 root root     4096 2009-12-05 22:12 ./source/l/libxslt
--rw-r--r--   1 root root  1666032 2009-09-24 14:45 ./source/l/libxslt/libxslt-1.1.26.tar.xz
--rwxr-xr-x   1 root root     3078 2009-12-05 22:13 ./source/l/libxslt/libxslt.SlackBuild
--rw-r--r--   1 root root      678 2005-03-26 23:49 ./source/l/libxslt/slack-desc
-drwxr-xr-x   2 root root     4096 2009-08-16 22:11 ./source/l/libzip
--rw-r--r--   1 root root   307116 2008-07-25 10:49 ./source/l/libzip/libzip-0.9.tar.bz2
--rwxr-xr-x   1 root root     3467 2009-08-16 22:11 ./source/l/libzip/libzip.SlackBuild
--rw-r--r--   1 root root      163 2008-01-08 04:45 ./source/l/libzip/libzip.info
--rw-r--r--   1 root root      882 2008-08-01 05:16 ./source/l/libzip/slack-desc
-drwxr-xr-x   2 root root     4096 2010-04-10 20:51 ./source/l/loudmouth
--rw-r--r--   1 root root   301420 2008-10-29 21:05 ./source/l/loudmouth/loudmouth-1.4.3.tar.xz
--rwxr-xr-x   1 root root     4357 2010-04-10 20:52 ./source/l/loudmouth/loudmouth.SlackBuild
--rw-r--r--   1 root root      403 2008-11-29 00:35 ./source/l/loudmouth/loudmouth.async_assertion.diff.gz
--rw-r--r--   1 root root      272 2009-11-03 22:57 ./source/l/loudmouth/loudmouth.crtpath.diff.gz
--rw-r--r--   1 root root      399 2010-04-10 20:42 ./source/l/loudmouth/loudmouth.gnutls.configure.ac.diff.gz
--rw-r--r--   1 root root      429 2009-06-13 21:28 ./source/l/loudmouth/loudmouth.sasl-md5-digest-uri.diff.gz
--rw-r--r--   1 root root      777 2009-11-16 01:46 ./source/l/loudmouth/loudmouth.stanzadrop.diff.gz
--rw-r--r--   1 root root      900 2010-04-10 20:56 ./source/l/loudmouth/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/lzo
--rw-r--r--   1 root root      280 2006-12-11 19:07 ./source/l/lzo/.lzo.info
--rw-r--r--   1 root root   599387 2005-10-17 16:10 ./source/l/lzo/lzo-2.02.tar.gz
--rwxr-xr-x   1 root root     2707 2009-05-19 20:05 ./source/l/lzo/lzo.SlackBuild
--rw-r--r--   1 root root      728 2007-06-10 00:52 ./source/l/lzo/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/mhash
--rw-r--r--   1 root root   634563 2007-04-05 02:35 ./source/l/mhash/mhash-0.9.9.tar.bz2
--rwxr-xr-x   1 root root     2544 2009-05-19 20:05 ./source/l/mhash/mhash.SlackBuild
--rw-r--r--   1 root root      924 2004-05-30 05:13 ./source/l/mhash/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/mm
--rw-r--r--   1 root root   248658 2006-08-15 07:05 ./source/l/mm/mm-1.4.2.tar.bz2
--rwxr-xr-x   1 root root     3497 2009-05-19 20:05 ./source/l/mm/mm.SlackBuild
--rw-r--r--   1 root root     1003 2006-08-10 00:38 ./source/l/mm/slack-desc
-drwxr-xr-x   3 root root     4096 2010-02-24 02:32 ./source/l/mpfr
--rw-r--r--   1 root root   951620 2009-11-30 12:29 ./source/l/mpfr/mpfr-2.4.2.tar.xz
--rwxr-xr-x   1 root root     3270 2010-02-24 02:35 ./source/l/mpfr/mpfr.SlackBuild
-drwxr-xr-x   2 root root     4096 2010-02-24 02:31 ./source/l/mpfr/patches
--rw-r--r--   1 root root     1816 2009-12-07 14:11 ./source/l/mpfr/patches/patch01.gz
--rw-r--r--   1 root root      800 2009-12-18 12:25 ./source/l/mpfr/patches/patch02.gz
--rw-r--r--   1 root root      765 2010-01-11 16:24 ./source/l/mpfr/patches/patch03.gz
--rw-r--r--   1 root root     1042 2006-05-08 19:39 ./source/l/mpfr/slack-desc
-drwxr-xr-x   3 root root     4096 2009-05-19 20:05 ./source/l/ncurses
--rw-r--r--   1 root root     5711 2002-10-08 13:32 ./source/l/ncurses/Eterm.ti
--rw-r--r--   1 root root  2445052 2008-11-03 21:52 ./source/l/ncurses/ncurses-5.7.tar.gz
--rw-r--r--   1 root root      266 2008-11-03 21:53 ./source/l/ncurses/ncurses-5.7.tar.gz.asc
--rwxr-xr-x   1 root root     4742 2009-05-22 21:51 ./source/l/ncurses/ncurses.SlackBuild
--rw-r--r--   1 root root      273 2006-12-27 23:21 ./source/l/ncurses/ncurses.mkhashsize.diff.gz
-drwxr-xr-x   2 root root     4096 2009-02-21 23:09 ./source/l/ncurses/patches
--rw-r--r--   1 root root     2649 2001-03-15 03:08 ./source/l/ncurses/rxvt.terminfo
--rw-r--r--   1 root root     3709 2003-07-21 15:33 ./source/l/ncurses/screeninfo.src
--rw-r--r--   1 root root      904 2008-02-11 03:44 ./source/l/ncurses/slack-desc
--rw-r--r--   1 root root    42014 2007-11-11 23:26 ./source/l/ncurses/xterm.terminfo
-drwxr-xr-x   2 root root     4096 2009-12-05 22:03 ./source/l/neon
--rw-r--r--   1 root root   604268 2009-09-13 12:32 ./source/l/neon/neon-0.29.0.tar.xz
--rwxr-xr-x   1 root root     3632 2009-12-05 22:04 ./source/l/neon/neon.SlackBuild
--rw-r--r--   1 root root      798 2006-09-18 07:08 ./source/l/neon/slack-desc
-drwxr-xr-x   2 root root     4096 2010-02-15 01:04 ./source/l/netpbm
--rw-r--r--   1 root root     9563 2010-02-15 00:59 ./source/l/netpbm/config.mk.gz
--rw-r--r--   1 root root  1917188 2010-02-15 01:03 ./source/l/netpbm/netpbm-10.49.02.tar.xz
--rw-r--r--   1 root root   322974 2004-04-11 19:27 ./source/l/netpbm/netpbm-manpages.tar.bz2
--rwxr-xr-x   1 root root     4039 2010-02-15 00:59 ./source/l/netpbm/netpbm.SlackBuild
--rw-r--r--   1 root root      688 2004-04-11 19:47 ./source/l/netpbm/slack-desc
--rwxr-xr-x   1 root root       77 2007-02-16 00:17 ./source/l/netpbm/svn-checkout-stable.sh
-drwxr-xr-x   2 root root     4096 2009-09-16 18:16 ./source/l/notify-python
--rw-r--r--   1 root root   214514 2006-10-08 18:07 ./source/l/notify-python/notify-python-0.1.1.tar.bz2
--rwxr-xr-x   1 root root     3024 2010-02-20 18:19 ./source/l/notify-python/notify-python.SlackBuild
--rw-r--r--   1 root root      819 2010-02-20 18:25 ./source/l/notify-python/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-23 00:41 ./source/l/openexr
--rw-r--r--   1 root root 12864668 2007-10-22 21:54 ./source/l/openexr/openexr-1.6.1.tar.bz2
--rwxr-xr-x   1 root root     2884 2009-05-23 00:41 ./source/l/openexr/openexr.SlackBuild
--rw-r--r--   1 root root      184 2009-04-06 19:06 ./source/l/openexr/openexr.gcc43.diff.gz
--rw-r--r--   1 root root      162 2008-04-29 21:13 ./source/l/openexr/openexr.info
--rw-r--r--   1 root root      915 2008-08-01 02:42 ./source/l/openexr/slack-desc
-drwxr-xr-x   2 root root     4096 2010-02-12 07:13 ./source/l/pango
--rw-r--r--   1 root root  1536011 2009-12-14 22:22 ./source/l/pango/pango-1.26.2.tar.bz2
--rwxr-xr-x   1 root root     4948 2010-02-12 07:15 ./source/l/pango/pango.SlackBuild
--rw-r--r--   1 root root      450 2009-03-04 23:00 ./source/l/pango/pango.etc.host.location.diff.gz
--rw-r--r--   1 root root      885 2008-02-11 03:44 ./source/l/pango/slack-desc
--rw-r--r--   1 root root     2324 2009-08-11 18:03 ./source/l/pango/update-pango-querymodules
-drwxr-xr-x   2 root root     4096 2010-03-02 18:50 ./source/l/parted
--rw-r--r--   1 root root  1407268 2010-02-26 15:13 ./source/l/parted/parted-2.2.tar.xz
--rwxr-xr-x   1 root root     4158 2010-02-07 03:35 ./source/l/parted/parted.SlackBuild
--rwxr-xr-x   1 root root     4158 2010-02-07 03:35 ./source/l/parted/parted.SlackBuild.static
--rw-r--r--   1 root root      301 2009-12-23 03:52 ./source/l/parted/parted.configure.diff.gz
--rw-r--r--   1 root root      840 2002-06-05 05:27 ./source/l/parted/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-07 19:39 ./source/l/pcre
--rw-r--r--   1 root root   956462 2010-03-19 10:27 ./source/l/pcre/pcre-8.02.tar.bz2
--rw-r--r--   1 root root      287 2010-03-19 10:27 ./source/l/pcre/pcre-8.02.tar.bz2.sig
--rwxr-xr-x   1 root root     4012 2010-05-07 22:45 ./source/l/pcre/pcre.SlackBuild
--rw-r--r--   1 root root      819 2002-03-30 19:17 ./source/l/pcre/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-04 00:31 ./source/l/phonon
--rw-r--r--   1 root root   625008 2010-04-22 14:15 ./source/l/phonon/phonon-4.4.1.tar.bz2
--rwxr-xr-x   1 root root     3527 2010-04-29 21:18 ./source/l/phonon/phonon.SlackBuild
--rw-r--r--   1 root root     4485 2009-11-07 02:31 ./source/l/phonon/phonon.gstreamer.qt-4.5.1.diff.gz
--rw-r--r--   1 root root      761 2010-05-04 01:21 ./source/l/phonon/slack-desc
-drwxr-xr-x   2 root root     4096 2010-02-14 23:47 ./source/l/pil
--rw-r--r--   1 root root   400368 2009-11-15 18:20 ./source/l/pil/Imaging-1.1.7.tar.xz
--rwxr-xr-x   1 root root     3218 2010-02-14 23:52 ./source/l/pil/pil.SlackBuild
--rw-r--r--   1 root root      873 2009-04-30 19:57 ./source/l/pil/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-02 07:06 ./source/l/pilot-link
--rw-r--r--   1 root root  1578735 2010-02-07 03:44 ./source/l/pilot-link/pilot-link-0.12.5.tar.bz2
--rw-r--r--   1 root root      198 2010-02-07 04:48 ./source/l/pilot-link/pilot-link-0.12.5.tar.bz2.asc
--rwxr-xr-x   1 root root     4250 2010-05-02 07:08 ./source/l/pilot-link/pilot-link.SlackBuild
--rw-r--r--   1 root root      645 2010-02-19 18:53 ./source/l/pilot-link/pilot-link.png14.diff.gz
--rw-r--r--   1 root root      877 2008-02-11 03:44 ./source/l/pilot-link/slack-desc
-drwxr-xr-x   2 root root     4096 2010-04-21 21:03 ./source/l/polkit
-drwxr-xr-x   2 root root     4096 2010-05-08 05:25 ./source/l/polkit-gnome
--rw-r--r--   1 root root      268 2010-05-03 06:04 ./source/l/polkit-gnome/pkga.desktop-NotShowInKDE.diff.gz
--rw-r--r--   1 root root   362723 2010-01-15 19:25 ./source/l/polkit-gnome/polkit-gnome-0.96.tar.bz2
--rwxr-xr-x   1 root root     3292 2010-05-08 05:27 ./source/l/polkit-gnome/polkit-gnome.SlackBuild
--rw-r--r--   1 root root      829 2010-05-06 00:15 ./source/l/polkit-gnome/slack-desc
--rw-r--r--   1 root root    30457 2010-03-19 22:49 ./source/l/polkit/polkit-1-shadow.diff
--rw-r--r--   1 root root   310088 2010-03-30 19:58 ./source/l/polkit/polkit-1_14bdfd8.tar.bz2
--rwxr-xr-x   1 root root     4503 2010-04-21 10:24 ./source/l/polkit/polkit.SlackBuild
--rw-r--r--   1 root root      906 2010-01-06 23:14 ./source/l/polkit/slack-desc
-drwxr-xr-x   2 root root     4096 2010-02-18 22:45 ./source/l/poppler
-drwxr-xr-x   2 root root     4096 2010-02-19 05:27 ./source/l/poppler-data
--rw-r--r--   1 root root  1479464 2010-02-19 05:27 ./source/l/poppler-data/poppler-data-0.4.0.tar.xz
--rwxr-xr-x   1 root root     2102 2010-02-19 05:29 ./source/l/poppler-data/poppler-data.SlackBuild
--rw-r--r--   1 root root     1064 2007-04-12 01:35 ./source/l/poppler-data/slack-desc
--rw-r--r--   1 root root  1094116 2010-02-17 22:18 ./source/l/poppler/poppler-0.12.4.tar.xz
--rwxr-xr-x   1 root root     3793 2010-02-14 23:03 ./source/l/poppler/poppler.SlackBuild
--rw-r--r--   1 root root      952 2007-04-10 20:40 ./source/l/poppler/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/popt
--rw-r--r--   1 root root   489869 2002-09-17 20:57 ./source/l/popt/popt-1.7.tar.bz2
--rwxr-xr-x   1 root root     3755 2010-04-26 02:44 ./source/l/popt/popt.SlackBuild
--rw-r--r--   1 root root     1047 2003-02-22 21:32 ./source/l/popt/slack-desc
-drwxr-xr-x   2 root root     4096 2010-02-07 01:47 ./source/l/pycairo
--rw-r--r--   1 root root   351356 2009-09-15 20:44 ./source/l/pycairo/pycairo-1.8.8.tar.xz
--rwxr-xr-x   1 root root     3468 2010-02-07 01:48 ./source/l/pycairo/pycairo.SlackBuild
--rw-r--r--   1 root root       68 2009-12-14 01:46 ./source/l/pycairo/pycairo.url
--rw-r--r--   1 root root      744 2008-02-11 03:44 ./source/l/pycairo/slack-desc
-drwxr-xr-x   2 root root     4096 2010-02-17 20:50 ./source/l/pycups
--rw-r--r--   1 root root    45313 2010-01-19 12:38 ./source/l/pycups/pycups-1.9.48.tar.bz2
--rwxr-xr-x   1 root root     2849 2010-02-17 20:51 ./source/l/pycups/pycups.SlackBuild
--rw-r--r--   1 root root      121 2008-07-25 02:41 ./source/l/pycups/pycups.info
--rw-r--r--   1 root root      688 2008-08-01 05:49 ./source/l/pycups/slack-desc
-drwxr-xr-x   2 root root     4096 2010-02-07 01:36 ./source/l/pygobject
--rw-r--r--   1 root root   666287 2009-10-19 05:32 ./source/l/pygobject/pygobject-2.20.0.tar.bz2
--rwxr-xr-x   1 root root     3471 2010-02-07 01:44 ./source/l/pygobject/pygobject.SlackBuild
--rw-r--r--   1 root root       72 2009-12-14 01:44 ./source/l/pygobject/pygobject.url
--rw-r--r--   1 root root      858 2008-02-11 03:44 ./source/l/pygobject/slack-desc
-drwxr-xr-x   2 root root     4096 2009-09-15 20:52 ./source/l/pygtk
--rw-r--r--   1 root root  2253202 2009-09-15 20:45 ./source/l/pygtk/pygtk-2.16.0.tar.bz2
--rwxr-xr-x   1 root root     3484 2010-02-07 01:51 ./source/l/pygtk/pygtk.SlackBuild
--rw-r--r--   1 root root      777 2008-01-09 04:33 ./source/l/pygtk/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/pyrex
--rw-r--r--   1 root root   192596 2009-03-05 18:32 ./source/l/pyrex/Pyrex-0.9.8.5.tar.bz2
--rw-r--r--   1 root root       58 2009-03-05 18:42 ./source/l/pyrex/Pyrex.url
--rwxr-xr-x   1 root root     2396 2009-05-19 20:05 ./source/l/pyrex/pyrex.SlackBuild
--rw-r--r--   1 root root      847 2009-03-05 18:42 ./source/l/pyrex/slack-desc
-drwxr-xr-x   2 root root     4096 2009-11-03 22:35 ./source/l/qca
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/qca-cyrus-sasl
--rw-r--r--   1 root root    24075 2007-11-08 04:25 ./source/l/qca-cyrus-sasl/qca-cyrus-sasl-2.0.0-beta3.tar.bz2
--rwxr-xr-x   1 root root     2624 2009-05-19 20:05 ./source/l/qca-cyrus-sasl/qca-cyrus-sasl.SlackBuild
--rw-r--r--   1 root root      736 2008-07-31 03:43 ./source/l/qca-cyrus-sasl/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/qca-gnupg
--rw-r--r--   1 root root    38177 2008-04-23 23:14 ./source/l/qca-gnupg/qca-gnupg-2.0.0-beta3.tar.bz2
--rwxr-xr-x   1 root root     2614 2009-05-19 20:05 ./source/l/qca-gnupg/qca-gnupg.SlackBuild
--rw-r--r--   1 root root      656 2008-07-31 03:43 ./source/l/qca-gnupg/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-23 02:23 ./source/l/qca-ossl
--rw-r--r--   1 root root    49188 2007-12-11 17:47 ./source/l/qca-ossl/qca-ossl-2.0.0-beta3.tar.bz2
--rwxr-xr-x   1 root root     2734 2009-05-19 20:05 ./source/l/qca-ossl/qca-ossl.SlackBuild
--rw-r--r--   1 root root      443 2008-12-16 15:36 ./source/l/qca-ossl/qca-ossl.nowhirlpool.diff.gz
--rw-r--r--   1 root root      947 2008-07-31 03:44 ./source/l/qca-ossl/slack-desc
--rw-r--r--   1 root root  1937201 2009-04-29 21:47 ./source/l/qca/qca-2.0.2.tar.bz2
--rwxr-xr-x   1 root root     2883 2009-11-03 22:35 ./source/l/qca/qca.SlackBuild
--rw-r--r--   1 root root      112 2008-07-24 15:03 ./source/l/qca/qca.info
--rw-r--r--   1 root root     1021 2006-07-31 21:42 ./source/l/qca/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/qimageblitz
--rw-r--r--   1 root root    57639 2009-04-02 20:53 ./source/l/qimageblitz/qimageblitz-r948358.tar.bz2
--rwxr-xr-x   1 root root     2693 2009-05-19 20:05 ./source/l/qimageblitz/qimageblitz.SlackBuild
--rw-r--r--   1 root root      278 2007-12-18 16:29 ./source/l/qimageblitz/qimageblitz.info
--rw-r--r--   1 root root      851 2008-08-01 05:40 ./source/l/qimageblitz/slack-desc
-drwxr-xr-x   3 root root     4096 2010-05-04 00:31 ./source/l/qt
--rw-r--r--   1 root root      289 2009-09-29 00:01 ./source/l/qt/README
--rw-r--r--   1 root root       92 2007-12-22 17:48 ./source/l/qt/doinst.sh.gz
-drwxr-xr-x   2 root root     4096 2008-10-03 20:21 ./source/l/qt/profile.d
--rwxr-xr-x   1 root root      661 2008-10-03 20:23 ./source/l/qt/profile.d/qt4.csh
--rwxr-xr-x   1 root root      561 2008-10-03 20:23 ./source/l/qt/profile.d/qt4.sh
--rw-r--r--   1 root root 93080240 2010-03-23 22:09 ./source/l/qt/qt-4.6.2_2d3d3e5.tar.xz
--rwxr-xr-x   1 root root     6383 2010-03-24 20:10 ./source/l/qt/qt.SlackBuild
--rw-r--r--   1 root root      277 2008-04-03 01:53 ./source/l/qt/qt.mysql.h.diff.gz
--rw-r--r--   1 root root      260 2007-12-22 06:24 ./source/l/qt/qt.x86.cflags.diff.gz
--rw-r--r--   1 root root      719 2010-05-04 00:21 ./source/l/qt/slack-desc
-drwxr-xr-x   2 root root     4096 2010-02-19 01:56 ./source/l/qtscriptgenerator
--rw-r--r--   1 root root      564 2009-06-05 09:21 ./source/l/qtscriptgenerator/include-everything.patch.gz
--rw-r--r--   1 root root   374223 2009-06-05 09:22 ./source/l/qtscriptgenerator/qtscriptgenerator-src-0.1.0.tar.gz
--rwxr-xr-x   1 root root     3960 2010-02-19 01:13 ./source/l/qtscriptgenerator/qtscriptgenerator.SlackBuild
--rw-r--r--   1 root root      197 2010-02-19 01:13 ./source/l/qtscriptgenerator/qtscriptgenerator.gcc44.diff.gz
--rw-r--r--   1 root root      292 2009-06-05 09:22 ./source/l/qtscriptgenerator/qtscriptgenerator.info
--rw-r--r--   1 root root      945 2009-06-05 09:34 ./source/l/qtscriptgenerator/slack-desc
-drwxr-xr-x   2 root root     4096 2010-03-05 21:43 ./source/l/raptor
--rw-r--r--   1 root root   907160 2010-01-30 16:21 ./source/l/raptor/raptor-1.4.21.tar.xz
--rwxr-xr-x   1 root root     3641 2010-03-05 21:45 ./source/l/raptor/raptor.SlackBuild
--rw-r--r--   1 root root       96 2009-11-28 04:16 ./source/l/raptor/raptor.info
--rw-r--r--   1 root root      624 2008-08-01 05:21 ./source/l/raptor/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-04 00:31 ./source/l/rasqal
--rw-r--r--   1 root root   722244 2010-04-21 11:59 ./source/l/rasqal/rasqal-0.9.19.tar.xz
--rwxr-xr-x   1 root root     3351 2010-04-21 12:02 ./source/l/rasqal/rasqal.SlackBuild
--rw-r--r--   1 root root      507 2010-05-04 00:22 ./source/l/rasqal/slack-desc
-drwxr-xr-x   3 root root     4096 2009-05-19 20:05 ./source/l/readline
-drwxr-xr-x   2 root root     4096 2009-02-21 22:42 ./source/l/readline/readline-5.2-patches
--rw-r--r--   1 root root      874 2006-12-12 21:25 ./source/l/readline/readline-5.2-patches/readline52-001
--rw-r--r--   1 root root       65 2006-12-12 21:25 ./source/l/readline/readline-5.2-patches/readline52-001.sig
--rw-r--r--   1 root root     1433 2007-03-21 18:47 ./source/l/readline/readline-5.2-patches/readline52-002
--rw-r--r--   1 root root       65 2007-03-21 18:47 ./source/l/readline/readline-5.2-patches/readline52-002.sig
--rw-r--r--   1 root root     1204 2007-04-25 18:00 ./source/l/readline/readline-5.2-patches/readline52-003
--rw-r--r--   1 root root       65 2007-04-25 18:00 ./source/l/readline/readline-5.2-patches/readline52-003.sig
--rw-r--r--   1 root root     2192 2007-04-25 18:00 ./source/l/readline/readline-5.2-patches/readline52-004
--rw-r--r--   1 root root       65 2007-04-25 18:00 ./source/l/readline/readline-5.2-patches/readline52-004.sig
--rw-r--r--   1 root root     8029 2007-08-22 13:22 ./source/l/readline/readline-5.2-patches/readline52-005
--rw-r--r--   1 root root       65 2007-08-22 13:22 ./source/l/readline/readline-5.2-patches/readline52-005.sig
--rw-r--r--   1 root root     2820 2007-08-22 13:22 ./source/l/readline/readline-5.2-patches/readline52-006
--rw-r--r--   1 root root       65 2007-08-22 13:22 ./source/l/readline/readline-5.2-patches/readline52-006.sig
--rw-r--r--   1 root root     1523 2007-08-22 13:22 ./source/l/readline/readline-5.2-patches/readline52-007
--rw-r--r--   1 root root       65 2007-08-22 13:22 ./source/l/readline/readline-5.2-patches/readline52-007.sig
--rw-r--r--   1 root root     2277 2007-12-15 03:56 ./source/l/readline/readline-5.2-patches/readline52-008
--rw-r--r--   1 root root       65 2007-12-15 03:56 ./source/l/readline/readline-5.2-patches/readline52-008.sig
--rw-r--r--   1 root root     1332 2007-12-15 03:56 ./source/l/readline/readline-5.2-patches/readline52-009
--rw-r--r--   1 root root       65 2007-12-15 03:56 ./source/l/readline/readline-5.2-patches/readline52-009.sig
--rw-r--r--   1 root root     1543 2007-12-15 03:56 ./source/l/readline/readline-5.2-patches/readline52-010
--rw-r--r--   1 root root       65 2007-12-15 03:56 ./source/l/readline/readline-5.2-patches/readline52-010.sig
--rw-r--r--   1 root root      886 2007-12-15 03:56 ./source/l/readline/readline-5.2-patches/readline52-011
--rw-r--r--   1 root root       65 2007-12-15 03:56 ./source/l/readline/readline-5.2-patches/readline52-011.sig
--rw-r--r--   1 root root     3870 2007-12-15 03:56 ./source/l/readline/readline-5.2-patches/readline52-012
--rw-r--r--   1 root root       65 2007-12-15 03:56 ./source/l/readline/readline-5.2-patches/readline52-012.sig
--rw-r--r--   1 root root     5147 2008-11-18 16:19 ./source/l/readline/readline-5.2-patches/readline52-013
--rw-r--r--   1 root root       65 2008-11-18 16:19 ./source/l/readline/readline-5.2-patches/readline52-013.sig
--rw-r--r--   1 root root  1693789 2006-10-11 16:12 ./source/l/readline/readline-5.2.tar.bz2
--rwxr-xr-x   1 root root     2767 2009-05-19 20:05 ./source/l/readline/readline.SlackBuild
--rw-r--r--   1 root root     1018 2002-03-23 23:44 ./source/l/readline/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-04 00:31 ./source/l/redland
--rw-r--r--   1 root root   843196 2010-04-21 14:23 ./source/l/redland/redland-1.0.10.tar.xz
--rwxr-xr-x   1 root root     4006 2010-04-21 20:49 ./source/l/redland/redland.SlackBuild
--rw-r--r--   1 root root      606 2008-08-01 05:25 ./source/l/redland/slack-desc
-drwxr-xr-x   2 root root     4096 2010-02-14 23:16 ./source/l/sdl
--rw-r--r--   1 root root  3077408 2009-10-20 03:53 ./source/l/sdl/SDL-1.2.14.tar.xz
--rw-r--r--   1 root root  1212636 2009-11-15 09:44 ./source/l/sdl/SDL_image-1.2.10.tar.xz
--rw-r--r--   1 root root  2525128 2009-11-15 09:42 ./source/l/sdl/SDL_mixer-1.2.11.tar.xz
--rw-r--r--   1 root root      212 2010-02-14 23:16 ./source/l/sdl/SDL_mixer.usrlocal.diff.gz
--rw-r--r--   1 root root   223252 2007-07-21 08:04 ./source/l/sdl/SDL_net-1.2.7.tar.xz
--rw-r--r--   1 root root  2996772 2007-07-21 17:27 ./source/l/sdl/SDL_ttf-2.0.9.tar.xz
--rwxr-xr-x   1 root root     7029 2010-03-25 21:43 ./source/l/sdl/sdl.SlackBuild
--rw-r--r--   1 root root      941 2004-03-27 18:28 ./source/l/sdl/slack-desc
-drwxr-xr-x   2 root root     4096 2010-03-24 11:29 ./source/l/shared-desktop-ontologies
--rw-r--r--   1 root root    88098 2010-03-24 11:28 ./source/l/shared-desktop-ontologies/shared-desktop-ontologies-0.3.tar.bz2
--rwxr-xr-x   1 root root     3404 2010-05-05 23:33 ./source/l/shared-desktop-ontologies/shared-desktop-ontologies.SlackBuild
--rw-r--r--   1 root root     1119 2010-05-05 23:32 ./source/l/shared-desktop-ontologies/slack-desc
-drwxr-xr-x   2 root root     4096 2010-04-27 20:41 ./source/l/shared-mime-info
--rw-r--r--   1 root root      352 2009-10-18 22:47 ./source/l/shared-mime-info/doinst.sh.gz
--rw-r--r--   1 root root   493216 2010-02-01 17:45 ./source/l/shared-mime-info/shared-mime-info-0.71.tar.bz2
--rwxr-xr-x   1 root root     3825 2010-04-30 05:09 ./source/l/shared-mime-info/shared-mime-info.SlackBuild
--rw-r--r--   1 root root      979 2007-12-23 22:25 ./source/l/shared-mime-info/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-04 00:42 ./source/l/sip
--rw-r--r--   1 root root   393460 2010-04-16 10:19 ./source/l/sip/sip-4.10.2.tar.xz
--rwxr-xr-x   1 root root     3026 2010-04-21 09:51 ./source/l/sip/sip.SlackBuild
--rw-r--r--   1 root root      147 2009-11-28 04:43 ./source/l/sip/sip.info
--rw-r--r--   1 root root      849 2010-05-04 00:22 ./source/l/sip/slack-desc
-drwxr-xr-x   2 root root     4096 2010-02-18 23:06 ./source/l/slang
--rw-r--r--   1 root root      994 2006-08-01 05:37 ./source/l/slang/slack-desc
--rw-r--r--   1 root root  1366850 2009-12-05 19:11 ./source/l/slang/slang-2.2.2.tar.bz2
--rw-r--r--   1 root root      261 2009-12-05 19:14 ./source/l/slang/slang-2.2.2.tar.bz2.asc
--rwxr-xr-x   1 root root     3778 2010-02-18 23:06 ./source/l/slang/slang.SlackBuild
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/slang1
--rw-r--r--   1 root root     1006 2006-08-01 05:37 ./source/l/slang1/slack-desc
--rw-r--r--   1 root root   631079 2003-03-23 05:58 ./source/l/slang1/slang-1.4.9.tar.bz2
--rwxr-xr-x   1 root root     2987 2009-05-19 20:05 ./source/l/slang1/slang1.SlackBuild
-drwxr-xr-x   2 root root     4096 2010-05-04 00:31 ./source/l/soprano
--rw-r--r--   1 root root      845 2010-05-04 00:22 ./source/l/soprano/slack-desc
--rw-r--r--   1 root root  1944785 2010-04-22 09:53 ./source/l/soprano/soprano-2.4.3.tar.bz2
--rwxr-xr-x   1 root root     2989 2010-04-30 12:20 ./source/l/soprano/soprano.SlackBuild
-drwxr-xr-x   2 root root     4096 2009-06-10 04:48 ./source/l/startup-notification
--rw-r--r--   1 root root      830 2008-02-11 03:44 ./source/l/startup-notification/slack-desc
--rw-r--r--   1 root root   248645 2009-06-10 04:47 ./source/l/startup-notification/startup-notification-0.10.tar.bz2
--rwxr-xr-x   1 root root     3060 2010-02-06 03:36 ./source/l/startup-notification/startup-notification.SlackBuild
-drwxr-xr-x   2 root root     4096 2010-02-08 23:13 ./source/l/strigi
--rw-r--r--   1 root root      965 2008-08-01 01:27 ./source/l/strigi/slack-desc
--rw-r--r--   1 root root   936320 2010-02-03 19:09 ./source/l/strigi/strigi-0.7.2.tar.bz2
--rwxr-xr-x   1 root root     3448 2010-02-08 23:14 ./source/l/strigi/strigi.SlackBuild
--rw-r--r--   1 root root      146 2008-05-17 02:12 ./source/l/strigi/strigi.info
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/svgalib
--rw-r--r--   1 root root      802 2009-03-09 23:10 ./source/l/svgalib/slack-desc
--rw-r--r--   1 root root      509 2008-05-31 14:12 ./source/l/svgalib/svgalib-1.9.25-kernel-2.6.26.diff.gz
--rw-r--r--   1 root root   807984 2006-07-14 11:57 ./source/l/svgalib/svgalib-1.9.25.tar.bz2
--rwxr-xr-x   1 root root     3717 2009-05-19 20:05 ./source/l/svgalib/svgalib.SlackBuild
--rw-r--r--   1 root root      271 2009-03-09 23:07 ./source/l/svgalib/svgalib.nohelper.diff.gz
--rw-r--r--   1 root root      282 2007-03-30 00:48 ./source/l/svgalib/svgalib.prefix.diff.gz
-drwxr-xr-x   2 root root     4096 2010-05-18 20:24 ./source/l/system-config-printer
--rw-r--r--   1 root root      380 2010-05-05 21:43 ./source/l/system-config-printer/doinst.sh.gz
--rw-r--r--   1 root root     1217 2010-05-04 00:23 ./source/l/system-config-printer/slack-desc
--rw-r--r--   1 root root   904696 2010-05-07 15:13 ./source/l/system-config-printer/system-config-printer-1.2.2.tar.xz
--rwxr-xr--   1 root root     4057 2010-05-18 20:24 ./source/l/system-config-printer/system-config-printer.SlackBuild
-drwxr-xr-x   2 root root     4096 2009-06-09 00:43 ./source/l/t1lib
--rw-r--r--   1 root root      813 2002-04-30 02:17 ./source/l/t1lib/slack-desc
--rw-r--r--   1 root root  1429408 2007-12-23 16:07 ./source/l/t1lib/t1lib-5.1.2.tar.xz
--rwxr-xr-x   1 root root     3576 2009-06-09 00:43 ./source/l/t1lib/t1lib.SlackBuild
-drwxr-xr-x   2 root root     4096 2010-04-10 19:51 ./source/l/taglib
-drwxr-xr-x   2 root root     4096 2009-12-17 02:17 ./source/l/taglib-extras
--rw-r--r--   1 root root      985 2009-06-05 09:55 ./source/l/taglib-extras/slack-desc
--rw-r--r--   1 root root    31363 2009-09-21 21:36 ./source/l/taglib-extras/taglib-extras-1.0.1.tar.gz
--rwxr-xr-x   1 root root     2843 2009-10-03 00:32 ./source/l/taglib-extras/taglib-extras.SlackBuild
--rw-r--r--   1 root root      797 2004-02-22 08:50 ./source/l/taglib/slack-desc
--rw-r--r--   1 root root   637840 2010-04-09 10:46 ./source/l/taglib/taglib-1.6.2.tar.xz
--rwxr-xr-x   1 root root     2952 2010-04-10 19:52 ./source/l/taglib/taglib.SlackBuild
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/tango-icon-theme
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/tango-icon-theme-extras
--rw-r--r--   1 root root     1015 2008-02-27 07:27 ./source/l/tango-icon-theme-extras/slack-desc
--rw-r--r--   1 root root   128095 2006-06-01 19:07 ./source/l/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0.tar.bz2
--rwxr-xr-x   1 root root     2937 2009-05-19 20:05 ./source/l/tango-icon-theme-extras/tango-icon-theme-extras.SlackBuild
--rw-r--r--   1 root root      990 2008-02-27 07:13 ./source/l/tango-icon-theme/slack-desc
--rw-r--r--   1 root root  1376581 2009-02-26 03:21 ./source/l/tango-icon-theme/tango-icon-theme-0.8.90.tar.bz2
--rwxr-xr-x   1 root root     2033 2009-05-19 20:05 ./source/l/tango-icon-theme/tango-icon-theme.SlackBuild
-drwxr-xr-x   2 root root     4096 2010-01-27 02:15 ./source/l/urwid
--rw-r--r--   1 root root     9389 2009-03-13 22:05 ./source/l/urwid/LICENSE.gz
--rw-r--r--   1 root root      843 2009-04-21 15:06 ./source/l/urwid/slack-desc
--rw-r--r--   1 root root   238005 2010-01-25 12:34 ./source/l/urwid/urwid-0.9.9.1.tar.gz
--rwxr-xr-x   1 root root     2867 2010-01-27 02:15 ./source/l/urwid/urwid.SlackBuild
--rw-r--r--   1 root root       24 2009-03-14 23:33 ./source/l/urwid/urwid.url
-drwxr-xr-x   2 root root     4096 2010-05-14 03:55 ./source/l/v4l-utils
--rw-r--r--   1 root root     1030 2010-05-14 03:55 ./source/l/v4l-utils/slack-desc
--rw-r--r--   1 root root   244204 2010-05-14 03:45 ./source/l/v4l-utils/v4l-utils-0.8.0.tar.xz
--rwxr-xr-x   1 root root     3036 2010-05-14 03:55 ./source/l/v4l-utils/v4l-utils.SlackBuild
-drwxr-xr-x   2 root root     4096 2010-04-20 20:48 ./source/l/virtuoso-ose
--rw-r--r--   1 root root      267 2009-12-24 23:22 ./source/l/virtuoso-ose/doinst.sh.gz
--rw-r--r--   1 root root      889 2010-02-24 20:39 ./source/l/virtuoso-ose/slack-desc
--rw-r--r--   1 root root 59528964 2010-04-20 20:48 ./source/l/virtuoso-ose/virtuoso-opensource-6.1.1.tar.xz
--rwxr-xr-x   1 root root     3617 2010-04-20 20:49 ./source/l/virtuoso-ose/virtuoso-ose.SlackBuild
-drwxr-xr-x   2 root root     4096 2010-04-28 14:28 ./source/l/vte
--rw-r--r--   1 root root      710 2007-02-17 03:01 ./source/l/vte/slack-desc
--rw-r--r--   1 root root  1312731 2010-04-26 13:44 ./source/l/vte/vte-0.24.1.tar.bz2
--rwxr-xr-x   1 root root     3995 2010-02-12 01:50 ./source/l/vte/vte.SlackBuild
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/wavpack
--rw-r--r--   1 root root      841 2008-03-16 05:02 ./source/l/wavpack/slack-desc
--rw-r--r--   1 root root   329241 2007-05-08 00:47 ./source/l/wavpack/wavpack-4.41.0.tar.bz2
--rwxr-xr-x   1 root root     2754 2009-05-19 20:05 ./source/l/wavpack/wavpack.SlackBuild
-drwxr-xr-x   2 root root     4096 2009-11-28 04:35 ./source/l/wv2
--rw-r--r--   1 root root      876 2003-11-17 01:49 ./source/l/wv2/slack-desc
--rw-r--r--   1 root root   373612 2009-10-31 18:23 ./source/l/wv2/wv2-0.4.2.tar.xz
--rwxr-xr-x   1 root root     2939 2009-12-17 02:11 ./source/l/wv2/wv2.SlackBuild
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/l/zlib
--rw-r--r--   1 root root      814 2002-02-15 03:04 ./source/l/zlib/slack-desc
--rw-r--r--   1 root root   425209 2005-07-18 13:39 ./source/l/zlib/zlib-1.2.3.tar.bz2
--rwxr-xr-x   1 root root     2956 2009-05-19 20:05 ./source/l/zlib/zlib.SlackBuild
-drwxr-xr-x 130 root root     4096 2010-05-17 19:24 ./source/n
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/alpine
--rw-r--r--   1 root root  5222673 2008-08-26 01:20 ./source/n/alpine/alpine-2.00.tar.bz2
--rwxr-xr-x   1 root root     6362 2010-03-06 03:07 ./source/n/alpine/alpine.SlackBuild
--rw-r--r--   1 root root      255 2008-08-07 02:01 ./source/n/alpine/alpine.config.h.diff.gz
--rw-r--r--   1 root root      301 2008-08-07 01:01 ./source/n/alpine/alpine.manpage.diff.gz
--rw-r--r--   1 root root     2493 2008-08-07 19:00 ./source/n/alpine/alpine.tech-notes.txt.diff.gz
--rw-r--r--   1 root root      472 2008-08-07 03:57 ./source/n/alpine/doinst.sh.alpine
--rw-r--r--   1 root root      737 2008-08-07 02:33 ./source/n/alpine/pinepgp-0.18.0-makefile-sed-fix.diff.gz
--rw-r--r--   1 root root    38103 2002-11-24 23:01 ./source/n/alpine/pinepgp-0.18.0.tar.gz
--rw-r--r--   1 root root       72 2002-11-24 23:01 ./source/n/alpine/pinepgp-0.18.0.tar.gz.sig
--rw-r--r--   1 root root      157 2008-08-07 02:50 ./source/n/alpine/pinepgp.pinegpgp.in.diff.gz
--rw-r--r--   1 root root     1102 2008-08-07 00:54 ./source/n/alpine/slack-desc.alpine
--rw-r--r--   1 root root      749 2008-08-07 00:39 ./source/n/alpine/slack-desc.imapd
-drwxr-xr-x   2 root root     4096 2010-03-05 22:57 ./source/n/autofs
--rw-r--r--   1 root root      857 2010-03-05 22:37 ./source/n/autofs/autofs-5.0.5-fix-libxml2-workaround-configure.patch.gz
--rw-r--r--   1 root root   301327 2009-09-03 10:11 ./source/n/autofs/autofs-5.0.5.tar.bz2
--rwxr-xr-x   1 root root     4248 2010-03-05 23:01 ./source/n/autofs/autofs.SlackBuild
--rw-r--r--   1 root root      369 2010-03-05 22:57 ./source/n/autofs/doinst.sh.gz
--rw-r--r--   1 root root      873 2002-02-27 02:39 ./source/n/autofs/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/biff+comsat
--rw-r--r--   1 root root      195 2001-02-26 02:06 ./source/n/biff+comsat/biff+comsat-0.17.diff.gz
--rw-r--r--   1 root root    13700 2000-07-31 02:56 ./source/n/biff+comsat/biff+comsat-0.17.tar.gz
--rwxr-xr-x   1 root root     2603 2009-05-19 20:05 ./source/n/biff+comsat/biff+comsat.SlackBuild
--rw-r--r--   1 root root      729 2004-06-21 20:51 ./source/n/biff+comsat/biff+comsat.badutmp.diff.gz
--rw-r--r--   1 root root     1222 2001-06-03 08:32 ./source/n/biff+comsat/biff+comsat.offset.diff.gz
--rw-r--r--   1 root root     1148 2007-04-30 01:44 ./source/n/biff+comsat/slack-desc
-drwxr-xr-x   3 root root     4096 2009-11-27 20:54 ./source/n/bind
--rw-r--r--   1 root root     5120 2007-06-08 04:48 ./source/n/bind/3link.sh
--rw-r--r--   1 root root  6545707 2009-11-24 15:03 ./source/n/bind/bind-9.4.3-P4.tar.gz
--rw-r--r--   1 root root      481 2009-11-24 15:03 ./source/n/bind/bind-9.4.3-P4.tar.gz.asc
--rwxr-xr-x   1 root root     5459 2009-11-27 20:54 ./source/n/bind/bind.SlackBuild
--rw-r--r--   1 root root      230 2007-06-08 04:17 ./source/n/bind/bind.man.diff.gz
--rw-r--r--   1 root root      280 2006-02-18 19:10 ./source/n/bind/bind.so_bsdcompat.diff.gz
--rw-r--r--   1 root root      290 2002-02-27 02:51 ./source/n/bind/bind.var.run.named.diff.gz
-drwxr-xr-x   2 root root     4096 2008-04-13 21:26 ./source/n/bind/caching-example
--rw-r--r--   1 root root      195 2001-05-18 02:03 ./source/n/bind/caching-example/localhost.zone
--rw-r--r--   1 root root      681 2008-04-13 21:47 ./source/n/bind/caching-example/named.conf
--rw-r--r--   1 root root      433 2001-05-18 02:03 ./source/n/bind/caching-example/named.local
--rw-r--r--   1 root root     2878 2008-02-04 20:07 ./source/n/bind/caching-example/named.root
--rw-r--r--   1 root root      514 2009-05-23 08:11 ./source/n/bind/doinst.sh.gz
--rw-r--r--   1 root root     3116 2008-04-13 21:48 ./source/n/bind/rc.bind
--rw-r--r--   1 root root      791 2002-02-27 02:45 ./source/n/bind/slack-desc
-drwxr-xr-x   4 root root     4096 2010-05-02 08:06 ./source/n/bluez
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/bluez-firmware
--rw-r--r--   1 root root   262963 2007-04-23 22:58 ./source/n/bluez-firmware/bluez-firmware-1.2.tar.bz2
--rwxr-xr-x   1 root root     2948 2009-05-19 20:05 ./source/n/bluez-firmware/bluez-firmware.SlackBuild
--rw-r--r--   1 root root      832 2007-04-23 22:59 ./source/n/bluez-firmware/slack-desc
-drwxr-xr-x   2 root root     4096 2010-03-03 05:16 ./source/n/bluez-hcidump
--rw-r--r--   1 root root   122212 2008-06-15 20:41 ./source/n/bluez-hcidump/bluez-hcidump-1.42.tar.bz2
--rwxr-xr-x   1 root root     3917 2010-05-02 06:04 ./source/n/bluez-hcidump/bluez-hcidump.SlackBuild
--rw-r--r--   1 root root      478 2010-03-03 05:15 ./source/n/bluez-hcidump/hci.c_for_bluez-4.61.patch.gz
--rw-r--r--   1 root root      909 2010-05-02 06:03 ./source/n/bluez-hcidump/slack-desc
--rw-r--r--   1 root root   668568 2010-04-28 16:03 ./source/n/bluez/bluez-4.64.tar.xz
--rwxr-xr-x   1 root root     6173 2010-05-02 08:07 ./source/n/bluez/bluez.SlackBuild
-drwxr-xr-x   2 root root     4096 2009-12-30 18:39 ./source/n/bluez/config
--rw-r--r--   1 root root      128 2009-12-30 18:25 ./source/n/bluez/config/bluetooth.modprobe
--rw-r--r--   1 root root      213 2009-12-30 18:18 ./source/n/bluez/config/bluetooth.sh
--rw-r--r--   1 root root      497 2010-04-20 16:27 ./source/n/bluez/config/rc.bluetooth
--rw-r--r--   1 root root      395 2010-03-03 15:39 ./source/n/bluez/doinst.sh.gz
--rw-r--r--   1 root root     9998 2009-10-30 15:38 ./source/n/bluez/passkey-agent.c
-drwxr-xr-x   2 root root     4096 2010-03-15 20:14 ./source/n/bluez/patches
--rw-r--r--   1 root root      436 2010-02-18 23:49 ./source/n/bluez/patches/bluez-dbus-config.patch.gz
--rw-r--r--   1 root root      446 2009-12-30 18:14 ./source/n/bluez/patches/bluez-run_udev_helper.patch.gz
--rw-r--r--   1 root root      433 2009-12-30 18:35 ./source/n/bluez/patches/bluez-unbreak_dell_mouse.patch.gz
--rw-r--r--   1 root root      803 2010-05-02 05:59 ./source/n/bluez/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/bootp
--rw-r--r--   1 root root      616 2006-06-09 23:31 ./source/n/bootp/_bootp.tar.gz
--rwxr-xr-x   1 root root     2527 2009-05-19 20:05 ./source/n/bootp/bootp.SlackBuild
--rw-r--r--   1 root root    23147 2006-02-17 23:17 ./source/n/bootp/bootp_2.4.3-15.diff.gz
--rw-r--r--   1 root root    89235 1999-03-18 19:52 ./source/n/bootp/bootp_2.4.3.orig.tar.gz
--rw-r--r--   1 root root      643 2002-02-27 00:08 ./source/n/bootp/bootptab.gz
--rw-r--r--   1 root root      876 2008-02-11 03:44 ./source/n/bootp/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/bridge-utils
--rw-r--r--   1 root root    32261 2006-09-09 05:30 ./source/n/bridge-utils/bridge-utils-1.2.tar.gz
--rwxr-xr-x   1 root root     2881 2009-05-19 20:05 ./source/n/bridge-utils/bridge-utils.SlackBuild
--rw-r--r--   1 root root      305 2008-11-29 20:10 ./source/n/bridge-utils/bridge-utils.isbridge.diff.gz
--rw-r--r--   1 root root     1054 2007-04-29 20:48 ./source/n/bridge-utils/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/bsd-finger
--rw-r--r--   1 root root      273 2001-02-26 01:21 ./source/n/bsd-finger/bsd-finger-0.17.diff.gz
--rw-r--r--   1 root root    25521 2000-07-31 02:56 ./source/n/bsd-finger/bsd-finger-0.17.tar.gz
--rwxr-xr-x   1 root root     2222 2009-05-19 20:05 ./source/n/bsd-finger/bsd-finger.SlackBuild
--rw-r--r--   1 root root     1075 2007-04-30 01:53 ./source/n/bsd-finger/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-03 01:18 ./source/n/crda
--rw-r--r--   1 root root    21666 2010-05-03 01:18 ./source/n/crda/crda-1.1.1.tar.bz2
--rwxr-xr-x   1 root root     3643 2010-05-03 01:19 ./source/n/crda/crda.SlackBuild
--rw-r--r--   1 root root      380 2009-02-23 01:33 ./source/n/crda/get_regdb.sh
--rw-r--r--   1 root root      870 2009-03-09 05:07 ./source/n/crda/slack-desc
--rw-r--r--   1 root root    68146 2010-05-03 01:17 ./source/n/crda/wireless-regdb-git_20100502.tar.bz2
-drwxr-xr-x   2 root root     4096 2010-04-20 18:06 ./source/n/curl
--rw-r--r--   1 root root   111348 2009-09-22 09:27 ./source/n/curl/cacert.pem.bz2
--rw-r--r--   1 root root  2097637 2010-04-14 14:57 ./source/n/curl/curl-7.20.1.tar.bz2
--rw-r--r--   1 root root      198 2010-04-14 14:57 ./source/n/curl/curl-7.20.1.tar.bz2.asc
--rwxr-xr-x   1 root root     3798 2010-03-05 20:12 ./source/n/curl/curl.SlackBuild
--rw-r--r--   1 root root     1010 2008-02-11 03:44 ./source/n/curl/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/cyrus-sasl
--rw-r--r--   1 root root   906552 2009-05-14 13:48 ./source/n/cyrus-sasl/cyrus-sasl-2.1.23.tar.xz
--rwxr-xr-x   1 root root     3358 2009-05-19 20:05 ./source/n/cyrus-sasl/cyrus-sasl.SlackBuild
--rw-r--r--   1 root root      275 2005-07-24 22:43 ./source/n/cyrus-sasl/doinst.sh.gz
--rw-r--r--   1 root root      580 2005-07-25 00:10 ./source/n/cyrus-sasl/rc.saslauthd.gz
--rw-r--r--   1 root root      836 2005-04-18 23:31 ./source/n/cyrus-sasl/slack-desc
-drwxr-xr-x   2 root root     4096 2010-03-03 15:15 ./source/n/dhcp
--rw-r--r--   1 root root      337 2010-03-03 15:15 ./source/n/dhcp/dhclient-script.PATH.diff.gz
--rw-r--r--   1 root root   763332 2010-01-18 20:24 ./source/n/dhcp/dhcp-4.1.1.tar.xz
--rwxr-xr-x   1 root root     4787 2010-03-03 15:16 ./source/n/dhcp/dhcp.SlackBuild
--rw-r--r--   1 root root      311 2009-11-12 05:15 ./source/n/dhcp/doinst.sh.gz
--rw-r--r--   1 root root     1099 2002-02-27 02:14 ./source/n/dhcp/slack-desc
-drwxr-xr-x   2 root root     4096 2010-04-02 17:50 ./source/n/dhcpcd
--rw-r--r--   1 root root      456 2009-09-12 05:37 ./source/n/dhcpcd/50-ntp.conf.diff.gz
--rw-r--r--   1 root root      759 2009-03-09 04:20 ./source/n/dhcpcd/COPYRIGHT.gz
--rw-r--r--   1 root root    67625 2010-03-31 08:50 ./source/n/dhcpcd/dhcpcd-5.2.2.tar.bz2
--rwxr-xr-x   1 root root     3809 2010-02-09 03:37 ./source/n/dhcpcd/dhcpcd.SlackBuild
--rw-r--r--   1 root root      265 2009-07-24 16:30 ./source/n/dhcpcd/doinst.sh.gz
--rw-r--r--   1 root root      900 2008-04-10 21:01 ./source/n/dhcpcd/slack-desc
-drwxr-xr-x   2 root root     4096 2009-07-04 06:54 ./source/n/dirmngr
--rw-r--r--   1 root root   556184 2009-06-18 02:19 ./source/n/dirmngr/dirmngr-1.0.3.tar.bz2
--rwxr-xr-x   1 root root     3672 2010-03-05 20:25 ./source/n/dirmngr/dirmngr.SlackBuild
--rw-r--r--   1 root root      952 2007-03-15 20:48 ./source/n/dirmngr/slack-desc
-drwxr-xr-x   2 root root     4096 2010-02-11 21:45 ./source/n/dnsmasq
--rw-r--r--   1 root root   305908 2010-01-22 20:16 ./source/n/dnsmasq/dnsmasq-2.52.tar.xz
--rwxr-xr-x   1 root root     3574 2010-02-11 21:46 ./source/n/dnsmasq/dnsmasq.SlackBuild
--rw-r--r--   1 root root      543 2010-01-22 21:33 ./source/n/dnsmasq/dnsmasq.leasedir.diff.gz
--rw-r--r--   1 root root      376 2010-01-22 21:37 ./source/n/dnsmasq/doinst.sh.gz
--rw-r--r--   1 root root      265 2005-10-16 20:02 ./source/n/dnsmasq/rc.dnsmasq.gz
--rw-r--r--   1 root root      854 2005-10-16 20:03 ./source/n/dnsmasq/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-23 00:41 ./source/n/elm
--rw-r--r--   1 root root     4400 2009-08-13 19:04 ./source/n/elm/config.sh
--rwxr-xr-x   1 root root     2597 2009-08-13 19:06 ./source/n/elm/elm.SlackBuild
--rw-r--r--   1 root root   481431 2005-08-18 13:25 ./source/n/elm/elm2.5.8.tar.bz2
--rw-r--r--   1 root root      678 2002-03-05 02:32 ./source/n/elm/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-17 18:59 ./source/n/epic5
--rw-r--r--   1 root root   249636 2005-03-16 01:15 ./source/n/epic5/epic-help-current.tar.xz
--rw-r--r--   1 root root   711512 2010-05-01 04:02 ./source/n/epic5/epic5-1.1.2.tar.xz
--rwxr-xr-x   1 root root     3351 2010-05-17 19:00 ./source/n/epic5/epic5.SlackBuild
--rw-r--r--   1 root root      777 2010-05-17 18:46 ./source/n/epic5/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-03 01:27 ./source/n/ethtool
--rw-r--r--   1 root root   155173 2010-02-25 03:23 ./source/n/ethtool/ethtool-2.6.33.tar.gz
--rwxr-xr-x   1 root root     2167 2010-05-03 01:28 ./source/n/ethtool/ethtool.SlackBuild
--rw-r--r--   1 root root      899 2007-04-29 22:26 ./source/n/ethtool/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-16 05:40 ./source/n/fetchmail
--rw-r--r--   1 root root  1642598 2010-05-16 05:23 ./source/n/fetchmail/fetchmail-6.3.17.tar.bz2
--rw-r--r--   1 root root      198 2010-05-16 05:23 ./source/n/fetchmail/fetchmail-6.3.17.tar.bz2.asc
--rwxr-xr-x   1 root root     3283 2010-05-03 01:33 ./source/n/fetchmail/fetchmail.SlackBuild
--rw-r--r--   1 root root     1067 2007-05-07 03:49 ./source/n/fetchmail/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-03 01:46 ./source/n/getmail
--rw-r--r--   1 root root   156472 2010-04-30 21:48 ./source/n/getmail/getmail-4.17.0.tar.gz
--rwxr-xr-x   1 root root     2052 2010-05-03 01:46 ./source/n/getmail/getmail.SlackBuild
--rw-r--r--   1 root root      821 2003-09-10 04:59 ./source/n/getmail/slack-desc
-drwxr-xr-x   2 root root     4096 2010-03-05 23:41 ./source/n/gnupg
--rw-r--r--   1 root root  3410814 2009-09-02 16:50 ./source/n/gnupg/gnupg-1.4.10.tar.bz2
--rw-r--r--   1 root root      158 2009-09-02 16:50 ./source/n/gnupg/gnupg-1.4.10.tar.bz2.sig
--rwxr-xr-x   1 root root     3383 2010-03-05 23:41 ./source/n/gnupg/gnupg.SlackBuild
--rw-r--r--   1 root root      827 2003-02-25 23:37 ./source/n/gnupg/slack-desc.gnupg
-drwxr-xr-x   2 root root     4096 2010-03-06 00:40 ./source/n/gnupg2
--rw-r--r--   1 root root     1016 2010-02-01 09:21 ./source/n/gnupg2/gnupg-2.0.14-encode-s2k.patch.gz
--rw-r--r--   1 root root  2727084 2009-12-21 17:22 ./source/n/gnupg2/gnupg-2.0.14.tar.xz
--rwxr-xr-x   1 root root     5256 2010-03-06 00:41 ./source/n/gnupg2/gnupg2.SlackBuild
--rw-r--r--   1 root root     1058 2008-02-11 03:44 ./source/n/gnupg2/slack-desc
-drwxr-xr-x   2 root root     4096 2010-04-10 20:13 ./source/n/gnutls
--rw-r--r--   1 root root  4298056 2010-03-15 13:00 ./source/n/gnutls/gnutls-2.8.6.tar.xz
--rwxr-xr-x   1 root root     3953 2010-04-10 20:14 ./source/n/gnutls/gnutls.SlackBuild
--rw-r--r--   1 root root      950 2007-03-16 01:33 ./source/n/gnutls/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/gpa
--rw-r--r--   1 root root      270 2007-03-16 00:41 ./source/n/gpa/doinst.sh.gz
--rw-r--r--   1 root root   564252 2007-03-06 14:54 ./source/n/gpa/gpa-0.7.5.tar.bz2
--rwxr-xr-x   1 root root     2771 2009-05-19 20:05 ./source/n/gpa/gpa.SlackBuild
--rw-r--r--   1 root root      741 2007-03-15 20:46 ./source/n/gpa/slack-desc
-drwxr-xr-x   2 root root     4096 2010-03-06 01:03 ./source/n/gpgme
--rw-r--r--   1 root root   845063 2009-06-18 16:27 ./source/n/gpgme/gpgme-1.2.0.tar.bz2
--rw-r--r--   1 root root      315 2009-06-18 16:27 ./source/n/gpgme/gpgme-1.2.0.tar.bz2.sig
--rwxr-xr-x   1 root root     3334 2010-03-06 01:03 ./source/n/gpgme/gpgme.SlackBuild
--rw-r--r--   1 root root      995 2007-03-15 20:46 ./source/n/gpgme/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/htdig
--rw-r--r--   1 root root      274 2007-04-07 22:58 ./source/n/htdig/doinst.sh.gz
--rw-r--r--   1 root root     3347 2007-04-07 22:30 ./source/n/htdig/htdig-3.2.0b6.diff.gz
--rw-r--r--   1 root root  2498246 2004-07-13 14:21 ./source/n/htdig/htdig-3.2.0b6.tar.bz2
--rwxr-xr-x   1 root root     4079 2009-05-19 20:05 ./source/n/htdig/htdig.SlackBuild
--rw-r--r--   1 root root      288 2007-05-02 18:02 ./source/n/htdig/htdig.conf.diff.gz
--rw-r--r--   1 root root      891 2007-04-07 18:26 ./source/n/htdig/slack-desc
-drwxr-xr-x   2 root root     4096 2010-03-08 19:35 ./source/n/httpd
--rw-r--r--   1 root root     1409 2007-05-18 22:51 ./source/n/httpd/README
--rw-r--r--   1 root root      439 2007-06-05 19:38 ./source/n/httpd/config.layout.diff.gz
--rw-r--r--   1 root root      702 2008-07-24 20:29 ./source/n/httpd/doinst.sh.gz
--rw-r--r--   1 root root  4959582 2010-03-05 21:13 ./source/n/httpd/httpd-2.2.15.tar.bz2
--rw-r--r--   1 root root      835 2010-03-05 21:13 ./source/n/httpd/httpd-2.2.15.tar.bz2.asc
--rwxr-xr-x   1 root root     6761 2010-03-08 19:35 ./source/n/httpd/httpd.SlackBuild
--rw-r--r--   1 root root      214 2007-05-18 20:56 ./source/n/httpd/httpd.nossldefault.diff.gz
--rw-r--r--   1 root root      237 2008-02-14 21:36 ./source/n/httpd/httpd.runasapache.diff.gz
--rw-r--r--   1 root root      159 2007-05-23 18:30 ./source/n/httpd/logrotate.httpd
--rw-r--r--   1 root root      703 2007-05-27 01:49 ./source/n/httpd/rc.httpd
--rw-r--r--   1 root root      970 2007-05-18 04:13 ./source/n/httpd/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/icmpinfo
--rw-r--r--   1 root root     2263 2007-04-29 20:13 ./source/n/icmpinfo/icmpinfo-1.11.diff.gz
--rw-r--r--   1 root root    11873 1995-08-23 23:00 ./source/n/icmpinfo/icmpinfo-1.11.tar.gz
--rwxr-xr-x   1 root root     2206 2009-05-19 20:05 ./source/n/icmpinfo/icmpinfo.SlackBuild
--rw-r--r--   1 root root      826 2007-04-29 20:21 ./source/n/icmpinfo/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/inetd
--rw-r--r--   1 root root     4876 2007-06-30 20:02 ./source/n/inetd/_inetd.tar.gz
--rw-r--r--   1 root root     6436 2001-02-07 01:19 ./source/n/inetd/inetd-OpenBSD-1.79.diff.gz
--rw-r--r--   1 root root    19053 2001-02-06 20:48 ./source/n/inetd/inetd-OpenBSD-1.79.tar.gz
--rwxr-xr-x   1 root root     2134 2009-05-19 20:05 ./source/n/inetd/inetd.SlackBuild
--rw-r--r--   1 root root      889 2003-09-06 23:32 ./source/n/inetd/inetd.loopingdos.diff.gz
--rw-r--r--   1 root root      910 2002-03-22 02:34 ./source/n/inetd/slack-desc
-drwxr-xr-x   2 root root     4096 2010-03-02 21:29 ./source/n/iproute2
--rw-r--r--   1 root root      305 2008-10-04 01:56 ./source/n/iproute2/doinst.sh.gz
--rw-r--r--   1 root root      502 2010-02-25 05:02 ./source/n/iproute2/iproute2-2.6.33-fixup_dbpath_and_iptablespath.diff.gz
--rw-r--r--   1 root root   375000 2010-02-25 03:53 ./source/n/iproute2/iproute2-2.6.33.tar.bz2
--rw-r--r--   1 root root      197 2010-02-25 03:53 ./source/n/iproute2/iproute2-2.6.33.tar.bz2.sig
--rwxr-xr-x   1 root root     4347 2010-03-02 21:29 ./source/n/iproute2/iproute2.SlackBuild
--rw-r--r--   1 root root      937 2004-06-12 22:12 ./source/n/iproute2/slack-desc
-drwxr-xr-x   2 root root     4096 2010-03-02 18:48 ./source/n/iptables
--rw-r--r--   1 root root   462420 2010-03-01 14:25 ./source/n/iptables/iptables-1.4.7.tar.bz2
--rwxr-xr-x   1 root root     3448 2010-02-09 00:35 ./source/n/iptables/iptables.SlackBuild
--rw-r--r--   1 root root     1129 2006-09-03 06:14 ./source/n/iptables/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-23 00:41 ./source/n/iptraf
--rw-r--r--   1 root root   575169 2005-09-13 09:27 ./source/n/iptraf/iptraf-3.0.0.tar.gz
--rwxr-xr-x   1 root root     2933 2009-05-23 00:41 ./source/n/iptraf/iptraf.SlackBuild
--rw-r--r--   1 root root      341 2003-03-14 21:41 ./source/n/iptraf/iptraf.paths.diff.gz
--rw-r--r--   1 root root    13181 2007-09-29 11:02 ./source/n/iptraf/iptraf_3.0.0-6.diff.gz
--rw-r--r--   1 root root     1006 2008-02-11 03:44 ./source/n/iptraf/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-10 08:01 ./source/n/iputils
--rw-r--r--   1 root root    94237 2010-04-18 04:45 ./source/n/iputils/iputils-s20100418.tar.bz2
--rwxr-xr-x   1 root root     3461 2010-05-10 08:07 ./source/n/iputils/iputils.SlackBuild
--rw-r--r--   1 root root      881 2007-04-30 00:45 ./source/n/iputils/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/ipw2100-fw
--rw-r--r--   1 root root   177519 2008-03-09 04:43 ./source/n/ipw2100-fw/ipw2100-fw-1.3.tar.bz2
--rwxr-xr-x   1 root root     2935 2009-05-19 20:05 ./source/n/ipw2100-fw/ipw2100-fw.SlackBuild
-drwxr-xr-x   2 root root     4096 2010-05-03 03:32 ./source/n/ipw2200-fw
--rw-r--r--   1 root root   118152 2010-05-03 02:47 ./source/n/ipw2200-fw/ipw2200-fw-3.1.tar.xz
--rwxr-xr-x   1 root root     2807 2010-05-03 03:32 ./source/n/ipw2200-fw/ipw2200-fw.SlackBuild
-drwxr-xr-x   2 root root     4096 2010-04-22 03:45 ./source/n/irssi
--rw-r--r--   1 root root      264 2009-07-29 00:34 ./source/n/irssi/doinst.sh.gz
--rw-r--r--   1 root root   948847 2010-04-22 03:29 ./source/n/irssi/irssi-0.8.15.tar.bz2
--rw-r--r--   1 root root       72 2010-04-22 03:29 ./source/n/irssi/irssi-0.8.15.tar.bz2.sig
--rwxr-xr-x   1 root root     4504 2010-04-22 03:51 ./source/n/irssi/irssi.SlackBuild
--rw-r--r--   1 root root      371 2009-10-12 20:24 ./source/n/irssi/irssi.manpage_fix.diff.gz
--rw-r--r--   1 root root      402 2010-04-22 03:39 ./source/n/irssi/irssi.ssl_proxy.diff.gz
--rw-r--r--   1 root root      789 2003-12-13 20:28 ./source/n/irssi/slack-desc
-drwxr-xr-x   2 root root     4096 2009-06-12 23:54 ./source/n/iw
--rw-r--r--   1 root root    33326 2009-06-12 23:54 ./source/n/iw/iw-0.9.14.tar.bz2
--rwxr-xr-x   1 root root     2488 2009-06-12 23:54 ./source/n/iw/iw.SlackBuild
--rw-r--r--   1 root root      132 2009-04-01 01:22 ./source/n/iw/iw.info
--rw-r--r--   1 root root      883 2009-04-01 01:20 ./source/n/iw/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-03 03:34 ./source/n/iwlwifi-1000-ucode
--rw-r--r--   1 root root   115416 2010-05-03 02:50 ./source/n/iwlwifi-1000-ucode/iwlwifi-1000-ucode-128.50.3.1.tar.xz
--rwxr-xr-x   1 root root     2049 2010-05-03 03:35 ./source/n/iwlwifi-1000-ucode/iwlwifi-1000-ucode.SlackBuild
--rw-r--r--   1 root root      953 2010-05-03 03:38 ./source/n/iwlwifi-1000-ucode/slack-desc
-drwxr-xr-x   2 root root     4096 2009-06-13 03:20 ./source/n/iwlwifi-3945-ucode
--rw-r--r--   1 root root    65335 2008-10-21 17:38 ./source/n/iwlwifi-3945-ucode/iwlwifi-3945-ucode-15.28.1.8.tar.bz2
--rw-r--r--   1 root root    65524 2009-06-13 00:05 ./source/n/iwlwifi-3945-ucode/iwlwifi-3945-ucode-15.32.2.9.tar.bz2
--rwxr-xr-x   1 root root     2043 2009-06-13 03:22 ./source/n/iwlwifi-3945-ucode/iwlwifi-3945-ucode.SlackBuild
--rw-r--r--   1 root root      987 2008-10-24 03:04 ./source/n/iwlwifi-3945-ucode/slack-desc
-drwxr-xr-x   2 root root     4096 2009-07-15 03:38 ./source/n/iwlwifi-4965-ucode
--rw-r--r--   1 root root    79274 2008-07-04 01:33 ./source/n/iwlwifi-4965-ucode/iwlwifi-4965-ucode-228.57.1.21.tar.bz2
--rw-r--r--   1 root root    79368 2009-07-09 21:16 ./source/n/iwlwifi-4965-ucode/iwlwifi-4965-ucode-228.61.2.24.tar.bz2
--rwxr-xr-x   1 root root     2043 2009-05-08 02:59 ./source/n/iwlwifi-4965-ucode/iwlwifi-4965-ucode.SlackBuild
--rw-r--r--   1 root root      987 2008-10-24 03:09 ./source/n/iwlwifi-4965-ucode/slack-desc
-drwxr-xr-x   2 root root     4096 2009-06-13 03:27 ./source/n/iwlwifi-5000-ucode
--rw-r--r--   1 root root   147606 2008-10-06 17:05 ./source/n/iwlwifi-5000-ucode/iwlwifi-5000-ucode-5.4.A.11.tar.bz2
--rw-r--r--   1 root root   152530 2009-06-13 00:05 ./source/n/iwlwifi-5000-ucode/iwlwifi-5000-ucode-8.24.2.12.tar.bz2
--rwxr-xr-x   1 root root     2037 2009-06-13 03:29 ./source/n/iwlwifi-5000-ucode/iwlwifi-5000-ucode.SlackBuild
--rw-r--r--   1 root root      981 2008-10-24 03:10 ./source/n/iwlwifi-5000-ucode/slack-desc
-drwxr-xr-x   2 root root     4096 2009-06-13 03:34 ./source/n/iwlwifi-5150-ucode
--rw-r--r--   1 root root   144943 2009-06-13 00:05 ./source/n/iwlwifi-5150-ucode/iwlwifi-5150-ucode-8.24.2.2.tar.bz2
--rwxr-xr-x   1 root root     2037 2009-06-13 03:34 ./source/n/iwlwifi-5150-ucode/iwlwifi-5150-ucode.SlackBuild
--rw-r--r--   1 root root      978 2009-06-13 03:35 ./source/n/iwlwifi-5150-ucode/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-03 03:40 ./source/n/iwlwifi-6000-ucode
--rw-r--r--   1 root root   137148 2010-05-03 02:50 ./source/n/iwlwifi-6000-ucode/iwlwifi-6000-ucode-9.193.4.1.tar.xz
--rwxr-xr-x   1 root root     2049 2010-05-03 03:40 ./source/n/iwlwifi-6000-ucode/iwlwifi-6000-ucode.SlackBuild
--rw-r--r--   1 root root      953 2010-05-03 03:43 ./source/n/iwlwifi-6000-ucode/slack-desc
-drwxr-xr-x   2 root root     4096 2010-04-30 00:20 ./source/n/lftp
--rw-r--r--   1 root root      263 2009-05-31 06:11 ./source/n/lftp/doinst.sh.gz
--rw-r--r--   1 root root  1596521 2010-04-29 11:02 ./source/n/lftp/lftp-4.0.7.tar.bz2
--rwxr-xr-x   1 root root     3784 2010-02-09 04:00 ./source/n/lftp/lftp.SlackBuild
--rw-r--r--   1 root root     1037 2002-04-06 20:20 ./source/n/lftp/slack-desc
-drwxr-xr-x   2 root root     4096 2010-03-06 00:54 ./source/n/libassuan
--rw-r--r--   1 root root   297786 2008-05-25 08:02 ./source/n/libassuan/libassuan-1.0.5.tar.bz2
--rw-r--r--   1 root root      158 2008-05-25 08:02 ./source/n/libassuan/libassuan-1.0.5.tar.bz2.sig
--rwxr-xr-x   1 root root     3281 2010-03-06 00:54 ./source/n/libassuan/libassuan.SlackBuild
--rw-r--r--   1 root root      712 2007-03-15 20:46 ./source/n/libassuan/slack-desc
-drwxr-xr-x   2 root root     4096 2010-03-06 00:34 ./source/n/libgcrypt
--rw-r--r--   1 root root  1148382 2009-12-11 15:58 ./source/n/libgcrypt/libgcrypt-1.4.5.tar.bz2
--rw-r--r--   1 root root      158 2009-12-11 15:58 ./source/n/libgcrypt/libgcrypt-1.4.5.tar.bz2.sig
--rwxr-xr-x   1 root root     3806 2010-05-05 05:37 ./source/n/libgcrypt/libgcrypt.SlackBuild
--rw-r--r--   1 root root      705 2007-03-15 20:47 ./source/n/libgcrypt/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/libgpg-error
--rw-r--r--   1 root root   403751 2009-01-13 04:56 ./source/n/libgpg-error/libgpg-error-1.7.tar.bz2
--rwxr-xr-x   1 root root     3701 2010-05-05 05:42 ./source/n/libgpg-error/libgpg-error.SlackBuild
--rw-r--r--   1 root root      856 2007-03-15 20:47 ./source/n/libgpg-error/slack-desc
-drwxr-xr-x   2 root root     4096 2010-03-06 00:32 ./source/n/libksba
--rw-r--r--   1 root root   569854 2009-07-03 09:50 ./source/n/libksba/libksba-1.0.7.tar.bz2
--rw-r--r--   1 root root      158 2009-07-03 09:50 ./source/n/libksba/libksba-1.0.7.tar.bz2.sig
--rwxr-xr-x   1 root root     3484 2010-03-06 00:33 ./source/n/libksba/libksba.SlackBuild
--rw-r--r--   1 root root      790 2007-03-15 20:47 ./source/n/libksba/slack-desc
-drwxr-xr-x   2 root root     4096 2010-02-18 20:45 ./source/n/links
--rw-r--r--   1 root root  3832651 2010-01-30 20:30 ./source/n/links/links-2.3pre1.tar.bz2
--rwxr-xr-x   1 root root     3561 2010-02-18 20:46 ./source/n/links/links.SlackBuild
--rw-r--r--   1 root root      902 2003-08-19 20:03 ./source/n/links/slack-desc
-drwxr-xr-x   2 root root     4096 2010-02-12 01:54 ./source/n/lynx
--rwxr-xr-x   1 root root     4439 2010-02-12 01:56 ./source/n/lynx/lynx.SlackBuild
--rw-r--r--   1 root root      355 2009-12-03 21:36 ./source/n/lynx/lynx.cfg.diff.gz
--rw-r--r--   1 root root      573 2009-12-03 21:59 ./source/n/lynx/lynx.path.diff.gz
--rw-r--r--   1 root root  2090248 2009-12-02 21:53 ./source/n/lynx/lynx2.8.7.tar.xz
--rw-r--r--   1 root root      953 2002-02-27 06:50 ./source/n/lynx/slack-desc
-drwxr-xr-x   2 root root     4096 2009-08-10 23:26 ./source/n/mailx
--rw-r--r--   1 root root      281 2006-09-20 05:36 ./source/n/mailx/doinst.sh.gz
--rw-r--r--   1 root root   271482 2008-07-28 22:39 ./source/n/mailx/mailx-12.4.tar.bz2
--rwxr-xr-x   1 root root     3124 2009-08-11 01:02 ./source/n/mailx/mailx.SlackBuild
--rw-r--r--   1 root root     1023 2008-04-11 02:52 ./source/n/mailx/slack-desc
-drwxr-xr-x   2 root root     4096 2010-04-11 14:14 ./source/n/mcabber
--rw-r--r--   1 root root   552111 2010-04-11 13:32 ./source/n/mcabber/mcabber-0.10.0.tar.bz2
--rwxr-xr-x   1 root root     3928 2010-04-22 19:23 ./source/n/mcabber/mcabber.SlackBuild
--rw-r--r--   1 root root      876 2007-06-14 00:35 ./source/n/mcabber/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-23 00:41 ./source/n/metamail
--rw-r--r--   1 root root   125480 1994-02-18 21:07 ./source/n/metamail/metamail-2.7.tar.xz
--rwxr-xr-x   1 root root     4198 2009-05-23 00:41 ./source/n/metamail/metamail.SlackBuild
--rw-r--r--   1 root root    20532 2009-04-23 21:04 ./source/n/metamail/metamail.automake.diff.xz
--rw-r--r--   1 root root   201660 2006-07-19 03:47 ./source/n/metamail/metamail_2.7-52.diff.xz
--rw-r--r--   1 root root      927 2002-03-23 23:50 ./source/n/metamail/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-03 03:51 ./source/n/mtr
--rw-r--r--   1 root root   137112 2008-09-19 09:38 ./source/n/mtr/mtr-0.75.tar.xz
--rwxr-xr-x   1 root root     3439 2010-05-03 03:51 ./source/n/mtr/mtr.SlackBuild
--rw-r--r--   1 root root      779 2007-06-04 22:06 ./source/n/mtr/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-23 00:41 ./source/n/mutt
--rw-r--r--   1 root root      264 2002-06-01 05:12 ./source/n/mutt/doinst.sh.gz
--rw-r--r--   1 root root  1782828 2007-05-27 00:59 ./source/n/mutt/mutt-1.4.2.3.tar.bz2
--rwxr-xr-x   1 root root     2897 2009-05-23 00:41 ./source/n/mutt/mutt.SlackBuild
--rw-r--r--   1 root root      866 2008-02-11 03:44 ./source/n/mutt/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/nc
--rw-r--r--   1 root root    10439 2002-03-14 16:47 ./source/n/nc/nc-110-21.diff.gz
--rwxr-xr-x   1 root root     2370 2009-05-19 20:05 ./source/n/nc/nc.SlackBuild
--rw-r--r--   1 root root      641 2002-05-28 21:39 ./source/n/nc/nc.diff.gz
--rw-r--r--   1 root root    75267 2002-05-28 18:18 ./source/n/nc/nc110.tgz
--rw-r--r--   1 root root     1081 2002-05-28 21:54 ./source/n/nc/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-03 05:21 ./source/n/ncftp
--rw-r--r--   1 root root   450965 2010-04-07 23:24 ./source/n/ncftp/ncftp-3.2.4-src.tar.bz2
--rwxr-xr-x   1 root root     3575 2010-05-03 05:25 ./source/n/ncftp/ncftp.SlackBuild
--rw-r--r--   1 root root      793 2008-02-11 03:44 ./source/n/ncftp/slack-desc
-drwxr-xr-x   2 root root     4096 2009-10-12 20:48 ./source/n/net-snmp
--rw-r--r--   1 root root      344 2007-06-19 03:37 ./source/n/net-snmp/doinst.sh.gz
--rw-r--r--   1 root root  3271436 2009-09-24 03:07 ./source/n/net-snmp/net-snmp-5.5.tar.xz
--rwxr-xr-x   1 root root     5403 2010-02-10 20:22 ./source/n/net-snmp/net-snmp.SlackBuild
--rw-r--r--   1 root root      895 2007-06-19 03:36 ./source/n/net-snmp/rc.snmpd
--rw-r--r--   1 root root      910 2007-04-16 17:27 ./source/n/net-snmp/slack-desc
--rw-r--r--   1 root root     4909 2007-04-16 18:39 ./source/n/net-snmp/snmpd.conf.gz
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/net-tools
--rw-r--r--   1 root root     1334 2007-04-29 20:01 ./source/n/net-tools/ipmask.8
--rw-r--r--   1 root root     2216 1994-08-15 19:16 ./source/n/net-tools/ipmask.c
--rw-r--r--   1 root root   198520 2001-04-15 14:21 ./source/n/net-tools/net-tools-1.60.tar.bz2
--rwxr-xr-x   1 root root     3806 2009-05-19 20:05 ./source/n/net-tools/net-tools.SlackBuild
--rw-r--r--   1 root root      650 2001-03-22 05:23 ./source/n/net-tools/net-tools.diff.gz
--rw-r--r--   1 root root   173444 2007-12-02 05:47 ./source/n/net-tools/net-tools_1.60-19.diff.gz
--rw-r--r--   1 root root      909 2007-04-29 19:40 ./source/n/net-tools/slack-desc
-drwxr-xr-x   2 root root     4096 2010-02-09 05:57 ./source/n/netatalk
--rw-r--r--   1 root root        0 2003-02-02 04:37 ./source/n/netatalk/afppasswd
--rw-r--r--   1 root root      334 2009-05-31 04:29 ./source/n/netatalk/doinst.sh.gz
--rw-r--r--   1 root root   776632 2009-11-11 22:39 ./source/n/netatalk/netatalk-2.0.5.tar.xz
--rwxr-xr-x   1 root root     4694 2010-02-09 05:58 ./source/n/netatalk/netatalk.SlackBuild
--rw-r--r--   1 root root      320 2009-05-31 04:20 ./source/n/netatalk/netatalk.afpdconf.diff.gz
--rw-r--r--   1 root root      292 2004-10-28 18:43 ./source/n/netatalk/netatalk.etc2ps.diff.gz
--rw-r--r--   1 root root      486 2009-05-31 04:12 ./source/n/netatalk/netatalk.without_xfs.diff.gz
--rw-r--r--   1 root root     1032 2003-02-02 03:47 ./source/n/netatalk/rc.atalk.new
--rw-r--r--   1 root root     1040 2003-02-02 00:09 ./source/n/netatalk/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/netdate
--rwxr-xr-x   1 root root     2146 2009-05-19 20:05 ./source/n/netdate/netdate.SlackBuild
--rw-r--r--   1 root root     3766 1999-08-04 23:51 ./source/n/netdate/netdate.diff.gz
--rw-r--r--   1 root root      164 2001-02-26 02:37 ./source/n/netdate/netdate.diff2.gz
--rw-r--r--   1 root root     6755 1996-08-15 02:58 ./source/n/netdate/netdate.tar.gz
--rw-r--r--   1 root root     1107 2007-04-30 02:16 ./source/n/netdate/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-23 00:41 ./source/n/netkit-bootparamd
--rw-r--r--   1 root root    13934 2000-07-31 02:57 ./source/n/netkit-bootparamd/netkit-bootparamd-0.17.tar.gz
--rwxr-xr-x   1 root root     2173 2009-05-23 00:41 ./source/n/netkit-bootparamd/netkit-bootparamd.SlackBuild
--rw-r--r--   1 root root      986 2007-04-30 01:02 ./source/n/netkit-bootparamd/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-23 00:41 ./source/n/netkit-ftp
--rw-r--r--   1 root root    53934 2000-07-31 03:01 ./source/n/netkit-ftp/netkit-ftp-0.17.tar.gz
--rwxr-xr-x   1 root root     2012 2009-05-23 00:41 ./source/n/netkit-ftp/netkit-ftp.SlackBuild
--rw-r--r--   1 root root      905 2007-04-30 01:21 ./source/n/netkit-ftp/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-23 00:41 ./source/n/netkit-ntalk
--rw-r--r--   1 root root      842 2000-06-08 02:04 ./source/n/netkit-ntalk/netkit-ntalk-0.11.diff.gz
--rw-r--r--   1 root root    30632 2000-06-08 02:04 ./source/n/netkit-ntalk/netkit-ntalk-0.11.tar.gz
--rw-r--r--   1 root root      230 2001-02-26 02:46 ./source/n/netkit-ntalk/netkit-ntalk-0.17.diff.gz
--rw-r--r--   1 root root    37396 2000-07-31 03:02 ./source/n/netkit-ntalk/netkit-ntalk-0.17.tar.gz
--rwxr-xr-x   1 root root     2908 2009-05-23 00:41 ./source/n/netkit-ntalk/netkit-ntalk.SlackBuild
--rw-r--r--   1 root root      551 2004-11-04 03:51 ./source/n/netkit-ntalk/ntalk-0.17-slackware-alt-talkd.patch.gz
--rw-r--r--   1 root root      941 2007-05-07 04:09 ./source/n/netkit-ntalk/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/netkit-routed
--rw-r--r--   1 root root      305 2001-02-26 02:15 ./source/n/netkit-routed/netkit-routed-0.17.diff.gz
--rw-r--r--   1 root root    36435 2000-07-31 03:02 ./source/n/netkit-routed/netkit-routed-0.17.tar.gz
--rwxr-xr-x   1 root root     2396 2009-05-19 20:05 ./source/n/netkit-routed/netkit-routed.SlackBuild
--rw-r--r--   1 root root     8075 2000-12-26 15:14 ./source/n/netkit-routed/routed.18.candidate.final.patch.gz
--rw-r--r--   1 root root     1100 2007-04-29 23:36 ./source/n/netkit-routed/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/netkit-rsh
--rw-r--r--   1 root root    58268 2000-07-31 03:02 ./source/n/netkit-rsh/netkit-rsh-0.17.tar.gz
--rwxr-xr-x   1 root root     2810 2009-05-19 20:05 ./source/n/netkit-rsh/netkit-rsh.SlackBuild
--rw-r--r--   1 root root      884 2007-04-30 00:06 ./source/n/netkit-rsh/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/netkit-rusers
--rw-r--r--   1 root root      221 2001-02-26 02:17 ./source/n/netkit-rusers/netkit-rusers-0.17.diff.gz
--rw-r--r--   1 root root    22063 2000-07-31 03:03 ./source/n/netkit-rusers/netkit-rusers-0.17.tar.gz
--rwxr-xr-x   1 root root     2379 2009-05-19 20:05 ./source/n/netkit-rusers/netkit-rusers.SlackBuild
--rw-r--r--   1 root root     1160 2007-04-30 02:04 ./source/n/netkit-rusers/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/netkit-rwall
--rw-r--r--   1 root root    11861 2000-07-31 03:03 ./source/n/netkit-rwall/netkit-rwall-0.17.tar.gz
--rwxr-xr-x   1 root root     2199 2009-05-19 20:05 ./source/n/netkit-rwall/netkit-rwall.SlackBuild
--rw-r--r--   1 root root      925 2007-04-30 02:12 ./source/n/netkit-rwall/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/netkit-rwho
--rw-r--r--   1 root root      159 2001-02-26 02:19 ./source/n/netkit-rwho/netkit-rwho-0.17.diff.gz
--rw-r--r--   1 root root    20610 2000-07-31 03:03 ./source/n/netkit-rwho/netkit-rwho-0.17.tar.gz
--rwxr-xr-x   1 root root     2461 2009-05-19 20:05 ./source/n/netkit-rwho/netkit-rwho.SlackBuild
--rw-r--r--   1 root root      225 2008-12-14 22:21 ./source/n/netkit-rwho/rwhod_getloadavg.diff.gz
--rw-r--r--   1 root root     1153 2007-04-30 02:42 ./source/n/netkit-rwho/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/netkit-timed
--rw-r--r--   1 root root      243 2001-01-07 21:30 ./source/n/netkit-timed/netkit-timed-0.17.diff.gz
--rw-r--r--   1 root root    48655 2000-07-31 03:04 ./source/n/netkit-timed/netkit-timed-0.17.tar.gz
--rwxr-xr-x   1 root root     2261 2009-05-19 20:05 ./source/n/netkit-timed/netkit-timed.SlackBuild
--rw-r--r--   1 root root      870 2007-04-30 02:22 ./source/n/netkit-timed/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 21:29 ./source/n/netpipes
--rw-r--r--   1 root root      365 1999-02-07 16:28 ./source/n/netpipes/_netpipes.tar.gz
--rw-r--r--   1 root root    75276 1999-01-30 17:09 ./source/n/netpipes/netpipes-4.2-export.tar.gz
--rwxr-xr-x   1 root root     2234 2009-05-19 20:05 ./source/n/netpipes/netpipes.SlackBuild
--rw-r--r--   1 root root     1019 2008-02-11 03:44 ./source/n/netpipes/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-23 00:41 ./source/n/netwatch
--rw-r--r--   1 root root   187936 2009-03-04 08:01 ./source/n/netwatch/netwatch-1.3.0-1.tar.gz
--rwxr-xr-x   1 root root     3105 2009-05-23 00:41 ./source/n/netwatch/netwatch.SlackBuild
--rw-r--r--   1 root root      491 2009-03-04 08:01 ./source/n/netwatch/netwatch.makefile.diff.gz
--rw-r--r--   1 root root      233 2009-03-04 08:01 ./source/n/netwatch/netwatch.phonemyself.diff.gz
--rw-r--r--   1 root root      765 2009-03-04 08:01 ./source/n/netwatch/slack-desc
-drwxr-xr-x   4 root root     4096 2008-12-06 21:40 ./source/n/network-scripts
--rw-r--r--   1 root root     3038 2005-05-20 20:48 ./source/n/network-scripts/README.rc.inet1
--rw-r--r--   1 root root      485 2007-04-26 01:50 ./source/n/network-scripts/doinst.sh.gz
-drwxr-xr-x   2 root root     4096 2009-08-05 18:51 ./source/n/network-scripts/manpages
--rw-r--r--   1 root root     3299 2009-08-05 18:51 ./source/n/network-scripts/manpages/rc.inet1.8
--rw-r--r--   1 root root     5525 2009-08-05 18:51 ./source/n/network-scripts/manpages/rc.inet1.conf.5
--rwxr-xr-x   1 root root     2465 2010-01-18 23:53 ./source/n/network-scripts/network-scripts.SlackBuild
-drwxr-xr-x   2 root root     4096 2009-08-26 14:25 ./source/n/network-scripts/scripts
--rw-r--r--   1 root root       21 1999-01-28 01:15 ./source/n/network-scripts/scripts/HOSTNAME
--rw-r--r--   1 root root       27 1994-07-07 15:39 ./source/n/network-scripts/scripts/host.conf
--rw-r--r--   1 root root      627 2003-08-27 01:07 ./source/n/network-scripts/scripts/hosts
--rw-r--r--   1 root root      293 1993-11-26 01:54 ./source/n/network-scripts/scripts/hosts.allow
--rw-r--r--   1 root root      296 1993-11-26 01:54 ./source/n/network-scripts/scripts/hosts.deny
--rw-r--r--   1 root root      320 1998-02-09 01:57 ./source/n/network-scripts/scripts/hosts.equiv
--rw-r--r--   1 root root    20016 2008-12-07 07:34 ./source/n/network-scripts/scripts/netconfig
--rw-r--r--   1 root root      233 1999-10-07 05:21 ./source/n/network-scripts/scripts/networks
--rw-r--r--   1 root root       24 1998-02-09 02:21 ./source/n/network-scripts/scripts/nntpserver
--rw-r--r--   1 root root     5748 2002-02-10 09:01 ./source/n/network-scripts/scripts/protocols
--rw-r--r--   1 root root     9600 2009-08-26 14:25 ./source/n/network-scripts/scripts/rc.inet1
--rw-r--r--   1 root root     4752 2009-08-25 04:37 ./source/n/network-scripts/scripts/rc.inet1.conf
--rw-r--r--   1 root root     4847 2007-09-17 22:07 ./source/n/network-scripts/scripts/rc.inet2
--rw-r--r--   1 root root     2684 2008-12-03 22:58 ./source/n/network-scripts/scripts/rc.ip_forward
--rw-r--r--   1 root root       19 1999-01-28 01:15 ./source/n/network-scripts/scripts/resolv.conf
--rw-r--r--   1 root root      349 2003-02-18 23:53 ./source/n/network-scripts/scripts/setup.netconfig
--rw-r--r--   1 root root     1049 2008-02-11 03:44 ./source/n/network-scripts/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/netwrite
--rw-r--r--   1 root root      266 2001-02-26 02:24 ./source/n/netwrite/netwrite-0.17.diff.gz
--rw-r--r--   1 root root    16110 2000-07-31 03:04 ./source/n/netwrite/netwrite-0.17.tar.gz
--rwxr-xr-x   1 root root     2492 2009-05-19 20:05 ./source/n/netwrite/netwrite.SlackBuild
--rw-r--r--   1 root root     1019 2007-04-30 02:34 ./source/n/netwrite/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/newspost
--rw-r--r--   1 root root    61412 2003-05-05 14:28 ./source/n/newspost/newspost-2.1.1.tar.gz
--rwxr-xr-x   1 root root     2139 2009-05-19 20:05 ./source/n/newspost/newspost.SlackBuild
--rw-r--r--   1 root root      970 2003-07-18 22:21 ./source/n/newspost/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-03 05:41 ./source/n/nfs-utils
--rw-r--r--   1 root root     1177 2007-05-17 23:17 ./source/n/nfs-utils/_nfs-utils.tar.gz
--rw-r--r--   1 root root   721051 2010-02-18 13:03 ./source/n/nfs-utils/nfs-utils-1.2.2.tar.bz2
--rw-r--r--   1 root root      248 2010-02-18 13:03 ./source/n/nfs-utils/nfs-utils-1.2.2.tar.bz2.sign
--rwxr-xr-x   1 root root     5061 2010-05-03 05:37 ./source/n/nfs-utils/nfs-utils.SlackBuild
--rw-r--r--   1 root root      255 2008-03-31 22:19 ./source/n/nfs-utils/nfs-utils.lwrap.needs.lnsl.diff.gz
--rw-r--r--   1 root root     2457 2008-03-31 22:23 ./source/n/nfs-utils/rc.nfsd
--rw-r--r--   1 root root      782 2003-02-02 05:38 ./source/n/nfs-utils/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-03 05:43 ./source/n/nmap
--rw-r--r--   1 root root  8844904 2010-02-24 21:01 ./source/n/nmap/nmap-5.21.tar.xz
--rwxr-xr-x   1 root root     4775 2010-05-03 05:45 ./source/n/nmap/nmap.SlackBuild
--rw-r--r--   1 root root      302 2009-04-30 22:29 ./source/n/nmap/nmap.ndiff.mandir.diff.gz
--rw-r--r--   1 root root     1107 2002-03-29 08:29 ./source/n/nmap/slack-desc
-drwxr-xr-x   2 root root     4096 2009-11-12 00:21 ./source/n/nn
--rw-r--r--   1 root root     4844 2001-07-02 05:31 ./source/n/nn/NNTP.gz
--rw-r--r--   1 root root      315 2006-06-27 21:55 ./source/n/nn/doinst.sh.gz
--rw-r--r--   1 root root      509 2009-11-11 21:28 ./source/n/nn/m-x86_64.h.gz
--rw-r--r--   1 root root   352656 2005-11-18 13:08 ./source/n/nn/nn-6.7.3.tar.bz2
--rwxr-xr-x   1 root root     4072 2009-11-12 00:23 ./source/n/nn/nn.SlackBuild
--rw-r--r--   1 root root      287 2006-06-27 22:14 ./source/n/nn/nn.badnntphost.diff.gz
--rw-r--r--   1 root root     1349 2009-03-17 00:18 ./source/n/nn/nn.destdir.diff.gz
--rw-r--r--   1 root root     1281 2009-11-11 21:16 ./source/n/nn/nn.diff.gz
--rw-r--r--   1 root root       53 2006-06-27 21:53 ./source/n/nn/nntpserver.gz
--rw-r--r--   1 root root      897 2002-03-29 01:23 ./source/n/nn/slack-desc
-drwxr-xr-x   2 root root     4096 2010-04-22 04:38 ./source/n/ntp
--rw-r--r--   1 root root      314 2007-05-07 04:51 ./source/n/ntp/doinst.sh.gz
--rw-r--r--   1 root root  2798304 2010-04-09 08:28 ./source/n/ntp/ntp-4.2.6p1.tar.xz
--rwxr-xr-x   1 root root     4676 2010-04-22 04:52 ./source/n/ntp/ntp.SlackBuild
--rw-r--r--   1 root root     1664 2007-05-07 04:46 ./source/n/ntp/ntp.conf
--rw-r--r--   1 root root       22 1999-10-07 19:50 ./source/n/ntp/ntp.keys
--rw-r--r--   1 root root      269 2010-04-22 04:38 ./source/n/ntp/ntp.nano.diff.gz
--rw-r--r--   1 root root      804 2010-04-22 04:31 ./source/n/ntp/rc.ntpd
--rw-r--r--   1 root root      986 2002-02-27 23:02 ./source/n/ntp/slack-desc
-drwxr-xr-x   2 root root     4096 2009-11-25 04:57 ./source/n/obex-data-server
--rw-r--r--   1 root root      297 2009-11-25 04:57 ./source/n/obex-data-server/doinst.sh.gz
--rw-r--r--   1 root root   148937 2009-11-24 01:47 ./source/n/obex-data-server/obex-data-server-0.4.5.tar.bz2
--rwxr-xr-x   1 root root     3646 2010-05-02 07:24 ./source/n/obex-data-server/obex-data-server.SlackBuild
--rw-r--r--   1 root root      897 2009-11-25 04:59 ./source/n/obex-data-server/slack-desc
-drwxr-xr-x   2 root root     4096 2009-12-13 22:25 ./source/n/obexfs
--rw-r--r--   1 root root    68953 2009-11-24 01:46 ./source/n/obexfs/obexfs-0.12.tar.bz2
--rwxr-xr-x   1 root root     3359 2010-05-02 07:29 ./source/n/obexfs/obexfs.SlackBuild
--rw-r--r--   1 root root      876 2009-11-25 04:42 ./source/n/obexfs/slack-desc
-drwxr-xr-x   2 root root     4096 2010-04-17 15:59 ./source/n/obexftp
--rw-r--r--   1 root root   402552 2009-02-17 18:54 ./source/n/obexftp/obexftp-0.23.tar.bz2
--rwxr-xr-x   1 root root     4787 2010-05-02 07:25 ./source/n/obexftp/obexftp.SlackBuild
--rw-r--r--   1 root root      281 2010-04-19 18:20 ./source/n/obexftp/ruby_rstringlen.diff.gz
--rw-r--r--   1 root root      924 2007-05-18 03:09 ./source/n/obexftp/slack-desc
-drwxr-xr-x   2 root root     4096 2010-02-12 03:50 ./source/n/openldap-client
--rw-r--r--   1 root root      275 2006-01-17 21:18 ./source/n/openldap-client/doinst.sh.gz
--rw-r--r--   1 root root  3547408 2009-12-20 17:42 ./source/n/openldap-client/openldap-2.4.21.tar.xz
--rwxr-xr-x   1 root root     4558 2010-02-12 04:05 ./source/n/openldap-client/openldap-client.SlackBuild
--rw-r--r--   1 root root     1027 2006-01-18 01:55 ./source/n/openldap-client/slack-desc
-drwxr-xr-x   2 root root     4096 2009-12-28 05:27 ./source/n/openobex
--rw-r--r--   1 root root   290891 2009-02-08 18:35 ./source/n/openobex/openobex-1.5.tar.bz2
--rwxr-xr-x   1 root root     3972 2010-05-02 07:14 ./source/n/openobex/openobex.SlackBuild
--rw-r--r--   1 root root      997 2007-05-12 23:06 ./source/n/openobex/slack-desc
-drwxr-xr-x   2 root root     4096 2010-04-16 13:56 ./source/n/openssh
--rw-r--r--   1 root root      470 2006-09-28 21:11 ./source/n/openssh/doinst.sh.gz
--rw-r--r--   1 root root  1097574 2010-04-16 00:32 ./source/n/openssh/openssh-5.5p1.tar.gz
--rw-r--r--   1 root root      187 2010-04-16 00:32 ./source/n/openssh/openssh-5.5p1.tar.gz.asc
--rwxr-xr-x   1 root root     5052 2010-04-16 13:58 ./source/n/openssh/openssh.SlackBuild
--rw-r--r--   1 root root     1477 2007-04-02 00:05 ./source/n/openssh/rc.sshd
--rw-r--r--   1 root root     1134 2002-03-07 23:03 ./source/n/openssh/slack-desc
-drwxr-xr-x   2 root root     4096 2010-03-29 22:36 ./source/n/openssl
--rw-r--r--   1 root root     1727 2007-06-13 04:45 ./source/n/openssl/certwatch.gz
--rw-r--r--   1 root root      281 2007-06-13 17:20 ./source/n/openssl/doinst.sh-openssl-solibs.gz
--rw-r--r--   1 root root      336 2007-06-13 04:52 ./source/n/openssl/doinst.sh-openssl.gz
--rw-r--r--   1 root root  2415264 2010-03-24 13:25 ./source/n/openssl/openssl-0.9.8n.tar.xz
--rwxr-xr-x   1 root root     6342 2010-03-29 22:36 ./source/n/openssl/openssl.SlackBuild
--rw-r--r--   1 root root      501 2006-01-17 23:28 ./source/n/openssl/openssl.optsx86.diff.gz
--rw-r--r--   1 root root      283 2005-10-13 03:02 ./source/n/openssl/openssl.soname.diff.gz
--rw-r--r--   1 root root     1019 2002-04-06 20:23 ./source/n/openssl/slack-desc.openssl
--rw-r--r--   1 root root     1143 2002-03-23 22:11 ./source/n/openssl/slack-desc.openssl-solibs
-drwxr-xr-x   2 root root     4096 2010-05-03 05:55 ./source/n/openvpn
--rw-r--r--   1 root root     1375 2007-06-10 01:25 ./source/n/openvpn/README
--rw-r--r--   1 root root   880115 2009-12-12 00:13 ./source/n/openvpn/openvpn-2.1.1.tar.gz
--rw-r--r--   1 root root      189 2009-12-12 00:13 ./source/n/openvpn/openvpn-2.1.1.tar.gz.asc
--rwxr-xr-x   1 root root     4663 2010-05-03 05:59 ./source/n/openvpn/openvpn.SlackBuild
--rw-r--r--   1 root root     6942 2007-06-12 03:48 ./source/n/openvpn/openvpn.conf.sample
--rw-r--r--   1 root root      888 2007-06-10 01:23 ./source/n/openvpn/slack-desc
-drwxr-xr-x   3 root root     4096 2010-03-21 20:58 ./source/n/php
--rw-r--r--   1 root root      151 2007-05-19 01:27 ./source/n/php/doinst.sh.gz
--rw-r--r--   1 root root     1022 2009-10-02 23:56 ./source/n/php/mod_php.conf.example
-drwxr-xr-x   2 root root     4096 2008-05-07 05:21 ./source/n/php/pear
--rw-r--r--   1 root root  6978964 2010-02-24 12:27 ./source/n/php/php-5.2.13.tar.xz
--rwxr-xr-x   1 root root     9340 2010-03-21 20:59 ./source/n/php/php.SlackBuild
--rw-r--r--   1 root root      244 2010-03-21 20:44 ./source/n/php/php.gd_libpng-1.4.diff.gz
--rw-r--r--   1 root root      268 2010-03-06 03:28 ./source/n/php/php.gmp5.diff.gz
--rw-r--r--   1 root root     1115 2007-06-29 04:43 ./source/n/php/php.ini.diff.gz
--rw-r--r--   1 root root     1120 2007-06-29 05:15 ./source/n/php/php.recommended.ini.diff.gz
--rw-r--r--   1 root root      830 2005-12-09 05:18 ./source/n/php/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/pidentd
--rw-r--r--   1 root root      296 2002-04-05 23:57 ./source/n/pidentd/doinst.sh.gz
--rw-r--r--   1 root root   145505 2005-10-18 14:06 ./source/n/pidentd/pidentd-3.0.19.tar.gz
--rw-r--r--   1 root root      185 2005-10-18 14:06 ./source/n/pidentd/pidentd-3.0.19.tar.gz.sig
--rwxr-xr-x   1 root root     2837 2009-05-19 20:05 ./source/n/pidentd/pidentd.SlackBuild
--rw-r--r--   1 root root      893 2004-06-13 20:28 ./source/n/pidentd/pidentd.conf.diff.gz
--rw-r--r--   1 root root     1036 2002-04-06 00:20 ./source/n/pidentd/slack-desc
-drwxr-xr-x   2 root root     4096 2010-03-06 00:36 ./source/n/pinentry
--rw-r--r--   1 root root   333112 2010-03-03 12:32 ./source/n/pinentry/pinentry-0.8.0.tar.xz
--rwxr-xr-x   1 root root     4087 2010-03-06 00:37 ./source/n/pinentry/pinentry.SlackBuild
--rw-r--r--   1 root root      781 2007-03-15 20:47 ./source/n/pinentry/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/popa3d
--rw-r--r--   1 root root      164 2006-09-30 23:56 ./source/n/popa3d/doinst.sh.gz
--rw-r--r--   1 root root    32848 2006-05-23 00:47 ./source/n/popa3d/popa3d-1.0.2.tar.gz
--rw-r--r--   1 root root      331 2006-05-23 00:47 ./source/n/popa3d/popa3d-1.0.2.tar.gz.sign
--rwxr-xr-x   1 root root     2520 2009-05-19 20:05 ./source/n/popa3d/popa3d.SlackBuild
--rw-r--r--   1 root root      769 2006-03-12 22:23 ./source/n/popa3d/popa3d.diff.gz
--rw-r--r--   1 root root     1002 2004-02-21 20:45 ./source/n/popa3d/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/portmap
--rw-r--r--   1 root root      271 2006-09-21 03:15 ./source/n/portmap/doinst.sh.gz
--rw-r--r--   1 root root    20092 2007-05-11 03:06 ./source/n/portmap/portmap-6.0.tar.bz2
--rwxr-xr-x   1 root root     2876 2009-05-19 20:05 ./source/n/portmap/portmap.SlackBuild
--rw-r--r--   1 root root      217 2007-05-17 22:45 ./source/n/portmap/portmap.lwrap.needs.lnsl.diff.gz
--rw-r--r--   1 root root      610 2007-05-17 22:51 ./source/n/portmap/rc.rpc.gz
--rw-r--r--   1 root root      987 2002-03-22 03:05 ./source/n/portmap/slack-desc
-drwxr-xr-x   2 root root     4096 2009-11-18 04:02 ./source/n/ppp
--rw-r--r--   1 root root      324 2004-02-23 06:39 ./source/n/ppp/doinst.sh.gz
--rw-r--r--   1 root root     3620 1999-09-30 05:49 ./source/n/ppp/options.new.gz
--rw-r--r--   1 root root   556120 2009-11-17 14:03 ./source/n/ppp/ppp-2.4.5.tar.bz2
--rwxr-xr-x   1 root root     5443 2010-02-12 02:07 ./source/n/ppp/ppp.SlackBuild
--rw-r--r--   1 root root      401 2004-02-23 05:37 ./source/n/ppp/ppp.slack.diff.gz
--rw-r--r--   1 root root      348 2002-05-20 02:06 ./source/n/ppp/pppsetup-1.98.backupfiles.diff.gz
--rw-r--r--   1 root root     1303 2002-05-20 01:53 ./source/n/ppp/pppsetup-1.98.moredevs.diff.gz
--rw-r--r--   1 root root      270 2000-10-21 00:47 ./source/n/ppp/pppsetup-1.98.pppoff.diff.gz
--rw-r--r--   1 root root    11656 2000-06-18 21:01 ./source/n/ppp/pppsetup-1.98.slack.diff.gz
--rw-r--r--   1 root root    78697 1998-03-04 21:07 ./source/n/ppp/pppsetup-1.98.tar.gz
--rw-r--r--   1 root root      812 2005-07-25 05:56 ./source/n/ppp/radius.msdict.gz
--rw-r--r--   1 root root   119071 2002-02-03 13:59 ./source/n/ppp/radiusclient-0.3.2.tar.bz2
--rw-r--r--   1 root root      372 2005-07-25 05:56 ./source/n/ppp/realms.gz
--rw-r--r--   1 root root      129 2005-07-25 05:56 ./source/n/ppp/servers.gz
--rw-r--r--   1 root root      905 2002-03-07 03:31 ./source/n/ppp/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/procmail
--rw-r--r--   1 root root      294 2001-08-21 22:22 ./source/n/procmail/_procmail.tar.gz
--rw-r--r--   1 root root   226817 2001-09-11 05:10 ./source/n/procmail/procmail-3.22.tar.gz
--rw-r--r--   1 root root      366 2001-09-11 05:10 ./source/n/procmail/procmail-3.22.tar.gz.sig
--rwxr-xr-x   1 root root     2665 2009-05-19 20:05 ./source/n/procmail/procmail.SlackBuild
--rw-r--r--   1 root root      277 2006-09-19 04:10 ./source/n/procmail/procmail.lfs.diff.gz
--rw-r--r--   1 root root    13073 2002-12-26 21:18 ./source/n/procmail/procmail_3.22-5.diff.gz
--rw-r--r--   1 root root     1146 2002-04-06 20:25 ./source/n/procmail/slack-desc
-drwxr-xr-x   3 root root     4096 2010-02-26 20:05 ./source/n/proftpd
--rw-r--r--   1 root root      306 2003-03-06 07:52 ./source/n/proftpd/doinst.sh.gz
-drwxr-xr-x   2 root root     4096 2001-02-26 07:35 ./source/n/proftpd/etc
--rw-r--r--   1 root root      581 2001-02-26 07:31 ./source/n/proftpd/etc/ftpusers
--rw-r--r--   1 root root     2046 2008-07-29 18:18 ./source/n/proftpd/etc/proftpd.conf
--rw-r--r--   1 root root  3594628 2010-02-24 18:17 ./source/n/proftpd/proftpd-1.3.3.tar.xz
--rwxr-xr-x   1 root root     4141 2010-03-29 23:32 ./source/n/proftpd/proftpd.SlackBuild
--rw-r--r--   1 root root      797 2004-09-18 22:48 ./source/n/proftpd/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-03 06:05 ./source/n/pssh
--rw-r--r--   1 root root    18366 2010-03-04 19:18 ./source/n/pssh/pssh-2.1.1.tar.gz
--rwxr-xr-x   1 root root     2844 2010-05-03 06:04 ./source/n/pssh/pssh.SlackBuild
--rw-r--r--   1 root root      989 2010-05-03 06:05 ./source/n/pssh/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/pth
--rw-r--r--   1 root root   507518 2007-01-05 15:04 ./source/n/pth/pth-2.0.7.tar.bz2
--rwxr-xr-x   1 root root     3228 2009-05-19 20:05 ./source/n/pth/pth.SlackBuild
--rw-r--r--   1 root root      926 2007-03-15 20:48 ./source/n/pth/slack-desc
-drwxr-xr-x   2 root root     4096 2010-01-25 21:40 ./source/n/rdist
--rw-r--r--   1 root root      360 2004-09-09 11:08 ./source/n/rdist/rdist-6.1.5-00.linux.diff.gz
--rw-r--r--   1 root root      836 2004-09-09 11:08 ./source/n/rdist/rdist-6.1.5-01.links.diff.gz
--rw-r--r--   1 root root      419 2004-09-09 11:08 ./source/n/rdist/rdist-6.1.5-03.hardlink.diff.gz
--rw-r--r--   1 root root      929 2004-09-09 11:11 ./source/n/rdist/rdist-6.1.5-04.bison.diff.gz
--rw-r--r--   1 root root      233 2004-09-09 11:11 ./source/n/rdist/rdist-6.1.5-05.varargs.diff.gz
--rw-r--r--   1 root root      271 2004-09-09 11:11 ./source/n/rdist/rdist-6.1.5-06.maxargs.diff.gz
--rw-r--r--   1 root root     1500 2004-09-09 11:11 ./source/n/rdist/rdist-6.1.5-07.lfs.diff.gz
--rw-r--r--   1 root root    12347 2004-09-09 11:11 ./source/n/rdist/rdist-6.1.5-08.cleanup.diff.gz
--rw-r--r--   1 root root      304 2004-09-09 11:11 ./source/n/rdist/rdist-6.1.5-09.svr4.diff.gz
--rw-r--r--   1 root root      253 2004-09-09 11:11 ./source/n/rdist/rdist-6.1.5-10.ssh.diff.gz
--rw-r--r--   1 root root      419 2004-09-09 11:13 ./source/n/rdist/rdist-6.1.5-11.mkstemp.diff.gz
--rw-r--r--   1 root root      963 2005-05-04 14:08 ./source/n/rdist/rdist-6.1.5-12.stat64.diff.gz
--rw-r--r--   1 root root      462 2006-08-02 09:11 ./source/n/rdist/rdist-6.1.5-14.fix-msgsndnotify-loop.diff.gz
--rw-r--r--   1 root root   117861 2001-04-03 17:01 ./source/n/rdist/rdist-6.1.5.tar.gz
--rw-r--r--   1 root root     5320 2004-09-09 11:08 ./source/n/rdist/rdist-eu-license.txt
--rwxr-xr-x   1 root root     3705 2010-01-25 21:41 ./source/n/rdist/rdist.SlackBuild
--rw-r--r--   1 root root      811 2008-02-11 03:44 ./source/n/rdist/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/rp-pppoe
--rw-r--r--   1 root root      307 2005-09-03 17:27 ./source/n/rp-pppoe/doinst.sh.gz
--rw-r--r--   1 root root   215288 2008-06-30 14:01 ./source/n/rp-pppoe/rp-pppoe-3.10.tar.gz
--rwxr-xr-x   1 root root     2574 2009-05-19 20:05 ./source/n/rp-pppoe/rp-pppoe.SlackBuild
--rw-r--r--   1 root root      958 2002-04-15 04:13 ./source/n/rp-pppoe/slack-desc
-drwxr-xr-x   2 root root     4096 2010-03-01 01:31 ./source/n/rsync
--rw-r--r--   1 root root   563476 2009-12-31 21:20 ./source/n/rsync/rsync-3.0.7.tar.xz
--rwxr-xr-x   1 root root     3053 2010-03-01 01:32 ./source/n/rsync/rsync.SlackBuild
--rw-r--r--   1 root root      950 2008-02-11 03:44 ./source/n/rsync/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-16 22:55 ./source/n/rt2860-firmware
--rw-r--r--   1 root root     4479 2010-05-14 18:50 ./source/n/rt2860-firmware/RT2860_Firmware_V26.zip
--rwxr-xr-x   1 root root     2009 2010-05-16 22:59 ./source/n/rt2860-firmware/rt2860-firmware.SlackBuild
--rw-r--r--   1 root root      916 2010-05-16 23:04 ./source/n/rt2860-firmware/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-16 23:02 ./source/n/rt2870-firmware
--rw-r--r--   1 root root     3570 2010-05-14 18:50 ./source/n/rt2870-firmware/RT2870_Firmware_V22.zip
--rwxr-xr-x   1 root root     2009 2010-05-16 23:02 ./source/n/rt2870-firmware/rt2870-firmware.SlackBuild
--rw-r--r--   1 root root      807 2010-05-16 23:04 ./source/n/rt2870-firmware/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/rt61-firmware
--rw-r--r--   1 root root    13937 2008-03-10 10:04 ./source/n/rt61-firmware/RT61_Firmware_V1.2.zip
--rwxr-xr-x   1 root root     1994 2009-05-19 20:05 ./source/n/rt61-firmware/rt61-firmware.SlackBuild
--rw-r--r--   1 root root      737 2008-03-10 10:21 ./source/n/rt61-firmware/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/rt71w-firmware
--rw-r--r--   1 root root     2679 2008-03-10 10:04 ./source/n/rt71w-firmware/RT71W_Firmware_V1.8.zip
--rwxr-xr-x   1 root root     1997 2009-05-19 20:05 ./source/n/rt71w-firmware/rt71w-firmware.SlackBuild
--rw-r--r--   1 root root      752 2008-03-10 10:26 ./source/n/rt71w-firmware/slack-desc
-drwxr-xr-x   2 root root     4096 2010-04-26 02:33 ./source/n/samba
--rw-r--r--   1 root root      374 2003-03-07 21:49 ./source/n/samba/doinst.sh.gz
--rw-r--r--   1 root root      791 2003-10-01 04:12 ./source/n/samba/rc.samba
--rw-r--r--   1 root root  5691556 2010-04-26 02:32 ./source/n/samba/samba-3.5.2.tar.xz
--rwxr-xr-x   1 root root     7075 2010-04-26 02:48 ./source/n/samba/samba.SlackBuild
--rw-r--r--   1 root root     1011 2002-03-06 04:53 ./source/n/samba/slack-desc
--rw-r--r--   1 root root     9671 2009-10-03 20:59 ./source/n/samba/smb.conf.default
--rw-r--r--   1 root root     9683 2009-09-30 12:17 ./source/n/samba/smb.conf.default.orig
--rw-r--r--   1 root root      528 2009-10-03 20:59 ./source/n/samba/smb.conf.diff.gz
-drwxr-xr-x   2 root root     4096 2010-04-22 01:43 ./source/n/sendmail
--rw-r--r--   1 root root      799 2008-04-12 05:48 ./source/n/sendmail/Build.gz
--rwxr-xr-x   1 root root       63 2008-11-26 21:58 ./source/n/sendmail/SlackBuild
--rwxr-xr-x   1 root root     5734 2010-04-22 01:44 ./source/n/sendmail/SlackBuild-sendmail
--rwxr-xr-x   1 root root     2104 2010-04-22 01:44 ./source/n/sendmail/SlackBuild-sendmail-cf
--rw-r--r--   1 root root     4793 2009-06-26 19:34 ./source/n/sendmail/_sendmail.tar.gz
--rw-r--r--   1 root root      224 2002-02-14 01:48 ./source/n/sendmail/linux.uucp.mc
--rw-r--r--   1 root root     2742 2008-04-12 06:41 ./source/n/sendmail/sendmail-slackware-tls-sasl.mc
--rw-r--r--   1 root root     2510 2008-04-12 07:06 ./source/n/sendmail/sendmail-slackware-tls.mc
--rw-r--r--   1 root root     1825 2003-05-05 03:34 ./source/n/sendmail/sendmail-slackware.mc
--rw-r--r--   1 root root  2080472 2009-12-29 05:14 ./source/n/sendmail/sendmail.8.14.4.tar.gz
--rw-r--r--   1 root root      152 2009-12-29 05:14 ./source/n/sendmail/sendmail.8.14.4.tar.gz.sig
--rw-r--r--   1 root root      467 2010-04-22 23:21 ./source/n/sendmail/site.config.m4
--rw-r--r--   1 root root      962 2002-06-01 20:17 ./source/n/sendmail/slack-desc.sendmail
--rw-r--r--   1 root root     1050 2002-06-01 20:19 ./source/n/sendmail/slack-desc.sendmail-cf
-drwxr-xr-x   2 root root     4096 2010-05-19 02:27 ./source/n/slrn
--rw-r--r--   1 root root      280 2010-05-19 02:27 ./source/n/slrn/doinst.sh.gz
--rw-r--r--   1 root root      764 2008-11-11 20:39 ./source/n/slrn/slack-desc
--rw-r--r--   1 root root  1040218 2008-10-25 19:16 ./source/n/slrn/slrn-0.9.9p1.tar.bz2
--rwxr-xr-x   1 root root     3834 2010-05-19 02:26 ./source/n/slrn/slrn.SlackBuild
-drwxr-xr-x   2 root root     4096 2010-05-03 01:09 ./source/n/snownews
--rw-r--r--   1 root root      874 2009-05-17 03:56 ./source/n/snownews/slack-desc
--rw-r--r--   1 root root   167944 2009-09-17 06:44 ./source/n/snownews/snownews-1.5.12.tar.gz
--rw-r--r--   1 root root      194 2009-09-17 06:46 ./source/n/snownews/snownews-1.5.12.tar.gz.asc
--rwxr-xr-x   1 root root     3588 2010-05-03 01:12 ./source/n/snownews/snownews.SlackBuild
-drwxr-xr-x   2 root root     4096 2010-05-03 06:39 ./source/n/stunnel
--rw-r--r--   1 root root      265 2005-01-09 07:05 ./source/n/stunnel/doinst.sh.gz
--rw-r--r--   1 root root      290 2003-08-28 23:32 ./source/n/stunnel/generate-stunnel-key.sh
--rw-r--r--   1 root root      968 2003-08-28 23:04 ./source/n/stunnel/slack-desc
--rw-r--r--   1 root root   560103 2010-04-05 18:50 ./source/n/stunnel/stunnel-4.33.tar.gz
--rw-r--r--   1 root root      189 2010-04-05 18:50 ./source/n/stunnel/stunnel-4.33.tar.gz.asc
--rwxr-xr-x   1 root root     4376 2010-05-03 06:39 ./source/n/stunnel/stunnel.SlackBuild
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/tcp_wrappers
--rw-r--r--   1 root root     1112 2007-04-29 22:11 ./source/n/tcp_wrappers/slack-desc
--rwxr-xr-x   1 root root     3004 2009-05-19 20:05 ./source/n/tcp_wrappers/tcp_wrappers.SlackBuild
--rw-r--r--   1 root root   118844 2004-02-22 22:48 ./source/n/tcp_wrappers/tcp_wrappers_7.6.tar.gz
-drwxr-xr-x   2 root root     4096 2009-11-23 20:10 ./source/n/tcpdump
--rw-r--r--   1 root root   524273 2008-10-28 18:36 ./source/n/tcpdump/libpcap-1.0.0.tar.gz
--rw-r--r--   1 root root       65 2008-10-28 18:36 ./source/n/tcpdump/libpcap-1.0.0.tar.gz.sig
--rw-r--r--   1 root root     1942 2009-11-23 20:08 ./source/n/tcpdump/libpcap.20-fix-any-intf.diff.gz
--rw-r--r--   1 root root      832 2008-02-11 03:44 ./source/n/tcpdump/slack-desc
--rw-r--r--   1 root root   708774 2008-10-28 18:03 ./source/n/tcpdump/tcpdump-4.0.0.tar.gz
--rw-r--r--   1 root root       65 2008-10-28 18:36 ./source/n/tcpdump/tcpdump-4.0.0.tar.gz.sig
--rwxr-xr-x   1 root root     4367 2009-11-23 21:02 ./source/n/tcpdump/tcpdump.SlackBuild
-drwxr-xr-x   2 root root     4096 2009-05-23 00:42 ./source/n/telnet
--rw-r--r--   1 root root      522 2001-08-09 19:36 ./source/n/telnet/netkit-telnet-0.17-ayt.patch.gz
--rw-r--r--   1 root root      176 2001-02-26 02:21 ./source/n/telnet/netkit-telnet-0.17.diff.gz
--rw-r--r--   1 root root   133749 2000-07-31 03:04 ./source/n/telnet/netkit-telnet-0.17.tar.gz
--rw-r--r--   1 root root     1014 2007-04-29 23:47 ./source/n/telnet/slack-desc
--rw-r--r--   1 root root     2605 2005-08-28 22:42 ./source/n/telnet/telnet-OpenBSD-014_telnet.diff.gz
--rw-r--r--   1 root root      869 2002-03-22 04:41 ./source/n/telnet/telnet-OpenBSD-20020321.diff.gz
--rw-r--r--   1 root root   104068 2002-03-22 04:19 ./source/n/telnet/telnet-OpenBSD-20020321.tar.gz
--rwxr-xr-x   1 root root     2681 2009-05-23 00:42 ./source/n/telnet/telnet.SlackBuild
-drwxr-xr-x   2 root root     4096 2010-05-03 06:41 ./source/n/tftp-hpa
--rw-r--r--   1 root root     1015 2007-04-29 21:07 ./source/n/tftp-hpa/slack-desc
--rw-r--r--   1 root root    91829 2008-10-20 22:09 ./source/n/tftp-hpa/tftp-hpa-0.49.tar.bz2
--rw-r--r--   1 root root      248 2008-10-20 22:09 ./source/n/tftp-hpa/tftp-hpa-0.49.tar.bz2.sign
--rwxr-xr-x   1 root root     2781 2010-05-03 06:43 ./source/n/tftp-hpa/tftp-hpa.SlackBuild
-drwxr-xr-x   2 root root     4096 2009-05-23 00:42 ./source/n/tin
--rw-r--r--   1 root root      944 2002-03-06 05:36 ./source/n/tin/slack-desc
--rw-r--r--   1 root root  1436706 2006-04-25 12:23 ./source/n/tin/tin-1.8.2.tar.bz2
--rw-r--r--   1 root root      286 2006-04-25 12:30 ./source/n/tin/tin-1.8.2.tar.bz2.sign
--rwxr-xr-x   1 root root     2927 2009-05-23 00:42 ./source/n/tin/tin.SlackBuild
-drwxr-xr-x   2 root root     4096 2010-05-10 08:25 ./source/n/traceroute
--rw-r--r--   1 root root      969 2002-03-16 05:59 ./source/n/traceroute/slack-desc
--rw-r--r--   1 root root    64063 2010-04-27 12:03 ./source/n/traceroute/traceroute-2.0.14.tar.gz
--rwxr-xr-x   1 root root     2967 2010-05-10 08:27 ./source/n/traceroute/traceroute.SlackBuild
-drwxr-xr-x   2 root root     4096 2009-05-23 00:42 ./source/n/trn
--rw-r--r--   1 root root     5599 1998-10-26 17:07 ./source/n/trn/_trn.tar.gz
--rw-r--r--   1 root root     1697 2002-03-07 02:29 ./source/n/trn/config.sh.gz
--rw-r--r--   1 root root     1716 2009-03-16 23:47 ./source/n/trn/config.x86_64.sh.gz
--rw-r--r--   1 root root      744 2002-03-06 08:04 ./source/n/trn/slack-desc
--rw-r--r--   1 root root   325115 1995-01-09 07:11 ./source/n/trn/trn-3.6.tar.gz
--rwxr-xr-x   1 root root     2627 2009-05-23 00:42 ./source/n/trn/trn.SlackBuild
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/uucp
--rw-r--r--   1 root root     1001 2003-06-05 22:07 ./source/n/uucp/_uucp.tar.gz
--rw-r--r--   1 root root     1777 2003-06-05 21:46 ./source/n/uucp/policy.h.diff.gz
--rw-r--r--   1 root root      737 2002-02-27 23:14 ./source/n/uucp/slack-desc
--rw-r--r--   1 root root  1013234 2003-06-04 00:51 ./source/n/uucp/uucp-1.07.tar.gz
--rwxr-xr-x   1 root root     2368 2009-05-19 20:05 ./source/n/uucp/uucp.SlackBuild
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/vlan
--rw-r--r--   1 root root      888 2007-04-29 22:43 ./source/n/vlan/slack-desc
--rw-r--r--   1 root root   132059 2005-10-20 09:17 ./source/n/vlan/vlan.1.9.tar.bz2
--rwxr-xr-x   1 root root     2054 2009-05-19 20:05 ./source/n/vlan/vlan.SlackBuild
-drwxr-xr-x   2 root root     4096 2009-11-18 04:55 ./source/n/vsftpd
--rw-r--r--   1 root root      283 2009-02-19 17:05 ./source/n/vsftpd/doinst.sh.gz
--rw-r--r--   1 root root      953 2004-09-03 18:38 ./source/n/vsftpd/slack-desc
--rw-r--r--   1 root root   185562 2009-11-18 04:54 ./source/n/vsftpd/vsftpd-2.2.2.tar.gz
--rwxr-xr-x   1 root root     3399 2010-02-09 21:51 ./source/n/vsftpd/vsftpd.SlackBuild
--rw-r--r--   1 root root      198 2004-09-03 18:41 ./source/n/vsftpd/vsftpd.builddefs.diff.gz
--rw-r--r--   1 root root      950 2009-10-19 15:22 ./source/n/vsftpd/vsftpd.conf.diff.gz
--rw-r--r--   1 root root      115 2004-09-03 18:59 ./source/n/vsftpd/vsftpd.log.gz
-drwxr-xr-x   2 root root     4096 2009-12-03 22:13 ./source/n/wget
--rw-r--r--   1 root root      264 2008-10-01 23:27 ./source/n/wget/doinst.sh.gz
--rw-r--r--   1 root root      853 2002-03-23 23:56 ./source/n/wget/slack-desc
--rw-r--r--   1 root root  1217348 2009-12-02 21:55 ./source/n/wget/wget-1.12.tar.xz
--rwxr-xr-x   1 root root     3368 2010-02-09 21:44 ./source/n/wget/wget.SlackBuild
-drwxr-xr-x   2 root root     4096 2010-04-29 02:19 ./source/n/whois
--rw-r--r--   1 root root      841 2004-06-13 00:33 ./source/n/whois/slack-desc
--rwxr-xr-x   1 root root     2496 2010-04-29 02:25 ./source/n/whois/whois.SlackBuild
--rw-r--r--   1 root root    78755 2010-04-11 03:51 ./source/n/whois/whois_5.0.2.tar.gz
-drwxr-xr-x   3 root root     4096 2009-04-27 18:32 ./source/n/wireless-tools
--rw-r--r--   1 root root      389 2007-05-10 01:04 ./source/n/wireless-tools/doinst.sh.gz
-drwxr-xr-x   2 root root     4096 2010-01-03 00:09 ./source/n/wireless-tools/scripts
--rw-r--r--   1 root root    12835 2010-01-03 00:03 ./source/n/wireless-tools/scripts/rc.wireless
--rw-r--r--   1 root root     7320 2007-05-09 17:42 ./source/n/wireless-tools/scripts/rc.wireless.conf
--rw-r--r--   1 root root     1147 2006-04-30 01:08 ./source/n/wireless-tools/slack-desc
--rw-r--r--   1 root root   294417 2007-09-18 00:23 ./source/n/wireless-tools/wireless_tools.29.tar.gz
--rwxr-xr-x   1 root root     3755 2010-01-03 00:09 ./source/n/wireless-tools/wireless_tools.SlackBuild
--rw-r--r--   1 root root      227 2005-07-14 05:20 ./source/n/wireless-tools/wireless_tools.nowhine.diff.gz
--rw-r--r--   1 root root      287 2005-07-25 07:19 ./source/n/wireless-tools/wireless_tools.static.diff.gz
-drwxr-xr-x   2 root root     4096 2010-02-20 06:44 ./source/n/wpa_supplicant
--rw-r--r--   1 root root     2080 2005-08-06 20:17 ./source/n/wpa_supplicant/README.slackware
--rw-r--r--   1 root root     1067 2008-02-28 05:38 ./source/n/wpa_supplicant/slack-desc
--rw-r--r--   1 root root     5124 2009-04-20 18:10 ./source/n/wpa_supplicant/wpa_gui.png
--rw-r--r--   1 root root   800524 2010-01-12 16:36 ./source/n/wpa_supplicant/wpa_supplicant-0.6.10.tar.xz
--rwxr-xr-x   1 root root     7697 2010-02-20 06:45 ./source/n/wpa_supplicant/wpa_supplicant.SlackBuild
--rw-r--r--   1 root root      500 2009-04-20 14:56 ./source/n/wpa_supplicant/wpa_supplicant.defconfig
-drwxr-xr-x   2 root root     4096 2010-05-03 06:49 ./source/n/yptools
--rw-r--r--   1 root root      616 2000-11-24 23:39 ./source/n/yptools/nsswitch.conf-nis.gz
--rw-r--r--   1 root root      922 2002-05-31 06:11 ./source/n/yptools/rc.yp.gz
--rw-r--r--   1 root root      865 2002-03-05 19:13 ./source/n/yptools/slack-desc
--rw-r--r--   1 root root   204228 2010-04-21 09:59 ./source/n/yptools/yp-tools-2.12.tar.bz2
--rw-r--r--   1 root root      248 2010-04-21 09:59 ./source/n/yptools/yp-tools-2.12.tar.bz2.sign
--rw-r--r--   1 root root   185910 2009-11-30 15:04 ./source/n/yptools/ypbind-mt-1.31.tar.bz2
--rw-r--r--   1 root root      248 2009-11-30 15:04 ./source/n/yptools/ypbind-mt-1.31.tar.bz2.sign
--rw-r--r--   1 root root   200425 2010-02-23 14:03 ./source/n/yptools/ypserv-2.23.tar.bz2
--rw-r--r--   1 root root      248 2010-02-23 14:03 ./source/n/yptools/ypserv-2.23.tar.bz2.sign
--rwxr-xr-x   1 root root     9328 2010-05-03 06:50 ./source/n/yptools/yptools.SlackBuild
-drwxr-xr-x   2 root root     4096 2009-05-23 00:42 ./source/n/ytalk
--rw-r--r--   1 root root      269 2006-02-03 23:28 ./source/n/ytalk/doinst.sh.gz
--rw-r--r--   1 root root      745 2002-03-25 03:59 ./source/n/ytalk/slack-desc
--rw-r--r--   1 root root   110912 2005-02-13 14:14 ./source/n/ytalk/ytalk-3.3.0.tar.bz2
--rwxr-xr-x   1 root root     2544 2009-05-23 00:42 ./source/n/ytalk/ytalk.SlackBuild
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/n/zd1211-firmware
--rw-r--r--   1 root root    39061 2007-10-04 11:55 ./source/n/zd1211-firmware/zd1211-firmware-1.4.tar.bz2
--rwxr-xr-x   1 root root     2935 2009-05-19 20:05 ./source/n/zd1211-firmware/zd1211-firmware.SlackBuild
-drwxr-xr-x   5 root root     4096 2010-05-17 19:31 ./source/t
-drwxr-xr-x   3 root root     4096 2010-05-17 19:05 ./source/t/tetex
--rw-r--r--   1 root root   103137 2005-10-04 18:51 ./source/t/tetex/jadetex-3.13.tar.gz
--rwxr-xr-x   1 root root     2073 2008-10-15 15:01 ./source/t/tetex/jadetex.build
-drwxr-xr-x   2 root root     4096 2002-08-28 23:00 ./source/t/tetex/profile.d
--rwxr-xr-x   1 root root      134 2000-04-24 19:46 ./source/t/tetex/profile.d/tetex.csh
--rwxr-xr-x   1 root root      118 2000-04-24 19:46 ./source/t/tetex/profile.d/tetex.sh
--rw-r--r--   1 root root      794 2002-08-28 22:34 ./source/t/tetex/slack-desc.tetex
--rw-r--r--   1 root root      984 2005-02-18 01:42 ./source/t/tetex/slack-desc.tetex-doc
--rw-r--r--   1 root root  7049516 2005-02-06 19:40 ./source/t/tetex/tetex-src-3.0.tar.xz
--rw-r--r--   1 root root 75797944 2005-02-06 19:41 ./source/t/tetex/tetex-texmf-3.0.tar.xz
--rw-r--r--   1 root root 47549400 2005-02-06 19:41 ./source/t/tetex/tetex-texmfsrc-3.0.tar.xz
--rw-r--r--   1 root root     1759 2006-01-17 12:14 ./source/t/tetex/tetex.CVE-2005-3193.diff.gz
--rwxr-xr-x   1 root root     9081 2010-05-17 18:14 ./source/t/tetex/tetex.SlackBuild
--rw-r--r--   1 root root      517 2010-02-19 17:56 ./source/t/tetex/tetex.afm2tfm.getline.diff.gz
--rw-r--r--   1 root root      303 2005-02-10 20:29 ./source/t/tetex/tetex.amstex.fmtutil.diff.gz
--rw-r--r--   1 root root      633 2006-05-16 21:40 ./source/t/tetex/tetex.browsers.diff.gz
--rw-r--r--   1 root root      389 2010-02-19 17:27 ./source/t/tetex/tetex.cpascal.getline.posix.2008.diff.gz
--rw-r--r--   1 root root      504 2004-09-09 13:25 ./source/t/tetex/tetex.dvipdfm.mkstemp.diff.gz
--rw-r--r--   1 root root      239 2005-07-18 00:11 ./source/t/tetex/tetex.etex.diff.gz
--rw-r--r--   1 root root      375 2007-06-28 02:45 ./source/t/tetex/tetex.fontcachedirinhome.diff.gz
--rw-r--r--   1 root root      478 2010-05-17 18:03 ./source/t/tetex/tetex.leet.diff.gz
--rw-r--r--   1 root root      580 2010-02-19 17:52 ./source/t/tetex/tetex.png14.diff.gz
--rw-r--r--   1 root root     2480 2005-02-10 20:29 ./source/t/tetex/tetex.scripts.mktemp.diff.gz
--rw-r--r--   1 root root      724 2005-11-09 10:00 ./source/t/tetex/tetex.tmp.cleanup.diff.gz
--rw-r--r--   1 root root      250 2005-02-10 20:29 ./source/t/tetex/tetex.var.fonts.diff.gz
-drwxr-xr-x   2 root root     4096 2010-02-20 01:26 ./source/t/transfig
--rw-r--r--   1 root root      903 2008-02-11 03:44 ./source/t/transfig/slack-desc
--rw-r--r--   1 root root      601 2007-02-19 22:21 ./source/t/transfig/transfig.3.2.4-gcc4.patch.gz
--rw-r--r--   1 root root   326284 2002-12-19 18:38 ./source/t/transfig/transfig.3.2.4.tar.gz
--rwxr-xr-x   1 root root     3669 2010-02-20 01:27 ./source/t/transfig/transfig.SlackBuild
--rw-r--r--   1 root root      479 2007-02-19 22:21 ./source/t/transfig/transfig.diff.gz
--rw-r--r--   1 root root      285 2010-02-20 01:26 ./source/t/transfig/transfig.png14.nodither.diff.gz
-drwxr-xr-x   2 root root     4096 2010-02-20 01:32 ./source/t/xfig
--rw-r--r--   1 root root      886 2008-02-11 03:44 ./source/t/xfig/slack-desc
--rw-r--r--   1 root root     3177 2004-02-05 12:49 ./source/t/xfig/xfig-3.2.4-mkstemp.diff.gz
--rw-r--r--   1 root root      604 2004-02-03 17:52 ./source/t/xfig/xfig.3.2.3d-international-std-fonts.diff.gz
--rw-r--r--   1 root root      149 2004-02-03 17:53 ./source/t/xfig/xfig.3.2.3d-xcolor.diff.gz
--rw-r--r--   1 root root      545 2004-02-03 17:51 ./source/t/xfig/xfig.3.2.3d-xim.diff.gz
--rw-r--r--   1 root root      210 2005-10-06 17:19 ./source/t/xfig/xfig.3.2.4-gcc4.diff.gz
--rw-r--r--   1 root root     1386 2006-11-16 13:30 ./source/t/xfig/xfig.3.2.4-locale.diff.gz
--rw-r--r--   1 root root      577 2004-03-22 12:26 ./source/t/xfig/xfig.3.2.4-null.diff.gz
--rw-r--r--   1 root root     1695 2004-08-25 12:26 ./source/t/xfig/xfig.3.2.4-quiet.diff.gz
--rw-r--r--   1 root root     1599 2005-10-06 17:19 ./source/t/xfig/xfig.3.2.4-urw-fonts.diff.gz
--rw-r--r--   1 root root     5582 2008-04-14 04:41 ./source/t/xfig/xfig.3.2.4.diff.gz
--rw-r--r--   1 root root  3666286 2006-08-15 00:06 ./source/t/xfig/xfig.3.2.4.full.tar.bz2
--rwxr-xr-x   1 root root     4442 2010-02-21 17:15 ./source/t/xfig/xfig.SlackBuild
--rw-r--r--   1 root root      288 2007-02-19 09:33 ./source/t/xfig/xfig.docs.location.diff.gz
--rw-r--r--   1 root root      578 2007-02-19 09:06 ./source/t/xfig/xfig.fig.ad.diff.gz
--rw-r--r--   1 root root      402 2006-08-14 23:55 ./source/t/xfig/xfig.no.pdf.ref.diff.gz
--rw-r--r--   1 root root      286 2006-08-15 00:21 ./source/t/xfig/xfig.no.xfig_ref_en.pdf.diff.gz
--rw-r--r--   1 root root      279 2010-02-20 01:32 ./source/t/xfig/xfig.png14.nodither.diff.gz
-drwxr-xr-x   8 root root     4096 2008-11-07 15:27 ./source/tcl
-drwxr-xr-x   2 root root     4096 2009-05-23 00:41 ./source/tcl/expect
--rw-r--r--   1 root root   567944 2008-10-29 18:15 ./source/tcl/expect/expect-5.44.1.11.tar.bz2
--rwxr-xr-x   1 root root     3863 2009-05-23 00:41 ./source/tcl/expect/expect.SlackBuild
--rw-r--r--   1 root root      221 2009-05-11 21:26 ./source/tcl/expect/expect.exp_main_tk.c.version.require.diff.gz
--rw-r--r--   1 root root      990 2008-02-11 03:44 ./source/tcl/expect/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/tcl/hfsutils
--rw-r--r--   1 root root   207697 1998-11-02 23:34 ./source/tcl/hfsutils/hfsutils-3.2.6.tar.gz
--rw-r--r--   1 root root      286 1998-11-02 23:39 ./source/tcl/hfsutils/hfsutils-3.2.6.tar.gz.sign
--rwxr-xr-x   1 root root     4449 2009-05-19 20:05 ./source/tcl/hfsutils/hfsutils.SlackBuild
--rw-r--r--   1 root root      209 2005-07-11 02:18 ./source/tcl/hfsutils/hfsutils.errno.diff.gz
--rw-r--r--   1 root root      928 2008-02-11 03:44 ./source/tcl/hfsutils/slack-desc
-drwxr-xr-x   2 root root     4096 2009-12-07 00:43 ./source/tcl/tcl
--rw-r--r--   1 root root      713 2002-03-23 23:59 ./source/tcl/tcl/slack-desc
--rwxr-xr-x   1 root root     3927 2009-12-07 00:43 ./source/tcl/tcl/tcl.SlackBuild
--rw-r--r--   1 root root  2769496 2009-11-17 16:26 ./source/tcl/tcl/tcl8.5.8-src.tar.xz
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/tcl/tclx
--rw-r--r--   1 root root     1010 2002-03-24 00:00 ./source/tcl/tclx/slack-desc
--rw-r--r--   1 root root      353 2007-02-21 04:54 ./source/tcl/tclx/tclx-8.4.configure.diff.gz
--rw-r--r--   1 root root      270 2007-02-21 04:54 ./source/tcl/tclx/tclx-8.4.gcc4.diff.gz
--rwxr-xr-x   1 root root     3874 2009-12-07 00:52 ./source/tcl/tclx/tclx.SlackBuild
--rw-r--r--   1 root root   313595 2006-02-03 15:28 ./source/tcl/tclx/tclx8.4.tar.bz2
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/tcl/tix
--rw-r--r--   1 root root  1831503 2008-07-28 19:37 ./source/tcl/tix/Tix8.4.3.tar.gz
--rw-r--r--   1 root root      860 2002-03-24 00:02 ./source/tcl/tix/slack-desc
--rwxr-xr-x   1 root root     3333 2009-12-07 00:50 ./source/tcl/tix/tix.SlackBuild
--rw-r--r--   1 root root      236 2006-11-18 04:05 ./source/tcl/tix/tix.soname.patch.gz
--rw-r--r--   1 root root     1908 2008-09-09 00:46 ./source/tcl/tix/tix.tcl8.5.patch.gz
-drwxr-xr-x   2 root root     4096 2009-12-07 00:47 ./source/tcl/tk
--rw-r--r--   1 root root      651 2002-03-24 00:03 ./source/tcl/tk/slack-desc
--rwxr-xr-x   1 root root     3816 2009-12-07 00:48 ./source/tcl/tk/tk.SlackBuild
--rw-r--r--   1 root root  2402508 2009-11-17 16:26 ./source/tcl/tk/tk8.5.8-src.tar.xz
-drwxr-xr-x  30 root root     4096 2010-04-27 21:48 ./source/x
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/x/anthy
--rw-r--r--   1 root root  4235687 2008-01-28 15:07 ./source/x/anthy/anthy-9100e.tar.gz
--rwxr-xr-x   1 root root     3610 2009-05-19 20:05 ./source/x/anthy/anthy.SlackBuild
--rw-r--r--   1 root root      714 2008-02-13 08:13 ./source/x/anthy/slack-desc
-drwxr-xr-x   2 root root     4096 2009-11-05 22:11 ./source/x/dejavu-fonts-ttf
--rw-r--r--   1 root root  4348431 2009-08-27 15:14 ./source/x/dejavu-fonts-ttf/dejavu-fonts-ttf-2.30.tar.bz2
--rwxr-xr-x   1 root root     2722 2009-11-05 22:11 ./source/x/dejavu-fonts-ttf/dejavu-fonts-ttf.SlackBuild
--rw-r--r--   1 root root      167 2007-03-24 05:03 ./source/x/dejavu-fonts-ttf/doinst.sh.gz
--rw-r--r--   1 root root     1003 2008-08-03 19:13 ./source/x/dejavu-fonts-ttf/slack-desc
-drwxr-xr-x   2 root root     4096 2009-12-02 03:54 ./source/x/fontconfig
--rw-r--r--   1 root root      149 2009-12-02 03:54 ./source/x/fontconfig/doinst.sh.gz
--rw-r--r--   1 root root   992040 2009-12-02 03:33 ./source/x/fontconfig/fontconfig-2.8.0.tar.xz
--rwxr-xr-x   1 root root     5286 2010-02-20 20:56 ./source/x/fontconfig/fontconfig.SlackBuild
--rw-r--r--   1 root root      546 2009-12-02 03:49 ./source/x/fontconfig/fontconfig.dejavu.diff.gz
--rw-r--r--   1 root root      457 2009-12-02 03:49 ./source/x/fontconfig/fontconfig.font.dir.list.diff.gz
--rw-r--r--   1 root root      657 2007-01-25 05:00 ./source/x/fontconfig/setup.05.fontconfig
--rw-r--r--   1 root root      809 2006-07-22 02:47 ./source/x/fontconfig/slack-desc
-drwxr-xr-x   2 root root     4096 2009-07-23 06:22 ./source/x/glew
--rw-r--r--   1 root root   241696 2009-05-30 01:35 ./source/x/glew/glew-1.5.1-src.tar.xz
--rwxr-xr-x   1 root root     2733 2009-08-04 00:09 ./source/x/glew/glew.SlackBuild
--rw-r--r--   1 root root       85 2009-07-23 06:15 ./source/x/glew/glew.url
--rw-r--r--   1 root root      840 2009-07-23 06:21 ./source/x/glew/slack-desc
-drwxr-xr-x   2 root root     4096 2010-04-27 21:57 ./source/x/libdrm
--rw-r--r--   1 root root   348128 2010-04-02 20:55 ./source/x/libdrm/libdrm-2.4.20.tar.xz
--rwxr-xr-x   1 root root     3666 2010-03-03 21:38 ./source/x/libdrm/libdrm.SlackBuild
--rw-r--r--   1 root root      257 2010-02-22 19:17 ./source/x/libdrm/libdrm.uint32_t.diff.gz
--rw-r--r--   1 root root      717 2007-02-01 01:33 ./source/x/libdrm/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/x/liberation-fonts-ttf
--rw-r--r--   1 root root      942 2008-03-27 11:15 ./source/x/liberation-fonts-ttf/60-liberation.conf
--rw-r--r--   1 root root      167 2007-03-24 05:03 ./source/x/liberation-fonts-ttf/doinst.sh.gz
--rw-r--r--   1 root root   848983 2008-07-17 10:27 ./source/x/liberation-fonts-ttf/liberation-fonts-1.04.tar.bz2
--rwxr-xr-x   1 root root     2251 2009-05-19 20:05 ./source/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild
--rw-r--r--   1 root root     1042 2008-01-02 05:15 ./source/x/liberation-fonts-ttf/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/x/libhangul
--rw-r--r--   1 root root  2791830 2008-02-04 12:36 ./source/x/libhangul/libhangul-0.0.7.tar.gz
--rwxr-xr-x   1 root root     3514 2009-05-19 20:05 ./source/x/libhangul/libhangul.SlackBuild
--rw-r--r--   1 root root      841 2008-02-13 08:10 ./source/x/libhangul/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/x/m17n-lib
--rw-r--r--   1 root root     1983 2008-01-29 10:34 ./source/x/m17n-lib/internal-flt.h
--rw-r--r--   1 root root  1323620 2009-03-03 00:46 ./source/x/m17n-lib/m17n-db-1.5.4.tar.gz
--rw-r--r--   1 root root  2383096 2009-02-25 03:53 ./source/x/m17n-lib/m17n-docs-1.5.2.tar.gz
--rw-r--r--   1 root root     1483 2008-01-29 13:16 ./source/x/m17n-lib/m17n-docs_makefile.patch
--rw-r--r--   1 root root   962454 2009-03-03 00:46 ./source/x/m17n-lib/m17n-lib-1.5.4.tar.gz
--rwxr-xr-x   1 root root     5451 2009-05-19 20:05 ./source/x/m17n-lib/m17n-lib.SlackBuild
--rw-r--r--   1 root root      875 2008-02-13 08:20 ./source/x/m17n-lib/slack-desc
-drwxr-xr-x   2 root root     4096 2010-04-09 14:06 ./source/x/mesa
--rw-r--r--   1 root root 14055068 2010-04-05 19:48 ./source/x/mesa/MesaDemos-7.8.1.tar.xz
--rw-r--r--   1 root root   150124 2010-04-05 19:49 ./source/x/mesa/MesaGLUT-7.8.1.tar.xz
--rw-r--r--   1 root root  4148040 2010-04-05 19:49 ./source/x/mesa/MesaLib-7.8.1.tar.xz
--rw-r--r--   1 root root      352 2008-03-10 07:13 ./source/x/mesa/README.GIT
--rw-r--r--   1 root root      301 2008-03-10 07:14 ./source/x/mesa/get-mesa.sh
--rwxr-xr-x   1 root root     4390 2010-04-09 14:11 ./source/x/mesa/mesa.SlackBuild
--rw-r--r--   1 root root       36 2009-12-05 00:46 ./source/x/mesa/mesa.url
--rw-r--r--   1 root root      790 2007-02-05 00:06 ./source/x/mesa/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/x/sazanami-fonts-ttf
--rw-r--r--   1 root root  8622710 2004-06-29 13:55 ./source/x/sazanami-fonts-ttf/sazanami-20040629.tar.bz2
--rwxr-xr-x   1 root root     3319 2009-05-19 20:05 ./source/x/sazanami-fonts-ttf/sazanami-fonts-ttf.SlackBuild
--rw-r--r--   1 root root      872 2008-02-12 06:53 ./source/x/sazanami-fonts-ttf/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-23 00:42 ./source/x/scim
-drwxr-xr-x   2 root root     4096 2009-06-10 01:42 ./source/x/scim-anthy
--rw-r--r--   1 root root   649495 2007-05-21 08:47 ./source/x/scim-anthy/scim-anthy-1.2.4.tar.gz
--rwxr-xr-x   1 root root     3585 2009-06-10 01:43 ./source/x/scim-anthy/scim-anthy.SlackBuild
--rw-r--r--   1 root root      553 2009-06-10 01:42 ./source/x/scim-anthy/scim-anthy.gcc43.diff.gz
--rw-r--r--   1 root root      969 2008-02-13 08:28 ./source/x/scim-anthy/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-23 00:42 ./source/x/scim-bridge
--rw-r--r--   1 root root   508870 2009-04-19 04:08 ./source/x/scim-bridge/scim-bridge-0.4.16.tar.gz
--rwxr-xr-x   1 root root     4354 2009-06-10 01:45 ./source/x/scim-bridge/scim-bridge.SlackBuild
--rw-r--r--   1 root root      967 2008-02-13 09:11 ./source/x/scim-bridge/slack-desc
-drwxr-xr-x   2 root root     4096 2009-06-10 01:50 ./source/x/scim-hangul
--rw-r--r--   1 root root  1176577 2007-12-30 07:57 ./source/x/scim-hangul/scim-hangul-0.3.2.tar.gz
--rwxr-xr-x   1 root root     3579 2009-06-10 01:52 ./source/x/scim-hangul/scim-hangul.SlackBuild
--rw-r--r--   1 root root      278 2009-06-10 01:50 ./source/x/scim-hangul/scim-hangul.gcc43.diff.gz
--rw-r--r--   1 root root     1073 2008-02-04 12:34 ./source/x/scim-hangul/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-23 00:42 ./source/x/scim-input-pad
--rw-r--r--   1 root root   442263 2009-04-19 04:09 ./source/x/scim-input-pad/scim-input-pad-0.1.2.tar.bz2
--rwxr-xr-x   1 root root     3330 2009-06-10 01:53 ./source/x/scim-input-pad/scim-input-pad.SlackBuild
--rw-r--r--   1 root root      821 2009-04-20 12:57 ./source/x/scim-input-pad/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/x/scim-m17n
--rw-r--r--   1 root root   355801 2009-04-19 04:11 ./source/x/scim-m17n/scim-m17n-0.2.3.tar.gz
--rwxr-xr-x   1 root root     3833 2009-05-19 20:05 ./source/x/scim-m17n/scim-m17n.SlackBuild
--rw-r--r--   1 root root      862 2008-02-13 09:16 ./source/x/scim-m17n/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/x/scim-pinyin
--rw-r--r--   1 root root  5492055 2005-08-12 01:44 ./source/x/scim-pinyin/scim-pinyin-0.5.91.tar.gz
--rwxr-xr-x   1 root root     3921 2009-06-10 01:54 ./source/x/scim-pinyin/scim-pinyin.SlackBuild
--rw-r--r--   1 root root      448 2009-03-16 13:59 ./source/x/scim-pinyin/scim-pinyin.gcc43.diff.gz
--rw-r--r--   1 root root      848 2008-02-13 09:19 ./source/x/scim-pinyin/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-23 00:42 ./source/x/scim-tables
--rw-r--r--   1 root root  7256429 2009-01-25 03:06 ./source/x/scim-tables/scim-tables-0.5.9.tar.gz
--rwxr-xr-x   1 root root     3688 2009-06-10 01:55 ./source/x/scim-tables/scim-tables.SlackBuild
--rw-r--r--   1 root root      751 2008-02-13 09:25 ./source/x/scim-tables/slack-desc
--rw-r--r--   1 root root  2928091 2009-04-19 04:29 ./source/x/scim/scim-1.4.9.tar.gz
--rw-r--r--   1 root root     1411 2007-10-28 14:28 ./source/x/scim/scim-setup.desktop
--rwxr-xr-x   1 root root     8930 2009-06-09 00:27 ./source/x/scim/scim.SlackBuild
--rw-r--r--   1 root root      423 2008-03-31 21:12 ./source/x/scim/scim.desktop
--rw-r--r--   1 root root      785 2008-02-16 23:16 ./source/x/scim/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/x/sinhala_lklug-font-ttf
--rwxr-xr-x   1 root root     3389 2009-05-19 20:05 ./source/x/sinhala_lklug-font-ttf/sinhala_lklug-font-ttf.SlackBuild
--rw-r--r--   1 root root   300476 2006-09-29 19:19 ./source/x/sinhala_lklug-font-ttf/sinhala_lklug.ttf
--rw-r--r--   1 root root      946 2008-02-12 06:59 ./source/x/sinhala_lklug-font-ttf/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/x/tibmachuni-font-ttf
--rw-r--r--   1 root root  1664901 2008-01-27 22:16 ./source/x/tibmachuni-font-ttf/TibetanMachineUnicodeFont.zip
--rw-r--r--   1 root root     1031 2008-02-16 02:42 ./source/x/tibmachuni-font-ttf/slack-desc
--rwxr-xr-x   1 root root     3803 2009-05-19 20:05 ./source/x/tibmachuni-font-ttf/tibmachuni-font-ttf.SlackBuild
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/x/ttf-indic-fonts
--rw-r--r--   1 root root     6168 2005-05-14 06:49 ./source/x/ttf-indic-fonts/COPYING.bz2
--rw-r--r--   1 root root    33862 2006-01-30 12:58 ./source/x/ttf-indic-fonts/Samyak_Malayalam.ttf.bz2
--rw-r--r--   1 root root      122 2006-09-21 08:00 ./source/x/ttf-indic-fonts/Samyak_Malayalam.url
--rw-r--r--   1 root root      170 2007-04-22 20:40 ./source/x/ttf-indic-fonts/doinst.sh.gz
--rw-r--r--   1 root root     1087 2006-09-21 08:19 ./source/x/ttf-indic-fonts/slack-desc
--rw-r--r--   1 root root  2925975 2006-12-26 08:32 ./source/x/ttf-indic-fonts/ttf-indic-fonts-0.4.7.4.tar.bz2
--rwxr-xr-x   1 root root     3351 2009-05-19 20:05 ./source/x/ttf-indic-fonts/ttf-indic-fonts.SlackBuild
--rw-r--r--   1 root root      757 2006-09-21 07:19 ./source/x/ttf-indic-fonts/ttf-indic-fonts.copyright.diff.gz
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/x/wqy-zenhei-font-ttf
--rw-r--r--   1 root root     1156 2008-02-20 01:44 ./source/x/wqy-zenhei-font-ttf/slack-desc
--rw-r--r--   1 root root  6649596 2009-04-20 19:06 ./source/x/wqy-zenhei-font-ttf/wqy-zenhei-0.8.38-1.tar.bz2
--rwxr-xr-x   1 root root     3953 2009-05-19 20:05 ./source/x/wqy-zenhei-font-ttf/wqy-zenhei-font-ttf.SlackBuild
-drwxr-xr-x  10 root root     4096 2010-03-29 20:09 ./source/x/x11
-drwxr-xr-x   4 root root     4096 2009-06-08 20:25 ./source/x/x11-skel
--rw-r--r--   1 root root      578 2009-06-08 20:24 ./source/x/x11-skel/doinst.sh.gz
-drwxr-xr-x   2 root root     4096 2007-02-14 19:32 ./source/x/x11-skel/manpages
--rw-r--r--   1 root root     1060 2002-05-31 22:23 ./source/x/x11-skel/manpages/xwmconfig.1
-drwxr-xr-x   2 root root     4096 2007-02-14 19:15 ./source/x/x11-skel/scripts
--rw-r--r--   1 root root      358 2006-08-10 03:33 ./source/x/x11-skel/scripts/setup.xwmconfig
--rw-r--r--   1 root root    17100 2007-02-12 21:14 ./source/x/x11-skel/scripts/xorg.conf-fbdev
--rw-r--r--   1 root root    15858 2007-02-12 21:14 ./source/x/x11-skel/scripts/xorg.conf-vesa
--rw-r--r--   1 root root    12785 2006-08-21 01:53 ./source/x/x11-skel/scripts/xorgsetup
--rw-r--r--   1 root root     7460 2009-03-09 23:19 ./source/x/x11-skel/scripts/xwmconfig
--rw-r--r--   1 root root     1066 2007-05-28 21:04 ./source/x/x11-skel/slack-desc
--rwxr-xr-x   1 root root     2315 2009-06-08 20:29 ./source/x/x11-skel/x11-skel.SlackBuild
--rw-r--r--   1 root root      183 2009-05-30 01:47 ./source/x/x11/arch.use.flags
-drwxr-xr-x   2 root root     4096 2010-05-05 06:54 ./source/x/x11/build
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/gccmakedep
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/ico
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/libXTrap
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/libXevie
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/libXp
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/libXprintAppUtil
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/libXprintUtil
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/libxkbui
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/lndir
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/oclock
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/printproto
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/proxymngr
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/rendercheck
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/scripts
--rw-r--r--   1 root root        2 2009-06-03 02:16 ./source/x/x11/build/trapproto
--rw-r--r--   1 root root        2 2009-12-01 07:39 ./source/x/x11/build/twm
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/xconsole
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/xdbedizzy
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/xditview
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/xf86-input-elographics
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/xf86-input-mutouch
--rw-r--r--   1 root root        2 2010-05-02 00:37 ./source/x/x11/build/xf86-input-vmmouse
--rw-r--r--   1 root root        2 2010-02-21 23:18 ./source/x/x11/build/xf86-video-apm
--rw-r--r--   1 root root        2 2009-10-24 04:16 ./source/x/x11/build/xf86-video-ast
--rw-r--r--   1 root root        2 2010-02-21 23:18 ./source/x/x11/build/xf86-video-cirrus
--rw-r--r--   1 root root        2 2009-10-24 04:16 ./source/x/x11/build/xf86-video-glint
--rw-r--r--   1 root root        2 2010-02-21 23:18 ./source/x/x11/build/xf86-video-i128
--rw-r--r--   1 root root        2 2010-02-21 23:18 ./source/x/x11/build/xf86-video-i740
--rw-r--r--   1 root root        2 2010-02-21 23:18 ./source/x/x11/build/xf86-video-mach64
--rw-r--r--   1 root root        2 2010-02-21 23:18 ./source/x/x11/build/xf86-video-mga
--rw-r--r--   1 root root        2 2010-02-21 23:18 ./source/x/x11/build/xf86-video-neomagic
--rw-r--r--   1 root root        2 2009-10-24 04:16 ./source/x/x11/build/xf86-video-r128
--rw-r--r--   1 root root        2 2010-02-21 23:18 ./source/x/x11/build/xf86-video-s3
--rw-r--r--   1 root root        2 2010-02-21 23:18 ./source/x/x11/build/xf86-video-s3virge
--rw-r--r--   1 root root        2 2009-10-24 04:16 ./source/x/x11/build/xf86-video-savage
--rw-r--r--   1 root root        2 2009-10-24 04:16 ./source/x/x11/build/xf86-video-sis
--rw-r--r--   1 root root        2 2009-10-24 04:16 ./source/x/x11/build/xf86-video-sisusb
--rw-r--r--   1 root root        2 2009-10-24 04:16 ./source/x/x11/build/xf86-video-tdfx
--rw-r--r--   1 root root        2 2010-02-21 23:17 ./source/x/x11/build/xf86-video-v4l
--rw-r--r--   1 root root        2 2009-10-21 05:47 ./source/x/x11/build/xf86-video-vesa
--rw-r--r--   1 root root        2 2009-10-24 04:18 ./source/x/x11/build/xf86-video-vmware
--rw-r--r--   1 root root        2 2010-02-21 23:18 ./source/x/x11/build/xf86-video-voodoo
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/xf86dga
--rw-r--r--   1 root root        2 2009-06-03 02:16 ./source/x/x11/build/xf86rushproto
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/xfd
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/xfindproxy
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/xfontsel
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/xfwp
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/xgc
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/xload
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/xlsfonts
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/xmh
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/xmore
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/xplsprinters
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/xprehashprinterlist
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/xsetmode
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/xsetpointer
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/xsm
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/xstdcmap
--rw-r--r--   1 root root        2 2009-06-03 02:17 ./source/x/x11/build/xtrap
-drwxr-xr-x   2 root root     4096 2010-02-10 05:53 ./source/x/x11/configure
--rw-r--r--   1 root root      334 2009-02-10 21:18 ./source/x/x11/configure/compiz
--rw-r--r--   1 root root      257 2008-10-14 22:49 ./source/x/x11/configure/configure
--rw-r--r--   1 root root      297 2009-10-20 04:17 ./source/x/x11/configure/font-util
--rw-r--r--   1 root root      276 2008-10-14 22:50 ./source/x/x11/configure/libX11
--rw-r--r--   1 root root      304 2008-10-14 22:51 ./source/x/x11/configure/libXt
--rw-r--r--   1 root root      384 2009-07-10 03:05 ./source/x/x11/configure/pixman
--rw-r--r--   1 root root      276 2009-07-24 04:25 ./source/x/x11/configure/setxkbmap
--rw-r--r--   1 root root      421 2010-05-02 00:36 ./source/x/x11/configure/xf86-input-vmmouse
--rw-r--r--   1 root root      629 2010-02-22 00:56 ./source/x/x11/configure/xf86-video-ati
--rw-r--r--   1 root root      629 2010-02-22 00:56 ./source/x/x11/configure/xf86-video-nv
--rw-r--r--   1 root root      282 2009-08-01 03:17 ./source/x/x11/configure/xfs
--rw-r--r--   1 root root      276 2009-07-24 04:28 ./source/x/x11/configure/xkbcomp
--rw-r--r--   1 root root      345 2008-10-14 22:51 ./source/x/x11/configure/xkeyboard-config
--rw-r--r--   1 root root      317 2008-10-14 22:51 ./source/x/x11/configure/xorg-docs
--rw-r--r--   1 root root     1361 2010-02-23 18:08 ./source/x/x11/configure/xorg-server
-drwxr-xr-x   2 root root     4096 2009-08-01 05:00 ./source/x/x11/doinst.sh
--rw-r--r--   1 root root      237 2007-03-24 03:59 ./source/x/x11/doinst.sh/font-adobe-100dpi
--rw-r--r--   1 root root      236 2007-03-24 03:59 ./source/x/x11/doinst.sh/font-adobe-75dpi
--rw-r--r--   1 root root      237 2007-03-24 03:59 ./source/x/x11/doinst.sh/font-adobe-utopia-100dpi
--rw-r--r--   1 root root      236 2007-03-24 03:59 ./source/x/x11/doinst.sh/font-adobe-utopia-75dpi
--rw-r--r--   1 root root      236 2007-03-24 03:59 ./source/x/x11/doinst.sh/font-adobe-utopia-type1
--rw-r--r--   1 root root      301 2007-03-24 04:06 ./source/x/x11/doinst.sh/font-arabic-misc
--rw-r--r--   1 root root      237 2007-03-24 04:00 ./source/x/x11/doinst.sh/font-bh-100dpi
--rw-r--r--   1 root root      236 2007-03-24 04:00 ./source/x/x11/doinst.sh/font-bh-75dpi
--rw-r--r--   1 root root      237 2007-03-24 04:00 ./source/x/x11/doinst.sh/font-bh-lucidatypewriter-100dpi
--rw-r--r--   1 root root      236 2007-03-24 04:00 ./source/x/x11/doinst.sh/font-bh-lucidatypewriter-75dpi
--rw-r--r--   1 root root      234 2007-03-24 04:00 ./source/x/x11/doinst.sh/font-bh-ttf
--rw-r--r--   1 root root      236 2007-03-24 04:00 ./source/x/x11/doinst.sh/font-bh-type1
--rw-r--r--   1 root root      237 2007-03-24 04:01 ./source/x/x11/doinst.sh/font-bitstream-100dpi
--rw-r--r--   1 root root      236 2007-03-24 04:01 ./source/x/x11/doinst.sh/font-bitstream-75dpi
--rw-r--r--   1 root root      237 2007-03-24 04:02 ./source/x/x11/doinst.sh/font-bitstream-speedo
--rw-r--r--   1 root root      236 2007-03-24 04:02 ./source/x/x11/doinst.sh/font-bitstream-type1
--rw-r--r--   1 root root      239 2007-03-24 04:03 ./source/x/x11/doinst.sh/font-cronyx-cyrillic
--rw-r--r--   1 root root      301 2007-03-24 04:07 ./source/x/x11/doinst.sh/font-cursor-misc
--rw-r--r--   1 root root      301 2007-03-24 04:07 ./source/x/x11/doinst.sh/font-daewoo-misc
--rw-r--r--   1 root root      301 2007-03-24 04:07 ./source/x/x11/doinst.sh/font-dec-misc
--rw-r--r--   1 root root      236 2007-03-24 04:07 ./source/x/x11/doinst.sh/font-ibm-type1
--rw-r--r--   1 root root      301 2007-03-24 04:07 ./source/x/x11/doinst.sh/font-isas-misc
--rw-r--r--   1 root root      301 2007-03-24 04:07 ./source/x/x11/doinst.sh/font-jis-misc
--rw-r--r--   1 root root      301 2007-03-24 04:07 ./source/x/x11/doinst.sh/font-micro-misc
--rw-r--r--   1 root root      239 2007-03-24 04:04 ./source/x/x11/doinst.sh/font-misc-cyrillic
--rw-r--r--   1 root root      300 2007-03-24 04:04 ./source/x/x11/doinst.sh/font-misc-ethiopic
--rw-r--r--   1 root root      234 2007-03-24 04:04 ./source/x/x11/doinst.sh/font-misc-meltho
--rw-r--r--   1 root root      301 2007-03-24 04:04 ./source/x/x11/doinst.sh/font-misc-misc
--rw-r--r--   1 root root      301 2007-03-24 04:05 ./source/x/x11/doinst.sh/font-mutt-misc
--rw-r--r--   1 root root      301 2007-03-24 04:05 ./source/x/x11/doinst.sh/font-schumacher-misc
--rw-r--r--   1 root root      239 2007-03-24 04:05 ./source/x/x11/doinst.sh/font-screen-cyrillic
--rw-r--r--   1 root root      301 2007-03-24 04:05 ./source/x/x11/doinst.sh/font-sony-misc
--rw-r--r--   1 root root      301 2007-03-24 04:06 ./source/x/x11/doinst.sh/font-sun-misc
--rw-r--r--   1 root root      239 2007-03-24 04:06 ./source/x/x11/doinst.sh/font-winitzki-cyrillic
--rw-r--r--   1 root root      236 2007-03-24 04:06 ./source/x/x11/doinst.sh/font-xfree86-type1
--rw-r--r--   1 root root      447 2007-02-14 01:29 ./source/x/x11/doinst.sh/xdm
--rw-r--r--   1 root root      377 2009-08-01 05:01 ./source/x/x11/doinst.sh/xfs
--rw-r--r--   1 root root      176 2007-07-01 03:16 ./source/x/x11/doinst.sh/xinit
--rw-r--r--   1 root root      247 2007-06-09 21:54 ./source/x/x11/doinst.sh/xkeyboard-config
--rw-r--r--   1 root root      212 2007-02-13 20:05 ./source/x/x11/doinst.sh/xorg-cf-files
-drwxr-xr-x   2 root root     4096 2009-05-30 01:47 ./source/x/x11/makepkg
--rw-r--r--   1 root root     2198 2009-06-03 04:55 ./source/x/x11/makepkg/xorg-server
--rw-r--r--   1 root root     4080 2009-11-20 14:26 ./source/x/x11/modularize
--rw-r--r--   1 root root     1336 2009-08-11 03:21 ./source/x/x11/noarch
--rw-r--r--   1 root root      726 2009-06-08 22:38 ./source/x/x11/package-blacklist
-drwxr-xr-x   5 root root     4096 2010-04-27 19:26 ./source/x/x11/patch
-drwxr-xr-x   2 root root     4096 2010-02-21 19:59 ./source/x/x11/patch/xcursorgen
--rw-r--r--   1 root root      101 2010-02-21 19:59 ./source/x/x11/patch/xcursorgen.patch
--rw-r--r--   1 root root      688 2010-02-21 19:59 ./source/x/x11/patch/xcursorgen/xcursorgen.png14.configure.kludge.diff.gz
-drwxr-xr-x   2 root root     4096 2010-04-24 18:00 ./source/x/x11/patch/xf86-input-synaptics
--rw-r--r--   1 root root      272 2010-04-24 18:02 ./source/x/x11/patch/xf86-input-synaptics.patch
--rw-r--r--   1 root root      345 2010-04-24 18:00 ./source/x/x11/patch/xf86-input-synaptics/xf86-input-synaptics.tap-to-click.diff.gz
-drwxr-xr-x   2 root root     4096 2010-04-29 19:15 ./source/x/x11/patch/xorg-server
--rw-r--r--   1 root root      189 2010-04-29 19:16 ./source/x/x11/patch/xorg-server.patch
--rw-r--r--   1 root root      245 2009-05-30 01:47 ./source/x/x11/patch/xorg-server/x11.startwithblackscreen.diff.gz
--rw-r--r--   1 root root      221 2010-04-29 19:15 ./source/x/x11/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff.gz
-drwxr-xr-x   7 root root     4096 2009-12-15 01:10 ./source/x/x11/post-install
--rw-r--r--   1 root root      357 2007-02-16 21:17 ./source/x/x11/post-install/beforelight.post-install
--rw-r--r--   1 root root      275 2007-02-14 02:06 ./source/x/x11/post-install/encodings.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-adobe-100dpi.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-adobe-75dpi.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-adobe-utopia-100dpi.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-adobe-utopia-75dpi.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-adobe-utopia-type1.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-alias.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-arabic-misc.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-bh-100dpi.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-bh-75dpi.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-bh-lucidatypewriter-100dpi.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-bh-lucidatypewriter-75dpi.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-bh-ttf.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-bh-type1.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-bitstream-100dpi.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-bitstream-75dpi.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-bitstream-speedo.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-bitstream-type1.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-cronyx-cyrillic.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-cursor-misc.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-daewoo-misc.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-dec-misc.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-ibm-type1.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-isas-misc.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-jis-misc.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-micro-misc.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-misc-cyrillic.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-misc-ethiopic.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-misc-meltho.post-install
--rw-r--r--   1 root root      664 2008-02-01 03:22 ./source/x/x11/post-install/font-misc-misc.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-mutt-misc.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-schumacher-misc.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-screen-cyrillic.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-sony-misc.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-sun-misc.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-util.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-winitzki-cyrillic.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/font-xfree86-type1.post-install
--rw-r--r--   1 root root      110 2007-02-13 23:21 ./source/x/x11/post-install/lbxproxy.post-install
--rw-r--r--   1 root root     1765 2009-06-08 19:45 ./source/x/x11/post-install/libXaw.post-install
--rw-r--r--   1 root root      183 2007-02-14 06:42 ./source/x/x11/post-install/libpthread-stubs.post-install
--rw-r--r--   1 root root     2320 2009-06-03 04:06 ./source/x/x11/post-install/libxcb.post-install
-drwxr-xr-x   2 root root     4096 2007-03-24 04:12 ./source/x/x11/post-install/mkfontdir
--rw-r--r--   1 root root      221 2007-03-24 04:13 ./source/x/x11/post-install/mkfontdir.post-install
--rw-r--r--   1 root root     1012 2007-03-23 20:46 ./source/x/x11/post-install/mkfontdir/setup.04.mkfontdir
--rw-r--r--   1 root root      286 2008-04-26 21:33 ./source/x/x11/post-install/pixman.post-install
--rw-r--r--   1 root root      112 2007-02-13 23:23 ./source/x/x11/post-install/proxymngr.post-install
--rw-r--r--   1 root root      106 2007-02-13 23:24 ./source/x/x11/post-install/rstart.post-install
-drwxr-xr-x   2 root root     4096 2007-02-22 01:03 ./source/x/x11/post-install/twm
--rw-r--r--   1 root root      175 2007-02-22 01:05 ./source/x/x11/post-install/twm.post-install
--rw-r--r--   1 root root      725 2009-12-01 07:39 ./source/x/x11/post-install/twm/xinitrc.twm
--rw-r--r--   1 root root       63 2009-12-15 01:10 ./source/x/x11/post-install/util-macros.post-install
--rw-r--r--   1 root root      344 2007-02-13 23:28 ./source/x/x11/post-install/x11-app-test.post-install
--rw-r--r--   1 root root      275 2007-02-13 21:50 ./source/x/x11/post-install/x11-font.post-install
--rw-r--r--   1 root root       68 2007-02-13 21:50 ./source/x/x11/post-install/x11-util.post-install
--rw-r--r--   1 root root      155 2007-02-14 06:42 ./source/x/x11/post-install/xcb-proto.post-install
-drwxr-xr-x   2 root root     4096 2007-02-14 01:08 ./source/x/x11/post-install/xdm
--rw-r--r--   1 root root      671 2010-03-12 01:08 ./source/x/x11/post-install/xdm.post-install
--rwxr-xr-x   1 root root     5401 2007-02-14 01:17 ./source/x/x11/post-install/xdm/Xsession
--rwxr-xr-x   1 root root      708 2001-02-17 22:27 ./source/x/x11/post-install/xdm/Xsession.orig
--rwxr-xr-x   1 root root      503 2007-02-14 01:22 ./source/x/x11/post-install/xdm/Xsetup_0
--rwxr-xr-x   1 root root      145 2007-02-13 06:04 ./source/x/x11/post-install/xdm/Xsetup_0.orig
--rw-r--r--   1 root root       40 2008-09-15 22:43 ./source/x/x11/post-install/xf86-input-joystick.post-install
--rw-r--r--   1 root root      304 2009-12-14 04:05 ./source/x/x11/post-install/xf86-input-synaptics.post-install
--rw-r--r--   1 root root      209 2010-02-16 04:31 ./source/x/x11/post-install/xf86-input-wacom.post-install
--rw-r--r--   1 root root       54 2009-08-01 05:00 ./source/x/x11/post-install/xfs.post-install
-drwxr-xr-x   2 root root     4096 2007-07-01 03:06 ./source/x/x11/post-install/xinit
--rw-r--r--   1 root root      637 2007-07-01 03:13 ./source/x/x11/post-install/xinit.post-install
--rw-r--r--   1 root root      321 2003-03-16 21:36 ./source/x/x11/post-install/xinit/README.Xmodmap
--rw-r--r--   1 root root      341 2007-02-18 03:51 ./source/x/x11/post-install/xkeyboard-config.post-install
-drwxr-xr-x   2 root root     4096 2009-08-11 03:27 ./source/x/x11/post-install/xorg-cf-files
--rw-r--r--   1 root root      237 2009-08-11 03:32 ./source/x/x11/post-install/xorg-cf-files.post-install
--rw-r--r--   1 root root      203 2009-08-11 03:26 ./source/x/x11/post-install/xorg-cf-files/x11.tmpl.lib64.kludge.diff.gz
--rw-r--r--   1 root root       30 2007-02-14 01:57 ./source/x/x11/post-install/xorg-docs.post-install
--rw-r--r--   1 root root      476 2009-08-02 03:48 ./source/x/x11/post-install/xorg-server.post-install
--rw-r--r--   1 root root      100 2007-02-13 23:26 ./source/x/x11/post-install/xsm.post-install
-drwxr-xr-x   2 root root    12288 2009-12-15 03:39 ./source/x/x11/slack-desc
--rw-r--r--   1 root root      811 2007-02-13 23:03 ./source/x/x11/slack-desc/applewmproto
--rw-r--r--   1 root root      727 2007-02-13 23:03 ./source/x/x11/slack-desc/appres
--rw-r--r--   1 root root      755 2007-02-13 23:03 ./source/x/x11/slack-desc/bdftopcf
--rw-r--r--   1 root root      797 2007-02-13 23:03 ./source/x/x11/slack-desc/beforelight
--rw-r--r--   1 root root      811 2007-02-13 23:03 ./source/x/x11/slack-desc/bigreqsproto
--rw-r--r--   1 root root      727 2007-02-13 23:03 ./source/x/x11/slack-desc/bitmap
--rw-r--r--   1 root root      727 2007-02-13 23:03 ./source/x/x11/slack-desc/compiz
--rw-r--r--   1 root root      839 2007-02-13 23:03 ./source/x/x11/slack-desc/compositeproto
--rw-r--r--   1 root root      755 2009-05-30 01:47 ./source/x/x11/slack-desc/constype
--rw-r--r--   1 root root      797 2007-02-13 23:03 ./source/x/x11/slack-desc/damageproto
--rw-r--r--   1 root root      755 2007-02-13 23:03 ./source/x/x11/slack-desc/dmxproto
--rw-r--r--   1 root root      769 2008-09-18 04:02 ./source/x/x11/slack-desc/dri2proto
--rw-r--r--   1 root root      741 2007-02-13 23:03 ./source/x/x11/slack-desc/editres
--rw-r--r--   1 root root      769 2007-02-13 23:03 ./source/x/x11/slack-desc/encodings
--rw-r--r--   1 root root      741 2007-02-13 23:03 ./source/x/x11/slack-desc/evieext
--rw-r--r--   1 root root      783 2007-02-13 23:03 ./source/x/x11/slack-desc/fixesproto
--rw-r--r--   1 root root      881 2007-02-13 23:03 ./source/x/x11/slack-desc/font-adobe-100dpi
--rw-r--r--   1 root root      867 2007-02-13 23:03 ./source/x/x11/slack-desc/font-adobe-75dpi
--rw-r--r--   1 root root      979 2007-02-13 23:03 ./source/x/x11/slack-desc/font-adobe-utopia-100dpi
--rw-r--r--   1 root root      965 2007-02-13 23:03 ./source/x/x11/slack-desc/font-adobe-utopia-75dpi
--rw-r--r--   1 root root      965 2007-02-13 23:03 ./source/x/x11/slack-desc/font-adobe-utopia-type1
--rw-r--r--   1 root root      783 2007-02-13 23:03 ./source/x/x11/slack-desc/font-alias
--rw-r--r--   1 root root      867 2007-02-13 23:03 ./source/x/x11/slack-desc/font-arabic-misc
--rw-r--r--   1 root root      839 2007-02-13 23:03 ./source/x/x11/slack-desc/font-bh-100dpi
--rw-r--r--   1 root root      825 2007-02-13 23:03 ./source/x/x11/slack-desc/font-bh-75dpi
--rw-r--r--   1 root root     1077 2007-02-13 23:03 ./source/x/x11/slack-desc/font-bh-lucidatypewriter-100dpi
--rw-r--r--   1 root root     1063 2007-02-13 23:03 ./source/x/x11/slack-desc/font-bh-lucidatypewriter-75dpi
--rw-r--r--   1 root root      797 2007-02-13 23:03 ./source/x/x11/slack-desc/font-bh-ttf
--rw-r--r--   1 root root      825 2007-02-13 23:03 ./source/x/x11/slack-desc/font-bh-type1
--rw-r--r--   1 root root      937 2007-02-13 23:03 ./source/x/x11/slack-desc/font-bitstream-100dpi
--rw-r--r--   1 root root      923 2007-02-13 23:03 ./source/x/x11/slack-desc/font-bitstream-75dpi
--rw-r--r--   1 root root      937 2007-02-13 23:03 ./source/x/x11/slack-desc/font-bitstream-speedo
--rw-r--r--   1 root root      923 2007-02-13 23:03 ./source/x/x11/slack-desc/font-bitstream-type1
--rw-r--r--   1 root root      923 2007-02-13 23:03 ./source/x/x11/slack-desc/font-cronyx-cyrillic
--rw-r--r--   1 root root      867 2007-02-13 23:03 ./source/x/x11/slack-desc/font-cursor-misc
--rw-r--r--   1 root root      867 2007-02-13 23:03 ./source/x/x11/slack-desc/font-daewoo-misc
--rw-r--r--   1 root root      825 2007-02-13 23:03 ./source/x/x11/slack-desc/font-dec-misc
--rw-r--r--   1 root root      839 2007-02-13 23:03 ./source/x/x11/slack-desc/font-ibm-type1
--rw-r--r--   1 root root      839 2007-02-13 23:03 ./source/x/x11/slack-desc/font-isas-misc
--rw-r--r--   1 root root      825 2007-02-13 23:03 ./source/x/x11/slack-desc/font-jis-misc
--rw-r--r--   1 root root      853 2007-02-13 23:03 ./source/x/x11/slack-desc/font-micro-misc
--rw-r--r--   1 root root      895 2007-02-13 23:03 ./source/x/x11/slack-desc/font-misc-cyrillic
--rw-r--r--   1 root root      895 2007-02-13 23:03 ./source/x/x11/slack-desc/font-misc-ethiopic
--rw-r--r--   1 root root      867 2007-02-13 23:03 ./source/x/x11/slack-desc/font-misc-meltho
--rw-r--r--   1 root root      839 2007-02-13 23:03 ./source/x/x11/slack-desc/font-misc-misc
--rw-r--r--   1 root root      839 2007-02-13 23:03 ./source/x/x11/slack-desc/font-mutt-misc
--rw-r--r--   1 root root      923 2007-02-13 23:03 ./source/x/x11/slack-desc/font-schumacher-misc
--rw-r--r--   1 root root      923 2007-02-13 23:03 ./source/x/x11/slack-desc/font-screen-cyrillic
--rw-r--r--   1 root root      839 2007-02-13 23:03 ./source/x/x11/slack-desc/font-sony-misc
--rw-r--r--   1 root root      825 2007-02-13 23:03 ./source/x/x11/slack-desc/font-sun-misc
--rw-r--r--   1 root root      769 2007-02-13 23:03 ./source/x/x11/slack-desc/font-util
--rw-r--r--   1 root root      951 2007-02-13 23:03 ./source/x/x11/slack-desc/font-winitzki-cyrillic
--rw-r--r--   1 root root      895 2007-02-13 23:03 ./source/x/x11/slack-desc/font-xfree86-type1
--rw-r--r--   1 root root      839 2007-02-13 23:03 ./source/x/x11/slack-desc/fontcacheproto
--rw-r--r--   1 root root      783 2007-02-13 23:03 ./source/x/x11/slack-desc/fontsproto
--rw-r--r--   1 root root      783 2007-02-13 23:03 ./source/x/x11/slack-desc/fonttosfnt
--rw-r--r--   1 root root      769 2007-02-13 23:03 ./source/x/x11/slack-desc/fslsfonts
--rw-r--r--   1 root root      741 2007-02-13 23:03 ./source/x/x11/slack-desc/fstobdf
--rw-r--r--   1 root root      783 2007-02-13 23:03 ./source/x/x11/slack-desc/gccmakedep
--rw-r--r--   1 root root      741 2007-02-13 23:03 ./source/x/x11/slack-desc/glproto
--rw-r--r--   1 root root      741 2007-02-13 23:03 ./source/x/x11/slack-desc/iceauth
--rw-r--r--   1 root root      685 2007-02-13 23:03 ./source/x/x11/slack-desc/ico
--rw-r--r--   1 root root      713 2007-02-13 23:03 ./source/x/x11/slack-desc/imake
--rw-r--r--   1 root root      783 2007-02-13 23:03 ./source/x/x11/slack-desc/inputproto
--rw-r--r--   1 root root      886 2009-06-03 05:02 ./source/x/x11/slack-desc/intel-gpu-tools
--rw-r--r--   1 root root      741 2007-02-13 23:03 ./source/x/x11/slack-desc/kbproto
--rw-r--r--   1 root root      755 2007-02-13 23:03 ./source/x/x11/slack-desc/lbxproxy
--rw-r--r--   1 root root      783 2007-02-13 23:03 ./source/x/x11/slack-desc/libAppleWM
--rw-r--r--   1 root root      713 2007-02-13 23:03 ./source/x/x11/slack-desc/libFS
--rw-r--r--   1 root root      727 2007-02-13 23:03 ./source/x/x11/slack-desc/libICE
--rw-r--r--   1 root root      713 2007-02-13 23:03 ./source/x/x11/slack-desc/libSM
--rw-r--r--   1 root root      811 2007-02-13 23:03 ./source/x/x11/slack-desc/libWindowsWM
--rw-r--r--   1 root root      727 2007-02-13 23:03 ./source/x/x11/slack-desc/libX11
--rw-r--r--   1 root root      825 2007-02-13 23:03 ./source/x/x11/slack-desc/libXScrnSaver
--rw-r--r--   1 root root      755 2007-02-13 23:03 ./source/x/x11/slack-desc/libXTrap
--rw-r--r--   1 root root      727 2007-02-13 23:03 ./source/x/x11/slack-desc/libXau
--rw-r--r--   1 root root      727 2007-02-13 23:03 ./source/x/x11/slack-desc/libXaw
--rw-r--r--   1 root root      825 2007-02-13 23:03 ./source/x/x11/slack-desc/libXcomposite
--rw-r--r--   1 root root      783 2007-02-13 23:03 ./source/x/x11/slack-desc/libXcursor
--rw-r--r--   1 root root      783 2007-02-13 23:03 ./source/x/x11/slack-desc/libXdamage
--rw-r--r--   1 root root      755 2007-02-13 23:03 ./source/x/x11/slack-desc/libXdmcp
--rw-r--r--   1 root root      755 2007-02-13 23:03 ./source/x/x11/slack-desc/libXevie
--rw-r--r--   1 root root      741 2007-02-13 23:03 ./source/x/x11/slack-desc/libXext
--rw-r--r--   1 root root      769 2007-02-13 23:03 ./source/x/x11/slack-desc/libXfixes
--rw-r--r--   1 root root      755 2007-02-13 23:03 ./source/x/x11/slack-desc/libXfont
--rw-r--r--   1 root root      825 2007-02-13 23:03 ./source/x/x11/slack-desc/libXfontcache
--rw-r--r--   1 root root      727 2007-02-13 23:03 ./source/x/x11/slack-desc/libXft
--rw-r--r--   1 root root      713 2007-02-13 23:03 ./source/x/x11/slack-desc/libXi
--rw-r--r--   1 root root      797 2007-02-13 23:03 ./source/x/x11/slack-desc/libXinerama
--rw-r--r--   1 root root      727 2007-02-13 23:03 ./source/x/x11/slack-desc/libXmu
--rw-r--r--   1 root root      713 2007-02-13 23:03 ./source/x/x11/slack-desc/libXp
--rw-r--r--   1 root root      727 2007-02-13 23:03 ./source/x/x11/slack-desc/libXpm
--rw-r--r--   1 root root      867 2007-02-13 23:03 ./source/x/x11/slack-desc/libXprintAppUtil
--rw-r--r--   1 root root      825 2007-02-13 23:03 ./source/x/x11/slack-desc/libXprintUtil
--rw-r--r--   1 root root      769 2007-02-13 23:03 ./source/x/x11/slack-desc/libXrandr
--rw-r--r--   1 root root      783 2007-02-13 23:03 ./source/x/x11/slack-desc/libXrender
--rw-r--r--   1 root root      741 2007-02-13 23:03 ./source/x/x11/slack-desc/libXres
--rw-r--r--   1 root root      713 2007-02-13 23:03 ./source/x/x11/slack-desc/libXt
--rw-r--r--   1 root root      741 2007-02-13 23:03 ./source/x/x11/slack-desc/libXtst
--rw-r--r--   1 root root      713 2007-02-13 23:03 ./source/x/x11/slack-desc/libXv
--rw-r--r--   1 root root      741 2007-02-13 23:03 ./source/x/x11/slack-desc/libXvMC
--rw-r--r--   1 root root      797 2007-02-13 23:03 ./source/x/x11/slack-desc/libXxf86dga
--rw-r--r--   1 root root      811 2007-02-13 23:03 ./source/x/x11/slack-desc/libXxf86misc
--rw-r--r--   1 root root      783 2007-02-13 23:03 ./source/x/x11/slack-desc/libXxf86vm
--rw-r--r--   1 root root      727 2007-02-13 23:03 ./source/x/x11/slack-desc/libdmx
--rw-r--r--   1 root root      783 2007-02-13 23:03 ./source/x/x11/slack-desc/libfontenc
--rw-r--r--   1 root root      783 2007-02-13 23:03 ./source/x/x11/slack-desc/liblbxutil
--rw-r--r--   1 root root      741 2007-02-13 23:03 ./source/x/x11/slack-desc/liboldX
--rw-r--r--   1 root root      811 2008-03-10 05:32 ./source/x/x11/slack-desc/libpciaccess
--rw-r--r--   1 root root      867 2007-02-14 06:45 ./source/x/x11/slack-desc/libpthread-stubs
--rw-r--r--   1 root root      903 2007-02-14 06:52 ./source/x/x11/slack-desc/libxcb
--rw-r--r--   1 root root      783 2007-02-13 23:03 ./source/x/x11/slack-desc/libxkbfile
--rw-r--r--   1 root root      755 2007-02-13 23:03 ./source/x/x11/slack-desc/libxkbui
--rw-r--r--   1 root root      741 2007-02-13 23:03 ./source/x/x11/slack-desc/listres
--rw-r--r--   1 root root      713 2007-02-13 23:03 ./source/x/x11/slack-desc/lndir
--rw-r--r--   1 root root      699 2007-02-13 23:03 ./source/x/x11/slack-desc/luit
--rw-r--r--   1 root root      783 2007-02-13 23:03 ./source/x/x11/slack-desc/makedepend
--rw-r--r--   1 root root      713 2007-02-13 23:03 ./source/x/x11/slack-desc/mkcfm
--rw-r--r--   1 root root      839 2007-02-13 23:03 ./source/x/x11/slack-desc/mkcomposecache
--rw-r--r--   1 root root      769 2007-02-13 23:03 ./source/x/x11/slack-desc/mkfontdir
--rw-r--r--   1 root root      797 2007-02-13 23:03 ./source/x/x11/slack-desc/mkfontscale
--rw-r--r--   1 root root      727 2007-02-13 23:03 ./source/x/x11/slack-desc/oclock
--rw-r--r--   1 root root      794 2007-09-16 00:32 ./source/x/x11/slack-desc/pixman
--rw-r--r--   1 root root      783 2007-02-13 23:03 ./source/x/x11/slack-desc/printproto
--rw-r--r--   1 root root      769 2007-02-13 23:03 ./source/x/x11/slack-desc/proxymngr
--rw-r--r--   1 root root      783 2007-02-13 23:03 ./source/x/x11/slack-desc/randrproto
--rw-r--r--   1 root root      797 2007-02-13 23:03 ./source/x/x11/slack-desc/recordproto
--rw-r--r--   1 root root      797 2007-02-13 23:03 ./source/x/x11/slack-desc/rendercheck
--rw-r--r--   1 root root      797 2007-02-13 23:03 ./source/x/x11/slack-desc/renderproto
--rw-r--r--   1 root root      825 2007-02-13 23:03 ./source/x/x11/slack-desc/resourceproto
--rw-r--r--   1 root root      685 2007-02-13 23:03 ./source/x/x11/slack-desc/rgb
--rw-r--r--   1 root root      727 2007-02-13 23:03 ./source/x/x11/slack-desc/rstart
--rw-r--r--   1 root root      741 2007-02-13 23:03 ./source/x/x11/slack-desc/scripts
--rw-r--r--   1 root root      839 2007-02-13 23:03 ./source/x/x11/slack-desc/scrnsaverproto
--rw-r--r--   1 root root      741 2007-02-13 23:03 ./source/x/x11/slack-desc/sessreg
--rw-r--r--   1 root root      769 2007-02-13 23:03 ./source/x/x11/slack-desc/setxkbmap
--rw-r--r--   1 root root      755 2007-02-13 23:03 ./source/x/x11/slack-desc/showfont
--rw-r--r--   1 root root      741 2007-02-13 23:03 ./source/x/x11/slack-desc/smproxy
--rw-r--r--   1 root root      769 2007-02-13 23:03 ./source/x/x11/slack-desc/trapproto
--rw-r--r--   1 root root      685 2007-02-13 23:03 ./source/x/x11/slack-desc/twm
--rw-r--r--   1 root root      797 2007-02-13 23:03 ./source/x/x11/slack-desc/util-macros
--rw-r--r--   1 root root      783 2007-02-13 23:03 ./source/x/x11/slack-desc/videoproto
--rw-r--r--   1 root root      741 2007-02-13 23:03 ./source/x/x11/slack-desc/viewres
--rw-r--r--   1 root root      839 2007-02-13 23:03 ./source/x/x11/slack-desc/windowswmproto
--rw-r--r--   1 root root      677 2007-02-05 01:25 ./source/x/x11/slack-desc/x11-app
--rw-r--r--   1 root root      601 2007-02-05 04:36 ./source/x/x11/slack-desc/x11-data
--rw-r--r--   1 root root      587 2007-02-05 04:36 ./source/x/x11/slack-desc/x11-doc
--rw-r--r--   1 root root      637 2007-02-05 04:36 ./source/x/x11/slack-desc/x11-driver
--rw-r--r--   1 root root      605 2007-02-05 04:36 ./source/x/x11/slack-desc/x11-font
--rw-r--r--   1 root root      598 2007-02-05 04:36 ./source/x/x11/slack-desc/x11-lib
--rw-r--r--   1 root root      621 2007-02-05 04:36 ./source/x/x11/slack-desc/x11-proto
--rw-r--r--   1 root root      613 2007-02-05 01:31 ./source/x/x11/slack-desc/x11-util
--rw-r--r--   1 root root      741 2007-02-13 23:03 ./source/x/x11/slack-desc/x11perf
--rw-r--r--   1 root root      713 2007-02-13 23:03 ./source/x/x11/slack-desc/xauth
--rw-r--r--   1 root root      782 2007-09-16 00:02 ./source/x/x11/slack-desc/xbacklight
--rw-r--r--   1 root root      713 2007-02-13 23:03 ./source/x/x11/slack-desc/xbiff
--rw-r--r--   1 root root      755 2007-02-13 23:03 ./source/x/x11/slack-desc/xbitmaps
--rw-r--r--   1 root root      713 2007-02-13 23:03 ./source/x/x11/slack-desc/xcalc
--rw-r--r--   1 root root      769 2007-02-14 06:46 ./source/x/x11/slack-desc/xcb-proto
--rw-r--r--   1 root root      756 2009-05-30 01:47 ./source/x/x11/slack-desc/xcb-util
--rw-r--r--   1 root root      783 2007-02-13 23:03 ./source/x/x11/slack-desc/xclipboard
--rw-r--r--   1 root root      727 2007-02-13 23:03 ./source/x/x11/slack-desc/xclock
--rw-r--r--   1 root root      797 2007-02-13 23:03 ./source/x/x11/slack-desc/xcmiscproto
--rw-r--r--   1 root root      727 2007-02-13 23:03 ./source/x/x11/slack-desc/xcmsdb
--rw-r--r--   1 root root      755 2008-03-10 05:33 ./source/x/x11/slack-desc/xcompmgr
--rw-r--r--   1 root root      755 2007-02-13 23:03 ./source/x/x11/slack-desc/xconsole
--rw-r--r--   1 root root      839 2007-02-13 23:03 ./source/x/x11/slack-desc/xcursor-themes
--rw-r--r--   1 root root      783 2007-02-13 23:03 ./source/x/x11/slack-desc/xcursorgen
--rw-r--r--   1 root root      769 2007-02-13 23:03 ./source/x/x11/slack-desc/xdbedizzy
--rw-r--r--   1 root root      755 2007-02-13 23:03 ./source/x/x11/slack-desc/xditview
--rw-r--r--   1 root root      685 2007-02-13 23:03 ./source/x/x11/slack-desc/xdm
--rw-r--r--   1 root root      755 2007-02-13 23:03 ./source/x/x11/slack-desc/xdpyinfo
--rw-r--r--   1 root root      755 2007-02-13 23:03 ./source/x/x11/slack-desc/xdriinfo
--rw-r--r--   1 root root      713 2007-02-13 23:03 ./source/x/x11/slack-desc/xedit
--rw-r--r--   1 root root      685 2007-02-13 23:03 ./source/x/x11/slack-desc/xev
--rw-r--r--   1 root root      769 2007-02-13 23:03 ./source/x/x11/slack-desc/xextproto
--rw-r--r--   1 root root      713 2007-02-13 23:03 ./source/x/x11/slack-desc/xeyes
--rw-r--r--   1 root root      881 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-input-acecad
--rw-r--r--   1 root root      881 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-input-aiptek
--rw-r--r--   1 root root      895 2008-11-19 21:28 ./source/x/x11/slack-desc/xf86-input-calcomp
--rw-r--r--   1 root root      881 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-input-citron
--rw-r--r--   1 root root      951 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-input-digitaledge
--rw-r--r--   1 root root      839 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-input-dmc
--rw-r--r--   1 root root      895 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-input-dynapro
--rw-r--r--   1 root root      895 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-input-elo2300
--rw-r--r--   1 root root      951 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-input-elographics
--rw-r--r--   1 root root      867 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-input-evdev
--rw-r--r--   1 root root      853 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-input-fpit
--rw-r--r--   1 root root      909 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-input-hyperpen
--rw-r--r--   1 root root      923 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-input-jamstudio
--rw-r--r--   1 root root      909 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-input-joystick
--rw-r--r--   1 root root      909 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-input-keyboard
--rw-r--r--   1 root root      909 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-input-magellan
--rw-r--r--   1 root root      937 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-input-magictouch
--rw-r--r--   1 root root      937 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-input-microtouch
--rw-r--r--   1 root root      867 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-input-mouse
--rw-r--r--   1 root root      895 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-input-mutouch
--rw-r--r--   1 root root      881 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-input-palmax
--rw-r--r--   1 root root      909 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-input-penmount
--rw-r--r--   1 root root      909 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-input-spaceorb
--rw-r--r--   1 root root      867 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-input-summa
--rw-r--r--   1 root root      923 2008-11-18 18:09 ./source/x/x11/slack-desc/xf86-input-synaptics
--rw-r--r--   1 root root      895 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-input-tek4957
--rw-r--r--   1 root root      853 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-input-ur98
--rw-r--r--   1 root root      895 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-input-vmmouse
--rw-r--r--   1 root root      853 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-input-void
--rw-r--r--   1 root root      867 2009-11-20 14:31 ./source/x/x11/slack-desc/xf86-input-wacom
--rw-r--r--   1 root root      839 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-apm
--rw-r--r--   1 root root      839 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-ark
--rw-r--r--   1 root root      839 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-ast
--rw-r--r--   1 root root      839 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-ati
--rw-r--r--   1 root root      867 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-chips
--rw-r--r--   1 root root      881 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-cirrus
--rw-r--r--   1 root root      867 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-cyrix
--rw-r--r--   1 root root      867 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-dummy
--rw-r--r--   1 root root      867 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-fbdev
--rw-r--r--   1 root root      902 2008-04-03 02:30 ./source/x/x11/slack-desc/xf86-video-geode
--rw-r--r--   1 root root      867 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-glint
--rw-r--r--   1 root root      853 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-i128
--rw-r--r--   1 root root      853 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-i740
--rw-r--r--   1 root root      853 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-i810
--rw-r--r--   1 root root      881 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-impact
--rw-r--r--   1 root root      867 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-imstt
--rw-r--r--   1 root root      867 2007-03-07 21:18 ./source/x/x11/slack-desc/xf86-video-intel
--rw-r--r--   1 root root      881 2008-07-10 23:31 ./source/x/x11/slack-desc/xf86-video-mach64
--rw-r--r--   1 root root      839 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-mga
--rw-r--r--   1 root root      909 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-neomagic
--rw-r--r--   1 root root      895 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-newport
--rw-r--r--   1 root root      839 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-nsc
--rw-r--r--   1 root root      825 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-nv
--rw-r--r--   1 root root      937 2008-11-18 19:25 ./source/x/x11/slack-desc/xf86-video-openchrome
--rw-r--r--   1 root root      853 2008-07-10 23:31 ./source/x/x11/slack-desc/xf86-video-r128
--rw-r--r--   1 root root      955 2008-04-12 05:04 ./source/x/x11/slack-desc/xf86-video-radeonhd
--rw-r--r--   1 root root      923 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-rendition
--rw-r--r--   1 root root      825 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-s3
--rw-r--r--   1 root root      895 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-s3virge
--rw-r--r--   1 root root      881 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-savage
--rw-r--r--   1 root root      979 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-siliconmotion
--rw-r--r--   1 root root      839 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-sis
--rw-r--r--   1 root root      881 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-sisusb
--rw-r--r--   1 root root      881 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-sunbw2
--rw-r--r--   1 root root      895 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-suncg14
--rw-r--r--   1 root root      881 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-suncg3
--rw-r--r--   1 root root      881 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-suncg6
--rw-r--r--   1 root root      881 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-sunffb
--rw-r--r--   1 root root      881 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-sunleo
--rw-r--r--   1 root root      881 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-suntcx
--rw-r--r--   1 root root      853 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-tdfx
--rw-r--r--   1 root root      839 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-tga
--rw-r--r--   1 root root      895 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-trident
--rw-r--r--   1 root root      867 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-tseng
--rw-r--r--   1 root root      839 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-v4l
--rw-r--r--   1 root root      955 2007-04-06 22:22 ./source/x/x11/slack-desc/xf86-video-vermilion
--rw-r--r--   1 root root      853 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-vesa
--rw-r--r--   1 root root      839 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-vga
--rw-r--r--   1 root root      839 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-via
--rw-r--r--   1 root root      881 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-vmware
--rw-r--r--   1 root root      881 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-voodoo
--rw-r--r--   1 root root      853 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86-video-wsfb
--rw-r--r--   1 root root      839 2009-12-15 03:39 ./source/x/x11/slack-desc/xf86-video-xgi
--rw-r--r--   1 root root      867 2009-12-15 03:39 ./source/x/x11/slack-desc/xf86-video-xgixp
--rw-r--r--   1 root root      867 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86bigfontproto
--rw-r--r--   1 root root      741 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86dga
--rw-r--r--   1 root root      811 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86dgaproto
--rw-r--r--   1 root root      811 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86driproto
--rw-r--r--   1 root root      825 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86miscproto
--rw-r--r--   1 root root      825 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86rushproto
--rw-r--r--   1 root root      867 2007-02-13 23:03 ./source/x/x11/slack-desc/xf86vidmodeproto
--rw-r--r--   1 root root      685 2007-02-13 23:03 ./source/x/x11/slack-desc/xfd
--rw-r--r--   1 root root      783 2007-02-13 23:03 ./source/x/x11/slack-desc/xfindproxy
--rw-r--r--   1 root root      755 2007-02-13 23:03 ./source/x/x11/slack-desc/xfontsel
--rw-r--r--   1 root root      685 2007-02-13 23:03 ./source/x/x11/slack-desc/xfs
--rw-r--r--   1 root root      741 2007-02-13 23:03 ./source/x/x11/slack-desc/xfsinfo
--rw-r--r--   1 root root      699 2007-02-13 23:03 ./source/x/x11/slack-desc/xfwp
--rw-r--r--   1 root root      727 2007-02-13 23:03 ./source/x/x11/slack-desc/xgamma
--rw-r--r--   1 root root      685 2007-02-13 23:03 ./source/x/x11/slack-desc/xgc
--rw-r--r--   1 root root      713 2007-02-13 23:03 ./source/x/x11/slack-desc/xhost
--rw-r--r--   1 root root      825 2007-02-13 23:03 ./source/x/x11/slack-desc/xineramaproto
--rw-r--r--   1 root root      713 2007-02-13 23:03 ./source/x/x11/slack-desc/xinit
--rw-r--r--   1 root root      923 2008-01-31 06:21 ./source/x/x11/slack-desc/xinput
--rw-r--r--   1 root root      741 2007-02-13 23:03 ./source/x/x11/slack-desc/xkbcomp
--rw-r--r--   1 root root      741 2007-02-13 23:03 ./source/x/x11/slack-desc/xkbdata
--rw-r--r--   1 root root      727 2007-02-13 23:03 ./source/x/x11/slack-desc/xkbevd
--rw-r--r--   1 root root      755 2007-02-13 23:03 ./source/x/x11/slack-desc/xkbprint
--rw-r--r--   1 root root      755 2007-02-13 23:03 ./source/x/x11/slack-desc/xkbutils
--rw-r--r--   1 root root      867 2007-02-13 23:03 ./source/x/x11/slack-desc/xkeyboard-config
--rw-r--r--   1 root root      713 2007-02-13 23:03 ./source/x/x11/slack-desc/xkill
--rw-r--r--   1 root root      713 2007-02-13 23:03 ./source/x/x11/slack-desc/xload
--rw-r--r--   1 root root      713 2007-02-13 23:03 ./source/x/x11/slack-desc/xlogo
--rw-r--r--   1 root root      755 2007-02-13 23:03 ./source/x/x11/slack-desc/xlsatoms
--rw-r--r--   1 root root      783 2007-02-13 23:03 ./source/x/x11/slack-desc/xlsclients
--rw-r--r--   1 root root      755 2007-02-13 23:03 ./source/x/x11/slack-desc/xlsfonts
--rw-r--r--   1 root root      699 2007-02-13 23:03 ./source/x/x11/slack-desc/xmag
--rw-r--r--   1 root root      699 2007-02-13 23:03 ./source/x/x11/slack-desc/xman
--rw-r--r--   1 root root      755 2007-02-13 23:03 ./source/x/x11/slack-desc/xmessage
--rw-r--r--   1 root root      685 2007-02-13 23:03 ./source/x/x11/slack-desc/xmh
--rw-r--r--   1 root root      741 2007-02-13 23:03 ./source/x/x11/slack-desc/xmodmap
--rw-r--r--   1 root root      713 2007-02-13 23:03 ./source/x/x11/slack-desc/xmore
--rw-r--r--   1 root root      825 2007-02-13 23:03 ./source/x/x11/slack-desc/xorg-cf-files
--rw-r--r--   1 root root      769 2007-02-13 23:03 ./source/x/x11/slack-desc/xorg-docs
--rw-r--r--   1 root root     1160 2007-02-13 18:20 ./source/x/x11/slack-desc/xorg-server
--rw-r--r--   1 root root      901 2007-02-14 10:05 ./source/x/x11/slack-desc/xorg-server-xdmx
--rw-r--r--   1 root root      839 2009-05-30 01:47 ./source/x/x11/slack-desc/xorg-server-xephyr
--rw-r--r--   1 root root     1063 2007-02-13 18:18 ./source/x/x11/slack-desc/xorg-server-xnest
--rw-r--r--   1 root root     1160 2007-02-13 18:20 ./source/x/x11/slack-desc/xorg-server-xvfb
--rw-r--r--   1 root root      895 2007-02-13 23:03 ./source/x/x11/slack-desc/xorg-sgml-doctools
--rw-r--r--   1 root root      811 2007-02-13 23:03 ./source/x/x11/slack-desc/xphelloworld
--rw-r--r--   1 root root      811 2007-02-13 23:03 ./source/x/x11/slack-desc/xplsprinters
--rw-r--r--   1 root root      685 2007-02-13 23:03 ./source/x/x11/slack-desc/xpr
--rw-r--r--   1 root root      909 2007-02-13 23:03 ./source/x/x11/slack-desc/xprehashprinterlist
--rw-r--r--   1 root root      713 2007-02-13 23:03 ./source/x/x11/slack-desc/xprop
--rw-r--r--   1 root root      727 2007-02-13 23:03 ./source/x/x11/slack-desc/xproto
--rw-r--r--   1 root root      979 2007-02-13 23:03 ./source/x/x11/slack-desc/xproxymanagementprotocol
--rw-r--r--   1 root root      700 2009-05-30 01:47 ./source/x/x11/slack-desc/xpyb
--rw-r--r--   1 root root      727 2007-02-13 23:03 ./source/x/x11/slack-desc/xrandr
--rw-r--r--   1 root root      699 2007-02-13 23:03 ./source/x/x11/slack-desc/xrdb
--rw-r--r--   1 root root      755 2007-02-13 23:03 ./source/x/x11/slack-desc/xrefresh
--rw-r--r--   1 root root      685 2007-02-13 23:03 ./source/x/x11/slack-desc/xrx
--rw-r--r--   1 root root      727 2009-05-30 01:47 ./source/x/x11/slack-desc/xscope
--rw-r--r--   1 root root      699 2007-02-13 23:03 ./source/x/x11/slack-desc/xset
--rw-r--r--   1 root root      755 2007-02-13 23:03 ./source/x/x11/slack-desc/xsetmode
--rw-r--r--   1 root root      797 2007-02-13 23:03 ./source/x/x11/slack-desc/xsetpointer
--rw-r--r--   1 root root      755 2007-02-13 23:03 ./source/x/x11/slack-desc/xsetroot
--rw-r--r--   1 root root      685 2007-02-13 23:03 ./source/x/x11/slack-desc/xsm
--rw-r--r--   1 root root      755 2007-02-13 23:03 ./source/x/x11/slack-desc/xstdcmap
--rw-r--r--   1 root root      727 2007-02-13 23:03 ./source/x/x11/slack-desc/xtrans
--rw-r--r--   1 root root      713 2007-02-13 23:03 ./source/x/x11/slack-desc/xtrap
--rw-r--r--   1 root root      755 2007-02-13 23:03 ./source/x/x11/slack-desc/xvidtune
--rw-r--r--   1 root root      727 2007-02-13 23:03 ./source/x/x11/slack-desc/xvinfo
--rw-r--r--   1 root root      685 2007-02-13 23:03 ./source/x/x11/slack-desc/xwd
--rw-r--r--   1 root root      755 2007-02-13 23:03 ./source/x/x11/slack-desc/xwininfo
--rw-r--r--   1 root root      699 2007-02-13 23:03 ./source/x/x11/slack-desc/xwud
-drwxr-xr-x  12 root root     4096 2010-04-16 03:23 ./source/x/x11/src
-drwxr-xr-x   2 root root     4096 2010-04-12 04:28 ./source/x/x11/src/app
--rw-r--r--   1 root root    88296 2009-10-13 20:34 ./source/x/x11/src/app/appres-1.0.2.tar.xz
--rw-r--r--   1 root root    88168 2009-10-13 20:34 ./source/x/x11/src/app/bdftopcf-1.0.2.tar.xz
--rw-r--r--   1 root root    79116 2007-09-08 20:25 ./source/x/x11/src/app/beforelight-1.0.3.tar.xz
--rw-r--r--   1 root root   129364 2009-10-13 20:34 ./source/x/x11/src/app/bitmap-1.0.4.tar.xz
--rw-r--r--   1 root root   939656 2010-03-28 12:43 ./source/x/x11/src/app/compiz-0.8.6.tar.xz
--rw-r--r--   1 root root   127380 2009-10-13 20:34 ./source/x/x11/src/app/editres-1.0.4.tar.xz
--rw-r--r--   1 root root    98084 2008-05-10 22:53 ./source/x/x11/src/app/fonttosfnt-1.0.4.tar.xz
--rw-r--r--   1 root root    81636 2008-05-23 23:33 ./source/x/x11/src/app/fslsfonts-1.0.2.tar.xz
--rw-r--r--   1 root root    83136 2008-05-23 23:55 ./source/x/x11/src/app/fstobdf-1.0.3.tar.xz
--rw-r--r--   1 root root    97520 2009-10-13 20:33 ./source/x/x11/src/app/iceauth-1.0.3.tar.xz
--rw-r--r--   1 root root    89560 2007-07-21 00:22 ./source/x/x11/src/app/ico-1.0.2.tar.xz
--rw-r--r--   1 root root   238960 2009-10-13 20:35 ./source/x/x11/src/app/intel-gpu-tools-1.0.2.tar.xz
--rw-r--r--   1 root root    93928 2009-12-15 23:10 ./source/x/x11/src/app/listres-1.0.2.tar.xz
--rw-r--r--   1 root root   112348 2010-02-10 00:54 ./source/x/x11/src/app/luit-1.0.5.tar.xz
--rw-r--r--   1 root root    70424 2006-01-18 23:51 ./source/x/x11/src/app/mkcfm-1.0.1.tar.xz
--rw-r--r--   1 root root    90748 2009-10-13 20:33 ./source/x/x11/src/app/mkcomposecache-1.2.1.tar.xz
--rw-r--r--   1 root root    80324 2009-10-13 20:32 ./source/x/x11/src/app/mkfontdir-1.0.5.tar.xz
--rw-r--r--   1 root root   102088 2009-10-13 20:33 ./source/x/x11/src/app/mkfontscale-1.0.7.tar.xz
--rw-r--r--   1 root root    76552 2006-01-18 23:51 ./source/x/x11/src/app/oclock-1.0.1.tar.xz
--rw-r--r--   1 root root    84328 2006-01-18 23:51 ./source/x/x11/src/app/proxymngr-1.0.1.tar.xz
--rw-r--r--   1 root root    81948 2008-03-07 21:48 ./source/x/x11/src/app/rendercheck-1.3.tar.xz
--rw-r--r--   1 root root    93640 2008-06-06 03:18 ./source/x/x11/src/app/rgb-1.0.3.tar.xz
--rw-r--r--   1 root root    96964 2009-08-02 13:41 ./source/x/x11/src/app/rstart-1.0.3.tar.xz
--rw-r--r--   1 root root    67148 2006-01-18 23:51 ./source/x/x11/src/app/scripts-1.0.1.tar.xz
--rw-r--r--   1 root root    94992 2009-10-13 20:32 ./source/x/x11/src/app/sessreg-1.0.5.tar.xz
--rw-r--r--   1 root root    91836 2009-07-08 23:20 ./source/x/x11/src/app/setxkbmap-1.1.0.tar.xz
--rw-r--r--   1 root root    83512 2008-05-24 00:14 ./source/x/x11/src/app/showfont-1.0.2.tar.xz
--rw-r--r--   1 root root    95064 2009-10-17 00:29 ./source/x/x11/src/app/smproxy-1.0.3.tar.xz
--rw-r--r--   1 root root   220032 2008-03-06 21:53 ./source/x/x11/src/app/twm-1.0.4.tar.xz
--rw-r--r--   1 root root   102100 2009-12-17 02:31 ./source/x/x11/src/app/viewres-1.0.2.tar.xz
--rw-r--r--   1 root root   139668 2009-10-17 00:29 ./source/x/x11/src/app/x11perf-1.5.1.tar.xz
--rw-r--r--   1 root root   109976 2009-10-13 20:34 ./source/x/x11/src/app/xauth-1.0.4.tar.xz
--rw-r--r--   1 root root    86356 2009-10-13 20:33 ./source/x/x11/src/app/xbacklight-1.1.1.tar.xz
--rw-r--r--   1 root root    99944 2009-12-17 16:33 ./source/x/x11/src/app/xbiff-1.0.2.tar.xz
--rw-r--r--   1 root root   109872 2009-12-18 03:52 ./source/x/x11/src/app/xcalc-1.0.3.tar.xz
--rw-r--r--   1 root root    96824 2009-10-17 00:27 ./source/x/x11/src/app/xclipboard-1.1.0.tar.xz
--rw-r--r--   1 root root   116444 2009-10-13 20:34 ./source/x/x11/src/app/xclock-1.0.4.tar.xz
--rw-r--r--   1 root root   104120 2009-10-17 00:28 ./source/x/x11/src/app/xcmsdb-1.0.2.tar.xz
--rw-r--r--   1 root root   102928 2009-11-02 23:52 ./source/x/x11/src/app/xcompmgr-1.1.5.tar.xz
--rw-r--r--   1 root root    91192 2007-08-21 02:04 ./source/x/x11/src/app/xconsole-1.0.3.tar.xz
--rw-r--r--   1 root root    92040 2009-10-17 02:34 ./source/x/x11/src/app/xcursorgen-1.0.3.tar.xz
--rw-r--r--   1 root root    81204 2006-10-13 21:48 ./source/x/x11/src/app/xdbedizzy-1.0.2.tar.xz
--rw-r--r--   1 root root    94716 2006-01-18 23:51 ./source/x/x11/src/app/xditview-1.0.1.tar.xz
--rw-r--r--   1 root root   356384 2010-04-10 02:27 ./source/x/x11/src/app/xdm-1.1.10.tar.xz
--rw-r--r--   1 root root   107276 2009-10-17 00:29 ./source/x/x11/src/app/xdpyinfo-1.1.0.tar.xz
--rw-r--r--   1 root root    90812 2009-10-17 00:29 ./source/x/x11/src/app/xdriinfo-1.0.3.tar.xz
--rw-r--r--   1 root root   452488 2008-11-07 19:14 ./source/x/x11/src/app/xedit-1.1.2.tar.xz
--rw-r--r--   1 root root    93064 2009-10-13 20:31 ./source/x/x11/src/app/xev-1.0.4.tar.xz
--rw-r--r--   1 root root    96824 2009-12-18 15:02 ./source/x/x11/src/app/xeyes-1.1.0.tar.xz
--rw-r--r--   1 root root    74620 2006-10-13 21:50 ./source/x/x11/src/app/xf86dga-1.0.2.tar.xz
--rw-r--r--   1 root root    81676 2006-01-18 23:51 ./source/x/x11/src/app/xfd-1.0.1.tar.xz
--rw-r--r--   1 root root    71840 2006-01-18 23:51 ./source/x/x11/src/app/xfindproxy-1.0.1.tar.xz
--rw-r--r--   1 root root    97148 2007-02-01 21:06 ./source/x/x11/src/app/xfontsel-1.0.2.tar.xz
--rw-r--r--   1 root root   174808 2009-08-01 03:13 ./source/x/x11/src/app/xfs-1.1.0.tar.xz
--rw-r--r--   1 root root    81172 2008-05-23 23:17 ./source/x/x11/src/app/xfsinfo-1.0.2.tar.xz
--rw-r--r--   1 root root    98048 2006-01-18 23:51 ./source/x/x11/src/app/xfwp-1.0.1.tar.xz
--rw-r--r--   1 root root    88336 2009-10-14 02:28 ./source/x/x11/src/app/xgamma-1.0.3.tar.xz
--rw-r--r--   1 root root   145304 2009-11-11 06:57 ./source/x/x11/src/app/xgc-1.0.2.tar.xz
--rw-r--r--   1 root root    96908 2009-10-14 02:28 ./source/x/x11/src/app/xhost-1.0.3.tar.xz
--rw-r--r--   1 root root   127904 2010-03-16 00:08 ./source/x/x11/src/app/xinit-1.2.1.tar.xz
--rw-r--r--   1 root root   111676 2010-03-15 01:48 ./source/x/x11/src/app/xinput-1.5.1.tar.xz
--rw-r--r--   1 root root   198428 2009-10-13 20:33 ./source/x/x11/src/app/xkbcomp-1.1.1.tar.xz
--rw-r--r--   1 root root   116760 2009-10-17 02:34 ./source/x/x11/src/app/xkbevd-1.1.0.tar.xz
--rw-r--r--   1 root root   124464 2009-11-11 07:42 ./source/x/x11/src/app/xkbprint-1.0.2.tar.xz
--rw-r--r--   1 root root   100400 2009-10-17 02:35 ./source/x/x11/src/app/xkbutils-1.0.2.tar.xz
--rw-r--r--   1 root root    90576 2009-10-13 20:31 ./source/x/x11/src/app/xkill-1.0.2.tar.xz
--rw-r--r--   1 root root    85624 2007-03-22 05:35 ./source/x/x11/src/app/xload-1.0.2.tar.xz
--rw-r--r--   1 root root   102884 2009-12-11 15:01 ./source/x/x11/src/app/xlogo-1.0.2.tar.xz
--rw-r--r--   1 root root    88136 2009-10-13 20:31 ./source/x/x11/src/app/xlsatoms-1.0.2.tar.xz
--rw-r--r--   1 root root    88504 2009-10-17 02:35 ./source/x/x11/src/app/xlsclients-1.0.2.tar.xz
--rw-r--r--   1 root root    91080 2007-02-01 22:15 ./source/x/x11/src/app/xlsfonts-1.0.2.tar.xz
--rw-r--r--   1 root root   101644 2009-10-13 20:35 ./source/x/x11/src/app/xmag-1.0.3.tar.xz
--rw-r--r--   1 root root   142312 2009-10-17 00:29 ./source/x/x11/src/app/xman-1.1.0.tar.xz
--rw-r--r--   1 root root   101600 2010-01-30 07:17 ./source/x/x11/src/app/xmessage-1.0.3.tar.xz
--rw-r--r--   1 root root   147888 2006-01-18 23:51 ./source/x/x11/src/app/xmh-1.0.1.tar.xz
--rw-r--r--   1 root root   107052 2009-10-13 20:33 ./source/x/x11/src/app/xmodmap-1.0.4.tar.xz
--rw-r--r--   1 root root    85148 2006-01-18 23:51 ./source/x/x11/src/app/xmore-1.0.1.tar.xz
--rw-r--r--   1 root root    64084 2006-01-18 23:51 ./source/x/x11/src/app/xphelloworld-1.0.1.tar.xz
--rw-r--r--   1 root root    71268 2006-01-18 23:51 ./source/x/x11/src/app/xplsprinters-1.0.1.tar.xz
--rw-r--r--   1 root root   117216 2009-10-17 03:48 ./source/x/x11/src/app/xpr-1.0.3.tar.xz
--rw-r--r--   1 root root    70076 2006-01-18 23:51 ./source/x/x11/src/app/xprehashprinterlist-1.0.1.tar.xz
--rw-r--r--   1 root root   107816 2009-10-13 20:32 ./source/x/x11/src/app/xprop-1.1.0.tar.xz
--rw-r--r--   1 root root   119588 2009-10-13 20:35 ./source/x/x11/src/app/xrandr-1.3.2.tar.xz
--rw-r--r--   1 root root    99888 2009-10-13 20:32 ./source/x/x11/src/app/xrdb-1.0.6.tar.xz
--rw-r--r--   1 root root    89092 2009-10-17 02:35 ./source/x/x11/src/app/xrefresh-1.0.3.tar.xz
--rw-r--r--   1 root root   156440 2009-10-13 20:33 ./source/x/x11/src/app/xscope-1.2.tar.xz
--rw-r--r--   1 root root   104564 2009-10-13 20:35 ./source/x/x11/src/app/xset-1.1.0.tar.xz
--rw-r--r--   1 root root    68360 2006-01-18 23:51 ./source/x/x11/src/app/xsetmode-1.0.0.tar.xz
--rw-r--r--   1 root root    76884 2006-11-02 01:38 ./source/x/x11/src/app/xsetpointer-1.0.1.tar.xz
--rw-r--r--   1 root root    93404 2009-10-17 03:47 ./source/x/x11/src/app/xsetroot-1.0.3.tar.xz
--rw-r--r--   1 root root   110080 2006-01-18 23:51 ./source/x/x11/src/app/xsm-1.0.1.tar.xz
--rw-r--r--   1 root root    70724 2006-01-18 23:51 ./source/x/x11/src/app/xstdcmap-1.0.1.tar.xz
--rw-r--r--   1 root root    88004 2006-05-12 16:23 ./source/x/x11/src/app/xtrap-1.0.2.tar.xz
--rw-r--r--   1 root root   103856 2010-01-16 07:12 ./source/x/x11/src/app/xvidtune-1.0.2.tar.xz
--rw-r--r--   1 root root    88788 2009-10-17 03:48 ./source/x/x11/src/app/xvinfo-1.1.0.tar.xz
--rw-r--r--   1 root root   108372 2009-10-17 03:48 ./source/x/x11/src/app/xwd-1.0.3.tar.xz
--rw-r--r--   1 root root   101032 2009-10-13 20:32 ./source/x/x11/src/app/xwininfo-1.0.5.tar.xz
--rw-r--r--   1 root root    95264 2009-10-13 20:31 ./source/x/x11/src/app/xwud-1.0.2.tar.xz
-drwxr-xr-x   2 root root     4096 2010-02-11 01:52 ./source/x/x11/src/data
--rw-r--r--   1 root root    95580 2009-10-14 23:00 ./source/x/x11/src/data/xbitmaps-1.1.0.tar.xz
--rw-r--r--   1 root root  1442840 2009-10-13 20:36 ./source/x/x11/src/data/xcursor-themes-1.0.2.tar.xz
--rw-r--r--   1 root root   534532 2010-01-26 23:38 ./source/x/x11/src/data/xkeyboard-config-1.8.tar.xz
-drwxr-xr-x   2 root root     4096 2010-04-07 21:11 ./source/x/x11/src/doc
--rw-r--r--   1 root root  1700284 2009-10-25 22:18 ./source/x/x11/src/doc/xorg-docs-1.5.tar.xz
--rw-r--r--   1 root root    83520 2010-04-05 13:56 ./source/x/x11/src/doc/xorg-sgml-doctools-1.4.tar.xz
-drwxr-xr-x   2 root root     4096 2010-05-10 08:11 ./source/x/x11/src/driver
--rw-r--r--   1 root root   210288 2009-10-13 20:39 ./source/x/x11/src/driver/xf86-input-acecad-1.4.0.tar.xz
--rw-r--r--   1 root root   218480 2009-10-13 20:39 ./source/x/x11/src/driver/xf86-input-aiptek-1.3.0.tar.xz
--rw-r--r--   1 root root   183984 2008-03-20 19:04 ./source/x/x11/src/driver/xf86-input-calcomp-1.1.2.tar.xz
--rw-r--r--   1 root root   207380 2009-04-29 00:56 ./source/x/x11/src/driver/xf86-input-citron-2.2.2.tar.xz
--rw-r--r--   1 root root   182548 2008-03-20 19:15 ./source/x/x11/src/driver/xf86-input-digitaledge-1.1.1.tar.xz
--rw-r--r--   1 root root   181760 2008-03-20 19:18 ./source/x/x11/src/driver/xf86-input-dmc-1.1.2.tar.xz
--rw-r--r--   1 root root   181148 2008-03-20 19:23 ./source/x/x11/src/driver/xf86-input-dynapro-1.1.2.tar.xz
--rw-r--r--   1 root root   183804 2008-05-21 18:58 ./source/x/x11/src/driver/xf86-input-elo2300-1.1.2.tar.xz
--rw-r--r--   1 root root   189608 2008-10-21 05:10 ./source/x/x11/src/driver/xf86-input-elographics-1.2.3.tar.xz
--rw-r--r--   1 root root   257320 2010-04-12 01:06 ./source/x/x11/src/driver/xf86-input-evdev-2.3.3.tar.xz
--rw-r--r--   1 root root   189848 2009-02-18 01:42 ./source/x/x11/src/driver/xf86-input-fpit-1.3.0.tar.xz
--rw-r--r--   1 root root   183932 2009-02-27 00:32 ./source/x/x11/src/driver/xf86-input-hyperpen-1.3.0.tar.xz
--rw-r--r--   1 root root   177228 2008-03-20 19:59 ./source/x/x11/src/driver/xf86-input-jamstudio-1.2.0.tar.xz
--rw-r--r--   1 root root   233420 2009-10-13 20:38 ./source/x/x11/src/driver/xf86-input-joystick-1.4.99.2.tar.xz
--rw-r--r--   1 root root   234700 2009-10-13 20:38 ./source/x/x11/src/driver/xf86-input-keyboard-1.4.0.tar.xz
--rw-r--r--   1 root root   181608 2008-03-20 20:12 ./source/x/x11/src/driver/xf86-input-magellan-1.2.0.tar.xz
--rw-r--r--   1 root root   161972 2006-01-18 23:51 ./source/x/x11/src/driver/xf86-input-magictouch-1.0.0.5.tar.xz
--rw-r--r--   1 root root   184172 2008-03-20 20:22 ./source/x/x11/src/driver/xf86-input-microtouch-1.2.0.tar.xz
--rw-r--r--   1 root root   258204 2009-10-13 20:38 ./source/x/x11/src/driver/xf86-input-mouse-1.5.0.tar.xz
--rw-r--r--   1 root root   185284 2008-10-01 23:51 ./source/x/x11/src/driver/xf86-input-mutouch-1.2.1.tar.xz
--rw-r--r--   1 root root   180076 2008-03-20 20:35 ./source/x/x11/src/driver/xf86-input-palmax-1.2.0.tar.xz
--rw-r--r--   1 root root   206712 2010-03-04 19:51 ./source/x/x11/src/driver/xf86-input-penmount-1.4.1.tar.xz
--rw-r--r--   1 root root   180460 2007-09-10 17:16 ./source/x/x11/src/driver/xf86-input-spaceorb-1.1.1.tar.xz
--rw-r--r--   1 root root   184212 2008-03-20 20:45 ./source/x/x11/src/driver/xf86-input-summa-1.2.0.tar.xz
--rw-r--r--   1 root root   247984 2010-03-26 05:23 ./source/x/x11/src/driver/xf86-input-synaptics-1.2.2.tar.xz
--rw-r--r--   1 root root   179536 2008-03-20 20:49 ./source/x/x11/src/driver/xf86-input-tek4957-1.2.0.tar.xz
--rw-r--r--   1 root root   171836 2006-04-07 22:09 ./source/x/x11/src/driver/xf86-input-ur98-1.1.0.tar.xz
--rw-r--r--   1 root root   224352 2010-04-08 23:11 ./source/x/x11/src/driver/xf86-input-vmmouse-12.6.9.tar.xz
--rw-r--r--   1 root root   201500 2009-10-13 20:39 ./source/x/x11/src/driver/xf86-input-void-1.3.0.tar.xz
--rw-r--r--   1 root root   306188 2010-03-19 05:34 ./source/x/x11/src/driver/xf86-input-wacom-0.10.5.tar.xz
--rw-r--r--   1 root root   223284 2009-07-30 01:25 ./source/x/x11/src/driver/xf86-video-apm-1.2.2.tar.xz
--rw-r--r--   1 root root   186220 2009-10-13 20:40 ./source/x/x11/src/driver/xf86-video-ark-0.7.2.tar.xz
--rw-r--r--   1 root root   208756 2009-07-30 02:29 ./source/x/x11/src/driver/xf86-video-ast-0.89.9.tar.xz
--rw-r--r--   1 root root   846292 2010-04-05 16:04 ./source/x/x11/src/driver/xf86-video-ati-6.13.0.tar.xz
--rw-r--r--   1 root root   289268 2009-10-13 20:40 ./source/x/x11/src/driver/xf86-video-chips-1.2.2.tar.xz
--rw-r--r--   1 root root   223812 2009-07-30 02:12 ./source/x/x11/src/driver/xf86-video-cirrus-1.3.2.tar.xz
--rw-r--r--   1 root root   189032 2006-04-07 22:43 ./source/x/x11/src/driver/xf86-video-cyrix-1.1.0.tar.xz
--rw-r--r--   1 root root   204340 2009-12-02 02:02 ./source/x/x11/src/driver/xf86-video-dummy-0.3.3.tar.xz
--rw-r--r--   1 root root   512804 2010-04-15 14:00 ./source/x/x11/src/driver/xf86-video-geode-2.11.8.tar.xz
--rw-r--r--   1 root root   207780 2009-10-13 20:40 ./source/x/x11/src/driver/xf86-video-glide-1.0.3.tar.xz
--rw-r--r--   1 root root   281928 2009-07-30 02:13 ./source/x/x11/src/driver/xf86-video-glint-1.2.4.tar.xz
--rw-r--r--   1 root root   216052 2009-07-30 02:14 ./source/x/x11/src/driver/xf86-video-i128-1.3.3.tar.xz
--rw-r--r--   1 root root   209584 2009-07-30 02:14 ./source/x/x11/src/driver/xf86-video-i740-1.3.2.tar.xz
--rw-r--r--   1 root root   178892 2006-06-28 01:36 ./source/x/x11/src/driver/xf86-video-impact-0.2.0.tar.xz
--rw-r--r--   1 root root   175160 2006-04-07 22:43 ./source/x/x11/src/driver/xf86-video-imstt-1.1.0.tar.xz
--rw-r--r--   1 root root   710712 2010-03-29 18:31 ./source/x/x11/src/driver/xf86-video-intel-2.11.0.tar.xz
--rw-r--r--   1 root root   416140 2009-07-30 02:14 ./source/x/x11/src/driver/xf86-video-mach64-6.8.2.tar.xz
--rw-r--r--   1 root root   331660 2009-07-30 02:15 ./source/x/x11/src/driver/xf86-video-mga-1.4.11.tar.xz
--rw-r--r--   1 root root   218964 2009-07-30 02:18 ./source/x/x11/src/driver/xf86-video-neomagic-1.2.4.tar.xz
--rw-r--r--   1 root root   355664 2010-03-08 21:46 ./source/x/x11/src/driver/xf86-video-nv-2.1.17.tar.xz
--rw-r--r--   1 root root   373296 2009-10-13 20:38 ./source/x/x11/src/driver/xf86-video-openchrome-0.2.904.tar.xz
--rw-r--r--   1 root root   351232 2009-07-30 02:15 ./source/x/x11/src/driver/xf86-video-r128-6.8.1.tar.xz
--rw-r--r--   1 root root   656376 2009-10-13 20:38 ./source/x/x11/src/driver/xf86-video-radeonhd-1.3.0.tar.xz
--rw-r--r--   1 root root   244408 2009-10-13 20:40 ./source/x/x11/src/driver/xf86-video-rendition-4.2.3.tar.xz
--rw-r--r--   1 root root   214920 2009-07-30 02:16 ./source/x/x11/src/driver/xf86-video-s3-0.6.3.tar.xz
--rw-r--r--   1 root root   236912 2009-07-30 02:16 ./source/x/x11/src/driver/xf86-video-s3virge-1.10.4.tar.xz
--rw-r--r--   1 root root   269908 2009-07-30 02:24 ./source/x/x11/src/driver/xf86-video-savage-2.3.1.tar.xz
--rw-r--r--   1 root root   294092 2010-04-27 22:39 ./source/x/x11/src/driver/xf86-video-siliconmotion-1.7.4.tar.xz
--rw-r--r--   1 root root   524420 2009-07-30 02:16 ./source/x/x11/src/driver/xf86-video-sis-0.10.2.tar.xz
--rw-r--r--   1 root root   261784 2009-07-30 02:28 ./source/x/x11/src/driver/xf86-video-sisusb-0.9.3.tar.xz
--rw-r--r--   1 root root   227984 2009-07-30 02:17 ./source/x/x11/src/driver/xf86-video-tdfx-1.4.3.tar.xz
--rw-r--r--   1 root root   214348 2009-10-13 20:40 ./source/x/x11/src/driver/xf86-video-tga-1.2.1.tar.xz
--rw-r--r--   1 root root   236604 2009-10-13 20:42 ./source/x/x11/src/driver/xf86-video-trident-1.3.3.tar.xz
--rw-r--r--   1 root root   224288 2009-10-13 20:40 ./source/x/x11/src/driver/xf86-video-tseng-1.2.3.tar.xz
--rw-r--r--   1 root root   183872 2008-03-19 20:58 ./source/x/x11/src/driver/xf86-video-v4l-0.2.0.tar.xz
--rw-r--r--   1 root root   191028 2007-04-05 14:50 ./source/x/x11/src/driver/xf86-video-vermilion-1.0.1.tar.xz
--rw-r--r--   1 root root   217708 2010-01-04 19:19 ./source/x/x11/src/driver/xf86-video-vesa-2.3.0.tar.xz
--rw-r--r--   1 root root   174860 2006-04-07 22:44 ./source/x/x11/src/driver/xf86-video-vga-4.1.0.tar.xz
--rw-r--r--   1 root root   248320 2009-12-29 17:21 ./source/x/x11/src/driver/xf86-video-vmware-10.16.9.tar.xz
--rw-r--r--   1 root root   199400 2009-07-30 02:18 ./source/x/x11/src/driver/xf86-video-voodoo-1.2.3.tar.xz
--rw-r--r--   1 root root   378936 2009-10-13 20:39 ./source/x/x11/src/driver/xf86-video-xgi-1.5.1.tar.xz
-drwxr-xr-x   2 root root     4096 2009-10-19 04:59 ./source/x/x11/src/font
--rw-r--r--   1 root root   283516 2009-10-13 20:45 ./source/x/x11/src/font/encodings-1.0.3.tar.xz
--rw-r--r--   1 root root   939812 2009-10-13 20:45 ./source/x/x11/src/font/font-adobe-100dpi-1.0.1.tar.xz
--rw-r--r--   1 root root   791652 2009-10-13 20:45 ./source/x/x11/src/font/font-adobe-75dpi-1.0.1.tar.xz
--rw-r--r--   1 root root   290820 2009-10-13 20:45 ./source/x/x11/src/font/font-adobe-utopia-100dpi-1.0.2.tar.xz
--rw-r--r--   1 root root   242348 2009-10-13 20:45 ./source/x/x11/src/font/font-adobe-utopia-75dpi-1.0.2.tar.xz
--rw-r--r--   1 root root   254720 2009-10-13 20:45 ./source/x/x11/src/font/font-adobe-utopia-type1-1.0.2.tar.xz
--rw-r--r--   1 root root    84016 2009-10-13 20:45 ./source/x/x11/src/font/font-alias-1.0.2.tar.xz
--rw-r--r--   1 root root    92388 2009-10-13 20:45 ./source/x/x11/src/font/font-arabic-misc-1.0.1.tar.xz
--rw-r--r--   1 root root   590364 2009-10-13 20:45 ./source/x/x11/src/font/font-bh-100dpi-1.0.1.tar.xz
--rw-r--r--   1 root root   492716 2009-10-13 20:45 ./source/x/x11/src/font/font-bh-75dpi-1.0.1.tar.xz
--rw-r--r--   1 root root   209192 2009-10-13 20:44 ./source/x/x11/src/font/font-bh-lucidatypewriter-100dpi-1.0.1.tar.xz
--rw-r--r--   1 root root   186460 2009-10-13 20:44 ./source/x/x11/src/font/font-bh-lucidatypewriter-75dpi-1.0.1.tar.xz
--rw-r--r--   1 root root   356860 2009-10-13 20:44 ./source/x/x11/src/font/font-bh-ttf-1.0.1.tar.xz
--rw-r--r--   1 root root   622220 2009-10-13 20:44 ./source/x/x11/src/font/font-bh-type1-1.0.1.tar.xz
--rw-r--r--   1 root root   165584 2009-10-13 20:44 ./source/x/x11/src/font/font-bitstream-100dpi-1.0.1.tar.xz
--rw-r--r--   1 root root   148364 2009-10-13 20:44 ./source/x/x11/src/font/font-bitstream-75dpi-1.0.1.tar.xz
--rw-r--r--   1 root root   320980 2009-10-13 20:44 ./source/x/x11/src/font/font-bitstream-speedo-1.0.1.tar.xz
--rw-r--r--   1 root root   381404 2009-10-13 20:44 ./source/x/x11/src/font/font-bitstream-type1-1.0.1.tar.xz
--rw-r--r--   1 root root   227160 2009-10-13 20:44 ./source/x/x11/src/font/font-cronyx-cyrillic-1.0.1.tar.xz
--rw-r--r--   1 root root    84820 2009-10-13 20:44 ./source/x/x11/src/font/font-cursor-misc-1.0.1.tar.xz
--rw-r--r--   1 root root   499208 2009-10-13 20:44 ./source/x/x11/src/font/font-daewoo-misc-1.0.1.tar.xz
--rw-r--r--   1 root root    83120 2009-10-13 20:44 ./source/x/x11/src/font/font-dec-misc-1.0.1.tar.xz
--rw-r--r--   1 root root   364332 2009-10-13 20:44 ./source/x/x11/src/font/font-ibm-type1-1.0.1.tar.xz
--rw-r--r--   1 root root   710580 2009-10-13 20:43 ./source/x/x11/src/font/font-isas-misc-1.0.1.tar.xz
--rw-r--r--   1 root root   508536 2009-10-13 20:43 ./source/x/x11/src/font/font-jis-misc-1.0.1.tar.xz
--rw-r--r--   1 root root    81776 2009-10-13 20:43 ./source/x/x11/src/font/font-micro-misc-1.0.1.tar.xz
--rw-r--r--   1 root root   111980 2009-10-13 20:43 ./source/x/x11/src/font/font-misc-cyrillic-1.0.1.tar.xz
--rw-r--r--   1 root root   208928 2009-10-13 20:43 ./source/x/x11/src/font/font-misc-ethiopic-1.0.1.tar.xz
--rw-r--r--   1 root root   818808 2009-10-13 20:43 ./source/x/x11/src/font/font-misc-meltho-1.0.1.tar.xz
--rw-r--r--   1 root root  1413876 2009-10-13 20:43 ./source/x/x11/src/font/font-misc-misc-1.1.0.tar.xz
--rw-r--r--   1 root root   207352 2009-10-13 20:43 ./source/x/x11/src/font/font-mutt-misc-1.0.1.tar.xz
--rw-r--r--   1 root root   118496 2009-10-13 20:43 ./source/x/x11/src/font/font-schumacher-misc-1.1.0.tar.xz
--rw-r--r--   1 root root    86212 2009-10-13 20:43 ./source/x/x11/src/font/font-screen-cyrillic-1.0.2.tar.xz
--rw-r--r--   1 root root    89656 2009-10-13 20:43 ./source/x/x11/src/font/font-sony-misc-1.0.1.tar.xz
--rw-r--r--   1 root root    97616 2009-10-13 20:43 ./source/x/x11/src/font/font-sun-misc-1.0.1.tar.xz
--rw-r--r--   1 root root   106884 2009-10-13 20:42 ./source/x/x11/src/font/font-util-1.1.1.tar.xz
--rw-r--r--   1 root root    84168 2009-10-13 20:43 ./source/x/x11/src/font/font-winitzki-cyrillic-1.0.1.tar.xz
--rw-r--r--   1 root root   108264 2009-10-13 20:42 ./source/x/x11/src/font/font-xfree86-type1-1.0.2.tar.xz
-drwxr-xr-x   2 root root     4096 2010-03-16 01:35 ./source/x/x11/src/lib
--rw-r--r--   1 root root   202008 2009-07-07 22:57 ./source/x/x11/src/lib/libFS-1.0.2.tar.xz
--rw-r--r--   1 root root   232780 2009-10-13 20:50 ./source/x/x11/src/lib/libICE-1.0.6.tar.xz
--rw-r--r--   1 root root   215424 2009-10-13 20:52 ./source/x/x11/src/lib/libSM-1.1.1.tar.xz
--rw-r--r--   1 root root  1474764 2010-01-16 19:55 ./source/x/x11/src/lib/libX11-1.3.3.tar.xz
--rw-r--r--   1 root root   204048 2009-10-13 20:51 ./source/x/x11/src/lib/libXScrnSaver-1.2.0.tar.xz
--rw-r--r--   1 root root   166564 2006-01-18 23:51 ./source/x/x11/src/lib/libXTrap-1.0.0.tar.xz
--rw-r--r--   1 root root   206784 2009-10-13 20:50 ./source/x/x11/src/lib/libXau-1.0.5.tar.xz
--rw-r--r--   1 root root   507844 2009-10-17 22:06 ./source/x/x11/src/lib/libXaw-1.0.7.tar.xz
--rw-r--r--   1 root root   192216 2009-10-13 20:47 ./source/x/x11/src/lib/libXcomposite-0.4.1.tar.xz
--rw-r--r--   1 root root   219680 2009-10-13 20:50 ./source/x/x11/src/lib/libXcursor-1.1.10.tar.xz
--rw-r--r--   1 root root   185184 2009-10-13 20:47 ./source/x/x11/src/lib/libXdamage-1.1.2.tar.xz
--rw-r--r--   1 root root   211188 2009-10-13 20:49 ./source/x/x11/src/lib/libXdmcp-1.0.3.tar.xz
--rw-r--r--   1 root root   171968 2006-10-13 20:03 ./source/x/x11/src/lib/libXevie-1.0.2.tar.xz
--rw-r--r--   1 root root   253892 2009-10-13 20:48 ./source/x/x11/src/lib/libXext-1.1.tar.xz
--rw-r--r--   1 root root   190504 2009-10-13 20:47 ./source/x/x11/src/lib/libXfixes-4.0.4.tar.xz
--rw-r--r--   1 root root   349212 2009-10-13 20:46 ./source/x/x11/src/lib/libXfont-1.4.1.tar.xz
--rw-r--r--   1 root root   189140 2009-10-13 20:47 ./source/x/x11/src/lib/libXfontcache-1.0.5.tar.xz
--rw-r--r--   1 root root   225892 2009-10-13 20:46 ./source/x/x11/src/lib/libXft-2.1.14.tar.xz
--rw-r--r--   1 root root   287272 2009-10-13 20:48 ./source/x/x11/src/lib/libXi-1.3.tar.xz
--rw-r--r--   1 root root   201688 2009-10-13 20:48 ./source/x/x11/src/lib/libXinerama-1.1.tar.xz
--rw-r--r--   1 root root   254824 2009-10-13 20:49 ./source/x/x11/src/lib/libXmu-1.0.5.tar.xz
--rw-r--r--   1 root root   187292 2006-01-18 23:51 ./source/x/x11/src/lib/libXp-1.0.0.tar.xz
--rw-r--r--   1 root root   312808 2009-10-13 20:46 ./source/x/x11/src/lib/libXpm-3.5.8.tar.xz
--rw-r--r--   1 root root   156780 2006-01-18 23:51 ./source/x/x11/src/lib/libXprintAppUtil-1.0.1.tar.xz
--rw-r--r--   1 root root   168108 2006-01-18 23:51 ./source/x/x11/src/lib/libXprintUtil-1.0.1.tar.xz
--rw-r--r--   1 root root   213480 2009-03-06 14:17 ./source/x/x11/src/lib/libXrandr-1.3.0.tar.xz
--rw-r--r--   1 root root   201984 2009-10-13 20:48 ./source/x/x11/src/lib/libXrender-0.9.5.tar.xz
--rw-r--r--   1 root root   188376 2009-10-13 20:47 ./source/x/x11/src/lib/libXres-1.0.4.tar.xz
--rw-r--r--   1 root root   466060 2010-03-15 22:10 ./source/x/x11/src/lib/libXt-1.0.8.tar.xz
--rw-r--r--   1 root root   211736 2009-10-13 20:48 ./source/x/x11/src/lib/libXtst-1.1.0.tar.xz
--rw-r--r--   1 root root   201700 2009-10-13 20:48 ./source/x/x11/src/lib/libXv-1.0.5.tar.xz
--rw-r--r--   1 root root   199920 2009-10-13 20:47 ./source/x/x11/src/lib/libXvMC-1.0.5.tar.xz
--rw-r--r--   1 root root   209484 2009-10-13 20:47 ./source/x/x11/src/lib/libXxf86dga-1.1.1.tar.xz
--rw-r--r--   1 root root   186704 2009-10-13 20:47 ./source/x/x11/src/lib/libXxf86misc-1.0.2.tar.xz
--rw-r--r--   1 root root   204832 2009-10-13 20:47 ./source/x/x11/src/lib/libXxf86vm-1.1.0.tar.xz
--rw-r--r--   1 root root   208060 2009-10-13 20:48 ./source/x/x11/src/lib/libdmx-1.1.0.tar.xz
--rw-r--r--   1 root root   206344 2009-10-13 20:50 ./source/x/x11/src/lib/libfontenc-1.0.5.tar.xz
--rw-r--r--   1 root root   247960 2009-12-15 00:48 ./source/x/x11/src/lib/libpciaccess-0.11.0.tar.xz
--rw-r--r--   1 root root   235860 2009-10-13 20:47 ./source/x/x11/src/lib/libxkbfile-1.0.6.tar.xz
--rw-r--r--   1 root root   168088 2006-04-27 00:18 ./source/x/x11/src/lib/libxkbui-1.0.2.tar.xz
--rw-r--r--   1 root root   324812 2010-02-08 16:24 ./source/x/x11/src/lib/pixman-0.16.6.tar.xz
--rw-r--r--   1 root root   133516 2009-10-17 20:53 ./source/x/x11/src/lib/xtrans-1.2.5.tar.xz
-drwxr-xr-x   2 root root     4096 2010-02-20 20:59 ./source/x/x11/src/proto
--rw-r--r--   1 root root    45352 2009-10-13 20:54 ./source/x/x11/src/proto/bigreqsproto-1.1.0.tar.xz
--rw-r--r--   1 root root    83536 2009-10-13 20:53 ./source/x/x11/src/proto/compositeproto-0.4.1.tar.xz
--rw-r--r--   1 root root    49856 2009-10-13 20:53 ./source/x/x11/src/proto/damageproto-1.2.0.tar.xz
--rw-r--r--   1 root root    77568 2009-10-13 20:53 ./source/x/x11/src/proto/dmxproto-2.3.tar.xz
--rw-r--r--   1 root root    89040 2010-02-16 12:43 ./source/x/x11/src/proto/dri2proto-2.3.tar.xz
--rw-r--r--   1 root root    45700 2009-10-13 20:53 ./source/x/x11/src/proto/evieext-1.1.0.tar.xz
--rw-r--r--   1 root root    84688 2009-10-13 20:53 ./source/x/x11/src/proto/fixesproto-4.1.1.tar.xz
--rw-r--r--   1 root root    78004 2009-10-13 20:53 ./source/x/x11/src/proto/fontcacheproto-0.1.3.tar.xz
--rw-r--r--   1 root root    52452 2009-10-13 20:53 ./source/x/x11/src/proto/fontsproto-2.1.0.tar.xz
--rw-r--r--   1 root root    99360 2010-01-08 20:15 ./source/x/x11/src/proto/glproto-1.4.11.tar.xz
--rw-r--r--   1 root root   133108 2009-10-13 20:53 ./source/x/x11/src/proto/inputproto-2.0.tar.xz
--rw-r--r--   1 root root    97856 2009-10-13 20:52 ./source/x/x11/src/proto/kbproto-1.0.4.tar.xz
--rw-r--r--   1 root root    46304 2008-03-06 21:25 ./source/x/x11/src/proto/printproto-1.0.4.tar.xz
--rw-r--r--   1 root root   102864 2009-10-13 20:53 ./source/x/x11/src/proto/randrproto-1.3.1.tar.xz
--rw-r--r--   1 root root    78044 2009-10-13 20:53 ./source/x/x11/src/proto/recordproto-1.14.tar.xz
--rw-r--r--   1 root root    60804 2009-07-15 03:54 ./source/x/x11/src/proto/renderproto-0.11.tar.xz
--rw-r--r--   1 root root    45400 2009-10-13 20:54 ./source/x/x11/src/proto/resourceproto-1.1.0.tar.xz
--rw-r--r--   1 root root    46192 2009-10-13 20:54 ./source/x/x11/src/proto/scrnsaverproto-1.2.0.tar.xz
--rw-r--r--   1 root root    45604 2006-01-18 23:51 ./source/x/x11/src/proto/trapproto-3.4.3.tar.xz
--rw-r--r--   1 root root    50424 2009-10-13 20:53 ./source/x/x11/src/proto/videoproto-2.3.0.tar.xz
--rw-r--r--   1 root root    45476 2009-10-13 20:54 ./source/x/x11/src/proto/xcmiscproto-1.2.0.tar.xz
--rw-r--r--   1 root root    66544 2009-10-13 20:54 ./source/x/x11/src/proto/xextproto-7.1.1.tar.xz
--rw-r--r--   1 root root    45976 2009-10-13 20:53 ./source/x/x11/src/proto/xf86bigfontproto-1.2.0.tar.xz
--rw-r--r--   1 root root    79572 2009-10-13 20:53 ./source/x/x11/src/proto/xf86dgaproto-2.1.tar.xz
--rw-r--r--   1 root root    46724 2009-10-13 20:53 ./source/x/x11/src/proto/xf86driproto-2.1.0.tar.xz
--rw-r--r--   1 root root    78424 2009-10-13 20:53 ./source/x/x11/src/proto/xf86miscproto-0.9.3.tar.xz
--rw-r--r--   1 root root    35400 2006-01-18 23:51 ./source/x/x11/src/proto/xf86rushproto-1.1.2.tar.xz
--rw-r--r--   1 root root    78020 2009-10-13 20:53 ./source/x/x11/src/proto/xf86vidmodeproto-2.3.tar.xz
--rw-r--r--   1 root root    77328 2009-10-13 20:53 ./source/x/x11/src/proto/xineramaproto-1.2.tar.xz
--rw-r--r--   1 root root   142100 2009-10-13 20:53 ./source/x/x11/src/proto/xproto-7.0.16.tar.xz
--rw-r--r--   1 root root    77844 2009-10-13 20:52 ./source/x/x11/src/proto/xproxymanagementprotocol-1.0.3.tar.xz
-drwxr-xr-x   2 root root     4096 2010-04-16 03:23 ./source/x/x11/src/util
--rw-r--r--   1 root root    65616 2006-05-19 18:42 ./source/x/x11/src/util/gccmakedep-1.0.2.tar.xz
--rw-r--r--   1 root root   128768 2010-04-16 03:01 ./source/x/x11/src/util/imake-1.0.3.tar.xz
--rw-r--r--   1 root root    70672 2006-01-18 23:51 ./source/x/x11/src/util/lndir-1.0.1.tar.xz
--rw-r--r--   1 root root   107208 2009-10-13 20:55 ./source/x/x11/src/util/makedepend-1.0.2.tar.xz
--rw-r--r--   1 root root    58968 2010-04-05 13:28 ./source/x/x11/src/util/util-macros-1.7.0.tar.xz
--rw-r--r--   1 root root   301996 2009-10-14 18:33 ./source/x/x11/src/util/xorg-cf-files-1.0.3.tar.xz
-drwxr-xr-x   2 root root     4096 2010-04-27 20:51 ./source/x/x11/src/xcb
--rw-r--r--   1 root root   185164 2009-10-14 09:16 ./source/x/x11/src/xcb/libpthread-stubs-0.3.tar.xz
--rw-r--r--   1 root root   284004 2010-04-09 15:03 ./source/x/x11/src/xcb/libxcb-1.6.tar.xz
--rw-r--r--   1 root root    90692 2009-12-02 09:10 ./source/x/x11/src/xcb/xcb-proto-1.6.tar.xz
--rw-r--r--   1 root root   238932 2009-08-24 08:51 ./source/x/x11/src/xcb/xcb-util-0.3.6.tar.xz
--rw-r--r--   1 root root   251920 2009-12-17 19:54 ./source/x/x11/src/xcb/xpyb-1.2.tar.xz
-drwxr-xr-x   2 root root     4096 2010-05-05 06:50 ./source/x/x11/src/xserver
--rw-r--r--   1 root root  3945780 2010-05-04 07:51 ./source/x/x11/src/xserver/xorg-server-1.7.7.tar.xz
--rwxr-xr-x   1 root root    12129 2010-02-22 17:35 ./source/x/x11/x11.SlackBuild
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/x/xaw3d
--rw-r--r--   1 root root     5180 2008-11-04 15:06 ./source/x/xaw3d/Xaw3d-1.5-debian-fixes.diff.gz
--rw-r--r--   1 root root      579 2008-11-04 15:02 ./source/x/xaw3d/Xaw3d-1.5E.diff.gz
--rw-r--r--   1 root root   309264 2008-11-04 14:57 ./source/x/xaw3d/Xaw3d-1.5E.tar.gz
--rw-r--r--   1 root root      975 2002-03-23 23:45 ./source/x/xaw3d/slack-desc
--rwxr-xr-x   1 root root     3773 2009-05-19 20:05 ./source/x/xaw3d/xaw3d.SlackBuild
-drwxr-xr-x   2 root root     4096 2010-05-06 19:28 ./source/x/xdg-utils
--rw-r--r--   1 root root     1432 2009-02-02 23:25 ./source/x/xdg-utils/doinst.sh.gz
--rw-r--r--   1 root root     1010 2008-08-01 05:42 ./source/x/xdg-utils/slack-desc
--rw-r--r--   1 root root   291993 2010-05-06 19:26 ./source/x/xdg-utils/xdg-utils-20100506cvs.tar.bz2
--rwxr-xr-x   1 root root      327 2009-02-02 19:15 ./source/x/xdg-utils/xdg-utils-cvs_checkout.sh
--rwxr-xr-x   1 root root     2316 2010-05-06 19:28 ./source/x/xdg-utils/xdg-utils.SlackBuild
--rw-r--r--   1 root root      121 2008-07-12 04:41 ./source/x/xdg-utils/xdg-utils.info
-drwxr-xr-x   2 root root     4096 2010-04-27 21:51 ./source/x/xf86-video-nouveau
--rw-r--r--   1 root root      567 2010-04-27 21:40 ./source/x/xf86-video-nouveau/this_is_NOT_a_driver.txt
--rw-r--r--   1 root root      880 2010-04-27 21:47 ./source/x/xf86-video-nouveau/xf86-video-nouveau-blacklist-noarch-1.txz
-drwxr-xr-x   2 root root     4096 2010-05-06 07:56 ./source/x/xterm
--rw-r--r--   1 root root      764 2007-02-11 23:54 ./source/x/xterm/slack-desc
--rw-r--r--   1 root root   643104 2010-05-02 01:30 ./source/x/xterm/xterm-258.tar.xz
--rwxr-xr-x   1 root root     3775 2010-02-22 00:53 ./source/x/xterm/xterm.SlackBuild
-drwxr-xr-x  49 root root     4096 2010-05-02 07:56 ./source/xap
-drwxr-xr-x   2 root root     4096 2010-02-19 07:03 ./source/xap/MPlayer
--rw-r--r--   1 root root   222567 2006-12-23 03:06 ./source/xap/MPlayer/Blue-1.7.tar.bz2
--rwxr-xr--   1 root root    15475 2010-02-19 07:04 ./source/xap/MPlayer/MPlayer.SlackBuild
--rw-r--r--   1 root root  7488308 2010-02-19 06:03 ./source/xap/MPlayer/MPlayer_nolibdvdcss-20100218.tar.xz
--rw-r--r--   1 root root      937 2009-05-15 20:43 ./source/xap/MPlayer/slack-desc
-drwxr-xr-x   2 root root     4096 2010-04-09 21:15 ./source/xap/audacious
-drwxr-xr-x   2 root root     4096 2010-04-09 21:31 ./source/xap/audacious-plugins
--rw-r--r--   1 root root  2027560 2010-04-06 19:23 ./source/xap/audacious-plugins/audacious-plugins-2.3.tar.xz
--rwxr-xr-x   1 root root     3738 2010-04-09 21:31 ./source/xap/audacious-plugins/audacious-plugins.SlackBuild
--rw-r--r--   1 root root      892 2007-03-08 06:08 ./source/xap/audacious-plugins/slack-desc
--rw-r--r--   1 root root   937104 2010-04-06 19:20 ./source/xap/audacious/audacious-2.3.tar.xz
--rwxr-xr-x   1 root root     4074 2010-04-09 21:21 ./source/xap/audacious/audacious.SlackBuild
--rw-r--r--   1 root root      121 2010-04-09 21:15 ./source/xap/audacious/doinst.sh.gz
--rw-r--r--   1 root root     1075 2007-03-08 05:46 ./source/xap/audacious/slack-desc
-drwxr-xr-x   2 root root     4096 2010-02-08 00:05 ./source/xap/blackbox
--rw-r--r--   1 root root   176564 2009-09-03 11:39 ./source/xap/blackbox/bbkeys-0.9.1.tar.xz
--rw-r--r--   1 root root      964 2009-09-03 11:39 ./source/xap/blackbox/blackbox-0.70.1-gcc-4.3.patch.gz
--rw-r--r--   1 root root   409496 2009-09-03 11:39 ./source/xap/blackbox/blackbox-0.70.1.tar.xz
--rwxr-xr-x   1 root root     6282 2010-02-07 22:55 ./source/xap/blackbox/blackbox.SlackBuild
--rw-r--r--   1 root root      900 2002-05-05 23:41 ./source/xap/blackbox/slack-desc
--rw-r--r--   1 root root      287 2010-02-08 00:05 ./source/xap/blackbox/xinitrc.blackbox.gz
-drwxr-xr-x   2 root root     4096 2010-05-02 07:44 ./source/xap/blueman
--rw-r--r--   1 root root   556944 2009-10-21 18:29 ./source/xap/blueman/blueman-1.21.tar.xz
--rw-r--r--   1 root root     3648 2010-04-15 04:30 ./source/xap/blueman/blueman-open
--rw-r--r--   1 root root      330 2010-04-11 04:24 ./source/xap/blueman/blueman-use_blueman-open_for_obexfs.diff.gz
--rwxr-xr-x   1 root root     4664 2010-05-02 21:48 ./source/xap/blueman/blueman.SlackBuild
--rw-r--r--   1 root root      361 2009-10-31 03:20 ./source/xap/blueman/doinst.sh.gz
--rw-r--r--   1 root root      667 2009-12-11 19:15 ./source/xap/blueman/fix_on_off_loop.diff.gz
--rw-r--r--   1 root root      503 2009-12-06 09:49 ./source/xap/blueman/no_hide_applet.diff.gz
--rw-r--r--   1 root root      882 2010-05-02 07:44 ./source/xap/blueman/slack-desc
-drwxr-xr-x   2 root root     4096 2010-02-19 18:36 ./source/xap/electricsheep
--rw-r--r--   1 root root     1306 2009-01-07 22:42 ./source/xap/electricsheep/README.slackware
--rw-r--r--   1 root root  3116176 2009-03-06 00:30 ./source/xap/electricsheep/electricsheep-20090306.tar.xz
--rwxr-xr--   1 root root     9750 2010-02-19 18:37 ./source/xap/electricsheep/electricsheep.SlackBuild
--rw-r--r--   1 root root      268 2009-07-01 19:53 ./source/xap/electricsheep/electricsheep.mplayer.diff.gz
--rw-r--r--   1 root root      524 2009-01-07 21:38 ./source/xap/electricsheep/electricsheep_gnome-open.patch
--rw-r--r--   1 root root     1116 2008-12-15 23:44 ./source/xap/electricsheep/slack-desc
-drwxr-xr-x   2 root root     4096 2009-12-01 07:32 ./source/xap/fluxbox
--rw-r--r--   1 root root   777660 2008-09-19 16:00 ./source/xap/fluxbox/fluxbox-1.1.1.tar.bz2
--rwxr-xr-x   1 root root     3138 2010-01-16 00:40 ./source/xap/fluxbox/fluxbox.SlackBuild
--rw-r--r--   1 root root      687 2005-07-21 19:03 ./source/xap/fluxbox/slack-desc
--rw-r--r--   1 root root      287 2009-12-01 07:31 ./source/xap/fluxbox/xinitrc.fluxbox.gz
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/xap/fvwm
--rw-r--r--   1 root root    23007 2007-02-18 02:02 ./source/xap/fvwm/ancient-icons.tar.gz
--rw-r--r--   1 root root      279 2004-04-05 01:55 ./source/xap/fvwm/doinst.sh.gz
--rw-r--r--   1 root root  1426470 2006-12-09 12:39 ./source/xap/fvwm/fvwm-2.4.20.tar.bz2
--rwxr-xr-x   1 root root     3827 2009-05-19 20:05 ./source/xap/fvwm/fvwm.SlackBuild
--rw-r--r--   1 root root      442 1999-09-13 19:12 ./source/xap/fvwm/fvwm.colormap.diff.gz
--rw-r--r--   1 root root      792 2008-02-11 03:44 ./source/xap/fvwm/slack-desc
--rw-r--r--   1 root root     7625 2007-02-18 02:15 ./source/xap/fvwm/system.fvwm2rc.gz
--rw-r--r--   1 root root      291 2007-02-18 02:12 ./source/xap/fvwm/xinitrc.fvwm2.gz
-drwxr-xr-x   2 root root     4096 2010-03-11 23:20 ./source/xap/geeqie
--rw-r--r--   1 root root      163 2010-03-11 23:20 ./source/xap/geeqie/doinst.sh.gz
--rw-r--r--   1 root root  1078384 2010-03-11 22:47 ./source/xap/geeqie/geeqie-1.0.tar.xz
--rwxr-xr-x   1 root root     3594 2010-03-13 21:14 ./source/xap/geeqie/geeqie.SlackBuild
--rw-r--r--   1 root root      776 2010-03-11 23:23 ./source/xap/geeqie/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-23 00:41 ./source/xap/gftp
--rw-r--r--   1 root root  1687167 2008-12-02 14:07 ./source/xap/gftp/gftp-2.0.19.tar.bz2
--rwxr-xr-x   1 root root     2997 2009-05-23 00:41 ./source/xap/gftp/gftp.SlackBuild
--rw-r--r--   1 root root      304 2008-12-02 20:08 ./source/xap/gftp/gftp.desktop.gz
--rw-r--r--   1 root root      899 2008-02-11 03:44 ./source/xap/gftp/slack-desc
-drwxr-xr-x   2 root root     4096 2010-02-16 04:54 ./source/xap/gimp
--rw-r--r--   1 root root 12405172 2009-12-10 21:26 ./source/xap/gimp/gimp-2.6.8.tar.xz
--rwxr-xr-x   1 root root     3856 2010-02-16 04:56 ./source/xap/gimp/gimp.SlackBuild
--rw-r--r--   1 root root      309 2010-02-16 04:54 ./source/xap/gimp/gimp.png14.diff.gz
--rw-r--r--   1 root root      928 2003-01-29 03:18 ./source/xap/gimp/slack-desc
-drwxr-xr-x   2 root root     4096 2010-03-31 04:43 ./source/xap/gkrellm
--rw-r--r--   1 root root   757875 2010-01-04 23:34 ./source/xap/gkrellm/gkrellm-2.3.4.tar.bz2
--rw-r--r--   1 root root    12374 2004-02-01 16:30 ./source/xap/gkrellm/gkrellm-countdown-0.1.1.tar.gz
--rwxr-xr-x   1 root root     4591 2010-03-31 04:46 ./source/xap/gkrellm/gkrellm.SlackBuild
--rw-r--r--   1 root root      211 2008-10-26 01:35 ./source/xap/gkrellm/gkrellm.theme.defaults.diff.gz
--rw-r--r--   1 root root      971 2004-04-29 18:52 ./source/xap/gkrellm/slack-desc
-drwxr-xr-x   2 root root     4096 2010-02-20 04:12 ./source/xap/gnuchess
--rw-r--r--   1 root root   142963 2004-01-19 11:50 ./source/xap/gnuchess/Sjeng-Free-11.2.tar.bz2
--rw-r--r--   1 root root      652 2004-10-27 05:47 ./source/xap/gnuchess/chess.png
--rw-r--r--   1 root root   462386 2008-02-22 15:57 ./source/xap/gnuchess/eboard-1.1.1.tar.bz2
--rw-r--r--   1 root root      458 2010-02-20 03:54 ./source/xap/gnuchess/eboard.assert.diff.gz
--rw-r--r--   1 root root      224 2004-10-27 06:07 ./source/xap/gnuchess/eboard.desktop
--rw-r--r--   1 root root   193507 2003-08-07 14:15 ./source/xap/gnuchess/gnuchess-5.07.tar.bz2
--rwxr-xr-x   1 root root     6024 2010-02-20 03:57 ./source/xap/gnuchess/gnuchess.SlackBuild
--rw-r--r--   1 root root     1229 2007-05-16 00:54 ./source/xap/gnuchess/gnuchess.SlackBuild.diff.gz
--rw-r--r--   1 root root      241 2007-05-16 00:54 ./source/xap/gnuchess/gnuchess.gcc4_fix.diff.gz
--rw-r--r--   1 root root      570 2010-02-20 03:37 ./source/xap/gnuchess/gnuchess.getline.glibc.diff.gz
--rw-r--r--   1 root root      796 2004-10-27 22:53 ./source/xap/gnuchess/slack-desc
--rw-r--r--   1 root root  1165580 2009-12-08 05:49 ./source/xap/gnuchess/xboard-4.4.2.tar.xz
--rw-r--r--   1 root root      224 2004-10-27 06:04 ./source/xap/gnuchess/xboard.desktop
-drwxr-xr-x   2 root root     4096 2010-03-02 22:28 ./source/xap/gnuplot
--rw-r--r--   1 root root  1940516 2009-09-03 03:04 ./source/xap/gnuplot/gnuplot-4.2.6.tar.xz
--rwxr-xr-x   1 root root     3728 2010-03-03 17:52 ./source/xap/gnuplot/gnuplot.SlackBuild
--rw-r--r--   1 root root     1105 2002-03-16 08:23 ./source/xap/gnuplot/slack-desc
-drwxr-xr-x   2 root root     4096 2010-02-16 04:11 ./source/xap/gucharmap
--rw-r--r--   1 root root      121 2009-03-23 15:07 ./source/xap/gucharmap/doinst.sh.gz
--rw-r--r--   1 root root  2482264 2009-12-14 21:34 ./source/xap/gucharmap/gucharmap-2.28.2.tar.xz
--rwxr-xr-x   1 root root     3509 2010-02-16 04:12 ./source/xap/gucharmap/gucharmap.SlackBuild
--rw-r--r--   1 root root      669 2004-10-13 19:31 ./source/xap/gucharmap/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-09 19:59 ./source/xap/gv
--rw-r--r--   1 root root   398180 2010-04-24 16:17 ./source/xap/gv/gv-3.6.9.tar.xz
--rwxr-xr-x   1 root root     3840 2010-05-09 20:00 ./source/xap/gv/gv.SlackBuild
--rw-r--r--   1 root root      823 2002-03-15 04:27 ./source/xap/gv/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/xap/gxine
--rw-r--r--   1 root root  1112012 2008-06-12 21:44 ./source/xap/gxine/gxine-0.5.903.tar.bz2
--rwxr-xr-x   1 root root     3142 2009-06-10 01:22 ./source/xap/gxine/gxine.SlackBuild
--rw-r--r--   1 root root      453 2006-02-02 19:36 ./source/xap/gxine/gxine.desktop.gz
--rw-r--r--   1 root root      792 2003-09-23 02:20 ./source/xap/gxine/slack-desc
-drwxr-xr-x   2 root root     4096 2010-02-17 21:12 ./source/xap/imagemagick
--rw-r--r--   1 root root  6230060 2010-02-16 11:56 ./source/xap/imagemagick/ImageMagick-6.5.9-6.tar.xz
--rwxr-xr-x   1 root root     5106 2010-02-17 21:15 ./source/xap/imagemagick/imagemagick.SlackBuild
--rw-r--r--   1 root root     1002 2004-04-11 20:51 ./source/xap/imagemagick/slack-desc
-drwxr-xr-x   2 root root     4096 2010-04-02 20:30 ./source/xap/mozilla-firefox
--rw-r--r--   1 root root 48633061 2010-04-02 11:04 ./source/xap/mozilla-firefox/firefox-3.6.3.source.tar.bz2
--rw-r--r--   1 root root      194 2010-04-02 11:04 ./source/xap/mozilla-firefox/firefox-3.6.3.source.tar.bz2.asc
--rw-r--r--   1 root root      327 2008-06-17 17:19 ./source/xap/mozilla-firefox/firefox.moz_plugin_path.diff.gz
--rw-r--r--   1 root root    24263 2009-06-18 08:34 ./source/xap/mozilla-firefox/firefox.png
--rw-r--r--   1 root root      462 2009-07-01 06:05 ./source/xap/mozilla-firefox/mimeTypes.rdf.gz
--rw-r--r--   1 root root      680 2009-07-01 13:28 ./source/xap/mozilla-firefox/mozilla-firefox-mimeTypes-fix.diff.gz
--rwxr-xr-x   1 root root     6405 2010-01-21 19:17 ./source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
--rw-r--r--   1 root root     2620 2009-07-01 06:10 ./source/xap/mozilla-firefox/mozilla-firefox.desktop
--rw-r--r--   1 root root      993 2005-03-08 04:51 ./source/xap/mozilla-firefox/slack-desc
-drwxr-xr-x   2 root root     4096 2010-04-02 01:53 ./source/xap/mozilla-thunderbird
--rw-r--r--   1 root root     1586 2009-12-12 01:10 ./source/xap/mozilla-thunderbird/mimeTypes.rdf.gz
--rwxr-xr-x   1 root root     6001 2010-01-21 23:13 ./source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
--rw-r--r--   1 root root     3378 2005-03-08 05:13 ./source/xap/mozilla-thunderbird/mozilla-thunderbird.desktop
--rw-r--r--   1 root root     1172 2005-03-08 04:50 ./source/xap/mozilla-thunderbird/slack-desc
--rw-r--r--   1 root root 61094371 2010-03-17 10:08 ./source/xap/mozilla-thunderbird/thunderbird-3.0.4.source.tar.bz2
--rw-r--r--   1 root root      323 2010-03-17 20:11 ./source/xap/mozilla-thunderbird/thunderbird-3.0.4.source.tar.bz2.asc
--rw-r--r--   1 root root    47617 2006-02-18 17:00 ./source/xap/mozilla-thunderbird/thunderbird.png
-drwxr-xr-x   2 root root     4096 2010-02-04 00:09 ./source/xap/pan
--rw-r--r--   1 root root  1452883 2008-07-30 02:46 ./source/xap/pan/pan-0.133.tar.bz2
--rwxr-xr-x   1 root root     3679 2010-02-04 00:11 ./source/xap/pan/pan.SlackBuild
--rw-r--r--   1 root root      430 2010-02-04 00:09 ./source/xap/pan/pan.gcc44.diff.gz
--rw-r--r--   1 root root    11893 2010-02-03 23:58 ./source/xap/pan/pan.gmime2.4.diff.gz
--rw-r--r--   1 root root      721 2008-02-11 03:44 ./source/xap/pan/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-18 16:51 ./source/xap/pidgin
--rw-r--r--   1 root root  7234248 2010-05-13 03:14 ./source/xap/pidgin/pidgin-2.7.0.tar.xz
--rw-r--r--   1 root root   604129 2010-05-18 16:51 ./source/xap/pidgin/pidgin-encryption-3.1.tar.gz
--rwxr-xr-x   1 root root     6730 2010-05-18 16:52 ./source/xap/pidgin/pidgin.SlackBuild
--rw-r--r--   1 root root      321 2008-12-07 04:57 ./source/xap/pidgin/purple-allow-sign-rsa-md5.patch.gz
--rw-r--r--   1 root root      926 2008-03-09 08:06 ./source/xap/pidgin/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/xap/rdesktop
--rw-r--r--   1 root root   243001 2008-05-11 06:24 ./source/xap/rdesktop/rdesktop-1.6.0.tar.bz2
--rwxr-xr-x   1 root root     3067 2009-05-19 20:05 ./source/xap/rdesktop/rdesktop.SlackBuild
--rw-r--r--   1 root root      854 2006-09-12 01:52 ./source/xap/rdesktop/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/xap/rxvt
--rw-r--r--   1 root root   493199 2003-03-26 06:47 ./source/xap/rxvt/rxvt-2.7.10.tar.bz2
--rwxr-xr-x   1 root root     3012 2009-06-09 19:32 ./source/xap/rxvt/rxvt.SlackBuild
--rw-r--r--   1 root root     2002 2003-06-08 04:09 ./source/xap/rxvt/rxvt.utempter.diff.gz
--rw-r--r--   1 root root      880 2002-03-10 07:02 ./source/xap/rxvt/slack-desc
-drwxr-xr-x   2 root root     4096 2010-04-26 05:03 ./source/xap/sane
--rw-r--r--   1 root root      133 2006-09-23 08:33 ./source/xap/sane/dll.conf.additions.gz
--rw-r--r--   1 root root      285 2008-02-12 16:23 ./source/xap/sane/doinst.sh.gz
--rw-r--r--   1 root root  3911411 2010-04-26 02:38 ./source/xap/sane/sane-backends-1.0.21.tar.bz2
--rw-r--r--   1 root root      341 2010-01-20 01:54 ./source/xap/sane/sane-frontends-1.0.14-sane_cap_always_settable.diff.gz
--rw-r--r--   1 root root   190172 2005-09-18 07:21 ./source/xap/sane/sane-frontends-1.0.14.tar.bz2
--rwxr-xr-x   1 root root     4617 2010-04-26 05:13 ./source/xap/sane/sane.SlackBuild
--rw-r--r--   1 root root      776 2002-04-04 02:41 ./source/xap/sane/slack-desc
-drwxr-xr-x   3 root root     4096 2010-04-02 19:51 ./source/xap/seamonkey
--rw-r--r--   1 root root      231 2007-06-01 23:47 ./source/xap/seamonkey/doinst.sh.gz
-drwxr-xr-x   2 root root     4096 2009-11-06 05:06 ./source/xap/seamonkey/pkgconfig
--rw-r--r--   1 root root      320 2009-11-06 05:10 ./source/xap/seamonkey/pkgconfig/seamonkey-gtkmozembed.pc
--rw-r--r--   1 root root      305 2009-11-06 05:10 ./source/xap/seamonkey/pkgconfig/seamonkey-js.pc
--rw-r--r--   1 root root      308 2009-11-06 05:10 ./source/xap/seamonkey/pkgconfig/seamonkey-nspr.pc
--rw-r--r--   1 root root      302 2009-11-06 05:10 ./source/xap/seamonkey/pkgconfig/seamonkey-nss.pc
--rw-r--r--   1 root root      276 2009-11-06 05:10 ./source/xap/seamonkey/pkgconfig/seamonkey-plugin.pc
--rw-r--r--   1 root root      372 2009-11-06 05:10 ./source/xap/seamonkey/pkgconfig/seamonkey-xpcom.pc
--rw-r--r--   1 root root 49156288 2010-03-17 11:35 ./source/xap/seamonkey/seamonkey-2.0.4.source.tar.xz
--rw-r--r--   1 root root    12796 2006-02-09 03:17 ./source/xap/seamonkey/seamonkey-icon.png
--rw-r--r--   1 root root      185 2006-02-09 03:40 ./source/xap/seamonkey/seamonkey-mail-icon.png
--rw-r--r--   1 root root      207 2006-02-09 03:23 ./source/xap/seamonkey/seamonkey-mail.desktop
--rwxr-xr-x   1 root root     8233 2010-04-02 19:53 ./source/xap/seamonkey/seamonkey.SlackBuild
--rw-r--r--   1 root root      178 2006-02-09 03:23 ./source/xap/seamonkey/seamonkey.desktop
--rw-r--r--   1 root root      894 2009-11-10 01:43 ./source/xap/seamonkey/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/xap/seyon
--rw-r--r--   1 root root      713 1999-05-09 22:46 ./source/xap/seyon/seyon-2.20c.lsm
--rw-r--r--   1 root root   167487 1999-05-09 22:47 ./source/xap/seyon/seyon-2.20c.tar.gz
--rwxr-xr-x   1 root root     3601 2009-05-19 20:05 ./source/xap/seyon/seyon.SlackBuild
--rw-r--r--   1 root root    36723 2005-01-03 22:32 ./source/xap/seyon/seyon_2.20c-16.diff.gz
--rw-r--r--   1 root root     1065 2002-03-24 00:53 ./source/xap/seyon/slack-desc
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/xap/thunar-volman
--rw-r--r--   1 root root      946 2009-02-26 03:27 ./source/xap/thunar-volman/slack-desc
--rw-r--r--   1 root root   353504 2008-09-14 13:04 ./source/xap/thunar-volman/thunar-volman-0.3.80.tar.bz2
--rwxr-xr-x   1 root root     2594 2009-05-19 20:05 ./source/xap/thunar-volman/thunar-volman.SlackBuild
-lrwxrwxrwx   1 root root        9 2009-08-23 23:36 ./source/xap/vim-gvim -> ../ap/vim
-drwxr-xr-x   2 root root     4096 2010-02-11 21:40 ./source/xap/windowmaker
--rw-r--r--   1 root root  2078830 2008-07-30 06:57 ./source/xap/windowmaker/WindowMaker-20060427cvs.tar.bz2
--rw-r--r--   1 root root   238018 1999-04-01 14:30 ./source/xap/windowmaker/WindowMaker-extra-0.1.tar.gz
--rw-r--r--   1 root root      917 2004-10-28 06:46 ./source/xap/windowmaker/slack-desc
--rwxr-xr-x   1 root root     4664 2010-02-11 21:40 ./source/xap/windowmaker/windowmaker.SlackBuild
--rw-r--r--   1 root root      390 2008-07-30 05:51 ./source/xap/windowmaker/windowmaker.no-mmx.diff.gz
--rw-r--r--   1 root root      214 2010-02-11 21:40 ./source/xap/windowmaker/windowmaker.png.1.4.0.diff.gz
--rw-r--r--   1 root root      669 2002-05-30 20:16 ./source/xap/windowmaker/wmaker.inst.diff.gz
--rw-r--r--   1 root root      394 2009-12-01 07:35 ./source/xap/windowmaker/xinitrc.wmaker.gz
-drwxr-xr-x   2 root root     4096 2009-08-18 22:26 ./source/xap/x11-ssh-askpass
--rw-r--r--   1 root root      533 2009-07-11 03:15 ./source/xap/x11-ssh-askpass/README
--rw-r--r--   1 root root      765 2009-01-17 08:31 ./source/xap/x11-ssh-askpass/slack-desc
--rw-r--r--   1 root root    29229 2009-07-20 23:44 ./source/xap/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1.tar.gz
--rwxr-xr-x   1 root root     1634 2009-08-18 23:17 ./source/xap/x11-ssh-askpass/x11-ssh-askpass.SlackBuild
--rw-r--r--   1 root root      349 2009-07-11 03:15 ./source/xap/x11-ssh-askpass/x11-ssh-askpass.info
--rw-r--r--   1 root root      261 2008-03-29 00:07 ./source/xap/x11-ssh-askpass/xprofile.sample
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/xap/x3270
--rw-r--r--   1 root root      391 2007-04-02 02:36 ./source/xap/x3270/doinst.sh.gz
--rw-r--r--   1 root root      766 2002-03-12 06:49 ./source/xap/x3270/slack-desc
--rw-r--r--   1 root root   854545 2008-08-28 19:23 ./source/xap/x3270/x3270-3.3.7p8.tar.bz2
--rwxr-xr-x   1 root root     2936 2009-05-19 20:05 ./source/xap/x3270/x3270.SlackBuild
-drwxr-xr-x   3 root root     4096 2009-05-19 20:05 ./source/xap/xchat
-drwxr-xr-x   2 root root     4096 2009-04-10 14:28 ./source/xap/xchat/patches
--rw-r--r--   1 root root       43 2007-02-15 05:32 ./source/xap/xchat/patches/patches.url
--rw-r--r--   1 root root      903 2008-06-24 11:43 ./source/xap/xchat/patches/xc286-smallfixes.diff.gz
--rw-r--r--   1 root root      848 2009-04-10 14:24 ./source/xap/xchat/patches/xchat.gtk_2_14.diff.gz
--rw-r--r--   1 root root      620 2008-02-11 03:44 ./source/xap/xchat/slack-desc
--rw-r--r--   1 root root  1423645 2008-06-12 08:47 ./source/xap/xchat/xchat-2.8.6.tar.bz2
--rwxr-xr-x   1 root root     3584 2010-03-02 17:49 ./source/xap/xchat/xchat.SlackBuild
-drwxr-xr-x   5 root root     4096 2010-02-12 20:38 ./source/xap/xfce
--rw-r--r--   1 root root    26680 2009-07-31 06:10 ./source/xap/xfce/icons.tar.xz
-drwxr-xr-x   2 root root     4096 2010-05-17 03:28 ./source/xap/xfce/patches
--rw-r--r--   1 root root     1446 2010-05-17 03:26 ./source/xap/xfce/patches/terminal.gtk.2.18.fix.diff.gz
--rw-r--r--   1 root root     1559 2009-07-21 00:37 ./source/xap/xfce/patches/thunar-1.0.1-fixup_docdir.diff.gz
--rw-r--r--   1 root root      247 2010-02-12 19:25 ./source/xap/xfce/patches/thunar-1.0.1-png14.diff.gz
--rw-r--r--   1 root root     1137 2009-10-25 23:19 ./source/xap/xfce/patches/thunar-fix_umask_properly.diff.gz
--rw-r--r--   1 root root      233 2009-03-01 16:14 ./source/xap/xfce/patches/xfcalendar.desktop.in.diff.gz
--rw-r--r--   1 root root      200 2010-05-06 08:06 ./source/xap/xfce/patches/xfce-utils.xinitrc.consolekit.diff.gz
--rw-r--r--   1 root root      277 2010-02-12 08:11 ./source/xap/xfce/patches/xfce4-settings.libxklavier5.diff.gz
--rw-r--r--   1 root root      289 2009-07-31 06:04 ./source/xap/xfce/patches/xfdesktop-fix_education_icon.diff.gz
-drwxr-xr-x   2 root root     4096 2007-04-21 19:12 ./source/xap/xfce/profile.d
--rwxr-xr-x   1 root root      162 2007-06-29 01:03 ./source/xap/xfce/profile.d/xfce.csh
--rwxr-xr-x   1 root root      170 2007-04-21 19:14 ./source/xap/xfce/profile.d/xfce.sh
--rw-r--r--   1 root root      764 2008-04-06 20:19 ./source/xap/xfce/slack-desc
-drwxr-xr-x   2 root root     4096 2010-02-12 19:25 ./source/xap/xfce/src
--rw-r--r--   1 root root  1304068 2010-02-01 17:12 ./source/xap/xfce/src/Terminal-0.4.4.tar.xz
--rw-r--r--   1 root root  3473596 2009-04-19 07:55 ./source/xap/xfce/src/Thunar-1.0.1.tar.xz
--rw-r--r--   1 root root  1214872 2009-12-12 12:23 ./source/xap/xfce/src/exo-0.3.106.tar.xz
--rw-r--r--   1 root root   228668 2009-02-26 01:41 ./source/xap/xfce/src/gtk-xfce-engine-2.6.0.tar.xz
--rw-r--r--   1 root root   331932 2009-04-19 07:55 ./source/xap/xfce/src/libxfce4menu-4.6.1.tar.xz
--rw-r--r--   1 root root   332712 2009-04-19 07:55 ./source/xap/xfce/src/libxfce4util-4.6.1.tar.xz
--rw-r--r--   1 root root   569016 2010-01-20 09:25 ./source/xap/xfce/src/libxfcegui4-4.6.3.tar.xz
--rw-r--r--   1 root root   269176 2009-02-26 18:56 ./source/xap/xfce/src/mousepad-0.2.16.tar.xz
--rw-r--r--   1 root root  1698784 2009-04-19 07:55 ./source/xap/xfce/src/orage-4.6.1.tar.xz
--rw-r--r--   1 root root   501132 2009-04-19 07:55 ./source/xap/xfce/src/xfce-utils-4.6.1.tar.xz
--rw-r--r--   1 root root   259900 2009-04-19 07:55 ./source/xap/xfce/src/xfce4-appfinder-4.6.1.tar.xz
--rw-r--r--   1 root root    65064 2009-09-20 19:43 ./source/xap/xfce/src/xfce4-dev-tools-4.7.2.tar.xz
--rw-r--r--   1 root root   334516 2009-04-19 07:55 ./source/xap/xfce/src/xfce4-mixer-4.6.1.tar.xz
--rw-r--r--   1 root root   786920 2009-12-30 12:04 ./source/xap/xfce/src/xfce4-panel-4.6.3.tar.xz
--rw-r--r--   1 root root  1201756 2009-04-19 07:55 ./source/xap/xfce/src/xfce4-session-4.6.1.tar.xz
--rw-r--r--   1 root root   454000 2010-01-02 13:39 ./source/xap/xfce/src/xfce4-settings-4.6.4.tar.xz
--rw-r--r--   1 root root   354500 2009-04-19 07:55 ./source/xap/xfce/src/xfconf-4.6.1.tar.xz
--rw-r--r--   1 root root  3136772 2009-04-19 07:55 ./source/xap/xfce/src/xfdesktop-4.6.1.tar.xz
--rw-r--r--   1 root root   728660 2009-04-19 07:55 ./source/xap/xfce/src/xfprint-4.6.1.tar.xz
--rw-r--r--   1 root root  1543832 2009-04-19 07:55 ./source/xap/xfce/src/xfwm4-4.6.1.tar.xz
--rw-r--r--   1 root root   372732 2009-02-26 01:41 ./source/xap/xfce/src/xfwm4-themes-4.6.0.tar.xz
--rwxr-xr-x   1 root root     8618 2010-05-17 03:45 ./source/xap/xfce/xfce.SlackBuild
-drwxr-xr-x   2 root root     4096 2010-02-20 18:14 ./source/xap/xfce4-notifyd
--rw-r--r--   1 root root      174 2009-02-26 05:47 ./source/xap/xfce4-notifyd/doinst.sh.gz
--rw-r--r--   1 root root      905 2010-02-20 18:14 ./source/xap/xfce4-notifyd/slack-desc
--rw-r--r--   1 root root   165593 2008-11-25 06:16 ./source/xap/xfce4-notifyd/xfce4-notifyd-0.1.0.tar.bz2
--rwxr-xr-x   1 root root     3234 2010-02-20 18:15 ./source/xap/xfce4-notifyd/xfce4-notifyd.SlackBuild
-drwxr-xr-x   2 root root     4096 2010-03-02 18:09 ./source/xap/xfce4-power-manager
--rw-r--r--   1 root root      172 2009-05-30 01:47 ./source/xap/xfce4-power-manager/doinst.sh.gz
--rw-r--r--   1 root root      936 2009-05-30 01:47 ./source/xap/xfce4-power-manager/slack-desc
--rw-r--r--   1 root root   920729 2010-03-02 17:24 ./source/xap/xfce4-power-manager/xfce4-power-manager-0.8.5.tar.bz2
--rwxr-xr-x   1 root root     3674 2010-03-02 18:10 ./source/xap/xfce4-power-manager/xfce4-power-manager.SlackBuild
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/xap/xfractint
--rw-r--r--   1 root root   103531 2002-03-14 20:57 ./source/xap/xfractint/palette.maps.tar.gz
--rw-r--r--   1 root root      871 2002-03-14 20:25 ./source/xap/xfractint/slack-desc
--rw-r--r--   1 root root  1212397 2008-10-14 01:16 ./source/xap/xfractint/xfractint-20.04p09.tar.bz2
--rwxr-xr-x   1 root root     3446 2009-05-19 20:05 ./source/xap/xfractint/xfractint.SlackBuild
-drwxr-xr-x   2 root root     4096 2009-08-22 21:20 ./source/xap/xgames
--rw-r--r--   1 root root      269 1999-08-04 18:49 ./source/xap/xgames/maze.diff.gz
--rw-r--r--   1 root root     7945 1994-10-22 00:44 ./source/xap/xgames/maze.tar.gz
--rw-r--r--   1 root root      696 2007-03-01 22:04 ./source/xap/xgames/slack-desc
--rw-r--r--   1 root root      871 2007-02-22 02:20 ./source/xap/xgames/spider.diff.gz
--rw-r--r--   1 root root   130637 1993-12-04 17:22 ./source/xap/xgames/spider.tar.gz
--rw-r--r--   1 root root      287 1999-08-04 18:54 ./source/xap/xgames/xcolormap.diff.gz
--rw-r--r--   1 root root     2808 1993-12-04 17:18 ./source/xap/xgames/xcolormap.tar.gz
--rw-r--r--   1 root root     5937 1993-12-04 17:18 ./source/xap/xgames/xcuckoo-1.1.tar.gz
--rw-r--r--   1 root root      228 2007-02-28 19:11 ./source/xap/xgames/xcuckoo.diff.gz
--rwxr-xr-x   1 root root     4706 2009-08-22 21:21 ./source/xap/xgames/xgames.SlackBuild
--rw-r--r--   1 root root     1150 2009-08-22 20:58 ./source/xap/xgames/xlander-2009-07-18.diff.gz
--rw-r--r--   1 root root     2543 2007-03-01 18:44 ./source/xap/xgames/xlander.fixes.diff.gz
--rw-r--r--   1 root root    15612 1995-06-17 19:23 ./source/xap/xgames/xlander.tar.gz
--rw-r--r--   1 root root    12791 2008-10-25 13:16 ./source/xap/xgames/xminesweep3.0.tar.gz
--rw-r--r--   1 root root    22849 1999-08-04 19:05 ./source/xap/xgames/xneko.tar.gz
--rw-r--r--   1 root root    21694 1993-12-02 07:19 ./source/xap/xgames/xroach.tar.gz
--rw-r--r--   1 root root    37809 1995-12-01 02:04 ./source/xap/xgames/xsnow-1.40.tar.gz
-drwxr-xr-x   2 root root     4096 2010-02-26 20:33 ./source/xap/xine-lib
--rw-r--r--   1 root root      927 2003-08-12 00:43 ./source/xap/xine-lib/slack-desc
--rw-r--r--   1 root root     8082 2010-02-18 22:57 ./source/xap/xine-lib/xine-lib-1.1.17.ff.diff.gz
--rw-r--r--   1 root root  7528937 2009-12-02 14:51 ./source/xap/xine-lib/xine-lib-1.1.17.tar.bz2
--rwxr-xr-x   1 root root     3478 2010-02-23 00:07 ./source/xap/xine-lib/xine-lib.SlackBuild
-drwxr-xr-x   2 root root     4096 2010-02-19 19:42 ./source/xap/xine-ui
--rw-r--r--   1 root root      832 2003-08-12 01:07 ./source/xap/xine-ui/slack-desc
--rw-r--r--   1 root root  2138011 2007-05-03 22:47 ./source/xap/xine-ui/xine-ui-0.99.5.tar.bz2
--rwxr-xr-x   1 root root     3139 2010-02-25 20:12 ./source/xap/xine-ui/xine-ui.SlackBuild
--rw-r--r--   1 root root      269 2010-02-19 19:42 ./source/xap/xine-ui/xine-ui.png14.diff.gz
--rw-r--r--   1 root root      258 2007-05-04 22:27 ./source/xap/xine-ui/xine.desktop.gz
-drwxr-xr-x   2 root root     4096 2009-08-08 00:54 ./source/xap/xlockmore
--rw-r--r--   1 root root      225 2002-02-23 22:23 ./source/xap/xlockmore/l-bob.README
--rw-r--r--   1 root root    27870 1998-04-01 15:09 ./source/xap/xlockmore/l-bob.xbm
--rw-r--r--   1 root root    15190 1998-04-01 15:09 ./source/xap/xlockmore/l-linux.xbm
--rw-r--r--   1 root root     7025 2002-02-23 21:40 ./source/xap/xlockmore/s-bob.xbm
--rw-r--r--   1 root root      922 2002-03-24 00:54 ./source/xap/xlockmore/slack-desc
--rw-r--r--   1 root root  1901583 2009-04-13 23:37 ./source/xap/xlockmore/xlockmore-5.28.tar.bz2
--rw-r--r--   1 root root      194 2009-04-13 23:37 ./source/xap/xlockmore/xlockmore-5.28.tar.bz2.asc
--rwxr-xr-x   1 root root     3449 2009-08-08 01:09 ./source/xap/xlockmore/xlockmore.SlackBuild
--rw-r--r--   1 root root      371 2002-05-30 04:25 ./source/xap/xlockmore/xlockmore.bitmap.diff.gz
-drwxr-xr-x   2 root root     4096 2010-03-22 19:03 ./source/xap/xmms
--rw-r--r--   1 root root      834 2004-02-24 02:30 ./source/xap/xmms/slack-desc
--rw-r--r--   1 root root  2581032 2007-11-16 22:53 ./source/xap/xmms/xmms-1.2.11.tar.bz2
--rwxr-xr-x   1 root root     3385 2010-03-22 19:05 ./source/xap/xmms/xmms.SlackBuild
--rw-r--r--   1 root root      525 2008-09-11 20:50 ./source/xap/xmms/xmms.desktop
--rw-r--r--   1 root root      279 2008-09-12 20:50 ./source/xap/xmms/xmms.gtk.doublesize.diff.gz
--rw-r--r--   1 root root     2475 2008-01-04 23:53 ./source/xap/xmms/xmms.png
--rw-r--r--   1 root root      260 2009-06-09 20:19 ./source/xap/xmms/xmms.wmxmms_vis_depth_workaround.diff.gz
-drwxr-xr-x   2 root root     4096 2010-02-20 01:05 ./source/xap/xpaint
--rw-r--r--   1 root root      902 2002-03-12 23:40 ./source/xap/xpaint/slack-desc
--rw-r--r--   1 root root   795772 2010-02-12 19:48 ./source/xap/xpaint/xpaint-2.8.16.tar.bz2
--rwxr-xr-x   1 root root     4009 2010-02-20 01:05 ./source/xap/xpaint/xpaint.SlackBuild
-drwxr-xr-x   4 root root     4096 2010-02-11 21:58 ./source/xap/xpdf
--rw-r--r--   1 root root      325 2010-01-11 04:59 ./source/xap/xpdf/doinst.sh.gz
-drwxr-xr-x   2 root root     4096 2010-01-11 05:01 ./source/xap/xpdf/lang
--rw-r--r--   1 root root      207 2008-03-02 07:24 ./source/xap/xpdf/lang/xpdf-arabic.diff.gz
--rw-r--r--   1 root root     1058 2004-07-18 23:14 ./source/xap/xpdf/lang/xpdf-arabic.tar.gz
--rw-r--r--   1 root root      375 2008-03-02 07:46 ./source/xap/xpdf/lang/xpdf-chinese-simplified.diff.gz
--rw-r--r--   1 root root   835960 2004-07-27 22:29 ./source/xap/xpdf/lang/xpdf-chinese-simplified.tar.gz
--rw-r--r--   1 root root      354 2008-03-02 07:45 ./source/xap/xpdf/lang/xpdf-chinese-traditional.diff.gz
--rw-r--r--   1 root root   794604 2004-07-27 22:30 ./source/xap/xpdf/lang/xpdf-chinese-traditional.tar.gz
--rw-r--r--   1 root root      242 2008-03-02 07:27 ./source/xap/xpdf/lang/xpdf-cyrillic.diff.gz
--rw-r--r--   1 root root     1660 2004-07-18 23:15 ./source/xap/xpdf/lang/xpdf-cyrillic.tar.gz
--rw-r--r--   1 root root      236 2008-03-02 07:28 ./source/xap/xpdf/lang/xpdf-greek.diff.gz
--rw-r--r--   1 root root     1263 2004-07-18 23:15 ./source/xap/xpdf/lang/xpdf-greek.tar.gz
--rw-r--r--   1 root root      224 2008-03-02 07:28 ./source/xap/xpdf/lang/xpdf-hebrew.diff.gz
--rw-r--r--   1 root root     1314 2004-07-18 23:15 ./source/xap/xpdf/lang/xpdf-hebrew.tar.gz
--rw-r--r--   1 root root      750 2008-03-02 07:48 ./source/xap/xpdf/lang/xpdf-japanese.diff.gz
--rw-r--r--   1 root root   494803 2004-07-27 22:30 ./source/xap/xpdf/lang/xpdf-japanese.tar.gz
--rw-r--r--   1 root root      312 2008-03-02 07:34 ./source/xap/xpdf/lang/xpdf-korean.diff.gz
--rw-r--r--   1 root root   470455 2005-07-07 18:05 ./source/xap/xpdf/lang/xpdf-korean.tar.gz
--rw-r--r--   1 root root      200 2008-03-02 07:36 ./source/xap/xpdf/lang/xpdf-latin2.diff.gz
--rw-r--r--   1 root root     1435 2004-07-18 23:15 ./source/xap/xpdf/lang/xpdf-latin2.tar.gz
--rw-r--r--   1 root root      231 2008-03-02 07:36 ./source/xap/xpdf/lang/xpdf-thai.diff.gz
--rw-r--r--   1 root root     1873 2004-07-18 23:17 ./source/xap/xpdf/lang/xpdf-thai.tar.gz
--rw-r--r--   1 root root      210 2008-03-02 07:37 ./source/xap/xpdf/lang/xpdf-turkish.diff.gz
--rw-r--r--   1 root root     1140 2004-07-18 23:17 ./source/xap/xpdf/lang/xpdf-turkish.tar.gz
-drwxr-xr-x   2 root root     4096 2010-01-11 04:55 ./source/xap/xpdf/patches
--rw-r--r--   1 root root     1050 2007-07-30 18:51 ./source/xap/xpdf/patches/xpdf-3.02pl1.patch
--rw-r--r--   1 root root      189 2007-07-30 18:51 ./source/xap/xpdf/patches/xpdf-3.02pl1.patch.sig
--rw-r--r--   1 root root    20843 2007-11-07 18:16 ./source/xap/xpdf/patches/xpdf-3.02pl2.patch
--rw-r--r--   1 root root      189 2007-11-07 18:16 ./source/xap/xpdf/patches/xpdf-3.02pl2.patch.sig
--rw-r--r--   1 root root    30727 2009-04-16 19:18 ./source/xap/xpdf/patches/xpdf-3.02pl3.patch
--rw-r--r--   1 root root      197 2009-04-16 19:18 ./source/xap/xpdf/patches/xpdf-3.02pl3.patch.sig
--rw-r--r--   1 root root     6982 2009-10-14 22:12 ./source/xap/xpdf/patches/xpdf-3.02pl4.patch
--rw-r--r--   1 root root      197 2009-10-14 22:12 ./source/xap/xpdf/patches/xpdf-3.02pl4.patch.sig
--rw-r--r--   1 root root      498 2007-04-12 00:58 ./source/xap/xpdf/patches/xpdf-resizefix.diff.gz
--rw-r--r--   1 root root    37396 2007-11-12 05:27 ./source/xap/xpdf/patches/xpdf_3.02-1.3.diff.gz
--rw-r--r--   1 root root      636 2007-02-18 03:26 ./source/xap/xpdf/patches/xpdfrc.diff.gz
--rw-r--r--   1 root root      711 2007-04-12 01:49 ./source/xap/xpdf/slack-desc
--rw-r--r--   1 root root   674912 2007-02-27 22:56 ./source/xap/xpdf/xpdf-3.02.tar.gz
--rw-r--r--   1 root root      189 2007-02-27 22:50 ./source/xap/xpdf/xpdf-3.02.tar.gz.sig
--rwxr-xr-x   1 root root     5157 2010-02-11 22:00 ./source/xap/xpdf/xpdf.SlackBuild
--rw-r--r--   1 root root     3260 2010-01-11 05:07 ./source/xap/xpdf/xpdf.desktop
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/xap/xsane
--rw-r--r--   1 root root      955 2004-05-11 19:29 ./source/xap/xsane/slack-desc
--rw-r--r--   1 root root  2531642 2008-09-21 18:31 ./source/xap/xsane/xsane-0.996.tar.bz2
--rwxr-xr-x   1 root root     3134 2010-02-20 00:47 ./source/xap/xsane/xsane.SlackBuild
-drwxr-xr-x   2 root root     4096 2010-05-03 07:21 ./source/xap/xscreensaver
--rw-r--r--   1 root root     2868 2008-10-17 04:30 ./source/xap/xscreensaver/setuid.c.gz
--rw-r--r--   1 root root      887 2008-10-17 04:31 ./source/xap/xscreensaver/slack-desc
--rw-r--r--   1 root root  3327596 2010-04-13 20:37 ./source/xap/xscreensaver/xscreensaver-5.11.tar.xz
--rwxr-xr-x   1 root root     3585 2010-02-20 19:40 ./source/xap/xscreensaver/xscreensaver.SlackBuild
--rw-r--r--   1 root root      285 2009-05-15 21:22 ./source/xap/xscreensaver/xscreensaver.electricsheep.diff.gz
--rw-r--r--   1 root root     1763 2008-10-17 04:32 ./source/xap/xscreensaver/xscreensaver.setuid.diff.gz
-drwxr-xr-x   2 root root     4096 2010-02-19 19:32 ./source/xap/xv
--rw-r--r--   1 root root      688 2002-03-10 06:26 ./source/xap/xv/slack-desc
--rw-r--r--   1 root root  1693808 1994-12-22 15:50 ./source/xap/xv/xv-3.10.tar.xz
--rw-r--r--   1 root root     3294 2008-12-16 18:04 ./source/xap/xv/xv-3.10a-enhancements.20070520-20081216.diff.bz2
--rw-r--r--   1 root root    25974 2007-05-21 05:19 ./source/xap/xv/xv-3.10a-jumbo-README.txt
--rw-r--r--   1 root root   114978 2010-02-19 19:24 ./source/xap/xv/xv-3.10a-jumbo-additions.diff.bz2
--rw-r--r--   1 root root   287250 2007-05-21 04:57 ./source/xap/xv/xv-3.10a-jumbo-fix-enh-patch-20070520.txt.bz2
--rw-r--r--   1 root root    21943 1996-10-05 19:33 ./source/xap/xv/xv-3.10a.patch.gz
--rwxr-xr-x   1 root root     3210 2010-02-19 19:32 ./source/xap/xv/xv.SlackBuild
--rw-r--r--   1 root root      229 2010-02-19 19:27 ./source/xap/xv/xv.jasper.diff.gz
--rw-r--r--   1 root root      317 2010-02-19 19:15 ./source/xap/xv/xv.prefix.diff.gz
--rw-r--r--   1 root root      282 2010-02-19 19:16 ./source/xap/xv/xv.prefix_x86_64.diff.gz
-drwxr-xr-x   2 root root     4096 2009-05-19 20:05 ./source/xap/xxgdb
--rw-r--r--   1 root root      874 2002-03-13 02:25 ./source/xap/xxgdb/slack-desc
--rw-r--r--   1 root root   115537 1995-11-19 16:40 ./source/xap/xxgdb/xxgdb-1.12.tar.gz
--rwxr-xr-x   1 root root     3066 2009-05-19 20:05 ./source/xap/xxgdb/xxgdb.SlackBuild
--rw-r--r--   1 root root      607 2007-02-21 18:30 ./source/xap/xxgdb/xxgdb.fix_glibc_and_gcc.diff.gz
-drwxr-xr-x   3 root root     4096 2010-05-12 04:10 ./source/y
-drwxr-xr-x   2 root root     4096 2010-05-11 21:10 ./source/y/bsd-games
--rw-r--r--   1 root root      825 2001-08-30 23:25 ./source/y/bsd-games/bsd-games-2.13.lsm
--rw-r--r--   1 root root  1861269 2001-08-30 23:25 ./source/y/bsd-games/bsd-games-2.13.tar.bz2
--rw-r--r--   1 root root      164 1999-09-27 21:18 ./source/y/bsd-games/bsd-games-login-fortune.csh
--rw-r--r--   1 root root      164 2010-05-11 19:26 ./source/y/bsd-games/bsd-games-login-fortune.sh
--rwxr-xr-x   1 root root     6785 2010-05-15 18:02 ./source/y/bsd-games/bsd-games.SlackBuild
--rw-r--r--   1 root root      563 2003-02-03 21:48 ./source/y/bsd-games/bsd-games.config.params.diff.gz
--rw-r--r--   1 root root      283 2003-02-03 22:28 ./source/y/bsd-games/bsd-games.fortlen.diff.gz
--rw-r--r--   1 root root      181 2002-03-10 05:27 ./source/y/bsd-games/bsd-games.fortunepath.diff.gz
--rw-r--r--   1 root root     2333 2010-05-11 21:10 ./source/y/bsd-games/bsd-games.getline.diff.gz
--rw-r--r--   1 root root      265 2006-09-07 02:18 ./source/y/bsd-games/bsd-games.ospeed.diff.gz
--rw-r--r--   1 root root      386 2007-08-27 17:51 ./source/y/bsd-games/bsd-games.phantasia_install_fix.diff.gz
--rw-r--r--   1 root root     1960 2006-09-09 00:47 ./source/y/bsd-games/bsd-games.pom.diff.gz
--rw-r--r--   1 root root      353 2003-02-03 22:51 ./source/y/bsd-games/bsd-games.strfile.8.diff.gz
--rw-r--r--   1 root root      405 2007-08-27 17:57 ./source/y/bsd-games/bsd-games.trek-gcc4.diff.gz
--rw-r--r--   1 root root    15107 2002-03-10 05:09 ./source/y/bsd-games/fortunes-linuxcookie.tar.gz
--rw-r--r--   1 root root   364407 2002-03-10 05:09 ./source/y/bsd-games/fortunes-o.tar.gz
--rw-r--r--   1 root root   104848 1993-10-25 00:02 ./source/y/bsd-games/hangman-words.gz
--rw-r--r--   1 root root     1056 2002-03-10 04:51 ./source/y/bsd-games/slack-desc
-drwxr-xr-x   4 root root     4096 2010-05-18 22:40 ./testing
--rw-r--r--   1 root root     1225 2010-05-18 22:40 ./testing/CHECKSUMS.md5
--rw-r--r--   1 root root      198 2010-05-18 22:40 ./testing/CHECKSUMS.md5.asc
--rw-r--r--   1 root root     1598 2010-05-18 22:40 ./testing/FILE_LIST
--rw-r--r--   1 root root     6847 2010-05-18 22:40 ./testing/MANIFEST.bz2
--rw-r--r--   1 root root     1528 2010-05-18 22:40 ./testing/PACKAGES.TXT
-drwxr-xr-x   2 root root     4096 2010-05-18 22:40 ./testing/packages
--rw-r--r--   1 root root      322 2010-05-04 07:08 ./testing/packages/amarok-2.3.0.90-x86_64-1.txt
--rw-r--r--   1 root root  7804796 2010-05-04 07:08 ./testing/packages/amarok-2.3.0.90-x86_64-1.txz
--rw-r--r--   1 root root      198 2010-05-04 07:08 ./testing/packages/amarok-2.3.0.90-x86_64-1.txz.asc
--rw-r--r--   1 root root      639 2010-05-18 20:16 ./testing/packages/btrfs-progs-20100518-x86_64-1.txt
--rw-r--r--   1 root root   125876 2010-05-18 20:16 ./testing/packages/btrfs-progs-20100518-x86_64-1.txz
--rw-r--r--   1 root root      198 2010-05-18 20:16 ./testing/packages/btrfs-progs-20100518-x86_64-1.txz.asc
-drwxr-xr-x   3 root root     4096 2010-05-18 20:16 ./testing/source
-drwxr-xr-x   2 root root     4096 2010-05-18 18:28 ./testing/source/btrfs-progs
--rw-r--r--   1 root root   135696 2010-05-18 18:28 ./testing/source/btrfs-progs/btrfs-progs-20100518.tar.xz
--rwxr-xr-x   1 root root     3826 2010-01-20 07:15 ./testing/source/btrfs-progs/btrfs-progs.SlackBuild
--rw-r--r--   1 root root     1102 2010-01-20 07:12 ./testing/source/btrfs-progs/slack-desc
-drwxr-xr-x   2 root root     4096 2010-05-17 02:11 ./usb-and-pxe-installers
--rw-r--r--   1 root root    31142 2009-07-22 14:49 ./usb-and-pxe-installers/README_PXE.TXT
--rw-r--r--   1 root root     7938 2009-07-22 14:47 ./usb-and-pxe-installers/README_USB.TXT
--rw-r--r--   1 root root      345 2010-04-13 20:56 ./usb-and-pxe-installers/pxelinux.cfg_default
--rw-r--r--   1 root root 25169920 2010-05-17 02:10 ./usb-and-pxe-installers/usbboot.img
--rw-r--r--   1 root root    13469 2010-04-24 18:22 ./usb-and-pxe-installers/usbimg2disk.sh
+drwxr-xr-x 12 root root      4096 Apr 25 17:03 .
+-rw-r--r--  1 root root     10188 Apr 25 04:36 ./ANNOUNCE.13_37
+-rw-r--r--  1 root root     20933 Oct  2  2006 ./BOOTING.TXT
+-rw-r--r--  1 root root     14744 Apr 23 17:22 ./CHANGES_AND_HINTS.TXT
+-rw-r--r--  1 root root    658810 Apr 25 13:58 ./CHECKSUMS.md5
+-rw-r--r--  1 root root       198 Apr 25 13:58 ./CHECKSUMS.md5.asc
+-rw-r--r--  1 root root     17976 Jun 10  1994 ./COPYING
+-rw-r--r--  1 root root     35147 Jun 30  2007 ./COPYING3
+-rw-r--r--  1 root root     19531 Aug 26  2009 ./COPYRIGHT.TXT
+-rw-r--r--  1 root root       616 Oct  2  2006 ./CRYPTO_NOTICE.TXT
+-rw-r--r--  1 root root    126748 Apr 25 13:37 ./ChangeLog.txt
+-rw-r--r--  1 root root    872123 Apr 25 13:55 ./FILELIST.TXT
+-rw-r--r--  1 root root      1565 Feb 26  2003 ./GPG-KEY
+-rw-r--r--  1 root root    542310 Apr 25 13:50 ./PACKAGES.TXT
+-rw-r--r--  1 root root      8815 Apr 21 23:38 ./README.TXT
+-rw-r--r--  1 root root      3644 Apr  7 11:02 ./README.initrd
+-rw-r--r--  1 root root     34068 Apr  8 15:15 ./README_CRYPT.TXT
+-rw-r--r--  1 root root      8978 Apr  8 15:16 ./README_LVM.TXT
+-rw-r--r--  1 root root     17957 Mar 15 18:32 ./README_RAID.TXT
+-rw-r--r--  1 root root    361680 Apr 25 17:03 ./READ_DVD.TXT
+-rw-r--r--  1 root root      3623 Apr 25 04:57 ./RELEASE_NOTES
+-rw-r--r--  1 root root     13855 Dec  8  2008 ./SPEAKUP_DOCS.TXT
+-rw-r--r--  1 root root     17294 Dec  8  2008 ./SPEAK_INSTALL.TXT
+-rw-r--r--  1 root root     58732 May 18  2010 ./Slackware-HOWTO
+-rw-r--r--  1 root root      7012 Apr  6 16:50 ./UPGRADE.TXT
+drwxr-xr-x 18 root root      4096 Apr 24 03:37 ./extra
+-rw-r--r--  1 root root     33251 Apr 24 03:37 ./extra/CHECKSUMS.md5
+-rw-r--r--  1 root root       198 Apr 24 03:37 ./extra/CHECKSUMS.md5.asc
+-rw-r--r--  1 root root     42266 Apr 24 03:36 ./extra/FILE_LIST
+-rw-r--r--  1 root root    152298 Apr 24 03:37 ./extra/MANIFEST.bz2
+-rw-r--r--  1 root root     34233 Apr 24 03:37 ./extra/PACKAGES.TXT
+-rw-r--r--  1 root root       149 Feb  9  2002 ./extra/README.TXT
+drwxr-xr-x  2 root root     20480 Aug 14  2009 ./extra/aspell-word-lists
+-rw-r--r--  1 root root       171 Oct  3  2008 ./extra/aspell-word-lists/aspell-af-0.50_0-noarch-4.txt
+-rw-r--r--  1 root root    868976 Oct  3  2008 ./extra/aspell-word-lists/aspell-af-0.50_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-af-0.50_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       190 Oct  3  2008 ./extra/aspell-word-lists/aspell-am-0.03_1-noarch-4.txt
+-rw-r--r--  1 root root    106700 Oct  3  2008 ./extra/aspell-word-lists/aspell-am-0.03_1-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-am-0.03_1-noarch-4.txz.asc
+-rw-r--r--  1 root root       195 Oct  3  2008 ./extra/aspell-word-lists/aspell-az-0.02_0-noarch-4.txt
+-rw-r--r--  1 root root    126472 Oct  3  2008 ./extra/aspell-word-lists/aspell-az-0.02_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-az-0.02_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       199 Oct  3  2008 ./extra/aspell-word-lists/aspell-be-0.01-noarch-4.txt
+-rw-r--r--  1 root root   9455764 Oct  3  2008 ./extra/aspell-word-lists/aspell-be-0.01-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-be-0.01-noarch-4.txz.asc
+-rw-r--r--  1 root root       171 Oct  3  2008 ./extra/aspell-word-lists/aspell-bg-4.0_0-noarch-4.txt
+-rw-r--r--  1 root root   5413300 Oct  3  2008 ./extra/aspell-word-lists/aspell-bg-4.0_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-bg-4.0_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       193 Oct  3  2008 ./extra/aspell-word-lists/aspell-bn-0.01.1_1-noarch-4.txt
+-rw-r--r--  1 root root    582408 Oct  3  2008 ./extra/aspell-word-lists/aspell-bn-0.01.1_1-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-bn-0.01.1_1-noarch-4.txz.asc
+-rw-r--r--  1 root root       168 Oct  3  2008 ./extra/aspell-word-lists/aspell-br-0.50_2-noarch-4.txt
+-rw-r--r--  1 root root    308936 Oct  3  2008 ./extra/aspell-word-lists/aspell-br-0.50_2-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-br-0.50_2-noarch-4.txz.asc
+-rw-r--r--  1 root root       185 Oct  3  2008 ./extra/aspell-word-lists/aspell-ca-20040130_1-noarch-4.txt
+-rw-r--r--  1 root root   1052772 Oct  3  2008 ./extra/aspell-word-lists/aspell-ca-20040130_1-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-ca-20040130_1-noarch-4.txz.asc
+-rw-r--r--  1 root root       185 Oct  3  2008 ./extra/aspell-word-lists/aspell-cs-20040614_1-noarch-4.txt
+-rw-r--r--  1 root root   2049648 Oct  3  2008 ./extra/aspell-word-lists/aspell-cs-20040614_1-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-cs-20040614_1-noarch-4.txz.asc
+-rw-r--r--  1 root root       203 Oct  3  2008 ./extra/aspell-word-lists/aspell-csb-0.02_0-noarch-4.txt
+-rw-r--r--  1 root root     42324 Oct  3  2008 ./extra/aspell-word-lists/aspell-csb-0.02_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-csb-0.02_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       167 Oct  3  2008 ./extra/aspell-word-lists/aspell-cy-0.50_3-noarch-4.txt
+-rw-r--r--  1 root root   1745716 Oct  3  2008 ./extra/aspell-word-lists/aspell-cy-0.50_3-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-cy-0.50_3-noarch-4.txz.asc
+-rw-r--r--  1 root root       182 Oct  3  2008 ./extra/aspell-word-lists/aspell-da-1.4.42_1-noarch-4.txt
+-rw-r--r--  1 root root   3045652 Oct  3  2008 ./extra/aspell-word-lists/aspell-da-1.4.42_1-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-da-1.4.42_1-noarch-4.txz.asc
+-rw-r--r--  1 root root       186 Oct  3  2008 ./extra/aspell-word-lists/aspell-de-20030222_1-noarch-4.txt
+-rw-r--r--  1 root root   2872868 Oct  3  2008 ./extra/aspell-word-lists/aspell-de-20030222_1-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-de-20030222_1-noarch-4.txz.asc
+-rw-r--r--  1 root root       167 Oct  3  2008 ./extra/aspell-word-lists/aspell-el-0.50_3-noarch-4.txt
+-rw-r--r--  1 root root   3216592 Oct  3  2008 ./extra/aspell-word-lists/aspell-el-0.50_3-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-el-0.50_3-noarch-4.txz.asc
+-rw-r--r--  1 root root       171 Oct  3  2008 ./extra/aspell-word-lists/aspell-eo-0.50_2-noarch-4.txt
+-rw-r--r--  1 root root   3797376 Oct  3  2008 ./extra/aspell-word-lists/aspell-eo-0.50_2-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-eo-0.50_2-noarch-4.txz.asc
+-rw-r--r--  1 root root       169 Oct  3  2008 ./extra/aspell-word-lists/aspell-es-0.50_2-noarch-4.txt
+-rw-r--r--  1 root root   2958592 Oct  3  2008 ./extra/aspell-word-lists/aspell-es-0.50_2-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-es-0.50_2-noarch-4.txz.asc
+-rw-r--r--  1 root root       176 Oct  3  2008 ./extra/aspell-word-lists/aspell-et-0.1.21_1-noarch-4.txt
+-rw-r--r--  1 root root    877160 Oct  3  2008 ./extra/aspell-word-lists/aspell-et-0.1.21_1-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-et-0.1.21_1-noarch-4.txz.asc
+-rw-r--r--  1 root root       188 Oct  3  2008 ./extra/aspell-word-lists/aspell-fa-0.02_0-noarch-4.txt
+-rw-r--r--  1 root root   1488308 Oct  3  2008 ./extra/aspell-word-lists/aspell-fa-0.02_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-fa-0.02_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       175 Oct  3  2008 ./extra/aspell-word-lists/aspell-fi-0.7_0-noarch-4.txt
+-rw-r--r--  1 root root    606924 Oct  3  2008 ./extra/aspell-word-lists/aspell-fi-0.7_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-fi-0.7_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       186 Oct  3  2008 ./extra/aspell-word-lists/aspell-fo-0.2.16_1-noarch-4.txt
+-rw-r--r--  1 root root    997552 Oct  3  2008 ./extra/aspell-word-lists/aspell-fo-0.2.16_1-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-fo-0.2.16_1-noarch-4.txz.asc
+-rw-r--r--  1 root root       168 Oct  3  2008 ./extra/aspell-word-lists/aspell-fr-0.50_3-noarch-4.txt
+-rw-r--r--  1 root root   4365324 Oct  3  2008 ./extra/aspell-word-lists/aspell-fr-0.50_3-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-fr-0.50_3-noarch-4.txz.asc
+-rw-r--r--  1 root root       183 Oct  3  2008 ./extra/aspell-word-lists/aspell-ga-3.6_0-noarch-4.txt
+-rw-r--r--  1 root root   2144676 Oct  3  2008 ./extra/aspell-word-lists/aspell-ga-3.6_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-ga-3.6_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       194 Oct  3  2008 ./extra/aspell-word-lists/aspell-gd-0.1.1_1-noarch-4.txt
+-rw-r--r--  1 root root    131084 Oct  3  2008 ./extra/aspell-word-lists/aspell-gd-0.1.1_1-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-gd-0.1.1_1-noarch-4.txz.asc
+-rw-r--r--  1 root root       170 Oct  3  2008 ./extra/aspell-word-lists/aspell-gl-0.50_0-noarch-4.txt
+-rw-r--r--  1 root root   2981948 Oct  3  2008 ./extra/aspell-word-lists/aspell-gl-0.50_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-gl-0.50_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       200 Oct  3  2008 ./extra/aspell-word-lists/aspell-gu-0.02_0-noarch-4.txt
+-rw-r--r--  1 root root     59216 Oct  3  2008 ./extra/aspell-word-lists/aspell-gu-0.02_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-gu-0.02_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       173 Oct  3  2008 ./extra/aspell-word-lists/aspell-gv-0.50_0-noarch-4.txt
+-rw-r--r--  1 root root    218880 Oct  3  2008 ./extra/aspell-word-lists/aspell-gv-0.50_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-gv-0.50_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       187 Oct  3  2008 ./extra/aspell-word-lists/aspell-he-1.0_0-noarch-4.txt
+-rw-r--r--  1 root root   1991800 Oct  3  2008 ./extra/aspell-word-lists/aspell-he-1.0_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-he-1.0_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       191 Oct  3  2008 ./extra/aspell-word-lists/aspell-hi-0.01_0-noarch-4.txt
+-rw-r--r--  1 root root    116448 Oct  3  2008 ./extra/aspell-word-lists/aspell-hi-0.01_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-hi-0.01_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       190 Oct  3  2008 ./extra/aspell-word-lists/aspell-hil-0.11_0-noarch-4.txt
+-rw-r--r--  1 root root    114780 Oct  3  2008 ./extra/aspell-word-lists/aspell-hil-0.11_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-hil-0.11_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       170 Oct  3  2008 ./extra/aspell-word-lists/aspell-hr-0.51_0-noarch-4.txt
+-rw-r--r--  1 root root   1945240 Oct  3  2008 ./extra/aspell-word-lists/aspell-hr-0.51_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-hr-0.51_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       209 Oct  3  2008 ./extra/aspell-word-lists/aspell-hsb-0.01_1-noarch-4.txt
+-rw-r--r--  1 root root    318392 Oct  3  2008 ./extra/aspell-word-lists/aspell-hsb-0.01_1-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-hsb-0.01_1-noarch-4.txz.asc
+-rw-r--r--  1 root root       177 Oct  3  2008 ./extra/aspell-word-lists/aspell-hu-0.99.4.2_0-noarch-4.txt
+-rw-r--r--  1 root root   1586716 Oct  3  2008 ./extra/aspell-word-lists/aspell-hu-0.99.4.2_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-hu-0.99.4.2_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       173 Oct  3  2008 ./extra/aspell-word-lists/aspell-ia-0.50_1-noarch-4.txt
+-rw-r--r--  1 root root    549808 Oct  3  2008 ./extra/aspell-word-lists/aspell-ia-0.50_1-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-ia-0.50_1-noarch-4.txz.asc
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-id-1.2_0-noarch-4.txt
+-rw-r--r--  1 root root    213320 Oct  3  2008 ./extra/aspell-word-lists/aspell-id-1.2_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-id-1.2_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       171 Oct  3  2008 ./extra/aspell-word-lists/aspell-is-0.51.1_0-noarch-4.txt
+-rw-r--r--  1 root root   1505496 Oct  3  2008 ./extra/aspell-word-lists/aspell-is-0.51.1_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-is-0.51.1_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       186 Oct  3  2008 ./extra/aspell-word-lists/aspell-it-2.2_20050523_0-noarch-4.txt
+-rw-r--r--  1 root root    643296 Oct  3  2008 ./extra/aspell-word-lists/aspell-it-2.2_20050523_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-it-2.2_20050523_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       182 Oct  3  2008 ./extra/aspell-word-lists/aspell-ku-0.12_0-noarch-4.txt
+-rw-r--r--  1 root root     55296 Oct  3  2008 ./extra/aspell-word-lists/aspell-ku-0.12_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-ku-0.12_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       173 Oct  3  2008 ./extra/aspell-word-lists/aspell-la-20020503_0-noarch-4.txt
+-rw-r--r--  1 root root    122204 Oct  3  2008 ./extra/aspell-word-lists/aspell-la-20020503_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-la-20020503_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       190 Oct  3  2008 ./extra/aspell-word-lists/aspell-lt-1.1+cvs20060103_0-noarch-4.txt
+-rw-r--r--  1 root root    567968 Oct  3  2008 ./extra/aspell-word-lists/aspell-lt-1.1+cvs20060103_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-lt-1.1+cvs20060103_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       175 Oct  3  2008 ./extra/aspell-word-lists/aspell-lv-0.5.5_1-noarch-4.txt
+-rw-r--r--  1 root root    186808 Oct  3  2008 ./extra/aspell-word-lists/aspell-lv-0.5.5_1-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-lv-0.5.5_1-noarch-4.txz.asc
+-rw-r--r--  1 root root       176 Oct  3  2008 ./extra/aspell-word-lists/aspell-mg-0.03_0-noarch-4.txt
+-rw-r--r--  1 root root    116888 Oct  3  2008 ./extra/aspell-word-lists/aspell-mg-0.03_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-mg-0.03_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       167 Oct  3  2008 ./extra/aspell-word-lists/aspell-mi-0.50_0-noarch-4.txt
+-rw-r--r--  1 root root    144836 Oct  3  2008 ./extra/aspell-word-lists/aspell-mi-0.50_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-mi-0.50_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       172 Oct  3  2008 ./extra/aspell-word-lists/aspell-mk-0.50_0-noarch-4.txt
+-rw-r--r--  1 root root   1250820 Oct  3  2008 ./extra/aspell-word-lists/aspell-mk-0.50_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-mk-0.50_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       192 Oct  3  2008 ./extra/aspell-word-lists/aspell-mn-0.01_0-noarch-4.txt
+-rw-r--r--  1 root root     68124 Oct  3  2008 ./extra/aspell-word-lists/aspell-mn-0.01_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-mn-0.01_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       193 Oct  3  2008 ./extra/aspell-word-lists/aspell-mr-0.10_0-noarch-4.txt
+-rw-r--r--  1 root root    474624 Oct  3  2008 ./extra/aspell-word-lists/aspell-mr-0.10_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-mr-0.10_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       167 Oct  3  2008 ./extra/aspell-word-lists/aspell-ms-0.50_0-noarch-4.txt
+-rw-r--r--  1 root root    116524 Oct  3  2008 ./extra/aspell-word-lists/aspell-ms-0.50_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-ms-0.50_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       169 Oct  3  2008 ./extra/aspell-word-lists/aspell-mt-0.50_0-noarch-4.txt
+-rw-r--r--  1 root root   5060516 Oct  3  2008 ./extra/aspell-word-lists/aspell-mt-0.50_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-mt-0.50_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       178 Aug 13  2009 ./extra/aspell-word-lists/aspell-nb-0.50.1_0-noarch-4.txt
+-rw-r--r--  1 root root   3039436 Aug 13  2009 ./extra/aspell-word-lists/aspell-nb-0.50.1_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Aug 13  2009 ./extra/aspell-word-lists/aspell-nb-0.50.1_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       206 Oct  3  2008 ./extra/aspell-word-lists/aspell-nds-0.01_0-noarch-4.txt
+-rw-r--r--  1 root root     39836 Oct  3  2008 ./extra/aspell-word-lists/aspell-nds-0.01_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-nds-0.01_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       167 Oct  3  2008 ./extra/aspell-word-lists/aspell-nl-0.50_2-noarch-4.txt
+-rw-r--r--  1 root root   1495132 Oct  3  2008 ./extra/aspell-word-lists/aspell-nl-0.50_2-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-nl-0.50_2-noarch-4.txz.asc
+-rw-r--r--  1 root root       179 Oct  3  2008 ./extra/aspell-word-lists/aspell-nn-0.50.1_1-noarch-4.txt
+-rw-r--r--  1 root root   1907332 Oct  3  2008 ./extra/aspell-word-lists/aspell-nn-0.50.1_1-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-nn-0.50.1_1-noarch-4.txz.asc
+-rw-r--r--  1 root root       171 Oct  3  2008 ./extra/aspell-word-lists/aspell-no-0.50_2-noarch-4.txt
+-rw-r--r--  1 root root   1250336 Oct  3  2008 ./extra/aspell-word-lists/aspell-no-0.50_2-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-no-0.50_2-noarch-4.txz.asc
+-rw-r--r--  1 root root       176 Oct  3  2008 ./extra/aspell-word-lists/aspell-ny-0.01_0-noarch-4.txt
+-rw-r--r--  1 root root     40792 Oct  3  2008 ./extra/aspell-word-lists/aspell-ny-0.01_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-ny-0.01_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       191 Oct  3  2008 ./extra/aspell-word-lists/aspell-or-0.03_1-noarch-4.txt
+-rw-r--r--  1 root root     14948 Oct  3  2008 ./extra/aspell-word-lists/aspell-or-0.03_1-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-or-0.03_1-noarch-4.txz.asc
+-rw-r--r--  1 root root       196 Oct  3  2008 ./extra/aspell-word-lists/aspell-pa-0.01_1-noarch-4.txt
+-rw-r--r--  1 root root     21904 Oct  3  2008 ./extra/aspell-word-lists/aspell-pa-0.01_1-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-pa-0.01_1-noarch-4.txz.asc
+-rw-r--r--  1 root root       168 Oct  3  2008 ./extra/aspell-word-lists/aspell-pl-0.51_0-noarch-4.txt
+-rw-r--r--  1 root root  13943900 Oct  3  2008 ./extra/aspell-word-lists/aspell-pl-0.51_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-pl-0.51_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       172 Oct  3  2008 ./extra/aspell-word-lists/aspell-pt-0.50_2-noarch-4.txt
+-rw-r--r--  1 root root   2279084 Oct  3  2008 ./extra/aspell-word-lists/aspell-pt-0.50_2-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-pt-0.50_2-noarch-4.txz.asc
+-rw-r--r--  1 root root       246 Jun 22  2009 ./extra/aspell-word-lists/aspell-pt_BR-20080707_0-noarch-4.txt
+-rw-r--r--  1 root root   2450800 Jun 22  2009 ./extra/aspell-word-lists/aspell-pt_BR-20080707_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Jun 22  2009 ./extra/aspell-word-lists/aspell-pt_BR-20080707_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       196 Oct  3  2008 ./extra/aspell-word-lists/aspell-qu-0.02_0-noarch-4.txt
+-rw-r--r--  1 root root    303040 Oct  3  2008 ./extra/aspell-word-lists/aspell-qu-0.02_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-qu-0.02_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       170 Oct  3  2008 ./extra/aspell-word-lists/aspell-ro-0.50_2-noarch-4.txt
+-rw-r--r--  1 root root    281784 Oct  3  2008 ./extra/aspell-word-lists/aspell-ro-0.50_2-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-ro-0.50_2-noarch-4.txz.asc
+-rw-r--r--  1 root root       192 Oct  3  2008 ./extra/aspell-word-lists/aspell-ru-0.99f7_1-noarch-4.txt
+-rw-r--r--  1 root root   1425980 Oct  3  2008 ./extra/aspell-word-lists/aspell-ru-0.99f7_1-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-ru-0.99f7_1-noarch-4.txz.asc
+-rw-r--r--  1 root root       173 Oct  3  2008 ./extra/aspell-word-lists/aspell-rw-0.50_0-noarch-4.txt
+-rw-r--r--  1 root root     37644 Oct  3  2008 ./extra/aspell-word-lists/aspell-rw-0.50_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-rw-0.50_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       171 Oct  3  2008 ./extra/aspell-word-lists/aspell-sc-1.0-noarch-4.txt
+-rw-r--r--  1 root root   4911444 Oct  3  2008 ./extra/aspell-word-lists/aspell-sc-1.0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-sc-1.0-noarch-4.txz.asc
+-rw-r--r--  1 root root       168 Oct  3  2008 ./extra/aspell-word-lists/aspell-sk-0.52_0-noarch-4.txt
+-rw-r--r--  1 root root   4641936 Oct  3  2008 ./extra/aspell-word-lists/aspell-sk-0.52_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-sk-0.52_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       171 Oct  3  2008 ./extra/aspell-word-lists/aspell-sl-0.50_0-noarch-4.txt
+-rw-r--r--  1 root root   5272152 Oct  3  2008 ./extra/aspell-word-lists/aspell-sl-0.50_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-sl-0.50_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       190 Oct  3  2008 ./extra/aspell-word-lists/aspell-sr-0.02-noarch-4.txt
+-rw-r--r--  1 root root   3705620 Oct  3  2008 ./extra/aspell-word-lists/aspell-sr-0.02-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-sr-0.02-noarch-4.txz.asc
+-rw-r--r--  1 root root       169 Oct  3  2008 ./extra/aspell-word-lists/aspell-sv-0.51_0-noarch-4.txt
+-rw-r--r--  1 root root    985180 Oct  3  2008 ./extra/aspell-word-lists/aspell-sv-0.51_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-sv-0.51_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       169 Oct  3  2008 ./extra/aspell-word-lists/aspell-sw-0.50_0-noarch-4.txt
+-rw-r--r--  1 root root    301120 Oct  3  2008 ./extra/aspell-word-lists/aspell-sw-0.50_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-sw-0.50_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       191 Oct  3  2008 ./extra/aspell-word-lists/aspell-ta-20040424_1-noarch-4.txt
+-rw-r--r--  1 root root     99988 Oct  3  2008 ./extra/aspell-word-lists/aspell-ta-20040424_1-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-ta-20040424_1-noarch-4.txz.asc
+-rw-r--r--  1 root root       195 Oct  3  2008 ./extra/aspell-word-lists/aspell-te-0.01_2-noarch-4.txt
+-rw-r--r--  1 root root    906648 Oct  3  2008 ./extra/aspell-word-lists/aspell-te-0.01_2-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-te-0.01_2-noarch-4.txz.asc
+-rw-r--r--  1 root root       179 Oct  3  2008 ./extra/aspell-word-lists/aspell-tet-0.1.1-noarch-4.txt
+-rw-r--r--  1 root root     65792 Oct  3  2008 ./extra/aspell-word-lists/aspell-tet-0.1.1-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-tet-0.1.1-noarch-4.txz.asc
+-rw-r--r--  1 root root       175 Oct  3  2008 ./extra/aspell-word-lists/aspell-tl-0.02_1-noarch-4.txt
+-rw-r--r--  1 root root     97512 Oct  3  2008 ./extra/aspell-word-lists/aspell-tl-0.02_1-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-tl-0.02_1-noarch-4.txz.asc
+-rw-r--r--  1 root root       176 Oct  3  2008 ./extra/aspell-word-lists/aspell-tn-1.0.1_0-noarch-4.txt
+-rw-r--r--  1 root root     42928 Oct  3  2008 ./extra/aspell-word-lists/aspell-tn-1.0.1_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-tn-1.0.1_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       169 Oct  3  2008 ./extra/aspell-word-lists/aspell-tr-0.50_0-noarch-4.txt
+-rw-r--r--  1 root root    494344 Oct  3  2008 ./extra/aspell-word-lists/aspell-tr-0.50_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-tr-0.50_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       171 Oct  3  2008 ./extra/aspell-word-lists/aspell-uk-0.51_0-noarch-4.txt
+-rw-r--r--  1 root root   4719068 Oct  3  2008 ./extra/aspell-word-lists/aspell-uk-0.51_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-uk-0.51_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       200 Oct  3  2008 ./extra/aspell-word-lists/aspell-uk-1.1_0-noarch-4.txt
+-rw-r--r--  1 root root    527632 Oct  3  2008 ./extra/aspell-word-lists/aspell-uk-1.1_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-uk-1.1_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       190 Oct  3  2008 ./extra/aspell-word-lists/aspell-uz-0.5_0-noarch-4.txt
+-rw-r--r--  1 root root    235116 Oct  3  2008 ./extra/aspell-word-lists/aspell-uz-0.5_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-uz-0.5_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       193 Oct  3  2008 ./extra/aspell-word-lists/aspell-vi-0.01.1_1-noarch-4.txt
+-rw-r--r--  1 root root     42408 Oct  3  2008 ./extra/aspell-word-lists/aspell-vi-0.01.1_1-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-vi-0.01.1_1-noarch-4.txz.asc
+-rw-r--r--  1 root root       169 Oct  3  2008 ./extra/aspell-word-lists/aspell-wa-0.50_0-noarch-4.txt
+-rw-r--r--  1 root root    647916 Oct  3  2008 ./extra/aspell-word-lists/aspell-wa-0.50_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-wa-0.50_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       190 Oct  3  2008 ./extra/aspell-word-lists/aspell-yi-0.01.1_1-noarch-4.txt
+-rw-r--r--  1 root root    396496 Oct  3  2008 ./extra/aspell-word-lists/aspell-yi-0.01.1_1-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-yi-0.01.1_1-noarch-4.txz.asc
+-rw-r--r--  1 root root       166 Oct  3  2008 ./extra/aspell-word-lists/aspell-zu-0.50_0-noarch-4.txt
+-rw-r--r--  1 root root    489764 Oct  3  2008 ./extra/aspell-word-lists/aspell-zu-0.50_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./extra/aspell-word-lists/aspell-zu-0.50_0-noarch-4.txz.asc
+drwxr-xr-x  2 root root      4096 Apr 20 04:47 ./extra/bash-completion
+-rw-r--r--  1 root root       669 Apr 20 02:28 ./extra/bash-completion/bash-completion-1.3-noarch-4.txt
+-rw-r--r--  1 root root    122524 Apr 20 02:28 ./extra/bash-completion/bash-completion-1.3-noarch-4.txz
+-rw-r--r--  1 root root       198 Apr 20 02:28 ./extra/bash-completion/bash-completion-1.3-noarch-4.txz.asc
+drwxr-xr-x  2 root root      4096 May 14  2010 ./extra/bittornado
+-rw-r--r--  1 root root       444 May 13  2010 ./extra/bittornado/bittornado-0.3.18-noarch-2.txt
+-rw-r--r--  1 root root    235960 May 13  2010 ./extra/bittornado/bittornado-0.3.18-noarch-2.txz
+-rw-r--r--  1 root root       198 May 13  2010 ./extra/bittornado/bittornado-0.3.18-noarch-2.txz.asc
+drwxr-xr-x  2 root root      4096 May 19  2009 ./extra/bittorrent
+-rw-r--r--  1 root root      1279 Feb  8  2006 ./extra/bittorrent/README
+-rw-r--r--  1 root root       613 May  1  2009 ./extra/bittorrent/bittorrent-4.4.0-noarch-3.txt
+-rw-r--r--  1 root root    336536 May  1  2009 ./extra/bittorrent/bittorrent-4.4.0-noarch-3.txz
+-rw-r--r--  1 root root       197 May  1  2009 ./extra/bittorrent/bittorrent-4.4.0-noarch-3.txz.asc
+drwxr-xr-x  2 root root      4096 May 14  2010 ./extra/brltty
+-rw-r--r--  1 root root       326 May 11  2010 ./extra/brltty/brltty-4.2-x86_64-1.txt
+-rw-r--r--  1 root root    973460 May 11  2010 ./extra/brltty/brltty-4.2-x86_64-1.txz
+-rw-r--r--  1 root root       198 May 11  2010 ./extra/brltty/brltty-4.2-x86_64-1.txz.asc
+drwxr-xr-x  2 root root      4096 Mar 12 21:21 ./extra/emacspeak
+-rw-r--r--  1 root root       665 Mar 12 20:46 ./extra/emacspeak/emacspeak-33.0-x86_64-1.txt
+-rw-r--r--  1 root root   5731676 Mar 12 20:46 ./extra/emacspeak/emacspeak-33.0-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar 12 20:46 ./extra/emacspeak/emacspeak-33.0-x86_64-1.txz.asc
+lrwxrwxrwx  1 root root        25 Aug 23  2009 ./extra/flashplayer-plugin -> source/flashplayer-plugin
+drwxr-xr-x  2 root root      4096 Apr 24 03:36 ./extra/fvwm-2.6.1
+-rw-r--r--  1 root root       368 Apr 24 01:27 ./extra/fvwm-2.6.1/fvwm-2.6.1-x86_64-1.txt
+-rw-r--r--  1 root root   1517896 Apr 24 01:27 ./extra/fvwm-2.6.1/fvwm-2.6.1-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr 24 01:27 ./extra/fvwm-2.6.1/fvwm-2.6.1-x86_64-1.txz.asc
+drwxr-xr-x  2 root root      4096 Apr  3 06:05 ./extra/google-chrome
+-rw-r--r--  1 root root       249 Mar 22 05:21 ./extra/google-chrome/GConf-2.32.1-x86_64-1.txt
+-rw-r--r--  1 root root    901148 Mar 22 05:21 ./extra/google-chrome/GConf-2.32.1-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar 22 05:21 ./extra/google-chrome/GConf-2.32.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       522 Mar 22 05:15 ./extra/google-chrome/ORBit2-2.14.19-x86_64-1.txt
+-rw-r--r--  1 root root    289336 Mar 22 05:15 ./extra/google-chrome/ORBit2-2.14.19-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar 22 05:15 ./extra/google-chrome/ORBit2-2.14.19-x86_64-1.txz.asc
+-rw-r--r--  1 root root      1723 Apr  3 05:19 ./extra/google-chrome/README
+-rw-r--r--  1 root root       714 Apr  3 05:15 ./extra/google-chrome/google-chrome-pam-solibs-1.1.3-x86_64-1.txt
+-rw-r--r--  1 root root     20068 Apr  3 05:15 ./extra/google-chrome/google-chrome-pam-solibs-1.1.3-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr  3 05:15 ./extra/google-chrome/google-chrome-pam-solibs-1.1.3-x86_64-1.txz.asc
+-rwxr-xr-x  1 root root      3874 Mar 22 05:24 ./extra/google-chrome/google-chrome.SlackBuild
+-rw-r--r--  1 root root       844 Mar 22 05:07 ./extra/google-chrome/slack-desc
+drwxr-xr-x  2 root root      4096 Apr 24 03:36 ./extra/jdk-6
+-rw-r--r--  1 root root       367 Apr 24 03:04 ./extra/jdk-6/jdk-6u25-x86_64-1.txt
+-rw-r--r--  1 root root  72633772 Apr 24 03:04 ./extra/jdk-6/jdk-6u25-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr 24 03:04 ./extra/jdk-6/jdk-6u25-x86_64-1.txz.asc
+drwxr-xr-x  2 root root      4096 May 19  2009 ./extra/mplayerplug-in
+-rw-r--r--  1 root root       534 May 19  2009 ./extra/mplayerplug-in/mplayerplug-in-3.55-x86_64-1.txt
+-rw-r--r--  1 root root    176148 May 19  2009 ./extra/mplayerplug-in/mplayerplug-in-3.55-x86_64-1.txz
+-rw-r--r--  1 root root       197 May 19  2009 ./extra/mplayerplug-in/mplayerplug-in-3.55-x86_64-1.txz.asc
+drwxr-xr-x  2 root root      4096 May  3  2010 ./extra/partitionmanager
+-rw-r--r--  1 root root       391 May  3  2010 ./extra/partitionmanager/partitionmanager-1.0.2-x86_64-1.txt
+-rw-r--r--  1 root root    423800 May  3  2010 ./extra/partitionmanager/partitionmanager-1.0.2-x86_64-1.txz
+-rw-r--r--  1 root root       198 May  3  2010 ./extra/partitionmanager/partitionmanager-1.0.2-x86_64-1.txz.asc
+drwxr-xr-x  2 root root      4096 May 19  2009 ./extra/recordmydesktop
+-rw-r--r--  1 root root       675 May 12  2009 ./extra/recordmydesktop/recordmydesktop-0.3.8.1-x86_64-2.txt
+-rw-r--r--  1 root root    128724 May 12  2009 ./extra/recordmydesktop/recordmydesktop-0.3.8.1-x86_64-2.txz
+-rw-r--r--  1 root root       197 May 12  2009 ./extra/recordmydesktop/recordmydesktop-0.3.8.1-x86_64-2.txz.asc
+drwxr-xr-x 19 root root      4096 Apr 24 01:24 ./extra/source
+drwxr-xr-x  2 root root      4096 Mar  6 18:15 ./extra/source/GConf
+-rw-r--r--  1 root root   1300408 Nov 10 14:19 ./extra/source/GConf/GConf-2.32.1.tar.xz
+-rwxr-xr-x  1 root root      3646 Mar 22 05:17 ./extra/source/GConf/GConf.SlackBuild
+-rw-r--r--  1 root root       107 Sep 28  2010 ./extra/source/GConf/GConf.url
+-rw-r--r--  1 root root       278 Oct 12  2010 ./extra/source/GConf/doinst.sh.gz
+-rw-r--r--  1 root root       706 Mar 22 05:20 ./extra/source/GConf/slack-desc
+drwxr-xr-x  2 root root      4096 Mar 22 05:12 ./extra/source/ORBit2
+-rw-r--r--  1 root root    632956 Sep 28  2010 ./extra/source/ORBit2/ORBit2-2.14.19.tar.xz
+-rwxr-xr-x  1 root root      3297 Mar 22 05:14 ./extra/source/ORBit2/ORBit2.SlackBuild
+-rw-r--r--  1 root root       111 Sep 28  2010 ./extra/source/ORBit2/ORBit2.url
+-rw-r--r--  1 root root       979 May 16  2010 ./extra/source/ORBit2/slack-desc
+drwxr-xr-x  3 root root      4096 Mar 22 03:01 ./extra/source/bash-completion
+-rw-r--r--  1 root root    211899 Feb  6 19:35 ./extra/source/bash-completion/bash-completion-1.3.tar.bz2
+-rwxr-xr-x  1 root root      3390 Apr 19 14:02 ./extra/source/bash-completion/bash-completion.SlackBuild
+-rw-r--r--  1 root root       115 Feb  7 03:53 ./extra/source/bash-completion/bash_completion.sh.gz
+drwxr-xr-x  2 root root      4096 Apr 19 14:01 ./extra/source/bash-completion/contrib
+-rw-r--r--  1 root root      2767 Apr 19 14:00 ./extra/source/bash-completion/contrib/pkgtools
+-rw-r--r--  1 root root       364 Apr 19 14:01 ./extra/source/bash-completion/contrib/rpm2tgz
+-rw-r--r--  1 root root      1811 Apr 19 14:01 ./extra/source/bash-completion/contrib/sbopkg
+-rw-r--r--  1 root root      3092 Apr 19 14:01 ./extra/source/bash-completion/contrib/slackpkg
+-rw-r--r--  1 root root      3901 Apr 19 14:01 ./extra/source/bash-completion/contrib/slapt
+-rw-r--r--  1 root root       458 Mar 22 03:01 ./extra/source/bash-completion/fixup-sh-script-completions.diff.gz
+-rw-r--r--  1 root root      1135 Jul 15  2009 ./extra/source/bash-completion/slack-desc
+drwxr-xr-x  2 root root      4096 Feb 10  2007 ./extra/source/bittornado
+-rw-r--r--  1 root root    159270 Dec 23  2006 ./extra/source/bittornado/BitTornado-0.3.18.tar.bz2
+-rwxr-xr-x  1 root root      1026 May 13  2010 ./extra/source/bittornado/bittornado.SlackBuild
+-rw-r--r--  1 root root       913 Jul 14  2005 ./extra/source/bittornado/btdownloadxterm.sh.gz
+-rw-r--r--  1 root root       283 Feb  8  2006 ./extra/source/bittornado/doinst.sh.gz
+-rw-r--r--  1 root root       905 Jan  4  2005 ./extra/source/bittornado/slack-desc
+drwxr-xr-x  2 root root      4096 May 19  2009 ./extra/source/bittorrent
+-rw-r--r--  1 root root    678768 Jan 31  2006 ./extra/source/bittorrent/BitTorrent-4.4.0.tar.bz2
+-rw-r--r--  1 root root       940 Feb  8  2006 ./extra/source/bittorrent/bittorrent-xterm.sh.gz
+-rwxr-xr-x  1 root root      2473 May 19  2009 ./extra/source/bittorrent/bittorrent.SlackBuild
+-rw-r--r--  1 root root       270 Feb  8  2006 ./extra/source/bittorrent/doinst.sh.gz
+-rw-r--r--  1 root root      1074 Sep 21  2003 ./extra/source/bittorrent/slack-desc
+drwxr-xr-x  2 root root      4096 May 11  2010 ./extra/source/brltty
+-rw-r--r--  1 root root   1328272 May 10  2010 ./extra/source/brltty/brltty-4.2.tar.xz
+-rwxr-xr-x  1 root root      4010 May 11  2010 ./extra/source/brltty/brltty.SlackBuild
+-rw-r--r--  1 root root       783 Jun  7  2002 ./extra/source/brltty/slack-desc
+drwxr-xr-x  2 root root      4096 Mar 12 20:44 ./extra/source/emacspeak
+-rw-r--r--  1 root root   5609520 Nov 24 18:18 ./extra/source/emacspeak/emacspeak-33.0.tar.xz
+-rwxr-xr-x  1 root root      4438 Mar 12 20:44 ./extra/source/emacspeak/emacspeak.SlackBuild
+-rw-r--r--  1 root root       513 Mar 12 20:43 ./extra/source/emacspeak/emacspeak.tcl8.5.diff.gz
+-rw-r--r--  1 root root      1125 Jun  7  2002 ./extra/source/emacspeak/slack-desc
+drwxr-xr-x  2 root root      4096 Mar  8 23:06 ./extra/source/flashplayer-plugin
+-rwxr-xr--  1 root root      6838 Dec  1 19:14 ./extra/source/flashplayer-plugin/flashplayer-plugin.SlackBuild
+-rw-r--r--  1 root root      1017 Dec 16  2008 ./extra/source/flashplayer-plugin/slack-desc
+drwxr-xr-x  2 root root      4096 Apr 24 01:18 ./extra/source/fvwm-2.6.1
+-rw-r--r--  1 root root       296 Apr 24 01:11 ./extra/source/fvwm-2.6.1/doinst.sh.gz
+-rw-r--r--  1 root root   2094260 Apr 16 21:30 ./extra/source/fvwm-2.6.1/fvwm-2.6.1.tar.xz
+-rwxr-xr-x  1 root root      3955 Apr 24 01:27 ./extra/source/fvwm-2.6.1/fvwm.SlackBuild
+-rw-r--r--  1 root root       823 Apr 24 01:16 ./extra/source/fvwm-2.6.1/slack-desc
+-rw-r--r--  1 root root       344 Dec 21 04:04 ./extra/source/fvwm-2.6.1/xinitrc.fvwm2.gz
+drwxr-xr-x  2 root root      4096 May 19  2009 ./extra/source/grub
+-rw-r--r--  1 root root      7697 Mar 14  2009 ./extra/source/grub/grub-0.97-x86_64.patch.gz
+-rw-r--r--  1 root root    971783 Jul 31  2005 ./extra/source/grub/grub-0.97.tar.gz
+-rw-r--r--  1 root root        65 May  8  2005 ./extra/source/grub/grub-0.97.tar.gz.sig
+-rwxr-xr-x  1 root root      3549 May 19  2009 ./extra/source/grub/grub.SlackBuild
+-rw-r--r--  1 root root      1746 Mar  5  2008 ./extra/source/grub/grub_support_256byte_inode.patch.gz
+-rw-r--r--  1 root root     11715 Mar 25  2006 ./extra/source/grub/grubconfig-1.28.tar.gz
+-rw-r--r--  1 root root       466 Jun  6  2007 ./extra/source/grub/grubconfig_localefix.patch.gz
+-rw-r--r--  1 root root       959 Sep  1  2005 ./extra/source/grub/slack-desc
+drwxr-xr-x  3 root root      4096 Apr 24 03:05 ./extra/source/jdk-6
+-r--r--r--  1 root root      3339 Apr 14 08:51 ./extra/source/jdk-6/COPYRIGHT
+-rw-r--r--  1 root root       265 Dec 19 00:08 ./extra/source/jdk-6/HOWTO-BUILD-TXZ
+-r--r--r--  1 root root        40 Apr 14 08:51 ./extra/source/jdk-6/LICENSE
+-r--r--r--  1 root root       115 Apr 14 08:51 ./extra/source/jdk-6/README.html
+-r--r--r--  1 root root        50 Apr 14 08:51 ./extra/source/jdk-6/THIRDPARTYLICENSEREADME.txt
+-rwxr-xr-x  1 root root      3906 Apr 24 03:00 ./extra/source/jdk-6/jdk.SlackBuild
+drwxr-xr-x  2 root root      4096 Sep  1  2007 ./extra/source/jdk-6/profile.d
+-rwxr-xr-x  1 root root       143 Aug 29  2007 ./extra/source/jdk-6/profile.d/jdk.csh
+-rwxr-xr-x  1 root root       146 Aug 29  2007 ./extra/source/jdk-6/profile.d/jdk.sh
+-r--r--r--  1 root root      5297 Apr 24 03:00 ./extra/source/jdk-6/register.html
+-r--r--r--  1 root root      6743 Apr 24 03:00 ./extra/source/jdk-6/register_ja.html
+-r--r--r--  1 root root      4900 Apr 24 03:00 ./extra/source/jdk-6/register_zh_CN.html
+-rw-r--r--  1 root root       822 Dec 18 23:16 ./extra/source/jdk-6/slack-desc
+drwxr-xr-x  2 root root      4096 May 19  2009 ./extra/source/mplayerplug-in
+-rw-r--r--  1 root root    281845 Jun 24  2008 ./extra/source/mplayerplug-in/mplayerplug-in-3.55.tar.gz
+-rwxr-xr--  1 root root      8298 May 19  2009 ./extra/source/mplayerplug-in/mplayerplug-in.SlackBuild
+-rw-r--r--  1 root root       999 Nov  6  2006 ./extra/source/mplayerplug-in/slack-desc
+drwxr-xr-x  3 root root      4096 Apr  3 05:16 ./extra/source/pam
+-rw-r--r--  1 root root    863472 Oct 28 14:19 ./extra/source/pam/Linux-PAM-1.1.3.tar.xz
+-rwxr-xr-x  1 root root      3514 Apr  3 05:15 ./extra/source/pam/make-pam-solibs-for-chrome.sh
+-rw-rw-r--  1 root root     36304 Dec 16  2008 ./extra/source/pam/pam-redhat-0.99.10-1.tar.bz2
+-rwxr-xr-x  1 root root      5966 Apr  3 04:43 ./extra/source/pam/pam.SlackBuild
+drwxr-xr-x  2 root root      4096 Apr  3 04:29 ./extra/source/pam/patches
+-rw-r--r--  1 root root       508 Feb  8 14:09 ./extra/source/pam/patches/pam-1.0.90-redhat-modules.patch.gz
+-rw-r--r--  1 root root       947 Feb  8 14:09 ./extra/source/pam/patches/pam-1.0.91-std-noclose.patch.gz
+-rw-r--r--  1 root root       354 Feb  8 14:09 ./extra/source/pam/patches/pam-1.1.0-notally.patch.gz
+-rw-r--r--  1 root root     11569 Feb  8 14:09 ./extra/source/pam/patches/pam-1.1.1-faillock.patch.gz
+-rw-r--r--  1 root root       443 Feb  8 14:09 ./extra/source/pam/patches/pam-1.1.2-noflex.patch.gz
+-rw-r--r--  1 root root      1893 Feb  8 14:09 ./extra/source/pam/patches/pam-1.1.3-faillock-screensaver.patch.gz
+-rw-r--r--  1 root root       976 Feb  8 14:09 ./extra/source/pam/patches/pam-1.1.3-limits-nosetreuid.patch.gz
+-rw-r--r--  1 root root      3174 Feb  8 14:09 ./extra/source/pam/patches/pam-1.1.3-limits-range.patch.gz
+-rw-r--r--  1 root root       487 Feb  8 14:09 ./extra/source/pam/patches/pam-1.1.3-nouserenv.patch.gz
+-rw-r--r--  1 root root       667 Feb  8 14:09 ./extra/source/pam/patches/pam-1.1.3-pwhistory-incomplete.patch.gz
+-rw-r--r--  1 root root      1590 Feb  8 14:09 ./extra/source/pam/patches/pam-1.1.3-securetty-console.patch.gz
+-rw-r--r--  1 root root       896 Apr  3 03:08 ./extra/source/pam/slack-desc
+drwxr-xr-x  2 root root      4096 May  3  2010 ./extra/source/partitionmanager
+-rw-r--r--  1 root root       118 Dec 24  2007 ./extra/source/partitionmanager/doinst.sh.gz
+-rw-r--r--  1 root root    292808 Apr 24  2010 ./extra/source/partitionmanager/partitionmanager-1.0.2.tar.xz
+-rwxr-xr-x  1 root root      3258 May  3  2010 ./extra/source/partitionmanager/partitionmanager.SlackBuild
+-rw-r--r--  1 root root       852 Jan 13  2009 ./extra/source/partitionmanager/slack-desc
+drwxr-xr-x  2 root root      4096 May 19  2009 ./extra/source/recordmydesktop
+-rw-r--r--  1 root root    185528 Nov 23  2008 ./extra/source/recordmydesktop/qt-recordmydesktop-0.3.8.tar.gz
+-rw-r--r--  1 root root    198732 Dec 13  2008 ./extra/source/recordmydesktop/recordmydesktop-0.3.8.1.tar.gz
+-rwxr-xr--  1 root root      8324 May 19  2009 ./extra/source/recordmydesktop/recordmydesktop.SlackBuild
+-rw-r--r--  1 root root      1140 Feb 19  2010 ./extra/source/recordmydesktop/slack-desc
+drwxr-xr-x  2 root root      4096 Jun  3  2009 ./extra/source/tightvnc
+-rw-r--r--  1 root root      8109 Jun  2  2009 ./extra/source/tightvnc/_tightvnc.tar.gz
+-rw-r--r--  1 root root       387 Jun  2  2009 ./extra/source/tightvnc/doinst.sh.gz
+-rw-r--r--  1 root root       989 Dec  4  2008 ./extra/source/tightvnc/slack-desc
+-rw-r--r--  1 root root   1549080 Mar  6  2009 ./extra/source/tightvnc/tightvnc-1.3.10_unixsrc.tar.xz
+-rwxr-xr--  1 root root      4093 Jun 14  2009 ./extra/source/tightvnc/tightvnc.SlackBuild
+-rw-r--r--  1 root root       728 Jun  2  2009 ./extra/source/tightvnc/tightvnc.paths-and-perms.diff.gz
+drwxr-xr-x  2 root root      4096 Apr  2  2010 ./extra/source/wicd
+-rw-r--r--  1 root root       775 Jun 21  2009 ./extra/source/wicd/README.SLACKWARE
+-rw-r--r--  1 root root       500 May 30  2009 ./extra/source/wicd/doinst.sh.gz
+-rw-r--r--  1 root root       863 Jun  5  2009 ./extra/source/wicd/slack-desc
+-rw-r--r--  1 root root       439 Apr  2  2010 ./extra/source/wicd/wicd-1.7.0-fix_EAP_fast_typo.diff.gz
+-rw-r--r--  1 root root       475 Apr  2  2010 ./extra/source/wicd/wicd-1.7.0-fix_script_bug.diff.gz
+-rw-r--r--  1 root root    411166 Jan 15  2010 ./extra/source/wicd/wicd-1.7.0.tar.bz2
+-rwxr-xr-x  1 root root      3091 Apr  2  2010 ./extra/source/wicd/wicd.SlackBuild
+drwxr-xr-x  2 root root      4096 Jun  3  2009 ./extra/tightvnc
+-rw-r--r--  1 root root       530 Jun  3  2009 ./extra/tightvnc/tightvnc-1.3.10-x86_64-1.txt
+-rw-r--r--  1 root root    777368 Jun  3  2009 ./extra/tightvnc/tightvnc-1.3.10-x86_64-1.txz
+-rw-r--r--  1 root root       197 Jun  3  2009 ./extra/tightvnc/tightvnc-1.3.10-x86_64-1.txz.asc
+drwxr-xr-x  2 root root      4096 Apr 30  2010 ./extra/wicd
+-rw-r--r--  1 root root       775 Jun 21  2009 ./extra/wicd/README.SLACKWARE
+-rw-r--r--  1 root root       407 Apr 30  2010 ./extra/wicd/wicd-1.7.0-x86_64-2.txt
+-rw-r--r--  1 root root    356948 Apr 30  2010 ./extra/wicd/wicd-1.7.0-x86_64-2.txz
+-rw-r--r--  1 root root       198 Apr 30  2010 ./extra/wicd/wicd-1.7.0-x86_64-2.txz.asc
+drwxr-xr-x  2 root root      4096 Jan 31 03:46 ./extra/xf86-video-nouveau-blacklist
+-rw-r--r--  1 root root       645 Apr 27  2010 ./extra/xf86-video-nouveau-blacklist/xf86-video-nouveau-blacklist-noarch-1.txt
+-rw-r--r--  1 root root       880 Apr 27  2010 ./extra/xf86-video-nouveau-blacklist/xf86-video-nouveau-blacklist-noarch-1.txz
+-rw-r--r--  1 root root       198 Apr 27  2010 ./extra/xf86-video-nouveau-blacklist/xf86-video-nouveau-blacklist-noarch-1.txz.asc
+drwxr-xr-x  3 root root      4096 Apr 23 21:44 ./isolinux
+-rw-r--r--  1 root root      5103 Apr 14 19:33 ./isolinux/README.TXT
+-rw-r--r--  1 root root       788 Mar 17  2007 ./isolinux/README_SPLIT.TXT
+-rw-r--r--  1 root root       470 Mar 23 23:53 ./isolinux/f2.txt
+-rw-r--r--  1 root root  16133793 Apr 23 21:43 ./isolinux/initrd.img
+-rw-r--r--  1 root root        50 Jan 18  2003 ./isolinux/iso.sort
+-rw-r--r--  1 root root     14336 Jan 19  2010 ./isolinux/isolinux.bin
+-rw-r--r--  1 root root       417 Mar 25 03:15 ./isolinux/isolinux.cfg
+-rw-r--r--  1 root root       645 Apr  7 22:29 ./isolinux/message.txt
+drwxr-xr-x  2 root root      4096 Mar 17  2003 ./isolinux/sbootmgr
+-rwxr-xr-x  1 root root     36064 May 12  1995 ./isolinux/sbootmgr/RAWRITE.EXE
+-rw-r--r--  1 root root      2138 Dec  1  1997 ./isolinux/sbootmgr/RAWRITE12.DOC
+-rwxr-xr-x  1 root root     13052 Dec  1  1997 ./isolinux/sbootmgr/RAWRITE12.EXE
+lrwxrwxrwx  1 root root        11 Aug 23  2009 ./isolinux/sbootmgr/RAWRITE13.EXE -> RAWRITE.EXE
+-rw-r--r--  1 root root      6170 Aug 29  2000 ./isolinux/sbootmgr/RAWRITENT.DOC
+-rwxr-xr-x  1 root root     24576 Aug 29  2000 ./isolinux/sbootmgr/RAWRITENT.EXE
+-rw-r--r--  1 root root      1291 Mar 17  2003 ./isolinux/sbootmgr/README.TXT
+-rw-r--r--  1 root root    110592 Mar 16  2003 ./isolinux/sbootmgr/sbootmgr.dsk
+-rw-r--r--  1 root root      2823 May  2  2005 ./isolinux/setpkg
+drwxr-xr-x  5 root root      4096 Apr 12 17:42 ./kernels
+-rw-r--r--  1 root root        41 Apr  7 22:20 ./kernels/VERSIONS.TXT
+drwxr-xr-x  2 root root      4096 Apr 10 03:50 ./kernels/huge.s
+-rw-r--r--  1 root root    575987 Apr 10 03:49 ./kernels/huge.s/System.map.gz
+-rw-r--r--  1 root root   5866144 Apr 10 03:49 ./kernels/huge.s/bzImage
+-rw-r--r--  1 root root    112298 Apr 10 03:43 ./kernels/huge.s/config
+drwxr-xr-x  2 root root      4096 Mar 25 03:15 ./kernels/memtest
+-rw-r--r--  1 root root        60 Mar 24 00:19 ./kernels/memtest/README
+-rw-r--r--  1 root root    164504 Mar 23 23:53 ./kernels/memtest/memtest
+drwxr-xr-x  2 root root      4096 Mar  2 22:16 ./kernels/speakup.s
+-rw-r--r--  1 root root       240 Mar  2 22:16 ./kernels/speakup.s/README.TXT
+drwxr-xr-x  3 root root      4096 Apr 16 04:36 ./pasture
+-rw-r--r--  1 root root      2769 Apr 16 04:36 ./pasture/CHECKSUMS.md5
+-rw-r--r--  1 root root       198 Apr 16 04:36 ./pasture/CHECKSUMS.md5.asc
+-rw-r--r--  1 root root      3734 Apr 16 04:36 ./pasture/FILE_LIST
+-rw-r--r--  1 root root     40638 Apr 16 04:36 ./pasture/MANIFEST.bz2
+-rw-r--r--  1 root root      2867 Apr 16 04:36 ./pasture/PACKAGES.TXT
+-rw-r--r--  1 root root       336 Nov 29 05:00 ./pasture/gxine-0.5.905-x86_64-1.txt
+-rw-r--r--  1 root root    370376 Nov 29 05:00 ./pasture/gxine-0.5.905-x86_64-1.txz
+-rw-r--r--  1 root root       198 Nov 29 05:00 ./pasture/gxine-0.5.905-x86_64-1.txz.asc
+-rw-r--r--  1 root root       468 Oct 12  2010 ./pasture/make-3.81-x86_64-3.txt
+-rw-r--r--  1 root root    383848 Oct 12  2010 ./pasture/make-3.81-x86_64-3.txz
+-rw-r--r--  1 root root       198 Oct 12  2010 ./pasture/make-3.81-x86_64-3.txz.asc
+-rw-r--r--  1 root root       335 Feb  4 03:58 ./pasture/mesa-7.8.2-x86_64-1.txt
+-rw-r--r--  1 root root   3918620 Feb  4 03:58 ./pasture/mesa-7.8.2-x86_64-1.txz
+-rw-r--r--  1 root root       198 Feb  4 03:58 ./pasture/mesa-7.8.2-x86_64-1.txz.asc
+drwxr-xr-x  7 root root      4096 Apr 16 03:04 ./pasture/source
+drwxr-xr-x  2 root root      4096 Nov 28 22:42 ./pasture/source/gxine
+-rw-r--r--  1 root root   1203720 Nov 28 22:42 ./pasture/source/gxine/gxine-0.5.905.tar.bz2
+-rwxr-xr-x  1 root root      3458 Nov 29 04:59 ./pasture/source/gxine/gxine.SlackBuild
+-rw-r--r--  1 root root       453 Feb  2  2006 ./pasture/source/gxine/gxine.desktop.gz
+-rw-r--r--  1 root root       792 Sep 23  2003 ./pasture/source/gxine/slack-desc
+drwxr-xr-x  2 root root      4096 May 19  2009 ./pasture/source/make
+-rw-r--r--  1 root root   1151445 Apr  1  2006 ./pasture/source/make/make-3.81.tar.bz2
+-rw-r--r--  1 root root        65 Apr  1  2006 ./pasture/source/make/make-3.81.tar.bz2.sig
+-rwxr-xr-x  1 root root      3119 Oct 12  2010 ./pasture/source/make/make.SlackBuild
+-rw-r--r--  1 root root       923 Mar 23  2002 ./pasture/source/make/slack-desc
+drwxr-xr-x  2 root root      4096 Nov  5 19:44 ./pasture/source/mesa-7.8.2
+-rw-r--r--  1 root root  14061000 Jun 17  2010 ./pasture/source/mesa-7.8.2/MesaDemos-7.8.2.tar.xz
+-rw-r--r--  1 root root    150144 Jun 17  2010 ./pasture/source/mesa-7.8.2/MesaGLUT-7.8.2.tar.xz
+-rw-r--r--  1 root root   4153012 Jun 17  2010 ./pasture/source/mesa-7.8.2/MesaLib-7.8.2.tar.xz
+-rw-r--r--  1 root root       352 Mar 10  2008 ./pasture/source/mesa-7.8.2/README.GIT
+-rw-r--r--  1 root root       301 Mar 10  2008 ./pasture/source/mesa-7.8.2/get-mesa.sh
+-rwxr-xr-x  1 root root      4390 Apr  9  2010 ./pasture/source/mesa-7.8.2/mesa.SlackBuild
+-rw-r--r--  1 root root        36 Dec  5  2009 ./pasture/source/mesa-7.8.2/mesa.url
+-rw-r--r--  1 root root       790 Feb  5  2007 ./pasture/source/mesa-7.8.2/slack-desc
+drwxr-xr-x  2 root root      4096 Feb  8 20:41 ./pasture/source/xf86-video-ati
+-rw-r--r--  1 root root    823096 Sep 27  2010 ./pasture/source/xf86-video-ati/xf86-video-ati-6.13.2.tar.xz
+drwxr-xr-x  2 root root      4096 Apr 16 03:03 ./pasture/source/xf86-video-intel
+-rw-r--r--  1 root root    767096 Jan  7 23:49 ./pasture/source/xf86-video-intel-2.14.0.tar.xz
+-rw-r--r--  1 root root       374 Nov 13 19:04 ./pasture/xf86-video-ati-6.13.2-x86_64-1.txt
+-rw-r--r--  1 root root    342244 Nov 13 19:04 ./pasture/xf86-video-ati-6.13.2-x86_64-1.txz
+-rw-r--r--  1 root root       198 Nov 13 19:04 ./pasture/xf86-video-ati-6.13.2-x86_64-1.txz.asc
+-rw-r--r--  1 root root       400 Feb  1 01:20 ./pasture/xf86-video-intel-2.14.0-x86_64-1.txt
+-rw-r--r--  1 root root    194652 Feb  1 01:20 ./pasture/xf86-video-intel-2.14.0-x86_64-1.txz
+-rw-r--r--  1 root root       198 Feb  1 01:20 ./pasture/xf86-video-intel-2.14.0-x86_64-1.txz.asc
+drwxr-xr-x  2 root root      4096 May 18  2010 ./patches
+-rw-r--r--  1 root root       531 May 18  2010 ./patches/CHECKSUMS.md5
+-rw-r--r--  1 root root       198 May 18  2010 ./patches/CHECKSUMS.md5.asc
+-rw-r--r--  1 root root       575 May 18  2010 ./patches/FILE_LIST
+-rw-r--r--  1 root root        14 May 18  2010 ./patches/MANIFEST.bz2
+-rw-r--r--  1 root root       224 May 18  2010 ./patches/PACKAGES.TXT
+drwxr-xr-x  3 root root      4096 Sep 25  2006 ./slackbook
+drwxr-xr-x 11 root root      4096 Sep 25  2006 ./slackbook/html
+-rw-r--r--  1 root root      3259 May 12  2005 ./slackbook/html/TRADEMARKS.html
+-rw-r--r--  1 root root      4361 Apr 23  2005 ./slackbook/html/archive-files-bzip2.html
+-rw-r--r--  1 root root      9821 May 10  2005 ./slackbook/html/archive-files-tar.html
+-rw-r--r--  1 root root      3978 Apr 23  2005 ./slackbook/html/archive-files-zip.html
+-rw-r--r--  1 root root      5345 Apr 23  2005 ./slackbook/html/archive-files.html
+drwxr-xr-x  2 root root      4096 Sep 25  2006 ./slackbook/html/basic-network-commands
+-rw-r--r--  1 root root      6838 May 12  2005 ./slackbook/html/basic-network-commands-dns.html
+-rw-r--r--  1 root root      9768 May  5  2005 ./slackbook/html/basic-network-commands-email.html
+-rw-r--r--  1 root root      4453 May  5  2005 ./slackbook/html/basic-network-commands-finger.html
+-rw-r--r--  1 root root      9338 May 12  2005 ./slackbook/html/basic-network-commands-ftp.html
+-rw-r--r--  1 root root      3890 Apr 23  2005 ./slackbook/html/basic-network-commands-ssh.html
+-rw-r--r--  1 root root      6210 May 12  2005 ./slackbook/html/basic-network-commands-talk.html
+-rw-r--r--  1 root root      6298 May 12  2005 ./slackbook/html/basic-network-commands-telnet.html
+-rw-r--r--  1 root root      4092 May  5  2005 ./slackbook/html/basic-network-commands-traceroute.html
+-rw-r--r--  1 root root      7857 May 12  2005 ./slackbook/html/basic-network-commands-web.html
+-rw-r--r--  1 root root      5418 May 12  2005 ./slackbook/html/basic-network-commands.html
+-rw-r--r--  1 root root      3421 May  1  2005 ./slackbook/html/basic-network-commands/elm.png
+-rw-r--r--  1 root root      5204 May  1  2005 ./slackbook/html/basic-network-commands/links.png
+-rw-r--r--  1 root root      7544 May  1  2005 ./slackbook/html/basic-network-commands/lynx.png
+-rw-r--r--  1 root root      2489 May  1  2005 ./slackbook/html/basic-network-commands/mutt.png
+-rw-r--r--  1 root root      4689 May  1  2005 ./slackbook/html/basic-network-commands/pine.png
+-rw-r--r--  1 root root       491 May  1  2005 ./slackbook/html/basic-network-commands/talk.png
+-rw-r--r--  1 root root       952 May  1  2005 ./slackbook/html/basic-network-commands/ytalk.png
+-rw-r--r--  1 root root     13925 May  5  2005 ./slackbook/html/book-preface.html
+-rw-r--r--  1 root root    517269 May 12  2005 ./slackbook/html/book.html
+drwxr-xr-x  2 root root      4096 Sep 25  2006 ./slackbook/html/booting
+-rw-r--r--  1 root root     12607 May 12  2005 ./slackbook/html/booting-dual.html
+-rw-r--r--  1 root root      4110 Apr 23  2005 ./slackbook/html/booting-loadlin.html
+-rw-r--r--  1 root root      8952 May  5  2005 ./slackbook/html/booting.html
+-rw-r--r--  1 root root      6986 May  1  2005 ./slackbook/html/booting/setup-lilo-expert-w.png
+-rw-r--r--  1 root root      5824 May  1  2005 ./slackbook/html/booting/setup-lilo-w.png
+-rw-r--r--  1 root root      2950 Apr 24  2005 ./slackbook/html/docbook.css
+drwxr-xr-x  2 root root      4096 Sep 25  2006 ./slackbook/html/emacs
+-rw-r--r--  1 root root      7301 Apr 24  2005 ./slackbook/html/emacs-basic-editing.html
+-rw-r--r--  1 root root      4989 May  5  2005 ./slackbook/html/emacs-buffers.html
+-rw-r--r--  1 root root      6305 May  5  2005 ./slackbook/html/emacs-modes.html
+-rw-r--r--  1 root root      4466 May  5  2005 ./slackbook/html/emacs-saving-files.html
+-rw-r--r--  1 root root      7785 May 12  2005 ./slackbook/html/emacs.html
+-rw-r--r--  1 root root      7842 Apr 24  2005 ./slackbook/html/emacs/emacs.png
+-rw-r--r--  1 root root      9989 May  5  2005 ./slackbook/html/essential-sysadmin-hardusers.html
+-rw-r--r--  1 root root     10340 May  5  2005 ./slackbook/html/essential-sysadmin-shutdown.html
+-rw-r--r--  1 root root     18830 May  5  2005 ./slackbook/html/essential-sysadmin.html
+-rw-r--r--  1 root root      5492 May 12  2005 ./slackbook/html/file-commands-copymove.html
+-rw-r--r--  1 root root      4959 May 12  2005 ./slackbook/html/file-commands-creation.html
+-rw-r--r--  1 root root      6218 May 12  2005 ./slackbook/html/file-commands-deletion.html
+-rw-r--r--  1 root root      4034 Apr 25  2005 ./slackbook/html/file-commands-link.html
+-rw-r--r--  1 root root      5596 May 12  2005 ./slackbook/html/file-commands-output.html
+-rw-r--r--  1 root root      5798 May 12  2005 ./slackbook/html/file-commands-pagers.html
+-rw-r--r--  1 root root     10160 May 12  2005 ./slackbook/html/file-commands.html
+-rw-r--r--  1 root root      4506 Apr 25  2005 ./slackbook/html/filesystem-structure-links.html
+-rw-r--r--  1 root root      8053 May 12  2005 ./slackbook/html/filesystem-structure-mounting.html
+-rw-r--r--  1 root root      3139 Apr 15  2005 ./slackbook/html/filesystem-structure-nfs.html
+-rw-r--r--  1 root root     10810 May 12  2005 ./slackbook/html/filesystem-structure-permissions.html
+-rw-r--r--  1 root root      6249 May  5  2005 ./slackbook/html/filesystem-structure.html
+-rw-r--r--  1 root root     18013 May  5  2005 ./slackbook/html/glossary.html
+-rw-r--r--  1 root root     21544 May 12  2005 ./slackbook/html/gpl.html
+-rw-r--r--  1 root root      9377 Jun 20  2006 ./slackbook/html/help-online.html
+-rw-r--r--  1 root root     10039 May 12  2005 ./slackbook/html/help.html
+drwxr-xr-x  3 root root      4096 Sep 25  2006 ./slackbook/html/imagelib
+drwxr-xr-x  2 root root      4096 Sep 25  2006 ./slackbook/html/imagelib/admon
+-rw-r--r--  1 root root       338 Apr 24  2005 ./slackbook/html/imagelib/admon/note.png
+-rw-r--r--  1 root root      1090 Apr 24  2005 ./slackbook/html/imagelib/admon/warning.png
+-rw-r--r--  1 root root     27647 May 12  2005 ./slackbook/html/index.html
+drwxr-xr-x  2 root root      4096 Sep 25  2006 ./slackbook/html/installation
+-rw-r--r--  1 root root      9134 Apr 24  2005 ./slackbook/html/installation-partitioning.html
+-rw-r--r--  1 root root     13788 May 12  2005 ./slackbook/html/installation-requirements.html
+-rw-r--r--  1 root root     17913 May 12  2005 ./slackbook/html/installation-setup.html
+-rw-r--r--  1 root root      6196 May 12  2005 ./slackbook/html/installation.html
+-rw-r--r--  1 root root      4010 May  1  2005 ./slackbook/html/installation/setup-bootdisk-w.png
+-rw-r--r--  1 root root      3856 May  1  2005 ./slackbook/html/installation/setup-font-w.png
+-rw-r--r--  1 root root      3916 May  1  2005 ./slackbook/html/installation/setup-hardware-clock-w.png
+-rw-r--r--  1 root root      4715 May  1  2005 ./slackbook/html/installation/setup-help-w.png
+-rw-r--r--  1 root root      7100 May  1  2005 ./slackbook/html/installation/setup-install-w.png
+-rw-r--r--  1 root root      6442 May  1  2005 ./slackbook/html/installation/setup-kernel-w.png
+-rw-r--r--  1 root root      4526 May  1  2005 ./slackbook/html/installation/setup-keymap-w.png
+-rw-r--r--  1 root root      5824 May  1  2005 ./slackbook/html/installation/setup-lilo-w.png
+-rw-r--r--  1 root root      5356 May  1  2005 ./slackbook/html/installation/setup-modem-w.png
+-rw-r--r--  1 root root      6516 May  1  2005 ./slackbook/html/installation/setup-mouse-w.png
+-rw-r--r--  1 root root      5705 May  1  2005 ./slackbook/html/installation/setup-program-w.png
+-rw-r--r--  1 root root      6817 May  1  2005 ./slackbook/html/installation/setup-select-w.png
+-rw-r--r--  1 root root      3238 May  1  2005 ./slackbook/html/installation/setup-source-w.png
+-rw-r--r--  1 root root      3066 May  1  2005 ./slackbook/html/installation/setup-swap-w.png
+-rw-r--r--  1 root root      3153 May  1  2005 ./slackbook/html/installation/setup-target-w.png
+-rw-r--r--  1 root root      3593 May  1  2005 ./slackbook/html/installation/setup-timezone-w.png
+-rw-r--r--  1 root root      6767 May  1  2005 ./slackbook/html/installation/setup-xwmconfig-w.png
+-rw-r--r--  1 root root      6602 May  5  2005 ./slackbook/html/introduction-opensource.html
+-rw-r--r--  1 root root      4353 Apr 15  2005 ./slackbook/html/introduction-slackware.html
+-rw-r--r--  1 root root      5703 May  5  2005 ./slackbook/html/introduction.html
+-rw-r--r--  1 root root      9336 May  7  2005 ./slackbook/html/network-configuration-hardware.html
+-rw-r--r--  1 root root     13205 May  7  2005 ./slackbook/html/network-configuration-nfs.html
+-rw-r--r--  1 root root      5671 May 12  2005 ./slackbook/html/network-configuration-ppp.html
+-rw-r--r--  1 root root     14339 May  7  2005 ./slackbook/html/network-configuration-tcpip.html
+-rw-r--r--  1 root root      8762 May 12  2005 ./slackbook/html/network-configuration-wireless.html
+-rw-r--r--  1 root root      4503 May  7  2005 ./slackbook/html/network-configuration.html
+drwxr-xr-x  2 root root      4096 Sep 25  2006 ./slackbook/html/package-management
+-rw-r--r--  1 root root      5411 May  5  2005 ./slackbook/html/package-management-making-packages.html
+-rw-r--r--  1 root root      4408 May 12  2005 ./slackbook/html/package-management-making-tags-and-tagfiles.html
+-rw-r--r--  1 root root     11962 May 12  2005 ./slackbook/html/package-management-package-utilities.html
+-rw-r--r--  1 root root      5784 May 10  2005 ./slackbook/html/package-management.html
+-rw-r--r--  1 root root      5817 May  1  2005 ./slackbook/html/package-management/pkgtool-view-w.png
+-rw-r--r--  1 root root      4784 May  1  2005 ./slackbook/html/package-management/pkgtool-w.png
+-rw-r--r--  1 root root      4873 Apr 25  2005 ./slackbook/html/process-control-foregrounding.html
+-rw-r--r--  1 root root      6934 May  5  2005 ./slackbook/html/process-control-kill.html
+-rw-r--r--  1 root root     11978 May  9  2005 ./slackbook/html/process-control-ps.html
+-rw-r--r--  1 root root      7703 Apr 23  2005 ./slackbook/html/process-control-top.html
+-rw-r--r--  1 root root      5264 Apr 25  2005 ./slackbook/html/process-control.html
+-rw-r--r--  1 root root      5421 May 10  2005 ./slackbook/html/security-current.html
+-rw-r--r--  1 root root      9659 May 10  2005 ./slackbook/html/security-host.html
+-rw-r--r--  1 root root      7349 May 12  2005 ./slackbook/html/security.html
+-rw-r--r--  1 root root      9018 May  5  2005 ./slackbook/html/shell-bash.html
+-rw-r--r--  1 root root     12375 May  9  2005 ./slackbook/html/shell-command-line.html
+-rw-r--r--  1 root root      6609 May 12  2005 ./slackbook/html/shell-vt.html
+-rw-r--r--  1 root root      6764 May 12  2005 ./slackbook/html/shell.html
+-rw-r--r--  1 root root      3675 May  3  2005 ./slackbook/html/slackware_logo.png
+drwxr-xr-x  2 root root      4096 Sep 25  2006 ./slackbook/html/system-configuration
+-rw-r--r--  1 root root     14395 May 12  2005 ./slackbook/html/system-configuration-kernel.html
+-rw-r--r--  1 root root     21909 May 12  2005 ./slackbook/html/system-configuration.html
+-rw-r--r--  1 root root      6421 May  1  2005 ./slackbook/html/system-configuration/make-menuconfig-w.png
+drwxr-xr-x  2 root root      4096 Sep 25  2006 ./slackbook/html/vi
+-rw-r--r--  1 root root      4292 Apr 24  2005 ./slackbook/html/vi-configuration.html
+-rw-r--r--  1 root root      6414 May 12  2005 ./slackbook/html/vi-keys.html
+-rw-r--r--  1 root root      9546 May 12  2005 ./slackbook/html/vi-modes.html
+-rw-r--r--  1 root root      4019 Apr 24  2005 ./slackbook/html/vi-opening-files.html
+-rw-r--r--  1 root root      3434 Apr 23  2005 ./slackbook/html/vi-quitting-vi.html
+-rw-r--r--  1 root root      3698 Apr 23  2005 ./slackbook/html/vi-saving-files.html
+-rw-r--r--  1 root root      7379 May  5  2005 ./slackbook/html/vi.html
+-rw-r--r--  1 root root      3515 May  1  2005 ./slackbook/html/vi/vim-splitedit.png
+drwxr-xr-x  2 root root      4096 Sep 25  2006 ./slackbook/html/x-window-system
+-rw-r--r--  1 root root      7131 Apr 23  2005 ./slackbook/html/x-window-system-xdm.html
+-rw-r--r--  1 root root      5093 May  5  2005 ./slackbook/html/x-window-system-xinitrc.html
+-rw-r--r--  1 root root      3027 Apr 23  2005 ./slackbook/html/x-window-system-xorgsetup.html
+-rw-r--r--  1 root root      6352 May  5  2005 ./slackbook/html/x-window-system-xwmconfig.html
+-rw-r--r--  1 root root      9651 May  9  2005 ./slackbook/html/x-window-system.html
+-rw-r--r--  1 root root      4003 May  1  2005 ./slackbook/html/x-window-system/xorgconfig1-w.png
+-rw-r--r--  1 root root      6872 May  1  2005 ./slackbook/html/x-window-system/xorgconfig2-w.png
+-rw-r--r--  1 root root      3069 May  1  2005 ./slackbook/html/x-window-system/xorgconfig3-w.png
+-rw-r--r--  1 root root      5245 May  1  2005 ./slackbook/html/x-window-system/xorgconfig4-w.png
+-rw-r--r--  1 root root      6767 May  1  2005 ./slackbook/html/x-window-system/xwmconfig-w.png
+-rw-r--r--  1 root root      3839 May  5  2005 ./slackbook/html/zipslack-booting.html
+-rw-r--r--  1 root root      4577 May  5  2005 ./slackbook/html/zipslack-getting.html
+-rw-r--r--  1 root root      4260 Apr 24  2005 ./slackbook/html/zipslack.html
+-rw-r--r--  1 root root   1863038 May 16  2005 ./slackbook/slackbook-2.0.pdf
+-rw-r--r--  1 root root   3223923 May 16  2005 ./slackbook/slackbook-2.0.ps
+drwxr-xr-x 17 root root      4096 Apr 25 13:51 ./slackware64
+-rw-r--r--  1 root root    213939 Apr 25 13:51 ./slackware64/CHECKSUMS.md5
+-rw-r--r--  1 root root       198 Apr 25 13:51 ./slackware64/CHECKSUMS.md5.asc
+-rw-r--r--  1 root root    267860 Apr 25 13:47 ./slackware64/FILE_LIST
+-rw-r--r--  1 root root   2404327 Apr 25 13:50 ./slackware64/MANIFEST.bz2
+lrwxrwxrwx  1 root root        15 Aug 23  2009 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT
+drwxr-xr-x  2 root root     20480 Apr 24 03:37 ./slackware64/a
+-rw-r--r--  1 root root       327 Mar 25 18:37 ./slackware64/a/aaa_base-13.37-x86_64-3.txt
+-rw-r--r--  1 root root     10552 Mar 25 18:37 ./slackware64/a/aaa_base-13.37-x86_64-3.txz
+-rw-r--r--  1 root root       198 Mar 25 18:37 ./slackware64/a/aaa_base-13.37-x86_64-3.txz.asc
+-rw-r--r--  1 root root       568 Apr 22 17:13 ./slackware64/a/aaa_elflibs-13.37-x86_64-7.txt
+-rw-r--r--  1 root root   4230216 Apr 22 17:13 ./slackware64/a/aaa_elflibs-13.37-x86_64-7.txz
+-rw-r--r--  1 root root       198 Apr 22 17:13 ./slackware64/a/aaa_elflibs-13.37-x86_64-7.txz.asc
+-rw-r--r--  1 root root       505 Mar  7 18:02 ./slackware64/a/aaa_terminfo-5.8-x86_64-1.txt
+-rw-r--r--  1 root root     43624 Mar  7 18:02 ./slackware64/a/aaa_terminfo-5.8-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar  7 18:02 ./slackware64/a/aaa_terminfo-5.8-x86_64-1.txz.asc
+-rw-r--r--  1 root root       416 Apr 18 18:46 ./slackware64/a/acl-2.2.50-x86_64-1.txt
+-rw-r--r--  1 root root    136596 Apr 18 18:46 ./slackware64/a/acl-2.2.50-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr 18 18:46 ./slackware64/a/acl-2.2.50-x86_64-1.txz.asc
+-rw-r--r--  1 root root       471 Apr 16 04:08 ./slackware64/a/acpid-2.0.9-x86_64-1.txt
+-rw-r--r--  1 root root     40356 Apr 16 04:08 ./slackware64/a/acpid-2.0.9-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr 16 04:08 ./slackware64/a/acpid-2.0.9-x86_64-1.txz.asc
+-rw-r--r--  1 root root       554 Apr 11 06:20 ./slackware64/a/apmd-3.2.2-x86_64-3.txt
+-rw-r--r--  1 root root     54944 Apr 11 06:20 ./slackware64/a/apmd-3.2.2-x86_64-3.txz
+-rw-r--r--  1 root root       198 Apr 11 06:20 ./slackware64/a/apmd-3.2.2-x86_64-3.txz.asc
+-rw-r--r--  1 root root       608 Apr 18 18:39 ./slackware64/a/attr-2.4.45-x86_64-1.txt
+-rw-r--r--  1 root root     72972 Apr 18 18:39 ./slackware64/a/attr-2.4.45-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr 18 18:39 ./slackware64/a/attr-2.4.45-x86_64-1.txz.asc
+-rw-r--r--  1 root root       510 Mar 10 05:07 ./slackware64/a/bash-4.1.010-x86_64-1.txt
+-rw-r--r--  1 root root    966004 Mar 10 05:07 ./slackware64/a/bash-4.1.010-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar 10 05:07 ./slackware64/a/bash-4.1.010-x86_64-1.txz.asc
+-rw-r--r--  1 root root       227 Sep 21  2008 ./slackware64/a/bin-11.1-x86_64-1.txt
+-rw-r--r--  1 root root     44196 Sep 21  2008 ./slackware64/a/bin-11.1-x86_64-1.txz
+-rw-r--r--  1 root root       197 Sep 21  2008 ./slackware64/a/bin-11.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       639 Mar 27 22:25 ./slackware64/a/btrfs-progs-20110327-x86_64-1.txt
+-rw-r--r--  1 root root    145856 Mar 27 22:25 ./slackware64/a/btrfs-progs-20110327-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar 27 22:25 ./slackware64/a/btrfs-progs-20110327-x86_64-1.txz.asc
+-rw-r--r--  1 root root       478 Sep 20  2010 ./slackware64/a/bzip2-1.0.6-x86_64-1.txt
+-rw-r--r--  1 root root    127592 Sep 20  2010 ./slackware64/a/bzip2-1.0.6-x86_64-1.txz
+-rw-r--r--  1 root root       198 Sep 20  2010 ./slackware64/a/bzip2-1.0.6-x86_64-1.txz.asc
+-rw-r--r--  1 root root       525 Apr 14 20:30 ./slackware64/a/coreutils-8.11-x86_64-1.txt
+-rw-r--r--  1 root root   2200132 Apr 14 20:30 ./slackware64/a/coreutils-8.11-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr 14 20:30 ./slackware64/a/coreutils-8.11-x86_64-1.txz.asc
+-rw-r--r--  1 root root       487 Mar 11 04:32 ./slackware64/a/cpio-2.11-x86_64-1.txt
+-rw-r--r--  1 root root    182752 Mar 11 04:32 ./slackware64/a/cpio-2.11-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar 11 04:32 ./slackware64/a/cpio-2.11-x86_64-1.txz.asc
+-rw-r--r--  1 root root       620 Feb 25 20:06 ./slackware64/a/cpufrequtils-008-x86_64-1.txt
+-rw-r--r--  1 root root     35440 Feb 25 20:06 ./slackware64/a/cpufrequtils-008-x86_64-1.txz
+-rw-r--r--  1 root root       198 Feb 25 20:06 ./slackware64/a/cpufrequtils-008-x86_64-1.txz.asc
+-rw-r--r--  1 root root       582 Jan 22 04:19 ./slackware64/a/cryptsetup-1.2.0-x86_64-1.txt
+-rw-r--r--  1 root root    117732 Jan 22 04:19 ./slackware64/a/cryptsetup-1.2.0-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan 22 04:19 ./slackware64/a/cryptsetup-1.2.0-x86_64-1.txz.asc
+-rw-r--r--  1 root root       644 Jan 22 04:23 ./slackware64/a/cups-1.4.6-x86_64-1.txt
+-rw-r--r--  1 root root   2094964 Jan 22 04:23 ./slackware64/a/cups-1.4.6-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan 22 04:23 ./slackware64/a/cups-1.4.6-x86_64-1.txz.asc
+-rw-r--r--  1 root root       280 Jan  7 06:46 ./slackware64/a/cxxlibs-6.0.14-x86_64-1.txt
+-rw-r--r--  1 root root    875276 Jan  7 06:46 ./slackware64/a/cxxlibs-6.0.14-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan  7 06:46 ./slackware64/a/cxxlibs-6.0.14-x86_64-1.txz.asc
+-rw-r--r--  1 root root       491 Dec 23 23:31 ./slackware64/a/dbus-1.4.1-x86_64-1.txt
+-rw-r--r--  1 root root    339312 Dec 23 23:31 ./slackware64/a/dbus-1.4.1-x86_64-1.txz
+-rw-r--r--  1 root root       198 Dec 23 23:31 ./slackware64/a/dbus-1.4.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       359 Feb 11  2010 ./slackware64/a/dcron-4.4-x86_64-1.txt
+-rw-r--r--  1 root root     32528 Feb 11  2010 ./slackware64/a/dcron-4.4-x86_64-1.txz
+-rw-r--r--  1 root root       197 Feb 11  2010 ./slackware64/a/dcron-4.4-x86_64-1.txz.asc
+-rw-r--r--  1 root root       311 Sep 25  2008 ./slackware64/a/devs-2.3.1-noarch-25.txt
+-rw-r--r--  1 root root     98596 Sep 25  2008 ./slackware64/a/devs-2.3.1-noarch-25.txz
+-rw-r--r--  1 root root       197 Sep 25  2008 ./slackware64/a/devs-2.3.1-noarch-25.txz.asc
+-rw-r--r--  1 root root       513 Apr  4 05:42 ./slackware64/a/dialog-1.1_20100428-x86_64-2.txt
+-rw-r--r--  1 root root    131812 Apr  4 05:42 ./slackware64/a/dialog-1.1_20100428-x86_64-2.txz
+-rw-r--r--  1 root root       198 Apr  4 05:42 ./slackware64/a/dialog-1.1_20100428-x86_64-2.txz.asc
+-rw-r--r--  1 root root       281 Apr  7 23:14 ./slackware64/a/dosfstools-3.0.11-x86_64-2.txt
+-rw-r--r--  1 root root     65160 Apr  7 23:14 ./slackware64/a/dosfstools-3.0.11-x86_64-2.txz
+-rw-r--r--  1 root root       198 Apr  7 23:14 ./slackware64/a/dosfstools-3.0.11-x86_64-2.txz.asc
+-rw-r--r--  1 root root       343 Dec 30 18:21 ./slackware64/a/e2fsprogs-1.41.14-x86_64-1.txt
+-rw-r--r--  1 root root    675072 Dec 30 18:21 ./slackware64/a/e2fsprogs-1.41.14-x86_64-1.txz
+-rw-r--r--  1 root root       198 Dec 30 18:21 ./slackware64/a/e2fsprogs-1.41.14-x86_64-1.txz.asc
+-rw-r--r--  1 root root       352 Jul 28  2010 ./slackware64/a/ed-1.4-x86_64-1.txt
+-rw-r--r--  1 root root     63580 Jul 28  2010 ./slackware64/a/ed-1.4-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jul 28  2010 ./slackware64/a/ed-1.4-x86_64-1.txz.asc
+-rw-r--r--  1 root root       430 Jan 25  2010 ./slackware64/a/eject-2.1.5-x86_64-2.txt
+-rw-r--r--  1 root root     34532 Jan 25  2010 ./slackware64/a/eject-2.1.5-x86_64-2.txz
+-rw-r--r--  1 root root       197 Jan 25  2010 ./slackware64/a/eject-2.1.5-x86_64-2.txz.asc
+-rw-r--r--  1 root root       389 Sep 23  2008 ./slackware64/a/elvis-2.2_0-x86_64-2.txt
+-rw-r--r--  1 root root    699236 Sep 23  2008 ./slackware64/a/elvis-2.2_0-x86_64-2.txz
+-rw-r--r--  1 root root       197 Sep 23  2008 ./slackware64/a/elvis-2.2_0-x86_64-2.txz.asc
+-rw-r--r--  1 root root       203 Feb  5  2010 ./slackware64/a/etc-13.013-x86_64-1.txt
+-rw-r--r--  1 root root    207624 Feb  5  2010 ./slackware64/a/etc-13.013-x86_64-1.txz
+-rw-r--r--  1 root root       197 Feb  5  2010 ./slackware64/a/etc-13.013-x86_64-1.txz.asc
+-rw-r--r--  1 root root       225 Jan 30 22:11 ./slackware64/a/file-5.05-x86_64-1.txt
+-rw-r--r--  1 root root    214020 Jan 30 22:11 ./slackware64/a/file-5.05-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan 30 22:11 ./slackware64/a/file-5.05-x86_64-1.txz.asc
+-rw-r--r--  1 root root       368 Jun 13  2009 ./slackware64/a/findutils-4.4.2-x86_64-1.txt
+-rw-r--r--  1 root root    414500 Jun 13  2009 ./slackware64/a/findutils-4.4.2-x86_64-1.txz
+-rw-r--r--  1 root root       197 Jun 13  2009 ./slackware64/a/findutils-4.4.2-x86_64-1.txz.asc
+-rw-r--r--  1 root root       271 Oct 23  2008 ./slackware64/a/floppy-5.4-x86_64-3.txt
+-rw-r--r--  1 root root    350400 Oct 23  2008 ./slackware64/a/floppy-5.4-x86_64-3.txz
+-rw-r--r--  1 root root       197 Oct 23  2008 ./slackware64/a/floppy-5.4-x86_64-3.txz.asc
+-rw-r--r--  1 root root       588 May  9  2010 ./slackware64/a/gawk-3.1.8-x86_64-1.txt
+-rw-r--r--  1 root root    796264 May  9  2010 ./slackware64/a/gawk-3.1.8-x86_64-1.txz
+-rw-r--r--  1 root root       198 May  9  2010 ./slackware64/a/gawk-3.1.8-x86_64-1.txz.asc
+-rw-r--r--  1 root root       438 Mar  2 21:35 ./slackware64/a/gdisk-0.6.14-x86_64-1.txt
+-rw-r--r--  1 root root    114224 Mar  2 21:35 ./slackware64/a/gdisk-0.6.14-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar  2 21:35 ./slackware64/a/gdisk-0.6.14-x86_64-1.txz.asc
+-rw-r--r--  1 root root       498 Dec 13  2008 ./slackware64/a/genpower-1.0.5-x86_64-2.txt
+-rw-r--r--  1 root root     42648 Dec 13  2008 ./slackware64/a/genpower-1.0.5-x86_64-2.txz
+-rw-r--r--  1 root root       197 Dec 13  2008 ./slackware64/a/genpower-1.0.5-x86_64-2.txz.asc
+-rw-r--r--  1 root root       279 Nov  6 19:16 ./slackware64/a/gettext-0.18.1.1-x86_64-1.txt
+-rw-r--r--  1 root root    113596 Nov  6 19:16 ./slackware64/a/gettext-0.18.1.1-x86_64-1.txz
+-rw-r--r--  1 root root       198 Nov  6 19:16 ./slackware64/a/gettext-0.18.1.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       510 Oct  2  2008 ./slackware64/a/getty-ps-2.1.0b-x86_64-1.txt
+-rw-r--r--  1 root root     64504 Oct  2  2008 ./slackware64/a/getty-ps-2.1.0b-x86_64-1.txz
+-rw-r--r--  1 root root       197 Oct  2  2008 ./slackware64/a/getty-ps-2.1.0b-x86_64-1.txz.asc
+-rw-r--r--  1 root root       323 Mar 24 07:51 ./slackware64/a/glibc-solibs-2.13-x86_64-4.txt
+-rw-r--r--  1 root root   2437800 Mar 24 07:51 ./slackware64/a/glibc-solibs-2.13-x86_64-4.txz
+-rw-r--r--  1 root root       198 Mar 24 07:51 ./slackware64/a/glibc-solibs-2.13-x86_64-4.txz.asc
+-rw-r--r--  1 root root       500 Mar 24 07:50 ./slackware64/a/glibc-zoneinfo-2.13-noarch-4.txt
+-rw-r--r--  1 root root    156896 Mar 24 07:50 ./slackware64/a/glibc-zoneinfo-2.13-noarch-4.txz
+-rw-r--r--  1 root root       198 Mar 24 07:50 ./slackware64/a/glibc-zoneinfo-2.13-noarch-4.txz.asc
+-rw-r--r--  1 root root       511 Oct  2  2008 ./slackware64/a/gpm-1.20.1-x86_64-5.txt
+-rw-r--r--  1 root root    190476 Oct  2  2008 ./slackware64/a/gpm-1.20.1-x86_64-5.txz
+-rw-r--r--  1 root root       197 Oct  2  2008 ./slackware64/a/gpm-1.20.1-x86_64-5.txz.asc
+-rw-r--r--  1 root root       292 Oct 28 17:29 ./slackware64/a/grep-2.7-x86_64-1.txt
+-rw-r--r--  1 root root    242736 Oct 28 17:29 ./slackware64/a/grep-2.7-x86_64-1.txz
+-rw-r--r--  1 root root       198 Oct 28 17:29 ./slackware64/a/grep-2.7-x86_64-1.txz.asc
+-rw-r--r--  1 root root    127483 Feb  9  2010 ./slackware64/a/gzip-1.4-x86_64-1.tgz
+-rw-r--r--  1 root root       197 Feb  9  2010 ./slackware64/a/gzip-1.4-x86_64-1.tgz.asc
+-rw-r--r--  1 root root       315 Feb  9  2010 ./slackware64/a/gzip-1.4-x86_64-1.txt
+-rw-r--r--  1 root root       348 Jan 26 23:02 ./slackware64/a/hdparm-9.37-x86_64-1.txt
+-rw-r--r--  1 root root     63524 Jan 26 23:02 ./slackware64/a/hdparm-9.37-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan 26 23:02 ./slackware64/a/hdparm-9.37-x86_64-1.txz.asc
+-rw-r--r--  1 root root       466 Aug 24  2009 ./slackware64/a/infozip-6.0-x86_64-1.txt
+-rw-r--r--  1 root root    405240 Aug 24  2009 ./slackware64/a/infozip-6.0-x86_64-1.txz
+-rw-r--r--  1 root root       197 Aug 24  2009 ./slackware64/a/infozip-6.0-x86_64-1.txz.asc
+-rw-r--r--  1 root root       513 May  8  2010 ./slackware64/a/inotify-tools-3.14-x86_64-1.txt
+-rw-r--r--  1 root root     43908 May  8  2010 ./slackware64/a/inotify-tools-3.14-x86_64-1.txz
+-rw-r--r--  1 root root       198 May  8  2010 ./slackware64/a/inotify-tools-3.14-x86_64-1.txz.asc
+-rwxr-xr-x  1 root root      2897 Jun 24  2009 ./slackware64/a/install-packages
+-rw-r--r--  1 root root       446 Sep 18  2006 ./slackware64/a/install.end
+-rw-r--r--  1 root root       539 Mar 29 19:01 ./slackware64/a/jfsutils-1.1.15-x86_64-1.txt
+-rw-r--r--  1 root root    198368 Mar 29 19:01 ./slackware64/a/jfsutils-1.1.15-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar 29 19:01 ./slackware64/a/jfsutils-1.1.15-x86_64-1.txz.asc
+-rw-r--r--  1 root root       465 Apr 29  2010 ./slackware64/a/kbd-1.15.2-x86_64-1.txt
+-rw-r--r--  1 root root   1097948 Apr 29  2010 ./slackware64/a/kbd-1.15.2-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr 29  2010 ./slackware64/a/kbd-1.15.2-x86_64-1.txz.asc
+-rw-r--r--  1 root root       344 Apr  9 18:25 ./slackware64/a/kernel-firmware-2.6.37.6-noarch-2.txt
+-rw-r--r--  1 root root   1025816 Apr  9 18:25 ./slackware64/a/kernel-firmware-2.6.37.6-noarch-2.txz
+-rw-r--r--  1 root root       198 Apr  9 18:25 ./slackware64/a/kernel-firmware-2.6.37.6-noarch-2.txz.asc
+-rw-r--r--  1 root root       626 Apr  9 18:25 ./slackware64/a/kernel-generic-2.6.37.6-x86_64-2.txt
+-rw-r--r--  1 root root   3241948 Apr  9 18:25 ./slackware64/a/kernel-generic-2.6.37.6-x86_64-2.txz
+-rw-r--r--  1 root root       198 Apr  9 18:25 ./slackware64/a/kernel-generic-2.6.37.6-x86_64-2.txz.asc
+-rw-r--r--  1 root root       638 Apr 10 03:50 ./slackware64/a/kernel-huge-2.6.37.6-x86_64-2.txt
+-rw-r--r--  1 root root   6297952 Apr 10 03:50 ./slackware64/a/kernel-huge-2.6.37.6-x86_64-2.txz
+-rw-r--r--  1 root root       198 Apr 10 03:50 ./slackware64/a/kernel-huge-2.6.37.6-x86_64-2.txz.asc
+-rw-r--r--  1 root root       520 Apr 10 03:43 ./slackware64/a/kernel-modules-2.6.37.6-x86_64-2.txt
+-rw-r--r--  1 root root  20648952 Apr 10 03:43 ./slackware64/a/kernel-modules-2.6.37.6-x86_64-2.txz
+-rw-r--r--  1 root root       198 Apr 10 03:43 ./slackware64/a/kernel-modules-2.6.37.6-x86_64-2.txz.asc
+-rw-r--r--  1 root root       386 Apr 14 18:19 ./slackware64/a/less-443-x86_64-1.txt
+-rw-r--r--  1 root root    114256 Apr 14 18:19 ./slackware64/a/less-443-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr 14 18:19 ./slackware64/a/less-443-x86_64-1.txz.asc
+-rw-r--r--  1 root root       152 Oct  2  2008 ./slackware64/a/lha-114i-x86_64-1.txt
+-rw-r--r--  1 root root     47640 Oct  2  2008 ./slackware64/a/lha-114i-x86_64-1.txz
+-rw-r--r--  1 root root       197 Oct  2  2008 ./slackware64/a/lha-114i-x86_64-1.txz.asc
+-rw-r--r--  1 root root       596 Mar  3 20:32 ./slackware64/a/libcgroup-0.37.1-x86_64-1.txt
+-rw-r--r--  1 root root     98376 Mar  3 20:32 ./slackware64/a/libcgroup-0.37.1-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar  3 20:32 ./slackware64/a/libcgroup-0.37.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       590 Mar 27 06:53 ./slackware64/a/lilo-22.8-x86_64-16.txt
+-rw-r--r--  1 root root    269720 Mar 27 06:53 ./slackware64/a/lilo-22.8-x86_64-16.txz
+-rw-r--r--  1 root root       198 Mar 27 06:53 ./slackware64/a/lilo-22.8-x86_64-16.txz.asc
+-rw-r--r--  1 root root       533 Feb 12  2010 ./slackware64/a/logrotate-3.7.8-x86_64-1.txt
+-rw-r--r--  1 root root     36996 Feb 12  2010 ./slackware64/a/logrotate-3.7.8-x86_64-1.txz
+-rw-r--r--  1 root root       197 Feb 12  2010 ./slackware64/a/logrotate-3.7.8-x86_64-1.txz.asc
+-rw-r--r--  1 root root       448 Apr 17 20:12 ./slackware64/a/lrzip-0.602-x86_64-1.txt
+-rw-r--r--  1 root root    140576 Apr 17 20:12 ./slackware64/a/lrzip-0.602-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr 17 20:12 ./slackware64/a/lrzip-0.602-x86_64-1.txz.asc
+-rw-r--r--  1 root root       557 Feb 16 02:56 ./slackware64/a/lvm2-2.02.84-x86_64-1.txt
+-rw-r--r--  1 root root   1321432 Feb 16 02:56 ./slackware64/a/lvm2-2.02.84-x86_64-1.txz
+-rw-r--r--  1 root root       198 Feb 16 02:56 ./slackware64/a/lvm2-2.02.84-x86_64-1.txz.asc
+-rw-r--r--  1 root root      8136 Apr 17 20:16 ./slackware64/a/maketag
+-rw-r--r--  1 root root      8136 Apr 17 20:16 ./slackware64/a/maketag.ez
+-rw-r--r--  1 root root       587 Sep 27  2010 ./slackware64/a/mcelog-1.0pre3-x86_64-1.txt
+-rw-r--r--  1 root root    186948 Sep 27  2010 ./slackware64/a/mcelog-1.0pre3-x86_64-1.txz
+-rw-r--r--  1 root root       198 Sep 27  2010 ./slackware64/a/mcelog-1.0pre3-x86_64-1.txz.asc
+-rw-r--r--  1 root root       472 Apr  7 03:19 ./slackware64/a/mdadm-3.1.5-x86_64-1.txt
+-rw-r--r--  1 root root    222372 Apr  7 03:19 ./slackware64/a/mdadm-3.1.5-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr  7 03:19 ./slackware64/a/mdadm-3.1.5-x86_64-1.txz.asc
+-rw-r--r--  1 root root       323 Feb  9 20:29 ./slackware64/a/minicom-2.5-x86_64-1.txt
+-rw-r--r--  1 root root    289676 Feb  9 20:29 ./slackware64/a/minicom-2.5-x86_64-1.txz
+-rw-r--r--  1 root root       198 Feb  9 20:29 ./slackware64/a/minicom-2.5-x86_64-1.txz.asc
+-rw-r--r--  1 root root       529 Apr  5 04:38 ./slackware64/a/mkinitrd-1.4.6-x86_64-11.txt
+-rw-r--r--  1 root root    584252 Apr  5 04:38 ./slackware64/a/mkinitrd-1.4.6-x86_64-11.txz
+-rw-r--r--  1 root root       198 Apr  5 04:38 ./slackware64/a/mkinitrd-1.4.6-x86_64-11.txz.asc
+-rw-r--r--  1 root root       388 Nov 16 22:04 ./slackware64/a/module-init-tools-3.12-x86_64-2.txt
+-rw-r--r--  1 root root    398372 Nov 16 22:04 ./slackware64/a/module-init-tools-3.12-x86_64-2.txz
+-rw-r--r--  1 root root       198 Nov 16 22:04 ./slackware64/a/module-init-tools-3.12-x86_64-2.txz.asc
+-rw-r--r--  1 root root       487 Oct  2  2008 ./slackware64/a/mt-st-0.9b-x86_64-2.txt
+-rw-r--r--  1 root root     30000 Oct  2  2008 ./slackware64/a/mt-st-0.9b-x86_64-2.txz
+-rw-r--r--  1 root root       197 Oct  2  2008 ./slackware64/a/mt-st-0.9b-x86_64-2.txz.asc
+-rw-r--r--  1 root root       400 Jul 28  2010 ./slackware64/a/mtx-1.3.12-x86_64-1.txt
+-rw-r--r--  1 root root     64888 Jul 28  2010 ./slackware64/a/mtx-1.3.12-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jul 28  2010 ./slackware64/a/mtx-1.3.12-x86_64-1.txz.asc
+-rw-r--r--  1 root root       560 Jul 28  2010 ./slackware64/a/ncompress-4.2.4.3-x86_64-1.txt
+-rw-r--r--  1 root root     16076 Jul 28  2010 ./slackware64/a/ncompress-4.2.4.3-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jul 28  2010 ./slackware64/a/ncompress-4.2.4.3-x86_64-1.txz.asc
+-rw-r--r--  1 root root       546 Jan 30 22:30 ./slackware64/a/ntfs-3g-2011.1.15-x86_64-1.txt
+-rw-r--r--  1 root root    282728 Jan 30 22:30 ./slackware64/a/ntfs-3g-2011.1.15-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan 30 22:30 ./slackware64/a/ntfs-3g-2011.1.15-x86_64-1.txz.asc
+-rw-r--r--  1 root root       678 Mar 22 19:19 ./slackware64/a/openssl-solibs-0.9.8r-x86_64-3.txt
+-rw-r--r--  1 root root    736652 Mar 22 19:19 ./slackware64/a/openssl-solibs-0.9.8r-x86_64-3.txz
+-rw-r--r--  1 root root       198 Mar 22 19:19 ./slackware64/a/openssl-solibs-0.9.8r-x86_64-3.txz.asc
+-rw-r--r--  1 root root       564 Jul 28  2010 ./slackware64/a/patch-2.6.1-x86_64-1.txt
+-rw-r--r--  1 root root     91844 Jul 28  2010 ./slackware64/a/patch-2.6.1-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jul 28  2010 ./slackware64/a/patch-2.6.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       436 Mar 14 03:53 ./slackware64/a/pciutils-3.1.7-x86_64-1.txt
+-rw-r--r--  1 root root    246796 Mar 14 03:53 ./slackware64/a/pciutils-3.1.7-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar 14 03:53 ./slackware64/a/pciutils-3.1.7-x86_64-1.txz.asc
+-rw-r--r--  1 root root       451 Feb 27 21:41 ./slackware64/a/pcmciautils-017-x86_64-1.txt
+-rw-r--r--  1 root root     32108 Feb 27 21:41 ./slackware64/a/pcmciautils-017-x86_64-1.txz
+-rw-r--r--  1 root root       198 Feb 27 21:41 ./slackware64/a/pcmciautils-017-x86_64-1.txz.asc
+-rw-r--r--  1 root root     39275 Apr 22 20:51 ./slackware64/a/pkgtools-13.37-noarch-9.tgz
+-rw-r--r--  1 root root       198 Apr 22 20:51 ./slackware64/a/pkgtools-13.37-noarch-9.tgz.asc
+-rw-r--r--  1 root root       624 Apr 22 20:51 ./slackware64/a/pkgtools-13.37-noarch-9.txt
+-rw-r--r--  1 root root       282 Mar 29 18:39 ./slackware64/a/procps-3.2.8-x86_64-3.txt
+-rw-r--r--  1 root root    240532 Mar 29 18:39 ./slackware64/a/procps-3.2.8-x86_64-3.txz
+-rw-r--r--  1 root root       198 Mar 29 18:39 ./slackware64/a/procps-3.2.8-x86_64-3.txz.asc
+-rw-r--r--  1 root root       524 Jun 22  2009 ./slackware64/a/quota-3.17-x86_64-1.txt
+-rw-r--r--  1 root root    167344 Jun 22  2009 ./slackware64/a/quota-3.17-x86_64-1.txz
+-rw-r--r--  1 root root       197 Jun 22  2009 ./slackware64/a/quota-3.17-x86_64-1.txz.asc
+-rw-r--r--  1 root root       476 Mar  4  2009 ./slackware64/a/reiserfsprogs-3.6.21-x86_64-1.txt
+-rw-r--r--  1 root root    224836 Mar  4  2009 ./slackware64/a/reiserfsprogs-3.6.21-x86_64-1.txz
+-rw-r--r--  1 root root       197 Mar  4  2009 ./slackware64/a/reiserfsprogs-3.6.21-x86_64-1.txz.asc
+-rw-r--r--  1 root root       398 Aug  7  2010 ./slackware64/a/rpm2tgz-1.2.2-x86_64-1.txt
+-rw-r--r--  1 root root      5492 Aug  7  2010 ./slackware64/a/rpm2tgz-1.2.2-x86_64-1.txz
+-rw-r--r--  1 root root       198 Aug  7  2010 ./slackware64/a/rpm2tgz-1.2.2-x86_64-1.txz.asc
+-rw-r--r--  1 root root       467 Nov 16 22:37 ./slackware64/a/sdparm-1.06-x86_64-1.txt
+-rw-r--r--  1 root root     96016 Nov 16 22:37 ./slackware64/a/sdparm-1.06-x86_64-1.txz
+-rw-r--r--  1 root root       198 Nov 16 22:37 ./slackware64/a/sdparm-1.06-x86_64-1.txz.asc
+-rw-r--r--  1 root root       408 Dec  6  2009 ./slackware64/a/sed-4.2.1-x86_64-1.txt
+-rw-r--r--  1 root root    173168 Dec  6  2009 ./slackware64/a/sed-4.2.1-x86_64-1.txz
+-rw-r--r--  1 root root       197 Dec  6  2009 ./slackware64/a/sed-4.2.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       536 Apr 11 04:22 ./slackware64/a/shadow-4.1.4.3-x86_64-2.txt
+-rw-r--r--  1 root root   1220456 Apr 11 04:22 ./slackware64/a/shadow-4.1.4.3-x86_64-2.txz
+-rw-r--r--  1 root root       198 Apr 11 04:22 ./slackware64/a/shadow-4.1.4.3-x86_64-2.txz.asc
+-rw-r--r--  1 root root       627 Feb  7 19:28 ./slackware64/a/sharutils-4.11-x86_64-1.txt
+-rw-r--r--  1 root root    154992 Feb  7 19:28 ./slackware64/a/sharutils-4.11-x86_64-1.txz
+-rw-r--r--  1 root root       198 Feb  7 19:28 ./slackware64/a/sharutils-4.11-x86_64-1.txz.asc
+-rw-r--r--  1 root root       553 Jul 18  2009 ./slackware64/a/slocate-3.1-x86_64-3.txt
+-rw-r--r--  1 root root     28148 Jul 18  2009 ./slackware64/a/slocate-3.1-x86_64-3.txz
+-rw-r--r--  1 root root       197 Jul 18  2009 ./slackware64/a/slocate-3.1-x86_64-3.txz.asc
+-rw-r--r--  1 root root       710 Jan 27 19:24 ./slackware64/a/smartmontools-5.40-x86_64-1.txt
+-rw-r--r--  1 root root    287120 Jan 27 19:24 ./slackware64/a/smartmontools-5.40-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan 27 19:24 ./slackware64/a/smartmontools-5.40-x86_64-1.txz.asc
+-rw-r--r--  1 root root       285 Oct  2  2008 ./slackware64/a/splitvt-1.6.5-x86_64-1.txt
+-rw-r--r--  1 root root     28700 Oct  2  2008 ./slackware64/a/splitvt-1.6.5-x86_64-1.txz
+-rw-r--r--  1 root root       197 Oct  2  2008 ./slackware64/a/splitvt-1.6.5-x86_64-1.txz.asc
+-rw-r--r--  1 root root       544 Sep 25  2008 ./slackware64/a/sysfsutils-2.1.0-x86_64-1.txt
+-rw-r--r--  1 root root     39392 Sep 25  2008 ./slackware64/a/sysfsutils-2.1.0-x86_64-1.txz
+-rw-r--r--  1 root root       197 Sep 25  2008 ./slackware64/a/sysfsutils-2.1.0-x86_64-1.txz.asc
+-rw-r--r--  1 root root       457 Oct 20  2010 ./slackware64/a/sysklogd-1.5-x86_64-1.txt
+-rw-r--r--  1 root root     61552 Oct 20  2010 ./slackware64/a/sysklogd-1.5-x86_64-1.txz
+-rw-r--r--  1 root root       198 Oct 20  2010 ./slackware64/a/sysklogd-1.5-x86_64-1.txz.asc
+-rw-r--r--  1 root root       518 Jan 25  2010 ./slackware64/a/syslinux-3.84-x86_64-2.txt
+-rw-r--r--  1 root root    450952 Jan 25  2010 ./slackware64/a/syslinux-3.84-x86_64-2.txz
+-rw-r--r--  1 root root       197 Jan 25  2010 ./slackware64/a/syslinux-3.84-x86_64-2.txz.asc
+-rw-r--r--  1 root root       513 Sep 25  2008 ./slackware64/a/sysvinit-2.86-x86_64-6.txt
+-rw-r--r--  1 root root     60428 Sep 25  2008 ./slackware64/a/sysvinit-2.86-x86_64-6.txz
+-rw-r--r--  1 root root       197 Sep 25  2008 ./slackware64/a/sysvinit-2.86-x86_64-6.txz.asc
+-rw-r--r--  1 root root       695 Sep 23  2008 ./slackware64/a/sysvinit-functions-8.53-x86_64-2.txt
+-rw-r--r--  1 root root     30356 Sep 23  2008 ./slackware64/a/sysvinit-functions-8.53-x86_64-2.txz
+-rw-r--r--  1 root root       197 Sep 23  2008 ./slackware64/a/sysvinit-functions-8.53-x86_64-2.txz.asc
+-rw-r--r--  1 root root       379 Apr 23 19:58 ./slackware64/a/sysvinit-scripts-1.2-noarch-43.txt
+-rw-r--r--  1 root root     19112 Apr 23 19:58 ./slackware64/a/sysvinit-scripts-1.2-noarch-43.txz
+-rw-r--r--  1 root root       198 Apr 23 19:58 ./slackware64/a/sysvinit-scripts-1.2-noarch-43.txz.asc
+-rw-r--r--  1 root root      1236 Apr 17 20:16 ./slackware64/a/tagfile
+-rw-r--r--  1 root root   1072795 Apr 14 18:24 ./slackware64/a/tar-1.26-x86_64-1.tgz
+-rw-r--r--  1 root root       198 Apr 14 18:24 ./slackware64/a/tar-1.26-x86_64-1.tgz.asc
+-rw-r--r--  1 root root       380 Apr 14 18:24 ./slackware64/a/tar-1.26-x86_64-1.txt
+-rw-r--r--  1 root root       431 Jul 28  2010 ./slackware64/a/tcsh-6.17.00-x86_64-1.txt
+-rw-r--r--  1 root root    281248 Jul 28  2010 ./slackware64/a/tcsh-6.17.00-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jul 28  2010 ./slackware64/a/tcsh-6.17.00-x86_64-1.txz.asc
+-rw-r--r--  1 root root       432 Sep 25  2008 ./slackware64/a/time-1.7-x86_64-1.txt
+-rw-r--r--  1 root root     18340 Sep 25  2008 ./slackware64/a/time-1.7-x86_64-1.txz
+-rw-r--r--  1 root root       197 Sep 25  2008 ./slackware64/a/time-1.7-x86_64-1.txz.asc
+-rw-r--r--  1 root root       418 Jul 28  2010 ./slackware64/a/tree-1.5.3-x86_64-1.txt
+-rw-r--r--  1 root root     29104 Jul 28  2010 ./slackware64/a/tree-1.5.3-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jul 28  2010 ./slackware64/a/tree-1.5.3-x86_64-1.txz.asc
+-rw-r--r--  1 root root       369 Jan  5 07:41 ./slackware64/a/udev-165-x86_64-2.txt
+-rw-r--r--  1 root root    305408 Jan  5 07:41 ./slackware64/a/udev-165-x86_64-2.txz
+-rw-r--r--  1 root root       198 Jan  5 07:41 ./slackware64/a/udev-165-x86_64-2.txz.asc
+-rw-r--r--  1 root root       392 Oct  2  2008 ./slackware64/a/unarj-265-x86_64-1.txt
+-rw-r--r--  1 root root     16528 Oct  2  2008 ./slackware64/a/unarj-265-x86_64-1.txz
+-rw-r--r--  1 root root       197 Oct  2  2008 ./slackware64/a/unarj-265-x86_64-1.txz.asc
+-rw-r--r--  1 root root       720 Jan 30 22:02 ./slackware64/a/usb_modeswitch-1.1.6-x86_64-1.txt
+-rw-r--r--  1 root root     53628 Jan 30 22:02 ./slackware64/a/usb_modeswitch-1.1.6-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan 30 22:02 ./slackware64/a/usb_modeswitch-1.1.6-x86_64-1.txz.asc
+-rw-r--r--  1 root root       322 Mar 17 23:50 ./slackware64/a/usbutils-002-x86_64-1.txt
+-rw-r--r--  1 root root    184744 Mar 17 23:50 ./slackware64/a/usbutils-002-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar 17 23:50 ./slackware64/a/usbutils-002-x86_64-1.txz.asc
+-rw-r--r--  1 root root       350 Jul 28  2010 ./slackware64/a/utempter-1.1.5-x86_64-1.txt
+-rw-r--r--  1 root root     13912 Jul 28  2010 ./slackware64/a/utempter-1.1.5-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jul 28  2010 ./slackware64/a/utempter-1.1.5-x86_64-1.txz.asc
+-rw-r--r--  1 root root       329 Feb 16 06:35 ./slackware64/a/util-linux-2.19-x86_64-1.txt
+-rw-r--r--  1 root root   1492964 Feb 16 06:35 ./slackware64/a/util-linux-2.19-x86_64-1.txz
+-rw-r--r--  1 root root       198 Feb 16 06:35 ./slackware64/a/util-linux-2.19-x86_64-1.txz.asc
+-rw-r--r--  1 root root       582 Mar  3  2009 ./slackware64/a/which-2.20-x86_64-1.txt
+-rw-r--r--  1 root root     28780 Mar  3  2009 ./slackware64/a/which-2.20-x86_64-1.txz
+-rw-r--r--  1 root root       197 Mar  3  2009 ./slackware64/a/which-2.20-x86_64-1.txz.asc
+-rw-r--r--  1 root root       495 Mar 22 22:35 ./slackware64/a/xfsprogs-3.1.4-x86_64-1.txt
+-rw-r--r--  1 root root    720248 Mar 22 22:35 ./slackware64/a/xfsprogs-3.1.4-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar 22 22:35 ./slackware64/a/xfsprogs-3.1.4-x86_64-1.txz.asc
+-rw-r--r--  1 root root    303871 Apr  6 03:47 ./slackware64/a/xz-5.0.2-x86_64-1.tgz
+-rw-r--r--  1 root root       198 Apr  6 03:47 ./slackware64/a/xz-5.0.2-x86_64-1.tgz.asc
+-rw-r--r--  1 root root       499 Apr  6 03:47 ./slackware64/a/xz-5.0.2-x86_64-1.txt
+-rw-r--r--  1 root root       542 Jul 28  2010 ./slackware64/a/zoo-2.10_22-x86_64-1.txt
+-rw-r--r--  1 root root     54660 Jul 28  2010 ./slackware64/a/zoo-2.10_22-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jul 28  2010 ./slackware64/a/zoo-2.10_22-x86_64-1.txz.asc
+drwxr-xr-x  2 root root     12288 Apr 22 18:53 ./slackware64/ap
+-rw-r--r--  1 root root       445 Jul 28  2010 ./slackware64/ap/a2ps-4.14-x86_64-5.txt
+-rw-r--r--  1 root root    749532 Jul 28  2010 ./slackware64/ap/a2ps-4.14-x86_64-5.txz
+-rw-r--r--  1 root root       198 Jul 28  2010 ./slackware64/ap/a2ps-4.14-x86_64-5.txz.asc
+-rw-r--r--  1 root root       599 Jul 28  2010 ./slackware64/ap/acct-6.5.4-x86_64-1.txt
+-rw-r--r--  1 root root     92664 Jul 28  2010 ./slackware64/ap/acct-6.5.4-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jul 28  2010 ./slackware64/ap/acct-6.5.4-x86_64-1.txz.asc
+-rw-r--r--  1 root root       625 Feb  9 05:53 ./slackware64/ap/alsa-utils-1.0.24.2-x86_64-1.txt
+-rw-r--r--  1 root root    967696 Feb  9 05:53 ./slackware64/ap/alsa-utils-1.0.24.2-x86_64-1.txz
+-rw-r--r--  1 root root       198 Feb  9 05:53 ./slackware64/ap/alsa-utils-1.0.24.2-x86_64-1.txz.asc
+-rw-r--r--  1 root root       275 Oct  2  2008 ./slackware64/ap/amp-0.7.6-x86_64-1.txt
+-rw-r--r--  1 root root     44568 Oct  2  2008 ./slackware64/ap/amp-0.7.6-x86_64-1.txz
+-rw-r--r--  1 root root       197 Oct  2  2008 ./slackware64/ap/amp-0.7.6-x86_64-1.txz.asc
+-rw-r--r--  1 root root       525 Apr 25  2010 ./slackware64/ap/ash-0.4.0-x86_64-2.txt
+-rw-r--r--  1 root root     81548 Apr 25  2010 ./slackware64/ap/ash-0.4.0-x86_64-2.txz
+-rw-r--r--  1 root root       198 Apr 25  2010 ./slackware64/ap/ash-0.4.0-x86_64-2.txz.asc
+-rw-r--r--  1 root root       284 Jul 28  2010 ./slackware64/ap/at-3.1.12-x86_64-1.txt
+-rw-r--r--  1 root root     41428 Jul 28  2010 ./slackware64/ap/at-3.1.12-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jul 28  2010 ./slackware64/ap/at-3.1.12-x86_64-1.txz.asc
+-rw-r--r--  1 root root       308 Jul 28  2010 ./slackware64/ap/aumix-2.9.1-x86_64-1.txt
+-rw-r--r--  1 root root     56316 Jul 28  2010 ./slackware64/ap/aumix-2.9.1-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jul 28  2010 ./slackware64/ap/aumix-2.9.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       386 May 23  2009 ./slackware64/ap/bc-1.06.95-x86_64-2.txt
+-rw-r--r--  1 root root    102072 May 23  2009 ./slackware64/ap/bc-1.06.95-x86_64-2.txz
+-rw-r--r--  1 root root       197 May 23  2009 ./slackware64/ap/bc-1.06.95-x86_64-2.txz.asc
+-rw-r--r--  1 root root       335 May 23  2009 ./slackware64/ap/bpe-2.01.00-x86_64-2.txt
+-rw-r--r--  1 root root     47880 May 23  2009 ./slackware64/ap/bpe-2.01.00-x86_64-2.txz
+-rw-r--r--  1 root root       197 May 23  2009 ./slackware64/ap/bpe-2.01.00-x86_64-2.txz.asc
+-rw-r--r--  1 root root       595 Nov 26  2008 ./slackware64/ap/cdparanoia-III_10.2-x86_64-1.txt
+-rw-r--r--  1 root root     97840 Nov 26  2008 ./slackware64/ap/cdparanoia-III_10.2-x86_64-1.txz
+-rw-r--r--  1 root root       197 Nov 26  2008 ./slackware64/ap/cdparanoia-III_10.2-x86_64-1.txz.asc
+-rw-r--r--  1 root root       296 Jul 28  2010 ./slackware64/ap/cdrdao-1.2.3-x86_64-1.txt
+-rw-r--r--  1 root root    288436 Jul 28  2010 ./slackware64/ap/cdrdao-1.2.3-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jul 28  2010 ./slackware64/ap/cdrdao-1.2.3-x86_64-1.txz.asc
+-rw-r--r--  1 root root       409 Dec 22 01:54 ./slackware64/ap/cdrtools-3.01a02-x86_64-1.txt
+-rw-r--r--  1 root root    844164 Dec 22 01:54 ./slackware64/ap/cdrtools-3.01a02-x86_64-1.txz
+-rw-r--r--  1 root root       198 Dec 22 01:54 ./slackware64/ap/cdrtools-3.01a02-x86_64-1.txz.asc
+-rw-r--r--  1 root root       456 Jul 22  2009 ./slackware64/ap/dc3dd-6.12.3-x86_64-1.txt
+-rw-r--r--  1 root root    116972 Jul 22  2009 ./slackware64/ap/dc3dd-6.12.3-x86_64-1.txz
+-rw-r--r--  1 root root       197 Jul 22  2009 ./slackware64/ap/dc3dd-6.12.3-x86_64-1.txz.asc
+-rw-r--r--  1 root root       465 Feb 25 20:34 ./slackware64/ap/ddrescue-1.14-x86_64-1.txt
+-rw-r--r--  1 root root     54512 Feb 25 20:34 ./slackware64/ap/ddrescue-1.14-x86_64-1.txz
+-rw-r--r--  1 root root       198 Feb 25 20:34 ./slackware64/ap/ddrescue-1.14-x86_64-1.txz.asc
+-rw-r--r--  1 root root       409 Jul 28  2010 ./slackware64/ap/diffstat-1.53-x86_64-1.txt
+-rw-r--r--  1 root root     21836 Jul 28  2010 ./slackware64/ap/diffstat-1.53-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jul 28  2010 ./slackware64/ap/diffstat-1.53-x86_64-1.txz.asc
+-rw-r--r--  1 root root       283 May 10  2010 ./slackware64/ap/diffutils-3.0-x86_64-1.txt
+-rw-r--r--  1 root root    313968 May 10  2010 ./slackware64/ap/diffutils-3.0-x86_64-1.txz
+-rw-r--r--  1 root root       198 May 10  2010 ./slackware64/ap/diffutils-3.0-x86_64-1.txz.asc
+-rw-r--r--  1 root root       348 Jun 13  2009 ./slackware64/ap/dmapi-2.2.10-x86_64-1.txt
+-rw-r--r--  1 root root     30804 Jun 13  2009 ./slackware64/ap/dmapi-2.2.10-x86_64-1.txz
+-rw-r--r--  1 root root       197 Jun 13  2009 ./slackware64/ap/dmapi-2.2.10-x86_64-1.txz.asc
+-rw-r--r--  1 root root       473 Mar 19 20:29 ./slackware64/ap/dmidecode-2.11-x86_64-1.txt
+-rw-r--r--  1 root root     54820 Mar 19 20:29 ./slackware64/ap/dmidecode-2.11-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar 19 20:29 ./slackware64/ap/dmidecode-2.11-x86_64-1.txz.asc
+-rw-r--r--  1 root root       360 Apr 14 18:30 ./slackware64/ap/dvd+rw-tools-7.1-x86_64-2.txt
+-rw-r--r--  1 root root    110456 Apr 14 18:30 ./slackware64/ap/dvd+rw-tools-7.1-x86_64-2.txz
+-rw-r--r--  1 root root       198 Apr 14 18:30 ./slackware64/ap/dvd+rw-tools-7.1-x86_64-2.txz.asc
+-rw-r--r--  1 root root       461 Jul 28  2010 ./slackware64/ap/enscript-1.6.5.2-x86_64-1.txt
+-rw-r--r--  1 root root    370380 Jul 28  2010 ./slackware64/ap/enscript-1.6.5.2-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jul 28  2010 ./slackware64/ap/enscript-1.6.5.2-x86_64-1.txz.asc
+-rw-r--r--  1 root root       603 Mar  9 20:08 ./slackware64/ap/flac-1.2.1-x86_64-3.txt
+-rw-r--r--  1 root root    801156 Mar  9 20:08 ./slackware64/ap/flac-1.2.1-x86_64-3.txz
+-rw-r--r--  1 root root       198 Mar  9 20:08 ./slackware64/ap/flac-1.2.1-x86_64-3.txz.asc
+-rw-r--r--  1 root root       637 Jan  1 20:05 ./slackware64/ap/foomatic-filters-4.0.6-x86_64-1.txt
+-rw-r--r--  1 root root     78652 Jan  1 20:05 ./slackware64/ap/foomatic-filters-4.0.6-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan  1 20:05 ./slackware64/ap/foomatic-filters-4.0.6-x86_64-1.txz.asc
+-rw-r--r--  1 root root       549 Dec 28 19:36 ./slackware64/ap/ghostscript-9.00-x86_64-2.txt
+-rw-r--r--  1 root root  12144188 Dec 28 19:36 ./slackware64/ap/ghostscript-9.00-x86_64-2.txz
+-rw-r--r--  1 root root       198 Dec 28 19:36 ./slackware64/ap/ghostscript-9.00-x86_64-2.txz.asc
+-rw-r--r--  1 root root       368 Oct  1  2008 ./slackware64/ap/ghostscript-fonts-std-8.11-noarch-1.txt
+-rw-r--r--  1 root root   3517036 Oct  1  2008 ./slackware64/ap/ghostscript-fonts-std-8.11-noarch-1.txz
+-rw-r--r--  1 root root       197 Oct  1  2008 ./slackware64/ap/ghostscript-fonts-std-8.11-noarch-1.txz.asc
+-rw-r--r--  1 root root       303 Dec 30 19:48 ./slackware64/ap/gphoto2-2.4.10-x86_64-1.txt
+-rw-r--r--  1 root root    166688 Dec 30 19:48 ./slackware64/ap/gphoto2-2.4.10-x86_64-1.txz
+-rw-r--r--  1 root root       198 Dec 30 19:48 ./slackware64/ap/gphoto2-2.4.10-x86_64-1.txz.asc
+-rw-r--r--  1 root root       431 Jan 27 19:39 ./slackware64/ap/groff-1.21-x86_64-1.txt
+-rw-r--r--  1 root root   1883028 Jan 27 19:39 ./slackware64/ap/groff-1.21-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan 27 19:39 ./slackware64/ap/groff-1.21-x86_64-1.txz.asc
+-rw-r--r--  1 root root       549 Nov 27 22:12 ./slackware64/ap/gutenprint-5.2.6-x86_64-1.txt
+-rw-r--r--  1 root root   2102464 Nov 27 22:12 ./slackware64/ap/gutenprint-5.2.6-x86_64-1.txz
+-rw-r--r--  1 root root       198 Nov 27 22:12 ./slackware64/ap/gutenprint-5.2.6-x86_64-1.txz.asc
+-rw-r--r--  1 root root       477 Mar 27 03:22 ./slackware64/ap/hplip-3.11.3a-x86_64-1.txt
+-rw-r--r--  1 root root  12530856 Mar 27 03:22 ./slackware64/ap/hplip-3.11.3a-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar 27 03:22 ./slackware64/ap/hplip-3.11.3a-x86_64-1.txz.asc
+-rwxr-xr-x  1 root root      2897 Jun 24  2009 ./slackware64/ap/install-packages
+-rw-r--r--  1 root root       446 Sep 18  2006 ./slackware64/ap/install.end
+-rw-r--r--  1 root root       600 Mar 16  2009 ./slackware64/ap/ispell-3.2.06-x86_64-1.txt
+-rw-r--r--  1 root root    347684 Mar 16  2009 ./slackware64/ap/ispell-3.2.06-x86_64-1.txz
+-rw-r--r--  1 root root       197 Mar 16  2009 ./slackware64/ap/ispell-3.2.06-x86_64-1.txz.asc
+-rw-r--r--  1 root root       484 Feb 18  2010 ./slackware64/ap/jed-0.99_19-x86_64-1.txt
+-rw-r--r--  1 root root    527460 Feb 18  2010 ./slackware64/ap/jed-0.99_19-x86_64-1.txz
+-rw-r--r--  1 root root       197 Feb 18  2010 ./slackware64/ap/jed-0.99_19-x86_64-1.txz.asc
+-rw-r--r--  1 root root       145 Jul 28  2010 ./slackware64/ap/joe-3.7-x86_64-1.txt
+-rw-r--r--  1 root root    318084 Jul 28  2010 ./slackware64/ap/joe-3.7-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jul 28  2010 ./slackware64/ap/joe-3.7-x86_64-1.txz.asc
+-rw-r--r--  1 root root       337 Jul 28  2010 ./slackware64/ap/jove-4.16.0.73-x86_64-1.txt
+-rw-r--r--  1 root root    150256 Jul 28  2010 ./slackware64/ap/jove-4.16.0.73-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jul 28  2010 ./slackware64/ap/jove-4.16.0.73-x86_64-1.txz.asc
+-rw-r--r--  1 root root       540 Jul 28  2010 ./slackware64/ap/ksh93-2010_06_21-x86_64-1.txt
+-rw-r--r--  1 root root    764160 Jul 28  2010 ./slackware64/ap/ksh93-2010_06_21-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jul 28  2010 ./slackware64/ap/ksh93-2010_06_21-x86_64-1.txz.asc
+-rw-r--r--  1 root root       316 Dec 12  2008 ./slackware64/ap/libx86-1.1-x86_64-1.txt
+-rw-r--r--  1 root root     59200 Dec 12  2008 ./slackware64/ap/libx86-1.1-x86_64-1.txz
+-rw-r--r--  1 root root       197 Dec 12  2008 ./slackware64/ap/libx86-1.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       701 Mar 21 17:59 ./slackware64/ap/linuxdoc-tools-0.9.66-x86_64-8.txt
+-rw-r--r--  1 root root   4686392 Mar 21 17:59 ./slackware64/ap/linuxdoc-tools-0.9.66-x86_64-8.txz
+-rw-r--r--  1 root root       198 Mar 21 17:59 ./slackware64/ap/linuxdoc-tools-0.9.66-x86_64-8.txz.asc
+-rw-r--r--  1 root root       644 May  3  2010 ./slackware64/ap/lm_sensors-3.1.2-x86_64-1.txt
+-rw-r--r--  1 root root    127248 May  3  2010 ./slackware64/ap/lm_sensors-3.1.2-x86_64-1.txz
+-rw-r--r--  1 root root       198 May  3  2010 ./slackware64/ap/lm_sensors-3.1.2-x86_64-1.txz.asc
+-rw-r--r--  1 root root       333 Mar 13  2010 ./slackware64/ap/lsof-4.83-x86_64-1.txt
+-rw-r--r--  1 root root    277000 Mar 13  2010 ./slackware64/ap/lsof-4.83-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar 13  2010 ./slackware64/ap/lsof-4.83-x86_64-1.txz.asc
+-rw-r--r--  1 root root       367 Dec 30 18:19 ./slackware64/ap/lsscsi-0.24-x86_64-1.txt
+-rw-r--r--  1 root root     31644 Dec 30 18:19 ./slackware64/ap/lsscsi-0.24-x86_64-1.txz
+-rw-r--r--  1 root root       198 Dec 30 18:19 ./slackware64/ap/lsscsi-0.24-x86_64-1.txz.asc
+-rw-r--r--  1 root root       507 Mar 15 22:32 ./slackware64/ap/lxc-0.7.4-x86_64-2.txt
+-rw-r--r--  1 root root    128452 Mar 15 22:32 ./slackware64/ap/lxc-0.7.4-x86_64-2.txz
+-rw-r--r--  1 root root       198 Mar 15 22:32 ./slackware64/ap/lxc-0.7.4-x86_64-2.txz.asc
+-rw-r--r--  1 root root       339 Apr  2 18:04 ./slackware64/ap/madplay-0.15.2b-x86_64-3.txt
+-rw-r--r--  1 root root     60412 Apr  2 18:04 ./slackware64/ap/madplay-0.15.2b-x86_64-3.txz
+-rw-r--r--  1 root root       198 Apr  2 18:04 ./slackware64/ap/madplay-0.15.2b-x86_64-3.txz.asc
+-rw-r--r--  1 root root      5564 Feb 26 04:35 ./slackware64/ap/maketag
+-rw-r--r--  1 root root      5564 Feb 26 04:35 ./slackware64/ap/maketag.ez
+-rw-r--r--  1 root root       447 Mar 27 07:48 ./slackware64/ap/man-1.6g-x86_64-1.txt
+-rw-r--r--  1 root root    219556 Mar 27 07:48 ./slackware64/ap/man-1.6g-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar 27 07:48 ./slackware64/ap/man-1.6g-x86_64-1.txz.asc
+-rw-r--r--  1 root root       490 Dec 15 00:05 ./slackware64/ap/man-pages-3.32-noarch-1.txt
+-rw-r--r--  1 root root   2501352 Dec 15 00:05 ./slackware64/ap/man-pages-3.32-noarch-1.txz
+-rw-r--r--  1 root root       198 Dec 15 00:05 ./slackware64/ap/man-pages-3.32-noarch-1.txz.asc
+-rw-r--r--  1 root root       451 Apr 14 18:04 ./slackware64/ap/mc-4.7.5.2-x86_64-1.txt
+-rw-r--r--  1 root root   1466028 Apr 14 18:04 ./slackware64/ap/mc-4.7.5.2-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr 14 18:04 ./slackware64/ap/mc-4.7.5.2-x86_64-1.txz.asc
+-rw-r--r--  1 root root       419 Jan 23 01:11 ./slackware64/ap/moc-2.5.0_alpha4-x86_64-1.txt
+-rw-r--r--  1 root root    190016 Jan 23 01:11 ./slackware64/ap/moc-2.5.0_alpha4-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan 23 01:11 ./slackware64/ap/moc-2.5.0_alpha4-x86_64-1.txz.asc
+-rw-r--r--  1 root root       378 Jun 25  2009 ./slackware64/ap/most-5.0.0a-x86_64-2.txt
+-rw-r--r--  1 root root     45504 Jun 25  2009 ./slackware64/ap/most-5.0.0a-x86_64-2.txz
+-rw-r--r--  1 root root       197 Jun 25  2009 ./slackware64/ap/most-5.0.0a-x86_64-2.txz.asc
+-rw-r--r--  1 root root       331 Apr 22 17:35 ./slackware64/ap/mpg123-1.13.3-x86_64-1.txt
+-rw-r--r--  1 root root    243172 Apr 22 17:35 ./slackware64/ap/mpg123-1.13.3-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr 22 17:35 ./slackware64/ap/mpg123-1.13.3-x86_64-1.txz.asc
+-rw-r--r--  1 root root       360 Apr  5 22:02 ./slackware64/ap/mysql-5.1.56-x86_64-1.txt
+-rw-r--r--  1 root root   8518712 Apr  5 22:02 ./slackware64/ap/mysql-5.1.56-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr  5 22:02 ./slackware64/ap/mysql-5.1.56-x86_64-1.txz.asc
+-rw-r--r--  1 root root       415 Mar  1 18:19 ./slackware64/ap/nano-2.3.0-x86_64-1.txt
+-rw-r--r--  1 root root    392196 Mar  1 18:19 ./slackware64/ap/nano-2.3.0-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar  1 18:19 ./slackware64/ap/nano-2.3.0-x86_64-1.txz.asc
+-rw-r--r--  1 root root       514 Jun 10  2009 ./slackware64/ap/normalize-0.7.7-x86_64-1.txt
+-rw-r--r--  1 root root     60608 Jun 10  2009 ./slackware64/ap/normalize-0.7.7-x86_64-1.txz
+-rw-r--r--  1 root root       197 Jun 10  2009 ./slackware64/ap/normalize-0.7.7-x86_64-1.txz.asc
+-rw-r--r--  1 root root       604 Oct 23  2008 ./slackware64/ap/ntfsprogs-2.0.0-x86_64-2.txt
+-rw-r--r--  1 root root    273544 Oct 23  2008 ./slackware64/ap/ntfsprogs-2.0.0-x86_64-2.txz
+-rw-r--r--  1 root root       197 Oct 23  2008 ./slackware64/ap/ntfsprogs-2.0.0-x86_64-2.txz.asc
+-rw-r--r--  1 root root       375 Jan 22 04:30 ./slackware64/ap/pm-utils-1.4.1-x86_64-2.txt
+-rw-r--r--  1 root root     68804 Jan 22 04:30 ./slackware64/ap/pm-utils-1.4.1-x86_64-2.txz
+-rw-r--r--  1 root root       198 Jan 22 04:30 ./slackware64/ap/pm-utils-1.4.1-x86_64-2.txz.asc
+-rw-r--r--  1 root root       548 Jan  2 23:00 ./slackware64/ap/powertop-1.13-x86_64-1.txt
+-rw-r--r--  1 root root     72224 Jan  2 23:00 ./slackware64/ap/powertop-1.13-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan  2 23:00 ./slackware64/ap/powertop-1.13-x86_64-1.txz.asc
+-rw-r--r--  1 root root       345 Apr 27  2010 ./slackware64/ap/radeontool-1.6.1-x86_64-1.txt
+-rw-r--r--  1 root root     52080 Apr 27  2010 ./slackware64/ap/radeontool-1.6.1-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr 27  2010 ./slackware64/ap/radeontool-1.6.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       372 May 23  2009 ./slackware64/ap/rexima-1.4-x86_64-2.txt
+-rw-r--r--  1 root root     16960 May 23  2009 ./slackware64/ap/rexima-1.4-x86_64-2.txz
+-rw-r--r--  1 root root       197 May 23  2009 ./slackware64/ap/rexima-1.4-x86_64-2.txz.asc
+-rw-r--r--  1 root root       493 Dec  3 20:05 ./slackware64/ap/rpm-4.8.1-x86_64-1.txt
+-rw-r--r--  1 root root    782528 Dec  3 20:05 ./slackware64/ap/rpm-4.8.1-x86_64-1.txz
+-rw-r--r--  1 root root       198 Dec  3 20:05 ./slackware64/ap/rpm-4.8.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       268 Oct 23  2008 ./slackware64/ap/rzip-2.1-x86_64-1.txt
+-rw-r--r--  1 root root     20372 Oct 23  2008 ./slackware64/ap/rzip-2.1-x86_64-1.txz
+-rw-r--r--  1 root root       197 Oct 23  2008 ./slackware64/ap/rzip-2.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       123 Jul 28  2010 ./slackware64/ap/sc-7.16-x86_64-3.txt
+-rw-r--r--  1 root root    195392 Jul 28  2010 ./slackware64/ap/sc-7.16-x86_64-3.txz
+-rw-r--r--  1 root root       198 Jul 28  2010 ./slackware64/ap/sc-7.16-x86_64-3.txz.asc
+-rw-r--r--  1 root root       654 May 23  2009 ./slackware64/ap/screen-4.0.3-x86_64-2.txt
+-rw-r--r--  1 root root    492712 May 23  2009 ./slackware64/ap/screen-4.0.3-x86_64-2.txz
+-rw-r--r--  1 root root       197 May 23  2009 ./slackware64/ap/screen-4.0.3-x86_64-2.txz.asc
+-rw-r--r--  1 root root       455 Dec 14  2008 ./slackware64/ap/seejpeg-1.10-x86_64-1.txt
+-rw-r--r--  1 root root     53832 Dec 14  2008 ./slackware64/ap/seejpeg-1.10-x86_64-1.txz
+-rw-r--r--  1 root root       197 Dec 14  2008 ./slackware64/ap/seejpeg-1.10-x86_64-1.txz.asc
+-rw-r--r--  1 root root     57936 Apr  5 05:59 ./slackware64/ap/slackpkg-2.82.0-noarch-5.tgz
+-rw-r--r--  1 root root       198 Apr  5 05:59 ./slackware64/ap/slackpkg-2.82.0-noarch-5.tgz.asc
+-rw-r--r--  1 root root       441 Apr  5 05:59 ./slackware64/ap/slackpkg-2.82.0-noarch-5.txt
+-rw-r--r--  1 root root       295 Apr  2 22:36 ./slackware64/ap/sox-14.3.2-x86_64-1.txt
+-rw-r--r--  1 root root    372428 Apr  2 22:36 ./slackware64/ap/sox-14.3.2-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr  2 22:36 ./slackware64/ap/sox-14.3.2-x86_64-1.txz.asc
+-rw-r--r--  1 root root       484 Apr  1 02:47 ./slackware64/ap/sqlite-3.7.5-x86_64-1.txt
+-rw-r--r--  1 root root    356452 Apr  1 02:47 ./slackware64/ap/sqlite-3.7.5-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr  1 02:47 ./slackware64/ap/sqlite-3.7.5-x86_64-1.txz.asc
+-rw-r--r--  1 root root       414 Feb  9 20:55 ./slackware64/ap/sudo-1.7.4p6-x86_64-1.txt
+-rw-r--r--  1 root root    170704 Feb  9 20:55 ./slackware64/ap/sudo-1.7.4p6-x86_64-1.txz
+-rw-r--r--  1 root root       198 Feb  9 20:55 ./slackware64/ap/sudo-1.7.4p6-x86_64-1.txz.asc
+-rw-r--r--  1 root root       444 Apr 25  2010 ./slackware64/ap/sysstat-9.0.6.1-x86_64-1.txt
+-rw-r--r--  1 root root    185340 Apr 25  2010 ./slackware64/ap/sysstat-9.0.6.1-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr 25  2010 ./slackware64/ap/sysstat-9.0.6.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       812 Feb 26 04:35 ./slackware64/ap/tagfile
+-rw-r--r--  1 root root       616 Jul 28  2010 ./slackware64/ap/texinfo-4.13a-x86_64-4.txt
+-rw-r--r--  1 root root    761204 Jul 28  2010 ./slackware64/ap/texinfo-4.13a-x86_64-4.txz
+-rw-r--r--  1 root root       198 Jul 28  2010 ./slackware64/ap/texinfo-4.13a-x86_64-4.txz.asc
+-rw-r--r--  1 root root       375 Dec 12  2008 ./slackware64/ap/vbetool-1.1-x86_64-1.txt
+-rw-r--r--  1 root root     22748 Dec 12  2008 ./slackware64/ap/vbetool-1.1-x86_64-1.txz
+-rw-r--r--  1 root root       197 Dec 12  2008 ./slackware64/ap/vbetool-1.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       385 Apr  4 05:16 ./slackware64/ap/vim-7.3.154-x86_64-1.txt
+-rw-r--r--  1 root root   6583868 Apr  4 05:16 ./slackware64/ap/vim-7.3.154-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr  4 05:16 ./slackware64/ap/vim-7.3.154-x86_64-1.txz.asc
+-rw-r--r--  1 root root       608 Jul 28  2010 ./slackware64/ap/vorbis-tools-1.4.0-x86_64-1.txt
+-rw-r--r--  1 root root    176832 Jul 28  2010 ./slackware64/ap/vorbis-tools-1.4.0-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jul 28  2010 ./slackware64/ap/vorbis-tools-1.4.0-x86_64-1.txz.asc
+-rw-r--r--  1 root root       230 Jul 28  2010 ./slackware64/ap/workbone-2.40-x86_64-4.txt
+-rw-r--r--  1 root root     12000 Jul 28  2010 ./slackware64/ap/workbone-2.40-x86_64-4.txz
+-rw-r--r--  1 root root       198 Jul 28  2010 ./slackware64/ap/workbone-2.40-x86_64-4.txz.asc
+-rw-r--r--  1 root root       525 Feb  9  2010 ./slackware64/ap/xfsdump-3.0.4-x86_64-1.txt
+-rw-r--r--  1 root root    299376 Feb  9  2010 ./slackware64/ap/xfsdump-3.0.4-x86_64-1.txz
+-rw-r--r--  1 root root       197 Feb  9  2010 ./slackware64/ap/xfsdump-3.0.4-x86_64-1.txz.asc
+-rw-r--r--  1 root root       508 Mar 19 23:51 ./slackware64/ap/zsh-4.3.11-x86_64-1.txt
+-rw-r--r--  1 root root   2381880 Mar 19 23:51 ./slackware64/ap/zsh-4.3.11-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar 19 23:51 ./slackware64/ap/zsh-4.3.11-x86_64-1.txz.asc
+drwxr-xr-x  2 root root     12288 Apr 16 04:36 ./slackware64/d
+-rw-r--r--  1 root root       631 Nov  6 17:44 ./slackware64/d/autoconf-2.68-noarch-1.txt
+-rw-r--r--  1 root root    715476 Nov  6 17:44 ./slackware64/d/autoconf-2.68-noarch-1.txz
+-rw-r--r--  1 root root       198 Nov  6 17:44 ./slackware64/d/autoconf-2.68-noarch-1.txz.asc
+-rw-r--r--  1 root root       627 Dec 15 01:05 ./slackware64/d/automake-1.11.1-noarch-2.txt
+-rw-r--r--  1 root root    572792 Dec 15 01:05 ./slackware64/d/automake-1.11.1-noarch-2.txz
+-rw-r--r--  1 root root       198 Dec 15 01:05 ./slackware64/d/automake-1.11.1-noarch-2.txz.asc
+-rw-r--r--  1 root root       443 Jan 22 04:47 ./slackware64/d/binutils-2.21.51.0.6-x86_64-1.txt
+-rw-r--r--  1 root root   3273712 Jan 22 04:47 ./slackware64/d/binutils-2.21.51.0.6-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan 22 04:47 ./slackware64/d/binutils-2.21.51.0.6-x86_64-1.txz.asc
+-rw-r--r--  1 root root       471 Dec 15 00:54 ./slackware64/d/bison-2.4.3-x86_64-2.txt
+-rw-r--r--  1 root root    434216 Dec 15 00:54 ./slackware64/d/bison-2.4.3-x86_64-2.txz
+-rw-r--r--  1 root root       198 Dec 15 00:54 ./slackware64/d/bison-2.4.3-x86_64-2.txz.asc
+-rw-r--r--  1 root root       314 Jan 11 20:15 ./slackware64/d/ccache-3.1.4-x86_64-1.txt
+-rw-r--r--  1 root root     75544 Jan 11 20:15 ./slackware64/d/ccache-3.1.4-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan 11 20:15 ./slackware64/d/ccache-3.1.4-x86_64-1.txz.asc
+-rw-r--r--  1 root root       665 Jul 20  2010 ./slackware64/d/clisp-2.49-x86_64-1.txt
+-rw-r--r--  1 root root   2806928 Jul 20  2010 ./slackware64/d/clisp-2.49-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jul 20  2010 ./slackware64/d/clisp-2.49-x86_64-1.txz.asc
+-rw-r--r--  1 root root       397 Mar 17 23:07 ./slackware64/d/cmake-2.8.4-x86_64-1.txt
+-rw-r--r--  1 root root   4812380 Mar 17 23:07 ./slackware64/d/cmake-2.8.4-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar 17 23:07 ./slackware64/d/cmake-2.8.4-x86_64-1.txz.asc
+-rw-r--r--  1 root root       350 May  3  2010 ./slackware64/d/cscope-15.7a-x86_64-1.txt
+-rw-r--r--  1 root root     98548 May  3  2010 ./slackware64/d/cscope-15.7a-x86_64-1.txz
+-rw-r--r--  1 root root       198 May  3  2010 ./slackware64/d/cscope-15.7a-x86_64-1.txz.asc
+-rw-r--r--  1 root root       538 Oct 15  2008 ./slackware64/d/cvs-1.11.23-x86_64-1.txt
+-rw-r--r--  1 root root    859048 Oct 15  2008 ./slackware64/d/cvs-1.11.23-x86_64-1.txz
+-rw-r--r--  1 root root       197 Oct 15  2008 ./slackware64/d/cvs-1.11.23-x86_64-1.txz.asc
+-rw-r--r--  1 root root       412 May 23  2009 ./slackware64/d/dev86-0.16.17-x86_64-2.txt
+-rw-r--r--  1 root root    287864 May 23  2009 ./slackware64/d/dev86-0.16.17-x86_64-2.txz
+-rw-r--r--  1 root root       197 May 23  2009 ./slackware64/d/dev86-0.16.17-x86_64-2.txz.asc
+-rw-r--r--  1 root root       483 Nov  4  2008 ./slackware64/d/distcc-2.18.3-x86_64-2.txt
+-rw-r--r--  1 root root    116144 Nov  4  2008 ./slackware64/d/distcc-2.18.3-x86_64-2.txz
+-rw-r--r--  1 root root       197 Nov  4  2008 ./slackware64/d/distcc-2.18.3-x86_64-2.txz.asc
+-rw-r--r--  1 root root       511 Jan 11 20:48 ./slackware64/d/doxygen-1.7.3-x86_64-1.txt
+-rw-r--r--  1 root root   3012292 Jan 11 20:48 ./slackware64/d/doxygen-1.7.3-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan 11 20:48 ./slackware64/d/doxygen-1.7.3-x86_64-1.txz.asc
+-rw-r--r--  1 root root       331 Oct 22  2008 ./slackware64/d/flex-2.5.35-x86_64-1.txt
+-rw-r--r--  1 root root    270228 Oct 22  2008 ./slackware64/d/flex-2.5.35-x86_64-1.txz
+-rw-r--r--  1 root root       197 Oct 22  2008 ./slackware64/d/flex-2.5.35-x86_64-1.txz.asc
+-rw-r--r--  1 root root       302 Feb  8 03:04 ./slackware64/d/gcc-4.5.2-x86_64-2.txt
+-rw-r--r--  1 root root  11372548 Feb  8 03:04 ./slackware64/d/gcc-4.5.2-x86_64-2.txz
+-rw-r--r--  1 root root       198 Feb  8 03:04 ./slackware64/d/gcc-4.5.2-x86_64-2.txz.asc
+-rw-r--r--  1 root root       295 Feb  8 03:04 ./slackware64/d/gcc-g++-4.5.2-x86_64-2.txt
+-rw-r--r--  1 root root   5059648 Feb  8 03:04 ./slackware64/d/gcc-g++-4.5.2-x86_64-2.txz
+-rw-r--r--  1 root root       198 Feb  8 03:04 ./slackware64/d/gcc-g++-4.5.2-x86_64-2.txz.asc
+-rw-r--r--  1 root root       768 Feb  8 03:04 ./slackware64/d/gcc-gfortran-4.5.2-x86_64-2.txt
+-rw-r--r--  1 root root   4189956 Feb  8 03:04 ./slackware64/d/gcc-gfortran-4.5.2-x86_64-2.txz
+-rw-r--r--  1 root root       198 Feb  8 03:04 ./slackware64/d/gcc-gfortran-4.5.2-x86_64-2.txz.asc
+-rw-r--r--  1 root root       384 Feb  8 03:05 ./slackware64/d/gcc-gnat-4.5.2-x86_64-2.txt
+-rw-r--r--  1 root root  10171112 Feb  8 03:05 ./slackware64/d/gcc-gnat-4.5.2-x86_64-2.txz
+-rw-r--r--  1 root root       198 Feb  8 03:05 ./slackware64/d/gcc-gnat-4.5.2-x86_64-2.txz.asc
+-rw-r--r--  1 root root       358 Feb  8 03:06 ./slackware64/d/gcc-java-4.5.2-x86_64-2.txt
+-rw-r--r--  1 root root  24823480 Feb  8 03:06 ./slackware64/d/gcc-java-4.5.2-x86_64-2.txz
+-rw-r--r--  1 root root       198 Feb  8 03:06 ./slackware64/d/gcc-java-4.5.2-x86_64-2.txz.asc
+-rw-r--r--  1 root root       503 Feb  8 03:06 ./slackware64/d/gcc-objc-4.5.2-x86_64-2.txt
+-rw-r--r--  1 root root   3561240 Feb  8 03:06 ./slackware64/d/gcc-objc-4.5.2-x86_64-2.txz
+-rw-r--r--  1 root root       198 Feb  8 03:06 ./slackware64/d/gcc-objc-4.5.2-x86_64-2.txz.asc
+-rw-r--r--  1 root root       757 Apr  7 23:38 ./slackware64/d/gdb-7.2-x86_64-2.txt
+-rw-r--r--  1 root root   2361264 Apr  7 23:38 ./slackware64/d/gdb-7.2-x86_64-2.txz
+-rw-r--r--  1 root root       198 Apr  7 23:38 ./slackware64/d/gdb-7.2-x86_64-2.txz.asc
+-rw-r--r--  1 root root       629 Nov  6 19:18 ./slackware64/d/gettext-tools-0.18.1.1-x86_64-1.txt
+-rw-r--r--  1 root root   2474296 Nov  6 19:18 ./slackware64/d/gettext-tools-0.18.1.1-x86_64-1.txz
+-rw-r--r--  1 root root       198 Nov  6 19:18 ./slackware64/d/gettext-tools-0.18.1.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       397 Apr 14 17:58 ./slackware64/d/git-1.7.4.4-x86_64-1.txt
+-rw-r--r--  1 root root   2730228 Apr 14 17:58 ./slackware64/d/git-1.7.4.4-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr 14 17:58 ./slackware64/d/git-1.7.4.4-x86_64-1.txz.asc
+-rw-r--r--  1 root root       562 Jul 29  2010 ./slackware64/d/gperf-3.0.4-x86_64-1.txt
+-rw-r--r--  1 root root     98760 Jul 29  2010 ./slackware64/d/gperf-3.0.4-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jul 29  2010 ./slackware64/d/gperf-3.0.4-x86_64-1.txz.asc
+-rw-r--r--  1 root root       438 Jan 11 19:10 ./slackware64/d/guile-1.8.8-x86_64-1.txt
+-rw-r--r--  1 root root   1547052 Jan 11 19:10 ./slackware64/d/guile-1.8.8-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan 11 19:10 ./slackware64/d/guile-1.8.8-x86_64-1.txz.asc
+-rw-r--r--  1 root root       432 Mar  4  2009 ./slackware64/d/indent-2.2.10-x86_64-1.txt
+-rw-r--r--  1 root root    122708 Mar  4  2009 ./slackware64/d/indent-2.2.10-x86_64-1.txz
+-rw-r--r--  1 root root       197 Mar  4  2009 ./slackware64/d/indent-2.2.10-x86_64-1.txz.asc
+-rwxr-xr-x  1 root root      2897 Jun 24  2009 ./slackware64/d/install-packages
+-rw-r--r--  1 root root       446 Sep 18  2006 ./slackware64/d/install.end
+-rw-r--r--  1 root root       233 Jan 11 19:15 ./slackware64/d/intltool-0.41.1-x86_64-1.txt
+-rw-r--r--  1 root root     44448 Jan 11 19:15 ./slackware64/d/intltool-0.41.1-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan 11 19:15 ./slackware64/d/intltool-0.41.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       332 Apr  9 18:20 ./slackware64/d/kernel-headers-2.6.37.6-x86-2.txt
+-rw-r--r--  1 root root    558888 Apr  9 18:20 ./slackware64/d/kernel-headers-2.6.37.6-x86-2.txz
+-rw-r--r--  1 root root       198 Apr  9 18:20 ./slackware64/d/kernel-headers-2.6.37.6-x86-2.txz.asc
+-rw-r--r--  1 root root       500 Nov  6 18:40 ./slackware64/d/libtool-2.4-x86_64-1.txt
+-rw-r--r--  1 root root    412188 Nov  6 18:40 ./slackware64/d/libtool-2.4-x86_64-1.txz
+-rw-r--r--  1 root root       198 Nov  6 18:40 ./slackware64/d/libtool-2.4-x86_64-1.txz.asc
+-rw-r--r--  1 root root       475 Mar  7 19:22 ./slackware64/d/m4-1.4.16-x86_64-1.txt
+-rw-r--r--  1 root root    219832 Mar  7 19:22 ./slackware64/d/m4-1.4.16-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar  7 19:22 ./slackware64/d/m4-1.4.16-x86_64-1.txz.asc
+-rw-r--r--  1 root root       468 Aug 30  2010 ./slackware64/d/make-3.82-x86_64-2.txt
+-rw-r--r--  1 root root    406704 Aug 30  2010 ./slackware64/d/make-3.82-x86_64-2.txz
+-rw-r--r--  1 root root       198 Aug 30  2010 ./slackware64/d/make-3.82-x86_64-2.txz.asc
+-rw-r--r--  1 root root      3717 Jan 11 21:07 ./slackware64/d/maketag
+-rw-r--r--  1 root root      3717 Jan 11 21:07 ./slackware64/d/maketag.ez
+-rw-r--r--  1 root root       664 Apr  4 03:00 ./slackware64/d/mercurial-1.8.2-x86_64-1.txt
+-rw-r--r--  1 root root   1434792 Apr  4 03:00 ./slackware64/d/mercurial-1.8.2-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr  4 03:00 ./slackware64/d/mercurial-1.8.2-x86_64-1.txz.asc
+-rw-r--r--  1 root root       310 Jan 11 19:19 ./slackware64/d/nasm-2.09.04-x86_64-1.txt
+-rw-r--r--  1 root root    371656 Jan 11 19:19 ./slackware64/d/nasm-2.09.04-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan 11 19:19 ./slackware64/d/nasm-2.09.04-x86_64-1.txz.asc
+-rw-r--r--  1 root root       506 Jan 22 04:51 ./slackware64/d/oprofile-0.9.6-x86_64-5.txt
+-rw-r--r--  1 root root    766372 Jan 22 04:51 ./slackware64/d/oprofile-0.9.6-x86_64-5.txz
+-rw-r--r--  1 root root       198 Jan 22 04:51 ./slackware64/d/oprofile-0.9.6-x86_64-5.txz.asc
+-rw-r--r--  1 root root       546 Nov  4  2008 ./slackware64/d/p2c-1.21alpha2-x86_64-3.txt
+-rw-r--r--  1 root root    314736 Nov  4  2008 ./slackware64/d/p2c-1.21alpha2-x86_64-3.txz
+-rw-r--r--  1 root root       197 Nov  4  2008 ./slackware64/d/p2c-1.21alpha2-x86_64-3.txz.asc
+-rw-r--r--  1 root root       516 Jan 26 18:55 ./slackware64/d/perl-5.12.3-x86_64-1.txt
+-rw-r--r--  1 root root  14849956 Jan 26 18:55 ./slackware64/d/perl-5.12.3-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan 26 18:55 ./slackware64/d/perl-5.12.3-x86_64-1.txz.asc
+-rw-r--r--  1 root root       446 Jul 29  2010 ./slackware64/d/pkg-config-0.25-x86_64-1.txt
+-rw-r--r--  1 root root     66148 Jul 29  2010 ./slackware64/d/pkg-config-0.25-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jul 29  2010 ./slackware64/d/pkg-config-0.25-x86_64-1.txz.asc
+-rw-r--r--  1 root root       339 Sep 21  2008 ./slackware64/d/pmake-1.111-x86_64-3.txt
+-rw-r--r--  1 root root     82500 Sep 21  2008 ./slackware64/d/pmake-1.111-x86_64-3.txz
+-rw-r--r--  1 root root       197 Sep 21  2008 ./slackware64/d/pmake-1.111-x86_64-3.txz.asc
+-rw-r--r--  1 root root       438 Nov 27 23:29 ./slackware64/d/python-2.6.6-x86_64-1.txt
+-rw-r--r--  1 root root  12633760 Nov 27 23:29 ./slackware64/d/python-2.6.6-x86_64-1.txz
+-rw-r--r--  1 root root       198 Nov 27 23:29 ./slackware64/d/python-2.6.6-x86_64-1.txz.asc
+-rw-r--r--  1 root root       322 Oct 15  2008 ./slackware64/d/rcs-5.7-x86_64-2.txt
+-rw-r--r--  1 root root    151448 Oct 15  2008 ./slackware64/d/rcs-5.7-x86_64-2.txz
+-rw-r--r--  1 root root       197 Oct 15  2008 ./slackware64/d/rcs-5.7-x86_64-2.txz.asc
+-rw-r--r--  1 root root       410 Mar  6 21:29 ./slackware64/d/ruby-1.9.1_p431-x86_64-1.txt
+-rw-r--r--  1 root root   3380460 Mar  6 21:29 ./slackware64/d/ruby-1.9.1_p431-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar  6 21:29 ./slackware64/d/ruby-1.9.1_p431-x86_64-1.txz.asc
+-rw-r--r--  1 root root       464 Nov 10 17:33 ./slackware64/d/slacktrack-2.08-x86_64-1.txt
+-rw-r--r--  1 root root     94744 Nov 10 17:33 ./slackware64/d/slacktrack-2.08-x86_64-1.txz
+-rw-r--r--  1 root root       198 Nov 10 17:33 ./slackware64/d/slacktrack-2.08-x86_64-1.txz.asc
+-rw-r--r--  1 root root       550 Jul 29  2010 ./slackware64/d/strace-4.5.20-x86_64-1.txt
+-rw-r--r--  1 root root    102968 Jul 29  2010 ./slackware64/d/strace-4.5.20-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jul 29  2010 ./slackware64/d/strace-4.5.20-x86_64-1.txz.asc
+-rw-r--r--  1 root root       597 Mar  9 21:00 ./slackware64/d/subversion-1.6.16-x86_64-1.txt
+-rw-r--r--  1 root root   3383116 Mar  9 21:00 ./slackware64/d/subversion-1.6.16-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar  9 21:00 ./slackware64/d/subversion-1.6.16-x86_64-1.txz.asc
+-rw-r--r--  1 root root       561 Jan 26 19:21 ./slackware64/d/swig-1.3.38-x86_64-2.txt
+-rw-r--r--  1 root root   2005440 Jan 26 19:21 ./slackware64/d/swig-1.3.38-x86_64-2.txz
+-rw-r--r--  1 root root       198 Jan 26 19:21 ./slackware64/d/swig-1.3.38-x86_64-2.txz.asc
+-rw-r--r--  1 root root       507 Jan 11 21:07 ./slackware64/d/tagfile
+-rw-r--r--  1 root root       592 Aug 31  2010 ./slackware64/d/yasm-1.1.0-x86_64-1.txt
+-rw-r--r--  1 root root    530020 Aug 31  2010 ./slackware64/d/yasm-1.1.0-x86_64-1.txz
+-rw-r--r--  1 root root       198 Aug 31  2010 ./slackware64/d/yasm-1.1.0-x86_64-1.txz.asc
+drwxr-xr-x  2 root root      4096 Mar 12 21:22 ./slackware64/e
+-rw-r--r--  1 root root       471 Mar 12 19:39 ./slackware64/e/emacs-23.3-x86_64-1.txt
+-rw-r--r--  1 root root  35063524 Mar 12 19:39 ./slackware64/e/emacs-23.3-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar 12 19:39 ./slackware64/e/emacs-23.3-x86_64-1.txz.asc
+-rwxr-xr-x  1 root root      2897 Jun 24  2009 ./slackware64/e/install-packages
+-rw-r--r--  1 root root       446 Sep 18  2006 ./slackware64/e/install.end
+-rw-r--r--  1 root root       953 Mar 12 20:23 ./slackware64/e/maketag
+-rw-r--r--  1 root root       953 Mar 12 20:23 ./slackware64/e/maketag.ez
+-rw-r--r--  1 root root        10 Mar 12 20:23 ./slackware64/e/tagfile
+drwxr-xr-x  2 root root      4096 Mar 19 04:51 ./slackware64/f
+-rwxr-xr-x  1 root root      2897 Jun 24  2009 ./slackware64/f/install-packages
+-rw-r--r--  1 root root       446 Sep 18  2006 ./slackware64/f/install.end
+-rw-r--r--  1 root root       502 Mar  1  2006 ./slackware64/f/linux-faqs-20060228-noarch-1.txt
+-rw-r--r--  1 root root    287176 Mar  1  2006 ./slackware64/f/linux-faqs-20060228-noarch-1.txz
+-rw-r--r--  1 root root       197 Mar  1  2006 ./slackware64/f/linux-faqs-20060228-noarch-1.txz.asc
+-rw-r--r--  1 root root       341 Mar 19 04:35 ./slackware64/f/linux-howtos-20110210-noarch-1.txt
+-rw-r--r--  1 root root   6560668 Mar 19 04:35 ./slackware64/f/linux-howtos-20110210-noarch-1.txz
+-rw-r--r--  1 root root       198 Mar 19 04:35 ./slackware64/f/linux-howtos-20110210-noarch-1.txz.asc
+-rw-r--r--  1 root root      1064 Mar  1  2010 ./slackware64/f/maketag
+-rw-r--r--  1 root root      1064 Mar  1  2010 ./slackware64/f/maketag.ez
+-rw-r--r--  1 root root        32 Mar  1  2010 ./slackware64/f/tagfile
+drwxr-xr-x  2 root root      4096 Apr 13 03:25 ./slackware64/k
+-rwxr-xr-x  1 root root      2897 Jun 24  2009 ./slackware64/k/install-packages
+-rw-r--r--  1 root root       446 Sep 18  2006 ./slackware64/k/install.end
+-rw-r--r--  1 root root       482 Apr 12 04:02 ./slackware64/k/kernel-source-2.6.37.6-noarch-2.txt
+-rw-r--r--  1 root root  64338348 Apr 12 04:02 ./slackware64/k/kernel-source-2.6.37.6-noarch-2.txz
+-rw-r--r--  1 root root       198 Apr 12 04:02 ./slackware64/k/kernel-source-2.6.37.6-noarch-2.txz.asc
+-rw-r--r--  1 root root      1161 Apr  7 22:22 ./slackware64/k/maketag
+-rw-r--r--  1 root root      1161 Apr  7 22:22 ./slackware64/k/maketag.ez
+-rw-r--r--  1 root root        18 Apr  7 22:22 ./slackware64/k/tagfile
+drwxr-xr-x  2 root root     12288 Apr  6 06:00 ./slackware64/kde
+-rw-r--r--  1 root root       322 Jan 15 20:04 ./slackware64/kde/amarok-2.4.0-x86_64-1.txt
+-rw-r--r--  1 root root  13190380 Jan 15 20:04 ./slackware64/kde/amarok-2.4.0-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan 15 20:04 ./slackware64/kde/amarok-2.4.0-x86_64-1.txz.asc
+-rwxr-xr-x  1 root root      2897 Jun 24  2009 ./slackware64/kde/install-packages
+-rw-r--r--  1 root root       446 Sep 18  2006 ./slackware64/kde/install.end
+-rw-r--r--  1 root root       382 Jan 26 05:19 ./slackware64/kde/k3b-2.0.2-x86_64-2.txt
+-rw-r--r--  1 root root   8749640 Jan 26 05:19 ./slackware64/kde/k3b-2.0.2-x86_64-2.txz
+-rw-r--r--  1 root root       198 Jan 26 05:19 ./slackware64/kde/k3b-2.0.2-x86_64-2.txz.asc
+-rw-r--r--  1 root root       295 Jan  7 20:18 ./slackware64/kde/kaudiocreator-r1212483-x86_64-1.txt
+-rw-r--r--  1 root root    125700 Jan  7 20:18 ./slackware64/kde/kaudiocreator-r1212483-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan  7 20:18 ./slackware64/kde/kaudiocreator-r1212483-x86_64-1.txz.asc
+-rw-r--r--  1 root root       414 Jan  7 18:24 ./slackware64/kde/kdeaccessibility-4.5.5-x86_64-1.txt
+-rw-r--r--  1 root root   4010380 Jan  7 18:24 ./slackware64/kde/kdeaccessibility-4.5.5-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan  7 18:24 ./slackware64/kde/kdeaccessibility-4.5.5-x86_64-1.txz.asc
+-rw-r--r--  1 root root       182 Mar 13 21:45 ./slackware64/kde/kdeadmin-4.5.5-x86_64-2.txt
+-rw-r--r--  1 root root   1241352 Mar 13 21:45 ./slackware64/kde/kdeadmin-4.5.5-x86_64-2.txz
+-rw-r--r--  1 root root       198 Mar 13 21:45 ./slackware64/kde/kdeadmin-4.5.5-x86_64-2.txz.asc
+-rw-r--r--  1 root root       233 Feb  9 07:10 ./slackware64/kde/kdeartwork-4.5.5-x86_64-2.txt
+-rw-r--r--  1 root root 101478988 Feb  9 07:10 ./slackware64/kde/kdeartwork-4.5.5-x86_64-2.txz
+-rw-r--r--  1 root root       198 Feb  9 07:10 ./slackware64/kde/kdeartwork-4.5.5-x86_64-2.txz.asc
+-rw-r--r--  1 root root       238 Apr  4 20:13 ./slackware64/kde/kdebase-4.5.5-x86_64-3.txt
+-rw-r--r--  1 root root   2931056 Apr  4 20:13 ./slackware64/kde/kdebase-4.5.5-x86_64-3.txz
+-rw-r--r--  1 root root       198 Apr  4 20:13 ./slackware64/kde/kdebase-4.5.5-x86_64-3.txz.asc
+-rw-r--r--  1 root root       292 Feb 12 23:19 ./slackware64/kde/kdebase-runtime-4.5.5-x86_64-2.txt
+-rw-r--r--  1 root root   6208856 Feb 12 23:19 ./slackware64/kde/kdebase-runtime-4.5.5-x86_64-2.txz
+-rw-r--r--  1 root root       198 Feb 12 23:19 ./slackware64/kde/kdebase-runtime-4.5.5-x86_64-2.txz.asc
+-rw-r--r--  1 root root       348 Jan  7 18:23 ./slackware64/kde/kdebase-workspace-4.5.5-x86_64-1.txt
+-rw-r--r--  1 root root  66360996 Jan  7 18:23 ./slackware64/kde/kdebase-workspace-4.5.5-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan  7 18:23 ./slackware64/kde/kdebase-workspace-4.5.5-x86_64-1.txz.asc
+-rw-r--r--  1 root root       513 Jan 26 20:19 ./slackware64/kde/kdebindings-4.5.5-x86_64-2.txt
+-rw-r--r--  1 root root   9575248 Jan 26 20:19 ./slackware64/kde/kdebindings-4.5.5-x86_64-2.txz
+-rw-r--r--  1 root root       198 Jan 26 20:19 ./slackware64/kde/kdebindings-4.5.5-x86_64-2.txz.asc
+-rw-r--r--  1 root root       181 Jan  7 19:11 ./slackware64/kde/kdeedu-4.5.5-x86_64-1.txt
+-rw-r--r--  1 root root  52631944 Jan  7 19:11 ./slackware64/kde/kdeedu-4.5.5-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan  7 19:11 ./slackware64/kde/kdeedu-4.5.5-x86_64-1.txz.asc
+-rw-r--r--  1 root root       187 Jan  7 18:47 ./slackware64/kde/kdegames-4.5.5-x86_64-1.txt
+-rw-r--r--  1 root root  50595152 Jan  7 18:47 ./slackware64/kde/kdegames-4.5.5-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan  7 18:47 ./slackware64/kde/kdegames-4.5.5-x86_64-1.txz.asc
+-rw-r--r--  1 root root       345 Mar 22 22:23 ./slackware64/kde/kdegraphics-4.5.5-x86_64-3.txt
+-rw-r--r--  1 root root   5081896 Mar 22 22:23 ./slackware64/kde/kdegraphics-4.5.5-x86_64-3.txz
+-rw-r--r--  1 root root       198 Mar 22 22:23 ./slackware64/kde/kdegraphics-4.5.5-x86_64-3.txz.asc
+-rw-r--r--  1 root root       191 Mar 28 21:00 ./slackware64/kde/kdelibs-4.5.5-x86_64-2.txt
+-rw-r--r--  1 root root  13467272 Mar 28 21:00 ./slackware64/kde/kdelibs-4.5.5-x86_64-2.txz
+-rw-r--r--  1 root root       198 Mar 28 21:00 ./slackware64/kde/kdelibs-4.5.5-x86_64-2.txz.asc
+-rw-r--r--  1 root root       513 Jan  7 18:29 ./slackware64/kde/kdemultimedia-4.5.5-x86_64-1.txt
+-rw-r--r--  1 root root   1612104 Jan  7 18:29 ./slackware64/kde/kdemultimedia-4.5.5-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan  7 18:29 ./slackware64/kde/kdemultimedia-4.5.5-x86_64-1.txz.asc
+-rw-r--r--  1 root root       231 Jan  7 18:36 ./slackware64/kde/kdenetwork-4.5.5-x86_64-1.txt
+-rw-r--r--  1 root root   8495736 Jan  7 18:36 ./slackware64/kde/kdenetwork-4.5.5-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan  7 18:36 ./slackware64/kde/kdenetwork-4.5.5-x86_64-1.txz.asc
+-rw-r--r--  1 root root       417 Feb  2 20:06 ./slackware64/kde/kdepim-4.4.10-x86_64-1.txt
+-rw-r--r--  1 root root  12106224 Feb  2 20:06 ./slackware64/kde/kdepim-4.4.10-x86_64-1.txz
+-rw-r--r--  1 root root       198 Feb  2 20:06 ./slackware64/kde/kdepim-4.4.10-x86_64-1.txz.asc
+-rw-r--r--  1 root root       508 Feb  2 20:06 ./slackware64/kde/kdepim-runtime-4.4.10-x86_64-1.txt
+-rw-r--r--  1 root root   1128320 Feb  2 20:06 ./slackware64/kde/kdepim-runtime-4.4.10-x86_64-1.txz
+-rw-r--r--  1 root root       198 Feb  2 20:06 ./slackware64/kde/kdepim-runtime-4.4.10-x86_64-1.txz.asc
+-rw-r--r--  1 root root       274 Jan 21 20:34 ./slackware64/kde/kdepimlibs-4.5.5-x86_64-2.txt
+-rw-r--r--  1 root root   2958576 Jan 21 20:34 ./slackware64/kde/kdepimlibs-4.5.5-x86_64-2.txz
+-rw-r--r--  1 root root       198 Jan 21 20:34 ./slackware64/kde/kdepimlibs-4.5.5-x86_64-2.txz.asc
+-rw-r--r--  1 root root       296 Jan  7 19:15 ./slackware64/kde/kdeplasma-addons-4.5.5-x86_64-1.txt
+-rw-r--r--  1 root root   2221736 Jan  7 19:15 ./slackware64/kde/kdeplasma-addons-4.5.5-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan  7 19:15 ./slackware64/kde/kdeplasma-addons-4.5.5-x86_64-1.txz.asc
+-rw-r--r--  1 root root       322 Jan  7 17:40 ./slackware64/kde/kdesdk-4.5.5-x86_64-1.txt
+-rw-r--r--  1 root root   6728072 Jan  7 17:40 ./slackware64/kde/kdesdk-4.5.5-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan  7 17:40 ./slackware64/kde/kdesdk-4.5.5-x86_64-1.txz.asc
+-rw-r--r--  1 root root       257 Jan  7 18:47 ./slackware64/kde/kdetoys-4.5.5-x86_64-1.txt
+-rw-r--r--  1 root root    410732 Jan  7 18:47 ./slackware64/kde/kdetoys-4.5.5-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan  7 18:47 ./slackware64/kde/kdetoys-4.5.5-x86_64-1.txz.asc
+-rw-r--r--  1 root root       330 Jan  7 18:27 ./slackware64/kde/kdeutils-4.5.5-x86_64-1.txt
+-rw-r--r--  1 root root   4059032 Jan  7 18:27 ./slackware64/kde/kdeutils-4.5.5-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan  7 18:27 ./slackware64/kde/kdeutils-4.5.5-x86_64-1.txz.asc
+-rw-r--r--  1 root root       220 Apr  5 23:40 ./slackware64/kde/kdevelop-4.2.2-x86_64-1.txt
+-rw-r--r--  1 root root   1983740 Apr  5 23:40 ./slackware64/kde/kdevelop-4.2.2-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr  5 23:40 ./slackware64/kde/kdevelop-4.2.2-x86_64-1.txz.asc
+-rw-r--r--  1 root root       247 Apr  5 23:36 ./slackware64/kde/kdevplatform-1.2.2-x86_64-1.txt
+-rw-r--r--  1 root root   2572860 Apr  5 23:36 ./slackware64/kde/kdevplatform-1.2.2-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr  5 23:36 ./slackware64/kde/kdevplatform-1.2.2-x86_64-1.txz.asc
+-rw-r--r--  1 root root       260 Jan  7 19:13 ./slackware64/kde/kdewebdev-4.5.5-x86_64-1.txt
+-rw-r--r--  1 root root   1403568 Jan  7 19:13 ./slackware64/kde/kdewebdev-4.5.5-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan  7 19:13 ./slackware64/kde/kdewebdev-4.5.5-x86_64-1.txz.asc
+-rw-r--r--  1 root root       493 Mar 23 00:37 ./slackware64/kde/koffice-2.3.3-x86_64-2.txt
+-rw-r--r--  1 root root  28846512 Mar 23 00:37 ./slackware64/kde/koffice-2.3.3-x86_64-2.txz
+-rw-r--r--  1 root root       198 Mar 23 00:37 ./slackware64/kde/koffice-2.3.3-x86_64-2.txz.asc
+-rw-r--r--  1 root root       519 Dec  3 08:52 ./slackware64/kde/konq-plugins-4.4.0-x86_64-2.txt
+-rw-r--r--  1 root root   1373716 Dec  3 08:52 ./slackware64/kde/konq-plugins-4.4.0-x86_64-2.txz
+-rw-r--r--  1 root root       198 Dec  3 08:52 ./slackware64/kde/konq-plugins-4.4.0-x86_64-2.txz.asc
+-rw-r--r--  1 root root       340 May  4  2010 ./slackware64/kde/kopete-cryptography-1.3.0_kde4.4.0-x86_64-1.txt
+-rw-r--r--  1 root root    113788 May  4  2010 ./slackware64/kde/kopete-cryptography-1.3.0_kde4.4.0-x86_64-1.txz
+-rw-r--r--  1 root root       198 May  4  2010 ./slackware64/kde/kopete-cryptography-1.3.0_kde4.4.0-x86_64-1.txz.asc
+-rw-r--r--  1 root root       582 Jan  7 19:36 ./slackware64/kde/ktorrent-4.0.5-x86_64-1.txt
+-rw-r--r--  1 root root   2357172 Jan  7 19:36 ./slackware64/kde/ktorrent-4.0.5-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan  7 19:36 ./slackware64/kde/ktorrent-4.0.5-x86_64-1.txz.asc
+-rw-r--r--  1 root root       479 Jan  7 19:34 ./slackware64/kde/libktorrent-1.0.5_3-x86_64-1.txt
+-rw-r--r--  1 root root    527900 Jan  7 19:34 ./slackware64/kde/libktorrent-1.0.5_3-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan  7 19:34 ./slackware64/kde/libktorrent-1.0.5_3-x86_64-1.txz.asc
+-rw-r--r--  1 root root      3683 Mar 13 20:00 ./slackware64/kde/maketag
+-rw-r--r--  1 root root      3683 Mar 13 20:00 ./slackware64/kde/maketag.ez
+-rw-r--r--  1 root root       329 Jan  7 18:37 ./slackware64/kde/oxygen-icons-4.5.5-x86_64-1.txt
+-rw-r--r--  1 root root  25751472 Jan  7 18:37 ./slackware64/kde/oxygen-icons-4.5.5-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan  7 18:37 ./slackware64/kde/oxygen-icons-4.5.5-x86_64-1.txz.asc
+-rw-r--r--  1 root root       225 Mar 31 01:23 ./slackware64/kde/polkit-kde-1-r1145544-x86_64-2.txt
+-rw-r--r--  1 root root     29268 Mar 31 01:23 ./slackware64/kde/polkit-kde-1-r1145544-x86_64-2.txz
+-rw-r--r--  1 root root       198 Mar 31 01:23 ./slackware64/kde/polkit-kde-1-r1145544-x86_64-2.txz.asc
+-rw-r--r--  1 root root       442 Mar 21 18:33 ./slackware64/kde/polkit-qt-1-r1145513-x86_64-2.txt
+-rw-r--r--  1 root root     67564 Mar 21 18:33 ./slackware64/kde/polkit-qt-1-r1145513-x86_64-2.txz
+-rw-r--r--  1 root root       198 Mar 21 18:33 ./slackware64/kde/polkit-qt-1-r1145513-x86_64-2.txz.asc
+-rw-r--r--  1 root root       207 Dec 29 03:59 ./slackware64/kde/skanlite-0.7-x86_64-1.txt
+-rw-r--r--  1 root root   1127044 Dec 29 03:59 ./slackware64/kde/skanlite-0.7-x86_64-1.txz
+-rw-r--r--  1 root root       198 Dec 29 03:59 ./slackware64/kde/skanlite-0.7-x86_64-1.txz.asc
+-rw-r--r--  1 root root       532 Mar 13 20:00 ./slackware64/kde/tagfile
+drwxr-xr-x  2 root root     20480 Mar  2 03:40 ./slackware64/kdei
+-rwxr-xr-x  1 root root      2897 Jun 24  2009 ./slackware64/kdei/install-packages
+-rw-r--r--  1 root root       446 Sep 18  2006 ./slackware64/kdei/install.end
+-rw-r--r--  1 root root       188 Jan 23 19:47 ./slackware64/kdei/kde-l10n-ar-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root   2159924 Jan 23 19:47 ./slackware64/kdei/kde-l10n-ar-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 19:47 ./slackware64/kdei/kde-l10n-ar-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       191 Jan 23 19:47 ./slackware64/kdei/kde-l10n-bg-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root   1051372 Jan 23 19:47 ./slackware64/kdei/kde-l10n-bg-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 19:47 ./slackware64/kdei/kde-l10n-bg-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       189 Jan 23 19:49 ./slackware64/kdei/kde-l10n-ca-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root   3944628 Jan 23 19:49 ./slackware64/kdei/kde-l10n-ca-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 19:49 ./slackware64/kdei/kde-l10n-ca-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       266 Jan 23 19:50 ./slackware64/kdei/kde-l10n-ca@valencia-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root   2039104 Jan 23 19:50 ./slackware64/kdei/kde-l10n-ca@valencia-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 19:50 ./slackware64/kdei/kde-l10n-ca@valencia-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       187 Jan 23 19:50 ./slackware64/kdei/kde-l10n-cs-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root   2413036 Jan 23 19:50 ./slackware64/kdei/kde-l10n-cs-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 19:50 ./slackware64/kdei/kde-l10n-cs-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       188 Jan 23 19:52 ./slackware64/kdei/kde-l10n-da-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root  13178028 Jan 23 19:52 ./slackware64/kdei/kde-l10n-da-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 19:52 ./slackware64/kdei/kde-l10n-da-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       188 Jan 23 19:58 ./slackware64/kdei/kde-l10n-de-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root  29217260 Jan 23 19:58 ./slackware64/kdei/kde-l10n-de-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 19:58 ./slackware64/kdei/kde-l10n-de-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       187 Jan 23 19:58 ./slackware64/kdei/kde-l10n-el-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root   2450180 Jan 23 19:58 ./slackware64/kdei/kde-l10n-el-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 19:58 ./slackware64/kdei/kde-l10n-el-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       230 Jan 23 19:59 ./slackware64/kdei/kde-l10n-en_GB-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root   2545180 Jan 23 19:59 ./slackware64/kdei/kde-l10n-en_GB-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 19:59 ./slackware64/kdei/kde-l10n-en_GB-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       191 Jan 23 20:00 ./slackware64/kdei/kde-l10n-eo-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root    807440 Jan 23 20:00 ./slackware64/kdei/kde-l10n-eo-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:00 ./slackware64/kdei/kde-l10n-eo-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       189 Jan 23 20:05 ./slackware64/kdei/kde-l10n-es-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root  27156480 Jan 23 20:05 ./slackware64/kdei/kde-l10n-es-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:05 ./slackware64/kdei/kde-l10n-es-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       190 Jan 23 20:11 ./slackware64/kdei/kde-l10n-et-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root   6706832 Jan 23 20:11 ./slackware64/kdei/kde-l10n-et-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:11 ./slackware64/kdei/kde-l10n-et-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       188 Jan 23 20:11 ./slackware64/kdei/kde-l10n-eu-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root   1367560 Jan 23 20:11 ./slackware64/kdei/kde-l10n-eu-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:11 ./slackware64/kdei/kde-l10n-eu-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       189 Jan 23 20:11 ./slackware64/kdei/kde-l10n-fi-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root   1519664 Jan 23 20:11 ./slackware64/kdei/kde-l10n-fi-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:11 ./slackware64/kdei/kde-l10n-fi-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       188 Jan 23 20:16 ./slackware64/kdei/kde-l10n-fr-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root  20022164 Jan 23 20:16 ./slackware64/kdei/kde-l10n-fr-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:16 ./slackware64/kdei/kde-l10n-fr-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       191 Jan 23 20:17 ./slackware64/kdei/kde-l10n-fy-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root    577720 Jan 23 20:17 ./slackware64/kdei/kde-l10n-fy-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:17 ./slackware64/kdei/kde-l10n-fy-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       187 Jan 23 20:17 ./slackware64/kdei/kde-l10n-ga-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root   2434996 Jan 23 20:17 ./slackware64/kdei/kde-l10n-ga-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:17 ./slackware64/kdei/kde-l10n-ga-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       190 Jan 23 20:19 ./slackware64/kdei/kde-l10n-gl-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root   3190532 Jan 23 20:19 ./slackware64/kdei/kde-l10n-gl-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:19 ./slackware64/kdei/kde-l10n-gl-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       190 Jan 23 20:19 ./slackware64/kdei/kde-l10n-gu-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root    444264 Jan 23 20:19 ./slackware64/kdei/kde-l10n-gu-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:19 ./slackware64/kdei/kde-l10n-gu-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       188 Jan 23 20:19 ./slackware64/kdei/kde-l10n-he-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root   1196892 Jan 23 20:19 ./slackware64/kdei/kde-l10n-he-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:19 ./slackware64/kdei/kde-l10n-he-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       187 Jan 23 20:20 ./slackware64/kdei/kde-l10n-hi-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root    888424 Jan 23 20:20 ./slackware64/kdei/kde-l10n-hi-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:20 ./slackware64/kdei/kde-l10n-hi-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       190 Jan 23 20:20 ./slackware64/kdei/kde-l10n-hr-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root    840868 Jan 23 20:20 ./slackware64/kdei/kde-l10n-hr-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:20 ./slackware64/kdei/kde-l10n-hr-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       191 Jan 23 20:21 ./slackware64/kdei/kde-l10n-hu-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root   3431836 Jan 23 20:21 ./slackware64/kdei/kde-l10n-hu-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:21 ./slackware64/kdei/kde-l10n-hu-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       193 Jan 23 20:21 ./slackware64/kdei/kde-l10n-ia-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root    350720 Jan 23 20:21 ./slackware64/kdei/kde-l10n-ia-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:21 ./slackware64/kdei/kde-l10n-ia-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       192 Jan 23 20:21 ./slackware64/kdei/kde-l10n-id-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root    420476 Jan 23 20:21 ./slackware64/kdei/kde-l10n-id-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:21 ./slackware64/kdei/kde-l10n-id-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       191 Jan 23 20:21 ./slackware64/kdei/kde-l10n-is-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root    862128 Jan 23 20:21 ./slackware64/kdei/kde-l10n-is-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:21 ./slackware64/kdei/kde-l10n-is-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       189 Jan 23 20:27 ./slackware64/kdei/kde-l10n-it-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root   9812684 Jan 23 20:27 ./slackware64/kdei/kde-l10n-it-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:27 ./slackware64/kdei/kde-l10n-it-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       190 Jan 23 20:27 ./slackware64/kdei/kde-l10n-ja-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root   1956008 Jan 23 20:27 ./slackware64/kdei/kde-l10n-ja-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:27 ./slackware64/kdei/kde-l10n-ja-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       188 Jan 23 20:28 ./slackware64/kdei/kde-l10n-kk-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root   1207032 Jan 23 20:28 ./slackware64/kdei/kde-l10n-kk-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:28 ./slackware64/kdei/kde-l10n-kk-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       187 Jan 23 20:28 ./slackware64/kdei/kde-l10n-km-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root   1526364 Jan 23 20:28 ./slackware64/kdei/kde-l10n-km-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:28 ./slackware64/kdei/kde-l10n-km-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       189 Jan 23 20:29 ./slackware64/kdei/kde-l10n-kn-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root    313472 Jan 23 20:29 ./slackware64/kdei/kde-l10n-kn-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:29 ./slackware64/kdei/kde-l10n-kn-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       188 Jan 23 20:29 ./slackware64/kdei/kde-l10n-ko-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root   1075612 Jan 23 20:29 ./slackware64/kdei/kde-l10n-ko-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:29 ./slackware64/kdei/kde-l10n-ko-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       192 Jan 23 20:30 ./slackware64/kdei/kde-l10n-lt-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root   2686108 Jan 23 20:30 ./slackware64/kdei/kde-l10n-lt-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:30 ./slackware64/kdei/kde-l10n-lt-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       189 Jan 23 20:30 ./slackware64/kdei/kde-l10n-lv-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root   1462132 Jan 23 20:30 ./slackware64/kdei/kde-l10n-lv-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:30 ./slackware64/kdei/kde-l10n-lv-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       191 Jan 23 20:31 ./slackware64/kdei/kde-l10n-ml-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root  19129892 Jan 23 20:31 ./slackware64/kdei/kde-l10n-ml-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:31 ./slackware64/kdei/kde-l10n-ml-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       201 Jan 23 20:31 ./slackware64/kdei/kde-l10n-nb-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root   2205580 Jan 23 20:31 ./slackware64/kdei/kde-l10n-nb-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:31 ./slackware64/kdei/kde-l10n-nb-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       203 Jan 23 20:32 ./slackware64/kdei/kde-l10n-nds-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root   3217604 Jan 23 20:32 ./slackware64/kdei/kde-l10n-nds-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:32 ./slackware64/kdei/kde-l10n-nds-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       187 Jan 23 20:36 ./slackware64/kdei/kde-l10n-nl-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root  13154220 Jan 23 20:36 ./slackware64/kdei/kde-l10n-nl-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:36 ./slackware64/kdei/kde-l10n-nl-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       201 Jan 23 20:37 ./slackware64/kdei/kde-l10n-nn-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root   1732496 Jan 23 20:37 ./slackware64/kdei/kde-l10n-nn-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:37 ./slackware64/kdei/kde-l10n-nn-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       189 Jan 23 20:37 ./slackware64/kdei/kde-l10n-pa-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root    864996 Jan 23 20:37 ./slackware64/kdei/kde-l10n-pa-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:37 ./slackware64/kdei/kde-l10n-pa-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       188 Jan 23 20:40 ./slackware64/kdei/kde-l10n-pl-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root   5342064 Jan 23 20:40 ./slackware64/kdei/kde-l10n-pl-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:40 ./slackware64/kdei/kde-l10n-pl-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       192 Jan 23 20:46 ./slackware64/kdei/kde-l10n-pt-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root   5468252 Jan 23 20:46 ./slackware64/kdei/kde-l10n-pt-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:46 ./slackware64/kdei/kde-l10n-pt-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       238 Jan 23 20:51 ./slackware64/kdei/kde-l10n-pt_BR-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root  18360680 Jan 23 20:51 ./slackware64/kdei/kde-l10n-pt_BR-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:51 ./slackware64/kdei/kde-l10n-pt_BR-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       190 Jan 23 20:52 ./slackware64/kdei/kde-l10n-ro-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root   2350648 Jan 23 20:52 ./slackware64/kdei/kde-l10n-ro-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:52 ./slackware64/kdei/kde-l10n-ro-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       189 Jan 23 20:55 ./slackware64/kdei/kde-l10n-ru-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root   7068420 Jan 23 20:55 ./slackware64/kdei/kde-l10n-ru-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:55 ./slackware64/kdei/kde-l10n-ru-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       188 Jan 23 20:55 ./slackware64/kdei/kde-l10n-sk-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root   1226404 Jan 23 20:55 ./slackware64/kdei/kde-l10n-sk-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:55 ./slackware64/kdei/kde-l10n-sk-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       191 Jan 23 20:56 ./slackware64/kdei/kde-l10n-sl-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root   2641100 Jan 23 20:56 ./slackware64/kdei/kde-l10n-sl-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 20:56 ./slackware64/kdei/kde-l10n-sl-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       189 Jan 23 21:00 ./slackware64/kdei/kde-l10n-sr-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root   6612752 Jan 23 21:00 ./slackware64/kdei/kde-l10n-sr-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 21:00 ./slackware64/kdei/kde-l10n-sr-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       189 Jan 23 21:06 ./slackware64/kdei/kde-l10n-sv-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root  16229180 Jan 23 21:06 ./slackware64/kdei/kde-l10n-sv-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 21:06 ./slackware64/kdei/kde-l10n-sv-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       186 Jan 23 21:06 ./slackware64/kdei/kde-l10n-th-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root    906188 Jan 23 21:06 ./slackware64/kdei/kde-l10n-th-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 21:06 ./slackware64/kdei/kde-l10n-th-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       189 Jan 23 21:07 ./slackware64/kdei/kde-l10n-tr-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root   1837692 Jan 23 21:07 ./slackware64/kdei/kde-l10n-tr-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 21:07 ./slackware64/kdei/kde-l10n-tr-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       191 Jan 23 21:12 ./slackware64/kdei/kde-l10n-uk-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root  14053220 Jan 23 21:12 ./slackware64/kdei/kde-l10n-uk-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 21:12 ./slackware64/kdei/kde-l10n-uk-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       189 Jan 23 21:13 ./slackware64/kdei/kde-l10n-wa-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root   1233192 Jan 23 21:13 ./slackware64/kdei/kde-l10n-wa-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 21:13 ./slackware64/kdei/kde-l10n-wa-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       236 Jan 23 21:13 ./slackware64/kdei/kde-l10n-zh_CN-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root   3044072 Jan 23 21:13 ./slackware64/kdei/kde-l10n-zh_CN-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 21:13 ./slackware64/kdei/kde-l10n-zh_CN-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       225 Jan 23 21:14 ./slackware64/kdei/kde-l10n-zh_TW-4.5.5-noarch-3.txt
+-rw-r--r--  1 root root   2013680 Jan 23 21:14 ./slackware64/kdei/kde-l10n-zh_TW-4.5.5-noarch-3.txz
+-rw-r--r--  1 root root       198 Jan 23 21:14 ./slackware64/kdei/kde-l10n-zh_TW-4.5.5-noarch-3.txz.asc
+-rw-r--r--  1 root root       241 Mar  1 23:54 ./slackware64/kdei/koffice-l10n-ca-2.3.2-noarch-1.txt
+-rw-r--r--  1 root root    543628 Mar  1 23:54 ./slackware64/kdei/koffice-l10n-ca-2.3.2-noarch-1.txz
+-rw-r--r--  1 root root       198 Mar  1 23:54 ./slackware64/kdei/koffice-l10n-ca-2.3.2-noarch-1.txz.asc
+-rw-r--r--  1 root root       370 Mar  1 23:55 ./slackware64/kdei/koffice-l10n-ca@valencia-2.3.2-noarch-1.txt
+-rw-r--r--  1 root root    278000 Mar  1 23:55 ./slackware64/kdei/koffice-l10n-ca@valencia-2.3.2-noarch-1.txz
+-rw-r--r--  1 root root       198 Mar  1 23:55 ./slackware64/kdei/koffice-l10n-ca@valencia-2.3.2-noarch-1.txz.asc
+-rw-r--r--  1 root root       240 Mar  1 23:55 ./slackware64/kdei/koffice-l10n-da-2.3.2-noarch-1.txt
+-rw-r--r--  1 root root    457436 Mar  1 23:55 ./slackware64/kdei/koffice-l10n-da-2.3.2-noarch-1.txz
+-rw-r--r--  1 root root       198 Mar  1 23:55 ./slackware64/kdei/koffice-l10n-da-2.3.2-noarch-1.txz.asc
+-rw-r--r--  1 root root       240 Mar  1 23:56 ./slackware64/kdei/koffice-l10n-de-2.3.2-noarch-1.txt
+-rw-r--r--  1 root root   1152132 Mar  1 23:56 ./slackware64/kdei/koffice-l10n-de-2.3.2-noarch-1.txz
+-rw-r--r--  1 root root       198 Mar  1 23:56 ./slackware64/kdei/koffice-l10n-de-2.3.2-noarch-1.txz.asc
+-rw-r--r--  1 root root       239 Mar  1 23:56 ./slackware64/kdei/koffice-l10n-el-2.3.2-noarch-1.txt
+-rw-r--r--  1 root root    230368 Mar  1 23:56 ./slackware64/kdei/koffice-l10n-el-2.3.2-noarch-1.txz
+-rw-r--r--  1 root root       198 Mar  1 23:56 ./slackware64/kdei/koffice-l10n-el-2.3.2-noarch-1.txz.asc
+-rw-r--r--  1 root root       282 Mar  1 23:56 ./slackware64/kdei/koffice-l10n-en_GB-2.3.2-noarch-1.txt
+-rw-r--r--  1 root root    186268 Mar  1 23:56 ./slackware64/kdei/koffice-l10n-en_GB-2.3.2-noarch-1.txz
+-rw-r--r--  1 root root       198 Mar  1 23:56 ./slackware64/kdei/koffice-l10n-en_GB-2.3.2-noarch-1.txz.asc
+-rw-r--r--  1 root root       241 Mar  1 23:57 ./slackware64/kdei/koffice-l10n-es-2.3.2-noarch-1.txt
+-rw-r--r--  1 root root   2809548 Mar  1 23:57 ./slackware64/kdei/koffice-l10n-es-2.3.2-noarch-1.txz
+-rw-r--r--  1 root root       198 Mar  1 23:57 ./slackware64/kdei/koffice-l10n-es-2.3.2-noarch-1.txz.asc
+-rw-r--r--  1 root root       242 Mar  1 23:58 ./slackware64/kdei/koffice-l10n-et-2.3.2-noarch-1.txt
+-rw-r--r--  1 root root    651668 Mar  1 23:58 ./slackware64/kdei/koffice-l10n-et-2.3.2-noarch-1.txz
+-rw-r--r--  1 root root       198 Mar  1 23:58 ./slackware64/kdei/koffice-l10n-et-2.3.2-noarch-1.txz.asc
+-rw-r--r--  1 root root       240 Mar  1 23:58 ./slackware64/kdei/koffice-l10n-fr-2.3.2-noarch-1.txt
+-rw-r--r--  1 root root   1192600 Mar  1 23:58 ./slackware64/kdei/koffice-l10n-fr-2.3.2-noarch-1.txz
+-rw-r--r--  1 root root       198 Mar  1 23:58 ./slackware64/kdei/koffice-l10n-fr-2.3.2-noarch-1.txz.asc
+-rw-r--r--  1 root root       242 Mar  1 23:59 ./slackware64/kdei/koffice-l10n-gl-2.3.2-noarch-1.txt
+-rw-r--r--  1 root root    229432 Mar  1 23:59 ./slackware64/kdei/koffice-l10n-gl-2.3.2-noarch-1.txz
+-rw-r--r--  1 root root       198 Mar  1 23:59 ./slackware64/kdei/koffice-l10n-gl-2.3.2-noarch-1.txz.asc
+-rw-r--r--  1 root root       243 Mar  1 23:59 ./slackware64/kdei/koffice-l10n-hu-2.3.2-noarch-1.txt
+-rw-r--r--  1 root root    198788 Mar  1 23:59 ./slackware64/kdei/koffice-l10n-hu-2.3.2-noarch-1.txz
+-rw-r--r--  1 root root       198 Mar  1 23:59 ./slackware64/kdei/koffice-l10n-hu-2.3.2-noarch-1.txz.asc
+-rw-r--r--  1 root root       241 Mar  1 23:59 ./slackware64/kdei/koffice-l10n-it-2.3.2-noarch-1.txt
+-rw-r--r--  1 root root    546712 Mar  1 23:59 ./slackware64/kdei/koffice-l10n-it-2.3.2-noarch-1.txz
+-rw-r--r--  1 root root       198 Mar  1 23:59 ./slackware64/kdei/koffice-l10n-it-2.3.2-noarch-1.txz.asc
+-rw-r--r--  1 root root       242 Mar  1 23:59 ./slackware64/kdei/koffice-l10n-ja-2.3.2-noarch-1.txt
+-rw-r--r--  1 root root    226240 Mar  1 23:59 ./slackware64/kdei/koffice-l10n-ja-2.3.2-noarch-1.txz
+-rw-r--r--  1 root root       198 Mar  1 23:59 ./slackware64/kdei/koffice-l10n-ja-2.3.2-noarch-1.txz.asc
+-rw-r--r--  1 root root       240 Mar  1 23:59 ./slackware64/kdei/koffice-l10n-kk-2.3.2-noarch-1.txt
+-rw-r--r--  1 root root    222820 Mar  1 23:59 ./slackware64/kdei/koffice-l10n-kk-2.3.2-noarch-1.txz
+-rw-r--r--  1 root root       198 Mar  1 23:59 ./slackware64/kdei/koffice-l10n-kk-2.3.2-noarch-1.txz.asc
+-rw-r--r--  1 root root       253 Mar  1 23:59 ./slackware64/kdei/koffice-l10n-nb-2.3.2-noarch-1.txt
+-rw-r--r--  1 root root    275884 Mar  1 23:59 ./slackware64/kdei/koffice-l10n-nb-2.3.2-noarch-1.txz
+-rw-r--r--  1 root root       198 Mar  1 23:59 ./slackware64/kdei/koffice-l10n-nb-2.3.2-noarch-1.txz.asc
+-rw-r--r--  1 root root       255 Mar  1 23:59 ./slackware64/kdei/koffice-l10n-nds-2.3.2-noarch-1.txt
+-rw-r--r--  1 root root    275400 Mar  1 23:59 ./slackware64/kdei/koffice-l10n-nds-2.3.2-noarch-1.txz
+-rw-r--r--  1 root root       198 Mar  1 23:59 ./slackware64/kdei/koffice-l10n-nds-2.3.2-noarch-1.txz.asc
+-rw-r--r--  1 root root       239 Mar  2 00:00 ./slackware64/kdei/koffice-l10n-nl-2.3.2-noarch-1.txt
+-rw-r--r--  1 root root   1680664 Mar  2 00:00 ./slackware64/kdei/koffice-l10n-nl-2.3.2-noarch-1.txz
+-rw-r--r--  1 root root       198 Mar  2 00:00 ./slackware64/kdei/koffice-l10n-nl-2.3.2-noarch-1.txz.asc
+-rw-r--r--  1 root root       240 Mar  2 00:00 ./slackware64/kdei/koffice-l10n-pl-2.3.2-noarch-1.txt
+-rw-r--r--  1 root root    201852 Mar  2 00:00 ./slackware64/kdei/koffice-l10n-pl-2.3.2-noarch-1.txz
+-rw-r--r--  1 root root       198 Mar  2 00:00 ./slackware64/kdei/koffice-l10n-pl-2.3.2-noarch-1.txz.asc
+-rw-r--r--  1 root root       244 Mar  2 00:00 ./slackware64/kdei/koffice-l10n-pt-2.3.2-noarch-1.txt
+-rw-r--r--  1 root root    559296 Mar  2 00:00 ./slackware64/kdei/koffice-l10n-pt-2.3.2-noarch-1.txz
+-rw-r--r--  1 root root       198 Mar  2 00:00 ./slackware64/kdei/koffice-l10n-pt-2.3.2-noarch-1.txz.asc
+-rw-r--r--  1 root root       287 Mar  2 00:00 ./slackware64/kdei/koffice-l10n-pt_BR-2.3.2-noarch-1.txt
+-rw-r--r--  1 root root    779688 Mar  2 00:00 ./slackware64/kdei/koffice-l10n-pt_BR-2.3.2-noarch-1.txz
+-rw-r--r--  1 root root       198 Mar  2 00:00 ./slackware64/kdei/koffice-l10n-pt_BR-2.3.2-noarch-1.txz.asc
+-rw-r--r--  1 root root       241 Mar  2 00:01 ./slackware64/kdei/koffice-l10n-ru-2.3.2-noarch-1.txt
+-rw-r--r--  1 root root    346240 Mar  2 00:01 ./slackware64/kdei/koffice-l10n-ru-2.3.2-noarch-1.txz
+-rw-r--r--  1 root root       198 Mar  2 00:01 ./slackware64/kdei/koffice-l10n-ru-2.3.2-noarch-1.txz.asc
+-rw-r--r--  1 root root       241 Mar  2 00:01 ./slackware64/kdei/koffice-l10n-sv-2.3.2-noarch-1.txt
+-rw-r--r--  1 root root   2299760 Mar  2 00:01 ./slackware64/kdei/koffice-l10n-sv-2.3.2-noarch-1.txz
+-rw-r--r--  1 root root       198 Mar  2 00:01 ./slackware64/kdei/koffice-l10n-sv-2.3.2-noarch-1.txz.asc
+-rw-r--r--  1 root root       241 Mar  2 00:01 ./slackware64/kdei/koffice-l10n-tr-2.3.2-noarch-1.txt
+-rw-r--r--  1 root root    177904 Mar  2 00:01 ./slackware64/kdei/koffice-l10n-tr-2.3.2-noarch-1.txz
+-rw-r--r--  1 root root       198 Mar  2 00:01 ./slackware64/kdei/koffice-l10n-tr-2.3.2-noarch-1.txz.asc
+-rw-r--r--  1 root root       243 Mar  2 00:01 ./slackware64/kdei/koffice-l10n-uk-2.3.2-noarch-1.txt
+-rw-r--r--  1 root root    589064 Mar  2 00:01 ./slackware64/kdei/koffice-l10n-uk-2.3.2-noarch-1.txz
+-rw-r--r--  1 root root       198 Mar  2 00:01 ./slackware64/kdei/koffice-l10n-uk-2.3.2-noarch-1.txz.asc
+-rw-r--r--  1 root root       241 Mar  2 00:02 ./slackware64/kdei/koffice-l10n-wa-2.3.2-noarch-1.txt
+-rw-r--r--  1 root root    172860 Mar  2 00:02 ./slackware64/kdei/koffice-l10n-wa-2.3.2-noarch-1.txz
+-rw-r--r--  1 root root       198 Mar  2 00:02 ./slackware64/kdei/koffice-l10n-wa-2.3.2-noarch-1.txz.asc
+-rw-r--r--  1 root root       288 Mar  2 00:02 ./slackware64/kdei/koffice-l10n-zh_CN-2.3.2-noarch-1.txt
+-rw-r--r--  1 root root    201908 Mar  2 00:02 ./slackware64/kdei/koffice-l10n-zh_CN-2.3.2-noarch-1.txz
+-rw-r--r--  1 root root       198 Mar  2 00:02 ./slackware64/kdei/koffice-l10n-zh_CN-2.3.2-noarch-1.txz.asc
+-rw-r--r--  1 root root       277 Mar  2 00:02 ./slackware64/kdei/koffice-l10n-zh_TW-2.3.2-noarch-1.txt
+-rw-r--r--  1 root root    262876 Mar  2 00:02 ./slackware64/kdei/koffice-l10n-zh_TW-2.3.2-noarch-1.txz
+-rw-r--r--  1 root root       198 Mar  2 00:02 ./slackware64/kdei/koffice-l10n-zh_TW-2.3.2-noarch-1.txz.asc
+-rw-r--r--  1 root root      7422 Feb  9 20:02 ./slackware64/kdei/maketag
+-rw-r--r--  1 root root      7422 Feb  9 20:02 ./slackware64/kdei/maketag.ez
+-rw-r--r--  1 root root      1464 Feb  9 20:02 ./slackware64/kdei/tagfile
+drwxr-xr-x  2 root root     36864 Apr 25 13:47 ./slackware64/l
+-rw-r--r--  1 root root       330 Dec 19 03:25 ./slackware64/l/ConsoleKit-0.4.3-x86_64-1.txt
+-rw-r--r--  1 root root    131844 Dec 19 03:25 ./slackware64/l/ConsoleKit-0.4.3-x86_64-1.txz
+-rw-r--r--  1 root root       198 Dec 19 03:25 ./slackware64/l/ConsoleKit-0.4.3-x86_64-1.txz.asc
+-rw-r--r--  1 root root       592 Aug  4  2010 ./slackware64/l/M2Crypto-0.20.2-x86_64-1.txt
+-rw-r--r--  1 root root    206896 Aug  4  2010 ./slackware64/l/M2Crypto-0.20.2-x86_64-1.txz
+-rw-r--r--  1 root root       198 Aug  4  2010 ./slackware64/l/M2Crypto-0.20.2-x86_64-1.txz.asc
+-rw-r--r--  1 root root       276 Nov 29 06:11 ./slackware64/l/PyQt-4.8.1-x86_64-1.txt
+-rw-r--r--  1 root root   8342240 Nov 29 06:11 ./slackware64/l/PyQt-4.8.1-x86_64-1.txz
+-rw-r--r--  1 root root       198 Nov 29 06:11 ./slackware64/l/PyQt-4.8.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       670 Mar 25 18:13 ./slackware64/l/QScintilla-2.4.5-x86_64-2.txt
+-rw-r--r--  1 root root   1181760 Mar 25 18:13 ./slackware64/l/QScintilla-2.4.5-x86_64-2.txz
+-rw-r--r--  1 root root       198 Mar 25 18:13 ./slackware64/l/QScintilla-2.4.5-x86_64-2.txz.asc
+-rw-r--r--  1 root root       995 Jan 23 07:27 ./slackware64/l/aalib-1.4rc5-x86_64-3.txt
+-rw-r--r--  1 root root    157780 Jan 23 07:27 ./slackware64/l/aalib-1.4rc5-x86_64-3.txz
+-rw-r--r--  1 root root       198 Jan 23 07:27 ./slackware64/l/aalib-1.4rc5-x86_64-3.txz.asc
+-rw-r--r--  1 root root       383 Mar 24 01:58 ./slackware64/l/akonadi-1.4.1-x86_64-3.txt
+-rw-r--r--  1 root root    624744 Mar 24 01:58 ./slackware64/l/akonadi-1.4.1-x86_64-3.txz
+-rw-r--r--  1 root root       198 Mar 24 01:58 ./slackware64/l/akonadi-1.4.1-x86_64-3.txz.asc
+-rw-r--r--  1 root root       402 Feb  9 05:47 ./slackware64/l/alsa-lib-1.0.24.1-x86_64-1.txt
+-rw-r--r--  1 root root    397656 Feb  9 05:47 ./slackware64/l/alsa-lib-1.0.24.1-x86_64-1.txz
+-rw-r--r--  1 root root       198 Feb  9 05:47 ./slackware64/l/alsa-lib-1.0.24.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       503 Oct  3  2008 ./slackware64/l/alsa-oss-1.0.17-x86_64-1.txt
+-rw-r--r--  1 root root     31944 Oct  3  2008 ./slackware64/l/alsa-oss-1.0.17-x86_64-1.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./slackware64/l/alsa-oss-1.0.17-x86_64-1.txz.asc
+-rw-r--r--  1 root root       275 Feb 12 19:21 ./slackware64/l/apr-1.4.2-x86_64-2.txt
+-rw-r--r--  1 root root    210296 Feb 12 19:21 ./slackware64/l/apr-1.4.2-x86_64-2.txz
+-rw-r--r--  1 root root       198 Feb 12 19:21 ./slackware64/l/apr-1.4.2-x86_64-2.txz.asc
+-rw-r--r--  1 root root       483 Feb 10 04:53 ./slackware64/l/apr-util-1.3.10-x86_64-1.txt
+-rw-r--r--  1 root root    110780 Feb 10 04:53 ./slackware64/l/apr-util-1.3.10-x86_64-1.txz
+-rw-r--r--  1 root root       198 Feb 10 04:53 ./slackware64/l/apr-util-1.3.10-x86_64-1.txz.asc
+-rw-r--r--  1 root root       251 Aug  5  2010 ./slackware64/l/aspell-0.60.6-x86_64-1.txt
+-rw-r--r--  1 root root    593692 Aug  5  2010 ./slackware64/l/aspell-0.60.6-x86_64-1.txz
+-rw-r--r--  1 root root       198 Aug  5  2010 ./slackware64/l/aspell-0.60.6-x86_64-1.txz.asc
+-rw-r--r--  1 root root       175 Oct  3  2008 ./slackware64/l/aspell-en-6.0_0-noarch-4.txt
+-rw-r--r--  1 root root   1090944 Oct  3  2008 ./slackware64/l/aspell-en-6.0_0-noarch-4.txz
+-rw-r--r--  1 root root       197 Oct  3  2008 ./slackware64/l/aspell-en-6.0_0-noarch-4.txz.asc
+-rw-r--r--  1 root root       173 Nov  6 05:04 ./slackware64/l/atk-1.32.0-x86_64-1.txt
+-rw-r--r--  1 root root    239268 Nov  6 05:04 ./slackware64/l/atk-1.32.0-x86_64-1.txz
+-rw-r--r--  1 root root       198 Nov  6 05:04 ./slackware64/l/atk-1.32.0-x86_64-1.txz.asc
+-rw-r--r--  1 root root       373 Jul 13  2010 ./slackware64/l/attica-0.1.4-x86_64-1.txt
+-rw-r--r--  1 root root    117588 Jul 13  2010 ./slackware64/l/attica-0.1.4-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jul 13  2010 ./slackware64/l/attica-0.1.4-x86_64-1.txz.asc
+-rw-r--r--  1 root root       315 Aug  5  2010 ./slackware64/l/audiofile-0.2.7-x86_64-1.txt
+-rw-r--r--  1 root root    121548 Aug  5  2010 ./slackware64/l/audiofile-0.2.7-x86_64-1.txz
+-rw-r--r--  1 root root       198 Aug  5  2010 ./slackware64/l/audiofile-0.2.7-x86_64-1.txz.asc
+-rw-r--r--  1 root root       454 Jan 22  2009 ./slackware64/l/automoc4-0.9.88-x86_64-1.txt
+-rw-r--r--  1 root root     25480 Jan 22  2009 ./slackware64/l/automoc4-0.9.88-x86_64-1.txz
+-rw-r--r--  1 root root       197 Jan 22  2009 ./slackware64/l/automoc4-0.9.88-x86_64-1.txz.asc
+-rw-r--r--  1 root root       517 Nov  8 02:01 ./slackware64/l/babl-0.1.2-x86_64-1.txt
+-rw-r--r--  1 root root     68536 Nov  8 02:01 ./slackware64/l/babl-0.1.2-x86_64-1.txz
+-rw-r--r--  1 root root       198 Nov  8 02:01 ./slackware64/l/babl-0.1.2-x86_64-1.txz.asc
+-rw-r--r--  1 root root       433 Nov 28 05:42 ./slackware64/l/boost-1.45.0-x86_64-1.txt
+-rw-r--r--  1 root root   5396360 Nov 28 05:42 ./slackware64/l/boost-1.45.0-x86_64-1.txz
+-rw-r--r--  1 root root       198 Nov 28 05:42 ./slackware64/l/boost-1.45.0-x86_64-1.txz.asc
+-rw-r--r--  1 root root       394 Mar 19 19:05 ./slackware64/l/cairo-1.10.2-x86_64-2.txt
+-rw-r--r--  1 root root    544028 Mar 19 19:05 ./slackware64/l/cairo-1.10.2-x86_64-2.txz
+-rw-r--r--  1 root root       198 Mar 19 19:05 ./slackware64/l/cairo-1.10.2-x86_64-2.txz.asc
+-rw-r--r--  1 root root       472 Mar 29 04:29 ./slackware64/l/chmlib-0.40-x86_64-2.txt
+-rw-r--r--  1 root root     33136 Mar 29 04:29 ./slackware64/l/chmlib-0.40-x86_64-2.txz
+-rw-r--r--  1 root root       198 Mar 29 04:29 ./slackware64/l/chmlib-0.40-x86_64-2.txz.asc
+-rw-r--r--  1 root root       279 Jan 20  2009 ./slackware64/l/clucene-0.9.21b-x86_64-1.txt
+-rw-r--r--  1 root root    382268 Jan 20  2009 ./slackware64/l/clucene-0.9.21b-x86_64-1.txz
+-rw-r--r--  1 root root       197 Jan 20  2009 ./slackware64/l/clucene-0.9.21b-x86_64-1.txz.asc
+-rw-r--r--  1 root root       364 Sep 29  2008 ./slackware64/l/db42-4.2.52-x86_64-3.txt
+-rw-r--r--  1 root root    380400 Sep 29  2008 ./slackware64/l/db42-4.2.52-x86_64-3.txz
+-rw-r--r--  1 root root       197 Sep 29  2008 ./slackware64/l/db42-4.2.52-x86_64-3.txz.asc
+-rw-r--r--  1 root root       363 Sep 29  2008 ./slackware64/l/db44-4.4.20-x86_64-2.txt
+-rw-r--r--  1 root root    705520 Sep 29  2008 ./slackware64/l/db44-4.4.20-x86_64-2.txz
+-rw-r--r--  1 root root       197 Sep 29  2008 ./slackware64/l/db44-4.4.20-x86_64-2.txz.asc
+-rw-r--r--  1 root root       222 Nov  6 02:02 ./slackware64/l/dbus-glib-0.88-x86_64-1.txt
+-rw-r--r--  1 root root    123876 Nov  6 02:02 ./slackware64/l/dbus-glib-0.88-x86_64-1.txz
+-rw-r--r--  1 root root       198 Nov  6 02:02 ./slackware64/l/dbus-glib-0.88-x86_64-1.txz.asc
+-rw-r--r--  1 root root       246 Apr 30  2010 ./slackware64/l/dbus-python-0.83.1-x86_64-1.txt
+-rw-r--r--  1 root root    106608 Apr 30  2010 ./slackware64/l/dbus-python-0.83.1-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr 30  2010 ./slackware64/l/dbus-python-0.83.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       655 May 11  2010 ./slackware64/l/desktop-file-utils-0.16-x86_64-2.txt
+-rw-r--r--  1 root root     45080 May 11  2010 ./slackware64/l/desktop-file-utils-0.16-x86_64-2.txz
+-rw-r--r--  1 root root       198 May 11  2010 ./slackware64/l/desktop-file-utils-0.16-x86_64-2.txz.asc
+-rw-r--r--  1 root root       561 Apr  8 00:00 ./slackware64/l/djvulibre-3.5.24-x86_64-1.txt
+-rw-r--r--  1 root root    976468 Apr  8 00:00 ./slackware64/l/djvulibre-3.5.24-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr  8 00:00 ./slackware64/l/djvulibre-3.5.24-x86_64-1.txz.asc
+-rw-r--r--  1 root root       323 May  4  2010 ./slackware64/l/ebook-tools-0.1.1-x86_64-2.txt
+-rw-r--r--  1 root root     20544 May  4  2010 ./slackware64/l/ebook-tools-0.1.1-x86_64-2.txz
+-rw-r--r--  1 root root       198 May  4  2010 ./slackware64/l/ebook-tools-0.1.1-x86_64-2.txz.asc
+-rw-r--r--  1 root root       257 Dec 17  2009 ./slackware64/l/eigen2-2.0.10-x86_64-1.txt
+-rw-r--r--  1 root root    161064 Dec 17  2009 ./slackware64/l/eigen2-2.0.10-x86_64-1.txz
+-rw-r--r--  1 root root       197 Dec 17  2009 ./slackware64/l/eigen2-2.0.10-x86_64-1.txz.asc
+-rw-r--r--  1 root root       346 Dec 17  2009 ./slackware64/l/enchant-1.5.0-x86_64-1.txt
+-rw-r--r--  1 root root    137616 Dec 17  2009 ./slackware64/l/enchant-1.5.0-x86_64-1.txz
+-rw-r--r--  1 root root       197 Dec 17  2009 ./slackware64/l/enchant-1.5.0-x86_64-1.txz.asc
+-rw-r--r--  1 root root       505 Apr  8  2009 ./slackware64/l/esound-0.2.41-x86_64-1.txt
+-rw-r--r--  1 root root     98952 Apr  8  2009 ./slackware64/l/esound-0.2.41-x86_64-1.txz
+-rw-r--r--  1 root root       197 Apr  8  2009 ./slackware64/l/esound-0.2.41-x86_64-1.txz.asc
+-rw-r--r--  1 root root       257 Feb 14 19:13 ./slackware64/l/exiv2-0.21.1-x86_64-1.txt
+-rw-r--r--  1 root root    850988 Feb 14 19:13 ./slackware64/l/exiv2-0.21.1-x86_64-1.txz
+-rw-r--r--  1 root root       198 Feb 14 19:13 ./slackware64/l/exiv2-0.21.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       264 Feb  9 22:07 ./slackware64/l/expat-2.0.1-x86_64-2.txt
+-rw-r--r--  1 root root    118928 Feb  9 22:07 ./slackware64/l/expat-2.0.1-x86_64-2.txz
+-rw-r--r--  1 root root       198 Feb  9 22:07 ./slackware64/l/expat-2.0.1-x86_64-2.txz.asc
+-rw-r--r--  1 root root       506 Dec 17  2009 ./slackware64/l/fftw-3.2.2-x86_64-1.txt
+-rw-r--r--  1 root root   1060684 Dec 17  2009 ./slackware64/l/fftw-3.2.2-x86_64-1.txz
+-rw-r--r--  1 root root       197 Dec 17  2009 ./slackware64/l/fftw-3.2.2-x86_64-1.txz.asc
+-rw-r--r--  1 root root       344 Dec 23 23:39 ./slackware64/l/freetype-2.4.4-x86_64-1.txt
+-rw-r--r--  1 root root    420516 Dec 23 23:39 ./slackware64/l/freetype-2.4.4-x86_64-1.txz
+-rw-r--r--  1 root root       198 Dec 23 23:39 ./slackware64/l/freetype-2.4.4-x86_64-1.txz.asc
+-rw-r--r--  1 root root       353 Oct  8  2008 ./slackware64/l/fribidi-0.10.9-x86_64-2.txt
+-rw-r--r--  1 root root     45716 Oct  8  2008 ./slackware64/l/fribidi-0.10.9-x86_64-2.txz
+-rw-r--r--  1 root root       197 Oct  8  2008 ./slackware64/l/fribidi-0.10.9-x86_64-2.txz.asc
+-rw-r--r--  1 root root       391 Jan 30 22:28 ./slackware64/l/fuse-2.8.5-x86_64-1.txt
+-rw-r--r--  1 root root    126692 Jan 30 22:28 ./slackware64/l/fuse-2.8.5-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan 30 22:28 ./slackware64/l/fuse-2.8.5-x86_64-1.txz.asc
+-rw-r--r--  1 root root       297 Mar 16 01:46 ./slackware64/l/gamin-0.1.10-x86_64-3.txt
+-rw-r--r--  1 root root    109232 Mar 16 01:46 ./slackware64/l/gamin-0.1.10-x86_64-3.txz
+-rw-r--r--  1 root root       198 Mar 16 01:46 ./slackware64/l/gamin-0.1.10-x86_64-3.txz.asc
+-rw-r--r--  1 root root       469 Feb 18  2010 ./slackware64/l/gd-2.0.35-x86_64-4.txt
+-rw-r--r--  1 root root    145516 Feb 18  2010 ./slackware64/l/gd-2.0.35-x86_64-4.txz
+-rw-r--r--  1 root root       197 Feb 18  2010 ./slackware64/l/gd-2.0.35-x86_64-4.txz.asc
+-rw-r--r--  1 root root       186 Sep 28  2008 ./slackware64/l/gdbm-1.8.3-x86_64-4.txt
+-rw-r--r--  1 root root     43824 Sep 28  2008 ./slackware64/l/gdbm-1.8.3-x86_64-4.txz
+-rw-r--r--  1 root root       197 Sep 28  2008 ./slackware64/l/gdbm-1.8.3-x86_64-4.txz.asc
+-rw-r--r--  1 root root       538 Apr 10 15:05 ./slackware64/l/gdk-pixbuf2-2.23.3-x86_64-1.txt
+-rw-r--r--  1 root root    595084 Apr 10 15:05 ./slackware64/l/gdk-pixbuf2-2.23.3-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr 10 15:05 ./slackware64/l/gdk-pixbuf2-2.23.3-x86_64-1.txz.asc
+-rw-r--r--  1 root root       405 Nov  8 02:04 ./slackware64/l/gegl-0.1.2-x86_64-1.txt
+-rw-r--r--  1 root root    335264 Nov  8 02:04 ./slackware64/l/gegl-0.1.2-x86_64-1.txz
+-rw-r--r--  1 root root       198 Nov  8 02:04 ./slackware64/l/gegl-0.1.2-x86_64-1.txz.asc
+-rw-r--r--  1 root root       320 Feb  6  2010 ./slackware64/l/giflib-4.1.6-x86_64-1.txt
+-rw-r--r--  1 root root    171608 Feb  6  2010 ./slackware64/l/giflib-4.1.6-x86_64-1.txz
+-rw-r--r--  1 root root       197 Feb  6  2010 ./slackware64/l/giflib-4.1.6-x86_64-1.txz.asc
+-rw-r--r--  1 root root       302 Sep 28  2008 ./slackware64/l/glib-1.2.10-x86_64-3.txt
+-rw-r--r--  1 root root    146248 Sep 28  2008 ./slackware64/l/glib-1.2.10-x86_64-3.txz
+-rw-r--r--  1 root root       197 Sep 28  2008 ./slackware64/l/glib-1.2.10-x86_64-3.txz.asc
+-rw-r--r--  1 root root       235 Apr 22 17:08 ./slackware64/l/glib2-2.28.6-x86_64-1.txt
+-rw-r--r--  1 root root   2858696 Apr 22 17:08 ./slackware64/l/glib2-2.28.6-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr 22 17:08 ./slackware64/l/glib2-2.28.6-x86_64-1.txz.asc
+-rw-r--r--  1 root root       389 Mar 24 07:52 ./slackware64/l/glibc-2.13-x86_64-4.txt
+-rw-r--r--  1 root root  11753000 Mar 24 07:52 ./slackware64/l/glibc-2.13-x86_64-4.txz
+-rw-r--r--  1 root root       198 Mar 24 07:52 ./slackware64/l/glibc-2.13-x86_64-4.txz.asc
+-rw-r--r--  1 root root       333 Mar 24 07:51 ./slackware64/l/glibc-i18n-2.13-x86_64-4.txt
+-rw-r--r--  1 root root   6644488 Mar 24 07:51 ./slackware64/l/glibc-i18n-2.13-x86_64-4.txz
+-rw-r--r--  1 root root       198 Mar 24 07:51 ./slackware64/l/glibc-i18n-2.13-x86_64-4.txz.asc
+-rw-r--r--  1 root root       508 Mar 24 07:50 ./slackware64/l/glibc-profile-2.13-x86_64-4.txt
+-rw-r--r--  1 root root   1157180 Mar 24 07:50 ./slackware64/l/glibc-profile-2.13-x86_64-4.txz
+-rw-r--r--  1 root root       198 Mar 24 07:50 ./slackware64/l/glibc-profile-2.13-x86_64-4.txz.asc
+-rw-r--r--  1 root root       297 Feb  3  2010 ./slackware64/l/gmime-2.4.15-x86_64-1.txt
+-rw-r--r--  1 root root    245244 Feb  3  2010 ./slackware64/l/gmime-2.4.15-x86_64-1.txz
+-rw-r--r--  1 root root       197 Feb  3  2010 ./slackware64/l/gmime-2.4.15-x86_64-1.txz.asc
+-rw-r--r--  1 root root       579 Dec 16  2008 ./slackware64/l/gmm-3.1-noarch-1.txt
+-rw-r--r--  1 root root    110636 Dec 16  2008 ./slackware64/l/gmm-3.1-noarch-1.txz
+-rw-r--r--  1 root root       197 Dec 16  2008 ./slackware64/l/gmm-3.1-noarch-1.txz.asc
+-rw-r--r--  1 root root       312 Feb 24  2010 ./slackware64/l/gmp-5.0.1-x86_64-1.txt
+-rw-r--r--  1 root root    469224 Feb 24  2010 ./slackware64/l/gmp-5.0.1-x86_64-1.txz
+-rw-r--r--  1 root root       197 Feb 24  2010 ./slackware64/l/gmp-5.0.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       299 Nov  6 19:02 ./slackware64/l/gnome-icon-theme-2.31.0-x86_64-1.txt
+-rw-r--r--  1 root root   8187140 Nov  6 19:02 ./slackware64/l/gnome-icon-theme-2.31.0-x86_64-1.txz
+-rw-r--r--  1 root root       198 Nov  6 19:02 ./slackware64/l/gnome-icon-theme-2.31.0-x86_64-1.txz.asc
+-rw-r--r--  1 root root       609 Jan 30 22:22 ./slackware64/l/gst-plugins-base-0.10.32-x86_64-1.txt
+-rw-r--r--  1 root root   1136360 Jan 30 22:22 ./slackware64/l/gst-plugins-base-0.10.32-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan 30 22:22 ./slackware64/l/gst-plugins-base-0.10.32-x86_64-1.txz.asc
+-rw-r--r--  1 root root       444 Apr 16 03:22 ./slackware64/l/gst-plugins-good-0.10.28-x86_64-2.txt
+-rw-r--r--  1 root root    891052 Apr 16 03:22 ./slackware64/l/gst-plugins-good-0.10.28-x86_64-2.txz
+-rw-r--r--  1 root root       198 Apr 16 03:22 ./slackware64/l/gst-plugins-good-0.10.28-x86_64-2.txz.asc
+-rw-r--r--  1 root root       602 Jan 30 22:20 ./slackware64/l/gstreamer-0.10.32-x86_64-1.txt
+-rw-r--r--  1 root root   1149800 Jan 30 22:20 ./slackware64/l/gstreamer-0.10.32-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan 30 22:20 ./slackware64/l/gstreamer-0.10.32-x86_64-1.txz.asc
+-rw-r--r--  1 root root       351 Jun  9  2009 ./slackware64/l/gtk+-1.2.10-x86_64-5.txt
+-rw-r--r--  1 root root   1046588 Jun  9  2009 ./slackware64/l/gtk+-1.2.10-x86_64-5.txz
+-rw-r--r--  1 root root       197 Jun  9  2009 ./slackware64/l/gtk+-1.2.10-x86_64-5.txz.asc
+-rw-r--r--  1 root root       335 Apr  2 17:27 ./slackware64/l/gtk+2-2.24.4-x86_64-1.txt
+-rw-r--r--  1 root root   6542816 Apr  2 17:27 ./slackware64/l/gtk+2-2.24.4-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr  2 17:27 ./slackware64/l/gtk+2-2.24.4-x86_64-1.txz.asc
+-rw-r--r--  1 root root       330 Aug  6  2010 ./slackware64/l/gtkspell-2.0.16-x86_64-1.txt
+-rw-r--r--  1 root root     35428 Aug  6  2010 ./slackware64/l/gtkspell-2.0.16-x86_64-1.txz
+-rw-r--r--  1 root root       198 Aug  6  2010 ./slackware64/l/gtkspell-2.0.16-x86_64-1.txz.asc
+-rw-r--r--  1 root root       464 Nov 16 20:51 ./slackware64/l/hal-0.5.14-x86_64-3.txt
+-rw-r--r--  1 root root    499528 Nov 16 20:51 ./slackware64/l/hal-0.5.14-x86_64-3.txz
+-rw-r--r--  1 root root       198 Nov 16 20:51 ./slackware64/l/hal-0.5.14-x86_64-3.txz.asc
+-rw-r--r--  1 root root       297 Feb  9  2010 ./slackware64/l/hal-info-20091130-noarch-1.txt
+-rw-r--r--  1 root root     47520 Feb  9  2010 ./slackware64/l/hal-info-20091130-noarch-1.txz
+-rw-r--r--  1 root root       197 Feb  9  2010 ./slackware64/l/hal-info-20091130-noarch-1.txz.asc
+-rw-r--r--  1 root root       445 Apr 30  2010 ./slackware64/l/hicolor-icon-theme-0.12-noarch-1.txt
+-rw-r--r--  1 root root     11776 Apr 30  2010 ./slackware64/l/hicolor-icon-theme-0.12-noarch-1.txz
+-rw-r--r--  1 root root       198 Apr 30  2010 ./slackware64/l/hicolor-icon-theme-0.12-noarch-1.txz.asc
+-rw-r--r--  1 root root       509 May  4  2010 ./slackware64/l/hunspell-1.2.9-x86_64-1.txt
+-rw-r--r--  1 root root    234676 May  4  2010 ./slackware64/l/hunspell-1.2.9-x86_64-1.txz
+-rw-r--r--  1 root root       198 May  4  2010 ./slackware64/l/hunspell-1.2.9-x86_64-1.txz.asc
+-rw-r--r--  1 root root       464 Aug 22  2009 ./slackware64/l/icon-naming-utils-0.8.90-x86_64-2.txt
+-rw-r--r--  1 root root     14068 Aug 22  2009 ./slackware64/l/icon-naming-utils-0.8.90-x86_64-2.txz
+-rw-r--r--  1 root root       197 Aug 22  2009 ./slackware64/l/icon-naming-utils-0.8.90-x86_64-2.txz.asc
+-rw-r--r--  1 root root       371 Aug  9  2010 ./slackware64/l/ilmbase-1.0.2-x86_64-1.txt
+-rw-r--r--  1 root root    103212 Aug  9  2010 ./slackware64/l/ilmbase-1.0.2-x86_64-1.txz
+-rw-r--r--  1 root root       198 Aug  9  2010 ./slackware64/l/ilmbase-1.0.2-x86_64-1.txz.asc
+-rw-r--r--  1 root root       401 Jun 24  2010 ./slackware64/l/imlib-1.9.15-x86_64-7.txt
+-rw-r--r--  1 root root    467148 Jun 24  2010 ./slackware64/l/imlib-1.9.15-x86_64-7.txz
+-rw-r--r--  1 root root       198 Jun 24  2010 ./slackware64/l/imlib-1.9.15-x86_64-7.txz.asc
+-rwxr-xr-x  1 root root      2897 Jun 24  2009 ./slackware64/l/install-packages
+-rw-r--r--  1 root root       446 Sep 18  2006 ./slackware64/l/install.end
+-rw-r--r--  1 root root       392 Mar  7 17:17 ./slackware64/l/iso-codes-3.24.2-noarch-1.txt
+-rw-r--r--  1 root root   1719676 Mar  7 17:17 ./slackware64/l/iso-codes-3.24.2-noarch-1.txz
+-rw-r--r--  1 root root       198 Mar  7 17:17 ./slackware64/l/iso-codes-3.24.2-noarch-1.txz.asc
+-rw-r--r--  1 root root       382 Feb 11  2010 ./slackware64/l/jasper-1.900.1-x86_64-3.txt
+-rw-r--r--  1 root root    158076 Feb 11  2010 ./slackware64/l/jasper-1.900.1-x86_64-3.txz
+-rw-r--r--  1 root root       197 Feb 11  2010 ./slackware64/l/jasper-1.900.1-x86_64-3.txz.asc
+-rw-r--r--  1 root root       510 Apr 24 02:52 ./slackware64/l/jre-6u25-x86_64-1.txt
+-rw-r--r--  1 root root  20315920 Apr 24 02:52 ./slackware64/l/jre-6u25-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr 24 02:52 ./slackware64/l/jre-6u25-x86_64-1.txz.asc
+-rw-r--r--  1 root root       210 Feb 20  2010 ./slackware64/l/lcms-1.19-x86_64-1.txt
+-rw-r--r--  1 root root    178476 Feb 20  2010 ./slackware64/l/lcms-1.19-x86_64-1.txz
+-rw-r--r--  1 root root       197 Feb 20  2010 ./slackware64/l/lcms-1.19-x86_64-1.txz.asc
+-rw-r--r--  1 root root       526 Apr 19  2010 ./slackware64/l/lesstif-0.95.2-x86_64-1.txt
+-rw-r--r--  1 root root   1397028 Apr 19  2010 ./slackware64/l/lesstif-0.95.2-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr 19  2010 ./slackware64/l/lesstif-0.95.2-x86_64-1.txz.asc
+-rw-r--r--  1 root root       505 May 11  2010 ./slackware64/l/libaio-0.3.109-x86_64-1.txt
+-rw-r--r--  1 root root     13524 May 11  2010 ./slackware64/l/libaio-0.3.109-x86_64-1.txz
+-rw-r--r--  1 root root       198 May 11  2010 ./slackware64/l/libaio-0.3.109-x86_64-1.txz.asc
+-rw-r--r--  1 root root       428 Mar  9 20:12 ./slackware64/l/libao-1.1.0-x86_64-1.txt
+-rw-r--r--  1 root root     52032 Mar  9 20:12 ./slackware64/l/libao-1.1.0-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar  9 20:12 ./slackware64/l/libao-1.1.0-x86_64-1.txz.asc
+-rw-r--r--  1 root root       415 Dec  3 19:34 ./slackware64/l/libarchive-2.8.4-x86_64-1.txt
+-rw-r--r--  1 root root    233372 Dec  3 19:34 ./slackware64/l/libarchive-2.8.4-x86_64-1.txz
+-rw-r--r--  1 root root       198 Dec  3 19:34 ./slackware64/l/libarchive-2.8.4-x86_64-1.txz.asc
+-rw-r--r--  1 root root       361 Aug  6  2010 ./slackware64/l/libart_lgpl-2.3.21-x86_64-1.txt
+-rw-r--r--  1 root root     76832 Aug  6  2010 ./slackware64/l/libart_lgpl-2.3.21-x86_64-1.txz
+-rw-r--r--  1 root root       198 Aug  6  2010 ./slackware64/l/libart_lgpl-2.3.21-x86_64-1.txz.asc
+-rw-r--r--  1 root root       359 Jun  9  2009 ./slackware64/l/libcaca-0.99.beta16-x86_64-3.txt
+-rw-r--r--  1 root root    433140 Jun  9  2009 ./slackware64/l/libcaca-0.99.beta16-x86_64-3.txz
+-rw-r--r--  1 root root       197 Jun  9  2009 ./slackware64/l/libcaca-0.99.beta16-x86_64-3.txz.asc
+-rw-r--r--  1 root root       380 Feb  8 20:26 ./slackware64/l/libcap-2.20-x86_64-1.txt
+-rw-r--r--  1 root root     52272 Feb  8 20:26 ./slackware64/l/libcap-2.20-x86_64-1.txz
+-rw-r--r--  1 root root       198 Feb  8 20:26 ./slackware64/l/libcap-2.20-x86_64-1.txz.asc
+-rw-r--r--  1 root root       328 Aug  6  2010 ./slackware64/l/libcddb-1.3.2-x86_64-1.txt
+-rw-r--r--  1 root root     68916 Aug  6  2010 ./slackware64/l/libcddb-1.3.2-x86_64-1.txz
+-rw-r--r--  1 root root       198 Aug  6  2010 ./slackware64/l/libcddb-1.3.2-x86_64-1.txz.asc
+-rw-r--r--  1 root root       554 Oct  8  2008 ./slackware64/l/libcdio-0.79-x86_64-1.txt
+-rw-r--r--  1 root root    280832 Oct  8  2008 ./slackware64/l/libcdio-0.79-x86_64-1.txz
+-rw-r--r--  1 root root       197 Oct  8  2008 ./slackware64/l/libcdio-0.79-x86_64-1.txz.asc
+-rw-r--r--  1 root root       459 Nov 20 17:55 ./slackware64/l/libdbusmenu-qt-0.6.4-x86_64-1.txt
+-rw-r--r--  1 root root     70436 Nov 20 17:55 ./slackware64/l/libdbusmenu-qt-0.6.4-x86_64-1.txz
+-rw-r--r--  1 root root       198 Nov 20 17:55 ./slackware64/l/libdbusmenu-qt-0.6.4-x86_64-1.txz.asc
+-rw-r--r--  1 root root       480 May  4  2010 ./slackware64/l/libdiscid-0.2.2-x86_64-1.txt
+-rw-r--r--  1 root root     19936 May  4  2010 ./slackware64/l/libdiscid-0.2.2-x86_64-1.txz
+-rw-r--r--  1 root root       198 May  4  2010 ./slackware64/l/libdiscid-0.2.2-x86_64-1.txz.asc
+-rw-r--r--  1 root root       398 Mar  9  2009 ./slackware64/l/libdvdread-4.1.3-x86_64-1.txt
+-rw-r--r--  1 root root     69700 Mar  9  2009 ./slackware64/l/libdvdread-4.1.3-x86_64-1.txz
+-rw-r--r--  1 root root       197 Mar  9  2009 ./slackware64/l/libdvdread-4.1.3-x86_64-1.txz.asc
+-rw-r--r--  1 root root       445 Mar 27 04:25 ./slackware64/l/libelf-0.8.13-x86_64-2.txt
+-rw-r--r--  1 root root     73896 Mar 27 04:25 ./slackware64/l/libelf-0.8.13-x86_64-2.txz
+-rw-r--r--  1 root root       198 Mar 27 04:25 ./slackware64/l/libelf-0.8.13-x86_64-2.txz.asc
+-rw-r--r--  1 root root       397 Feb  9 07:02 ./slackware64/l/libexif-0.6.20-x86_64-1.txt
+-rw-r--r--  1 root root    306960 Feb  9 07:02 ./slackware64/l/libexif-0.6.20-x86_64-1.txz
+-rw-r--r--  1 root root       198 Feb  9 07:02 ./slackware64/l/libexif-0.6.20-x86_64-1.txz.asc
+-rw-r--r--  1 root root       349 Apr 25  2010 ./slackware64/l/libglade-2.6.4-x86_64-4.txt
+-rw-r--r--  1 root root     89064 Apr 25  2010 ./slackware64/l/libglade-2.6.4-x86_64-4.txz
+-rw-r--r--  1 root root       198 Apr 25  2010 ./slackware64/l/libglade-2.6.4-x86_64-4.txz.asc
+-rw-r--r--  1 root root       293 Dec 30 18:44 ./slackware64/l/libgphoto2-2.4.10.1-x86_64-1.txt
+-rw-r--r--  1 root root   1060988 Dec 30 18:44 ./slackware64/l/libgphoto2-2.4.10.1-x86_64-1.txz
+-rw-r--r--  1 root root       198 Dec 30 18:44 ./slackware64/l/libgphoto2-2.4.10.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       518 Jan 16 17:25 ./slackware64/l/libgpod-0.8.0-x86_64-2.txt
+-rw-r--r--  1 root root    295288 Jan 16 17:25 ./slackware64/l/libgpod-0.8.0-x86_64-2.txz
+-rw-r--r--  1 root root       198 Jan 16 17:25 ./slackware64/l/libgpod-0.8.0-x86_64-2.txz.asc
+-rw-r--r--  1 root root       336 Apr  4 04:25 ./slackware64/l/libgsf-1.14.20-x86_64-1.txt
+-rw-r--r--  1 root root    216880 Apr  4 04:25 ./slackware64/l/libgsf-1.14.20-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr  4 04:25 ./slackware64/l/libgsf-1.14.20-x86_64-1.txz.asc
+-rw-r--r--  1 root root       466 Aug  6  2010 ./slackware64/l/libical-0.44-x86_64-1.txt
+-rw-r--r--  1 root root    243272 Aug  6  2010 ./slackware64/l/libical-0.44-x86_64-1.txz
+-rw-r--r--  1 root root       198 Aug  6  2010 ./slackware64/l/libical-0.44-x86_64-1.txz.asc
+-rw-r--r--  1 root root       318 Feb  8 21:00 ./slackware64/l/libid3tag-0.15.1b-x86_64-4.txt
+-rw-r--r--  1 root root     36076 Feb  8 21:00 ./slackware64/l/libid3tag-0.15.1b-x86_64-4.txz
+-rw-r--r--  1 root root       198 Feb  8 21:00 ./slackware64/l/libid3tag-0.15.1b-x86_64-4.txz.asc
+-rw-r--r--  1 root root       338 Aug  7  2010 ./slackware64/l/libidl-0.8.14-x86_64-1.txt
+-rw-r--r--  1 root root     88332 Aug  7  2010 ./slackware64/l/libidl-0.8.14-x86_64-1.txz
+-rw-r--r--  1 root root       198 Aug  7  2010 ./slackware64/l/libidl-0.8.14-x86_64-1.txz.asc
+-rw-r--r--  1 root root       336 Aug  7  2010 ./slackware64/l/libidn-1.19-x86_64-1.txt
+-rw-r--r--  1 root root    289176 Aug  7  2010 ./slackware64/l/libidn-1.19-x86_64-1.txz
+-rw-r--r--  1 root root       198 Aug  7  2010 ./slackware64/l/libidn-1.19-x86_64-1.txz.asc
+-rw-r--r--  1 root root       380 Apr 30  2009 ./slackware64/l/libieee1284-0.2.11-x86_64-2.txt
+-rw-r--r--  1 root root     75032 Apr 30  2009 ./slackware64/l/libieee1284-0.2.11-x86_64-2.txz
+-rw-r--r--  1 root root       197 Apr 30  2009 ./slackware64/l/libieee1284-0.2.11-x86_64-2.txz.asc
+-rw-r--r--  1 root root       438 May  4  2010 ./slackware64/l/libiodbc-3.52.7-x86_64-2.txt
+-rw-r--r--  1 root root    260652 May  4  2010 ./slackware64/l/libiodbc-3.52.7-x86_64-2.txz
+-rw-r--r--  1 root root       198 May  4  2010 ./slackware64/l/libiodbc-3.52.7-x86_64-2.txz.asc
+-rw-r--r--  1 root root       662 Apr  5  2010 ./slackware64/l/libjpeg-v8a-x86_64-1.txt
+-rw-r--r--  1 root root    178868 Apr  5  2010 ./slackware64/l/libjpeg-v8a-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr  5  2010 ./slackware64/l/libjpeg-v8a-x86_64-1.txz.asc
+-rw-r--r--  1 root root       357 Dec 15 01:07 ./slackware64/l/libkarma-0.1.1-x86_64-2.txt
+-rw-r--r--  1 root root     57356 Dec 15 01:07 ./slackware64/l/libkarma-0.1.1-x86_64-2.txz
+-rw-r--r--  1 root root       198 Dec 15 01:07 ./slackware64/l/libkarma-0.1.1-x86_64-2.txz.asc
+-rw-r--r--  1 root root       204 Jan 15 19:20 ./slackware64/l/liblastfm-0.3.3_f0b3239-x86_64-1.txt
+-rw-r--r--  1 root root    150120 Jan 15 19:20 ./slackware64/l/liblastfm-0.3.3_f0b3239-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan 15 19:20 ./slackware64/l/liblastfm-0.3.3_f0b3239-x86_64-1.txz.asc
+-rw-r--r--  1 root root       600 Oct  9  2008 ./slackware64/l/libmad-0.15.1b-x86_64-3.txt
+-rw-r--r--  1 root root     70860 Oct  9  2008 ./slackware64/l/libmad-0.15.1b-x86_64-3.txz
+-rw-r--r--  1 root root       197 Oct  9  2008 ./slackware64/l/libmad-0.15.1b-x86_64-3.txz.asc
+-rw-r--r--  1 root root       552 Apr  5  2009 ./slackware64/l/libmcrypt-2.5.8-x86_64-1.txt
+-rw-r--r--  1 root root     81464 Apr  5  2009 ./slackware64/l/libmcrypt-2.5.8-x86_64-1.txz
+-rw-r--r--  1 root root       197 Apr  5  2009 ./slackware64/l/libmcrypt-2.5.8-x86_64-1.txz.asc
+-rw-r--r--  1 root root       509 Aug  9  2010 ./slackware64/l/libmcs-0.7.2-x86_64-1.txt
+-rw-r--r--  1 root root     16208 Aug  9  2010 ./slackware64/l/libmcs-0.7.2-x86_64-1.txz
+-rw-r--r--  1 root root       198 Aug  9  2010 ./slackware64/l/libmcs-0.7.2-x86_64-1.txz.asc
+-rw-r--r--  1 root root       484 Feb 14  2010 ./slackware64/l/libmng-1.0.10-x86_64-2.txt
+-rw-r--r--  1 root root    211592 Feb 14  2010 ./slackware64/l/libmng-1.0.10-x86_64-2.txz
+-rw-r--r--  1 root root       197 Feb 14  2010 ./slackware64/l/libmng-1.0.10-x86_64-2.txz.asc
+-rw-r--r--  1 root root       399 Aug  9  2010 ./slackware64/l/libmowgli-0.7.1-x86_64-1.txt
+-rw-r--r--  1 root root     32144 Aug  9  2010 ./slackware64/l/libmowgli-0.7.1-x86_64-1.txz
+-rw-r--r--  1 root root       198 Aug  9  2010 ./slackware64/l/libmowgli-0.7.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       376 Feb  8 17:40 ./slackware64/l/libmpc-0.8.2-x86_64-2.txt
+-rw-r--r--  1 root root     70112 Feb  8 17:40 ./slackware64/l/libmpc-0.8.2-x86_64-2.txz
+-rw-r--r--  1 root root       198 Feb  8 17:40 ./slackware64/l/libmpc-0.8.2-x86_64-2.txz.asc
+-rw-r--r--  1 root root       315 May  4  2010 ./slackware64/l/libmsn-4.1-x86_64-1.txt
+-rw-r--r--  1 root root    264324 May  4  2010 ./slackware64/l/libmsn-4.1-x86_64-1.txz
+-rw-r--r--  1 root root       198 May  4  2010 ./slackware64/l/libmsn-4.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       602 May  3  2010 ./slackware64/l/libmtp-1.0.1-x86_64-2.txt
+-rw-r--r--  1 root root    244572 May  3  2010 ./slackware64/l/libmtp-1.0.1-x86_64-2.txz
+-rw-r--r--  1 root root       198 May  3  2010 ./slackware64/l/libmtp-1.0.1-x86_64-2.txz.asc
+-rw-r--r--  1 root root       540 Aug  9  2010 ./slackware64/l/libnjb-2.2.6-x86_64-5.txt
+-rw-r--r--  1 root root    223428 Aug  9  2010 ./slackware64/l/libnjb-2.2.6-x86_64-5.txz
+-rw-r--r--  1 root root       198 Aug  9  2010 ./slackware64/l/libnjb-2.2.6-x86_64-5.txz.asc
+-rw-r--r--  1 root root       330 Mar 31  2009 ./slackware64/l/libnl-1.1-x86_64-1.txt
+-rw-r--r--  1 root root    119472 Mar 31  2009 ./slackware64/l/libnl-1.1-x86_64-1.txz
+-rw-r--r--  1 root root       197 Mar 31  2009 ./slackware64/l/libnl-1.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       251 Dec 15 01:38 ./slackware64/l/libnotify-0.5.2-x86_64-1.txt
+-rw-r--r--  1 root root     44324 Dec 15 01:38 ./slackware64/l/libnotify-0.5.2-x86_64-1.txz
+-rw-r--r--  1 root root       198 Dec 15 01:38 ./slackware64/l/libnotify-0.5.2-x86_64-1.txz.asc
+-rw-r--r--  1 root root       305 Mar  9 20:13 ./slackware64/l/libogg-1.2.2-x86_64-1.txt
+-rw-r--r--  1 root root     72076 Mar  9 20:13 ./slackware64/l/libogg-1.2.2-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar  9 20:13 ./slackware64/l/libogg-1.2.2-x86_64-1.txz.asc
+-rw-r--r--  1 root root       580 Mar  9 20:23 ./slackware64/l/liboggz-1.1.1-x86_64-1.txt
+-rw-r--r--  1 root root    181980 Mar  9 20:23 ./slackware64/l/liboggz-1.1.1-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar  9 20:23 ./slackware64/l/liboggz-1.1.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       576 Aug  9  2010 ./slackware64/l/liboil-0.3.17-x86_64-1.txt
+-rw-r--r--  1 root root    162476 Aug  9  2010 ./slackware64/l/liboil-0.3.17-x86_64-1.txz
+-rw-r--r--  1 root root       198 Aug  9  2010 ./slackware64/l/liboil-0.3.17-x86_64-1.txz.asc
+-rw-r--r--  1 root root       450 Aug  5  2010 ./slackware64/l/libpcap-1.1.1-x86_64-1.txt
+-rw-r--r--  1 root root    239420 Aug  5  2010 ./slackware64/l/libpcap-1.1.1-x86_64-1.txz
+-rw-r--r--  1 root root       198 Aug  5  2010 ./slackware64/l/libpcap-1.1.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       337 Jan 15 19:55 ./slackware64/l/libplist-1.3-x86_64-1.txt
+-rw-r--r--  1 root root     99496 Jan 15 19:55 ./slackware64/l/libplist-1.3-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan 15 19:55 ./slackware64/l/libplist-1.3-x86_64-1.txz.asc
+-rw-r--r--  1 root root       492 Jan 30 17:52 ./slackware64/l/libpng-1.4.5-x86_64-1.txt
+-rw-r--r--  1 root root    562208 Jan 30 17:52 ./slackware64/l/libpng-1.4.5-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan 30 17:52 ./slackware64/l/libpng-1.4.5-x86_64-1.txz.asc
+-rw-r--r--  1 root root       351 Mar 17 22:57 ./slackware64/l/libraw1394-2.0.7-x86_64-1.txt
+-rw-r--r--  1 root root     64768 Mar 17 22:57 ./slackware64/l/libraw1394-2.0.7-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar 17 22:57 ./slackware64/l/libraw1394-2.0.7-x86_64-1.txz.asc
+-rw-r--r--  1 root root       174 Nov  6 03:55 ./slackware64/l/librsvg-2.32.0-x86_64-1.txt
+-rw-r--r--  1 root root    149660 Nov  6 03:55 ./slackware64/l/librsvg-2.32.0-x86_64-1.txz
+-rw-r--r--  1 root root       198 Nov  6 03:55 ./slackware64/l/librsvg-2.32.0-x86_64-1.txz.asc
+-rw-r--r--  1 root root       653 Jan 26 05:13 ./slackware64/l/libsamplerate-0.1.7-x86_64-2.txt
+-rw-r--r--  1 root root    993312 Jan 26 05:13 ./slackware64/l/libsamplerate-0.1.7-x86_64-2.txz
+-rw-r--r--  1 root root       198 Jan 26 05:13 ./slackware64/l/libsamplerate-0.1.7-x86_64-2.txz.asc
+-rw-r--r--  1 root root       370 Apr 17 16:57 ./slackware64/l/libsndfile-1.0.24-x86_64-1.txt
+-rw-r--r--  1 root root    242904 Apr 17 16:57 ./slackware64/l/libsndfile-1.0.24-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr 17 16:57 ./slackware64/l/libsndfile-1.0.24-x86_64-1.txz.asc
+-rw-r--r--  1 root root       413 Dec  5 18:24 ./slackware64/l/libspectre-0.2.5-x86_64-2.txt
+-rw-r--r--  1 root root     38468 Dec  5 18:24 ./slackware64/l/libspectre-0.2.5-x86_64-2.txz
+-rw-r--r--  1 root root       198 Dec  5 18:24 ./slackware64/l/libspectre-0.2.5-x86_64-2.txz.asc
+-rw-r--r--  1 root root       477 Sep 28  2008 ./slackware64/l/libtermcap-1.2.3-x86_64-7.txt
+-rw-r--r--  1 root root     59224 Sep 28  2008 ./slackware64/l/libtermcap-1.2.3-x86_64-7.txz
+-rw-r--r--  1 root root       197 Sep 28  2008 ./slackware64/l/libtermcap-1.2.3-x86_64-7.txz.asc
+-rw-r--r--  1 root root       625 Feb 17  2010 ./slackware64/l/libtheora-1.1.1-x86_64-1.txt
+-rw-r--r--  1 root root    183020 Feb 17  2010 ./slackware64/l/libtheora-1.1.1-x86_64-1.txz
+-rw-r--r--  1 root root       197 Feb 17  2010 ./slackware64/l/libtheora-1.1.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       394 Apr  7 21:18 ./slackware64/l/libtiff-3.9.4-x86_64-2.txt
+-rw-r--r--  1 root root    472744 Apr  7 21:18 ./slackware64/l/libtiff-3.9.4-x86_64-2.txz
+-rw-r--r--  1 root root       198 Apr  7 21:18 ./slackware64/l/libtiff-3.9.4-x86_64-2.txz.asc
+-rw-r--r--  1 root root       387 Mar 24 23:42 ./slackware64/l/libusb-1.0.8-x86_64-2.txt
+-rw-r--r--  1 root root     65040 Mar 24 23:42 ./slackware64/l/libusb-1.0.8-x86_64-2.txz
+-rw-r--r--  1 root root       198 Mar 24 23:42 ./slackware64/l/libusb-1.0.8-x86_64-2.txz.asc
+-rw-r--r--  1 root root       544 Oct 10  2008 ./slackware64/l/libvisual-0.4.0-x86_64-2.txt
+-rw-r--r--  1 root root    127060 Oct 10  2008 ./slackware64/l/libvisual-0.4.0-x86_64-2.txz
+-rw-r--r--  1 root root       197 Oct 10  2008 ./slackware64/l/libvisual-0.4.0-x86_64-2.txz.asc
+-rw-r--r--  1 root root       722 Jun 10  2009 ./slackware64/l/libvisual-plugins-0.4.0-x86_64-2.txt
+-rw-r--r--  1 root root    220752 Jun 10  2009 ./slackware64/l/libvisual-plugins-0.4.0-x86_64-2.txz
+-rw-r--r--  1 root root       197 Jun 10  2009 ./slackware64/l/libvisual-plugins-0.4.0-x86_64-2.txz.asc
+-rw-r--r--  1 root root       374 Feb 15  2010 ./slackware64/l/libvncserver-0.9.7-x86_64-2.txt
+-rw-r--r--  1 root root    198772 Feb 15  2010 ./slackware64/l/libvncserver-0.9.7-x86_64-2.txz
+-rw-r--r--  1 root root       197 Feb 15  2010 ./slackware64/l/libvncserver-0.9.7-x86_64-2.txz.asc
+-rw-r--r--  1 root root       560 Nov 16 17:54 ./slackware64/l/libvorbis-1.3.2-x86_64-1.txt
+-rw-r--r--  1 root root    308812 Nov 16 17:54 ./slackware64/l/libvorbis-1.3.2-x86_64-1.txz
+-rw-r--r--  1 root root       198 Nov 16 17:54 ./slackware64/l/libvorbis-1.3.2-x86_64-1.txz.asc
+-rw-r--r--  1 root root       288 Feb 15  2010 ./slackware64/l/libwmf-0.2.8.4-x86_64-5.txt
+-rw-r--r--  1 root root    752556 Feb 15  2010 ./slackware64/l/libwmf-0.2.8.4-x86_64-5.txz
+-rw-r--r--  1 root root       197 Feb 15  2010 ./slackware64/l/libwmf-0.2.8.4-x86_64-5.txz.asc
+-rw-r--r--  1 root root       305 Feb 15  2010 ./slackware64/l/libwmf-docs-0.2.8.4-noarch-5.txt
+-rw-r--r--  1 root root    207316 Feb 15  2010 ./slackware64/l/libwmf-docs-0.2.8.4-noarch-5.txz
+-rw-r--r--  1 root root       197 Feb 15  2010 ./slackware64/l/libwmf-docs-0.2.8.4-noarch-5.txz.asc
+-rw-r--r--  1 root root       475 Feb 24 22:25 ./slackware64/l/libwnck-2.30.6-x86_64-1.txt
+-rw-r--r--  1 root root    359812 Feb 24 22:25 ./slackware64/l/libwnck-2.30.6-x86_64-1.txz
+-rw-r--r--  1 root root       198 Feb 24 22:25 ./slackware64/l/libwnck-2.30.6-x86_64-1.txz.asc
+-rw-r--r--  1 root root       316 Oct 20  2008 ./slackware64/l/libwpd-0.8.14-x86_64-1.txt
+-rw-r--r--  1 root root    198748 Oct 20  2008 ./slackware64/l/libwpd-0.8.14-x86_64-1.txz
+-rw-r--r--  1 root root       197 Oct 20  2008 ./slackware64/l/libwpd-0.8.14-x86_64-1.txz.asc
+-rw-r--r--  1 root root       292 Feb 16 01:33 ./slackware64/l/libxklavier-5.1-x86_64-1.txt
+-rw-r--r--  1 root root     79684 Feb 16 01:33 ./slackware64/l/libxklavier-5.1-x86_64-1.txz
+-rw-r--r--  1 root root       198 Feb 16 01:33 ./slackware64/l/libxklavier-5.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       522 Jan  8 01:52 ./slackware64/l/libxml2-2.7.8-x86_64-3.txt
+-rw-r--r--  1 root root   1424280 Jan  8 01:52 ./slackware64/l/libxml2-2.7.8-x86_64-3.txz
+-rw-r--r--  1 root root       198 Jan  8 01:52 ./slackware64/l/libxml2-2.7.8-x86_64-3.txz.asc
+-rw-r--r--  1 root root       220 Dec  5  2009 ./slackware64/l/libxslt-1.1.26-x86_64-1.txt
+-rw-r--r--  1 root root    408116 Dec  5  2009 ./slackware64/l/libxslt-1.1.26-x86_64-1.txz
+-rw-r--r--  1 root root       197 Dec  5  2009 ./slackware64/l/libxslt-1.1.26-x86_64-1.txz.asc
+-rw-r--r--  1 root root       429 Aug  9  2010 ./slackware64/l/libzip-0.9.3-x86_64-1.txt
+-rw-r--r--  1 root root     90092 Aug  9  2010 ./slackware64/l/libzip-0.9.3-x86_64-1.txz
+-rw-r--r--  1 root root       198 Aug  9  2010 ./slackware64/l/libzip-0.9.3-x86_64-1.txz.asc
+-rw-r--r--  1 root root       440 Apr 10  2010 ./slackware64/l/loudmouth-1.4.3-x86_64-1.txt
+-rw-r--r--  1 root root     76796 Apr 10  2010 ./slackware64/l/loudmouth-1.4.3-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr 10  2010 ./slackware64/l/loudmouth-1.4.3-x86_64-1.txz.asc
+-rw-r--r--  1 root root       273 Aug  9  2010 ./slackware64/l/lzo-2.03-x86_64-1.txt
+-rw-r--r--  1 root root     73672 Aug  9  2010 ./slackware64/l/lzo-2.03-x86_64-1.txz
+-rw-r--r--  1 root root       198 Aug  9  2010 ./slackware64/l/lzo-2.03-x86_64-1.txz.asc
+-rw-r--r--  1 root root     14283 Mar 31 03:51 ./slackware64/l/maketag
+-rw-r--r--  1 root root     14283 Mar 31 03:51 ./slackware64/l/maketag.ez
+-rw-r--r--  1 root root       468 Feb 16 21:33 ./slackware64/l/mhash-0.9.9.9-x86_64-3.txt
+-rw-r--r--  1 root root    121720 Feb 16 21:33 ./slackware64/l/mhash-0.9.9.9-x86_64-3.txz
+-rw-r--r--  1 root root       198 Feb 16 21:33 ./slackware64/l/mhash-0.9.9.9-x86_64-3.txz.asc
+-rw-r--r--  1 root root       550 Oct 10  2008 ./slackware64/l/mm-1.4.2-x86_64-2.txt
+-rw-r--r--  1 root root     32612 Oct 10  2008 ./slackware64/l/mm-1.4.2-x86_64-2.txz
+-rw-r--r--  1 root root       197 Oct 10  2008 ./slackware64/l/mm-1.4.2-x86_64-2.txz.asc
+-rw-r--r--  1 root root       587 Apr  5 02:56 ./slackware64/l/mpfr-3.0.1-x86_64-1.txt
+-rw-r--r--  1 root root    301412 Apr  5 02:56 ./slackware64/l/mpfr-3.0.1-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr  5 02:56 ./slackware64/l/mpfr-3.0.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       446 Apr  5 02:48 ./slackware64/l/ncurses-5.9-x86_64-1.txt
+-rw-r--r--  1 root root   1079328 Apr  5 02:48 ./slackware64/l/ncurses-5.9-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr  5 02:48 ./slackware64/l/ncurses-5.9-x86_64-1.txz.asc
+-rw-r--r--  1 root root       343 Mar  1 20:20 ./slackware64/l/neon-0.29.5-x86_64-1.txt
+-rw-r--r--  1 root root    202880 Mar  1 20:20 ./slackware64/l/neon-0.29.5-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar  1 20:20 ./slackware64/l/neon-0.29.5-x86_64-1.txz.asc
+-rw-r--r--  1 root root       231 Feb 15  2010 ./slackware64/l/netpbm-10.49.02-x86_64-1.txt
+-rw-r--r--  1 root root   1629468 Feb 15  2010 ./slackware64/l/netpbm-10.49.02-x86_64-1.txz
+-rw-r--r--  1 root root       197 Feb 15  2010 ./slackware64/l/netpbm-10.49.02-x86_64-1.txz.asc
+-rw-r--r--  1 root root       354 Feb 20  2010 ./slackware64/l/notify-python-0.1.1-x86_64-1.txt
+-rw-r--r--  1 root root     18960 Feb 20  2010 ./slackware64/l/notify-python-0.1.1-x86_64-1.txz
+-rw-r--r--  1 root root       197 Feb 20  2010 ./slackware64/l/notify-python-0.1.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       457 Aug  9  2010 ./slackware64/l/openexr-1.7.0-x86_64-1.txt
+-rw-r--r--  1 root root   3053004 Aug  9  2010 ./slackware64/l/openexr-1.7.0-x86_64-1.txz
+-rw-r--r--  1 root root       198 Aug  9  2010 ./slackware64/l/openexr-1.7.0-x86_64-1.txz.asc
+-rw-r--r--  1 root root       429 Apr  7 01:14 ./slackware64/l/pango-1.28.4-x86_64-1.txt
+-rw-r--r--  1 root root    507476 Apr  7 01:14 ./slackware64/l/pango-1.28.4-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr  7 01:14 ./slackware64/l/pango-1.28.4-x86_64-1.txz.asc
+-rw-r--r--  1 root root       384 Nov  6 21:30 ./slackware64/l/parted-2.3-x86_64-1.txt
+-rw-r--r--  1 root root    519756 Nov  6 21:30 ./slackware64/l/parted-2.3-x86_64-1.txz
+-rw-r--r--  1 root root       198 Nov  6 21:30 ./slackware64/l/parted-2.3-x86_64-1.txz.asc
+-rw-r--r--  1 root root       364 Mar 26 05:23 ./slackware64/l/pcre-8.12-x86_64-1.txt
+-rw-r--r--  1 root root    442552 Mar 26 05:23 ./slackware64/l/pcre-8.12-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar 26 05:23 ./slackware64/l/pcre-8.12-x86_64-1.txz.asc
+-rw-r--r--  1 root root       302 Nov 27 18:02 ./slackware64/l/phonon-4.4.3-x86_64-1.txt
+-rw-r--r--  1 root root    355792 Nov 27 18:02 ./slackware64/l/phonon-4.4.3-x86_64-1.txz
+-rw-r--r--  1 root root       198 Nov 27 18:02 ./slackware64/l/phonon-4.4.3-x86_64-1.txz.asc
+-rw-r--r--  1 root root       372 Dec 18 02:34 ./slackware64/l/phonon-mplayer-20101213-x86_64-1.txt
+-rw-r--r--  1 root root     89032 Dec 18 02:34 ./slackware64/l/phonon-mplayer-20101213-x86_64-1.txz
+-rw-r--r--  1 root root       198 Dec 18 02:34 ./slackware64/l/phonon-mplayer-20101213-x86_64-1.txz.asc
+-rw-r--r--  1 root root       419 Feb 14  2010 ./slackware64/l/pil-1.1.7-x86_64-1.txt
+-rw-r--r--  1 root root    365828 Feb 14  2010 ./slackware64/l/pil-1.1.7-x86_64-1.txz
+-rw-r--r--  1 root root       197 Feb 14  2010 ./slackware64/l/pil-1.1.7-x86_64-1.txz.asc
+-rw-r--r--  1 root root       416 Jan 26 19:26 ./slackware64/l/pilot-link-0.12.5-x86_64-3.txt
+-rw-r--r--  1 root root    560116 Jan 26 19:26 ./slackware64/l/pilot-link-0.12.5-x86_64-3.txz
+-rw-r--r--  1 root root       198 Jan 26 19:26 ./slackware64/l/pilot-link-0.12.5-x86_64-3.txz.asc
+-rw-r--r--  1 root root       450 Apr 20 03:07 ./slackware64/l/polkit-0.101-x86_64-2.txt
+-rw-r--r--  1 root root    364208 Apr 20 03:07 ./slackware64/l/polkit-0.101-x86_64-2.txz
+-rw-r--r--  1 root root       198 Apr 20 03:07 ./slackware64/l/polkit-0.101-x86_64-2.txz.asc
+-rw-r--r--  1 root root       367 Mar  7 19:12 ./slackware64/l/polkit-gnome-0.101-x86_64-1.txt
+-rw-r--r--  1 root root     97712 Mar  7 19:12 ./slackware64/l/polkit-gnome-0.101-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar  7 19:12 ./slackware64/l/polkit-gnome-0.101-x86_64-1.txz.asc
+-rw-r--r--  1 root root       494 Apr  6 05:29 ./slackware64/l/poppler-0.16.4-x86_64-1.txt
+-rw-r--r--  1 root root   1030660 Apr  6 05:29 ./slackware64/l/poppler-0.16.4-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr  6 05:29 ./slackware64/l/poppler-0.16.4-x86_64-1.txz.asc
+-rw-r--r--  1 root root       601 Nov 11 20:57 ./slackware64/l/poppler-data-0.4.4-noarch-1.txt
+-rw-r--r--  1 root root   1482016 Nov 11 20:57 ./slackware64/l/poppler-data-0.4.4-noarch-1.txz
+-rw-r--r--  1 root root       198 Nov 11 20:57 ./slackware64/l/poppler-data-0.4.4-noarch-1.txz.asc
+-rw-r--r--  1 root root       592 Apr 30  2010 ./slackware64/l/popt-1.7-x86_64-3.txt
+-rw-r--r--  1 root root     41380 Apr 30  2010 ./slackware64/l/popt-1.7-x86_64-3.txz
+-rw-r--r--  1 root root       198 Apr 30  2010 ./slackware64/l/popt-1.7-x86_64-3.txz.asc
+-rw-r--r--  1 root root       286 Nov  6 04:10 ./slackware64/l/pycairo-1.8.10-x86_64-1.txt
+-rw-r--r--  1 root root     45312 Nov  6 04:10 ./slackware64/l/pycairo-1.8.10-x86_64-1.txz
+-rw-r--r--  1 root root       198 Nov  6 04:10 ./slackware64/l/pycairo-1.8.10-x86_64-1.txz.asc
+-rw-r--r--  1 root root       239 Mar 22 06:21 ./slackware64/l/pycups-1.9.55-x86_64-1.txt
+-rw-r--r--  1 root root     62288 Mar 22 06:21 ./slackware64/l/pycups-1.9.55-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar 22 06:21 ./slackware64/l/pycups-1.9.55-x86_64-1.txz.asc
+-rw-r--r--  1 root root       398 Nov 14 23:00 ./slackware64/l/pygobject-2.26.0-x86_64-1.txt
+-rw-r--r--  1 root root    403228 Nov 14 23:00 ./slackware64/l/pygobject-2.26.0-x86_64-1.txz
+-rw-r--r--  1 root root       198 Nov 14 23:00 ./slackware64/l/pygobject-2.26.0-x86_64-1.txz.asc
+-rw-r--r--  1 root root       320 Nov  6 04:13 ./slackware64/l/pygtk-2.22.0-x86_64-1.txt
+-rw-r--r--  1 root root   1712368 Nov  6 04:13 ./slackware64/l/pygtk-2.22.0-x86_64-1.txz
+-rw-r--r--  1 root root       198 Nov  6 04:13 ./slackware64/l/pygtk-2.22.0-x86_64-1.txz.asc
+-rw-r--r--  1 root root       392 Aug  9  2010 ./slackware64/l/pyrex-0.9.9-x86_64-1.txt
+-rw-r--r--  1 root root    249272 Aug  9  2010 ./slackware64/l/pyrex-0.9.9-x86_64-1.txz
+-rw-r--r--  1 root root       198 Aug  9  2010 ./slackware64/l/pyrex-0.9.9-x86_64-1.txz.asc
+-rw-r--r--  1 root root       567 Nov  3  2009 ./slackware64/l/qca-2.0.2-x86_64-1.txt
+-rw-r--r--  1 root root    543344 Nov  3  2009 ./slackware64/l/qca-2.0.2-x86_64-1.txz
+-rw-r--r--  1 root root       197 Nov  3  2009 ./slackware64/l/qca-2.0.2-x86_64-1.txz.asc
+-rw-r--r--  1 root root       280 Dec 16  2008 ./slackware64/l/qca-cyrus-sasl-2.0.0_beta3-x86_64-1.txt
+-rw-r--r--  1 root root     25916 Dec 16  2008 ./slackware64/l/qca-cyrus-sasl-2.0.0_beta3-x86_64-1.txz
+-rw-r--r--  1 root root       197 Dec 16  2008 ./slackware64/l/qca-cyrus-sasl-2.0.0_beta3-x86_64-1.txz.asc
+-rw-r--r--  1 root root       200 Dec 16  2008 ./slackware64/l/qca-gnupg-2.0.0_beta3-x86_64-1.txt
+-rw-r--r--  1 root root     83252 Dec 16  2008 ./slackware64/l/qca-gnupg-2.0.0_beta3-x86_64-1.txz
+-rw-r--r--  1 root root       197 Dec 16  2008 ./slackware64/l/qca-gnupg-2.0.0_beta3-x86_64-1.txz.asc
+-rw-r--r--  1 root root       493 Dec 16  2008 ./slackware64/l/qca-ossl-2.0.0_beta3-x86_64-1.txt
+-rw-r--r--  1 root root     92288 Dec 16  2008 ./slackware64/l/qca-ossl-2.0.0_beta3-x86_64-1.txz
+-rw-r--r--  1 root root       197 Dec 16  2008 ./slackware64/l/qca-ossl-2.0.0_beta3-x86_64-1.txz.asc
+-rw-r--r--  1 root root       395 Jul 12  2010 ./slackware64/l/qimageblitz-0.0.6-x86_64-1.txt
+-rw-r--r--  1 root root     68836 Jul 12  2010 ./slackware64/l/qimageblitz-0.0.6-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jul 12  2010 ./slackware64/l/qimageblitz-0.0.6-x86_64-1.txz.asc
+-rw-r--r--  1 root root       266 Mar 25 19:07 ./slackware64/l/qt-4.7.0_7abde40-x86_64-3.txt
+-rw-r--r--  1 root root  56135792 Mar 25 19:07 ./slackware64/l/qt-4.7.0_7abde40-x86_64-3.txz
+-rw-r--r--  1 root root       198 Mar 25 19:07 ./slackware64/l/qt-4.7.0_7abde40-x86_64-3.txz.asc
+-rw-r--r--  1 root root       488 Feb 19  2010 ./slackware64/l/qtscriptgenerator-0.1.0-x86_64-2.txt
+-rw-r--r--  1 root root   3635940 Feb 19  2010 ./slackware64/l/qtscriptgenerator-0.1.0-x86_64-2.txz
+-rw-r--r--  1 root root       197 Feb 19  2010 ./slackware64/l/qtscriptgenerator-0.1.0-x86_64-2.txz.asc
+-rw-r--r--  1 root root       545 Mar  5  2010 ./slackware64/l/raptor-1.4.21-x86_64-1.txt
+-rw-r--r--  1 root root    319968 Mar  5  2010 ./slackware64/l/raptor-1.4.21-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar  5  2010 ./slackware64/l/raptor-1.4.21-x86_64-1.txz.asc
+-rw-r--r--  1 root root       428 Mar  3 22:18 ./slackware64/l/rasqal-0.9.21-x86_64-1.txt
+-rw-r--r--  1 root root    258148 Mar  3 22:18 ./slackware64/l/rasqal-0.9.21-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar  3 22:18 ./slackware64/l/rasqal-0.9.21-x86_64-1.txz.asc
+-rw-r--r--  1 root root       559 Feb 22  2009 ./slackware64/l/readline-5.2-x86_64-4.txt
+-rw-r--r--  1 root root    280136 Feb 22  2009 ./slackware64/l/readline-5.2-x86_64-4.txz
+-rw-r--r--  1 root root       197 Feb 22  2009 ./slackware64/l/readline-5.2-x86_64-4.txz.asc
+-rw-r--r--  1 root root       528 Mar  3 22:23 ./slackware64/l/redland-1.0.12-x86_64-1.txt
+-rw-r--r--  1 root root    290084 Mar  3 22:23 ./slackware64/l/redland-1.0.12-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar  3 22:23 ./slackware64/l/redland-1.0.12-x86_64-1.txz.asc
+-rw-r--r--  1 root root       487 Apr 25 05:29 ./slackware64/l/sdl-1.2.14-x86_64-5.txt
+-rw-r--r--  1 root root    666788 Apr 25 05:29 ./slackware64/l/sdl-1.2.14-x86_64-5.txz
+-rw-r--r--  1 root root       198 Apr 25 05:29 ./slackware64/l/sdl-1.2.14-x86_64-5.txz.asc
+-rw-r--r--  1 root root       782 Apr 11 01:34 ./slackware64/l/seamonkey-solibs-2.1b3-x86_64-2.txt
+-rw-r--r--  1 root root   2156852 Apr 11 01:34 ./slackware64/l/seamonkey-solibs-2.1b3-x86_64-2.txz
+-rw-r--r--  1 root root       198 Apr 11 01:34 ./slackware64/l/seamonkey-solibs-2.1b3-x86_64-2.txz.asc
+-rw-r--r--  1 root root       642 Jul 12  2010 ./slackware64/l/shared-desktop-ontologies-0.5-x86_64-1.txt
+-rw-r--r--  1 root root     91888 Jul 12  2010 ./slackware64/l/shared-desktop-ontologies-0.5-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jul 12  2010 ./slackware64/l/shared-desktop-ontologies-0.5-x86_64-1.txz.asc
+-rw-r--r--  1 root root       512 Jan 22 04:21 ./slackware64/l/shared-mime-info-0.90-x86_64-1.txt
+-rw-r--r--  1 root root    389852 Jan 22 04:21 ./slackware64/l/shared-mime-info-0.90-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan 22 04:21 ./slackware64/l/shared-mime-info-0.90-x86_64-1.txz.asc
+-rw-r--r--  1 root root       395 Nov 29 06:01 ./slackware64/l/sip-4.11.2-x86_64-1.txt
+-rw-r--r--  1 root root    329668 Nov 29 06:01 ./slackware64/l/sip-4.11.2-x86_64-1.txz
+-rw-r--r--  1 root root       198 Nov 29 06:01 ./slackware64/l/sip-4.11.2-x86_64-1.txz.asc
+-rw-r--r--  1 root root       538 Jan  1 20:17 ./slackware64/l/slang-2.2.3-x86_64-1.txt
+-rw-r--r--  1 root root    430916 Jan  1 20:17 ./slackware64/l/slang-2.2.3-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan  1 20:17 ./slackware64/l/slang-2.2.3-x86_64-1.txz.asc
+-rw-r--r--  1 root root       549 Oct 13  2008 ./slackware64/l/slang1-1.4.9-x86_64-1.txt
+-rw-r--r--  1 root root    191920 Oct 13  2008 ./slackware64/l/slang1-1.4.9-x86_64-1.txz
+-rw-r--r--  1 root root       197 Oct 13  2008 ./slackware64/l/slang1-1.4.9-x86_64-1.txz.asc
+-rw-r--r--  1 root root       389 Dec  9 18:57 ./slackware64/l/soprano-2.5.2-x86_64-2.txt
+-rw-r--r--  1 root root   2120176 Dec  9 18:57 ./slackware64/l/soprano-2.5.2-x86_64-2.txz
+-rw-r--r--  1 root root       198 Dec  9 18:57 ./slackware64/l/soprano-2.5.2-x86_64-2.txz.asc
+-rw-r--r--  1 root root       359 Feb  6  2010 ./slackware64/l/startup-notification-0.10-x86_64-1.txt
+-rw-r--r--  1 root root     29620 Feb  6  2010 ./slackware64/l/startup-notification-0.10-x86_64-1.txz
+-rw-r--r--  1 root root       197 Feb  6  2010 ./slackware64/l/startup-notification-0.10-x86_64-1.txz.asc
+-rw-r--r--  1 root root       509 Feb 12 23:07 ./slackware64/l/strigi-0.7.2-x86_64-2.txt
+-rw-r--r--  1 root root    726172 Feb 12 23:07 ./slackware64/l/strigi-0.7.2-x86_64-2.txz
+-rw-r--r--  1 root root       198 Feb 12 23:07 ./slackware64/l/strigi-0.7.2-x86_64-2.txz.asc
+-rw-r--r--  1 root root       344 Mar 10  2009 ./slackware64/l/svgalib-1.9.25-x86_64-2.txt
+-rw-r--r--  1 root root    596412 Mar 10  2009 ./slackware64/l/svgalib-1.9.25-x86_64-2.txz
+-rw-r--r--  1 root root       197 Mar 10  2009 ./slackware64/l/svgalib-1.9.25-x86_64-2.txz.asc
+-rw-r--r--  1 root root       745 Mar 22 06:28 ./slackware64/l/system-config-printer-1.2.7-x86_64-1.txt
+-rw-r--r--  1 root root    640380 Mar 22 06:28 ./slackware64/l/system-config-printer-1.2.7-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar 22 06:28 ./slackware64/l/system-config-printer-1.2.7-x86_64-1.txz.asc
+-rw-r--r--  1 root root       357 Mar 31 01:16 ./slackware64/l/t1lib-5.1.2-x86_64-2.txt
+-rw-r--r--  1 root root    514448 Mar 31 01:16 ./slackware64/l/t1lib-5.1.2-x86_64-2.txz
+-rw-r--r--  1 root root       198 Mar 31 01:16 ./slackware64/l/t1lib-5.1.2-x86_64-2.txz.asc
+-rw-r--r--  1 root root      2510 Mar 31 03:51 ./slackware64/l/tagfile
+-rw-r--r--  1 root root       340 Jan  1 21:43 ./slackware64/l/taglib-1.6.3-x86_64-1.txt
+-rw-r--r--  1 root root    227332 Jan  1 21:43 ./slackware64/l/taglib-1.6.3-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan  1 21:43 ./slackware64/l/taglib-1.6.3-x86_64-1.txz.asc
+-rw-r--r--  1 root root       521 Oct  3  2009 ./slackware64/l/taglib-extras-1.0.1-x86_64-1.txt
+-rw-r--r--  1 root root     28432 Oct  3  2009 ./slackware64/l/taglib-extras-1.0.1-x86_64-1.txz
+-rw-r--r--  1 root root       197 Oct  3  2009 ./slackware64/l/taglib-extras-1.0.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       523 Mar  6  2009 ./slackware64/l/tango-icon-theme-0.8.90-noarch-1.txt
+-rw-r--r--  1 root root   1245240 Mar  6  2009 ./slackware64/l/tango-icon-theme-0.8.90-noarch-1.txz
+-rw-r--r--  1 root root       197 Mar  6  2009 ./slackware64/l/tango-icon-theme-0.8.90-noarch-1.txz.asc
+-rw-r--r--  1 root root       541 Oct 23  2008 ./slackware64/l/tango-icon-theme-extras-0.1.0-noarch-1.txt
+-rw-r--r--  1 root root     55540 Oct 23  2008 ./slackware64/l/tango-icon-theme-extras-0.1.0-noarch-1.txz
+-rw-r--r--  1 root root       197 Oct 23  2008 ./slackware64/l/tango-icon-theme-extras-0.1.0-noarch-1.txz.asc
+-rw-r--r--  1 root root       386 Jan 27  2010 ./slackware64/l/urwid-0.9.9.1-x86_64-1.txt
+-rw-r--r--  1 root root    251080 Jan 27  2010 ./slackware64/l/urwid-0.9.9.1-x86_64-1.txz
+-rw-r--r--  1 root root       197 Jan 27  2010 ./slackware64/l/urwid-0.9.9.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       571 Apr 11 04:36 ./slackware64/l/v4l-utils-0.8.3-x86_64-2.txt
+-rw-r--r--  1 root root    248864 Apr 11 04:36 ./slackware64/l/v4l-utils-0.8.3-x86_64-2.txz
+-rw-r--r--  1 root root       198 Apr 11 04:36 ./slackware64/l/v4l-utils-0.8.3-x86_64-2.txz.asc
+-rw-r--r--  1 root root       427 Jul 29  2010 ./slackware64/l/virtuoso-ose-6.1.2-x86_64-1.txt
+-rw-r--r--  1 root root   7045000 Jul 29  2010 ./slackware64/l/virtuoso-ose-6.1.2-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jul 29  2010 ./slackware64/l/virtuoso-ose-6.1.2-x86_64-1.txz.asc
+-rw-r--r--  1 root root       256 Feb 16 03:59 ./slackware64/l/vte-0.26.2-x86_64-1.txt
+-rw-r--r--  1 root root    385912 Feb 16 03:59 ./slackware64/l/vte-0.26.2-x86_64-1.txz
+-rw-r--r--  1 root root       198 Feb 16 03:59 ./slackware64/l/vte-0.26.2-x86_64-1.txz.asc
+-rw-r--r--  1 root root       381 Aug  9  2010 ./slackware64/l/wavpack-4.60.1-x86_64-1.txt
+-rw-r--r--  1 root root    121360 Aug  9  2010 ./slackware64/l/wavpack-4.60.1-x86_64-1.txz
+-rw-r--r--  1 root root       198 Aug  9  2010 ./slackware64/l/wavpack-4.60.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       422 Dec 17  2009 ./slackware64/l/wv2-0.4.2-x86_64-1.txt
+-rw-r--r--  1 root root    263140 Dec 17  2009 ./slackware64/l/wv2-0.4.2-x86_64-1.txz
+-rw-r--r--  1 root root       197 Dec 17  2009 ./slackware64/l/wv2-0.4.2-x86_64-1.txz.asc
+-rw-r--r--  1 root root       359 Feb  9 18:12 ./slackware64/l/zlib-1.2.5-x86_64-4.txt
+-rw-r--r--  1 root root     97088 Feb  9 18:12 ./slackware64/l/zlib-1.2.5-x86_64-4.txz
+-rw-r--r--  1 root root       198 Feb  9 18:12 ./slackware64/l/zlib-1.2.5-x86_64-4.txz.asc
+drwxr-xr-x  2 root root     28672 Apr 16 04:36 ./slackware64/n
+-rw-r--r--  1 root root       645 Mar  6  2010 ./slackware64/n/alpine-2.00-x86_64-3.txt
+-rw-r--r--  1 root root   1937736 Mar  6  2010 ./slackware64/n/alpine-2.00-x86_64-3.txz
+-rw-r--r--  1 root root       198 Mar  6  2010 ./slackware64/n/alpine-2.00-x86_64-3.txz.asc
+-rw-r--r--  1 root root       416 Mar  5  2010 ./slackware64/n/autofs-5.0.5-x86_64-1.txt
+-rw-r--r--  1 root root    304952 Mar  5  2010 ./slackware64/n/autofs-5.0.5-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar  5  2010 ./slackware64/n/autofs-5.0.5-x86_64-1.txz.asc
+-rw-r--r--  1 root root       686 Oct 23  2008 ./slackware64/n/biff+comsat-0.17-x86_64-1.txt
+-rw-r--r--  1 root root     10972 Oct 23  2008 ./slackware64/n/biff+comsat-0.17-x86_64-1.txz
+-rw-r--r--  1 root root       197 Oct 23  2008 ./slackware64/n/biff+comsat-0.17-x86_64-1.txz.asc
+-rw-r--r--  1 root root       336 Mar 26 07:17 ./slackware64/n/bind-9.7.3-x86_64-2.txt
+-rw-r--r--  1 root root   1873616 Mar 26 07:17 ./slackware64/n/bind-9.7.3-x86_64-2.txz
+-rw-r--r--  1 root root       198 Mar 26 07:17 ./slackware64/n/bind-9.7.3-x86_64-2.txz.asc
+-rw-r--r--  1 root root       347 Mar 31 02:54 ./slackware64/n/bluez-4.91-x86_64-1.txt
+-rw-r--r--  1 root root    520052 Mar 31 02:54 ./slackware64/n/bluez-4.91-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar 31 02:54 ./slackware64/n/bluez-4.91-x86_64-1.txz.asc
+-rw-r--r--  1 root root       367 Oct 23  2008 ./slackware64/n/bluez-firmware-1.2-x86_64-1.txt
+-rw-r--r--  1 root root     71980 Oct 23  2008 ./slackware64/n/bluez-firmware-1.2-x86_64-1.txz
+-rw-r--r--  1 root root       197 Oct 23  2008 ./slackware64/n/bluez-firmware-1.2-x86_64-1.txz.asc
+-rw-r--r--  1 root root       445 Mar  7 19:29 ./slackware64/n/bluez-hcidump-2.0-x86_64-1.txt
+-rw-r--r--  1 root root     92468 Mar  7 19:29 ./slackware64/n/bluez-hcidump-2.0-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar  7 19:29 ./slackware64/n/bluez-hcidump-2.0-x86_64-1.txz.asc
+-rw-r--r--  1 root root       420 Oct 14  2008 ./slackware64/n/bootp-2.4.3-x86_64-2.txt
+-rw-r--r--  1 root root     49328 Oct 14  2008 ./slackware64/n/bootp-2.4.3-x86_64-2.txz
+-rw-r--r--  1 root root       197 Oct 14  2008 ./slackware64/n/bootp-2.4.3-x86_64-2.txz.asc
+-rw-r--r--  1 root root       591 Aug 10  2010 ./slackware64/n/bridge-utils-1.4-x86_64-1.txt
+-rw-r--r--  1 root root     29096 Aug 10  2010 ./slackware64/n/bridge-utils-1.4-x86_64-1.txz
+-rw-r--r--  1 root root       198 Aug 10  2010 ./slackware64/n/bridge-utils-1.4-x86_64-1.txz.asc
+-rw-r--r--  1 root root       613 Oct 25  2008 ./slackware64/n/bsd-finger-0.17-x86_64-1.txt
+-rw-r--r--  1 root root     18984 Oct 25  2008 ./slackware64/n/bsd-finger-0.17-x86_64-1.txz
+-rw-r--r--  1 root root       197 Oct 25  2008 ./slackware64/n/bsd-finger-0.17-x86_64-1.txz.asc
+-rw-r--r--  1 root root       430 Nov 16 17:57 ./slackware64/n/ca-certificates-20090814-noarch-1.txt
+-rw-r--r--  1 root root    113936 Nov 16 17:57 ./slackware64/n/ca-certificates-20090814-noarch-1.txz
+-rw-r--r--  1 root root       198 Nov 16 17:57 ./slackware64/n/ca-certificates-20090814-noarch-1.txz.asc
+-rw-r--r--  1 root root       415 May  3  2010 ./slackware64/n/crda-1.1.1-x86_64-1.txt
+-rw-r--r--  1 root root     13484 May  3  2010 ./slackware64/n/crda-1.1.1-x86_64-1.txz
+-rw-r--r--  1 root root       198 May  3  2010 ./slackware64/n/crda-1.1.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       555 Mar 29 19:36 ./slackware64/n/curl-7.21.4-x86_64-1.txt
+-rw-r--r--  1 root root    695512 Mar 29 19:36 ./slackware64/n/curl-7.21.4-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar 29 19:36 ./slackware64/n/curl-7.21.4-x86_64-1.txz.asc
+-rw-r--r--  1 root root       375 May 15  2009 ./slackware64/n/cyrus-sasl-2.1.23-x86_64-1.txt
+-rw-r--r--  1 root root    413528 May 15  2009 ./slackware64/n/cyrus-sasl-2.1.23-x86_64-1.txz
+-rw-r--r--  1 root root       197 May 15  2009 ./slackware64/n/cyrus-sasl-2.1.23-x86_64-1.txz.asc
+-rw-r--r--  1 root root       644 Apr  6 19:14 ./slackware64/n/dhcp-4.2.1_P1-x86_64-1.txt
+-rw-r--r--  1 root root   1141948 Apr  6 19:14 ./slackware64/n/dhcp-4.2.1_P1-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr  6 19:14 ./slackware64/n/dhcp-4.2.1_P1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       443 Mar  7 23:05 ./slackware64/n/dhcpcd-5.2.11-x86_64-1.txt
+-rw-r--r--  1 root root     62540 Mar  7 23:05 ./slackware64/n/dhcpcd-5.2.11-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar  7 23:05 ./slackware64/n/dhcpcd-5.2.11-x86_64-1.txz.asc
+-rw-r--r--  1 root root       494 Mar  7 20:19 ./slackware64/n/dirmngr-1.1.0-x86_64-1.txt
+-rw-r--r--  1 root root    198520 Mar  7 20:19 ./slackware64/n/dirmngr-1.1.0-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar  7 20:19 ./slackware64/n/dirmngr-1.1.0-x86_64-1.txz.asc
+-rw-r--r--  1 root root       396 Mar 16 05:33 ./slackware64/n/dnsmasq-2.57-x86_64-1.txt
+-rw-r--r--  1 root root    233680 Mar 16 05:33 ./slackware64/n/dnsmasq-2.57-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar 16 05:33 ./slackware64/n/dnsmasq-2.57-x86_64-1.txz.asc
+-rw-r--r--  1 root root       224 Aug 13  2009 ./slackware64/n/elm-2.5.8-x86_64-3.txt
+-rw-r--r--  1 root root    254788 Aug 13  2009 ./slackware64/n/elm-2.5.8-x86_64-3.txz
+-rw-r--r--  1 root root       197 Aug 13  2009 ./slackware64/n/elm-2.5.8-x86_64-3.txz.asc
+-rw-r--r--  1 root root       321 May 17  2010 ./slackware64/n/epic5-1.1.2-x86_64-1.txt
+-rw-r--r--  1 root root    706312 May 17  2010 ./slackware64/n/epic5-1.1.2-x86_64-1.txz
+-rw-r--r--  1 root root       198 May 17  2010 ./slackware64/n/epic5-1.1.2-x86_64-1.txz.asc
+-rw-r--r--  1 root root       441 Mar 25 05:54 ./slackware64/n/ethtool-2.6.36-x86_64-1.txt
+-rw-r--r--  1 root root     72564 Mar 25 05:54 ./slackware64/n/ethtool-2.6.36-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar 25 05:54 ./slackware64/n/ethtool-2.6.36-x86_64-1.txz.asc
+-rw-r--r--  1 root root       607 Apr  5 06:27 ./slackware64/n/fetchmail-6.3.19-x86_64-1.txt
+-rw-r--r--  1 root root    589496 Apr  5 06:27 ./slackware64/n/fetchmail-6.3.19-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr  5 06:27 ./slackware64/n/fetchmail-6.3.19-x86_64-1.txz.asc
+-rw-r--r--  1 root root       363 Apr  5 06:26 ./slackware64/n/getmail-4.20.0-x86_64-1.txt
+-rw-r--r--  1 root root    144044 Apr  5 06:26 ./slackware64/n/getmail-4.20.0-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr  5 06:26 ./slackware64/n/getmail-4.20.0-x86_64-1.txz.asc
+-rw-r--r--  1 root root       371 Mar  9 22:30 ./slackware64/n/gnupg-1.4.11-x86_64-1.txt
+-rw-r--r--  1 root root   1112784 Mar  9 22:30 ./slackware64/n/gnupg-1.4.11-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar  9 22:30 ./slackware64/n/gnupg-1.4.11-x86_64-1.txz.asc
+-rw-r--r--  1 root root       601 Mar  7 20:24 ./slackware64/n/gnupg2-2.0.17-x86_64-1.txt
+-rw-r--r--  1 root root   1597732 Mar  7 20:24 ./slackware64/n/gnupg2-2.0.17-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar  7 20:24 ./slackware64/n/gnupg2-2.0.17-x86_64-1.txz.asc
+-rw-r--r--  1 root root       493 Mar  7 20:36 ./slackware64/n/gnutls-2.10.5-x86_64-1.txt
+-rw-r--r--  1 root root   1576076 Mar  7 20:36 ./slackware64/n/gnutls-2.10.5-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar  7 20:36 ./slackware64/n/gnutls-2.10.5-x86_64-1.txz.asc
+-rw-r--r--  1 root root       287 Oct 20  2008 ./slackware64/n/gpa-0.7.5-x86_64-1.txt
+-rw-r--r--  1 root root    185464 Oct 20  2008 ./slackware64/n/gpa-0.7.5-x86_64-1.txz
+-rw-r--r--  1 root root       197 Oct 20  2008 ./slackware64/n/gpa-0.7.5-x86_64-1.txz.asc
+-rw-r--r--  1 root root       539 Mar  7 20:21 ./slackware64/n/gpgme-1.3.0-x86_64-1.txt
+-rw-r--r--  1 root root    245336 Mar  7 20:21 ./slackware64/n/gpgme-1.3.0-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar  7 20:21 ./slackware64/n/gpgme-1.3.0-x86_64-1.txz.asc
+-rw-r--r--  1 root root       435 Oct 15  2008 ./slackware64/n/htdig-3.2.0b6-x86_64-3.txt
+-rw-r--r--  1 root root    939096 Oct 15  2008 ./slackware64/n/htdig-3.2.0b6-x86_64-3.txz
+-rw-r--r--  1 root root       197 Oct 15  2008 ./slackware64/n/htdig-3.2.0b6-x86_64-3.txz.asc
+-rw-r--r--  1 root root       514 Feb 12 19:26 ./slackware64/n/httpd-2.2.17-x86_64-3.txt
+-rw-r--r--  1 root root   1487252 Feb 12 19:26 ./slackware64/n/httpd-2.2.17-x86_64-3.txz
+-rw-r--r--  1 root root       198 Feb 12 19:26 ./slackware64/n/httpd-2.2.17-x86_64-3.txz.asc
+-rw-r--r--  1 root root       366 Oct 25  2008 ./slackware64/n/icmpinfo-1.11-x86_64-1.txt
+-rw-r--r--  1 root root      9396 Oct 25  2008 ./slackware64/n/icmpinfo-1.11-x86_64-1.txz
+-rw-r--r--  1 root root       197 Oct 25  2008 ./slackware64/n/icmpinfo-1.11-x86_64-1.txz.asc
+-rw-r--r--  1 root root       441 Mar 25 21:45 ./slackware64/n/idnkit-1.0-x86_64-1.txt
+-rw-r--r--  1 root root    140632 Mar 25 21:45 ./slackware64/n/idnkit-1.0-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar 25 21:45 ./slackware64/n/idnkit-1.0-x86_64-1.txz.asc
+-rw-r--r--  1 root root       293 May 23  2009 ./slackware64/n/imapd-2.00-x86_64-2.txt
+-rw-r--r--  1 root root    466172 May 23  2009 ./slackware64/n/imapd-2.00-x86_64-2.txz
+-rw-r--r--  1 root root       197 May 23  2009 ./slackware64/n/imapd-2.00-x86_64-2.txz.asc
+-rw-r--r--  1 root root       454 Oct 14  2008 ./slackware64/n/inetd-1.79s-x86_64-8.txt
+-rw-r--r--  1 root root     20976 Oct 14  2008 ./slackware64/n/inetd-1.79s-x86_64-8.txz
+-rw-r--r--  1 root root       197 Oct 14  2008 ./slackware64/n/inetd-1.79s-x86_64-8.txz.asc
+-rwxr-xr-x  1 root root      2897 Jun 24  2009 ./slackware64/n/install-packages
+-rw-r--r--  1 root root       446 Sep 18  2006 ./slackware64/n/install.end
+-rw-r--r--  1 root root       478 Mar 16 03:11 ./slackware64/n/iproute2-2.6.37-x86_64-1.txt
+-rw-r--r--  1 root root    376396 Mar 16 03:11 ./slackware64/n/iproute2-2.6.37-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar 16 03:11 ./slackware64/n/iproute2-2.6.37-x86_64-1.txz.asc
+-rw-r--r--  1 root root       670 Nov  5 16:32 ./slackware64/n/iptables-1.4.10-x86_64-1.txt
+-rw-r--r--  1 root root    294416 Nov  5 16:32 ./slackware64/n/iptables-1.4.10-x86_64-1.txz
+-rw-r--r--  1 root root       198 Nov  5 16:32 ./slackware64/n/iptables-1.4.10-x86_64-1.txz.asc
+-rw-r--r--  1 root root       588 Mar 12 18:48 ./slackware64/n/iptraf-ng-1.0.2-x86_64-2.txt
+-rw-r--r--  1 root root    296188 Mar 12 18:48 ./slackware64/n/iptraf-ng-1.0.2-x86_64-2.txz
+-rw-r--r--  1 root root       198 Mar 12 18:48 ./slackware64/n/iptraf-ng-1.0.2-x86_64-2.txz.asc
+-rw-r--r--  1 root root       423 Mar 25 05:50 ./slackware64/n/iputils-s20101006-x86_64-1.txt
+-rw-r--r--  1 root root     76476 Mar 25 05:50 ./slackware64/n/iputils-s20101006-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar 25 05:50 ./slackware64/n/iputils-s20101006-x86_64-1.txz.asc
+-rw-r--r--  1 root root       479 Nov  4  2008 ./slackware64/n/ipw2100-fw-1.3-fw-1.txt
+-rw-r--r--  1 root root    119440 Nov  4  2008 ./slackware64/n/ipw2100-fw-1.3-fw-1.txz
+-rw-r--r--  1 root root       197 Nov  4  2008 ./slackware64/n/ipw2100-fw-1.3-fw-1.txz.asc
+-rw-r--r--  1 root root       532 May  3  2010 ./slackware64/n/ipw2200-fw-3.1-fw-1.txt
+-rw-r--r--  1 root root    118824 May  3  2010 ./slackware64/n/ipw2200-fw-3.1-fw-1.txz
+-rw-r--r--  1 root root       198 May  3  2010 ./slackware64/n/ipw2200-fw-3.1-fw-1.txz.asc
+-rw-r--r--  1 root root       333 Jan 26 19:09 ./slackware64/n/irssi-0.8.15-x86_64-3.txt
+-rw-r--r--  1 root root   1142936 Jan 26 19:09 ./slackware64/n/irssi-0.8.15-x86_64-3.txz
+-rw-r--r--  1 root root       198 Jan 26 19:09 ./slackware64/n/irssi-0.8.15-x86_64-3.txz.asc
+-rw-r--r--  1 root root       426 Aug 12  2010 ./slackware64/n/iw-0.9.20-x86_64-1.txt
+-rw-r--r--  1 root root     32944 Aug 12  2010 ./slackware64/n/iw-0.9.20-x86_64-1.txz
+-rw-r--r--  1 root root       198 Aug 12  2010 ./slackware64/n/iw-0.9.20-x86_64-1.txz.asc
+-rw-r--r--  1 root root       483 Mar  3 21:00 ./slackware64/n/iwlwifi-100-ucode-39.31.5.1-fw-1.txt
+-rw-r--r--  1 root root    118852 Mar  3 21:00 ./slackware64/n/iwlwifi-100-ucode-39.31.5.1-fw-1.txz
+-rw-r--r--  1 root root       198 Mar  3 21:00 ./slackware64/n/iwlwifi-100-ucode-39.31.5.1-fw-1.txz.asc
+-rw-r--r--  1 root root       484 May  3  2010 ./slackware64/n/iwlwifi-1000-ucode-128.50.3.1-fw-1.txt
+-rw-r--r--  1 root root    115892 May  3  2010 ./slackware64/n/iwlwifi-1000-ucode-128.50.3.1-fw-1.txz
+-rw-r--r--  1 root root       198 May  3  2010 ./slackware64/n/iwlwifi-1000-ucode-128.50.3.1-fw-1.txz.asc
+-rw-r--r--  1 root root       518 Jul  1  2009 ./slackware64/n/iwlwifi-3945-ucode-15.32.2.9-fw-1.txt
+-rw-r--r--  1 root root     65720 Jul  1  2009 ./slackware64/n/iwlwifi-3945-ucode-15.32.2.9-fw-1.txz
+-rw-r--r--  1 root root       197 Jul  1  2009 ./slackware64/n/iwlwifi-3945-ucode-15.32.2.9-fw-1.txz.asc
+-rw-r--r--  1 root root       518 Jul 16  2009 ./slackware64/n/iwlwifi-4965-ucode-228.61.2.24-fw-1.txt
+-rw-r--r--  1 root root     77788 Jul 16  2009 ./slackware64/n/iwlwifi-4965-ucode-228.61.2.24-fw-1.txz
+-rw-r--r--  1 root root       197 Jul 16  2009 ./slackware64/n/iwlwifi-4965-ucode-228.61.2.24-fw-1.txz.asc
+-rw-r--r--  1 root root       512 Mar  3 20:56 ./slackware64/n/iwlwifi-5000-ucode-8.83.5.1-fw-1.txt
+-rw-r--r--  1 root root    259024 Mar  3 20:56 ./slackware64/n/iwlwifi-5000-ucode-8.83.5.1-fw-1.txz
+-rw-r--r--  1 root root       198 Mar  3 20:56 ./slackware64/n/iwlwifi-5000-ucode-8.83.5.1-fw-1.txz.asc
+-rw-r--r--  1 root root       509 Jul 15  2009 ./slackware64/n/iwlwifi-5150-ucode-8.24.2.2-fw-1.txt
+-rw-r--r--  1 root root    115588 Jul 15  2009 ./slackware64/n/iwlwifi-5150-ucode-8.24.2.2-fw-1.txz
+-rw-r--r--  1 root root       197 Jul 15  2009 ./slackware64/n/iwlwifi-5150-ucode-8.24.2.2-fw-1.txz.asc
+-rw-r--r--  1 root root       484 Mar  3 20:50 ./slackware64/n/iwlwifi-6000-ucode-9.221.4.1-fw-1.txt
+-rw-r--r--  1 root root    135044 Mar  3 20:50 ./slackware64/n/iwlwifi-6000-ucode-9.221.4.1-fw-1.txz
+-rw-r--r--  1 root root       198 Mar  3 20:50 ./slackware64/n/iwlwifi-6000-ucode-9.221.4.1-fw-1.txz.asc
+-rw-r--r--  1 root root       484 Mar  3 21:41 ./slackware64/n/iwlwifi-6xxx-ucode-41.28.5.1-fw-1.txt
+-rw-r--r--  1 root root    317340 Mar  3 21:41 ./slackware64/n/iwlwifi-6xxx-ucode-41.28.5.1-fw-1.txz
+-rw-r--r--  1 root root       198 Mar  3 21:41 ./slackware64/n/iwlwifi-6xxx-ucode-41.28.5.1-fw-1.txz.asc
+-rw-r--r--  1 root root       582 Apr 14 18:09 ./slackware64/n/lftp-4.2.2-x86_64-1.txt
+-rw-r--r--  1 root root    669212 Apr 14 18:09 ./slackware64/n/lftp-4.2.2-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr 14 18:09 ./slackware64/n/lftp-4.2.2-x86_64-1.txz.asc
+-rw-r--r--  1 root root       252 Aug 11  2010 ./slackware64/n/libassuan-2.0.1-x86_64-1.txt
+-rw-r--r--  1 root root    102544 Aug 11  2010 ./slackware64/n/libassuan-2.0.1-x86_64-1.txz
+-rw-r--r--  1 root root       198 Aug 11  2010 ./slackware64/n/libassuan-2.0.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       245 Aug 11  2010 ./slackware64/n/libgcrypt-1.4.6-x86_64-1.txt
+-rw-r--r--  1 root root    400052 Aug 11  2010 ./slackware64/n/libgcrypt-1.4.6-x86_64-1.txz
+-rw-r--r--  1 root root       198 Aug 11  2010 ./slackware64/n/libgcrypt-1.4.6-x86_64-1.txz.asc
+-rw-r--r--  1 root root       393 Aug 11  2010 ./slackware64/n/libgpg-error-1.9-x86_64-1.txt
+-rw-r--r--  1 root root     83024 Aug 11  2010 ./slackware64/n/libgpg-error-1.9-x86_64-1.txz
+-rw-r--r--  1 root root       198 Aug 11  2010 ./slackware64/n/libgpg-error-1.9-x86_64-1.txz.asc
+-rw-r--r--  1 root root       332 Mar  7 20:16 ./slackware64/n/libksba-1.2.0-x86_64-1.txt
+-rw-r--r--  1 root root    133940 Mar  7 20:16 ./slackware64/n/libksba-1.2.0-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar  7 20:16 ./slackware64/n/libksba-1.2.0-x86_64-1.txz.asc
+-rw-r--r--  1 root root       446 Feb 18  2010 ./slackware64/n/links-2.3pre1-x86_64-1.txt
+-rw-r--r--  1 root root   1869348 Feb 18  2010 ./slackware64/n/links-2.3pre1-x86_64-1.txz
+-rw-r--r--  1 root root       197 Feb 18  2010 ./slackware64/n/links-2.3pre1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       498 Feb 12  2010 ./slackware64/n/lynx-2.8.7-x86_64-1.txt
+-rw-r--r--  1 root root   1615412 Feb 12  2010 ./slackware64/n/lynx-2.8.7-x86_64-1.txz
+-rw-r--r--  1 root root       197 Feb 12  2010 ./slackware64/n/lynx-2.8.7-x86_64-1.txz.asc
+-rw-r--r--  1 root root       567 Aug 11  2009 ./slackware64/n/mailx-12.4-x86_64-1.txt
+-rw-r--r--  1 root root    240064 Aug 11  2009 ./slackware64/n/mailx-12.4-x86_64-1.txz
+-rw-r--r--  1 root root       197 Aug 11  2009 ./slackware64/n/mailx-12.4-x86_64-1.txz.asc
+-rw-r--r--  1 root root     10563 Mar 25 22:06 ./slackware64/n/maketag
+-rw-r--r--  1 root root     10563 Mar 25 22:06 ./slackware64/n/maketag.ez
+-rw-r--r--  1 root root       418 Mar 14 03:39 ./slackware64/n/mcabber-0.10.1-x86_64-1.txt
+-rw-r--r--  1 root root    221752 Mar 14 03:39 ./slackware64/n/mcabber-0.10.1-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar 14 03:39 ./slackware64/n/mcabber-0.10.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       468 Aug 12  2010 ./slackware64/n/metamail-2.7-x86_64-5.txt
+-rw-r--r--  1 root root    126392 Aug 12  2010 ./slackware64/n/metamail-2.7-x86_64-5.txz
+-rw-r--r--  1 root root       198 Aug 12  2010 ./slackware64/n/metamail-2.7-x86_64-5.txz.asc
+-rw-r--r--  1 root root       325 Mar 25 05:19 ./slackware64/n/mtr-0.80-x86_64-1.txt
+-rw-r--r--  1 root root     55404 Mar 25 05:19 ./slackware64/n/mtr-0.80-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar 25 05:19 ./slackware64/n/mtr-0.80-x86_64-1.txz.asc
+-rw-r--r--  1 root root       411 Oct 25 17:58 ./slackware64/n/mutt-1.5.21-x86_64-1.txt
+-rw-r--r--  1 root root    997964 Oct 25 17:58 ./slackware64/n/mutt-1.5.21-x86_64-1.txz
+-rw-r--r--  1 root root       198 Oct 25 17:58 ./slackware64/n/mutt-1.5.21-x86_64-1.txz.asc
+-rw-r--r--  1 root root       628 Oct 28  2008 ./slackware64/n/nc-1.10-x86_64-1.txt
+-rw-r--r--  1 root root     53592 Oct 28  2008 ./slackware64/n/nc-1.10-x86_64-1.txz
+-rw-r--r--  1 root root       197 Oct 28  2008 ./slackware64/n/nc-1.10-x86_64-1.txz.asc
+-rw-r--r--  1 root root       337 Jan 22 04:13 ./slackware64/n/ncftp-3.2.5-x86_64-1.txt
+-rw-r--r--  1 root root    272456 Jan 22 04:13 ./slackware64/n/ncftp-3.2.5-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan 22 04:13 ./slackware64/n/ncftp-3.2.5-x86_64-1.txz.asc
+-rw-r--r--  1 root root       451 Mar 19 22:17 ./slackware64/n/net-snmp-5.6.1-x86_64-1.txt
+-rw-r--r--  1 root root   2014200 Mar 19 22:17 ./slackware64/n/net-snmp-5.6.1-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar 19 22:17 ./slackware64/n/net-snmp-5.6.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       449 Aug 12  2010 ./slackware64/n/net-tools-1.60-x86_64-3.txt
+-rw-r--r--  1 root root    119416 Aug 12  2010 ./slackware64/n/net-tools-1.60-x86_64-3.txz
+-rw-r--r--  1 root root       198 Aug 12  2010 ./slackware64/n/net-tools-1.60-x86_64-3.txz.asc
+-rw-r--r--  1 root root       581 Feb 17  2010 ./slackware64/n/netatalk-2.0.5-x86_64-1.txt
+-rw-r--r--  1 root root    480208 Feb 17  2010 ./slackware64/n/netatalk-2.0.5-x86_64-1.txz
+-rw-r--r--  1 root root       197 Feb 17  2010 ./slackware64/n/netatalk-2.0.5-x86_64-1.txz.asc
+-rw-r--r--  1 root root       649 Oct 28  2008 ./slackware64/n/netdate-bsd4-x86_64-1.txt
+-rw-r--r--  1 root root      8812 Oct 28  2008 ./slackware64/n/netdate-bsd4-x86_64-1.txz
+-rw-r--r--  1 root root       197 Oct 28  2008 ./slackware64/n/netdate-bsd4-x86_64-1.txz.asc
+-rw-r--r--  1 root root       518 May 23  2009 ./slackware64/n/netkit-bootparamd-0.17-x86_64-2.txt
+-rw-r--r--  1 root root      9232 May 23  2009 ./slackware64/n/netkit-bootparamd-0.17-x86_64-2.txz
+-rw-r--r--  1 root root       197 May 23  2009 ./slackware64/n/netkit-bootparamd-0.17-x86_64-2.txz.asc
+-rw-r--r--  1 root root       444 Sep 23  2008 ./slackware64/n/netkit-ftp-0.17-x86_64-1.txt
+-rw-r--r--  1 root root     44944 Sep 23  2008 ./slackware64/n/netkit-ftp-0.17-x86_64-1.txz
+-rw-r--r--  1 root root       197 Sep 23  2008 ./slackware64/n/netkit-ftp-0.17-x86_64-1.txz.asc
+-rw-r--r--  1 root root       478 May 23  2009 ./slackware64/n/netkit-ntalk-0.17-x86_64-3.txt
+-rw-r--r--  1 root root     26168 May 23  2009 ./slackware64/n/netkit-ntalk-0.17-x86_64-3.txz
+-rw-r--r--  1 root root       197 May 23  2009 ./slackware64/n/netkit-ntalk-0.17-x86_64-3.txz.asc
+-rw-r--r--  1 root root       636 Sep 23  2008 ./slackware64/n/netkit-routed-0.17-x86_64-1.txt
+-rw-r--r--  1 root root     25544 Sep 23  2008 ./slackware64/n/netkit-routed-0.17-x86_64-1.txz
+-rw-r--r--  1 root root       197 Sep 23  2008 ./slackware64/n/netkit-routed-0.17-x86_64-1.txz.asc
+-rw-r--r--  1 root root       423 Sep 23  2008 ./slackware64/n/netkit-rsh-0.17-x86_64-1.txt
+-rw-r--r--  1 root root     42092 Sep 23  2008 ./slackware64/n/netkit-rsh-0.17-x86_64-1.txz
+-rw-r--r--  1 root root       197 Sep 23  2008 ./slackware64/n/netkit-rsh-0.17-x86_64-1.txz.asc
+-rw-r--r--  1 root root       696 Sep 23  2008 ./slackware64/n/netkit-rusers-0.17-x86_64-1.txt
+-rw-r--r--  1 root root     17720 Sep 23  2008 ./slackware64/n/netkit-rusers-0.17-x86_64-1.txz
+-rw-r--r--  1 root root       197 Sep 23  2008 ./slackware64/n/netkit-rusers-0.17-x86_64-1.txz.asc
+-rw-r--r--  1 root root       462 Sep 23  2008 ./slackware64/n/netkit-rwall-0.17-x86_64-1.txt
+-rw-r--r--  1 root root     10388 Sep 23  2008 ./slackware64/n/netkit-rwall-0.17-x86_64-1.txz
+-rw-r--r--  1 root root       197 Sep 23  2008 ./slackware64/n/netkit-rwall-0.17-x86_64-1.txz.asc
+-rw-r--r--  1 root root       691 Dec 14  2008 ./slackware64/n/netkit-rwho-0.17-x86_64-2.txt
+-rw-r--r--  1 root root     17040 Dec 14  2008 ./slackware64/n/netkit-rwho-0.17-x86_64-2.txz
+-rw-r--r--  1 root root       197 Dec 14  2008 ./slackware64/n/netkit-rwho-0.17-x86_64-2.txz.asc
+-rw-r--r--  1 root root       407 Dec 14  2008 ./slackware64/n/netkit-timed-0.17-x86_64-1.txt
+-rw-r--r--  1 root root     30900 Dec 14  2008 ./slackware64/n/netkit-timed-0.17-x86_64-1.txz
+-rw-r--r--  1 root root       197 Dec 14  2008 ./slackware64/n/netkit-timed-0.17-x86_64-1.txz.asc
+-rw-r--r--  1 root root       560 Oct 15  2008 ./slackware64/n/netpipes-4.2-x86_64-1.txt
+-rw-r--r--  1 root root     70156 Oct 15  2008 ./slackware64/n/netpipes-4.2-x86_64-1.txz
+-rw-r--r--  1 root root       197 Oct 15  2008 ./slackware64/n/netpipes-4.2-x86_64-1.txz.asc
+-rw-r--r--  1 root root       306 May 23  2009 ./slackware64/n/netwatch-1.3.0-x86_64-2.txt
+-rw-r--r--  1 root root     95588 May 23  2009 ./slackware64/n/netwatch-1.3.0-x86_64-2.txz
+-rw-r--r--  1 root root       197 May 23  2009 ./slackware64/n/netwatch-1.3.0-x86_64-2.txz.asc
+-rw-r--r--  1 root root       583 Jan 18  2010 ./slackware64/n/network-scripts-13.0-noarch-3.txt
+-rw-r--r--  1 root root     19968 Jan 18  2010 ./slackware64/n/network-scripts-13.0-noarch-3.txz
+-rw-r--r--  1 root root       197 Jan 18  2010 ./slackware64/n/network-scripts-13.0-noarch-3.txz.asc
+-rw-r--r--  1 root root       560 Oct 28  2008 ./slackware64/n/netwrite-0.17-x86_64-1.txt
+-rw-r--r--  1 root root      6836 Oct 28  2008 ./slackware64/n/netwrite-0.17-x86_64-1.txz
+-rw-r--r--  1 root root       197 Oct 28  2008 ./slackware64/n/netwrite-0.17-x86_64-1.txz.asc
+-rw-r--r--  1 root root       511 Oct 28  2008 ./slackware64/n/newspost-2.1.1-x86_64-1.txt
+-rw-r--r--  1 root root     42084 Oct 28  2008 ./slackware64/n/newspost-2.1.1-x86_64-1.txz
+-rw-r--r--  1 root root       197 Oct 28  2008 ./slackware64/n/newspost-2.1.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       322 Mar 21 23:42 ./slackware64/n/nfs-utils-1.2.3-x86_64-3.txt
+-rw-r--r--  1 root root    216564 Mar 21 23:42 ./slackware64/n/nfs-utils-1.2.3-x86_64-3.txz
+-rw-r--r--  1 root root       198 Mar 21 23:42 ./slackware64/n/nfs-utils-1.2.3-x86_64-3.txz.asc
+-rw-r--r--  1 root root       652 Mar 10 03:51 ./slackware64/n/nmap-5.51-x86_64-1.txt
+-rw-r--r--  1 root root   3140092 Mar 10 03:51 ./slackware64/n/nmap-5.51-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar 10 03:51 ./slackware64/n/nmap-5.51-x86_64-1.txz.asc
+-rw-r--r--  1 root root       444 Nov 12  2009 ./slackware64/n/nn-6.7.3-x86_64-3.txt
+-rw-r--r--  1 root root    303276 Nov 12  2009 ./slackware64/n/nn-6.7.3-x86_64-3.txz
+-rw-r--r--  1 root root       197 Nov 12  2009 ./slackware64/n/nn-6.7.3-x86_64-3.txz.asc
+-rw-r--r--  1 root root       532 Jan 26 00:15 ./slackware64/n/ntp-4.2.6p3-x86_64-1.txt
+-rw-r--r--  1 root root   1514612 Jan 26 00:15 ./slackware64/n/ntp-4.2.6p3-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan 26 00:15 ./slackware64/n/ntp-4.2.6p3-x86_64-1.txz.asc
+-rw-r--r--  1 root root       430 Nov  6 20:40 ./slackware64/n/obex-data-server-0.4.5-x86_64-2.txt
+-rw-r--r--  1 root root     71452 Nov  6 20:40 ./slackware64/n/obex-data-server-0.4.5-x86_64-2.txz
+-rw-r--r--  1 root root       198 Nov  6 20:40 ./slackware64/n/obex-data-server-0.4.5-x86_64-2.txz.asc
+-rw-r--r--  1 root root       419 May  2  2010 ./slackware64/n/obexfs-0.12-x86_64-1.txt
+-rw-r--r--  1 root root     20300 May  2  2010 ./slackware64/n/obexfs-0.12-x86_64-1.txz
+-rw-r--r--  1 root root       198 May  2  2010 ./slackware64/n/obexfs-0.12-x86_64-1.txz.asc
+-rw-r--r--  1 root root       466 Jan 26 19:24 ./slackware64/n/obexftp-0.23-x86_64-5.txt
+-rw-r--r--  1 root root    100780 Jan 26 19:24 ./slackware64/n/obexftp-0.23-x86_64-5.txz
+-rw-r--r--  1 root root       198 Jan 26 19:24 ./slackware64/n/obexftp-0.23-x86_64-5.txz.asc
+-rw-r--r--  1 root root       565 Jan  1 23:04 ./slackware64/n/openldap-client-2.4.23-x86_64-1.txt
+-rw-r--r--  1 root root    391000 Jan  1 23:04 ./slackware64/n/openldap-client-2.4.23-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan  1 23:04 ./slackware64/n/openldap-client-2.4.23-x86_64-1.txz.asc
+-rw-r--r--  1 root root       538 May  2  2010 ./slackware64/n/openobex-1.5-x86_64-1.txt
+-rw-r--r--  1 root root     52832 May  2  2010 ./slackware64/n/openobex-1.5-x86_64-1.txz
+-rw-r--r--  1 root root       198 May  2  2010 ./slackware64/n/openobex-1.5-x86_64-1.txz.asc
+-rw-r--r--  1 root root       676 Feb  4 16:33 ./slackware64/n/openssh-5.8p1-x86_64-1.txt
+-rw-r--r--  1 root root    588120 Feb  4 16:33 ./slackware64/n/openssh-5.8p1-x86_64-1.txz
+-rw-r--r--  1 root root       198 Feb  4 16:33 ./slackware64/n/openssh-5.8p1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       561 Mar 22 19:19 ./slackware64/n/openssl-0.9.8r-x86_64-3.txt
+-rw-r--r--  1 root root   2416304 Mar 22 19:19 ./slackware64/n/openssl-0.9.8r-x86_64-3.txz
+-rw-r--r--  1 root root       198 Mar 22 19:19 ./slackware64/n/openssl-0.9.8r-x86_64-3.txz.asc
+-rw-r--r--  1 root root       430 Mar 29 20:08 ./slackware64/n/openvpn-2.1.4-x86_64-2.txt
+-rw-r--r--  1 root root    329956 Mar 29 20:08 ./slackware64/n/openvpn-2.1.4-x86_64-2.txz
+-rw-r--r--  1 root root       198 Mar 29 20:08 ./slackware64/n/openvpn-2.1.4-x86_64-2.txz.asc
+-rw-r--r--  1 root root       376 Apr 14 19:44 ./slackware64/n/php-5.3.6-x86_64-6.txt
+-rw-r--r--  1 root root   5752792 Apr 14 19:44 ./slackware64/n/php-5.3.6-x86_64-6.txz
+-rw-r--r--  1 root root       198 Apr 14 19:44 ./slackware64/n/php-5.3.6-x86_64-6.txz.asc
+-rw-r--r--  1 root root       578 Oct 28  2008 ./slackware64/n/pidentd-3.0.19-x86_64-1.txt
+-rw-r--r--  1 root root     42368 Oct 28  2008 ./slackware64/n/pidentd-3.0.19-x86_64-1.txz
+-rw-r--r--  1 root root       197 Oct 28  2008 ./slackware64/n/pidentd-3.0.19-x86_64-1.txz.asc
+-rw-r--r--  1 root root       322 Mar  7 20:22 ./slackware64/n/pinentry-0.8.1-x86_64-1.txt
+-rw-r--r--  1 root root    119024 Mar  7 20:22 ./slackware64/n/pinentry-0.8.1-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar  7 20:22 ./slackware64/n/pinentry-0.8.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       545 Oct 31  2008 ./slackware64/n/popa3d-1.0.2-x86_64-2.txt
+-rw-r--r--  1 root root     20584 Oct 31  2008 ./slackware64/n/popa3d-1.0.2-x86_64-2.txz
+-rw-r--r--  1 root root       197 Oct 31  2008 ./slackware64/n/popa3d-1.0.2-x86_64-2.txz.asc
+-rw-r--r--  1 root root       529 Oct 14  2008 ./slackware64/n/portmap-6.0-x86_64-1.txt
+-rw-r--r--  1 root root     27588 Oct 14  2008 ./slackware64/n/portmap-6.0-x86_64-1.txz
+-rw-r--r--  1 root root       197 Oct 14  2008 ./slackware64/n/portmap-6.0-x86_64-1.txz.asc
+-rw-r--r--  1 root root       451 Feb 12  2010 ./slackware64/n/ppp-2.4.5-x86_64-1.txt
+-rw-r--r--  1 root root    367944 Feb 12  2010 ./slackware64/n/ppp-2.4.5-x86_64-1.txz
+-rw-r--r--  1 root root       197 Feb 12  2010 ./slackware64/n/ppp-2.4.5-x86_64-1.txz.asc
+-rw-r--r--  1 root root       687 Oct 31  2008 ./slackware64/n/procmail-3.22-x86_64-2.txt
+-rw-r--r--  1 root root    132440 Oct 31  2008 ./slackware64/n/procmail-3.22-x86_64-2.txz
+-rw-r--r--  1 root root       197 Oct 31  2008 ./slackware64/n/procmail-3.22-x86_64-2.txz.asc
+-rw-r--r--  1 root root       339 Apr  5 03:57 ./slackware64/n/proftpd-1.3.3e-x86_64-1.txt
+-rw-r--r--  1 root root    786260 Apr  5 03:57 ./slackware64/n/proftpd-1.3.3e-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr  5 03:57 ./slackware64/n/proftpd-1.3.3e-x86_64-1.txz.asc
+-rw-r--r--  1 root root       580 Jan 23 07:56 ./slackware64/n/pssh-2.2-x86_64-1.txt
+-rw-r--r--  1 root root     28720 Jan 23 07:56 ./slackware64/n/pssh-2.2-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan 23 07:56 ./slackware64/n/pssh-2.2-x86_64-1.txz.asc
+-rw-r--r--  1 root root       472 Oct 14  2008 ./slackware64/n/pth-2.0.7-x86_64-1.txt
+-rw-r--r--  1 root root    101100 Oct 14  2008 ./slackware64/n/pth-2.0.7-x86_64-1.txz
+-rw-r--r--  1 root root       197 Oct 14  2008 ./slackware64/n/pth-2.0.7-x86_64-1.txz.asc
+-rw-r--r--  1 root root       355 Jan 25  2010 ./slackware64/n/rdist-6.1.5-x86_64-2.txt
+-rw-r--r--  1 root root     59660 Jan 25  2010 ./slackware64/n/rdist-6.1.5-x86_64-2.txz
+-rw-r--r--  1 root root       197 Jan 25  2010 ./slackware64/n/rdist-6.1.5-x86_64-2.txz.asc
+-rw-r--r--  1 root root       287 Jan 22 04:34 ./slackware64/n/rfkill-0.4-x86_64-1.txt
+-rw-r--r--  1 root root      5872 Jan 22 04:34 ./slackware64/n/rfkill-0.4-x86_64-1.txz
+-rw-r--r--  1 root root       198 Jan 22 04:34 ./slackware64/n/rfkill-0.4-x86_64-1.txz.asc
+-rw-r--r--  1 root root       499 Oct 31  2008 ./slackware64/n/rp-pppoe-3.10-x86_64-1.txt
+-rw-r--r--  1 root root     84764 Oct 31  2008 ./slackware64/n/rp-pppoe-3.10-x86_64-1.txz
+-rw-r--r--  1 root root       197 Oct 31  2008 ./slackware64/n/rp-pppoe-3.10-x86_64-1.txz.asc
+-rw-r--r--  1 root root       494 Mar 27 00:54 ./slackware64/n/rsync-3.0.8-x86_64-1.txt
+-rw-r--r--  1 root root    277320 Mar 27 00:54 ./slackware64/n/rsync-3.0.8-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar 27 00:54 ./slackware64/n/rsync-3.0.8-x86_64-1.txz.asc
+-rw-r--r--  1 root root       450 May 16  2010 ./slackware64/n/rt2860-firmware-26-fw-1.txt
+-rw-r--r--  1 root root      4656 May 16  2010 ./slackware64/n/rt2860-firmware-26-fw-1.txz
+-rw-r--r--  1 root root       198 May 16  2010 ./slackware64/n/rt2860-firmware-26-fw-1.txz.asc
+-rw-r--r--  1 root root       341 May 16  2010 ./slackware64/n/rt2870-firmware-22-fw-1.txt
+-rw-r--r--  1 root root      3692 May 16  2010 ./slackware64/n/rt2870-firmware-22-fw-1.txz
+-rw-r--r--  1 root root       198 May 16  2010 ./slackware64/n/rt2870-firmware-22-fw-1.txz.asc
+-rw-r--r--  1 root root       273 Nov  4  2008 ./slackware64/n/rt61-firmware-1.2-fw-1.txt
+-rw-r--r--  1 root root      7224 Nov  4  2008 ./slackware64/n/rt61-firmware-1.2-fw-1.txz
+-rw-r--r--  1 root root       197 Nov  4  2008 ./slackware64/n/rt61-firmware-1.2-fw-1.txz.asc
+-rw-r--r--  1 root root       287 Nov  4  2008 ./slackware64/n/rt71w-firmware-1.8-fw-1.txt
+-rw-r--r--  1 root root      2808 Nov  4  2008 ./slackware64/n/rt71w-firmware-1.8-fw-1.txz
+-rw-r--r--  1 root root       197 Nov  4  2008 ./slackware64/n/rt71w-firmware-1.8-fw-1.txz.asc
+-rw-r--r--  1 root root       529 Mar  8 19:04 ./slackware64/n/samba-3.5.8-x86_64-1.txt
+-rw-r--r--  1 root root  21775844 Mar  8 19:04 ./slackware64/n/samba-3.5.8-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar  8 19:04 ./slackware64/n/samba-3.5.8-x86_64-1.txz.asc
+-rw-r--r--  1 root root       503 Apr 23  2010 ./slackware64/n/sendmail-8.14.4-x86_64-1.txt
+-rw-r--r--  1 root root    949108 Apr 23  2010 ./slackware64/n/sendmail-8.14.4-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr 23  2010 ./slackware64/n/sendmail-8.14.4-x86_64-1.txz.asc
+-rw-r--r--  1 root root       588 Apr 23  2010 ./slackware64/n/sendmail-cf-8.14.4-noarch-1.txt
+-rw-r--r--  1 root root    114172 Apr 23  2010 ./slackware64/n/sendmail-cf-8.14.4-noarch-1.txz
+-rw-r--r--  1 root root       198 Apr 23  2010 ./slackware64/n/sendmail-cf-8.14.4-noarch-1.txz.asc
+-rw-r--r--  1 root root       309 May 19  2010 ./slackware64/n/slrn-0.9.9p1-x86_64-3.txt
+-rw-r--r--  1 root root    460120 May 19  2010 ./slackware64/n/slrn-0.9.9p1-x86_64-3.txz
+-rw-r--r--  1 root root       198 May 19  2010 ./slackware64/n/slrn-0.9.9p1-x86_64-3.txz.asc
+-rw-r--r--  1 root root       415 May  3  2010 ./slackware64/n/snownews-1.5.12-x86_64-1.txt
+-rw-r--r--  1 root root    125584 May  3  2010 ./slackware64/n/snownews-1.5.12-x86_64-1.txz
+-rw-r--r--  1 root root       198 May  3  2010 ./slackware64/n/snownews-1.5.12-x86_64-1.txz.asc
+-rw-r--r--  1 root root       510 Apr  5 06:27 ./slackware64/n/stunnel-4.35-x86_64-1.txt
+-rw-r--r--  1 root root    130884 Apr  5 06:27 ./slackware64/n/stunnel-4.35-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr  5 06:27 ./slackware64/n/stunnel-4.35-x86_64-1.txz.asc
+-rw-r--r--  1 root root      1781 Mar 25 22:06 ./slackware64/n/tagfile
+-rw-r--r--  1 root root       649 Oct 13  2008 ./slackware64/n/tcp_wrappers-7.6-x86_64-1.txt
+-rw-r--r--  1 root root     78592 Oct 13  2008 ./slackware64/n/tcp_wrappers-7.6-x86_64-1.txz
+-rw-r--r--  1 root root       197 Oct 13  2008 ./slackware64/n/tcp_wrappers-7.6-x86_64-1.txz.asc
+-rw-r--r--  1 root root       450 Aug  5  2010 ./slackware64/n/tcpdump-4.1.1-x86_64-1.txt
+-rw-r--r--  1 root root    376416 Aug  5  2010 ./slackware64/n/tcpdump-4.1.1-x86_64-1.txz
+-rw-r--r--  1 root root       198 Aug  5  2010 ./slackware64/n/tcpdump-4.1.1-x86_64-1.txz.asc
+-rw-r--r--  1 root root       557 May 23  2009 ./slackware64/n/telnet-0.17-x86_64-2.txt
+-rw-r--r--  1 root root     63900 May 23  2009 ./slackware64/n/telnet-0.17-x86_64-2.txz
+-rw-r--r--  1 root root       197 May 23  2009 ./slackware64/n/telnet-0.17-x86_64-2.txz.asc
+-rw-r--r--  1 root root       555 May  3  2010 ./slackware64/n/tftp-hpa-0.49-x86_64-1.txt
+-rw-r--r--  1 root root     49348 May  3  2010 ./slackware64/n/tftp-hpa-0.49-x86_64-1.txz
+-rw-r--r--  1 root root       198 May  3  2010 ./slackware64/n/tftp-hpa-0.49-x86_64-1.txz.asc
+-rw-r--r--  1 root root       490 Feb 24 23:09 ./slackware64/n/tin-1.8.3-x86_64-2.txt
+-rw-r--r--  1 root root    529352 Feb 24 23:09 ./slackware64/n/tin-1.8.3-x86_64-2.txz
+-rw-r--r--  1 root root       198 Feb 24 23:09 ./slackware64/n/tin-1.8.3-x86_64-2.txz.asc
+-rw-r--r--  1 root root       508 Mar 25 06:03 ./slackware64/n/traceroute-2.0.17-x86_64-1.txt
+-rw-r--r--  1 root root     48028 Mar 25 06:03 ./slackware64/n/traceroute-2.0.17-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar 25 06:03 ./slackware64/n/traceroute-2.0.17-x86_64-1.txz.asc
+-rw-r--r--  1 root root       290 May 23  2009 ./slackware64/n/trn-3.6-x86_64-2.txt
+-rw-r--r--  1 root root    188992 May 23  2009 ./slackware64/n/trn-3.6-x86_64-2.txz
+-rw-r--r--  1 root root       197 May 23  2009 ./slackware64/n/trn-3.6-x86_64-2.txz.asc
+-rw-r--r--  1 root root       282 Oct 31  2008 ./slackware64/n/uucp-1.07-x86_64-1.txt
+-rw-r--r--  1 root root    376540 Oct 31  2008 ./slackware64/n/uucp-1.07-x86_64-1.txz
+-rw-r--r--  1 root root       197 Oct 31  2008 ./slackware64/n/uucp-1.07-x86_64-1.txz.asc
+-rw-r--r--  1 root root       433 Oct 31  2008 ./slackware64/n/vlan-1.9-x86_64-2.txt
+-rw-r--r--  1 root root     24048 Oct 31  2008 ./slackware64/n/vlan-1.9-x86_64-2.txz
+-rw-r--r--  1 root root       197 Oct 31  2008 ./slackware64/n/vlan-1.9-x86_64-2.txz.asc
+-rw-r--r--  1 root root       496 Feb 28 03:37 ./slackware64/n/vsftpd-2.3.4-x86_64-1.txt
+-rw-r--r--  1 root root    121120 Feb 28 03:37 ./slackware64/n/vsftpd-2.3.4-x86_64-1.txz
+-rw-r--r--  1 root root       198 Feb 28 03:37 ./slackware64/n/vsftpd-2.3.4-x86_64-1.txz.asc
+-rw-r--r--  1 root root       398 Feb  9  2010 ./slackware64/n/wget-1.12-x86_64-1.txt
+-rw-r--r--  1 root root    444808 Feb  9  2010 ./slackware64/n/wget-1.12-x86_64-1.txz
+-rw-r--r--  1 root root       197 Feb  9  2010 ./slackware64/n/wget-1.12-x86_64-1.txz.asc
+-rw-r--r--  1 root root       385 Mar 25 21:13 ./slackware64/n/whois-5.0.11-x86_64-1.txt
+-rw-r--r--  1 root root     44876 Mar 25 21:13 ./slackware64/n/whois-5.0.11-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar 25 21:13 ./slackware64/n/whois-5.0.11-x86_64-1.txz.asc
+-rw-r--r--  1 root root       682 Jan  3  2010 ./slackware64/n/wireless-tools-29-x86_64-6.txt
+-rw-r--r--  1 root root    130976 Jan  3  2010 ./slackware64/n/wireless-tools-29-x86_64-6.txz
+-rw-r--r--  1 root root       197 Jan  3  2010 ./slackware64/n/wireless-tools-29-x86_64-6.txz.asc
+-rw-r--r--  1 root root       603 Mar 20 04:10 ./slackware64/n/wpa_supplicant-0.7.3-x86_64-3.txt
+-rw-r--r--  1 root root    538024 Mar 20 04:10 ./slackware64/n/wpa_supplicant-0.7.3-x86_64-3.txz
+-rw-r--r--  1 root root       198 Mar 20 04:10 ./slackware64/n/wpa_supplicant-0.7.3-x86_64-3.txz.asc
+-rw-r--r--  1 root root       407 Mar  8 18:34 ./slackware64/n/yptools-2.12-x86_64-2.txt
+-rw-r--r--  1 root root    179200 Mar  8 18:34 ./slackware64/n/yptools-2.12-x86_64-2.txz
+-rw-r--r--  1 root root       198 Mar  8 18:34 ./slackware64/n/yptools-2.12-x86_64-2.txz.asc
+-rw-r--r--  1 root root       289 May 23  2009 ./slackware64/n/ytalk-3.3.0-x86_64-2.txt
+-rw-r--r--  1 root root     49704 May 23  2009 ./slackware64/n/ytalk-3.3.0-x86_64-2.txz
+-rw-r--r--  1 root root       197 May 23  2009 ./slackware64/n/ytalk-3.3.0-x86_64-2.txz.asc
+-rw-r--r--  1 root root       651 Nov  4  2008 ./slackware64/n/zd1211-firmware-1.4-fw-1.txt
+-rw-r--r--  1 root root     33896 Nov  4  2008 ./slackware64/n/zd1211-firmware-1.4-fw-1.txz
+-rw-r--r--  1 root root       197 Nov  4  2008 ./slackware64/n/zd1211-firmware-1.4-fw-1.txz.asc
+drwxr-xr-x  2 root root      4096 May 17  2010 ./slackware64/t
+-rwxr-xr-x  1 root root      2897 Jun 24  2009 ./slackware64/t/install-packages
+-rw-r--r--  1 root root       446 Sep 18  2006 ./slackware64/t/install.end
+-rw-r--r--  1 root root      1157 Mar  1  2010 ./slackware64/t/maketag
+-rw-r--r--  1 root root      1157 Mar  1  2010 ./slackware64/t/maketag.ez
+-rw-r--r--  1 root root        46 Mar  1  2010 ./slackware64/t/tagfile
+-rw-r--r--  1 root root       338 May 17  2010 ./slackware64/t/tetex-3.0-x86_64-8.txt
+-rw-r--r--  1 root root  36585468 May 17  2010 ./slackware64/t/tetex-3.0-x86_64-8.txz
+-rw-r--r--  1 root root       198 May 17  2010 ./slackware64/t/tetex-3.0-x86_64-8.txz.asc
+-rw-r--r--  1 root root       524 May 17  2010 ./slackware64/t/tetex-doc-3.0-x86_64-8.txt
+-rw-r--r--  1 root root  43929492 May 17  2010 ./slackware64/t/tetex-doc-3.0-x86_64-8.txz
+-rw-r--r--  1 root root       198 May 17  2010 ./slackware64/t/tetex-doc-3.0-x86_64-8.txz.asc
+-rw-r--r--  1 root root       444 Feb 20  2010 ./slackware64/t/transfig-3.2.4-x86_64-3.txt
+-rw-r--r--  1 root root    209952 Feb 20  2010 ./slackware64/t/transfig-3.2.4-x86_64-3.txz
+-rw-r--r--  1 root root       197 Feb 20  2010 ./slackware64/t/transfig-3.2.4-x86_64-3.txz.asc
+-rw-r--r--  1 root root       431 Feb 21  2010 ./slackware64/t/xfig-3.2.4-x86_64-5.txt
+-rw-r--r--  1 root root   3014444 Feb 21  2010 ./slackware64/t/xfig-3.2.4-x86_64-5.txz
+-rw-r--r--  1 root root       197 Feb 21  2010 ./slackware64/t/xfig-3.2.4-x86_64-5.txz.asc
+drwxr-xr-x  2 root root      4096 Nov 14 01:32 ./slackware64/tcl
+-rw-r--r--  1 root root       533 Aug 12  2010 ./slackware64/tcl/expect-5.44.1.15-x86_64-1.txt
+-rw-r--r--  1 root root    301616 Aug 12  2010 ./slackware64/tcl/expect-5.44.1.15-x86_64-1.txz
+-rw-r--r--  1 root root       198 Aug 12  2010 ./slackware64/tcl/expect-5.44.1.15-x86_64-1.txz.asc
+-rw-r--r--  1 root root       469 Nov  6  2008 ./slackware64/tcl/hfsutils-3.2.6-x86_64-4.txt
+-rw-r--r--  1 root root    140068 Nov  6  2008 ./slackware64/tcl/hfsutils-3.2.6-x86_64-4.txz
+-rw-r--r--  1 root root       197 Nov  6  2008 ./slackware64/tcl/hfsutils-3.2.6-x86_64-4.txz.asc
+-rwxr-xr-x  1 root root      2897 Jun 24  2009 ./slackware64/tcl/install-packages
+-rw-r--r--  1 root root       446 Sep 18  2006 ./slackware64/tcl/install.end
+-rw-r--r--  1 root root      1285 Mar  1  2010 ./slackware64/tcl/maketag
+-rw-r--r--  1 root root      1285 Mar  1  2010 ./slackware64/tcl/maketag.ez
+-rw-r--r--  1 root root        56 Mar  1  2010 ./slackware64/tcl/tagfile
+-rw-r--r--  1 root root       259 Nov  4 00:43 ./slackware64/tcl/tcl-8.5.9-x86_64-1.txt
+-rw-r--r--  1 root root   1727440 Nov  4 00:43 ./slackware64/tcl/tcl-8.5.9-x86_64-1.txz
+-rw-r--r--  1 root root       198 Nov  4 00:43 ./slackware64/tcl/tcl-8.5.9-x86_64-1.txz.asc
+-rw-r--r--  1 root root       555 Dec  7  2009 ./slackware64/tcl/tclx-8.4-x86_64-3.txt
+-rw-r--r--  1 root root    113312 Dec  7  2009 ./slackware64/tcl/tclx-8.4-x86_64-3.txz
+-rw-r--r--  1 root root       197 Dec  7  2009 ./slackware64/tcl/tclx-8.4-x86_64-3.txz.asc
+-rw-r--r--  1 root root       406 Dec  7  2009 ./slackware64/tcl/tix-8.4.3-x86_64-2.txt
+-rw-r--r--  1 root root    538204 Dec  7  2009 ./slackware64/tcl/tix-8.4.3-x86_64-2.txz
+-rw-r--r--  1 root root       197 Dec  7  2009 ./slackware64/tcl/tix-8.4.3-x86_64-2.txz.asc
+-rw-r--r--  1 root root       198 Nov  4 00:45 ./slackware64/tcl/tk-8.5.9-x86_64-1.txt
+-rw-r--r--  1 root root   1673308 Nov  4 00:45 ./slackware64/tcl/tk-8.5.9-x86_64-1.txz
+-rw-r--r--  1 root root       198 Nov  4 00:45 ./slackware64/tcl/tk-8.5.9-x86_64-1.txz.asc
+drwxr-xr-x  2 root root     65536 Apr 16 04:36 ./slackware64/x
+-rw-r--r--  1 root root       258 Aug 12  2010 ./slackware64/x/anthy-9100h-x86_64-1.txt
+-rw-r--r--  1 root root   5083544 Aug 12  2010 ./slackware64/x/anthy-9100h-x86_64-1.txz
+-rw-r--r--  1 root root       198 Aug 12  2010 ./slackware64/x/anthy-9100h-x86_64-1.txz.asc
+-rw-r--r--  1 root root       270 Nov 13 18:55 ./slackware64/x/appres-1.0.3-x86_64-1.txt
+-rw-r--r--  1 root root     14196 Nov 13 18:55 ./slackware64/x/appres-1.0.3-x86_64-1.txz
+-rw-r--r--  1 root root       198 Nov 13 18:55 ./slackware64/x/appres-1.0.3-x86_64-1.txz.asc
+-rw-r--r--  1 root root       296 Nov 13 18:55 ./slackware64/x/bdftopcf-1.0.3-x86_64-1.txt
+-rw-r--r--  1 root root     14176 Nov 13 18:55 ./slackware64/x/bdftopcf-1.0.3-x86_64-1.txz
+-rw-r--r--  1 root root       198 Nov 13 18:55 ./slackware64/x/bdftopcf-1.0.3-x86_64-1.txz.asc
+-rw-r--r--  1 root root       335 Nov 13 18:55 ./slackware64/x/beforelight-1.0.4-x86_64-1.txt
+-rw-r--r--  1 root root     15228 Nov 13 18:55 ./slackware64/x/beforelight-1.0.4-x86_64-1.txz
+-rw-r--r--  1 root root       198 Nov 13 18:55 ./slackware64/x/beforelight-1.0.4-x86_64-1.txz.asc
+-rw-r--r--  1 root root       348 Nov 13 18:46 ./slackware64/x/bigreqsproto-1.1.1-noarch-1.txt
+-rw-r--r--  1 root root     13804 Nov 13 18:46 ./slackware64/x/bigreqsproto-1.1.1-noarch-1.txz
+-rw-r--r--  1 root root       198 Nov 13 18:46 ./slackware64/x/bigreqsproto-1.1.1-noarch-1.txz.asc
+-rw-r--r--  1 root root       270 Nov 13 18:55 ./slackware64/x/bitmap-1.0.5-x86_64-1.txt
+-rw-r--r--  1 root root     59752 Nov 13 18:55 ./slackware64/x/bitmap-1.0.5-x86_64-1.txz
+-rw-r--r--  1 root root       198 Nov 13 18:55 ./slackware64/x/bitmap-1.0.5-x86_64-1.txz.asc
+-rw-r--r--  1 root root       270 Apr  2 21:18 ./slackware64/x/compiz-0.8.8-x86_64-1.txt
+-rw-r--r--  1 root root    805552 Apr  2 21:18 ./slackware64/x/compiz-0.8.8-x86_64-1.txz
+-rw-r--r--  1 root root       198 Apr  2 21:18 ./slackware64/x/compiz-0.8.8-x86_64-1.txz.asc
+-rw-r--r--  1 root root       374 Nov 13 18:46 ./slackware64/x/compositeproto-0.4.2-noarch-1.txt
+-rw-r--r--  1 root root     15416 Nov 13 18:46 ./slackware64/x/compositeproto-0.4.2-noarch-1.txz
+-rw-r--r--  1 root root       198 Nov 13 18:46 ./slackware64/x/compositeproto-0.4.2-noarch-1.txz.asc
+-rw-r--r--  1 root root       335 Nov 13 18:46 ./slackware64/x/damageproto-1.2.1-noarch-1.txt
+-rw-r--r--  1 root root     12556 Nov 13 18:46 ./slackware64/x/damageproto-1.2.1-noarch-1.txz
+-rw-r--r--  1 root root       198 Nov 13 18:46 ./slackware64/x/damageproto-1.2.1-noarch-1.txz.asc
+-rw-r--r--  1 root root       536 Mar 18 19:44 ./slackware64/x/dejavu-fonts-ttf-2.33-noarch-1.txt
+-rw-r--r--  1 root root   2234656 Mar 18 19:44 ./slackware64/x/dejavu-fonts-ttf-2.33-noarch-1.txz
+-rw-r--r--  1 root root       198 Mar 18 19:44 ./slackware64/x/dejavu-fonts-ttf-2.33-noarch-1.txz.asc
+-rw-r--r--  1 root root       296 Feb  1 01:02 ./slackware64/x/dmxproto-2.3.1-noarch-1.txt
+-rw-r--r--  1 root root     10900 Feb  1 01:02 ./slackware64/x/dmxproto-2.3.1-noarch-1.txz
+-rw-r--r--  1 root root       198 Feb  1 01:02 ./slackware64/x/dmxproto-2.3.1-noarch-1.txz.asc
+-rw-r--r--  1 root root       309 Feb 22  2010 ./slackware64/x/dri2proto-2.3-x86_64-1.txt
+-rw-r--r--  1 root root     10420 Feb 22  2010 ./slackware64/x/dri2proto-2.3-x86_64-1.txz
+-rw-r--r--  1 root root       197 Feb 22  2010 ./slackware64/x/dri2proto-2.3-x86_64-1.txz.asc
+-rw-r--r--  1 root root       283 Nov 13 18:56 ./slackware64/x/editres-1.0.5-x86_64-1.txt
+-rw-r--r--  1 root root     45400 Nov 13 18:56 ./slackware64/x/editres-1.0.5-x86_64-1.txz
+-rw-r--r--  1 root root       198 Nov 13 18:56 ./slackware64/x/editres-1.0.5-x86_64-1.txz.asc
+-rw-r--r--  1 root root       309 Nov 13 19:09 ./slackware64/x/encodings-1.0.4-noarch-1.txt
+-rw-r--r--  1 root root    578788 Nov 13 19:09 ./slackware64/x/encodings-1.0.4-noarch-1.txz
+-rw-r--r--  1 root root       198 Nov 13 19:09 ./slackware64/x/encodings-1.0.4-noarch-1.txz.asc
+-rw-r--r--  1 root root       283 Feb  1 01:02 ./slackware64/x/evieext-1.1.1-noarch-1.txt
+-rw-r--r--  1 root root      9788 Feb  1 01:02 ./slackware64/x/evieext-1.1.1-noarch-1.txz
+-rw-r--r--  1 root root       198 Feb  1 01:02 ./slackware64/x/evieext-1.1.1-noarch-1.txz.asc
+-rw-r--r--  1 root root       322 Mar  9 04:45 ./slackware64/x/fixesproto-5.0-x86_64-1.txt
+-rw-r--r--  1 root root     14528 Mar  9 04:45 ./slackware64/x/fixesproto-5.0-x86_64-1.txz
+-rw-r--r--  1 root root       198 Mar  9 04:45 ./slackware64/x/fixesproto-5.0-x86_64-1.txz.asc
+-rw-r--r--  1 root root       413 Nov 16 20:37 ./slackware64/x/font-adobe-100dpi-1.0.3-noarch-1.txt
+-rw-r--r--  1 root root   6186912 Nov 16 20:37 ./slackware64/x/font-adobe-100dpi-1.0.3-noarch-1.txz
+-rw-r--r--  1 root root       198 Nov 16 20:37 ./slackware64/x/font-adobe-100dpi-1.0.3-noarch-1.txz.asc
+-rw-r--r--  1 root root       400 Nov 16 20:37 ./slackware64/x/font-adobe-75dpi-1.0.3-noarch-1.txt
+-rw-r--r--  1 root root   5474484 Nov 16 20:37 ./slackware64/x/font-adobe-75dpi-1.0.3-noarch-1.txz
+-rw-r--r--  1 root root       198 Nov 16 20:37 ./slackware64/x/font-adobe-75dpi-1.0.3-noarch-1.txz.asc
+-rw-r--r--  1 root root       504 Nov 16 20:37 ./slackware64/x/font-adobe-utopia-100dpi-1.0.4-noarch-1.txt
+-rw-r--r--  1 root root   1469172 Nov 16 20:37 ./slackware64/x/font-adobe-utopia-100dpi-1.0.4-noarch-1.txz
+-rw-r--r--  1 root root       198 Nov 16 20:37 ./slackware64/x/font-adobe-utopia-100dpi-1.0.4-noarch-1.txz.asc
+-rw-r--r--  1 root root       491 Nov 16 20:37 ./slackware64/x/font-adobe-utopia-75dpi-1.0.4-noarch-1.txt
+-rw-r--r--  1 root root   1222588 Nov 16 20:37 ./slackware64/x/font-adobe-utopia-75dpi-1.0.4-noarch-1.txz
+-rw-r--r--  1 root root       198 Nov 16 20:37 ./slackware64/x/font-adobe-utopia-75dpi-1.0.4-noarch-1.txz.asc
+-rw-r--r--  1 root root       491 Nov 16 20:37 ./slackware64/x/font-adobe-utopia-type1-1.0.4-noarch-1.txt
+-rw-r--r--  1 root root    176264 Nov 16 20:37 ./slackware64/x/font-adobe-utopia-type1-1.0.4-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 16 20:37 ./slackware64/x/font-adobe-utopia-type1-1.0.4-noarch-1.txz.asc
+-rw-r--r--   1 root root       322 Nov 13 19:10 ./slackware64/x/font-alias-1.0.3-noarch-1.txt
+-rw-r--r--   1 root root      9476 Nov 13 19:10 ./slackware64/x/font-alias-1.0.3-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:10 ./slackware64/x/font-alias-1.0.3-noarch-1.txz.asc
+-rw-r--r--   1 root root       400 Nov 16 20:37 ./slackware64/x/font-arabic-misc-1.0.3-noarch-1.txt
+-rw-r--r--   1 root root     22036 Nov 16 20:37 ./slackware64/x/font-arabic-misc-1.0.3-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 16 20:37 ./slackware64/x/font-arabic-misc-1.0.3-noarch-1.txz.asc
+-rw-r--r--   1 root root       374 Nov 16 20:38 ./slackware64/x/font-bh-100dpi-1.0.3-noarch-1.txt
+-rw-r--r--   1 root root   3786184 Nov 16 20:38 ./slackware64/x/font-bh-100dpi-1.0.3-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 16 20:38 ./slackware64/x/font-bh-100dpi-1.0.3-noarch-1.txz.asc
+-rw-r--r--   1 root root       361 Nov 16 20:38 ./slackware64/x/font-bh-75dpi-1.0.3-noarch-1.txt
+-rw-r--r--   1 root root   3252044 Nov 16 20:38 ./slackware64/x/font-bh-75dpi-1.0.3-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 16 20:38 ./slackware64/x/font-bh-75dpi-1.0.3-noarch-1.txz.asc
+-rw-r--r--   1 root root       595 Nov 16 20:38 ./slackware64/x/font-bh-lucidatypewriter-100dpi-1.0.3-noarch-1.txt
+-rw-r--r--   1 root root    859668 Nov 16 20:38 ./slackware64/x/font-bh-lucidatypewriter-100dpi-1.0.3-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 16 20:38 ./slackware64/x/font-bh-lucidatypewriter-100dpi-1.0.3-noarch-1.txz.asc
+-rw-r--r--   1 root root       582 Nov 16 20:38 ./slackware64/x/font-bh-lucidatypewriter-75dpi-1.0.3-noarch-1.txt
+-rw-r--r--   1 root root    750652 Nov 16 20:38 ./slackware64/x/font-bh-lucidatypewriter-75dpi-1.0.3-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 16 20:38 ./slackware64/x/font-bh-lucidatypewriter-75dpi-1.0.3-noarch-1.txz.asc
+-rw-r--r--   1 root root       335 Nov 13 19:11 ./slackware64/x/font-bh-ttf-1.0.3-noarch-1.txt
+-rw-r--r--   1 root root    284928 Nov 13 19:11 ./slackware64/x/font-bh-ttf-1.0.3-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:11 ./slackware64/x/font-bh-ttf-1.0.3-noarch-1.txz.asc
+-rw-r--r--   1 root root       361 Nov 16 20:38 ./slackware64/x/font-bh-type1-1.0.3-noarch-1.txt
+-rw-r--r--   1 root root    531048 Nov 16 20:38 ./slackware64/x/font-bh-type1-1.0.3-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 16 20:38 ./slackware64/x/font-bh-type1-1.0.3-noarch-1.txz.asc
+-rw-r--r--   1 root root       465 Nov 16 20:38 ./slackware64/x/font-bitstream-100dpi-1.0.3-noarch-1.txt
+-rw-r--r--   1 root root    169368 Nov 16 20:38 ./slackware64/x/font-bitstream-100dpi-1.0.3-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 16 20:38 ./slackware64/x/font-bitstream-100dpi-1.0.3-noarch-1.txz.asc
+-rw-r--r--   1 root root       452 Nov 16 20:38 ./slackware64/x/font-bitstream-75dpi-1.0.3-noarch-1.txt
+-rw-r--r--   1 root root    149204 Nov 16 20:38 ./slackware64/x/font-bitstream-75dpi-1.0.3-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 16 20:38 ./slackware64/x/font-bitstream-75dpi-1.0.3-noarch-1.txz.asc
+-rw-r--r--   1 root root       465 Nov 16 20:38 ./slackware64/x/font-bitstream-speedo-1.0.2-noarch-1.txt
+-rw-r--r--   1 root root    245556 Nov 16 20:38 ./slackware64/x/font-bitstream-speedo-1.0.2-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 16 20:38 ./slackware64/x/font-bitstream-speedo-1.0.2-noarch-1.txz.asc
+-rw-r--r--   1 root root       452 Nov 16 20:38 ./slackware64/x/font-bitstream-type1-1.0.3-noarch-1.txt
+-rw-r--r--   1 root root    307796 Nov 16 20:38 ./slackware64/x/font-bitstream-type1-1.0.3-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 16 20:38 ./slackware64/x/font-bitstream-type1-1.0.3-noarch-1.txz.asc
+-rw-r--r--   1 root root       452 Nov 16 20:38 ./slackware64/x/font-cronyx-cyrillic-1.0.3-noarch-1.txt
+-rw-r--r--   1 root root    310788 Nov 16 20:38 ./slackware64/x/font-cronyx-cyrillic-1.0.3-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 16 20:38 ./slackware64/x/font-cronyx-cyrillic-1.0.3-noarch-1.txz.asc
+-rw-r--r--   1 root root       400 Nov 16 20:38 ./slackware64/x/font-cursor-misc-1.0.3-noarch-1.txt
+-rw-r--r--   1 root root     13288 Nov 16 20:38 ./slackware64/x/font-cursor-misc-1.0.3-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 16 20:38 ./slackware64/x/font-cursor-misc-1.0.3-noarch-1.txz.asc
+-rw-r--r--   1 root root       400 Nov 16 20:38 ./slackware64/x/font-daewoo-misc-1.0.3-noarch-1.txt
+-rw-r--r--   1 root root    669124 Nov 16 20:38 ./slackware64/x/font-daewoo-misc-1.0.3-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 16 20:38 ./slackware64/x/font-daewoo-misc-1.0.3-noarch-1.txz.asc
+-rw-r--r--   1 root root       361 Nov 16 20:38 ./slackware64/x/font-dec-misc-1.0.3-noarch-1.txt
+-rw-r--r--   1 root root     11880 Nov 16 20:38 ./slackware64/x/font-dec-misc-1.0.3-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 16 20:38 ./slackware64/x/font-dec-misc-1.0.3-noarch-1.txz.asc
+-rw-r--r--   1 root root       374 Nov 16 20:39 ./slackware64/x/font-ibm-type1-1.0.3-noarch-1.txt
+-rw-r--r--   1 root root    285888 Nov 16 20:39 ./slackware64/x/font-ibm-type1-1.0.3-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 16 20:39 ./slackware64/x/font-ibm-type1-1.0.3-noarch-1.txz.asc
+-rw-r--r--   1 root root       374 Nov 16 20:39 ./slackware64/x/font-isas-misc-1.0.3-noarch-1.txt
+-rw-r--r--   1 root root    805592 Nov 16 20:39 ./slackware64/x/font-isas-misc-1.0.3-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 16 20:39 ./slackware64/x/font-isas-misc-1.0.3-noarch-1.txz.asc
+-rw-r--r--   1 root root       361 Nov 16 20:39 ./slackware64/x/font-jis-misc-1.0.3-noarch-1.txt
+-rw-r--r--   1 root root    544524 Nov 16 20:39 ./slackware64/x/font-jis-misc-1.0.3-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 16 20:39 ./slackware64/x/font-jis-misc-1.0.3-noarch-1.txz.asc
+-rw-r--r--   1 root root       387 Nov 16 20:39 ./slackware64/x/font-micro-misc-1.0.3-noarch-1.txt
+-rw-r--r--   1 root root     10008 Nov 16 20:39 ./slackware64/x/font-micro-misc-1.0.3-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 16 20:39 ./slackware64/x/font-micro-misc-1.0.3-noarch-1.txz.asc
+-rw-r--r--   1 root root       426 Nov 16 20:39 ./slackware64/x/font-misc-cyrillic-1.0.3-noarch-1.txt
+-rw-r--r--   1 root root     74616 Nov 16 20:39 ./slackware64/x/font-misc-cyrillic-1.0.3-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 16 20:39 ./slackware64/x/font-misc-cyrillic-1.0.3-noarch-1.txz.asc
+-rw-r--r--   1 root root       426 Nov 16 20:39 ./slackware64/x/font-misc-ethiopic-1.0.3-noarch-1.txt
+-rw-r--r--   1 root root    136536 Nov 16 20:39 ./slackware64/x/font-misc-ethiopic-1.0.3-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 16 20:39 ./slackware64/x/font-misc-ethiopic-1.0.3-noarch-1.txz.asc
+-rw-r--r--   1 root root       400 Nov 16 20:39 ./slackware64/x/font-misc-meltho-1.0.3-noarch-1.txt
+-rw-r--r--   1 root root    743760 Nov 16 20:39 ./slackware64/x/font-misc-meltho-1.0.3-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 16 20:39 ./slackware64/x/font-misc-meltho-1.0.3-noarch-1.txz.asc
+-rw-r--r--   1 root root       374 Nov 16 20:39 ./slackware64/x/font-misc-misc-1.1.2-noarch-1.txt
+-rw-r--r--   1 root root   3522740 Nov 16 20:39 ./slackware64/x/font-misc-misc-1.1.2-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 16 20:39 ./slackware64/x/font-misc-misc-1.1.2-noarch-1.txz.asc
+-rw-r--r--   1 root root       374 Nov 16 20:39 ./slackware64/x/font-mutt-misc-1.0.3-noarch-1.txt
+-rw-r--r--   1 root root    217564 Nov 16 20:39 ./slackware64/x/font-mutt-misc-1.0.3-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 16 20:39 ./slackware64/x/font-mutt-misc-1.0.3-noarch-1.txz.asc
+-rw-r--r--   1 root root       452 Nov 16 20:39 ./slackware64/x/font-schumacher-misc-1.1.2-noarch-1.txt
+-rw-r--r--   1 root root    163056 Nov 16 20:39 ./slackware64/x/font-schumacher-misc-1.1.2-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 16 20:39 ./slackware64/x/font-schumacher-misc-1.1.2-noarch-1.txz.asc
+-rw-r--r--   1 root root       452 Nov 16 20:39 ./slackware64/x/font-screen-cyrillic-1.0.4-noarch-1.txt
+-rw-r--r--   1 root root     17984 Nov 16 20:39 ./slackware64/x/font-screen-cyrillic-1.0.4-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 16 20:39 ./slackware64/x/font-screen-cyrillic-1.0.4-noarch-1.txz.asc
+-rw-r--r--   1 root root       374 Nov 16 20:39 ./slackware64/x/font-sony-misc-1.0.3-noarch-1.txt
+-rw-r--r--   1 root root     28432 Nov 16 20:39 ./slackware64/x/font-sony-misc-1.0.3-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 16 20:39 ./slackware64/x/font-sony-misc-1.0.3-noarch-1.txz.asc
+-rw-r--r--   1 root root       361 Nov 16 20:39 ./slackware64/x/font-sun-misc-1.0.3-noarch-1.txt
+-rw-r--r--   1 root root     34664 Nov 16 20:39 ./slackware64/x/font-sun-misc-1.0.3-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 16 20:39 ./slackware64/x/font-sun-misc-1.0.3-noarch-1.txz.asc
+-rw-r--r--   1 root root       309 Nov 13 19:12 ./slackware64/x/font-util-1.2.0-x86_64-1.txt
+-rw-r--r--   1 root root     35864 Nov 13 19:12 ./slackware64/x/font-util-1.2.0-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:12 ./slackware64/x/font-util-1.2.0-x86_64-1.txz.asc
+-rw-r--r--   1 root root       478 Nov 16 20:39 ./slackware64/x/font-winitzki-cyrillic-1.0.3-noarch-1.txt
+-rw-r--r--   1 root root     13228 Nov 16 20:39 ./slackware64/x/font-winitzki-cyrillic-1.0.3-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 16 20:39 ./slackware64/x/font-winitzki-cyrillic-1.0.3-noarch-1.txz.asc
+-rw-r--r--   1 root root       426 Nov 16 20:39 ./slackware64/x/font-xfree86-type1-1.0.4-noarch-1.txt
+-rw-r--r--   1 root root     36336 Nov 16 20:39 ./slackware64/x/font-xfree86-type1-1.0.4-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 16 20:39 ./slackware64/x/font-xfree86-type1-1.0.4-noarch-1.txz.asc
+-rw-r--r--   1 root root       374 Feb 22  2010 ./slackware64/x/fontcacheproto-0.1.3-noarch-1.txt
+-rw-r--r--   1 root root      5180 Feb 22  2010 ./slackware64/x/fontcacheproto-0.1.3-noarch-1.txz
+-rw-r--r--   1 root root       197 Feb 22  2010 ./slackware64/x/fontcacheproto-0.1.3-noarch-1.txz.asc
+-rw-r--r--   1 root root       348 Feb 20  2010 ./slackware64/x/fontconfig-2.8.0-x86_64-1.txt
+-rw-r--r--   1 root root    272112 Feb 20  2010 ./slackware64/x/fontconfig-2.8.0-x86_64-1.txz
+-rw-r--r--   1 root root       197 Feb 20  2010 ./slackware64/x/fontconfig-2.8.0-x86_64-1.txz.asc
+-rw-r--r--   1 root root       322 Nov 13 18:46 ./slackware64/x/fontsproto-2.1.1-noarch-1.txt
+-rw-r--r--   1 root root     45500 Nov 13 18:46 ./slackware64/x/fontsproto-2.1.1-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:46 ./slackware64/x/fontsproto-2.1.1-noarch-1.txz.asc
+-rw-r--r--   1 root root       322 Jun  3  2009 ./slackware64/x/fonttosfnt-1.0.4-x86_64-1.txt
+-rw-r--r--   1 root root     16584 Jun  3  2009 ./slackware64/x/fonttosfnt-1.0.4-x86_64-1.txz
+-rw-r--r--   1 root root       197 Jun  3  2009 ./slackware64/x/fonttosfnt-1.0.4-x86_64-1.txz.asc
+-rw-r--r--   1 root root       309 Nov 13 18:56 ./slackware64/x/fslsfonts-1.0.3-x86_64-1.txt
+-rw-r--r--   1 root root     16436 Nov 13 18:56 ./slackware64/x/fslsfonts-1.0.3-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:56 ./slackware64/x/fslsfonts-1.0.3-x86_64-1.txz.asc
+-rw-r--r--   1 root root       283 Nov 13 18:56 ./slackware64/x/fstobdf-1.0.4-x86_64-1.txt
+-rw-r--r--   1 root root     16512 Nov 13 18:56 ./slackware64/x/fstobdf-1.0.4-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:56 ./slackware64/x/fstobdf-1.0.4-x86_64-1.txz.asc
+-rw-r--r--   1 root root       322 Jun  3  2009 ./slackware64/x/gccmakedep-1.0.2-noarch-2.txt
+-rw-r--r--   1 root root      3016 Jun  3  2009 ./slackware64/x/gccmakedep-1.0.2-noarch-2.txz
+-rw-r--r--   1 root root       197 Jun  3  2009 ./slackware64/x/gccmakedep-1.0.2-noarch-2.txz.asc
+-rw-r--r--   1 root root       385 Nov  4 23:55 ./slackware64/x/glew-1.5.7-x86_64-1.txt
+-rw-r--r--   1 root root    268316 Nov  4 23:55 ./slackware64/x/glew-1.5.7-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov  4 23:55 ./slackware64/x/glew-1.5.7-x86_64-1.txz.asc
+-rw-r--r--   1 root root       283 Nov 13 18:47 ./slackware64/x/glproto-1.4.12-noarch-1.txt
+-rw-r--r--   1 root root     21740 Nov 13 18:47 ./slackware64/x/glproto-1.4.12-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:47 ./slackware64/x/glproto-1.4.12-noarch-1.txz.asc
+-rw-r--r--   1 root root       283 Nov 13 18:56 ./slackware64/x/iceauth-1.0.4-x86_64-1.txt
+-rw-r--r--   1 root root     22468 Nov 13 18:56 ./slackware64/x/iceauth-1.0.4-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:56 ./slackware64/x/iceauth-1.0.4-x86_64-1.txz.asc
+-rw-r--r--   1 root root       231 Nov 13 18:56 ./slackware64/x/ico-1.0.3-x86_64-1.txt
+-rw-r--r--   1 root root     21928 Nov 13 18:56 ./slackware64/x/ico-1.0.3-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:56 ./slackware64/x/ico-1.0.3-x86_64-1.txz.asc
+-rw-r--r--   1 root root       257 Nov 13 18:48 ./slackware64/x/imake-1.0.4-x86_64-1.txt
+-rw-r--r--   1 root root     38624 Nov 13 18:48 ./slackware64/x/imake-1.0.4-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:48 ./slackware64/x/imake-1.0.4-x86_64-1.txz.asc
+-rw-r--r--   1 root root       322 Nov 13 18:47 ./slackware64/x/inputproto-2.0.1-noarch-1.txt
+-rw-r--r--   1 root root     59340 Nov 13 18:47 ./slackware64/x/inputproto-2.0.1-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:47 ./slackware64/x/inputproto-2.0.1-noarch-1.txz.asc
+-rwxr-xr-x   1 root root      2897 Jun 24  2009 ./slackware64/x/install-packages
+-rw-r--r--   1 root root       446 Sep 18  2006 ./slackware64/x/install.end
+-rw-r--r--   1 root root       420 Feb 22  2010 ./slackware64/x/intel-gpu-tools-1.0.2-x86_64-1.txt
+-rw-r--r--   1 root root     34396 Feb 22  2010 ./slackware64/x/intel-gpu-tools-1.0.2-x86_64-1.txz
+-rw-r--r--   1 root root       197 Feb 22  2010 ./slackware64/x/intel-gpu-tools-1.0.2-x86_64-1.txz.asc
+-rw-r--r--   1 root root       283 Nov 13 18:47 ./slackware64/x/kbproto-1.0.5-noarch-1.txt
+-rw-r--r--   1 root root     26492 Nov 13 18:47 ./slackware64/x/kbproto-1.0.5-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:47 ./slackware64/x/kbproto-1.0.5-noarch-1.txz.asc
+-rw-r--r--   1 root root       257 Nov 13 18:49 ./slackware64/x/libFS-1.0.3-x86_64-1.txt
+-rw-r--r--   1 root root     34856 Nov 13 18:49 ./slackware64/x/libFS-1.0.3-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:49 ./slackware64/x/libFS-1.0.3-x86_64-1.txz.asc
+-rw-r--r--   1 root root       270 Nov 13 18:49 ./slackware64/x/libICE-1.0.7-x86_64-1.txt
+-rw-r--r--   1 root root     94240 Nov 13 18:49 ./slackware64/x/libICE-1.0.7-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:49 ./slackware64/x/libICE-1.0.7-x86_64-1.txz.asc
+-rw-r--r--   1 root root       257 Nov 13 18:50 ./slackware64/x/libSM-1.2.0-x86_64-1.txt
+-rw-r--r--   1 root root     57060 Nov 13 18:50 ./slackware64/x/libSM-1.2.0-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:50 ./slackware64/x/libSM-1.2.0-x86_64-1.txz.asc
+-rw-r--r--   1 root root       270 Apr 16 03:34 ./slackware64/x/libX11-1.4.3-x86_64-2.txt
+-rw-r--r--   1 root root   2310392 Apr 16 03:34 ./slackware64/x/libX11-1.4.3-x86_64-2.txz
+-rw-r--r--   1 root root       198 Apr 16 03:34 ./slackware64/x/libX11-1.4.3-x86_64-2.txz.asc
+-rw-r--r--   1 root root       361 Nov 13 18:51 ./slackware64/x/libXScrnSaver-1.2.1-x86_64-1.txt
+-rw-r--r--   1 root root     23448 Nov 13 18:51 ./slackware64/x/libXScrnSaver-1.2.1-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:51 ./slackware64/x/libXScrnSaver-1.2.1-x86_64-1.txz.asc
+-rw-r--r--   1 root root       270 Nov 13 18:51 ./slackware64/x/libXau-1.0.6-x86_64-1.txt
+-rw-r--r--   1 root root     22864 Nov 13 18:51 ./slackware64/x/libXau-1.0.6-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:51 ./slackware64/x/libXau-1.0.6-x86_64-1.txz.asc
+-rw-r--r--   1 root root       270 Feb  1 01:09 ./slackware64/x/libXaw-1.0.9-x86_64-1.txt
+-rw-r--r--   1 root root    363792 Feb  1 01:09 ./slackware64/x/libXaw-1.0.9-x86_64-1.txz
+-rw-r--r--   1 root root       198 Feb  1 01:09 ./slackware64/x/libXaw-1.0.9-x86_64-1.txz.asc
+-rw-r--r--   1 root root       361 Nov 13 18:52 ./slackware64/x/libXcomposite-0.4.3-x86_64-1.txt
+-rw-r--r--   1 root root     20404 Nov 13 18:52 ./slackware64/x/libXcomposite-0.4.3-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:52 ./slackware64/x/libXcomposite-0.4.3-x86_64-1.txz.asc
+-rw-r--r--   1 root root       322 Nov 13 18:52 ./slackware64/x/libXcursor-1.1.11-x86_64-1.txt
+-rw-r--r--   1 root root     37120 Nov 13 18:52 ./slackware64/x/libXcursor-1.1.11-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:52 ./slackware64/x/libXcursor-1.1.11-x86_64-1.txz.asc
+-rw-r--r--   1 root root       322 Nov 13 18:52 ./slackware64/x/libXdamage-1.1.3-x86_64-1.txt
+-rw-r--r--   1 root root     15192 Nov 13 18:52 ./slackware64/x/libXdamage-1.1.3-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:52 ./slackware64/x/libXdamage-1.1.3-x86_64-1.txz.asc
+-rw-r--r--   1 root root       296 Nov 13 18:52 ./slackware64/x/libXdmcp-1.1.0-x86_64-1.txt
+-rw-r--r--   1 root root     42288 Nov 13 18:52 ./slackware64/x/libXdmcp-1.1.0-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:52 ./slackware64/x/libXdmcp-1.1.0-x86_64-1.txz.asc
+-rw-r--r--   1 root root       296 Nov 13 18:52 ./slackware64/x/libXevie-1.0.3-x86_64-1.txt
+-rw-r--r--   1 root root     15720 Nov 13 18:52 ./slackware64/x/libXevie-1.0.3-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:52 ./slackware64/x/libXevie-1.0.3-x86_64-1.txz.asc
+-rw-r--r--   1 root root       283 Nov 13 18:52 ./slackware64/x/libXext-1.2.0-x86_64-1.txt
+-rw-r--r--   1 root root    117092 Nov 13 18:52 ./slackware64/x/libXext-1.2.0-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:52 ./slackware64/x/libXext-1.2.0-x86_64-1.txz.asc
+-rw-r--r--   1 root root       309 Mar  9 04:46 ./slackware64/x/libXfixes-5.0-x86_64-1.txt
+-rw-r--r--   1 root root     18612 Mar  9 04:46 ./slackware64/x/libXfixes-5.0-x86_64-1.txz
+-rw-r--r--   1 root root       198 Mar  9 04:46 ./slackware64/x/libXfixes-5.0-x86_64-1.txz.asc
+-rw-r--r--   1 root root       296 Nov 13 18:53 ./slackware64/x/libXfont-1.4.3-x86_64-1.txt
+-rw-r--r--   1 root root    137256 Nov 13 18:53 ./slackware64/x/libXfont-1.4.3-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:53 ./slackware64/x/libXfont-1.4.3-x86_64-1.txz.asc
+-rw-r--r--   1 root root       361 Feb 22  2010 ./slackware64/x/libXfontcache-1.0.5-x86_64-1.txt
+-rw-r--r--   1 root root     14896 Feb 22  2010 ./slackware64/x/libXfontcache-1.0.5-x86_64-1.txz
+-rw-r--r--   1 root root       197 Feb 22  2010 ./slackware64/x/libXfontcache-1.0.5-x86_64-1.txz.asc
+-rw-r--r--   1 root root       270 Nov 13 18:53 ./slackware64/x/libXft-2.2.0-x86_64-1.txt
+-rw-r--r--   1 root root     56484 Nov 13 18:53 ./slackware64/x/libXft-2.2.0-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:53 ./slackware64/x/libXft-2.2.0-x86_64-1.txz.asc
+-rw-r--r--   1 root root       257 Mar 27 07:40 ./slackware64/x/libXi-1.4.2-x86_64-1.txt
+-rw-r--r--   1 root root    169348 Mar 27 07:40 ./slackware64/x/libXi-1.4.2-x86_64-1.txz
+-rw-r--r--   1 root root       198 Mar 27 07:40 ./slackware64/x/libXi-1.4.2-x86_64-1.txz.asc
+-rw-r--r--   1 root root       335 Nov 13 18:53 ./slackware64/x/libXinerama-1.1.1-x86_64-1.txt
+-rw-r--r--   1 root root     18572 Nov 13 18:53 ./slackware64/x/libXinerama-1.1.1-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:53 ./slackware64/x/libXinerama-1.1.1-x86_64-1.txz.asc
+-rw-r--r--   1 root root       270 Nov 13 18:53 ./slackware64/x/libXmu-1.1.0-x86_64-1.txt
+-rw-r--r--   1 root root     90868 Nov 13 18:53 ./slackware64/x/libXmu-1.1.0-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:53 ./slackware64/x/libXmu-1.1.0-x86_64-1.txz.asc
+-rw-r--r--   1 root root       257 Feb  1 01:11 ./slackware64/x/libXp-1.0.1-x86_64-1.txt
+-rw-r--r--   1 root root     83328 Feb  1 01:11 ./slackware64/x/libXp-1.0.1-x86_64-1.txz
+-rw-r--r--   1 root root       198 Feb  1 01:11 ./slackware64/x/libXp-1.0.1-x86_64-1.txz.asc
+-rw-r--r--   1 root root       270 Nov 13 18:54 ./slackware64/x/libXpm-3.5.9-x86_64-1.txt
+-rw-r--r--   1 root root     72320 Nov 13 18:54 ./slackware64/x/libXpm-3.5.9-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:54 ./slackware64/x/libXpm-3.5.9-x86_64-1.txz.asc
+-rw-r--r--   1 root root       309 Nov 13 18:54 ./slackware64/x/libXrandr-1.3.1-x86_64-1.txt
+-rw-r--r--   1 root root     36332 Nov 13 18:54 ./slackware64/x/libXrandr-1.3.1-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:54 ./slackware64/x/libXrandr-1.3.1-x86_64-1.txz.asc
+-rw-r--r--   1 root root       322 Nov 13 18:54 ./slackware64/x/libXrender-0.9.6-x86_64-1.txt
+-rw-r--r--   1 root root     31684 Nov 13 18:54 ./slackware64/x/libXrender-0.9.6-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:54 ./slackware64/x/libXrender-0.9.6-x86_64-1.txz.asc
+-rw-r--r--   1 root root       283 Nov 13 18:54 ./slackware64/x/libXres-1.0.5-x86_64-1.txt
+-rw-r--r--   1 root root     17156 Nov 13 18:54 ./slackware64/x/libXres-1.0.5-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:54 ./slackware64/x/libXres-1.0.5-x86_64-1.txz.asc
+-rw-r--r--   1 root root       257 Mar 11 04:18 ./slackware64/x/libXt-1.1.1-x86_64-1.txt
+-rw-r--r--   1 root root    417576 Mar 11 04:18 ./slackware64/x/libXt-1.1.1-x86_64-1.txz
+-rw-r--r--   1 root root       198 Mar 11 04:18 ./slackware64/x/libXt-1.1.1-x86_64-1.txz.asc
+-rw-r--r--   1 root root       283 Nov 13 18:54 ./slackware64/x/libXtst-1.2.0-x86_64-1.txt
+-rw-r--r--   1 root root     43068 Nov 13 18:54 ./slackware64/x/libXtst-1.2.0-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:54 ./slackware64/x/libXtst-1.2.0-x86_64-1.txz.asc
+-rw-r--r--   1 root root       257 Nov 13 18:54 ./slackware64/x/libXv-1.0.6-x86_64-1.txt
+-rw-r--r--   1 root root     43252 Nov 13 18:54 ./slackware64/x/libXv-1.0.6-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:54 ./slackware64/x/libXv-1.0.6-x86_64-1.txz.asc
+-rw-r--r--   1 root root       283 Nov 13 18:54 ./slackware64/x/libXvMC-1.0.6-x86_64-1.txt
+-rw-r--r--   1 root root     29972 Nov 13 18:54 ./slackware64/x/libXvMC-1.0.6-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:54 ./slackware64/x/libXvMC-1.0.6-x86_64-1.txz.asc
+-rw-r--r--   1 root root       335 Nov 13 18:54 ./slackware64/x/libXxf86dga-1.1.2-x86_64-1.txt
+-rw-r--r--   1 root root     26684 Nov 13 18:54 ./slackware64/x/libXxf86dga-1.1.2-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:54 ./slackware64/x/libXxf86dga-1.1.2-x86_64-1.txz.asc
+-rw-r--r--   1 root root       348 Feb  1 01:12 ./slackware64/x/libXxf86misc-1.0.3-x86_64-1.txt
+-rw-r--r--   1 root root     17304 Feb  1 01:12 ./slackware64/x/libXxf86misc-1.0.3-x86_64-1.txz
+-rw-r--r--   1 root root       198 Feb  1 01:12 ./slackware64/x/libXxf86misc-1.0.3-x86_64-1.txz.asc
+-rw-r--r--   1 root root       322 Nov 13 18:55 ./slackware64/x/libXxf86vm-1.1.1-x86_64-1.txt
+-rw-r--r--   1 root root     23268 Nov 13 18:55 ./slackware64/x/libXxf86vm-1.1.1-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:55 ./slackware64/x/libXxf86vm-1.1.1-x86_64-1.txz.asc
+-rw-r--r--   1 root root       270 Nov 13 18:55 ./slackware64/x/libdmx-1.1.1-x86_64-1.txt
+-rw-r--r--   1 root root     42188 Nov 13 18:55 ./slackware64/x/libdmx-1.1.1-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:55 ./slackware64/x/libdmx-1.1.1-x86_64-1.txz.asc
+-rw-r--r--   1 root root       260 Jan 30 23:20 ./slackware64/x/libdrm-2.4.23-x86_64-1.txt
+-rw-r--r--   1 root root     97420 Jan 30 23:20 ./slackware64/x/libdrm-2.4.23-x86_64-1.txz
+-rw-r--r--   1 root root       198 Jan 30 23:20 ./slackware64/x/libdrm-2.4.23-x86_64-1.txz.asc
+-rw-r--r--   1 root root       581 Mar 23 05:07 ./slackware64/x/liberation-fonts-ttf-1.06.0.20100721-noarch-3.txt
+-rw-r--r--   1 root root    830028 Mar 23 05:07 ./slackware64/x/liberation-fonts-ttf-1.06.0.20100721-noarch-3.txz
+-rw-r--r--   1 root root       198 Mar 23 05:07 ./slackware64/x/liberation-fonts-ttf-1.06.0.20100721-noarch-3.txz.asc
+-rw-r--r--   1 root root       322 Nov 13 18:55 ./slackware64/x/libfontenc-1.1.0-x86_64-1.txt
+-rw-r--r--   1 root root     23316 Nov 13 18:55 ./slackware64/x/libfontenc-1.1.0-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:55 ./slackware64/x/libfontenc-1.1.0-x86_64-1.txz.asc
+-rw-r--r--   1 root root       381 Mar 21 17:29 ./slackware64/x/libhangul-0.0.12-x86_64-1.txt
+-rw-r--r--   1 root root   1869400 Mar 21 17:29 ./slackware64/x/libhangul-0.0.12-x86_64-1.txz
+-rw-r--r--   1 root root       198 Mar 21 17:29 ./slackware64/x/libhangul-0.0.12-x86_64-1.txz.asc
+-rw-r--r--   1 root root       348 Feb  7 23:10 ./slackware64/x/libpciaccess-0.12.1-x86_64-1.txt
+-rw-r--r--   1 root root     32372 Feb  7 23:10 ./slackware64/x/libpciaccess-0.12.1-x86_64-1.txz
+-rw-r--r--   1 root root       198 Feb  7 23:10 ./slackware64/x/libpciaccess-0.12.1-x86_64-1.txz.asc
+-rw-r--r--   1 root root       400 Feb 22  2010 ./slackware64/x/libpthread-stubs-0.3-noarch-1.txt
+-rw-r--r--   1 root root      1904 Feb 22  2010 ./slackware64/x/libpthread-stubs-0.3-noarch-1.txz
+-rw-r--r--   1 root root       197 Feb 22  2010 ./slackware64/x/libpthread-stubs-0.3-noarch-1.txz.asc
+-rw-r--r--   1 root root       446 Nov 13 18:49 ./slackware64/x/libxcb-1.7-x86_64-1.txt
+-rw-r--r--   1 root root    224052 Nov 13 18:49 ./slackware64/x/libxcb-1.7-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:49 ./slackware64/x/libxcb-1.7-x86_64-1.txz.asc
+-rw-r--r--   1 root root       322 Nov 13 18:55 ./slackware64/x/libxkbfile-1.0.7-x86_64-1.txt
+-rw-r--r--   1 root root     76380 Nov 13 18:55 ./slackware64/x/libxkbfile-1.0.7-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:55 ./slackware64/x/libxkbfile-1.0.7-x86_64-1.txz.asc
+-rw-r--r--   1 root root       283 Feb 22  2010 ./slackware64/x/listres-1.0.2-x86_64-1.txt
+-rw-r--r--   1 root root     14712 Feb 22  2010 ./slackware64/x/listres-1.0.2-x86_64-1.txz
+-rw-r--r--   1 root root       197 Feb 22  2010 ./slackware64/x/listres-1.0.2-x86_64-1.txz.asc
+-rw-r--r--   1 root root       257 Nov 13 18:48 ./slackware64/x/lndir-1.0.2-x86_64-1.txt
+-rw-r--r--   1 root root     14484 Nov 13 18:48 ./slackware64/x/lndir-1.0.2-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:48 ./slackware64/x/lndir-1.0.2-x86_64-1.txz.asc
+-rw-r--r--   1 root root       244 Nov 13 18:56 ./slackware64/x/luit-1.1.0-x86_64-1.txt
+-rw-r--r--   1 root root     31064 Nov 13 18:56 ./slackware64/x/luit-1.1.0-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:56 ./slackware64/x/luit-1.1.0-x86_64-1.txz.asc
+-rw-r--r--   1 root root       416 Aug 12  2010 ./slackware64/x/m17n-lib-1.6.1-x86_64-1.txt
+-rw-r--r--   1 root root   1144424 Aug 12  2010 ./slackware64/x/m17n-lib-1.6.1-x86_64-1.txz
+-rw-r--r--   1 root root       198 Aug 12  2010 ./slackware64/x/m17n-lib-1.6.1-x86_64-1.txz.asc
+-rw-r--r--   1 root root       322 Nov 13 18:48 ./slackware64/x/makedepend-1.0.3-x86_64-1.txt
+-rw-r--r--   1 root root     24460 Nov 13 18:48 ./slackware64/x/makedepend-1.0.3-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:48 ./slackware64/x/makedepend-1.0.3-x86_64-1.txz.asc
+-rw-r--r--   1 root root     22590 Feb  1 07:15 ./slackware64/x/maketag
+-rw-r--r--   1 root root     22590 Feb  1 07:15 ./slackware64/x/maketag.ez
+-rw-r--r--   1 root root       335 Mar 15 21:40 ./slackware64/x/mesa-7.9.2-x86_64-1.txt
+-rw-r--r--   1 root root   6218480 Mar 15 21:40 ./slackware64/x/mesa-7.9.2-x86_64-1.txz
+-rw-r--r--   1 root root       198 Mar 15 21:40 ./slackware64/x/mesa-7.9.2-x86_64-1.txz.asc
+-rw-r--r--   1 root root       374 Feb 22  2010 ./slackware64/x/mkcomposecache-1.2.1-x86_64-1.txt
+-rw-r--r--   1 root root      9244 Feb 22  2010 ./slackware64/x/mkcomposecache-1.2.1-x86_64-1.txz
+-rw-r--r--   1 root root       197 Feb 22  2010 ./slackware64/x/mkcomposecache-1.2.1-x86_64-1.txz.asc
+-rw-r--r--   1 root root       309 Nov 13 18:57 ./slackware64/x/mkfontdir-1.0.6-noarch-1.txt
+-rw-r--r--   1 root root     13420 Nov 13 18:57 ./slackware64/x/mkfontdir-1.0.6-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:57 ./slackware64/x/mkfontdir-1.0.6-noarch-1.txz.asc
+-rw-r--r--   1 root root       335 Nov 13 18:57 ./slackware64/x/mkfontscale-1.0.8-x86_64-1.txt
+-rw-r--r--   1 root root     25900 Nov 13 18:57 ./slackware64/x/mkfontscale-1.0.8-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:57 ./slackware64/x/mkfontscale-1.0.8-x86_64-1.txz.asc
+-rw-r--r--   1 root root       270 Nov 13 18:57 ./slackware64/x/oclock-1.0.2-x86_64-1.txt
+-rw-r--r--   1 root root     18720 Nov 13 18:57 ./slackware64/x/oclock-1.0.2-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:57 ./slackware64/x/oclock-1.0.2-x86_64-1.txz.asc
+-rw-r--r--   1 root root       337 Feb  1 01:12 ./slackware64/x/pixman-0.20.2-x86_64-1.txt
+-rw-r--r--   1 root root    164776 Feb  1 01:12 ./slackware64/x/pixman-0.20.2-x86_64-1.txz
+-rw-r--r--   1 root root       198 Feb  1 01:12 ./slackware64/x/pixman-0.20.2-x86_64-1.txz.asc
+-rw-r--r--   1 root root       322 Feb  1 01:03 ./slackware64/x/printproto-1.0.5-noarch-1.txt
+-rw-r--r--   1 root root     18220 Feb  1 01:03 ./slackware64/x/printproto-1.0.5-noarch-1.txz
+-rw-r--r--   1 root root       198 Feb  1 01:03 ./slackware64/x/printproto-1.0.5-noarch-1.txz.asc
+-rw-r--r--   1 root root       367 Mar 11 04:25 ./slackware64/x/radeon_ucode-20110302-noarch-1.txt
+-rw-r--r--   1 root root     26448 Mar 11 04:25 ./slackware64/x/radeon_ucode-20110302-noarch-1.txz
+-rw-r--r--   1 root root       198 Mar 11 04:25 ./slackware64/x/radeon_ucode-20110302-noarch-1.txz.asc
+-rw-r--r--   1 root root       322 Nov 13 18:47 ./slackware64/x/randrproto-1.3.2-noarch-1.txt
+-rw-r--r--   1 root root     36012 Nov 13 18:47 ./slackware64/x/randrproto-1.3.2-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:47 ./slackware64/x/randrproto-1.3.2-noarch-1.txz.asc
+-rw-r--r--   1 root root       335 Nov 13 18:47 ./slackware64/x/recordproto-1.14.1-noarch-1.txt
+-rw-r--r--   1 root root     25896 Nov 13 18:47 ./slackware64/x/recordproto-1.14.1-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:47 ./slackware64/x/recordproto-1.14.1-noarch-1.txz.asc
+-rw-r--r--   1 root root       335 Feb  1 01:13 ./slackware64/x/rendercheck-1.4-x86_64-1.txt
+-rw-r--r--   1 root root     32820 Feb  1 01:13 ./slackware64/x/rendercheck-1.4-x86_64-1.txz
+-rw-r--r--   1 root root       198 Feb  1 01:13 ./slackware64/x/rendercheck-1.4-x86_64-1.txz.asc
+-rw-r--r--   1 root root       335 Nov 13 18:47 ./slackware64/x/renderproto-0.11.1-noarch-1.txt
+-rw-r--r--   1 root root     21004 Nov 13 18:47 ./slackware64/x/renderproto-0.11.1-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:47 ./slackware64/x/renderproto-0.11.1-noarch-1.txz.asc
+-rw-r--r--   1 root root       361 Feb  1 01:03 ./slackware64/x/resourceproto-1.1.1-noarch-1.txt
+-rw-r--r--   1 root root      9760 Feb  1 01:03 ./slackware64/x/resourceproto-1.1.1-noarch-1.txz
+-rw-r--r--   1 root root       198 Feb  1 01:03 ./slackware64/x/resourceproto-1.1.1-noarch-1.txz.asc
+-rw-r--r--   1 root root       231 Nov 13 18:57 ./slackware64/x/rgb-1.0.4-x86_64-1.txt
+-rw-r--r--   1 root root     17912 Nov 13 18:57 ./slackware64/x/rgb-1.0.4-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:57 ./slackware64/x/rgb-1.0.4-x86_64-1.txz.asc
+-rw-r--r--   1 root root       403 Nov  6  2008 ./slackware64/x/sazanami-fonts-ttf-20040629-noarch-1.txt
+-rw-r--r--   1 root root   5974804 Nov  6  2008 ./slackware64/x/sazanami-fonts-ttf-20040629-noarch-1.txz
+-rw-r--r--   1 root root       197 Nov  6  2008 ./slackware64/x/sazanami-fonts-ttf-20040629-noarch-1.txz.asc
+-rw-r--r--   1 root root       330 Mar 19 23:12 ./slackware64/x/scim-1.4.9-x86_64-5.txt
+-rw-r--r--   1 root root   1084800 Mar 19 23:12 ./slackware64/x/scim-1.4.9-x86_64-5.txz
+-rw-r--r--   1 root root       198 Mar 19 23:12 ./slackware64/x/scim-1.4.9-x86_64-5.txz.asc
+-rw-r--r--   1 root root       508 Jun 10  2009 ./slackware64/x/scim-anthy-1.2.4-x86_64-2.txt
+-rw-r--r--   1 root root    250080 Jun 10  2009 ./slackware64/x/scim-anthy-1.2.4-x86_64-2.txz
+-rw-r--r--   1 root root       197 Jun 10  2009 ./slackware64/x/scim-anthy-1.2.4-x86_64-2.txz.asc
+-rw-r--r--   1 root root       505 Mar 19 23:19 ./slackware64/x/scim-bridge-0.4.16-x86_64-5.txt
+-rw-r--r--   1 root root    118732 Mar 19 23:19 ./slackware64/x/scim-bridge-0.4.16-x86_64-5.txz
+-rw-r--r--   1 root root       198 Mar 19 23:19 ./slackware64/x/scim-bridge-0.4.16-x86_64-5.txz.asc
+-rw-r--r--   1 root root       611 Jun 10  2009 ./slackware64/x/scim-hangul-0.3.2-x86_64-2.txt
+-rw-r--r--   1 root root     44956 Jun 10  2009 ./slackware64/x/scim-hangul-0.3.2-x86_64-2.txz
+-rw-r--r--   1 root root       197 Jun 10  2009 ./slackware64/x/scim-hangul-0.3.2-x86_64-2.txz.asc
+-rw-r--r--   1 root root       356 Jun 10  2009 ./slackware64/x/scim-input-pad-0.1.2-x86_64-4.txt
+-rw-r--r--   1 root root     69624 Jun 10  2009 ./slackware64/x/scim-input-pad-0.1.2-x86_64-4.txz
+-rw-r--r--   1 root root       197 Jun 10  2009 ./slackware64/x/scim-input-pad-0.1.2-x86_64-4.txz.asc
+-rw-r--r--   1 root root       402 Apr 20  2009 ./slackware64/x/scim-m17n-0.2.3-x86_64-1.txt
+-rw-r--r--   1 root root     32356 Apr 20  2009 ./slackware64/x/scim-m17n-0.2.3-x86_64-1.txz
+-rw-r--r--   1 root root       197 Apr 20  2009 ./slackware64/x/scim-m17n-0.2.3-x86_64-1.txz.asc
+-rw-r--r--   1 root root       386 Jun 10  2009 ./slackware64/x/scim-pinyin-0.5.91-x86_64-2.txt
+-rw-r--r--   1 root root   1670432 Jun 10  2009 ./slackware64/x/scim-pinyin-0.5.91-x86_64-2.txz
+-rw-r--r--   1 root root       197 Jun 10  2009 ./slackware64/x/scim-pinyin-0.5.91-x86_64-2.txz.asc
+-rw-r--r--   1 root root       289 Jun 10  2009 ./slackware64/x/scim-tables-0.5.9-x86_64-3.txt
+-rw-r--r--   1 root root   3977628 Jun 10  2009 ./slackware64/x/scim-tables-0.5.9-x86_64-3.txz
+-rw-r--r--   1 root root       197 Jun 10  2009 ./slackware64/x/scim-tables-0.5.9-x86_64-3.txz.asc
+-rw-r--r--   1 root root       283 Jun  3  2009 ./slackware64/x/scripts-1.0.1-noarch-2.txt
+-rw-r--r--   1 root root      6628 Jun  3  2009 ./slackware64/x/scripts-1.0.1-noarch-2.txz
+-rw-r--r--   1 root root       197 Jun  3  2009 ./slackware64/x/scripts-1.0.1-noarch-2.txz.asc
+-rw-r--r--   1 root root       374 Nov 13 18:47 ./slackware64/x/scrnsaverproto-1.2.1-noarch-1.txt
+-rw-r--r--   1 root root     21000 Nov 13 18:47 ./slackware64/x/scrnsaverproto-1.2.1-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:47 ./slackware64/x/scrnsaverproto-1.2.1-noarch-1.txz.asc
+-rw-r--r--   1 root root       283 Nov 13 18:57 ./slackware64/x/sessreg-1.0.6-x86_64-1.txt
+-rw-r--r--   1 root root     17800 Nov 13 18:57 ./slackware64/x/sessreg-1.0.6-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:57 ./slackware64/x/sessreg-1.0.6-x86_64-1.txz.asc
+-rw-r--r--   1 root root       309 Nov 13 18:57 ./slackware64/x/setxkbmap-1.2.0-x86_64-1.txt
+-rw-r--r--   1 root root     21324 Nov 13 18:57 ./slackware64/x/setxkbmap-1.2.0-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:57 ./slackware64/x/setxkbmap-1.2.0-x86_64-1.txz.asc
+-rw-r--r--   1 root root       296 Nov 13 18:57 ./slackware64/x/showfont-1.0.3-x86_64-1.txt
+-rw-r--r--   1 root root     16056 Nov 13 18:57 ./slackware64/x/showfont-1.0.3-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:57 ./slackware64/x/showfont-1.0.3-x86_64-1.txz.asc
+-rw-r--r--   1 root root       473 Nov  6  2008 ./slackware64/x/sinhala_lklug-font-ttf-20060929-noarch-1.txt
+-rw-r--r--   1 root root     67728 Nov  6  2008 ./slackware64/x/sinhala_lklug-font-ttf-20060929-noarch-1.txz
+-rw-r--r--   1 root root       197 Nov  6  2008 ./slackware64/x/sinhala_lklug-font-ttf-20060929-noarch-1.txz.asc
+-rw-r--r--   1 root root       283 Nov 13 18:57 ./slackware64/x/smproxy-1.0.4-x86_64-1.txt
+-rw-r--r--   1 root root     19480 Nov 13 18:57 ./slackware64/x/smproxy-1.0.4-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:57 ./slackware64/x/smproxy-1.0.4-x86_64-1.txz.asc
+-rw-r--r--   1 root root      4550 Feb  1 07:15 ./slackware64/x/tagfile
+-rw-r--r--   1 root root       561 Nov  5 00:29 ./slackware64/x/tibmachuni-font-ttf-1.901b-noarch-1.txt
+-rw-r--r--   1 root root    864912 Nov  5 00:29 ./slackware64/x/tibmachuni-font-ttf-1.901b-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov  5 00:29 ./slackware64/x/tibmachuni-font-ttf-1.901b-noarch-1.txz.asc
+-rw-r--r--   1 root root       621 Nov  6  2008 ./slackware64/x/ttf-indic-fonts-0.4.7.4-noarch-1.txt
+-rw-r--r--   1 root root   2183528 Nov  6  2008 ./slackware64/x/ttf-indic-fonts-0.4.7.4-noarch-1.txz
+-rw-r--r--   1 root root       197 Nov  6  2008 ./slackware64/x/ttf-indic-fonts-0.4.7.4-noarch-1.txz.asc
+-rw-r--r--   1 root root       231 Feb  1 01:14 ./slackware64/x/twm-1.0.6-x86_64-1.txt
+-rw-r--r--   1 root root    107088 Feb  1 01:14 ./slackware64/x/twm-1.0.6-x86_64-1.txz
+-rw-r--r--   1 root root       198 Feb  1 01:14 ./slackware64/x/twm-1.0.6-x86_64-1.txz.asc
+-rw-r--r--   1 root root       335 Apr  6 04:46 ./slackware64/x/util-macros-1.13.0-noarch-1.txt
+-rw-r--r--   1 root root     25800 Apr  6 04:46 ./slackware64/x/util-macros-1.13.0-noarch-1.txz
+-rw-r--r--   1 root root       198 Apr  6 04:46 ./slackware64/x/util-macros-1.13.0-noarch-1.txz.asc
+-rw-r--r--   1 root root       322 Nov 13 18:47 ./slackware64/x/videoproto-2.3.1-noarch-1.txt
+-rw-r--r--   1 root root     15848 Nov 13 18:47 ./slackware64/x/videoproto-2.3.1-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:47 ./slackware64/x/videoproto-2.3.1-noarch-1.txz.asc
+-rw-r--r--   1 root root       283 Nov 13 18:57 ./slackware64/x/viewres-1.0.3-x86_64-1.txt
+-rw-r--r--   1 root root     22984 Nov 13 18:57 ./slackware64/x/viewres-1.0.3-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:57 ./slackware64/x/viewres-1.0.3-x86_64-1.txz.asc
+-rw-r--r--   1 root root       686 Apr 20  2009 ./slackware64/x/wqy-zenhei-font-ttf-0.8.38_1-noarch-1.txt
+-rw-r--r--   1 root root   5752036 Apr 20  2009 ./slackware64/x/wqy-zenhei-font-ttf-0.8.38_1-noarch-1.txz
+-rw-r--r--   1 root root       197 Apr 20  2009 ./slackware64/x/wqy-zenhei-font-ttf-0.8.38_1-noarch-1.txz.asc
+-rw-r--r--   1 root root       607 Mar 14 03:33 ./slackware64/x/x11-skel-7.4-x86_64-2.txt
+-rw-r--r--   1 root root     12256 Mar 14 03:33 ./slackware64/x/x11-skel-7.4-x86_64-2.txz
+-rw-r--r--   1 root root       198 Mar 14 03:33 ./slackware64/x/x11-skel-7.4-x86_64-2.txz.asc
+-rw-r--r--   1 root root       283 Feb  1 01:14 ./slackware64/x/x11perf-1.5.3-x86_64-1.txt
+-rw-r--r--   1 root root     67076 Feb  1 01:14 ./slackware64/x/x11perf-1.5.3-x86_64-1.txz
+-rw-r--r--   1 root root       198 Feb  1 01:14 ./slackware64/x/x11perf-1.5.3-x86_64-1.txz.asc
+-rw-r--r--   1 root root       257 Nov 13 18:57 ./slackware64/x/xauth-1.0.5-x86_64-1.txt
+-rw-r--r--   1 root root     31136 Nov 13 18:57 ./slackware64/x/xauth-1.0.5-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:57 ./slackware64/x/xauth-1.0.5-x86_64-1.txz.asc
+-rw-r--r--   1 root root       519 Apr 15 19:44 ./slackware64/x/xaw3d-20110415git-x86_64-1.txt
+-rw-r--r--   1 root root    176620 Apr 15 19:44 ./slackware64/x/xaw3d-20110415git-x86_64-1.txz
+-rw-r--r--   1 root root       198 Apr 15 19:44 ./slackware64/x/xaw3d-20110415git-x86_64-1.txz.asc
+-rw-r--r--   1 root root       322 Feb  1 01:14 ./slackware64/x/xbacklight-1.1.2-x86_64-1.txt
+-rw-r--r--   1 root root     12940 Feb  1 01:14 ./slackware64/x/xbacklight-1.1.2-x86_64-1.txz
+-rw-r--r--   1 root root       198 Feb  1 01:14 ./slackware64/x/xbacklight-1.1.2-x86_64-1.txz.asc
+-rw-r--r--   1 root root       257 Feb  1 01:14 ./slackware64/x/xbiff-1.0.3-x86_64-1.txt
+-rw-r--r--   1 root root     19136 Feb  1 01:14 ./slackware64/x/xbiff-1.0.3-x86_64-1.txz
+-rw-r--r--   1 root root       198 Feb  1 01:14 ./slackware64/x/xbiff-1.0.3-x86_64-1.txz.asc
+-rw-r--r--   1 root root       296 Feb  1 01:04 ./slackware64/x/xbitmaps-1.1.1-x86_64-1.txt
+-rw-r--r--   1 root root     25968 Feb  1 01:04 ./slackware64/x/xbitmaps-1.1.1-x86_64-1.txz
+-rw-r--r--   1 root root       198 Feb  1 01:04 ./slackware64/x/xbitmaps-1.1.1-x86_64-1.txz.asc
+-rw-r--r--   1 root root       257 Feb  1 01:14 ./slackware64/x/xcalc-1.0.4.1-x86_64-1.txt
+-rw-r--r--   1 root root     30856 Feb  1 01:14 ./slackware64/x/xcalc-1.0.4.1-x86_64-1.txz
+-rw-r--r--   1 root root       198 Feb  1 01:14 ./slackware64/x/xcalc-1.0.4.1-x86_64-1.txz.asc
+-rw-r--r--   1 root root       309 Feb 22  2010 ./slackware64/x/xcb-proto-1.6-noarch-1.txt
+-rw-r--r--   1 root root     51536 Feb 22  2010 ./slackware64/x/xcb-proto-1.6-noarch-1.txz
+-rw-r--r--   1 root root       197 Feb 22  2010 ./slackware64/x/xcb-proto-1.6-noarch-1.txz.asc
+-rw-r--r--   1 root root       296 Feb 22  2010 ./slackware64/x/xcb-util-0.3.6-x86_64-1.txt
+-rw-r--r--   1 root root     45544 Feb 22  2010 ./slackware64/x/xcb-util-0.3.6-x86_64-1.txz
+-rw-r--r--   1 root root       197 Feb 22  2010 ./slackware64/x/xcb-util-0.3.6-x86_64-1.txz.asc
+-rw-r--r--   1 root root       322 Nov 13 18:58 ./slackware64/x/xclipboard-1.1.1-x86_64-1.txt
+-rw-r--r--   1 root root     24856 Nov 13 18:58 ./slackware64/x/xclipboard-1.1.1-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:58 ./slackware64/x/xclipboard-1.1.1-x86_64-1.txz.asc
+-rw-r--r--   1 root root       270 Nov 13 18:58 ./slackware64/x/xclock-1.0.5-x86_64-1.txt
+-rw-r--r--   1 root root     33340 Nov 13 18:58 ./slackware64/x/xclock-1.0.5-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:58 ./slackware64/x/xclock-1.0.5-x86_64-1.txz.asc
+-rw-r--r--   1 root root       335 Nov 13 18:47 ./slackware64/x/xcmiscproto-1.2.1-noarch-1.txt
+-rw-r--r--   1 root root     13308 Nov 13 18:47 ./slackware64/x/xcmiscproto-1.2.1-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:47 ./slackware64/x/xcmiscproto-1.2.1-noarch-1.txz.asc
+-rw-r--r--   1 root root       270 Nov 13 18:58 ./slackware64/x/xcmsdb-1.0.3-x86_64-1.txt
+-rw-r--r--   1 root root     22784 Nov 13 18:58 ./slackware64/x/xcmsdb-1.0.3-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:58 ./slackware64/x/xcmsdb-1.0.3-x86_64-1.txz.asc
+-rw-r--r--   1 root root       296 Mar  9 00:18 ./slackware64/x/xcompmgr-1.1.5-x86_64-2.txt
+-rw-r--r--   1 root root     22220 Mar  9 00:18 ./slackware64/x/xcompmgr-1.1.5-x86_64-2.txz
+-rw-r--r--   1 root root       198 Mar  9 00:18 ./slackware64/x/xcompmgr-1.1.5-x86_64-2.txz.asc
+-rw-r--r--   1 root root       296 Nov 13 18:58 ./slackware64/x/xconsole-1.0.4-x86_64-1.txt
+-rw-r--r--   1 root root     20040 Nov 13 18:58 ./slackware64/x/xconsole-1.0.4-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:58 ./slackware64/x/xconsole-1.0.4-x86_64-1.txz.asc
+-rw-r--r--   1 root root       374 Nov 13 18:48 ./slackware64/x/xcursor-themes-1.0.3-noarch-1.txt
+-rw-r--r--   1 root root    319516 Nov 13 18:48 ./slackware64/x/xcursor-themes-1.0.3-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:48 ./slackware64/x/xcursor-themes-1.0.3-noarch-1.txz.asc
+-rw-r--r--   1 root root       322 Nov 13 18:58 ./slackware64/x/xcursorgen-1.0.4-x86_64-1.txt
+-rw-r--r--   1 root root     16028 Nov 13 18:58 ./slackware64/x/xcursorgen-1.0.4-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:58 ./slackware64/x/xcursorgen-1.0.4-x86_64-1.txz.asc
+-rw-r--r--   1 root root       309 Nov 13 18:58 ./slackware64/x/xdbedizzy-1.1.0-x86_64-1.txt
+-rw-r--r--   1 root root     17356 Nov 13 18:58 ./slackware64/x/xdbedizzy-1.1.0-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:58 ./slackware64/x/xdbedizzy-1.1.0-x86_64-1.txz.asc
+-rw-r--r--   1 root root       476 Feb  1 06:55 ./slackware64/x/xdg-user-dirs-0.13-x86_64-1.txt
+-rw-r--r--   1 root root     32976 Feb  1 06:55 ./slackware64/x/xdg-user-dirs-0.13-x86_64-1.txz
+-rw-r--r--   1 root root       198 Feb  1 06:55 ./slackware64/x/xdg-user-dirs-0.13-x86_64-1.txz.asc
+-rw-r--r--   1 root root       550 Jan 22 04:11 ./slackware64/x/xdg-utils-1.1.0_rc1-noarch-1.txt
+-rw-r--r--   1 root root     53616 Jan 22 04:11 ./slackware64/x/xdg-utils-1.1.0_rc1-noarch-1.txz
+-rw-r--r--   1 root root       198 Jan 22 04:11 ./slackware64/x/xdg-utils-1.1.0_rc1-noarch-1.txz.asc
+-rw-r--r--   1 root root       296 Nov 13 18:58 ./slackware64/x/xditview-1.0.2-x86_64-1.txt
+-rw-r--r--   1 root root     31080 Nov 13 18:58 ./slackware64/x/xditview-1.0.2-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:58 ./slackware64/x/xditview-1.0.2-x86_64-1.txz.asc
+-rw-r--r--   1 root root       231 Apr 27  2010 ./slackware64/x/xdm-1.1.10-x86_64-1.txt
+-rw-r--r--   1 root root    117264 Apr 27  2010 ./slackware64/x/xdm-1.1.10-x86_64-1.txz
+-rw-r--r--   1 root root       198 Apr 27  2010 ./slackware64/x/xdm-1.1.10-x86_64-1.txz.asc
+-rw-r--r--   1 root root       296 Nov 13 18:58 ./slackware64/x/xdpyinfo-1.2.0-x86_64-1.txt
+-rw-r--r--   1 root root     27580 Nov 13 18:58 ./slackware64/x/xdpyinfo-1.2.0-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:58 ./slackware64/x/xdpyinfo-1.2.0-x86_64-1.txz.asc
+-rw-r--r--   1 root root       296 Nov 13 18:58 ./slackware64/x/xdriinfo-1.0.4-x86_64-1.txt
+-rw-r--r--   1 root root     12444 Nov 13 18:58 ./slackware64/x/xdriinfo-1.0.4-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:58 ./slackware64/x/xdriinfo-1.0.4-x86_64-1.txz.asc
+-rw-r--r--   1 root root       257 Nov 13 18:58 ./slackware64/x/xedit-1.2.0-x86_64-1.txt
+-rw-r--r--   1 root root    313756 Nov 13 18:58 ./slackware64/x/xedit-1.2.0-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:58 ./slackware64/x/xedit-1.2.0-x86_64-1.txz.asc
+-rw-r--r--   1 root root       231 Nov 13 18:58 ./slackware64/x/xev-1.1.0-x86_64-1.txt
+-rw-r--r--   1 root root     19960 Nov 13 18:58 ./slackware64/x/xev-1.1.0-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:58 ./slackware64/x/xev-1.1.0-x86_64-1.txz.asc
+-rw-r--r--   1 root root       309 Mar  9 04:45 ./slackware64/x/xextproto-7.2.0-x86_64-1.txt
+-rw-r--r--   1 root root    140628 Mar  9 04:45 ./slackware64/x/xextproto-7.2.0-x86_64-1.txz
+-rw-r--r--   1 root root       198 Mar  9 04:45 ./slackware64/x/xextproto-7.2.0-x86_64-1.txz.asc
+-rw-r--r--   1 root root       257 Feb  1 01:15 ./slackware64/x/xeyes-1.1.1-x86_64-1.txt
+-rw-r--r--   1 root root     19156 Feb  1 01:15 ./slackware64/x/xeyes-1.1.1-x86_64-1.txz
+-rw-r--r--   1 root root       198 Feb  1 01:15 ./slackware64/x/xeyes-1.1.1-x86_64-1.txz.asc
+-rw-r--r--   1 root root       413 Nov 13 19:02 ./slackware64/x/xf86-input-acecad-1.4.0-x86_64-2.txt
+-rw-r--r--   1 root root     18236 Nov 13 19:02 ./slackware64/x/xf86-input-acecad-1.4.0-x86_64-2.txz
+-rw-r--r--   1 root root       198 Nov 13 19:02 ./slackware64/x/xf86-input-acecad-1.4.0-x86_64-2.txz.asc
+-rw-r--r--   1 root root       413 Nov 13 19:02 ./slackware64/x/xf86-input-aiptek-1.3.1-x86_64-1.txt
+-rw-r--r--   1 root root     22932 Nov 13 19:02 ./slackware64/x/xf86-input-aiptek-1.3.1-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:02 ./slackware64/x/xf86-input-aiptek-1.3.1-x86_64-1.txz.asc
+-rw-r--r--   1 root root       400 Feb  1 01:18 ./slackware64/x/xf86-input-evdev-2.6.0-x86_64-1.txt
+-rw-r--r--   1 root root     35944 Feb  1 01:18 ./slackware64/x/xf86-input-evdev-2.6.0-x86_64-1.txz
+-rw-r--r--   1 root root       198 Feb  1 01:18 ./slackware64/x/xf86-input-evdev-2.6.0-x86_64-1.txz.asc
+-rw-r--r--   1 root root       439 Nov 13 19:02 ./slackware64/x/xf86-input-joystick-1.5.0-x86_64-1.txt
+-rw-r--r--   1 root root     33584 Nov 13 19:02 ./slackware64/x/xf86-input-joystick-1.5.0-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:02 ./slackware64/x/xf86-input-joystick-1.5.0-x86_64-1.txz.asc
+-rw-r--r--   1 root root       439 Mar 20 00:08 ./slackware64/x/xf86-input-keyboard-1.6.0-x86_64-1.txt
+-rw-r--r--   1 root root     25072 Mar 20 00:08 ./slackware64/x/xf86-input-keyboard-1.6.0-x86_64-1.txz
+-rw-r--r--   1 root root       198 Mar 20 00:08 ./slackware64/x/xf86-input-keyboard-1.6.0-x86_64-1.txz.asc
+-rw-r--r--   1 root root       400 Mar 20 00:07 ./slackware64/x/xf86-input-mouse-1.7.0-x86_64-1.txt
+-rw-r--r--   1 root root     46692 Mar 20 00:07 ./slackware64/x/xf86-input-mouse-1.7.0-x86_64-1.txz
+-rw-r--r--   1 root root       198 Mar 20 00:07 ./slackware64/x/xf86-input-mouse-1.7.0-x86_64-1.txz.asc
+-rw-r--r--   1 root root       439 Nov 13 19:03 ./slackware64/x/xf86-input-penmount-1.4.1-x86_64-2.txt
+-rw-r--r--   1 root root     12792 Nov 13 19:03 ./slackware64/x/xf86-input-penmount-1.4.1-x86_64-2.txz
+-rw-r--r--   1 root root       198 Nov 13 19:03 ./slackware64/x/xf86-input-penmount-1.4.1-x86_64-2.txz.asc
+-rw-r--r--   1 root root       452 Mar  9 00:20 ./slackware64/x/xf86-input-synaptics-1.4.0-x86_64-1.txt
+-rw-r--r--   1 root root     62128 Mar  9 00:20 ./slackware64/x/xf86-input-synaptics-1.4.0-x86_64-1.txz
+-rw-r--r--   1 root root       198 Mar  9 00:20 ./slackware64/x/xf86-input-synaptics-1.4.0-x86_64-1.txz.asc
+-rw-r--r--   1 root root       426 Mar  9 00:20 ./slackware64/x/xf86-input-vmmouse-12.7.0-x86_64-1.txt
+-rw-r--r--   1 root root     25292 Mar  9 00:20 ./slackware64/x/xf86-input-vmmouse-12.7.0-x86_64-1.txz
+-rw-r--r--   1 root root       198 Mar  9 00:20 ./slackware64/x/xf86-input-vmmouse-12.7.0-x86_64-1.txz.asc
+-rw-r--r--   1 root root       387 Nov 13 19:03 ./slackware64/x/xf86-input-void-1.3.1-x86_64-1.txt
+-rw-r--r--   1 root root     15332 Nov 13 19:03 ./slackware64/x/xf86-input-void-1.3.1-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:03 ./slackware64/x/xf86-input-void-1.3.1-x86_64-1.txz.asc
+-rw-r--r--   1 root root       400 Mar 18 03:22 ./slackware64/x/xf86-input-wacom-0.10.11-x86_64-1.txt
+-rw-r--r--   1 root root     81748 Mar 18 03:22 ./slackware64/x/xf86-input-wacom-0.10.11-x86_64-1.txz
+-rw-r--r--   1 root root       198 Mar 18 03:22 ./slackware64/x/xf86-input-wacom-0.10.11-x86_64-1.txz.asc
+-rw-r--r--   1 root root       374 Nov 13 19:03 ./slackware64/x/xf86-video-apm-1.2.3-x86_64-1.txt
+-rw-r--r--   1 root root     66136 Nov 13 19:03 ./slackware64/x/xf86-video-apm-1.2.3-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:03 ./slackware64/x/xf86-video-apm-1.2.3-x86_64-1.txz.asc
+-rw-r--r--   1 root root       374 Nov 13 19:03 ./slackware64/x/xf86-video-ark-0.7.3-x86_64-1.txt
+-rw-r--r--   1 root root     19724 Nov 13 19:03 ./slackware64/x/xf86-video-ark-0.7.3-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:03 ./slackware64/x/xf86-video-ark-0.7.3-x86_64-1.txz.asc
+-rw-r--r--   1 root root       374 Nov 13 19:03 ./slackware64/x/xf86-video-ast-0.91.10-x86_64-1.txt
+-rw-r--r--   1 root root     26656 Nov 13 19:03 ./slackware64/x/xf86-video-ast-0.91.10-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:03 ./slackware64/x/xf86-video-ast-0.91.10-x86_64-1.txz.asc
+-rw-r--r--   1 root root       374 Mar 18 04:00 ./slackware64/x/xf86-video-ati-6.14.1-x86_64-1.txt
+-rw-r--r--   1 root root    359704 Mar 18 04:00 ./slackware64/x/xf86-video-ati-6.14.1-x86_64-1.txz
+-rw-r--r--   1 root root       198 Mar 18 04:00 ./slackware64/x/xf86-video-ati-6.14.1-x86_64-1.txz.asc
+-rw-r--r--   1 root root       400 Mar  9 00:19 ./slackware64/x/xf86-video-chips-1.2.4-x86_64-1.txt
+-rw-r--r--   1 root root     89720 Mar  9 00:19 ./slackware64/x/xf86-video-chips-1.2.4-x86_64-1.txz
+-rw-r--r--   1 root root       198 Mar  9 00:19 ./slackware64/x/xf86-video-chips-1.2.4-x86_64-1.txz.asc
+-rw-r--r--   1 root root       413 Nov 13 19:04 ./slackware64/x/xf86-video-cirrus-1.3.2-x86_64-3.txt
+-rw-r--r--   1 root root     36416 Nov 13 19:04 ./slackware64/x/xf86-video-cirrus-1.3.2-x86_64-3.txz
+-rw-r--r--   1 root root       198 Nov 13 19:04 ./slackware64/x/xf86-video-cirrus-1.3.2-x86_64-3.txz.asc
+-rw-r--r--   1 root root       400 Nov 13 19:04 ./slackware64/x/xf86-video-dummy-0.3.4-x86_64-1.txt
+-rw-r--r--   1 root root     13100 Nov 13 19:04 ./slackware64/x/xf86-video-dummy-0.3.4-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:04 ./slackware64/x/xf86-video-dummy-0.3.4-x86_64-1.txz.asc
+-rw-r--r--   1 root root       400 Nov 13 19:05 ./slackware64/x/xf86-video-glint-1.2.5-x86_64-1.txt
+-rw-r--r--   1 root root     92956 Nov 13 19:05 ./slackware64/x/xf86-video-glint-1.2.5-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:05 ./slackware64/x/xf86-video-glint-1.2.5-x86_64-1.txz.asc
+-rw-r--r--   1 root root       387 Nov 13 19:05 ./slackware64/x/xf86-video-i128-1.3.4-x86_64-1.txt
+-rw-r--r--   1 root root     32256 Nov 13 19:05 ./slackware64/x/xf86-video-i128-1.3.4-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:05 ./slackware64/x/xf86-video-i128-1.3.4-x86_64-1.txz.asc
+-rw-r--r--   1 root root       387 Nov 13 19:05 ./slackware64/x/xf86-video-i740-1.3.2-x86_64-3.txt
+-rw-r--r--   1 root root     24792 Nov 13 19:05 ./slackware64/x/xf86-video-i740-1.3.2-x86_64-3.txz
+-rw-r--r--   1 root root       198 Nov 13 19:05 ./slackware64/x/xf86-video-i740-1.3.2-x86_64-3.txz.asc
+-rw-r--r--   1 root root       400 Apr 16 03:15 ./slackware64/x/xf86-video-intel-2.15.0-x86_64-1.txt
+-rw-r--r--   1 root root    196176 Apr 16 03:15 ./slackware64/x/xf86-video-intel-2.15.0-x86_64-1.txz
+-rw-r--r--   1 root root       198 Apr 16 03:15 ./slackware64/x/xf86-video-intel-2.15.0-x86_64-1.txz.asc
+-rw-r--r--   1 root root       413 Nov 13 19:05 ./slackware64/x/xf86-video-mach64-6.8.2-x86_64-3.txt
+-rw-r--r--   1 root root     95636 Nov 13 19:05 ./slackware64/x/xf86-video-mach64-6.8.2-x86_64-3.txz
+-rw-r--r--   1 root root       198 Nov 13 19:05 ./slackware64/x/xf86-video-mach64-6.8.2-x86_64-3.txz.asc
+-rw-r--r--   1 root root       374 Nov 13 19:06 ./slackware64/x/xf86-video-mga-1.4.13-x86_64-1.txt
+-rw-r--r--   1 root root     92784 Nov 13 19:06 ./slackware64/x/xf86-video-mga-1.4.13-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:06 ./slackware64/x/xf86-video-mga-1.4.13-x86_64-1.txz.asc
+-rw-r--r--   1 root root       439 Nov 13 19:06 ./slackware64/x/xf86-video-neomagic-1.2.5-x86_64-1.txt
+-rw-r--r--   1 root root     39976 Nov 13 19:06 ./slackware64/x/xf86-video-neomagic-1.2.5-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:06 ./slackware64/x/xf86-video-neomagic-1.2.5-x86_64-1.txz.asc
+-rw-r--r--   1 root root       426 Jan 31 03:43 ./slackware64/x/xf86-video-nouveau-8bb82312-x86_64-1.txt
+-rw-r--r--   1 root root     72616 Jan 31 03:43 ./slackware64/x/xf86-video-nouveau-8bb82312-x86_64-1.txz
+-rw-r--r--   1 root root       198 Jan 31 03:43 ./slackware64/x/xf86-video-nouveau-8bb82312-x86_64-1.txz.asc
+-rw-r--r--   1 root root       361 Nov 13 19:06 ./slackware64/x/xf86-video-nv-2.1.18-x86_64-1.txt
+-rw-r--r--   1 root root     88096 Nov 13 19:06 ./slackware64/x/xf86-video-nv-2.1.18-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:06 ./slackware64/x/xf86-video-nv-2.1.18-x86_64-1.txz.asc
+-rw-r--r--   1 root root       465 Nov 13 19:06 ./slackware64/x/xf86-video-openchrome-0.2.904-x86_64-2.txt
+-rw-r--r--   1 root root    140796 Nov 13 19:06 ./slackware64/x/xf86-video-openchrome-0.2.904-x86_64-2.txz
+-rw-r--r--   1 root root       198 Nov 13 19:06 ./slackware64/x/xf86-video-openchrome-0.2.904-x86_64-2.txz.asc
+-rw-r--r--   1 root root       387 Nov 13 19:06 ./slackware64/x/xf86-video-r128-6.8.1-x86_64-3.txt
+-rw-r--r--   1 root root     56192 Nov 13 19:06 ./slackware64/x/xf86-video-r128-6.8.1-x86_64-3.txz
+-rw-r--r--   1 root root       198 Nov 13 19:06 ./slackware64/x/xf86-video-r128-6.8.1-x86_64-3.txz.asc
+-rw-r--r--   1 root root       485 Mar 14 04:00 ./slackware64/x/xf86-video-radeonhd-1.3.0-x86_64-2.txt
+-rw-r--r--   1 root root    201788 Mar 14 04:00 ./slackware64/x/xf86-video-radeonhd-1.3.0-x86_64-2.txz
+-rw-r--r--   1 root root       198 Mar 14 04:00 ./slackware64/x/xf86-video-radeonhd-1.3.0-x86_64-2.txz.asc
+-rw-r--r--   1 root root       452 Nov 13 19:07 ./slackware64/x/xf86-video-rendition-4.2.4-x86_64-1.txt
+-rw-r--r--   1 root root     44860 Nov 13 19:07 ./slackware64/x/xf86-video-rendition-4.2.4-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:07 ./slackware64/x/xf86-video-rendition-4.2.4-x86_64-1.txz.asc
+-rw-r--r--   1 root root       361 Nov 13 19:07 ./slackware64/x/xf86-video-s3-0.6.3-x86_64-3.txt
+-rw-r--r--   1 root root     30856 Nov 13 19:07 ./slackware64/x/xf86-video-s3-0.6.3-x86_64-3.txz
+-rw-r--r--   1 root root       198 Nov 13 19:07 ./slackware64/x/xf86-video-s3-0.6.3-x86_64-3.txz.asc
+-rw-r--r--   1 root root       426 Nov 13 19:07 ./slackware64/x/xf86-video-s3virge-1.10.4-x86_64-3.txt
+-rw-r--r--   1 root root     41860 Nov 13 19:07 ./slackware64/x/xf86-video-s3virge-1.10.4-x86_64-3.txz
+-rw-r--r--   1 root root       198 Nov 13 19:07 ./slackware64/x/xf86-video-s3virge-1.10.4-x86_64-3.txz.asc
+-rw-r--r--   1 root root       413 Feb  1 01:21 ./slackware64/x/xf86-video-savage-2.3.2-x86_64-1.txt
+-rw-r--r--   1 root root     73852 Feb  1 01:21 ./slackware64/x/xf86-video-savage-2.3.2-x86_64-1.txz
+-rw-r--r--   1 root root       198 Feb  1 01:21 ./slackware64/x/xf86-video-savage-2.3.2-x86_64-1.txz.asc
+-rw-r--r--   1 root root       504 Mar  9 00:19 ./slackware64/x/xf86-video-siliconmotion-1.7.5-x86_64-1.txt
+-rw-r--r--   1 root root     65852 Mar  9 00:19 ./slackware64/x/xf86-video-siliconmotion-1.7.5-x86_64-1.txz
+-rw-r--r--   1 root root       198 Mar  9 00:19 ./slackware64/x/xf86-video-siliconmotion-1.7.5-x86_64-1.txz.asc
+-rw-r--r--   1 root root       374 Nov 13 19:07 ./slackware64/x/xf86-video-sis-0.10.3-x86_64-1.txt
+-rw-r--r--   1 root root    248936 Nov 13 19:07 ./slackware64/x/xf86-video-sis-0.10.3-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:07 ./slackware64/x/xf86-video-sis-0.10.3-x86_64-1.txz.asc
+-rw-r--r--   1 root root       413 Nov 13 19:07 ./slackware64/x/xf86-video-sisusb-0.9.4-x86_64-1.txt
+-rw-r--r--   1 root root     46264 Nov 13 19:07 ./slackware64/x/xf86-video-sisusb-0.9.4-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:07 ./slackware64/x/xf86-video-sisusb-0.9.4-x86_64-1.txz.asc
+-rw-r--r--   1 root root       387 Nov 13 19:08 ./slackware64/x/xf86-video-tdfx-1.4.3-x86_64-3.txt
+-rw-r--r--   1 root root     31684 Nov 13 19:08 ./slackware64/x/xf86-video-tdfx-1.4.3-x86_64-3.txz
+-rw-r--r--   1 root root       198 Nov 13 19:08 ./slackware64/x/xf86-video-tdfx-1.4.3-x86_64-3.txz.asc
+-rw-r--r--   1 root root       374 Nov 13 19:08 ./slackware64/x/xf86-video-tga-1.2.1-x86_64-2.txt
+-rw-r--r--   1 root root     24308 Nov 13 19:08 ./slackware64/x/xf86-video-tga-1.2.1-x86_64-2.txz
+-rw-r--r--   1 root root       198 Nov 13 19:08 ./slackware64/x/xf86-video-tga-1.2.1-x86_64-2.txz.asc
+-rw-r--r--   1 root root       426 Nov 13 19:08 ./slackware64/x/xf86-video-trident-1.3.4-x86_64-1.txt
+-rw-r--r--   1 root root     69236 Nov 13 19:08 ./slackware64/x/xf86-video-trident-1.3.4-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:08 ./slackware64/x/xf86-video-trident-1.3.4-x86_64-1.txz.asc
+-rw-r--r--   1 root root       400 Nov 13 19:08 ./slackware64/x/xf86-video-tseng-1.2.4-x86_64-1.txt
+-rw-r--r--   1 root root     30804 Nov 13 19:08 ./slackware64/x/xf86-video-tseng-1.2.4-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:08 ./slackware64/x/xf86-video-tseng-1.2.4-x86_64-1.txz.asc
+-rw-r--r--   1 root root       374 Nov 13 19:08 ./slackware64/x/xf86-video-v4l-0.2.0-x86_64-4.txt
+-rw-r--r--   1 root root     10172 Nov 13 19:08 ./slackware64/x/xf86-video-v4l-0.2.0-x86_64-4.txz
+-rw-r--r--   1 root root       198 Nov 13 19:08 ./slackware64/x/xf86-video-v4l-0.2.0-x86_64-4.txz.asc
+-rw-r--r--   1 root root       387 Nov 13 19:08 ./slackware64/x/xf86-video-vesa-2.3.0-x86_64-3.txt
+-rw-r--r--   1 root root     25724 Nov 13 19:08 ./slackware64/x/xf86-video-vesa-2.3.0-x86_64-3.txz
+-rw-r--r--   1 root root       198 Nov 13 19:08 ./slackware64/x/xf86-video-vesa-2.3.0-x86_64-3.txz.asc
+-rw-r--r--   1 root root       413 Nov 13 19:08 ./slackware64/x/xf86-video-vmware-11.0.3-x86_64-1.txt
+-rw-r--r--   1 root root     39504 Nov 13 19:08 ./slackware64/x/xf86-video-vmware-11.0.3-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:08 ./slackware64/x/xf86-video-vmware-11.0.3-x86_64-1.txz.asc
+-rw-r--r--   1 root root       413 Nov 13 19:08 ./slackware64/x/xf86-video-voodoo-1.2.4-x86_64-1.txt
+-rw-r--r--   1 root root     21428 Nov 13 19:08 ./slackware64/x/xf86-video-voodoo-1.2.4-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:08 ./slackware64/x/xf86-video-voodoo-1.2.4-x86_64-1.txz.asc
+-rw-r--r--   1 root root       374 Nov 13 19:08 ./slackware64/x/xf86-video-xgi-1.6.0-x86_64-1.txt
+-rw-r--r--   1 root root    125108 Nov 13 19:08 ./slackware64/x/xf86-video-xgi-1.6.0-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:08 ./slackware64/x/xf86-video-xgi-1.6.0-x86_64-1.txz.asc
+-rw-r--r--   1 root root       400 Feb 22  2010 ./slackware64/x/xf86bigfontproto-1.2.0-noarch-1.txt
+-rw-r--r--   1 root root      4792 Feb 22  2010 ./slackware64/x/xf86bigfontproto-1.2.0-noarch-1.txz
+-rw-r--r--   1 root root       197 Feb 22  2010 ./slackware64/x/xf86bigfontproto-1.2.0-noarch-1.txz.asc
+-rw-r--r--   1 root root       283 Nov 13 18:59 ./slackware64/x/xf86dga-1.0.3-x86_64-1.txt
+-rw-r--r--   1 root root     13352 Nov 13 18:59 ./slackware64/x/xf86dga-1.0.3-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:59 ./slackware64/x/xf86dga-1.0.3-x86_64-1.txz.asc
+-rw-r--r--   1 root root       348 Feb 22  2010 ./slackware64/x/xf86dgaproto-2.1-noarch-1.txt
+-rw-r--r--   1 root root      7428 Feb 22  2010 ./slackware64/x/xf86dgaproto-2.1-noarch-1.txz
+-rw-r--r--   1 root root       197 Feb 22  2010 ./slackware64/x/xf86dgaproto-2.1-noarch-1.txz.asc
+-rw-r--r--   1 root root       348 Feb  1 01:03 ./slackware64/x/xf86driproto-2.1.1-noarch-1.txt
+-rw-r--r--   1 root root     10904 Feb  1 01:03 ./slackware64/x/xf86driproto-2.1.1-noarch-1.txz
+-rw-r--r--   1 root root       198 Feb  1 01:03 ./slackware64/x/xf86driproto-2.1.1-noarch-1.txz.asc
+-rw-r--r--   1 root root       361 Feb 22  2010 ./slackware64/x/xf86miscproto-0.9.3-noarch-1.txt
+-rw-r--r--   1 root root      6148 Feb 22  2010 ./slackware64/x/xf86miscproto-0.9.3-noarch-1.txz
+-rw-r--r--   1 root root       197 Feb 22  2010 ./slackware64/x/xf86miscproto-0.9.3-noarch-1.txz.asc
+-rw-r--r--   1 root root       400 Feb  1 01:03 ./slackware64/x/xf86vidmodeproto-2.3.1-noarch-1.txt
+-rw-r--r--   1 root root     11304 Feb  1 01:03 ./slackware64/x/xf86vidmodeproto-2.3.1-noarch-1.txz
+-rw-r--r--   1 root root       198 Feb  1 01:03 ./slackware64/x/xf86vidmodeproto-2.3.1-noarch-1.txz.asc
+-rw-r--r--   1 root root       231 Nov 13 18:59 ./slackware64/x/xfd-1.1.0-x86_64-1.txt
+-rw-r--r--   1 root root     25016 Nov 13 18:59 ./slackware64/x/xfd-1.1.0-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:59 ./slackware64/x/xfd-1.1.0-x86_64-1.txz.asc
+-rw-r--r--   1 root root       296 Nov 13 18:59 ./slackware64/x/xfontsel-1.0.3-x86_64-1.txt
+-rw-r--r--   1 root root     31072 Nov 13 18:59 ./slackware64/x/xfontsel-1.0.3-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:59 ./slackware64/x/xfontsel-1.0.3-x86_64-1.txz.asc
+-rw-r--r--   1 root root       231 Nov 13 18:59 ./slackware64/x/xfs-1.1.1-x86_64-1.txt
+-rw-r--r--   1 root root     73640 Nov 13 18:59 ./slackware64/x/xfs-1.1.1-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:59 ./slackware64/x/xfs-1.1.1-x86_64-1.txz.asc
+-rw-r--r--   1 root root       283 Nov 13 18:59 ./slackware64/x/xfsinfo-1.0.3-x86_64-1.txt
+-rw-r--r--   1 root root     14340 Nov 13 18:59 ./slackware64/x/xfsinfo-1.0.3-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:59 ./slackware64/x/xfsinfo-1.0.3-x86_64-1.txz.asc
+-rw-r--r--   1 root root       270 Nov 13 18:59 ./slackware64/x/xgamma-1.0.4-x86_64-1.txt
+-rw-r--r--   1 root root     14660 Nov 13 18:59 ./slackware64/x/xgamma-1.0.4-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:59 ./slackware64/x/xgamma-1.0.4-x86_64-1.txz.asc
+-rw-r--r--   1 root root       231 Nov 13 18:59 ./slackware64/x/xgc-1.0.3-x86_64-1.txt
+-rw-r--r--   1 root root     38636 Nov 13 18:59 ./slackware64/x/xgc-1.0.3-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:59 ./slackware64/x/xgc-1.0.3-x86_64-1.txz.asc
+-rw-r--r--   1 root root       257 Nov 13 18:59 ./slackware64/x/xhost-1.0.4-x86_64-1.txt
+-rw-r--r--   1 root root     19384 Nov 13 18:59 ./slackware64/x/xhost-1.0.4-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:59 ./slackware64/x/xhost-1.0.4-x86_64-1.txz.asc
+-rw-r--r--   1 root root       361 Feb  1 01:04 ./slackware64/x/xineramaproto-1.2.1-noarch-1.txt
+-rw-r--r--   1 root root     10716 Feb  1 01:04 ./slackware64/x/xineramaproto-1.2.1-noarch-1.txz
+-rw-r--r--   1 root root       198 Feb  1 01:04 ./slackware64/x/xineramaproto-1.2.1-noarch-1.txz.asc
+-rw-r--r--   1 root root       257 Nov 13 18:59 ./slackware64/x/xinit-1.3.0-x86_64-1.txt
+-rw-r--r--   1 root root     29188 Nov 13 18:59 ./slackware64/x/xinit-1.3.0-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:59 ./slackware64/x/xinit-1.3.0-x86_64-1.txz.asc
+-rw-r--r--   1 root root       468 Nov 13 18:59 ./slackware64/x/xinput-1.5.3-x86_64-1.txt
+-rw-r--r--   1 root root     34168 Nov 13 18:59 ./slackware64/x/xinput-1.5.3-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:59 ./slackware64/x/xinput-1.5.3-x86_64-1.txz.asc
+-rw-r--r--   1 root root       283 Mar  9 00:18 ./slackware64/x/xkbcomp-1.2.1-x86_64-1.txt
+-rw-r--r--   1 root root     97720 Mar  9 00:18 ./slackware64/x/xkbcomp-1.2.1-x86_64-1.txz
+-rw-r--r--   1 root root       198 Mar  9 00:18 ./slackware64/x/xkbcomp-1.2.1-x86_64-1.txz.asc
+-rw-r--r--   1 root root       270 Feb  1 01:16 ./slackware64/x/xkbevd-1.1.2-x86_64-1.txt
+-rw-r--r--   1 root root     27208 Feb  1 01:16 ./slackware64/x/xkbevd-1.1.2-x86_64-1.txz
+-rw-r--r--   1 root root       198 Feb  1 01:16 ./slackware64/x/xkbevd-1.1.2-x86_64-1.txz.asc
+-rw-r--r--   1 root root       296 Feb  1 01:16 ./slackware64/x/xkbprint-1.0.3-x86_64-1.txt
+-rw-r--r--   1 root root     51776 Feb  1 01:16 ./slackware64/x/xkbprint-1.0.3-x86_64-1.txz
+-rw-r--r--   1 root root       198 Feb  1 01:16 ./slackware64/x/xkbprint-1.0.3-x86_64-1.txz.asc
+-rw-r--r--   1 root root       296 Nov 13 18:59 ./slackware64/x/xkbutils-1.0.3-x86_64-1.txt
+-rw-r--r--   1 root root     26796 Nov 13 18:59 ./slackware64/x/xkbutils-1.0.3-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:59 ./slackware64/x/xkbutils-1.0.3-x86_64-1.txz.asc
+-rw-r--r--   1 root root       400 Apr  7 18:06 ./slackware64/x/xkeyboard-config-2.2.1-noarch-1.txt
+-rw-r--r--   1 root root    489060 Apr  7 18:06 ./slackware64/x/xkeyboard-config-2.2.1-noarch-1.txz
+-rw-r--r--   1 root root       198 Apr  7 18:06 ./slackware64/x/xkeyboard-config-2.2.1-noarch-1.txz.asc
+-rw-r--r--   1 root root       257 Nov 13 19:00 ./slackware64/x/xkill-1.0.3-x86_64-1.txt
+-rw-r--r--   1 root root     16860 Nov 13 19:00 ./slackware64/x/xkill-1.0.3-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:00 ./slackware64/x/xkill-1.0.3-x86_64-1.txz.asc
+-rw-r--r--   1 root root       257 Nov 13 19:00 ./slackware64/x/xload-1.1.0-x86_64-1.txt
+-rw-r--r--   1 root root     19372 Nov 13 19:00 ./slackware64/x/xload-1.1.0-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:00 ./slackware64/x/xload-1.1.0-x86_64-1.txz.asc
+-rw-r--r--   1 root root       257 Nov 13 19:00 ./slackware64/x/xlogo-1.0.3-x86_64-1.txt
+-rw-r--r--   1 root root     21268 Nov 13 19:00 ./slackware64/x/xlogo-1.0.3-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:00 ./slackware64/x/xlogo-1.0.3-x86_64-1.txz.asc
+-rw-r--r--   1 root root       296 Nov 13 19:00 ./slackware64/x/xlsatoms-1.1.0-x86_64-1.txt
+-rw-r--r--   1 root root     14344 Nov 13 19:00 ./slackware64/x/xlsatoms-1.1.0-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:00 ./slackware64/x/xlsatoms-1.1.0-x86_64-1.txz.asc
+-rw-r--r--   1 root root       322 Nov 13 19:00 ./slackware64/x/xlsclients-1.1.1-x86_64-1.txt
+-rw-r--r--   1 root root     17668 Nov 13 19:00 ./slackware64/x/xlsclients-1.1.1-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:00 ./slackware64/x/xlsclients-1.1.1-x86_64-1.txz.asc
+-rw-r--r--   1 root root       296 Nov 13 19:00 ./slackware64/x/xlsfonts-1.0.3-x86_64-1.txt
+-rw-r--r--   1 root root     18532 Nov 13 19:00 ./slackware64/x/xlsfonts-1.0.3-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:00 ./slackware64/x/xlsfonts-1.0.3-x86_64-1.txz.asc
+-rw-r--r--   1 root root       244 Nov 13 19:00 ./slackware64/x/xmag-1.0.4-x86_64-1.txt
+-rw-r--r--   1 root root     27372 Nov 13 19:00 ./slackware64/x/xmag-1.0.4-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:00 ./slackware64/x/xmag-1.0.4-x86_64-1.txz.asc
+-rw-r--r--   1 root root       244 Nov 13 19:00 ./slackware64/x/xman-1.1.1-x86_64-1.txt
+-rw-r--r--   1 root root     47208 Nov 13 19:00 ./slackware64/x/xman-1.1.1-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:00 ./slackware64/x/xman-1.1.1-x86_64-1.txz.asc
+-rw-r--r--   1 root root       296 Feb 22  2010 ./slackware64/x/xmessage-1.0.3-x86_64-1.txt
+-rw-r--r--   1 root root     19764 Feb 22  2010 ./slackware64/x/xmessage-1.0.3-x86_64-1.txz
+-rw-r--r--   1 root root       197 Feb 22  2010 ./slackware64/x/xmessage-1.0.3-x86_64-1.txz.asc
+-rw-r--r--   1 root root       231 Nov 13 19:00 ./slackware64/x/xmh-1.0.2-x86_64-1.txt
+-rw-r--r--   1 root root     81160 Nov 13 19:00 ./slackware64/x/xmh-1.0.2-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:00 ./slackware64/x/xmh-1.0.2-x86_64-1.txz.asc
+-rw-r--r--   1 root root       283 Nov 13 19:00 ./slackware64/x/xmodmap-1.0.5-x86_64-1.txt
+-rw-r--r--   1 root root     30040 Nov 13 19:00 ./slackware64/x/xmodmap-1.0.5-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:00 ./slackware64/x/xmodmap-1.0.5-x86_64-1.txz.asc
+-rw-r--r--   1 root root       257 Nov 13 19:00 ./slackware64/x/xmore-1.0.2-x86_64-1.txt
+-rw-r--r--   1 root root     14060 Nov 13 19:00 ./slackware64/x/xmore-1.0.2-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:00 ./slackware64/x/xmore-1.0.2-x86_64-1.txz.asc
+-rw-r--r--   1 root root       361 Feb  1 01:04 ./slackware64/x/xorg-cf-files-1.0.4-noarch-1.txt
+-rw-r--r--   1 root root    185448 Feb  1 01:04 ./slackware64/x/xorg-cf-files-1.0.4-noarch-1.txz
+-rw-r--r--   1 root root       198 Feb  1 01:04 ./slackware64/x/xorg-cf-files-1.0.4-noarch-1.txz.asc
+-rw-r--r--   1 root root       309 Feb  1 01:17 ./slackware64/x/xorg-docs-1.6-noarch-1.txt
+-rw-r--r--   1 root root    254664 Feb  1 01:17 ./slackware64/x/xorg-docs-1.6-noarch-1.txz
+-rw-r--r--   1 root root       198 Feb  1 01:17 ./slackware64/x/xorg-docs-1.6-noarch-1.txz.asc
+-rw-r--r--   1 root root       698 Mar 18 03:51 ./slackware64/x/xorg-server-1.9.5-x86_64-1.txt
+-rw-r--r--   1 root root   1924400 Mar 18 03:51 ./slackware64/x/xorg-server-1.9.5-x86_64-1.txz
+-rw-r--r--   1 root root       198 Mar 18 03:51 ./slackware64/x/xorg-server-1.9.5-x86_64-1.txz.asc
+-rw-r--r--   1 root root       370 Mar 18 03:51 ./slackware64/x/xorg-server-xephyr-1.9.5-x86_64-1.txt
+-rw-r--r--   1 root root    750896 Mar 18 03:51 ./slackware64/x/xorg-server-xephyr-1.9.5-x86_64-1.txz
+-rw-r--r--   1 root root       198 Mar 18 03:51 ./slackware64/x/xorg-server-xephyr-1.9.5-x86_64-1.txz.asc
+-rw-r--r--   1 root root       595 Mar 18 03:51 ./slackware64/x/xorg-server-xnest-1.9.5-x86_64-1.txt
+-rw-r--r--   1 root root    578116 Mar 18 03:51 ./slackware64/x/xorg-server-xnest-1.9.5-x86_64-1.txz
+-rw-r--r--   1 root root       198 Mar 18 03:51 ./slackware64/x/xorg-server-xnest-1.9.5-x86_64-1.txz.asc
+-rw-r--r--   1 root root       693 Mar 18 03:51 ./slackware64/x/xorg-server-xvfb-1.9.5-x86_64-1.txt
+-rw-r--r--   1 root root    670956 Mar 18 03:51 ./slackware64/x/xorg-server-xvfb-1.9.5-x86_64-1.txz
+-rw-r--r--   1 root root       198 Mar 18 03:51 ./slackware64/x/xorg-server-xvfb-1.9.5-x86_64-1.txz.asc
+-rw-r--r--   1 root root       426 Apr  6 04:29 ./slackware64/x/xorg-sgml-doctools-1.7-x86_64-1.txt
+-rw-r--r--   1 root root     20304 Apr  6 04:29 ./slackware64/x/xorg-sgml-doctools-1.7-x86_64-1.txz
+-rw-r--r--   1 root root       198 Apr  6 04:29 ./slackware64/x/xorg-sgml-doctools-1.7-x86_64-1.txz.asc
+-rw-r--r--   1 root root       231 Feb 22  2010 ./slackware64/x/xpr-1.0.3-x86_64-1.txt
+-rw-r--r--   1 root root     33188 Feb 22  2010 ./slackware64/x/xpr-1.0.3-x86_64-1.txz
+-rw-r--r--   1 root root       197 Feb 22  2010 ./slackware64/x/xpr-1.0.3-x86_64-1.txz.asc
+-rw-r--r--   1 root root       257 Nov 13 19:00 ./slackware64/x/xprop-1.2.0-x86_64-1.txt
+-rw-r--r--   1 root root     33848 Nov 13 19:00 ./slackware64/x/xprop-1.2.0-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:00 ./slackware64/x/xprop-1.2.0-x86_64-1.txz.asc
+-rw-r--r--   1 root root       270 Mar 27 07:42 ./slackware64/x/xproto-7.0.21-noarch-1.txt
+-rw-r--r--   1 root root    192272 Mar 27 07:42 ./slackware64/x/xproto-7.0.21-noarch-1.txz
+-rw-r--r--   1 root root       198 Mar 27 07:42 ./slackware64/x/xproto-7.0.21-noarch-1.txz.asc
+-rw-r--r--   1 root root       244 Feb 22  2010 ./slackware64/x/xpyb-1.2-x86_64-1.txt
+-rw-r--r--   1 root root    109120 Feb 22  2010 ./slackware64/x/xpyb-1.2-x86_64-1.txz
+-rw-r--r--   1 root root       197 Feb 22  2010 ./slackware64/x/xpyb-1.2-x86_64-1.txz.asc
+-rw-r--r--   1 root root       270 Nov 13 19:00 ./slackware64/x/xrandr-1.3.4-x86_64-1.txt
+-rw-r--r--   1 root root     47376 Nov 13 19:00 ./slackware64/x/xrandr-1.3.4-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:00 ./slackware64/x/xrandr-1.3.4-x86_64-1.txz.asc
+-rw-r--r--   1 root root       244 Apr  6 04:27 ./slackware64/x/xrdb-1.0.9-x86_64-1.txt
+-rw-r--r--   1 root root     23584 Apr  6 04:27 ./slackware64/x/xrdb-1.0.9-x86_64-1.txz
+-rw-r--r--   1 root root       198 Apr  6 04:27 ./slackware64/x/xrdb-1.0.9-x86_64-1.txz.asc
+-rw-r--r--   1 root root       296 Nov 13 19:01 ./slackware64/x/xrefresh-1.0.4-x86_64-1.txt
+-rw-r--r--   1 root root     14884 Nov 13 19:01 ./slackware64/x/xrefresh-1.0.4-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:01 ./slackware64/x/xrefresh-1.0.4-x86_64-1.txz.asc
+-rw-r--r--   1 root root       270 Nov 13 19:01 ./slackware64/x/xscope-1.3-x86_64-1.txt
+-rw-r--r--   1 root root     99736 Nov 13 19:01 ./slackware64/x/xscope-1.3-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:01 ./slackware64/x/xscope-1.3-x86_64-1.txz.asc
+-rw-r--r--   1 root root       244 Nov 13 19:01 ./slackware64/x/xset-1.2.1-x86_64-1.txt
+-rw-r--r--   1 root root     32128 Nov 13 19:01 ./slackware64/x/xset-1.2.1-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:01 ./slackware64/x/xset-1.2.1-x86_64-1.txz.asc
+-rw-r--r--   1 root root       296 Nov 13 19:01 ./slackware64/x/xsetroot-1.1.0-x86_64-1.txt
+-rw-r--r--   1 root root     18128 Nov 13 19:01 ./slackware64/x/xsetroot-1.1.0-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:01 ./slackware64/x/xsetroot-1.1.0-x86_64-1.txz.asc
+-rw-r--r--   1 root root       231 Nov 13 19:01 ./slackware64/x/xsm-1.0.2-x86_64-1.txt
+-rw-r--r--   1 root root     52892 Nov 13 19:01 ./slackware64/x/xsm-1.0.2-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:01 ./slackware64/x/xsm-1.0.2-x86_64-1.txz.asc
+-rw-r--r--   1 root root       296 Nov 13 19:01 ./slackware64/x/xstdcmap-1.0.2-x86_64-1.txt
+-rw-r--r--   1 root root     15508 Nov 13 19:01 ./slackware64/x/xstdcmap-1.0.2-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:01 ./slackware64/x/xstdcmap-1.0.2-x86_64-1.txz.asc
+-rw-r--r--   1 root root       308 Feb 24 17:55 ./slackware64/x/xterm-267-x86_64-1.txt
+-rw-r--r--   1 root root    242440 Feb 24 17:55 ./slackware64/x/xterm-267-x86_64-1.txz
+-rw-r--r--   1 root root       198 Feb 24 17:55 ./slackware64/x/xterm-267-x86_64-1.txz.asc
+-rw-r--r--   1 root root       270 Nov 13 18:55 ./slackware64/x/xtrans-1.2.6-noarch-1.txt
+-rw-r--r--   1 root root     63524 Nov 13 18:55 ./slackware64/x/xtrans-1.2.6-noarch-1.txz
+-rw-r--r--   1 root root       198 Nov 13 18:55 ./slackware64/x/xtrans-1.2.6-noarch-1.txz.asc
+-rw-r--r--   1 root root       296 Feb 22  2010 ./slackware64/x/xvidtune-1.0.2-x86_64-1.txt
+-rw-r--r--   1 root root     26252 Feb 22  2010 ./slackware64/x/xvidtune-1.0.2-x86_64-1.txz
+-rw-r--r--   1 root root       197 Feb 22  2010 ./slackware64/x/xvidtune-1.0.2-x86_64-1.txz.asc
+-rw-r--r--   1 root root       270 Nov 13 19:01 ./slackware64/x/xvinfo-1.1.1-x86_64-1.txt
+-rw-r--r--   1 root root     14972 Nov 13 19:01 ./slackware64/x/xvinfo-1.1.1-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:01 ./slackware64/x/xvinfo-1.1.1-x86_64-1.txz.asc
+-rw-r--r--   1 root root       231 Nov 13 19:01 ./slackware64/x/xwd-1.0.4-x86_64-1.txt
+-rw-r--r--   1 root root     24596 Nov 13 19:01 ./slackware64/x/xwd-1.0.4-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:01 ./slackware64/x/xwd-1.0.4-x86_64-1.txz.asc
+-rw-r--r--   1 root root       296 Nov 13 19:01 ./slackware64/x/xwininfo-1.1.1-x86_64-1.txt
+-rw-r--r--   1 root root     32140 Nov 13 19:01 ./slackware64/x/xwininfo-1.1.1-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:01 ./slackware64/x/xwininfo-1.1.1-x86_64-1.txz.asc
+-rw-r--r--   1 root root       244 Nov 13 19:01 ./slackware64/x/xwud-1.0.3-x86_64-1.txt
+-rw-r--r--   1 root root     22528 Nov 13 19:01 ./slackware64/x/xwud-1.0.3-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov 13 19:01 ./slackware64/x/xwud-1.0.3-x86_64-1.txz.asc
+drwxr-xr-x   2 root root     12288 Apr 21 03:50 ./slackware64/xap
+-rw-r--r--   1 root root       479 Dec 18 18:47 ./slackware64/xap/MPlayer-20101218-x86_64-1.txt
+-rw-r--r--   1 root root   9132276 Dec 18 18:47 ./slackware64/xap/MPlayer-20101218-x86_64-1.txz
+-rw-r--r--   1 root root       198 Dec 18 18:47 ./slackware64/xap/MPlayer-20101218-x86_64-1.txz.asc
+-rw-r--r--   1 root root       615 Mar 11 20:54 ./slackware64/xap/audacious-2.4.4-x86_64-1.txt
+-rw-r--r--   1 root root    431092 Mar 11 20:54 ./slackware64/xap/audacious-2.4.4-x86_64-1.txz
+-rw-r--r--   1 root root       198 Mar 11 20:54 ./slackware64/xap/audacious-2.4.4-x86_64-1.txz.asc
+-rw-r--r--   1 root root       424 Mar 11 21:06 ./slackware64/xap/audacious-plugins-2.4.4-x86_64-1.txt
+-rw-r--r--   1 root root   1391076 Mar 11 21:06 ./slackware64/xap/audacious-plugins-2.4.4-x86_64-1.txz
+-rw-r--r--   1 root root       198 Mar 11 21:06 ./slackware64/xap/audacious-plugins-2.4.4-x86_64-1.txz.asc
+-rw-r--r--   1 root root       441 Feb 28 03:35 ./slackware64/xap/blackbox-0.70.1-x86_64-4.txt
+-rw-r--r--   1 root root    297476 Feb 28 03:35 ./slackware64/xap/blackbox-0.70.1-x86_64-4.txz
+-rw-r--r--   1 root root       198 Feb 28 03:35 ./slackware64/xap/blackbox-0.70.1-x86_64-4.txz.asc
+-rw-r--r--   1 root root       424 Mar  7 19:31 ./slackware64/xap/blueman-r708-x86_64-1.txt
+-rw-r--r--   1 root root    539788 Mar  7 19:31 ./slackware64/xap/blueman-r708-x86_64-1.txz
+-rw-r--r--   1 root root       198 Mar  7 19:31 ./slackware64/xap/blueman-r708-x86_64-1.txz.asc
+-rw-r--r--   1 root root       652 Feb 19  2010 ./slackware64/xap/electricsheep-20090306-x86_64-3.txt
+-rw-r--r--   1 root root   2598696 Feb 19  2010 ./slackware64/xap/electricsheep-20090306-x86_64-3.txz
+-rw-r--r--   1 root root       197 Feb 19  2010 ./slackware64/xap/electricsheep-20090306-x86_64-3.txz.asc
+-rw-r--r--   1 root root       229 Feb 28 01:17 ./slackware64/xap/fluxbox-1.3.1-x86_64-1.txt
+-rw-r--r--   1 root root    724508 Feb 28 01:17 ./slackware64/xap/fluxbox-1.3.1-x86_64-1.txz
+-rw-r--r--   1 root root       198 Feb 28 01:17 ./slackware64/xap/fluxbox-1.3.1-x86_64-1.txz.asc
+-rw-r--r--   1 root root       337 Feb 28 03:46 ./slackware64/xap/fvwm-2.4.20-x86_64-2.txt
+-rw-r--r--   1 root root   1016848 Feb 28 03:46 ./slackware64/xap/fvwm-2.4.20-x86_64-2.txz
+-rw-r--r--   1 root root       198 Feb 28 03:46 ./slackware64/xap/fvwm-2.4.20-x86_64-2.txz.asc
+-rw-r--r--   1 root root       319 Mar 11 18:51 ./slackware64/xap/geeqie-1.0-x86_64-3.txt
+-rw-r--r--   1 root root    785488 Mar 11 18:51 ./slackware64/xap/geeqie-1.0-x86_64-3.txz
+-rw-r--r--   1 root root       198 Mar 11 18:51 ./slackware64/xap/geeqie-1.0-x86_64-3.txz.asc
+-rw-r--r--   1 root root       444 May 23  2009 ./slackware64/xap/gftp-2.0.19-x86_64-2.txt
+-rw-r--r--   1 root root    589988 May 23  2009 ./slackware64/xap/gftp-2.0.19-x86_64-2.txz
+-rw-r--r--   1 root root       197 May 23  2009 ./slackware64/xap/gftp-2.0.19-x86_64-2.txz.asc
+-rw-r--r--   1 root root       473 Mar 22 22:12 ./slackware64/xap/gimp-2.6.11-x86_64-3.txt
+-rw-r--r--   1 root root  10236712 Mar 22 22:12 ./slackware64/xap/gimp-2.6.11-x86_64-3.txz
+-rw-r--r--   1 root root       198 Mar 22 22:12 ./slackware64/xap/gimp-2.6.11-x86_64-3.txz.asc
+-rw-r--r--   1 root root       513 Feb 12 19:40 ./slackware64/xap/gkrellm-2.3.5-x86_64-1.txt
+-rw-r--r--   1 root root    535872 Feb 12 19:40 ./slackware64/xap/gkrellm-2.3.5-x86_64-1.txz
+-rw-r--r--   1 root root       198 Feb 12 19:40 ./slackware64/xap/gkrellm-2.3.5-x86_64-1.txz.asc
+-rw-r--r--   1 root root       337 Mar 21 22:48 ./slackware64/xap/gnuchess-5.08-x86_64-2.txt
+-rw-r--r--   1 root root   1057424 Mar 21 22:48 ./slackware64/xap/gnuchess-5.08-x86_64-2.txz
+-rw-r--r--   1 root root       198 Mar 21 22:48 ./slackware64/xap/gnuchess-5.08-x86_64-2.txz.asc
+-rw-r--r--   1 root root       647 Mar 18 04:38 ./slackware64/xap/gnuplot-4.4.3-x86_64-1.txt
+-rw-r--r--   1 root root   1241208 Mar 18 04:38 ./slackware64/xap/gnuplot-4.4.3-x86_64-1.txz
+-rw-r--r--   1 root root       198 Mar 18 04:38 ./slackware64/xap/gnuplot-4.4.3-x86_64-1.txz.asc
+-rw-r--r--   1 root root       209 Mar 19 22:37 ./slackware64/xap/gucharmap-2.33.2-x86_64-1.txt
+-rw-r--r--   1 root root   2132108 Mar 19 22:37 ./slackware64/xap/gucharmap-2.33.2-x86_64-1.txz
+-rw-r--r--   1 root root       198 Mar 19 22:37 ./slackware64/xap/gucharmap-2.33.2-x86_64-1.txz.asc
+-rw-r--r--   1 root root       370 Apr 14 17:17 ./slackware64/xap/gv-3.7.1-x86_64-2.txt
+-rw-r--r--   1 root root    208200 Apr 14 17:17 ./slackware64/xap/gv-3.7.1-x86_64-2.txz
+-rw-r--r--   1 root root       198 Apr 14 17:17 ./slackware64/xap/gv-3.7.1-x86_64-2.txz.asc
+-rw-r--r--   1 root root       540 Jan 26 19:03 ./slackware64/xap/imagemagick-6.6.6_10-x86_64-1.txt
+-rw-r--r--   1 root root   4875824 Jan 26 19:03 ./slackware64/xap/imagemagick-6.6.6_10-x86_64-1.txz
+-rw-r--r--   1 root root       198 Jan 26 19:03 ./slackware64/xap/imagemagick-6.6.6_10-x86_64-1.txz.asc
+-rwxr-xr-x   1 root root      2897 Jun 24  2009 ./slackware64/xap/install-packages
+-rw-r--r--   1 root root       446 Sep 18  2006 ./slackware64/xap/install.end
+-rw-r--r--   1 root root      4205 Nov 29 18:41 ./slackware64/xap/maketag
+-rw-r--r--   1 root root      4205 Nov 29 18:41 ./slackware64/xap/maketag.ez
+-rw-r--r--   1 root root       527 Mar 23 19:39 ./slackware64/xap/mozilla-firefox-4.0-x86_64-2.txt
+-rw-r--r--   1 root root  12981552 Mar 23 19:39 ./slackware64/xap/mozilla-firefox-4.0-x86_64-2.txz
+-rw-r--r--   1 root root       198 Mar 23 19:39 ./slackware64/xap/mozilla-firefox-4.0-x86_64-2.txz.asc
+-rw-r--r--   1 root root       702 Mar 23 19:57 ./slackware64/xap/mozilla-thunderbird-3.1.9-x86_64-2.txt
+-rw-r--r--   1 root root  10439992 Mar 23 19:57 ./slackware64/xap/mozilla-thunderbird-3.1.9-x86_64-2.txz
+-rw-r--r--   1 root root       198 Mar 23 19:57 ./slackware64/xap/mozilla-thunderbird-3.1.9-x86_64-2.txz.asc
+-rw-r--r--   1 root root       267 Feb 20 19:22 ./slackware64/xap/pan-0.134-x86_64-1.txt
+-rw-r--r--   1 root root    780556 Feb 20 19:22 ./slackware64/xap/pan-0.134-x86_64-1.txz
+-rw-r--r--   1 root root       198 Feb 20 19:22 ./slackware64/xap/pan-0.134-x86_64-1.txz.asc
+-rw-r--r--   1 root root       469 Mar 11 18:34 ./slackware64/xap/pidgin-2.7.11-x86_64-1.txt
+-rw-r--r--   1 root root   7246136 Mar 11 18:34 ./slackware64/xap/pidgin-2.7.11-x86_64-1.txz
+-rw-r--r--   1 root root       198 Mar 11 18:34 ./slackware64/xap/pidgin-2.7.11-x86_64-1.txz.asc
+-rw-r--r--   1 root root       395 Apr 21 01:32 ./slackware64/xap/rdesktop-1.6.0-x86_64-2.txt
+-rw-r--r--   1 root root    132388 Apr 21 01:32 ./slackware64/xap/rdesktop-1.6.0-x86_64-2.txz
+-rw-r--r--   1 root root       198 Apr 21 01:32 ./slackware64/xap/rdesktop-1.6.0-x86_64-2.txz.asc
+-rw-r--r--   1 root root       425 Jun  9  2009 ./slackware64/xap/rxvt-2.7.10-x86_64-4.txt
+-rw-r--r--   1 root root    162500 Jun  9  2009 ./slackware64/xap/rxvt-2.7.10-x86_64-4.txz
+-rw-r--r--   1 root root       197 Jun  9  2009 ./slackware64/xap/rxvt-2.7.10-x86_64-4.txz.asc
+-rw-r--r--   1 root root       321 Mar 18 19:57 ./slackware64/xap/sane-1.0.22-x86_64-2.txt
+-rw-r--r--   1 root root   2750500 Mar 18 19:57 ./slackware64/xap/sane-1.0.22-x86_64-2.txz
+-rw-r--r--   1 root root       198 Mar 18 19:57 ./slackware64/xap/sane-1.0.22-x86_64-2.txz.asc
+-rw-r--r--   1 root root       434 Apr 11 01:34 ./slackware64/xap/seamonkey-2.1b3-x86_64-2.txt
+-rw-r--r--   1 root root  22453456 Apr 11 01:34 ./slackware64/xap/seamonkey-2.1b3-x86_64-2.txz
+-rw-r--r--   1 root root       198 Apr 11 01:34 ./slackware64/xap/seamonkey-2.1b3-x86_64-2.txz.asc
+-rw-r--r--   1 root root       609 Mar 16  2009 ./slackware64/xap/seyon-2.20c-x86_64-3.txt
+-rw-r--r--   1 root root    113164 Mar 16  2009 ./slackware64/xap/seyon-2.20c-x86_64-3.txz
+-rw-r--r--   1 root root       197 Mar 16  2009 ./slackware64/xap/seyon-2.20c-x86_64-3.txz.asc
+-rw-r--r--   1 root root       617 Nov 29 18:41 ./slackware64/xap/tagfile
+-rw-r--r--   1 root root       488 Mar 16  2009 ./slackware64/xap/thunar-volman-0.3.80-x86_64-1.txt
+-rw-r--r--   1 root root     70548 Mar 16  2009 ./slackware64/xap/thunar-volman-0.3.80-x86_64-1.txz
+-rw-r--r--   1 root root       197 Mar 16  2009 ./slackware64/xap/thunar-volman-0.3.80-x86_64-1.txz.asc
+-rw-r--r--   1 root root       505 Apr  4 05:17 ./slackware64/xap/vim-gvim-7.3.154-x86_64-1.txt
+-rw-r--r--   1 root root   1543812 Apr  4 05:17 ./slackware64/xap/vim-gvim-7.3.154-x86_64-1.txz
+-rw-r--r--   1 root root       198 Apr  4 05:17 ./slackware64/xap/vim-gvim-7.3.154-x86_64-1.txz.asc
+-rw-r--r--   1 root root       455 Feb 28 03:44 ./slackware64/xap/windowmaker-20060427cvs-x86_64-4.txt
+-rw-r--r--   1 root root   1808464 Feb 28 03:44 ./slackware64/xap/windowmaker-20060427cvs-x86_64-4.txz
+-rw-r--r--   1 root root       198 Feb 28 03:44 ./slackware64/xap/windowmaker-20060427cvs-x86_64-4.txz.asc
+-rw-r--r--   1 root root       308 Feb  1 06:39 ./slackware64/xap/x11-ssh-askpass-1.2.4.1-x86_64-2.txt
+-rw-r--r--   1 root root     24736 Feb  1 06:39 ./slackware64/xap/x11-ssh-askpass-1.2.4.1-x86_64-2.txz
+-rw-r--r--   1 root root       198 Feb  1 06:39 ./slackware64/xap/x11-ssh-askpass-1.2.4.1-x86_64-2.txz.asc
+-rw-r--r--   1 root root       310 Nov  6  2008 ./slackware64/xap/x3270-3.3.7p8-x86_64-1.txt
+-rw-r--r--   1 root root    508772 Nov  6  2008 ./slackware64/xap/x3270-3.3.7p8-x86_64-1.txz
+-rw-r--r--   1 root root       197 Nov  6  2008 ./slackware64/xap/x3270-3.3.7p8-x86_64-1.txz.asc
+-rw-r--r--   1 root root       420 Oct 16  2010 ./slackware64/xap/xaos-3.5-x86_64-1.txt
+-rw-r--r--   1 root root    514032 Oct 16  2010 ./slackware64/xap/xaos-3.5-x86_64-1.txz
+-rw-r--r--   1 root root       198 Oct 16  2010 ./slackware64/xap/xaos-3.5-x86_64-1.txz.asc
+-rw-r--r--   1 root root       164 Jan 26 17:42 ./slackware64/xap/xchat-2.8.8-x86_64-3.txt
+-rw-r--r--   1 root root   1821744 Jan 26 17:42 ./slackware64/xap/xchat-2.8.8-x86_64-3.txz
+-rw-r--r--   1 root root       198 Jan 26 17:42 ./slackware64/xap/xchat-2.8.8-x86_64-3.txz.asc
+-rw-r--r--   1 root root       309 Mar 29 21:38 ./slackware64/xap/xfce-4.6.2-x86_64-5.txt
+-rw-r--r--   1 root root  12597672 Mar 29 21:38 ./slackware64/xap/xfce-4.6.2-x86_64-5.txz
+-rw-r--r--   1 root root       198 Mar 29 21:38 ./slackware64/xap/xfce-4.6.2-x86_64-5.txz.asc
+-rw-r--r--   1 root root       441 Feb 16 03:44 ./slackware64/xap/xfce4-notifyd-0.1.1-x86_64-1.txt
+-rw-r--r--   1 root root     49248 Feb 16 03:44 ./slackware64/xap/xfce4-notifyd-0.1.1-x86_64-1.txz
+-rw-r--r--   1 root root       198 Feb 16 03:44 ./slackware64/xap/xfce4-notifyd-0.1.1-x86_64-1.txz.asc
+-rw-r--r--   1 root root       472 Mar 13  2010 ./slackware64/xap/xfce4-power-manager-0.8.5-x86_64-1.txt
+-rw-r--r--   1 root root    478920 Mar 13  2010 ./slackware64/xap/xfce4-power-manager-0.8.5-x86_64-1.txz
+-rw-r--r--   1 root root       198 Mar 13  2010 ./slackware64/xap/xfce4-power-manager-0.8.5-x86_64-1.txz.asc
+-rw-r--r--   1 root root       411 Nov  6  2008 ./slackware64/xap/xfractint-20.04p09-x86_64-1.txt
+-rw-r--r--   1 root root    837944 Nov  6  2008 ./slackware64/xap/xfractint-20.04p09-x86_64-1.txz
+-rw-r--r--   1 root root       197 Nov  6  2008 ./slackware64/xap/xfractint-20.04p09-x86_64-1.txz.asc
+-rw-r--r--   1 root root       239 Mar 20 17:31 ./slackware64/xap/xgames-0.3-x86_64-4.txt
+-rw-r--r--   1 root root    114676 Mar 20 17:31 ./slackware64/xap/xgames-0.3-x86_64-4.txz
+-rw-r--r--   1 root root       198 Mar 20 17:31 ./slackware64/xap/xgames-0.3-x86_64-4.txz.asc
+-rw-r--r--   1 root root       468 Nov  6 21:05 ./slackware64/xap/xine-lib-1.1.19-x86_64-1.txt
+-rw-r--r--   1 root root   3642104 Nov  6 21:05 ./slackware64/xap/xine-lib-1.1.19-x86_64-1.txz
+-rw-r--r--   1 root root       198 Nov  6 21:05 ./slackware64/xap/xine-lib-1.1.19-x86_64-1.txz.asc
+-rw-r--r--   1 root root       374 Feb 19  2010 ./slackware64/xap/xine-ui-0.99.5-x86_64-3.txt
+-rw-r--r--   1 root root   1281472 Feb 19  2010 ./slackware64/xap/xine-ui-0.99.5-x86_64-3.txz
+-rw-r--r--   1 root root       197 Feb 19  2010 ./slackware64/xap/xine-ui-0.99.5-x86_64-3.txz.asc
+-rw-r--r--   1 root root       462 Mar 15 22:26 ./slackware64/xap/xlockmore-5.32-x86_64-1.txt
+-rw-r--r--   1 root root   1016612 Mar 15 22:26 ./slackware64/xap/xlockmore-5.32-x86_64-1.txz
+-rw-r--r--   1 root root       198 Mar 15 22:26 ./slackware64/xap/xlockmore-5.32-x86_64-1.txz.asc
+-rw-r--r--   1 root root       379 Mar 25  2010 ./slackware64/xap/xmms-1.2.11-x86_64-4.txt
+-rw-r--r--   1 root root   1153728 Mar 25  2010 ./slackware64/xap/xmms-1.2.11-x86_64-4.txz
+-rw-r--r--   1 root root       198 Mar 25  2010 ./slackware64/xap/xmms-1.2.11-x86_64-4.txz.asc
+-rw-r--r--   1 root root       445 Feb 20  2010 ./slackware64/xap/xpaint-2.8.16-x86_64-1.txt
+-rw-r--r--   1 root root    423688 Feb 20  2010 ./slackware64/xap/xpaint-2.8.16-x86_64-1.txz
+-rw-r--r--   1 root root       197 Feb 20  2010 ./slackware64/xap/xpaint-2.8.16-x86_64-1.txz.asc
+-rw-r--r--   1 root root       188 Mar 31 19:24 ./slackware64/xap/xpdf-3.02pl6-x86_64-3.txt
+-rw-r--r--   1 root root   1489460 Mar 31 19:24 ./slackware64/xap/xpdf-3.02pl6-x86_64-3.txz
+-rw-r--r--   1 root root       198 Mar 31 19:24 ./slackware64/xap/xpdf-3.02pl6-x86_64-3.txz.asc
+-rw-r--r--   1 root root       499 Feb 28 03:41 ./slackware64/xap/xsane-0.998-x86_64-1.txt
+-rw-r--r--   1 root root   1633000 Feb 28 03:41 ./slackware64/xap/xsane-0.998-x86_64-1.txz
+-rw-r--r--   1 root root       198 Feb 28 03:41 ./slackware64/xap/xsane-0.998-x86_64-1.txz.asc
+-rw-r--r--   1 root root       424 Mar 15 22:38 ./slackware64/xap/xscreensaver-5.12-x86_64-1.txt
+-rw-r--r--   1 root root   3481372 Mar 15 22:38 ./slackware64/xap/xscreensaver-5.12-x86_64-1.txz
+-rw-r--r--   1 root root       198 Mar 15 22:38 ./slackware64/xap/xscreensaver-5.12-x86_64-1.txz.asc
+-rw-r--r--   1 root root       235 Feb 19  2010 ./slackware64/xap/xv-3.10a-x86_64-6.txt
+-rw-r--r--   1 root root    939688 Feb 19  2010 ./slackware64/xap/xv-3.10a-x86_64-6.txz
+-rw-r--r--   1 root root       197 Feb 19  2010 ./slackware64/xap/xv-3.10a-x86_64-6.txz.asc
+-rw-r--r--   1 root root       418 Apr  5 00:45 ./slackware64/xap/xxgdb-1.12-x86_64-3.txt
+-rw-r--r--   1 root root     51460 Apr  5 00:45 ./slackware64/xap/xxgdb-1.12-x86_64-3.txz
+-rw-r--r--   1 root root       198 Apr  5 00:45 ./slackware64/xap/xxgdb-1.12-x86_64-3.txz.asc
+drwxr-xr-x   2 root root      4096 May 16  2010 ./slackware64/y
+-rw-r--r--   1 root root       596 May 15  2010 ./slackware64/y/bsd-games-2.13-x86_64-11.txt
+-rw-r--r--   1 root root   1759252 May 15  2010 ./slackware64/y/bsd-games-2.13-x86_64-11.txz
+-rw-r--r--   1 root root       198 May 15  2010 ./slackware64/y/bsd-games-2.13-x86_64-11.txz.asc
+-rwxr-xr-x   1 root root      2897 Jun 24  2009 ./slackware64/y/install-packages
+-rw-r--r--   1 root root       446 Sep 18  2006 ./slackware64/y/install.end
+-rw-r--r--   1 root root      1136 Mar  1  2010 ./slackware64/y/maketag
+-rw-r--r--   1 root root      1136 Mar  1  2010 ./slackware64/y/maketag.ez
+-rw-r--r--   1 root root        14 Mar  1  2010 ./slackware64/y/tagfile
+drwxr-xr-x  19 root root      4096 Apr 25 17:03 ./source
+-rw-r--r--   1 root root    328446 Apr 25 17:03 ./source/CHECKSUMS.md5
+-rw-r--r--   1 root root       198 Apr 25 17:03 ./source/CHECKSUMS.md5.asc
+-rw-r--r--   1 root root    440693 Apr 25 17:01 ./source/FILE_LIST
+-rw-r--r--   1 root root   7155058 Apr 25 17:01 ./source/MANIFEST.bz2
+drwxr-xr-x  96 root root      4096 Apr 17 20:06 ./source/a
+drwxr-xr-x   2 root root      4096 Mar 25 18:37 ./source/a/aaa_base
+-rw-r--r--   1 root root     11053 Mar 25 18:37 ./source/a/aaa_base/_aaa_base.tar.gz
+-rwxr-xr-x   1 root root      2174 Mar 25 18:37 ./source/a/aaa_base/aaa_base.SlackBuild
+-rw-r--r--   1 root root       786 Mar 28  2002 ./source/a/aaa_base/slack-desc
+-rw-r--r--   1 root root        18 Mar 25 18:37 ./source/a/aaa_base/slackware-version
+drwxr-xr-x   2 root root      4096 May 23  2009 ./source/a/aaa_elflibs
+-rwxr-xr-x   1 root root      2617 Apr 22 17:13 ./source/a/aaa_elflibs/aaa_elflibs.SlackBuild
+-rw-r--r--   1 root root      1030 Jun 14  2004 ./source/a/aaa_elflibs/slack-desc
+-rw-r--r--   1 root root      1524 Mar  6 20:00 ./source/a/aaa_elflibs/symlinks-to-tracked-libs
+-rw-r--r--   1 root root       194 Nov  3 17:47 ./source/a/aaa_elflibs/tracked-files
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/a/aaa_terminfo
+-rwxr-xr-x   1 root root      2464 Mar  7 18:01 ./source/a/aaa_terminfo/aaa_terminfo.SlackBuild
+-rw-r--r--   1 root root       968 Jan  2  2007 ./source/a/aaa_terminfo/slack-desc
+drwxr-xr-x   2 root root      4096 Apr 18 18:46 ./source/a/acl
+-rw-r--r--   1 root root    365413 Apr 16 00:05 ./source/a/acl/acl-2.2.50.src.tar.gz
+-rwxr-xr-x   1 root root      3777 Apr 18 18:46 ./source/a/acl/acl.SlackBuild
+-rw-r--r--   1 root root       509 Apr 18 18:42 ./source/a/acl/acl.destdir.diff.gz
+-rw-r--r--   1 root root       870 Apr 18 18:43 ./source/a/acl/slack-desc
+drwxr-xr-x   2 root root      4096 Apr 16 04:07 ./source/a/acpid
+-rw-r--r--   1 root root       224 Feb  5  2004 ./source/a/acpid/acpi_handler.sh.gz
+-rw-r--r--   1 root root     75552 Apr 15 17:36 ./source/a/acpid/acpid-2.0.9.tar.gz
+-rwxr-xr-x   1 root root      2952 Apr 16 04:08 ./source/a/acpid/acpid.SlackBuild
+-rw-r--r--   1 root root       399 May 16  2002 ./source/a/acpid/default.gz
+-rw-r--r--   1 root root       271 Jan 16  2010 ./source/a/acpid/doinst.sh.gz
+-rw-r--r--   1 root root       285 Feb 16  2010 ./source/a/acpid/rc.acpid.gz
+-rw-r--r--   1 root root       927 Apr 16 04:07 ./source/a/acpid/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/a/apmd
+-rw-r--r--   1 root root     61686 Apr 30  2004 ./source/a/apmd/apmd-3.2.2.tar.bz2
+-rwxr-xr-x   1 root root      3572 Apr 11 06:19 ./source/a/apmd/apmd.SlackBuild
+-rw-r--r--   1 root root      1009 Feb 22  2002 ./source/a/apmd/slack-desc
+drwxr-xr-x   2 root root      4096 Apr 18 18:38 ./source/a/attr
+-rw-r--r--   1 root root    318247 Apr 16 00:05 ./source/a/attr/attr-2.4.45.src.tar.gz
+-rw-r--r--   1 root root        72 Apr 16 00:05 ./source/a/attr/attr-2.4.45.src.tar.gz.sig
+-rwxr-xr-x   1 root root      3836 Apr 18 18:39 ./source/a/attr/attr.SlackBuild
+-rw-r--r--   1 root root       514 Apr 18 18:28 ./source/a/attr/attr.destdir.diff.gz
+-rw-r--r--   1 root root        88 Feb 28  2006 ./source/a/attr/build
+-rw-r--r--   1 root root      1063 Apr 18 18:00 ./source/a/attr/slack-desc
+drwxr-xr-x   3 root root      4096 Feb  8  2010 ./source/a/bash
+drwxr-xr-x   2 root root      4096 Mar 10 05:06 ./source/a/bash/bash-4.1-patches
+-rw-r--r--   1 root root      1445 Jan 18  2010 ./source/a/bash/bash-4.1-patches/bash41-001
+-rw-r--r--   1 root root        65 Jan 18  2010 ./source/a/bash/bash-4.1-patches/bash41-001.sig
+-rw-r--r--   1 root root      1799 Jan 18  2010 ./source/a/bash/bash-4.1-patches/bash41-002
+-rw-r--r--   1 root root        65 Jan 18  2010 ./source/a/bash/bash-4.1-patches/bash41-002.sig
+-rw-r--r--   1 root root      1407 Mar 26  2010 ./source/a/bash/bash-4.1-patches/bash41-003
+-rw-r--r--   1 root root        65 Mar 26  2010 ./source/a/bash/bash-4.1-patches/bash41-003.sig
+-rw-r--r--   1 root root      1705 Mar 26  2010 ./source/a/bash/bash-4.1-patches/bash41-004
+-rw-r--r--   1 root root        65 Mar 26  2010 ./source/a/bash/bash-4.1-patches/bash41-004.sig
+-rw-r--r--   1 root root      1626 Mar 26  2010 ./source/a/bash/bash-4.1-patches/bash41-005
+-rw-r--r--   1 root root        65 Mar 26  2010 ./source/a/bash/bash-4.1-patches/bash41-005.sig
+-rw-r--r--   1 root root      2166 May 14  2010 ./source/a/bash/bash-4.1-patches/bash41-006
+-rw-r--r--   1 root root        65 May 14  2010 ./source/a/bash/bash-4.1-patches/bash41-006.sig
+-rw-r--r--   1 root root      1610 May 14  2010 ./source/a/bash/bash-4.1-patches/bash41-007
+-rw-r--r--   1 root root        65 May 14  2010 ./source/a/bash/bash-4.1-patches/bash41-007.sig
+-rw-r--r--   1 root root      1610 Oct  8  2010 ./source/a/bash/bash-4.1-patches/bash41-008
+-rw-r--r--   1 root root        72 Oct  8  2010 ./source/a/bash/bash-4.1-patches/bash41-008.sig
+-rw-r--r--   1 root root      1323 Oct  8  2010 ./source/a/bash/bash-4.1-patches/bash41-009
+-rw-r--r--   1 root root        72 Oct  8  2010 ./source/a/bash/bash-4.1-patches/bash41-009.sig
+-rw-r--r--   1 root root      1801 Feb 25 15:27 ./source/a/bash/bash-4.1-patches/bash41-010
+-rw-r--r--   1 root root        65 Feb 25 15:27 ./source/a/bash/bash-4.1-patches/bash41-010.sig
+-rw-r--r--   1 root root   4012140 Jan  1  2010 ./source/a/bash/bash-4.1.tar.xz
+-rwxr-xr-x   1 root root      4530 Feb  8  2010 ./source/a/bash/bash.SlackBuild
+-rw-r--r--   1 root root       189 Feb 23  2009 ./source/a/bash/doinst.sh.gz
+-rw-r--r--   1 root root       965 Mar 23  2002 ./source/a/bash/slack-desc
+drwxr-xr-x   3 root root      4096 May 19  2009 ./source/a/bin
+-rw-r--r--   1 root root      7275 Dec 30  1994 ./source/a/bin/banners.tar.gz
+-rwxr-xr-x   1 root root      4497 Jul 28  2010 ./source/a/bin/bin.SlackBuild
+-rw-r--r--   1 root root       478 Feb 24  2004 ./source/a/bin/debianutils_2.7.dsc
+-rw-r--r--   1 root root    165590 Feb 24  2004 ./source/a/bin/debianutils_2.7.tar.gz
+-rw-r--r--   1 root root     27721 Oct  7  1999 ./source/a/bin/fbset-2.1.tar.gz
+drwxr-xr-x   2 root root      4096 Dec 23  2006 ./source/a/bin/scripts
+-rw-r--r--   1 root root       195 Feb 21  2002 ./source/a/bin/scripts/diskcopy.gz
+-rw-r--r--   1 root root       595 May  2  1993 ./source/a/bin/scripts/xx.gz
+-rw-r--r--   1 root root       681 Dec 21  2006 ./source/a/bin/slack-desc
+-rw-r--r--   1 root root      2403 Jun 15  1997 ./source/a/bin/todos.tar.gz
+drwxr-xr-x   2 root root      4096 Mar 27 22:24 ./source/a/btrfs-progs
+-rw-r--r--   1 root root    137044 Mar 27 22:24 ./source/a/btrfs-progs/btrfs-progs-20110327.tar.xz
+-rwxr-xr-x   1 root root      4087 Mar 23 00:29 ./source/a/btrfs-progs/btrfs-progs.SlackBuild
+-rw-r--r--   1 root root      1978 Mar 27 22:24 ./source/a/btrfs-progs/fsck.btrfs
+-rw-r--r--   1 root root      1102 Jan 20  2010 ./source/a/btrfs-progs/slack-desc
+drwxr-xr-x   2 root root      4096 Sep 20  2010 ./source/a/bzip2
+-rw-r--r--   1 root root    782025 Sep 20  2010 ./source/a/bzip2/bzip2-1.0.6.tar.gz
+-rwxr-xr-x   1 root root      4034 Sep 20  2010 ./source/a/bzip2/bzip2.SlackBuild
+-rw-r--r--   1 root root       288 Sep 20  2010 ./source/a/bzip2/bzip2.saneso.diff.gz
+-rw-r--r--   1 root root       934 Feb 19  2002 ./source/a/bzip2/slack-desc
+drwxr-xr-x   2 root root      4096 Apr 14 20:28 ./source/a/coreutils
+-rw-r--r--   1 root root      1854 Apr 14 20:27 ./source/a/coreutils/DIR_COLORS.gz
+-rw-r--r--   1 root root   4841952 Apr 13 20:20 ./source/a/coreutils/coreutils-8.11.tar.xz
+-rw-r--r--   1 root root       836 Apr 13 20:20 ./source/a/coreutils/coreutils-8.11.tar.xz.sig
+-rw-r--r--   1 root root       778 Apr 28  2010 ./source/a/coreutils/coreutils-dircolors.csh.gz
+-rw-r--r--   1 root root       931 May 11  2010 ./source/a/coreutils/coreutils-dircolors.sh.gz
+-rwxr-xr-x   1 root root      7036 Nov  4 22:20 ./source/a/coreutils/coreutils.SlackBuild
+-rw-r--r--   1 root root      1610 Sep 15  2009 ./source/a/coreutils/coreutils.uname.diff.gz
+-rw-r--r--   1 root root       270 Feb 23  2009 ./source/a/coreutils/doinst.sh.gz
+-rw-r--r--   1 root root       985 May 20  2003 ./source/a/coreutils/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 11 04:30 ./source/a/cpio
+-rw-r--r--   1 root root    809000 Mar 10  2010 ./source/a/cpio/cpio-2.11.tar.xz
+-rwxr-xr-x   1 root root      4294 Mar 11 04:31 ./source/a/cpio/cpio.SlackBuild
+-rw-r--r--   1 root root       942 Mar 23  2002 ./source/a/cpio/slack-desc
+drwxr-xr-x   2 root root      4096 Feb 25 20:06 ./source/a/cpufrequtils
+-rw-r--r--   1 root root     52186 Jul  5  2010 ./source/a/cpufrequtils/cpufrequtils-008.tar.bz2
+-rw-r--r--   1 root root       248 Jul  5  2010 ./source/a/cpufrequtils/cpufrequtils-008.tar.bz2.sign
+-rwxr-xr-x   1 root root      3298 Mar 11  2010 ./source/a/cpufrequtils/cpufrequtils.SlackBuild
+-rw-r--r--   1 root root      1083 Mar 11  2010 ./source/a/cpufrequtils/slack-desc
+drwxr-xr-x   2 root root      4096 Jan  6 00:29 ./source/a/cryptsetup
+-rw-r--r--   1 root root    523859 Dec 20 11:46 ./source/a/cryptsetup/cryptsetup-1.2.0.tar.bz2
+-rw-r--r--   1 root root       198 Dec 20 11:46 ./source/a/cryptsetup/cryptsetup-1.2.0.tar.bz2.asc
+-rwxr-xr-x   1 root root      4183 Jan  6 00:27 ./source/a/cryptsetup/cryptsetup.SlackBuild
+-rw-r--r--   1 root root      1045 Nov  8 02:48 ./source/a/cryptsetup/slack-desc
+drwxr-xr-x   2 root root      4096 Jan 10 01:06 ./source/a/cups
+-rw-r--r--   1 root root   4517061 Jan  6 22:31 ./source/a/cups/cups-1.4.6-source.tar.bz2
+-rw-r--r--   1 root root    199167 Jan  3  2004 ./source/a/cups/cups-samba-5.0rc3.tar.gz
+-rw-r--r--   1 root root     38284 Apr 19  2006 ./source/a/cups/cups-windows-6.0-source.tar.bz2
+-rwxr-xr-x   1 root root      6729 Jan 10 01:47 ./source/a/cups/cups.SlackBuild
+-rw-r--r--   1 root root      2502 Dec 11 21:24 ./source/a/cups/cups.fix_broken_locking.diff.gz
+-rw-r--r--   1 root root       565 May 17  2010 ./source/a/cups/doinst.sh.gz
+-rw-r--r--   1 root root      1099 Feb  1  2002 ./source/a/cups/slack-desc
+-rw-r--r--   1 root root      5324 Apr 26  2010 ./source/a/cups/usb-backend-both-usblp-and-libusb.dpatch.gz
+drwxr-xr-x   2 root root      4096 Aug 10  2010 ./source/a/cxxlibs
+-rwxr-xr-x   1 root root      2099 Jan  7 06:46 ./source/a/cxxlibs/cxxlibs.SlackBuild
+-rw-r--r--   1 root root       738 Mar 23  2002 ./source/a/cxxlibs/slack-desc
+-rw-r--r--   1 root root       224 Apr  3  2008 ./source/a/cxxlibs/symlinks-to-tracked-libs
+-rw-r--r--   1 root root        52 Jul 24  2009 ./source/a/cxxlibs/symlinks-to-tracked-libs64
+drwxr-xr-x   2 root root      4096 Dec 21 17:00 ./source/a/dbus
+-rw-r--r--   1 root root   1220516 Dec 20 21:42 ./source/a/dbus/dbus-1.4.1.tar.xz
+-rw-r--r--   1 root root       486 Sep 14  2010 ./source/a/dbus/dbus-1.4.x-allow_root_globally.diff.gz
+-rwxr-xr-x   1 root root      3912 Nov  3 19:31 ./source/a/dbus/dbus.SlackBuild
+-rw-r--r--   1 root root       333 Sep 14  2010 ./source/a/dbus/doinst.sh.gz
+-rw-r--r--   1 root root       773 May  1  2010 ./source/a/dbus/rc.messagebus.gz
+-rw-r--r--   1 root root       945 Oct 21  2007 ./source/a/dbus/slack-desc
+drwxr-xr-x   2 root root      4096 Feb 11  2010 ./source/a/dcron
+-rw-r--r--   1 root root       315 Feb 11  2010 ./source/a/dcron/crontab.c.O_EXCL.diff.gz
+-rw-r--r--   1 root root       519 May 30  2009 ./source/a/dcron/crontab.root.gz
+-rw-r--r--   1 root root     36404 Jan 18  2010 ./source/a/dcron/dcron-4.4.tar.gz
+-rwxr-xr-x   1 root root      4105 Feb 11  2010 ./source/a/dcron/dcron.SlackBuild
+-rw-r--r--   1 root root      1054 Feb 11  2010 ./source/a/dcron/dcron.manpage.paths.diff.gz
+-rw-r--r--   1 root root       193 Feb 11  2010 ./source/a/dcron/defs.h.TMPDIR.diff.gz
+-rw-r--r--   1 root root       104 Feb 11  2010 ./source/a/dcron/doinst.sh.gz
+-rw-r--r--   1 root root       699 May 30  2009 ./source/a/dcron/run-parts.8.gz
+-rw-r--r--   1 root root       567 May 30  2009 ./source/a/dcron/run-parts.gz
+-rw-r--r--   1 root root       815 May 30  2009 ./source/a/dcron/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/a/devs
+-rw-r--r--   1 root root     92572 Sep 20  2006 ./source/a/devs/_devs.tar.gz
+-rwxr-xr-x   1 root root      2044 May 19  2009 ./source/a/devs/devs.SlackBuild
+-rw-r--r--   1 root root       423 Jun  9  2002 ./source/a/devs/makedev.hd.diff.gz
+-rw-r--r--   1 root root     27096 Nov 11  2000 ./source/a/devs/makedev_2.3.1-46.2.diff.gz
+-rw-r--r--   1 root root       602 Sep  2  2003 ./source/a/devs/makedev_2.3.1.hd.diff.gz
+-rw-r--r--   1 root root     10037 Sep  7  1998 ./source/a/devs/makedev_2.3.1.orig.tar.gz
+-rw-r--r--   1 root root       262 May 21  2004 ./source/a/devs/makedev_2.3.1.slack.diff.gz
+-rw-r--r--   1 root root       766 Mar 20  2002 ./source/a/devs/slack-desc
+drwxr-xr-x   2 root root      4096 Jul 28  2010 ./source/a/dialog
+-rw-r--r--   1 root root    291512 Apr 29  2010 ./source/a/dialog/dialog-1.1-20100428.tar.xz
+-rwxr-xr-x   1 root root      4166 Apr  4 05:42 ./source/a/dialog/dialog.SlackBuild
+-rw-r--r--   1 root root       334 Apr 23  2009 ./source/a/dialog/dialog.smaller.min.height.diff.gz
+-rw-r--r--   1 root root       970 Jan  2  2007 ./source/a/dialog/slack-desc
+drwxr-xr-x   2 root root      4096 Feb 25 19:44 ./source/a/dosfstools
+-rw-r--r--   1 root root     70039 Dec 24 17:00 ./source/a/dosfstools/dosfstools-3.0.11.tar.bz2
+-rw-r--r--   1 root root       198 Dec 24 17:00 ./source/a/dosfstools/dosfstools-3.0.11.tar.bz2.sign
+-rwxr-xr-x   1 root root      4114 Apr  7 23:13 ./source/a/dosfstools/dosfstools.SlackBuild
+-rw-r--r--   1 root root       332 Feb 25 19:45 ./source/a/dosfstools/dosfstools.paths.diff.gz
+-rw-r--r--   1 root root       742 Dec 21  2006 ./source/a/dosfstools/slack-desc
+drwxr-xr-x   2 root root      4096 Dec 24 23:40 ./source/a/e2fsprogs
+-rw-r--r--   1 root root       325 May 30  2009 ./source/a/e2fsprogs/doinst.sh.gz
+-rw-r--r--   1 root root   3383012 Dec 23 00:03 ./source/a/e2fsprogs/e2fsprogs-1.41.14.tar.xz
+-rwxr-xr-x   1 root root      5019 Aug 24  2010 ./source/a/e2fsprogs/e2fsprogs.SlackBuild
+-rw-r--r--   1 root root       803 May 30  2009 ./source/a/e2fsprogs/slack-desc
+drwxr-xr-x   2 root root      4096 Jul 28  2010 ./source/a/ed
+-rw-r--r--   1 root root     65712 Jul 10  2009 ./source/a/ed/ed-1.4.tar.xz
+-rwxr-xr-x   1 root root      3812 Jul 28  2010 ./source/a/ed/ed.SlackBuild
+-rw-r--r--   1 root root       805 Dec 13  2006 ./source/a/ed/slack-desc
+drwxr-xr-x   2 root root      4096 Jan 25  2010 ./source/a/eject
+-rw-r--r--   1 root root    107301 Jun  4  2006 ./source/a/eject/eject-2.1.5.tar.bz2
+-rwxr-xr-x   1 root root      3501 Jan 25  2010 ./source/a/eject/eject.SlackBuild
+-rw-r--r--   1 root root       883 Jan 25  2010 ./source/a/eject/eject.spaces.diff.gz
+-rw-r--r--   1 root root       886 Dec 14  2006 ./source/a/eject/slack-desc
+drwxr-xr-x   2 root root      4096 Jan 27  2010 ./source/a/elvis
+-rw-r--r--   1 root root   1143603 Oct 21  2003 ./source/a/elvis/elvis-2.2_0.tar.bz2
+-rwxr-xr-x   1 root root      4002 Jan 27  2010 ./source/a/elvis/elvis.SlackBuild
+-rw-r--r--   1 root root      1633 Feb 22  2004 ./source/a/elvis/elvis.clr
+-rw-r--r--   1 root root      1584 Oct 21  2003 ./source/a/elvis/elvis.clr.orig
+-rw-r--r--   1 root root       673 Jan 27  2010 ./source/a/elvis/elvis.ref.c.getline.diff.gz
+-rw-r--r--   1 root root       845 Feb 11  2008 ./source/a/elvis/slack-desc
+drwxr-xr-x   2 root root      4096 Feb  5  2010 ./source/a/etc
+-rw-r--r--   1 root root     34612 Feb  5  2010 ./source/a/etc/_etc.tar.gz
+-rwxr-xr-x   1 root root      2032 Feb  5  2010 ./source/a/etc/etc.SlackBuild
+-rw-r--r--   1 root root       536 Oct 11  2002 ./source/a/etc/nsswitch.conf.gz
+-rw-r--r--   1 root root       657 Mar 23  2002 ./source/a/etc/slack-desc
+-rw-r--r--   1 root root    226973 Mar  2  2000 ./source/a/etc/termcap-BSD.gz
+drwxr-xr-x   2 root root      4096 Jan 18 22:59 ./source/a/file
+-rw-r--r--   1 root root    434260 Jan 17 19:47 ./source/a/file/file-5.05.tar.xz
+-rwxr-xr-x   1 root root      5048 Feb  6  2010 ./source/a/file/file.SlackBuild
+-rw-r--r--   1 root root       195 Feb 23  2009 ./source/a/file/file.crdaregbin.magic.gz
+-rw-r--r--   1 root root       212 Jun 12  2009 ./source/a/file/file.etc.file.diff.gz
+-rw-r--r--   1 root root       336 Feb  9  2009 ./source/a/file/file.quiet.diff.gz
+-rw-r--r--   1 root root       272 Feb  9  2009 ./source/a/file/file.short.diff.gz
+-rw-r--r--   1 root root       248 Apr 23  2009 ./source/a/file/file.xz.magic.gz
+-rw-r--r--   1 root root       214 Sep  7  2005 ./source/a/file/file.zisofs.magic.gz
+-rw-r--r--   1 root root       680 Dec 13  2006 ./source/a/file/slack-desc
+drwxr-xr-x   2 root root      4096 Jun 13  2009 ./source/a/findutils
+-rw-r--r--   1 root root   1114432 Jun  6  2009 ./source/a/findutils/findutils-4.4.2.tar.xz
+-rwxr-xr-x   1 root root      3850 Jul 28  2010 ./source/a/findutils/findutils.SlackBuild
+-rw-r--r--   1 root root       186 Feb 21  2009 ./source/a/findutils/findutils.no.default.options.warnings.diff.gz
+-rw-r--r--   1 root root       359 Feb 21  2009 ./source/a/findutils/findutils.nolocate.diff.gz
+-rw-r--r--   1 root root       828 Apr  7  2002 ./source/a/findutils/slack-desc
+drwxr-xr-x   2 root root      4096 May 23  2009 ./source/a/floppy
+-rw-r--r--   1 root root     25310 May  1  2002 ./source/a/floppy/fdutils-5.4-20020222.diff.gz
+-rw-r--r--   1 root root    190535 Feb  4  2001 ./source/a/floppy/fdutils-5.4.tar.gz
+-rw-r--r--   1 root root       182 Feb  4  2001 ./source/a/floppy/fdutils.mediaprm.diff.gz
+-rwxr-xr-x   1 root root      3661 Jul 28  2010 ./source/a/floppy/floppy.SlackBuild
+-rw-r--r--   1 root root     11298 May  1  2002 ./source/a/floppy/mediaprm
+-rw-r--r--   1 root root    286730 May 27  2001 ./source/a/floppy/mtools-3.9.8.tar.gz
+-rw-r--r--   1 root root      1914 Feb  4  2001 ./source/a/floppy/mtools.conf
+-rw-r--r--   1 root root       728 Mar 23  2002 ./source/a/floppy/slack-desc
+drwxr-xr-x   2 root root      4096 May  9  2010 ./source/a/gawk
+-rw-r--r--   1 root root   1523944 May  7  2010 ./source/a/gawk/gawk-3.1.8.tar.xz
+-rwxr-xr-x   1 root root      3742 May  9  2010 ./source/a/gawk/gawk.SlackBuild
+-rw-r--r--   1 root root      1043 Mar 23  2002 ./source/a/gawk/slack-desc
+drwxr-xr-x   2 root root      4096 Mar  2 21:35 ./source/a/gdisk
+-rw-r--r--   1 root root     97576 Jan  8 23:35 ./source/a/gdisk/gdisk-0.6.14.tar.xz
+-rwxr-xr-x   1 root root      3465 Mar  2 21:35 ./source/a/gdisk/gdisk.SlackBuild
+-rw-r--r--   1 root root       894 Mar  2 21:28 ./source/a/gdisk/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/a/genpower
+-rw-r--r--   1 root root     66728 Jan  4  2005 ./source/a/genpower/genpower-1.0.5.tar.gz
+-rwxr-xr-x   1 root root      3352 Jul 28  2010 ./source/a/genpower/genpower.SlackBuild
+-rw-r--r--   1 root root       514 Dec  3  2008 ./source/a/genpower/genpower.halt.diff.gz
+-rw-r--r--   1 root root       460 Apr 11  2002 ./source/a/genpower/genpower.var.diff.gz
+-rw-r--r--   1 root root       957 Apr 11  2002 ./source/a/genpower/slack-desc
+drwxr-xr-x   2 root root      4096 Jul 14  2010 ./source/a/gettext
+-rw-r--r--   1 root root  11941176 Jun  6  2010 ./source/a/gettext/gettext-0.18.1.1.tar.bz2
+-rwxr-xr-x   1 root root      3601 Jul 14  2010 ./source/a/gettext/gettext-tools.SlackBuild
+-rwxr-xr-x   1 root root      3336 Jul 14  2010 ./source/a/gettext/gettext.SlackBuild
+-rw-r--r--   1 root root       737 Feb 11  2008 ./source/a/gettext/slack-desc
+-rw-r--r--   1 root root      1093 Feb 11  2008 ./source/a/gettext/slack-desc.gettext-tools
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/a/getty-ps
+-rwxr-xr-x   1 root root      2942 Jul 28  2010 ./source/a/getty-ps/getty-ps.SlackBuild
+-rw-r--r--   1 root root      3609 Jul 21  2005 ./source/a/getty-ps/getty.bugfixes.diff.gz
+-rw-r--r--   1 root root      1223 Oct  4  2002 ./source/a/getty-ps/getty_ps-2.1.0.lsm
+-rw-r--r--   1 root root    117414 Jul 21  2005 ./source/a/getty-ps/getty_ps-2.1.0b.tar.gz
+-rw-r--r--   1 root root       969 Feb 11  2008 ./source/a/getty-ps/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/a/gpm
+-rw-r--r--   1 root root       344 Oct 13  2004 ./source/a/gpm/gpm-1.20.1-consolename.patch.gz
+-rw-r--r--   1 root root       404 Sep  9  2004 ./source/a/gpm/gpm-1.20.1-gpmopen.patch.gz
+-rw-r--r--   1 root root       274 Sep  9  2004 ./source/a/gpm/gpm-1.20.1-idie.patch.gz
+-rw-r--r--   1 root root       289 Dec 12  2006 ./source/a/gpm/gpm-1.20.1-input-defines.diff.gz
+-rw-r--r--   1 root root       301 Sep 23  2004 ./source/a/gpm/gpm-1.20.1-input.patch.gz
+-rw-r--r--   1 root root       362 Jan 18  2006 ./source/a/gpm/gpm-1.20.1-lib-silent.patch.gz
+-rw-r--r--   1 root root       294 Sep  9  2004 ./source/a/gpm/gpm-1.20.1-math.patch.gz
+-rw-r--r--   1 root root       791 Oct 20  2004 ./source/a/gpm/gpm-1.20.1-multilib.patch.gz
+-rw-r--r--   1 root root       356 Jan 18  2006 ./source/a/gpm/gpm-1.20.1-no-console-error.patch.gz
+-rw-r--r--   1 root root       249 Oct 13  2004 ./source/a/gpm/gpm-1.20.1-nodebug.patch.gz
+-rw-r--r--   1 root root       237 Sep  9  2004 ./source/a/gpm/gpm-1.20.1-subscript.patch.gz
+-rw-r--r--   1 root root       515 Sep  9  2004 ./source/a/gpm/gpm-1.20.1-weak-wgetch.patch.gz
+-rw-r--r--   1 root root       651 Aug 20  2006 ./source/a/gpm/gpm-1.20.1.send-noise-to-syslogs.diff.gz
+-rw-r--r--   1 root root    565014 Jun 25  2004 ./source/a/gpm/gpm-1.20.1.tar.bz2
+-rw-r--r--   1 root root     59408 Sep  9  2004 ./source/a/gpm/gpm-evdev-cumulative.patch.gz
+-rwxr-xr-x   1 root root      5750 Jul 28  2010 ./source/a/gpm/gpm.SlackBuild
+-rw-r--r--   1 root root       285 Feb  7  2006 ./source/a/gpm/gpm.evdevmakefile.patch.gz
+-rw-r--r--   1 root root      4268 Sep  9  2004 ./source/a/gpm/inputattach.c.gz
+-rw-r--r--   1 root root       168 Apr 15  2001 ./source/a/gpm/mouseconfig.gz
+-rw-r--r--   1 root root      2117 Mar 15  2008 ./source/a/gpm/setup.mouse.gz
+-rw-r--r--   1 root root       965 May 29  2002 ./source/a/gpm/slack-desc
+drwxr-xr-x   2 root root      4096 Oct 28 17:28 ./source/a/grep
+-rw-r--r--   1 root root    924276 Sep 20  2010 ./source/a/grep/grep-2.7.tar.xz
+-rw-r--r--   1 root root       836 Sep 20  2010 ./source/a/grep/grep-2.7.tar.xz.sig
+-rwxr-xr-x   1 root root      3703 Oct 28 17:28 ./source/a/grep/grep.SlackBuild
+-rw-r--r--   1 root root       747 Apr  2  2002 ./source/a/grep/slack-desc
+drwxr-xr-x   2 root root      4096 Feb  9  2010 ./source/a/gzip
+-rw-r--r--   1 root root    618124 Jan 20  2010 ./source/a/gzip/gzip-1.4.tar.xz
+-rw-r--r--   1 root root       836 Jan 20  2010 ./source/a/gzip/gzip-1.4.tar.xz.sig
+-rwxr-xr-x   1 root root      4934 Feb  9  2010 ./source/a/gzip/gzip.SlackBuild
+-rw-r--r--   1 root root       770 Mar 23  2002 ./source/a/gzip/slack-desc
+drwxr-xr-x   2 root root      4096 Jan 26 23:02 ./source/a/hdparm
+-rw-r--r--   1 root root    122062 Jan 24 15:17 ./source/a/hdparm/hdparm-9.37.tar.gz
+-rwxr-xr-x   1 root root      2886 Jul 28  2010 ./source/a/hdparm/hdparm.SlackBuild
+-rw-r--r--   1 root root       805 Feb 22  2002 ./source/a/hdparm/slack-desc
+drwxr-xr-x   2 root root      4096 Aug 24  2009 ./source/a/infozip
+-rwxr-xr-x   1 root root      3434 Jul 28  2010 ./source/a/infozip/infozip.SlackBuild
+-rw-r--r--   1 root root       924 Mar 29  2002 ./source/a/infozip/slack-desc
+-rw-r--r--   1 root root    882180 Jan  2  2009 ./source/a/infozip/unzip60.tar.xz
+-rw-r--r--   1 root root    775420 Jul  5  2008 ./source/a/infozip/zip30.tar.xz
+drwxr-xr-x   2 root root      4096 May  8  2010 ./source/a/inotify-tools
+-rw-r--r--   1 root root    243384 Mar 14  2010 ./source/a/inotify-tools/inotify-tools-3.14.tar.xz
+-rwxr-xr-x   1 root root      3972 May  8  2010 ./source/a/inotify-tools/inotify-tools.SlackBuild
+-rw-r--r--   1 root root       977 Feb 11  2008 ./source/a/inotify-tools/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 29 19:00 ./source/a/jfsutils
+-rw-r--r--   1 root root    374892 Mar  4 19:26 ./source/a/jfsutils/jfsutils-1.1.15.tar.xz
+-rwxr-xr-x   1 root root      3694 Mar 29 19:01 ./source/a/jfsutils/jfsutils.SlackBuild
+-rw-r--r--   1 root root       998 Feb 16  2003 ./source/a/jfsutils/slack-desc
+drwxr-xr-x   3 root root      4096 Apr 29  2010 ./source/a/kbd
+-rwxr-xr-x   1 root root      7076 Apr 29  2010 ./source/a/kbd/kbd.SlackBuild
+-rw-r--r--   1 root root     11717 Apr 29  2010 ./source/a/kbd/setconsolefont
+-rw-r--r--   1 root root       283 May 14  2009 ./source/a/kbd/setup.setconsolefont
+-rw-r--r--   1 root root       919 Feb 27  2003 ./source/a/kbd/slack-desc
+drwxr-xr-x   2 root root      4096 Apr 29  2010 ./source/a/kbd/sources
+-rw-r--r--   1 root root     24797 May 26  2001 ./source/a/kbd/sources/extraf.tgz
+-rw-r--r--   1 root root       960 Jan  8  2009 ./source/a/kbd/sources/kbd-1.15-keycodes-man.patch.gz
+-rw-r--r--   1 root root       270 Jan  8  2009 ./source/a/kbd/sources/kbd-1.15-resizecon-x86_64.patch.gz
+-rw-r--r--   1 root root       399 Aug 25  2009 ./source/a/kbd/sources/kbd-1.15-unicode_start.patch.gz
+-rw-r--r--   1 root root       213 Apr 29  2010 ./source/a/kbd/sources/kbd-1.15.2-po.patch.gz
+-rw-r--r--   1 root root   1040140 Apr 10  2010 ./source/a/kbd/sources/kbd-1.15.2.tar.bz2
+-rw-r--r--   1 root root       248 Apr 10  2010 ./source/a/kbd/sources/kbd-1.15.2.tar.bz2.sign
+-rw-r--r--   1 root root      4291 Oct 15  2007 ./source/a/kbd/sources/kbd-latarcyrheb-16-fixed.tar.bz2
+-rw-r--r--   1 root root      6155 Sep 29  2006 ./source/a/kbd/sources/kbd-latsun-fonts.tar.bz2
+-rw-r--r--   1 root root       224 May 30  2004 ./source/a/kbd/sources/nl.euro.diff.gz
+-rw-r--r--   1 root root      2338 Nov 14  2007 ./source/a/kbd/sources/ro_maps.tar.bz2
+-rw-r--r--   1 root root      3543 May 24  2002 ./source/a/kbd/sources/speakup-jfw.tar.gz
+-rw-r--r--   1 root root      2246 Oct  5  2001 ./source/a/kbd/sources/speakupmap.map.gz
+drwxr-xr-x   2 root root      4096 Apr 11 23:07 ./source/a/less
+-rw-r--r--   1 root root    234588 Apr 10 06:05 ./source/a/less/less-443.tar.xz
+-rwxr-xr-x   1 root root      3397 Feb  9  2010 ./source/a/less/less.SlackBuild
+-rw-r--r--   1 root root       313 May 28  2002 ./source/a/less/less.sysconfdir.diff.gz
+-rw-r--r--   1 root root      1355 Nov  5  2009 ./source/a/less/lesspipe.sh.gz
+-rw-r--r--   1 root root       841 Mar 23  2002 ./source/a/less/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/a/lha
+-rw-r--r--   1 root root     64608 Dec 15  2000 ./source/a/lha/lha-114i.tar.gz
+-rwxr-xr-x   1 root root      2808 Jul 28  2010 ./source/a/lha/lha.SlackBuild
+-rw-r--r--   1 root root     45132 Dec 13  2006 ./source/a/lha/lha_1.14i-10.1.diff.gz
+-rw-r--r--   1 root root       606 Dec 23  2006 ./source/a/lha/slack-desc
+drwxr-xr-x   2 root root      4096 Mar  3 20:23 ./source/a/libcgroup
+-rw-r--r--   1 root root       513 Jan 10 20:23 ./source/a/libcgroup/doinst.sh.gz
+-rw-r--r--   1 root root    369988 Mar  3 08:33 ./source/a/libcgroup/libcgroup-0.37.1.tar.xz
+-rwxr-xr-x   1 root root      4867 Mar  3 18:41 ./source/a/libcgroup/libcgroup.SlackBuild
+-rw-r--r--   1 root root       282 Jan 10 20:16 ./source/a/libcgroup/libcgroup.conf.diff.gz
+-rw-r--r--   1 root root      1260 Mar  3 20:23 ./source/a/libcgroup/libcgroup.init.diff.gz
+-rw-r--r--   1 root root      1057 Jan 10 19:23 ./source/a/libcgroup/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 27 06:14 ./source/a/lilo
+-rw-r--r--   1 root root    437555 Feb 19  2007 ./source/a/lilo/lilo-22.8.src.tar.gz
+-rw-r--r--   1 root root       536 Feb 19  2007 ./source/a/lilo/lilo-22.8.src.tar.gz.sig
+-rwxr-xr-x   1 root root      3232 Mar 27 05:57 ./source/a/lilo/lilo.SlackBuild
+-rw-r--r--   1 root root       709 Dec 18  2009 ./source/a/lilo/lilo.use_major_minor_instead_lvm_name.diff.gz
+-rw-r--r--   1 root root     39716 Mar 27 06:53 ./source/a/lilo/liloconfig
+-rw-r--r--   1 root root       105 Mar  9  2002 ./source/a/lilo/setup.liloconfig
+-rw-r--r--   1 root root     14406 Mar 27 05:51 ./source/a/lilo/sl1337.bmp
+-rw-r--r--   1 root root      1045 Mar 23  2002 ./source/a/lilo/slack-desc
+-rw-r--r--   1 root root     14174 Feb 15  2010 ./source/a/lilo/slack.bmp
+-rw-r--r--   1 root root       133 Feb 22  2008 ./source/a/lilo/slack.dat
+-rw-r--r--   1 root root     15634 Mar 27 05:32 ./source/a/lilo/slack64.bmp
+-rw-r--r--   1 root root      3331 Jul  8  1994 ./source/a/lilo/text.lilohelp
+drwxr-xr-x   2 root root      4096 Feb 12  2010 ./source/a/logrotate
+-rw-r--r--   1 root root       268 May 30  2009 ./source/a/logrotate/doinst.sh.gz
+-rw-r--r--   1 root root     37716 May 30  2009 ./source/a/logrotate/logrotate-3.7.8.tar.xz
+-rwxr-xr-x   1 root root      3243 Feb 12  2010 ./source/a/logrotate/logrotate.SlackBuild
+-rw-r--r--   1 root root       645 May 30  2009 ./source/a/logrotate/logrotate.conf.gz
+-rw-r--r--   1 root root       131 May 30  2009 ./source/a/logrotate/logrotate.cron.gz
+-rw-r--r--   1 root root      1076 May 30  2009 ./source/a/logrotate/logrotate.slackware.diff.gz
+-rw-r--r--   1 root root       993 May 30  2009 ./source/a/logrotate/slack-desc
+drwxr-xr-x   2 root root      4096 Apr 17 20:11 ./source/a/lrzip
+-rw-r--r--   1 root root       266 Apr 17 20:11 ./source/a/lrzip/doinst.sh.gz
+-rw-r--r--   1 root root    345788 Apr 13 05:35 ./source/a/lrzip/lrzip-0.602.tar.xz
+-rwxr-xr-x   1 root root      3967 Apr 17 20:12 ./source/a/lrzip/lrzip.SlackBuild
+-rw-r--r--   1 root root       904 Apr 17 20:04 ./source/a/lrzip/slack-desc
+drwxr-xr-x   2 root root      4096 Feb 10 02:24 ./source/a/lvm2
+-rw-r--r--   1 root root    725804 Feb  9 12:09 ./source/a/lvm2/LVM2.2.02.84.tar.xz
+-rw-r--r--   1 root root       478 Feb 10 02:23 ./source/a/lvm2/build_with_udev_165_and_later.diff.gz
+-rw-r--r--   1 root root       271 Oct  6  2008 ./source/a/lvm2/doinst.sh.gz
+-rwxr-xr-x   1 root root      4456 Feb  9 05:55 ./source/a/lvm2/lvm2.SlackBuild
+-rw-r--r--   1 root root      1012 Feb  8  2008 ./source/a/lvm2/slack-desc
+drwxr-xr-x   2 root root      4096 Sep 27  2010 ./source/a/mcelog
+-rw-r--r--   1 root root       355 Sep 27  2010 ./source/a/mcelog/doinst.sh.gz
+-rw-r--r--   1 root root    167285 Jan 21  2010 ./source/a/mcelog/mcelog-1.0pre3.tar.bz2
+-rw-r--r--   1 root root       248 Jan 21  2010 ./source/a/mcelog/mcelog-1.0pre3.tar.bz2.sign
+-rwxr-xr-x   1 root root      2964 Sep 27  2010 ./source/a/mcelog/mcelog.SlackBuild
+-rw-r--r--   1 root root       712 Sep 27  2010 ./source/a/mcelog/mcelog.init.diff.gz
+-rw-r--r--   1 root root      1044 Sep 27  2010 ./source/a/mcelog/slack-desc
+drwxr-xr-x   2 root root      4096 Apr  7 03:19 ./source/a/mdadm
+-rw-r--r--   1 root root       261 May 27  2004 ./source/a/mdadm/doinst.sh.gz
+-rw-r--r--   1 root root    292709 Mar 23 04:51 ./source/a/mdadm/mdadm-3.1.5.tar.bz2
+-rw-r--r--   1 root root       249 Mar 23 04:51 ./source/a/mdadm/mdadm-3.1.5.tar.bz2.sign
+-rwxr-xr-x   1 root root      2931 Apr  7 03:19 ./source/a/mdadm/mdadm.SlackBuild
+-rw-r--r--   1 root root       258 May 17  2010 ./source/a/mdadm/mdadm.static.diff.gz
+-rw-r--r--   1 root root       928 May 27  2004 ./source/a/mdadm/slack-desc
+drwxr-xr-x   2 root root      4096 Feb  1 23:54 ./source/a/minicom
+-rw-r--r--   1 root root       503 Sep 30  2008 ./source/a/minicom/config.sub-x86_64.diff.gz
+-rw-r--r--   1 root root       290 Feb  1 21:44 ./source/a/minicom/doinst.sh.gz
+-rw-r--r--   1 root root     30271 Nov 23  2009 ./source/a/minicom/lrzsz_0.12.21-5.diff.gz
+-rw-r--r--   1 root root    287790 Sep 19  1999 ./source/a/minicom/lrzsz_0.12.21.orig.tar.gz
+-rw-r--r--   1 root root    822499 Feb  1 21:16 ./source/a/minicom/minicom-2.5.tar.gz
+-rwxr-xr-x   1 root root      4969 Feb  9 20:28 ./source/a/minicom/minicom.SlackBuild
+-rw-r--r--   1 root root       570 Sep  4  2004 ./source/a/minicom/minicom.users.gz
+-rw-r--r--   1 root root       781 Mar 29  2002 ./source/a/minicom/slack-desc
+drwxr-xr-x   2 root root      4096 Apr  5 04:36 ./source/a/mkinitrd
+-rw-r--r--   1 root root      3644 Apr  7 11:02 ./source/a/mkinitrd/README.initrd
+-rw-r--r--   1 root root      2475 Jul 12  2010 ./source/a/mkinitrd/_initrd-tree.tar.gz
+-rw-r--r--   1 root root   1884368 Mar 13 01:48 ./source/a/mkinitrd/busybox-1.18.4.tar.xz
+-rw-r--r--   1 root root     24220 Mar 26 04:08 ./source/a/mkinitrd/busybox-dot-config
+-rw-r--r--   1 root root     21604 Dec 18  2009 ./source/a/mkinitrd/busybox-dot-config.1.15.x
+-rw-r--r--   1 root root     23672 Feb 28 03:49 ./source/a/mkinitrd/busybox-dot-config.1.17.x
+-rwxr-xr-x   1 root root     10211 Mar 21 23:04 ./source/a/mkinitrd/init
+-rw-r--r--   1 root root     29903 Dec 18  2009 ./source/a/mkinitrd/keymaps.tar.gz
+-rw-r--r--   1 root root     21254 Apr  5 04:36 ./source/a/mkinitrd/mkinitrd
+-rw-r--r--   1 root root      7669 Mar 27  2010 ./source/a/mkinitrd/mkinitrd.8
+-rwxr-xr-x   1 root root      5043 Apr  5 04:37 ./source/a/mkinitrd/mkinitrd.SlackBuild
+-rw-r--r--   1 root root      5898 Aug 29  2010 ./source/a/mkinitrd/mkinitrd.conf.5
+-rw-r--r--   1 root root       415 Aug 29  2010 ./source/a/mkinitrd/mkinitrd.conf.sample
+-rw-r--r--   1 root root     27921 Feb 17 09:27 ./source/a/mkinitrd/mkinitrd_command_generator.sh
+-rw-r--r--   1 root root       988 Dec 18  2009 ./source/a/mkinitrd/slack-desc
+drwxr-xr-x   2 root root      4096 Nov 16 22:03 ./source/a/module-init-tools
+-rw-r--r--   1 root root       130 Nov 16 22:03 ./source/a/module-init-tools/doinst.sh.gz
+-rw-r--r--   1 root root       676 Jun  8  2010 ./source/a/module-init-tools/modprobe.ignore_some_suffixes.diff.gz
+-rw-r--r--   1 root root    938086 Jun  7  2010 ./source/a/module-init-tools/module-init-tools-3.12.tar.bz2
+-rwxr-xr-x   1 root root      3632 Nov 16 22:04 ./source/a/module-init-tools/module-init-tools.SlackBuild
+-rw-r--r--   1 root root       857 May 30  2009 ./source/a/module-init-tools/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/a/mt-st
+-rw-r--r--   1 root root       375 May 15  2007 ./source/a/mt-st/_mt-st.tar.gz
+-rw-r--r--   1 root root     36537 Aug 21  2005 ./source/a/mt-st/mt-st-0.9b.tar.gz
+-rwxr-xr-x   1 root root      2977 Jul 28  2010 ./source/a/mt-st/mt-st.SlackBuild
+-rw-r--r--   1 root root       949 Apr  7  2005 ./source/a/mt-st/mt-st.config.diff.gz
+-rw-r--r--   1 root root       358 Oct 25  2005 ./source/a/mt-st/mt-st.man.diff.gz
+-rw-r--r--   1 root root       236 Sep  9  2004 ./source/a/mt-st/mt-st.sdlt.diff.gz
+-rw-r--r--   1 root root       943 Feb 24  2002 ./source/a/mt-st/slack-desc
+drwxr-xr-x   2 root root      4096 Jul 28  2010 ./source/a/mtx
+-rw-r--r--   1 root root    235214 Feb 15  2009 ./source/a/mtx/mtx-1.3.12.tar.gz
+-rwxr-xr-x   1 root root      3021 Jul 28  2010 ./source/a/mtx/mtx.SlackBuild
+-rw-r--r--   1 root root       854 Jan 25  2007 ./source/a/mtx/slack-desc
+drwxr-xr-x   2 root root      4096 Jul 28  2010 ./source/a/ncompress
+-rw-r--r--   1 root root     32473 Jan 29  2010 ./source/a/ncompress/ncompress-4.2.4.3.tar.gz
+-rwxr-xr-x   1 root root      2865 Jul 28  2010 ./source/a/ncompress/ncompress.SlackBuild
+-rw-r--r--   1 root root      1020 Dec 14  2006 ./source/a/ncompress/slack-desc
+drwxr-xr-x   2 root root      4096 Jan 24 03:03 ./source/a/ntfs-3g
+-rw-r--r--   1 root root      2067 Jan 18  2010 ./source/a/ntfs-3g/10-ntfs-3g-policy.fdi
+-rw-r--r--   1 root root    559952 Jan 15 10:53 ./source/a/ntfs-3g/ntfs-3g-2011.1.15.tar.xz
+-rwxr-xr-x   1 root root      4082 Aug 14  2010 ./source/a/ntfs-3g/ntfs-3g.SlackBuild
+-rw-r--r--   1 root root      1003 Mar 15  2008 ./source/a/ntfs-3g/slack-desc
+drwxr-xr-x   2 root root      4096 Jul 28  2010 ./source/a/patch
+-rw-r--r--   1 root root    239408 Dec 30  2009 ./source/a/patch/patch-2.6.1.tar.xz
+-rw-r--r--   1 root root       198 Dec 30  2009 ./source/a/patch/patch-2.6.1.tar.xz.sig
+-rwxr-xr-x   1 root root      3454 Jul 28  2010 ./source/a/patch/patch.SlackBuild
+-rw-r--r--   1 root root      1020 Dec 14  2006 ./source/a/patch/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 14 17:14 ./source/a/pciutils
+-rw-r--r--   1 root root    249428 Jan 31  2010 ./source/a/pciutils/pciutils-3.1.7.tar.xz
+-rwxr-xr-x   1 root root      3525 Feb  9  2010 ./source/a/pciutils/pciutils.SlackBuild
+-rw-r--r--   1 root root       306 Jul 29  2009 ./source/a/pciutils/pciutils.ids.dest.diff.gz
+-rw-r--r--   1 root root        92 Apr  1  2008 ./source/a/pciutils/pciutils.url
+-rw-r--r--   1 root root       895 Dec 19  2006 ./source/a/pciutils/slack-desc
+drwxr-xr-x   3 root root      4096 Feb 27 21:33 ./source/a/pcmciautils
+-rw-r--r--   1 root root      1429 Mar 16  2007 ./source/a/pcmciautils/cis-cs-3.2.8.tar.gz
+drwxr-xr-x   2 root root      4096 Sep 12  2008 ./source/a/pcmciautils/config
+-rw-r--r--   1 root root       926 Mar 16  2007 ./source/a/pcmciautils/config/60-pcmcia.rules
+-rw-r--r--   1 root root      2577 Mar  5  2008 ./source/a/pcmciautils/config/config.opts
+-rwxr-xr-x   1 root root      1722 Mar 16  2007 ./source/a/pcmciautils/config/rc.pcmcia
+-rw-r--r--   1 root root       277 Apr 14  2009 ./source/a/pcmciautils/doinst.sh.gz
+-rw-r--r--   1 root root     43721 Jan  6  2010 ./source/a/pcmciautils/pcmciautils-017.tar.bz2
+-rw-r--r--   1 root root       248 Jan  6  2010 ./source/a/pcmciautils/pcmciautils-017.tar.sign
+-rwxr-xr-x   1 root root      3871 Feb 27 21:40 ./source/a/pcmciautils/pcmciautils.SlackBuild
+-rw-r--r--   1 root root       914 Apr 14  2009 ./source/a/pcmciautils/slack-desc
+drwxr-xr-x   5 root root      4096 Mar  7 18:47 ./source/a/pkgtools
+drwxr-xr-x   2 root root      4096 Apr 11  2009 ./source/a/pkgtools/manpages
+-rw-r--r--   1 root root      1256 Apr 11  2009 ./source/a/pkgtools/manpages/explodepkg.8
+-rw-r--r--   1 root root      3065 Mar 18 21:22 ./source/a/pkgtools/manpages/installpkg.8
+-rw-r--r--   1 root root      4557 Apr 11  2009 ./source/a/pkgtools/manpages/makepkg.8
+-rw-r--r--   1 root root      2518 Apr 11  2009 ./source/a/pkgtools/manpages/pkgtool.8
+-rw-r--r--   1 root root      3080 Apr 11  2009 ./source/a/pkgtools/manpages/removepkg.8
+-rw-r--r--   1 root root      3199 Jun  7  2001 ./source/a/pkgtools/manpages/setup.8-deprecated
+-rw-r--r--   1 root root      2665 Apr 11  2009 ./source/a/pkgtools/manpages/upgradepkg.8
+drwxr-xr-x   2 root root      4096 Apr 19  2008 ./source/a/pkgtools/obsolete-scripts
+-rw-r--r--   1 root root       155 Apr 19  2008 ./source/a/pkgtools/obsolete-scripts/README
+-rw-r--r--   1 root root      1326 Feb 16  2003 ./source/a/pkgtools/obsolete-scripts/setup.90.modem-device
+-rwxr-xr-x   1 root root      2496 Apr 22 20:51 ./source/a/pkgtools/pkgtools.SlackBuild
+drwxr-xr-x   2 root root      4096 Mar 18 21:19 ./source/a/pkgtools/scripts
+-rw-r--r--   1 root root      3169 May 11  2010 ./source/a/pkgtools/scripts/explodepkg
+-rw-r--r--   1 root root     20490 Apr 22 20:50 ./source/a/pkgtools/scripts/installpkg
+-rw-r--r--   1 root root     13749 Apr  6  2009 ./source/a/pkgtools/scripts/makebootdisk
+-rw-r--r--   1 root root     11315 Jun  2  2009 ./source/a/pkgtools/scripts/makepkg
+-rw-r--r--   1 root root     22665 Mar  7 18:14 ./source/a/pkgtools/scripts/pkgtool
+-rw-r--r--   1 root root     14048 Apr 28  2009 ./source/a/pkgtools/scripts/removepkg
+-rw-r--r--   1 root root       170 Feb 16  2003 ./source/a/pkgtools/scripts/setup.70.install-kernel
+-rw-r--r--   1 root root      6356 Mar 18  2008 ./source/a/pkgtools/scripts/setup.80.make-bootdisk
+-rw-r--r--   1 root root      1070 Jun 27  2007 ./source/a/pkgtools/scripts/setup.htmlview
+-rw-r--r--   1 root root      7421 Mar 19  2008 ./source/a/pkgtools/scripts/setup.services
+-rw-r--r--   1 root root     12135 May 11  2010 ./source/a/pkgtools/scripts/upgradepkg
+-rw-r--r--   1 root root      1083 Mar 23  2002 ./source/a/pkgtools/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 29 18:34 ./source/a/procps
+-rw-r--r--   1 root root     24365 Mar  2  2001 ./source/a/procps/procinfo-18.tar.gz
+-rw-r--r--   1 root root       213 Feb  7  2003 ./source/a/procps/procinfo.gcc3.diff.gz
+-rw-r--r--   1 root root       504 Mar  2  2001 ./source/a/procps/procinfo.lsm
+-rw-r--r--   1 root root      1056 Mar 28 16:20 ./source/a/procps/procps-3.2.7-ps-cgroup.patch.gz
+-rw-r--r--   1 root root       824 Sep 19  2008 ./source/a/procps/procps-3.2.7-ps-eip64.diff.gz
+-rw-r--r--   1 root root       513 Mar 28 16:21 ./source/a/procps/procps-3.2.8-ps-cgroup-suppress-root-group.patch.gz
+-rw-r--r--   1 root root    217784 May 10  2009 ./source/a/procps/procps-3.2.8.tar.xz
+-rw-r--r--   1 root root       596 Mar 29 18:34 ./source/a/procps/procps-3.2.8.unknown.hz.value.diff.gz
+-rwxr-xr-x   1 root root      6745 Mar 29 18:38 ./source/a/procps/procps.SlackBuild
+-rw-r--r--   1 root root       854 Aug 17  2004 ./source/a/procps/procps.nowarning.diff.gz
+-rw-r--r--   1 root root       182 Feb  2  2003 ./source/a/procps/procps.w.showfrom.diff.gz
+-rw-r--r--   1 root root    245676 Sep  6  2010 ./source/a/procps/psmisc-22.13.tar.xz
+-rw-r--r--   1 root root       739 May 27  2004 ./source/a/procps/slack-desc
+drwxr-xr-x   2 root root      4096 Jun 22  2009 ./source/a/quota
+-rw-r--r--   1 root root    216356 Jan  5  2009 ./source/a/quota/quota-3.17.tar.xz
+-rwxr-xr-x   1 root root      3814 Jul 28  2010 ./source/a/quota/quota.SlackBuild
+-rw-r--r--   1 root root       980 Mar 31  2002 ./source/a/quota/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/a/reiserfsprogs
+-rw-r--r--   1 root root    324847 Jan 12  2009 ./source/a/reiserfsprogs/reiserfsprogs-3.6.21.tar.bz2
+-rwxr-xr-x   1 root root      3783 Jul 28  2010 ./source/a/reiserfsprogs/reiserfsprogs.SlackBuild
+-rw-r--r--   1 root root       940 Feb 11  2008 ./source/a/reiserfsprogs/slack-desc
+drwxr-xr-x   3 root root      4096 Apr 30  2010 ./source/a/rpm2tgz
+-rw-r--r--   1 root root      1809 Nov 27  2002 ./source/a/rpm2tgz/getrpmtype.tar.gz
+drwxr-xr-x   2 root root      4096 Aug  7  2010 ./source/a/rpm2tgz/patches
+-rw-r--r--   1 root root       567 Apr 30  2010 ./source/a/rpm2tgz/patches/0001-fix-d-handling.patch.gz
+-rw-r--r--   1 root root       651 Apr 30  2010 ./source/a/rpm2tgz/patches/0002-fix-spurious-path-to-rpm-file-with-n-option.patch.gz
+-rw-r--r--   1 root root       521 Apr 30  2010 ./source/a/rpm2tgz/patches/0003-allow-every-user-to-use-rpm2tgz.patch.gz
+-rw-r--r--   1 root root       707 Apr 30  2010 ./source/a/rpm2tgz/patches/0004-produce-more-compliant-slack-desc.patch.gz
+-rw-r--r--   1 root root       792 Apr 30  2010 ./source/a/rpm2tgz/patches/0005-gzip-man-info-pages.patch.gz
+-rw-r--r--   1 root root       755 Apr 30  2010 ./source/a/rpm2tgz/patches/0006-should-we-use-.txz-format-in-slackware-current.patch.gz
+-rw-r--r--   1 root root       969 Aug  7  2010 ./source/a/rpm2tgz/patches/0007-Add-support-for-.txz-packages-and-rpm2txz-symlink.patch.gz
+-rw-r--r--   1 root root       674 Aug  7  2010 ./source/a/rpm2tgz/patches/0008-Avoid-none-values-in-slack-desc.patch.gz
+-rw-r--r--   1 root root      1057 Aug  7  2010 ./source/a/rpm2tgz/patches/0009-Add-c-option-just-as-makepkg-c-y.patch.gz
+-rw-r--r--   1 root root      7333 Feb 18  2010 ./source/a/rpm2tgz/rpm2targz
+-rw-r--r--   1 root root       986 Dec 23  2006 ./source/a/rpm2tgz/rpm2targz.README
+-rwxr-xr-x   1 root root      3821 Aug  7  2010 ./source/a/rpm2tgz/rpm2tgz.SlackBuild
+-rw-r--r--   1 root root       854 Feb 23  2010 ./source/a/rpm2tgz/rpmoffset.c
+-rw-r--r--   1 root root       856 Feb 11  2008 ./source/a/rpm2tgz/slack-desc
+drwxr-xr-x   2 root root      4096 Nov 16 05:37 ./source/a/sdparm
+-rw-r--r--   1 root root    218904 Nov 11 15:50 ./source/a/sdparm/sdparm-1.06.tar.xz
+-rwxr-xr-x   1 root root      3879 Feb 12  2010 ./source/a/sdparm/sdparm.SlackBuild
+-rw-r--r--   1 root root       924 Jun  2  2007 ./source/a/sdparm/slack-desc
+drwxr-xr-x   2 root root      4096 Dec  6  2009 ./source/a/sed
+-rw-r--r--   1 root root    728284 Jun 29  2009 ./source/a/sed/sed-4.2.1.tar.xz
+-rwxr-xr-x   1 root root      3342 Dec  6  2009 ./source/a/sed/sed.SlackBuild
+-rw-r--r--   1 root root       862 May 30  2009 ./source/a/sed/slack-desc
+drwxr-xr-x   3 root root      4096 Mar 24 03:06 ./source/a/shadow
+-rw-r--r--   1 root root     15623 Jan 13  2010 ./source/a/shadow/adduser
+-rw-r--r--   1 root root       290 Jan 28  2010 ./source/a/shadow/doinst.sh.gz
+-rw-r--r--   1 root root      4551 Jan 28  2010 ./source/a/shadow/login.defs.gz
+drwxr-xr-x   2 root root      4096 Mar 24 03:26 ./source/a/shadow/patches
+-rw-r--r--   1 root root       415 Mar 24 02:47 ./source/a/shadow/patches/README_PATCHES
+-rw-r--r--   1 root root       365 Mar 24 02:47 ./source/a/shadow/patches/r3054.diff.gz
+-rw-r--r--   1 root root      7828 Mar 24 02:47 ./source/a/shadow/patches/r3055.diff.gz
+-rw-r--r--   1 root root       671 Mar 24 02:47 ./source/a/shadow/patches/r3060.diff.gz
+-rw-r--r--   1 root root       888 Mar 24 02:47 ./source/a/shadow/patches/r3062.diff.gz
+-rw-r--r--   1 root root       314 Mar 24 02:47 ./source/a/shadow/patches/r3096.diff.gz
+-rw-r--r--   1 root root      3291 Mar 24 02:47 ./source/a/shadow/patches/r3160.diff.gz
+-rw-r--r--   1 root root       273 Mar 24 02:47 ./source/a/shadow/patches/r3194.diff.gz
+-rw-r--r--   1 root root       173 Mar 24 02:47 ./source/a/shadow/patches/r3299.diff.gz
+-rw-r--r--   1 root root   1295904 Feb 15 23:55 ./source/a/shadow/shadow-4.1.4.3.tar.xz
+-rwxr-xr-x   1 root root      4865 Apr 11 04:20 ./source/a/shadow/shadow.SlackBuild
+-rw-r--r--   1 root root        50 Mar 24 03:05 ./source/a/shadow/shadow.url
+-rw-r--r--   1 root root       993 Apr 30  2002 ./source/a/shadow/slack-desc
+-rw-r--r--   1 root root       142 Feb 28  2010 ./source/a/shadow/useradd.gz
+drwxr-xr-x   2 root root      4096 Feb  7 19:16 ./source/a/sharutils
+-rw-r--r--   1 root root    761964 Feb  5 19:34 ./source/a/sharutils/sharutils-4.11.tar.xz
+-rwxr-xr-x   1 root root      3543 Feb  7 19:28 ./source/a/sharutils/sharutils.SlackBuild
+-rw-r--r--   1 root root      1087 May 19  2006 ./source/a/sharutils/slack-desc
+drwxr-xr-x   2 root root      4096 Jun 30  2009 ./source/a/slocate
+-rw-r--r--   1 root root       941 Jul 18  2009 ./source/a/slocate/_slocate.tar.gz
+-rw-r--r--   1 root root      1011 Apr  7  2002 ./source/a/slocate/slack-desc
+-rw-r--r--   1 root root     37748 Mar  8  2006 ./source/a/slocate/slocate-3.1.tar.gz
+-rw-r--r--   1 root root       189 Mar  8  2006 ./source/a/slocate/slocate-3.1.tar.gz.sign
+-rwxr-xr-x   1 root root      2705 Jul 28  2010 ./source/a/slocate/slocate.SlackBuild
+drwxr-xr-x   2 root root      4096 Jan 27 19:05 ./source/a/smartmontools
+-rw-r--r--   1 root root       270 Apr 12  2004 ./source/a/smartmontools/doinst.sh.gz
+-rw-r--r--   1 root root      1174 Oct 21  2002 ./source/a/smartmontools/slack-desc
+-rw-r--r--   1 root root    515092 Oct 16  2010 ./source/a/smartmontools/smartmontools-5.40.tar.xz
+-rwxr-xr-x   1 root root      3187 Jan 27 19:24 ./source/a/smartmontools/smartmontools.SlackBuild
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/a/splitvt
+-rw-r--r--   1 root root       743 Dec 13  2006 ./source/a/splitvt/slack-desc
+-rw-r--r--   1 root root     64301 Jan 18  2001 ./source/a/splitvt/splitvt-1.6.5.tar.gz
+-rwxr-xr-x   1 root root      2556 Jul 28  2010 ./source/a/splitvt/splitvt.SlackBuild
+-rw-r--r--   1 root root     10403 Jul 19  2005 ./source/a/splitvt/splitvt_1.6.5-9.diff.gz
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/a/sysfsutils
+-rw-r--r--   1 root root      1005 Aug  3  2006 ./source/a/sysfsutils/slack-desc
+-rw-r--r--   1 root root    288189 Dec 12  2006 ./source/a/sysfsutils/sysfsutils-2.1.0.tar.bz2
+-rwxr-xr-x   1 root root      3470 Jul 28  2010 ./source/a/sysfsutils/sysfsutils.SlackBuild
+drwxr-xr-x   3 root root      4096 Oct 14  2010 ./source/a/sysklogd
+drwxr-xr-x   2 root root      4096 Oct 14  2010 ./source/a/sysklogd/config
+-rw-r--r--   1 root root       981 Apr  9  2007 ./source/a/sysklogd/config/rc.syslog.new
+-rw-r--r--   1 root root      1573 Mar 14  2003 ./source/a/sysklogd/config/syslog.conf.new
+-rw-r--r--   1 root root       239 Jun  8  2003 ./source/a/sysklogd/config/syslog.logrotate
+-rw-r--r--   1 root root       380 Oct 14  2010 ./source/a/sysklogd/doinst.sh.gz
+-rw-r--r--   1 root root       916 Mar 23  2002 ./source/a/sysklogd/slack-desc
+-rw-r--r--   1 root root     86557 Jul 29  2007 ./source/a/sysklogd/sysklogd-1.5.tar.gz
+-rwxr-xr-x   1 root root      3423 Oct 14  2010 ./source/a/sysklogd/sysklogd.SlackBuild
+-rw-r--r--   1 root root       382 Oct 14  2010 ./source/a/sysklogd/use_memmove_not_strcpy.diff.gz
+drwxr-xr-x   2 root root      4096 Jan 25  2010 ./source/a/syslinux
+-rw-r--r--   1 root root       977 Mar 22  2002 ./source/a/syslinux/slack-desc
+-rw-r--r--   1 root root   3383248 Dec 18  2009 ./source/a/syslinux/syslinux-3.84.tar.bz2
+-rw-r--r--   1 root root       248 Dec 18  2009 ./source/a/syslinux/syslinux-3.84.tar.bz2.sign
+-rwxr-xr-x   1 root root      3103 Jan 25  2010 ./source/a/syslinux/syslinux.SlackBuild
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/a/sysvinit
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/a/sysvinit-functions
+-rw-r--r--   1 root root       832 Apr 29  2007 ./source/a/sysvinit-functions/README.functions
+-rw-r--r--   1 root root       226 May 15  2007 ./source/a/sysvinit-functions/doinst.sh.gz
+-rw-r--r--   1 root root     10001 Apr 29  2007 ./source/a/sysvinit-functions/function-src-8.53.tar.bz2
+-rw-r--r--   1 root root     13913 Oct 26  2006 ./source/a/sysvinit-functions/functions
+-rw-r--r--   1 root root      1164 May 15  2007 ./source/a/sysvinit-functions/slack-desc
+-rwxr-xr-x   1 root root      3323 Jul 28  2010 ./source/a/sysvinit-functions/sysvinit-functions.SlackBuild
+drwxr-xr-x   3 root root      4096 Apr 23 19:57 ./source/a/sysvinit-scripts
+-rw-r--r--   1 root root       342 Apr 23 19:41 ./source/a/sysvinit-scripts/doinst.sh.gz
+drwxr-xr-x   2 root root      4096 Apr 23 19:40 ./source/a/sysvinit-scripts/scripts
+-rw-r--r--   1 root root        60 Aug  1  2006 ./source/a/sysvinit-scripts/scripts/fetch-rescan-scsi-bus.sh
+-rw-r--r--   1 root root      2344 Mar 26 01:38 ./source/a/sysvinit-scripts/scripts/inittab
+-rw-r--r--   1 root root      1282 Mar 27  2007 ./source/a/sysvinit-scripts/scripts/rc.4
+-rw-r--r--   1 root root      7677 Apr 16 21:14 ./source/a/sysvinit-scripts/scripts/rc.6
+-rw-r--r--   1 root root      2893 Apr 16 21:14 ./source/a/sysvinit-scripts/scripts/rc.K
+-rw-r--r--   1 root root     11475 Mar 22 06:15 ./source/a/sysvinit-scripts/scripts/rc.M
+-rw-r--r--   1 root root     14581 Apr 23 19:37 ./source/a/sysvinit-scripts/scripts/rc.S
+-rw-r--r--   1 root root       272 Aug 12  2006 ./source/a/sysvinit-scripts/scripts/rc.local
+-rw-r--r--   1 root root       168 Apr 23 19:40 ./source/a/sysvinit-scripts/scripts/rc.loop
+-rw-r--r--   1 root root      1740 Sep 11  1999 ./source/a/sysvinit-scripts/scripts/rc.sysvinit
+-rw-r--r--   1 root root     20491 Aug 10  2010 ./source/a/sysvinit-scripts/scripts/rescan-scsi-bus.sh
+-rw-r--r--   1 root root       846 May 15  2007 ./source/a/sysvinit-scripts/slack-desc
+-rwxr-xr-x   1 root root      2185 Apr 23 19:41 ./source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
+-rw-r--r--   1 root root       681 Apr 16  2007 ./source/a/sysvinit/doinst.sh.gz
+-rw-r--r--   1 root root       972 Mar 22  2002 ./source/a/sysvinit/slack-desc
+-rw-r--r--   1 root root       489 Sep 22  2008 ./source/a/sysvinit/sysvinit-2.86-timeval.patch.gz
+-rw-r--r--   1 root root     99009 Dec  8  2006 ./source/a/sysvinit/sysvinit-2.86.tar.gz
+-rwxr-xr-x   1 root root      4105 Jul 28  2010 ./source/a/sysvinit/sysvinit.SlackBuild
+-rw-r--r--   1 root root      1729 Apr  3  2008 ./source/a/sysvinit/sysvinit.diff.gz
+-rw-r--r--   1 root root      1107 Dec 19  2005 ./source/a/sysvinit/sysvinit.pidof.rhforkseverything.diff.gz
+drwxr-xr-x   2 root root      4096 Mar 12 17:59 ./source/a/tar
+-rw-r--r--   1 root root      2429 Jan  7  1995 ./source/a/tar/rmt.8.gz
+-rw-r--r--   1 root root       834 Mar 23  2002 ./source/a/tar/slack-desc
+-rw-r--r--   1 root root       949 Nov 30  2006 ./source/a/tar/tar-1.13.bzip2.diff.gz
+-rw-r--r--   1 root root   1052531 Jul  8  1999 ./source/a/tar/tar-1.13.tar.gz
+-rw-r--r--   1 root root   1783904 Mar 12 10:50 ./source/a/tar/tar-1.26.tar.xz
+-rw-r--r--   1 root root       189 Mar 12 10:50 ./source/a/tar/tar-1.26.tar.xz.sig
+-rw-r--r--   1 root root       230 Mar 16  2010 ./source/a/tar/tar-1.2x.support_txz.diff.gz
+-rw-r--r--   1 root root      2682 Oct 27 02:22 ./source/a/tar/tar.1.gz
+-rwxr-xr-x   1 root root      4848 Apr 14 18:21 ./source/a/tar/tar.SlackBuild
+-rw-r--r--   1 root root       509 Nov  8 19:42 ./source/a/tar/tar.nolonezero.diff.gz
+-rw-r--r--   1 root root       377 Mar 16  2010 ./source/a/tar/tar.norecordsizespam.diff.gz
+drwxr-xr-x   2 root root      4096 Jul 28  2010 ./source/a/tcsh
+-rw-r--r--   1 root root       146 Aug  6  1995 ./source/a/tcsh/doinst.sh.gz
+-rw-r--r--   1 root root       886 Mar 23  2002 ./source/a/tcsh/slack-desc
+-rw-r--r--   1 root root    670184 Jul 10  2009 ./source/a/tcsh/tcsh-6.17.00.tar.xz
+-rwxr-xr-x   1 root root      3278 Jul 28  2010 ./source/a/tcsh/tcsh.SlackBuild
+-rw-r--r--   1 root root       202 Feb  9  2006 ./source/a/tcsh/tcsh.nobuiltincolorls.diff.gz
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/a/time
+-rw-r--r--   1 root root       887 Feb 11  2008 ./source/a/time/slack-desc
+-rw-r--r--   1 root root    103066 Jul 11  1996 ./source/a/time/time-1.7.tar.gz
+-rwxr-xr-x   1 root root      2538 Jul 28  2010 ./source/a/time/time.SlackBuild
+drwxr-xr-x   2 root root      4096 Jul 28  2010 ./source/a/tree
+-rw-r--r--   1 root root       873 Dec 23  2006 ./source/a/tree/slack-desc
+-rw-r--r--   1 root root     32133 Nov 24  2009 ./source/a/tree/tree-1.5.3.tar.bz2
+-rwxr-xr-x   1 root root      2528 Jul 28  2010 ./source/a/tree/tree.SlackBuild
+drwxr-xr-x   3 root root      4096 Jan  5 07:29 ./source/a/udev
+drwxr-xr-x   6 root root      4096 Aug 14  2009 ./source/a/udev/config
+drwxr-xr-x   2 root root      4096 Aug 14  2009 ./source/a/udev/config/modprobe.d
+-rw-r--r--   1 root root      6251 Aug 14  2009 ./source/a/udev/config/modprobe.d/blacklist.conf.new
+-rw-r--r--   1 root root       443 May 30  2009 ./source/a/udev/config/modprobe.d/isapnp.conf.new
+-rw-r--r--   1 root root       265 Aug 14  2009 ./source/a/udev/config/modprobe.d/psmouse.conf.new
+-rw-r--r--   1 root root       244 May 30  2009 ./source/a/udev/config/modprobe.d/usb-controller.conf.new
+drwxr-xr-x   2 root root      4096 Jan 14  2010 ./source/a/udev/config/rc.d
+-rw-r--r--   1 root root      5058 Dec 13 18:51 ./source/a/udev/config/rc.d/rc.udev.new
+drwxr-xr-x   2 root root      4096 Dec  2  2009 ./source/a/udev/config/rules.d
+-rw-r--r--   1 root root       538 Nov 19 17:27 ./source/a/udev/config/rules.d/40-slackware.rules
+-rw-r--r--   1 root root      1847 Apr 20  2010 ./source/a/udev/config/rules.d/59-non-libata-devices.rules
+-rw-r--r--   1 root root      1380 Apr 20  2010 ./source/a/udev/config/rules.d/65-permissions.rules
+-rw-r--r--   1 root root       305 May 30  2009 ./source/a/udev/config/rules.d/90-network.rules
+drwxr-xr-x   2 root root      4096 May 30  2009 ./source/a/udev/config/scripts
+-rwxr-xr-x   1 root root      1978 May 30  2009 ./source/a/udev/config/scripts/nethelper.sh
+-rw-r--r--   1 root root       489 Nov  6 03:46 ./source/a/udev/config/udev.conf
+-rw-r--r--   1 root root       588 Dec 17 16:48 ./source/a/udev/doinst.sh.gz
+-rw-r--r--   1 root root       803 Jul  7  2010 ./source/a/udev/rule_generator.diff.gz
+-rw-r--r--   1 root root       825 May 30  2009 ./source/a/udev/slack-desc
+-rw-r--r--   1 root root    478564 Dec 16 12:36 ./source/a/udev/udev-165.tar.xz
+-rw-r--r--   1 root root       381 May 29  2010 ./source/a/udev/udev-fixed-devices.tar.gz
+-rwxr-xr-x   1 root root      5111 Jan  5 07:29 ./source/a/udev/udev.SlackBuild
+-rw-r--r--   1 root root      3887 Jan  5 07:11 ./source/a/udev/udev.git-560de575148b7efda3b34a7f7073abd483c5f08e.patch.gz
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/a/unarj
+-rw-r--r--   1 root root       269 Dec 23  2006 ./source/a/unarj/Makefile.gz
+-rw-r--r--   1 root root       848 Dec 23  2006 ./source/a/unarj/slack-desc
+-rwxr-xr-x   1 root root      2268 Jul 28  2010 ./source/a/unarj/unarj.SlackBuild
+-rw-r--r--   1 root root     23151 Jun  5  2002 ./source/a/unarj/unarj265.tar.gz
+drwxr-xr-x   2 root root      4096 Dec 31 03:40 ./source/a/usb_modeswitch
+-rw-r--r--   1 root root      9312 Dec 22 23:38 ./source/a/usb_modeswitch/device_reference.txt.gz
+-rw-r--r--   1 root root       272 Apr 30  2010 ./source/a/usb_modeswitch/doinst.sh.gz
+-rw-r--r--   1 root root      1185 Apr 30  2010 ./source/a/usb_modeswitch/slack-desc
+-rw-r--r--   1 root root     40247 Dec 22 23:32 ./source/a/usb_modeswitch/usb-modeswitch-1.1.6.tar.bz2
+-rw-r--r--   1 root root     16871 Dec 22 23:32 ./source/a/usb_modeswitch/usb-modeswitch-data-20101222.tar.bz2
+-rwxr-xr-x   1 root root      4299 Dec 31 03:40 ./source/a/usb_modeswitch/usb_modeswitch.SlackBuild
+drwxr-xr-x   2 root root      4096 Mar 17 23:49 ./source/a/usbutils
+-rw-r--r--   1 root root       781 May 30  2009 ./source/a/usbutils/slack-desc
+-rw-r--r--   1 root root    475212 Mar 17 23:21 ./source/a/usbutils/usbutils-002.tar.bz2
+-rw-r--r--   1 root root       249 Mar 17 23:21 ./source/a/usbutils/usbutils-002.tar.bz2.sign
+-rwxr-xr-x   1 root root      4564 Mar 17 23:50 ./source/a/usbutils/usbutils.SlackBuild
+-rw-r--r--   1 root root       220 May 30  2009 ./source/a/usbutils/usbutils.ids.dest.gz
+drwxr-xr-x   2 root root      4096 Jul 28  2010 ./source/a/utempter
+-rw-r--r--   1 root root       230 Dec 12  2006 ./source/a/utempter/doinst.sh.gz
+-rw-r--r--   1 root root     14588 Feb 19  2007 ./source/a/utempter/libutempter-1.1.5.tar.bz2
+-rw-r--r--   1 root root       189 Feb 19  2007 ./source/a/utempter/libutempter-1.1.5.tar.bz2.asc
+-rw-r--r--   1 root root       809 Jun  8  2003 ./source/a/utempter/slack-desc
+-rwxr-xr-x   1 root root      3118 Jul 28  2010 ./source/a/utempter/utempter.SlackBuild
+drwxr-xr-x   2 root root      4096 Feb 11 17:05 ./source/a/util-linux
+-rw-r--r--   1 root root     43150 May 30  2009 ./source/a/util-linux/adjtimex_1.23-1.diff.gz
+-rw-r--r--   1 root root     56580 May 30  2009 ./source/a/util-linux/adjtimex_1.23.orig.tar.gz
+-rw-r--r--   1 root root      4513 May 30  2009 ./source/a/util-linux/bsdstrings.tar.gz
+-rw-r--r--   1 root root       337 May 30  2009 ./source/a/util-linux/doinst.sh.gz
+-rw-r--r--   1 root root    179192 May 30  2009 ./source/a/util-linux/net-tools-1.60.tar.xz
+-rw-r--r--   1 root root       650 May 30  2009 ./source/a/util-linux/net-tools.diff.gz
+-rw-r--r--   1 root root    173444 May 30  2009 ./source/a/util-linux/net-tools_1.60-19.diff.gz
+-rw-r--r--   1 root root      1266 May 30  2009 ./source/a/util-linux/scsi_ioctl.h
+-rw-r--r--   1 root root     52437 May 30  2009 ./source/a/util-linux/setserial-2.17.tar.gz
+-rw-r--r--   1 root root       729 May 30  2009 ./source/a/util-linux/setserial-rc.serial.diff.gz
+-rw-r--r--   1 root root       376 Mar 30  2010 ./source/a/util-linux/setserial-undef_TIOCGHAYESESP.diff.gz
+-rw-r--r--   1 root root       784 Feb 16 06:11 ./source/a/util-linux/slack-desc
+-rw-r--r--   1 root root   2690604 Feb 10 09:15 ./source/a/util-linux/util-linux-2.19.tar.xz
+-rwxr-xr-x   1 root root      9358 Feb 16 04:46 ./source/a/util-linux/util-linux.SlackBuild
+-rw-r--r--   1 root root       299 May 30  2009 ./source/a/util-linux/util-linux.fdisk-no-solaris.diff.gz
+-rw-r--r--   1 root root     10292 May 30  2009 ./source/a/util-linux/ziptool-1.4.0.tar.xz
+-rw-r--r--   1 root root       386 May 30  2009 ./source/a/util-linux/ziptool-fix_build.patch.gz
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/a/which
+-rw-r--r--   1 root root      1038 Dec 14  2006 ./source/a/which/slack-desc
+-rw-r--r--   1 root root    135372 Aug  6  2008 ./source/a/which/which-2.20.tar.gz
+-rw-r--r--   1 root root       152 Aug  6  2008 ./source/a/which/which-2.20.tar.gz.sig
+-rwxr-xr-x   1 root root      3081 Jul 28  2010 ./source/a/which/which.SlackBuild
+drwxr-xr-x   2 root root      4096 Mar 22 22:34 ./source/a/xfsprogs
+-rw-r--r--   1 root root       954 Feb 21  2006 ./source/a/xfsprogs/slack-desc
+-rw-r--r--   1 root root    925100 Nov 11 17:41 ./source/a/xfsprogs/xfsprogs-3.1.4.tar.xz
+-rwxr-xr-x   1 root root      4530 Jul 12  2010 ./source/a/xfsprogs/xfsprogs.SlackBuild
+drwxr-xr-x   2 root root      4096 Apr  6 03:46 ./source/a/xz
+-rw-r--r--   1 root root       952 Apr  8  2009 ./source/a/xz/slack-desc
+-rw-r--r--   1 root root   1023720 Apr  1 10:11 ./source/a/xz/xz-5.0.2.tar.bz2
+-rw-r--r--   1 root root       543 Apr  1 10:11 ./source/a/xz/xz-5.0.2.tar.bz2.sig
+-rwxr-xr-x   1 root root      4822 Apr  6 03:46 ./source/a/xz/xz.SlackBuild
+drwxr-xr-x   2 root root      4096 Jul 28  2010 ./source/a/zoo
+-rw-r--r--   1 root root       996 Dec 14  2006 ./source/a/zoo/slack-desc
+-rw-r--r--   1 root root    173607 Dec 30  1994 ./source/a/zoo/zoo-2.10.tar.gz
+-rwxr-xr-x   1 root root      2802 Jul 28  2010 ./source/a/zoo/zoo.SlackBuild
+-rw-r--r--   1 root root     14136 May 22  2010 ./source/a/zoo/zoo_2.10-22.debian.tar.gz
+drwxr-xr-x  73 root root      4096 Apr 22 17:37 ./source/ap
+drwxr-xr-x   2 root root      4096 May 23  2009 ./source/ap/a2ps
+-rw-r--r--   1 root root   1814364 Dec 29  2007 ./source/ap/a2ps/a2ps-4.14.tar.bz2
+-rwxr-xr-x   1 root root      5426 Jul 28  2010 ./source/ap/a2ps/a2ps.SlackBuild
+-rw-r--r--   1 root root       298 Mar 31  2009 ./source/ap/a2ps/a2ps.a2ps_cfg.in.diff.gz
+-rw-r--r--   1 root root       249 Jan 19  2001 ./source/ap/a2ps/a2ps.diff.gz
+-rw-r--r--   1 root root     62039 Aug 28  1997 ./source/ap/a2ps/psutils-1.17.tar.gz
+-rw-r--r--   1 root root       574 Mar  4  2009 ./source/ap/a2ps/psutils.destdir.diff.gz
+-rw-r--r--   1 root root       471 Jan 19  2001 ./source/ap/a2ps/psutils.diff.gz
+-rw-r--r--   1 root root       900 Mar 29  2002 ./source/ap/a2ps/slack-desc
+drwxr-xr-x   2 root root      4096 Jul 28  2010 ./source/ap/acct
+-rw-r--r--   1 root root    448772 Apr 27  2010 ./source/ap/acct/acct-6.5.4.tar.xz
+-rwxr-xr-x   1 root root      4580 Jul 28  2010 ./source/ap/acct/acct.SlackBuild
+-rw-r--r--   1 root root       320 Jul 28  2010 ./source/ap/acct/acct.logdir.fhs.diff.gz
+-rw-r--r--   1 root root      1054 Nov 12  2008 ./source/ap/acct/slack-desc
+drwxr-xr-x   2 root root      4096 Feb  9 05:53 ./source/ap/alsa-utils
+-rw-r--r--   1 root root   1130734 Jan 31 14:27 ./source/ap/alsa-utils/alsa-utils-1.0.24.2.tar.bz2
+-rwxr-xr-x   1 root root      4076 Feb  9 05:47 ./source/ap/alsa-utils/alsa-utils.SlackBuild
+-rw-r--r--   1 root root       989 May 30  2010 ./source/ap/alsa-utils/alsa-utils.alsaconf.diff.gz
+-rw-r--r--   1 root root       178 Feb  9 05:53 ./source/ap/alsa-utils/doinst.sh.gz
+-rw-r--r--   1 root root      1109 Feb  9 05:46 ./source/ap/alsa-utils/rc.alsa.gz
+-rw-r--r--   1 root root      1086 Aug 29  2003 ./source/ap/alsa-utils/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/ap/amp
+-rw-r--r--   1 root root       236 Feb 24  2002 ./source/ap/amp/_amp.tar.gz
+-rw-r--r--   1 root root    100337 Mar 17  1999 ./source/ap/amp/amp-0.7.6.tar.gz
+-rw-r--r--   1 root root       239 Oct  1  2008 ./source/ap/amp/amp-gcc34.diff.gz
+-rwxr-xr-x   1 root root      2279 Jul 28  2010 ./source/ap/amp/amp.SlackBuild
+-rw-r--r--   1 root root      1514 Mar 17  1999 ./source/ap/amp/license_excerpts
+-rw-r--r--   1 root root       729 Mar 29  2002 ./source/ap/amp/slack-desc
+drwxr-xr-x   3 root root      4096 Apr 25  2010 ./source/ap/ash
+-rw-r--r--   1 root root    121233 Jan 12  2001 ./source/ap/ash/ash-0.4.0.tar.gz
+-rwxr-xr-x   1 root root      3066 Apr 25  2010 ./source/ap/ash/ash.SlackBuild
+drwxr-xr-x   2 root root      4096 Apr 25  2010 ./source/ap/ash/patches
+-rw-r--r--   1 root root      6275 Jun  2  2002 ./source/ap/ash/patches/ash-builtin.patch.gz
+-rw-r--r--   1 root root      6506 Jun  2  2002 ./source/ap/ash/patches/ash-debian.patch.gz
+-rw-r--r--   1 root root       832 Jun  2  2002 ./source/ap/ash/patches/ash-echo.patch.gz
+-rw-r--r--   1 root root       707 Jun  2  2002 ./source/ap/ash/patches/ash-freebsd.patch.gz
+-rw-r--r--   1 root root       312 Jun  2  2002 ./source/ap/ash/patches/ash-getcwd.patch.gz
+-rw-r--r--   1 root root      1585 Jun  2  2002 ./source/ap/ash/patches/ash-getopt.patch.gz
+-rw-r--r--   1 root root      2937 Jun  2  2002 ./source/ap/ash/patches/ash-glob.patch.gz
+-rw-r--r--   1 root root      4556 Apr 25  2010 ./source/ap/ash/patches/ash-hetio.patch.gz
+-rw-r--r--   1 root root      1004 Jun  2  2002 ./source/ap/ash/patches/ash-jobs.patch.gz
+-rw-r--r--   1 root root      5625 Jun  2  2002 ./source/ap/ash/patches/ash-kill.patch.gz
+-rw-r--r--   1 root root      1338 Jun  2  2002 ./source/ap/ash/patches/ash-makefile.patch.gz
+-rw-r--r--   1 root root       718 Jun  2  2002 ./source/ap/ash/patches/ash-manpage.patch.gz
+-rw-r--r--   1 root root      2357 Jun  2  2002 ./source/ap/ash/patches/ash-memout.patch.gz
+-rw-r--r--   1 root root      1499 Jun  2  2002 ./source/ap/ash/patches/ash-misc.patch.gz
+-rw-r--r--   1 root root       388 Jun  2  2002 ./source/ap/ash/patches/ash-ppid.patch.gz
+-rw-r--r--   1 root root      3928 Jun  2  2002 ./source/ap/ash/patches/ash-redir.patch.gz
+-rw-r--r--   1 root root      4570 Jun  2  2002 ./source/ap/ash/patches/ash-setmode.patch.gz
+-rw-r--r--   1 root root       261 Jun  2  2002 ./source/ap/ash/patches/ash-sighup.patch.gz
+-rw-r--r--   1 root root      2215 Jun  2  2002 ./source/ap/ash/patches/ash-syntax.patch.gz
+-rw-r--r--   1 root root      3668 Jun  2  2002 ./source/ap/ash/patches/ash-test.patch.gz
+-rw-r--r--   1 root root       585 Jun  2  2002 ./source/ap/ash/patches/ash-times.patch.gz
+-rw-r--r--   1 root root       979 Jun  2  2002 ./source/ap/ash/slack-desc
+drwxr-xr-x   2 root root      4096 Jul 28  2010 ./source/ap/at
+-rw-r--r--   1 root root     98664 Nov 30  2009 ./source/ap/at/at-3.1.12.tar.xz
+-rwxr-xr-x   1 root root      3362 Jul 28  2010 ./source/ap/at/at.SlackBuild
+-rw-r--r--   1 root root       414 Aug  3  2006 ./source/ap/at/doinst.sh.gz
+-rw-r--r--   1 root root       737 Nov 23  2003 ./source/ap/at/slack-desc
+drwxr-xr-x   2 root root      4096 Jul 28  2010 ./source/ap/aumix
+-rw-r--r--   1 root root    194652 May  9  2010 ./source/ap/aumix/aumix-2.9.1.tar.xz
+-rwxr-xr-x   1 root root      2561 Jul 28  2010 ./source/ap/aumix/aumix.SlackBuild
+-rw-r--r--   1 root root       764 Jun  5  2002 ./source/ap/aumix/slack-desc
+drwxr-xr-x   2 root root      4096 May 23  2009 ./source/ap/bc
+-rw-r--r--   1 root root    290069 Sep  5  2006 ./source/ap/bc/bc-1.06.95.tar.bz2
+-rw-r--r--   1 root root       184 Sep  5  2006 ./source/ap/bc/bc-1.06.95.tar.bz2.sig
+-rwxr-xr-x   1 root root      3568 Jul 28  2010 ./source/ap/bc/bc.SlackBuild
+-rw-r--r--   1 root root       839 May 13  2002 ./source/ap/bc/slack-desc
+drwxr-xr-x   2 root root      4096 May 23  2009 ./source/ap/bpe
+-rw-r--r--   1 root root    115498 Jan  2  2001 ./source/ap/bpe/bpe-2.01.00.tar.gz
+-rwxr-xr-x   1 root root      2498 Jul 28  2010 ./source/ap/bpe/bpe.SlackBuild
+-rw-r--r--   1 root root       789 Jun  6  2004 ./source/ap/bpe/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/ap/cdparanoia
+-rw-r--r--   1 root root    183236 Sep 11  2008 ./source/ap/cdparanoia/cdparanoia-III-10.2.src.tar.gz
+-rw-r--r--   1 root root      3327 Oct 19  2008 ./source/ap/cdparanoia/cdparanoia-III-10.2_cdda_private.patch.gz
+-rwxr-xr-x   1 root root      4199 Jul 28  2010 ./source/ap/cdparanoia/cdparanoia.SlackBuild
+-rw-r--r--   1 root root      1056 Nov 17  2007 ./source/ap/cdparanoia/slack-desc
+drwxr-xr-x   2 root root      4096 Jul 28  2010 ./source/ap/cdrdao
+-rw-r--r--   1 root root   1180112 Jul 11  2010 ./source/ap/cdrdao/cdrdao-1.2.3.tar.xz
+-rwxr-xr-x   1 root root      2862 Jul 28  2010 ./source/ap/cdrdao/cdrdao.SlackBuild
+-rw-r--r--   1 root root       753 Mar 23  2002 ./source/ap/cdrdao/slack-desc
+drwxr-xr-x   2 root root      4096 Dec 22 00:54 ./source/ap/cdrtools
+-rw-r--r--   1 root root   1672524 Dec 21 11:10 ./source/ap/cdrtools/cdrtools-3.01a02.tar.xz
+-rwxr-xr-x   1 root root      5526 Dec 22 00:53 ./source/ap/cdrtools/cdrtools.SlackBuild
+-rw-r--r--   1 root root       269 Dec 29  2009 ./source/ap/cdrtools/doinst.sh.gz
+-rw-r--r--   1 root root       868 Feb 11  2008 ./source/ap/cdrtools/slack-desc
+-rw-r--r--   1 root root     52968 May 17  2007 ./source/ap/cdrtools/zisofs-tools-1.0.8.tar.bz2
+-rw-r--r--   1 root root       248 May 17  2007 ./source/ap/cdrtools/zisofs-tools-1.0.8.tar.bz2.sign
+drwxr-xr-x   2 root root      4096 Jul 28  2010 ./source/ap/dc3dd
+-rw-r--r--   1 root root   2138588 Mar 19  2009 ./source/ap/dc3dd/dc3dd-6.12.3.tar.xz
+-rwxr-xr-x   1 root root      3338 Jul 28  2010 ./source/ap/dc3dd/dc3dd.SlackBuild
+-rw-r--r--   1 root root       913 Feb 14  2009 ./source/ap/dc3dd/slack-desc
+drwxr-xr-x   2 root root      4096 Feb 25 20:30 ./source/ap/ddrescue
+-rw-r--r--   1 root root     48812 Jan 11 18:52 ./source/ap/ddrescue/ddrescue-1.14.tar.xz
+-rwxr-xr-x   1 root root      3940 Feb 25 20:33 ./source/ap/ddrescue/ddrescue.SlackBuild
+-rw-r--r--   1 root root       924 Feb 25 20:34 ./source/ap/ddrescue/slack-desc
+drwxr-xr-x   2 root root      4096 Jul 28  2010 ./source/ap/diffstat
+-rw-r--r--   1 root root    165236 Jul 19  2010 ./source/ap/diffstat/diffstat-1.53.tar.xz
+-rwxr-xr-x   1 root root      3410 Jul 28  2010 ./source/ap/diffstat/diffstat.SlackBuild
+-rw-r--r--   1 root root       868 Sep 20  2006 ./source/ap/diffstat/slack-desc
+drwxr-xr-x   2 root root      4096 May 10  2010 ./source/ap/diffutils
+-rw-r--r--   1 root root   1023932 May  3  2010 ./source/ap/diffutils/diffutils-3.0.tar.xz
+-rw-r--r--   1 root root       373 Feb 14  2010 ./source/ap/diffutils/diffutils-sdiff-no-waitpid.patch.gz
+-rwxr-xr-x   1 root root      3803 May 10  2010 ./source/ap/diffutils/diffutils.SlackBuild
+-rw-r--r--   1 root root       321 Aug 21  2006 ./source/ap/diffutils/doinst.sh.gz
+-rw-r--r--   1 root root       743 Mar 23  2002 ./source/ap/diffutils/slack-desc
+drwxr-xr-x   2 root root      4096 Jun 13  2009 ./source/ap/dmapi
+-rw-r--r--   1 root root    196416 May  5  2009 ./source/ap/dmapi/dmapi-2.2.10.tar.xz
+-rwxr-xr-x   1 root root      3798 Jul 28  2010 ./source/ap/dmapi/dmapi.SlackBuild
+-rw-r--r--   1 root root       526 Apr  1  2008 ./source/ap/dmapi/dmapi.destdir.diff.gz
+-rw-r--r--   1 root root       804 Feb 21  2006 ./source/ap/dmapi/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 19 20:28 ./source/ap/dmidecode
+-rw-r--r--   1 root root     54537 Jan 19 15:00 ./source/ap/dmidecode/dmidecode-2.11.tar.bz2
+-rw-r--r--   1 root root        96 Jan 19 15:00 ./source/ap/dmidecode/dmidecode-2.11.tar.bz2.sig
+-rwxr-xr-x   1 root root      3252 Mar 19 20:29 ./source/ap/dmidecode/dmidecode.SlackBuild
+-rw-r--r--   1 root root       215 May  2  2007 ./source/ap/dmidecode/dmidecode.makefile.diff.gz
+-rw-r--r--   1 root root       933 May  2  2007 ./source/ap/dmidecode/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/ap/dvd+rw-tools
+-rw-r--r--   1 root root    140846 Mar  5  2008 ./source/ap/dvd+rw-tools/dvd+rw-tools-7.1.tar.gz
+-rwxr-xr-x   1 root root      2743 Apr 14 18:30 ./source/ap/dvd+rw-tools/dvd+rw-tools.SlackBuild
+-rw-r--r--   1 root root       185 Apr  7  2008 ./source/ap/dvd+rw-tools/dvd+rw-tools.limits.h.diff.gz
+-rw-r--r--   1 root root        49 Sep  2  2003 ./source/ap/dvd+rw-tools/dvd+rw-tools.url
+-rw-r--r--   1 root root       823 Feb 11  2008 ./source/ap/dvd+rw-tools/slack-desc
+drwxr-xr-x   2 root root      4096 Jul 28  2010 ./source/ap/enscript
+-rw-r--r--   1 root root    804704 Jun  1  2010 ./source/ap/enscript/enscript-1.6.5.2.tar.xz
+-rwxr-xr-x   1 root root      3920 Jul 28  2010 ./source/ap/enscript/enscript.SlackBuild
+-rw-r--r--   1 root root       920 Mar 23  2002 ./source/ap/enscript/slack-desc
+drwxr-xr-x   2 root root      4096 Mar  9 20:08 ./source/ap/flac
+-rw-r--r--   1 root root   1143864 Sep 18  2007 ./source/ap/flac/flac-1.2.1.tar.xz
+-rwxr-xr-x   1 root root      4004 Mar  9 20:07 ./source/ap/flac/flac.SlackBuild
+-rw-r--r--   1 root root       214 Mar  9 20:08 ./source/ap/flac/flac.gcc45.diff.gz
+-rw-r--r--   1 root root       371 Mar  8  2008 ./source/ap/flac/flac.man.diff.gz
+-rw-r--r--   1 root root      1058 Aug 26  2002 ./source/ap/flac/slack-desc
+drwxr-xr-x   2 root root      4096 Jan  1 20:05 ./source/ap/foomatic-filters
+-rw-r--r--   1 root root       275 Sep 26  2007 ./source/ap/foomatic-filters/doinst.sh.gz
+-rw-r--r--   1 root root    244365 Dec 15 16:19 ./source/ap/foomatic-filters/foomatic-filters-4.0.6.tar.gz
+-rwxr-xr-x   1 root root      4353 Feb 16  2010 ./source/ap/foomatic-filters/foomatic-filters.SlackBuild
+-rw-r--r--   1 root root      1104 Feb 11  2008 ./source/ap/foomatic-filters/slack-desc
+drwxr-xr-x   2 root root      4096 Dec 28 19:25 ./source/ap/ghostscript
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/ap/ghostscript-fonts-std
+-rw-r--r--   1 root root       165 Feb 19  2007 ./source/ap/ghostscript-fonts-std/doinst.sh.gz
+-rw-r--r--   1 root root   3621829 Jul 24  2003 ./source/ap/ghostscript-fonts-std/ghostscript-fonts-std-8.11.tar.bz2
+-rwxr-xr-x   1 root root      2267 May 19  2009 ./source/ap/ghostscript-fonts-std/ghostscript-fonts-std.SlackBuild
+-rw-r--r--   1 root root       840 Feb 19  2007 ./source/ap/ghostscript-fonts-std/slack-desc
+-rw-r--r--   1 root root      1436 Apr 11  2008 ./source/ap/ghostscript/cidfmap.gz
+-rw-r--r--   1 root root  17377160 Sep 19  2010 ./source/ap/ghostscript/ghostscript-9.00.tar.xz
+-rwxr-xr-x   1 root root      5447 Dec 28 19:26 ./source/ap/ghostscript/ghostscript.SlackBuild
+-rw-r--r--   1 root root       355 Dec 28 19:25 ./source/ap/ghostscript/ghostscript.rev11948.diff.gz
+-rw-r--r--   1 root root      1011 Mar  2  2008 ./source/ap/ghostscript/slack-desc
+drwxr-xr-x   2 root root      4096 Dec 27 08:43 ./source/ap/gphoto2
+-rw-r--r--   1 root root    471332 Aug 15  2010 ./source/ap/gphoto2/gphoto2-2.4.10.tar.xz
+-rwxr-xr-x   1 root root      3613 Feb 14  2010 ./source/ap/gphoto2/gphoto2.SlackBuild
+-rw-r--r--   1 root root       762 Sep 11  2008 ./source/ap/gphoto2/slack-desc
+drwxr-xr-x   2 root root      4096 Jan 27 19:32 ./source/ap/groff
+-rw-r--r--   1 root root   2480692 Dec 31 07:47 ./source/ap/groff/groff-1.21.tar.xz
+-rwxr-xr-x   1 root root      4717 Jan 27 19:38 ./source/ap/groff/groff.SlackBuild
+-rw-r--r--   1 root root       459 Jun 23  2005 ./source/ap/groff/groff.man.mdoc.local.gz
+-rw-r--r--   1 root root       887 Mar 23  2002 ./source/ap/groff/slack-desc
+drwxr-xr-x   2 root root      4096 Nov 27 22:10 ./source/ap/gutenprint
+-rw-r--r--   1 root root   4068468 Aug 11  2010 ./source/ap/gutenprint/gutenprint-5.2.6.tar.xz
+-rwxr-xr-x   1 root root      4073 Nov 27 22:11 ./source/ap/gutenprint/gutenprint.SlackBuild
+-rw-r--r--   1 root root      1010 Aug 12  2006 ./source/ap/gutenprint/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 27 03:04 ./source/ap/hplip
+-rw-r--r--   1 root root       118 Mar  5  2009 ./source/ap/hplip/doinst.sh.gz
+-rw-r--r--   1 root root  15190340 Mar 25 08:31 ./source/ap/hplip/hplip-3.11.3a.tar.xz
+-rwxr-xr-x   1 root root      3889 Jan 29 02:00 ./source/ap/hplip/hplip.SlackBuild
+-rw-r--r--   1 root root       935 Mar  5  2009 ./source/ap/hplip/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/ap/ispell
+-rw-r--r--   1 root root    580742 Aug  1  2001 ./source/ap/ispell/ispell-3.2.06.tar.gz
+-rwxr-xr-x   1 root root      3345 Jul 28  2010 ./source/ap/ispell/ispell.SlackBuild
+-rw-r--r--   1 root root      5808 Jun  8  2001 ./source/ap/ispell/ispell.diff.gz
+-rw-r--r--   1 root root      1057 Mar 23  2002 ./source/ap/ispell/slack-desc
+drwxr-xr-x   2 root root      4096 Feb 18  2010 ./source/ap/jed
+-rw-r--r--   1 root root    884198 Dec 14  2009 ./source/ap/jed/jed-0.99-19.tar.bz2
+-rw-r--r--   1 root root       261 Dec 14  2009 ./source/ap/jed/jed-0.99-19.tar.bz2.asc
+-rwxr-xr-x   1 root root      3136 Feb 18  2010 ./source/ap/jed/jed.SlackBuild
+-rw-r--r--   1 root root       938 Mar 23  2002 ./source/ap/jed/slack-desc
+drwxr-xr-x   2 root root      4096 Jul 28  2010 ./source/ap/joe
+-rw-r--r--   1 root root    443056 Jul 28  2010 ./source/ap/joe/joe-3.7.tar.xz
+-rwxr-xr-x   1 root root      3113 Jul 28  2010 ./source/ap/joe/joe.SlackBuild
+-rw-r--r--   1 root root       599 Feb 24  2002 ./source/ap/joe/slack-desc
+drwxr-xr-x   2 root root      4096 Jul 28  2010 ./source/ap/jove
+-rwxr-xr-x   1 root root      3166 Jul 28  2010 ./source/ap/jove/jove.SlackBuild
+-rw-r--r--   1 root root      1709 Mar  4  2009 ./source/ap/jove/jove.makefile.diff.gz
+-rw-r--r--   1 root root    357932 Jul 11  2010 ./source/ap/jove/jove4.16.0.73.tar.xz
+-rw-r--r--   1 root root       792 Mar  4  2009 ./source/ap/jove/slack-desc
+drwxr-xr-x   2 root root      4096 Jul 28  2010 ./source/ap/ksh93
+-rw-r--r--   1 root root     12885 Dec 16  2004 ./source/ap/ksh93/CPL
+-rw-r--r--   1 root root    362425 Jul 28  2010 ./source/ap/ksh93/INIT.2010-06-21.tgz
+-rw-r--r--   1 root root    721167 Jul 28  2010 ./source/ap/ksh93/ast-ksh-locale.2010-02-02.tgz
+-rw-r--r--   1 root root   1914305 Jul 28  2010 ./source/ap/ksh93/ast-ksh.2010-06-21.tgz
+-rwxr-xr-x   1 root root      5254 Jul 28  2010 ./source/ap/ksh93/ksh93.SlackBuild
+-rw-r--r--   1 root root       996 Mar 23  2002 ./source/ap/ksh93/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/ap/libx86
+-rw-r--r--   1 root root     87428 May 19  2008 ./source/ap/libx86/libx86-1.1.tar.gz
+-rwxr-xr-x   1 root root      2943 Jul 28  2010 ./source/ap/libx86/libx86.SlackBuild
+-rw-r--r--   1 root root       127 Nov 24  2008 ./source/ap/libx86/libx86.info
+-rw-r--r--   1 root root       324 Nov 24  2008 ./source/ap/libx86/lrmi.c.diff.gz
+-rw-r--r--   1 root root       769 Nov 24  2008 ./source/ap/libx86/slack-desc
+drwxr-xr-x   4 root root      4096 Mar 21 18:02 ./source/ap/linuxdoc-tools
+-rw-r--r--   1 root root      7047 Mar 21 17:40 ./source/ap/linuxdoc-tools/ChangeLog.txt
+drwxr-xr-x   2 root root      4096 Oct  4  2005 ./source/ap/linuxdoc-tools/arm
+-rwxr-xr-x   1 root root      1593 Nov  4 17:09 ./source/ap/linuxdoc-tools/arm/build
+-rwxr-xr-x   1 root root        28 Feb  5  2006 ./source/ap/linuxdoc-tools/linuxdoc-tools.SlackBuild
+-rwxr-xr-x   1 root root     31071 Mar 21 17:38 ./source/ap/linuxdoc-tools/linuxdoc-tools.build
+-rwxr-xr-x   1 root root      2786 Feb 10  2010 ./source/ap/linuxdoc-tools/postbuildfixes.sh
+-rw-r--r--   1 root root      1166 Jun 26  2006 ./source/ap/linuxdoc-tools/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 21 17:38 ./source/ap/linuxdoc-tools/sources
+-rw-r--r--   1 root root    647972 Oct  3  2010 ./source/ap/linuxdoc-tools/sources/asciidoc-8.6.2.tar.xz
+-rw-r--r--   1 root root      1280 Nov 11 19:31 ./source/ap/linuxdoc-tools/sources/asciidoc.asciidoc7compatible.revertbrokenchange.diff.xz
+-rw-r--r--   1 root root    224920 May  5  2007 ./source/ap/linuxdoc-tools/sources/docbook-dsssl-1.79.tar.xz
+-rw-r--r--   1 root root    134196 Nov 12  2004 ./source/ap/linuxdoc-tools/sources/docbook-dsssl-doc-1.79.tar.xz
+-rw-r--r--   1 root root   2986317 Jul 25  2010 ./source/ap/linuxdoc-tools/sources/docbook-style-xsl-1.75.2-6.fc14.src.rpm
+-rw-r--r--   1 root root    166203 Jul 25  2010 ./source/ap/linuxdoc-tools/sources/docbook-utils-0.6.14-24.fc14.src.rpm
+-rw-r--r--   1 root root     98497 Oct 26  2006 ./source/ap/linuxdoc-tools/sources/docbook-xml-4.5.zip
+-rw-r--r--   1 root root    133260 Apr 11  2007 ./source/ap/linuxdoc-tools/sources/docbook_4.5.orig.tar.xz
+-rw-r--r--   1 root root    505208 Jan 10 17:23 ./source/ap/linuxdoc-tools/sources/gnome-doc-utils-0.20.4.tar.xz
+-rw-r--r--   1 root root    601476 Jul 25  2010 ./source/ap/linuxdoc-tools/sources/gtk-doc-1.15.tar.xz
+-rw-r--r--   1 root root       632 Oct 19  2010 ./source/ap/linuxdoc-tools/sources/gtk-doc.patch.xz
+-rw-r--r--   1 root root      7808 Jan  4  2008 ./source/ap/linuxdoc-tools/sources/libsgmls-perl_1.03ii-32.diff.xz
+-rw-r--r--   1 root root     68364 Apr 15  2001 ./source/ap/linuxdoc-tools/sources/libsgmls-perl_1.03ii.orig.tar.xz
+-rw-r--r--   1 root root    630479 Jul 25  2010 ./source/ap/linuxdoc-tools/sources/linuxdoc-tools-0.9.66-6.fc14.src.rpm
+-rw-r--r--   1 root root    711620 Apr 18  2003 ./source/ap/linuxdoc-tools/sources/openjade-1.3.3-pre1.tar.xz
+-rw-r--r--   1 root root   1525065 Aug 12  2009 ./source/ap/linuxdoc-tools/sources/opensp-1.5.2-12.fc12.src.rpm
+-rw-r--r--   1 root root     95000 Jul 25  2010 ./source/ap/linuxdoc-tools/sources/sgml-common-0.6.3-33.fc14.src.rpm
+-rwxr-xr-x   1 root root      4631 Oct 19  2010 ./source/ap/linuxdoc-tools/sources/source.download
+-rw-r--r--   1 root root    117791 Jul 25  2010 ./source/ap/linuxdoc-tools/sources/xmlto-0.0.23-3.fc13.src.rpm
+-rwxr-xr-x   1 root root      2813 Mar 21 17:39 ./source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools
+drwxr-xr-x   2 root root      4096 May  3  2010 ./source/ap/lm_sensors
+-rw-r--r--   1 root root    157644 Feb  2  2010 ./source/ap/lm_sensors/lm_sensors-3.1.2.tar.bz2
+-rw-r--r--   1 root root        65 Feb  2  2010 ./source/ap/lm_sensors/lm_sensors-3.1.2.tar.bz2.sig
+-rwxr-xr-x   1 root root      3728 May  3  2010 ./source/ap/lm_sensors/lm_sensors.SlackBuild
+-rw-r--r--   1 root root       312 Oct 26  2008 ./source/ap/lm_sensors/lm_sensors.makefile.diff.gz
+-rw-r--r--   1 root root      1105 Sep 20  2006 ./source/ap/lm_sensors/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 13  2010 ./source/ap/lsof
+-rwxr-xr-x   1 root root      2744 Mar 13  2010 ./source/ap/lsof/lsof.SlackBuild
+-rw-r--r--   1 root root    753094 Jan 18  2010 ./source/ap/lsof/lsof_4.83.tar.bz2
+-rw-r--r--   1 root root       152 Jan 18  2010 ./source/ap/lsof/lsof_4.83.tar.bz2.sig
+-rw-r--r--   1 root root       789 Mar 17  2002 ./source/ap/lsof/slack-desc
+drwxr-xr-x   2 root root      4096 Dec 24 23:51 ./source/ap/lsscsi
+-rw-r--r--   1 root root     97740 Dec 24 22:00 ./source/ap/lsscsi/lsscsi-0.24.tar.xz
+-rwxr-xr-x   1 root root      3547 Jul 28  2010 ./source/ap/lsscsi/lsscsi.SlackBuild
+-rw-r--r--   1 root root        36 Nov 29  2008 ./source/ap/lsscsi/lsscsi.url
+-rw-r--r--   1 root root       825 May  2  2007 ./source/ap/lsscsi/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 12 21:02 ./source/ap/lxc
+-rw-r--r--   1 root root    274417 Feb 26 09:21 ./source/ap/lxc/lxc-0.7.4.tar.gz
+-rwxr-xr-x   1 root root      4104 Mar 15 22:32 ./source/ap/lxc/lxc.SlackBuild
+-rw-r--r--   1 root root       961 Feb  8 20:34 ./source/ap/lxc/slack-desc
+drwxr-xr-x   2 root root      4096 Apr  2 18:03 ./source/ap/madplay
+-rw-r--r--   1 root root       285 Apr  2 17:59 ./source/ap/madplay/madplay-0.15.2b-fix-segfault.patch.gz
+-rw-r--r--   1 root root    361360 Feb 23  2004 ./source/ap/madplay/madplay-0.15.2b.tar.xz
+-rwxr-xr-x   1 root root      2848 Apr  2 18:03 ./source/ap/madplay/madplay.SlackBuild
+-rw-r--r--   1 root root       797 Sep 10  2003 ./source/ap/madplay/slack-desc
+drwxr-xr-x   2 root root      4096 Jan  4 23:42 ./source/ap/man
+drwxr-xr-x   2 root root      4096 Dec  3 18:59 ./source/ap/man-pages
+-rw-r--r--   1 root root       147 Jul 17  2008 ./source/ap/man-pages/doinst.sh.gz
+-rw-r--r--   1 root root   1134370 Dec  3 07:09 ./source/ap/man-pages/man-pages-3.32.tar.bz2
+-rw-r--r--   1 root root    971300 Jun 17  2008 ./source/ap/man-pages/man-pages-posix-2003-a.tar.bz2
+-rwxr-xr-x   1 root root      3752 Feb 28  2010 ./source/ap/man-pages/man-pages.SlackBuild
+-rw-r--r--   1 root root       950 Jul 17  2008 ./source/ap/man-pages/slack-desc
+-rw-r--r--   1 root root    156268 Jun 14  2009 ./source/ap/man-pages/whatis.sample.xz
+-rw-r--r--   1 root root       274 Apr  9  2008 ./source/ap/man/doinst.sh.gz
+-rw-r--r--   1 root root       215 Aug  9  2009 ./source/ap/man/man-1.6f.nroff.mandoc.diff.gz
+-rw-r--r--   1 root root    213636 Jan  1 01:06 ./source/ap/man/man-1.6g.tar.xz
+-rwxr-xr-x   1 root root      3351 Jan  4 23:47 ./source/ap/man/man.SlackBuild
+-rw-r--r--   1 root root       901 Mar 23  2002 ./source/ap/man/slack-desc
+drwxr-xr-x   3 root root      4096 Apr 11 23:06 ./source/ap/mc
+-rw-r--r--   1 root root   1944452 Apr 11 11:33 ./source/ap/mc/mc-4.7.5.2.tar.xz
+-rwxr-xr-x   1 root root      3769 Apr 11 23:06 ./source/ap/mc/mc.SlackBuild
+-rw-r--r--   1 root root       239 Nov 11 20:34 ./source/ap/mc/mc.ext.in.geeqie.diff.gz
+drwxr-xr-x   2 root root      4096 Jul 14  2009 ./source/ap/mc/profile.d
+-rwxr-xr-x   1 root root       389 Nov 29  2008 ./source/ap/mc/profile.d/mc-wrapper.csh
+-rwxr-xr-x   1 root root       315 Nov 29  2008 ./source/ap/mc/profile.d/mc-wrapper.sh
+-rwxr-xr-x   1 root root        51 Nov 29  2008 ./source/ap/mc/profile.d/mc.csh
+-rwxr-xr-x   1 root root        45 Nov 29  2008 ./source/ap/mc/profile.d/mc.sh
+-rw-r--r--   1 root root       904 Feb 26  2002 ./source/ap/mc/slack-desc
+drwxr-xr-x   2 root root      4096 Jan 23 01:10 ./source/ap/moc
+-rw-r--r--   1 root root    430508 Sep 25  2009 ./source/ap/moc/moc-2.5.0-alpha4.tar.xz
+-rwxr-xr-x   1 root root      4103 Jan 23 00:45 ./source/ap/moc/moc.SlackBuild
+-rw-r--r--   1 root root       874 Jan 23 00:34 ./source/ap/moc/slack-desc
+drwxr-xr-x   2 root root      4096 Jun 22  2009 ./source/ap/most
+-rw-r--r--   1 root root    131130 Sep  9  2007 ./source/ap/most/most-5.0.0a.tar.bz2
+-rwxr-xr-x   1 root root      2950 Jul 28  2010 ./source/ap/most/most.SlackBuild
+-rw-r--r--   1 root root       833 Jun  6  2003 ./source/ap/most/slack-desc
+drwxr-xr-x   2 root root      4096 Apr 22 17:35 ./source/ap/mpg123
+-rw-r--r--   1 root root    626808 Apr 21 16:07 ./source/ap/mpg123/mpg123-1.13.3.tar.xz
+-rwxr-xr-x   1 root root      5421 Mar 10 21:15 ./source/ap/mpg123/mpg123.SlackBuild
+-rw-r--r--   1 root root       788 Dec 15  2009 ./source/ap/mpg123/slack-desc
+drwxr-xr-x   2 root root      4096 Apr  5 21:56 ./source/ap/mysql
+-rw-r--r--   1 root root       330 Oct  2  2008 ./source/ap/mysql/doinst.sh.gz
+-rw-r--r--   1 root root  13378736 Feb 11 19:50 ./source/ap/mysql/mysql-5.1.56.tar.xz
+-rwxr-xr-x   1 root root      1739 Feb 10 20:10 ./source/ap/mysql/mysql-embedded.build
+-rwxr-xr-x   1 root root      6493 Nov 21 02:42 ./source/ap/mysql/mysql.SlackBuild
+-rw-r--r--   1 root root      1208 Apr 17  2008 ./source/ap/mysql/rc.mysqld.gz
+-rw-r--r--   1 root root       816 Mar 23  2002 ./source/ap/mysql/slack-desc
+drwxr-xr-x   2 root root      4096 Mar  1 18:18 ./source/ap/nano
+-rw-r--r--   1 root root    831212 Feb 26 14:36 ./source/ap/nano/nano-2.3.0.tar.xz
+-rwxr-xr-x   1 root root      3981 Feb 16  2010 ./source/ap/nano/nano.SlackBuild
+-rw-r--r--   1 root root       870 Apr  7  2007 ./source/ap/nano/slack-desc
+drwxr-xr-x   2 root root      4096 Jun 10  2009 ./source/ap/normalize
+-rw-r--r--   1 root root    388777 Sep 14  2005 ./source/ap/normalize/normalize-0.7.7.tar.bz2
+-rwxr-xr-x   1 root root      2751 Jul 28  2010 ./source/ap/normalize/normalize.SlackBuild
+-rw-r--r--   1 root root       971 May 25  2004 ./source/ap/normalize/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/ap/ntfsprogs
+-rw-r--r--   1 root root    678114 Sep 29  2007 ./source/ap/ntfsprogs/ntfsprogs-2.0.0.tar.bz2
+-rwxr-xr-x   1 root root      3877 Jul 28  2010 ./source/ap/ntfsprogs/ntfsprogs.SlackBuild
+-rw-r--r--   1 root root      1064 Feb 29  2008 ./source/ap/ntfsprogs/slack-desc
+drwxr-xr-x   2 root root      4096 Jan  3 06:38 ./source/ap/pm-utils
+-rw-r--r--   1 root root       168 Dec 30 23:12 ./source/ap/pm-utils/49bluetooth-generic
+-rw-r--r--   1 root root      6659 Dec 30 02:48 ./source/ap/pm-utils/README.SLACKWARE
+-rw-r--r--   1 root root       635 Jan  3 06:36 ./source/ap/pm-utils/fix-wrong-path-in-intel-audio-powersave.patch.gz
+-rw-r--r--   1 root root     10033 Jun 19  2010 ./source/ap/pm-utils/pm-quirks-20100619.tar.gz
+-rw-r--r--   1 root root    208687 Jul  4  2010 ./source/ap/pm-utils/pm-utils-1.4.1.tar.gz
+-rwxr-xr-x   1 root root      4656 Jan  3 06:40 ./source/ap/pm-utils/pm-utils.SlackBuild
+-rw-r--r--   1 root root        32 Apr 14  2009 ./source/ap/pm-utils/pm-utils.url
+-rw-r--r--   1 root root       835 Apr 14  2009 ./source/ap/pm-utils/slack-desc
+-rw-r--r--   1 root root       343 Dec 27 20:23 ./source/ap/pm-utils/use_more_sane_harddrive_defaults.patch.gz
+drwxr-xr-x   2 root root      4096 Jan  2 23:00 ./source/ap/powertop
+-rw-r--r--   1 root root    104675 Jul 23  2010 ./source/ap/powertop/powertop-1.13.tar.gz
+-rwxr-xr-x   1 root root      3152 May  4  2010 ./source/ap/powertop/powertop.SlackBuild
+-rw-r--r--   1 root root      1007 May  4  2010 ./source/ap/powertop/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 25  2010 ./source/ap/radeontool
+-rw-r--r--   1 root root    338446 Mar 24  2010 ./source/ap/radeontool/radeontool-1.6.1.tar.bz2
+-rwxr-xr-x   1 root root      2915 Jul 28  2010 ./source/ap/radeontool/radeontool.SlackBuild
+-rw-r--r--   1 root root       802 Nov 24  2008 ./source/ap/radeontool/slack-desc
+drwxr-xr-x   2 root root      4096 May 23  2009 ./source/ap/rexima
+-rw-r--r--   1 root root     15903 Jul  1  2003 ./source/ap/rexima/rexima-1.4.tar.gz
+-rwxr-xr-x   1 root root      2381 Jul 28  2010 ./source/ap/rexima/rexima.SlackBuild
+-rw-r--r--   1 root root       829 May 29  2002 ./source/ap/rexima/slack-desc
+drwxr-xr-x   2 root root      4096 Dec  3 20:02 ./source/ap/rpm
+-rw-r--r--   1 root root       133 Nov 27  2009 ./source/ap/rpm/Packages.gz
+-rw-r--r--   1 root root       132 Nov 27  2009 ./source/ap/rpm/doinst.sh.gz
+-rw-r--r--   1 root root   2978736 Jun 11  2010 ./source/ap/rpm/rpm-4.8.1.tar.xz
+-rwxr-xr-x   1 root root      4386 Dec  3 20:05 ./source/ap/rpm/rpm.SlackBuild
+-rw-r--r--   1 root root       948 Nov 27  2009 ./source/ap/rpm/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/ap/rzip
+-rw-r--r--   1 root root     46785 Feb 14  2006 ./source/ap/rzip/rzip-2.1.tar.gz
+-rwxr-xr-x   1 root root      2749 Jul 28  2010 ./source/ap/rzip/rzip.SlackBuild
+-rw-r--r--   1 root root       723 Jun  3  2004 ./source/ap/rzip/slack-desc
+drwxr-xr-x   2 root root      4096 Jul 28  2010 ./source/ap/sc
+-rw-r--r--   1 root root       309 Aug  3  1999 ./source/ap/sc/_sc.tar.gz
+-rw-r--r--   1 root root      4598 May  3  2010 ./source/ap/sc/sc-7.16-3.diff.gz
+-rw-r--r--   1 root root       636 Sep 20  2002 ./source/ap/sc/sc-7.16.lsm
+-rw-r--r--   1 root root    210809 Sep 20  2002 ./source/ap/sc/sc-7.16.tar.gz
+-rwxr-xr-x   1 root root      2976 Jul 28  2010 ./source/ap/sc/sc.SlackBuild
+-rw-r--r--   1 root root       576 Feb 24  2002 ./source/ap/sc/slack-desc
+drwxr-xr-x   2 root root      4096 May 23  2009 ./source/ap/screen
+-rw-r--r--   1 root root    741741 Oct 23  2006 ./source/ap/screen/screen-4.0.3.tar.bz2
+-rwxr-xr-x   1 root root      4054 Jul 28  2010 ./source/ap/screen/screen.SlackBuild
+-rw-r--r--   1 root root      1111 Mar 23  2002 ./source/ap/screen/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/ap/seejpeg
+-rw-r--r--   1 root root       227 Apr 30  2000 ./source/ap/seejpeg/_seejpeg.tar.gz
+-rw-r--r--   1 root root    500701 Jul 25  1996 ./source/ap/seejpeg/libjpeg-6a.tar.gz
+-rw-r--r--   1 root root       654 Apr 30  2000 ./source/ap/seejpeg/seejpeg-1.10.diff.gz
+-rw-r--r--   1 root root       855 Nov  9  1999 ./source/ap/seejpeg/seejpeg-1.10.lsm
+-rw-r--r--   1 root root     46550 Nov  9  1999 ./source/ap/seejpeg/seejpeg-1.10.tgz
+-rwxr-xr-x   1 root root      2557 Jul 28  2010 ./source/ap/seejpeg/seejpeg.SlackBuild
+-rw-r--r--   1 root root       913 Mar 23  2002 ./source/ap/seejpeg/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 25 06:59 ./source/ap/slackpkg
+-rw-r--r--   1 root root        69 Nov 21  2008 ./source/ap/slackpkg/README
+drwxr-xr-x   2 root root      4096 Apr  2 22:34 ./source/ap/sox
+-rw-r--r--   1 root root       749 Apr  2 22:32 ./source/ap/sox/slack-desc
+-rw-r--r--   1 root root    748360 Feb 27 22:00 ./source/ap/sox/sox-14.3.2.tar.xz
+-rwxr-xr-x   1 root root      3569 Apr  2 22:36 ./source/ap/sox/sox.SlackBuild
+drwxr-xr-x   2 root root      4096 Apr  1 02:37 ./source/ap/sqlite
+-rw-r--r--   1 root root      1684 Aug  1  2008 ./source/ap/sqlite/COPYRIGHT.gz
+-rw-r--r--   1 root root       942 Aug  1  2008 ./source/ap/sqlite/slack-desc
+-rw-r--r--   1 root root   2352132 Feb  1 01:38 ./source/ap/sqlite/sqlite-src-3070500.tar.xz
+-rwxr-xr-x   1 root root      4084 Apr  1 02:47 ./source/ap/sqlite/sqlite.SlackBuild
+drwxr-xr-x   2 root root      4096 Feb  9 20:55 ./source/ap/sudo
+-rw-r--r--   1 root root       275 Sep 19  2004 ./source/ap/sudo/doinst.sh.gz
+-rw-r--r--   1 root root       869 Mar 23  2002 ./source/ap/sudo/slack-desc
+-rw-r--r--   1 root root    966234 Jan 19 14:32 ./source/ap/sudo/sudo-1.7.4p6.tar.gz
+-rw-r--r--   1 root root        72 Jan 19 14:32 ./source/ap/sudo/sudo-1.7.4p6.tar.gz.sig
+-rwxr-xr-x   1 root root      3736 Feb  9 20:55 ./source/ap/sudo/sudo.SlackBuild
+drwxr-xr-x   2 root root      4096 Apr 25  2010 ./source/ap/sysstat
+-rw-r--r--   1 root root       527 Aug 30  2009 ./source/ap/sysstat/doinst.sh.gz
+-rw-r--r--   1 root root       902 Aug 30  2009 ./source/ap/sysstat/slack-desc
+-rw-r--r--   1 root root    243939 Feb 28  2010 ./source/ap/sysstat/sysstat-9.0.6.1.tar.bz2
+-rwxr-xr-x   1 root root      5157 Apr 25  2010 ./source/ap/sysstat/sysstat.SlackBuild
+drwxr-xr-x   2 root root      4096 May 23  2009 ./source/ap/texinfo
+-rw-r--r--   1 root root      5853 Nov 20  2008 ./source/ap/texinfo/dir.gz
+-rw-r--r--   1 root root       251 Nov 21  2008 ./source/ap/texinfo/doinst.sh.gz
+-rw-r--r--   1 root root      1074 Mar 22  2002 ./source/ap/texinfo/slack-desc
+-rw-r--r--   1 root root   1969110 Sep 29  2008 ./source/ap/texinfo/texinfo-4.13a.tar.bz2
+-rwxr-xr-x   1 root root      3166 Jul 28  2010 ./source/ap/texinfo/texinfo.SlackBuild
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/ap/vbetool
+-rw-r--r--   1 root root       833 Nov 24  2008 ./source/ap/vbetool/slack-desc
+-rw-r--r--   1 root root    182826 May 16  2008 ./source/ap/vbetool/vbetool-1.1.tar.gz
+-rwxr-xr-x   1 root root      2844 Jul 28  2010 ./source/ap/vbetool/vbetool.SlackBuild
+-rw-r--r--   1 root root       129 Nov 24  2008 ./source/ap/vbetool/vbetool.info
+drwxr-xr-x   3 root root      4096 Mar 28 19:08 ./source/ap/vim
+-rw-r--r--   1 root root    479927 Jul  9  2009 ./source/ap/vim/ctags-5.8.tar.gz
+-rw-r--r--   1 root root       118 Aug 23  2006 ./source/ap/vim/doinst.sh.gz
+-rw-r--r--   1 root root      4203 Feb 16  2007 ./source/ap/vim/gvim.desktop
+-rw-r--r--   1 root root      8249 Jan 19  2006 ./source/ap/vim/gvim.png
+drwxr-xr-x   2 root root      4096 Apr  4 05:15 ./source/ap/vim/patches
+-rw-r--r--   1 root root       843 Aug 16  2010 ./source/ap/vim/patches/7.3.001.gz
+-rw-r--r--   1 root root       793 Aug 16  2010 ./source/ap/vim/patches/7.3.002.gz
+-rw-r--r--   1 root root       698 Aug 17  2010 ./source/ap/vim/patches/7.3.003.gz
+-rw-r--r--   1 root root       699 Sep 14  2010 ./source/ap/vim/patches/7.3.004.gz
+-rw-r--r--   1 root root      1104 Sep 14  2010 ./source/ap/vim/patches/7.3.005.gz
+-rw-r--r--   1 root root      1152 Sep 18  2010 ./source/ap/vim/patches/7.3.006.gz
+-rw-r--r--   1 root root      1686 Sep 21  2010 ./source/ap/vim/patches/7.3.007.gz
+-rw-r--r--   1 root root      2949 Sep 21  2010 ./source/ap/vim/patches/7.3.008.gz
+-rw-r--r--   1 root root      1466 Sep 21  2010 ./source/ap/vim/patches/7.3.009.gz
+-rw-r--r--   1 root root      1828 Sep 21  2010 ./source/ap/vim/patches/7.3.010.gz
+-rw-r--r--   1 root root      2699 Sep 21  2010 ./source/ap/vim/patches/7.3.011.gz
+-rw-r--r--   1 root root       830 Sep 29  2010 ./source/ap/vim/patches/7.3.012.gz
+-rw-r--r--   1 root root      2016 Sep 29  2010 ./source/ap/vim/patches/7.3.013.gz
+-rw-r--r--   1 root root      1105 Sep 29  2010 ./source/ap/vim/patches/7.3.014.gz
+-rw-r--r--   1 root root       932 Sep 29  2010 ./source/ap/vim/patches/7.3.015.gz
+-rw-r--r--   1 root root      2154 Sep 29  2010 ./source/ap/vim/patches/7.3.016.gz
+-rw-r--r--   1 root root      1427 Sep 29  2010 ./source/ap/vim/patches/7.3.017.gz
+-rw-r--r--   1 root root       989 Sep 29  2010 ./source/ap/vim/patches/7.3.018.gz
+-rw-r--r--   1 root root       836 Sep 30  2010 ./source/ap/vim/patches/7.3.019.gz
+-rw-r--r--   1 root root      1330 Oct  9  2010 ./source/ap/vim/patches/7.3.020.gz
+-rw-r--r--   1 root root       958 Oct 10  2010 ./source/ap/vim/patches/7.3.021.gz
+-rw-r--r--   1 root root       815 Oct 13  2010 ./source/ap/vim/patches/7.3.022.gz
+-rw-r--r--   1 root root      1030 Oct 13  2010 ./source/ap/vim/patches/7.3.023.gz
+-rw-r--r--   1 root root      1255 Oct 13  2010 ./source/ap/vim/patches/7.3.024.gz
+-rw-r--r--   1 root root      1461 Oct 13  2010 ./source/ap/vim/patches/7.3.025.gz
+-rw-r--r--   1 root root       893 Oct 13  2010 ./source/ap/vim/patches/7.3.026.gz
+-rw-r--r--   1 root root      1217 Oct 13  2010 ./source/ap/vim/patches/7.3.027.gz
+-rw-r--r--   1 root root      1887 Oct 14  2010 ./source/ap/vim/patches/7.3.028.gz
+-rw-r--r--   1 root root      1663 Oct 15  2010 ./source/ap/vim/patches/7.3.029.gz
+-rw-r--r--   1 root root      3235 Oct 20  2010 ./source/ap/vim/patches/7.3.030.gz
+-rw-r--r--   1 root root      1527 Oct 20  2010 ./source/ap/vim/patches/7.3.031.gz
+-rw-r--r--   1 root root      6128 Oct 20  2010 ./source/ap/vim/patches/7.3.032.gz
+-rw-r--r--   1 root root       728 Oct 22  2010 ./source/ap/vim/patches/7.3.033.gz
+-rw-r--r--   1 root root      3363 Oct 23  2010 ./source/ap/vim/patches/7.3.034.gz
+-rw-r--r--   1 root root       878 Oct 24  2010 ./source/ap/vim/patches/7.3.035.gz
+-rw-r--r--   1 root root       929 Oct 27 10:16 ./source/ap/vim/patches/7.3.036.gz
+-rw-r--r--   1 root root      1509 Oct 27 10:18 ./source/ap/vim/patches/7.3.037.gz
+-rw-r--r--   1 root root      1113 Oct 27 10:59 ./source/ap/vim/patches/7.3.038.gz
+-rw-r--r--   1 root root      1083 Oct 27 10:59 ./source/ap/vim/patches/7.3.039.gz
+-rw-r--r--   1 root root       835 Oct 27 11:39 ./source/ap/vim/patches/7.3.040.gz
+-rw-r--r--   1 root root       835 Oct 27 14:02 ./source/ap/vim/patches/7.3.041.gz
+-rw-r--r--   1 root root       988 Oct 27 14:18 ./source/ap/vim/patches/7.3.042.gz
+-rw-r--r--   1 root root      4032 Oct 27 14:50 ./source/ap/vim/patches/7.3.043.gz
+-rw-r--r--   1 root root       863 Oct 27 15:12 ./source/ap/vim/patches/7.3.044.gz
+-rw-r--r--   1 root root       819 Oct 27 15:39 ./source/ap/vim/patches/7.3.045.gz
+-rw-r--r--   1 root root       998 Oct 27 15:41 ./source/ap/vim/patches/7.3.046.gz
+-rw-r--r--   1 root root      1309 Oct 27 16:37 ./source/ap/vim/patches/7.3.047.gz
+-rw-r--r--   1 root root      1388 Nov  3 18:34 ./source/ap/vim/patches/7.3.048.gz
+-rw-r--r--   1 root root      3386 Nov  4 08:46 ./source/ap/vim/patches/7.3.049.gz
+-rw-r--r--   1 root root      2069 Nov  4 08:46 ./source/ap/vim/patches/7.3.050.gz
+-rw-r--r--   1 root root      1350 Nov 10 14:38 ./source/ap/vim/patches/7.3.051.gz
+-rw-r--r--   1 root root      2797 Nov 10 17:58 ./source/ap/vim/patches/7.3.052.gz
+-rw-r--r--   1 root root      1195 Nov 10 17:58 ./source/ap/vim/patches/7.3.053.gz
+-rw-r--r--   1 root root      1528 Nov 10 18:01 ./source/ap/vim/patches/7.3.054.gz
+-rw-r--r--   1 root root      2770 Nov 10 19:44 ./source/ap/vim/patches/7.3.055.gz
+-rw-r--r--   1 root root      3899 Nov 16 10:33 ./source/ap/vim/patches/7.3.056.gz
+-rw-r--r--   1 root root      1037 Nov 16 13:07 ./source/ap/vim/patches/7.3.057.gz
+-rw-r--r--   1 root root      1650 Nov 16 13:46 ./source/ap/vim/patches/7.3.058.gz
+-rw-r--r--   1 root root      1464 Nov 16 14:06 ./source/ap/vim/patches/7.3.059.gz
+-rw-r--r--   1 root root      2038 Nov 16 14:49 ./source/ap/vim/patches/7.3.060.gz
+-rw-r--r--   1 root root      1483 Nov 16 15:26 ./source/ap/vim/patches/7.3.061.gz
+-rw-r--r--   1 root root      4145 Nov 16 18:27 ./source/ap/vim/patches/7.3.062.gz
+-rw-r--r--   1 root root      1019 Nov 24 11:36 ./source/ap/vim/patches/7.3.063.gz
+-rw-r--r--   1 root root      1207 Nov 24 13:30 ./source/ap/vim/patches/7.3.064.gz
+-rw-r--r--   1 root root      1336 Nov 24 14:52 ./source/ap/vim/patches/7.3.065.gz
+-rw-r--r--   1 root root      1364 Nov 24 17:02 ./source/ap/vim/patches/7.3.066.gz
+-rw-r--r--   1 root root      1074 Nov 24 17:02 ./source/ap/vim/patches/7.3.067.gz
+-rw-r--r--   1 root root       830 Nov 24 17:02 ./source/ap/vim/patches/7.3.068.gz
+-rw-r--r--   1 root root       869 Nov 24 17:49 ./source/ap/vim/patches/7.3.069.gz
+-rw-r--r--   1 root root       808 Dec  2 13:50 ./source/ap/vim/patches/7.3.070.gz
+-rw-r--r--   1 root root      1016 Dec  2 14:34 ./source/ap/vim/patches/7.3.071.gz
+-rw-r--r--   1 root root      3171 Dec  2 15:08 ./source/ap/vim/patches/7.3.072.gz
+-rw-r--r--   1 root root      1035 Dec  2 16:11 ./source/ap/vim/patches/7.3.073.gz
+-rw-r--r--   1 root root      2448 Dec  2 20:44 ./source/ap/vim/patches/7.3.074.gz
+-rw-r--r--   1 root root      1229 Dec  2 20:46 ./source/ap/vim/patches/7.3.075.gz
+-rw-r--r--   1 root root      2075 Dec  8 12:13 ./source/ap/vim/patches/7.3.076.gz
+-rw-r--r--   1 root root      1214 Dec  8 12:18 ./source/ap/vim/patches/7.3.077.gz
+-rw-r--r--   1 root root       818 Dec  8 13:24 ./source/ap/vim/patches/7.3.078.gz
+-rw-r--r--   1 root root       735 Dec  8 13:57 ./source/ap/vim/patches/7.3.079.gz
+-rw-r--r--   1 root root      1811 Dec  8 16:11 ./source/ap/vim/patches/7.3.080.gz
+-rw-r--r--   1 root root      1030 Dec  8 18:58 ./source/ap/vim/patches/7.3.081.gz
+-rw-r--r--   1 root root       890 Dec 17 11:20 ./source/ap/vim/patches/7.3.082.gz
+-rw-r--r--   1 root root      2964 Dec 17 15:28 ./source/ap/vim/patches/7.3.083.gz
+-rw-r--r--   1 root root      1445 Dec 17 17:07 ./source/ap/vim/patches/7.3.084.gz
+-rw-r--r--   1 root root      2407 Dec 17 17:07 ./source/ap/vim/patches/7.3.085.gz
+-rw-r--r--   1 root root      1607 Dec 17 17:54 ./source/ap/vim/patches/7.3.086.gz
+-rw-r--r--   1 root root      1436 Dec 17 19:27 ./source/ap/vim/patches/7.3.087.gz
+-rw-r--r--   1 root root      1560 Dec 24 12:40 ./source/ap/vim/patches/7.3.088.gz
+-rw-r--r--   1 root root       776 Dec 24 13:00 ./source/ap/vim/patches/7.3.089.gz
+-rw-r--r--   1 root root       971 Dec 30 10:42 ./source/ap/vim/patches/7.3.090.gz
+-rw-r--r--   1 root root      2776 Dec 30 11:32 ./source/ap/vim/patches/7.3.091.gz
+-rw-r--r--   1 root root       799 Dec 30 13:48 ./source/ap/vim/patches/7.3.092.gz
+-rw-r--r--   1 root root      1790 Dec 30 13:51 ./source/ap/vim/patches/7.3.093.gz
+-rw-r--r--   1 root root       887 Dec 30 13:58 ./source/ap/vim/patches/7.3.094.gz
+-rw-r--r--   1 root root       872 Jan  4 16:50 ./source/ap/vim/patches/7.3.095.gz
+-rw-r--r--   1 root root      1208 Jan  4 17:13 ./source/ap/vim/patches/7.3.096.gz
+-rw-r--r--   1 root root       973 Jan  4 18:04 ./source/ap/vim/patches/7.3.097.gz
+-rw-r--r--   1 root root       887 Jan  4 18:26 ./source/ap/vim/patches/7.3.098.gz
+-rw-r--r--   1 root root       786 Jan  8 13:47 ./source/ap/vim/patches/7.3.099.gz
+-rw-r--r--   1 root root       768 Jan 17 18:51 ./source/ap/vim/patches/7.3.100.gz
+-rw-r--r--   1 root root       970 Jan 17 18:54 ./source/ap/vim/patches/7.3.101.gz
+-rw-r--r--   1 root root      4239 Jan 17 19:09 ./source/ap/vim/patches/7.3.102.gz
+-rw-r--r--   1 root root      1481 Jan 21 23:14 ./source/ap/vim/patches/7.3.103.gz
+-rw-r--r--   1 root root       812 Jan 21 23:59 ./source/ap/vim/patches/7.3.104.gz
+-rw-r--r--   1 root root       852 Jan 22 00:14 ./source/ap/vim/patches/7.3.105.gz
+-rw-r--r--   1 root root       811 Jan 22 20:06 ./source/ap/vim/patches/7.3.106.gz
+-rw-r--r--   1 root root       980 Jan 22 20:25 ./source/ap/vim/patches/7.3.107.gz
+-rw-r--r--   1 root root      1276 Feb  1 12:50 ./source/ap/vim/patches/7.3.108.gz
+-rw-r--r--   1 root root      2469 Feb  1 13:01 ./source/ap/vim/patches/7.3.109.gz
+-rw-r--r--   1 root root      1001 Feb  1 16:13 ./source/ap/vim/patches/7.3.110.gz
+-rw-r--r--   1 root root      1575 Feb  1 17:02 ./source/ap/vim/patches/7.3.111.gz
+-rw-r--r--   1 root root       951 Feb  1 20:56 ./source/ap/vim/patches/7.3.112.gz
+-rw-r--r--   1 root root       870 Feb  9 13:47 ./source/ap/vim/patches/7.3.113.gz
+-rw-r--r--   1 root root       844 Feb  9 15:00 ./source/ap/vim/patches/7.3.114.gz
+-rw-r--r--   1 root root       826 Feb  9 15:45 ./source/ap/vim/patches/7.3.115.gz
+-rw-r--r--   1 root root       870 Feb  9 16:10 ./source/ap/vim/patches/7.3.116.gz
+-rw-r--r--   1 root root      1293 Feb  9 16:44 ./source/ap/vim/patches/7.3.117.gz
+-rw-r--r--   1 root root       980 Feb  9 17:48 ./source/ap/vim/patches/7.3.118.gz
+-rw-r--r--   1 root root       808 Feb 12 13:01 ./source/ap/vim/patches/7.3.119.gz
+-rw-r--r--   1 root root      1056 Feb 15 10:58 ./source/ap/vim/patches/7.3.120.gz
+-rw-r--r--   1 root root       943 Feb 15 13:25 ./source/ap/vim/patches/7.3.121.gz
+-rw-r--r--   1 root root      1513 Feb 15 14:28 ./source/ap/vim/patches/7.3.122.gz
+-rw-r--r--   1 root root       867 Feb 15 15:34 ./source/ap/vim/patches/7.3.123.gz
+-rw-r--r--   1 root root      2267 Feb 15 16:40 ./source/ap/vim/patches/7.3.124.gz
+-rw-r--r--   1 root root      1021 Feb 15 17:07 ./source/ap/vim/patches/7.3.125.gz
+-rw-r--r--   1 root root       822 Feb 25 13:43 ./source/ap/vim/patches/7.3.126.gz
+-rw-r--r--   1 root root       880 Feb 25 13:47 ./source/ap/vim/patches/7.3.127.gz
+-rw-r--r--   1 root root       868 Feb 25 14:12 ./source/ap/vim/patches/7.3.128.gz
+-rw-r--r--   1 root root      1613 Feb 25 14:14 ./source/ap/vim/patches/7.3.129.gz
+-rw-r--r--   1 root root       909 Feb 25 14:16 ./source/ap/vim/patches/7.3.130.gz
+-rw-r--r--   1 root root       711 Feb 25 14:18 ./source/ap/vim/patches/7.3.131.gz
+-rw-r--r--   1 root root      1205 Feb 25 14:19 ./source/ap/vim/patches/7.3.132.gz
+-rw-r--r--   1 root root      1321 Feb 25 15:53 ./source/ap/vim/patches/7.3.133.gz
+-rw-r--r--   1 root root       730 Feb 25 16:11 ./source/ap/vim/patches/7.3.134.gz
+-rw-r--r--   1 root root      1158 Feb 25 17:42 ./source/ap/vim/patches/7.3.135.gz
+-rw-r--r--   1 root root       887 Mar  3 14:02 ./source/ap/vim/patches/7.3.136.gz
+-rw-r--r--   1 root root      1258 Mar  3 14:05 ./source/ap/vim/patches/7.3.137.gz
+-rw-r--r--   1 root root       984 Mar  3 14:55 ./source/ap/vim/patches/7.3.138.gz
+-rw-r--r--   1 root root      1377 Mar 30 02:28 ./source/ap/vim/patches/7.3.139.gz
+-rw-r--r--   1 root root       893 Mar 30 02:28 ./source/ap/vim/patches/7.3.140.gz
+-rw-r--r--   1 root root      1303 Mar 22 13:36 ./source/ap/vim/patches/7.3.141.gz
+-rw-r--r--   1 root root      1135 Mar 22 14:49 ./source/ap/vim/patches/7.3.142.gz
+-rw-r--r--   1 root root     11270 Mar 22 17:12 ./source/ap/vim/patches/7.3.143.gz
+-rw-r--r--   1 root root       993 Mar 26 12:57 ./source/ap/vim/patches/7.3.144.gz
+-rw-r--r--   1 root root       981 Mar 26 17:33 ./source/ap/vim/patches/7.3.145.gz
+-rw-r--r--   1 root root      2415 Mar 27 14:04 ./source/ap/vim/patches/7.3.146.gz
+-rw-r--r--   1 root root       814 Apr  1 11:07 ./source/ap/vim/patches/7.3.147.gz
+-rw-r--r--   1 root root      2468 Apr  1 12:46 ./source/ap/vim/patches/7.3.148.gz
+-rw-r--r--   1 root root      1002 Apr  1 13:35 ./source/ap/vim/patches/7.3.149.gz
+-rw-r--r--   1 root root      1201 Apr  1 14:08 ./source/ap/vim/patches/7.3.150.gz
+-rw-r--r--   1 root root       937 Apr  1 14:30 ./source/ap/vim/patches/7.3.151.gz
+-rw-r--r--   1 root root      3970 Apr  1 17:16 ./source/ap/vim/patches/7.3.152.gz
+-rw-r--r--   1 root root       905 Apr  2 12:46 ./source/ap/vim/patches/7.3.153.gz
+-rw-r--r--   1 root root      1394 Apr  2 13:14 ./source/ap/vim/patches/7.3.154.gz
+-rw-r--r--   1 root root       839 Jul 21  2006 ./source/ap/vim/slack-desc.vim
+-rw-r--r--   1 root root       964 Jul 21  2006 ./source/ap/vim/slack-desc.vim-gvim
+-rw-r--r--   1 root root   6922196 Aug 15  2010 ./source/ap/vim/vim-7.3.tar.xz
+-rwxr-xr-x   1 root root      6533 Aug 28  2010 ./source/ap/vim/vim-gvim.SlackBuild
+-rw-r--r--   1 root root     34845 Mar 28 19:08 ./source/ap/vim/vim-runtime-syntax-20110328.diff.gz
+-rwxr-xr-x   1 root root      6828 Aug 28  2010 ./source/ap/vim/vim.SlackBuild
+-rw-r--r--   1 root root       303 May 28  2009 ./source/ap/vim/vim.vimrc.diff.gz
+drwxr-xr-x   2 root root      4096 Jul 28  2010 ./source/ap/vorbis-tools
+-rw-r--r--   1 root root      1071 Dec 19  2003 ./source/ap/vorbis-tools/slack-desc
+-rw-r--r--   1 root root    677868 Mar 26  2010 ./source/ap/vorbis-tools/vorbis-tools-1.4.0.tar.xz
+-rwxr-xr-x   1 root root      2702 Jul 28  2010 ./source/ap/vorbis-tools/vorbis-tools.SlackBuild
+drwxr-xr-x   2 root root      4096 Jul 28  2010 ./source/ap/workbone
+-rw-r--r--   1 root root       689 Mar 23  2002 ./source/ap/workbone/slack-desc
+-rw-r--r--   1 root root       262 Feb 14  2003 ./source/ap/workbone/workbone.1.diff.gz
+-rwxr-xr-x   1 root root      2551 Jul 28  2010 ./source/ap/workbone/workbone.SlackBuild
+-rw-r--r--   1 root root      4997 Jun  5  2008 ./source/ap/workbone/workbone_2.40-9.diff.gz
+-rw-r--r--   1 root root     21877 Oct 15  1998 ./source/ap/workbone/workbone_2.40.orig.tar.gz
+drwxr-xr-x   2 root root      4096 Feb  9  2010 ./source/ap/xfsdump
+-rw-r--r--   1 root root       983 Feb 22  2006 ./source/ap/xfsdump/slack-desc
+-rw-r--r--   1 root root    560656 Jan 13  2010 ./source/ap/xfsdump/xfsdump-3.0.4.tar.xz
+-rwxr-xr-x   1 root root      3906 Feb  9  2010 ./source/ap/xfsdump/xfsdump.SlackBuild
+-rw-r--r--   1 root root       473 Feb  9  2010 ./source/ap/xfsdump/xfsdump.destdir.diff.gz
+drwxr-xr-x   2 root root      4096 Mar 19 23:48 ./source/ap/zsh
+-rw-r--r--   1 root root       140 Apr 10  2007 ./source/ap/zsh/doinst.sh.gz
+-rw-r--r--   1 root root       962 Feb 14  2002 ./source/ap/zsh/slack-desc
+-rw-r--r--   1 root root   2516540 Dec 20 15:10 ./source/ap/zsh/zsh-4.3.11-doc.tar.xz
+-rw-r--r--   1 root root   2419260 Dec 20 16:06 ./source/ap/zsh/zsh-4.3.11.tar.xz
+-rwxr-xr-x   1 root root      4074 Mar 19 23:48 ./source/ap/zsh/zsh.SlackBuild
+-rw-r--r--   1 root root       262 Mar 19 23:50 ./source/ap/zsh/zsh.regex.oh.bah.diff.gz
+drwxr-xr-x  41 root root      4096 Mar 29 05:28 ./source/d
+drwxr-xr-x   2 root root      4096 Nov  6 17:42 ./source/d/autoconf
+-rw-r--r--   1 root root   1167804 Sep 22  2010 ./source/d/autoconf/autoconf-2.68.tar.xz
+-rw-r--r--   1 root root       556 Sep 22  2010 ./source/d/autoconf/autoconf-2.68.tar.xz.sig
+-rwxr-xr-x   1 root root      2929 Nov  6 17:44 ./source/d/autoconf/autoconf.SlackBuild
+-rw-r--r--   1 root root       339 May 30  2001 ./source/d/autoconf/doinst.sh.gz
+-rw-r--r--   1 root root      1090 Mar 23  2002 ./source/d/autoconf/slack-desc
+drwxr-xr-x   2 root root      4096 Jan 12  2010 ./source/d/automake
+-rw-r--r--   1 root root    934172 Dec  8  2009 ./source/d/automake/automake-1.11.1.tar.xz
+-rwxr-xr-x   1 root root      3016 Dec 15 01:05 ./source/d/automake/automake.SlackBuild
+-rw-r--r--   1 root root       348 May 30  2001 ./source/d/automake/doinst.sh.gz
+-rw-r--r--   1 root root      1086 Mar 23  2002 ./source/d/automake/slack-desc
+drwxr-xr-x   2 root root      4096 Jan 22 04:39 ./source/d/binutils
+-rw-r--r--   1 root root       249 Jan 19 00:26 ./source/d/binutils/binutils-2.21.51.0.6.tar.sign
+-rw-r--r--   1 root root  12320416 Jan 19 00:26 ./source/d/binutils/binutils-2.21.51.0.6.tar.xz
+-rwxr-xr-x   1 root root      5799 Jan  6 19:24 ./source/d/binutils/binutils.SlackBuild
+-rw-r--r--   1 root root      8418 Jan 19 01:46 ./source/d/binutils/release.binutils-2.21.51.0.6
+-rw-r--r--   1 root root       902 Mar 22  2002 ./source/d/binutils/slack-desc
+drwxr-xr-x   2 root root      4096 Aug 14  2010 ./source/d/bison
+-rw-r--r--   1 root root   1652612 Aug  6  2010 ./source/d/bison/bison-2.4.3.tar.bz2
+-rwxr-xr-x   1 root root      3327 Dec  4 18:28 ./source/d/bison/bison.SlackBuild
+-rw-r--r--   1 root root       927 Mar 23  2002 ./source/d/bison/slack-desc
+drwxr-xr-x   2 root root      4096 Jan 11 20:14 ./source/d/ccache
+-rw-r--r--   1 root root    233936 Jan  9 19:59 ./source/d/ccache/ccache-3.1.4.tar.xz
+-rw-r--r--   1 root root       198 Jan  9 19:59 ./source/d/ccache/ccache-3.1.4.tar.xz.asc
+-rwxr-xr-x   1 root root      2889 Jan 11 20:15 ./source/d/ccache/ccache.SlackBuild
+-rw-r--r--   1 root root       771 Mar 18  2003 ./source/d/ccache/slack-desc
+drwxr-xr-x   2 root root      4096 Jul 20  2010 ./source/d/clisp
+-rw-r--r--   1 root root   8091011 Jul  7  2010 ./source/d/clisp/clisp-2.49.tar.bz2
+-rw-r--r--   1 root root        65 Jul  7  2010 ./source/d/clisp/clisp-2.49.tar.bz2.sig
+-rwxr-xr-x   1 root root      5799 Jul 20  2010 ./source/d/clisp/clisp.SlackBuild
+-rw-r--r--   1 root root    898945 Sep 11  2008 ./source/d/clisp/ffcall-20080704cvs.tar.bz2
+-rw-r--r--   1 root root    264500 Dec 11  2009 ./source/d/clisp/libsigsegv-2.8.tar.xz
+-rw-r--r--   1 root root      1121 Jul 17  2003 ./source/d/clisp/slack-desc
+-rwxr-xr-x   1 root root       242 Sep 11  2008 ./source/d/clisp/source.download
+drwxr-xr-x   2 root root      4096 Mar 17 23:01 ./source/d/cmake
+-rw-r--r--   1 root root   3725240 Feb 15 20:54 ./source/d/cmake/cmake-2.8.4.tar.xz
+-rwxr-xr-x   1 root root      3635 Jan  2 22:51 ./source/d/cmake/cmake.SlackBuild
+-rw-r--r--   1 root root       852 Apr  9  2008 ./source/d/cmake/slack-desc
+drwxr-xr-x   2 root root      4096 May  3  2010 ./source/d/cscope
+-rw-r--r--   1 root root    361214 Apr 30  2009 ./source/d/cscope/cscope-15.7a.tar.bz2
+-rwxr-xr-x   1 root root      2952 May  3  2010 ./source/d/cscope/cscope.SlackBuild
+-rw-r--r--   1 root root       805 Aug 20  2003 ./source/d/cscope/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/d/cvs
+-rw-r--r--   1 root root   2942652 May  8  2008 ./source/d/cvs/cvs-1.11.23.tar.bz2
+-rw-r--r--   1 root root        65 May  8  2008 ./source/d/cvs/cvs-1.11.23.tar.bz2.sig
+-rwxr-xr-x   1 root root      3149 Jul 29  2010 ./source/d/cvs/cvs.SlackBuild
+-rw-r--r--   1 root root       992 Feb 23  2002 ./source/d/cvs/slack-desc
+drwxr-xr-x   2 root root      4096 May 23  2009 ./source/d/dev86
+-rw-r--r--   1 root root    703028 Oct 16  2007 ./source/d/dev86/Dev86src-0.16.17.tar.gz
+-rw-r--r--   1 root root       408 Mar 28  2008 ./source/d/dev86/README
+-rw-r--r--   1 root root       361 Sep 23  2008 ./source/d/dev86/dev86-x86_64.noelks.patch.gz
+-rw-r--r--   1 root root       342 Sep 22  2008 ./source/d/dev86/dev86-x86_64.patch.gz
+-rwxr-xr-x   1 root root      3662 Jul 29  2010 ./source/d/dev86/dev86.SlackBuild
+-rw-r--r--   1 root root       312 Mar 29  2008 ./source/d/dev86/dev86.info
+-rw-r--r--   1 root root       490 Sep 18  2008 ./source/d/dev86/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/d/distcc
+-rw-r--r--   1 root root    341601 Dec 22  2004 ./source/d/distcc/distcc-2.18.3.tar.bz2
+-rw-r--r--   1 root root       189 Dec 22  2004 ./source/d/distcc/distcc-2.18.3.tar.bz2.asc
+-rwxr-xr-x   1 root root      2921 Jul 29  2010 ./source/d/distcc/distcc.SlackBuild
+-rw-r--r--   1 root root       940 Feb 19  2003 ./source/d/distcc/slack-desc
+drwxr-xr-x   2 root root      4096 Jan 11 20:19 ./source/d/doxygen
+-rw-r--r--   1 root root   2976276 Jan  3 16:03 ./source/d/doxygen/doxygen-1.7.3.src.tar.xz
+-rwxr-xr-x   1 root root      3549 Nov  6 18:22 ./source/d/doxygen/doxygen.SlackBuild
+-rw-r--r--   1 root root       969 Feb 11  2008 ./source/d/doxygen/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/d/flex
+-rw-r--r--   1 root root   1256501 Feb 26  2008 ./source/d/flex/flex-2.5.35.tar.bz2
+-rwxr-xr-x   1 root root      3607 Jul 29  2010 ./source/d/flex/flex.SlackBuild
+-rw-r--r--   1 root root       786 Sep 20  2006 ./source/d/flex/slack-desc
+drwxr-xr-x   3 root root      4096 Jan  4 04:41 ./source/d/gcc
+-rw-r--r--   1 root root   1470676 Jan  6  2010 ./source/d/gcc/ecj-4.5.jar
+-rw-rw-r--   1 root root    482116 Jan 16  2009 ./source/d/gcc/fastjar-0.97.tar.xz
+drwxr-xr-x   2 root root      4096 Oct  4  2010 ./source/d/gcc/fastjar-patches
+-rw-r--r--   1 root root       554 Jan 16  2009 ./source/d/gcc/fastjar-patches/1000-fastjar-0.97-segfault.patch.gz
+-rw-r--r--   1 root root       345 Dec 22  2009 ./source/d/gcc/fastjar-patches/1001-fastjar-0.97-len1.patch.gz
+-rw-r--r--   1 root root       358 Jun 11  2010 ./source/d/gcc/fastjar-patches/1002-fastjar-0.97-filename0.patch.gz
+-rw-r--r--   1 root root      1211 Jun 11  2010 ./source/d/gcc/fastjar-patches/1003-fastjar-CVE-2010-0831.patch.gz
+-rw-r--r--   1 root root       514 Jun 24  2010 ./source/d/gcc/fastjar-patches/1004-fastjar-man.patch.gz
+-rw-r--r--   1 root root  51230644 Dec 16 14:50 ./source/d/gcc/gcc-4.5.2.tar.xz
+-rw-r--r--   1 root root       527 Aug  1  2010 ./source/d/gcc/gcc-no_fixincludes.diff.gz
+-rwxr-xr-x   1 root root     25005 Feb  8 02:15 ./source/d/gcc/gcc.SlackBuild
+-rw-r--r--   1 root root       756 Feb 21  2002 ./source/d/gcc/slack-desc.gcc
+-rw-r--r--   1 root root       753 Feb 21  2002 ./source/d/gcc/slack-desc.gcc-g++
+-rw-r--r--   1 root root      1231 Nov  8  2007 ./source/d/gcc/slack-desc.gcc-gfortran
+-rw-r--r--   1 root root       843 Jul 30  2006 ./source/d/gcc/slack-desc.gcc-gnat
+-rw-r--r--   1 root root       817 Jul 30  2006 ./source/d/gcc/slack-desc.gcc-java
+-rw-r--r--   1 root root       962 Jul 30  2006 ./source/d/gcc/slack-desc.gcc-objc
+drwxr-xr-x   2 root root      4096 Nov 27 22:20 ./source/d/gdb
+-rw-r--r--   1 root root  13982712 Sep  3  2010 ./source/d/gdb/gdb-7.2.tar.xz
+-rwxr-xr-x   1 root root      3810 Apr  7 23:37 ./source/d/gdb/gdb.SlackBuild
+-rw-r--r--   1 root root      1211 Feb 11  2008 ./source/d/gdb/slack-desc
+lrwxrwxrwx   1 root root        12 Jul 29  2010 ./source/d/gettext-tools -> ../a/gettext
+drwxr-xr-x   2 root root      4096 Apr 14 17:52 ./source/d/git
+-rw-r--r--   1 root root       249 Apr  6 19:16 ./source/d/git/git-1.7.4.4.tar.sign
+-rw-r--r--   1 root root   2431840 Apr  6 19:16 ./source/d/git/git-1.7.4.4.tar.xz
+-rwxr-xr-x   1 root root      4792 Feb 16 04:07 ./source/d/git/git.SlackBuild
+-rw-r--r--   1 root root       851 May 30  2009 ./source/d/git/slack-desc
+drwxr-xr-x   2 root root      4096 Jul 29  2010 ./source/d/gperf
+-rw-r--r--   1 root root    676172 Feb  3  2009 ./source/d/gperf/gperf-3.0.4.tar.xz
+-rwxr-xr-x   1 root root      3432 Jul 29  2010 ./source/d/gperf/gperf.SlackBuild
+-rw-r--r--   1 root root      1018 Feb 14  2007 ./source/d/gperf/slack-desc
+drwxr-xr-x   2 root root      4096 Jan 11 19:06 ./source/d/guile
+-rw-r--r--   1 root root   2320720 Dec 13 20:36 ./source/d/guile/guile-1.8.8.tar.xz
+-rwxr-xr-x   1 root root      3456 Jan 11 19:08 ./source/d/guile/guile.SlackBuild
+-rw-r--r--   1 root root       894 Feb 11  2008 ./source/d/guile/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/d/indent
+-rw-r--r--   1 root root    531879 Mar  4  2009 ./source/d/indent/indent-2.2.10.tar.bz2
+-rwxr-xr-x   1 root root      3581 Jul 29  2010 ./source/d/indent/indent.SlackBuild
+-rw-r--r--   1 root root       889 Mar  4  2009 ./source/d/indent/slack-desc
+drwxr-xr-x   2 root root      4096 Jan 11 19:15 ./source/d/intltool
+-rw-r--r--   1 root root    106831 Mar 24  2010 ./source/d/intltool/intltool-0.41.1.tar.bz2
+-rwxr-xr-x   1 root root      3802 Apr 30  2010 ./source/d/intltool/intltool.SlackBuild
+-rw-r--r--   1 root root       692 Sep 18  2008 ./source/d/intltool/slack-desc
+drwxr-xr-x   2 root root      4096 May 29  2009 ./source/d/kernel-headers
+-rw-r--r--   1 root root       797 Sep  4  2003 ./source/d/kernel-headers/slack-desc
+drwxr-xr-x   2 root root      4096 Nov  6 18:39 ./source/d/libtool
+-rw-r--r--   1 root root       385 May 30  2009 ./source/d/libtool/doinst.sh.gz
+-rw-r--r--   1 root root    852248 Sep 22  2010 ./source/d/libtool/libtool-2.4.tar.xz
+-rw-r--r--   1 root root        72 Sep 22  2010 ./source/d/libtool/libtool-2.4.tar.xz.sig
+-rwxr-xr-x   1 root root      3162 Nov  6 18:40 ./source/d/libtool/libtool.SlackBuild
+-rw-r--r--   1 root root       506 Nov  6 18:38 ./source/d/libtool/libtool.no.moved.warning.diff.gz
+-rw-r--r--   1 root root       958 May 30  2009 ./source/d/libtool/slack-desc
+drwxr-xr-x   2 root root      4096 Mar  2 23:25 ./source/d/m4
+-rw-r--r--   1 root root   1005264 Mar  1 19:45 ./source/d/m4/m4-1.4.16.tar.xz
+-rw-r--r--   1 root root       556 Mar  1 19:45 ./source/d/m4/m4-1.4.16.tar.xz.sig
+-rwxr-xr-x   1 root root      3981 Mar  2 23:26 ./source/d/m4/m4.SlackBuild
+-rw-r--r--   1 root root       928 Oct 15  2008 ./source/d/m4/slack-desc
+drwxr-xr-x   2 root root      4096 Jul 29  2010 ./source/d/make
+-rw-r--r--   1 root root   1242186 Jul 28  2010 ./source/d/make/make-3.82.tar.bz2
+-rw-r--r--   1 root root        72 Jul 28  2010 ./source/d/make/make-3.82.tar.bz2.sig
+-rwxr-xr-x   1 root root      3320 Aug 30  2010 ./source/d/make/make.SlackBuild
+-rw-r--r--   1 root root       923 Mar 23  2002 ./source/d/make/slack-desc
+drwxr-xr-x   2 root root      4096 Apr  4 03:00 ./source/d/mercurial
+-rw-r--r--   1 root root       279 May 18  2010 ./source/d/mercurial/doinst.sh.gz
+-rw-r--r--   1 root root   1330072 Apr  1 17:46 ./source/d/mercurial/mercurial-1.8.2.tar.xz
+-rwxr-xr-x   1 root root      3734 May 18  2010 ./source/d/mercurial/mercurial.SlackBuild
+-rw-r--r--   1 root root      1253 May 14  2006 ./source/d/mercurial/slack-desc
+drwxr-xr-x   2 root root      4096 Jan 11 19:17 ./source/d/nasm
+-rw-r--r--   1 root root    801640 Nov 22 19:29 ./source/d/nasm/nasm-2.09.04.tar.bz2
+-rwxr-xr-x   1 root root      2797 Jan 11 19:18 ./source/d/nasm/nasm.SlackBuild
+-rw-r--r--   1 root root       765 May 28  2002 ./source/d/nasm/slack-desc
+drwxr-xr-x   2 root root      4096 Feb 12  2010 ./source/d/oprofile
+-rw-r--r--   1 root root    788892 Nov 24  2009 ./source/d/oprofile/oprofile-0.9.6.tar.xz
+-rwxr-xr-x   1 root root      4153 Jan 22 04:50 ./source/d/oprofile/oprofile.SlackBuild
+-rw-r--r--   1 root root     14520 Jun 29  2009 ./source/d/oprofile/oprofile.qt4.diff.gz
+-rw-r--r--   1 root root       965 Sep  8  2003 ./source/d/oprofile/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/d/p2c
+-rw-r--r--   1 root root       409 Jun  2  2007 ./source/d/p2c/_p2c.tar.gz
+-rw-r--r--   1 root root    423399 Jul  4  1996 ./source/d/p2c/p2c-1.21alpha2.tar.gz
+-rwxr-xr-x   1 root root      4424 Jul 29  2010 ./source/d/p2c/p2c.SlackBuild
+-rw-r--r--   1 root root       268 Jun  2  2007 ./source/d/p2c/p2c.examples.diff.gz
+-rw-r--r--   1 root root      4450 May  5  2005 ./source/d/p2c/p2c_1.21alpha2-2.1.diff.gz
+-rw-r--r--   1 root root       168 Oct 31  2008 ./source/d/p2c/p2c_time.diff.gz
+-rw-r--r--   1 root root      1000 Mar 23  2002 ./source/d/p2c/slack-desc
+drwxr-xr-x   2 root root      4096 Jan 26 03:25 ./source/d/perl
+-rw-r--r--   1 root root    133427 Oct 26 16:59 ./source/d/perl/DBD-mysql-4.018.tar.gz
+-rw-r--r--   1 root root    576803 Dec 30 10:26 ./source/d/perl/DBI-1.616.tar.gz
+-rw-r--r--   1 root root     80723 Jan 22 23:34 ./source/d/perl/URI-1.58.tar.gz
+-rw-r--r--   1 root root    237891 Sep 15  2010 ./source/d/perl/XML-Parser-2.40.tar.gz
+-rw-r--r--   1 root root     71129 Aug 15  2007 ./source/d/perl/XML-Simple-2.18.tar.gz
+-rw-r--r--   1 root root   9292208 Jan 22 02:40 ./source/d/perl/perl-5.12.3.tar.xz
+-rwxr-xr-x   1 root root      8929 Jan 26 18:38 ./source/d/perl/perl.SlackBuild
+-rw-r--r--   1 root root       606 Sep 21  2008 ./source/d/perl/perl.configure.multilib.patch.gz
+-rw-r--r--   1 root root       971 Jul 23  2002 ./source/d/perl/slack-desc
+drwxr-xr-x   3 root root      4096 Jul 29  2010 ./source/d/pkg-config
+-rw-r--r--   1 root root       143 Apr  9  2008 ./source/d/pkg-config/doinst.sh.gz
+-rw-r--r--   1 root root    492420 May 28  2010 ./source/d/pkg-config/pkg-config-0.25.tar.xz
+-rwxr-xr-x   1 root root      3534 Jul 29  2010 ./source/d/pkg-config/pkg-config.SlackBuild
+drwxr-xr-x   2 root root      4096 Aug 20  2006 ./source/d/pkg-config/scripts
+-rwxr-xr-x   1 root root       194 May 24  2007 ./source/d/pkg-config/scripts/pkgconfig.csh
+-rwxr-xr-x   1 root root       204 May 24  2007 ./source/d/pkg-config/scripts/pkgconfig.sh
+-rw-r--r--   1 root root       907 Feb 11  2008 ./source/d/pkg-config/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/d/pmake
+-rw-r--r--   1 root root    264383 Jul  7  2005 ./source/d/pmake/pmake-1.111.tar.gz
+-rwxr-xr-x   1 root root      4221 Mar 29 04:17 ./source/d/pmake/pmake.SlackBuild
+-rw-r--r--   1 root root       265 Mar 24  2007 ./source/d/pmake/pmake.strerror.strdup.diff.gz
+-rw-r--r--   1 root root     38071 Feb  9  2007 ./source/d/pmake/pmake.txt.gz
+-rw-r--r--   1 root root     26675 Jul  7  2005 ./source/d/pmake/pmake_1.111-1.diff.gz
+-rw-r--r--   1 root root       795 Feb  9  2007 ./source/d/pmake/slack-desc
+drwxr-xr-x   2 root root      4096 Nov 27 23:26 ./source/d/python
+-rw-r--r--   1 root root   8949356 Aug 24  2010 ./source/d/python/Python-2.6.6.tar.xz
+-rw-r--r--   1 root root   1324848 Aug 24  2010 ./source/d/python/python-2.6.6-docs-text.tar.xz
+-rwxr-xr-x   1 root root      4674 Nov 27 23:26 ./source/d/python/python.SlackBuild
+-rw-r--r--   1 root root       422 Nov 27 23:26 ./source/d/python/python.pure64.diff.gz
+-rw-r--r--   1 root root       327 Nov 27 23:08 ./source/d/python/python.readline.set_pre_input_hook.diff.gz
+-rw-r--r--   1 root root      2071 Nov 27 23:23 ./source/d/python/python.x86_64.diff.gz
+-rw-r--r--   1 root root       895 Mar 23  2002 ./source/d/python/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/d/rcs
+-rw-r--r--   1 root root     10982 Jun 27  2007 ./source/d/rcs/_rcs.tar.gz
+-rw-r--r--   1 root root       270 Aug 12  1995 ./source/d/rcs/rcs-5.7.diff.gz
+-rw-r--r--   1 root root    282413 Jun 16  1995 ./source/d/rcs/rcs-5.7.tar.gz
+-rwxr-xr-x   1 root root      3037 Jan 25  2010 ./source/d/rcs/rcs.SlackBuild
+-rw-r--r--   1 root root       776 Mar 23  2002 ./source/d/rcs/slack-desc
+drwxr-xr-x   2 root root      4096 Mar  6 21:25 ./source/d/ruby
+-rw-r--r--   1 root root   5561312 Feb 18 13:08 ./source/d/ruby/ruby-1.9.1-p431.tar.xz
+-rwxr-xr-x   1 root root      4717 Mar  6 21:26 ./source/d/ruby/ruby.SlackBuild
+-rw-r--r--   1 root root       865 Jul 20  2006 ./source/d/ruby/slack-desc
+drwxr-xr-x   2 root root      4096 Nov  8 21:30 ./source/d/slacktrack
+-rw-r--r--   1 root root     27340 May 15  2009 ./source/d/slacktrack/OVERVIEW
+-rw-r--r--   1 root root     85852 Nov  9 16:03 ./source/d/slacktrack/slacktrack-2.08-source.tar.xz
+-rwxr-xr-x   1 root root       332 Nov  9 16:04 ./source/d/slacktrack/slacktrack.SlackBuild
+drwxr-xr-x   2 root root      4096 Jul 29  2010 ./source/d/strace
+-rw-r--r--   1 root root      1007 Apr  6  2002 ./source/d/strace/slack-desc
+-rw-r--r--   1 root root    504078 Jul 29  2010 ./source/d/strace/strace-4.5.20.tar.bz2
+-rwxr-xr-x   1 root root      2759 Jul 29  2010 ./source/d/strace/strace.SlackBuild
+drwxr-xr-x   2 root root      4096 Mar  9 20:39 ./source/d/subversion
+-rwxr-xr-x   1 root root       185 May 30  2009 ./source/d/subversion/get-svn-book.sh
+-rw-r--r--   1 root root      1058 Apr 30  2010 ./source/d/subversion/slack-desc
+-rw-r--r--   1 root root   4426856 Mar  3 19:46 ./source/d/subversion/subversion-1.6.16.tar.xz
+-rwxr-xr-x   1 root root      5458 Mar  9 20:59 ./source/d/subversion/subversion.SlackBuild
+-rw-r--r--   1 root root    421431 Mar  9 07:03 ./source/d/subversion/svn-book-html.tar.bz2
+drwxr-xr-x   2 root root      4096 Jan 26 19:15 ./source/d/swig
+-rw-r--r--   1 root root      1018 Mar  8  2009 ./source/d/swig/slack-desc
+-rw-r--r--   1 root root   3888548 Jan 31  2009 ./source/d/swig/swig-1.3.38.tar.bz2
+-rwxr-xr-x   1 root root      3623 Jan 26 19:15 ./source/d/swig/swig.SlackBuild
+-rw-r--r--   1 root root        61 Feb 23  2009 ./source/d/swig/swig.url
+drwxr-xr-x   2 root root      4096 Aug 31  2010 ./source/d/yasm
+-rw-r--r--   1 root root      1047 Jun 16  2008 ./source/d/yasm/slack-desc
+-rw-r--r--   1 root root    905836 Aug  7  2010 ./source/d/yasm/yasm-1.1.0.tar.xz
+-rwxr-xr--   1 root root      7478 Aug 31  2010 ./source/d/yasm/yasm.SlackBuild
+drwxr-xr-x   3 root root      4096 Mar 16  2010 ./source/e
+drwxr-xr-x   2 root root      4096 Mar 12 19:27 ./source/e/emacs
+-rw-r--r--   1 root root       312 Apr  6  2008 ./source/e/emacs/doinst.sh.gz
+-rw-r--r--   1 root root  29323756 Mar 10 02:45 ./source/e/emacs/emacs-23.3.tar.xz
+-rwxr-xr-x   1 root root      5152 Mar 12 19:35 ./source/e/emacs/emacs.SlackBuild
+-rw-r--r--   1 root root       549 Apr  6  2008 ./source/e/emacs/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 16  2009 ./source/f
+-rw-r--r--   1 root root       963 Feb 25  2002 ./source/f/slack-desc.linux-faqs
+-rw-r--r--   1 root root       804 Feb 25  2002 ./source/f/slack-desc.linux-howtos
+drwxr-xr-x   4 root root      4096 Mar 26 04:42 ./source/installer
+-rw-r--r--   1 root root   1884368 Mar 13 01:48 ./source/installer/busybox-1.18.4.tar.xz
+-rw-r--r--   1 root root     26549 Apr 12 00:18 ./source/installer/busybox-dot-config
+-rw-r--r--   1 root root       275 Dec 31  2009 ./source/installer/busybox.2.6.32.2.diff.gz
+-rwxr-xr-x   1 root root      2388 Mar 26 04:42 ./source/installer/busybox.SlackBuild
+drwxr-xr-x   2 root root      4096 Jan 20  2010 ./source/installer/dhcpcd
+-rw-r--r--   1 root root       311 Mar  6  2009 ./source/installer/dhcpcd/config.h.diff.gz
+-rw-r--r--   1 root root     45030 Aug 26  2008 ./source/installer/dhcpcd/dhcpcd-3.2.3.tar.bz2
+-rw-r--r--   1 root root       391 Mar  7  2009 ./source/installer/dhcpcd/dhcpcd.sh.diff.gz
+drwxr-xr-x   2 root root      4096 Mar 13  2008 ./source/installer/dropbear
+-rw-r--r--   1 root root       372 Mar 13  2008 ./source/installer/dropbear/doinst.sh
+-rw-r--r--   1 root root   1589729 Mar 13  2008 ./source/installer/dropbear/dropbear-0.50.tar.bz2
+-rwxr-xr--   1 root root      4332 Mar 13  2008 ./source/installer/dropbear/dropbear.Slackbuild
+-rw-r--r--   1 root root       414 Mar 13  2008 ./source/installer/dropbear/dropbear.xauth.patch
+-rw-r--r--   1 root root       582 Mar 13  2008 ./source/installer/dropbear/dropbear_dbclientpath.patch
+-rw-r--r--   1 root root      1887 Mar 13  2008 ./source/installer/dropbear/dropbear_emptypass.patch
+-rw-r--r--   1 root root      1795 Mar 13  2008 ./source/installer/dropbear/rc.dropbear.new
+-rw-r--r--   1 root root       890 Mar 13  2008 ./source/installer/dropbear/slack-desc
+-rw-r--r--   1 root root    161644 Mar 23 21:16 ./source/installer/memtest86+-4.20.tar.xz
+drwxr-xr-x   6 root root      4096 Apr 12 17:43 ./source/k
+-rw-r--r--   1 root root      1208 Apr  7 06:09 ./source/k/README.TXT
+-rw-r--r--   1 root root      2975 Mar  2 21:58 ./source/k/README_SPEAKUP_PATCH.TXT
+-rw-r--r--   1 root root    112324 Apr  9 17:54 ./source/k/config-generic-2.6.37.6
+-rw-r--r--   1 root root    112298 Apr 10 03:43 ./source/k/config-huge-2.6.37.6
+drwxr-xr-x   2 root root      4096 Apr  9 18:25 ./source/k/kernel-firmware
+-rwxr-xr-x   1 root root      1679 Apr  9 18:25 ./source/k/kernel-firmware/kernel-firmware.SlackBuild
+-rw-r--r--   1 root root       344 Oct 16  2008 ./source/k/kernel-firmware/slack-desc
+drwxr-xr-x   2 root root      4096 Apr  9 18:25 ./source/k/kernel-generic
+-rwxr-xr-x   1 root root      2909 Apr  9 18:25 ./source/k/kernel-generic/kernel-generic.SlackBuild
+-rw-r--r--   1 root root      1091 Jun 18  2009 ./source/k/kernel-generic/slack-desc
+drwxr-xr-x   2 root root      4096 Apr 10 03:50 ./source/k/kernel-huge
+-rwxr-xr-x   1 root root      2906 Apr 10 03:50 ./source/k/kernel-huge/kernel-huge.SlackBuild
+-rw-r--r--   1 root root      1100 Jun 18  2009 ./source/k/kernel-huge/slack-desc
+drwxr-xr-x   2 root root      4096 Apr  9 18:25 ./source/k/kernel-modules
+-rwxr-xr-x   1 root root      2872 Apr  9 18:25 ./source/k/kernel-modules/kernel-modules.SlackBuild
+-rwxr-xr-x   1 root root     35406 Jun  4  2009 ./source/k/kernel-modules/rc.modules.new
+-rw-r--r--   1 root root       985 Jun 18  2009 ./source/k/kernel-modules/slack-desc
+-rw-r--r--   1 root root       249 Mar 27 22:47 ./source/k/linux-2.6.37.6.tar.sign
+-rw-r--r--   1 root root  61028204 Mar 27 22:47 ./source/k/linux-2.6.37.6.tar.xz
+drwxr-xr-x  40 root root      4096 Mar 13 19:53 ./source/kde
+-rwxr-xr-x   1 root root      1992 Dec  2 22:44 ./source/kde/KDE.SlackBuild
+-rw-r--r--   1 root root      1598 Jan  7 06:58 ./source/kde/KDE.options
+-rwxr-xr-x   1 root root      1334 Mar 13 19:53 ./source/kde/KDE_extra.SlackBuild
+drwxr-xr-x   2 root root      4096 Nov  3  2009 ./source/kde/amarok
+-rwxr-xr-x   1 root root      3561 Nov  3  2009 ./source/kde/amarok/amarok.SlackBuild
+-rw-r--r--   1 root root       118 May 17  2008 ./source/kde/amarok/doinst.sh.gz
+-rw-r--r--   1 root root        14 Jan 15 18:33 ./source/kde/amarok/local.options
+-rw-r--r--   1 root root       779 May 26  2008 ./source/kde/amarok/slack-desc
+drwxr-xr-x   2 root root      4096 Jan 16 17:32 ./source/kde/k3b
+-rw-r--r--   1 root root       118 May 17  2008 ./source/kde/k3b/doinst.sh.gz
+-rwxr-xr-x   1 root root      2876 Jan 16 17:32 ./source/kde/k3b/k3b.SlackBuild
+-rw-r--r--   1 root root        22 Jan 26 05:17 ./source/kde/k3b/local.options
+-rw-r--r--   1 root root       836 Jun 15  2004 ./source/kde/k3b/slack-desc
+drwxr-xr-x   2 root root      4096 Jun  5  2010 ./source/kde/kaudiocreator
+-rw-r--r--   1 root root       118 May 17  2008 ./source/kde/kaudiocreator/doinst.sh.gz
+-rwxr-xr-x   1 root root      2704 Jun  5  2010 ./source/kde/kaudiocreator/kaudiocreator.SlackBuild
+-rw-r--r--   1 root root        25 Jan  7 06:27 ./source/kde/kaudiocreator/local.options
+-rw-r--r--   1 root root       752 Dec 16  2009 ./source/kde/kaudiocreator/slack-desc
+drwxr-xr-x   2 root root      4096 Jun  5  2010 ./source/kde/kdeaccessibility
+-rw-r--r--   1 root root       118 Dec 21  2007 ./source/kde/kdeaccessibility/doinst.sh.gz
+-rwxr-xr-x   1 root root      2935 Jun  5  2010 ./source/kde/kdeaccessibility/kdeaccessibility.SlackBuild
+-rw-r--r--   1 root root       881 May  4  2010 ./source/kde/kdeaccessibility/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 13 21:43 ./source/kde/kdeadmin
+-rw-r--r--   1 root root       118 Dec 21  2007 ./source/kde/kdeadmin/doinst.sh.gz
+-rwxr-xr-x   1 root root      3028 Jun  5  2010 ./source/kde/kdeadmin/kdeadmin.SlackBuild
+-rw-r--r--   1 root root      1254 Mar 13 21:43 ./source/kde/kdeadmin/knetworkconf.diff.gz
+-rw-r--r--   1 root root         8 Mar  4 04:00 ./source/kde/kdeadmin/local.options
+-rw-r--r--   1 root root       639 May  4  2010 ./source/kde/kdeadmin/slack-desc
+drwxr-xr-x   2 root root      4096 Feb  9 07:05 ./source/kde/kdeartwork
+-rw-r--r--   1 root root       118 Dec 21  2007 ./source/kde/kdeartwork/doinst.sh.gz
+-rwxr-xr-x   1 root root      2938 Jun  5  2010 ./source/kde/kdeartwork/kdeartwork.SlackBuild
+-rw-r--r--   1 root root         8 Feb  9 07:05 ./source/kde/kdeartwork/local.options
+-rw-r--r--   1 root root       689 May  4  2010 ./source/kde/kdeartwork/slack-desc
+drwxr-xr-x   4 root root      4096 Apr  4 20:09 ./source/kde/kdebase
+drwxr-xr-x   2 root root      4096 Feb 12 23:15 ./source/kde/kdebase-runtime
+-rw-r--r--   1 root root       118 Dec 21  2007 ./source/kde/kdebase-runtime/doinst.sh.gz
+-rwxr-xr-x   1 root root      3078 Jun  5  2010 ./source/kde/kdebase-runtime/kdebase-runtime.SlackBuild
+-rw-r--r--   1 root root         8 Feb 12 23:15 ./source/kde/kdebase-runtime/local.options
+-rw-r--r--   1 root root       757 May  4  2010 ./source/kde/kdebase-runtime/slack-desc
+drwxr-xr-x   4 root root      4096 Dec  2 01:13 ./source/kde/kdebase-workspace
+drwxr-xr-x   2 root root      4096 Aug 31  2009 ./source/kde/kdebase-workspace/config
+-rw-r--r--   1 root root      2551 Dec 21  2007 ./source/kde/kdebase-workspace/config/Xsession
+-rw-r--r--   1 root root      1844 Dec 21  2007 ./source/kde/kdebase-workspace/config/Xsession.orig
+-rw-r--r--   1 root root       361 Dec 21  2007 ./source/kde/kdebase-workspace/doinst.sh.gz
+-rwxr-xr-x   1 root root      4490 Sep  3  2010 ./source/kde/kdebase-workspace/kdebase-workspace.SlackBuild
+-rw-r--r--   1 root root       247 Dec  2 01:13 ./source/kde/kdebase-workspace/kdebase-workspace.kdm.server.timeout.diff.gz
+-rw-r--r--   1 root root       438 May  4  2010 ./source/kde/kdebase-workspace/slack-desc
+drwxr-xr-x   2 root root      4096 Aug 31  2009 ./source/kde/kdebase-workspace/xinit
+-rwxr-xr-x   1 root root       627 Jun 18  2010 ./source/kde/kdebase-workspace/xinit/xinitrc.kde
+drwxr-xr-x   2 root root      4096 Aug 31  2009 ./source/kde/kdebase/config
+-rw-r--r--   1 root root        69 Aug 23  2006 ./source/kde/kdebase/config/kdeglobals
+-rw-r--r--   1 root root       124 Jan 21  2009 ./source/kde/kdebase/doinst.sh.gz
+-rwxr-xr-x   1 root root      4071 Apr  4 20:10 ./source/kde/kdebase/kdebase.SlackBuild
+-rw-r--r--   1 root root      1335 Mar  4 03:47 ./source/kde/kdebase/konsole_right_click-185466.patch.gz
+-rw-r--r--   1 root root       282 Apr  4 20:09 ./source/kde/kdebase/konsole_right_click-185466.patch.patch.gz
+-rw-r--r--   1 root root         8 Apr  4 20:09 ./source/kde/kdebase/local.options
+drwxr-xr-x   2 root root      4096 Aug 31  2009 ./source/kde/kdebase/profile.d
+-rwxr-xr-x   1 root root       274 Jul 11  2008 ./source/kde/kdebase/profile.d/kde.csh
+-rwxr-xr-x   1 root root       261 Jul 11  2008 ./source/kde/kdebase/profile.d/kde.sh
+-rw-r--r--   1 root root       696 May  4  2010 ./source/kde/kdebase/slack-desc
+drwxr-xr-x   2 root root      4096 Jan 26 19:44 ./source/kde/kdebindings
+-rw-r--r--   1 root root      1819 Dec 16  2009 ./source/kde/kdebindings/kdebindings-len-ptr-rfloat.diff.gz
+-rw-r--r--   1 root root      1812 Dec 16  2009 ./source/kde/kdebindings/kdebindings-ruby-env.h.diff.gz
+-rw-r--r--   1 root root       307 Dec 16  2009 ./source/kde/kdebindings/kdebindings-rubyconfig.h.diff.gz
+-rw-r--r--   1 root root       658 Dec  2 18:23 ./source/kde/kdebindings/kdebindings.1170602.sip_4_11_x.diff.gz
+-rwxr-xr-x   1 root root      3871 Dec 29 01:44 ./source/kde/kdebindings/kdebindings.SlackBuild
+-rw-r--r--   1 root root         8 Jan 26 19:44 ./source/kde/kdebindings/local.options
+-rw-r--r--   1 root root       370 Dec 29 01:38 ./source/kde/kdebindings/pykdeuic4.patch.gz
+-rw-r--r--   1 root root       975 May  4  2010 ./source/kde/kdebindings/slack-desc
+drwxr-xr-x   2 root root      4096 Jun  5  2010 ./source/kde/kdeedu
+-rw-r--r--   1 root root       118 Dec 21  2007 ./source/kde/kdeedu/doinst.sh.gz
+-rwxr-xr-x   1 root root      2880 Jun  5  2010 ./source/kde/kdeedu/kdeedu.SlackBuild
+-rw-r--r--   1 root root       638 May  4  2010 ./source/kde/kdeedu/slack-desc
+drwxr-xr-x   2 root root      4096 Jun  5  2010 ./source/kde/kdegames
+-rw-r--r--   1 root root       118 Dec 21  2007 ./source/kde/kdegames/doinst.sh.gz
+-rwxr-xr-x   1 root root      2894 Jun  5  2010 ./source/kde/kdegames/kdegames.SlackBuild
+-rw-r--r--   1 root root       646 May  4  2010 ./source/kde/kdegames/slack-desc
+drwxr-xr-x   2 root root      4096 Feb  9 07:03 ./source/kde/kdegraphics
+-rw-r--r--   1 root root       118 Dec 21  2007 ./source/kde/kdegraphics/doinst.sh.gz
+-rwxr-xr-x   1 root root      2942 Aug 28  2010 ./source/kde/kdegraphics/kdegraphics.SlackBuild
+-rw-r--r--   1 root root         8 Mar 22 22:04 ./source/kde/kdegraphics/local.options
+-rw-r--r--   1 root root       807 Dec 16  2009 ./source/kde/kdegraphics/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 28 20:36 ./source/kde/kdelibs
+-rw-r--r--   1 root root       142 Dec 20  2007 ./source/kde/kdelibs/doinst.sh.gz
+-rwxr-xr-x   1 root root      3293 Mar 28 20:36 ./source/kde/kdelibs/kdelibs.SlackBuild
+-rw-r--r--   1 root root       361 Jun  7  2010 ./source/kde/kdelibs/kdelibs.docbook.patch.gz
+-rw-r--r--   1 root root       404 Mar 28 20:34 ./source/kde/kdelibs/kdelibs.khtml.CVE-2011-1168.diff.gz
+-rw-r--r--   1 root root       766 Oct 19  2009 ./source/kde/kdelibs/kdesu-allow_NOPASS_in_suauth.patch.gz
+-rw-r--r--   1 root root         8 Mar 28 20:36 ./source/kde/kdelibs/local.options
+-rw-r--r--   1 root root       649 Dec 16  2009 ./source/kde/kdelibs/slack-desc
+drwxr-xr-x   2 root root      4096 Jun  5  2010 ./source/kde/kdemultimedia
+-rw-r--r--   1 root root       118 Dec 21  2007 ./source/kde/kdemultimedia/doinst.sh.gz
+-rwxr-xr-x   1 root root      2937 Jun  5  2010 ./source/kde/kdemultimedia/kdemultimedia.SlackBuild
+-rw-r--r--   1 root root       977 May  4  2010 ./source/kde/kdemultimedia/slack-desc
+drwxr-xr-x   2 root root      4096 Dec  2 01:10 ./source/kde/kdenetwork
+-rw-r--r--   1 root root       118 Dec 21  2007 ./source/kde/kdenetwork/doinst.sh.gz
+-rwxr-xr-x   1 root root      2929 Jun  5  2010 ./source/kde/kdenetwork/kdenetwork.SlackBuild
+-rw-r--r--   1 root root       692 May  4  2010 ./source/kde/kdenetwork/slack-desc
+drwxr-xr-x   2 root root      4096 Sep  3  2010 ./source/kde/kdepim
+drwxr-xr-x   2 root root      4096 Sep  3  2010 ./source/kde/kdepim-runtime
+-rw-r--r--   1 root root       118 Aug 31  2009 ./source/kde/kdepim-runtime/doinst.sh.gz
+-rwxr-xr-x   1 root root      2914 Jun  5  2010 ./source/kde/kdepim-runtime/kdepim-runtime.SlackBuild
+-rw-r--r--   1 root root        15 Feb  2 19:02 ./source/kde/kdepim-runtime/local.options
+-rw-r--r--   1 root root       972 May  4  2010 ./source/kde/kdepim-runtime/slack-desc
+-rw-r--r--   1 root root       118 Dec 21  2007 ./source/kde/kdepim/doinst.sh.gz
+-rw-r--r--   1 root root      3880 May  4  2010 ./source/kde/kdepim/kdepim-4.4.0-install-headers.patch
+-rwxr-xr-x   1 root root      3048 Jun  5  2010 ./source/kde/kdepim/kdepim.SlackBuild
+-rw-r--r--   1 root root        15 Feb  2 19:02 ./source/kde/kdepim/local.options
+-rw-r--r--   1 root root       873 May  4  2010 ./source/kde/kdepim/slack-desc
+drwxr-xr-x   2 root root      4096 Jan 21 20:30 ./source/kde/kdepimlibs
+-rw-r--r--   1 root root       306 Jan 21 19:50 ./source/kde/kdepimlibs/kdepimlibs-4.5.imap4.cpp.r1216162.diff.gz
+-rwxr-xr-x   1 root root      2989 Jan 21 20:30 ./source/kde/kdepimlibs/kdepimlibs.SlackBuild
+-rw-r--r--   1 root root         8 Jan 21 20:30 ./source/kde/kdepimlibs/local.options
+-rw-r--r--   1 root root       735 May  4  2010 ./source/kde/kdepimlibs/slack-desc
+drwxr-xr-x   2 root root      4096 Jun  5  2010 ./source/kde/kdeplasma-addons
+-rw-r--r--   1 root root       118 Dec 21  2007 ./source/kde/kdeplasma-addons/doinst.sh.gz
+-rwxr-xr-x   1 root root      2935 Jun  5  2010 ./source/kde/kdeplasma-addons/kdeplasma-addons.SlackBuild
+-rw-r--r--   1 root root       763 Dec 16  2009 ./source/kde/kdeplasma-addons/slack-desc
+drwxr-xr-x   2 root root      4096 Jun  5  2010 ./source/kde/kdesdk
+-rw-r--r--   1 root root       118 Dec 21  2007 ./source/kde/kdesdk/doinst.sh.gz
+-rwxr-xr-x   1 root root      2872 Jun  5  2010 ./source/kde/kdesdk/kdesdk.SlackBuild
+-rw-r--r--   1 root root       778 May  4  2010 ./source/kde/kdesdk/slack-desc
+drwxr-xr-x   2 root root      4096 Jun  5  2010 ./source/kde/kdetoys
+-rw-r--r--   1 root root       118 Dec 21  2007 ./source/kde/kdetoys/doinst.sh.gz
+-rwxr-xr-x   1 root root      2887 Jun  5  2010 ./source/kde/kdetoys/kdetoys.SlackBuild
+-rw-r--r--   1 root root       715 May  4  2010 ./source/kde/kdetoys/slack-desc
+drwxr-xr-x   2 root root      4096 Jun  5  2010 ./source/kde/kdeutils
+-rw-r--r--   1 root root       118 Dec 21  2007 ./source/kde/kdeutils/doinst.sh.gz
+-rwxr-xr-x   1 root root      2903 Jun  5  2010 ./source/kde/kdeutils/kdeutils.SlackBuild
+-rw-r--r--   1 root root       786 May  4  2010 ./source/kde/kdeutils/slack-desc
+drwxr-xr-x   2 root root      4096 Jun  5  2010 ./source/kde/kdevelop
+-rw-r--r--   1 root root       118 Dec 24  2007 ./source/kde/kdevelop/doinst.sh.gz
+-rwxr-xr-x   1 root root      2905 Jun  5  2010 ./source/kde/kdevelop/kdevelop.SlackBuild
+-rw-r--r--   1 root root        14 Apr  5 23:30 ./source/kde/kdevelop/local.options
+-rw-r--r--   1 root root       679 Dec 16  2009 ./source/kde/kdevelop/slack-desc
+drwxr-xr-x   2 root root      4096 Jun  5  2010 ./source/kde/kdevplatform
+-rw-r--r--   1 root root       118 Dec 24  2007 ./source/kde/kdevplatform/doinst.sh.gz
+-rwxr-xr-x   1 root root      2915 Jun  5  2010 ./source/kde/kdevplatform/kdevplatform.SlackBuild
+-rw-r--r--   1 root root        14 Apr  5 23:30 ./source/kde/kdevplatform/local.options
+-rw-r--r--   1 root root       710 Jan 13  2009 ./source/kde/kdevplatform/slack-desc
+drwxr-xr-x   3 root root      4096 Jun  5  2010 ./source/kde/kdewebdev
+-rw-r--r--   1 root root       118 Dec 21  2007 ./source/kde/kdewebdev/doinst.sh.gz
+-rw-r--r--   1 root root       260 Sep  3  2009 ./source/kde/kdewebdev/include-tidy.patch.gz
+-rw-r--r--   1 root root       391 Dec 29  2008 ./source/kde/kdewebdev/kde4-kdewebdev-findtidy.diff.gz
+-rwxr-xr-x   1 root root      3391 Jun  5  2010 ./source/kde/kdewebdev/kdewebdev.SlackBuild
+-rw-r--r--   1 root root       716 May  4  2010 ./source/kde/kdewebdev/slack-desc
+drwxr-xr-x   2 root root      4096 Jun  5  2010 ./source/kde/kdewebdev/tidy
+-rwxr-xr-x   1 root root      1682 May  7  2009 ./source/kde/kdewebdev/tidy/get-tidy-cvs.sh
+-rw-r--r--   1 root root    338924 May  4  2010 ./source/kde/kdewebdev/tidy/tidy-20100503T2309.tar.xz
+-rwxr-xr-x   1 root root      3271 Jun  5  2010 ./source/kde/kdewebdev/tidy/tidy.SlackBuild
+-rwxr-xr-x   1 root root      2907 May  4  2010 ./source/kde/kdewebdev/tidy/tidy.build
+drwxr-xr-x   2 root root      4096 Dec 31 17:40 ./source/kde/koffice
+-rw-r--r--   1 root root       118 Dec 24  2007 ./source/kde/koffice/doinst.sh.gz
+-rwxr-xr-x   1 root root      3716 Mar 23 03:06 ./source/kde/koffice/koffice.SlackBuild
+-rw-r--r--   1 root root        22 Mar 22 22:04 ./source/kde/koffice/local.options
+-rw-r--r--   1 root root       951 Dec 24  2007 ./source/kde/koffice/slack-desc
+drwxr-xr-x   2 root root      4096 Dec  3 08:38 ./source/kde/konq-plugins
+-rw-r--r--   1 root root       318 Oct 26 15:08 ./source/kde/konq-plugins/konq-plugins-4.4.0-qt47.patch.gz
+-rwxr-xr-x   1 root root      2977 Dec  3 08:39 ./source/kde/konq-plugins/konq-plugins.SlackBuild
+-rw-r--r--   1 root root        22 Dec  3 08:39 ./source/kde/konq-plugins/local.options
+-rw-r--r--   1 root root       982 Nov 24  2008 ./source/kde/konq-plugins/slack-desc
+drwxr-xr-x   2 root root      4096 Jun  5  2010 ./source/kde/kopete-cryptography
+-rw-r--r--   1 root root       118 Aug 31  2009 ./source/kde/kopete-cryptography/doinst.sh.gz
+-rwxr-xr-x   1 root root      2900 Jun  5  2010 ./source/kde/kopete-cryptography/kopete-cryptography.SlackBuild
+-rw-r--r--   1 root root        23 Apr 30  2010 ./source/kde/kopete-cryptography/local.options
+-rw-r--r--   1 root root       810 Oct 21  2009 ./source/kde/kopete-cryptography/slack-desc
+drwxr-xr-x   2 root root      4096 Jun  5  2010 ./source/kde/ktorrent
+-rw-r--r--   1 root root       118 May 17  2008 ./source/kde/ktorrent/doinst.sh.gz
+-rwxr-xr-x   1 root root      2898 Jun  5  2010 ./source/kde/ktorrent/ktorrent.SlackBuild
+-rw-r--r--   1 root root        14 Jan  7 06:29 ./source/kde/ktorrent/local.options
+-rw-r--r--   1 root root      1041 Dec 16  2009 ./source/kde/ktorrent/slack-desc
+drwxr-xr-x   2 root root      4096 Jul 17  2010 ./source/kde/libktorrent
+-rwxr-xr-x   1 root root      2888 Jan  7 19:33 ./source/kde/libktorrent/libktorrent.SlackBuild
+-rw-r--r--   1 root root        16 Jan  7 06:28 ./source/kde/libktorrent/local.options
+-rw-r--r--   1 root root       938 Jul 17  2010 ./source/kde/libktorrent/slack-desc
+drwxr-xr-x   2 root root      4096 Jun  5  2010 ./source/kde/oxygen-icons
+-rwxr-xr-x   1 root root      2796 Jun  5  2010 ./source/kde/oxygen-icons/oxygen-icons.SlackBuild
+-rw-r--r--   1 root root       792 May  4  2010 ./source/kde/oxygen-icons/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 30 23:48 ./source/kde/polkit-kde-1
+-rw-r--r--   1 root root        25 Mar 30 23:49 ./source/kde/polkit-kde-1/local.options
+-rwxr-xr-x   1 root root      2979 Mar 30 23:49 ./source/kde/polkit-kde-1/polkit-kde-1.SlackBuild
+-rw-r--r--   1 root root       351 Mar 30 23:52 ./source/kde/polkit-kde-1/polkit-kde-1.nodrkonqi.diff.gz
+-rw-r--r--   1 root root       686 May  5  2010 ./source/kde/polkit-kde-1/slack-desc
+drwxr-xr-x   2 root root      4096 Dec  2 21:28 ./source/kde/polkit-kde-agent-1
+-rw-r--r--   1 root root        20 Dec  2 21:29 ./source/kde/polkit-kde-agent-1/local.options
+-rwxr-xr-x   1 root root      2947 Dec  2 21:29 ./source/kde/polkit-kde-agent-1/polkit-kde-agent-1.SlackBuild
+-rw-r--r--   1 root root       314 Dec  2 21:27 ./source/kde/polkit-kde-agent-1/pull-polkit-kde-agent-1
+-rw-r--r--   1 root root       759 Dec  2 21:30 ./source/kde/polkit-kde-agent-1/slack-desc
+drwxr-xr-x   2 root root      4096 Dec  2 21:36 ./source/kde/polkit-kde-kcmodules-1
+-rw-r--r--   1 root root        20 Dec  2 21:36 ./source/kde/polkit-kde-kcmodules-1/local.options
+-rwxr-xr-x   1 root root      2975 Dec  2 21:36 ./source/kde/polkit-kde-kcmodules-1/polkit-kde-kcmodules-1.SlackBuild
+-rw-r--r--   1 root root       346 Dec  2 21:28 ./source/kde/polkit-kde-kcmodules-1/pull-polkit-kde-kcmodules-1
+-rw-r--r--   1 root root       810 Dec  2 21:37 ./source/kde/polkit-kde-kcmodules-1/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 21 18:31 ./source/kde/polkit-qt-1
+-rw-r--r--   1 root root        41 Mar 21 18:32 ./source/kde/polkit-qt-1/local.options
+-rwxr-xr-x   1 root root      2938 Mar 21 18:32 ./source/kde/polkit-qt-1/polkit-qt-1.SlackBuild
+-rw-r--r--   1 root root       317 Mar 21 18:31 ./source/kde/polkit-qt-1/polkit-qt-1.null-checking.diff.gz
+-rw-r--r--   1 root root       258 Dec  2 21:22 ./source/kde/polkit-qt-1/pull-polkit-qt-1
+-rw-r--r--   1 root root       903 May  5  2010 ./source/kde/polkit-qt-1/slack-desc
+drwxr-xr-x   2 root root      4096 Jun  5  2010 ./source/kde/skanlite
+-rw-r--r--   1 root root       118 May 17  2008 ./source/kde/skanlite/doinst.sh.gz
+-rw-r--r--   1 root root        12 Dec 29 03:59 ./source/kde/skanlite/local.options
+-rwxr-xr-x   1 root root      2818 Jun  5  2010 ./source/kde/skanlite/skanlite.SlackBuild
+-rw-r--r--   1 root root       666 Jan 14  2009 ./source/kde/skanlite/slack-desc
+drwxr-xr-x   3 root root      4096 Apr 25 16:58 ./source/kde/src
+drwxr-xr-x   2 root root      4096 Mar 13 19:53 ./source/kde/src/extragear
+-rw-r--r--   1 root root  13332440 Jan 11 16:11 ./source/kde/src/extragear/amarok-2.4.0.tar.xz
+-rw-r--r--   1 root root   8590104 Jan 16 17:31 ./source/kde/src/extragear/k3b-2.0.2.tar.xz
+-rw-r--r--   1 root root     62176 Jan  7 06:26 ./source/kde/src/extragear/kaudiocreator-r1212483.tar.xz
+-rw-r--r--   1 root root    995644 Feb 12  2010 ./source/kde/src/extragear/konq-plugins-4.4.0.tar.xz
+-rw-r--r--   1 root root     73404 Feb 12  2010 ./source/kde/src/extragear/kopete-cryptography-1.3.0-kde4.4.0.tar.xz
+-rw-r--r--   1 root root   1943180 Dec 29 12:21 ./source/kde/src/extragear/ktorrent-4.0.5.tar.xz
+-rw-r--r--   1 root root    746744 Dec 29 12:21 ./source/kde/src/extragear/libktorrent-1.0.5-3.tar.xz
+-rw-r--r--   1 root root   1065356 Nov 30 19:56 ./source/kde/src/extragear/skanlite-0.7.tar.xz
+-rw-r--r--   1 root root   4076212 Jan  4 16:15 ./source/kde/src/kdeaccessibility-4.5.5.tar.xz
+-rw-r--r--   1 root root   1106292 Jan  4 16:15 ./source/kde/src/kdeadmin-4.5.5.tar.xz
+-rw-r--r--   1 root root 107472308 Jan  4 16:21 ./source/kde/src/kdeartwork-4.5.5.tar.xz
+-rw-r--r--   1 root root   2399616 Jan  4 16:18 ./source/kde/src/kdebase-4.5.5.tar.xz
+-rw-r--r--   1 root root   5390148 Jan  4 16:15 ./source/kde/src/kdebase-runtime-4.5.5.tar.xz
+-rw-r--r--   1 root root  60669260 Jan  4 16:19 ./source/kde/src/kdebase-workspace-4.5.5.tar.xz
+-rw-r--r--   1 root root   5906628 Jan  4 16:18 ./source/kde/src/kdebindings-4.5.5.tar.xz
+-rw-r--r--   1 root root  58687972 Jan  4 16:15 ./source/kde/src/kdeedu-4.5.5.tar.xz
+-rw-r--r--   1 root root  52712260 Jan  4 16:19 ./source/kde/src/kdegames-4.5.5.tar.xz
+-rw-r--r--   1 root root   4627976 Jan  4 16:15 ./source/kde/src/kdegraphics-4.5.5.tar.xz
+-rw-r--r--   1 root root  12084912 Jan  4 16:21 ./source/kde/src/kdelibs-4.5.5.tar.xz
+-rw-r--r--   1 root root   1428964 Jan  4 16:15 ./source/kde/src/kdemultimedia-4.5.5.tar.xz
+-rw-r--r--   1 root root   7164888 Jan  4 16:15 ./source/kde/src/kdenetwork-4.5.5.tar.xz
+-rw-r--r--   1 root root   8076128 Jan 27 16:41 ./source/kde/src/kdepim-4.4.10.tar.xz
+-rw-r--r--   1 root root    533888 Jan 27 16:41 ./source/kde/src/kdepim-runtime-4.4.10.tar.xz
+-rw-r--r--   1 root root   2271340 Jan  4 16:19 ./source/kde/src/kdepimlibs-4.5.5.tar.xz
+-rw-r--r--   1 root root   1473152 Jan  4 16:19 ./source/kde/src/kdeplasma-addons-4.5.5.tar.xz
+-rw-r--r--   1 root root   5011376 Jan  4 16:21 ./source/kde/src/kdesdk-4.5.5.tar.xz
+-rw-r--r--   1 root root    376444 Jan  4 16:21 ./source/kde/src/kdetoys-4.5.5.tar.xz
+-rw-r--r--   1 root root   3582940 Jan  4 16:15 ./source/kde/src/kdeutils-4.5.5.tar.xz
+-rw-r--r--   1 root root   3699844 Apr  5 21:20 ./source/kde/src/kdevelop-4.2.2.tar.xz
+-rw-r--r--   1 root root   1433800 Apr  5 21:44 ./source/kde/src/kdevplatform-1.2.2.tar.xz
+-rw-r--r--   1 root root   2074344 Jan  4 16:21 ./source/kde/src/kdewebdev-4.5.5.tar.xz
+-rw-r--r--   1 root root  69460992 Feb 23 20:13 ./source/kde/src/koffice-2.3.3.tar.xz
+-rw-r--r--   1 root root     39992 Jul  5  2010 ./source/kde/src/polkit-kde-1-r1145544.tar.xz
+-rw-r--r--   1 root root     17328 Dec  2 21:27 ./source/kde/src/polkit-kde-agent-1-20101202git.tar.xz
+-rw-r--r--   1 root root     25240 Dec  2 21:28 ./source/kde/src/polkit-kde-kcmodules-1-20101202git.tar.xz
+-rw-r--r--   1 root root     61840 Jul  5  2010 ./source/kde/src/polkit-qt-1-r1145513.tar.xz
+drwxr-xr-x   4 root root      4096 Jul 16  2010 ./source/kdei
+drwxr-xr-x   5 root root      4096 Jan 19 18:57 ./source/kdei/kde-l10n
+-rw-r--r--   1 root root   3018421 Jan  5 10:34 ./source/kdei/kde-l10n/kde-l10n-ar-4.5.5.tar.bz2
+-rw-r--r--   1 root root   1631594 Jan  5 10:34 ./source/kdei/kde-l10n/kde-l10n-bg-4.5.5.tar.bz2
+-rw-r--r--   1 root root   3744364 Jan  5 10:36 ./source/kdei/kde-l10n/kde-l10n-ca-4.5.5.tar.bz2
+-rw-r--r--   1 root root   1999760 Jan  5 10:34 ./source/kdei/kde-l10n/kde-l10n-ca@valencia-4.5.5.tar.bz2
+-rw-r--r--   1 root root   2722346 Jan  5 10:36 ./source/kdei/kde-l10n/kde-l10n-cs-4.5.5.tar.bz2
+-rw-r--r--   1 root root  12789665 Jan  5 10:35 ./source/kdei/kde-l10n/kde-l10n-da-4.5.5.tar.bz2
+-rw-r--r--   1 root root  28603705 Jan  5 10:35 ./source/kdei/kde-l10n/kde-l10n-de-4.5.5.tar.bz2
+-rw-r--r--   1 root root   2780801 Jan  5 10:36 ./source/kdei/kde-l10n/kde-l10n-el-4.5.5.tar.bz2
+-rw-r--r--   1 root root   2689162 Jan  5 10:34 ./source/kdei/kde-l10n/kde-l10n-en_GB-4.5.5.tar.bz2
+-rw-r--r--   1 root root   1716183 Jan  5 10:34 ./source/kdei/kde-l10n/kde-l10n-eo-4.5.5.tar.bz2
+-rw-r--r--   1 root root  24716636 Jan  5 10:34 ./source/kdei/kde-l10n/kde-l10n-es-4.5.5.tar.bz2
+-rw-r--r--   1 root root   5538080 Jan  5 10:36 ./source/kdei/kde-l10n/kde-l10n-et-4.5.5.tar.bz2
+-rw-r--r--   1 root root   1803334 Jan  5 10:36 ./source/kdei/kde-l10n/kde-l10n-eu-4.5.5.tar.bz2
+-rw-r--r--   1 root root   2110044 Jan  5 10:34 ./source/kdei/kde-l10n/kde-l10n-fi-4.5.5.tar.bz2
+-rw-r--r--   1 root root  19920786 Jan  5 10:34 ./source/kdei/kde-l10n/kde-l10n-fr-4.5.5.tar.bz2
+-rw-r--r--   1 root root    752677 Jan  5 10:36 ./source/kdei/kde-l10n/kde-l10n-fy-4.5.5.tar.bz2
+-rw-r--r--   1 root root   3109525 Jan  5 10:36 ./source/kdei/kde-l10n/kde-l10n-ga-4.5.5.tar.bz2
+-rw-r--r--   1 root root   3342956 Jan  5 10:34 ./source/kdei/kde-l10n/kde-l10n-gl-4.5.5.tar.bz2
+-rw-r--r--   1 root root    819600 Jan  5 10:34 ./source/kdei/kde-l10n/kde-l10n-gu-4.5.5.tar.bz2
+-rw-r--r--   1 root root   1932352 Jan  5 10:36 ./source/kdei/kde-l10n/kde-l10n-he-4.5.5.tar.bz2
+-rw-r--r--   1 root root   1613489 Jan  5 10:36 ./source/kdei/kde-l10n/kde-l10n-hi-4.5.5.tar.bz2
+-rw-r--r--   1 root root   1868383 Jan  5 10:35 ./source/kdei/kde-l10n/kde-l10n-hr-4.5.5.tar.bz2
+-rw-r--r--   1 root root   3852047 Jan  5 10:36 ./source/kdei/kde-l10n/kde-l10n-hu-4.5.5.tar.bz2
+-rw-r--r--   1 root root    389458 Jan  5 10:36 ./source/kdei/kde-l10n/kde-l10n-ia-4.5.5.tar.bz2
+-rw-r--r--   1 root root    492988 Jan  5 10:34 ./source/kdei/kde-l10n/kde-l10n-id-4.5.5.tar.bz2
+-rw-r--r--   1 root root   1603344 Jan  5 10:35 ./source/kdei/kde-l10n/kde-l10n-is-4.5.5.tar.bz2
+-rw-r--r--   1 root root   9948813 Jan  5 10:34 ./source/kdei/kde-l10n/kde-l10n-it-4.5.5.tar.bz2
+-rw-r--r--   1 root root   2068687 Jan  5 10:36 ./source/kdei/kde-l10n/kde-l10n-ja-4.5.5.tar.bz2
+-rw-r--r--   1 root root   1381880 Jan  5 10:34 ./source/kdei/kde-l10n/kde-l10n-kk-4.5.5.tar.bz2
+-rw-r--r--   1 root root   1791047 Jan  5 10:35 ./source/kdei/kde-l10n/kde-l10n-km-4.5.5.tar.bz2
+-rw-r--r--   1 root root    433183 Jan  5 10:36 ./source/kdei/kde-l10n/kde-l10n-kn-4.5.5.tar.bz2
+-rw-r--r--   1 root root   1479088 Jan  5 10:36 ./source/kdei/kde-l10n/kde-l10n-ko-4.5.5.tar.bz2
+-rw-r--r--   1 root root   3331976 Jan  5 10:36 ./source/kdei/kde-l10n/kde-l10n-lt-4.5.5.tar.bz2
+-rw-r--r--   1 root root   1844149 Jan  5 10:36 ./source/kdei/kde-l10n/kde-l10n-lv-4.5.5.tar.bz2
+-rw-r--r--   1 root root  20318506 Jan  5 10:34 ./source/kdei/kde-l10n/kde-l10n-ml-4.5.5.tar.bz2
+-rw-r--r--   1 root root   2220342 Jan  5 10:34 ./source/kdei/kde-l10n/kde-l10n-nb-4.5.5.tar.bz2
+-rw-r--r--   1 root root   3453731 Jan  5 10:34 ./source/kdei/kde-l10n/kde-l10n-nds-4.5.5.tar.bz2
+-rw-r--r--   1 root root  13167408 Jan  5 10:35 ./source/kdei/kde-l10n/kde-l10n-nl-4.5.5.tar.bz2
+-rw-r--r--   1 root root   1837924 Jan  5 10:36 ./source/kdei/kde-l10n/kde-l10n-nn-4.5.5.tar.bz2
+-rw-r--r--   1 root root   1514724 Jan  5 10:34 ./source/kdei/kde-l10n/kde-l10n-pa-4.5.5.tar.bz2
+-rw-r--r--   1 root root   5637630 Jan  5 10:34 ./source/kdei/kde-l10n/kde-l10n-pl-4.5.5.tar.bz2
+-rw-r--r--   1 root root   4988405 Jan  5 10:35 ./source/kdei/kde-l10n/kde-l10n-pt-4.5.5.tar.bz2
+-rw-r--r--   1 root root  18438098 Jan  5 10:34 ./source/kdei/kde-l10n/kde-l10n-pt_BR-4.5.5.tar.bz2
+-rw-r--r--   1 root root   2939162 Jan  5 10:34 ./source/kdei/kde-l10n/kde-l10n-ro-4.5.5.tar.bz2
+-rw-r--r--   1 root root   7606562 Jan  5 10:34 ./source/kdei/kde-l10n/kde-l10n-ru-4.5.5.tar.bz2
+-rw-r--r--   1 root root   4075553 Jan  5 10:35 ./source/kdei/kde-l10n/kde-l10n-sk-4.5.5.tar.bz2
+-rw-r--r--   1 root root   3746951 Jan  5 10:34 ./source/kdei/kde-l10n/kde-l10n-sl-4.5.5.tar.bz2
+-rw-r--r--   1 root root  10428953 Jan  5 10:36 ./source/kdei/kde-l10n/kde-l10n-sr-4.5.5.tar.bz2
+-rw-r--r--   1 root root  14215078 Jan  5 10:34 ./source/kdei/kde-l10n/kde-l10n-sv-4.5.5.tar.bz2
+-rw-r--r--   1 root root   1296435 Jan  5 10:36 ./source/kdei/kde-l10n/kde-l10n-th-4.5.5.tar.bz2
+-rw-r--r--   1 root root   2137585 Jan  5 10:36 ./source/kdei/kde-l10n/kde-l10n-tr-4.5.5.tar.bz2
+-rw-r--r--   1 root root  13570179 Jan  5 10:35 ./source/kdei/kde-l10n/kde-l10n-uk-4.5.5.tar.bz2
+-rw-r--r--   1 root root   1615824 Jan  5 10:34 ./source/kdei/kde-l10n/kde-l10n-wa-4.5.5.tar.bz2
+-rw-r--r--   1 root root   3172543 Jan  5 10:36 ./source/kdei/kde-l10n/kde-l10n-zh_CN-4.5.5.tar.bz2
+-rw-r--r--   1 root root   2128435 Jan  5 10:36 ./source/kdei/kde-l10n/kde-l10n-zh_TW-4.5.5.tar.bz2
+-rwxr-xr-x   1 root root      5404 Jan 23 19:38 ./source/kdei/kde-l10n/kde-l10n.SlackBuild
+drwxr-xr-x   2 root root      4096 Jan 23 19:37 ./source/kdei/kde-l10n/kdepim-l10n
+-rwxr-xr-x   1 root root      1046 Jan 23 19:12 ./source/kdei/kde-l10n/kdepim-l10n/extract-kdepim-goodness.sh
+-rw-r--r--   1 root root    486936 Jan 23 19:18 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-ar-4.4.5.tar.bz2
+-rw-r--r--   1 root root    493466 Jan 23 19:18 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-bg-4.4.5.tar.bz2
+-rw-r--r--   1 root root    610587 Jan 23 19:18 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-ca-4.4.5.tar.bz2
+-rw-r--r--   1 root root    362129 Jan 23 19:18 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-ca@valencia-4.4.5.tar.bz2
+-rw-r--r--   1 root root    336355 Jan 23 19:18 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-cs-4.4.5.tar.bz2
+-rw-r--r--   1 root root       321 Jan 23 19:18 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-csb-4.4.5.tar.bz2
+-rw-r--r--   1 root root   1525886 Jan 23 19:18 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-da-4.4.5.tar.bz2
+-rw-r--r--   1 root root   2380888 Jan 23 19:19 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-de-4.4.5.tar.bz2
+-rw-r--r--   1 root root    522201 Jan 23 19:19 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-el-4.4.5.tar.bz2
+-rw-r--r--   1 root root    786080 Jan 23 19:19 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-en_GB-4.4.5.tar.bz2
+-rw-r--r--   1 root root    409949 Jan 23 19:19 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-eo-4.4.5.tar.bz2
+-rw-r--r--   1 root root   4466568 Jan 23 19:19 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-es-4.4.5.tar.bz2
+-rw-r--r--   1 root root   2090097 Jan 23 19:19 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-et-4.4.5.tar.bz2
+-rw-r--r--   1 root root    451630 Jan 23 19:19 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-eu-4.4.5.tar.bz2
+-rw-r--r--   1 root root    530939 Jan 23 19:19 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-fi-4.4.5.tar.bz2
+-rw-r--r--   1 root root       507 Jan 19 18:42 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-fr-4.4.5.korganizer.docbook.reorganize.diff.gz
+-rw-r--r--   1 root root   2673277 Jan 23 19:19 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-fr-4.4.5.tar.bz2
+-rw-r--r--   1 root root    534264 Jan 23 19:19 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-fy-4.4.5.tar.bz2
+-rw-r--r--   1 root root    312274 Jan 23 19:19 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-ga-4.4.5.tar.bz2
+-rw-r--r--   1 root root    640340 Jan 23 19:19 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-gl-4.4.5.tar.bz2
+-rw-r--r--   1 root root       109 Jan 23 19:19 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-gu-4.4.5.tar.bz2
+-rw-r--r--   1 root root    388967 Jan 23 19:19 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-he-4.4.5.tar.bz2
+-rw-r--r--   1 root root    330416 Jan 23 19:19 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-hi-4.4.5.tar.bz2
+-rw-r--r--   1 root root    355603 Jan 23 19:19 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-hr-4.4.5.tar.bz2
+-rw-r--r--   1 root root    559371 Jan 23 19:19 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-hu-4.4.5.tar.bz2
+-rw-r--r--   1 root root       107 Jan 23 19:19 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-id-4.4.5.tar.bz2
+-rw-r--r--   1 root root    454040 Jan 23 19:19 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-is-4.4.5.tar.bz2
+-rw-r--r--   1 root root    981204 Jan 23 19:19 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-it-4.4.5.tar.bz2
+-rw-r--r--   1 root root    318791 Jan 23 19:19 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-ja-4.4.5.tar.bz2
+-rw-r--r--   1 root root    464114 Jan 23 19:19 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-kk-4.4.5.tar.bz2
+-rw-r--r--   1 root root    492472 Jan 23 19:20 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-km-4.4.5.tar.bz2
+-rw-r--r--   1 root root       110 Jan 23 19:20 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-kn-4.4.5.tar.bz2
+-rw-r--r--   1 root root    258859 Jan 23 19:20 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-ko-4.4.5.tar.bz2
+-rw-r--r--   1 root root    327862 Jan 23 19:20 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-lt-4.4.5.tar.bz2
+-rw-r--r--   1 root root    473649 Jan 23 19:20 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-lv-4.4.5.tar.bz2
+-rw-r--r--   1 root root       107 Jan 23 19:20 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-mai-4.4.5.tar.bz2
+-rw-r--r--   1 root root    420017 Jan 23 19:20 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-mk-4.4.5.tar.bz2
+-rw-r--r--   1 root root       109 Jan 23 19:20 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-ml-4.4.5.tar.bz2
+-rw-r--r--   1 root root    358975 Jan 23 19:20 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-nb-4.4.5.tar.bz2
+-rw-r--r--   1 root root    465948 Jan 23 19:20 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-nds-4.4.5.tar.bz2
+-rw-r--r--   1 root root    834570 Jan 23 19:20 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-nl-4.4.5.tar.bz2
+-rw-r--r--   1 root root    354219 Jan 23 19:20 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-nn-4.4.5.tar.bz2
+-rw-r--r--   1 root root    352073 Jan 23 19:20 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-pa-4.4.5.tar.bz2
+-rw-r--r--   1 root root    539967 Jan 23 19:20 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-pl-4.4.5.tar.bz2
+-rw-r--r--   1 root root    992914 Jan 23 19:20 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-pt-4.4.5.tar.bz2
+-rw-r--r--   1 root root    905746 Jan 23 19:20 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-pt_BR-4.4.5.tar.bz2
+-rw-r--r--   1 root root    426377 Jan 23 19:20 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-ro-4.4.5.tar.bz2
+-rw-r--r--   1 root root   1721399 Jan 23 19:20 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-ru-4.4.5.tar.bz2
+-rw-r--r--   1 root root     56176 Jan 23 19:20 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-si-4.4.5.tar.bz2
+-rw-r--r--   1 root root    336068 Jan 23 19:20 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-sk-4.4.5.tar.bz2
+-rw-r--r--   1 root root    575363 Jan 23 19:20 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-sl-4.4.5.tar.bz2
+-rw-r--r--   1 root root      4656 Jan 23 19:20 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-sr-4.4.5.tar.bz2
+-rw-r--r--   1 root root   3014518 Jan 23 19:20 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-sv-4.4.5.tar.bz2
+-rw-r--r--   1 root root    439429 Jan 23 19:20 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-tg-4.4.5.tar.bz2
+-rw-r--r--   1 root root    459217 Jan 23 19:20 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-tr-4.4.5.tar.bz2
+-rw-r--r--   1 root root   1170409 Jan 23 19:20 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-uk-4.4.5.tar.bz2
+-rw-r--r--   1 root root    221472 Jan 23 19:20 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-wa-4.4.5.tar.bz2
+-rw-r--r--   1 root root    477865 Jan 23 19:20 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-zh_CN-4.4.5.tar.bz2
+-rw-r--r--   1 root root    496889 Jan 23 19:20 ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-zh_TW-4.4.5.tar.bz2
+-rw-r--r--   1 root root       187 Jan 19 18:57 ./source/kdei/kde-l10n/languages
+drwxr-xr-x   2 root root      4096 May 26  2008 ./source/kdei/kde-l10n/local.options
+drwxr-xr-x   2 root root      4096 Dec  8 05:34 ./source/kdei/kde-l10n/slack-desc
+-rw-r--r--   1 root root       188 Jan 21  2009 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ar
+-rw-r--r--   1 root root       191 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-bg
+-rw-r--r--   1 root root       225 Mar  6  2009 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-bn_IN
+-rw-r--r--   1 root root       189 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ca
+-rw-r--r--   1 root root       300 Jan 21  2010 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ca@valencia
+-rw-r--r--   1 root root       187 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-cs
+-rw-r--r--   1 root root       203 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-csb
+-rw-r--r--   1 root root       188 Jul 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-da
+-rw-r--r--   1 root root       188 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-de
+-rw-r--r--   1 root root       187 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-el
+-rw-r--r--   1 root root       230 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-en_GB
+-rw-r--r--   1 root root       191 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-eo
+-rw-r--r--   1 root root       189 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-es
+-rw-r--r--   1 root root       190 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-et
+-rw-r--r--   1 root root       188 Mar  6  2009 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-eu
+-rw-r--r--   1 root root       189 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-fi
+-rw-r--r--   1 root root       188 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-fr
+-rw-r--r--   1 root root       191 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-fy
+-rw-r--r--   1 root root       187 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ga
+-rw-r--r--   1 root root       190 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-gl
+-rw-r--r--   1 root root       190 Jan 21  2009 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-gu
+-rw-r--r--   1 root root       188 Jan 21  2009 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-he
+-rw-r--r--   1 root root       187 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-hi
+-rw-r--r--   1 root root       207 Oct 21  2009 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-hne
+-rw-r--r--   1 root root       190 Oct 21  2009 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-hr
+-rw-r--r--   1 root root       191 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-hu
+-rw-r--r--   1 root root       193 Dec  8 05:34 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ia
+-rw-r--r--   1 root root       192 Feb  5  2010 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-id
+-rw-r--r--   1 root root       191 Mar  6  2009 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-is
+-rw-r--r--   1 root root       189 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-it
+-rw-r--r--   1 root root       190 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ja
+-rw-r--r--   1 root root       188 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-kk
+-rw-r--r--   1 root root       187 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-km
+-rw-r--r--   1 root root       189 Mar  6  2009 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-kn
+-rw-r--r--   1 root root       188 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ko
+-rw-r--r--   1 root root       189 Jul 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ku
+-rw-r--r--   1 root root       192 Jul 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-lt
+-rw-r--r--   1 root root       189 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-lv
+-rw-r--r--   1 root root       202 Jan 27  2009 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-mai
+-rw-r--r--   1 root root       192 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-mk
+-rw-r--r--   1 root root       191 Jul 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ml
+-rw-r--r--   1 root root       189 Mar  6  2009 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-mr
+-rw-r--r--   1 root root       201 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-nb
+-rw-r--r--   1 root root       203 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-nds
+-rw-r--r--   1 root root       187 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-nl
+-rw-r--r--   1 root root       201 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-nn
+-rw-r--r--   1 root root       189 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-pa
+-rw-r--r--   1 root root       188 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-pl
+-rw-r--r--   1 root root       192 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-pt
+-rw-r--r--   1 root root       238 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-pt_BR
+-rw-r--r--   1 root root       190 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ro
+-rw-r--r--   1 root root       189 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ru
+-rw-r--r--   1 root root       189 Jan 21  2010 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-si
+-rw-r--r--   1 root root       188 Apr  3  2009 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-sk
+-rw-r--r--   1 root root       191 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-sl
+-rw-r--r--   1 root root       189 Jul 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-sr
+-rw-r--r--   1 root root       189 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-sv
+-rw-r--r--   1 root root       187 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ta
+-rw-r--r--   1 root root       187 Mar  6  2009 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-tg
+-rw-r--r--   1 root root       186 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-th
+-rw-r--r--   1 root root       189 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-tr
+-rw-r--r--   1 root root       191 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-uk
+-rw-r--r--   1 root root       189 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-wa
+-rw-r--r--   1 root root       236 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-zh_CN
+-rw-r--r--   1 root root       225 May 26  2008 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-zh_TW
+drwxr-xr-x   3 root root      4096 Mar  1 23:54 ./source/kdei/koffice-l10n
+-rw-r--r--   1 root root    602048 Feb 17 16:02 ./source/kdei/koffice-l10n/koffice-l10n-ca-2.3.2.tar.bz2
+-rw-r--r--   1 root root    333533 Feb 17 16:02 ./source/kdei/koffice-l10n/koffice-l10n-ca@valencia-2.3.2.tar.bz2
+-rw-r--r--   1 root root    574454 Feb 17 16:02 ./source/kdei/koffice-l10n/koffice-l10n-da-2.3.2.tar.bz2
+-rw-r--r--   1 root root   1309655 Feb 17 16:02 ./source/kdei/koffice-l10n/koffice-l10n-de-2.3.2.tar.bz2
+-rw-r--r--   1 root root    344811 Feb 17 16:02 ./source/kdei/koffice-l10n/koffice-l10n-el-2.3.2.tar.bz2
+-rw-r--r--   1 root root    335363 Feb 17 16:02 ./source/kdei/koffice-l10n/koffice-l10n-en_GB-2.3.2.tar.bz2
+-rw-r--r--   1 root root   6265591 Feb 17 16:02 ./source/kdei/koffice-l10n/koffice-l10n-es-2.3.2.tar.bz2
+-rw-r--r--   1 root root    732317 Feb 17 16:02 ./source/kdei/koffice-l10n/koffice-l10n-et-2.3.2.tar.bz2
+-rw-r--r--   1 root root   6343416 Feb 17 16:02 ./source/kdei/koffice-l10n/koffice-l10n-fr-2.3.2.tar.bz2
+-rw-r--r--   1 root root    366933 Feb 17 16:02 ./source/kdei/koffice-l10n/koffice-l10n-gl-2.3.2.tar.bz2
+-rw-r--r--   1 root root    383914 Feb 17 16:02 ./source/kdei/koffice-l10n/koffice-l10n-hu-2.3.2.tar.bz2
+-rw-r--r--   1 root root    709685 Feb 17 16:02 ./source/kdei/koffice-l10n/koffice-l10n-it-2.3.2.tar.bz2
+-rw-r--r--   1 root root    301144 Feb 17 16:02 ./source/kdei/koffice-l10n/koffice-l10n-ja-2.3.2.tar.bz2
+-rw-r--r--   1 root root    333005 Feb 17 16:02 ./source/kdei/koffice-l10n/koffice-l10n-kk-2.3.2.tar.bz2
+-rw-r--r--   1 root root    329542 Feb 17 16:02 ./source/kdei/koffice-l10n/koffice-l10n-nb-2.3.2.tar.bz2
+-rw-r--r--   1 root root    971904 Feb 17 16:02 ./source/kdei/koffice-l10n/koffice-l10n-nds-2.3.2.tar.bz2
+-rw-r--r--   1 root root   2787702 Feb 17 16:02 ./source/kdei/koffice-l10n/koffice-l10n-nl-2.3.2.tar.bz2
+-rw-r--r--   1 root root    357991 Feb 17 16:02 ./source/kdei/koffice-l10n/koffice-l10n-pl-2.3.2.tar.bz2
+-rw-r--r--   1 root root    609615 Feb 17 16:02 ./source/kdei/koffice-l10n/koffice-l10n-pt-2.3.2.tar.bz2
+-rw-r--r--   1 root root    848370 Feb 17 16:02 ./source/kdei/koffice-l10n/koffice-l10n-pt_BR-2.3.2.tar.bz2
+-rw-r--r--   1 root root    558576 Feb 17 16:02 ./source/kdei/koffice-l10n/koffice-l10n-ru-2.3.2.tar.bz2
+-rw-r--r--   1 root root   2447736 Feb 17 16:02 ./source/kdei/koffice-l10n/koffice-l10n-sv-2.3.2.tar.bz2
+-rw-r--r--   1 root root    322498 Feb 17 16:02 ./source/kdei/koffice-l10n/koffice-l10n-tr-2.3.2.tar.bz2
+-rw-r--r--   1 root root    651651 Feb 17 16:02 ./source/kdei/koffice-l10n/koffice-l10n-uk-2.3.2.tar.bz2
+-rw-r--r--   1 root root    331887 Feb 17 16:02 ./source/kdei/koffice-l10n/koffice-l10n-wa-2.3.2.tar.bz2
+-rw-r--r--   1 root root    292546 Feb 17 16:02 ./source/kdei/koffice-l10n/koffice-l10n-zh_CN-2.3.2.tar.bz2
+-rw-r--r--   1 root root    334294 Feb 17 16:02 ./source/kdei/koffice-l10n/koffice-l10n-zh_TW-2.3.2.tar.bz2
+-rwxr-xr-x   1 root root      4029 Mar  1 23:02 ./source/kdei/koffice-l10n/koffice-l10n.SlackBuild
+-rw-r--r--   1 root root       103 Mar  1 23:54 ./source/kdei/koffice-l10n/languages
+drwxr-xr-x   2 root root      4096 Apr 10  2010 ./source/kdei/koffice-l10n/slack-desc
+-rw-r--r--   1 root root       709 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-af
+-rw-r--r--   1 root root       240 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ar
+-rw-r--r--   1 root root       711 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-az
+-rw-r--r--   1 root root       243 Jun 11  2007 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-bg
+-rw-r--r--   1 root root       706 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-br
+-rw-r--r--   1 root root       241 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-bs
+-rw-r--r--   1 root root       241 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ca
+-rw-r--r--   1 root root       370 Apr 10  2010 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ca@valencia
+-rw-r--r--   1 root root       705 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-cs
+-rw-r--r--   1 root root       239 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-cy
+-rw-r--r--   1 root root       706 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-da
+-rw-r--r--   1 root root       706 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-de
+-rw-r--r--   1 root root       239 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-el
+-rw-r--r--   1 root root       751 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-en_GB
+-rw-r--r--   1 root root       709 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-eo
+-rw-r--r--   1 root root       707 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-es
+-rw-r--r--   1 root root       708 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-et
+-rw-r--r--   1 root root       706 Jan 29  2006 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-eu
+-rw-r--r--   1 root root       249 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-fa
+-rw-r--r--   1 root root       241 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-fi
+-rw-r--r--   1 root root       706 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-fr
+-rw-r--r--   1 root root       243 Nov 24  2008 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-fy
+-rw-r--r--   1 root root       712 Apr 17  2006 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ga
+-rw-r--r--   1 root root       708 Feb 16  2007 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-gl
+-rw-r--r--   1 root root       240 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-he
+-rw-r--r--   1 root root       239 Apr 17  2006 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-hi
+-rw-r--r--   1 root root       259 Oct 21  2009 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-hne
+-rw-r--r--   1 root root       259 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-hsb
+-rw-r--r--   1 root root       709 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-hu
+-rw-r--r--   1 root root       243 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-is
+-rw-r--r--   1 root root       707 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-it
+-rw-r--r--   1 root root       708 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ja
+-rw-r--r--   1 root root       240 Nov 24  2008 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-kk
+-rw-r--r--   1 root root       705 Apr 22  2007 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-km
+-rw-r--r--   1 root root       237 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-lo
+-rw-r--r--   1 root root       710 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-lt
+-rw-r--r--   1 root root       241 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-lv
+-rw-r--r--   1 root root       244 Feb 16  2007 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-mk
+-rw-r--r--   1 root root       705 Jun  2  2006 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ms
+-rw-r--r--   1 root root       707 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-mt
+-rw-r--r--   1 root root       253 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-nb
+-rw-r--r--   1 root root       255 Jun 11  2007 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-nds
+-rw-r--r--   1 root root       240 Jun 11  2007 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ne
+-rw-r--r--   1 root root       705 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-nl
+-rw-r--r--   1 root root       253 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-nn
+-rw-r--r--   1 root root       719 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-no
+-rw-r--r--   1 root root       758 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-no_NY
+-rw-r--r--   1 root root       706 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-pl
+-rw-r--r--   1 root root       710 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-pt
+-rw-r--r--   1 root root       756 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-pt_BR
+-rw-r--r--   1 root root       708 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ro
+-rw-r--r--   1 root root       707 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ru
+-rw-r--r--   1 root root       713 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-se
+-rw-r--r--   1 root root       706 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-sk
+-rw-r--r--   1 root root       709 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-sl
+-rw-r--r--   1 root root       707 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-sr
+-rw-r--r--   1 root root       788 Jul 27  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-sr@Latn
+-rw-r--r--   1 root root       707 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-sv
+-rw-r--r--   1 root root       705 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ta
+-rw-r--r--   1 root root       239 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-tg
+-rw-r--r--   1 root root       238 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-th
+-rw-r--r--   1 root root       707 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-tr
+-rw-r--r--   1 root root       709 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-uk
+-rw-r--r--   1 root root       239 Apr 17  2006 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-uz
+-rw-r--r--   1 root root       251 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ven
+-rw-r--r--   1 root root       707 Jun  3  2009 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-wa
+-rw-r--r--   1 root root       239 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-xh
+-rw-r--r--   1 root root       288 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-zh_CN
+-rw-r--r--   1 root root       277 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-zh_TW
+-rw-r--r--   1 root root       238 Jun 23  2005 ./source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-zu
+drwxr-xr-x 194 root root      4096 Apr 20 03:02 ./source/l
+drwxr-xr-x   2 root root      4096 Dec 15 20:53 ./source/l/ConsoleKit
+-rw-r--r--   1 root root    344004 Nov 17 01:05 ./source/l/ConsoleKit/ConsoleKit-0.4.3.tar.xz
+-rwxr-xr-x   1 root root      4512 Mar 31 20:55 ./source/l/ConsoleKit/ConsoleKit.SlackBuild
+-rw-r--r--   1 root root       854 May  4  2009 ./source/l/ConsoleKit/consolekit-0.2.10-cleanup_console_tags.patch.gz
+-rw-r--r--   1 root root      2210 Sep 28  2010 ./source/l/ConsoleKit/consolekit-0.4.2-revert.patch.gz
+-rw-r--r--   1 root root       353 Sep 28  2010 ./source/l/ConsoleKit/doinst.sh.gz
+-rw-r--r--   1 root root       411 Jul  7  2009 ./source/l/ConsoleKit/pam-foreground-compat.ck
+-rw-r--r--   1 root root       572 Dec  2 19:03 ./source/l/ConsoleKit/rc.consolekit
+-rw-r--r--   1 root root       790 May  4  2010 ./source/l/ConsoleKit/slack-desc
+drwxr-xr-x   2 root root      4096 Aug  4  2010 ./source/l/M2Crypto
+-rw-r--r--   1 root root    284604 Oct  7  2009 ./source/l/M2Crypto/M2Crypto-0.20.2.tar.xz
+-rwxr-xr-x   1 root root      2842 Aug  4  2010 ./source/l/M2Crypto/M2Crypto.SlackBuild
+-rw-r--r--   1 root root      1050 Mar 31  2009 ./source/l/M2Crypto/slack-desc
+drwxr-xr-x   2 root root      4096 Nov 29 06:05 ./source/l/PyQt
+-rw-r--r--   1 root root   8044248 Nov 29 06:03 ./source/l/PyQt/PyQt-x11-gpl-4.8.1.tar.xz
+-rwxr-xr-x   1 root root      3163 Nov 29 06:05 ./source/l/PyQt/PyQt.SlackBuild
+-rw-r--r--   1 root root       158 Nov 28  2009 ./source/l/PyQt/PyQt.info
+-rw-r--r--   1 root root       254 Mar 25  2010 ./source/l/PyQt/PyQt.phonon.diff.gz
+-rw-r--r--   1 root root       731 May  4  2010 ./source/l/PyQt/slack-desc
+drwxr-xr-x   2 root root      4096 Nov 29 05:56 ./source/l/QScintilla
+-rw-r--r--   1 root root    944464 Aug 31  2010 ./source/l/QScintilla/QScintilla-gpl-2.4.5.tar.xz
+-rwxr-xr-x   1 root root      3139 Mar 25 18:10 ./source/l/QScintilla/QScintilla.SlackBuild
+-rw-r--r--   1 root root      1127 Jul 31  2008 ./source/l/QScintilla/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/l/aalib
+-rw-r--r--   1 root root    391028 Apr 26  2001 ./source/l/aalib/aalib-1.4rc5.tar.gz
+-rwxr-xr-x   1 root root      3784 Jan 23 07:26 ./source/l/aalib/aalib.SlackBuild
+-rw-r--r--   1 root root      1451 Mar 28  2002 ./source/l/aalib/slack-desc
+-rw-r--r--   1 root root      1305 Mar 28  2002 ./source/l/aalib/slack-desc.11line
+drwxr-xr-x   2 root root      4096 Nov 21 03:10 ./source/l/akonadi
+-rw-r--r--   1 root root    229469 Oct 22  2010 ./source/l/akonadi/akonadi-1.4.1.tar.bz2
+-rwxr-xr-x   1 root root      3289 Mar 24 01:56 ./source/l/akonadi/akonadi.SlackBuild
+-rw-r--r--   1 root root       110 Aug 31  2009 ./source/l/akonadi/doinst.sh.gz
+-rw-r--r--   1 root root       840 May  4  2010 ./source/l/akonadi/slack-desc
+drwxr-xr-x   2 root root      4096 Feb  9 05:40 ./source/l/alsa-lib
+-rw-r--r--   1 root root    636476 Jan 31 14:27 ./source/l/alsa-lib/alsa-lib-1.0.24.1.tar.xz
+-rwxr-xr-x   1 root root      3315 Feb  1 02:20 ./source/l/alsa-lib/alsa-lib.SlackBuild
+-rw-r--r--   1 root root       861 Aug 29  2003 ./source/l/alsa-lib/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/l/alsa-oss
+-rw-r--r--   1 root root    248726 Jul 14  2008 ./source/l/alsa-oss/alsa-oss-1.0.17.tar.bz2
+-rwxr-xr-x   1 root root      3021 Aug  5  2010 ./source/l/alsa-oss/alsa-oss.SlackBuild
+-rw-r--r--   1 root root       962 Aug 29  2003 ./source/l/alsa-oss/slack-desc
+drwxr-xr-x   2 root root      4096 Feb 12 19:18 ./source/l/apr
+drwxr-xr-x   2 root root      4096 Feb 10 04:52 ./source/l/apr-util
+-rw-r--r--   1 root root    607912 Oct  3  2010 ./source/l/apr-util/apr-util-1.3.10.tar.bz2
+-rw-r--r--   1 root root       836 Oct  3  2010 ./source/l/apr-util/apr-util-1.3.10.tar.bz2.asc
+-rwxr-xr-x   1 root root      3874 Feb 10 04:52 ./source/l/apr-util/apr-util.SlackBuild
+-rw-r--r--   1 root root       942 Jul 29  2006 ./source/l/apr-util/slack-desc
+-rw-r--r--   1 root root    766793 Jul 18  2010 ./source/l/apr/apr-1.4.2.tar.bz2
+-rw-r--r--   1 root root       836 Jul 18  2010 ./source/l/apr/apr-1.4.2.tar.bz2.asc
+-rwxr-xr-x   1 root root      3487 Feb 12 19:20 ./source/l/apr/apr.SlackBuild
+-rw-r--r--   1 root root       226 Feb 12 19:18 ./source/l/apr/apr.apr_ring.h.gcc45.diff.gz
+-rw-r--r--   1 root root       729 Jul 29  2006 ./source/l/apr/slack-desc
+drwxr-xr-x   2 root root      4096 Aug  5  2010 ./source/l/aspell
+drwxr-xr-x   2 root root      4096 Aug 13  2009 ./source/l/aspell-dict
+-rw-r--r--   1 root root    256111 Mar 15  2004 ./source/l/aspell-dict/aspell-af-0.50-0.tar.bz2
+-rw-r--r--   1 root root     68055 Apr 17  2003 ./source/l/aspell-dict/aspell-br-0.50-2.tar.bz2
+-rw-r--r--   1 root root    117652 Apr 17  2003 ./source/l/aspell-dict/aspell-cy-0.50-3.tar.bz2
+-rwxr-xr-x   1 root root      2446 May 19  2009 ./source/l/aspell-dict/aspell-dict.SlackBuild
+-rw-r--r--   1 root root    328225 Apr 17  2003 ./source/l/aspell-dict/aspell-el-0.50-3.tar.bz2
+-rw-r--r--   1 root root     89703 Apr 17  2003 ./source/l/aspell-dict/aspell-eo-0.50-2.tar.bz2
+-rw-r--r--   1 root root    157809 Apr 17  2003 ./source/l/aspell-dict/aspell-es-0.50-2.tar.bz2
+-rw-r--r--   1 root root    283086 Apr 17  2003 ./source/l/aspell-dict/aspell-fr-0.50-3.tar.bz2
+-rw-r--r--   1 root root    112313 Mar 10  2004 ./source/l/aspell-dict/aspell-gl-0.50-0.tar.bz2
+-rw-r--r--   1 root root     69462 Apr  5  2004 ./source/l/aspell-dict/aspell-gv-0.50-0.tar.bz2
+-rw-r--r--   1 root root    208118 Mar 30  2004 ./source/l/aspell-dict/aspell-hr-0.51-0.tar.bz2
+-rw-r--r--   1 root root     70883 Mar 30  2004 ./source/l/aspell-dict/aspell-ia-0.50-1.tar.bz2
+-rw-r--r--   1 root root    323850 Mar 13  2004 ./source/l/aspell-dict/aspell-is-0.51.1-0.tar.bz2
+-rw-r--r--   1 root root     57818 Mar 15  2004 ./source/l/aspell-dict/aspell-mi-0.50-0.tar.bz2
+-rw-r--r--   1 root root    122690 Apr 23  2004 ./source/l/aspell-dict/aspell-mk-0.50-0.tar.bz2
+-rw-r--r--   1 root root     50368 Mar 15  2004 ./source/l/aspell-dict/aspell-ms-0.50-0.tar.bz2
+-rw-r--r--   1 root root    124114 Mar 25  2004 ./source/l/aspell-dict/aspell-mt-0.50-0.tar.bz2
+-rw-r--r--   1 root root    423161 Jul 21  2009 ./source/l/aspell-dict/aspell-nb-0.50.1-0.tar.bz2
+-rw-r--r--   1 root root    428365 Apr 17  2003 ./source/l/aspell-dict/aspell-nl-0.50-2.tar.bz2
+-rw-r--r--   1 root root    335156 Apr  5  2004 ./source/l/aspell-dict/aspell-nn-0.50.1-1.tar.bz2
+-rw-r--r--   1 root root    286696 Apr 17  2003 ./source/l/aspell-dict/aspell-no-0.50-2.tar.bz2
+-rw-r--r--   1 root root    624458 Mar 10  2004 ./source/l/aspell-dict/aspell-pl-0.51-0.tar.bz2
+-rw-r--r--   1 root root    201341 Apr 17  2003 ./source/l/aspell-dict/aspell-pt-0.50-2.tar.bz2
+-rw-r--r--   1 root root     64110 Apr 17  2003 ./source/l/aspell-dict/aspell-ro-0.50-2.tar.bz2
+-rw-r--r--   1 root root     21821 May 19  2004 ./source/l/aspell-dict/aspell-rw-0.50-0.tar.bz2
+-rw-r--r--   1 root root    383840 Apr 16  2004 ./source/l/aspell-dict/aspell-sk-0.52-0.tar.bz2
+-rw-r--r--   1 root root    215463 Mar 15  2004 ./source/l/aspell-dict/aspell-sl-0.50-0.tar.bz2
+-rw-r--r--   1 root root     93942 Mar 10  2004 ./source/l/aspell-dict/aspell-sv-0.51-0.tar.bz2
+-rw-r--r--   1 root root    102172 Mar 29  2004 ./source/l/aspell-dict/aspell-sw-0.50-0.tar.bz2
+-rw-r--r--   1 root root     84846 Mar 29  2004 ./source/l/aspell-dict/aspell-tr-0.50-0.tar.bz2
+-rw-r--r--   1 root root    382513 Mar 10  2004 ./source/l/aspell-dict/aspell-uk-0.51-0.tar.bz2
+-rw-r--r--   1 root root     50363 Mar 29  2004 ./source/l/aspell-dict/aspell-wa-0.50-0.tar.bz2
+-rw-r--r--   1 root root    168226 Mar 29  2004 ./source/l/aspell-dict/aspell-zu-0.50-0.tar.bz2
+-rw-r--r--   1 root root    653405 Jul  5  2004 ./source/l/aspell-dict/aspell5-be-0.01.tar.bz2
+-rw-r--r--   1 root root    176676 May 28  2004 ./source/l/aspell-dict/aspell5-bg-4.0-0.tar.bz2
+-rw-r--r--   1 root root    317688 Aug 13  2004 ./source/l/aspell-dict/aspell5-da-1.4.42-1.tar.bz2
+-rw-r--r--   1 root root    165901 Aug 13  2004 ./source/l/aspell-dict/aspell5-fo-0.2.16-1.tar.bz2
+-rw-r--r--   1 root root    539910 Jan  7  2005 ./source/l/aspell-dict/aspell5-ga-3.6-0.tar.bz2
+-rw-r--r--   1 root root     51167 Aug 13  2004 ./source/l/aspell-dict/aspell5-gd-0.1.1-1.tar.bz2
+-rw-r--r--   1 root root     46288 Apr  6  2005 ./source/l/aspell-dict/aspell5-hil-0.11-0.tar.bz2
+-rw-r--r--   1 root root     76958 Aug 12  2004 ./source/l/aspell-dict/aspell5-id-1.2-0.tar.bz2
+-rw-r--r--   1 root root     23870 Sep 22  2004 ./source/l/aspell-dict/aspell5-ku-0.12-0.tar.bz2
+-rw-r--r--   1 root root     45331 Sep 10  2004 ./source/l/aspell-dict/aspell5-mg-0.03-0.tar.bz2
+-rw-r--r--   1 root root     22952 Aug 10  2004 ./source/l/aspell-dict/aspell5-ny-0.01-0.tar.bz2
+-rw-r--r--   1 root root    281538 Jun  1  2004 ./source/l/aspell-dict/aspell5-sc-1.0.tar.bz2
+-rw-r--r--   1 root root     33044 Jun  2  2004 ./source/l/aspell-dict/aspell5-tet-0.1.1.tar.bz2
+-rw-r--r--   1 root root     40642 Aug  6  2004 ./source/l/aspell-dict/aspell5-tl-0.02-1.tar.bz2
+-rw-r--r--   1 root root     22127 Aug 13  2004 ./source/l/aspell-dict/aspell5-tn-1.0.1-0.tar.bz2
+-rw-r--r--   1 root root     40493 Dec 28  2004 ./source/l/aspell-dict/aspell6-am-0.03-1.tar.bz2
+-rw-r--r--   1 root root     50588 Aug 27  2004 ./source/l/aspell-dict/aspell6-az-0.02-0.tar.bz2
+-rw-r--r--   1 root root    117436 Aug 27  2004 ./source/l/aspell-dict/aspell6-bn-0.01.1-1.tar.bz2
+-rw-r--r--   1 root root    222986 Aug 27  2004 ./source/l/aspell-dict/aspell6-ca-20040130-1.tar.bz2
+-rw-r--r--   1 root root    451507 Aug 27  2004 ./source/l/aspell-dict/aspell6-cs-20040614-1.tar.bz2
+-rw-r--r--   1 root root     32694 Mar 11  2005 ./source/l/aspell-dict/aspell6-csb-0.02-0.tar.bz2
+-rw-r--r--   1 root root    274407 Nov  4  2004 ./source/l/aspell-dict/aspell6-de-20030222-1.tar.bz2
+-rw-r--r--   1 root root    182442 Aug 27  2004 ./source/l/aspell-dict/aspell6-en-6.0-0.tar.bz2
+-rw-r--r--   1 root root    338155 Aug 27  2004 ./source/l/aspell-dict/aspell6-et-0.1.21-1.tar.bz2
+-rw-r--r--   1 root root     97168 Nov  4  2004 ./source/l/aspell-dict/aspell6-fa-0.02-0.tar.bz2
+-rw-r--r--   1 root root    209249 Aug 27  2004 ./source/l/aspell-dict/aspell6-fi-0.7-0.tar.bz2
+-rw-r--r--   1 root root     30949 Jan 17  2006 ./source/l/aspell-dict/aspell6-gu-0.02-0.tar.bz2
+-rw-r--r--   1 root root    122781 May 21  2006 ./source/l/aspell-dict/aspell6-he-1.0-0.tar.bz2
+-rw-r--r--   1 root root     51021 Jan 27  2005 ./source/l/aspell-dict/aspell6-hi-0.01-0.tar.bz2
+-rw-r--r--   1 root root    109026 Aug 27  2004 ./source/l/aspell-dict/aspell6-hsb-0.01-1.tar.bz2
+-rw-r--r--   1 root root    375949 Aug 27  2004 ./source/l/aspell-dict/aspell6-hu-0.99.4.2-0.tar.bz2
+-rw-r--r--   1 root root    216189 Jun  1  2005 ./source/l/aspell-dict/aspell6-it-2.2_20050523-0.tar.bz2
+-rw-r--r--   1 root root     42722 Aug 27  2004 ./source/l/aspell-dict/aspell6-la-20020503-0.tar.bz2
+-rw-r--r--   1 root root    153912 Jan 18  2006 ./source/l/aspell-dict/aspell6-lt-1.1+cvs20060103-0.tar.bz2
+-rw-r--r--   1 root root     72416 Aug 27  2004 ./source/l/aspell-dict/aspell6-lv-0.5.5-1.tar.bz2
+-rw-r--r--   1 root root     35446 Aug 27  2004 ./source/l/aspell-dict/aspell6-mn-0.01-0.tar.bz2
+-rw-r--r--   1 root root    151720 May 25  2005 ./source/l/aspell-dict/aspell6-mr-0.10-0.tar.bz2
+-rw-r--r--   1 root root     32658 Dec 28  2004 ./source/l/aspell-dict/aspell6-nds-0.01-0.tar.bz2
+-rw-r--r--   1 root root     20525 Jan 25  2005 ./source/l/aspell-dict/aspell6-or-0.03-1.tar.bz2
+-rw-r--r--   1 root root     22143 Jan 25  2005 ./source/l/aspell-dict/aspell6-pa-0.01-1.tar.bz2
+-rw-r--r--   1 root root    864887 Jul 18  2008 ./source/l/aspell-dict/aspell6-pt_BR-20080707-0.tar.bz2
+-rw-r--r--   1 root root     85541 Aug 27  2004 ./source/l/aspell-dict/aspell6-qu-0.02-0.tar.bz2
+-rw-r--r--   1 root root    427312 Aug 27  2004 ./source/l/aspell-dict/aspell6-ru-0.99f7-1.tar.bz2
+-rw-r--r--   1 root root    574923 Nov 11  2005 ./source/l/aspell-dict/aspell6-sr-0.02.tar.bz2
+-rw-r--r--   1 root root     44452 Aug 27  2004 ./source/l/aspell-dict/aspell6-ta-20040424-1.tar.bz2
+-rw-r--r--   1 root root    310738 Sep 29  2005 ./source/l/aspell-dict/aspell6-te-0.01-2.tar.bz2
+-rw-r--r--   1 root root    179098 Nov  6  2005 ./source/l/aspell-dict/aspell6-uk-1.1-0.tar.bz2
+-rw-r--r--   1 root root     71160 Jan 15  2006 ./source/l/aspell-dict/aspell6-uz-0.5-0.tar.bz2
+-rw-r--r--   1 root root     30843 Aug 27  2004 ./source/l/aspell-dict/aspell6-vi-0.01.1-1.tar.bz2
+-rw-r--r--   1 root root     74382 Aug 27  2004 ./source/l/aspell-dict/aspell6-yi-0.01.1-1.tar.bz2
+-rw-r--r--   1 root root    864576 Apr 16  2008 ./source/l/aspell/aspell-0.60.6.tar.xz
+-rwxr-xr-x   1 root root      3359 Aug  5  2010 ./source/l/aspell/aspell.SlackBuild
+-rw-r--r--   1 root root       708 Jan 13  2003 ./source/l/aspell/slack-desc
+drwxr-xr-x   2 root root      4096 Sep 28  2010 ./source/l/atk
+-rw-r--r--   1 root root    688186 Sep 27  2010 ./source/l/atk/atk-1.32.0.tar.bz2
+-rwxr-xr-x   1 root root      2896 Apr 30  2010 ./source/l/atk/atk.SlackBuild
+-rw-r--r--   1 root root       627 Feb 11  2008 ./source/l/atk/slack-desc
+drwxr-xr-x   2 root root      4096 Jun  7  2010 ./source/l/attica
+-rw-r--r--   1 root root     33349 Jun  7  2010 ./source/l/attica/attica-0.1.4.tar.bz2
+-rwxr-xr-x   1 root root      3030 Jun  7  2010 ./source/l/attica/attica.SlackBuild
+-rw-r--r--   1 root root       831 May  4  2010 ./source/l/attica/slack-desc
+drwxr-xr-x   2 root root      4096 Aug  5  2010 ./source/l/audiofile
+-rw-r--r--   1 root root    301344 Mar 22  2010 ./source/l/audiofile/audiofile-0.2.7.tar.xz
+-rwxr-xr-x   1 root root      3984 Aug  5  2010 ./source/l/audiofile/audiofile.SlackBuild
+-rw-r--r--   1 root root       775 Feb  9  2002 ./source/l/audiofile/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/l/automoc4
+-rw-r--r--   1 root root      9153 Jan 22  2009 ./source/l/automoc4/automoc4-0.9.88.tar.bz2
+-rwxr-xr-x   1 root root      2859 Aug  5  2010 ./source/l/automoc4/automoc4.SlackBuild
+-rw-r--r--   1 root root       912 Jan  3  2009 ./source/l/automoc4/slack-desc
+drwxr-xr-x   2 root root      4096 Nov  8 02:00 ./source/l/babl
+-rw-r--r--   1 root root    349288 Jan 14  2010 ./source/l/babl/babl-0.1.2.tar.xz
+-rwxr-xr-x   1 root root      3032 Nov  8 02:00 ./source/l/babl/babl.SlackBuild
+-rw-r--r--   1 root root       975 Oct  2  2008 ./source/l/babl/slack-desc
+drwxr-xr-x   2 root root      4096 Nov 28 05:25 ./source/l/boost
+-rwxr-xr-x   1 root root      4968 Nov 28 05:31 ./source/l/boost/boost.SlackBuild
+-rw-r--r--   1 root root  34263508 Nov 17 14:52 ./source/l/boost/boost_1_45_0.tar.xz
+-rw-r--r--   1 root root       889 Aug  1  2008 ./source/l/boost/slack-desc
+drwxr-xr-x   2 root root      4096 Jan  8 18:10 ./source/l/cairo
+-rw-r--r--   1 root root       354 Oct 17  2010 ./source/l/cairo/cairo-1.10.0-buggy_gradients.patch.gz
+-rw-r--r--   1 root root  19646268 Dec 25 23:03 ./source/l/cairo/cairo-1.10.2.tar.xz
+-rwxr-xr-x   1 root root      3652 Mar 19 19:04 ./source/l/cairo/cairo.SlackBuild
+-rw-r--r--   1 root root       851 Jan 18  2006 ./source/l/cairo/slack-desc
+drwxr-xr-x   2 root root      4096 Aug  5  2010 ./source/l/chmlib
+-rw-r--r--   1 root root    252036 May 23  2009 ./source/l/chmlib/chmlib-0.40.tar.bz2
+-rwxr-xr-x   1 root root      3064 Mar 29 04:29 ./source/l/chmlib/chmlib.SlackBuild
+-rw-r--r--   1 root root       164 Jan  8  2008 ./source/l/chmlib/chmlib.info
+-rw-r--r--   1 root root       927 Aug  1  2008 ./source/l/chmlib/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/l/clucene
+-rw-r--r--   1 root root   1539103 Oct 23  2008 ./source/l/clucene/clucene-core-0.9.21b.tar.bz2
+-rwxr-xr-x   1 root root      3161 Aug  5  2010 ./source/l/clucene/clucene.SlackBuild
+-rw-r--r--   1 root root       198 Dec 20  2007 ./source/l/clucene/clucene.info
+-rw-r--r--   1 root root       357 Aug  1  2008 ./source/l/clucene/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/l/db42
+-rw-r--r--   1 root root   3045196 Dec  4  2003 ./source/l/db42/db-4.2.52.tar.bz2
+-rwxr-xr-x   1 root root      4771 Aug  5  2010 ./source/l/db42/db42.SlackBuild
+-rw-r--r--   1 root root       544 Dec 19  2003 ./source/l/db42/patch.4.2.52.1.gz
+-rw-r--r--   1 root root       466 Feb  2  2004 ./source/l/db42/patch.4.2.52.2.gz
+-rw-r--r--   1 root root      1683 Dec  9  2005 ./source/l/db42/patch.4.2.52.3.gz
+-rw-r--r--   1 root root       427 Dec  9  2005 ./source/l/db42/patch.4.2.52.4.gz
+-rw-r--r--   1 root root       819 Mar  4  2006 ./source/l/db42/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/l/db44
+-rw-r--r--   1 root root   6886251 Jan 10  2006 ./source/l/db44/db-4.4.20.tar.bz2
+-rwxr-xr-x   1 root root      4345 Aug  6  2010 ./source/l/db44/db44.SlackBuild
+-rw-r--r--   1 root root       515 Feb  3  2006 ./source/l/db44/patch.4.4.20.1.gz
+-rw-r--r--   1 root root       392 Feb  3  2006 ./source/l/db44/patch.4.4.20.2.gz
+-rw-r--r--   1 root root       818 Mar  8  2006 ./source/l/db44/slack-desc
+drwxr-xr-x   2 root root      4096 Sep 14  2010 ./source/l/dbus-glib
+-rw-r--r--   1 root root    454004 Aug 12  2010 ./source/l/dbus-glib/dbus-glib-0.88.tar.xz
+-rwxr-xr-x   1 root root      3189 Nov  3 19:36 ./source/l/dbus-glib/dbus-glib.SlackBuild
+-rw-r--r--   1 root root       681 Mar 16  2007 ./source/l/dbus-glib/slack-desc
+drwxr-xr-x   2 root root      4096 Apr 27  2010 ./source/l/dbus-python
+-rw-r--r--   1 root root    533391 Feb 18  2010 ./source/l/dbus-python/dbus-python-0.83.1.tar.gz
+-rwxr-xr-x   1 root root      3123 Apr 27  2010 ./source/l/dbus-python/dbus-python.SlackBuild
+-rw-r--r--   1 root root       702 Apr  4  2008 ./source/l/dbus-python/slack-desc
+drwxr-xr-x   2 root root      4096 May 11  2010 ./source/l/desktop-file-utils
+-rw-r--r--   1 root root    282640 Mar 10  2010 ./source/l/desktop-file-utils/desktop-file-utils-0.16.tar.bz2
+-rwxr-xr-x   1 root root      4151 May 11  2010 ./source/l/desktop-file-utils/desktop-file-utils.SlackBuild
+-rw-r--r--   1 root root       354 May 11  2010 ./source/l/desktop-file-utils/desktop-file-utils.quiet.warnings.diff.gz
+-rw-r--r--   1 root root       128 Oct  7  2008 ./source/l/desktop-file-utils/doinst.sh.gz
+-rw-r--r--   1 root root      1124 Sep 17  2006 ./source/l/desktop-file-utils/slack-desc
+drwxr-xr-x   2 root root      4096 Apr  7 23:58 ./source/l/djvulibre
+-rw-r--r--   1 root root   2454400 Mar  6 17:46 ./source/l/djvulibre/djvulibre-3.5.24.tar.xz
+-rwxr-xr-x   1 root root      4173 Apr  7 23:59 ./source/l/djvulibre/djvulibre.SlackBuild
+-rw-r--r--   1 root root       257 Nov 28  2009 ./source/l/djvulibre/djvulibre.info
+-rw-r--r--   1 root root       140 Nov 28  2009 ./source/l/djvulibre/doinst.sh.gz
+-rw-r--r--   1 root root      1019 Aug  1  2008 ./source/l/djvulibre/slack-desc
+drwxr-xr-x   2 root root      4096 May  4  2010 ./source/l/ebook-tools
+-rw-r--r--   1 root root     37866 Jan 29  2010 ./source/l/ebook-tools/ebook-tools-0.1.1.tar.bz2
+-rwxr-xr-x   1 root root      3475 Mar 26  2010 ./source/l/ebook-tools/ebook-tools.SlackBuild
+-rw-r--r--   1 root root       742 Mar 26  2010 ./source/l/ebook-tools/ebook-tools.paths.diff
+-rw-r--r--   1 root root       781 May  4  2010 ./source/l/ebook-tools/slack-desc
+drwxr-xr-x   2 root root      4096 Nov 28  2009 ./source/l/eigen2
+-rw-r--r--   1 root root    327460 Nov 25  2009 ./source/l/eigen2/eigen2-2.0.10.tar.xz
+-rwxr-xr-x   1 root root      2874 Dec 17  2009 ./source/l/eigen2/eigen2.SlackBuild
+-rw-r--r--   1 root root       712 Nov 23  2008 ./source/l/eigen2/slack-desc
+drwxr-xr-x   2 root root      4096 Dec  5  2009 ./source/l/enchant
+-rw-r--r--   1 root root    359608 Dec  5  2009 ./source/l/enchant/enchant-1.5.0.tar.xz
+-rwxr-xr-x   1 root root      3293 Dec 17  2009 ./source/l/enchant/enchant.SlackBuild
+-rw-r--r--   1 root root       113 Dec  5  2009 ./source/l/enchant/enchant.info
+-rw-r--r--   1 root root       802 Aug  1  2008 ./source/l/enchant/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/l/esound
+-rw-r--r--   1 root root       262 Mar 23  2009 ./source/l/esound/doinst.sh.gz
+-rw-r--r--   1 root root    396474 Mar 23  2009 ./source/l/esound/esound-0.2.41.tar.bz2
+-rwxr-xr-x   1 root root      3634 Aug  6  2010 ./source/l/esound/esound.SlackBuild
+-rw-r--r--   1 root root       962 Apr  2  2002 ./source/l/esound/slack-desc
+drwxr-xr-x   2 root root      4096 Feb 14 19:12 ./source/l/exiv2
+-rw-r--r--   1 root root   1551004 Feb 14 09:31 ./source/l/exiv2/exiv2-0.21.1.tar.xz
+-rwxr-xr-x   1 root root      3602 Feb  9 06:00 ./source/l/exiv2/exiv2.SlackBuild
+-rw-r--r--   1 root root       714 Aug  1  2008 ./source/l/exiv2/slack-desc
+drwxr-xr-x   2 root root      4096 Feb  9 22:05 ./source/l/expat
+-rw-r--r--   1 root root       824 Dec  9 21:51 ./source/l/expat/expat-2.0.1-fixes-3.patch.gz
+-rw-r--r--   1 root root    446456 Jun  7  2007 ./source/l/expat/expat-2.0.1.tar.gz
+-rwxr-xr-x   1 root root      2867 Feb  9 22:06 ./source/l/expat/expat.SlackBuild
+-rw-r--r--   1 root root       720 Feb 11  2008 ./source/l/expat/slack-desc
+drwxr-xr-x   2 root root      4096 Dec 17  2009 ./source/l/fftw
+-rw-r--r--   1 root root   1937412 Jul 14  2009 ./source/l/fftw/fftw-3.2.2.tar.xz
+-rwxr-xr-x   1 root root      3591 Dec 17  2009 ./source/l/fftw/fftw.SlackBuild
+-rw-r--r--   1 root root       961 Sep 27  2009 ./source/l/fftw/slack-desc
+drwxr-xr-x   2 root root      4096 Dec 23 23:39 ./source/l/freetype
+-rw-r--r--   1 root root   1442053 Nov 28 15:54 ./source/l/freetype/freetype-2.4.4.tar.bz2
+-rwxr-xr-x   1 root root      3929 Nov  5 00:17 ./source/l/freetype/freetype.SlackBuild
+-rw-r--r--   1 root root       493 Jun  5  2004 ./source/l/freetype/freetype.illadvisederror.diff.gz
+-rw-r--r--   1 root root       295 Apr 21  2007 ./source/l/freetype/freetype.subpixel.rendering.diff.gz
+-rw-r--r--   1 root root       803 Jul 22  2006 ./source/l/freetype/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/l/fribidi
+-rw-r--r--   1 root root    490862 Aug  9  2007 ./source/l/fribidi/fribidi-0.10.9.tar.bz2
+-rwxr-xr-x   1 root root      2870 Aug  6  2010 ./source/l/fribidi/fribidi.SlackBuild
+-rw-r--r--   1 root root       811 Apr  8  2008 ./source/l/fribidi/slack-desc
+drwxr-xr-x   2 root root      4096 Jan 30 22:27 ./source/l/fuse
+-rw-r--r--   1 root root       336 Dec  7  2007 ./source/l/fuse/doinst.sh.gz
+-rw-r--r--   1 root root    346680 Sep 28  2010 ./source/l/fuse/fuse-2.8.5.tar.xz
+-rwxr-xr-x   1 root root      4014 Jan 30 22:28 ./source/l/fuse/fuse.SlackBuild
+-rw-r--r--   1 root root       846 Mar  8  2008 ./source/l/fuse/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 16 01:45 ./source/l/gamin
+-rw-r--r--   1 root root       272 Mar 16 01:44 ./source/l/gamin/doinst.sh.gz
+-rw-r--r--   1 root root    333504 Mar  9  2009 ./source/l/gamin/gamin-0.1.10.tar.xz
+-rwxr-xr-x   1 root root      3694 Mar 16 01:45 ./source/l/gamin/gamin.SlackBuild
+-rw-r--r--   1 root root       497 Mar 16 01:42 ./source/l/gamin/gaminrc.gz
+-rw-r--r--   1 root root       753 Mar 16  2007 ./source/l/gamin/slack-desc
+drwxr-xr-x   2 root root      4096 Feb 12  2010 ./source/l/gd
+-rw-r--r--   1 root root   1212730 Jun 21  2007 ./source/l/gd/gd-2.0.35.tar.bz2
+-rwxr-xr-x   1 root root      3770 Feb 12  2010 ./source/l/gd/gd.SlackBuild
+-rw-r--r--   1 root root      1088 Feb 12  2010 ./source/l/gd/gd.png14.diff.gz
+-rw-r--r--   1 root root       366 Feb 18  2010 ./source/l/gd/gdlib.pc
+-rw-r--r--   1 root root       922 Aug 16  2006 ./source/l/gd/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/l/gdbm
+-rw-r--r--   1 root root    228695 Oct 16  2002 ./source/l/gdbm/gdbm-1.8.3.tar.gz
+-rwxr-xr-x   1 root root      3614 Aug  6  2010 ./source/l/gdbm/gdbm.SlackBuild
+-rw-r--r--   1 root root       641 Mar 23  2002 ./source/l/gdbm/slack-desc
+drwxr-xr-x   2 root root      4096 Apr 10 14:27 ./source/l/gdk-pixbuf2
+-rw-r--r--   1 root root        91 Nov 16 21:31 ./source/l/gdk-pixbuf2/doinst.sh.gz
+-rw-r--r--   1 root root   1170284 Mar 30 18:40 ./source/l/gdk-pixbuf2/gdk-pixbuf-2.23.3.tar.xz
+-rw-r--r--   1 root root       242 Oct  9  2010 ./source/l/gdk-pixbuf2/gdk-pixbuf.pnglz.diff.gz
+-rwxr-xr-x   1 root root      4232 Mar 21 17:34 ./source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild
+-rw-r--r--   1 root root      1000 Nov 14 18:49 ./source/l/gdk-pixbuf2/slack-desc
+-rw-r--r--   1 root root      1744 Sep  8  2010 ./source/l/gdk-pixbuf2/update-gdk-pixbuf-loaders
+drwxr-xr-x   2 root root      4096 Nov  8 02:02 ./source/l/gegl
+-rw-r--r--   1 root root   2857496 Feb  7  2010 ./source/l/gegl/gegl-0.1.2.tar.xz
+-rwxr-xr-x   1 root root      3428 Nov  8 02:03 ./source/l/gegl/gegl.SlackBuild
+-rw-r--r--   1 root root       862 Oct  2  2008 ./source/l/gegl/slack-desc
+drwxr-xr-x   2 root root      4096 Feb  6  2010 ./source/l/giflib
+-rw-r--r--   1 root root    403232 Jul  1  2009 ./source/l/giflib/giflib-4.1.6.tar.xz
+-rwxr-xr-x   1 root root      3450 Feb  6  2010 ./source/l/giflib/giflib.SlackBuild
+-rw-r--r--   1 root root       776 Jul  1  2009 ./source/l/giflib/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/l/glib
+-rw-r--r--   1 root root    346080 Mar 15  2001 ./source/l/glib/glib-1.2.10.tar.bz2
+-rwxr-xr-x   1 root root      3807 Aug  6  2010 ./source/l/glib/glib.SlackBuild
+-rw-r--r--   1 root root    110117 Dec  1  2006 ./source/l/glib/glib1.2_1.2.10-17.diff.bz2
+-rw-r--r--   1 root root       757 Mar  8  2007 ./source/l/glib/slack-desc
+drwxr-xr-x   2 root root      4096 Apr 22 17:06 ./source/l/glib2
+-rw-r--r--   1 root root       489 Dec 15 02:36 ./source/l/glib2/doinst.sh.gz
+-rw-r--r--   1 root root   4883344 Apr 14 06:28 ./source/l/glib2/glib-2.28.6.tar.xz
+-rwxr-xr-x   1 root root      3740 Feb 11 14:23 ./source/l/glib2/glib2.SlackBuild
+-rw-r--r--   1 root root       999 Mar 27 21:04 ./source/l/glib2/libglib2.csh
+-rw-r--r--   1 root root       982 Mar 18  2008 ./source/l/glib2/libglib2.sh
+-rw-r--r--   1 root root       691 Jan 11  2003 ./source/l/glib2/slack-desc
+drwxr-xr-x   4 root root      4096 Mar 24 07:32 ./source/l/glibc
+-rw-r--r--   1 root root      7252 Feb  8 21:23 ./source/l/glibc/doinst.sh-glibc
+-rw-r--r--   1 root root      4512 Feb  8 21:23 ./source/l/glibc/doinst.sh-glibc-solibs
+-rw-r--r--   1 root root       736 Oct 12  2010 ./source/l/glibc/doinst.sh-glibc-zoneinfo
+-rw-r--r--   1 root root       652 Jan  9  2009 ./source/l/glibc/glibc-2.10-dns-no-gethostbyname4.diff.gz
+-rw-r--r--   1 root root  10262020 Feb  1 09:53 ./source/l/glibc/glibc-2.13.tar.xz
+-rw-r--r--   1 root root        72 Feb  1 09:53 ./source/l/glibc/glibc-2.13.tar.xz.sig
+-rwxr-xr-x   1 root root       174 Aug  9  2004 ./source/l/glibc/glibc-cvs-checkout.sh
+-rwxr-xr-x   1 root root     16039 Mar 24 07:31 ./source/l/glibc/glibc.SlackBuild
+-rw-r--r--   1 root root       333 Feb  9 01:36 ./source/l/glibc/glibc.disable.broken.optimized.memcpy.diff.gz
+-rw-r--r--   1 root root       183 Oct 11  2006 ./source/l/glibc/glibc.getcwd.max.macro.diff.gz
+-rw-r--r--   1 root root     11654 Jan  6 17:20 ./source/l/glibc/glibc.git-4a531bb0b3b582cb693de9f76d2d97d970f9a5d5.patch.gz
+-rw-r--r--   1 root root       558 Jan  6 02:45 ./source/l/glibc/glibc.git-96611391ad8823ba58405325d78cefeae5cdf699-CVE-2010-3847b.patch.gz
+-rw-r--r--   1 root root       722 Mar 24 07:29 ./source/l/glibc/glibc.ldd.trace.through.dynamic.linker.diff.gz
+-rw-r--r--   1 root root       304 Aug  4  2004 ./source/l/glibc/glibc.locale.no-archive.diff.gz
+-rw-r--r--   1 root root       558 Oct 19  2010 ./source/l/glibc/glibc.make-3.82.diff.gz
+-rw-r--r--   1 root root       325 Oct 11  2006 ./source/l/glibc/glibc.nis-netgroups.diff.gz
+-rw-r--r--   1 root root       246 Feb 24  2009 ./source/l/glibc/glibc.revert.to.fix.build.breakages.diff.gz
+-rw-r--r--   1 root root       213 Aug 22  2006 ./source/l/glibc/glibc.ru_RU.CP1251.diff.gz
+-rw-r--r--   1 root root       254 Oct 31  2007 ./source/l/glibc/is_IS.diff.gz
+drwxr-xr-x   2 root root      4096 Sep 14  2006 ./source/l/glibc/profile.d
+-rwxr-xr-x   1 root root       328 Mar 27 21:19 ./source/l/glibc/profile.d/glibc.csh.new
+-rwxr-xr-x   1 root root       325 Sep 14  2006 ./source/l/glibc/profile.d/glibc.sh.new
+-rw-r--r--   1 root root       845 Oct 11  2002 ./source/l/glibc/slack-desc.glibc
+-rw-r--r--   1 root root      1139 Oct 12  2002 ./source/l/glibc/slack-desc.glibc-debug
+-rw-r--r--   1 root root       794 May  1  2002 ./source/l/glibc/slack-desc.glibc-i18n
+-rw-r--r--   1 root root       972 Nov 18  2005 ./source/l/glibc/slack-desc.glibc-profile
+-rw-r--r--   1 root root       786 Mar 23  2002 ./source/l/glibc/slack-desc.glibc-solibs
+-rw-r--r--   1 root root      1227 Nov 23  2006 ./source/l/glibc/slack-desc.glibc-solibs-linuxthreads
+-rw-r--r--   1 root root       965 Apr 30  2007 ./source/l/glibc/slack-desc.glibc-zoneinfo
+drwxr-xr-x   3 root root      4096 Feb 25  2009 ./source/l/glibc/timezone-scripts
+-rw-r--r--   1 root root      2106 Dec  4  2006 ./source/l/glibc/timezone-scripts/output-updated-timeconfig.sh
+drwxr-xr-x   2 root root      4096 Dec  3  2006 ./source/l/glibc/timezone-scripts/parts
+-rw-r--r--   1 root root      4398 Mar 10  2008 ./source/l/glibc/timezone-scripts/parts/00
+-rw-r--r--   1 root root     44857 Sep 18  2007 ./source/l/glibc/timezone-scripts/parts/01
+-rw-r--r--   1 root root       443 Dec  3  2006 ./source/l/glibc/timezone-scripts/parts/02
+-rw-r--r--   1 root root     31601 Sep 18  2007 ./source/l/glibc/timezone-scripts/parts/03
+-rw-r--r--   1 root root       857 Dec  3  2006 ./source/l/glibc/timezone-scripts/parts/04
+-rw-r--r--   1 root root        87 Dec  3  2006 ./source/l/glibc/timezone-scripts/parts/README
+-rw-r--r--   1 root root        66 Feb 16  2003 ./source/l/glibc/timezone-scripts/setup.timeconfig
+-rw-r--r--   1 root root     84202 Feb 25  2009 ./source/l/glibc/timezone-scripts/timeconfig
+-rw-r--r--   1 root root    193553 Mar 14 13:18 ./source/l/glibc/tzcode2011d.tar.gz
+-rw-r--r--   1 root root    194588 Mar 14 13:18 ./source/l/glibc/tzdata2011d.tar.gz
+drwxr-xr-x   2 root root      4096 Feb  3  2010 ./source/l/gmime
+-rw-r--r--   1 root root    719516 Feb  2  2010 ./source/l/gmime/gmime-2.4.15.tar.xz
+-rwxr-xr-x   1 root root      3655 Feb  4  2010 ./source/l/gmime/gmime.SlackBuild
+-rw-r--r--   1 root root       753 Mar 14  2007 ./source/l/gmime/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/l/gmm
+-rw-r--r--   1 root root    333173 Sep  9  2008 ./source/l/gmm/gmm-3.1.tar.bz2
+-rwxr-xr-x   1 root root      2111 May 19  2009 ./source/l/gmm/gmm.SlackBuild
+-rw-r--r--   1 root root       117 Jul 25  2008 ./source/l/gmm/gmm.info
+-rw-r--r--   1 root root      1035 Aug  1  2008 ./source/l/gmm/slack-desc
+drwxr-xr-x   2 root root      4096 Feb 24  2010 ./source/l/gmp
+-rw-r--r--   1 root root   1656884 Feb  6  2010 ./source/l/gmp/gmp-5.0.1.tar.xz
+-rwxr-xr-x   1 root root      3225 Feb 24  2010 ./source/l/gmp/gmp.SlackBuild
+-rw-r--r--   1 root root       766 Jun 24  2003 ./source/l/gmp/slack-desc
+drwxr-xr-x   2 root root      4096 Nov  6 19:00 ./source/l/gnome-icon-theme
+-rw-r--r--   1 root root       138 Jul 14  2009 ./source/l/gnome-icon-theme/doinst.sh.gz
+-rw-r--r--   1 root root  12469028 Aug  5  2010 ./source/l/gnome-icon-theme/gnome-icon-theme-2.31.0.tar.xz
+-rwxr-xr-x   1 root root      3094 Nov  6 18:55 ./source/l/gnome-icon-theme/gnome-icon-theme.SlackBuild
+-rw-r--r--   1 root root       384 Nov  6 19:00 ./source/l/gnome-icon-theme/gnome-icon-theme.pkgconfig.path.diff.gz
+-rw-r--r--   1 root root       766 Feb 11  2008 ./source/l/gnome-icon-theme/slack-desc
+drwxr-xr-x   2 root root      4096 Jan 23 21:59 ./source/l/gst-plugins-base
+-rw-r--r--   1 root root   2127100 Jan 21 10:45 ./source/l/gst-plugins-base/gst-plugins-base-0.10.32.tar.xz
+-rwxr-xr-x   1 root root      3696 Feb 11  2010 ./source/l/gst-plugins-base/gst-plugins-base.SlackBuild
+-rw-r--r--   1 root root      1067 Aug  1  2008 ./source/l/gst-plugins-base/slack-desc
+drwxr-xr-x   2 root root      4096 Apr 16 03:19 ./source/l/gst-plugins-good
+-rw-r--r--   1 root root   2488032 Mar  8 17:45 ./source/l/gst-plugins-good/gst-plugins-good-0.10.28.tar.xz
+-rw-r--r--   1 root root       331 Apr 16 03:19 ./source/l/gst-plugins-good/gst-plugins-good.6b86b56abd8a28b9e94cee679e3d86367a9a0ab3.diff.gz
+-rwxr-xr-x   1 root root      4058 Apr 16 03:20 ./source/l/gst-plugins-good/gst-plugins-good.SlackBuild
+-rw-r--r--   1 root root       902 Nov  3  2009 ./source/l/gst-plugins-good/slack-desc
+drwxr-xr-x   2 root root      4096 Jan 23 21:36 ./source/l/gstreamer
+-rw-r--r--   1 root root   2859392 Jan 21 10:14 ./source/l/gstreamer/gstreamer-0.10.32.tar.xz
+-rwxr-xr-x   1 root root      4042 Feb 11  2010 ./source/l/gstreamer/gstreamer.SlackBuild
+-rw-r--r--   1 root root      1060 Aug  1  2008 ./source/l/gstreamer/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/l/gtk+
+-rw-r--r--   1 root root   2248773 Apr  2  2001 ./source/l/gtk+/gtk+-1.2.10.tar.bz2
+-rwxr-xr-x   1 root root      3984 Jan 23 07:31 ./source/l/gtk+/gtk+.SlackBuild
+-rw-r--r--   1 root root    159953 Oct  6  2005 ./source/l/gtk+/gtk+1.2_1.2.10-18.diff.bz2
+-rw-r--r--   1 root root       806 Mar  8  2007 ./source/l/gtk+/slack-desc
+drwxr-xr-x   3 root root      4096 Apr  2 17:21 ./source/l/gtk+2
+-rw-r--r--   1 root root       505 Dec  4 23:22 ./source/l/gtk+2/doinst.sh.gz
+-rw-r--r--   1 root root       359 Feb 11 16:42 ./source/l/gtk+2/fix_build_issues_on_tutorial_and_faq.diff.gz
+-rw-r--r--   1 root root  11736120 Apr  2 00:35 ./source/l/gtk+2/gtk+-2.24.4.tar.xz
+-rw-r--r--   1 root root      2047 Apr  2 17:20 ./source/l/gtk+2/gtk+-2.24.x.icon-compat.am.diff.gz
+-rw-r--r--   1 root root      1923 Apr  2 17:21 ./source/l/gtk+2/gtk+-2.24.x.icon-compat.diff.gz
+-rwxr-xr-x   1 root root      6816 Feb 24 21:25 ./source/l/gtk+2/gtk+2.SlackBuild
+-rw-r--r--   1 root root       293 Feb  8  2010 ./source/l/gtk+2/gtk.xid.nowarningflood.diff.gz
+drwxr-xr-x   2 root root      4096 Jan 11  2003 ./source/l/gtk+2/profile.d
+-rwxr-xr-x   1 root root        32 Dec  9 19:12 ./source/l/gtk+2/profile.d/gtk+.csh
+-rwxr-xr-x   1 root root        44 Dec  9 19:13 ./source/l/gtk+2/profile.d/gtk+.sh
+-rw-r--r--   1 root root       791 Feb 11  2008 ./source/l/gtk+2/slack-desc
+-rw-r--r--   1 root root       339 Feb 24 20:40 ./source/l/gtk+2/update-gtk-immodules
+-rw-r--r--   1 root root      2412 Aug 11  2009 ./source/l/gtk+2/update-gtk-immodules-2.0
+-rw-r--r--   1 root root       475 Feb 11 14:54 ./source/l/gtk+2/use_host_triplet_for_gtk_immodules.diff.gz
+drwxr-xr-x   2 root root      4096 Aug  6  2010 ./source/l/gtkspell
+-rw-r--r--   1 root root    241976 Oct 23  2009 ./source/l/gtkspell/gtkspell-2.0.16.tar.xz
+-rwxr-xr-x   1 root root      3589 Aug  6  2010 ./source/l/gtkspell/gtkspell.SlackBuild
+-rw-r--r--   1 root root       789 Sep 18  2008 ./source/l/gtkspell/slack-desc
+drwxr-xr-x   3 root root      4096 Jul 14  2010 ./source/l/hal
+drwxr-xr-x   3 root root      4096 Dec 31  2009 ./source/l/hal-info
+-rw-r--r--   1 root root    108915 Dec  1  2009 ./source/l/hal-info/hal-info-20091130.tar.bz2
+-rwxr-xr-x   1 root root      2273 Feb  9  2010 ./source/l/hal-info/hal-info.SlackBuild
+drwxr-xr-x   2 root root      4096 Dec 31  2009 ./source/l/hal-info/patches
+-rw-r--r--   1 root root       952 Dec 31  2009 ./source/l/hal-info/patches/quirk-LG_X110-keyboard.patch.gz
+-rw-r--r--   1 root root       603 Dec 31  2009 ./source/l/hal-info/patches/quirk-acer_aspire_hotkey.patch.gz
+-rw-r--r--   1 root root       757 Apr 14  2009 ./source/l/hal-info/slack-desc
+-rw-r--r--   1 root root       346 Jul 15  2009 ./source/l/hal/doinst.sh.gz
+-rw-r--r--   1 root root    762460 Nov 30  2009 ./source/l/hal/hal-0.5.14.tar.xz
+-rwxr-xr-x   1 root root      6160 Nov  8 03:00 ./source/l/hal/hal.SlackBuild
+-rw-r--r--   1 root root       643 Sep  9  2009 ./source/l/hal/hal.conf.gz
+drwxr-xr-x   2 root root      4096 Nov  8 02:57 ./source/l/hal/patches
+-rw-r--r--   1 root root      1338 Dec 12  2009 ./source/l/hal/patches/10-keymap.fdi-restore_zap.diff.gz
+-rw-r--r--   1 root root       460 Nov  8 02:55 ./source/l/hal/patches/fix-build-with-automake-1.11.1.patch.gz
+-rw-r--r--   1 root root       602 Nov  8 02:57 ./source/l/hal/patches/fix-hal-segfault.patch.gz
+-rw-r--r--   1 root root       679 Mar  4  2010 ./source/l/hal/patches/fix_ioperm_arguments.patch.gz
+-rw-r--r--   1 root root       970 Dec 12  2009 ./source/l/hal/patches/fix_libusb_detection.diff.gz
+-rw-r--r--   1 root root      1274 Mar  4  2010 ./source/l/hal/patches/fix_segfault-dbus_error_init.patch.gz
+-rw-r--r--   1 root root      1037 Dec 31  2009 ./source/l/hal/patches/fix_segfault_in_LIBHAL_FREE_DBUS_ERROR.diff.gz
+-rw-r--r--   1 root root      1009 Jan 20  2010 ./source/l/hal/patches/handle_input.touchpad_explicitly.diff.gz
+-rw-r--r--   1 root root       909 Nov  8 02:55 ./source/l/hal/patches/ignore_internal_dm_devices.diff.gz
+-rw-r--r--   1 root root       641 Jan  9  2010 ./source/l/hal/patches/increase_HAL_PATH_MAX_to_4096.diff.gz
+-rw-r--r--   1 root root       438 Sep  9  2009 ./source/l/hal/rc.hald.gz
+-rw-r--r--   1 root root       918 Jul 15  2009 ./source/l/hal/slack-desc
+drwxr-xr-x   2 root root      4096 Apr 27  2010 ./source/l/hicolor-icon-theme
+-rw-r--r--   1 root root       542 Mar 18  2008 ./source/l/hicolor-icon-theme/doinst.sh.gz
+-rw-r--r--   1 root root     38008 Jan 13  2010 ./source/l/hicolor-icon-theme/hicolor-icon-theme-0.12.tar.gz
+-rwxr-xr-x   1 root root      2277 Apr 30  2010 ./source/l/hicolor-icon-theme/hicolor-icon-theme.SlackBuild
+-rw-r--r--   1 root root       522 Mar 18  2008 ./source/l/hicolor-icon-theme/setup.08.gtk-update-icon-cache
+-rw-r--r--   1 root root       914 Aug 11  2006 ./source/l/hicolor-icon-theme/slack-desc
+drwxr-xr-x   2 root root      4096 May  4  2010 ./source/l/hunspell
+-rw-r--r--   1 root root    505780 Mar  3  2010 ./source/l/hunspell/hunspell-1.2.9.tar.xz
+-rwxr-xr-x   1 root root      3525 Mar 26  2010 ./source/l/hunspell/hunspell.SlackBuild
+-rw-r--r--   1 root root       964 Mar 21  2010 ./source/l/hunspell/slack-desc
+drwxr-xr-x   2 root root      4096 Mar  5  2009 ./source/l/icon-naming-utils
+-rw-r--r--   1 root root     70352 Feb 21  2009 ./source/l/icon-naming-utils/icon-naming-utils-0.8.90.tar.gz
+-rwxr-xr-x   1 root root      2613 Aug  6  2010 ./source/l/icon-naming-utils/icon-naming-utils.SlackBuild
+-rw-r--r--   1 root root       219 Mar  5  2009 ./source/l/icon-naming-utils/icon-naming-utils.pkgconfigdir.diff.gz
+-rw-r--r--   1 root root       917 Mar  5  2009 ./source/l/icon-naming-utils/slack-desc
+drwxr-xr-x   2 root root      4096 Aug  9  2010 ./source/l/ilmbase
+-rw-r--r--   1 root root    286616 Jul 23  2010 ./source/l/ilmbase/ilmbase-1.0.2.tar.xz
+-rwxr-xr-x   1 root root      3154 Aug  9  2010 ./source/l/ilmbase/ilmbase.SlackBuild
+-rw-r--r--   1 root root       171 Aug  9  2010 ./source/l/ilmbase/ilmbase.gcc4.diff.gz
+-rw-r--r--   1 root root       162 Apr 29  2008 ./source/l/ilmbase/ilmbase.info
+-rw-r--r--   1 root root       829 Aug  1  2008 ./source/l/ilmbase/slack-desc
+drwxr-xr-x   2 root root      4096 Feb 11  2010 ./source/l/imlib
+-rw-r--r--   1 root root    605220 Sep 24  2004 ./source/l/imlib/imlib-1.9.15.tar.xz
+-rwxr-xr-x   1 root root      3193 Jun 24  2010 ./source/l/imlib/imlib.SlackBuild
+-rw-r--r--   1 root root       799 Apr 28  2008 ./source/l/imlib/imlib.mitshm.render.diff.gz
+-rw-r--r--   1 root root       857 Feb 11  2008 ./source/l/imlib/slack-desc
+drwxr-xr-x   2 root root      4096 Mar  7 17:15 ./source/l/iso-codes
+-rw-r--r--   1 root root   6218585 Mar  1 09:42 ./source/l/iso-codes/iso-codes-3.24.2.tar.bz2
+-rw-r--r--   1 root root       543 Mar  1 09:42 ./source/l/iso-codes/iso-codes-3.24.2.tar.bz2.sig
+-rwxr-xr-x   1 root root      2449 Mar  7 17:16 ./source/l/iso-codes/iso-codes.SlackBuild
+-rw-r--r--   1 root root       212 Nov 14  2008 ./source/l/iso-codes/iso-codes.info
+-rw-r--r--   1 root root       471 Nov 14  2008 ./source/l/iso-codes/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/l/jasper
+-rw-r--r--   1 root root    958519 Apr  3  2009 ./source/l/jasper/jasper-1.900.1.tar.bz2
+-rwxr-xr-x   1 root root      3513 Feb 11  2010 ./source/l/jasper/jasper.SlackBuild
+-rw-r--r--   1 root root       839 Sep 16  2007 ./source/l/jasper/slack-desc
+lrwxrwxrwx   1 root root        12 Aug 22  2010 ./source/l/jre -> ../local/jre
+drwxr-xr-x   2 root root      4096 Feb 20  2010 ./source/l/lcms
+-rw-r--r--   1 root root    608880 Oct 30  2009 ./source/l/lcms/lcms-1.19.tar.xz
+-rwxr-xr-x   1 root root      3261 Feb 20  2010 ./source/l/lcms/lcms.SlackBuild
+-rw-r--r--   1 root root       665 Feb 22  2004 ./source/l/lcms/slack-desc
+drwxr-xr-x   2 root root      4096 Apr 19  2010 ./source/l/lesstif
+-rw-r--r--   1 root root       210 Feb  7  2007 ./source/l/lesstif/doinst.sh.gz
+-rw-r--r--   1 root root   1821464 May 27  2009 ./source/l/lesstif/lesstif-0.95.2.tar.xz
+-rw-r--r--   1 root root       507 Oct 21  2008 ./source/l/lesstif/lesstif.Makefile.in.patch.gz
+-rw-r--r--   1 root root       737 Oct 21  2008 ./source/l/lesstif/lesstif.PutPixel32.patch.gz
+-rwxr-xr-x   1 root root      4824 Apr 19  2010 ./source/l/lesstif/lesstif.SlackBuild
+-rw-r--r--   1 root root       267 Mar 23  2009 ./source/l/lesstif/lesstif.rendertable.check.diff.gz
+-rw-r--r--   1 root root       588 Oct 17  2008 ./source/l/lesstif/lesstif.x86_64.patch.gz
+-rw-r--r--   1 root root       984 Mar 23  2002 ./source/l/lesstif/slack-desc
+drwxr-xr-x   2 root root      4096 May 11  2010 ./source/l/libaio
+-rw-r--r--   1 root root     43579 Oct  9  2009 ./source/l/libaio/libaio-0.3.109.tar.bz2
+-rw-r--r--   1 root root       248 Oct  9  2009 ./source/l/libaio/libaio-0.3.109.tar.sign
+-rwxr-xr-x   1 root root      3782 May 11  2010 ./source/l/libaio/libaio.SlackBuild
+-rw-r--r--   1 root root       962 Apr 10  2008 ./source/l/libaio/slack-desc
+drwxr-xr-x   2 root root      4096 Mar  9 20:11 ./source/l/libao
+-rw-r--r--   1 root root    397102 Feb 22 23:00 ./source/l/libao/libao-1.1.0.tar.gz
+-rwxr-xr-x   1 root root      2737 Mar  9 20:12 ./source/l/libao/libao.SlackBuild
+-rw-r--r--   1 root root       884 Dec 19  2003 ./source/l/libao/slack-desc
+drwxr-xr-x   2 root root      4096 Dec  3 19:33 ./source/l/libarchive
+-rw-r--r--   1 root root    999068 Jun 30  2010 ./source/l/libarchive/libarchive-2.8.4.tar.xz
+-rwxr-xr-x   1 root root      3245 Mar  6  2010 ./source/l/libarchive/libarchive.SlackBuild
+-rw-r--r--   1 root root       145 Jul 24  2008 ./source/l/libarchive/libarchive.info
+-rw-r--r--   1 root root       872 Mar  7  2009 ./source/l/libarchive/slack-desc
+drwxr-xr-x   2 root root      4096 Aug  6  2010 ./source/l/libart_lgpl
+-rw-r--r--   1 root root    278396 Apr  1  2010 ./source/l/libart_lgpl/libart_lgpl-2.3.21.tar.xz
+-rwxr-xr-x   1 root root      2898 Aug  6  2010 ./source/l/libart_lgpl/libart_lgpl.SlackBuild
+-rw-r--r--   1 root root       823 May  4  2007 ./source/l/libart_lgpl/slack-desc
+drwxr-xr-x   2 root root      4096 Aug  6  2010 ./source/l/libcaca
+-rw-r--r--   1 root root    750005 Oct 18  2008 ./source/l/libcaca/libcaca-0.99.beta16.tar.bz2
+-rwxr-xr-x   1 root root      3706 Aug  6  2010 ./source/l/libcaca/libcaca.SlackBuild
+-rw-r--r--   1 root root       817 Apr 20  2004 ./source/l/libcaca/slack-desc
+drwxr-xr-x   2 root root      4096 Feb  8 20:26 ./source/l/libcap
+-rw-r--r--   1 root root       553 Oct 30  2008 ./source/l/libcap/README.SLACKWARE
+-rw-r--r--   1 root root     11907 Mar 29  2008 ./source/l/libcap/capfaq-0.2.txt
+-rw-r--r--   1 root root       249 Jan 19 05:10 ./source/l/libcap/libcap-2.20.tar.sign
+-rw-r--r--   1 root root     51404 Jan 19 05:10 ./source/l/libcap/libcap-2.20.tar.xz
+-rwxr-xr-x   1 root root      3761 Feb  8 20:26 ./source/l/libcap/libcap.SlackBuild
+-rw-r--r--   1 root root       247 Feb  8 20:24 ./source/l/libcap/libcap.capability.h.fix.broken.includes.diff.gz
+-rw-r--r--   1 root root       837 Oct 30  2008 ./source/l/libcap/slack-desc
+drwxr-xr-x   2 root root      4096 Aug  6  2010 ./source/l/libcddb
+-rw-r--r--   1 root root    295676 Apr  6  2009 ./source/l/libcddb/libcddb-1.3.2.tar.xz
+-rwxr-xr-x   1 root root      3871 Aug  6  2010 ./source/l/libcddb/libcddb.SlackBuild
+-rw-r--r--   1 root root       786 Mar 10  2008 ./source/l/libcddb/slack-desc
+drwxr-xr-x   2 root root      4096 May 23  2009 ./source/l/libcdio
+-rw-r--r--   1 root root   1308090 Oct 27  2007 ./source/l/libcdio/libcdio-0.79.tar.bz2
+-rwxr-xr-x   1 root root      3300 Mar 11  2010 ./source/l/libcdio/libcdio.SlackBuild
+-rw-r--r--   1 root root      1012 Mar 10  2008 ./source/l/libcdio/slack-desc
+drwxr-xr-x   2 root root      4096 Nov 20 17:53 ./source/l/libdbusmenu-qt
+-rw-r--r--   1 root root     31720 Nov 20 17:53 ./source/l/libdbusmenu-qt/libdbusmenu-qt-0.6.4.tar.xz
+-rwxr-xr-x   1 root root      3286 Nov 20 17:55 ./source/l/libdbusmenu-qt/libdbusmenu-qt.SlackBuild
+-rw-r--r--   1 root root       923 Sep  3  2010 ./source/l/libdbusmenu-qt/slack-desc
+drwxr-xr-x   2 root root      4096 May  4  2010 ./source/l/libdiscid
+-rw-r--r--   1 root root    347907 Aug  6  2008 ./source/l/libdiscid/libdiscid-0.2.2.tar.gz
+-rwxr-xr-x   1 root root      3431 Apr 30  2010 ./source/l/libdiscid/libdiscid.SlackBuild
+-rw-r--r--   1 root root       940 May  4  2010 ./source/l/libdiscid/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/l/libdvdread
+-rw-r--r--   1 root root     96899 Sep  7  2008 ./source/l/libdvdread/libdvdread-4.1.3.tar.bz2
+-rwxr-xr-x   1 root root      3145 Aug  6  2010 ./source/l/libdvdread/libdvdread.SlackBuild
+-rw-r--r--   1 root root       858 Mar  8  2009 ./source/l/libdvdread/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 27 04:23 ./source/l/libelf
+-rw-r--r--   1 root root    112852 Oct 18  2010 ./source/l/libelf/libelf-0.8.13.tar.xz
+-rwxr-xr-x   1 root root      3954 Mar 27 04:24 ./source/l/libelf/libelf.SlackBuild
+-rw-r--r--   1 root root       902 Oct 18  2010 ./source/l/libelf/slack-desc
+drwxr-xr-x   2 root root      4096 Feb  9 07:00 ./source/l/libexif
+-rw-r--r--   1 root root    998720 Dec 16 06:26 ./source/l/libexif/libexif-0.6.20.tar.xz
+-rwxr-xr-x   1 root root      3344 Feb  9 07:00 ./source/l/libexif/libexif.SlackBuild
+-rw-r--r--   1 root root       197 Feb  9 07:02 ./source/l/libexif/libexif.pc.diff.gz
+-rw-r--r--   1 root root       855 Feb 11  2008 ./source/l/libexif/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/l/libglade
+-rw-r--r--   1 root root    356119 Mar 23  2009 ./source/l/libglade/libglade-2.6.4.tar.bz2
+-rwxr-xr-x   1 root root      3575 Apr 25  2010 ./source/l/libglade/libglade.SlackBuild
+-rw-r--r--   1 root root       808 Feb 11  2008 ./source/l/libglade/slack-desc
+drwxr-xr-x   2 root root      4096 Dec 27 08:44 ./source/l/libgphoto2
+-rw-r--r--   1 root root   4570956 Aug 23  2010 ./source/l/libgphoto2/libgphoto2-2.4.10.1.tar.xz
+-rwxr-xr-x   1 root root      5431 Dec 27 08:39 ./source/l/libgphoto2/libgphoto2.SlackBuild
+-rw-r--r--   1 root root       749 Apr 27  2008 ./source/l/libgphoto2/slack-desc
+drwxr-xr-x   2 root root      4096 Jan 16 17:25 ./source/l/libgpod
+-rw-r--r--   1 root root       269 Jan 16 17:25 ./source/l/libgpod/doinst.sh.gz
+-rw-r--r--   1 root root    651224 Oct 12  2010 ./source/l/libgpod/libgpod-0.8.0.tar.xz
+-rwxr-xr-x   1 root root      4318 Jan 16 17:25 ./source/l/libgpod/libgpod.SlackBuild
+-rw-r--r--   1 root root       976 Sep  6  2006 ./source/l/libgpod/slack-desc
+drwxr-xr-x   2 root root      4096 Apr  4 04:23 ./source/l/libgsf
+-rw-r--r--   1 root root    509172 Mar 25 03:17 ./source/l/libgsf/libgsf-1.14.20.tar.xz
+-rwxr-xr-x   1 root root      3974 Apr  4 04:24 ./source/l/libgsf/libgsf.SlackBuild
+-rw-r--r--   1 root root       793 Apr 15  2006 ./source/l/libgsf/slack-desc
+drwxr-xr-x   2 root root      4096 Aug  6  2010 ./source/l/libical
+-rw-r--r--   1 root root       438 Nov  2  2008 ./source/l/libical/README
+-rw-r--r--   1 root root    612212 Sep 27  2009 ./source/l/libical/libical-0.44.tar.xz
+-rwxr-xr-x   1 root root      3538 Aug  6  2010 ./source/l/libical/libical.SlackBuild
+-rw-r--r--   1 root root       272 Nov  2  2008 ./source/l/libical/libical.info
+-rw-r--r--   1 root root       923 Oct 28  2008 ./source/l/libical/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/l/libid3tag
+-rw-r--r--   1 root root       222 Mar 23  2009 ./source/l/libid3tag/id3tag.pc
+-rw-r--r--   1 root root    338143 Feb 17  2004 ./source/l/libid3tag/libid3tag-0.15.1b.tar.gz
+-rw-r--r--   1 root root       189 Feb 18  2004 ./source/l/libid3tag/libid3tag-0.15.1b.tar.gz.sign
+-rwxr-xr-x   1 root root      3890 Feb  8 20:57 ./source/l/libid3tag/libid3tag.SlackBuild
+-rw-r--r--   1 root root       778 Sep 10  2003 ./source/l/libid3tag/slack-desc
+drwxr-xr-x   2 root root      4096 Aug  7  2010 ./source/l/libidl
+-rw-r--r--   1 root root    359144 Mar 30  2010 ./source/l/libidl/libIDL-0.8.14.tar.xz
+-rwxr-xr-x   1 root root      3306 Aug  7  2010 ./source/l/libidl/libidl.SlackBuild
+-rw-r--r--   1 root root       795 Feb 11  2008 ./source/l/libidl/slack-desc
+drwxr-xr-x   2 root root      4096 Aug  7  2010 ./source/l/libidn
+-rw-r--r--   1 root root   2114904 May 22  2010 ./source/l/libidn/libidn-1.19.tar.xz
+-rwxr-xr-x   1 root root      3788 Aug  7  2010 ./source/l/libidn/libidn.SlackBuild
+-rw-r--r--   1 root root       793 Oct 14  2004 ./source/l/libidn/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/l/libieee1284
+-rw-r--r--   1 root root    278804 Sep 18  2007 ./source/l/libieee1284/libieee1284-0.2.11.tar.bz2
+-rwxr-xr-x   1 root root      3896 Aug  7  2010 ./source/l/libieee1284/libieee1284.SlackBuild
+-rw-r--r--   1 root root       842 Feb 11  2008 ./source/l/libieee1284/slack-desc
+drwxr-xr-x   2 root root      4096 May  4  2010 ./source/l/libiodbc
+-rw-r--r--   1 root root    658548 Dec 24  2009 ./source/l/libiodbc/libiodbc-3.52.7.tar.xz
+-rwxr-xr-x   1 root root      3649 May  4  2010 ./source/l/libiodbc/libiodbc.SlackBuild
+-rw-r--r--   1 root root       896 Dec 24  2009 ./source/l/libiodbc/slack-desc
+drwxr-xr-x   2 root root      4096 Apr  5  2010 ./source/l/libjpeg
+-rw-r--r--   1 root root    648772 Feb 28  2010 ./source/l/libjpeg/jpegsrc.v8a.tar.xz
+-rwxr-xr-x   1 root root      3238 Apr  5  2010 ./source/l/libjpeg/libjpeg.SlackBuild
+-rw-r--r--   1 root root      1120 Mar 23  2002 ./source/l/libjpeg/slack-desc
+drwxr-xr-x   2 root root      4096 Jun  7  2009 ./source/l/libkarma
+-rw-r--r--   1 root root     81330 Jun  6  2009 ./source/l/libkarma/libkarma-0.1.1.tar.gz
+-rwxr-xr-x   1 root root      3928 Dec  4 19:32 ./source/l/libkarma/libkarma.SlackBuild
+-rw-r--r--   1 root root       816 Feb 15  2007 ./source/l/libkarma/slack-desc
+drwxr-xr-x   2 root root      4096 Jan 15 19:18 ./source/l/liblastfm
+-rw-r--r--   1 root root     92156 Jan 15 19:18 ./source/l/liblastfm/liblastfm-0.3.3_f0b3239.tar.xz
+-rwxr-xr-x   1 root root      2848 Jan 15 19:19 ./source/l/liblastfm/liblastfm.SlackBuild
+-rw-r--r--   1 root root       663 Oct  7  2009 ./source/l/liblastfm/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/l/libmad
+-rw-r--r--   1 root root    502379 Feb 17  2004 ./source/l/libmad/libmad-0.15.1b.tar.gz
+-rw-r--r--   1 root root       189 Feb 18  2004 ./source/l/libmad/libmad-0.15.1b.tar.gz.sign
+-rwxr-xr-x   1 root root      3805 Aug  8  2010 ./source/l/libmad/libmad.SlackBuild
+-rw-r--r--   1 root root       207 Feb 19  2008 ./source/l/libmad/mad.pc
+-rw-r--r--   1 root root      1055 Sep 10  2003 ./source/l/libmad/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/l/libmcrypt
+-rw-r--r--   1 root root    875425 Feb 19  2007 ./source/l/libmcrypt/libmcrypt-2.5.8.tar.bz2
+-rwxr-xr-x   1 root root      3986 Aug  8  2010 ./source/l/libmcrypt/libmcrypt.SlackBuild
+-rw-r--r--   1 root root       634 Apr  4  2009 ./source/l/libmcrypt/slack-desc
+drwxr-xr-x   2 root root      4096 Aug  9  2010 ./source/l/libmcs
+-rw-r--r--   1 root root     96126 Jul 14  2010 ./source/l/libmcs/libmcs-0.7.2.tar.bz2
+-rwxr-xr-x   1 root root      3696 Aug  9  2010 ./source/l/libmcs/libmcs.SlackBuild
+-rw-r--r--   1 root root       966 Feb 27  2008 ./source/l/libmcs/slack-desc
+drwxr-xr-x   2 root root      4096 Feb 14  2010 ./source/l/libmng
+-rw-r--r--   1 root root    737812 Jul 13  2007 ./source/l/libmng/libmng-1.0.10.tar.xz
+-rwxr-xr-x   1 root root      3759 Feb 14  2010 ./source/l/libmng/libmng.SlackBuild
+-rw-r--r--   1 root root       941 Aug  4  2003 ./source/l/libmng/slack-desc
+drwxr-xr-x   2 root root      4096 Aug  9  2010 ./source/l/libmowgli
+-rw-r--r--   1 root root    104972 Jul 14  2010 ./source/l/libmowgli/libmowgli-0.7.1.tar.bz2
+-rwxr-xr-x   1 root root      3854 Aug  9  2010 ./source/l/libmowgli/libmowgli.SlackBuild
+-rw-r--r--   1 root root       859 Jan 30  2008 ./source/l/libmowgli/slack-desc
+drwxr-xr-x   2 root root      4096 Aug  4  2010 ./source/l/libmpc
+-rwxr-xr-x   1 root root      3489 Feb  8 17:36 ./source/l/libmpc/libmpc.SlackBuild
+-rw-r--r--   1 root root    376072 May 14  2010 ./source/l/libmpc/mpc-0.8.2.tar.xz
+-rw-r--r--   1 root root       833 Aug  4  2010 ./source/l/libmpc/slack-desc
+drwxr-xr-x   2 root root      4096 May  4  2010 ./source/l/libmsn
+-rw-r--r--   1 root root    289614 Mar 24  2010 ./source/l/libmsn/libmsn-4.1.tar.bz2
+-rwxr-xr-x   1 root root      2927 Mar 24  2010 ./source/l/libmsn/libmsn.SlackBuild
+-rw-r--r--   1 root root       771 May  4  2010 ./source/l/libmsn/slack-desc
+drwxr-xr-x   2 root root      4096 May  3  2010 ./source/l/libmtp
+-rw-r--r--   1 root root    408544 Sep 12  2009 ./source/l/libmtp/libmtp-1.0.1.tar.xz
+-rwxr-xr-x   1 root root      4318 May  3  2010 ./source/l/libmtp/libmtp.SlackBuild
+-rw-r--r--   1 root root      1059 May  3  2010 ./source/l/libmtp/slack-desc
+drwxr-xr-x   2 root root      4096 May 23  2009 ./source/l/libnjb
+-rw-r--r--   1 root root      1674 Oct 26  2007 ./source/l/libnjb/80-libnjb.rules
+-rw-r--r--   1 root root    404914 Sep  5  2007 ./source/l/libnjb/libnjb-2.2.6.tar.bz2
+-rwxr-xr-x   1 root root      4300 Aug  9  2010 ./source/l/libnjb/libnjb.SlackBuild
+-rw-r--r--   1 root root       997 Sep  7  2006 ./source/l/libnjb/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/l/libnl
+-rw-r--r--   1 root root    217408 Jun  8  2008 ./source/l/libnl/libnl-1.1.tar.bz2
+-rw-r--r--   1 root root       237 Feb 23  2009 ./source/l/libnl/libnl-include_limits.h.patch.gz
+-rwxr-xr-x   1 root root      3202 Aug  9  2010 ./source/l/libnl/libnl.SlackBuild
+-rw-r--r--   1 root root       112 Feb 23  2009 ./source/l/libnl/libnl.info
+-rw-r--r--   1 root root       786 Jun  8  2008 ./source/l/libnl/slack-desc
+drwxr-xr-x   2 root root      4096 Nov 17 22:24 ./source/l/libnotify
+-rw-r--r--   1 root root    310439 Oct 15  2010 ./source/l/libnotify/libnotify-0.5.2.tar.bz2
+-rwxr-xr-x   1 root root      2738 Nov 17 22:30 ./source/l/libnotify/libnotify.SlackBuild
+-rw-r--r--   1 root root       707 May 31  2009 ./source/l/libnotify/slack-desc
+drwxr-xr-x   2 root root      4096 Mar  9 20:13 ./source/l/libogg
+-rw-r--r--   1 root root    281444 Dec  7 10:46 ./source/l/libogg/libogg-1.2.2.tar.xz
+-rwxr-xr-x   1 root root      2841 Feb  6  2010 ./source/l/libogg/libogg.SlackBuild
+-rw-r--r--   1 root root       762 Dec 19  2003 ./source/l/libogg/slack-desc
+drwxr-xr-x   2 root root      4096 Mar  9 20:19 ./source/l/liboggz
+-rw-r--r--   1 root root    420788 Apr 29  2010 ./source/l/liboggz/liboggz-1.1.1.tar.xz
+-rwxr-xr-x   1 root root      3352 Mar  9 20:23 ./source/l/liboggz/liboggz.SlackBuild
+-rw-r--r--   1 root root      1038 Mar  9 20:18 ./source/l/liboggz/slack-desc
+drwxr-xr-x   2 root root      4096 Aug  9  2010 ./source/l/liboil
+-rw-r--r--   1 root root    499068 Feb  4  2010 ./source/l/liboil/liboil-0.3.17.tar.xz
+-rwxr-xr-x   1 root root      3252 Aug  9  2010 ./source/l/liboil/liboil.SlackBuild
+-rw-r--r--   1 root root      1033 Aug  1  2008 ./source/l/liboil/slack-desc
+drwxr-xr-x   2 root root      4096 Aug  5  2010 ./source/l/libpcap
+-rw-r--r--   1 root root    581984 Apr  6  2010 ./source/l/libpcap/libpcap-1.1.1.tar.gz
+-rw-r--r--   1 root root        72 Apr  6  2010 ./source/l/libpcap/libpcap-1.1.1.tar.gz.sig
+-rwxr-xr-x   1 root root      4131 Aug  5  2010 ./source/l/libpcap/libpcap.SlackBuild
+-rw-r--r--   1 root root       908 Aug  5  2010 ./source/l/libpcap/slack-desc
+drwxr-xr-x   2 root root      4096 Jan 15 19:30 ./source/l/libplist
+-rw-r--r--   1 root root     67642 Apr 18  2010 ./source/l/libplist/libplist-1.3.tar.bz2
+-rwxr-xr-x   1 root root      3592 Jan 15 19:55 ./source/l/libplist/libplist.SlackBuild
+-rw-r--r--   1 root root       796 Jan 15 19:44 ./source/l/libplist/slack-desc
+drwxr-xr-x   2 root root      4096 Jan 30 17:52 ./source/l/libpng
+-rw-r--r--   1 root root    540480 Jun 26  2010 ./source/l/libpng/libpng-1.2.44.tar.xz
+-rw-r--r--   1 root root    545672 Dec  9 13:48 ./source/l/libpng/libpng-1.4.5.tar.xz
+-rwxr-xr-x   1 root root      4389 Jan 30 17:52 ./source/l/libpng/libpng.SlackBuild
+-rw-r--r--   1 root root       949 Mar 23  2002 ./source/l/libpng/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 17 18:38 ./source/l/libraw1394
+-rw-r--r--   1 root root       191 Dec  9  2007 ./source/l/libraw1394/README
+-rw-r--r--   1 root root       249 Mar  8 19:21 ./source/l/libraw1394/libraw1394-2.0.7.tar.sign
+-rw-r--r--   1 root root    268568 Mar  8 19:21 ./source/l/libraw1394/libraw1394-2.0.7.tar.xz
+-rwxr-xr-x   1 root root      3633 May 11  2010 ./source/l/libraw1394/libraw1394.SlackBuild
+-rw-r--r--   1 root root       807 May 11  2010 ./source/l/libraw1394/slack-desc
+drwxr-xr-x   2 root root      4096 Oct 13  2010 ./source/l/librsvg
+-rw-r--r--   1 root root    516660 Sep 27  2010 ./source/l/librsvg/librsvg-2.32.0.tar.bz2
+-rwxr-xr-x   1 root root      3486 Nov  6 03:55 ./source/l/librsvg/librsvg.SlackBuild
+-rw-r--r--   1 root root       632 Feb 11  2008 ./source/l/librsvg/slack-desc
+drwxr-xr-x   2 root root      4096 Dec 17  2009 ./source/l/libsamplerate
+-rw-r--r--   1 root root   3268548 Feb 14  2009 ./source/l/libsamplerate/libsamplerate-0.1.7.tar.xz
+-rwxr-xr-x   1 root root      1741 Jan 26 05:13 ./source/l/libsamplerate/libsamplerate.SlackBuild
+-rw-r--r--   1 root root      1117 Dec 17  2009 ./source/l/libsamplerate/slack-desc
+drwxr-xr-x   2 root root      4096 Apr 17 16:56 ./source/l/libsndfile
+-rw-r--r--   1 root root    609332 Mar 23 09:39 ./source/l/libsndfile/libsndfile-1.0.24.tar.xz
+-rwxr-xr-x   1 root root      3189 Jan 26 17:59 ./source/l/libsndfile/libsndfile.SlackBuild
+-rw-r--r--   1 root root       828 Jan 23 00:47 ./source/l/libsndfile/slack-desc
+drwxr-xr-x   2 root root      4096 May  4  2010 ./source/l/libspectre
+-rw-r--r--   1 root root    262053 Apr 21  2010 ./source/l/libspectre/libspectre-0.2.5.tar.bz2
+-rwxr-xr-x   1 root root      3318 Dec  5 18:23 ./source/l/libspectre/libspectre.SlackBuild
+-rw-r--r--   1 root root       870 Oct  9  2008 ./source/l/libspectre/slack-desc
+drwxr-xr-x   2 root root      4096 May 23  2009 ./source/l/libtermcap
+-rwxr-xr-x   1 root root      2858 Aug  9  2010 ./source/l/libtermcap/libtermcap.SlackBuild
+-rw-r--r--   1 root root       938 Feb 11  2008 ./source/l/libtermcap/slack-desc
+-rw-r--r--   1 root root       213 Feb 15  2002 ./source/l/libtermcap/termcap-compat_1.2.3.diff.gz
+-rw-r--r--   1 root root       655 Feb  4  2000 ./source/l/libtermcap/termcap-compat_1.2.3.dsc
+-rw-r--r--   1 root root    552156 Feb  4  2000 ./source/l/libtermcap/termcap-compat_1.2.3.tar.gz
+-rw-r--r--   1 root root       233 Jan  3  2003 ./source/l/libtermcap/termcap.bufsize.diff.gz
+-rw-r--r--   1 root root       365 May 10  2000 ./source/l/libtermcap/termcap.h.diff.gz
+drwxr-xr-x   2 root root      4096 Feb 17  2010 ./source/l/libtheora
+-rw-r--r--   1 root root   1434496 Jan 25  2010 ./source/l/libtheora/libtheora-1.1.1.tar.xz
+-rwxr-xr-x   1 root root      3783 Feb 17  2010 ./source/l/libtheora/libtheora.SlackBuild
+-rw-r--r--   1 root root      1085 Sep 16  2006 ./source/l/libtheora/slack-desc
+drwxr-xr-x   2 root root      4096 Apr  7 21:16 ./source/l/libtiff
+-rw-r--r--   1 root root       722 Mar 21 20:17 ./source/l/libtiff/libtiff-CVE-2011-0192.patch.gz
+-rw-r--r--   1 root root       755 Mar 21 20:17 ./source/l/libtiff/libtiff-CVE-2011-1167.patch.gz
+-rwxr-xr-x   1 root root      3874 Apr  7 21:17 ./source/l/libtiff/libtiff.SlackBuild
+-rw-r--r--   1 root root       852 Oct 28  2004 ./source/l/libtiff/slack-desc
+-rw-r--r--   1 root root    932280 Jun 15  2010 ./source/l/libtiff/tiff-3.9.4.tar.xz
+drwxr-xr-x   2 root root      4096 Mar 24 23:41 ./source/l/libusb
+-rw-r--r--   1 root root    331820 May  4  2010 ./source/l/libusb/libusb-1.0.8.tar.bz2
+-rw-r--r--   1 root root    251218 Dec  1  2009 ./source/l/libusb/libusb-compat-0.1.3.tar.bz2
+-rwxr-xr-x   1 root root      4892 Mar 24 23:41 ./source/l/libusb/libusb.SlackBuild
+-rw-r--r--   1 root root       322 Mar 24 23:41 ./source/l/libusb/libusb.fix.debug.log.level.diff.gz
+-rw-r--r--   1 root root       844 Dec  1  2009 ./source/l/libusb/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/l/libvisual
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/l/libvisual-plugins
+-rw-r--r--   1 root root    575514 Mar 20  2006 ./source/l/libvisual-plugins/libvisual-plugins-0.4.0.tar.bz2
+-rwxr-xr-x   1 root root      3460 Aug  9  2010 ./source/l/libvisual-plugins/libvisual-plugins.SlackBuild
+-rw-r--r--   1 root root       912 Sep 12  2008 ./source/l/libvisual-plugins/libvisual-plugins.gstreamer.diff.gz
+-rw-r--r--   1 root root      1190 Sep 12  2008 ./source/l/libvisual-plugins/slack-desc
+-rw-r--r--   1 root root    430496 Mar 20  2006 ./source/l/libvisual/libvisual-0.4.0.tar.bz2
+-rwxr-xr-x   1 root root      3512 Aug  9  2010 ./source/l/libvisual/libvisual.SlackBuild
+-rw-r--r--   1 root root      1004 Aug 23  2006 ./source/l/libvisual/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/l/libvncserver
+-rw-r--r--   1 root root    797659 Jan 31  2009 ./source/l/libvncserver/LibVNCServer-0.9.7.tar.bz2
+-rwxr-xr-x   1 root root      3473 Feb 15  2010 ./source/l/libvncserver/libvncserver.SlackBuild
+-rw-r--r--   1 root root       211 Jan  8  2008 ./source/l/libvncserver/libvncserver.info
+-rw-r--r--   1 root root       830 Aug  1  2008 ./source/l/libvncserver/slack-desc
+drwxr-xr-x   2 root root      4096 Nov 16 17:54 ./source/l/libvorbis
+-rw-r--r--   1 root root    994276 Nov  1 20:42 ./source/l/libvorbis/libvorbis-1.3.2.tar.xz
+-rwxr-xr-x   1 root root      2889 Jul 28  2010 ./source/l/libvorbis/libvorbis.SlackBuild
+-rw-r--r--   1 root root      1020 Dec 18  2003 ./source/l/libvorbis/slack-desc
+drwxr-xr-x   2 root root      4096 Feb 15  2010 ./source/l/libwmf
+-rw-r--r--   1 root root   1271924 Jun 14  2006 ./source/l/libwmf/libwmf-0.2.8.4.tar.xz
+-rwxr-xr-x   1 root root      3438 Feb 15  2010 ./source/l/libwmf/libwmf.SlackBuild
+-rw-r--r--   1 root root       340 Feb 15  2010 ./source/l/libwmf/libwmf.png14.diff.gz
+-rw-r--r--   1 root root       745 Dec 15  2003 ./source/l/libwmf/slack-desc
+-rw-r--r--   1 root root       767 Dec 15  2003 ./source/l/libwmf/slack-desc-docs
+drwxr-xr-x   2 root root      4096 Feb 24 22:24 ./source/l/libwnck
+-rw-r--r--   1 root root    625724 Nov 17 12:17 ./source/l/libwnck/libwnck-2.30.6.tar.xz
+-rwxr-xr-x   1 root root      3602 Feb 24 22:25 ./source/l/libwnck/libwnck.SlackBuild
+-rw-r--r--   1 root root       933 Sep 15  2007 ./source/l/libwnck/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/l/libwpd
+-rw-r--r--   1 root root    424176 Feb 12  2008 ./source/l/libwpd/libwpd-0.8.14.tar.bz2
+-rwxr-xr-x   1 root root      2933 Aug  9  2010 ./source/l/libwpd/libwpd.SlackBuild
+-rw-r--r--   1 root root       773 Apr 15  2006 ./source/l/libwpd/slack-desc
+drwxr-xr-x   2 root root      4096 Feb 16 01:32 ./source/l/libxklavier
+-rw-r--r--   1 root root    289268 Feb 13 13:53 ./source/l/libxklavier/libxklavier-5.1.tar.xz
+-rwxr-xr-x   1 root root      3482 Feb 16 01:33 ./source/l/libxklavier/libxklavier.SlackBuild
+-rw-r--r--   1 root root       748 Aug  1  2008 ./source/l/libxklavier/slack-desc
+drwxr-xr-x   2 root root      4096 Dec  7 18:34 ./source/l/libxml2
+-rw-r--r--   1 root root       452 Dec  7 18:34 ./source/l/libxml2/libxml2-2.7.8.broken.versioning.diff.gz
+-rw-r--r--   1 root root   2729708 Nov  4 17:30 ./source/l/libxml2/libxml2-2.7.8.tar.xz
+-rwxr-xr-x   1 root root      3639 Jan  8 01:51 ./source/l/libxml2/libxml2.SlackBuild
+-rw-r--r--   1 root root       980 Jan  8  2008 ./source/l/libxml2/slack-desc
+drwxr-xr-x   2 root root      4096 Dec  5  2009 ./source/l/libxslt
+-rw-r--r--   1 root root   1666032 Sep 24  2009 ./source/l/libxslt/libxslt-1.1.26.tar.xz
+-rwxr-xr-x   1 root root      3078 Dec  5  2009 ./source/l/libxslt/libxslt.SlackBuild
+-rw-r--r--   1 root root       678 Mar 26  2005 ./source/l/libxslt/slack-desc
+drwxr-xr-x   2 root root      4096 Aug  9  2010 ./source/l/libzip
+-rw-r--r--   1 root root    304965 Feb  1  2010 ./source/l/libzip/libzip-0.9.3.tar.bz2
+-rwxr-xr-x   1 root root      3877 Aug  9  2010 ./source/l/libzip/libzip.SlackBuild
+-rw-r--r--   1 root root       163 Jan  8  2008 ./source/l/libzip/libzip.info
+-rw-r--r--   1 root root       882 Aug  1  2008 ./source/l/libzip/slack-desc
+drwxr-xr-x   2 root root      4096 Apr 10  2010 ./source/l/loudmouth
+-rw-r--r--   1 root root    301420 Oct 29  2008 ./source/l/loudmouth/loudmouth-1.4.3.tar.xz
+-rwxr-xr-x   1 root root      4357 Apr 10  2010 ./source/l/loudmouth/loudmouth.SlackBuild
+-rw-r--r--   1 root root       403 Nov 29  2008 ./source/l/loudmouth/loudmouth.async_assertion.diff.gz
+-rw-r--r--   1 root root       272 Nov  3  2009 ./source/l/loudmouth/loudmouth.crtpath.diff.gz
+-rw-r--r--   1 root root       399 Apr 10  2010 ./source/l/loudmouth/loudmouth.gnutls.configure.ac.diff.gz
+-rw-r--r--   1 root root       429 Jun 13  2009 ./source/l/loudmouth/loudmouth.sasl-md5-digest-uri.diff.gz
+-rw-r--r--   1 root root       777 Nov 16  2009 ./source/l/loudmouth/loudmouth.stanzadrop.diff.gz
+-rw-r--r--   1 root root       900 Apr 10  2010 ./source/l/loudmouth/slack-desc
+drwxr-xr-x   2 root root      4096 Aug  9  2010 ./source/l/lzo
+-rw-r--r--   1 root root       280 Dec 11  2006 ./source/l/lzo/.lzo.info
+-rw-r--r--   1 root root    349732 Apr 30  2008 ./source/l/lzo/lzo-2.03.tar.xz
+-rwxr-xr-x   1 root root      3397 Aug  9  2010 ./source/l/lzo/lzo.SlackBuild
+-rw-r--r--   1 root root       728 Jun 10  2007 ./source/l/lzo/slack-desc
+drwxr-xr-x   2 root root      4096 Feb 16 01:25 ./source/l/mhash
+-rw-r--r--   1 root root    655906 Dec  8  2008 ./source/l/mhash/mhash-0.9.9.9.tar.bz2
+-rwxr-xr-x   1 root root      3637 Feb 16 21:29 ./source/l/mhash/mhash.SlackBuild
+-rw-r--r--   1 root root       924 May 30  2004 ./source/l/mhash/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/l/mm
+-rw-r--r--   1 root root    248658 Aug 15  2006 ./source/l/mm/mm-1.4.2.tar.bz2
+-rwxr-xr-x   1 root root      4190 Aug  9  2010 ./source/l/mm/mm.SlackBuild
+-rw-r--r--   1 root root      1003 Aug 10  2006 ./source/l/mm/slack-desc
+drwxr-xr-x   3 root root      4096 Apr  5 02:51 ./source/l/mpfr
+-rw-r--r--   1 root root   1016096 Apr  4 13:03 ./source/l/mpfr/mpfr-3.0.1.tar.xz
+-rwxr-xr-x   1 root root      3660 Apr  5 02:55 ./source/l/mpfr/mpfr.SlackBuild
+drwxr-xr-x   2 root root      4096 Apr  5 02:53 ./source/l/mpfr/patches
+-rw-r--r--   1 root root      1042 May  8  2006 ./source/l/mpfr/slack-desc
+drwxr-xr-x   3 root root      4096 Apr  5 02:41 ./source/l/ncurses
+-rw-r--r--   1 root root      5711 Oct  8  2002 ./source/l/ncurses/Eterm.ti
+-rw-r--r--   1 root root   1656420 Apr  4 23:18 ./source/l/ncurses/ncurses-5.9.tar.xz
+-rwxr-xr-x   1 root root      5846 Apr  5 02:45 ./source/l/ncurses/ncurses.SlackBuild
+-rw-r--r--   1 root root       273 Dec 27  2006 ./source/l/ncurses/ncurses.mkhashsize.diff.gz
+drwxr-xr-x   2 root root      4096 Apr  5 02:42 ./source/l/ncurses/patches
+-rw-r--r--   1 root root      2649 Mar 15  2001 ./source/l/ncurses/rxvt.terminfo
+-rw-r--r--   1 root root      3709 Jul 21  2003 ./source/l/ncurses/screeninfo.src
+-rw-r--r--   1 root root       904 Feb 11  2008 ./source/l/ncurses/slack-desc
+-rw-r--r--   1 root root     42014 Nov 11  2007 ./source/l/ncurses/xterm.terminfo
+drwxr-xr-x   2 root root      4096 Mar  1 20:19 ./source/l/neon
+-rw-r--r--   1 root root    884484 Oct 14  2010 ./source/l/neon/neon-0.29.5.tar.gz
+-rwxr-xr-x   1 root root      4015 Mar  1 20:20 ./source/l/neon/neon.SlackBuild
+-rw-r--r--   1 root root       798 Sep 18  2006 ./source/l/neon/slack-desc
+drwxr-xr-x   2 root root      4096 Feb 15  2010 ./source/l/netpbm
+-rw-r--r--   1 root root      9563 Feb 15  2010 ./source/l/netpbm/config.mk.gz
+-rw-r--r--   1 root root   1917188 Feb 15  2010 ./source/l/netpbm/netpbm-10.49.02.tar.xz
+-rw-r--r--   1 root root    322974 Apr 11  2004 ./source/l/netpbm/netpbm-manpages.tar.bz2
+-rwxr-xr-x   1 root root      4039 Feb 15  2010 ./source/l/netpbm/netpbm.SlackBuild
+-rw-r--r--   1 root root       688 Apr 11  2004 ./source/l/netpbm/slack-desc
+-rwxr-xr-x   1 root root        77 Feb 16  2007 ./source/l/netpbm/svn-checkout-stable.sh
+drwxr-xr-x   2 root root      4096 Sep 16  2009 ./source/l/notify-python
+-rw-r--r--   1 root root    214514 Oct  8  2006 ./source/l/notify-python/notify-python-0.1.1.tar.bz2
+-rwxr-xr-x   1 root root      3024 Feb 20  2010 ./source/l/notify-python/notify-python.SlackBuild
+-rw-r--r--   1 root root       819 Feb 20  2010 ./source/l/notify-python/slack-desc
+drwxr-xr-x   2 root root      4096 Aug  9  2010 ./source/l/openexr
+-rw-r--r--   1 root root  12080576 Jul 23  2010 ./source/l/openexr/openexr-1.7.0.tar.xz
+-rwxr-xr-x   1 root root      3557 Aug  9  2010 ./source/l/openexr/openexr.SlackBuild
+-rw-r--r--   1 root root       367 Aug  9  2010 ./source/l/openexr/openexr.gcc4.diff.gz
+-rw-r--r--   1 root root       162 Apr 29  2008 ./source/l/openexr/openexr.info
+-rw-r--r--   1 root root       915 Aug  1  2008 ./source/l/openexr/slack-desc
+drwxr-xr-x   2 root root      4096 Apr  7 00:56 ./source/l/pango
+-rw-r--r--   1 root root   1142608 Apr  4 22:32 ./source/l/pango/pango-1.28.4.tar.xz
+-rwxr-xr-x   1 root root      4966 Apr  7 00:56 ./source/l/pango/pango.SlackBuild
+-rw-r--r--   1 root root       502 Oct 13  2010 ./source/l/pango/pango.etc.host.location.diff.gz
+-rw-r--r--   1 root root       885 Feb 11  2008 ./source/l/pango/slack-desc
+-rw-r--r--   1 root root      2324 Aug 11  2009 ./source/l/pango/update-pango-querymodules
+drwxr-xr-x   2 root root      4096 Jul 12  2010 ./source/l/parted
+-rw-r--r--   1 root root   1454340 May 28  2010 ./source/l/parted/parted-2.3.tar.xz
+-rwxr-xr-x   1 root root      4158 Feb  7  2010 ./source/l/parted/parted.SlackBuild
+-rwxr-xr-x   1 root root      4158 Feb  7  2010 ./source/l/parted/parted.SlackBuild.static
+-rw-r--r--   1 root root       341 Jul 12  2010 ./source/l/parted/parted.configure.diff.gz
+-rw-r--r--   1 root root       840 Jun  5  2002 ./source/l/parted/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 26 05:22 ./source/l/pcre
+-rw-r--r--   1 root root    759088 Jan 15 17:31 ./source/l/pcre/pcre-8.12.tar.xz
+-rwxr-xr-x   1 root root      4084 Mar 26 05:22 ./source/l/pcre/pcre.SlackBuild
+-rw-r--r--   1 root root       819 Mar 30  2002 ./source/l/pcre/slack-desc
+drwxr-xr-x   2 root root      4096 Nov 27 18:00 ./source/l/phonon
+drwxr-xr-x   2 root root      4096 Dec 17 21:10 ./source/l/phonon-mplayer
+-rw-r--r--   1 root root     12619 Dec 17 21:00 ./source/l/phonon-mplayer/cmake_fixes.tar.gz
+-rw-r--r--   1 root root    341740 Dec 17 21:00 ./source/l/phonon-mplayer/phonon-mplayer-20101213.tar.xz
+-rwxr-xr--   1 root root      3480 Dec 18 02:34 ./source/l/phonon-mplayer/phonon-mplayer.SlackBuild
+-rw-r--r--   1 root root       837 Dec 18 02:32 ./source/l/phonon-mplayer/slack-desc
+-rw-r--r--   1 root root    648733 Nov 24 18:47 ./source/l/phonon/phonon-4.4.3.tar.bz2
+-rwxr-xr-x   1 root root      3540 Nov 27 18:01 ./source/l/phonon/phonon.SlackBuild
+-rw-r--r--   1 root root       759 Nov  7  2009 ./source/l/phonon/slack-desc
+drwxr-xr-x   2 root root      4096 Feb 14  2010 ./source/l/pil
+-rw-r--r--   1 root root    400368 Nov 15  2009 ./source/l/pil/Imaging-1.1.7.tar.xz
+-rwxr-xr-x   1 root root      3218 Feb 14  2010 ./source/l/pil/pil.SlackBuild
+-rw-r--r--   1 root root       873 Apr 30  2009 ./source/l/pil/slack-desc
+drwxr-xr-x   2 root root      4096 May  2  2010 ./source/l/pilot-link
+-rw-r--r--   1 root root   1578735 Feb  7  2010 ./source/l/pilot-link/pilot-link-0.12.5.tar.bz2
+-rw-r--r--   1 root root       198 Feb  7  2010 ./source/l/pilot-link/pilot-link-0.12.5.tar.bz2.asc
+-rwxr-xr-x   1 root root      4256 Jan 26 19:25 ./source/l/pilot-link/pilot-link.SlackBuild
+-rw-r--r--   1 root root       645 Feb 19  2010 ./source/l/pilot-link/pilot-link.png14.diff.gz
+-rw-r--r--   1 root root       877 Feb 11  2008 ./source/l/pilot-link/slack-desc
+drwxr-xr-x   3 root root      4096 Apr 19 20:06 ./source/l/polkit
+drwxr-xr-x   2 root root      4096 Mar  4 00:03 ./source/l/polkit-gnome
+-rw-r--r--   1 root root    336824 Mar  3 18:52 ./source/l/polkit-gnome/polkit-gnome-0.101.tar.xz
+-rw-r--r--   1 root root      4581 Feb 25 05:43 ./source/l/polkit-gnome/polkit-gnome-authentication-agent-1.desktop
+-rwxr-xr-x   1 root root      3309 Feb 27 19:26 ./source/l/polkit-gnome/polkit-gnome.SlackBuild
+-rw-r--r--   1 root root       829 May  6  2010 ./source/l/polkit-gnome/slack-desc
+drwxr-xr-x   2 root root      4096 Apr 19 20:06 ./source/l/polkit/CVE-2011-1485
+-rw-r--r--   1 root root      3907 Apr 19 20:06 ./source/l/polkit/CVE-2011-1485/0001-PolkitUnixProcess-Clarify-that-the-real-uid-is-retur.patch
+-rw-r--r--   1 root root     21673 Apr 19 20:06 ./source/l/polkit/CVE-2011-1485/0002-Make-PolkitUnixProcess-also-record-the-uid-of-the-pr.patch
+-rw-r--r--   1 root root      1529 Apr 19 20:06 ./source/l/polkit/CVE-2011-1485/0003-Use-polkit_unix_process_get_uid-to-get-the-owner-of-.patch
+-rw-r--r--   1 root root      4683 Apr 19 20:06 ./source/l/polkit/CVE-2011-1485/0004-pkexec-Avoid-TOCTTOU-problems-with-parent-process.patch
+-rw-r--r--   1 root root    582932 Mar  3 18:52 ./source/l/polkit/polkit-0.101.tar.xz
+-rwxr-xr-x   1 root root      4750 Apr 20 03:06 ./source/l/polkit/polkit.SlackBuild
+-rw-r--r--   1 root root       906 Jan  6  2010 ./source/l/polkit/slack-desc
+drwxr-xr-x   2 root root      4096 Apr  6 05:25 ./source/l/poppler
+drwxr-xr-x   2 root root      4096 Nov 11 20:57 ./source/l/poppler-data
+-rw-r--r--   1 root root   1471440 Oct 28 22:23 ./source/l/poppler-data/poppler-data-0.4.4.tar.xz
+-rwxr-xr-x   1 root root      2043 Sep  8  2010 ./source/l/poppler-data/poppler-data.SlackBuild
+-rw-r--r--   1 root root      1064 Apr 12  2007 ./source/l/poppler-data/slack-desc
+-rw-r--r--   1 root root   1268144 Mar 28 21:38 ./source/l/poppler/poppler-0.16.4.tar.xz
+-rwxr-xr-x   1 root root      3793 Sep  8  2010 ./source/l/poppler/poppler.SlackBuild
+-rw-r--r--   1 root root       952 Apr 10  2007 ./source/l/poppler/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/l/popt
+-rw-r--r--   1 root root    489869 Sep 17  2002 ./source/l/popt/popt-1.7.tar.bz2
+-rwxr-xr-x   1 root root      3755 Apr 26  2010 ./source/l/popt/popt.SlackBuild
+-rw-r--r--   1 root root      1047 Feb 22  2003 ./source/l/popt/slack-desc
+drwxr-xr-x   2 root root      4096 Jul 29  2010 ./source/l/pycairo
+-rw-r--r--   1 root root    447388 May 20  2010 ./source/l/pycairo/py2cairo-1.8.10.tar.xz
+-rwxr-xr-x   1 root root      3484 Jul 29  2010 ./source/l/pycairo/pycairo.SlackBuild
+-rw-r--r--   1 root root        68 Dec 14  2009 ./source/l/pycairo/pycairo.url
+-rw-r--r--   1 root root       745 Jul 29  2010 ./source/l/pycairo/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 22 06:21 ./source/l/pycups
+-rw-r--r--   1 root root     49899 Mar 22 06:21 ./source/l/pycups/pycups-1.9.55.tar.bz2
+-rwxr-xr-x   1 root root      2849 Feb 17  2010 ./source/l/pycups/pycups.SlackBuild
+-rw-r--r--   1 root root       121 Jul 25  2008 ./source/l/pycups/pycups.info
+-rw-r--r--   1 root root       688 Aug  1  2008 ./source/l/pycups/slack-desc
+drwxr-xr-x   2 root root      4096 Nov 14 22:55 ./source/l/pygobject
+-rw-r--r--   1 root root    808427 Sep 27  2010 ./source/l/pygobject/pygobject-2.26.0.tar.bz2
+-rwxr-xr-x   1 root root      3589 Nov 14 22:56 ./source/l/pygobject/pygobject.SlackBuild
+-rw-r--r--   1 root root       472 Nov 14 22:54 ./source/l/pygobject/pygobject.fix.no.introspection.crash.diff.gz
+-rw-r--r--   1 root root        72 Dec 14  2009 ./source/l/pygobject/pygobject.url
+-rw-r--r--   1 root root       858 Feb 11  2008 ./source/l/pygobject/slack-desc
+drwxr-xr-x   2 root root      4096 Oct 13  2010 ./source/l/pygtk
+-rw-r--r--   1 root root   2285379 Sep 26  2010 ./source/l/pygtk/pygtk-2.22.0.tar.bz2
+-rwxr-xr-x   1 root root      3484 Feb  7  2010 ./source/l/pygtk/pygtk.SlackBuild
+-rw-r--r--   1 root root       777 Jan  9  2008 ./source/l/pygtk/slack-desc
+drwxr-xr-x   2 root root      4096 Aug  9  2010 ./source/l/pyrex
+-rw-r--r--   1 root root    197340 Apr 12  2010 ./source/l/pyrex/Pyrex-0.9.9.tar.xz
+-rw-r--r--   1 root root        58 Mar  5  2009 ./source/l/pyrex/Pyrex.url
+-rwxr-xr-x   1 root root      3113 Aug  9  2010 ./source/l/pyrex/pyrex.SlackBuild
+-rw-r--r--   1 root root       847 Mar  5  2009 ./source/l/pyrex/slack-desc
+drwxr-xr-x   2 root root      4096 Nov  3  2009 ./source/l/qca
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/l/qca-cyrus-sasl
+-rw-r--r--   1 root root     24075 Nov  8  2007 ./source/l/qca-cyrus-sasl/qca-cyrus-sasl-2.0.0-beta3.tar.bz2
+-rwxr-xr-x   1 root root      2942 Aug  9  2010 ./source/l/qca-cyrus-sasl/qca-cyrus-sasl.SlackBuild
+-rw-r--r--   1 root root       736 Jul 31  2008 ./source/l/qca-cyrus-sasl/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/l/qca-gnupg
+-rw-r--r--   1 root root     38177 Apr 23  2008 ./source/l/qca-gnupg/qca-gnupg-2.0.0-beta3.tar.bz2
+-rwxr-xr-x   1 root root      2930 Aug  9  2010 ./source/l/qca-gnupg/qca-gnupg.SlackBuild
+-rw-r--r--   1 root root       656 Jul 31  2008 ./source/l/qca-gnupg/slack-desc
+drwxr-xr-x   2 root root      4096 May 23  2009 ./source/l/qca-ossl
+-rw-r--r--   1 root root     49188 Dec 11  2007 ./source/l/qca-ossl/qca-ossl-2.0.0-beta3.tar.bz2
+-rwxr-xr-x   1 root root      3050 Aug  9  2010 ./source/l/qca-ossl/qca-ossl.SlackBuild
+-rw-r--r--   1 root root       443 Dec 16  2008 ./source/l/qca-ossl/qca-ossl.nowhirlpool.diff.gz
+-rw-r--r--   1 root root       947 Jul 31  2008 ./source/l/qca-ossl/slack-desc
+-rw-r--r--   1 root root   1937201 Apr 29  2009 ./source/l/qca/qca-2.0.2.tar.bz2
+-rwxr-xr-x   1 root root      2883 Nov  3  2009 ./source/l/qca/qca.SlackBuild
+-rw-r--r--   1 root root       112 Jul 24  2008 ./source/l/qca/qca.info
+-rw-r--r--   1 root root      1021 Jul 31  2006 ./source/l/qca/slack-desc
+drwxr-xr-x   2 root root      4096 Jul  5  2010 ./source/l/qimageblitz
+-rw-r--r--   1 root root     57681 Jul  5  2010 ./source/l/qimageblitz/qimageblitz-0.0.6.tar.bz2
+-rwxr-xr-x   1 root root      2906 Jul  5  2010 ./source/l/qimageblitz/qimageblitz.SlackBuild
+-rw-r--r--   1 root root       278 Dec 18  2007 ./source/l/qimageblitz/qimageblitz.info
+-rw-r--r--   1 root root       851 Aug  1  2008 ./source/l/qimageblitz/slack-desc
+drwxr-xr-x   3 root root      4096 Mar 25 18:58 ./source/l/qt
+-rw-r--r--   1 root root       327 Nov 21 00:00 ./source/l/qt/README
+-rw-r--r--   1 root root        92 Dec 22  2007 ./source/l/qt/doinst.sh.gz
+drwxr-xr-x   2 root root      4096 Oct  3  2008 ./source/l/qt/profile.d
+-rw-r--r--   1 root root       661 Oct  3  2008 ./source/l/qt/profile.d/qt4.csh
+-rw-r--r--   1 root root       561 Oct  3  2008 ./source/l/qt/profile.d/qt4.sh
+-rw-r--r--   1 root root 106125788 Nov 20 23:56 ./source/l/qt/qt-4.7.0_7abde40.tar.xz
+-rw-r--r--   1 root root      1151 Jan  7 06:41 ./source/l/qt/qt.QSortFilterProxyModel.reformatted.diff.gz
+-rwxr-xr-x   1 root root      7143 Mar 25 18:59 ./source/l/qt/qt.SlackBuild
+-rw-r--r--   1 root root      1188 Mar 24 23:09 ./source/l/qt/qt.blacklist.bad.certs.diff.gz
+-rw-r--r--   1 root root       758 Mar 25 18:58 ./source/l/qt/qt.blacklist.bad.certs.patch02.diff.gz
+-rw-r--r--   1 root root       277 Apr  3  2008 ./source/l/qt/qt.mysql.h.diff.gz
+-rw-r--r--   1 root root       260 Dec 22  2007 ./source/l/qt/qt.x86.cflags.diff.gz
+-rw-r--r--   1 root root       719 May  4  2010 ./source/l/qt/slack-desc
+drwxr-xr-x   2 root root      4096 Feb 19  2010 ./source/l/qtscriptgenerator
+-rw-r--r--   1 root root       564 Jun  5  2009 ./source/l/qtscriptgenerator/include-everything.patch.gz
+-rw-r--r--   1 root root    374223 Jun  5  2009 ./source/l/qtscriptgenerator/qtscriptgenerator-src-0.1.0.tar.gz
+-rwxr-xr-x   1 root root      3960 Feb 19  2010 ./source/l/qtscriptgenerator/qtscriptgenerator.SlackBuild
+-rw-r--r--   1 root root       197 Feb 19  2010 ./source/l/qtscriptgenerator/qtscriptgenerator.gcc44.diff.gz
+-rw-r--r--   1 root root       292 Jun  5  2009 ./source/l/qtscriptgenerator/qtscriptgenerator.info
+-rw-r--r--   1 root root       945 Jun  5  2009 ./source/l/qtscriptgenerator/slack-desc
+drwxr-xr-x   2 root root      4096 Mar  5  2010 ./source/l/raptor
+-rw-r--r--   1 root root    907160 Jan 30  2010 ./source/l/raptor/raptor-1.4.21.tar.xz
+-rwxr-xr-x   1 root root      3641 Mar  5  2010 ./source/l/raptor/raptor.SlackBuild
+-rw-r--r--   1 root root        96 Nov 28  2009 ./source/l/raptor/raptor.info
+-rw-r--r--   1 root root       624 Aug  1  2008 ./source/l/raptor/slack-desc
+drwxr-xr-x   2 root root      4096 Feb  8 19:07 ./source/l/raptor2
+-rw-r--r--   1 root root    933068 Jan  3 22:01 ./source/l/raptor2/raptor2-2.0.0.tar.xz
+-rwxr-xr-x   1 root root      3683 Feb  8 19:08 ./source/l/raptor2/raptor2.SlackBuild
+-rw-r--r--   1 root root       637 Feb  8 19:06 ./source/l/raptor2/slack-desc
+drwxr-xr-x   2 root root      4096 Mar  3 22:17 ./source/l/rasqal
+-rw-r--r--   1 root root    799636 Dec  5 03:31 ./source/l/rasqal/rasqal-0.9.21.tar.xz
+-rwxr-xr-x   1 root root      3719 Nov 29 06:31 ./source/l/rasqal/rasqal.SlackBuild
+-rw-r--r--   1 root root       507 May  4  2010 ./source/l/rasqal/slack-desc
+drwxr-xr-x   3 root root      4096 May 19  2009 ./source/l/readline
+drwxr-xr-x   2 root root      4096 Feb 21  2009 ./source/l/readline/readline-5.2-patches
+-rw-r--r--   1 root root       874 Dec 12  2006 ./source/l/readline/readline-5.2-patches/readline52-001
+-rw-r--r--   1 root root        65 Dec 12  2006 ./source/l/readline/readline-5.2-patches/readline52-001.sig
+-rw-r--r--   1 root root      1433 Mar 21  2007 ./source/l/readline/readline-5.2-patches/readline52-002
+-rw-r--r--   1 root root        65 Mar 21  2007 ./source/l/readline/readline-5.2-patches/readline52-002.sig
+-rw-r--r--   1 root root      1204 Apr 25  2007 ./source/l/readline/readline-5.2-patches/readline52-003
+-rw-r--r--   1 root root        65 Apr 25  2007 ./source/l/readline/readline-5.2-patches/readline52-003.sig
+-rw-r--r--   1 root root      2192 Apr 25  2007 ./source/l/readline/readline-5.2-patches/readline52-004
+-rw-r--r--   1 root root        65 Apr 25  2007 ./source/l/readline/readline-5.2-patches/readline52-004.sig
+-rw-r--r--   1 root root      8029 Aug 22  2007 ./source/l/readline/readline-5.2-patches/readline52-005
+-rw-r--r--   1 root root        65 Aug 22  2007 ./source/l/readline/readline-5.2-patches/readline52-005.sig
+-rw-r--r--   1 root root      2820 Aug 22  2007 ./source/l/readline/readline-5.2-patches/readline52-006
+-rw-r--r--   1 root root        65 Aug 22  2007 ./source/l/readline/readline-5.2-patches/readline52-006.sig
+-rw-r--r--   1 root root      1523 Aug 22  2007 ./source/l/readline/readline-5.2-patches/readline52-007
+-rw-r--r--   1 root root        65 Aug 22  2007 ./source/l/readline/readline-5.2-patches/readline52-007.sig
+-rw-r--r--   1 root root      2277 Dec 15  2007 ./source/l/readline/readline-5.2-patches/readline52-008
+-rw-r--r--   1 root root        65 Dec 15  2007 ./source/l/readline/readline-5.2-patches/readline52-008.sig
+-rw-r--r--   1 root root      1332 Dec 15  2007 ./source/l/readline/readline-5.2-patches/readline52-009
+-rw-r--r--   1 root root        65 Dec 15  2007 ./source/l/readline/readline-5.2-patches/readline52-009.sig
+-rw-r--r--   1 root root      1543 Dec 15  2007 ./source/l/readline/readline-5.2-patches/readline52-010
+-rw-r--r--   1 root root        65 Dec 15  2007 ./source/l/readline/readline-5.2-patches/readline52-010.sig
+-rw-r--r--   1 root root       886 Dec 15  2007 ./source/l/readline/readline-5.2-patches/readline52-011
+-rw-r--r--   1 root root        65 Dec 15  2007 ./source/l/readline/readline-5.2-patches/readline52-011.sig
+-rw-r--r--   1 root root      3870 Dec 15  2007 ./source/l/readline/readline-5.2-patches/readline52-012
+-rw-r--r--   1 root root        65 Dec 15  2007 ./source/l/readline/readline-5.2-patches/readline52-012.sig
+-rw-r--r--   1 root root      5147 Nov 18  2008 ./source/l/readline/readline-5.2-patches/readline52-013
+-rw-r--r--   1 root root        65 Nov 18  2008 ./source/l/readline/readline-5.2-patches/readline52-013.sig
+-rw-r--r--   1 root root   1693789 Oct 11  2006 ./source/l/readline/readline-5.2.tar.bz2
+-rwxr-xr-x   1 root root      3079 Aug  9  2010 ./source/l/readline/readline.SlackBuild
+-rw-r--r--   1 root root      1018 Mar 23  2002 ./source/l/readline/slack-desc
+drwxr-xr-x   2 root root      4096 Mar  3 22:22 ./source/l/redland
+-rw-r--r--   1 root root    836644 Oct 14  2010 ./source/l/redland/redland-1.0.12.tar.xz
+-rwxr-xr-x   1 root root      4374 Nov 29 06:29 ./source/l/redland/redland.SlackBuild
+-rw-r--r--   1 root root       606 Aug  1  2008 ./source/l/redland/slack-desc
+drwxr-xr-x   2 root root      4096 Apr 25 13:38 ./source/l/sdl
+-rw-r--r--   1 root root   3077408 Oct 20  2009 ./source/l/sdl/SDL-1.2.14.tar.xz
+-rw-r--r--   1 root root   1212636 Nov 15  2009 ./source/l/sdl/SDL_image-1.2.10.tar.xz
+-rw-r--r--   1 root root   2525128 Nov 15  2009 ./source/l/sdl/SDL_mixer-1.2.11.tar.xz
+-rw-r--r--   1 root root       212 Feb 14  2010 ./source/l/sdl/SDL_mixer.usrlocal.diff.gz
+-rw-r--r--   1 root root    223252 Jul 21  2007 ./source/l/sdl/SDL_net-1.2.7.tar.xz
+-rw-r--r--   1 root root   1221848 Oct 19  2009 ./source/l/sdl/SDL_ttf-2.0.10.tar.xz
+-rwxr-xr-x   1 root root      7264 Apr 25 05:25 ./source/l/sdl/sdl.SlackBuild
+-rw-r--r--   1 root root       637 Apr 25 05:25 ./source/l/sdl/sdl.linux-2.6.31.input_absinfo.diff.gz
+-rw-r--r--   1 root root       941 Mar 27  2004 ./source/l/sdl/slack-desc
+drwxr-xr-x   2 root root      4096 Jun  7  2010 ./source/l/shared-desktop-ontologies
+-rw-r--r--   1 root root     90155 May  9  2010 ./source/l/shared-desktop-ontologies/shared-desktop-ontologies-0.5.tar.bz2
+-rwxr-xr-x   1 root root      3404 Jun  7  2010 ./source/l/shared-desktop-ontologies/shared-desktop-ontologies.SlackBuild
+-rw-r--r--   1 root root      1119 May  5  2010 ./source/l/shared-desktop-ontologies/slack-desc
+drwxr-xr-x   2 root root      4096 Jan 20 22:00 ./source/l/shared-mime-info
+-rw-r--r--   1 root root       352 Oct 18  2009 ./source/l/shared-mime-info/doinst.sh.gz
+-rw-r--r--   1 root root    580163 Dec  1 17:37 ./source/l/shared-mime-info/shared-mime-info-0.90.tar.bz2
+-rwxr-xr-x   1 root root      3825 Apr 30  2010 ./source/l/shared-mime-info/shared-mime-info.SlackBuild
+-rw-r--r--   1 root root       979 Dec 23  2007 ./source/l/shared-mime-info/slack-desc
+drwxr-xr-x   2 root root      4096 Nov 29 06:01 ./source/l/sip
+-rw-r--r--   1 root root    406528 Oct 22  2010 ./source/l/sip/sip-4.11.2.tar.xz
+-rwxr-xr-x   1 root root      3026 Nov 29 06:01 ./source/l/sip/sip.SlackBuild
+-rw-r--r--   1 root root       147 Nov 28  2009 ./source/l/sip/sip.info
+-rw-r--r--   1 root root       849 May  4  2010 ./source/l/sip/slack-desc
+drwxr-xr-x   2 root root      4096 Jan  1 20:16 ./source/l/slang
+-rw-r--r--   1 root root       994 Aug  1  2006 ./source/l/slang/slack-desc
+-rw-r--r--   1 root root   1424726 Dec 13 07:23 ./source/l/slang/slang-2.2.3.tar.bz2
+-rw-r--r--   1 root root       262 Dec 13 07:26 ./source/l/slang/slang-2.2.3.tar.bz2.asc
+-rwxr-xr-x   1 root root      3784 Jan  1 20:16 ./source/l/slang/slang.SlackBuild
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/l/slang1
+-rw-r--r--   1 root root      1006 Aug  1  2006 ./source/l/slang1/slack-desc
+-rw-r--r--   1 root root    631079 Mar 23  2003 ./source/l/slang1/slang-1.4.9.tar.bz2
+-rwxr-xr-x   1 root root      3303 Aug  9  2010 ./source/l/slang1/slang1.SlackBuild
+drwxr-xr-x   2 root root      4096 Nov 21 03:08 ./source/l/soprano
+-rw-r--r--   1 root root       845 May  4  2010 ./source/l/soprano/slack-desc
+-rw-r--r--   1 root root   1944325 Sep  9  2010 ./source/l/soprano/soprano-2.5.2.tar.bz2
+-rwxr-xr-x   1 root root      3336 Dec  9 18:57 ./source/l/soprano/soprano.SlackBuild
+drwxr-xr-x   2 root root      4096 Jun 10  2009 ./source/l/startup-notification
+-rw-r--r--   1 root root       830 Feb 11  2008 ./source/l/startup-notification/slack-desc
+-rw-r--r--   1 root root    248645 Jun 10  2009 ./source/l/startup-notification/startup-notification-0.10.tar.bz2
+-rwxr-xr-x   1 root root      3060 Feb  6  2010 ./source/l/startup-notification/startup-notification.SlackBuild
+drwxr-xr-x   2 root root      4096 Feb  8  2010 ./source/l/strigi
+-rw-r--r--   1 root root       965 Aug  1  2008 ./source/l/strigi/slack-desc
+-rw-r--r--   1 root root    936320 Feb  3  2010 ./source/l/strigi/strigi-0.7.2.tar.bz2
+-rwxr-xr-x   1 root root      3453 Feb 12 23:05 ./source/l/strigi/strigi.SlackBuild
+-rw-r--r--   1 root root       146 May 17  2008 ./source/l/strigi/strigi.info
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/l/svgalib
+-rw-r--r--   1 root root       802 Mar  9  2009 ./source/l/svgalib/slack-desc
+-rw-r--r--   1 root root       509 May 31  2008 ./source/l/svgalib/svgalib-1.9.25-kernel-2.6.26.diff.gz
+-rw-r--r--   1 root root    807984 Jul 14  2006 ./source/l/svgalib/svgalib-1.9.25.tar.bz2
+-rwxr-xr-x   1 root root      4097 Aug  9  2010 ./source/l/svgalib/svgalib.SlackBuild
+-rw-r--r--   1 root root       271 Mar  9  2009 ./source/l/svgalib/svgalib.nohelper.diff.gz
+-rw-r--r--   1 root root       282 Mar 30  2007 ./source/l/svgalib/svgalib.prefix.diff.gz
+drwxr-xr-x   2 root root      4096 Mar 22 06:28 ./source/l/system-config-printer
+-rw-r--r--   1 root root       380 May  5  2010 ./source/l/system-config-printer/doinst.sh.gz
+-rw-r--r--   1 root root      1217 May  4  2010 ./source/l/system-config-printer/slack-desc
+-rw-r--r--   1 root root    968996 Feb  9 15:10 ./source/l/system-config-printer/system-config-printer-1.2.7.tar.xz
+-rw-r--r--   1 root root        65 Feb  9 16:08 ./source/l/system-config-printer/system-config-printer-1.2.7.tar.xz.sig
+-rwxr-xr--   1 root root      4176 Dec 30 18:17 ./source/l/system-config-printer/system-config-printer.SlackBuild
+drwxr-xr-x   2 root root      4096 Mar 31 01:05 ./source/l/t1lib
+-rw-r--r--   1 root root       813 Apr 30  2002 ./source/l/t1lib/slack-desc
+-rw-r--r--   1 root root   1429408 Dec 23  2007 ./source/l/t1lib/t1lib-5.1.2.tar.xz
+-rwxr-xr-x   1 root root      4291 Mar 31 01:15 ./source/l/t1lib/t1lib.SlackBuild
+-rw-r--r--   1 root root     17575 Jul 24  2008 ./source/l/t1lib/t1lib_5.1.2-3.diff.gz
+drwxr-xr-x   2 root root      4096 Jan  1 21:41 ./source/l/taglib
+drwxr-xr-x   2 root root      4096 Dec 17  2009 ./source/l/taglib-extras
+-rw-r--r--   1 root root       985 Jun  5  2009 ./source/l/taglib-extras/slack-desc
+-rw-r--r--   1 root root     31363 Sep 21  2009 ./source/l/taglib-extras/taglib-extras-1.0.1.tar.gz
+-rwxr-xr-x   1 root root      2976 Aug  9  2010 ./source/l/taglib-extras/taglib-extras.SlackBuild
+-rw-r--r--   1 root root       797 Feb 22  2004 ./source/l/taglib/slack-desc
+-rw-r--r--   1 root root    642284 Apr 19  2010 ./source/l/taglib/taglib-1.6.3.tar.xz
+-rwxr-xr-x   1 root root      2958 Jan  1 21:42 ./source/l/taglib/taglib.SlackBuild
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/l/tango-icon-theme
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/l/tango-icon-theme-extras
+-rw-r--r--   1 root root      1015 Feb 27  2008 ./source/l/tango-icon-theme-extras/slack-desc
+-rw-r--r--   1 root root    128095 Jun  1  2006 ./source/l/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0.tar.bz2
+-rwxr-xr-x   1 root root      2937 May 19  2009 ./source/l/tango-icon-theme-extras/tango-icon-theme-extras.SlackBuild
+-rw-r--r--   1 root root       990 Feb 27  2008 ./source/l/tango-icon-theme/slack-desc
+-rw-r--r--   1 root root   1376581 Feb 26  2009 ./source/l/tango-icon-theme/tango-icon-theme-0.8.90.tar.bz2
+-rwxr-xr-x   1 root root      2033 May 19  2009 ./source/l/tango-icon-theme/tango-icon-theme.SlackBuild
+drwxr-xr-x   2 root root      4096 Jan 27  2010 ./source/l/urwid
+-rw-r--r--   1 root root      9389 Mar 13  2009 ./source/l/urwid/LICENSE.gz
+-rw-r--r--   1 root root       843 Apr 21  2009 ./source/l/urwid/slack-desc
+-rw-r--r--   1 root root    238005 Jan 25  2010 ./source/l/urwid/urwid-0.9.9.1.tar.gz
+-rwxr-xr-x   1 root root      2867 Jan 27  2010 ./source/l/urwid/urwid.SlackBuild
+-rw-r--r--   1 root root        24 Mar 14  2009 ./source/l/urwid/urwid.url
+drwxr-xr-x   2 root root      4096 Apr  4 04:29 ./source/l/v4l-utils
+-rw-r--r--   1 root root      1030 May 14  2010 ./source/l/v4l-utils/slack-desc
+-rw-r--r--   1 root root    276732 Feb  9 22:04 ./source/l/v4l-utils/v4l-utils-0.8.3.tar.xz
+-rwxr-xr-x   1 root root      4262 Apr 11 04:35 ./source/l/v4l-utils/v4l-utils.SlackBuild
+drwxr-xr-x   2 root root      4096 Jul 29  2010 ./source/l/virtuoso-ose
+-rw-r--r--   1 root root       267 Dec 24  2009 ./source/l/virtuoso-ose/doinst.sh.gz
+-rw-r--r--   1 root root       889 Feb 24  2010 ./source/l/virtuoso-ose/slack-desc
+-rw-r--r--   1 root root  58883504 Jul 29  2010 ./source/l/virtuoso-ose/virtuoso-opensource-6.1.2.tar.xz
+-rwxr-xr-x   1 root root      3709 Jul 29  2010 ./source/l/virtuoso-ose/virtuoso-ose.SlackBuild
+drwxr-xr-x   2 root root      4096 Feb 16 03:58 ./source/l/vte
+-rw-r--r--   1 root root       710 Feb 17  2007 ./source/l/vte/slack-desc
+-rw-r--r--   1 root root    952736 Nov 13 13:34 ./source/l/vte/vte-0.26.2.tar.xz
+-rwxr-xr-x   1 root root      4143 Nov 11 19:09 ./source/l/vte/vte.SlackBuild
+drwxr-xr-x   2 root root      4096 Aug  9  2010 ./source/l/wavpack
+-rw-r--r--   1 root root       841 Mar 16  2008 ./source/l/wavpack/slack-desc
+-rw-r--r--   1 root root    394434 Dec  1  2009 ./source/l/wavpack/wavpack-4.60.1.tar.bz2
+-rwxr-xr-x   1 root root      3780 Aug 10  2010 ./source/l/wavpack/wavpack.SlackBuild
+drwxr-xr-x   2 root root      4096 Nov 28  2009 ./source/l/wv2
+-rw-r--r--   1 root root       876 Nov 17  2003 ./source/l/wv2/slack-desc
+-rw-r--r--   1 root root    373612 Oct 31  2009 ./source/l/wv2/wv2-0.4.2.tar.xz
+-rwxr-xr-x   1 root root      2939 Dec 17  2009 ./source/l/wv2/wv2.SlackBuild
+drwxr-xr-x   2 root root      4096 Feb  9 18:12 ./source/l/zlib
+-rw-r--r--   1 root root       814 Feb 15  2002 ./source/l/zlib/slack-desc
+-rw-r--r--   1 root root    433868 Apr 20  2010 ./source/l/zlib/zlib-1.2.5.tar.xz
+-rwxr-xr-x   1 root root      4118 Feb  9 17:05 ./source/l/zlib/zlib.SlackBuild
+-rw-r--r--   1 root root       272 Feb  9 18:12 ./source/l/zlib/zlib.largefile64_source.diff.gz
+drwxr-xr-x   3 root root      4096 Mar 23 19:58 ./source/local
+-rw-r--r--   1 root root        45 Aug 10  2010 ./source/local/README
+drwxr-xr-x   3 root root      4096 Apr 24 02:49 ./source/local/jre
+-rw-r--r--   1 root root      3339 Apr 14 08:49 ./source/local/jre/COPYRIGHT
+-rw-r--r--   1 root root        46 Apr 14 08:49 ./source/local/jre/README
+-rw-r--r--   1 root root        50 Apr 14 08:49 ./source/local/jre/THIRDPARTYLICENSEREADME.txt
+-rw-r--r--   1 root root       917 Apr 14 08:49 ./source/local/jre/Welcome.html
+-rw-r--r--   1 root root  21180382 Apr 24 01:45 ./source/local/jre/jre-6u25-linux-x64.bin
+-rwxr-xr-x   1 root root      4252 Apr 24 02:49 ./source/local/jre/jre.SlackBuild
+drwxr-xr-x   2 root root      4096 Apr 29  2009 ./source/local/jre/profile.d
+-rwxr-xr-x   1 root root       122 Apr 29  2009 ./source/local/jre/profile.d/jre.csh
+-rwxr-xr-x   1 root root       125 Apr 29  2009 ./source/local/jre/profile.d/jre.sh
+-rw-r--r--   1 root root       963 Dec 19 00:09 ./source/local/jre/slack-desc
+drwxr-xr-x 135 root root      4096 Apr  5 06:26 ./source/n
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/n/alpine
+-rw-r--r--   1 root root   5222673 Aug 26  2008 ./source/n/alpine/alpine-2.00.tar.bz2
+-rwxr-xr-x   1 root root      6362 Mar  6  2010 ./source/n/alpine/alpine.SlackBuild
+-rw-r--r--   1 root root       255 Aug  7  2008 ./source/n/alpine/alpine.config.h.diff.gz
+-rw-r--r--   1 root root       301 Aug  7  2008 ./source/n/alpine/alpine.manpage.diff.gz
+-rw-r--r--   1 root root      2493 Aug  7  2008 ./source/n/alpine/alpine.tech-notes.txt.diff.gz
+-rw-r--r--   1 root root       472 Aug  7  2008 ./source/n/alpine/doinst.sh.alpine
+-rw-r--r--   1 root root       737 Aug  7  2008 ./source/n/alpine/pinepgp-0.18.0-makefile-sed-fix.diff.gz
+-rw-r--r--   1 root root     38103 Nov 24  2002 ./source/n/alpine/pinepgp-0.18.0.tar.gz
+-rw-r--r--   1 root root        72 Nov 24  2002 ./source/n/alpine/pinepgp-0.18.0.tar.gz.sig
+-rw-r--r--   1 root root       157 Aug  7  2008 ./source/n/alpine/pinepgp.pinegpgp.in.diff.gz
+-rw-r--r--   1 root root      1102 Aug  7  2008 ./source/n/alpine/slack-desc.alpine
+-rw-r--r--   1 root root       749 Aug  7  2008 ./source/n/alpine/slack-desc.imapd
+drwxr-xr-x   2 root root      4096 Mar  5  2010 ./source/n/autofs
+-rw-r--r--   1 root root       857 Mar  5  2010 ./source/n/autofs/autofs-5.0.5-fix-libxml2-workaround-configure.patch.gz
+-rw-r--r--   1 root root    301327 Sep  3  2009 ./source/n/autofs/autofs-5.0.5.tar.bz2
+-rwxr-xr-x   1 root root      4248 Mar  5  2010 ./source/n/autofs/autofs.SlackBuild
+-rw-r--r--   1 root root       369 Mar  5  2010 ./source/n/autofs/doinst.sh.gz
+-rw-r--r--   1 root root       873 Feb 27  2002 ./source/n/autofs/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/n/biff+comsat
+-rw-r--r--   1 root root       195 Feb 26  2001 ./source/n/biff+comsat/biff+comsat-0.17.diff.gz
+-rw-r--r--   1 root root     13700 Jul 31  2000 ./source/n/biff+comsat/biff+comsat-0.17.tar.gz
+-rwxr-xr-x   1 root root      2878 Aug 10  2010 ./source/n/biff+comsat/biff+comsat.SlackBuild
+-rw-r--r--   1 root root       729 Jun 21  2004 ./source/n/biff+comsat/biff+comsat.badutmp.diff.gz
+-rw-r--r--   1 root root      1222 Jun  3  2001 ./source/n/biff+comsat/biff+comsat.offset.diff.gz
+-rw-r--r--   1 root root      1148 Apr 30  2007 ./source/n/biff+comsat/slack-desc
+drwxr-xr-x   3 root root      4096 Feb 23 17:40 ./source/n/bind
+-rw-r--r--   1 root root      5120 Jun  8  2007 ./source/n/bind/3link.sh
+-rw-r--r--   1 root root   7653584 Feb 14 21:18 ./source/n/bind/bind-9.7.3.tar.gz
+-rw-r--r--   1 root root       481 Feb 14 21:18 ./source/n/bind/bind-9.7.3.tar.gz.asc
+-rwxr-xr-x   1 root root      5175 Mar 25 21:34 ./source/n/bind/bind.SlackBuild
+-rw-r--r--   1 root root       280 Feb 18  2006 ./source/n/bind/bind.so_bsdcompat.diff.gz
+drwxr-xr-x   2 root root      4096 Mar 26 06:54 ./source/n/bind/caching-example
+-rw-r--r--   1 root root       195 May 18  2001 ./source/n/bind/caching-example/localhost.zone
+-rw-r--r--   1 root root       681 Apr 13  2008 ./source/n/bind/caching-example/named.conf
+-rw-r--r--   1 root root       433 Mar 26 06:54 ./source/n/bind/caching-example/named.local
+-rw-r--r--   1 root root      2994 Jun 17  2010 ./source/n/bind/caching-example/named.root
+-rw-r--r--   1 root root       514 May 23  2009 ./source/n/bind/doinst.sh.gz
+-rw-r--r--   1 root root      3378 Jun 24  2010 ./source/n/bind/rc.bind
+-rw-r--r--   1 root root       791 Feb 27  2002 ./source/n/bind/slack-desc
+drwxr-xr-x   4 root root      4096 Mar 31 02:53 ./source/n/bluez
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/n/bluez-firmware
+-rw-r--r--   1 root root    262963 Apr 23  2007 ./source/n/bluez-firmware/bluez-firmware-1.2.tar.bz2
+-rwxr-xr-x   1 root root      3541 Aug 10  2010 ./source/n/bluez-firmware/bluez-firmware.SlackBuild
+-rw-r--r--   1 root root       832 Apr 23  2007 ./source/n/bluez-firmware/slack-desc
+drwxr-xr-x   2 root root      4096 Feb  1 01:11 ./source/n/bluez-hcidump
+-rw-r--r--   1 root root    117744 Jan 27 04:12 ./source/n/bluez-hcidump/bluez-hcidump-2.0.tar.xz
+-rwxr-xr-x   1 root root      3818 Feb  1 01:11 ./source/n/bluez-hcidump/bluez-hcidump.SlackBuild
+-rw-r--r--   1 root root       909 May  2  2010 ./source/n/bluez-hcidump/slack-desc
+-rw-r--r--   1 root root       249 Mar 29 09:00 ./source/n/bluez/bluez-4.91.tar.sign
+-rw-r--r--   1 root root    785488 Mar 29 09:00 ./source/n/bluez/bluez-4.91.tar.xz
+-rwxr-xr-x   1 root root      6306 Mar 24 23:07 ./source/n/bluez/bluez.SlackBuild
+drwxr-xr-x   2 root root      4096 Dec 30  2009 ./source/n/bluez/config
+-rw-r--r--   1 root root       128 Dec 30  2009 ./source/n/bluez/config/bluetooth.modprobe
+-rw-r--r--   1 root root       213 Dec 30  2009 ./source/n/bluez/config/bluetooth.sh
+-rw-r--r--   1 root root       497 Apr 20  2010 ./source/n/bluez/config/rc.bluetooth
+-rw-r--r--   1 root root       390 Aug 27  2010 ./source/n/bluez/doinst.sh.gz
+-rw-r--r--   1 root root      9998 Oct 30  2009 ./source/n/bluez/passkey-agent.c
+drwxr-xr-x   2 root root      4096 Mar 15  2010 ./source/n/bluez/patches
+-rw-r--r--   1 root root       341 Nov  8 01:52 ./source/n/bluez/patches/bluez-dbus-config.patch.gz
+-rw-r--r--   1 root root       446 Dec 30  2009 ./source/n/bluez/patches/bluez-run_udev_helper.patch.gz
+-rw-r--r--   1 root root       433 Dec 30  2009 ./source/n/bluez/patches/bluez-unbreak_dell_mouse.patch.gz
+-rw-r--r--   1 root root       803 May  2  2010 ./source/n/bluez/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/n/bootp
+-rw-r--r--   1 root root       616 Jun  9  2006 ./source/n/bootp/_bootp.tar.gz
+-rwxr-xr-x   1 root root      2801 Aug 10  2010 ./source/n/bootp/bootp.SlackBuild
+-rw-r--r--   1 root root     23147 Feb 17  2006 ./source/n/bootp/bootp_2.4.3-15.diff.gz
+-rw-r--r--   1 root root     89235 Mar 18  1999 ./source/n/bootp/bootp_2.4.3.orig.tar.gz
+-rw-r--r--   1 root root       643 Feb 27  2002 ./source/n/bootp/bootptab.gz
+-rw-r--r--   1 root root       876 Feb 11  2008 ./source/n/bootp/slack-desc
+drwxr-xr-x   2 root root      4096 Aug 10  2010 ./source/n/bridge-utils
+-rw-r--r--   1 root root     32657 Jan 14  2008 ./source/n/bridge-utils/bridge-utils-1.4.tar.gz
+-rwxr-xr-x   1 root root      3590 Aug 10  2010 ./source/n/bridge-utils/bridge-utils.SlackBuild
+-rw-r--r--   1 root root       305 Nov 29  2008 ./source/n/bridge-utils/bridge-utils.isbridge.diff.gz
+-rw-r--r--   1 root root      1054 Apr 29  2007 ./source/n/bridge-utils/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/n/bsd-finger
+-rw-r--r--   1 root root       273 Feb 26  2001 ./source/n/bsd-finger/bsd-finger-0.17.diff.gz
+-rw-r--r--   1 root root     25521 Jul 31  2000 ./source/n/bsd-finger/bsd-finger-0.17.tar.gz
+-rwxr-xr-x   1 root root      2222 May 19  2009 ./source/n/bsd-finger/bsd-finger.SlackBuild
+-rw-r--r--   1 root root      1075 Apr 30  2007 ./source/n/bsd-finger/slack-desc
+drwxr-xr-x   2 root root      4096 Dec 17  2009 ./source/n/ca-certificates
+-rwxr-xr-x   1 root root      2707 Dec 17  2009 ./source/n/ca-certificates/ca-certificates.SlackBuild
+-rw-r--r--   1 root root    226907 Aug 14  2009 ./source/n/ca-certificates/ca-certificates_20090814.tar.gz
+-rw-r--r--   1 root root       718 Dec 17  2009 ./source/n/ca-certificates/cacerts-20090814-fixup_DESTDIR.diff.gz
+-rw-r--r--   1 root root       393 Dec 17  2009 ./source/n/ca-certificates/cacerts-20090814-fixup_update-ca-certificates.diff.gz
+-rw-r--r--   1 root root       320 Dec 17  2009 ./source/n/ca-certificates/cacerts-20090814-remove_debconf.diff.gz
+-rw-r--r--   1 root root       308 Jul  2  2009 ./source/n/ca-certificates/doinst.sh.gz
+-rw-r--r--   1 root root       895 Jul  2  2009 ./source/n/ca-certificates/slack-desc
+drwxr-xr-x   2 root root      4096 May  3  2010 ./source/n/crda
+-rw-r--r--   1 root root     21666 May  3  2010 ./source/n/crda/crda-1.1.1.tar.bz2
+-rwxr-xr-x   1 root root      3643 May  3  2010 ./source/n/crda/crda.SlackBuild
+-rw-r--r--   1 root root       380 Feb 23  2009 ./source/n/crda/get_regdb.sh
+-rw-r--r--   1 root root       870 Mar  9  2009 ./source/n/crda/slack-desc
+-rw-r--r--   1 root root     68146 May  3  2010 ./source/n/crda/wireless-regdb-git_20100502.tar.bz2
+drwxr-xr-x   2 root root      4096 Mar 29 19:32 ./source/n/curl
+-rw-r--r--   1 root root    127548 Mar 29 19:30 ./source/n/curl/cacert.pem.bz2
+-rw-r--r--   1 root root   2256354 Feb 17 12:22 ./source/n/curl/curl-7.21.4.tar.bz2
+-rw-r--r--   1 root root       198 Feb 17 12:22 ./source/n/curl/curl-7.21.4.tar.bz2.asc
+-rwxr-xr-x   1 root root      4105 Mar 29 19:34 ./source/n/curl/curl.SlackBuild
+-rw-r--r--   1 root root      1010 Feb 11  2008 ./source/n/curl/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/n/cyrus-sasl
+-rw-r--r--   1 root root    906552 May 14  2009 ./source/n/cyrus-sasl/cyrus-sasl-2.1.23.tar.xz
+-rwxr-xr-x   1 root root      3796 Aug 11  2010 ./source/n/cyrus-sasl/cyrus-sasl.SlackBuild
+-rw-r--r--   1 root root       275 Jul 24  2005 ./source/n/cyrus-sasl/doinst.sh.gz
+-rw-r--r--   1 root root       580 Jul 25  2005 ./source/n/cyrus-sasl/rc.saslauthd.gz
+-rw-r--r--   1 root root       836 Apr 18  2005 ./source/n/cyrus-sasl/slack-desc
+drwxr-xr-x   2 root root      4096 Apr  6 19:12 ./source/n/dhcp
+-rw-r--r--   1 root root       337 Mar  3  2010 ./source/n/dhcp/dhclient-script.PATH.diff.gz
+-rw-r--r--   1 root root   8797289 Apr  5 16:46 ./source/n/dhcp/dhcp-4.2.1-P1.tar.gz
+-rw-r--r--   1 root root       481 Apr  5 16:46 ./source/n/dhcp/dhcp-4.2.1-P1.tar.gz.asc
+-rwxr-xr-x   1 root root      1667 Apr  6 19:13 ./source/n/dhcp/dhcp-remove-bind-tarball.sh
+-rwxr-xr-x   1 root root      4818 Apr  6 18:53 ./source/n/dhcp/dhcp.SlackBuild
+-rw-r--r--   1 root root       309 Mar 24 13:39 ./source/n/dhcp/doinst.sh.gz
+-rw-r--r--   1 root root      1099 Feb 27  2002 ./source/n/dhcp/slack-desc
+drwxr-xr-x   2 root root      4096 Mar  7 23:05 ./source/n/dhcpcd
+-rw-r--r--   1 root root       580 Dec 29 22:23 ./source/n/dhcpcd/50-ntp.conf.diff.gz
+-rw-r--r--   1 root root       759 Mar  9  2009 ./source/n/dhcpcd/COPYRIGHT.gz
+-rw-r--r--   1 root root     71055 Feb  4 14:57 ./source/n/dhcpcd/dhcpcd-5.2.11.tar.bz2
+-rwxr-xr-x   1 root root      3811 Aug  7  2010 ./source/n/dhcpcd/dhcpcd.SlackBuild
+-rw-r--r--   1 root root       265 Jul 24  2009 ./source/n/dhcpcd/doinst.sh.gz
+-rw-r--r--   1 root root       900 Apr 10  2008 ./source/n/dhcpcd/slack-desc
+drwxr-xr-x   2 root root      4096 Mar  7 20:19 ./source/n/dirmngr
+-rw-r--r--   1 root root    481320 Jun 14  2010 ./source/n/dirmngr/dirmngr-1.1.0.tar.xz
+-rwxr-xr-x   1 root root      3625 Jan 14 03:19 ./source/n/dirmngr/dirmngr.SlackBuild
+-rw-r--r--   1 root root       952 Mar 15  2007 ./source/n/dirmngr/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 16 05:33 ./source/n/dnsmasq
+-rw-r--r--   1 root root    334524 Feb 18 18:11 ./source/n/dnsmasq/dnsmasq-2.57.tar.xz
+-rwxr-xr-x   1 root root      3574 Feb 11  2010 ./source/n/dnsmasq/dnsmasq.SlackBuild
+-rw-r--r--   1 root root       543 Jan 22  2010 ./source/n/dnsmasq/dnsmasq.leasedir.diff.gz
+-rw-r--r--   1 root root       376 Jan 22  2010 ./source/n/dnsmasq/doinst.sh.gz
+-rw-r--r--   1 root root       265 Oct 16  2005 ./source/n/dnsmasq/rc.dnsmasq.gz
+-rw-r--r--   1 root root       854 Oct 16  2005 ./source/n/dnsmasq/slack-desc
+drwxr-xr-x   2 root root      4096 May 23  2009 ./source/n/elm
+-rw-r--r--   1 root root      4400 Aug 13  2009 ./source/n/elm/config.sh
+-rwxr-xr-x   1 root root      2872 Aug 11  2010 ./source/n/elm/elm.SlackBuild
+-rw-r--r--   1 root root    481431 Aug 18  2005 ./source/n/elm/elm2.5.8.tar.bz2
+-rw-r--r--   1 root root       678 Mar  5  2002 ./source/n/elm/slack-desc
+drwxr-xr-x   2 root root      4096 May 17  2010 ./source/n/epic5
+-rw-r--r--   1 root root    249636 Mar 16  2005 ./source/n/epic5/epic-help-current.tar.xz
+-rw-r--r--   1 root root    711512 May  1  2010 ./source/n/epic5/epic5-1.1.2.tar.xz
+-rwxr-xr-x   1 root root      3351 May 17  2010 ./source/n/epic5/epic5.SlackBuild
+-rw-r--r--   1 root root       777 May 17  2010 ./source/n/epic5/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 25 05:52 ./source/n/ethtool
+-rw-r--r--   1 root root    144548 Nov 16 20:04 ./source/n/ethtool/ethtool-2.6.36.tar.xz
+-rwxr-xr-x   1 root root      2558 Mar 25 05:54 ./source/n/ethtool/ethtool.SlackBuild
+-rw-r--r--   1 root root       899 Apr 29  2007 ./source/n/ethtool/slack-desc
+drwxr-xr-x   2 root root      4096 Apr  5 06:19 ./source/n/fetchmail
+-rw-r--r--   1 root root   1244804 Dec 10 16:34 ./source/n/fetchmail/fetchmail-6.3.19.tar.xz
+-rw-r--r--   1 root root       198 Dec 10 16:34 ./source/n/fetchmail/fetchmail-6.3.19.tar.xz.asc
+-rwxr-xr-x   1 root root      3287 Apr  5 06:19 ./source/n/fetchmail/fetchmail.SlackBuild
+-rw-r--r--   1 root root      1067 May  7  2007 ./source/n/fetchmail/slack-desc
+drwxr-xr-x   2 root root      4096 Apr  5 06:16 ./source/n/getmail
+-rw-r--r--   1 root root    156907 Jun 30  2010 ./source/n/getmail/getmail-4.20.0.tar.gz
+-rwxr-xr-x   1 root root      2052 May  3  2010 ./source/n/getmail/getmail.SlackBuild
+-rw-r--r--   1 root root       821 Sep 10  2003 ./source/n/getmail/slack-desc
+drwxr-xr-x   2 root root      4096 Mar  9 22:25 ./source/n/gnupg
+-rw-r--r--   1 root root   3407075 Oct 18  2010 ./source/n/gnupg/gnupg-1.4.11.tar.bz2
+-rw-r--r--   1 root root       158 Oct 18  2010 ./source/n/gnupg/gnupg-1.4.11.tar.bz2.sig
+-rwxr-xr-x   1 root root      3402 Mar  9 22:30 ./source/n/gnupg/gnupg.SlackBuild
+-rw-r--r--   1 root root       827 Feb 25  2003 ./source/n/gnupg/slack-desc.gnupg
+drwxr-xr-x   2 root root      4096 Jan 14 02:58 ./source/n/gnupg2
+-rw-r--r--   1 root root   2738768 Jan 13 15:37 ./source/n/gnupg2/gnupg-2.0.17.tar.xz
+-rwxr-xr-x   1 root root      5180 Jan 14 02:58 ./source/n/gnupg2/gnupg2.SlackBuild
+-rw-r--r--   1 root root      1058 Feb 11  2008 ./source/n/gnupg2/slack-desc
+drwxr-xr-x   2 root root      4096 Mar  7 20:34 ./source/n/gnutls
+-rw-r--r--   1 root root   5099412 Feb 28 11:49 ./source/n/gnutls/gnutls-2.10.5.tar.xz
+-rwxr-xr-x   1 root root      3953 Apr 10  2010 ./source/n/gnutls/gnutls.SlackBuild
+-rw-r--r--   1 root root       950 Mar 16  2007 ./source/n/gnutls/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/n/gpa
+-rw-r--r--   1 root root       270 Mar 16  2007 ./source/n/gpa/doinst.sh.gz
+-rw-r--r--   1 root root    564252 Mar  6  2007 ./source/n/gpa/gpa-0.7.5.tar.bz2
+-rwxr-xr-x   1 root root      3468 Aug 12  2010 ./source/n/gpa/gpa.SlackBuild
+-rw-r--r--   1 root root       741 Mar 15  2007 ./source/n/gpa/slack-desc
+drwxr-xr-x   2 root root      4096 Jan 14 03:04 ./source/n/gpgme
+-rw-r--r--   1 root root    869470 Jan 11  2010 ./source/n/gpgme/gpgme-1.3.0.tar.bz2
+-rw-r--r--   1 root root       315 Jan 11  2010 ./source/n/gpgme/gpgme-1.3.0.tar.bz2.sig
+-rwxr-xr-x   1 root root      3334 Jan 14 03:05 ./source/n/gpgme/gpgme.SlackBuild
+-rw-r--r--   1 root root       995 Mar 15  2007 ./source/n/gpgme/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/n/htdig
+-rw-r--r--   1 root root       274 Apr  7  2007 ./source/n/htdig/doinst.sh.gz
+-rw-r--r--   1 root root      3347 Apr  7  2007 ./source/n/htdig/htdig-3.2.0b6.diff.gz
+-rw-r--r--   1 root root   2498246 Jul 13  2004 ./source/n/htdig/htdig-3.2.0b6.tar.bz2
+-rwxr-xr-x   1 root root      4395 Aug 12  2010 ./source/n/htdig/htdig.SlackBuild
+-rw-r--r--   1 root root       288 May  2  2007 ./source/n/htdig/htdig.conf.diff.gz
+-rw-r--r--   1 root root       891 Apr  7  2007 ./source/n/htdig/slack-desc
+drwxr-xr-x   2 root root      4096 Feb 12 19:23 ./source/n/httpd
+-rw-r--r--   1 root root      1409 May 18  2007 ./source/n/httpd/README
+-rw-r--r--   1 root root       439 Jun  5  2007 ./source/n/httpd/config.layout.diff.gz
+-rw-r--r--   1 root root       702 Jul 24  2008 ./source/n/httpd/doinst.sh.gz
+-rw-r--r--   1 root root   4951247 Oct 18  2010 ./source/n/httpd/httpd-2.2.17.tar.bz2
+-rw-r--r--   1 root root       833 Oct 18  2010 ./source/n/httpd/httpd-2.2.17.tar.bz2.asc
+-rwxr-xr-x   1 root root      7004 Feb 12 19:25 ./source/n/httpd/httpd.SlackBuild
+-rw-r--r--   1 root root       238 Feb 12 19:23 ./source/n/httpd/httpd.brigade_move.__noinline__.gcc451.diff.gz
+-rw-r--r--   1 root root       214 May 18  2007 ./source/n/httpd/httpd.nossldefault.diff.gz
+-rw-r--r--   1 root root       237 Feb 14  2008 ./source/n/httpd/httpd.runasapache.diff.gz
+-rw-r--r--   1 root root       112 Nov 16 21:16 ./source/n/httpd/httpd.url
+-rw-r--r--   1 root root       171 Nov  9 20:22 ./source/n/httpd/logrotate.httpd
+-rw-r--r--   1 root root       703 May 27  2007 ./source/n/httpd/rc.httpd
+-rw-r--r--   1 root root       970 May 18  2007 ./source/n/httpd/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/n/icmpinfo
+-rw-r--r--   1 root root      2263 Apr 29  2007 ./source/n/icmpinfo/icmpinfo-1.11.diff.gz
+-rw-r--r--   1 root root     11873 Aug 23  1995 ./source/n/icmpinfo/icmpinfo-1.11.tar.gz
+-rwxr-xr-x   1 root root      2481 Aug 12  2010 ./source/n/icmpinfo/icmpinfo.SlackBuild
+-rw-r--r--   1 root root       826 Apr 29  2007 ./source/n/icmpinfo/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 25 21:45 ./source/n/idnkit
+-rw-r--r--   1 root root    297016 Apr 14  2010 ./source/n/idnkit/idnkit-1.0-src.tar.xz
+-rwxr-xr-x   1 root root      3996 Mar 25 21:45 ./source/n/idnkit/idnkit.SlackBuild
+-rw-r--r--   1 root root       898 Mar 25 21:23 ./source/n/idnkit/slack-desc
+lrwxrwxrwx   1 root root         6 Aug 12  2010 ./source/n/imapd -> alpine
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/n/inetd
+-rw-r--r--   1 root root      4876 Jun 30  2007 ./source/n/inetd/_inetd.tar.gz
+-rw-r--r--   1 root root      6436 Feb  7  2001 ./source/n/inetd/inetd-OpenBSD-1.79.diff.gz
+-rw-r--r--   1 root root     19053 Feb  6  2001 ./source/n/inetd/inetd-OpenBSD-1.79.tar.gz
+-rwxr-xr-x   1 root root      2409 Aug 12  2010 ./source/n/inetd/inetd.SlackBuild
+-rw-r--r--   1 root root       889 Sep  6  2003 ./source/n/inetd/inetd.loopingdos.diff.gz
+-rw-r--r--   1 root root       910 Mar 22  2002 ./source/n/inetd/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 16 03:09 ./source/n/iproute2
+-rw-r--r--   1 root root       305 Oct  4  2008 ./source/n/iproute2/doinst.sh.gz
+-rw-r--r--   1 root root    388866 Jan  7 17:18 ./source/n/iproute2/iproute2-2.6.37.tar.bz2
+-rw-r--r--   1 root root       198 Jan  7 17:18 ./source/n/iproute2/iproute2-2.6.37.tar.bz2.sig
+-rwxr-xr-x   1 root root      4643 Mar 16 03:11 ./source/n/iproute2/iproute2.SlackBuild
+-rw-r--r--   1 root root       502 Feb 25  2010 ./source/n/iproute2/iproute2.fixup_dbpath_and_iptablespath.diff.gz
+-rw-r--r--   1 root root       937 Jun 12  2004 ./source/n/iproute2/slack-desc
+drwxr-xr-x   2 root root      4096 Oct 29 16:24 ./source/n/iptables
+-rw-r--r--   1 root root    478007 Oct 29 15:33 ./source/n/iptables/iptables-1.4.10.tar.bz2
+-rwxr-xr-x   1 root root      3102 Aug 14  2010 ./source/n/iptables/iptables.SlackBuild
+-rw-r--r--   1 root root      1129 Sep  3  2006 ./source/n/iptables/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 11 03:47 ./source/n/iptraf-ng
+-rw-r--r--   1 root root    574784 Mar 24  2010 ./source/n/iptraf-ng/iptraf-ng-1.0.2.tar.xz
+-rwxr-xr-x   1 root root      3894 Mar 12 18:47 ./source/n/iptraf-ng/iptraf-ng.SlackBuild
+-rw-r--r--   1 root root      1048 Mar 11 03:13 ./source/n/iptraf-ng/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 25 05:49 ./source/n/iputils
+-rw-r--r--   1 root root     94386 Oct  6  2010 ./source/n/iputils/iputils-s20101006.tar.bz2
+-rwxr-xr-x   1 root root      3467 Mar 25 05:50 ./source/n/iputils/iputils.SlackBuild
+-rw-r--r--   1 root root       881 Apr 30  2007 ./source/n/iputils/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/n/ipw2100-fw
+-rw-r--r--   1 root root    177519 Mar  9  2008 ./source/n/ipw2100-fw/ipw2100-fw-1.3.tar.bz2
+-rwxr-xr-x   1 root root      2935 May 19  2009 ./source/n/ipw2100-fw/ipw2100-fw.SlackBuild
+drwxr-xr-x   2 root root      4096 May  3  2010 ./source/n/ipw2200-fw
+-rw-r--r--   1 root root    118152 May  3  2010 ./source/n/ipw2200-fw/ipw2200-fw-3.1.tar.xz
+-rwxr-xr-x   1 root root      2807 May  3  2010 ./source/n/ipw2200-fw/ipw2200-fw.SlackBuild
+drwxr-xr-x   2 root root      4096 Apr 22  2010 ./source/n/irssi
+-rw-r--r--   1 root root       264 Jul 29  2009 ./source/n/irssi/doinst.sh.gz
+-rw-r--r--   1 root root    948847 Apr 22  2010 ./source/n/irssi/irssi-0.8.15.tar.bz2
+-rw-r--r--   1 root root        72 Apr 22  2010 ./source/n/irssi/irssi-0.8.15.tar.bz2.sig
+-rwxr-xr-x   1 root root      4510 Jan 26 19:09 ./source/n/irssi/irssi.SlackBuild
+-rw-r--r--   1 root root       371 Oct 12  2009 ./source/n/irssi/irssi.manpage_fix.diff.gz
+-rw-r--r--   1 root root       402 Apr 22  2010 ./source/n/irssi/irssi.ssl_proxy.diff.gz
+-rw-r--r--   1 root root       789 Dec 13  2003 ./source/n/irssi/slack-desc
+drwxr-xr-x   2 root root      4096 Aug 12  2010 ./source/n/iw
+-rw-r--r--   1 root root     44999 Aug 12  2010 ./source/n/iw/iw-0.9.20.tar.bz2
+-rwxr-xr-x   1 root root      2852 Aug 12  2010 ./source/n/iw/iw.SlackBuild
+-rw-r--r--   1 root root       132 Apr  1  2009 ./source/n/iw/iw.info
+-rw-r--r--   1 root root       883 Apr  1  2009 ./source/n/iw/slack-desc
+drwxr-xr-x   2 root root      4096 Mar  3 20:59 ./source/n/iwlwifi-100-ucode
+-rw-r--r--   1 root root    118392 Mar  3 20:44 ./source/n/iwlwifi-100-ucode/iwlwifi-100-ucode-39.31.5.1.tar.xz
+-rwxr-xr-x   1 root root      2054 Mar  3 21:00 ./source/n/iwlwifi-100-ucode/iwlwifi-100-ucode.SlackBuild
+-rw-r--r--   1 root root       951 Mar  3 21:00 ./source/n/iwlwifi-100-ucode/slack-desc
+drwxr-xr-x   2 root root      4096 May  3  2010 ./source/n/iwlwifi-1000-ucode
+-rw-r--r--   1 root root    115416 May  3  2010 ./source/n/iwlwifi-1000-ucode/iwlwifi-1000-ucode-128.50.3.1.tar.xz
+-rwxr-xr-x   1 root root      2049 May  3  2010 ./source/n/iwlwifi-1000-ucode/iwlwifi-1000-ucode.SlackBuild
+-rw-r--r--   1 root root       953 May  3  2010 ./source/n/iwlwifi-1000-ucode/slack-desc
+drwxr-xr-x   2 root root      4096 Jun 13  2009 ./source/n/iwlwifi-3945-ucode
+-rw-r--r--   1 root root     65335 Oct 21  2008 ./source/n/iwlwifi-3945-ucode/iwlwifi-3945-ucode-15.28.1.8.tar.bz2
+-rw-r--r--   1 root root     65524 Jun 13  2009 ./source/n/iwlwifi-3945-ucode/iwlwifi-3945-ucode-15.32.2.9.tar.bz2
+-rwxr-xr-x   1 root root      2043 Jun 13  2009 ./source/n/iwlwifi-3945-ucode/iwlwifi-3945-ucode.SlackBuild
+-rw-r--r--   1 root root       987 Oct 24  2008 ./source/n/iwlwifi-3945-ucode/slack-desc
+drwxr-xr-x   2 root root      4096 Jul 15  2009 ./source/n/iwlwifi-4965-ucode
+-rw-r--r--   1 root root     79274 Jul  4  2008 ./source/n/iwlwifi-4965-ucode/iwlwifi-4965-ucode-228.57.1.21.tar.bz2
+-rw-r--r--   1 root root     79368 Jul  9  2009 ./source/n/iwlwifi-4965-ucode/iwlwifi-4965-ucode-228.61.2.24.tar.bz2
+-rwxr-xr-x   1 root root      2043 May  8  2009 ./source/n/iwlwifi-4965-ucode/iwlwifi-4965-ucode.SlackBuild
+-rw-r--r--   1 root root       987 Oct 24  2008 ./source/n/iwlwifi-4965-ucode/slack-desc
+drwxr-xr-x   2 root root      4096 Mar  3 20:56 ./source/n/iwlwifi-5000-ucode
+-rw-r--r--   1 root root    116124 Oct  6  2008 ./source/n/iwlwifi-5000-ucode/iwlwifi-5000-ucode-5.4.A.11.tar.xz
+-rw-r--r--   1 root root    120484 Jun 13  2009 ./source/n/iwlwifi-5000-ucode/iwlwifi-5000-ucode-8.24.2.12.tar.xz
+-rw-r--r--   1 root root    115692 Dec  3 01:05 ./source/n/iwlwifi-5000-ucode/iwlwifi-5000-ucode-8.83.5.1.tar.xz
+-rwxr-xr-x   1 root root      2037 Jun 13  2009 ./source/n/iwlwifi-5000-ucode/iwlwifi-5000-ucode.SlackBuild
+-rw-r--r--   1 root root       981 Oct 24  2008 ./source/n/iwlwifi-5000-ucode/slack-desc
+drwxr-xr-x   2 root root      4096 Jun 13  2009 ./source/n/iwlwifi-5150-ucode
+-rw-r--r--   1 root root    144943 Jun 13  2009 ./source/n/iwlwifi-5150-ucode/iwlwifi-5150-ucode-8.24.2.2.tar.bz2
+-rwxr-xr-x   1 root root      2037 Jun 13  2009 ./source/n/iwlwifi-5150-ucode/iwlwifi-5150-ucode.SlackBuild
+-rw-r--r--   1 root root       978 Jun 13  2009 ./source/n/iwlwifi-5150-ucode/slack-desc
+drwxr-xr-x   2 root root      4096 Mar  3 21:35 ./source/n/iwlwifi-6000-ucode
+-rw-r--r--   1 root root    134608 Jun  2  2010 ./source/n/iwlwifi-6000-ucode/iwlwifi-6000-ucode-9.221.4.1.tar.xz
+-rwxr-xr-x   1 root root      2049 May  3  2010 ./source/n/iwlwifi-6000-ucode/iwlwifi-6000-ucode.SlackBuild
+-rw-r--r--   1 root root       953 May  3  2010 ./source/n/iwlwifi-6000-ucode/slack-desc
+drwxr-xr-x   2 root root      4096 Mar  3 21:37 ./source/n/iwlwifi-6xxx-ucode
+-rw-r--r--   1 root root    136400 Mar  3 20:44 ./source/n/iwlwifi-6xxx-ucode/iwlwifi-6000g2a-ucode-17.168.5.2.tar.xz
+-rw-r--r--   1 root root    141832 Mar  3 20:44 ./source/n/iwlwifi-6xxx-ucode/iwlwifi-6000g2b-ucode-17.168.5.2.tar.xz
+-rw-r--r--   1 root root    141460 Mar  3 20:44 ./source/n/iwlwifi-6xxx-ucode/iwlwifi-6050-ucode-41.28.5.1.tar.xz
+-rwxr-xr-x   1 root root      2134 Mar  3 21:41 ./source/n/iwlwifi-6xxx-ucode/iwlwifi-6xxx-ucode.SlackBuild
+-rw-r--r--   1 root root       953 Mar  3 21:38 ./source/n/iwlwifi-6xxx-ucode/slack-desc
+drwxr-xr-x   2 root root      4096 Apr 14 18:07 ./source/n/lftp
+-rw-r--r--   1 root root       263 May 31  2009 ./source/n/lftp/doinst.sh.gz
+-rw-r--r--   1 root root   1325468 Apr 11 09:24 ./source/n/lftp/lftp-4.2.2.tar.xz
+-rwxr-xr-x   1 root root      3784 Aug  7  2010 ./source/n/lftp/lftp.SlackBuild
+-rw-r--r--   1 root root      1037 Apr  6  2002 ./source/n/lftp/slack-desc
+drwxr-xr-x   2 root root      4096 Aug 11  2010 ./source/n/libassuan
+-rw-r--r--   1 root root    494384 Aug  9  2010 ./source/n/libassuan/libassuan-2.0.1.tar.bz2
+-rw-r--r--   1 root root       158 Aug  9  2010 ./source/n/libassuan/libassuan-2.0.1.tar.bz2.sig
+-rwxr-xr-x   1 root root      3358 Aug 11  2010 ./source/n/libassuan/libassuan.SlackBuild
+-rw-r--r--   1 root root       712 Mar 15  2007 ./source/n/libassuan/slack-desc
+drwxr-xr-x   2 root root      4096 Aug 11  2010 ./source/n/libgcrypt
+-rw-r--r--   1 root root   1151877 Jul 13  2010 ./source/n/libgcrypt/libgcrypt-1.4.6.tar.bz2
+-rw-r--r--   1 root root       158 Jul 13  2010 ./source/n/libgcrypt/libgcrypt-1.4.6.tar.bz2.sig
+-rwxr-xr-x   1 root root      3806 Aug 11  2010 ./source/n/libgcrypt/libgcrypt.SlackBuild
+-rw-r--r--   1 root root       705 Mar 15  2007 ./source/n/libgcrypt/slack-desc
+drwxr-xr-x   2 root root      4096 Aug 11  2010 ./source/n/libgpg-error
+-rw-r--r--   1 root root    436310 Jul 21  2010 ./source/n/libgpg-error/libgpg-error-1.9.tar.bz2
+-rw-r--r--   1 root root       158 Jul 21  2010 ./source/n/libgpg-error/libgpg-error-1.9.tar.bz2.sig
+-rwxr-xr-x   1 root root      3701 Aug 11  2010 ./source/n/libgpg-error/libgpg-error.SlackBuild
+-rw-r--r--   1 root root       856 Mar 15  2007 ./source/n/libgpg-error/slack-desc
+drwxr-xr-x   2 root root      4096 Mar  7 20:16 ./source/n/libksba
+-rw-r--r--   1 root root    588323 Mar  1 11:47 ./source/n/libksba/libksba-1.2.0.tar.bz2
+-rw-r--r--   1 root root       287 Mar  1 11:47 ./source/n/libksba/libksba-1.2.0.tar.bz2.sig
+-rwxr-xr-x   1 root root      3484 Mar  6  2010 ./source/n/libksba/libksba.SlackBuild
+-rw-r--r--   1 root root       790 Mar 15  2007 ./source/n/libksba/slack-desc
+drwxr-xr-x   2 root root      4096 Feb 18  2010 ./source/n/links
+-rw-r--r--   1 root root   3832651 Jan 30  2010 ./source/n/links/links-2.3pre1.tar.bz2
+-rwxr-xr-x   1 root root      3561 Feb 18  2010 ./source/n/links/links.SlackBuild
+-rw-r--r--   1 root root       902 Aug 19  2003 ./source/n/links/slack-desc
+drwxr-xr-x   2 root root      4096 Feb 12  2010 ./source/n/lynx
+-rwxr-xr-x   1 root root      4439 Feb 12  2010 ./source/n/lynx/lynx.SlackBuild
+-rw-r--r--   1 root root       355 Dec  3  2009 ./source/n/lynx/lynx.cfg.diff.gz
+-rw-r--r--   1 root root       573 Dec  3  2009 ./source/n/lynx/lynx.path.diff.gz
+-rw-r--r--   1 root root   2090248 Dec  2  2009 ./source/n/lynx/lynx2.8.7.tar.xz
+-rw-r--r--   1 root root       953 Feb 27  2002 ./source/n/lynx/slack-desc
+drwxr-xr-x   2 root root      4096 Aug 10  2009 ./source/n/mailx
+-rw-r--r--   1 root root       281 Sep 20  2006 ./source/n/mailx/doinst.sh.gz
+-rw-r--r--   1 root root    271482 Jul 28  2008 ./source/n/mailx/mailx-12.4.tar.bz2
+-rwxr-xr-x   1 root root      3422 Aug 12  2010 ./source/n/mailx/mailx.SlackBuild
+-rw-r--r--   1 root root      1023 Apr 11  2008 ./source/n/mailx/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 14 03:39 ./source/n/mcabber
+-rw-r--r--   1 root root    554682 Dec  1 20:52 ./source/n/mcabber/mcabber-0.10.1.tar.bz2
+-rwxr-xr-x   1 root root      3928 Apr 22  2010 ./source/n/mcabber/mcabber.SlackBuild
+-rw-r--r--   1 root root       876 Jun 14  2007 ./source/n/mcabber/slack-desc
+drwxr-xr-x   2 root root      4096 Aug 12  2010 ./source/n/metamail
+-rw-r--r--   1 root root    125480 Feb 18  1994 ./source/n/metamail/metamail-2.7.tar.xz
+-rwxr-xr-x   1 root root      4578 Aug 12  2010 ./source/n/metamail/metamail.SlackBuild
+-rw-r--r--   1 root root     20532 Apr 23  2009 ./source/n/metamail/metamail.automake.diff.xz
+-rw-r--r--   1 root root       284 Aug 12  2010 ./source/n/metamail/metamail.uue.getline.diff.gz
+-rw-r--r--   1 root root    202588 Mar  8  2008 ./source/n/metamail/metamail_2.7-54.diff.xz
+-rw-r--r--   1 root root       927 Mar 23  2002 ./source/n/metamail/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 25 05:16 ./source/n/mtr
+-rw-r--r--   1 root root    208168 Jul 13  2010 ./source/n/mtr/mtr-0.80.tar.xz
+-rwxr-xr-x   1 root root      3394 Mar 25 05:19 ./source/n/mtr/mtr.SlackBuild
+-rw-r--r--   1 root root       779 Jun  4  2007 ./source/n/mtr/slack-desc
+drwxr-xr-x   2 root root      4096 Oct 25 17:54 ./source/n/mutt
+-rw-r--r--   1 root root       264 Jun  1  2002 ./source/n/mutt/doinst.sh.gz
+-rw-r--r--   1 root root   1810848 Sep 15  2010 ./source/n/mutt/mutt-1.5.21.tar.xz
+-rwxr-xr-x   1 root root      4096 Oct 25 17:55 ./source/n/mutt/mutt.SlackBuild
+-rw-r--r--   1 root root       466 Oct 25 17:51 ./source/n/mutt/mutt.gpgme.diff.gz
+-rw-r--r--   1 root root       866 Feb 11  2008 ./source/n/mutt/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/n/nc
+-rw-r--r--   1 root root     10439 Mar 14  2002 ./source/n/nc/nc-110-21.diff.gz
+-rwxr-xr-x   1 root root      2668 Aug 12  2010 ./source/n/nc/nc.SlackBuild
+-rw-r--r--   1 root root       641 May 28  2002 ./source/n/nc/nc.diff.gz
+-rw-r--r--   1 root root     75267 May 28  2002 ./source/n/nc/nc110.tgz
+-rw-r--r--   1 root root      1081 May 28  2002 ./source/n/nc/slack-desc
+drwxr-xr-x   2 root root      4096 Jan 21 01:40 ./source/n/ncftp
+-rw-r--r--   1 root root    454388 Jan 18 03:52 ./source/n/ncftp/ncftp-3.2.5-src.tar.bz2
+-rwxr-xr-x   1 root root      3575 May  3  2010 ./source/n/ncftp/ncftp.SlackBuild
+-rw-r--r--   1 root root       793 Feb 11  2008 ./source/n/ncftp/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 19 22:11 ./source/n/net-snmp
+-rw-r--r--   1 root root       344 Jun 19  2007 ./source/n/net-snmp/doinst.sh.gz
+-rw-r--r--   1 root root   3499040 Jan  3 23:45 ./source/n/net-snmp/net-snmp-5.6.1.tar.xz
+-rwxr-xr-x   1 root root      5500 Mar 19 22:15 ./source/n/net-snmp/net-snmp.SlackBuild
+-rw-r--r--   1 root root       341 Dec  6 13:48 ./source/n/net-snmp/net-snmp.net-snmp-create-v3-user.etc.snmpd.conf.diff.gz
+-rw-r--r--   1 root root       895 Jun 19  2007 ./source/n/net-snmp/rc.snmpd
+-rw-r--r--   1 root root       910 Apr 16  2007 ./source/n/net-snmp/slack-desc
+-rw-r--r--   1 root root      4909 Apr 16  2007 ./source/n/net-snmp/snmpd.conf.gz
+drwxr-xr-x   2 root root      4096 Aug 12  2010 ./source/n/net-tools
+-rw-r--r--   1 root root      1334 Apr 29  2007 ./source/n/net-tools/ipmask.8
+-rw-r--r--   1 root root      2216 Aug 15  1994 ./source/n/net-tools/ipmask.c
+-rw-r--r--   1 root root    198520 Apr 15  2001 ./source/n/net-tools/net-tools-1.60.tar.bz2
+-rwxr-xr-x   1 root root      4374 Aug 12  2010 ./source/n/net-tools/net-tools.SlackBuild
+-rw-r--r--   1 root root       650 Mar 22  2001 ./source/n/net-tools/net-tools.diff.gz
+-rw-r--r--   1 root root       532 Aug 12  2010 ./source/n/net-tools/net-tools.mii-tool.string.diff.gz
+-rw-r--r--   1 root root       272 Aug 12  2010 ./source/n/net-tools/net-tools.struct.x25_address.gcc4.diff.gz
+-rw-r--r--   1 root root       299 Aug 12  2010 ./source/n/net-tools/net-tools.switch.default.gcc4.diff.gz
+-rw-r--r--   1 root root    214620 Mar 16  2009 ./source/n/net-tools/net-tools_1.60-23.diff.gz
+-rw-r--r--   1 root root       909 Apr 29  2007 ./source/n/net-tools/slack-desc
+drwxr-xr-x   2 root root      4096 Feb  9  2010 ./source/n/netatalk
+-rw-r--r--   1 root root         0 Feb  2  2003 ./source/n/netatalk/afppasswd
+-rw-r--r--   1 root root       334 May 31  2009 ./source/n/netatalk/doinst.sh.gz
+-rw-r--r--   1 root root    776632 Nov 11  2009 ./source/n/netatalk/netatalk-2.0.5.tar.xz
+-rwxr-xr-x   1 root root      4694 Feb  9  2010 ./source/n/netatalk/netatalk.SlackBuild
+-rw-r--r--   1 root root       320 May 31  2009 ./source/n/netatalk/netatalk.afpdconf.diff.gz
+-rw-r--r--   1 root root       292 Oct 28  2004 ./source/n/netatalk/netatalk.etc2ps.diff.gz
+-rw-r--r--   1 root root       486 May 31  2009 ./source/n/netatalk/netatalk.without_xfs.diff.gz
+-rw-r--r--   1 root root      1032 Feb  2  2003 ./source/n/netatalk/rc.atalk.new
+-rw-r--r--   1 root root      1040 Feb  2  2003 ./source/n/netatalk/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/n/netdate
+-rwxr-xr-x   1 root root      2421 Aug 12  2010 ./source/n/netdate/netdate.SlackBuild
+-rw-r--r--   1 root root      3766 Aug  4  1999 ./source/n/netdate/netdate.diff.gz
+-rw-r--r--   1 root root       164 Feb 26  2001 ./source/n/netdate/netdate.diff2.gz
+-rw-r--r--   1 root root      6755 Aug 15  1996 ./source/n/netdate/netdate.tar.gz
+-rw-r--r--   1 root root      1107 Apr 30  2007 ./source/n/netdate/slack-desc
+drwxr-xr-x   2 root root      4096 May 23  2009 ./source/n/netkit-bootparamd
+-rw-r--r--   1 root root     13934 Jul 31  2000 ./source/n/netkit-bootparamd/netkit-bootparamd-0.17.tar.gz
+-rwxr-xr-x   1 root root      2442 Aug 12  2010 ./source/n/netkit-bootparamd/netkit-bootparamd.SlackBuild
+-rw-r--r--   1 root root       986 Apr 30  2007 ./source/n/netkit-bootparamd/slack-desc
+drwxr-xr-x   2 root root      4096 May 23  2009 ./source/n/netkit-ftp
+-rw-r--r--   1 root root     53934 Jul 31  2000 ./source/n/netkit-ftp/netkit-ftp-0.17.tar.gz
+-rwxr-xr-x   1 root root      2281 Aug 12  2010 ./source/n/netkit-ftp/netkit-ftp.SlackBuild
+-rw-r--r--   1 root root       905 Apr 30  2007 ./source/n/netkit-ftp/slack-desc
+drwxr-xr-x   2 root root      4096 May 23  2009 ./source/n/netkit-ntalk
+-rw-r--r--   1 root root       842 Jun  8  2000 ./source/n/netkit-ntalk/netkit-ntalk-0.11.diff.gz
+-rw-r--r--   1 root root     30632 Jun  8  2000 ./source/n/netkit-ntalk/netkit-ntalk-0.11.tar.gz
+-rw-r--r--   1 root root       230 Feb 26  2001 ./source/n/netkit-ntalk/netkit-ntalk-0.17.diff.gz
+-rw-r--r--   1 root root     37396 Jul 31  2000 ./source/n/netkit-ntalk/netkit-ntalk-0.17.tar.gz
+-rwxr-xr-x   1 root root      3177 Aug 12  2010 ./source/n/netkit-ntalk/netkit-ntalk.SlackBuild
+-rw-r--r--   1 root root       551 Nov  4  2004 ./source/n/netkit-ntalk/ntalk-0.17-slackware-alt-talkd.patch.gz
+-rw-r--r--   1 root root       941 May  7  2007 ./source/n/netkit-ntalk/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/n/netkit-routed
+-rw-r--r--   1 root root       305 Feb 26  2001 ./source/n/netkit-routed/netkit-routed-0.17.diff.gz
+-rw-r--r--   1 root root     36435 Jul 31  2000 ./source/n/netkit-routed/netkit-routed-0.17.tar.gz
+-rwxr-xr-x   1 root root      2665 Aug 12  2010 ./source/n/netkit-routed/netkit-routed.SlackBuild
+-rw-r--r--   1 root root      8075 Dec 26  2000 ./source/n/netkit-routed/routed.18.candidate.final.patch.gz
+-rw-r--r--   1 root root      1100 Apr 29  2007 ./source/n/netkit-routed/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/n/netkit-rsh
+-rw-r--r--   1 root root     58268 Jul 31  2000 ./source/n/netkit-rsh/netkit-rsh-0.17.tar.gz
+-rwxr-xr-x   1 root root      3079 Aug 12  2010 ./source/n/netkit-rsh/netkit-rsh.SlackBuild
+-rw-r--r--   1 root root       884 Aug 12  2010 ./source/n/netkit-rsh/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/n/netkit-rusers
+-rw-r--r--   1 root root       221 Feb 26  2001 ./source/n/netkit-rusers/netkit-rusers-0.17.diff.gz
+-rw-r--r--   1 root root     22063 Jul 31  2000 ./source/n/netkit-rusers/netkit-rusers-0.17.tar.gz
+-rwxr-xr-x   1 root root      2648 Aug 12  2010 ./source/n/netkit-rusers/netkit-rusers.SlackBuild
+-rw-r--r--   1 root root      1160 Apr 30  2007 ./source/n/netkit-rusers/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/n/netkit-rwall
+-rw-r--r--   1 root root     11861 Jul 31  2000 ./source/n/netkit-rwall/netkit-rwall-0.17.tar.gz
+-rwxr-xr-x   1 root root      2468 Aug 12  2010 ./source/n/netkit-rwall/netkit-rwall.SlackBuild
+-rw-r--r--   1 root root       925 Apr 30  2007 ./source/n/netkit-rwall/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/n/netkit-rwho
+-rw-r--r--   1 root root       159 Feb 26  2001 ./source/n/netkit-rwho/netkit-rwho-0.17.diff.gz
+-rw-r--r--   1 root root     20610 Jul 31  2000 ./source/n/netkit-rwho/netkit-rwho-0.17.tar.gz
+-rwxr-xr-x   1 root root      2730 Aug 12  2010 ./source/n/netkit-rwho/netkit-rwho.SlackBuild
+-rw-r--r--   1 root root       225 Dec 14  2008 ./source/n/netkit-rwho/rwhod_getloadavg.diff.gz
+-rw-r--r--   1 root root      1153 Apr 30  2007 ./source/n/netkit-rwho/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/n/netkit-timed
+-rw-r--r--   1 root root       243 Jan  7  2001 ./source/n/netkit-timed/netkit-timed-0.17.diff.gz
+-rw-r--r--   1 root root     48655 Jul 31  2000 ./source/n/netkit-timed/netkit-timed-0.17.tar.gz
+-rwxr-xr-x   1 root root      2530 Aug 12  2010 ./source/n/netkit-timed/netkit-timed.SlackBuild
+-rw-r--r--   1 root root       870 Apr 30  2007 ./source/n/netkit-timed/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/n/netpipes
+-rw-r--r--   1 root root       365 Feb  7  1999 ./source/n/netpipes/_netpipes.tar.gz
+-rw-r--r--   1 root root     75276 Jan 30  1999 ./source/n/netpipes/netpipes-4.2-export.tar.gz
+-rwxr-xr-x   1 root root      2509 Aug 12  2010 ./source/n/netpipes/netpipes.SlackBuild
+-rw-r--r--   1 root root      1019 Feb 11  2008 ./source/n/netpipes/slack-desc
+drwxr-xr-x   2 root root      4096 May 23  2009 ./source/n/netwatch
+-rw-r--r--   1 root root    187936 Mar  4  2009 ./source/n/netwatch/netwatch-1.3.0-1.tar.gz
+-rwxr-xr-x   1 root root      3403 Aug 12  2010 ./source/n/netwatch/netwatch.SlackBuild
+-rw-r--r--   1 root root       491 Mar  4  2009 ./source/n/netwatch/netwatch.makefile.diff.gz
+-rw-r--r--   1 root root       233 Mar  4  2009 ./source/n/netwatch/netwatch.phonemyself.diff.gz
+-rw-r--r--   1 root root       765 Mar  4  2009 ./source/n/netwatch/slack-desc
+drwxr-xr-x   4 root root      4096 Dec  6  2008 ./source/n/network-scripts
+-rw-r--r--   1 root root      3038 May 20  2005 ./source/n/network-scripts/README.rc.inet1
+-rw-r--r--   1 root root       485 Apr 26  2007 ./source/n/network-scripts/doinst.sh.gz
+drwxr-xr-x   2 root root      4096 Aug  5  2009 ./source/n/network-scripts/manpages
+-rw-r--r--   1 root root      3299 Aug  5  2009 ./source/n/network-scripts/manpages/rc.inet1.8
+-rw-r--r--   1 root root      5525 Aug  5  2009 ./source/n/network-scripts/manpages/rc.inet1.conf.5
+-rwxr-xr-x   1 root root      2465 Jan 18  2010 ./source/n/network-scripts/network-scripts.SlackBuild
+drwxr-xr-x   2 root root      4096 Aug 26  2009 ./source/n/network-scripts/scripts
+-rw-r--r--   1 root root        21 Jan 28  1999 ./source/n/network-scripts/scripts/HOSTNAME
+-rw-r--r--   1 root root        27 Jul  7  1994 ./source/n/network-scripts/scripts/host.conf
+-rw-r--r--   1 root root       627 Aug 27  2003 ./source/n/network-scripts/scripts/hosts
+-rw-r--r--   1 root root       293 Nov 26  1993 ./source/n/network-scripts/scripts/hosts.allow
+-rw-r--r--   1 root root       296 Nov 26  1993 ./source/n/network-scripts/scripts/hosts.deny
+-rw-r--r--   1 root root       320 Feb  9  1998 ./source/n/network-scripts/scripts/hosts.equiv
+-rw-r--r--   1 root root     20016 Dec  7  2008 ./source/n/network-scripts/scripts/netconfig
+-rw-r--r--   1 root root       233 Oct  7  1999 ./source/n/network-scripts/scripts/networks
+-rw-r--r--   1 root root        24 Feb  9  1998 ./source/n/network-scripts/scripts/nntpserver
+-rw-r--r--   1 root root      5748 Feb 10  2002 ./source/n/network-scripts/scripts/protocols
+-rw-r--r--   1 root root      9600 Aug 26  2009 ./source/n/network-scripts/scripts/rc.inet1
+-rw-r--r--   1 root root      4752 Aug 25  2009 ./source/n/network-scripts/scripts/rc.inet1.conf
+-rw-r--r--   1 root root      4847 Sep 17  2007 ./source/n/network-scripts/scripts/rc.inet2
+-rw-r--r--   1 root root      2684 Dec  3  2008 ./source/n/network-scripts/scripts/rc.ip_forward
+-rw-r--r--   1 root root        19 Jan 28  1999 ./source/n/network-scripts/scripts/resolv.conf
+-rw-r--r--   1 root root       349 Feb 18  2003 ./source/n/network-scripts/scripts/setup.netconfig
+-rw-r--r--   1 root root      1049 Feb 11  2008 ./source/n/network-scripts/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/n/netwrite
+-rw-r--r--   1 root root       266 Feb 26  2001 ./source/n/netwrite/netwrite-0.17.diff.gz
+-rw-r--r--   1 root root     16110 Jul 31  2000 ./source/n/netwrite/netwrite-0.17.tar.gz
+-rwxr-xr-x   1 root root      2767 Aug 12  2010 ./source/n/netwrite/netwrite.SlackBuild
+-rw-r--r--   1 root root      1019 Apr 30  2007 ./source/n/netwrite/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/n/newspost
+-rw-r--r--   1 root root     61412 May  5  2003 ./source/n/newspost/newspost-2.1.1.tar.gz
+-rwxr-xr-x   1 root root      2414 Aug 12  2010 ./source/n/newspost/newspost.SlackBuild
+-rw-r--r--   1 root root       970 Jul 18  2003 ./source/n/newspost/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 21 23:41 ./source/n/nfs-utils
+-rw-r--r--   1 root root       651 Mar 21 23:41 ./source/n/nfs-utils/_nfs-utils.tar.gz
+-rw-r--r--   1 root root       515 Mar 21 23:39 ./source/n/nfs-utils/doinst.sh.gz
+-rw-r--r--   1 root root       248 Sep 28  2010 ./source/n/nfs-utils/nfs-utils-1.2.3.tar.sign
+-rw-r--r--   1 root root    533952 Sep 28  2010 ./source/n/nfs-utils/nfs-utils-1.2.3.tar.xz
+-rwxr-xr-x   1 root root      4813 Mar 21 23:41 ./source/n/nfs-utils/nfs-utils.SlackBuild
+-rw-r--r--   1 root root       255 Mar 31  2008 ./source/n/nfs-utils/nfs-utils.lwrap.needs.lnsl.diff.gz
+-rw-r--r--   1 root root      2449 Mar 18 20:44 ./source/n/nfs-utils/rc.nfsd
+-rw-r--r--   1 root root       782 Feb  2  2003 ./source/n/nfs-utils/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 10 03:46 ./source/n/nmap
+-rw-r--r--   1 root root  15235852 Feb 11 23:17 ./source/n/nmap/nmap-5.51.tar.xz
+-rwxr-xr-x   1 root root      4845 Mar 10 03:50 ./source/n/nmap/nmap.SlackBuild
+-rw-r--r--   1 root root       302 Apr 30  2009 ./source/n/nmap/nmap.ndiff.mandir.diff.gz
+-rw-r--r--   1 root root      1107 Mar 29  2002 ./source/n/nmap/slack-desc
+drwxr-xr-x   2 root root      4096 Nov 12  2009 ./source/n/nn
+-rw-r--r--   1 root root      4844 Jul  2  2001 ./source/n/nn/NNTP.gz
+-rw-r--r--   1 root root       315 Jun 27  2006 ./source/n/nn/doinst.sh.gz
+-rw-r--r--   1 root root       509 Nov 11  2009 ./source/n/nn/m-x86_64.h.gz
+-rw-r--r--   1 root root    352656 Nov 18  2005 ./source/n/nn/nn-6.7.3.tar.bz2
+-rwxr-xr-x   1 root root      4072 Nov 12  2009 ./source/n/nn/nn.SlackBuild
+-rw-r--r--   1 root root       287 Jun 27  2006 ./source/n/nn/nn.badnntphost.diff.gz
+-rw-r--r--   1 root root      1349 Mar 17  2009 ./source/n/nn/nn.destdir.diff.gz
+-rw-r--r--   1 root root      1281 Nov 11  2009 ./source/n/nn/nn.diff.gz
+-rw-r--r--   1 root root        53 Jun 27  2006 ./source/n/nn/nntpserver.gz
+-rw-r--r--   1 root root       897 Mar 29  2002 ./source/n/nn/slack-desc
+drwxr-xr-x   2 root root      4096 Jan 26 00:14 ./source/n/ntp
+-rw-r--r--   1 root root       314 May  7  2007 ./source/n/ntp/doinst.sh.gz
+-rw-r--r--   1 root root   2786388 Jan  4 02:38 ./source/n/ntp/ntp-4.2.6p3.tar.xz
+-rwxr-xr-x   1 root root      4676 Apr 22  2010 ./source/n/ntp/ntp.SlackBuild
+-rw-r--r--   1 root root      1867 Jan 26 00:14 ./source/n/ntp/ntp.conf
+-rw-r--r--   1 root root        22 Oct  7  1999 ./source/n/ntp/ntp.keys
+-rw-r--r--   1 root root       269 Apr 22  2010 ./source/n/ntp/ntp.nano.diff.gz
+-rw-r--r--   1 root root       804 Apr 22  2010 ./source/n/ntp/rc.ntpd
+-rw-r--r--   1 root root       986 Feb 27  2002 ./source/n/ntp/slack-desc
+drwxr-xr-x   2 root root      4096 Nov 25  2009 ./source/n/obex-data-server
+-rw-r--r--   1 root root       297 Nov 25  2009 ./source/n/obex-data-server/doinst.sh.gz
+-rw-r--r--   1 root root    148937 Nov 24  2009 ./source/n/obex-data-server/obex-data-server-0.4.5.tar.bz2
+-rwxr-xr-x   1 root root      3646 Nov  6 20:40 ./source/n/obex-data-server/obex-data-server.SlackBuild
+-rw-r--r--   1 root root       897 Nov 25  2009 ./source/n/obex-data-server/slack-desc
+drwxr-xr-x   2 root root      4096 Dec 13  2009 ./source/n/obexfs
+-rw-r--r--   1 root root     68953 Nov 24  2009 ./source/n/obexfs/obexfs-0.12.tar.bz2
+-rwxr-xr-x   1 root root      3359 May  2  2010 ./source/n/obexfs/obexfs.SlackBuild
+-rw-r--r--   1 root root       876 Nov 25  2009 ./source/n/obexfs/slack-desc
+drwxr-xr-x   2 root root      4096 Apr 17  2010 ./source/n/obexftp
+-rw-r--r--   1 root root    402552 Feb 17  2009 ./source/n/obexftp/obexftp-0.23.tar.bz2
+-rwxr-xr-x   1 root root      4793 Jan 26 19:11 ./source/n/obexftp/obexftp.SlackBuild
+-rw-r--r--   1 root root       281 Apr 19  2010 ./source/n/obexftp/ruby_rstringlen.diff.gz
+-rw-r--r--   1 root root       924 May 18  2007 ./source/n/obexftp/slack-desc
+drwxr-xr-x   2 root root      4096 Jan  1 23:03 ./source/n/openldap-client
+-rw-r--r--   1 root root       275 Jan 17  2006 ./source/n/openldap-client/doinst.sh.gz
+-rw-r--r--   1 root root   3413876 Jun 29  2010 ./source/n/openldap-client/openldap-2.4.23.tar.xz
+-rwxr-xr-x   1 root root      4558 Feb 12  2010 ./source/n/openldap-client/openldap-client.SlackBuild
+-rw-r--r--   1 root root      1027 Jan 18  2006 ./source/n/openldap-client/slack-desc
+drwxr-xr-x   2 root root      4096 Dec 28  2009 ./source/n/openobex
+-rw-r--r--   1 root root    290891 Feb  8  2009 ./source/n/openobex/openobex-1.5.tar.bz2
+-rwxr-xr-x   1 root root      3972 May  2  2010 ./source/n/openobex/openobex.SlackBuild
+-rw-r--r--   1 root root       997 May 12  2007 ./source/n/openobex/slack-desc
+drwxr-xr-x   2 root root      4096 Feb  4 16:30 ./source/n/openssh
+-rw-r--r--   1 root root       470 Sep 28  2006 ./source/n/openssh/doinst.sh.gz
+-rw-r--r--   1 root root   1113798 Feb  4 01:02 ./source/n/openssh/openssh-5.8p1.tar.gz
+-rw-r--r--   1 root root       188 Feb  4 01:02 ./source/n/openssh/openssh-5.8p1.tar.gz.asc
+-rwxr-xr-x   1 root root      5058 Feb  4 16:32 ./source/n/openssh/openssh.SlackBuild
+-rw-r--r--   1 root root      1600 Jan 27 21:54 ./source/n/openssh/rc.sshd
+-rw-r--r--   1 root root      1134 Mar  7  2002 ./source/n/openssh/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 22 19:17 ./source/n/openssl
+-rw-r--r--   1 root root      1737 Feb 10 19:03 ./source/n/openssl/certwatch.gz
+-rw-r--r--   1 root root       281 Jun 13  2007 ./source/n/openssl/doinst.sh-openssl-solibs.gz
+-rw-r--r--   1 root root       433 Mar 22 18:29 ./source/n/openssl/doinst.sh-openssl.gz
+-rw-r--r--   1 root root   2419180 Feb  8 17:21 ./source/n/openssl/openssl-0.9.8r.tar.xz
+-rwxr-xr-x   1 root root      6990 Mar 22 18:29 ./source/n/openssl/openssl.SlackBuild
+-rw-r--r--   1 root root       501 Jan 17  2006 ./source/n/openssl/openssl.optsx86.diff.gz
+-rw-r--r--   1 root root       283 Oct 13  2005 ./source/n/openssl/openssl.soname.diff.gz
+-rw-r--r--   1 root root      1019 Apr  6  2002 ./source/n/openssl/slack-desc.openssl
+-rw-r--r--   1 root root      1143 Mar 23  2002 ./source/n/openssl/slack-desc.openssl-solibs
+drwxr-xr-x   2 root root      4096 Mar 10 18:34 ./source/n/openvpn
+-rw-r--r--   1 root root      1375 Jun 10  2007 ./source/n/openvpn/README
+-rw-r--r--   1 root root    863726 Nov  9 13:51 ./source/n/openvpn/openvpn-2.1.4.tar.gz
+-rw-r--r--   1 root root       189 Nov  9 13:51 ./source/n/openvpn/openvpn-2.1.4.tar.gz.asc
+-rwxr-xr-x   1 root root      4693 Mar 29 20:07 ./source/n/openvpn/openvpn.SlackBuild
+-rw-r--r--   1 root root      6942 Jun 12  2007 ./source/n/openvpn/openvpn.conf.sample
+-rw-r--r--   1 root root       888 Jun 10  2007 ./source/n/openvpn/slack-desc
+drwxr-xr-x   3 root root      4096 Apr 14 19:39 ./source/n/php
+-rw-r--r--   1 root root       152 Dec 23 22:04 ./source/n/php/doinst.sh.gz
+-rwxr-xr-x   1 root root        60 Mar 17 18:06 ./source/n/php/fetch-php.sh
+-rw-r--r--   1 root root      1022 Oct  2  2009 ./source/n/php/mod_php.conf.example
+drwxr-xr-x   2 root root      4096 May  7  2008 ./source/n/php/pear
+-rw-r--r--   1 root root   8804248 Mar 17 12:30 ./source/n/php/php-5.3.6.tar.xz
+-rwxr-xr-x   1 root root      8640 Apr 14 19:40 ./source/n/php/php.SlackBuild
+-rw-r--r--   1 root root       555 Apr  2 03:43 ./source/n/php/php.ini-development.diff.gz
+-rw-r--r--   1 root root       321 Apr 14 19:39 ./source/n/php/php.session.save_path.diff.gz
+-rw-r--r--   1 root root       830 Dec  9  2005 ./source/n/php/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/n/pidentd
+-rw-r--r--   1 root root       296 Apr  5  2002 ./source/n/pidentd/doinst.sh.gz
+-rw-r--r--   1 root root    145505 Oct 18  2005 ./source/n/pidentd/pidentd-3.0.19.tar.gz
+-rw-r--r--   1 root root       185 Oct 18  2005 ./source/n/pidentd/pidentd-3.0.19.tar.gz.sig
+-rwxr-xr-x   1 root root      3112 Aug 12  2010 ./source/n/pidentd/pidentd.SlackBuild
+-rw-r--r--   1 root root       893 Jun 13  2004 ./source/n/pidentd/pidentd.conf.diff.gz
+-rw-r--r--   1 root root      1036 Apr  6  2002 ./source/n/pidentd/slack-desc
+drwxr-xr-x   2 root root      4096 Jan 14 03:01 ./source/n/pinentry
+-rw-r--r--   1 root root    348208 Dec 16 17:05 ./source/n/pinentry/pinentry-0.8.1.tar.xz
+-rwxr-xr-x   1 root root      4087 Mar  6  2010 ./source/n/pinentry/pinentry.SlackBuild
+-rw-r--r--   1 root root       781 Mar 15  2007 ./source/n/pinentry/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/n/popa3d
+-rw-r--r--   1 root root       164 Sep 30  2006 ./source/n/popa3d/doinst.sh.gz
+-rw-r--r--   1 root root     32848 May 23  2006 ./source/n/popa3d/popa3d-1.0.2.tar.gz
+-rw-r--r--   1 root root       331 May 23  2006 ./source/n/popa3d/popa3d-1.0.2.tar.gz.sign
+-rwxr-xr-x   1 root root      2795 Aug 12  2010 ./source/n/popa3d/popa3d.SlackBuild
+-rw-r--r--   1 root root       769 Mar 12  2006 ./source/n/popa3d/popa3d.diff.gz
+-rw-r--r--   1 root root      1002 Feb 21  2004 ./source/n/popa3d/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/n/portmap
+-rw-r--r--   1 root root       271 Sep 21  2006 ./source/n/portmap/doinst.sh.gz
+-rw-r--r--   1 root root     20092 May 11  2007 ./source/n/portmap/portmap-6.0.tar.bz2
+-rwxr-xr-x   1 root root      3151 Aug 12  2010 ./source/n/portmap/portmap.SlackBuild
+-rw-r--r--   1 root root       217 May 17  2007 ./source/n/portmap/portmap.lwrap.needs.lnsl.diff.gz
+-rw-r--r--   1 root root       610 May 17  2007 ./source/n/portmap/rc.rpc.gz
+-rw-r--r--   1 root root       987 Mar 22  2002 ./source/n/portmap/slack-desc
+drwxr-xr-x   2 root root      4096 Nov 18  2009 ./source/n/ppp
+-rw-r--r--   1 root root       324 Feb 23  2004 ./source/n/ppp/doinst.sh.gz
+-rw-r--r--   1 root root      3620 Sep 30  1999 ./source/n/ppp/options.new.gz
+-rw-r--r--   1 root root    556120 Nov 17  2009 ./source/n/ppp/ppp-2.4.5.tar.bz2
+-rwxr-xr-x   1 root root      5443 Feb 12  2010 ./source/n/ppp/ppp.SlackBuild
+-rw-r--r--   1 root root       401 Feb 23  2004 ./source/n/ppp/ppp.slack.diff.gz
+-rw-r--r--   1 root root       348 May 20  2002 ./source/n/ppp/pppsetup-1.98.backupfiles.diff.gz
+-rw-r--r--   1 root root      1303 May 20  2002 ./source/n/ppp/pppsetup-1.98.moredevs.diff.gz
+-rw-r--r--   1 root root       270 Oct 21  2000 ./source/n/ppp/pppsetup-1.98.pppoff.diff.gz
+-rw-r--r--   1 root root     11656 Jun 18  2000 ./source/n/ppp/pppsetup-1.98.slack.diff.gz
+-rw-r--r--   1 root root     78697 Mar  4  1998 ./source/n/ppp/pppsetup-1.98.tar.gz
+-rw-r--r--   1 root root       812 Jul 25  2005 ./source/n/ppp/radius.msdict.gz
+-rw-r--r--   1 root root    119071 Feb  3  2002 ./source/n/ppp/radiusclient-0.3.2.tar.bz2
+-rw-r--r--   1 root root       372 Jul 25  2005 ./source/n/ppp/realms.gz
+-rw-r--r--   1 root root       129 Jul 25  2005 ./source/n/ppp/servers.gz
+-rw-r--r--   1 root root       905 Mar  7  2002 ./source/n/ppp/slack-desc
+drwxr-xr-x   2 root root      4096 Aug 12  2010 ./source/n/procmail
+-rw-r--r--   1 root root       294 Aug 21  2001 ./source/n/procmail/_procmail.tar.gz
+-rw-r--r--   1 root root    226817 Sep 11  2001 ./source/n/procmail/procmail-3.22.tar.gz
+-rw-r--r--   1 root root       366 Sep 11  2001 ./source/n/procmail/procmail-3.22.tar.gz.sig
+-rwxr-xr-x   1 root root      2942 Aug 12  2010 ./source/n/procmail/procmail.SlackBuild
+-rw-r--r--   1 root root       277 Sep 19  2006 ./source/n/procmail/procmail.lfs.diff.gz
+-rw-r--r--   1 root root     13073 Dec 26  2002 ./source/n/procmail/procmail_3.22-5.diff.gz
+-rw-r--r--   1 root root      1146 Apr  6  2002 ./source/n/procmail/slack-desc
+drwxr-xr-x   3 root root      4096 Apr  5 03:56 ./source/n/proftpd
+-rw-r--r--   1 root root       306 Mar  6  2003 ./source/n/proftpd/doinst.sh.gz
+drwxr-xr-x   2 root root      4096 Feb 26  2001 ./source/n/proftpd/etc
+-rw-r--r--   1 root root       581 Feb 26  2001 ./source/n/proftpd/etc/ftpusers
+-rw-r--r--   1 root root      2046 Jul 29  2008 ./source/n/proftpd/etc/proftpd.conf
+-rw-r--r--   1 root root   3629540 Apr  1 18:02 ./source/n/proftpd/proftpd-1.3.3e.tar.xz
+-rwxr-xr-x   1 root root      4150 Apr  5 03:56 ./source/n/proftpd/proftpd.SlackBuild
+-rw-r--r--   1 root root       797 Sep 18  2004 ./source/n/proftpd/slack-desc
+drwxr-xr-x   2 root root      4096 Jan 23 07:45 ./source/n/pssh
+-rw-r--r--   1 root root     21340 Jan 21 22:55 ./source/n/pssh/pssh-2.2.tar.gz
+-rwxr-xr-x   1 root root      2959 Jan 23 07:55 ./source/n/pssh/pssh.SlackBuild
+-rw-r--r--   1 root root      1035 Jan 23 07:45 ./source/n/pssh/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/n/pth
+-rw-r--r--   1 root root    507518 Jan  5  2007 ./source/n/pth/pth-2.0.7.tar.bz2
+-rwxr-xr-x   1 root root      3847 Aug 12  2010 ./source/n/pth/pth.SlackBuild
+-rw-r--r--   1 root root       926 Mar 15  2007 ./source/n/pth/slack-desc
+drwxr-xr-x   2 root root      4096 Jan 25  2010 ./source/n/rdist
+-rw-r--r--   1 root root       360 Sep  9  2004 ./source/n/rdist/rdist-6.1.5-00.linux.diff.gz
+-rw-r--r--   1 root root       836 Sep  9  2004 ./source/n/rdist/rdist-6.1.5-01.links.diff.gz
+-rw-r--r--   1 root root       419 Sep  9  2004 ./source/n/rdist/rdist-6.1.5-03.hardlink.diff.gz
+-rw-r--r--   1 root root       929 Sep  9  2004 ./source/n/rdist/rdist-6.1.5-04.bison.diff.gz
+-rw-r--r--   1 root root       233 Sep  9  2004 ./source/n/rdist/rdist-6.1.5-05.varargs.diff.gz
+-rw-r--r--   1 root root       271 Sep  9  2004 ./source/n/rdist/rdist-6.1.5-06.maxargs.diff.gz
+-rw-r--r--   1 root root      1500 Sep  9  2004 ./source/n/rdist/rdist-6.1.5-07.lfs.diff.gz
+-rw-r--r--   1 root root     12347 Sep  9  2004 ./source/n/rdist/rdist-6.1.5-08.cleanup.diff.gz
+-rw-r--r--   1 root root       304 Sep  9  2004 ./source/n/rdist/rdist-6.1.5-09.svr4.diff.gz
+-rw-r--r--   1 root root       253 Sep  9  2004 ./source/n/rdist/rdist-6.1.5-10.ssh.diff.gz
+-rw-r--r--   1 root root       419 Sep  9  2004 ./source/n/rdist/rdist-6.1.5-11.mkstemp.diff.gz
+-rw-r--r--   1 root root       963 May  4  2005 ./source/n/rdist/rdist-6.1.5-12.stat64.diff.gz
+-rw-r--r--   1 root root       462 Aug  2  2006 ./source/n/rdist/rdist-6.1.5-14.fix-msgsndnotify-loop.diff.gz
+-rw-r--r--   1 root root    117861 Apr  3  2001 ./source/n/rdist/rdist-6.1.5.tar.gz
+-rw-r--r--   1 root root      5320 Sep  9  2004 ./source/n/rdist/rdist-eu-license.txt
+-rwxr-xr-x   1 root root      3705 Jan 25  2010 ./source/n/rdist/rdist.SlackBuild
+-rw-r--r--   1 root root       811 Feb 11  2008 ./source/n/rdist/slack-desc
+drwxr-xr-x   2 root root      4096 Dec 30 23:00 ./source/n/rfkill
+-rw-r--r--   1 root root      8052 Aug 15  2010 ./source/n/rfkill/rfkill-0.4.tar.bz2
+-rwxr-xr-x   1 root root      2827 Jan 22 04:34 ./source/n/rfkill/rfkill.SlackBuild
+-rw-r--r--   1 root root        99 Dec 30 23:00 ./source/n/rfkill/rfkill.url
+-rw-r--r--   1 root root       744 Aug 16  2010 ./source/n/rfkill/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/n/rp-pppoe
+-rw-r--r--   1 root root       307 Sep  3  2005 ./source/n/rp-pppoe/doinst.sh.gz
+-rw-r--r--   1 root root    215288 Jun 30  2008 ./source/n/rp-pppoe/rp-pppoe-3.10.tar.gz
+-rwxr-xr-x   1 root root      2872 Aug 12  2010 ./source/n/rp-pppoe/rp-pppoe.SlackBuild
+-rw-r--r--   1 root root       958 Apr 15  2002 ./source/n/rp-pppoe/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 27 00:52 ./source/n/rsync
+-rw-r--r--   1 root root    573284 Mar 26 21:37 ./source/n/rsync/rsync-3.0.8.tar.xz
+-rwxr-xr-x   1 root root      3075 Mar 27 00:53 ./source/n/rsync/rsync.SlackBuild
+-rw-r--r--   1 root root       950 Feb 11  2008 ./source/n/rsync/slack-desc
+drwxr-xr-x   2 root root      4096 May 16  2010 ./source/n/rt2860-firmware
+-rw-r--r--   1 root root      4479 May 14  2010 ./source/n/rt2860-firmware/RT2860_Firmware_V26.zip
+-rwxr-xr-x   1 root root      2009 May 16  2010 ./source/n/rt2860-firmware/rt2860-firmware.SlackBuild
+-rw-r--r--   1 root root       916 May 16  2010 ./source/n/rt2860-firmware/slack-desc
+drwxr-xr-x   2 root root      4096 May 16  2010 ./source/n/rt2870-firmware
+-rw-r--r--   1 root root      3570 May 14  2010 ./source/n/rt2870-firmware/RT2870_Firmware_V22.zip
+-rwxr-xr-x   1 root root      2009 May 16  2010 ./source/n/rt2870-firmware/rt2870-firmware.SlackBuild
+-rw-r--r--   1 root root       807 May 16  2010 ./source/n/rt2870-firmware/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/n/rt61-firmware
+-rw-r--r--   1 root root     13937 Mar 10  2008 ./source/n/rt61-firmware/RT61_Firmware_V1.2.zip
+-rwxr-xr-x   1 root root      1994 May 19  2009 ./source/n/rt61-firmware/rt61-firmware.SlackBuild
+-rw-r--r--   1 root root       737 Mar 10  2008 ./source/n/rt61-firmware/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/n/rt71w-firmware
+-rw-r--r--   1 root root      2679 Mar 10  2008 ./source/n/rt71w-firmware/RT71W_Firmware_V1.8.zip
+-rwxr-xr-x   1 root root      1997 May 19  2009 ./source/n/rt71w-firmware/rt71w-firmware.SlackBuild
+-rw-r--r--   1 root root       752 Mar 10  2008 ./source/n/rt71w-firmware/slack-desc
+drwxr-xr-x   2 root root      4096 Mar  8 18:51 ./source/n/samba
+-rw-r--r--   1 root root       374 Mar  7  2003 ./source/n/samba/doinst.sh.gz
+-rwxr-xr-x   1 root root      1548 Nov  3 21:28 ./source/n/samba/prune-samba.sh
+-rw-r--r--   1 root root       791 Oct  1  2003 ./source/n/samba/rc.samba
+-rw-r--r--   1 root root   5677528 Mar  8 18:51 ./source/n/samba/samba-3.5.8.tar.xz
+-rwxr-xr-x   1 root root      7420 Nov  3 22:30 ./source/n/samba/samba.SlackBuild
+-rw-r--r--   1 root root       985 Jun 18  2010 ./source/n/samba/slack-desc
+-rw-r--r--   1 root root      9671 Oct  3  2009 ./source/n/samba/smb.conf.default
+-rw-r--r--   1 root root      9683 Sep 30  2009 ./source/n/samba/smb.conf.default.orig
+-rw-r--r--   1 root root       528 Oct  3  2009 ./source/n/samba/smb.conf.diff.gz
+-rw-r--r--   1 root root       271 Nov  3 21:36 ./source/n/samba/talloc.pc
+drwxr-xr-x   2 root root      4096 Apr 22  2010 ./source/n/sendmail
+-rw-r--r--   1 root root       799 Apr 12  2008 ./source/n/sendmail/Build.gz
+-rwxr-xr-x   1 root root        63 Nov 26  2008 ./source/n/sendmail/SlackBuild
+-rwxr-xr-x   1 root root      5734 Apr 22  2010 ./source/n/sendmail/SlackBuild-sendmail
+-rwxr-xr-x   1 root root      2104 Apr 22  2010 ./source/n/sendmail/SlackBuild-sendmail-cf
+-rw-r--r--   1 root root      4793 Jun 26  2009 ./source/n/sendmail/_sendmail.tar.gz
+-rw-r--r--   1 root root       224 Feb 14  2002 ./source/n/sendmail/linux.uucp.mc
+-rw-r--r--   1 root root      2742 Apr 12  2008 ./source/n/sendmail/sendmail-slackware-tls-sasl.mc
+-rw-r--r--   1 root root      2510 Apr 12  2008 ./source/n/sendmail/sendmail-slackware-tls.mc
+-rw-r--r--   1 root root      1825 May  5  2003 ./source/n/sendmail/sendmail-slackware.mc
+-rw-r--r--   1 root root   2080472 Dec 29  2009 ./source/n/sendmail/sendmail.8.14.4.tar.gz
+-rw-r--r--   1 root root       152 Dec 29  2009 ./source/n/sendmail/sendmail.8.14.4.tar.gz.sig
+-rw-r--r--   1 root root       467 Apr 22  2010 ./source/n/sendmail/site.config.m4
+-rw-r--r--   1 root root       962 Jun  1  2002 ./source/n/sendmail/slack-desc.sendmail
+-rw-r--r--   1 root root      1050 Jun  1  2002 ./source/n/sendmail/slack-desc.sendmail-cf
+drwxr-xr-x   2 root root      4096 May 19  2010 ./source/n/slrn
+-rw-r--r--   1 root root       280 May 19  2010 ./source/n/slrn/doinst.sh.gz
+-rw-r--r--   1 root root       764 Nov 11  2008 ./source/n/slrn/slack-desc
+-rw-r--r--   1 root root   1040218 Oct 25  2008 ./source/n/slrn/slrn-0.9.9p1.tar.bz2
+-rwxr-xr-x   1 root root      3834 May 19  2010 ./source/n/slrn/slrn.SlackBuild
+drwxr-xr-x   2 root root      4096 May  3  2010 ./source/n/snownews
+-rw-r--r--   1 root root       874 May 17  2009 ./source/n/snownews/slack-desc
+-rw-r--r--   1 root root    167944 Sep 17  2009 ./source/n/snownews/snownews-1.5.12.tar.gz
+-rw-r--r--   1 root root       194 Sep 17  2009 ./source/n/snownews/snownews-1.5.12.tar.gz.asc
+-rwxr-xr-x   1 root root      3588 May  3  2010 ./source/n/snownews/snownews.SlackBuild
+drwxr-xr-x   2 root root      4096 Apr  5 06:13 ./source/n/stunnel
+-rw-r--r--   1 root root       265 Jan  9  2005 ./source/n/stunnel/doinst.sh.gz
+-rw-r--r--   1 root root       290 Aug 28  2003 ./source/n/stunnel/generate-stunnel-key.sh
+-rw-r--r--   1 root root       968 Aug 28  2003 ./source/n/stunnel/slack-desc
+-rw-r--r--   1 root root    541012 Feb  5 21:54 ./source/n/stunnel/stunnel-4.35.tar.gz
+-rw-r--r--   1 root root       190 Feb  5 21:54 ./source/n/stunnel/stunnel-4.35.tar.gz.asc
+-rwxr-xr-x   1 root root      4376 May  3  2010 ./source/n/stunnel/stunnel.SlackBuild
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/n/tcp_wrappers
+-rw-r--r--   1 root root      1112 Apr 29  2007 ./source/n/tcp_wrappers/slack-desc
+-rwxr-xr-x   1 root root      3279 Aug 12  2010 ./source/n/tcp_wrappers/tcp_wrappers.SlackBuild
+-rw-r--r--   1 root root    118844 Feb 22  2004 ./source/n/tcp_wrappers/tcp_wrappers_7.6.tar.gz
+drwxr-xr-x   2 root root      4096 Aug  5  2010 ./source/n/tcpdump
+-rw-r--r--   1 root root       908 Aug  5  2010 ./source/n/tcpdump/slack-desc
+-rw-r--r--   1 root root   1587392 Apr  6  2010 ./source/n/tcpdump/tcpdump-4.1.1.tar.gz
+-rw-r--r--   1 root root        72 Apr  6  2010 ./source/n/tcpdump/tcpdump-4.1.1.tar.gz.sig
+-rwxr-xr-x   1 root root      3088 Aug  5  2010 ./source/n/tcpdump/tcpdump.SlackBuild
+drwxr-xr-x   2 root root      4096 May 23  2009 ./source/n/telnet
+-rw-r--r--   1 root root       522 Aug  9  2001 ./source/n/telnet/netkit-telnet-0.17-ayt.patch.gz
+-rw-r--r--   1 root root       176 Feb 26  2001 ./source/n/telnet/netkit-telnet-0.17.diff.gz
+-rw-r--r--   1 root root    133749 Jul 31  2000 ./source/n/telnet/netkit-telnet-0.17.tar.gz
+-rw-r--r--   1 root root      1014 Apr 29  2007 ./source/n/telnet/slack-desc
+-rw-r--r--   1 root root      2605 Aug 28  2005 ./source/n/telnet/telnet-OpenBSD-014_telnet.diff.gz
+-rw-r--r--   1 root root       869 Mar 22  2002 ./source/n/telnet/telnet-OpenBSD-20020321.diff.gz
+-rw-r--r--   1 root root    104068 Mar 22  2002 ./source/n/telnet/telnet-OpenBSD-20020321.tar.gz
+-rwxr-xr-x   1 root root      2950 Aug 12  2010 ./source/n/telnet/telnet.SlackBuild
+drwxr-xr-x   2 root root      4096 May  3  2010 ./source/n/tftp-hpa
+-rw-r--r--   1 root root      1015 Apr 29  2007 ./source/n/tftp-hpa/slack-desc
+-rw-r--r--   1 root root     91829 Oct 20  2008 ./source/n/tftp-hpa/tftp-hpa-0.49.tar.bz2
+-rw-r--r--   1 root root       248 Oct 20  2008 ./source/n/tftp-hpa/tftp-hpa-0.49.tar.bz2.sign
+-rwxr-xr-x   1 root root      2781 May  3  2010 ./source/n/tftp-hpa/tftp-hpa.SlackBuild
+drwxr-xr-x   2 root root      4096 Aug 12  2010 ./source/n/tin
+-rw-r--r--   1 root root       944 Mar  6  2002 ./source/n/tin/slack-desc
+-rw-r--r--   1 root root   1437604 Feb  1  2007 ./source/n/tin/tin-1.8.3.tar.bz2
+-rw-r--r--   1 root root       286 Feb  1  2007 ./source/n/tin/tin-1.8.3.tar.bz2.sign
+-rwxr-xr-x   1 root root      3304 Feb 24 23:08 ./source/n/tin/tin.SlackBuild
+drwxr-xr-x   2 root root      4096 Mar 25 06:03 ./source/n/traceroute
+-rw-r--r--   1 root root       969 Mar 16  2002 ./source/n/traceroute/slack-desc
+-rw-r--r--   1 root root     65252 Dec 14 16:24 ./source/n/traceroute/traceroute-2.0.17.tar.gz
+-rwxr-xr-x   1 root root      2967 May 10  2010 ./source/n/traceroute/traceroute.SlackBuild
+drwxr-xr-x   2 root root      4096 Aug 12  2010 ./source/n/trn
+-rw-r--r--   1 root root      5599 Oct 26  1998 ./source/n/trn/_trn.tar.gz
+-rw-r--r--   1 root root      1697 Mar  7  2002 ./source/n/trn/config.sh.gz
+-rw-r--r--   1 root root      1716 Mar 16  2009 ./source/n/trn/config.x86_64.sh.gz
+-rw-r--r--   1 root root       744 Mar  6  2002 ./source/n/trn/slack-desc
+-rw-r--r--   1 root root    325115 Jan  9  1995 ./source/n/trn/trn-3.6.tar.gz
+-rwxr-xr-x   1 root root      2902 Aug 12  2010 ./source/n/trn/trn.SlackBuild
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/n/uucp
+-rw-r--r--   1 root root      1001 Jun  5  2003 ./source/n/uucp/_uucp.tar.gz
+-rw-r--r--   1 root root      1777 Jun  5  2003 ./source/n/uucp/policy.h.diff.gz
+-rw-r--r--   1 root root       737 Feb 27  2002 ./source/n/uucp/slack-desc
+-rw-r--r--   1 root root   1013234 Jun  4  2003 ./source/n/uucp/uucp-1.07.tar.gz
+-rwxr-xr-x   1 root root      2666 Aug 12  2010 ./source/n/uucp/uucp.SlackBuild
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/n/vlan
+-rw-r--r--   1 root root       888 Apr 29  2007 ./source/n/vlan/slack-desc
+-rw-r--r--   1 root root    132059 Oct 20  2005 ./source/n/vlan/vlan.1.9.tar.bz2
+-rwxr-xr-x   1 root root      2329 Aug 12  2010 ./source/n/vlan/vlan.SlackBuild
+drwxr-xr-x   2 root root      4096 Feb 17 17:11 ./source/n/vsftpd
+-rw-r--r--   1 root root       283 Feb 19  2009 ./source/n/vsftpd/doinst.sh.gz
+-rw-r--r--   1 root root       953 Sep  3  2004 ./source/n/vsftpd/slack-desc
+-rw-r--r--   1 root root    187043 Feb 15 22:38 ./source/n/vsftpd/vsftpd-2.3.4.tar.gz
+-rwxr-xr-x   1 root root      3422 Feb 17 17:11 ./source/n/vsftpd/vsftpd.SlackBuild
+-rw-r--r--   1 root root       198 Sep  3  2004 ./source/n/vsftpd/vsftpd.builddefs.diff.gz
+-rw-r--r--   1 root root       950 Oct 19  2009 ./source/n/vsftpd/vsftpd.conf.diff.gz
+-rw-r--r--   1 root root       115 Sep  3  2004 ./source/n/vsftpd/vsftpd.log.gz
+drwxr-xr-x   2 root root      4096 Dec  3  2009 ./source/n/wget
+-rw-r--r--   1 root root       264 Oct  1  2008 ./source/n/wget/doinst.sh.gz
+-rw-r--r--   1 root root       853 Mar 23  2002 ./source/n/wget/slack-desc
+-rw-r--r--   1 root root   1217348 Dec  2  2009 ./source/n/wget/wget-1.12.tar.xz
+-rwxr-xr-x   1 root root      3368 Feb  9  2010 ./source/n/wget/wget.SlackBuild
+drwxr-xr-x   2 root root      4096 Mar 25 21:01 ./source/n/whois
+-rw-r--r--   1 root root       841 Jun 13  2004 ./source/n/whois/slack-desc
+-rwxr-xr-x   1 root root      2518 Mar 25 21:01 ./source/n/whois/whois.SlackBuild
+-rw-r--r--   1 root root     81195 Feb  4 11:02 ./source/n/whois/whois_5.0.11.tar.gz
+drwxr-xr-x   3 root root      4096 Apr 27  2009 ./source/n/wireless-tools
+-rw-r--r--   1 root root       389 May 10  2007 ./source/n/wireless-tools/doinst.sh.gz
+drwxr-xr-x   2 root root      4096 Jan  3  2010 ./source/n/wireless-tools/scripts
+-rw-r--r--   1 root root     12835 Jan  3  2010 ./source/n/wireless-tools/scripts/rc.wireless
+-rw-r--r--   1 root root      7320 May  9  2007 ./source/n/wireless-tools/scripts/rc.wireless.conf
+-rw-r--r--   1 root root      1147 Apr 30  2006 ./source/n/wireless-tools/slack-desc
+-rw-r--r--   1 root root    294417 Sep 18  2007 ./source/n/wireless-tools/wireless_tools.29.tar.gz
+-rwxr-xr-x   1 root root      3755 Jan  3  2010 ./source/n/wireless-tools/wireless_tools.SlackBuild
+-rw-r--r--   1 root root       227 Jul 14  2005 ./source/n/wireless-tools/wireless_tools.nowhine.diff.gz
+-rw-r--r--   1 root root       287 Jul 25  2005 ./source/n/wireless-tools/wireless_tools.static.diff.gz
+drwxr-xr-x   2 root root      4096 Mar 14 04:33 ./source/n/wpa_supplicant
+-rw-r--r--   1 root root      2080 Aug  6  2005 ./source/n/wpa_supplicant/README.slackware
+-rw-r--r--   1 root root        96 Jun 16  2010 ./source/n/wpa_supplicant/fi.epitest.hostap.WPASupplicant.service
+-rw-r--r--   1 root root       897 Mar 14 04:32 ./source/n/wpa_supplicant/hostap-07.git-b80b5639935d37b95d00f86b57f2844a9c775f57.patch.gz
+-rw-r--r--   1 root root      1067 Feb 28  2008 ./source/n/wpa_supplicant/slack-desc
+-rw-r--r--   1 root root      5124 Apr 20  2009 ./source/n/wpa_supplicant/wpa_gui.png
+-rw-r--r--   1 root root   1123344 Sep  7  2010 ./source/n/wpa_supplicant/wpa_supplicant-0.7.3.tar.xz
+-rwxr-xr-x   1 root root      8200 Mar 14 04:34 ./source/n/wpa_supplicant/wpa_supplicant.SlackBuild
+-rw-r--r--   1 root root       560 Feb 24 23:03 ./source/n/wpa_supplicant/wpa_supplicant.defconfig
+drwxr-xr-x   2 root root      4096 Mar  8 18:32 ./source/n/yptools
+-rw-r--r--   1 root root       616 Nov 24  2000 ./source/n/yptools/nsswitch.conf-nis.gz
+-rw-r--r--   1 root root       922 May 31  2002 ./source/n/yptools/rc.yp.gz
+-rw-r--r--   1 root root       865 Mar  5  2002 ./source/n/yptools/slack-desc
+-rw-r--r--   1 root root    204228 Apr 21  2010 ./source/n/yptools/yp-tools-2.12.tar.bz2
+-rw-r--r--   1 root root       248 Apr 21  2010 ./source/n/yptools/yp-tools-2.12.tar.bz2.sign
+-rw-r--r--   1 root root    182276 Jul  7  2010 ./source/n/yptools/ypbind-mt-1.32.tar.bz2
+-rw-r--r--   1 root root       248 Jul  7  2010 ./source/n/yptools/ypbind-mt-1.32.tar.sign
+-rw-r--r--   1 root root    195528 Sep 24  2010 ./source/n/yptools/ypserv-2.24.tar.bz2
+-rw-r--r--   1 root root       248 Sep 24  2010 ./source/n/yptools/ypserv-2.24.tar.sign
+-rwxr-xr-x   1 root root      9334 Mar  8 18:33 ./source/n/yptools/yptools.SlackBuild
+drwxr-xr-x   2 root root      4096 May 23  2009 ./source/n/ytalk
+-rw-r--r--   1 root root       269 Feb  3  2006 ./source/n/ytalk/doinst.sh.gz
+-rw-r--r--   1 root root       745 Mar 25  2002 ./source/n/ytalk/slack-desc
+-rw-r--r--   1 root root    110912 Feb 13  2005 ./source/n/ytalk/ytalk-3.3.0.tar.bz2
+-rwxr-xr-x   1 root root      2844 Aug 12  2010 ./source/n/ytalk/ytalk.SlackBuild
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/n/zd1211-firmware
+-rw-r--r--   1 root root     39061 Oct  4  2007 ./source/n/zd1211-firmware/zd1211-firmware-1.4.tar.bz2
+-rwxr-xr-x   1 root root      2935 May 19  2009 ./source/n/zd1211-firmware/zd1211-firmware.SlackBuild
+drwxr-xr-x   5 root root      4096 May 17  2010 ./source/t
+drwxr-xr-x   3 root root      4096 May 17  2010 ./source/t/tetex
+-rw-r--r--   1 root root    103137 Oct  4  2005 ./source/t/tetex/jadetex-3.13.tar.gz
+-rwxr-xr-x   1 root root      2073 Oct 15  2008 ./source/t/tetex/jadetex.build
+drwxr-xr-x   2 root root      4096 Aug 28  2002 ./source/t/tetex/profile.d
+-rwxr-xr-x   1 root root       134 Apr 24  2000 ./source/t/tetex/profile.d/tetex.csh
+-rwxr-xr-x   1 root root       118 Apr 24  2000 ./source/t/tetex/profile.d/tetex.sh
+-rw-r--r--   1 root root       794 Aug 28  2002 ./source/t/tetex/slack-desc.tetex
+-rw-r--r--   1 root root       984 Feb 18  2005 ./source/t/tetex/slack-desc.tetex-doc
+-rw-r--r--   1 root root   7049516 Feb  6  2005 ./source/t/tetex/tetex-src-3.0.tar.xz
+-rw-r--r--   1 root root  75797944 Feb  6  2005 ./source/t/tetex/tetex-texmf-3.0.tar.xz
+-rw-r--r--   1 root root  47549400 Feb  6  2005 ./source/t/tetex/tetex-texmfsrc-3.0.tar.xz
+-rw-r--r--   1 root root      1759 Jan 17  2006 ./source/t/tetex/tetex.CVE-2005-3193.diff.gz
+-rwxr-xr-x   1 root root      9081 May 17  2010 ./source/t/tetex/tetex.SlackBuild
+-rw-r--r--   1 root root       517 Feb 19  2010 ./source/t/tetex/tetex.afm2tfm.getline.diff.gz
+-rw-r--r--   1 root root       303 Feb 10  2005 ./source/t/tetex/tetex.amstex.fmtutil.diff.gz
+-rw-r--r--   1 root root       633 May 16  2006 ./source/t/tetex/tetex.browsers.diff.gz
+-rw-r--r--   1 root root       389 Feb 19  2010 ./source/t/tetex/tetex.cpascal.getline.posix.2008.diff.gz
+-rw-r--r--   1 root root       504 Sep  9  2004 ./source/t/tetex/tetex.dvipdfm.mkstemp.diff.gz
+-rw-r--r--   1 root root       239 Jul 18  2005 ./source/t/tetex/tetex.etex.diff.gz
+-rw-r--r--   1 root root       375 Jun 28  2007 ./source/t/tetex/tetex.fontcachedirinhome.diff.gz
+-rw-r--r--   1 root root       478 May 17  2010 ./source/t/tetex/tetex.leet.diff.gz
+-rw-r--r--   1 root root       580 Feb 19  2010 ./source/t/tetex/tetex.png14.diff.gz
+-rw-r--r--   1 root root      2480 Feb 10  2005 ./source/t/tetex/tetex.scripts.mktemp.diff.gz
+-rw-r--r--   1 root root       724 Nov  9  2005 ./source/t/tetex/tetex.tmp.cleanup.diff.gz
+-rw-r--r--   1 root root       250 Feb 10  2005 ./source/t/tetex/tetex.var.fonts.diff.gz
+drwxr-xr-x   2 root root      4096 Feb 20  2010 ./source/t/transfig
+-rw-r--r--   1 root root       903 Feb 11  2008 ./source/t/transfig/slack-desc
+-rw-r--r--   1 root root       601 Feb 19  2007 ./source/t/transfig/transfig.3.2.4-gcc4.patch.gz
+-rw-r--r--   1 root root    326284 Dec 19  2002 ./source/t/transfig/transfig.3.2.4.tar.gz
+-rwxr-xr-x   1 root root      3669 Feb 20  2010 ./source/t/transfig/transfig.SlackBuild
+-rw-r--r--   1 root root       479 Feb 19  2007 ./source/t/transfig/transfig.diff.gz
+-rw-r--r--   1 root root       285 Feb 20  2010 ./source/t/transfig/transfig.png14.nodither.diff.gz
+drwxr-xr-x   2 root root      4096 Feb 20  2010 ./source/t/xfig
+-rw-r--r--   1 root root       886 Feb 11  2008 ./source/t/xfig/slack-desc
+-rw-r--r--   1 root root      3177 Feb  5  2004 ./source/t/xfig/xfig-3.2.4-mkstemp.diff.gz
+-rw-r--r--   1 root root       604 Feb  3  2004 ./source/t/xfig/xfig.3.2.3d-international-std-fonts.diff.gz
+-rw-r--r--   1 root root       149 Feb  3  2004 ./source/t/xfig/xfig.3.2.3d-xcolor.diff.gz
+-rw-r--r--   1 root root       545 Feb  3  2004 ./source/t/xfig/xfig.3.2.3d-xim.diff.gz
+-rw-r--r--   1 root root       210 Oct  6  2005 ./source/t/xfig/xfig.3.2.4-gcc4.diff.gz
+-rw-r--r--   1 root root      1386 Nov 16  2006 ./source/t/xfig/xfig.3.2.4-locale.diff.gz
+-rw-r--r--   1 root root       577 Mar 22  2004 ./source/t/xfig/xfig.3.2.4-null.diff.gz
+-rw-r--r--   1 root root      1695 Aug 25  2004 ./source/t/xfig/xfig.3.2.4-quiet.diff.gz
+-rw-r--r--   1 root root      1599 Oct  6  2005 ./source/t/xfig/xfig.3.2.4-urw-fonts.diff.gz
+-rw-r--r--   1 root root      5582 Apr 14  2008 ./source/t/xfig/xfig.3.2.4.diff.gz
+-rw-r--r--   1 root root   3666286 Aug 15  2006 ./source/t/xfig/xfig.3.2.4.full.tar.bz2
+-rwxr-xr-x   1 root root      4442 Feb 21  2010 ./source/t/xfig/xfig.SlackBuild
+-rw-r--r--   1 root root       288 Feb 19  2007 ./source/t/xfig/xfig.docs.location.diff.gz
+-rw-r--r--   1 root root       578 Feb 19  2007 ./source/t/xfig/xfig.fig.ad.diff.gz
+-rw-r--r--   1 root root       402 Aug 14  2006 ./source/t/xfig/xfig.no.pdf.ref.diff.gz
+-rw-r--r--   1 root root       286 Aug 15  2006 ./source/t/xfig/xfig.no.xfig_ref_en.pdf.diff.gz
+-rw-r--r--   1 root root       279 Feb 20  2010 ./source/t/xfig/xfig.png14.nodither.diff.gz
+drwxr-xr-x   8 root root      4096 Nov  4 00:44 ./source/tcl
+drwxr-xr-x   2 root root      4096 Aug 12  2010 ./source/tcl/expect
+-rw-r--r--   1 root root    547655 Aug 12  2010 ./source/tcl/expect/expect-5.44.1.15.tar.bz2
+-rwxr-xr-x   1 root root      4180 Aug 12  2010 ./source/tcl/expect/expect.SlackBuild
+-rw-r--r--   1 root root       221 May 11  2009 ./source/tcl/expect/expect.exp_main_tk.c.version.require.diff.gz
+-rw-r--r--   1 root root       990 Feb 11  2008 ./source/tcl/expect/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/tcl/hfsutils
+-rw-r--r--   1 root root    207697 Nov  2  1998 ./source/tcl/hfsutils/hfsutils-3.2.6.tar.gz
+-rw-r--r--   1 root root       286 Nov  2  1998 ./source/tcl/hfsutils/hfsutils-3.2.6.tar.gz.sign
+-rwxr-xr-x   1 root root      4765 Aug 12  2010 ./source/tcl/hfsutils/hfsutils.SlackBuild
+-rw-r--r--   1 root root       209 Jul 11  2005 ./source/tcl/hfsutils/hfsutils.errno.diff.gz
+-rw-r--r--   1 root root       928 Feb 11  2008 ./source/tcl/hfsutils/slack-desc
+drwxr-xr-x   2 root root      4096 Sep 12  2010 ./source/tcl/tcl
+-rw-r--r--   1 root root       713 Mar 23  2002 ./source/tcl/tcl/slack-desc
+-rwxr-xr-x   1 root root      3937 Sep 12  2010 ./source/tcl/tcl/tcl.SlackBuild
+-rw-r--r--   1 root root   2786880 Sep  8  2010 ./source/tcl/tcl/tcl8.5.9-src.tar.xz
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/tcl/tclx
+-rw-r--r--   1 root root      1010 Mar 24  2002 ./source/tcl/tclx/slack-desc
+-rw-r--r--   1 root root       353 Feb 21  2007 ./source/tcl/tclx/tclx-8.4.configure.diff.gz
+-rw-r--r--   1 root root       270 Feb 21  2007 ./source/tcl/tclx/tclx-8.4.gcc4.diff.gz
+-rwxr-xr-x   1 root root      3874 Dec  7  2009 ./source/tcl/tclx/tclx.SlackBuild
+-rw-r--r--   1 root root    313595 Feb  3  2006 ./source/tcl/tclx/tclx8.4.tar.bz2
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/tcl/tix
+-rw-r--r--   1 root root   1831503 Jul 28  2008 ./source/tcl/tix/Tix8.4.3.tar.gz
+-rw-r--r--   1 root root       860 Mar 24  2002 ./source/tcl/tix/slack-desc
+-rwxr-xr-x   1 root root      3333 Dec  7  2009 ./source/tcl/tix/tix.SlackBuild
+-rw-r--r--   1 root root       236 Nov 18  2006 ./source/tcl/tix/tix.soname.patch.gz
+-rw-r--r--   1 root root      1908 Sep  9  2008 ./source/tcl/tix/tix.tcl8.5.patch.gz
+drwxr-xr-x   2 root root      4096 Sep 12  2010 ./source/tcl/tk
+-rw-r--r--   1 root root       651 Mar 24  2002 ./source/tcl/tk/slack-desc
+-rwxr-xr-x   1 root root      3805 Sep 12  2010 ./source/tcl/tk/tk.SlackBuild
+-rw-r--r--   1 root root   2423452 Sep  8  2010 ./source/tcl/tk/tk8.5.9-src.tar.xz
+drwxr-xr-x  31 root root      4096 Apr 15 19:50 ./source/x
+drwxr-xr-x   2 root root      4096 Aug 12  2010 ./source/x/anthy
+-rw-r--r--   1 root root   3198760 Feb  7  2009 ./source/x/anthy/anthy-9100h.tar.xz
+-rwxr-xr-x   1 root root      4287 Aug 12  2010 ./source/x/anthy/anthy.SlackBuild
+-rw-r--r--   1 root root       714 Feb 13  2008 ./source/x/anthy/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 18 19:44 ./source/x/dejavu-fonts-ttf
+-rw-r--r--   1 root root   2238052 Feb 27 15:04 ./source/x/dejavu-fonts-ttf/dejavu-fonts-ttf-2.33.tar.xz
+-rwxr-xr-x   1 root root      2889 Oct 11  2010 ./source/x/dejavu-fonts-ttf/dejavu-fonts-ttf.SlackBuild
+-rw-r--r--   1 root root       167 Mar 24  2007 ./source/x/dejavu-fonts-ttf/doinst.sh.gz
+-rw-r--r--   1 root root      1003 Aug  3  2008 ./source/x/dejavu-fonts-ttf/slack-desc
+drwxr-xr-x   2 root root      4096 Dec  2  2009 ./source/x/fontconfig
+-rw-r--r--   1 root root       149 Dec  2  2009 ./source/x/fontconfig/doinst.sh.gz
+-rw-r--r--   1 root root    992040 Dec  2  2009 ./source/x/fontconfig/fontconfig-2.8.0.tar.xz
+-rwxr-xr-x   1 root root      5286 Feb 20  2010 ./source/x/fontconfig/fontconfig.SlackBuild
+-rw-r--r--   1 root root       546 Dec  2  2009 ./source/x/fontconfig/fontconfig.dejavu.diff.gz
+-rw-r--r--   1 root root       457 Dec  2  2009 ./source/x/fontconfig/fontconfig.font.dir.list.diff.gz
+-rw-r--r--   1 root root       657 Jan 25  2007 ./source/x/fontconfig/setup.05.fontconfig
+-rw-r--r--   1 root root       809 Jul 22  2006 ./source/x/fontconfig/slack-desc
+drwxr-xr-x   2 root root      4096 Nov  4 23:55 ./source/x/glew
+-rw-r--r--   1 root root    286588 Nov  3 20:55 ./source/x/glew/glew-1.5.7.tar.xz
+-rwxr-xr-x   1 root root      3009 Nov  4 23:55 ./source/x/glew/glew.SlackBuild
+-rw-r--r--   1 root root        81 Aug 12  2010 ./source/x/glew/glew.url
+-rw-r--r--   1 root root       840 Jul 23  2009 ./source/x/glew/slack-desc
+drwxr-xr-x   2 root root      4096 Dec 13 02:43 ./source/x/libdrm
+-rw-r--r--   1 root root    323600 Dec 10 16:01 ./source/x/libdrm/libdrm-2.4.23.tar.xz
+-rwxr-xr-x   1 root root      3666 Mar  3  2010 ./source/x/libdrm/libdrm.SlackBuild
+-rw-r--r--   1 root root       257 Feb 22  2010 ./source/x/libdrm/libdrm.uint32_t.diff.gz
+-rw-r--r--   1 root root       717 Feb  1  2007 ./source/x/libdrm/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 23 05:06 ./source/x/liberation-fonts-ttf
+-rw-r--r--   1 root root      1123 Mar 23 05:07 ./source/x/liberation-fonts-ttf/60-liberation.conf
+-rw-r--r--   1 root root       167 Mar 24  2007 ./source/x/liberation-fonts-ttf/doinst.sh.gz
+-rw-r--r--   1 root root    830232 Jul 21  2010 ./source/x/liberation-fonts-ttf/liberation-fonts-ttf-1.06.0.20100721.tar.xz
+-rwxr-xr-x   1 root root      2573 Mar 23 05:07 ./source/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild
+-rw-r--r--   1 root root      1042 Jan  2  2008 ./source/x/liberation-fonts-ttf/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 21 17:28 ./source/x/libhangul
+-rw-r--r--   1 root root   2133260 Jan  2 15:04 ./source/x/libhangul/libhangul-0.0.12.tar.xz
+-rwxr-xr-x   1 root root      4134 Mar 21 17:29 ./source/x/libhangul/libhangul.SlackBuild
+-rw-r--r--   1 root root       841 Feb 13  2008 ./source/x/libhangul/slack-desc
+drwxr-xr-x   2 root root      4096 Aug 12  2010 ./source/x/m17n-lib
+-rw-r--r--   1 root root    926952 Apr 19  2010 ./source/x/m17n-lib/m17n-db-1.6.1.tar.xz
+-rw-r--r--   1 root root    670440 Apr 26  2010 ./source/x/m17n-lib/m17n-lib-1.6.1.tar.xz
+-rwxr-xr-x   1 root root      5665 Aug 12  2010 ./source/x/m17n-lib/m17n-lib.SlackBuild
+-rw-r--r--   1 root root       875 Feb 13  2008 ./source/x/m17n-lib/slack-desc
+drwxr-xr-x   3 root root      4096 Mar 15 21:35 ./source/x/mesa
+-rw-r--r--   1 root root    200406 Mar  2 22:21 ./source/x/mesa/MesaGLUT-7.9.2.tar.bz2
+-rw-r--r--   1 root root   5648858 Mar  2 22:21 ./source/x/mesa/MesaLib-7.9.2.tar.bz2
+-rw-r--r--   1 root root       352 Mar 10  2008 ./source/x/mesa/README.GIT
+-rwxr-xr-x   1 root root       731 Feb  5 21:30 ./source/x/mesa/get-mesa.sh
+-rw-r--r--   1 root root   7168504 Oct  1  2010 ./source/x/mesa/mesa-demos-8.0.1.tar.xz
+-rwxr-xr-x   1 root root      5447 Mar 15 21:35 ./source/x/mesa/mesa.SlackBuild
+-rw-r--r--   1 root root        78 Oct  1  2010 ./source/x/mesa/mesa.url
+drwxr-xr-x   2 root root      4096 Jan 30 23:09 ./source/x/mesa/patches
+-rw-r--r--   1 root root       579 Oct 29 19:22 ./source/x/mesa/patches/i915_fragment_shader_disable.patch.gz
+-rw-r--r--   1 root root      1191 Jan 30 23:05 ./source/x/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch.gz
+-rw-r--r--   1 root root       790 Feb  5  2007 ./source/x/mesa/slack-desc
+drwxr-xr-x   3 root root      4096 Mar 11 04:25 ./source/x/radeon_ucode
+-rwxr-xr-x   1 root root      1913 Mar 11 04:25 ./source/x/radeon_ucode/radeon_ucode.SlackBuild
+-rw-r--r--   1 root root       830 Sep  3  2010 ./source/x/radeon_ucode/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 11 04:25 ./source/x/radeon_ucode/ucode-20110302
+-rw-r--r--   1 root root     24096 Jan  6 22:49 ./source/x/radeon_ucode/ucode-20110302/BARTS_mc.bin
+-rw-r--r--   1 root root      5504 Jan  6 22:49 ./source/x/radeon_ucode/ucode-20110302/BARTS_me.bin
+-rw-r--r--   1 root root      4480 Jan  6 22:49 ./source/x/radeon_ucode/ucode-20110302/BARTS_pfp.bin
+-rw-r--r--   1 root root      3072 Jan  6 22:49 ./source/x/radeon_ucode/ucode-20110302/BTC_rlc.bin
+-rw-r--r--   1 root root     24096 Jan  6 22:50 ./source/x/radeon_ucode/ucode-20110302/CAICOS_mc.bin
+-rw-r--r--   1 root root      5504 Jan  6 22:50 ./source/x/radeon_ucode/ucode-20110302/CAICOS_me.bin
+-rw-r--r--   1 root root      4480 Jan  6 22:50 ./source/x/radeon_ucode/ucode-20110302/CAICOS_pfp.bin
+-rw-r--r--   1 root root     24148 Mar  3 01:15 ./source/x/radeon_ucode/ucode-20110302/CAYMAN_mc.bin
+-rw-r--r--   1 root root      8704 Mar  3 01:15 ./source/x/radeon_ucode/ucode-20110302/CAYMAN_me.bin
+-rw-r--r--   1 root root      8704 Mar  3 01:15 ./source/x/radeon_ucode/ucode-20110302/CAYMAN_pfp.bin
+-rw-r--r--   1 root root      4096 Mar  3 01:15 ./source/x/radeon_ucode/ucode-20110302/CAYMAN_rlc.bin
+-rw-r--r--   1 root root      5504 Apr  8  2010 ./source/x/radeon_ucode/ucode-20110302/CEDAR_me.bin
+-rw-r--r--   1 root root      4480 Apr  8  2010 ./source/x/radeon_ucode/ucode-20110302/CEDAR_pfp.bin
+-rw-r--r--   1 root root      3072 Apr  8  2010 ./source/x/radeon_ucode/ucode-20110302/CEDAR_rlc.bin
+-rw-r--r--   1 root root      5504 Apr  8  2010 ./source/x/radeon_ucode/ucode-20110302/CYPRESS_me.bin
+-rw-r--r--   1 root root      4480 Apr  8  2010 ./source/x/radeon_ucode/ucode-20110302/CYPRESS_pfp.bin
+-rw-r--r--   1 root root      3072 Apr  8  2010 ./source/x/radeon_ucode/ucode-20110302/CYPRESS_rlc.bin
+-rw-r--r--   1 root root      5504 Apr  8  2010 ./source/x/radeon_ucode/ucode-20110302/JUNIPER_me.bin
+-rw-r--r--   1 root root      4480 Apr  8  2010 ./source/x/radeon_ucode/ucode-20110302/JUNIPER_pfp.bin
+-rw-r--r--   1 root root      3072 Apr  8  2010 ./source/x/radeon_ucode/ucode-20110302/JUNIPER_rlc.bin
+-rw-r--r--   1 root root      2943 Jan  6 22:51 ./source/x/radeon_ucode/ucode-20110302/LICENSE.radeon
+-rw-r--r--   1 root root      5504 Nov 22 23:26 ./source/x/radeon_ucode/ucode-20110302/PALM_me.bin
+-rw-r--r--   1 root root      4480 Nov 22 23:26 ./source/x/radeon_ucode/ucode-20110302/PALM_pfp.bin
+-rw-r--r--   1 root root      3072 Dec  9  2009 ./source/x/radeon_ucode/ucode-20110302/R600_rlc.bin
+-rw-r--r--   1 root root      4096 Dec  9  2009 ./source/x/radeon_ucode/ucode-20110302/R700_rlc.bin
+-rw-r--r--   1 root root      5504 Apr  8  2010 ./source/x/radeon_ucode/ucode-20110302/REDWOOD_me.bin
+-rw-r--r--   1 root root      4480 Apr  8  2010 ./source/x/radeon_ucode/ucode-20110302/REDWOOD_pfp.bin
+-rw-r--r--   1 root root      3072 Apr  8  2010 ./source/x/radeon_ucode/ucode-20110302/REDWOOD_rlc.bin
+-rw-r--r--   1 root root      3072 Nov 22 23:26 ./source/x/radeon_ucode/ucode-20110302/SUMO_rlc.bin
+-rw-r--r--   1 root root     24096 Jan  6 22:50 ./source/x/radeon_ucode/ucode-20110302/TURKS_mc.bin
+-rw-r--r--   1 root root      5504 Jan  6 22:50 ./source/x/radeon_ucode/ucode-20110302/TURKS_me.bin
+-rw-r--r--   1 root root      4480 Jan  6 22:50 ./source/x/radeon_ucode/ucode-20110302/TURKS_pfp.bin
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/x/sazanami-fonts-ttf
+-rw-r--r--   1 root root   8622710 Jun 29  2004 ./source/x/sazanami-fonts-ttf/sazanami-20040629.tar.bz2
+-rwxr-xr-x   1 root root      3319 May 19  2009 ./source/x/sazanami-fonts-ttf/sazanami-fonts-ttf.SlackBuild
+-rw-r--r--   1 root root       872 Feb 12  2008 ./source/x/sazanami-fonts-ttf/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 19 23:10 ./source/x/scim
+drwxr-xr-x   2 root root      4096 Jun 10  2009 ./source/x/scim-anthy
+-rw-r--r--   1 root root    649495 May 21  2007 ./source/x/scim-anthy/scim-anthy-1.2.4.tar.gz
+-rwxr-xr-x   1 root root      3585 Jun 10  2009 ./source/x/scim-anthy/scim-anthy.SlackBuild
+-rw-r--r--   1 root root       553 Jun 10  2009 ./source/x/scim-anthy/scim-anthy.gcc43.diff.gz
+-rw-r--r--   1 root root       969 Feb 13  2008 ./source/x/scim-anthy/slack-desc
+drwxr-xr-x   3 root root      4096 Mar 19 23:17 ./source/x/scim-bridge
+drwxr-xr-x   2 root root      4096 Mar 19 23:17 ./source/x/scim-bridge/patches
+-rw-r--r--   1 root root       326 Mar 19 23:05 ./source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-application.cpp.patch.gz
+-rw-r--r--   1 root root       876 Mar 19 23:05 ./source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.cpp.patch.gz
+-rw-r--r--   1 root root       407 Mar 19 23:05 ./source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.h.patch.gz
+-rw-r--r--   1 root root       648 Mar 19 23:05 ./source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent.cpp.patch.gz
+-rw-r--r--   1 root root       758 Mar 19 23:05 ./source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-gtk.c.patch.gz
+-rw-r--r--   1 root root       419 Mar 19 23:05 ./source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-qt.cpp.patch.gz
+-rw-r--r--   1 root root    508870 Apr 19  2009 ./source/x/scim-bridge/scim-bridge-0.4.16.tar.gz
+-rwxr-xr-x   1 root root      5290 Mar 19 23:19 ./source/x/scim-bridge/scim-bridge.SlackBuild
+-rw-r--r--   1 root root       967 Feb 13  2008 ./source/x/scim-bridge/slack-desc
+drwxr-xr-x   2 root root      4096 Jun 10  2009 ./source/x/scim-hangul
+-rw-r--r--   1 root root   1176577 Dec 30  2007 ./source/x/scim-hangul/scim-hangul-0.3.2.tar.gz
+-rwxr-xr-x   1 root root      3579 Jun 10  2009 ./source/x/scim-hangul/scim-hangul.SlackBuild
+-rw-r--r--   1 root root       278 Jun 10  2009 ./source/x/scim-hangul/scim-hangul.gcc43.diff.gz
+-rw-r--r--   1 root root      1073 Feb  4  2008 ./source/x/scim-hangul/slack-desc
+drwxr-xr-x   2 root root      4096 May 23  2009 ./source/x/scim-input-pad
+-rw-r--r--   1 root root    442263 Apr 19  2009 ./source/x/scim-input-pad/scim-input-pad-0.1.2.tar.bz2
+-rwxr-xr-x   1 root root      3330 Jun 10  2009 ./source/x/scim-input-pad/scim-input-pad.SlackBuild
+-rw-r--r--   1 root root       821 Apr 20  2009 ./source/x/scim-input-pad/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/x/scim-m17n
+-rw-r--r--   1 root root    355801 Apr 19  2009 ./source/x/scim-m17n/scim-m17n-0.2.3.tar.gz
+-rwxr-xr-x   1 root root      3833 May 19  2009 ./source/x/scim-m17n/scim-m17n.SlackBuild
+-rw-r--r--   1 root root       862 Feb 13  2008 ./source/x/scim-m17n/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/x/scim-pinyin
+-rw-r--r--   1 root root   5492055 Aug 12  2005 ./source/x/scim-pinyin/scim-pinyin-0.5.91.tar.gz
+-rwxr-xr-x   1 root root      3921 Jun 10  2009 ./source/x/scim-pinyin/scim-pinyin.SlackBuild
+-rw-r--r--   1 root root       448 Mar 16  2009 ./source/x/scim-pinyin/scim-pinyin.gcc43.diff.gz
+-rw-r--r--   1 root root       848 Feb 13  2008 ./source/x/scim-pinyin/slack-desc
+drwxr-xr-x   2 root root      4096 May 23  2009 ./source/x/scim-tables
+-rw-r--r--   1 root root   7256429 Jan 25  2009 ./source/x/scim-tables/scim-tables-0.5.9.tar.gz
+-rwxr-xr-x   1 root root      3688 Jun 10  2009 ./source/x/scim-tables/scim-tables.SlackBuild
+-rw-r--r--   1 root root       751 Feb 13  2008 ./source/x/scim-tables/slack-desc
+-rw-r--r--   1 root root       222 Mar 19 23:05 ./source/x/scim/scim-1.4.9-fix-ltdl.cpp.patch.gz
+-rw-r--r--   1 root root   1512444 Apr 19  2009 ./source/x/scim/scim-1.4.9.tar.xz
+-rw-r--r--   1 root root      1411 Oct 28  2007 ./source/x/scim/scim-setup.desktop
+-rwxr-xr-x   1 root root      9293 Mar 19 23:11 ./source/x/scim/scim.SlackBuild
+-rw-r--r--   1 root root       423 Mar 31  2008 ./source/x/scim/scim.desktop
+-rw-r--r--   1 root root       785 Feb 16  2008 ./source/x/scim/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/x/sinhala_lklug-font-ttf
+-rwxr-xr-x   1 root root      3389 May 19  2009 ./source/x/sinhala_lklug-font-ttf/sinhala_lklug-font-ttf.SlackBuild
+-rw-r--r--   1 root root    300476 Sep 29  2006 ./source/x/sinhala_lklug-font-ttf/sinhala_lklug.ttf
+-rw-r--r--   1 root root       946 Feb 12  2008 ./source/x/sinhala_lklug-font-ttf/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/x/tibmachuni-font-ttf
+-rw-r--r--   1 root root   1676199 Mar  2  2010 ./source/x/tibmachuni-font-ttf/TibetanMachineUnicodeFont.zip
+-rw-r--r--   1 root root      1031 Feb 16  2008 ./source/x/tibmachuni-font-ttf/slack-desc
+-rwxr-xr-x   1 root root      3833 Nov  5 00:29 ./source/x/tibmachuni-font-ttf/tibmachuni-font-ttf.SlackBuild
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/x/ttf-indic-fonts
+-rw-r--r--   1 root root      6168 May 14  2005 ./source/x/ttf-indic-fonts/COPYING.bz2
+-rw-r--r--   1 root root     33862 Jan 30  2006 ./source/x/ttf-indic-fonts/Samyak_Malayalam.ttf.bz2
+-rw-r--r--   1 root root       122 Sep 21  2006 ./source/x/ttf-indic-fonts/Samyak_Malayalam.url
+-rw-r--r--   1 root root       170 Apr 22  2007 ./source/x/ttf-indic-fonts/doinst.sh.gz
+-rw-r--r--   1 root root      1087 Sep 21  2006 ./source/x/ttf-indic-fonts/slack-desc
+-rw-r--r--   1 root root   2925975 Dec 26  2006 ./source/x/ttf-indic-fonts/ttf-indic-fonts-0.4.7.4.tar.bz2
+-rwxr-xr-x   1 root root      3351 May 19  2009 ./source/x/ttf-indic-fonts/ttf-indic-fonts.SlackBuild
+-rw-r--r--   1 root root       757 Sep 21  2006 ./source/x/ttf-indic-fonts/ttf-indic-fonts.copyright.diff.gz
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/x/wqy-zenhei-font-ttf
+-rw-r--r--   1 root root      1156 Feb 20  2008 ./source/x/wqy-zenhei-font-ttf/slack-desc
+-rw-r--r--   1 root root   6649596 Apr 20  2009 ./source/x/wqy-zenhei-font-ttf/wqy-zenhei-0.8.38-1.tar.bz2
+-rwxr-xr-x   1 root root      3953 May 19  2009 ./source/x/wqy-zenhei-font-ttf/wqy-zenhei-font-ttf.SlackBuild
+drwxr-xr-x  10 root root      4096 Jan  8 18:07 ./source/x/x11
+drwxr-xr-x   4 root root      4096 Mar 14 03:32 ./source/x/x11-skel
+-rw-r--r--   1 root root       576 Mar 14 03:32 ./source/x/x11-skel/doinst.sh.gz
+drwxr-xr-x   2 root root      4096 Feb 14  2007 ./source/x/x11-skel/manpages
+-rw-r--r--   1 root root      1060 May 31  2002 ./source/x/x11-skel/manpages/xwmconfig.1
+drwxr-xr-x   2 root root      4096 Feb 14  2007 ./source/x/x11-skel/scripts
+-rw-r--r--   1 root root       358 Aug 10  2006 ./source/x/x11-skel/scripts/setup.xwmconfig
+-rw-r--r--   1 root root     17100 Feb 12  2007 ./source/x/x11-skel/scripts/xorg.conf-fbdev
+-rw-r--r--   1 root root     15858 Feb 12  2007 ./source/x/x11-skel/scripts/xorg.conf-vesa
+-rw-r--r--   1 root root     12785 Aug 21  2006 ./source/x/x11-skel/scripts/xorgsetup
+-rw-r--r--   1 root root      7460 Mar  9  2009 ./source/x/x11-skel/scripts/xwmconfig
+-rw-r--r--   1 root root      1066 May 28  2007 ./source/x/x11-skel/slack-desc
+-rwxr-xr-x   1 root root      2590 Mar 14 13:03 ./source/x/x11-skel/x11-skel.SlackBuild
+-rw-r--r--   1 root root       183 May 30  2009 ./source/x/x11/arch.use.flags
+drwxr-xr-x   2 root root      4096 Apr 16 03:30 ./source/x/x11/build
+-rw-r--r--   1 root root         2 Jun  3  2009 ./source/x/x11/build/gccmakedep
+-rw-r--r--   1 root root         2 Apr 16 03:30 ./source/x/x11/build/libX11
+-rw-r--r--   1 root root         2 Mar  4 22:05 ./source/x/x11/build/xcompmgr
+-rw-r--r--   1 root root         2 Jun  8  2010 ./source/x/x11/build/xf86-input-acecad
+-rw-r--r--   1 root root         2 Jun  8  2010 ./source/x/x11/build/xf86-input-penmount
+-rw-r--r--   1 root root         2 Jun  8  2010 ./source/x/x11/build/xf86-video-cirrus
+-rw-r--r--   1 root root         2 Jun  8  2010 ./source/x/x11/build/xf86-video-i740
+-rw-r--r--   1 root root         2 Jun  8  2010 ./source/x/x11/build/xf86-video-mach64
+-rw-r--r--   1 root root         2 Jun  8  2010 ./source/x/x11/build/xf86-video-openchrome
+-rw-r--r--   1 root root         2 Jun  8  2010 ./source/x/x11/build/xf86-video-r128
+-rw-r--r--   1 root root         2 Mar 14 04:00 ./source/x/x11/build/xf86-video-radeonhd
+-rw-r--r--   1 root root         2 Jun  8  2010 ./source/x/x11/build/xf86-video-s3
+-rw-r--r--   1 root root         2 Jun  8  2010 ./source/x/x11/build/xf86-video-s3virge
+-rw-r--r--   1 root root         2 Jun  8  2010 ./source/x/x11/build/xf86-video-tdfx
+-rw-r--r--   1 root root         2 Jun  8  2010 ./source/x/x11/build/xf86-video-tga
+-rw-r--r--   1 root root         2 Jun  8  2010 ./source/x/x11/build/xf86-video-v4l
+-rw-r--r--   1 root root         2 Jun  8  2010 ./source/x/x11/build/xf86-video-vesa
+drwxr-xr-x   2 root root      4096 Dec 13 03:06 ./source/x/x11/configure
+-rw-r--r--   1 root root       391 Apr  2 21:17 ./source/x/x11/configure/compiz
+-rw-r--r--   1 root root       317 Nov  5 06:13 ./source/x/x11/configure/configure
+-rw-r--r--   1 root root       341 Nov 13 18:36 ./source/x/x11/configure/font-bh-ttf
+-rw-r--r--   1 root root       297 Oct 20  2009 ./source/x/x11/configure/font-util
+-rw-r--r--   1 root root       320 Nov 13 20:17 ./source/x/x11/configure/gccmakedep
+-rw-r--r--   1 root root       317 Dec  4 23:25 ./source/x/x11/configure/libX11
+-rw-r--r--   1 root root       320 Nov 13 19:40 ./source/x/x11/configure/libXp
+-rw-r--r--   1 root root       304 Oct 14  2008 ./source/x/x11/configure/libXt
+-rw-r--r--   1 root root       384 Jul 10  2009 ./source/x/x11/configure/pixman
+-rw-r--r--   1 root root       276 Jul 24  2009 ./source/x/x11/configure/setxkbmap
+-rw-r--r--   1 root root       421 May  2  2010 ./source/x/x11/configure/xf86-input-vmmouse
+-rw-r--r--   1 root root       629 Dec 19 06:51 ./source/x/x11/configure/xf86-video-ati
+-rw-r--r--   1 root root       262 Dec 13 03:07 ./source/x/x11/configure/xf86-video-nouveau
+-rw-r--r--   1 root root       282 Aug  1  2009 ./source/x/x11/configure/xfs
+-rw-r--r--   1 root root       276 Jul 24  2009 ./source/x/x11/configure/xkbcomp
+-rw-r--r--   1 root root       345 Oct 14  2008 ./source/x/x11/configure/xkeyboard-config
+-rw-r--r--   1 root root       377 Dec 19 06:52 ./source/x/x11/configure/xorg-docs
+-rw-r--r--   1 root root      1410 Feb  9 02:41 ./source/x/x11/configure/xorg-server
+drwxr-xr-x   2 root root      4096 Aug  1  2009 ./source/x/x11/doinst.sh
+-rw-r--r--   1 root root       237 Mar 24  2007 ./source/x/x11/doinst.sh/font-adobe-100dpi
+-rw-r--r--   1 root root       236 Mar 24  2007 ./source/x/x11/doinst.sh/font-adobe-75dpi
+-rw-r--r--   1 root root       237 Mar 24  2007 ./source/x/x11/doinst.sh/font-adobe-utopia-100dpi
+-rw-r--r--   1 root root       236 Mar 24  2007 ./source/x/x11/doinst.sh/font-adobe-utopia-75dpi
+-rw-r--r--   1 root root       236 Mar 24  2007 ./source/x/x11/doinst.sh/font-adobe-utopia-type1
+-rw-r--r--   1 root root       301 Mar 24  2007 ./source/x/x11/doinst.sh/font-arabic-misc
+-rw-r--r--   1 root root       237 Mar 24  2007 ./source/x/x11/doinst.sh/font-bh-100dpi
+-rw-r--r--   1 root root       236 Mar 24  2007 ./source/x/x11/doinst.sh/font-bh-75dpi
+-rw-r--r--   1 root root       237 Mar 24  2007 ./source/x/x11/doinst.sh/font-bh-lucidatypewriter-100dpi
+-rw-r--r--   1 root root       236 Mar 24  2007 ./source/x/x11/doinst.sh/font-bh-lucidatypewriter-75dpi
+-rw-r--r--   1 root root       234 Mar 24  2007 ./source/x/x11/doinst.sh/font-bh-ttf
+-rw-r--r--   1 root root       236 Mar 24  2007 ./source/x/x11/doinst.sh/font-bh-type1
+-rw-r--r--   1 root root       237 Mar 24  2007 ./source/x/x11/doinst.sh/font-bitstream-100dpi
+-rw-r--r--   1 root root       236 Mar 24  2007 ./source/x/x11/doinst.sh/font-bitstream-75dpi
+-rw-r--r--   1 root root       237 Mar 24  2007 ./source/x/x11/doinst.sh/font-bitstream-speedo
+-rw-r--r--   1 root root       236 Mar 24  2007 ./source/x/x11/doinst.sh/font-bitstream-type1
+-rw-r--r--   1 root root       239 Mar 24  2007 ./source/x/x11/doinst.sh/font-cronyx-cyrillic
+-rw-r--r--   1 root root       301 Mar 24  2007 ./source/x/x11/doinst.sh/font-cursor-misc
+-rw-r--r--   1 root root       301 Mar 24  2007 ./source/x/x11/doinst.sh/font-daewoo-misc
+-rw-r--r--   1 root root       301 Mar 24  2007 ./source/x/x11/doinst.sh/font-dec-misc
+-rw-r--r--   1 root root       236 Mar 24  2007 ./source/x/x11/doinst.sh/font-ibm-type1
+-rw-r--r--   1 root root       301 Mar 24  2007 ./source/x/x11/doinst.sh/font-isas-misc
+-rw-r--r--   1 root root       301 Mar 24  2007 ./source/x/x11/doinst.sh/font-jis-misc
+-rw-r--r--   1 root root       301 Mar 24  2007 ./source/x/x11/doinst.sh/font-micro-misc
+-rw-r--r--   1 root root       239 Mar 24  2007 ./source/x/x11/doinst.sh/font-misc-cyrillic
+-rw-r--r--   1 root root       300 Mar 24  2007 ./source/x/x11/doinst.sh/font-misc-ethiopic
+-rw-r--r--   1 root root       234 Mar 24  2007 ./source/x/x11/doinst.sh/font-misc-meltho
+-rw-r--r--   1 root root       301 Mar 24  2007 ./source/x/x11/doinst.sh/font-misc-misc
+-rw-r--r--   1 root root       301 Mar 24  2007 ./source/x/x11/doinst.sh/font-mutt-misc
+-rw-r--r--   1 root root       301 Mar 24  2007 ./source/x/x11/doinst.sh/font-schumacher-misc
+-rw-r--r--   1 root root       239 Mar 24  2007 ./source/x/x11/doinst.sh/font-screen-cyrillic
+-rw-r--r--   1 root root       301 Mar 24  2007 ./source/x/x11/doinst.sh/font-sony-misc
+-rw-r--r--   1 root root       301 Mar 24  2007 ./source/x/x11/doinst.sh/font-sun-misc
+-rw-r--r--   1 root root       239 Mar 24  2007 ./source/x/x11/doinst.sh/font-winitzki-cyrillic
+-rw-r--r--   1 root root       236 Mar 24  2007 ./source/x/x11/doinst.sh/font-xfree86-type1
+-rw-r--r--   1 root root       447 Feb 14  2007 ./source/x/x11/doinst.sh/xdm
+-rw-r--r--   1 root root       377 Aug  1  2009 ./source/x/x11/doinst.sh/xfs
+-rw-r--r--   1 root root       176 Jul  1  2007 ./source/x/x11/doinst.sh/xinit
+-rw-r--r--   1 root root       247 Jun  9  2007 ./source/x/x11/doinst.sh/xkeyboard-config
+-rw-r--r--   1 root root       212 Feb 13  2007 ./source/x/x11/doinst.sh/xorg-cf-files
+drwxr-xr-x   2 root root      4096 May 30  2009 ./source/x/x11/makepkg
+-rw-r--r--   1 root root      2198 Jun  3  2009 ./source/x/x11/makepkg/xorg-server
+-rw-r--r--   1 root root      3645 Aug 31  2010 ./source/x/x11/modularize
+-rw-r--r--   1 root root      1287 Mar  9 04:43 ./source/x/x11/noarch
+-rw-r--r--   1 root root       726 Jun  8  2009 ./source/x/x11/package-blacklist
+drwxr-xr-x   4 root root      4096 Apr 16 03:29 ./source/x/x11/patch
+-rw-r--r--   1 root root       326 Nov 13 18:39 ./source/x/x11/patch/README
+drwxr-xr-x   2 root root      4096 Mar  3 03:14 ./source/x/x11/patch/xcompmgr
+-rw-r--r--   1 root root       154 Mar  3 03:15 ./source/x/x11/patch/xcompmgr.patch
+-rw-r--r--   1 root root       464 Mar  3 03:11 ./source/x/x11/patch/xcompmgr/xcompmgr-follow-icccm-spec.diff.gz
+drwxr-xr-x   2 root root      4096 Mar 18 03:42 ./source/x/x11/patch/xorg-server
+-rw-r--r--   1 root root       446 Mar 18 03:42 ./source/x/x11/patch/xorg-server.patch
+-rw-r--r--   1 root root       245 May 30  2009 ./source/x/x11/patch/xorg-server/x11.startwithblackscreen.diff.gz
+-rw-r--r--   1 root root       221 Apr 29  2010 ./source/x/x11/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff.gz
+-rw-r--r--   1 root root       266 Nov 18 22:57 ./source/x/x11/patch/xorg-server/xorg-server.try_nouveau.diff.gz
+drwxr-xr-x   9 root root      4096 Apr 16 03:29 ./source/x/x11/post-install
+-rw-r--r--   1 root root       357 Feb 16  2007 ./source/x/x11/post-install/beforelight.post-install
+-rw-r--r--   1 root root       275 Feb 14  2007 ./source/x/x11/post-install/encodings.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-adobe-100dpi.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-adobe-75dpi.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-adobe-utopia-100dpi.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-adobe-utopia-75dpi.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-adobe-utopia-type1.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-alias.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-arabic-misc.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-bh-100dpi.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-bh-75dpi.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-bh-lucidatypewriter-100dpi.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-bh-lucidatypewriter-75dpi.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-bh-ttf.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-bh-type1.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-bitstream-100dpi.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-bitstream-75dpi.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-bitstream-speedo.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-bitstream-type1.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-cronyx-cyrillic.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-cursor-misc.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-daewoo-misc.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-dec-misc.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-ibm-type1.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-isas-misc.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-jis-misc.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-micro-misc.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-misc-cyrillic.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-misc-ethiopic.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-misc-meltho.post-install
+-rw-r--r--   1 root root       664 Feb  1  2008 ./source/x/x11/post-install/font-misc-misc.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-mutt-misc.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-schumacher-misc.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-screen-cyrillic.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-sony-misc.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-sun-misc.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-util.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-winitzki-cyrillic.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/font-xfree86-type1.post-install
+-rw-r--r--   1 root root       110 Feb 13  2007 ./source/x/x11/post-install/lbxproxy.post-install
+-rw-r--r--   1 root root        58 Nov  5 06:08 ./source/x/x11/post-install/libSM.post-install
+drwxr-xr-x   2 root root      4096 Apr 16 03:28 ./source/x/x11/post-install/libX11
+-rw-r--r--   1 root root       102 Apr 16 03:30 ./source/x/x11/post-install/libX11.post-install
+-rw-r--r--   1 root root      3050 Feb 22  2010 ./source/x/x11/post-install/libX11/XKeysymDB.gz
+-rw-r--r--   1 root root      1765 Jun  8  2009 ./source/x/x11/post-install/libXaw.post-install
+-rw-r--r--   1 root root       183 Feb 14  2007 ./source/x/x11/post-install/libpthread-stubs.post-install
+-rw-r--r--   1 root root      2320 Jun  3  2009 ./source/x/x11/post-install/libxcb.post-install
+drwxr-xr-x   2 root root      4096 Mar 24  2007 ./source/x/x11/post-install/mkfontdir
+-rw-r--r--   1 root root       221 Mar 24  2007 ./source/x/x11/post-install/mkfontdir.post-install
+-rw-r--r--   1 root root      1012 Mar 23  2007 ./source/x/x11/post-install/mkfontdir/setup.04.mkfontdir
+-rw-r--r--   1 root root       286 Apr 26  2008 ./source/x/x11/post-install/pixman.post-install
+-rw-r--r--   1 root root       112 Feb 13  2007 ./source/x/x11/post-install/proxymngr.post-install
+-rw-r--r--   1 root root       106 Feb 13  2007 ./source/x/x11/post-install/rstart.post-install
+drwxr-xr-x   2 root root      4096 Feb 22  2007 ./source/x/x11/post-install/twm
+-rw-r--r--   1 root root       175 Feb 22  2007 ./source/x/x11/post-install/twm.post-install
+-rw-r--r--   1 root root       725 Dec  1  2009 ./source/x/x11/post-install/twm/xinitrc.twm
+-rw-r--r--   1 root root        63 Dec 15  2009 ./source/x/x11/post-install/util-macros.post-install
+-rw-r--r--   1 root root       344 Feb 13  2007 ./source/x/x11/post-install/x11-app-test.post-install
+-rw-r--r--   1 root root       275 Feb 13  2007 ./source/x/x11/post-install/x11-font.post-install
+-rw-r--r--   1 root root        68 Feb 13  2007 ./source/x/x11/post-install/x11-util.post-install
+-rw-r--r--   1 root root        63 Dec 15  2009 ./source/x/x11/post-install/xbitmaps.post-install
+-rw-r--r--   1 root root       155 Feb 14  2007 ./source/x/x11/post-install/xcb-proto.post-install
+drwxr-xr-x   2 root root      4096 Feb 14  2007 ./source/x/x11/post-install/xdm
+-rw-r--r--   1 root root       671 Mar 12  2010 ./source/x/x11/post-install/xdm.post-install
+-rwxr-xr-x   1 root root      5470 Jan 23 19:01 ./source/x/x11/post-install/xdm/Xsession
+-rwxr-xr-x   1 root root       708 Feb 17  2001 ./source/x/x11/post-install/xdm/Xsession.orig
+-rwxr-xr-x   1 root root       503 Feb 14  2007 ./source/x/x11/post-install/xdm/Xsetup_0
+-rwxr-xr-x   1 root root       145 Feb 13  2007 ./source/x/x11/post-install/xdm/Xsetup_0.orig
+-rw-r--r--   1 root root        40 Sep 15  2008 ./source/x/x11/post-install/xf86-input-joystick.post-install
+drwxr-xr-x   2 root root      4096 Aug  3  2010 ./source/x/x11/post-install/xf86-input-synaptics
+-rw-r--r--   1 root root       373 Aug  3  2010 ./source/x/x11/post-install/xf86-input-synaptics.post-install
+-rw-r--r--   1 root root       444 Nov  1 01:13 ./source/x/x11/post-install/xf86-input-synaptics/50-synaptics.conf
+-rw-r--r--   1 root root        54 Aug  1  2009 ./source/x/x11/post-install/xfs.post-install
+drwxr-xr-x   2 root root      4096 Jul  1  2007 ./source/x/x11/post-install/xinit
+-rw-r--r--   1 root root       637 Jul  1  2007 ./source/x/x11/post-install/xinit.post-install
+-rw-r--r--   1 root root       321 Mar 16  2003 ./source/x/x11/post-install/xinit/README.Xmodmap
+-rw-r--r--   1 root root       341 Feb 18  2007 ./source/x/x11/post-install/xkeyboard-config.post-install
+drwxr-xr-x   2 root root      4096 Aug 11  2009 ./source/x/x11/post-install/xorg-cf-files
+-rw-r--r--   1 root root       237 Aug 11  2009 ./source/x/x11/post-install/xorg-cf-files.post-install
+-rw-r--r--   1 root root       203 Aug 11  2009 ./source/x/x11/post-install/xorg-cf-files/x11.tmpl.lib64.kludge.diff.gz
+-rw-r--r--   1 root root      2241 Dec 29 01:53 ./source/x/x11/post-install/xorg-server.post-install
+-rw-r--r--   1 root root        63 Dec 19 06:16 ./source/x/x11/post-install/xorg-sgml-doctools.post-install
+-rw-r--r--   1 root root        35 Nov  5 06:10 ./source/x/x11/post-install/xproto.post-install
+-rw-r--r--   1 root root       100 Feb 13  2007 ./source/x/x11/post-install/xsm.post-install
+drwxr-xr-x   2 root root     12288 Nov  5 06:00 ./source/x/x11/slack-desc
+-rw-r--r--   1 root root       811 Feb 13  2007 ./source/x/x11/slack-desc/applewmproto
+-rw-r--r--   1 root root       727 Feb 13  2007 ./source/x/x11/slack-desc/appres
+-rw-r--r--   1 root root       755 Feb 13  2007 ./source/x/x11/slack-desc/bdftopcf
+-rw-r--r--   1 root root       797 Feb 13  2007 ./source/x/x11/slack-desc/beforelight
+-rw-r--r--   1 root root       811 Feb 13  2007 ./source/x/x11/slack-desc/bigreqsproto
+-rw-r--r--   1 root root       727 Feb 13  2007 ./source/x/x11/slack-desc/bitmap
+-rw-r--r--   1 root root       727 Feb 13  2007 ./source/x/x11/slack-desc/compiz
+-rw-r--r--   1 root root       839 Feb 13  2007 ./source/x/x11/slack-desc/compositeproto
+-rw-r--r--   1 root root       755 May 30  2009 ./source/x/x11/slack-desc/constype
+-rw-r--r--   1 root root       797 Feb 13  2007 ./source/x/x11/slack-desc/damageproto
+-rw-r--r--   1 root root       755 Feb 13  2007 ./source/x/x11/slack-desc/dmxproto
+-rw-r--r--   1 root root       769 Sep 18  2008 ./source/x/x11/slack-desc/dri2proto
+-rw-r--r--   1 root root       741 Feb 13  2007 ./source/x/x11/slack-desc/editres
+-rw-r--r--   1 root root       769 Feb 13  2007 ./source/x/x11/slack-desc/encodings
+-rw-r--r--   1 root root       741 Feb 13  2007 ./source/x/x11/slack-desc/evieext
+-rw-r--r--   1 root root       783 Feb 13  2007 ./source/x/x11/slack-desc/fixesproto
+-rw-r--r--   1 root root       881 Feb 13  2007 ./source/x/x11/slack-desc/font-adobe-100dpi
+-rw-r--r--   1 root root       867 Feb 13  2007 ./source/x/x11/slack-desc/font-adobe-75dpi
+-rw-r--r--   1 root root       979 Feb 13  2007 ./source/x/x11/slack-desc/font-adobe-utopia-100dpi
+-rw-r--r--   1 root root       965 Feb 13  2007 ./source/x/x11/slack-desc/font-adobe-utopia-75dpi
+-rw-r--r--   1 root root       965 Feb 13  2007 ./source/x/x11/slack-desc/font-adobe-utopia-type1
+-rw-r--r--   1 root root       783 Feb 13  2007 ./source/x/x11/slack-desc/font-alias
+-rw-r--r--   1 root root       867 Feb 13  2007 ./source/x/x11/slack-desc/font-arabic-misc
+-rw-r--r--   1 root root       839 Feb 13  2007 ./source/x/x11/slack-desc/font-bh-100dpi
+-rw-r--r--   1 root root       825 Feb 13  2007 ./source/x/x11/slack-desc/font-bh-75dpi
+-rw-r--r--   1 root root      1077 Feb 13  2007 ./source/x/x11/slack-desc/font-bh-lucidatypewriter-100dpi
+-rw-r--r--   1 root root      1063 Feb 13  2007 ./source/x/x11/slack-desc/font-bh-lucidatypewriter-75dpi
+-rw-r--r--   1 root root       797 Feb 13  2007 ./source/x/x11/slack-desc/font-bh-ttf
+-rw-r--r--   1 root root       825 Feb 13  2007 ./source/x/x11/slack-desc/font-bh-type1
+-rw-r--r--   1 root root       937 Feb 13  2007 ./source/x/x11/slack-desc/font-bitstream-100dpi
+-rw-r--r--   1 root root       923 Feb 13  2007 ./source/x/x11/slack-desc/font-bitstream-75dpi
+-rw-r--r--   1 root root       937 Feb 13  2007 ./source/x/x11/slack-desc/font-bitstream-speedo
+-rw-r--r--   1 root root       923 Feb 13  2007 ./source/x/x11/slack-desc/font-bitstream-type1
+-rw-r--r--   1 root root       923 Feb 13  2007 ./source/x/x11/slack-desc/font-cronyx-cyrillic
+-rw-r--r--   1 root root       867 Feb 13  2007 ./source/x/x11/slack-desc/font-cursor-misc
+-rw-r--r--   1 root root       867 Feb 13  2007 ./source/x/x11/slack-desc/font-daewoo-misc
+-rw-r--r--   1 root root       825 Feb 13  2007 ./source/x/x11/slack-desc/font-dec-misc
+-rw-r--r--   1 root root       839 Feb 13  2007 ./source/x/x11/slack-desc/font-ibm-type1
+-rw-r--r--   1 root root       839 Feb 13  2007 ./source/x/x11/slack-desc/font-isas-misc
+-rw-r--r--   1 root root       825 Feb 13  2007 ./source/x/x11/slack-desc/font-jis-misc
+-rw-r--r--   1 root root       853 Feb 13  2007 ./source/x/x11/slack-desc/font-micro-misc
+-rw-r--r--   1 root root       895 Feb 13  2007 ./source/x/x11/slack-desc/font-misc-cyrillic
+-rw-r--r--   1 root root       895 Feb 13  2007 ./source/x/x11/slack-desc/font-misc-ethiopic
+-rw-r--r--   1 root root       867 Feb 13  2007 ./source/x/x11/slack-desc/font-misc-meltho
+-rw-r--r--   1 root root       839 Feb 13  2007 ./source/x/x11/slack-desc/font-misc-misc
+-rw-r--r--   1 root root       839 Feb 13  2007 ./source/x/x11/slack-desc/font-mutt-misc
+-rw-r--r--   1 root root       923 Feb 13  2007 ./source/x/x11/slack-desc/font-schumacher-misc
+-rw-r--r--   1 root root       923 Feb 13  2007 ./source/x/x11/slack-desc/font-screen-cyrillic
+-rw-r--r--   1 root root       839 Feb 13  2007 ./source/x/x11/slack-desc/font-sony-misc
+-rw-r--r--   1 root root       825 Feb 13  2007 ./source/x/x11/slack-desc/font-sun-misc
+-rw-r--r--   1 root root       769 Feb 13  2007 ./source/x/x11/slack-desc/font-util
+-rw-r--r--   1 root root       951 Feb 13  2007 ./source/x/x11/slack-desc/font-winitzki-cyrillic
+-rw-r--r--   1 root root       895 Feb 13  2007 ./source/x/x11/slack-desc/font-xfree86-type1
+-rw-r--r--   1 root root       839 Feb 13  2007 ./source/x/x11/slack-desc/fontcacheproto
+-rw-r--r--   1 root root       783 Feb 13  2007 ./source/x/x11/slack-desc/fontsproto
+-rw-r--r--   1 root root       783 Feb 13  2007 ./source/x/x11/slack-desc/fonttosfnt
+-rw-r--r--   1 root root       769 Feb 13  2007 ./source/x/x11/slack-desc/fslsfonts
+-rw-r--r--   1 root root       741 Feb 13  2007 ./source/x/x11/slack-desc/fstobdf
+-rw-r--r--   1 root root       783 Feb 13  2007 ./source/x/x11/slack-desc/gccmakedep
+-rw-r--r--   1 root root       741 Feb 13  2007 ./source/x/x11/slack-desc/glproto
+-rw-r--r--   1 root root       741 Feb 13  2007 ./source/x/x11/slack-desc/iceauth
+-rw-r--r--   1 root root       685 Feb 13  2007 ./source/x/x11/slack-desc/ico
+-rw-r--r--   1 root root       713 Feb 13  2007 ./source/x/x11/slack-desc/imake
+-rw-r--r--   1 root root       783 Feb 13  2007 ./source/x/x11/slack-desc/inputproto
+-rw-r--r--   1 root root       886 Jun  3  2009 ./source/x/x11/slack-desc/intel-gpu-tools
+-rw-r--r--   1 root root       741 Feb 13  2007 ./source/x/x11/slack-desc/kbproto
+-rw-r--r--   1 root root       755 Feb 13  2007 ./source/x/x11/slack-desc/lbxproxy
+-rw-r--r--   1 root root       783 Feb 13  2007 ./source/x/x11/slack-desc/libAppleWM
+-rw-r--r--   1 root root       713 Feb 13  2007 ./source/x/x11/slack-desc/libFS
+-rw-r--r--   1 root root       727 Feb 13  2007 ./source/x/x11/slack-desc/libICE
+-rw-r--r--   1 root root       713 Feb 13  2007 ./source/x/x11/slack-desc/libSM
+-rw-r--r--   1 root root       811 Feb 13  2007 ./source/x/x11/slack-desc/libWindowsWM
+-rw-r--r--   1 root root       727 Feb 13  2007 ./source/x/x11/slack-desc/libX11
+-rw-r--r--   1 root root       825 Feb 13  2007 ./source/x/x11/slack-desc/libXScrnSaver
+-rw-r--r--   1 root root       755 Feb 13  2007 ./source/x/x11/slack-desc/libXTrap
+-rw-r--r--   1 root root       727 Feb 13  2007 ./source/x/x11/slack-desc/libXau
+-rw-r--r--   1 root root       727 Feb 13  2007 ./source/x/x11/slack-desc/libXaw
+-rw-r--r--   1 root root       825 Feb 13  2007 ./source/x/x11/slack-desc/libXcomposite
+-rw-r--r--   1 root root       783 Feb 13  2007 ./source/x/x11/slack-desc/libXcursor
+-rw-r--r--   1 root root       783 Feb 13  2007 ./source/x/x11/slack-desc/libXdamage
+-rw-r--r--   1 root root       755 Feb 13  2007 ./source/x/x11/slack-desc/libXdmcp
+-rw-r--r--   1 root root       755 Feb 13  2007 ./source/x/x11/slack-desc/libXevie
+-rw-r--r--   1 root root       741 Feb 13  2007 ./source/x/x11/slack-desc/libXext
+-rw-r--r--   1 root root       769 Feb 13  2007 ./source/x/x11/slack-desc/libXfixes
+-rw-r--r--   1 root root       755 Feb 13  2007 ./source/x/x11/slack-desc/libXfont
+-rw-r--r--   1 root root       825 Feb 13  2007 ./source/x/x11/slack-desc/libXfontcache
+-rw-r--r--   1 root root       727 Feb 13  2007 ./source/x/x11/slack-desc/libXft
+-rw-r--r--   1 root root       713 Feb 13  2007 ./source/x/x11/slack-desc/libXi
+-rw-r--r--   1 root root       797 Feb 13  2007 ./source/x/x11/slack-desc/libXinerama
+-rw-r--r--   1 root root       727 Feb 13  2007 ./source/x/x11/slack-desc/libXmu
+-rw-r--r--   1 root root       713 Feb 13  2007 ./source/x/x11/slack-desc/libXp
+-rw-r--r--   1 root root       727 Feb 13  2007 ./source/x/x11/slack-desc/libXpm
+-rw-r--r--   1 root root       867 Feb 13  2007 ./source/x/x11/slack-desc/libXprintAppUtil
+-rw-r--r--   1 root root       825 Feb 13  2007 ./source/x/x11/slack-desc/libXprintUtil
+-rw-r--r--   1 root root       769 Feb 13  2007 ./source/x/x11/slack-desc/libXrandr
+-rw-r--r--   1 root root       783 Feb 13  2007 ./source/x/x11/slack-desc/libXrender
+-rw-r--r--   1 root root       741 Feb 13  2007 ./source/x/x11/slack-desc/libXres
+-rw-r--r--   1 root root       713 Feb 13  2007 ./source/x/x11/slack-desc/libXt
+-rw-r--r--   1 root root       741 Feb 13  2007 ./source/x/x11/slack-desc/libXtst
+-rw-r--r--   1 root root       713 Feb 13  2007 ./source/x/x11/slack-desc/libXv
+-rw-r--r--   1 root root       741 Feb 13  2007 ./source/x/x11/slack-desc/libXvMC
+-rw-r--r--   1 root root       797 Feb 13  2007 ./source/x/x11/slack-desc/libXxf86dga
+-rw-r--r--   1 root root       811 Feb 13  2007 ./source/x/x11/slack-desc/libXxf86misc
+-rw-r--r--   1 root root       783 Feb 13  2007 ./source/x/x11/slack-desc/libXxf86vm
+-rw-r--r--   1 root root       727 Feb 13  2007 ./source/x/x11/slack-desc/libdmx
+-rw-r--r--   1 root root       783 Feb 13  2007 ./source/x/x11/slack-desc/libfontenc
+-rw-r--r--   1 root root       783 Feb 13  2007 ./source/x/x11/slack-desc/liblbxutil
+-rw-r--r--   1 root root       741 Feb 13  2007 ./source/x/x11/slack-desc/liboldX
+-rw-r--r--   1 root root       811 Mar 10  2008 ./source/x/x11/slack-desc/libpciaccess
+-rw-r--r--   1 root root       867 Feb 14  2007 ./source/x/x11/slack-desc/libpthread-stubs
+-rw-r--r--   1 root root       903 Feb 14  2007 ./source/x/x11/slack-desc/libxcb
+-rw-r--r--   1 root root       783 Feb 13  2007 ./source/x/x11/slack-desc/libxkbfile
+-rw-r--r--   1 root root       755 Feb 13  2007 ./source/x/x11/slack-desc/libxkbui
+-rw-r--r--   1 root root       741 Feb 13  2007 ./source/x/x11/slack-desc/listres
+-rw-r--r--   1 root root       713 Feb 13  2007 ./source/x/x11/slack-desc/lndir
+-rw-r--r--   1 root root       699 Feb 13  2007 ./source/x/x11/slack-desc/luit
+-rw-r--r--   1 root root       783 Feb 13  2007 ./source/x/x11/slack-desc/makedepend
+-rw-r--r--   1 root root       839 Feb 13  2007 ./source/x/x11/slack-desc/mkcomposecache
+-rw-r--r--   1 root root       769 Feb 13  2007 ./source/x/x11/slack-desc/mkfontdir
+-rw-r--r--   1 root root       797 Feb 13  2007 ./source/x/x11/slack-desc/mkfontscale
+-rw-r--r--   1 root root       727 Feb 13  2007 ./source/x/x11/slack-desc/oclock
+-rw-r--r--   1 root root       794 Sep 16  2007 ./source/x/x11/slack-desc/pixman
+-rw-r--r--   1 root root       783 Feb 13  2007 ./source/x/x11/slack-desc/printproto
+-rw-r--r--   1 root root       769 Feb 13  2007 ./source/x/x11/slack-desc/proxymngr
+-rw-r--r--   1 root root       783 Feb 13  2007 ./source/x/x11/slack-desc/randrproto
+-rw-r--r--   1 root root       797 Feb 13  2007 ./source/x/x11/slack-desc/recordproto
+-rw-r--r--   1 root root       797 Feb 13  2007 ./source/x/x11/slack-desc/rendercheck
+-rw-r--r--   1 root root       797 Feb 13  2007 ./source/x/x11/slack-desc/renderproto
+-rw-r--r--   1 root root       825 Feb 13  2007 ./source/x/x11/slack-desc/resourceproto
+-rw-r--r--   1 root root       685 Feb 13  2007 ./source/x/x11/slack-desc/rgb
+-rw-r--r--   1 root root       727 Feb 13  2007 ./source/x/x11/slack-desc/rstart
+-rw-r--r--   1 root root       741 Feb 13  2007 ./source/x/x11/slack-desc/scripts
+-rw-r--r--   1 root root       839 Feb 13  2007 ./source/x/x11/slack-desc/scrnsaverproto
+-rw-r--r--   1 root root       741 Feb 13  2007 ./source/x/x11/slack-desc/sessreg
+-rw-r--r--   1 root root       769 Feb 13  2007 ./source/x/x11/slack-desc/setxkbmap
+-rw-r--r--   1 root root       755 Feb 13  2007 ./source/x/x11/slack-desc/showfont
+-rw-r--r--   1 root root       741 Feb 13  2007 ./source/x/x11/slack-desc/smproxy
+-rw-r--r--   1 root root       769 Feb 13  2007 ./source/x/x11/slack-desc/trapproto
+-rw-r--r--   1 root root       685 Feb 13  2007 ./source/x/x11/slack-desc/twm
+-rw-r--r--   1 root root       797 Feb 13  2007 ./source/x/x11/slack-desc/util-macros
+-rw-r--r--   1 root root       783 Feb 13  2007 ./source/x/x11/slack-desc/videoproto
+-rw-r--r--   1 root root       741 Feb 13  2007 ./source/x/x11/slack-desc/viewres
+-rw-r--r--   1 root root       839 Feb 13  2007 ./source/x/x11/slack-desc/windowswmproto
+-rw-r--r--   1 root root       677 Feb  5  2007 ./source/x/x11/slack-desc/x11-app
+-rw-r--r--   1 root root       601 Feb  5  2007 ./source/x/x11/slack-desc/x11-data
+-rw-r--r--   1 root root       587 Feb  5  2007 ./source/x/x11/slack-desc/x11-doc
+-rw-r--r--   1 root root       637 Feb  5  2007 ./source/x/x11/slack-desc/x11-driver
+-rw-r--r--   1 root root       605 Feb  5  2007 ./source/x/x11/slack-desc/x11-font
+-rw-r--r--   1 root root       598 Feb  5  2007 ./source/x/x11/slack-desc/x11-lib
+-rw-r--r--   1 root root       621 Feb  5  2007 ./source/x/x11/slack-desc/x11-proto
+-rw-r--r--   1 root root       613 Feb  5  2007 ./source/x/x11/slack-desc/x11-util
+-rw-r--r--   1 root root       741 Feb 13  2007 ./source/x/x11/slack-desc/x11perf
+-rw-r--r--   1 root root       713 Feb 13  2007 ./source/x/x11/slack-desc/xauth
+-rw-r--r--   1 root root       782 Sep 16  2007 ./source/x/x11/slack-desc/xbacklight
+-rw-r--r--   1 root root       713 Feb 13  2007 ./source/x/x11/slack-desc/xbiff
+-rw-r--r--   1 root root       755 Feb 13  2007 ./source/x/x11/slack-desc/xbitmaps
+-rw-r--r--   1 root root       713 Feb 13  2007 ./source/x/x11/slack-desc/xcalc
+-rw-r--r--   1 root root       769 Feb 14  2007 ./source/x/x11/slack-desc/xcb-proto
+-rw-r--r--   1 root root       756 May 30  2009 ./source/x/x11/slack-desc/xcb-util
+-rw-r--r--   1 root root       783 Feb 13  2007 ./source/x/x11/slack-desc/xclipboard
+-rw-r--r--   1 root root       727 Feb 13  2007 ./source/x/x11/slack-desc/xclock
+-rw-r--r--   1 root root       797 Feb 13  2007 ./source/x/x11/slack-desc/xcmiscproto
+-rw-r--r--   1 root root       727 Feb 13  2007 ./source/x/x11/slack-desc/xcmsdb
+-rw-r--r--   1 root root       755 Mar 10  2008 ./source/x/x11/slack-desc/xcompmgr
+-rw-r--r--   1 root root       755 Feb 13  2007 ./source/x/x11/slack-desc/xconsole
+-rw-r--r--   1 root root       839 Feb 13  2007 ./source/x/x11/slack-desc/xcursor-themes
+-rw-r--r--   1 root root       783 Feb 13  2007 ./source/x/x11/slack-desc/xcursorgen
+-rw-r--r--   1 root root       769 Feb 13  2007 ./source/x/x11/slack-desc/xdbedizzy
+-rw-r--r--   1 root root       755 Feb 13  2007 ./source/x/x11/slack-desc/xditview
+-rw-r--r--   1 root root       685 Feb 13  2007 ./source/x/x11/slack-desc/xdm
+-rw-r--r--   1 root root       755 Feb 13  2007 ./source/x/x11/slack-desc/xdpyinfo
+-rw-r--r--   1 root root       755 Feb 13  2007 ./source/x/x11/slack-desc/xdriinfo
+-rw-r--r--   1 root root       713 Feb 13  2007 ./source/x/x11/slack-desc/xedit
+-rw-r--r--   1 root root       685 Feb 13  2007 ./source/x/x11/slack-desc/xev
+-rw-r--r--   1 root root       769 Feb 13  2007 ./source/x/x11/slack-desc/xextproto
+-rw-r--r--   1 root root       713 Feb 13  2007 ./source/x/x11/slack-desc/xeyes
+-rw-r--r--   1 root root       881 Feb 13  2007 ./source/x/x11/slack-desc/xf86-input-acecad
+-rw-r--r--   1 root root       881 Feb 13  2007 ./source/x/x11/slack-desc/xf86-input-aiptek
+-rw-r--r--   1 root root       895 Nov 19  2008 ./source/x/x11/slack-desc/xf86-input-calcomp
+-rw-r--r--   1 root root       881 Feb 13  2007 ./source/x/x11/slack-desc/xf86-input-citron
+-rw-r--r--   1 root root       951 Feb 13  2007 ./source/x/x11/slack-desc/xf86-input-digitaledge
+-rw-r--r--   1 root root       839 Feb 13  2007 ./source/x/x11/slack-desc/xf86-input-dmc
+-rw-r--r--   1 root root       895 Feb 13  2007 ./source/x/x11/slack-desc/xf86-input-dynapro
+-rw-r--r--   1 root root       895 Feb 13  2007 ./source/x/x11/slack-desc/xf86-input-elo2300
+-rw-r--r--   1 root root       951 Feb 13  2007 ./source/x/x11/slack-desc/xf86-input-elographics
+-rw-r--r--   1 root root       867 Feb 13  2007 ./source/x/x11/slack-desc/xf86-input-evdev
+-rw-r--r--   1 root root       853 Feb 13  2007 ./source/x/x11/slack-desc/xf86-input-fpit
+-rw-r--r--   1 root root       909 Feb 13  2007 ./source/x/x11/slack-desc/xf86-input-hyperpen
+-rw-r--r--   1 root root       923 Feb 13  2007 ./source/x/x11/slack-desc/xf86-input-jamstudio
+-rw-r--r--   1 root root       909 Feb 13  2007 ./source/x/x11/slack-desc/xf86-input-joystick
+-rw-r--r--   1 root root       909 Feb 13  2007 ./source/x/x11/slack-desc/xf86-input-keyboard
+-rw-r--r--   1 root root       909 Feb 13  2007 ./source/x/x11/slack-desc/xf86-input-magellan
+-rw-r--r--   1 root root       937 Feb 13  2007 ./source/x/x11/slack-desc/xf86-input-magictouch
+-rw-r--r--   1 root root       937 Feb 13  2007 ./source/x/x11/slack-desc/xf86-input-microtouch
+-rw-r--r--   1 root root       867 Feb 13  2007 ./source/x/x11/slack-desc/xf86-input-mouse
+-rw-r--r--   1 root root       895 Feb 13  2007 ./source/x/x11/slack-desc/xf86-input-mutouch
+-rw-r--r--   1 root root       881 Feb 13  2007 ./source/x/x11/slack-desc/xf86-input-palmax
+-rw-r--r--   1 root root       909 Feb 13  2007 ./source/x/x11/slack-desc/xf86-input-penmount
+-rw-r--r--   1 root root       909 Feb 13  2007 ./source/x/x11/slack-desc/xf86-input-spaceorb
+-rw-r--r--   1 root root       867 Feb 13  2007 ./source/x/x11/slack-desc/xf86-input-summa
+-rw-r--r--   1 root root       923 Nov 18  2008 ./source/x/x11/slack-desc/xf86-input-synaptics
+-rw-r--r--   1 root root       895 Feb 13  2007 ./source/x/x11/slack-desc/xf86-input-tek4957
+-rw-r--r--   1 root root       853 Feb 13  2007 ./source/x/x11/slack-desc/xf86-input-ur98
+-rw-r--r--   1 root root       895 Feb 13  2007 ./source/x/x11/slack-desc/xf86-input-vmmouse
+-rw-r--r--   1 root root       853 Feb 13  2007 ./source/x/x11/slack-desc/xf86-input-void
+-rw-r--r--   1 root root       867 Nov 20  2009 ./source/x/x11/slack-desc/xf86-input-wacom
+-rw-r--r--   1 root root       839 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-apm
+-rw-r--r--   1 root root       839 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-ark
+-rw-r--r--   1 root root       839 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-ast
+-rw-r--r--   1 root root       839 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-ati
+-rw-r--r--   1 root root       867 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-chips
+-rw-r--r--   1 root root       881 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-cirrus
+-rw-r--r--   1 root root       867 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-cyrix
+-rw-r--r--   1 root root       867 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-dummy
+-rw-r--r--   1 root root       867 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-fbdev
+-rw-r--r--   1 root root       902 Apr  3  2008 ./source/x/x11/slack-desc/xf86-video-geode
+-rw-r--r--   1 root root       867 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-glint
+-rw-r--r--   1 root root       853 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-i128
+-rw-r--r--   1 root root       853 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-i740
+-rw-r--r--   1 root root       853 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-i810
+-rw-r--r--   1 root root       881 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-impact
+-rw-r--r--   1 root root       867 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-imstt
+-rw-r--r--   1 root root       867 Mar  7  2007 ./source/x/x11/slack-desc/xf86-video-intel
+-rw-r--r--   1 root root       881 Jul 10  2008 ./source/x/x11/slack-desc/xf86-video-mach64
+-rw-r--r--   1 root root       839 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-mga
+-rw-r--r--   1 root root       909 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-neomagic
+-rw-r--r--   1 root root       895 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-newport
+-rw-r--r--   1 root root       895 Aug 26  2010 ./source/x/x11/slack-desc/xf86-video-nouveau
+-rw-r--r--   1 root root       839 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-nsc
+-rw-r--r--   1 root root       825 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-nv
+-rw-r--r--   1 root root       937 Nov 18  2008 ./source/x/x11/slack-desc/xf86-video-openchrome
+-rw-r--r--   1 root root       853 Jul 10  2008 ./source/x/x11/slack-desc/xf86-video-r128
+-rw-r--r--   1 root root       955 Apr 12  2008 ./source/x/x11/slack-desc/xf86-video-radeonhd
+-rw-r--r--   1 root root       923 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-rendition
+-rw-r--r--   1 root root       825 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-s3
+-rw-r--r--   1 root root       895 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-s3virge
+-rw-r--r--   1 root root       881 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-savage
+-rw-r--r--   1 root root       979 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-siliconmotion
+-rw-r--r--   1 root root       839 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-sis
+-rw-r--r--   1 root root       881 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-sisusb
+-rw-r--r--   1 root root       881 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-sunbw2
+-rw-r--r--   1 root root       895 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-suncg14
+-rw-r--r--   1 root root       881 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-suncg3
+-rw-r--r--   1 root root       881 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-suncg6
+-rw-r--r--   1 root root       881 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-sunffb
+-rw-r--r--   1 root root       881 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-sunleo
+-rw-r--r--   1 root root       881 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-suntcx
+-rw-r--r--   1 root root       853 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-tdfx
+-rw-r--r--   1 root root       839 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-tga
+-rw-r--r--   1 root root       895 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-trident
+-rw-r--r--   1 root root       867 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-tseng
+-rw-r--r--   1 root root       839 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-v4l
+-rw-r--r--   1 root root       955 Apr  6  2007 ./source/x/x11/slack-desc/xf86-video-vermilion
+-rw-r--r--   1 root root       853 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-vesa
+-rw-r--r--   1 root root       839 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-vga
+-rw-r--r--   1 root root       839 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-via
+-rw-r--r--   1 root root       881 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-vmware
+-rw-r--r--   1 root root       881 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-voodoo
+-rw-r--r--   1 root root       853 Feb 13  2007 ./source/x/x11/slack-desc/xf86-video-wsfb
+-rw-r--r--   1 root root       839 Dec 15  2009 ./source/x/x11/slack-desc/xf86-video-xgi
+-rw-r--r--   1 root root       867 Dec 15  2009 ./source/x/x11/slack-desc/xf86-video-xgixp
+-rw-r--r--   1 root root       867 Feb 13  2007 ./source/x/x11/slack-desc/xf86bigfontproto
+-rw-r--r--   1 root root       741 Feb 13  2007 ./source/x/x11/slack-desc/xf86dga
+-rw-r--r--   1 root root       811 Feb 13  2007 ./source/x/x11/slack-desc/xf86dgaproto
+-rw-r--r--   1 root root       811 Feb 13  2007 ./source/x/x11/slack-desc/xf86driproto
+-rw-r--r--   1 root root       825 Feb 13  2007 ./source/x/x11/slack-desc/xf86miscproto
+-rw-r--r--   1 root root       825 Feb 13  2007 ./source/x/x11/slack-desc/xf86rushproto
+-rw-r--r--   1 root root       867 Feb 13  2007 ./source/x/x11/slack-desc/xf86vidmodeproto
+-rw-r--r--   1 root root       685 Feb 13  2007 ./source/x/x11/slack-desc/xfd
+-rw-r--r--   1 root root       783 Feb 13  2007 ./source/x/x11/slack-desc/xfindproxy
+-rw-r--r--   1 root root       755 Feb 13  2007 ./source/x/x11/slack-desc/xfontsel
+-rw-r--r--   1 root root       685 Feb 13  2007 ./source/x/x11/slack-desc/xfs
+-rw-r--r--   1 root root       741 Feb 13  2007 ./source/x/x11/slack-desc/xfsinfo
+-rw-r--r--   1 root root       699 Feb 13  2007 ./source/x/x11/slack-desc/xfwp
+-rw-r--r--   1 root root       727 Feb 13  2007 ./source/x/x11/slack-desc/xgamma
+-rw-r--r--   1 root root       685 Feb 13  2007 ./source/x/x11/slack-desc/xgc
+-rw-r--r--   1 root root       713 Feb 13  2007 ./source/x/x11/slack-desc/xhost
+-rw-r--r--   1 root root       825 Feb 13  2007 ./source/x/x11/slack-desc/xineramaproto
+-rw-r--r--   1 root root       713 Feb 13  2007 ./source/x/x11/slack-desc/xinit
+-rw-r--r--   1 root root       923 Jan 31  2008 ./source/x/x11/slack-desc/xinput
+-rw-r--r--   1 root root       741 Feb 13  2007 ./source/x/x11/slack-desc/xkbcomp
+-rw-r--r--   1 root root       741 Feb 13  2007 ./source/x/x11/slack-desc/xkbdata
+-rw-r--r--   1 root root       727 Feb 13  2007 ./source/x/x11/slack-desc/xkbevd
+-rw-r--r--   1 root root       755 Feb 13  2007 ./source/x/x11/slack-desc/xkbprint
+-rw-r--r--   1 root root       755 Feb 13  2007 ./source/x/x11/slack-desc/xkbutils
+-rw-r--r--   1 root root       867 Feb 13  2007 ./source/x/x11/slack-desc/xkeyboard-config
+-rw-r--r--   1 root root       713 Feb 13  2007 ./source/x/x11/slack-desc/xkill
+-rw-r--r--   1 root root       713 Feb 13  2007 ./source/x/x11/slack-desc/xload
+-rw-r--r--   1 root root       713 Feb 13  2007 ./source/x/x11/slack-desc/xlogo
+-rw-r--r--   1 root root       755 Feb 13  2007 ./source/x/x11/slack-desc/xlsatoms
+-rw-r--r--   1 root root       783 Feb 13  2007 ./source/x/x11/slack-desc/xlsclients
+-rw-r--r--   1 root root       755 Feb 13  2007 ./source/x/x11/slack-desc/xlsfonts
+-rw-r--r--   1 root root       699 Feb 13  2007 ./source/x/x11/slack-desc/xmag
+-rw-r--r--   1 root root       699 Feb 13  2007 ./source/x/x11/slack-desc/xman
+-rw-r--r--   1 root root       755 Feb 13  2007 ./source/x/x11/slack-desc/xmessage
+-rw-r--r--   1 root root       685 Feb 13  2007 ./source/x/x11/slack-desc/xmh
+-rw-r--r--   1 root root       741 Feb 13  2007 ./source/x/x11/slack-desc/xmodmap
+-rw-r--r--   1 root root       713 Feb 13  2007 ./source/x/x11/slack-desc/xmore
+-rw-r--r--   1 root root       825 Feb 13  2007 ./source/x/x11/slack-desc/xorg-cf-files
+-rw-r--r--   1 root root       769 Feb 13  2007 ./source/x/x11/slack-desc/xorg-docs
+-rw-r--r--   1 root root      1160 Feb 13  2007 ./source/x/x11/slack-desc/xorg-server
+-rw-r--r--   1 root root       901 Feb 14  2007 ./source/x/x11/slack-desc/xorg-server-xdmx
+-rw-r--r--   1 root root       839 May 30  2009 ./source/x/x11/slack-desc/xorg-server-xephyr
+-rw-r--r--   1 root root      1063 Feb 13  2007 ./source/x/x11/slack-desc/xorg-server-xnest
+-rw-r--r--   1 root root      1160 Feb 13  2007 ./source/x/x11/slack-desc/xorg-server-xvfb
+-rw-r--r--   1 root root       895 Feb 13  2007 ./source/x/x11/slack-desc/xorg-sgml-doctools
+-rw-r--r--   1 root root       811 Feb 13  2007 ./source/x/x11/slack-desc/xphelloworld
+-rw-r--r--   1 root root       811 Feb 13  2007 ./source/x/x11/slack-desc/xplsprinters
+-rw-r--r--   1 root root       685 Feb 13  2007 ./source/x/x11/slack-desc/xpr
+-rw-r--r--   1 root root       909 Feb 13  2007 ./source/x/x11/slack-desc/xprehashprinterlist
+-rw-r--r--   1 root root       713 Feb 13  2007 ./source/x/x11/slack-desc/xprop
+-rw-r--r--   1 root root       727 Feb 13  2007 ./source/x/x11/slack-desc/xproto
+-rw-r--r--   1 root root       979 Feb 13  2007 ./source/x/x11/slack-desc/xproxymanagementprotocol
+-rw-r--r--   1 root root       700 May 30  2009 ./source/x/x11/slack-desc/xpyb
+-rw-r--r--   1 root root       727 Feb 13  2007 ./source/x/x11/slack-desc/xrandr
+-rw-r--r--   1 root root       699 Feb 13  2007 ./source/x/x11/slack-desc/xrdb
+-rw-r--r--   1 root root       755 Feb 13  2007 ./source/x/x11/slack-desc/xrefresh
+-rw-r--r--   1 root root       685 Feb 13  2007 ./source/x/x11/slack-desc/xrx
+-rw-r--r--   1 root root       727 May 30  2009 ./source/x/x11/slack-desc/xscope
+-rw-r--r--   1 root root       699 Feb 13  2007 ./source/x/x11/slack-desc/xset
+-rw-r--r--   1 root root       755 Feb 13  2007 ./source/x/x11/slack-desc/xsetmode
+-rw-r--r--   1 root root       797 Feb 13  2007 ./source/x/x11/slack-desc/xsetpointer
+-rw-r--r--   1 root root       755 Feb 13  2007 ./source/x/x11/slack-desc/xsetroot
+-rw-r--r--   1 root root       685 Feb 13  2007 ./source/x/x11/slack-desc/xsm
+-rw-r--r--   1 root root       755 Feb 13  2007 ./source/x/x11/slack-desc/xstdcmap
+-rw-r--r--   1 root root       727 Feb 13  2007 ./source/x/x11/slack-desc/xtrans
+-rw-r--r--   1 root root       713 Feb 13  2007 ./source/x/x11/slack-desc/xtrap
+-rw-r--r--   1 root root       755 Feb 13  2007 ./source/x/x11/slack-desc/xvidtune
+-rw-r--r--   1 root root       727 Feb 13  2007 ./source/x/x11/slack-desc/xvinfo
+-rw-r--r--   1 root root       685 Feb 13  2007 ./source/x/x11/slack-desc/xwd
+-rw-r--r--   1 root root       755 Feb 13  2007 ./source/x/x11/slack-desc/xwininfo
+-rw-r--r--   1 root root       699 Feb 13  2007 ./source/x/x11/slack-desc/xwud
+drwxr-xr-x  12 root root      4096 Mar  5 01:42 ./source/x/x11/src
+drwxr-xr-x   2 root root      4096 Apr  6 04:27 ./source/x/x11/src/app
+-rw-r--r--   1 root root     97604 Oct 31 18:51 ./source/x/x11/src/app/appres-1.0.3.tar.xz
+-rw-r--r--   1 root root     97448 Oct 30 03:02 ./source/x/x11/src/app/bdftopcf-1.0.3.tar.xz
+-rw-r--r--   1 root root    100340 Oct 30 19:19 ./source/x/x11/src/app/beforelight-1.0.4.tar.xz
+-rw-r--r--   1 root root    140120 Oct  8  2010 ./source/x/x11/src/app/bitmap-1.0.5.tar.xz
+-rw-r--r--   1 root root    942584 Mar 30 09:42 ./source/x/x11/src/app/compiz-0.8.8.tar.xz
+-rw-r--r--   1 root root    136928 Oct 30 19:44 ./source/x/x11/src/app/editres-1.0.5.tar.xz
+-rw-r--r--   1 root root     98084 May 10  2008 ./source/x/x11/src/app/fonttosfnt-1.0.4.tar.xz
+-rw-r--r--   1 root root     99196 Oct 30 19:50 ./source/x/x11/src/app/fslsfonts-1.0.3.tar.xz
+-rw-r--r--   1 root root    100464 Oct 30 20:03 ./source/x/x11/src/app/fstobdf-1.0.4.tar.xz
+-rw-r--r--   1 root root    107064 Oct 30 04:51 ./source/x/x11/src/app/iceauth-1.0.4.tar.xz
+-rw-r--r--   1 root root    107744 Oct 30 20:12 ./source/x/x11/src/app/ico-1.0.3.tar.xz
+-rw-r--r--   1 root root    238960 Oct 13  2009 ./source/x/x11/src/app/intel-gpu-tools-1.0.2.tar.xz
+-rw-r--r--   1 root root     93928 Dec 15  2009 ./source/x/x11/src/app/listres-1.0.2.tar.xz
+-rw-r--r--   1 root root    120624 Oct  7  2010 ./source/x/x11/src/app/luit-1.1.0.tar.xz
+-rw-r--r--   1 root root     90748 Oct 13  2009 ./source/x/x11/src/app/mkcomposecache-1.2.1.tar.xz
+-rw-r--r--   1 root root     90880 Nov  7 19:18 ./source/x/x11/src/app/mkfontdir-1.0.6.tar.xz
+-rw-r--r--   1 root root    110808 Oct 30 06:08 ./source/x/x11/src/app/mkfontscale-1.0.8.tar.xz
+-rw-r--r--   1 root root    104140 Sep 23  2010 ./source/x/x11/src/app/oclock-1.0.2.tar.xz
+-rw-r--r--   1 root root    115856 Nov 22 02:56 ./source/x/x11/src/app/rendercheck-1.4.tar.xz
+-rw-r--r--   1 root root    110304 Oct  7  2010 ./source/x/x11/src/app/rgb-1.0.4.tar.xz
+-rw-r--r--   1 root root    104316 Jun  4  2010 ./source/x/x11/src/app/sessreg-1.0.6.tar.xz
+-rw-r--r--   1 root root    104700 Sep 23  2010 ./source/x/x11/src/app/setxkbmap-1.2.0.tar.xz
+-rw-r--r--   1 root root     99616 Oct 30 21:57 ./source/x/x11/src/app/showfont-1.0.3.tar.xz
+-rw-r--r--   1 root root    104564 Oct 21  2010 ./source/x/x11/src/app/smproxy-1.0.4.tar.xz
+-rw-r--r--   1 root root    238008 Jan  5 22:12 ./source/x/x11/src/app/twm-1.0.6.tar.xz
+-rw-r--r--   1 root root    106276 Oct 30 22:18 ./source/x/x11/src/app/viewres-1.0.3.tar.xz
+-rw-r--r--   1 root root    149484 Jan  6 00:36 ./source/x/x11/src/app/x11perf-1.5.3.tar.xz
+-rw-r--r--   1 root root    120104 Sep 24  2010 ./source/x/x11/src/app/xauth-1.0.5.tar.xz
+-rw-r--r--   1 root root     95900 Dec  9 07:13 ./source/x/x11/src/app/xbacklight-1.1.2.tar.xz
+-rw-r--r--   1 root root    107328 Jan 25 20:45 ./source/x/x11/src/app/xbiff-1.0.3.tar.xz
+-rw-r--r--   1 root root    114364 Nov 26 21:56 ./source/x/x11/src/app/xcalc-1.0.4.1.tar.xz
+-rw-r--r--   1 root root    106200 Nov  9 06:56 ./source/x/x11/src/app/xclipboard-1.1.1.tar.xz
+-rw-r--r--   1 root root    122220 Sep 24  2010 ./source/x/x11/src/app/xclock-1.0.5.tar.xz
+-rw-r--r--   1 root root    113140 Sep 24  2010 ./source/x/x11/src/app/xcmsdb-1.0.3.tar.xz
+-rw-r--r--   1 root root    102928 Nov  2  2009 ./source/x/x11/src/app/xcompmgr-1.1.5.tar.xz
+-rw-r--r--   1 root root    106728 Sep 24  2010 ./source/x/x11/src/app/xconsole-1.0.4.tar.xz
+-rw-r--r--   1 root root     98912 Sep 24  2010 ./source/x/x11/src/app/xcursorgen-1.0.4.tar.xz
+-rw-r--r--   1 root root    102156 Oct 31 17:10 ./source/x/x11/src/app/xdbedizzy-1.1.0.tar.xz
+-rw-r--r--   1 root root    120980 Aug  6  2010 ./source/x/x11/src/app/xditview-1.0.2.tar.xz
+-rw-r--r--   1 root root    356384 Apr 10  2010 ./source/x/x11/src/app/xdm-1.1.10.tar.xz
+-rw-r--r--   1 root root    112608 Oct  3  2010 ./source/x/x11/src/app/xdpyinfo-1.2.0.tar.xz
+-rw-r--r--   1 root root     97056 Nov  9 07:03 ./source/x/x11/src/app/xdriinfo-1.0.4.tar.xz
+-rw-r--r--   1 root root    457836 Oct 30 22:30 ./source/x/x11/src/app/xedit-1.2.0.tar.xz
+-rw-r--r--   1 root root    102524 Oct 30 16:04 ./source/x/x11/src/app/xev-1.1.0.tar.xz
+-rw-r--r--   1 root root    105108 Nov 25 07:30 ./source/x/x11/src/app/xeyes-1.1.1.tar.xz
+-rw-r--r--   1 root root     97320 Oct 31 18:20 ./source/x/x11/src/app/xf86dga-1.0.3.tar.xz
+-rw-r--r--   1 root root    111984 Oct 21  2010 ./source/x/x11/src/app/xfd-1.1.0.tar.xz
+-rw-r--r--   1 root root    115868 Sep 27  2010 ./source/x/x11/src/app/xfontsel-1.0.3.tar.xz
+-rw-r--r--   1 root root    193808 Oct 30 22:40 ./source/x/x11/src/app/xfs-1.1.1.tar.xz
+-rw-r--r--   1 root root     97452 Oct 30 22:56 ./source/x/x11/src/app/xfsinfo-1.0.3.tar.xz
+-rw-r--r--   1 root root     97192 Nov  9 07:50 ./source/x/x11/src/app/xgamma-1.0.4.tar.xz
+-rw-r--r--   1 root root    154592 Oct 30 23:35 ./source/x/x11/src/app/xgc-1.0.3.tar.xz
+-rw-r--r--   1 root root    106456 Oct 30 16:54 ./source/x/x11/src/app/xhost-1.0.4.tar.xz
+-rw-r--r--   1 root root    125352 Oct 30 23:45 ./source/x/x11/src/app/xinit-1.3.0.tar.xz
+-rw-r--r--   1 root root    120504 Nov 11 04:01 ./source/x/x11/src/app/xinput-1.5.3.tar.xz
+-rw-r--r--   1 root root    196140 Feb 10 23:08 ./source/x/x11/src/app/xkbcomp-1.2.1.tar.xz
+-rw-r--r--   1 root root    126624 Dec  9 05:57 ./source/x/x11/src/app/xkbevd-1.1.2.tar.xz
+-rw-r--r--   1 root root    133736 Jan  8 03:10 ./source/x/x11/src/app/xkbprint-1.0.3.tar.xz
+-rw-r--r--   1 root root    110104 Oct 30 17:15 ./source/x/x11/src/app/xkbutils-1.0.3.tar.xz
+-rw-r--r--   1 root root    100368 Nov 11 03:28 ./source/x/x11/src/app/xkill-1.0.3.tar.xz
+-rw-r--r--   1 root root    112172 Sep 26  2010 ./source/x/x11/src/app/xload-1.1.0.tar.xz
+-rw-r--r--   1 root root    106752 Oct 31 00:02 ./source/x/x11/src/app/xlogo-1.0.3.tar.xz
+-rw-r--r--   1 root root     96240 Jun  3  2010 ./source/x/x11/src/app/xlsatoms-1.1.0.tar.xz
+-rw-r--r--   1 root root    101680 Sep 24  2010 ./source/x/x11/src/app/xlsclients-1.1.1.tar.xz
+-rw-r--r--   1 root root    103228 Jun 11  2010 ./source/x/x11/src/app/xlsfonts-1.0.3.tar.xz
+-rw-r--r--   1 root root    115872 Oct 31 00:23 ./source/x/x11/src/app/xmag-1.0.4.tar.xz
+-rw-r--r--   1 root root    151824 Oct 31 00:40 ./source/x/x11/src/app/xman-1.1.1.tar.xz
+-rw-r--r--   1 root root    101600 Jan 30  2010 ./source/x/x11/src/app/xmessage-1.0.3.tar.xz
+-rw-r--r--   1 root root    173752 Oct 31 00:47 ./source/x/x11/src/app/xmh-1.0.2.tar.xz
+-rw-r--r--   1 root root    115976 Sep 24  2010 ./source/x/x11/src/app/xmodmap-1.0.5.tar.xz
+-rw-r--r--   1 root root     99592 Jul 23  2010 ./source/x/x11/src/app/xmore-1.0.2.tar.xz
+-rw-r--r--   1 root root     64084 Jan 18  2006 ./source/x/x11/src/app/xphelloworld-1.0.1.tar.xz
+-rw-r--r--   1 root root    117216 Oct 17  2009 ./source/x/x11/src/app/xpr-1.0.3.tar.xz
+-rw-r--r--   1 root root    118436 Oct 30 18:19 ./source/x/x11/src/app/xprop-1.2.0.tar.xz
+-rw-r--r--   1 root root    136704 Oct 30 18:29 ./source/x/x11/src/app/xrandr-1.3.4.tar.xz
+-rw-r--r--   1 root root    110064 Apr  5 16:02 ./source/x/x11/src/app/xrdb-1.0.9.tar.xz
+-rw-r--r--   1 root root     97992 Nov 11 03:55 ./source/x/x11/src/app/xrefresh-1.0.4.tar.xz
+-rw-r--r--   1 root root    164512 Oct 31 01:31 ./source/x/x11/src/app/xscope-1.3.tar.xz
+-rw-r--r--   1 root root    115132 Nov 11 04:03 ./source/x/x11/src/app/xset-1.2.1.tar.xz
+-rw-r--r--   1 root root    100688 Oct 30 18:48 ./source/x/x11/src/app/xsetroot-1.1.0.tar.xz
+-rw-r--r--   1 root root    136804 Sep 27  2010 ./source/x/x11/src/app/xsm-1.0.2.tar.xz
+-rw-r--r--   1 root root     98468 Sep 27  2010 ./source/x/x11/src/app/xstdcmap-1.0.2.tar.xz
+-rw-r--r--   1 root root    103856 Jan 16  2010 ./source/x/x11/src/app/xvidtune-1.0.2.tar.xz
+-rw-r--r--   1 root root     98216 Nov  6 16:01 ./source/x/x11/src/app/xvinfo-1.1.1.tar.xz
+-rw-r--r--   1 root root    117680 Nov  7 18:19 ./source/x/x11/src/app/xwd-1.0.4.tar.xz
+-rw-r--r--   1 root root    120696 Oct 30 18:59 ./source/x/x11/src/app/xwininfo-1.1.1.tar.xz
+-rw-r--r--   1 root root    104868 Nov  7 18:45 ./source/x/x11/src/app/xwud-1.0.3.tar.xz
+drwxr-xr-x   2 root root      4096 Apr  7 18:05 ./source/x/x11/src/data
+-rw-r--r--   1 root root    107168 Dec  9 06:29 ./source/x/x11/src/data/xbitmaps-1.1.1.tar.xz
+-rw-r--r--   1 root root   1482588 Oct 30 15:59 ./source/x/x11/src/data/xcursor-themes-1.0.3.tar.xz
+-rw-r--r--   1 root root    591624 Apr  5 22:52 ./source/x/x11/src/data/xkeyboard-config-2.2.1.tar.xz
+drwxr-xr-x   2 root root      4096 Apr  6 04:28 ./source/x/x11/src/doc
+-rw-r--r--   1 root root    311768 Dec 19 06:46 ./source/x/x11/src/doc/xorg-docs-1.6.tar.xz
+-rw-r--r--   1 root root     97492 Mar 29 20:38 ./source/x/x11/src/doc/xorg-sgml-doctools-1.7.tar.xz
+drwxr-xr-x   2 root root      4096 Apr 16 03:15 ./source/x/x11/src/driver
+-rw-r--r--   1 root root    210288 Oct 13  2009 ./source/x/x11/src/driver/xf86-input-acecad-1.4.0.tar.xz
+-rw-r--r--   1 root root    224004 Aug 10  2010 ./source/x/x11/src/driver/xf86-input-aiptek-1.3.1.tar.xz
+-rw-r--r--   1 root root    277992 Jan 11 02:50 ./source/x/x11/src/driver/xf86-input-evdev-2.6.0.tar.xz
+-rw-r--r--   1 root root    231760 Oct 31  2009 ./source/x/x11/src/driver/xf86-input-joystick-1.5.0.tar.xz
+-rw-r--r--   1 root root    246540 Mar  7 23:44 ./source/x/x11/src/driver/xf86-input-keyboard-1.6.0.tar.xz
+-rw-r--r--   1 root root    272068 Mar  9 22:34 ./source/x/x11/src/driver/xf86-input-mouse-1.7.0.tar.xz
+-rw-r--r--   1 root root    206712 Mar  4  2010 ./source/x/x11/src/driver/xf86-input-penmount-1.4.1.tar.xz
+-rw-r--r--   1 root root    339044 Mar  4 02:43 ./source/x/x11/src/driver/xf86-input-synaptics-1.4.0.tar.xz
+-rw-r--r--   1 root root    225404 Mar  2 11:05 ./source/x/x11/src/driver/xf86-input-vmmouse-12.7.0.tar.xz
+-rw-r--r--   1 root root    214308 Oct 30 16:27 ./source/x/x11/src/driver/xf86-input-void-1.3.1.tar.xz
+-rw-r--r--   1 root root    383204 Feb 17 01:39 ./source/x/x11/src/driver/xf86-input-wacom-0.10.11.tar.xz
+-rw-r--r--   1 root root    247284 Jul 23  2010 ./source/x/x11/src/driver/xf86-video-apm-1.2.3.tar.xz
+-rw-r--r--   1 root root    214660 Jul 23  2010 ./source/x/x11/src/driver/xf86-video-ark-0.7.3.tar.xz
+-rw-r--r--   1 root root    231564 Aug 10  2010 ./source/x/x11/src/driver/xf86-video-ast-0.91.10.tar.xz
+-rw-r--r--   1 root root    859448 Mar 17 23:07 ./source/x/x11/src/driver/xf86-video-ati-6.14.1.tar.xz
+-rw-r--r--   1 root root    304560 Feb 27 16:21 ./source/x/x11/src/driver/xf86-video-chips-1.2.4.tar.xz
+-rw-r--r--   1 root root    223812 Jul 30  2009 ./source/x/x11/src/driver/xf86-video-cirrus-1.3.2.tar.xz
+-rw-r--r--   1 root root    207756 Jul  5  2010 ./source/x/x11/src/driver/xf86-video-dummy-0.3.4.tar.xz
+-rw-r--r--   1 root root    524676 Nov  9 09:31 ./source/x/x11/src/driver/xf86-video-geode-2.11.10.tar.xz
+-rw-r--r--   1 root root    314196 Sep 11  2010 ./source/x/x11/src/driver/xf86-video-glint-1.2.5.tar.xz
+-rw-r--r--   1 root root    240280 Aug 10  2010 ./source/x/x11/src/driver/xf86-video-i128-1.3.4.tar.xz
+-rw-r--r--   1 root root    209584 Jul 30  2009 ./source/x/x11/src/driver/xf86-video-i740-1.3.2.tar.xz
+-rw-r--r--   1 root root    775108 Apr 14 09:21 ./source/x/x11/src/driver/xf86-video-intel-2.15.0.tar.xz
+-rw-r--r--   1 root root    416140 Jul 30  2009 ./source/x/x11/src/driver/xf86-video-mach64-6.8.2.tar.xz
+-rw-r--r--   1 root root    355800 Aug 10  2010 ./source/x/x11/src/driver/xf86-video-mga-1.4.13.tar.xz
+-rw-r--r--   1 root root    242244 Jul  5  2010 ./source/x/x11/src/driver/xf86-video-neomagic-1.2.5.tar.xz
+-rw-r--r--   1 root root   5002204 Dec 13 03:05 ./source/x/x11/src/driver/xf86-video-nouveau-8bb82312.tar.xz
+-rw-r--r--   1 root root    303492 Jul 30  2010 ./source/x/x11/src/driver/xf86-video-nv-2.1.18.tar.xz
+-rw-r--r--   1 root root    373296 Oct 13  2009 ./source/x/x11/src/driver/xf86-video-openchrome-0.2.904.tar.xz
+-rw-r--r--   1 root root    351232 Jul 30  2009 ./source/x/x11/src/driver/xf86-video-r128-6.8.1.tar.xz
+-rw-r--r--   1 root root    656376 Oct 13  2009 ./source/x/x11/src/driver/xf86-video-radeonhd-1.3.0.tar.xz
+-rw-r--r--   1 root root    262936 Jul  5  2010 ./source/x/x11/src/driver/xf86-video-rendition-4.2.4.tar.xz
+-rw-r--r--   1 root root    214920 Jul 30  2009 ./source/x/x11/src/driver/xf86-video-s3-0.6.3.tar.xz
+-rw-r--r--   1 root root    236912 Jul 30  2009 ./source/x/x11/src/driver/xf86-video-s3virge-1.10.4.tar.xz
+-rw-r--r--   1 root root    310764 Dec  5 09:13 ./source/x/x11/src/driver/xf86-video-savage-2.3.2.tar.xz
+-rw-r--r--   1 root root    296928 Feb 27 16:23 ./source/x/x11/src/driver/xf86-video-siliconmotion-1.7.5.tar.xz
+-rw-r--r--   1 root root    557304 Jul  5  2010 ./source/x/x11/src/driver/xf86-video-sis-0.10.3.tar.xz
+-rw-r--r--   1 root root    290200 Jul  5  2010 ./source/x/x11/src/driver/xf86-video-sisusb-0.9.4.tar.xz
+-rw-r--r--   1 root root    227984 Jul 30  2009 ./source/x/x11/src/driver/xf86-video-tdfx-1.4.3.tar.xz
+-rw-r--r--   1 root root    214348 Oct 13  2009 ./source/x/x11/src/driver/xf86-video-tga-1.2.1.tar.xz
+-rw-r--r--   1 root root    260916 Jul  5  2010 ./source/x/x11/src/driver/xf86-video-trident-1.3.4.tar.xz
+-rw-r--r--   1 root root    246852 Jul  5  2010 ./source/x/x11/src/driver/xf86-video-tseng-1.2.4.tar.xz
+-rw-r--r--   1 root root    183872 Mar 19  2008 ./source/x/x11/src/driver/xf86-video-v4l-0.2.0.tar.xz
+-rw-r--r--   1 root root    217708 Jan  4  2010 ./source/x/x11/src/driver/xf86-video-vesa-2.3.0.tar.xz
+-rw-r--r--   1 root root    260648 Nov  9 13:57 ./source/x/x11/src/driver/xf86-video-vmware-11.0.3.tar.xz
+-rw-r--r--   1 root root    222360 Jul  5  2010 ./source/x/x11/src/driver/xf86-video-voodoo-1.2.4.tar.xz
+-rw-r--r--   1 root root    411440 Aug 10  2010 ./source/x/x11/src/driver/xf86-video-xgi-1.6.0.tar.xz
+drwxr-xr-x   2 root root      4096 Nov 16 20:36 ./source/x/x11/src/font
+-rw-r--r--   1 root root    291832 Oct 30 03:55 ./source/x/x11/src/font/encodings-1.0.4.tar.xz
+-rw-r--r--   1 root root    945192 Nov 14 23:54 ./source/x/x11/src/font/font-adobe-100dpi-1.0.3.tar.xz
+-rw-r--r--   1 root root    796356 Nov 14 23:54 ./source/x/x11/src/font/font-adobe-75dpi-1.0.3.tar.xz
+-rw-r--r--   1 root root    296996 Nov 14 23:59 ./source/x/x11/src/font/font-adobe-utopia-100dpi-1.0.4.tar.xz
+-rw-r--r--   1 root root    247800 Nov 15 00:02 ./source/x/x11/src/font/font-adobe-utopia-75dpi-1.0.4.tar.xz
+-rw-r--r--   1 root root    263520 Nov 15 00:05 ./source/x/x11/src/font/font-adobe-utopia-type1-1.0.4.tar.xz
+-rw-r--r--   1 root root     92712 Oct  5  2010 ./source/x/x11/src/font/font-alias-1.0.3.tar.xz
+-rw-r--r--   1 root root    101872 Nov 15 19:55 ./source/x/x11/src/font/font-arabic-misc-1.0.3.tar.xz
+-rw-r--r--   1 root root    589148 Nov 15 20:01 ./source/x/x11/src/font/font-bh-100dpi-1.0.3.tar.xz
+-rw-r--r--   1 root root    489900 Nov 15 20:06 ./source/x/x11/src/font/font-bh-75dpi-1.0.3.tar.xz
+-rw-r--r--   1 root root    216368 Nov 15 20:11 ./source/x/x11/src/font/font-bh-lucidatypewriter-100dpi-1.0.3.tar.xz
+-rw-r--r--   1 root root    193720 Nov 15 20:16 ./source/x/x11/src/font/font-bh-lucidatypewriter-75dpi-1.0.3.tar.xz
+-rw-r--r--   1 root root    367740 Nov 11 05:26 ./source/x/x11/src/font/font-bh-ttf-1.0.3.tar.xz
+-rw-r--r--   1 root root    628208 Nov 15 20:36 ./source/x/x11/src/font/font-bh-type1-1.0.3.tar.xz
+-rw-r--r--   1 root root    172716 Nov 15 20:39 ./source/x/x11/src/font/font-bitstream-100dpi-1.0.3.tar.xz
+-rw-r--r--   1 root root    155516 Nov 15 20:46 ./source/x/x11/src/font/font-bitstream-75dpi-1.0.3.tar.xz
+-rw-r--r--   1 root root    329196 Nov 15 20:53 ./source/x/x11/src/font/font-bitstream-speedo-1.0.2.tar.xz
+-rw-r--r--   1 root root    390700 Nov 15 20:56 ./source/x/x11/src/font/font-bitstream-type1-1.0.3.tar.xz
+-rw-r--r--   1 root root    236644 Nov 15 21:06 ./source/x/x11/src/font/font-cronyx-cyrillic-1.0.3.tar.xz
+-rw-r--r--   1 root root     94716 Nov 15 21:14 ./source/x/x11/src/font/font-cursor-misc-1.0.3.tar.xz
+-rw-r--r--   1 root root    508312 Nov 15 21:20 ./source/x/x11/src/font/font-daewoo-misc-1.0.3.tar.xz
+-rw-r--r--   1 root root     92740 Nov 15 21:25 ./source/x/x11/src/font/font-dec-misc-1.0.3.tar.xz
+-rw-r--r--   1 root root    374360 Nov 15 21:33 ./source/x/x11/src/font/font-ibm-type1-1.0.3.tar.xz
+-rw-r--r--   1 root root    719756 Nov 15 22:21 ./source/x/x11/src/font/font-isas-misc-1.0.3.tar.xz
+-rw-r--r--   1 root root    517868 Nov 15 22:34 ./source/x/x11/src/font/font-jis-misc-1.0.3.tar.xz
+-rw-r--r--   1 root root     91408 Nov 15 22:38 ./source/x/x11/src/font/font-micro-misc-1.0.3.tar.xz
+-rw-r--r--   1 root root    121968 Nov 15 22:42 ./source/x/x11/src/font/font-misc-cyrillic-1.0.3.tar.xz
+-rw-r--r--   1 root root    218584 Nov 15 22:46 ./source/x/x11/src/font/font-misc-ethiopic-1.0.3.tar.xz
+-rw-r--r--   1 root root    828248 Nov 15 22:52 ./source/x/x11/src/font/font-misc-meltho-1.0.3.tar.xz
+-rw-r--r--   1 root root   1423336 Nov 15 23:06 ./source/x/x11/src/font/font-misc-misc-1.1.2.tar.xz
+-rw-r--r--   1 root root    217292 Nov 15 23:09 ./source/x/x11/src/font/font-mutt-misc-1.0.3.tar.xz
+-rw-r--r--   1 root root    128096 Nov 15 23:12 ./source/x/x11/src/font/font-schumacher-misc-1.1.2.tar.xz
+-rw-r--r--   1 root root     95876 Nov 15 23:14 ./source/x/x11/src/font/font-screen-cyrillic-1.0.4.tar.xz
+-rw-r--r--   1 root root     99540 Nov 15 23:18 ./source/x/x11/src/font/font-sony-misc-1.0.3.tar.xz
+-rw-r--r--   1 root root    106568 Nov 15 23:20 ./source/x/x11/src/font/font-sun-misc-1.0.3.tar.xz
+-rw-r--r--   1 root root    119952 Oct 14  2010 ./source/x/x11/src/font/font-util-1.2.0.tar.xz
+-rw-r--r--   1 root root     93740 Nov 15 23:21 ./source/x/x11/src/font/font-winitzki-cyrillic-1.0.3.tar.xz
+-rw-r--r--   1 root root    117928 Nov 15 23:23 ./source/x/x11/src/font/font-xfree86-type1-1.0.4.tar.xz
+-rwxr-xr-x   1 root root       897 Jan 31 07:24 ./source/x/x11/src/get-xf86-video-nouveau.sh
+drwxr-xr-x   2 root root      4096 Apr  6 04:05 ./source/x/x11/src/lib
+-rw-r--r--   1 root root    236792 Oct 27 01:49 ./source/x/x11/src/lib/libFS-1.0.3.tar.xz
+-rw-r--r--   1 root root    269404 Oct 19  2010 ./source/x/x11/src/lib/libICE-1.0.7.tar.xz
+-rw-r--r--   1 root root    256596 Oct 28 05:32 ./source/x/x11/src/lib/libSM-1.2.0.tar.xz
+-rw-r--r--   1 root root   1717272 Apr  5 21:04 ./source/x/x11/src/lib/libX11-1.4.3.tar.xz
+-rw-r--r--   1 root root    220360 Oct 30 05:22 ./source/x/x11/src/lib/libXScrnSaver-1.2.1.tar.xz
+-rw-r--r--   1 root root    215724 Jul 19  2010 ./source/x/x11/src/lib/libXau-1.0.6.tar.xz
+-rw-r--r--   1 root root    546976 Jan 12 01:18 ./source/x/x11/src/lib/libXaw-1.0.9.tar.xz
+-rw-r--r--   1 root root    220776 Oct 28 05:41 ./source/x/x11/src/lib/libXcomposite-0.4.3.tar.xz
+-rw-r--r--   1 root root    233248 Oct 28 05:51 ./source/x/x11/src/lib/libXcursor-1.1.11.tar.xz
+-rw-r--r--   1 root root    208192 Jun  9  2010 ./source/x/x11/src/lib/libXdamage-1.1.3.tar.xz
+-rw-r--r--   1 root root    239016 Oct 29 23:06 ./source/x/x11/src/lib/libXdmcp-1.1.0.tar.xz
+-rw-r--r--   1 root root    212200 Oct 31 16:46 ./source/x/x11/src/lib/libXevie-1.0.3.tar.xz
+-rw-r--r--   1 root root    280120 Oct 28 06:10 ./source/x/x11/src/lib/libXext-1.2.0.tar.xz
+-rw-r--r--   1 root root    214808 Mar  8 16:35 ./source/x/x11/src/lib/libXfixes-5.0.tar.xz
+-rw-r--r--   1 root root    379392 Oct 29 03:50 ./source/x/x11/src/lib/libXfont-1.4.3.tar.xz
+-rw-r--r--   1 root root    189140 Oct 13  2009 ./source/x/x11/src/lib/libXfontcache-1.0.5.tar.xz
+-rw-r--r--   1 root root    252040 Oct 29 23:23 ./source/x/x11/src/lib/libXft-2.2.0.tar.xz
+-rw-r--r--   1 root root    353096 Mar 18 23:34 ./source/x/x11/src/lib/libXi-1.4.2.tar.xz
+-rw-r--r--   1 root root    214976 Oct 28 06:30 ./source/x/x11/src/lib/libXinerama-1.1.1.tar.xz
+-rw-r--r--   1 root root    296064 Oct 30 00:19 ./source/x/x11/src/lib/libXmu-1.1.0.tar.xz
+-rw-r--r--   1 root root    247092 Jan 14 06:11 ./source/x/x11/src/lib/libXp-1.0.1.tar.xz
+-rw-r--r--   1 root root    337460 Oct 30 00:33 ./source/x/x11/src/lib/libXpm-3.5.9.tar.xz
+-rw-r--r--   1 root root    231960 Oct 28 19:38 ./source/x/x11/src/lib/libXrandr-1.3.1.tar.xz
+-rw-r--r--   1 root root    223896 Jun  9  2010 ./source/x/x11/src/lib/libXrender-0.9.6.tar.xz
+-rw-r--r--   1 root root    214312 Oct 28 23:52 ./source/x/x11/src/lib/libXres-1.0.5.tar.xz
+-rw-r--r--   1 root root    590864 Mar 10 12:09 ./source/x/x11/src/lib/libXt-1.1.1.tar.xz
+-rw-r--r--   1 root root    238284 Oct 30 00:45 ./source/x/x11/src/lib/libXtst-1.2.0.tar.xz
+-rw-r--r--   1 root root    229500 Oct 30 00:55 ./source/x/x11/src/lib/libXv-1.0.6.tar.xz
+-rw-r--r--   1 root root    222960 Aug 14  2010 ./source/x/x11/src/lib/libXvMC-1.0.6.tar.xz
+-rw-r--r--   1 root root    223740 Oct 30 01:01 ./source/x/x11/src/lib/libXxf86dga-1.1.2.tar.xz
+-rw-r--r--   1 root root    212836 Nov 21 21:49 ./source/x/x11/src/lib/libXxf86misc-1.0.3.tar.xz
+-rw-r--r--   1 root root    219016 Oct 30 01:05 ./source/x/x11/src/lib/libXxf86vm-1.1.1.tar.xz
+-rw-r--r--   1 root root    221120 Oct 29 02:40 ./source/x/x11/src/lib/libdmx-1.1.1.tar.xz
+-rw-r--r--   1 root root    223944 Oct 21  2010 ./source/x/x11/src/lib/libfontenc-1.1.0.tar.xz
+-rw-r--r--   1 root root    271432 Feb  3 04:52 ./source/x/x11/src/lib/libpciaccess-0.12.1.tar.xz
+-rw-r--r--   1 root root    263052 Oct 30 01:17 ./source/x/x11/src/lib/libxkbfile-1.0.7.tar.xz
+-rw-r--r--   1 root root    364492 Jan 19 13:34 ./source/x/x11/src/lib/pixman-0.20.2.tar.xz
+-rw-r--r--   1 root root    146688 Nov  9 00:38 ./source/x/x11/src/lib/xtrans-1.2.6.tar.xz
+drwxr-xr-x   2 root root      4096 Mar 27 07:41 ./source/x/x11/src/proto
+-rw-r--r--   1 root root     94368 Oct 30 03:22 ./source/x/x11/src/proto/bigreqsproto-1.1.1.tar.xz
+-rw-r--r--   1 root root     94356 Oct 30 03:29 ./source/x/x11/src/proto/compositeproto-0.4.2.tar.xz
+-rw-r--r--   1 root root     91724 Oct 30 03:37 ./source/x/x11/src/proto/damageproto-1.2.1.tar.xz
+-rw-r--r--   1 root root     89776 Jan  6 01:39 ./source/x/x11/src/proto/dmxproto-2.3.1.tar.xz
+-rw-r--r--   1 root root     89040 Feb 16  2010 ./source/x/x11/src/proto/dri2proto-2.3.tar.xz
+-rw-r--r--   1 root root     88412 Jan  6 02:06 ./source/x/x11/src/proto/evieext-1.1.1.tar.xz
+-rw-r--r--   1 root root     93728 Mar  8 16:19 ./source/x/x11/src/proto/fixesproto-5.0.tar.xz
+-rw-r--r--   1 root root     78004 Oct 13  2009 ./source/x/x11/src/proto/fontcacheproto-0.1.3.tar.xz
+-rw-r--r--   1 root root    121468 Oct 30 04:32 ./source/x/x11/src/proto/fontsproto-2.1.1.tar.xz
+-rw-r--r--   1 root root     98288 Aug 10  2010 ./source/x/x11/src/proto/glproto-1.4.12.tar.xz
+-rw-r--r--   1 root root    145316 Nov 11 04:15 ./source/x/x11/src/proto/inputproto-2.0.1.tar.xz
+-rw-r--r--   1 root root    103816 Aug 10  2010 ./source/x/x11/src/proto/kbproto-1.0.5.tar.xz
+-rw-r--r--   1 root root    191432 Jan  6 02:33 ./source/x/x11/src/proto/printproto-1.0.5.tar.xz
+-rw-r--r--   1 root root    114768 Oct 30 06:13 ./source/x/x11/src/proto/randrproto-1.3.2.tar.xz
+-rw-r--r--   1 root root    103576 Oct 30 06:21 ./source/x/x11/src/proto/recordproto-1.14.1.tar.xz
+-rw-r--r--   1 root root     97920 Aug 10  2010 ./source/x/x11/src/proto/renderproto-0.11.1.tar.xz
+-rw-r--r--   1 root root     88480 Dec  9 06:21 ./source/x/x11/src/proto/resourceproto-1.1.1.tar.xz
+-rw-r--r--   1 root root     99792 Oct 30 06:28 ./source/x/x11/src/proto/scrnsaverproto-1.2.1.tar.xz
+-rw-r--r--   1 root root     92500 Aug 10  2010 ./source/x/x11/src/proto/videoproto-2.3.1.tar.xz
+-rw-r--r--   1 root root     93876 Oct 30 07:05 ./source/x/x11/src/proto/xcmiscproto-1.2.1.tar.xz
+-rw-r--r--   1 root root    194588 Feb 27 08:03 ./source/x/x11/src/proto/xextproto-7.2.0.tar.xz
+-rw-r--r--   1 root root     45976 Oct 13  2009 ./source/x/x11/src/proto/xf86bigfontproto-1.2.0.tar.xz
+-rw-r--r--   1 root root     79572 Oct 13  2009 ./source/x/x11/src/proto/xf86dgaproto-2.1.tar.xz
+-rw-r--r--   1 root root     89840 Jan  6 03:57 ./source/x/x11/src/proto/xf86driproto-2.1.1.tar.xz
+-rw-r--r--   1 root root     78424 Oct 13  2009 ./source/x/x11/src/proto/xf86miscproto-0.9.3.tar.xz
+-rw-r--r--   1 root root     90148 Jan  6 04:06 ./source/x/x11/src/proto/xf86vidmodeproto-2.3.1.tar.xz
+-rw-r--r--   1 root root     89352 Jan  6 04:21 ./source/x/x11/src/proto/xineramaproto-1.2.1.tar.xz
+-rw-r--r--   1 root root    248024 Mar 23 01:57 ./source/x/x11/src/proto/xproto-7.0.21.tar.xz
+drwxr-xr-x   2 root root      4096 Apr  6 04:45 ./source/x/x11/src/util
+-rw-r--r--   1 root root     65616 May 19  2006 ./source/x/x11/src/util/gccmakedep-1.0.2.tar.xz
+-rw-r--r--   1 root root    131032 Oct 31 02:11 ./source/x/x11/src/util/imake-1.0.4.tar.xz
+-rw-r--r--   1 root root     98748 Aug 14  2010 ./source/x/x11/src/util/lndir-1.0.2.tar.xz
+-rw-r--r--   1 root root    114524 Oct 30 05:47 ./source/x/x11/src/util/makedepend-1.0.3.tar.xz
+-rw-r--r--   1 root root     64800 Mar 15 00:42 ./source/x/x11/src/util/util-macros-1.13.0.tar.xz
+-rw-r--r--   1 root root    315680 Jan  6 04:37 ./source/x/x11/src/util/xorg-cf-files-1.0.4.tar.xz
+drwxr-xr-x   2 root root      4096 Aug 14  2010 ./source/x/x11/src/xcb
+-rw-r--r--   1 root root    185164 Oct 14  2009 ./source/x/x11/src/xcb/libpthread-stubs-0.3.tar.xz
+-rw-r--r--   1 root root    284816 Aug 13  2010 ./source/x/x11/src/xcb/libxcb-1.7.tar.xz
+-rw-r--r--   1 root root     90692 Dec  2  2009 ./source/x/x11/src/xcb/xcb-proto-1.6.tar.xz
+-rw-r--r--   1 root root    238932 Aug 24  2009 ./source/x/x11/src/xcb/xcb-util-0.3.6.tar.xz
+-rw-r--r--   1 root root    251920 Dec 17  2009 ./source/x/x11/src/xcb/xpyb-1.2.tar.xz
+drwxr-xr-x   2 root root      4096 Mar 18 03:41 ./source/x/x11/src/xserver
+-rw-r--r--   1 root root   4185452 Mar 17 21:49 ./source/x/x11/src/xserver/xorg-server-1.9.5.tar.xz
+-rwxr-xr-x   1 root root     12129 Feb 22  2010 ./source/x/x11/x11.SlackBuild
+drwxr-xr-x   2 root root      4096 Apr 15 19:37 ./source/x/xaw3d
+-rwxr-xr-x   1 root root       219 Apr 15 19:25 ./source/x/xaw3d/pull-xaw3d.sh
+-rw-r--r--   1 root root       975 Mar 23  2002 ./source/x/xaw3d/slack-desc
+-rw-r--r--   1 root root    211040 Apr 15 19:26 ./source/x/xaw3d/xaw3d-20110415git.tar.xz
+-rwxr-xr-x   1 root root      2958 Apr 15 19:44 ./source/x/xaw3d/xaw3d.SlackBuild
+drwxr-xr-x   2 root root      4096 Feb  1 06:54 ./source/x/xdg-user-dirs
+-rw-r--r--   1 root root       281 Dec 15 02:17 ./source/x/xdg-user-dirs/doinst.sh.gz
+-rw-r--r--   1 root root       940 Feb  1 06:53 ./source/x/xdg-user-dirs/slack-desc
+-rw-r--r--   1 root root    167200 Sep 13  2010 ./source/x/xdg-user-dirs/xdg-user-dirs-0.13.tar.xz
+-rwxr-xr-x   1 root root      2954 Feb  1 06:55 ./source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild
+drwxr-xr-x   2 root root      4096 Jan 20 23:46 ./source/x/xdg-utils
+-rw-r--r--   1 root root      1432 Jan 20 23:46 ./source/x/xdg-utils/doinst.sh.gz
+-rw-r--r--   1 root root      1010 Aug  1  2008 ./source/x/xdg-utils/slack-desc
+-rw-r--r--   1 root root    277034 Jan  1 10:13 ./source/x/xdg-utils/xdg-utils-1.1.0-rc1.tar.bz2
+-rwxr-xr-x   1 root root       327 Feb  2  2009 ./source/x/xdg-utils/xdg-utils-cvs_checkout.sh
+-rwxr-xr-x   1 root root      2656 Jan 22 04:11 ./source/x/xdg-utils/xdg-utils.SlackBuild
+-rw-r--r--   1 root root       121 Jul 12  2008 ./source/x/xdg-utils/xdg-utils.info
+drwxr-xr-x   2 root root      4096 Feb 24 17:55 ./source/x/xterm
+-rw-r--r--   1 root root       764 Feb 11  2007 ./source/x/xterm/slack-desc
+-rw-r--r--   1 root root    658200 Nov 22 01:42 ./source/x/xterm/xterm-267.tar.xz
+-rwxr-xr-x   1 root root      3775 Feb 22  2010 ./source/x/xterm/xterm.SlackBuild
+drwxr-xr-x  49 root root      4096 Apr  5 00:43 ./source/xap
+drwxr-xr-x   2 root root      4096 Dec 18 18:10 ./source/xap/MPlayer
+-rw-r--r--   1 root root    222567 Dec 23  2006 ./source/xap/MPlayer/Blue-1.7.tar.bz2
+-rwxr-xr--   1 root root     15388 Dec 18 18:39 ./source/xap/MPlayer/MPlayer.SlackBuild
+-rw-r--r--   1 root root   8592820 Dec 18 18:10 ./source/xap/MPlayer/MPlayer_nolibdvdcss-20101218.tar.xz
+-rw-r--r--   1 root root       937 May 15  2009 ./source/xap/MPlayer/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 11 20:50 ./source/xap/audacious
+drwxr-xr-x   2 root root      4096 Mar 11 21:03 ./source/xap/audacious-plugins
+-rw-r--r--   1 root root   2150032 Feb 22 17:29 ./source/xap/audacious-plugins/audacious-plugins-2.4.4.tar.xz
+-rwxr-xr-x   1 root root      3912 Mar 11 21:04 ./source/xap/audacious-plugins/audacious-plugins.SlackBuild
+-rw-r--r--   1 root root       629 Mar 11 21:03 ./source/xap/audacious-plugins/audacious-plugins.alsa.noise.is.not.helpful.diff.gz
+-rw-r--r--   1 root root       892 Mar  8  2007 ./source/xap/audacious-plugins/slack-desc
+-rw-r--r--   1 root root    796344 Feb 22 17:29 ./source/xap/audacious/audacious-2.4.4.tar.xz
+-rwxr-xr-x   1 root root      4141 Sep 10  2010 ./source/xap/audacious/audacious.SlackBuild
+-rw-r--r--   1 root root       121 Apr  9  2010 ./source/xap/audacious/doinst.sh.gz
+-rw-r--r--   1 root root      1075 Mar  8  2007 ./source/xap/audacious/slack-desc
+drwxr-xr-x   2 root root      4096 Dec 21 04:04 ./source/xap/blackbox
+-rw-r--r--   1 root root    176564 Sep  3  2009 ./source/xap/blackbox/bbkeys-0.9.1.tar.xz
+-rw-r--r--   1 root root       964 Sep  3  2009 ./source/xap/blackbox/blackbox-0.70.1-gcc-4.3.patch.gz
+-rw-r--r--   1 root root    409496 Sep  3  2009 ./source/xap/blackbox/blackbox-0.70.1.tar.xz
+-rwxr-xr-x   1 root root      6288 Feb 28 03:34 ./source/xap/blackbox/blackbox.SlackBuild
+-rw-r--r--   1 root root       900 May  5  2002 ./source/xap/blackbox/slack-desc
+-rw-r--r--   1 root root       339 Dec 21 04:04 ./source/xap/blackbox/xinitrc.blackbox.gz
+drwxr-xr-x   2 root root      4096 Mar  7 19:31 ./source/xap/blueman
+-rw-r--r--   1 root root      3648 Feb  1 00:16 ./source/xap/blueman/blueman-open
+-rw-r--r--   1 root root    410120 Mar  7 19:30 ./source/xap/blueman/blueman-r708.tar.xz
+-rw-r--r--   1 root root       330 Apr 11  2010 ./source/xap/blueman/blueman-use_blueman-open_for_obexfs.diff.gz
+-rwxr-xr-x   1 root root      4314 Feb  1 00:16 ./source/xap/blueman/blueman.SlackBuild
+-rw-r--r--   1 root root       361 Oct 31  2009 ./source/xap/blueman/doinst.sh.gz
+-rw-r--r--   1 root root       882 May  2  2010 ./source/xap/blueman/slack-desc
+drwxr-xr-x   2 root root      4096 Feb 19  2010 ./source/xap/electricsheep
+-rw-r--r--   1 root root      1306 Jan  7  2009 ./source/xap/electricsheep/README.slackware
+-rw-r--r--   1 root root   3116176 Mar  6  2009 ./source/xap/electricsheep/electricsheep-20090306.tar.xz
+-rwxr-xr--   1 root root      9750 Feb 19  2010 ./source/xap/electricsheep/electricsheep.SlackBuild
+-rw-r--r--   1 root root       268 Jul  1  2009 ./source/xap/electricsheep/electricsheep.mplayer.diff.gz
+-rw-r--r--   1 root root       524 Jan  7  2009 ./source/xap/electricsheep/electricsheep_gnome-open.patch
+-rw-r--r--   1 root root      1116 Dec 15  2008 ./source/xap/electricsheep/slack-desc
+drwxr-xr-x   2 root root      4096 Feb 28 01:16 ./source/xap/fluxbox
+-rw-r--r--   1 root root    681756 Feb 27 19:40 ./source/xap/fluxbox/fluxbox-1.3.1.tar.xz
+-rwxr-xr-x   1 root root      3510 Feb 28 01:16 ./source/xap/fluxbox/fluxbox.SlackBuild
+-rw-r--r--   1 root root       687 Jul 21  2005 ./source/xap/fluxbox/slack-desc
+-rw-r--r--   1 root root       339 Dec 21 04:03 ./source/xap/fluxbox/xinitrc.fluxbox.gz
+drwxr-xr-x   2 root root      4096 Dec 21 04:04 ./source/xap/fvwm
+-rw-r--r--   1 root root     23007 Feb 18  2007 ./source/xap/fvwm/ancient-icons.tar.gz
+-rw-r--r--   1 root root       279 Apr  5  2004 ./source/xap/fvwm/doinst.sh.gz
+-rw-r--r--   1 root root   1426470 Dec  9  2006 ./source/xap/fvwm/fvwm-2.4.20.tar.bz2
+-rwxr-xr-x   1 root root      4095 Dec 21 04:06 ./source/xap/fvwm/fvwm.SlackBuild
+-rw-r--r--   1 root root       442 Sep 13  1999 ./source/xap/fvwm/fvwm.colormap.diff.gz
+-rw-r--r--   1 root root       792 Feb 11  2008 ./source/xap/fvwm/slack-desc
+-rw-r--r--   1 root root      7625 Feb 18  2007 ./source/xap/fvwm/system.fvwm2rc.gz
+-rw-r--r--   1 root root       344 Dec 21 04:04 ./source/xap/fvwm/xinitrc.fvwm2.gz
+drwxr-xr-x   2 root root      4096 Mar 11  2010 ./source/xap/geeqie
+-rw-r--r--   1 root root       163 Mar 11  2010 ./source/xap/geeqie/doinst.sh.gz
+-rw-r--r--   1 root root   1078384 Mar 11  2010 ./source/xap/geeqie/geeqie-1.0.tar.xz
+-rwxr-xr-x   1 root root      3715 Mar 11 18:50 ./source/xap/geeqie/geeqie.SlackBuild
+-rw-r--r--   1 root root       776 Mar 11  2010 ./source/xap/geeqie/slack-desc
+drwxr-xr-x   2 root root      4096 May 23  2009 ./source/xap/gftp
+-rw-r--r--   1 root root   1687167 Dec  2  2008 ./source/xap/gftp/gftp-2.0.19.tar.bz2
+-rwxr-xr-x   1 root root      2997 May 23  2009 ./source/xap/gftp/gftp.SlackBuild
+-rw-r--r--   1 root root       304 Dec  2  2008 ./source/xap/gftp/gftp.desktop.gz
+-rw-r--r--   1 root root       899 Feb 11  2008 ./source/xap/gftp/slack-desc
+drwxr-xr-x   2 root root      4096 Nov  8 02:08 ./source/xap/gimp
+-rw-r--r--   1 root root  12409912 Oct  3  2010 ./source/xap/gimp/gimp-2.6.11.tar.xz
+-rwxr-xr-x   1 root root      3931 Mar 22 22:05 ./source/xap/gimp/gimp.SlackBuild
+-rw-r--r--   1 root root       928 Jan 29  2003 ./source/xap/gimp/slack-desc
+drwxr-xr-x   2 root root      4096 Feb 12 19:40 ./source/xap/gkrellm
+-rw-r--r--   1 root root    765011 Oct  7  2010 ./source/xap/gkrellm/gkrellm-2.3.5.tar.bz2
+-rw-r--r--   1 root root     12374 Feb  1  2004 ./source/xap/gkrellm/gkrellm-countdown-0.1.1.tar.gz
+-rwxr-xr-x   1 root root      4597 Feb 12 19:40 ./source/xap/gkrellm/gkrellm.SlackBuild
+-rw-r--r--   1 root root       211 Oct 26  2008 ./source/xap/gkrellm/gkrellm.theme.defaults.diff.gz
+-rw-r--r--   1 root root       971 Apr 29  2004 ./source/xap/gkrellm/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 21 22:21 ./source/xap/gnuchess
+-rw-r--r--   1 root root    142963 Jan 19  2004 ./source/xap/gnuchess/Sjeng-Free-11.2.tar.bz2
+-rw-r--r--   1 root root       652 Oct 27  2004 ./source/xap/gnuchess/chess.png
+-rw-r--r--   1 root root    462386 Feb 22  2008 ./source/xap/gnuchess/eboard-1.1.1.tar.bz2
+-rw-r--r--   1 root root       458 Feb 20  2010 ./source/xap/gnuchess/eboard.assert.diff.gz
+-rw-r--r--   1 root root       224 Oct 27  2004 ./source/xap/gnuchess/eboard.desktop
+-rw-r--r--   1 root root    210780 Jan 25 19:12 ./source/xap/gnuchess/gnuchess-5.08.tar.xz
+-rwxr-xr-x   1 root root      5629 Mar 21 22:24 ./source/xap/gnuchess/gnuchess.SlackBuild
+-rw-r--r--   1 root root       796 Oct 27  2004 ./source/xap/gnuchess/slack-desc
+-rw-r--r--   1 root root   1586180 Feb 21 00:54 ./source/xap/gnuchess/xboard-4.5.1.tar.xz
+-rw-r--r--   1 root root       238 Mar 21 22:22 ./source/xap/gnuchess/xboard.desktop
+drwxr-xr-x   2 root root      4096 Mar 18 04:37 ./source/xap/gnuplot
+-rw-r--r--   1 root root   2226152 Mar  5 03:29 ./source/xap/gnuplot/gnuplot-4.4.3.tar.xz
+-rwxr-xr-x   1 root root      4128 Sep  9  2010 ./source/xap/gnuplot/gnuplot.SlackBuild
+-rw-r--r--   1 root root      1105 Mar 16  2002 ./source/xap/gnuplot/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 19 22:34 ./source/xap/gucharmap
+-rw-r--r--   1 root root       121 Mar 23  2009 ./source/xap/gucharmap/doinst.sh.gz
+-rw-r--r--   1 root root   2658784 Dec 23 14:26 ./source/xap/gucharmap/gucharmap-2.33.2.tar.xz
+-rwxr-xr-x   1 root root      3480 Mar 19 22:37 ./source/xap/gucharmap/gucharmap.SlackBuild
+-rw-r--r--   1 root root       669 Oct 13  2004 ./source/xap/gucharmap/slack-desc
+drwxr-xr-x   2 root root      4096 Apr 14 17:16 ./source/xap/gv
+-rw-r--r--   1 root root    502216 Jun 10  2010 ./source/xap/gv/gv-3.7.1.tar.xz
+-rwxr-xr-x   1 root root      3907 Apr 14 17:17 ./source/xap/gv/gv.SlackBuild
+-rw-r--r--   1 root root       265 Apr 14 17:13 ./source/xap/gv/gv.keysym.diff.gz
+-rw-r--r--   1 root root       823 Mar 15  2002 ./source/xap/gv/slack-desc
+drwxr-xr-x   2 root root      4096 Jan 26 19:00 ./source/xap/imagemagick
+-rw-r--r--   1 root root   6202504 Jan  1 21:31 ./source/xap/imagemagick/ImageMagick-6.6.6-10.tar.xz
+-rwxr-xr-x   1 root root      5125 Jan 26 19:01 ./source/xap/imagemagick/imagemagick.SlackBuild
+-rw-r--r--   1 root root      1002 Apr 11  2004 ./source/xap/imagemagick/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 21 18:41 ./source/xap/mozilla-firefox
+-rw-r--r--   1 root root  66024327 Mar 18 16:58 ./source/xap/mozilla-firefox/firefox-4.0.source.tar.bz2
+-rw-r--r--   1 root root       194 Mar 18 17:40 ./source/xap/mozilla-firefox/firefox-4.0.source.tar.bz2.asc
+-rw-r--r--   1 root root       327 Jun 17  2008 ./source/xap/mozilla-firefox/firefox.moz_plugin_path.diff.gz
+-rw-r--r--   1 root root     24263 Jun 18  2009 ./source/xap/mozilla-firefox/firefox.png
+-rw-r--r--   1 root root       462 Jul  1  2009 ./source/xap/mozilla-firefox/mimeTypes.rdf.gz
+-rw-r--r--   1 root root       680 Jul  1  2009 ./source/xap/mozilla-firefox/mozilla-firefox-mimeTypes-fix.diff.gz
+-rwxr-xr-x   1 root root      6465 Mar 23 19:54 ./source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
+-rw-r--r--   1 root root      2620 Jul  1  2009 ./source/xap/mozilla-firefox/mozilla-firefox.desktop
+-rw-r--r--   1 root root       993 Mar  8  2005 ./source/xap/mozilla-firefox/slack-desc
+drwxr-xr-x   2 root root      4096 Mar  6 00:06 ./source/xap/mozilla-thunderbird
+-rw-r--r--   1 root root      1586 Dec 12  2009 ./source/xap/mozilla-thunderbird/mimeTypes.rdf.gz
+-rwxr-xr-x   1 root root      5932 Mar 23 19:53 ./source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
+-rw-r--r--   1 root root      3378 Mar  8  2005 ./source/xap/mozilla-thunderbird/mozilla-thunderbird.desktop
+-rw-r--r--   1 root root      1172 Mar  8  2005 ./source/xap/mozilla-thunderbird/slack-desc
+-rw-r--r--   1 root root  68760361 Mar  3 03:47 ./source/xap/mozilla-thunderbird/thunderbird-3.1.9.source.tar.bz2
+-rw-r--r--   1 root root       499 Mar  3 10:36 ./source/xap/mozilla-thunderbird/thunderbird-3.1.9.source.tar.bz2.asc
+-rw-r--r--   1 root root     47617 Feb 18  2006 ./source/xap/mozilla-thunderbird/thunderbird.png
+drwxr-xr-x   2 root root      4096 Feb 20 19:20 ./source/xap/pan
+-rw-r--r--   1 root root   1197720 Feb 19 10:19 ./source/xap/pan/pan-0.134.tar.xz
+-rwxr-xr-x   1 root root      3961 Feb 20 19:20 ./source/xap/pan/pan.SlackBuild
+-rw-r--r--   1 root root       721 Feb 11  2008 ./source/xap/pan/slack-desc
+drwxr-xr-x   2 root root      4096 Mar 11 18:12 ./source/xap/pidgin
+-rw-r--r--   1 root root   7341672 Mar 11 02:52 ./source/xap/pidgin/pidgin-2.7.11.tar.xz
+-rw-r--r--   1 root root    604129 May 18  2010 ./source/xap/pidgin/pidgin-encryption-3.1.tar.gz
+-rwxr-xr-x   1 root root      6803 Mar 11 18:30 ./source/xap/pidgin/pidgin.SlackBuild
+-rw-r--r--   1 root root       321 Dec  7  2008 ./source/xap/pidgin/purple-allow-sign-rsa-md5.patch.gz
+-rw-r--r--   1 root root       926 Mar  9  2008 ./source/xap/pidgin/slack-desc
+drwxr-xr-x   2 root root      4096 Apr 21 01:31 ./source/xap/rdesktop
+-rw-r--r--   1 root root    243001 May 11  2008 ./source/xap/rdesktop/rdesktop-1.6.0.tar.bz2
+-rw-r--r--   1 root root       403 Apr 21 01:29 ./source/xap/rdesktop/rdesktop.CVE-2011-1595.diff.gz
+-rwxr-xr-x   1 root root      3416 Apr 21 01:31 ./source/xap/rdesktop/rdesktop.SlackBuild
+-rw-r--r--   1 root root       854 Sep 12  2006 ./source/xap/rdesktop/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/xap/rxvt
+-rw-r--r--   1 root root    493199 Mar 26  2003 ./source/xap/rxvt/rxvt-2.7.10.tar.bz2
+-rwxr-xr-x   1 root root      3012 Jun  9  2009 ./source/xap/rxvt/rxvt.SlackBuild
+-rw-r--r--   1 root root      2002 Jun  8  2003 ./source/xap/rxvt/rxvt.utempter.diff.gz
+-rw-r--r--   1 root root       880 Mar 10  2002 ./source/xap/rxvt/slack-desc
+drwxr-xr-x   2 root root      4096 Feb 16 15:08 ./source/xap/sane
+-rw-r--r--   1 root root       133 Sep 23  2006 ./source/xap/sane/dll.conf.additions.gz
+-rw-r--r--   1 root root       285 Feb 12  2008 ./source/xap/sane/doinst.sh.gz
+-rw-r--r--   1 root root   4064768 Feb 14 04:07 ./source/xap/sane/sane-backends-1.0.22.tar.bz2
+-rw-r--r--   1 root root       341 Jan 20  2010 ./source/xap/sane/sane-frontends-1.0.14-sane_cap_always_settable.diff.gz
+-rw-r--r--   1 root root    190172 Sep 18  2005 ./source/xap/sane/sane-frontends-1.0.14.tar.bz2
+-rwxr-xr-x   1 root root      4647 Mar 18 19:56 ./source/xap/sane/sane.SlackBuild
+-rw-r--r--   1 root root       776 Apr  4  2002 ./source/xap/sane/slack-desc
+drwxr-xr-x   3 root root      4096 Apr 11 01:12 ./source/xap/seamonkey
+-rw-r--r--   1 root root       231 Jun  1  2007 ./source/xap/seamonkey/doinst.sh.gz
+drwxr-xr-x   2 root root      4096 Nov  6  2009 ./source/xap/seamonkey/pkgconfig
+-rw-r--r--   1 root root       320 Nov  6  2009 ./source/xap/seamonkey/pkgconfig/seamonkey-gtkmozembed.pc
+-rw-r--r--   1 root root       305 Nov  6  2009 ./source/xap/seamonkey/pkgconfig/seamonkey-js.pc
+-rw-r--r--   1 root root       308 Nov  6  2009 ./source/xap/seamonkey/pkgconfig/seamonkey-nspr.pc
+-rw-r--r--   1 root root       302 Nov  6  2009 ./source/xap/seamonkey/pkgconfig/seamonkey-nss.pc
+-rw-r--r--   1 root root       276 Nov  6  2009 ./source/xap/seamonkey/pkgconfig/seamonkey-plugin.pc
+-rw-r--r--   1 root root       372 Nov  6  2009 ./source/xap/seamonkey/pkgconfig/seamonkey-xpcom.pc
+-rw-r--r--   1 root root  66878216 Apr  8 11:40 ./source/xap/seamonkey/seamonkey-2.1b3.source.tar.xz
+-rw-r--r--   1 root root     12796 Feb  9  2006 ./source/xap/seamonkey/seamonkey-icon.png
+-rw-r--r--   1 root root       185 Feb  9  2006 ./source/xap/seamonkey/seamonkey-mail-icon.png
+-rw-r--r--   1 root root       207 Feb  9  2006 ./source/xap/seamonkey/seamonkey-mail.desktop
+-rwxr-xr-x   1 root root      8367 Apr 11 01:08 ./source/xap/seamonkey/seamonkey.SlackBuild
+-rw-r--r--   1 root root       178 Feb  9  2006 ./source/xap/seamonkey/seamonkey.desktop
+-rw-r--r--   1 root root       894 Nov 10  2009 ./source/xap/seamonkey/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/xap/seyon
+-rw-r--r--   1 root root       713 May  9  1999 ./source/xap/seyon/seyon-2.20c.lsm
+-rw-r--r--   1 root root    167487 May  9  1999 ./source/xap/seyon/seyon-2.20c.tar.gz
+-rwxr-xr-x   1 root root      3601 May 19  2009 ./source/xap/seyon/seyon.SlackBuild
+-rw-r--r--   1 root root     36723 Jan  3  2005 ./source/xap/seyon/seyon_2.20c-16.diff.gz
+-rw-r--r--   1 root root      1065 Mar 24  2002 ./source/xap/seyon/slack-desc
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/xap/thunar-volman
+-rw-r--r--   1 root root       946 Feb 26  2009 ./source/xap/thunar-volman/slack-desc
+-rw-r--r--   1 root root    353504 Sep 14  2008 ./source/xap/thunar-volman/thunar-volman-0.3.80.tar.bz2
+-rwxr-xr-x   1 root root      2594 May 19  2009 ./source/xap/thunar-volman/thunar-volman.SlackBuild
+lrwxrwxrwx   1 root root         9 Aug 23  2009 ./source/xap/vim-gvim -> ../ap/vim
+drwxr-xr-x   2 root root      4096 Dec 21 04:05 ./source/xap/windowmaker
+-rw-r--r--   1 root root   2078830 Jul 30  2008 ./source/xap/windowmaker/WindowMaker-20060427cvs.tar.bz2
+-rw-r--r--   1 root root    238018 Apr  1  1999 ./source/xap/windowmaker/WindowMaker-extra-0.1.tar.gz
+-rw-r--r--   1 root root       917 Oct 28  2004 ./source/xap/windowmaker/slack-desc
+-rwxr-xr-x   1 root root      4664 Dec 21 04:05 ./source/xap/windowmaker/windowmaker.SlackBuild
+-rw-r--r--   1 root root       390 Jul 30  2008 ./source/xap/windowmaker/windowmaker.no-mmx.diff.gz
+-rw-r--r--   1 root root       214 Feb 11  2010 ./source/xap/windowmaker/windowmaker.png.1.4.0.diff.gz
+-rw-r--r--   1 root root       669 May 30  2002 ./source/xap/windowmaker/wmaker.inst.diff.gz
+-rw-r--r--   1 root root       445 Dec 21 04:05 ./source/xap/windowmaker/xinitrc.wmaker.gz
+drwxr-xr-x   2 root root      4096 Jan 22 18:19 ./source/xap/x11-ssh-askpass
+-rw-r--r--   1 root root       533 Jul 11  2009 ./source/xap/x11-ssh-askpass/README
+-rw-r--r--   1 root root       765 Jan 17  2009 ./source/xap/x11-ssh-askpass/slack-desc
+-rw-r--r--   1 root root     29229 Jul 20  2009 ./source/xap/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1.tar.gz
+-rwxr-xr-x   1 root root      1941 Feb  1 06:39 ./source/xap/x11-ssh-askpass/x11-ssh-askpass.SlackBuild
+-rw-r--r--   1 root root       349 Jul 11  2009 ./source/xap/x11-ssh-askpass/x11-ssh-askpass.info
+-rw-r--r--   1 root root       261 Mar 29  2008 ./source/xap/x11-ssh-askpass/xprofile.sample
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/xap/x3270
+-rw-r--r--   1 root root       391 Apr  2  2007 ./source/xap/x3270/doinst.sh.gz
+-rw-r--r--   1 root root       766 Mar 12  2002 ./source/xap/x3270/slack-desc
+-rw-r--r--   1 root root    854545 Aug 28  2008 ./source/xap/x3270/x3270-3.3.7p8.tar.bz2
+-rwxr-xr-x   1 root root      2936 May 19  2009 ./source/xap/x3270/x3270.SlackBuild
+drwxr-xr-x   2 root root      4096 Oct 16  2010 ./source/xap/xaos
+-rw-r--r--   1 root root       875 Oct 16  2010 ./source/xap/xaos/slack-desc
+-rw-r--r--   1 root root   1121380 Oct 16  2010 ./source/xap/xaos/xaos-3.5.tar.xz
+-rw-r--r--   1 root root      2796 Oct 16  2010 ./source/xap/xaos/xaos.6.gz
+-rwxr-xr-x   1 root root      5060 Oct 16  2010 ./source/xap/xaos/xaos.SlackBuild
+-rw-r--r--   1 root root       161 May 24  2010 ./source/xap/xaos/xaos.desktop
+-rw-r--r--   1 root root     14980 May 24  2010 ./source/xap/xaos/xaos.png
+drwxr-xr-x   2 root root      4096 Jun  6  2010 ./source/xap/xchat
+-rw-r--r--   1 root root       620 Feb 11  2008 ./source/xap/xchat/slack-desc
+-rw-r--r--   1 root root   1509993 May 30  2010 ./source/xap/xchat/xchat-2.8.8.tar.bz2
+-rwxr-xr-x   1 root root      3590 Jan 26 17:42 ./source/xap/xchat/xchat.SlackBuild
+drwxr-xr-x   5 root root      4096 Mar 29 22:03 ./source/xap/xfce
+-rw-r--r--   1 root root     26680 Jul 31  2009 ./source/xap/xfce/icons.tar.xz
+drwxr-xr-x   2 root root      4096 Mar 29 21:22 ./source/xap/xfce/patches
+-rw-r--r--   1 root root       410 Mar 29 21:18 ./source/xap/xfce/patches/Thunar.thunar-vfs-io-local.diff.gz
+-rw-r--r--   1 root root       508 Aug 22  2010 ./source/xap/xfce/patches/fixup_comments_in_xfce-utils-Xft.xrdb.diff.gz
+-rw-r--r--   1 root root       762 Jul  8  2010 ./source/xap/xfce/patches/mousepad-fix_find.diff.gz
+-rw-r--r--   1 root root       644 Jul  8  2010 ./source/xap/xfce/patches/mousepad-fix_find_and_replace.diff.gz
+-rw-r--r--   1 root root       580 Feb 23 03:54 ./source/xap/xfce/patches/no_sensitive_panel_during_plugin_moves.patch.gz
+-rw-r--r--   1 root root      1842 May 23  2010 ./source/xap/xfce/patches/thunar-1.0.2-fixup_docdir.diff.gz
+-rw-r--r--   1 root root       233 Mar  1  2009 ./source/xap/xfce/patches/xfcalendar.desktop.in.diff.gz
+-rw-r--r--   1 root root       347 Mar 10 04:56 ./source/xap/xfce/patches/xfce-utils-load_systemwide_Xmodmap.diff.gz
+-rw-r--r--   1 root root       301 Jun 18  2010 ./source/xap/xfce/patches/xfce-utils.xinitrc.consolekit.diff.gz
+-rw-r--r--   1 root root       289 Jul 31  2009 ./source/xap/xfce/patches/xfdesktop-fix_education_icon.diff.gz
+-rw-r--r--   1 root root       834 Mar  9 14:04 ./source/xap/xfce/patches/xfsm-compat-kde.c-start-kde4-services.diff.gz
+drwxr-xr-x   2 root root      4096 Apr 21  2007 ./source/xap/xfce/profile.d
+-rwxr-xr-x   1 root root       162 Jun 29  2007 ./source/xap/xfce/profile.d/xfce.csh
+-rwxr-xr-x   1 root root       170 Apr 21  2007 ./source/xap/xfce/profile.d/xfce.sh
+-rw-r--r--   1 root root       764 Apr  6  2008 ./source/xap/xfce/slack-desc
+drwxr-xr-x   2 root root      4096 Feb 12 03:29 ./source/xap/xfce/src
+-rw-r--r--   1 root root   1368508 Jan 30 16:15 ./source/xap/xfce/src/Terminal-0.4.6.tar.xz
+-rw-r--r--   1 root root   3519008 May 21  2010 ./source/xap/xfce/src/Thunar-1.0.2.tar.xz
+-rw-r--r--   1 root root   1209728 May 21  2010 ./source/xap/xfce/src/exo-0.3.107.tar.xz
+-rw-r--r--   1 root root    228668 Feb 26  2009 ./source/xap/xfce/src/gtk-xfce-engine-2.6.0.tar.xz
+-rw-r--r--   1 root root    334512 May 21  2010 ./source/xap/xfce/src/libxfce4menu-4.6.2.tar.xz
+-rw-r--r--   1 root root    347928 May 21  2010 ./source/xap/xfce/src/libxfce4util-4.6.2.tar.xz
+-rw-r--r--   1 root root    570980 May 21  2010 ./source/xap/xfce/src/libxfcegui4-4.6.4.tar.xz
+-rw-r--r--   1 root root    269176 Feb 26  2009 ./source/xap/xfce/src/mousepad-0.2.16.tar.xz
+-rw-r--r--   1 root root   1698784 Apr 19  2009 ./source/xap/xfce/src/orage-4.6.1.tar.xz
+-rw-r--r--   1 root root    531852 May 21  2010 ./source/xap/xfce/src/xfce-utils-4.6.2.tar.xz
+-rw-r--r--   1 root root    284652 May 21  2010 ./source/xap/xfce/src/xfce4-appfinder-4.6.2.tar.xz
+-rw-r--r--   1 root root     73924 Jan 16 14:16 ./source/xap/xfce/src/xfce4-dev-tools-4.8.0.tar.xz
+-rw-r--r--   1 root root    334516 Apr 19  2009 ./source/xap/xfce/src/xfce4-mixer-4.6.1.tar.xz
+-rw-r--r--   1 root root    792944 May 21  2010 ./source/xap/xfce/src/xfce4-panel-4.6.4.tar.xz
+-rw-r--r--   1 root root   1262588 May 21  2010 ./source/xap/xfce/src/xfce4-session-4.6.2.tar.xz
+-rw-r--r--   1 root root    466224 May 21  2010 ./source/xap/xfce/src/xfce4-settings-4.6.5.tar.xz
+-rw-r--r--   1 root root    368260 May 21  2010 ./source/xap/xfce/src/xfconf-4.6.2.tar.xz
+-rw-r--r--   1 root root   3215316 May 21  2010 ./source/xap/xfce/src/xfdesktop-4.6.2.tar.xz
+-rw-r--r--   1 root root    728660 Apr 19  2009 ./source/xap/xfce/src/xfprint-4.6.1.tar.xz
+-rw-r--r--   1 root root   1639812 May 21  2010 ./source/xap/xfce/src/xfwm4-4.6.2.tar.xz
+-rw-r--r--   1 root root    372732 Feb 26  2009 ./source/xap/xfce/src/xfwm4-themes-4.6.0.tar.xz
+-rwxr-xr-x   1 root root      9648 Mar 29 21:30 ./source/xap/xfce/xfce.SlackBuild
+drwxr-xr-x   2 root root      4096 Feb 12 21:02 ./source/xap/xfce4-notifyd
+-rw-r--r--   1 root root       174 Feb 26  2009 ./source/xap/xfce4-notifyd/doinst.sh.gz
+-rw-r--r--   1 root root       905 Feb 20  2010 ./source/xap/xfce4-notifyd/slack-desc
+-rw-r--r--   1 root root    225913 Feb  2 21:59 ./source/xap/xfce4-notifyd/xfce4-notifyd-0.1.1.tar.bz2
+-rwxr-xr-x   1 root root      3234 Feb 12 21:03 ./source/xap/xfce4-notifyd/xfce4-notifyd.SlackBuild
+drwxr-xr-x   2 root root      4096 Mar  2  2010 ./source/xap/xfce4-power-manager
+-rw-r--r--   1 root root       172 May 30  2009 ./source/xap/xfce4-power-manager/doinst.sh.gz
+-rw-r--r--   1 root root       936 May 30  2009 ./source/xap/xfce4-power-manager/slack-desc
+-rw-r--r--   1 root root    920729 Mar  2  2010 ./source/xap/xfce4-power-manager/xfce4-power-manager-0.8.5.tar.bz2
+-rwxr-xr-x   1 root root      3674 Mar  2  2010 ./source/xap/xfce4-power-manager/xfce4-power-manager.SlackBuild
+drwxr-xr-x   2 root root      4096 May 19  2009 ./source/xap/xfractint
+-rw-r--r--   1 root root    103531 Mar 14  2002 ./source/xap/xfractint/palette.maps.tar.gz
+-rw-r--r--   1 root root       871 Mar 14  2002 ./source/xap/xfractint/slack-desc
+-rw-r--r--   1 root root   1212397 Oct 14  2008 ./source/xap/xfractint/xfractint-20.04p09.tar.bz2
+-rwxr-xr-x   1 root root      3446 May 19  2009 ./source/xap/xfractint/xfractint.SlackBuild
+drwxr-xr-x   2 root root      4096 Mar 19 22:56 ./source/xap/xgames
+-rw-r--r--   1 root root       269 Aug  4  1999 ./source/xap/xgames/maze.diff.gz
+-rw-r--r--   1 root root      7945 Oct 22  1994 ./source/xap/xgames/maze.tar.gz
+-rw-r--r--   1 root root       696 Mar  1  2007 ./source/xap/xgames/slack-desc
+-rw-r--r--   1 root root       871 Feb 22  2007 ./source/xap/xgames/spider.diff.gz
+-rw-r--r--   1 root root    130637 Dec  4  1993 ./source/xap/xgames/spider.tar.gz
+-rw-r--r--   1 root root       287 Aug  4  1999 ./source/xap/xgames/xcolormap.diff.gz
+-rw-r--r--   1 root root      2808 Dec  4  1993 ./source/xap/xgames/xcolormap.tar.gz
+-rw-r--r--   1 root root      5937 Dec  4  1993 ./source/xap/xgames/xcuckoo-1.1.tar.gz
+-rw-r--r--   1 root root       228 Feb 28  2007 ./source/xap/xgames/xcuckoo.diff.gz
+-rwxr-xr-x   1 root root      4981 Mar 20 17:12 ./source/xap/xgames/xgames.SlackBuild
+-rw-r--r--   1 root root      1150 Aug 22  2009 ./source/xap/xgames/xlander-2009-07-18.diff.gz
+-rw-r--r--   1 root root      2543 Mar  1  2007 ./source/xap/xgames/xlander.fixes.diff.gz
+-rw-r--r--   1 root root     15612 Jun 17  1995 ./source/xap/xgames/xlander.tar.gz
+-rw-r--r--   1 root root     12791 Oct 25  2008 ./source/xap/xgames/xminesweep3.0.tar.gz
+-rw-r--r--   1 root root     22849 Aug  4  1999 ./source/xap/xgames/xneko.tar.gz
+-rw-r--r--   1 root root     21694 Dec  2  1993 ./source/xap/xgames/xroach.tar.gz
+-rw-r--r--   1 root root     56752 Dec 15  2001 ./source/xap/xgames/xsnow-1.42.tar.gz
+drwxr-xr-x   2 root root      4096 Nov  6 21:02 ./source/xap/xine-lib
+-rw-r--r--   1 root root       927 Aug 12  2003 ./source/xap/xine-lib/slack-desc
+-rw-r--r--   1 root root   5782580 Jul 25  2010 ./source/xap/xine-lib/xine-lib-1.1.19.tar.xz
+-rwxr-xr-x   1 root root      3392 Nov  6 21:02 ./source/xap/xine-lib/xine-lib.SlackBuild
+-rw-r--r--   1 root root       329 Nov  6 21:02 ./source/xap/xine-lib/xine-lib.XvMClib.h.diff.gz
+drwxr-xr-x   2 root root      4096 Feb 19  2010 ./source/xap/xine-ui
+-rw-r--r--   1 root root       832 Aug 12  2003 ./source/xap/xine-ui/slack-desc
+-rw-r--r--   1 root root   2138011 May  3  2007 ./source/xap/xine-ui/xine-ui-0.99.5.tar.bz2
+-rwxr-xr-x   1 root root      3139 Feb 25  2010 ./source/xap/xine-ui/xine-ui.SlackBuild
+-rw-r--r--   1 root root       269 Feb 19  2010 ./source/xap/xine-ui/xine-ui.png14.diff.gz
+-rw-r--r--   1 root root       258 May  4  2007 ./source/xap/xine-ui/xine.desktop.gz
+drwxr-xr-x   2 root root      4096 Mar 15 22:22 ./source/xap/xlockmore
+-rw-r--r--   1 root root       225 Feb 23  2002 ./source/xap/xlockmore/l-bob.README
+-rw-r--r--   1 root root     27870 Apr  1  1998 ./source/xap/xlockmore/l-bob.xbm
+-rw-r--r--   1 root root     15190 Apr  1  1998 ./source/xap/xlockmore/l-linux.xbm
+-rw-r--r--   1 root root      7025 Feb 23  2002 ./source/xap/xlockmore/s-bob.xbm
+-rw-r--r--   1 root root       922 Mar 24  2002 ./source/xap/xlockmore/slack-desc
+-rw-r--r--   1 root root   1987212 Dec 12 20:21 ./source/xap/xlockmore/xlockmore-5.32.tar.bz2
+-rw-r--r--   1 root root       194 Dec 12 20:21 ./source/xap/xlockmore/xlockmore-5.32.tar.bz2.asc
+-rwxr-xr-x   1 root root      3907 Mar 15 22:33 ./source/xap/xlockmore/xlockmore.SlackBuild
+-rw-r--r--   1 root root       371 May 30  2002 ./source/xap/xlockmore/xlockmore.bitmap.diff.gz
+drwxr-xr-x   2 root root      4096 Mar 22  2010 ./source/xap/xmms
+-rw-r--r--   1 root root       834 Feb 24  2004 ./source/xap/xmms/slack-desc
+-rw-r--r--   1 root root   2581032 Nov 16  2007 ./source/xap/xmms/xmms-1.2.11.tar.bz2
+-rwxr-xr-x   1 root root      3385 Mar 22  2010 ./source/xap/xmms/xmms.SlackBuild
+-rw-r--r--   1 root root       525 Sep 11  2008 ./source/xap/xmms/xmms.desktop
+-rw-r--r--   1 root root       279 Sep 12  2008 ./source/xap/xmms/xmms.gtk.doublesize.diff.gz
+-rw-r--r--   1 root root      2475 Jan  4  2008 ./source/xap/xmms/xmms.png
+-rw-r--r--   1 root root       260 Jun  9  2009 ./source/xap/xmms/xmms.wmxmms_vis_depth_workaround.diff.gz
+drwxr-xr-x   2 root root      4096 Feb 20  2010 ./source/xap/xpaint
+-rw-r--r--   1 root root       902 Mar 12  2002 ./source/xap/xpaint/slack-desc
+-rw-r--r--   1 root root    795772 Feb 12  2010 ./source/xap/xpaint/xpaint-2.8.16.tar.bz2
+-rwxr-xr-x   1 root root      4009 Feb 20  2010 ./source/xap/xpaint/xpaint.SlackBuild
+drwxr-xr-x   4 root root      4096 Feb 11  2010 ./source/xap/xpdf
+-rw-r--r--   1 root root       325 Jan 11  2010 ./source/xap/xpdf/doinst.sh.gz
+drwxr-xr-x   2 root root      4096 Jan 11  2010 ./source/xap/xpdf/lang
+-rw-r--r--   1 root root       207 Mar  2  2008 ./source/xap/xpdf/lang/xpdf-arabic.diff.gz
+-rw-r--r--   1 root root      1058 Jul 18  2004 ./source/xap/xpdf/lang/xpdf-arabic.tar.gz
+-rw-r--r--   1 root root       375 Mar  2  2008 ./source/xap/xpdf/lang/xpdf-chinese-simplified.diff.gz
+-rw-r--r--   1 root root    835960 Jul 27  2004 ./source/xap/xpdf/lang/xpdf-chinese-simplified.tar.gz
+-rw-r--r--   1 root root       354 Mar  2  2008 ./source/xap/xpdf/lang/xpdf-chinese-traditional.diff.gz
+-rw-r--r--   1 root root    794604 Jul 27  2004 ./source/xap/xpdf/lang/xpdf-chinese-traditional.tar.gz
+-rw-r--r--   1 root root       242 Mar  2  2008 ./source/xap/xpdf/lang/xpdf-cyrillic.diff.gz
+-rw-r--r--   1 root root      1660 Jul 18  2004 ./source/xap/xpdf/lang/xpdf-cyrillic.tar.gz
+-rw-r--r--   1 root root       236 Mar  2  2008 ./source/xap/xpdf/lang/xpdf-greek.diff.gz
+-rw-r--r--   1 root root      1263 Jul 18  2004 ./source/xap/xpdf/lang/xpdf-greek.tar.gz
+-rw-r--r--   1 root root       224 Mar  2  2008 ./source/xap/xpdf/lang/xpdf-hebrew.diff.gz
+-rw-r--r--   1 root root      1314 Jul 18  2004 ./source/xap/xpdf/lang/xpdf-hebrew.tar.gz
+-rw-r--r--   1 root root       750 Mar  2  2008 ./source/xap/xpdf/lang/xpdf-japanese.diff.gz
+-rw-r--r--   1 root root    494803 Jul 27  2004 ./source/xap/xpdf/lang/xpdf-japanese.tar.gz
+-rw-r--r--   1 root root       312 Mar  2  2008 ./source/xap/xpdf/lang/xpdf-korean.diff.gz
+-rw-r--r--   1 root root    470455 Jul  7  2005 ./source/xap/xpdf/lang/xpdf-korean.tar.gz
+-rw-r--r--   1 root root       200 Mar  2  2008 ./source/xap/xpdf/lang/xpdf-latin2.diff.gz
+-rw-r--r--   1 root root      1435 Jul 18  2004 ./source/xap/xpdf/lang/xpdf-latin2.tar.gz
+-rw-r--r--   1 root root       231 Mar  2  2008 ./source/xap/xpdf/lang/xpdf-thai.diff.gz
+-rw-r--r--   1 root root      1873 Jul 18  2004 ./source/xap/xpdf/lang/xpdf-thai.tar.gz
+-rw-r--r--   1 root root       210 Mar  2  2008 ./source/xap/xpdf/lang/xpdf-turkish.diff.gz
+-rw-r--r--   1 root root      1140 Jul 18  2004 ./source/xap/xpdf/lang/xpdf-turkish.tar.gz
+drwxr-xr-x   2 root root      4096 Mar 29 18:28 ./source/xap/xpdf/patches
+-rw-r--r--   1 root root      1050 Jul 30  2007 ./source/xap/xpdf/patches/xpdf-3.02pl1.patch
+-rw-r--r--   1 root root       189 Jul 30  2007 ./source/xap/xpdf/patches/xpdf-3.02pl1.patch.sig
+-rw-r--r--   1 root root     20843 Nov  7  2007 ./source/xap/xpdf/patches/xpdf-3.02pl2.patch
+-rw-r--r--   1 root root       189 Nov  7  2007 ./source/xap/xpdf/patches/xpdf-3.02pl2.patch.sig
+-rw-r--r--   1 root root     30727 Apr 16  2009 ./source/xap/xpdf/patches/xpdf-3.02pl3.patch
+-rw-r--r--   1 root root       197 Apr 16  2009 ./source/xap/xpdf/patches/xpdf-3.02pl3.patch.sig
+-rw-r--r--   1 root root      6982 Oct 14  2009 ./source/xap/xpdf/patches/xpdf-3.02pl4.patch
+-rw-r--r--   1 root root       197 Oct 14  2009 ./source/xap/xpdf/patches/xpdf-3.02pl4.patch.sig
+-rw-r--r--   1 root root      1065 Oct 21  2010 ./source/xap/xpdf/patches/xpdf-3.02pl5.patch
+-rw-r--r--   1 root root       197 Oct 21  2010 ./source/xap/xpdf/patches/xpdf-3.02pl5.patch.sig
+-rw-r--r--   1 root root        60 Mar 29 18:23 ./source/xap/xpdf/patches/xpdf-3.02pl6.patch
+-rw-r--r--   1 root root       305 Mar 29 18:28 ./source/xap/xpdf/patches/xpdf-3.02pl6.patch.sig
+-rw-r--r--   1 root root       498 Apr 12  2007 ./source/xap/xpdf/patches/xpdf-resizefix.diff.gz
+-rw-r--r--   1 root root     37396 Nov 12  2007 ./source/xap/xpdf/patches/xpdf_3.02-1.3.diff.gz
+-rw-r--r--   1 root root       636 Feb 18  2007 ./source/xap/xpdf/patches/xpdfrc.diff.gz
+-rw-r--r--   1 root root       643 Mar 31 02:49 ./source/xap/xpdf/slack-desc
+-rw-r--r--   1 root root    674912 Feb 27  2007 ./source/xap/xpdf/xpdf-3.02.tar.gz
+-rw-r--r--   1 root root       189 Feb 27  2007 ./source/xap/xpdf/xpdf-3.02.tar.gz.sig
+-rwxr-xr-x   1 root root      5256 Mar 31 19:24 ./source/xap/xpdf/xpdf.SlackBuild
+-rw-r--r--   1 root root      3260 Jan 11  2010 ./source/xap/xpdf/xpdf.desktop
+drwxr-xr-x   2 root root      4096 Feb 28 03:41 ./source/xap/xsane
+-rw-r--r--   1 root root       955 May 11  2004 ./source/xap/xsane/slack-desc
+-rw-r--r--   1 root root   1874276 Nov 16 22:05 ./source/xap/xsane/xsane-0.998.tar.xz
+-rwxr-xr-x   1 root root      3140 Feb 28 03:41 ./source/xap/xsane/xsane.SlackBuild
+drwxr-xr-x   2 root root      4096 Mar 15 22:05 ./source/xap/xscreensaver
+-rw-r--r--   1 root root      2868 Oct 17  2008 ./source/xap/xscreensaver/setuid.c.gz
+-rw-r--r--   1 root root       887 Oct 17  2008 ./source/xap/xscreensaver/slack-desc
+-rw-r--r--   1 root root   3350612 Sep 15  2010 ./source/xap/xscreensaver/xscreensaver-5.12.tar.xz
+-rwxr-xr-x   1 root root      3584 Mar 15 22:37 ./source/xap/xscreensaver/xscreensaver.SlackBuild
+-rw-r--r--   1 root root       285 May 15  2009 ./source/xap/xscreensaver/xscreensaver.electricsheep.diff.gz
+-rw-r--r--   1 root root      1763 Oct 17  2008 ./source/xap/xscreensaver/xscreensaver.setuid.diff.gz
+drwxr-xr-x   2 root root      4096 Feb 19  2010 ./source/xap/xv
+-rw-r--r--   1 root root       688 Mar 10  2002 ./source/xap/xv/slack-desc
+-rw-r--r--   1 root root   1693808 Dec 22  1994 ./source/xap/xv/xv-3.10.tar.xz
+-rw-r--r--   1 root root      3294 Dec 16  2008 ./source/xap/xv/xv-3.10a-enhancements.20070520-20081216.diff.bz2
+-rw-r--r--   1 root root     25974 May 21  2007 ./source/xap/xv/xv-3.10a-jumbo-README.txt
+-rw-r--r--   1 root root    114978 Feb 19  2010 ./source/xap/xv/xv-3.10a-jumbo-additions.diff.bz2
+-rw-r--r--   1 root root    287250 May 21  2007 ./source/xap/xv/xv-3.10a-jumbo-fix-enh-patch-20070520.txt.bz2
+-rw-r--r--   1 root root     21943 Oct  5  1996 ./source/xap/xv/xv-3.10a.patch.gz
+-rwxr-xr-x   1 root root      3210 Feb 19  2010 ./source/xap/xv/xv.SlackBuild
+-rw-r--r--   1 root root       229 Feb 19  2010 ./source/xap/xv/xv.jasper.diff.gz
+-rw-r--r--   1 root root       317 Feb 19  2010 ./source/xap/xv/xv.prefix.diff.gz
+-rw-r--r--   1 root root       282 Feb 19  2010 ./source/xap/xv/xv.prefix_x86_64.diff.gz
+drwxr-xr-x   2 root root      4096 Apr  3 10:43 ./source/xap/xxgdb
+-rw-r--r--   1 root root       874 Mar 13  2002 ./source/xap/xxgdb/slack-desc
+-rw-r--r--   1 root root       236 Apr  3 09:58 ./source/xap/xxgdb/xxgdb-1.08-glibc.patch.xz
+-rw-r--r--   1 root root       212 Apr  3 09:58 ./source/xap/xxgdb/xxgdb-1.12-debian-filemenu.patch.xz
+-rw-r--r--   1 root root       768 Apr  3 09:58 ./source/xap/xxgdb/xxgdb-1.12-debian-pty.patch.xz
+-rw-r--r--   1 root root      7024 Apr  3 09:58 ./source/xap/xxgdb/xxgdb-1.12-mandriva.patch.xz
+-rw-r--r--   1 root root       376 Apr  3 09:58 ./source/xap/xxgdb/xxgdb-1.12-sysv.patch.xz
+-rw-r--r--   1 root root     88596 Nov 19  1995 ./source/xap/xxgdb/xxgdb-1.12.tar.xz
+-rwxr-xr-x   1 root root      3446 Apr  5 00:44 ./source/xap/xxgdb/xxgdb.SlackBuild
+drwxr-xr-x   3 root root      4096 May 12  2010 ./source/y
+drwxr-xr-x   2 root root      4096 May 11  2010 ./source/y/bsd-games
+-rw-r--r--   1 root root       825 Aug 30  2001 ./source/y/bsd-games/bsd-games-2.13.lsm
+-rw-r--r--   1 root root   1861269 Aug 30  2001 ./source/y/bsd-games/bsd-games-2.13.tar.bz2
+-rw-r--r--   1 root root       164 Sep 27  1999 ./source/y/bsd-games/bsd-games-login-fortune.csh
+-rw-r--r--   1 root root       164 May 11  2010 ./source/y/bsd-games/bsd-games-login-fortune.sh
+-rwxr-xr-x   1 root root      6785 May 15  2010 ./source/y/bsd-games/bsd-games.SlackBuild
+-rw-r--r--   1 root root       563 Feb  3  2003 ./source/y/bsd-games/bsd-games.config.params.diff.gz
+-rw-r--r--   1 root root       283 Feb  3  2003 ./source/y/bsd-games/bsd-games.fortlen.diff.gz
+-rw-r--r--   1 root root       181 Mar 10  2002 ./source/y/bsd-games/bsd-games.fortunepath.diff.gz
+-rw-r--r--   1 root root      2333 May 11  2010 ./source/y/bsd-games/bsd-games.getline.diff.gz
+-rw-r--r--   1 root root       265 Sep  7  2006 ./source/y/bsd-games/bsd-games.ospeed.diff.gz
+-rw-r--r--   1 root root       386 Aug 27  2007 ./source/y/bsd-games/bsd-games.phantasia_install_fix.diff.gz
+-rw-r--r--   1 root root      1960 Sep  9  2006 ./source/y/bsd-games/bsd-games.pom.diff.gz
+-rw-r--r--   1 root root       353 Feb  3  2003 ./source/y/bsd-games/bsd-games.strfile.8.diff.gz
+-rw-r--r--   1 root root       405 Aug 27  2007 ./source/y/bsd-games/bsd-games.trek-gcc4.diff.gz
+-rw-r--r--   1 root root     15107 Mar 10  2002 ./source/y/bsd-games/fortunes-linuxcookie.tar.gz
+-rw-r--r--   1 root root    364407 Mar 10  2002 ./source/y/bsd-games/fortunes-o.tar.gz
+-rw-r--r--   1 root root    104848 Oct 25  1993 ./source/y/bsd-games/hangman-words.gz
+-rw-r--r--   1 root root      1056 Mar 10  2002 ./source/y/bsd-games/slack-desc
+drwxr-xr-x   4 root root      4096 Apr 22 19:05 ./testing
+-rw-r--r--   1 root root      5053 Apr 22 19:05 ./testing/CHECKSUMS.md5
+-rw-r--r--   1 root root       198 Apr 22 19:05 ./testing/CHECKSUMS.md5.asc
+-rw-r--r--   1 root root      7115 Apr 22 19:05 ./testing/FILE_LIST
+-rw-r--r--   1 root root    364878 Apr 22 19:05 ./testing/MANIFEST.bz2
+-rw-r--r--   1 root root      5286 Apr 22 19:05 ./testing/PACKAGES.TXT
+drwxr-xr-x   2 root root      4096 Apr 22 04:53 ./testing/packages
+-rw-r--r--   1 root root       344 Apr 22 01:49 ./testing/packages/kernel-firmware-2.6.38.4-noarch-1.txt
+-rw-r--r--   1 root root   1025880 Apr 22 01:49 ./testing/packages/kernel-firmware-2.6.38.4-noarch-1.txz
+-rw-r--r--   1 root root       198 Apr 22 01:49 ./testing/packages/kernel-firmware-2.6.38.4-noarch-1.txz.asc
+-rw-r--r-- 1 root root      626 Apr 22 01:49 ./testing/packages/kernel-generic-2.6.38.4-x86_64-1.txt
+-rw-r--r-- 1 root root  3255200 Apr 22 01:49 ./testing/packages/kernel-generic-2.6.38.4-x86_64-1.txz
+-rw-r--r-- 1 root root      198 Apr 22 01:49 ./testing/packages/kernel-generic-2.6.38.4-x86_64-1.txz.asc
+-rw-r--r-- 1 root root      332 Apr 22 01:45 ./testing/packages/kernel-headers-2.6.38.4-x86-1.txt
+-rw-r--r-- 1 root root   563168 Apr 22 01:45 ./testing/packages/kernel-headers-2.6.38.4-x86-1.txz
+-rw-r--r-- 1 root root      198 Apr 22 01:45 ./testing/packages/kernel-headers-2.6.38.4-x86-1.txz.asc
+-rw-r--r-- 1 root root      638 Apr 22 04:04 ./testing/packages/kernel-huge-2.6.38.4-x86_64-1.txt
+-rw-r--r-- 1 root root  6302200 Apr 22 04:04 ./testing/packages/kernel-huge-2.6.38.4-x86_64-1.txz
+-rw-r--r-- 1 root root      198 Apr 22 04:04 ./testing/packages/kernel-huge-2.6.38.4-x86_64-1.txz.asc
+-rw-r--r-- 1 root root      520 Apr 22 03:56 ./testing/packages/kernel-modules-2.6.38.4-x86_64-1.txt
+-rw-r--r-- 1 root root 20856840 Apr 22 03:56 ./testing/packages/kernel-modules-2.6.38.4-x86_64-1.txz
+-rw-r--r-- 1 root root      198 Apr 22 03:56 ./testing/packages/kernel-modules-2.6.38.4-x86_64-1.txz.asc
+-rw-r--r-- 1 root root      317 Apr 22 01:45 ./testing/packages/kernel-source-2.6.38.4-noarch-1.txt
+-rw-r--r-- 1 root root 65458468 Apr 22 01:45 ./testing/packages/kernel-source-2.6.38.4-noarch-1.txz
+-rw-r--r-- 1 root root      198 Apr 22 01:45 ./testing/packages/kernel-source-2.6.38.4-noarch-1.txz.asc
+-rw-r--r-- 1 root root      260 Apr 17 20:54 ./testing/packages/libdrm-2.4.25-x86_64-1.txt
+-rw-r--r-- 1 root root    99160 Apr 17 20:54 ./testing/packages/libdrm-2.4.25-x86_64-1.txz
+-rw-r--r-- 1 root root      198 Apr 17 20:54 ./testing/packages/libdrm-2.4.25-x86_64-1.txz.asc
+-rw-r--r-- 1 root root      335 Apr  8 18:15 ./testing/packages/mesa-7.10.2-x86_64-1.txt
+-rw-r--r-- 1 root root  6419244 Apr  8 18:15 ./testing/packages/mesa-7.10.2-x86_64-1.txz
+-rw-r--r-- 1 root root      198 Apr  8 18:15 ./testing/packages/mesa-7.10.2-x86_64-1.txz.asc
+-rw-r--r-- 1 root root      426 Apr 17 21:22 ./testing/packages/xf86-video-nouveau-git_20110417_8378443-x86_64-1.txt
+-rw-r--r-- 1 root root    83116 Apr 17 21:22 ./testing/packages/xf86-video-nouveau-git_20110417_8378443-x86_64-1.txz
+-rw-r--r-- 1 root root      198 Apr 17 21:22 ./testing/packages/xf86-video-nouveau-git_20110417_8378443-x86_64-1.txz.asc
+drwxr-xr-x 8 root root     4096 Apr 24 01:24 ./testing/source
+drwxr-xr-x 2 root root     4096 Apr 17 20:54 ./testing/source/libdrm
+-rw-r--r-- 1 root root   326944 Apr 11 07:28 ./testing/source/libdrm/libdrm-2.4.25.tar.xz
+-rwxr-xr-x 1 root root     3558 Apr 17 20:54 ./testing/source/libdrm/libdrm.SlackBuild
+-rw-r--r-- 1 root root      717 Feb  1  2007 ./testing/source/libdrm/slack-desc
+drwxr-xr-x 2 root root     4096 Apr 22 18:23 ./testing/source/linux-2.6.35.12-configs
+-rw-r--r-- 1 root root   108781 Apr 22 18:03 ./testing/source/linux-2.6.35.12-configs/config-generic-2.6.35.12
+-rw-r--r-- 1 root root   108755 Apr 22 18:03 ./testing/source/linux-2.6.35.12-configs/config-huge-2.6.35.12
+drwxr-xr-x 2 root root     4096 Apr 22 04:11 ./testing/source/linux-2.6.38.4-configs
+-rw-r--r-- 1 root root   113940 Apr 22 01:32 ./testing/source/linux-2.6.38.4-configs/config-generic-2.6.38.4
+-rw-r--r-- 1 root root   113914 Apr 22 03:56 ./testing/source/linux-2.6.38.4-configs/config-huge-2.6.38.4
+drwxr-xr-x 2 root root     4096 Apr 19 18:15 ./testing/source/linux-2.6.39-rc4-configs
+-rw-r--r-- 1 root root   116864 Apr 19 18:15 ./testing/source/linux-2.6.39-rc4-configs/config-generic-2.6.39-rc4
+-rw-r--r-- 1 root root   116838 Apr 19 18:14 ./testing/source/linux-2.6.39-rc4-configs/config-huge-2.6.39-rc4
+drwxr-xr-x 3 root root     4096 Apr  8 18:10 ./testing/source/mesa
+-rw-r--r-- 1 root root   150188 Apr  6 20:44 ./testing/source/mesa/MesaGLUT-7.10.2.tar.xz
+-rw-r--r-- 1 root root  4783896 Apr  6 20:45 ./testing/source/mesa/MesaLib-7.10.2.tar.xz
+-rw-r--r-- 1 root root      352 Mar 10  2008 ./testing/source/mesa/README.GIT
+-rwxr-xr-x 1 root root      732 Feb  5 21:09 ./testing/source/mesa/get-mesa.sh
+-rw-r--r-- 1 root root  7168504 Oct  1  2010 ./testing/source/mesa/mesa-demos-8.0.1.tar.xz
+-rwxr-xr-x 1 root root     5461 Apr  8 18:10 ./testing/source/mesa/mesa.SlackBuild
+-rw-r--r-- 1 root root       78 Oct  1  2010 ./testing/source/mesa/mesa.url
+drwxr-xr-x 2 root root     4096 Jan 30 23:09 ./testing/source/mesa/patches
+-rw-r--r-- 1 root root      579 Oct 29 19:22 ./testing/source/mesa/patches/i915_fragment_shader_disable.patch.gz
+-rw-r--r-- 1 root root     1191 Jan 30 23:05 ./testing/source/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch.gz
+-rw-r--r-- 1 root root      790 Feb  5  2007 ./testing/source/mesa/slack-desc
+drwxr-xr-x 7 root root     4096 Apr 17 21:21 ./testing/source/xf86-video-nouveau
+-rw-r--r-- 1 root root      183 May 30  2009 ./testing/source/xf86-video-nouveau/arch.use.flags
+drwxr-xr-x 2 root root     4096 Apr 17 21:20 ./testing/source/xf86-video-nouveau/build
+drwxr-xr-x 2 root root     4096 Apr 17 21:20 ./testing/source/xf86-video-nouveau/configure
+-rw-r--r-- 1 root root      262 Dec 13 03:07 ./testing/source/xf86-video-nouveau/configure/xf86-video-nouveau
+drwxr-xr-x 2 root root     4096 Apr 17 21:21 ./testing/source/xf86-video-nouveau/doinst.sh
+-rwxr-xr-x 1 root root      897 Jan 31 07:24 ./testing/source/xf86-video-nouveau/get-xf86-video-nouveau.sh
+-rw-r--r-- 1 root root     3645 Aug 31  2010 ./testing/source/xf86-video-nouveau/modularize
+-rw-r--r-- 1 root root     1287 Mar  9 04:43 ./testing/source/xf86-video-nouveau/noarch
+-rw-r--r-- 1 root root      726 Jun  8  2009 ./testing/source/xf86-video-nouveau/package-blacklist
+drwxr-xr-x 2 root root     4096 Apr 17 21:20 ./testing/source/xf86-video-nouveau/slack-desc
+-rw-r--r-- 1 root root      895 Aug 26  2010 ./testing/source/xf86-video-nouveau/slack-desc/xf86-video-nouveau
+drwxr-xr-x 3 root root     4096 Apr 17 21:19 ./testing/source/xf86-video-nouveau/src
+drwxr-xr-x 2 root root     4096 Apr 17 21:19 ./testing/source/xf86-video-nouveau/src/driver
+-rw-r--r-- 1 root root   117612 Apr 17 21:14 ./testing/source/xf86-video-nouveau/src/driver/xf86-video-nouveau-git_20110417_8378443.tar.xz
+-rwxr-xr-x 1 root root    12129 Feb 22  2010 ./testing/source/xf86-video-nouveau/x11.SlackBuild
+-rwxr-xr-x 1 root root       43 Apr 17 21:21 ./testing/source/xf86-video-nouveau/xf86-video-nouveau.SlackBuild
+drwxr-xr-x 2 root root     4096 Apr 22 21:45 ./usb-and-pxe-installers
+-rw-r--r-- 1 root root    31203 Mar 21 21:21 ./usb-and-pxe-installers/README_PXE.TXT
+-rw-r--r-- 1 root root     9198 Feb 17 11:46 ./usb-and-pxe-installers/README_USB.TXT
+-rw-r--r-- 1 root root      414 Apr 23 21:43 ./usb-and-pxe-installers/pxelinux.cfg_default
+-rw-r--r-- 1 root root 22832128 Apr 23 21:43 ./usb-and-pxe-installers/usbboot.img
+-rw-r--r-- 1 root root    16349 Apr 16 19:11 ./usb-and-pxe-installers/usbimg2disk.sh
diff --git a/README.TXT b/README.TXT
index a6e24c6a..00839c66 100644
--- a/README.TXT
+++ b/README.TXT
@@ -1,18 +1,18 @@
 

-Welcome to Slackware 13.1!  (64-bit x86_64 edition)

+Welcome to Slackware 13.37!  (64-bit x86_64 edition)

 

-Slackware 13.1 is a complete distribution of the Linux operating system.

+Slackware 13.37 is a complete distribution of the Linux operating system.

 

-Here are some versions of major components of Slackware 13.1:

+Here are some versions of major components of Slackware 13.37:

 

-- Linux kernel           2.6.33.4

-- C compiler             gcc-4.4.4

-- Binutils               2.20.51.0.8

-- GNU C Library          glibc-2.11.1

-- X Window System        Updated (but not "bleeding edge") packages

-                         from X.Org

-- KDE                    4.4.3

-- Xfce                   4.6.1

+- Linux kernel           2.6.37.6

+                         2.6.38.4

+- C compiler             gcc-4.5.2

+- Binutils               2.21.51.0.6

+- GNU C Library          glibc-2.13

+- X Window System        X11R7.6 + updates

+- KDE                    4.5.5

+- Xfce                   4.6.2

 

 For installation instructions, see the file 'Slackware-HOWTO'.

 

@@ -21,11 +21,11 @@ For important hints about this release, see the file 'CHANGES_AND_HINTS.TXT'.
 These are some of the important files and directories found on the Slackware

 FTP site:

 

-  ftp://ftp.slackware.com/pub/slackware/slackware64-13.1/

+  ftp://ftp.slackware.com/pub/slackware/slackware64-13.37/

 

 There is also a newer (and faster) primary FTP site for Slackware here:

 

-  ftp://slackware.osuosl.org/pub/slackware/slackware64-13.1/

+  ftp://slackware.osuosl.org/pub/slackware/slackware64-13.37/

 

 Thanks to cwo.com for continuing to help us with hosting for our web site

 and ftp.slackware.com, and to the OSU Open Source Lab for hosting our

@@ -35,10 +35,10 @@ If you're reading this on a CD-ROM, these directories will probably be
 split across several discs.

 

 .

-|-- ANNOUNCE.13.1        Announcement for Slackware 13.1.

+|-- ANNOUNCE.13.37        Announcement for Slackware 13.37.

 |-- BOOTING.TXT          Tips for troubleshooting boot problems.

-|-- CHANGES_AND_HINTS.TXT  A summary of major changes from Slackware 13.0

-|                        to 13.1 and common pitfalls.

+|-- CHANGES_AND_HINTS.TXT  A summary of major changes from Slackware 13.1

+|                        to 13.37 and common pitfalls.

 |-- CHECKSUMS.md5        MD5 format file checksums.

 |-- COPYING              The GNU Public License, version 2.

 |-- COPYING3             The GNU Public License, version 3.

@@ -64,10 +64,9 @@ split across several discs.
 |

 |-- extra/               Extra packages for Slackware like:

 |   |                    aspell-word-lists, bash-completion, bittornado,

-|   |                    brltty, emacspeak, the Java(TM) JDK, kde3-compat,

+|   |                    brltty, emacspeak, the Java(TM) JDK,

 |   |                    mplayerplug-in, partitionmanager (GUI partitioning

-|   |                    tool for KDE4), slacktrack, tightvnc, wicd,

-|   |                    yasm assembler.

+|   |                    tool for KDE4), slacktrack, tightvnc, and wicd.

 |   |

 |   `-- source/          Source code for the extra packages.

 |

@@ -81,27 +80,25 @@ split across several discs.
 |   |

 |   `-- initrd.img       Installation initrd (can also be loaded with Loadlin)

 |

-|-- kernels/             Precompiled Linux 2.6.33.4 kernel images.

+|-- kernels/             Precompiled Linux 2.6.37.6 kernel images.

 |   |

-|   |-- huge.s           The default standard install kernel for Slackware.

-|   |                    This supports pretty much everything in the

-|   |                    2.6.33.4 kernel.  This kernel requires an x86_64

-|   |                    (also known as AMD64, EM64T, or Intel 64) capable

-|   |                    64-bit CPU.

+|   `-- huge.s           The default standard install kernel for Slackware.

+|                        This supports pretty much everything in the

+|                        2.6.37.6 kernel, including Speakup.  This kernel

+|                        requires an x86_64 (also known as AMD64, EM64T, or

+|                        Intel 64) capable 64-bit CPU.

+|    

+|-- pasture/             These are packages that have been removed

+|   |                    from Slackware, but are useful enough to

+|   |                    keep around.  Might not be secure.

 |   |

-|   `-- speakup.s        A huge.s kernel patched to support speakup

-|                        speech output through various hardware and 

-|                        software speech synthesizers.

-|

-|-- pasture/             Used to store packages that have been removed from

-|   |                    Slackware, but are useful enough to keep around.

-|   |                    This is currently empty in x86_64 Slackware.

+|   |                    Packages currently found here include

+|   |                    gxine-0.5.905, mesa-7.8.2, and xf86-video-ati-6.13.2.

 |   |

 |   `-- source/          Source code directory for the pasture packages.

-|                        This directory is also currently empty.

 |

 |-- slackware/           This directory contains the core software packages

-|   |                    for Slackware 13.1.

+|   |                    for Slackware 13.37.

 |   |

 |   |-- a/               The A (base) package series.

 |   |-- ap/              The AP (applications) package series.

@@ -141,9 +138,9 @@ split across several discs.
 |

 |-- testing/             This directory contains packages being tested

 |   |                    for possible use in future versions of Slackware.

-|   |                    You'll find amarok-2.3.0.90 (a development

-|   |                    release), and btrfs-progs (2010-05-18 repo pull).

-|   |                    These packages should not be considered supported.

+|   |                    You'll find mesa-7.10.1, which might be a better

+|   |                    option for some hardware.  This package should

+|   |                    not be considered supported.

 |   |

 |   `--- source/         This directory contains source code for the 

 |                        packages in testing.

@@ -163,7 +160,7 @@ split across several discs.
 

 

 If you like Slackware, please consider supporting the project by becoming

-a Slackware subscriber.  The announcement (ANNOUNCE_13.1) in this directory

+a Slackware subscriber.  The announcement (ANNOUNCE_13.37) in this directory

 has information about ordering or subscribing to the Slackware CD-ROM or

 DVD releases.  Note that at this time the x86_64 release is only available

 as part of the DVD -- if there's interest in a CD-ROM version, let us know.

diff --git a/README.initrd b/README.initrd
index 96a2ed45..ca95c332 100644
--- a/README.initrd
+++ b/README.initrd
@@ -1,7 +1,7 @@
 
 Slackware initrd mini HOWTO
 by Patrick Volkerding, volkerdi@slackware.com
-Wed May 12 22:32:34 CDT 2010
+Thu Apr  7 06:02:26 CDT 2011
 
 This document describes how to create and install an initrd, which may be 
 required to use the 2.6 kernel.  Also see "man mkinitrd".
@@ -33,16 +33,16 @@ flexible to ship a generic kernel and a set of kernel modules for it.
 
 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.33.4 Linux kernel using the packages
+upgrading to the generic 2.6.37.6 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.33.4-x86_64-1.tgz
-  installpkg kernel-modules-2.6.33.4-x86_64-1.tgz
-  installpkg mkinitrd-1.4.5-x86_64-2.txz
+  installpkg kernel-generic-2.6.37.6-i686-1.tgz
+  installpkg kernel-modules-2.6.37.6-i686-1.tgz
+  installpkg mkinitrd-1.1.0-i486-1.tgz
 
 Change into the /boot directory:
 
@@ -52,7 +52,7 @@ 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.33.4 -m reiserfs
+  mkinitrd -c -k 2.6.37.6 -m reiserfs
 
 This should do two things.  First, it will create a directory
 /boot/initrd-tree containing the initrd's filesystem.  Then it will
@@ -61,10 +61,10 @@ 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.33.4
+Here's another example:  Build an initrd image using Linux 2.6.37.6
 kernel modules for a system with an ext3 root partition on /dev/sdb3:
 
-  mkinitrd -c -k 2.6.33.4 -m ext3 -f ext3 -r /dev/sdb3
+  mkinitrd -c -k 2.6.37.6 -m ext3 -f ext3 -r /dev/sdb3
 
 
 4.  Now that I've built an initrd, how do I use it?
@@ -76,10 +76,10 @@ 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.33.4
+image = /boot/vmlinuz-generic-2.6.37.6
   initrd = /boot/initrd.gz
   root = /dev/sda6
-  label = Lnx26334
+  label = Lnx26376
   read-only
 # Linux bootable partition config ends
 
diff --git a/README_CRYPT.TXT b/README_CRYPT.TXT
index d8a0dd87..d2b98029 100644
--- a/README_CRYPT.TXT
+++ b/README_CRYPT.TXT
@@ -14,6 +14,7 @@ Contents:
 * Hibernation (suspend-to-disk)

 * Additional passphrases, keyfiles

 * A note on custom kernels

+* USB keyboards and LUKS

 * A mkinitrd helper script

 

 

@@ -306,10 +307,10 @@ needed to unlock the root filesystem, so that the kernel can start the init
 program.  In the example command line below which creates the 'initrd.gz'

 image I assume that the root filesystem is 'ext3', we used the mapped device

 'cryptroot' for the root filesystem on the real partition '/dev/sdx1',

-and are running the Slackware 13.1 default SMP kernel '2.6.33.4-smp'

+and are running the Slackware 13.37 default SMP kernel '2.6.37.6-smp'

 and we did not use Logical Volumes (more about that in the next section):

 

-  # mkinitrd -c -k 2.6.33.4-smp -m ext3 -f ext3 -r cryptroot -C /dev/sdx1

+  # mkinitrd -c -k 2.6.37.6-smp -m ext3 -f ext3 -r cryptroot -C /dev/sdx1

 

 * The resulting initrd image will be written to the file '/boot/initrd.gz'

 by default.  We still need to tell lilo about this initrd. Open the

@@ -317,7 +318,7 @@ configuration file '/etc/lilo.conf' in an editor such as vi or pico -
 it should already have been generated by the 'liloconfig' part of setup.

 Look for the "Linux bootable partition config" and add a line for the initrd.

 We also need to change the kernel file to a generic kernel, because lilo

-is unable to combine the 'huge' kernels in Slackware 13.1 with an initrd

+is unable to combine the 'huge' kernels in Slackware 13.37 with an initrd

 image - it will complain about "The initial RAM disk is too big to fit

 between the kernel and the 15M-16M memory hole" if you try with a 'huge'

 kernel.  We can live with that, since the 'huge' kernels are not meant

@@ -325,7 +326,7 @@ for day-to-day use anyway.  They are meant to install Slackware on a wide
 range of computers and that is why they are 'huge'.  The linux part of

 '/etc/lilo.conf' should end up looking somewhat like this:

 

-image = /boot/vmlinuz-generic-smp-2.6.33.4-smp

+image = /boot/vmlinuz-generic-smp-2.6.37.6-smp

   initrd = /boot/initrd.gz

   root = /dev/mapper/cryptroot

   label = linux

@@ -366,7 +367,7 @@ One, you will need to enter a passphrase for every partition you have encrypted
 (except for the swap which Slackware encrypts with a random passphrase

 on every boot).  Two, the method used for encrypting the swap partition

 prohibits the use of the swap as a hibernation partition.  And since the

-initrd of Slackware 13.1 supports hibernation, it would be a shame not to be

+initrd of Slackware 13.37 supports hibernation, it would be a shame not to be

 able to use this feature on your laptop (which, because of it's portability,

 is the primary target for full disk encryption anyway).

 

@@ -416,7 +417,7 @@ operations will therefore be '/dev/mapper/slackluks'.
 * The LVM part is next.  Create a Physical Volume (PV) on device

 '/dev/mapper/slackluks', a Volume Group (VG) called 'cryptvg' - any name will

 do - on the PV, and three Logical Volumes (LV's) in the VG, one for your

-root partition (5 GB in size), one for the /home partition (10 GB in size)

+root partition (7 GB in size), one for the /home partition (10 GB in size)

 and a third which we will use for swap (1 GB in size).  You will probably

 use different sizes depending on your environment and wishes, but keep the

 sum of the LV sizes less than the total size of the Physical Volume:

@@ -425,7 +426,7 @@ sum of the LV sizes less than the total size of the Physical Volume:
 

   # vgcreate cryptvg /dev/mapper/slackluks

 

-  # lvcreate -L 5G -n root cryptvg

+  # lvcreate -L 7G -n root cryptvg

 

   # lvcreate -L 10G -n home cryptvg

 

@@ -489,10 +490,10 @@ stage of booting the kernel.  The initial ramdisk (initrd) contains a small
 filesystem with the tools needed to unlock the root filesystem, so that

 the kernel can start the init program.  In the example command line below

 which creates the 'initrd.gz' image I assume that you formatted the root

-filesystem as 'ext3', and will be running the Slackware 13.1 default SMP

-kernel '2.6.33.4-smp' :

+filesystem as 'ext3', and will be running the Slackware 13.37 default SMP

+kernel '2.6.37.6-smp' :

 

-  # mkinitrd -c -k 2.6.33.4-smp -m ext3 -f ext3 -r /dev/cryptvg/root -C /dev/sdx2 -L

+  # mkinitrd -c -k 2.6.37.6-smp -m ext3 -f ext3 -r /dev/cryptvg/root -C /dev/sdx2 -L

 

 NOTE: if you use a non-US keyboard and need to enter a passphrase during boot,

       this may be problematic if the keyboard mapping is US while Slackware

@@ -508,7 +509,7 @@ configuration file '/etc/lilo.conf' in an editor such as vi or pico -
 it should already have been generated by the 'liloconfig' part of setup.

 Look for the "Linux bootable partition config" and add a line for the initrd.

 We also need to change the kernel file to a generic kernel, because lilo

-is unable to combine the 'huge' kernels in Slackware 13.1 with an initrd

+is unable to combine the 'huge' kernels in Slackware 13.37 with an initrd

 image - it will complain about "The initial RAM disk is too big to fit

 between the kernel and the 15M-16M memory hole" if you try a 'huge'

 kernel.  We can live with that, since the 'huge' kernels are not meant

@@ -516,7 +517,7 @@ for day-to-day use anyway.  They are meant to install Slackware on a wide
 range of computers and that is why they are 'huge'.  The linux part of

 '/etc/lilo.conf' should end up looking somewhat like this:

 

-image = /boot/vmlinuz-generic-smp-2.6.33.4-smp

+image = /boot/vmlinuz-generic-smp-2.6.37.6-smp

   initrd = /boot/initrd.gz

   root = /dev/cryptvg/root

   label = linux

@@ -547,22 +548,27 @@ do not mind using LVM.
 Additional passphrases, keyfiles

 --------------------------------

 

-The cryptsetup program assigns 7 'key slots' to any partition or volume

+    The cryptsetup program assigns 7 'key slots' to any partition or volume

 it encrypts.  Each of those seven slots can contain a key to unlock the

 partition's data.  The key can be a passphrase, but the content of a

 *keyfile* is another option.  You can then pass the name of a file as a

 parameter to cryptsetup in order to unlock an encrypted volume so that

 you won't have to type a passphrase.  This creates the possibility to

 use a keyfile on a removable USB flash disk for unlocking your Slackware

-computer.  Slackware has partial support for keyfiles: if the file can be

-found, it will be used and you won't have to type a passphrase.  A file on a

-USB stick will *not* be found on boot because the stick's filesystem is not

-mounted.  Future versions of Slackware may support USB sticks as unlocking

-mechanism.  For now, if you encrypt your root filesystem, you will have to

-enter a passphrase to boot into it.  After the root filesystem is unlocked

+computer.  Slackware supports keyfiles: if the file can be found on the file

+system, it will be used and you won't have to type a passphrase.

+

+    A keyfile on a FAT formatted USB stick can be used as well.  This scenario

+requires you to use the "-K" parameter to mkinitrd to specify the USB stick's

+FAT-label or UUID, as well as the full path to the keyfile.  An example:

+

+  # mkinitrd -c -k 2.6.37.6-smp -m ext3 -f ext3 -r /dev/cryptvg/root -C /dev/sdx2 -L -K LABEL=TRAVELSTICK:/keys/alien.luks

+

+    The mkinitrd of Slackware 13.1 introduced this support for USB sticks as

+unlocking mechanism.  Alternatively, after the root filesystem is unlocked

 and mounted, it is completely safe to have a keyfile for _additional_

-encrypted filesystems stored in for instance the '/root' directory.  That

-way, you have only one passphrase to type.

+encrypted filesystems stored in for instance the '/root' directory.

+That way, you still have only one passphrase to type.

 

 

 Hibernation (suspend-to-disk)

@@ -601,10 +607,21 @@ CONFIG_DM_CRYPT=y
 Do not compile these as module! They are required in your kernel. 

 

 

+USB keyboards and LUKS

+----------------------

+

+    If you have set up an encrypted root partition, you will need to have

+access to your keyboard in order to type the passphrase.  This may require

+you to add the 'uhci-hcd' and 'usbhid' modules to your initrd image if you

+have a USB keyboard.  Also note that if you are using a non-US keyboard,

+you can use the '-l' parameter to the 'mkinitrd' command in order to add

+support for this keyboard to your initrd.

+

+

 A mkinitrd helper script

 ------------------------

 

-    The mkinitrd package in Slackware 13.1 ships with a script called

+    The mkinitrd package in Slackware 13.37 ships with a script called

 'mkinitrd_command_generator.sh'.  If you run this script, it will analyze

 your Slackware configuration and make a smart suggestion about the 'mkinitrd'

 command you have to type in order to create an initrd.gz with all the bells

@@ -619,7 +636,7 @@ by yourself:
 It should emit a string like this (your system will probably give different

 parameter values):

 

-mkinitrd -c -k 2.6.33.4-smp -m ext3 -f ext3 -r /dev/cryptvg/root -C /dev/sdx2 -L

+mkinitrd -c -k 2.6.37.6-smp -m ext3 -f ext3 -r /dev/cryptvg/root -C /dev/sdx2 -L

 

 You can copy and paste this output to your command prompt, and add any other

 parameters you need such as "-h" to indicate a hibernation partition or

@@ -634,6 +651,7 @@ Good luck with your fresh Slackware installion on encrypted partition(s)!
 

 ==============================================================================

 Author:

-  Eric Hameleers <alien@slackware.com> 23-jul-2009

+  Eric Hameleers <alien@slackware.com> 08-apr-2011

 URLs:

   http://www.slackware.com/~alien/dokuwiki/doku.php?id=slackware:setup

+

diff --git a/README_LVM.TXT b/README_LVM.TXT
index 94cd5ad8..2318e696 100644
--- a/README_LVM.TXT
+++ b/README_LVM.TXT
@@ -11,7 +11,7 @@ installation to Logical Volumes.  In Slackware, the installer has never
 supported this, but the gurus usually would find a way to create logical

 volumes and install or migrate their Slackware onto those.  Having your

 Slackware installed fully on LVM was near impossible until Slackware 12.0.

-Slackware 13.1 has improved support for LVM built into the installer.

+Slackware 13.37 has improved support for LVM built into the installer.

 

 

 Preparing Logical Volumes (LV)

@@ -40,14 +40,14 @@ LV's called 'root' and 'home'.  The first is going to contain the root partition
 

     After booting your computer from the Slackware CD/DVD/USB, and logging in

 as root, you run the following sequence of commands to create the Physical

-Volume (PV), the Volume Group (VG) within that PV and two LV's of size 5GB

+Volume (PV), the Volume Group (VG) within that PV and two LV's of size 6GB

 (root) and 3GB (home) inside the VG:

 

   # pvcreate /dev/sda1

 

   # vgcreate myvg /dev/sda1

 

-  # lvcreate -L 5G -n root myvg

+  # lvcreate -L 6G -n root myvg

 

   # lvcreate -L 3G -n home myvg

 

@@ -60,13 +60,8 @@ Volume (PV), the Volume Group (VG) within that PV and two LV's of size 5GB
             # lvcreate -l 100%FREE -n home myvg

     ========================================================================

 

-    Next, we create the device nodes needed before activating the volumes, and

-finally we activate the volumes (the last command is not really needed because

-'setup' will run it anyway):

-

-  # vgscan --mknodes

-

-  # vgchange -ay

+    The device nodes for the logical volumes are created, and the volumes

+will be activated automatically when running lvcreate.

 

 This is all we need to do before running 'setup'.

 

@@ -110,9 +105,9 @@ We are going to 'chroot' into our fresh installation:
     Next, while we are in the chroot, create the initrd with LVM support -

 in the example command line I assume that the root filesystem is 'ext3',

 we used the LV '/dev/myvg/root' as the root device, and are running the

-Slackware 13.1 default SMP kernel '2.6.33.4-smp':

+Slackware 13.37 default SMP kernel '2.6.37.6-smp':

 

-  # mkinitrd -c -k 2.6.33.4-smp -m ext3 -f ext3 -r /dev/myvg/root -L

+  # mkinitrd -c -k 2.6.37.6-smp -m ext3 -f ext3 -r /dev/myvg/root -L

 

     The resulting initrd image will be written to the file '/boot/initrd.gz'

 by default.  We still need to tell lilo about this initrd, so open the

@@ -124,7 +119,7 @@ filename added by 'liloconfig' is '/boot/vmlinuz' which is a symbolic link to
 the huge SMP kernel.  Remember that we need a 'generic' kernel with the initrd.

 The end result should look somewhat like this:

 

-  image = /boot/vmlinuz-generic-smp-2.6.33.4-smp

+  image = /boot/vmlinuz-generic-smp-2.6.37.6-smp

     initrd = /boot/initrd.gz

     root = /dev/myvg/root

     label = linux

@@ -139,9 +134,9 @@ but it is safe to ignore these.
 

     =====================================================================

     An alternative method of creating the commandline for mkinitrd is

-    to use the '/usr/share/mkinitrd_command_generator.sh' script that is

-    part of the mkinitrd package. This script will analyze your Slackware

-    installation and show you a useable 'mkinitrd' commandline:

+    to use the '/usr/share/mkinitrd/mkinitrd_command_generator.sh' script

+    which is part of the mkinitrd package.  This script will analyze your

+    Slackware installation and show you a useable 'mkinitrd' commandline:

 

     # /usr/share/mkinitrd/mkinitrd_command_generator.sh -r

 

@@ -188,7 +183,7 @@ This is enough to get it recognized by the setup program.  Have fun!
 

 ========================================================

 Author:

-  Eric Hameleers <alien@slackware.com> 25-jul-2009

+  Eric Hameleers <alien@slackware.com> 08-apr-2011

 Wiki URLs:

   http://www.slackware.com/~alien/dokuwiki/doku.php?id=slackware:setup

 Documentation:

diff --git a/README_RAID.TXT b/README_RAID.TXT
index 38f27828..ca423f77 100644
--- a/README_RAID.TXT
+++ b/README_RAID.TXT
@@ -1,7 +1,7 @@
 Slackware RAID HOWTO

 

-Version 1.00

-2008/04/29

+Version 1.01

+2011/03/15

 

 by Amritpal Bath <amrit@slackware.com>

 

@@ -10,6 +10,7 @@ by Amritpal Bath <amrit@slackware.com>
 Contents

 ===============================================================================

 

+- Changelog

 - Introduction

 - Warnings

 - Planning

@@ -22,6 +23,17 @@ Contents
 

 

 

+Changelog

+===============================================================================

+

+1.01 (2011/03/15):

+  - Added Robby Workman's --metadata edits per James Davies' tip.

+1.00 (2008/04/09):

+  - Intitial release.

+

+

+

+

 Introduction

 ===============================================================================

 

@@ -222,6 +234,10 @@ The parameters for each of these RAID commands specifies, in order:
  - the RAID level to use for this array (--level X)

  - how many devices (partitions) to use in the array (--raid-devices X)

  - the actual list of devices (/dev/sdaX /dev/sdbX /dev/sdcX)

+ - this is not present on all of them, but "--metadata=0.90" tells mdadm

+   to use the older version 0.90 metadata instead of the newer version;

+   you must use this for any array from which LILO will be loading a 

+   kernel image, or else LILO won't be able to read from it.

 

 Start by creating the RAID array for your root filesystem.

 

@@ -231,7 +247,7 @@ Start by creating the RAID array for your root filesystem.
 

  - RAID 1:

      mdadm --create /dev/md0 --level 1 --raid-devices 2 \

-       /dev/sda1 /dev/sdb1

+       /dev/sda1 /dev/sdb1 --metadata=0.90

 

  - RAID 5:

      mdadm --create /dev/md0 --level 5 --raid-devices 3 \

@@ -260,11 +276,11 @@ RAID 1 users do not need to do this.
 

  - RAID 0:

      mdadm --create /dev/md2 --level 1 --raid-devices 2 \

-       /dev/sda1 /dev/sdb1

+       /dev/sda1 /dev/sdb1 --metadata=0.90

 

  - RAID 5:

      mdadm --create /dev/md2 --level 1 --raid-devices 3 \

-       /dev/sda1 /dev/sdb1 /dev/sdc1

+       /dev/sda1 /dev/sdb1 /dev/sdc1 --metadata=0.90

 

 

 We're all done creating our arrays!  Yay!

diff --git a/READ_DVD.TXT b/READ_DVD.TXT
index b74f36f7..74808224 100644
--- a/READ_DVD.TXT
+++ b/READ_DVD.TXT
@@ -1,11 +1,11 @@
 

-Welcome to the Slackware Linux version 13.1 64-bit x86_64 DVD.

+Welcome to the Slackware Linux version 13.37 64-bit x86_64 DVD.

 

 Here's a tree showing the contents of this disc.  For complete details,

 see additional documentation files.

 

 .

-|-- ANNOUNCE.13_1

+|-- ANNOUNCE.13_37

 |-- BOOTING.TXT

 |-- CHANGES_AND_HINTS.TXT

 |-- CHECKSUMS.md5

@@ -281,9 +281,9 @@ see additional documentation files.
 |   |   |-- aspell-zu-0.50_0-noarch-4.txz

 |   |   `-- aspell-zu-0.50_0-noarch-4.txz.asc

 |   |-- bash-completion

-|   |   |-- bash-completion-1.1-noarch-3.txt

-|   |   |-- bash-completion-1.1-noarch-3.txz

-|   |   `-- bash-completion-1.1-noarch-3.txz.asc

+|   |   |-- bash-completion-1.3-noarch-4.txt

+|   |   |-- bash-completion-1.3-noarch-4.txz

+|   |   `-- bash-completion-1.3-noarch-4.txz.asc

 |   |-- bittornado

 |   |   |-- bittornado-0.3.18-noarch-2.txt

 |   |   |-- bittornado-0.3.18-noarch-2.txz

@@ -298,27 +298,31 @@ see additional documentation files.
 |   |   |-- brltty-4.2-x86_64-1.txz

 |   |   `-- brltty-4.2-x86_64-1.txz.asc

 |   |-- emacspeak

-|   |   |-- emacspeak-32.0-x86_64-1.txt

-|   |   |-- emacspeak-32.0-x86_64-1.txz

-|   |   `-- emacspeak-32.0-x86_64-1.txz.asc

+|   |   |-- emacspeak-33.0-x86_64-1.txt

+|   |   |-- emacspeak-33.0-x86_64-1.txz

+|   |   `-- emacspeak-33.0-x86_64-1.txz.asc

 |   |-- flashplayer-plugin -> source/flashplayer-plugin

+|   |-- fvwm-2.6.1

+|   |   |-- fvwm-2.6.1-x86_64-1.txt

+|   |   |-- fvwm-2.6.1-x86_64-1.txz

+|   |   `-- fvwm-2.6.1-x86_64-1.txz.asc

+|   |-- google-chrome

+|   |   |-- GConf-2.32.1-x86_64-1.txt

+|   |   |-- GConf-2.32.1-x86_64-1.txz

+|   |   |-- GConf-2.32.1-x86_64-1.txz.asc

+|   |   |-- ORBit2-2.14.19-x86_64-1.txt

+|   |   |-- ORBit2-2.14.19-x86_64-1.txz

+|   |   |-- ORBit2-2.14.19-x86_64-1.txz.asc

+|   |   |-- README

+|   |   |-- google-chrome-pam-solibs-1.1.3-x86_64-1.txt

+|   |   |-- google-chrome-pam-solibs-1.1.3-x86_64-1.txz

+|   |   |-- google-chrome-pam-solibs-1.1.3-x86_64-1.txz.asc

+|   |   |-- google-chrome.SlackBuild

+|   |   `-- slack-desc

 |   |-- jdk-6

-|   |   |-- jdk-6u20-x86_64-1.txt

-|   |   |-- jdk-6u20-x86_64-1.txz

-|   |   `-- jdk-6u20-x86_64-1.txz.asc

-|   |-- kde3-compat

-|   |   |-- arts-1.5.10-x86_64-opt1.txt

-|   |   |-- arts-1.5.10-x86_64-opt1.txz

-|   |   |-- arts-1.5.10-x86_64-opt1.txz.asc

-|   |   |-- k3b3-1.0.5-x86_64-opt1.txt

-|   |   |-- k3b3-1.0.5-x86_64-opt1.txz

-|   |   |-- k3b3-1.0.5-x86_64-opt1.txz.asc

-|   |   |-- kdelibs3-3.5.10-x86_64-opt1.txt

-|   |   |-- kdelibs3-3.5.10-x86_64-opt1.txz

-|   |   |-- kdelibs3-3.5.10-x86_64-opt1.txz.asc

-|   |   |-- qt3-3.3.8b-x86_64-opt2.txt

-|   |   |-- qt3-3.3.8b-x86_64-opt2.txz

-|   |   `-- qt3-3.3.8b-x86_64-opt2.txz.asc

+|   |   |-- jdk-6u25-x86_64-1.txt

+|   |   |-- jdk-6u25-x86_64-1.txz

+|   |   `-- jdk-6u25-x86_64-1.txz.asc

 |   |-- mplayerplug-in

 |   |   |-- mplayerplug-in-3.55-x86_64-1.txt

 |   |   |-- mplayerplug-in-3.55-x86_64-1.txz

@@ -331,17 +335,29 @@ see additional documentation files.
 |   |   |-- recordmydesktop-0.3.8.1-x86_64-2.txt

 |   |   |-- recordmydesktop-0.3.8.1-x86_64-2.txz

 |   |   `-- recordmydesktop-0.3.8.1-x86_64-2.txz.asc

-|   |-- slacktrack

-|   |   |-- OVERVIEW

-|   |   |-- slacktrack-2.07-x86_64-1.txt

-|   |   |-- slacktrack-2.07-x86_64-1.txz

-|   |   `-- slacktrack-2.07-x86_64-1.txz.asc

 |   |-- source

+|   |   |-- GConf

+|   |   |   |-- GConf-2.32.1.tar.xz

+|   |   |   |-- GConf.SlackBuild

+|   |   |   |-- GConf.url

+|   |   |   |-- doinst.sh.gz

+|   |   |   `-- slack-desc

+|   |   |-- ORBit2

+|   |   |   |-- ORBit2-2.14.19.tar.xz

+|   |   |   |-- ORBit2.SlackBuild

+|   |   |   |-- ORBit2.url

+|   |   |   `-- slack-desc

 |   |   |-- bash-completion

-|   |   |   |-- bash-completion-1.1-pkgtools_tgxz.diff.gz

-|   |   |   |-- bash-completion-1.1.tar.bz2

+|   |   |   |-- bash-completion-1.3.tar.bz2

 |   |   |   |-- bash-completion.SlackBuild

 |   |   |   |-- bash_completion.sh.gz

+|   |   |   |-- contrib

+|   |   |   |   |-- pkgtools

+|   |   |   |   |-- rpm2tgz

+|   |   |   |   |-- sbopkg

+|   |   |   |   |-- slackpkg

+|   |   |   |   `-- slapt

+|   |   |   |-- fixup-sh-script-completions.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- bittornado

 |   |   |   |-- BitTornado-0.3.18.tar.bz2

@@ -360,13 +376,19 @@ see additional documentation files.
 |   |   |   |-- brltty.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- emacspeak

-|   |   |   |-- emacspeak-32.0.tar.xz

-|   |   |   |-- emacspeak-32.0.tcl8.5.diff.gz

+|   |   |   |-- emacspeak-33.0.tar.xz

 |   |   |   |-- emacspeak.SlackBuild

+|   |   |   |-- emacspeak.tcl8.5.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- flashplayer-plugin

 |   |   |   |-- flashplayer-plugin.SlackBuild

 |   |   |   `-- slack-desc

+|   |   |-- fvwm-2.6.1

+|   |   |   |-- doinst.sh.gz

+|   |   |   |-- fvwm-2.6.1.tar.xz

+|   |   |   |-- fvwm.SlackBuild

+|   |   |   |-- slack-desc

+|   |   |   `-- xinitrc.fvwm2.gz

 |   |   |-- grub

 |   |   |   |-- grub-0.97-x86_64.patch.gz

 |   |   |   |-- grub-0.97.tar.gz

@@ -381,8 +403,6 @@ see additional documentation files.
 |   |   |   |-- HOWTO-BUILD-TXZ

 |   |   |   |-- LICENSE

 |   |   |   |-- README.html

-|   |   |   |-- README_ja.html

-|   |   |   |-- README_zh_CN.html

 |   |   |   |-- THIRDPARTYLICENSEREADME.txt

 |   |   |   |-- jdk.SlackBuild

 |   |   |   |-- profile.d

@@ -392,40 +412,28 @@ see additional documentation files.
 |   |   |   |-- register_ja.html

 |   |   |   |-- register_zh_CN.html

 |   |   |   `-- slack-desc

-|   |   |-- kde3-compat

-|   |   |   |-- arts

-|   |   |   |   |-- arts-1.5.10.tar.bz2

-|   |   |   |   |-- arts.SlackBuild

-|   |   |   |   |-- arts.tmpdir.diff.gz

-|   |   |   |   `-- slack-desc

-|   |   |   |-- k3b3

-|   |   |   |   |-- k3b-1.0.5.tar.bz2

-|   |   |   |   |-- k3b3.SlackBuild

-|   |   |   |   `-- slack-desc

-|   |   |   |-- kdelibs3

-|   |   |   |   |-- apply-patches.sh

-|   |   |   |   |-- kdelibs-3.5.10.tar.bz2

-|   |   |   |   |-- kdelibs-utempter.diff.gz

-|   |   |   |   |-- kdelibs.inotify.diff.gz

-|   |   |   |   |-- kdelibs.no.inotify.externs.diff.gz

-|   |   |   |   |-- kdelibs3.SlackBuild

-|   |   |   |   |-- local.options

-|   |   |   |   `-- slack-desc

-|   |   |   `-- qt3

-|   |   |       |-- doinst.sh.gz

-|   |   |       |-- profile.d

-|   |   |       |   |-- qt.csh

-|   |   |       |   `-- qt.sh

-|   |   |       |-- qt-x11-free-3.3.8b.tar.bz2

-|   |   |       |-- qt-x11.diff.gz

-|   |   |       |-- qt.mysql.h.diff.gz

-|   |   |       |-- qt.x86.cflags.diff.gz

-|   |   |       |-- qt3.SlackBuild

-|   |   |       `-- slack-desc

 |   |   |-- mplayerplug-in

 |   |   |   |-- mplayerplug-in-3.55.tar.gz

 |   |   |   |-- mplayerplug-in.SlackBuild

 |   |   |   `-- slack-desc

+|   |   |-- pam

+|   |   |   |-- Linux-PAM-1.1.3.tar.xz

+|   |   |   |-- make-pam-solibs-for-chrome.sh

+|   |   |   |-- pam-redhat-0.99.10-1.tar.bz2

+|   |   |   |-- pam.SlackBuild

+|   |   |   |-- patches

+|   |   |   |   |-- pam-1.0.90-redhat-modules.patch.gz

+|   |   |   |   |-- pam-1.0.91-std-noclose.patch.gz

+|   |   |   |   |-- pam-1.1.0-notally.patch.gz

+|   |   |   |   |-- pam-1.1.1-faillock.patch.gz

+|   |   |   |   |-- pam-1.1.2-noflex.patch.gz

+|   |   |   |   |-- pam-1.1.3-faillock-screensaver.patch.gz

+|   |   |   |   |-- pam-1.1.3-limits-nosetreuid.patch.gz

+|   |   |   |   |-- pam-1.1.3-limits-range.patch.gz

+|   |   |   |   |-- pam-1.1.3-nouserenv.patch.gz

+|   |   |   |   |-- pam-1.1.3-pwhistory-incomplete.patch.gz

+|   |   |   |   `-- pam-1.1.3-securetty-console.patch.gz

+|   |   |   `-- slack-desc

 |   |   |-- partitionmanager

 |   |   |   |-- doinst.sh.gz

 |   |   |   |-- partitionmanager-1.0.2.tar.xz

@@ -436,9 +444,6 @@ see additional documentation files.
 |   |   |   |-- recordmydesktop-0.3.8.1.tar.gz

 |   |   |   |-- recordmydesktop.SlackBuild

 |   |   |   `-- slack-desc

-|   |   |-- slacktrack

-|   |   |   |-- slacktrack-2.07-source.tar.gz

-|   |   |   `-- slacktrack.SlackBuild

 |   |   |-- tightvnc

 |   |   |   |-- _tightvnc.tar.gz

 |   |   |   |-- doinst.sh.gz

@@ -446,18 +451,14 @@ see additional documentation files.
 |   |   |   |-- tightvnc-1.3.10_unixsrc.tar.xz

 |   |   |   |-- tightvnc.SlackBuild

 |   |   |   `-- tightvnc.paths-and-perms.diff.gz

-|   |   |-- wicd

-|   |   |   |-- README.SLACKWARE

-|   |   |   |-- doinst.sh.gz

-|   |   |   |-- slack-desc

-|   |   |   |-- wicd-1.7.0-fix_EAP_fast_typo.diff.gz

-|   |   |   |-- wicd-1.7.0-fix_script_bug.diff.gz

-|   |   |   |-- wicd-1.7.0.tar.bz2

-|   |   |   `-- wicd.SlackBuild

-|   |   `-- yasm

+|   |   `-- wicd

+|   |       |-- README.SLACKWARE

+|   |       |-- doinst.sh.gz

 |   |       |-- slack-desc

-|   |       |-- yasm-0.8.0.tar.gz

-|   |       `-- yasm.SlackBuild

+|   |       |-- wicd-1.7.0-fix_EAP_fast_typo.diff.gz

+|   |       |-- wicd-1.7.0-fix_script_bug.diff.gz

+|   |       |-- wicd-1.7.0.tar.bz2

+|   |       `-- wicd.SlackBuild

 |   |-- tightvnc

 |   |   |-- tightvnc-1.3.10-x86_64-1.txt

 |   |   |-- tightvnc-1.3.10-x86_64-1.txz

@@ -467,10 +468,10 @@ see additional documentation files.
 |   |   |-- wicd-1.7.0-x86_64-2.txt

 |   |   |-- wicd-1.7.0-x86_64-2.txz

 |   |   `-- wicd-1.7.0-x86_64-2.txz.asc

-|   `-- yasm

-|       |-- yasm-0.8.0-x86_64-1.txt

-|       |-- yasm-0.8.0-x86_64-1.txz

-|       `-- yasm-0.8.0-x86_64-1.txz.asc

+|   `-- xf86-video-nouveau-blacklist

+|       |-- xf86-video-nouveau-blacklist-noarch-1.txt

+|       |-- xf86-video-nouveau-blacklist-noarch-1.txz

+|       `-- xf86-video-nouveau-blacklist-noarch-1.txz.asc

 |-- isolinux

 |   |-- README.TXT

 |   |-- README_SPLIT.TXT

@@ -496,166 +497,207 @@ see additional documentation files.
 |   |   |-- System.map.gz

 |   |   |-- bzImage

 |   |   `-- config

+|   |-- memtest

+|   |   |-- README

+|   |   `-- memtest

 |   `-- speakup.s

-|       |-- System.map.gz

-|       |-- bzImage

-|       |-- config

-|       `-- speakup_decpc.ko

-|-- misc

-|   `-- slackbook

-|       |-- html

-|       |   |-- TRADEMARKS.html

-|       |   |-- archive-files-bzip2.html

-|       |   |-- archive-files-tar.html

-|       |   |-- archive-files-zip.html

-|       |   |-- archive-files.html

-|       |   |-- basic-network-commands

-|       |   |   |-- elm.png

-|       |   |   |-- links.png

-|       |   |   |-- lynx.png

-|       |   |   |-- mutt.png

-|       |   |   |-- pine.png

-|       |   |   |-- talk.png

-|       |   |   `-- ytalk.png

-|       |   |-- basic-network-commands-dns.html

-|       |   |-- basic-network-commands-email.html

-|       |   |-- basic-network-commands-finger.html

-|       |   |-- basic-network-commands-ftp.html

-|       |   |-- basic-network-commands-ssh.html

-|       |   |-- basic-network-commands-talk.html

-|       |   |-- basic-network-commands-telnet.html

-|       |   |-- basic-network-commands-traceroute.html

-|       |   |-- basic-network-commands-web.html

-|       |   |-- basic-network-commands.html

-|       |   |-- book-preface.html

-|       |   |-- book.html

-|       |   |-- booting

-|       |   |   |-- setup-lilo-expert-w.png

-|       |   |   `-- setup-lilo-w.png

-|       |   |-- booting-dual.html

-|       |   |-- booting-loadlin.html

-|       |   |-- booting.html

-|       |   |-- docbook.css

-|       |   |-- emacs

-|       |   |   `-- emacs.png

-|       |   |-- emacs-basic-editing.html

-|       |   |-- emacs-buffers.html

-|       |   |-- emacs-modes.html

-|       |   |-- emacs-saving-files.html

-|       |   |-- emacs.html

-|       |   |-- essential-sysadmin-hardusers.html

-|       |   |-- essential-sysadmin-shutdown.html

-|       |   |-- essential-sysadmin.html

-|       |   |-- file-commands-copymove.html

-|       |   |-- file-commands-creation.html

-|       |   |-- file-commands-deletion.html

-|       |   |-- file-commands-link.html

-|       |   |-- file-commands-output.html

-|       |   |-- file-commands-pagers.html

-|       |   |-- file-commands.html

-|       |   |-- filesystem-structure-links.html

-|       |   |-- filesystem-structure-mounting.html

-|       |   |-- filesystem-structure-nfs.html

-|       |   |-- filesystem-structure-permissions.html

-|       |   |-- filesystem-structure.html

-|       |   |-- glossary.html

-|       |   |-- gpl.html

-|       |   |-- help-online.html

-|       |   |-- help.html

-|       |   |-- imagelib

-|       |   |   `-- admon

-|       |   |       |-- note.png

-|       |   |       `-- warning.png

-|       |   |-- index.html

-|       |   |-- installation

-|       |   |   |-- setup-bootdisk-w.png

-|       |   |   |-- setup-font-w.png

-|       |   |   |-- setup-hardware-clock-w.png

-|       |   |   |-- setup-help-w.png

-|       |   |   |-- setup-install-w.png

-|       |   |   |-- setup-kernel-w.png

-|       |   |   |-- setup-keymap-w.png

-|       |   |   |-- setup-lilo-w.png

-|       |   |   |-- setup-modem-w.png

-|       |   |   |-- setup-mouse-w.png

-|       |   |   |-- setup-program-w.png

-|       |   |   |-- setup-select-w.png

-|       |   |   |-- setup-source-w.png

-|       |   |   |-- setup-swap-w.png

-|       |   |   |-- setup-target-w.png

-|       |   |   |-- setup-timezone-w.png

-|       |   |   `-- setup-xwmconfig-w.png

-|       |   |-- installation-partitioning.html

-|       |   |-- installation-requirements.html

-|       |   |-- installation-setup.html

-|       |   |-- installation.html

-|       |   |-- introduction-opensource.html

-|       |   |-- introduction-slackware.html

-|       |   |-- introduction.html

-|       |   |-- network-configuration-hardware.html

-|       |   |-- network-configuration-nfs.html

-|       |   |-- network-configuration-ppp.html

-|       |   |-- network-configuration-tcpip.html

-|       |   |-- network-configuration-wireless.html

-|       |   |-- network-configuration.html

-|       |   |-- package-management

-|       |   |   |-- pkgtool-view-w.png

-|       |   |   `-- pkgtool-w.png

-|       |   |-- package-management-making-packages.html

-|       |   |-- package-management-making-tags-and-tagfiles.html

-|       |   |-- package-management-package-utilities.html

-|       |   |-- package-management.html

-|       |   |-- process-control-foregrounding.html

-|       |   |-- process-control-kill.html

-|       |   |-- process-control-ps.html

-|       |   |-- process-control-top.html

-|       |   |-- process-control.html

-|       |   |-- security-current.html

-|       |   |-- security-host.html

-|       |   |-- security.html

-|       |   |-- shell-bash.html

-|       |   |-- shell-command-line.html

-|       |   |-- shell-vt.html

-|       |   |-- shell.html

-|       |   |-- slackware_logo.png

-|       |   |-- system-configuration

-|       |   |   `-- make-menuconfig-w.png

-|       |   |-- system-configuration-kernel.html

-|       |   |-- system-configuration.html

-|       |   |-- vi

-|       |   |   `-- vim-splitedit.png

-|       |   |-- vi-configuration.html

-|       |   |-- vi-keys.html

-|       |   |-- vi-modes.html

-|       |   |-- vi-opening-files.html

-|       |   |-- vi-quitting-vi.html

-|       |   |-- vi-saving-files.html

-|       |   |-- vi.html

-|       |   |-- x-window-system

-|       |   |   |-- xorgconfig1-w.png

-|       |   |   |-- xorgconfig2-w.png

-|       |   |   |-- xorgconfig3-w.png

-|       |   |   |-- xorgconfig4-w.png

-|       |   |   `-- xwmconfig-w.png

-|       |   |-- x-window-system-xdm.html

-|       |   |-- x-window-system-xinitrc.html

-|       |   |-- x-window-system-xorgsetup.html

-|       |   |-- x-window-system-xwmconfig.html

-|       |   |-- x-window-system.html

-|       |   |-- zipslack-booting.html

-|       |   |-- zipslack-getting.html

-|       |   `-- zipslack.html

-|       |-- slackbook-2.0.pdf

-|       `-- slackbook-2.0.ps

+|       `-- README.TXT

 |-- pasture

+|   |-- CHECKSUMS.md5

 |   |-- CHECKSUMS.md5.asc

-|   `-- source

+|   |-- FILE_LIST

+|   |-- MANIFEST.bz2

+|   |-- PACKAGES.TXT

+|   |-- gxine-0.5.905-x86_64-1.txt

+|   |-- gxine-0.5.905-x86_64-1.txz

+|   |-- gxine-0.5.905-x86_64-1.txz.asc

+|   |-- make-3.81-x86_64-3.txt

+|   |-- make-3.81-x86_64-3.txz

+|   |-- make-3.81-x86_64-3.txz.asc

+|   |-- mesa-7.8.2-x86_64-1.txt

+|   |-- mesa-7.8.2-x86_64-1.txz

+|   |-- mesa-7.8.2-x86_64-1.txz.asc

+|   |-- source

+|   |   |-- gxine

+|   |   |   |-- gxine-0.5.905.tar.bz2

+|   |   |   |-- gxine.SlackBuild

+|   |   |   |-- gxine.desktop.gz

+|   |   |   `-- slack-desc

+|   |   |-- make

+|   |   |   |-- make-3.81.tar.bz2

+|   |   |   |-- make-3.81.tar.bz2.sig

+|   |   |   |-- make.SlackBuild

+|   |   |   `-- slack-desc

+|   |   |-- mesa-7.8.2

+|   |   |   |-- MesaDemos-7.8.2.tar.xz

+|   |   |   |-- MesaGLUT-7.8.2.tar.xz

+|   |   |   |-- MesaLib-7.8.2.tar.xz

+|   |   |   |-- README.GIT

+|   |   |   |-- get-mesa.sh

+|   |   |   |-- mesa.SlackBuild

+|   |   |   |-- mesa.url

+|   |   |   `-- slack-desc

+|   |   |-- xf86-video-ati

+|   |   |   `-- xf86-video-ati-6.13.2.tar.xz

+|   |   |-- xf86-video-intel

+|   |   `-- xf86-video-intel-2.14.0.tar.xz

+|   |-- xf86-video-ati-6.13.2-x86_64-1.txt

+|   |-- xf86-video-ati-6.13.2-x86_64-1.txz

+|   |-- xf86-video-ati-6.13.2-x86_64-1.txz.asc

+|   |-- xf86-video-intel-2.14.0-x86_64-1.txt

+|   |-- xf86-video-intel-2.14.0-x86_64-1.txz

+|   `-- xf86-video-intel-2.14.0-x86_64-1.txz.asc

 |-- patches

 |   |-- CHECKSUMS.md5

 |   |-- CHECKSUMS.md5.asc

 |   |-- FILE_LIST

 |   |-- MANIFEST.bz2

 |   `-- PACKAGES.TXT

+|-- slackbook

+|   |-- html

+|   |   |-- TRADEMARKS.html

+|   |   |-- archive-files-bzip2.html

+|   |   |-- archive-files-tar.html

+|   |   |-- archive-files-zip.html

+|   |   |-- archive-files.html

+|   |   |-- basic-network-commands

+|   |   |   |-- elm.png

+|   |   |   |-- links.png

+|   |   |   |-- lynx.png

+|   |   |   |-- mutt.png

+|   |   |   |-- pine.png

+|   |   |   |-- talk.png

+|   |   |   `-- ytalk.png

+|   |   |-- basic-network-commands-dns.html

+|   |   |-- basic-network-commands-email.html

+|   |   |-- basic-network-commands-finger.html

+|   |   |-- basic-network-commands-ftp.html

+|   |   |-- basic-network-commands-ssh.html

+|   |   |-- basic-network-commands-talk.html

+|   |   |-- basic-network-commands-telnet.html

+|   |   |-- basic-network-commands-traceroute.html

+|   |   |-- basic-network-commands-web.html

+|   |   |-- basic-network-commands.html

+|   |   |-- book-preface.html

+|   |   |-- book.html

+|   |   |-- booting

+|   |   |   |-- setup-lilo-expert-w.png

+|   |   |   `-- setup-lilo-w.png

+|   |   |-- booting-dual.html

+|   |   |-- booting-loadlin.html

+|   |   |-- booting.html

+|   |   |-- docbook.css

+|   |   |-- emacs

+|   |   |   `-- emacs.png

+|   |   |-- emacs-basic-editing.html

+|   |   |-- emacs-buffers.html

+|   |   |-- emacs-modes.html

+|   |   |-- emacs-saving-files.html

+|   |   |-- emacs.html

+|   |   |-- essential-sysadmin-hardusers.html

+|   |   |-- essential-sysadmin-shutdown.html

+|   |   |-- essential-sysadmin.html

+|   |   |-- file-commands-copymove.html

+|   |   |-- file-commands-creation.html

+|   |   |-- file-commands-deletion.html

+|   |   |-- file-commands-link.html

+|   |   |-- file-commands-output.html

+|   |   |-- file-commands-pagers.html

+|   |   |-- file-commands.html

+|   |   |-- filesystem-structure-links.html

+|   |   |-- filesystem-structure-mounting.html

+|   |   |-- filesystem-structure-nfs.html

+|   |   |-- filesystem-structure-permissions.html

+|   |   |-- filesystem-structure.html

+|   |   |-- glossary.html

+|   |   |-- gpl.html

+|   |   |-- help-online.html

+|   |   |-- help.html

+|   |   |-- imagelib

+|   |   |   `-- admon

+|   |   |       |-- note.png

+|   |   |       `-- warning.png

+|   |   |-- index.html

+|   |   |-- installation

+|   |   |   |-- setup-bootdisk-w.png

+|   |   |   |-- setup-font-w.png

+|   |   |   |-- setup-hardware-clock-w.png

+|   |   |   |-- setup-help-w.png

+|   |   |   |-- setup-install-w.png

+|   |   |   |-- setup-kernel-w.png

+|   |   |   |-- setup-keymap-w.png

+|   |   |   |-- setup-lilo-w.png

+|   |   |   |-- setup-modem-w.png

+|   |   |   |-- setup-mouse-w.png

+|   |   |   |-- setup-program-w.png

+|   |   |   |-- setup-select-w.png

+|   |   |   |-- setup-source-w.png

+|   |   |   |-- setup-swap-w.png

+|   |   |   |-- setup-target-w.png

+|   |   |   |-- setup-timezone-w.png

+|   |   |   `-- setup-xwmconfig-w.png

+|   |   |-- installation-partitioning.html

+|   |   |-- installation-requirements.html

+|   |   |-- installation-setup.html

+|   |   |-- installation.html

+|   |   |-- introduction-opensource.html

+|   |   |-- introduction-slackware.html

+|   |   |-- introduction.html

+|   |   |-- network-configuration-hardware.html

+|   |   |-- network-configuration-nfs.html

+|   |   |-- network-configuration-ppp.html

+|   |   |-- network-configuration-tcpip.html

+|   |   |-- network-configuration-wireless.html

+|   |   |-- network-configuration.html

+|   |   |-- package-management

+|   |   |   |-- pkgtool-view-w.png

+|   |   |   `-- pkgtool-w.png

+|   |   |-- package-management-making-packages.html

+|   |   |-- package-management-making-tags-and-tagfiles.html

+|   |   |-- package-management-package-utilities.html

+|   |   |-- package-management.html

+|   |   |-- process-control-foregrounding.html

+|   |   |-- process-control-kill.html

+|   |   |-- process-control-ps.html

+|   |   |-- process-control-top.html

+|   |   |-- process-control.html

+|   |   |-- security-current.html

+|   |   |-- security-host.html

+|   |   |-- security.html

+|   |   |-- shell-bash.html

+|   |   |-- shell-command-line.html

+|   |   |-- shell-vt.html

+|   |   |-- shell.html

+|   |   |-- slackware_logo.png

+|   |   |-- system-configuration

+|   |   |   `-- make-menuconfig-w.png

+|   |   |-- system-configuration-kernel.html

+|   |   |-- system-configuration.html

+|   |   |-- vi

+|   |   |   `-- vim-splitedit.png

+|   |   |-- vi-configuration.html

+|   |   |-- vi-keys.html

+|   |   |-- vi-modes.html

+|   |   |-- vi-opening-files.html

+|   |   |-- vi-quitting-vi.html

+|   |   |-- vi-saving-files.html

+|   |   |-- vi.html

+|   |   |-- x-window-system

+|   |   |   |-- xorgconfig1-w.png

+|   |   |   |-- xorgconfig2-w.png

+|   |   |   |-- xorgconfig3-w.png

+|   |   |   |-- xorgconfig4-w.png

+|   |   |   `-- xwmconfig-w.png

+|   |   |-- x-window-system-xdm.html

+|   |   |-- x-window-system-xinitrc.html

+|   |   |-- x-window-system-xorgsetup.html

+|   |   |-- x-window-system-xwmconfig.html

+|   |   |-- x-window-system.html

+|   |   |-- zipslack-booting.html

+|   |   |-- zipslack-getting.html

+|   |   `-- zipslack.html

+|   |-- slackbook-2.0.pdf

+|   `-- slackbook-2.0.ps

 |-- slackware64

 |   |-- CHECKSUMS.md5

 |   |-- CHECKSUMS.md5.asc

@@ -663,75 +705,78 @@ see additional documentation files.
 |   |-- MANIFEST.bz2

 |   |-- PACKAGES.TXT -> ../PACKAGES.TXT

 |   |-- a

-|   |   |-- aaa_base-13.1-x86_64-2.txt

-|   |   |-- aaa_base-13.1-x86_64-2.txz

-|   |   |-- aaa_base-13.1-x86_64-2.txz.asc

-|   |   |-- aaa_elflibs-13.1-x86_64-1.txt

-|   |   |-- aaa_elflibs-13.1-x86_64-1.txz

-|   |   |-- aaa_elflibs-13.1-x86_64-1.txz.asc

-|   |   |-- aaa_terminfo-5.7-noarch-1.txt

-|   |   |-- aaa_terminfo-5.7-noarch-1.txz

-|   |   |-- aaa_terminfo-5.7-noarch-1.txz.asc

-|   |   |-- acl-2.2.47_1-x86_64-1.txt

-|   |   |-- acl-2.2.47_1-x86_64-1.txz

-|   |   |-- acl-2.2.47_1-x86_64-1.txz.asc

-|   |   |-- acpid-2.0.5-x86_64-1.txt

-|   |   |-- acpid-2.0.5-x86_64-1.txz

-|   |   |-- acpid-2.0.5-x86_64-1.txz.asc

-|   |   |-- apmd-3.2.2-x86_64-2.txt

-|   |   |-- apmd-3.2.2-x86_64-2.txz

-|   |   |-- apmd-3.2.2-x86_64-2.txz.asc

-|   |   |-- attr-2.4.43_1-x86_64-1.txt

-|   |   |-- attr-2.4.43_1-x86_64-1.txz

-|   |   |-- attr-2.4.43_1-x86_64-1.txz.asc

-|   |   |-- bash-4.1.007-x86_64-1.txt

-|   |   |-- bash-4.1.007-x86_64-1.txz

-|   |   |-- bash-4.1.007-x86_64-1.txz.asc

+|   |   |-- aaa_base-13.37-x86_64-3.txt

+|   |   |-- aaa_base-13.37-x86_64-3.txz

+|   |   |-- aaa_base-13.37-x86_64-3.txz.asc

+|   |   |-- aaa_elflibs-13.37-x86_64-7.txt

+|   |   |-- aaa_elflibs-13.37-x86_64-7.txz

+|   |   |-- aaa_elflibs-13.37-x86_64-7.txz.asc

+|   |   |-- aaa_terminfo-5.8-x86_64-1.txt

+|   |   |-- aaa_terminfo-5.8-x86_64-1.txz

+|   |   |-- aaa_terminfo-5.8-x86_64-1.txz.asc

+|   |   |-- acl-2.2.50-x86_64-1.txt

+|   |   |-- acl-2.2.50-x86_64-1.txz

+|   |   |-- acl-2.2.50-x86_64-1.txz.asc

+|   |   |-- acpid-2.0.9-x86_64-1.txt

+|   |   |-- acpid-2.0.9-x86_64-1.txz

+|   |   |-- acpid-2.0.9-x86_64-1.txz.asc

+|   |   |-- apmd-3.2.2-x86_64-3.txt

+|   |   |-- apmd-3.2.2-x86_64-3.txz

+|   |   |-- apmd-3.2.2-x86_64-3.txz.asc

+|   |   |-- attr-2.4.45-x86_64-1.txt

+|   |   |-- attr-2.4.45-x86_64-1.txz

+|   |   |-- attr-2.4.45-x86_64-1.txz.asc

+|   |   |-- bash-4.1.010-x86_64-1.txt

+|   |   |-- bash-4.1.010-x86_64-1.txz

+|   |   |-- bash-4.1.010-x86_64-1.txz.asc

 |   |   |-- bin-11.1-x86_64-1.txt

 |   |   |-- bin-11.1-x86_64-1.txz

 |   |   |-- bin-11.1-x86_64-1.txz.asc

-|   |   |-- bzip2-1.0.5-x86_64-1.txt

-|   |   |-- bzip2-1.0.5-x86_64-1.txz

-|   |   |-- bzip2-1.0.5-x86_64-1.txz.asc

-|   |   |-- coreutils-8.5-x86_64-3.txt

-|   |   |-- coreutils-8.5-x86_64-3.txz

-|   |   |-- coreutils-8.5-x86_64-3.txz.asc

-|   |   |-- cpio-2.9-x86_64-2.txt

-|   |   |-- cpio-2.9-x86_64-2.txz

-|   |   |-- cpio-2.9-x86_64-2.txz.asc

-|   |   |-- cpufrequtils-007-x86_64-1.txt

-|   |   |-- cpufrequtils-007-x86_64-1.txz

-|   |   |-- cpufrequtils-007-x86_64-1.txz.asc

-|   |   |-- cryptsetup-1.1.0-x86_64-2.txt

-|   |   |-- cryptsetup-1.1.0-x86_64-2.txz

-|   |   |-- cryptsetup-1.1.0-x86_64-2.txz.asc

-|   |   |-- cups-1.4.3-x86_64-3.txt

-|   |   |-- cups-1.4.3-x86_64-3.txz

-|   |   |-- cups-1.4.3-x86_64-3.txz.asc

-|   |   |-- cxxlibs-6.0.13-x86_64-2.txt

-|   |   |-- cxxlibs-6.0.13-x86_64-2.txz

-|   |   |-- cxxlibs-6.0.13-x86_64-2.txz.asc

-|   |   |-- dbus-1.2.24-x86_64-2.txt

-|   |   |-- dbus-1.2.24-x86_64-2.txz

-|   |   |-- dbus-1.2.24-x86_64-2.txz.asc

+|   |   |-- btrfs-progs-20110327-x86_64-1.txt

+|   |   |-- btrfs-progs-20110327-x86_64-1.txz

+|   |   |-- btrfs-progs-20110327-x86_64-1.txz.asc

+|   |   |-- bzip2-1.0.6-x86_64-1.txt

+|   |   |-- bzip2-1.0.6-x86_64-1.txz

+|   |   |-- bzip2-1.0.6-x86_64-1.txz.asc

+|   |   |-- coreutils-8.11-x86_64-1.txt

+|   |   |-- coreutils-8.11-x86_64-1.txz

+|   |   |-- coreutils-8.11-x86_64-1.txz.asc

+|   |   |-- cpio-2.11-x86_64-1.txt

+|   |   |-- cpio-2.11-x86_64-1.txz

+|   |   |-- cpio-2.11-x86_64-1.txz.asc

+|   |   |-- cpufrequtils-008-x86_64-1.txt

+|   |   |-- cpufrequtils-008-x86_64-1.txz

+|   |   |-- cpufrequtils-008-x86_64-1.txz.asc

+|   |   |-- cryptsetup-1.2.0-x86_64-1.txt

+|   |   |-- cryptsetup-1.2.0-x86_64-1.txz

+|   |   |-- cryptsetup-1.2.0-x86_64-1.txz.asc

+|   |   |-- cups-1.4.6-x86_64-1.txt

+|   |   |-- cups-1.4.6-x86_64-1.txz

+|   |   |-- cups-1.4.6-x86_64-1.txz.asc

+|   |   |-- cxxlibs-6.0.14-x86_64-1.txt

+|   |   |-- cxxlibs-6.0.14-x86_64-1.txz

+|   |   |-- cxxlibs-6.0.14-x86_64-1.txz.asc

+|   |   |-- dbus-1.4.1-x86_64-1.txt

+|   |   |-- dbus-1.4.1-x86_64-1.txz

+|   |   |-- dbus-1.4.1-x86_64-1.txz.asc

 |   |   |-- dcron-4.4-x86_64-1.txt

 |   |   |-- dcron-4.4-x86_64-1.txz

 |   |   |-- dcron-4.4-x86_64-1.txz.asc

 |   |   |-- devs-2.3.1-noarch-25.txt

 |   |   |-- devs-2.3.1-noarch-25.txz

 |   |   |-- devs-2.3.1-noarch-25.txz.asc

-|   |   |-- dialog-1.1_20080819-x86_64-3.txt

-|   |   |-- dialog-1.1_20080819-x86_64-3.txz

-|   |   |-- dialog-1.1_20080819-x86_64-3.txz.asc

-|   |   |-- dosfstools-2.11-x86_64-1.txt

-|   |   |-- dosfstools-2.11-x86_64-1.txz

-|   |   |-- dosfstools-2.11-x86_64-1.txz.asc

-|   |   |-- e2fsprogs-1.41.11-x86_64-1.txt

-|   |   |-- e2fsprogs-1.41.11-x86_64-1.txz

-|   |   |-- e2fsprogs-1.41.11-x86_64-1.txz.asc

-|   |   |-- ed-1.3-x86_64-1.txt

-|   |   |-- ed-1.3-x86_64-1.txz

-|   |   |-- ed-1.3-x86_64-1.txz.asc

+|   |   |-- dialog-1.1_20100428-x86_64-2.txt

+|   |   |-- dialog-1.1_20100428-x86_64-2.txz

+|   |   |-- dialog-1.1_20100428-x86_64-2.txz.asc

+|   |   |-- dosfstools-3.0.11-x86_64-2.txt

+|   |   |-- dosfstools-3.0.11-x86_64-2.txz

+|   |   |-- dosfstools-3.0.11-x86_64-2.txz.asc

+|   |   |-- e2fsprogs-1.41.14-x86_64-1.txt

+|   |   |-- e2fsprogs-1.41.14-x86_64-1.txz

+|   |   |-- e2fsprogs-1.41.14-x86_64-1.txz.asc

+|   |   |-- ed-1.4-x86_64-1.txt

+|   |   |-- ed-1.4-x86_64-1.txz

+|   |   |-- ed-1.4-x86_64-1.txz.asc

 |   |   |-- eject-2.1.5-x86_64-2.txt

 |   |   |-- eject-2.1.5-x86_64-2.txz

 |   |   |-- eject-2.1.5-x86_64-2.txz.asc

@@ -741,9 +786,9 @@ see additional documentation files.
 |   |   |-- etc-13.013-x86_64-1.txt

 |   |   |-- etc-13.013-x86_64-1.txz

 |   |   |-- etc-13.013-x86_64-1.txz.asc

-|   |   |-- file-5.04-x86_64-1.txt

-|   |   |-- file-5.04-x86_64-1.txz

-|   |   |-- file-5.04-x86_64-1.txz.asc

+|   |   |-- file-5.05-x86_64-1.txt

+|   |   |-- file-5.05-x86_64-1.txz

+|   |   |-- file-5.05-x86_64-1.txz.asc

 |   |   |-- findutils-4.4.2-x86_64-1.txt

 |   |   |-- findutils-4.4.2-x86_64-1.txz

 |   |   |-- findutils-4.4.2-x86_64-1.txz.asc

@@ -753,33 +798,36 @@ see additional documentation files.
 |   |   |-- gawk-3.1.8-x86_64-1.txt

 |   |   |-- gawk-3.1.8-x86_64-1.txz

 |   |   |-- gawk-3.1.8-x86_64-1.txz.asc

+|   |   |-- gdisk-0.6.14-x86_64-1.txt

+|   |   |-- gdisk-0.6.14-x86_64-1.txz

+|   |   |-- gdisk-0.6.14-x86_64-1.txz.asc

 |   |   |-- genpower-1.0.5-x86_64-2.txt

 |   |   |-- genpower-1.0.5-x86_64-2.txz

 |   |   |-- genpower-1.0.5-x86_64-2.txz.asc

-|   |   |-- gettext-0.17-x86_64-3.txt

-|   |   |-- gettext-0.17-x86_64-3.txz

-|   |   |-- gettext-0.17-x86_64-3.txz.asc

+|   |   |-- gettext-0.18.1.1-x86_64-1.txt

+|   |   |-- gettext-0.18.1.1-x86_64-1.txz

+|   |   |-- gettext-0.18.1.1-x86_64-1.txz.asc

 |   |   |-- getty-ps-2.1.0b-x86_64-1.txt

 |   |   |-- getty-ps-2.1.0b-x86_64-1.txz

 |   |   |-- getty-ps-2.1.0b-x86_64-1.txz.asc

-|   |   |-- glibc-solibs-2.11.1-x86_64-3.txt

-|   |   |-- glibc-solibs-2.11.1-x86_64-3.txz

-|   |   |-- glibc-solibs-2.11.1-x86_64-3.txz.asc

-|   |   |-- glibc-zoneinfo-2.11.1-noarch-3.txt

-|   |   |-- glibc-zoneinfo-2.11.1-noarch-3.txz

-|   |   |-- glibc-zoneinfo-2.11.1-noarch-3.txz.asc

+|   |   |-- glibc-solibs-2.13-x86_64-4.txt

+|   |   |-- glibc-solibs-2.13-x86_64-4.txz

+|   |   |-- glibc-solibs-2.13-x86_64-4.txz.asc

+|   |   |-- glibc-zoneinfo-2.13-noarch-4.txt

+|   |   |-- glibc-zoneinfo-2.13-noarch-4.txz

+|   |   |-- glibc-zoneinfo-2.13-noarch-4.txz.asc

 |   |   |-- gpm-1.20.1-x86_64-5.txt

 |   |   |-- gpm-1.20.1-x86_64-5.txz

 |   |   |-- gpm-1.20.1-x86_64-5.txz.asc

-|   |   |-- grep-2.5.4-x86_64-1.txt

-|   |   |-- grep-2.5.4-x86_64-1.txz

-|   |   |-- grep-2.5.4-x86_64-1.txz.asc

+|   |   |-- grep-2.7-x86_64-1.txt

+|   |   |-- grep-2.7-x86_64-1.txz

+|   |   |-- grep-2.7-x86_64-1.txz.asc

 |   |   |-- gzip-1.4-x86_64-1.tgz

 |   |   |-- gzip-1.4-x86_64-1.tgz.asc

 |   |   |-- gzip-1.4-x86_64-1.txt

-|   |   |-- hdparm-9.27-x86_64-1.txt

-|   |   |-- hdparm-9.27-x86_64-1.txz

-|   |   |-- hdparm-9.27-x86_64-1.txz.asc

+|   |   |-- hdparm-9.37-x86_64-1.txt

+|   |   |-- hdparm-9.37-x86_64-1.txz

+|   |   |-- hdparm-9.37-x86_64-1.txz.asc

 |   |   |-- infozip-6.0-x86_64-1.txt

 |   |   |-- infozip-6.0-x86_64-1.txz

 |   |   |-- infozip-6.0-x86_64-1.txz.asc

@@ -788,119 +836,128 @@ see additional documentation files.
 |   |   |-- inotify-tools-3.14-x86_64-1.txz.asc

 |   |   |-- install-packages

 |   |   |-- install.end

-|   |   |-- jfsutils-1.1.14-x86_64-1.txt

-|   |   |-- jfsutils-1.1.14-x86_64-1.txz

-|   |   |-- jfsutils-1.1.14-x86_64-1.txz.asc

+|   |   |-- jfsutils-1.1.15-x86_64-1.txt

+|   |   |-- jfsutils-1.1.15-x86_64-1.txz

+|   |   |-- jfsutils-1.1.15-x86_64-1.txz.asc

 |   |   |-- kbd-1.15.2-x86_64-1.txt

 |   |   |-- kbd-1.15.2-x86_64-1.txz

 |   |   |-- kbd-1.15.2-x86_64-1.txz.asc

-|   |   |-- kernel-firmware-2.6.33.4-noarch-1.txt

-|   |   |-- kernel-firmware-2.6.33.4-noarch-1.txz

-|   |   |-- kernel-firmware-2.6.33.4-noarch-1.txz.asc

-|   |   |-- kernel-generic-2.6.33.4-x86_64-1.txt

-|   |   |-- kernel-generic-2.6.33.4-x86_64-1.txz

-|   |   |-- kernel-generic-2.6.33.4-x86_64-1.txz.asc

-|   |   |-- kernel-huge-2.6.33.4-x86_64-1.txt

-|   |   |-- kernel-huge-2.6.33.4-x86_64-1.txz

-|   |   |-- kernel-huge-2.6.33.4-x86_64-1.txz.asc

-|   |   |-- kernel-modules-2.6.33.4-x86_64-1.txt

-|   |   |-- kernel-modules-2.6.33.4-x86_64-1.txz

-|   |   |-- kernel-modules-2.6.33.4-x86_64-1.txz.asc

-|   |   |-- less-436-x86_64-1.txt

-|   |   |-- less-436-x86_64-1.txz

-|   |   |-- less-436-x86_64-1.txz.asc

+|   |   |-- kernel-firmware-2.6.37.6-noarch-2.txt

+|   |   |-- kernel-firmware-2.6.37.6-noarch-2.txz

+|   |   |-- kernel-firmware-2.6.37.6-noarch-2.txz.asc

+|   |   |-- kernel-generic-2.6.37.6-x86_64-2.txt

+|   |   |-- kernel-generic-2.6.37.6-x86_64-2.txz

+|   |   |-- kernel-generic-2.6.37.6-x86_64-2.txz.asc

+|   |   |-- kernel-huge-2.6.37.6-x86_64-2.txt

+|   |   |-- kernel-huge-2.6.37.6-x86_64-2.txz

+|   |   |-- kernel-huge-2.6.37.6-x86_64-2.txz.asc

+|   |   |-- kernel-modules-2.6.37.6-x86_64-2.txt

+|   |   |-- kernel-modules-2.6.37.6-x86_64-2.txz

+|   |   |-- kernel-modules-2.6.37.6-x86_64-2.txz.asc

+|   |   |-- less-443-x86_64-1.txt

+|   |   |-- less-443-x86_64-1.txz

+|   |   |-- less-443-x86_64-1.txz.asc

 |   |   |-- lha-114i-x86_64-1.txt

 |   |   |-- lha-114i-x86_64-1.txz

 |   |   |-- lha-114i-x86_64-1.txz.asc

-|   |   |-- lilo-22.8-x86_64-15.txt

-|   |   |-- lilo-22.8-x86_64-15.txz

-|   |   |-- lilo-22.8-x86_64-15.txz.asc

+|   |   |-- libcgroup-0.37.1-x86_64-1.txt

+|   |   |-- libcgroup-0.37.1-x86_64-1.txz

+|   |   |-- libcgroup-0.37.1-x86_64-1.txz.asc

+|   |   |-- lilo-22.8-x86_64-16.txt

+|   |   |-- lilo-22.8-x86_64-16.txz

+|   |   |-- lilo-22.8-x86_64-16.txz.asc

 |   |   |-- logrotate-3.7.8-x86_64-1.txt

 |   |   |-- logrotate-3.7.8-x86_64-1.txz

 |   |   |-- logrotate-3.7.8-x86_64-1.txz.asc

-|   |   |-- lvm2-2.02.64-x86_64-1.txt

-|   |   |-- lvm2-2.02.64-x86_64-1.txz

-|   |   |-- lvm2-2.02.64-x86_64-1.txz.asc

+|   |   |-- lrzip-0.602-x86_64-1.txt

+|   |   |-- lrzip-0.602-x86_64-1.txz

+|   |   |-- lrzip-0.602-x86_64-1.txz.asc

+|   |   |-- lvm2-2.02.84-x86_64-1.txt

+|   |   |-- lvm2-2.02.84-x86_64-1.txz

+|   |   |-- lvm2-2.02.84-x86_64-1.txz.asc

 |   |   |-- maketag

 |   |   |-- maketag.ez

-|   |   |-- mdadm-2.6.9-x86_64-1.txt

-|   |   |-- mdadm-2.6.9-x86_64-1.txz

-|   |   |-- mdadm-2.6.9-x86_64-1.txz.asc

-|   |   |-- minicom-2.1-x86_64-4.txt

-|   |   |-- minicom-2.1-x86_64-4.txz

-|   |   |-- minicom-2.1-x86_64-4.txz.asc

-|   |   |-- mkinitrd-1.4.5-x86_64-2.txt

-|   |   |-- mkinitrd-1.4.5-x86_64-2.txz

-|   |   |-- mkinitrd-1.4.5-x86_64-2.txz.asc

-|   |   |-- module-init-tools-3.11.1-x86_64-1.txt

-|   |   |-- module-init-tools-3.11.1-x86_64-1.txz

-|   |   |-- module-init-tools-3.11.1-x86_64-1.txz.asc

+|   |   |-- mcelog-1.0pre3-x86_64-1.txt

+|   |   |-- mcelog-1.0pre3-x86_64-1.txz

+|   |   |-- mcelog-1.0pre3-x86_64-1.txz.asc

+|   |   |-- mdadm-3.1.5-x86_64-1.txt

+|   |   |-- mdadm-3.1.5-x86_64-1.txz

+|   |   |-- mdadm-3.1.5-x86_64-1.txz.asc

+|   |   |-- minicom-2.5-x86_64-1.txt

+|   |   |-- minicom-2.5-x86_64-1.txz

+|   |   |-- minicom-2.5-x86_64-1.txz.asc

+|   |   |-- mkinitrd-1.4.6-x86_64-11.txt

+|   |   |-- mkinitrd-1.4.6-x86_64-11.txz

+|   |   |-- mkinitrd-1.4.6-x86_64-11.txz.asc

+|   |   |-- module-init-tools-3.12-x86_64-2.txt

+|   |   |-- module-init-tools-3.12-x86_64-2.txz

+|   |   |-- module-init-tools-3.12-x86_64-2.txz.asc

 |   |   |-- mt-st-0.9b-x86_64-2.txt

 |   |   |-- mt-st-0.9b-x86_64-2.txz

 |   |   |-- mt-st-0.9b-x86_64-2.txz.asc

-|   |   |-- mtx-1.3.9-x86_64-2.txt

-|   |   |-- mtx-1.3.9-x86_64-2.txz

-|   |   |-- mtx-1.3.9-x86_64-2.txz.asc

-|   |   |-- ncompress-4.2.4-x86_64-1.txt

-|   |   |-- ncompress-4.2.4-x86_64-1.txz

-|   |   |-- ncompress-4.2.4-x86_64-1.txz.asc

-|   |   |-- ntfs-3g-2010.3.6-x86_64-1.txt

-|   |   |-- ntfs-3g-2010.3.6-x86_64-1.txz

-|   |   |-- ntfs-3g-2010.3.6-x86_64-1.txz.asc

-|   |   |-- openssl-solibs-0.9.8n-x86_64-1.txt

-|   |   |-- openssl-solibs-0.9.8n-x86_64-1.txz

-|   |   |-- openssl-solibs-0.9.8n-x86_64-1.txz.asc

-|   |   |-- patch-2.5.4-x86_64-1.txt

-|   |   |-- patch-2.5.4-x86_64-1.txz

-|   |   |-- patch-2.5.4-x86_64-1.txz.asc

-|   |   |-- pciutils-3.1.5-x86_64-1.txt

-|   |   |-- pciutils-3.1.5-x86_64-1.txz

-|   |   |-- pciutils-3.1.5-x86_64-1.txz.asc

-|   |   |-- pcmciautils-015-x86_64-2.txt

-|   |   |-- pcmciautils-015-x86_64-2.txz

-|   |   |-- pcmciautils-015-x86_64-2.txz.asc

-|   |   |-- pkgtools-13.1-noarch-1.tgz

-|   |   |-- pkgtools-13.1-noarch-1.tgz.asc

-|   |   |-- pkgtools-13.1-noarch-1.txt

-|   |   |-- procps-3.2.7-x86_64-3.txt

-|   |   |-- procps-3.2.7-x86_64-3.txz

-|   |   |-- procps-3.2.7-x86_64-3.txz.asc

+|   |   |-- mtx-1.3.12-x86_64-1.txt

+|   |   |-- mtx-1.3.12-x86_64-1.txz

+|   |   |-- mtx-1.3.12-x86_64-1.txz.asc

+|   |   |-- ncompress-4.2.4.3-x86_64-1.txt

+|   |   |-- ncompress-4.2.4.3-x86_64-1.txz

+|   |   |-- ncompress-4.2.4.3-x86_64-1.txz.asc

+|   |   |-- ntfs-3g-2011.1.15-x86_64-1.txt

+|   |   |-- ntfs-3g-2011.1.15-x86_64-1.txz

+|   |   |-- ntfs-3g-2011.1.15-x86_64-1.txz.asc

+|   |   |-- openssl-solibs-0.9.8r-x86_64-3.txt

+|   |   |-- openssl-solibs-0.9.8r-x86_64-3.txz

+|   |   |-- openssl-solibs-0.9.8r-x86_64-3.txz.asc

+|   |   |-- patch-2.6.1-x86_64-1.txt

+|   |   |-- patch-2.6.1-x86_64-1.txz

+|   |   |-- patch-2.6.1-x86_64-1.txz.asc

+|   |   |-- pciutils-3.1.7-x86_64-1.txt

+|   |   |-- pciutils-3.1.7-x86_64-1.txz

+|   |   |-- pciutils-3.1.7-x86_64-1.txz.asc

+|   |   |-- pcmciautils-017-x86_64-1.txt

+|   |   |-- pcmciautils-017-x86_64-1.txz

+|   |   |-- pcmciautils-017-x86_64-1.txz.asc

+|   |   |-- pkgtools-13.37-noarch-9.tgz

+|   |   |-- pkgtools-13.37-noarch-9.tgz.asc

+|   |   |-- pkgtools-13.37-noarch-9.txt

+|   |   |-- procps-3.2.8-x86_64-3.txt

+|   |   |-- procps-3.2.8-x86_64-3.txz

+|   |   |-- procps-3.2.8-x86_64-3.txz.asc

 |   |   |-- quota-3.17-x86_64-1.txt

 |   |   |-- quota-3.17-x86_64-1.txz

 |   |   |-- quota-3.17-x86_64-1.txz.asc

 |   |   |-- reiserfsprogs-3.6.21-x86_64-1.txt

 |   |   |-- reiserfsprogs-3.6.21-x86_64-1.txz

 |   |   |-- reiserfsprogs-3.6.21-x86_64-1.txz.asc

-|   |   |-- rpm2tgz-1.2.1-x86_64-1.txt

-|   |   |-- rpm2tgz-1.2.1-x86_64-1.txz

-|   |   |-- rpm2tgz-1.2.1-x86_64-1.txz.asc

-|   |   |-- sdparm-1.04-x86_64-1.txt

-|   |   |-- sdparm-1.04-x86_64-1.txz

-|   |   |-- sdparm-1.04-x86_64-1.txz.asc

+|   |   |-- rpm2tgz-1.2.2-x86_64-1.txt

+|   |   |-- rpm2tgz-1.2.2-x86_64-1.txz

+|   |   |-- rpm2tgz-1.2.2-x86_64-1.txz.asc

+|   |   |-- sdparm-1.06-x86_64-1.txt

+|   |   |-- sdparm-1.06-x86_64-1.txz

+|   |   |-- sdparm-1.06-x86_64-1.txz.asc

 |   |   |-- sed-4.2.1-x86_64-1.txt

 |   |   |-- sed-4.2.1-x86_64-1.txz

 |   |   |-- sed-4.2.1-x86_64-1.txz.asc

-|   |   |-- shadow-4.1.4.2-x86_64-3.txt

-|   |   |-- shadow-4.1.4.2-x86_64-3.txz

-|   |   |-- shadow-4.1.4.2-x86_64-3.txz.asc

-|   |   |-- sharutils-4.7-x86_64-1.txt

-|   |   |-- sharutils-4.7-x86_64-1.txz

-|   |   |-- sharutils-4.7-x86_64-1.txz.asc

+|   |   |-- shadow-4.1.4.3-x86_64-2.txt

+|   |   |-- shadow-4.1.4.3-x86_64-2.txz

+|   |   |-- shadow-4.1.4.3-x86_64-2.txz.asc

+|   |   |-- sharutils-4.11-x86_64-1.txt

+|   |   |-- sharutils-4.11-x86_64-1.txz

+|   |   |-- sharutils-4.11-x86_64-1.txz.asc

 |   |   |-- slocate-3.1-x86_64-3.txt

 |   |   |-- slocate-3.1-x86_64-3.txz

 |   |   |-- slocate-3.1-x86_64-3.txz.asc

-|   |   |-- smartmontools-5.39.1-x86_64-1.txt

-|   |   |-- smartmontools-5.39.1-x86_64-1.txz

-|   |   |-- smartmontools-5.39.1-x86_64-1.txz.asc

+|   |   |-- smartmontools-5.40-x86_64-1.txt

+|   |   |-- smartmontools-5.40-x86_64-1.txz

+|   |   |-- smartmontools-5.40-x86_64-1.txz.asc

 |   |   |-- splitvt-1.6.5-x86_64-1.txt

 |   |   |-- splitvt-1.6.5-x86_64-1.txz

 |   |   |-- splitvt-1.6.5-x86_64-1.txz.asc

 |   |   |-- sysfsutils-2.1.0-x86_64-1.txt

 |   |   |-- sysfsutils-2.1.0-x86_64-1.txz

 |   |   |-- sysfsutils-2.1.0-x86_64-1.txz.asc

-|   |   |-- sysklogd-1.4.1-x86_64-10.txt

-|   |   |-- sysklogd-1.4.1-x86_64-10.txz

-|   |   |-- sysklogd-1.4.1-x86_64-10.txz.asc

+|   |   |-- sysklogd-1.5-x86_64-1.txt

+|   |   |-- sysklogd-1.5-x86_64-1.txz

+|   |   |-- sysklogd-1.5-x86_64-1.txz.asc

 |   |   |-- syslinux-3.84-x86_64-2.txt

 |   |   |-- syslinux-3.84-x86_64-2.txz

 |   |   |-- syslinux-3.84-x86_64-2.txz.asc

@@ -910,74 +967,74 @@ see additional documentation files.
 |   |   |-- sysvinit-functions-8.53-x86_64-2.txt

 |   |   |-- sysvinit-functions-8.53-x86_64-2.txz

 |   |   |-- sysvinit-functions-8.53-x86_64-2.txz.asc

-|   |   |-- sysvinit-scripts-1.2-noarch-32.txt

-|   |   |-- sysvinit-scripts-1.2-noarch-32.txz

-|   |   |-- sysvinit-scripts-1.2-noarch-32.txz.asc

+|   |   |-- sysvinit-scripts-1.2-noarch-43.txt

+|   |   |-- sysvinit-scripts-1.2-noarch-43.txz

+|   |   |-- sysvinit-scripts-1.2-noarch-43.txz.asc

 |   |   |-- tagfile

-|   |   |-- tar-1.23-x86_64-1.tgz

-|   |   |-- tar-1.23-x86_64-1.tgz.asc

-|   |   |-- tar-1.23-x86_64-1.txt

-|   |   |-- tcsh-6.15.00-x86_64-1.txt

-|   |   |-- tcsh-6.15.00-x86_64-1.txz

-|   |   |-- tcsh-6.15.00-x86_64-1.txz.asc

+|   |   |-- tar-1.26-x86_64-1.tgz

+|   |   |-- tar-1.26-x86_64-1.tgz.asc

+|   |   |-- tar-1.26-x86_64-1.txt

+|   |   |-- tcsh-6.17.00-x86_64-1.txt

+|   |   |-- tcsh-6.17.00-x86_64-1.txz

+|   |   |-- tcsh-6.17.00-x86_64-1.txz.asc

 |   |   |-- time-1.7-x86_64-1.txt

 |   |   |-- time-1.7-x86_64-1.txz

 |   |   |-- time-1.7-x86_64-1.txz.asc

-|   |   |-- tree-1.5.2.2-x86_64-1.txt

-|   |   |-- tree-1.5.2.2-x86_64-1.txz

-|   |   |-- tree-1.5.2.2-x86_64-1.txz.asc

-|   |   |-- udev-153-x86_64-1.txt

-|   |   |-- udev-153-x86_64-1.txz

-|   |   |-- udev-153-x86_64-1.txz.asc

+|   |   |-- tree-1.5.3-x86_64-1.txt

+|   |   |-- tree-1.5.3-x86_64-1.txz

+|   |   |-- tree-1.5.3-x86_64-1.txz.asc

+|   |   |-- udev-165-x86_64-2.txt

+|   |   |-- udev-165-x86_64-2.txz

+|   |   |-- udev-165-x86_64-2.txz.asc

 |   |   |-- unarj-265-x86_64-1.txt

 |   |   |-- unarj-265-x86_64-1.txz

 |   |   |-- unarj-265-x86_64-1.txz.asc

-|   |   |-- usb_modeswitch-1.1.2-x86_64-1.txt

-|   |   |-- usb_modeswitch-1.1.2-x86_64-1.txz

-|   |   |-- usb_modeswitch-1.1.2-x86_64-1.txz.asc

-|   |   |-- usbutils-0.87-x86_64-1.txt

-|   |   |-- usbutils-0.87-x86_64-1.txz

-|   |   |-- usbutils-0.87-x86_64-1.txz.asc

-|   |   |-- utempter-1.1.4-x86_64-1.txt

-|   |   |-- utempter-1.1.4-x86_64-1.txz

-|   |   |-- utempter-1.1.4-x86_64-1.txz.asc

-|   |   |-- util-linux-ng-2.17.2-x86_64-1.txt

-|   |   |-- util-linux-ng-2.17.2-x86_64-1.txz

-|   |   |-- util-linux-ng-2.17.2-x86_64-1.txz.asc

+|   |   |-- usb_modeswitch-1.1.6-x86_64-1.txt

+|   |   |-- usb_modeswitch-1.1.6-x86_64-1.txz

+|   |   |-- usb_modeswitch-1.1.6-x86_64-1.txz.asc

+|   |   |-- usbutils-002-x86_64-1.txt

+|   |   |-- usbutils-002-x86_64-1.txz

+|   |   |-- usbutils-002-x86_64-1.txz.asc

+|   |   |-- utempter-1.1.5-x86_64-1.txt

+|   |   |-- utempter-1.1.5-x86_64-1.txz

+|   |   |-- utempter-1.1.5-x86_64-1.txz.asc

+|   |   |-- util-linux-2.19-x86_64-1.txt

+|   |   |-- util-linux-2.19-x86_64-1.txz

+|   |   |-- util-linux-2.19-x86_64-1.txz.asc

 |   |   |-- which-2.20-x86_64-1.txt

 |   |   |-- which-2.20-x86_64-1.txz

 |   |   |-- which-2.20-x86_64-1.txz.asc

-|   |   |-- xfsprogs-3.1.1-x86_64-1.txt

-|   |   |-- xfsprogs-3.1.1-x86_64-1.txz

-|   |   |-- xfsprogs-3.1.1-x86_64-1.txz.asc

-|   |   |-- xz-4.999.9beta-x86_64-1.tgz

-|   |   |-- xz-4.999.9beta-x86_64-1.tgz.asc

-|   |   |-- xz-4.999.9beta-x86_64-1.txt

-|   |   |-- zoo-2.10-x86_64-1.txt

-|   |   |-- zoo-2.10-x86_64-1.txz

-|   |   `-- zoo-2.10-x86_64-1.txz.asc

+|   |   |-- xfsprogs-3.1.4-x86_64-1.txt

+|   |   |-- xfsprogs-3.1.4-x86_64-1.txz

+|   |   |-- xfsprogs-3.1.4-x86_64-1.txz.asc

+|   |   |-- xz-5.0.2-x86_64-1.tgz

+|   |   |-- xz-5.0.2-x86_64-1.tgz.asc

+|   |   |-- xz-5.0.2-x86_64-1.txt

+|   |   |-- zoo-2.10_22-x86_64-1.txt

+|   |   |-- zoo-2.10_22-x86_64-1.txz

+|   |   `-- zoo-2.10_22-x86_64-1.txz.asc

 |   |-- ap

-|   |   |-- a2ps-4.14-x86_64-4.txt

-|   |   |-- a2ps-4.14-x86_64-4.txz

-|   |   |-- a2ps-4.14-x86_64-4.txz.asc

-|   |   |-- acct-6.4pre1-x86_64-1.txt

-|   |   |-- acct-6.4pre1-x86_64-1.txz

-|   |   |-- acct-6.4pre1-x86_64-1.txz.asc

-|   |   |-- alsa-utils-1.0.23-x86_64-1.txt

-|   |   |-- alsa-utils-1.0.23-x86_64-1.txz

-|   |   |-- alsa-utils-1.0.23-x86_64-1.txz.asc

+|   |   |-- a2ps-4.14-x86_64-5.txt

+|   |   |-- a2ps-4.14-x86_64-5.txz

+|   |   |-- a2ps-4.14-x86_64-5.txz.asc

+|   |   |-- acct-6.5.4-x86_64-1.txt

+|   |   |-- acct-6.5.4-x86_64-1.txz

+|   |   |-- acct-6.5.4-x86_64-1.txz.asc

+|   |   |-- alsa-utils-1.0.24.2-x86_64-1.txt

+|   |   |-- alsa-utils-1.0.24.2-x86_64-1.txz

+|   |   |-- alsa-utils-1.0.24.2-x86_64-1.txz.asc

 |   |   |-- amp-0.7.6-x86_64-1.txt

 |   |   |-- amp-0.7.6-x86_64-1.txz

 |   |   |-- amp-0.7.6-x86_64-1.txz.asc

 |   |   |-- ash-0.4.0-x86_64-2.txt

 |   |   |-- ash-0.4.0-x86_64-2.txz

 |   |   |-- ash-0.4.0-x86_64-2.txz.asc

-|   |   |-- at-3.1.10-x86_64-1.txt

-|   |   |-- at-3.1.10-x86_64-1.txz

-|   |   |-- at-3.1.10-x86_64-1.txz.asc

-|   |   |-- aumix-2.8-x86_64-2.txt

-|   |   |-- aumix-2.8-x86_64-2.txz

-|   |   |-- aumix-2.8-x86_64-2.txz.asc

+|   |   |-- at-3.1.12-x86_64-1.txt

+|   |   |-- at-3.1.12-x86_64-1.txz

+|   |   |-- at-3.1.12-x86_64-1.txz.asc

+|   |   |-- aumix-2.9.1-x86_64-1.txt

+|   |   |-- aumix-2.9.1-x86_64-1.txz

+|   |   |-- aumix-2.9.1-x86_64-1.txz.asc

 |   |   |-- bc-1.06.95-x86_64-2.txt

 |   |   |-- bc-1.06.95-x86_64-2.txz

 |   |   |-- bc-1.06.95-x86_64-2.txz.asc

@@ -987,57 +1044,60 @@ see additional documentation files.
 |   |   |-- cdparanoia-III_10.2-x86_64-1.txt

 |   |   |-- cdparanoia-III_10.2-x86_64-1.txz

 |   |   |-- cdparanoia-III_10.2-x86_64-1.txz.asc

-|   |   |-- cdrdao-1.2.1-x86_64-1.txt

-|   |   |-- cdrdao-1.2.1-x86_64-1.txz

-|   |   |-- cdrdao-1.2.1-x86_64-1.txz.asc

-|   |   |-- cdrtools-2.01.01a78-x86_64-1.txt

-|   |   |-- cdrtools-2.01.01a78-x86_64-1.txz

-|   |   |-- cdrtools-2.01.01a78-x86_64-1.txz.asc

+|   |   |-- cdrdao-1.2.3-x86_64-1.txt

+|   |   |-- cdrdao-1.2.3-x86_64-1.txz

+|   |   |-- cdrdao-1.2.3-x86_64-1.txz.asc

+|   |   |-- cdrtools-3.01a02-x86_64-1.txt

+|   |   |-- cdrtools-3.01a02-x86_64-1.txz

+|   |   |-- cdrtools-3.01a02-x86_64-1.txz.asc

 |   |   |-- dc3dd-6.12.3-x86_64-1.txt

 |   |   |-- dc3dd-6.12.3-x86_64-1.txz

 |   |   |-- dc3dd-6.12.3-x86_64-1.txz.asc

-|   |   |-- diffstat-1.43-x86_64-1.txt

-|   |   |-- diffstat-1.43-x86_64-1.txz

-|   |   |-- diffstat-1.43-x86_64-1.txz.asc

+|   |   |-- ddrescue-1.14-x86_64-1.txt

+|   |   |-- ddrescue-1.14-x86_64-1.txz

+|   |   |-- ddrescue-1.14-x86_64-1.txz.asc

+|   |   |-- diffstat-1.53-x86_64-1.txt

+|   |   |-- diffstat-1.53-x86_64-1.txz

+|   |   |-- diffstat-1.53-x86_64-1.txz.asc

 |   |   |-- diffutils-3.0-x86_64-1.txt

 |   |   |-- diffutils-3.0-x86_64-1.txz

 |   |   |-- diffutils-3.0-x86_64-1.txz.asc

 |   |   |-- dmapi-2.2.10-x86_64-1.txt

 |   |   |-- dmapi-2.2.10-x86_64-1.txz

 |   |   |-- dmapi-2.2.10-x86_64-1.txz.asc

-|   |   |-- dmidecode-2.10-x86_64-1.txt

-|   |   |-- dmidecode-2.10-x86_64-1.txz

-|   |   |-- dmidecode-2.10-x86_64-1.txz.asc

-|   |   |-- dvd+rw-tools-7.1-x86_64-1.txt

-|   |   |-- dvd+rw-tools-7.1-x86_64-1.txz

-|   |   |-- dvd+rw-tools-7.1-x86_64-1.txz.asc

-|   |   |-- enscript-1.6.3-x86_64-1.txt

-|   |   |-- enscript-1.6.3-x86_64-1.txz

-|   |   |-- enscript-1.6.3-x86_64-1.txz.asc

-|   |   |-- flac-1.2.1-x86_64-2.txt

-|   |   |-- flac-1.2.1-x86_64-2.txz

-|   |   |-- flac-1.2.1-x86_64-2.txz.asc

-|   |   |-- foomatic-filters-4.0.4-x86_64-1.txt

-|   |   |-- foomatic-filters-4.0.4-x86_64-1.txz

-|   |   |-- foomatic-filters-4.0.4-x86_64-1.txz.asc

-|   |   |-- ghostscript-8.71-x86_64-2.txt

-|   |   |-- ghostscript-8.71-x86_64-2.txz

-|   |   |-- ghostscript-8.71-x86_64-2.txz.asc

+|   |   |-- dmidecode-2.11-x86_64-1.txt

+|   |   |-- dmidecode-2.11-x86_64-1.txz

+|   |   |-- dmidecode-2.11-x86_64-1.txz.asc

+|   |   |-- dvd+rw-tools-7.1-x86_64-2.txt

+|   |   |-- dvd+rw-tools-7.1-x86_64-2.txz

+|   |   |-- dvd+rw-tools-7.1-x86_64-2.txz.asc

+|   |   |-- enscript-1.6.5.2-x86_64-1.txt

+|   |   |-- enscript-1.6.5.2-x86_64-1.txz

+|   |   |-- enscript-1.6.5.2-x86_64-1.txz.asc

+|   |   |-- flac-1.2.1-x86_64-3.txt

+|   |   |-- flac-1.2.1-x86_64-3.txz

+|   |   |-- flac-1.2.1-x86_64-3.txz.asc

+|   |   |-- foomatic-filters-4.0.6-x86_64-1.txt

+|   |   |-- foomatic-filters-4.0.6-x86_64-1.txz

+|   |   |-- foomatic-filters-4.0.6-x86_64-1.txz.asc

+|   |   |-- ghostscript-9.00-x86_64-2.txt

+|   |   |-- ghostscript-9.00-x86_64-2.txz

+|   |   |-- ghostscript-9.00-x86_64-2.txz.asc

 |   |   |-- ghostscript-fonts-std-8.11-noarch-1.txt

 |   |   |-- ghostscript-fonts-std-8.11-noarch-1.txz

 |   |   |-- ghostscript-fonts-std-8.11-noarch-1.txz.asc

-|   |   |-- gphoto2-2.4.9-x86_64-1.txt

-|   |   |-- gphoto2-2.4.9-x86_64-1.txz

-|   |   |-- gphoto2-2.4.9-x86_64-1.txz.asc

-|   |   |-- groff-1.20.1-x86_64-1.txt

-|   |   |-- groff-1.20.1-x86_64-1.txz

-|   |   |-- groff-1.20.1-x86_64-1.txz.asc

-|   |   |-- gutenprint-5.2.4-x86_64-2.txt

-|   |   |-- gutenprint-5.2.4-x86_64-2.txz

-|   |   |-- gutenprint-5.2.4-x86_64-2.txz.asc

-|   |   |-- hplip-3.10.2-x86_64-2.txt

-|   |   |-- hplip-3.10.2-x86_64-2.txz

-|   |   |-- hplip-3.10.2-x86_64-2.txz.asc

+|   |   |-- gphoto2-2.4.10-x86_64-1.txt

+|   |   |-- gphoto2-2.4.10-x86_64-1.txz

+|   |   |-- gphoto2-2.4.10-x86_64-1.txz.asc

+|   |   |-- groff-1.21-x86_64-1.txt

+|   |   |-- groff-1.21-x86_64-1.txz

+|   |   |-- groff-1.21-x86_64-1.txz.asc

+|   |   |-- gutenprint-5.2.6-x86_64-1.txt

+|   |   |-- gutenprint-5.2.6-x86_64-1.txz

+|   |   |-- gutenprint-5.2.6-x86_64-1.txz.asc

+|   |   |-- hplip-3.11.3a-x86_64-1.txt

+|   |   |-- hplip-3.11.3a-x86_64-1.txz

+|   |   |-- hplip-3.11.3a-x86_64-1.txz.asc

 |   |   |-- install-packages

 |   |   |-- install.end

 |   |   |-- ispell-3.2.06-x86_64-1.txt

@@ -1046,148 +1106,154 @@ see additional documentation files.
 |   |   |-- jed-0.99_19-x86_64-1.txt

 |   |   |-- jed-0.99_19-x86_64-1.txz

 |   |   |-- jed-0.99_19-x86_64-1.txz.asc

-|   |   |-- joe-3.5-x86_64-2.txt

-|   |   |-- joe-3.5-x86_64-2.txz

-|   |   |-- joe-3.5-x86_64-2.txz.asc

-|   |   |-- jove-4.16.0.70-x86_64-2.txt

-|   |   |-- jove-4.16.0.70-x86_64-2.txz

-|   |   |-- jove-4.16.0.70-x86_64-2.txz.asc

-|   |   |-- ksh93-2007_03_28-x86_64-2.txt

-|   |   |-- ksh93-2007_03_28-x86_64-2.txz

-|   |   |-- ksh93-2007_03_28-x86_64-2.txz.asc

+|   |   |-- joe-3.7-x86_64-1.txt

+|   |   |-- joe-3.7-x86_64-1.txz

+|   |   |-- joe-3.7-x86_64-1.txz.asc

+|   |   |-- jove-4.16.0.73-x86_64-1.txt

+|   |   |-- jove-4.16.0.73-x86_64-1.txz

+|   |   |-- jove-4.16.0.73-x86_64-1.txz.asc

+|   |   |-- ksh93-2010_06_21-x86_64-1.txt

+|   |   |-- ksh93-2010_06_21-x86_64-1.txz

+|   |   |-- ksh93-2010_06_21-x86_64-1.txz.asc

 |   |   |-- libx86-1.1-x86_64-1.txt

 |   |   |-- libx86-1.1-x86_64-1.txz

 |   |   |-- libx86-1.1-x86_64-1.txz.asc

-|   |   |-- linuxdoc-tools-0.9.66-x86_64-2.txt

-|   |   |-- linuxdoc-tools-0.9.66-x86_64-2.txz

-|   |   |-- linuxdoc-tools-0.9.66-x86_64-2.txz.asc

+|   |   |-- linuxdoc-tools-0.9.66-x86_64-8.txt

+|   |   |-- linuxdoc-tools-0.9.66-x86_64-8.txz

+|   |   |-- linuxdoc-tools-0.9.66-x86_64-8.txz.asc

 |   |   |-- lm_sensors-3.1.2-x86_64-1.txt

 |   |   |-- lm_sensors-3.1.2-x86_64-1.txz

 |   |   |-- lm_sensors-3.1.2-x86_64-1.txz.asc

 |   |   |-- lsof-4.83-x86_64-1.txt

 |   |   |-- lsof-4.83-x86_64-1.txz

 |   |   |-- lsof-4.83-x86_64-1.txz.asc

-|   |   |-- lsscsi-0.22-x86_64-1.txt

-|   |   |-- lsscsi-0.22-x86_64-1.txz

-|   |   |-- lsscsi-0.22-x86_64-1.txz.asc

-|   |   |-- madplay-0.15.2b-x86_64-2.txt

-|   |   |-- madplay-0.15.2b-x86_64-2.txz

-|   |   |-- madplay-0.15.2b-x86_64-2.txz.asc

+|   |   |-- lsscsi-0.24-x86_64-1.txt

+|   |   |-- lsscsi-0.24-x86_64-1.txz

+|   |   |-- lsscsi-0.24-x86_64-1.txz.asc

+|   |   |-- lxc-0.7.4-x86_64-2.txt

+|   |   |-- lxc-0.7.4-x86_64-2.txz

+|   |   |-- lxc-0.7.4-x86_64-2.txz.asc

+|   |   |-- madplay-0.15.2b-x86_64-3.txt

+|   |   |-- madplay-0.15.2b-x86_64-3.txz

+|   |   |-- madplay-0.15.2b-x86_64-3.txz.asc

 |   |   |-- maketag

 |   |   |-- maketag.ez

-|   |   |-- man-1.6f-x86_64-2.txt

-|   |   |-- man-1.6f-x86_64-2.txz

-|   |   |-- man-1.6f-x86_64-2.txz.asc

-|   |   |-- man-pages-3.24-noarch-1.txt

-|   |   |-- man-pages-3.24-noarch-1.txz

-|   |   |-- man-pages-3.24-noarch-1.txz.asc

-|   |   |-- mc-20100509_git-x86_64-1.txt

-|   |   |-- mc-20100509_git-x86_64-1.txz

-|   |   |-- mc-20100509_git-x86_64-1.txz.asc

+|   |   |-- man-1.6g-x86_64-1.txt

+|   |   |-- man-1.6g-x86_64-1.txz

+|   |   |-- man-1.6g-x86_64-1.txz.asc

+|   |   |-- man-pages-3.32-noarch-1.txt

+|   |   |-- man-pages-3.32-noarch-1.txz

+|   |   |-- man-pages-3.32-noarch-1.txz.asc

+|   |   |-- mc-4.7.5.2-x86_64-1.txt

+|   |   |-- mc-4.7.5.2-x86_64-1.txz

+|   |   |-- mc-4.7.5.2-x86_64-1.txz.asc

+|   |   |-- moc-2.5.0_alpha4-x86_64-1.txt

+|   |   |-- moc-2.5.0_alpha4-x86_64-1.txz

+|   |   |-- moc-2.5.0_alpha4-x86_64-1.txz.asc

 |   |   |-- most-5.0.0a-x86_64-2.txt

 |   |   |-- most-5.0.0a-x86_64-2.txz

 |   |   |-- most-5.0.0a-x86_64-2.txz.asc

-|   |   |-- mpg123-1.12.1-x86_64-1.txt

-|   |   |-- mpg123-1.12.1-x86_64-1.txz

-|   |   |-- mpg123-1.12.1-x86_64-1.txz.asc

-|   |   |-- mysql-5.1.46-x86_64-2.txt

-|   |   |-- mysql-5.1.46-x86_64-2.txz

-|   |   |-- mysql-5.1.46-x86_64-2.txz.asc

-|   |   |-- nano-2.2.4-x86_64-1.txt

-|   |   |-- nano-2.2.4-x86_64-1.txz

-|   |   |-- nano-2.2.4-x86_64-1.txz.asc

+|   |   |-- mpg123-1.13.3-x86_64-1.txt

+|   |   |-- mpg123-1.13.3-x86_64-1.txz

+|   |   |-- mpg123-1.13.3-x86_64-1.txz.asc

+|   |   |-- mysql-5.1.56-x86_64-1.txt

+|   |   |-- mysql-5.1.56-x86_64-1.txz

+|   |   |-- mysql-5.1.56-x86_64-1.txz.asc

+|   |   |-- nano-2.3.0-x86_64-1.txt

+|   |   |-- nano-2.3.0-x86_64-1.txz

+|   |   |-- nano-2.3.0-x86_64-1.txz.asc

 |   |   |-- normalize-0.7.7-x86_64-1.txt

 |   |   |-- normalize-0.7.7-x86_64-1.txz

 |   |   |-- normalize-0.7.7-x86_64-1.txz.asc

 |   |   |-- ntfsprogs-2.0.0-x86_64-2.txt

 |   |   |-- ntfsprogs-2.0.0-x86_64-2.txz

 |   |   |-- ntfsprogs-2.0.0-x86_64-2.txz.asc

-|   |   |-- pm-utils-1.3.0-x86_64-1.txt

-|   |   |-- pm-utils-1.3.0-x86_64-1.txz

-|   |   |-- pm-utils-1.3.0-x86_64-1.txz.asc

-|   |   |-- powertop-1.11-x86_64-1.txt

-|   |   |-- powertop-1.11-x86_64-1.txz

-|   |   |-- powertop-1.11-x86_64-1.txz.asc

+|   |   |-- pm-utils-1.4.1-x86_64-2.txt

+|   |   |-- pm-utils-1.4.1-x86_64-2.txz

+|   |   |-- pm-utils-1.4.1-x86_64-2.txz.asc

+|   |   |-- powertop-1.13-x86_64-1.txt

+|   |   |-- powertop-1.13-x86_64-1.txz

+|   |   |-- powertop-1.13-x86_64-1.txz.asc

 |   |   |-- radeontool-1.6.1-x86_64-1.txt

 |   |   |-- radeontool-1.6.1-x86_64-1.txz

 |   |   |-- radeontool-1.6.1-x86_64-1.txz.asc

 |   |   |-- rexima-1.4-x86_64-2.txt

 |   |   |-- rexima-1.4-x86_64-2.txz

 |   |   |-- rexima-1.4-x86_64-2.txz.asc

-|   |   |-- rpm-4.8.0-x86_64-1.txt

-|   |   |-- rpm-4.8.0-x86_64-1.txz

-|   |   |-- rpm-4.8.0-x86_64-1.txz.asc

+|   |   |-- rpm-4.8.1-x86_64-1.txt

+|   |   |-- rpm-4.8.1-x86_64-1.txz

+|   |   |-- rpm-4.8.1-x86_64-1.txz.asc

 |   |   |-- rzip-2.1-x86_64-1.txt

 |   |   |-- rzip-2.1-x86_64-1.txz

 |   |   |-- rzip-2.1-x86_64-1.txz.asc

-|   |   |-- sc-7.16-x86_64-2.txt

-|   |   |-- sc-7.16-x86_64-2.txz

-|   |   |-- sc-7.16-x86_64-2.txz.asc

+|   |   |-- sc-7.16-x86_64-3.txt

+|   |   |-- sc-7.16-x86_64-3.txz

+|   |   |-- sc-7.16-x86_64-3.txz.asc

 |   |   |-- screen-4.0.3-x86_64-2.txt

 |   |   |-- screen-4.0.3-x86_64-2.txz

 |   |   |-- screen-4.0.3-x86_64-2.txz.asc

 |   |   |-- seejpeg-1.10-x86_64-1.txt

 |   |   |-- seejpeg-1.10-x86_64-1.txz

 |   |   |-- seejpeg-1.10-x86_64-1.txz.asc

-|   |   |-- slackpkg-2.81.1-noarch-1.tgz

-|   |   |-- slackpkg-2.81.1-noarch-1.tgz.asc

-|   |   |-- slackpkg-2.81.1-noarch-1.txt

-|   |   |-- sox-14.3.0-x86_64-3.txt

-|   |   |-- sox-14.3.0-x86_64-3.txz

-|   |   |-- sox-14.3.0-x86_64-3.txz.asc

-|   |   |-- sqlite-3.6.23.1-x86_64-1.txt

-|   |   |-- sqlite-3.6.23.1-x86_64-1.txz

-|   |   |-- sqlite-3.6.23.1-x86_64-1.txz.asc

-|   |   |-- sudo-1.7.2p6-x86_64-1.txt

-|   |   |-- sudo-1.7.2p6-x86_64-1.txz

-|   |   |-- sudo-1.7.2p6-x86_64-1.txz.asc

+|   |   |-- slackpkg-2.82.0-noarch-5.tgz

+|   |   |-- slackpkg-2.82.0-noarch-5.tgz.asc

+|   |   |-- slackpkg-2.82.0-noarch-5.txt

+|   |   |-- sox-14.3.2-x86_64-1.txt

+|   |   |-- sox-14.3.2-x86_64-1.txz

+|   |   |-- sox-14.3.2-x86_64-1.txz.asc

+|   |   |-- sqlite-3.7.5-x86_64-1.txt

+|   |   |-- sqlite-3.7.5-x86_64-1.txz

+|   |   |-- sqlite-3.7.5-x86_64-1.txz.asc

+|   |   |-- sudo-1.7.4p6-x86_64-1.txt

+|   |   |-- sudo-1.7.4p6-x86_64-1.txz

+|   |   |-- sudo-1.7.4p6-x86_64-1.txz.asc

 |   |   |-- sysstat-9.0.6.1-x86_64-1.txt

 |   |   |-- sysstat-9.0.6.1-x86_64-1.txz

 |   |   |-- sysstat-9.0.6.1-x86_64-1.txz.asc

 |   |   |-- tagfile

-|   |   |-- texinfo-4.13a-x86_64-3.txt

-|   |   |-- texinfo-4.13a-x86_64-3.txz

-|   |   |-- texinfo-4.13a-x86_64-3.txz.asc

+|   |   |-- texinfo-4.13a-x86_64-4.txt

+|   |   |-- texinfo-4.13a-x86_64-4.txz

+|   |   |-- texinfo-4.13a-x86_64-4.txz.asc

 |   |   |-- vbetool-1.1-x86_64-1.txt

 |   |   |-- vbetool-1.1-x86_64-1.txz

 |   |   |-- vbetool-1.1-x86_64-1.txz.asc

-|   |   |-- vim-7.2.416-x86_64-1.txt

-|   |   |-- vim-7.2.416-x86_64-1.txz

-|   |   |-- vim-7.2.416-x86_64-1.txz.asc

-|   |   |-- vorbis-tools-1.2.0-x86_64-1.txt

-|   |   |-- vorbis-tools-1.2.0-x86_64-1.txz

-|   |   |-- vorbis-tools-1.2.0-x86_64-1.txz.asc

-|   |   |-- workbone-2.40-x86_64-3.txt

-|   |   |-- workbone-2.40-x86_64-3.txz

-|   |   |-- workbone-2.40-x86_64-3.txz.asc

+|   |   |-- vim-7.3.154-x86_64-1.txt

+|   |   |-- vim-7.3.154-x86_64-1.txz

+|   |   |-- vim-7.3.154-x86_64-1.txz.asc

+|   |   |-- vorbis-tools-1.4.0-x86_64-1.txt

+|   |   |-- vorbis-tools-1.4.0-x86_64-1.txz

+|   |   |-- vorbis-tools-1.4.0-x86_64-1.txz.asc

+|   |   |-- workbone-2.40-x86_64-4.txt

+|   |   |-- workbone-2.40-x86_64-4.txz

+|   |   |-- workbone-2.40-x86_64-4.txz.asc

 |   |   |-- xfsdump-3.0.4-x86_64-1.txt

 |   |   |-- xfsdump-3.0.4-x86_64-1.txz

 |   |   |-- xfsdump-3.0.4-x86_64-1.txz.asc

-|   |   |-- zsh-4.3.10-x86_64-1.txt

-|   |   |-- zsh-4.3.10-x86_64-1.txz

-|   |   `-- zsh-4.3.10-x86_64-1.txz.asc

+|   |   |-- zsh-4.3.11-x86_64-1.txt

+|   |   |-- zsh-4.3.11-x86_64-1.txz

+|   |   `-- zsh-4.3.11-x86_64-1.txz.asc

 |   |-- d

-|   |   |-- autoconf-2.65-noarch-1.txt

-|   |   |-- autoconf-2.65-noarch-1.txz

-|   |   |-- autoconf-2.65-noarch-1.txz.asc

-|   |   |-- automake-1.11.1-noarch-1.txt

-|   |   |-- automake-1.11.1-noarch-1.txz

-|   |   |-- automake-1.11.1-noarch-1.txz.asc

-|   |   |-- binutils-2.20.51.0.8-x86_64-1.txt

-|   |   |-- binutils-2.20.51.0.8-x86_64-1.txz

-|   |   |-- binutils-2.20.51.0.8-x86_64-1.txz.asc

-|   |   |-- bison-2.4.2-x86_64-1.txt

-|   |   |-- bison-2.4.2-x86_64-1.txz

-|   |   |-- bison-2.4.2-x86_64-1.txz.asc

-|   |   |-- ccache-2.4-x86_64-1.txt

-|   |   |-- ccache-2.4-x86_64-1.txz

-|   |   |-- ccache-2.4-x86_64-1.txz.asc

-|   |   |-- clisp-2.48-x86_64-1.txt

-|   |   |-- clisp-2.48-x86_64-1.txz

-|   |   |-- clisp-2.48-x86_64-1.txz.asc

-|   |   |-- cmake-2.8.1-x86_64-1.txt

-|   |   |-- cmake-2.8.1-x86_64-1.txz

-|   |   |-- cmake-2.8.1-x86_64-1.txz.asc

+|   |   |-- autoconf-2.68-noarch-1.txt

+|   |   |-- autoconf-2.68-noarch-1.txz

+|   |   |-- autoconf-2.68-noarch-1.txz.asc

+|   |   |-- automake-1.11.1-noarch-2.txt

+|   |   |-- automake-1.11.1-noarch-2.txz

+|   |   |-- automake-1.11.1-noarch-2.txz.asc

+|   |   |-- binutils-2.21.51.0.6-x86_64-1.txt

+|   |   |-- binutils-2.21.51.0.6-x86_64-1.txz

+|   |   |-- binutils-2.21.51.0.6-x86_64-1.txz.asc

+|   |   |-- bison-2.4.3-x86_64-2.txt

+|   |   |-- bison-2.4.3-x86_64-2.txz

+|   |   |-- bison-2.4.3-x86_64-2.txz.asc

+|   |   |-- ccache-3.1.4-x86_64-1.txt

+|   |   |-- ccache-3.1.4-x86_64-1.txz

+|   |   |-- ccache-3.1.4-x86_64-1.txz.asc

+|   |   |-- clisp-2.49-x86_64-1.txt

+|   |   |-- clisp-2.49-x86_64-1.txz

+|   |   |-- clisp-2.49-x86_64-1.txz.asc

+|   |   |-- cmake-2.8.4-x86_64-1.txt

+|   |   |-- cmake-2.8.4-x86_64-1.txz

+|   |   |-- cmake-2.8.4-x86_64-1.txz.asc

 |   |   |-- cscope-15.7a-x86_64-1.txt

 |   |   |-- cscope-15.7a-x86_64-1.txz

 |   |   |-- cscope-15.7a-x86_64-1.txz.asc

@@ -1200,111 +1266,117 @@ see additional documentation files.
 |   |   |-- distcc-2.18.3-x86_64-2.txt

 |   |   |-- distcc-2.18.3-x86_64-2.txz

 |   |   |-- distcc-2.18.3-x86_64-2.txz.asc

-|   |   |-- doxygen-1.6.3-x86_64-1.txt

-|   |   |-- doxygen-1.6.3-x86_64-1.txz

-|   |   |-- doxygen-1.6.3-x86_64-1.txz.asc

+|   |   |-- doxygen-1.7.3-x86_64-1.txt

+|   |   |-- doxygen-1.7.3-x86_64-1.txz

+|   |   |-- doxygen-1.7.3-x86_64-1.txz.asc

 |   |   |-- flex-2.5.35-x86_64-1.txt

 |   |   |-- flex-2.5.35-x86_64-1.txz

 |   |   |-- flex-2.5.35-x86_64-1.txz.asc

-|   |   |-- gcc-4.4.4-x86_64-1.txt

-|   |   |-- gcc-4.4.4-x86_64-1.txz

-|   |   |-- gcc-4.4.4-x86_64-1.txz.asc

-|   |   |-- gcc-g++-4.4.4-x86_64-1.txt

-|   |   |-- gcc-g++-4.4.4-x86_64-1.txz

-|   |   |-- gcc-g++-4.4.4-x86_64-1.txz.asc

-|   |   |-- gcc-gfortran-4.4.4-x86_64-1.txt

-|   |   |-- gcc-gfortran-4.4.4-x86_64-1.txz

-|   |   |-- gcc-gfortran-4.4.4-x86_64-1.txz.asc

-|   |   |-- gcc-gnat-4.4.4-x86_64-1.txt

-|   |   |-- gcc-gnat-4.4.4-x86_64-1.txz

-|   |   |-- gcc-gnat-4.4.4-x86_64-1.txz.asc

-|   |   |-- gcc-java-4.4.4-x86_64-1.txt

-|   |   |-- gcc-java-4.4.4-x86_64-1.txz

-|   |   |-- gcc-java-4.4.4-x86_64-1.txz.asc

-|   |   |-- gcc-objc-4.4.4-x86_64-1.txt

-|   |   |-- gcc-objc-4.4.4-x86_64-1.txz

-|   |   |-- gcc-objc-4.4.4-x86_64-1.txz.asc

-|   |   |-- gdb-7.1-x86_64-1.txt

-|   |   |-- gdb-7.1-x86_64-1.txz

-|   |   |-- gdb-7.1-x86_64-1.txz.asc

-|   |   |-- gettext-tools-0.17-x86_64-4.txt

-|   |   |-- gettext-tools-0.17-x86_64-4.txz

-|   |   |-- gettext-tools-0.17-x86_64-4.txz.asc

-|   |   |-- git-1.7.1-x86_64-1.txt

-|   |   |-- git-1.7.1-x86_64-1.txz

-|   |   |-- git-1.7.1-x86_64-1.txz.asc

-|   |   |-- gperf-3.0.3-x86_64-1.txt

-|   |   |-- gperf-3.0.3-x86_64-1.txz

-|   |   |-- gperf-3.0.3-x86_64-1.txz.asc

-|   |   |-- guile-1.8.7-x86_64-3.txt

-|   |   |-- guile-1.8.7-x86_64-3.txz

-|   |   |-- guile-1.8.7-x86_64-3.txz.asc

+|   |   |-- gcc-4.5.2-x86_64-2.txt

+|   |   |-- gcc-4.5.2-x86_64-2.txz

+|   |   |-- gcc-4.5.2-x86_64-2.txz.asc

+|   |   |-- gcc-g++-4.5.2-x86_64-2.txt

+|   |   |-- gcc-g++-4.5.2-x86_64-2.txz

+|   |   |-- gcc-g++-4.5.2-x86_64-2.txz.asc

+|   |   |-- gcc-gfortran-4.5.2-x86_64-2.txt

+|   |   |-- gcc-gfortran-4.5.2-x86_64-2.txz

+|   |   |-- gcc-gfortran-4.5.2-x86_64-2.txz.asc

+|   |   |-- gcc-gnat-4.5.2-x86_64-2.txt

+|   |   |-- gcc-gnat-4.5.2-x86_64-2.txz

+|   |   |-- gcc-gnat-4.5.2-x86_64-2.txz.asc

+|   |   |-- gcc-java-4.5.2-x86_64-2.txt

+|   |   |-- gcc-java-4.5.2-x86_64-2.txz

+|   |   |-- gcc-java-4.5.2-x86_64-2.txz.asc

+|   |   |-- gcc-objc-4.5.2-x86_64-2.txt

+|   |   |-- gcc-objc-4.5.2-x86_64-2.txz

+|   |   |-- gcc-objc-4.5.2-x86_64-2.txz.asc

+|   |   |-- gdb-7.2-x86_64-2.txt

+|   |   |-- gdb-7.2-x86_64-2.txz

+|   |   |-- gdb-7.2-x86_64-2.txz.asc

+|   |   |-- gettext-tools-0.18.1.1-x86_64-1.txt

+|   |   |-- gettext-tools-0.18.1.1-x86_64-1.txz

+|   |   |-- gettext-tools-0.18.1.1-x86_64-1.txz.asc

+|   |   |-- git-1.7.4.4-x86_64-1.txt

+|   |   |-- git-1.7.4.4-x86_64-1.txz

+|   |   |-- git-1.7.4.4-x86_64-1.txz.asc

+|   |   |-- gperf-3.0.4-x86_64-1.txt

+|   |   |-- gperf-3.0.4-x86_64-1.txz

+|   |   |-- gperf-3.0.4-x86_64-1.txz.asc

+|   |   |-- guile-1.8.8-x86_64-1.txt

+|   |   |-- guile-1.8.8-x86_64-1.txz

+|   |   |-- guile-1.8.8-x86_64-1.txz.asc

 |   |   |-- indent-2.2.10-x86_64-1.txt

 |   |   |-- indent-2.2.10-x86_64-1.txz

 |   |   |-- indent-2.2.10-x86_64-1.txz.asc

 |   |   |-- install-packages

 |   |   |-- install.end

-|   |   |-- intltool-0.40.6-x86_64-1.txt

-|   |   |-- intltool-0.40.6-x86_64-1.txz

-|   |   |-- intltool-0.40.6-x86_64-1.txz.asc

-|   |   |-- kernel-headers-2.6.33.4-x86-1.txt

-|   |   |-- kernel-headers-2.6.33.4-x86-1.txz

-|   |   |-- kernel-headers-2.6.33.4-x86-1.txz.asc

-|   |   |-- libtool-2.2.6b-x86_64-2.txt

-|   |   |-- libtool-2.2.6b-x86_64-2.txz

-|   |   |-- libtool-2.2.6b-x86_64-2.txz.asc

-|   |   |-- m4-1.4.14-x86_64-1.txt

-|   |   |-- m4-1.4.14-x86_64-1.txz

-|   |   |-- m4-1.4.14-x86_64-1.txz.asc

-|   |   |-- make-3.81-x86_64-1.txt

-|   |   |-- make-3.81-x86_64-1.txz

-|   |   |-- make-3.81-x86_64-1.txz.asc

+|   |   |-- intltool-0.41.1-x86_64-1.txt

+|   |   |-- intltool-0.41.1-x86_64-1.txz

+|   |   |-- intltool-0.41.1-x86_64-1.txz.asc

+|   |   |-- kernel-headers-2.6.37.6-x86-2.txt

+|   |   |-- kernel-headers-2.6.37.6-x86-2.txz

+|   |   |-- kernel-headers-2.6.37.6-x86-2.txz.asc

+|   |   |-- libtool-2.4-x86_64-1.txt

+|   |   |-- libtool-2.4-x86_64-1.txz

+|   |   |-- libtool-2.4-x86_64-1.txz.asc

+|   |   |-- m4-1.4.16-x86_64-1.txt

+|   |   |-- m4-1.4.16-x86_64-1.txz

+|   |   |-- m4-1.4.16-x86_64-1.txz.asc

+|   |   |-- make-3.82-x86_64-2.txt

+|   |   |-- make-3.82-x86_64-2.txz

+|   |   |-- make-3.82-x86_64-2.txz.asc

 |   |   |-- maketag

 |   |   |-- maketag.ez

-|   |   |-- mercurial-1.5.2-x86_64-1.txt

-|   |   |-- mercurial-1.5.2-x86_64-1.txz

-|   |   |-- mercurial-1.5.2-x86_64-1.txz.asc

-|   |   |-- nasm-2.07-x86_64-1.txt

-|   |   |-- nasm-2.07-x86_64-1.txz

-|   |   |-- nasm-2.07-x86_64-1.txz.asc

-|   |   |-- oprofile-0.9.6-x86_64-2.txt

-|   |   |-- oprofile-0.9.6-x86_64-2.txz

-|   |   |-- oprofile-0.9.6-x86_64-2.txz.asc

+|   |   |-- mercurial-1.8.2-x86_64-1.txt

+|   |   |-- mercurial-1.8.2-x86_64-1.txz

+|   |   |-- mercurial-1.8.2-x86_64-1.txz.asc

+|   |   |-- nasm-2.09.04-x86_64-1.txt

+|   |   |-- nasm-2.09.04-x86_64-1.txz

+|   |   |-- nasm-2.09.04-x86_64-1.txz.asc

+|   |   |-- oprofile-0.9.6-x86_64-5.txt

+|   |   |-- oprofile-0.9.6-x86_64-5.txz

+|   |   |-- oprofile-0.9.6-x86_64-5.txz.asc

 |   |   |-- p2c-1.21alpha2-x86_64-3.txt

 |   |   |-- p2c-1.21alpha2-x86_64-3.txz

 |   |   |-- p2c-1.21alpha2-x86_64-3.txz.asc

-|   |   |-- perl-5.10.1-x86_64-1.txt

-|   |   |-- perl-5.10.1-x86_64-1.txz

-|   |   |-- perl-5.10.1-x86_64-1.txz.asc

-|   |   |-- pkg-config-0.23-x86_64-3.txt

-|   |   |-- pkg-config-0.23-x86_64-3.txz

-|   |   |-- pkg-config-0.23-x86_64-3.txz.asc

+|   |   |-- perl-5.12.3-x86_64-1.txt

+|   |   |-- perl-5.12.3-x86_64-1.txz

+|   |   |-- perl-5.12.3-x86_64-1.txz.asc

+|   |   |-- pkg-config-0.25-x86_64-1.txt

+|   |   |-- pkg-config-0.25-x86_64-1.txz

+|   |   |-- pkg-config-0.25-x86_64-1.txz.asc

 |   |   |-- pmake-1.111-x86_64-3.txt

 |   |   |-- pmake-1.111-x86_64-3.txz

 |   |   |-- pmake-1.111-x86_64-3.txz.asc

-|   |   |-- python-2.6.4-x86_64-1.txt

-|   |   |-- python-2.6.4-x86_64-1.txz

-|   |   |-- python-2.6.4-x86_64-1.txz.asc

+|   |   |-- python-2.6.6-x86_64-1.txt

+|   |   |-- python-2.6.6-x86_64-1.txz

+|   |   |-- python-2.6.6-x86_64-1.txz.asc

 |   |   |-- rcs-5.7-x86_64-2.txt

 |   |   |-- rcs-5.7-x86_64-2.txz

 |   |   |-- rcs-5.7-x86_64-2.txz.asc

-|   |   |-- ruby-1.9.1_p378-x86_64-1.txt

-|   |   |-- ruby-1.9.1_p378-x86_64-1.txz

-|   |   |-- ruby-1.9.1_p378-x86_64-1.txz.asc

-|   |   |-- strace-4.5.18-x86_64-1.txt

-|   |   |-- strace-4.5.18-x86_64-1.txz

-|   |   |-- strace-4.5.18-x86_64-1.txz.asc

-|   |   |-- subversion-1.6.11-x86_64-1.txt

-|   |   |-- subversion-1.6.11-x86_64-1.txz

-|   |   |-- subversion-1.6.11-x86_64-1.txz.asc

-|   |   |-- swig-1.3.38-x86_64-1.txt

-|   |   |-- swig-1.3.38-x86_64-1.txz

-|   |   |-- swig-1.3.38-x86_64-1.txz.asc

-|   |   `-- tagfile

+|   |   |-- ruby-1.9.1_p431-x86_64-1.txt

+|   |   |-- ruby-1.9.1_p431-x86_64-1.txz

+|   |   |-- ruby-1.9.1_p431-x86_64-1.txz.asc

+|   |   |-- slacktrack-2.08-x86_64-1.txt

+|   |   |-- slacktrack-2.08-x86_64-1.txz

+|   |   |-- slacktrack-2.08-x86_64-1.txz.asc

+|   |   |-- strace-4.5.20-x86_64-1.txt

+|   |   |-- strace-4.5.20-x86_64-1.txz

+|   |   |-- strace-4.5.20-x86_64-1.txz.asc

+|   |   |-- subversion-1.6.16-x86_64-1.txt

+|   |   |-- subversion-1.6.16-x86_64-1.txz

+|   |   |-- subversion-1.6.16-x86_64-1.txz.asc

+|   |   |-- swig-1.3.38-x86_64-2.txt

+|   |   |-- swig-1.3.38-x86_64-2.txz

+|   |   |-- swig-1.3.38-x86_64-2.txz.asc

+|   |   |-- tagfile

+|   |   |-- yasm-1.1.0-x86_64-1.txt

+|   |   |-- yasm-1.1.0-x86_64-1.txz

+|   |   `-- yasm-1.1.0-x86_64-1.txz.asc

 |   |-- e

-|   |   |-- emacs-23.2-x86_64-1.txt

-|   |   |-- emacs-23.2-x86_64-1.txz

-|   |   |-- emacs-23.2-x86_64-1.txz.asc

+|   |   |-- emacs-23.3-x86_64-1.txt

+|   |   |-- emacs-23.3-x86_64-1.txz

+|   |   |-- emacs-23.3-x86_64-1.txz.asc

 |   |   |-- install-packages

 |   |   |-- install.end

 |   |   |-- maketag

@@ -1316,454 +1388,445 @@ see additional documentation files.
 |   |   |-- linux-faqs-20060228-noarch-1.txt

 |   |   |-- linux-faqs-20060228-noarch-1.txz

 |   |   |-- linux-faqs-20060228-noarch-1.txz.asc

-|   |   |-- linux-howtos-20100501-noarch-1.txt

-|   |   |-- linux-howtos-20100501-noarch-1.txz

-|   |   |-- linux-howtos-20100501-noarch-1.txz.asc

+|   |   |-- linux-howtos-20110210-noarch-1.txt

+|   |   |-- linux-howtos-20110210-noarch-1.txz

+|   |   |-- linux-howtos-20110210-noarch-1.txz.asc

 |   |   |-- maketag

 |   |   |-- maketag.ez

 |   |   `-- tagfile

 |   |-- k

 |   |   |-- install-packages

 |   |   |-- install.end

-|   |   |-- kernel-source-2.6.33.4-noarch-1.txt

-|   |   |-- kernel-source-2.6.33.4-noarch-1.txz

-|   |   |-- kernel-source-2.6.33.4-noarch-1.txz.asc

+|   |   |-- kernel-source-2.6.37.6-noarch-2.txt

+|   |   |-- kernel-source-2.6.37.6-noarch-2.txz

+|   |   |-- kernel-source-2.6.37.6-noarch-2.txz.asc

 |   |   |-- maketag

 |   |   |-- maketag.ez

 |   |   `-- tagfile

 |   |-- kde

-|   |   |-- amarok-2.3.0-x86_64-1.txt

-|   |   |-- amarok-2.3.0-x86_64-1.txz

-|   |   |-- amarok-2.3.0-x86_64-1.txz.asc

-|   |   |-- guidance-power-manager-4.4.0-x86_64-1.txt

-|   |   |-- guidance-power-manager-4.4.0-x86_64-1.txz

-|   |   |-- guidance-power-manager-4.4.0-x86_64-1.txz.asc

+|   |   |-- amarok-2.4.0-x86_64-1.txt

+|   |   |-- amarok-2.4.0-x86_64-1.txz

+|   |   |-- amarok-2.4.0-x86_64-1.txz.asc

 |   |   |-- install-packages

 |   |   |-- install.end

-|   |   |-- k3b-1.91.0-x86_64-3.txt

-|   |   |-- k3b-1.91.0-x86_64-3.txz

-|   |   |-- k3b-1.91.0-x86_64-3.txz.asc

-|   |   |-- kaudiocreator-r1118889-x86_64-1.txt

-|   |   |-- kaudiocreator-r1118889-x86_64-1.txz

-|   |   |-- kaudiocreator-r1118889-x86_64-1.txz.asc

-|   |   |-- kdeaccessibility-4.4.3-x86_64-1.txt

-|   |   |-- kdeaccessibility-4.4.3-x86_64-1.txz

-|   |   |-- kdeaccessibility-4.4.3-x86_64-1.txz.asc

-|   |   |-- kdeadmin-4.4.3-x86_64-1.txt

-|   |   |-- kdeadmin-4.4.3-x86_64-1.txz

-|   |   |-- kdeadmin-4.4.3-x86_64-1.txz.asc

-|   |   |-- kdeartwork-4.4.3-x86_64-1.txt

-|   |   |-- kdeartwork-4.4.3-x86_64-1.txz

-|   |   |-- kdeartwork-4.4.3-x86_64-1.txz.asc

-|   |   |-- kdebase-4.4.3-x86_64-1.txt

-|   |   |-- kdebase-4.4.3-x86_64-1.txz

-|   |   |-- kdebase-4.4.3-x86_64-1.txz.asc

-|   |   |-- kdebase-runtime-4.4.3-x86_64-1.txt

-|   |   |-- kdebase-runtime-4.4.3-x86_64-1.txz

-|   |   |-- kdebase-runtime-4.4.3-x86_64-1.txz.asc

-|   |   |-- kdebase-workspace-4.4.3-x86_64-1.txt

-|   |   |-- kdebase-workspace-4.4.3-x86_64-1.txz

-|   |   |-- kdebase-workspace-4.4.3-x86_64-1.txz.asc

-|   |   |-- kdebindings-4.4.3-x86_64-2.txt

-|   |   |-- kdebindings-4.4.3-x86_64-2.txz

-|   |   |-- kdebindings-4.4.3-x86_64-2.txz.asc

-|   |   |-- kdeedu-4.4.3-x86_64-1.txt

-|   |   |-- kdeedu-4.4.3-x86_64-1.txz

-|   |   |-- kdeedu-4.4.3-x86_64-1.txz.asc

-|   |   |-- kdegames-4.4.3-x86_64-1.txt

-|   |   |-- kdegames-4.4.3-x86_64-1.txz

-|   |   |-- kdegames-4.4.3-x86_64-1.txz.asc

-|   |   |-- kdegraphics-4.4.3-x86_64-2.txt

-|   |   |-- kdegraphics-4.4.3-x86_64-2.txz

-|   |   |-- kdegraphics-4.4.3-x86_64-2.txz.asc

-|   |   |-- kdelibs-4.4.3-x86_64-1.txt

-|   |   |-- kdelibs-4.4.3-x86_64-1.txz

-|   |   |-- kdelibs-4.4.3-x86_64-1.txz.asc

-|   |   |-- kdemultimedia-4.4.3-x86_64-1.txt

-|   |   |-- kdemultimedia-4.4.3-x86_64-1.txz

-|   |   |-- kdemultimedia-4.4.3-x86_64-1.txz.asc

-|   |   |-- kdenetwork-4.4.3-x86_64-2.txt

-|   |   |-- kdenetwork-4.4.3-x86_64-2.txz

-|   |   |-- kdenetwork-4.4.3-x86_64-2.txz.asc

-|   |   |-- kdepim-4.4.3-x86_64-1.txt

-|   |   |-- kdepim-4.4.3-x86_64-1.txz

-|   |   |-- kdepim-4.4.3-x86_64-1.txz.asc

-|   |   |-- kdepim-runtime-4.4.3-x86_64-1.txt

-|   |   |-- kdepim-runtime-4.4.3-x86_64-1.txz

-|   |   |-- kdepim-runtime-4.4.3-x86_64-1.txz.asc

-|   |   |-- kdepimlibs-4.4.3-x86_64-1.txt

-|   |   |-- kdepimlibs-4.4.3-x86_64-1.txz

-|   |   |-- kdepimlibs-4.4.3-x86_64-1.txz.asc

-|   |   |-- kdeplasma-addons-4.4.3-x86_64-1.txt

-|   |   |-- kdeplasma-addons-4.4.3-x86_64-1.txz

-|   |   |-- kdeplasma-addons-4.4.3-x86_64-1.txz.asc

-|   |   |-- kdesdk-4.4.3-x86_64-1.txt

-|   |   |-- kdesdk-4.4.3-x86_64-1.txz

-|   |   |-- kdesdk-4.4.3-x86_64-1.txz.asc

-|   |   |-- kdetoys-4.4.3-x86_64-1.txt

-|   |   |-- kdetoys-4.4.3-x86_64-1.txz

-|   |   |-- kdetoys-4.4.3-x86_64-1.txz.asc

-|   |   |-- kdeutils-4.4.3-x86_64-1.txt

-|   |   |-- kdeutils-4.4.3-x86_64-1.txz

-|   |   |-- kdeutils-4.4.3-x86_64-1.txz.asc

-|   |   |-- kdevelop-4.0.0-x86_64-1.txt

-|   |   |-- kdevelop-4.0.0-x86_64-1.txz

-|   |   |-- kdevelop-4.0.0-x86_64-1.txz.asc

-|   |   |-- kdevplatform-1.0.0-x86_64-1.txt

-|   |   |-- kdevplatform-1.0.0-x86_64-1.txz

-|   |   |-- kdevplatform-1.0.0-x86_64-1.txz.asc

-|   |   |-- kdewebdev-4.4.3-x86_64-1.txt

-|   |   |-- kdewebdev-4.4.3-x86_64-1.txz

-|   |   |-- kdewebdev-4.4.3-x86_64-1.txz.asc

-|   |   |-- koffice-2.1.2-x86_64-2.txt

-|   |   |-- koffice-2.1.2-x86_64-2.txz

-|   |   |-- koffice-2.1.2-x86_64-2.txz.asc

-|   |   |-- konq-plugins-4.4.0-x86_64-1.txt

-|   |   |-- konq-plugins-4.4.0-x86_64-1.txz

-|   |   |-- konq-plugins-4.4.0-x86_64-1.txz.asc

+|   |   |-- k3b-2.0.2-x86_64-2.txt

+|   |   |-- k3b-2.0.2-x86_64-2.txz

+|   |   |-- k3b-2.0.2-x86_64-2.txz.asc

+|   |   |-- kaudiocreator-r1212483-x86_64-1.txt

+|   |   |-- kaudiocreator-r1212483-x86_64-1.txz

+|   |   |-- kaudiocreator-r1212483-x86_64-1.txz.asc

+|   |   |-- kdeaccessibility-4.5.5-x86_64-1.txt

+|   |   |-- kdeaccessibility-4.5.5-x86_64-1.txz

+|   |   |-- kdeaccessibility-4.5.5-x86_64-1.txz.asc

+|   |   |-- kdeadmin-4.5.5-x86_64-2.txt

+|   |   |-- kdeadmin-4.5.5-x86_64-2.txz

+|   |   |-- kdeadmin-4.5.5-x86_64-2.txz.asc

+|   |   |-- kdeartwork-4.5.5-x86_64-2.txt

+|   |   |-- kdeartwork-4.5.5-x86_64-2.txz

+|   |   |-- kdeartwork-4.5.5-x86_64-2.txz.asc

+|   |   |-- kdebase-4.5.5-x86_64-3.txt

+|   |   |-- kdebase-4.5.5-x86_64-3.txz

+|   |   |-- kdebase-4.5.5-x86_64-3.txz.asc

+|   |   |-- kdebase-runtime-4.5.5-x86_64-2.txt

+|   |   |-- kdebase-runtime-4.5.5-x86_64-2.txz

+|   |   |-- kdebase-runtime-4.5.5-x86_64-2.txz.asc

+|   |   |-- kdebase-workspace-4.5.5-x86_64-1.txt

+|   |   |-- kdebase-workspace-4.5.5-x86_64-1.txz

+|   |   |-- kdebase-workspace-4.5.5-x86_64-1.txz.asc

+|   |   |-- kdebindings-4.5.5-x86_64-2.txt

+|   |   |-- kdebindings-4.5.5-x86_64-2.txz

+|   |   |-- kdebindings-4.5.5-x86_64-2.txz.asc

+|   |   |-- kdeedu-4.5.5-x86_64-1.txt

+|   |   |-- kdeedu-4.5.5-x86_64-1.txz

+|   |   |-- kdeedu-4.5.5-x86_64-1.txz.asc

+|   |   |-- kdegames-4.5.5-x86_64-1.txt

+|   |   |-- kdegames-4.5.5-x86_64-1.txz

+|   |   |-- kdegames-4.5.5-x86_64-1.txz.asc

+|   |   |-- kdegraphics-4.5.5-x86_64-3.txt

+|   |   |-- kdegraphics-4.5.5-x86_64-3.txz

+|   |   |-- kdegraphics-4.5.5-x86_64-3.txz.asc

+|   |   |-- kdelibs-4.5.5-x86_64-2.txt

+|   |   |-- kdelibs-4.5.5-x86_64-2.txz

+|   |   |-- kdelibs-4.5.5-x86_64-2.txz.asc

+|   |   |-- kdemultimedia-4.5.5-x86_64-1.txt

+|   |   |-- kdemultimedia-4.5.5-x86_64-1.txz

+|   |   |-- kdemultimedia-4.5.5-x86_64-1.txz.asc

+|   |   |-- kdenetwork-4.5.5-x86_64-1.txt

+|   |   |-- kdenetwork-4.5.5-x86_64-1.txz

+|   |   |-- kdenetwork-4.5.5-x86_64-1.txz.asc

+|   |   |-- kdepim-4.4.10-x86_64-1.txt

+|   |   |-- kdepim-4.4.10-x86_64-1.txz

+|   |   |-- kdepim-4.4.10-x86_64-1.txz.asc

+|   |   |-- kdepim-runtime-4.4.10-x86_64-1.txt

+|   |   |-- kdepim-runtime-4.4.10-x86_64-1.txz

+|   |   |-- kdepim-runtime-4.4.10-x86_64-1.txz.asc

+|   |   |-- kdepimlibs-4.5.5-x86_64-2.txt

+|   |   |-- kdepimlibs-4.5.5-x86_64-2.txz

+|   |   |-- kdepimlibs-4.5.5-x86_64-2.txz.asc

+|   |   |-- kdeplasma-addons-4.5.5-x86_64-1.txt

+|   |   |-- kdeplasma-addons-4.5.5-x86_64-1.txz

+|   |   |-- kdeplasma-addons-4.5.5-x86_64-1.txz.asc

+|   |   |-- kdesdk-4.5.5-x86_64-1.txt

+|   |   |-- kdesdk-4.5.5-x86_64-1.txz

+|   |   |-- kdesdk-4.5.5-x86_64-1.txz.asc

+|   |   |-- kdetoys-4.5.5-x86_64-1.txt

+|   |   |-- kdetoys-4.5.5-x86_64-1.txz

+|   |   |-- kdetoys-4.5.5-x86_64-1.txz.asc

+|   |   |-- kdeutils-4.5.5-x86_64-1.txt

+|   |   |-- kdeutils-4.5.5-x86_64-1.txz

+|   |   |-- kdeutils-4.5.5-x86_64-1.txz.asc

+|   |   |-- kdevelop-4.2.2-x86_64-1.txt

+|   |   |-- kdevelop-4.2.2-x86_64-1.txz

+|   |   |-- kdevelop-4.2.2-x86_64-1.txz.asc

+|   |   |-- kdevplatform-1.2.2-x86_64-1.txt

+|   |   |-- kdevplatform-1.2.2-x86_64-1.txz

+|   |   |-- kdevplatform-1.2.2-x86_64-1.txz.asc

+|   |   |-- kdewebdev-4.5.5-x86_64-1.txt

+|   |   |-- kdewebdev-4.5.5-x86_64-1.txz

+|   |   |-- kdewebdev-4.5.5-x86_64-1.txz.asc

+|   |   |-- koffice-2.3.3-x86_64-2.txt

+|   |   |-- koffice-2.3.3-x86_64-2.txz

+|   |   |-- koffice-2.3.3-x86_64-2.txz.asc

+|   |   |-- konq-plugins-4.4.0-x86_64-2.txt

+|   |   |-- konq-plugins-4.4.0-x86_64-2.txz

+|   |   |-- konq-plugins-4.4.0-x86_64-2.txz.asc

 |   |   |-- kopete-cryptography-1.3.0_kde4.4.0-x86_64-1.txt

 |   |   |-- kopete-cryptography-1.3.0_kde4.4.0-x86_64-1.txz

 |   |   |-- kopete-cryptography-1.3.0_kde4.4.0-x86_64-1.txz.asc

-|   |   |-- ktorrent-3.3.4-x86_64-1.txt

-|   |   |-- ktorrent-3.3.4-x86_64-1.txz

-|   |   |-- ktorrent-3.3.4-x86_64-1.txz.asc

+|   |   |-- ktorrent-4.0.5-x86_64-1.txt

+|   |   |-- ktorrent-4.0.5-x86_64-1.txz

+|   |   |-- ktorrent-4.0.5-x86_64-1.txz.asc

+|   |   |-- libktorrent-1.0.5_3-x86_64-1.txt

+|   |   |-- libktorrent-1.0.5_3-x86_64-1.txz

+|   |   |-- libktorrent-1.0.5_3-x86_64-1.txz.asc

 |   |   |-- maketag

 |   |   |-- maketag.ez

-|   |   |-- oxygen-icons-4.4.3-x86_64-1.txt

-|   |   |-- oxygen-icons-4.4.3-x86_64-1.txz

-|   |   |-- oxygen-icons-4.4.3-x86_64-1.txz.asc

-|   |   |-- polkit-kde-1-r1120537-x86_64-1.txt

-|   |   |-- polkit-kde-1-r1120537-x86_64-1.txz

-|   |   |-- polkit-kde-1-r1120537-x86_64-1.txz.asc

-|   |   |-- polkit-qt-1-r1118744-x86_64-1.txt

-|   |   |-- polkit-qt-1-r1118744-x86_64-1.txz

-|   |   |-- polkit-qt-1-r1118744-x86_64-1.txz.asc

-|   |   |-- skanlite-0.4_kde4.4.0-x86_64-1.txt

-|   |   |-- skanlite-0.4_kde4.4.0-x86_64-1.txz

-|   |   |-- skanlite-0.4_kde4.4.0-x86_64-1.txz.asc

+|   |   |-- oxygen-icons-4.5.5-x86_64-1.txt

+|   |   |-- oxygen-icons-4.5.5-x86_64-1.txz

+|   |   |-- oxygen-icons-4.5.5-x86_64-1.txz.asc

+|   |   |-- polkit-kde-1-r1145544-x86_64-2.txt

+|   |   |-- polkit-kde-1-r1145544-x86_64-2.txz

+|   |   |-- polkit-kde-1-r1145544-x86_64-2.txz.asc

+|   |   |-- polkit-qt-1-r1145513-x86_64-2.txt

+|   |   |-- polkit-qt-1-r1145513-x86_64-2.txz

+|   |   |-- polkit-qt-1-r1145513-x86_64-2.txz.asc

+|   |   |-- skanlite-0.7-x86_64-1.txt

+|   |   |-- skanlite-0.7-x86_64-1.txz

+|   |   |-- skanlite-0.7-x86_64-1.txz.asc

 |   |   `-- tagfile

 |   |-- kdei

 |   |   |-- install-packages

 |   |   |-- install.end

-|   |   |-- kde-l10n-ar-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-ar-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-ar-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-bg-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-bg-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-bg-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-ca-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-ca-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-ca-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-ca@valencia-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-ca@valencia-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-ca@valencia-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-cs-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-cs-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-cs-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-csb-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-csb-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-csb-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-da-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-da-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-da-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-de-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-de-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-de-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-el-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-el-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-el-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-en_GB-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-en_GB-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-en_GB-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-eo-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-eo-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-eo-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-es-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-es-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-es-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-et-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-et-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-et-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-eu-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-eu-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-eu-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-fi-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-fi-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-fi-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-fr-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-fr-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-fr-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-fy-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-fy-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-fy-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-ga-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-ga-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-ga-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-gl-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-gl-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-gl-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-gu-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-gu-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-gu-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-he-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-he-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-he-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-hi-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-hi-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-hi-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-hr-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-hr-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-hr-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-hu-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-hu-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-hu-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-id-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-id-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-id-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-is-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-is-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-is-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-it-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-it-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-it-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-ja-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-ja-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-ja-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-kk-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-kk-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-kk-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-km-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-km-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-km-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-kn-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-kn-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-kn-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-ko-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-ko-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-ko-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-lt-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-lt-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-lt-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-lv-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-lv-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-lv-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-mai-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-mai-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-mai-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-mk-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-mk-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-mk-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-ml-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-ml-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-ml-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-nb-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-nb-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-nb-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-nds-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-nds-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-nds-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-nl-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-nl-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-nl-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-nn-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-nn-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-nn-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-pa-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-pa-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-pa-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-pl-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-pl-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-pl-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-pt-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-pt-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-pt-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-pt_BR-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-pt_BR-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-pt_BR-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-ro-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-ro-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-ro-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-ru-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-ru-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-ru-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-si-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-si-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-si-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-sk-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-sk-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-sk-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-sl-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-sl-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-sl-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-sr-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-sr-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-sr-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-sv-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-sv-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-sv-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-tg-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-tg-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-tg-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-tr-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-tr-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-tr-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-uk-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-uk-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-uk-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-wa-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-wa-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-wa-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-zh_CN-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-zh_CN-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-zh_CN-4.4.3-noarch-1.txz.asc

-|   |   |-- kde-l10n-zh_TW-4.4.3-noarch-1.txt

-|   |   |-- kde-l10n-zh_TW-4.4.3-noarch-1.txz

-|   |   |-- kde-l10n-zh_TW-4.4.3-noarch-1.txz.asc

-|   |   |-- koffice-l10n-ca-2.1.2-noarch-1.txt

-|   |   |-- koffice-l10n-ca-2.1.2-noarch-1.txz

-|   |   |-- koffice-l10n-ca-2.1.2-noarch-1.txz.asc

-|   |   |-- koffice-l10n-ca@valencia-2.1.2-noarch-1.txt

-|   |   |-- koffice-l10n-ca@valencia-2.1.2-noarch-1.txz

-|   |   |-- koffice-l10n-ca@valencia-2.1.2-noarch-1.txz.asc

-|   |   |-- koffice-l10n-da-2.1.2-noarch-1.txt

-|   |   |-- koffice-l10n-da-2.1.2-noarch-1.txz

-|   |   |-- koffice-l10n-da-2.1.2-noarch-1.txz.asc

-|   |   |-- koffice-l10n-de-2.1.2-noarch-1.txt

-|   |   |-- koffice-l10n-de-2.1.2-noarch-1.txz

-|   |   |-- koffice-l10n-de-2.1.2-noarch-1.txz.asc

-|   |   |-- koffice-l10n-el-2.1.2-noarch-1.txt

-|   |   |-- koffice-l10n-el-2.1.2-noarch-1.txz

-|   |   |-- koffice-l10n-el-2.1.2-noarch-1.txz.asc

-|   |   |-- koffice-l10n-en_GB-2.1.2-noarch-1.txt

-|   |   |-- koffice-l10n-en_GB-2.1.2-noarch-1.txz

-|   |   |-- koffice-l10n-en_GB-2.1.2-noarch-1.txz.asc

-|   |   |-- koffice-l10n-es-2.1.2-noarch-1.txt

-|   |   |-- koffice-l10n-es-2.1.2-noarch-1.txz

-|   |   |-- koffice-l10n-es-2.1.2-noarch-1.txz.asc

-|   |   |-- koffice-l10n-et-2.1.2-noarch-1.txt

-|   |   |-- koffice-l10n-et-2.1.2-noarch-1.txz

-|   |   |-- koffice-l10n-et-2.1.2-noarch-1.txz.asc

-|   |   |-- koffice-l10n-fr-2.1.2-noarch-1.txt

-|   |   |-- koffice-l10n-fr-2.1.2-noarch-1.txz

-|   |   |-- koffice-l10n-fr-2.1.2-noarch-1.txz.asc

-|   |   |-- koffice-l10n-fy-2.1.2-noarch-1.txt

-|   |   |-- koffice-l10n-fy-2.1.2-noarch-1.txz

-|   |   |-- koffice-l10n-fy-2.1.2-noarch-1.txz.asc

-|   |   |-- koffice-l10n-gl-2.1.2-noarch-1.txt

-|   |   |-- koffice-l10n-gl-2.1.2-noarch-1.txz

-|   |   |-- koffice-l10n-gl-2.1.2-noarch-1.txz.asc

-|   |   |-- koffice-l10n-hne-2.1.2-noarch-1.txt

-|   |   |-- koffice-l10n-hne-2.1.2-noarch-1.txz

-|   |   |-- koffice-l10n-hne-2.1.2-noarch-1.txz.asc

-|   |   |-- koffice-l10n-it-2.1.2-noarch-1.txt

-|   |   |-- koffice-l10n-it-2.1.2-noarch-1.txz

-|   |   |-- koffice-l10n-it-2.1.2-noarch-1.txz.asc

-|   |   |-- koffice-l10n-ja-2.1.2-noarch-1.txt

-|   |   |-- koffice-l10n-ja-2.1.2-noarch-1.txz

-|   |   |-- koffice-l10n-ja-2.1.2-noarch-1.txz.asc

-|   |   |-- koffice-l10n-kk-2.1.2-noarch-1.txt

-|   |   |-- koffice-l10n-kk-2.1.2-noarch-1.txz

-|   |   |-- koffice-l10n-kk-2.1.2-noarch-1.txz.asc

-|   |   |-- koffice-l10n-nb-2.1.2-noarch-1.txt

-|   |   |-- koffice-l10n-nb-2.1.2-noarch-1.txz

-|   |   |-- koffice-l10n-nb-2.1.2-noarch-1.txz.asc

-|   |   |-- koffice-l10n-nds-2.1.2-noarch-1.txt

-|   |   |-- koffice-l10n-nds-2.1.2-noarch-1.txz

-|   |   |-- koffice-l10n-nds-2.1.2-noarch-1.txz.asc

-|   |   |-- koffice-l10n-nl-2.1.2-noarch-1.txt

-|   |   |-- koffice-l10n-nl-2.1.2-noarch-1.txz

-|   |   |-- koffice-l10n-nl-2.1.2-noarch-1.txz.asc

-|   |   |-- koffice-l10n-pl-2.1.2-noarch-1.txt

-|   |   |-- koffice-l10n-pl-2.1.2-noarch-1.txz

-|   |   |-- koffice-l10n-pl-2.1.2-noarch-1.txz.asc

-|   |   |-- koffice-l10n-pt-2.1.2-noarch-1.txt

-|   |   |-- koffice-l10n-pt-2.1.2-noarch-1.txz

-|   |   |-- koffice-l10n-pt-2.1.2-noarch-1.txz.asc

-|   |   |-- koffice-l10n-pt_BR-2.1.2-noarch-1.txt

-|   |   |-- koffice-l10n-pt_BR-2.1.2-noarch-1.txz

-|   |   |-- koffice-l10n-pt_BR-2.1.2-noarch-1.txz.asc

-|   |   |-- koffice-l10n-sv-2.1.2-noarch-1.txt

-|   |   |-- koffice-l10n-sv-2.1.2-noarch-1.txz

-|   |   |-- koffice-l10n-sv-2.1.2-noarch-1.txz.asc

-|   |   |-- koffice-l10n-tr-2.1.2-noarch-1.txt

-|   |   |-- koffice-l10n-tr-2.1.2-noarch-1.txz

-|   |   |-- koffice-l10n-tr-2.1.2-noarch-1.txz.asc

-|   |   |-- koffice-l10n-uk-2.1.2-noarch-1.txt

-|   |   |-- koffice-l10n-uk-2.1.2-noarch-1.txz

-|   |   |-- koffice-l10n-uk-2.1.2-noarch-1.txz.asc

-|   |   |-- koffice-l10n-wa-2.1.2-noarch-1.txt

-|   |   |-- koffice-l10n-wa-2.1.2-noarch-1.txz

-|   |   |-- koffice-l10n-wa-2.1.2-noarch-1.txz.asc

-|   |   |-- koffice-l10n-zh_CN-2.1.2-noarch-1.txt

-|   |   |-- koffice-l10n-zh_CN-2.1.2-noarch-1.txz

-|   |   |-- koffice-l10n-zh_CN-2.1.2-noarch-1.txz.asc

-|   |   |-- koffice-l10n-zh_TW-2.1.2-noarch-1.txt

-|   |   |-- koffice-l10n-zh_TW-2.1.2-noarch-1.txz

-|   |   |-- koffice-l10n-zh_TW-2.1.2-noarch-1.txz.asc

+|   |   |-- kde-l10n-ar-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-ar-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-ar-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-bg-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-bg-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-bg-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-ca-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-ca-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-ca-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-ca@valencia-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-ca@valencia-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-ca@valencia-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-cs-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-cs-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-cs-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-da-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-da-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-da-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-de-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-de-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-de-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-el-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-el-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-el-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-en_GB-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-en_GB-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-en_GB-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-eo-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-eo-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-eo-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-es-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-es-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-es-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-et-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-et-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-et-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-eu-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-eu-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-eu-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-fi-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-fi-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-fi-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-fr-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-fr-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-fr-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-fy-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-fy-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-fy-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-ga-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-ga-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-ga-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-gl-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-gl-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-gl-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-gu-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-gu-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-gu-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-he-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-he-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-he-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-hi-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-hi-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-hi-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-hr-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-hr-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-hr-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-hu-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-hu-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-hu-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-ia-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-ia-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-ia-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-id-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-id-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-id-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-is-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-is-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-is-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-it-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-it-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-it-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-ja-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-ja-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-ja-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-kk-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-kk-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-kk-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-km-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-km-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-km-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-kn-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-kn-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-kn-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-ko-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-ko-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-ko-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-lt-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-lt-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-lt-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-lv-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-lv-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-lv-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-ml-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-ml-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-ml-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-nb-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-nb-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-nb-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-nds-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-nds-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-nds-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-nl-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-nl-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-nl-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-nn-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-nn-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-nn-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-pa-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-pa-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-pa-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-pl-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-pl-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-pl-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-pt-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-pt-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-pt-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-pt_BR-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-pt_BR-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-pt_BR-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-ro-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-ro-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-ro-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-ru-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-ru-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-ru-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-sk-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-sk-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-sk-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-sl-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-sl-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-sl-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-sr-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-sr-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-sr-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-sv-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-sv-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-sv-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-th-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-th-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-th-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-tr-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-tr-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-tr-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-uk-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-uk-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-uk-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-wa-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-wa-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-wa-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-zh_CN-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-zh_CN-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-zh_CN-4.5.5-noarch-3.txz.asc

+|   |   |-- kde-l10n-zh_TW-4.5.5-noarch-3.txt

+|   |   |-- kde-l10n-zh_TW-4.5.5-noarch-3.txz

+|   |   |-- kde-l10n-zh_TW-4.5.5-noarch-3.txz.asc

+|   |   |-- koffice-l10n-ca-2.3.2-noarch-1.txt

+|   |   |-- koffice-l10n-ca-2.3.2-noarch-1.txz

+|   |   |-- koffice-l10n-ca-2.3.2-noarch-1.txz.asc

+|   |   |-- koffice-l10n-ca@valencia-2.3.2-noarch-1.txt

+|   |   |-- koffice-l10n-ca@valencia-2.3.2-noarch-1.txz

+|   |   |-- koffice-l10n-ca@valencia-2.3.2-noarch-1.txz.asc

+|   |   |-- koffice-l10n-da-2.3.2-noarch-1.txt

+|   |   |-- koffice-l10n-da-2.3.2-noarch-1.txz

+|   |   |-- koffice-l10n-da-2.3.2-noarch-1.txz.asc

+|   |   |-- koffice-l10n-de-2.3.2-noarch-1.txt

+|   |   |-- koffice-l10n-de-2.3.2-noarch-1.txz

+|   |   |-- koffice-l10n-de-2.3.2-noarch-1.txz.asc

+|   |   |-- koffice-l10n-el-2.3.2-noarch-1.txt

+|   |   |-- koffice-l10n-el-2.3.2-noarch-1.txz

+|   |   |-- koffice-l10n-el-2.3.2-noarch-1.txz.asc

+|   |   |-- koffice-l10n-en_GB-2.3.2-noarch-1.txt

+|   |   |-- koffice-l10n-en_GB-2.3.2-noarch-1.txz

+|   |   |-- koffice-l10n-en_GB-2.3.2-noarch-1.txz.asc

+|   |   |-- koffice-l10n-es-2.3.2-noarch-1.txt

+|   |   |-- koffice-l10n-es-2.3.2-noarch-1.txz

+|   |   |-- koffice-l10n-es-2.3.2-noarch-1.txz.asc

+|   |   |-- koffice-l10n-et-2.3.2-noarch-1.txt

+|   |   |-- koffice-l10n-et-2.3.2-noarch-1.txz

+|   |   |-- koffice-l10n-et-2.3.2-noarch-1.txz.asc

+|   |   |-- koffice-l10n-fr-2.3.2-noarch-1.txt

+|   |   |-- koffice-l10n-fr-2.3.2-noarch-1.txz

+|   |   |-- koffice-l10n-fr-2.3.2-noarch-1.txz.asc

+|   |   |-- koffice-l10n-gl-2.3.2-noarch-1.txt

+|   |   |-- koffice-l10n-gl-2.3.2-noarch-1.txz

+|   |   |-- koffice-l10n-gl-2.3.2-noarch-1.txz.asc

+|   |   |-- koffice-l10n-hu-2.3.2-noarch-1.txt

+|   |   |-- koffice-l10n-hu-2.3.2-noarch-1.txz

+|   |   |-- koffice-l10n-hu-2.3.2-noarch-1.txz.asc

+|   |   |-- koffice-l10n-it-2.3.2-noarch-1.txt

+|   |   |-- koffice-l10n-it-2.3.2-noarch-1.txz

+|   |   |-- koffice-l10n-it-2.3.2-noarch-1.txz.asc

+|   |   |-- koffice-l10n-ja-2.3.2-noarch-1.txt

+|   |   |-- koffice-l10n-ja-2.3.2-noarch-1.txz

+|   |   |-- koffice-l10n-ja-2.3.2-noarch-1.txz.asc

+|   |   |-- koffice-l10n-kk-2.3.2-noarch-1.txt

+|   |   |-- koffice-l10n-kk-2.3.2-noarch-1.txz

+|   |   |-- koffice-l10n-kk-2.3.2-noarch-1.txz.asc

+|   |   |-- koffice-l10n-nb-2.3.2-noarch-1.txt

+|   |   |-- koffice-l10n-nb-2.3.2-noarch-1.txz

+|   |   |-- koffice-l10n-nb-2.3.2-noarch-1.txz.asc

+|   |   |-- koffice-l10n-nds-2.3.2-noarch-1.txt

+|   |   |-- koffice-l10n-nds-2.3.2-noarch-1.txz

+|   |   |-- koffice-l10n-nds-2.3.2-noarch-1.txz.asc

+|   |   |-- koffice-l10n-nl-2.3.2-noarch-1.txt

+|   |   |-- koffice-l10n-nl-2.3.2-noarch-1.txz

+|   |   |-- koffice-l10n-nl-2.3.2-noarch-1.txz.asc

+|   |   |-- koffice-l10n-pl-2.3.2-noarch-1.txt

+|   |   |-- koffice-l10n-pl-2.3.2-noarch-1.txz

+|   |   |-- koffice-l10n-pl-2.3.2-noarch-1.txz.asc

+|   |   |-- koffice-l10n-pt-2.3.2-noarch-1.txt

+|   |   |-- koffice-l10n-pt-2.3.2-noarch-1.txz

+|   |   |-- koffice-l10n-pt-2.3.2-noarch-1.txz.asc

+|   |   |-- koffice-l10n-pt_BR-2.3.2-noarch-1.txt

+|   |   |-- koffice-l10n-pt_BR-2.3.2-noarch-1.txz

+|   |   |-- koffice-l10n-pt_BR-2.3.2-noarch-1.txz.asc

+|   |   |-- koffice-l10n-ru-2.3.2-noarch-1.txt

+|   |   |-- koffice-l10n-ru-2.3.2-noarch-1.txz

+|   |   |-- koffice-l10n-ru-2.3.2-noarch-1.txz.asc

+|   |   |-- koffice-l10n-sv-2.3.2-noarch-1.txt

+|   |   |-- koffice-l10n-sv-2.3.2-noarch-1.txz

+|   |   |-- koffice-l10n-sv-2.3.2-noarch-1.txz.asc

+|   |   |-- koffice-l10n-tr-2.3.2-noarch-1.txt

+|   |   |-- koffice-l10n-tr-2.3.2-noarch-1.txz

+|   |   |-- koffice-l10n-tr-2.3.2-noarch-1.txz.asc

+|   |   |-- koffice-l10n-uk-2.3.2-noarch-1.txt

+|   |   |-- koffice-l10n-uk-2.3.2-noarch-1.txz

+|   |   |-- koffice-l10n-uk-2.3.2-noarch-1.txz.asc

+|   |   |-- koffice-l10n-wa-2.3.2-noarch-1.txt

+|   |   |-- koffice-l10n-wa-2.3.2-noarch-1.txz

+|   |   |-- koffice-l10n-wa-2.3.2-noarch-1.txz.asc

+|   |   |-- koffice-l10n-zh_CN-2.3.2-noarch-1.txt

+|   |   |-- koffice-l10n-zh_CN-2.3.2-noarch-1.txz

+|   |   |-- koffice-l10n-zh_CN-2.3.2-noarch-1.txz.asc

+|   |   |-- koffice-l10n-zh_TW-2.3.2-noarch-1.txt

+|   |   |-- koffice-l10n-zh_TW-2.3.2-noarch-1.txz

+|   |   |-- koffice-l10n-zh_TW-2.3.2-noarch-1.txz.asc

 |   |   |-- maketag

 |   |   |-- maketag.ez

 |   |   `-- tagfile

 |   |-- l

-|   |   |-- ConsoleKit-20100129-x86_64-1.txt

-|   |   |-- ConsoleKit-20100129-x86_64-1.txz

-|   |   |-- ConsoleKit-20100129-x86_64-1.txz.asc

-|   |   |-- M2Crypto-0.19.1-x86_64-2.txt

-|   |   |-- M2Crypto-0.19.1-x86_64-2.txz

-|   |   |-- M2Crypto-0.19.1-x86_64-2.txz.asc

-|   |   |-- PyQt-4.7.3-x86_64-1.txt

-|   |   |-- PyQt-4.7.3-x86_64-1.txz

-|   |   |-- PyQt-4.7.3-x86_64-1.txz.asc

-|   |   |-- QScintilla-2.4.3-x86_64-1.txt

-|   |   |-- QScintilla-2.4.3-x86_64-1.txz

-|   |   |-- QScintilla-2.4.3-x86_64-1.txz.asc

-|   |   |-- aalib-1.4rc5-x86_64-2.txt

-|   |   |-- aalib-1.4rc5-x86_64-2.txz

-|   |   |-- aalib-1.4rc5-x86_64-2.txz.asc

-|   |   |-- akonadi-1.3.1-x86_64-1.txt

-|   |   |-- akonadi-1.3.1-x86_64-1.txz

-|   |   |-- akonadi-1.3.1-x86_64-1.txz.asc

-|   |   |-- alsa-lib-1.0.23-x86_64-1.txt

-|   |   |-- alsa-lib-1.0.23-x86_64-1.txz

-|   |   |-- alsa-lib-1.0.23-x86_64-1.txz.asc

+|   |   |-- ConsoleKit-0.4.3-x86_64-1.txt

+|   |   |-- ConsoleKit-0.4.3-x86_64-1.txz

+|   |   |-- ConsoleKit-0.4.3-x86_64-1.txz.asc

+|   |   |-- M2Crypto-0.20.2-x86_64-1.txt

+|   |   |-- M2Crypto-0.20.2-x86_64-1.txz

+|   |   |-- M2Crypto-0.20.2-x86_64-1.txz.asc

+|   |   |-- PyQt-4.8.1-x86_64-1.txt

+|   |   |-- PyQt-4.8.1-x86_64-1.txz

+|   |   |-- PyQt-4.8.1-x86_64-1.txz.asc

+|   |   |-- QScintilla-2.4.5-x86_64-2.txt

+|   |   |-- QScintilla-2.4.5-x86_64-2.txz

+|   |   |-- QScintilla-2.4.5-x86_64-2.txz.asc

+|   |   |-- aalib-1.4rc5-x86_64-3.txt

+|   |   |-- aalib-1.4rc5-x86_64-3.txz

+|   |   |-- aalib-1.4rc5-x86_64-3.txz.asc

+|   |   |-- akonadi-1.4.1-x86_64-3.txt

+|   |   |-- akonadi-1.4.1-x86_64-3.txz

+|   |   |-- akonadi-1.4.1-x86_64-3.txz.asc

+|   |   |-- alsa-lib-1.0.24.1-x86_64-1.txt

+|   |   |-- alsa-lib-1.0.24.1-x86_64-1.txz

+|   |   |-- alsa-lib-1.0.24.1-x86_64-1.txz.asc

 |   |   |-- alsa-oss-1.0.17-x86_64-1.txt

 |   |   |-- alsa-oss-1.0.17-x86_64-1.txz

 |   |   |-- alsa-oss-1.0.17-x86_64-1.txz.asc

-|   |   |-- apr-1.3.9-x86_64-1.txt

-|   |   |-- apr-1.3.9-x86_64-1.txz

-|   |   |-- apr-1.3.9-x86_64-1.txz.asc

-|   |   |-- apr-util-1.3.9-x86_64-2.txt

-|   |   |-- apr-util-1.3.9-x86_64-2.txz

-|   |   |-- apr-util-1.3.9-x86_64-2.txz.asc

-|   |   |-- aspell-0.60.5-x86_64-2.txt

-|   |   |-- aspell-0.60.5-x86_64-2.txz

-|   |   |-- aspell-0.60.5-x86_64-2.txz.asc

+|   |   |-- apr-1.4.2-x86_64-2.txt

+|   |   |-- apr-1.4.2-x86_64-2.txz

+|   |   |-- apr-1.4.2-x86_64-2.txz.asc

+|   |   |-- apr-util-1.3.10-x86_64-1.txt

+|   |   |-- apr-util-1.3.10-x86_64-1.txz

+|   |   |-- apr-util-1.3.10-x86_64-1.txz.asc

+|   |   |-- aspell-0.60.6-x86_64-1.txt

+|   |   |-- aspell-0.60.6-x86_64-1.txz

+|   |   |-- aspell-0.60.6-x86_64-1.txz.asc

 |   |   |-- aspell-en-6.0_0-noarch-4.txt

 |   |   |-- aspell-en-6.0_0-noarch-4.txz

 |   |   |-- aspell-en-6.0_0-noarch-4.txz.asc

-|   |   |-- atk-1.30.0-x86_64-1.txt

-|   |   |-- atk-1.30.0-x86_64-1.txz

-|   |   |-- atk-1.30.0-x86_64-1.txz.asc

-|   |   |-- attica-0.1.3-x86_64-1.txt

-|   |   |-- attica-0.1.3-x86_64-1.txz

-|   |   |-- attica-0.1.3-x86_64-1.txz.asc

-|   |   |-- audiofile-0.2.6-x86_64-2.txt

-|   |   |-- audiofile-0.2.6-x86_64-2.txz

-|   |   |-- audiofile-0.2.6-x86_64-2.txz.asc

+|   |   |-- atk-1.32.0-x86_64-1.txt

+|   |   |-- atk-1.32.0-x86_64-1.txz

+|   |   |-- atk-1.32.0-x86_64-1.txz.asc

+|   |   |-- attica-0.1.4-x86_64-1.txt

+|   |   |-- attica-0.1.4-x86_64-1.txz

+|   |   |-- attica-0.1.4-x86_64-1.txz.asc

+|   |   |-- audiofile-0.2.7-x86_64-1.txt

+|   |   |-- audiofile-0.2.7-x86_64-1.txz

+|   |   |-- audiofile-0.2.7-x86_64-1.txz.asc

 |   |   |-- automoc4-0.9.88-x86_64-1.txt

 |   |   |-- automoc4-0.9.88-x86_64-1.txz

 |   |   |-- automoc4-0.9.88-x86_64-1.txz.asc

-|   |   |-- babl-0.1.0-x86_64-1.txt

-|   |   |-- babl-0.1.0-x86_64-1.txz

-|   |   |-- babl-0.1.0-x86_64-1.txz.asc

-|   |   |-- boost-1.42.0-x86_64-1.txt

-|   |   |-- boost-1.42.0-x86_64-1.txz

-|   |   |-- boost-1.42.0-x86_64-1.txz.asc

-|   |   |-- cairo-1.8.8-x86_64-3.txt

-|   |   |-- cairo-1.8.8-x86_64-3.txz

-|   |   |-- cairo-1.8.8-x86_64-3.txz.asc

-|   |   |-- chmlib-0.39-x86_64-1.txt

-|   |   |-- chmlib-0.39-x86_64-1.txz

-|   |   |-- chmlib-0.39-x86_64-1.txz.asc

+|   |   |-- babl-0.1.2-x86_64-1.txt

+|   |   |-- babl-0.1.2-x86_64-1.txz

+|   |   |-- babl-0.1.2-x86_64-1.txz.asc

+|   |   |-- boost-1.45.0-x86_64-1.txt

+|   |   |-- boost-1.45.0-x86_64-1.txz

+|   |   |-- boost-1.45.0-x86_64-1.txz.asc

+|   |   |-- cairo-1.10.2-x86_64-2.txt

+|   |   |-- cairo-1.10.2-x86_64-2.txz

+|   |   |-- cairo-1.10.2-x86_64-2.txz.asc

+|   |   |-- chmlib-0.40-x86_64-2.txt

+|   |   |-- chmlib-0.40-x86_64-2.txz

+|   |   |-- chmlib-0.40-x86_64-2.txz.asc

 |   |   |-- clucene-0.9.21b-x86_64-1.txt

 |   |   |-- clucene-0.9.21b-x86_64-1.txz

 |   |   |-- clucene-0.9.21b-x86_64-1.txz.asc

@@ -1773,24 +1836,21 @@ see additional documentation files.
 |   |   |-- db44-4.4.20-x86_64-2.txt

 |   |   |-- db44-4.4.20-x86_64-2.txz

 |   |   |-- db44-4.4.20-x86_64-2.txz.asc

-|   |   |-- dbus-glib-0.86-x86_64-1.txt

-|   |   |-- dbus-glib-0.86-x86_64-1.txz

-|   |   |-- dbus-glib-0.86-x86_64-1.txz.asc

+|   |   |-- dbus-glib-0.88-x86_64-1.txt

+|   |   |-- dbus-glib-0.88-x86_64-1.txz

+|   |   |-- dbus-glib-0.88-x86_64-1.txz.asc

 |   |   |-- dbus-python-0.83.1-x86_64-1.txt

 |   |   |-- dbus-python-0.83.1-x86_64-1.txz

 |   |   |-- dbus-python-0.83.1-x86_64-1.txz.asc

 |   |   |-- desktop-file-utils-0.16-x86_64-2.txt

 |   |   |-- desktop-file-utils-0.16-x86_64-2.txz

 |   |   |-- desktop-file-utils-0.16-x86_64-2.txz.asc

-|   |   |-- djvulibre-3.5.22-x86_64-2.txt

-|   |   |-- djvulibre-3.5.22-x86_64-2.txz

-|   |   |-- djvulibre-3.5.22-x86_64-2.txz.asc

+|   |   |-- djvulibre-3.5.24-x86_64-1.txt

+|   |   |-- djvulibre-3.5.24-x86_64-1.txz

+|   |   |-- djvulibre-3.5.24-x86_64-1.txz.asc

 |   |   |-- ebook-tools-0.1.1-x86_64-2.txt

 |   |   |-- ebook-tools-0.1.1-x86_64-2.txz

 |   |   |-- ebook-tools-0.1.1-x86_64-2.txz.asc

-|   |   |-- eggdbus-0.6-x86_64-1.txt

-|   |   |-- eggdbus-0.6-x86_64-1.txz

-|   |   |-- eggdbus-0.6-x86_64-1.txz.asc

 |   |   |-- eigen2-2.0.10-x86_64-1.txt

 |   |   |-- eigen2-2.0.10-x86_64-1.txz

 |   |   |-- eigen2-2.0.10-x86_64-1.txz.asc

@@ -1800,54 +1860,57 @@ see additional documentation files.
 |   |   |-- esound-0.2.41-x86_64-1.txt

 |   |   |-- esound-0.2.41-x86_64-1.txz

 |   |   |-- esound-0.2.41-x86_64-1.txz.asc

-|   |   |-- exiv2-0.18.2-x86_64-1.txt

-|   |   |-- exiv2-0.18.2-x86_64-1.txz

-|   |   |-- exiv2-0.18.2-x86_64-1.txz.asc

-|   |   |-- expat-2.0.1-x86_64-1.txt

-|   |   |-- expat-2.0.1-x86_64-1.txz

-|   |   |-- expat-2.0.1-x86_64-1.txz.asc

+|   |   |-- exiv2-0.21.1-x86_64-1.txt

+|   |   |-- exiv2-0.21.1-x86_64-1.txz

+|   |   |-- exiv2-0.21.1-x86_64-1.txz.asc

+|   |   |-- expat-2.0.1-x86_64-2.txt

+|   |   |-- expat-2.0.1-x86_64-2.txz

+|   |   |-- expat-2.0.1-x86_64-2.txz.asc

 |   |   |-- fftw-3.2.2-x86_64-1.txt

 |   |   |-- fftw-3.2.2-x86_64-1.txz

 |   |   |-- fftw-3.2.2-x86_64-1.txz.asc

-|   |   |-- freetype-2.3.12-x86_64-1.txt

-|   |   |-- freetype-2.3.12-x86_64-1.txz

-|   |   |-- freetype-2.3.12-x86_64-1.txz.asc

+|   |   |-- freetype-2.4.4-x86_64-1.txt

+|   |   |-- freetype-2.4.4-x86_64-1.txz

+|   |   |-- freetype-2.4.4-x86_64-1.txz.asc

 |   |   |-- fribidi-0.10.9-x86_64-2.txt

 |   |   |-- fribidi-0.10.9-x86_64-2.txz

 |   |   |-- fribidi-0.10.9-x86_64-2.txz.asc

-|   |   |-- fuse-2.8.1-x86_64-1.txt

-|   |   |-- fuse-2.8.1-x86_64-1.txz

-|   |   |-- fuse-2.8.1-x86_64-1.txz.asc

-|   |   |-- gamin-0.1.10-x86_64-2.txt

-|   |   |-- gamin-0.1.10-x86_64-2.txz

-|   |   |-- gamin-0.1.10-x86_64-2.txz.asc

+|   |   |-- fuse-2.8.5-x86_64-1.txt

+|   |   |-- fuse-2.8.5-x86_64-1.txz

+|   |   |-- fuse-2.8.5-x86_64-1.txz.asc

+|   |   |-- gamin-0.1.10-x86_64-3.txt

+|   |   |-- gamin-0.1.10-x86_64-3.txz

+|   |   |-- gamin-0.1.10-x86_64-3.txz.asc

 |   |   |-- gd-2.0.35-x86_64-4.txt

 |   |   |-- gd-2.0.35-x86_64-4.txz

 |   |   |-- gd-2.0.35-x86_64-4.txz.asc

 |   |   |-- gdbm-1.8.3-x86_64-4.txt

 |   |   |-- gdbm-1.8.3-x86_64-4.txz

 |   |   |-- gdbm-1.8.3-x86_64-4.txz.asc

-|   |   |-- gegl-0.1.0-x86_64-2.txt

-|   |   |-- gegl-0.1.0-x86_64-2.txz

-|   |   |-- gegl-0.1.0-x86_64-2.txz.asc

+|   |   |-- gdk-pixbuf2-2.23.3-x86_64-1.txt

+|   |   |-- gdk-pixbuf2-2.23.3-x86_64-1.txz

+|   |   |-- gdk-pixbuf2-2.23.3-x86_64-1.txz.asc

+|   |   |-- gegl-0.1.2-x86_64-1.txt

+|   |   |-- gegl-0.1.2-x86_64-1.txz

+|   |   |-- gegl-0.1.2-x86_64-1.txz.asc

 |   |   |-- giflib-4.1.6-x86_64-1.txt

 |   |   |-- giflib-4.1.6-x86_64-1.txz

 |   |   |-- giflib-4.1.6-x86_64-1.txz.asc

 |   |   |-- glib-1.2.10-x86_64-3.txt

 |   |   |-- glib-1.2.10-x86_64-3.txz

 |   |   |-- glib-1.2.10-x86_64-3.txz.asc

-|   |   |-- glib2-2.22.5-x86_64-1.txt

-|   |   |-- glib2-2.22.5-x86_64-1.txz

-|   |   |-- glib2-2.22.5-x86_64-1.txz.asc

-|   |   |-- glibc-2.11.1-x86_64-3.txt

-|   |   |-- glibc-2.11.1-x86_64-3.txz

-|   |   |-- glibc-2.11.1-x86_64-3.txz.asc

-|   |   |-- glibc-i18n-2.11.1-x86_64-3.txt

-|   |   |-- glibc-i18n-2.11.1-x86_64-3.txz

-|   |   |-- glibc-i18n-2.11.1-x86_64-3.txz.asc

-|   |   |-- glibc-profile-2.11.1-x86_64-3.txt

-|   |   |-- glibc-profile-2.11.1-x86_64-3.txz

-|   |   |-- glibc-profile-2.11.1-x86_64-3.txz.asc

+|   |   |-- glib2-2.28.6-x86_64-1.txt

+|   |   |-- glib2-2.28.6-x86_64-1.txz

+|   |   |-- glib2-2.28.6-x86_64-1.txz.asc

+|   |   |-- glibc-2.13-x86_64-4.txt

+|   |   |-- glibc-2.13-x86_64-4.txz

+|   |   |-- glibc-2.13-x86_64-4.txz.asc

+|   |   |-- glibc-i18n-2.13-x86_64-4.txt

+|   |   |-- glibc-i18n-2.13-x86_64-4.txz

+|   |   |-- glibc-i18n-2.13-x86_64-4.txz.asc

+|   |   |-- glibc-profile-2.13-x86_64-4.txt

+|   |   |-- glibc-profile-2.13-x86_64-4.txz

+|   |   |-- glibc-profile-2.13-x86_64-4.txz.asc

 |   |   |-- gmime-2.4.15-x86_64-1.txt

 |   |   |-- gmime-2.4.15-x86_64-1.txz

 |   |   |-- gmime-2.4.15-x86_64-1.txz.asc

@@ -1857,30 +1920,30 @@ see additional documentation files.
 |   |   |-- gmp-5.0.1-x86_64-1.txt

 |   |   |-- gmp-5.0.1-x86_64-1.txz

 |   |   |-- gmp-5.0.1-x86_64-1.txz.asc

-|   |   |-- gnome-icon-theme-2.30.2-x86_64-1.txt

-|   |   |-- gnome-icon-theme-2.30.2-x86_64-1.txz

-|   |   |-- gnome-icon-theme-2.30.2-x86_64-1.txz.asc

-|   |   |-- gst-plugins-base-0.10.29-x86_64-1.txt

-|   |   |-- gst-plugins-base-0.10.29-x86_64-1.txz

-|   |   |-- gst-plugins-base-0.10.29-x86_64-1.txz.asc

-|   |   |-- gst-plugins-good-0.10.22-x86_64-1.txt

-|   |   |-- gst-plugins-good-0.10.22-x86_64-1.txz

-|   |   |-- gst-plugins-good-0.10.22-x86_64-1.txz.asc

-|   |   |-- gstreamer-0.10.29-x86_64-1.txt

-|   |   |-- gstreamer-0.10.29-x86_64-1.txz

-|   |   |-- gstreamer-0.10.29-x86_64-1.txz.asc

+|   |   |-- gnome-icon-theme-2.31.0-x86_64-1.txt

+|   |   |-- gnome-icon-theme-2.31.0-x86_64-1.txz

+|   |   |-- gnome-icon-theme-2.31.0-x86_64-1.txz.asc

+|   |   |-- gst-plugins-base-0.10.32-x86_64-1.txt

+|   |   |-- gst-plugins-base-0.10.32-x86_64-1.txz

+|   |   |-- gst-plugins-base-0.10.32-x86_64-1.txz.asc

+|   |   |-- gst-plugins-good-0.10.28-x86_64-2.txt

+|   |   |-- gst-plugins-good-0.10.28-x86_64-2.txz

+|   |   |-- gst-plugins-good-0.10.28-x86_64-2.txz.asc

+|   |   |-- gstreamer-0.10.32-x86_64-1.txt

+|   |   |-- gstreamer-0.10.32-x86_64-1.txz

+|   |   |-- gstreamer-0.10.32-x86_64-1.txz.asc

 |   |   |-- gtk+-1.2.10-x86_64-5.txt

 |   |   |-- gtk+-1.2.10-x86_64-5.txz

 |   |   |-- gtk+-1.2.10-x86_64-5.txz.asc

-|   |   |-- gtk+2-2.18.9-x86_64-1.txt

-|   |   |-- gtk+2-2.18.9-x86_64-1.txz

-|   |   |-- gtk+2-2.18.9-x86_64-1.txz.asc

-|   |   |-- gtkspell-2.0.15-x86_64-1.txt

-|   |   |-- gtkspell-2.0.15-x86_64-1.txz

-|   |   |-- gtkspell-2.0.15-x86_64-1.txz.asc

-|   |   |-- hal-0.5.14-x86_64-2.txt

-|   |   |-- hal-0.5.14-x86_64-2.txz

-|   |   |-- hal-0.5.14-x86_64-2.txz.asc

+|   |   |-- gtk+2-2.24.4-x86_64-1.txt

+|   |   |-- gtk+2-2.24.4-x86_64-1.txz

+|   |   |-- gtk+2-2.24.4-x86_64-1.txz.asc

+|   |   |-- gtkspell-2.0.16-x86_64-1.txt

+|   |   |-- gtkspell-2.0.16-x86_64-1.txz

+|   |   |-- gtkspell-2.0.16-x86_64-1.txz.asc

+|   |   |-- hal-0.5.14-x86_64-3.txt

+|   |   |-- hal-0.5.14-x86_64-3.txz

+|   |   |-- hal-0.5.14-x86_64-3.txz.asc

 |   |   |-- hal-info-20091130-noarch-1.txt

 |   |   |-- hal-info-20091130-noarch-1.txz

 |   |   |-- hal-info-20091130-noarch-1.txz.asc

@@ -1893,23 +1956,23 @@ see additional documentation files.
 |   |   |-- icon-naming-utils-0.8.90-x86_64-2.txt

 |   |   |-- icon-naming-utils-0.8.90-x86_64-2.txz

 |   |   |-- icon-naming-utils-0.8.90-x86_64-2.txz.asc

-|   |   |-- ilmbase-1.0.1-x86_64-1.txt

-|   |   |-- ilmbase-1.0.1-x86_64-1.txz

-|   |   |-- ilmbase-1.0.1-x86_64-1.txz.asc

-|   |   |-- imlib-1.9.15-x86_64-6.txt

-|   |   |-- imlib-1.9.15-x86_64-6.txz

-|   |   |-- imlib-1.9.15-x86_64-6.txz.asc

+|   |   |-- ilmbase-1.0.2-x86_64-1.txt

+|   |   |-- ilmbase-1.0.2-x86_64-1.txz

+|   |   |-- ilmbase-1.0.2-x86_64-1.txz.asc

+|   |   |-- imlib-1.9.15-x86_64-7.txt

+|   |   |-- imlib-1.9.15-x86_64-7.txz

+|   |   |-- imlib-1.9.15-x86_64-7.txz.asc

 |   |   |-- install-packages

 |   |   |-- install.end

-|   |   |-- iso-codes-3.8-noarch-1.txt

-|   |   |-- iso-codes-3.8-noarch-1.txz

-|   |   |-- iso-codes-3.8-noarch-1.txz.asc

+|   |   |-- iso-codes-3.24.2-noarch-1.txt

+|   |   |-- iso-codes-3.24.2-noarch-1.txz

+|   |   |-- iso-codes-3.24.2-noarch-1.txz.asc

 |   |   |-- jasper-1.900.1-x86_64-3.txt

 |   |   |-- jasper-1.900.1-x86_64-3.txz

 |   |   |-- jasper-1.900.1-x86_64-3.txz.asc

-|   |   |-- jre-6u20-x86_64-1.txt

-|   |   |-- jre-6u20-x86_64-1.txz

-|   |   |-- jre-6u20-x86_64-1.txz.asc

+|   |   |-- jre-6u25-x86_64-1.txt

+|   |   |-- jre-6u25-x86_64-1.txz

+|   |   |-- jre-6u25-x86_64-1.txz.asc

 |   |   |-- lcms-1.19-x86_64-1.txt

 |   |   |-- lcms-1.19-x86_64-1.txz

 |   |   |-- lcms-1.19-x86_64-1.txz.asc

@@ -1919,60 +1982,66 @@ see additional documentation files.
 |   |   |-- libaio-0.3.109-x86_64-1.txt

 |   |   |-- libaio-0.3.109-x86_64-1.txz

 |   |   |-- libaio-0.3.109-x86_64-1.txz.asc

-|   |   |-- libao-0.8.8-x86_64-1.txt

-|   |   |-- libao-0.8.8-x86_64-1.txz

-|   |   |-- libao-0.8.8-x86_64-1.txz.asc

-|   |   |-- libarchive-2.8.0-x86_64-1.txt

-|   |   |-- libarchive-2.8.0-x86_64-1.txz

-|   |   |-- libarchive-2.8.0-x86_64-1.txz.asc

-|   |   |-- libart_lgpl-2.3.20-x86_64-1.txt

-|   |   |-- libart_lgpl-2.3.20-x86_64-1.txz

-|   |   |-- libart_lgpl-2.3.20-x86_64-1.txz.asc

+|   |   |-- libao-1.1.0-x86_64-1.txt

+|   |   |-- libao-1.1.0-x86_64-1.txz

+|   |   |-- libao-1.1.0-x86_64-1.txz.asc

+|   |   |-- libarchive-2.8.4-x86_64-1.txt

+|   |   |-- libarchive-2.8.4-x86_64-1.txz

+|   |   |-- libarchive-2.8.4-x86_64-1.txz.asc

+|   |   |-- libart_lgpl-2.3.21-x86_64-1.txt

+|   |   |-- libart_lgpl-2.3.21-x86_64-1.txz

+|   |   |-- libart_lgpl-2.3.21-x86_64-1.txz.asc

 |   |   |-- libcaca-0.99.beta16-x86_64-3.txt

 |   |   |-- libcaca-0.99.beta16-x86_64-3.txz

 |   |   |-- libcaca-0.99.beta16-x86_64-3.txz.asc

-|   |   |-- libcap-2.19-x86_64-1.txt

-|   |   |-- libcap-2.19-x86_64-1.txz

-|   |   |-- libcap-2.19-x86_64-1.txz.asc

-|   |   |-- libcddb-1.3.0-x86_64-1.txt

-|   |   |-- libcddb-1.3.0-x86_64-1.txz

-|   |   |-- libcddb-1.3.0-x86_64-1.txz.asc

+|   |   |-- libcap-2.20-x86_64-1.txt

+|   |   |-- libcap-2.20-x86_64-1.txz

+|   |   |-- libcap-2.20-x86_64-1.txz.asc

+|   |   |-- libcddb-1.3.2-x86_64-1.txt

+|   |   |-- libcddb-1.3.2-x86_64-1.txz

+|   |   |-- libcddb-1.3.2-x86_64-1.txz.asc

 |   |   |-- libcdio-0.79-x86_64-1.txt

 |   |   |-- libcdio-0.79-x86_64-1.txz

 |   |   |-- libcdio-0.79-x86_64-1.txz.asc

+|   |   |-- libdbusmenu-qt-0.6.4-x86_64-1.txt

+|   |   |-- libdbusmenu-qt-0.6.4-x86_64-1.txz

+|   |   |-- libdbusmenu-qt-0.6.4-x86_64-1.txz.asc

 |   |   |-- libdiscid-0.2.2-x86_64-1.txt

 |   |   |-- libdiscid-0.2.2-x86_64-1.txz

 |   |   |-- libdiscid-0.2.2-x86_64-1.txz.asc

 |   |   |-- libdvdread-4.1.3-x86_64-1.txt

 |   |   |-- libdvdread-4.1.3-x86_64-1.txz

 |   |   |-- libdvdread-4.1.3-x86_64-1.txz.asc

-|   |   |-- libexif-0.6.19-x86_64-1.txt

-|   |   |-- libexif-0.6.19-x86_64-1.txz

-|   |   |-- libexif-0.6.19-x86_64-1.txz.asc

+|   |   |-- libelf-0.8.13-x86_64-2.txt

+|   |   |-- libelf-0.8.13-x86_64-2.txz

+|   |   |-- libelf-0.8.13-x86_64-2.txz.asc

+|   |   |-- libexif-0.6.20-x86_64-1.txt

+|   |   |-- libexif-0.6.20-x86_64-1.txz

+|   |   |-- libexif-0.6.20-x86_64-1.txz.asc

 |   |   |-- libglade-2.6.4-x86_64-4.txt

 |   |   |-- libglade-2.6.4-x86_64-4.txz

 |   |   |-- libglade-2.6.4-x86_64-4.txz.asc

-|   |   |-- libgphoto2-2.4.9-x86_64-1.txt

-|   |   |-- libgphoto2-2.4.9-x86_64-1.txz

-|   |   |-- libgphoto2-2.4.9-x86_64-1.txz.asc

-|   |   |-- libgpod-0.7.2-x86_64-1.txt

-|   |   |-- libgpod-0.7.2-x86_64-1.txz

-|   |   |-- libgpod-0.7.2-x86_64-1.txz.asc

-|   |   |-- libgsf-1.14.16-x86_64-1.txt

-|   |   |-- libgsf-1.14.16-x86_64-1.txz

-|   |   |-- libgsf-1.14.16-x86_64-1.txz.asc

-|   |   |-- libical-0.43-x86_64-1.txt

-|   |   |-- libical-0.43-x86_64-1.txz

-|   |   |-- libical-0.43-x86_64-1.txz.asc

-|   |   |-- libid3tag-0.15.1b-x86_64-3.txt

-|   |   |-- libid3tag-0.15.1b-x86_64-3.txz

-|   |   |-- libid3tag-0.15.1b-x86_64-3.txz.asc

-|   |   |-- libidl-0.8.10-x86_64-1.txt

-|   |   |-- libidl-0.8.10-x86_64-1.txz

-|   |   |-- libidl-0.8.10-x86_64-1.txz.asc

-|   |   |-- libidn-1.5-x86_64-1.txt

-|   |   |-- libidn-1.5-x86_64-1.txz

-|   |   |-- libidn-1.5-x86_64-1.txz.asc

+|   |   |-- libgphoto2-2.4.10.1-x86_64-1.txt

+|   |   |-- libgphoto2-2.4.10.1-x86_64-1.txz

+|   |   |-- libgphoto2-2.4.10.1-x86_64-1.txz.asc

+|   |   |-- libgpod-0.8.0-x86_64-2.txt

+|   |   |-- libgpod-0.8.0-x86_64-2.txz

+|   |   |-- libgpod-0.8.0-x86_64-2.txz.asc

+|   |   |-- libgsf-1.14.20-x86_64-1.txt

+|   |   |-- libgsf-1.14.20-x86_64-1.txz

+|   |   |-- libgsf-1.14.20-x86_64-1.txz.asc

+|   |   |-- libical-0.44-x86_64-1.txt

+|   |   |-- libical-0.44-x86_64-1.txz

+|   |   |-- libical-0.44-x86_64-1.txz.asc

+|   |   |-- libid3tag-0.15.1b-x86_64-4.txt

+|   |   |-- libid3tag-0.15.1b-x86_64-4.txz

+|   |   |-- libid3tag-0.15.1b-x86_64-4.txz.asc

+|   |   |-- libidl-0.8.14-x86_64-1.txt

+|   |   |-- libidl-0.8.14-x86_64-1.txz

+|   |   |-- libidl-0.8.14-x86_64-1.txz.asc

+|   |   |-- libidn-1.19-x86_64-1.txt

+|   |   |-- libidn-1.19-x86_64-1.txz

+|   |   |-- libidn-1.19-x86_64-1.txz.asc

 |   |   |-- libieee1284-0.2.11-x86_64-2.txt

 |   |   |-- libieee1284-0.2.11-x86_64-2.txz

 |   |   |-- libieee1284-0.2.11-x86_64-2.txz.asc

@@ -1982,75 +2051,90 @@ see additional documentation files.
 |   |   |-- libjpeg-v8a-x86_64-1.txt

 |   |   |-- libjpeg-v8a-x86_64-1.txz

 |   |   |-- libjpeg-v8a-x86_64-1.txz.asc

-|   |   |-- libkarma-0.1.1-x86_64-1.txt

-|   |   |-- libkarma-0.1.1-x86_64-1.txz

-|   |   |-- libkarma-0.1.1-x86_64-1.txz.asc

-|   |   |-- liblastfm-0.3.0-x86_64-2.txt

-|   |   |-- liblastfm-0.3.0-x86_64-2.txz

-|   |   |-- liblastfm-0.3.0-x86_64-2.txz.asc

+|   |   |-- libkarma-0.1.1-x86_64-2.txt

+|   |   |-- libkarma-0.1.1-x86_64-2.txz

+|   |   |-- libkarma-0.1.1-x86_64-2.txz.asc

+|   |   |-- liblastfm-0.3.3_f0b3239-x86_64-1.txt

+|   |   |-- liblastfm-0.3.3_f0b3239-x86_64-1.txz

+|   |   |-- liblastfm-0.3.3_f0b3239-x86_64-1.txz.asc

 |   |   |-- libmad-0.15.1b-x86_64-3.txt

 |   |   |-- libmad-0.15.1b-x86_64-3.txz

 |   |   |-- libmad-0.15.1b-x86_64-3.txz.asc

 |   |   |-- libmcrypt-2.5.8-x86_64-1.txt

 |   |   |-- libmcrypt-2.5.8-x86_64-1.txz

 |   |   |-- libmcrypt-2.5.8-x86_64-1.txz.asc

-|   |   |-- libmcs-0.7.1-x86_64-1.txt

-|   |   |-- libmcs-0.7.1-x86_64-1.txz

-|   |   |-- libmcs-0.7.1-x86_64-1.txz.asc

+|   |   |-- libmcs-0.7.2-x86_64-1.txt

+|   |   |-- libmcs-0.7.2-x86_64-1.txz

+|   |   |-- libmcs-0.7.2-x86_64-1.txz.asc

 |   |   |-- libmng-1.0.10-x86_64-2.txt

 |   |   |-- libmng-1.0.10-x86_64-2.txz

 |   |   |-- libmng-1.0.10-x86_64-2.txz.asc

-|   |   |-- libmowgli-0.6.0-x86_64-1.txt

-|   |   |-- libmowgli-0.6.0-x86_64-1.txz

-|   |   |-- libmowgli-0.6.0-x86_64-1.txz.asc

+|   |   |-- libmowgli-0.7.1-x86_64-1.txt

+|   |   |-- libmowgli-0.7.1-x86_64-1.txz

+|   |   |-- libmowgli-0.7.1-x86_64-1.txz.asc

+|   |   |-- libmpc-0.8.2-x86_64-2.txt

+|   |   |-- libmpc-0.8.2-x86_64-2.txz

+|   |   |-- libmpc-0.8.2-x86_64-2.txz.asc

 |   |   |-- libmsn-4.1-x86_64-1.txt

 |   |   |-- libmsn-4.1-x86_64-1.txz

 |   |   |-- libmsn-4.1-x86_64-1.txz.asc

 |   |   |-- libmtp-1.0.1-x86_64-2.txt

 |   |   |-- libmtp-1.0.1-x86_64-2.txz

 |   |   |-- libmtp-1.0.1-x86_64-2.txz.asc

-|   |   |-- libnjb-2.2.6-x86_64-4.txt

-|   |   |-- libnjb-2.2.6-x86_64-4.txz

-|   |   |-- libnjb-2.2.6-x86_64-4.txz.asc

+|   |   |-- libnjb-2.2.6-x86_64-5.txt

+|   |   |-- libnjb-2.2.6-x86_64-5.txz

+|   |   |-- libnjb-2.2.6-x86_64-5.txz.asc

 |   |   |-- libnl-1.1-x86_64-1.txt

 |   |   |-- libnl-1.1-x86_64-1.txz

 |   |   |-- libnl-1.1-x86_64-1.txz.asc

-|   |   |-- libnotify-0.4.5-x86_64-2.txt

-|   |   |-- libnotify-0.4.5-x86_64-2.txz

-|   |   |-- libnotify-0.4.5-x86_64-2.txz.asc

-|   |   |-- libogg-1.1.4-x86_64-1.txt

-|   |   |-- libogg-1.1.4-x86_64-1.txz

-|   |   |-- libogg-1.1.4-x86_64-1.txz.asc

-|   |   |-- liboil-0.3.16-x86_64-1.txt

-|   |   |-- liboil-0.3.16-x86_64-1.txz

-|   |   |-- liboil-0.3.16-x86_64-1.txz.asc

-|   |   |-- libpng-1.4.2-x86_64-1.txt

-|   |   |-- libpng-1.4.2-x86_64-1.txz

-|   |   |-- libpng-1.4.2-x86_64-1.txz.asc

-|   |   |-- libraw1394-2.0.5-x86_64-1.txt

-|   |   |-- libraw1394-2.0.5-x86_64-1.txz

-|   |   |-- libraw1394-2.0.5-x86_64-1.txz.asc

-|   |   |-- librsvg-2.26.0-x86_64-3.txt

-|   |   |-- librsvg-2.26.0-x86_64-3.txz

-|   |   |-- librsvg-2.26.0-x86_64-3.txz.asc

-|   |   |-- libsamplerate-0.1.7-x86_64-1.txt

-|   |   |-- libsamplerate-0.1.7-x86_64-1.txz

-|   |   |-- libsamplerate-0.1.7-x86_64-1.txz.asc

-|   |   |-- libspectre-0.2.5-x86_64-1.txt

-|   |   |-- libspectre-0.2.5-x86_64-1.txz

-|   |   |-- libspectre-0.2.5-x86_64-1.txz.asc

+|   |   |-- libnotify-0.5.2-x86_64-1.txt

+|   |   |-- libnotify-0.5.2-x86_64-1.txz

+|   |   |-- libnotify-0.5.2-x86_64-1.txz.asc

+|   |   |-- libogg-1.2.2-x86_64-1.txt

+|   |   |-- libogg-1.2.2-x86_64-1.txz

+|   |   |-- libogg-1.2.2-x86_64-1.txz.asc

+|   |   |-- liboggz-1.1.1-x86_64-1.txt

+|   |   |-- liboggz-1.1.1-x86_64-1.txz

+|   |   |-- liboggz-1.1.1-x86_64-1.txz.asc

+|   |   |-- liboil-0.3.17-x86_64-1.txt

+|   |   |-- liboil-0.3.17-x86_64-1.txz

+|   |   |-- liboil-0.3.17-x86_64-1.txz.asc

+|   |   |-- libpcap-1.1.1-x86_64-1.txt

+|   |   |-- libpcap-1.1.1-x86_64-1.txz

+|   |   |-- libpcap-1.1.1-x86_64-1.txz.asc

+|   |   |-- libplist-1.3-x86_64-1.txt

+|   |   |-- libplist-1.3-x86_64-1.txz

+|   |   |-- libplist-1.3-x86_64-1.txz.asc

+|   |   |-- libpng-1.4.5-x86_64-1.txt

+|   |   |-- libpng-1.4.5-x86_64-1.txz

+|   |   |-- libpng-1.4.5-x86_64-1.txz.asc

+|   |   |-- libraw1394-2.0.7-x86_64-1.txt

+|   |   |-- libraw1394-2.0.7-x86_64-1.txz

+|   |   |-- libraw1394-2.0.7-x86_64-1.txz.asc

+|   |   |-- librsvg-2.32.0-x86_64-1.txt

+|   |   |-- librsvg-2.32.0-x86_64-1.txz

+|   |   |-- librsvg-2.32.0-x86_64-1.txz.asc

+|   |   |-- libsamplerate-0.1.7-x86_64-2.txt

+|   |   |-- libsamplerate-0.1.7-x86_64-2.txz

+|   |   |-- libsamplerate-0.1.7-x86_64-2.txz.asc

+|   |   |-- libsndfile-1.0.24-x86_64-1.txt

+|   |   |-- libsndfile-1.0.24-x86_64-1.txz

+|   |   |-- libsndfile-1.0.24-x86_64-1.txz.asc

+|   |   |-- libspectre-0.2.5-x86_64-2.txt

+|   |   |-- libspectre-0.2.5-x86_64-2.txz

+|   |   |-- libspectre-0.2.5-x86_64-2.txz.asc

 |   |   |-- libtermcap-1.2.3-x86_64-7.txt

 |   |   |-- libtermcap-1.2.3-x86_64-7.txz

 |   |   |-- libtermcap-1.2.3-x86_64-7.txz.asc

 |   |   |-- libtheora-1.1.1-x86_64-1.txt

 |   |   |-- libtheora-1.1.1-x86_64-1.txz

 |   |   |-- libtheora-1.1.1-x86_64-1.txz.asc

-|   |   |-- libtiff-3.9.2-x86_64-1.txt

-|   |   |-- libtiff-3.9.2-x86_64-1.txz

-|   |   |-- libtiff-3.9.2-x86_64-1.txz.asc

-|   |   |-- libusb-1.0.6-x86_64-1.txt

-|   |   |-- libusb-1.0.6-x86_64-1.txz

-|   |   |-- libusb-1.0.6-x86_64-1.txz.asc

+|   |   |-- libtiff-3.9.4-x86_64-2.txt

+|   |   |-- libtiff-3.9.4-x86_64-2.txz

+|   |   |-- libtiff-3.9.4-x86_64-2.txz.asc

+|   |   |-- libusb-1.0.8-x86_64-2.txt

+|   |   |-- libusb-1.0.8-x86_64-2.txz

+|   |   |-- libusb-1.0.8-x86_64-2.txz.asc

 |   |   |-- libvisual-0.4.0-x86_64-2.txt

 |   |   |-- libvisual-0.4.0-x86_64-2.txz

 |   |   |-- libvisual-0.4.0-x86_64-2.txz.asc

@@ -2060,113 +2144,116 @@ see additional documentation files.
 |   |   |-- libvncserver-0.9.7-x86_64-2.txt

 |   |   |-- libvncserver-0.9.7-x86_64-2.txz

 |   |   |-- libvncserver-0.9.7-x86_64-2.txz.asc

-|   |   |-- libvorbis-1.2.3-x86_64-1.txt

-|   |   |-- libvorbis-1.2.3-x86_64-1.txz

-|   |   |-- libvorbis-1.2.3-x86_64-1.txz.asc

+|   |   |-- libvorbis-1.3.2-x86_64-1.txt

+|   |   |-- libvorbis-1.3.2-x86_64-1.txz

+|   |   |-- libvorbis-1.3.2-x86_64-1.txz.asc

 |   |   |-- libwmf-0.2.8.4-x86_64-5.txt

 |   |   |-- libwmf-0.2.8.4-x86_64-5.txz

 |   |   |-- libwmf-0.2.8.4-x86_64-5.txz.asc

 |   |   |-- libwmf-docs-0.2.8.4-noarch-5.txt

 |   |   |-- libwmf-docs-0.2.8.4-noarch-5.txz

 |   |   |-- libwmf-docs-0.2.8.4-noarch-5.txz.asc

-|   |   |-- libwnck-2.28.0-x86_64-1.txt

-|   |   |-- libwnck-2.28.0-x86_64-1.txz

-|   |   |-- libwnck-2.28.0-x86_64-1.txz.asc

+|   |   |-- libwnck-2.30.6-x86_64-1.txt

+|   |   |-- libwnck-2.30.6-x86_64-1.txz

+|   |   |-- libwnck-2.30.6-x86_64-1.txz.asc

 |   |   |-- libwpd-0.8.14-x86_64-1.txt

 |   |   |-- libwpd-0.8.14-x86_64-1.txz

 |   |   |-- libwpd-0.8.14-x86_64-1.txz.asc

-|   |   |-- libxklavier-5.0-x86_64-1.txt

-|   |   |-- libxklavier-5.0-x86_64-1.txz

-|   |   |-- libxklavier-5.0-x86_64-1.txz.asc

-|   |   |-- libxml2-2.7.6-x86_64-1.txt

-|   |   |-- libxml2-2.7.6-x86_64-1.txz

-|   |   |-- libxml2-2.7.6-x86_64-1.txz.asc

+|   |   |-- libxklavier-5.1-x86_64-1.txt

+|   |   |-- libxklavier-5.1-x86_64-1.txz

+|   |   |-- libxklavier-5.1-x86_64-1.txz.asc

+|   |   |-- libxml2-2.7.8-x86_64-3.txt

+|   |   |-- libxml2-2.7.8-x86_64-3.txz

+|   |   |-- libxml2-2.7.8-x86_64-3.txz.asc

 |   |   |-- libxslt-1.1.26-x86_64-1.txt

 |   |   |-- libxslt-1.1.26-x86_64-1.txz

 |   |   |-- libxslt-1.1.26-x86_64-1.txz.asc

-|   |   |-- libzip-0.9-x86_64-2.txt

-|   |   |-- libzip-0.9-x86_64-2.txz

-|   |   |-- libzip-0.9-x86_64-2.txz.asc

+|   |   |-- libzip-0.9.3-x86_64-1.txt

+|   |   |-- libzip-0.9.3-x86_64-1.txz

+|   |   |-- libzip-0.9.3-x86_64-1.txz.asc

 |   |   |-- loudmouth-1.4.3-x86_64-1.txt

 |   |   |-- loudmouth-1.4.3-x86_64-1.txz

 |   |   |-- loudmouth-1.4.3-x86_64-1.txz.asc

-|   |   |-- lzo-2.02-x86_64-1.txt

-|   |   |-- lzo-2.02-x86_64-1.txz

-|   |   |-- lzo-2.02-x86_64-1.txz.asc

+|   |   |-- lzo-2.03-x86_64-1.txt

+|   |   |-- lzo-2.03-x86_64-1.txz

+|   |   |-- lzo-2.03-x86_64-1.txz.asc

 |   |   |-- maketag

 |   |   |-- maketag.ez

-|   |   |-- mhash-0.9.9-x86_64-1.txt

-|   |   |-- mhash-0.9.9-x86_64-1.txz

-|   |   |-- mhash-0.9.9-x86_64-1.txz.asc

+|   |   |-- mhash-0.9.9.9-x86_64-3.txt

+|   |   |-- mhash-0.9.9.9-x86_64-3.txz

+|   |   |-- mhash-0.9.9.9-x86_64-3.txz.asc

 |   |   |-- mm-1.4.2-x86_64-2.txt

 |   |   |-- mm-1.4.2-x86_64-2.txz

 |   |   |-- mm-1.4.2-x86_64-2.txz.asc

-|   |   |-- mpfr-2.4.2p03-x86_64-1.txt

-|   |   |-- mpfr-2.4.2p03-x86_64-1.txz

-|   |   |-- mpfr-2.4.2p03-x86_64-1.txz.asc

-|   |   |-- ncurses-5.7-x86_64-2.txt

-|   |   |-- ncurses-5.7-x86_64-2.txz

-|   |   |-- ncurses-5.7-x86_64-2.txz.asc

-|   |   |-- neon-0.29.0-x86_64-1.txt

-|   |   |-- neon-0.29.0-x86_64-1.txz

-|   |   |-- neon-0.29.0-x86_64-1.txz.asc

+|   |   |-- mpfr-3.0.1-x86_64-1.txt

+|   |   |-- mpfr-3.0.1-x86_64-1.txz

+|   |   |-- mpfr-3.0.1-x86_64-1.txz.asc

+|   |   |-- ncurses-5.9-x86_64-1.txt

+|   |   |-- ncurses-5.9-x86_64-1.txz

+|   |   |-- ncurses-5.9-x86_64-1.txz.asc

+|   |   |-- neon-0.29.5-x86_64-1.txt

+|   |   |-- neon-0.29.5-x86_64-1.txz

+|   |   |-- neon-0.29.5-x86_64-1.txz.asc

 |   |   |-- netpbm-10.49.02-x86_64-1.txt

 |   |   |-- netpbm-10.49.02-x86_64-1.txz

 |   |   |-- netpbm-10.49.02-x86_64-1.txz.asc

 |   |   |-- notify-python-0.1.1-x86_64-1.txt

 |   |   |-- notify-python-0.1.1-x86_64-1.txz

 |   |   |-- notify-python-0.1.1-x86_64-1.txz.asc

-|   |   |-- openexr-1.6.1-x86_64-2.txt

-|   |   |-- openexr-1.6.1-x86_64-2.txz

-|   |   |-- openexr-1.6.1-x86_64-2.txz.asc

-|   |   |-- pango-1.26.2-x86_64-1.txt

-|   |   |-- pango-1.26.2-x86_64-1.txz

-|   |   |-- pango-1.26.2-x86_64-1.txz.asc

-|   |   |-- parted-2.2-x86_64-1.txt

-|   |   |-- parted-2.2-x86_64-1.txz

-|   |   |-- parted-2.2-x86_64-1.txz.asc

-|   |   |-- pcre-8.02-x86_64-1.txt

-|   |   |-- pcre-8.02-x86_64-1.txz

-|   |   |-- pcre-8.02-x86_64-1.txz.asc

-|   |   |-- phonon-4.4.1-x86_64-1.txt

-|   |   |-- phonon-4.4.1-x86_64-1.txz

-|   |   |-- phonon-4.4.1-x86_64-1.txz.asc

+|   |   |-- openexr-1.7.0-x86_64-1.txt

+|   |   |-- openexr-1.7.0-x86_64-1.txz

+|   |   |-- openexr-1.7.0-x86_64-1.txz.asc

+|   |   |-- pango-1.28.4-x86_64-1.txt

+|   |   |-- pango-1.28.4-x86_64-1.txz

+|   |   |-- pango-1.28.4-x86_64-1.txz.asc

+|   |   |-- parted-2.3-x86_64-1.txt

+|   |   |-- parted-2.3-x86_64-1.txz

+|   |   |-- parted-2.3-x86_64-1.txz.asc

+|   |   |-- pcre-8.12-x86_64-1.txt

+|   |   |-- pcre-8.12-x86_64-1.txz

+|   |   |-- pcre-8.12-x86_64-1.txz.asc

+|   |   |-- phonon-4.4.3-x86_64-1.txt

+|   |   |-- phonon-4.4.3-x86_64-1.txz

+|   |   |-- phonon-4.4.3-x86_64-1.txz.asc

+|   |   |-- phonon-mplayer-20101213-x86_64-1.txt

+|   |   |-- phonon-mplayer-20101213-x86_64-1.txz

+|   |   |-- phonon-mplayer-20101213-x86_64-1.txz.asc

 |   |   |-- pil-1.1.7-x86_64-1.txt

 |   |   |-- pil-1.1.7-x86_64-1.txz

 |   |   |-- pil-1.1.7-x86_64-1.txz.asc

-|   |   |-- pilot-link-0.12.5-x86_64-1.txt

-|   |   |-- pilot-link-0.12.5-x86_64-1.txz

-|   |   |-- pilot-link-0.12.5-x86_64-1.txz.asc

-|   |   |-- polkit-1_14bdfd8-x86_64-1.txt

-|   |   |-- polkit-1_14bdfd8-x86_64-1.txz

-|   |   |-- polkit-1_14bdfd8-x86_64-1.txz.asc

-|   |   |-- polkit-gnome-0.96-x86_64-1.txt

-|   |   |-- polkit-gnome-0.96-x86_64-1.txz

-|   |   |-- polkit-gnome-0.96-x86_64-1.txz.asc

-|   |   |-- poppler-0.12.4-x86_64-1.txt

-|   |   |-- poppler-0.12.4-x86_64-1.txz

-|   |   |-- poppler-0.12.4-x86_64-1.txz.asc

-|   |   |-- poppler-data-0.4.0-noarch-1.txt

-|   |   |-- poppler-data-0.4.0-noarch-1.txz

-|   |   |-- poppler-data-0.4.0-noarch-1.txz.asc

+|   |   |-- pilot-link-0.12.5-x86_64-3.txt

+|   |   |-- pilot-link-0.12.5-x86_64-3.txz

+|   |   |-- pilot-link-0.12.5-x86_64-3.txz.asc

+|   |   |-- polkit-0.101-x86_64-2.txt

+|   |   |-- polkit-0.101-x86_64-2.txz

+|   |   |-- polkit-0.101-x86_64-2.txz.asc

+|   |   |-- polkit-gnome-0.101-x86_64-1.txt

+|   |   |-- polkit-gnome-0.101-x86_64-1.txz

+|   |   |-- polkit-gnome-0.101-x86_64-1.txz.asc

+|   |   |-- poppler-0.16.4-x86_64-1.txt

+|   |   |-- poppler-0.16.4-x86_64-1.txz

+|   |   |-- poppler-0.16.4-x86_64-1.txz.asc

+|   |   |-- poppler-data-0.4.4-noarch-1.txt

+|   |   |-- poppler-data-0.4.4-noarch-1.txz

+|   |   |-- poppler-data-0.4.4-noarch-1.txz.asc

 |   |   |-- popt-1.7-x86_64-3.txt

 |   |   |-- popt-1.7-x86_64-3.txz

 |   |   |-- popt-1.7-x86_64-3.txz.asc

-|   |   |-- pycairo-1.8.8-x86_64-1.txt

-|   |   |-- pycairo-1.8.8-x86_64-1.txz

-|   |   |-- pycairo-1.8.8-x86_64-1.txz.asc

-|   |   |-- pycups-1.9.48-x86_64-1.txt

-|   |   |-- pycups-1.9.48-x86_64-1.txz

-|   |   |-- pycups-1.9.48-x86_64-1.txz.asc

-|   |   |-- pygobject-2.20.0-x86_64-1.txt

-|   |   |-- pygobject-2.20.0-x86_64-1.txz

-|   |   |-- pygobject-2.20.0-x86_64-1.txz.asc

-|   |   |-- pygtk-2.16.0-x86_64-1.txt

-|   |   |-- pygtk-2.16.0-x86_64-1.txz

-|   |   |-- pygtk-2.16.0-x86_64-1.txz.asc

-|   |   |-- pyrex-0.9.8.5-x86_64-2.txt

-|   |   |-- pyrex-0.9.8.5-x86_64-2.txz

-|   |   |-- pyrex-0.9.8.5-x86_64-2.txz.asc

+|   |   |-- pycairo-1.8.10-x86_64-1.txt

+|   |   |-- pycairo-1.8.10-x86_64-1.txz

+|   |   |-- pycairo-1.8.10-x86_64-1.txz.asc

+|   |   |-- pycups-1.9.55-x86_64-1.txt

+|   |   |-- pycups-1.9.55-x86_64-1.txz

+|   |   |-- pycups-1.9.55-x86_64-1.txz.asc

+|   |   |-- pygobject-2.26.0-x86_64-1.txt

+|   |   |-- pygobject-2.26.0-x86_64-1.txz

+|   |   |-- pygobject-2.26.0-x86_64-1.txz.asc

+|   |   |-- pygtk-2.22.0-x86_64-1.txt

+|   |   |-- pygtk-2.22.0-x86_64-1.txz

+|   |   |-- pygtk-2.22.0-x86_64-1.txz.asc

+|   |   |-- pyrex-0.9.9-x86_64-1.txt

+|   |   |-- pyrex-0.9.9-x86_64-1.txz

+|   |   |-- pyrex-0.9.9-x86_64-1.txz.asc

 |   |   |-- qca-2.0.2-x86_64-1.txt

 |   |   |-- qca-2.0.2-x86_64-1.txz

 |   |   |-- qca-2.0.2-x86_64-1.txz.asc

@@ -2179,70 +2266,70 @@ see additional documentation files.
 |   |   |-- qca-ossl-2.0.0_beta3-x86_64-1.txt

 |   |   |-- qca-ossl-2.0.0_beta3-x86_64-1.txz

 |   |   |-- qca-ossl-2.0.0_beta3-x86_64-1.txz.asc

-|   |   |-- qimageblitz-r948358-x86_64-1.txt

-|   |   |-- qimageblitz-r948358-x86_64-1.txz

-|   |   |-- qimageblitz-r948358-x86_64-1.txz.asc

-|   |   |-- qt-4.6.2_2d3d3e5-x86_64-1.txt

-|   |   |-- qt-4.6.2_2d3d3e5-x86_64-1.txz

-|   |   |-- qt-4.6.2_2d3d3e5-x86_64-1.txz.asc

+|   |   |-- qimageblitz-0.0.6-x86_64-1.txt

+|   |   |-- qimageblitz-0.0.6-x86_64-1.txz

+|   |   |-- qimageblitz-0.0.6-x86_64-1.txz.asc

+|   |   |-- qt-4.7.0_7abde40-x86_64-3.txt

+|   |   |-- qt-4.7.0_7abde40-x86_64-3.txz

+|   |   |-- qt-4.7.0_7abde40-x86_64-3.txz.asc

 |   |   |-- qtscriptgenerator-0.1.0-x86_64-2.txt

 |   |   |-- qtscriptgenerator-0.1.0-x86_64-2.txz

 |   |   |-- qtscriptgenerator-0.1.0-x86_64-2.txz.asc

 |   |   |-- raptor-1.4.21-x86_64-1.txt

 |   |   |-- raptor-1.4.21-x86_64-1.txz

 |   |   |-- raptor-1.4.21-x86_64-1.txz.asc

-|   |   |-- rasqal-0.9.19-x86_64-1.txt

-|   |   |-- rasqal-0.9.19-x86_64-1.txz

-|   |   |-- rasqal-0.9.19-x86_64-1.txz.asc

+|   |   |-- rasqal-0.9.21-x86_64-1.txt

+|   |   |-- rasqal-0.9.21-x86_64-1.txz

+|   |   |-- rasqal-0.9.21-x86_64-1.txz.asc

 |   |   |-- readline-5.2-x86_64-4.txt

 |   |   |-- readline-5.2-x86_64-4.txz

 |   |   |-- readline-5.2-x86_64-4.txz.asc

-|   |   |-- redland-1.0.10-x86_64-1.txt

-|   |   |-- redland-1.0.10-x86_64-1.txz

-|   |   |-- redland-1.0.10-x86_64-1.txz.asc

-|   |   |-- sdl-1.2.14-x86_64-2.txt

-|   |   |-- sdl-1.2.14-x86_64-2.txz

-|   |   |-- sdl-1.2.14-x86_64-2.txz.asc

-|   |   |-- seamonkey-solibs-2.0.4-x86_64-1.txt

-|   |   |-- seamonkey-solibs-2.0.4-x86_64-1.txz

-|   |   |-- seamonkey-solibs-2.0.4-x86_64-1.txz.asc

-|   |   |-- shared-desktop-ontologies-0.3-x86_64-1.txt

-|   |   |-- shared-desktop-ontologies-0.3-x86_64-1.txz

-|   |   |-- shared-desktop-ontologies-0.3-x86_64-1.txz.asc

-|   |   |-- shared-mime-info-0.71-x86_64-1.txt

-|   |   |-- shared-mime-info-0.71-x86_64-1.txz

-|   |   |-- shared-mime-info-0.71-x86_64-1.txz.asc

-|   |   |-- sip-4.10.2-x86_64-1.txt

-|   |   |-- sip-4.10.2-x86_64-1.txz

-|   |   |-- sip-4.10.2-x86_64-1.txz.asc

-|   |   |-- slang-2.2.2-x86_64-1.txt

-|   |   |-- slang-2.2.2-x86_64-1.txz

-|   |   |-- slang-2.2.2-x86_64-1.txz.asc

+|   |   |-- redland-1.0.12-x86_64-1.txt

+|   |   |-- redland-1.0.12-x86_64-1.txz

+|   |   |-- redland-1.0.12-x86_64-1.txz.asc

+|   |   |-- sdl-1.2.14-x86_64-5.txt

+|   |   |-- sdl-1.2.14-x86_64-5.txz

+|   |   |-- sdl-1.2.14-x86_64-5.txz.asc

+|   |   |-- seamonkey-solibs-2.1b3-x86_64-2.txt

+|   |   |-- seamonkey-solibs-2.1b3-x86_64-2.txz

+|   |   |-- seamonkey-solibs-2.1b3-x86_64-2.txz.asc

+|   |   |-- shared-desktop-ontologies-0.5-x86_64-1.txt

+|   |   |-- shared-desktop-ontologies-0.5-x86_64-1.txz

+|   |   |-- shared-desktop-ontologies-0.5-x86_64-1.txz.asc

+|   |   |-- shared-mime-info-0.90-x86_64-1.txt

+|   |   |-- shared-mime-info-0.90-x86_64-1.txz

+|   |   |-- shared-mime-info-0.90-x86_64-1.txz.asc

+|   |   |-- sip-4.11.2-x86_64-1.txt

+|   |   |-- sip-4.11.2-x86_64-1.txz

+|   |   |-- sip-4.11.2-x86_64-1.txz.asc

+|   |   |-- slang-2.2.3-x86_64-1.txt

+|   |   |-- slang-2.2.3-x86_64-1.txz

+|   |   |-- slang-2.2.3-x86_64-1.txz.asc

 |   |   |-- slang1-1.4.9-x86_64-1.txt

 |   |   |-- slang1-1.4.9-x86_64-1.txz

 |   |   |-- slang1-1.4.9-x86_64-1.txz.asc

-|   |   |-- soprano-2.4.3-x86_64-1.txt

-|   |   |-- soprano-2.4.3-x86_64-1.txz

-|   |   |-- soprano-2.4.3-x86_64-1.txz.asc

+|   |   |-- soprano-2.5.2-x86_64-2.txt

+|   |   |-- soprano-2.5.2-x86_64-2.txz

+|   |   |-- soprano-2.5.2-x86_64-2.txz.asc

 |   |   |-- startup-notification-0.10-x86_64-1.txt

 |   |   |-- startup-notification-0.10-x86_64-1.txz

 |   |   |-- startup-notification-0.10-x86_64-1.txz.asc

-|   |   |-- strigi-0.7.2-x86_64-1.txt

-|   |   |-- strigi-0.7.2-x86_64-1.txz

-|   |   |-- strigi-0.7.2-x86_64-1.txz.asc

+|   |   |-- strigi-0.7.2-x86_64-2.txt

+|   |   |-- strigi-0.7.2-x86_64-2.txz

+|   |   |-- strigi-0.7.2-x86_64-2.txz.asc

 |   |   |-- svgalib-1.9.25-x86_64-2.txt

 |   |   |-- svgalib-1.9.25-x86_64-2.txz

 |   |   |-- svgalib-1.9.25-x86_64-2.txz.asc

-|   |   |-- system-config-printer-1.2.2-x86_64-1.txt

-|   |   |-- system-config-printer-1.2.2-x86_64-1.txz

-|   |   |-- system-config-printer-1.2.2-x86_64-1.txz.asc

-|   |   |-- t1lib-5.1.2-x86_64-1.txt

-|   |   |-- t1lib-5.1.2-x86_64-1.txz

-|   |   |-- t1lib-5.1.2-x86_64-1.txz.asc

+|   |   |-- system-config-printer-1.2.7-x86_64-1.txt

+|   |   |-- system-config-printer-1.2.7-x86_64-1.txz

+|   |   |-- system-config-printer-1.2.7-x86_64-1.txz.asc

+|   |   |-- t1lib-5.1.2-x86_64-2.txt

+|   |   |-- t1lib-5.1.2-x86_64-2.txz

+|   |   |-- t1lib-5.1.2-x86_64-2.txz.asc

 |   |   |-- tagfile

-|   |   |-- taglib-1.6.2-x86_64-1.txt

-|   |   |-- taglib-1.6.2-x86_64-1.txz

-|   |   |-- taglib-1.6.2-x86_64-1.txz.asc

+|   |   |-- taglib-1.6.3-x86_64-1.txt

+|   |   |-- taglib-1.6.3-x86_64-1.txz

+|   |   |-- taglib-1.6.3-x86_64-1.txz.asc

 |   |   |-- taglib-extras-1.0.1-x86_64-1.txt

 |   |   |-- taglib-extras-1.0.1-x86_64-1.txz

 |   |   |-- taglib-extras-1.0.1-x86_64-1.txz.asc

@@ -2255,24 +2342,24 @@ see additional documentation files.
 |   |   |-- urwid-0.9.9.1-x86_64-1.txt

 |   |   |-- urwid-0.9.9.1-x86_64-1.txz

 |   |   |-- urwid-0.9.9.1-x86_64-1.txz.asc

-|   |   |-- v4l-utils-0.8.0-x86_64-1.txt

-|   |   |-- v4l-utils-0.8.0-x86_64-1.txz

-|   |   |-- v4l-utils-0.8.0-x86_64-1.txz.asc

-|   |   |-- virtuoso-ose-6.1.1-x86_64-1.txt

-|   |   |-- virtuoso-ose-6.1.1-x86_64-1.txz

-|   |   |-- virtuoso-ose-6.1.1-x86_64-1.txz.asc

-|   |   |-- vte-0.24.1-x86_64-1.txt

-|   |   |-- vte-0.24.1-x86_64-1.txz

-|   |   |-- vte-0.24.1-x86_64-1.txz.asc

-|   |   |-- wavpack-4.41.0-x86_64-1.txt

-|   |   |-- wavpack-4.41.0-x86_64-1.txz

-|   |   |-- wavpack-4.41.0-x86_64-1.txz.asc

+|   |   |-- v4l-utils-0.8.3-x86_64-2.txt

+|   |   |-- v4l-utils-0.8.3-x86_64-2.txz

+|   |   |-- v4l-utils-0.8.3-x86_64-2.txz.asc

+|   |   |-- virtuoso-ose-6.1.2-x86_64-1.txt

+|   |   |-- virtuoso-ose-6.1.2-x86_64-1.txz

+|   |   |-- virtuoso-ose-6.1.2-x86_64-1.txz.asc

+|   |   |-- vte-0.26.2-x86_64-1.txt

+|   |   |-- vte-0.26.2-x86_64-1.txz

+|   |   |-- vte-0.26.2-x86_64-1.txz.asc

+|   |   |-- wavpack-4.60.1-x86_64-1.txt

+|   |   |-- wavpack-4.60.1-x86_64-1.txz

+|   |   |-- wavpack-4.60.1-x86_64-1.txz.asc

 |   |   |-- wv2-0.4.2-x86_64-1.txt

 |   |   |-- wv2-0.4.2-x86_64-1.txz

 |   |   |-- wv2-0.4.2-x86_64-1.txz.asc

-|   |   |-- zlib-1.2.3-x86_64-2.txt

-|   |   |-- zlib-1.2.3-x86_64-2.txz

-|   |   `-- zlib-1.2.3-x86_64-2.txz.asc

+|   |   |-- zlib-1.2.5-x86_64-4.txt

+|   |   |-- zlib-1.2.5-x86_64-4.txz

+|   |   `-- zlib-1.2.5-x86_64-4.txz.asc

 |   |-- n

 |   |   |-- alpine-2.00-x86_64-3.txt

 |   |   |-- alpine-2.00-x86_64-3.txz

@@ -2283,87 +2370,93 @@ see additional documentation files.
 |   |   |-- biff+comsat-0.17-x86_64-1.txt

 |   |   |-- biff+comsat-0.17-x86_64-1.txz

 |   |   |-- biff+comsat-0.17-x86_64-1.txz.asc

-|   |   |-- bind-9.4.3_P4-x86_64-1.txt

-|   |   |-- bind-9.4.3_P4-x86_64-1.txz

-|   |   |-- bind-9.4.3_P4-x86_64-1.txz.asc

-|   |   |-- bluez-4.64-x86_64-1.txt

-|   |   |-- bluez-4.64-x86_64-1.txz

-|   |   |-- bluez-4.64-x86_64-1.txz.asc

+|   |   |-- bind-9.7.3-x86_64-2.txt

+|   |   |-- bind-9.7.3-x86_64-2.txz

+|   |   |-- bind-9.7.3-x86_64-2.txz.asc

+|   |   |-- bluez-4.91-x86_64-1.txt

+|   |   |-- bluez-4.91-x86_64-1.txz

+|   |   |-- bluez-4.91-x86_64-1.txz.asc

 |   |   |-- bluez-firmware-1.2-x86_64-1.txt

 |   |   |-- bluez-firmware-1.2-x86_64-1.txz

 |   |   |-- bluez-firmware-1.2-x86_64-1.txz.asc

-|   |   |-- bluez-hcidump-1.42-x86_64-3.txt

-|   |   |-- bluez-hcidump-1.42-x86_64-3.txz

-|   |   |-- bluez-hcidump-1.42-x86_64-3.txz.asc

+|   |   |-- bluez-hcidump-2.0-x86_64-1.txt

+|   |   |-- bluez-hcidump-2.0-x86_64-1.txz

+|   |   |-- bluez-hcidump-2.0-x86_64-1.txz.asc

 |   |   |-- bootp-2.4.3-x86_64-2.txt

 |   |   |-- bootp-2.4.3-x86_64-2.txz

 |   |   |-- bootp-2.4.3-x86_64-2.txz.asc

-|   |   |-- bridge-utils-1.2-x86_64-2.txt

-|   |   |-- bridge-utils-1.2-x86_64-2.txz

-|   |   |-- bridge-utils-1.2-x86_64-2.txz.asc

+|   |   |-- bridge-utils-1.4-x86_64-1.txt

+|   |   |-- bridge-utils-1.4-x86_64-1.txz

+|   |   |-- bridge-utils-1.4-x86_64-1.txz.asc

 |   |   |-- bsd-finger-0.17-x86_64-1.txt

 |   |   |-- bsd-finger-0.17-x86_64-1.txz

 |   |   |-- bsd-finger-0.17-x86_64-1.txz.asc

+|   |   |-- ca-certificates-20090814-noarch-1.txt

+|   |   |-- ca-certificates-20090814-noarch-1.txz

+|   |   |-- ca-certificates-20090814-noarch-1.txz.asc

 |   |   |-- crda-1.1.1-x86_64-1.txt

 |   |   |-- crda-1.1.1-x86_64-1.txz

 |   |   |-- crda-1.1.1-x86_64-1.txz.asc

-|   |   |-- curl-7.20.1-x86_64-1.txt

-|   |   |-- curl-7.20.1-x86_64-1.txz

-|   |   |-- curl-7.20.1-x86_64-1.txz.asc

+|   |   |-- curl-7.21.4-x86_64-1.txt

+|   |   |-- curl-7.21.4-x86_64-1.txz

+|   |   |-- curl-7.21.4-x86_64-1.txz.asc

 |   |   |-- cyrus-sasl-2.1.23-x86_64-1.txt

 |   |   |-- cyrus-sasl-2.1.23-x86_64-1.txz

 |   |   |-- cyrus-sasl-2.1.23-x86_64-1.txz.asc

-|   |   |-- dhcp-4.1.1-x86_64-2.txt

-|   |   |-- dhcp-4.1.1-x86_64-2.txz

-|   |   |-- dhcp-4.1.1-x86_64-2.txz.asc

-|   |   |-- dhcpcd-5.2.2-x86_64-1.txt

-|   |   |-- dhcpcd-5.2.2-x86_64-1.txz

-|   |   |-- dhcpcd-5.2.2-x86_64-1.txz.asc

-|   |   |-- dirmngr-1.0.3-x86_64-2.txt

-|   |   |-- dirmngr-1.0.3-x86_64-2.txz

-|   |   |-- dirmngr-1.0.3-x86_64-2.txz.asc

-|   |   |-- dnsmasq-2.52-x86_64-1.txt

-|   |   |-- dnsmasq-2.52-x86_64-1.txz

-|   |   |-- dnsmasq-2.52-x86_64-1.txz.asc

+|   |   |-- dhcp-4.2.1_P1-x86_64-1.txt

+|   |   |-- dhcp-4.2.1_P1-x86_64-1.txz

+|   |   |-- dhcp-4.2.1_P1-x86_64-1.txz.asc

+|   |   |-- dhcpcd-5.2.11-x86_64-1.txt

+|   |   |-- dhcpcd-5.2.11-x86_64-1.txz

+|   |   |-- dhcpcd-5.2.11-x86_64-1.txz.asc

+|   |   |-- dirmngr-1.1.0-x86_64-1.txt

+|   |   |-- dirmngr-1.1.0-x86_64-1.txz

+|   |   |-- dirmngr-1.1.0-x86_64-1.txz.asc

+|   |   |-- dnsmasq-2.57-x86_64-1.txt

+|   |   |-- dnsmasq-2.57-x86_64-1.txz

+|   |   |-- dnsmasq-2.57-x86_64-1.txz.asc

 |   |   |-- elm-2.5.8-x86_64-3.txt

 |   |   |-- elm-2.5.8-x86_64-3.txz

 |   |   |-- elm-2.5.8-x86_64-3.txz.asc

 |   |   |-- epic5-1.1.2-x86_64-1.txt

 |   |   |-- epic5-1.1.2-x86_64-1.txz

 |   |   |-- epic5-1.1.2-x86_64-1.txz.asc

-|   |   |-- ethtool-2.6.33-x86_64-1.txt

-|   |   |-- ethtool-2.6.33-x86_64-1.txz

-|   |   |-- ethtool-2.6.33-x86_64-1.txz.asc

-|   |   |-- fetchmail-6.3.17-x86_64-1.txt

-|   |   |-- fetchmail-6.3.17-x86_64-1.txz

-|   |   |-- fetchmail-6.3.17-x86_64-1.txz.asc

-|   |   |-- getmail-4.17.0-x86_64-1.txt

-|   |   |-- getmail-4.17.0-x86_64-1.txz

-|   |   |-- getmail-4.17.0-x86_64-1.txz.asc

-|   |   |-- gnupg-1.4.10-x86_64-1.txt

-|   |   |-- gnupg-1.4.10-x86_64-1.txz

-|   |   |-- gnupg-1.4.10-x86_64-1.txz.asc

-|   |   |-- gnupg2-2.0.14-x86_64-2.txt

-|   |   |-- gnupg2-2.0.14-x86_64-2.txz

-|   |   |-- gnupg2-2.0.14-x86_64-2.txz.asc

-|   |   |-- gnutls-2.8.6-x86_64-1.txt

-|   |   |-- gnutls-2.8.6-x86_64-1.txz

-|   |   |-- gnutls-2.8.6-x86_64-1.txz.asc

+|   |   |-- ethtool-2.6.36-x86_64-1.txt

+|   |   |-- ethtool-2.6.36-x86_64-1.txz

+|   |   |-- ethtool-2.6.36-x86_64-1.txz.asc

+|   |   |-- fetchmail-6.3.19-x86_64-1.txt

+|   |   |-- fetchmail-6.3.19-x86_64-1.txz

+|   |   |-- fetchmail-6.3.19-x86_64-1.txz.asc

+|   |   |-- getmail-4.20.0-x86_64-1.txt

+|   |   |-- getmail-4.20.0-x86_64-1.txz

+|   |   |-- getmail-4.20.0-x86_64-1.txz.asc

+|   |   |-- gnupg-1.4.11-x86_64-1.txt

+|   |   |-- gnupg-1.4.11-x86_64-1.txz

+|   |   |-- gnupg-1.4.11-x86_64-1.txz.asc

+|   |   |-- gnupg2-2.0.17-x86_64-1.txt

+|   |   |-- gnupg2-2.0.17-x86_64-1.txz

+|   |   |-- gnupg2-2.0.17-x86_64-1.txz.asc

+|   |   |-- gnutls-2.10.5-x86_64-1.txt

+|   |   |-- gnutls-2.10.5-x86_64-1.txz

+|   |   |-- gnutls-2.10.5-x86_64-1.txz.asc

 |   |   |-- gpa-0.7.5-x86_64-1.txt

 |   |   |-- gpa-0.7.5-x86_64-1.txz

 |   |   |-- gpa-0.7.5-x86_64-1.txz.asc

-|   |   |-- gpgme-1.2.0-x86_64-1.txt

-|   |   |-- gpgme-1.2.0-x86_64-1.txz

-|   |   |-- gpgme-1.2.0-x86_64-1.txz.asc

+|   |   |-- gpgme-1.3.0-x86_64-1.txt

+|   |   |-- gpgme-1.3.0-x86_64-1.txz

+|   |   |-- gpgme-1.3.0-x86_64-1.txz.asc

 |   |   |-- htdig-3.2.0b6-x86_64-3.txt

 |   |   |-- htdig-3.2.0b6-x86_64-3.txz

 |   |   |-- htdig-3.2.0b6-x86_64-3.txz.asc

-|   |   |-- httpd-2.2.15-x86_64-1.txt

-|   |   |-- httpd-2.2.15-x86_64-1.txz

-|   |   |-- httpd-2.2.15-x86_64-1.txz.asc

+|   |   |-- httpd-2.2.17-x86_64-3.txt

+|   |   |-- httpd-2.2.17-x86_64-3.txz

+|   |   |-- httpd-2.2.17-x86_64-3.txz.asc

 |   |   |-- icmpinfo-1.11-x86_64-1.txt

 |   |   |-- icmpinfo-1.11-x86_64-1.txz

 |   |   |-- icmpinfo-1.11-x86_64-1.txz.asc

+|   |   |-- idnkit-1.0-x86_64-1.txt

+|   |   |-- idnkit-1.0-x86_64-1.txz

+|   |   |-- idnkit-1.0-x86_64-1.txz.asc

 |   |   |-- imapd-2.00-x86_64-2.txt

 |   |   |-- imapd-2.00-x86_64-2.txz

 |   |   |-- imapd-2.00-x86_64-2.txz.asc

@@ -2372,30 +2465,33 @@ see additional documentation files.
 |   |   |-- inetd-1.79s-x86_64-8.txz.asc

 |   |   |-- install-packages

 |   |   |-- install.end

-|   |   |-- iproute2-2.6.33-x86_64-1.txt

-|   |   |-- iproute2-2.6.33-x86_64-1.txz

-|   |   |-- iproute2-2.6.33-x86_64-1.txz.asc

-|   |   |-- iptables-1.4.7-x86_64-1.txt

-|   |   |-- iptables-1.4.7-x86_64-1.txz

-|   |   |-- iptables-1.4.7-x86_64-1.txz.asc

-|   |   |-- iptraf-3.0.0-x86_64-3.txt

-|   |   |-- iptraf-3.0.0-x86_64-3.txz

-|   |   |-- iptraf-3.0.0-x86_64-3.txz.asc

-|   |   |-- iputils-s20100418-x86_64-1.txt

-|   |   |-- iputils-s20100418-x86_64-1.txz

-|   |   |-- iputils-s20100418-x86_64-1.txz.asc

+|   |   |-- iproute2-2.6.37-x86_64-1.txt

+|   |   |-- iproute2-2.6.37-x86_64-1.txz

+|   |   |-- iproute2-2.6.37-x86_64-1.txz.asc

+|   |   |-- iptables-1.4.10-x86_64-1.txt

+|   |   |-- iptables-1.4.10-x86_64-1.txz

+|   |   |-- iptables-1.4.10-x86_64-1.txz.asc

+|   |   |-- iptraf-ng-1.0.2-x86_64-2.txt

+|   |   |-- iptraf-ng-1.0.2-x86_64-2.txz

+|   |   |-- iptraf-ng-1.0.2-x86_64-2.txz.asc

+|   |   |-- iputils-s20101006-x86_64-1.txt

+|   |   |-- iputils-s20101006-x86_64-1.txz

+|   |   |-- iputils-s20101006-x86_64-1.txz.asc

 |   |   |-- ipw2100-fw-1.3-fw-1.txt

 |   |   |-- ipw2100-fw-1.3-fw-1.txz

 |   |   |-- ipw2100-fw-1.3-fw-1.txz.asc

 |   |   |-- ipw2200-fw-3.1-fw-1.txt

 |   |   |-- ipw2200-fw-3.1-fw-1.txz

 |   |   |-- ipw2200-fw-3.1-fw-1.txz.asc

-|   |   |-- irssi-0.8.15-x86_64-1.txt

-|   |   |-- irssi-0.8.15-x86_64-1.txz

-|   |   |-- irssi-0.8.15-x86_64-1.txz.asc

-|   |   |-- iw-0.9.14-x86_64-1.txt

-|   |   |-- iw-0.9.14-x86_64-1.txz

-|   |   |-- iw-0.9.14-x86_64-1.txz.asc

+|   |   |-- irssi-0.8.15-x86_64-3.txt

+|   |   |-- irssi-0.8.15-x86_64-3.txz

+|   |   |-- irssi-0.8.15-x86_64-3.txz.asc

+|   |   |-- iw-0.9.20-x86_64-1.txt

+|   |   |-- iw-0.9.20-x86_64-1.txz

+|   |   |-- iw-0.9.20-x86_64-1.txz.asc

+|   |   |-- iwlwifi-100-ucode-39.31.5.1-fw-1.txt

+|   |   |-- iwlwifi-100-ucode-39.31.5.1-fw-1.txz

+|   |   |-- iwlwifi-100-ucode-39.31.5.1-fw-1.txz.asc

 |   |   |-- iwlwifi-1000-ucode-128.50.3.1-fw-1.txt

 |   |   |-- iwlwifi-1000-ucode-128.50.3.1-fw-1.txz

 |   |   |-- iwlwifi-1000-ucode-128.50.3.1-fw-1.txz.asc

@@ -2405,30 +2501,33 @@ see additional documentation files.
 |   |   |-- iwlwifi-4965-ucode-228.61.2.24-fw-1.txt

 |   |   |-- iwlwifi-4965-ucode-228.61.2.24-fw-1.txz

 |   |   |-- iwlwifi-4965-ucode-228.61.2.24-fw-1.txz.asc

-|   |   |-- iwlwifi-5000-ucode-8.24.2.12-fw-1.txt

-|   |   |-- iwlwifi-5000-ucode-8.24.2.12-fw-1.txz

-|   |   |-- iwlwifi-5000-ucode-8.24.2.12-fw-1.txz.asc

+|   |   |-- iwlwifi-5000-ucode-8.83.5.1-fw-1.txt

+|   |   |-- iwlwifi-5000-ucode-8.83.5.1-fw-1.txz

+|   |   |-- iwlwifi-5000-ucode-8.83.5.1-fw-1.txz.asc

 |   |   |-- iwlwifi-5150-ucode-8.24.2.2-fw-1.txt

 |   |   |-- iwlwifi-5150-ucode-8.24.2.2-fw-1.txz

 |   |   |-- iwlwifi-5150-ucode-8.24.2.2-fw-1.txz.asc

-|   |   |-- iwlwifi-6000-ucode-9.193.4.1-fw-1.txt

-|   |   |-- iwlwifi-6000-ucode-9.193.4.1-fw-1.txz

-|   |   |-- iwlwifi-6000-ucode-9.193.4.1-fw-1.txz.asc

-|   |   |-- lftp-4.0.7-x86_64-1.txt

-|   |   |-- lftp-4.0.7-x86_64-1.txz

-|   |   |-- lftp-4.0.7-x86_64-1.txz.asc

-|   |   |-- libassuan-1.0.5-x86_64-1.txt

-|   |   |-- libassuan-1.0.5-x86_64-1.txz

-|   |   |-- libassuan-1.0.5-x86_64-1.txz.asc

-|   |   |-- libgcrypt-1.4.5-x86_64-2.txt

-|   |   |-- libgcrypt-1.4.5-x86_64-2.txz

-|   |   |-- libgcrypt-1.4.5-x86_64-2.txz.asc

-|   |   |-- libgpg-error-1.7-x86_64-2.txt

-|   |   |-- libgpg-error-1.7-x86_64-2.txz

-|   |   |-- libgpg-error-1.7-x86_64-2.txz.asc

-|   |   |-- libksba-1.0.7-x86_64-1.txt

-|   |   |-- libksba-1.0.7-x86_64-1.txz

-|   |   |-- libksba-1.0.7-x86_64-1.txz.asc

+|   |   |-- iwlwifi-6000-ucode-9.221.4.1-fw-1.txt

+|   |   |-- iwlwifi-6000-ucode-9.221.4.1-fw-1.txz

+|   |   |-- iwlwifi-6000-ucode-9.221.4.1-fw-1.txz.asc

+|   |   |-- iwlwifi-6xxx-ucode-41.28.5.1-fw-1.txt

+|   |   |-- iwlwifi-6xxx-ucode-41.28.5.1-fw-1.txz

+|   |   |-- iwlwifi-6xxx-ucode-41.28.5.1-fw-1.txz.asc

+|   |   |-- lftp-4.2.2-x86_64-1.txt

+|   |   |-- lftp-4.2.2-x86_64-1.txz

+|   |   |-- lftp-4.2.2-x86_64-1.txz.asc

+|   |   |-- libassuan-2.0.1-x86_64-1.txt

+|   |   |-- libassuan-2.0.1-x86_64-1.txz

+|   |   |-- libassuan-2.0.1-x86_64-1.txz.asc

+|   |   |-- libgcrypt-1.4.6-x86_64-1.txt

+|   |   |-- libgcrypt-1.4.6-x86_64-1.txz

+|   |   |-- libgcrypt-1.4.6-x86_64-1.txz.asc

+|   |   |-- libgpg-error-1.9-x86_64-1.txt

+|   |   |-- libgpg-error-1.9-x86_64-1.txz

+|   |   |-- libgpg-error-1.9-x86_64-1.txz.asc

+|   |   |-- libksba-1.2.0-x86_64-1.txt

+|   |   |-- libksba-1.2.0-x86_64-1.txz

+|   |   |-- libksba-1.2.0-x86_64-1.txz.asc

 |   |   |-- links-2.3pre1-x86_64-1.txt

 |   |   |-- links-2.3pre1-x86_64-1.txz

 |   |   |-- links-2.3pre1-x86_64-1.txz.asc

@@ -2440,30 +2539,30 @@ see additional documentation files.
 |   |   |-- mailx-12.4-x86_64-1.txz.asc

 |   |   |-- maketag

 |   |   |-- maketag.ez

-|   |   |-- mcabber-0.10.0-x86_64-1.txt

-|   |   |-- mcabber-0.10.0-x86_64-1.txz

-|   |   |-- mcabber-0.10.0-x86_64-1.txz.asc

-|   |   |-- metamail-2.7-x86_64-4.txt

-|   |   |-- metamail-2.7-x86_64-4.txz

-|   |   |-- metamail-2.7-x86_64-4.txz.asc

-|   |   |-- mtr-0.75-x86_64-1.txt

-|   |   |-- mtr-0.75-x86_64-1.txz

-|   |   |-- mtr-0.75-x86_64-1.txz.asc

-|   |   |-- mutt-1.4.2.3-x86_64-2.txt

-|   |   |-- mutt-1.4.2.3-x86_64-2.txz

-|   |   |-- mutt-1.4.2.3-x86_64-2.txz.asc

+|   |   |-- mcabber-0.10.1-x86_64-1.txt

+|   |   |-- mcabber-0.10.1-x86_64-1.txz

+|   |   |-- mcabber-0.10.1-x86_64-1.txz.asc

+|   |   |-- metamail-2.7-x86_64-5.txt

+|   |   |-- metamail-2.7-x86_64-5.txz

+|   |   |-- metamail-2.7-x86_64-5.txz.asc

+|   |   |-- mtr-0.80-x86_64-1.txt

+|   |   |-- mtr-0.80-x86_64-1.txz

+|   |   |-- mtr-0.80-x86_64-1.txz.asc

+|   |   |-- mutt-1.5.21-x86_64-1.txt

+|   |   |-- mutt-1.5.21-x86_64-1.txz

+|   |   |-- mutt-1.5.21-x86_64-1.txz.asc

 |   |   |-- nc-1.10-x86_64-1.txt

 |   |   |-- nc-1.10-x86_64-1.txz

 |   |   |-- nc-1.10-x86_64-1.txz.asc

-|   |   |-- ncftp-3.2.4-x86_64-1.txt

-|   |   |-- ncftp-3.2.4-x86_64-1.txz

-|   |   |-- ncftp-3.2.4-x86_64-1.txz.asc

-|   |   |-- net-snmp-5.5-x86_64-2.txt

-|   |   |-- net-snmp-5.5-x86_64-2.txz

-|   |   |-- net-snmp-5.5-x86_64-2.txz.asc

-|   |   |-- net-tools-1.60-x86_64-2.txt

-|   |   |-- net-tools-1.60-x86_64-2.txz

-|   |   |-- net-tools-1.60-x86_64-2.txz.asc

+|   |   |-- ncftp-3.2.5-x86_64-1.txt

+|   |   |-- ncftp-3.2.5-x86_64-1.txz

+|   |   |-- ncftp-3.2.5-x86_64-1.txz.asc

+|   |   |-- net-snmp-5.6.1-x86_64-1.txt

+|   |   |-- net-snmp-5.6.1-x86_64-1.txz

+|   |   |-- net-snmp-5.6.1-x86_64-1.txz.asc

+|   |   |-- net-tools-1.60-x86_64-3.txt

+|   |   |-- net-tools-1.60-x86_64-3.txz

+|   |   |-- net-tools-1.60-x86_64-3.txz.asc

 |   |   |-- netatalk-2.0.5-x86_64-1.txt

 |   |   |-- netatalk-2.0.5-x86_64-1.txz

 |   |   |-- netatalk-2.0.5-x86_64-1.txz.asc

@@ -2512,51 +2611,51 @@ see additional documentation files.
 |   |   |-- newspost-2.1.1-x86_64-1.txt

 |   |   |-- newspost-2.1.1-x86_64-1.txz

 |   |   |-- newspost-2.1.1-x86_64-1.txz.asc

-|   |   |-- nfs-utils-1.2.2-x86_64-1.txt

-|   |   |-- nfs-utils-1.2.2-x86_64-1.txz

-|   |   |-- nfs-utils-1.2.2-x86_64-1.txz.asc

-|   |   |-- nmap-5.21-x86_64-1.txt

-|   |   |-- nmap-5.21-x86_64-1.txz

-|   |   |-- nmap-5.21-x86_64-1.txz.asc

+|   |   |-- nfs-utils-1.2.3-x86_64-3.txt

+|   |   |-- nfs-utils-1.2.3-x86_64-3.txz

+|   |   |-- nfs-utils-1.2.3-x86_64-3.txz.asc

+|   |   |-- nmap-5.51-x86_64-1.txt

+|   |   |-- nmap-5.51-x86_64-1.txz

+|   |   |-- nmap-5.51-x86_64-1.txz.asc

 |   |   |-- nn-6.7.3-x86_64-3.txt

 |   |   |-- nn-6.7.3-x86_64-3.txz

 |   |   |-- nn-6.7.3-x86_64-3.txz.asc

-|   |   |-- ntp-4.2.6p1-x86_64-1.txt

-|   |   |-- ntp-4.2.6p1-x86_64-1.txz

-|   |   |-- ntp-4.2.6p1-x86_64-1.txz.asc

-|   |   |-- obex-data-server-0.4.5-x86_64-1.txt

-|   |   |-- obex-data-server-0.4.5-x86_64-1.txz

-|   |   |-- obex-data-server-0.4.5-x86_64-1.txz.asc

+|   |   |-- ntp-4.2.6p3-x86_64-1.txt

+|   |   |-- ntp-4.2.6p3-x86_64-1.txz

+|   |   |-- ntp-4.2.6p3-x86_64-1.txz.asc

+|   |   |-- obex-data-server-0.4.5-x86_64-2.txt

+|   |   |-- obex-data-server-0.4.5-x86_64-2.txz

+|   |   |-- obex-data-server-0.4.5-x86_64-2.txz.asc

 |   |   |-- obexfs-0.12-x86_64-1.txt

 |   |   |-- obexfs-0.12-x86_64-1.txz

 |   |   |-- obexfs-0.12-x86_64-1.txz.asc

-|   |   |-- obexftp-0.23-x86_64-3.txt

-|   |   |-- obexftp-0.23-x86_64-3.txz

-|   |   |-- obexftp-0.23-x86_64-3.txz.asc

-|   |   |-- openldap-client-2.4.21-x86_64-1.txt

-|   |   |-- openldap-client-2.4.21-x86_64-1.txz

-|   |   |-- openldap-client-2.4.21-x86_64-1.txz.asc

+|   |   |-- obexftp-0.23-x86_64-5.txt

+|   |   |-- obexftp-0.23-x86_64-5.txz

+|   |   |-- obexftp-0.23-x86_64-5.txz.asc

+|   |   |-- openldap-client-2.4.23-x86_64-1.txt

+|   |   |-- openldap-client-2.4.23-x86_64-1.txz

+|   |   |-- openldap-client-2.4.23-x86_64-1.txz.asc

 |   |   |-- openobex-1.5-x86_64-1.txt

 |   |   |-- openobex-1.5-x86_64-1.txz

 |   |   |-- openobex-1.5-x86_64-1.txz.asc

-|   |   |-- openssh-5.5p1-x86_64-1.txt

-|   |   |-- openssh-5.5p1-x86_64-1.txz

-|   |   |-- openssh-5.5p1-x86_64-1.txz.asc

-|   |   |-- openssl-0.9.8n-x86_64-1.txt

-|   |   |-- openssl-0.9.8n-x86_64-1.txz

-|   |   |-- openssl-0.9.8n-x86_64-1.txz.asc

-|   |   |-- openvpn-2.1.1-x86_64-1.txt

-|   |   |-- openvpn-2.1.1-x86_64-1.txz

-|   |   |-- openvpn-2.1.1-x86_64-1.txz.asc

-|   |   |-- php-5.2.13-x86_64-2.txt

-|   |   |-- php-5.2.13-x86_64-2.txz

-|   |   |-- php-5.2.13-x86_64-2.txz.asc

+|   |   |-- openssh-5.8p1-x86_64-1.txt

+|   |   |-- openssh-5.8p1-x86_64-1.txz

+|   |   |-- openssh-5.8p1-x86_64-1.txz.asc

+|   |   |-- openssl-0.9.8r-x86_64-3.txt

+|   |   |-- openssl-0.9.8r-x86_64-3.txz

+|   |   |-- openssl-0.9.8r-x86_64-3.txz.asc

+|   |   |-- openvpn-2.1.4-x86_64-2.txt

+|   |   |-- openvpn-2.1.4-x86_64-2.txz

+|   |   |-- openvpn-2.1.4-x86_64-2.txz.asc

+|   |   |-- php-5.3.6-x86_64-6.txt

+|   |   |-- php-5.3.6-x86_64-6.txz

+|   |   |-- php-5.3.6-x86_64-6.txz.asc

 |   |   |-- pidentd-3.0.19-x86_64-1.txt

 |   |   |-- pidentd-3.0.19-x86_64-1.txz

 |   |   |-- pidentd-3.0.19-x86_64-1.txz.asc

-|   |   |-- pinentry-0.8.0-x86_64-1.txt

-|   |   |-- pinentry-0.8.0-x86_64-1.txz

-|   |   |-- pinentry-0.8.0-x86_64-1.txz.asc

+|   |   |-- pinentry-0.8.1-x86_64-1.txt

+|   |   |-- pinentry-0.8.1-x86_64-1.txz

+|   |   |-- pinentry-0.8.1-x86_64-1.txz.asc

 |   |   |-- popa3d-1.0.2-x86_64-2.txt

 |   |   |-- popa3d-1.0.2-x86_64-2.txz

 |   |   |-- popa3d-1.0.2-x86_64-2.txz.asc

@@ -2569,24 +2668,27 @@ see additional documentation files.
 |   |   |-- procmail-3.22-x86_64-2.txt

 |   |   |-- procmail-3.22-x86_64-2.txz

 |   |   |-- procmail-3.22-x86_64-2.txz.asc

-|   |   |-- proftpd-1.3.3-x86_64-2.txt

-|   |   |-- proftpd-1.3.3-x86_64-2.txz

-|   |   |-- proftpd-1.3.3-x86_64-2.txz.asc

-|   |   |-- pssh-2.1.1-noarch-1.txt

-|   |   |-- pssh-2.1.1-noarch-1.txz

-|   |   |-- pssh-2.1.1-noarch-1.txz.asc

+|   |   |-- proftpd-1.3.3e-x86_64-1.txt

+|   |   |-- proftpd-1.3.3e-x86_64-1.txz

+|   |   |-- proftpd-1.3.3e-x86_64-1.txz.asc

+|   |   |-- pssh-2.2-x86_64-1.txt

+|   |   |-- pssh-2.2-x86_64-1.txz

+|   |   |-- pssh-2.2-x86_64-1.txz.asc

 |   |   |-- pth-2.0.7-x86_64-1.txt

 |   |   |-- pth-2.0.7-x86_64-1.txz

 |   |   |-- pth-2.0.7-x86_64-1.txz.asc

 |   |   |-- rdist-6.1.5-x86_64-2.txt

 |   |   |-- rdist-6.1.5-x86_64-2.txz

 |   |   |-- rdist-6.1.5-x86_64-2.txz.asc

+|   |   |-- rfkill-0.4-x86_64-1.txt

+|   |   |-- rfkill-0.4-x86_64-1.txz

+|   |   |-- rfkill-0.4-x86_64-1.txz.asc

 |   |   |-- rp-pppoe-3.10-x86_64-1.txt

 |   |   |-- rp-pppoe-3.10-x86_64-1.txz

 |   |   |-- rp-pppoe-3.10-x86_64-1.txz.asc

-|   |   |-- rsync-3.0.7-x86_64-1.txt

-|   |   |-- rsync-3.0.7-x86_64-1.txz

-|   |   |-- rsync-3.0.7-x86_64-1.txz.asc

+|   |   |-- rsync-3.0.8-x86_64-1.txt

+|   |   |-- rsync-3.0.8-x86_64-1.txz

+|   |   |-- rsync-3.0.8-x86_64-1.txz.asc

 |   |   |-- rt2860-firmware-26-fw-1.txt

 |   |   |-- rt2860-firmware-26-fw-1.txz

 |   |   |-- rt2860-firmware-26-fw-1.txz.asc

@@ -2599,9 +2701,9 @@ see additional documentation files.
 |   |   |-- rt71w-firmware-1.8-fw-1.txt

 |   |   |-- rt71w-firmware-1.8-fw-1.txz

 |   |   |-- rt71w-firmware-1.8-fw-1.txz.asc

-|   |   |-- samba-3.5.2-x86_64-1.txt

-|   |   |-- samba-3.5.2-x86_64-1.txz

-|   |   |-- samba-3.5.2-x86_64-1.txz.asc

+|   |   |-- samba-3.5.8-x86_64-1.txt

+|   |   |-- samba-3.5.8-x86_64-1.txz

+|   |   |-- samba-3.5.8-x86_64-1.txz.asc

 |   |   |-- sendmail-8.14.4-x86_64-1.txt

 |   |   |-- sendmail-8.14.4-x86_64-1.txz

 |   |   |-- sendmail-8.14.4-x86_64-1.txz.asc

@@ -2614,28 +2716,28 @@ see additional documentation files.
 |   |   |-- snownews-1.5.12-x86_64-1.txt

 |   |   |-- snownews-1.5.12-x86_64-1.txz

 |   |   |-- snownews-1.5.12-x86_64-1.txz.asc

-|   |   |-- stunnel-4.33-x86_64-1.txt

-|   |   |-- stunnel-4.33-x86_64-1.txz

-|   |   |-- stunnel-4.33-x86_64-1.txz.asc

+|   |   |-- stunnel-4.35-x86_64-1.txt

+|   |   |-- stunnel-4.35-x86_64-1.txz

+|   |   |-- stunnel-4.35-x86_64-1.txz.asc

 |   |   |-- tagfile

 |   |   |-- tcp_wrappers-7.6-x86_64-1.txt

 |   |   |-- tcp_wrappers-7.6-x86_64-1.txz

 |   |   |-- tcp_wrappers-7.6-x86_64-1.txz.asc

-|   |   |-- tcpdump-4.0.0-x86_64-2.txt

-|   |   |-- tcpdump-4.0.0-x86_64-2.txz

-|   |   |-- tcpdump-4.0.0-x86_64-2.txz.asc

+|   |   |-- tcpdump-4.1.1-x86_64-1.txt

+|   |   |-- tcpdump-4.1.1-x86_64-1.txz

+|   |   |-- tcpdump-4.1.1-x86_64-1.txz.asc

 |   |   |-- telnet-0.17-x86_64-2.txt

 |   |   |-- telnet-0.17-x86_64-2.txz

 |   |   |-- telnet-0.17-x86_64-2.txz.asc

 |   |   |-- tftp-hpa-0.49-x86_64-1.txt

 |   |   |-- tftp-hpa-0.49-x86_64-1.txz

 |   |   |-- tftp-hpa-0.49-x86_64-1.txz.asc

-|   |   |-- tin-1.8.2-x86_64-2.txt

-|   |   |-- tin-1.8.2-x86_64-2.txz

-|   |   |-- tin-1.8.2-x86_64-2.txz.asc

-|   |   |-- traceroute-2.0.14-x86_64-1.txt

-|   |   |-- traceroute-2.0.14-x86_64-1.txz

-|   |   |-- traceroute-2.0.14-x86_64-1.txz.asc

+|   |   |-- tin-1.8.3-x86_64-2.txt

+|   |   |-- tin-1.8.3-x86_64-2.txz

+|   |   |-- tin-1.8.3-x86_64-2.txz.asc

+|   |   |-- traceroute-2.0.17-x86_64-1.txt

+|   |   |-- traceroute-2.0.17-x86_64-1.txz

+|   |   |-- traceroute-2.0.17-x86_64-1.txz.asc

 |   |   |-- trn-3.6-x86_64-2.txt

 |   |   |-- trn-3.6-x86_64-2.txz

 |   |   |-- trn-3.6-x86_64-2.txz.asc

@@ -2645,24 +2747,24 @@ see additional documentation files.
 |   |   |-- vlan-1.9-x86_64-2.txt

 |   |   |-- vlan-1.9-x86_64-2.txz

 |   |   |-- vlan-1.9-x86_64-2.txz.asc

-|   |   |-- vsftpd-2.2.2-x86_64-1.txt

-|   |   |-- vsftpd-2.2.2-x86_64-1.txz

-|   |   |-- vsftpd-2.2.2-x86_64-1.txz.asc

+|   |   |-- vsftpd-2.3.4-x86_64-1.txt

+|   |   |-- vsftpd-2.3.4-x86_64-1.txz

+|   |   |-- vsftpd-2.3.4-x86_64-1.txz.asc

 |   |   |-- wget-1.12-x86_64-1.txt

 |   |   |-- wget-1.12-x86_64-1.txz

 |   |   |-- wget-1.12-x86_64-1.txz.asc

-|   |   |-- whois-5.0.2-x86_64-1.txt

-|   |   |-- whois-5.0.2-x86_64-1.txz

-|   |   |-- whois-5.0.2-x86_64-1.txz.asc

+|   |   |-- whois-5.0.11-x86_64-1.txt

+|   |   |-- whois-5.0.11-x86_64-1.txz

+|   |   |-- whois-5.0.11-x86_64-1.txz.asc

 |   |   |-- wireless-tools-29-x86_64-6.txt

 |   |   |-- wireless-tools-29-x86_64-6.txz

 |   |   |-- wireless-tools-29-x86_64-6.txz.asc

-|   |   |-- wpa_supplicant-0.6.10-x86_64-1.txt

-|   |   |-- wpa_supplicant-0.6.10-x86_64-1.txz

-|   |   |-- wpa_supplicant-0.6.10-x86_64-1.txz.asc

-|   |   |-- yptools-2.12-x86_64-1.txt

-|   |   |-- yptools-2.12-x86_64-1.txz

-|   |   |-- yptools-2.12-x86_64-1.txz.asc

+|   |   |-- wpa_supplicant-0.7.3-x86_64-3.txt

+|   |   |-- wpa_supplicant-0.7.3-x86_64-3.txz

+|   |   |-- wpa_supplicant-0.7.3-x86_64-3.txz.asc

+|   |   |-- yptools-2.12-x86_64-2.txt

+|   |   |-- yptools-2.12-x86_64-2.txz

+|   |   |-- yptools-2.12-x86_64-2.txz.asc

 |   |   |-- ytalk-3.3.0-x86_64-2.txt

 |   |   |-- ytalk-3.3.0-x86_64-2.txz

 |   |   |-- ytalk-3.3.0-x86_64-2.txz.asc

@@ -2688,9 +2790,9 @@ see additional documentation files.
 |   |   |-- xfig-3.2.4-x86_64-5.txz

 |   |   `-- xfig-3.2.4-x86_64-5.txz.asc

 |   |-- tcl

-|   |   |-- expect-5.44.1.11-x86_64-3.txt

-|   |   |-- expect-5.44.1.11-x86_64-3.txz

-|   |   |-- expect-5.44.1.11-x86_64-3.txz.asc

+|   |   |-- expect-5.44.1.15-x86_64-1.txt

+|   |   |-- expect-5.44.1.15-x86_64-1.txz

+|   |   |-- expect-5.44.1.15-x86_64-1.txz.asc

 |   |   |-- hfsutils-3.2.6-x86_64-4.txt

 |   |   |-- hfsutils-3.2.6-x86_64-4.txz

 |   |   |-- hfsutils-3.2.6-x86_64-4.txz.asc

@@ -2699,431 +2801,419 @@ see additional documentation files.
 |   |   |-- maketag

 |   |   |-- maketag.ez

 |   |   |-- tagfile

-|   |   |-- tcl-8.5.8-x86_64-1.txt

-|   |   |-- tcl-8.5.8-x86_64-1.txz

-|   |   |-- tcl-8.5.8-x86_64-1.txz.asc

+|   |   |-- tcl-8.5.9-x86_64-1.txt

+|   |   |-- tcl-8.5.9-x86_64-1.txz

+|   |   |-- tcl-8.5.9-x86_64-1.txz.asc

 |   |   |-- tclx-8.4-x86_64-3.txt

 |   |   |-- tclx-8.4-x86_64-3.txz

 |   |   |-- tclx-8.4-x86_64-3.txz.asc

 |   |   |-- tix-8.4.3-x86_64-2.txt

 |   |   |-- tix-8.4.3-x86_64-2.txz

 |   |   |-- tix-8.4.3-x86_64-2.txz.asc

-|   |   |-- tk-8.5.8-x86_64-1.txt

-|   |   |-- tk-8.5.8-x86_64-1.txz

-|   |   `-- tk-8.5.8-x86_64-1.txz.asc

+|   |   |-- tk-8.5.9-x86_64-1.txt

+|   |   |-- tk-8.5.9-x86_64-1.txz

+|   |   `-- tk-8.5.9-x86_64-1.txz.asc

 |   |-- x

-|   |   |-- anthy-9100e-x86_64-1.txt

-|   |   |-- anthy-9100e-x86_64-1.txz

-|   |   |-- anthy-9100e-x86_64-1.txz.asc

-|   |   |-- appres-1.0.2-x86_64-1.txt

-|   |   |-- appres-1.0.2-x86_64-1.txz

-|   |   |-- appres-1.0.2-x86_64-1.txz.asc

-|   |   |-- bdftopcf-1.0.2-x86_64-1.txt

-|   |   |-- bdftopcf-1.0.2-x86_64-1.txz

-|   |   |-- bdftopcf-1.0.2-x86_64-1.txz.asc

-|   |   |-- beforelight-1.0.3-x86_64-1.txt

-|   |   |-- beforelight-1.0.3-x86_64-1.txz

-|   |   |-- beforelight-1.0.3-x86_64-1.txz.asc

-|   |   |-- bigreqsproto-1.1.0-noarch-1.txt

-|   |   |-- bigreqsproto-1.1.0-noarch-1.txz

-|   |   |-- bigreqsproto-1.1.0-noarch-1.txz.asc

-|   |   |-- bitmap-1.0.4-x86_64-1.txt

-|   |   |-- bitmap-1.0.4-x86_64-1.txz

-|   |   |-- bitmap-1.0.4-x86_64-1.txz.asc

-|   |   |-- compiz-0.8.6-x86_64-1.txt

-|   |   |-- compiz-0.8.6-x86_64-1.txz

-|   |   |-- compiz-0.8.6-x86_64-1.txz.asc

-|   |   |-- compositeproto-0.4.1-noarch-1.txt

-|   |   |-- compositeproto-0.4.1-noarch-1.txz

-|   |   |-- compositeproto-0.4.1-noarch-1.txz.asc

-|   |   |-- damageproto-1.2.0-noarch-1.txt

-|   |   |-- damageproto-1.2.0-noarch-1.txz

-|   |   |-- damageproto-1.2.0-noarch-1.txz.asc

-|   |   |-- dejavu-fonts-ttf-2.30-noarch-1.txt

-|   |   |-- dejavu-fonts-ttf-2.30-noarch-1.txz

-|   |   |-- dejavu-fonts-ttf-2.30-noarch-1.txz.asc

-|   |   |-- dmxproto-2.3-noarch-1.txt

-|   |   |-- dmxproto-2.3-noarch-1.txz

-|   |   |-- dmxproto-2.3-noarch-1.txz.asc

+|   |   |-- anthy-9100h-x86_64-1.txt

+|   |   |-- anthy-9100h-x86_64-1.txz

+|   |   |-- anthy-9100h-x86_64-1.txz.asc

+|   |   |-- appres-1.0.3-x86_64-1.txt

+|   |   |-- appres-1.0.3-x86_64-1.txz

+|   |   |-- appres-1.0.3-x86_64-1.txz.asc

+|   |   |-- bdftopcf-1.0.3-x86_64-1.txt

+|   |   |-- bdftopcf-1.0.3-x86_64-1.txz

+|   |   |-- bdftopcf-1.0.3-x86_64-1.txz.asc

+|   |   |-- beforelight-1.0.4-x86_64-1.txt

+|   |   |-- beforelight-1.0.4-x86_64-1.txz

+|   |   |-- beforelight-1.0.4-x86_64-1.txz.asc

+|   |   |-- bigreqsproto-1.1.1-noarch-1.txt

+|   |   |-- bigreqsproto-1.1.1-noarch-1.txz

+|   |   |-- bigreqsproto-1.1.1-noarch-1.txz.asc

+|   |   |-- bitmap-1.0.5-x86_64-1.txt

+|   |   |-- bitmap-1.0.5-x86_64-1.txz

+|   |   |-- bitmap-1.0.5-x86_64-1.txz.asc

+|   |   |-- compiz-0.8.8-x86_64-1.txt

+|   |   |-- compiz-0.8.8-x86_64-1.txz

+|   |   |-- compiz-0.8.8-x86_64-1.txz.asc

+|   |   |-- compositeproto-0.4.2-noarch-1.txt

+|   |   |-- compositeproto-0.4.2-noarch-1.txz

+|   |   |-- compositeproto-0.4.2-noarch-1.txz.asc

+|   |   |-- damageproto-1.2.1-noarch-1.txt

+|   |   |-- damageproto-1.2.1-noarch-1.txz

+|   |   |-- damageproto-1.2.1-noarch-1.txz.asc

+|   |   |-- dejavu-fonts-ttf-2.33-noarch-1.txt

+|   |   |-- dejavu-fonts-ttf-2.33-noarch-1.txz

+|   |   |-- dejavu-fonts-ttf-2.33-noarch-1.txz.asc

+|   |   |-- dmxproto-2.3.1-noarch-1.txt

+|   |   |-- dmxproto-2.3.1-noarch-1.txz

+|   |   |-- dmxproto-2.3.1-noarch-1.txz.asc

 |   |   |-- dri2proto-2.3-x86_64-1.txt

 |   |   |-- dri2proto-2.3-x86_64-1.txz

 |   |   |-- dri2proto-2.3-x86_64-1.txz.asc

-|   |   |-- editres-1.0.4-x86_64-1.txt

-|   |   |-- editres-1.0.4-x86_64-1.txz

-|   |   |-- editres-1.0.4-x86_64-1.txz.asc

-|   |   |-- encodings-1.0.3-noarch-1.txt

-|   |   |-- encodings-1.0.3-noarch-1.txz

-|   |   |-- encodings-1.0.3-noarch-1.txz.asc

-|   |   |-- evieext-1.1.0-noarch-1.txt

-|   |   |-- evieext-1.1.0-noarch-1.txz

-|   |   |-- evieext-1.1.0-noarch-1.txz.asc

-|   |   |-- fixesproto-4.1.1-noarch-1.txt

-|   |   |-- fixesproto-4.1.1-noarch-1.txz

-|   |   |-- fixesproto-4.1.1-noarch-1.txz.asc

-|   |   |-- font-adobe-100dpi-1.0.1-noarch-1.txt

-|   |   |-- font-adobe-100dpi-1.0.1-noarch-1.txz

-|   |   |-- font-adobe-100dpi-1.0.1-noarch-1.txz.asc

-|   |   |-- font-adobe-75dpi-1.0.1-noarch-1.txt

-|   |   |-- font-adobe-75dpi-1.0.1-noarch-1.txz

-|   |   |-- font-adobe-75dpi-1.0.1-noarch-1.txz.asc

-|   |   |-- font-adobe-utopia-100dpi-1.0.2-noarch-1.txt

-|   |   |-- font-adobe-utopia-100dpi-1.0.2-noarch-1.txz

-|   |   |-- font-adobe-utopia-100dpi-1.0.2-noarch-1.txz.asc

-|   |   |-- font-adobe-utopia-75dpi-1.0.2-noarch-1.txt

-|   |   |-- font-adobe-utopia-75dpi-1.0.2-noarch-1.txz

-|   |   |-- font-adobe-utopia-75dpi-1.0.2-noarch-1.txz.asc

-|   |   |-- font-adobe-utopia-type1-1.0.2-noarch-1.txt

-|   |   |-- font-adobe-utopia-type1-1.0.2-noarch-1.txz

-|   |   |-- font-adobe-utopia-type1-1.0.2-noarch-1.txz.asc

-|   |   |-- font-alias-1.0.2-noarch-1.txt

-|   |   |-- font-alias-1.0.2-noarch-1.txz

-|   |   |-- font-alias-1.0.2-noarch-1.txz.asc

-|   |   |-- font-arabic-misc-1.0.1-noarch-1.txt

-|   |   |-- font-arabic-misc-1.0.1-noarch-1.txz

-|   |   |-- font-arabic-misc-1.0.1-noarch-1.txz.asc

-|   |   |-- font-bh-100dpi-1.0.1-noarch-1.txt

-|   |   |-- font-bh-100dpi-1.0.1-noarch-1.txz

-|   |   |-- font-bh-100dpi-1.0.1-noarch-1.txz.asc

-|   |   |-- font-bh-75dpi-1.0.1-noarch-1.txt

-|   |   |-- font-bh-75dpi-1.0.1-noarch-1.txz

-|   |   |-- font-bh-75dpi-1.0.1-noarch-1.txz.asc

-|   |   |-- font-bh-lucidatypewriter-100dpi-1.0.1-noarch-1.txt

-|   |   |-- font-bh-lucidatypewriter-100dpi-1.0.1-noarch-1.txz

-|   |   |-- font-bh-lucidatypewriter-100dpi-1.0.1-noarch-1.txz.asc

-|   |   |-- font-bh-lucidatypewriter-75dpi-1.0.1-noarch-1.txt

-|   |   |-- font-bh-lucidatypewriter-75dpi-1.0.1-noarch-1.txz

-|   |   |-- font-bh-lucidatypewriter-75dpi-1.0.1-noarch-1.txz.asc

-|   |   |-- font-bh-ttf-1.0.1-noarch-1.txt

-|   |   |-- font-bh-ttf-1.0.1-noarch-1.txz

-|   |   |-- font-bh-ttf-1.0.1-noarch-1.txz.asc

-|   |   |-- font-bh-type1-1.0.1-noarch-1.txt

-|   |   |-- font-bh-type1-1.0.1-noarch-1.txz

-|   |   |-- font-bh-type1-1.0.1-noarch-1.txz.asc

-|   |   |-- font-bitstream-100dpi-1.0.1-noarch-1.txt

-|   |   |-- font-bitstream-100dpi-1.0.1-noarch-1.txz

-|   |   |-- font-bitstream-100dpi-1.0.1-noarch-1.txz.asc

-|   |   |-- font-bitstream-75dpi-1.0.1-noarch-1.txt

-|   |   |-- font-bitstream-75dpi-1.0.1-noarch-1.txz

-|   |   |-- font-bitstream-75dpi-1.0.1-noarch-1.txz.asc

-|   |   |-- font-bitstream-speedo-1.0.1-noarch-1.txt

-|   |   |-- font-bitstream-speedo-1.0.1-noarch-1.txz

-|   |   |-- font-bitstream-speedo-1.0.1-noarch-1.txz.asc

-|   |   |-- font-bitstream-type1-1.0.1-noarch-1.txt

-|   |   |-- font-bitstream-type1-1.0.1-noarch-1.txz

-|   |   |-- font-bitstream-type1-1.0.1-noarch-1.txz.asc

-|   |   |-- font-cronyx-cyrillic-1.0.1-noarch-1.txt

-|   |   |-- font-cronyx-cyrillic-1.0.1-noarch-1.txz

-|   |   |-- font-cronyx-cyrillic-1.0.1-noarch-1.txz.asc

-|   |   |-- font-cursor-misc-1.0.1-noarch-1.txt

-|   |   |-- font-cursor-misc-1.0.1-noarch-1.txz

-|   |   |-- font-cursor-misc-1.0.1-noarch-1.txz.asc

-|   |   |-- font-daewoo-misc-1.0.1-noarch-1.txt

-|   |   |-- font-daewoo-misc-1.0.1-noarch-1.txz

-|   |   |-- font-daewoo-misc-1.0.1-noarch-1.txz.asc

-|   |   |-- font-dec-misc-1.0.1-noarch-1.txt

-|   |   |-- font-dec-misc-1.0.1-noarch-1.txz

-|   |   |-- font-dec-misc-1.0.1-noarch-1.txz.asc

-|   |   |-- font-ibm-type1-1.0.1-noarch-1.txt

-|   |   |-- font-ibm-type1-1.0.1-noarch-1.txz

-|   |   |-- font-ibm-type1-1.0.1-noarch-1.txz.asc

-|   |   |-- font-isas-misc-1.0.1-noarch-1.txt

-|   |   |-- font-isas-misc-1.0.1-noarch-1.txz

-|   |   |-- font-isas-misc-1.0.1-noarch-1.txz.asc

-|   |   |-- font-jis-misc-1.0.1-noarch-1.txt

-|   |   |-- font-jis-misc-1.0.1-noarch-1.txz

-|   |   |-- font-jis-misc-1.0.1-noarch-1.txz.asc

-|   |   |-- font-micro-misc-1.0.1-noarch-1.txt

-|   |   |-- font-micro-misc-1.0.1-noarch-1.txz

-|   |   |-- font-micro-misc-1.0.1-noarch-1.txz.asc

-|   |   |-- font-misc-cyrillic-1.0.1-noarch-1.txt

-|   |   |-- font-misc-cyrillic-1.0.1-noarch-1.txz

-|   |   |-- font-misc-cyrillic-1.0.1-noarch-1.txz.asc

-|   |   |-- font-misc-ethiopic-1.0.1-noarch-1.txt

-|   |   |-- font-misc-ethiopic-1.0.1-noarch-1.txz

-|   |   |-- font-misc-ethiopic-1.0.1-noarch-1.txz.asc

-|   |   |-- font-misc-meltho-1.0.1-noarch-1.txt

-|   |   |-- font-misc-meltho-1.0.1-noarch-1.txz

-|   |   |-- font-misc-meltho-1.0.1-noarch-1.txz.asc

-|   |   |-- font-misc-misc-1.1.0-noarch-1.txt

-|   |   |-- font-misc-misc-1.1.0-noarch-1.txz

-|   |   |-- font-misc-misc-1.1.0-noarch-1.txz.asc

-|   |   |-- font-mutt-misc-1.0.1-noarch-1.txt

-|   |   |-- font-mutt-misc-1.0.1-noarch-1.txz

-|   |   |-- font-mutt-misc-1.0.1-noarch-1.txz.asc

-|   |   |-- font-schumacher-misc-1.1.0-noarch-1.txt

-|   |   |-- font-schumacher-misc-1.1.0-noarch-1.txz

-|   |   |-- font-schumacher-misc-1.1.0-noarch-1.txz.asc

-|   |   |-- font-screen-cyrillic-1.0.2-noarch-1.txt

-|   |   |-- font-screen-cyrillic-1.0.2-noarch-1.txz

-|   |   |-- font-screen-cyrillic-1.0.2-noarch-1.txz.asc

-|   |   |-- font-sony-misc-1.0.1-noarch-1.txt

-|   |   |-- font-sony-misc-1.0.1-noarch-1.txz

-|   |   |-- font-sony-misc-1.0.1-noarch-1.txz.asc

-|   |   |-- font-sun-misc-1.0.1-noarch-1.txt

-|   |   |-- font-sun-misc-1.0.1-noarch-1.txz

-|   |   |-- font-sun-misc-1.0.1-noarch-1.txz.asc

-|   |   |-- font-util-1.1.1-x86_64-1.txt

-|   |   |-- font-util-1.1.1-x86_64-1.txz

-|   |   |-- font-util-1.1.1-x86_64-1.txz.asc

-|   |   |-- font-winitzki-cyrillic-1.0.1-noarch-1.txt

-|   |   |-- font-winitzki-cyrillic-1.0.1-noarch-1.txz

-|   |   |-- font-winitzki-cyrillic-1.0.1-noarch-1.txz.asc

-|   |   |-- font-xfree86-type1-1.0.2-noarch-1.txt

-|   |   |-- font-xfree86-type1-1.0.2-noarch-1.txz

-|   |   |-- font-xfree86-type1-1.0.2-noarch-1.txz.asc

+|   |   |-- editres-1.0.5-x86_64-1.txt

+|   |   |-- editres-1.0.5-x86_64-1.txz

+|   |   |-- editres-1.0.5-x86_64-1.txz.asc

+|   |   |-- encodings-1.0.4-noarch-1.txt

+|   |   |-- encodings-1.0.4-noarch-1.txz

+|   |   |-- encodings-1.0.4-noarch-1.txz.asc

+|   |   |-- evieext-1.1.1-noarch-1.txt

+|   |   |-- evieext-1.1.1-noarch-1.txz

+|   |   |-- evieext-1.1.1-noarch-1.txz.asc

+|   |   |-- fixesproto-5.0-x86_64-1.txt

+|   |   |-- fixesproto-5.0-x86_64-1.txz

+|   |   |-- fixesproto-5.0-x86_64-1.txz.asc

+|   |   |-- font-adobe-100dpi-1.0.3-noarch-1.txt

+|   |   |-- font-adobe-100dpi-1.0.3-noarch-1.txz

+|   |   |-- font-adobe-100dpi-1.0.3-noarch-1.txz.asc

+|   |   |-- font-adobe-75dpi-1.0.3-noarch-1.txt

+|   |   |-- font-adobe-75dpi-1.0.3-noarch-1.txz

+|   |   |-- font-adobe-75dpi-1.0.3-noarch-1.txz.asc

+|   |   |-- font-adobe-utopia-100dpi-1.0.4-noarch-1.txt

+|   |   |-- font-adobe-utopia-100dpi-1.0.4-noarch-1.txz

+|   |   |-- font-adobe-utopia-100dpi-1.0.4-noarch-1.txz.asc

+|   |   |-- font-adobe-utopia-75dpi-1.0.4-noarch-1.txt

+|   |   |-- font-adobe-utopia-75dpi-1.0.4-noarch-1.txz

+|   |   |-- font-adobe-utopia-75dpi-1.0.4-noarch-1.txz.asc

+|   |   |-- font-adobe-utopia-type1-1.0.4-noarch-1.txt

+|   |   |-- font-adobe-utopia-type1-1.0.4-noarch-1.txz

+|   |   |-- font-adobe-utopia-type1-1.0.4-noarch-1.txz.asc

+|   |   |-- font-alias-1.0.3-noarch-1.txt

+|   |   |-- font-alias-1.0.3-noarch-1.txz

+|   |   |-- font-alias-1.0.3-noarch-1.txz.asc

+|   |   |-- font-arabic-misc-1.0.3-noarch-1.txt

+|   |   |-- font-arabic-misc-1.0.3-noarch-1.txz

+|   |   |-- font-arabic-misc-1.0.3-noarch-1.txz.asc

+|   |   |-- font-bh-100dpi-1.0.3-noarch-1.txt

+|   |   |-- font-bh-100dpi-1.0.3-noarch-1.txz

+|   |   |-- font-bh-100dpi-1.0.3-noarch-1.txz.asc

+|   |   |-- font-bh-75dpi-1.0.3-noarch-1.txt

+|   |   |-- font-bh-75dpi-1.0.3-noarch-1.txz

+|   |   |-- font-bh-75dpi-1.0.3-noarch-1.txz.asc

+|   |   |-- font-bh-lucidatypewriter-100dpi-1.0.3-noarch-1.txt

+|   |   |-- font-bh-lucidatypewriter-100dpi-1.0.3-noarch-1.txz

+|   |   |-- font-bh-lucidatypewriter-100dpi-1.0.3-noarch-1.txz.asc

+|   |   |-- font-bh-lucidatypewriter-75dpi-1.0.3-noarch-1.txt

+|   |   |-- font-bh-lucidatypewriter-75dpi-1.0.3-noarch-1.txz

+|   |   |-- font-bh-lucidatypewriter-75dpi-1.0.3-noarch-1.txz.asc

+|   |   |-- font-bh-ttf-1.0.3-noarch-1.txt

+|   |   |-- font-bh-ttf-1.0.3-noarch-1.txz

+|   |   |-- font-bh-ttf-1.0.3-noarch-1.txz.asc

+|   |   |-- font-bh-type1-1.0.3-noarch-1.txt

+|   |   |-- font-bh-type1-1.0.3-noarch-1.txz

+|   |   |-- font-bh-type1-1.0.3-noarch-1.txz.asc

+|   |   |-- font-bitstream-100dpi-1.0.3-noarch-1.txt

+|   |   |-- font-bitstream-100dpi-1.0.3-noarch-1.txz

+|   |   |-- font-bitstream-100dpi-1.0.3-noarch-1.txz.asc

+|   |   |-- font-bitstream-75dpi-1.0.3-noarch-1.txt

+|   |   |-- font-bitstream-75dpi-1.0.3-noarch-1.txz

+|   |   |-- font-bitstream-75dpi-1.0.3-noarch-1.txz.asc

+|   |   |-- font-bitstream-speedo-1.0.2-noarch-1.txt

+|   |   |-- font-bitstream-speedo-1.0.2-noarch-1.txz

+|   |   |-- font-bitstream-speedo-1.0.2-noarch-1.txz.asc

+|   |   |-- font-bitstream-type1-1.0.3-noarch-1.txt

+|   |   |-- font-bitstream-type1-1.0.3-noarch-1.txz

+|   |   |-- font-bitstream-type1-1.0.3-noarch-1.txz.asc

+|   |   |-- font-cronyx-cyrillic-1.0.3-noarch-1.txt

+|   |   |-- font-cronyx-cyrillic-1.0.3-noarch-1.txz

+|   |   |-- font-cronyx-cyrillic-1.0.3-noarch-1.txz.asc

+|   |   |-- font-cursor-misc-1.0.3-noarch-1.txt

+|   |   |-- font-cursor-misc-1.0.3-noarch-1.txz

+|   |   |-- font-cursor-misc-1.0.3-noarch-1.txz.asc

+|   |   |-- font-daewoo-misc-1.0.3-noarch-1.txt

+|   |   |-- font-daewoo-misc-1.0.3-noarch-1.txz

+|   |   |-- font-daewoo-misc-1.0.3-noarch-1.txz.asc

+|   |   |-- font-dec-misc-1.0.3-noarch-1.txt

+|   |   |-- font-dec-misc-1.0.3-noarch-1.txz

+|   |   |-- font-dec-misc-1.0.3-noarch-1.txz.asc

+|   |   |-- font-ibm-type1-1.0.3-noarch-1.txt

+|   |   |-- font-ibm-type1-1.0.3-noarch-1.txz

+|   |   |-- font-ibm-type1-1.0.3-noarch-1.txz.asc

+|   |   |-- font-isas-misc-1.0.3-noarch-1.txt

+|   |   |-- font-isas-misc-1.0.3-noarch-1.txz

+|   |   |-- font-isas-misc-1.0.3-noarch-1.txz.asc

+|   |   |-- font-jis-misc-1.0.3-noarch-1.txt

+|   |   |-- font-jis-misc-1.0.3-noarch-1.txz

+|   |   |-- font-jis-misc-1.0.3-noarch-1.txz.asc

+|   |   |-- font-micro-misc-1.0.3-noarch-1.txt

+|   |   |-- font-micro-misc-1.0.3-noarch-1.txz

+|   |   |-- font-micro-misc-1.0.3-noarch-1.txz.asc

+|   |   |-- font-misc-cyrillic-1.0.3-noarch-1.txt

+|   |   |-- font-misc-cyrillic-1.0.3-noarch-1.txz

+|   |   |-- font-misc-cyrillic-1.0.3-noarch-1.txz.asc

+|   |   |-- font-misc-ethiopic-1.0.3-noarch-1.txt

+|   |   |-- font-misc-ethiopic-1.0.3-noarch-1.txz

+|   |   |-- font-misc-ethiopic-1.0.3-noarch-1.txz.asc

+|   |   |-- font-misc-meltho-1.0.3-noarch-1.txt

+|   |   |-- font-misc-meltho-1.0.3-noarch-1.txz

+|   |   |-- font-misc-meltho-1.0.3-noarch-1.txz.asc

+|   |   |-- font-misc-misc-1.1.2-noarch-1.txt

+|   |   |-- font-misc-misc-1.1.2-noarch-1.txz

+|   |   |-- font-misc-misc-1.1.2-noarch-1.txz.asc

+|   |   |-- font-mutt-misc-1.0.3-noarch-1.txt

+|   |   |-- font-mutt-misc-1.0.3-noarch-1.txz

+|   |   |-- font-mutt-misc-1.0.3-noarch-1.txz.asc

+|   |   |-- font-schumacher-misc-1.1.2-noarch-1.txt

+|   |   |-- font-schumacher-misc-1.1.2-noarch-1.txz

+|   |   |-- font-schumacher-misc-1.1.2-noarch-1.txz.asc

+|   |   |-- font-screen-cyrillic-1.0.4-noarch-1.txt

+|   |   |-- font-screen-cyrillic-1.0.4-noarch-1.txz

+|   |   |-- font-screen-cyrillic-1.0.4-noarch-1.txz.asc

+|   |   |-- font-sony-misc-1.0.3-noarch-1.txt

+|   |   |-- font-sony-misc-1.0.3-noarch-1.txz

+|   |   |-- font-sony-misc-1.0.3-noarch-1.txz.asc

+|   |   |-- font-sun-misc-1.0.3-noarch-1.txt

+|   |   |-- font-sun-misc-1.0.3-noarch-1.txz

+|   |   |-- font-sun-misc-1.0.3-noarch-1.txz.asc

+|   |   |-- font-util-1.2.0-x86_64-1.txt

+|   |   |-- font-util-1.2.0-x86_64-1.txz

+|   |   |-- font-util-1.2.0-x86_64-1.txz.asc

+|   |   |-- font-winitzki-cyrillic-1.0.3-noarch-1.txt

+|   |   |-- font-winitzki-cyrillic-1.0.3-noarch-1.txz

+|   |   |-- font-winitzki-cyrillic-1.0.3-noarch-1.txz.asc

+|   |   |-- font-xfree86-type1-1.0.4-noarch-1.txt

+|   |   |-- font-xfree86-type1-1.0.4-noarch-1.txz

+|   |   |-- font-xfree86-type1-1.0.4-noarch-1.txz.asc

 |   |   |-- fontcacheproto-0.1.3-noarch-1.txt

 |   |   |-- fontcacheproto-0.1.3-noarch-1.txz

 |   |   |-- fontcacheproto-0.1.3-noarch-1.txz.asc

 |   |   |-- fontconfig-2.8.0-x86_64-1.txt

 |   |   |-- fontconfig-2.8.0-x86_64-1.txz

 |   |   |-- fontconfig-2.8.0-x86_64-1.txz.asc

-|   |   |-- fontsproto-2.1.0-noarch-1.txt

-|   |   |-- fontsproto-2.1.0-noarch-1.txz

-|   |   |-- fontsproto-2.1.0-noarch-1.txz.asc

+|   |   |-- fontsproto-2.1.1-noarch-1.txt

+|   |   |-- fontsproto-2.1.1-noarch-1.txz

+|   |   |-- fontsproto-2.1.1-noarch-1.txz.asc

 |   |   |-- fonttosfnt-1.0.4-x86_64-1.txt

 |   |   |-- fonttosfnt-1.0.4-x86_64-1.txz

 |   |   |-- fonttosfnt-1.0.4-x86_64-1.txz.asc

-|   |   |-- fslsfonts-1.0.2-x86_64-1.txt

-|   |   |-- fslsfonts-1.0.2-x86_64-1.txz

-|   |   |-- fslsfonts-1.0.2-x86_64-1.txz.asc

-|   |   |-- fstobdf-1.0.3-x86_64-1.txt

-|   |   |-- fstobdf-1.0.3-x86_64-1.txz

-|   |   |-- fstobdf-1.0.3-x86_64-1.txz.asc

+|   |   |-- fslsfonts-1.0.3-x86_64-1.txt

+|   |   |-- fslsfonts-1.0.3-x86_64-1.txz

+|   |   |-- fslsfonts-1.0.3-x86_64-1.txz.asc

+|   |   |-- fstobdf-1.0.4-x86_64-1.txt

+|   |   |-- fstobdf-1.0.4-x86_64-1.txz

+|   |   |-- fstobdf-1.0.4-x86_64-1.txz.asc

 |   |   |-- gccmakedep-1.0.2-noarch-2.txt

 |   |   |-- gccmakedep-1.0.2-noarch-2.txz

 |   |   |-- gccmakedep-1.0.2-noarch-2.txz.asc

-|   |   |-- glew-1.5.1-x86_64-1.txt

-|   |   |-- glew-1.5.1-x86_64-1.txz

-|   |   |-- glew-1.5.1-x86_64-1.txz.asc

-|   |   |-- glproto-1.4.11-noarch-1.txt

-|   |   |-- glproto-1.4.11-noarch-1.txz

-|   |   |-- glproto-1.4.11-noarch-1.txz.asc

-|   |   |-- iceauth-1.0.3-x86_64-1.txt

-|   |   |-- iceauth-1.0.3-x86_64-1.txz

-|   |   |-- iceauth-1.0.3-x86_64-1.txz.asc

-|   |   |-- ico-1.0.2-x86_64-2.txt

-|   |   |-- ico-1.0.2-x86_64-2.txz

-|   |   |-- ico-1.0.2-x86_64-2.txz.asc

-|   |   |-- imake-1.0.3-x86_64-1.txt

-|   |   |-- imake-1.0.3-x86_64-1.txz

-|   |   |-- imake-1.0.3-x86_64-1.txz.asc

-|   |   |-- inputproto-2.0-noarch-1.txt

-|   |   |-- inputproto-2.0-noarch-1.txz

-|   |   |-- inputproto-2.0-noarch-1.txz.asc

+|   |   |-- glew-1.5.7-x86_64-1.txt

+|   |   |-- glew-1.5.7-x86_64-1.txz

+|   |   |-- glew-1.5.7-x86_64-1.txz.asc

+|   |   |-- glproto-1.4.12-noarch-1.txt

+|   |   |-- glproto-1.4.12-noarch-1.txz

+|   |   |-- glproto-1.4.12-noarch-1.txz.asc

+|   |   |-- iceauth-1.0.4-x86_64-1.txt

+|   |   |-- iceauth-1.0.4-x86_64-1.txz

+|   |   |-- iceauth-1.0.4-x86_64-1.txz.asc

+|   |   |-- ico-1.0.3-x86_64-1.txt

+|   |   |-- ico-1.0.3-x86_64-1.txz

+|   |   |-- ico-1.0.3-x86_64-1.txz.asc

+|   |   |-- imake-1.0.4-x86_64-1.txt

+|   |   |-- imake-1.0.4-x86_64-1.txz

+|   |   |-- imake-1.0.4-x86_64-1.txz.asc

+|   |   |-- inputproto-2.0.1-noarch-1.txt

+|   |   |-- inputproto-2.0.1-noarch-1.txz

+|   |   |-- inputproto-2.0.1-noarch-1.txz.asc

 |   |   |-- install-packages

 |   |   |-- install.end

 |   |   |-- intel-gpu-tools-1.0.2-x86_64-1.txt

 |   |   |-- intel-gpu-tools-1.0.2-x86_64-1.txz

 |   |   |-- intel-gpu-tools-1.0.2-x86_64-1.txz.asc

-|   |   |-- kbproto-1.0.4-noarch-1.txt

-|   |   |-- kbproto-1.0.4-noarch-1.txz

-|   |   |-- kbproto-1.0.4-noarch-1.txz.asc

-|   |   |-- libFS-1.0.2-x86_64-1.txt

-|   |   |-- libFS-1.0.2-x86_64-1.txz

-|   |   |-- libFS-1.0.2-x86_64-1.txz.asc

-|   |   |-- libICE-1.0.6-x86_64-1.txt

-|   |   |-- libICE-1.0.6-x86_64-1.txz

-|   |   |-- libICE-1.0.6-x86_64-1.txz.asc

-|   |   |-- libSM-1.1.1-x86_64-1.txt

-|   |   |-- libSM-1.1.1-x86_64-1.txz

-|   |   |-- libSM-1.1.1-x86_64-1.txz.asc

-|   |   |-- libX11-1.3.3-x86_64-1.txt

-|   |   |-- libX11-1.3.3-x86_64-1.txz

-|   |   |-- libX11-1.3.3-x86_64-1.txz.asc

-|   |   |-- libXScrnSaver-1.2.0-x86_64-1.txt

-|   |   |-- libXScrnSaver-1.2.0-x86_64-1.txz

-|   |   |-- libXScrnSaver-1.2.0-x86_64-1.txz.asc

-|   |   |-- libXTrap-1.0.0-x86_64-2.txt

-|   |   |-- libXTrap-1.0.0-x86_64-2.txz

-|   |   |-- libXTrap-1.0.0-x86_64-2.txz.asc

-|   |   |-- libXau-1.0.5-x86_64-1.txt

-|   |   |-- libXau-1.0.5-x86_64-1.txz

-|   |   |-- libXau-1.0.5-x86_64-1.txz.asc

-|   |   |-- libXaw-1.0.7-x86_64-1.txt

-|   |   |-- libXaw-1.0.7-x86_64-1.txz

-|   |   |-- libXaw-1.0.7-x86_64-1.txz.asc

-|   |   |-- libXcomposite-0.4.1-x86_64-1.txt

-|   |   |-- libXcomposite-0.4.1-x86_64-1.txz

-|   |   |-- libXcomposite-0.4.1-x86_64-1.txz.asc

-|   |   |-- libXcursor-1.1.10-x86_64-1.txt

-|   |   |-- libXcursor-1.1.10-x86_64-1.txz

-|   |   |-- libXcursor-1.1.10-x86_64-1.txz.asc

-|   |   |-- libXdamage-1.1.2-x86_64-1.txt

-|   |   |-- libXdamage-1.1.2-x86_64-1.txz

-|   |   |-- libXdamage-1.1.2-x86_64-1.txz.asc

-|   |   |-- libXdmcp-1.0.3-x86_64-1.txt

-|   |   |-- libXdmcp-1.0.3-x86_64-1.txz

-|   |   |-- libXdmcp-1.0.3-x86_64-1.txz.asc

-|   |   |-- libXevie-1.0.2-x86_64-2.txt

-|   |   |-- libXevie-1.0.2-x86_64-2.txz

-|   |   |-- libXevie-1.0.2-x86_64-2.txz.asc

-|   |   |-- libXext-1.1-x86_64-1.txt

-|   |   |-- libXext-1.1-x86_64-1.txz

-|   |   |-- libXext-1.1-x86_64-1.txz.asc

-|   |   |-- libXfixes-4.0.4-x86_64-1.txt

-|   |   |-- libXfixes-4.0.4-x86_64-1.txz

-|   |   |-- libXfixes-4.0.4-x86_64-1.txz.asc

-|   |   |-- libXfont-1.4.1-x86_64-1.txt

-|   |   |-- libXfont-1.4.1-x86_64-1.txz

-|   |   |-- libXfont-1.4.1-x86_64-1.txz.asc

+|   |   |-- kbproto-1.0.5-noarch-1.txt

+|   |   |-- kbproto-1.0.5-noarch-1.txz

+|   |   |-- kbproto-1.0.5-noarch-1.txz.asc

+|   |   |-- libFS-1.0.3-x86_64-1.txt

+|   |   |-- libFS-1.0.3-x86_64-1.txz

+|   |   |-- libFS-1.0.3-x86_64-1.txz.asc

+|   |   |-- libICE-1.0.7-x86_64-1.txt

+|   |   |-- libICE-1.0.7-x86_64-1.txz

+|   |   |-- libICE-1.0.7-x86_64-1.txz.asc

+|   |   |-- libSM-1.2.0-x86_64-1.txt

+|   |   |-- libSM-1.2.0-x86_64-1.txz

+|   |   |-- libSM-1.2.0-x86_64-1.txz.asc

+|   |   |-- libX11-1.4.3-x86_64-2.txt

+|   |   |-- libX11-1.4.3-x86_64-2.txz

+|   |   |-- libX11-1.4.3-x86_64-2.txz.asc

+|   |   |-- libXScrnSaver-1.2.1-x86_64-1.txt

+|   |   |-- libXScrnSaver-1.2.1-x86_64-1.txz

+|   |   |-- libXScrnSaver-1.2.1-x86_64-1.txz.asc

+|   |   |-- libXau-1.0.6-x86_64-1.txt

+|   |   |-- libXau-1.0.6-x86_64-1.txz

+|   |   |-- libXau-1.0.6-x86_64-1.txz.asc

+|   |   |-- libXaw-1.0.9-x86_64-1.txt

+|   |   |-- libXaw-1.0.9-x86_64-1.txz

+|   |   |-- libXaw-1.0.9-x86_64-1.txz.asc

+|   |   |-- libXcomposite-0.4.3-x86_64-1.txt

+|   |   |-- libXcomposite-0.4.3-x86_64-1.txz

+|   |   |-- libXcomposite-0.4.3-x86_64-1.txz.asc

+|   |   |-- libXcursor-1.1.11-x86_64-1.txt

+|   |   |-- libXcursor-1.1.11-x86_64-1.txz

+|   |   |-- libXcursor-1.1.11-x86_64-1.txz.asc

+|   |   |-- libXdamage-1.1.3-x86_64-1.txt

+|   |   |-- libXdamage-1.1.3-x86_64-1.txz

+|   |   |-- libXdamage-1.1.3-x86_64-1.txz.asc

+|   |   |-- libXdmcp-1.1.0-x86_64-1.txt

+|   |   |-- libXdmcp-1.1.0-x86_64-1.txz

+|   |   |-- libXdmcp-1.1.0-x86_64-1.txz.asc

+|   |   |-- libXevie-1.0.3-x86_64-1.txt

+|   |   |-- libXevie-1.0.3-x86_64-1.txz

+|   |   |-- libXevie-1.0.3-x86_64-1.txz.asc

+|   |   |-- libXext-1.2.0-x86_64-1.txt

+|   |   |-- libXext-1.2.0-x86_64-1.txz

+|   |   |-- libXext-1.2.0-x86_64-1.txz.asc

+|   |   |-- libXfixes-5.0-x86_64-1.txt

+|   |   |-- libXfixes-5.0-x86_64-1.txz

+|   |   |-- libXfixes-5.0-x86_64-1.txz.asc

+|   |   |-- libXfont-1.4.3-x86_64-1.txt

+|   |   |-- libXfont-1.4.3-x86_64-1.txz

+|   |   |-- libXfont-1.4.3-x86_64-1.txz.asc

 |   |   |-- libXfontcache-1.0.5-x86_64-1.txt

 |   |   |-- libXfontcache-1.0.5-x86_64-1.txz

 |   |   |-- libXfontcache-1.0.5-x86_64-1.txz.asc

-|   |   |-- libXft-2.1.14-x86_64-1.txt

-|   |   |-- libXft-2.1.14-x86_64-1.txz

-|   |   |-- libXft-2.1.14-x86_64-1.txz.asc

-|   |   |-- libXi-1.3-x86_64-1.txt

-|   |   |-- libXi-1.3-x86_64-1.txz

-|   |   |-- libXi-1.3-x86_64-1.txz.asc

-|   |   |-- libXinerama-1.1-x86_64-1.txt

-|   |   |-- libXinerama-1.1-x86_64-1.txz

-|   |   |-- libXinerama-1.1-x86_64-1.txz.asc

-|   |   |-- libXmu-1.0.5-x86_64-1.txt

-|   |   |-- libXmu-1.0.5-x86_64-1.txz

-|   |   |-- libXmu-1.0.5-x86_64-1.txz.asc

-|   |   |-- libXp-1.0.0-x86_64-2.txt

-|   |   |-- libXp-1.0.0-x86_64-2.txz

-|   |   |-- libXp-1.0.0-x86_64-2.txz.asc

-|   |   |-- libXpm-3.5.8-x86_64-1.txt

-|   |   |-- libXpm-3.5.8-x86_64-1.txz

-|   |   |-- libXpm-3.5.8-x86_64-1.txz.asc

-|   |   |-- libXprintAppUtil-1.0.1-x86_64-2.txt

-|   |   |-- libXprintAppUtil-1.0.1-x86_64-2.txz

-|   |   |-- libXprintAppUtil-1.0.1-x86_64-2.txz.asc

-|   |   |-- libXprintUtil-1.0.1-x86_64-2.txt

-|   |   |-- libXprintUtil-1.0.1-x86_64-2.txz

-|   |   |-- libXprintUtil-1.0.1-x86_64-2.txz.asc

-|   |   |-- libXrandr-1.3.0-x86_64-1.txt

-|   |   |-- libXrandr-1.3.0-x86_64-1.txz

-|   |   |-- libXrandr-1.3.0-x86_64-1.txz.asc

-|   |   |-- libXrender-0.9.5-x86_64-1.txt

-|   |   |-- libXrender-0.9.5-x86_64-1.txz

-|   |   |-- libXrender-0.9.5-x86_64-1.txz.asc

-|   |   |-- libXres-1.0.4-x86_64-1.txt

-|   |   |-- libXres-1.0.4-x86_64-1.txz

-|   |   |-- libXres-1.0.4-x86_64-1.txz.asc

-|   |   |-- libXt-1.0.8-x86_64-1.txt

-|   |   |-- libXt-1.0.8-x86_64-1.txz

-|   |   |-- libXt-1.0.8-x86_64-1.txz.asc

-|   |   |-- libXtst-1.1.0-x86_64-1.txt

-|   |   |-- libXtst-1.1.0-x86_64-1.txz

-|   |   |-- libXtst-1.1.0-x86_64-1.txz.asc

-|   |   |-- libXv-1.0.5-x86_64-1.txt

-|   |   |-- libXv-1.0.5-x86_64-1.txz

-|   |   |-- libXv-1.0.5-x86_64-1.txz.asc

-|   |   |-- libXvMC-1.0.5-x86_64-1.txt

-|   |   |-- libXvMC-1.0.5-x86_64-1.txz

-|   |   |-- libXvMC-1.0.5-x86_64-1.txz.asc

-|   |   |-- libXxf86dga-1.1.1-x86_64-1.txt

-|   |   |-- libXxf86dga-1.1.1-x86_64-1.txz

-|   |   |-- libXxf86dga-1.1.1-x86_64-1.txz.asc

-|   |   |-- libXxf86misc-1.0.2-x86_64-1.txt

-|   |   |-- libXxf86misc-1.0.2-x86_64-1.txz

-|   |   |-- libXxf86misc-1.0.2-x86_64-1.txz.asc

-|   |   |-- libXxf86vm-1.1.0-x86_64-1.txt

-|   |   |-- libXxf86vm-1.1.0-x86_64-1.txz

-|   |   |-- libXxf86vm-1.1.0-x86_64-1.txz.asc

-|   |   |-- libdmx-1.1.0-x86_64-1.txt

-|   |   |-- libdmx-1.1.0-x86_64-1.txz

-|   |   |-- libdmx-1.1.0-x86_64-1.txz.asc

-|   |   |-- libdrm-2.4.20-x86_64-1.txt

-|   |   |-- libdrm-2.4.20-x86_64-1.txz

-|   |   |-- libdrm-2.4.20-x86_64-1.txz.asc

-|   |   |-- liberation-fonts-ttf-1.04-noarch-1.txt

-|   |   |-- liberation-fonts-ttf-1.04-noarch-1.txz

-|   |   |-- liberation-fonts-ttf-1.04-noarch-1.txz.asc

-|   |   |-- libfontenc-1.0.5-x86_64-1.txt

-|   |   |-- libfontenc-1.0.5-x86_64-1.txz

-|   |   |-- libfontenc-1.0.5-x86_64-1.txz.asc

-|   |   |-- libhangul-0.0.7-x86_64-1.txt

-|   |   |-- libhangul-0.0.7-x86_64-1.txz

-|   |   |-- libhangul-0.0.7-x86_64-1.txz.asc

-|   |   |-- libpciaccess-0.11.0-x86_64-1.txt

-|   |   |-- libpciaccess-0.11.0-x86_64-1.txz

-|   |   |-- libpciaccess-0.11.0-x86_64-1.txz.asc

+|   |   |-- libXft-2.2.0-x86_64-1.txt

+|   |   |-- libXft-2.2.0-x86_64-1.txz

+|   |   |-- libXft-2.2.0-x86_64-1.txz.asc

+|   |   |-- libXi-1.4.2-x86_64-1.txt

+|   |   |-- libXi-1.4.2-x86_64-1.txz

+|   |   |-- libXi-1.4.2-x86_64-1.txz.asc

+|   |   |-- libXinerama-1.1.1-x86_64-1.txt

+|   |   |-- libXinerama-1.1.1-x86_64-1.txz

+|   |   |-- libXinerama-1.1.1-x86_64-1.txz.asc

+|   |   |-- libXmu-1.1.0-x86_64-1.txt

+|   |   |-- libXmu-1.1.0-x86_64-1.txz

+|   |   |-- libXmu-1.1.0-x86_64-1.txz.asc

+|   |   |-- libXp-1.0.1-x86_64-1.txt

+|   |   |-- libXp-1.0.1-x86_64-1.txz

+|   |   |-- libXp-1.0.1-x86_64-1.txz.asc

+|   |   |-- libXpm-3.5.9-x86_64-1.txt

+|   |   |-- libXpm-3.5.9-x86_64-1.txz

+|   |   |-- libXpm-3.5.9-x86_64-1.txz.asc

+|   |   |-- libXrandr-1.3.1-x86_64-1.txt

+|   |   |-- libXrandr-1.3.1-x86_64-1.txz

+|   |   |-- libXrandr-1.3.1-x86_64-1.txz.asc

+|   |   |-- libXrender-0.9.6-x86_64-1.txt

+|   |   |-- libXrender-0.9.6-x86_64-1.txz

+|   |   |-- libXrender-0.9.6-x86_64-1.txz.asc

+|   |   |-- libXres-1.0.5-x86_64-1.txt

+|   |   |-- libXres-1.0.5-x86_64-1.txz

+|   |   |-- libXres-1.0.5-x86_64-1.txz.asc

+|   |   |-- libXt-1.1.1-x86_64-1.txt

+|   |   |-- libXt-1.1.1-x86_64-1.txz

+|   |   |-- libXt-1.1.1-x86_64-1.txz.asc

+|   |   |-- libXtst-1.2.0-x86_64-1.txt

+|   |   |-- libXtst-1.2.0-x86_64-1.txz

+|   |   |-- libXtst-1.2.0-x86_64-1.txz.asc

+|   |   |-- libXv-1.0.6-x86_64-1.txt

+|   |   |-- libXv-1.0.6-x86_64-1.txz

+|   |   |-- libXv-1.0.6-x86_64-1.txz.asc

+|   |   |-- libXvMC-1.0.6-x86_64-1.txt

+|   |   |-- libXvMC-1.0.6-x86_64-1.txz

+|   |   |-- libXvMC-1.0.6-x86_64-1.txz.asc

+|   |   |-- libXxf86dga-1.1.2-x86_64-1.txt

+|   |   |-- libXxf86dga-1.1.2-x86_64-1.txz

+|   |   |-- libXxf86dga-1.1.2-x86_64-1.txz.asc

+|   |   |-- libXxf86misc-1.0.3-x86_64-1.txt

+|   |   |-- libXxf86misc-1.0.3-x86_64-1.txz

+|   |   |-- libXxf86misc-1.0.3-x86_64-1.txz.asc

+|   |   |-- libXxf86vm-1.1.1-x86_64-1.txt

+|   |   |-- libXxf86vm-1.1.1-x86_64-1.txz

+|   |   |-- libXxf86vm-1.1.1-x86_64-1.txz.asc

+|   |   |-- libdmx-1.1.1-x86_64-1.txt

+|   |   |-- libdmx-1.1.1-x86_64-1.txz

+|   |   |-- libdmx-1.1.1-x86_64-1.txz.asc

+|   |   |-- libdrm-2.4.23-x86_64-1.txt

+|   |   |-- libdrm-2.4.23-x86_64-1.txz

+|   |   |-- libdrm-2.4.23-x86_64-1.txz.asc

+|   |   |-- liberation-fonts-ttf-1.06.0.20100721-noarch-3.txt

+|   |   |-- liberation-fonts-ttf-1.06.0.20100721-noarch-3.txz

+|   |   |-- liberation-fonts-ttf-1.06.0.20100721-noarch-3.txz.asc

+|   |   |-- libfontenc-1.1.0-x86_64-1.txt

+|   |   |-- libfontenc-1.1.0-x86_64-1.txz

+|   |   |-- libfontenc-1.1.0-x86_64-1.txz.asc

+|   |   |-- libhangul-0.0.12-x86_64-1.txt

+|   |   |-- libhangul-0.0.12-x86_64-1.txz

+|   |   |-- libhangul-0.0.12-x86_64-1.txz.asc

+|   |   |-- libpciaccess-0.12.1-x86_64-1.txt

+|   |   |-- libpciaccess-0.12.1-x86_64-1.txz

+|   |   |-- libpciaccess-0.12.1-x86_64-1.txz.asc

 |   |   |-- libpthread-stubs-0.3-noarch-1.txt

 |   |   |-- libpthread-stubs-0.3-noarch-1.txz

 |   |   |-- libpthread-stubs-0.3-noarch-1.txz.asc

-|   |   |-- libxcb-1.6-x86_64-1.txt

-|   |   |-- libxcb-1.6-x86_64-1.txz

-|   |   |-- libxcb-1.6-x86_64-1.txz.asc

-|   |   |-- libxkbfile-1.0.6-x86_64-1.txt

-|   |   |-- libxkbfile-1.0.6-x86_64-1.txz

-|   |   |-- libxkbfile-1.0.6-x86_64-1.txz.asc

-|   |   |-- libxkbui-1.0.2-x86_64-2.txt

-|   |   |-- libxkbui-1.0.2-x86_64-2.txz

-|   |   |-- libxkbui-1.0.2-x86_64-2.txz.asc

+|   |   |-- libxcb-1.7-x86_64-1.txt

+|   |   |-- libxcb-1.7-x86_64-1.txz

+|   |   |-- libxcb-1.7-x86_64-1.txz.asc

+|   |   |-- libxkbfile-1.0.7-x86_64-1.txt

+|   |   |-- libxkbfile-1.0.7-x86_64-1.txz

+|   |   |-- libxkbfile-1.0.7-x86_64-1.txz.asc

 |   |   |-- listres-1.0.2-x86_64-1.txt

 |   |   |-- listres-1.0.2-x86_64-1.txz

 |   |   |-- listres-1.0.2-x86_64-1.txz.asc

-|   |   |-- lndir-1.0.1-x86_64-2.txt

-|   |   |-- lndir-1.0.1-x86_64-2.txz

-|   |   |-- lndir-1.0.1-x86_64-2.txz.asc

-|   |   |-- luit-1.0.5-x86_64-1.txt

-|   |   |-- luit-1.0.5-x86_64-1.txz

-|   |   |-- luit-1.0.5-x86_64-1.txz.asc

-|   |   |-- m17n-lib-1.5.4-x86_64-1.txt

-|   |   |-- m17n-lib-1.5.4-x86_64-1.txz

-|   |   |-- m17n-lib-1.5.4-x86_64-1.txz.asc

-|   |   |-- makedepend-1.0.2-x86_64-1.txt

-|   |   |-- makedepend-1.0.2-x86_64-1.txz

-|   |   |-- makedepend-1.0.2-x86_64-1.txz.asc

+|   |   |-- lndir-1.0.2-x86_64-1.txt

+|   |   |-- lndir-1.0.2-x86_64-1.txz

+|   |   |-- lndir-1.0.2-x86_64-1.txz.asc

+|   |   |-- luit-1.1.0-x86_64-1.txt

+|   |   |-- luit-1.1.0-x86_64-1.txz

+|   |   |-- luit-1.1.0-x86_64-1.txz.asc

+|   |   |-- m17n-lib-1.6.1-x86_64-1.txt

+|   |   |-- m17n-lib-1.6.1-x86_64-1.txz

+|   |   |-- m17n-lib-1.6.1-x86_64-1.txz.asc

+|   |   |-- makedepend-1.0.3-x86_64-1.txt

+|   |   |-- makedepend-1.0.3-x86_64-1.txz

+|   |   |-- makedepend-1.0.3-x86_64-1.txz.asc

 |   |   |-- maketag

 |   |   |-- maketag.ez

-|   |   |-- mesa-7.8.1-x86_64-1.txt

-|   |   |-- mesa-7.8.1-x86_64-1.txz

-|   |   |-- mesa-7.8.1-x86_64-1.txz.asc

+|   |   |-- mesa-7.9.2-x86_64-1.txt

+|   |   |-- mesa-7.9.2-x86_64-1.txz

+|   |   |-- mesa-7.9.2-x86_64-1.txz.asc

 |   |   |-- mkcomposecache-1.2.1-x86_64-1.txt

 |   |   |-- mkcomposecache-1.2.1-x86_64-1.txz

 |   |   |-- mkcomposecache-1.2.1-x86_64-1.txz.asc

-|   |   |-- mkfontdir-1.0.5-noarch-1.txt

-|   |   |-- mkfontdir-1.0.5-noarch-1.txz

-|   |   |-- mkfontdir-1.0.5-noarch-1.txz.asc

-|   |   |-- mkfontscale-1.0.7-x86_64-1.txt

-|   |   |-- mkfontscale-1.0.7-x86_64-1.txz

-|   |   |-- mkfontscale-1.0.7-x86_64-1.txz.asc

-|   |   |-- oclock-1.0.1-x86_64-2.txt

-|   |   |-- oclock-1.0.1-x86_64-2.txz

-|   |   |-- oclock-1.0.1-x86_64-2.txz.asc

-|   |   |-- pixman-0.16.6-x86_64-1.txt

-|   |   |-- pixman-0.16.6-x86_64-1.txz

-|   |   |-- pixman-0.16.6-x86_64-1.txz.asc

-|   |   |-- printproto-1.0.4-noarch-2.txt

-|   |   |-- printproto-1.0.4-noarch-2.txz

-|   |   |-- printproto-1.0.4-noarch-2.txz.asc

-|   |   |-- randrproto-1.3.1-noarch-1.txt

-|   |   |-- randrproto-1.3.1-noarch-1.txz

-|   |   |-- randrproto-1.3.1-noarch-1.txz.asc

-|   |   |-- recordproto-1.14-noarch-1.txt

-|   |   |-- recordproto-1.14-noarch-1.txz

-|   |   |-- recordproto-1.14-noarch-1.txz.asc

-|   |   |-- rendercheck-1.3-x86_64-2.txt

-|   |   |-- rendercheck-1.3-x86_64-2.txz

-|   |   |-- rendercheck-1.3-x86_64-2.txz.asc

-|   |   |-- renderproto-0.11-noarch-1.txt

-|   |   |-- renderproto-0.11-noarch-1.txz

-|   |   |-- renderproto-0.11-noarch-1.txz.asc

-|   |   |-- resourceproto-1.1.0-noarch-1.txt

-|   |   |-- resourceproto-1.1.0-noarch-1.txz

-|   |   |-- resourceproto-1.1.0-noarch-1.txz.asc

-|   |   |-- rgb-1.0.3-x86_64-1.txt

-|   |   |-- rgb-1.0.3-x86_64-1.txz

-|   |   |-- rgb-1.0.3-x86_64-1.txz.asc

-|   |   |-- rstart-1.0.3-x86_64-1.txt

-|   |   |-- rstart-1.0.3-x86_64-1.txz

-|   |   |-- rstart-1.0.3-x86_64-1.txz.asc

+|   |   |-- mkfontdir-1.0.6-noarch-1.txt

+|   |   |-- mkfontdir-1.0.6-noarch-1.txz

+|   |   |-- mkfontdir-1.0.6-noarch-1.txz.asc

+|   |   |-- mkfontscale-1.0.8-x86_64-1.txt

+|   |   |-- mkfontscale-1.0.8-x86_64-1.txz

+|   |   |-- mkfontscale-1.0.8-x86_64-1.txz.asc

+|   |   |-- oclock-1.0.2-x86_64-1.txt

+|   |   |-- oclock-1.0.2-x86_64-1.txz

+|   |   |-- oclock-1.0.2-x86_64-1.txz.asc

+|   |   |-- pixman-0.20.2-x86_64-1.txt

+|   |   |-- pixman-0.20.2-x86_64-1.txz

+|   |   |-- pixman-0.20.2-x86_64-1.txz.asc

+|   |   |-- printproto-1.0.5-noarch-1.txt

+|   |   |-- printproto-1.0.5-noarch-1.txz

+|   |   |-- printproto-1.0.5-noarch-1.txz.asc

+|   |   |-- radeon_ucode-20110302-noarch-1.txt

+|   |   |-- radeon_ucode-20110302-noarch-1.txz

+|   |   |-- radeon_ucode-20110302-noarch-1.txz.asc

+|   |   |-- randrproto-1.3.2-noarch-1.txt

+|   |   |-- randrproto-1.3.2-noarch-1.txz

+|   |   |-- randrproto-1.3.2-noarch-1.txz.asc

+|   |   |-- recordproto-1.14.1-noarch-1.txt

+|   |   |-- recordproto-1.14.1-noarch-1.txz

+|   |   |-- recordproto-1.14.1-noarch-1.txz.asc

+|   |   |-- rendercheck-1.4-x86_64-1.txt

+|   |   |-- rendercheck-1.4-x86_64-1.txz

+|   |   |-- rendercheck-1.4-x86_64-1.txz.asc

+|   |   |-- renderproto-0.11.1-noarch-1.txt

+|   |   |-- renderproto-0.11.1-noarch-1.txz

+|   |   |-- renderproto-0.11.1-noarch-1.txz.asc

+|   |   |-- resourceproto-1.1.1-noarch-1.txt

+|   |   |-- resourceproto-1.1.1-noarch-1.txz

+|   |   |-- resourceproto-1.1.1-noarch-1.txz.asc

+|   |   |-- rgb-1.0.4-x86_64-1.txt

+|   |   |-- rgb-1.0.4-x86_64-1.txz

+|   |   |-- rgb-1.0.4-x86_64-1.txz.asc

 |   |   |-- sazanami-fonts-ttf-20040629-noarch-1.txt

 |   |   |-- sazanami-fonts-ttf-20040629-noarch-1.txz

 |   |   |-- sazanami-fonts-ttf-20040629-noarch-1.txz.asc

-|   |   |-- scim-1.4.9-x86_64-4.txt

-|   |   |-- scim-1.4.9-x86_64-4.txz

-|   |   |-- scim-1.4.9-x86_64-4.txz.asc

+|   |   |-- scim-1.4.9-x86_64-5.txt

+|   |   |-- scim-1.4.9-x86_64-5.txz

+|   |   |-- scim-1.4.9-x86_64-5.txz.asc

 |   |   |-- scim-anthy-1.2.4-x86_64-2.txt

 |   |   |-- scim-anthy-1.2.4-x86_64-2.txz

 |   |   |-- scim-anthy-1.2.4-x86_64-2.txz.asc

-|   |   |-- scim-bridge-0.4.16-x86_64-4.txt

-|   |   |-- scim-bridge-0.4.16-x86_64-4.txz

-|   |   |-- scim-bridge-0.4.16-x86_64-4.txz.asc

+|   |   |-- scim-bridge-0.4.16-x86_64-5.txt

+|   |   |-- scim-bridge-0.4.16-x86_64-5.txz

+|   |   |-- scim-bridge-0.4.16-x86_64-5.txz.asc

 |   |   |-- scim-hangul-0.3.2-x86_64-2.txt

 |   |   |-- scim-hangul-0.3.2-x86_64-2.txz

 |   |   |-- scim-hangul-0.3.2-x86_64-2.txz.asc

@@ -3142,558 +3232,528 @@ see additional documentation files.
 |   |   |-- scripts-1.0.1-noarch-2.txt

 |   |   |-- scripts-1.0.1-noarch-2.txz

 |   |   |-- scripts-1.0.1-noarch-2.txz.asc

-|   |   |-- scrnsaverproto-1.2.0-noarch-1.txt

-|   |   |-- scrnsaverproto-1.2.0-noarch-1.txz

-|   |   |-- scrnsaverproto-1.2.0-noarch-1.txz.asc

-|   |   |-- sessreg-1.0.5-x86_64-1.txt

-|   |   |-- sessreg-1.0.5-x86_64-1.txz

-|   |   |-- sessreg-1.0.5-x86_64-1.txz.asc

-|   |   |-- setxkbmap-1.1.0-x86_64-1.txt

-|   |   |-- setxkbmap-1.1.0-x86_64-1.txz

-|   |   |-- setxkbmap-1.1.0-x86_64-1.txz.asc

-|   |   |-- showfont-1.0.2-x86_64-1.txt

-|   |   |-- showfont-1.0.2-x86_64-1.txz

-|   |   |-- showfont-1.0.2-x86_64-1.txz.asc

+|   |   |-- scrnsaverproto-1.2.1-noarch-1.txt

+|   |   |-- scrnsaverproto-1.2.1-noarch-1.txz

+|   |   |-- scrnsaverproto-1.2.1-noarch-1.txz.asc

+|   |   |-- sessreg-1.0.6-x86_64-1.txt

+|   |   |-- sessreg-1.0.6-x86_64-1.txz

+|   |   |-- sessreg-1.0.6-x86_64-1.txz.asc

+|   |   |-- setxkbmap-1.2.0-x86_64-1.txt

+|   |   |-- setxkbmap-1.2.0-x86_64-1.txz

+|   |   |-- setxkbmap-1.2.0-x86_64-1.txz.asc

+|   |   |-- showfont-1.0.3-x86_64-1.txt

+|   |   |-- showfont-1.0.3-x86_64-1.txz

+|   |   |-- showfont-1.0.3-x86_64-1.txz.asc

 |   |   |-- sinhala_lklug-font-ttf-20060929-noarch-1.txt

 |   |   |-- sinhala_lklug-font-ttf-20060929-noarch-1.txz

 |   |   |-- sinhala_lklug-font-ttf-20060929-noarch-1.txz.asc

-|   |   |-- smproxy-1.0.3-x86_64-1.txt

-|   |   |-- smproxy-1.0.3-x86_64-1.txz

-|   |   |-- smproxy-1.0.3-x86_64-1.txz.asc

+|   |   |-- smproxy-1.0.4-x86_64-1.txt

+|   |   |-- smproxy-1.0.4-x86_64-1.txz

+|   |   |-- smproxy-1.0.4-x86_64-1.txz.asc

 |   |   |-- tagfile

-|   |   |-- tibmachuni-font-ttf-1.901-noarch-1.txt

-|   |   |-- tibmachuni-font-ttf-1.901-noarch-1.txz

-|   |   |-- tibmachuni-font-ttf-1.901-noarch-1.txz.asc

-|   |   |-- trapproto-3.4.3-noarch-2.txt

-|   |   |-- trapproto-3.4.3-noarch-2.txz

-|   |   |-- trapproto-3.4.3-noarch-2.txz.asc

+|   |   |-- tibmachuni-font-ttf-1.901b-noarch-1.txt

+|   |   |-- tibmachuni-font-ttf-1.901b-noarch-1.txz

+|   |   |-- tibmachuni-font-ttf-1.901b-noarch-1.txz.asc

 |   |   |-- ttf-indic-fonts-0.4.7.4-noarch-1.txt

 |   |   |-- ttf-indic-fonts-0.4.7.4-noarch-1.txz

 |   |   |-- ttf-indic-fonts-0.4.7.4-noarch-1.txz.asc

-|   |   |-- twm-1.0.4-x86_64-3.txt

-|   |   |-- twm-1.0.4-x86_64-3.txz

-|   |   |-- twm-1.0.4-x86_64-3.txz.asc

-|   |   |-- util-macros-1.7.0-noarch-1.txt

-|   |   |-- util-macros-1.7.0-noarch-1.txz

-|   |   |-- util-macros-1.7.0-noarch-1.txz.asc

-|   |   |-- videoproto-2.3.0-noarch-1.txt

-|   |   |-- videoproto-2.3.0-noarch-1.txz

-|   |   |-- videoproto-2.3.0-noarch-1.txz.asc

-|   |   |-- viewres-1.0.2-x86_64-1.txt

-|   |   |-- viewres-1.0.2-x86_64-1.txz

-|   |   |-- viewres-1.0.2-x86_64-1.txz.asc

+|   |   |-- twm-1.0.6-x86_64-1.txt

+|   |   |-- twm-1.0.6-x86_64-1.txz

+|   |   |-- twm-1.0.6-x86_64-1.txz.asc

+|   |   |-- util-macros-1.13.0-noarch-1.txt

+|   |   |-- util-macros-1.13.0-noarch-1.txz

+|   |   |-- util-macros-1.13.0-noarch-1.txz.asc

+|   |   |-- videoproto-2.3.1-noarch-1.txt

+|   |   |-- videoproto-2.3.1-noarch-1.txz

+|   |   |-- videoproto-2.3.1-noarch-1.txz.asc

+|   |   |-- viewres-1.0.3-x86_64-1.txt

+|   |   |-- viewres-1.0.3-x86_64-1.txz

+|   |   |-- viewres-1.0.3-x86_64-1.txz.asc

 |   |   |-- wqy-zenhei-font-ttf-0.8.38_1-noarch-1.txt

 |   |   |-- wqy-zenhei-font-ttf-0.8.38_1-noarch-1.txz

 |   |   |-- wqy-zenhei-font-ttf-0.8.38_1-noarch-1.txz.asc

-|   |   |-- x11-skel-7.4-x86_64-1.txt

-|   |   |-- x11-skel-7.4-x86_64-1.txz

-|   |   |-- x11-skel-7.4-x86_64-1.txz.asc

-|   |   |-- x11perf-1.5.1-x86_64-1.txt

-|   |   |-- x11perf-1.5.1-x86_64-1.txz

-|   |   |-- x11perf-1.5.1-x86_64-1.txz.asc

-|   |   |-- xauth-1.0.4-x86_64-1.txt

-|   |   |-- xauth-1.0.4-x86_64-1.txz

-|   |   |-- xauth-1.0.4-x86_64-1.txz.asc

-|   |   |-- xaw3d-1.5E-x86_64-1.txt

-|   |   |-- xaw3d-1.5E-x86_64-1.txz

-|   |   |-- xaw3d-1.5E-x86_64-1.txz.asc

-|   |   |-- xbacklight-1.1.1-x86_64-1.txt

-|   |   |-- xbacklight-1.1.1-x86_64-1.txz

-|   |   |-- xbacklight-1.1.1-x86_64-1.txz.asc

-|   |   |-- xbiff-1.0.2-x86_64-1.txt

-|   |   |-- xbiff-1.0.2-x86_64-1.txz

-|   |   |-- xbiff-1.0.2-x86_64-1.txz.asc

-|   |   |-- xbitmaps-1.1.0-noarch-1.txt

-|   |   |-- xbitmaps-1.1.0-noarch-1.txz

-|   |   |-- xbitmaps-1.1.0-noarch-1.txz.asc

-|   |   |-- xcalc-1.0.3-x86_64-1.txt

-|   |   |-- xcalc-1.0.3-x86_64-1.txz

-|   |   |-- xcalc-1.0.3-x86_64-1.txz.asc

+|   |   |-- x11-skel-7.4-x86_64-2.txt

+|   |   |-- x11-skel-7.4-x86_64-2.txz

+|   |   |-- x11-skel-7.4-x86_64-2.txz.asc

+|   |   |-- x11perf-1.5.3-x86_64-1.txt

+|   |   |-- x11perf-1.5.3-x86_64-1.txz

+|   |   |-- x11perf-1.5.3-x86_64-1.txz.asc

+|   |   |-- xauth-1.0.5-x86_64-1.txt

+|   |   |-- xauth-1.0.5-x86_64-1.txz

+|   |   |-- xauth-1.0.5-x86_64-1.txz.asc

+|   |   |-- xaw3d-20110415git-x86_64-1.txt

+|   |   |-- xaw3d-20110415git-x86_64-1.txz

+|   |   |-- xaw3d-20110415git-x86_64-1.txz.asc

+|   |   |-- xbacklight-1.1.2-x86_64-1.txt

+|   |   |-- xbacklight-1.1.2-x86_64-1.txz

+|   |   |-- xbacklight-1.1.2-x86_64-1.txz.asc

+|   |   |-- xbiff-1.0.3-x86_64-1.txt

+|   |   |-- xbiff-1.0.3-x86_64-1.txz

+|   |   |-- xbiff-1.0.3-x86_64-1.txz.asc

+|   |   |-- xbitmaps-1.1.1-x86_64-1.txt

+|   |   |-- xbitmaps-1.1.1-x86_64-1.txz

+|   |   |-- xbitmaps-1.1.1-x86_64-1.txz.asc

+|   |   |-- xcalc-1.0.4.1-x86_64-1.txt

+|   |   |-- xcalc-1.0.4.1-x86_64-1.txz

+|   |   |-- xcalc-1.0.4.1-x86_64-1.txz.asc

 |   |   |-- xcb-proto-1.6-noarch-1.txt

 |   |   |-- xcb-proto-1.6-noarch-1.txz

 |   |   |-- xcb-proto-1.6-noarch-1.txz.asc

 |   |   |-- xcb-util-0.3.6-x86_64-1.txt

 |   |   |-- xcb-util-0.3.6-x86_64-1.txz

 |   |   |-- xcb-util-0.3.6-x86_64-1.txz.asc

-|   |   |-- xclipboard-1.1.0-x86_64-1.txt

-|   |   |-- xclipboard-1.1.0-x86_64-1.txz

-|   |   |-- xclipboard-1.1.0-x86_64-1.txz.asc

-|   |   |-- xclock-1.0.4-x86_64-1.txt

-|   |   |-- xclock-1.0.4-x86_64-1.txz

-|   |   |-- xclock-1.0.4-x86_64-1.txz.asc

-|   |   |-- xcmiscproto-1.2.0-noarch-1.txt

-|   |   |-- xcmiscproto-1.2.0-noarch-1.txz

-|   |   |-- xcmiscproto-1.2.0-noarch-1.txz.asc

-|   |   |-- xcmsdb-1.0.2-x86_64-1.txt

-|   |   |-- xcmsdb-1.0.2-x86_64-1.txz

-|   |   |-- xcmsdb-1.0.2-x86_64-1.txz.asc

-|   |   |-- xcompmgr-1.1.5-x86_64-1.txt

-|   |   |-- xcompmgr-1.1.5-x86_64-1.txz

-|   |   |-- xcompmgr-1.1.5-x86_64-1.txz.asc

-|   |   |-- xconsole-1.0.3-x86_64-2.txt

-|   |   |-- xconsole-1.0.3-x86_64-2.txz

-|   |   |-- xconsole-1.0.3-x86_64-2.txz.asc

-|   |   |-- xcursor-themes-1.0.2-noarch-1.txt

-|   |   |-- xcursor-themes-1.0.2-noarch-1.txz

-|   |   |-- xcursor-themes-1.0.2-noarch-1.txz.asc

-|   |   |-- xcursorgen-1.0.3-x86_64-1.txt

-|   |   |-- xcursorgen-1.0.3-x86_64-1.txz

-|   |   |-- xcursorgen-1.0.3-x86_64-1.txz.asc

-|   |   |-- xdbedizzy-1.0.2-x86_64-2.txt

-|   |   |-- xdbedizzy-1.0.2-x86_64-2.txz

-|   |   |-- xdbedizzy-1.0.2-x86_64-2.txz.asc

-|   |   |-- xdg-utils-1.0.2-noarch-4.txt

-|   |   |-- xdg-utils-1.0.2-noarch-4.txz

-|   |   |-- xdg-utils-1.0.2-noarch-4.txz.asc

-|   |   |-- xditview-1.0.1-x86_64-2.txt

-|   |   |-- xditview-1.0.1-x86_64-2.txz

-|   |   |-- xditview-1.0.1-x86_64-2.txz.asc

+|   |   |-- xclipboard-1.1.1-x86_64-1.txt

+|   |   |-- xclipboard-1.1.1-x86_64-1.txz

+|   |   |-- xclipboard-1.1.1-x86_64-1.txz.asc

+|   |   |-- xclock-1.0.5-x86_64-1.txt

+|   |   |-- xclock-1.0.5-x86_64-1.txz

+|   |   |-- xclock-1.0.5-x86_64-1.txz.asc

+|   |   |-- xcmiscproto-1.2.1-noarch-1.txt

+|   |   |-- xcmiscproto-1.2.1-noarch-1.txz

+|   |   |-- xcmiscproto-1.2.1-noarch-1.txz.asc

+|   |   |-- xcmsdb-1.0.3-x86_64-1.txt

+|   |   |-- xcmsdb-1.0.3-x86_64-1.txz

+|   |   |-- xcmsdb-1.0.3-x86_64-1.txz.asc

+|   |   |-- xcompmgr-1.1.5-x86_64-2.txt

+|   |   |-- xcompmgr-1.1.5-x86_64-2.txz

+|   |   |-- xcompmgr-1.1.5-x86_64-2.txz.asc

+|   |   |-- xconsole-1.0.4-x86_64-1.txt

+|   |   |-- xconsole-1.0.4-x86_64-1.txz

+|   |   |-- xconsole-1.0.4-x86_64-1.txz.asc

+|   |   |-- xcursor-themes-1.0.3-noarch-1.txt

+|   |   |-- xcursor-themes-1.0.3-noarch-1.txz

+|   |   |-- xcursor-themes-1.0.3-noarch-1.txz.asc

+|   |   |-- xcursorgen-1.0.4-x86_64-1.txt

+|   |   |-- xcursorgen-1.0.4-x86_64-1.txz

+|   |   |-- xcursorgen-1.0.4-x86_64-1.txz.asc

+|   |   |-- xdbedizzy-1.1.0-x86_64-1.txt

+|   |   |-- xdbedizzy-1.1.0-x86_64-1.txz

+|   |   |-- xdbedizzy-1.1.0-x86_64-1.txz.asc

+|   |   |-- xdg-user-dirs-0.13-x86_64-1.txt

+|   |   |-- xdg-user-dirs-0.13-x86_64-1.txz

+|   |   |-- xdg-user-dirs-0.13-x86_64-1.txz.asc

+|   |   |-- xdg-utils-1.1.0_rc1-noarch-1.txt

+|   |   |-- xdg-utils-1.1.0_rc1-noarch-1.txz

+|   |   |-- xdg-utils-1.1.0_rc1-noarch-1.txz.asc

+|   |   |-- xditview-1.0.2-x86_64-1.txt

+|   |   |-- xditview-1.0.2-x86_64-1.txz

+|   |   |-- xditview-1.0.2-x86_64-1.txz.asc

 |   |   |-- xdm-1.1.10-x86_64-1.txt

 |   |   |-- xdm-1.1.10-x86_64-1.txz

 |   |   |-- xdm-1.1.10-x86_64-1.txz.asc

-|   |   |-- xdpyinfo-1.1.0-x86_64-1.txt

-|   |   |-- xdpyinfo-1.1.0-x86_64-1.txz

-|   |   |-- xdpyinfo-1.1.0-x86_64-1.txz.asc

-|   |   |-- xdriinfo-1.0.3-x86_64-1.txt

-|   |   |-- xdriinfo-1.0.3-x86_64-1.txz

-|   |   |-- xdriinfo-1.0.3-x86_64-1.txz.asc

-|   |   |-- xedit-1.1.2-x86_64-1.txt

-|   |   |-- xedit-1.1.2-x86_64-1.txz

-|   |   |-- xedit-1.1.2-x86_64-1.txz.asc

-|   |   |-- xev-1.0.4-x86_64-1.txt

-|   |   |-- xev-1.0.4-x86_64-1.txz

-|   |   |-- xev-1.0.4-x86_64-1.txz.asc

-|   |   |-- xextproto-7.1.1-noarch-1.txt

-|   |   |-- xextproto-7.1.1-noarch-1.txz

-|   |   |-- xextproto-7.1.1-noarch-1.txz.asc

-|   |   |-- xeyes-1.1.0-x86_64-1.txt

-|   |   |-- xeyes-1.1.0-x86_64-1.txz

-|   |   |-- xeyes-1.1.0-x86_64-1.txz.asc

-|   |   |-- xf86-input-acecad-1.4.0-x86_64-1.txt

-|   |   |-- xf86-input-acecad-1.4.0-x86_64-1.txz

-|   |   |-- xf86-input-acecad-1.4.0-x86_64-1.txz.asc

-|   |   |-- xf86-input-aiptek-1.3.0-x86_64-1.txt

-|   |   |-- xf86-input-aiptek-1.3.0-x86_64-1.txz

-|   |   |-- xf86-input-aiptek-1.3.0-x86_64-1.txz.asc

-|   |   |-- xf86-input-evdev-2.3.3-x86_64-1.txt

-|   |   |-- xf86-input-evdev-2.3.3-x86_64-1.txz

-|   |   |-- xf86-input-evdev-2.3.3-x86_64-1.txz.asc

-|   |   |-- xf86-input-joystick-1.4.99.2-x86_64-1.txt

-|   |   |-- xf86-input-joystick-1.4.99.2-x86_64-1.txz

-|   |   |-- xf86-input-joystick-1.4.99.2-x86_64-1.txz.asc

-|   |   |-- xf86-input-keyboard-1.4.0-x86_64-1.txt

-|   |   |-- xf86-input-keyboard-1.4.0-x86_64-1.txz

-|   |   |-- xf86-input-keyboard-1.4.0-x86_64-1.txz.asc

-|   |   |-- xf86-input-mouse-1.5.0-x86_64-1.txt

-|   |   |-- xf86-input-mouse-1.5.0-x86_64-1.txz

-|   |   |-- xf86-input-mouse-1.5.0-x86_64-1.txz.asc

-|   |   |-- xf86-input-penmount-1.4.1-x86_64-1.txt

-|   |   |-- xf86-input-penmount-1.4.1-x86_64-1.txz

-|   |   |-- xf86-input-penmount-1.4.1-x86_64-1.txz.asc

-|   |   |-- xf86-input-synaptics-1.2.2-x86_64-1.txt

-|   |   |-- xf86-input-synaptics-1.2.2-x86_64-1.txz

-|   |   |-- xf86-input-synaptics-1.2.2-x86_64-1.txz.asc

-|   |   |-- xf86-input-vmmouse-12.6.9-x86_64-2.txt

-|   |   |-- xf86-input-vmmouse-12.6.9-x86_64-2.txz

-|   |   |-- xf86-input-vmmouse-12.6.9-x86_64-2.txz.asc

-|   |   |-- xf86-input-void-1.3.0-x86_64-1.txt

-|   |   |-- xf86-input-void-1.3.0-x86_64-1.txz

-|   |   |-- xf86-input-void-1.3.0-x86_64-1.txz.asc

-|   |   |-- xf86-input-wacom-0.10.5-x86_64-1.txt

-|   |   |-- xf86-input-wacom-0.10.5-x86_64-1.txz

-|   |   |-- xf86-input-wacom-0.10.5-x86_64-1.txz.asc

-|   |   |-- xf86-video-apm-1.2.2-x86_64-2.txt

-|   |   |-- xf86-video-apm-1.2.2-x86_64-2.txz

-|   |   |-- xf86-video-apm-1.2.2-x86_64-2.txz.asc

-|   |   |-- xf86-video-ark-0.7.2-x86_64-1.txt

-|   |   |-- xf86-video-ark-0.7.2-x86_64-1.txz

-|   |   |-- xf86-video-ark-0.7.2-x86_64-1.txz.asc

-|   |   |-- xf86-video-ast-0.89.9-x86_64-2.txt

-|   |   |-- xf86-video-ast-0.89.9-x86_64-2.txz

-|   |   |-- xf86-video-ast-0.89.9-x86_64-2.txz.asc

-|   |   |-- xf86-video-ati-6.13.0-x86_64-1.txt

-|   |   |-- xf86-video-ati-6.13.0-x86_64-1.txz

-|   |   |-- xf86-video-ati-6.13.0-x86_64-1.txz.asc

-|   |   |-- xf86-video-chips-1.2.2-x86_64-1.txt

-|   |   |-- xf86-video-chips-1.2.2-x86_64-1.txz

-|   |   |-- xf86-video-chips-1.2.2-x86_64-1.txz.asc

-|   |   |-- xf86-video-cirrus-1.3.2-x86_64-2.txt

-|   |   |-- xf86-video-cirrus-1.3.2-x86_64-2.txz

-|   |   |-- xf86-video-cirrus-1.3.2-x86_64-2.txz.asc

-|   |   |-- xf86-video-dummy-0.3.3-x86_64-1.txt

-|   |   |-- xf86-video-dummy-0.3.3-x86_64-1.txz

-|   |   |-- xf86-video-dummy-0.3.3-x86_64-1.txz.asc

-|   |   |-- xf86-video-glint-1.2.4-x86_64-2.txt

-|   |   |-- xf86-video-glint-1.2.4-x86_64-2.txz

-|   |   |-- xf86-video-glint-1.2.4-x86_64-2.txz.asc

-|   |   |-- xf86-video-i128-1.3.3-x86_64-2.txt

-|   |   |-- xf86-video-i128-1.3.3-x86_64-2.txz

-|   |   |-- xf86-video-i128-1.3.3-x86_64-2.txz.asc

-|   |   |-- xf86-video-i740-1.3.2-x86_64-2.txt

-|   |   |-- xf86-video-i740-1.3.2-x86_64-2.txz

-|   |   |-- xf86-video-i740-1.3.2-x86_64-2.txz.asc

-|   |   |-- xf86-video-intel-2.11.0-x86_64-1.txt

-|   |   |-- xf86-video-intel-2.11.0-x86_64-1.txz

-|   |   |-- xf86-video-intel-2.11.0-x86_64-1.txz.asc

-|   |   |-- xf86-video-mach64-6.8.2-x86_64-2.txt

-|   |   |-- xf86-video-mach64-6.8.2-x86_64-2.txz

-|   |   |-- xf86-video-mach64-6.8.2-x86_64-2.txz.asc

-|   |   |-- xf86-video-mga-1.4.11-x86_64-2.txt

-|   |   |-- xf86-video-mga-1.4.11-x86_64-2.txz

-|   |   |-- xf86-video-mga-1.4.11-x86_64-2.txz.asc

-|   |   |-- xf86-video-neomagic-1.2.4-x86_64-2.txt

-|   |   |-- xf86-video-neomagic-1.2.4-x86_64-2.txz

-|   |   |-- xf86-video-neomagic-1.2.4-x86_64-2.txz.asc

-|   |   |-- xf86-video-nouveau-blacklist-noarch-1.txt

-|   |   |-- xf86-video-nouveau-blacklist-noarch-1.txz

-|   |   |-- xf86-video-nouveau-blacklist-noarch-1.txz.asc

-|   |   |-- xf86-video-nv-2.1.17-x86_64-1.txt

-|   |   |-- xf86-video-nv-2.1.17-x86_64-1.txz

-|   |   |-- xf86-video-nv-2.1.17-x86_64-1.txz.asc

-|   |   |-- xf86-video-openchrome-0.2.904-x86_64-1.txt

-|   |   |-- xf86-video-openchrome-0.2.904-x86_64-1.txz

-|   |   |-- xf86-video-openchrome-0.2.904-x86_64-1.txz.asc

-|   |   |-- xf86-video-r128-6.8.1-x86_64-2.txt

-|   |   |-- xf86-video-r128-6.8.1-x86_64-2.txz

-|   |   |-- xf86-video-r128-6.8.1-x86_64-2.txz.asc

-|   |   |-- xf86-video-radeonhd-1.3.0-x86_64-1.txt

-|   |   |-- xf86-video-radeonhd-1.3.0-x86_64-1.txz

-|   |   |-- xf86-video-radeonhd-1.3.0-x86_64-1.txz.asc

-|   |   |-- xf86-video-rendition-4.2.3-x86_64-1.txt

-|   |   |-- xf86-video-rendition-4.2.3-x86_64-1.txz

-|   |   |-- xf86-video-rendition-4.2.3-x86_64-1.txz.asc

-|   |   |-- xf86-video-s3-0.6.3-x86_64-2.txt

-|   |   |-- xf86-video-s3-0.6.3-x86_64-2.txz

-|   |   |-- xf86-video-s3-0.6.3-x86_64-2.txz.asc

-|   |   |-- xf86-video-s3virge-1.10.4-x86_64-2.txt

-|   |   |-- xf86-video-s3virge-1.10.4-x86_64-2.txz

-|   |   |-- xf86-video-s3virge-1.10.4-x86_64-2.txz.asc

-|   |   |-- xf86-video-savage-2.3.1-x86_64-2.txt

-|   |   |-- xf86-video-savage-2.3.1-x86_64-2.txz

-|   |   |-- xf86-video-savage-2.3.1-x86_64-2.txz.asc

-|   |   |-- xf86-video-siliconmotion-1.7.4-x86_64-1.txt

-|   |   |-- xf86-video-siliconmotion-1.7.4-x86_64-1.txz

-|   |   |-- xf86-video-siliconmotion-1.7.4-x86_64-1.txz.asc

-|   |   |-- xf86-video-sis-0.10.2-x86_64-2.txt

-|   |   |-- xf86-video-sis-0.10.2-x86_64-2.txz

-|   |   |-- xf86-video-sis-0.10.2-x86_64-2.txz.asc

-|   |   |-- xf86-video-sisusb-0.9.3-x86_64-2.txt

-|   |   |-- xf86-video-sisusb-0.9.3-x86_64-2.txz

-|   |   |-- xf86-video-sisusb-0.9.3-x86_64-2.txz.asc

-|   |   |-- xf86-video-tdfx-1.4.3-x86_64-2.txt

-|   |   |-- xf86-video-tdfx-1.4.3-x86_64-2.txz

-|   |   |-- xf86-video-tdfx-1.4.3-x86_64-2.txz.asc

-|   |   |-- xf86-video-tga-1.2.1-x86_64-1.txt

-|   |   |-- xf86-video-tga-1.2.1-x86_64-1.txz

-|   |   |-- xf86-video-tga-1.2.1-x86_64-1.txz.asc

-|   |   |-- xf86-video-trident-1.3.3-x86_64-1.txt

-|   |   |-- xf86-video-trident-1.3.3-x86_64-1.txz

-|   |   |-- xf86-video-trident-1.3.3-x86_64-1.txz.asc

-|   |   |-- xf86-video-tseng-1.2.3-x86_64-1.txt

-|   |   |-- xf86-video-tseng-1.2.3-x86_64-1.txz

-|   |   |-- xf86-video-tseng-1.2.3-x86_64-1.txz.asc

-|   |   |-- xf86-video-v4l-0.2.0-x86_64-3.txt

-|   |   |-- xf86-video-v4l-0.2.0-x86_64-3.txz

-|   |   |-- xf86-video-v4l-0.2.0-x86_64-3.txz.asc

-|   |   |-- xf86-video-vesa-2.3.0-x86_64-2.txt

-|   |   |-- xf86-video-vesa-2.3.0-x86_64-2.txz

-|   |   |-- xf86-video-vesa-2.3.0-x86_64-2.txz.asc

-|   |   |-- xf86-video-vmware-10.16.9-x86_64-2.txt

-|   |   |-- xf86-video-vmware-10.16.9-x86_64-2.txz

-|   |   |-- xf86-video-vmware-10.16.9-x86_64-2.txz.asc

-|   |   |-- xf86-video-voodoo-1.2.3-x86_64-2.txt

-|   |   |-- xf86-video-voodoo-1.2.3-x86_64-2.txz

-|   |   |-- xf86-video-voodoo-1.2.3-x86_64-2.txz.asc

-|   |   |-- xf86-video-xgi-1.5.1-x86_64-1.txt

-|   |   |-- xf86-video-xgi-1.5.1-x86_64-1.txz

-|   |   |-- xf86-video-xgi-1.5.1-x86_64-1.txz.asc

+|   |   |-- xdpyinfo-1.2.0-x86_64-1.txt

+|   |   |-- xdpyinfo-1.2.0-x86_64-1.txz

+|   |   |-- xdpyinfo-1.2.0-x86_64-1.txz.asc

+|   |   |-- xdriinfo-1.0.4-x86_64-1.txt

+|   |   |-- xdriinfo-1.0.4-x86_64-1.txz

+|   |   |-- xdriinfo-1.0.4-x86_64-1.txz.asc

+|   |   |-- xedit-1.2.0-x86_64-1.txt

+|   |   |-- xedit-1.2.0-x86_64-1.txz

+|   |   |-- xedit-1.2.0-x86_64-1.txz.asc

+|   |   |-- xev-1.1.0-x86_64-1.txt

+|   |   |-- xev-1.1.0-x86_64-1.txz

+|   |   |-- xev-1.1.0-x86_64-1.txz.asc

+|   |   |-- xextproto-7.2.0-x86_64-1.txt

+|   |   |-- xextproto-7.2.0-x86_64-1.txz

+|   |   |-- xextproto-7.2.0-x86_64-1.txz.asc

+|   |   |-- xeyes-1.1.1-x86_64-1.txt

+|   |   |-- xeyes-1.1.1-x86_64-1.txz

+|   |   |-- xeyes-1.1.1-x86_64-1.txz.asc

+|   |   |-- xf86-input-acecad-1.4.0-x86_64-2.txt

+|   |   |-- xf86-input-acecad-1.4.0-x86_64-2.txz

+|   |   |-- xf86-input-acecad-1.4.0-x86_64-2.txz.asc

+|   |   |-- xf86-input-aiptek-1.3.1-x86_64-1.txt

+|   |   |-- xf86-input-aiptek-1.3.1-x86_64-1.txz

+|   |   |-- xf86-input-aiptek-1.3.1-x86_64-1.txz.asc

+|   |   |-- xf86-input-evdev-2.6.0-x86_64-1.txt

+|   |   |-- xf86-input-evdev-2.6.0-x86_64-1.txz

+|   |   |-- xf86-input-evdev-2.6.0-x86_64-1.txz.asc

+|   |   |-- xf86-input-joystick-1.5.0-x86_64-1.txt

+|   |   |-- xf86-input-joystick-1.5.0-x86_64-1.txz

+|   |   |-- xf86-input-joystick-1.5.0-x86_64-1.txz.asc

+|   |   |-- xf86-input-keyboard-1.6.0-x86_64-1.txt

+|   |   |-- xf86-input-keyboard-1.6.0-x86_64-1.txz

+|   |   |-- xf86-input-keyboard-1.6.0-x86_64-1.txz.asc

+|   |   |-- xf86-input-mouse-1.7.0-x86_64-1.txt

+|   |   |-- xf86-input-mouse-1.7.0-x86_64-1.txz

+|   |   |-- xf86-input-mouse-1.7.0-x86_64-1.txz.asc

+|   |   |-- xf86-input-penmount-1.4.1-x86_64-2.txt

+|   |   |-- xf86-input-penmount-1.4.1-x86_64-2.txz

+|   |   |-- xf86-input-penmount-1.4.1-x86_64-2.txz.asc

+|   |   |-- xf86-input-synaptics-1.4.0-x86_64-1.txt

+|   |   |-- xf86-input-synaptics-1.4.0-x86_64-1.txz

+|   |   |-- xf86-input-synaptics-1.4.0-x86_64-1.txz.asc

+|   |   |-- xf86-input-vmmouse-12.7.0-x86_64-1.txt

+|   |   |-- xf86-input-vmmouse-12.7.0-x86_64-1.txz

+|   |   |-- xf86-input-vmmouse-12.7.0-x86_64-1.txz.asc

+|   |   |-- xf86-input-void-1.3.1-x86_64-1.txt

+|   |   |-- xf86-input-void-1.3.1-x86_64-1.txz

+|   |   |-- xf86-input-void-1.3.1-x86_64-1.txz.asc

+|   |   |-- xf86-input-wacom-0.10.11-x86_64-1.txt

+|   |   |-- xf86-input-wacom-0.10.11-x86_64-1.txz

+|   |   |-- xf86-input-wacom-0.10.11-x86_64-1.txz.asc

+|   |   |-- xf86-video-apm-1.2.3-x86_64-1.txt

+|   |   |-- xf86-video-apm-1.2.3-x86_64-1.txz

+|   |   |-- xf86-video-apm-1.2.3-x86_64-1.txz.asc

+|   |   |-- xf86-video-ark-0.7.3-x86_64-1.txt

+|   |   |-- xf86-video-ark-0.7.3-x86_64-1.txz

+|   |   |-- xf86-video-ark-0.7.3-x86_64-1.txz.asc

+|   |   |-- xf86-video-ast-0.91.10-x86_64-1.txt

+|   |   |-- xf86-video-ast-0.91.10-x86_64-1.txz

+|   |   |-- xf86-video-ast-0.91.10-x86_64-1.txz.asc

+|   |   |-- xf86-video-ati-6.14.1-x86_64-1.txt

+|   |   |-- xf86-video-ati-6.14.1-x86_64-1.txz

+|   |   |-- xf86-video-ati-6.14.1-x86_64-1.txz.asc

+|   |   |-- xf86-video-chips-1.2.4-x86_64-1.txt

+|   |   |-- xf86-video-chips-1.2.4-x86_64-1.txz

+|   |   |-- xf86-video-chips-1.2.4-x86_64-1.txz.asc

+|   |   |-- xf86-video-cirrus-1.3.2-x86_64-3.txt

+|   |   |-- xf86-video-cirrus-1.3.2-x86_64-3.txz

+|   |   |-- xf86-video-cirrus-1.3.2-x86_64-3.txz.asc

+|   |   |-- xf86-video-dummy-0.3.4-x86_64-1.txt

+|   |   |-- xf86-video-dummy-0.3.4-x86_64-1.txz

+|   |   |-- xf86-video-dummy-0.3.4-x86_64-1.txz.asc

+|   |   |-- xf86-video-glint-1.2.5-x86_64-1.txt

+|   |   |-- xf86-video-glint-1.2.5-x86_64-1.txz

+|   |   |-- xf86-video-glint-1.2.5-x86_64-1.txz.asc

+|   |   |-- xf86-video-i128-1.3.4-x86_64-1.txt

+|   |   |-- xf86-video-i128-1.3.4-x86_64-1.txz

+|   |   |-- xf86-video-i128-1.3.4-x86_64-1.txz.asc

+|   |   |-- xf86-video-i740-1.3.2-x86_64-3.txt

+|   |   |-- xf86-video-i740-1.3.2-x86_64-3.txz

+|   |   |-- xf86-video-i740-1.3.2-x86_64-3.txz.asc

+|   |   |-- xf86-video-intel-2.15.0-x86_64-1.txt

+|   |   |-- xf86-video-intel-2.15.0-x86_64-1.txz

+|   |   |-- xf86-video-intel-2.15.0-x86_64-1.txz.asc

+|   |   |-- xf86-video-mach64-6.8.2-x86_64-3.txt

+|   |   |-- xf86-video-mach64-6.8.2-x86_64-3.txz

+|   |   |-- xf86-video-mach64-6.8.2-x86_64-3.txz.asc

+|   |   |-- xf86-video-mga-1.4.13-x86_64-1.txt

+|   |   |-- xf86-video-mga-1.4.13-x86_64-1.txz

+|   |   |-- xf86-video-mga-1.4.13-x86_64-1.txz.asc

+|   |   |-- xf86-video-neomagic-1.2.5-x86_64-1.txt

+|   |   |-- xf86-video-neomagic-1.2.5-x86_64-1.txz

+|   |   |-- xf86-video-neomagic-1.2.5-x86_64-1.txz.asc

+|   |   |-- xf86-video-nouveau-8bb82312-x86_64-1.txt

+|   |   |-- xf86-video-nouveau-8bb82312-x86_64-1.txz

+|   |   |-- xf86-video-nouveau-8bb82312-x86_64-1.txz.asc

+|   |   |-- xf86-video-nv-2.1.18-x86_64-1.txt

+|   |   |-- xf86-video-nv-2.1.18-x86_64-1.txz

+|   |   |-- xf86-video-nv-2.1.18-x86_64-1.txz.asc

+|   |   |-- xf86-video-openchrome-0.2.904-x86_64-2.txt

+|   |   |-- xf86-video-openchrome-0.2.904-x86_64-2.txz

+|   |   |-- xf86-video-openchrome-0.2.904-x86_64-2.txz.asc

+|   |   |-- xf86-video-r128-6.8.1-x86_64-3.txt

+|   |   |-- xf86-video-r128-6.8.1-x86_64-3.txz

+|   |   |-- xf86-video-r128-6.8.1-x86_64-3.txz.asc

+|   |   |-- xf86-video-radeonhd-1.3.0-x86_64-2.txt

+|   |   |-- xf86-video-radeonhd-1.3.0-x86_64-2.txz

+|   |   |-- xf86-video-radeonhd-1.3.0-x86_64-2.txz.asc

+|   |   |-- xf86-video-rendition-4.2.4-x86_64-1.txt

+|   |   |-- xf86-video-rendition-4.2.4-x86_64-1.txz

+|   |   |-- xf86-video-rendition-4.2.4-x86_64-1.txz.asc

+|   |   |-- xf86-video-s3-0.6.3-x86_64-3.txt

+|   |   |-- xf86-video-s3-0.6.3-x86_64-3.txz

+|   |   |-- xf86-video-s3-0.6.3-x86_64-3.txz.asc

+|   |   |-- xf86-video-s3virge-1.10.4-x86_64-3.txt

+|   |   |-- xf86-video-s3virge-1.10.4-x86_64-3.txz

+|   |   |-- xf86-video-s3virge-1.10.4-x86_64-3.txz.asc

+|   |   |-- xf86-video-savage-2.3.2-x86_64-1.txt

+|   |   |-- xf86-video-savage-2.3.2-x86_64-1.txz

+|   |   |-- xf86-video-savage-2.3.2-x86_64-1.txz.asc

+|   |   |-- xf86-video-siliconmotion-1.7.5-x86_64-1.txt

+|   |   |-- xf86-video-siliconmotion-1.7.5-x86_64-1.txz

+|   |   |-- xf86-video-siliconmotion-1.7.5-x86_64-1.txz.asc

+|   |   |-- xf86-video-sis-0.10.3-x86_64-1.txt

+|   |   |-- xf86-video-sis-0.10.3-x86_64-1.txz

+|   |   |-- xf86-video-sis-0.10.3-x86_64-1.txz.asc

+|   |   |-- xf86-video-sisusb-0.9.4-x86_64-1.txt

+|   |   |-- xf86-video-sisusb-0.9.4-x86_64-1.txz

+|   |   |-- xf86-video-sisusb-0.9.4-x86_64-1.txz.asc

+|   |   |-- xf86-video-tdfx-1.4.3-x86_64-3.txt

+|   |   |-- xf86-video-tdfx-1.4.3-x86_64-3.txz

+|   |   |-- xf86-video-tdfx-1.4.3-x86_64-3.txz.asc

+|   |   |-- xf86-video-tga-1.2.1-x86_64-2.txt

+|   |   |-- xf86-video-tga-1.2.1-x86_64-2.txz

+|   |   |-- xf86-video-tga-1.2.1-x86_64-2.txz.asc

+|   |   |-- xf86-video-trident-1.3.4-x86_64-1.txt

+|   |   |-- xf86-video-trident-1.3.4-x86_64-1.txz

+|   |   |-- xf86-video-trident-1.3.4-x86_64-1.txz.asc

+|   |   |-- xf86-video-tseng-1.2.4-x86_64-1.txt

+|   |   |-- xf86-video-tseng-1.2.4-x86_64-1.txz

+|   |   |-- xf86-video-tseng-1.2.4-x86_64-1.txz.asc

+|   |   |-- xf86-video-v4l-0.2.0-x86_64-4.txt

+|   |   |-- xf86-video-v4l-0.2.0-x86_64-4.txz

+|   |   |-- xf86-video-v4l-0.2.0-x86_64-4.txz.asc

+|   |   |-- xf86-video-vesa-2.3.0-x86_64-3.txt

+|   |   |-- xf86-video-vesa-2.3.0-x86_64-3.txz

+|   |   |-- xf86-video-vesa-2.3.0-x86_64-3.txz.asc

+|   |   |-- xf86-video-vmware-11.0.3-x86_64-1.txt

+|   |   |-- xf86-video-vmware-11.0.3-x86_64-1.txz

+|   |   |-- xf86-video-vmware-11.0.3-x86_64-1.txz.asc

+|   |   |-- xf86-video-voodoo-1.2.4-x86_64-1.txt

+|   |   |-- xf86-video-voodoo-1.2.4-x86_64-1.txz

+|   |   |-- xf86-video-voodoo-1.2.4-x86_64-1.txz.asc

+|   |   |-- xf86-video-xgi-1.6.0-x86_64-1.txt

+|   |   |-- xf86-video-xgi-1.6.0-x86_64-1.txz

+|   |   |-- xf86-video-xgi-1.6.0-x86_64-1.txz.asc

 |   |   |-- xf86bigfontproto-1.2.0-noarch-1.txt

 |   |   |-- xf86bigfontproto-1.2.0-noarch-1.txz

 |   |   |-- xf86bigfontproto-1.2.0-noarch-1.txz.asc

-|   |   |-- xf86dga-1.0.2-x86_64-2.txt

-|   |   |-- xf86dga-1.0.2-x86_64-2.txz

-|   |   |-- xf86dga-1.0.2-x86_64-2.txz.asc

+|   |   |-- xf86dga-1.0.3-x86_64-1.txt

+|   |   |-- xf86dga-1.0.3-x86_64-1.txz

+|   |   |-- xf86dga-1.0.3-x86_64-1.txz.asc

 |   |   |-- xf86dgaproto-2.1-noarch-1.txt

 |   |   |-- xf86dgaproto-2.1-noarch-1.txz

 |   |   |-- xf86dgaproto-2.1-noarch-1.txz.asc

-|   |   |-- xf86driproto-2.1.0-noarch-1.txt

-|   |   |-- xf86driproto-2.1.0-noarch-1.txz

-|   |   |-- xf86driproto-2.1.0-noarch-1.txz.asc

+|   |   |-- xf86driproto-2.1.1-noarch-1.txt

+|   |   |-- xf86driproto-2.1.1-noarch-1.txz

+|   |   |-- xf86driproto-2.1.1-noarch-1.txz.asc

 |   |   |-- xf86miscproto-0.9.3-noarch-1.txt

 |   |   |-- xf86miscproto-0.9.3-noarch-1.txz

 |   |   |-- xf86miscproto-0.9.3-noarch-1.txz.asc

-|   |   |-- xf86rushproto-1.1.2-noarch-2.txt

-|   |   |-- xf86rushproto-1.1.2-noarch-2.txz

-|   |   |-- xf86rushproto-1.1.2-noarch-2.txz.asc

-|   |   |-- xf86vidmodeproto-2.3-noarch-1.txt

-|   |   |-- xf86vidmodeproto-2.3-noarch-1.txz

-|   |   |-- xf86vidmodeproto-2.3-noarch-1.txz.asc

-|   |   |-- xfd-1.0.1-x86_64-2.txt

-|   |   |-- xfd-1.0.1-x86_64-2.txz

-|   |   |-- xfd-1.0.1-x86_64-2.txz.asc

-|   |   |-- xfindproxy-1.0.1-x86_64-2.txt

-|   |   |-- xfindproxy-1.0.1-x86_64-2.txz

-|   |   |-- xfindproxy-1.0.1-x86_64-2.txz.asc

-|   |   |-- xfontsel-1.0.2-x86_64-2.txt

-|   |   |-- xfontsel-1.0.2-x86_64-2.txz

-|   |   |-- xfontsel-1.0.2-x86_64-2.txz.asc

-|   |   |-- xfs-1.1.0-x86_64-1.txt

-|   |   |-- xfs-1.1.0-x86_64-1.txz

-|   |   |-- xfs-1.1.0-x86_64-1.txz.asc

-|   |   |-- xfsinfo-1.0.2-x86_64-1.txt

-|   |   |-- xfsinfo-1.0.2-x86_64-1.txz

-|   |   |-- xfsinfo-1.0.2-x86_64-1.txz.asc

-|   |   |-- xfwp-1.0.1-x86_64-2.txt

-|   |   |-- xfwp-1.0.1-x86_64-2.txz

-|   |   |-- xfwp-1.0.1-x86_64-2.txz.asc

-|   |   |-- xgamma-1.0.3-x86_64-1.txt

-|   |   |-- xgamma-1.0.3-x86_64-1.txz

-|   |   |-- xgamma-1.0.3-x86_64-1.txz.asc

-|   |   |-- xgc-1.0.2-x86_64-2.txt

-|   |   |-- xgc-1.0.2-x86_64-2.txz

-|   |   |-- xgc-1.0.2-x86_64-2.txz.asc

-|   |   |-- xhost-1.0.3-x86_64-1.txt

-|   |   |-- xhost-1.0.3-x86_64-1.txz

-|   |   |-- xhost-1.0.3-x86_64-1.txz.asc

-|   |   |-- xineramaproto-1.2-noarch-1.txt

-|   |   |-- xineramaproto-1.2-noarch-1.txz

-|   |   |-- xineramaproto-1.2-noarch-1.txz.asc

-|   |   |-- xinit-1.2.1-x86_64-1.txt

-|   |   |-- xinit-1.2.1-x86_64-1.txz

-|   |   |-- xinit-1.2.1-x86_64-1.txz.asc

-|   |   |-- xinput-1.5.1-x86_64-1.txt

-|   |   |-- xinput-1.5.1-x86_64-1.txz

-|   |   |-- xinput-1.5.1-x86_64-1.txz.asc

-|   |   |-- xkbcomp-1.1.1-x86_64-1.txt

-|   |   |-- xkbcomp-1.1.1-x86_64-1.txz

-|   |   |-- xkbcomp-1.1.1-x86_64-1.txz.asc

-|   |   |-- xkbevd-1.1.0-x86_64-1.txt

-|   |   |-- xkbevd-1.1.0-x86_64-1.txz

-|   |   |-- xkbevd-1.1.0-x86_64-1.txz.asc

-|   |   |-- xkbprint-1.0.2-x86_64-1.txt

-|   |   |-- xkbprint-1.0.2-x86_64-1.txz

-|   |   |-- xkbprint-1.0.2-x86_64-1.txz.asc

-|   |   |-- xkbutils-1.0.2-x86_64-1.txt

-|   |   |-- xkbutils-1.0.2-x86_64-1.txz

-|   |   |-- xkbutils-1.0.2-x86_64-1.txz.asc

-|   |   |-- xkeyboard-config-1.8-noarch-1.txt

-|   |   |-- xkeyboard-config-1.8-noarch-1.txz

-|   |   |-- xkeyboard-config-1.8-noarch-1.txz.asc

-|   |   |-- xkill-1.0.2-x86_64-1.txt

-|   |   |-- xkill-1.0.2-x86_64-1.txz

-|   |   |-- xkill-1.0.2-x86_64-1.txz.asc

-|   |   |-- xload-1.0.2-x86_64-2.txt

-|   |   |-- xload-1.0.2-x86_64-2.txz

-|   |   |-- xload-1.0.2-x86_64-2.txz.asc

-|   |   |-- xlogo-1.0.2-x86_64-1.txt

-|   |   |-- xlogo-1.0.2-x86_64-1.txz

-|   |   |-- xlogo-1.0.2-x86_64-1.txz.asc

-|   |   |-- xlsatoms-1.0.2-x86_64-1.txt

-|   |   |-- xlsatoms-1.0.2-x86_64-1.txz

-|   |   |-- xlsatoms-1.0.2-x86_64-1.txz.asc

-|   |   |-- xlsclients-1.0.2-x86_64-1.txt

-|   |   |-- xlsclients-1.0.2-x86_64-1.txz

-|   |   |-- xlsclients-1.0.2-x86_64-1.txz.asc

-|   |   |-- xlsfonts-1.0.2-x86_64-2.txt

-|   |   |-- xlsfonts-1.0.2-x86_64-2.txz

-|   |   |-- xlsfonts-1.0.2-x86_64-2.txz.asc

-|   |   |-- xmag-1.0.3-x86_64-1.txt

-|   |   |-- xmag-1.0.3-x86_64-1.txz

-|   |   |-- xmag-1.0.3-x86_64-1.txz.asc

-|   |   |-- xman-1.1.0-x86_64-1.txt

-|   |   |-- xman-1.1.0-x86_64-1.txz

-|   |   |-- xman-1.1.0-x86_64-1.txz.asc

+|   |   |-- xf86vidmodeproto-2.3.1-noarch-1.txt

+|   |   |-- xf86vidmodeproto-2.3.1-noarch-1.txz

+|   |   |-- xf86vidmodeproto-2.3.1-noarch-1.txz.asc

+|   |   |-- xfd-1.1.0-x86_64-1.txt

+|   |   |-- xfd-1.1.0-x86_64-1.txz

+|   |   |-- xfd-1.1.0-x86_64-1.txz.asc

+|   |   |-- xfontsel-1.0.3-x86_64-1.txt

+|   |   |-- xfontsel-1.0.3-x86_64-1.txz

+|   |   |-- xfontsel-1.0.3-x86_64-1.txz.asc

+|   |   |-- xfs-1.1.1-x86_64-1.txt

+|   |   |-- xfs-1.1.1-x86_64-1.txz

+|   |   |-- xfs-1.1.1-x86_64-1.txz.asc

+|   |   |-- xfsinfo-1.0.3-x86_64-1.txt

+|   |   |-- xfsinfo-1.0.3-x86_64-1.txz

+|   |   |-- xfsinfo-1.0.3-x86_64-1.txz.asc

+|   |   |-- xgamma-1.0.4-x86_64-1.txt

+|   |   |-- xgamma-1.0.4-x86_64-1.txz

+|   |   |-- xgamma-1.0.4-x86_64-1.txz.asc

+|   |   |-- xgc-1.0.3-x86_64-1.txt

+|   |   |-- xgc-1.0.3-x86_64-1.txz

+|   |   |-- xgc-1.0.3-x86_64-1.txz.asc

+|   |   |-- xhost-1.0.4-x86_64-1.txt

+|   |   |-- xhost-1.0.4-x86_64-1.txz

+|   |   |-- xhost-1.0.4-x86_64-1.txz.asc

+|   |   |-- xineramaproto-1.2.1-noarch-1.txt

+|   |   |-- xineramaproto-1.2.1-noarch-1.txz

+|   |   |-- xineramaproto-1.2.1-noarch-1.txz.asc

+|   |   |-- xinit-1.3.0-x86_64-1.txt

+|   |   |-- xinit-1.3.0-x86_64-1.txz

+|   |   |-- xinit-1.3.0-x86_64-1.txz.asc

+|   |   |-- xinput-1.5.3-x86_64-1.txt

+|   |   |-- xinput-1.5.3-x86_64-1.txz

+|   |   |-- xinput-1.5.3-x86_64-1.txz.asc

+|   |   |-- xkbcomp-1.2.1-x86_64-1.txt

+|   |   |-- xkbcomp-1.2.1-x86_64-1.txz

+|   |   |-- xkbcomp-1.2.1-x86_64-1.txz.asc

+|   |   |-- xkbevd-1.1.2-x86_64-1.txt

+|   |   |-- xkbevd-1.1.2-x86_64-1.txz

+|   |   |-- xkbevd-1.1.2-x86_64-1.txz.asc

+|   |   |-- xkbprint-1.0.3-x86_64-1.txt

+|   |   |-- xkbprint-1.0.3-x86_64-1.txz

+|   |   |-- xkbprint-1.0.3-x86_64-1.txz.asc

+|   |   |-- xkbutils-1.0.3-x86_64-1.txt

+|   |   |-- xkbutils-1.0.3-x86_64-1.txz

+|   |   |-- xkbutils-1.0.3-x86_64-1.txz.asc

+|   |   |-- xkeyboard-config-2.2.1-noarch-1.txt

+|   |   |-- xkeyboard-config-2.2.1-noarch-1.txz

+|   |   |-- xkeyboard-config-2.2.1-noarch-1.txz.asc

+|   |   |-- xkill-1.0.3-x86_64-1.txt

+|   |   |-- xkill-1.0.3-x86_64-1.txz

+|   |   |-- xkill-1.0.3-x86_64-1.txz.asc

+|   |   |-- xload-1.1.0-x86_64-1.txt

+|   |   |-- xload-1.1.0-x86_64-1.txz

+|   |   |-- xload-1.1.0-x86_64-1.txz.asc

+|   |   |-- xlogo-1.0.3-x86_64-1.txt

+|   |   |-- xlogo-1.0.3-x86_64-1.txz

+|   |   |-- xlogo-1.0.3-x86_64-1.txz.asc

+|   |   |-- xlsatoms-1.1.0-x86_64-1.txt

+|   |   |-- xlsatoms-1.1.0-x86_64-1.txz

+|   |   |-- xlsatoms-1.1.0-x86_64-1.txz.asc

+|   |   |-- xlsclients-1.1.1-x86_64-1.txt

+|   |   |-- xlsclients-1.1.1-x86_64-1.txz

+|   |   |-- xlsclients-1.1.1-x86_64-1.txz.asc

+|   |   |-- xlsfonts-1.0.3-x86_64-1.txt

+|   |   |-- xlsfonts-1.0.3-x86_64-1.txz

+|   |   |-- xlsfonts-1.0.3-x86_64-1.txz.asc

+|   |   |-- xmag-1.0.4-x86_64-1.txt

+|   |   |-- xmag-1.0.4-x86_64-1.txz

+|   |   |-- xmag-1.0.4-x86_64-1.txz.asc

+|   |   |-- xman-1.1.1-x86_64-1.txt

+|   |   |-- xman-1.1.1-x86_64-1.txz

+|   |   |-- xman-1.1.1-x86_64-1.txz.asc

 |   |   |-- xmessage-1.0.3-x86_64-1.txt

 |   |   |-- xmessage-1.0.3-x86_64-1.txz

 |   |   |-- xmessage-1.0.3-x86_64-1.txz.asc

-|   |   |-- xmh-1.0.1-x86_64-2.txt

-|   |   |-- xmh-1.0.1-x86_64-2.txz

-|   |   |-- xmh-1.0.1-x86_64-2.txz.asc

-|   |   |-- xmodmap-1.0.4-x86_64-1.txt

-|   |   |-- xmodmap-1.0.4-x86_64-1.txz

-|   |   |-- xmodmap-1.0.4-x86_64-1.txz.asc

-|   |   |-- xmore-1.0.1-x86_64-2.txt

-|   |   |-- xmore-1.0.1-x86_64-2.txz

-|   |   |-- xmore-1.0.1-x86_64-2.txz.asc

-|   |   |-- xorg-cf-files-1.0.3-noarch-1.txt

-|   |   |-- xorg-cf-files-1.0.3-noarch-1.txz

-|   |   |-- xorg-cf-files-1.0.3-noarch-1.txz.asc

-|   |   |-- xorg-docs-1.5-noarch-1.txt

-|   |   |-- xorg-docs-1.5-noarch-1.txz

-|   |   |-- xorg-docs-1.5-noarch-1.txz.asc

-|   |   |-- xorg-server-1.7.7-x86_64-1.txt

-|   |   |-- xorg-server-1.7.7-x86_64-1.txz

-|   |   |-- xorg-server-1.7.7-x86_64-1.txz.asc

-|   |   |-- xorg-server-xephyr-1.7.7-x86_64-1.txt

-|   |   |-- xorg-server-xephyr-1.7.7-x86_64-1.txz

-|   |   |-- xorg-server-xephyr-1.7.7-x86_64-1.txz.asc

-|   |   |-- xorg-server-xnest-1.7.7-x86_64-1.txt

-|   |   |-- xorg-server-xnest-1.7.7-x86_64-1.txz

-|   |   |-- xorg-server-xnest-1.7.7-x86_64-1.txz.asc

-|   |   |-- xorg-server-xvfb-1.7.7-x86_64-1.txt

-|   |   |-- xorg-server-xvfb-1.7.7-x86_64-1.txz

-|   |   |-- xorg-server-xvfb-1.7.7-x86_64-1.txz.asc

-|   |   |-- xorg-sgml-doctools-1.4-noarch-1.txt

-|   |   |-- xorg-sgml-doctools-1.4-noarch-1.txz

-|   |   |-- xorg-sgml-doctools-1.4-noarch-1.txz.asc

-|   |   |-- xplsprinters-1.0.1-x86_64-2.txt

-|   |   |-- xplsprinters-1.0.1-x86_64-2.txz

-|   |   |-- xplsprinters-1.0.1-x86_64-2.txz.asc

+|   |   |-- xmh-1.0.2-x86_64-1.txt

+|   |   |-- xmh-1.0.2-x86_64-1.txz

+|   |   |-- xmh-1.0.2-x86_64-1.txz.asc

+|   |   |-- xmodmap-1.0.5-x86_64-1.txt

+|   |   |-- xmodmap-1.0.5-x86_64-1.txz

+|   |   |-- xmodmap-1.0.5-x86_64-1.txz.asc

+|   |   |-- xmore-1.0.2-x86_64-1.txt

+|   |   |-- xmore-1.0.2-x86_64-1.txz

+|   |   |-- xmore-1.0.2-x86_64-1.txz.asc

+|   |   |-- xorg-cf-files-1.0.4-noarch-1.txt

+|   |   |-- xorg-cf-files-1.0.4-noarch-1.txz

+|   |   |-- xorg-cf-files-1.0.4-noarch-1.txz.asc

+|   |   |-- xorg-docs-1.6-noarch-1.txt

+|   |   |-- xorg-docs-1.6-noarch-1.txz

+|   |   |-- xorg-docs-1.6-noarch-1.txz.asc

+|   |   |-- xorg-server-1.9.5-x86_64-1.txt

+|   |   |-- xorg-server-1.9.5-x86_64-1.txz

+|   |   |-- xorg-server-1.9.5-x86_64-1.txz.asc

+|   |   |-- xorg-server-xephyr-1.9.5-x86_64-1.txt

+|   |   |-- xorg-server-xephyr-1.9.5-x86_64-1.txz

+|   |   |-- xorg-server-xephyr-1.9.5-x86_64-1.txz.asc

+|   |   |-- xorg-server-xnest-1.9.5-x86_64-1.txt

+|   |   |-- xorg-server-xnest-1.9.5-x86_64-1.txz

+|   |   |-- xorg-server-xnest-1.9.5-x86_64-1.txz.asc

+|   |   |-- xorg-server-xvfb-1.9.5-x86_64-1.txt

+|   |   |-- xorg-server-xvfb-1.9.5-x86_64-1.txz

+|   |   |-- xorg-server-xvfb-1.9.5-x86_64-1.txz.asc

+|   |   |-- xorg-sgml-doctools-1.7-x86_64-1.txt

+|   |   |-- xorg-sgml-doctools-1.7-x86_64-1.txz

+|   |   |-- xorg-sgml-doctools-1.7-x86_64-1.txz.asc

 |   |   |-- xpr-1.0.3-x86_64-1.txt

 |   |   |-- xpr-1.0.3-x86_64-1.txz

 |   |   |-- xpr-1.0.3-x86_64-1.txz.asc

-|   |   |-- xprehashprinterlist-1.0.1-x86_64-2.txt

-|   |   |-- xprehashprinterlist-1.0.1-x86_64-2.txz

-|   |   |-- xprehashprinterlist-1.0.1-x86_64-2.txz.asc

-|   |   |-- xprop-1.1.0-x86_64-1.txt

-|   |   |-- xprop-1.1.0-x86_64-1.txz

-|   |   |-- xprop-1.1.0-x86_64-1.txz.asc

-|   |   |-- xproto-7.0.16-noarch-1.txt

-|   |   |-- xproto-7.0.16-noarch-1.txz

-|   |   |-- xproto-7.0.16-noarch-1.txz.asc

-|   |   |-- xproxymanagementprotocol-1.0.3-noarch-1.txt

-|   |   |-- xproxymanagementprotocol-1.0.3-noarch-1.txz

-|   |   |-- xproxymanagementprotocol-1.0.3-noarch-1.txz.asc

+|   |   |-- xprop-1.2.0-x86_64-1.txt

+|   |   |-- xprop-1.2.0-x86_64-1.txz

+|   |   |-- xprop-1.2.0-x86_64-1.txz.asc

+|   |   |-- xproto-7.0.21-noarch-1.txt

+|   |   |-- xproto-7.0.21-noarch-1.txz

+|   |   |-- xproto-7.0.21-noarch-1.txz.asc

 |   |   |-- xpyb-1.2-x86_64-1.txt

 |   |   |-- xpyb-1.2-x86_64-1.txz

 |   |   |-- xpyb-1.2-x86_64-1.txz.asc

-|   |   |-- xrandr-1.3.2-x86_64-1.txt

-|   |   |-- xrandr-1.3.2-x86_64-1.txz

-|   |   |-- xrandr-1.3.2-x86_64-1.txz.asc

-|   |   |-- xrdb-1.0.6-x86_64-1.txt

-|   |   |-- xrdb-1.0.6-x86_64-1.txz

-|   |   |-- xrdb-1.0.6-x86_64-1.txz.asc

-|   |   |-- xrefresh-1.0.3-x86_64-1.txt

-|   |   |-- xrefresh-1.0.3-x86_64-1.txz

-|   |   |-- xrefresh-1.0.3-x86_64-1.txz.asc

-|   |   |-- xscope-1.2-x86_64-1.txt

-|   |   |-- xscope-1.2-x86_64-1.txz

-|   |   |-- xscope-1.2-x86_64-1.txz.asc

-|   |   |-- xset-1.1.0-x86_64-1.txt

-|   |   |-- xset-1.1.0-x86_64-1.txz

-|   |   |-- xset-1.1.0-x86_64-1.txz.asc

-|   |   |-- xsetmode-1.0.0-x86_64-2.txt

-|   |   |-- xsetmode-1.0.0-x86_64-2.txz

-|   |   |-- xsetmode-1.0.0-x86_64-2.txz.asc

-|   |   |-- xsetpointer-1.0.1-x86_64-2.txt

-|   |   |-- xsetpointer-1.0.1-x86_64-2.txz

-|   |   |-- xsetpointer-1.0.1-x86_64-2.txz.asc

-|   |   |-- xsetroot-1.0.3-x86_64-1.txt

-|   |   |-- xsetroot-1.0.3-x86_64-1.txz

-|   |   |-- xsetroot-1.0.3-x86_64-1.txz.asc

-|   |   |-- xsm-1.0.1-x86_64-2.txt

-|   |   |-- xsm-1.0.1-x86_64-2.txz

-|   |   |-- xsm-1.0.1-x86_64-2.txz.asc

-|   |   |-- xstdcmap-1.0.1-x86_64-2.txt

-|   |   |-- xstdcmap-1.0.1-x86_64-2.txz

-|   |   |-- xstdcmap-1.0.1-x86_64-2.txz.asc

-|   |   |-- xterm-258-x86_64-1.txt

-|   |   |-- xterm-258-x86_64-1.txz

-|   |   |-- xterm-258-x86_64-1.txz.asc

-|   |   |-- xtrans-1.2.5-noarch-1.txt

-|   |   |-- xtrans-1.2.5-noarch-1.txz

-|   |   |-- xtrans-1.2.5-noarch-1.txz.asc

-|   |   |-- xtrap-1.0.2-x86_64-2.txt

-|   |   |-- xtrap-1.0.2-x86_64-2.txz

-|   |   |-- xtrap-1.0.2-x86_64-2.txz.asc

+|   |   |-- xrandr-1.3.4-x86_64-1.txt

+|   |   |-- xrandr-1.3.4-x86_64-1.txz

+|   |   |-- xrandr-1.3.4-x86_64-1.txz.asc

+|   |   |-- xrdb-1.0.9-x86_64-1.txt

+|   |   |-- xrdb-1.0.9-x86_64-1.txz

+|   |   |-- xrdb-1.0.9-x86_64-1.txz.asc

+|   |   |-- xrefresh-1.0.4-x86_64-1.txt

+|   |   |-- xrefresh-1.0.4-x86_64-1.txz

+|   |   |-- xrefresh-1.0.4-x86_64-1.txz.asc

+|   |   |-- xscope-1.3-x86_64-1.txt

+|   |   |-- xscope-1.3-x86_64-1.txz

+|   |   |-- xscope-1.3-x86_64-1.txz.asc

+|   |   |-- xset-1.2.1-x86_64-1.txt

+|   |   |-- xset-1.2.1-x86_64-1.txz

+|   |   |-- xset-1.2.1-x86_64-1.txz.asc

+|   |   |-- xsetroot-1.1.0-x86_64-1.txt

+|   |   |-- xsetroot-1.1.0-x86_64-1.txz

+|   |   |-- xsetroot-1.1.0-x86_64-1.txz.asc

+|   |   |-- xsm-1.0.2-x86_64-1.txt

+|   |   |-- xsm-1.0.2-x86_64-1.txz

+|   |   |-- xsm-1.0.2-x86_64-1.txz.asc

+|   |   |-- xstdcmap-1.0.2-x86_64-1.txt

+|   |   |-- xstdcmap-1.0.2-x86_64-1.txz

+|   |   |-- xstdcmap-1.0.2-x86_64-1.txz.asc

+|   |   |-- xterm-267-x86_64-1.txt

+|   |   |-- xterm-267-x86_64-1.txz

+|   |   |-- xterm-267-x86_64-1.txz.asc

+|   |   |-- xtrans-1.2.6-noarch-1.txt

+|   |   |-- xtrans-1.2.6-noarch-1.txz

+|   |   |-- xtrans-1.2.6-noarch-1.txz.asc

 |   |   |-- xvidtune-1.0.2-x86_64-1.txt

 |   |   |-- xvidtune-1.0.2-x86_64-1.txz

 |   |   |-- xvidtune-1.0.2-x86_64-1.txz.asc

-|   |   |-- xvinfo-1.1.0-x86_64-1.txt

-|   |   |-- xvinfo-1.1.0-x86_64-1.txz

-|   |   |-- xvinfo-1.1.0-x86_64-1.txz.asc

-|   |   |-- xwd-1.0.3-x86_64-1.txt

-|   |   |-- xwd-1.0.3-x86_64-1.txz

-|   |   |-- xwd-1.0.3-x86_64-1.txz.asc

-|   |   |-- xwininfo-1.0.5-x86_64-1.txt

-|   |   |-- xwininfo-1.0.5-x86_64-1.txz

-|   |   |-- xwininfo-1.0.5-x86_64-1.txz.asc

-|   |   |-- xwud-1.0.2-x86_64-1.txt

-|   |   |-- xwud-1.0.2-x86_64-1.txz

-|   |   `-- xwud-1.0.2-x86_64-1.txz.asc

+|   |   |-- xvinfo-1.1.1-x86_64-1.txt

+|   |   |-- xvinfo-1.1.1-x86_64-1.txz

+|   |   |-- xvinfo-1.1.1-x86_64-1.txz.asc

+|   |   |-- xwd-1.0.4-x86_64-1.txt

+|   |   |-- xwd-1.0.4-x86_64-1.txz

+|   |   |-- xwd-1.0.4-x86_64-1.txz.asc

+|   |   |-- xwininfo-1.1.1-x86_64-1.txt

+|   |   |-- xwininfo-1.1.1-x86_64-1.txz

+|   |   |-- xwininfo-1.1.1-x86_64-1.txz.asc

+|   |   |-- xwud-1.0.3-x86_64-1.txt

+|   |   |-- xwud-1.0.3-x86_64-1.txz

+|   |   `-- xwud-1.0.3-x86_64-1.txz.asc

 |   |-- xap

-|   |   |-- MPlayer-20100218-x86_64-1.txt

-|   |   |-- MPlayer-20100218-x86_64-1.txz

-|   |   |-- MPlayer-20100218-x86_64-1.txz.asc

-|   |   |-- audacious-2.3-x86_64-1.txt

-|   |   |-- audacious-2.3-x86_64-1.txz

-|   |   |-- audacious-2.3-x86_64-1.txz.asc

-|   |   |-- audacious-plugins-2.3-x86_64-1.txt

-|   |   |-- audacious-plugins-2.3-x86_64-1.txz

-|   |   |-- audacious-plugins-2.3-x86_64-1.txz.asc

-|   |   |-- blackbox-0.70.1-x86_64-3.txt

-|   |   |-- blackbox-0.70.1-x86_64-3.txz

-|   |   |-- blackbox-0.70.1-x86_64-3.txz.asc

-|   |   |-- blueman-1.21-x86_64-1.txt

-|   |   |-- blueman-1.21-x86_64-1.txz

-|   |   |-- blueman-1.21-x86_64-1.txz.asc

+|   |   |-- MPlayer-20101218-x86_64-1.txt

+|   |   |-- MPlayer-20101218-x86_64-1.txz

+|   |   |-- MPlayer-20101218-x86_64-1.txz.asc

+|   |   |-- audacious-2.4.4-x86_64-1.txt

+|   |   |-- audacious-2.4.4-x86_64-1.txz

+|   |   |-- audacious-2.4.4-x86_64-1.txz.asc

+|   |   |-- audacious-plugins-2.4.4-x86_64-1.txt

+|   |   |-- audacious-plugins-2.4.4-x86_64-1.txz

+|   |   |-- audacious-plugins-2.4.4-x86_64-1.txz.asc

+|   |   |-- blackbox-0.70.1-x86_64-4.txt

+|   |   |-- blackbox-0.70.1-x86_64-4.txz

+|   |   |-- blackbox-0.70.1-x86_64-4.txz.asc

+|   |   |-- blueman-r708-x86_64-1.txt

+|   |   |-- blueman-r708-x86_64-1.txz

+|   |   |-- blueman-r708-x86_64-1.txz.asc

 |   |   |-- electricsheep-20090306-x86_64-3.txt

 |   |   |-- electricsheep-20090306-x86_64-3.txz

 |   |   |-- electricsheep-20090306-x86_64-3.txz.asc

-|   |   |-- fluxbox-1.1.1-x86_64-2.txt

-|   |   |-- fluxbox-1.1.1-x86_64-2.txz

-|   |   |-- fluxbox-1.1.1-x86_64-2.txz.asc

-|   |   |-- fvwm-2.4.20-x86_64-1.txt

-|   |   |-- fvwm-2.4.20-x86_64-1.txz

-|   |   |-- fvwm-2.4.20-x86_64-1.txz.asc

-|   |   |-- geeqie-1.0-x86_64-1.txt

-|   |   |-- geeqie-1.0-x86_64-1.txz

-|   |   |-- geeqie-1.0-x86_64-1.txz.asc

+|   |   |-- fluxbox-1.3.1-x86_64-1.txt

+|   |   |-- fluxbox-1.3.1-x86_64-1.txz

+|   |   |-- fluxbox-1.3.1-x86_64-1.txz.asc

+|   |   |-- fvwm-2.4.20-x86_64-2.txt

+|   |   |-- fvwm-2.4.20-x86_64-2.txz

+|   |   |-- fvwm-2.4.20-x86_64-2.txz.asc

+|   |   |-- geeqie-1.0-x86_64-3.txt

+|   |   |-- geeqie-1.0-x86_64-3.txz

+|   |   |-- geeqie-1.0-x86_64-3.txz.asc

 |   |   |-- gftp-2.0.19-x86_64-2.txt

 |   |   |-- gftp-2.0.19-x86_64-2.txz

 |   |   |-- gftp-2.0.19-x86_64-2.txz.asc

-|   |   |-- gimp-2.6.8-x86_64-2.txt

-|   |   |-- gimp-2.6.8-x86_64-2.txz

-|   |   |-- gimp-2.6.8-x86_64-2.txz.asc

-|   |   |-- gkrellm-2.3.4-x86_64-1.txt

-|   |   |-- gkrellm-2.3.4-x86_64-1.txz

-|   |   |-- gkrellm-2.3.4-x86_64-1.txz.asc

-|   |   |-- gnuchess-5.07-x86_64-5.txt

-|   |   |-- gnuchess-5.07-x86_64-5.txz

-|   |   |-- gnuchess-5.07-x86_64-5.txz.asc

-|   |   |-- gnuplot-4.2.6-x86_64-1.txt

-|   |   |-- gnuplot-4.2.6-x86_64-1.txz

-|   |   |-- gnuplot-4.2.6-x86_64-1.txz.asc

-|   |   |-- gucharmap-2.28.2-x86_64-1.txt

-|   |   |-- gucharmap-2.28.2-x86_64-1.txz

-|   |   |-- gucharmap-2.28.2-x86_64-1.txz.asc

-|   |   |-- gv-3.6.9-x86_64-1.txt

-|   |   |-- gv-3.6.9-x86_64-1.txz

-|   |   |-- gv-3.6.9-x86_64-1.txz.asc

-|   |   |-- gxine-0.5.903-x86_64-2.txt

-|   |   |-- gxine-0.5.903-x86_64-2.txz

-|   |   |-- gxine-0.5.903-x86_64-2.txz.asc

-|   |   |-- imagemagick-6.5.9_6-x86_64-1.txt

-|   |   |-- imagemagick-6.5.9_6-x86_64-1.txz

-|   |   |-- imagemagick-6.5.9_6-x86_64-1.txz.asc

+|   |   |-- gimp-2.6.11-x86_64-3.txt

+|   |   |-- gimp-2.6.11-x86_64-3.txz

+|   |   |-- gimp-2.6.11-x86_64-3.txz.asc

+|   |   |-- gkrellm-2.3.5-x86_64-1.txt

+|   |   |-- gkrellm-2.3.5-x86_64-1.txz

+|   |   |-- gkrellm-2.3.5-x86_64-1.txz.asc

+|   |   |-- gnuchess-5.08-x86_64-2.txt

+|   |   |-- gnuchess-5.08-x86_64-2.txz

+|   |   |-- gnuchess-5.08-x86_64-2.txz.asc

+|   |   |-- gnuplot-4.4.3-x86_64-1.txt

+|   |   |-- gnuplot-4.4.3-x86_64-1.txz

+|   |   |-- gnuplot-4.4.3-x86_64-1.txz.asc

+|   |   |-- gucharmap-2.33.2-x86_64-1.txt

+|   |   |-- gucharmap-2.33.2-x86_64-1.txz

+|   |   |-- gucharmap-2.33.2-x86_64-1.txz.asc

+|   |   |-- gv-3.7.1-x86_64-2.txt

+|   |   |-- gv-3.7.1-x86_64-2.txz

+|   |   |-- gv-3.7.1-x86_64-2.txz.asc

+|   |   |-- imagemagick-6.6.6_10-x86_64-1.txt

+|   |   |-- imagemagick-6.6.6_10-x86_64-1.txz

+|   |   |-- imagemagick-6.6.6_10-x86_64-1.txz.asc

 |   |   |-- install-packages

 |   |   |-- install.end

 |   |   |-- maketag

 |   |   |-- maketag.ez

-|   |   |-- mozilla-firefox-3.6.3-x86_64-1.txt

-|   |   |-- mozilla-firefox-3.6.3-x86_64-1.txz

-|   |   |-- mozilla-firefox-3.6.3-x86_64-1.txz.asc

-|   |   |-- mozilla-thunderbird-3.0.4-x86_64-1.txt

-|   |   |-- mozilla-thunderbird-3.0.4-x86_64-1.txz

-|   |   |-- mozilla-thunderbird-3.0.4-x86_64-1.txz.asc

-|   |   |-- pan-0.133-x86_64-2.txt

-|   |   |-- pan-0.133-x86_64-2.txz

-|   |   |-- pan-0.133-x86_64-2.txz.asc

-|   |   |-- pidgin-2.7.0-x86_64-1.txt

-|   |   |-- pidgin-2.7.0-x86_64-1.txz

-|   |   |-- pidgin-2.7.0-x86_64-1.txz.asc

-|   |   |-- rdesktop-1.6.0-x86_64-1.txt

-|   |   |-- rdesktop-1.6.0-x86_64-1.txz

-|   |   |-- rdesktop-1.6.0-x86_64-1.txz.asc

+|   |   |-- mozilla-firefox-4.0-x86_64-2.txt

+|   |   |-- mozilla-firefox-4.0-x86_64-2.txz

+|   |   |-- mozilla-firefox-4.0-x86_64-2.txz.asc

+|   |   |-- mozilla-thunderbird-3.1.9-x86_64-2.txt

+|   |   |-- mozilla-thunderbird-3.1.9-x86_64-2.txz

+|   |   |-- mozilla-thunderbird-3.1.9-x86_64-2.txz.asc

+|   |   |-- pan-0.134-x86_64-1.txt

+|   |   |-- pan-0.134-x86_64-1.txz

+|   |   |-- pan-0.134-x86_64-1.txz.asc

+|   |   |-- pidgin-2.7.11-x86_64-1.txt

+|   |   |-- pidgin-2.7.11-x86_64-1.txz

+|   |   |-- pidgin-2.7.11-x86_64-1.txz.asc

+|   |   |-- rdesktop-1.6.0-x86_64-2.txt

+|   |   |-- rdesktop-1.6.0-x86_64-2.txz

+|   |   |-- rdesktop-1.6.0-x86_64-2.txz.asc

 |   |   |-- rxvt-2.7.10-x86_64-4.txt

 |   |   |-- rxvt-2.7.10-x86_64-4.txz

 |   |   |-- rxvt-2.7.10-x86_64-4.txz.asc

-|   |   |-- sane-1.0.21-x86_64-1.txt

-|   |   |-- sane-1.0.21-x86_64-1.txz

-|   |   |-- sane-1.0.21-x86_64-1.txz.asc

-|   |   |-- seamonkey-2.0.4-x86_64-1.txt

-|   |   |-- seamonkey-2.0.4-x86_64-1.txz

-|   |   |-- seamonkey-2.0.4-x86_64-1.txz.asc

+|   |   |-- sane-1.0.22-x86_64-2.txt

+|   |   |-- sane-1.0.22-x86_64-2.txz

+|   |   |-- sane-1.0.22-x86_64-2.txz.asc

+|   |   |-- seamonkey-2.1b3-x86_64-2.txt

+|   |   |-- seamonkey-2.1b3-x86_64-2.txz

+|   |   |-- seamonkey-2.1b3-x86_64-2.txz.asc

 |   |   |-- seyon-2.20c-x86_64-3.txt

 |   |   |-- seyon-2.20c-x86_64-3.txz

 |   |   |-- seyon-2.20c-x86_64-3.txz.asc

@@ -3701,66 +3761,69 @@ see additional documentation files.
 |   |   |-- thunar-volman-0.3.80-x86_64-1.txt

 |   |   |-- thunar-volman-0.3.80-x86_64-1.txz

 |   |   |-- thunar-volman-0.3.80-x86_64-1.txz.asc

-|   |   |-- vim-gvim-7.2.416-x86_64-1.txt

-|   |   |-- vim-gvim-7.2.416-x86_64-1.txz

-|   |   |-- vim-gvim-7.2.416-x86_64-1.txz.asc

-|   |   |-- windowmaker-20060427cvs-x86_64-3.txt

-|   |   |-- windowmaker-20060427cvs-x86_64-3.txz

-|   |   |-- windowmaker-20060427cvs-x86_64-3.txz.asc

-|   |   |-- x11-ssh-askpass-1.2.4.1-x86_64-1.txt

-|   |   |-- x11-ssh-askpass-1.2.4.1-x86_64-1.txz

-|   |   |-- x11-ssh-askpass-1.2.4.1-x86_64-1.txz.asc

+|   |   |-- vim-gvim-7.3.154-x86_64-1.txt

+|   |   |-- vim-gvim-7.3.154-x86_64-1.txz

+|   |   |-- vim-gvim-7.3.154-x86_64-1.txz.asc

+|   |   |-- windowmaker-20060427cvs-x86_64-4.txt

+|   |   |-- windowmaker-20060427cvs-x86_64-4.txz

+|   |   |-- windowmaker-20060427cvs-x86_64-4.txz.asc

+|   |   |-- x11-ssh-askpass-1.2.4.1-x86_64-2.txt

+|   |   |-- x11-ssh-askpass-1.2.4.1-x86_64-2.txz

+|   |   |-- x11-ssh-askpass-1.2.4.1-x86_64-2.txz.asc

 |   |   |-- x3270-3.3.7p8-x86_64-1.txt

 |   |   |-- x3270-3.3.7p8-x86_64-1.txz

 |   |   |-- x3270-3.3.7p8-x86_64-1.txz.asc

-|   |   |-- xchat-2.8.6-x86_64-5.txt

-|   |   |-- xchat-2.8.6-x86_64-5.txz

-|   |   |-- xchat-2.8.6-x86_64-5.txz.asc

-|   |   |-- xfce-4.6.1-x86_64-8.txt

-|   |   |-- xfce-4.6.1-x86_64-8.txz

-|   |   |-- xfce-4.6.1-x86_64-8.txz.asc

-|   |   |-- xfce4-notifyd-0.1.0-x86_64-1.txt

-|   |   |-- xfce4-notifyd-0.1.0-x86_64-1.txz

-|   |   |-- xfce4-notifyd-0.1.0-x86_64-1.txz.asc

+|   |   |-- xaos-3.5-x86_64-1.txt

+|   |   |-- xaos-3.5-x86_64-1.txz

+|   |   |-- xaos-3.5-x86_64-1.txz.asc

+|   |   |-- xchat-2.8.8-x86_64-3.txt

+|   |   |-- xchat-2.8.8-x86_64-3.txz

+|   |   |-- xchat-2.8.8-x86_64-3.txz.asc

+|   |   |-- xfce-4.6.2-x86_64-5.txt

+|   |   |-- xfce-4.6.2-x86_64-5.txz

+|   |   |-- xfce-4.6.2-x86_64-5.txz.asc

+|   |   |-- xfce4-notifyd-0.1.1-x86_64-1.txt

+|   |   |-- xfce4-notifyd-0.1.1-x86_64-1.txz

+|   |   |-- xfce4-notifyd-0.1.1-x86_64-1.txz.asc

 |   |   |-- xfce4-power-manager-0.8.5-x86_64-1.txt

 |   |   |-- xfce4-power-manager-0.8.5-x86_64-1.txz

 |   |   |-- xfce4-power-manager-0.8.5-x86_64-1.txz.asc

 |   |   |-- xfractint-20.04p09-x86_64-1.txt

 |   |   |-- xfractint-20.04p09-x86_64-1.txz

 |   |   |-- xfractint-20.04p09-x86_64-1.txz.asc

-|   |   |-- xgames-0.3-x86_64-2.txt

-|   |   |-- xgames-0.3-x86_64-2.txz

-|   |   |-- xgames-0.3-x86_64-2.txz.asc

-|   |   |-- xine-lib-1.1.17-x86_64-1.txt

-|   |   |-- xine-lib-1.1.17-x86_64-1.txz

-|   |   |-- xine-lib-1.1.17-x86_64-1.txz.asc

+|   |   |-- xgames-0.3-x86_64-4.txt

+|   |   |-- xgames-0.3-x86_64-4.txz

+|   |   |-- xgames-0.3-x86_64-4.txz.asc

+|   |   |-- xine-lib-1.1.19-x86_64-1.txt

+|   |   |-- xine-lib-1.1.19-x86_64-1.txz

+|   |   |-- xine-lib-1.1.19-x86_64-1.txz.asc

 |   |   |-- xine-ui-0.99.5-x86_64-3.txt

 |   |   |-- xine-ui-0.99.5-x86_64-3.txz

 |   |   |-- xine-ui-0.99.5-x86_64-3.txz.asc

-|   |   |-- xlockmore-5.28-x86_64-1.txt

-|   |   |-- xlockmore-5.28-x86_64-1.txz

-|   |   |-- xlockmore-5.28-x86_64-1.txz.asc

+|   |   |-- xlockmore-5.32-x86_64-1.txt

+|   |   |-- xlockmore-5.32-x86_64-1.txz

+|   |   |-- xlockmore-5.32-x86_64-1.txz.asc

 |   |   |-- xmms-1.2.11-x86_64-4.txt

 |   |   |-- xmms-1.2.11-x86_64-4.txz

 |   |   |-- xmms-1.2.11-x86_64-4.txz.asc

 |   |   |-- xpaint-2.8.16-x86_64-1.txt

 |   |   |-- xpaint-2.8.16-x86_64-1.txz

 |   |   |-- xpaint-2.8.16-x86_64-1.txz.asc

-|   |   |-- xpdf-3.02pl4-x86_64-2.txt

-|   |   |-- xpdf-3.02pl4-x86_64-2.txz

-|   |   |-- xpdf-3.02pl4-x86_64-2.txz.asc

-|   |   |-- xsane-0.996-x86_64-2.txt

-|   |   |-- xsane-0.996-x86_64-2.txz

-|   |   |-- xsane-0.996-x86_64-2.txz.asc

-|   |   |-- xscreensaver-5.11-x86_64-1.txt

-|   |   |-- xscreensaver-5.11-x86_64-1.txz

-|   |   |-- xscreensaver-5.11-x86_64-1.txz.asc

+|   |   |-- xpdf-3.02pl6-x86_64-3.txt

+|   |   |-- xpdf-3.02pl6-x86_64-3.txz

+|   |   |-- xpdf-3.02pl6-x86_64-3.txz.asc

+|   |   |-- xsane-0.998-x86_64-1.txt

+|   |   |-- xsane-0.998-x86_64-1.txz

+|   |   |-- xsane-0.998-x86_64-1.txz.asc

+|   |   |-- xscreensaver-5.12-x86_64-1.txt

+|   |   |-- xscreensaver-5.12-x86_64-1.txz

+|   |   |-- xscreensaver-5.12-x86_64-1.txz.asc

 |   |   |-- xv-3.10a-x86_64-6.txt

 |   |   |-- xv-3.10a-x86_64-6.txz

 |   |   |-- xv-3.10a-x86_64-6.txz.asc

-|   |   |-- xxgdb-1.12-x86_64-2.txt

-|   |   |-- xxgdb-1.12-x86_64-2.txz

-|   |   `-- xxgdb-1.12-x86_64-2.txz.asc

+|   |   |-- xxgdb-1.12-x86_64-3.txt

+|   |   |-- xxgdb-1.12-x86_64-3.txz

+|   |   `-- xxgdb-1.12-x86_64-3.txz.asc

 |   `-- y

 |       |-- bsd-games-2.13-x86_64-11.txt

 |       |-- bsd-games-2.13-x86_64-11.txz

@@ -3790,13 +3853,13 @@ see additional documentation files.
 |   |   |   |-- aaa_terminfo.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- acl

+|   |   |   |-- acl-2.2.50.src.tar.gz

 |   |   |   |-- acl.SlackBuild

 |   |   |   |-- acl.destdir.diff.gz

-|   |   |   |-- acl_2.2.47-1.tar.gz

 |   |   |   `-- slack-desc

 |   |   |-- acpid

 |   |   |   |-- acpi_handler.sh.gz

-|   |   |   |-- acpid-2.0.5.tar.gz

+|   |   |   |-- acpid-2.0.9.tar.gz

 |   |   |   |-- acpid.SlackBuild

 |   |   |   |-- default.gz

 |   |   |   |-- doinst.sh.gz

@@ -3807,9 +3870,10 @@ see additional documentation files.
 |   |   |   |-- apmd.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- attr

+|   |   |   |-- attr-2.4.45.src.tar.gz

+|   |   |   |-- attr-2.4.45.src.tar.gz.sig

 |   |   |   |-- attr.SlackBuild

 |   |   |   |-- attr.destdir.diff.gz

-|   |   |   |-- attr_2.4.43-1.tar.gz

 |   |   |   |-- build

 |   |   |   `-- slack-desc

 |   |   |-- bash

@@ -3827,7 +3891,13 @@ see additional documentation files.
 |   |   |   |   |-- bash41-006

 |   |   |   |   |-- bash41-006.sig

 |   |   |   |   |-- bash41-007

-|   |   |   |   `-- bash41-007.sig

+|   |   |   |   |-- bash41-007.sig

+|   |   |   |   |-- bash41-008

+|   |   |   |   |-- bash41-008.sig

+|   |   |   |   |-- bash41-009

+|   |   |   |   |-- bash41-009.sig

+|   |   |   |   |-- bash41-010

+|   |   |   |   `-- bash41-010.sig

 |   |   |   |-- bash-4.1.tar.xz

 |   |   |   |-- bash.SlackBuild

 |   |   |   |-- doinst.sh.gz

@@ -3843,15 +3913,20 @@ see additional documentation files.
 |   |   |   |   `-- xx.gz

 |   |   |   |-- slack-desc

 |   |   |   `-- todos.tar.gz

+|   |   |-- btrfs-progs

+|   |   |   |-- btrfs-progs-20110327.tar.xz

+|   |   |   |-- btrfs-progs.SlackBuild

+|   |   |   |-- fsck.btrfs

+|   |   |   `-- slack-desc

 |   |   |-- bzip2

-|   |   |   |-- bzip2-1.0.4.saneso.diff.gz

-|   |   |   |-- bzip2-1.0.5.tar.gz

+|   |   |   |-- bzip2-1.0.6.tar.gz

 |   |   |   |-- bzip2.SlackBuild

+|   |   |   |-- bzip2.saneso.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- coreutils

 |   |   |   |-- DIR_COLORS.gz

-|   |   |   |-- coreutils-8.5.tar.xz

-|   |   |   |-- coreutils-8.5.tar.xz.sig

+|   |   |   |-- coreutils-8.11.tar.xz

+|   |   |   |-- coreutils-8.11.tar.xz.sig

 |   |   |   |-- coreutils-dircolors.csh.gz

 |   |   |   |-- coreutils-dircolors.sh.gz

 |   |   |   |-- coreutils.SlackBuild

@@ -3859,40 +3934,36 @@ see additional documentation files.
 |   |   |   |-- doinst.sh.gz

 |   |   |   `-- slack-desc

 |   |   |-- cpio

-|   |   |   |-- cpio-2.9.gcc43.diff.gz

-|   |   |   |-- cpio-2.9.tar.bz2

+|   |   |   |-- cpio-2.11.tar.xz

 |   |   |   |-- cpio.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- cpufrequtils

-|   |   |   |-- cpufrequtils-007.tar.bz2

-|   |   |   |-- cpufrequtils-007.tar.bz2.sign

+|   |   |   |-- cpufrequtils-008.tar.bz2

+|   |   |   |-- cpufrequtils-008.tar.bz2.sign

 |   |   |   |-- cpufrequtils.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- cryptsetup

-|   |   |   |-- cryptsetup-1.1.0.tar.bz2

-|   |   |   |-- cryptsetup-1.1.0.tar.bz2.asc

+|   |   |   |-- cryptsetup-1.2.0.tar.bz2

+|   |   |   |-- cryptsetup-1.2.0.tar.bz2.asc

 |   |   |   |-- cryptsetup.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- cups

-|   |   |   |-- cups-1.4.3-source.tar.bz2

+|   |   |   |-- cups-1.4.6-source.tar.bz2

 |   |   |   |-- cups-samba-5.0rc3.tar.gz

 |   |   |   |-- cups-windows-6.0-source.tar.bz2

 |   |   |   |-- cups.SlackBuild

+|   |   |   |-- cups.fix_broken_locking.diff.gz

 |   |   |   |-- doinst.sh.gz

 |   |   |   |-- slack-desc

 |   |   |   `-- usb-backend-both-usblp-and-libusb.dpatch.gz

 |   |   |-- cxxlibs

 |   |   |   |-- cxxlibs.SlackBuild

-|   |   |   |-- oldgcc

-|   |   |   |   |-- gcc-3.3.6.tar.bz2

-|   |   |   |   |-- gcc-3.3.6.tar.bz2.sig

-|   |   |   |   `-- oldgcc.build

 |   |   |   |-- slack-desc

 |   |   |   |-- symlinks-to-tracked-libs

 |   |   |   `-- symlinks-to-tracked-libs64

 |   |   |-- dbus

-|   |   |   |-- dbus-1.2.24.tar.xz

-|   |   |   |-- dbus-1.2.x-allow_root_globally.diff.gz

+|   |   |   |-- dbus-1.4.1.tar.xz

+|   |   |   |-- dbus-1.4.x-allow_root_globally.diff.gz

 |   |   |   |-- dbus.SlackBuild

 |   |   |   |-- doinst.sh.gz

 |   |   |   |-- rc.messagebus.gz

@@ -3918,21 +3989,23 @@ see additional documentation files.
 |   |   |   |-- makedev_2.3.1.slack.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- dialog

-|   |   |   |-- dialog-1.1-20080819.tar.bz2

+|   |   |   |-- dialog-1.1-20100428.tar.xz

 |   |   |   |-- dialog.SlackBuild

 |   |   |   |-- dialog.smaller.min.height.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- dosfstools

-|   |   |   |-- dosfstools-2.11.src.tar.gz

+|   |   |   |-- dosfstools-3.0.11.tar.bz2

+|   |   |   |-- dosfstools-3.0.11.tar.bz2.sign

 |   |   |   |-- dosfstools.SlackBuild

+|   |   |   |-- dosfstools.paths.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- e2fsprogs

 |   |   |   |-- doinst.sh.gz

-|   |   |   |-- e2fsprogs-1.41.11.tar.xz

+|   |   |   |-- e2fsprogs-1.41.14.tar.xz

 |   |   |   |-- e2fsprogs.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- ed

-|   |   |   |-- ed-1.3.tar.bz2

+|   |   |   |-- ed-1.4.tar.xz

 |   |   |   |-- ed.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- eject

@@ -3954,7 +4027,7 @@ see additional documentation files.
 |   |   |   |-- slack-desc

 |   |   |   `-- termcap-BSD.gz

 |   |   |-- file

-|   |   |   |-- file-5.04.tar.xz

+|   |   |   |-- file-5.05.tar.xz

 |   |   |   |-- file.SlackBuild

 |   |   |   |-- file.crdaregbin.magic.gz

 |   |   |   |-- file.etc.file.diff.gz

@@ -3982,6 +4055,10 @@ see additional documentation files.
 |   |   |   |-- gawk-3.1.8.tar.xz

 |   |   |   |-- gawk.SlackBuild

 |   |   |   `-- slack-desc

+|   |   |-- gdisk

+|   |   |   |-- gdisk-0.6.14.tar.xz

+|   |   |   |-- gdisk.SlackBuild

+|   |   |   `-- slack-desc

 |   |   |-- genpower

 |   |   |   |-- genpower-1.0.5.tar.gz

 |   |   |   |-- genpower.SlackBuild

@@ -3989,7 +4066,7 @@ see additional documentation files.
 |   |   |   |-- genpower.var.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- gettext

-|   |   |   |-- gettext-0.17.tar.bz2

+|   |   |   |-- gettext-0.18.1.1.tar.bz2

 |   |   |   |-- gettext-tools.SlackBuild

 |   |   |   |-- gettext.SlackBuild

 |   |   |   |-- slack-desc

@@ -4023,7 +4100,8 @@ see additional documentation files.
 |   |   |   |-- setup.mouse.gz

 |   |   |   `-- slack-desc

 |   |   |-- grep

-|   |   |   |-- grep-2.5.4.tar.bz2

+|   |   |   |-- grep-2.7.tar.xz

+|   |   |   |-- grep-2.7.tar.xz.sig

 |   |   |   |-- grep.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- gzip

@@ -4032,7 +4110,7 @@ see additional documentation files.
 |   |   |   |-- gzip.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- hdparm

-|   |   |   |-- hdparm-9.27.tar.bz2

+|   |   |   |-- hdparm-9.37.tar.gz

 |   |   |   |-- hdparm.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- infozip

@@ -4045,7 +4123,7 @@ see additional documentation files.
 |   |   |   |-- inotify-tools.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- jfsutils

-|   |   |   |-- jfsutils-1.1.14.tar.bz2

+|   |   |   |-- jfsutils-1.1.15.tar.xz

 |   |   |   |-- jfsutils.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- kbd

@@ -4068,7 +4146,7 @@ see additional documentation files.
 |   |   |       |-- speakup-jfw.tar.gz

 |   |   |       `-- speakupmap.map.gz

 |   |   |-- less

-|   |   |   |-- less-436.tar.bz2

+|   |   |   |-- less-443.tar.xz

 |   |   |   |-- less.SlackBuild

 |   |   |   |-- less.sysconfdir.diff.gz

 |   |   |   |-- lesspipe.sh.gz

@@ -4078,6 +4156,13 @@ see additional documentation files.
 |   |   |   |-- lha.SlackBuild

 |   |   |   |-- lha_1.14i-10.1.diff.gz

 |   |   |   `-- slack-desc

+|   |   |-- libcgroup

+|   |   |   |-- doinst.sh.gz

+|   |   |   |-- libcgroup-0.37.1.tar.xz

+|   |   |   |-- libcgroup.SlackBuild

+|   |   |   |-- libcgroup.conf.diff.gz

+|   |   |   |-- libcgroup.init.diff.gz

+|   |   |   `-- slack-desc

 |   |   |-- lilo

 |   |   |   |-- lilo-22.8.src.tar.gz

 |   |   |   |-- lilo-22.8.src.tar.gz.sig

@@ -4085,6 +4170,7 @@ see additional documentation files.
 |   |   |   |-- lilo.use_major_minor_instead_lvm_name.diff.gz

 |   |   |   |-- liloconfig

 |   |   |   |-- setup.liloconfig

+|   |   |   |-- sl1337.bmp

 |   |   |   |-- slack-desc

 |   |   |   |-- slack.bmp

 |   |   |   |-- slack.dat

@@ -4098,35 +4184,47 @@ see additional documentation files.
 |   |   |   |-- logrotate.cron.gz

 |   |   |   |-- logrotate.slackware.diff.gz

 |   |   |   `-- slack-desc

+|   |   |-- lrzip

+|   |   |   |-- doinst.sh.gz

+|   |   |   |-- lrzip-0.602.tar.xz

+|   |   |   |-- lrzip.SlackBuild

+|   |   |   `-- slack-desc

 |   |   |-- lvm2

-|   |   |   |-- LVM2.2.02.64.tar.xz

+|   |   |   |-- LVM2.2.02.84.tar.xz

+|   |   |   |-- build_with_udev_165_and_later.diff.gz

 |   |   |   |-- doinst.sh.gz

 |   |   |   |-- lvm2.SlackBuild

 |   |   |   `-- slack-desc

+|   |   |-- mcelog

+|   |   |   |-- doinst.sh.gz

+|   |   |   |-- mcelog-1.0pre3.tar.bz2

+|   |   |   |-- mcelog-1.0pre3.tar.bz2.sign

+|   |   |   |-- mcelog.SlackBuild

+|   |   |   |-- mcelog.init.diff.gz

+|   |   |   `-- slack-desc

 |   |   |-- mdadm

 |   |   |   |-- doinst.sh.gz

-|   |   |   |-- mdadm-2.6.9.tar.bz2

-|   |   |   |-- mdadm-2.6.9.tar.bz2.sign

+|   |   |   |-- mdadm-3.1.5.tar.bz2

+|   |   |   |-- mdadm-3.1.5.tar.bz2.sign

 |   |   |   |-- mdadm.SlackBuild

 |   |   |   |-- mdadm.static.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- minicom

 |   |   |   |-- config.sub-x86_64.diff.gz

 |   |   |   |-- doinst.sh.gz

-|   |   |   |-- lrzsz_0.12.21-4.diff.gz

+|   |   |   |-- lrzsz_0.12.21-5.diff.gz

 |   |   |   |-- lrzsz_0.12.21.orig.tar.gz

-|   |   |   |-- minicom-2.1.tar.gz

-|   |   |   |-- minicom-2.1.tar.gz.asc

+|   |   |   |-- minicom-2.5.tar.gz

 |   |   |   |-- minicom.SlackBuild

 |   |   |   |-- minicom.users.gz

-|   |   |   |-- minirc.dfl.gz

-|   |   |   |-- slack-desc

-|   |   |   `-- wintcap.diff.gz

+|   |   |   `-- slack-desc

 |   |   |-- mkinitrd

 |   |   |   |-- README.initrd

 |   |   |   |-- _initrd-tree.tar.gz

-|   |   |   |-- busybox-1.15.3.tar.bz2

+|   |   |   |-- busybox-1.18.4.tar.xz

 |   |   |   |-- busybox-dot-config

+|   |   |   |-- busybox-dot-config.1.15.x

+|   |   |   |-- busybox-dot-config.1.17.x

 |   |   |   |-- init

 |   |   |   |-- keymaps.tar.gz

 |   |   |   |-- mkinitrd

@@ -4137,9 +4235,9 @@ see additional documentation files.
 |   |   |   |-- mkinitrd_command_generator.sh

 |   |   |   `-- slack-desc

 |   |   |-- module-init-tools

+|   |   |   |-- doinst.sh.gz

 |   |   |   |-- modprobe.ignore_some_suffixes.diff.gz

-|   |   |   |-- modprobe.quit.whining.about.modprobe.conf.diff.gz

-|   |   |   |-- module-init-tools-3.11.1.tar.bz2

+|   |   |   |-- module-init-tools-3.12.tar.bz2

 |   |   |   |-- module-init-tools.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- mt-st

@@ -4151,31 +4249,25 @@ see additional documentation files.
 |   |   |   |-- mt-st.sdlt.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- mtx

-|   |   |   |-- mtx-1.3.9.tar.gz

+|   |   |   |-- mtx-1.3.12.tar.gz

 |   |   |   |-- mtx.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- ncompress

-|   |   |   |-- ncompress-4.2.4-bssUnderflow.patch.gz

-|   |   |   |-- ncompress-4.2.4-endians.patch.gz

-|   |   |   |-- ncompress-4.2.4.tar.gz

-|   |   |   |-- ncompress.2GB.diff.gz

+|   |   |   |-- ncompress-4.2.4.3.tar.gz

 |   |   |   |-- ncompress.SlackBuild

-|   |   |   |-- ncompress.filenamelen.diff.gz

-|   |   |   |-- ncompress.lfs2.diff.gz

-|   |   |   |-- ncompress.make.diff.gz

-|   |   |   |-- ncompress.zerobyteforce.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- ntfs-3g

 |   |   |   |-- 10-ntfs-3g-policy.fdi

-|   |   |   |-- ntfs-3g-2010.3.6.tar.xz

+|   |   |   |-- ntfs-3g-2011.1.15.tar.xz

 |   |   |   |-- ntfs-3g.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- patch

-|   |   |   |-- patch-2.5.4.tar.gz

+|   |   |   |-- patch-2.6.1.tar.xz

+|   |   |   |-- patch-2.6.1.tar.xz.sig

 |   |   |   |-- patch.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- pciutils

-|   |   |   |-- pciutils-3.1.5.tar.bz2

+|   |   |   |-- pciutils-3.1.7.tar.xz

 |   |   |   |-- pciutils.SlackBuild

 |   |   |   |-- pciutils.ids.dest.diff.gz

 |   |   |   |-- pciutils.url

@@ -4187,7 +4279,8 @@ see additional documentation files.
 |   |   |   |   |-- config.opts

 |   |   |   |   `-- rc.pcmcia

 |   |   |   |-- doinst.sh.gz

-|   |   |   |-- pcmciautils-015.tar.bz2

+|   |   |   |-- pcmciautils-017.tar.bz2

+|   |   |   |-- pcmciautils-017.tar.sign

 |   |   |   |-- pcmciautils.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- pkgtools

@@ -4220,12 +4313,15 @@ see additional documentation files.
 |   |   |   |-- procinfo-18.tar.gz

 |   |   |   |-- procinfo.gcc3.diff.gz

 |   |   |   |-- procinfo.lsm

+|   |   |   |-- procps-3.2.7-ps-cgroup.patch.gz

 |   |   |   |-- procps-3.2.7-ps-eip64.diff.gz

-|   |   |   |-- procps-3.2.7.tar.gz

+|   |   |   |-- procps-3.2.8-ps-cgroup-suppress-root-group.patch.gz

+|   |   |   |-- procps-3.2.8.tar.xz

+|   |   |   |-- procps-3.2.8.unknown.hz.value.diff.gz

 |   |   |   |-- procps.SlackBuild

 |   |   |   |-- procps.nowarning.diff.gz

 |   |   |   |-- procps.w.showfrom.diff.gz

-|   |   |   |-- psmisc-22.3.tar.gz

+|   |   |   |-- psmisc-22.13.tar.xz

 |   |   |   `-- slack-desc

 |   |   |-- quota

 |   |   |   |-- quota-3.17.tar.xz

@@ -4243,14 +4339,17 @@ see additional documentation files.
 |   |   |   |   |-- 0003-allow-every-user-to-use-rpm2tgz.patch.gz

 |   |   |   |   |-- 0004-produce-more-compliant-slack-desc.patch.gz

 |   |   |   |   |-- 0005-gzip-man-info-pages.patch.gz

-|   |   |   |   `-- 0006-should-we-use-.txz-format-in-slackware-current.patch.gz

+|   |   |   |   |-- 0006-should-we-use-.txz-format-in-slackware-current.patch.gz

+|   |   |   |   |-- 0007-Add-support-for-.txz-packages-and-rpm2txz-symlink.patch.gz

+|   |   |   |   |-- 0008-Avoid-none-values-in-slack-desc.patch.gz

+|   |   |   |   `-- 0009-Add-c-option-just-as-makepkg-c-y.patch.gz

 |   |   |   |-- rpm2targz

 |   |   |   |-- rpm2targz.README

 |   |   |   |-- rpm2tgz.SlackBuild

 |   |   |   |-- rpmoffset.c

 |   |   |   `-- slack-desc

 |   |   |-- sdparm

-|   |   |   |-- sdparm-1.04.tar.bz2

+|   |   |   |-- sdparm-1.06.tar.xz

 |   |   |   |-- sdparm.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- sed

@@ -4261,13 +4360,23 @@ see additional documentation files.
 |   |   |   |-- adduser

 |   |   |   |-- doinst.sh.gz

 |   |   |   |-- login.defs.gz

-|   |   |   |-- shadow-4.1.4.2.tar.xz

+|   |   |   |-- patches

+|   |   |   |   |-- README_PATCHES

+|   |   |   |   |-- r3054.diff.gz

+|   |   |   |   |-- r3055.diff.gz

+|   |   |   |   |-- r3060.diff.gz

+|   |   |   |   |-- r3062.diff.gz

+|   |   |   |   |-- r3096.diff.gz

+|   |   |   |   |-- r3160.diff.gz

+|   |   |   |   |-- r3194.diff.gz

+|   |   |   |   `-- r3299.diff.gz

+|   |   |   |-- shadow-4.1.4.3.tar.xz

 |   |   |   |-- shadow.SlackBuild

+|   |   |   |-- shadow.url

 |   |   |   |-- slack-desc

 |   |   |   `-- useradd.gz

 |   |   |-- sharutils

-|   |   |   |-- sharutils-4.7.tar.bz2

-|   |   |   |-- sharutils-4.7.tar.bz2.sig

+|   |   |   |-- sharutils-4.11.tar.xz

 |   |   |   |-- sharutils.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- slocate

@@ -4279,7 +4388,7 @@ see additional documentation files.
 |   |   |-- smartmontools

 |   |   |   |-- doinst.sh.gz

 |   |   |   |-- slack-desc

-|   |   |   |-- smartmontools-5.39.1.tar.xz

+|   |   |   |-- smartmontools-5.40.tar.xz

 |   |   |   `-- smartmontools.SlackBuild

 |   |   |-- splitvt

 |   |   |   |-- slack-desc

@@ -4291,13 +4400,15 @@ see additional documentation files.
 |   |   |   |-- sysfsutils-2.1.0.tar.bz2

 |   |   |   `-- sysfsutils.SlackBuild

 |   |   |-- sysklogd

-|   |   |   |-- _sysklogd.tar.gz

+|   |   |   |-- config

+|   |   |   |   |-- rc.syslog.new

+|   |   |   |   |-- syslog.conf.new

+|   |   |   |   `-- syslog.logrotate

+|   |   |   |-- doinst.sh.gz

 |   |   |   |-- slack-desc

-|   |   |   |-- sysklogd-1.4.1-owl-syslogd-crunch_list.diff.gz

-|   |   |   |-- sysklogd-1.4.1.lsm

-|   |   |   |-- sysklogd-1.4.1.tar.gz

+|   |   |   |-- sysklogd-1.5.tar.gz

 |   |   |   |-- sysklogd.SlackBuild

-|   |   |   `-- sysklogd_1.4.1-20.diff.gz

+|   |   |   `-- use_memmove_not_strcpy.diff.gz

 |   |   |-- syslinux

 |   |   |   |-- slack-desc

 |   |   |   |-- syslinux-3.84.tar.bz2

@@ -4329,6 +4440,7 @@ see additional documentation files.
 |   |   |   |   |-- rc.M

 |   |   |   |   |-- rc.S

 |   |   |   |   |-- rc.local

+|   |   |   |   |-- rc.loop

 |   |   |   |   |-- rc.sysvinit

 |   |   |   |   `-- rescan-scsi-bus.sh

 |   |   |   |-- slack-desc

@@ -4338,8 +4450,9 @@ see additional documentation files.
 |   |   |   |-- slack-desc

 |   |   |   |-- tar-1.13.bzip2.diff.gz

 |   |   |   |-- tar-1.13.tar.gz

-|   |   |   |-- tar-1.23-support_txz.diff.gz

-|   |   |   |-- tar-1.23.tar.xz

+|   |   |   |-- tar-1.26.tar.xz

+|   |   |   |-- tar-1.26.tar.xz.sig

+|   |   |   |-- tar-1.2x.support_txz.diff.gz

 |   |   |   |-- tar.1.gz

 |   |   |   |-- tar.SlackBuild

 |   |   |   |-- tar.nolonezero.diff.gz

@@ -4347,7 +4460,7 @@ see additional documentation files.
 |   |   |-- tcsh

 |   |   |   |-- doinst.sh.gz

 |   |   |   |-- slack-desc

-|   |   |   |-- tcsh-6.15.00.tar.bz2

+|   |   |   |-- tcsh-6.17.00.tar.xz

 |   |   |   |-- tcsh.SlackBuild

 |   |   |   `-- tcsh.nobuiltincolorls.diff.gz

 |   |   |-- time

@@ -4356,7 +4469,7 @@ see additional documentation files.
 |   |   |   `-- time.SlackBuild

 |   |   |-- tree

 |   |   |   |-- slack-desc

-|   |   |   |-- tree-1.5.2.2.tar.bz2

+|   |   |   |-- tree-1.5.3.tar.bz2

 |   |   |   `-- tree.SlackBuild

 |   |   |-- udev

 |   |   |   |-- config

@@ -4378,33 +4491,35 @@ see additional documentation files.
 |   |   |   |-- doinst.sh.gz

 |   |   |   |-- rule_generator.diff.gz

 |   |   |   |-- slack-desc

-|   |   |   |-- udev-153.tar.sign

-|   |   |   |-- udev-153.tar.xz

+|   |   |   |-- udev-165.tar.xz

 |   |   |   |-- udev-fixed-devices.tar.gz

-|   |   |   `-- udev.SlackBuild

+|   |   |   |-- udev.SlackBuild

+|   |   |   `-- udev.git-560de575148b7efda3b34a7f7073abd483c5f08e.patch.gz

 |   |   |-- unarj

 |   |   |   |-- Makefile.gz

 |   |   |   |-- slack-desc

 |   |   |   |-- unarj.SlackBuild

 |   |   |   `-- unarj265.tar.gz

 |   |   |-- usb_modeswitch

+|   |   |   |-- device_reference.txt.gz

 |   |   |   |-- doinst.sh.gz

 |   |   |   |-- slack-desc

-|   |   |   |-- usb-modeswitch-1.1.2.tar.bz2

-|   |   |   |-- usb-modeswitch-data-20100418.tar.bz2

+|   |   |   |-- usb-modeswitch-1.1.6.tar.bz2

+|   |   |   |-- usb-modeswitch-data-20101222.tar.bz2

 |   |   |   `-- usb_modeswitch.SlackBuild

 |   |   |-- usbutils

 |   |   |   |-- slack-desc

-|   |   |   |-- usbutils-0.87.tar.bz2

+|   |   |   |-- usbutils-002.tar.bz2

+|   |   |   |-- usbutils-002.tar.bz2.sign

 |   |   |   |-- usbutils.SlackBuild

 |   |   |   `-- usbutils.ids.dest.gz

 |   |   |-- utempter

 |   |   |   |-- doinst.sh.gz

-|   |   |   |-- libutempter-1.1.4.tar.bz2

-|   |   |   |-- libutempter-1.1.4.tar.bz2.asc

+|   |   |   |-- libutempter-1.1.5.tar.bz2

+|   |   |   |-- libutempter-1.1.5.tar.bz2.asc

 |   |   |   |-- slack-desc

 |   |   |   `-- utempter.SlackBuild

-|   |   |-- util-linux-ng

+|   |   |-- util-linux

 |   |   |   |-- adjtimex_1.23-1.diff.gz

 |   |   |   |-- adjtimex_1.23.orig.tar.gz

 |   |   |   |-- bsdstrings.tar.gz

@@ -4417,9 +4532,9 @@ see additional documentation files.
 |   |   |   |-- setserial-rc.serial.diff.gz

 |   |   |   |-- setserial-undef_TIOCGHAYESESP.diff.gz

 |   |   |   |-- slack-desc

-|   |   |   |-- util-linux-ng-2.17.2.tar.xz

-|   |   |   |-- util-linux-ng.SlackBuild

-|   |   |   |-- util-linux-ng.fdisk-no-solaris.diff.gz

+|   |   |   |-- util-linux-2.19.tar.xz

+|   |   |   |-- util-linux.SlackBuild

+|   |   |   |-- util-linux.fdisk-no-solaris.diff.gz

 |   |   |   |-- ziptool-1.4.0.tar.xz

 |   |   |   `-- ziptool-fix_build.patch.gz

 |   |   |-- which

@@ -4429,17 +4544,18 @@ see additional documentation files.
 |   |   |   `-- which.SlackBuild

 |   |   |-- xfsprogs

 |   |   |   |-- slack-desc

-|   |   |   |-- xfsprogs-3.1.1.tar.xz

+|   |   |   |-- xfsprogs-3.1.4.tar.xz

 |   |   |   `-- xfsprogs.SlackBuild

 |   |   |-- xz

 |   |   |   |-- slack-desc

-|   |   |   |-- xz-4.999.9beta.tar.bz2

+|   |   |   |-- xz-5.0.2.tar.bz2

+|   |   |   |-- xz-5.0.2.tar.bz2.sig

 |   |   |   `-- xz.SlackBuild

 |   |   `-- zoo

 |   |       |-- slack-desc

 |   |       |-- zoo-2.10.tar.gz

 |   |       |-- zoo.SlackBuild

-|   |       `-- zoo_2.10-18.diff.gz

+|   |       `-- zoo_2.10-22.debian.tar.gz

 |   |-- ap

 |   |   |-- a2ps

 |   |   |   |-- a2ps-4.14.tar.bz2

@@ -4451,15 +4567,15 @@ see additional documentation files.
 |   |   |   |-- psutils.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- acct

-|   |   |   |-- acct-6.4pre1-6.diff.gz

-|   |   |   |-- acct-6.4pre1.tar.bz2

+|   |   |   |-- acct-6.5.4.tar.xz

 |   |   |   |-- acct.SlackBuild

 |   |   |   |-- acct.logdir.fhs.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- alsa-utils

-|   |   |   |-- alsa-utils-1.0.23.tar.bz2

+|   |   |   |-- alsa-utils-1.0.24.2.tar.bz2

 |   |   |   |-- alsa-utils.SlackBuild

 |   |   |   |-- alsa-utils.alsaconf.diff.gz

+|   |   |   |-- doinst.sh.gz

 |   |   |   |-- rc.alsa.gz

 |   |   |   `-- slack-desc

 |   |   |-- amp

@@ -4496,14 +4612,13 @@ see additional documentation files.
 |   |   |   |   `-- ash-times.patch.gz

 |   |   |   `-- slack-desc

 |   |   |-- at

-|   |   |   |-- at-3.1.10.tar.bz2

+|   |   |   |-- at-3.1.12.tar.xz

 |   |   |   |-- at.SlackBuild

 |   |   |   |-- doinst.sh.gz

 |   |   |   `-- slack-desc

 |   |   |-- aumix

-|   |   |   |-- aumix-2.8.tar.bz2

+|   |   |   |-- aumix-2.9.1.tar.xz

 |   |   |   |-- aumix.SlackBuild

-|   |   |   |-- aumix.alsa.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- bc

 |   |   |   |-- bc-1.06.95.tar.bz2

@@ -4520,11 +4635,11 @@ see additional documentation files.
 |   |   |   |-- cdparanoia.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- cdrdao

-|   |   |   |-- cdrdao-1.2.1.tar.bz2

+|   |   |   |-- cdrdao-1.2.3.tar.xz

 |   |   |   |-- cdrdao.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- cdrtools

-|   |   |   |-- cdrtools-2.01.01a78.tar.bz2

+|   |   |   |-- cdrtools-3.01a02.tar.xz

 |   |   |   |-- cdrtools.SlackBuild

 |   |   |   |-- doinst.sh.gz

 |   |   |   |-- slack-desc

@@ -4534,8 +4649,12 @@ see additional documentation files.
 |   |   |   |-- dc3dd-6.12.3.tar.xz

 |   |   |   |-- dc3dd.SlackBuild

 |   |   |   `-- slack-desc

+|   |   |-- ddrescue

+|   |   |   |-- ddrescue-1.14.tar.xz

+|   |   |   |-- ddrescue.SlackBuild

+|   |   |   `-- slack-desc

 |   |   |-- diffstat

-|   |   |   |-- diffstat-1.43.tar.bz2

+|   |   |   |-- diffstat-1.53.tar.xz

 |   |   |   |-- diffstat.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- diffutils

@@ -4550,8 +4669,8 @@ see additional documentation files.
 |   |   |   |-- dmapi.destdir.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- dmidecode

-|   |   |   |-- dmidecode-2.10.tar.bz2

-|   |   |   |-- dmidecode-2.10.tar.bz2.sig

+|   |   |   |-- dmidecode-2.11.tar.bz2

+|   |   |   |-- dmidecode-2.11.tar.bz2.sig

 |   |   |   |-- dmidecode.SlackBuild

 |   |   |   |-- dmidecode.makefile.diff.gz

 |   |   |   `-- slack-desc

@@ -4562,24 +4681,25 @@ see additional documentation files.
 |   |   |   |-- dvd+rw-tools.url

 |   |   |   `-- slack-desc

 |   |   |-- enscript

-|   |   |   |-- enscript-1.6.3.tar.gz

+|   |   |   |-- enscript-1.6.5.2.tar.xz

 |   |   |   |-- enscript.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- flac

-|   |   |   |-- flac-1.2.1.tar.bz2

+|   |   |   |-- flac-1.2.1.tar.xz

 |   |   |   |-- flac.SlackBuild

+|   |   |   |-- flac.gcc45.diff.gz

 |   |   |   |-- flac.man.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- foomatic-filters

 |   |   |   |-- doinst.sh.gz

-|   |   |   |-- foomatic-filters-4.0.4.tar.gz

+|   |   |   |-- foomatic-filters-4.0.6.tar.gz

 |   |   |   |-- foomatic-filters.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- ghostscript

 |   |   |   |-- cidfmap.gz

-|   |   |   |-- ghostscript-8.71.tar.xz

-|   |   |   |-- ghostscript-pdf2dsc.patch.gz

+|   |   |   |-- ghostscript-9.00.tar.xz

 |   |   |   |-- ghostscript.SlackBuild

+|   |   |   |-- ghostscript.rev11948.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- ghostscript-fonts-std

 |   |   |   |-- doinst.sh.gz

@@ -4587,22 +4707,21 @@ see additional documentation files.
 |   |   |   |-- ghostscript-fonts-std.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- gphoto2

-|   |   |   |-- gphoto2-2.4.9.tar.xz

+|   |   |   |-- gphoto2-2.4.10.tar.xz

 |   |   |   |-- gphoto2.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- groff

-|   |   |   |-- groff-1.20.1.tar.bz2

+|   |   |   |-- groff-1.21.tar.xz

 |   |   |   |-- groff.SlackBuild

-|   |   |   |-- groff.docdir.diff.gz

 |   |   |   |-- groff.man.mdoc.local.gz

 |   |   |   `-- slack-desc

 |   |   |-- gutenprint

-|   |   |   |-- gutenprint-5.2.4.tar.xz

+|   |   |   |-- gutenprint-5.2.6.tar.xz

 |   |   |   |-- gutenprint.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- hplip

 |   |   |   |-- doinst.sh.gz

-|   |   |   |-- hplip-3.10.2.tar.xz

+|   |   |   |-- hplip-3.11.3a.tar.xz

 |   |   |   |-- hplip.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- ispell

@@ -4616,19 +4735,19 @@ see additional documentation files.
 |   |   |   |-- jed.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- joe

-|   |   |   |-- joe-3.5.tar.bz2

+|   |   |   |-- joe-3.7.tar.xz

 |   |   |   |-- joe.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- jove

 |   |   |   |-- jove.SlackBuild

 |   |   |   |-- jove.makefile.diff.gz

-|   |   |   |-- jove4.16.0.70.tar.gz

+|   |   |   |-- jove4.16.0.73.tar.xz

 |   |   |   `-- slack-desc

 |   |   |-- ksh93

 |   |   |   |-- CPL

-|   |   |   |-- INIT.2007-03-28.tgz

-|   |   |   |-- ast-ksh-locale.2007-03-28.tgz

-|   |   |   |-- ast-ksh.2007-03-28.tgz

+|   |   |   |-- INIT.2010-06-21.tgz

+|   |   |   |-- ast-ksh-locale.2010-02-02.tgz

+|   |   |   |-- ast-ksh.2010-06-21.tgz

 |   |   |   |-- ksh93.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- libx86

@@ -4646,24 +4765,25 @@ see additional documentation files.
 |   |   |   |-- postbuildfixes.sh

 |   |   |   |-- slack-desc

 |   |   |   |-- sources

-|   |   |   |   |-- asciidoc-8.5.2.tar.xz

-|   |   |   |   |-- docbook-dsssl-1.79.tar.bz2

-|   |   |   |   |-- docbook-dsssl-doc-1.79.tar.bz2

-|   |   |   |   |-- docbook-style-xsl-1.75.2-5.fc13.src.rpm

-|   |   |   |   |-- docbook-utils-0.6.14-23.fc13.src.rpm

+|   |   |   |   |-- asciidoc-8.6.2.tar.xz

+|   |   |   |   |-- asciidoc.asciidoc7compatible.revertbrokenchange.diff.xz

+|   |   |   |   |-- docbook-dsssl-1.79.tar.xz

+|   |   |   |   |-- docbook-dsssl-doc-1.79.tar.xz

+|   |   |   |   |-- docbook-style-xsl-1.75.2-6.fc14.src.rpm

+|   |   |   |   |-- docbook-utils-0.6.14-24.fc14.src.rpm

 |   |   |   |   |-- docbook-xml-4.5.zip

-|   |   |   |   |-- docbook_4.5.orig.tar.gz

-|   |   |   |   |-- gnome-doc-utils-0.19.1.tar.xz

-|   |   |   |   |-- gtk-doc-1.13.tar.bz2

-|   |   |   |   |-- gtkdoc-1.13-fixref.patch.bz2

-|   |   |   |   |-- libsgmls-perl_1.03ii-32.diff.gz

-|   |   |   |   |-- libsgmls-perl_1.03ii.orig.tar.gz

-|   |   |   |   |-- linuxdoc-tools-0.9.66-5.fc13.src.rpm

+|   |   |   |   |-- docbook_4.5.orig.tar.xz

+|   |   |   |   |-- gnome-doc-utils-0.20.4.tar.xz

+|   |   |   |   |-- gtk-doc-1.15.tar.xz

+|   |   |   |   |-- gtk-doc.patch.xz

+|   |   |   |   |-- libsgmls-perl_1.03ii-32.diff.xz

+|   |   |   |   |-- libsgmls-perl_1.03ii.orig.tar.xz

+|   |   |   |   |-- linuxdoc-tools-0.9.66-6.fc14.src.rpm

 |   |   |   |   |-- openjade-1.3.3-pre1.tar.xz

 |   |   |   |   |-- opensp-1.5.2-12.fc12.src.rpm

-|   |   |   |   |-- sgml-common-0.6.3-31.fc13.src.rpm

+|   |   |   |   |-- sgml-common-0.6.3-33.fc14.src.rpm

 |   |   |   |   |-- source.download

-|   |   |   |   `-- xmlto-0.0.23.tar.xz

+|   |   |   |   `-- xmlto-0.0.23-3.fc13.src.rpm

 |   |   |   `-- trackbuild.linuxdoc-tools

 |   |   |-- lm_sensors

 |   |   |   |-- lm_sensors-3.1.2.tar.bz2

@@ -4677,54 +4797,63 @@ see additional documentation files.
 |   |   |   |-- lsof_4.83.tar.bz2.sig

 |   |   |   `-- slack-desc

 |   |   |-- lsscsi

-|   |   |   |-- lsscsi-0.22.tar.bz2

+|   |   |   |-- lsscsi-0.24.tar.xz

 |   |   |   |-- lsscsi.SlackBuild

 |   |   |   |-- lsscsi.url

 |   |   |   `-- slack-desc

+|   |   |-- lxc

+|   |   |   |-- lxc-0.7.4.tar.gz

+|   |   |   |-- lxc.SlackBuild

+|   |   |   `-- slack-desc

 |   |   |-- madplay

-|   |   |   |-- madplay-0.15.2b.tar.gz

-|   |   |   |-- madplay-0.15.2b.tar.gz.sign

+|   |   |   |-- madplay-0.15.2b-fix-segfault.patch.gz

+|   |   |   |-- madplay-0.15.2b.tar.xz

 |   |   |   |-- madplay.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- man

 |   |   |   |-- doinst.sh.gz

 |   |   |   |-- man-1.6f.nroff.mandoc.diff.gz

-|   |   |   |-- man-1.6f.tar.bz2

+|   |   |   |-- man-1.6g.tar.xz

 |   |   |   |-- man.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- man-pages

 |   |   |   |-- doinst.sh.gz

-|   |   |   |-- man-pages-3.24.tar.bz2

+|   |   |   |-- man-pages-3.32.tar.bz2

 |   |   |   |-- man-pages-posix-2003-a.tar.bz2

 |   |   |   |-- man-pages.SlackBuild

 |   |   |   |-- slack-desc

 |   |   |   `-- whatis.sample.xz

 |   |   |-- mc

-|   |   |   |-- mc-20100509_git.tar.xz

+|   |   |   |-- mc-4.7.5.2.tar.xz

 |   |   |   |-- mc.SlackBuild

+|   |   |   |-- mc.ext.in.geeqie.diff.gz

 |   |   |   |-- profile.d

 |   |   |   |   |-- mc-wrapper.csh

 |   |   |   |   |-- mc-wrapper.sh

 |   |   |   |   |-- mc.csh

 |   |   |   |   `-- mc.sh

 |   |   |   `-- slack-desc

+|   |   |-- moc

+|   |   |   |-- moc-2.5.0-alpha4.tar.xz

+|   |   |   |-- moc.SlackBuild

+|   |   |   `-- slack-desc

 |   |   |-- most

 |   |   |   |-- most-5.0.0a.tar.bz2

 |   |   |   |-- most.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- mpg123

-|   |   |   |-- mpg123-1.12.1.tar.xz

+|   |   |   |-- mpg123-1.13.3.tar.xz

 |   |   |   |-- mpg123.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- mysql

 |   |   |   |-- doinst.sh.gz

-|   |   |   |-- mysql-5.1.46.tar.xz

+|   |   |   |-- mysql-5.1.56.tar.xz

 |   |   |   |-- mysql-embedded.build

 |   |   |   |-- mysql.SlackBuild

 |   |   |   |-- rc.mysqld.gz

 |   |   |   `-- slack-desc

 |   |   |-- nano

-|   |   |   |-- nano-2.2.4.tar.xz

+|   |   |   |-- nano-2.3.0.tar.xz

 |   |   |   |-- nano.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- normalize

@@ -4736,14 +4865,17 @@ see additional documentation files.
 |   |   |   |-- ntfsprogs.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- pm-utils

+|   |   |   |-- 49bluetooth-generic

 |   |   |   |-- README.SLACKWARE

-|   |   |   |-- pm-quirks-20100316.tar.xz

-|   |   |   |-- pm-utils-1.3.0.tar.xz

+|   |   |   |-- fix-wrong-path-in-intel-audio-powersave.patch.gz

+|   |   |   |-- pm-quirks-20100619.tar.gz

+|   |   |   |-- pm-utils-1.4.1.tar.gz

 |   |   |   |-- pm-utils.SlackBuild

 |   |   |   |-- pm-utils.url

-|   |   |   `-- slack-desc

+|   |   |   |-- slack-desc

+|   |   |   `-- use_more_sane_harddrive_defaults.patch.gz

 |   |   |-- powertop

-|   |   |   |-- powertop-1.11.tar.gz

+|   |   |   |-- powertop-1.13.tar.gz

 |   |   |   |-- powertop.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- radeontool

@@ -4757,7 +4889,7 @@ see additional documentation files.
 |   |   |-- rpm

 |   |   |   |-- Packages.gz

 |   |   |   |-- doinst.sh.gz

-|   |   |   |-- rpm-4.8.0.tar.xz

+|   |   |   |-- rpm-4.8.1.tar.xz

 |   |   |   |-- rpm.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- rzip

@@ -4766,10 +4898,9 @@ see additional documentation files.
 |   |   |   `-- slack-desc

 |   |   |-- sc

 |   |   |   |-- _sc.tar.gz

+|   |   |   |-- sc-7.16-3.diff.gz

 |   |   |   |-- sc-7.16.lsm

 |   |   |   |-- sc-7.16.tar.gz

-|   |   |   |-- sc-gcc34.diff.gz

-|   |   |   |-- sc-malloc.diff.gz

 |   |   |   |-- sc.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- screen

@@ -4788,18 +4919,18 @@ see additional documentation files.
 |   |   |   `-- README

 |   |   |-- sox

 |   |   |   |-- slack-desc

-|   |   |   |-- sox-14.3.0.tar.xz

+|   |   |   |-- sox-14.3.2.tar.xz

 |   |   |   `-- sox.SlackBuild

 |   |   |-- sqlite

 |   |   |   |-- COPYRIGHT.gz

 |   |   |   |-- slack-desc

-|   |   |   |-- sqlite-3.6.23.1.tar.xz

+|   |   |   |-- sqlite-src-3070500.tar.xz

 |   |   |   `-- sqlite.SlackBuild

 |   |   |-- sudo

 |   |   |   |-- doinst.sh.gz

 |   |   |   |-- slack-desc

-|   |   |   |-- sudo-1.7.2p6.tar.gz

-|   |   |   |-- sudo-1.7.2p6.tar.gz.sig

+|   |   |   |-- sudo-1.7.4p6.tar.gz

+|   |   |   |-- sudo-1.7.4p6.tar.gz.sig

 |   |   |   `-- sudo.SlackBuild

 |   |   |-- sysstat

 |   |   |   |-- doinst.sh.gz

@@ -4818,444 +4949,181 @@ see additional documentation files.
 |   |   |   |-- vbetool.SlackBuild

 |   |   |   `-- vbetool.info

 |   |   |-- vim

-|   |   |   |-- ctags-5.7.tar.gz

+|   |   |   |-- ctags-5.8.tar.gz

 |   |   |   |-- doinst.sh.gz

 |   |   |   |-- gvim.desktop

 |   |   |   |-- gvim.png

 |   |   |   |-- patches

-|   |   |   |   |-- 7.2.001.gz

-|   |   |   |   |-- 7.2.002.gz

-|   |   |   |   |-- 7.2.003.gz

-|   |   |   |   |-- 7.2.004.gz

-|   |   |   |   |-- 7.2.005.gz

-|   |   |   |   |-- 7.2.006.gz

-|   |   |   |   |-- 7.2.007.gz

-|   |   |   |   |-- 7.2.008.gz

-|   |   |   |   |-- 7.2.009.gz

-|   |   |   |   |-- 7.2.010.gz

-|   |   |   |   |-- 7.2.011.gz

-|   |   |   |   |-- 7.2.012.gz

-|   |   |   |   |-- 7.2.013.gz

-|   |   |   |   |-- 7.2.014.gz

-|   |   |   |   |-- 7.2.015.gz

-|   |   |   |   |-- 7.2.016.gz

-|   |   |   |   |-- 7.2.017.gz

-|   |   |   |   |-- 7.2.018.gz

-|   |   |   |   |-- 7.2.019.gz

-|   |   |   |   |-- 7.2.020.gz

-|   |   |   |   |-- 7.2.021.gz

-|   |   |   |   |-- 7.2.022.gz

-|   |   |   |   |-- 7.2.023.gz

-|   |   |   |   |-- 7.2.024.gz

-|   |   |   |   |-- 7.2.025.gz

-|   |   |   |   |-- 7.2.026.gz

-|   |   |   |   |-- 7.2.027.gz

-|   |   |   |   |-- 7.2.028.gz

-|   |   |   |   |-- 7.2.029.gz

-|   |   |   |   |-- 7.2.030.gz

-|   |   |   |   |-- 7.2.031.gz

-|   |   |   |   |-- 7.2.032.gz

-|   |   |   |   |-- 7.2.033.gz

-|   |   |   |   |-- 7.2.034.gz

-|   |   |   |   |-- 7.2.035.gz

-|   |   |   |   |-- 7.2.036.gz

-|   |   |   |   |-- 7.2.037.gz

-|   |   |   |   |-- 7.2.038.gz

-|   |   |   |   |-- 7.2.039.gz

-|   |   |   |   |-- 7.2.040.gz

-|   |   |   |   |-- 7.2.041.gz

-|   |   |   |   |-- 7.2.042.gz

-|   |   |   |   |-- 7.2.043.gz

-|   |   |   |   |-- 7.2.044.gz

-|   |   |   |   |-- 7.2.045.gz

-|   |   |   |   |-- 7.2.046.gz

-|   |   |   |   |-- 7.2.047.gz

-|   |   |   |   |-- 7.2.048.gz

-|   |   |   |   |-- 7.2.049.gz

-|   |   |   |   |-- 7.2.050.gz

-|   |   |   |   |-- 7.2.051.gz

-|   |   |   |   |-- 7.2.052.gz

-|   |   |   |   |-- 7.2.053.gz

-|   |   |   |   |-- 7.2.054.gz

-|   |   |   |   |-- 7.2.055.gz

-|   |   |   |   |-- 7.2.056.gz

-|   |   |   |   |-- 7.2.057.gz

-|   |   |   |   |-- 7.2.058.gz

-|   |   |   |   |-- 7.2.059.gz

-|   |   |   |   |-- 7.2.060.gz

-|   |   |   |   |-- 7.2.061.gz

-|   |   |   |   |-- 7.2.062.gz

-|   |   |   |   |-- 7.2.063.gz

-|   |   |   |   |-- 7.2.064.gz

-|   |   |   |   |-- 7.2.065.gz

-|   |   |   |   |-- 7.2.066.gz

-|   |   |   |   |-- 7.2.067.gz

-|   |   |   |   |-- 7.2.068.gz

-|   |   |   |   |-- 7.2.069.gz

-|   |   |   |   |-- 7.2.070.gz

-|   |   |   |   |-- 7.2.071.gz

-|   |   |   |   |-- 7.2.072.gz

-|   |   |   |   |-- 7.2.073.gz

-|   |   |   |   |-- 7.2.074.gz

-|   |   |   |   |-- 7.2.075.gz

-|   |   |   |   |-- 7.2.076.gz

-|   |   |   |   |-- 7.2.077.gz

-|   |   |   |   |-- 7.2.078.gz

-|   |   |   |   |-- 7.2.079.gz

-|   |   |   |   |-- 7.2.080.gz

-|   |   |   |   |-- 7.2.081.gz

-|   |   |   |   |-- 7.2.082.gz

-|   |   |   |   |-- 7.2.083.gz

-|   |   |   |   |-- 7.2.084.gz

-|   |   |   |   |-- 7.2.085.gz

-|   |   |   |   |-- 7.2.086.gz

-|   |   |   |   |-- 7.2.087.gz

-|   |   |   |   |-- 7.2.088.gz

-|   |   |   |   |-- 7.2.089.gz

-|   |   |   |   |-- 7.2.090.gz

-|   |   |   |   |-- 7.2.091.gz

-|   |   |   |   |-- 7.2.092.gz

-|   |   |   |   |-- 7.2.093.gz

-|   |   |   |   |-- 7.2.094.gz

-|   |   |   |   |-- 7.2.095.gz

-|   |   |   |   |-- 7.2.096.gz

-|   |   |   |   |-- 7.2.097.gz

-|   |   |   |   |-- 7.2.098.gz

-|   |   |   |   |-- 7.2.099.gz

-|   |   |   |   |-- 7.2.100.gz

-|   |   |   |   |-- 7.2.101.gz

-|   |   |   |   |-- 7.2.102.gz

-|   |   |   |   |-- 7.2.103.gz

-|   |   |   |   |-- 7.2.104.gz

-|   |   |   |   |-- 7.2.105.gz

-|   |   |   |   |-- 7.2.106.gz

-|   |   |   |   |-- 7.2.107.gz

-|   |   |   |   |-- 7.2.108.gz

-|   |   |   |   |-- 7.2.109.gz

-|   |   |   |   |-- 7.2.110.gz

-|   |   |   |   |-- 7.2.111.gz

-|   |   |   |   |-- 7.2.112.gz

-|   |   |   |   |-- 7.2.113.gz

-|   |   |   |   |-- 7.2.114.gz

-|   |   |   |   |-- 7.2.115.gz

-|   |   |   |   |-- 7.2.116.gz

-|   |   |   |   |-- 7.2.117.gz

-|   |   |   |   |-- 7.2.118.gz

-|   |   |   |   |-- 7.2.119.gz

-|   |   |   |   |-- 7.2.120.gz

-|   |   |   |   |-- 7.2.121.gz

-|   |   |   |   |-- 7.2.122.gz

-|   |   |   |   |-- 7.2.123.gz

-|   |   |   |   |-- 7.2.124.gz

-|   |   |   |   |-- 7.2.125.gz

-|   |   |   |   |-- 7.2.126.gz

-|   |   |   |   |-- 7.2.127.gz

-|   |   |   |   |-- 7.2.128.gz

-|   |   |   |   |-- 7.2.129.gz

-|   |   |   |   |-- 7.2.130.gz

-|   |   |   |   |-- 7.2.131.gz

-|   |   |   |   |-- 7.2.132.gz

-|   |   |   |   |-- 7.2.133.gz

-|   |   |   |   |-- 7.2.134.gz

-|   |   |   |   |-- 7.2.135.gz

-|   |   |   |   |-- 7.2.136.gz

-|   |   |   |   |-- 7.2.137.gz

-|   |   |   |   |-- 7.2.138.gz

-|   |   |   |   |-- 7.2.139.gz

-|   |   |   |   |-- 7.2.140.gz

-|   |   |   |   |-- 7.2.141.gz

-|   |   |   |   |-- 7.2.142.gz

-|   |   |   |   |-- 7.2.143.gz

-|   |   |   |   |-- 7.2.144.gz

-|   |   |   |   |-- 7.2.145.gz

-|   |   |   |   |-- 7.2.146.gz

-|   |   |   |   |-- 7.2.147.gz

-|   |   |   |   |-- 7.2.148.gz

-|   |   |   |   |-- 7.2.149.gz

-|   |   |   |   |-- 7.2.150.gz

-|   |   |   |   |-- 7.2.151.gz

-|   |   |   |   |-- 7.2.152.gz

-|   |   |   |   |-- 7.2.153.gz

-|   |   |   |   |-- 7.2.154.gz

-|   |   |   |   |-- 7.2.155.gz

-|   |   |   |   |-- 7.2.156.gz

-|   |   |   |   |-- 7.2.157.gz

-|   |   |   |   |-- 7.2.158.gz

-|   |   |   |   |-- 7.2.159.gz

-|   |   |   |   |-- 7.2.160.gz

-|   |   |   |   |-- 7.2.161.gz

-|   |   |   |   |-- 7.2.162.gz

-|   |   |   |   |-- 7.2.163.gz

-|   |   |   |   |-- 7.2.164.gz

-|   |   |   |   |-- 7.2.165.gz

-|   |   |   |   |-- 7.2.166.gz

-|   |   |   |   |-- 7.2.167.gz

-|   |   |   |   |-- 7.2.168.gz

-|   |   |   |   |-- 7.2.169.gz

-|   |   |   |   |-- 7.2.170.gz

-|   |   |   |   |-- 7.2.171.gz

-|   |   |   |   |-- 7.2.172.gz

-|   |   |   |   |-- 7.2.173.gz

-|   |   |   |   |-- 7.2.174.gz

-|   |   |   |   |-- 7.2.175.gz

-|   |   |   |   |-- 7.2.176.gz

-|   |   |   |   |-- 7.2.177.gz

-|   |   |   |   |-- 7.2.178.gz

-|   |   |   |   |-- 7.2.179.gz

-|   |   |   |   |-- 7.2.180.gz

-|   |   |   |   |-- 7.2.181.gz

-|   |   |   |   |-- 7.2.182.gz

-|   |   |   |   |-- 7.2.183.gz

-|   |   |   |   |-- 7.2.184.gz

-|   |   |   |   |-- 7.2.185.gz

-|   |   |   |   |-- 7.2.186.gz

-|   |   |   |   |-- 7.2.187.gz

-|   |   |   |   |-- 7.2.188.gz

-|   |   |   |   |-- 7.2.189.gz

-|   |   |   |   |-- 7.2.190.gz

-|   |   |   |   |-- 7.2.191.gz

-|   |   |   |   |-- 7.2.192.gz

-|   |   |   |   |-- 7.2.193.gz

-|   |   |   |   |-- 7.2.194.gz

-|   |   |   |   |-- 7.2.195.gz

-|   |   |   |   |-- 7.2.196.gz

-|   |   |   |   |-- 7.2.197.gz

-|   |   |   |   |-- 7.2.198.gz

-|   |   |   |   |-- 7.2.199.gz

-|   |   |   |   |-- 7.2.200.gz

-|   |   |   |   |-- 7.2.201.gz

-|   |   |   |   |-- 7.2.202.gz

-|   |   |   |   |-- 7.2.203.gz

-|   |   |   |   |-- 7.2.204.gz

-|   |   |   |   |-- 7.2.205.gz

-|   |   |   |   |-- 7.2.206.gz

-|   |   |   |   |-- 7.2.207.gz

-|   |   |   |   |-- 7.2.208.gz

-|   |   |   |   |-- 7.2.209.gz

-|   |   |   |   |-- 7.2.210.gz

-|   |   |   |   |-- 7.2.211.gz

-|   |   |   |   |-- 7.2.212.gz

-|   |   |   |   |-- 7.2.213.gz

-|   |   |   |   |-- 7.2.214.gz

-|   |   |   |   |-- 7.2.215.gz

-|   |   |   |   |-- 7.2.216.gz

-|   |   |   |   |-- 7.2.217.gz

-|   |   |   |   |-- 7.2.218.gz

-|   |   |   |   |-- 7.2.219.gz

-|   |   |   |   |-- 7.2.220.gz

-|   |   |   |   |-- 7.2.221.gz

-|   |   |   |   |-- 7.2.222.gz

-|   |   |   |   |-- 7.2.223.gz

-|   |   |   |   |-- 7.2.224.gz

-|   |   |   |   |-- 7.2.225.gz

-|   |   |   |   |-- 7.2.226.gz

-|   |   |   |   |-- 7.2.227.gz

-|   |   |   |   |-- 7.2.228.gz

-|   |   |   |   |-- 7.2.229.gz

-|   |   |   |   |-- 7.2.230.gz

-|   |   |   |   |-- 7.2.231.gz

-|   |   |   |   |-- 7.2.232.gz

-|   |   |   |   |-- 7.2.233.gz

-|   |   |   |   |-- 7.2.234.gz

-|   |   |   |   |-- 7.2.235.gz

-|   |   |   |   |-- 7.2.236.gz

-|   |   |   |   |-- 7.2.237.gz

-|   |   |   |   |-- 7.2.238.gz

-|   |   |   |   |-- 7.2.239.gz

-|   |   |   |   |-- 7.2.240.gz

-|   |   |   |   |-- 7.2.241.gz

-|   |   |   |   |-- 7.2.242.gz

-|   |   |   |   |-- 7.2.243.gz

-|   |   |   |   |-- 7.2.244.gz

-|   |   |   |   |-- 7.2.245.gz

-|   |   |   |   |-- 7.2.246.gz

-|   |   |   |   |-- 7.2.247.gz

-|   |   |   |   |-- 7.2.248.gz

-|   |   |   |   |-- 7.2.249.gz

-|   |   |   |   |-- 7.2.250.gz

-|   |   |   |   |-- 7.2.251.gz

-|   |   |   |   |-- 7.2.252.gz

-|   |   |   |   |-- 7.2.253.gz

-|   |   |   |   |-- 7.2.254.gz

-|   |   |   |   |-- 7.2.255.gz

-|   |   |   |   |-- 7.2.256.gz

-|   |   |   |   |-- 7.2.257.gz

-|   |   |   |   |-- 7.2.258.gz

-|   |   |   |   |-- 7.2.259.gz

-|   |   |   |   |-- 7.2.260.gz

-|   |   |   |   |-- 7.2.261.gz

-|   |   |   |   |-- 7.2.262.gz

-|   |   |   |   |-- 7.2.263.gz

-|   |   |   |   |-- 7.2.264.gz

-|   |   |   |   |-- 7.2.265.gz

-|   |   |   |   |-- 7.2.266.gz

-|   |   |   |   |-- 7.2.267.gz

-|   |   |   |   |-- 7.2.268.gz

-|   |   |   |   |-- 7.2.269.gz

-|   |   |   |   |-- 7.2.270.gz

-|   |   |   |   |-- 7.2.271.gz

-|   |   |   |   |-- 7.2.272.gz

-|   |   |   |   |-- 7.2.273.gz

-|   |   |   |   |-- 7.2.274.gz

-|   |   |   |   |-- 7.2.275.gz

-|   |   |   |   |-- 7.2.276.gz

-|   |   |   |   |-- 7.2.277.gz

-|   |   |   |   |-- 7.2.278.gz

-|   |   |   |   |-- 7.2.279.gz

-|   |   |   |   |-- 7.2.280.gz

-|   |   |   |   |-- 7.2.281.gz

-|   |   |   |   |-- 7.2.282.gz

-|   |   |   |   |-- 7.2.283.gz

-|   |   |   |   |-- 7.2.284.gz

-|   |   |   |   |-- 7.2.285.gz

-|   |   |   |   |-- 7.2.286.gz

-|   |   |   |   |-- 7.2.287.gz

-|   |   |   |   |-- 7.2.288.gz

-|   |   |   |   |-- 7.2.289.gz

-|   |   |   |   |-- 7.2.290.gz

-|   |   |   |   |-- 7.2.291.gz

-|   |   |   |   |-- 7.2.292.gz

-|   |   |   |   |-- 7.2.293.gz

-|   |   |   |   |-- 7.2.294.gz

-|   |   |   |   |-- 7.2.295.gz

-|   |   |   |   |-- 7.2.296.gz

-|   |   |   |   |-- 7.2.297.gz

-|   |   |   |   |-- 7.2.298.gz

-|   |   |   |   |-- 7.2.299.gz

-|   |   |   |   |-- 7.2.300.gz

-|   |   |   |   |-- 7.2.301.gz

-|   |   |   |   |-- 7.2.302.gz

-|   |   |   |   |-- 7.2.303.gz

-|   |   |   |   |-- 7.2.304.gz

-|   |   |   |   |-- 7.2.305.gz

-|   |   |   |   |-- 7.2.306.gz

-|   |   |   |   |-- 7.2.307.gz

-|   |   |   |   |-- 7.2.308.gz

-|   |   |   |   |-- 7.2.309.gz

-|   |   |   |   |-- 7.2.310.gz

-|   |   |   |   |-- 7.2.311.gz

-|   |   |   |   |-- 7.2.312.gz

-|   |   |   |   |-- 7.2.313.gz

-|   |   |   |   |-- 7.2.314.gz

-|   |   |   |   |-- 7.2.315.gz

-|   |   |   |   |-- 7.2.316.gz

-|   |   |   |   |-- 7.2.317.gz

-|   |   |   |   |-- 7.2.318.gz

-|   |   |   |   |-- 7.2.319.gz

-|   |   |   |   |-- 7.2.320.gz

-|   |   |   |   |-- 7.2.321.gz

-|   |   |   |   |-- 7.2.322.gz

-|   |   |   |   |-- 7.2.323.gz

-|   |   |   |   |-- 7.2.324.gz

-|   |   |   |   |-- 7.2.325.gz

-|   |   |   |   |-- 7.2.326.gz

-|   |   |   |   |-- 7.2.327.gz

-|   |   |   |   |-- 7.2.328.gz

-|   |   |   |   |-- 7.2.329.gz

-|   |   |   |   |-- 7.2.330.gz

-|   |   |   |   |-- 7.2.331.gz

-|   |   |   |   |-- 7.2.332.gz

-|   |   |   |   |-- 7.2.333.gz

-|   |   |   |   |-- 7.2.334.gz

-|   |   |   |   |-- 7.2.335.gz

-|   |   |   |   |-- 7.2.336.gz

-|   |   |   |   |-- 7.2.337.gz

-|   |   |   |   |-- 7.2.338.gz

-|   |   |   |   |-- 7.2.339.gz

-|   |   |   |   |-- 7.2.340.gz

-|   |   |   |   |-- 7.2.341.gz

-|   |   |   |   |-- 7.2.342.gz

-|   |   |   |   |-- 7.2.343.gz

-|   |   |   |   |-- 7.2.344.gz

-|   |   |   |   |-- 7.2.345.gz

-|   |   |   |   |-- 7.2.346.gz

-|   |   |   |   |-- 7.2.347.gz

-|   |   |   |   |-- 7.2.348.gz

-|   |   |   |   |-- 7.2.349.gz

-|   |   |   |   |-- 7.2.350.gz

-|   |   |   |   |-- 7.2.351.gz

-|   |   |   |   |-- 7.2.352.gz

-|   |   |   |   |-- 7.2.353.gz

-|   |   |   |   |-- 7.2.354.gz

-|   |   |   |   |-- 7.2.355.gz

-|   |   |   |   |-- 7.2.356.gz

-|   |   |   |   |-- 7.2.357.gz

-|   |   |   |   |-- 7.2.358.gz

-|   |   |   |   |-- 7.2.359.gz

-|   |   |   |   |-- 7.2.360.gz

-|   |   |   |   |-- 7.2.361.gz

-|   |   |   |   |-- 7.2.362.gz

-|   |   |   |   |-- 7.2.363.gz

-|   |   |   |   |-- 7.2.364.gz

-|   |   |   |   |-- 7.2.365.gz

-|   |   |   |   |-- 7.2.366.gz

-|   |   |   |   |-- 7.2.367.gz

-|   |   |   |   |-- 7.2.368.gz

-|   |   |   |   |-- 7.2.369.gz

-|   |   |   |   |-- 7.2.370.gz

-|   |   |   |   |-- 7.2.371.gz

-|   |   |   |   |-- 7.2.372.gz

-|   |   |   |   |-- 7.2.373.gz

-|   |   |   |   |-- 7.2.374.gz

-|   |   |   |   |-- 7.2.375.gz

-|   |   |   |   |-- 7.2.376.gz

-|   |   |   |   |-- 7.2.377.gz

-|   |   |   |   |-- 7.2.378.gz

-|   |   |   |   |-- 7.2.379.gz

-|   |   |   |   |-- 7.2.380.gz

-|   |   |   |   |-- 7.2.381.gz

-|   |   |   |   |-- 7.2.382.gz

-|   |   |   |   |-- 7.2.383.gz

-|   |   |   |   |-- 7.2.384.gz

-|   |   |   |   |-- 7.2.385.gz

-|   |   |   |   |-- 7.2.386.gz

-|   |   |   |   |-- 7.2.387.gz

-|   |   |   |   |-- 7.2.388.gz

-|   |   |   |   |-- 7.2.389.gz

-|   |   |   |   |-- 7.2.390.gz

-|   |   |   |   |-- 7.2.391.gz

-|   |   |   |   |-- 7.2.392.gz

-|   |   |   |   |-- 7.2.393.gz

-|   |   |   |   |-- 7.2.394.gz

-|   |   |   |   |-- 7.2.395.gz

-|   |   |   |   |-- 7.2.396.gz

-|   |   |   |   |-- 7.2.397.gz

-|   |   |   |   |-- 7.2.398.gz

-|   |   |   |   |-- 7.2.399.gz

-|   |   |   |   |-- 7.2.400.gz

-|   |   |   |   |-- 7.2.401.gz

-|   |   |   |   |-- 7.2.402.gz

-|   |   |   |   |-- 7.2.403.gz

-|   |   |   |   |-- 7.2.404.gz

-|   |   |   |   |-- 7.2.405.gz

-|   |   |   |   |-- 7.2.406.gz

-|   |   |   |   |-- 7.2.407.gz

-|   |   |   |   |-- 7.2.408.gz

-|   |   |   |   |-- 7.2.409.gz

-|   |   |   |   |-- 7.2.410.gz

-|   |   |   |   |-- 7.2.411.gz

-|   |   |   |   |-- 7.2.412.gz

-|   |   |   |   |-- 7.2.413.gz

-|   |   |   |   |-- 7.2.414.gz

-|   |   |   |   |-- 7.2.415.gz

-|   |   |   |   `-- 7.2.416.gz

+|   |   |   |   |-- 7.3.001.gz

+|   |   |   |   |-- 7.3.002.gz

+|   |   |   |   |-- 7.3.003.gz

+|   |   |   |   |-- 7.3.004.gz

+|   |   |   |   |-- 7.3.005.gz

+|   |   |   |   |-- 7.3.006.gz

+|   |   |   |   |-- 7.3.007.gz

+|   |   |   |   |-- 7.3.008.gz

+|   |   |   |   |-- 7.3.009.gz

+|   |   |   |   |-- 7.3.010.gz

+|   |   |   |   |-- 7.3.011.gz

+|   |   |   |   |-- 7.3.012.gz

+|   |   |   |   |-- 7.3.013.gz

+|   |   |   |   |-- 7.3.014.gz

+|   |   |   |   |-- 7.3.015.gz

+|   |   |   |   |-- 7.3.016.gz

+|   |   |   |   |-- 7.3.017.gz

+|   |   |   |   |-- 7.3.018.gz

+|   |   |   |   |-- 7.3.019.gz

+|   |   |   |   |-- 7.3.020.gz

+|   |   |   |   |-- 7.3.021.gz

+|   |   |   |   |-- 7.3.022.gz

+|   |   |   |   |-- 7.3.023.gz

+|   |   |   |   |-- 7.3.024.gz

+|   |   |   |   |-- 7.3.025.gz

+|   |   |   |   |-- 7.3.026.gz

+|   |   |   |   |-- 7.3.027.gz

+|   |   |   |   |-- 7.3.028.gz

+|   |   |   |   |-- 7.3.029.gz

+|   |   |   |   |-- 7.3.030.gz

+|   |   |   |   |-- 7.3.031.gz

+|   |   |   |   |-- 7.3.032.gz

+|   |   |   |   |-- 7.3.033.gz

+|   |   |   |   |-- 7.3.034.gz

+|   |   |   |   |-- 7.3.035.gz

+|   |   |   |   |-- 7.3.036.gz

+|   |   |   |   |-- 7.3.037.gz

+|   |   |   |   |-- 7.3.038.gz

+|   |   |   |   |-- 7.3.039.gz

+|   |   |   |   |-- 7.3.040.gz

+|   |   |   |   |-- 7.3.041.gz

+|   |   |   |   |-- 7.3.042.gz

+|   |   |   |   |-- 7.3.043.gz

+|   |   |   |   |-- 7.3.044.gz

+|   |   |   |   |-- 7.3.045.gz

+|   |   |   |   |-- 7.3.046.gz

+|   |   |   |   |-- 7.3.047.gz

+|   |   |   |   |-- 7.3.048.gz

+|   |   |   |   |-- 7.3.049.gz

+|   |   |   |   |-- 7.3.050.gz

+|   |   |   |   |-- 7.3.051.gz

+|   |   |   |   |-- 7.3.052.gz

+|   |   |   |   |-- 7.3.053.gz

+|   |   |   |   |-- 7.3.054.gz

+|   |   |   |   |-- 7.3.055.gz

+|   |   |   |   |-- 7.3.056.gz

+|   |   |   |   |-- 7.3.057.gz

+|   |   |   |   |-- 7.3.058.gz

+|   |   |   |   |-- 7.3.059.gz

+|   |   |   |   |-- 7.3.060.gz

+|   |   |   |   |-- 7.3.061.gz

+|   |   |   |   |-- 7.3.062.gz

+|   |   |   |   |-- 7.3.063.gz

+|   |   |   |   |-- 7.3.064.gz

+|   |   |   |   |-- 7.3.065.gz

+|   |   |   |   |-- 7.3.066.gz

+|   |   |   |   |-- 7.3.067.gz

+|   |   |   |   |-- 7.3.068.gz

+|   |   |   |   |-- 7.3.069.gz

+|   |   |   |   |-- 7.3.070.gz

+|   |   |   |   |-- 7.3.071.gz

+|   |   |   |   |-- 7.3.072.gz

+|   |   |   |   |-- 7.3.073.gz

+|   |   |   |   |-- 7.3.074.gz

+|   |   |   |   |-- 7.3.075.gz

+|   |   |   |   |-- 7.3.076.gz

+|   |   |   |   |-- 7.3.077.gz

+|   |   |   |   |-- 7.3.078.gz

+|   |   |   |   |-- 7.3.079.gz

+|   |   |   |   |-- 7.3.080.gz

+|   |   |   |   |-- 7.3.081.gz

+|   |   |   |   |-- 7.3.082.gz

+|   |   |   |   |-- 7.3.083.gz

+|   |   |   |   |-- 7.3.084.gz

+|   |   |   |   |-- 7.3.085.gz

+|   |   |   |   |-- 7.3.086.gz

+|   |   |   |   |-- 7.3.087.gz

+|   |   |   |   |-- 7.3.088.gz

+|   |   |   |   |-- 7.3.089.gz

+|   |   |   |   |-- 7.3.090.gz

+|   |   |   |   |-- 7.3.091.gz

+|   |   |   |   |-- 7.3.092.gz

+|   |   |   |   |-- 7.3.093.gz

+|   |   |   |   |-- 7.3.094.gz

+|   |   |   |   |-- 7.3.095.gz

+|   |   |   |   |-- 7.3.096.gz

+|   |   |   |   |-- 7.3.097.gz

+|   |   |   |   |-- 7.3.098.gz

+|   |   |   |   |-- 7.3.099.gz

+|   |   |   |   |-- 7.3.100.gz

+|   |   |   |   |-- 7.3.101.gz

+|   |   |   |   |-- 7.3.102.gz

+|   |   |   |   |-- 7.3.103.gz

+|   |   |   |   |-- 7.3.104.gz

+|   |   |   |   |-- 7.3.105.gz

+|   |   |   |   |-- 7.3.106.gz

+|   |   |   |   |-- 7.3.107.gz

+|   |   |   |   |-- 7.3.108.gz

+|   |   |   |   |-- 7.3.109.gz

+|   |   |   |   |-- 7.3.110.gz

+|   |   |   |   |-- 7.3.111.gz

+|   |   |   |   |-- 7.3.112.gz

+|   |   |   |   |-- 7.3.113.gz

+|   |   |   |   |-- 7.3.114.gz

+|   |   |   |   |-- 7.3.115.gz

+|   |   |   |   |-- 7.3.116.gz

+|   |   |   |   |-- 7.3.117.gz

+|   |   |   |   |-- 7.3.118.gz

+|   |   |   |   |-- 7.3.119.gz

+|   |   |   |   |-- 7.3.120.gz

+|   |   |   |   |-- 7.3.121.gz

+|   |   |   |   |-- 7.3.122.gz

+|   |   |   |   |-- 7.3.123.gz

+|   |   |   |   |-- 7.3.124.gz

+|   |   |   |   |-- 7.3.125.gz

+|   |   |   |   |-- 7.3.126.gz

+|   |   |   |   |-- 7.3.127.gz

+|   |   |   |   |-- 7.3.128.gz

+|   |   |   |   |-- 7.3.129.gz

+|   |   |   |   |-- 7.3.130.gz

+|   |   |   |   |-- 7.3.131.gz

+|   |   |   |   |-- 7.3.132.gz

+|   |   |   |   |-- 7.3.133.gz

+|   |   |   |   |-- 7.3.134.gz

+|   |   |   |   |-- 7.3.135.gz

+|   |   |   |   |-- 7.3.136.gz

+|   |   |   |   |-- 7.3.137.gz

+|   |   |   |   |-- 7.3.138.gz

+|   |   |   |   |-- 7.3.139.gz

+|   |   |   |   |-- 7.3.140.gz

+|   |   |   |   |-- 7.3.141.gz

+|   |   |   |   |-- 7.3.142.gz

+|   |   |   |   |-- 7.3.143.gz

+|   |   |   |   |-- 7.3.144.gz

+|   |   |   |   |-- 7.3.145.gz

+|   |   |   |   |-- 7.3.146.gz

+|   |   |   |   |-- 7.3.147.gz

+|   |   |   |   |-- 7.3.148.gz

+|   |   |   |   |-- 7.3.149.gz

+|   |   |   |   |-- 7.3.150.gz

+|   |   |   |   |-- 7.3.151.gz

+|   |   |   |   |-- 7.3.152.gz

+|   |   |   |   |-- 7.3.153.gz

+|   |   |   |   `-- 7.3.154.gz

 |   |   |   |-- slack-desc.vim

 |   |   |   |-- slack-desc.vim-gvim

-|   |   |   |-- vim-7.2-lang.tar.xz

-|   |   |   |-- vim-7.2.tar.xz

+|   |   |   |-- vim-7.3.tar.xz

 |   |   |   |-- vim-gvim.SlackBuild

-|   |   |   |-- vim-runtime-syntax-20100510.diff.gz

+|   |   |   |-- vim-runtime-syntax-20110328.diff.gz

 |   |   |   |-- vim.SlackBuild

 |   |   |   `-- vim.vimrc.diff.gz

 |   |   |-- vorbis-tools

 |   |   |   |-- slack-desc

-|   |   |   |-- vorbis-tools-1.2.0.tar.bz2

+|   |   |   |-- vorbis-tools-1.4.0.tar.xz

 |   |   |   `-- vorbis-tools.SlackBuild

 |   |   |-- workbone

 |   |   |   |-- slack-desc

 |   |   |   |-- workbone.1.diff.gz

 |   |   |   |-- workbone.SlackBuild

-|   |   |   |-- workbone_2.40-3.diff.gz

+|   |   |   |-- workbone_2.40-9.diff.gz

 |   |   |   `-- workbone_2.40.orig.tar.gz

 |   |   |-- xfsdump

 |   |   |   |-- slack-desc

@@ -5265,14 +5133,14 @@ see additional documentation files.
 |   |   `-- zsh

 |   |       |-- doinst.sh.gz

 |   |       |-- slack-desc

-|   |       |-- zsh-4.3.10-add_new_pkg_completion.diff.gz

-|   |       |-- zsh-4.3.10-doc.tar.xz

-|   |       |-- zsh-4.3.10.tar.xz

-|   |       `-- zsh.SlackBuild

+|   |       |-- zsh-4.3.11-doc.tar.xz

+|   |       |-- zsh-4.3.11.tar.xz

+|   |       |-- zsh.SlackBuild

+|   |       `-- zsh.regex.oh.bah.diff.gz

 |   |-- d

 |   |   |-- autoconf

-|   |   |   |-- autoconf-2.65.tar.xz

-|   |   |   |-- autoconf-2.65.tar.xz.sig

+|   |   |   |-- autoconf-2.68.tar.xz

+|   |   |   |-- autoconf-2.68.tar.xz.sig

 |   |   |   |-- autoconf.SlackBuild

 |   |   |   |-- doinst.sh.gz

 |   |   |   `-- slack-desc

@@ -5282,30 +5150,30 @@ see additional documentation files.
 |   |   |   |-- doinst.sh.gz

 |   |   |   `-- slack-desc

 |   |   |-- binutils

-|   |   |   |-- binutils-2.20.51.0.8.tar.sign

-|   |   |   |-- binutils-2.20.51.0.8.tar.xz

+|   |   |   |-- binutils-2.21.51.0.6.tar.sign

+|   |   |   |-- binutils-2.21.51.0.6.tar.xz

 |   |   |   |-- binutils.SlackBuild

-|   |   |   |-- release.binutils-2.20.51.0.8

+|   |   |   |-- release.binutils-2.21.51.0.6

 |   |   |   `-- slack-desc

 |   |   |-- bison

-|   |   |   |-- bison-2.4.2.tar.bz2

-|   |   |   |-- bison-2.4.2.tar.bz2.sig

+|   |   |   |-- bison-2.4.3.tar.bz2

 |   |   |   |-- bison.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- ccache

-|   |   |   |-- ccache-2.4.tar.gz

+|   |   |   |-- ccache-3.1.4.tar.xz

+|   |   |   |-- ccache-3.1.4.tar.xz.asc

 |   |   |   |-- ccache.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- clisp

-|   |   |   |-- clisp-2.48.tar.bz2

-|   |   |   |-- clisp-2.48.tar.bz2.sig

+|   |   |   |-- clisp-2.49.tar.bz2

+|   |   |   |-- clisp-2.49.tar.bz2.sig

 |   |   |   |-- clisp.SlackBuild

 |   |   |   |-- ffcall-20080704cvs.tar.bz2

 |   |   |   |-- libsigsegv-2.8.tar.xz

 |   |   |   |-- slack-desc

 |   |   |   `-- source.download

 |   |   |-- cmake

-|   |   |   |-- cmake-2.8.1.tar.xz

+|   |   |   |-- cmake-2.8.4.tar.xz

 |   |   |   |-- cmake.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- cscope

@@ -5331,7 +5199,7 @@ see additional documentation files.
 |   |   |   |-- distcc.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- doxygen

-|   |   |   |-- doxygen-1.6.3.src.tar.xz

+|   |   |   |-- doxygen-1.7.3.src.tar.xz

 |   |   |   |-- doxygen.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- flex

@@ -5339,8 +5207,15 @@ see additional documentation files.
 |   |   |   |-- flex.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- gcc

-|   |   |   |-- ecj-4.3.jar

-|   |   |   |-- gcc-4.4.4.tar.xz

+|   |   |   |-- ecj-4.5.jar

+|   |   |   |-- fastjar-0.97.tar.xz

+|   |   |   |-- fastjar-patches

+|   |   |   |   |-- 1000-fastjar-0.97-segfault.patch.gz

+|   |   |   |   |-- 1001-fastjar-0.97-len1.patch.gz

+|   |   |   |   |-- 1002-fastjar-0.97-filename0.patch.gz

+|   |   |   |   |-- 1003-fastjar-CVE-2010-0831.patch.gz

+|   |   |   |   `-- 1004-fastjar-man.patch.gz

+|   |   |   |-- gcc-4.5.2.tar.xz

 |   |   |   |-- gcc-no_fixincludes.diff.gz

 |   |   |   |-- gcc.SlackBuild

 |   |   |   |-- slack-desc.gcc

@@ -5350,20 +5225,21 @@ see additional documentation files.
 |   |   |   |-- slack-desc.gcc-java

 |   |   |   `-- slack-desc.gcc-objc

 |   |   |-- gdb

-|   |   |   |-- gdb-7.1.tar.xz

+|   |   |   |-- gdb-7.2.tar.xz

 |   |   |   |-- gdb.SlackBuild

 |   |   |   `-- slack-desc

+|   |   |-- gettext-tools -> ../a/gettext

 |   |   |-- git

-|   |   |   |-- git-1.7.1.tar.sign

-|   |   |   |-- git-1.7.1.tar.xz

+|   |   |   |-- git-1.7.4.4.tar.sign

+|   |   |   |-- git-1.7.4.4.tar.xz

 |   |   |   |-- git.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- gperf

-|   |   |   |-- gperf-3.0.3.tar.bz2

+|   |   |   |-- gperf-3.0.4.tar.xz

 |   |   |   |-- gperf.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- guile

-|   |   |   |-- guile-1.8.7.tar.xz

+|   |   |   |-- guile-1.8.8.tar.xz

 |   |   |   |-- guile.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- indent

@@ -5371,33 +5247,35 @@ see additional documentation files.
 |   |   |   |-- indent.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- intltool

-|   |   |   |-- intltool-0.40.6.tar.bz2

+|   |   |   |-- intltool-0.41.1.tar.bz2

 |   |   |   |-- intltool.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- kernel-headers

 |   |   |   `-- slack-desc

 |   |   |-- libtool

 |   |   |   |-- doinst.sh.gz

-|   |   |   |-- libtool-2.2.6b.tar.xz

+|   |   |   |-- libtool-2.4.tar.xz

+|   |   |   |-- libtool-2.4.tar.xz.sig

 |   |   |   |-- libtool.SlackBuild

 |   |   |   |-- libtool.no.moved.warning.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- m4

-|   |   |   |-- m4-1.4.14.tar.xz

+|   |   |   |-- m4-1.4.16.tar.xz

+|   |   |   |-- m4-1.4.16.tar.xz.sig

 |   |   |   |-- m4.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- make

-|   |   |   |-- make-3.81.tar.bz2

-|   |   |   |-- make-3.81.tar.bz2.sig

+|   |   |   |-- make-3.82.tar.bz2

+|   |   |   |-- make-3.82.tar.bz2.sig

 |   |   |   |-- make.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- mercurial

 |   |   |   |-- doinst.sh.gz

-|   |   |   |-- mercurial-1.5.2.tar.xz

+|   |   |   |-- mercurial-1.8.2.tar.xz

 |   |   |   |-- mercurial.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- nasm

-|   |   |   |-- nasm-2.07.tar.bz2

+|   |   |   |-- nasm-2.09.04.tar.bz2

 |   |   |   |-- nasm.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- oprofile

@@ -5414,18 +5292,18 @@ see additional documentation files.
 |   |   |   |-- p2c_time.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- perl

-|   |   |   |-- DBD-mysql-4.013.tar.gz

-|   |   |   |-- DBI-1.609.tar.gz

-|   |   |   |-- URI-1.40.tar.gz

-|   |   |   |-- XML-Parser-2.36.tar.gz

+|   |   |   |-- DBD-mysql-4.018.tar.gz

+|   |   |   |-- DBI-1.616.tar.gz

+|   |   |   |-- URI-1.58.tar.gz

+|   |   |   |-- XML-Parser-2.40.tar.gz

 |   |   |   |-- XML-Simple-2.18.tar.gz

-|   |   |   |-- perl-5.10.1.tar.xz

+|   |   |   |-- perl-5.12.3.tar.xz

 |   |   |   |-- perl.SlackBuild

 |   |   |   |-- perl.configure.multilib.patch.gz

 |   |   |   `-- slack-desc

 |   |   |-- pkg-config

 |   |   |   |-- doinst.sh.gz

-|   |   |   |-- pkg-config-0.23.tar.bz2

+|   |   |   |-- pkg-config-0.25.tar.xz

 |   |   |   |-- pkg-config.SlackBuild

 |   |   |   |-- scripts

 |   |   |   |   |-- pkgconfig.csh

@@ -5439,8 +5317,8 @@ see additional documentation files.
 |   |   |   |-- pmake_1.111-1.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- python

-|   |   |   |-- Python-2.6.4.tar.xz

-|   |   |   |-- python-2.6.4-docs-text.tar.xz

+|   |   |   |-- Python-2.6.6.tar.xz

+|   |   |   |-- python-2.6.6-docs-text.tar.xz

 |   |   |   |-- python.SlackBuild

 |   |   |   |-- python.pure64.diff.gz

 |   |   |   |-- python.readline.set_pre_input_hook.diff.gz

@@ -5453,36 +5331,43 @@ see additional documentation files.
 |   |   |   |-- rcs.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- ruby

-|   |   |   |-- ruby-1.9.1-p378.tar.xz

+|   |   |   |-- ruby-1.9.1-p431.tar.xz

 |   |   |   |-- ruby.SlackBuild

 |   |   |   `-- slack-desc

+|   |   |-- slacktrack

+|   |   |   |-- OVERVIEW

+|   |   |   |-- slacktrack-2.08-source.tar.xz

+|   |   |   `-- slacktrack.SlackBuild

 |   |   |-- strace

 |   |   |   |-- slack-desc

-|   |   |   |-- strace-4.5.18.tar.bz2

+|   |   |   |-- strace-4.5.20.tar.bz2

 |   |   |   `-- strace.SlackBuild

 |   |   |-- subversion

 |   |   |   |-- get-svn-book.sh

 |   |   |   |-- slack-desc

-|   |   |   |-- subversion-1.6.11.tar.xz

+|   |   |   |-- subversion-1.6.16.tar.xz

 |   |   |   |-- subversion.SlackBuild

 |   |   |   `-- svn-book-html.tar.bz2

-|   |   `-- swig

+|   |   |-- swig

+|   |   |   |-- slack-desc

+|   |   |   |-- swig-1.3.38.tar.bz2

+|   |   |   |-- swig.SlackBuild

+|   |   |   `-- swig.url

+|   |   `-- yasm

 |   |       |-- slack-desc

-|   |       |-- swig-1.3.38.tar.bz2

-|   |       |-- swig.SlackBuild

-|   |       `-- swig.url

+|   |       |-- yasm-1.1.0.tar.xz

+|   |       `-- yasm.SlackBuild

 |   |-- e

 |   |   `-- emacs

 |   |       |-- doinst.sh.gz

-|   |       |-- emacs-23.2.tar.xz

+|   |       |-- emacs-23.3.tar.xz

 |   |       |-- emacs.SlackBuild

-|   |       |-- emacs.info

 |   |       `-- slack-desc

 |   |-- f

 |   |   |-- slack-desc.linux-faqs

 |   |   `-- slack-desc.linux-howtos

 |   |-- installer

-|   |   |-- busybox-1.15.3.tar.bz2

+|   |   |-- busybox-1.18.4.tar.xz

 |   |   |-- busybox-dot-config

 |   |   |-- busybox.2.6.32.2.diff.gz

 |   |   |-- busybox.SlackBuild

@@ -5490,21 +5375,21 @@ see additional documentation files.
 |   |   |   |-- config.h.diff.gz

 |   |   |   |-- dhcpcd-3.2.3.tar.bz2

 |   |   |   `-- dhcpcd.sh.diff.gz

-|   |   `-- dropbear

-|   |       |-- doinst.sh

-|   |       |-- dropbear-0.50.tar.bz2

-|   |       |-- dropbear.Slackbuild

-|   |       |-- dropbear.xauth.patch

-|   |       |-- dropbear_dbclientpath.patch

-|   |       |-- dropbear_emptypass.patch

-|   |       |-- rc.dropbear.new

-|   |       `-- slack-desc

+|   |   |-- dropbear

+|   |   |   |-- doinst.sh

+|   |   |   |-- dropbear-0.50.tar.bz2

+|   |   |   |-- dropbear.Slackbuild

+|   |   |   |-- dropbear.xauth.patch

+|   |   |   |-- dropbear_dbclientpath.patch

+|   |   |   |-- dropbear_emptypass.patch

+|   |   |   |-- rc.dropbear.new

+|   |   |   `-- slack-desc

+|   |   `-- memtest86+-4.20.tar.xz

 |   |-- k

 |   |   |-- README.TXT

 |   |   |-- README_SPEAKUP_PATCH.TXT

-|   |   |-- config-generic-2.6.33.4

-|   |   |-- config-huge-2.6.33.4

-|   |   |-- config-speakup-2.6.33.4

+|   |   |-- config-generic-2.6.37.6

+|   |   |-- config-huge-2.6.37.6

 |   |   |-- kernel-firmware

 |   |   |   |-- kernel-firmware.SlackBuild

 |   |   |   `-- slack-desc

@@ -5518,9 +5403,8 @@ see additional documentation files.
 |   |   |   |-- kernel-modules.SlackBuild

 |   |   |   |-- rc.modules.new

 |   |   |   `-- slack-desc

-|   |   |-- linux-2.6.33.4.tar.sign

-|   |   |-- linux-2.6.33.4.tar.xz

-|   |   `-- speakup-2009-12-30.tar.xz

+|   |   |-- linux-2.6.37.6.tar.sign

+|   |   `-- linux-2.6.37.6.tar.xz

 |   |-- kde

 |   |   |-- KDE.SlackBuild

 |   |   |-- KDE.options

@@ -5530,10 +5414,6 @@ see additional documentation files.
 |   |   |   |-- doinst.sh.gz

 |   |   |   |-- local.options

 |   |   |   `-- slack-desc

-|   |   |-- guidance-power-manager

-|   |   |   |-- guidance-power-manager.SlackBuild

-|   |   |   |-- local.options

-|   |   |   `-- slack-desc

 |   |   |-- k3b

 |   |   |   |-- doinst.sh.gz

 |   |   |   |-- k3b.SlackBuild

@@ -5552,17 +5432,21 @@ see additional documentation files.
 |   |   |   |-- doinst.sh.gz

 |   |   |   |-- kdeadmin.SlackBuild

 |   |   |   |-- knetworkconf.diff.gz

+|   |   |   |-- local.options

 |   |   |   `-- slack-desc

 |   |   |-- kdeartwork

 |   |   |   |-- doinst.sh.gz

 |   |   |   |-- kdeartwork.SlackBuild

+|   |   |   |-- local.options

 |   |   |   `-- slack-desc

 |   |   |-- kdebase

 |   |   |   |-- config

 |   |   |   |   `-- kdeglobals

 |   |   |   |-- doinst.sh.gz

 |   |   |   |-- kdebase.SlackBuild

-|   |   |   |-- module_manager_include.diff

+|   |   |   |-- konsole_right_click-185466.patch.gz

+|   |   |   |-- konsole_right_click-185466.patch.patch.gz

+|   |   |   |-- local.options

 |   |   |   |-- profile.d

 |   |   |   |   |-- kde.csh

 |   |   |   |   `-- kde.sh

@@ -5570,13 +5454,13 @@ see additional documentation files.
 |   |   |-- kdebase-runtime

 |   |   |   |-- doinst.sh.gz

 |   |   |   |-- kdebase-runtime.SlackBuild

+|   |   |   |-- local.options

 |   |   |   `-- slack-desc

 |   |   |-- kdebase-workspace

 |   |   |   |-- config

 |   |   |   |   |-- Xsession

 |   |   |   |   `-- Xsession.orig

 |   |   |   |-- doinst.sh.gz

-|   |   |   |-- kcmshell_root_privilege.patch

 |   |   |   |-- kdebase-workspace.SlackBuild

 |   |   |   |-- kdebase-workspace.kdm.server.timeout.diff.gz

 |   |   |   |-- slack-desc

@@ -5586,8 +5470,10 @@ see additional documentation files.
 |   |   |   |-- kdebindings-len-ptr-rfloat.diff.gz

 |   |   |   |-- kdebindings-ruby-env.h.diff.gz

 |   |   |   |-- kdebindings-rubyconfig.h.diff.gz

+|   |   |   |-- kdebindings.1170602.sip_4_11_x.diff.gz

 |   |   |   |-- kdebindings.SlackBuild

 |   |   |   |-- local.options

+|   |   |   |-- pykdeuic4.patch.gz

 |   |   |   `-- slack-desc

 |   |   |-- kdeedu

 |   |   |   |-- doinst.sh.gz

@@ -5600,13 +5486,15 @@ see additional documentation files.
 |   |   |-- kdegraphics

 |   |   |   |-- doinst.sh.gz

 |   |   |   |-- kdegraphics.SlackBuild

-|   |   |   |-- kdegraphics.gwenview.jpeg8.diff.gz

 |   |   |   |-- local.options

 |   |   |   `-- slack-desc

 |   |   |-- kdelibs

 |   |   |   |-- doinst.sh.gz

 |   |   |   |-- kdelibs.SlackBuild

+|   |   |   |-- kdelibs.docbook.patch.gz

+|   |   |   |-- kdelibs.khtml.CVE-2011-1168.diff.gz

 |   |   |   |-- kdesu-allow_NOPASS_in_suauth.patch.gz

+|   |   |   |-- local.options

 |   |   |   `-- slack-desc

 |   |   |-- kdemultimedia

 |   |   |   |-- doinst.sh.gz

@@ -5615,20 +5503,22 @@ see additional documentation files.
 |   |   |-- kdenetwork

 |   |   |   |-- doinst.sh.gz

 |   |   |   |-- kdenetwork.SlackBuild

-|   |   |   |-- kget.kde44.CVE-2010-1000-1511.diff.gz

-|   |   |   |-- local.options

 |   |   |   `-- slack-desc

 |   |   |-- kdepim

 |   |   |   |-- doinst.sh.gz

 |   |   |   |-- kdepim-4.4.0-install-headers.patch

 |   |   |   |-- kdepim.SlackBuild

+|   |   |   |-- local.options

 |   |   |   `-- slack-desc

 |   |   |-- kdepim-runtime

 |   |   |   |-- doinst.sh.gz

 |   |   |   |-- kdepim-runtime.SlackBuild

+|   |   |   |-- local.options

 |   |   |   `-- slack-desc

 |   |   |-- kdepimlibs

+|   |   |   |-- kdepimlibs-4.5.imap4.cpp.r1216162.diff.gz

 |   |   |   |-- kdepimlibs.SlackBuild

+|   |   |   |-- local.options

 |   |   |   `-- slack-desc

 |   |   |-- kdeplasma-addons

 |   |   |   |-- doinst.sh.gz

@@ -5670,10 +5560,10 @@ see additional documentation files.
 |   |   |-- koffice

 |   |   |   |-- doinst.sh.gz

 |   |   |   |-- koffice.SlackBuild

-|   |   |   |-- koffice.krita.png14.diff.gz

 |   |   |   |-- local.options

 |   |   |   `-- slack-desc

 |   |   |-- konq-plugins

+|   |   |   |-- konq-plugins-4.4.0-qt47.patch.gz

 |   |   |   |-- konq-plugins.SlackBuild

 |   |   |   |-- local.options

 |   |   |   `-- slack-desc

@@ -5687,16 +5577,33 @@ see additional documentation files.
 |   |   |   |-- ktorrent.SlackBuild

 |   |   |   |-- local.options

 |   |   |   `-- slack-desc

+|   |   |-- libktorrent

+|   |   |   |-- libktorrent.SlackBuild

+|   |   |   |-- local.options

+|   |   |   `-- slack-desc

 |   |   |-- oxygen-icons

 |   |   |   |-- oxygen-icons.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- polkit-kde-1

 |   |   |   |-- local.options

 |   |   |   |-- polkit-kde-1.SlackBuild

+|   |   |   |-- polkit-kde-1.nodrkonqi.diff.gz

+|   |   |   `-- slack-desc

+|   |   |-- polkit-kde-agent-1

+|   |   |   |-- local.options

+|   |   |   |-- polkit-kde-agent-1.SlackBuild

+|   |   |   |-- pull-polkit-kde-agent-1

+|   |   |   `-- slack-desc

+|   |   |-- polkit-kde-kcmodules-1

+|   |   |   |-- local.options

+|   |   |   |-- polkit-kde-kcmodules-1.SlackBuild

+|   |   |   |-- pull-polkit-kde-kcmodules-1

 |   |   |   `-- slack-desc

 |   |   |-- polkit-qt-1

 |   |   |   |-- local.options

 |   |   |   |-- polkit-qt-1.SlackBuild

+|   |   |   |-- polkit-qt-1.null-checking.diff.gz

+|   |   |   |-- pull-polkit-qt-1

 |   |   |   `-- slack-desc

 |   |   |-- skanlite

 |   |   |   |-- doinst.sh.gz

@@ -5705,103 +5612,161 @@ see additional documentation files.
 |   |   |   `-- slack-desc

 |   |   `-- src

 |   |       |-- extragear

-|   |       |   |-- amarok-2.3.0.90.tar.bz2

-|   |       |   |-- amarok-2.3.0.tar.xz

-|   |       |   |-- guidance-power-manager-4.4.0.tar.xz

-|   |       |   |-- k3b-1.91.0.tar.xz

-|   |       |   |-- kaudiocreator-r1118889.tar.xz

+|   |       |   |-- amarok-2.4.0.tar.xz

+|   |       |   |-- k3b-2.0.2.tar.xz

+|   |       |   |-- kaudiocreator-r1212483.tar.xz

 |   |       |   |-- konq-plugins-4.4.0.tar.xz

 |   |       |   |-- kopete-cryptography-1.3.0-kde4.4.0.tar.xz

-|   |       |   |-- ktorrent-3.3.4.tar.xz

-|   |       |   `-- skanlite-0.4-kde4.4.0.tar.xz

-|   |       |-- kdeaccessibility-4.4.3.tar.xz

-|   |       |-- kdeadmin-4.4.3.tar.xz

-|   |       |-- kdeartwork-4.4.3.tar.xz

-|   |       |-- kdebase-4.4.3.tar.xz

-|   |       |-- kdebase-runtime-4.4.3.tar.xz

-|   |       |-- kdebase-workspace-4.4.3.tar.xz

-|   |       |-- kdebindings-4.4.3.tar.xz

-|   |       |-- kdeedu-4.4.3.tar.xz

-|   |       |-- kdegames-4.4.3.tar.xz

-|   |       |-- kdegraphics-4.4.3.tar.xz

-|   |       |-- kdelibs-4.4.3.tar.xz

-|   |       |-- kdemultimedia-4.4.3.tar.xz

-|   |       |-- kdenetwork-4.4.3.tar.xz

-|   |       |-- kdepim-4.4.3.tar.xz

-|   |       |-- kdepim-runtime-4.4.3.tar.xz

-|   |       |-- kdepimlibs-4.4.3.tar.xz

-|   |       |-- kdeplasma-addons-4.4.3.tar.xz

-|   |       |-- kdesdk-4.4.3.tar.xz

-|   |       |-- kdetoys-4.4.3.tar.xz

-|   |       |-- kdeutils-4.4.3.tar.xz

-|   |       |-- kdevelop-4.0.0.tar.xz

-|   |       |-- kdevplatform-1.0.0.tar.xz

-|   |       |-- kdewebdev-4.4.3.tar.xz

-|   |       |-- koffice-2.1.2.tar.xz

-|   |       |-- oxygen-icons-4.4.3.tar.xz

-|   |       |-- polkit-kde-1-r1120537.tar.xz

-|   |       `-- polkit-qt-1-r1118744.tar.xz

+|   |       |   |-- ktorrent-4.0.5.tar.xz

+|   |       |   |-- libktorrent-1.0.5-3.tar.xz

+|   |       |   `-- skanlite-0.7.tar.xz

+|   |       |-- kdeaccessibility-4.5.5.tar.xz

+|   |       |-- kdeadmin-4.5.5.tar.xz

+|   |       |-- kdeartwork-4.5.5.tar.xz

+|   |       |-- kdebase-4.5.5.tar.xz

+|   |       |-- kdebase-runtime-4.5.5.tar.xz

+|   |       |-- kdebase-workspace-4.5.5.tar.xz

+|   |       |-- kdebindings-4.5.5.tar.xz

+|   |       |-- kdeedu-4.5.5.tar.xz

+|   |       |-- kdegames-4.5.5.tar.xz

+|   |       |-- kdegraphics-4.5.5.tar.xz

+|   |       |-- kdelibs-4.5.5.tar.xz

+|   |       |-- kdemultimedia-4.5.5.tar.xz

+|   |       |-- kdenetwork-4.5.5.tar.xz

+|   |       |-- kdepim-4.4.10.tar.xz

+|   |       |-- kdepim-runtime-4.4.10.tar.xz

+|   |       |-- kdepimlibs-4.5.5.tar.xz

+|   |       |-- kdeplasma-addons-4.5.5.tar.xz

+|   |       |-- kdesdk-4.5.5.tar.xz

+|   |       |-- kdetoys-4.5.5.tar.xz

+|   |       |-- kdeutils-4.5.5.tar.xz

+|   |       |-- kdevelop-4.2.2.tar.xz

+|   |       |-- kdevplatform-1.2.2.tar.xz

+|   |       |-- kdewebdev-4.5.5.tar.xz

+|   |       |-- koffice-2.3.3.tar.xz

+|   |       |-- polkit-kde-1-r1145544.tar.xz

+|   |       |-- polkit-kde-agent-1-20101202git.tar.xz

+|   |       |-- polkit-kde-kcmodules-1-20101202git.tar.xz

+|   |       `-- polkit-qt-1-r1145513.tar.xz

 |   |-- kdei

 |   |   |-- kde-l10n

-|   |   |   |-- kde-l10n-ar-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-bg-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-ca-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-ca@valencia-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-cs-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-csb-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-da-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-de-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-el-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-en_GB-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-eo-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-es-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-et-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-eu-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-fi-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-fr-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-fy-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-ga-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-gl-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-gu-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-he-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-hi-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-hr-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-hu-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-id-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-is-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-it-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-ja-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-kk-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-km-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-kn-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-ko-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-lt-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-lv-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-mai-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-mk-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-ml-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-nb-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-nds-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-nl-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-nn-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-pa-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-pl-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-pt-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-pt_BR-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-ro-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-ru-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-si-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-sk-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-sl-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-sr-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-sv-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-tg-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-tr-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-uk-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-wa-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-zh_CN-4.4.3.tar.bz2

-|   |   |   |-- kde-l10n-zh_TW-4.4.3.tar.bz2

+|   |   |   |-- kde-l10n-ar-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-bg-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-ca-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-ca@valencia-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-cs-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-da-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-de-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-el-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-en_GB-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-eo-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-es-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-et-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-eu-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-fi-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-fr-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-fy-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-ga-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-gl-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-gu-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-he-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-hi-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-hr-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-hu-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-ia-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-id-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-is-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-it-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-ja-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-kk-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-km-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-kn-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-ko-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-lt-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-lv-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-ml-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-nb-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-nds-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-nl-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-nn-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-pa-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-pl-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-pt-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-pt_BR-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-ro-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-ru-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-sk-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-sl-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-sr-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-sv-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-th-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-tr-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-uk-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-wa-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-zh_CN-4.5.5.tar.bz2

+|   |   |   |-- kde-l10n-zh_TW-4.5.5.tar.bz2

 |   |   |   |-- kde-l10n.SlackBuild

+|   |   |   |-- kdepim-l10n

+|   |   |   |   |-- extract-kdepim-goodness.sh

+|   |   |   |   |-- kdepim-l10n-ar-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-bg-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-ca-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-ca@valencia-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-cs-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-csb-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-da-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-de-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-el-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-en_GB-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-eo-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-es-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-et-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-eu-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-fi-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-fr-4.4.5.korganizer.docbook.reorganize.diff.gz

+|   |   |   |   |-- kdepim-l10n-fr-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-fy-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-ga-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-gl-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-gu-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-he-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-hi-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-hr-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-hu-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-id-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-is-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-it-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-ja-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-kk-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-km-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-kn-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-ko-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-lt-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-lv-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-mai-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-mk-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-ml-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-nb-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-nds-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-nl-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-nn-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-pa-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-pl-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-pt-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-pt_BR-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-ro-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-ru-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-si-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-sk-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-sl-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-sr-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-sv-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-tg-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-tr-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-uk-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-wa-4.4.5.tar.bz2

+|   |   |   |   |-- kdepim-l10n-zh_CN-4.4.5.tar.bz2

+|   |   |   |   `-- kdepim-l10n-zh_TW-4.4.5.tar.bz2

 |   |   |   |-- languages

 |   |   |   |-- local.options

 |   |   |   `-- slack-desc

@@ -5831,6 +5796,7 @@ see additional documentation files.
 |   |   |       |-- slack-desc.kde-l10n-hne

 |   |   |       |-- slack-desc.kde-l10n-hr

 |   |   |       |-- slack-desc.kde-l10n-hu

+|   |   |       |-- slack-desc.kde-l10n-ia

 |   |   |       |-- slack-desc.kde-l10n-id

 |   |   |       |-- slack-desc.kde-l10n-is

 |   |   |       |-- slack-desc.kde-l10n-it

@@ -5869,35 +5835,36 @@ see additional documentation files.
 |   |   |       |-- slack-desc.kde-l10n-wa

 |   |   |       |-- slack-desc.kde-l10n-zh_CN

 |   |   |       `-- slack-desc.kde-l10n-zh_TW

-|   |   `-- koffice

-|   |       |-- koffice-l10n-ca-2.1.2.tar.bz2

-|   |       |-- koffice-l10n-ca@valencia-2.1.2.tar.bz2

-|   |       |-- koffice-l10n-da-2.1.2.tar.bz2

-|   |       |-- koffice-l10n-de-2.1.2.tar.bz2

-|   |       |-- koffice-l10n-el-2.1.2.tar.bz2

-|   |       |-- koffice-l10n-en_GB-2.1.2.tar.bz2

-|   |       |-- koffice-l10n-es-2.1.2.tar.bz2

-|   |       |-- koffice-l10n-et-2.1.2.tar.bz2

-|   |       |-- koffice-l10n-fr-2.1.2.tar.bz2

-|   |       |-- koffice-l10n-fy-2.1.2.tar.bz2

-|   |       |-- koffice-l10n-gl-2.1.2.tar.bz2

-|   |       |-- koffice-l10n-hne-2.1.2.tar.bz2

-|   |       |-- koffice-l10n-it-2.1.2.tar.bz2

-|   |       |-- koffice-l10n-ja-2.1.2.tar.bz2

-|   |       |-- koffice-l10n-kk-2.1.2.tar.bz2

-|   |       |-- koffice-l10n-nb-2.1.2.tar.bz2

-|   |       |-- koffice-l10n-nds-2.1.2.tar.bz2

-|   |       |-- koffice-l10n-nl-2.1.2.tar.bz2

-|   |       |-- koffice-l10n-pl-2.1.2.tar.bz2

-|   |       |-- koffice-l10n-pt-2.1.2.tar.bz2

-|   |       |-- koffice-l10n-pt_BR-2.1.2.tar.bz2

-|   |       |-- koffice-l10n-sv-2.1.2.tar.bz2

-|   |       |-- koffice-l10n-tr-2.1.2.tar.bz2

-|   |       |-- koffice-l10n-uk-2.1.2.tar.bz2

-|   |       |-- koffice-l10n-wa-2.1.2.tar.bz2

-|   |       |-- koffice-l10n-zh_CN-2.1.2.tar.bz2

-|   |       |-- koffice-l10n-zh_TW-2.1.2.tar.bz2

+|   |   `-- koffice-l10n

+|   |       |-- koffice-l10n-ca-2.3.2.tar.bz2

+|   |       |-- koffice-l10n-ca@valencia-2.3.2.tar.bz2

+|   |       |-- koffice-l10n-da-2.3.2.tar.bz2

+|   |       |-- koffice-l10n-de-2.3.2.tar.bz2

+|   |       |-- koffice-l10n-el-2.3.2.tar.bz2

+|   |       |-- koffice-l10n-en_GB-2.3.2.tar.bz2

+|   |       |-- koffice-l10n-es-2.3.2.tar.bz2

+|   |       |-- koffice-l10n-et-2.3.2.tar.bz2

+|   |       |-- koffice-l10n-fr-2.3.2.tar.bz2

+|   |       |-- koffice-l10n-gl-2.3.2.tar.bz2

+|   |       |-- koffice-l10n-hu-2.3.2.tar.bz2

+|   |       |-- koffice-l10n-it-2.3.2.tar.bz2

+|   |       |-- koffice-l10n-ja-2.3.2.tar.bz2

+|   |       |-- koffice-l10n-kk-2.3.2.tar.bz2

+|   |       |-- koffice-l10n-nb-2.3.2.tar.bz2

+|   |       |-- koffice-l10n-nds-2.3.2.tar.bz2

+|   |       |-- koffice-l10n-nl-2.3.2.tar.bz2

+|   |       |-- koffice-l10n-pl-2.3.2.tar.bz2

+|   |       |-- koffice-l10n-pt-2.3.2.tar.bz2

+|   |       |-- koffice-l10n-pt_BR-2.3.2.tar.bz2

+|   |       |-- koffice-l10n-ru-2.3.2.tar.bz2

+|   |       |-- koffice-l10n-sv-2.3.2.tar.bz2

+|   |       |-- koffice-l10n-tr-2.3.2.tar.bz2

+|   |       |-- koffice-l10n-uk-2.3.2.tar.bz2

+|   |       |-- koffice-l10n-wa-2.3.2.tar.bz2

+|   |       |-- koffice-l10n-zh_CN-2.3.2.tar.bz2

+|   |       |-- koffice-l10n-zh_TW-2.3.2.tar.bz2

 |   |       |-- koffice-l10n.SlackBuild

+|   |       |-- languages

 |   |       `-- slack-desc

 |   |           |-- slack-desc.koffice-l10n-af

 |   |           |-- slack-desc.koffice-l10n-ar

@@ -5971,28 +5938,26 @@ see additional documentation files.
 |   |           `-- slack-desc.koffice-l10n-zu

 |   |-- l

 |   |   |-- ConsoleKit

-|   |   |   |-- ConsoleKit-0.4.1.tar.bz2

-|   |   |   |-- ConsoleKit-20100129.tar.bz2

+|   |   |   |-- ConsoleKit-0.4.3.tar.xz

 |   |   |   |-- ConsoleKit.SlackBuild

+|   |   |   |-- consolekit-0.2.10-cleanup_console_tags.patch.gz

+|   |   |   |-- consolekit-0.4.2-revert.patch.gz

 |   |   |   |-- doinst.sh.gz

 |   |   |   |-- pam-foreground-compat.ck

-|   |   |   |-- patches

-|   |   |   |   |-- consolekit-0.2.10-cleanup_console_tags.patch.gz

-|   |   |   |   |-- consolekit-dbus-permissions.patch.gz

-|   |   |   |   `-- consolekit-skipvalidation.patch.gz

+|   |   |   |-- rc.consolekit

 |   |   |   `-- slack-desc

 |   |   |-- M2Crypto

-|   |   |   |-- M2Crypto-0.19.1.tar.bz2

+|   |   |   |-- M2Crypto-0.20.2.tar.xz

 |   |   |   |-- M2Crypto.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- PyQt

-|   |   |   |-- PyQt-x11-gpl-4.7.3.tar.xz

+|   |   |   |-- PyQt-x11-gpl-4.8.1.tar.xz

 |   |   |   |-- PyQt.SlackBuild

 |   |   |   |-- PyQt.info

 |   |   |   |-- PyQt.phonon.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- QScintilla

-|   |   |   |-- QScintilla-gpl-2.4.3.tar.xz

+|   |   |   |-- QScintilla-gpl-2.4.5.tar.xz

 |   |   |   |-- QScintilla.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- aalib

@@ -6001,13 +5966,12 @@ see additional documentation files.
 |   |   |   |-- slack-desc

 |   |   |   `-- slack-desc.11line

 |   |   |-- akonadi

-|   |   |   |-- README.html

-|   |   |   |-- akonadi-1.3.1.tar.bz2

+|   |   |   |-- akonadi-1.4.1.tar.bz2

 |   |   |   |-- akonadi.SlackBuild

 |   |   |   |-- doinst.sh.gz

 |   |   |   `-- slack-desc

 |   |   |-- alsa-lib

-|   |   |   |-- alsa-lib-1.0.23.tar.bz2

+|   |   |   |-- alsa-lib-1.0.24.1.tar.xz

 |   |   |   |-- alsa-lib.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- alsa-oss

@@ -6015,17 +5979,18 @@ see additional documentation files.
 |   |   |   |-- alsa-oss.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- apr

-|   |   |   |-- apr-1.3.9.tar.bz2

-|   |   |   |-- apr-1.3.9.tar.bz2.asc

+|   |   |   |-- apr-1.4.2.tar.bz2

+|   |   |   |-- apr-1.4.2.tar.bz2.asc

 |   |   |   |-- apr.SlackBuild

+|   |   |   |-- apr.apr_ring.h.gcc45.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- apr-util

-|   |   |   |-- apr-util-1.3.9.tar.bz2

-|   |   |   |-- apr-util-1.3.9.tar.bz2.asc

+|   |   |   |-- apr-util-1.3.10.tar.bz2

+|   |   |   |-- apr-util-1.3.10.tar.bz2.asc

 |   |   |   |-- apr-util.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- aspell

-|   |   |   |-- aspell-0.60.5.tar.bz2

+|   |   |   |-- aspell-0.60.6.tar.xz

 |   |   |   |-- aspell.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- aspell-dict

@@ -6113,15 +6078,15 @@ see additional documentation files.
 |   |   |   |-- aspell6-vi-0.01.1-1.tar.bz2

 |   |   |   `-- aspell6-yi-0.01.1-1.tar.bz2

 |   |   |-- atk

-|   |   |   |-- atk-1.30.0.tar.bz2

+|   |   |   |-- atk-1.32.0.tar.bz2

 |   |   |   |-- atk.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- attica

-|   |   |   |-- attica-0.1.3.tar.bz2

+|   |   |   |-- attica-0.1.4.tar.bz2

 |   |   |   |-- attica.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- audiofile

-|   |   |   |-- audiofile-0.2.6.tar.bz2

+|   |   |   |-- audiofile-0.2.7.tar.xz

 |   |   |   |-- audiofile.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- automoc4

@@ -6129,21 +6094,20 @@ see additional documentation files.
 |   |   |   |-- automoc4.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- babl

-|   |   |   |-- babl-0.1.0-build-fixes.patch.gz

-|   |   |   |-- babl-0.1.0.tar.bz2

+|   |   |   |-- babl-0.1.2.tar.xz

 |   |   |   |-- babl.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- boost

 |   |   |   |-- boost.SlackBuild

-|   |   |   |-- boost_1_42_0.tar.xz

+|   |   |   |-- boost_1_45_0.tar.xz

 |   |   |   `-- slack-desc

 |   |   |-- cairo

-|   |   |   |-- cairo-1.8.8.tar.xz

+|   |   |   |-- cairo-1.10.0-buggy_gradients.patch.gz

+|   |   |   |-- cairo-1.10.2.tar.xz

 |   |   |   |-- cairo.SlackBuild

-|   |   |   |-- cairo.libpng14.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- chmlib

-|   |   |   |-- chmlib-0.39.tar.bz2

+|   |   |   |-- chmlib-0.40.tar.bz2

 |   |   |   |-- chmlib.SlackBuild

 |   |   |   |-- chmlib.info

 |   |   |   `-- slack-desc

@@ -6167,7 +6131,7 @@ see additional documentation files.
 |   |   |   |-- patch.4.4.20.2.gz

 |   |   |   `-- slack-desc

 |   |   |-- dbus-glib

-|   |   |   |-- dbus-glib-0.86.tar.xz

+|   |   |   |-- dbus-glib-0.88.tar.xz

 |   |   |   |-- dbus-glib.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- dbus-python

@@ -6181,7 +6145,7 @@ see additional documentation files.
 |   |   |   |-- doinst.sh.gz

 |   |   |   `-- slack-desc

 |   |   |-- djvulibre

-|   |   |   |-- djvulibre-3.5.22.tar.xz

+|   |   |   |-- djvulibre-3.5.24.tar.xz

 |   |   |   |-- djvulibre.SlackBuild

 |   |   |   |-- djvulibre.info

 |   |   |   |-- doinst.sh.gz

@@ -6191,10 +6155,6 @@ see additional documentation files.
 |   |   |   |-- ebook-tools.SlackBuild

 |   |   |   |-- ebook-tools.paths.diff

 |   |   |   `-- slack-desc

-|   |   |-- eggdbus

-|   |   |   |-- eggdbus-0.6.tar.bz2

-|   |   |   |-- eggdbus.SlackBuild

-|   |   |   `-- slack-desc

 |   |   |-- eigen2

 |   |   |   |-- eigen2-2.0.10.tar.xz

 |   |   |   |-- eigen2.SlackBuild

@@ -6210,10 +6170,11 @@ see additional documentation files.
 |   |   |   |-- esound.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- exiv2

-|   |   |   |-- exiv2-0.18.2.tar.xz

+|   |   |   |-- exiv2-0.21.1.tar.xz

 |   |   |   |-- exiv2.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- expat

+|   |   |   |-- expat-2.0.1-fixes-3.patch.gz

 |   |   |   |-- expat-2.0.1.tar.gz

 |   |   |   |-- expat.SlackBuild

 |   |   |   `-- slack-desc

@@ -6222,9 +6183,8 @@ see additional documentation files.
 |   |   |   |-- fftw.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- freetype

-|   |   |   |-- freetype-2.3.12.tar.xz

+|   |   |   |-- freetype-2.4.4.tar.bz2

 |   |   |   |-- freetype.SlackBuild

-|   |   |   |-- freetype.bytecode.interpreter.diff.gz

 |   |   |   |-- freetype.illadvisederror.diff.gz

 |   |   |   |-- freetype.subpixel.rendering.diff.gz

 |   |   |   `-- slack-desc

@@ -6234,12 +6194,14 @@ see additional documentation files.
 |   |   |   `-- slack-desc

 |   |   |-- fuse

 |   |   |   |-- doinst.sh.gz

-|   |   |   |-- fuse-2.8.1.tar.gz

+|   |   |   |-- fuse-2.8.5.tar.xz

 |   |   |   |-- fuse.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- gamin

-|   |   |   |-- gamin-0.1.10.tar.bz2

+|   |   |   |-- doinst.sh.gz

+|   |   |   |-- gamin-0.1.10.tar.xz

 |   |   |   |-- gamin.SlackBuild

+|   |   |   |-- gaminrc.gz

 |   |   |   `-- slack-desc

 |   |   |-- gd

 |   |   |   |-- gd-2.0.35.tar.bz2

@@ -6251,8 +6213,15 @@ see additional documentation files.
 |   |   |   |-- gdbm-1.8.3.tar.gz

 |   |   |   |-- gdbm.SlackBuild

 |   |   |   `-- slack-desc

+|   |   |-- gdk-pixbuf2

+|   |   |   |-- doinst.sh.gz

+|   |   |   |-- gdk-pixbuf-2.23.3.tar.xz

+|   |   |   |-- gdk-pixbuf.pnglz.diff.gz

+|   |   |   |-- gdk-pixbuf2.SlackBuild

+|   |   |   |-- slack-desc

+|   |   |   `-- update-gdk-pixbuf-loaders

 |   |   |-- gegl

-|   |   |   |-- gegl-0.1.0.tar.bz2

+|   |   |   |-- gegl-0.1.2.tar.xz

 |   |   |   |-- gegl.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- giflib

@@ -6266,7 +6235,7 @@ see additional documentation files.
 |   |   |   `-- slack-desc

 |   |   |-- glib2

 |   |   |   |-- doinst.sh.gz

-|   |   |   |-- glib-2.22.5.tar.xz

+|   |   |   |-- glib-2.28.6.tar.xz

 |   |   |   |-- glib2.SlackBuild

 |   |   |   |-- libglib2.csh

 |   |   |   |-- libglib2.sh

@@ -6276,12 +6245,17 @@ see additional documentation files.
 |   |   |   |-- doinst.sh-glibc-solibs

 |   |   |   |-- doinst.sh-glibc-zoneinfo

 |   |   |   |-- glibc-2.10-dns-no-gethostbyname4.diff.gz

-|   |   |   |-- glibc-2.11.1.tar.xz

-|   |   |   |-- glibc-2.11.1.tar.xz.sig

+|   |   |   |-- glibc-2.13.tar.xz

+|   |   |   |-- glibc-2.13.tar.xz.sig

 |   |   |   |-- glibc-cvs-checkout.sh

 |   |   |   |-- glibc.SlackBuild

+|   |   |   |-- glibc.disable.broken.optimized.memcpy.diff.gz

 |   |   |   |-- glibc.getcwd.max.macro.diff.gz

+|   |   |   |-- glibc.git-4a531bb0b3b582cb693de9f76d2d97d970f9a5d5.patch.gz

+|   |   |   |-- glibc.git-96611391ad8823ba58405325d78cefeae5cdf699-CVE-2010-3847b.patch.gz

+|   |   |   |-- glibc.ldd.trace.through.dynamic.linker.diff.gz

 |   |   |   |-- glibc.locale.no-archive.diff.gz

+|   |   |   |-- glibc.make-3.82.diff.gz

 |   |   |   |-- glibc.nis-netgroups.diff.gz

 |   |   |   |-- glibc.revert.to.fix.build.breakages.diff.gz

 |   |   |   |-- glibc.ru_RU.CP1251.diff.gz

@@ -6307,8 +6281,8 @@ see additional documentation files.
 |   |   |   |   |   `-- README

 |   |   |   |   |-- setup.timeconfig

 |   |   |   |   `-- timeconfig

-|   |   |   |-- tzcode2010j.tar.gz

-|   |   |   `-- tzdata2010j.tar.gz

+|   |   |   |-- tzcode2011d.tar.gz

+|   |   |   `-- tzdata2011d.tar.gz

 |   |   |-- gmime

 |   |   |   |-- gmime-2.4.15.tar.xz

 |   |   |   |-- gmime.SlackBuild

@@ -6324,20 +6298,21 @@ see additional documentation files.
 |   |   |   `-- slack-desc

 |   |   |-- gnome-icon-theme

 |   |   |   |-- doinst.sh.gz

-|   |   |   |-- gnome-icon-theme-2.30.2.tar.xz

+|   |   |   |-- gnome-icon-theme-2.31.0.tar.xz

 |   |   |   |-- gnome-icon-theme.SlackBuild

 |   |   |   |-- gnome-icon-theme.pkgconfig.path.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- gst-plugins-base

-|   |   |   |-- gst-plugins-base-0.10.29.tar.xz

+|   |   |   |-- gst-plugins-base-0.10.32.tar.xz

 |   |   |   |-- gst-plugins-base.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- gst-plugins-good

-|   |   |   |-- gst-plugins-good-0.10.22.tar.xz

+|   |   |   |-- gst-plugins-good-0.10.28.tar.xz

+|   |   |   |-- gst-plugins-good.6b86b56abd8a28b9e94cee679e3d86367a9a0ab3.diff.gz

 |   |   |   |-- gst-plugins-good.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- gstreamer

-|   |   |   |-- gstreamer-0.10.29.tar.xz

+|   |   |   |-- gstreamer-0.10.32.tar.xz

 |   |   |   |-- gstreamer.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- gtk+

@@ -6347,19 +6322,21 @@ see additional documentation files.
 |   |   |   `-- slack-desc

 |   |   |-- gtk+2

 |   |   |   |-- doinst.sh.gz

-|   |   |   |-- gtk+-2.18.9.tar.xz

+|   |   |   |-- fix_build_issues_on_tutorial_and_faq.diff.gz

+|   |   |   |-- gtk+-2.24.4.tar.xz

+|   |   |   |-- gtk+-2.24.x.icon-compat.am.diff.gz

+|   |   |   |-- gtk+-2.24.x.icon-compat.diff.gz

 |   |   |   |-- gtk+2.SlackBuild

-|   |   |   |-- gtk.png14.diff.gz

-|   |   |   |-- gtk.pnglz.diff.gz

 |   |   |   |-- gtk.xid.nowarningflood.diff.gz

 |   |   |   |-- profile.d

 |   |   |   |   |-- gtk+.csh

 |   |   |   |   `-- gtk+.sh

 |   |   |   |-- slack-desc

-|   |   |   |-- update-gdk-pixbuf-loaders

-|   |   |   `-- update-gtk-immodules

+|   |   |   |-- update-gtk-immodules

+|   |   |   |-- update-gtk-immodules-2.0

+|   |   |   `-- use_host_triplet_for_gtk_immodules.diff.gz

 |   |   |-- gtkspell

-|   |   |   |-- gtkspell-2.0.15.tar.bz2

+|   |   |   |-- gtkspell-2.0.16.tar.xz

 |   |   |   |-- gtkspell.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- hal

@@ -6369,11 +6346,14 @@ see additional documentation files.
 |   |   |   |-- hal.conf.gz

 |   |   |   |-- patches

 |   |   |   |   |-- 10-keymap.fdi-restore_zap.diff.gz

+|   |   |   |   |-- fix-build-with-automake-1.11.1.patch.gz

+|   |   |   |   |-- fix-hal-segfault.patch.gz

 |   |   |   |   |-- fix_ioperm_arguments.patch.gz

 |   |   |   |   |-- fix_libusb_detection.diff.gz

 |   |   |   |   |-- fix_segfault-dbus_error_init.patch.gz

 |   |   |   |   |-- fix_segfault_in_LIBHAL_FREE_DBUS_ERROR.diff.gz

 |   |   |   |   |-- handle_input.touchpad_explicitly.diff.gz

+|   |   |   |   |-- ignore_internal_dm_devices.diff.gz

 |   |   |   |   `-- increase_HAL_PATH_MAX_to_4096.diff.gz

 |   |   |   |-- rc.hald.gz

 |   |   |   `-- slack-desc

@@ -6400,8 +6380,9 @@ see additional documentation files.
 |   |   |   |-- icon-naming-utils.pkgconfigdir.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- ilmbase

-|   |   |   |-- ilmbase-1.0.1.tar.bz2

+|   |   |   |-- ilmbase-1.0.2.tar.xz

 |   |   |   |-- ilmbase.SlackBuild

+|   |   |   |-- ilmbase.gcc4.diff.gz

 |   |   |   |-- ilmbase.info

 |   |   |   `-- slack-desc

 |   |   |-- imlib

@@ -6410,7 +6391,8 @@ see additional documentation files.
 |   |   |   |-- imlib.mitshm.render.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- iso-codes

-|   |   |   |-- iso-codes-3.8.tar.bz2

+|   |   |   |-- iso-codes-3.24.2.tar.bz2

+|   |   |   |-- iso-codes-3.24.2.tar.bz2.sig

 |   |   |   |-- iso-codes.SlackBuild

 |   |   |   |-- iso-codes.info

 |   |   |   `-- slack-desc

@@ -6418,18 +6400,7 @@ see additional documentation files.
 |   |   |   |-- jasper-1.900.1.tar.bz2

 |   |   |   |-- jasper.SlackBuild

 |   |   |   `-- slack-desc

-|   |   |-- jre

-|   |   |   |-- COPYRIGHT

-|   |   |   |-- LICENSE

-|   |   |   |-- README

-|   |   |   |-- THIRDPARTYLICENSEREADME.txt

-|   |   |   |-- Welcome.html

-|   |   |   |-- jre-6u20-linux-x64.bin

-|   |   |   |-- jre.SlackBuild

-|   |   |   |-- profile.d

-|   |   |   |   |-- jre.csh

-|   |   |   |   `-- jre.sh

-|   |   |   `-- slack-desc

+|   |   |-- jre -> ../local/jre

 |   |   |-- lcms

 |   |   |   |-- lcms-1.19.tar.xz

 |   |   |   |-- lcms.SlackBuild

@@ -6449,16 +6420,16 @@ see additional documentation files.
 |   |   |   |-- libaio.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- libao

-|   |   |   |-- libao-0.8.8.tar.gz

+|   |   |   |-- libao-1.1.0.tar.gz

 |   |   |   |-- libao.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- libarchive

-|   |   |   |-- libarchive-2.8.0.tar.xz

+|   |   |   |-- libarchive-2.8.4.tar.xz

 |   |   |   |-- libarchive.SlackBuild

 |   |   |   |-- libarchive.info

 |   |   |   `-- slack-desc

 |   |   |-- libart_lgpl

-|   |   |   |-- libart_lgpl-2.3.20.tar.bz2

+|   |   |   |-- libart_lgpl-2.3.21.tar.xz

 |   |   |   |-- libart_lgpl.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- libcaca

@@ -6468,19 +6439,23 @@ see additional documentation files.
 |   |   |-- libcap

 |   |   |   |-- README.SLACKWARE

 |   |   |   |-- capfaq-0.2.txt

-|   |   |   |-- libcap-2.19.tar.bz2

-|   |   |   |-- libcap-2.19.tar.bz2.sign

+|   |   |   |-- libcap-2.20.tar.sign

+|   |   |   |-- libcap-2.20.tar.xz

 |   |   |   |-- libcap.SlackBuild

 |   |   |   |-- libcap.capability.h.fix.broken.includes.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- libcddb

-|   |   |   |-- libcddb-1.3.0.tar.bz2

+|   |   |   |-- libcddb-1.3.2.tar.xz

 |   |   |   |-- libcddb.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- libcdio

 |   |   |   |-- libcdio-0.79.tar.bz2

 |   |   |   |-- libcdio.SlackBuild

 |   |   |   `-- slack-desc

+|   |   |-- libdbusmenu-qt

+|   |   |   |-- libdbusmenu-qt-0.6.4.tar.xz

+|   |   |   |-- libdbusmenu-qt.SlackBuild

+|   |   |   `-- slack-desc

 |   |   |-- libdiscid

 |   |   |   |-- libdiscid-0.2.2.tar.gz

 |   |   |   |-- libdiscid.SlackBuild

@@ -6489,8 +6464,12 @@ see additional documentation files.
 |   |   |   |-- libdvdread-4.1.3.tar.bz2

 |   |   |   |-- libdvdread.SlackBuild

 |   |   |   `-- slack-desc

+|   |   |-- libelf

+|   |   |   |-- libelf-0.8.13.tar.xz

+|   |   |   |-- libelf.SlackBuild

+|   |   |   `-- slack-desc

 |   |   |-- libexif

-|   |   |   |-- libexif-0.6.19.tar.xz

+|   |   |   |-- libexif-0.6.20.tar.xz

 |   |   |   |-- libexif.SlackBuild

 |   |   |   |-- libexif.pc.diff.gz

 |   |   |   `-- slack-desc

@@ -6499,20 +6478,21 @@ see additional documentation files.
 |   |   |   |-- libglade.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- libgphoto2

-|   |   |   |-- libgphoto2-2.4.9.tar.xz

+|   |   |   |-- libgphoto2-2.4.10.1.tar.xz

 |   |   |   |-- libgphoto2.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- libgpod

-|   |   |   |-- libgpod-0.7.2.tar.xz

+|   |   |   |-- doinst.sh.gz

+|   |   |   |-- libgpod-0.8.0.tar.xz

 |   |   |   |-- libgpod.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- libgsf

-|   |   |   |-- libgsf-1.14.16.tar.bz2

+|   |   |   |-- libgsf-1.14.20.tar.xz

 |   |   |   |-- libgsf.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- libical

 |   |   |   |-- README

-|   |   |   |-- libical-0.43.tar.bz2

+|   |   |   |-- libical-0.44.tar.xz

 |   |   |   |-- libical.SlackBuild

 |   |   |   |-- libical.info

 |   |   |   `-- slack-desc

@@ -6523,11 +6503,11 @@ see additional documentation files.
 |   |   |   |-- libid3tag.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- libidl

-|   |   |   |-- libIDL-0.8.10.tar.bz2

+|   |   |   |-- libIDL-0.8.14.tar.xz

 |   |   |   |-- libidl.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- libidn

-|   |   |   |-- libidn-1.5.tar.bz2

+|   |   |   |-- libidn-1.19.tar.xz

 |   |   |   |-- libidn.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- libieee1284

@@ -6547,7 +6527,7 @@ see additional documentation files.
 |   |   |   |-- libkarma.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- liblastfm

-|   |   |   |-- liblastfm-0.3.0.tar.bz2

+|   |   |   |-- liblastfm-0.3.3_f0b3239.tar.xz

 |   |   |   |-- liblastfm.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- libmad

@@ -6561,7 +6541,7 @@ see additional documentation files.
 |   |   |   |-- libmcrypt.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- libmcs

-|   |   |   |-- libmcs-0.7.1.tar.bz2

+|   |   |   |-- libmcs-0.7.2.tar.bz2

 |   |   |   |-- libmcs.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- libmng

@@ -6569,9 +6549,13 @@ see additional documentation files.
 |   |   |   |-- libmng.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- libmowgli

-|   |   |   |-- libmowgli-0.6.0.tar.bz2

+|   |   |   |-- libmowgli-0.7.1.tar.bz2

 |   |   |   |-- libmowgli.SlackBuild

 |   |   |   `-- slack-desc

+|   |   |-- libmpc

+|   |   |   |-- libmpc.SlackBuild

+|   |   |   |-- mpc-0.8.2.tar.xz

+|   |   |   `-- slack-desc

 |   |   |-- libmsn

 |   |   |   |-- libmsn-4.1.tar.bz2

 |   |   |   |-- libmsn.SlackBuild

@@ -6592,37 +6576,53 @@ see additional documentation files.
 |   |   |   |-- libnl.info

 |   |   |   `-- slack-desc

 |   |   |-- libnotify

-|   |   |   |-- libnotify-0.4.5.tar.xz

+|   |   |   |-- libnotify-0.5.2.tar.bz2

 |   |   |   |-- libnotify.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- libogg

-|   |   |   |-- libogg-1.1.4.tar.xz

+|   |   |   |-- libogg-1.2.2.tar.xz

 |   |   |   |-- libogg.SlackBuild

 |   |   |   `-- slack-desc

+|   |   |-- liboggz

+|   |   |   |-- liboggz-1.1.1.tar.xz

+|   |   |   |-- liboggz.SlackBuild

+|   |   |   `-- slack-desc

 |   |   |-- liboil

-|   |   |   |-- liboil-0.3.16.tar.xz

+|   |   |   |-- liboil-0.3.17.tar.xz

 |   |   |   |-- liboil.SlackBuild

 |   |   |   `-- slack-desc

+|   |   |-- libpcap

+|   |   |   |-- libpcap-1.1.1.tar.gz

+|   |   |   |-- libpcap-1.1.1.tar.gz.sig

+|   |   |   |-- libpcap.SlackBuild

+|   |   |   `-- slack-desc

+|   |   |-- libplist

+|   |   |   |-- libplist-1.3.tar.bz2

+|   |   |   |-- libplist.SlackBuild

+|   |   |   `-- slack-desc

 |   |   |-- libpng

-|   |   |   |-- libpng-1.2.43.tar.xz

-|   |   |   |-- libpng-1.4.2.tar.xz

+|   |   |   |-- libpng-1.2.44.tar.xz

+|   |   |   |-- libpng-1.4.5.tar.xz

 |   |   |   |-- libpng.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- libraw1394

 |   |   |   |-- README

-|   |   |   |-- libraw1394-2.0.5.tar.bz2

-|   |   |   |-- libraw1394-2.0.5.tar.sign

+|   |   |   |-- libraw1394-2.0.7.tar.sign

+|   |   |   |-- libraw1394-2.0.7.tar.xz

 |   |   |   |-- libraw1394.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- librsvg

-|   |   |   |-- librsvg-2.26.0.tar.bz2

+|   |   |   |-- librsvg-2.32.0.tar.bz2

 |   |   |   |-- librsvg.SlackBuild

-|   |   |   |-- librsvg_seamonkey-config.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- libsamplerate

 |   |   |   |-- libsamplerate-0.1.7.tar.xz

 |   |   |   |-- libsamplerate.SlackBuild

 |   |   |   `-- slack-desc

+|   |   |-- libsndfile

+|   |   |   |-- libsndfile-1.0.24.tar.xz

+|   |   |   |-- libsndfile.SlackBuild

+|   |   |   `-- slack-desc

 |   |   |-- libspectre

 |   |   |   |-- libspectre-0.2.5.tar.bz2

 |   |   |   |-- libspectre.SlackBuild

@@ -6640,13 +6640,16 @@ see additional documentation files.
 |   |   |   |-- libtheora.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- libtiff

+|   |   |   |-- libtiff-CVE-2011-0192.patch.gz

+|   |   |   |-- libtiff-CVE-2011-1167.patch.gz

 |   |   |   |-- libtiff.SlackBuild

 |   |   |   |-- slack-desc

-|   |   |   `-- tiff-3.9.2.tar.xz

+|   |   |   `-- tiff-3.9.4.tar.xz

 |   |   |-- libusb

-|   |   |   |-- libusb-1.0.6.tar.bz2

+|   |   |   |-- libusb-1.0.8.tar.bz2

 |   |   |   |-- libusb-compat-0.1.3.tar.bz2

 |   |   |   |-- libusb.SlackBuild

+|   |   |   |-- libusb.fix.debug.log.level.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- libvisual

 |   |   |   |-- libvisual-0.4.0.tar.bz2

@@ -6663,7 +6666,7 @@ see additional documentation files.
 |   |   |   |-- libvncserver.info

 |   |   |   `-- slack-desc

 |   |   |-- libvorbis

-|   |   |   |-- libvorbis-1.2.3.tar.xz

+|   |   |   |-- libvorbis-1.3.2.tar.xz

 |   |   |   |-- libvorbis.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- libwmf

@@ -6673,7 +6676,7 @@ see additional documentation files.
 |   |   |   |-- slack-desc

 |   |   |   `-- slack-desc-docs

 |   |   |-- libwnck

-|   |   |   |-- libwnck-2.28.0.tar.bz2

+|   |   |   |-- libwnck-2.30.6.tar.xz

 |   |   |   |-- libwnck.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- libwpd

@@ -6681,11 +6684,12 @@ see additional documentation files.
 |   |   |   |-- libwpd.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- libxklavier

-|   |   |   |-- libxklavier-5.0.tar.bz2

+|   |   |   |-- libxklavier-5.1.tar.xz

 |   |   |   |-- libxklavier.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- libxml2

-|   |   |   |-- libxml2-2.7.6.tar.xz

+|   |   |   |-- libxml2-2.7.8.broken.versioning.diff.gz

+|   |   |   |-- libxml2-2.7.8.tar.xz

 |   |   |   |-- libxml2.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- libxslt

@@ -6693,7 +6697,7 @@ see additional documentation files.
 |   |   |   |-- libxslt.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- libzip

-|   |   |   |-- libzip-0.9.tar.bz2

+|   |   |   |-- libzip-0.9.3.tar.bz2

 |   |   |   |-- libzip.SlackBuild

 |   |   |   |-- libzip.info

 |   |   |   `-- slack-desc

@@ -6707,11 +6711,11 @@ see additional documentation files.
 |   |   |   |-- loudmouth.stanzadrop.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- lzo

-|   |   |   |-- lzo-2.02.tar.gz

+|   |   |   |-- lzo-2.03.tar.xz

 |   |   |   |-- lzo.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- mhash

-|   |   |   |-- mhash-0.9.9.tar.bz2

+|   |   |   |-- mhash-0.9.9.9.tar.bz2

 |   |   |   |-- mhash.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- mm

@@ -6719,17 +6723,13 @@ see additional documentation files.
 |   |   |   |-- mm.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- mpfr

-|   |   |   |-- mpfr-2.4.2.tar.xz

+|   |   |   |-- mpfr-3.0.1.tar.xz

 |   |   |   |-- mpfr.SlackBuild

 |   |   |   |-- patches

-|   |   |   |   |-- patch01.gz

-|   |   |   |   |-- patch02.gz

-|   |   |   |   `-- patch03.gz

 |   |   |   `-- slack-desc

 |   |   |-- ncurses

 |   |   |   |-- Eterm.ti

-|   |   |   |-- ncurses-5.7.tar.gz

-|   |   |   |-- ncurses-5.7.tar.gz.asc

+|   |   |   |-- ncurses-5.9.tar.xz

 |   |   |   |-- ncurses.SlackBuild

 |   |   |   |-- ncurses.mkhashsize.diff.gz

 |   |   |   |-- patches

@@ -6738,7 +6738,7 @@ see additional documentation files.
 |   |   |   |-- slack-desc

 |   |   |   `-- xterm.terminfo

 |   |   |-- neon

-|   |   |   |-- neon-0.29.0.tar.xz

+|   |   |   |-- neon-0.29.5.tar.gz

 |   |   |   |-- neon.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- netpbm

@@ -6753,32 +6753,35 @@ see additional documentation files.
 |   |   |   |-- notify-python.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- openexr

-|   |   |   |-- openexr-1.6.1.tar.bz2

+|   |   |   |-- openexr-1.7.0.tar.xz

 |   |   |   |-- openexr.SlackBuild

-|   |   |   |-- openexr.gcc43.diff.gz

+|   |   |   |-- openexr.gcc4.diff.gz

 |   |   |   |-- openexr.info

 |   |   |   `-- slack-desc

 |   |   |-- pango

-|   |   |   |-- pango-1.26.2.tar.bz2

+|   |   |   |-- pango-1.28.4.tar.xz

 |   |   |   |-- pango.SlackBuild

 |   |   |   |-- pango.etc.host.location.diff.gz

 |   |   |   |-- slack-desc

 |   |   |   `-- update-pango-querymodules

 |   |   |-- parted

-|   |   |   |-- parted-2.2.tar.xz

+|   |   |   |-- parted-2.3.tar.xz

 |   |   |   |-- parted.SlackBuild

 |   |   |   |-- parted.SlackBuild.static

 |   |   |   |-- parted.configure.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- pcre

-|   |   |   |-- pcre-8.02.tar.bz2

-|   |   |   |-- pcre-8.02.tar.bz2.sig

+|   |   |   |-- pcre-8.12.tar.xz

 |   |   |   |-- pcre.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- phonon

-|   |   |   |-- phonon-4.4.1.tar.bz2

+|   |   |   |-- phonon-4.4.3.tar.bz2

 |   |   |   |-- phonon.SlackBuild

-|   |   |   |-- phonon.gstreamer.qt-4.5.1.diff.gz

+|   |   |   `-- slack-desc

+|   |   |-- phonon-mplayer

+|   |   |   |-- cmake_fixes.tar.gz

+|   |   |   |-- phonon-mplayer-20101213.tar.xz

+|   |   |   |-- phonon-mplayer.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- pil

 |   |   |   |-- Imaging-1.1.7.tar.xz

@@ -6791,21 +6794,25 @@ see additional documentation files.
 |   |   |   |-- pilot-link.png14.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- polkit

-|   |   |   |-- polkit-1-shadow.diff

-|   |   |   |-- polkit-1_14bdfd8.tar.bz2

+|   |   |   |-- CVE-2011-1485

+|   |   |   |   |-- 0001-PolkitUnixProcess-Clarify-that-the-real-uid-is-retur.patch

+|   |   |   |   |-- 0002-Make-PolkitUnixProcess-also-record-the-uid-of-the-pr.patch

+|   |   |   |   |-- 0003-Use-polkit_unix_process_get_uid-to-get-the-owner-of-.patch

+|   |   |   |   `-- 0004-pkexec-Avoid-TOCTTOU-problems-with-parent-process.patch

+|   |   |   |-- polkit-0.101.tar.xz

 |   |   |   |-- polkit.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- polkit-gnome

-|   |   |   |-- pkga.desktop-NotShowInKDE.diff.gz

-|   |   |   |-- polkit-gnome-0.96.tar.bz2

+|   |   |   |-- polkit-gnome-0.101.tar.xz

+|   |   |   |-- polkit-gnome-authentication-agent-1.desktop

 |   |   |   |-- polkit-gnome.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- poppler

-|   |   |   |-- poppler-0.12.4.tar.xz

+|   |   |   |-- poppler-0.16.4.tar.xz

 |   |   |   |-- poppler.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- poppler-data

-|   |   |   |-- poppler-data-0.4.0.tar.xz

+|   |   |   |-- poppler-data-0.4.4.tar.xz

 |   |   |   |-- poppler-data.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- popt

@@ -6813,26 +6820,27 @@ see additional documentation files.
 |   |   |   |-- popt.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- pycairo

-|   |   |   |-- pycairo-1.8.8.tar.xz

+|   |   |   |-- py2cairo-1.8.10.tar.xz

 |   |   |   |-- pycairo.SlackBuild

 |   |   |   |-- pycairo.url

 |   |   |   `-- slack-desc

 |   |   |-- pycups

-|   |   |   |-- pycups-1.9.48.tar.bz2

+|   |   |   |-- pycups-1.9.55.tar.bz2

 |   |   |   |-- pycups.SlackBuild

 |   |   |   |-- pycups.info

 |   |   |   `-- slack-desc

 |   |   |-- pygobject

-|   |   |   |-- pygobject-2.20.0.tar.bz2

+|   |   |   |-- pygobject-2.26.0.tar.bz2

 |   |   |   |-- pygobject.SlackBuild

+|   |   |   |-- pygobject.fix.no.introspection.crash.diff.gz

 |   |   |   |-- pygobject.url

 |   |   |   `-- slack-desc

 |   |   |-- pygtk

-|   |   |   |-- pygtk-2.16.0.tar.bz2

+|   |   |   |-- pygtk-2.22.0.tar.bz2

 |   |   |   |-- pygtk.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- pyrex

-|   |   |   |-- Pyrex-0.9.8.5.tar.bz2

+|   |   |   |-- Pyrex-0.9.9.tar.xz

 |   |   |   |-- Pyrex.url

 |   |   |   |-- pyrex.SlackBuild

 |   |   |   `-- slack-desc

@@ -6855,7 +6863,7 @@ see additional documentation files.
 |   |   |   |-- qca-ossl.nowhirlpool.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- qimageblitz

-|   |   |   |-- qimageblitz-r948358.tar.bz2

+|   |   |   |-- qimageblitz-0.0.6.tar.bz2

 |   |   |   |-- qimageblitz.SlackBuild

 |   |   |   |-- qimageblitz.info

 |   |   |   `-- slack-desc

@@ -6865,8 +6873,11 @@ see additional documentation files.
 |   |   |   |-- profile.d

 |   |   |   |   |-- qt4.csh

 |   |   |   |   `-- qt4.sh

-|   |   |   |-- qt-4.6.2_2d3d3e5.tar.xz

+|   |   |   |-- qt-4.7.0_7abde40.tar.xz

+|   |   |   |-- qt.QSortFilterProxyModel.reformatted.diff.gz

 |   |   |   |-- qt.SlackBuild

+|   |   |   |-- qt.blacklist.bad.certs.diff.gz

+|   |   |   |-- qt.blacklist.bad.certs.patch02.diff.gz

 |   |   |   |-- qt.mysql.h.diff.gz

 |   |   |   |-- qt.x86.cflags.diff.gz

 |   |   |   `-- slack-desc

@@ -6882,8 +6893,12 @@ see additional documentation files.
 |   |   |   |-- raptor.SlackBuild

 |   |   |   |-- raptor.info

 |   |   |   `-- slack-desc

+|   |   |-- raptor2

+|   |   |   |-- raptor2-2.0.0.tar.xz

+|   |   |   |-- raptor2.SlackBuild

+|   |   |   `-- slack-desc

 |   |   |-- rasqal

-|   |   |   |-- rasqal-0.9.19.tar.xz

+|   |   |   |-- rasqal-0.9.21.tar.xz

 |   |   |   |-- rasqal.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- readline

@@ -6918,7 +6933,7 @@ see additional documentation files.
 |   |   |   |-- readline.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- redland

-|   |   |   |-- redland-1.0.10.tar.xz

+|   |   |   |-- redland-1.0.12.tar.xz

 |   |   |   |-- redland.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- sdl

@@ -6927,27 +6942,28 @@ see additional documentation files.
 |   |   |   |-- SDL_mixer-1.2.11.tar.xz

 |   |   |   |-- SDL_mixer.usrlocal.diff.gz

 |   |   |   |-- SDL_net-1.2.7.tar.xz

-|   |   |   |-- SDL_ttf-2.0.9.tar.xz

+|   |   |   |-- SDL_ttf-2.0.10.tar.xz

 |   |   |   |-- sdl.SlackBuild

+|   |   |   |-- sdl.linux-2.6.31.input_absinfo.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- shared-desktop-ontologies

-|   |   |   |-- shared-desktop-ontologies-0.3.tar.bz2

+|   |   |   |-- shared-desktop-ontologies-0.5.tar.bz2

 |   |   |   |-- shared-desktop-ontologies.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- shared-mime-info

 |   |   |   |-- doinst.sh.gz

-|   |   |   |-- shared-mime-info-0.71.tar.bz2

+|   |   |   |-- shared-mime-info-0.90.tar.bz2

 |   |   |   |-- shared-mime-info.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- sip

-|   |   |   |-- sip-4.10.2.tar.xz

+|   |   |   |-- sip-4.11.2.tar.xz

 |   |   |   |-- sip.SlackBuild

 |   |   |   |-- sip.info

 |   |   |   `-- slack-desc

 |   |   |-- slang

 |   |   |   |-- slack-desc

-|   |   |   |-- slang-2.2.2.tar.bz2

-|   |   |   |-- slang-2.2.2.tar.bz2.asc

+|   |   |   |-- slang-2.2.3.tar.bz2

+|   |   |   |-- slang-2.2.3.tar.bz2.asc

 |   |   |   `-- slang.SlackBuild

 |   |   |-- slang1

 |   |   |   |-- slack-desc

@@ -6955,7 +6971,7 @@ see additional documentation files.
 |   |   |   `-- slang1.SlackBuild

 |   |   |-- soprano

 |   |   |   |-- slack-desc

-|   |   |   |-- soprano-2.4.3.tar.bz2

+|   |   |   |-- soprano-2.5.2.tar.bz2

 |   |   |   `-- soprano.SlackBuild

 |   |   |-- startup-notification

 |   |   |   |-- slack-desc

@@ -6976,15 +6992,17 @@ see additional documentation files.
 |   |   |-- system-config-printer

 |   |   |   |-- doinst.sh.gz

 |   |   |   |-- slack-desc

-|   |   |   |-- system-config-printer-1.2.2.tar.xz

+|   |   |   |-- system-config-printer-1.2.7.tar.xz

+|   |   |   |-- system-config-printer-1.2.7.tar.xz.sig

 |   |   |   `-- system-config-printer.SlackBuild

 |   |   |-- t1lib

 |   |   |   |-- slack-desc

 |   |   |   |-- t1lib-5.1.2.tar.xz

-|   |   |   `-- t1lib.SlackBuild

+|   |   |   |-- t1lib.SlackBuild

+|   |   |   `-- t1lib_5.1.2-3.diff.gz

 |   |   |-- taglib

 |   |   |   |-- slack-desc

-|   |   |   |-- taglib-1.6.2.tar.xz

+|   |   |   |-- taglib-1.6.3.tar.xz

 |   |   |   `-- taglib.SlackBuild

 |   |   |-- taglib-extras

 |   |   |   |-- slack-desc

@@ -7006,20 +7024,20 @@ see additional documentation files.
 |   |   |   `-- urwid.url

 |   |   |-- v4l-utils

 |   |   |   |-- slack-desc

-|   |   |   |-- v4l-utils-0.8.0.tar.xz

+|   |   |   |-- v4l-utils-0.8.3.tar.xz

 |   |   |   `-- v4l-utils.SlackBuild

 |   |   |-- virtuoso-ose

 |   |   |   |-- doinst.sh.gz

 |   |   |   |-- slack-desc

-|   |   |   |-- virtuoso-opensource-6.1.1.tar.xz

+|   |   |   |-- virtuoso-opensource-6.1.2.tar.xz

 |   |   |   `-- virtuoso-ose.SlackBuild

 |   |   |-- vte

 |   |   |   |-- slack-desc

-|   |   |   |-- vte-0.24.1.tar.bz2

+|   |   |   |-- vte-0.26.2.tar.xz

 |   |   |   `-- vte.SlackBuild

 |   |   |-- wavpack

 |   |   |   |-- slack-desc

-|   |   |   |-- wavpack-4.41.0.tar.bz2

+|   |   |   |-- wavpack-4.60.1.tar.bz2

 |   |   |   `-- wavpack.SlackBuild

 |   |   |-- wv2

 |   |   |   |-- slack-desc

@@ -7027,8 +7045,22 @@ see additional documentation files.
 |   |   |   `-- wv2.SlackBuild

 |   |   `-- zlib

 |   |       |-- slack-desc

-|   |       |-- zlib-1.2.3.tar.bz2

-|   |       `-- zlib.SlackBuild

+|   |       |-- zlib-1.2.5.tar.xz

+|   |       |-- zlib.SlackBuild

+|   |       `-- zlib.largefile64_source.diff.gz

+|   |-- local

+|   |   |-- README

+|   |   `-- jre

+|   |       |-- COPYRIGHT

+|   |       |-- README

+|   |       |-- THIRDPARTYLICENSEREADME.txt

+|   |       |-- Welcome.html

+|   |       |-- jre-6u25-linux-x64.bin

+|   |       |-- jre.SlackBuild

+|   |       |-- profile.d

+|   |       |   |-- jre.csh

+|   |       |   `-- jre.sh

+|   |       `-- slack-desc

 |   |-- n

 |   |   |-- alpine

 |   |   |   |-- alpine-2.00.tar.bz2

@@ -7058,12 +7090,10 @@ see additional documentation files.
 |   |   |   `-- slack-desc

 |   |   |-- bind

 |   |   |   |-- 3link.sh

-|   |   |   |-- bind-9.4.3-P4.tar.gz

-|   |   |   |-- bind-9.4.3-P4.tar.gz.asc

+|   |   |   |-- bind-9.7.3.tar.gz

+|   |   |   |-- bind-9.7.3.tar.gz.asc

 |   |   |   |-- bind.SlackBuild

-|   |   |   |-- bind.man.diff.gz

 |   |   |   |-- bind.so_bsdcompat.diff.gz

-|   |   |   |-- bind.var.run.named.diff.gz

 |   |   |   |-- caching-example

 |   |   |   |   |-- localhost.zone

 |   |   |   |   |-- named.conf

@@ -7073,7 +7103,8 @@ see additional documentation files.
 |   |   |   |-- rc.bind

 |   |   |   `-- slack-desc

 |   |   |-- bluez

-|   |   |   |-- bluez-4.64.tar.xz

+|   |   |   |-- bluez-4.91.tar.sign

+|   |   |   |-- bluez-4.91.tar.xz

 |   |   |   |-- bluez.SlackBuild

 |   |   |   |-- config

 |   |   |   |   |-- bluetooth.modprobe

@@ -7091,9 +7122,8 @@ see additional documentation files.
 |   |   |   |-- bluez-firmware.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- bluez-hcidump

-|   |   |   |-- bluez-hcidump-1.42.tar.bz2

+|   |   |   |-- bluez-hcidump-2.0.tar.xz

 |   |   |   |-- bluez-hcidump.SlackBuild

-|   |   |   |-- hci.c_for_bluez-4.61.patch.gz

 |   |   |   `-- slack-desc

 |   |   |-- bootp

 |   |   |   |-- _bootp.tar.gz

@@ -7103,7 +7133,7 @@ see additional documentation files.
 |   |   |   |-- bootptab.gz

 |   |   |   `-- slack-desc

 |   |   |-- bridge-utils

-|   |   |   |-- bridge-utils-1.2.tar.gz

+|   |   |   |-- bridge-utils-1.4.tar.gz

 |   |   |   |-- bridge-utils.SlackBuild

 |   |   |   |-- bridge-utils.isbridge.diff.gz

 |   |   |   `-- slack-desc

@@ -7112,6 +7142,14 @@ see additional documentation files.
 |   |   |   |-- bsd-finger-0.17.tar.gz

 |   |   |   |-- bsd-finger.SlackBuild

 |   |   |   `-- slack-desc

+|   |   |-- ca-certificates

+|   |   |   |-- ca-certificates.SlackBuild

+|   |   |   |-- ca-certificates_20090814.tar.gz

+|   |   |   |-- cacerts-20090814-fixup_DESTDIR.diff.gz

+|   |   |   |-- cacerts-20090814-fixup_update-ca-certificates.diff.gz

+|   |   |   |-- cacerts-20090814-remove_debconf.diff.gz

+|   |   |   |-- doinst.sh.gz

+|   |   |   `-- slack-desc

 |   |   |-- crda

 |   |   |   |-- crda-1.1.1.tar.bz2

 |   |   |   |-- crda.SlackBuild

@@ -7120,8 +7158,8 @@ see additional documentation files.
 |   |   |   `-- wireless-regdb-git_20100502.tar.bz2

 |   |   |-- curl

 |   |   |   |-- cacert.pem.bz2

-|   |   |   |-- curl-7.20.1.tar.bz2

-|   |   |   |-- curl-7.20.1.tar.bz2.asc

+|   |   |   |-- curl-7.21.4.tar.bz2

+|   |   |   |-- curl-7.21.4.tar.bz2.asc

 |   |   |   |-- curl.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- cyrus-sasl

@@ -7132,23 +7170,25 @@ see additional documentation files.
 |   |   |   `-- slack-desc

 |   |   |-- dhcp

 |   |   |   |-- dhclient-script.PATH.diff.gz

-|   |   |   |-- dhcp-4.1.1.tar.xz

+|   |   |   |-- dhcp-4.2.1-P1.tar.gz

+|   |   |   |-- dhcp-4.2.1-P1.tar.gz.asc

+|   |   |   |-- dhcp-remove-bind-tarball.sh

 |   |   |   |-- dhcp.SlackBuild

 |   |   |   |-- doinst.sh.gz

 |   |   |   `-- slack-desc

 |   |   |-- dhcpcd

 |   |   |   |-- 50-ntp.conf.diff.gz

 |   |   |   |-- COPYRIGHT.gz

-|   |   |   |-- dhcpcd-5.2.2.tar.bz2

+|   |   |   |-- dhcpcd-5.2.11.tar.bz2

 |   |   |   |-- dhcpcd.SlackBuild

 |   |   |   |-- doinst.sh.gz

 |   |   |   `-- slack-desc

 |   |   |-- dirmngr

-|   |   |   |-- dirmngr-1.0.3.tar.bz2

+|   |   |   |-- dirmngr-1.1.0.tar.xz

 |   |   |   |-- dirmngr.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- dnsmasq

-|   |   |   |-- dnsmasq-2.52.tar.xz

+|   |   |   |-- dnsmasq-2.57.tar.xz

 |   |   |   |-- dnsmasq.SlackBuild

 |   |   |   |-- dnsmasq.leasedir.diff.gz

 |   |   |   |-- doinst.sh.gz

@@ -7165,30 +7205,29 @@ see additional documentation files.
 |   |   |   |-- epic5.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- ethtool

-|   |   |   |-- ethtool-2.6.33.tar.gz

+|   |   |   |-- ethtool-2.6.36.tar.xz

 |   |   |   |-- ethtool.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- fetchmail

-|   |   |   |-- fetchmail-6.3.17.tar.bz2

-|   |   |   |-- fetchmail-6.3.17.tar.bz2.asc

+|   |   |   |-- fetchmail-6.3.19.tar.xz

+|   |   |   |-- fetchmail-6.3.19.tar.xz.asc

 |   |   |   |-- fetchmail.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- getmail

-|   |   |   |-- getmail-4.17.0.tar.gz

+|   |   |   |-- getmail-4.20.0.tar.gz

 |   |   |   |-- getmail.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- gnupg

-|   |   |   |-- gnupg-1.4.10.tar.bz2

-|   |   |   |-- gnupg-1.4.10.tar.bz2.sig

+|   |   |   |-- gnupg-1.4.11.tar.bz2

+|   |   |   |-- gnupg-1.4.11.tar.bz2.sig

 |   |   |   |-- gnupg.SlackBuild

 |   |   |   `-- slack-desc.gnupg

 |   |   |-- gnupg2

-|   |   |   |-- gnupg-2.0.14-encode-s2k.patch.gz

-|   |   |   |-- gnupg-2.0.14.tar.xz

+|   |   |   |-- gnupg-2.0.17.tar.xz

 |   |   |   |-- gnupg2.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- gnutls

-|   |   |   |-- gnutls-2.8.6.tar.xz

+|   |   |   |-- gnutls-2.10.5.tar.xz

 |   |   |   |-- gnutls.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- gpa

@@ -7197,8 +7236,8 @@ see additional documentation files.
 |   |   |   |-- gpa.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- gpgme

-|   |   |   |-- gpgme-1.2.0.tar.bz2

-|   |   |   |-- gpgme-1.2.0.tar.bz2.sig

+|   |   |   |-- gpgme-1.3.0.tar.bz2

+|   |   |   |-- gpgme-1.3.0.tar.bz2.sig

 |   |   |   |-- gpgme.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- htdig

@@ -7212,11 +7251,13 @@ see additional documentation files.
 |   |   |   |-- README

 |   |   |   |-- config.layout.diff.gz

 |   |   |   |-- doinst.sh.gz

-|   |   |   |-- httpd-2.2.15.tar.bz2

-|   |   |   |-- httpd-2.2.15.tar.bz2.asc

+|   |   |   |-- httpd-2.2.17.tar.bz2

+|   |   |   |-- httpd-2.2.17.tar.bz2.asc

 |   |   |   |-- httpd.SlackBuild

+|   |   |   |-- httpd.brigade_move.__noinline__.gcc451.diff.gz

 |   |   |   |-- httpd.nossldefault.diff.gz

 |   |   |   |-- httpd.runasapache.diff.gz

+|   |   |   |-- httpd.url

 |   |   |   |-- logrotate.httpd

 |   |   |   |-- rc.httpd

 |   |   |   `-- slack-desc

@@ -7225,6 +7266,11 @@ see additional documentation files.
 |   |   |   |-- icmpinfo-1.11.tar.gz

 |   |   |   |-- icmpinfo.SlackBuild

 |   |   |   `-- slack-desc

+|   |   |-- idnkit

+|   |   |   |-- idnkit-1.0-src.tar.xz

+|   |   |   |-- idnkit.SlackBuild

+|   |   |   `-- slack-desc

+|   |   |-- imapd -> alpine

 |   |   |-- inetd

 |   |   |   |-- _inetd.tar.gz

 |   |   |   |-- inetd-OpenBSD-1.79.diff.gz

@@ -7234,23 +7280,21 @@ see additional documentation files.
 |   |   |   `-- slack-desc

 |   |   |-- iproute2

 |   |   |   |-- doinst.sh.gz

-|   |   |   |-- iproute2-2.6.33-fixup_dbpath_and_iptablespath.diff.gz

-|   |   |   |-- iproute2-2.6.33.tar.bz2

-|   |   |   |-- iproute2-2.6.33.tar.bz2.sig

+|   |   |   |-- iproute2-2.6.37.tar.bz2

+|   |   |   |-- iproute2-2.6.37.tar.bz2.sig

 |   |   |   |-- iproute2.SlackBuild

+|   |   |   |-- iproute2.fixup_dbpath_and_iptablespath.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- iptables

-|   |   |   |-- iptables-1.4.7.tar.bz2

+|   |   |   |-- iptables-1.4.10.tar.bz2

 |   |   |   |-- iptables.SlackBuild

 |   |   |   `-- slack-desc

-|   |   |-- iptraf

-|   |   |   |-- iptraf-3.0.0.tar.gz

-|   |   |   |-- iptraf.SlackBuild

-|   |   |   |-- iptraf.paths.diff.gz

-|   |   |   |-- iptraf_3.0.0-6.diff.gz

+|   |   |-- iptraf-ng

+|   |   |   |-- iptraf-ng-1.0.2.tar.xz

+|   |   |   |-- iptraf-ng.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- iputils

-|   |   |   |-- iputils-s20100418.tar.bz2

+|   |   |   |-- iputils-s20101006.tar.bz2

 |   |   |   |-- iputils.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- ipw2100-fw

@@ -7268,10 +7312,14 @@ see additional documentation files.
 |   |   |   |-- irssi.ssl_proxy.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- iw

-|   |   |   |-- iw-0.9.14.tar.bz2

+|   |   |   |-- iw-0.9.20.tar.bz2

 |   |   |   |-- iw.SlackBuild

 |   |   |   |-- iw.info

 |   |   |   `-- slack-desc

+|   |   |-- iwlwifi-100-ucode

+|   |   |   |-- iwlwifi-100-ucode-39.31.5.1.tar.xz

+|   |   |   |-- iwlwifi-100-ucode.SlackBuild

+|   |   |   `-- slack-desc

 |   |   |-- iwlwifi-1000-ucode

 |   |   |   |-- iwlwifi-1000-ucode-128.50.3.1.tar.xz

 |   |   |   |-- iwlwifi-1000-ucode.SlackBuild

@@ -7287,8 +7335,9 @@ see additional documentation files.
 |   |   |   |-- iwlwifi-4965-ucode.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- iwlwifi-5000-ucode

-|   |   |   |-- iwlwifi-5000-ucode-5.4.A.11.tar.bz2

-|   |   |   |-- iwlwifi-5000-ucode-8.24.2.12.tar.bz2

+|   |   |   |-- iwlwifi-5000-ucode-5.4.A.11.tar.xz

+|   |   |   |-- iwlwifi-5000-ucode-8.24.2.12.tar.xz

+|   |   |   |-- iwlwifi-5000-ucode-8.83.5.1.tar.xz

 |   |   |   |-- iwlwifi-5000-ucode.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- iwlwifi-5150-ucode

@@ -7296,31 +7345,38 @@ see additional documentation files.
 |   |   |   |-- iwlwifi-5150-ucode.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- iwlwifi-6000-ucode

-|   |   |   |-- iwlwifi-6000-ucode-9.193.4.1.tar.xz

+|   |   |   |-- iwlwifi-6000-ucode-9.221.4.1.tar.xz

 |   |   |   |-- iwlwifi-6000-ucode.SlackBuild

 |   |   |   `-- slack-desc

+|   |   |-- iwlwifi-6xxx-ucode

+|   |   |   |-- iwlwifi-6000g2a-ucode-17.168.5.2.tar.xz

+|   |   |   |-- iwlwifi-6000g2b-ucode-17.168.5.2.tar.xz

+|   |   |   |-- iwlwifi-6050-ucode-41.28.5.1.tar.xz

+|   |   |   |-- iwlwifi-6xxx-ucode.SlackBuild

+|   |   |   `-- slack-desc

 |   |   |-- lftp

 |   |   |   |-- doinst.sh.gz

-|   |   |   |-- lftp-4.0.7.tar.bz2

+|   |   |   |-- lftp-4.2.2.tar.xz

 |   |   |   |-- lftp.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- libassuan

-|   |   |   |-- libassuan-1.0.5.tar.bz2

-|   |   |   |-- libassuan-1.0.5.tar.bz2.sig

+|   |   |   |-- libassuan-2.0.1.tar.bz2

+|   |   |   |-- libassuan-2.0.1.tar.bz2.sig

 |   |   |   |-- libassuan.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- libgcrypt

-|   |   |   |-- libgcrypt-1.4.5.tar.bz2

-|   |   |   |-- libgcrypt-1.4.5.tar.bz2.sig

+|   |   |   |-- libgcrypt-1.4.6.tar.bz2

+|   |   |   |-- libgcrypt-1.4.6.tar.bz2.sig

 |   |   |   |-- libgcrypt.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- libgpg-error

-|   |   |   |-- libgpg-error-1.7.tar.bz2

+|   |   |   |-- libgpg-error-1.9.tar.bz2

+|   |   |   |-- libgpg-error-1.9.tar.bz2.sig

 |   |   |   |-- libgpg-error.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- libksba

-|   |   |   |-- libksba-1.0.7.tar.bz2

-|   |   |   |-- libksba-1.0.7.tar.bz2.sig

+|   |   |   |-- libksba-1.2.0.tar.bz2

+|   |   |   |-- libksba-1.2.0.tar.bz2.sig

 |   |   |   |-- libksba.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- links

@@ -7339,23 +7395,25 @@ see additional documentation files.
 |   |   |   |-- mailx.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- mcabber

-|   |   |   |-- mcabber-0.10.0.tar.bz2

+|   |   |   |-- mcabber-0.10.1.tar.bz2

 |   |   |   |-- mcabber.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- metamail

 |   |   |   |-- metamail-2.7.tar.xz

 |   |   |   |-- metamail.SlackBuild

 |   |   |   |-- metamail.automake.diff.xz

-|   |   |   |-- metamail_2.7-52.diff.xz

+|   |   |   |-- metamail.uue.getline.diff.gz

+|   |   |   |-- metamail_2.7-54.diff.xz

 |   |   |   `-- slack-desc

 |   |   |-- mtr

-|   |   |   |-- mtr-0.75.tar.xz

+|   |   |   |-- mtr-0.80.tar.xz

 |   |   |   |-- mtr.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- mutt

 |   |   |   |-- doinst.sh.gz

-|   |   |   |-- mutt-1.4.2.3.tar.bz2

+|   |   |   |-- mutt-1.5.21.tar.xz

 |   |   |   |-- mutt.SlackBuild

+|   |   |   |-- mutt.gpgme.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- nc

 |   |   |   |-- nc-110-21.diff.gz

@@ -7364,13 +7422,14 @@ see additional documentation files.
 |   |   |   |-- nc110.tgz

 |   |   |   `-- slack-desc

 |   |   |-- ncftp

-|   |   |   |-- ncftp-3.2.4-src.tar.bz2

+|   |   |   |-- ncftp-3.2.5-src.tar.bz2

 |   |   |   |-- ncftp.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- net-snmp

 |   |   |   |-- doinst.sh.gz

-|   |   |   |-- net-snmp-5.5.tar.xz

+|   |   |   |-- net-snmp-5.6.1.tar.xz

 |   |   |   |-- net-snmp.SlackBuild

+|   |   |   |-- net-snmp.net-snmp-create-v3-user.etc.snmpd.conf.diff.gz

 |   |   |   |-- rc.snmpd

 |   |   |   |-- slack-desc

 |   |   |   `-- snmpd.conf.gz

@@ -7380,7 +7439,10 @@ see additional documentation files.
 |   |   |   |-- net-tools-1.60.tar.bz2

 |   |   |   |-- net-tools.SlackBuild

 |   |   |   |-- net-tools.diff.gz

-|   |   |   |-- net-tools_1.60-19.diff.gz

+|   |   |   |-- net-tools.mii-tool.string.diff.gz

+|   |   |   |-- net-tools.struct.x25_address.gcc4.diff.gz

+|   |   |   |-- net-tools.switch.default.gcc4.diff.gz

+|   |   |   |-- net-tools_1.60-23.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- netatalk

 |   |   |   |-- afppasswd

@@ -7491,14 +7553,15 @@ see additional documentation files.
 |   |   |   `-- slack-desc

 |   |   |-- nfs-utils

 |   |   |   |-- _nfs-utils.tar.gz

-|   |   |   |-- nfs-utils-1.2.2.tar.bz2

-|   |   |   |-- nfs-utils-1.2.2.tar.bz2.sign

+|   |   |   |-- doinst.sh.gz

+|   |   |   |-- nfs-utils-1.2.3.tar.sign

+|   |   |   |-- nfs-utils-1.2.3.tar.xz

 |   |   |   |-- nfs-utils.SlackBuild

 |   |   |   |-- nfs-utils.lwrap.needs.lnsl.diff.gz

 |   |   |   |-- rc.nfsd

 |   |   |   `-- slack-desc

 |   |   |-- nmap

-|   |   |   |-- nmap-5.21.tar.xz

+|   |   |   |-- nmap-5.51.tar.xz

 |   |   |   |-- nmap.SlackBuild

 |   |   |   |-- nmap.ndiff.mandir.diff.gz

 |   |   |   `-- slack-desc

@@ -7515,7 +7578,7 @@ see additional documentation files.
 |   |   |   `-- slack-desc

 |   |   |-- ntp

 |   |   |   |-- doinst.sh.gz

-|   |   |   |-- ntp-4.2.6p1.tar.xz

+|   |   |   |-- ntp-4.2.6p3.tar.xz

 |   |   |   |-- ntp.SlackBuild

 |   |   |   |-- ntp.conf

 |   |   |   |-- ntp.keys

@@ -7538,7 +7601,7 @@ see additional documentation files.
 |   |   |   `-- slack-desc

 |   |   |-- openldap-client

 |   |   |   |-- doinst.sh.gz

-|   |   |   |-- openldap-2.4.21.tar.xz

+|   |   |   |-- openldap-2.4.23.tar.xz

 |   |   |   |-- openldap-client.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- openobex

@@ -7547,8 +7610,8 @@ see additional documentation files.
 |   |   |   `-- slack-desc

 |   |   |-- openssh

 |   |   |   |-- doinst.sh.gz

-|   |   |   |-- openssh-5.5p1.tar.gz

-|   |   |   |-- openssh-5.5p1.tar.gz.asc

+|   |   |   |-- openssh-5.8p1.tar.gz

+|   |   |   |-- openssh-5.8p1.tar.gz.asc

 |   |   |   |-- openssh.SlackBuild

 |   |   |   |-- rc.sshd

 |   |   |   `-- slack-desc

@@ -7556,7 +7619,7 @@ see additional documentation files.
 |   |   |   |-- certwatch.gz

 |   |   |   |-- doinst.sh-openssl-solibs.gz

 |   |   |   |-- doinst.sh-openssl.gz

-|   |   |   |-- openssl-0.9.8n.tar.xz

+|   |   |   |-- openssl-0.9.8r.tar.xz

 |   |   |   |-- openssl.SlackBuild

 |   |   |   |-- openssl.optsx86.diff.gz

 |   |   |   |-- openssl.soname.diff.gz

@@ -7564,21 +7627,20 @@ see additional documentation files.
 |   |   |   `-- slack-desc.openssl-solibs

 |   |   |-- openvpn

 |   |   |   |-- README

-|   |   |   |-- openvpn-2.1.1.tar.gz

-|   |   |   |-- openvpn-2.1.1.tar.gz.asc

+|   |   |   |-- openvpn-2.1.4.tar.gz

+|   |   |   |-- openvpn-2.1.4.tar.gz.asc

 |   |   |   |-- openvpn.SlackBuild

 |   |   |   |-- openvpn.conf.sample

 |   |   |   `-- slack-desc

 |   |   |-- php

 |   |   |   |-- doinst.sh.gz

+|   |   |   |-- fetch-php.sh

 |   |   |   |-- mod_php.conf.example

 |   |   |   |-- pear

-|   |   |   |-- php-5.2.13.tar.xz

+|   |   |   |-- php-5.3.6.tar.xz

 |   |   |   |-- php.SlackBuild

-|   |   |   |-- php.gd_libpng-1.4.diff.gz

-|   |   |   |-- php.gmp5.diff.gz

-|   |   |   |-- php.ini.diff.gz

-|   |   |   |-- php.recommended.ini.diff.gz

+|   |   |   |-- php.ini-development.diff.gz

+|   |   |   |-- php.session.save_path.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- pidentd

 |   |   |   |-- doinst.sh.gz

@@ -7588,7 +7650,7 @@ see additional documentation files.
 |   |   |   |-- pidentd.conf.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- pinentry

-|   |   |   |-- pinentry-0.8.0.tar.xz

+|   |   |   |-- pinentry-0.8.1.tar.xz

 |   |   |   |-- pinentry.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- popa3d

@@ -7634,11 +7696,11 @@ see additional documentation files.
 |   |   |   |-- etc

 |   |   |   |   |-- ftpusers

 |   |   |   |   `-- proftpd.conf

-|   |   |   |-- proftpd-1.3.3.tar.xz

+|   |   |   |-- proftpd-1.3.3e.tar.xz

 |   |   |   |-- proftpd.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- pssh

-|   |   |   |-- pssh-2.1.1.tar.gz

+|   |   |   |-- pssh-2.2.tar.gz

 |   |   |   |-- pssh.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- pth

@@ -7663,13 +7725,18 @@ see additional documentation files.
 |   |   |   |-- rdist-eu-license.txt

 |   |   |   |-- rdist.SlackBuild

 |   |   |   `-- slack-desc

+|   |   |-- rfkill

+|   |   |   |-- rfkill-0.4.tar.bz2

+|   |   |   |-- rfkill.SlackBuild

+|   |   |   |-- rfkill.url

+|   |   |   `-- slack-desc

 |   |   |-- rp-pppoe

 |   |   |   |-- doinst.sh.gz

 |   |   |   |-- rp-pppoe-3.10.tar.gz

 |   |   |   |-- rp-pppoe.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- rsync

-|   |   |   |-- rsync-3.0.7.tar.xz

+|   |   |   |-- rsync-3.0.8.tar.xz

 |   |   |   |-- rsync.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- rt2860-firmware

@@ -7690,13 +7757,15 @@ see additional documentation files.
 |   |   |   `-- slack-desc

 |   |   |-- samba

 |   |   |   |-- doinst.sh.gz

+|   |   |   |-- prune-samba.sh

 |   |   |   |-- rc.samba

-|   |   |   |-- samba-3.5.2.tar.xz

+|   |   |   |-- samba-3.5.8.tar.xz

 |   |   |   |-- samba.SlackBuild

 |   |   |   |-- slack-desc

 |   |   |   |-- smb.conf.default

 |   |   |   |-- smb.conf.default.orig

-|   |   |   `-- smb.conf.diff.gz

+|   |   |   |-- smb.conf.diff.gz

+|   |   |   `-- talloc.pc

 |   |   |-- sendmail

 |   |   |   |-- Build.gz

 |   |   |   |-- SlackBuild

@@ -7726,20 +7795,17 @@ see additional documentation files.
 |   |   |   |-- doinst.sh.gz

 |   |   |   |-- generate-stunnel-key.sh

 |   |   |   |-- slack-desc

-|   |   |   |-- stunnel-4.33.tar.gz

-|   |   |   |-- stunnel-4.33.tar.gz.asc

+|   |   |   |-- stunnel-4.35.tar.gz

+|   |   |   |-- stunnel-4.35.tar.gz.asc

 |   |   |   `-- stunnel.SlackBuild

 |   |   |-- tcp_wrappers

 |   |   |   |-- slack-desc

 |   |   |   |-- tcp_wrappers.SlackBuild

 |   |   |   `-- tcp_wrappers_7.6.tar.gz

 |   |   |-- tcpdump

-|   |   |   |-- libpcap-1.0.0.tar.gz

-|   |   |   |-- libpcap-1.0.0.tar.gz.sig

-|   |   |   |-- libpcap.20-fix-any-intf.diff.gz

 |   |   |   |-- slack-desc

-|   |   |   |-- tcpdump-4.0.0.tar.gz

-|   |   |   |-- tcpdump-4.0.0.tar.gz.sig

+|   |   |   |-- tcpdump-4.1.1.tar.gz

+|   |   |   |-- tcpdump-4.1.1.tar.gz.sig

 |   |   |   `-- tcpdump.SlackBuild

 |   |   |-- telnet

 |   |   |   |-- netkit-telnet-0.17-ayt.patch.gz

@@ -7757,12 +7823,12 @@ see additional documentation files.
 |   |   |   `-- tftp-hpa.SlackBuild

 |   |   |-- tin

 |   |   |   |-- slack-desc

-|   |   |   |-- tin-1.8.2.tar.bz2

-|   |   |   |-- tin-1.8.2.tar.bz2.sign

+|   |   |   |-- tin-1.8.3.tar.bz2

+|   |   |   |-- tin-1.8.3.tar.bz2.sign

 |   |   |   `-- tin.SlackBuild

 |   |   |-- traceroute

 |   |   |   |-- slack-desc

-|   |   |   |-- traceroute-2.0.14.tar.gz

+|   |   |   |-- traceroute-2.0.17.tar.gz

 |   |   |   `-- traceroute.SlackBuild

 |   |   |-- trn

 |   |   |   |-- _trn.tar.gz

@@ -7784,7 +7850,7 @@ see additional documentation files.
 |   |   |-- vsftpd

 |   |   |   |-- doinst.sh.gz

 |   |   |   |-- slack-desc

-|   |   |   |-- vsftpd-2.2.2.tar.gz

+|   |   |   |-- vsftpd-2.3.4.tar.gz

 |   |   |   |-- vsftpd.SlackBuild

 |   |   |   |-- vsftpd.builddefs.diff.gz

 |   |   |   |-- vsftpd.conf.diff.gz

@@ -7797,7 +7863,7 @@ see additional documentation files.
 |   |   |-- whois

 |   |   |   |-- slack-desc

 |   |   |   |-- whois.SlackBuild

-|   |   |   `-- whois_5.0.2.tar.gz

+|   |   |   `-- whois_5.0.11.tar.gz

 |   |   |-- wireless-tools

 |   |   |   |-- doinst.sh.gz

 |   |   |   |-- scripts

@@ -7810,9 +7876,11 @@ see additional documentation files.
 |   |   |   `-- wireless_tools.static.diff.gz

 |   |   |-- wpa_supplicant

 |   |   |   |-- README.slackware

+|   |   |   |-- fi.epitest.hostap.WPASupplicant.service

+|   |   |   |-- hostap-07.git-b80b5639935d37b95d00f86b57f2844a9c775f57.patch.gz

 |   |   |   |-- slack-desc

 |   |   |   |-- wpa_gui.png

-|   |   |   |-- wpa_supplicant-0.6.10.tar.xz

+|   |   |   |-- wpa_supplicant-0.7.3.tar.xz

 |   |   |   |-- wpa_supplicant.SlackBuild

 |   |   |   `-- wpa_supplicant.defconfig

 |   |   |-- yptools

@@ -7821,10 +7889,10 @@ see additional documentation files.
 |   |   |   |-- slack-desc

 |   |   |   |-- yp-tools-2.12.tar.bz2

 |   |   |   |-- yp-tools-2.12.tar.bz2.sign

-|   |   |   |-- ypbind-mt-1.31.tar.bz2

-|   |   |   |-- ypbind-mt-1.31.tar.bz2.sign

-|   |   |   |-- ypserv-2.23.tar.bz2

-|   |   |   |-- ypserv-2.23.tar.bz2.sign

+|   |   |   |-- ypbind-mt-1.32.tar.bz2

+|   |   |   |-- ypbind-mt-1.32.tar.sign

+|   |   |   |-- ypserv-2.24.tar.bz2

+|   |   |   |-- ypserv-2.24.tar.sign

 |   |   |   `-- yptools.SlackBuild

 |   |   |-- ytalk

 |   |   |   |-- doinst.sh.gz

@@ -7888,7 +7956,7 @@ see additional documentation files.
 |   |       `-- xfig.png14.nodither.diff.gz

 |   |-- tcl

 |   |   |-- expect

-|   |   |   |-- expect-5.44.1.11.tar.bz2

+|   |   |   |-- expect-5.44.1.15.tar.bz2

 |   |   |   |-- expect.SlackBuild

 |   |   |   |-- expect.exp_main_tk.c.version.require.diff.gz

 |   |   |   `-- slack-desc

@@ -7901,7 +7969,7 @@ see additional documentation files.
 |   |   |-- tcl

 |   |   |   |-- slack-desc

 |   |   |   |-- tcl.SlackBuild

-|   |   |   `-- tcl8.5.8-src.tar.xz

+|   |   |   `-- tcl8.5.9-src.tar.xz

 |   |   |-- tclx

 |   |   |   |-- slack-desc

 |   |   |   |-- tclx-8.4.configure.diff.gz

@@ -7917,14 +7985,14 @@ see additional documentation files.
 |   |   `-- tk

 |   |       |-- slack-desc

 |   |       |-- tk.SlackBuild

-|   |       `-- tk8.5.8-src.tar.xz

+|   |       `-- tk8.5.9-src.tar.xz

 |   |-- x

 |   |   |-- anthy

-|   |   |   |-- anthy-9100e.tar.gz

+|   |   |   |-- anthy-9100h.tar.xz

 |   |   |   |-- anthy.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- dejavu-fonts-ttf

-|   |   |   |-- dejavu-fonts-ttf-2.30.tar.bz2

+|   |   |   |-- dejavu-fonts-ttf-2.33.tar.xz

 |   |   |   |-- dejavu-fonts-ttf.SlackBuild

 |   |   |   |-- doinst.sh.gz

 |   |   |   `-- slack-desc

@@ -7937,48 +8005,85 @@ see additional documentation files.
 |   |   |   |-- setup.05.fontconfig

 |   |   |   `-- slack-desc

 |   |   |-- glew

-|   |   |   |-- glew-1.5.1-src.tar.xz

+|   |   |   |-- glew-1.5.7.tar.xz

 |   |   |   |-- glew.SlackBuild

 |   |   |   |-- glew.url

 |   |   |   `-- slack-desc

 |   |   |-- libdrm

-|   |   |   |-- libdrm-2.4.20.tar.xz

+|   |   |   |-- libdrm-2.4.23.tar.xz

 |   |   |   |-- libdrm.SlackBuild

 |   |   |   |-- libdrm.uint32_t.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- liberation-fonts-ttf

 |   |   |   |-- 60-liberation.conf

 |   |   |   |-- doinst.sh.gz

-|   |   |   |-- liberation-fonts-1.04.tar.bz2

+|   |   |   |-- liberation-fonts-ttf-1.06.0.20100721.tar.xz

 |   |   |   |-- liberation-fonts-ttf.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- libhangul

-|   |   |   |-- libhangul-0.0.7.tar.gz

+|   |   |   |-- libhangul-0.0.12.tar.xz

 |   |   |   |-- libhangul.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- m17n-lib

-|   |   |   |-- internal-flt.h

-|   |   |   |-- m17n-db-1.5.4.tar.gz

-|   |   |   |-- m17n-docs-1.5.2.tar.gz

-|   |   |   |-- m17n-docs_makefile.patch

-|   |   |   |-- m17n-lib-1.5.4.tar.gz

+|   |   |   |-- m17n-db-1.6.1.tar.xz

+|   |   |   |-- m17n-lib-1.6.1.tar.xz

 |   |   |   |-- m17n-lib.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- mesa

-|   |   |   |-- MesaDemos-7.8.1.tar.xz

-|   |   |   |-- MesaGLUT-7.8.1.tar.xz

-|   |   |   |-- MesaLib-7.8.1.tar.xz

+|   |   |   |-- MesaGLUT-7.9.2.tar.bz2

+|   |   |   |-- MesaLib-7.9.2.tar.bz2

 |   |   |   |-- README.GIT

 |   |   |   |-- get-mesa.sh

+|   |   |   |-- mesa-demos-8.0.1.tar.xz

 |   |   |   |-- mesa.SlackBuild

 |   |   |   |-- mesa.url

-|   |   |   `-- slack-desc

+|   |   |   |-- patches

+|   |   |   |   |-- i915_fragment_shader_disable.patch.gz

+|   |   |   |   `-- mesa-7.9-libdrm-2.4.23-nouveau-api.patch.gz

+|   |   |   `-- slack-desc

+|   |   |-- radeon_ucode

+|   |   |   |-- radeon_ucode.SlackBuild

+|   |   |   |-- slack-desc

+|   |   |   `-- ucode-20110302

+|   |   |       |-- BARTS_mc.bin

+|   |   |       |-- BARTS_me.bin

+|   |   |       |-- BARTS_pfp.bin

+|   |   |       |-- BTC_rlc.bin

+|   |   |       |-- CAICOS_mc.bin

+|   |   |       |-- CAICOS_me.bin

+|   |   |       |-- CAICOS_pfp.bin

+|   |   |       |-- CAYMAN_mc.bin

+|   |   |       |-- CAYMAN_me.bin

+|   |   |       |-- CAYMAN_pfp.bin

+|   |   |       |-- CAYMAN_rlc.bin

+|   |   |       |-- CEDAR_me.bin

+|   |   |       |-- CEDAR_pfp.bin

+|   |   |       |-- CEDAR_rlc.bin

+|   |   |       |-- CYPRESS_me.bin

+|   |   |       |-- CYPRESS_pfp.bin

+|   |   |       |-- CYPRESS_rlc.bin

+|   |   |       |-- JUNIPER_me.bin

+|   |   |       |-- JUNIPER_pfp.bin

+|   |   |       |-- JUNIPER_rlc.bin

+|   |   |       |-- LICENSE.radeon

+|   |   |       |-- PALM_me.bin

+|   |   |       |-- PALM_pfp.bin

+|   |   |       |-- R600_rlc.bin

+|   |   |       |-- R700_rlc.bin

+|   |   |       |-- REDWOOD_me.bin

+|   |   |       |-- REDWOOD_pfp.bin

+|   |   |       |-- REDWOOD_rlc.bin

+|   |   |       |-- SUMO_rlc.bin

+|   |   |       |-- TURKS_mc.bin

+|   |   |       |-- TURKS_me.bin

+|   |   |       `-- TURKS_pfp.bin

 |   |   |-- sazanami-fonts-ttf

 |   |   |   |-- sazanami-20040629.tar.bz2

 |   |   |   |-- sazanami-fonts-ttf.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- scim

-|   |   |   |-- scim-1.4.9.tar.gz

+|   |   |   |-- scim-1.4.9-fix-ltdl.cpp.patch.gz

+|   |   |   |-- scim-1.4.9.tar.xz

 |   |   |   |-- scim-setup.desktop

 |   |   |   |-- scim.SlackBuild

 |   |   |   |-- scim.desktop

@@ -7989,6 +8094,13 @@ see additional documentation files.
 |   |   |   |-- scim-anthy.gcc43.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- scim-bridge

+|   |   |   |-- patches

+|   |   |   |   |-- scim-bridge-0.4.16-scim-bridge-agent-application.cpp.patch.gz

+|   |   |   |   |-- scim-bridge-0.4.16-scim-bridge-agent-imcontext.cpp.patch.gz

+|   |   |   |   |-- scim-bridge-0.4.16-scim-bridge-agent-imcontext.h.patch.gz

+|   |   |   |   |-- scim-bridge-0.4.16-scim-bridge-agent.cpp.patch.gz

+|   |   |   |   |-- scim-bridge-0.4.16-scim-bridge-client-imcontext-gtk.c.patch.gz

+|   |   |   |   `-- scim-bridge-0.4.16-scim-bridge-client-imcontext-qt.cpp.patch.gz

 |   |   |   |-- scim-bridge-0.4.16.tar.gz

 |   |   |   |-- scim-bridge.SlackBuild

 |   |   |   `-- slack-desc

@@ -8039,76 +8151,36 @@ see additional documentation files.
 |   |   |   |-- arch.use.flags

 |   |   |   |-- build

 |   |   |   |   |-- gccmakedep

-|   |   |   |   |-- ico

-|   |   |   |   |-- libXTrap

-|   |   |   |   |-- libXevie

-|   |   |   |   |-- libXp

-|   |   |   |   |-- libXprintAppUtil

-|   |   |   |   |-- libXprintUtil

-|   |   |   |   |-- libxkbui

-|   |   |   |   |-- lndir

-|   |   |   |   |-- oclock

-|   |   |   |   |-- printproto

-|   |   |   |   |-- proxymngr

-|   |   |   |   |-- rendercheck

-|   |   |   |   |-- scripts

-|   |   |   |   |-- trapproto

-|   |   |   |   |-- twm

-|   |   |   |   |-- xconsole

-|   |   |   |   |-- xdbedizzy

-|   |   |   |   |-- xditview

-|   |   |   |   |-- xf86-input-elographics

-|   |   |   |   |-- xf86-input-mutouch

-|   |   |   |   |-- xf86-input-vmmouse

-|   |   |   |   |-- xf86-video-apm

-|   |   |   |   |-- xf86-video-ast

+|   |   |   |   |-- libX11

+|   |   |   |   |-- xcompmgr

+|   |   |   |   |-- xf86-input-acecad

+|   |   |   |   |-- xf86-input-penmount

 |   |   |   |   |-- xf86-video-cirrus

-|   |   |   |   |-- xf86-video-glint

-|   |   |   |   |-- xf86-video-i128

 |   |   |   |   |-- xf86-video-i740

 |   |   |   |   |-- xf86-video-mach64

-|   |   |   |   |-- xf86-video-mga

-|   |   |   |   |-- xf86-video-neomagic

+|   |   |   |   |-- xf86-video-openchrome

 |   |   |   |   |-- xf86-video-r128

+|   |   |   |   |-- xf86-video-radeonhd

 |   |   |   |   |-- xf86-video-s3

 |   |   |   |   |-- xf86-video-s3virge

-|   |   |   |   |-- xf86-video-savage

-|   |   |   |   |-- xf86-video-sis

-|   |   |   |   |-- xf86-video-sisusb

 |   |   |   |   |-- xf86-video-tdfx

+|   |   |   |   |-- xf86-video-tga

 |   |   |   |   |-- xf86-video-v4l

-|   |   |   |   |-- xf86-video-vesa

-|   |   |   |   |-- xf86-video-vmware

-|   |   |   |   |-- xf86-video-voodoo

-|   |   |   |   |-- xf86dga

-|   |   |   |   |-- xf86rushproto

-|   |   |   |   |-- xfd

-|   |   |   |   |-- xfindproxy

-|   |   |   |   |-- xfontsel

-|   |   |   |   |-- xfwp

-|   |   |   |   |-- xgc

-|   |   |   |   |-- xload

-|   |   |   |   |-- xlsfonts

-|   |   |   |   |-- xmh

-|   |   |   |   |-- xmore

-|   |   |   |   |-- xplsprinters

-|   |   |   |   |-- xprehashprinterlist

-|   |   |   |   |-- xsetmode

-|   |   |   |   |-- xsetpointer

-|   |   |   |   |-- xsm

-|   |   |   |   |-- xstdcmap

-|   |   |   |   `-- xtrap

+|   |   |   |   `-- xf86-video-vesa

 |   |   |   |-- configure

 |   |   |   |   |-- compiz

 |   |   |   |   |-- configure

+|   |   |   |   |-- font-bh-ttf

 |   |   |   |   |-- font-util

+|   |   |   |   |-- gccmakedep

 |   |   |   |   |-- libX11

+|   |   |   |   |-- libXp

 |   |   |   |   |-- libXt

 |   |   |   |   |-- pixman

 |   |   |   |   |-- setxkbmap

 |   |   |   |   |-- xf86-input-vmmouse

 |   |   |   |   |-- xf86-video-ati

-|   |   |   |   |-- xf86-video-nv

+|   |   |   |   |-- xf86-video-nouveau

 |   |   |   |   |-- xfs

 |   |   |   |   |-- xkbcomp

 |   |   |   |   |-- xkeyboard-config

@@ -8161,15 +8233,14 @@ see additional documentation files.
 |   |   |   |-- noarch

 |   |   |   |-- package-blacklist

 |   |   |   |-- patch

-|   |   |   |   |-- xcursorgen

-|   |   |   |   |   `-- xcursorgen.png14.configure.kludge.diff.gz

-|   |   |   |   |-- xcursorgen.patch

-|   |   |   |   |-- xf86-input-synaptics

-|   |   |   |   |   `-- xf86-input-synaptics.tap-to-click.diff.gz

-|   |   |   |   |-- xf86-input-synaptics.patch

+|   |   |   |   |-- README

+|   |   |   |   |-- xcompmgr

+|   |   |   |   |   `-- xcompmgr-follow-icccm-spec.diff.gz

+|   |   |   |   |-- xcompmgr.patch

 |   |   |   |   |-- xorg-server

 |   |   |   |   |   |-- x11.startwithblackscreen.diff.gz

-|   |   |   |   |   `-- xorg-server.fb.fbpict.c.mod.diff.gz

+|   |   |   |   |   |-- xorg-server.fb.fbpict.c.mod.diff.gz

+|   |   |   |   |   `-- xorg-server.try_nouveau.diff.gz

 |   |   |   |   `-- xorg-server.patch

 |   |   |   |-- post-install

 |   |   |   |   |-- beforelight.post-install

@@ -8212,6 +8283,10 @@ see additional documentation files.
 |   |   |   |   |-- font-winitzki-cyrillic.post-install

 |   |   |   |   |-- font-xfree86-type1.post-install

 |   |   |   |   |-- lbxproxy.post-install

+|   |   |   |   |-- libSM.post-install

+|   |   |   |   |-- libX11

+|   |   |   |   |   `-- XKeysymDB.gz

+|   |   |   |   |-- libX11.post-install

 |   |   |   |   |-- libXaw.post-install

 |   |   |   |   |-- libpthread-stubs.post-install

 |   |   |   |   |-- libxcb.post-install

@@ -8228,6 +8303,7 @@ see additional documentation files.
 |   |   |   |   |-- x11-app-test.post-install

 |   |   |   |   |-- x11-font.post-install

 |   |   |   |   |-- x11-util.post-install

+|   |   |   |   |-- xbitmaps.post-install

 |   |   |   |   |-- xcb-proto.post-install

 |   |   |   |   |-- xdm

 |   |   |   |   |   |-- Xsession

@@ -8236,8 +8312,9 @@ see additional documentation files.
 |   |   |   |   |   `-- Xsetup_0.orig

 |   |   |   |   |-- xdm.post-install

 |   |   |   |   |-- xf86-input-joystick.post-install

+|   |   |   |   |-- xf86-input-synaptics

+|   |   |   |   |   `-- 50-synaptics.conf

 |   |   |   |   |-- xf86-input-synaptics.post-install

-|   |   |   |   |-- xf86-input-wacom.post-install

 |   |   |   |   |-- xfs.post-install

 |   |   |   |   |-- xinit

 |   |   |   |   |   `-- README.Xmodmap

@@ -8246,8 +8323,9 @@ see additional documentation files.
 |   |   |   |   |-- xorg-cf-files

 |   |   |   |   |   `-- x11.tmpl.lib64.kludge.diff.gz

 |   |   |   |   |-- xorg-cf-files.post-install

-|   |   |   |   |-- xorg-docs.post-install

 |   |   |   |   |-- xorg-server.post-install

+|   |   |   |   |-- xorg-sgml-doctools.post-install

+|   |   |   |   |-- xproto.post-install

 |   |   |   |   `-- xsm.post-install

 |   |   |   |-- slack-desc

 |   |   |   |   |-- applewmproto

@@ -8367,7 +8445,6 @@ see additional documentation files.
 |   |   |   |   |-- lndir

 |   |   |   |   |-- luit

 |   |   |   |   |-- makedepend

-|   |   |   |   |-- mkcfm

 |   |   |   |   |-- mkcomposecache

 |   |   |   |   |-- mkfontdir

 |   |   |   |   |-- mkfontscale

@@ -8478,6 +8555,7 @@ see additional documentation files.
 |   |   |   |   |-- xf86-video-mga

 |   |   |   |   |-- xf86-video-neomagic

 |   |   |   |   |-- xf86-video-newport

+|   |   |   |   |-- xf86-video-nouveau

 |   |   |   |   |-- xf86-video-nsc

 |   |   |   |   |-- xf86-video-nv

 |   |   |   |   |-- xf86-video-openchrome

@@ -8584,312 +8662,271 @@ see additional documentation files.
 |   |   |   |   `-- xwud

 |   |   |   |-- src

 |   |   |   |   |-- app

-|   |   |   |   |   |-- appres-1.0.2.tar.xz

-|   |   |   |   |   |-- bdftopcf-1.0.2.tar.xz

-|   |   |   |   |   |-- beforelight-1.0.3.tar.xz

-|   |   |   |   |   |-- bitmap-1.0.4.tar.xz

-|   |   |   |   |   |-- compiz-0.8.6.tar.xz

-|   |   |   |   |   |-- editres-1.0.4.tar.xz

+|   |   |   |   |   |-- appres-1.0.3.tar.xz

+|   |   |   |   |   |-- bdftopcf-1.0.3.tar.xz

+|   |   |   |   |   |-- beforelight-1.0.4.tar.xz

+|   |   |   |   |   |-- bitmap-1.0.5.tar.xz

+|   |   |   |   |   |-- compiz-0.8.8.tar.xz

+|   |   |   |   |   |-- editres-1.0.5.tar.xz

 |   |   |   |   |   |-- fonttosfnt-1.0.4.tar.xz

-|   |   |   |   |   |-- fslsfonts-1.0.2.tar.xz

-|   |   |   |   |   |-- fstobdf-1.0.3.tar.xz

-|   |   |   |   |   |-- iceauth-1.0.3.tar.xz

-|   |   |   |   |   |-- ico-1.0.2.tar.xz

+|   |   |   |   |   |-- fslsfonts-1.0.3.tar.xz

+|   |   |   |   |   |-- fstobdf-1.0.4.tar.xz

+|   |   |   |   |   |-- iceauth-1.0.4.tar.xz

+|   |   |   |   |   |-- ico-1.0.3.tar.xz

 |   |   |   |   |   |-- intel-gpu-tools-1.0.2.tar.xz

 |   |   |   |   |   |-- listres-1.0.2.tar.xz

-|   |   |   |   |   |-- luit-1.0.5.tar.xz

-|   |   |   |   |   |-- mkcfm-1.0.1.tar.xz

+|   |   |   |   |   |-- luit-1.1.0.tar.xz

 |   |   |   |   |   |-- mkcomposecache-1.2.1.tar.xz

-|   |   |   |   |   |-- mkfontdir-1.0.5.tar.xz

-|   |   |   |   |   |-- mkfontscale-1.0.7.tar.xz

-|   |   |   |   |   |-- oclock-1.0.1.tar.xz

-|   |   |   |   |   |-- proxymngr-1.0.1.tar.xz

-|   |   |   |   |   |-- rendercheck-1.3.tar.xz

-|   |   |   |   |   |-- rgb-1.0.3.tar.xz

-|   |   |   |   |   |-- rstart-1.0.3.tar.xz

-|   |   |   |   |   |-- scripts-1.0.1.tar.xz

-|   |   |   |   |   |-- sessreg-1.0.5.tar.xz

-|   |   |   |   |   |-- setxkbmap-1.1.0.tar.xz

-|   |   |   |   |   |-- showfont-1.0.2.tar.xz

-|   |   |   |   |   |-- smproxy-1.0.3.tar.xz

-|   |   |   |   |   |-- twm-1.0.4.tar.xz

-|   |   |   |   |   |-- viewres-1.0.2.tar.xz

-|   |   |   |   |   |-- x11perf-1.5.1.tar.xz

-|   |   |   |   |   |-- xauth-1.0.4.tar.xz

-|   |   |   |   |   |-- xbacklight-1.1.1.tar.xz

-|   |   |   |   |   |-- xbiff-1.0.2.tar.xz

-|   |   |   |   |   |-- xcalc-1.0.3.tar.xz

-|   |   |   |   |   |-- xclipboard-1.1.0.tar.xz

-|   |   |   |   |   |-- xclock-1.0.4.tar.xz

-|   |   |   |   |   |-- xcmsdb-1.0.2.tar.xz

+|   |   |   |   |   |-- mkfontdir-1.0.6.tar.xz

+|   |   |   |   |   |-- mkfontscale-1.0.8.tar.xz

+|   |   |   |   |   |-- oclock-1.0.2.tar.xz

+|   |   |   |   |   |-- rendercheck-1.4.tar.xz

+|   |   |   |   |   |-- rgb-1.0.4.tar.xz

+|   |   |   |   |   |-- sessreg-1.0.6.tar.xz

+|   |   |   |   |   |-- setxkbmap-1.2.0.tar.xz

+|   |   |   |   |   |-- showfont-1.0.3.tar.xz

+|   |   |   |   |   |-- smproxy-1.0.4.tar.xz

+|   |   |   |   |   |-- twm-1.0.6.tar.xz

+|   |   |   |   |   |-- viewres-1.0.3.tar.xz

+|   |   |   |   |   |-- x11perf-1.5.3.tar.xz

+|   |   |   |   |   |-- xauth-1.0.5.tar.xz

+|   |   |   |   |   |-- xbacklight-1.1.2.tar.xz

+|   |   |   |   |   |-- xbiff-1.0.3.tar.xz

+|   |   |   |   |   |-- xcalc-1.0.4.1.tar.xz

+|   |   |   |   |   |-- xclipboard-1.1.1.tar.xz

+|   |   |   |   |   |-- xclock-1.0.5.tar.xz

+|   |   |   |   |   |-- xcmsdb-1.0.3.tar.xz

 |   |   |   |   |   |-- xcompmgr-1.1.5.tar.xz

-|   |   |   |   |   |-- xconsole-1.0.3.tar.xz

-|   |   |   |   |   |-- xcursorgen-1.0.3.tar.xz

-|   |   |   |   |   |-- xdbedizzy-1.0.2.tar.xz

-|   |   |   |   |   |-- xditview-1.0.1.tar.xz

+|   |   |   |   |   |-- xconsole-1.0.4.tar.xz

+|   |   |   |   |   |-- xcursorgen-1.0.4.tar.xz

+|   |   |   |   |   |-- xdbedizzy-1.1.0.tar.xz

+|   |   |   |   |   |-- xditview-1.0.2.tar.xz

 |   |   |   |   |   |-- xdm-1.1.10.tar.xz

-|   |   |   |   |   |-- xdpyinfo-1.1.0.tar.xz

-|   |   |   |   |   |-- xdriinfo-1.0.3.tar.xz

-|   |   |   |   |   |-- xedit-1.1.2.tar.xz

-|   |   |   |   |   |-- xev-1.0.4.tar.xz

-|   |   |   |   |   |-- xeyes-1.1.0.tar.xz

-|   |   |   |   |   |-- xf86dga-1.0.2.tar.xz

-|   |   |   |   |   |-- xfd-1.0.1.tar.xz

-|   |   |   |   |   |-- xfindproxy-1.0.1.tar.xz

-|   |   |   |   |   |-- xfontsel-1.0.2.tar.xz

-|   |   |   |   |   |-- xfs-1.1.0.tar.xz

-|   |   |   |   |   |-- xfsinfo-1.0.2.tar.xz

-|   |   |   |   |   |-- xfwp-1.0.1.tar.xz

-|   |   |   |   |   |-- xgamma-1.0.3.tar.xz

-|   |   |   |   |   |-- xgc-1.0.2.tar.xz

-|   |   |   |   |   |-- xhost-1.0.3.tar.xz

-|   |   |   |   |   |-- xinit-1.2.1.tar.xz

-|   |   |   |   |   |-- xinput-1.5.1.tar.xz

-|   |   |   |   |   |-- xkbcomp-1.1.1.tar.xz

-|   |   |   |   |   |-- xkbevd-1.1.0.tar.xz

-|   |   |   |   |   |-- xkbprint-1.0.2.tar.xz

-|   |   |   |   |   |-- xkbutils-1.0.2.tar.xz

-|   |   |   |   |   |-- xkill-1.0.2.tar.xz

-|   |   |   |   |   |-- xload-1.0.2.tar.xz

-|   |   |   |   |   |-- xlogo-1.0.2.tar.xz

-|   |   |   |   |   |-- xlsatoms-1.0.2.tar.xz

-|   |   |   |   |   |-- xlsclients-1.0.2.tar.xz

-|   |   |   |   |   |-- xlsfonts-1.0.2.tar.xz

-|   |   |   |   |   |-- xmag-1.0.3.tar.xz

-|   |   |   |   |   |-- xman-1.1.0.tar.xz

+|   |   |   |   |   |-- xdpyinfo-1.2.0.tar.xz

+|   |   |   |   |   |-- xdriinfo-1.0.4.tar.xz

+|   |   |   |   |   |-- xedit-1.2.0.tar.xz

+|   |   |   |   |   |-- xev-1.1.0.tar.xz

+|   |   |   |   |   |-- xeyes-1.1.1.tar.xz

+|   |   |   |   |   |-- xf86dga-1.0.3.tar.xz

+|   |   |   |   |   |-- xfd-1.1.0.tar.xz

+|   |   |   |   |   |-- xfontsel-1.0.3.tar.xz

+|   |   |   |   |   |-- xfs-1.1.1.tar.xz

+|   |   |   |   |   |-- xfsinfo-1.0.3.tar.xz

+|   |   |   |   |   |-- xgamma-1.0.4.tar.xz

+|   |   |   |   |   |-- xgc-1.0.3.tar.xz

+|   |   |   |   |   |-- xhost-1.0.4.tar.xz

+|   |   |   |   |   |-- xinit-1.3.0.tar.xz

+|   |   |   |   |   |-- xinput-1.5.3.tar.xz

+|   |   |   |   |   |-- xkbcomp-1.2.1.tar.xz

+|   |   |   |   |   |-- xkbevd-1.1.2.tar.xz

+|   |   |   |   |   |-- xkbprint-1.0.3.tar.xz

+|   |   |   |   |   |-- xkbutils-1.0.3.tar.xz

+|   |   |   |   |   |-- xkill-1.0.3.tar.xz

+|   |   |   |   |   |-- xload-1.1.0.tar.xz

+|   |   |   |   |   |-- xlogo-1.0.3.tar.xz

+|   |   |   |   |   |-- xlsatoms-1.1.0.tar.xz

+|   |   |   |   |   |-- xlsclients-1.1.1.tar.xz

+|   |   |   |   |   |-- xlsfonts-1.0.3.tar.xz

+|   |   |   |   |   |-- xmag-1.0.4.tar.xz

+|   |   |   |   |   |-- xman-1.1.1.tar.xz

 |   |   |   |   |   |-- xmessage-1.0.3.tar.xz

-|   |   |   |   |   |-- xmh-1.0.1.tar.xz

-|   |   |   |   |   |-- xmodmap-1.0.4.tar.xz

-|   |   |   |   |   |-- xmore-1.0.1.tar.xz

+|   |   |   |   |   |-- xmh-1.0.2.tar.xz

+|   |   |   |   |   |-- xmodmap-1.0.5.tar.xz

+|   |   |   |   |   |-- xmore-1.0.2.tar.xz

 |   |   |   |   |   |-- xphelloworld-1.0.1.tar.xz

-|   |   |   |   |   |-- xplsprinters-1.0.1.tar.xz

 |   |   |   |   |   |-- xpr-1.0.3.tar.xz

-|   |   |   |   |   |-- xprehashprinterlist-1.0.1.tar.xz

-|   |   |   |   |   |-- xprop-1.1.0.tar.xz

-|   |   |   |   |   |-- xrandr-1.3.2.tar.xz

-|   |   |   |   |   |-- xrdb-1.0.6.tar.xz

-|   |   |   |   |   |-- xrefresh-1.0.3.tar.xz

-|   |   |   |   |   |-- xscope-1.2.tar.xz

-|   |   |   |   |   |-- xset-1.1.0.tar.xz

-|   |   |   |   |   |-- xsetmode-1.0.0.tar.xz

-|   |   |   |   |   |-- xsetpointer-1.0.1.tar.xz

-|   |   |   |   |   |-- xsetroot-1.0.3.tar.xz

-|   |   |   |   |   |-- xsm-1.0.1.tar.xz

-|   |   |   |   |   |-- xstdcmap-1.0.1.tar.xz

-|   |   |   |   |   |-- xtrap-1.0.2.tar.xz

+|   |   |   |   |   |-- xprop-1.2.0.tar.xz

+|   |   |   |   |   |-- xrandr-1.3.4.tar.xz

+|   |   |   |   |   |-- xrdb-1.0.9.tar.xz

+|   |   |   |   |   |-- xrefresh-1.0.4.tar.xz

+|   |   |   |   |   |-- xscope-1.3.tar.xz

+|   |   |   |   |   |-- xset-1.2.1.tar.xz

+|   |   |   |   |   |-- xsetroot-1.1.0.tar.xz

+|   |   |   |   |   |-- xsm-1.0.2.tar.xz

+|   |   |   |   |   |-- xstdcmap-1.0.2.tar.xz

 |   |   |   |   |   |-- xvidtune-1.0.2.tar.xz

-|   |   |   |   |   |-- xvinfo-1.1.0.tar.xz

-|   |   |   |   |   |-- xwd-1.0.3.tar.xz

-|   |   |   |   |   |-- xwininfo-1.0.5.tar.xz

-|   |   |   |   |   `-- xwud-1.0.2.tar.xz

+|   |   |   |   |   |-- xvinfo-1.1.1.tar.xz

+|   |   |   |   |   |-- xwd-1.0.4.tar.xz

+|   |   |   |   |   |-- xwininfo-1.1.1.tar.xz

+|   |   |   |   |   `-- xwud-1.0.3.tar.xz

 |   |   |   |   |-- data

-|   |   |   |   |   |-- xbitmaps-1.1.0.tar.xz

-|   |   |   |   |   |-- xcursor-themes-1.0.2.tar.xz

-|   |   |   |   |   `-- xkeyboard-config-1.8.tar.xz

+|   |   |   |   |   |-- xbitmaps-1.1.1.tar.xz

+|   |   |   |   |   |-- xcursor-themes-1.0.3.tar.xz

+|   |   |   |   |   `-- xkeyboard-config-2.2.1.tar.xz

 |   |   |   |   |-- doc

-|   |   |   |   |   |-- xorg-docs-1.5.tar.xz

-|   |   |   |   |   `-- xorg-sgml-doctools-1.4.tar.xz

+|   |   |   |   |   |-- xorg-docs-1.6.tar.xz

+|   |   |   |   |   `-- xorg-sgml-doctools-1.7.tar.xz

 |   |   |   |   |-- driver

 |   |   |   |   |   |-- xf86-input-acecad-1.4.0.tar.xz

-|   |   |   |   |   |-- xf86-input-aiptek-1.3.0.tar.xz

-|   |   |   |   |   |-- xf86-input-calcomp-1.1.2.tar.xz

-|   |   |   |   |   |-- xf86-input-citron-2.2.2.tar.xz

-|   |   |   |   |   |-- xf86-input-digitaledge-1.1.1.tar.xz

-|   |   |   |   |   |-- xf86-input-dmc-1.1.2.tar.xz

-|   |   |   |   |   |-- xf86-input-dynapro-1.1.2.tar.xz

-|   |   |   |   |   |-- xf86-input-elo2300-1.1.2.tar.xz

-|   |   |   |   |   |-- xf86-input-elographics-1.2.3.tar.xz

-|   |   |   |   |   |-- xf86-input-evdev-2.3.3.tar.xz

-|   |   |   |   |   |-- xf86-input-fpit-1.3.0.tar.xz

-|   |   |   |   |   |-- xf86-input-hyperpen-1.3.0.tar.xz

-|   |   |   |   |   |-- xf86-input-jamstudio-1.2.0.tar.xz

-|   |   |   |   |   |-- xf86-input-joystick-1.4.99.2.tar.xz

-|   |   |   |   |   |-- xf86-input-keyboard-1.4.0.tar.xz

-|   |   |   |   |   |-- xf86-input-magellan-1.2.0.tar.xz

-|   |   |   |   |   |-- xf86-input-magictouch-1.0.0.5.tar.xz

-|   |   |   |   |   |-- xf86-input-microtouch-1.2.0.tar.xz

-|   |   |   |   |   |-- xf86-input-mouse-1.5.0.tar.xz

-|   |   |   |   |   |-- xf86-input-mutouch-1.2.1.tar.xz

-|   |   |   |   |   |-- xf86-input-palmax-1.2.0.tar.xz

+|   |   |   |   |   |-- xf86-input-aiptek-1.3.1.tar.xz

+|   |   |   |   |   |-- xf86-input-evdev-2.6.0.tar.xz

+|   |   |   |   |   |-- xf86-input-joystick-1.5.0.tar.xz

+|   |   |   |   |   |-- xf86-input-keyboard-1.6.0.tar.xz

+|   |   |   |   |   |-- xf86-input-mouse-1.7.0.tar.xz

 |   |   |   |   |   |-- xf86-input-penmount-1.4.1.tar.xz

-|   |   |   |   |   |-- xf86-input-spaceorb-1.1.1.tar.xz

-|   |   |   |   |   |-- xf86-input-summa-1.2.0.tar.xz

-|   |   |   |   |   |-- xf86-input-synaptics-1.2.2.tar.xz

-|   |   |   |   |   |-- xf86-input-tek4957-1.2.0.tar.xz

-|   |   |   |   |   |-- xf86-input-ur98-1.1.0.tar.xz

-|   |   |   |   |   |-- xf86-input-vmmouse-12.6.9.tar.xz

-|   |   |   |   |   |-- xf86-input-void-1.3.0.tar.xz

-|   |   |   |   |   |-- xf86-input-wacom-0.10.5.tar.xz

-|   |   |   |   |   |-- xf86-video-apm-1.2.2.tar.xz

-|   |   |   |   |   |-- xf86-video-ark-0.7.2.tar.xz

-|   |   |   |   |   |-- xf86-video-ast-0.89.9.tar.xz

-|   |   |   |   |   |-- xf86-video-ati-6.13.0.tar.xz

-|   |   |   |   |   |-- xf86-video-chips-1.2.2.tar.xz

+|   |   |   |   |   |-- xf86-input-synaptics-1.4.0.tar.xz

+|   |   |   |   |   |-- xf86-input-vmmouse-12.7.0.tar.xz

+|   |   |   |   |   |-- xf86-input-void-1.3.1.tar.xz

+|   |   |   |   |   |-- xf86-input-wacom-0.10.11.tar.xz

+|   |   |   |   |   |-- xf86-video-apm-1.2.3.tar.xz

+|   |   |   |   |   |-- xf86-video-ark-0.7.3.tar.xz

+|   |   |   |   |   |-- xf86-video-ast-0.91.10.tar.xz

+|   |   |   |   |   |-- xf86-video-ati-6.14.1.tar.xz

+|   |   |   |   |   |-- xf86-video-chips-1.2.4.tar.xz

 |   |   |   |   |   |-- xf86-video-cirrus-1.3.2.tar.xz

-|   |   |   |   |   |-- xf86-video-cyrix-1.1.0.tar.xz

-|   |   |   |   |   |-- xf86-video-dummy-0.3.3.tar.xz

-|   |   |   |   |   |-- xf86-video-geode-2.11.8.tar.xz

-|   |   |   |   |   |-- xf86-video-glide-1.0.3.tar.xz

-|   |   |   |   |   |-- xf86-video-glint-1.2.4.tar.xz

-|   |   |   |   |   |-- xf86-video-i128-1.3.3.tar.xz

+|   |   |   |   |   |-- xf86-video-dummy-0.3.4.tar.xz

+|   |   |   |   |   |-- xf86-video-geode-2.11.10.tar.xz

+|   |   |   |   |   |-- xf86-video-glint-1.2.5.tar.xz

+|   |   |   |   |   |-- xf86-video-i128-1.3.4.tar.xz

 |   |   |   |   |   |-- xf86-video-i740-1.3.2.tar.xz

-|   |   |   |   |   |-- xf86-video-impact-0.2.0.tar.xz

-|   |   |   |   |   |-- xf86-video-imstt-1.1.0.tar.xz

-|   |   |   |   |   |-- xf86-video-intel-2.11.0.tar.xz

+|   |   |   |   |   |-- xf86-video-intel-2.15.0.tar.xz

 |   |   |   |   |   |-- xf86-video-mach64-6.8.2.tar.xz

-|   |   |   |   |   |-- xf86-video-mga-1.4.11.tar.xz

-|   |   |   |   |   |-- xf86-video-neomagic-1.2.4.tar.xz

-|   |   |   |   |   |-- xf86-video-nv-2.1.17.tar.xz

+|   |   |   |   |   |-- xf86-video-mga-1.4.13.tar.xz

+|   |   |   |   |   |-- xf86-video-neomagic-1.2.5.tar.xz

+|   |   |   |   |   |-- xf86-video-nouveau-8bb82312.tar.xz

+|   |   |   |   |   |-- xf86-video-nv-2.1.18.tar.xz

 |   |   |   |   |   |-- xf86-video-openchrome-0.2.904.tar.xz

 |   |   |   |   |   |-- xf86-video-r128-6.8.1.tar.xz

 |   |   |   |   |   |-- xf86-video-radeonhd-1.3.0.tar.xz

-|   |   |   |   |   |-- xf86-video-rendition-4.2.3.tar.xz

+|   |   |   |   |   |-- xf86-video-rendition-4.2.4.tar.xz

 |   |   |   |   |   |-- xf86-video-s3-0.6.3.tar.xz

 |   |   |   |   |   |-- xf86-video-s3virge-1.10.4.tar.xz

-|   |   |   |   |   |-- xf86-video-savage-2.3.1.tar.xz

-|   |   |   |   |   |-- xf86-video-siliconmotion-1.7.4.tar.xz

-|   |   |   |   |   |-- xf86-video-sis-0.10.2.tar.xz

-|   |   |   |   |   |-- xf86-video-sisusb-0.9.3.tar.xz

+|   |   |   |   |   |-- xf86-video-savage-2.3.2.tar.xz

+|   |   |   |   |   |-- xf86-video-siliconmotion-1.7.5.tar.xz

+|   |   |   |   |   |-- xf86-video-sis-0.10.3.tar.xz

+|   |   |   |   |   |-- xf86-video-sisusb-0.9.4.tar.xz

 |   |   |   |   |   |-- xf86-video-tdfx-1.4.3.tar.xz

 |   |   |   |   |   |-- xf86-video-tga-1.2.1.tar.xz

-|   |   |   |   |   |-- xf86-video-trident-1.3.3.tar.xz

-|   |   |   |   |   |-- xf86-video-tseng-1.2.3.tar.xz

+|   |   |   |   |   |-- xf86-video-trident-1.3.4.tar.xz

+|   |   |   |   |   |-- xf86-video-tseng-1.2.4.tar.xz

 |   |   |   |   |   |-- xf86-video-v4l-0.2.0.tar.xz

-|   |   |   |   |   |-- xf86-video-vermilion-1.0.1.tar.xz

 |   |   |   |   |   |-- xf86-video-vesa-2.3.0.tar.xz

-|   |   |   |   |   |-- xf86-video-vga-4.1.0.tar.xz

-|   |   |   |   |   |-- xf86-video-vmware-10.16.9.tar.xz

-|   |   |   |   |   |-- xf86-video-voodoo-1.2.3.tar.xz

-|   |   |   |   |   `-- xf86-video-xgi-1.5.1.tar.xz

+|   |   |   |   |   |-- xf86-video-vmware-11.0.3.tar.xz

+|   |   |   |   |   |-- xf86-video-voodoo-1.2.4.tar.xz

+|   |   |   |   |   `-- xf86-video-xgi-1.6.0.tar.xz

 |   |   |   |   |-- font

-|   |   |   |   |   |-- encodings-1.0.3.tar.xz

-|   |   |   |   |   |-- font-adobe-100dpi-1.0.1.tar.xz

-|   |   |   |   |   |-- font-adobe-75dpi-1.0.1.tar.xz

-|   |   |   |   |   |-- font-adobe-utopia-100dpi-1.0.2.tar.xz

-|   |   |   |   |   |-- font-adobe-utopia-75dpi-1.0.2.tar.xz

-|   |   |   |   |   |-- font-adobe-utopia-type1-1.0.2.tar.xz

-|   |   |   |   |   |-- font-alias-1.0.2.tar.xz

-|   |   |   |   |   |-- font-arabic-misc-1.0.1.tar.xz

-|   |   |   |   |   |-- font-bh-100dpi-1.0.1.tar.xz

-|   |   |   |   |   |-- font-bh-75dpi-1.0.1.tar.xz

-|   |   |   |   |   |-- font-bh-lucidatypewriter-100dpi-1.0.1.tar.xz

-|   |   |   |   |   |-- font-bh-lucidatypewriter-75dpi-1.0.1.tar.xz

-|   |   |   |   |   |-- font-bh-ttf-1.0.1.tar.xz

-|   |   |   |   |   |-- font-bh-type1-1.0.1.tar.xz

-|   |   |   |   |   |-- font-bitstream-100dpi-1.0.1.tar.xz

-|   |   |   |   |   |-- font-bitstream-75dpi-1.0.1.tar.xz

-|   |   |   |   |   |-- font-bitstream-speedo-1.0.1.tar.xz

-|   |   |   |   |   |-- font-bitstream-type1-1.0.1.tar.xz

-|   |   |   |   |   |-- font-cronyx-cyrillic-1.0.1.tar.xz

-|   |   |   |   |   |-- font-cursor-misc-1.0.1.tar.xz

-|   |   |   |   |   |-- font-daewoo-misc-1.0.1.tar.xz

-|   |   |   |   |   |-- font-dec-misc-1.0.1.tar.xz

-|   |   |   |   |   |-- font-ibm-type1-1.0.1.tar.xz

-|   |   |   |   |   |-- font-isas-misc-1.0.1.tar.xz

-|   |   |   |   |   |-- font-jis-misc-1.0.1.tar.xz

-|   |   |   |   |   |-- font-micro-misc-1.0.1.tar.xz

-|   |   |   |   |   |-- font-misc-cyrillic-1.0.1.tar.xz

-|   |   |   |   |   |-- font-misc-ethiopic-1.0.1.tar.xz

-|   |   |   |   |   |-- font-misc-meltho-1.0.1.tar.xz

-|   |   |   |   |   |-- font-misc-misc-1.1.0.tar.xz

-|   |   |   |   |   |-- font-mutt-misc-1.0.1.tar.xz

-|   |   |   |   |   |-- font-schumacher-misc-1.1.0.tar.xz

-|   |   |   |   |   |-- font-screen-cyrillic-1.0.2.tar.xz

-|   |   |   |   |   |-- font-sony-misc-1.0.1.tar.xz

-|   |   |   |   |   |-- font-sun-misc-1.0.1.tar.xz

-|   |   |   |   |   |-- font-util-1.1.1.tar.xz

-|   |   |   |   |   |-- font-winitzki-cyrillic-1.0.1.tar.xz

-|   |   |   |   |   `-- font-xfree86-type1-1.0.2.tar.xz

+|   |   |   |   |   |-- encodings-1.0.4.tar.xz

+|   |   |   |   |   |-- font-adobe-100dpi-1.0.3.tar.xz

+|   |   |   |   |   |-- font-adobe-75dpi-1.0.3.tar.xz

+|   |   |   |   |   |-- font-adobe-utopia-100dpi-1.0.4.tar.xz

+|   |   |   |   |   |-- font-adobe-utopia-75dpi-1.0.4.tar.xz

+|   |   |   |   |   |-- font-adobe-utopia-type1-1.0.4.tar.xz

+|   |   |   |   |   |-- font-alias-1.0.3.tar.xz

+|   |   |   |   |   |-- font-arabic-misc-1.0.3.tar.xz

+|   |   |   |   |   |-- font-bh-100dpi-1.0.3.tar.xz

+|   |   |   |   |   |-- font-bh-75dpi-1.0.3.tar.xz

+|   |   |   |   |   |-- font-bh-lucidatypewriter-100dpi-1.0.3.tar.xz

+|   |   |   |   |   |-- font-bh-lucidatypewriter-75dpi-1.0.3.tar.xz

+|   |   |   |   |   |-- font-bh-ttf-1.0.3.tar.xz

+|   |   |   |   |   |-- font-bh-type1-1.0.3.tar.xz

+|   |   |   |   |   |-- font-bitstream-100dpi-1.0.3.tar.xz

+|   |   |   |   |   |-- font-bitstream-75dpi-1.0.3.tar.xz

+|   |   |   |   |   |-- font-bitstream-speedo-1.0.2.tar.xz

+|   |   |   |   |   |-- font-bitstream-type1-1.0.3.tar.xz

+|   |   |   |   |   |-- font-cronyx-cyrillic-1.0.3.tar.xz

+|   |   |   |   |   |-- font-cursor-misc-1.0.3.tar.xz

+|   |   |   |   |   |-- font-daewoo-misc-1.0.3.tar.xz

+|   |   |   |   |   |-- font-dec-misc-1.0.3.tar.xz

+|   |   |   |   |   |-- font-ibm-type1-1.0.3.tar.xz

+|   |   |   |   |   |-- font-isas-misc-1.0.3.tar.xz

+|   |   |   |   |   |-- font-jis-misc-1.0.3.tar.xz

+|   |   |   |   |   |-- font-micro-misc-1.0.3.tar.xz

+|   |   |   |   |   |-- font-misc-cyrillic-1.0.3.tar.xz

+|   |   |   |   |   |-- font-misc-ethiopic-1.0.3.tar.xz

+|   |   |   |   |   |-- font-misc-meltho-1.0.3.tar.xz

+|   |   |   |   |   |-- font-misc-misc-1.1.2.tar.xz

+|   |   |   |   |   |-- font-mutt-misc-1.0.3.tar.xz

+|   |   |   |   |   |-- font-schumacher-misc-1.1.2.tar.xz

+|   |   |   |   |   |-- font-screen-cyrillic-1.0.4.tar.xz

+|   |   |   |   |   |-- font-sony-misc-1.0.3.tar.xz

+|   |   |   |   |   |-- font-sun-misc-1.0.3.tar.xz

+|   |   |   |   |   |-- font-util-1.2.0.tar.xz

+|   |   |   |   |   |-- font-winitzki-cyrillic-1.0.3.tar.xz

+|   |   |   |   |   `-- font-xfree86-type1-1.0.4.tar.xz

+|   |   |   |   |-- get-xf86-video-nouveau.sh

 |   |   |   |   |-- lib

-|   |   |   |   |   |-- libFS-1.0.2.tar.xz

-|   |   |   |   |   |-- libICE-1.0.6.tar.xz

-|   |   |   |   |   |-- libSM-1.1.1.tar.xz

-|   |   |   |   |   |-- libX11-1.3.3.tar.xz

-|   |   |   |   |   |-- libXScrnSaver-1.2.0.tar.xz

-|   |   |   |   |   |-- libXTrap-1.0.0.tar.xz

-|   |   |   |   |   |-- libXau-1.0.5.tar.xz

-|   |   |   |   |   |-- libXaw-1.0.7.tar.xz

-|   |   |   |   |   |-- libXcomposite-0.4.1.tar.xz

-|   |   |   |   |   |-- libXcursor-1.1.10.tar.xz

-|   |   |   |   |   |-- libXdamage-1.1.2.tar.xz

-|   |   |   |   |   |-- libXdmcp-1.0.3.tar.xz

-|   |   |   |   |   |-- libXevie-1.0.2.tar.xz

-|   |   |   |   |   |-- libXext-1.1.tar.xz

-|   |   |   |   |   |-- libXfixes-4.0.4.tar.xz

-|   |   |   |   |   |-- libXfont-1.4.1.tar.xz

+|   |   |   |   |   |-- libFS-1.0.3.tar.xz

+|   |   |   |   |   |-- libICE-1.0.7.tar.xz

+|   |   |   |   |   |-- libSM-1.2.0.tar.xz

+|   |   |   |   |   |-- libX11-1.4.3.tar.xz

+|   |   |   |   |   |-- libXScrnSaver-1.2.1.tar.xz

+|   |   |   |   |   |-- libXau-1.0.6.tar.xz

+|   |   |   |   |   |-- libXaw-1.0.9.tar.xz

+|   |   |   |   |   |-- libXcomposite-0.4.3.tar.xz

+|   |   |   |   |   |-- libXcursor-1.1.11.tar.xz

+|   |   |   |   |   |-- libXdamage-1.1.3.tar.xz

+|   |   |   |   |   |-- libXdmcp-1.1.0.tar.xz

+|   |   |   |   |   |-- libXevie-1.0.3.tar.xz

+|   |   |   |   |   |-- libXext-1.2.0.tar.xz

+|   |   |   |   |   |-- libXfixes-5.0.tar.xz

+|   |   |   |   |   |-- libXfont-1.4.3.tar.xz

 |   |   |   |   |   |-- libXfontcache-1.0.5.tar.xz

-|   |   |   |   |   |-- libXft-2.1.14.tar.xz

-|   |   |   |   |   |-- libXi-1.3.tar.xz

-|   |   |   |   |   |-- libXinerama-1.1.tar.xz

-|   |   |   |   |   |-- libXmu-1.0.5.tar.xz

-|   |   |   |   |   |-- libXp-1.0.0.tar.xz

-|   |   |   |   |   |-- libXpm-3.5.8.tar.xz

-|   |   |   |   |   |-- libXprintAppUtil-1.0.1.tar.xz

-|   |   |   |   |   |-- libXprintUtil-1.0.1.tar.xz

-|   |   |   |   |   |-- libXrandr-1.3.0.tar.xz

-|   |   |   |   |   |-- libXrender-0.9.5.tar.xz

-|   |   |   |   |   |-- libXres-1.0.4.tar.xz

-|   |   |   |   |   |-- libXt-1.0.8.tar.xz

-|   |   |   |   |   |-- libXtst-1.1.0.tar.xz

-|   |   |   |   |   |-- libXv-1.0.5.tar.xz

-|   |   |   |   |   |-- libXvMC-1.0.5.tar.xz

-|   |   |   |   |   |-- libXxf86dga-1.1.1.tar.xz

-|   |   |   |   |   |-- libXxf86misc-1.0.2.tar.xz

-|   |   |   |   |   |-- libXxf86vm-1.1.0.tar.xz

-|   |   |   |   |   |-- libdmx-1.1.0.tar.xz

-|   |   |   |   |   |-- libfontenc-1.0.5.tar.xz

-|   |   |   |   |   |-- libpciaccess-0.11.0.tar.xz

-|   |   |   |   |   |-- libxkbfile-1.0.6.tar.xz

-|   |   |   |   |   |-- libxkbui-1.0.2.tar.xz

-|   |   |   |   |   |-- pixman-0.16.6.tar.xz

-|   |   |   |   |   `-- xtrans-1.2.5.tar.xz

+|   |   |   |   |   |-- libXft-2.2.0.tar.xz

+|   |   |   |   |   |-- libXi-1.4.2.tar.xz

+|   |   |   |   |   |-- libXinerama-1.1.1.tar.xz

+|   |   |   |   |   |-- libXmu-1.1.0.tar.xz

+|   |   |   |   |   |-- libXp-1.0.1.tar.xz

+|   |   |   |   |   |-- libXpm-3.5.9.tar.xz

+|   |   |   |   |   |-- libXrandr-1.3.1.tar.xz

+|   |   |   |   |   |-- libXrender-0.9.6.tar.xz

+|   |   |   |   |   |-- libXres-1.0.5.tar.xz

+|   |   |   |   |   |-- libXt-1.1.1.tar.xz

+|   |   |   |   |   |-- libXtst-1.2.0.tar.xz

+|   |   |   |   |   |-- libXv-1.0.6.tar.xz

+|   |   |   |   |   |-- libXvMC-1.0.6.tar.xz

+|   |   |   |   |   |-- libXxf86dga-1.1.2.tar.xz

+|   |   |   |   |   |-- libXxf86misc-1.0.3.tar.xz

+|   |   |   |   |   |-- libXxf86vm-1.1.1.tar.xz

+|   |   |   |   |   |-- libdmx-1.1.1.tar.xz

+|   |   |   |   |   |-- libfontenc-1.1.0.tar.xz

+|   |   |   |   |   |-- libpciaccess-0.12.1.tar.xz

+|   |   |   |   |   |-- libxkbfile-1.0.7.tar.xz

+|   |   |   |   |   |-- pixman-0.20.2.tar.xz

+|   |   |   |   |   `-- xtrans-1.2.6.tar.xz

 |   |   |   |   |-- proto

-|   |   |   |   |   |-- bigreqsproto-1.1.0.tar.xz

-|   |   |   |   |   |-- compositeproto-0.4.1.tar.xz

-|   |   |   |   |   |-- damageproto-1.2.0.tar.xz

-|   |   |   |   |   |-- dmxproto-2.3.tar.xz

+|   |   |   |   |   |-- bigreqsproto-1.1.1.tar.xz

+|   |   |   |   |   |-- compositeproto-0.4.2.tar.xz

+|   |   |   |   |   |-- damageproto-1.2.1.tar.xz

+|   |   |   |   |   |-- dmxproto-2.3.1.tar.xz

 |   |   |   |   |   |-- dri2proto-2.3.tar.xz

-|   |   |   |   |   |-- evieext-1.1.0.tar.xz

-|   |   |   |   |   |-- fixesproto-4.1.1.tar.xz

+|   |   |   |   |   |-- evieext-1.1.1.tar.xz

+|   |   |   |   |   |-- fixesproto-5.0.tar.xz

 |   |   |   |   |   |-- fontcacheproto-0.1.3.tar.xz

-|   |   |   |   |   |-- fontsproto-2.1.0.tar.xz

-|   |   |   |   |   |-- glproto-1.4.11.tar.xz

-|   |   |   |   |   |-- inputproto-2.0.tar.xz

-|   |   |   |   |   |-- kbproto-1.0.4.tar.xz

-|   |   |   |   |   |-- printproto-1.0.4.tar.xz

-|   |   |   |   |   |-- randrproto-1.3.1.tar.xz

-|   |   |   |   |   |-- recordproto-1.14.tar.xz

-|   |   |   |   |   |-- renderproto-0.11.tar.xz

-|   |   |   |   |   |-- resourceproto-1.1.0.tar.xz

-|   |   |   |   |   |-- scrnsaverproto-1.2.0.tar.xz

-|   |   |   |   |   |-- trapproto-3.4.3.tar.xz

-|   |   |   |   |   |-- videoproto-2.3.0.tar.xz

-|   |   |   |   |   |-- xcmiscproto-1.2.0.tar.xz

-|   |   |   |   |   |-- xextproto-7.1.1.tar.xz

+|   |   |   |   |   |-- fontsproto-2.1.1.tar.xz

+|   |   |   |   |   |-- glproto-1.4.12.tar.xz

+|   |   |   |   |   |-- inputproto-2.0.1.tar.xz

+|   |   |   |   |   |-- kbproto-1.0.5.tar.xz

+|   |   |   |   |   |-- printproto-1.0.5.tar.xz

+|   |   |   |   |   |-- randrproto-1.3.2.tar.xz

+|   |   |   |   |   |-- recordproto-1.14.1.tar.xz

+|   |   |   |   |   |-- renderproto-0.11.1.tar.xz

+|   |   |   |   |   |-- resourceproto-1.1.1.tar.xz

+|   |   |   |   |   |-- scrnsaverproto-1.2.1.tar.xz

+|   |   |   |   |   |-- videoproto-2.3.1.tar.xz

+|   |   |   |   |   |-- xcmiscproto-1.2.1.tar.xz

+|   |   |   |   |   |-- xextproto-7.2.0.tar.xz

 |   |   |   |   |   |-- xf86bigfontproto-1.2.0.tar.xz

 |   |   |   |   |   |-- xf86dgaproto-2.1.tar.xz

-|   |   |   |   |   |-- xf86driproto-2.1.0.tar.xz

+|   |   |   |   |   |-- xf86driproto-2.1.1.tar.xz

 |   |   |   |   |   |-- xf86miscproto-0.9.3.tar.xz

-|   |   |   |   |   |-- xf86rushproto-1.1.2.tar.xz

-|   |   |   |   |   |-- xf86vidmodeproto-2.3.tar.xz

-|   |   |   |   |   |-- xineramaproto-1.2.tar.xz

-|   |   |   |   |   |-- xproto-7.0.16.tar.xz

-|   |   |   |   |   `-- xproxymanagementprotocol-1.0.3.tar.xz

+|   |   |   |   |   |-- xf86vidmodeproto-2.3.1.tar.xz

+|   |   |   |   |   |-- xineramaproto-1.2.1.tar.xz

+|   |   |   |   |   `-- xproto-7.0.21.tar.xz

 |   |   |   |   |-- util

 |   |   |   |   |   |-- gccmakedep-1.0.2.tar.xz

-|   |   |   |   |   |-- imake-1.0.3.tar.xz

-|   |   |   |   |   |-- lndir-1.0.1.tar.xz

-|   |   |   |   |   |-- makedepend-1.0.2.tar.xz

-|   |   |   |   |   |-- util-macros-1.7.0.tar.xz

-|   |   |   |   |   `-- xorg-cf-files-1.0.3.tar.xz

+|   |   |   |   |   |-- imake-1.0.4.tar.xz

+|   |   |   |   |   |-- lndir-1.0.2.tar.xz

+|   |   |   |   |   |-- makedepend-1.0.3.tar.xz

+|   |   |   |   |   |-- util-macros-1.13.0.tar.xz

+|   |   |   |   |   `-- xorg-cf-files-1.0.4.tar.xz

 |   |   |   |   |-- xcb

 |   |   |   |   |   |-- libpthread-stubs-0.3.tar.xz

-|   |   |   |   |   |-- libxcb-1.6.tar.xz

+|   |   |   |   |   |-- libxcb-1.7.tar.xz

 |   |   |   |   |   |-- xcb-proto-1.6.tar.xz

 |   |   |   |   |   |-- xcb-util-0.3.6.tar.xz

 |   |   |   |   |   `-- xpyb-1.2.tar.xz

 |   |   |   |   `-- xserver

-|   |   |   |       `-- xorg-server-1.7.7.tar.xz

+|   |   |   |       `-- xorg-server-1.9.5.tar.xz

 |   |   |   `-- x11.SlackBuild

 |   |   |-- x11-skel

 |   |   |   |-- doinst.sh.gz

@@ -8904,39 +8941,41 @@ see additional documentation files.
 |   |   |   |-- slack-desc

 |   |   |   `-- x11-skel.SlackBuild

 |   |   |-- xaw3d

-|   |   |   |-- Xaw3d-1.5-debian-fixes.diff.gz

-|   |   |   |-- Xaw3d-1.5E.diff.gz

-|   |   |   |-- Xaw3d-1.5E.tar.gz

+|   |   |   |-- pull-xaw3d.sh

 |   |   |   |-- slack-desc

+|   |   |   |-- xaw3d-20110415git.tar.xz

 |   |   |   `-- xaw3d.SlackBuild

+|   |   |-- xdg-user-dirs

+|   |   |   |-- doinst.sh.gz

+|   |   |   |-- slack-desc

+|   |   |   |-- xdg-user-dirs-0.13.tar.xz

+|   |   |   `-- xdg-user-dirs.SlackBuild

 |   |   |-- xdg-utils

 |   |   |   |-- doinst.sh.gz

 |   |   |   |-- slack-desc

-|   |   |   |-- xdg-utils-20100506cvs.tar.bz2

+|   |   |   |-- xdg-utils-1.1.0-rc1.tar.bz2

 |   |   |   |-- xdg-utils-cvs_checkout.sh

 |   |   |   |-- xdg-utils.SlackBuild

 |   |   |   `-- xdg-utils.info

-|   |   |-- xf86-video-nouveau

-|   |   |   |-- this_is_NOT_a_driver.txt

-|   |   |   `-- xf86-video-nouveau-blacklist-noarch-1.txz

 |   |   `-- xterm

 |   |       |-- slack-desc

-|   |       |-- xterm-258.tar.xz

+|   |       |-- xterm-267.tar.xz

 |   |       `-- xterm.SlackBuild

 |   |-- xap

 |   |   |-- MPlayer

 |   |   |   |-- Blue-1.7.tar.bz2

 |   |   |   |-- MPlayer.SlackBuild

-|   |   |   |-- MPlayer_nolibdvdcss-20100218.tar.xz

+|   |   |   |-- MPlayer_nolibdvdcss-20101218.tar.xz

 |   |   |   `-- slack-desc

 |   |   |-- audacious

-|   |   |   |-- audacious-2.3.tar.xz

+|   |   |   |-- audacious-2.4.4.tar.xz

 |   |   |   |-- audacious.SlackBuild

 |   |   |   |-- doinst.sh.gz

 |   |   |   `-- slack-desc

 |   |   |-- audacious-plugins

-|   |   |   |-- audacious-plugins-2.3.tar.xz

+|   |   |   |-- audacious-plugins-2.4.4.tar.xz

 |   |   |   |-- audacious-plugins.SlackBuild

+|   |   |   |-- audacious-plugins.alsa.noise.is.not.helpful.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- blackbox

 |   |   |   |-- bbkeys-0.9.1.tar.xz

@@ -8946,13 +8985,11 @@ see additional documentation files.
 |   |   |   |-- slack-desc

 |   |   |   `-- xinitrc.blackbox.gz

 |   |   |-- blueman

-|   |   |   |-- blueman-1.21.tar.xz

 |   |   |   |-- blueman-open

+|   |   |   |-- blueman-r708.tar.xz

 |   |   |   |-- blueman-use_blueman-open_for_obexfs.diff.gz

 |   |   |   |-- blueman.SlackBuild

 |   |   |   |-- doinst.sh.gz

-|   |   |   |-- fix_on_off_loop.diff.gz

-|   |   |   |-- no_hide_applet.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- electricsheep

 |   |   |   |-- README.slackware

@@ -8962,7 +8999,7 @@ see additional documentation files.
 |   |   |   |-- electricsheep_gnome-open.patch

 |   |   |   `-- slack-desc

 |   |   |-- fluxbox

-|   |   |   |-- fluxbox-1.1.1.tar.bz2

+|   |   |   |-- fluxbox-1.3.1.tar.xz

 |   |   |   |-- fluxbox.SlackBuild

 |   |   |   |-- slack-desc

 |   |   |   `-- xinitrc.fluxbox.gz

@@ -8986,12 +9023,11 @@ see additional documentation files.
 |   |   |   |-- gftp.desktop.gz

 |   |   |   `-- slack-desc

 |   |   |-- gimp

-|   |   |   |-- gimp-2.6.8.tar.xz

+|   |   |   |-- gimp-2.6.11.tar.xz

 |   |   |   |-- gimp.SlackBuild

-|   |   |   |-- gimp.png14.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- gkrellm

-|   |   |   |-- gkrellm-2.3.4.tar.bz2

+|   |   |   |-- gkrellm-2.3.5.tar.bz2

 |   |   |   |-- gkrellm-countdown-0.1.1.tar.gz

 |   |   |   |-- gkrellm.SlackBuild

 |   |   |   |-- gkrellm.theme.defaults.diff.gz

@@ -9002,39 +9038,32 @@ see additional documentation files.
 |   |   |   |-- eboard-1.1.1.tar.bz2

 |   |   |   |-- eboard.assert.diff.gz

 |   |   |   |-- eboard.desktop

-|   |   |   |-- gnuchess-5.07.tar.bz2

+|   |   |   |-- gnuchess-5.08.tar.xz

 |   |   |   |-- gnuchess.SlackBuild

-|   |   |   |-- gnuchess.SlackBuild.diff.gz

-|   |   |   |-- gnuchess.gcc4_fix.diff.gz

-|   |   |   |-- gnuchess.getline.glibc.diff.gz

 |   |   |   |-- slack-desc

-|   |   |   |-- xboard-4.4.2.tar.xz

+|   |   |   |-- xboard-4.5.1.tar.xz

 |   |   |   `-- xboard.desktop

 |   |   |-- gnuplot

-|   |   |   |-- gnuplot-4.2.6.tar.xz

+|   |   |   |-- gnuplot-4.4.3.tar.xz

 |   |   |   |-- gnuplot.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- gucharmap

 |   |   |   |-- doinst.sh.gz

-|   |   |   |-- gucharmap-2.28.2.tar.xz

+|   |   |   |-- gucharmap-2.33.2.tar.xz

 |   |   |   |-- gucharmap.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- gv

-|   |   |   |-- gv-3.6.9.tar.xz

+|   |   |   |-- gv-3.7.1.tar.xz

 |   |   |   |-- gv.SlackBuild

-|   |   |   `-- slack-desc

-|   |   |-- gxine

-|   |   |   |-- gxine-0.5.903.tar.bz2

-|   |   |   |-- gxine.SlackBuild

-|   |   |   |-- gxine.desktop.gz

+|   |   |   |-- gv.keysym.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- imagemagick

-|   |   |   |-- ImageMagick-6.5.9-6.tar.xz

+|   |   |   |-- ImageMagick-6.6.6-10.tar.xz

 |   |   |   |-- imagemagick.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- mozilla-firefox

-|   |   |   |-- firefox-3.6.3.source.tar.bz2

-|   |   |   |-- firefox-3.6.3.source.tar.bz2.asc

+|   |   |   |-- firefox-4.0.source.tar.bz2

+|   |   |   |-- firefox-4.0.source.tar.bz2.asc

 |   |   |   |-- firefox.moz_plugin_path.diff.gz

 |   |   |   |-- firefox.png

 |   |   |   |-- mimeTypes.rdf.gz

@@ -9047,23 +9076,22 @@ see additional documentation files.
 |   |   |   |-- mozilla-thunderbird.SlackBuild

 |   |   |   |-- mozilla-thunderbird.desktop

 |   |   |   |-- slack-desc

-|   |   |   |-- thunderbird-3.0.4.source.tar.bz2

-|   |   |   |-- thunderbird-3.0.4.source.tar.bz2.asc

+|   |   |   |-- thunderbird-3.1.9.source.tar.bz2

+|   |   |   |-- thunderbird-3.1.9.source.tar.bz2.asc

 |   |   |   `-- thunderbird.png

 |   |   |-- pan

-|   |   |   |-- pan-0.133.tar.bz2

+|   |   |   |-- pan-0.134.tar.xz

 |   |   |   |-- pan.SlackBuild

-|   |   |   |-- pan.gcc44.diff.gz

-|   |   |   |-- pan.gmime2.4.diff.gz

 |   |   |   `-- slack-desc

 |   |   |-- pidgin

-|   |   |   |-- pidgin-2.7.0.tar.xz

+|   |   |   |-- pidgin-2.7.11.tar.xz

 |   |   |   |-- pidgin-encryption-3.1.tar.gz

 |   |   |   |-- pidgin.SlackBuild

 |   |   |   |-- purple-allow-sign-rsa-md5.patch.gz

 |   |   |   `-- slack-desc

 |   |   |-- rdesktop

 |   |   |   |-- rdesktop-1.6.0.tar.bz2

+|   |   |   |-- rdesktop.CVE-2011-1595.diff.gz

 |   |   |   |-- rdesktop.SlackBuild

 |   |   |   `-- slack-desc

 |   |   |-- rxvt

@@ -9074,7 +9102,7 @@ see additional documentation files.
 |   |   |-- sane

 |   |   |   |-- dll.conf.additions.gz

 |   |   |   |-- doinst.sh.gz

-|   |   |   |-- sane-backends-1.0.21.tar.bz2

+|   |   |   |-- sane-backends-1.0.22.tar.bz2

 |   |   |   |-- sane-frontends-1.0.14-sane_cap_always_settable.diff.gz

 |   |   |   |-- sane-frontends-1.0.14.tar.bz2

 |   |   |   |-- sane.SlackBuild

@@ -9088,7 +9116,7 @@ see additional documentation files.
 |   |   |   |   |-- seamonkey-nss.pc

 |   |   |   |   |-- seamonkey-plugin.pc

 |   |   |   |   `-- seamonkey-xpcom.pc

-|   |   |   |-- seamonkey-2.0.4.source.tar.xz

+|   |   |   |-- seamonkey-2.1b3.source.tar.xz

 |   |   |   |-- seamonkey-icon.png

 |   |   |   |-- seamonkey-mail-icon.png

 |   |   |   |-- seamonkey-mail.desktop

@@ -9127,56 +9155,62 @@ see additional documentation files.
 |   |   |   |-- slack-desc

 |   |   |   |-- x3270-3.3.7p8.tar.bz2

 |   |   |   `-- x3270.SlackBuild

+|   |   |-- xaos

+|   |   |   |-- slack-desc

+|   |   |   |-- xaos-3.5.tar.xz

+|   |   |   |-- xaos.6.gz

+|   |   |   |-- xaos.SlackBuild

+|   |   |   |-- xaos.desktop

+|   |   |   `-- xaos.png

 |   |   |-- xchat

-|   |   |   |-- patches

-|   |   |   |   |-- patches.url

-|   |   |   |   |-- xc286-smallfixes.diff.gz

-|   |   |   |   `-- xchat.gtk_2_14.diff.gz

 |   |   |   |-- slack-desc

-|   |   |   |-- xchat-2.8.6.tar.bz2

+|   |   |   |-- xchat-2.8.8.tar.bz2

 |   |   |   `-- xchat.SlackBuild

 |   |   |-- xfce

 |   |   |   |-- icons.tar.xz

 |   |   |   |-- patches

-|   |   |   |   |-- terminal.gtk.2.18.fix.diff.gz

-|   |   |   |   |-- thunar-1.0.1-fixup_docdir.diff.gz

-|   |   |   |   |-- thunar-1.0.1-png14.diff.gz

-|   |   |   |   |-- thunar-fix_umask_properly.diff.gz

+|   |   |   |   |-- Thunar.thunar-vfs-io-local.diff.gz

+|   |   |   |   |-- fixup_comments_in_xfce-utils-Xft.xrdb.diff.gz

+|   |   |   |   |-- mousepad-fix_find.diff.gz

+|   |   |   |   |-- mousepad-fix_find_and_replace.diff.gz

+|   |   |   |   |-- no_sensitive_panel_during_plugin_moves.patch.gz

+|   |   |   |   |-- thunar-1.0.2-fixup_docdir.diff.gz

 |   |   |   |   |-- xfcalendar.desktop.in.diff.gz

+|   |   |   |   |-- xfce-utils-load_systemwide_Xmodmap.diff.gz

 |   |   |   |   |-- xfce-utils.xinitrc.consolekit.diff.gz

-|   |   |   |   |-- xfce4-settings.libxklavier5.diff.gz

-|   |   |   |   `-- xfdesktop-fix_education_icon.diff.gz

+|   |   |   |   |-- xfdesktop-fix_education_icon.diff.gz

+|   |   |   |   `-- xfsm-compat-kde.c-start-kde4-services.diff.gz

 |   |   |   |-- profile.d

 |   |   |   |   |-- xfce.csh

 |   |   |   |   `-- xfce.sh

 |   |   |   |-- slack-desc

 |   |   |   |-- src

-|   |   |   |   |-- Terminal-0.4.4.tar.xz

-|   |   |   |   |-- Thunar-1.0.1.tar.xz

-|   |   |   |   |-- exo-0.3.106.tar.xz

+|   |   |   |   |-- Terminal-0.4.6.tar.xz

+|   |   |   |   |-- Thunar-1.0.2.tar.xz

+|   |   |   |   |-- exo-0.3.107.tar.xz

 |   |   |   |   |-- gtk-xfce-engine-2.6.0.tar.xz

-|   |   |   |   |-- libxfce4menu-4.6.1.tar.xz

-|   |   |   |   |-- libxfce4util-4.6.1.tar.xz

-|   |   |   |   |-- libxfcegui4-4.6.3.tar.xz

+|   |   |   |   |-- libxfce4menu-4.6.2.tar.xz

+|   |   |   |   |-- libxfce4util-4.6.2.tar.xz

+|   |   |   |   |-- libxfcegui4-4.6.4.tar.xz

 |   |   |   |   |-- mousepad-0.2.16.tar.xz

 |   |   |   |   |-- orage-4.6.1.tar.xz

-|   |   |   |   |-- xfce-utils-4.6.1.tar.xz

-|   |   |   |   |-- xfce4-appfinder-4.6.1.tar.xz

-|   |   |   |   |-- xfce4-dev-tools-4.7.2.tar.xz

+|   |   |   |   |-- xfce-utils-4.6.2.tar.xz

+|   |   |   |   |-- xfce4-appfinder-4.6.2.tar.xz

+|   |   |   |   |-- xfce4-dev-tools-4.8.0.tar.xz

 |   |   |   |   |-- xfce4-mixer-4.6.1.tar.xz

-|   |   |   |   |-- xfce4-panel-4.6.3.tar.xz

-|   |   |   |   |-- xfce4-session-4.6.1.tar.xz

-|   |   |   |   |-- xfce4-settings-4.6.4.tar.xz

-|   |   |   |   |-- xfconf-4.6.1.tar.xz

-|   |   |   |   |-- xfdesktop-4.6.1.tar.xz

+|   |   |   |   |-- xfce4-panel-4.6.4.tar.xz

+|   |   |   |   |-- xfce4-session-4.6.2.tar.xz

+|   |   |   |   |-- xfce4-settings-4.6.5.tar.xz

+|   |   |   |   |-- xfconf-4.6.2.tar.xz

+|   |   |   |   |-- xfdesktop-4.6.2.tar.xz

 |   |   |   |   |-- xfprint-4.6.1.tar.xz

-|   |   |   |   |-- xfwm4-4.6.1.tar.xz

+|   |   |   |   |-- xfwm4-4.6.2.tar.xz

 |   |   |   |   `-- xfwm4-themes-4.6.0.tar.xz

 |   |   |   `-- xfce.SlackBuild

 |   |   |-- xfce4-notifyd

 |   |   |   |-- doinst.sh.gz

 |   |   |   |-- slack-desc

-|   |   |   |-- xfce4-notifyd-0.1.0.tar.bz2

+|   |   |   |-- xfce4-notifyd-0.1.1.tar.bz2

 |   |   |   `-- xfce4-notifyd.SlackBuild

 |   |   |-- xfce4-power-manager

 |   |   |   |-- doinst.sh.gz

@@ -9205,12 +9239,12 @@ see additional documentation files.
 |   |   |   |-- xminesweep3.0.tar.gz

 |   |   |   |-- xneko.tar.gz

 |   |   |   |-- xroach.tar.gz

-|   |   |   `-- xsnow-1.40.tar.gz

+|   |   |   `-- xsnow-1.42.tar.gz

 |   |   |-- xine-lib

 |   |   |   |-- slack-desc

-|   |   |   |-- xine-lib-1.1.17.ff.diff.gz

-|   |   |   |-- xine-lib-1.1.17.tar.bz2

-|   |   |   `-- xine-lib.SlackBuild

+|   |   |   |-- xine-lib-1.1.19.tar.xz

+|   |   |   |-- xine-lib.SlackBuild

+|   |   |   `-- xine-lib.XvMClib.h.diff.gz

 |   |   |-- xine-ui

 |   |   |   |-- slack-desc

 |   |   |   |-- xine-ui-0.99.5.tar.bz2

@@ -9223,8 +9257,8 @@ see additional documentation files.
 |   |   |   |-- l-linux.xbm

 |   |   |   |-- s-bob.xbm

 |   |   |   |-- slack-desc

-|   |   |   |-- xlockmore-5.28.tar.bz2

-|   |   |   |-- xlockmore-5.28.tar.bz2.asc

+|   |   |   |-- xlockmore-5.32.tar.bz2

+|   |   |   |-- xlockmore-5.32.tar.bz2.asc

 |   |   |   |-- xlockmore.SlackBuild

 |   |   |   `-- xlockmore.bitmap.diff.gz

 |   |   |-- xmms

@@ -9273,6 +9307,10 @@ see additional documentation files.
 |   |   |   |   |-- xpdf-3.02pl3.patch.sig

 |   |   |   |   |-- xpdf-3.02pl4.patch

 |   |   |   |   |-- xpdf-3.02pl4.patch.sig

+|   |   |   |   |-- xpdf-3.02pl5.patch

+|   |   |   |   |-- xpdf-3.02pl5.patch.sig

+|   |   |   |   |-- xpdf-3.02pl6.patch

+|   |   |   |   |-- xpdf-3.02pl6.patch.sig

 |   |   |   |   |-- xpdf-resizefix.diff.gz

 |   |   |   |   |-- xpdf_3.02-1.3.diff.gz

 |   |   |   |   `-- xpdfrc.diff.gz

@@ -9283,12 +9321,12 @@ see additional documentation files.
 |   |   |   `-- xpdf.desktop

 |   |   |-- xsane

 |   |   |   |-- slack-desc

-|   |   |   |-- xsane-0.996.tar.bz2

+|   |   |   |-- xsane-0.998.tar.xz

 |   |   |   `-- xsane.SlackBuild

 |   |   |-- xscreensaver

 |   |   |   |-- setuid.c.gz

 |   |   |   |-- slack-desc

-|   |   |   |-- xscreensaver-5.11.tar.xz

+|   |   |   |-- xscreensaver-5.12.tar.xz

 |   |   |   |-- xscreensaver.SlackBuild

 |   |   |   |-- xscreensaver.electricsheep.diff.gz

 |   |   |   `-- xscreensaver.setuid.diff.gz

@@ -9306,9 +9344,13 @@ see additional documentation files.
 |   |   |   `-- xv.prefix_x86_64.diff.gz

 |   |   `-- xxgdb

 |   |       |-- slack-desc

-|   |       |-- xxgdb-1.12.tar.gz

-|   |       |-- xxgdb.SlackBuild

-|   |       `-- xxgdb.fix_glibc_and_gcc.diff.gz

+|   |       |-- xxgdb-1.08-glibc.patch.xz

+|   |       |-- xxgdb-1.12-debian-filemenu.patch.xz

+|   |       |-- xxgdb-1.12-debian-pty.patch.xz

+|   |       |-- xxgdb-1.12-mandriva.patch.xz

+|   |       |-- xxgdb-1.12-sysv.patch.xz

+|   |       |-- xxgdb-1.12.tar.xz

+|   |       `-- xxgdb.SlackBuild

 |   `-- y

 |       `-- bsd-games

 |           |-- bsd-games-2.13.lsm

@@ -9336,17 +9378,76 @@ see additional documentation files.
 |   |-- MANIFEST.bz2

 |   |-- PACKAGES.TXT

 |   |-- packages

-|   |   |-- amarok-2.3.0.90-x86_64-1.txt

-|   |   |-- amarok-2.3.0.90-x86_64-1.txz

-|   |   |-- amarok-2.3.0.90-x86_64-1.txz.asc

-|   |   |-- btrfs-progs-20100518-x86_64-1.txt

-|   |   |-- btrfs-progs-20100518-x86_64-1.txz

-|   |   `-- btrfs-progs-20100518-x86_64-1.txz.asc

+|   |   |-- kernel-firmware-2.6.38.4-noarch-1.txt

+|   |   |-- kernel-firmware-2.6.38.4-noarch-1.txz

+|   |   |-- kernel-firmware-2.6.38.4-noarch-1.txz.asc

+|   |   |-- kernel-generic-2.6.38.4-x86_64-1.txt

+|   |   |-- kernel-generic-2.6.38.4-x86_64-1.txz

+|   |   |-- kernel-generic-2.6.38.4-x86_64-1.txz.asc

+|   |   |-- kernel-headers-2.6.38.4-x86-1.txt

+|   |   |-- kernel-headers-2.6.38.4-x86-1.txz

+|   |   |-- kernel-headers-2.6.38.4-x86-1.txz.asc

+|   |   |-- kernel-huge-2.6.38.4-x86_64-1.txt

+|   |   |-- kernel-huge-2.6.38.4-x86_64-1.txz

+|   |   |-- kernel-huge-2.6.38.4-x86_64-1.txz.asc

+|   |   |-- kernel-modules-2.6.38.4-x86_64-1.txt

+|   |   |-- kernel-modules-2.6.38.4-x86_64-1.txz

+|   |   |-- kernel-modules-2.6.38.4-x86_64-1.txz.asc

+|   |   |-- kernel-source-2.6.38.4-noarch-1.txt

+|   |   |-- kernel-source-2.6.38.4-noarch-1.txz

+|   |   |-- kernel-source-2.6.38.4-noarch-1.txz.asc

+|   |   |-- libdrm-2.4.25-x86_64-1.txt

+|   |   |-- libdrm-2.4.25-x86_64-1.txz

+|   |   |-- libdrm-2.4.25-x86_64-1.txz.asc

+|   |   |-- mesa-7.10.2-x86_64-1.txt

+|   |   |-- mesa-7.10.2-x86_64-1.txz

+|   |   |-- mesa-7.10.2-x86_64-1.txz.asc

+|   |   |-- xf86-video-nouveau-git_20110417_8378443-x86_64-1.txt

+|   |   |-- xf86-video-nouveau-git_20110417_8378443-x86_64-1.txz

+|   |   `-- xf86-video-nouveau-git_20110417_8378443-x86_64-1.txz.asc

 |   `-- source

-|       `-- btrfs-progs

-|           |-- btrfs-progs-20100518.tar.xz

-|           |-- btrfs-progs.SlackBuild

-|           `-- slack-desc

+|       |-- libdrm

+|       |   |-- libdrm-2.4.25.tar.xz

+|       |   |-- libdrm.SlackBuild

+|       |   `-- slack-desc

+|       |-- linux-2.6.35.12-configs

+|       |   |-- config-generic-2.6.35.12

+|       |   `-- config-huge-2.6.35.12

+|       |-- linux-2.6.38.4-configs

+|       |   |-- config-generic-2.6.38.4

+|       |   `-- config-huge-2.6.38.4

+|       |-- linux-2.6.39-rc4-configs

+|       |   |-- config-generic-2.6.39-rc4

+|       |   `-- config-huge-2.6.39-rc4

+|       |-- mesa

+|       |   |-- MesaGLUT-7.10.2.tar.xz

+|       |   |-- MesaLib-7.10.2.tar.xz

+|       |   |-- README.GIT

+|       |   |-- get-mesa.sh

+|       |   |-- mesa-demos-8.0.1.tar.xz

+|       |   |-- mesa.SlackBuild

+|       |   |-- mesa.url

+|       |   |-- patches

+|       |   |   |-- i915_fragment_shader_disable.patch.gz

+|       |   |   `-- mesa-7.9-libdrm-2.4.23-nouveau-api.patch.gz

+|       |   `-- slack-desc

+|       `-- xf86-video-nouveau

+|           |-- arch.use.flags

+|           |-- build

+|           |-- configure

+|           |   `-- xf86-video-nouveau

+|           |-- doinst.sh

+|           |-- get-xf86-video-nouveau.sh

+|           |-- modularize

+|           |-- noarch

+|           |-- package-blacklist

+|           |-- slack-desc

+|           |   `-- xf86-video-nouveau

+|           |-- src

+|           |   `-- driver

+|           |       `-- xf86-video-nouveau-git_20110417_8378443.tar.xz

+|           |-- x11.SlackBuild

+|           `-- xf86-video-nouveau.SlackBuild

 `-- usb-and-pxe-installers

     |-- README_PXE.TXT

     |-- README_USB.TXT

@@ -9354,5 +9455,5 @@ see additional documentation files.
     |-- usbboot.img

     `-- usbimg2disk.sh

 

-822 directories, 8526 files

+874 directories, 8575 files

 

diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index eb02035e..53c67bef 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,13 +1,11 @@
 
-Slackware 13.1 release notes.  Wed May 19 04:40:19 UTC 2010
+Slackware 13.37 release notes.  Mon Apr 25 02:43:57 UTC 2011
 
 Hi folks,
 
     Historically, the RELEASE_NOTES had been mostly technical 
 information, but once again Robby Workman has covered the important 
-technical details in CHANGES_AND_HINTS.TXT.  Thanks!  If you are 
-upgrading an existing installation, don't miss the section on the LIBATA 
-SWITCHOVER.
+technical details in CHANGES_AND_HINTS.TXT.  Thanks!
 
     I'll mention a few technical items here.  Slackware's userspace does 
 require a recent 2.6.x kernel (I believe 2.6.27.x is a minimum for 
@@ -16,44 +14,21 @@ better off running the included kernels that we've tested things
 against. The best kernel to run (even on a one CPU/core machine) is the 
 generic SMP one, but that needs an initrd, so be sure to read the 
 instructions in /boot after installing with a huge* kernel if you plan 
-to switch. We have chosen to use the 2.6.33.4 kernel after testing the 
-2.6.33.x kernel branch extensively.  I would not suggest trying to run 
-without udev.  Consider it the userspace portion of the kernel.  It *is* 
-possible, but if you must do that you'll have to tweak a couple things 
-here and there.  The specifics are left as an exercise for the advanced 
-user.  Wait, an advanced user would just use udev.  Really, it works and 
-makes things a lot easier.
+to switch. We have chosen to use the 2.6.37.6 kernel after testing the 
+2.6.37.x kernel branch extensively (and because there are still a few
+things that work in 2.6.37.x but not in 2.6.38.x).  But, for those who
+would like to run the latest kernel, there are 2.6.38.4 kernels included
+in /testing.  Also in the /testing/source/ directory you'll find config
+files for two other kernel versions, 2.6.35.12 (which is a longterm
+supported branch), and 2.6.39-rc4, a release candidate for
+the next major kernel series.
 
-    Slackware 13.1 contains version 4.4.3 of the KDE Software 
-Compilation.  In the nearly 8 months since the release of Slackware 
-13.0, the KDE team made some huge improvements, including better 
-handling of netbook screen resolutions, a new authentication framework 
-based on standards from freedesktop.org, and a new tabbing feature that 
-allows applications to be grouped in a tabbed interface.  You'll notice 
-a snappier feel, helped also by the improved performance of Qt version 
-4.6.2.
-
-    Several Xfce components have been updated as well.  Xfce continues 
-to be a great lightweight desktop that doesn't get in your way. If you 
-haven't looked at this great desktop environment lately, you might want 
-to give it another try.  Thanks to Robby for tracking the Xfce 
-development closely and making sure everything was just exactly right in 
-the Slackware Xfce packages.
-
-    If you prefer GNOME, there are teams online producing GNOME for 
-Slackware.  Here are a few places to look:
+    Slackware 13.37 contains updated versions of both KDE and Xfce, but
+if you prefer GNOME then you'll be pleased with the work that the
+GNOME SlackBuild (GSB) team is doing producing a full-featured GNOME
+desktop for Slackware:
 
     http://gnomeslackbuild.org
-    http://www.droplinegnome.net/
-    http://www.gware.org/
-
-    If any of these replaces some system components, using them voids 
-your warranty.  ;-)  But it should work, *if* you absolutely must have 
-GNOME.  I'd suggest Xfce instead if you want a GTK+ based desktop.  If 
-you do want to use GNOME, remember that there may be some updates needed 
-after 13.1 is released, so it might be best not to rush into it.  
-Thanks to these teams for making the GNOME desktop a viable option for 
-Slackware users.
 
     Need more build scripts?  Something that you wanted wasn't included 
 in Slackware?  Well, then check out slackbuilds.org. Several of the team 
@@ -66,31 +41,29 @@ multilib compilers (read more here: http://alien.slackbook.org/blog/),
 Robby Workman for following X.Org, udev, wicd, xfce, and tons of other 
 projects, building and testing all that stuff, writing documentation, 
 his work with the team at slackbuilds.org, and lots of package upgrades 
-(like the switch to the bluez4 bluetooth stack), Piter Punk for udev and 
-slackpkg work, updating the shadow password system, writing the initial 
-patch for polkit to use a shadow authentication backend so we could 
-consider using KDE 4.4.3, and making tap-to-click work with Synaptics 
-touchpads out-of-the-box, Stuart Winter for more updates to 
-linuxdoc-tools, and for all kinds of fixes throughout the installer and 
-system (he finds my bugs all the time while porting packages to ARM for 
-the ARMedslack port:  http://www.armedslack.org/), Alan Hicks for 
-testing the installer on Apple hardware, Vincent Batts for keeping Ruby 
-working well and other miscellaneous fixes, Andrew Psaltis for work on 
-the polkit/shadow patches, Heinz Wiesinger for Qt (and other) fixes, 
+(like the switch to the bluez4 bluetooth stack), Piter Punk for udev and
+slackpkg work, Stuart Winter for more updates to linuxdoc-tools, slacktrack,
+and for all kinds of fixes throughout the installer and system (he finds my
+bugs all the time while porting packages to ARM for the ARMedslack port:
+http://www.armedslack.org/), Alan Hicks for testing the installer on Apple
+hardware, Vincent Batts for keeping Ruby working well (difficult!) and other
+miscellaneous fixes, Heinz Wiesinger for PHP (and other) fixes,
 Amritpal Bath for various bugfixes and helping with release torrents, 
 mrgoblin for testing RAID, bluetooth, and well, everything (and fixing a 
 lot of it, too), other very honorable mentions go to Erik Jan Tromp, 
-Mark Post, Karl Magnus Kolstoe, Fizban, Fred Emmott, and NetrixTardis, 
+Mark Post, Karl Magnus Kolstoe, Fred Emmott, and NetrixTardis, 
 and anyone else I'm forgetting (including the other team members who 
 contributed little fixes and suggestions here and there along with 
 general moral support), and all the folks who emailed in bug reports 
 (and especially fixes).  Thanks for the technical assistance (*you* make 
 this possible), and for keeping the project a good time.  And, of 
 course, thanks *much* to the upstream developers for such nice building 
-materials.  As always, thanks to my wife Andrea and daughter Briah (who 
-is becoming a surprisingly good beta tester already!)
+materials.  As always, thanks to my wife Andrea and daughter Briah.
 
 Have fun!
 
 Pat Volkerding <volkerdi@slackware.com>
 
+---
+Help keep the lights on @slackware!  Shop at http://store.slackware.com
+
diff --git a/UPGRADE.TXT b/UPGRADE.TXT
index afdc3d9b..5508e11f 100644
--- a/UPGRADE.TXT
+++ b/UPGRADE.TXT
@@ -1,11 +1,11 @@
 

-Slackware 13.0 to 13.1 Upgrade HOWTO  <volkerdi@slackware.com>

+Slackware 13.1 to 13.37 Upgrade HOWTO  <volkerdi@slackware.com>

 

-This document explains how to upgrade from Slackware 13.0 to Slackware 13.1.

+This document explains how to upgrade from Slackware 13.1 to Slackware 13.37.

 

 ----------------------------------------------------------------------------

 

-For details of important changes from Slackware 13.0 to 13.1, see the file

+For details of important changes from Slackware 13.1 to 13.37, see the file

 'CHANGES_AND_HINTS.TXT'.  Thanks to Robby Workman for help with this.

 If you have partitions in /etc/fstab named /dev/hd*, please take special

 note of the instructions for the changeover to /dev/sd* devices or your

@@ -18,7 +18,7 @@ process is complete. Back it up, or take your chances.
 

 OK, now that everything is safely backed up, let's proceed. :-)

 

-To do this, you'll need the Slackware 13.1 packages.  If these are on a CD,

+To do this, you'll need the Slackware 13.37 packages.  If these are on a CD,

 create a new directory to mount the CD on so that it doesn't get in the way

 during the upgrade:

 

@@ -48,7 +48,7 @@ is that you know where the slackware packages directory is.  We'll use
 

     upgradepkg /root/slackware/a/pkgtools-*.tgz

     upgradepkg /root/slackware/a/tar-*.tgz

-    installpkg /root/slackware/a/xz-*.tgz

+    upgradepkg /root/slackware/a/xz-*.tgz

     upgradepkg /root/slackware/a/findutils-*.txz

 

 

@@ -81,13 +81,15 @@ is that you know where the slackware packages directory is.  We'll use
 

     You may spot some old, obsolete, or discontinued packages.  If so,

     you can remove these using 'removepkg'.  This command will get rid of

-    the packages which became obsolete since Slackware 13.0:

+    the packages which became obsolete since Slackware 13.1:

 

-    removepkg bluez-libs bluez-utils cupsddk device-mapper epic4 gqview \

-      kdelibs-experimental lbxproxy libgtkhtml liblbxutil libungif \

-      libv4l loadlin mpg321 mplayerthumbs proxymngr xf86-input-citron \

-      xf86-input-elographics xf86-input-fpit xf86-input-hyperpen \

-      xf86-input-mutouch xf86-video-newport xf86-video-xgixp

+    removepkg util-linux-ng guidance-power-manager eggdbus iptraf \

+      libXTrap libXprintAppUtil libXprintUtil libxkbui rstart trapproto \

+      xf86rushproto xfindproxy xfwp xplsprinters xprehashprinterlist \

+      xproxymanagementprotocol xsetmode xsetpointer xtrap 

+

+    Note the removal of util-linux-ng!  You better make sure that the

+    renamed util-linux package is installed before removing that.  :-)

 

 

 5.  Fix your config files.  Some of the config files in /etc are going to 

@@ -132,7 +134,7 @@ is that you know where the slackware packages directory is.  We'll use
 

     upgradepkg *t?z

 

-    If your language has been added to KDE since Slackware 13.0, you'll

+    If your language has been added to KDE since Slackware 13.1, you'll

     need to install it using installpkg, or upgradepkg --install-new.

    

     Typically you'll need to make sure that you have installed the

@@ -147,7 +149,7 @@ is that you know where the slackware packages directory is.  We'll use
     stick to boot, copy the new kernel to it in place of the old one.

 

     If you were using devices such as /dev/hda (IDE hard drive) with

-    Slackware 13.0, you will need to consider how to switch over to the

+    Slackware 13.1, you will need to consider how to switch over to the

     new /dev/sda type device names.  See CHANGES_AND_HINTS.TXT for complete

     instructions on how to do this.  If you have not read this yet, now

     is a great time to go look at that.  Forget about step 8 and 9 and

@@ -161,7 +163,7 @@ is that you know where the slackware packages directory is.  We'll use
 9.  Reboot to start using the new kernel.

 

 

-At this point you should be running Slackware 13.1.  :-)

+At this point you should be running Slackware 13.37.  :-)

 

 I wish everyone good luck with this!

 

diff --git a/extra/google-chrome/README b/extra/google-chrome/README
new file mode 100644
index 00000000..cf64c7b8
--- /dev/null
+++ b/extra/google-chrome/README
@@ -0,0 +1,54 @@
+Google Chrome (Open Source Web Browser)
+---------------------------------------
+
+Here's how to install Google Chrome on Slackware.
+
+
+First, go to the Google Chrome site:
+
+http://www.google.com/chrome
+
+Click the download button, and select either:
+
+    < >  32 bit .deb (for Debian/Ubuntu)
+OR
+    < >  64 bit .deb (for Debian/Ubuntu)
+
+
+Read and accept the license terms, and download the .deb package.
+
+
+Then, with the google-chrome-stable_current_i386.deb or 
+google-chrome-stable_current_amd64.deb package in the same directory
+as the google-chrome.SlackBuild script, run the script as root to
+convert the .deb to a Slackware .txz:
+
+./google-chrome.SlackBuild
+
+This will produce a Slackware compatible .txz package.  The exact
+version number in the package filename will depend on the version
+of Google Chrome found in the .deb package, but it will be something
+like:  google-chrome-10.0.648.151-x86_64-1.txz
+
+You'll find the output package in the /tmp directory.
+
+
+Then, install the package (again as root):
+
+cd /tmp
+upgradepkg --install-new google-chrome-10.0.648.151-x86_64-1.txz
+
+
+Finally, please note that Google Chrome requires the GConf and ORBit2
+packages found in this directory in order to run.  Be careful with these
+as they may create unintended dependencies on GConf/ORBit2 in other
+software that you compile on machines where they are installed.
+
+Newer beta and unstable builds may also require the PAM library libpam.so.0.
+Installing the google-chrome-pam-solibs package in this directory will
+allow these newer versions of Chrome to run without having to actually
+switch the system to using PAM.  If you need real PAM (to compile Chromium
+for example), you can find it in /extra/source/pam/.
+
+Enjoy!  :-)
+
diff --git a/extra/google-chrome/google-chrome.SlackBuild b/extra/google-chrome/google-chrome.SlackBuild
new file mode 100755
index 00000000..16179d2a
--- /dev/null
+++ b/extra/google-chrome/google-chrome.SlackBuild
@@ -0,0 +1,112 @@
+#!/bin/sh
+
+# Copyright 2009-2010  Erik Hanson, Minneapolis, MN, USA
+# Copyright 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+PKGNAM=google-chrome
+RELEASE=${RELEASE:-stable}    # stable, beta, or unstable
+case "$(uname -m)" in
+  i?86) DEBARCH="i386" ; LIBDIRSUFFIX="" ; ARCH=i386 ;;
+  x86_64) DEBARCH="amd64" ; LIBDIRSUFFIX="64" ; ARCH=x86_64 ;;
+  *) echo "Package for $(uname -m) architecture is not available." ; exit 1 ;;
+esac
+# Get the version from the Debian/Ubuntu .deb (thanks to Fred Richards):
+VERSION=$(ar p google-chrome-${RELEASE}_current_${DEBARCH}.deb control.tar.gz 2> /dev/null | tar zxO ./control 2> /dev/null | grep Version | awk '{print $2}' | cut -d- -f1)
+BUILD=${BUILD:-1}
+
+
+if [ ! $UID = 0 ]; then
+  cat << EOF
+
+This script must be run as root.
+
+EOF
+  exit 1
+fi
+
+if ! /bin/ls google-chrome-*.deb 1> /dev/null 2> /dev/null ; then
+  cat << EOF
+
+This is a script to repackage a Debian/Ubuntu Google Chrome .deb package
+for Slackware.  Run this script in the same directory as one of these
+binary packages:
+
+  google-chrome-stable_current_amd64.deb  (for 64-bit x86_64)
+  google-chrome-stable_current_i386.deb   (for 32-bit x86)
+  
+This will create a Slackware .txz package.  Install it with installpkg
+or use upgradepkg to upgrade from a previous version.
+
+EOF
+  exit 1
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $PKG
+ar p $CWD/google-chrome-${RELEASE}_current_${DEBARCH}.deb data.tar.lzma | lzma -d | tar xv || exit 1
+chown -R root:root .
+chmod -R u+w,go+r-w,a-s .
+
+# Make sure top-level perms are correct:
+chmod 0755 .
+# This needs to be setuid root:
+chmod 4711 opt/google/chrome/chrome-sandbox
+# The cron job is for Debian/Ubuntu only:
+rm -rf etc
+
+# Link to the standard Mozilla library names:
+sed -i 's,libnss3.so.1d,libnss3.so\x00\x00\x00,g;
+        s,libnssutil3.so.1d,libnssutil3.so\x00\x00\x00,g;
+        s,libsmime3.so.1d,libsmime3.so\x00\x00\x00,g;
+        s,libssl3.so.1d,libssl3.so\x00\x00\x00,g;
+        s,libplds4.so.0d,libplds4.so\x00\x00\x00,g;
+        s,libplc4.so.0d,libplc4.so\x00\x00\x00,g;
+        s,libnspr4.so.0d,libnspr4.so\x00\x00\x00,g;' opt/google/chrome/chrome
+
+# --mandir=/usr/man:
+mv $PKG/usr/share/man $PKG/usr/man
+# Compress manual pages:
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do
+  ln -s $( readlink $i ).gz $i.gz
+  rm $i
+done
+
+# Install a .desktop launcher:
+sed -i -e "s#Icon=google-chrome#Icon=/opt/google/chrome/product_logo_256.png#" \
+  $PKG/opt/google/chrome/google-chrome.desktop
+mkdir -p $PKG/usr/share/applications
+ln -s /opt/google/chrome/google-chrome.desktop \
+  $PKG/usr/share/applications/google-chrome.desktop
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/extra/google-chrome/slack-desc b/extra/google-chrome/slack-desc
new file mode 100644
index 00000000..a16b2118
--- /dev/null
+++ b/extra/google-chrome/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----------------------------------------------------|
+google-chrome: google-chrome (Google Chrome web browser)
+google-chrome:
+google-chrome: Google Chrome is a web browser that combines a minimal design with
+google-chrome: sophisticated technology to make the web faster, safer, and easier.
+google-chrome:
+google-chrome:
+google-chrome:
+google-chrome:
+google-chrome:
+google-chrome: Homepage:  http://www.google.com/chrome
+google-chrome:
diff --git a/extra/source/GConf/GConf.SlackBuild b/extra/source/GConf/GConf.SlackBuild
new file mode 100755
index 00000000..f6e0627c
--- /dev/null
+++ b/extra/source/GConf/GConf.SlackBuild
@@ -0,0 +1,113 @@
+#!/bin/sh
+
+# Slackware build script for GConf
+
+# Copyright 2010, 2011  Robby Workman, Northport, Alabama, USA
+# Copyright 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PKGNAM=GConf
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:--j6}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+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 $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION || exit 1
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --with-gtk=2.0 \
+  --disable-static \
+  --enable-debug=no \
+  --build=$ARCH-slackware-linux || exit 1
+
+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 || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mv $PKG/etc/gconf/2/path $PKG/etc/gconf/2/path.new
+mv $PKG/etc/gconf/2/evoldap.conf $PKG/etc/gconf/2/evoldap.conf.new
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a AUTHORS COPYING* NEWS README* TODO \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/extra/source/GConf/GConf.url b/extra/source/GConf/GConf.url
new file mode 100644
index 00000000..3fa6c986
--- /dev/null
+++ b/extra/source/GConf/GConf.url
@@ -0,0 +1,2 @@
+http://www.gnome.org/projects/gconf/
+ftp://ftp.gnome.org/pub/gnome/sources/GConf/2.32/GConf-2.32.0.tar.bz2
diff --git a/extra/source/GConf/doinst.sh b/extra/source/GConf/doinst.sh
new file mode 100644
index 00000000..e4c115f3
--- /dev/null
+++ b/extra/source/GConf/doinst.sh
@@ -0,0 +1,16 @@
+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/gconf/2/path.new
+config etc/gconf/2/evoldap.conf.new
+
diff --git a/extra/source/GConf/slack-desc b/extra/source/GConf/slack-desc
new file mode 100644
index 00000000..1c6ce492
--- /dev/null
+++ b/extra/source/GConf/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-------------------------------------------------------|
+GConf: GConf (GNOME configuration library)
+GConf:
+GConf: GConf is a configuration database system, functionally similar to the
+GConf: Windows registry.
+GConf:
+GConf:
+GConf:
+GConf:
+GConf: Homepage:  http://www.gnome.org/projects/gconf/
+GConf:
+GConf:
diff --git a/extra/source/ORBit2/ORBit2.SlackBuild b/extra/source/ORBit2/ORBit2.SlackBuild
new file mode 100755
index 00000000..36ef40cc
--- /dev/null
+++ b/extra/source/ORBit2/ORBit2.SlackBuild
@@ -0,0 +1,104 @@
+#!/bin/sh
+
+# Slackware build script for ORBit2
+
+# Copyright 2010  Robby Workman, Northport, Alabama, USA
+# Copyright 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PKGNAM=ORBit2
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:--j6}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+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 $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION || exit 1
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --disable-static \
+  --build=$ARCH-slackware-linux || exit 1
+
+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 || true
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* HACKING MAINTAINERS NEWS README* TODO \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/extra/source/ORBit2/ORBit2.url b/extra/source/ORBit2/ORBit2.url
new file mode 100644
index 00000000..d51f9f0a
--- /dev/null
+++ b/extra/source/ORBit2/ORBit2.url
@@ -0,0 +1,2 @@
+http://www.gnome.org/projects/ORBit2/
+ftp://ftp.gnome.org/pub/gnome/sources/ORBit2/2.14/ORBit2-2.14.19.tar.bz2
diff --git a/extra/source/ORBit2/slack-desc b/extra/source/ORBit2/slack-desc
new file mode 100644
index 00000000..867444e8
--- /dev/null
+++ b/extra/source/ORBit2/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------------------------------------------------------|
+ORBit2: ORBit2 (CORBA ORB library)
+ORBit2:
+ORBit2: ORBit is a high-performance CORBA (Common Object Request Broker
+ORBit2: Architecture) ORB (object request broker).  It allows programs to
+ORBit2: send requests and receive replies from other programs, regardless
+ORBit2: of the locations of the two programs.  CORBA is an architecture that
+ORBit2: enables communication between program objects, regardless of the
+ORBit2: programming language they're written in or the operating system they
+ORBit2: run on.
+ORBit2:
+ORBit2:
diff --git a/extra/source/bash-completion/bash-completion-1.1-pkgtools_tgxz.diff b/extra/source/bash-completion/bash-completion-1.1-pkgtools_tgxz.diff
deleted file mode 100644
index 803f5991..00000000
--- a/extra/source/bash-completion/bash-completion-1.1-pkgtools_tgxz.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur bash-completion-1.1.orig//contrib/pkgtools bash-completion-1.1//contrib/pkgtools
---- bash-completion-1.1.orig//contrib/pkgtools	2009-10-09 07:49:31.000000000 -0500
-+++ bash-completion-1.1//contrib/pkgtools	2010-03-06 21:56:50.343715164 -0600
-@@ -11,7 +11,7 @@
-     COMPREPLY=( $( (cd /var/log/packages; compgen -f -- "$cur") ) )
- } &&
- complete -F _removepkg $filenames removepkg &&
--    complete $dirnames -f -X '!*.tgz' installpkg upgradepkg explodepkg
-+    complete $dirnames -f -X '!*.t[gx]z' installpkg upgradepkg explodepkg
- 
- # Local variables:
- # mode: shell-script
diff --git a/extra/source/bash-completion/bash-completion.SlackBuild b/extra/source/bash-completion/bash-completion.SlackBuild
index 3fb915c0..d2e59446 100755
--- a/extra/source/bash-completion/bash-completion.SlackBuild
+++ b/extra/source/bash-completion/bash-completion.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,9 @@
 
 # Slackware build script for bash-completion
 
-VERSION=1.1
+VERSION=1.3
 ARCH=noarch
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -43,26 +43,35 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Add support for txz packages instead of only tgz
-zcat $CWD/bash-completion-1.1-pkgtools_tgxz.diff.gz | patch -p1 || exit 1
+# Fixup sh completion for us
+zcat $CWD/fixup-sh-script-completions.diff.gz | patch -p1 --verbose || exit 1
 
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc \
   --mandir=/usr/man \
   --infodir=/usr/info \
-  --docdir=/usr/doc/bash_completion-$VERSION
+  --docdir=/usr/doc/bash-completion-$VERSION
 
 make || exit 1
 make install DESTDIR=$PKG || exit 1
-  
+
 mkdir -p $PKG/etc/profile.d
 zcat $CWD/bash_completion.sh.gz > $PKG/etc/profile.d/bash_completion.sh
 chmod 0755 $PKG/etc/profile.d/bash_completion.sh
 
+# Sorry, but these contrib scripts have been causing a lot of problems.
+# If these are merged with upstream (and hopefully debugged) then we
+# will have them, but adding them at this level is IMHO a mistake.
+## https://github.com/GArik/bash-completion
+## GArik has a 'slackware' branch with quite a few enhancements
+#for i in pkgtools rpm2tgz sbopkg slackpkg slapt ; do
+#  cat $CWD/contrib/$i > $PKG/etc/bash_completion.d/$i ;
+#done
+
 mkdir -p $PKG/usr/doc/bash-completion-$VERSION
 cp -a \
-  AUTHORS COPYING README TODO \
+  AUTHORS COPYING* README* TODO \
     $PKG/usr/doc/bash-completion-$VERSION
 
 # If there's a ChangeLog, installing at least part of the recent history
@@ -73,6 +82,12 @@ if [ -r CHANGES ]; then
   touch -r CHANGES $DOCSDIR/CHANGES
 fi
 
+# Contrib scripts can go in with the documentation:
+cp -a $CWD/contrib $PKG/usr/doc/bash-completion-$VERSION
+chown -R root:root $PKG/usr/doc/bash-completion-$VERSION
+chmod 755 $PKG/usr/doc/bash-completion-$VERSION/contrib
+chmod 644 $PKG/usr/doc/bash-completion-$VERSION/contrib/*
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/extra/source/bash-completion/bash_completion.sh b/extra/source/bash-completion/bash_completion.sh
index 4f2cdf82..cb2adb67 100644
--- a/extra/source/bash-completion/bash_completion.sh
+++ b/extra/source/bash-completion/bash_completion.sh
@@ -1,11 +1,3 @@
-bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
-if [ "$PS1" ] && [ $bmajor -eq 2 ] && [ $bminor '>' 04 ] \
-   && [ -f /etc/bash_completion ]; then # interactive shell
-        # Source completion code
-        . /etc/bash_completion
-elif [ "$PS1" ] && [ $bmajor -ge 3 ] \
-   && [ -f /etc/bash_completion ]; then # interactive shell
-        # Source completion code
-        . /etc/bash_completion
+if [ "$(basename $SHELL)" = "bash" -a -f /etc/bash_completion ]; then
+  . /etc/bash_completion
 fi
-unset bash bmajor bminor
diff --git a/extra/source/bash-completion/contrib/pkgtools b/extra/source/bash-completion/contrib/pkgtools
new file mode 100644
index 00000000..2b438efc
--- /dev/null
+++ b/extra/source/bash-completion/contrib/pkgtools
@@ -0,0 +1,127 @@
+# bash completion for Slackware Linux pkgtools
+
+[ -f /etc/slackware-version ] &&
+{
+
+have pkgtool &&
+_pkgtool()
+{
+    COMPREPLY=()
+    local cur="${COMP_WORDS[COMP_CWORD]}"
+    if [[ "$cur" == -* ]]; then
+        COMPREPLY=( $( compgen -W '--sets --ignore-tagfiles --tagfile \
+            --source-mounted --source_dir --target_dir --source_device' \
+            -- "$cur" ) )
+        return 0
+    fi
+
+    local prev=${COMP_WORDS[COMP_CWORD-1]}
+
+    case $prev in
+        --source_dir|--target_dir)
+            _filedir -d
+            return 0
+            ;;
+        --sets)
+            # argument required but no completions available
+            return 0
+            ;;
+        --source_device)
+            COMPREPLY=( $( compgen -f -d -- "${cur:-/dev/}" ) )
+            return 0
+            ;;
+        --tagfile)
+            _filedir
+            return 0
+            ;;
+    esac
+} &&
+complete -F _pkgtool pkgtool
+
+have removepkg &&
+_removepkg()
+{
+    COMPREPLY=()
+    local cur=`_get_cword`
+    if [[ "$cur" == -* ]]; then
+        COMPREPLY=( $( compgen -W '-copy -keep -preserve -warn' \
+            -- "$cur" ) )
+        return 0
+    fi
+
+    COMPREPLY=( $( cd /var/log/packages; compgen -f -- "$cur" ) )
+} &&
+complete -F _removepkg removepkg
+
+have upgradepkg &&
+_upgradepkg()
+{
+    COMPREPLY=()
+    local cur=`_get_cword`
+    if [[ "$cur" == -* ]]; then
+        COMPREPLY=( $( compgen -W '--dry-run --install-new --reinstall \
+            --verbose' -- "$cur") )
+        return 0
+    fi
+
+    _filedir "t[bglx]z"
+} && complete -F _upgradepkg upgradepkg
+
+have installpkg &&
+_installpkg()
+{
+    COMPREPLY=()
+    local cur=`_get_cword`
+    if [[ "$cur" == -* ]]; then
+        COMPREPLY=( $( compgen -W '--warn --md5sum --root --infobox --terse \
+            --menu --ask --priority --tagfile' -- "$cur") )
+        return 0
+    fi
+
+    local prev=`_get_pword`
+
+    case $prev in
+        --root)
+            _filedir -d
+            return 0
+            ;;
+        --priority)
+            COMPREPLY=( $( compgen -W 'ADD REC OPT SKP' -- "$cur" ) )
+            return 0
+            ;;
+        --tagfile)
+            _filedir
+            return 0
+            ;;
+    esac
+
+    _filedir "t[bglx]z"
+} && complete -F _installpkg installpkg
+
+have makepkg &&
+_makepkg()
+{
+    COMPREPLY=()
+    local cur=`_get_cword`
+    if [[ "$cur" == -* ]]; then
+        COMPREPLY=( $( compgen -W '-l --linkadd -p --prepend \
+            -c --chown' -- "$cur") )
+        return 0
+    fi
+
+    local prev=`_get_pword`
+
+    case $prev in
+        -l|--linkadd|-c|--chown)
+            COMPREPLY=( $( compgen -W 'y n' -- "$cur" ) )
+            return 0
+            ;;
+    esac
+
+    _filedir
+} && complete -F _makepkg makepkg
+
+have explodepkg &&
+complete -o plusdirs -f -X '!*.t[bglx]z' explodepkg
+
+}
diff --git a/extra/source/bash-completion/contrib/rpm2tgz b/extra/source/bash-completion/contrib/rpm2tgz
new file mode 100644
index 00000000..23c70ac9
--- /dev/null
+++ b/extra/source/bash-completion/contrib/rpm2tgz
@@ -0,0 +1,14 @@
+# Slackware rpm2tgz completion.
+
+have rpm2tgz &&
+_rpm2tgz()
+{
+    COMPREPLY=()
+    local cur="${COMP_WORDS[COMP_CWORD]}"
+    if [[ "$cur" == -* ]]; then
+        COMPREPLY=( $( compgen -W '-s -S -n -r -d -c' -- "$cur" ) )
+        return 0
+    fi
+
+    COMPREPLY=( $(compgen -f -X "!*.rpm" -- "$cur") )
+} && complete -F _rpm2tgz -o plusdirs rpm2tgz rpm2txz rpm2targz
diff --git a/extra/source/bash-completion/contrib/sbopkg b/extra/source/bash-completion/contrib/sbopkg
new file mode 100644
index 00000000..698fdf18
--- /dev/null
+++ b/extra/source/bash-completion/contrib/sbopkg
@@ -0,0 +1,76 @@
+# bash completion for sbopkg tool
+
+have sbopkg &&
+_sbopkg()
+{
+    COMPREPLY=()
+    local cur prev
+    _get_comp_words_by_ref cur prev
+
+    if [[ "$cur" == -* ]]; then
+        COMPREPLY=( $( compgen -W '-b -c -d -e -f -g -h -i -k -l \
+                      -o -P -p -q -R -r -s -u -V -v' -- "$cur" ) )
+        return 0
+    fi
+
+    case $prev in
+        -e)
+            COMPREPLY=( $( compgen -W 'ask continue stop' -- "$cur" ) )
+            return 0
+            ;;
+        -f)
+            _filedir
+            return 0
+            ;;
+        -d)
+            _filedir -d
+            return 0
+            ;;
+        -V)
+            COMPREPLY=( $( compgen -W "? \
+                $(sbopkg -V ? 2>&1 | cut -s -f1)" -- "$cur" ) )
+            return 0
+            ;;
+        -i|-b)
+            ;;
+        *)
+            return 0
+            ;;
+    esac
+
+    local config="/etc/sbopkg/sbopkg.conf"
+    local words
+    _get_comp_words_by_ref words
+
+    for (( i=${#words[@]}-1; i>0; i-- )); do
+        if [[ "${words[i]}" == -f ]]; then
+            config="${words[i+1]}"
+            break
+        fi
+    done
+
+    if [ ! -r "$config" ]; then
+        return 0
+    fi
+
+    . $config
+
+    for (( i=1; i<${#words[@]}; i++ )); do
+        case "${words[i]}" in
+            -V)
+                REPO_NAME="${words[i+1]%%/*}"
+                REPO_BRANCH="${words[i+1]#*/}"
+                ;;
+            -d)
+                REPO_ROOT="${words[i+1]}"
+                ;;
+        esac
+    done
+
+    if [ ! -r "$REPO_ROOT/$REPO_NAME/$REPO_BRANCH/SLACKBUILDS.TXT" ]; then
+        return 0
+    fi
+    COMPREPLY=( $( sed -ne "/^SLACKBUILD NAME: $cur/{s/^SLACKBUILD NAME: //;p}"\
+        $REPO_ROOT/$REPO_NAME/$REPO_BRANCH/SLACKBUILDS.TXT )
+        $( cd $QUEUEDIR; compgen -f -X "!*.sqf"  -- "$cur" ) )
+} && complete -F _sbopkg sbopkg
diff --git a/extra/source/bash-completion/contrib/slackpkg b/extra/source/bash-completion/contrib/slackpkg
new file mode 100644
index 00000000..139e7edd
--- /dev/null
+++ b/extra/source/bash-completion/contrib/slackpkg
@@ -0,0 +1,95 @@
+# bash completion for slackpkg tool
+
+have slackpkg &&
+_slackpkg()
+{
+    COMPREPLY=()
+    local cur
+    _get_comp_words_by_ref cur
+
+    # based on `grep '\-.*\=.*)' /usr/sbin/slackpkg | cut -f1 -d\)`
+    if [[ "$cur" == -* ]]; then
+        COMPREPLY=( $( compgen -W '-delall=on -delall=off \
+            -checkmd5=on -checkmd5=off \
+            -checkgpg=on -checkgpg=off \
+            -checksize=on -checksize=off \
+            -postinst=on -postinst=off \
+            -onoff=on -onoff=off \
+            -download_all=on -download_all=off \
+            -dialog=on -dialog=off \
+            -dialog_maxargs= \
+            -batch=on -batch=off \
+            -only_new_dotnew=on -only_new_dotnew=off \
+            -use_includes=on -use_includes=off \
+            -spinning=on -spinning=off \
+            -default_answer=yes -default_answer=no \
+            -mirror=' -- "$cur" ) )
+        return 0
+    fi
+
+    local confdir="/etc/slackpkg"
+    local config="$confdir/slackpkg.conf"
+
+    if [ ! -r "$config" ]; then
+        return 0
+    fi
+    . "$config"
+
+    local action words
+    _get_comp_words_by_ref -n "=" words
+
+    for (( i=1; i<${#words[@]}; i++ )); do
+        if [[ "${words[i]}" != -* ]]; then
+            action="${words[i]}"
+            break
+        fi
+    done
+
+    case $action in
+        generate-template|search|file-search)
+            # argument required but no completions available
+            return 0
+            ;;
+        install-template|remove-template)
+            if [ -e "$confdir/templates" ]; then
+                COMPREPLY=( $( cd "$confdir/templates"; \
+                    compgen -f -X "!*.template" -- "$cur" ) )
+                COMPREPLY=( ${COMPREPLY[@]%.template} )
+            fi
+            return 0
+            ;;
+        remove)
+            _filedir
+            COMPREPLY+=( $( compgen -W 'a ap d e f k kde kdei l n t tcl x \
+                xap y' -- "$cur" ) )
+            COMPREPLY+=( $( cd /var/log/packages; compgen -f -- "$cur" ) )
+            return 0
+            ;;
+        install|reinstall|upgrade|blacklist|download)
+            _filedir
+            COMPREPLY+=( $( compgen -W 'a ap d e f k kde kdei l n t tcl x \
+                xap y' -- "$cur" ) )
+            COMPREPLY+=( $( cut -f 6 -d\  ${WORKDIR}/pkglist 2> /dev/null | \
+                grep "^$cur" ) )
+            return 0
+            ;;
+        info)
+            COMPREPLY+=( $( cut -f 6 -d\  ${WORKDIR}/pkglist 2> /dev/null | \
+                grep "^$cur" ) )
+            return 0
+            ;;
+        update)
+            # we should complete the same as the next `list` + "gpg"
+            COMPREPLY=( $( compgen -W 'gpg' -- "$cur" ) )
+            ;&
+        *)
+            COMPREPLY+=( $( compgen -W 'install reinstall upgrade remove \
+                blacklist download update install-new upgrade-all \
+                clean-system new-config check-updates help generate-template \
+                install-template remove-template search file-search info' -- \
+                "$cur" ) )
+            return 0
+            ;;
+    esac
+
+} && complete -F _slackpkg slackpkg
diff --git a/extra/source/bash-completion/contrib/slapt b/extra/source/bash-completion/contrib/slapt
new file mode 100644
index 00000000..77946538
--- /dev/null
+++ b/extra/source/bash-completion/contrib/slapt
@@ -0,0 +1,136 @@
+# slapt-get and slapt-src completion
+
+have slapt-get &&
+_slapt_get()
+{
+    COMPREPLY=()
+    local cur prev
+    _get_comp_words_by_ref cur prev
+
+    if [[ "$cur" == -* ]]; then
+        COMPREPLY=( $( compgen -W '--download-only -d --simulate -s \
+            --no-prompt -y --prompt -p --reinstall --ignore-excludes \
+            --no-md5 --ignore-dep --no-dep --print-uris --show-stats -S \
+            --config -c --remove-obsolete --retry --no-upgrade \
+            --update -u --upgrade --dist-upgrade --install -i --install-set \
+            --remove --show --filelist --search --list --available \
+            --installed --clean --autoclean --add-keys \
+            --version --help -h' -- "$cur" ) )
+        return 0
+    fi
+
+    case $prev in
+        --config|-c)
+            _filedir
+            return 0
+            ;;
+        --retry|--search)
+            # argument required but no completions available
+            return 0
+            ;;
+    esac
+
+    local words t
+    _get_comp_words_by_ref words
+
+    # search for last action (--install|--install-set|--remove|--show|--filelist)
+    for (( i=${#words[@]}-1; i>0; i-- )); do
+        if [[ ${words[i]} == -@(i|-install|-show) ]]; then
+            t="all"
+            break
+        elif [[ ${words[i]} == --install-set ]]; then
+            t="set"
+            break
+        elif [[ ${words[i]} == --@(remove|filelist) ]]; then
+            t="ins"
+            break
+        fi
+    done
+
+    case $t in
+        all) # --install|-i|--show
+            # slapt-get will fail to search for "^name-version"
+            # it can search for names only
+            local name=$( echo $cur | cut -f1 -d- )
+            COMPREPLY=( $( slapt-get --search "^$name" 2> /dev/null | \
+                sed -ne "/^$cur/{s/ .*$//;p}" ) )
+            return 0
+            ;;
+        ins) # --remove|--filelist
+            COMPREPLY=( $( cd /var/log/packages; compgen -f -- "$cur" ) )
+            return 0
+            ;;
+        set) # --install-set
+            COMPREPLY=( $( compgen -W 'a ap d e f k kde kdei l n t tcl x \
+                xap y' -- "$cur" ) )
+            return 0
+            ;;
+    esac
+} && complete -F _slapt_get slapt-get
+
+have slapt-src &&
+_slapt_src()
+{
+    COMPREPLY=()
+    local cur prev
+    _get_comp_words_by_ref cur prev
+
+    if [[ "$cur" == -* ]]; then
+        COMPREPLY=( $( compgen -W '--update -u --list -l --clean -e \
+            --search -s --show -w --install -i --build -b --fetch -f \
+            --yes -y --config -c --no-dep -n --postprocess -p \
+            --version -v --help -h' -- "$cur" ) )
+        return 0
+    fi
+
+    case $prev in
+        --config|-c)
+            _filedir
+            return 0
+            ;;
+        --search|-s|--postprocess|-p)
+            # argument required but no completions available
+            return 0
+            ;;
+    esac
+
+    local words
+    _get_comp_words_by_ref words
+
+    local t
+    # search for last action (-i|-w|-b|-f)
+    for (( i=${#words[@]}-1; i>0; i-- )); do
+        if [[ ${words[i]} == -@(i|w|f|b|-install|-show|-build|-fetch) ]]; then
+            t="all"
+            break
+        fi
+    done
+    if [ "$t" != "all" ]; then
+        return 0
+    fi
+
+    local config="/etc/slapt-get/slapt-srcrc" # default config location
+    # search for config
+    for (( i=${#words[@]}-1; i>0; i-- )); do
+        if [[ ${words[i]} == -@(c|-config) ]]; then
+            config="${words[i+1]}"
+            break
+        fi
+    done
+    if [ ! -r "$config" ]; then
+        return 0
+    fi
+
+    local builddir=$( sed -ne "/^BUILDDIR=/{s/^BUILDDIR=//;p}" "$config" )
+    if [ ! -d "$builddir" ]; then
+        return 0
+    fi
+
+    local slck_data="${builddir}/slackbuilds_data"
+    if [ ! -r "$slck_data" ]; then
+        return 0
+    fi
+
+    COMPREPLY=( $( sed -ne \
+        "/^SLACKBUILD NAME: $cur/{s/^SLACKBUILD NAME: //;p}" "$slck_data" ) )
+} && complete -F _slapt_src slapt-src
diff --git a/extra/source/bash-completion/fixup-sh-script-completions.diff b/extra/source/bash-completion/fixup-sh-script-completions.diff
new file mode 100644
index 00000000..15bcf1d1
--- /dev/null
+++ b/extra/source/bash-completion/fixup-sh-script-completions.diff
@@ -0,0 +1,22 @@
+The 'sh' completion file only completes on *.sh files.
+This breaks the expectation (on Slackware, at least) that
+e.g. "sh /etc/rc.d/rc.my<TAB>" will complete to rc.mysql.
+This patch fixes that, but a consequence is that "sh" will
+complete on *any* filename.  IMHO, that's not a regression
+at all, since stock bash without bash-completion does that
+already...  --rworkman
+
+Acked-by: volkerdi
+
+diff -Nur bash-completion-1.3.orig/completions/sh bash-completion-1.3/completions/sh
+--- bash-completion-1.3.orig/completions/sh	2011-01-21 03:36:11.000000000 -0600
++++ bash-completion-1.3/completions/sh	2011-03-12 02:06:00.964938285 -0600
+@@ -28,7 +28,7 @@
+         return 0
+     fi
+ 
+-    _filedir sh
++    _filedir
+ } &&
+ complete -F _sh sh
+ 
diff --git a/extra/source/emacspeak/emacspeak-32.0.tcl8.5.diff b/extra/source/emacspeak/emacspeak-32.0.tcl8.5.diff
deleted file mode 100644
index 41401892..00000000
--- a/extra/source/emacspeak/emacspeak-32.0.tcl8.5.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -u -r emacspeak-32.0.orig/servers/linux-espeak/Makefile emacspeak-32.0/servers/linux-espeak/Makefile
---- emacspeak-32.0.orig/servers/linux-espeak/Makefile	2009-08-26 12:19:01.000000000 -0500
-+++ emacspeak-32.0/servers/linux-espeak/Makefile	2010-05-13 17:17:12.000000000 -0500
-@@ -4,7 +4,7 @@
- PREFIX = /usr
- LIBPARENTDIR = ${PREFIX}/share/emacs/site-lisp
- LIBDIR =$(LIBPARENTDIR)/emacspeak/servers/linux-espeak
--TCL_VERSION = 8.4
-+TCL_VERSION = 8.5
- TCL_INCLUDE= /usr/include/tcl$(TCL_VERSION)
- CXXFLAGS+= -g    -O2 -fPIC  -DPIC  -pedantic -ansi -Wall -Wno-long-long -I$(TCL_INCLUDE)
- 
-diff -u -r emacspeak-32.0.orig/servers/linux-outloud/Makefile emacspeak-32.0/servers/linux-outloud/Makefile
---- emacspeak-32.0.orig/servers/linux-outloud/Makefile	2009-08-28 16:07:35.000000000 -0500
-+++ emacspeak-32.0/servers/linux-outloud/Makefile	2010-05-13 17:17:18.000000000 -0500
-@@ -5,7 +5,7 @@
- LIBPARENTDIR = ${PREFIX}/share/emacs/site-lisp
- LIBDIR =$(LIBPARENTDIR)/emacspeak/servers/linux-outloud
- 
--TCL_VERSION=8.4
-+TCL_VERSION=8.5
- TCL_INCLUDE=/usr/include/tcl$(TCL_VERSION)
- CFLAGS+= -g    -O2 -fPIC  -DPIC  -pedantic -ansi -Wall  -Wno-long-long -I$(TCL_INCLUDE)
- CXXFLAGS+= $(CFLAGS)
-diff -u -r emacspeak-32.0.orig/servers/software-dtk/Makefile emacspeak-32.0/servers/software-dtk/Makefile
---- emacspeak-32.0.orig/servers/software-dtk/Makefile	2009-08-28 16:07:35.000000000 -0500
-+++ emacspeak-32.0/servers/software-dtk/Makefile	2010-05-13 17:17:46.000000000 -0500
-@@ -2,7 +2,7 @@
- #
- LABEL=1.1
- DIST=software-dtk-$(LABEL)
--TCL_VERSION=8.4
-+TCL_VERSION=8.5
- CFLAGS+=-O3 -fpic -pedantic -ansi -Wall -I/usr/include/tcl$(TCL_VERSION)
- CPPFLAGS+=-DSTDC_HEADERS=1 -Dclock_t=long -DRETSIGTYPE=void 
- INSTALL=install
diff --git a/extra/source/emacspeak/emacspeak.SlackBuild b/extra/source/emacspeak/emacspeak.SlackBuild
index 3235c94c..f6d04773 100755
--- a/extra/source/emacspeak/emacspeak.SlackBuild
+++ b/extra/source/emacspeak/emacspeak.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2006, 2008, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2008, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -75,7 +75,7 @@ find . -perm 711 -exec chmod 755 {} \;
 find . -perm 555 -exec chmod 755 {} \;
 
 # Patch to use Tcl 8.5:
-zcat $CWD/emacspeak-32.0.tcl8.5.diff.gz | patch -p1 || exit 1
+zcat $CWD/emacspeak.tcl8.5.diff.gz | patch -p1 || exit 1
 
 # Compile the main program against Emacs:
 make config
diff --git a/extra/source/emacspeak/emacspeak.tcl8.5.diff b/extra/source/emacspeak/emacspeak.tcl8.5.diff
new file mode 100644
index 00000000..41a003e2
--- /dev/null
+++ b/extra/source/emacspeak/emacspeak.tcl8.5.diff
@@ -0,0 +1,33 @@
+--- ./servers/software-dtk/Makefile.orig	2009-08-28 16:07:35.000000000 -0500
++++ ./servers/software-dtk/Makefile	2011-03-12 14:43:44.000000000 -0600
+@@ -2,7 +2,7 @@
+ #
+ LABEL=1.1
+ DIST=software-dtk-$(LABEL)
+-TCL_VERSION=8.4
++TCL_VERSION=8.5
+ CFLAGS+=-O3 -fpic -pedantic -ansi -Wall -I/usr/include/tcl$(TCL_VERSION)
+ CPPFLAGS+=-DSTDC_HEADERS=1 -Dclock_t=long -DRETSIGTYPE=void 
+ INSTALL=install
+--- ./servers/linux-espeak/Makefile.orig	2009-08-26 12:19:01.000000000 -0500
++++ ./servers/linux-espeak/Makefile	2011-03-12 14:43:44.000000000 -0600
+@@ -4,7 +4,7 @@
+ PREFIX = /usr
+ LIBPARENTDIR = ${PREFIX}/share/emacs/site-lisp
+ LIBDIR =$(LIBPARENTDIR)/emacspeak/servers/linux-espeak
+-TCL_VERSION = 8.4
++TCL_VERSION = 8.5
+ TCL_INCLUDE= /usr/include/tcl$(TCL_VERSION)
+ CXXFLAGS+= -g    -O2 -fPIC  -DPIC  -pedantic -ansi -Wall -Wno-long-long -I$(TCL_INCLUDE)
+ 
+--- ./servers/linux-outloud/Makefile.orig	2010-11-23 12:57:29.000000000 -0600
++++ ./servers/linux-outloud/Makefile	2011-03-12 14:43:44.000000000 -0600
+@@ -5,7 +5,7 @@
+ LIBPARENTDIR = ${PREFIX}/share/emacs/site-lisp
+ LIBDIR =$(LIBPARENTDIR)/emacspeak/servers/linux-outloud
+ 
+-TCL_VERSION=8.4
++TCL_VERSION=8.5
+ TCL_INCLUDE=/usr/include/tcl$(TCL_VERSION)
+ #CFLAGS+= -g    -O2 -fPIC  -DPIC  -pedantic -ansi -Wall  -Wno-long-long -I$(TCL_INCLUDE)
+ CFLAGS+= -m32 -g    -O2 -fPIC  -DPIC  -pedantic -ansi -Wall  -Wno-long-long -I$(TCL_INCLUDE)
diff --git a/extra/source/flashplayer-plugin/flashplayer-plugin.SlackBuild b/extra/source/flashplayer-plugin/flashplayer-plugin.SlackBuild
index 24ce32a5..e61ce917 100755
--- a/extra/source/flashplayer-plugin/flashplayer-plugin.SlackBuild
+++ b/extra/source/flashplayer-plugin/flashplayer-plugin.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2008, 2009  Eric Hameleers, Eindhoven, NL
+# Copyright 2008, 2009, 2010  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -26,7 +26,7 @@
 # By:           Eric Hameleers <alien@slackware.com>
 # For:          flashplayer-plugin
 # Descr:        Adobe flash player plugin for mozilla
-# URL:          http://labs.adobe.com/
+# URL:          http://labs.adobe.com/technologies/flashplayer10/
 # Needs:        
 # Changelog:    
 # 10.0.d20.7-1: 16/Dec/2008 by Eric Hameleers <alien@slackware.com>
@@ -39,6 +39,14 @@
 #               * Update (plugs vulnerability).
 # 10.0.42.34-1: 14/dec/2009 by Patrick J. Volkerding <volkerdi@slackware.com>
 #               * Update (plugs vulnerability).
+# 10.091510-1:  15/sep/2010 by Eric Hameleers <alien@slackware.com>
+#               * Preview1 of "flash player square".
+# 10.092710-1:  28/sep/2010 by Eric Hameleers <alien@slackware.com>
+#               * Preview2 of "flash player square".
+# 10_2.111710-1:28/sep/2010 by Eric Hameleers <alien@slackware.com>
+#               * New preview of "flash player square" for 64-bit Linux; there
+#                 is no more 32-bit "square" version, because new developments
+#                 are being folded into regular flashplayer10.
 # 
 # Run 'sh flashplayer-plugin.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -49,16 +57,11 @@
 # Set initial variables:
 
 PRGNAM=flashplayer-plugin
-VERSION=${VERSION:-10.0.42.34}
-ARCH=${ARCH:-x86_64}
+SRCVER=${SRCVER:-10_2}
+BLDVER=${BLDVER:-111710}
+VERSION=$SRCVER.$BLDVER
 BUILD=${BUILD:-1}
 
-if [ "$ARCH" = "x86_64" ]; then
-  LIBDIRSUFFIX="64"
-else
-  LIBDIRSUFFIX=""
-fi
-
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)
 
@@ -67,8 +70,34 @@ TMP=${TMP:-/tmp/build}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-SOURCE="$SRCDIR/libflashplayer-${VERSION}.linux-${ARCH}.so.tar.gz"
-SRCURL="http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-${VERSION}.linux-${ARCH}.so.tar.gz"
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+case "$ARCH" in
+  x86_64)
+    PREVER=${PREVER:-3}
+    LIBDIRSUFFIX="64"
+    ARCHBITS="64"
+    ;;
+  i?86)
+    PREVER=${PREVER:-2}
+    LIBDIRSUFFIX=""
+    ARCHBITS="32"
+    ;;
+  *)
+    echo "Unsupported architecture '$ARCH'"
+    exit 1
+    ;;
+esac
+
+SOURCE="$SRCDIR/flashplayer${SRCVER}_p${PREVER}_${ARCHBITS}bit_linux_${BLDVER}.tar.gz"
+SRCURL="http://download.macromedia.com/pub/labs/flashplayer10/flashplayer${SRCVER}_p${PREVER}_${ARCHBITS}bit_linux_${BLDVER}.tar.gz"
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
@@ -124,17 +153,20 @@ cd $TMP/tmp-$PRGNAM
 echo "Extracting the source archive(s) for $PRGNAM..."
 tar -xvf ${SOURCE}
 chown -R root:root *
-chmod -R u+w,go+r-w,a-s .
+chmod -R u+w,go+r-w,a+X-s .
 
-if [ "$ARCH" = "x86_64" ]; then
-  if ! file libflashplayer.so | grep -q "ELF 64-bit" ; then
-    echo "The downloaded plugin is not for the '$ARCH' architecture!"; exit 1
-  fi
-elif [[ "$ARCH" =~ "i?86" ]]; then
-  if ! file libflashplayer.so | grep -q "ELF 32-bit" ; then
-    echo "The downloaded plugin is not for the '$ARCH' architecture!"; exit 1
-  fi
-fi
+case "$ARCH" in
+  x86_64)
+    if ! file libflashplayer.so | grep -q "ELF 64-bit" ; then
+      echo "The downloaded plugin is not for the '$ARCH' architecture!"; exit 1
+    fi
+    ;;
+  i?86)
+    if ! file libflashplayer.so | grep -q "ELF 32-bit" ; then
+      echo "The downloaded plugin is not for the '$ARCH' architecture!"; exit 1
+    fi
+    ;;
+esac
 
 # Install the plugin to the package dir:
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
diff --git a/extra/source/fvwm-2.6.1/doinst.sh b/extra/source/fvwm-2.6.1/doinst.sh
new file mode 100644
index 00000000..087da9e3
--- /dev/null
+++ b/extra/source/fvwm-2.6.1/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...
+}
+# Might need this later
+#config etc/X11/fvwm2/system.fvwm2rc.new
diff --git a/extra/source/fvwm-2.6.1/fvwm.SlackBuild b/extra/source/fvwm-2.6.1/fvwm.SlackBuild
new file mode 100755
index 00000000..e7aa4fa6
--- /dev/null
+++ b/extra/source/fvwm-2.6.1/fvwm.SlackBuild
@@ -0,0 +1,131 @@
+#!/bin/sh
+
+# Copyright 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+PKGNAM=fvwm
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION
+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 \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --disable-bidi \
+  --program-prefix= \
+  --program-suffix= \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Add a few more things:
+mkdir -p $PKG/etc/X11/xinit
+zcat $CWD/xinitrc.fvwm2.gz > $PKG/etc/X11/xinit/xinitrc.fvwm2
+chmod 755 $PKG/etc/X11/xinit/xinitrc.fvwm2
+#zcat $CWD/system.fvwm2rc.gz > $PKG/etc/system.fvwm2rc.new
+
+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
+
+# Restore a few original file timestamps:
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* NEWS README* \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
+mkdir -p $PKG/install
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/extra/source/fvwm-2.6.1/slack-desc b/extra/source/fvwm-2.6.1/slack-desc
new file mode 100644
index 00000000..2d2a9ef5
--- /dev/null
+++ b/extra/source/fvwm-2.6.1/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------------------------------------------------------|
+fvwm: fvwm (a small and fast virtual window manager for X)
+fvwm:
+fvwm: Fvwm is the classic highly-configurable virtual window manager for
+fvwm: X11.  It is a derivative of twm, redesigned to minimize memory
+fvwm: consumption, provide a 3-D look to window frames, and provide a simple
+fvwm: virtual desktop.
+fvwm:
+fvwm: Homepage:  http://www.fvwm.org
+fvwm:
+fvwm:
+fvwm:
diff --git a/extra/source/fvwm-2.6.1/xinitrc.fvwm2 b/extra/source/fvwm-2.6.1/xinitrc.fvwm2
new file mode 100644
index 00000000..788a4e43
--- /dev/null
+++ b/extra/source/fvwm-2.6.1/xinitrc.fvwm2
@@ -0,0 +1,35 @@
+#!/bin/sh
+# $XConsortium: xinitrc.cpp,v 1.4 91/08/22 11:41:34 rws Exp $
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# merge in defaults and keymaps
+
+if [ -f $sysresources ]; then
+    xrdb -merge $sysresources
+fi
+
+if [ -f $sysmodmap ]; then
+    xmodmap $sysmodmap
+fi
+
+if [ -f $userresources ]; then
+    xrdb -merge $userresources
+fi
+
+if [ -f $usermodmap ]; then
+    xmodmap $usermodmap
+fi
+
+# start some nice programs
+
+xsetroot -solid SteelBlue
+if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
+  ck-launch-session fvwm2
+else
+  fvwm2
+fi
+
diff --git a/extra/source/jdk-6/COPYRIGHT b/extra/source/jdk-6/COPYRIGHT
index ee5019b5..fcb67309 100644
--- a/extra/source/jdk-6/COPYRIGHT
+++ b/extra/source/jdk-6/COPYRIGHT
@@ -1,74 +1,70 @@
-Copyright © 2010 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-California 95054, U.S.A.  All rights reserved.
+Copyright © 2006, 2011, Oracle and/or its affiliates. 
+All rights reserved.
 
-Sun Microsystems, Inc.  has intellectual property rights relating to
-technology embodied in the product that is described in this document.
-In particular, and without limitation, these intellectual property
-rights may include one or more of the U.S.  patents listed at
-http://www.sun.com/patents and one or more additional patents or pending
-patent applications in the U.S.  and in other countries.
+This software and related documentation are provided under a
+license agreement containing restrictions on use and
+disclosure and are protected by intellectual property laws.
+Except as expressly permitted in your license agreement or
+allowed by law, you may not use, copy, reproduce, translate,
+broadcast, modify, license, transmit, distribute, exhibit,
+perform, publish, or display any part, in any form, or by
+any means.  Reverse engineering, disassembly, or
+decompilation of this software, unless required by law for
+interoperability, is prohibited.
 
-THIS PRODUCT CONTAINS CONFIDENTIAL INFORMATION AND TRADE SECRETS OF SUN
-MICROSYSTEMS, INC.  USE, DISCLOSURE OR REPRODUCTION IS PROHIBITED
-WITHOUT THE PRIOR EXPRESS WRITTEN PERMISSION OF SUN MICROSYSTEMS, INC.
+The information contained herein is subject to change
+without notice and is not warranted to be error-free.  If
+you find any errors, please report them to us in writing.
 
-U.S.  Government Rights - Commercial software.  Government users are
-subject to the Sun Microsystems, Inc.  standard license agreement and
-applicable provisions of the FAR and its supplements.
+If this is software or related software documentation that
+is delivered to the U.S.  Government or anyone licensing it
+on behalf of the U.S.  Government, the following notice is
+applicable:
 
-Use is subject to license terms.
+U.S.  GOVERNMENT RIGHTS Programs, software, databases, and
+related documentation and technical data delivered to U.S.
+Government customers are "commercial computer software" or
+"commercial technical data" pursuant to the applicable
+Federal Acquisition Regulation and agency-specific
+supplemental regulations.  As such, the use, duplication,
+disclosure, modification, and adaptation shall be subject to
+the restrictions and license terms set forth in the
+applicable Government contract, and, to the extent
+applicable by the terms of the Government contract, the
+additional rights set forth in FAR 52.227-19, Commercial
+Computer Software License (December 2007).  Oracle America,
+Inc., 500 Oracle Parkway, Redwood City, CA 94065.
 
-This distribution may include materials developed by third parties.
+This software or hardware is developed for general use in a
+variety of information management applications.  It is not
+developed or intended for use in any inherently dangerous
+applications, including applications which may create a risk
+of personal injury.  If you use this software or hardware in
+dangerous applications, then you shall be responsible to
+take all appropriate fail-safe, backup, redundancy, and
+other measures to ensure its safe use.  Oracle Corporation
+and its affiliates disclaim any liability for any damages
+caused by use of this software or hardware in dangerous
+applications.
 
-Sun, Sun Microsystems, the Sun logo, Java and Java SE are trademarks or
-registered trademarks of Sun Microsystems, Inc.  in the U.S.  and other
-countries.
+Oracle and Java are registered trademarks of Oracle and/or
+its affiliates.  Other names may be trademarks of their
+respective owners.
 
-This product is covered and controlled by U.S.  Export Control laws and
-may be subject to the export or import laws in other countries.
-Nuclear, missile, chemical biological weapons or nuclear maritime end
-uses or end users, whether direct or indirect, are strictly prohibited.
-Export or reexport to countries subject to U.S.  embargo or to entities
-identified on U.S.  export exclusion lists, including, but not limited
-to, the denied persons and specially designated nationals lists is
-strictly prohibited.
+AMD, Opteron, the AMD logo, and the AMD Opteron logo are
+trademarks or registered trademarks of Advanced Micro
+Devices.  Intel and Intel Xeon are trademarks or registered
+trademarks of Intel Corporation.  All SPARC trademarks are
+used under license and are trademarks or registered
+trademarks of SPARC International, Inc.  UNIX is a
+registered trademark licensed through X/Open Company, Ltd.
 
-Copyright © 2010 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-California 95054, Etats-Unis.  Tous droits rservs.
-
-Sun Microsystems, Inc.  dtient les droits de proprit intellectuele
-relatifs la technologie incorpore dans le produit qui est dcrit dans ce
-document.  En particulier, et ce sans limitation, ces droits de proprit
-intellectuelle peuvent inclure un ou plusieurs des brevets amricains
-lists l'adresse suivante:  http://www.sun.com/patents et un ou
-plusieures de brevet en attente aux Etats - Unis et dans les autres
-pays.
-
-CE PRODUIT CONTIENT DES INFORMATIONS CONFIDENTIELLES ET DES SECRETS
-COMMERCIAUX DE SUN MICROSYSTEMS, INC.  SON UTILISATION, SA DIVULGATION
-ET SA REPRODUCTION SONT INTERDITES SANS L AUTORISATION EXPRESSE, ECRITE
-ET PREALABLE DE SUN MICROSYSTEMS, INC.
-
-L'utilisation est soumise aux termes du contract de licence.
-
-Cette distributions peut inclure des elements dvelopps par des tiers.
-
-Sun, Sun Microsystems, le logo Sun, Java et Java SE sont des marques de
-fabrique ou des marques dposes de Sun Microsystems, Inc.  aux Etats-Unis
-et dans d'autres pays.
-
-Ce produit est soumis la lgislation amricaine en matire de contrle des
-exportations et peut tre soumis la rglementation en vigueur dans
-d'autres pays dans le domaine des exportations et importations.  Les
-utilisations finales, ou utilisateurs finaux, pour des armes
-nuclaires,des missiles, des armes biologiques et chimiques ou du
-nuclaire maritime, directement ou indirectement, sont strictement
-interdites.  Les exportations ou rexportations vers les pays sous
-embargo amricain, ou vers des entits figurant sur les listes d'exclusion
-d'exportation des produits ou des services qui sont regis parla
-legislation amricaines, y compris, mais de manire non exhaustive, la
-liste de personnes qui font objet d'un ordre de ne pas participer, d'une
-faon directe ou indirecte, aux exportations des produits ou des services
-qui sont rgis par la lgislation amricaine sur le contrle des
-exportations et la liste de ressortissants spcifiquement dsigns, sont
-rigoureusement interdites.
+This software or hardware and documentation may provide
+access to or information on content, products, and services
+from third parties.  Oracle Corporation and its affiliates
+are not responsible for and expressly disclaim all
+warranties of any kind with respect to third-party content,
+products, and services.  Oracle Corporation and its
+affiliates will not be responsible for any loss, costs, or
+damages incurred due to your access to or use of third-party
+content, products, or services.
diff --git a/extra/source/jdk-6/HOWTO-BUILD-TXZ b/extra/source/jdk-6/HOWTO-BUILD-TXZ
index 18f07e93..90a572b5 100644
--- a/extra/source/jdk-6/HOWTO-BUILD-TXZ
+++ b/extra/source/jdk-6/HOWTO-BUILD-TXZ
@@ -1,5 +1,5 @@
-1.  Download the file jdk-6u20-linux-i586.bin from
-    java.sun.com and put it in the directory.
+1.  Download the file jdk-6u*-linux-i586.bin from
+    java.com and put it in the directory.
 
 2.  Run jdk.SlackBuild to package it as an installable
     .txz package.
diff --git a/extra/source/jdk-6/LICENSE b/extra/source/jdk-6/LICENSE
index 0e8bde04..39e216aa 100644
--- a/extra/source/jdk-6/LICENSE
+++ b/extra/source/jdk-6/LICENSE
@@ -1,345 +1 @@
-Sun Microsystems, Inc. Binary Code License Agreement
-
-for the JAVA SE DEVELOPMENT KIT (JDK), VERSION 6
-
-SUN MICROSYSTEMS, INC. ("SUN") IS WILLING TO LICENSE THE
-SOFTWARE IDENTIFIED BELOW TO YOU ONLY UPON THE CONDITION
-THAT YOU ACCEPT ALL OF THE TERMS CONTAINED IN THIS BINARY
-CODE LICENSE AGREEMENT AND SUPPLEMENTAL LICENSE TERMS
-(COLLECTIVELY "AGREEMENT"). PLEASE READ THE AGREEMENT
-CAREFULLY.  BY USING THE SOFTWARE YOU ACKNOWLEDGE THAT 
-YOU HAVE READ THE TERMS AND AGREE TO THEM. IF YOU ARE 
-AGREEING TO THESE TERMS ON BEHALF OF A COMPANY OR OTHER 
-LEGAL ENTITY, YOU REPRESENT THAT YOU HAVE THE LEGAL 
-AUTHORITY TO BIND THE LEGAL ENTITY TO THESE TERMS. IF 
-YOU DO NOT HAVE SUCH AUTHORITY, OR IF YOU DO NOT WISH 
-TO BE BOUND BY THE TERMS, THEN YOU MUST NOT USE THE
-SOFTWARE ON THIS SITE OR ANY OTHER MEDIA ON WHICH THE 
-SOFTWARE IS CONTAINED.
-
-1. DEFINITIONS. "Software" means the identified above in
-binary form, any other machine readable materials
-(including, but not limited to, libraries, source files,
-header files, and data files), any updates or error
-corrections provided by Sun, and any user manuals,
-programming guides and other documentation provided to you
-by Sun under this Agreement.  "General Purpose Desktop
-Computers and Servers" means computers, including desktop
-and laptop computers, or servers, used for general
-computing functions under end user control (such as but not
-specifically limited to email, general purpose Internet
-browsing, and office suite productivity tools).
-The use of Software in systems and solutions that provide
-dedicated functionality (other than as mentioned above) or
-designed for use in embedded or function-specific software
-applications, for example but not limited to: Software
-embedded in or bundled with industrial control systems,
-wireless mobile telephones, wireless handheld devices,
-netbooks, kiosks, TV/STB, Blu-ray Disc devices, telematics 
-and network control switching equipment, printers and 
-storage management systems, and other related systems are 
-excluded from this definition and not licensed under this
-Agreement.  "Programs" means Java technology applets and
-applications intended to run on the Java Platform Standard
-Edition (Java SE) platform on Java-enabled General Purpose
-Desktop Computers and Servers.
-
-2. LICENSE TO USE. Subject to the terms and conditions of
-this Agreement, including, but not limited to the Java
-Technology Restrictions of the Supplemental License Terms,
-Sun grants you a non-exclusive, non-transferable, limited
-license without license fees to reproduce and use
-internally Software complete and unmodified for the sole
-purpose of running Programs. Additional licenses for
-developers and/or publishers are granted in the
-Supplemental License Terms.
-
-3. RESTRICTIONS. Software is confidential and copyrighted.
-Title to Software and all associated intellectual property
-rights is retained by Sun and/or its licensors. Unless
-enforcement is prohibited by applicable law, you may not
-modify, decompile, or reverse engineer Software. You
-acknowledge that Licensed Software is not designed or
-intended for use in the design, construction, operation or
-maintenance of any nuclear facility. Sun Microsystems, Inc.
-disclaims any express or implied warranty of fitness for
-such uses. No right, title or interest in or to any
-trademark, service mark, logo or trade name of Sun or its
-licensors is granted under this Agreement. Additional
-restrictions for developers and/or publishers licenses are
-set forth in the Supplemental License Terms.
-
-4. LIMITED WARRANTY. Sun warrants to you that for a period
-of ninety (90) days from the date of purchase, as evidenced
-by a copy of the receipt, the media on which Software is
-furnished (if any) will be free of defects in materials and
-workmanship under normal use. Except for the foregoing,
-Software is provided "AS IS". Your exclusive remedy and
-Sun's entire liability under this limited warranty will be
-at Sun's option to replace Software media or refund the fee
-paid for Software. Any implied warranties on the Software
-are limited to 90 days. Some states do not allow
-limitations on duration of an implied warranty, so the
-above may not apply to you. This limited warranty gives you
-specific legal rights. You may have others, which vary from
-state to state.
-
-5. DISCLAIMER OF WARRANTY. UNLESS SPECIFIED IN THIS
-AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS,
-REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED
-WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE OR NON-INFRINGEMENT ARE DISCLAIMED, EXCEPT TO THE
-EXTENT THAT THESE DISCLAIMERS ARE HELD TO BE LEGALLY
-INVALID.
-
-6. LIMITATION OF LIABILITY. TO THE EXTENT NOT PROHIBITED BY
-LAW, IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR
-ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, INDIRECT,
-CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER
-CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT
-OF OR RELATED TO THE USE OF OR INABILITY TO USE SOFTWARE,
-EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES. In no event will Sun's liability to you, whether
-in contract, tort (including negligence), or otherwise,
-exceed the amount paid by you for Software under this
-Agreement. The foregoing limitations will apply even if the
-above stated warranty fails of its essential purpose. Some
-states do not allow the exclusion of incidental or
-consequential damages, so some of the terms above may not
-be applicable to you.
-
-7. TERMINATION. This Agreement is effective until
-terminated. You may terminate this Agreement at any time by
-destroying all copies of Software. This Agreement will
-terminate immediately without notice from Sun if you fail
-to comply with any provision of this Agreement. Either
-party may terminate this Agreement immediately should any
-Software become, or in either party's opinion be likely to
-become, the subject of a claim of infringement of any
-intellectual property right. Upon Termination, you must
-destroy all copies of Software.
-
-8. EXPORT REGULATIONS. All Software and technical data
-delivered under this Agreement are subject to US export
-control laws and may be subject to export or import
-regulations in other countries. You agree to comply
-strictly with all such laws and regulations and acknowledge
-that you have the responsibility to obtain such licenses to
-export, re-export, or import as may be required after
-delivery to you.
-
-9. TRADEMARKS AND LOGOS. You acknowledge and agree as
-between you and Sun that Sun owns the SUN, SOLARIS, JAVA,
-JINI, FORTE, and iPLANET trademarks and all SUN, SOLARIS,
-JAVA, JINI, FORTE, and iPLANET-related trademarks, service
-marks, logos and other brand designations ("Sun Marks"),
-and you agree to comply with the Sun Trademark and Logo
-Usage Requirements currently located at
-http://www.sun.com/policies/trademarks. Any use you make of
-the Sun Marks inures to Sun's benefit.
-
-10. U.S. GOVERNMENT RESTRICTED RIGHTS. If Software is being
-acquired by or on behalf of the U.S. Government or by a
-U.S. Government prime contractor or subcontractor (at any
-tier), then the Government's rights in Software and
-accompanying documentation will be only as set forth in
-this Agreement; this is in accordance with 48 CFR 227.7201
-through 227.7202-4 (for Department of Defense (DOD)
-acquisitions) and with 48 CFR 2.101 and 12.212 (for non-DOD
-acquisitions).
-
-11. GOVERNING LAW. Any action related to this Agreement
-will be governed by California law and controlling U.S.
-federal law. No choice of law rules of any jurisdiction
-will apply.
-
-12. SEVERABILITY. If any provision of this Agreement is
-held to be unenforceable, this Agreement will remain in
-effect with the provision omitted, unless omission would
-frustrate the intent of the parties, in which case this
-Agreement will immediately terminate.
-
-13. INTEGRATION. This Agreement is the entire agreement
-between you and Sun relating to its subject matter. It
-supersedes all prior or contemporaneous oral or written
-communications, proposals, representations and warranties
-and prevails over any conflicting or additional terms of
-any quote, order, acknowledgment, or other communication
-between the parties relating to its subject matter during
-the term of this Agreement. No modification of this
-Agreement will be binding, unless in writing and signed by
-an authorized representative of each party.
-
-SUPPLEMENTAL LICENSE TERMS
-
-These Supplemental License Terms add to or modify the terms
-of the Binary Code License Agreement. Capitalized terms not
-defined in these Supplemental Terms shall have the same
-meanings ascribed to them in the Binary Code License
-Agreement . These Supplemental Terms shall supersede any
-inconsistent or conflicting terms in the Binary Code
-License Agreement, or in any license contained within the
-Software.
-
-A. Software Internal Use and Development License Grant.
-Subject to the terms and conditions of this Agreement and
-restrictions and exceptions set forth in the Software
-"README" file incorporated herein by reference, including,
-but not limited to the Java Technology Restrictions of
-these Supplemental Terms, Sun grants you a non-exclusive,
-non-transferable, limited license without fees to reproduce
-internally and use internally the Software complete and
-unmodified for the purpose of designing, developing, and
-testing your Programs.
-
-B. License to Distribute Software. Subject to the terms and
-conditions of this Agreement and restrictions and
-exceptions set forth in the Software README file,
-including, but not limited to the Java Technology
-Restrictions of these Supplemental Terms, Sun grants you a
-non-exclusive, non-transferable, limited license without
-fees to reproduce and distribute the Software, provided
-that (i) you distribute the Software complete and
-unmodified and only bundled as part of, and for the sole
-purpose of running, your Programs, (ii) the Programs add
-significant and primary functionality to the Software,
-(iii) you do not distribute additional software intended to
-replace any component(s) of the Software, (iv) you do not
-remove or alter any proprietary legends or notices
-contained in the Software, (v) you only distribute the
-Software subject to a license agreement that protects Sun's
-interests consistent with the terms contained in this
-Agreement, and (vi) you agree to defend and indemnify Sun
-and its licensors from and against any damages, costs,
-liabilities, settlement amounts and/or expenses (including
-attorneys' fees) incurred in connection with any claim,
-lawsuit or action by any third party that arises or results
-from the use or distribution of any and all Programs and/or
-Software.
-
-C. License to Distribute Redistributables. Subject to the
-terms and conditions of this Agreement and restrictions and
-exceptions set forth in the Software README file, including
-but not limited to the Java Technology Restrictions of
-these Supplemental Terms, Sun grants you a non-exclusive,
-non-transferable, limited license without fees to reproduce
-and distribute those files specifically identified as
-redistributable in the Software "README" file
-("Redistributables") provided that: (i) you distribute the
-Redistributables complete and unmodified, and only bundled
-as part of Programs, (ii) the Programs add significant and
-primary functionality to the Redistributables, (iii) you do
-not distribute additional software intended to supersede
-any component(s) of the Redistributables (unless otherwise
-specified in the applicable README file), (iv) you do not
-remove or alter any proprietary legends or notices
-contained in or on the Redistributables, (v) you only
-distribute the Redistributables pursuant to a license
-agreement that protects Sun's interests consistent with the
-terms contained in the Agreement, (vi) you agree to defend
-and indemnify Sun and its licensors from and against any
-damages, costs, liabilities, settlement amounts and/or
-expenses (including attorneys' fees) incurred in connection
-with any claim, lawsuit or action by any third party that
-arises or results from the use or distribution of any and
-all Programs and/or Software.
-
-D. Java Technology Restrictions.  You may not create,
-modify, or change the behavior of, or authorize your
-licensees to create, modify, or change the behavior of,
-classes, interfaces, or subpackages that are in any way
-identified as "java", "javax", "sun" or similar convention
-as specified by Sun in any naming convention designation.
-
-E. Distribution by Publishers. This section pertains to
-your distribution of the Software with your printed book or
-magazine (as those terms are commonly used in the industry)
-relating to Java technology ("Publication"). Subject to and
-conditioned upon your compliance with the restrictions and
-obligations contained in the Agreement, in addition to the
-license granted in Paragraph 1 above, Sun hereby grants to
-you a non-exclusive, nontransferable limited right to
-reproduce complete and unmodified copies of the Software on
-electronic media (the "Media") for the sole purpose of
-inclusion and distribution with your Publication(s),
-subject to the following terms: (i) You may not distribute
-the Software on a stand-alone basis; it must be distributed
-with your Publication(s); (ii) You are responsible for
-downloading the Software from the applicable Sun web site;
-(iii) You must refer to the Software as JavaTM SE
-Development Kit 6; (iv) The Software must be reproduced in
-its entirety and without any modification whatsoever
-(including, without limitation, the Binary Code License and
-Supplemental License Terms accompanying the Software and
-proprietary rights notices contained in the Software);
-(v) The Media label shall include the following
-information: Copyright 2006, Sun Microsystems, Inc. All
-rights reserved. Use is subject to license terms. Sun, Sun
-Microsystems, the Sun logo, Solaris, Java, the Java Coffee
-Cup logo, J2SE, and all trademarks and logos based on Java
-are trademarks or registered trademarks of Sun
-Microsystems, Inc. in the U.S. and other countries. This
-information must be placed on the Media label in such a
-manner as to only apply to the Sun Software; (vi) You must
-clearly identify the Software as Sun's product on the Media
-holder or Media label, and you may not state or imply that
-Sun is responsible for any third-party software contained
-on the Media; (vii) You may not include any third party
-software on the Media which is intended to be a replacement
-or substitute for the Software; (viii) You shall indemnify
-Sun for all damages arising from your failure to comply
-with the requirements of this Agreement. In addition, you
-shall defend, at your expense, any and all claims brought
-against Sun by third parties, and shall pay all damages
-awarded by a court of competent jurisdiction, or such
-settlement amount negotiated by you, arising out of or in
-connection with your use, reproduction or distribution of
-the Software and/or the Publication. Your obligation to
-provide indemnification under this section shall arise
-provided that Sun: (a) provides you prompt notice of the
-claim; (b) gives you sole control of the defense and
-settlement of the claim; (c) provides you, at your expense,
-with all available information, assistance and authority to
-defend; and (d) has not compromised or settled such claim
-without your prior written consent; and (ix) You shall
-provide Sun with a written notice for each Publication;
-such notice shall include the following information: (1)
-title of Publication, (2) author(s), (3) date of
-Publication, and (4) ISBN or ISSN numbers. Such notice
-shall be sent to Sun Microsystems, Inc., 4150 Network
-Circle, M/S USCA12-110, Santa Clara, California 95054,
-U.S.A , Attention: Contracts Administration.
-
-F. Source Code. Software may contain source code that,
-unless expressly licensed for other purposes, is provided
-solely for reference purposes pursuant to the terms of this
-Agreement. Source code may not be redistributed unless
-expressly provided for in this Agreement.
-
-G. Third Party Code. Additional copyright notices and
-license terms applicable to portions of the Software are
-set forth in the THIRDPARTYLICENSEREADME.txt file. In
-addition to any terms and conditions of any third party
-opensource/freeware license identified in the
-THIRDPARTYLICENSEREADME.txt file, the disclaimer of
-warranty and limitation of liability provisions in
-paragraphs 5 and 6 of the  Binary Code License Agreement
-shall apply to all Software in this distribution.
-
-H. Termination for Infringement. Either party may terminate
-this Agreement immediately should any Software become, or
-in either party's opinion be likely to become, the subject
-of a claim of infringement of any intellectual property
-right.
-
-I. Installation and Auto-Update.  The Software's
-installation and auto-update processes transmit a limited
-amount of data to Sun (or its service provider) about those
-specific processes to help Sun understand and optimize
-them.  Sun does not associate the data with personally
-identifiable information.  You can find more information
-about the data Sun collects at http://java.com/data/.
-
-For inquiries please contact: Sun Microsystems, Inc., 4150
-Network Circle, Santa  Clara, California 95054, U.S.A.
-
+Please refer to http://java.com/license
diff --git a/extra/source/jdk-6/README.html b/extra/source/jdk-6/README.html
index 5b784f95..b7996aec 100644
--- a/extra/source/jdk-6/README.html
+++ b/extra/source/jdk-6/README.html
@@ -1,714 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
 <html>
 <head>
-  <meta http-equiv="CONTENT-TYPE" content="text/html; charset=us-ascii">
-  <meta name="collection" content="reference">
-
-  <title>README -- Java Platform, Standard Edition Development Kit</title>
+<title>README
+</title>
 </head>
-
-<body lang="en-US" bgcolor="#FFFFFF">
-  <h1 align="center">README</h1>
-
-  <h2 align="center">Java<sup><font size="-2">TM</font></sup> Platform,
-  Standard Edition 6<br>
-  Development Kit</h2>
-
-  <p align="center"><b>JDK<sup><font size="-2">TM</font></sup> 6</b></p>
-
-  <h2>Contents</h2>
-
-  <ul>
-    <li><a href="#introduction">Introduction</a></li>
-
-    <li><a href="#install">System Requirements &amp; Installation</a></li>
-
-    <li><a href="#docs">JDK Documentation</a></li>
-
-    <li><a href="#relnotes">Release Notes</a></li>
-
-    <li><a href="#compatibility">Compatibility</a></li>
-
-    <li><a href="#bugs">Bug Reports and Feedback</a></li>
-
-    <li><a href="#contents">Contents of the JDK</a></li>
-
-    <li><a href="#jre">Java Runtime Environment</a></li>
-
-    <li><a href="#redistribution">Redistribution</a></li>
-
-    <li><a href="#endorsed">Java Endorsed Standards Override
-    Mechanism</a></li>
-
-    <li><a href="#javadb">Java DB</a></li>
-
-    <li><a href="#webpages">Web Pages</a></li>
-  </ul>
-
-  <h2><a name="introduction" id="introduction"></a>Introduction</h2>
-
-  <blockquote>
-    Thank you for downloading this release of the Java<sup><font size=
-    "-2">TM</font></sup> Platform, Standard Edition Development Kit
-    (JDK<sup><font size="-2">TM</font></sup>). The JDK is a development
-    environment for building applications, applets, and components using the
-    Java programming language.
-  </blockquote>
-
-  <blockquote>
-    The JDK includes tools useful for developing and testing programs written
-    in the Java programming language and running on the Java<sup><font size=
-    "-2">TM</font></sup> platform.
-  </blockquote>
-
-  <h2><a name="install" id="install"></a>System Requirements &amp;
-  Installation</h2>
-
-  <blockquote>
-    System requirements, installation instructions and troubleshooting tips
-    are located on the Java Software web site at:
-  </blockquote>
-
-  <blockquote>
-    <a href="http://java.sun.com/javase/6/webnotes/install/">JDK 6
-    Installation Instructions</a>
-  </blockquote>
-
-  <h2><a name="docs" id="docs"></a>JDK<sup><font size="-2">TM</font></sup>
-  Documentation</h2>
-
-  <blockquote>
-    The on-line <a href=
-    "http://java.sun.com/javase/6/docs/">Java<sup><font size=
-    "-2">TM</font></sup> Platform, Standard Edition (Java SE)
-    Documentation</a> contains API specifications, feature descriptions,
-    developer guides, reference pages for JDK<sup><font size=
-    "-2">TM</font></sup> tools and utilities, demos, and links to related
-    information. This documentation is also available in a download bundle
-    which you can install on your machine. To obtain the documentation bundle,
-    see the <a href="http://java.sun.com/javase/6/download.jsp">download
-    page</a>. For API documentation, refer to the <a href=
-    "http://java.sun.com/javase/6/docs/api/index.html">The
-    Java<sup><font size="-2">TM</font></sup> Platform, Standard Edition API
-    Specification</a> This provides brief descriptions of the API with an
-    emphasis on specifications, not on code examples.
-  </blockquote>
-
-  <h2><a name="relnotes" id="relnotes"></a>Release Notes</h2>
-
-  <blockquote>
-    See the <a href="http://java.sun.com/javase/6/webnotes/">Java SE 6 Release
-    Notes</a> on the Java Software web site for additional information
-    pertaining to this release. Please check the on-line release notes
-    occasionally for the latest information as they will be updated as needed.
-  </blockquote>
-
-  <h2><a name="compatibility" id="compatibility"></a>Compatibility</h2>
-
-  <blockquote>
-    See <a href=
-    "http://java.sun.com/javase/6/webnotes/compatibility.html">Compatibility
-    with Previous Releases</a> on the Java Software web site for the list of
-    known compatibility issues. Every effort has been made to support programs
-    written for previous versions of the Java<sup><font size=
-    "-2">TM</font></sup> platform. Although some incompatible changes were
-    necessary, most software should migrate to the current version with no
-    reprogramming. Any failure to do so is considered a bug, except for a
-    small number of cases where compatibility was deliberately broken, as
-    described on our compatibility web page. Some compatibility-breaking
-    changes were required to close potential security holes or to fix
-    implementation or design bugs.
-  </blockquote>
-
-  <h2><a name="bugs" id="bugs"></a>Bug Reports and Feedback</h2>
-
-  <blockquote>
-    The <a href="http://bugs.sun.com/bugdatabase/index.jsp">Bug Database</a>
-    web site lets you search for and examine existing bug reports, submit your
-    own bug reports, and tell us which bug fixes matter most to you. To
-    directly submit a bug or request a feature, fill out this form:
-  </blockquote>
-
-  <blockquote>
-    <a href=
-    "http://bugs.sun.com/services/bugreport/index.jsp">http://bugs.sun.com/services/bugreport/index.jsp</a>
-  </blockquote>
-
-  <blockquote>
-    You can send feedback to the <a href=
-    "http://developers.sun.com/contact/feedback.jsp?&category=docteam">Java SE documentation
-    team</a>. You can also send comments directly to <a href=
-    "http://developers.sun.com/contact/index.jsp">Java Software engineering
-    team email addresses</a>.
-  </blockquote>
-
-  <blockquote>
-    <b>Note</b> - Please do not seek technical support through the Bug
-    Database or our development teams. For support options, see <a href=
-    "http://java.sun.com/developer/support/">Support and Services</a> on the
-    Java Software web site.
-  </blockquote>
-
-  <h2><a name="contents" id="contents"></a>Contents of the JDK<sup><font size=
-  "-2">TM</font></sup></h2>
-
-  <blockquote>
-    This section contains a general summary of the files and directories in
-    the JDK<sup><font size="-2">TM</font></sup>. For details on the files and
-    directories, see the <a href=
-    "http://java.sun.com/javase/6/docs/technotes/tools/index.html#general">JDK
-    File Structure</a> section of the Java SE documentation for your platform.
-  </blockquote>
-
-  <dl>
-    <dd>
-      <dl>
-        <dt><b>Development Tools</b></dt>
-
-        <dd>(In the <code>bin/</code> subdirectory) Tools and utilities that
-        will help you develop, execute, debug, and document programs written
-        in the Java<sup><font size="-2">TM</font></sup> programming language.
-        For further information, see the <a href=
-        "http://java.sun.com/javase/6/docs/technotes/tools/index.html">tool
-        documentation</a>.<br>
-        <br></dd>
-
-        <dt><b>Runtime Environment</b></dt>
-
-        <dd>(In the <code>jre/</code> subdirectory) An implementation of the
-        Java Runtime Environment (JRE<sup><font size="-2">TM</font></sup>) for
-        use by the JDK. The JRE includes a Java<sup><font size=
-        "-2">TM</font></sup> Virtual Machine (JVM<sup><font size=
-        "-2">TM</font></sup>), class libraries, and other files that support
-        the execution of programs written in the Java<sup><font size=
-        "-2">TM</font></sup> programming language.<br>
-        <br></dd>
-
-        <dt><b>Additional Libraries</b></dt>
-
-        <dd>(In the <code>lib/</code> subdirectory) Additional class libraries
-        and support files required by the development tools.<br>
-        <br></dd>
-
-        <dt><b>Demo Applets and Applications</b></dt>
-
-        <dd>(In the <code>demo/</code> subdirectory) Examples, with source
-        code, of programming for the Java<sup><font size="-2">TM</font></sup>
-        platform. These include examples that use Swing and other
-        Java<sup><font size="-2">TM</font></sup> Foundation Classes, and the
-        Java<sup><font size="-2">TM</font></sup> Platform Debugger
-        Architecture.<br>
-        <br></dd>
-
-        <dt><b>Sample Code</b></dt>
-
-        <dd>(In the <code>sample</code> subdirectory) Samples, with source
-        code, of programming for certain Java API's.<br>
-        <br></dd>
-
-        <dt><b>C header Files</b></dt>
-
-        <dd>(In the <code>include/</code> subdirectory) Header files that
-        support native-code programming using the <a href=
-        "http://java.sun.com/javase/6/docs/technotes/guides/jni/">Java Native
-        Interface</a>, the <a href=
-        "http://java.sun.com/javase/6/docs/technotes/guides/jvmti/">JVM<sup><font size="-2">TM</font></sup>
-        Tool Interface</a>, and other functionality of the
-        Java<sup><font size="-2">TM</font></sup> platform.<br>
-        <br></dd>
-
-        <dt><b>Source Code</b></dt>
-
-        <dd>(In <code>src.zip</code>) Java<sup><font size="-2">TM</font></sup>
-        programming language source files for all classes that make up the
-        Java&nbsp;core API (that is, sources files for the java.*, javax.* and
-        some org.* packages, but not for com.sun.* packages). This source code
-        is provided for informational purposes only, to help developers learn
-        and use the Java<sup><font size="-2">TM</font></sup> programming
-        language. These files do not include platform-specific implementation
-        code and cannot be used to rebuild the class libraries. To extract
-        these file, use any common zip utility. Or, you may use the Jar
-        utility in the JDK's <code>bin/</code> directory:<br>
-        <br>
-        <code>jar xvf src.zip</code></dd>
-      </dl>
-    </dd>
-  </dl>
-
-  <h2><a name="jre" id="jre"></a>The Java Runtime Environment
-  (JRE<sup><font size="-2">TM</font></sup>)</h2>
-
-  <blockquote>
-    The Java<sup><font size="-2">TM</font></sup> Runtime Environment
-    (JRE<sup><font size="-2">TM</font></sup>) is available as a separately
-    downloadable product. See the <a href=
-    "http://java.sun.com/javase/6/download.jsp">download web site</a>.
-  </blockquote>
-
-  <blockquote>
-    The JRE allows you to run applications written in the Java<sup><font size=
-    "-2">TM</font></sup> programming language. Like the JDK<sup><font size=
-    "-2">TM</font></sup>, it contains the Java<sup><font size=
-    "-2">TM</font></sup> Virtual Machine (JVM<sup><font size=
-    "-2">TM</font></sup>), classes comprising the Java<sup><font size=
-    "-2">TM</font></sup> platform API, and supporting files. Unlike the JDK,
-    it does not contain development tools such as compilers and debuggers.
-  </blockquote>
-
-  <blockquote>
-    You can freely redistribute the JRE with your application, according to
-    the terms of the JRE license. Once you have developed your application
-    using the JDK, you can ship it with the JRE so your end-users will have a
-    Java<sup><font size="-2">TM</font></sup> platform on which to run your
-    software.
-  </blockquote>
-
-  <h2><a name="redistribution" id="redistribution"></a>Redistribution</h2>
-
-  <blockquote>
-    <blockquote>
-      <hr>
-      NOTE - The license for this software does not allow the redistribution
-      of beta and other pre-release versions.
-      <hr>
-    </blockquote>
-  </blockquote>
-
-  <blockquote>
-    Subject to the terms and conditions of the Software License Agreement and
-    the obligations, restrictions, and exceptions set forth below, You may
-    reproduce and distribute the Software (and also portions of Software
-    identified below as Redistributable), provided that:
-  </blockquote>
-
-  <blockquote>
-    <ol type="a">
-      <li>you distribute the Software complete and unmodified and only bundled
-      as part of Your applets and applications ("Programs"),</li>
-
-      <li>your Programs add significant and primary functionality to the
-      Software,</li>
-
-      <li>your Programs are only intended to run on Java-enabled general
-      purpose desktop computers and servers,</li>
-
-      <li>you distribute Software for the sole purpose of running your
-      Programs,</li>
-
-      <li>you do not distribute additional software intended to replace any
-      component(s) of the Software,</li>
-
-      <li>you do not remove or alter any proprietary legends or notices
-      contained in or on the Software,</li>
-
-      <li>you only distribute the Software subject to a license agreement that
-      protects Sun's interests consistent with the terms contained in this
-      Agreement, and</li>
-
-      <li>you agree to defend and indemnify Sun and its licensors from and
-      against any damages, costs, liabilities, settlement amounts and/or
-      expenses (including attorneys' fees) incurred in connection with any
-      claim, lawsuit or action by any third party that arises or results from
-      the use or distribution of any and all Programs and/or Software.</li>
-    </ol>
-  </blockquote>
-
-  <blockquote>
-    The term "vendors" used here refers to licensees, developers, and
-    independent software vendors (ISVs) who license and distribute the
-    Java<sup><font size="-2">TM</font></sup> Development Kit
-    (JDK<sup><font size="-2">TM</font></sup>) with their programs.
-  </blockquote>
-
-  <blockquote>
-    Vendors must follow the terms of the Java Development Kit Binary Code
-    License agreement.
-  </blockquote>
-
-  <h3>Required vs. Optional Files</h3>
-
-  <blockquote>
-    The files that make up the Java<sup><font size="-2">TM</font></sup>
-    Development Kit (JDK<sup><font size="-2">TM</font></sup>) are divided into
-    two categories: required and optional. Optional files may be excluded from
-    redistributions of the JDK at the vendor's discretion.
-  </blockquote>
-
-  <blockquote>
-    The following section contains a list of the files and directories that
-    may optionally be omitted from redistributions of the JDK. All files not
-    in these lists of optional files must be included in redistributions of
-    the JDK.
-  </blockquote>
-
-  <h3>Optional Files and Directories</h3>
-
-  <blockquote>
-    The following files may be optionally excluded from redistributions. These
-    files are located in the jdk1.6.0_&lt;version&gt; directory, where
-    &lt;version&gt; is the update version number. Solaris<sup><font size=
-    "-2">TM</font></sup> and Linux filenames and separators are shown. Windows
-    executables have the ".exe" suffix. Corresponding files with
-    <code>_g</code> in the name can also be excluded. The corresponding man
-    pages should be excluded for any excluded executables (with paths listed
-    below beginning with <code>bin/</code>, for the Solaris<sup><font size=
-    "-2">TM</font></sup> Operating System and Linux).
-  </blockquote>
-
-  <dl>
-    <dd>
-      <dl>
-        <dt><code>jre/lib/charsets.jar</code></dt>
-
-        <dd>Character conversion classes</dd>
-
-        <dt><code>jre/lib/ext/</code></dt>
-
-        <dd><code>sunjce_provider.jar</code> - the SunJCE provider for Java
-        Cryptography APIs<br>
-        <code>localedata.jar</code> - contains many of the resources needed
-        for non US English locales<br>
-        <code>ldapsec.jar</code> - contains security features supported by the
-        LDAP service provider<br>
-        <code>dnsns.jar</code> - for the InetAddress wrapper of JNDI DNS
-        provider</dd>
-
-        <dt><code>bin/rmid</code> and <code>jre/bin/rmid</code></dt>
-
-        <dd>Java RMI Activation System Daemon</dd>
-
-        <dt><code>bin/rmiregistry</code> and
-        <code>jre/bin/rmiregistry</code></dt>
-
-        <dd>Java Remote Object Registry</dd>
-
-        <dt><code>bin/tnameserv</code> and <code>jre/bin/tnameserv</code></dt>
-
-        <dd>Java IDL Name Server</dd>
-
-        <dt><code>bin/keytool</code> and <code>jre/bin/keytool</code></dt>
-
-        <dd>Key and Certificate Management Tool</dd>
-
-        <dt><code>bin/kinit</code> and <code>jre/bin/kinit</code></dt>
-
-        <dd>Used to obtain and cache Kerberos ticket-granting tickets</dd>
-
-        <dt><code>bin/klist</code> and <code>jre/bin/klist</code></dt>
-
-        <dd>Kerberos display entries in credentials cache and keytab</dd>
-
-        <dt><code>bin/ktab</code> and <code>jre/bin/ktab</code></dt>
-
-        <dd>Kerberos key table manager</dd>
-
-        <dt><code>bin/policytool</code> and
-        <code>jre/bin/policytool</code></dt>
-
-        <dd>Policy File Creation and Management Tool</dd>
-
-        <dt><code>bin/orbd</code> and <code>jre/bin/orbd</code></dt>
-
-        <dd>Object Request Broker Daemon</dd>
-
-        <dt><code>bin/servertool</code> and
-        <code>jre/bin/servertool</code></dt>
-
-        <dd>Java IDL Server Tool</dd>
-
-        <dt><code>bin/javaws</code>, <code>jre/bin/javaws</code>,
-        <code>jre/lib/javaws/</code> and <code>jre/lib/javaws.jar</code></dt>
-
-        <dd>Java Web Start</dd>
-
-        <dt><code>db/</code></dt>
-
-        <dd>
-          Java DB, Sun Microsystems's distribution of the Apache Derby
-          database (only with file based distributions of the JDK). 
-        </dd>
-
-        <dt><code>demo/</code></dt>
-
-        <dd>Demo Applets and Applications</dd>
-
-        <dt><code>sample/</code></dt>
-
-        <dd>Sample Code</dd>
-
-        <dt><code>src.zip</code></dt>
-
-        <dd>Archive of source files</dd>
-      </dl>
-    </dd>
-  </dl>
-
-  <h3><a name="redistributablejdkfiles" id=
-  "redistributablejdkfiles"></a>Redistributable JDK<sup><font size=
-  "-2">TM</font></sup> Files</h3>
-
-  <blockquote>
-    The limited set of files and directories from the JDK listed below may be
-    included in vendor redistributions of the Java<sup><font size=
-    "-2">TM</font></sup> Runtime Environment (JRE<sup><font size=
-    "-2">TM</font></sup>). They cannot be redistributed separately, and must
-    accompany an identically versioned JRE distribution. All paths are
-    relative to the top-level directory of the JDK. The corresponding man
-    pages should be included for any included executables (with paths listed
-    below beginning with <code>bin/</code>, for the Solaris<sup><font size=
-    "-2">TM</font></sup> Operating System and Linux).
-  </blockquote>
-
-  <dl>
-    <dd>
-      <dl>
-        <dt><code>jre/lib/cmm/PYCC.pf</code></dt>
-
-        <dd>Color profile. This file is required only if one wishes to convert
-        between the PYCC color space and another color space.</dd>
-
-        <dt>All <code>.ttf</code> font files in the
-        <code>jre/lib/fonts/</code> directory.</dt>
-
-        <dd>Note that the LucidaSansRegular.ttf font is already contained in
-        the JRE, so there is no need to bring that file over from the
-        JDK.</dd>
-
-        <dt><code>jre/lib/audio/soundbank.gm</code></dt>
-
-        <dd>This MIDI soundbank is present in the JDK, but it has been removed
-        from the JRE in order to reduce the size of the JRE download bundle.
-        However, a soundbank file is necessary for MIDI playback, and
-        therefore the JDK's <code>soundbank.gm</code> file may be included in
-        redistributions of the JRE at the vendor's discretion. Several
-        versions of enhanced MIDI soundbanks are available from the Java Sound
-        web site: <a href=
-        "http://java.sun.com/products/java-media/sound/">http://java.sun.com/products/java-media/sound/</a>.
-        These alternative soundbanks may be included in redistributions of the
-        JRE.</dd>
-
-        <dt>The javac bytecode compiler, consisting of the following
-        files:</dt>
-
-        <dd><code>bin/javac</code> [Solaris<sup><font size=
-        "-2">TM</font></sup> Operating System and Linux]<br>
-        <code>bin/sparcv9/javac</code> [Solaris<sup><font size=
-        "-2">TM</font></sup> Operating System (SPARC(R) Platform Edition)]<br>
-        <code>bin/amd64/javac</code> [Solaris<sup><font size=
-        "-2">TM</font></sup> Operating System (AMD)]<br>
-        <code>bin/javac.exe</code> [Microsoft Windows]<br>
-        <code>lib/tools.jar</code> [All platforms]</dd>
-
-        <dt>The Annotation Processing Tool, consisting of the following
-        files:</dt>
-
-        <dd><code>lib/tools.jar</code> [All platforms]<br>
-        <code>bin/apt</code> [Solaris<sup><font size="-2">TM</font></sup>
-        Operating System and Linux]<br>
-        <code>bin/sparcv9/apt</code> [Solaris<sup><font size=
-        "-2">TM</font></sup> Operating System (SPARC(R) Platform Edition)]<br>
-        <code>bin/amd64/apt</code> [Solaris<sup><font size=
-        "-2">TM</font></sup> Operating System (AMD)]<br>
-        <code>bin/apt.exe</code> [Microsoft Windows]</dd>
-
-        <dt><code>lib/jconsole.jar</code></dt>
-
-        <dd>The Jconsole application. NOTE: The Jconsole application requires
-        the dynamic attach mechanism.</dd>
-
-        <dt>The dynamic attach mechanism consisting of the following
-        files:</dt>
-
-        <dd><code>lib/tools.jar</code> [All platforms]<br>
-        <code>jre/lib/sparc/libattach.so</code> [Solaris<sup><font size=
-        "-2">TM</font></sup> Operating System (SPARC(R) Platform Edition) and
-        Linux]<br>
-        <code>jre/lib/sparcv9/libattach.so</code> [Solaris<sup><font size=
-        "-2">TM</font></sup> Operating System (SPARC(R) Platform Edition) and
-        Linux]<br>
-        <code>jre/lib/i386/libattach.so</code> [Solaris<sup><font size=
-        "-2">TM</font></sup> Operating System (x86) and Linux]<br>
-        <code>jre/lib/amd64/libattach.so</code> [Solaris<sup><font size=
-        "-2">TM</font></sup> Operating System (AMD) and Linux]<br>
-        <code>jre\bin\attach.dll</code> [Microsoft Windows]<br></dd>
-
-        <dt>The Java Platform Debugger Architecture implementation consisting
-        of the files shown in the dynamic attach section above, and the
-        following files:</dt>
-
-        <dd><code>lib/tools.jar</code> [All platforms]<br>
-        <code>lib/sa-jdi.jar</code> [All platforms]<br>
-        <code>jre/lib/sparc/libsaproc.so</code> [Solaris<sup><font size=
-        "-2">TM</font></sup> Operating System (SPARC(R) Platform Edition) and
-        Linux]<br>
-        <code>jre/lib/sparcv9/libsaproc.so</code> [Solaris<sup><font size=
-        "-2">TM</font></sup> Operating System (SPARC(R) Platform Edition) and
-        Linux]<br>
-        <code>jre/lib/i386/libsaproc.so</code> [Solaris<sup><font size=
-        "-2">TM</font></sup> Operating System (x86) and Linux]<br>
-        <code>jre/lib/amd64/libsaproc.so</code> [Solaris<sup><font size=
-        "-2">TM</font></sup> Operating System (AMD) and Linux]<br></dd>
-
-        <dt><code>jre\bin\server\</code></dt>
-
-        <dd>On Microsoft Windows platforms, the JDK includes both the Java
-        HotSpot<sup><font size="-2">TM</font></sup> Server VM and Java
-        HotSpot<sup><font size="-2">TM</font></sup> Client VM. However, the
-        JRE for Microsoft Windows platforms includes only the Java
-        HotSpot<sup><font size="-2">TM</font></sup> Client VM. Those wishing
-        to use the Java HotSpot<sup><font size="-2">TM</font></sup> Server VM
-        with the JRE may copy the JDK's <code>jre\bin\server</code> folder to
-        a <code>bin\server</code> directory in the JRE. Software vendors may
-        redistribute the Java HotSpot<sup><font size="-2">TM</font></sup>
-        Server VM with their redistributions of the JRE.</dd>
-      </dl>
-    </dd>
-  </dl>
-
-  <h3>Unlimited Strength Java Cryptography Extension</h3>
-
-  <blockquote>
-    Due to import control restrictions for some countries, the Java
-    Cryptography Extension (JCE) policy files shipped with the JDK and the JRE
-    allow strong but limited cryptography to be used. These files are located
-    at<br>
-    <br>
-    <code>&lt;java-home&gt;/lib/security/local_policy.jar</code><br>
-    <code>&lt;java-home&gt;/lib/security/US_export_policy.jar</code><br>
-    <br>
-    where <code>&lt;java-home&gt;</code> is the <code>jre</code> directory of
-    the JDK or the top-level directory of the JRE.
-  </blockquote>
-
-  <blockquote>
-    An unlimited strength version of these files indicating no restrictions on
-    cryptographic strengths is available on the JDK web site for those living
-    in eligible countries. Those living in eligible countries may download the
-    unlimited strength version and replace the strong cryptography jar files
-    with the unlimited strength files.
-  </blockquote>
-
-  <h3>The cacerts Certificates File</h3>
-
-  <blockquote>
-    Root CA certificates may be added to or removed from the Java SE
-    certificate file located at
-  </blockquote>
-
-  <blockquote>
-    <code>&lt;java-home&gt;/lib/security/cacerts</code>
-  </blockquote>
-
-  <blockquote>
-    For more information, see <a href=
-    "http://java.sun.com/javase/6/docs/technotes/tools/solaris/keytool.html#cacerts">
-    The cacerts Certificates File</a> section in the keytool documentation.
-  </blockquote>
-
-  <h2><a name="endorsed" id="endorsed"></a> Java Endorsed Standards Override
-  Mechanism</h2>
-
-  <blockquote>
-    From time to time it is necessary to update the Java platform in order to
-    incorporate newer versions of standards that are created outside of the
-    Java Community Process<font size="-2"><sup>SM</sup></font> (JCP<font size=
-    "-2"><sup>SM</sup></font> <a href=
-    "http://www.jcp.org/">http://www.jcp.org/</a>) (<i>Endorsed
-    Standards</i>), or in order to update the version of a technology included
-    in the platform to correspond to a later standalone version of that
-    technology (<i>Standalone Technologies</i>).
-  </blockquote>
-
-  <blockquote>
-    The <i>Endorsed Standards Override Mechanism</i> provides a means whereby
-    later versions of classes and interfaces that implement Endorsed Standards
-    or Standalone Technologies may be incorporated into the Java Platform.
-  </blockquote>
-
-  <blockquote>
-    For more information on the Endorsed Standards Override Mechanism,
-    including the list of platform packages that it may be used to override,
-    see
-  </blockquote>
-
-  <blockquote>
-    <a href=
-    "http://java.sun.com/javase/6/docs/technotes/guides/standards/">http://java.sun.com/javase/6/docs/technotes/guides/standards/</a>
-  </blockquote>
-
-  <h2><a name="javadb" id="javadb"></a>Java DB</h2>
-
-  <blockquote>
-    This distribution bundles Java DB, Sun Microsystems' distribution of the
-    Apache Derby pure Java database technology. Default installation locations
-    are:
-
-    <ul>
-      <li>Solaris: <code>/opt/SUNWjavadb</code></li>
-
-      <li>Linux: <code>/opt/sun/javadb</code></li>
-
-      <li>Windows: <code>C:\Program Files\Sun\JavaDB</code></li>
-    </ul>
-
-    <p>For information on Java DB and Derby, including user and API
-    documentation, the capabilities of Java DB and further resources, see the
-    index.html file in the above directories.</p>
-
-<p>
-Note that file based distributions of the JDK on Solaris and Linux
-include Java DB in the ${JAVA_HOME}/db directory.
-</p>
-  </blockquote>
-
-  <h2><a name="webpages" id="webpages"></a>Web Pages</h2>
-
-  <blockquote>
-    For additional information, refer to these Sun Microsystems pages on the
-    World Wide Web:
-  </blockquote>
-
-  <dl>
-    <dd>
-      <dl>
-        <dt><a href="http://java.sun.com/">http://java.sun.com/</a></dt>
-
-        <dd>The Java Software web site, with the latest information on Java
-        technology, product information, news, and features.</dd>
-
-        <dt><a href=
-        "http://java.sun.com/docs">http://java.sun.com/docs</a></dt>
-
-        <dd>Java<sup><font size="-2">TM</font></sup> platform Documentation
-        provides access to white papers, the Java Tutorial and other
-        documents.</dd>
-
-        <dt><a href=
-        "http://developer.java.sun.com/">http://developer.java.sun.com</a></dt>
-
-        <dd>Developer Services web site (Free registration required).
-        Additional technical information, news, and features; user forums;
-        support information, and much more.</dd>
-
-        <dt><a href=
-        "http://java.sun.com/products/">http://java.sun.com/products/</a></dt>
-
-        <dd>Java Technology Products &amp; API</dd>
-      </dl>
-    </dd>
-  </dl>
-  <hr>
-
-  <p><font size="2">The Java<sup><font size="-2">TM</font></sup> Development
-  Kit (JDK<sup><font size="-2">TM</font></sup>) is a product of Sun
-  Microsystems<sup><font size="-2">TM</font></sup>, Inc.<br>
-  <br>
-  Copyright &copy; 2010 Sun Microsystems, Inc.<br>
-  4150 Network Circle, Santa Clara, California 95054, U.S.A.<br>
-  All rights reserved.</font></p>
-<script type="text/javascript" language="JavaScript" src="/js/omi/jsc/s_code_remote.js">
-</script>
+<body>
+Please refer to http://java.com/licensereadme
 </body>
 </html>
 
diff --git a/extra/source/jdk-6/README_ja.html b/extra/source/jdk-6/README_ja.html
deleted file mode 100644
index 363acb05..00000000
--- a/extra/source/jdk-6/README_ja.html
+++ /dev/null
@@ -1,438 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-  <meta http-equiv="CONTENT-TYPE" content="text/html; charset=EUC-JP">
-  <meta name="collection" content="reference">
-
-<title>README -- Java Platform, Standard Edition Development Kit</title>
-</head>
-
-<body lang="en-US" bgcolor="#FFFFFF">
-<h1 align="center">README</h1>
-
-<h2 align="center">Java<sup><font size="-2">TM</font></sup> Platform, Standard Edition 6<br> Development Kit</h2>
-
-<p align="center"><b>JDK<sup><font size="-2">TM</font></sup> 6</b></p>
-
-<h2>Ìܼ¡</h2>
-
-  <ul>
-<li><a href="#introduction">¤Ï¤¸¤á¤Ë</a></li>
-
-<li><a href="#install">¥·¥¹¥Æ¥àÍ׷浪¤è¤Ó¥¤¥ó¥¹¥È¡¼¥ë</a></li>
-
-<li><a href="#docs">JDK ¥É¥­¥å¥á¥ó¥È</a></li>
-
-<li><a href="#relnotes">¥ê¥ê¡¼¥¹¥Î¡¼¥È</a></li>
-
-<li><a href="#compatibility">¸ß´¹À­</a></li>
-
-<li><a href="#bugs">¥Ð¥°Êó¹ð¤È¥Õ¥£¡¼¥É¥Ð¥Ã¥¯</a></li>
-
-<li><a href="#contents">JDK ¤ÎÆâÍÆ</a></li>
-
-<li><a href="#jre">Java Runtime Environment</a></li>
-
-<li><a href="#redistribution">ºÆÇÛÉÛ</a></li>
-
-<li><a href="#endorsed">¿ä¾©µ¬³Ê¥ª¡¼¥Ð¡¼¥é¥¤¥Éµ¡¹½</a></li>
-
-<li><a href="#javadb">Java DB</a></li>
-
-<li><a href="#webpages">Web ¥Ú¡¼¥¸</a></li>
-  </ul>
-
-<h2><a name="introduction"></a>¤Ï¤¸¤á¤Ë</h2>
-
-  <blockquote>
-    Java<sup><font size="-2">TM</font></sup> Platform, Standard Edition Development Kit (JDK<sup><font size="-2">TM</font></sup>) ¤Î¤³¤Î¥ê¥ê¡¼¥¹¤ò¥À¥¦¥ó¥í¡¼¥É¤¤¤¿¤À¤­¤¢¤ê¤¬¤È¤¦¤´¤¶¤¤¤Þ¤¹¡£JDK ¤Ï¡¢Java ¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¤ò»ÈÍѤ·¤Æ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¡¢¥¢¥×¥ì¥Ã¥È¡¢¤ª¤è¤Ó¥³¥ó¥Ý¡¼¥Í¥ó¥È¤ò¹½ÃÛ¤¹¤ë¤¿¤á¤Î³«È¯´Ä¶­¤Ç¤¹¡£
-  </blockquote>
-
-  <blockquote>
-    JDK ¤Ë¤Ï¡¢Java ¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¤Çµ­½Ò¤µ¤ì¤¿¥×¥í¥°¥é¥à¤Î³«È¯¤È¥Æ¥¹¥È¡¢¤ª¤è¤Ó Java<sup><font size="-2">TM</font></sup> ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ç¤Î¼Â¹Ô¤Ë»ÈÍѤǤ­¤ë³Æ¼ï¥Ä¡¼¥ë¤¬ÉÕ°¤·¤Æ¤¤¤Þ¤¹¡£
-  </blockquote>
-
-<h2><a name="install"></a>¥·¥¹¥Æ¥àÍ׷浪¤è¤Ó¥¤¥ó¥¹¥È¡¼¥ë</h2>
-
-  <blockquote>
-¥·¥¹¥Æ¥àÍ×·ï¡¢¥¤¥ó¥¹¥È¡¼¥ë¼ê½ç¡¢¤ª¤è¤Ó¥È¥é¥Ö¥ë¥·¥å¡¼¥Æ¥£¥ó¥°¤Î¥Ò¥ó¥È¤Ë¤Ä¤¤¤Æ¤Ï¡¢¼¡¤Î Java Software Web ¥µ¥¤¥È¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-  </blockquote>
-
-  <blockquote>
-<a href="http://java.sun.com/javase/ja/6/webnotes/install/">JDK 6 ¥¤¥ó¥¹¥È¡¼¥ë¼ê½ç</a>
-  </blockquote>
-
-<h2><a name="docs"></a>JDK<sup><font size="-2">TM</font></sup> ¥É¥­¥å¥á¥ó¥È</h2>
-
-  <blockquote>
-    <a href="http://java.sun.com/javase/ja/6/docs/ja/index.html">Java<sup><font size="-2">TM</font></sup> Platform, Standard Edition (Java SE) ¤Î¥ª¥ó¥é¥¤¥ó¥É¥­¥å¥á¥ó¥È</a>¤Ë¤Ï¡¢API »ÅÍÍ¡¢µ¡Ç½ÀâÌÀ¡¢³«È¯¼Ô¥¬¥¤¥É¡¢JDK<sup><font size="-2">TM</font></sup> ¥Ä¡¼¥ë¤ª¤è¤Ó¥æ¡¼¥Æ¥£¥ê¥Æ¥£¡¼¤Î¥ê¥Õ¥¡¥ì¥ó¥¹¥Ú¡¼¥¸¡¢¥Ç¥â¡¢¤ª¤è¤Ó´ØÏ¢¾ðÊó¤Ø¤Î¥ê¥ó¥¯¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£JDK ¥É¥­¥å¥á¥ó¥È¤Ï¡¢»ÈÍѤ·¤Æ¤¤¤ë¥Þ¥·¥ó¤Ë¥¤¥ó¥¹¥È¡¼¥ë²Äǽ¤Ê¥À¥¦¥ó¥í¡¼¥É¥Ð¥ó¥É¥ë¤Ç¤âÆþ¼ê¤Ç¤­¤Þ¤¹¡£ ¥É¥­¥å¥á¥ó¥È¥Ð¥ó¥É¥ë¤òÆþ¼ê¤¹¤ë¤Ë¤Ï¡¢<a  href="../download.html">¥À¥¦¥ó¥í¡¼¥É¥Ú¡¼¥¸</a>¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ API ¤Ë¤Ä¤¤¤Æ¤Ï¡¢<a href="http://java.sun.com/javase/ja/6/docs/ja/api/index.html">Java<sup><font size="-2">TM</font></sup> Platform, Standard Edition ¤Î API »ÅÍÍ</a>¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ API ¤Ë¤Ä¤¤¤Æ¡¢¥³¡¼¥ÉÎã¤è¤ê¤â»ÅÍͤ˽ÅÅÀ¤ò¤ª¤¤¤¿´Êñ¤ÊÀâÌÀ¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤¹¡£
-  </blockquote>
-
-<h2><a name="relnotes"></a>¥ê¥ê¡¼¥¹¥Î¡¼¥È</h2>
-
-  <blockquote>
-    ¤³¤Î¥ê¥ê¡¼¥¹¤Ë´Ø¤¹¤ëÄɲþðÊó¤Ë¤Ä¤¤¤Æ¤Ï¡¢Java Software Web ¥µ¥¤¥È¤Î <a  href="index.html">Java SE 6 ¥ê¥ê¡¼¥¹¥Î¡¼¥È</a>¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£¥ª¥ó¥é¥¤¥óÈǤΥê¥ê¡¼¥¹¥Î¡¼¥È¤Ï¿ï»þ¹¹¿·¤µ¤ì¤ë¤Î¤Ç¡¢Äê´üŪ¤Ë¥¢¥¯¥»¥¹¤·¤ÆºÇ¿·¤Î¾ðÊó¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£
-  </blockquote>
-
-<h2><a name="compatibility"></a>¸ß´¹À­</h2>
-
-  <blockquote>
-    ¸ß´¹À­¤Ë´Ø¤¹¤ë´ûÃΤÎÌäÂê¤Ë¤Ä¤¤¤Æ¤Ï¡¢Java Software Web ¥µ¥¤¥È¤Ç<a href="compatibility.html">°ÊÁ°¤Î¥ê¥ê¡¼¥¹¤È¤Î¸ß´¹À­</a>¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ °ÊÁ°¤Î¥Ð¡¼¥¸¥ç¥ó¤Î Java<sup><font size="-2">TM</font></sup> ¥×¥é¥Ã¥È¥Õ¥©¡¼¥àÍѤ˵­½Ò¤µ¤ì¤¿¥×¥í¥°¥é¥à¤Î¥µ¥Ý¡¼¥È¤Ë¤Ä¤¤¤Æ¤ÏËüÁ´¤ò´ü¤·¤Æ¤¤¤Þ¤¹¡£¸ß´¹À­¤ò¼º¤¦Êѹ¹¤¬É¬Íפʲսê¤â¤¢¤ê¤Þ¤·¤¿¤¬¡¢¤Û¤È¤ó¤É¤Î¥½¥Õ¥È¥¦¥§¥¢¤Ï¥×¥í¥°¥é¥ß¥ó¥°¤ò¤ä¤êľ¤¹¤³¤È¤Ê¤¯¸½ºß¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë°Ü¹Ô¤Ç¤­¤Þ¤¹¡£¸ß´¹À­¤Ë´Ø¤¹¤ë Web ¥Ú¡¼¥¸¤ÇÀâÌÀ¤·¤Æ¤¤¤ë¤è¤¦¤Ê°Õ¿ÞŪ¤Ë¸ß´¹À­¤òÇÓ½ü¤·¤¿¤ï¤º¤«¤Ê¾ì¹ç¤ò½ü¤¤¤Æ¡¢¥×¥í¥°¥é¥ß¥ó¥°¤ò¤ä¤êľ¤µ¤Ê¤¤¤È°Ü¹Ô¤Ç¤­¤Ê¤¤¾ì¹ç¤Ï¥Ð¥°¤Ç¤¢¤ë¤È¤ß¤Ê¤µ¤ì¤Þ¤¹¡£ÀøºßŪ¤Ê¥»¥­¥å¥ê¥Æ¥£¡¼¥Û¡¼¥ë¤ò¤Õ¤µ¤°¤¿¤á¡¢¤Þ¤¿¤Ï¼ÂÁõ¤äÀß·×¾å¤Î¥Ð¥°¤ò½¤Àµ¤¹¤ë¤¿¤á¤ËɬÍפÊÊѹ¹¤Ë¤è¤Ã¤Æ¡¢°ìÉô¤Î¸ß´¹À­¤¬¼º¤ï¤ì¤Æ¤¤¤Þ¤¹¡£
-  </blockquote>
-
-<h2><a name="bugs"></a>¥Ð¥°Êó¹ð¤È¥Õ¥£¡¼¥É¥Ð¥Ã¥¯</h2>
-
-  <blockquote>
-    <a href="http://bugs.sun.com/bugdatabase/index.jsp">¥Ð¥°¥Ç¡¼¥¿¥Ù¡¼¥¹</a> Web ¥µ¥¤¥È¤Ç¤Ï¡¢´û¸¤Î¥Ð¥°Êó¹ð¤Î¸¡º÷¤ÈÄ´ºº¡¢¥Ð¥°Êó¹ð¤ÎÁ÷¿®¡¢¥Ð¥°½¤Àµ¤Î½ÅÍ×ÅÙ¤ÎÊó¹ð¤ò¹Ô¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¥Ð¥°Êó¹ð¤äµ¡Ç½¤Ë´Ø¤¹¤ëÍ×˾¤òľÀÜÁ÷¿®¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¥Õ¥©¡¼¥à¤Ëµ­Æþ¤·¤Æ¤¯¤À¤µ¤¤¡£
-  </blockquote>
-
-  <blockquote>
-    <a href=     "http://bugs.sun.com/services/bugreport/index.jsp">http://bugs.sun.com/services/bugreport/index.jsp</a>
-  </blockquote>
-
-  <blockquote>
-    ¥Õ¥£¡¼¥É¥Ð¥Ã¥¯¤Ï¡¢<a href="http://java.sun.com/docs/forms/sendusmail.html">Java SE ¥É¥­¥å¥á¥ó¥È¥Á¡¼¥à</a>¤ËÁ÷¿®¤·¤Æ¤¯¤À¤µ¤¤¡£ ¤Þ¤¿¡¢<a href="http://java.sun.com/mail/">Java Software ¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°¥Á¡¼¥à¤ÎÅŻҥ᡼¥ë¥¢¥É¥ì¥¹</a>¤Ë¥³¥á¥ó¥È¤òľÀÜÁ÷¿®¤·¤Æ¤¤¤¿¤À¤¯¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
-  </blockquote>
-
-  <blockquote>
-<b>Ãí</b> - Bug Database ¤äÊÀ¼Ò³«È¯¥Á¡¼¥à¤«¤é¥Æ¥¯¥Ë¥«¥ë¥µ¥Ý¡¼¥È¤ò¼õ¤±¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£ ¥µ¥Ý¡¼¥È¥ª¥×¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ¤Ï¡¢Java Software Web ¥µ¥¤¥È¤Î<a  href="http://java.sun.com/support/">¥µ¥Ý¡¼¥È¤È¥µ¡¼¥Ó¥¹</a>¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-  </blockquote>
-
-  <h2><a name="contents"></a>JDK<sup><font size="-2">TM</font></sup> ¤ÎÆâÍÆ</h2>
-
-  <blockquote>
-¤³¤³¤Ç¤Ï¡¢JDK<sup><font size="-2">TM</font></sup> ¤Î¥Õ¥¡¥¤¥ë¤È¥Ç¥£¥ì¥¯¥È¥ê¤Î³µÍפòÀâÌÀ¤·¤Þ¤¹¡£ ¥Õ¥¡¥¤¥ë¤È¥Ç¥£¥ì¥¯¥È¥ê¤Î¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢¤ª»È¤¤¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Î Java SE ¥É¥­¥å¥á¥ó¥È¤Î¡Ö<a href="http://java.sun.com/javase/ja/6/docs/ja/technotes/tools/index.html#general">JDK ¥Õ¥¡¥¤¥ë¹½Â¤</a>¡×¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-  </blockquote>
-
-  <dl>
-    <dd>
-      <dl>
-<dt><b>³«È¯¥Ä¡¼¥ë</b></dt>
-
-<dd><code>bin</code> ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Ë³ÊǼ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£ Java<sup><font size="-2">TM</font></sup> ¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¤Çµ­½Ò¤µ¤ì¤¿¥×¥í¥°¥é¥à¤Î³«È¯¡¢¼Â¹Ô¡¢¥Ç¥Ð¥Ã¥°¡¢¤ª¤è¤Ó¥É¥­¥å¥á¥ó¥ÈºîÀ®¤ò»Ù±ç¤¹¤ë¥Ä¡¼¥ë¤È¥æ¡¼¥Æ¥£¥ê¥Æ¥£¡¼¤Ç¤¹¡£ ¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢<a  href="http://java.sun.com/javase/ja/6/docs/ja/technotes/tools/index.html">³Æ¥Ä¡¼¥ë¤Î¥Þ¥Ë¥å¥¢¥ë</a>¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£<br> <br></dd>
-
-<dt><b>Runtime Environment</b></dt>
-
-<dd><code>jre</code> ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Ë³ÊǼ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£JDK ¤Ç»ÈÍѤµ¤ì¤ë Java Runtime Environment (JRE<sup><font size="-2">TM</font></sup>) ¼Â¹Ô´Ä¶­¤Î¼ÂÁõ¤Ç¤¹¡£ JRE¤Ë¤Ï¡¢Java<sup><font size="-2">TM</font></sup> ²¾ÁÛ¥Þ¥·¥ó¡¢¥¯¥é¥¹¥é¥¤¥Ö¥é¥ê¡¢¤ª¤è¤Ó Java<sup><font size="-2">TM</font></sup> ¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¤Çµ­½Ò¤µ¤ì¤¿¥×¥í¥°¥é¥à¤Î¼Â¹Ô¤ò¥µ¥Ý¡¼¥È¤¹¤ë¤½¤Î¾¤Î¥Õ¥¡¥¤¥ë¤¬´Þ¤Þ¤ì¤Þ¤¹¡£<br> <br></dd>
-
-<dt><b>Äɲå饤¥Ö¥é¥ê</b></dt>
-
-        <dd><code>lib</code> ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Ë³ÊǼ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£ ³«È¯¥Ä¡¼¥ë¤ËɬÍפÊÄɲäΥ¯¥é¥¹¥é¥¤¥Ö¥é¥ê¤È¥µ¥Ý¡¼¥È¥Õ¥¡¥¤¥ë¤Ç¤¹¡£<br> <br></dd>
-
-<dt><b>¥Ç¥â¥¢¥×¥ì¥Ã¥È¤È¥¢¥×¥ê¥±¡¼¥·¥ç¥ó</b></dt>
-
-<dd><code>demo</code> ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Ë³ÊǼ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£ Java<sup><font size="-2">TM</font></sup> ¥×¥é¥Ã¥È¥Õ¥©¡¼¥àÍÑ¤Î¥×¥í¥°¥é¥ß¥ó¥°Îã¤Ç¡¢¥½¡¼¥¹¥³¡¼¥É¤¬´Þ¤Þ¤ì¤Þ¤¹¡£ Swing ¤ä¤½¤Î¾¤Î Java<sup><font size="-2">TM</font></sup> Foundation Classes¡¢¤ª¤è¤Ó Java<sup><font size="-2">TM</font></sup> Platform Debugger Architecture ¤ò»ÈÍѤ¹¤ëÎã¤â´Þ¤Þ¤ì¤Þ¤¹¡£<br> <br></dd>
-
-<dt><b>¥µ¥ó¥×¥ë¥³¡¼¥É</b></dt>
-
-        <dd><code>sample</code> ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Ë³ÊǼ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£ ÆÃÄê¤Î Java API ¤Î¥×¥í¥°¥é¥ß¥ó¥°¤Î¥½¡¼¥¹¥³¡¼¥ÉÉÕ¤­¥µ¥ó¥×¥ë¤Ç¤¹¡£</dd>
-
-<dt><b>C ¥Ø¥Ã¥À¡¼¥Õ¥¡¥¤¥ë</b></dt>
-
-        <dd><code>include</code> ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Ë³ÊǼ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£ <a  href="http://java.sun.com/javase/ja/6/docs/ja/technotes/guides/jni/index.html">Java Native Interface</a>¡¢<a  href="http://java.sun.com/javase/ja/6/docs/ja/technotes/guides/jvmti/index.html">JVM<sup><font size="-2">TM</font></sup> Tool Interface</a>¡¢¤ª¤è¤Ó¤½¤Î¾¤Î Java<sup><font size="-2">TM</font></sup> Platform ¤Îµ¡Ç½¤ò»ÈÍѤ¹¤ë¥Í¥¤¥Æ¥£¥Ö¥³¡¼¥É¥×¥í¥°¥é¥ß¥ó¥°¤ò¥µ¥Ý¡¼¥È¤¹¤ë¥Ø¥Ã¥À¡¼¥Õ¥¡¥¤¥ë¤Ç¤¹¡£<br> <br></dd>
-
-<dt><b>¥½¡¼¥¹¥³¡¼¥É</b></dt>
-
-        <dd><code>src.zip</code> ¤Ë³ÊǼ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£Java&nbsp;¥³¥¢ API ¤ò¹½À®¤¹¤ë¤¹¤Ù¤Æ¤Î¥¯¥é¥¹¤ËÂФ¹¤ë Java<sup><font size="-2">TM</font></sup> ¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¤Î¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Ç¤¹ (java.*¡¢javax.*¡¢¤ª¤è¤Ó°ìÉô¤Î org.* ¥Ñ¥Ã¥±¡¼¥¸¤Î¥½¡¼¥¹¥Õ¥¡¥¤¥ë¡£com.sun.* ¥Ñ¥Ã¥±¡¼¥¸¤ÏÂоݳ°)¡£¤³¤Î¥½¡¼¥¹¥³¡¼¥É¤Ï¾ðÊóÄ󶡤ΤߤòÌÜŪ¤È¤·¤Æ¤ª¤ê¡¢³«È¯¼Ô¤¬ Java<sup><font size="-2">TM</font></sup> ¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¤òÍý²ò¤·³èÍѤ¹¤ë¤Î¤ËÌòΩ¤Á¤Þ¤¹¡£¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¸ÇÍ­¤Î¼ÂÁõ¥³¡¼¥É¤Ï´Þ¤Þ¤ì¤Þ¤»¤ó¡£¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤ò»ÈÍѤ·¤Æ¡¢¥¯¥é¥¹¥é¥¤¥Ö¥é¥ê¤òºÆ¹½ÃÛ¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤òŸ³«¤¹¤ë¤Ë¤Ï¡¢°ìÈÌŪ¤Ê zip ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¡¼¤ò»ÈÍѤ·¤Þ¤¹¡£ ¤Þ¤¿¡¢¼¡¤Î¤è¤¦¤Ë¡¢JDK ¤Î <code>bin/</code> ¥Ç¥£¥ì¥¯¥È¥ê¤ËÍÑ°Õ¤µ¤ì¤Æ¤¤¤ë Jar ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¡¼¤ò»ÈÍѤ¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£<br> <br> <code>jar xvf src.zip</code></dd>
-      </dl>
-    </dd>
-  </dl>
-
-<h2><a name="jre"></a>Java SE Runtime Environment (JRE<sup><font size="-2">TM</font></sup>)</h2>
-
-  <blockquote>
-Java<sup><font size="-2">TM</font></sup> Runtime Environment (JRE<sup><font size="-2">TM</font></sup>) ¤Ï¡¢Ã±ÆȤǥÀ¥¦¥ó¥í¡¼¥É¤Ç¤­¤ëÀ½ÉʤȤ·¤ÆÄ󶡤µ¤ì¤Æ¤¤¤Þ¤¹¡£ <a  href="../download.html">¥À¥¦¥ó¥í¡¼¥É Web ¥µ¥¤¥È</a>¤ò»²¾È ¤·¤Æ¤¯¤À¤µ¤¤¡£
-  </blockquote>
-
-  <blockquote>
-    JRE ¤ò»ÈÍѤ¹¤ë¤È¡¢Java<sup><font size="-2">TM</font></sup> ¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¤Çµ­½Ò¤µ¤ì¤¿¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¼Â¹Ô¤Ç¤­¤Þ¤¹¡£ JDK<sup><font size="-2">TM</font></sup> ¤ÈƱÍͤˡ¢Java<sup><font size="-2">TM</font></sup> ²¾ÁÛ¥Þ¥·¥ó¡¢Java<sup><font size="-2">TM</font></sup> ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à API ¤ò¹½À®¤¹¤ë¥¯¥é¥¹¡¢¤ª¤è¤Ó¥µ¥Ý¡¼¥È¥Õ¥¡¥¤¥ë¤¬´Þ¤Þ¤ì¤Þ¤¹¡£JDK ¤È¤Ï°Û¤Ê¤ê¡¢¥³¥ó¥Ñ¥¤¥é¤ä¥Ç¥Ð¥Ã¥¬¤Ê¤É¤Î³«È¯¥Ä¡¼¥ë¤Ï´Þ¤Þ¤ì¤Þ¤»¤ó¡£
-  </blockquote>
-
-  <blockquote>
-JRE ¤Ï¡¢JRE ¤Î¥é¥¤¥»¥ó¥¹¾ò¹à¤Ë½¾¤Ã¤Æ¡¢Æȼ«¤Ë³«È¯¤·¤¿¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤È¤È¤â¤Ë¼«Í³¤ËºÆÇÛÉÛ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£JDK ¤ò»ÈÍѤ·¤Æ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò³«È¯¤·¤¿¤Î¤Á¡¢¥¨¥ó¥É¥æ¡¼¥¶¡¼¤¬¤½¤Î¥½¥Õ¥È¥¦¥§¥¢¤ò Java<sup><font size="-2">TM</font></sup> ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ç¼Â¹Ô¤Ç¤­¤ë¤è¤¦¤Ë¡¢JRE ¤È¤È¤â¤Ë½Ð²Ù¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-  </blockquote>
-
-<h2><a name="redistribution"></a>ºÆÇÛÉÛ</h2>
-
-  <blockquote>
-    <blockquote>
-      <hr>
-Ãí - ¤³¤Î¥½¥Õ¥È¥¦¥§¥¢¤Î¥é¥¤¥»¥ó¥¹¤Ï¡¢¥Ù¡¼¥¿ÈǤª¤è¤Ó¤½¤Î¾¤Î¥×¥ì¥ê¥ê¡¼¥¹ÈǤκÆÇÛÉÛ¤òµö²Ä¤¹¤ë¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-      <hr>
-    </blockquote>
-  </blockquote>
-
-  <blockquote>
-¥½¥Õ¥È¥¦¥§¥¢¥é¥¤¥»¥ó¥¹·ÀÌó¤Î¾ò¹à¡¢¤ª¤è¤Ó°Ê²¼¤Çµ¬Äꤵ¤ì¤ëµÁ̳¡¢À©¸Â¡¢¤ª¤è¤ÓÎã³°»ö¹à¤Ë½¾¤¤¡¢¥½¥Õ¥È¥¦¥§¥¢ (¤ª¤è¤Ó°Ê²¼¤ÇºÆÇÛÉÛ²Äǽ¤È¸«¤Ê¤µ¤ì¤ë¡¢¥½¥Õ¥È¥¦¥§¥¢¤Î°ìÉô) ¤òÊ£À½¤ª¤è¤ÓÇÛÉۤǤ­¤Þ¤¹¡£
-  </blockquote>
-
-  <blockquote>
-    <ol type="a">
-<li>¥½¥Õ¥È¥¦¥§¥¢¤ò´°Á´¤Ê²þÊѤµ¤ì¤Æ¤¤¤Ê¤¤¾õÂ֤ǡ¢¤«¤Ä¥¢¥×¥ì¥Ã¥È¤ª¤è¤Ó¥¢¥×¥ê¥±¡¼¥·¥ç¥ó (¡Ö¥×¥í¥°¥é¥à¡×) ¤Î°ìÉô¤È¤·¤Æ¥Ð¥ó¥É¥ë¤µ¤ì¤¿¾õÂ֤ǤΤßÇÛÉÛ¤¹¤ë¡£</li>
-
-<li>¥×¥í¥°¥é¥à¤¬½ÅÍפ«¤Ä¼çÍפʵ¡Ç½¤ò¥½¥Õ¥È¥¦¥§¥¢¤ËÄɲ乤롣</li>
-
-<li>¥×¥í¥°¥é¥à¤¬ Java Âбþ¤ÎÈÆÍѥǥ¹¥¯¥È¥Ã¥×¥³¥ó¥Ô¥å¡¼¥¿¤ª¤è¤Ó¥µ¡¼¥Ð¡¼¤Ç¼Â¹Ô¤µ¤ì¤ë¤³¤È¤Î¤ß¤òÌÜŪ¤È¤¹¤ë¡£</li>
-
-<li>¥×¥í¥°¥é¥à¤Î¼Â¹Ô¤Î¤ß¤òÌÜŪ¤È¤·¤Æ¡¢¥½¥Õ¥È¥¦¥§¥¢¤òÇÛÉÛ¤¹¤ë¡£</li>
-
-<li>¥½¥Õ¥È¥¦¥§¥¢¤Î¥³¥ó¥Ý¡¼¥Í¥ó¥È¤ÈÃÖ¤­´¹¤¨¤ë¤³¤È¤òÌÜŪ¤È¤·¤ÆÄɲäΥ½¥Õ¥È¥¦¥§¥¢¤òÇÛÉÛ¤·¤Ê¤¤¡£</li>
-
-<li>¥½¥Õ¥È¥¦¥§¥¢¤Ëµ­ºÜ¤µ¤ì¤Æ¤¤¤ë¤¤¤«¤Ê¤ë½êÍ­¸¢É½¼¨¤ä¹ðÃΤâ½üµî¤Þ¤¿¤ÏÊѹ¹¤·¤Ê¤¤¡£</li>
-
-<li>ËÜ·ÀÌó¤Ë´Þ¤Þ¤ì¤ë¾ò¹à¤È¹çÃפ·¤¿¡¢Sun ¤ÎÍø±×¤òÊݸ¤ë¥é¥¤¥»¥ó¥¹·ÀÌó¤Ë½¾¤Ã¤Æ¤Î¤ß¥½¥Õ¥È¥¦¥§¥¢¤òÇÛÉÛ¤¹¤ë¡£</li>
-
-<li>¥×¥í¥°¥é¥à¤ª¤è¤Ó¥½¥Õ¥È¥¦¥§¥¢¤Î°ìÉô¤Þ¤¿¤Ï¤¹¤Ù¤Æ¤Î»ÈÍѤ¢¤ë¤¤¤ÏÇÛÉۤ˵¯°ø¤·¤¿Âè»°¼Ô¤«¤é¤ÎÀÁµá¡¢Áʾ١¢¤Þ¤¿¤ÏÁ¼Ã֤˴ØÏ¢¤·¤ÆÀ¸¤¸¤ë¤¤¤«¤Ê¤ë»³²¡¢ÈñÍÑ¡¢ºÄ̳¡¢Ï²ò¶â¡¢¤ª¤è¤Ó½ÐÈñ (ÊÛ¸î»ÎÈñÍѤò´Þ¤à) ¤«¤é¡¢Sun ¤È¤½¤Î¥é¥¤¥»¥ó¥µ¤òÍʸ¡¢Êä½þ¤¹¤ë¤³¤È¤ËƱ°Õ¤¹¤ë¡£</li>
-    </ol>
-  </blockquote>
-
-  <blockquote>
-¤³¤³¤Ç»ÈÍѤµ¤ì¤Æ¤¤¤ë¡Ö¥Ù¥ó¥À¡¼¡×¤È¤¤¤¦ÍѸì¤Ï¡¢¼«¤é¤Î¥×¥í¥°¥é¥à¤È¤È¤â¤Ë Java<sup><font size="-2">TM</font></sup> Development Kit (JDK<sup><font size="-2">TM</font></sup>) ¤ò¥é¥¤¥»¥ó¥¹¶¡Í¿¤ª¤è¤ÓÇÛÉÛ¤¹¤ë¥é¥¤¥»¥ó¥·¡¢³«È¯¼Ô¡¢¤ª¤è¤ÓÆÈΩ·Ï¥½¥Õ¥È¥¦¥§¥¢¥Ù¥ó¥À¡¼ (ISV) ¤ò»Ø¤·¤Þ¤¹¡£
-  </blockquote>
-
-  <blockquote>
-¥Ù¥ó¥À¡¼¤Ï¡¢Java Development Kit ¥Ð¥¤¥Ê¥ê¥³¡¼¥É¥é¥¤¥»¥ó¥¹·ÀÌó¤Î¾ò¹à¤Ë½¾¤¦É¬Íפ¬¤¢¤ê¤Þ¤¹¡£
-  </blockquote>
-
-<h3>ɬ¿Ü¥Õ¥¡¥¤¥ë¤È¥ª¥×¥·¥ç¥ó¥Õ¥¡¥¤¥ë</h3>
-
-  <blockquote>
-Java<sup><font size="-2">TM</font></sup> Development Kit (JDK<sup><font size="-2">TM</font></sup>) ¤ò¹½À®¤¹¤ë¥Õ¥¡¥¤¥ë¤Ï¡¢É¬¿Ü¤È¥ª¥×¥·¥ç¥ó¤Î 2 ¤Ä¤ËʬÎव¤ì¤Þ¤¹¡£¥ª¥×¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤Ï¡¢¥Ù¥ó¥À¡¼¤ÎȽÃǤˤè¤ê JDK ¤ÎºÆÇÛÉÛ¤«¤é½ü³°¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-  </blockquote>
-
-  <blockquote>
-JDK ¤ÎºÆÇÛÉÛ¤«¤éǤ°Õ¤Ç½ü³°¤Ç¤­¤ë¥Õ¥¡¥¤¥ë¤ª¤è¤Ó¥Ç¥£¥ì¥¯¥È¥ê¤ò¼¡¤Ë¼¨¤·¤Þ¤¹¡£¤³¤ì¤é¤Î¥ª¥×¥·¥ç¥ó¥Õ¥¡¥¤¥ë°ìÍ÷¤Ë´Þ¤Þ¤ì¤Ê¤¤¥Õ¥¡¥¤¥ë¤Ï¡¢¤¹¤Ù¤Æ JDK ¤ÎºÆÇÛÉۤ˴ޤá¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-  </blockquote>
-
-<h3>¥ª¥×¥·¥ç¥ó¤Î¥Õ¥¡¥¤¥ë¤È¥Ç¥£¥ì¥¯¥È¥ê</h3>
-
-  <blockquote>
-¼¡¤Î¥Õ¥¡¥¤¥ë¤ÏºÆÇÛÉÛ¤«¤éǤ°Õ¤Ë½ü³°¤Ç¤­¤Þ¤¹¡£ ¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤Ï¡¢jdk1.6.0_&lt;version&gt; ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ê¤Þ¤¹¡£&lt;version&gt; ¤Ï¡¢¥¢¥Ã¥×¥Ç¡¼¥È¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤Ç¤¹¡£ Solaris<sup><font size=     "-2">TM</font></sup> ¤ª¤è¤Ó Linux ¤Î¥Õ¥¡¥¤¥ë̾¤È¶èÀڤ국¹æ¤¬¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£Windows ¤Î¼Â¹Ô²Äǽ¥Õ¥¡¥¤¥ë¤Ë¤ÏËöÈø¤Ë¡Ö.exe¡×¤¬ÉÕ¤­¤Þ¤¹¡£Ì¾Á°¤Ë <code>_g</code> ¤¬ÉÕ¤¯Âбþ¤¹¤ë¥Õ¥¡¥¤¥ë¤â½ü³°¤Ç¤­¤Þ¤¹¡£ ½ü³°¤µ¤ì¤¿¼Â¹Ô²Äǽ¥Õ¥¡¥¤¥ë ¡ÊSolaris<sup><font size="-2">TM</font></sup> ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤ª¤è¤Ó Linux ¤Î¾ì¹ç¡¢°Ê²¼¤Î°ìÍ÷¤Ç¥Ñ¥¹¤¬ bin/ ¤«¤é»Ï¤Þ¤ë) ¤ËÂбþ¤¹¤ë¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Ï½ü³°¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-  </blockquote>
-
-  <dl>
-    <dd>
-      <dl>
-        <dt><code>jre/lib/charsets.jar</code></dt>
-
-<dd>ʸ»úÊÑ´¹¥¯¥é¥¹</dd>
-
-<dt><code>jre/lib/ext/</code></dt>
-
-        <dd><code>sunjce_provider.jar</code> - Java °Å¹æ²½ API ¤Î SunJCE ¥×¥í¥Ð¥¤¥À<br> <code>localedata.jar</code> - Êƹñ±Ñ¸ì°Ê³°¤Î¥í¥±¡¼¥ë¤ËɬÍפʥ꥽¡¼¥¹¤Î¿¤¯¤ò´Þ¤à<br> <code>ldapsec.jar</code> - LDAP ¥µ¡¼¥Ó¥¹¥×¥í¥Ð¥¤¥À¤¬¥µ¥Ý¡¼¥È¤¹¤ë¥»¥­¥å¥ê¥Æ¥£¡¼µ¡Ç½¤ò´Þ¤à<br> <code>dnsns.jar</code> - JNDI DNS ¥×¥í¥Ð¥¤¥À¤Î InetAddress ¥é¥Ã¥Ñ¡¼ÍÑ</dd>
-
-<dt><tt>bin/rmid</tt> ¤ª¤è¤Ó <tt>jre/bin/rmid</tt></dt>
-
-<dd>Java RMI µ¯Æ°¥·¥¹¥Æ¥à¥Ç¡¼¥â¥ó</dd>
-
-<dt><tt>bin/rmiregistry</tt> ¤ª¤è¤Ó <tt>jre/bin/rmiregistry</tt></dt>
-
-<dd>Java ¥ê¥â¡¼¥È¥ª¥Ö¥¸¥§¥¯¥È¥ì¥¸¥¹¥È¥ê</dd>
-
-<dt><tt>bin/tnameserv</tt> ¤ª¤è¤Ó <tt>jre/bin/tnameserv</tt></dt>
-
-<dd>Java IDL ¥Í¡¼¥à¥µ¡¼¥Ð¡¼</dd>
-
-<dt><tt>bin/keytool</tt> ¤ª¤è¤Ó <tt>jre/bin/keytool</tt></dt>
-
-<dd>¸°¤ª¤è¤Ó¾ÚÌÀ½ñ¤Î´ÉÍý¥Ä¡¼¥ë</dd>
-
-<dt><tt>bin/kinit</tt> ¤ª¤è¤Ó <tt>jre/bin/kinit</tt></dt>
-
-<dd>Kerberos ¥Á¥±¥Ã¥Èǧ²Ä¥Á¥±¥Ã¥È¤Î¼èÆÀ¤ª¤è¤Ó¥­¥ã¥Ã¥·¥å¤Ë»ÈÍÑ</dd>
-
-<dt><tt>bin/klist</tt> ¤ª¤è¤Ó <tt>jre/bin/klist</tt></dt>
-
-<dd>»ñ³Ê¥­¥ã¥Ã¥·¥å¤ª¤è¤Ó¥­¡¼¥¿¥ÖÆâ¤Î Kerberos ɽ¼¨¥¨¥ó¥È¥ê</dd>
-
-<dt><tt>bin/ktab</tt> ¤ª¤è¤Ó <tt>jre/bin/ktab</tt></dt>
-
-<dd>Kerberos ¥­¡¼¥Æ¡¼¥Ö¥ë¥Þ¥Í¡¼¥¸¥ã¡¼</dd>
-
-<dt><tt>bin/policytool</tt> ¤ª¤è¤Ó <tt>jre/bin/policytool</tt></dt>
-
-<dd>¥Ý¥ê¥·¡¼¥Õ¥¡¥¤¥ë¤ÎºîÀ®¤ª¤è¤Ó´ÉÍý¥Ä¡¼¥ë</dd>
-
-<dt><tt>bin/orbd</tt> ¤ª¤è¤Ó <tt>jre/bin/orbd</tt></dt>
-
-<dd>Object Request Broker Daemon</dd>
-
-<dt><tt>bin/servertool</tt> ¤ª¤è¤Ó <tt>jre/bin/servertool</tt></dt>
-
-<dd>Java IDL ¥µ¡¼¥Ð¡¼¥Ä¡¼¥ë</dd>
-
-        <dt><tt>bin/javaws</tt>¡¢<tt>jre/bin/javaws</tt>¡¢<tt>jre/lib/javaws/</tt> ¤ª¤è¤Ó <tt>jre/lib/javaws.jar</tt></dt>
-
-<dd>Java Web Start</dd>
-
-        <dt><code>db/</code></dt>
-
-        <dd>
-          Java DB¡£Sun Microsystems ¤¬ÇÛÉÛ¤¹¤ë Apache Derby ¥Ç¡¼¥¿¥Ù¡¼¥¹¥Æ¥¯¥Î¥í¥¸¡¼¤Ç¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï°Ê²¼¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£
-
-          <ul>
-<li>Solaris: <code>/opt/SUNWjavadb</code></li>
-
-<li>Linux: <code>/opt/sun/javadb</code></li>
-
-<li>Windows: <code>C:\Program Files\Sun\JavaDB</code></li>
-          </ul>¥æ¡¼¥¶¡¼¥É¥­¥å¥á¥ó¥È¤ä API ¥É¥­¥å¥á¥ó¥È¡¢Java DB ¤Îµ¡Ç½¤ä¤½¤Î¾¥ê¥½¡¼¥¹¤Ê¤É¤Î Java DB ¤È Derby ¤Î¾ðÊó¤Ë¤Ä¤¤¤Æ¤Ï¡¢¾åµ­¥Ç¥£¥ì¥¯¥È¥ê¤Î index.html ¥Õ¥¡¥¤¥ë¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-        </dd>
-
-<dt><code>demo/</code></dt>
-
-<dd>¥Ç¥â¥¢¥×¥ì¥Ã¥È¤È¥¢¥×¥ê¥±¡¼¥·¥ç¥ó</dd>
-
-<dt><code>sample/</code></dt>
-
-<dd>¥µ¥ó¥×¥ë¥³¡¼¥É</dd>
-
-        <dt><code>src.zip</code></dt>
-
-<dd>¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Î¥¢¡¼¥«¥¤¥Ö</dd>
-      </dl>
-    </dd>
-  </dl>
-
-  <h3>ºÆÇÛÉÛ²Äǽ¤Ê JDK<sup><font size="-2">TM</font></sup> ¥Õ¥¡¥¤¥ë</h3>
-
-  <blockquote>
-    ¼¡¤Ë¼¨¤¹ JDK ¤Î¥Õ¥¡¥¤¥ë¡¿¥Ç¥£¥ì¥¯¥È¥ê¥»¥Ã¥È¤Ï¡¢¥Ù¥ó¥À¡¼¤ÎÄ󶡤¹¤ë Java<sup><font size="-2">TM</font></sup> Runtime Environment (JRE<sup><font size="-2">TM</font></sup>) ¤ÎºÆÇÛÉۤ˴ޤá¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ ¤³¤ì¤é¤ò¸ÄÊ̤˺ÆÇÛÉÛ¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£¥Ð¡¼¥¸¥ç¥ó¤¬°ìÃפ¹¤ë JRE ¤È¤È¤â¤ËÇÛÉÛ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¼¡¤Î¥Ñ¥¹¤Ï¡¢¤¹¤Ù¤Æ JDK ¤ÎºÇ¾å°Ì¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¤ÎÁêÂХѥ¹¤Ç¤¹¡£ ´Þ¤á¤é¤ì¤ë¼Â¹Ô²Äǽ¥Õ¥¡¥¤¥ë ¡ÊSolaris<sup><font size="-2">TM</font></sup> ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤ª¤è¤Ó Linux ¤Î¾ì¹ç¡¢°Ê²¼¤Î°ìÍ÷¤Ç¥Ñ¥¹¤¬ bin/ ¤«¤é»Ï¤Þ¤ë) ¤ËÂбþ¤¹¤ë¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Ï´Þ¤á¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-  </blockquote>
-
-  <dl>
-    <dd>
-      <dl>
-        <dt><code>jre/lib/cmm/PYCC.pf</code></dt>
-
-<dd>¥«¥é¡¼¥×¥í¥Õ¥¡¥¤¥ë¡£¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¡¢PYCC ¥«¥é¡¼Îΰè¤È¤½¤Î¾¤Î¥«¥é¡¼Îΰè¤Î´Ö¤ÇÊÑ´¹¤ò¹Ô¤¦¾ì¹ç¤Ë¤Î¤ßɬÍפǤ¹¡£</dd>
-
-<dt><tt>jre/lib/fonts</tt> ¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î¤¹¤Ù¤Æ¤Î <tt>.ttf</tt> ¥Õ¥©¥ó¥È¥Õ¥¡¥¤¥ë</dt>
-
-        <dd>LucidaSansRegular.ttf ¥Õ¥©¥ó¥È¤Ï¤¹¤Ç¤Ë JRE ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¤¿¤á¡¢JDK ¤«¤é¼èÆÀ¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£</dd>
-
-        <dt><code>jre/lib/audio/soundbank.gm</code></dt>
-
-<dd>¤³¤Î MIDI ¥µ¥¦¥ó¥É¥Ð¥ó¥¯¤Ï JDK ¤Ë´Þ¤Þ¤ì¤Þ¤¹¤¬¡¢JRE ¤«¤éºï½ü¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤ì¤Ï JRE ¤Î¥À¥¦¥ó¥í¡¼¥É¥Ð¥ó¥É¥ë¤Î¥µ¥¤¥º¤ò¸º¤é¤¹¤³¤È¤¬ÌÜŪ¤Ç¤¹¡£ ¤¿¤À¤·¡¢¥µ¥¦¥ó¥É¥Ð¥ó¥¯¥Õ¥¡¥¤¥ë¤Ï MIDI ¤ÎºÆÀ¸¤ËɬÍפʤ¿¤á¡¢¥Ù¥ó¥À¡¼¤ÎȽÃÇ¤Ç JDK ¤Î <tt>soundbank.gm</tt> ¥Õ¥¡¥¤¥ë¤ò JRE ¤ÎºÆÇÛÉۤ˴ޤá¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ ³ÈÄ¥ MIDI ¥µ¥¦¥ó¥É¥Ð¥ó¥¯¤Î¤¤¤¯¤Ä¤«¤Î¥Ð¡¼¥¸¥ç¥ó¤ò Java Sound Web ¥µ¥¤¥È <a  href="http://java.sun.com/products/java-media/sound/">http://java.sun.com/products/java-media/sound/</a> ¤ÇÆþ¼ê¤Ç¤­¤Þ¤¹¡£¤³¤ì¤é¤ÎÂåÂؤΥµ¥¦¥ó¥É¥Ð¥ó¥¯¤Ï¤É¤ì¤â¡¢JRE ¤ÎºÆÇÛÉۤ˴ޤá¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</dd>
-
-<dt>javac ¥Ð¥¤¥È¥³¡¼¥É¥³¥ó¥Ñ¥¤¥é¡£°Ê²¼¤Î¥Õ¥¡¥¤¥ë¤Ç¹½À®¤µ¤ì¤Þ¤¹¡£</dt>
-
-        <dd><tt>bin/javac</tt> [Solaris<sup><font size=         "-2">TM</font></sup> ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤ª¤è¤Ó Linux]<br> <tt>bin/sparcv9/javac</tt> [Solaris<sup><font size=         "-2">TM</font></sup> ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à (SPARC(R) ¥×¥é¥Ã¥È¥Õ¥©¡¼¥àÈÇ)]<br> <tt>bin/amd64/javac</tt> [Solaris<sup><font size=         "-2">TM</font></sup> ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à (AMD)]<br> <tt>bin/javac.exe</tt> [Microsoft Windows]<br> <tt>lib/tools.jar</tt> [¤¹¤Ù¤Æ¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à]</dd>
-
-<dt>Annotation Processing Tool¡£°Ê²¼¤Î¥Õ¥¡¥¤¥ë¤Ç¹½À®¤µ¤ì¤Þ¤¹¡£<br></dt>
-
-        <dd><code>lib/tools.jar</code> [¤¹¤Ù¤Æ¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à]<br> <code>bin/apt</code> [Solaris<sup><font size="-2">TM</font></sup> ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤ª¤è¤Ó Linux]<br> <code>bin/sparcv9/apt</code> [Solaris<sup><font size=         "-2">TM</font></sup> ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à (SPARC(R) ¥×¥é¥Ã¥È¥Õ¥©¡¼¥àÈÇ)]<br> <code>bin/amd64/apt</code> [Solaris<sup><font size=         "-2">TM</font></sup> ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à (AMD)]<br> <code>bin/apt.exe</code> [Microsoft Windows]</dd>
-
-        <dt><code>lib/jconsole.jar</code></dt>
-
-<dd>Jconsole ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¡£Ãí: Jconsole ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë¤ÏưŪ¥¢¥¿¥Ã¥Áµ¡¹½¤¬É¬ÍפǤ¹¡£</dd>
-
-        <dt>ưŪ¥¢¥¿¥Ã¥Áµ¡¹½¤Ï¡¢°Ê²¼¤Î¥Õ¥¡¥¤¥ë¤Ç¹½À®¤µ¤ì¤Þ¤¹¡£</dt>
-
-        <dd><code>lib/tools.jar</code> [¤¹¤Ù¤Æ¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à]<br> <code>jre/lib/sparc/libattach.so</code> [Solaris<sup><font size=         "-2">TM</font></sup> ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à (SPARC(R) ¥×¥é¥Ã¥È¥Õ¥©¡¼¥àÈÇ) ¤ª¤è¤Ó Linux]<br> <code>jre/lib/sparcv9/libattach.so</code> [Solaris<sup><font size=         "-2">TM</font></sup> ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à (SPARC(R) ¥×¥é¥Ã¥È¥Õ¥©¡¼¥àÈÇ) ¤ª¤è¤Ó Linux]<br> <code>jre/lib/i386/libattach.so</code> [Solaris<sup><font size=         "-2">TM</font></sup> ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à (x86) ¤ª¤è¤Ó Linux]<br> <code>jre/lib/amd64/libattach.so</code> [Solaris<sup><font size=         "-2">TM</font></sup> ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à (AMD) ¤ª¤è¤Ó Linux]<br> <code>jre\bin\attach.dll</code> [Microsoft Windows]<br></dd>
-
-        <dt>Java Platform Debugger Architecture ¤Î¼ÂÁõ¤Ï¡¢¾å¤ÎưŪ¥¢¥¿¥Ã¥Á¤Ç¼¨¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¡¢¤ª¤è¤Ó°Ê²¼¤Î¥Õ¥¡¥¤¥ë¤Ç¹½À®¤µ¤ì¤Þ¤¹¡£</dt>
-
-        <dd><code>lib/tools.jar</code> [¤¹¤Ù¤Æ¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à]<br> <code>lib/sa-jdi.jar</code> [¤¹¤Ù¤Æ¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à]<br> <code>jre/lib/sparc/libsaproc.so</code> [Solaris<sup><font size=         "-2">TM</font></sup> ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à (SPARC(R) ¥×¥é¥Ã¥È¥Õ¥©¡¼¥àÈÇ) ¤ª¤è¤Ó Linux]<br> <code>jre/lib/sparcv9/libsaproc.so</code> [Solaris<sup><font size=         "-2">TM</font></sup> ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à (SPARC(R) ¥×¥é¥Ã¥È¥Õ¥©¡¼¥àÈÇ) ¤ª¤è¤Ó Linux]<br> <code>jre/lib/i386/libsaproc.so</code> [Solaris<sup><font size=         "-2">TM</font></sup> ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à (x86) ¤ª¤è¤Ó Linux]<br> <code>jre/lib/amd64/libsaproc.so</code> [Solaris<sup><font size=         "-2">TM</font></sup> ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à (AMD) ¤ª¤è¤Ó Linux]<br></dd>
-
-<dt><code>jre\bin\server\</code></dt>
-
-<dd>Microsoft Windows ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ç¤Ï¡¢JDK ¤Ë Java HotSpot<sup><font size="-2">TM</font></sup> Server VM ¤È Java HotSpot<sup><font size="-2">TM</font></sup> Client VM ¤ÎξÊý¤¬´Þ¤Þ¤ì¤Þ¤¹¡£¤¿¤À¤·¡¢Microsoft Windows ¥×¥é¥Ã¥È¥Õ¥©¡¼¥àÈǤΠJRE ¤Ë¤Ï Java HotSpot<sup><font size="-2">TM</font></sup> Client VM ¤·¤«´Þ¤Þ¤ì¤Æ¤¤¤Þ¤»¤ó¡£Java HotSpot<sup><font size="-2">TM</font></sup> Server VM ¤ò JRE ¤Ç»ÈÍѤ¹¤ë¾ì¹ç¤Ï¡¢JDK ¤Î <tt>jre\bin\server</tt> ¥Õ¥©¥ë¥À¤ò JRE ¤Î <tt>bin\server</tt> ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥³¥Ô¡¼¤·¤Æ¤¯¤À¤µ¤¤¡£¥½¥Õ¥È¥¦¥§¥¢¥Ù¥ó¥À¡¼¤Ï¡¢JRE ¤ÎºÆÇÛÉۤκݤˡ¢Java HotSpot<sup><font size="-2">TM</font></sup> Server VM ¤òºÆÇÛÉÛ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</dd>
-      </dl>
-    </dd>
-  </dl>
-
-<h3>̵À©¸Â¶¯ÅÙ Java °Å¹æ²½³ÈÄ¥µ¡Ç½</h3>
-
-  <blockquote>
-°ìÉô¤Î¹ñ¤ÎÍ¢Æþµ¬À©¤ËÂбþ¤¹¤ë¤¿¤á¡¢JDK ¤ª¤è¤Ó JRE ¤È¤È¤â¤Ë½Ð²Ù¤µ¤ì¤ë Java °Å¹æ²½³ÈÄ¥µ¡Ç½ (JCE) ¤Î¥Ý¥ê¥·¡¼¥Õ¥¡¥¤¥ë¤Ï¡¢¶¯ÎϤǤϤ¢¤Ã¤Æ¤âÀ©¸ÂÉÕ¤­¤Î°Å¹æÊý¼°¤Î»ÈÍѤ·¤«µö²Ä¤·¤Æ¤¤¤Þ¤»¤ó¡£ ¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤Ï¼¡¤Î¾ì½ê¤Ë³ÊǼ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£<br>
- <br> <code>&lt;java-home&gt;/lib/security/local_policy.jar</code><br> <code>&lt;java-home&gt;/lib/security/US_export_policy.jar</code><br> <br><code>&lt;java-home&gt;</code> ¤Ï¡¢JDK ¤Î <code>jre</code> ¥Ç¥£¥ì¥¯¥È¥ê¤Þ¤¿¤Ï JRE ¤ÎºÇ¾å°Ì¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤¹¡£  </blockquote>
-
-  <blockquote>
-µ¬À©¤ò¼õ¤±¤Ê¤¤¹ñ¤Î¥æ¡¼¥¶¡¼¤Î¤¿¤á¤Ë¡¢°Å¹æ²½¶¯ÅÙ¤ËÀ©¸Â¤Î¤Ê¤¤ÌµÀ©¸Â¶¯Å٥С¼¥¸¥ç¥ó¤Î¥Õ¥¡¥¤¥ë¤¬ JDK Web ¥µ¥¤¥È¤ËÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤ì¤é¤Î¹ñ¤Î¥æ¡¼¥¶¡¼¤Ï¡¢ÌµÀ©¸Â¶¯Å٥С¼¥¸¥ç¥ó¤ò¥À¥¦¥ó¥í¡¼¥É¤·¡¢¶¯ÎϰŹ沽 jar ¥Õ¥¡¥¤¥ë¤ò̵À©¸Â¶¯ÅÙ¥Õ¥¡¥¤¥ë¤ÇÃÖ¤­´¹¤¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-  </blockquote>
-
-<h3>cacerts ¾ÚÌÀ½ñ¥Õ¥¡¥¤¥ë</h3>
-
-  <blockquote>
-°Ê²¼¤Ë¤¢¤ë Java SE ¾ÚÌÀ½ñ¥Õ¥¡¥¤¥ë¤Ç¥ë¡¼¥Èǧ¾Ú¶É¾ÚÌÀ½ñ¤òÄɲäޤ¿¤Ïºï½ü¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-  </blockquote>
-
-  <blockquote>
-<code>&lt;java-home&gt;/lib/security/cacerts</code>
-  </blockquote>
-
-  <blockquote>
-    ¾ÜºÙ¤Ï keytool ¥É¥­¥å¥á¥ó¥È¤Î <a href="http://java.sun.com/javase/ja/6/docs/ja/technotes/tools/solaris/keytool.html#cacerts">cacerts ¾ÚÌÀ½ñ¥Õ¥¡¥¤¥ë</a> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-  </blockquote>
-
-<h2><a name="endorsed"></a>Java ¿ä¾©µ¬³Ê¥ª¡¼¥Ð¡¼¥é¥¤¥Éµ¡¹½</h2>
-
-  <blockquote>
-    Java ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ï¡¢Java Community Process<sup><font size="-1">SM</font></sup> (JCP<sup><font size="-1">SM</font></sup><a href="http://www.jcp.org/">http://www.jcp.org/</a>) °Ê³°¤ÇºîÀ®¤µ¤ì¤¿É¸½à (¿ä¾©É¸½à) ¤ÎºÇ¿·¥Ð¡¼¥¸¥ç¥ó¤òÁȤ߹þ¤à¤¿¤á¡¢¤Þ¤¿¤Ï¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ë´Þ¤Þ¤ì¤ë¥Æ¥¯¥Î¥í¥¸¡¼¤Î¥Ð¡¼¥¸¥ç¥ó¤ò¡¢¤½¤Î¥Æ¥¯¥Î¥í¥¸¡¼¤Î¿·¤·¤¤¥¹¥¿¥ó¥É¥¢¥í¥ó¥Ð¡¼¥¸¥ç¥ó (ɸ½à¥Æ¥¯¥Î¥í¥¸¡¼) ¤ËÂбþ¤µ¤»¤ë¤¿¤á¡¢Å¬µ¹¹¹¿·¤¬É¬ÍפǤ¹¡£
-  </blockquote>
-
-  <blockquote>
-¿ä¾©µ¬³Ê¥ª¡¼¥Ð¡¼¥é¥¤¥Éµ¡¹½¤ò»ÈÍѤ¹¤ì¤Ð¡¢Java ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤ËÁȤ߹þ¤Þ¤ì¤ë²ÄǽÀ­¤Î¤¢¤ë¿ä¾©É¸½à¤ä¥¹¥¿¥ó¥É¥¢¥í¥ó¥Æ¥¯¥Î¥í¥¸¡¼¤ò¼ÂÁõ¤¹¤ë¡¢¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Î¥¯¥é¥¹¤ä¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤òÄ󶡤Ǥ­¤Þ¤¹¡£
-  </blockquote>
-
-  <blockquote>
-¿ä¾©µ¬³Ê¥ª¡¼¥Ð¡¼¥é¥¤¥Éµ¡¹½¤Î¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢¼¡¤Î¥µ¥¤¥È¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£Í¥Àè»ØÄê¤Ë»ÈÍѤǤ­¤ë¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¥Ñ¥Ã¥±¡¼¥¸¤Î°ìÍ÷¤â·ÇºÜ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-  </blockquote>
-
-  <blockquote>
-    <a href=     "http://java.sun.com/javase/ja/6/docs/ja/technotes/guides/standards/">http://java.sun.com/javase/ja/6/docs/ja/technotes/guides/standards/</a>
-  </blockquote>
-
-<h2><a name="javadb" id="javadb"></a>Java DB</h2>
-
-  <blockquote>
-¤³¤ÎÇÛÉۤϡ¢Sun Microsystems ¤¬ÇÛÉÛ¤¹¤ë Apache Derby pure Java ¥Ç¡¼¥¿¥Ù¡¼¥¹¥Æ¥¯¥Î¥í¥¸¡¼¤Ç¤¢¤ë Java DB ¤ò¥Ð¥ó¥É¥ë¤·¤Æ¤¤¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï°Ê²¼¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£
-
-    <ul>
-<li>Solaris: <code>/opt/SUNWjavadb</code></li>
-
-<li>Linux: <code>/opt/sun/javadb</code></li>
-
-<li>Windows: <code>C:\Program Files\Sun\JavaDB</code></li>
-    </ul>
-
-    <p>¥æ¡¼¥¶¡¼¥É¥­¥å¥á¥ó¥È¤ä API ¥É¥­¥å¥á¥ó¥È¡¢Java DB ¤Îµ¡Ç½¤ä¤½¤Î¾¥ê¥½¡¼¥¹¤Ê¤É¤Î Java DB ¤È Derby ¤Î¾ðÊó¤Ë¤Ä¤¤¤Æ¤Ï¡¢¾åµ­¥Ç¥£¥ì¥¯¥È¥ê¤Î index.html ¥Õ¥¡¥¤¥ë¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-  </blockquote>
-
-<h2><a name="webpages"></a>Web ¥Ú¡¼¥¸</h2>
-
-  <blockquote>
-¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢¼¡¤Î Sun Microsystems ¤Î Web ¥Ú¡¼¥¸¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-  </blockquote>
-
-  <dl>
-    <dd>
-      <dl>
-        <dt><a href="http://java.sun.com/">http://java.sun.com/</a></dt>
-
-<dd>Java Software Web ¥µ¥¤¥È¡£Java ¥Æ¥¯¥Î¥í¥¸¡¢À½ÉʾðÊ󡢥˥塼¥¹¡¢¤ª¤è¤Óµ¡Ç½¤Ë¤Ä¤¤¤Æ¤ÎºÇ¿·¾ðÊ󤬷Ǻܤµ¤ì¤Æ¤¤¤Þ¤¹¡£</dd>
-
-        <dt><a href=         "http://java.sun.com/docs">http://java.sun.com/docs</a></dt>
-
-<dd>Java<sup><font size="-2">TM</font></sup> ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Î¥É¥­¥å¥á¥ó¥È¡£¥Û¥ï¥¤¥È¥Ú¡¼¥Ñ¡¼¤ä Java ¥Á¥å¡¼¥È¥ê¥¢¥ë¤Ê¤É¤Î¥É¥­¥å¥á¥ó¥È¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤¹¡£</dd>
-
-        <dt><a href=         "http://developer.java.sun.com/">http://developer.java.sun.com</a></dt>
-
-<dd>Developer Services Web ¥µ¥¤¥È¡£(̵ÎÁ¤ÎÅÐÏ¿¤¬É¬Íס£) µ»½Ñ¾ðÊ󡢥˥塼¥¹¡¢¤ª¤è¤Óµ¡Ç½¤Î¾ÜºÙ¾ðÊ󡢥桼¥¶¡¼¥Õ¥©¡¼¥é¥à¡¢¥µ¥Ý¡¼¥È¾ðÊó¤Ê¤É¤¬Ä󶡤µ¤ì¤Æ¤¤¤Þ¤¹¡£</dd>
-
-        <dt><a href=         "http://java.sun.com/products/">http://java.sun.com/products/</a></dt>
-
-        <dd>Java ¥Æ¥¯¥Î¥í¥¸À½ÉÊ¤È API</dd>
-      </dl>
-    </dd>
-  </dl>
-  <hr>
-
-<p><font size="2">Java<sup><font size="-2">TM</font></sup> Development Kit (JDK<sup><font size="-2">TM</font></sup>) ¤Ï Sun Microsystems<sup><small>TM</small></sup>, Inc. ¤ÎÀ½ÉʤǤ¹¡£<br> <br> Copyright &copy; 2010 Sun Microsystems, Inc.<br> 4150 Network Circle, Santa Clara, California 95054, U.S.A.<br> All rights reserved.</font></p>
-<script type="text/javascript" language="JavaScript" src="/js/omi/jsc/s_code_remote.js">
-</script>
-</body>
-</html>
-
diff --git a/extra/source/jdk-6/README_zh_CN.html b/extra/source/jdk-6/README_zh_CN.html
deleted file mode 100644
index a09bf21b..00000000
--- a/extra/source/jdk-6/README_zh_CN.html
+++ /dev/null
@@ -1,507 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-  <meta http-equiv="CONTENT-TYPE" content="text/html; charset=GB2312">
-
-<title>×ÔÊöÎļþ -- Java Platform, Standard Edition Development Kit</title>
-</head>
-
-<body lang="en-US" bgcolor="#FFFFFF">
-<h1 align="center">×ÔÊöÎļþ</h1>
-
-<h2 align="center">Java<sup><font size="-2">TM</font></sup> Platform, Standard Edition 6<br> Development Kit</h2>
-
-<p align="center"><b>JDK<sup><font size="-2">TM</font></sup> 6</b></p>
-
-<h2>Ŀ¼</h2>
-
-  <ul>
-<li><a href="#introduction">¼ò½é</a></li>
-
-<li><a href="#install">ϵͳҪÇóÓë°²×°</a></li>
-
-<li><a href="#docs">JDK Îĵµ</a></li>
-
-<li><a href="#relnotes">·¢ÐÐ˵Ã÷</a></li>
-
-<li><a href="#compatibility">¼æÈÝÐÔ</a></li>
-
-<li><a href="#bugs">´íÎ󱨸æÓë·´À¡</a></li>
-
-<li><a href="#contents">JDK µÄÄÚÈÝ</a></li>
-
-<li><a href="#jre">Java Runtime Environment</a></li>
-
-<li><a href="#redistribution">ÔÙ·Ö·¢</a></li>
-
-<li><a href="#endorsed">Java Ç©Ãû±ê×¼¸²¸Ç»úÖÆ</a></li>
-
-<li><a href="#javadb">Java DB</a></li>
-
-<li><a href="#webpages">Web Ò³</a></li>
-  </ul>
-
-<h2><a name="introduction" id="introduction"></a>¼ò½é</h2>
-
-  <blockquote>
-¸ÐлÄúÏÂÔØ´Ë°æ±¾µÄ Java<sup><font size=
-    "-2">TM</font></sup> Platform, Standard Edition Development Kit (JDK<sup><font size="-2">TM</font></sup>)¡£JDK ÊÇÒ»ÖÖ¿ª·¢»·¾³£¬ÓÃÓÚʹÓà Java ±à³ÌÓïÑÔÉú³ÉÓ¦ÓóÌÐò¡¢applet ºÍ×é¼þ¡£
-  </blockquote>
-
-  <blockquote>
-JDK °üº¬µÄ¹¤¾ß¿ÉÓÃÓÚ¿ª·¢ºÍ²âÊÔÒÔ Java ±à³ÌÓïÑÔ±àд²¢ÔÚ Java<sup><font size=
-    "-2">TM</font></sup> ƽ̨ÉÏÔËÐеijÌÐò¡£
-  </blockquote>
-
-<h2><a name="install" id="install"></a>ϵͳҪÇóÓë°²×°</h2>
-
-  <blockquote>
-ϵͳҪÇó¡¢°²×°ËµÃ÷ºÍ¹ÊÕÏÅųýÌáʾλÓÚ Java Èí¼þ Web Õ¾µãÉϵÄÒÔÏÂλÖãº
-  </blockquote>
-
-  <blockquote>
-<a href="http://java.sun.com/javase/6/webnotes/install/">JDK 6 °²×°ËµÃ÷</a>
-  </blockquote>
-
-<h2><a name="docs" id="docs"></a>JDK<sup><font size="-2">TM</font></sup> Îĵµ</h2>
-
-  <blockquote>
-Áª»ú <a href=
-    "http://java.sun.com/javase/6/docs/">Java<sup><font size=
-    "-2">TM</font></sup> Platform, Standard Edition (Java SE) Îĵµ</a>°üº¬ API ˵Ã÷¡¢¹¦ÄܽéÉÜ¡¢¿ª·¢ÕßÖ¸ÄÏ¡¢JDK<sup><font size=
-    "-2">TM</font></sup> ¹¤¾ßºÍʵÓóÌÐòµÄ²Î¿¼Ò³Ãæ¡¢ÑÝʾ³ÌÐòÒÔ¼°Ö¸ÏòÏà¹ØÐÅÏ¢µÄÁ´½Ó¡£´ËÎĵµ»¹ÒÔÏÂÔØ°üµÄÐÎʽÌṩ£¬Äú¿ÉÒÔ½«´Ë°ü°²×°ÔÚ¼ÆËã»úÉÏ¡£Òª»ñµÃ¸ÃÎĵµ°ü£¬Çë²Î¼û<a href="http://java.sun.com/javase/downloads/index.jsp">ÏÂÔØÒ³Ãæ</a>¡£ÓÐ¹Ø API ÎĵµµÄÐÅÏ¢£¬Çë²ÎÔÄ <a href=
-    "http://java.sun.com/javase/6/docs/api/index.html">Java<sup><font size="-2">TM</font></sup> Platform, Standard Edition API ˵Ã÷</a>¡£¸ÃÒ³ÃæÌṩÁË API µÄ¼òÒª½éÉÜ£¬ÆäÖÐÖصã½éÉÜÁË API ˵Ã÷¶ø·Ç´úÂëʾÀý¡£
-  </blockquote>
-
-<h2><a name="relnotes" id="relnotes"></a>·¢ÐÐ˵Ã÷</h2>
-
-  <blockquote>
-Óйش˰汾µÄÆäËûÐÅÏ¢£¬Çë²Î¼û Java Èí¼þ Web Õ¾µãÉ쵀 <a href="http://java.sun.com/javase/6/webnotes/">Java SE 6 ·¢ÐÐ˵Ã÷</a>¡£ÓÉÓÚÁª»ú·¢ÐÐ˵Ã÷½«¸ù¾ÝÐèÒª½øÐиüУ¬Òò´ËÇë²»¶¨Æڲ鿴Áª»ú·¢ÐÐ˵Ã÷ÒÔÁ˽â×îÐÂÐÅÏ¢¡£
-  </blockquote>
-
-<h2><a name="compatibility" id="compatibility"></a>¼æÈÝÐÔ</h2>
-
-  <blockquote>
-ÓйØÒÑÖªµÄ¼æÈÝÐÔÎÊÌâÁÐ±í£¬Çë²Î¼û Java Èí¼þ Web Õ¾µãÉÏ<a href=
-    "http://java.sun.com/javase/6/webnotes/compatibility.html">ÓëÔçÆÚ°æ±¾µÄ¼æÈÝÐÔ</a>¡£ÎÒÃÇÒѾ¡Á¦Ö§³ÖΪÔçÆÚ°æ±¾µÄ Java<sup><font size=
-    "-2">TM</font></sup> ƽ̨±àдµÄ³ÌÐò¡£¾¡¹Ü±ØÈ»»áÓÐijЩ²»¼æÈݵĸü¸Ä£¬µ«´ó²¿·ÖÈí¼þ¶¼Äܹ»ÔÚ²»ÖØбà³ÌµÄÇé¿öÏÂǨÒƵ½µ±Ç°°æ±¾¡£³ýÁËÔÚ¼«ÉÙÊýÇé¿öÏÂÓÐÒâ²»±£³Ö¼æÈÝ£¨ÈçÎÒÃǵļæÈÝÐÔ Web Ò³ÖÐËùÊö£©ÒÔÍ⣬Èç¹û×ö²»µ½ÕâÒ»µã£¬½«±»ÈÏΪÊÇÒ»¸ö´íÎó¡£Ö®ËùÒÔ´æÔÚһЩÆÆ»µ¼æÈÝÐԵĸü¸Ä£¬ÊÇÒòΪÐèÒªÃÖ²¹Ç±Ôڵݲȫ©¶´»òÐÞ¸´ÊµÏÖ»òÉè¼Æ´íÎó¡£
-  </blockquote>
-
-<h2><a name="bugs" id="bugs"></a>´íÎ󱨸æÓë·´À¡</h2>
-
-  <blockquote>
-<a href="http://bugs.sun.com/bugdatabase/index.jsp">´íÎóÊý¾Ý¿â</a> Web Õ¾µãʹÄú¿ÉÒÔËÑË÷ºÍ¼ì²éÏÖÓеĴíÎ󱨸桢Ìá½»Äú×Ô¼ºµÄ´íÎ󱨸æÒÔ¼°Í¨ÖªÎÒÃÇÄú×îÏ£ÍûÐÞ¸´ÄÄЩ´íÎó¡£ÒªÖ±½ÓÌá½»´íÎó»òÇëÇó¹¦ÄÜ£¬ÇëÌîдÒÔÏÂ±íµ¥£º
-  </blockquote>
-
-  <blockquote>
-<a href=
-    "http://bugs.sun.com/services/bugreport/index.jsp">http://bugs.sun.com/services/bugreport/index.jsp</a>
-  </blockquote>
-
-  <blockquote>
-Äú¿ÉÒÔÏò <a href=
-    "http://java.sun.com/docs/forms/sendusmail.html">Java SE ÎĵµÐ¡×é</a>·¢ËÍ·´À¡£¬Ò²¿ÉÒÔÖ±½ÓÏò <a href=
-    "http://developers.sun.com/contact/index.jsp">Java Èí¼þ¹¤³ÌС×éµÄµç×ÓÓʼþµØÖ·</a>·¢ËÍÒâ¼û¡£
-  </blockquote>
-
-  <blockquote>
-<b>×¢</b> - Ç벻Ҫͨ¹ý´íÎóÊý¾Ý¿â»òÎÒÃǵĿª·¢ÍŶÓÑ°Çó¼¼ÊõÖ§³Ö¡£ÓйؿÉÒÔÑ¡ÔñµÄÖ§³Ö·½Ê½£¬Çë²Î¼û Java Èí¼þ Web Õ¾µãÉϵÄ<a href=
-    "http://java.sun.com/developer/support/">Ö§³ÖÓë·þÎñ</a>¡£
-  </blockquote>
-
-<h2><a name="contents" id="contents"></a>JDK<sup><font size=   "-2">TM</font></sup> µÄÄÚÈÝ</h2>
-
-  <blockquote>
-±¾²¿·Ö¸ÅÀ¨½éÉÜÁË JDK<sup><font size="-2">TM</font></sup> ÖеÄÎļþºÍĿ¼¡£ÓйØÕâЩÎļþºÍĿ¼µÄÏêϸÐÅÏ¢£¬Çë²Î¼ûÊÊÓÃÓÚÄúµÄƽ̨µÄ Java SE ÎĵµµÄ <a href=
-    "http://java.sun.com/javase/6/docs/technotes/tools/index.html#general">JDK Îļþ½á¹¹</a>²¿·Ö¡£
-  </blockquote>
-
-  <dl>
-    <dd>
-      <dl>
-<dt><b>¿ª·¢¹¤¾ß</b></dt>
-
-<dd>£¨Î»ÓÚ <code>bin/</code> ×ÓĿ¼ÖУ©Ö¸¹¤¾ßºÍʵÓóÌÐò£¬¿É°ïÖúÄú¿ª·¢¡¢Ö´ÐС¢µ÷ÊԺͱ£´æÒÔ Java<sup><font size="-2">TM</font></sup> ±à³ÌÓïÑÔ±àдµÄ³ÌÐò¡£ÓйØÏêϸÐÅÏ¢£¬Çë²Î¼û<a href=
-        "http://java.sun.com/javase/6/docs/technotes/tools/index.html">¹¤¾ßÎĵµ</a>¡£<br> <br></dd>
-
-<dt><b>ÔËÐÐʱ»·¾³</b></dt>
-
-<dd>£¨Î»ÓÚ <code>jre/</code> ×ÓĿ¼ÖУ©ÓÉ JDK ʹÓÃµÄ Java Runtime Environment (JRE<sup><font size="-2">TM</font></sup>) µÄʵÏÖ¡£JRE °üÀ¨ Java<sup><font size=
-        "-2">TM</font></sup> ÐéÄâ»ú (JVM<sup><font size=
-        "-2">TM</font></sup>)¡¢Àà¿âÒÔ¼°ÆäËûÖ§³ÖÖ´ÐÐÒÔ Java<sup><font size=
-        "-2">TM</font></sup> ±à³ÌÓïÑÔ±àдµÄ³ÌÐòµÄÎļþ¡£<br> <br></dd>
-
-<dt><b>¸½¼Ó¿â</b></dt>
-
-<dd>£¨Î»ÓÚ <code>lib/</code> ×ÓĿ¼ÖУ©¿ª·¢¹¤¾ßËùÐèµÄÆäËûÀà¿âºÍÖ§³ÖÎļþ¡£<br> <br></dd>
-
-<dt><b>ÑÝʾ applet ºÍÓ¦ÓóÌÐò</b></dt>
-
-<dd>£¨Î»ÓÚ <code>demo/</code> ×ÓĿ¼ÖУ©Java<sup><font size="-2">TM</font></sup> ƽ̨µÄ±à³ÌʾÀý£¨´øÔ´´úÂ룩¡£ÕâЩʾÀý°üÀ¨Ê¹Óà Swing ºÍÆäËû Java<sup><font size="-2">TM</font></sup> »ùÀàÒÔ¼° Java<sup><font size="-2">TM</font></sup> ƽ̨µ÷ÊÔÆ÷Ìåϵ½á¹¹µÄʾÀý¡£<br> <br></dd>
-
-<dt><b>ÑùÀý´úÂë</b></dt>
-
-<dd>£¨Î»ÓÚ <code>sample</code> ×ÓĿ¼ÖУ©Ä³Ð© Java API µÄ±à³ÌÑùÀý£¨´øÔ´´úÂ룩¡£<br> <br></dd>
-
-<dt><b>C Í·Îļþ</b></dt>
-
-<dd>£¨Î»ÓÚ <code>include/</code> ×ÓĿ¼ÖУ©Ö§³ÖʹÓà <a href=
-        "http://java.sun.com/javase/6/docs/technotes/guides/jni/">Java ±¾»ú½çÃæ</a>¡¢<a href=
-        "http://java.sun.com/javase/6/docs/technotes/guides/jvmti/">JVM<sup><font size="-2">TM</font></sup> ¹¤¾ß½çÃæ</a>ÒÔ¼° Java<sup><font size="-2">TM</font></sup> ƽ̨µÄÆäËû¹¦ÄܽøÐб¾»ú´úÂë±à³ÌµÄÍ·Îļþ¡£<br> <br></dd>
-
-<dt><b>Ô´´úÂë</b></dt>
-
-<dd>£¨Î»ÓÚ <code>src.zip</code> ÖУ©×é³É Java ºËÐÄ API µÄËùÓÐÀàµÄ Java<sup><font size="-2">TM</font></sup> ±à³ÌÓïÑÔÔ´Îļþ£¨¼´£¬java.*¡¢javax.* ºÍijЩ org.* °üµÄÔ´Îļþ£¬µ«²»°üÀ¨ com.sun.* °üµÄÔ´Îļþ£©¡£´ËÔ´´úÂë½ö¹©²Î¿¼£¬ÒÔ±ã°ïÖú¿ª·¢ÕßѧϰºÍʹÓà Java<sup><font size="-2">TM</font></sup> ±à³ÌÓïÑÔ¡£ÕâЩÎļþ²»°üº¬Ìض¨ÓÚƽ̨µÄʵÏÖ´úÂ룬ÇÒ²»ÄÜÓÃÓÚÖØÐÂÉú³ÉÀà¿â¡£Òª¶ÔÕâЩÎļþ½øÐнâѹ£¬ÇëʹÓÃÈÎÒ»³£ÓÃµÄ zip ʵÓóÌÐò£»»òÕßÒ²¿ÉÒÔʹÓÃλÓÚ JDK µÄ <code>bin/</code> Ŀ¼ÖÐµÄ Jar ʵÓóÌÐò£º<br><br><code>jar xvf src.zip</code></dd>
-      </dl>
-    </dd>
-  </dl>
-
-<h2><a name="jre" id="jre"></a>Java Runtime Environment (JRE<sup><font size="-2">TM</font></sup>)</h2>
-
-  <blockquote>
-Java<sup><font size="-2">TM</font></sup> Runtime Environment (JRE<sup><font size="-2">TM</font></sup>) ÊÇÒ»¿î¿Éµ¥¶ÀÏÂÔصIJúÆ·¡£Çë²Î¼û<a href=
-    "http://java.sun.com/javase/downloads/index.jsp">ÏÂÔØ Web Õ¾µã</a>¡£
-  </blockquote>
-
-  <blockquote>
-ͨ¹ý JRE£¬Äú¿ÉÒÔÔËÐÐÒÔ Java<sup><font size=
-    "-2">TM</font></sup> ±à³ÌÓïÑÔ±àдµÄÓ¦ÓóÌÐò¡£Óë JDK<sup><font size=
-    "-2">TM</font></sup> ÏàËÆ£¬JRE °üº¬ Java<sup><font size=
-    "-2">TM</font></sup> ÐéÄâ»ú (JVM<sup><font size=
-    "-2">TM</font></sup>)¡¢×é³É Java<sup><font size=
-    "-2">TM</font></sup> ƽ̨ API µÄÀ༰֧³ÖÎļþ¡£Óë JDK ²»Í¬µÄÊÇ£¬Ëü²»°üº¬ÖîÈç±àÒëÆ÷ºÍµ÷ÊÔÆ÷ÕâÑùµÄ¿ª·¢¹¤¾ß¡£
-  </blockquote>
-
-  <blockquote>
-ÒÀÕÕ JRE Ðí¿ÉÖ¤Ìõ¿î£¬Äú¿ÉÒÔËæÒâµØ½« JRE ËæÓ¦ÓóÌÐòÒ»Æð½øÐÐÔÙ·Ö·¢¡£Ê¹Óà JDK ¿ª·¢Ó¦ÓóÌÐòºó£¬¿É½«ÆäÓë JRE Ò»Æð·¢ÐУ¬ÒÔ±ã×îÖÕÓû§¾ßÓпÉÔËÐÐÈí¼þµÄ Java<sup><font size="-2">TM</font></sup> ƽ̨¡£
-  </blockquote>
-
-<h2><a name="redistribution" id="redistribution"></a>ÔÙ·Ö·¢</h2>
-
-  <blockquote>
-    <blockquote>
-      <hr>
-×¢ - ±¾Èí¼þµÄÐí¿ÉÖ¤²»ÔÊÐíÔÙ·Ö·¢²âÊÔ°æºÍÆäËûÔ¤·¢Ðа汾¡£
-      <hr>
-    </blockquote>
-  </blockquote>
-
-  <blockquote>
-±ØÐë×ñÊØÈí¼þÐí¿ÉЭÒéµÄÌõ¿îºÍÌõ¼þÒÔ¼°ÏÂÃæÌá³öµÄÒåÎñ¡¢ÏÞÖƺÍÀýÍâ¡£ÔÚÏÂÁÐÇé¿öÏ£¬Äú¿ÉÒÔ¸´Öƺͷַ¢±¾Èí¼þ£¨ÒÔ¼°ÔÚÏÂÃæ±êʶΪ&ldquo;¿ÉÔÙ·Ö·¢&rdquo;µÄÈí¼þ²¿·Ö£©£º
-  </blockquote>
-
-  <blockquote>
-    <ol type="a">
-<li>Äú½«ÍêÕûµØ·Ö·¢Èí¼þ¶ø²»ÄܽøÐÐÐ޸ģ¬²¢½ö×÷ΪÄúµÄ applet ºÍÓ¦ÓóÌÐò£¨³ÌÐò£©µÄÒ»²¿·Ö´ò°ü£»</li>
-
-<li>ÄúµÄ³ÌÐò½«Ïò±¾Èí¼þÌí¼ÓÖØÒªµÄÖ÷Òª¹¦ÄÜ£»</li>
-
-<li>ÄúµÄ³ÌÐò½öÓÃÓÚÔÚÆôÓÃÁË Java µÄÆÕͨ×ÀÃæ¼ÆËã»úºÍ·þÎñÆ÷ÉÏÔËÐУ»</li>
-
-<li>Äú·Ö·¢Èí¼þÖ»ÊÇΪÁËÔËÐÐÄúµÄ³ÌÐò£»</li>
-
-<li>Äú²»·Ö·¢ÆäËûÈí¼þÀ´Ìæ»»±¾Èí¼þµÄÈκÎ×é¼þ£»</li>
-
-<li>Äú²»É¾³ý»ò¸ü¸Ä±¾Èí¼þÖаüº¬µÄÈκÎרÓÃͼÀý»òÉùÃ÷£»</li>
-
-<li>ÄúÖ»°´ÕÕÖ¼ÔÚ±£»¤ Sun µÄÀûÒæµÄÐí¿ÉЭÒéÖеÄÌõ¿îÀ´·Ö·¢±¾Èí¼þ£»</li>
-
-<li>ÄúͬÒâά»¤ºÍ±£ÕÏ Sun ¼°ÆäÐí¿É·½µÄÀûÒ棬²»Ê¹Æä³Ðµ£ÒòµÚÈý·½Ê¹Óûò·Ö·¢ÈÎÒâºÍÈ«²¿³ÌÐòºÍ/»òÈí¼þ¶øÒýÆðµÄÅâ³¥¡¢ËßËÏ»ò³åÍ»Ëùµ¼ÖµÄÅâ³¥½ð¡¢ËßËÏ·Ñ¡¢Õ®ÎñºÍ/»òµ÷½â·Ñ£¨°üÀ¨ÂÉʦ·Ñ£©¡£</li>
-    </ol>
-  </blockquote>
-
-  <blockquote>
-´Ë´¦Ê¹ÓõÄ&ldquo;¹©Ó¦ÉÌ&rdquo;Ò»´ÊÊÇÖ¸Ðí¿ÉÖ¤³ÖÓÐÈË¡¢¿ª·¢ÕßÒÔ¼°½« Java<sup><font size="-2">TM</font></sup> Development Kit (JDK<sup><font size="-2">TM</font></sup>) ÓëÆä³ÌÐòÒ»ÆðÐí¿ÉºÍ·Ö·¢µÄ¶ÀÁ¢Èí¼þ¹©Ó¦ÉÌ (ISV)¡£
-  </blockquote>
-
-  <blockquote>
-¹©Ó¦É̱ØÐë×ñÊØ Java Development Kit ¶þ½øÖÆ´úÂëÐí¿ÉЭÒéµÄÌõ¿î¡£
-  </blockquote>
-
-<h3>±ØÒªÎļþÓë¿ÉÑ¡Îļþ</h3>
-
-  <blockquote>
-×é³É Java<sup><font size="-2">TM</font></sup> Development Kit (JDK<sup><font size="-2">TM</font></sup>) µÄÎļþ·ÖΪÁ½Àࣺ±ØÒªµÄºÍ¿ÉÑ¡µÄ¡£¿ÉÑ¡Îļþ¿ÉÒÔ²»°üº¬ÔÚ JDK µÄÔÙ·Ö·¢ÖУ¨Óɹ©Ó¦É̾ö¶¨£©¡£
-  </blockquote>
-
-  <blockquote>
-ÏÂÃæÒ»½ÚÁгöÁË¿ÉÒÔÑ¡Ôñ´Ó JDK µÄÔÙ·Ö·¢ÖÐÊ¡ÂÔµÄÎļþºÍĿ¼¡£Ã»ÓÐÁÐΪ¿ÉÑ¡ÎļþµÄËùÓÐÎļþ¶¼±ØÐë°üº¬ÔÚ JDK µÄÔÙ·Ö·¢ÖС£
-  </blockquote>
-
-<h3>¿ÉÑ¡ÎļþºÍĿ¼</h3>
-
-  <blockquote>
-ÏÂÁÐÎļþ¿ÉÒÔ´ÓÔÙ·Ö·¢ÖÐÅųý¡£ÕâЩÎļþλÓÚ jdk1.6.0_&lt;°æ±¾&gt; Ŀ¼ÖУ¬ÆäÖÐ &lt;°æ±¾&gt; ÊÇ×îеİ汾ºÅ¡£½«ÏÔʾ Solaris<sup><font size="-2">TM</font></sup> ºÍ Linux µÄÎļþÃûºÍ·Ö¸ô·û¡£Windows ¿ÉÖ´ÐÐÎļþ¾ßÓÐ &quot;.exe&quot; ºó׺¡£»¹¿ÉÒÔÅųýÃû³ÆÖдøÓÐ <code>_g</code> µÄÏàÓ¦Îļþ¡£¶ÔÓÚÈκÎÒÑÅųýµÄ¿ÉÖ´ÐÐÎļþ£¬Ó¦ÅųýÏàÓ¦µÄÊÖ²áÒ³£¨°üº¬ÏÂÃæÁгöµÄÒÔ <code>bin/</code> ¿ªÍ·µÄ·¾¶£¬ÊÊÓÃÓÚ Solaris<sup><font size="-2">TM</font></sup> ²Ù×÷ϵͳºÍ Linux£©¡£
-  </blockquote>
-
-  <dl>
-    <dd>
-      <dl>
-<dt><code>jre/lib/charsets.jar</code></dt>
-
-<dd>×Ö·ûת»»Àà</dd>
-
-<dt><code>jre/lib/ext/</code></dt>
-
-<dd><code>sunjce_provider.jar</code> - SunJCE µÄ Java ¼ÓÃÜ·¨ API ÌṩÕß<br> <code>localedata.jar</code> - °üº¬·ÇÃÀʽӢÓïÓïÑÔ»·¾³ËùÐèµÄÐí¶à×ÊÔ´<br> <code>ldapsec.jar</code> - °üº¬ LDAP ·þÎñÌṩÕßËùÖ§³ÖµÄ°²È«ÌØÕ÷<br> <code>dnsns.jar</code> - ÓÃÓÚ JNDI DNS ÌṩÕßµÄ InetAddress °ü×°</dd>
-
-<dt><code>bin/rmid</code> ºÍ <code>jre/bin/rmid</code></dt>
-
-<dd>Java RMI »î»¯ÏµÍ³ÊØ»¤½ø³Ì</dd>
-
-<dt><code>bin/rmiregistry</code> ºÍ <code>jre/bin/rmiregistry</code></dt>
-
-<dd>Java Ô¶³Ì¶ÔÏó×¢²á±í</dd>
-
-<dt><code>bin/tnameserv</code> ºÍ <code>jre/bin/tnameserv</code></dt>
-
-<dd>Java IDL Ãû³Æ·þÎñÆ÷</dd>
-
-<dt><code>bin/keytool</code> ºÍ <code>jre/bin/keytool</code></dt>
-
-<dd>ÃÜÔ¿ºÍÖ¤Êé¹ÜÀí¹¤¾ß</dd>
-
-<dt><code>bin/kinit</code> ºÍ <code>jre/bin/kinit</code></dt>
-
-<dd>ÓÃÓÚ»ñÈ¡ºÍ¸ßËÙ»º´æ Kerberos Ʊ֤µÄÊÚÓèƱ֤</dd>
-
-<dt><code>bin/klist</code> ºÍ <code>jre/bin/klist</code></dt>
-
-<dd>ƾ¾Ý¸ßËÙ»º´æºÍÃÜÔ¿±íÖÐµÄ Kerberos ÏÔʾÌõÄ¿</dd>
-
-<dt><code>bin/ktab</code> ºÍ <code>jre/bin/ktab</code></dt>
-
-<dd>Kerberos ÃÜÔ¿±í¹ÜÀíÆ÷</dd>
-
-<dt><code>bin/policytool</code> ºÍ <code>jre/bin/policytool</code></dt>
-
-<dd>²ßÂÔÎļþ´´½¨ºÍ¹ÜÀí¹¤¾ß</dd>
-
-<dt><code>bin/orbd</code> ºÍ <code>jre/bin/orbd</code></dt>
-
-<dd>¶ÔÏóÇëÇó´úÀíÊØ»¤½ø³Ì</dd>
-
-<dt><code>bin/servertool</code> ºÍ <code>jre/bin/servertool</code></dt>
-
-<dd>Java IDL ·þÎñÆ÷¹¤¾ß</dd>
-
-<dt><code>bin/javaws</code>¡¢<code>jre/bin/javaws</code>¡¢<code>jre/lib/javaws/</code> ºÍ <code>jre/lib/javaws.jar</code></dt>
-
-<dd>Java Web Start</dd>
-
-<dt><code>db/</code></dt>
-<dd>
-Java DB£¬ËüÊÇ Sun Microsystems µÄ Apache Derby Êý¾Ý¿â¼¼ÊõµÄ·Ö·¢¡£
-ĬÈÏ°²×°Î»ÖÃΪ£º
-
-<ul>
-<li>Solaris£º<code>/opt/SUNWjavadb</code></li>
-
-<li>Linux£º<code>/opt/sun/javadb</code></li>
-
-<li>Windows£º<code>C:\Program Files\Sun\JavaDB</code></li>
-</ul>ÓÐ¹Ø Java DB ºÍ Derby µÄÐÅÏ¢£¨°üÀ¨Óû§
-ºÍ API Îĵµ¡¢Java DB µÄ¹¦ÄÜÒÔ¼°¸ü¶à×ÊÔ´£©£¬
-Çë²Î¼ûÉÏÊöĿ¼ÖÐµÄ index.html Îļþ¡£
-</dd>
-
-<dd>Java<sup><font size="-2">TM</font></sup>DB£¬Sun Microsystems µÄ Apache Derby Êý¾Ý¿â¼¼Êõ·Ö·¢¡£</dd>
-
-<dt><code>demo/</code></dt>
-
-<dd>ÑÝʾ applet ºÍÓ¦ÓóÌÐò</dd>
-
-<dt><code>sample/</code></dt>
-
-<dd>ÑùÀý´úÂë</dd>
-
-<dt><code>src.zip</code></dt>
-
-<dd>Ô´Îļþ¹éµµ</dd>
-      </dl>
-    </dd>
-  </dl>
-
-<h3><a name="redistributablejdkfiles" id=
-  "redistributablejdkfiles"></a>¿ÉÔÙ·Ö·¢µÄ JDK<sup><font size=
-  "-2">TM</font></sup> Îļþ</h3>
-
-  <blockquote>
-ÏÂÃæÁгöÁËÓÐÏÞ¼¸×é JDK ÎļþºÍĿ¼£¬¹©Ó¦ÉÌÔÚÔÙ·Ö·¢ Java<sup><font size=
-    "-2">TM</font></sup> Runtime Environment (JRE<sup><font size=
-    "-2">TM</font></sup>) ʱ£¬¿ÉÄܻὫÕâЩÎļþºÍĿ¼Ë渽ÆäÖС£²»Äܵ¥¶À¶ÔËüÃǽøÐÐÔÙ·Ö·¢£¬¶ø±ØÐëËæÏàͬ°æ±¾µÄ JRE Ò»Æð·Ö·¢¡£ËùÓз¾¶¶¼ÊÇÏà¶Ô JDK µÄ¶¥²ãĿ¼¶øÑԵġ£¶ÔÓÚÈκÎÒÑ°üº¬µÄ¿ÉÖ´ÐÐÎļþ£¬Ó¦°üº¬ÏàÓ¦µÄÊÖ²áÒ³£¨°üº¬ÏÂÃæÁгöµÄÒÔ <code>bin/</code> ¿ªÍ·µÄ·¾¶£¬ÊÊÓÃÓÚ Solaris<sup><font size="-2">TM</font></sup> ²Ù×÷ϵͳºÍ Linux£©¡£
-  </blockquote>
-
-  <dl>
-    <dd>
-      <dl>
-<dt><code>jre/lib/cmm/PYCC.pf</code></dt>
-
-<dd>ÑÕÉ«ÅäÖÃÎļþ¡£½öµ±Óû§Ï£ÍûÔÚ PYCC ÑÕÉ«Çø¼äÓëÁíÒ»¸öÑÕÉ«Çø¼äÖ®¼ä½øÐÐת»»Ê±²ÅÐèÒªÓõ½´ËÎļþ¡£</dd>
-
-<dt>λÓÚ <code>jre/lib/fonts/</code> Ŀ¼ÖеÄËùÓÐ <code>.ttf</code> ×ÖÌåÎļþ¡£</dt>
-
-<dd>Çë×¢Ò⣬JRE ÖÐÒÑ°üº¬ LucidaSansRegular.ttf ×ÖÌ壬Òò´ËÎÞÐè´Ó JDK ÖÐÒýÈë¸ÃÎļþ¡£</dd>
-
-<dt><code>jre/lib/audio/soundbank.gm</code></dt>
-
-<dd>JDK ÖоßÓиà MIDI ÉùÒô¿â£¬µ«ÎªÁ˼õС JRE ÏÂÔØ°üËùÕ¼µÄ¿Õ¼ä£¬ÒÑ´Ó JRE ÖÐɾ³ý¸Ã¿â¡£µ«ÊÇ£¬¶ÔÓÚ MIDI »Ø·Å£¬ÉùÒô¿âÎļþÊDZØÐèµÄ£¬Òò´ËÔÚÔÙ·Ö·¢ JRE ʱ¿ÉÄܽ« JDK µÄ <code>soundbank.gm</code> ÎļþË渽ÆäÖУ¨Óɹ©Ó¦É̾ö¶¨£©¡£¿É´Ó Java Sound Web Õ¾µã»ñµÃÈô¸É¼ÓÇ¿µÄ MIDI ÉùÒô¿â°æ±¾£¬¸ÃÕ¾µãÈçÏ£º<a href=
-        "http://java.sun.com/products/java-media/sound/">http://java.sun.com/products/java-media/sound/</a>¡£ÔÚÔÙ·Ö·¢ JRE ʱ£¬¿ÉÄܽ«ÕâЩ±¸ÓÃÉùÒô¿âË渽ÆäÖС£</dd>
-
-<dt>javac ×Ö½ÚÂë±àÒëÆ÷ÓÉÏÂÁÐÎļþ×é³É£º</dt>
-
-<dd><code>bin/javac</code> [Solaris<sup><font size="-2">TM</font></sup> ²Ù×÷ϵͳºÍ Linux]<br> <code>bin/sparcv9/javac</code> [Solaris<sup><font size="-2">TM</font></sup> ²Ù×÷ϵͳ£¨SPARC(R) ƽ̨°æ£©]<br> <code>bin/amd64/javac</code> [Solaris<sup><font size="-2">TM</font></sup> ²Ù×÷ϵͳ (AMD)]<br> <code>bin/javac.exe</code> [Microsoft Windows]<br> <code>lib/tools.jar</code> [ËùÓÐƽ̨]</dd>
-
-<dt>×¢ÊÍ´¦Àí¹¤¾ßÓÉÏÂÁÐÎļþ×é³É£º</dt>
-<dd><code>lib/tools.jar</code> [ËùÓÐƽ̨]<br>
-<dd><code>bin/apt</code> [Solaris<sup><font size="-2">TM</font></sup> ²Ù×÷ϵͳºÍ Linux]<br> <code>bin/sparcv9/apt</code> [Solaris<sup><font size="-2">TM</font></sup> ²Ù×÷ϵͳ£¨SPARC(R) ƽ̨°æ£©]<br> <code>bin/amd64/apt</code> [Solaris<sup><font size="-2">TM</font></sup> ²Ù×÷ϵͳ (AMD)]<br> <code>bin/apt.exe</code> [Microsoft Windows]</dd>
-
-<dt><code>lib/jconsole.jar</code></dt>
-
-<dd>Jconsole Ó¦ÓóÌÐò¡£×¢Ò⣺</dd>
-Jconsole Ó¦ÓóÌÐòÒªÇóʹÓö¯Ì¬Á¬½Ó»úÖÆ¡£</dd>
-
-<dt>¶¯Ì¬Á¬½Ó»úÖÆÓÉÏÂÁÐÎļþ×é³É£º</dt>
-
-<dd><code>lib/tools.jar</code> [ËùÓÐƽ̨]<br>
-<code>jre/lib/sparc/libattach.so</code> [Solaris<sup><font size=
-"-2">TM</font></sup> ²Ù×÷ϵͳ£¨SPARC(R) ƽ̨°æ£©ºÍ Linux]
-<br>
-<code>jre/lib/sparcv9/libattach.so</code> [Solaris<sup><font size=
-"-2">TM</font></sup> ²Ù×÷ϵͳ£¨SPARC(R) ƽ̨°æ£©ºÍ Linux]
-<br>
-<code>jre/lib/i386/libattach.so</code> [Solaris<sup><font size=
-"-2">TM</font></sup> ²Ù×÷ϵͳ (x86) ºÍ Linux]<br>
-<code>jre/lib/amd64/libattach.so</code> [Solaris<sup><font size=
-"-2">TM</font></sup> ²Ù×÷ϵͳ (AMD) ºÍ Linux]
-<code>jre\bin\attach.dll</code> [Microsoft Windows]<br></dd>
-
-<dt>Java ƽ̨µ÷ÊÔÆ÷Ìåϵ½á¹¹ÊµÏÖÓÉ
-ÔÚÉÏÊö¶¯Ì¬Á¬½Ó²¿·ÖÖÐÏÔʾµÄÎļþºÍ
-ÏÂÁÐÎļþ×é³É£º</dt>
-
-<dd><code>lib/tools.jar</code> [ËùÓÐƽ̨]<br>
-<code>lib/sa-jdi.jar</code> [ËùÓÐƽ̨]<br>
-<code>jre/lib/sparc/libsaproc.so</code> [Solaris<sup><font size=
-"-2">TM</font></sup> ²Ù×÷ϵͳ£¨SPARC(R) ƽ̨°æ£©ºÍ Linux]
-<br>
-<code>jre/lib/sparcv9/libsaproc.so</code> [Solaris<sup><font size=
-"-2">TM</font></sup> ²Ù×÷ϵͳ£¨SPARC(R) ƽ̨°æ£©ºÍ Linux]
-<br>
-<code>jre/lib/i386/libsaproc.so</code> [Solaris<sup><font size=
-"-2">TM</font></sup> ²Ù×÷ϵͳ (x86) ºÍ Linux]<br>
-<code>jre/lib/amd64/libsaproc.so</code> [Solaris<sup><font size=
-"-2">TM</font></sup> ²Ù×÷ϵͳ (AMD) ºÍ Linux]<br></dd>
-
-<dt><code>jre\bin\server\</code></dt>
-
-<dd>ÔÚ Microsoft Windows ƽ̨ÉÏ£¬JDK ͬʱ°üº¬ Java HotSpot<sup><font size="-2">TM</font></sup> ·þÎñÆ÷ VM ºÍ Java HotSpot<sup><font size="-2">TM</font></sup> ¿Í»§»ú VM¡£µ«ÊÇ£¬Microsoft Windows ƽ̨É쵀 JRE ½ö°üº¬ Java HotSpot<sup><font size="-2">TM</font></sup> ¿Í»§»ú VM¡£Èç¹ûÓû§Ï£ÍûºÍ JRE Ò»ÆðʹÓà Java HotSpot<sup><font size="-2">TM</font></sup> ·þÎñÆ÷ VM£¬¿ÉÒÔ½« JDK µÄ <code>jre\bin\server</code> Îļþ¼Ð¸´ÖƵ½ JRE µÄ <code>bin\server</code> Ŀ¼ÖС£Èí¼þ¹©Ó¦É̿ɽ« Java HotSpot<sup><font size="-2">TM</font></sup> ·þÎñÆ÷ VM Ëæ JRE Ò»ÆðÔÙ·Ö·¢¡£</dd>
-      </dl>
-    </dd>
-  </dl>
-
-<h3>ÎÞÏÞ¼ÓÇ¿µÄ Java ¼ÓÃÜ·¨À©Õ¹</h3>
-
-  <blockquote>
-ÓÉÓÚijЩ¹ú¼Ò/µØÇø´æÔÚ½ø¿Ú¿ØÖÆÏÞÖÆ£¬Òò´Ë JDK ºÍ JRE Ë渽µÄ Java ¼ÓÃÜ·¨À©Õ¹ (JCE) ²ßÂÔÎļþÔÊÐíʹÓÃÇ¿´óµ«ÓÐÏ޵ļÓÃÜ·¨¡£ÕâЩÎļþλÓÚ<br> <br> <code>&lt;java-home&gt;/lib/security/local_policy.jar</code><br> <code>&lt;java-home&gt;/lib/security/US_export_policy.jar</code><br> <br>ÆäÖÐ <code>&lt;java-home&gt;</code> ÊÇ JDK µÄ <code>jre</code> Ŀ¼»ò JRE µÄ¶¥²ãĿ¼¡£
-  </blockquote>
-
-  <blockquote>
-¶ÔÓÚÄÇЩλÓÚ·ûºÏÌõ¼þµÄ¹ú¼Ò/µØÇøµÄÓû§£¬¿ÉÒÔ´Ó JDK Web Õ¾µã»ñÈ¡²»¶Ô¼ÓÃܼ¼ÊõµÄÇ¿¶ÈÖ¸¶¨ÈκÎÏÞÖƵÄÎÞÏÞ¼ÓÇ¿°æÎļþ¡£Î»ÓÚ·ûºÏÌõ¼þµÄ¹ú¼Ò/µØÇøµÄÓû§¿ÉÒÔÏÂÔØÎÞÏÞ¼ÓÇ¿°æÎļþ£¬²¢ÓÃÕâЩÎļþÌ滻ǿ¶ÈÓÐÏÞµÄ jar Îļþ¡£
-  </blockquote>
-
-<h3>Cacerts Ö¤ÊéÎļþ</h3>
-
-  <blockquote>
-¿ÉÒÔÔÚλÓÚÒÔÏÂλÖÃµÄ Java SE Ö¤ÊéÎļþÖÐÌí¼Ó»òɾ³ý¸ù CA Ö¤Êé
-  </blockquote>
-
-  <blockquote>
-<code>&lt;java-home&gt;/lib/security/cacerts</code>
-  </blockquote>
-
-  <blockquote>
-ÓйØÏêϸÐÅÏ¢£¬Çë²Î¼û keytool ÎĵµÖÐµÄ <a href=
-    "http://java.sun.com/javase/6/docs/technotes/tools/solaris/keytool.html#cacerts">cacerts Ö¤ÊéÎļþ</a>Ò»½Ú¡£
-  </blockquote>
-
-<h2><a name="endorsed" id="endorsed"></a>Java Ç©Ãû±ê×¼¸²¸Ç»úÖÆ</h2>
-
-  <blockquote>
-Ðèʱ³£¸üРJava ƽ̨£¬ÒԱ㲢ÈëÔÚ Java Community Process <font size="-2"><sup>SM</sup></font> (JCP<font size=
-    "-2"><sup>SM</sup></font> <a href=
-    "http://www.jcp.org/">http://www.jcp.org/</a>) Ö®Íâ´´½¨µÄ½Ïа汾µÄ±ê×¼£¨<i>Ç©Ãû±ê×¼</i>£©£¬»ò½«¸Ãƽ̨ÖÐËù°üº¬µÄ¼¼Êõ°æ±¾¸üÐÂΪ¸Ã¼¼ÊõÏàÓ¦µÄ½ÏеĶÀÁ¢°æ±¾£¨<i>¶ÀÁ¢¼¼Êõ</i>£©¡£
-  </blockquote>
-
-  <blockquote>
-<i>Ç©Ãû±ê×¼¸²¸Ç»úÖÆ</i>ÌṩÁËÒ»ÖÖ·½·¨£¬¿É½«Ö´ÐÐÇ©Ãû±ê×¼»ò¶ÀÁ¢¼¼ÊõµÄ½Ïа汾µÄÀàºÍ½çÃæ²¢Èë Java ƽ̨ÖС£
-  </blockquote>
-
-  <blockquote>
-ÓйØÇ©Ãû±ê×¼¸²¸Ç»úÖƵÄÏêϸÐÅÏ¢£¬°üÀ¨¸Ã»úÖƽøÐи²¸Çʱ¿ÉÄÜÓõ½µÄƽ̨°üµÄÁÐ±í£¬Çë²Î¼û
-  </blockquote>
-
-  <blockquote>
-<a href=
-    "http://java.sun.com/javase/6/docs/technotes/guides/standards/">http://java.sun.com/javase/6/docs/technotes/guides/standards/</a>
-  </blockquote>
-  
-  <h2><a name="javadb" id="javadb"></a>Java DB</h2>
-  
-  <blockquote>
-  ·Ö·¢°ü Java DB£¬ËüÊÇ Sun Microsystems 
-  µÄ Apache Derby ´¿ Java Êý¾Ý¿â¼¼ÊõµÄ·Ö·¢¡£
-  ĬÈÏ°²×°Î»ÖÃΪ£º
-  
-  <ul>
-  <li>Solaris: <code>/opt/SUNWjavadb</code></li>
-  
-  <li>Linux: <code>/opt/sun/javadb</code></li>
-  
-  <li>Windows: <code>C:\Program Files\Sun\JavaDB</code></li>
-  </ul>
-  
-  <p>ÓÐ¹Ø Java DB ºÍ Derby µÄÐÅÏ¢£¨°üÀ¨Óû§ºÍ API Îĵµ¡¢Java DB 
-  µÄ¹¦ÄÜÒÔ¼°¸ü¶à×ÊÔ´£©£¬
-  Çë²Î¼ûÉÏÊöĿ¼ÖÐµÄ index.html Îļþ¡£</p>
-  </blockquote>
-  
-
-<h2><a name="webpages" id="webpages"></a>Web Ò³</h2>
-
-  <blockquote>
-ÓйØÏêϸÐÅÏ¢£¬Çë²ÎÔÄÍòάÍøÉϵÄÏÂÁÐ Sun Microsystems Ò³Ã棺
-  </blockquote>
-
-  <dl>
-    <dd>
-      <dl>
-<dt><a href="http://java.sun.com/">http://java.sun.com/</a></dt>
-
-<dd>Java Èí¼þ Web Õ¾µã£¬°üº¬ÓÐ¹Ø Java ¼¼Êõ¡¢²úÆ·ÐÅÏ¢¡¢ÐÂÎźÍÈí¼þÌØÐÔµÄ×îÐÂÐÅÏ¢¡£</dd>
-
-<dt><a href=
-        "http://java.sun.com/docs">http://java.sun.com/docs</a></dt>
-
-<dd>Java<sup><font size="-2">TM</font></sup> ƽ̨Îĵµ£¬°üº¬°×ƤÊé¡¢Java ½Ì³ÌÒÔ¼°ÆäËûÎĵµ¡£</dd>
-
-<dt><a href=
-        "http://developer.java.sun.com/">http://developer.java.sun.com</a></dt>
-
-<dd>¿ª·¢Õß·þÎñ Web Õ¾µã£¨ÐèÒª½øÐÐÃâ·Ñ×¢²á£©¡£ÆäËû¼¼ÊõÐÅÏ¢¡¢ÐÂÎźÍÈí¼þÌØÐÔ£»Óû§ÂÛ̳£»Ö§³ÖÐÅÏ¢µÈµÈ¡£</dd>
-
-<dt><a href=
-        "http://java.sun.com/products/">http://java.sun.com/products/</a></dt>
-
-<dd>Java ¼¼Êõ²úÆ·ºÍ API</dd>
-      </dl>
-    </dd>
-  </dl>
-  <hr>
-
-<p><font size="2">Java<sup><font size="-2">TM</font></sup> Development Kit (JDK<sup><font size="-2">TM</font></sup>) ÊÇ Sun Microsystems<sup><font size="-2">TM</font></sup>, Inc. µÄ²úÆ·¡£<br> <br> °æȨËùÓÐ (C) 2010 Sun Microsystems, Inc.<br> 4150 Network Circle, Santa Clara, California 95054, U.S.A.<br> ±£ÁôËùÓÐȨÀû¡£</font></p>
-<script type="text/javascript" language="JavaScript" src="/js/omi/jsc/s_code_remote.js">
-</script>
-</body>
-</html>
diff --git a/extra/source/jdk-6/THIRDPARTYLICENSEREADME.txt b/extra/source/jdk-6/THIRDPARTYLICENSEREADME.txt
index a84b0734..4381e7df 100644
--- a/extra/source/jdk-6/THIRDPARTYLICENSEREADME.txt
+++ b/extra/source/jdk-6/THIRDPARTYLICENSEREADME.txt
@@ -1,3482 +1 @@
-DO NOT TRANSLATE OR LOCALIZE.
-
-%% The following software may be included in this product:  CS CodeViewer v1.0;
-Use of any of this software is governed by the terms of the license below:
-Copyright 1999 by CoolServlets.com.
-
-Any errors or suggested improvements to this class can be reported as instructed
-on CoolServlets.com.  We hope you enjoy this program...  your comments will
-encourage further development!  This software is distributed under the terms of
-the BSD License.  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.  Neither name of
-CoolServlets.com 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 COOLSERVLETS.COM 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 AUTHOR 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 INANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-
-%% The following software may be included in this product:  Crimson v1.1.1 ; Use
-of any of this software is governed by the terms of the license below:
-
-/*
-* The Apache Software License, Version 1.1
-*
-*
-* Copyright (c) 1999-2000 The Apache Software Foundation. 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. The end-user documentation included with the redistribution,
-* if any, must include the following acknowledgment: 
-* "This product includes software developed by the
-* Apache Software Foundation (http://www.apache.org/)."
-* Alternately, this acknowledgment may appear in the software itself,
-* if and wherever such third-party acknowledgments normally appear.
-*
-* 4. The names "Crimson" and "Apache Software Foundation" must
-* not be used to endorse or promote products derived from this
-* software without prior written permission. For written 
-* permission, please contact apache@apache.org.
-*
-* 5. Products derived from this software may not be called "Apache",
-* nor may "Apache" appear in their name, without prior written
-* permission of the Apache Software Foundation.
-*
-* 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 APACHE SOFTWARE FOUNDATION OR
-* ITS 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 software consists of voluntary contributions made by many
-* individuals on behalf of the Apache Software Foundation and was
-* originally based on software copyright (c) 1999, International
-* Business Machines, Inc., http://www.ibm.com. For more
-* information on the Apache Software Foundation, please see
-* <http://www.apache.org/>.
-*/
-
-
-%% The following software may be included in this product:  Xalan J2; Use of any of this
-software is governed by the terms of the license below:
-
-                                Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and
-distribution as defined by Sections 1 through 9 of this document.  "Licensor"
-shall mean the copyright owner or entity authorized by the copyright owner that
-is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities
-that control, are controlled by, or are under common control with that entity.
-For the purposes of this definition, "control" means (i) the power, direct or
-indirect, to cause the direction or management of such entity, whether by
-contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
-outstanding shares, or (iii) beneficial ownership of such entity.  "You" (or
-"Your") shall mean an individual or Legal Entity exercising permissions granted
-by this License.
-
-"Source" form shall mean the preferred form for making modifications, including
-but not limited to software source code, documentation source, and configuration
-files.
-
-"Object" form shall mean any form resulting from mechanical transformation or
-translation of a Source form, including but not limited to compiled object code,
-generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form, made
-available under the License, as indicated by a copyright notice that is included
-in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that
-is based on (or derived from) the Work and for which the editorial revisions,
-annotations, elaborations, or other modifications represent, as a whole, an
-original work of authorship.  For the purposes of this License, Derivative Works
-shall not include works that remain separable from, or merely link (or bind by
-name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original version
-of the Work and any modifications or additions to that Work or Derivative Works
-thereof, that is intentionally submitted to Licensor for inclusion in the Work
-by the copyright owner or by an individual or Legal Entity authorized to submit
-on behalf of the copyright owner.  For the purposes of this definition,
-"submitted" means any form of electronic, verbal, or written communication sent
-to the Licensor or its representatives, including but not limited to
-communication on electronic mailing lists, source code control systems, and
-issue tracking systems that are managed by, or on behalf of, the Licensor for
-the purpose of discussing and improving the Work, but excluding communication
-that is conspicuously marked or otherwise designated in writing by the copyright
-owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
-of whom a Contribution has been received by Licensor and subsequently
-incorporated within the Work.
-
-2.  Grant of Copyright License.  Subject to the terms and conditions of this
-License, each Contributor hereby grants to You a perpetual, worldwide,
-non-exclusive, no-charge, royalty-free, irrevocable copyright license to
-reproduce, prepare Derivative Works of, publicly display, publicly perform,
-sublicense, and distribute the Work and such Derivative Works in Source or
-Object form.
-
-3.  Grant of Patent License.  Subject to the terms and conditions of this
-License, each Contributor hereby grants to You a perpetual, worldwide,
-non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this
-section) patent license to make, have made, use, offer to sell, sell, import,
-and otherwise transfer the Work, where such license applies only to those patent
-claims licensable by such Contributor that are necessarily infringed by their
-Contribution(s) alone or by combination of their Contribution(s) with the Work
-to which such Contribution(s) was submitted.  If You institute patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Work or a Contribution incorporated within the Work
-constitutes direct or contributory patent infringement, then any patent licenses
-granted to You under this License for that Work shall terminate as of the date
-such litigation is filed.
-
-4.  Redistribution.  You may reproduce and distribute copies of the Work or
-Derivative Works thereof in any medium, with or without modifications, and in
-Source or Object form, provided that You meet the following conditions:
-
-(a) You must give any other recipients of the Work or Derivative Works a copy of
-this License; and
-
-(b) You must cause any modified files to carry prominent notices stating that
-You changed the files; and
-
-(c) You must retain, in the Source form of any Derivative Works that You
-distribute, all copyright, patent, trademark, and attribution notices from the
-Source form of the Work, excluding those notices that do not pertain to any part
-of the Derivative Works; and
-
-(d) If the Work includes a "NOTICE" text file as part of its distribution, then
-any Derivative Works that You distribute must include a readable copy of the
-attribution notices contained within such NOTICE file, excluding those notices
-that do not pertain to any part of the Derivative Works, in at least one of the
-following places:  within a NOTICE text file distributed as part of the
-Derivative Works; within the Source form or documentation, if provided along
-with the Derivative Works; or, within a display generated by the Derivative
-Works, if and wherever such third-party notices normally appear.  The contents
-of the NOTICE file are for informational purposes only and do not modify the
-License.  You may add Your own attribution notices within Derivative Works that
-You distribute, alongside or as an addendum to the NOTICE text from the Work,
-provided that such additional attribution notices cannot be construed as
-modifying the License.
-
-You may add Your own copyright statement to Your modifications and may provide
-additional or different license terms and conditions for use, reproduction, or
-distribution of Your modifications, or for any such Derivative Works as a whole,
-provided Your use,reproduction, and distribution of the Work otherwise complies
-with the conditions stated in this License.
-
-5.  Submission of Contributions.  Unless You explicitly state otherwise, any
-Contribution intentionally submitted for inclusion in the Work by You to the
-Licensor shall be under the terms and conditions of this License, without any
-additional terms or conditions.  Notwithstanding the above, nothing herein shall
-supersede or modify the terms of any separate license agreement you may have
-executed with Licensor regarding such Contributions.
-
-6.  Trademarks.  This License does not grant permission to use the trade names,
-trademarks, service marks, or product names of the Licensor, except as required
-for reasonable and customary use in describing the origin of the Work and
-reproducing the content of the NOTICE file.
-
-7.  Disclaimer of Warranty.  Unless required by applicable law or agreed to in
-writing, Licensor provides the Work (and each Contributor provides its
-Contributions) 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.  You are solely responsible for determining the
-appropriateness of using or redistributing the Work and assume any risks
-associated with Your exercise of permissions under this License.
-
-8.  Limitation of Liability.  In no event and under no legal theory, whether in
-tort (including negligence), contract, or otherwise, unless required by
-applicable law (such as deliberate and grossly negligent acts) or agreed to in
-writing, shall any Contributor be liable to You for damages, including any
-direct, indirect, special, incidental, or consequential damages of any character
-arising as a result of this License or out of the use or inability to use the
-Work (including but not limited to damages for loss of goodwill, work stoppage,
-computer failure or malfunction, or any and all other commercial damages or
-losses), even if such Contributor has been advised of the possibility of such
-damages.
-
-9.  Accepting Warranty or Additional Liability.  While redistributing the Work
-or Derivative Works thereof, You may choose to offer,and charge a fee for,
-acceptance of support, warranty, indemnity, or other liability obligations
-and/or rights consistent with this License.  However, in accepting such
-obligations, You may act only on Your own behalf and on Your sole
-responsibility, not on behalf of any other Contributor, and only if You agree to
-indemnify, defend, and hold each Contributor harmless for any liability incurred
-by, or claims asserted against, such Contributor by reason of your accepting any
-such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-To apply the Apache License to your work, attach the following boilerplate
-notice, with the fields enclosed by brackets "[]" replaced with your own
-identifying information.  (Don't include the brackets!)  The text should be
-enclosed in the appropriate comment syntax for the file format.  We also
-recommend that a file or class name and description of purpose be included on
-the same "printed page" as the copyright notice for easier identification within
-third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License.  You may obtain a copy of the
-License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed
-under the License is distributed on an "AS IS" BASIS,WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations under the License.
-
-%% The following software may be included in this product:  NSIS 1.0j; Use of
-any of this software is governed by the terms of the license below:  
-Copyright (C) 1999-2000 Nullsoft, Inc.
-
-This software is provided 'as-is', without any express or implied warranty.  In
-no event will the authors be held liable for any damages arising from the use of
-this software.  Permission is granted to anyone to use this software for any
-purpose, including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1.  The origin of this software must not be misrepresented; you must not claim
-that you wrote the original software.  If you use this software in a product, an
-acknowledgment in the product documentation would be appreciated but is not
-required.
-
-2.  Altered source versions must be plainly marked as such, and must not be
-misrepresented as being the original software.
-
-3.  This notice may not be removed or altered from any source distribution.
-Justin Frankel justin@nullsoft.com"
-
-%% Some Portions licensed from IBM are available at: 
-http://www.ibm.com/software/globalization/icu/
-
-%% Portions Copyright Eastman Kodak Company 1992
-
-%% Lucida is a registered trademark or trademark of Bigelow & Holmes in the U.S.
-and other countries.
-
-%% Portions licensed from Taligent, Inc.
-
-%% The following software may be included in this product:IAIK PKCS Wrapper; Use
-of any of this software is governed by the terms of the license below:
-
-Copyright (c) 2002 Graz University of Technology.  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.  The end-user documentation included with the redistribution, if any, must
-include the following acknowledgment:
-
-   "This product includes software developed by IAIK of Graz University of Technology."
-
-Alternately, this acknowledgment may appear in the software itself, if and
-wherever such third-party acknowledgments normally appear.
-
-4.  The names "Graz University of Technology" and "IAIK of Graz University of
-Technology" must not be used to endorse or promote products derived from this
-software without prior written permission.
-
-5.  Products derived from this software may not be called "IAIK PKCS Wrapper",
-nor may "IAIK" appear in their name, without prior written permission of Graz
-University of Technology.
-
-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 LICENSOR
-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.
-
-%% The following software may be included in this product:  Document Object
-Model (DOM) v.  Level 3; Use of any of this software is governed by the terms of
-the license below:
-
-W3C SOFTWARE NOTICE AND LICENSE
-
-http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-This work (and included software, documentation such as READMEs, or other
-related items) is being provided by the copyright holders under the following
-license.  By obtaining, using and/or copying this work, you (the licensee) agree
-that you have read, understood, and will comply with the following terms and
-conditions.
-
-Permission to copy, modify, and distribute this software and its documentation,
-with or without modification, for any purpose and without fee or royalty is
-hereby granted, provided that you include the following on ALL copies of the
-software and documentation or portions thereof, including modifications:
-
-1.The full text of this NOTICE in a location viewable to users of the
-redistributed or derivative work.
-
-2.Any pre-existing intellectual property disclaimers, notices, or terms and
-  conditions.  If none exist, the W3C Software Short Notice should be included
-  (hypertext is preferred, text is permitted) within the body of any
-  redistributed or derivative code.
-
-3.Notice of any changes or modifications to the files, including the date
-  changes were made.  (We recommend you provide URIs to the location from which
-  the code is derived.)
-
-THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS
-MAKENO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE
-OR THAT THEUSE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD
-PARTY PATENTS,COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL
-ORCONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
-The name and trademarks of copyright holders may NOT be used in advertising or
-publicity pertaining to the software without specific, written prior permission.
-Title to copyright in this software and any associated documentation will at all
-times remain with copyright holders.
-
-____________________________________
-
-This formulation of W3C's notice and license became active on December 31 2002.
-This version removes the copyright ownership notice such that this license can
-be used with materials other than those owned by the W3C, reflects that ERCIM is
-now a host of the W3C, includes references to this specific dated version of the
-license, and removes the ambiguous grant of "use".  Otherwise, this version is
-the same as the previous version and is written so as to preserve the Free
-Software Foundation's assessment of GPL compatibility and OSI's certification
-under the Open Source Definition.  Please see our Copyright FAQ for common
-questions about using materials from our site, including specific terms and
-conditions for packages like libwww, Amaya, and Jigsaw.  Other questions about
-this notice can be directed to site-policy@w3.org.
-
-%% The following software may be included in this product:  Xalan, Xerces; Use
-of any of this software is governed by the terms of the license below:  /*
-
- * The Apache Software License, Version 1.1
- *
- *
- * Copyright (c) 1999-2003 The Apache Software Foundation.  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. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:  
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Xerces" and "Apache Software Foundation" must
- *    not be used to endorse or promote products derived from this
- *    software without prior written permission. For written 
- *    permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    nor may "Apache" appear in their name, without prior written
- *    permission of the Apache Software Foundation.
- *
- * 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 APACHE SOFTWARE FOUNDATION OR
- * ITS 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 software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation and was
- * originally based on software copyright (c) 1999, International
- * Business Machines, Inc., http://www.ibm.com.  For more
- * information on the Apache Software Foundation, please see http://www.apache.org
- * 
-
-%% The following software may be included in this product:  W3C XML Conformance
-Test Suites v.  20020606; Use of any of this software is governed by the terms
-of the license below:
-
-W3C SOFTWARE NOTICE AND LICENSE
-
-Copyright 1994-2002 World Wide Web Consortium, (Massachusetts Institute of
-Technology, Institut National de Recherche en Informatique et en
-Automatique,Keio University).  All Rights Reserved.
-http://www.w3.org/Consortium/Legal/
-
-This W3C work (including software, documents, or other related items) is being
-provided by the copyright holders under the following license.  By
-obtaining,using and/or copying this work, you (the licensee) agree that you have
-read,understood, and will comply with the following terms and conditions:
-
-Permission to use, copy, modify, and distribute this software and its
-documentation, with or without modification, for any purpose and without fee
-orroyalty is hereby granted, provided that you include the following on ALL
-copiesof the software and documentation or portions thereof, including
-modifications,that you make:
-
-1.  The full text of this NOTICE in a location viewable to users of the
-redistributed or derivative work.
-
-2.  Any pre-existing intellectual property disclaimers, notices, or terms and
-conditions.  If none exist, a short notice of the following form (hypertext is
-preferred, text is permitted) should be used within the body of any
-redistributed or derivative code:  "Copyright [$date-of-software] World Wide Web
-Consortium, (Massachusetts Institute of Technology, Institut National
-deRecherche en Informatique et en Automatique, Keio University).  All Rights
-Reserved.  http://www.w3.org/Consortium/Legal/"
-
-3.  Notice of any changes or modifications to the W3C files, including the date
-changes were made.  (We recommend you provide URIs to the location from which
-the code is derived.)
-
-THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS
-MAKENO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITEDTO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE
-OR THATTHE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD
-PARTYPATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL
-ORCONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
-
-The name and trademarks of copyright holders may NOT be used in advertising or
-publicity pertaining to the software without specific, written prior permission.
-Title to copyright in this software and any associated documentation will at all
-times remain with copyright holders.
-
-____________________________________
-
-This formulation of W3C's notice and license became active on August 14 1998
-soas to improve compatibility with GPL.  This version ensures that W3C software
-licensing terms are no more restrictive than GPL and consequently W3C software
-may be distributed in GPL packages.  See the older formulation for the policy
-prior to this date.  Please see our Copyright FAQ for common questions about
-using materials from our site, including specific terms and conditions for
-packages like libwww, Amaya, and Jigsaw.  Other questions about this notice can
-be directed to site-policy@w3.org.
-
-%% The following software may be included in this product:  W3C XML Schema Test
-Collection v.  1.16.2; Use of any of this software is governed by the terms of
-the license below:  W3C DOCUMENT NOTICE AND LICENSE
-
-Copyright 1994-2002 World Wide Web Consortium, (Massachusetts Institute of
-Technology, Institut National de Recherche en Informatique et en
-Automatique,Keio University).  All Rights Reserved.
-http://www.w3.org/Consortium/Legal/
-
-Public documents on the W3C site are provided by the copyright holders under the
-following license.  The software or Document Type Definitions (DTDs) associated
-with W3C specifications are governed by the Software Notice.  By using and/or
-copying this document, or the W3C document from which this statement is
-linked,you (the licensee) agree that you have read, understood, and will comply
-with the following terms and conditions:
-
-Permission to use, copy, and distribute the contents of this document, or theW3C
-document from which this statement is linked, in any medium for any purpose and
-without fee or royalty is hereby granted, provided that you include the
-following on ALL copies of the document, or portions thereof, that you use:
-
-1. A link or URL to the original W3C document.
- 
-2.  The pre-existing copyright notice of the original author, or if it doesn't
-exist, a notice of the form:  "Copyright [$date-of-document] World Wide
-WebConsortium, (Massachusetts Institute of Technology, Institut National
-deRecherche en Informatique et en Automatique, Keio University).  All Rights
-Reserved.  http://www.w3.org/Consortium/Legal/" (Hypertext is preferred, but
-atextual representation is permitted.)
-
-3. If it exists, the STATUS of the W3C document.
-
-When space permits, inclusion of the full text of this NOTICE should be
-provided.  We request that authorship attribution be provided in any
-software,documents, or other items or products that you create pursuant to the
-implementation of the contents of this document, or any portion thereof.
-
-No right to create modifications or derivatives of W3C documents is granted
-pursuant to this license.  However, if additional requirements (documented in
-the Copyright FAQ) are satisfied, the right to create modifications or
-derivatives is sometimes granted by the W3C to individuals complying with those
-requirements.  THIS DOCUMENT IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO
-REPRESENTATIONSOR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-WARRANTIES OFMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
-NON-INFRINGEMENT, OR TITLE;THAT THE CONTENTS OF THE DOCUMENT ARE SUITABLE FOR
-ANY PURPOSE; NOR THAT THEIMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY
-THIRD PARTY PATENTS,COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL
-ORCONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE DOCUMENT OR THE
-PERFORMANCEOR IMPLEMENTATION OF THE CONTENTS THEREOF.
-
-The name and trademarks of copyright holders may NOT be used in advertising or
-publicity pertaining to this document or its contents without specific, written
-prior permission.  Title to copyright in this document will at all times remain
-with copyright holders.
-
-----------------------------------------------------------------------------
-
-This formulation of W3C's notice and license became active on April 05 1999 soas
-to account for the treatment of DTDs, schema's and bindings.  See the older
-formulation for the policy prior to this date.  Please see our Copyright FAQ for
-common questions about using materials from our site, including specific terms
-and conditions for packages like libwww, Amaya, and Jigsaw.  Other questions
-about this notice can be directed to site-policy@w3.org.  webmaster (last
-updated by reagle on 1999/04/99.)
-
-
-%% The following software may be included in this product:  Mesa 3-D graphics
-library v.  5; Use of any of this software is governed by the terms of the
-license below:
-
-core Mesa code  include/GL/gl.h       Brian Paul          
-Mesa GLX driver      include/GL/glx.h      Brian Paul
-Mesa Ext registry    include/GL/glext.h    SGI
-SGI Free B           include/GL/glxext.h
-
-Mesa license:
-
-The Mesa distribution consists of several components.  Different copyrights and
-licenses apply to different components.  For example, GLUT is copyrighted by
-Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa device
-drivers are copyrighted by their authors.  See below for a list of Mesa's
-components and the copyright/license for each.
-
-The core Mesa library is licensed according to the terms of the XFree86copyright
-(an MIT-style license).  This allows integration with the XFree86/DRIproject.
-Unless otherwise stated, the Mesa source code and documentation is licensed as
-follows:
-
-Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"),to deal in the
-Software without restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense,and/or sell copies of the
-Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESSOR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALLBRIAN PAUL BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER INAN ACTION OF
-CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-SGI FREE SOFTWARE LICENSE B (Version 1.1 [02/22/2000]) 
-1. Definitions.
-
-1.1 "Additional Notice Provisions" means such additional provisions as appear in
-the Notice in Original Code under the heading "Additional Notice Provisions."
-
-1.2 "Covered Code" means the Original Code or Modifications, or any combination
-thereof.
-
-1.3 "Hardware" means any physical device that accepts input, processes input,
-stores the results of processing, and/or provides output.
-
-1.4 "Larger Work" means a work that combines Covered Code or portions thereof
-with code not governed by the terms of this License.
-
-1.5 "Licensable" means having the right to grant, to the maximum extent
-possible, whether at the time of the initial grant or subsequently acquired, any
-and all of the rights conveyed herein.
-
-1.6 "License" means this document.
-
-1.7 "Licensed Patents" means patent claims Licensable by SGI that are infringed
-by the use or sale of Original Code or any Modifications provided by SGI, or any
-combination thereof.
-
-1.8 "Modifications" means any addition to or deletion from the substance or
-structure of the Original Code or any previous Modifications.  When Covered Code
-is released as a series of files, a Modification is:  A.  Any addition to the
-contents of a file containing Original Code and/or addition to or deletion from
-the contents of a file containing previous Modifications.B.  Any new file that
-contains any part of the Original Code or previous Modifications.
-
-1.9 "Notice" means any notice in Original Code or Covered Code, as required by
-and in compliance with this License.
-
-1.10 "Original Code" means source code of computer software code that is
-described in the source code Notice required by Exhibit A as Original Code, and
-updates and error corrections specifically thereto.
-
-1.11 "Recipient" means an individual or a legal entity exercising rights under,
-and complying with all of the terms of, this License or a future version of this
-License issued under Section 8.  For legal entities, "Recipient" includes any
-entity that controls, is controlled by, or is under common control with
-Recipient.  For purposes of this definition, "control" of an entity means (a)
-the power, direct or indirect, to direct or manage such entity, or (b) ownership
-of fifty percent (50%) or more of the outstanding shares or beneficial ownership
-of such entity.
-
-1.12 "Recipient Patents" means patent claims Licensable by a Recipient that are
-infringed by the use or sale of Original Code or any Modifications provided by
-SGI, or any combination thereof.
-
-1.13 "SGI" means Silicon Graphics, Inc.
-
-1.14 "SGI Patents" means patent claims Licensable by SGI other than the Licensed
-Patents.
-
-2.  License Grant and Restrictions.
-
-2.1 SGI License Grant.  Subject to the terms of this License and any third party
-intellectual property claims, for the duration of intellectual property
-protections inherent in the Original Code, SGI hereby grants Recipient a
-worldwide, royalty-free, non-exclusive license, to do the following:  (i) under
-copyrights Licensable by SGI, to reproduce, distribute, create derivative works
-from, and, to the extent applicable, display and perform the Original Code
-and/or any Modifications provided by SGI alone and/or as part of a Larger Work;
-and (ii) under any Licensable Patents, to make, have made, use, sell, offer for
-sale, import and/or otherwise transfer the Original Code and/or any
-Modifications provided by SGI.  Recipient accepts the terms and conditions of
-this License by undertaking any of the aforementioned actions.  The patent
-license shall apply to the Covered Code if, at the time any related Modification
-is added, such addition of the Modification causes such combination to be
-covered by the Licensed Patents .  The patent license in Section 2.1(ii) shall
-not apply to any other combinations that include the Modification.  No patent
-license is provided under SGI Patents for infringements of SGI Patents by
-Modifications not provided by SGI or combinations of Original Code and
-Modifications not provided by SGI.
-
-2.2 Recipient License Grant.  Subject to the terms of this License and any third
-party intellectual property claims, Recipient hereby grants SGI and any other
-Recipients a worldwide, royalty-free, non-exclusive license, under any Recipient
-Patents, to make, have made, use, sell, offer for sale, import and/or otherwise
-transfer the Original Code and/or any Modifications provided by SGI.
-
-2.3 No License For Hardware Implementations.  The licenses granted in Section
-2.1 and 2.2 are not applicable to implementation in Hardware of the algorithms
-embodied in the Original Code or any Modifications provided by SGI .
-
-3. Redistributions. 
-
-3.1 Retention of Notice/Copy of License.  The Notice set forth in Exhibit A,
-below, must be conspicuously retained or included in any and all redistributions
-of Covered Code.  For distributions of the Covered Code in source code form, the
-Notice must appear in every file that can include a text comments field; in
-executable form, the Notice and a copy of this License must appear in related
-documentation or collateral where the Recipient's rights relating to Covered
-Code are described.  Any Additional Notice Provisions which actually appears in
-the Original Code must also be retained or included in any and all
-redistributions of Covered Code.
-
-3.2 Alternative License.  Provided that Recipient is in compliance with the
-terms of this License, Recipient may, so long as without derogation of any of
-SGI's rights in and to the Original Code, distribute the source code and/or
-executable version(s) of Covered Code under (1) this License; (2) a license
-identical to this License but for only such changes as are necessary in order to
-clarify Recipient's role as licensor of Modifications; and/or (3) a license of
-Recipient's choosing, containing terms different from this License, provided
-that the license terms include this Section 3 and Sections 4, 6, 7, 10, 12, and
-13, which terms may not be modified or superseded by any other terms of such
-license.  If Recipient elects to use any license other than this License,
-Recipient must make it absolutely clear that any of its terms which differ from
-this License are offered by Recipient alone, and not by SGI.  It is emphasized
-that this License is a limited license, and, regardless of the license form
-employed by Recipi ent in accordance with this Section 3.2, Recipient may
-relicense only such rights, in Original Code and Modifications by SGI, as it has
-actually been granted by SGI in this License.
-
-3.3 Indemnity.  Recipient hereby agrees to indemnify SGI for any liability
-incurred by SGI as a result of any such alternative license terms Recipient
-offers.
-
-4.  Termination.  This License and the rights granted hereunder will terminate
-automatically if Recipient breaches any term herein and fails to cure such
-breach within 30 days thereof.  Any sublicense to the Covered Code that is
-properly granted shall survive any termination of this License, absent
-termination by the terms of such sublicense.  Provisions that, by their nature,
-must remain in effect beyond the termination of this License, shall survive.
-
-5.  No Trademark Or Other Rights.  This License does not grant any rights to:
-(i) any software apart from the Covered Code, nor shall any other rights or
-licenses not expressly granted hereunder arise by implication, estoppel or
-otherwise with respect to the Covered Code; (ii) any trade name, trademark or
-service mark whatsoever, including without limitation any related right for
-purposes of endorsement or promotion of products derived from the Covered Code,
-without prior written permission of SGI; or (iii) any title to or ownership of
-the Original Code, which shall at all times remains with SGI.  All rights in the
-Original Code not expressly granted under this License are reserved.
-
-6.  Compliance with Laws; Non-Infringement.  There are various worldwide laws,
-regulations, and executive orders applicable to dispositions of Covered Code,
-including without limitation export, re-export, and import control laws,
-regulations, and executive orders, of the U.S.  government and other countries,
-and Recipient is reminded it is obliged to obey such laws, regulations, and
-executive orders.  Recipient may not distribute Covered Code that (i) in any way
-infringes (directly or contributorily) any intellectual property rights of any
-kind of any other person or entity or (ii) breaches any representation or
-warranty, express, implied or statutory, to which, under any applicable law, it
-might be deemed to have been subject.
-
-7.  Claims of Infringement.  If Recipient learns of any third party claim that
-any disposition of Covered Code and/or functionality wholly or partially
-infringes the third party's intellectual property rights, Recipient will
-promptly notify SGI of such claim.
-
-8.  Versions of the License.  SGI may publish revised and/or new versions of the
-License from time to time, each with a distinguishing version number.  Once
-Covered Code has been published under a particular version of the License,
-Recipient may, for the duration of the license, continue to use it under the
-terms of that version, or choose to use such Covered Code under the terms of any
-subsequent version published by SGI.  Subject to the provisions of Sections 3
-and 4 of this License, only SGI may modify the terms applicable to Covered Code
-created under this License.
-
-9.  DISCLAIMER OF WARRANTY.  COVERED CODE IS PROVIDED "AS IS."  ALL EXPRESS AND
-IMPLIED WARRANTIES AND CONDITIONS ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION,
-ANY IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
-FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  SGI ASSUMES NO RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE.  SHOULD THE SOFTWARE PROVE
-DEFECTIVE IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR SERVICING, REPAIR
-OR CORRECTION.  THIS DISCLAIMER OF WARRANTY IS AN ESSENTIAL PART OF THIS
-LICENSE.  NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT SUBJECT TO
-THIS DISCLAIMER.
-
-10.  LIMITATION OF LIABILITY.  UNDER NO CIRCUMSTANCES NOR LEGAL THEORY, WHETHER
-TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT LIABILITY), CONTRACT,
-OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING,
-WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, LOSS OF DATA,
-COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR
-LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH
-DAMAGES.  THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR
-PERSONAL INJURY RESULTING FROM SGI's NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-PROHIBITS SUCH LIMITATION.  SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR
-LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT EXCLUSION AND
-LIMITATION MAY NOT APPLY TO RECIPIENT.
-
-11.  Indemnity.  Recipient shall be solely responsible for damages arising,
-directly or indirectly, out of its utilization of rights under this License.
-Recipient will defend, indemnify and hold harmless Silicon Graphics, Inc.  from
-and against any loss, liability, damages, costs or expenses (including the
-payment of reasonable attorneys fees) arising out of Recipient's use,
-modification, reproduction and distribution of the Covered Code or out of any
-representation or warranty made by Recipient.
-
-12.  U.S.  Government End Users.  The Covered Code is a "commercial item"
-consisting of "commercial computer software" as such terms are defined in title
-48 of the Code of Federal Regulations and all U.S.  Government End Users acquire
-only the rights set forth in this License and are subject to the terms of this
-License.
-
-13.  Miscellaneous.  This License represents the complete agreement concerning
-the its subject matter.  If any provision of this License is held to be
-unenforceable, such provision shall be reformed so as to achieve as nearly as
-possible the same legal and economic effect as the original provision and the
-remainder of this License will remain in effect.  This License shall be governed
-by and construed in accordance with the laws of the United States and the State
-of California as applied to agreements entered into and to be performed entirely
-within California between California residents.  Any litigation relating to this
-License shall be subject to the exclusive jurisdiction of the Federal Courts of
-the Northern District of California (or, absent subject matter jurisdiction in
-such courts, the courts of the State of California), with venue lying
-exclusively in Santa Clara County, California, with the losing party responsible
-for costs, including without limitation, court costs and reasonable attorneys
-fees and ex penses.  The application of the United Nations Convention on
-Contracts for the International Sale of Goods is expressly excluded.  Any law or
-regulation that provides that the language of a contract shall be construed
-against the drafter shall not apply to this License.
-
-Exhibit A License Applicability.  Except to the extent portions of this file are
-made subject to an alternative license as permitted in the SGI Free Software
-License B, Version 1.1 (the "License"), the contents of this file are subject
-only to the provisions of the License.  You may not use this file except in
-compliance with the License.  You may obtain a copy of the License at Silicon
-Graphics, Inc., attn:  Legal Services, 1600 Amphitheatre Parkway, Mountain View,
-CA 94043-1351, or at:  http://oss.sgi.com/projects/FreeB Note that, as provided
-in the License, the Software is distributed on an "AS IS" basis, with ALL
-EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS DISCLAIMED, INCLUDING, WITHOUT
-LIMITATION, ANY IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY,
-SATISFACTORY QUALITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-Original Code.  The Original Code is:  [name of software, version number, and
-release date], developed by Silicon Graphics, Inc.  The Original Code is
-Copyright (c) [dates of first publication, as appearing in the Notice in the
-Original Code] Silicon Graphics, Inc.  Copyright in any portions created by
-third parties is as indicated elsewhere herein.  All Rights Reserved.
-Additional Notice Provisions:  [such additional provisions, if any, as appear in
-the Notice in the Original Code under the heading "Additional Notice
-Provisions"]
-
-%% The following software may be included in this product:  Byte Code
-Engineering Library (BCEL) v.  5; Use of any of this software is governed by the
-terms of the license below:
-
-Apache Software License 
-
-/
-====================================================================
-The Apache Software License, Version 1.1
-
-Copyright (c) 2001 The Apache Software Foundation.  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 providedwith the distribution.
-
-3.  The end-user documentation included with the redistribution, if any, must
-include the following acknowledgment:  "This product includes software developed
-by the Apache Software Foundation (http://www.apache.org/)."  Alternately, this
-acknowledgment may appear in the software itself, if and wherever such
-third-party acknowledgments normally appear.
-
-4.  The names "Apache" and "Apache Software Foundation"and "Apache BCEL" must
-not be used to endorse or promote products derived from this software without
-prior written permission.  For written permission, please contact
-apache@apache.org.
-
-5.  Products derived from this software may not be called"Apache", "Apache
-BCEL", nor may "Apache" appear in their name,without prior written permission of
-the Apache Software Foundation.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED ORIMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIEDWARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSEARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE
-SOFTWAREFOUNDATION OR ITS 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) HOWEVERCAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICTLIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING INANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THEPOSSIBILITY OF SUCH DAMAGE.
-====================================================================
-
-This software consists of voluntary contributions made by many individuals on
-behalf of the Apache Software Foundation.  For more information on the Apache
-Software Foundation, please see http://www.apache.org.  /
-
-
-
-%% The following software may be included in this product:  Regexp, Regular
-Expression Package v.  1.2; Use of any of this software is governed by the terms
-of the license below:  The Apache Software License, Version 1.1
-
-Copyright (c) 2001 The Apache Software Foundation.  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.  The end-user documentation included with the redistribution, if any, must
-include the following acknowledgment:  "This product includes software developed
-by the Apache Software Foundation (http://www.apache.org/)."  Alternately, this
-acknowledgment may appear in the software itself, if and wherever such
-third-party acknowledgments normally appear.
-
-4.  The names "Apache" and "Apache Software Foundation" and "Apache Turbine"
-must not be used to endorse or promote products derived from this software
-without prior written permission.  For written permission, please contact
-apache@apache.org.
-
-5.  Products derived from this software may not be called "Apache", "Apache
-Turbine", nor may "Apache" appear in their name, without prior written
-permission of the Apache Software Foundation.
-
-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 APACHE
-SOFTWARE FOUNDATION OR ITS 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 software consists of voluntary contributions made by many individuals on
-behalf of the Apache Software Foundation.  For more information on the Apache
-Software Foundation, please see http://www.apache.org.
-
-%% The following software may be included in this product:  CUP Parser Generator
-for Java v.  0.10k; Use of any of this software is governed by the terms of the
-license below:  CUP Parser Generator Copyright Notice, License, and Disclaimer
-
-Copyright 1996-1999 by Scott Hudson, Frank Flannery, C.  Scott Ananian
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted, provided that
-the above copyright notice appear in all copies and that both the copyright
-notice and this permission notice and warranty disclaimer appear in supporting
-documentation, and that the names of the authors or their employers not be used
-in advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.
-
-The authors and their employers disclaim all warranties with regard to this
-software, including all implied warranties of merchantability and fitness.  In
-no event shall the authors or their employers be liable for any special,
-indirect or consequential damages or any damages whatsoever resulting from loss
-of use, data or profits, whether in an action of contract,negligence or other
-tortious action, arising out of or in connection with the use or performance of
-this software.
-
-%% The following software may be included in this product:  JLex:  A Lexical
-Analyzer Generator for Java v.  1.2.5; Use of any of this software is governed
-by the terms of the license below:  JLEX COPYRIGHT NOTICE, LICENSE AND
-DISCLAIMER.
-
-Copyright 1996-2003 by Elliot Joel Berk and C.  Scott Ananian
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted, provided that
-the above copyright notice appear in all copies and that both the copyright
-notice and this permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of the authors or their employers not be used
-in advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.
-
-The authors and their employers disclaim all warranties with regard to this
-software, including all implied warranties of merchantability and fitness.  In
-no event shall the authors or their employers be liable for any special,
-indirect or consequential damages or any damages whatsoever resulting from loss
-of use, data or profits, whether in an action of contract, negligence or other
-tortious action, arising out of or in connection with the use or performance of
-this software.
-
-Java is a trademark of Sun Microsystems, Inc.  References to the Java
-programming language in relation to JLex are not meant to imply that Sun
-endorses this product.
-
-%% The following software may be included in this product:  SAX v.  2.0.1; Use
-of any of this software is governed by the terms of the license below:
-Copyright Status
-
-SAX is free!
-
-In fact, it's not possible to own a license to SAX, since it's been placed in
-the public domain.
-
-No Warranty
-
-Because SAX is released to the public domain, there is no warranty for the
-design or for the software implementation, to the extent permitted by applicable
-law.  Except when otherwise stated in writing the copyright holders and/or other
-parties provide SAX "as is" without warranty of any kind, either expressed or
-implied, including, but not limited to, the implied warranties of
-merchantability and fitness for a particular purpose.  The entire risk as to the
-quality and performance of SAX is with you.  Should SAX prove defective, you
-assume the cost of all necessary servicing, repair or correction.
-
-In no event unless required by applicable law or agreed to in writing will any
-copyright holder, or any other party who may modify and/or redistribute SAX, be
-liable to you for damages, including any general, special, incidental or
-consequential damages arising out of the use or inability to use SAX (including
-but not limited to loss of data or data being rendered inaccurate or losses
-sustained by you or third parties or a failure of the SAX to operate with any
-other programs), even if such holder or other party has been advised of the
-possibility of such damages.
-
-Copyright Disclaimers 
-
-This page includes statements to that effect by David Megginson, who would have
-been able to claim copyright for the original work.
-
-SAX 1.0
-
-Version 1.0 of the Simple API for XML (SAX), created collectively by the
-membership of the XML-DEV mailing list, is hereby released into the public
-domain.
-
-No one owns SAX:  you may use it freely in both commercial and non-commercial
-applications, bundle it with your software distribution, include it on a CD-ROM,
-list the source code in a book, mirror the documentation at your own web site,
-or use it in any other way you see fit.
-
-David Megginson, sax@megginson.com
-1998-05-11
-
-SAX 2.0 
-
-I hereby abandon any property rights to SAX 2.0 (the Simple API for XML), and
-release all of the SAX 2.0 source code, compiled code, and documentation
-contained in this distribution into the Public Domain.  SAX comes with NO
-WARRANTY or guarantee of fitness for any purpose.
-
-David Megginson, david@megginson.com
-2000-05-05
-
-%% The following software may be included in this product:  Cryptix; Use of any
-of this software is governed by the terms of the license below:
-
-Cryptix General License
-
-Copyright © 1995-2003 The Cryptix Foundation Limited. 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 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.  THIS SOFTWARE IS PROVIDED BY
-THE CRYPTIX FOUNDATION LIMITED AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS
-ORIMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FORA PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT
-SHALL THE CRYPTIX FOUNDATION LIMITED OR CONTRIBUTORS BELIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOTLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESSINTERRUPTION) 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 OFTHE POSSIBILITY OF SUCH DAMAGE.
-
-%% The following software may be included in this product:  W3C XML Schema Test
-Collection; Use of any of this software is governed by the terms of the license
-below:
-
-W3C DOCUMENT NOTICE AND LICENSE 
-
-Copyright 1994-2002 World Wide Web Consortium, (Massachusetts Institute of
-Technology, Institut National de Recherche en Informatique et en
-Automatique,Keio University).  All Rights Reserved.
-
-http://www.w3.org/Consortium/Legal/
-
-Public documents on the W3C site are provided by the copyright holders under the
-following license.  The software or Document Type Definitions (DTDs) associated
-with W3C specifications are governed by the Software Notice.  By using and/or
-copying this document, or the W3C document from which this statement is
-linked,you (the licensee) agree that you have read, understood, and will comply
-with the following terms and conditions:
-
-Permission to use, copy, and distribute the contents of this document, or theW3C
-document from which this statement is linked, in any medium for any purpose and
-without fee or royalty is hereby granted, provided that you include the
-following on ALL copies of the document, or portions thereof, that you use:
-
-1. A link or URL to the original W3C document.
-2.  The pre-existing copyright notice of the original author, or if it doesn't
-exist, a notice of the form:  "Copyright [$date-of-document] World Wide Web
-Consortium, (Massachusetts Institute of Technology, Institut National
-deRecherche en Informatique et en Automatique, Keio University).  All Rights
-Reserved.  http://www.w3.org/Consortium/Legal/" (Hypertext is preferred, but a
-textual representation is permitted.)
-3. If it exists, the STATUS of the W3C document.
-
-When space permits, inclusion of the full text of this NOTICE should be
-provided.  We request that authorship attribution be provided in any
-software,documents, or other items or products that you create pursuant to the
-implementation of the contents of this document, or any portion thereof.
-
-No right to create modifications or derivatives of W3C documents is granted
-pursuant to this license.  However, if additional requirements (documented in
-the Copyright FAQ) are satisfied, the right to create modifications or
-derivatives is sometimes granted by the W3C to individuals complying with those
-requirements.  
-
-THIS DOCUMENT IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO
-REPRESENTATIONSOR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-WARRANTIES OFMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
-NON-INFRINGEMENT, OR TITLE;THAT THE CONTENTS OF THE DOCUMENT ARE SUITABLE FOR
-ANY PURPOSE; NOR THAT THEIMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY
-THIRD PARTY PATENTS,COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL
-ORCONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE DOCUMENT OR THE
-PERFORMANCEOR IMPLEMENTATION OF THE CONTENTS THEREOF.
-
-The name and trademarks of copyright holders may NOT be used in advertising or
-publicity pertaining to this document or its contents without specific, written
-prior permission.  Title to copyright in this document will at all times remain
-with copyright holders.
-
-----------------------------------------------------------------------------
-
-This formulation of W3C's notice and license became active on April 05 1999 so
-as to account for the treatment of DTDs, schema's and bindings.  See the older
-formulation for the policy prior to this date.  Please see our Copyright FAQ for
-common questions about using materials from our site, including specific terms
-and conditions for packages like libwww, Amaya, and Jigsaw.  Other questions
-about this notice can be directed to site-policy@w3.org.  webmaster (last
-updated by reagle on 1999/04/99.)
-
-%% The following software may be included in this product:  Stax API; Use of any
-of this software is governed by the terms of the license below:
-
-Streaming API for XML (JSR-173) Specification
-Reference Implementation
-License Agreement
-
-READ THE TERMS OF THIS (THE "AGREEMENT") CAREFULLY BEFORE VIEWING OR USING
-THESOFTWARE LICENSED HEREUNDER.  BY VIEWING OR USING THE SOFTWARE, YOU AGREE TO
-THE TERMS OF THISAGREEMENT.  IF YOU ARE ACCESSING THE SOFTWARE ELECTRONICALLY,
-INDICATE YOUR ACCEPTANCE OF THESETERMS BY SELECTING THE "ACCEPT" BUTTON AT THE
-END OF THIS AGREEMENT.  IF YOU DO NOT AGREE TOALL THESE TERMS, PROMPTLY RETURN
-THE UNUSED SOFTWARE TO ORIGINAL CONTRIBUTOR, DEFINED HEREIN.
-
-1.0  DEFINITIONS.
-
-1.1.  "BEA" means BEA Systems, Inc., the licensor of the Original Code.
-
-1.2.  "Contributor" means BEA and each entity that creates or contributes to the
-creation of Modifications.
-
-1.3.  "Covered Code" means the Original Code or Modifications or the combination
-of the Original Code and Modifications, in each case including portions thereof
-and corresponding documentation released with the source code.
-
-1.4.  "Executable" means Covered Code in any form other than Source Code.
-
-1.5.  "FCS" means first commercial shipment of a product.
-
-1.6.  "Modifications" means any addition to or deletion from the substance or
-structure of either the Original Code or any previous Modifications.  When
-Covered Code is released as a series of files, a Modification is:
-
-(a) Any addition to or deletion from the contents of a file containing Original
-Code or previous Modifications.
-
-(b) Any new file that contains any part of the Original Code or previous
-Modifications.
-
-1.7.  "Original Code" means Source Code of computer software code Reference
-Implementation.
-
-1.8.  "Patent Claims" means any patent claim(s), now owned or hereafter
-acquired,including without limitation, method, process, and apparatus claims, in
-any patent for which the grantor has the right to grant a license.
-
-1.9.  "Reference Implementation" means the prototype or "proof of
-concept"implementation of the Specification developed and made available for
-license by or on behalf of BEA.
-
-1.10.  "Source Code" means the preferred form of the Covered Code for making
-modifications to it, including all modules it contains, plus any associated
-documentation,interface definition files, scripts used to control compilation
-and installation of an Executable, or source code differential comparisons
-against either the Original Code or another well known,available Covered Code of
-the Contributor's choice.
-
-1.11.  "Specification" means the written specification for the Streaming API for
-XML , Java technology developed pursuant to the Java Community Process.
-
-1.12.  "Technology Compatibility Kit" or "TCK" means the documentation, testing
-tools and test suites associated with the Specification as may be revised by BEA
-from time to time, that is provided so that an implementer of the Specification
-may determine if its implementation is compliant with the Specification.
-
-1.13.  "You" (or "Your") means an individual or a legal entity exercising rights
-under, and complying with all of the terms of, this Agreement or a future
-version of this Agreement issued under Section 6.1.  For legal entities, "You"
-includes any entity which controls,is controlled by, or is under common control
-with You.  For purposes of this definition,"control" means (a) the power, direct
-or indirect, to cause the direction or management of such entity, whether by
-contract or otherwise, or (b) ownership of more than fifty percent (50%) of the
-outstanding shares or beneficial ownership of such entity.
-
-2.0  SOURCE CODE LICENSE.
-
-2.1.  Copyright Grant.  Subject to the terms of this Agreement, each Contributor
-hereby grants You a non-exclusive, worldwide, royalty-free copyright license to
-reproduce,prepare derivative works of, publicly display, publicly perform,
-distribute and sublicense the Covered Code of such Contributor, if any, and such
-derivative works, in Source Code and Executable form.
-
-2.2.  Patent Grant.  Subject to the terms of this Agreement, each Contributor
-hereby grants You a non-exclusive, worldwide, royalty-free patent license under
-the Patent Claims to make, use, sell, offer to sell, import and otherwise
-transfer the Covered Code prepared and provided by such Contributor, if any, in
-Source Code and Executable form.  This patent license shall apply to the Covered
-Code if, at the time a Modification is added by the Contributor,such addition of
-the Modification causes such combination to be covered by the Patent Claims.
-The patent license shall not apply to any other combinations which include the
-Modification.
-
-2.3.  Conditions to Grants.  You understand that although each Contributor
-grants the licenses to the Covered Code prepared by it, no assurances are
-provided by any Contributor that the Covered Code does not infringe the patent
-or other intellectual property rights of any other entity.  Each Contributor
-disclaims any liability to You 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, You hereby assume sole
-responsibility to secure any other intellectual property rights needed, if any.
-For example, if a thirdparty patent license is required to allow You to
-distribute Covered Code, it is Your responsibility to acquire that license
-before distributing such code.
-
-2.4.  Contributors' Representation.  Each Contributor represents that to its
-knowledge it has sufficient copyright rights in the Covered Code it provides ,
-if any, to grant the copyright license set forth in this Agreement.
-
-3.0  DISTRIBUION RESTRICTIONS.
-
-3.1. Application of Agreement.
-
-The Modifications which You create or to which You contribute are governed by
-the terms of this Agreement, including without limitation Section 2.0.  The
-Source Code version of Covered Code may be distributed only under the terms of
-this Agreement or a future version of this Agreement released under Section 6.1,
-and You must include a copy of this Agreement with every copy of the Source Code
-You distribute.  You may not offer or impose any terms on any Source Code
-version that alters or restricts the applicable version of this Agreement or the
-recipients' rights hereunder.  However, You may include an additional document
-offering the additional rights described in Section 3.3.
-
-3.2.  Description of Modifications.
-
-You must cause all Covered Code to which You contribute to contain a file
-documenting the changes You made to create that Covered Code and the date of any
-change.  You must include a prominent statement that the Modification is
-derived, directly or indirectly, from Original Code provided by BEA and
-including the name of BEA in (a) the Source Code, and (b) in any notice in an
-Executable version or related documentation in which You describe the origin or
-ownership of the Covered Code.
-
-%% The following software may be included in this product:  X Window System; Use
-of any of this software is governed by the terms of the license below:
-Copyright The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that the
-above copyright notice appear in all copies and that both that copyright notice
-and this permission notice appear in supporting documentation.
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-ORIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESSFOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE OPEN
-GROUPBE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OFCONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
-THESOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be used
-in advertising or otherwise to promote the sale, use or other dealings in this
-Software without prior written authorization from The Open Group.
-
-Portions also covered by other licenses as noted in the above URL.
-
-%% The following software may be included in this product:  dom4j v.  1.6; Use
-of any of this software is governed by the terms of the license below:
-
-Redistribution and use of this software and associated documentation
-("Software"), with or without modification, are permitted provided that the
-following conditions are met:
-
-1.  Redistributions of source code must retain copyright statements and notices
-Redistributions must also contain a copy of this document.
-
-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.  The name "DOM4J" must not be used to endorse or promote products derived
-from this Software without prior written permission of MetaStuff, Ltd.  For
-written permission, please contact dom4j-info@metastuff.com.
-
-4.  Products derived from this Software may not be called "DOM4J" nor may"DOM4J"
-appear in their names without prior written permission of MetaStuff,Ltd.  DOM4J
-is a registered trademark of MetaStuff, Ltd.
-
-5.  Due credit should be given to the DOM4J Project - http://www.dom4j.org
-
-THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD.  AND CONTRIBUTORS ``AS IS'' AND
-ANYEXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIEDWARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-AREDISCLAIMED.  IN NO EVENT SHALL METASTUFF, LTD.  OR ITS CONTRIBUTORS BE LIABLE
-FORANY 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 ONANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-TORT(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THISSOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Copyright 2001-2005 (C) MetaStuff, Ltd.  All Rights Reserved.
-
-%% The following software may be included in this product:  Retroweaver; Use of
-any of this software is governed by the terms of the license below:
-
-Copyright (c) February 2004, Toby Reyelts All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list
-of conditions and the following disclaimer.  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.  Neither the name of Toby Reyelts nor the names of his
-contributors may be used to endorse or promote products derived from this
-software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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, STRICTLIABILITY, 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.
-
-%% The following software may be included in this product:  stripper; Use of any
-of this software is governed by the terms of the license below:
-
-Stripper :  debug information stripper Copyright (c) 2003 Kohsuke Kawaguchi 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.  Neither the name of the copyright holders 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
-
-%% The following software may be included in this product:  libpng official PNG
-reference library; Use of any of this software is governed by the terms of the
-license below:
-
-This copy of the libpng notices is provided for your convenience.  In case of
-any discrepancy between this copy and the notices in the file png.h that is
-included in the libpng distribution, the latter shall prevail.
-
-COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
-
-If you modify libpng you may insert additional notices immediately following
-this sentence.
-
-libpng version 1.2.6, December 3, 2004, is Copyright (c) 2004 Glenn
-   Randers-Pehrson, and is distributed according to the same disclaimer and
-   license as libpng-1.2.5with the following individual added to the list of
-   Contributing Authors Cosmin Truta
-
-libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are
-   Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are distributed according
-   to the same disclaimer and license as libpng-1.0.6 with the following
-   individuals added to the list of Contributing Authors Simon-Pierre Cadieux
-   Eric S.  Raymond Gilles Vollant
-
-and with the following additions to the disclaimer:
-
-There is no warranty against interference with your enjoyment of the library or
-against infringement.  There is no warranty that our efforts or the library will
-fulfill any of your particular purposes or needs.  This library is provided with
-all faults, and the entire risk of satisfactory quality, performance, accuracy,
-and effort is with the user.
-
-libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are Copyright
-   (c) 1998, 1999 Glenn Randers-Pehrson, and are distributed according to the
-   same disclaimer and license as libpng-0.96,with the following individuals
-   added to the list of Contributing Authors:  Tom Lane Glenn Randers-Pehrson
-   Willem van Schaik
-
-libpng versions 0.89, June 1996, through 0.96, May 1997, are Copyright (c) 1996,
-1997 Andreas Dilger Distributed according to the same disclaimer and license as
-libpng-0.88, with the following individuals added to the list of Contributing
-Authors:  John Bowler Kevin Bracey Sam Bushell Magnus Holmgren Greg Roelofs Tom
-Tanner
-
-libpng versions 0.5, May 1995, through 0.88, January 1996, are Copyright (c)
-1995, 1996 Guy Eric Schalnat, Group 42, Inc.
-
-For the purposes of this copyright and license, "Contributing Authors"is defined
-as the following set of individuals:
-
-   Andreas Dilger
-   Dave Martindale
-   Guy Eric Schalnat
-   Paul Schmidt
-   Tim Wegner
-
-The PNG Reference Library is supplied "AS IS".  The Contributing Authors and
-Group 42, Inc.  disclaim all warranties, expressed or implied, including,
-without limitation, the warranties of merchantability and of fitness for any
-purpose.  The Contributing Authors and Group 42, Inc.  assume no liability for
-direct, indirect, incidental, special, exemplary,or consequential damages, which
-may result from the use of the PNG Reference Library, even if advised of the
-possibility of such damage.
-
-Permission is hereby granted to use, copy, modify, and distribute this source
-code, or portions hereof, for any purpose, without fee, subject to the following
-restrictions:
-
-1.  The origin of this source code must not be misrepresented.
-
-2.  Altered versions must be plainly marked as such and must not be
-misrepresented as being the original source.
-
-3.  This Copyright notice may not be removed or altered from any source or
-altered source distribution.
-
-The Contributing Authors and Group 42, Inc.  specifically permit, without fee,
-and encourage the use of this source code as a component to supporting the PNG
-file format in commercial products.  If you use this source code in a product,
-acknowledgment is not required but would be appreciated.
-
-
-A "png_get_copyright" function is available, for convenient use in "about"boxes
-and the like:
-
-   printf("%s",png_get_copyright(NULL));
-
-Also, the PNG logo (in PNG format, of course) is supplied in the files
-"pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
-
-Libpng is OSI Certified Open Source Software.  OSI Certified Open Source is a
-certification mark of the Open Source Initiative.
-
-Glenn Randers-Pehrson
-glennrp at users.sourceforge.net
-December 3, 2004
-
-%% The following software may be included in this product:  Libungif - An
-uncompressed GIF library; Use of any of this software is governed by the terms
-of the license below:  
-The GIFLIB distribution is Copyright (c) 1997 Eric S.Raymond
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-ORIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY,FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO
-EVENT SHALL THEAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHERLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM,OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-INTHE SOFTWARE.
-
-
-%% The following software may be included in this product:  Ant; Use of any of
-this software is governed by the terms of the license below:  License The Apache
-Software License Version 2.0
-
-The Apache Software License Version 2.0 applies to all releases of Ant starting
-with ant 1.6.1
-
-/*
- *                                 Apache License
- *                           Version 2.0, January 2004
- *                        http://www.apache.org/licenses/
- *
- *   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- *
- *   1. Definitions.
- *
- *      "License" shall mean the terms and conditions for use, reproduction,
- *      and distribution as defined by Sections 1 through 9 of this document. 
- *
- *      "Licensor" shall mean the copyright owner or entity authorized by
- *      the copyright owner that is granting the License.
- *
- *      "Legal Entity" shall mean the union of the acting entity and all
- *      other entities that control, are controlled by, or are under common
- *      control with that entity. For the purposes of this definition,
- *      "control" means (i) the power, direct or indirect, to cause the
- *      direction or management of such entity, whether by contract or
- *      otherwise, or (ii) ownership of fifty percent (50%) or more of the
- *      outstanding shares, or (iii) beneficial ownership of such entity.
- *
- *      "You" (or "Your") shall mean an individual or Legal Entity
- *      exercising permissions granted by this License.
- *
- *      "Source" form shall mean the preferred form for making modifications,
- *      including but not limited to software source code, documentation
- *      source, and configuration files.
- *
- *      "Object" form shall mean any form resulting from mechanical
- *      transformation or translation of a Source form, including but
- *      not limited to compiled object code, generated documentation,
- *      and conversions to other media types.
- *
- *      "Work" shall mean the work of authorship, whether in Source or
- *      Object form, made available under the License, as indicated by a
- *      copyright notice that is included in or attached to the work
- *      (an example is provided in the Appendix below).
- *
- *      "Derivative Works" shall mean any work, whether in Source or Object
- *      form, that is based on (or derived from) the Work and for which the
- *      editorial revisions, annotations, elaborations, or other modifications
- *      represent, as a whole, an original work of authorship. For the purposes
- *      of this License, Derivative Works shall not include works that remain
- *      separable from, or merely link (or bind by name) to the interfaces of,
- *      the Work and Derivative Works thereof.
- *
- *      "Contribution" shall mean any work of authorship, including
- *      the original version of the Work and any modifications or additions
- *      to that Work or Derivative Works thereof, that is intentionally
- *      submitted to Licensor for inclusion in the Work by the copyright owner
- *      or by an individual or Legal Entity authorized to submit on behalf of
- *      the copyright owner. For the purposes of this definition, "submitted"
- *      means any form of electronic, verbal, or written communication sent
- *      to the Licensor or its representatives, including but not limited to
- *      communication on electronic mailing lists, source code control systems,
- *      and issue tracking systems that are managed by, or on behalf of, the
- *      Licensor for the purpose of discussing and improving the Work, but
- *      excluding communication that is conspicuously marked or otherwise
- *      designated in writing by the copyright owner as "Not a Contribution."
- *
- *      "Contributor" shall mean Licensor and any individual or Legal Entity
- *      on behalf of whom a Contribution has been received by Licensor and
- *      subsequently incorporated within the Work.
- *
- *   2. Grant of Copyright License. Subject to the terms and conditions of
- *      this License, each Contributor hereby grants to You a perpetual,
- *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- *      copyright license to reproduce, prepare Derivative Works of,
- *      publicly display, publicly perform, sublicense, and distribute the
- *      Work and such Derivative Works in Source or Object form.
- *
- *   3. Grant of Patent License. Subject to the terms and conditions of
- *      this License, each Contributor hereby grants to You a perpetual,
- *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- *      (except as stated in this section) patent license to make, have made,
- *      use, offer to sell, sell, import, and otherwise transfer the Work,
- *      where such license applies only to those patent claims licensable
- *      by such Contributor that are necessarily infringed by their
- *      Contribution(s) alone or by combination of their Contribution(s)
- *      with the Work to which such Contribution(s) was submitted. If You
- *      institute patent litigation against any entity (including a
- *      cross-claim or counterclaim in a lawsuit) alleging that the Work
- *      or a Contribution incorporated within the Work constitutes direct
- *      or contributory patent infringement, then any patent licenses
- *      granted to You under this License for that Work shall terminate
- *      as of the date such litigation is filed.
- *
- *   4. Redistribution. You may reproduce and distribute copies of the
- *      Work or Derivative Works thereof in any medium, with or without
- *      modifications, and in Source or Object form, provided that You
- *      meet the following conditions:
- *
- *      (a) You must give any other recipients of the Work or
- *          Derivative Works a copy of this License; and
- *
- *      (b) You must cause any modified files to carry prominent notices
- *          stating that You changed the files; and
- *
- *      (c) You must retain, in the Source form of any Derivative Works
- *          that You distribute, all copyright, patent, trademark, and
- *          attribution notices from the Source form of the Work,
- *          excluding those notices that do not pertain to any part of
- *          the Derivative Works; and
- *
- *      (d) If the Work includes a "NOTICE" text file as part of its
- *          distribution, then any Derivative Works that You distribute must
- *          include a readable copy of the attribution notices contained
- *          within such NOTICE file, excluding those notices that do not
- *          pertain to any part of the Derivative Works, in at least one
- *          of the following places: within a NOTICE text file distributed
- *          as part of the Derivative Works; within the Source form or
- *          documentation, if provided along with the Derivative Works; or,
- *          within a display generated by the Derivative Works, if and
- *          wherever such third-party notices normally appear. The contents
- *          of the NOTICE file are for informational purposes only and
- *          do not modify the License. You may add Your own attribution
- *          notices within Derivative Works that You distribute, alongside
- *          or as an addendum to the NOTICE text from the Work, provided
- *          that such additional attribution notices cannot be construed
- *          as modifying the License.
- *
- *      You may add Your own copyright statement to Your modifications and
- *      may provide additional or different license terms and conditions
- *      for use, reproduction, or distribution of Your modifications, or
- *      for any such Derivative Works as a whole, provided Your use,
- *      reproduction, and distribution of the Work otherwise complies with
- *      the conditions stated in this License.
- *
- *   5. Submission of Contributions. Unless You explicitly state otherwise,
- *      any Contribution intentionally submitted for inclusion in the Work
- *      by You to the Licensor shall be under the terms and conditions of
- *      this License, without any additional terms or conditions.
- *      Notwithstanding the above, nothing herein shall supersede or modify
- *      the terms of any separate license agreement you may have executed
- *      with Licensor regarding such Contributions.
- *
- *   6. Trademarks. This License does not grant permission to use the trade
- *      names, trademarks, service marks, or product names of the Licensor,
- *      except as required for reasonable and customary use in describing the
- *      origin of the Work and reproducing the content of the NOTICE file.
- *
- *   7. Disclaimer of Warranty. Unless required by applicable law or
- *      agreed to in writing, Licensor provides the Work (and each
- *      Contributor provides its Contributions) 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. You are solely responsible for determining the
- *      appropriateness of using or redistributing the Work and assume any
- *      risks associated with Your exercise of permissions under this License.
- *
- *   8. Limitation of Liability. In no event and under no legal theory,
- *      whether in tort (including negligence), contract, or otherwise,
- *      unless required by applicable law (such as deliberate and grossly
- *      negligent acts) or agreed to in writing, shall any Contributor be
- *      liable to You for damages, including any direct, indirect, special,
- *      incidental, or consequential damages of any character arising as a
- *      result of this License or out of the use or inability to use the
- *      Work (including but not limited to damages for loss of goodwill,
- *      work stoppage, computer failure or malfunction, or any and all
- *      other commercial damages or losses), even if such Contributor
- *      has been advised of the possibility of such damages.
- *
- *   9. Accepting Warranty or Additional Liability. While redistributing
- *      the Work or Derivative Works thereof, You may choose to offer,
- *      and charge a fee for, acceptance of support, warranty, indemnity,
- *      or other liability obligations and/or rights consistent with this
- *      License. However, in accepting such obligations, You may act only
- *      on Your own behalf and on Your sole responsibility, not on behalf
- *      of any other Contributor, and only if You agree to indemnify,
- *      defend, and hold each Contributor harmless for any liability
- *      incurred by, or claims asserted against, such Contributor by reason
- *      of your accepting any such warranty or additional liability.
- *
- *   END OF TERMS AND CONDITIONS
- *
- *   APPENDIX: How to apply the Apache License to your work.
- *
- *      To apply the Apache License to your work, attach the following
- *      boilerplate notice, with the fields enclosed by brackets "[]"
- *      replaced with your own identifying information. (Don't include
- *      the brackets!)  The text should be enclosed in the appropriate
- *      comment syntax for the file format. We also recommend that a
- *      file or class name and description of purpose be included on the
- *      same "printed page" as the copyright notice for easier
- *      identification within third-party archives.
- *
- *   Copyright [yyyy] Apache Software Foundation
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- */
-    
-
-You can download the original license file here.
-
-The License is accompanied by a NOTICE
-
-   =========================================================================
-   ==  NOTICE file corresponding to the section 4 d of                    ==
-   ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache Ant distribution.                      ==
-   =========================================================================
-   This product includes software developed by
-   The Apache Software Foundation (http://www.apache.org/).
-
-This product includes also software developed by :  - the W3C consortium
-  (http://www.w3c.org) , - the SAX project (http://www.saxproject.org)
-
-Please read the different LICENSE files present in the root directory of this
-distribution.
-
-The names "Ant" and "Apache Software Foundation" must not be used to endorse or
-promote products derived from this software without prior written permission.
-For written permission, please contact apache@apache.org.
-
-The Apache Software License, Version 1.1
-
-The Apache Software License, Version 1.1, applies to all versions of up to
-ant1.6.0 included.
-
-/*
- * ============================================================================
- *                   The Apache Software License, Version 1.1
- * ============================================================================
- * 
- *    Copyright (C) 2000-2003 The Apache Software Foundation. All
- *    rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modifica-
- * tion, 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. The end-user documentation included with the redistribution, if any, must
- *    include  the following  acknowledgment:  "This product includes  software
- *    developed  by the  Apache Software Foundation  (http://www.apache.org/)."
- *    Alternately, this  acknowledgment may  appear in the software itself,  if
- *    and wherever such third-party acknowledgments normally appear.
- * 
- * 4. The names "Ant" and  "Apache Software Foundation"  must not be used to
- *    endorse  or promote  products derived  from this  software without  prior
- *    written permission. For written permission, please contact
- *    apache@apache.org.
- * 
- * 5. Products  derived from this software may not  be called "Apache", nor may
- *    "Apache" appear  in their name,  without prior written permission  of the
- *    Apache Software Foundation.
- * 
- * 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
- * APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
- * DING, 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 software  consists of voluntary contributions made  by many individuals
- * on behalf of the  Apache Software Foundation.  For more  information  on the
- * Apache Software Foundation, please see http://www.apache.org.
- *
- */
-
-
-%% The following software may be included in this product:  XML Resolver
-library; Use of any of this software is governed by the terms of the license
-below:
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-    1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction, 
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by the 
-      copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all other 
-      entities that control, are controlled by, or are under common control 
-      with that entity. For the purposes of this definition, "control" means 
-      (i) the power, direct or indirect, to cause the direction or management 
-      of such entity, whether by contract or otherwise, or (ii) ownership of 
-      fifty percent (50%) or more of the outstanding shares, or 
-      (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity exercising 
-      permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications, 
-      including but not limited to software source code, documentation source, 
-      and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical transformation
-       or translation of a Source form, including but not limited to compiled 
-       object code, generated documentation, and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or Object 
-      form, made available under the License, as indicated by a copyright 
-      notice that is included in or attached to the work (an example is 
-      provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object 
-      form, that is based on (or derived from) the Work and for which the 
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces 
-      of, the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including the original 
-      version of the Work and any modifications or additions to that Work or 
-      Derivative Works thereof, that is intentionally submitted to Licensor 
-      for inclusion in the Work by the copyright owner or by an individual 
-      or Legal Entity authorized to submit on behalf of the copyright owner. 
-      For the purposes of this definition, "submitted" means any form of 
-      electronic, verbal, or written communication sent to the Licensor or 
-      its representatives, including but not limited to communication on 
-      electronic mailing lists, source code control systems, and issue 
-      tracking systems that are managed by, or on behalf of, the Licensor 
-      for the purpose of discussing and improving the Work, but excluding 
-      communication that is conspicuously marked or otherwise designated 
-      in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity 
-      on behalf of whom a Contribution has been received by Licensor and 
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of 
-      this License, each Contributor hereby grants to You a perpetual, 
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright 
-      license to reproduce, prepare Derivative Works of, publicly display, 
-      publicly perform, sublicense, and distribute the Work and such 
-      Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of this 
-      License, each Contributor hereby grants to You a perpetual, worldwide, 
-      non-exclusive, no-charge, royalty-free, irrevocable (except as stated 
-      in this section) patent license to make, have made, use, offer to sell,
-      sell, import, and otherwise transfer the Work,  where such license 
-      applies only to those patent claims licensable by such Contributor 
-      that are necessarily infringed by their  Contribution(s) alone or by 
-      combination of their Contribution(s) with the Work to which such 
-      Contribution(s) was submitted. If You institute patent litigation 
-      against any entity (including a cross-claim or counterclaim in a 
-      lawsuit) alleging that the Work or a Contribution incorporated within 
-      the Work constitutes direct or contributory patent infringement, then 
-      any patent licenses granted to You under this License for that Work 
-      shall terminate as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the Work 
-      or Derivative Works thereof in any medium, with or without modifications,
-      and in Source or Object form, provided that You meet the following
-      conditions:
-
-      (a) You must give any other recipients of the Work or Derivative Works 
-      a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices 
-      stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works that 
-      You distribute, all copyright, patent, trademark, and attribution notices 
-      from the Source form of the Work, excluding those notices that do not 
-      pertain to any part of the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its distribution,
-      then any Derivative Works that You distribute must include a readable copy
-      of the attribution notices contained within such NOTICE file, excluding 
-      those notices that do not pertain to any part of the Derivative Works, in 
-      at least one of the following places: within a NOTICE text file distributed 
-      as part of the Derivative Works; within the Source form or documentation, 
-      if provided along with the Derivative Works; or, within a display generated 
-      by the Derivative Works, if and wherever such third-party notices normally 
-      appear. The contents of the NOTICE file are for informational purposes only 
-      and do not modify the License. You may add Your own attribution notices 
-      within Derivative Works that You distribute, alongside or as an addendum to 
-      the NOTICE text from the Work, provided that such additional attribution 
-      notices cannot be construed as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and may provide
-      additional or different license terms and conditions for use, reproduction, 
-      or distribution of Your modifications, or for any such Derivative Works as a
-      whole, provided Your use, reproduction, and distribution of the Work otherwise 
-      complies with the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise, any 
-      Contribution intentionally submitted for inclusion in the Work by You to 
-      the Licensor shall be under the terms and conditions of this License, without 
-      any additional terms or conditions. Notwithstanding the above, nothing herein 
-      shall supersede or modify the terms of any separate license agreement you may 
-      have executed with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade names, 
-      trademarks, service marks, or product names of the Licensor, except as required 
-      for reasonable and customary use in describing the origin of the Work and 
-      reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or agreed to in 
-      writing, Licensor provides the Work (and each Contributor provides its 
-      Contributions) 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. You are solely responsible for determining 
-      the appropriateness of using or redistributing the Work and assume any 
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory, whether 
-      in tort (including negligence), contract, or otherwise, unless required by 
-      applicable law (such as deliberate and grossly negligent acts) or agreed to 
-      in writing, shall any Contributor be liable to You for damages, including 
-      any direct, indirect, special, incidental, or consequential damages of any 
-      character arising as a result of this License or out of the use or inability 
-      to use the Work (including but not limited to damages for loss of goodwill, 
-      work stoppage, computer failure or malfunction, or any and all other 
-      commercial damages or losses), even if such Contributor has been advised 
-      of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing the Work 
-      or Derivative Works thereof, You may choose to offer, and charge a fee for, 
-      acceptance of support, warranty, indemnity, or other liability obligations 
-      and/or rights consistent with this License. However, in accepting such 
-      obligations, You may act only on Your own behalf and on Your sole 
-      responsibility, not on behalf of any other Contributor, and only if You 
-      agree to indemnify, defend, and hold each Contributor harmless for any 
-      liability incurred by, or claims asserted against, such Contributor by 
-      reason of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following boilerplate notice, 
-   with the fields enclosed by brackets "[]" replaced with your own identifying 
-   information. (Don't include the brackets!)  The text should be enclosed in the 
-   appropriate comment syntax for the file format. We also recommend that a file 
-   or class name and description of purpose be included on the same "printed page" 
-   as the copyright notice for easier identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License"); you may not use 
-   this file except in compliance with the License. You may obtain a copy of the 
-   License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software distributed 
-   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-   CONDITIONS OF ANY KIND, either express or implied.   See the License for the 
-   specific language governing permissions and limitations under the License.
-
-
-%% The following software may be included in this product:  ICU4J; Use of any of
-this software is governed by the terms of the license below:
-
-ICU License - ICU 1.8.1 and later COPYRIGHT AND PERMISSION NOTICE Copyright (c)
-
-1995-2003 International Business Machines Corporation and others All rights
- reserved Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the "Software"), to
- deal in the Software without restriction, including without limitation the
- rights to use, copy, modify, merge, publish, distribute, and/or sell copies of
- the Software, and to permit persons to whom the Software is furnished to do
- so,provided that the above copyright notice(s) and this permission notice
- appear in all copies of the Software and that both the above copyright
- notice(s) and this permission notice appear in supporting documentation.  THE
- SOFTWARE IS PROVIDED"AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- INCLUDING BUT NOTLIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- PARTICULAR PURPOSEAND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO EVENT SHALL
- THE COPYRIGHTHOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM,
- OR ANYSPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER
- RESULTINGFROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- NEGLIGENCEOR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
- USE ORPERFORMANCE OF THIS SOFTWARE.  Except as contained in this notice, the
- name of a copyright holder shall not be used in advertising or otherwise to
- promote the sale, use or other dealings in this Software without prior written
- authorization of the copyright holder.
-
-
-%% The following software may be included in this product:  NekoHTML; Use of any
-of this software is governed by the terms of the license below:  The CyberNeko
-Software License, Version 1.0
-
-
-(C) Copyright 2002,2003, Andy Clark.  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. The end-user documentation included with the redistribution,
-   if any, must include the following acknowledgment:  
-     "This product includes software developed by Andy Clark."
-   Alternately, this acknowledgment may appear in the software itself,
-   if and wherever such third-party acknowledgments normally appear.
-
-4. The names "CyberNeko" and "NekoHTML" must not be used to endorse
-   or promote products derived from this software without prior 
-   written permission. For written permission, please contact 
-   andy@cyberneko.net.
-
-5. Products derived from this software may not be called "CyberNeko",
-   nor may "CyberNeko" appear in their name, without prior written
-   permission of the author.
-
-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 AUTHOR
-OR OTHER 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 license is based on the Apache Software License, version 1.1
-
-
-%% The following software may be included in this product:  Jing; Use of any of
-this software is governed by the terms of the license below:  Jing Copying
-Conditions
-
-Copyright (c) 2001-2003 Thai Open Source Software Center Ltd All rights
-reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification,are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * 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.
-    * Neither the name of the Thai Open Source Software Center Ltd 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 COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-ANDANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIEDWARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-AREDISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
-ANYDIRECT, 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 ONANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-TORT(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THISSOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-%% The following software may be included in this product:  RelaxNGCC; Use of
-any of this software is governed by the terms of the license below:
-
-Copyright (c) 2000-2003 Daisuke Okajima and Kohsuke Kawaguchi.
-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. The end-user documentation included with the redistribution, if
-any, must include the following acknowledgment:
-
-    "This product includes software developed by Daisuke Okajima
-    and Kohsuke Kawaguchi (http://relaxngcc.sf.net/)."
-
-Alternately, this acknowledgment may appear in the software itself,
-if and wherever such third-party acknowledgments normally appear.
-
-4. The names of the copyright holders must not be used to endorse or
-promote products derived from this software without prior written
-permission. For written permission, please contact the copyright
-holders.
-
-5. Products derived from this software may not be called "RELAXNGCC",
-nor may "RELAXNGCC" appear in their name, without prior written
-permission of the copyright holders.
-
-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 APACHE
-SOFTWARE FOUNDATION OR ITS 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.
-
-%% The following software may be included in this product:  RELAX NG Object
-Model/Parser; Use of any of this software is governed by the terms of the
-license below:  The MIT License
-
-Copyright (c)  
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do
-so,subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-ORIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESSFOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS ORCOPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHERIN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-INCONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-%% The following software may be included in this product:  XFree86-VidMode
-Extension; Use of any of this software is governed by the terms of the license
-below:  Version 1.1 of Project Licence.
-
-    Copyright (C) 1994-2004 The Project, Inc.    All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicence, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do
-so,subject to the following conditions:
-
-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, and in the same place and form
-as other copyright, license and disclaimer information.  
-
-3.  The end-user documentation included with the redistribution, if any,must
-include the following acknowledgment:  "This product includes software developed
-by The XFree86 Project, Inc (http://www.xfree86.org/) and its contributors", in
-the same place and form as other third-party acknowledgments.  Alternately, this
-acknowledgment may appear in the software itself, in the same form and location
-as other such third-party acknowledgments.
-
-4.  Except as contained in this notice, the name of The XFree86 Project,Inc
-shall not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from TheXFree86
-Project, Inc.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-WARRANTIES,INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY ANDFITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT
-SHALL THE XFREE86PROJECT, INC OR ITS 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; ORBUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER INCONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISINGIN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITYOF SUCH DAMAGE.
-
-
-%% The following software may be included in this product:  RelaxNGCC; Use of
-any of this software is governed by the terms of the license below:  This is
-version 2003-May-08 of the Info-ZIP copyright and license.  The definitive
-version of this document should be available at
-ftp://ftp.info-zip.org/pub/infozip/license.html indefinitely.
-
-
-Copyright (c) 1990-2003 Info-ZIP.  All rights reserved.
-
-For the purposes of this copyright and license, "Info-ZIP" is defined asthe
-following set of individuals:
-
-   Mark Adler, John Bush, Karl Davis, Harald Denker, Jean-Michel Dubois, Jean-loup
-   Gailly, Hunter Goatley, Ian Gorman, Chris Herborth, Dirk Haase, Greg Hartwig,
-   Robert Heath, Jonathan Hudson, Paul Kienitz, David Kirschbaum, Johnny Lee,
-   Onno van der Linden, Igor Mandrichenko, Steve P.  Miller, Sergio Monesi,
-   Keith Owens, George Petrov, Greg Roelofs, Kai Uwe Rommel, Steve Salisbury,
-   Dave Smith, Christian Spieler, Antoine Verheijen, Paul von Behren, Rich
-   Wales, Mike White
-
-This software is provided "as is," without warranty of any kind, express or
-implied.  In no event shall Info-ZIP or its contributors be held liable for any
-direct, indirect, incidental, special or consequential damages arising out of
-the use of or inability to use this software.
-
-Permission is granted to anyone to use this software for any purpose, including
-commercial applications, and to alter it and redistribute it freely, subject to
-the following restrictions:
-
-1.  Redistributions of source code must retain the above copyright notice,
-definition, disclaimer, and this list of conditions.
-
-2.  Redistributions in binary form (compiled executables) must reproduce the
-above copyright notice, definition, disclaimer, and this list of conditions in
-documentation and/or other materials provided with the distribution.  The sole
-exception to this condition is redistribution of a standard UnZipSFX binary
-(including SFXWiz) as part of a self-extracting archive; that is permitted
-without inclusion of this license, as long as the normal SFX banner has not been
-removed from the binary or disabled.
-
-3.  Altered versions--including, but not limited to, ports to new operating
-systems, existing ports with new graphical interfaces, and dynamic, shared, or
-static library versions--must be plainly marked as such and must not be
-misrepresented as being the original source.  Such altered versions also must
-not be misrepresented as being Info-ZIP releases--including, but not limited to,
-labeling of the altered versions with the names "Info-ZIP" (or any variation
-thereof, including, but not limited to, different capitalizations), "Pocket
-UnZip," "WiZ" or "MacZip" without the explicit permission of Info-ZIP.  Such
-altered versions are further prohibited from misrepresentative use of the
-Zip-Bugs or Info-ZIP e-mail addresses or of the Info-ZIP URL(s).
-
-4.  Info-ZIP retains the right to use the names "Info-ZIP," "Zip," "UnZip,"
-"UnZipSFX," "WiZ," "Pocket UnZip," "Pocket Zip," and "MacZip" for its own source
-and binary releases.
-
-
-%% The following software may be included in this product:  XML Security; Use of
-  any of this software is governed by the terms of the license below:  The
-  Apache Software License, Version 1.1 PDF
-
-Copyright (C) 2002 The Apache Software Foundation.
-
-All rights reserved.  Redistribution and use in source and binary forms, with or
-without modifica- tion, 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.  The end-user documentation included with the redistribution, if any,must
-include the following acknowledgment:"This product includes software developed
-by the Apache Software Foundation (http://www.apache.org/)."  Alternately, this
-acknowledgment may appear in the software itself, if and wherever such
-third-party acknowledgments normally appear.
-
-4.  The names"Apache Forrest" and "Apache Software Foundation" must not be used
-to endorse or promote products derived from this software without prior written
-permission.  For written permission,please contact apache@apache.org.  5.
-Products derived from this software may not be called "Apache", normay "Apache"
-appear in their name, without prior written permission of the Apache Software
-Foundation.  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 APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT,INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ORSERVICES; LOSS
-OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANYTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICTLIABILITY, 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 software consists of
-voluntary contributions made by many individuals on behalf of the Apache
-Software Foundation.  For more information on the Apache Software Foundation,
-please see http://www.apache.org.
-
-
-%% The following software may be included in this product:  Regexp, Regular
-Expression Package v.  1.2; Use of any of this software is governed by the terms
-of the license below:  The Apache Software License, Version 1.1 Copyright (c)
-2001 The Apache Software Foundation.  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.  The end-user documentation included with the redistribution, if any, must
-include the following acknowledgment:  "This product includes software developed
-by the Apache Software Foundation (http://www.apache.org/)."  Alternately, this
-acknowledgment may appear in the software itself, if and wherever such
-third-party acknowledgments normally appear.
-
-4.  The names "Apache" and "Apache Software Foundation" and "Apache Turbine"
-must not be used to endorse or promote products derived from this software
-without prior written permission.  For written permission, please contact
-apache@apache.org.
-
-5.  Products derived from this software may not be called "Apache", "Apache
-Turbine", nor may "Apache" appear in their name, without prior written
-permission of the Apache Software Foundation.
-
-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 APACHE
-SOFTWARE FOUNDATION OR ITS 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 software consists of voluntary contributions made by many individuals on
-behalf of the Apache Software Foundation.  For more information on the Apache
-Software Foundation, please see http://www.apache.org.
-
-========================================================================
-
-
-%% The following software may be included in this product:  zlib; Use of any of
-this software is governed by the terms of the license below:
-
-zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.1.3, July 9th, 1998
-
-  Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
-
-  The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files ftp://ds.internic.net/rfc/rfc1950.txt
-  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format
-
-
-%% The following software may be included in this product:  Mozilla Rhino.  Use
-of any of this software is governed by the terms of the license below:
-
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is Rhino code, released
- * May 6, 1999.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1997-2000 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *
- * Kemal Bayram
- * Patrick Beard
- * Norris Boyd
- * Igor Bukanov, igor@mir2.org
- * Brendan Eich
- * Ethan Hugg
- * Roger Lawrence
- * Terry Lucas
- * Mike McCabe
- * Milen Nankov
- * Attila Szegedi, szegedia@freemail.hu
- * Ian D. Stewart
- * Andi Vajda
- * Andrew Wason
- */
-
-%% The following software may be included in this product:  Apache Derby.  Use
-of any of this software is governed by the terms of the license below:
-
-
-                           Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) 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. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-
-%% The following software may be included in this product:  7-Zip.  Use of any
-of this software is governed by the terms of the license below:
-
-      ~~~~~
-      License for use and distribution
-      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-      7-Zip Copyright (C) 1999-2007 Igor Pavlov.
-
-      Licenses for files are:
-
-        1) 7z.dll:  GNU LGPL + AES code license + unRAR restriction
-        2) 7za.exe, 7z.sfx and 7zCon.sfx:  GNU LGPL + AES code license
-        3) All other files:  GNU LGPL
-      
-      The GNU LGPL + AES code license + unRAR restriction means that you must follow 
-      GNU LGPL rules, AES code license rules and unRAR restriction rules.
-
-      The GNU LGPL + AES code license means that you must follow both GNU LGPL rules 
-      and AES code license rules.
-
-
-      Note: 
-        You can use 7-Zip on any computer, including a computer in a commercial 
-        organization. You don't need to register or pay for 7-Zip.
-
-
-      GNU LGPL information
-      --------------------
-
-GNU Lesser General Public License
-
-Version 2.1, February 1999
-
-    Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-    59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-    Everyone is permitted to copy and distribute verbatim copies
-    of this license document, but changing it is not allowed.
-
-    [This is the first released version of the Lesser GPL. It also counts
-    as the successor of the GNU Library Public License, version 2, hence
-    the version number 2.1.]
-
-Preamble
-
-The licenses for most software are designed to take away your freedom to share
-and change it.  By contrast, the GNU General Public Licenses are intended to
-guarantee your freedom to share and change free software--to make sure the
-software is free for all its users.
-
-This license, the Lesser General Public License, applies to some specially
-designated software packages--typically libraries--of the Free Software
-Foundation and other authors who decide to use it.  You can use it too, but we
-suggest you first think carefully about whether this license or the ordinary
-General Public License is the better strategy to use in any particular case,
-based on the explanations below.
-
-When we speak of free software, we are referring to freedom of use, not price.
-Our General Public Licenses are designed to make sure that you have the freedom
-to distribute copies of free software (and charge for this service if you wish);
-that you receive source code or can get it if you want it; that you can change
-the software and use pieces of it in new free programs; and that you are
-informed that you can do these things.
-
-To protect your rights, we need to make restrictions that forbid distributors to
-deny you these rights or to ask you to surrender these rights.  These
-restrictions translate to certain responsibilities for you if you distribute
-copies of the library or if you modify it.
-
-For example, if you distribute copies of the library, whether gratis or for a
-fee, you must give the recipients all the rights that we gave you.  You must
-make sure that they, too, receive or can get the source code.  If you link other
-code with the library, you must provide complete object files to the recipients,
-so that they can relink them with the library after making changes to the
-library and recompiling it.  And you must show them these terms so they know
-their rights.
-
-We protect your rights with a two-step method:  (1) we copyright the library,
-and (2) we offer you this license, which gives you legal permission to copy,
-distribute and/or modify the library.
-
-To protect each distributor, we want to make it very clear that there is no
-warranty for the free library.  Also, if the library is modified by someone else
-and passed on, the recipients should know that what they have is not the
-original version, so that the original author's reputation will not be affected
-by problems that might be introduced by others.
-
-Finally, software patents pose a constant threat to the existence of any free
-program.  We wish to make sure that a company cannot effectively restrict the
-users of a free program by obtaining a restrictive license from a patent holder.
-Therefore, we insist that any patent license obtained for a version of the
-library must be consistent with the full freedom of use specified in this
-license.
-
-Most GNU software, including some libraries, is covered by the ordinary GNU
-General Public License.  This license, the GNU Lesser General Public License,
-applies to certain designated libraries, and is quite different from the
-ordinary General Public License.  We use this license for certain libraries in
-order to permit linking those libraries into non-free programs.
-
-When a program is linked with a library, whether statically or using a shared
-library, the combination of the two is legally speaking a combined work, a
-derivative of the original library.  The ordinary General Public License
-therefore permits such linking only if the entire combination fits its criteria
-of freedom.  The Lesser General Public License permits more lax criteria for
-linking other code with the library.
-
-We call this license the "Lesser" General Public License because it does Less to
-protect the user's freedom than the ordinary General Public License.  It also
-provides other free software developers Less of an advantage over competing
-non-free programs.  These disadvantages are the reason we use the ordinary
-General Public License for many libraries.  However, the Lesser license provides
-advantages in certain special circumstances.
-
-For example, on rare occasions, there may be a special need to encourage the
-widest possible use of a certain library, so that it becomes a de-facto
-standard.  To achieve this, non-free programs must be allowed to use the
-library.  A more frequent case is that a free library does the same job as
-widely used non-free libraries.  In this case, there is little to gain by
-limiting the free library to free software only, so we use the Lesser General
-Public License.
-
-In other cases, permission to use a particular library in non-free programs
-enables a greater number of people to use a large body of free software.  For
-example, permission to use the GNU C Library in non-free programs enables many
-more people to use the whole GNU operating system, as well as its variant, the
-GNU/Linux operating system.
-
-Although the Lesser General Public License is Less protective of the users'
-freedom, it does ensure that the user of a program that is linked with the
-Library has the freedom and the wherewithal to run that program using a modified
-version of the Library.
-
-The precise terms and conditions for copying, distribution and modification
-follow.  Pay close attention to the difference between a "work based on the
-library" and a "work that uses the library".  The former contains code derived
-from the library, whereas the latter must be combined with the library in order
-to run.  TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-0.  This License Agreement applies to any software library or other program
-which contains a notice placed by the copyright holder or other authorized party
-saying it may be distributed under the terms of this Lesser General Public
-License (also called "this License").  Each licensee is addressed as "you".
-
-A "library" means a collection of software functions and/or data prepared so as
-to be conveniently linked with application programs (which use some of those
-functions and data) to form executables.
-
-The "Library", below, refers to any such software library or work which has been
-distributed under these terms.  A "work based on the Library" means either the
-Library or any derivative work under copyright law:  that is to say, a work
-containing the Library or a portion of it, either verbatim or with modifications
-and/or translated straightforwardly into another language.  (Hereinafter,
-translation is included without limitation in the term "modification".)
-
-"Source code" for a work means the preferred form of the work for making
-modifications to it.  For a library, complete source code means all the source
-code for all modules it contains, plus any associated interface definition
-files, plus the scripts used to control compilation and installation of the
-library.
-
-Activities other than copying, distribution and modification are not covered by
-this License; they are outside its scope.  The act of running a program using
-the Library is not restricted, and output from such a program is covered only if
-its contents constitute a work based on the Library (independent of the use of
-the Library in a tool for writing it).  Whether that is true depends on what the
-Library does and what the program that uses the Library does.
-
-1.  You may copy and distribute verbatim copies of the Library's complete source
-code as you receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice and
-disclaimer of warranty; keep intact all the notices that refer to this License
-and to the absence of any warranty; and distribute a copy of this License along
-with the Library.
-
-You may charge a fee for the physical act of transferring a copy, and you may at
-your option offer warranty protection in exchange for a fee.
-
-2.  You may modify your copy or copies of the Library or any portion of it, thus
-forming a work based on the Library, and copy and distribute such modifications
-or work under the terms of Section 1 above, provided that you also meet all of
-these conditions:
-
-a) The modified work must itself be a software library.
-
-b) You must cause the files modified to carry prominent notices stating that you
-changed the files and the date of any change.
-
-c) You must cause the whole of the work to be licensed at no charge to all third
-parties under the terms of this License.
-
-d) If a facility in the modified Library refers to a function or a table of data
-to be supplied by an application program that uses the facility, other than as
-an argument passed when the facility is invoked, then you must make a good faith
-effort to ensure that, in the event an application does not supply such function
-or table, the facility still operates, and performs whatever part of its purpose
-remains meaningful.
-
-(For example, a function in a library to compute square roots has a purpose that
-is entirely well-defined independent of the application.  Therefore, Subsection
-2d requires that any application-supplied function or table used by this
-function must be optional:  if the application does not supply it, the square
-root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If identifiable
-sections of that work are not derived from the Library, and can be reasonably
-considered independent and separate works in themselves, then this License, and
-its terms, do not apply to those sections when you distribute them as separate
-works.  But when you distribute the same sections as part of a whole which is a
-work based on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the entire whole,
-and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest your
-rights to work written entirely by you; rather, the intent is to exercise the
-right to control the distribution of derivative or collective works based on the
-Library.
-
-In addition, mere aggregation of another work not based on the Library with the
-Library (or with a work based on the Library) on a volume of a storage or
-distribution medium does not bring the other work under the scope of this
-License.
-
-3.  You may opt to apply the terms of the ordinary GNU General Public License
-instead of this License to a given copy of the Library.  To do this, you must
-alter all the notices that refer to this License, so that they refer to the
-ordinary GNU General Public License, version 2, instead of to this License.  (If
-a newer version than version 2 of the ordinary GNU General Public License has
-appeared, then you can specify that version instead if you wish.)  Do not make
-any other change in these notices.
-
-Once this change is made in a given copy, it is irreversible for that copy, so
-the ordinary GNU General Public License applies to all subsequent copies and
-derivative works made from that copy.
-
-This option is useful when you wish to copy part of the code of the Library into
-a program that is not a library.
-
-4.  You may copy and distribute the Library (or a portion or derivative of it,
-under Section 2) in object code or executable form under the terms of Sections 1
-and 2 above provided that you accompany it with the complete corresponding
-machine-readable source code, which must be distributed under the terms of
-Sections 1 and 2 above on a medium customarily used for software interchange.
-
-If distribution of object code is made by offering access to copy from a
-designated place, then offering equivalent access to copy the source code from
-the same place satisfies the requirement to distribute the source code, even
-though third parties are not compelled to copy the source along with the object
-code.
-
-5.  A program that contains no derivative of any portion of the Library, but is
-designed to work with the Library by being compiled or linked with it, is called
-a "work that uses the Library".  Such a work, in isolation, is not a derivative
-work of the Library, and therefore falls outside the scope of this License.
-
-However, linking a "work that uses the Library" with the Library creates an
-executable that is a derivative of the Library (because it contains portions of
-the Library), rather than a "work that uses the library".  The executable is
-therefore covered by this License.  Section 6 states terms for distribution of
-such executables.
-
-When a "work that uses the Library" uses material from a header file that is
-part of the Library, the object code for the work may be a derivative work of
-the Library even though the source code is not.  Whether this is true is
-especially significant if the work can be linked without the Library, or if the
-work is itself a library.  The threshold for this to be true is not precisely
-defined by law.
-
-If such an object file uses only numerical parameters, data structure layouts
-and accessors, and small macros and small inline functions (ten lines or less in
-length), then the use of the object file is unrestricted, regardless of whether
-it is legally a derivative work.  (Executables containing this object code plus
-portions of the Library will still fall under Section 6.)
-
-Otherwise, if the work is a derivative of the Library, you may distribute the
-object code for the work under the terms of Section 6.  Any executables
-containing that work also fall under Section 6, whether or not they are linked
-directly with the Library itself.
-
-6.  As an exception to the Sections above, you may also combine or link a "work
-that uses the Library" with the Library to produce a work containing portions of
-the Library, and distribute that work under terms of your choice, provided that
-the terms permit modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-You must give prominent notice with each copy of the work that the Library is
-used in it and that the Library and its use are covered by this License.  You
-must supply a copy of this License.  If the work during execution displays
-copyright notices, you must include the copyright notice for the Library among
-them, as well as a reference directing the user to the copy of this License.
-Also, you must do one of these things:
-
-a) Accompany the work with the complete corresponding machine-readable source
-code for the Library including whatever changes were used in the work (which
-must be distributed under Sections 1 and 2 above); and, if the work is an
-executable linked with the Library, with the complete machine-readable "work
-that uses the Library", as object code and/or source code, so that the user can
-modify the Library and then relink to produce a modified executable containing
-the modified Library.  (It is understood that the user who changes the contents
-of definitions files in the Library will not necessarily be able to recompile
-the application to use the modified definitions.)
-
-b) Use a suitable shared library mechanism for linking with the Library.  A
-suitable mechanism is one that (1) uses at run time a copy of the library
-already present on the user's computer system, rather than copying library
-functions into the executable, and (2) will operate properly with a modified
-version of the library, if the user installs one, as long as the modified
-version is interface-compatible with the version that the work was made with.
-
-c) Accompany the work with a written offer, valid for at least three years, to
-give the same user the materials specified in Subsection 6a, above, for a charge
-no more than the cost of performing this distribution.
-
-d) If distribution of the work is made by offering access to copy from a
-designated place, offer equivalent access to copy the above specified materials
-from the same place.
-
-e) Verify that the user has already received a copy of these materials or that
-you have already sent this user a copy.
-
-For an executable, the required form of the "work that uses the Library" must
-include any data and utility programs needed for reproducing the executable from
-it.  However, as a special exception, the materials to be distributed need not
-include anything that is normally distributed (in either source or binary form)
-with the major components (compiler, kernel, and so on) of the operating system
-on which the executable runs, unless that component itself accompanies the
-executable.
-
-It may happen that this requirement contradicts the license restrictions of
-other proprietary libraries that do not normally accompany the operating system.
-Such a contradiction means you cannot use both them and the Library together in
-an executable that you distribute.
-
-7.  You may place library facilities that are a work based on the Library
-side-by-side in a single library together with other library facilities not
-covered by this License, and distribute such a combined library, provided that
-the separate distribution of the work based on the Library and of the other
-library facilities is otherwise permitted, and provided that you do these two
-things:
-
-a) Accompany the combined library with a copy of the same work based on the
-Library, uncombined with any other library facilities.  This must be distributed
-under the terms of the Sections above.
-
-b) Give prominent notice with the combined library of the fact that part of it
-is a work based on the Library, and explaining where to find the accompanying
-uncombined form of the same work.
-
-8.  You may not copy, modify, sublicense, link with, or distribute the Library
-except as expressly provided under this License.  Any attempt otherwise to copy,
-modify, sublicense, link with, or distribute the Library is void, and will
-automatically terminate your rights under this License.  However, parties who
-have received copies, or rights, from you under this License will not have their
-licenses terminated so long as such parties remain in full compliance.
-
-9.  You are not required to accept this License, since you have not signed it.
-However, nothing else grants you permission to modify or distribute the Library
-or its derivative works.  These actions are prohibited by law if you do not
-accept this License.  Therefore, by modifying or distributing the Library (or
-any work based on the Library), you indicate your acceptance of this License to
-do so, and all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-10.  Each time you redistribute the Library (or any work based on the Library),
-the recipient automatically receives a license from the original licensor to
-copy, distribute, link with or modify the Library subject to these terms and
-conditions.  You may not impose any further restrictions on the recipients'
-exercise of the rights granted herein.  You are not responsible for enforcing
-compliance by third parties with this License.
-
-11.  If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues), conditions
-are imposed on you (whether by court order, agreement or otherwise) that
-contradict the conditions of this License, they do not excuse you from the
-conditions of this License.  If you cannot distribute so as to satisfy
-simultaneously your obligations under this License and any other pertinent
-obligations, then as a consequence you may not distribute the Library at all.
-For example, if a patent license would not permit royalty-free redistribution of
-the Library by all those who receive copies directly or indirectly through you,
-then the only way you could satisfy both it and this License would be to refrain
-entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply, and
-the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any patents or
-other property right claims or to contest validity of any such claims; this
-section has the sole purpose of protecting the integrity of the free software
-distribution system which is implemented by public license practices.  Many
-people have made generous contributions to the wide range of software
-distributed through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing to
-distribute software through any other system and a licensee cannot impose that
-choice.
-
-This section is intended to make thoroughly clear what is believed to be a
-consequence of the rest of this License.
-
-12.  If the distribution and/or use of the Library is restricted in certain
-countries either by patents or by copyrighted interfaces, the original copyright
-holder who places the Library under this License may add an explicit
-geographical distribution limitation excluding those countries, so that
-distribution is permitted only in or among countries not thus excluded.  In such
-case, this License incorporates the limitation as if written in the body of this
-License.
-
-13.  The Free Software Foundation may publish revised and/or new versions of the
-Lesser General Public License from time to time.  Such new versions will be
-similar in spirit to the present version, but may differ in detail to address
-new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library specifies
-a version number of this License which applies to it and "any later version",
-you have the option of following the terms and conditions either of that version
-or of any later version published by the Free Software Foundation.  If the
-Library does not specify a license version number, you may choose any version
-ever published by the Free Software Foundation.
-
-14.  If you wish to incorporate parts of the Library into other free programs
-whose distribution conditions are incompatible with these, write to the author
-to ask for permission.  For software which is copyrighted by the Free Software
-Foundation, write to the Free Software Foundation; we sometimes make exceptions
-for this.  Our decision will be guided by the two goals of preserving the free
-status of all derivatives of our free software and of promoting the sharing and
-reuse of software generally.
-
-NO WARRANTY
-
-15.  BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
-THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE
-STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY
-"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-16.  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
-ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE
-LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL,
-SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY
-TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF
-THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER
-PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.  END OF TERMS AND
-CONDITIONS
-
-How to Apply These Terms to Your New Libraries
-
-If you develop a new library, and you want it to be of the greatest possible use
-to the public, we recommend making it free software that everyone can
-redistribute and change.  You can do so by permitting redistribution under these
-terms (or, alternatively, under the terms of the ordinary General Public
-License).
-
-To apply these terms, attach the following notices to the library.  It is safest
-to attach them to the start of each source file to most effectively convey the
-exclusion of warranty; and each file should have at least the "copyright" line
-and a pointer to where the full notice is found.
-
-    <one line to give the library's name and an idea of what it does.>
-    Copyright (C) <year> <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your school,
-if any, to sign a "copyright disclaimer" for the library, if necessary.  Here is
-a sample; alter the names:
-
-    Yoyodyne, Inc., hereby disclaims all copyright interest in
-    the library `Frob' (a library for tweaking knobs) written
-    by James Random Hacker.
-
-    signature of Ty Coon, 1 April 1990
-
-    Ty Coon, President of Vice
-
-That's all there is to it!
-
-
-      unRAR restriction
-      -----------------
-
-        The unRAR sources cannot be used to re-create the RAR compression
-algorithm, 
-        which is proprietary. Distribution of modified unRAR sources in separate
-form 
-        or as a part of other software is permitted, provided that it is clearly
-        stated in the documentation and source comments that the code may
-        not be used to develop a RAR (WinRAR) compatible archiver.
-
-
-      AES code license
-      ----------------
-    
-        Copyright (c) 2001, Dr Brian Gladman
-
-        LICENSE TERMS
-
-        The free distribution and use of this software in both source and binary 
-        form is allowed (with or without changes) provided that:
-
-          1. distributions of this source code include the above copyright 
-             notice, this list of conditions and the following disclaimer;
-
-          2. distributions in binary form include the above copyright
-             notice, this list of conditions and the following disclaimer
-             in the documentation and/or other associated materials;
-
-          3. the copyright holder's name is not used to endorse products 
-             built using this software without specific written permission. 
-
-        DISCLAIMER
-
-        This software is provided 'as is' with no explicit or implied warranties
-        in respect of its properties, including, but not limited to, correctness 
-        and fitness for purpose.
-
-
-***************************************************************************
-
-%%The following software may be included in this product:
-UPX
-
-Use of any of this software is governed by the terms of the license below:
-
------BEGIN PGP SIGNED MESSAGE-----
-
-
-                 ooooo     ooo ooooooooo.   ooooooo  ooooo
-                 `888'     `8' `888   `Y88.  `8888    d8'
-                  888       8   888   .d88'    Y888..8P
-                  888       8   888ooo88P'      `8888'
-                  888       8   888            .8PY888.
-                  `88.    .8'   888           d8'  `888b
-                    `YbodP'    o888o        o888o  o88888o
-
-
-                    The Ultimate Packer for eXecutables
-          Copyright (c) 1996-2000 Markus Oberhumer & Laszlo Molnar
-               http://wildsau.idv.uni-linz.ac.at/mfx/upx.html
-                          http://www.nexus.hu/upx
-                            http://upx.tsx.org
-
-
-PLEASE CAREFULLY READ THIS LICENSE AGREEMENT, ESPECIALLY IF YOU PLAN
-TO MODIFY THE UPX SOURCE CODE OR USE A MODIFIED UPX VERSION.
-
-
-ABSTRACT
-========
-
-   UPX and UCL are copyrighted software distributed under the terms
-   of the GNU General Public License (hereinafter the "GPL").
-
-   The stub which is imbedded in each UPX compressed program is part
-   of UPX and UCL, and contains code that is under our copyright. The
-   terms of the GNU General Public License still apply as compressing
-   a program is a special form of linking with our stub.
-
-   As a special exception we grant the free usage of UPX for all
-   executables, including commercial programs.
-   See below for details and restrictions.
-
-
-COPYRIGHT
-=========
-
-   UPX and UCL are copyrighted software. All rights remain with the authors.
-
-   UPX is Copyright (C) 1996-2000 Markus Franz Xaver Johannes Oberhumer
-   UPX is Copyright (C) 1996-2000 Laszlo Molnar
-
-   UCL is Copyright (C) 1996-2000 Markus Franz Xaver Johannes Oberhumer
-
-
-GNU GENERAL PUBLIC LICENSE
-==========================
-
-   UPX and the UCL library are free software; you can redistribute them
-   and/or modify them 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.
-
-   UPX and UCL are distributed in the hope that they 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; see the file COPYING.
-
-
-SPECIAL EXCEPTION FOR COMPRESSED EXECUTABLES
-============================================
-
-   The stub which is imbedded in each UPX compressed program is part
-   of UPX and UCL, and contains code that is under our copyright. The
-   terms of the GNU General Public License still apply as compressing
-   a program is a special form of linking with our stub.
-
-   Hereby Markus F.X.J. Oberhumer and Laszlo Molnar grant you special
-   permission to freely use and distribute all UPX compressed programs
-   (including commercial ones), subject to the following restrictions:
-
-   1. You must compress your program with a completely unmodified UPX
-      version; either with our precompiled version, or (at your option)
-      with a self compiled version of the unmodified UPX sources as
-      distributed by us.
-   2. This also implies that the UPX stub must be completely unmodfied, i.e.
-      the stub imbedded in your compressed program must be byte-identical
-      to the stub that is produced by the official unmodified UPX version.
-   3. The decompressor and any other code from the stub must exclusively get
-      used by the unmodified UPX stub for decompressing your program at
-      program startup. No portion of the stub may get read, copied,
-      called or otherwise get used or accessed by your program.
-
-
-ANNOTATIONS
-===========
-
-  - You can use a modified UPX version or modified UPX stub only for
-    programs that are compatible with the GNU General Public License.
-
-  - We grant you special permission to freely use and distribute all UPX
-    compressed programs. But any modification of the UPX stub (such as,
-    but not limited to, removing our copyright string or making your
-    program non-decompressible) will immediately revoke your right to
-    use and distribute a UPX compressed program.
-
-  - UPX is not a software protection tool; by requiring that you use
-    the unmodified UPX version for your proprietary programs we
-    make sure that any user can decompress your program. This protects
-    both you and your users as nobody can hide malicious code -
-    any program that cannot be decompressed is highly suspicious
-    by definition.
-
-  - You can integrate all or part of UPX and UCL into projects that
-    are compatible with the GNU GPL, but obviously you cannot grant
-    any special exceptions beyond the GPL for our code in your project.
-
-  - We want to actively support manufacturers of virus scanners and
-    similar security software. Please contact us if you would like to
-    incorporate parts of UPX or UCL into such a product.
-
-
-
-Markus F.X.J. Oberhumer                   Laszlo Molnar
-markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
-
-Linz, Austria, 25 Feb 2000
-
-Additional License(s)
-
-The UPX license file is at http://upx.sourceforge.net/upx-license.html.
-
-***************************************************************************
-
-%%The following software may be included in this product:
-LZMA Software Development Kit
-
-Use of any of this software is governed by the terms of the license below:
-
-License
-
-LZMA SDK is available under any of the following licenses:
-
-   1. GNU Lesser General Public License (GNU LGPL)
-   2. Common Public License (CPL)
-   3. Simplified license for unmodified code (read SPECIAL EXCEPTION)
-   4. Proprietary license
-
-This means that you can select one of these four options and follow rules of
-that license.
-
-SPECIAL EXCEPTION:  Igor Pavlov, as the author of this code, expressly permit
-you statically or dynamically to link your code (or bind by name) to the files
-from LZMA SDK without subjecting your linked code to the terms of the CPL or GNU
-LGPL.  Any modification or addition to any file in the LZMA SDK, however, is
-subject to the GNU LGPL or CPL terms.
-
-This SPECIAL EXCEPTION allows you to use LZMA SDK in applications with
-proprietary code, provided you keep the LZMA SDK code unmodified.
-
-SPECIAL EXCEPTION #2:  Igor Pavlov, as the author of this code, expressly
-permits you to use LZMA SDK 4.43 under the same terms and conditions contained
-in the License Agreement you have for any previous version of LZMA SDK developed
-by Igor Pavlov.
-
-SPECIAL EXCEPTION #2 allows holders of proprietary licenses to use latest
-version of LZMA SDK as update for previous versions.
-
-GNU LGPL and CPL are pretty similar and both these licenses are classified as
-free software licenses at http://www.gnu.org/ and OSI-approved at
-http://www.opensource.org/.
-
-LZMA SDK also is available under a proprietary license which can include:
-
-1.  The right to modify code from the LZMA SDK without subjecting the modified
-code to the terms of the CPL or GNU LGPL
-
-2.  Technical support for LZMA SDK via email
-
-To request such a proprietary license, or for any additional consultations, send
-an email message, using the 7-Zip support page:  Send message to LZMA developer
-
-The source code of 7-Zip is released under the terms of the GNU LGPL.  You can
-download the source code of 7-Zip at 7-Zip's Source Forge Page
-
-Additional License(s)
-
-The license included with the software differs slightly from the version posted
-on the website.  Specifically it includes SPECIAL EXCEPTION #3, which is not
-present in the license on the website.  The license from the software archive
-follows:
-
-LICENSE
--------
-
-LZMA SDK is available under any of the following licenses:
-
-1) GNU Lesser General Public License (GNU LGPL)
-2) Common Public License (CPL)
-3) Simplified license for unmodified code (read SPECIAL EXCEPTION) 
-4) Proprietary license 
-
-It means that you can select one of these four options and follow rules of that license.
-
-
-1,2) GNU LGPL and CPL licenses are pretty similar and both these licenses are
-classified as
- - "Free software licenses" at http://www.gnu.org/ 
- - "OSI-approved" at http://www.opensource.org/
-
-
-3) SPECIAL EXCEPTION
-
-Igor Pavlov, as the author of this code, expressly permits you to statically or
-dynamically link your code (or bind by name) to the files from LZMA SDK without
-subjecting your linked code to the terms of the CPL or GNU LGPL.  Any
-modifications or additions to files from LZMA SDK, however, are subject to the
-GNU LGPL or CPL terms.
-
-SPECIAL EXCEPTION allows you to use LZMA SDK in applications with closed code,
-while you keep LZMA SDK code unmodified.
-
-
-SPECIAL EXCEPTION #2:  Igor Pavlov, as the author of this code, expressly
-permits you to use this code under the same terms and conditions contained in
-the License Agreement you have for any previous version of LZMA SDK developed by
-Igor Pavlov.
-
-SPECIAL EXCEPTION #2 allows owners of proprietary licenses to use latest version
-of LZMA SDK as update for previous versions.
-
-
-SPECIAL EXCEPTION #3:  Igor Pavlov, as the author of this code, expressly
-permits you to use code of the following files:  BranchTypes.h, LzmaTypes.h,
-LzmaTest.c, LzmaStateTest.c, LzmaAlone.cpp, LzmaAlone.cs, LzmaAlone.java as
-public domain code.
-
-
-4) Proprietary license
-
-LZMA SDK also can be available under a proprietary license which 
-can include:
-
-1) Right to modify code without subjecting modified code to the terms of the CPL or GNU LGPL
-2) Technical support for code
-
-To request such proprietary license or any additional consultations, send email
-message from that page:http://www.7-zip.org/support.html
-
-
-You should have received a copy of the GNU Lesser General Public License along
-with this library; if not, write to the Free Software Foundation, Inc., 59
-Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-You should have received a copy of the Common Public License along with this
-library.
+Please refer to http://java.com/thirdpartylicense
diff --git a/extra/source/jdk-6/jdk.SlackBuild b/extra/source/jdk-6/jdk.SlackBuild
index 02eef970..db589f7d 100755
--- a/extra/source/jdk-6/jdk.SlackBuild
+++ b/extra/source/jdk-6/jdk.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,8 +21,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=6u20
-DVER=1.6.0_20
+VERSION=6u25
+DVER=1.6.0_25
 ARCH=x86_64                  # only determines the lib path locations
 JAVA_ARCH=${JAVA_ARCH:-x64}  # or i586 if you want the 32bit version
 BUILD=${BUILD:-1}
diff --git a/extra/source/jdk-6/register.html b/extra/source/jdk-6/register.html
index 259a70fa..b5411e14 100644
--- a/extra/source/jdk-6/register.html
+++ b/extra/source/jdk-6/register.html
@@ -23,30 +23,30 @@ a:visited,a:visited code{color:#917E9C}
   <tr>
     <td width="7" height="78">&nbsp;</td>
     <td width="794" align="left" valign="top">
-        <img src="file:/tmp/package-jdk/usr/lib64/jdk1.6.0_20/jre/lib/servicetag/jdk_header.png" width="783" height="63"></td>
+        <img src="file:/tmp/package-jdk/usr/lib64/jdk1.6.0_25/jre/lib/servicetag/jdk_header.png" width="783" height="63"></td>
   </tr>
   <tr>
     <td>&nbsp;</td>
     <td><p class="style1">Thank you for installing the 
-        <strong> Java Development Kit Version 6 Update 20 </strong>
-        from Sun Microsystems. </p>
+        <strong> Java Development Kit Version 6 Update 25 </strong>
+        from Oracle Corporation. </p>
         <p class="style1">Registering your product will give you the following benefits:</p>
         <ul class="style1">
           <li> Notification of new versions, patches, and updates</li>
-          <li> Special offers on Sun developer products, services and training </li>
+          <li> Special offers on Oracle developer products, services and training </li>
           <li> Access to early releases and documentation </li>
         </ul>
         <p class="style1">Product registration is FREE, quick and easy!</p>
         <blockquote>
-          <p class="style1">All you need is a Sun Developer Network or other Sun Online account. If you don't already have one, you will be prompted to create one. </p>
+          <p class="style1">All you need is an Oracle.com account. If you don't already have one, you will be prompted to create one. </p>
           <table width="708" border="0" cellspacing="0" cellpadding="3">
             <tr valign="top">
               <td width="126" height="35">
-              <form name="form1" method="post" action="https://inventory.sun.com/RegistrationWeb/register/urn:st:b1330404-f0ee-4a41-a965-2f4bd7482e3b?product=jdk&locale=en" enctype="text/xml">
-                <input type="hidden" name="servicetag_payload" value="<?xml version=%221.0%22 encoding=%22UTF-8%22 standalone=%22no%22?><registration_data version=%221.0%22><environment><hostname>midas64</hostname><hostId>a8c0265d</hostId><osName>Linux</osName><osVersion>2.6.33.3</osVersion><osArchitecture>amd64</osArchitecture><systemModel>AuthenticAMD</systemModel><systemManufacturer>emachines</systemManufacturer><cpuManufacturer>AuthenticAMD</cpuManufacturer><serialNumber>ptnba0200193508e052700</serialNumber></environment><registry urn=%22urn:st:b1330404-f0ee-4a41-a965-2f4bd7482e3b%22 version=%221.0%22><service_tag><instance_urn>urn:st:4f6e7c38-ac6f-41da-8ebe-4d438a23e936</instance_urn><product_name>Java SE 6 Development Kit</product_name><product_version>1.6.0_20</product_version><product_urn>urn:uuid:b58ef9a8-5ae8-11db-a023-080020a9ed93</product_urn><product_parent_urn>urn:uuid:fdc90b21-018d-4cab-b866-612c7c119ed3</product_parent_urn><product_parent>Java Platform Standard Edition 6 (Java SE 6)</product_parent><product_defined_inst_id>id=1.6.0_20-b02 amd64,dir=/tmp/package-jdk/usr/lib64/jdk1.6.0_20/jre</product_defined_inst_id><product_vendor>Sun Microsystems</product_vendor><platform_arch>amd64</platform_arch><timestamp>2010-05-09 01:43:40 GMT</timestamp><container>global</container><source>jdk-6u20-fcs-bin-b02-linux-amd64-12_apr_2010.bin</source><installer_uid>-1</installer_uid></service_tag></registry></registration_data>">
+              <form name="form1" method="post" action="https://hs-ws1.oracle.com/RegistrationWeb/register/urn:st:38623f4b-7a05-441f-9da6-39cc71ca5a58?product=jdk&locale=en" enctype="text/xml">
+                <input type="hidden" name="servicetag_payload" value="<?xml version=%221.0%22 encoding=%22UTF-8%22 standalone=%22no%22?><registration_data version=%221.0%22><environment><hostname>midas64</hostname><hostId>00000000</hostId><osName>Linux</osName><osVersion>2.6.37.6</osVersion><osArchitecture>amd64</osArchitecture><systemModel>AuthenticAMD</systemModel><systemManufacturer>emachines</systemManufacturer><cpuManufacturer>AuthenticAMD</cpuManufacturer><serialNumber>ptnba0200193508e052700</serialNumber></environment><registry urn=%22urn:st:38623f4b-7a05-441f-9da6-39cc71ca5a58%22 version=%221.0%22><service_tag><instance_urn>urn:st:14aa9f1c-8a07-4e99-ada1-a020589ad7fd</instance_urn><product_name>Java SE 6 Development Kit</product_name><product_version>1.6.0_25</product_version><product_urn>urn:uuid:b58ef9a8-5ae8-11db-a023-080020a9ed93</product_urn><product_parent_urn>urn:uuid:fdc90b21-018d-4cab-b866-612c7c119ed3</product_parent_urn><product_parent>Java Platform Standard Edition 6 (Java SE 6)</product_parent><product_defined_inst_id>id=1.6.0_25-b06 amd64,dir=/tmp/package-jdk/usr/lib64/jdk1.6.0_25/jre</product_defined_inst_id><product_vendor>Sun Microsystems</product_vendor><platform_arch>amd64</platform_arch><timestamp>2011-04-24 03:00:46 GMT</timestamp><container>global</container><source>jdk-6u25-fcs-bin-b06-linux-amd64-14_apr_2011.bin</source><installer_uid>-1</installer_uid></service_tag></registry></registration_data>">
                 <input type="submit" name="Submit"border="0" class="buttonblue" onmouseover="this.style.color='#fbe249';" onmouseout="this.style.color='#FFF';"  value="Register My JDK">
               </form></td>
-              <td width="570"><span class="style3">You need to be connected to the Internet to register this Sun product. </span></td>
+              <td width="570"><span class="style3">You need to be connected to the Internet to register this Oracle product. </span></td>
             </tr>
           </table>
         </blockquote>
@@ -55,16 +55,16 @@ a:visited,a:visited code{color:#917E9C}
     <tr>
        <td>&nbsp;</td>
        <td bgcolor="#f1f7df">
-       <p class="style3">Sun Microsystems, Inc. respects your privacy. 
+       <p class="style3">Oracle Corporation respects your privacy. 
     We will use your personal information for communications 
-    and management of your Sun Online Account, the services 
-    and applications you access using your Sun Online Account, 
-    and the products and systems you register with your Sun Online Account.</p>
+    and management of your Oracle.com account, the services 
+    and applications you access using your Oracle.com account, 
+    and the products and systems you register with your Oracle.com account.</p>
                 <p class="style3">For more information on the data that will be collected as 
           part of the registration process and how it will be managed <br>
           see <a href="http://java.sun.com/javase/registration/JDKRegistrationPrivacy.html">http://java.sun.com/javase/registration/JDKRegistrationPrivacy.html</a>. <br>      
           <br>
-          For more information on Sun's Privacy Policy see <a href="http://www.sun.com/privacy/">http://www.sun.com/privacy/</a> or contact <a class="moz-txt-link-rfc2396E" href="mailto:privacy@sun.com">privacy@sun.com.</a></p></td>
+          For more information on Oracle's Privacy Policy see <a href="http://www.oracle.com/html/privacy.html">http://www.oracle.com/html/privacy.html</a> or contact <a class="moz-txt-link-rfc2396E" href="mailto:privacy_ww@oracle.com">privacy_ww@oracle.com.</a></p></td>
   </tr>
   <tr>
     <td>&nbsp;</td>
diff --git a/extra/source/jdk-6/register_ja.html b/extra/source/jdk-6/register_ja.html
index 7030d6ac..330e8430 100644
--- a/extra/source/jdk-6/register_ja.html
+++ b/extra/source/jdk-6/register_ja.html
@@ -5,6 +5,31 @@ g/TR/html4/loose.dtd">
 
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>JDK 製�登録</title>
 
+<!--
+Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+This code is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License version 2 only, as
+published by the Free Software Foundation.  Oracle designates this
+particular file as subject to the "Classpath" exception as provided
+by Oracle in the LICENSE file that accompanied this code.
+
+This code 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
+version 2 for more details (a copy is included in the LICENSE file that
+accompanied this code).
+
+You should have received a copy of the GNU General Public License version
+2 along with this work; if not, write to the Free Software Foundation,
+Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
+-->
+
 <style type="text/css">
 <!--
 .style1 {font-family: Arial, Helvetica, sans-serif}
@@ -20,28 +45,28 @@ a:visited,a:visited code{color:#917E9C}
 <table border="0" cellpadding="3" cellspacing="0" width="813">
   <tbody><tr>
     <td height="78" width="7">&nbsp;</td>
-    <td align="left" valign="top" width="794"><img src="file:/tmp/package-jdk/usr/lib64/jdk1.6.0_20/jre/lib/servicetag/jdk_header.png" height="63" width="783"></td>
+    <td align="left" valign="top" width="794"><img src="file:/tmp/package-jdk/usr/lib64/jdk1.6.0_25/jre/lib/servicetag/jdk_header.png" height="63" width="783"></td>
   </tr>
   <tr>
     <td>&nbsp;</td>
 
-    <td><p class="style1">Sun Microsystems �<strong> Java Development Kit Version 6 Update 20 </strong>をインストール��������り��������。 </p>
+    <td><p class="style1">Oracle Corporation �<strong> Java Development Kit Version 6 Update 25 </strong>をインストール��������り��������。 </p>
         <p class="style1">製�登録を�る��次�よ��特典を��る�������。</p>
         <ul class="style1">
           <li> 最新��ージョン�パッ���よ�更新�����通知</li>
-          <li> Sun �開発者��製��サービス��よ�トレーニング�特別販売 </li>
+          <li> Oracle �開発者��製��サービス��よ�トレーニング�特別販売 </li>
           <li> アーリーリリース�よ�ドキュメント��アクセス </li>
         </ul>
         <p class="style1">製�登録�無料��り�迅速�簡���。</p>
         <blockquote>
-          <p class="style1">必���る���Sun 開発者���ットワークアカウント�����他� Sun オンラインアカウント����。 ��アカウント���場���アカウント�作��求�られ��。 </p>
+          <p class="style1">必���る���Oracle.com アカウント����。 ��アカウント���場���アカウント�作��求�られ��。 </p>
           <table width="708" border="0" cellspacing="0" cellpadding="3">
             <tr valign="top">
-              <td width="126" height="35"><form name="form1" method="post" action="https://inventory.sun.com/RegistrationWeb/register/urn:st:b1330404-f0ee-4a41-a965-2f4bd7482e3b?product=jdk&locale=ja" enctype="text/xml">
-			  <input type="hidden" name="servicetag_payload" value="<?xml version=%221.0%22 encoding=%22UTF-8%22 standalone=%22no%22?><registration_data version=%221.0%22><environment><hostname>midas64</hostname><hostId>a8c0265d</hostId><osName>Linux</osName><osVersion>2.6.33.3</osVersion><osArchitecture>amd64</osArchitecture><systemModel>AuthenticAMD</systemModel><systemManufacturer>emachines</systemManufacturer><cpuManufacturer>AuthenticAMD</cpuManufacturer><serialNumber>ptnba0200193508e052700</serialNumber></environment><registry urn=%22urn:st:b1330404-f0ee-4a41-a965-2f4bd7482e3b%22 version=%221.0%22><service_tag><instance_urn>urn:st:4f6e7c38-ac6f-41da-8ebe-4d438a23e936</instance_urn><product_name>Java SE 6 Development Kit</product_name><product_version>1.6.0_20</product_version><product_urn>urn:uuid:b58ef9a8-5ae8-11db-a023-080020a9ed93</product_urn><product_parent_urn>urn:uuid:fdc90b21-018d-4cab-b866-612c7c119ed3</product_parent_urn><product_parent>Java Platform Standard Edition 6 (Java SE 6)</product_parent><product_defined_inst_id>id=1.6.0_20-b02 amd64,dir=/tmp/package-jdk/usr/lib64/jdk1.6.0_20/jre</product_defined_inst_id><product_vendor>Sun Microsystems</product_vendor><platform_arch>amd64</platform_arch><timestamp>2010-05-09 01:43:40 GMT</timestamp><container>global</container><source>jdk-6u20-fcs-bin-b02-linux-amd64-12_apr_2010.bin</source><installer_uid>-1</installer_uid></service_tag></registry></registration_data>">
+              <td width="126" height="35"><form name="form1" method="post" action="https://hs-ws1.oracle.com/RegistrationWeb/register/urn:st:38623f4b-7a05-441f-9da6-39cc71ca5a58?product=jdk&locale=ja" enctype="text/xml">
+			  <input type="hidden" name="servicetag_payload" value="<?xml version=%221.0%22 encoding=%22UTF-8%22 standalone=%22no%22?><registration_data version=%221.0%22><environment><hostname>midas64</hostname><hostId>00000000</hostId><osName>Linux</osName><osVersion>2.6.37.6</osVersion><osArchitecture>amd64</osArchitecture><systemModel>AuthenticAMD</systemModel><systemManufacturer>emachines</systemManufacturer><cpuManufacturer>AuthenticAMD</cpuManufacturer><serialNumber>ptnba0200193508e052700</serialNumber></environment><registry urn=%22urn:st:38623f4b-7a05-441f-9da6-39cc71ca5a58%22 version=%221.0%22><service_tag><instance_urn>urn:st:14aa9f1c-8a07-4e99-ada1-a020589ad7fd</instance_urn><product_name>Java SE 6 Development Kit</product_name><product_version>1.6.0_25</product_version><product_urn>urn:uuid:b58ef9a8-5ae8-11db-a023-080020a9ed93</product_urn><product_parent_urn>urn:uuid:fdc90b21-018d-4cab-b866-612c7c119ed3</product_parent_urn><product_parent>Java Platform Standard Edition 6 (Java SE 6)</product_parent><product_defined_inst_id>id=1.6.0_25-b06 amd64,dir=/tmp/package-jdk/usr/lib64/jdk1.6.0_25/jre</product_defined_inst_id><product_vendor>Sun Microsystems</product_vendor><platform_arch>amd64</platform_arch><timestamp>2011-04-24 03:00:46 GMT</timestamp><container>global</container><source>jdk-6u25-fcs-bin-b06-linux-amd64-14_apr_2011.bin</source><installer_uid>-1</installer_uid></service_tag></registry></registration_data>">
                 <input type="submit" name="Submit"border="0" class="buttonblue" onmouseover="this.style.color='#fbe249';" onmouseout="this.style.color='#FFF';"  value="JDK 製�登録">
               </form></td>
-              <td width="570"><span class="style3">�� Sun 製�を登録�る���インター�ット�接続���る必���り��。 </span></td>
+              <td width="570"><span class="style3">�� Oracle 製�を登録�る���インター�ット�接続���る必���り��。 </span></td>
             </tr>
 	  </table>
 	</blockquote>
@@ -50,8 +75,8 @@ a:visited,a:visited code{color:#917E9C}
    <tr>
        <td>&nbsp;</td>
 	<td bgcolor="#f1f7df">
-        <p class="style3">Sun Microsystems, Inc. ���客様�プライ�シーを尊����。 �客様�個人情報���客様� Sun オンラインアカウント��客様� Sun オンラインアカウントを使用��アクセス�るサービス�アプリケーション��よ��客様� Sun オンラインアカウント�登録�る製��システム�通信�管��使用���。</p>
-                <p class="style3">登録�際��集�れるデータや��れら���よ��管��れる������詳細��<br><a href="http://java.sun.com/javase/ja/registration/JDKRegistrationPrivacy.html">http://java.sun.com/javase/ja/registration/JDKRegistrationPrivacy.html</a> を�照������。 <br> <br> Sun �プライ�シー�リシー�����詳細��<a href="http://jp.sun.com/privacy/">http://jp.sun.com/privacy/</a> を�照�る��<a class="moz-txt-link-rfc2396E" href="http://jp.sun.com/cgi-bin/contact/comment.cgi?url=http://jp.sun.com/privacy/">������フォーム</a>�ら����������。</p></td>
+        <p class="style3">Oracle Corporation ���客様�プライ�シーを尊����。 �客様�個人情報���客様� Oracle.com アカウント��客様� Oracle.com アカウントを使用��アクセス�るサービス�アプリケーション��よ��客様� Oracle.com アカウント�登録�る製��システム�通信�管��使用���。</p>
+                <p class="style3">登録�際��集�れるデータや��れら���よ��管��れる������詳細��<br><a href="http://java.sun.com/javase/ja/registration/JDKRegistrationPrivacy.html">http://java.sun.com/javase/ja/registration/JDKRegistrationPrivacy.html</a> を�照������。 <br> <br> Oracle �プライ�シー�リシー�����詳細��<a href="http://www.oracle.com/html/privacy.html">http://www.oracle.com/html/privacy.html</a> を�照�る��<a class="moz-txt-link-rfc2396E" href="mailto:privacy_ww@oracle.com">������フォーム</a>�ら����������。</p></td>
   </tr>
   <tr>
     <td>&nbsp;</td>
diff --git a/extra/source/jdk-6/register_zh_CN.html b/extra/source/jdk-6/register_zh_CN.html
index 0656e82e..d17e3535 100644
--- a/extra/source/jdk-6/register_zh_CN.html
+++ b/extra/source/jdk-6/register_zh_CN.html
@@ -19,29 +19,29 @@ a:visited,a:visited code{color:#917E9C}
 <table border="0" cellpadding="3" cellspacing="0" width="813">
   <tbody><tr>
     <td height="78" width="7">&nbsp;</td>
-    <td align="left" valign="top" width="794"><img src="file:/tmp/package-jdk/usr/lib64/jdk1.6.0_20/jre/lib/servicetag/jdk_header.png" height="63" width="783"></td>
+    <td align="left" valign="top" width="794"><img src="file:/tmp/package-jdk/usr/lib64/jdk1.6.0_25/jre/lib/servicetag/jdk_header.png" height="63" width="783"></td>
   </tr>
 
   <tr>
     <td>&nbsp;</td>
 
-<td><p class="style1">感谢您安装 Sun Microsystems 的 <strong>Java Development Kit Version 6 Update 20</strong>。 </p>
+<td><p class="style1">感谢您安装 Oracle Corporation 的 <strong>Java Development Kit Version 6 Update 25</strong>。 </p>
 <p class="style1">注册产��您将获得如下增值�务：</p>
         <ul class="style1">
 <li> 获得新版本�修补程�和更新的通知�务</li>
-<li> 获得有关 Sun 开�者产���务和培训的优惠 </li>
+<li> 获得有关 Oracle 开�者产���务和培训的优惠 </li>
 <li> 获得对早期版本和文档的访问�� </li>
         </ul>
 <p class="style1">产�注册是�费的，�快速�轻��</p>
         <blockquote>
-<p class="style1">您需�具有 Sun 开�者网络或其他 Sun �机�户。如果您没有，系统将�示您创建一个。 </p>
+<p class="style1">您需�具有 Oracle.com �户。如果您没有，系统将�示您创建一个。 </p>
           <table width="708" border="0" cellspacing="0" cellpadding="3">
             <tr valign="top">
-              <td width="126" height="35"><form name="form1" method="post" action="https://inventory.sun.com/RegistrationWeb/register/urn:st:b1330404-f0ee-4a41-a965-2f4bd7482e3b?product=jdk&locale=zh_CN" enctype="text/xml">
-			  <input type="hidden" name="servicetag_payload" value="<?xml version=%221.0%22 encoding=%22UTF-8%22 standalone=%22no%22?><registration_data version=%221.0%22><environment><hostname>midas64</hostname><hostId>a8c0265d</hostId><osName>Linux</osName><osVersion>2.6.33.3</osVersion><osArchitecture>amd64</osArchitecture><systemModel>AuthenticAMD</systemModel><systemManufacturer>emachines</systemManufacturer><cpuManufacturer>AuthenticAMD</cpuManufacturer><serialNumber>ptnba0200193508e052700</serialNumber></environment><registry urn=%22urn:st:b1330404-f0ee-4a41-a965-2f4bd7482e3b%22 version=%221.0%22><service_tag><instance_urn>urn:st:4f6e7c38-ac6f-41da-8ebe-4d438a23e936</instance_urn><product_name>Java SE 6 Development Kit</product_name><product_version>1.6.0_20</product_version><product_urn>urn:uuid:b58ef9a8-5ae8-11db-a023-080020a9ed93</product_urn><product_parent_urn>urn:uuid:fdc90b21-018d-4cab-b866-612c7c119ed3</product_parent_urn><product_parent>Java Platform Standard Edition 6 (Java SE 6)</product_parent><product_defined_inst_id>id=1.6.0_20-b02 amd64,dir=/tmp/package-jdk/usr/lib64/jdk1.6.0_20/jre</product_defined_inst_id><product_vendor>Sun Microsystems</product_vendor><platform_arch>amd64</platform_arch><timestamp>2010-05-09 01:43:40 GMT</timestamp><container>global</container><source>jdk-6u20-fcs-bin-b02-linux-amd64-12_apr_2010.bin</source><installer_uid>-1</installer_uid></service_tag></registry></registration_data>">
+              <td width="126" height="35"><form name="form1" method="post" action="https://hs-ws1.oracle.com/RegistrationWeb/register/urn:st:38623f4b-7a05-441f-9da6-39cc71ca5a58?product=jdk&locale=zh_CN" enctype="text/xml">
+			  <input type="hidden" name="servicetag_payload" value="<?xml version=%221.0%22 encoding=%22UTF-8%22 standalone=%22no%22?><registration_data version=%221.0%22><environment><hostname>midas64</hostname><hostId>00000000</hostId><osName>Linux</osName><osVersion>2.6.37.6</osVersion><osArchitecture>amd64</osArchitecture><systemModel>AuthenticAMD</systemModel><systemManufacturer>emachines</systemManufacturer><cpuManufacturer>AuthenticAMD</cpuManufacturer><serialNumber>ptnba0200193508e052700</serialNumber></environment><registry urn=%22urn:st:38623f4b-7a05-441f-9da6-39cc71ca5a58%22 version=%221.0%22><service_tag><instance_urn>urn:st:14aa9f1c-8a07-4e99-ada1-a020589ad7fd</instance_urn><product_name>Java SE 6 Development Kit</product_name><product_version>1.6.0_25</product_version><product_urn>urn:uuid:b58ef9a8-5ae8-11db-a023-080020a9ed93</product_urn><product_parent_urn>urn:uuid:fdc90b21-018d-4cab-b866-612c7c119ed3</product_parent_urn><product_parent>Java Platform Standard Edition 6 (Java SE 6)</product_parent><product_defined_inst_id>id=1.6.0_25-b06 amd64,dir=/tmp/package-jdk/usr/lib64/jdk1.6.0_25/jre</product_defined_inst_id><product_vendor>Sun Microsystems</product_vendor><platform_arch>amd64</platform_arch><timestamp>2011-04-24 03:00:46 GMT</timestamp><container>global</container><source>jdk-6u25-fcs-bin-b06-linux-amd64-14_apr_2011.bin</source><installer_uid>-1</installer_uid></service_tag></registry></registration_data>">
 <input type="submit" name="Submit"border="0" class="buttonblue" onmouseover="this.style.color='#fbe249';" onmouseout="this.style.color='#FFF';"  value="注册我的 JDK">
               </form></td>
-<td width="570"><span class="style3">您需�连接到 Internet �注册此 Sun 产�。 </span></td>
+<td width="570"><span class="style3">您需�连接到 Internet �注册此 Oracle 产�。 </span></td>
             </tr>
 	  </table>
 	</blockquote>
@@ -50,8 +50,8 @@ a:visited,a:visited code{color:#917E9C}
     <tr>
        <td>&nbsp;</td>
 	<td bgcolor="#f1f7df">
-        <p class="style3">Sun Microsystems, Inc. 尊�您的��。我们会将您的个人信�用于通信和 Sun �机�户的管��Sun �机�户访问的�务和应用程�以�用于使用 Sun �机�户注册的产�和系统。</p>
-<p class="style3">有关注册过程中收集的数�以�这些数�的管�方�的更多信�，<br>请访问 <a href="http://java.sun.com/javase/registration/JDKRegistrationPrivacy.html">http://java.sun.com/javase/registration/JDKRegistrationPrivacy.html</a>。<br> <br>有关 Sun ��政策的更多信�，请访问 <a href="http://www.sun.com/privacy/">http://www.sun.com/privacy/</a> 或与 <a class="moz-txt-link-rfc2396E" href="mailto:privacy@sun.com">privacy@sun.com</a> �系。</p></td>
+        <p class="style3">Oracle 尊�您的��。我们会将您的个人信�用于通信和 Oracle.com �户的管��Oracle.com �户访问的�务和应用程�以�用于使用 Oracle.com �户注册的产�和系统。</p>
+<p class="style3">有关注册过程中收集的数�以�这些数�的管�方�的更多信�，<br>请访问 <a href="http://java.sun.com/javase/registration/JDKRegistrationPrivacy.html">http://java.sun.com/javase/registration/JDKRegistrationPrivacy.html</a>。<br> <br>有关 Oracle ��政策的更多信�，请访问 <a href="http://www.oracle.com/html/privacy.html">http://www.oracle.com/html/privacy.html</a> 或与 <a class="moz-txt-link-rfc2396E" href="mailto:privacy_ww@oracle.com">privacy_ww@oracle.com</a> �系。</p></td>
   </tr>
   <tr>
     <td>&nbsp;</td>
diff --git a/extra/source/jdk-6/slack-desc b/extra/source/jdk-6/slack-desc
index 9dafa417..57dfb7e0 100644
--- a/extra/source/jdk-6/slack-desc
+++ b/extra/source/jdk-6/slack-desc
@@ -5,14 +5,14 @@
 # exactly 11 lines for the formatting to be correct.  It's also customary to
 # leave one space after the ':'.
      |-----handy-ruler------------------------------------------------------|
-jdk: Java(TM) 2 Platform Standard Edition Development Kit 6.0 update 20.
+jdk: Java(TM) 2 Platform Standard Edition Development Kit.
 jdk:
 jdk: The Java 2 SDK software includes tools for developing, testing, and
 jdk: running programs written in the Java programming language.  This
 jdk: package contains everything you need to run Java(TM).
 jdk:
-jdk: For additional information, refer to this Sun Microsystems web page:
-jdk:   http://java.sun.com/
+jdk: For additional information, refer to this web page:
+jdk:   http://java.com/
 jdk:
 jdk:
 jdk:
diff --git a/extra/source/kde3-compat/arts/arts.SlackBuild b/extra/source/kde3-compat/arts/arts.SlackBuild
deleted file mode 100755
index a617c18c..00000000
--- a/extra/source/kde3-compat/arts/arts.SlackBuild
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-CWD=`pwd`
-TMP=/tmp
-PKG=$TMP/package-arts
-
-VERSION=${VERSION:-1.5.10}
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-opt1}
-
-rm -rf $PKG
-mkdir -p $PKG/opt/kde3
-
-# Avoid a version number in .la files:
-if [ -d /opt/kde3/lib64/qt3 ]; then
-  QTDIR=/opt/kde3/lib64/qt3
-fi
-cd $TMP
-echo "Building arts-$VERSION.tar.bz2..."
-tar xjvf $CWD/arts-$VERSION.tar.bz2
-cd arts-$VERSION
-
-QTDIR=/opt/kde3/lib64/qt3
-
-zcat $CWD/arts.tmpdir.diff.gz | patch -p1 --verbose || exit 1
-
-chown -R root:root .
-CFLAGS=$CPUOPT \
-CXXFLAGS=$CPUOPT \
-./configure \
-  --prefix=/opt/kde3 \
-  --libdir=/opt/kde3/lib64 \
-  --sysconfdir=/opt/kde3/etc \
-  --with-xinerama \
-  --disable-debug \
-  --program-prefix="" \
-  --program-suffix="" \
-  --build=$ARCH-slackware-linux
-make -j4 || exit 1
-make install DESTDIR=$PKG
-
-mkdir -p $PKG/usr/doc/arts-$VERSION
-cp -a \
-  COPYING* INSTALL doc/NEWS doc/README doc/TODO \
-  $PKG/usr/doc/arts-$VERSION
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-( 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
-  gzip -9 $PKG/usr/man/man?/*
-fi
-
-cd $PKG
-makepkg -l y -c n ../arts-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/extra/source/kde3-compat/arts/arts.tmpdir.diff b/extra/source/kde3-compat/arts/arts.tmpdir.diff
deleted file mode 100644
index f50472a1..00000000
--- a/extra/source/kde3-compat/arts/arts.tmpdir.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./mcop/mcoputils.cc.orig	2006-01-19 10:16:08.000000000 -0600
-+++ ./mcop/mcoputils.cc	2006-09-19 17:07:50.000000000 -0500
-@@ -47,7 +47,13 @@
-   result = lstat(tmp_dir, &stat_buf);
-   if ((result == -1) && (errno == ENOENT))
-   {
--    return 1;
-+    result = mkdir(tmp_dir, 0700);
-+    if (result == -1)
-+    {
-+       arts_warning("Error: Can not create directory \"%s\".\n", tmp_dir);
-+       return 1;
-+    }
-+    result = stat(tmp_dir, &stat_buf);
-   }
-   if ((result == -1) || (!S_ISDIR(stat_buf.st_mode)))
-   {
diff --git a/extra/source/kde3-compat/arts/slack-desc b/extra/source/kde3-compat/arts/slack-desc
deleted file mode 100644
index c7b45613..00000000
--- a/extra/source/kde3-compat/arts/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-    |-----handy-ruler------------------------------------------------------|
-arts: arts (Analog Realtime Synthesizer)
-arts:
-arts: aRts is the core sound system for KDE, and is short for "analog
-arts: realtime synthesizer".  aRts is designed to create or process sound
-arts: using small specialized modules.  These may create a waveform, play
-arts: samples, filter data, add signals, perform effects (like delay,
-arts: flanger or chorus), or output the data to the soundcard.
-arts:
-arts:
-arts:
-arts:
diff --git a/extra/source/kde3-compat/k3b3/k3b3.SlackBuild b/extra/source/kde3-compat/k3b3/k3b3.SlackBuild
deleted file mode 100755
index 186fbe7b..00000000
--- a/extra/source/kde3-compat/k3b3/k3b3.SlackBuild
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-CWD=`pwd`
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-k3b3
-
-VERSION=1.0.5
-ARCH=${ARCH:-x86_64}
-BUILD=opt1
-
-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"
-fi
-
-if [ ! -d $TMP ]; then
-  mkdir -p $TMP
-fi
-rm -rf $PKG
-mkdir -p $PKG
-cd $TMP
-rm -rf k3b-$VERSION
-tar xjvf $CWD/k3b-$VERSION.tar.bz2 || exit 1
-cd k3b-$VERSION
-chown -R root:root .
-find . -perm 777 -exec chmod 755 {} \;
-find . -perm 664 -exec chmod 644 {} \;
-
-QTDIR=/opt/kde3/lib64/qt3
-
-# ./configure --help lists --docdir, but it is ignored.  Oh well.
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/opt/kde3 \
-  --libdir=/opt/kde3/lib64 \
-  --sysconfdir=/etc/kde \
-  --docdir=/usr/doc \
-  --without-cdrecord-suid-root \
-  --program-prefix="" \
-  --program-suffix="" \
-  --build=$ARCH-slackware-linux
-make -j4 || exit 1
-make install DESTDIR=$PKG
-
-# Add a .desktop in the compatible location:
-mkdir -p $PKG/usr/share/applications/kde4
-( cd $PKG/usr/share/applications/kde4 ; ln -sf /opt/kde3/share/applications/kde/k3b.desktop k3b3.desktop )
-
-( 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/k3b-$VERSION
-cp -a \
-  AUTHORS COPYING COPYING-DOCS ChangeLog FAQ INSTALL KNOWNBUGS PERMISSIONS README RELEASE_HOWTO TODO k3b.lsm \
-  $PKG/usr/doc/k3b-$VERSION
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-makepkg -l y -c n $TMP/k3b3-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/extra/source/kde3-compat/k3b3/slack-desc b/extra/source/kde3-compat/k3b3/slack-desc
deleted file mode 100644
index 52856f6a..00000000
--- a/extra/source/kde3-compat/k3b3/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-    |-----handy-ruler------------------------------------------------------|
-k3b3: k3b3 (The CD Creator, KDE3 version)
-k3b3:
-k3b3: K3b makes writing cds under Linux easy.  It has an easy to use
-k3b3: interface and supports CD burning (including on-the-fly), copying,
-k3b3: erasing, ripping, and more.
-k3b3:
-k3b3: K3b was written by Sebastian Trueg, Thomas Froescher,
-k3b3: Christian Kvasny, and Klaus-Dieter Krannich.
-k3b3:
-k3b3: For more information, visit:  http://www.k3b.org
-k3b3:
diff --git a/extra/source/kde3-compat/kdelibs3/apply-patches.sh b/extra/source/kde3-compat/kdelibs3/apply-patches.sh
deleted file mode 100644
index 68190b0b..00000000
--- a/extra/source/kde3-compat/kdelibs3/apply-patches.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-zcat $CWD/kdelibs-utempter.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
-zcat $CWD/kdelibs.inotify.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
-zcat $CWD/kdelibs.no.inotify.externs.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
diff --git a/extra/source/kde3-compat/kdelibs3/kdelibs-utempter.diff b/extra/source/kde3-compat/kdelibs3/kdelibs-utempter.diff
deleted file mode 100644
index 4f7c8f3a..00000000
--- a/extra/source/kde3-compat/kdelibs3/kdelibs-utempter.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur kdelibs-3.5.7.orig/kdecore/kpty.cpp kdelibs-3.5.7/kdecore/kpty.cpp
---- kdelibs-3.5.7.orig/kdecore/kpty.cpp	2006-05-22 19:14:21.000000000 +0100
-+++ kdelibs-3.5.7/kdecore/kpty.cpp	2007-06-10 14:08:18.000000000 +0100
-@@ -401,7 +401,9 @@
- #ifdef HAVE_UTEMPTER
-     KProcess_Utmp utmp;
-     utmp.cmdFd = d->masterFd;
--    utmp << "/usr/sbin/utempter" << "-a" << d->ttyName << "";
-+    utmp << "/usr/lib/utempter/utempter" << "add";
-+    if (remotehost)
-+      utmp << remotehost;
-     utmp.start(KProcess::Block);
-     Q_UNUSED(user);
-     Q_UNUSED(remotehost);
-@@ -444,7 +446,7 @@
- #ifdef HAVE_UTEMPTER
-     KProcess_Utmp utmp;
-     utmp.cmdFd = d->masterFd;
--    utmp << "/usr/sbin/utempter" << "-d" << d->ttyName;
-+    utmp << "/usr/lib/utempter/utempter" << "del";
-     utmp.start(KProcess::Block);
- #elif defined(USE_LOGIN)
-     const char *str_ptr = d->ttyName.data();
diff --git a/extra/source/kde3-compat/kdelibs3/kdelibs.inotify.diff b/extra/source/kde3-compat/kdelibs3/kdelibs.inotify.diff
deleted file mode 100644
index 791b5e68..00000000
--- a/extra/source/kde3-compat/kdelibs3/kdelibs.inotify.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./kio/kio/kdirwatch.cpp.orig	2006-07-22 03:16:37.000000000 -0500
-+++ ./kio/kio/kdirwatch.cpp	2009-06-18 19:27:38.000000000 -0500
-@@ -71,7 +71,7 @@
- #include <linux/types.h>
- // Linux kernel headers are documented to not compile
- #define _S390_BITOPS_H
--#include <linux/inotify.h>
-+#include <sys/inotify.h>
- 
- static inline int inotify_init (void)
- {
diff --git a/extra/source/kde3-compat/kdelibs3/kdelibs.no.inotify.externs.diff b/extra/source/kde3-compat/kdelibs3/kdelibs.no.inotify.externs.diff
deleted file mode 100644
index ef06c1dc..00000000
--- a/extra/source/kde3-compat/kdelibs3/kdelibs.no.inotify.externs.diff
+++ /dev/null
@@ -1,37 +0,0 @@
---- ./kio/kio/kdirwatch.cpp.orig	2009-06-18 19:29:01.000000000 -0500
-+++ ./kio/kio/kdirwatch.cpp	2009-06-18 19:32:41.000000000 -0500
-@@ -73,20 +73,20 @@
- #define _S390_BITOPS_H
- #include <sys/inotify.h>
- 
--static inline int inotify_init (void)
--{
--  return syscall (__NR_inotify_init);
--}
--
--static inline int inotify_add_watch (int fd, const char *name, __u32 mask)
--{
--  return syscall (__NR_inotify_add_watch, fd, name, mask);
--}
--
--static inline int inotify_rm_watch (int fd, __u32 wd)
--{
--  return syscall (__NR_inotify_rm_watch, fd, wd);
--}
-+// static inline int inotify_init (void)
-+// {
-+//   return syscall (__NR_inotify_init);
-+// }
-+
-+// static inline int inotify_add_watch (int fd, const char *name, __u32 mask)
-+// {
-+//   return syscall (__NR_inotify_add_watch, fd, name, mask);
-+// }
-+
-+// static inline int inotify_rm_watch (int fd, __u32 wd)
-+// {
-+//   return syscall (__NR_inotify_rm_watch, fd, wd);
-+// }
- 
- #ifndef  IN_ONLYDIR
- #define  IN_ONLYDIR 0x01000000 
diff --git a/extra/source/kde3-compat/kdelibs3/kdelibs3.SlackBuild b/extra/source/kde3-compat/kdelibs3/kdelibs3.SlackBuild
deleted file mode 100755
index d197ea32..00000000
--- a/extra/source/kde3-compat/kdelibs3/kdelibs3.SlackBuild
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh
-CWD=`pwd`
-TMP=/tmp
-PKG=$TMP/package-kdelibs
-
-# Set the config option variables if they are not already set:
-if [ -r ../KDE.options ]; then
-  . ../KDE.options
-fi
-
-# The global options may be overridden here (if needed):
-if [ -r ./local.options ]; then
-  . ./local.options
-fi
-
-rm -rf $PKG
-mkdir -p $PKG/usr
-
-# Avoid a version number in .la files:
-if [ -d /opt/kde3/lib64/qt ]; then
-  QTDIR=/opt/kde3/lib64/qt3
-fi
-
-cd $TMP
-echo "Building kdelibs-$VERSION.tar.bz2..."
-tar xjvf $CWD/kdelibs-$VERSION.tar.bz2 || exit 1
-cd kdelibs-$VERSION || exit 1
-
-if [ -r $CWD/apply-patches.sh ]; then
-  . $CWD/apply-patches.sh
-fi
-
-chown -R root:root .
-CFLAGS=$CPUOPT \
-CXXFLAGS=$CPUOPT \
-./configure \
-  --prefix=/opt/kde3 \
-  --libdir=/opt/kde3/lib64 \
-  --sysconfdir=/opt/kde3/etc \
-  --with-ssl-dir=/usr \
-  --with-xinerama \
-  --disable-debug \
-  --enable-dnotify \
-  --program-prefix="" \
-  --program-suffix="" \
-  --build=$TARGET-slackware-linux
-
-make $NUMJOBS || exit 1
-make install DESTDIR=$PKG
-
-mkdir -p $PKG/usr/doc/kdelibs-$VERSION
-cp -a \
-  AUTHORS COMPILING COMPILING.html COPYING* DEBUG INSTALL KDE2PORTING.html KDE3PORTING.html NAMING README  kdelibs.lsm \
-  $PKG/usr/doc/kdelibs-$VERSION
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-( 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
-  gzip -9 $PKG/usr/man/man?/*
-fi
-
-cd $PKG
-makepkg -l y -c n ../kdelibs3-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/extra/source/kde3-compat/kdelibs3/local.options b/extra/source/kde3-compat/kdelibs3/local.options
deleted file mode 100644
index 05670327..00000000
--- a/extra/source/kde3-compat/kdelibs3/local.options
+++ /dev/null
@@ -1,4 +0,0 @@
-VERSION=3.5.10
-ARCH=x86_64
-TARGET=x86_64
-BUILD=opt1
diff --git a/extra/source/kde3-compat/kdelibs3/slack-desc b/extra/source/kde3-compat/kdelibs3/slack-desc
deleted file mode 100644
index b6e75d1d..00000000
--- a/extra/source/kde3-compat/kdelibs3/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-kdelibs3: kdelibs3 (KDE3 runtime libraries)
-kdelibs3:
-kdelibs3: System libraries and other resources required by KDE3.
-kdelibs3:
-kdelibs3:
-kdelibs3:
-kdelibs3:
-kdelibs3:
-kdelibs3:
-kdelibs3:
-kdelibs3:
diff --git a/extra/source/kde3-compat/qt3/doinst.sh b/extra/source/kde3-compat/qt3/doinst.sh
deleted file mode 100644
index d57fb031..00000000
--- a/extra/source/kde3-compat/qt3/doinst.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-## This was causing problems compiling KDE for unknown reasons.
-## So, we'll symlink the libraries into /opt/kde3 again...
-# Add QT library directory to /etc/ld.so.conf:
-if ! grep /opt/kde3/lib etc/ld.so.conf 1> /dev/null 2> /dev/null ; then
-  echo "/opt/kde3/lib" >> etc/ld.so.conf
-fi
-if [ -x /sbin/ldconfig ]; then
-  /sbin/ldconfig 2> /dev/null
-fi
diff --git a/extra/source/kde3-compat/qt3/profile.d/qt.csh b/extra/source/kde3-compat/qt3/profile.d/qt.csh
deleted file mode 100755
index 490877c4..00000000
--- a/extra/source/kde3-compat/qt3/profile.d/qt.csh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/csh
-# Environment path variables for the Qt package:
-if ( ! $?QTDIR ) then
-    # It's best to use the generic directory to avoid
-    # compiling in a version-containing path:
-    if ( -d /opt/kde3/lib/qt3 ) then
-        setenv QTDIR /opt/kde3/lib/qt3
-    else
-        # Find the newest Qt directory and set $QTDIR to that:
-        foreach qtd ( /opt/kde3/lib/qt-* )
-            if ( -d $qtd ) then
-                setenv QTDIR $qtd
-            endif
-        end
-    endif
-endif
-set path = ( $path $QTDIR/bin /opt/kde3/bin )
-if ( $?CPLUS_INCLUDE_PATH ) then
-    setenv CPLUS_INCLUDE_PATH $QTDIR/include:$CPLUS_INCLUDE_PATH
-else
-    setenv CPLUS_INCLUDE_PATH $QTDIR/include
-endif
diff --git a/extra/source/kde3-compat/qt3/profile.d/qt.sh b/extra/source/kde3-compat/qt3/profile.d/qt.sh
deleted file mode 100755
index c4e23bb5..00000000
--- a/extra/source/kde3-compat/qt3/profile.d/qt.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# Environment variables for the Qt package.
-#
-# It's best to use the generic directory to avoid
-# compiling in a version-containing path:
-if [ -d /opt/kde3/lib/qt3 ]; then
-  QTDIR=/opt/kde3/lib/qt3
-else
-  # Find the newest Qt directory and set $QTDIR to that:
-  for qtd in /opt/kde3/lib/qt-* ; do
-    if [ -d $qtd ]; then
-      QTDIR=$qtd
-    fi
-  done
-fi
-if [ ! "$CPLUS_INCLUDE_PATH" = "" ]; then
-  CPLUS_INCLUDE_PATH=$QTDIR/include:$CPLUS_INCLUDE_PATH
-else
-  CPLUS_INCLUDE_PATH=$QTDIR/include
-fi
-PATH="$PATH:$QTDIR/bin:/opt/kde3/bin"
-export QTDIR
-export CPLUS_INCLUDE_PATH
diff --git a/extra/source/kde3-compat/qt3/qt-x11.diff b/extra/source/kde3-compat/qt3/qt-x11.diff
deleted file mode 100644
index 74453f21..00000000
--- a/extra/source/kde3-compat/qt3/qt-x11.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/kernel/qgif.h.orig	Tue Mar 19 02:31:42 2002
-+++ ./src/kernel/qgif.h	Sun Mar 24 22:14:19 2002
-@@ -47,7 +47,7 @@
- #endif // QT_H
- 
- #ifndef QT_BUILTIN_GIF_READER
--#define QT_BUILTIN_GIF_READER 0
-+#define QT_BUILTIN_GIF_READER 1
- #endif
- 
- bool qt_builtin_gif_reader();
diff --git a/extra/source/kde3-compat/qt3/qt.mysql.h.diff b/extra/source/kde3-compat/qt3/qt.mysql.h.diff
deleted file mode 100644
index 2d6fca5a..00000000
--- a/extra/source/kde3-compat/qt3/qt.mysql.h.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/sql/drivers/mysql/qsql_mysql.h.orig	2002-04-15 03:05:53.000000000 -0700
-+++ ./src/sql/drivers/mysql/qsql_mysql.h	2002-10-14 14:59:36.000000000 -0700
-@@ -46,7 +46,7 @@
- #include <qt_windows.h>
- #endif
- 
--#include <mysql.h>
-+#include <mysql/mysql.h>
- 
- #ifdef QT_PLUGIN
- #define Q_EXPORT_SQLDRIVER_MYSQL
diff --git a/extra/source/kde3-compat/qt3/qt.x86.cflags.diff b/extra/source/kde3-compat/qt3/qt.x86.cflags.diff
deleted file mode 100644
index 880037c2..00000000
--- a/extra/source/kde3-compat/qt3/qt.x86.cflags.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./mkspecs/linux-g++/qmake.conf.orig	Fri Apr 26 00:48:00 2002
-+++ ./mkspecs/linux-g++/qmake.conf	Tue May  7 12:05:04 2002
-@@ -18,7 +18,7 @@
- QMAKE_CFLAGS_DEPS	= -M
- QMAKE_CFLAGS_WARN_ON	= -Wall -W
- QMAKE_CFLAGS_WARN_OFF	= -w
--QMAKE_CFLAGS_RELEASE	= -O2
-+QMAKE_CFLAGS_RELEASE	= -O2 -march=i486 -mtune=i686
- QMAKE_CFLAGS_DEBUG	= -g
- QMAKE_CFLAGS_SHLIB	= -fPIC
- QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
diff --git a/extra/source/kde3-compat/qt3/qt3.SlackBuild b/extra/source/kde3-compat/qt3/qt3.SlackBuild
deleted file mode 100755
index d32d283e..00000000
--- a/extra/source/kde3-compat/qt3/qt3.SlackBuild
+++ /dev/null
@@ -1,192 +0,0 @@
-#!/bin/sh
-# Copyright 2006, 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.
-
-# Build with NODEVEL=<something> after building the other deps to get rid of
-# the .so, include, and other files not needed for runtime.
-
-PKGNAM=qt3
-VERSION=${VERSION:-3.3.8b}
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-opt2}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-${PKGNAM}
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-# Don't build a devel package (but put a devel SYSTEM on this machine...)
-NODEVEL=true
-
-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
-# I have *many* times tried building this package in /tmp, and it always
-# ends up with a "/tmp" directory embedded in some wrong place.  Hopefully
-# the next time I see this comment I'll remember that and not make the
-# same mistake again just for the sake of doing things "right" (but having
-# the package come out wrong...)
-#rm -rf ${PKGNAM}-${VERSION}
-mkdir -p /opt/kde3/lib${LIBDIRSUFFIX}
-cd /opt/kde3/lib${LIBDIRSUFFIX}
-rm -rf qt-3* qt3 qt-3.* qt3-*
-tar xvf $CWD/qt-x11-free-$VERSION.tar.bz2 || exit 1
-mv qt-x11-free-$VERSION qt3
-cd qt3
-
-if [ $ARCH = "i486" ]; then
-  zcat $CWD/qt.x86.cflags.diff.gz | patch -p1 || exit 1
-fi
-
-zcat $CWD/qt-x11.diff.gz | patch -p1 || exit 1
-zcat $CWD/qt.mysql.h.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 {} \;
-
-QTDIR=/opt/kde3/lib${LIBDIRSUFFIX}/qt3
-
-# And here's what we are currently using.  The "yes" agrees to the GPL, so don't run this script if you
-# don't agree.  :-)
-echo "yes" | CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" ./configure \
- -prefix /opt/kde3/lib${LIBDIRSUFFIX}/qt3-${VERSION} \
- -release \
- -system-zlib \
- -system-libpng \
- -qt-imgfmt-png \
- -system-libmng \
- -qt-imgfmt-mng \
- -system-libjpeg \
- -qt-imgfmt-jpeg \
- -qt-gif \
- -thread \
- -stl \
- -no-g++-exceptions \
- -xft \
- -plugin-sql-mysql \
- -plugin-style-cde \
- -plugin-style-compact \
- -qt-style-motif \
- -plugin-style-motifplus \
- -plugin-style-platinum \
- -plugin-style-sgi \
- -plugin-style-windows \
- -enable-opengl
-
-# We're using '-i' to work around a bug where the build tries to strip html files.
-# Build the important stuff:
-make $NUMJOBS -i
-make install || exit 1
-make $NUMJOBS -i symlinks sub-src sub-tools
-make install || exit 1
-make install INSTALL_ROOT=$PKG || exit 1
-# Link the shared libraries into /opt/kde3/lib.
-( cd /opt/kde3/lib${LIBDIRSUFFIX}
-  for file in qt3/lib/*.so* ; do
-    ln -sf $file .
-  done
-)
-
-# Leave these out so as not to interfere with Qt4:
-if [ -z "$NODEVEL" ]; then
-  # Add man pages:
-  mkdir -p $PKG/usr/man
-  cp -a doc/man/* $PKG/usr/man
-  find $PKG/usr/man -type f -exec gzip -9 "{}" \;
-fi
-
-if [ $ARCH = "i486" ]; then
-  # Put this back as shipped:
-  ( cd $PKG/opt/kde3/lib/qt3-${VERSION}
-    zcat $CWD/qt.x86.cflags.diff.gz | patch -p1 -R )
-fi
-
-mkdir -p $PKG/etc/profile.d
-cat $CWD/profile.d/qt.sh  | sed -e "s#/lib#/lib${LIBDIRSUFFIX}#" \
-  > $PKG/etc/profile.d/qt.sh
-cat $CWD/profile.d/qt.csh | sed -e "s#/lib#/lib${LIBDIRSUFFIX}#" \
-  > $PKG/etc/profile.d/qt.csh
-chmod 755 $PKG/etc/profile.d/*
-
-# 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
-
-# Put a ton of links to more "normal" places.  I'd just use a prefix of /usr, but it
-# creates a ton of new (and ambiguously named) /usr directories...
-
-mkdir -p $PKG/opt/kde3/bin
-( cd $PKG/opt/kde3/bin
-  for file in assistant designer linguist lrelease lupdate moc qm2ts qmake qtconfig uic ; do
-    ln -sf /opt/kde3/lib${LIBDIRSUFFIX}/qt3/bin/$file .
-  done
-)
-
-sed -i -e "s#/lib\$#/lib${LIBDIRSUFFIX}#" \
-  $PKG/opt/kde3/lib${LIBDIRSUFFIX}/qt3-$VERSION/lib/pkgconfig/qt-mt.pc || exit 1
-mkdir -p $PKG/opt/kde3/lib${LIBDIRSUFFIX}/pkgconfig
-( cd $PKG/opt/kde3/lib${LIBDIRSUFFIX}/pkgconfig
-  ln -sf /opt/kde3/lib${LIBDIRSUFFIX}/qt3/lib/pkgconfig/qt-mt.pc .
-)
-
-# Add a documentation directory:
-mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
-cp -a \
-  FAQ INSTALL LICENSE.GPL* LICENSE.QPL MANIFEST PLATFORMS README* changes* \
-  $PKG/usr/doc/${PKGNAM}-$VERSION
-
-# Put the actual file tree in /opt/kde3/lib/qt3:
-mv $PKG/opt/kde3/lib${LIBDIRSUFFIX}/qt3-${VERSION} $PKG/opt/kde3/lib${LIBDIRSUFFIX}/qt3
-( cd $PKG/opt/kde3/lib${LIBDIRSUFFIX} ; ln -sf qt3 qt3-${VERSION})
-
-( cd $PKG/opt/kde3/lib${LIBDIRSUFFIX}
-  for file in qt3/lib/*.so* ; do
-    ln -sf $file .
-  done
-)
-
-# This much documentation isn't needed for the compat qt3 package -- look in the
-# source if you need it.
-rm -rf $PKG/opt/kde3/lib${LIBDIRSUFFIX}/qt3/doc
-
-mkdir -p $PKG/install
-zcat $CWD/doinst.sh.gz | sed -e "s#/lib#/lib${LIBDIRSUFFIX}#" \
-  > $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/extra/source/kde3-compat/qt3/slack-desc b/extra/source/kde3-compat/qt3/slack-desc
deleted file mode 100644
index dc7ea57e..00000000
--- a/extra/source/kde3-compat/qt3/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-   |-----handy-ruler------------------------------------------------------|
-qt3: Qt3 (a multi-platform C++ graphical user interface toolkit, version 3)
-qt3:
-qt3: Qt is a complete and well-developed object-oriented framework for
-qt3: developing graphical user interface (GUI) applications using C++.
-qt3:
-qt3: This release is free only for development of free software for the X
-qt3: Window System.  If you use Qt for developing commercial or other
-qt3: non-free software, you must have a professional license.  Please see
-qt3: http://www.trolltech.com/purchase.html for information on how to
-qt3: obtain a professional license.
-qt3:
diff --git a/extra/source/pam/make-pam-solibs-for-chrome.sh b/extra/source/pam/make-pam-solibs-for-chrome.sh
new file mode 100755
index 00000000..e7cd4c9e
--- /dev/null
+++ b/extra/source/pam/make-pam-solibs-for-chrome.sh
@@ -0,0 +1,84 @@
+#!/bin/sh
+ 
+# Copyright 2011  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.
+
+# This expects to find a file pam-*.txz in the local directory that
+# will contain a usable PAM shared library to satify the requirement
+# for that library.  To get whatever is actually using PAM working is
+# going to need more PAM structure installed, but luckily I've yet to
+# encounter what needs it and everything works fine with only the
+# libpam.so.0 installed.
+
+if ! ls pam-*-*-*.txz 1> /dev/null 2> /dev/null ; then
+  echo "FAIL:  no Slackware pam txz package found."
+  exit 1
+fi
+
+PKGNAM=google-chrome-pam-solibs
+VERSION=${VERSION:-$(echo pam-*-*-*.txz | cut -f 2 -d -)}
+ARCH=${ARCH:-$(echo pam-*-*-*.txz | cut -f 3 -d -)}
+BUILD=${BUILD:-$(echo pam-*-*-*.txz | cut -f 4 -d - | cut -f 1 -d .)}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $PKG
+mkdir tmp
+( cd tmp
+  explodepkg $CWD/pam-$VERSION-$ARCH-$BUILD.txz
+  sh install/doinst.sh
+)
+mkdir -p $PKG/opt/google/chrome
+if [ -d tmp/lib64 ]; then
+  cp -a tmp/lib64/libpam.so.0* $PKG/opt/google/chrome
+else
+  cp -a tmp/lib/libpam.so.0* $PKG/opt/google/chrome
+fi
+rm -rf $PKG/tmp
+
+mkdir -p $PKG/install
+cat << EOF > $PKG/install/slack-desc
+# 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------------------------------------------------------|
+google-chrome-pam-solibs: google-chrome-pam-solibs (libpam.so.0)
+google-chrome-pam-solibs:
+google-chrome-pam-solibs: This is a package that provides libpam.so.0 to satisfy the library
+google-chrome-pam-solibs: requirement for Google Chrome when that is installed in the
+google-chrome-pam-solibs: usual /opt/google/chrome directory.  It does not provide any other
+google-chrome-pam-solibs: PAM features, and cannot be used to compile against or by other
+google-chrome-pam-solibs: programs.  If you need real PAM for some reason (like to compile
+google-chrome-pam-solibs: Chromium), please see the pam.SlackBuild in the source directory.
+google-chrome-pam-solibs:
+google-chrome-pam-solibs:
+google-chrome-pam-solibs:
+EOF
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD$TAG.txz
+
diff --git a/extra/source/pam/pam.SlackBuild b/extra/source/pam/pam.SlackBuild
new file mode 100755
index 00000000..bbea0617
--- /dev/null
+++ b/extra/source/pam/pam.SlackBuild
@@ -0,0 +1,173 @@
+#!/bin/sh
+ 
+# Copyright 2010  Vincent Batts, vbatts@hashbangbash.com
+# Copyright 2010, 2011  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.
+
+# Call the church police!  ;-)
+SRCNAM=Linux-PAM
+PKGNAM=pam
+PAMRHVER=${PAMRHVER:-$(echo pam-redhat-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1,2 -d - | rev)}
+VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:--j7}
+
+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"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1
+cd $SRCNAM-$VERSION || exit 1
+
+# Better take the Red Hat added modules and patches, because that's very
+# likely to be the most standard as far as PAM goes:
+tar xvf $CWD/pam-redhat-$PAMRHVER.tar.?z* || exit 1
+mv pam-redhat-$PAMRHVER/{CHANGELOG*,COPYING*,README*} .
+mv pam-redhat-$PAMRHVER/* modules
+zcat $CWD/patches/pam-1.0.90-redhat-modules.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/pam-1.0.91-std-noclose.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/pam-1.1.0-notally.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/pam-1.1.1-faillock.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/pam-1.1.2-noflex.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/pam-1.1.3-faillock-screensaver.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/pam-1.1.3-limits-nosetreuid.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/pam-1.1.3-limits-range.patch.gz | patch -p0 --verbose || exit 1
+zcat $CWD/patches/pam-1.1.3-nouserenv.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/pam-1.1.3-pwhistory-incomplete.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/pam-1.1.3-securetty-console.patch.gz | patch -p0 --verbose || exit 1
+
+# Churn some patches from .am -> .in:
+autoreconf -f
+
+# Make these 2 man pages or the build falls over later on:
+( cd modules/pam_faillock
+  xmlto man faillock.8.xml
+  xmlto man pam_faillock.8.xml
+)
+
+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=/ \
+  --libdir=/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --includedir=/usr/include/security \
+  --datarootdir=/usr/share \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --enable-read-both-confs \
+  --disable-prelude \
+  --disable-selinux \
+  --build=$ARCH-slackware-linux || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# this is a pam helper, that can only be called from pam
+chown root:shadow $PKG/sbin/unix_chkpwd
+chmod g+s $PKG/sbin/unix_chkpwd
+
+# 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 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/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* Copyright NEWS README* \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+if [ -r CHANGELOG ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat CHANGELOG | head -n 1000 > $DOCSDIR/CHANGELOG
+  touch -r CHANGELOG $DOCSDIR/CHANGELOG
+fi
+rm -f $PKG/usr/doc/$PKGNAM-$VERSION/index.html
+
+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$TAG.txz
+
diff --git a/extra/source/pam/patches/pam-1.0.90-redhat-modules.patch b/extra/source/pam/patches/pam-1.0.90-redhat-modules.patch
new file mode 100644
index 00000000..3ad41ccc
--- /dev/null
+++ b/extra/source/pam/patches/pam-1.0.90-redhat-modules.patch
@@ -0,0 +1,23 @@
+diff -up Linux-PAM-1.0.90/modules/Makefile.am.redhat-modules Linux-PAM-1.0.90/modules/Makefile.am
+--- Linux-PAM-1.0.90/modules/Makefile.am.redhat-modules	2008-11-29 08:27:35.000000000 +0100
++++ Linux-PAM-1.0.90/modules/Makefile.am	2008-12-16 13:40:16.000000000 +0100
+@@ -3,6 +3,7 @@
+ #
+ 
+ SUBDIRS = pam_access pam_cracklib pam_debug pam_deny pam_echo \
++	pam_chroot pam_console pam_postgresok \
+ 	pam_env pam_exec pam_faildelay pam_filter pam_ftp \
+ 	pam_group pam_issue pam_keyinit pam_lastlog pam_limits \
+ 	pam_listfile pam_localuser pam_loginuid pam_mail \
+diff -up Linux-PAM-1.0.90/configure.in.redhat-modules Linux-PAM-1.0.90/configure.in
+--- Linux-PAM-1.0.90/configure.in.redhat-modules	2008-12-02 16:25:01.000000000 +0100
++++ Linux-PAM-1.0.90/configure.in	2008-12-16 13:39:11.000000000 +0100
+@@ -531,6 +531,8 @@ AC_CONFIG_FILES([Makefile libpam/Makefil
+ 	libpam_misc/Makefile conf/Makefile conf/pam_conv1/Makefile \
+ 	po/Makefile.in \
+ 	modules/Makefile \
++	modules/pam_chroot/Makefile modules/pam_console/Makefile \
++	modules/pam_postgresok/Makefile \
+ 	modules/pam_access/Makefile modules/pam_cracklib/Makefile \
+         modules/pam_debug/Makefile modules/pam_deny/Makefile \
+ 	modules/pam_echo/Makefile modules/pam_env/Makefile \
diff --git a/extra/source/pam/patches/pam-1.0.91-std-noclose.patch b/extra/source/pam/patches/pam-1.0.91-std-noclose.patch
new file mode 100644
index 00000000..73594849
--- /dev/null
+++ b/extra/source/pam/patches/pam-1.0.91-std-noclose.patch
@@ -0,0 +1,98 @@
+diff -up Linux-PAM-1.0.91/modules/pam_mkhomedir/pam_mkhomedir.c.std-noclose Linux-PAM-1.0.91/modules/pam_mkhomedir/pam_mkhomedir.c
+--- Linux-PAM-1.0.91/modules/pam_mkhomedir/pam_mkhomedir.c.std-noclose	2009-03-03 14:56:01.000000000 +0100
++++ Linux-PAM-1.0.91/modules/pam_mkhomedir/pam_mkhomedir.c	2009-03-26 10:02:15.000000000 +0100
+@@ -131,13 +131,21 @@ create_homedir (pam_handle_t *pamh, int 
+    if (child == 0) {
+         int i;
+         struct rlimit rlim;
++	int dummyfds[2];
+ 	static char *envp[] = { NULL };
+ 	char *args[] = { NULL, NULL, NULL, NULL, NULL };
+ 
++	/* replace std file descriptors with a dummy pipe */
++	if (pipe(dummyfds) == 0) {
++		dup2(dummyfds[0], STDIN_FILENO);
++		dup2(dummyfds[1], STDOUT_FILENO);
++		dup2(dummyfds[1], STDERR_FILENO);
++	}
++
+ 	if (getrlimit(RLIMIT_NOFILE, &rlim)==0) {
+           if (rlim.rlim_max >= MAX_FD_NO)
+                 rlim.rlim_max = MAX_FD_NO;
+-	  for (i=0; i < (int)rlim.rlim_max; i++) {
++	  for (i = STDERR_FILENO + 1; i < (int)rlim.rlim_max; i++) {
+ 	  	close(i);
+ 	  }
+ 	}
+diff -up Linux-PAM-1.0.91/modules/pam_unix/support.c.std-noclose Linux-PAM-1.0.91/modules/pam_unix/support.c
+--- Linux-PAM-1.0.91/modules/pam_unix/support.c.std-noclose	2009-03-03 14:56:01.000000000 +0100
++++ Linux-PAM-1.0.91/modules/pam_unix/support.c	2009-03-26 10:08:59.000000000 +0100
+@@ -443,13 +443,16 @@ static int _unix_run_helper_binary(pam_h
+ 
+ 	/* reopen stdin as pipe */
+ 	dup2(fds[0], STDIN_FILENO);
++	/* and replace also the stdout/err as the helper will
++           not write anything there */
++	dup2(fds[1], STDOUT_FILENO);
++	dup2(fds[1], STDERR_FILENO);
+ 
+ 	if (getrlimit(RLIMIT_NOFILE,&rlim)==0) {
+           if (rlim.rlim_max >= MAX_FD_NO)
+                 rlim.rlim_max = MAX_FD_NO;
+-	  for (i=0; i < (int)rlim.rlim_max; i++) {
+-		if (i != STDIN_FILENO)
+-	  	   close(i);
++	  for (i = STDERR_FILENO + 1; i < (int)rlim.rlim_max; i++) {
++	  	close(i);
+ 	  }
+ 	}
+ 
+diff -up Linux-PAM-1.0.91/modules/pam_unix/pam_unix_passwd.c.std-noclose Linux-PAM-1.0.91/modules/pam_unix/pam_unix_passwd.c
+--- Linux-PAM-1.0.91/modules/pam_unix/pam_unix_passwd.c.std-noclose	2009-03-03 14:56:01.000000000 +0100
++++ Linux-PAM-1.0.91/modules/pam_unix/pam_unix_passwd.c	2009-03-26 10:07:06.000000000 +0100
+@@ -175,13 +175,16 @@ static int _unix_run_update_binary(pam_h
+ 
+ 	/* reopen stdin as pipe */
+ 	dup2(fds[0], STDIN_FILENO);
++	/* and replace also the stdout/err as the helper will
++           not write anything there */
++	dup2(fds[1], STDOUT_FILENO);
++	dup2(fds[1], STDERR_FILENO);
+ 
+ 	if (getrlimit(RLIMIT_NOFILE,&rlim)==0) {
+ 	  if (rlim.rlim_max >= MAX_FD_NO)
+ 	    rlim.rlim_max = MAX_FD_NO;
+-	  for (i=0; i < (int)rlim.rlim_max; i++) {
+-	    if (i != STDIN_FILENO)
+-	  	   close(i);
++	  for (i = STDERR_FILENO + 1; i < (int)rlim.rlim_max; i++) {
++	    close(i);
+ 	  }
+ 	}
+ 
+diff -up Linux-PAM-1.0.91/modules/pam_unix/pam_unix_acct.c.std-noclose Linux-PAM-1.0.91/modules/pam_unix/pam_unix_acct.c
+--- Linux-PAM-1.0.91/modules/pam_unix/pam_unix_acct.c.std-noclose	2009-03-03 14:56:01.000000000 +0100
++++ Linux-PAM-1.0.91/modules/pam_unix/pam_unix_acct.c	2009-03-26 10:05:41.000000000 +0100
+@@ -100,16 +100,18 @@ int _unix_run_verify_binary(pam_handle_t
+ 
+     /* reopen stdout as pipe */
+     dup2(fds[1], STDOUT_FILENO);
++    /* and replace also the stdin, stderr so we do not exec the helper with
++       tty as stdin, it will not read anything from there anyway */
++    dup2(fds[0], STDIN_FILENO);
++    dup2(fds[1], STDERR_FILENO);
+ 
+     /* XXX - should really tidy up PAM here too */
+ 
+     if (getrlimit(RLIMIT_NOFILE,&rlim)==0) {
+       if (rlim.rlim_max >= MAX_FD_NO)
+         rlim.rlim_max = MAX_FD_NO;
+-      for (i=0; i < (int)rlim.rlim_max; i++) {
+-	if (i != STDOUT_FILENO) {
+-	  close(i);
+-	}
++      for (i = STDERR_FILENO + 1; i < (int)rlim.rlim_max; i++) {
++	close(i);
+       }
+     }
+ 
diff --git a/extra/source/pam/patches/pam-1.1.0-notally.patch b/extra/source/pam/patches/pam-1.1.0-notally.patch
new file mode 100644
index 00000000..9327eecb
--- /dev/null
+++ b/extra/source/pam/patches/pam-1.1.0-notally.patch
@@ -0,0 +1,12 @@
+diff -up Linux-PAM-1.1.0/modules/Makefile.am.notally Linux-PAM-1.1.0/modules/Makefile.am
+--- Linux-PAM-1.1.0/modules/Makefile.am.notally	2009-07-27 17:39:25.000000000 +0200
++++ Linux-PAM-1.1.0/modules/Makefile.am	2009-09-01 17:40:16.000000000 +0200
+@@ -10,7 +10,7 @@ SUBDIRS = pam_access pam_cracklib pam_de
+ 	pam_mkhomedir pam_motd pam_namespace pam_nologin \
+ 	pam_permit pam_pwhistory pam_rhosts pam_rootok pam_securetty \
+ 	pam_selinux pam_sepermit pam_shells pam_stress \
+-	pam_succeed_if pam_tally pam_tally2 pam_time pam_timestamp \
++	pam_succeed_if pam_tally2 pam_time pam_timestamp \
+ 	pam_tty_audit pam_umask \
+ 	pam_unix pam_userdb pam_warn pam_wheel pam_xauth
+ 
diff --git a/extra/source/pam/patches/pam-1.1.1-faillock.patch b/extra/source/pam/patches/pam-1.1.1-faillock.patch
new file mode 100644
index 00000000..46f30374
--- /dev/null
+++ b/extra/source/pam/patches/pam-1.1.1-faillock.patch
@@ -0,0 +1,1712 @@
+diff -up Linux-PAM-1.1.1/configure.in.faillock Linux-PAM-1.1.1/configure.in
+--- Linux-PAM-1.1.1/configure.in.faillock	2010-09-17 15:58:41.000000000 +0200
++++ Linux-PAM-1.1.1/configure.in	2010-09-17 15:58:41.000000000 +0200
+@@ -539,7 +539,7 @@ AC_CONFIG_FILES([Makefile libpam/Makefil
+ 	modules/pam_access/Makefile modules/pam_cracklib/Makefile \
+         modules/pam_debug/Makefile modules/pam_deny/Makefile \
+ 	modules/pam_echo/Makefile modules/pam_env/Makefile \
+-	modules/pam_faildelay/Makefile \
++	modules/pam_faildelay/Makefile modules/pam_faillock/Makefile \
+ 	modules/pam_filter/Makefile modules/pam_filter/upperLOWER/Makefile \
+ 	modules/pam_ftp/Makefile modules/pam_group/Makefile \
+ 	modules/pam_issue/Makefile modules/pam_keyinit/Makefile \
+diff -up Linux-PAM-1.1.1/doc/sag/pam_faillock.xml.faillock Linux-PAM-1.1.1/doc/sag/pam_faillock.xml
+--- Linux-PAM-1.1.1/doc/sag/pam_faillock.xml.faillock	2010-09-17 16:05:56.000000000 +0200
++++ Linux-PAM-1.1.1/doc/sag/pam_faillock.xml	2010-09-17 16:08:26.000000000 +0200
+@@ -0,0 +1,38 @@
++<?xml version='1.0' encoding='UTF-8'?>
++<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
++        "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
++<section id='sag-pam_faillock'>
++  <title>pam_faillock - temporarily locking access based on failed authentication attempts during an interval</title>
++  <cmdsynopsis>
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++     href="../../modules/pam_faillock/pam_faillock.8.xml" xpointer='xpointer(//cmdsynopsis[@id = "pam_faillock-cmdsynopsisauth"]/*)'/>
++  </cmdsynopsis>
++  <cmdsynopsis>
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++     href="../../modules/pam_faillock/pam_faillock.8.xml" xpointer='xpointer(//cmdsynopsis[@id = "pam_faillock-cmdsynopsisacct"]/*)'/>
++  </cmdsynopsis>
++  <section id='sag-pam_faillock-description'>
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++     href="../../modules/pam_faillock/pam_faillock.8.xml" xpointer='xpointer(//refsect1[@id = "pam_faillock-description"]/*)'/>
++  </section>
++  <section id='sag-pam_faillock-options'>
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++     href="../../modules/pam_faillock/pam_faillock.8.xml" xpointer='xpointer(//refsect1[@id = "pam_faillock-options"]/*)'/>
++  </section>
++  <section id='sag-pam_faillock-types'>
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++     href="../../modules/pam_faillock/pam_faillock.8.xml" xpointer='xpointer(//refsect1[@id = "pam_faillock-types"]/*)'/>
++  </section>
++  <section id='sag-pam_faillock-return_values'>
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++     href="../../modules/pam_faillock/pam_faillock.8.xml" xpointer='xpointer(//refsect1[@id = "pam_faillock-return_values"]/*)'/>
++  </section>
++  <section id='sag-pam_faillock-examples'>
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++     href="../../modules/pam_faillock/pam_faillock.8.xml" xpointer='xpointer(//refsect1[@id = "pam_faillock-examples"]/*)'/>
++  </section>
++  <section id='sag-pam_faillock-author'>
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++     href="../../modules/pam_faillock/pam_faillock.8.xml" xpointer='xpointer(//refsect1[@id = "pam_faillock-author"]/*)'/>
++  </section>
++</section>
+diff -up Linux-PAM-1.1.1/modules/Makefile.am.faillock Linux-PAM-1.1.1/modules/Makefile.am
+--- Linux-PAM-1.1.1/modules/Makefile.am.faillock	2010-09-17 15:58:41.000000000 +0200
++++ Linux-PAM-1.1.1/modules/Makefile.am	2010-09-17 15:58:41.000000000 +0200
+@@ -3,7 +3,7 @@
+ #
+ 
+ SUBDIRS = pam_access pam_cracklib pam_debug pam_deny pam_echo \
+-	pam_chroot pam_console pam_postgresok \
++	pam_chroot pam_console pam_postgresok pam_faillock \
+ 	pam_env pam_exec pam_faildelay pam_filter pam_ftp \
+ 	pam_group pam_issue pam_keyinit pam_lastlog pam_limits \
+ 	pam_listfile pam_localuser pam_loginuid pam_mail \
+diff -up Linux-PAM-1.1.1/modules/pam_faillock/faillock.c.faillock Linux-PAM-1.1.1/modules/pam_faillock/faillock.c
+--- Linux-PAM-1.1.1/modules/pam_faillock/faillock.c.faillock	2010-09-17 15:58:41.000000000 +0200
++++ Linux-PAM-1.1.1/modules/pam_faillock/faillock.c	2010-09-17 15:58:41.000000000 +0200
+@@ -0,0 +1,147 @@
++/*
++ * Copyright (c) 2010 Tomas Mraz <tmraz@redhat.com>
++ *
++ * 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, and the entire permission notice in its entirety,
++ *    including the disclaimer of warranties.
++ * 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. The name of the author may not be used to endorse or promote
++ *    products derived from this software without specific prior
++ *    written permission.
++ *
++ * ALTERNATIVELY, this product may be distributed under the terms of
++ * the GNU Public License, in which case the provisions of the GPL are
++ * required INSTEAD OF the above restrictions.  (This clause is
++ * necessary due to a potential bad interaction between the GPL and
++ * the restrictions contained in a BSD-style copyright.)
++ *
++ * THIS SOFTWARE IS PROVIDED ``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.
++ */
++
++#include "config.h"
++#include <string.h>
++#include <stdlib.h>
++#include <unistd.h>
++#include <errno.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <sys/file.h>
++#include <fcntl.h>
++#include <security/pam_modutil.h>
++
++#include "faillock.h"
++
++int
++open_tally (const char *dir, const char *user, int create)
++{
++	char *path;
++	int flags = O_RDWR;
++	int fd;
++
++	if (strstr(user, "../") != NULL)
++	/* just a defensive programming as the user must be a
++	 * valid user on the system anyway
++	 */
++		return -1;
++	path = malloc(strlen(dir) + strlen(user) + 2);
++	if (path == NULL)
++		return -1;
++
++	strcpy(path, dir);
++	if (*dir && dir[strlen(dir) - 1] != '/') {
++		strcat(path, "/");
++	}
++	strcat(path, user);
++
++	if (create) {
++		flags |= O_CREAT;
++	}
++
++	fd = open(path, flags, 0600);
++
++	if (fd != -1)
++		while (flock(fd, LOCK_EX) == -1 && errno == EINTR);
++
++	return fd;
++}
++
++#define CHUNK_SIZE (64 * sizeof(struct tally))
++#define MAX_RECORDS 1024
++
++int
++read_tally(int fd, struct tally_data *tallies)
++{
++	void *data = NULL, *newdata;
++	unsigned int count = 0;
++	ssize_t chunk = 0;
++
++	do {
++		newdata = realloc(data, count * sizeof(struct tally) + CHUNK_SIZE);
++		if (newdata == NULL) {
++			free(data);
++			return -1;
++		}
++
++		data = newdata;
++
++		chunk = pam_modutil_read(fd, (char *)data + count * sizeof(struct tally), CHUNK_SIZE);
++		if (chunk < 0) {
++			free(data);
++			return -1;
++		}
++
++		count += chunk/sizeof(struct tally);
++
++		if (count >= MAX_RECORDS)
++			break;
++	}
++	while (chunk == CHUNK_SIZE); 
++
++	tallies->records = data;
++	tallies->count = count;
++
++	return 0;
++}
++
++int
++update_tally(int fd, struct tally_data *tallies)
++{
++	void *data = tallies->records;
++	unsigned int count = tallies->count;
++	ssize_t chunk;
++
++	if (tallies->count > MAX_RECORDS) {
++		data = tallies->records + (count - MAX_RECORDS);
++		count = MAX_RECORDS;
++	}
++
++	if (lseek(fd, 0, SEEK_SET) == (off_t)-1) {
++		return -1;
++	}
++
++	chunk = pam_modutil_write(fd, data, count * sizeof(struct tally));
++
++	if (chunk != (ssize_t)(count * sizeof(struct tally))) {
++		return -1;
++	}
++
++	if (ftruncate(fd, count * sizeof(struct tally)) == -1)
++		return -1;
++
++	return 0;
++}
+diff -up Linux-PAM-1.1.1/modules/pam_faillock/faillock.h.faillock Linux-PAM-1.1.1/modules/pam_faillock/faillock.h
+--- Linux-PAM-1.1.1/modules/pam_faillock/faillock.h.faillock	2010-09-17 15:58:41.000000000 +0200
++++ Linux-PAM-1.1.1/modules/pam_faillock/faillock.h	2010-09-17 15:58:41.000000000 +0200
+@@ -0,0 +1,72 @@
++/*
++ * Copyright (c) 2010 Tomas Mraz <tmraz@redhat.com>
++ *
++ * 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, and the entire permission notice in its entirety,
++ *    including the disclaimer of warranties.
++ * 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. The name of the author may not be used to endorse or promote
++ *    products derived from this software without specific prior
++ *    written permission.
++ *
++ * ALTERNATIVELY, this product may be distributed under the terms of
++ * the GNU Public License, in which case the provisions of the GPL are
++ * required INSTEAD OF the above restrictions.  (This clause is
++ * necessary due to a potential bad interaction between the GPL and
++ * the restrictions contained in a BSD-style copyright.)
++ *
++ * THIS SOFTWARE IS PROVIDED ``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.
++ */
++
++/*
++ * faillock.h - authentication failure data file record structure
++ *
++ * Each record in the file represents an instance of login failure of
++ * the user at the recorded time
++ */
++
++
++#ifndef _FAILLOCK_H
++#define _FAILLOCK_H
++
++#include <stdint.h>
++
++#define TALLY_STATUS_VALID     0x1       /* the tally file entry is valid */
++#define TALLY_STATUS_RHOST     0x2       /* the source is rhost */
++#define TALLY_STATUS_TTY       0x4       /* the source is tty - if both TALLY_FLAG_RHOST and TALLY_FLAG_TTY are not set the source is service */
++
++struct	tally {
++	char		source[52];	/* rhost or tty of the login failure (not necessarily NULL terminated) */
++	uint16_t	reserved;	/* reserved for future use */
++	uint16_t	status;		/* record status  */
++	uint64_t	time;		/* time of the login failure */
++};
++/* 64 bytes per entry */
++
++struct tally_data {
++	struct tally *records;		/* array of tallies */
++	unsigned int count;		/* number of records */
++};
++
++#define FAILLOCK_DEFAULT_TALLYDIR "/var/run/faillock"
++
++int open_tally(const char *dir, const char *user, int create);
++int read_tally(int fd, struct tally_data *tallies);
++int update_tally(int fd, struct tally_data *tallies);
++#endif
++
+diff -up Linux-PAM-1.1.1/modules/pam_faillock/faillock.8.xml.faillock Linux-PAM-1.1.1/modules/pam_faillock/faillock.8.xml
+--- Linux-PAM-1.1.1/modules/pam_faillock/faillock.8.xml.faillock	2010-09-17 15:58:41.000000000 +0200
++++ Linux-PAM-1.1.1/modules/pam_faillock/faillock.8.xml	2010-09-17 15:58:41.000000000 +0200
+@@ -0,0 +1,123 @@
++<?xml version="1.0" encoding='UTF-8'?>
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
++	"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
++
++<refentry id="faillock">
++
++  <refmeta>
++    <refentrytitle>faillock</refentrytitle>
++    <manvolnum>8</manvolnum>
++    <refmiscinfo class="sectdesc">Linux-PAM Manual</refmiscinfo>
++  </refmeta>
++
++  <refnamediv id="pam_faillock-name">
++    <refname>faillock</refname>
++    <refpurpose>Tool for displaying and modifying the authentication failure record files</refpurpose>
++  </refnamediv>
++
++  <refsynopsisdiv>
++    <cmdsynopsis id="faillock-cmdsynopsis">
++      <command>faillock</command>
++      <arg choice="opt">
++        --dir <replaceable>/path/to/tally-directory</replaceable>
++      </arg>
++      <arg choice="opt">
++        --user <replaceable>username</replaceable>
++      </arg>
++      <arg choice="opt">
++        --reset
++      </arg>
++    </cmdsynopsis>
++  </refsynopsisdiv>
++
++  <refsect1 id="faillock-description">
++
++    <title>DESCRIPTION</title>
++
++    <para>
++      The <emphasis>pam_faillock.so</emphasis> module maintains a list of
++      failed authentication attempts per user during a specified interval
++      and locks the account in case there were more than
++      <replaceable>deny</replaceable> consecutive failed authentications.
++      It stores the failure records into per-user files in the tally
++      directory.
++    </para>
++    <para>
++      The <command>faillock</command> command is an application which
++      can be used to examine and modify the contents of the
++      the tally files. It can display the recent failed authentication
++      attempts of the <replaceable>username</replaceable> or clear the tally
++      files of all or individual <replaceable>usernames</replaceable>.
++    </para>
++  </refsect1>
++
++  <refsect1 id="faillock-options">
++
++    <title>OPTIONS</title>
++         <variablelist>
++            <varlistentry>
++              <term>
++                <option>--dir <replaceable>/path/to/tally-directory</replaceable></option>
++              </term>
++              <listitem>
++                <para>
++                  The directory where the user files with the failure records are kept. The
++                  default is <filename>/var/run/faillock</filename>.
++                </para>
++              </listitem>
++            </varlistentry>
++            <varlistentry>
++              <term>
++                <option>--user <replaceable>username</replaceable></option>
++              </term>
++              <listitem>
++                <para>
++                  The user whose failure records should be displayed or cleared.
++                </para>
++              </listitem>
++            </varlistentry>
++            <varlistentry>
++              <term>
++                <option>--reset</option>
++              </term>
++              <listitem>
++                <para>
++                  Instead of displaying the user's failure records, clear them.
++                </para>
++              </listitem>
++            </varlistentry>
++        </variablelist>
++  </refsect1>
++
++  <refsect1 id="faillock-files">
++    <title>FILES</title>
++    <variablelist>
++      <varlistentry>
++        <term><filename>/var/run/faillock/*</filename></term>
++        <listitem>
++          <para>the files logging the authentication failures for users</para>
++        </listitem>
++      </varlistentry>
++    </variablelist>
++  </refsect1>
++
++  <refsect1 id='faillock-see_also'>
++    <title>SEE ALSO</title>
++    <para>
++      <citerefentry>
++        <refentrytitle>pam_faillock</refentrytitle><manvolnum>8</manvolnum>
++      </citerefentry>,
++      <citerefentry>
++        <refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
++      </citerefentry>
++    </para>
++  </refsect1>
++
++  <refsect1 id='faillock-author'>
++    <title>AUTHOR</title>
++      <para>
++        faillock was written by Tomas Mraz.
++      </para>
++  </refsect1>
++
++</refentry>
+diff -up Linux-PAM-1.1.1/modules/pam_faillock/main.c.faillock Linux-PAM-1.1.1/modules/pam_faillock/main.c
+--- Linux-PAM-1.1.1/modules/pam_faillock/main.c.faillock	2010-09-17 15:58:41.000000000 +0200
++++ Linux-PAM-1.1.1/modules/pam_faillock/main.c	2010-09-17 15:58:41.000000000 +0200
+@@ -0,0 +1,231 @@
++/*
++ * Copyright (c) 2010 Tomas Mraz <tmraz@redhat.com>
++ *
++ * 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, and the entire permission notice in its entirety,
++ *    including the disclaimer of warranties.
++ * 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. The name of the author may not be used to endorse or promote
++ *    products derived from this software without specific prior
++ *    written permission.
++ *
++ * ALTERNATIVELY, this product may be distributed under the terms of
++ * the GNU Public License, in which case the provisions of the GPL are
++ * required INSTEAD OF the above restrictions.  (This clause is
++ * necessary due to a potential bad interaction between the GPL and
++ * the restrictions contained in a BSD-style copyright.)
++ *
++ * THIS SOFTWARE IS PROVIDED ``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.
++ */
++
++#include "config.h"
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <dirent.h>
++#include <errno.h>
++#include <pwd.h>
++#include <time.h>
++#ifdef HAVE_LIBAUDIT
++#include <libaudit.h>
++#endif
++
++#include "faillock.h"
++
++struct options {
++	unsigned int reset;
++	const char *dir;
++	const char *user;
++	const char *progname;
++};
++
++static int
++args_parse(int argc, char **argv, struct options *opts)
++{
++	int i;
++	memset(opts, 0, sizeof(*opts));
++
++	opts->dir = FAILLOCK_DEFAULT_TALLYDIR;
++	opts->progname = argv[0];
++
++	for (i = 1; i < argc; ++i) {
++
++		if (strcmp(argv[i], "--dir") == 0) {
++			++i;
++			if (i >= argc || strlen(argv[i]) == 0) {
++				fprintf(stderr, "%s: No directory supplied.\n", argv[0]);				
++				return -1;
++			}
++		        opts->dir = argv[i];
++		} 
++		else if (strcmp(argv[i], "--user") == 0) {
++			++i;
++			if (i >= argc || strlen(argv[i]) == 0) {
++				fprintf(stderr, "%s: No user name supplied.\n", argv[0]);				
++				return -1;
++			}
++		        opts->user = argv[i];
++		}
++ 		else if (strcmp(argv[i], "--reset") == 0) {
++			opts->reset = 1;
++		}
++		else {
++			fprintf(stderr, "%s: Unknown option: %s\n", argv[0], argv[i]);
++			return -1;
++		}
++	}
++	return 0;
++}
++
++static void
++usage(const char *progname)
++{
++	fprintf(stderr, _("Usage: %s [--dir /path/to/tally-directory] [--user username] [--reset]\n"),
++		progname);
++}
++
++static int
++do_user(struct options *opts, const char *user)
++{
++	int fd;
++	int rv;
++	struct tally_data tallies;
++
++	fd = open_tally(opts->dir, user, 0);
++
++	if (fd == -1) {
++		if (errno == ENOENT) {
++			return 0;
++		}
++		else {
++			fprintf(stderr, "%s: Error opening the tally file for %s:",
++				opts->progname, user);
++			perror(NULL);
++			return 3;
++		}
++	}
++	if (opts->reset) {
++#ifdef HAVE_LIBAUDIT
++		char buf[64];
++		int audit_fd;
++#endif
++		
++		while ((rv=ftruncate(fd, 0)) == -1 && errno == EINTR);
++		if (rv == -1) {
++			fprintf(stderr, "%s: Error clearing the tally file for %s:",
++				opts->progname, user);
++			perror(NULL);
++#ifdef HAVE_LIBAUDIT
++		}
++		if ((audit_fd=audit_open()) >= 0) {
++			struct passwd *pwd;
++
++			if ((pwd=getpwnam(user)) != NULL) {
++				snprintf(buf, sizeof(buf), "faillock reset uid=%u",
++					pwd->pw_uid);
++				audit_log_user_message(audit_fd, AUDIT_USER_ACCT,
++					buf, NULL, NULL, NULL, rv == 0);
++			}
++			close(audit_fd);
++		}
++		if (rv == -1) {
++#endif
++			close(fd);
++			return 4;
++		}
++	}
++	else {
++		unsigned int i;
++
++		memset(&tallies, 0, sizeof(tallies));
++		if ((rv=read_tally(fd, &tallies)) == -1) {
++			fprintf(stderr, "%s: Error reading the tally file for %s:",
++				opts->progname, user);
++			perror(NULL);
++			close(fd);
++			return 5;
++		}
++
++		printf("%s:\n", user);
++		printf("%-19s %-5s %-48s %-5s\n", "When", "Type", "Source", "Valid");
++
++		for (i = 0; i < tallies.count; i++) {
++			struct tm *tm;
++			char timebuf[80];
++			uint16_t status = tallies.records[i].status;
++			time_t when = tallies.records[i].time;
++
++			tm = localtime(&when);
++			strftime(timebuf, sizeof(timebuf), "%Y-%m-%d %H:%M:%S", tm);
++			printf("%-19s %-5s %-52.52s %s\n", timebuf,
++				status & TALLY_STATUS_RHOST ? "RHOST" : (status & TALLY_STATUS_TTY ? "TTY" : "SVC"),
++				tallies.records[i].source, status & TALLY_STATUS_VALID ? "V":"I");
++		}
++		free(tallies.records);
++	}
++	close(fd);
++	return 0;
++}
++
++static int
++do_allusers(struct options *opts)
++{
++	struct dirent **userlist;
++	int rv, i;
++
++	rv = scandir(opts->dir, &userlist, NULL, alphasort);
++	if (rv < 0) {
++		fprintf(stderr, "%s: Error reading tally directory: ", opts->progname);
++		perror(NULL);
++		return 2;
++	}
++
++	for (i = 0; i < rv; i++) {
++		if (userlist[i]->d_name[0] == '.') {
++			if ((userlist[i]->d_name[1] == '.' && userlist[i]->d_name[2] == '\0') ||
++			    userlist[i]->d_name[1] == '\0')
++				continue;
++		}
++		do_user(opts, userlist[i]->d_name);
++		free(userlist[i]);
++	}
++	free(userlist);
++
++	return 0;
++}
++
++
++/*-----------------------------------------------------------------------*/
++int
++main (int argc, char *argv[])
++{
++	struct options opts;
++
++	if (args_parse(argc, argv, &opts)) {
++		usage(argv[0]);
++		return 1;
++	}
++
++	if (opts.user == NULL) {
++		return do_allusers(&opts);		
++	}
++
++	return do_user(&opts, opts.user);
++}
++
+diff -up Linux-PAM-1.1.1/modules/pam_faillock/Makefile.am.faillock Linux-PAM-1.1.1/modules/pam_faillock/Makefile.am
+--- Linux-PAM-1.1.1/modules/pam_faillock/Makefile.am.faillock	2010-09-17 15:58:41.000000000 +0200
++++ Linux-PAM-1.1.1/modules/pam_faillock/Makefile.am	2010-09-17 15:58:41.000000000 +0200
+@@ -0,0 +1,43 @@
++#
++# Copyright (c) 2005, 2006, 2007, 2009 Thorsten Kukuk <kukuk@thkukuk.de>
++# Copyright (c) 2008 Red Hat, Inc.
++# Copyright (c) 2010 Tomas Mraz <tmraz@redhat.com>
++#
++
++CLEANFILES = *~
++MAINTAINERCLEANFILES = $(MANS) README
++
++EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_faillock
++
++man_MANS = pam_faillock.8 faillock.8
++XMLS = README.xml pam_faillock.8.xml faillock.8.xml
++
++TESTS = tst-pam_faillock
++
++securelibdir = $(SECUREDIR)
++secureconfdir = $(SCONFIGDIR)
++
++noinst_HEADERS = faillock.h
++
++faillock_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include
++pam_faillock_la_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include
++
++pam_faillock_la_LDFLAGS = -no-undefined -avoid-version -module
++pam_faillock_la_LIBADD = -L$(top_builddir)/libpam -lpam $(LIBAUDIT)
++if HAVE_VERSIONING
++  pam_faillock_la_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
++endif
++
++faillock_LDADD = -L$(top_builddir)/libpam -lpam $(LIBAUDIT)
++
++securelib_LTLIBRARIES = pam_faillock.la
++sbin_PROGRAMS = faillock
++
++pam_faillock_la_SOURCES = pam_faillock.c faillock.c
++faillock_SOURCES = main.c faillock.c
++
++if ENABLE_REGENERATE_MAN
++noinst_DATA = README
++README: pam_faillock.8.xml
++-include $(top_srcdir)/Make.xml.rules
++endif
+diff -up Linux-PAM-1.1.1/modules/pam_faillock/pam_faillock.c.faillock Linux-PAM-1.1.1/modules/pam_faillock/pam_faillock.c
+--- Linux-PAM-1.1.1/modules/pam_faillock/pam_faillock.c.faillock	2010-09-17 15:58:41.000000000 +0200
++++ Linux-PAM-1.1.1/modules/pam_faillock/pam_faillock.c	2010-09-17 15:58:41.000000000 +0200
+@@ -0,0 +1,550 @@
++/*
++ * Copyright (c) 2010 Tomas Mraz <tmraz@redhat.com>
++ *
++ * 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, and the entire permission notice in its entirety,
++ *    including the disclaimer of warranties.
++ * 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. The name of the author may not be used to endorse or promote
++ *    products derived from this software without specific prior
++ *    written permission.
++ *
++ * ALTERNATIVELY, this product may be distributed under the terms of
++ * the GNU Public License, in which case the provisions of the GPL are
++ * required INSTEAD OF the above restrictions.  (This clause is
++ * necessary due to a potential bad interaction between the GPL and
++ * the restrictions contained in a BSD-style copyright.)
++ *
++ * THIS SOFTWARE IS PROVIDED ``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.
++ */
++
++#include "config.h"
++#include <stdio.h>
++#include <string.h>
++#include <unistd.h>
++#include <stdint.h>
++#include <stdlib.h>
++#include <errno.h>
++#include <time.h>
++#include <pwd.h>
++#include <syslog.h>
++
++#ifdef HAVE_LIBAUDIT
++#include <libaudit.h>
++#endif
++
++#include <security/pam_modules.h>
++#include <security/pam_modutil.h>
++#include <security/pam_ext.h>
++
++#include "faillock.h"
++
++#define PAM_SM_AUTH
++#define PAM_SM_ACCOUNT
++
++#define FAILLOCK_ACTION_PREAUTH  0
++#define FAILLOCK_ACTION_AUTHSUCC 1
++#define FAILLOCK_ACTION_AUTHFAIL 2
++
++#define FAILLOCK_FLAG_DENY_ROOT		0x1
++#define FAILLOCK_FLAG_AUDIT		0x2
++#define FAILLOCK_FLAG_SILENT		0x4
++#define FAILLOCK_FLAG_NO_LOG_INFO	0x8
++#define FAILLOCK_FLAG_UNLOCKED		0x10
++
++#define MAX_TIME_INTERVAL 604800 /* 7 days */
++
++struct options {
++	unsigned int action;
++	unsigned int flags;
++	unsigned short deny;
++	unsigned int fail_interval;
++	unsigned int unlock_time;
++	unsigned int root_unlock_time;
++	const char *dir;
++	const char *user;
++	int failures;
++	uint64_t latest_time;
++	uid_t uid;
++	uint64_t now;
++};
++
++static void
++args_parse(pam_handle_t *pamh, int argc, const char **argv,
++		int flags, struct options *opts)
++{
++	int i;
++	memset(opts, 0, sizeof(*opts));
++
++	opts->dir = FAILLOCK_DEFAULT_TALLYDIR;
++	opts->deny = 3;
++	opts->fail_interval = 900;
++	opts->unlock_time = 600;
++	opts->root_unlock_time = MAX_TIME_INTERVAL+1;
++
++	for (i = 0; i < argc; ++i) {
++
++		if (strncmp(argv[i], "dir=", 4) == 0) {
++			if (argv[i][4] != '/') {
++				pam_syslog(pamh, LOG_ERR,
++					"Tally directory is not absolute path (%s); keeping default", argv[i]);
++	        	} else {
++			        opts->dir = argv[i]+4;
++			}
++		} 
++		else if (strncmp(argv[i], "deny=", 5) == 0) {
++			if (sscanf(argv[i]+5, "%hu", &opts->deny) != 1) {
++				pam_syslog(pamh, LOG_ERR,
++					"Bad number supplied for deny argument");
++        		}
++		}
++		else if (strncmp(argv[i], "fail_interval=", 14) == 0) {
++			unsigned int temp;
++			if (sscanf(argv[i]+14, "%u", &temp) != 1 ||
++				temp > MAX_TIME_INTERVAL) {
++				pam_syslog(pamh, LOG_ERR,
++					"Bad number supplied for fail_interval argument");
++	        	} else {
++				opts->fail_interval = temp;
++			}
++		}
++		else if (strncmp(argv[i], "unlock_time=", 12) == 0) {
++			unsigned int temp;
++			if (sscanf(argv[i]+12, "%u", &temp) != 1 ||
++				temp > MAX_TIME_INTERVAL) {
++				pam_syslog(pamh, LOG_ERR,
++					"Bad number supplied for unlock_time argument");
++        		} else {
++				opts->unlock_time = temp;
++			}
++		}
++		else if (strncmp(argv[i], "root_unlock_time=", 17) == 0) {
++			unsigned int temp;
++			if (sscanf(argv[i]+17, "%u", &temp) != 1 ||
++				temp > MAX_TIME_INTERVAL) {
++				pam_syslog(pamh, LOG_ERR,
++					"Bad number supplied for root_unlock_time argument");
++        		} else {
++				opts->root_unlock_time = temp;
++			}
++		}
++ 		else if (strcmp(argv[i], "preauth") == 0) {
++			opts->action = FAILLOCK_ACTION_PREAUTH;
++		}
++ 		else if (strcmp(argv[i], "authfail") == 0) {
++			opts->action = FAILLOCK_ACTION_AUTHFAIL;
++		}
++	 	else if (strcmp(argv[i], "authsucc") == 0) {
++			opts->action = FAILLOCK_ACTION_AUTHSUCC;
++		}
++	 	else if (strcmp(argv[i], "even_deny_root") == 0) {
++			opts->flags |= FAILLOCK_FLAG_DENY_ROOT;
++		}
++	 	else if (strcmp(argv[i], "audit") == 0) {
++			opts->flags |= FAILLOCK_FLAG_AUDIT;
++		}
++	 	else if (strcmp(argv[i], "silent") == 0) {
++			opts->flags |= FAILLOCK_FLAG_SILENT;
++		}
++	 	else if (strcmp(argv[i], "no_log_info") == 0) {
++			opts->flags |= FAILLOCK_FLAG_NO_LOG_INFO;
++		}
++		else {
++			pam_syslog(pamh, LOG_ERR, "Unknown option: %s", argv[i]);
++		}
++	}
++
++	if (opts->root_unlock_time == MAX_TIME_INTERVAL+1)
++		opts->root_unlock_time = opts->unlock_time;
++	if (flags & PAM_SILENT)
++		opts->flags |= FAILLOCK_FLAG_SILENT;
++}
++
++static int get_pam_user(pam_handle_t *pamh, struct options *opts)
++{
++	const char *user;
++	int rv;
++	struct passwd *pwd;
++
++	if ((rv=pam_get_user(pamh, &user, NULL)) != PAM_SUCCESS) {
++		return rv;
++	}
++
++	if (*user == '\0') {
++		return PAM_IGNORE;
++	}
++
++	if ((pwd=pam_modutil_getpwnam(pamh, user)) == NULL) {
++		if (opts->flags & FAILLOCK_FLAG_AUDIT) {
++			pam_syslog(pamh, LOG_ERR, "User unknown: %s", user);
++		}
++		else {
++			pam_syslog(pamh, LOG_ERR, "User unknown");
++		}
++		return PAM_IGNORE;
++	}
++	opts->user = user;
++	opts->uid = pwd->pw_uid;
++	return PAM_SUCCESS;
++}
++
++static int
++check_tally(pam_handle_t *pamh, struct options *opts, struct tally_data *tallies, int *fd)
++{
++	int tfd;
++	unsigned int i;
++	uint64_t latest_time;
++	int failures;
++
++	opts->now = time(NULL);
++
++	tfd = open_tally(opts->dir, opts->user, 0);
++
++	*fd = tfd;
++
++	if (tfd == -1) {
++		if (errno == EACCES || errno == ENOENT) {
++			return PAM_SUCCESS;
++		}
++		pam_syslog(pamh, LOG_ERR, "Error opening the tally file for %s: %m", opts->user);
++		return PAM_SYSTEM_ERR;
++	}
++
++	if (read_tally(tfd, tallies) != 0) {
++		pam_syslog(pamh, LOG_ERR, "Error reading the tally file for %s: %m", opts->user);
++		return PAM_SYSTEM_ERR;
++	}
++
++	if (opts->uid == 0 && !(opts->flags & FAILLOCK_FLAG_DENY_ROOT)) {
++		return PAM_SUCCESS;
++	}
++
++	latest_time = 0;
++	for(i = 0; i < tallies->count; i++) {
++		if ((tallies->records[i].status & TALLY_STATUS_VALID) &&
++			tallies->records[i].time > latest_time)
++			latest_time = tallies->records[i].time;
++	}
++
++	opts->latest_time = latest_time;
++
++	failures = 0;
++	for(i = 0; i < tallies->count; i++) {
++		if ((tallies->records[i].status & TALLY_STATUS_VALID) &&
++			latest_time - tallies->records[i].time < opts->fail_interval) {
++			++failures;
++		}
++	}
++
++	opts->failures = failures;
++
++	if (opts->uid == 0 && !(opts->flags & FAILLOCK_FLAG_DENY_ROOT)) {
++		return PAM_SUCCESS;
++	}
++
++	if (opts->deny && failures >= opts->deny) {
++		if ((opts->uid && latest_time + opts->unlock_time < opts->now) ||
++			(!opts->uid && latest_time + opts->root_unlock_time < opts->now)) {
++#ifdef HAVE_LIBAUDIT
++			if (opts->action != FAILLOCK_ACTION_PREAUTH) { /* do not audit in preauth */
++				char buf[64];
++				int audit_fd;
++
++				audit_fd = audit_open();
++				/* If there is an error & audit support is in the kernel report error */
++				if ((audit_fd < 0) && !(errno == EINVAL || errno == EPROTONOSUPPORT ||
++					errno == EAFNOSUPPORT))
++					return PAM_SYSTEM_ERR;
++
++				snprintf(buf, sizeof(buf), "pam_faillock uid=%u ", opts->uid);
++				audit_log_user_message(audit_fd, AUDIT_RESP_ACCT_UNLOCK_TIMED, buf,
++					NULL, NULL, NULL, 1);
++			}
++#endif
++			opts->flags |= FAILLOCK_FLAG_UNLOCKED;
++			return PAM_SUCCESS;
++		}
++		return PAM_AUTH_ERR;
++	}
++	return PAM_SUCCESS;
++}
++
++static void
++reset_tally(pam_handle_t *pamh, struct options *opts, int *fd)
++{
++	int rv;
++
++	while ((rv=ftruncate(*fd, 0)) == -1 && errno == EINTR);
++	if (rv == -1) {
++		pam_syslog(pamh, LOG_ERR, "Error clearing the tally file for %s: %m", opts->user);
++	}
++}
++
++static int
++write_tally(pam_handle_t *pamh, struct options *opts, struct tally_data *tallies, int *fd)
++{
++	struct tally *records;
++	unsigned int i;
++	int failures;
++	unsigned int oldest;
++	uint64_t oldtime;
++	const void *source = NULL;
++
++	if (*fd == -1) {
++		*fd = open_tally(opts->dir, opts->user, 1);
++	}
++	if (*fd == -1) {
++		if (errno == EACCES) {
++			return PAM_SUCCESS;
++		}
++		pam_syslog(pamh, LOG_ERR, "Error opening the tally file for %s: %m", opts->user);
++		return PAM_SYSTEM_ERR;
++	}
++
++	oldtime = 0;
++	oldest = 0;
++	failures = 0;
++
++	for (i = 0; i < tallies->count; ++i) {
++		if (tallies->records[i].time < oldtime) {
++			oldtime = tallies->records[i].time;
++			oldest = i;
++		}
++		if (opts->flags & FAILLOCK_FLAG_UNLOCKED ||
++			opts->now - tallies->records[i].time >= opts->fail_interval ) {
++			tallies->records[i].status &= ~TALLY_STATUS_VALID;
++		} else {
++			++failures;
++		}
++	}
++
++	if (oldest >= tallies->count || (tallies->records[oldest].status & TALLY_STATUS_VALID)) {
++		oldest = tallies->count;
++
++		if ((records=realloc(tallies->records, (oldest+1) * sizeof (*tallies->records))) == NULL) {
++			pam_syslog(pamh, LOG_CRIT, "Error allocating memory for tally records: %m");
++			return PAM_BUF_ERR;
++		}
++
++		++tallies->count;
++		tallies->records = records;
++	}
++
++	memset(&tallies->records[oldest], 0, sizeof (*tallies->records));
++
++	tallies->records[oldest].status = TALLY_STATUS_VALID;
++	if (pam_get_item(pamh, PAM_RHOST, &source) != PAM_SUCCESS || source == NULL) {
++		if (pam_get_item(pamh, PAM_TTY, &source) != PAM_SUCCESS || source == NULL) {
++			if (pam_get_item(pamh, PAM_SERVICE, &source) != PAM_SUCCESS || source == NULL) {
++				source = "";
++			}
++		}
++		else {
++			tallies->records[oldest].status |= TALLY_STATUS_TTY;
++		}
++	}
++	else {
++		tallies->records[oldest].status |= TALLY_STATUS_RHOST;
++	}
++
++	strncpy(tallies->records[oldest].source, source, sizeof(tallies->records[oldest].source));
++	/* source does not have to be null terminated */
++	
++	tallies->records[oldest].time = opts->now;
++
++	++failures;
++
++	if (opts->deny && failures == opts->deny) {
++#ifdef HAVE_LIBAUDIT
++		char buf[64];
++		int audit_fd;
++
++		audit_fd = audit_open();
++		/* If there is an error & audit support is in the kernel report error */
++		if ((audit_fd < 0) && !(errno == EINVAL || errno == EPROTONOSUPPORT ||
++			errno == EAFNOSUPPORT))
++			return PAM_SYSTEM_ERR;
++
++		snprintf(buf, sizeof(buf), "pam_faillock uid=%u ", opts->uid);
++		audit_log_user_message(audit_fd, AUDIT_ANOM_LOGIN_FAILURES, buf,
++			NULL, NULL, NULL, 1);
++
++		if (opts->uid != 0 || (opts->flags & FAILLOCK_FLAG_DENY_ROOT)) {
++			audit_log_user_message(audit_fd, AUDIT_RESP_ACCT_LOCK, buf,
++				NULL, NULL, NULL, 1);
++		}
++		close(audit_fd);
++#endif
++		if (!(opts->flags & FAILLOCK_FLAG_NO_LOG_INFO)) {
++			pam_syslog(pamh, LOG_INFO, "Consecutive login failures for user %s account temporarily locked",
++				opts->user);
++		}
++	}
++
++	if (update_tally(*fd, tallies) == 0)
++		return PAM_SUCCESS;
++
++	return PAM_SYSTEM_ERR;
++}
++
++static void
++faillock_message(pam_handle_t *pamh, struct options *opts)
++{
++	int64_t left;
++
++	if (!(opts->flags & FAILLOCK_FLAG_SILENT)) {
++		if (opts->uid) {
++			left = opts->latest_time + opts->unlock_time - opts->now;
++		}
++		else {
++			left = opts->latest_time + opts->root_unlock_time - opts->now;
++		}
++
++		left /= 60; /* minutes */
++
++		pam_info(pamh, _("Account temporarily locked due to %d failed logins"),
++			opts->failures);
++		pam_info(pamh, _("(%d minutes left to unlock)"), (int)left);
++	}
++}
++
++static void
++tally_cleanup(struct tally_data *tallies, int fd)
++{
++	if (fd != -1) {
++		close(fd);
++	}
++
++	free(tallies->records);
++}
++
++/*---------------------------------------------------------------------*/
++
++PAM_EXTERN int
++pam_sm_authenticate(pam_handle_t *pamh, int flags,
++		    int argc, const char **argv)
++{
++	struct options opts;
++	int rv, fd = -1;
++	struct tally_data tallies;
++
++	memset(&tallies, 0, sizeof(tallies));
++
++	args_parse(pamh, argc, argv, flags, &opts);
++
++	pam_fail_delay(pamh, 2000000);	/* 2 sec delay for on failure */
++
++	if ((rv=get_pam_user(pamh, &opts)) != PAM_SUCCESS) {
++		return rv;
++	}
++
++	switch (opts.action) {
++		case FAILLOCK_ACTION_PREAUTH:
++			rv = check_tally(pamh, &opts, &tallies, &fd);
++			if (rv == PAM_AUTH_ERR && !(opts.flags & FAILLOCK_FLAG_SILENT)) {
++				faillock_message(pamh, &opts);
++			}
++                        break;
++
++		case FAILLOCK_ACTION_AUTHSUCC:
++			rv = check_tally(pamh, &opts, &tallies, &fd);
++			if (rv == PAM_SUCCESS && fd != -1) {
++				reset_tally(pamh, &opts, &fd);
++			}
++                        break;
++
++		case FAILLOCK_ACTION_AUTHFAIL:
++			rv = check_tally(pamh, &opts, &tallies, &fd);
++			if (rv == PAM_SUCCESS) {
++				rv = PAM_IGNORE; /* this return value should be ignored */
++				write_tally(pamh, &opts, &tallies, &fd);
++			}
++			break;
++	}
++
++	tally_cleanup(&tallies, fd);
++
++	return rv;
++}
++
++/*---------------------------------------------------------------------*/
++
++PAM_EXTERN int
++pam_sm_setcred(pam_handle_t *pamh UNUSED, int flags UNUSED,
++	       int argc UNUSED, const char **argv UNUSED)
++{
++	return PAM_SUCCESS;
++}
++
++/*---------------------------------------------------------------------*/
++
++PAM_EXTERN int
++pam_sm_acct_mgmt(pam_handle_t *pamh, int flags,
++		 int argc, const char **argv)
++{
++	struct options opts;
++	int rv, fd = -1;
++	struct tally_data tallies;
++
++	memset(&tallies, 0, sizeof(tallies));
++
++	args_parse(pamh, argc, argv, flags, &opts);
++
++	opts.action = FAILLOCK_ACTION_AUTHSUCC;
++
++	if ((rv=get_pam_user(pamh, &opts)) != PAM_SUCCESS) {
++		return rv;
++	}
++
++	check_tally(pamh, &opts, &tallies, &fd);
++	if (fd != -1) {
++		reset_tally(pamh, &opts, &fd);
++	}
++
++	tally_cleanup(&tallies, fd);
++
++	return PAM_SUCCESS;
++}
++
++/*-----------------------------------------------------------------------*/
++
++#ifdef PAM_STATIC
++
++/* static module data */
++
++struct pam_module _pam_faillock_modstruct = {
++     MODULE_NAME,
++#ifdef PAM_SM_AUTH
++     pam_sm_authenticate,
++     pam_sm_setcred,
++#else
++     NULL,
++     NULL,
++#endif
++#ifdef PAM_SM_ACCOUNT
++     pam_sm_acct_mgmt,
++#else
++     NULL,
++#endif
++     NULL,
++     NULL,
++     NULL,
++};
++
++#endif   /* #ifdef PAM_STATIC */
++
+diff -up Linux-PAM-1.1.1/modules/pam_faillock/pam_faillock.8.xml.faillock Linux-PAM-1.1.1/modules/pam_faillock/pam_faillock.8.xml
+--- Linux-PAM-1.1.1/modules/pam_faillock/pam_faillock.8.xml.faillock	2010-09-17 15:58:41.000000000 +0200
++++ Linux-PAM-1.1.1/modules/pam_faillock/pam_faillock.8.xml	2010-09-17 15:58:41.000000000 +0200
+@@ -0,0 +1,396 @@
++<?xml version="1.0" encoding='UTF-8'?>
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
++	"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
++
++<refentry id="pam_faillock">
++
++  <refmeta>
++    <refentrytitle>pam_faillock</refentrytitle>
++    <manvolnum>8</manvolnum>
++    <refmiscinfo class="sectdesc">Linux-PAM Manual</refmiscinfo>
++  </refmeta>
++
++  <refnamediv id="pam_faillock-name">
++    <refname>pam_faillock</refname>
++    <refpurpose>Module counting authentication failures during a specified interval</refpurpose>
++  </refnamediv>
++
++  <refsynopsisdiv>
++    <cmdsynopsis id="pam_faillock-cmdsynopsisauth">
++      <command>auth ... pam_faillock.so</command>
++      <arg choice="req">
++        preauth|authfail|authsucc
++      </arg>
++      <arg choice="opt">
++        dir=<replaceable>/path/to/tally-directory</replaceable>
++      </arg>
++      <arg choice="opt">
++        even_deny_root
++      </arg>
++      <arg choice="opt">
++        deny=<replaceable>n</replaceable>
++      </arg>
++      <arg choice="opt">
++        fail_interval=<replaceable>n</replaceable>
++      </arg>
++      <arg choice="opt">
++        unlock_time=<replaceable>n</replaceable>
++      </arg>
++      <arg choice="opt">
++        root_unlock_time=<replaceable>n</replaceable>
++      </arg>
++      <arg choice="opt">
++        audit
++      </arg>
++      <arg choice="opt">
++        silent
++      </arg>
++      <arg choice="opt">
++        no_log_info
++      </arg>
++    </cmdsynopsis>
++    <cmdsynopsis id="pam_faillock-cmdsynopsisacct">
++      <command>account ... pam_faillock.so</command>
++      <arg choice="opt">
++        dir=<replaceable>/path/to/tally-directory</replaceable>
++      </arg>
++      <arg choice="opt">
++        no_log_info
++      </arg>
++    </cmdsynopsis>
++  </refsynopsisdiv>
++
++  <refsect1 id="pam_faillock-description">
++
++    <title>DESCRIPTION</title>
++
++    <para>
++      This module maintains a list of failed authentication attempts per
++      user during a specified interval and locks the account in case
++      there were more than <replaceable>deny</replaceable> consecutive
++      failed authentications.
++    </para>
++    <para>
++      Normally, failed attempts to authenticate <emphasis>root</emphasis> will
++      <emphasis remap='B'>not</emphasis> cause the root account to become
++      blocked, to prevent denial-of-service: if your users aren't given
++      shell accounts and root may only login via <command>su</command> or
++      at the machine console (not telnet/rsh, etc), this is safe.
++    </para>
++  </refsect1>
++
++  <refsect1 id="pam_faillock-options">
++
++    <title>OPTIONS</title>
++         <variablelist>
++            <varlistentry>
++              <term>
++                <option>{preauth|authfail|authsucc}</option>
++              </term>
++              <listitem>
++                <para>
++                  This argument must be set accordingly to the position of this module
++                  instance in the PAM stack.
++                </para>
++                <para>
++                  The <emphasis>preauth</emphasis> argument must be used when the module
++                  is called before the modules which ask for the user credentials such
++                  as the password. The module just examines whether the user should
++                  be blocked from accessing the service in case there were anomalous
++                  number of failed consecutive authentication attempts recently. This
++                  call is optional if <emphasis>authsucc</emphasis> is used.
++                </para>
++                <para>
++                  The <emphasis>authfail</emphasis> argument must be used when the module
++                  is called after the modules which determine the authentication outcome,
++                  failed. Unless the user is already blocked due to previous authentication
++                  failures, the module will record the failure into the appropriate user
++                  tally file.
++                </para>
++                <para>
++                  The <emphasis>authsucc</emphasis> argument must be used when the module
++                  is called after the modules which determine the authentication outcome,
++                  succeded. Unless the user is already blocked due to previous authentication
++                  failures, the module will then clear the record of the failures in the
++                  respective user tally file. Otherwise it will return authentication error.
++                  If this call is not done, the pam_faillock will not distinguish between
++                  consecutive and non-consecutive failed authentication attempts. The
++                  <emphasis>preauth</emphasis> call must be used in such case. Due to
++                  complications in the way the PAM stack can be configured it is also
++                  possible to call <emphasis>pam_faillock</emphasis> as an account module.
++                  In such configuration the module must be also called in the
++                  <emphasis>preauth</emphasis> stage.
++                </para>
++              </listitem>
++            </varlistentry>
++            <varlistentry>
++              <term>
++                <option>dir=<replaceable>/path/to/tally-directory</replaceable></option>
++              </term>
++              <listitem>
++                <para>
++                  The directory where the user files with the failure records are kept. The
++                  default is <filename>/var/run/faillock</filename>.
++                </para>
++              </listitem>
++            </varlistentry>
++            <varlistentry>
++              <term>
++                <option>audit</option>
++              </term>
++              <listitem>
++                <para>
++                  Will log the user name into the system log if the user is not found.
++                </para>
++              </listitem>
++            </varlistentry>
++            <varlistentry>
++              <term>
++                <option>silent</option>
++              </term>
++              <listitem>
++                <para>
++                  Don't print informative messages. This option is implicite
++                  in the <emphasis>authfail</emphasis> and <emphasis>authsucc</emphasis>
++                  functions.
++                </para>
++              </listitem>
++            </varlistentry>
++            <varlistentry>
++              <term>
++                <option>no_log_info</option>
++              </term>
++              <listitem>
++                <para>
++                  Don't log informative messages via <citerefentry><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
++                </para>
++              </listitem>
++            </varlistentry>
++            <varlistentry>
++              <term>
++                <option>deny=<replaceable>n</replaceable></option>
++              </term>
++              <listitem>
++                <para>
++                  Deny access if the number of consecutive authentication failures
++                  for this user during the recent interval exceeds
++                  <replaceable>n</replaceable>. The default is 3.
++                </para>
++              </listitem>
++            </varlistentry>
++            <varlistentry>
++              <term>
++                <option>fail_interval=<replaceable>n</replaceable></option>
++              </term>
++              <listitem>
++                <para>
++                  The length of the interval during which the consecutive
++                  authentication failures must happen for the user account
++                  lock out is <replaceable>n</replaceable> seconds.
++                  The default is 900 (15 minutes).
++                </para>
++              </listitem>
++            </varlistentry>
++            <varlistentry>
++              <term>
++                <option>unlock_time=<replaceable>n</replaceable></option>
++              </term>
++              <listitem>
++                <para>
++                  The access will be reenabled after
++                  <replaceable>n</replaceable> seconds after the lock out.
++                  The default is 600 (10 minutes).
++                </para>
++              </listitem>
++            </varlistentry>
++            <varlistentry>
++              <term>
++                <option>even_deny_root</option>
++              </term>
++              <listitem>
++                <para>
++                  Root account can become locked as well as regular accounts.
++                </para>
++              </listitem>
++            </varlistentry>
++            <varlistentry>
++              <term>
++                <option>root_unlock_time=<replaceable>n</replaceable></option>
++              </term>
++              <listitem>
++                <para>
++                  This option implies <option>even_deny_root</option> option.
++                  Allow access after <replaceable>n</replaceable> seconds
++                  to root account after the account is locked. In case the
++                  option is not specified the value is the same as of the
++                  <option>unlock_time</option> option.
++                </para>
++              </listitem>
++            </varlistentry>
++        </variablelist>
++  </refsect1>
++
++  <refsect1 id="pam_faillock-types">
++    <title>MODULE TYPES PROVIDED</title>
++    <para>
++      The <option>auth</option> and <option>account</option> module types are
++      provided.
++    </para>
++  </refsect1>
++
++  <refsect1 id='pam_faillock-return_values'>
++    <title>RETURN VALUES</title>
++    <variablelist>
++      <varlistentry>
++        <term>PAM_AUTH_ERR</term>
++        <listitem>
++          <para>
++            A invalid option was given, the module was not able
++            to retrieve the user name, no valid counter file
++            was found, or too many failed logins.
++          </para>
++        </listitem>
++      </varlistentry>
++      <varlistentry>
++        <term>PAM_SUCCESS</term>
++        <listitem>
++          <para>
++            Everything was successful.
++          </para>
++        </listitem>
++      </varlistentry>
++      <varlistentry>
++        <term>PAM_IGNORE</term>
++        <listitem>
++          <para>
++            User not present in passwd database.
++          </para>
++        </listitem>
++      </varlistentry>
++    </variablelist>
++  </refsect1>
++
++  <refsect1 id='pam_faillock-notes'>
++    <title>NOTES</title>
++    <para>
++      <emphasis>pam_faillock</emphasis> setup in the PAM stack is different
++      from the <emphasis>pam_tally2</emphasis> module setup.
++    </para>
++    <para>
++      There is no setuid wrapper for access to the data file such as when the
++      <emphasis remap='B'>pam_faillock.so</emphasis> module is called from
++      a screensaver. As this would make it impossible to share PAM configuration
++      with such services the following workaround is used: If the data file
++      cannot be opened because of insufficient permissions
++      (<errorcode>EACCES</errorcode>) the module returns
++      <errorcode>PAM_SUCCESS</errorcode>.
++    </para>
++    <para>
++      Note that using the module in <option>preauth</option> without the
++      <option>silent</option> option or with <emphasis>requisite</emphasis>
++      control field leaks an information about existence or
++      non-existence of an user account in the system because
++      the failures are not recorded for the unknown users. The message
++      about the user account being locked is never displayed for nonexisting
++      user accounts allowing the adversary to infer that a particular account
++      is not existing on a system.
++    </para>
++  </refsect1>
++
++  <refsect1 id='pam_faillock-examples'>
++    <title>EXAMPLES</title>
++    <para>
++      Here are two possible configuration examples for <filename>/etc/pam.d/login</filename>.
++      They make <emphasis>pam_faillock</emphasis> to lock the account after 4 consecutive
++      failed logins during the default interval of 15 minutes. Root account will be locked
++      as well. The accounts will be automatically unlocked after 20 minutes.
++    </para>
++    <para>
++      In the first example the module is called only in the <emphasis>auth</emphasis>
++      phase and the module does not print any information about the account blocking
++      by <emphasis>pam_faillock</emphasis>. The <emphasis>preauth</emphasis> call can
++      be added to tell the user that his login is blocked by the module and also to abort
++      the authentication without even asking for password in such case.
++    </para>
++    <programlisting>
++auth     required       pam_securetty.so
++auth     required       pam_env.so
++auth     required       pam_nologin.so
++# optionally call: auth requisite pam_faillock.so preauth deny=4 even_deny_root unlock_time=1200
++# to display the message about account being locked
++auth     [success=1 default=bad] pam_unix.so
++auth     [default=die]  pam_faillock.so authfail deny=4 even_deny_root unlock_time=1200
++auth     sufficient     pam_faillock.so authsucc deny=4 even_deny_root unlock_time=1200
++auth     required       pam_deny.so
++account  required       pam_unix.so
++password required       pam_unix.so shadow
++session  required       pam_selinux.so close
++session  required       pam_loginuid.so
++session  required       pam_unix.so
++session  required       pam_selinux.so open
++    </programlisting>
++    <para>
++      In the second example the module is called both in the <emphasis>auth</emphasis>
++      and <emphasis>account</emphasis> phases and the module gives the authenticating
++      user message when the account is locked 
++    </para>
++    <programlisting>
++auth     required       pam_securetty.so
++auth     required       pam_env.so
++auth     required       pam_nologin.so
++auth     required       pam_faillock.so preauth silent deny=4 even_deny_root unlock_time=1200
++# optionally use requisite above if you do not want to prompt for the password
++# on locked accounts, possibly with removing the silent option as well
++auth     sufficient     pam_unix.so
++auth     [default=die]  pam_faillock.so authfail deny=4 even_deny_root unlock_time=1200
++auth     required       pam_deny.so
++account  required       pam_faillock.so
++# if you drop the above call to pam_faillock.so the lock will be done also
++# on non-consecutive authentication failures
++account  required       pam_unix.so
++password required       pam_unix.so shadow
++session  required       pam_selinux.so close
++session  required       pam_loginuid.so
++session  required       pam_unix.so
++session  required       pam_selinux.so open
++    </programlisting>
++  </refsect1>
++
++  <refsect1 id="pam_faillock-files">
++    <title>FILES</title>
++    <variablelist>
++      <varlistentry>
++        <term><filename>/var/run/faillock/*</filename></term>
++        <listitem>
++          <para>the files logging the authentication failures for users</para>
++        </listitem>
++      </varlistentry>
++    </variablelist>
++  </refsect1>
++
++  <refsect1 id='pam_faillock-see_also'>
++    <title>SEE ALSO</title>
++    <para>
++      <citerefentry>
++        <refentrytitle>faillock</refentrytitle><manvolnum>8</manvolnum>
++      </citerefentry>,
++      <citerefentry>
++        <refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum>
++      </citerefentry>,
++      <citerefentry>
++        <refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
++      </citerefentry>,
++      <citerefentry>
++        <refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
++      </citerefentry>
++    </para>
++  </refsect1>
++
++  <refsect1 id='pam_faillock-author'>
++    <title>AUTHOR</title>
++      <para>
++        pam_faillock was written by Tomas Mraz.
++      </para>
++  </refsect1>
++
++</refentry>
+diff -up Linux-PAM-1.1.1/modules/pam_faillock/README.xml.faillock Linux-PAM-1.1.1/modules/pam_faillock/README.xml
+--- Linux-PAM-1.1.1/modules/pam_faillock/README.xml.faillock	2010-09-17 15:58:41.000000000 +0200
++++ Linux-PAM-1.1.1/modules/pam_faillock/README.xml	2010-09-17 15:58:41.000000000 +0200
+@@ -0,0 +1,46 @@
++<?xml version="1.0" encoding='UTF-8'?>
++<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
++"http://www.docbook.org/xml/4.3/docbookx.dtd"
++[
++<!--
++<!ENTITY pamaccess SYSTEM "pam_faillock.8.xml">
++-->
++]>
++
++<article>
++
++  <articleinfo>
++
++    <title>
++      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++      href="pam_faillock.8.xml" xpointer='xpointer(//refnamediv[@id = "pam_faillock-name"]/*)'/>
++    </title>
++
++  </articleinfo>
++
++  <section>
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++      href="pam_faillock.8.xml" xpointer='xpointer(//refsect1[@id = "pam_faillock-description"]/*)'/>
++  </section>
++
++  <section>
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++      href="pam_faillock.8.xml" xpointer='xpointer(//refsect1[@id = "pam_faillock-options"]/*)'/>
++  </section>
++
++  <section>
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++      href="pam_faillock.8.xml" xpointer='xpointer(//refsect1[@id = "pam_faillock-notes"]/*)'/>
++  </section>
++
++  <section>
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++      href="pam_faillock.8.xml" xpointer='xpointer(//refsect1[@id = "pam_faillock-examples"]/*)'/>
++  </section>
++
++  <section>
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++      href="pam_faillock.8.xml" xpointer='xpointer(//refsect1[@id = "pam_faillock-author"]/*)'/>
++  </section>
++
++</article>
+diff -up Linux-PAM-1.1.1/modules/pam_faillock/tst-pam_faillock.faillock Linux-PAM-1.1.1/modules/pam_faillock/tst-pam_faillock
+--- Linux-PAM-1.1.1/modules/pam_faillock/tst-pam_faillock.faillock	2010-09-17 15:58:41.000000000 +0200
++++ Linux-PAM-1.1.1/modules/pam_faillock/tst-pam_faillock	2010-09-17 15:58:41.000000000 +0200
+@@ -0,0 +1,2 @@
++#!/bin/sh
++../../tests/tst-dlopen .libs/pam_faillock.so
diff --git a/extra/source/pam/patches/pam-1.1.2-noflex.patch b/extra/source/pam/patches/pam-1.1.2-noflex.patch
new file mode 100644
index 00000000..fc965559
--- /dev/null
+++ b/extra/source/pam/patches/pam-1.1.2-noflex.patch
@@ -0,0 +1,27 @@
+diff -up Linux-PAM-1.1.2/doc/Makefile.am.noflex Linux-PAM-1.1.2/doc/Makefile.am
+--- Linux-PAM-1.1.2/doc/Makefile.am.noflex	2008-02-04 16:05:51.000000000 +0100
++++ Linux-PAM-1.1.2/doc/Makefile.am	2010-09-20 10:40:59.000000000 +0200
+@@ -2,7 +2,7 @@
+ # Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de>
+ #
+ 
+-SUBDIRS = man specs sag adg mwg
++SUBDIRS = man sag adg mwg
+ 
+ CLEANFILES = *~
+ 
+diff -up Linux-PAM-1.1.2/Makefile.am.noflex Linux-PAM-1.1.2/Makefile.am
+--- Linux-PAM-1.1.2/Makefile.am.noflex	2010-07-08 14:04:19.000000000 +0200
++++ Linux-PAM-1.1.2/Makefile.am	2010-09-20 10:04:56.000000000 +0200
+@@ -5,9 +5,9 @@
+ AUTOMAKE_OPTIONS = 1.9 gnu dist-bzip2 check-news
+ 
+ if STATIC_MODULES
+-SUBDIRS = modules libpam libpamc libpam_misc tests po conf doc examples xtests
++SUBDIRS = modules libpam libpamc libpam_misc tests po doc examples xtests
+ else
+-SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc examples xtests
++SUBDIRS = libpam tests libpamc libpam_misc modules po doc examples xtests
+ endif
+ 
+ CLEANFILES = *~
diff --git a/extra/source/pam/patches/pam-1.1.3-faillock-screensaver.patch b/extra/source/pam/patches/pam-1.1.3-faillock-screensaver.patch
new file mode 100644
index 00000000..249d2850
--- /dev/null
+++ b/extra/source/pam/patches/pam-1.1.3-faillock-screensaver.patch
@@ -0,0 +1,167 @@
+diff -up Linux-PAM-1.1.3/modules/pam_faillock/faillock.c.screensaver Linux-PAM-1.1.3/modules/pam_faillock/faillock.c
+--- Linux-PAM-1.1.3/modules/pam_faillock/faillock.c.screensaver	2010-11-10 11:46:07.000000000 +0100
++++ Linux-PAM-1.1.3/modules/pam_faillock/faillock.c	2010-11-10 11:46:07.000000000 +0100
+@@ -41,13 +41,14 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/file.h>
++#include <sys/stat.h>
+ #include <fcntl.h>
+ #include <security/pam_modutil.h>
+ 
+ #include "faillock.h"
+ 
+ int
+-open_tally (const char *dir, const char *user, int create)
++open_tally (const char *dir, const char *user, uid_t uid, int create)
+ {
+ 	char *path;
+ 	int flags = O_RDWR;
+@@ -69,8 +70,18 @@ open_tally (const char *dir, const char 
+ 
+ 	fd = open(path, flags, 0600);
+ 
+-	if (fd != -1)
++	free(path);
++
++	if (fd != -1) {
++		struct stat st;
++
+ 		while (flock(fd, LOCK_EX) == -1 && errno == EINTR);
++		if (fstat(fd, &st) == 0) {
++			if (st.st_uid != uid) {
++				fchown(fd, uid, -1);
++			}
++		}
++	}
+ 
+ 	return fd;
+ }
+diff -up Linux-PAM-1.1.3/modules/pam_faillock/faillock.h.screensaver Linux-PAM-1.1.3/modules/pam_faillock/faillock.h
+--- Linux-PAM-1.1.3/modules/pam_faillock/faillock.h.screensaver	2010-11-10 11:46:07.000000000 +0100
++++ Linux-PAM-1.1.3/modules/pam_faillock/faillock.h	2010-11-10 11:46:07.000000000 +0100
+@@ -45,6 +45,7 @@
+ #define _FAILLOCK_H
+ 
+ #include <stdint.h>
++#include <sys/types.h>
+ 
+ #define TALLY_STATUS_VALID     0x1       /* the tally file entry is valid */
+ #define TALLY_STATUS_RHOST     0x2       /* the source is rhost */
+@@ -65,7 +66,7 @@ struct tally_data {
+ 
+ #define FAILLOCK_DEFAULT_TALLYDIR "/var/run/faillock"
+ 
+-int open_tally(const char *dir, const char *user, int create);
++int open_tally(const char *dir, const char *user, uid_t uid, int create);
+ int read_tally(int fd, struct tally_data *tallies);
+ int update_tally(int fd, struct tally_data *tallies);
+ #endif
+diff -up Linux-PAM-1.1.3/modules/pam_faillock/main.c.screensaver Linux-PAM-1.1.3/modules/pam_faillock/main.c
+--- Linux-PAM-1.1.3/modules/pam_faillock/main.c.screensaver	2010-11-10 11:46:07.000000000 +0100
++++ Linux-PAM-1.1.3/modules/pam_faillock/main.c	2010-11-10 11:46:07.000000000 +0100
+@@ -106,8 +106,11 @@ do_user(struct options *opts, const char
+ 	int fd;
+ 	int rv;
+ 	struct tally_data tallies;
++	struct passwd *pwd;
+ 
+-	fd = open_tally(opts->dir, user, 0);
++	pwd = getpwnam(user);
++
++	fd = open_tally(opts->dir, user, pwd != NULL ? pwd->pw_uid : 0, 0);
+ 
+ 	if (fd == -1) {
+ 		if (errno == ENOENT) {
+@@ -134,9 +137,8 @@ do_user(struct options *opts, const char
+ #ifdef HAVE_LIBAUDIT
+ 		}
+ 		if ((audit_fd=audit_open()) >= 0) {
+-			struct passwd *pwd;
+ 
+-			if ((pwd=getpwnam(user)) != NULL) {
++			if (pwd != NULL) {
+ 				snprintf(buf, sizeof(buf), "faillock reset uid=%u",
+ 					pwd->pw_uid);
+ 				audit_log_user_message(audit_fd, AUDIT_USER_ACCT,
+diff -up Linux-PAM-1.1.3/modules/pam_faillock/pam_faillock.c.screensaver Linux-PAM-1.1.3/modules/pam_faillock/pam_faillock.c
+--- Linux-PAM-1.1.3/modules/pam_faillock/pam_faillock.c.screensaver	2010-11-10 11:46:07.000000000 +0100
++++ Linux-PAM-1.1.3/modules/pam_faillock/pam_faillock.c	2010-11-10 11:46:07.000000000 +0100
+@@ -213,7 +213,7 @@ check_tally(pam_handle_t *pamh, struct o
+ 
+ 	opts->now = time(NULL);
+ 
+-	tfd = open_tally(opts->dir, opts->user, 0);
++	tfd = open_tally(opts->dir, opts->user, opts->uid, 0);
+ 
+ 	*fd = tfd;
+ 
+@@ -289,9 +289,14 @@ reset_tally(pam_handle_t *pamh, struct o
+ {
+ 	int rv;
+ 
+-	while ((rv=ftruncate(*fd, 0)) == -1 && errno == EINTR);
+-	if (rv == -1) {
+-		pam_syslog(pamh, LOG_ERR, "Error clearing the tally file for %s: %m", opts->user);
++	if (*fd == -1) {
++		*fd = open_tally(opts->dir, opts->user, opts->uid, 1);
++	}
++	else {
++		while ((rv=ftruncate(*fd, 0)) == -1 && errno == EINTR);
++		if (rv == -1) {
++			pam_syslog(pamh, LOG_ERR, "Error clearing the tally file for %s: %m", opts->user);
++		}
+ 	}
+ }
+ 
+@@ -306,7 +311,7 @@ write_tally(pam_handle_t *pamh, struct o
+ 	const void *source = NULL;
+ 
+ 	if (*fd == -1) {
+-		*fd = open_tally(opts->dir, opts->user, 1);
++		*fd = open_tally(opts->dir, opts->user, opts->uid, 1);
+ 	}
+ 	if (*fd == -1) {
+ 		if (errno == EACCES) {
+@@ -463,7 +468,7 @@ pam_sm_authenticate(pam_handle_t *pamh, 
+ 
+ 		case FAILLOCK_ACTION_AUTHSUCC:
+ 			rv = check_tally(pamh, &opts, &tallies, &fd);
+-			if (rv == PAM_SUCCESS && fd != -1) {
++			if (rv == PAM_SUCCESS) {
+ 				reset_tally(pamh, &opts, &fd);
+ 			}
+                         break;
+@@ -511,10 +516,8 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int
+ 		return rv;
+ 	}
+ 
+-	check_tally(pamh, &opts, &tallies, &fd);
+-	if (fd != -1) {
+-		reset_tally(pamh, &opts, &fd);
+-	}
++	check_tally(pamh, &opts, &tallies, &fd); /* for auditing */
++	reset_tally(pamh, &opts, &fd);
+ 
+ 	tally_cleanup(&tallies, fd);
+ 
+diff -up Linux-PAM-1.1.3/modules/pam_faillock/pam_faillock.8.xml.screensaver Linux-PAM-1.1.3/modules/pam_faillock/pam_faillock.8.xml
+--- Linux-PAM-1.1.3/modules/pam_faillock/pam_faillock.8.xml.screensaver	2010-11-10 11:46:07.000000000 +0100
++++ Linux-PAM-1.1.3/modules/pam_faillock/pam_faillock.8.xml	2010-11-10 11:47:14.000000000 +0100
+@@ -277,13 +277,9 @@
+       from the <emphasis>pam_tally2</emphasis> module setup.
+     </para>
+     <para>
+-      There is no setuid wrapper for access to the data file such as when the
+-      <emphasis remap='B'>pam_faillock.so</emphasis> module is called from
+-      a screensaver. As this would make it impossible to share PAM configuration
+-      with such services the following workaround is used: If the data file
+-      cannot be opened because of insufficient permissions
+-      (<errorcode>EACCES</errorcode>) the module returns
+-      <errorcode>PAM_SUCCESS</errorcode>.
++      The individual files with the failure records are created as owned by
++      the user. This allows <emphasis remap='B'>pam_faillock.so</emphasis> module
++      to work correctly when it is called from a screensaver.
+     </para>
+     <para>
+       Note that using the module in <option>preauth</option> without the
diff --git a/extra/source/pam/patches/pam-1.1.3-limits-nosetreuid.patch b/extra/source/pam/patches/pam-1.1.3-limits-nosetreuid.patch
new file mode 100644
index 00000000..885690d0
--- /dev/null
+++ b/extra/source/pam/patches/pam-1.1.3-limits-nosetreuid.patch
@@ -0,0 +1,64 @@
+diff -up Linux-PAM-1.1.3/modules/pam_limits/pam_limits.c.nosetreuid Linux-PAM-1.1.3/modules/pam_limits/pam_limits.c
+--- Linux-PAM-1.1.3/modules/pam_limits/pam_limits.c.nosetreuid	2009-02-20 14:27:14.000000000 +0100
++++ Linux-PAM-1.1.3/modules/pam_limits/pam_limits.c	2010-11-11 12:31:04.000000000 +0100
+@@ -103,7 +103,6 @@ struct pam_limit_s {
+ /* argument parsing */
+ 
+ #define PAM_DEBUG_ARG       0x0001
+-#define PAM_DO_SETREUID     0x0002
+ #define PAM_UTMP_EARLY      0x0004
+ #define PAM_NO_AUDIT        0x0008
+ 
+@@ -127,8 +126,6 @@ _pam_parse (const pam_handle_t *pamh, in
+ 	    ctrl |= PAM_DEBUG_ARG;
+ 	} else if (!strncmp(*argv,"conf=",5)) {
+ 	    pl->conf_file = *argv+5;
+-	} else if (!strncmp(*argv,"change_uid",10)) {
+-	    ctrl |= PAM_DO_SETREUID;
+ 	} else if (!strcmp(*argv,"utmp_early")) {
+ 	    ctrl |= PAM_UTMP_EARLY;
+ 	} else if (!strcmp(*argv,"noaudit")) {
+@@ -777,10 +774,6 @@ out:
+ 	return retval;
+     }
+ 
+-    if (ctrl & PAM_DO_SETREUID) {
+-	setreuid(pwd->pw_uid, -1);
+-    }
+-
+     retval = setup_limits(pamh, pwd->pw_name, pwd->pw_uid, ctrl, pl);
+     if (retval & LOGIN_ERR)
+ 	pam_error(pamh, _("Too many logins for '%s'."), pwd->pw_name);
+diff -up Linux-PAM-1.1.3/modules/pam_limits/pam_limits.8.xml.nosetreuid Linux-PAM-1.1.3/modules/pam_limits/pam_limits.8.xml
+--- Linux-PAM-1.1.3/modules/pam_limits/pam_limits.8.xml.nosetreuid	2009-06-01 09:03:20.000000000 +0200
++++ Linux-PAM-1.1.3/modules/pam_limits/pam_limits.8.xml	2010-11-11 12:32:35.000000000 +0100
+@@ -23,9 +23,6 @@
+     <cmdsynopsis id="pam_limits-cmdsynopsis">
+       <command>pam_limits.so</command>
+       <arg choice="opt">
+-        change_uid
+-      </arg>
+-      <arg choice="opt">
+         conf=<replaceable>/path/to/limits.conf</replaceable>
+       </arg>
+       <arg choice="opt">
+@@ -72,19 +69,6 @@
+     <variablelist>
+       <varlistentry>
+         <term>
+-          <option>change_uid</option>
+-        </term>
+-        <listitem>
+-          <para>
+-            Change real uid to the user for who the limits are set up. Use this
+-            option if you have problems like login not forking a shell for user
+-            who has no processes. Be warned that something else may break when
+-            you do this.
+-          </para>
+-        </listitem>
+-      </varlistentry>
+-      <varlistentry>
+-        <term>
+           <option>conf=<replaceable>/path/to/limits.conf</replaceable></option>
+         </term>
+         <listitem>
diff --git a/extra/source/pam/patches/pam-1.1.3-limits-range.patch b/extra/source/pam/patches/pam-1.1.3-limits-range.patch
new file mode 100644
index 00000000..c357eb28
--- /dev/null
+++ b/extra/source/pam/patches/pam-1.1.3-limits-range.patch
@@ -0,0 +1,351 @@
+Index: modules/pam_limits/limits.conf.5.xml
+===================================================================
+RCS file: /cvsroot/pam/Linux-PAM/modules/pam_limits/limits.conf.5.xml,v
+retrieving revision 1.9
+retrieving revision 1.11
+diff -u -p -r1.9 -r1.11
+--- modules/pam_limits/limits.conf.5.xml	20 Feb 2009 13:27:14 -0000	1.9
++++ modules/pam_limits/limits.conf.5.xml	14 Dec 2010 08:40:40 -0000	1.11
+@@ -53,7 +53,38 @@
+             <listitem>
+               <para>
+                 the wildcard <emphasis remap='B'>%</emphasis>, for maxlogins limit only,
+-                can also be used with <emphasis remap='b'>%group</emphasis> syntax.
++                can also be used with <emphasis remap='B'>%group</emphasis> syntax. If the
++                <emphasis remap='B'>%</emphasis> wildcard is used alone it is identical
++                to using <emphasis remap='B'>*</emphasis> with maxsyslogins limit. With
++                a group specified after <emphasis remap='B'>%</emphasis> it limits the total
++                number of logins of all users that are member of the group.
++              </para>
++            </listitem>
++            <listitem>
++              <para>
++                an uid range specified as <replaceable>&lt;min_uid&gt;</replaceable><emphasis
++                remap='B'>:</emphasis><replaceable>&lt;max_uid&gt;</replaceable>. If min_uid
++                is omitted, the match is exact for the max_uid. If max_uid is omitted, all
++                uids greater than or equal min_uid match.
++              </para>
++            </listitem>
++            <listitem>
++              <para>
++                a gid range specified as <emphasis
++                remap='B'>@</emphasis><replaceable>&lt;min_gid&gt;</replaceable><emphasis
++                remap='B'>:</emphasis><replaceable>&lt;max_gid&gt;</replaceable>. If min_gid
++                is omitted, the match is exact for the max_gid. If max_gid is omitted, all
++                gids greater than or equal min_gid match. For the exact match all groups including
++                the user's supplementary groups are examined. For the range matches only
++                the user's primary group is examined.
++              </para>
++            </listitem>
++            <listitem>
++              <para>
++                a gid specified as <emphasis
++                remap='B'>%:</emphasis><replaceable>&lt;gid&gt;</replaceable> applicable
++                to maxlogins limit only. It limits the total number of logins of all users
++                that are member of the group with the specified gid.
+               </para>
+             </listitem>
+           </itemizedlist>
+@@ -182,7 +213,7 @@
+             <varlistentry>
+               <term><option>maxsyslogins</option></term>
+               <listitem>
+-                <para>maximum number of logins on system</para>
++                <para>maximum number of all logins on system</para>
+               </listitem>
+             </varlistentry>
+             <varlistentry>
+@@ -272,12 +303,15 @@
+     </para>
+     <programlisting>
+ *               soft    core            0
+-*               hard    rss             10000
++*               hard    nofile          512
+ @student        hard    nproc           20
+ @faculty        soft    nproc           20
+ @faculty        hard    nproc           50
+ ftp             hard    nproc           0
+ @student        -       maxlogins       4
++:123            hard    cpu             5000
++@500:           soft    cpu             10000
++600:700         hard    locks           10
+     </programlisting>
+   </refsect1>
+ 
+Index: modules/pam_limits/pam_limits.c
+===================================================================
+RCS file: /cvsroot/pam/Linux-PAM/modules/pam_limits/pam_limits.c,v
+retrieving revision 1.48
+retrieving revision 1.49
+diff -u -p -r1.48 -r1.49
+--- modules/pam_limits/pam_limits.c	18 Nov 2010 09:37:32 -0000	1.48
++++ modules/pam_limits/pam_limits.c	14 Dec 2010 08:40:40 -0000	1.49
+@@ -55,6 +55,12 @@
+ #define LIMITS_DEF_DEFAULT  4 /* limit was set by an default entry */
+ #define LIMITS_DEF_NONE     5 /* this limit was not set yet */
+ 
++#define LIMIT_RANGE_ERR    -1 /* error in specified uid/gid range */
++#define LIMIT_RANGE_NONE    0 /* no range specified */
++#define LIMIT_RANGE_ONE     1 /* exact uid/gid specified (:max_uid)*/
++#define LIMIT_RANGE_MIN     2 /* only minimum uid/gid specified (min_uid:) */
++#define LIMIT_RANGE_MM      3 /* both min and max uid/gid specified (min_uid:max_uid) */
++
+ static const char *limits_def_names[] = {
+        "USER",
+        "GROUP",
+@@ -520,8 +526,57 @@ process_limit (const pam_handle_t *pamh,
+     return;
+ }
+ 
+-static int parse_config_file(pam_handle_t *pamh, const char *uname, int ctrl,
+-			     struct pam_limit_s *pl)
++static int
++parse_uid_range(pam_handle_t *pamh, const char *domain,
++		uid_t *min_uid, uid_t *max_uid)
++{
++    const char *range = domain;
++    char *pmax;
++    char *endptr;
++    int rv = LIMIT_RANGE_MM;
++
++    if ((pmax=strchr(range, ':')) == NULL)
++	return LIMIT_RANGE_NONE;
++    ++pmax;
++
++    if (range[0] == '@' || range[0] == '%')
++	++range;
++
++    if (range[0] == ':')
++	rv = LIMIT_RANGE_ONE;
++    else {
++	    errno = 0;
++	    *min_uid = strtoul (range, &endptr, 10);
++	    if (errno != 0 || (range == endptr) || *endptr != ':') {
++		pam_syslog(pamh, LOG_DEBUG,
++			   "wrong min_uid/gid value in '%s'", domain);
++		return LIMIT_RANGE_ERR;
++	    }
++    }
++
++    if (*pmax == '\0') {
++	if (rv == LIMIT_RANGE_ONE)
++	    return LIMIT_RANGE_ERR;
++	else
++	    return LIMIT_RANGE_MIN;
++    }
++
++    errno = 0;
++    *max_uid = strtoul (pmax, &endptr, 10);
++    if (errno != 0 || (pmax == endptr) || *endptr != '\0') {
++	pam_syslog(pamh, LOG_DEBUG,
++		   "wrong max_uid/gid value in '%s'", domain);
++	return LIMIT_RANGE_ERR;
++    }
++
++    if (rv == LIMIT_RANGE_ONE)
++	*min_uid = *max_uid;
++    return rv;
++}
++
++static int
++parse_config_file(pam_handle_t *pamh, const char *uname, uid_t uid, gid_t gid,
++			     int ctrl, struct pam_limit_s *pl)
+ {
+     FILE *fil;
+     char buf[LINE_LENGTH];
+@@ -543,8 +598,10 @@ static int parse_config_file(pam_handle_
+         char item[LINE_LENGTH];
+         char value[LINE_LENGTH];
+         int i;
++        int rngtype;
+         size_t j;
+         char *tptr,*line;
++        uid_t min_uid = (uid_t)-1, max_uid = (uid_t)-1;
+ 
+         line = buf;
+         /* skip the leading white space */
+@@ -572,6 +629,11 @@ static int parse_config_file(pam_handle_
+         for(j=0; j < strlen(ltype); j++)
+             ltype[j]=tolower(ltype[j]);
+ 
++	if ((rngtype=parse_uid_range(pamh, domain, &min_uid, &max_uid)) < 0) {
++	    pam_syslog(pamh, LOG_WARNING, "invalid uid range '%s' - skipped", domain);
++	    continue;
++	}
++
+         if (i == 4) { /* a complete line */
+ 	    for(j=0; j < strlen(item); j++)
+ 		item[j]=tolower(item[j]);
+@@ -581,47 +643,133 @@ static int parse_config_file(pam_handle_
+             if (strcmp(uname, domain) == 0) /* this user have a limit */
+                 process_limit(pamh, LIMITS_DEF_USER, ltype, item, value, ctrl, pl);
+             else if (domain[0]=='@') {
+-		    if (ctrl & PAM_DEBUG_ARG) {
++		if (ctrl & PAM_DEBUG_ARG) {
+ 			pam_syslog(pamh, LOG_DEBUG,
+ 				   "checking if %s is in group %s",
+ 				   uname, domain + 1);
+-		    }
+-                if (pam_modutil_user_in_group_nam_nam(pamh, uname, domain+1))
+-                    process_limit(pamh, LIMITS_DEF_GROUP, ltype, item, value, ctrl,
++		}
++		switch(rngtype) {
++		    case LIMIT_RANGE_NONE:
++			if (pam_modutil_user_in_group_nam_nam(pamh, uname, domain+1))
++			    process_limit(pamh, LIMITS_DEF_GROUP, ltype, item, value, ctrl,
++					  pl);
++			break;
++		    case LIMIT_RANGE_ONE:
++			if (pam_modutil_user_in_group_nam_gid(pamh, uname, (gid_t)max_uid))
++			    process_limit(pamh, LIMITS_DEF_GROUP, ltype, item, value, ctrl,
+ 				  pl);
++			break;
++		    case LIMIT_RANGE_MM:
++			if (gid > (gid_t)max_uid)
++			    break;
++			/* fallthrough */
++		    case LIMIT_RANGE_MIN:
++			if (gid >= (gid_t)min_uid)
++			    process_limit(pamh, LIMITS_DEF_GROUP, ltype, item, value, ctrl,
++					  pl);
++		}
+             } else if (domain[0]=='%') {
+-		    if (ctrl & PAM_DEBUG_ARG) {
++		if (ctrl & PAM_DEBUG_ARG) {
+ 			pam_syslog(pamh, LOG_DEBUG,
+ 				   "checking if %s is in group %s",
+ 				   uname, domain + 1);
+-		    }
+-		if (strcmp(domain,"%") == 0)
+-		    process_limit(pamh, LIMITS_DEF_ALL, ltype, item, value, ctrl,
+-				  pl);
+-		else if (pam_modutil_user_in_group_nam_nam(pamh, uname, domain+1)) {
+-		    strcpy(pl->login_group, domain+1);
+-                    process_limit(pamh, LIMITS_DEF_ALLGROUP, ltype, item, value, ctrl,
+-				  pl);
+ 		}
+-            } else if (strcmp(domain, "*") == 0)
+-                process_limit(pamh, LIMITS_DEF_DEFAULT, ltype, item, value, ctrl,
+-			      pl);
++		switch(rngtype) {
++		    case LIMIT_RANGE_NONE:
++			if (strcmp(domain,"%") == 0)
++			    process_limit(pamh, LIMITS_DEF_ALL, ltype, item, value, ctrl,
++					  pl);
++			else if (pam_modutil_user_in_group_nam_nam(pamh, uname, domain+1)) {
++			    strcpy(pl->login_group, domain+1);
++			    process_limit(pamh, LIMITS_DEF_ALLGROUP, ltype, item, value, ctrl,
++					  pl);
++			}
++			break;
++		    case LIMIT_RANGE_ONE:
++			if (pam_modutil_user_in_group_nam_gid(pamh, uname, (gid_t)max_uid)) {
++			    struct group *grp;
++			    grp = pam_modutil_getgrgid(pamh, (gid_t)max_uid);
++			    strncpy(pl->login_group, grp->gr_name, sizeof(pl->login_group));
++			    pl->login_group[sizeof(pl->login_group)-1] = '\0';
++			    process_limit(pamh, LIMITS_DEF_ALLGROUP, ltype, item, value, ctrl,
++					  pl);
++			}
++			break;
++		    case LIMIT_RANGE_MIN:
++		    case LIMIT_RANGE_MM:
++			pam_syslog(pamh, LOG_WARNING, "range unsupported for %%group matching - ignored");
++		}
++            } else {
++		switch(rngtype) {
++		    case LIMIT_RANGE_NONE:
++			if (strcmp(domain, "*") == 0)
++			    process_limit(pamh, LIMITS_DEF_DEFAULT, ltype, item, value, ctrl,
++					  pl);
++			break;
++		    case LIMIT_RANGE_ONE:
++			if (uid != max_uid)
++			    break;
++			/* fallthrough */
++		    case LIMIT_RANGE_MM:
++			if (uid > max_uid)
++			    break;
++			/* fallthrough */
++		    case LIMIT_RANGE_MIN:
++			if (uid >= min_uid)
++			    process_limit(pamh, LIMITS_DEF_USER, ltype, item, value, ctrl, pl);
++		}
++	    }
+ 	} else if (i == 2 && ltype[0] == '-') { /* Probably a no-limit line */
+ 	    if (strcmp(uname, domain) == 0) {
+ 		if (ctrl & PAM_DEBUG_ARG) {
+ 		    pam_syslog(pamh, LOG_DEBUG, "no limits for '%s'", uname);
+ 		}
+-		fclose(fil);
+-		return PAM_IGNORE;
+-	    } else if (domain[0] == '@' && pam_modutil_user_in_group_nam_nam(pamh, uname, domain+1)) {
++	    } else if (domain[0] == '@') {
++		switch(rngtype) {
++		    case LIMIT_RANGE_NONE:
++			if (!pam_modutil_user_in_group_nam_nam(pamh, uname, domain+1))
++			    continue; /* next line */
++			break;
++		    case LIMIT_RANGE_ONE:
++			if (!pam_modutil_user_in_group_nam_gid(pamh, uname, (gid_t)max_uid))
++			    continue; /* next line */
++			break;
++		    case LIMIT_RANGE_MM:
++			if (gid > (gid_t)max_uid)
++			    continue;  /* next line */
++			/* fallthrough */
++		    case LIMIT_RANGE_MIN:
++			if (gid < (gid_t)min_uid)
++			    continue;  /* next line */
++		}
+ 		if (ctrl & PAM_DEBUG_ARG) {
+ 		    pam_syslog(pamh, LOG_DEBUG,
+ 			       "no limits for '%s' in group '%s'",
+ 			       uname, domain+1);
+ 		}
+-		fclose(fil);
+-		return PAM_IGNORE;
++	    } else {
++		switch(rngtype) {
++		    case LIMIT_RANGE_NONE:
++			continue;  /* next line */
++		    case LIMIT_RANGE_ONE:
++			if (uid != max_uid)
++			    continue;  /* next line */
++			break;
++		    case LIMIT_RANGE_MM:
++			if (uid > max_uid)
++			    continue;  /* next line */
++			/* fallthrough */
++		    case LIMIT_RANGE_MIN:
++			if (uid >= min_uid)
++			    break;
++			continue;  /* next line */
++		}
++		if (ctrl & PAM_DEBUG_ARG) {
++		    pam_syslog(pamh, LOG_DEBUG, "no limits for '%s'", uname);
++		}
+ 	    }
++	    fclose(fil);
++	    return PAM_IGNORE;
+         } else {
+             pam_syslog(pamh, LOG_WARNING, "invalid line '%s' - skipped", line);
+ 	}
+@@ -731,7 +879,7 @@ pam_sm_open_session (pam_handle_t *pamh,
+         return PAM_ABORT;
+     }
+ 
+-    retval = parse_config_file(pamh, pwd->pw_name, ctrl, pl);
++    retval = parse_config_file(pamh, pwd->pw_name, pwd->pw_uid, pwd->pw_gid, ctrl, pl);
+     if (retval == PAM_IGNORE) {
+ 	D(("the configuration file ('%s') has an applicable '<domain> -' entry", CONF_FILE));
+ 	return PAM_SUCCESS;
+@@ -755,7 +903,7 @@ pam_sm_open_session (pam_handle_t *pamh,
+ 	/* Parse the *.conf files. */
+ 	for (i = 0; globbuf.gl_pathv[i] != NULL; i++) {
+ 	    pl->conf_file = globbuf.gl_pathv[i];
+-    	    retval = parse_config_file(pamh, pwd->pw_name, ctrl, pl);
++    	    retval = parse_config_file(pamh, pwd->pw_name, pwd->pw_uid, pwd->pw_gid, ctrl, pl);
+     	    if (retval == PAM_IGNORE) {
+ 		D(("the configuration file ('%s') has an applicable '<domain> -' entry", pl->conf_file));
+ 		globfree(&globbuf);
diff --git a/extra/source/pam/patches/pam-1.1.3-nouserenv.patch b/extra/source/pam/patches/pam-1.1.3-nouserenv.patch
new file mode 100644
index 00000000..f3a742c8
--- /dev/null
+++ b/extra/source/pam/patches/pam-1.1.3-nouserenv.patch
@@ -0,0 +1,27 @@
+diff -up pam/modules/pam_env/pam_env.c.nouserenv pam/modules/pam_env/pam_env.c
+--- pam/modules/pam_env/pam_env.c.nouserenv	2010-10-20 09:59:30.000000000 +0200
++++ pam/modules/pam_env/pam_env.c	2010-11-01 14:42:01.000000000 +0100
+@@ -10,7 +10,7 @@
+ #define DEFAULT_READ_ENVFILE    1
+ 
+ #define DEFAULT_USER_ENVFILE    ".pam_environment"
+-#define DEFAULT_USER_READ_ENVFILE 1
++#define DEFAULT_USER_READ_ENVFILE 0
+ 
+ #include "config.h"
+ 
+diff -up pam/modules/pam_env/pam_env.8.xml.nouserenv pam/modules/pam_env/pam_env.8.xml
+--- pam/modules/pam_env/pam_env.8.xml.nouserenv	2010-10-20 09:59:30.000000000 +0200
++++ pam/modules/pam_env/pam_env.8.xml	2010-11-01 14:42:01.000000000 +0100
+@@ -147,7 +147,10 @@
+         <listitem>
+           <para>
+             Turns on or off the reading of the user specific environment
+-            file. 0 is off, 1 is on. By default this option is on.
++            file. 0 is off, 1 is on. By default this option is off as user
++            supplied environment variables in the PAM environment could affect
++            behavior of subsequent modules in the stack without the consent
++            of the system administrator.
+           </para>
+         </listitem>
+       </varlistentry>
diff --git a/extra/source/pam/patches/pam-1.1.3-pwhistory-incomplete.patch b/extra/source/pam/patches/pam-1.1.3-pwhistory-incomplete.patch
new file mode 100644
index 00000000..6117b26e
--- /dev/null
+++ b/extra/source/pam/patches/pam-1.1.3-pwhistory-incomplete.patch
@@ -0,0 +1,54 @@
+diff -up Linux-PAM-1.1.3/modules/pam_pwhistory/pam_pwhistory.c.incomplete Linux-PAM-1.1.3/modules/pam_pwhistory/pam_pwhistory.c
+--- Linux-PAM-1.1.3/modules/pam_pwhistory/pam_pwhistory.c.incomplete	2008-12-18 14:09:36.000000000 +0100
++++ Linux-PAM-1.1.3/modules/pam_pwhistory/pam_pwhistory.c	2010-11-11 14:45:02.000000000 +0100
+@@ -187,12 +187,13 @@ pam_sm_chauthtok (pam_handle_t *pamh, in
+     {
+       retval = pam_get_authtok (pamh, PAM_AUTHTOK, &newpass, NULL);
+       if (retval != PAM_SUCCESS && retval != PAM_TRY_AGAIN)
+-	return retval;
++	{
++	  if (retval == PAM_CONV_AGAIN)
++	    retval = PAM_INCOMPLETE;
++	  return retval;
++	}
+       tries++;
+ 
+-      if (newpass == NULL || retval == PAM_TRY_AGAIN)
+-	continue;
+-
+       if (options.debug)
+ 	{
+ 	  if (newpass)
+@@ -201,12 +202,8 @@ pam_sm_chauthtok (pam_handle_t *pamh, in
+ 	    pam_syslog (pamh, LOG_DEBUG, "got no auth token");
+ 	}
+ 
+-      if (retval != PAM_SUCCESS || newpass == NULL)
+-	{
+-	  if (retval == PAM_CONV_AGAIN)
+-	    retval = PAM_INCOMPLETE;
+-	  return retval;
+-	}
++      if (newpass == NULL || retval == PAM_TRY_AGAIN)
++	continue;
+ 
+       if (options.debug)
+ 	pam_syslog (pamh, LOG_DEBUG, "check against old password file");
+@@ -219,7 +216,6 @@ pam_sm_chauthtok (pam_handle_t *pamh, in
+ 	  newpass = NULL;
+ 	  /* Remove password item, else following module will use it */
+           pam_set_item (pamh, PAM_AUTHTOK, (void *) NULL);
+-	  continue;
+ 	}
+     }
+ 
+@@ -230,8 +226,7 @@ pam_sm_chauthtok (pam_handle_t *pamh, in
+       return PAM_MAXTRIES;
+     }
+ 
+-  /* Remember new password */
+-  return pam_set_item (pamh, PAM_AUTHTOK, newpass);
++  return PAM_SUCCESS;
+ }
+ 
+ 
diff --git a/extra/source/pam/patches/pam-1.1.3-securetty-console.patch b/extra/source/pam/patches/pam-1.1.3-securetty-console.patch
new file mode 100644
index 00000000..94fa6ecf
--- /dev/null
+++ b/extra/source/pam/patches/pam-1.1.3-securetty-console.patch
@@ -0,0 +1,120 @@
+Index: modules/pam_securetty/pam_securetty.8.xml
+===================================================================
+RCS file: /cvsroot/pam/Linux-PAM/modules/pam_securetty/pam_securetty.8.xml,v
+retrieving revision 1.4
+retrieving revision 1.6
+diff -u -p -r1.4 -r1.6
+--- modules/pam_securetty/pam_securetty.8.xml	18 Aug 2008 13:29:25 -0000	1.4
++++ modules/pam_securetty/pam_securetty.8.xml	25 Nov 2010 16:58:59 -0000	1.6
+@@ -33,7 +33,9 @@
+       user is logging in on a "secure" tty, as defined by the listing
+       in <filename>/etc/securetty</filename>. pam_securetty also checks
+       to make sure that <filename>/etc/securetty</filename> is a plain
+-      file and not world writable.
++      file and not world writable. It will also allow root logins on
++      the tty specified with <option>console=</option> switch on the
++      kernel command line.
+     </para>
+     <para>
+       This module has no effect on non-root users and requires that the
+@@ -61,6 +63,18 @@
+           </para>
+         </listitem>
+       </varlistentry>
++      <varlistentry>
++        <term>
++          <option>noconsole</option>
++        </term>
++        <listitem>
++          <para>
++            Do not automatically allow root logins on the kernel console
++            device, as specified on the kernel command line, if it is
++            not also specified in the <filename>/etc/securetty</filename> file.
++          </para>
++        </listitem>
++      </varlistentry>
+     </variablelist>
+   </refsect1>
+ 
+Index: modules/pam_securetty/pam_securetty.c
+===================================================================
+RCS file: /cvsroot/pam/Linux-PAM/modules/pam_securetty/pam_securetty.c,v
+retrieving revision 1.14
+retrieving revision 1.15
+diff -u -p -r1.14 -r1.15
+--- modules/pam_securetty/pam_securetty.c	10 Sep 2009 10:19:58 -0000	1.14
++++ modules/pam_securetty/pam_securetty.c	24 Nov 2010 12:28:01 -0000	1.15
+@@ -2,6 +2,7 @@
+ 
+ #define SECURETTY_FILE "/etc/securetty"
+ #define TTY_PREFIX     "/dev/"
++#define CMDLINE_FILE   "/proc/cmdline"
+ 
+ /*
+  * by Elliot Lee <sopwith@redhat.com>, Red Hat Software.
+@@ -22,6 +23,7 @@
+ #include <pwd.h>
+ #include <string.h>
+ #include <ctype.h>
++#include <limits.h>
+ 
+ /*
+  * here, we make a definition for the externally accessible function
+@@ -38,6 +40,7 @@
+ #include <security/pam_ext.h>
+ 
+ #define PAM_DEBUG_ARG       0x0001
++#define PAM_NOCONSOLE_ARG   0x0002
+ 
+ static int
+ _pam_parse (const pam_handle_t *pamh, int argc, const char **argv)
+@@ -51,6 +54,8 @@ _pam_parse (const pam_handle_t *pamh, in
+ 
+ 	if (!strcmp(*argv,"debug"))
+ 	    ctrl |= PAM_DEBUG_ARG;
++        else if (!strcmp(*argv, "noconsole"))
++            ctrl |= PAM_NOCONSOLE_ARG;
+ 	else {
+ 	    pam_syslog(pamh, LOG_ERR, "unknown option: %s", *argv);
+ 	}
+@@ -144,6 +149,40 @@ securetty_perform_check (pam_handle_t *p
+     }
+     fclose(ttyfile);
+ 
++    if (retval && !(ctrl & PAM_NOCONSOLE_ARG)) {
++        FILE *cmdlinefile;
++
++        /* Allow access from the kernel console, if enabled */
++        cmdlinefile = fopen(CMDLINE_FILE, "r");
++
++        if (cmdlinefile != NULL) {
++            char line[LINE_MAX], *p;
++
++            line[0] = 0;
++            fgets(line, sizeof(line), cmdlinefile);
++            fclose(cmdlinefile);
++
++            for (p = line; p; p = strstr(p+1, "console=")) {
++                char *e;
++
++                /* Test whether this is a beginning of a word? */
++                if (p > line && p[-1] != ' ')
++                    continue;
++
++                /* Ist this our console? */
++                if (strncmp(p + 8, uttyname, strlen(uttyname)))
++                    continue;
++
++                /* Is there any garbage after the TTY name? */
++                e = p + 8 + strlen(uttyname);
++                if (*e == ',' || *e == ' ' || *e == '\n' || *e == 0) {
++                    retval = 0;
++                    break;
++                }
++            }
++        }
++    }
++
+     if (retval) {
+ 	    pam_syslog(pamh, LOG_WARNING, "access denied: tty '%s' is not secure !",
+ 		     uttyname);
diff --git a/extra/source/pam/slack-desc b/extra/source/pam/slack-desc
new file mode 100644
index 00000000..8b57bc0d
--- /dev/null
+++ b/extra/source/pam/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------------------------------------------------------|
+pam: pam (Pluggable Authentication Modules)
+pam:
+pam: PAM = Pluggable Authentication Modules.  Basically, it is a flexible
+pam: mechanism for authenticating users.  PAM provides a way to develop
+pam: programs that are independent of authentication scheme.  However,
+pam: these programs will need "authentication modules" (and libpam) at
+pam: run-time in order to work.
+pam:
+pam:
+pam: Homepage:  http://www.kernel.org/pub/linux/libs/pam/
+pam:
diff --git a/extra/source/slacktrack/slacktrack.SlackBuild b/extra/source/slacktrack/slacktrack.SlackBuild
deleted file mode 100755
index ca2bd093..00000000
--- a/extra/source/slacktrack/slacktrack.SlackBuild
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-# Set initial variables:
-CWD=`pwd`
-if [ "$TMP" = "" ]; then
-  TMP=/tmp
-fi
-
-export VERSION=2.07
-export PKGEXT=${PKGEXT:-txz}
-
-if [ ! -d $TMP ]; then
-  mkdir -p $TMP # location to build the source
-fi
-cd $TMP
-rm -rf slacktrack
-tar xvf $CWD/slacktrack-$VERSION-source.tar.gz
-cd slacktrack
-
-# Start the "real" SlackBuild:
-./slacktrack.SlackBuild
diff --git a/extra/source/yasm/yasm.SlackBuild b/extra/source/yasm/yasm.SlackBuild
deleted file mode 100755
index 0c71cdae..00000000
--- a/extra/source/yasm/yasm.SlackBuild
+++ /dev/null
@@ -1,204 +0,0 @@
-#!/bin/sh
-# $Id: yasm.SlackBuild,v 1.7 2009/05/12 20:24:31 root Exp root $
-# Copyright (c) 2008 Eric Hameleers <alien@slackware.com>
-# 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.
-# -----------------------------------------------------------------------------
-#
-# Slackware SlackBuild script 
-# ===========================
-# By:         Eric Hameleers <alien@slackware.com>
-# For:        yasm
-# Descr:      complete rewrite of the NASM assembler
-# URL:        http://www.tortall.net/projects/yasm/
-# Needs:      
-# Changelog:  
-# 0.7.1-1:    16/Jun/2008 by Eric Hameleers <alien@slackware.com>
-#             * Initial build.
-# 0.7.2-1:    08/dec/2008 by Eric Hameleers <alien@slackware.com>
-#             * Update.
-# 0.8.0-1:    12/may/2009 by Eric Hameleers <alien@slackware.com>
-#             * Update.
-# 
-# Run 'sh yasm.SlackBuild' to build a Slackware package.
-# The package (.txz) plus descriptive .txt file are created in /tmp .
-# Install using 'installpkg'. 
-#
-# -----------------------------------------------------------------------------
-
-PRGNAM=yasm
-VERSION=${VERSION:-0.8.0}
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-1}
-TAG=${TAG:-}
-
-DOCS="ABOUT-NLS AUTHORS ChangeLog COPYING GNU_* NEWS README *.txt"
-
-# If you want to disable python bindings, set ENABLE_PYTHON to "NO".
-# Building python support on Slackware 12.0 and older will fail (missing Pyrex).
-ENABLE_PYTHON=${ENABLE_PYTHON:-"YES"}
-
-# Where do we look for sources?
-SRCDIR=$(cd $(dirname $0); pwd)
-
-# Place to build (TMP) package (PKG) and output (OUTPUT) the program:
-TMP=${TMP:-/tmp/build}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.gz"
-SRCURL="http://www.tortall.net/projects/${PRGNAM}/releases/${PRGNAM}-${VERSION}.tar.gz"
-
-##
-## --- with a little luck, you won't have to edit below this point --- ##
-##
-
-# Exit the script on errors:
-set -e
-trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR
-# Catch unitialized variables:
-set -u
-P1=${1:-1}
-
-case "$ARCH" in
-  i486)      SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-             SLKLDFLAGS=""; LIBDIRSUFFIX=""
-             ;;
-  s390)      SLKCFLAGS="-O2"
-             SLKLDFLAGS=""; LIBDIRSUFFIX=""
-             ;;
-  powerpc)   SLKCFLAGS="-O2"
-             SLKLDFLAGS=""; LIBDIRSUFFIX=""
-             ;;
-  x86_64)    SLKCFLAGS="-O2 -fPIC"
-             SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
-             ;;
-  athlon-xp) SLKCFLAGS="-march=athlon-xp -O3 -pipe -fomit-frame-pointer"
-             SLKLDFLAGS=""; LIBDIRSUFFIX=""
-             ;;
-esac
-
-# Create working directories:
-mkdir -p $OUTPUT          # place for the package to be saved
-mkdir -p $TMP/tmp-$PRGNAM # location to build the source
-mkdir -p $PKG             # place for the package to be built
-rm -rf $PKG/*             # always erase old package's contents
-rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build
-
-# Source file availability:
-if ! [ -f ${SOURCE} ]; then
-  if ! [ "x${SRCURL}" == "x" ]; then
-    # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
-    [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)"
-    echo "Source '$(basename ${SOURCE})' not available yet..."
-    echo "Will download file to $(dirname $SOURCE)"
-    wget -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true
-    if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then
-      echo "Downloading '$(basename ${SOURCE})' failed... aborting the build."
-      mv -f "${SOURCE}" "${SOURCE}".FAIL
-      exit 1
-    fi
-  else
-    echo "File '$(basename ${SOURCE})' not available... aborting the build."
-    exit 1
-  fi
-fi
-
-if [ "$P1" == "--download" ]; then
-  echo "Download complete."
-  exit 0
-fi
-
-# --- PACKAGE BUILDING ---
-
-echo "++"
-echo "|| $PRGNAM-$VERSION"
-echo "++"
-
-cd $TMP/tmp-$PRGNAM
-echo "Extracting the source archive(s) for $PRGNAM..."
-tar -xvf ${SOURCE}
-cd ${PRGNAM}-${VERSION}
-chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
-
-if [ "$ENABLE_PYTHON" = "YES" ]; then
-  PYTHONSTUFF="--enable-python --enable-python-bindings"
-else
-  PYTHONSTUFF=""
-fi
-
-echo Building ...
-LDFLAGS="$SLKLDFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-CFLAGS="$SLKCFLAGS" \
-./configure --prefix=/usr \
-            --libdir=/usr/lib${LIBDIRSUFFIX} \
-            --localstatedir=/var \
-            --sysconfdir=/etc \
-            --mandir=/usr/man \
-            ${PYTHONSTUFF} \
-            --program-prefix= \
-            --program-suffix= \
-            --build=$ARCH-slackware-linux \
-            2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
-make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
-
-# Install all the needed stuff to the package dir
-# Use installwatch if available, to produce a logfile of the installation
-# process that is more easily readable:
-if $(which installwatch > /dev/null 2>&1); then
-  installwatch -o $OUTPUT/install-${PRGNAM}.log make DESTDIR=$PKG install
-else
-  make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
-fi
-
-# Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
-cp -a $SRCDIR/$(basename $0) $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
-find $PKG/usr/doc -type f -exec chmod 644 {} \;
-
-# Remove empty share directory:
-rmdir $PKG/usr/share || true
-
-# Compress the man page(s):
-if [ -d $PKG/usr/man ]; then
-  find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
-  for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-fi
-
-# 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 package description:
-mkdir -p $PKG/install
-cat $SRCDIR/slack-desc > $PKG/install/slack-desc
-
-# Build the package:
-cd $PKG
-makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
-cd $OUTPUT
-md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz.md5
-cd -
-cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
-
diff --git a/isolinux/README.TXT b/isolinux/README.TXT
index 94f84489..2c1cfbbf 100644
--- a/isolinux/README.TXT
+++ b/isolinux/README.TXT
@@ -13,6 +13,7 @@ mkisofs -o /tmp/slackware-dvd.iso \
   -sort isolinux/iso.sort \

   -b isolinux/isolinux.bin \

   -c isolinux/isolinux.boot \

+  -m 'kde-l10n-*.tar.bz2' \

   -V "SlackDVD" .

 

 On my system, here's the command I'd use to burn the resulting DVD ISO:

@@ -38,9 +39,16 @@ growisofs \
   -sort isolinux/iso.sort \

   -b isolinux/isolinux.bin \

   -c isolinux/isolinux.boot \

+  -m 'kde-l10n-*.tar.bz2' \

   -dvd-compat \

   -V "SlackDVD" .

 

+Note that the source files for the KDE language translations will not be

+included on these DVD images in order to keep them under the limit for

+a single-layer disc.  If you are using double layer DVD media and want to

+burn the complete tree to your disc, remove the -m option line from the

+command.

+

 

 HOW TO MAKE A SET OF BOOTABLE / INSTALLABLE CDROMS

 

diff --git a/isolinux/f2.txt b/isolinux/f2.txt
index 1b79d8ee..bb6ffbc2 100644
--- a/isolinux/f2.txt
+++ b/isolinux/f2.txt
@@ -3,14 +3,13 @@
 
 You'll need one kernel to get Linux started on your system so that you can
 install it.  The default kernel is huge.s, which requires at least a
-Pentium Pro processor.  There is also a "speakup.s" kernel, which supports
-various speech synthesizers.
-
-***************************************************************************
-* Tip:  If you have no idea which kernel to use, go with huge.s!          *
-***************************************************************************
+Pentium Pro processor.  This kernel now includes Speakup support as well.
 
 To boot the chosen kernel put the name of the kernel and press enter.
 
 boot: huge.s  "For example, boot the 'huge.s' kernel!"
 
+To check your system memory with memtest86+, use 'memtest':
+
+boot: memtest
+
diff --git a/isolinux/isolinux.boot b/isolinux/isolinux.boot
index bcc923ae..08f4418b 100644
--- a/isolinux/isolinux.boot
+++ b/isolinux/isolinux.boot
diff --git a/isolinux/isolinux.cfg b/isolinux/isolinux.cfg
index ccca60d7..e134d2d1 100644
--- a/isolinux/isolinux.cfg
+++ b/isolinux/isolinux.cfg
@@ -6,7 +6,9 @@ F1 message.txt
 F2 f2.txt
 label huge.s
   kernel /kernels/huge.s/bzImage
-  append initrd=initrd.img load_ramdisk=1 prompt_ramdisk=0 rw SLACK_KERNEL=huge.s
+  append initrd=initrd.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 SLACK_KERNEL=huge.s
 label speakup.s
-  kernel /kernels/speakup.s/bzImage
-  append initrd=initrd.img load_ramdisk=1 prompt_ramdisk=0 rw SLACK_KERNEL=speakup.s
+  kernel /kernels/huge.s/bzImage
+  append initrd=initrd.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 SLACK_KERNEL=huge.s
+label memtest
+  kernel /kernels/memtest/memtest
diff --git a/isolinux/message.txt b/isolinux/message.txt
index 365bddfe..681ae661 100644
--- a/isolinux/message.txt
+++ b/isolinux/message.txt
@@ -1,5 +1,5 @@
 
-Welcome to 09Slackware6407 version 13.1 (Linux kernel 2.6.33.4)!
+Welcome to 09Slackware6407 version 13.37 (Linux kernel 2.6.37.6)!
 
 If you need to pass extra parameters to the kernel, enter them at the prompt
 below after the name of the kernel to boot (huge.s etc).
@@ -10,6 +10,8 @@ boot: huge.s root=/dev/sda1 rdinit= ro
 
 In the example above, /dev/sda1 is the / Linux partition.
 
+To test your memory with memtest86+, enter memtest on the boot line below.
+
 This prompt is just for entering extra parameters.  If you don't need to enter
 any parameters, hit ENTER to boot the default kernel "huge.s" or press [F2] 
 for a listing of more kernel choices.
diff --git a/kernels/VERSIONS.TXT b/kernels/VERSIONS.TXT
index e328d23a..ba28c380 100644
--- a/kernels/VERSIONS.TXT
+++ b/kernels/VERSIONS.TXT
@@ -1,3 +1,3 @@
 

-These kernels are version 2.6.33.4.

+These kernels are version 2.6.37.6.

 

diff --git a/kernels/memtest/README b/kernels/memtest/README
new file mode 100644
index 00000000..26ca10d1
--- /dev/null
+++ b/kernels/memtest/README
@@ -0,0 +1 @@
+This "kernel" is really the memtest86+ RAM testing utility.
diff --git a/kernels/memtest/memtest b/kernels/memtest/memtest
new file mode 100644
index 00000000..293e15d4
--- /dev/null
+++ b/kernels/memtest/memtest
diff --git a/pasture/source/gxine/gxine.SlackBuild b/pasture/source/gxine/gxine.SlackBuild
new file mode 100755
index 00000000..172d17aa
--- /dev/null
+++ b/pasture/source/gxine/gxine.SlackBuild
@@ -0,0 +1,111 @@
+#!/bin/sh
+
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+VERSION=0.5.905
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-gxine
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf gxine-$VERSION
+tar xvf $CWD/gxine-$VERSION.tar.bz2 || exit 1
+cd gxine-$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 \
+  --localstatedir=/var/lib \
+  --mandir=/usr/man \
+  --disable-static \
+  --with-browser-plugin \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+#zcat $CWD/gxine.desktop.gz > $PKG/usr/share/applications/gxine.desktop
+#if [ ! -r $PKG/usr/share/pixmaps/gxine.png ]; then
+#  exit 1
+#fi
+
+# I'm sorry, but making this link was the worst suggestion I ever
+# went along with.  I'll continue to include it (for now), but having
+# (buggy) gxine pop up without prompting all the time is ANNOYING!!!
+#mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
+#( cd $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
+#  ln -sf /usr/lib${LIBDIRSUFFIX}/gxine/gxineplugin.so .
+#)
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+
+mkdir -p $PKG/usr/doc/gxine-$VERSION
+cp -a \
+  ABOUT-NLS AUTHORS COPYING* INSTALL NEWS README TODO \
+  $PKG/usr/doc/gxine-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/gxine-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/xap/gxine/gxine.desktop b/pasture/source/gxine/gxine.desktop
index 54e5e6c2..54e5e6c2 100644
--- a/source/xap/gxine/gxine.desktop
+++ b/pasture/source/gxine/gxine.desktop
diff --git a/source/xap/gxine/slack-desc b/pasture/source/gxine/slack-desc
index 18f7cef4..18f7cef4 100644
--- a/source/xap/gxine/slack-desc
+++ b/pasture/source/gxine/slack-desc
diff --git a/pasture/source/make/make.SlackBuild b/pasture/source/make/make.SlackBuild
new file mode 100755
index 00000000..32e4b250
--- /dev/null
+++ b/pasture/source/make/make.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Copyright 2005-2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+VERSION=3.81
+BUILD=${BUILD:-3}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-make
+
+if [ "$ARCH" = "i386" ]; then
+  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+elif [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf make-$VERSION
+tar xjvf $CWD/make-$VERSION.tar.bz2 || exit 1
+cd make-$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} \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --build=$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
+)
+gzip -9 $PKG/usr/man/man1/*
+rm $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*
+# This has been here so long that it should probably stay.
+# Trying to get rid of ginstall didn't go well, so...  :-)
+( cd $PKG/usr/bin
+  rm -f gmake
+  ln -sf make gmake )
+mkdir -p $PKG/usr/doc/make-$VERSION
+cp -a \
+  ABOUT-NLS AUTHORS COPYING NEWS README* \
+  $PKG/usr/doc/make-$VERSION/
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/make-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/pasture/source/make/slack-desc b/pasture/source/make/slack-desc
new file mode 100644
index 00000000..ef19ca33
--- /dev/null
+++ b/pasture/source/make/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------------------------------------------------------|
+make: make (GNU make utility to maintain groups of programs)
+make:
+make: This is the GNU implementation of make, which was written by Richard
+make: Stallman and Roland McGrath.  The purpose of the make utility is to
+make: determine automatically which pieces of a large program need to be 
+make: recompiled, and issue the commands to recompile them.  
+make:
+make: This is needed to compile just about any major C program, including
+make: the Linux kernel.
+make:
+make:
diff --git a/pasture/source/mesa-7.8.2/README.GIT b/pasture/source/mesa-7.8.2/README.GIT
new file mode 100644
index 00000000..4e79f374
--- /dev/null
+++ b/pasture/source/mesa-7.8.2/README.GIT
@@ -0,0 +1,16 @@
+Anonymous git Access
+
+   To get the Mesa sources anonymously (read-only):
+
+    1. Install the git software on your computer if needed.
+
+    2. Get an initial, local copy of the repository with:
+
+     git clone git://anongit.freedesktop.org/git/mesa/mesa
+
+
+    3. Later, you can update your tree from the master repository with:
+
+     git pull origin
+
+
diff --git a/pasture/source/mesa-7.8.2/get-mesa.sh b/pasture/source/mesa-7.8.2/get-mesa.sh
new file mode 100644
index 00000000..710043c6
--- /dev/null
+++ b/pasture/source/mesa-7.8.2/get-mesa.sh
@@ -0,0 +1,8 @@
+rm -rf mesa
+git clone git://anongit.freedesktop.org/git/mesa/mesa
+# package the source archive and clean up:
+( cd mesa ; find . -type d -name .git -exec rm -rf {} \; 2> /dev/null )
+DATE=$(date +%Y%m%d)
+mv mesa mesa-${DATE}_git
+tar cjf mesa-${DATE}_git.tar.bz2 mesa-${DATE}_git
+rm -rf mesa-${DATE}_git
diff --git a/pasture/source/mesa-7.8.2/mesa.SlackBuild b/pasture/source/mesa-7.8.2/mesa.SlackBuild
new file mode 100755
index 00000000..d4579625
--- /dev/null
+++ b/pasture/source/mesa-7.8.2/mesa.SlackBuild
@@ -0,0 +1,145 @@
+#!/bin/sh
+
+# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# 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=mesa
+VERSION=${VERSION:-$(echo MesaLib-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+PKG_VERSION=${VERSION}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# Be sure this list is up-to-date:
+DRI_DRIVERS="i810,i915,i965,mach64,mga,r128,r200,r300,r600,radeon,savage,sis,tdfx,unichrome,swrast"
+
+NUMJOBS=${NUMJOBS:--j8}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-mesa
+
+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 Mesa-${VERSION}
+tar xvf $CWD/MesaLib-${PKG_VERSION}.tar.?z* || exit 1
+tar xvf $CWD/MesaGLUT-${PKG_VERSION}.tar.?z* || exit 1
+tar xvf $CWD/MesaDemos-${PKG_VERSION}.tar.?z* || exit 1
+cd Mesa-$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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --sysconfdir=/etc \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/mesa-$VERSION \
+  --with-dri-driverdir=/usr/lib${LIBDIRSUFFIX}/xorg/modules/dri \
+  --with-dri-drivers="$DRI_DRIVERS" \
+  --build=$ARCH-slackware-linux
+
+# Nobody else is enabling this.  Seems like it's asking for trouble.
+#  --enable-xcb
+
+# This doesn't seem to build - maybe it needs something else...
+#  --enable-gallium-nouveau 
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Install gears and glinfo:
+mkdir -p $PKG/usr/bin
+cp -a progs/demos/gears $PKG/usr/bin/gears
+cp -a progs/demos/glinfo $PKG/usr/bin/glinfo
+
+# Install some "demos":
+( cd progs/xdemos
+  cp glthreads glxcontexts glxdemo glxgears glxgears_fbconfig glxheads \
+    glxinfo glxpbdemo glxpixmap \
+    $PKG/usr/bin
+)
+
+# 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
+
+mkdir -p $PKG/usr/doc/Mesa-$PKG_VERSION/html
+cp -a COPYING docs/relnotes-$VERSION.html $PKG/usr/doc/Mesa-$PKG_VERSION
+rm -f docs/relnotes*.html docs/RELNOTES*
+cp -a docs/*.html $PKG/usr/doc/Mesa-$PKG_VERSION/html
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$PKG_VERSION-$ARCH-$BUILD.txz
+
diff --git a/pasture/source/mesa-7.8.2/mesa.url b/pasture/source/mesa-7.8.2/mesa.url
new file mode 100644
index 00000000..f4efeae6
--- /dev/null
+++ b/pasture/source/mesa-7.8.2/mesa.url
@@ -0,0 +1 @@
+ftp://ftp.freedesktop.org/pub/mesa/
diff --git a/pasture/source/mesa-7.8.2/slack-desc b/pasture/source/mesa-7.8.2/slack-desc
new file mode 100644
index 00000000..113964bd
--- /dev/null
+++ b/pasture/source/mesa-7.8.2/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------------------------------------------------------|
+mesa: mesa (a 3-D graphics library)
+mesa:
+mesa: Mesa is a 3-D graphics library with an API very similar to that of
+mesa: another well-known 3-D graphics library.  :-)  The Mesa libraries are
+mesa: used by X to provide both software and hardware accelerated graphics.
+mesa:
+mesa: Mesa was written by Brian Paul.
+mesa:
+mesa:
+mesa:
+mesa:
diff --git a/recompress.sh b/recompress.sh
index e525c74f..51c94b23 100755
--- a/recompress.sh
+++ b/recompress.sh
@@ -3,30 +3,40 @@
 # Run this script in the root directory of the repository to re-compress
 # all patches and scripts that were un-compressed to make a better git commit:
 #
-gzip ./extra/source/kde3-compat/qt3/qt.x86.cflags.diff
-gzip ./extra/source/kde3-compat/qt3/qt-x11.diff
-gzip ./extra/source/kde3-compat/qt3/qt.mysql.h.diff
-gzip ./extra/source/kde3-compat/qt3/doinst.sh
-gzip ./extra/source/kde3-compat/arts/arts.tmpdir.diff
-gzip ./extra/source/kde3-compat/kdelibs3/kdelibs-utempter.diff
-gzip ./extra/source/kde3-compat/kdelibs3/kdelibs.inotify.diff
-gzip ./extra/source/kde3-compat/kdelibs3/kdelibs.no.inotify.externs.diff
-gzip ./extra/source/emacspeak/emacspeak-32.0.tcl8.5.diff
+gzip ./extra/source/emacspeak/emacspeak.tcl8.5.diff
+gzip ./extra/source/pam/patches/pam-1.1.0-notally.patch
+gzip ./extra/source/pam/patches/pam-1.1.3-limits-nosetreuid.patch
+gzip ./extra/source/pam/patches/pam-1.1.3-securetty-console.patch
+gzip ./extra/source/pam/patches/pam-1.1.3-limits-range.patch
+gzip ./extra/source/pam/patches/pam-1.1.3-pwhistory-incomplete.patch
+gzip ./extra/source/pam/patches/pam-1.1.1-faillock.patch
+gzip ./extra/source/pam/patches/pam-1.1.3-faillock-screensaver.patch
+gzip ./extra/source/pam/patches/pam-1.0.91-std-noclose.patch
+gzip ./extra/source/pam/patches/pam-1.1.3-nouserenv.patch
+gzip ./extra/source/pam/patches/pam-1.0.90-redhat-modules.patch
+gzip ./extra/source/pam/patches/pam-1.1.2-noflex.patch
 gzip ./extra/source/grub/grub-0.97-x86_64.patch
 gzip ./extra/source/grub/grub_support_256byte_inode.patch
 gzip ./extra/source/grub/grubconfig_localefix.patch
 gzip ./extra/source/bittorrent/doinst.sh
 gzip ./extra/source/bittorrent/bittorrent-xterm.sh
 gzip ./extra/source/partitionmanager/doinst.sh
+gzip ./extra/source/fvwm-2.6.1/xinitrc.fvwm2
+gzip ./extra/source/fvwm-2.6.1/doinst.sh
 gzip ./extra/source/wicd/wicd-1.7.0-fix_script_bug.diff
 gzip ./extra/source/wicd/wicd-1.7.0-fix_EAP_fast_typo.diff
 gzip ./extra/source/wicd/doinst.sh
 gzip ./extra/source/bash-completion/bash_completion.sh
-gzip ./extra/source/bash-completion/bash-completion-1.1-pkgtools_tgxz.diff
+gzip ./extra/source/bash-completion/fixup-sh-script-completions.diff
 gzip ./extra/source/bittornado/btdownloadxterm.sh
 gzip ./extra/source/bittornado/doinst.sh
 gzip ./extra/source/tightvnc/doinst.sh
 gzip ./extra/source/tightvnc/tightvnc.paths-and-perms.diff
+gzip ./extra/source/GConf/doinst.sh
+gzip ./testing/source/mesa/patches/i915_fragment_shader_disable.patch
+gzip ./testing/source/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch
+gzip ./source/a/mcelog/doinst.sh
+gzip ./source/a/mcelog/mcelog.init.diff
 gzip ./source/a/kbd/sources/kbd-1.15-unicode_start.patch
 gzip ./source/a/kbd/sources/speakupmap.map
 gzip ./source/a/kbd/sources/kbd-1.15-keycodes-man.patch
@@ -38,29 +48,19 @@ gzip ./source/a/dialog/dialog.smaller.min.height.diff
 gzip ./source/a/splitvt/splitvt_1.6.5-9.diff
 gzip ./source/a/bin/scripts/xx
 gzip ./source/a/bin/scripts/diskcopy
-gzip ./source/a/cpio/cpio-2.9.gcc43.diff
 gzip ./source/a/acl/acl.destdir.diff
-gzip ./source/a/util-linux-ng/setserial-undef_TIOCGHAYESESP.diff
-gzip ./source/a/util-linux-ng/adjtimex_1.23-1.diff
-gzip ./source/a/util-linux-ng/setserial-rc.serial.diff
-gzip ./source/a/util-linux-ng/ziptool-fix_build.patch
-gzip ./source/a/util-linux-ng/doinst.sh
-gzip ./source/a/util-linux-ng/net-tools.diff
-gzip ./source/a/util-linux-ng/net-tools_1.60-19.diff
-gzip ./source/a/util-linux-ng/util-linux-ng.fdisk-no-solaris.diff
 gzip ./source/a/lha/lha_1.14i-10.1.diff
 gzip ./source/a/bash/doinst.sh
 gzip ./source/a/tcsh/tcsh.nobuiltincolorls.diff
 gzip ./source/a/tcsh/doinst.sh
 gzip ./source/a/elvis/elvis.ref.c.getline.diff
+gzip ./source/a/dbus/dbus-1.4.x-allow_root_globally.diff
 gzip ./source/a/dbus/rc.messagebus
 gzip ./source/a/dbus/doinst.sh
-gzip ./source/a/dbus/dbus-1.2.x-allow_root_globally.diff
+gzip ./source/a/usb_modeswitch/device_reference.txt
 gzip ./source/a/usb_modeswitch/doinst.sh
 gzip ./source/a/minicom/minicom.users
-gzip ./source/a/minicom/lrzsz_0.12.21-4.diff
-gzip ./source/a/minicom/wintcap.diff
-gzip ./source/a/minicom/minirc.dfl
+gzip ./source/a/minicom/lrzsz_0.12.21-5.diff
 gzip ./source/a/minicom/config.sub-x86_64.diff
 gzip ./source/a/minicom/doinst.sh
 gzip ./source/a/sysvinit-scripts/doinst.sh
@@ -70,6 +70,7 @@ gzip ./source/a/acpid/doinst.sh
 gzip ./source/a/acpid/acpi_handler.sh
 gzip ./source/a/utempter/doinst.sh
 gzip ./source/a/lvm2/doinst.sh
+gzip ./source/a/lvm2/build_with_udev_165_and_later.diff
 gzip ./source/a/sysvinit-functions/doinst.sh
 gzip ./source/a/logrotate/logrotate.conf
 gzip ./source/a/logrotate/logrotate.cron
@@ -84,14 +85,23 @@ gzip ./source/a/file/file.quiet.diff
 gzip ./source/a/file/file.etc.file.diff
 gzip ./source/a/file/file.xz.magic
 gzip ./source/a/pciutils/pciutils.ids.dest.diff
+gzip ./source/a/tar/tar-1.2x.support_txz.diff
 gzip ./source/a/tar/tar.nolonezero.diff
-gzip ./source/a/tar/tar-1.23-support_txz.diff
 gzip ./source/a/tar/tar.norecordsizespam.diff
 gzip ./source/a/tar/rmt.8
 gzip ./source/a/tar/tar.1
 gzip ./source/a/tar/tar-1.13.bzip2.diff
 gzip ./source/a/less/less.sysconfdir.diff
 gzip ./source/a/less/lesspipe.sh
+gzip ./source/a/lrzip/doinst.sh
+gzip ./source/a/util-linux/setserial-undef_TIOCGHAYESESP.diff
+gzip ./source/a/util-linux/util-linux.fdisk-no-solaris.diff
+gzip ./source/a/util-linux/adjtimex_1.23-1.diff
+gzip ./source/a/util-linux/setserial-rc.serial.diff
+gzip ./source/a/util-linux/ziptool-fix_build.patch
+gzip ./source/a/util-linux/doinst.sh
+gzip ./source/a/util-linux/net-tools.diff
+gzip ./source/a/util-linux/net-tools_1.60-19.diff
 gzip ./source/a/floppy/fdutils-5.4-20020222.diff
 gzip ./source/a/floppy/fdutils.mediaprm.diff
 gzip ./source/a/gpm/inputattach.c
@@ -112,11 +122,21 @@ gzip ./source/a/gpm/gpm-1.20.1-weak-wgetch.patch
 gzip ./source/a/gpm/gpm-1.20.1-nodebug.patch
 gzip ./source/a/gpm/gpm-1.20.1-input.patch
 gzip ./source/a/gpm/gpm-1.20.1-subscript.patch
+gzip ./source/a/shadow/patches/r3160.diff
+gzip ./source/a/shadow/patches/r3055.diff
+gzip ./source/a/shadow/patches/r3299.diff
+gzip ./source/a/shadow/patches/r3062.diff
+gzip ./source/a/shadow/patches/r3054.diff
+gzip ./source/a/shadow/patches/r3060.diff
+gzip ./source/a/shadow/patches/r3096.diff
+gzip ./source/a/shadow/patches/r3194.diff
 gzip ./source/a/shadow/useradd
 gzip ./source/a/shadow/login.defs
 gzip ./source/a/shadow/doinst.sh
-gzip ./source/a/zoo/zoo_2.10-18.diff
-gzip ./source/a/bzip2/bzip2-1.0.4.saneso.diff
+gzip ./source/a/libcgroup/libcgroup.conf.diff
+gzip ./source/a/libcgroup/libcgroup.init.diff
+gzip ./source/a/libcgroup/doinst.sh
+gzip ./source/a/bzip2/bzip2.saneso.diff
 gzip ./source/a/e2fsprogs/doinst.sh
 gzip ./source/a/smartmontools/doinst.sh
 gzip ./source/a/usbutils/usbutils.ids.dest
@@ -132,23 +152,21 @@ gzip ./source/a/sysvinit/sysvinit.pidof.rhforkseverything.diff
 gzip ./source/a/sysvinit/doinst.sh
 gzip ./source/a/sysvinit/sysvinit.diff
 gzip ./source/a/sysvinit/sysvinit-2.86-timeval.patch
-gzip ./source/a/sysklogd/sysklogd-1.4.1-owl-syslogd-crunch_list.diff
-gzip ./source/a/sysklogd/sysklogd_1.4.1-20.diff
+gzip ./source/a/dosfstools/dosfstools.paths.diff
+gzip ./source/a/sysklogd/use_memmove_not_strcpy.diff
+gzip ./source/a/sysklogd/doinst.sh
 gzip ./source/a/udev/rule_generator.diff
+gzip ./source/a/udev/udev.git-560de575148b7efda3b34a7f7073abd483c5f08e.patch
 gzip ./source/a/udev/doinst.sh
 gzip ./source/a/eject/eject.spaces.diff
 gzip ./source/a/genpower/genpower.halt.diff
 gzip ./source/a/genpower/genpower.var.diff
-gzip ./source/a/ncompress/ncompress.filenamelen.diff
-gzip ./source/a/ncompress/ncompress.zerobyteforce.diff
-gzip ./source/a/ncompress/ncompress-4.2.4-bssUnderflow.patch
-gzip ./source/a/ncompress/ncompress.lfs2.diff
-gzip ./source/a/ncompress/ncompress.make.diff
-gzip ./source/a/ncompress/ncompress.2GB.diff
-gzip ./source/a/ncompress/ncompress-4.2.4-endians.patch
 gzip ./source/a/lilo/lilo.use_major_minor_instead_lvm_name.diff
+gzip ./source/a/procps/procps-3.2.7-ps-cgroup.patch
 gzip ./source/a/procps/procinfo.gcc3.diff
 gzip ./source/a/procps/procps.nowarning.diff
+gzip ./source/a/procps/procps-3.2.8-ps-cgroup-suppress-root-group.patch
+gzip ./source/a/procps/procps-3.2.8.unknown.hz.value.diff
 gzip ./source/a/procps/procps.w.showfrom.diff
 gzip ./source/a/procps/procps-3.2.7-ps-eip64.diff
 gzip ./source/a/coreutils/DIR_COLORS
@@ -160,6 +178,7 @@ gzip ./source/a/mt-st/mt-st.man.diff
 gzip ./source/a/mt-st/mt-st.config.diff
 gzip ./source/a/mt-st/mt-st.sdlt.diff
 gzip ./source/a/cups/usb-backend-both-usblp-and-libusb.dpatch
+gzip ./source/a/cups/cups.fix_broken_locking.diff
 gzip ./source/a/cups/doinst.sh
 gzip ./source/a/devs/makedev_2.3.1-46.2.diff
 gzip ./source/a/devs/makedev_2.3.1.slack.diff
@@ -167,9 +186,12 @@ gzip ./source/a/devs/makedev_2.3.1.hd.diff
 gzip ./source/a/devs/makedev.hd.diff
 gzip ./source/a/rpm2tgz/patches/0003-allow-every-user-to-use-rpm2tgz.patch
 gzip ./source/a/rpm2tgz/patches/0004-produce-more-compliant-slack-desc.patch
+gzip ./source/a/rpm2tgz/patches/0009-Add-c-option-just-as-makepkg-c-y.patch
 gzip ./source/a/rpm2tgz/patches/0005-gzip-man-info-pages.patch
 gzip ./source/a/rpm2tgz/patches/0006-should-we-use-.txz-format-in-slackware-current.patch
 gzip ./source/a/rpm2tgz/patches/0002-fix-spurious-path-to-rpm-file-with-n-option.patch
+gzip ./source/a/rpm2tgz/patches/0007-Add-support-for-.txz-packages-and-rpm2txz-symlink.patch
+gzip ./source/a/rpm2tgz/patches/0008-Avoid-none-values-in-slack-desc.patch
 gzip ./source/a/rpm2tgz/patches/0001-fix-d-handling.patch
 gzip ./source/a/mdadm/mdadm.static.diff
 gzip ./source/a/mdadm/doinst.sh
@@ -177,9 +199,10 @@ gzip ./source/a/findutils/findutils.no.default.options.warnings.diff
 gzip ./source/a/findutils/findutils.nolocate.diff
 gzip ./source/a/attr/attr.destdir.diff
 gzip ./source/a/module-init-tools/modprobe.ignore_some_suffixes.diff
-gzip ./source/a/module-init-tools/modprobe.quit.whining.about.modprobe.conf.diff
+gzip ./source/a/module-init-tools/doinst.sh
 gzip ./source/a/unarj/Makefile
 gzip ./source/n/httpd/httpd.nossldefault.diff
+gzip ./source/n/httpd/httpd.brigade_move.__noinline__.gcc451.diff
 gzip ./source/n/httpd/config.layout.diff
 gzip ./source/n/httpd/httpd.runasapache.diff
 gzip ./source/n/httpd/doinst.sh
@@ -189,8 +212,6 @@ gzip ./source/n/dnsmasq/doinst.sh
 gzip ./source/n/portmap/rc.rpc
 gzip ./source/n/portmap/doinst.sh
 gzip ./source/n/portmap/portmap.lwrap.needs.lnsl.diff
-gzip ./source/n/iptraf/iptraf_3.0.0-6.diff
-gzip ./source/n/iptraf/iptraf.paths.diff
 gzip ./source/n/htdig/htdig.conf.diff
 gzip ./source/n/htdig/htdig-3.2.0b6.diff
 gzip ./source/n/htdig/doinst.sh
@@ -205,6 +226,7 @@ gzip ./source/n/bluez/patches/bluez-unbreak_dell_mouse.patch
 gzip ./source/n/bluez/doinst.sh
 gzip ./source/n/mailx/doinst.sh
 gzip ./source/n/nfs-utils/nfs-utils.lwrap.needs.lnsl.diff
+gzip ./source/n/nfs-utils/doinst.sh
 gzip ./source/n/network-scripts/doinst.sh
 gzip ./source/n/netkit-timed/netkit-timed-0.17.diff
 gzip ./source/n/ytalk/doinst.sh
@@ -218,13 +240,17 @@ gzip ./source/n/netwrite/netwrite-0.17.diff
 gzip ./source/n/bsd-finger/bsd-finger-0.17.diff
 gzip ./source/n/netkit-routed/routed.18.candidate.final.patch
 gzip ./source/n/netkit-routed/netkit-routed-0.17.diff
+gzip ./source/n/net-tools/net-tools_1.60-23.diff
+gzip ./source/n/net-tools/net-tools.struct.x25_address.gcc4.diff
+gzip ./source/n/net-tools/net-tools.switch.default.gcc4.diff
 gzip ./source/n/net-tools/net-tools.diff
-gzip ./source/n/net-tools/net-tools_1.60-19.diff
+gzip ./source/n/net-tools/net-tools.mii-tool.string.diff
 gzip ./source/n/inetd/inetd.loopingdos.diff
 gzip ./source/n/inetd/inetd-OpenBSD-1.79.diff
 gzip ./source/n/openldap-client/doinst.sh
 gzip ./source/n/netwatch/netwatch.makefile.diff
 gzip ./source/n/netwatch/netwatch.phonemyself.diff
+gzip ./source/n/wpa_supplicant/hostap-07.git-b80b5639935d37b95d00f86b57f2844a9c775f57.patch
 gzip ./source/n/nmap/nmap.ndiff.mandir.diff
 gzip ./source/n/procmail/procmail_3.22-5.diff
 gzip ./source/n/procmail/procmail.lfs.diff
@@ -260,10 +286,8 @@ gzip ./source/n/wget/doinst.sh
 gzip ./source/n/gpa/doinst.sh
 gzip ./source/n/samba/doinst.sh
 gzip ./source/n/samba/smb.conf.diff
-gzip ./source/n/php/php.ini.diff
-gzip ./source/n/php/php.recommended.ini.diff
-gzip ./source/n/php/php.gmp5.diff
-gzip ./source/n/php/php.gd_libpng-1.4.diff
+gzip ./source/n/php/php.session.save_path.diff
+gzip ./source/n/php/php.ini-development.diff
 gzip ./source/n/php/doinst.sh
 gzip ./source/n/alpine/alpine.manpage.diff
 gzip ./source/n/alpine/alpine.config.h.diff
@@ -279,10 +303,11 @@ gzip ./source/n/nn/nn.badnntphost.diff
 gzip ./source/n/nn/doinst.sh
 gzip ./source/n/nn/NNTP
 gzip ./source/n/net-snmp/snmpd.conf
+gzip ./source/n/net-snmp/net-snmp.net-snmp-create-v3-user.etc.snmpd.conf.diff
 gzip ./source/n/net-snmp/doinst.sh
 gzip ./source/n/trn/config.sh
 gzip ./source/n/trn/config.x86_64.sh
-gzip ./source/n/iproute2/iproute2-2.6.33-fixup_dbpath_and_iptablespath.diff
+gzip ./source/n/iproute2/iproute2.fixup_dbpath_and_iptablespath.diff
 gzip ./source/n/iproute2/doinst.sh
 gzip ./source/n/biff+comsat/biff+comsat.offset.diff
 gzip ./source/n/biff+comsat/biff+comsat-0.17.diff
@@ -294,21 +319,18 @@ gzip ./source/n/telnet/telnet-OpenBSD-20020321.diff
 gzip ./source/n/bootp/bootptab
 gzip ./source/n/bootp/bootp_2.4.3-15.diff
 gzip ./source/n/bridge-utils/bridge-utils.isbridge.diff
-gzip ./source/n/tcpdump/libpcap.20-fix-any-intf.diff
 gzip ./source/n/netkit-rwho/rwhod_getloadavg.diff
 gzip ./source/n/netkit-rwho/netkit-rwho-0.17.diff
+gzip ./source/n/mutt/mutt.gpgme.diff
 gzip ./source/n/mutt/doinst.sh
-gzip ./source/n/bind/bind.man.diff
-gzip ./source/n/bind/bind.var.run.named.diff
 gzip ./source/n/bind/bind.so_bsdcompat.diff
 gzip ./source/n/bind/doinst.sh
-gzip ./source/n/gnupg2/gnupg-2.0.14-encode-s2k.patch
 gzip ./source/n/openssl/openssl.optsx86.diff
 gzip ./source/n/openssl/openssl.soname.diff
 gzip ./source/n/openssl/doinst.sh-openssl
 gzip ./source/n/openssl/doinst.sh-openssl-solibs
 gzip ./source/n/openssl/certwatch
-gzip ./source/n/bluez-hcidump/hci.c_for_bluez-4.61.patch
+gzip ./source/n/metamail/metamail.uue.getline.diff
 gzip ./source/n/wireless-tools/wireless_tools.nowhine.diff
 gzip ./source/n/wireless-tools/doinst.sh
 gzip ./source/n/wireless-tools/wireless_tools.static.diff
@@ -329,6 +351,10 @@ gzip ./source/n/ppp/radius.msdict
 gzip ./source/n/autofs/autofs-5.0.5-fix-libxml2-workaround-configure.patch
 gzip ./source/n/autofs/doinst.sh
 gzip ./source/n/obexftp/ruby_rstringlen.diff
+gzip ./source/n/ca-certificates/cacerts-20090814-remove_debconf.diff
+gzip ./source/n/ca-certificates/cacerts-20090814-fixup_update-ca-certificates.diff
+gzip ./source/n/ca-certificates/cacerts-20090814-fixup_DESTDIR.diff
+gzip ./source/n/ca-certificates/doinst.sh
 gzip ./source/n/cyrus-sasl/rc.saslauthd
 gzip ./source/n/cyrus-sasl/doinst.sh
 gzip ./source/n/vsftpd/vsftpd.log
@@ -344,6 +370,7 @@ gzip ./source/n/netkit-ntalk/ntalk-0.17-slackware-alt-talkd.patch
 gzip ./source/n/netkit-ntalk/netkit-ntalk-0.17.diff
 gzip ./source/n/ntp/ntp.nano.diff
 gzip ./source/n/ntp/doinst.sh
+gzip ./source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-fr-4.4.5.korganizer.docbook.reorganize.diff
 gzip ./source/installer/dhcpcd/config.h.diff
 gzip ./source/installer/dhcpcd/dhcpcd.sh.diff
 gzip ./source/installer/busybox.2.6.32.2.diff
@@ -351,12 +378,10 @@ gzip ./source/ap/hplip/doinst.sh
 gzip ./source/ap/xfsdump/xfsdump.destdir.diff
 gzip ./source/ap/sysstat/doinst.sh
 gzip ./source/ap/ghostscript-fonts-std/doinst.sh
-gzip ./source/ap/groff/groff.docdir.diff
 gzip ./source/ap/groff/groff.man.mdoc.local
 gzip ./source/ap/cdrtools/doinst.sh
 gzip ./source/ap/diffutils/doinst.sh
 gzip ./source/ap/diffutils/diffutils-sdiff-no-waitpid.patch
-gzip ./source/ap/acct/acct-6.4pre1-6.diff
 gzip ./source/ap/acct/acct.logdir.fhs.diff
 gzip ./source/ap/amp/amp-gcc34.diff
 gzip ./source/ap/ispell/ispell.diff
@@ -365,17 +390,18 @@ gzip ./source/ap/libx86/lrmi.c.diff
 gzip ./source/ap/man-pages/doinst.sh
 gzip ./source/ap/alsa-utils/alsa-utils.alsaconf.diff
 gzip ./source/ap/alsa-utils/rc.alsa
+gzip ./source/ap/alsa-utils/doinst.sh
+gzip ./source/ap/workbone/workbone_2.40-9.diff
 gzip ./source/ap/workbone/workbone.1.diff
-gzip ./source/ap/workbone/workbone_2.40-3.diff
 gzip ./source/ap/sudo/doinst.sh
 gzip ./source/ap/dvd+rw-tools/dvd+rw-tools.limits.h.diff
 gzip ./source/ap/texinfo/dir
 gzip ./source/ap/texinfo/doinst.sh
 gzip ./source/ap/jove/jove.makefile.diff
-gzip ./source/ap/sc/sc-malloc.diff
-gzip ./source/ap/sc/sc-gcc34.diff
+gzip ./source/ap/sc/sc-7.16-3.diff
 gzip ./source/ap/man/man-1.6f.nroff.mandoc.diff
 gzip ./source/ap/man/doinst.sh
+gzip ./source/ap/madplay/madplay-0.15.2b-fix-segfault.patch
 gzip ./source/ap/ash/patches/ash-freebsd.patch
 gzip ./source/ap/ash/patches/ash-setmode.patch
 gzip ./source/ap/ash/patches/ash-syntax.patch
@@ -399,438 +425,178 @@ gzip ./source/ap/ash/patches/ash-redir.patch
 gzip ./source/ap/ash/patches/ash-jobs.patch
 gzip ./source/ap/dmidecode/dmidecode.makefile.diff
 gzip ./source/ap/cdparanoia/cdparanoia-III-10.2_cdda_private.patch
+gzip ./source/ap/pm-utils/fix-wrong-path-in-intel-audio-powersave.patch
+gzip ./source/ap/pm-utils/use_more_sane_harddrive_defaults.patch
 gzip ./source/ap/sqlite/COPYRIGHT
 gzip ./source/ap/ghostscript/cidfmap
-gzip ./source/ap/ghostscript/ghostscript-pdf2dsc.patch
-gzip ./source/ap/linuxdoc-tools/sources/libsgmls-perl_1.03ii-32.diff
+gzip ./source/ap/ghostscript/ghostscript.rev11948.diff
 gzip ./source/ap/dmapi/dmapi.destdir.diff
 gzip ./source/ap/rpm/doinst.sh
 gzip ./source/ap/rpm/Packages
 gzip ./source/ap/at/doinst.sh
-gzip ./source/ap/aumix/aumix.alsa.diff
 gzip ./source/ap/mysql/rc.mysqld
 gzip ./source/ap/mysql/doinst.sh
+gzip ./source/ap/mc/mc.ext.in.geeqie.diff
 gzip ./source/ap/foomatic-filters/doinst.sh
-gzip ./source/ap/zsh/zsh-4.3.10-add_new_pkg_completion.diff
+gzip ./source/ap/zsh/zsh.regex.oh.bah.diff
 gzip ./source/ap/zsh/doinst.sh
+gzip ./source/ap/flac/flac.gcc45.diff
 gzip ./source/ap/flac/flac.man.diff
-gzip ./source/ap/vim/patches/7.2.334
-gzip ./source/ap/vim/patches/7.2.328
-gzip ./source/ap/vim/patches/7.2.130
-gzip ./source/ap/vim/patches/7.2.243
-gzip ./source/ap/vim/patches/7.2.194
-gzip ./source/ap/vim/patches/7.2.110
-gzip ./source/ap/vim/patches/7.2.068
-gzip ./source/ap/vim/patches/7.2.358
-gzip ./source/ap/vim/patches/7.2.085
-gzip ./source/ap/vim/patches/7.2.375
-gzip ./source/ap/vim/patches/7.2.105
-gzip ./source/ap/vim/patches/7.2.095
-gzip ./source/ap/vim/patches/7.2.113
-gzip ./source/ap/vim/patches/7.2.394
-gzip ./source/ap/vim/patches/7.2.024
-gzip ./source/ap/vim/patches/7.2.360
-gzip ./source/ap/vim/patches/7.2.324
-gzip ./source/ap/vim/patches/7.2.318
-gzip ./source/ap/vim/patches/7.2.062
-gzip ./source/ap/vim/patches/7.2.275
-gzip ./source/ap/vim/patches/7.2.415
-gzip ./source/ap/vim/patches/7.2.136
-gzip ./source/ap/vim/patches/7.2.106
-gzip ./source/ap/vim/patches/7.2.033
-gzip ./source/ap/vim/patches/7.2.147
-gzip ./source/ap/vim/patches/7.2.189
-gzip ./source/ap/vim/patches/7.2.163
-gzip ./source/ap/vim/patches/7.2.201
-gzip ./source/ap/vim/patches/7.2.120
-gzip ./source/ap/vim/patches/7.2.403
-gzip ./source/ap/vim/patches/7.2.240
-gzip ./source/ap/vim/patches/7.2.262
-gzip ./source/ap/vim/patches/7.2.035
-gzip ./source/ap/vim/patches/7.2.372
-gzip ./source/ap/vim/patches/7.2.401
-gzip ./source/ap/vim/patches/7.2.069
-gzip ./source/ap/vim/patches/7.2.244
-gzip ./source/ap/vim/patches/7.2.153
-gzip ./source/ap/vim/patches/7.2.296
-gzip ./source/ap/vim/patches/7.2.030
-gzip ./source/ap/vim/patches/7.2.373
-gzip ./source/ap/vim/patches/7.2.388
-gzip ./source/ap/vim/patches/7.2.252
-gzip ./source/ap/vim/patches/7.2.154
-gzip ./source/ap/vim/patches/7.2.179
-gzip ./source/ap/vim/patches/7.2.348
-gzip ./source/ap/vim/patches/7.2.185
-gzip ./source/ap/vim/patches/7.2.363
-gzip ./source/ap/vim/patches/7.2.064
-gzip ./source/ap/vim/patches/7.2.377
-gzip ./source/ap/vim/patches/7.2.374
-gzip ./source/ap/vim/patches/7.2.116
-gzip ./source/ap/vim/patches/7.2.255
-gzip ./source/ap/vim/patches/7.2.352
-gzip ./source/ap/vim/patches/7.2.272
-gzip ./source/ap/vim/patches/7.2.010
-gzip ./source/ap/vim/patches/7.2.278
-gzip ./source/ap/vim/patches/7.2.121
-gzip ./source/ap/vim/patches/7.2.245
-gzip ./source/ap/vim/patches/7.2.117
-gzip ./source/ap/vim/patches/7.2.277
-gzip ./source/ap/vim/patches/7.2.178
-gzip ./source/ap/vim/patches/7.2.391
-gzip ./source/ap/vim/patches/7.2.362
-gzip ./source/ap/vim/patches/7.2.264
-gzip ./source/ap/vim/patches/7.2.124
-gzip ./source/ap/vim/patches/7.2.280
-gzip ./source/ap/vim/patches/7.2.101
-gzip ./source/ap/vim/patches/7.2.061
-gzip ./source/ap/vim/patches/7.2.187
-gzip ./source/ap/vim/patches/7.2.387
-gzip ./source/ap/vim/patches/7.2.060
-gzip ./source/ap/vim/patches/7.2.306
-gzip ./source/ap/vim/patches/7.2.075
-gzip ./source/ap/vim/patches/7.2.266
-gzip ./source/ap/vim/patches/7.2.267
-gzip ./source/ap/vim/patches/7.2.390
-gzip ./source/ap/vim/patches/7.2.131
-gzip ./source/ap/vim/patches/7.2.166
-gzip ./source/ap/vim/patches/7.2.406
-gzip ./source/ap/vim/patches/7.2.219
-gzip ./source/ap/vim/patches/7.2.317
-gzip ./source/ap/vim/patches/7.2.090
-gzip ./source/ap/vim/patches/7.2.170
-gzip ./source/ap/vim/patches/7.2.129
-gzip ./source/ap/vim/patches/7.2.404
-gzip ./source/ap/vim/patches/7.2.088
-gzip ./source/ap/vim/patches/7.2.200
-gzip ./source/ap/vim/patches/7.2.204
-gzip ./source/ap/vim/patches/7.2.376
-gzip ./source/ap/vim/patches/7.2.311
-gzip ./source/ap/vim/patches/7.2.321
-gzip ./source/ap/vim/patches/7.2.216
-gzip ./source/ap/vim/patches/7.2.281
-gzip ./source/ap/vim/patches/7.2.402
-gzip ./source/ap/vim/patches/7.2.097
-gzip ./source/ap/vim/patches/7.2.125
-gzip ./source/ap/vim/patches/7.2.041
-gzip ./source/ap/vim/patches/7.2.013
-gzip ./source/ap/vim/patches/7.2.276
-gzip ./source/ap/vim/patches/7.2.055
-gzip ./source/ap/vim/patches/7.2.293
-gzip ./source/ap/vim/patches/7.2.152
-gzip ./source/ap/vim/patches/7.2.410
-gzip ./source/ap/vim/patches/7.2.169
-gzip ./source/ap/vim/patches/7.2.251
-gzip ./source/ap/vim/patches/7.2.411
-gzip ./source/ap/vim/patches/7.2.128
-gzip ./source/ap/vim/patches/7.2.126
-gzip ./source/ap/vim/patches/7.2.261
-gzip ./source/ap/vim/patches/7.2.157
-gzip ./source/ap/vim/patches/7.2.305
-gzip ./source/ap/vim/patches/7.2.254
-gzip ./source/ap/vim/patches/7.2.079
-gzip ./source/ap/vim/patches/7.2.222
-gzip ./source/ap/vim/patches/7.2.007
-gzip ./source/ap/vim/patches/7.2.412
-gzip ./source/ap/vim/patches/7.2.180
-gzip ./source/ap/vim/patches/7.2.044
-gzip ./source/ap/vim/patches/7.2.399
-gzip ./source/ap/vim/patches/7.2.045
-gzip ./source/ap/vim/patches/7.2.282
-gzip ./source/ap/vim/patches/7.2.331
-gzip ./source/ap/vim/patches/7.2.234
-gzip ./source/ap/vim/patches/7.2.345
-gzip ./source/ap/vim/patches/7.2.098
-gzip ./source/ap/vim/patches/7.2.298
-gzip ./source/ap/vim/patches/7.2.239
-gzip ./source/ap/vim/patches/7.2.301
-gzip ./source/ap/vim/patches/7.2.392
-gzip ./source/ap/vim/patches/7.2.237
-gzip ./source/ap/vim/patches/7.2.340
-gzip ./source/ap/vim/patches/7.2.056
-gzip ./source/ap/vim/patches/7.2.191
-gzip ./source/ap/vim/patches/7.2.159
-gzip ./source/ap/vim/patches/7.2.080
-gzip ./source/ap/vim/patches/7.2.214
-gzip ./source/ap/vim/patches/7.2.270
-gzip ./source/ap/vim/patches/7.2.381
-gzip ./source/ap/vim/patches/7.2.371
-gzip ./source/ap/vim/patches/7.2.142
-gzip ./source/ap/vim/patches/7.2.369
-gzip ./source/ap/vim/patches/7.2.172
-gzip ./source/ap/vim/patches/7.2.134
-gzip ./source/ap/vim/patches/7.2.135
-gzip ./source/ap/vim/patches/7.2.076
-gzip ./source/ap/vim/patches/7.2.398
-gzip ./source/ap/vim/patches/7.2.271
-gzip ./source/ap/vim/patches/7.2.071
-gzip ./source/ap/vim/patches/7.2.190
-gzip ./source/ap/vim/patches/7.2.312
-gzip ./source/ap/vim/patches/7.2.384
-gzip ./source/ap/vim/patches/7.2.294
-gzip ./source/ap/vim/patches/7.2.220
-gzip ./source/ap/vim/patches/7.2.070
-gzip ./source/ap/vim/patches/7.2.257
-gzip ./source/ap/vim/patches/7.2.059
-gzip ./source/ap/vim/patches/7.2.361
-gzip ./source/ap/vim/patches/7.2.356
-gzip ./source/ap/vim/patches/7.2.006
-gzip ./source/ap/vim/patches/7.2.283
-gzip ./source/ap/vim/patches/7.2.096
-gzip ./source/ap/vim/patches/7.2.226
-gzip ./source/ap/vim/patches/7.2.023
-gzip ./source/ap/vim/patches/7.2.368
-gzip ./source/ap/vim/patches/7.2.083
-gzip ./source/ap/vim/patches/7.2.329
-gzip ./source/ap/vim/patches/7.2.054
-gzip ./source/ap/vim/patches/7.2.122
-gzip ./source/ap/vim/patches/7.2.052
-gzip ./source/ap/vim/patches/7.2.354
-gzip ./source/ap/vim/patches/7.2.235
-gzip ./source/ap/vim/patches/7.2.326
-gzip ./source/ap/vim/patches/7.2.248
-gzip ./source/ap/vim/patches/7.2.379
-gzip ./source/ap/vim/patches/7.2.259
-gzip ./source/ap/vim/patches/7.2.241
-gzip ./source/ap/vim/patches/7.2.342
-gzip ./source/ap/vim/patches/7.2.307
-gzip ./source/ap/vim/patches/7.2.111
-gzip ./source/ap/vim/patches/7.2.034
-gzip ./source/ap/vim/patches/7.2.081
-gzip ./source/ap/vim/patches/7.2.114
-gzip ./source/ap/vim/patches/7.2.047
-gzip ./source/ap/vim/patches/7.2.158
-gzip ./source/ap/vim/patches/7.2.149
-gzip ./source/ap/vim/patches/7.2.032
-gzip ./source/ap/vim/patches/7.2.156
-gzip ./source/ap/vim/patches/7.2.009
-gzip ./source/ap/vim/patches/7.2.016
-gzip ./source/ap/vim/patches/7.2.386
-gzip ./source/ap/vim/patches/7.2.004
-gzip ./source/ap/vim/patches/7.2.091
-gzip ./source/ap/vim/patches/7.2.205
-gzip ./source/ap/vim/patches/7.2.150
-gzip ./source/ap/vim/patches/7.2.236
-gzip ./source/ap/vim/patches/7.2.089
-gzip ./source/ap/vim/patches/7.2.092
-gzip ./source/ap/vim/patches/7.2.288
-gzip ./source/ap/vim/patches/7.2.160
-gzip ./source/ap/vim/patches/7.2.258
-gzip ./source/ap/vim/patches/7.2.247
-gzip ./source/ap/vim/patches/7.2.350
-gzip ./source/ap/vim/patches/7.2.289
-gzip ./source/ap/vim/patches/7.2.206
-gzip ./source/ap/vim/patches/7.2.199
-gzip ./source/ap/vim/patches/7.2.162
-gzip ./source/ap/vim/patches/7.2.215
-gzip ./source/ap/vim/patches/7.2.102
-gzip ./source/ap/vim/patches/7.2.207
-gzip ./source/ap/vim/patches/7.2.249
-gzip ./source/ap/vim/patches/7.2.316
-gzip ./source/ap/vim/patches/7.2.323
-gzip ./source/ap/vim/patches/7.2.198
-gzip ./source/ap/vim/patches/7.2.263
-gzip ./source/ap/vim/patches/7.2.297
-gzip ./source/ap/vim/patches/7.2.197
-gzip ./source/ap/vim/patches/7.2.094
-gzip ./source/ap/vim/patches/7.2.043
-gzip ./source/ap/vim/patches/7.2.186
-gzip ./source/ap/vim/patches/7.2.223
-gzip ./source/ap/vim/patches/7.2.309
-gzip ./source/ap/vim/patches/7.2.046
-gzip ./source/ap/vim/patches/7.2.230
-gzip ./source/ap/vim/patches/7.2.333
-gzip ./source/ap/vim/patches/7.2.268
-gzip ./source/ap/vim/patches/7.2.042
-gzip ./source/ap/vim/patches/7.2.290
-gzip ./source/ap/vim/patches/7.2.228
-gzip ./source/ap/vim/patches/7.2.304
-gzip ./source/ap/vim/patches/7.2.343
-gzip ./source/ap/vim/patches/7.2.058
-gzip ./source/ap/vim/patches/7.2.029
-gzip ./source/ap/vim/patches/7.2.077
-gzip ./source/ap/vim/patches/7.2.217
-gzip ./source/ap/vim/patches/7.2.078
-gzip ./source/ap/vim/patches/7.2.093
-gzip ./source/ap/vim/patches/7.2.335
-gzip ./source/ap/vim/patches/7.2.310
-gzip ./source/ap/vim/patches/7.2.218
-gzip ./source/ap/vim/patches/7.2.405
-gzip ./source/ap/vim/patches/7.2.181
-gzip ./source/ap/vim/patches/7.2.414
-gzip ./source/ap/vim/patches/7.2.138
-gzip ./source/ap/vim/patches/7.2.119
-gzip ./source/ap/vim/patches/7.2.063
-gzip ./source/ap/vim/patches/7.2.225
-gzip ./source/ap/vim/patches/7.2.003
-gzip ./source/ap/vim/patches/7.2.380
-gzip ./source/ap/vim/patches/7.2.144
-gzip ./source/ap/vim/patches/7.2.145
-gzip ./source/ap/vim/patches/7.2.389
-gzip ./source/ap/vim/patches/7.2.065
-gzip ./source/ap/vim/patches/7.2.184
-gzip ./source/ap/vim/patches/7.2.188
-gzip ./source/ap/vim/patches/7.2.099
-gzip ./source/ap/vim/patches/7.2.109
-gzip ./source/ap/vim/patches/7.2.074
-gzip ./source/ap/vim/patches/7.2.397
-gzip ./source/ap/vim/patches/7.2.209
-gzip ./source/ap/vim/patches/7.2.087
-gzip ./source/ap/vim/patches/7.2.107
-gzip ./source/ap/vim/patches/7.2.143
-gzip ./source/ap/vim/patches/7.2.246
-gzip ./source/ap/vim/patches/7.2.299
-gzip ./source/ap/vim/patches/7.2.115
-gzip ./source/ap/vim/patches/7.2.233
-gzip ./source/ap/vim/patches/7.2.327
-gzip ./source/ap/vim/patches/7.2.028
-gzip ./source/ap/vim/patches/7.2.025
-gzip ./source/ap/vim/patches/7.2.082
-gzip ./source/ap/vim/patches/7.2.183
-gzip ./source/ap/vim/patches/7.2.165
-gzip ./source/ap/vim/patches/7.2.037
-gzip ./source/ap/vim/patches/7.2.347
-gzip ./source/ap/vim/patches/7.2.213
-gzip ./source/ap/vim/patches/7.2.175
-gzip ./source/ap/vim/patches/7.2.238
-gzip ./source/ap/vim/patches/7.2.370
-gzip ./source/ap/vim/patches/7.2.351
-gzip ./source/ap/vim/patches/7.2.314
-gzip ./source/ap/vim/patches/7.2.168
-gzip ./source/ap/vim/patches/7.2.048
-gzip ./source/ap/vim/patches/7.2.021
-gzip ./source/ap/vim/patches/7.2.330
-gzip ./source/ap/vim/patches/7.2.279
-gzip ./source/ap/vim/patches/7.2.104
-gzip ./source/ap/vim/patches/7.2.015
-gzip ./source/ap/vim/patches/7.2.383
-gzip ./source/ap/vim/patches/7.2.103
-gzip ./source/ap/vim/patches/7.2.051
-gzip ./source/ap/vim/patches/7.2.039
-gzip ./source/ap/vim/patches/7.2.140
-gzip ./source/ap/vim/patches/7.2.269
-gzip ./source/ap/vim/patches/7.2.303
-gzip ./source/ap/vim/patches/7.2.341
-gzip ./source/ap/vim/patches/7.2.349
-gzip ./source/ap/vim/patches/7.2.112
-gzip ./source/ap/vim/patches/7.2.308
-gzip ./source/ap/vim/patches/7.2.050
-gzip ./source/ap/vim/patches/7.2.203
-gzip ./source/ap/vim/patches/7.2.132
-gzip ./source/ap/vim/patches/7.2.017
-gzip ./source/ap/vim/patches/7.2.284
-gzip ./source/ap/vim/patches/7.2.378
-gzip ./source/ap/vim/patches/7.2.242
-gzip ./source/ap/vim/patches/7.2.408
-gzip ./source/ap/vim/patches/7.2.137
-gzip ./source/ap/vim/patches/7.2.195
-gzip ./source/ap/vim/patches/7.2.260
-gzip ./source/ap/vim/patches/7.2.364
-gzip ./source/ap/vim/patches/7.2.167
-gzip ./source/ap/vim/patches/7.2.250
-gzip ./source/ap/vim/patches/7.2.141
-gzip ./source/ap/vim/patches/7.2.355
-gzip ./source/ap/vim/patches/7.2.227
-gzip ./source/ap/vim/patches/7.2.139
-gzip ./source/ap/vim/patches/7.2.018
-gzip ./source/ap/vim/patches/7.2.382
-gzip ./source/ap/vim/patches/7.2.176
-gzip ./source/ap/vim/patches/7.2.291
-gzip ./source/ap/vim/patches/7.2.001
-gzip ./source/ap/vim/patches/7.2.295
-gzip ./source/ap/vim/patches/7.2.123
-gzip ./source/ap/vim/patches/7.2.208
-gzip ./source/ap/vim/patches/7.2.020
-gzip ./source/ap/vim/patches/7.2.193
-gzip ./source/ap/vim/patches/7.2.393
-gzip ./source/ap/vim/patches/7.2.357
-gzip ./source/ap/vim/patches/7.2.146
-gzip ./source/ap/vim/patches/7.2.100
-gzip ./source/ap/vim/patches/7.2.229
-gzip ./source/ap/vim/patches/7.2.164
-gzip ./source/ap/vim/patches/7.2.019
-gzip ./source/ap/vim/patches/7.2.211
-gzip ./source/ap/vim/patches/7.2.108
-gzip ./source/ap/vim/patches/7.2.224
-gzip ./source/ap/vim/patches/7.2.026
-gzip ./source/ap/vim/patches/7.2.367
-gzip ./source/ap/vim/patches/7.2.192
-gzip ./source/ap/vim/patches/7.2.040
-gzip ./source/ap/vim/patches/7.2.322
-gzip ./source/ap/vim/patches/7.2.273
-gzip ./source/ap/vim/patches/7.2.395
-gzip ./source/ap/vim/patches/7.2.171
-gzip ./source/ap/vim/patches/7.2.005
-gzip ./source/ap/vim/patches/7.2.409
-gzip ./source/ap/vim/patches/7.2.320
-gzip ./source/ap/vim/patches/7.2.407
-gzip ./source/ap/vim/patches/7.2.182
-gzip ./source/ap/vim/patches/7.2.256
-gzip ./source/ap/vim/patches/7.2.049
-gzip ./source/ap/vim/patches/7.2.053
-gzip ./source/ap/vim/patches/7.2.319
-gzip ./source/ap/vim/patches/7.2.031
-gzip ./source/ap/vim/patches/7.2.337
-gzip ./source/ap/vim/patches/7.2.300
-gzip ./source/ap/vim/patches/7.2.344
-gzip ./source/ap/vim/patches/7.2.385
-gzip ./source/ap/vim/patches/7.2.212
-gzip ./source/ap/vim/patches/7.2.118
-gzip ./source/ap/vim/patches/7.2.365
-gzip ./source/ap/vim/patches/7.2.038
-gzip ./source/ap/vim/patches/7.2.196
-gzip ./source/ap/vim/patches/7.2.274
-gzip ./source/ap/vim/patches/7.2.396
-gzip ./source/ap/vim/patches/7.2.346
-gzip ./source/ap/vim/patches/7.2.232
-gzip ./source/ap/vim/patches/7.2.127
-gzip ./source/ap/vim/patches/7.2.151
-gzip ./source/ap/vim/patches/7.2.073
-gzip ./source/ap/vim/patches/7.2.366
-gzip ./source/ap/vim/patches/7.2.066
-gzip ./source/ap/vim/patches/7.2.413
-gzip ./source/ap/vim/patches/7.2.086
-gzip ./source/ap/vim/patches/7.2.173
-gzip ./source/ap/vim/patches/7.2.012
-gzip ./source/ap/vim/patches/7.2.338
-gzip ./source/ap/vim/patches/7.2.057
-gzip ./source/ap/vim/patches/7.2.067
-gzip ./source/ap/vim/patches/7.2.221
-gzip ./source/ap/vim/patches/7.2.325
-gzip ./source/ap/vim/patches/7.2.400
-gzip ./source/ap/vim/patches/7.2.265
-gzip ./source/ap/vim/patches/7.2.072
-gzip ./source/ap/vim/patches/7.2.022
-gzip ./source/ap/vim/patches/7.2.292
-gzip ./source/ap/vim/patches/7.2.353
-gzip ./source/ap/vim/patches/7.2.285
-gzip ./source/ap/vim/patches/7.2.210
-gzip ./source/ap/vim/patches/7.2.336
-gzip ./source/ap/vim/patches/7.2.253
-gzip ./source/ap/vim/patches/7.2.359
-gzip ./source/ap/vim/patches/7.2.148
-gzip ./source/ap/vim/patches/7.2.286
-gzip ./source/ap/vim/patches/7.2.133
-gzip ./source/ap/vim/patches/7.2.011
-gzip ./source/ap/vim/patches/7.2.416
-gzip ./source/ap/vim/patches/7.2.008
-gzip ./source/ap/vim/patches/7.2.174
-gzip ./source/ap/vim/patches/7.2.339
-gzip ./source/ap/vim/patches/7.2.161
-gzip ./source/ap/vim/patches/7.2.315
-gzip ./source/ap/vim/patches/7.2.177
-gzip ./source/ap/vim/patches/7.2.002
-gzip ./source/ap/vim/patches/7.2.287
-gzip ./source/ap/vim/patches/7.2.084
-gzip ./source/ap/vim/patches/7.2.036
-gzip ./source/ap/vim/patches/7.2.332
-gzip ./source/ap/vim/patches/7.2.202
-gzip ./source/ap/vim/patches/7.2.231
-gzip ./source/ap/vim/patches/7.2.014
-gzip ./source/ap/vim/patches/7.2.027
-gzip ./source/ap/vim/patches/7.2.313
-gzip ./source/ap/vim/patches/7.2.155
-gzip ./source/ap/vim/patches/7.2.302
-gzip ./source/ap/vim/vim-runtime-syntax-20100510.diff
+gzip ./source/ap/vim/patches/7.3.115
+gzip ./source/ap/vim/patches/7.3.039
+gzip ./source/ap/vim/patches/7.3.013
+gzip ./source/ap/vim/patches/7.3.112
+gzip ./source/ap/vim/patches/7.3.090
+gzip ./source/ap/vim/patches/7.3.034
+gzip ./source/ap/vim/patches/7.3.054
+gzip ./source/ap/vim/patches/7.3.061
+gzip ./source/ap/vim/patches/7.3.101
+gzip ./source/ap/vim/patches/7.3.011
+gzip ./source/ap/vim/patches/7.3.131
+gzip ./source/ap/vim/patches/7.3.153
+gzip ./source/ap/vim/patches/7.3.110
+gzip ./source/ap/vim/patches/7.3.150
+gzip ./source/ap/vim/patches/7.3.002
+gzip ./source/ap/vim/patches/7.3.059
+gzip ./source/ap/vim/patches/7.3.089
+gzip ./source/ap/vim/patches/7.3.132
+gzip ./source/ap/vim/patches/7.3.117
+gzip ./source/ap/vim/patches/7.3.111
+gzip ./source/ap/vim/patches/7.3.074
+gzip ./source/ap/vim/patches/7.3.024
+gzip ./source/ap/vim/patches/7.3.038
+gzip ./source/ap/vim/patches/7.3.069
+gzip ./source/ap/vim/patches/7.3.104
+gzip ./source/ap/vim/patches/7.3.124
+gzip ./source/ap/vim/patches/7.3.085
+gzip ./source/ap/vim/patches/7.3.068
+gzip ./source/ap/vim/patches/7.3.100
+gzip ./source/ap/vim/patches/7.3.077
+gzip ./source/ap/vim/patches/7.3.136
+gzip ./source/ap/vim/patches/7.3.120
+gzip ./source/ap/vim/patches/7.3.071
+gzip ./source/ap/vim/patches/7.3.129
+gzip ./source/ap/vim/patches/7.3.137
+gzip ./source/ap/vim/patches/7.3.062
+gzip ./source/ap/vim/patches/7.3.116
+gzip ./source/ap/vim/patches/7.3.144
+gzip ./source/ap/vim/patches/7.3.064
+gzip ./source/ap/vim/patches/7.3.093
+gzip ./source/ap/vim/patches/7.3.032
+gzip ./source/ap/vim/patches/7.3.008
+gzip ./source/ap/vim/patches/7.3.004
+gzip ./source/ap/vim/patches/7.3.126
+gzip ./source/ap/vim/patches/7.3.147
+gzip ./source/ap/vim/patches/7.3.138
+gzip ./source/ap/vim/patches/7.3.006
+gzip ./source/ap/vim/patches/7.3.028
+gzip ./source/ap/vim/patches/7.3.073
+gzip ./source/ap/vim/patches/7.3.081
+gzip ./source/ap/vim/patches/7.3.113
+gzip ./source/ap/vim/patches/7.3.010
+gzip ./source/ap/vim/patches/7.3.088
+gzip ./source/ap/vim/patches/7.3.005
+gzip ./source/ap/vim/patches/7.3.070
+gzip ./source/ap/vim/patches/7.3.094
+gzip ./source/ap/vim/patches/7.3.001
+gzip ./source/ap/vim/patches/7.3.146
+gzip ./source/ap/vim/patches/7.3.029
+gzip ./source/ap/vim/patches/7.3.140
+gzip ./source/ap/vim/patches/7.3.119
+gzip ./source/ap/vim/patches/7.3.060
+gzip ./source/ap/vim/patches/7.3.036
+gzip ./source/ap/vim/patches/7.3.035
+gzip ./source/ap/vim/patches/7.3.103
+gzip ./source/ap/vim/patches/7.3.122
+gzip ./source/ap/vim/patches/7.3.123
+gzip ./source/ap/vim/patches/7.3.018
+gzip ./source/ap/vim/patches/7.3.106
+gzip ./source/ap/vim/patches/7.3.154
+gzip ./source/ap/vim/patches/7.3.040
+gzip ./source/ap/vim/patches/7.3.086
+gzip ./source/ap/vim/patches/7.3.053
+gzip ./source/ap/vim/patches/7.3.072
+gzip ./source/ap/vim/patches/7.3.075
+gzip ./source/ap/vim/patches/7.3.056
+gzip ./source/ap/vim/patches/7.3.026
+gzip ./source/ap/vim/patches/7.3.003
+gzip ./source/ap/vim/patches/7.3.145
+gzip ./source/ap/vim/patches/7.3.127
+gzip ./source/ap/vim/patches/7.3.067
+gzip ./source/ap/vim/patches/7.3.102
+gzip ./source/ap/vim/patches/7.3.015
+gzip ./source/ap/vim/patches/7.3.019
+gzip ./source/ap/vim/patches/7.3.151
+gzip ./source/ap/vim/patches/7.3.044
+gzip ./source/ap/vim/patches/7.3.091
+gzip ./source/ap/vim/patches/7.3.142
+gzip ./source/ap/vim/patches/7.3.021
+gzip ./source/ap/vim/patches/7.3.017
+gzip ./source/ap/vim/patches/7.3.050
+gzip ./source/ap/vim/patches/7.3.105
+gzip ./source/ap/vim/patches/7.3.114
+gzip ./source/ap/vim/patches/7.3.118
+gzip ./source/ap/vim/patches/7.3.048
+gzip ./source/ap/vim/patches/7.3.009
+gzip ./source/ap/vim/patches/7.3.007
+gzip ./source/ap/vim/patches/7.3.037
+gzip ./source/ap/vim/patches/7.3.012
+gzip ./source/ap/vim/patches/7.3.141
+gzip ./source/ap/vim/patches/7.3.109
+gzip ./source/ap/vim/patches/7.3.125
+gzip ./source/ap/vim/patches/7.3.087
+gzip ./source/ap/vim/patches/7.3.148
+gzip ./source/ap/vim/patches/7.3.023
+gzip ./source/ap/vim/patches/7.3.033
+gzip ./source/ap/vim/patches/7.3.065
+gzip ./source/ap/vim/patches/7.3.084
+gzip ./source/ap/vim/patches/7.3.041
+gzip ./source/ap/vim/patches/7.3.057
+gzip ./source/ap/vim/patches/7.3.027
+gzip ./source/ap/vim/patches/7.3.016
+gzip ./source/ap/vim/patches/7.3.049
+gzip ./source/ap/vim/patches/7.3.052
+gzip ./source/ap/vim/patches/7.3.080
+gzip ./source/ap/vim/patches/7.3.134
+gzip ./source/ap/vim/patches/7.3.135
+gzip ./source/ap/vim/patches/7.3.079
+gzip ./source/ap/vim/patches/7.3.096
+gzip ./source/ap/vim/patches/7.3.078
+gzip ./source/ap/vim/patches/7.3.092
+gzip ./source/ap/vim/patches/7.3.108
+gzip ./source/ap/vim/patches/7.3.149
+gzip ./source/ap/vim/patches/7.3.099
+gzip ./source/ap/vim/patches/7.3.043
+gzip ./source/ap/vim/patches/7.3.020
+gzip ./source/ap/vim/patches/7.3.152
+gzip ./source/ap/vim/patches/7.3.082
+gzip ./source/ap/vim/patches/7.3.128
+gzip ./source/ap/vim/patches/7.3.031
+gzip ./source/ap/vim/patches/7.3.022
+gzip ./source/ap/vim/patches/7.3.066
+gzip ./source/ap/vim/patches/7.3.046
+gzip ./source/ap/vim/patches/7.3.042
+gzip ./source/ap/vim/patches/7.3.098
+gzip ./source/ap/vim/patches/7.3.083
+gzip ./source/ap/vim/patches/7.3.051
+gzip ./source/ap/vim/patches/7.3.139
+gzip ./source/ap/vim/patches/7.3.014
+gzip ./source/ap/vim/patches/7.3.063
+gzip ./source/ap/vim/patches/7.3.058
+gzip ./source/ap/vim/patches/7.3.095
+gzip ./source/ap/vim/patches/7.3.055
+gzip ./source/ap/vim/patches/7.3.121
+gzip ./source/ap/vim/patches/7.3.030
+gzip ./source/ap/vim/patches/7.3.097
+gzip ./source/ap/vim/patches/7.3.143
+gzip ./source/ap/vim/patches/7.3.130
+gzip ./source/ap/vim/patches/7.3.045
+gzip ./source/ap/vim/patches/7.3.076
+gzip ./source/ap/vim/patches/7.3.107
+gzip ./source/ap/vim/patches/7.3.025
+gzip ./source/ap/vim/patches/7.3.133
+gzip ./source/ap/vim/patches/7.3.047
+gzip ./source/ap/vim/vim-runtime-syntax-20110328.diff
 gzip ./source/ap/vim/vim.vimrc.diff
 gzip ./source/ap/vim/doinst.sh
 gzip ./source/ap/a2ps/a2ps.diff
@@ -854,6 +620,11 @@ gzip ./source/d/pmake/pmake.strerror.strdup.diff
 gzip ./source/d/pmake/pmake.txt
 gzip ./source/d/pmake/pmake_1.111-1.diff
 gzip ./source/d/pkg-config/doinst.sh
+gzip ./source/d/gcc/fastjar-patches/1004-fastjar-man.patch
+gzip ./source/d/gcc/fastjar-patches/1002-fastjar-0.97-filename0.patch
+gzip ./source/d/gcc/fastjar-patches/1000-fastjar-0.97-segfault.patch
+gzip ./source/d/gcc/fastjar-patches/1001-fastjar-0.97-len1.patch
+gzip ./source/d/gcc/fastjar-patches/1003-fastjar-CVE-2010-0831.patch
 gzip ./source/d/gcc/gcc-no_fixincludes.diff
 gzip ./source/d/p2c/p2c_1.21alpha2-2.1.diff
 gzip ./source/d/p2c/p2c.examples.diff
@@ -862,29 +633,28 @@ gzip ./source/d/perl/perl.configure.multilib.patch
 gzip ./source/xap/rxvt/rxvt.utempter.diff
 gzip ./source/xap/xmms/xmms.gtk.doublesize.diff
 gzip ./source/xap/xmms/xmms.wmxmms_vis_depth_workaround.diff
-gzip ./source/xap/gxine/gxine.desktop
 gzip ./source/xap/gftp/gftp.desktop
+gzip ./source/xap/gv/gv.keysym.diff
 gzip ./source/xap/xfce/patches/xfce-utils.xinitrc.consolekit.diff
-gzip ./source/xap/xfce/patches/xfce4-settings.libxklavier5.diff
+gzip ./source/xap/xfce/patches/xfce-utils-load_systemwide_Xmodmap.diff
+gzip ./source/xap/xfce/patches/Thunar.thunar-vfs-io-local.diff
+gzip ./source/xap/xfce/patches/thunar-1.0.2-fixup_docdir.diff
+gzip ./source/xap/xfce/patches/xfsm-compat-kde.c-start-kde4-services.diff
 gzip ./source/xap/xfce/patches/xfdesktop-fix_education_icon.diff
 gzip ./source/xap/xfce/patches/xfcalendar.desktop.in.diff
-gzip ./source/xap/xfce/patches/thunar-1.0.1-png14.diff
-gzip ./source/xap/xfce/patches/thunar-fix_umask_properly.diff
-gzip ./source/xap/xfce/patches/thunar-1.0.1-fixup_docdir.diff
-gzip ./source/xap/xfce/patches/terminal.gtk.2.18.fix.diff
+gzip ./source/xap/xfce/patches/fixup_comments_in_xfce-utils-Xft.xrdb.diff
+gzip ./source/xap/xfce/patches/mousepad-fix_find.diff
+gzip ./source/xap/xfce/patches/mousepad-fix_find_and_replace.diff
+gzip ./source/xap/xfce/patches/no_sensitive_panel_during_plugin_moves.patch
 gzip ./source/xap/xfce4-notifyd/doinst.sh
 gzip ./source/xap/fluxbox/xinitrc.fluxbox
-gzip ./source/xap/gimp/gimp.png14.diff
 gzip ./source/xap/mozilla-thunderbird/mimeTypes.rdf
 gzip ./source/xap/xine-ui/xine.desktop
 gzip ./source/xap/xine-ui/xine-ui.png14.diff
 gzip ./source/xap/xfce4-power-manager/doinst.sh
 gzip ./source/xap/geeqie/doinst.sh
-gzip ./source/xap/xchat/patches/xc286-smallfixes.diff
-gzip ./source/xap/xchat/patches/xchat.gtk_2_14.diff
 gzip ./source/xap/gkrellm/gkrellm.theme.defaults.diff
 gzip ./source/xap/x3270/doinst.sh
-gzip ./source/xap/xxgdb/xxgdb.fix_glibc_and_gcc.diff
 gzip ./source/xap/blackbox/blackbox-0.70.1-gcc-4.3.patch
 gzip ./source/xap/blackbox/xinitrc.blackbox
 gzip ./source/xap/windowmaker/windowmaker.no-mmx.diff
@@ -907,18 +677,12 @@ gzip ./source/xap/xscreensaver/xscreensaver.electricsheep.diff
 gzip ./source/xap/sane/sane-frontends-1.0.14-sane_cap_always_settable.diff
 gzip ./source/xap/sane/doinst.sh
 gzip ./source/xap/sane/dll.conf.additions
-gzip ./source/xap/pan/pan.gcc44.diff
-gzip ./source/xap/pan/pan.gmime2.4.diff
 gzip ./source/xap/seamonkey/doinst.sh
-gzip ./source/xap/gnuchess/gnuchess.gcc4_fix.diff
 gzip ./source/xap/gnuchess/eboard.assert.diff
-gzip ./source/xap/gnuchess/gnuchess.getline.glibc.diff
-gzip ./source/xap/gnuchess/gnuchess.SlackBuild.diff
-gzip ./source/xap/xine-lib/xine-lib-1.1.17.ff.diff
+gzip ./source/xap/audacious-plugins/audacious-plugins.alsa.noise.is.not.helpful.diff
+gzip ./source/xap/xine-lib/xine-lib.XvMClib.h.diff
 gzip ./source/xap/blueman/blueman-use_blueman-open_for_obexfs.diff
 gzip ./source/xap/blueman/doinst.sh
-gzip ./source/xap/blueman/no_hide_applet.diff
-gzip ./source/xap/blueman/fix_on_off_loop.diff
 gzip ./source/xap/xpdf/patches/xpdf-resizefix.diff
 gzip ./source/xap/xpdf/patches/xpdfrc.diff
 gzip ./source/xap/xpdf/patches/xpdf_3.02-1.3.diff
@@ -935,6 +699,7 @@ gzip ./source/xap/xpdf/lang/xpdf-japanese.diff
 gzip ./source/xap/xpdf/lang/xpdf-cyrillic.diff
 gzip ./source/xap/xpdf/lang/xpdf-latin2.diff
 gzip ./source/xap/seyon/seyon_2.20c-16.diff
+gzip ./source/xap/xaos/xaos.6
 gzip ./source/xap/xlockmore/xlockmore.bitmap.diff
 gzip ./source/xap/fvwm/xinitrc.fvwm2
 gzip ./source/xap/fvwm/fvwm.colormap.diff
@@ -947,21 +712,31 @@ gzip ./source/xap/xv/xv-3.10a.patch
 gzip ./source/xap/mozilla-firefox/mozilla-firefox-mimeTypes-fix.diff
 gzip ./source/xap/mozilla-firefox/firefox.moz_plugin_path.diff
 gzip ./source/xap/mozilla-firefox/mimeTypes.rdf
+gzip ./source/xap/rdesktop/rdesktop.CVE-2011-1595.diff
+gzip ./source/x/xdg-user-dirs/doinst.sh
 gzip ./source/x/x11-skel/doinst.sh
-gzip ./source/x/xaw3d/Xaw3d-1.5-debian-fixes.diff
-gzip ./source/x/xaw3d/Xaw3d-1.5E.diff
+gzip ./source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-application.cpp.patch
+gzip ./source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-qt.cpp.patch
+gzip ./source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-gtk.c.patch
+gzip ./source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.h.patch
+gzip ./source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent.cpp.patch
+gzip ./source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.cpp.patch
 gzip ./source/x/x11/post-install/xorg-cf-files/x11.tmpl.lib64.kludge.diff
+gzip ./source/x/x11/post-install/libX11/XKeysymDB
 gzip ./source/x/x11/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff
 gzip ./source/x/x11/patch/xorg-server/x11.startwithblackscreen.diff
-gzip ./source/x/x11/patch/xf86-input-synaptics/xf86-input-synaptics.tap-to-click.diff
-gzip ./source/x/x11/patch/xcursorgen/xcursorgen.png14.configure.kludge.diff
+gzip ./source/x/x11/patch/xorg-server/xorg-server.try_nouveau.diff
+gzip ./source/x/x11/patch/xcompmgr/xcompmgr-follow-icccm-spec.diff
 gzip ./source/x/ttf-indic-fonts/ttf-indic-fonts.copyright.diff
 gzip ./source/x/ttf-indic-fonts/doinst.sh
 gzip ./source/x/scim-hangul/scim-hangul.gcc43.diff
 gzip ./source/x/xdg-utils/doinst.sh
 gzip ./source/x/liberation-fonts-ttf/doinst.sh
 gzip ./source/x/libdrm/libdrm.uint32_t.diff
+gzip ./source/x/mesa/patches/i915_fragment_shader_disable.patch
+gzip ./source/x/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch
 gzip ./source/x/scim-anthy/scim-anthy.gcc43.diff
+gzip ./source/x/scim/scim-1.4.9-fix-ltdl.cpp.patch
 gzip ./source/x/dejavu-fonts-ttf/doinst.sh
 gzip ./source/x/fontconfig/fontconfig.dejavu.diff
 gzip ./source/x/fontconfig/doinst.sh
@@ -1013,19 +788,22 @@ gzip ./source/kde/kdemultimedia/doinst.sh
 gzip ./source/kde/kdeadmin/doinst.sh
 gzip ./source/kde/kdeadmin/knetworkconf.diff
 gzip ./source/kde/k3b/doinst.sh
+gzip ./source/kde/polkit-qt-1/polkit-qt-1.null-checking.diff
 gzip ./source/kde/kdeartwork/doinst.sh
 gzip ./source/kde/amarok/doinst.sh
 gzip ./source/kde/ktorrent/doinst.sh
 gzip ./source/kde/kdepim-runtime/doinst.sh
 gzip ./source/kde/kaudiocreator/doinst.sh
-gzip ./source/kde/kdenetwork/kget.kde44.CVE-2010-1000-1511.diff
 gzip ./source/kde/kdenetwork/doinst.sh
+gzip ./source/kde/kdebindings/pykdeuic4.patch
 gzip ./source/kde/kdebindings/kdebindings-ruby-env.h.diff
+gzip ./source/kde/kdebindings/kdebindings.1170602.sip_4_11_x.diff
 gzip ./source/kde/kdebindings/kdebindings-len-ptr-rfloat.diff
 gzip ./source/kde/kdebindings/kdebindings-rubyconfig.h.diff
 gzip ./source/kde/kdebase-runtime/doinst.sh
 gzip ./source/kde/kdebase-workspace/kdebase-workspace.kdm.server.timeout.diff
 gzip ./source/kde/kdebase-workspace/doinst.sh
+gzip ./source/kde/kdepimlibs/kdepimlibs-4.5.imap4.cpp.r1216162.diff
 gzip ./source/kde/kdetoys/doinst.sh
 gzip ./source/kde/kdewebdev/include-tidy.patch
 gzip ./source/kde/kdewebdev/doinst.sh
@@ -1034,17 +812,21 @@ gzip ./source/kde/kdepim/doinst.sh
 gzip ./source/kde/kdeedu/doinst.sh
 gzip ./source/kde/kdeaccessibility/doinst.sh
 gzip ./source/kde/kdeplasma-addons/doinst.sh
-gzip ./source/kde/kdegraphics/kdegraphics.gwenview.jpeg8.diff
+gzip ./source/kde/polkit-kde-1/polkit-kde-1.nodrkonqi.diff
 gzip ./source/kde/kdegraphics/doinst.sh
+gzip ./source/kde/kdebase/konsole_right_click-185466.patch.patch
+gzip ./source/kde/kdebase/konsole_right_click-185466.patch
 gzip ./source/kde/kdebase/doinst.sh
 gzip ./source/kde/skanlite/doinst.sh
-gzip ./source/kde/koffice/koffice.krita.png14.diff
 gzip ./source/kde/koffice/doinst.sh
 gzip ./source/kde/kdegames/doinst.sh
 gzip ./source/kde/kdevplatform/doinst.sh
 gzip ./source/kde/kdevelop/doinst.sh
+gzip ./source/kde/konq-plugins/konq-plugins-4.4.0-qt47.patch
+gzip ./source/kde/kdelibs/kdelibs.khtml.CVE-2011-1168.diff
 gzip ./source/kde/kdelibs/kdesu-allow_NOPASS_in_suauth.patch
 gzip ./source/kde/kdelibs/doinst.sh
+gzip ./source/kde/kdelibs/kdelibs.docbook.patch
 gzip ./source/kde/kdesdk/doinst.sh
 gzip ./source/kde/kopete-cryptography/doinst.sh
 gzip ./source/e/emacs/doinst.sh
@@ -1056,8 +838,11 @@ gzip ./source/tcl/tclx/tclx-8.4.configure.diff
 gzip ./source/tcl/tclx/tclx-8.4.gcc4.diff
 gzip ./source/l/hal/patches/fix_libusb_detection.diff
 gzip ./source/l/hal/patches/increase_HAL_PATH_MAX_to_4096.diff
+gzip ./source/l/hal/patches/fix-hal-segfault.patch
 gzip ./source/l/hal/patches/10-keymap.fdi-restore_zap.diff
+gzip ./source/l/hal/patches/ignore_internal_dm_devices.diff
 gzip ./source/l/hal/patches/fix_ioperm_arguments.patch
+gzip ./source/l/hal/patches/fix-build-with-automake-1.11.1.patch
 gzip ./source/l/hal/patches/handle_input.touchpad_explicitly.diff
 gzip ./source/l/hal/patches/fix_segfault-dbus_error_init.patch
 gzip ./source/l/hal/patches/fix_segfault_in_LIBHAL_FREE_DBUS_ERROR.diff
@@ -1079,79 +864,97 @@ gzip ./source/l/hicolor-icon-theme/doinst.sh
 gzip ./source/l/svgalib/svgalib.nohelper.diff
 gzip ./source/l/svgalib/svgalib-1.9.25-kernel-2.6.26.diff
 gzip ./source/l/svgalib/svgalib.prefix.diff
-gzip ./source/l/cairo/cairo.libpng14.diff
+gzip ./source/l/cairo/cairo-1.10.0-buggy_gradients.patch
 gzip ./source/l/urwid/LICENSE
 gzip ./source/l/djvulibre/doinst.sh
 gzip ./source/l/gd/gd.png14.diff
 gzip ./source/l/glib2/doinst.sh
+gzip ./source/l/libusb/libusb.fix.debug.log.level.diff
+gzip ./source/l/sdl/sdl.linux-2.6.31.input_absinfo.diff
 gzip ./source/l/sdl/SDL_mixer.usrlocal.diff
+gzip ./source/l/expat/expat-2.0.1-fixes-3.patch
+gzip ./source/l/gst-plugins-good/gst-plugins-good.6b86b56abd8a28b9e94cee679e3d86367a9a0ab3.diff
 gzip ./source/l/parted/parted.configure.diff
+gzip ./source/l/libtiff/libtiff-CVE-2011-0192.patch
+gzip ./source/l/libtiff/libtiff-CVE-2011-1167.patch
+gzip ./source/l/glibc/glibc.disable.broken.optimized.memcpy.diff
 gzip ./source/l/glibc/glibc-2.10-dns-no-gethostbyname4.diff
+gzip ./source/l/glibc/glibc.make-3.82.diff
+gzip ./source/l/glibc/glibc.git-96611391ad8823ba58405325d78cefeae5cdf699-CVE-2010-3847b.patch
+gzip ./source/l/glibc/glibc.ldd.trace.through.dynamic.linker.diff
 gzip ./source/l/glibc/glibc.ru_RU.CP1251.diff
 gzip ./source/l/glibc/glibc.nis-netgroups.diff
+gzip ./source/l/glibc/glibc.git-4a531bb0b3b582cb693de9f76d2d97d970f9a5d5.patch
 gzip ./source/l/glibc/glibc.getcwd.max.macro.diff
 gzip ./source/l/glibc/is_IS.diff
 gzip ./source/l/glibc/glibc.locale.no-archive.diff
 gzip ./source/l/glibc/glibc.revert.to.fix.build.breakages.diff
 gzip ./source/l/libvisual-plugins/libvisual-plugins.gstreamer.diff
+gzip ./source/l/qt/qt.blacklist.bad.certs.patch02.diff
 gzip ./source/l/qt/qt.x86.cflags.diff
 gzip ./source/l/qt/qt.mysql.h.diff
 gzip ./source/l/qt/doinst.sh
-gzip ./source/l/librsvg/librsvg_seamonkey-config.diff
+gzip ./source/l/qt/qt.QSortFilterProxyModel.reformatted.diff
+gzip ./source/l/qt/qt.blacklist.bad.certs.diff
+gzip ./source/l/gamin/gaminrc
+gzip ./source/l/gamin/doinst.sh
 gzip ./source/l/system-config-printer/doinst.sh
 gzip ./source/l/netpbm/config.mk
-gzip ./source/l/polkit-gnome/pkga.desktop-NotShowInKDE.diff
 gzip ./source/l/PyQt/PyQt.phonon.diff
-gzip ./source/l/mpfr/patches/patch01
-gzip ./source/l/mpfr/patches/patch02
-gzip ./source/l/mpfr/patches/patch03
 gzip ./source/l/libwmf/libwmf.png14.diff
 gzip ./source/l/esound/doinst.sh
+gzip ./source/l/t1lib/t1lib_5.1.2-3.diff
+gzip ./source/l/gdk-pixbuf2/gdk-pixbuf.pnglz.diff
+gzip ./source/l/gdk-pixbuf2/doinst.sh
 gzip ./source/l/qtscriptgenerator/include-everything.patch
 gzip ./source/l/qtscriptgenerator/qtscriptgenerator.gcc44.diff
 gzip ./source/l/libtermcap/termcap.h.diff
 gzip ./source/l/libtermcap/termcap-compat_1.2.3.diff
 gzip ./source/l/libtermcap/termcap.bufsize.diff
-gzip ./source/l/babl/babl-0.1.0-build-fixes.patch
-gzip ./source/l/openexr/openexr.gcc43.diff
+gzip ./source/l/openexr/openexr.gcc4.diff
+gzip ./source/l/libxml2/libxml2-2.7.8.broken.versioning.diff
 gzip ./source/l/lesstif/lesstif.x86_64.patch
 gzip ./source/l/lesstif/lesstif.rendertable.check.diff
 gzip ./source/l/lesstif/lesstif.Makefile.in.patch
 gzip ./source/l/lesstif/doinst.sh
 gzip ./source/l/lesstif/lesstif.PutPixel32.patch
 gzip ./source/l/imlib/imlib.mitshm.render.diff
-gzip ./source/l/gtk+2/gtk.pnglz.diff
-gzip ./source/l/gtk+2/gtk.png14.diff
+gzip ./source/l/gtk+2/gtk+-2.24.x.icon-compat.diff
+gzip ./source/l/gtk+2/fix_build_issues_on_tutorial_and_faq.diff
+gzip ./source/l/gtk+2/gtk+-2.24.x.icon-compat.am.diff
+gzip ./source/l/gtk+2/use_host_triplet_for_gtk_immodules.diff
 gzip ./source/l/gtk+2/doinst.sh
 gzip ./source/l/gtk+2/gtk.xid.nowarningflood.diff
 gzip ./source/l/pilot-link/pilot-link.png14.diff
+gzip ./source/l/pygobject/pygobject.fix.no.introspection.crash.diff
+gzip ./source/l/libgpod/doinst.sh
 gzip ./source/l/libnl/libnl-include_limits.h.patch
 gzip ./source/l/hal-info/patches/quirk-LG_X110-keyboard.patch
 gzip ./source/l/hal-info/patches/quirk-acer_aspire_hotkey.patch
 gzip ./source/l/pango/pango.etc.host.location.diff
 gzip ./source/l/desktop-file-utils/desktop-file-utils.quiet.warnings.diff
 gzip ./source/l/desktop-file-utils/doinst.sh
+gzip ./source/l/apr/apr.apr_ring.h.gcc45.diff
 gzip ./source/l/db44/patch.4.4.20.2
 gzip ./source/l/db44/patch.4.4.20.1
 gzip ./source/l/libcap/libcap.capability.h.fix.broken.includes.diff
-gzip ./source/l/ConsoleKit/patches/consolekit-0.2.10-cleanup_console_tags.patch
-gzip ./source/l/ConsoleKit/patches/consolekit-dbus-permissions.patch
-gzip ./source/l/ConsoleKit/patches/consolekit-skipvalidation.patch
+gzip ./source/l/ilmbase/ilmbase.gcc4.diff
+gzip ./source/l/zlib/zlib.largefile64_source.diff
+gzip ./source/l/ConsoleKit/consolekit-0.4.2-revert.patch
+gzip ./source/l/ConsoleKit/consolekit-0.2.10-cleanup_console_tags.patch
 gzip ./source/l/ConsoleKit/doinst.sh
-gzip ./source/l/freetype/freetype.bytecode.interpreter.diff
 gzip ./source/l/freetype/freetype.illadvisederror.diff
 gzip ./source/l/freetype/freetype.subpixel.rendering.diff
 gzip ./source/l/qca-ossl/qca-ossl.nowhirlpool.diff
 gzip ./source/l/akonadi/doinst.sh
 gzip ./source/l/icon-naming-utils/icon-naming-utils.pkgconfigdir.diff
-gzip ./source/l/phonon/phonon.gstreamer.qt-4.5.1.diff
 gzip ./source/l/fuse/doinst.sh
 gzip ./source/l/gnome-icon-theme/doinst.sh
 gzip ./source/l/gnome-icon-theme/gnome-icon-theme.pkgconfig.path.diff
 gzip ./source/l/virtuoso-ose/doinst.sh
 gzip ./source/l/libexif/libexif.pc.diff
+gzip ./pasture/source/gxine/gxine.desktop
 bzip2 ./source/n/curl/cacert.pem
-bzip2 ./source/ap/linuxdoc-tools/sources/gtkdoc-1.13-fixref.patch
 bzip2 ./source/xap/xv/xv-3.10a-enhancements.20070520-20081216.diff
 bzip2 ./source/xap/xv/xv-3.10a-jumbo-fix-enh-patch-20070520.txt
 bzip2 ./source/xap/xv/xv-3.10a-jumbo-additions.diff
diff --git a/misc/slackbook/html/TRADEMARKS.html b/slackbook/html/TRADEMARKS.html
index 0f282ca4..0f282ca4 100644
--- a/misc/slackbook/html/TRADEMARKS.html
+++ b/slackbook/html/TRADEMARKS.html
diff --git a/misc/slackbook/html/archive-files-bzip2.html b/slackbook/html/archive-files-bzip2.html
index ea3a4e04..ea3a4e04 100644
--- a/misc/slackbook/html/archive-files-bzip2.html
+++ b/slackbook/html/archive-files-bzip2.html
diff --git a/misc/slackbook/html/archive-files-tar.html b/slackbook/html/archive-files-tar.html
index b23db4b1..b23db4b1 100644
--- a/misc/slackbook/html/archive-files-tar.html
+++ b/slackbook/html/archive-files-tar.html
diff --git a/misc/slackbook/html/archive-files-zip.html b/slackbook/html/archive-files-zip.html
index cf7ef6cd..cf7ef6cd 100644
--- a/misc/slackbook/html/archive-files-zip.html
+++ b/slackbook/html/archive-files-zip.html
diff --git a/misc/slackbook/html/archive-files.html b/slackbook/html/archive-files.html
index c29542a9..c29542a9 100644
--- a/misc/slackbook/html/archive-files.html
+++ b/slackbook/html/archive-files.html
diff --git a/misc/slackbook/html/basic-network-commands-dns.html b/slackbook/html/basic-network-commands-dns.html
index f8881aad..f8881aad 100644
--- a/misc/slackbook/html/basic-network-commands-dns.html
+++ b/slackbook/html/basic-network-commands-dns.html
diff --git a/misc/slackbook/html/basic-network-commands-email.html b/slackbook/html/basic-network-commands-email.html
index 487ea4bc..487ea4bc 100644
--- a/misc/slackbook/html/basic-network-commands-email.html
+++ b/slackbook/html/basic-network-commands-email.html
diff --git a/misc/slackbook/html/basic-network-commands-finger.html b/slackbook/html/basic-network-commands-finger.html
index 08eca57c..08eca57c 100644
--- a/misc/slackbook/html/basic-network-commands-finger.html
+++ b/slackbook/html/basic-network-commands-finger.html
diff --git a/misc/slackbook/html/basic-network-commands-ftp.html b/slackbook/html/basic-network-commands-ftp.html
index a5b48f07..a5b48f07 100644
--- a/misc/slackbook/html/basic-network-commands-ftp.html
+++ b/slackbook/html/basic-network-commands-ftp.html
diff --git a/misc/slackbook/html/basic-network-commands-ssh.html b/slackbook/html/basic-network-commands-ssh.html
index f9912fe1..f9912fe1 100644
--- a/misc/slackbook/html/basic-network-commands-ssh.html
+++ b/slackbook/html/basic-network-commands-ssh.html
diff --git a/misc/slackbook/html/basic-network-commands-talk.html b/slackbook/html/basic-network-commands-talk.html
index 5c61119e..5c61119e 100644
--- a/misc/slackbook/html/basic-network-commands-talk.html
+++ b/slackbook/html/basic-network-commands-talk.html
diff --git a/misc/slackbook/html/basic-network-commands-telnet.html b/slackbook/html/basic-network-commands-telnet.html
index 736a2648..736a2648 100644
--- a/misc/slackbook/html/basic-network-commands-telnet.html
+++ b/slackbook/html/basic-network-commands-telnet.html
diff --git a/misc/slackbook/html/basic-network-commands-traceroute.html b/slackbook/html/basic-network-commands-traceroute.html
index fead8c00..fead8c00 100644
--- a/misc/slackbook/html/basic-network-commands-traceroute.html
+++ b/slackbook/html/basic-network-commands-traceroute.html
diff --git a/misc/slackbook/html/basic-network-commands-web.html b/slackbook/html/basic-network-commands-web.html
index e3f3b6c5..e3f3b6c5 100644
--- a/misc/slackbook/html/basic-network-commands-web.html
+++ b/slackbook/html/basic-network-commands-web.html
diff --git a/misc/slackbook/html/basic-network-commands.html b/slackbook/html/basic-network-commands.html
index 7ee78751..7ee78751 100644
--- a/misc/slackbook/html/basic-network-commands.html
+++ b/slackbook/html/basic-network-commands.html
diff --git a/misc/slackbook/html/basic-network-commands/elm.png b/slackbook/html/basic-network-commands/elm.png
index 3607bb64..3607bb64 100644
--- a/misc/slackbook/html/basic-network-commands/elm.png
+++ b/slackbook/html/basic-network-commands/elm.png
diff --git a/misc/slackbook/html/basic-network-commands/links.png b/slackbook/html/basic-network-commands/links.png
index f5b8275a..f5b8275a 100644
--- a/misc/slackbook/html/basic-network-commands/links.png
+++ b/slackbook/html/basic-network-commands/links.png
diff --git a/misc/slackbook/html/basic-network-commands/lynx.png b/slackbook/html/basic-network-commands/lynx.png
index 52d0a0c3..52d0a0c3 100644
--- a/misc/slackbook/html/basic-network-commands/lynx.png
+++ b/slackbook/html/basic-network-commands/lynx.png
diff --git a/misc/slackbook/html/basic-network-commands/mutt.png b/slackbook/html/basic-network-commands/mutt.png
index d67675ab..d67675ab 100644
--- a/misc/slackbook/html/basic-network-commands/mutt.png
+++ b/slackbook/html/basic-network-commands/mutt.png
diff --git a/misc/slackbook/html/basic-network-commands/pine.png b/slackbook/html/basic-network-commands/pine.png
index 3257d14e..3257d14e 100644
--- a/misc/slackbook/html/basic-network-commands/pine.png
+++ b/slackbook/html/basic-network-commands/pine.png
diff --git a/misc/slackbook/html/basic-network-commands/talk.png b/slackbook/html/basic-network-commands/talk.png
index 408ab118..408ab118 100644
--- a/misc/slackbook/html/basic-network-commands/talk.png
+++ b/slackbook/html/basic-network-commands/talk.png
diff --git a/misc/slackbook/html/basic-network-commands/ytalk.png b/slackbook/html/basic-network-commands/ytalk.png
index f5f2f9c7..f5f2f9c7 100644
--- a/misc/slackbook/html/basic-network-commands/ytalk.png
+++ b/slackbook/html/basic-network-commands/ytalk.png
diff --git a/misc/slackbook/html/book-preface.html b/slackbook/html/book-preface.html
index 9507434d..9507434d 100644
--- a/misc/slackbook/html/book-preface.html
+++ b/slackbook/html/book-preface.html
diff --git a/misc/slackbook/html/book.html b/slackbook/html/book.html
index c0803a78..c0803a78 100644
--- a/misc/slackbook/html/book.html
+++ b/slackbook/html/book.html
diff --git a/misc/slackbook/html/booting-dual.html b/slackbook/html/booting-dual.html
index b74eb874..b74eb874 100644
--- a/misc/slackbook/html/booting-dual.html
+++ b/slackbook/html/booting-dual.html
diff --git a/misc/slackbook/html/booting-loadlin.html b/slackbook/html/booting-loadlin.html
index d11754d3..d11754d3 100644
--- a/misc/slackbook/html/booting-loadlin.html
+++ b/slackbook/html/booting-loadlin.html
diff --git a/misc/slackbook/html/booting.html b/slackbook/html/booting.html
index ca3b7871..ca3b7871 100644
--- a/misc/slackbook/html/booting.html
+++ b/slackbook/html/booting.html
diff --git a/misc/slackbook/html/booting/setup-lilo-expert-w.png b/slackbook/html/booting/setup-lilo-expert-w.png
index 9c029d78..9c029d78 100644
--- a/misc/slackbook/html/booting/setup-lilo-expert-w.png
+++ b/slackbook/html/booting/setup-lilo-expert-w.png
diff --git a/misc/slackbook/html/booting/setup-lilo-w.png b/slackbook/html/booting/setup-lilo-w.png
index 638a29ff..638a29ff 100644
--- a/misc/slackbook/html/booting/setup-lilo-w.png
+++ b/slackbook/html/booting/setup-lilo-w.png
diff --git a/misc/slackbook/html/docbook.css b/slackbook/html/docbook.css
index 7d7cf794..7d7cf794 100644
--- a/misc/slackbook/html/docbook.css
+++ b/slackbook/html/docbook.css
diff --git a/misc/slackbook/html/emacs-basic-editing.html b/slackbook/html/emacs-basic-editing.html
index fbc5072b..fbc5072b 100644
--- a/misc/slackbook/html/emacs-basic-editing.html
+++ b/slackbook/html/emacs-basic-editing.html
diff --git a/misc/slackbook/html/emacs-buffers.html b/slackbook/html/emacs-buffers.html
index 53516de8..53516de8 100644
--- a/misc/slackbook/html/emacs-buffers.html
+++ b/slackbook/html/emacs-buffers.html
diff --git a/misc/slackbook/html/emacs-modes.html b/slackbook/html/emacs-modes.html
index ed22a354..ed22a354 100644
--- a/misc/slackbook/html/emacs-modes.html
+++ b/slackbook/html/emacs-modes.html
diff --git a/misc/slackbook/html/emacs-saving-files.html b/slackbook/html/emacs-saving-files.html
index 7e2ee9e1..7e2ee9e1 100644
--- a/misc/slackbook/html/emacs-saving-files.html
+++ b/slackbook/html/emacs-saving-files.html
diff --git a/misc/slackbook/html/emacs.html b/slackbook/html/emacs.html
index 8c6479cd..8c6479cd 100644
--- a/misc/slackbook/html/emacs.html
+++ b/slackbook/html/emacs.html
diff --git a/misc/slackbook/html/emacs/emacs.png b/slackbook/html/emacs/emacs.png
index 7571dec4..7571dec4 100644
--- a/misc/slackbook/html/emacs/emacs.png
+++ b/slackbook/html/emacs/emacs.png
diff --git a/misc/slackbook/html/essential-sysadmin-hardusers.html b/slackbook/html/essential-sysadmin-hardusers.html
index f9ad5448..f9ad5448 100644
--- a/misc/slackbook/html/essential-sysadmin-hardusers.html
+++ b/slackbook/html/essential-sysadmin-hardusers.html
diff --git a/misc/slackbook/html/essential-sysadmin-shutdown.html b/slackbook/html/essential-sysadmin-shutdown.html
index a97c78f6..a97c78f6 100644
--- a/misc/slackbook/html/essential-sysadmin-shutdown.html
+++ b/slackbook/html/essential-sysadmin-shutdown.html
diff --git a/misc/slackbook/html/essential-sysadmin.html b/slackbook/html/essential-sysadmin.html
index 85e127ed..85e127ed 100644
--- a/misc/slackbook/html/essential-sysadmin.html
+++ b/slackbook/html/essential-sysadmin.html
diff --git a/misc/slackbook/html/file-commands-copymove.html b/slackbook/html/file-commands-copymove.html
index ddb7179a..ddb7179a 100644
--- a/misc/slackbook/html/file-commands-copymove.html
+++ b/slackbook/html/file-commands-copymove.html
diff --git a/misc/slackbook/html/file-commands-creation.html b/slackbook/html/file-commands-creation.html
index cfbf7205..cfbf7205 100644
--- a/misc/slackbook/html/file-commands-creation.html
+++ b/slackbook/html/file-commands-creation.html
diff --git a/misc/slackbook/html/file-commands-deletion.html b/slackbook/html/file-commands-deletion.html
index 5b4277c6..5b4277c6 100644
--- a/misc/slackbook/html/file-commands-deletion.html
+++ b/slackbook/html/file-commands-deletion.html
diff --git a/misc/slackbook/html/file-commands-link.html b/slackbook/html/file-commands-link.html
index 8a3784fa..8a3784fa 100644
--- a/misc/slackbook/html/file-commands-link.html
+++ b/slackbook/html/file-commands-link.html
diff --git a/misc/slackbook/html/file-commands-output.html b/slackbook/html/file-commands-output.html
index e2419b27..e2419b27 100644
--- a/misc/slackbook/html/file-commands-output.html
+++ b/slackbook/html/file-commands-output.html
diff --git a/misc/slackbook/html/file-commands-pagers.html b/slackbook/html/file-commands-pagers.html
index 731c464b..731c464b 100644
--- a/misc/slackbook/html/file-commands-pagers.html
+++ b/slackbook/html/file-commands-pagers.html
diff --git a/misc/slackbook/html/file-commands.html b/slackbook/html/file-commands.html
index b541735d..b541735d 100644
--- a/misc/slackbook/html/file-commands.html
+++ b/slackbook/html/file-commands.html
diff --git a/misc/slackbook/html/filesystem-structure-links.html b/slackbook/html/filesystem-structure-links.html
index 451270e5..451270e5 100644
--- a/misc/slackbook/html/filesystem-structure-links.html
+++ b/slackbook/html/filesystem-structure-links.html
diff --git a/misc/slackbook/html/filesystem-structure-mounting.html b/slackbook/html/filesystem-structure-mounting.html
index e09694e4..e09694e4 100644
--- a/misc/slackbook/html/filesystem-structure-mounting.html
+++ b/slackbook/html/filesystem-structure-mounting.html
diff --git a/misc/slackbook/html/filesystem-structure-nfs.html b/slackbook/html/filesystem-structure-nfs.html
index 720cda6e..720cda6e 100644
--- a/misc/slackbook/html/filesystem-structure-nfs.html
+++ b/slackbook/html/filesystem-structure-nfs.html
diff --git a/misc/slackbook/html/filesystem-structure-permissions.html b/slackbook/html/filesystem-structure-permissions.html
index 0f951e77..0f951e77 100644
--- a/misc/slackbook/html/filesystem-structure-permissions.html
+++ b/slackbook/html/filesystem-structure-permissions.html
diff --git a/misc/slackbook/html/filesystem-structure.html b/slackbook/html/filesystem-structure.html
index 843c07c5..843c07c5 100644
--- a/misc/slackbook/html/filesystem-structure.html
+++ b/slackbook/html/filesystem-structure.html
diff --git a/misc/slackbook/html/glossary.html b/slackbook/html/glossary.html
index efdb6323..efdb6323 100644
--- a/misc/slackbook/html/glossary.html
+++ b/slackbook/html/glossary.html
diff --git a/misc/slackbook/html/gpl.html b/slackbook/html/gpl.html
index 7e41435c..7e41435c 100644
--- a/misc/slackbook/html/gpl.html
+++ b/slackbook/html/gpl.html
diff --git a/misc/slackbook/html/help-online.html b/slackbook/html/help-online.html
index fdd25388..fdd25388 100644
--- a/misc/slackbook/html/help-online.html
+++ b/slackbook/html/help-online.html
diff --git a/misc/slackbook/html/help.html b/slackbook/html/help.html
index 691282f6..691282f6 100644
--- a/misc/slackbook/html/help.html
+++ b/slackbook/html/help.html
diff --git a/misc/slackbook/html/imagelib/admon/note.png b/slackbook/html/imagelib/admon/note.png
index b0ee5555..b0ee5555 100644
--- a/misc/slackbook/html/imagelib/admon/note.png
+++ b/slackbook/html/imagelib/admon/note.png
diff --git a/misc/slackbook/html/imagelib/admon/warning.png b/slackbook/html/imagelib/admon/warning.png
index bc0adf33..bc0adf33 100644
--- a/misc/slackbook/html/imagelib/admon/warning.png
+++ b/slackbook/html/imagelib/admon/warning.png
diff --git a/misc/slackbook/html/index.html b/slackbook/html/index.html
index dc63844e..dc63844e 100644
--- a/misc/slackbook/html/index.html
+++ b/slackbook/html/index.html
diff --git a/misc/slackbook/html/installation-partitioning.html b/slackbook/html/installation-partitioning.html
index 3d3821e5..3d3821e5 100644
--- a/misc/slackbook/html/installation-partitioning.html
+++ b/slackbook/html/installation-partitioning.html
diff --git a/misc/slackbook/html/installation-requirements.html b/slackbook/html/installation-requirements.html
index e0e53dbf..e0e53dbf 100644
--- a/misc/slackbook/html/installation-requirements.html
+++ b/slackbook/html/installation-requirements.html
diff --git a/misc/slackbook/html/installation-setup.html b/slackbook/html/installation-setup.html
index 68b06ce1..68b06ce1 100644
--- a/misc/slackbook/html/installation-setup.html
+++ b/slackbook/html/installation-setup.html
diff --git a/misc/slackbook/html/installation.html b/slackbook/html/installation.html
index c2d1140e..c2d1140e 100644
--- a/misc/slackbook/html/installation.html
+++ b/slackbook/html/installation.html
diff --git a/misc/slackbook/html/installation/setup-bootdisk-w.png b/slackbook/html/installation/setup-bootdisk-w.png
index 55eb7b2a..55eb7b2a 100644
--- a/misc/slackbook/html/installation/setup-bootdisk-w.png
+++ b/slackbook/html/installation/setup-bootdisk-w.png
diff --git a/misc/slackbook/html/installation/setup-font-w.png b/slackbook/html/installation/setup-font-w.png
index c1876966..c1876966 100644
--- a/misc/slackbook/html/installation/setup-font-w.png
+++ b/slackbook/html/installation/setup-font-w.png
diff --git a/misc/slackbook/html/installation/setup-hardware-clock-w.png b/slackbook/html/installation/setup-hardware-clock-w.png
index 784975da..784975da 100644
--- a/misc/slackbook/html/installation/setup-hardware-clock-w.png
+++ b/slackbook/html/installation/setup-hardware-clock-w.png
diff --git a/misc/slackbook/html/installation/setup-help-w.png b/slackbook/html/installation/setup-help-w.png
index 21958005..21958005 100644
--- a/misc/slackbook/html/installation/setup-help-w.png
+++ b/slackbook/html/installation/setup-help-w.png
diff --git a/misc/slackbook/html/installation/setup-install-w.png b/slackbook/html/installation/setup-install-w.png
index 7ca52698..7ca52698 100644
--- a/misc/slackbook/html/installation/setup-install-w.png
+++ b/slackbook/html/installation/setup-install-w.png
diff --git a/misc/slackbook/html/installation/setup-kernel-w.png b/slackbook/html/installation/setup-kernel-w.png
index 206c3d76..206c3d76 100644
--- a/misc/slackbook/html/installation/setup-kernel-w.png
+++ b/slackbook/html/installation/setup-kernel-w.png
diff --git a/misc/slackbook/html/installation/setup-keymap-w.png b/slackbook/html/installation/setup-keymap-w.png
index ab7dd6f4..ab7dd6f4 100644
--- a/misc/slackbook/html/installation/setup-keymap-w.png
+++ b/slackbook/html/installation/setup-keymap-w.png
diff --git a/misc/slackbook/html/installation/setup-lilo-w.png b/slackbook/html/installation/setup-lilo-w.png
index 638a29ff..638a29ff 100644
--- a/misc/slackbook/html/installation/setup-lilo-w.png
+++ b/slackbook/html/installation/setup-lilo-w.png
diff --git a/misc/slackbook/html/installation/setup-modem-w.png b/slackbook/html/installation/setup-modem-w.png
index e1c8877e..e1c8877e 100644
--- a/misc/slackbook/html/installation/setup-modem-w.png
+++ b/slackbook/html/installation/setup-modem-w.png
diff --git a/misc/slackbook/html/installation/setup-mouse-w.png b/slackbook/html/installation/setup-mouse-w.png
index 31ee6b35..31ee6b35 100644
--- a/misc/slackbook/html/installation/setup-mouse-w.png
+++ b/slackbook/html/installation/setup-mouse-w.png
diff --git a/misc/slackbook/html/installation/setup-program-w.png b/slackbook/html/installation/setup-program-w.png
index 721ed058..721ed058 100644
--- a/misc/slackbook/html/installation/setup-program-w.png
+++ b/slackbook/html/installation/setup-program-w.png
diff --git a/misc/slackbook/html/installation/setup-select-w.png b/slackbook/html/installation/setup-select-w.png
index d2f7a144..d2f7a144 100644
--- a/misc/slackbook/html/installation/setup-select-w.png
+++ b/slackbook/html/installation/setup-select-w.png
diff --git a/misc/slackbook/html/installation/setup-source-w.png b/slackbook/html/installation/setup-source-w.png
index 226ef5b6..226ef5b6 100644
--- a/misc/slackbook/html/installation/setup-source-w.png
+++ b/slackbook/html/installation/setup-source-w.png
diff --git a/misc/slackbook/html/installation/setup-swap-w.png b/slackbook/html/installation/setup-swap-w.png
index f17ba4f3..f17ba4f3 100644
--- a/misc/slackbook/html/installation/setup-swap-w.png
+++ b/slackbook/html/installation/setup-swap-w.png
diff --git a/misc/slackbook/html/installation/setup-target-w.png b/slackbook/html/installation/setup-target-w.png
index 142cf8bc..142cf8bc 100644
--- a/misc/slackbook/html/installation/setup-target-w.png
+++ b/slackbook/html/installation/setup-target-w.png
diff --git a/misc/slackbook/html/installation/setup-timezone-w.png b/slackbook/html/installation/setup-timezone-w.png
index b51500b8..b51500b8 100644
--- a/misc/slackbook/html/installation/setup-timezone-w.png
+++ b/slackbook/html/installation/setup-timezone-w.png
diff --git a/misc/slackbook/html/installation/setup-xwmconfig-w.png b/slackbook/html/installation/setup-xwmconfig-w.png
index 91c8cc01..91c8cc01 100644
--- a/misc/slackbook/html/installation/setup-xwmconfig-w.png
+++ b/slackbook/html/installation/setup-xwmconfig-w.png
diff --git a/misc/slackbook/html/introduction-opensource.html b/slackbook/html/introduction-opensource.html
index eeeda9e5..eeeda9e5 100644
--- a/misc/slackbook/html/introduction-opensource.html
+++ b/slackbook/html/introduction-opensource.html
diff --git a/misc/slackbook/html/introduction-slackware.html b/slackbook/html/introduction-slackware.html
index c9c7a11a..c9c7a11a 100644
--- a/misc/slackbook/html/introduction-slackware.html
+++ b/slackbook/html/introduction-slackware.html
diff --git a/misc/slackbook/html/introduction.html b/slackbook/html/introduction.html
index 70bc4216..70bc4216 100644
--- a/misc/slackbook/html/introduction.html
+++ b/slackbook/html/introduction.html
diff --git a/misc/slackbook/html/network-configuration-hardware.html b/slackbook/html/network-configuration-hardware.html
index 99c2f283..99c2f283 100644
--- a/misc/slackbook/html/network-configuration-hardware.html
+++ b/slackbook/html/network-configuration-hardware.html
diff --git a/misc/slackbook/html/network-configuration-nfs.html b/slackbook/html/network-configuration-nfs.html
index ca6138d8..ca6138d8 100644
--- a/misc/slackbook/html/network-configuration-nfs.html
+++ b/slackbook/html/network-configuration-nfs.html
diff --git a/misc/slackbook/html/network-configuration-ppp.html b/slackbook/html/network-configuration-ppp.html
index 06dd7203..06dd7203 100644
--- a/misc/slackbook/html/network-configuration-ppp.html
+++ b/slackbook/html/network-configuration-ppp.html
diff --git a/misc/slackbook/html/network-configuration-tcpip.html b/slackbook/html/network-configuration-tcpip.html
index 3b49437e..3b49437e 100644
--- a/misc/slackbook/html/network-configuration-tcpip.html
+++ b/slackbook/html/network-configuration-tcpip.html
diff --git a/misc/slackbook/html/network-configuration-wireless.html b/slackbook/html/network-configuration-wireless.html
index fa86dcc2..fa86dcc2 100644
--- a/misc/slackbook/html/network-configuration-wireless.html
+++ b/slackbook/html/network-configuration-wireless.html
diff --git a/misc/slackbook/html/network-configuration.html b/slackbook/html/network-configuration.html
index 66fb0082..66fb0082 100644
--- a/misc/slackbook/html/network-configuration.html
+++ b/slackbook/html/network-configuration.html
diff --git a/misc/slackbook/html/package-management-making-packages.html b/slackbook/html/package-management-making-packages.html
index f5812775..f5812775 100644
--- a/misc/slackbook/html/package-management-making-packages.html
+++ b/slackbook/html/package-management-making-packages.html
diff --git a/misc/slackbook/html/package-management-making-tags-and-tagfiles.html b/slackbook/html/package-management-making-tags-and-tagfiles.html
index 9c82bdf0..9c82bdf0 100644
--- a/misc/slackbook/html/package-management-making-tags-and-tagfiles.html
+++ b/slackbook/html/package-management-making-tags-and-tagfiles.html
diff --git a/misc/slackbook/html/package-management-package-utilities.html b/slackbook/html/package-management-package-utilities.html
index 0179a5a8..0179a5a8 100644
--- a/misc/slackbook/html/package-management-package-utilities.html
+++ b/slackbook/html/package-management-package-utilities.html
diff --git a/misc/slackbook/html/package-management.html b/slackbook/html/package-management.html
index e6ddc32b..e6ddc32b 100644
--- a/misc/slackbook/html/package-management.html
+++ b/slackbook/html/package-management.html
diff --git a/misc/slackbook/html/package-management/pkgtool-view-w.png b/slackbook/html/package-management/pkgtool-view-w.png
index 7a62a8bc..7a62a8bc 100644
--- a/misc/slackbook/html/package-management/pkgtool-view-w.png
+++ b/slackbook/html/package-management/pkgtool-view-w.png
diff --git a/misc/slackbook/html/package-management/pkgtool-w.png b/slackbook/html/package-management/pkgtool-w.png
index 1a43423f..1a43423f 100644
--- a/misc/slackbook/html/package-management/pkgtool-w.png
+++ b/slackbook/html/package-management/pkgtool-w.png
diff --git a/misc/slackbook/html/process-control-foregrounding.html b/slackbook/html/process-control-foregrounding.html
index 7b185ba7..7b185ba7 100644
--- a/misc/slackbook/html/process-control-foregrounding.html
+++ b/slackbook/html/process-control-foregrounding.html
diff --git a/misc/slackbook/html/process-control-kill.html b/slackbook/html/process-control-kill.html
index 32292651..32292651 100644
--- a/misc/slackbook/html/process-control-kill.html
+++ b/slackbook/html/process-control-kill.html
diff --git a/misc/slackbook/html/process-control-ps.html b/slackbook/html/process-control-ps.html
index 27b84268..27b84268 100644
--- a/misc/slackbook/html/process-control-ps.html
+++ b/slackbook/html/process-control-ps.html
diff --git a/misc/slackbook/html/process-control-top.html b/slackbook/html/process-control-top.html
index c15f0f4e..c15f0f4e 100644
--- a/misc/slackbook/html/process-control-top.html
+++ b/slackbook/html/process-control-top.html
diff --git a/misc/slackbook/html/process-control.html b/slackbook/html/process-control.html
index 8727262d..8727262d 100644
--- a/misc/slackbook/html/process-control.html
+++ b/slackbook/html/process-control.html
diff --git a/misc/slackbook/html/security-current.html b/slackbook/html/security-current.html
index 12e20716..12e20716 100644
--- a/misc/slackbook/html/security-current.html
+++ b/slackbook/html/security-current.html
diff --git a/misc/slackbook/html/security-host.html b/slackbook/html/security-host.html
index 55f33286..55f33286 100644
--- a/misc/slackbook/html/security-host.html
+++ b/slackbook/html/security-host.html
diff --git a/misc/slackbook/html/security.html b/slackbook/html/security.html
index 34249a8b..34249a8b 100644
--- a/misc/slackbook/html/security.html
+++ b/slackbook/html/security.html
diff --git a/misc/slackbook/html/shell-bash.html b/slackbook/html/shell-bash.html
index 13ffdf08..13ffdf08 100644
--- a/misc/slackbook/html/shell-bash.html
+++ b/slackbook/html/shell-bash.html
diff --git a/misc/slackbook/html/shell-command-line.html b/slackbook/html/shell-command-line.html
index 6188bd95..6188bd95 100644
--- a/misc/slackbook/html/shell-command-line.html
+++ b/slackbook/html/shell-command-line.html
diff --git a/misc/slackbook/html/shell-vt.html b/slackbook/html/shell-vt.html
index 2d28160c..2d28160c 100644
--- a/misc/slackbook/html/shell-vt.html
+++ b/slackbook/html/shell-vt.html
diff --git a/misc/slackbook/html/shell.html b/slackbook/html/shell.html
index aa259c8c..aa259c8c 100644
--- a/misc/slackbook/html/shell.html
+++ b/slackbook/html/shell.html
diff --git a/misc/slackbook/html/slackware_logo.png b/slackbook/html/slackware_logo.png
index 3f2955e3..3f2955e3 100644
--- a/misc/slackbook/html/slackware_logo.png
+++ b/slackbook/html/slackware_logo.png
diff --git a/misc/slackbook/html/system-configuration-kernel.html b/slackbook/html/system-configuration-kernel.html
index 7934fec4..7934fec4 100644
--- a/misc/slackbook/html/system-configuration-kernel.html
+++ b/slackbook/html/system-configuration-kernel.html
diff --git a/misc/slackbook/html/system-configuration.html b/slackbook/html/system-configuration.html
index 2c88375a..2c88375a 100644
--- a/misc/slackbook/html/system-configuration.html
+++ b/slackbook/html/system-configuration.html
diff --git a/misc/slackbook/html/system-configuration/make-menuconfig-w.png b/slackbook/html/system-configuration/make-menuconfig-w.png
index 84814290..84814290 100644
--- a/misc/slackbook/html/system-configuration/make-menuconfig-w.png
+++ b/slackbook/html/system-configuration/make-menuconfig-w.png
diff --git a/misc/slackbook/html/vi-configuration.html b/slackbook/html/vi-configuration.html
index e37b86dd..e37b86dd 100644
--- a/misc/slackbook/html/vi-configuration.html
+++ b/slackbook/html/vi-configuration.html
diff --git a/misc/slackbook/html/vi-keys.html b/slackbook/html/vi-keys.html
index a2386360..a2386360 100644
--- a/misc/slackbook/html/vi-keys.html
+++ b/slackbook/html/vi-keys.html
diff --git a/misc/slackbook/html/vi-modes.html b/slackbook/html/vi-modes.html
index df838797..df838797 100644
--- a/misc/slackbook/html/vi-modes.html
+++ b/slackbook/html/vi-modes.html
diff --git a/misc/slackbook/html/vi-opening-files.html b/slackbook/html/vi-opening-files.html
index db79dd08..db79dd08 100644
--- a/misc/slackbook/html/vi-opening-files.html
+++ b/slackbook/html/vi-opening-files.html
diff --git a/misc/slackbook/html/vi-quitting-vi.html b/slackbook/html/vi-quitting-vi.html
index d600af00..d600af00 100644
--- a/misc/slackbook/html/vi-quitting-vi.html
+++ b/slackbook/html/vi-quitting-vi.html
diff --git a/misc/slackbook/html/vi-saving-files.html b/slackbook/html/vi-saving-files.html
index 137c46b5..137c46b5 100644
--- a/misc/slackbook/html/vi-saving-files.html
+++ b/slackbook/html/vi-saving-files.html
diff --git a/misc/slackbook/html/vi.html b/slackbook/html/vi.html
index d5fbf29f..d5fbf29f 100644
--- a/misc/slackbook/html/vi.html
+++ b/slackbook/html/vi.html
diff --git a/misc/slackbook/html/vi/vim-splitedit.png b/slackbook/html/vi/vim-splitedit.png
index f1ce5ceb..f1ce5ceb 100644
--- a/misc/slackbook/html/vi/vim-splitedit.png
+++ b/slackbook/html/vi/vim-splitedit.png
diff --git a/misc/slackbook/html/x-window-system-xdm.html b/slackbook/html/x-window-system-xdm.html
index 88b44e49..88b44e49 100644
--- a/misc/slackbook/html/x-window-system-xdm.html
+++ b/slackbook/html/x-window-system-xdm.html
diff --git a/misc/slackbook/html/x-window-system-xinitrc.html b/slackbook/html/x-window-system-xinitrc.html
index 968b4c13..968b4c13 100644
--- a/misc/slackbook/html/x-window-system-xinitrc.html
+++ b/slackbook/html/x-window-system-xinitrc.html
diff --git a/misc/slackbook/html/x-window-system-xorgsetup.html b/slackbook/html/x-window-system-xorgsetup.html
index 664f895f..664f895f 100644
--- a/misc/slackbook/html/x-window-system-xorgsetup.html
+++ b/slackbook/html/x-window-system-xorgsetup.html
diff --git a/misc/slackbook/html/x-window-system-xwmconfig.html b/slackbook/html/x-window-system-xwmconfig.html
index 849d383a..849d383a 100644
--- a/misc/slackbook/html/x-window-system-xwmconfig.html
+++ b/slackbook/html/x-window-system-xwmconfig.html
diff --git a/misc/slackbook/html/x-window-system.html b/slackbook/html/x-window-system.html
index 6aaf81bb..6aaf81bb 100644
--- a/misc/slackbook/html/x-window-system.html
+++ b/slackbook/html/x-window-system.html
diff --git a/misc/slackbook/html/x-window-system/xorgconfig1-w.png b/slackbook/html/x-window-system/xorgconfig1-w.png
index bedcc0b3..bedcc0b3 100644
--- a/misc/slackbook/html/x-window-system/xorgconfig1-w.png
+++ b/slackbook/html/x-window-system/xorgconfig1-w.png
diff --git a/misc/slackbook/html/x-window-system/xorgconfig2-w.png b/slackbook/html/x-window-system/xorgconfig2-w.png
index 82722c4b..82722c4b 100644
--- a/misc/slackbook/html/x-window-system/xorgconfig2-w.png
+++ b/slackbook/html/x-window-system/xorgconfig2-w.png
diff --git a/misc/slackbook/html/x-window-system/xorgconfig3-w.png b/slackbook/html/x-window-system/xorgconfig3-w.png
index eb8c5c7d..eb8c5c7d 100644
--- a/misc/slackbook/html/x-window-system/xorgconfig3-w.png
+++ b/slackbook/html/x-window-system/xorgconfig3-w.png
diff --git a/misc/slackbook/html/x-window-system/xorgconfig4-w.png b/slackbook/html/x-window-system/xorgconfig4-w.png
index 651da228..651da228 100644
--- a/misc/slackbook/html/x-window-system/xorgconfig4-w.png
+++ b/slackbook/html/x-window-system/xorgconfig4-w.png
diff --git a/misc/slackbook/html/x-window-system/xwmconfig-w.png b/slackbook/html/x-window-system/xwmconfig-w.png
index 91c8cc01..91c8cc01 100644
--- a/misc/slackbook/html/x-window-system/xwmconfig-w.png
+++ b/slackbook/html/x-window-system/xwmconfig-w.png
diff --git a/misc/slackbook/html/zipslack-booting.html b/slackbook/html/zipslack-booting.html
index 89dabfee..89dabfee 100644
--- a/misc/slackbook/html/zipslack-booting.html
+++ b/slackbook/html/zipslack-booting.html
diff --git a/misc/slackbook/html/zipslack-getting.html b/slackbook/html/zipslack-getting.html
index 3e3e54f4..3e3e54f4 100644
--- a/misc/slackbook/html/zipslack-getting.html
+++ b/slackbook/html/zipslack-getting.html
diff --git a/misc/slackbook/html/zipslack.html b/slackbook/html/zipslack.html
index 7edd94d2..7edd94d2 100644
--- a/misc/slackbook/html/zipslack.html
+++ b/slackbook/html/zipslack.html
diff --git a/misc/slackbook/slackbook-2.0.pdf b/slackbook/slackbook-2.0.pdf
index 8961f55f..8961f55f 100644
--- a/misc/slackbook/slackbook-2.0.pdf
+++ b/slackbook/slackbook-2.0.pdf
diff --git a/misc/slackbook/slackbook-2.0.ps b/slackbook/slackbook-2.0.ps
index 75b1c13b..75b1c13b 100644
--- a/misc/slackbook/slackbook-2.0.ps
+++ b/slackbook/slackbook-2.0.ps
diff --git a/slackware64/a/maketag b/slackware64/a/maketag
index 6ec55425..e3316e4e 100644
--- a/slackware64/a/maketag
+++ b/slackware64/a/maketag
@@ -20,6 +20,7 @@ system. :^)  Press ENTER when you are done."  21 76 10 \
 "attr" "Tools for fs extended attributes -- REQUIRED" "on" \
 "bash" "GNU bash shell - REQUIRED" "on" \
 "bin" "Various system utilities - REQUIRED" "on" \
+"btrfs-progs" "Utilities for btrfs filesystems" "on" \
 "bzip2" "bzip2 compression utility" "on" \
 "coreutils" "The core GNU command-line utilities - REQUIRED" "on" \
 "cpio" "The GNU cpio backup/archiving utility" "on" \
@@ -41,6 +42,7 @@ system. :^)  Press ENTER when you are done."  21 76 10 \
 "findutils" "GNU file finding utilities" "on" \
 "floppy" "Utilities for using DOS floppies" "on" \
 "gawk" "GNU awk pattern scanning language" "on" \
+"gdisk" "GPT fdisk (gdisk)" "on" \
 "genpower" "UPS monitoring daemon" "on" \
 "gettext" "Programs used to internationalize scripts" "on" \
 "getty-ps" "Getty_ps serial login support - OPTIONAL" "on" \
@@ -54,15 +56,18 @@ system. :^)  Press ENTER when you are done."  21 76 10 \
 "inotify-tools" "Command-line tools for using inotify." "on" \
 "jfsutils" "Utilities for IBM's Journaled Filesystem" "on" \
 "kbd" "Change keyboard and console mappings" "on" \
-"kernel-firmware" "Linux 2.6.33.4 kernel firmware -- REQUIRED" "on" \
-"kernel-generic" "Generic 2.6.33.4 kernel (needs an initrd)" "on" \
-"kernel-huge" "Loaded 2.6.33.4 Linux kernel" "on" \
-"kernel-modules" "Linux 2.6.33.4 kernel modules -- REQUIRED" "on" \
+"kernel-firmware" "Linux 2.6.37.6 kernel firmware -- REQUIRED" "on" \
+"kernel-generic" "Generic 2.6.37.6 kernel (needs an initrd)" "on" \
+"kernel-huge" "Loaded 2.6.37.6 Linux kernel" "on" \
+"kernel-modules" "Linux 2.6.37.6 kernel modules -- REQUIRED" "on" \
 "less" "A text pager utility - REQUIRED" "on" \
 "lha" "LHA archive utility" "on" \
+"libcgroup" "Tools for using kernel control groups" "on" \
 "lilo" "Boot loader for Linux, DOS, OS/2, etc." "on" \
 "logrotate" "System log rotation utility" "on" \
+"lrzip" "Long Range ZIP" "on" \
 "lvm2" "Tools for creating logical volumes" "on" \
+"mcelog" "Machine Check Event logger" "on" \
 "mdadm" "Utilities for managing MD (RAID) devices" "on" \
 "minicom" "Serial transfer and modem comm package" "on" \
 "mkinitrd" "Tool for building an initial ramdisk" "on" \
@@ -102,7 +107,7 @@ system. :^)  Press ENTER when you are done."  21 76 10 \
 "usb_modeswitch" "Switching tool for multiple mode USB devices" "on" \
 "usbutils" "Linux USB utilities" "on" \
 "utempter" "Library used for writing to utmp/wtmp" "on" \
-"util-linux-ng" "Util-linux utilities - REQUIRED" "on" \
+"util-linux" "Util-linux utilities - REQUIRED" "on" \
 "which" "Locate an executable in your $PATH" "on" \
 "xfsprogs" "Utilities for SGI's XFS filesystem" "on" \
 "xz" "xz (LZMA) compression utility - REQUIRED" "on" \
@@ -112,7 +117,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-aaa_base aaa_elflibs aaa_terminfo acl acpid apmd attr bash bin bzip2 coreutils cpio cpufrequtils cryptsetup cups cxxlibs dbus dcron devs dialog dosfstools e2fsprogs ed eject elvis etc file findutils floppy gawk genpower gettext getty-ps glibc-solibs glibc-zoneinfo gpm grep gzip hdparm infozip inotify-tools jfsutils kbd kernel-firmware kernel-generic kernel-huge kernel-modules less lha lilo logrotate lvm2 mdadm minicom mkinitrd module-init-tools mt-st mtx ncompress ntfs-3g openssl-solibs patch pciutils pcmciautils pkgtools procps quota reiserfsprogs rpm2tgz sdparm sed shadow sharutils slocate smartmontools splitvt sysfsutils sysklogd syslinux sysvinit sysvinit-functions sysvinit-scripts tar tcsh time tree udev unarj usb_modeswitch usbutils utempter util-linux-ng which xfsprogs xz zoo \
+aaa_base aaa_elflibs aaa_terminfo acl acpid apmd attr bash bin btrfs-progs bzip2 coreutils cpio cpufrequtils cryptsetup cups cxxlibs dbus dcron devs dialog dosfstools e2fsprogs ed eject elvis etc file findutils floppy gawk gdisk genpower gettext getty-ps glibc-solibs glibc-zoneinfo gpm grep gzip hdparm infozip inotify-tools jfsutils kbd kernel-firmware kernel-generic kernel-huge kernel-modules less lha libcgroup lilo logrotate lrzip lvm2 mcelog mdadm minicom mkinitrd module-init-tools mt-st mtx ncompress ntfs-3g openssl-solibs patch pciutils pcmciautils pkgtools procps quota reiserfsprogs rpm2tgz sdparm sed shadow sharutils slocate smartmontools splitvt sysfsutils sysklogd syslinux sysvinit sysvinit-functions sysvinit-scripts tar tcsh time tree udev unarj usb_modeswitch usbutils utempter util-linux which xfsprogs xz zoo \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -120,7 +125,7 @@ aaa_base aaa_elflibs aaa_terminfo acl acpid apmd attr bash bin bzip2 coreutils c
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-aaa_base aaa_elflibs aaa_terminfo acl acpid apmd attr bash bin bzip2 coreutils cpio cpufrequtils cryptsetup cups cxxlibs dbus dcron devs dialog dosfstools e2fsprogs ed eject elvis etc file findutils floppy gawk genpower gettext getty-ps glibc-solibs glibc-zoneinfo gpm grep gzip hdparm infozip inotify-tools jfsutils kbd kernel-firmware kernel-generic kernel-huge kernel-modules less lha lilo logrotate lvm2 mdadm minicom mkinitrd module-init-tools mt-st mtx ncompress ntfs-3g openssl-solibs patch pciutils pcmciautils pkgtools procps quota reiserfsprogs rpm2tgz sdparm sed shadow sharutils slocate smartmontools splitvt sysfsutils sysklogd syslinux sysvinit sysvinit-functions sysvinit-scripts tar tcsh time tree udev unarj usb_modeswitch usbutils utempter util-linux-ng which xfsprogs xz zoo \
+aaa_base aaa_elflibs aaa_terminfo acl acpid apmd attr bash bin btrfs-progs bzip2 coreutils cpio cpufrequtils cryptsetup cups cxxlibs dbus dcron devs dialog dosfstools e2fsprogs ed eject elvis etc file findutils floppy gawk gdisk genpower gettext getty-ps glibc-solibs glibc-zoneinfo gpm grep gzip hdparm infozip inotify-tools jfsutils kbd kernel-firmware kernel-generic kernel-huge kernel-modules less lha libcgroup lilo logrotate lrzip lvm2 mcelog mdadm minicom mkinitrd module-init-tools mt-st mtx ncompress ntfs-3g openssl-solibs patch pciutils pcmciautils pkgtools procps quota reiserfsprogs rpm2tgz sdparm sed shadow sharutils slocate smartmontools splitvt sysfsutils sysklogd syslinux sysvinit sysvinit-functions sysvinit-scripts tar tcsh time tree udev unarj usb_modeswitch usbutils utempter util-linux which xfsprogs xz zoo \
  ; do
  if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
diff --git a/slackware64/a/maketag.ez b/slackware64/a/maketag.ez
index 6ec55425..e3316e4e 100644
--- a/slackware64/a/maketag.ez
+++ b/slackware64/a/maketag.ez
@@ -20,6 +20,7 @@ system. :^)  Press ENTER when you are done."  21 76 10 \
 "attr" "Tools for fs extended attributes -- REQUIRED" "on" \
 "bash" "GNU bash shell - REQUIRED" "on" \
 "bin" "Various system utilities - REQUIRED" "on" \
+"btrfs-progs" "Utilities for btrfs filesystems" "on" \
 "bzip2" "bzip2 compression utility" "on" \
 "coreutils" "The core GNU command-line utilities - REQUIRED" "on" \
 "cpio" "The GNU cpio backup/archiving utility" "on" \
@@ -41,6 +42,7 @@ system. :^)  Press ENTER when you are done."  21 76 10 \
 "findutils" "GNU file finding utilities" "on" \
 "floppy" "Utilities for using DOS floppies" "on" \
 "gawk" "GNU awk pattern scanning language" "on" \
+"gdisk" "GPT fdisk (gdisk)" "on" \
 "genpower" "UPS monitoring daemon" "on" \
 "gettext" "Programs used to internationalize scripts" "on" \
 "getty-ps" "Getty_ps serial login support - OPTIONAL" "on" \
@@ -54,15 +56,18 @@ system. :^)  Press ENTER when you are done."  21 76 10 \
 "inotify-tools" "Command-line tools for using inotify." "on" \
 "jfsutils" "Utilities for IBM's Journaled Filesystem" "on" \
 "kbd" "Change keyboard and console mappings" "on" \
-"kernel-firmware" "Linux 2.6.33.4 kernel firmware -- REQUIRED" "on" \
-"kernel-generic" "Generic 2.6.33.4 kernel (needs an initrd)" "on" \
-"kernel-huge" "Loaded 2.6.33.4 Linux kernel" "on" \
-"kernel-modules" "Linux 2.6.33.4 kernel modules -- REQUIRED" "on" \
+"kernel-firmware" "Linux 2.6.37.6 kernel firmware -- REQUIRED" "on" \
+"kernel-generic" "Generic 2.6.37.6 kernel (needs an initrd)" "on" \
+"kernel-huge" "Loaded 2.6.37.6 Linux kernel" "on" \
+"kernel-modules" "Linux 2.6.37.6 kernel modules -- REQUIRED" "on" \
 "less" "A text pager utility - REQUIRED" "on" \
 "lha" "LHA archive utility" "on" \
+"libcgroup" "Tools for using kernel control groups" "on" \
 "lilo" "Boot loader for Linux, DOS, OS/2, etc." "on" \
 "logrotate" "System log rotation utility" "on" \
+"lrzip" "Long Range ZIP" "on" \
 "lvm2" "Tools for creating logical volumes" "on" \
+"mcelog" "Machine Check Event logger" "on" \
 "mdadm" "Utilities for managing MD (RAID) devices" "on" \
 "minicom" "Serial transfer and modem comm package" "on" \
 "mkinitrd" "Tool for building an initial ramdisk" "on" \
@@ -102,7 +107,7 @@ system. :^)  Press ENTER when you are done."  21 76 10 \
 "usb_modeswitch" "Switching tool for multiple mode USB devices" "on" \
 "usbutils" "Linux USB utilities" "on" \
 "utempter" "Library used for writing to utmp/wtmp" "on" \
-"util-linux-ng" "Util-linux utilities - REQUIRED" "on" \
+"util-linux" "Util-linux utilities - REQUIRED" "on" \
 "which" "Locate an executable in your $PATH" "on" \
 "xfsprogs" "Utilities for SGI's XFS filesystem" "on" \
 "xz" "xz (LZMA) compression utility - REQUIRED" "on" \
@@ -112,7 +117,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-aaa_base aaa_elflibs aaa_terminfo acl acpid apmd attr bash bin bzip2 coreutils cpio cpufrequtils cryptsetup cups cxxlibs dbus dcron devs dialog dosfstools e2fsprogs ed eject elvis etc file findutils floppy gawk genpower gettext getty-ps glibc-solibs glibc-zoneinfo gpm grep gzip hdparm infozip inotify-tools jfsutils kbd kernel-firmware kernel-generic kernel-huge kernel-modules less lha lilo logrotate lvm2 mdadm minicom mkinitrd module-init-tools mt-st mtx ncompress ntfs-3g openssl-solibs patch pciutils pcmciautils pkgtools procps quota reiserfsprogs rpm2tgz sdparm sed shadow sharutils slocate smartmontools splitvt sysfsutils sysklogd syslinux sysvinit sysvinit-functions sysvinit-scripts tar tcsh time tree udev unarj usb_modeswitch usbutils utempter util-linux-ng which xfsprogs xz zoo \
+aaa_base aaa_elflibs aaa_terminfo acl acpid apmd attr bash bin btrfs-progs bzip2 coreutils cpio cpufrequtils cryptsetup cups cxxlibs dbus dcron devs dialog dosfstools e2fsprogs ed eject elvis etc file findutils floppy gawk gdisk genpower gettext getty-ps glibc-solibs glibc-zoneinfo gpm grep gzip hdparm infozip inotify-tools jfsutils kbd kernel-firmware kernel-generic kernel-huge kernel-modules less lha libcgroup lilo logrotate lrzip lvm2 mcelog mdadm minicom mkinitrd module-init-tools mt-st mtx ncompress ntfs-3g openssl-solibs patch pciutils pcmciautils pkgtools procps quota reiserfsprogs rpm2tgz sdparm sed shadow sharutils slocate smartmontools splitvt sysfsutils sysklogd syslinux sysvinit sysvinit-functions sysvinit-scripts tar tcsh time tree udev unarj usb_modeswitch usbutils utempter util-linux which xfsprogs xz zoo \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -120,7 +125,7 @@ aaa_base aaa_elflibs aaa_terminfo acl acpid apmd attr bash bin bzip2 coreutils c
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-aaa_base aaa_elflibs aaa_terminfo acl acpid apmd attr bash bin bzip2 coreutils cpio cpufrequtils cryptsetup cups cxxlibs dbus dcron devs dialog dosfstools e2fsprogs ed eject elvis etc file findutils floppy gawk genpower gettext getty-ps glibc-solibs glibc-zoneinfo gpm grep gzip hdparm infozip inotify-tools jfsutils kbd kernel-firmware kernel-generic kernel-huge kernel-modules less lha lilo logrotate lvm2 mdadm minicom mkinitrd module-init-tools mt-st mtx ncompress ntfs-3g openssl-solibs patch pciutils pcmciautils pkgtools procps quota reiserfsprogs rpm2tgz sdparm sed shadow sharutils slocate smartmontools splitvt sysfsutils sysklogd syslinux sysvinit sysvinit-functions sysvinit-scripts tar tcsh time tree udev unarj usb_modeswitch usbutils utempter util-linux-ng which xfsprogs xz zoo \
+aaa_base aaa_elflibs aaa_terminfo acl acpid apmd attr bash bin btrfs-progs bzip2 coreutils cpio cpufrequtils cryptsetup cups cxxlibs dbus dcron devs dialog dosfstools e2fsprogs ed eject elvis etc file findutils floppy gawk gdisk genpower gettext getty-ps glibc-solibs glibc-zoneinfo gpm grep gzip hdparm infozip inotify-tools jfsutils kbd kernel-firmware kernel-generic kernel-huge kernel-modules less lha libcgroup lilo logrotate lrzip lvm2 mcelog mdadm minicom mkinitrd module-init-tools mt-st mtx ncompress ntfs-3g openssl-solibs patch pciutils pcmciautils pkgtools procps quota reiserfsprogs rpm2tgz sdparm sed shadow sharutils slocate smartmontools splitvt sysfsutils sysklogd syslinux sysvinit sysvinit-functions sysvinit-scripts tar tcsh time tree udev unarj usb_modeswitch usbutils utempter util-linux which xfsprogs xz zoo \
  ; do
  if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
diff --git a/slackware64/a/tagfile b/slackware64/a/tagfile
index 2e679f7c..b141c13c 100644
--- a/slackware64/a/tagfile
+++ b/slackware64/a/tagfile
@@ -7,6 +7,7 @@ apmd:REC
 attr:ADD
 bash:ADD
 bin:ADD
+btrfs-progs:REC
 bzip2:ADD
 coreutils:ADD
 cpio:ADD
@@ -28,6 +29,7 @@ file:REC
 findutils:ADD
 floppy:ADD
 gawk:ADD
+gdisk:ADD
 genpower:OPT
 gettext:REC
 getty-ps:OPT
@@ -47,9 +49,12 @@ kernel-huge:ADD
 kernel-modules:ADD
 less:ADD
 lha:REC
+libcgroup:REC
 lilo:ADD
 logrotate:ADD
+lrzip:OPT
 lvm2:REC
+mcelog:REC
 mdadm:OPT
 minicom:REC
 mkinitrd:REC
@@ -89,7 +94,7 @@ unarj:REC
 usb_modeswitch:ADD
 usbutils:ADD
 utempter:REC
-util-linux-ng:ADD
+util-linux:ADD
 which:REC
 xfsprogs:OPT
 xz:ADD
diff --git a/slackware64/ap/maketag b/slackware64/ap/maketag
index 9f9d8e97..e8698bae 100644
--- a/slackware64/ap/maketag
+++ b/slackware64/ap/maketag
@@ -24,6 +24,7 @@ done." 22 72 12 \
 "cdrdao" "Tool for burning audio CDRs" "on" \
 "cdrtools" "CD-R/RW mastering/burning tools" "on" \
 "dc3dd" "Enhanced dd for computer forensics" "on" \
+"ddrescue" "Data recovery utility" "on" \
 "diffstat" "Generate diff statistics" "on" \
 "diffutils" "GNU diffutils - find file differences" "on" \
 "dmapi" "Data Management API library for xfsdump" "on" \
@@ -48,10 +49,12 @@ done." 22 72 12 \
 "lm_sensors" "Hardware monitoring package" "on" \
 "lsof" "A tool to list open files" "on" \
 "lsscsi" "Display infomation about SCSI devices" "on" \
+"lxc" "Linux Containers tools" "on" \
 "madplay" "MPEG audio player" "on" \
 "man" "Primary tool for reading online documentation" "on" \
 "man-pages" "Online documentation (requires groff)" "on" \
 "mc" "The Midnight Commander file manager" "on" \
+"moc" "A music player for the console" "on" \
 "most" "A pager, like 'more' or 'less'" "on" \
 "mpg123" "A command-line MP3 player" "on" \
 "mysql" "MySQL database server" "on" \
@@ -84,7 +87,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-a2ps acct alsa-utils amp ash at aumix bc bpe cdparanoia cdrdao cdrtools dc3dd diffstat diffutils dmapi dmidecode dvd+rw-tools enscript flac foomatic-filters ghostscript ghostscript-fonts-std gphoto2 groff gutenprint hplip ispell jed joe jove ksh93 libx86 linuxdoc-tools lm_sensors lsof lsscsi madplay man man-pages mc most mpg123 mysql nano normalize ntfsprogs pm-utils powertop radeontool rexima rpm rzip sc screen seejpeg slackpkg sox sqlite sudo sysstat texinfo vbetool vim vorbis-tools workbone xfsdump zsh \
+a2ps acct alsa-utils amp ash at aumix bc bpe cdparanoia cdrdao cdrtools dc3dd ddrescue diffstat diffutils dmapi dmidecode dvd+rw-tools enscript flac foomatic-filters ghostscript ghostscript-fonts-std gphoto2 groff gutenprint hplip ispell jed joe jove ksh93 libx86 linuxdoc-tools lm_sensors lsof lsscsi lxc madplay man man-pages mc moc most mpg123 mysql nano normalize ntfsprogs pm-utils powertop radeontool rexima rpm rzip sc screen seejpeg slackpkg sox sqlite sudo sysstat texinfo vbetool vim vorbis-tools workbone xfsdump zsh \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -92,7 +95,7 @@ a2ps acct alsa-utils amp ash at aumix bc bpe cdparanoia cdrdao cdrtools dc3dd di
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-a2ps acct alsa-utils amp ash at aumix bc bpe cdparanoia cdrdao cdrtools dc3dd diffstat diffutils dmapi dmidecode dvd+rw-tools enscript flac foomatic-filters ghostscript ghostscript-fonts-std gphoto2 groff gutenprint hplip ispell jed joe jove ksh93 libx86 linuxdoc-tools lm_sensors lsof lsscsi madplay man man-pages mc most mpg123 mysql nano normalize ntfsprogs pm-utils powertop radeontool rexima rpm rzip sc screen seejpeg slackpkg sox sqlite sudo sysstat texinfo vbetool vim vorbis-tools workbone xfsdump zsh \
+a2ps acct alsa-utils amp ash at aumix bc bpe cdparanoia cdrdao cdrtools dc3dd ddrescue diffstat diffutils dmapi dmidecode dvd+rw-tools enscript flac foomatic-filters ghostscript ghostscript-fonts-std gphoto2 groff gutenprint hplip ispell jed joe jove ksh93 libx86 linuxdoc-tools lm_sensors lsof lsscsi lxc madplay man man-pages mc moc most mpg123 mysql nano normalize ntfsprogs pm-utils powertop radeontool rexima rpm rzip sc screen seejpeg slackpkg sox sqlite sudo sysstat texinfo vbetool vim vorbis-tools workbone xfsdump zsh \
  ; do
  if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
diff --git a/slackware64/ap/maketag.ez b/slackware64/ap/maketag.ez
index 9f9d8e97..e8698bae 100644
--- a/slackware64/ap/maketag.ez
+++ b/slackware64/ap/maketag.ez
@@ -24,6 +24,7 @@ done." 22 72 12 \
 "cdrdao" "Tool for burning audio CDRs" "on" \
 "cdrtools" "CD-R/RW mastering/burning tools" "on" \
 "dc3dd" "Enhanced dd for computer forensics" "on" \
+"ddrescue" "Data recovery utility" "on" \
 "diffstat" "Generate diff statistics" "on" \
 "diffutils" "GNU diffutils - find file differences" "on" \
 "dmapi" "Data Management API library for xfsdump" "on" \
@@ -48,10 +49,12 @@ done." 22 72 12 \
 "lm_sensors" "Hardware monitoring package" "on" \
 "lsof" "A tool to list open files" "on" \
 "lsscsi" "Display infomation about SCSI devices" "on" \
+"lxc" "Linux Containers tools" "on" \
 "madplay" "MPEG audio player" "on" \
 "man" "Primary tool for reading online documentation" "on" \
 "man-pages" "Online documentation (requires groff)" "on" \
 "mc" "The Midnight Commander file manager" "on" \
+"moc" "A music player for the console" "on" \
 "most" "A pager, like 'more' or 'less'" "on" \
 "mpg123" "A command-line MP3 player" "on" \
 "mysql" "MySQL database server" "on" \
@@ -84,7 +87,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-a2ps acct alsa-utils amp ash at aumix bc bpe cdparanoia cdrdao cdrtools dc3dd diffstat diffutils dmapi dmidecode dvd+rw-tools enscript flac foomatic-filters ghostscript ghostscript-fonts-std gphoto2 groff gutenprint hplip ispell jed joe jove ksh93 libx86 linuxdoc-tools lm_sensors lsof lsscsi madplay man man-pages mc most mpg123 mysql nano normalize ntfsprogs pm-utils powertop radeontool rexima rpm rzip sc screen seejpeg slackpkg sox sqlite sudo sysstat texinfo vbetool vim vorbis-tools workbone xfsdump zsh \
+a2ps acct alsa-utils amp ash at aumix bc bpe cdparanoia cdrdao cdrtools dc3dd ddrescue diffstat diffutils dmapi dmidecode dvd+rw-tools enscript flac foomatic-filters ghostscript ghostscript-fonts-std gphoto2 groff gutenprint hplip ispell jed joe jove ksh93 libx86 linuxdoc-tools lm_sensors lsof lsscsi lxc madplay man man-pages mc moc most mpg123 mysql nano normalize ntfsprogs pm-utils powertop radeontool rexima rpm rzip sc screen seejpeg slackpkg sox sqlite sudo sysstat texinfo vbetool vim vorbis-tools workbone xfsdump zsh \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -92,7 +95,7 @@ a2ps acct alsa-utils amp ash at aumix bc bpe cdparanoia cdrdao cdrtools dc3dd di
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-a2ps acct alsa-utils amp ash at aumix bc bpe cdparanoia cdrdao cdrtools dc3dd diffstat diffutils dmapi dmidecode dvd+rw-tools enscript flac foomatic-filters ghostscript ghostscript-fonts-std gphoto2 groff gutenprint hplip ispell jed joe jove ksh93 libx86 linuxdoc-tools lm_sensors lsof lsscsi madplay man man-pages mc most mpg123 mysql nano normalize ntfsprogs pm-utils powertop radeontool rexima rpm rzip sc screen seejpeg slackpkg sox sqlite sudo sysstat texinfo vbetool vim vorbis-tools workbone xfsdump zsh \
+a2ps acct alsa-utils amp ash at aumix bc bpe cdparanoia cdrdao cdrtools dc3dd ddrescue diffstat diffutils dmapi dmidecode dvd+rw-tools enscript flac foomatic-filters ghostscript ghostscript-fonts-std gphoto2 groff gutenprint hplip ispell jed joe jove ksh93 libx86 linuxdoc-tools lm_sensors lsof lsscsi lxc madplay man man-pages mc moc most mpg123 mysql nano normalize ntfsprogs pm-utils powertop radeontool rexima rpm rzip sc screen seejpeg slackpkg sox sqlite sudo sysstat texinfo vbetool vim vorbis-tools workbone xfsdump zsh \
  ; do
  if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
diff --git a/slackware64/ap/tagfile b/slackware64/ap/tagfile
index 348135f4..59bcfc28 100644
--- a/slackware64/ap/tagfile
+++ b/slackware64/ap/tagfile
@@ -11,6 +11,7 @@ cdparanoia:OPT
 cdrdao:OPT
 cdrtools:OPT
 dc3dd:OPT
+ddrescue:OPT
 diffstat:REC
 diffutils:REC
 dmapi:REC
@@ -35,10 +36,12 @@ linuxdoc-tools:REC
 lm_sensors:REC
 lsof:OPT
 lsscsi:OPT
+lxc:OPT
 madplay:OPT
 man:ADD
 man-pages:REC
 mc:OPT
+moc:OPT
 most:OPT
 mpg123:OPT
 mysql:OPT
diff --git a/slackware64/d/maketag b/slackware64/d/maketag
index a9148fec..bff74924 100644
--- a/slackware64/d/maketag
+++ b/slackware64/d/maketag
@@ -51,15 +51,17 @@ done." 22 72 12 \
 "python" "An interpreted object-oriented language" "on" \
 "rcs" "GNU revision control system" "on" \
 "ruby" "Interpreted object-oriented script language" "on" \
+"slacktrack" "Tracks a source installation to make a package" "on" \
 "strace" "Traces program execution" "on" \
 "subversion" "Subversion version control system" "on" \
 "swig" "Simplified Wrapper and Interface Generator" "on" \
+"yasm" "The Yasm Modular Assembler" "on" \
 2> $TMP/SeTpkgs
 if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-autoconf automake binutils bison ccache clisp cmake cscope cvs dev86 distcc doxygen flex gcc gcc-g++ gcc-gfortran gcc-gnat gcc-java gcc-objc gdb gettext-tools git gperf guile indent intltool kernel-headers libtool m4 make mercurial nasm oprofile p2c perl pkg-config pmake python rcs ruby strace subversion swig \
+autoconf automake binutils bison ccache clisp cmake cscope cvs dev86 distcc doxygen flex gcc gcc-g++ gcc-gfortran gcc-gnat gcc-java gcc-objc gdb gettext-tools git gperf guile indent intltool kernel-headers libtool m4 make mercurial nasm oprofile p2c perl pkg-config pmake python rcs ruby slacktrack strace subversion swig yasm \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -67,7 +69,7 @@ autoconf automake binutils bison ccache clisp cmake cscope cvs dev86 distcc doxy
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-autoconf automake binutils bison ccache clisp cmake cscope cvs dev86 distcc doxygen flex gcc gcc-g++ gcc-gfortran gcc-gnat gcc-java gcc-objc gdb gettext-tools git gperf guile indent intltool kernel-headers libtool m4 make mercurial nasm oprofile p2c perl pkg-config pmake python rcs ruby strace subversion swig \
+autoconf automake binutils bison ccache clisp cmake cscope cvs dev86 distcc doxygen flex gcc gcc-g++ gcc-gfortran gcc-gnat gcc-java gcc-objc gdb gettext-tools git gperf guile indent intltool kernel-headers libtool m4 make mercurial nasm oprofile p2c perl pkg-config pmake python rcs ruby slacktrack strace subversion swig yasm \
  ; do
  if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
diff --git a/slackware64/d/maketag.ez b/slackware64/d/maketag.ez
index a9148fec..bff74924 100644
--- a/slackware64/d/maketag.ez
+++ b/slackware64/d/maketag.ez
@@ -51,15 +51,17 @@ done." 22 72 12 \
 "python" "An interpreted object-oriented language" "on" \
 "rcs" "GNU revision control system" "on" \
 "ruby" "Interpreted object-oriented script language" "on" \
+"slacktrack" "Tracks a source installation to make a package" "on" \
 "strace" "Traces program execution" "on" \
 "subversion" "Subversion version control system" "on" \
 "swig" "Simplified Wrapper and Interface Generator" "on" \
+"yasm" "The Yasm Modular Assembler" "on" \
 2> $TMP/SeTpkgs
 if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-autoconf automake binutils bison ccache clisp cmake cscope cvs dev86 distcc doxygen flex gcc gcc-g++ gcc-gfortran gcc-gnat gcc-java gcc-objc gdb gettext-tools git gperf guile indent intltool kernel-headers libtool m4 make mercurial nasm oprofile p2c perl pkg-config pmake python rcs ruby strace subversion swig \
+autoconf automake binutils bison ccache clisp cmake cscope cvs dev86 distcc doxygen flex gcc gcc-g++ gcc-gfortran gcc-gnat gcc-java gcc-objc gdb gettext-tools git gperf guile indent intltool kernel-headers libtool m4 make mercurial nasm oprofile p2c perl pkg-config pmake python rcs ruby slacktrack strace subversion swig yasm \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -67,7 +69,7 @@ autoconf automake binutils bison ccache clisp cmake cscope cvs dev86 distcc doxy
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-autoconf automake binutils bison ccache clisp cmake cscope cvs dev86 distcc doxygen flex gcc gcc-g++ gcc-gfortran gcc-gnat gcc-java gcc-objc gdb gettext-tools git gperf guile indent intltool kernel-headers libtool m4 make mercurial nasm oprofile p2c perl pkg-config pmake python rcs ruby strace subversion swig \
+autoconf automake binutils bison ccache clisp cmake cscope cvs dev86 distcc doxygen flex gcc gcc-g++ gcc-gfortran gcc-gnat gcc-java gcc-objc gdb gettext-tools git gperf guile indent intltool kernel-headers libtool m4 make mercurial nasm oprofile p2c perl pkg-config pmake python rcs ruby slacktrack strace subversion swig yasm \
  ; do
  if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
diff --git a/slackware64/d/tagfile b/slackware64/d/tagfile
index 92415a8d..e0c4c302 100644
--- a/slackware64/d/tagfile
+++ b/slackware64/d/tagfile
@@ -38,6 +38,8 @@ pmake:REC
 python:REC
 rcs:REC
 ruby:REC
+slacktrack:REC
 strace:REC
 subversion:OPT
 swig:REC
+yasm:OPT
diff --git a/slackware64/e/maketag b/slackware64/e/maketag
index ea5da8bb..2a2f7439 100644
--- a/slackware64/e/maketag
+++ b/slackware64/e/maketag
@@ -11,7 +11,7 @@ from series E.  Use the UP/DOWN keys to scroll through the list, and \
 the SPACE key to deselect any items you don't want to install.  \
 Press ENTER when you are \
 done." 16 72 6 \
-"emacs" "The GNU Emacs 23.2 system" "on" \
+"emacs" "The GNU Emacs 23.3 system" "on" \
 2> $TMP/SeTpkgs
 if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
diff --git a/slackware64/e/maketag.ez b/slackware64/e/maketag.ez
index ea5da8bb..2a2f7439 100644
--- a/slackware64/e/maketag.ez
+++ b/slackware64/e/maketag.ez
@@ -11,7 +11,7 @@ from series E.  Use the UP/DOWN keys to scroll through the list, and \
 the SPACE key to deselect any items you don't want to install.  \
 Press ENTER when you are \
 done." 16 72 6 \
-"emacs" "The GNU Emacs 23.2 system" "on" \
+"emacs" "The GNU Emacs 23.3 system" "on" \
 2> $TMP/SeTpkgs
 if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
diff --git a/slackware64/k/maketag b/slackware64/k/maketag
index 3e35378f..9f101c59 100644
--- a/slackware64/k/maketag
+++ b/slackware64/k/maketag
@@ -21,7 +21,7 @@ from series K.  Use the UP/DOWN keys to scroll through the list, and \
 the SPACE key to deselect any items you don't want to install.  \
 Press ENTER when you are \
 done." 11 70 1 \
-"kernel-source" "Linux 2.6.33.4 kernel source" "on" \
+"kernel-source" "Linux 2.6.37.6 kernel source" "on" \
 2> $TMP/SeTpkgs
 if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
diff --git a/slackware64/k/maketag.ez b/slackware64/k/maketag.ez
index 3e35378f..9f101c59 100644
--- a/slackware64/k/maketag.ez
+++ b/slackware64/k/maketag.ez
@@ -21,7 +21,7 @@ from series K.  Use the UP/DOWN keys to scroll through the list, and \
 the SPACE key to deselect any items you don't want to install.  \
 Press ENTER when you are \
 done." 11 70 1 \
-"kernel-source" "Linux 2.6.33.4 kernel source" "on" \
+"kernel-source" "Linux 2.6.37.6 kernel source" "on" \
 2> $TMP/SeTpkgs
 if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
diff --git a/slackware64/kde/maketag b/slackware64/kde/maketag
index 03a71bbc..1b82effe 100644
--- a/slackware64/kde/maketag
+++ b/slackware64/kde/maketag
@@ -15,7 +15,6 @@ the list, and the SPACE key to deselect any items you don't want \
 to install.  Press ENTER when you are done." \
 22 72 9 \
 "amarok" "A media player for KDE" "on" \
-"guidance-power-manager" "KDE frontend for HAL's power features" "on" \
 "k3b" "CD/DVD burning app for KDE" "on" \
 "kaudiocreator" "CD ripper and audio encoder" "on" \
 "kdeaccessibility" "KDE accessibility utilities" "on" \
@@ -45,6 +44,7 @@ to install.  Press ENTER when you are done." \
 "konq-plugins" "Plugins to extend Konqueror" "on" \
 "kopete-cryptography" "Crypto support for Kopete Messenger" "on" \
 "ktorrent" "BitTorrent program for KDE" "on" \
+"libktorrent" "KDE BitTorrent library" "on" \
 "oxygen-icons" "Oxygen icon theme" "on" \
 "polkit-kde-1" "KDE polkit authenticator" "on" \
 "polkit-qt-1" "Qt wrapper for the polkit API" "on" \
@@ -54,7 +54,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-amarok guidance-power-manager k3b kaudiocreator kdeaccessibility kdeadmin kdeartwork kdebase kdebase-runtime kdebase-workspace kdebindings kdeedu kdegames kdegraphics kdelibs kdemultimedia kdenetwork kdepim kdepim-runtime kdepimlibs kdeplasma-addons kdesdk kdetoys kdeutils kdevelop kdevplatform kdewebdev koffice konq-plugins kopete-cryptography ktorrent oxygen-icons polkit-kde-1 polkit-qt-1 skanlite \
+amarok k3b kaudiocreator kdeaccessibility kdeadmin kdeartwork kdebase kdebase-runtime kdebase-workspace kdebindings kdeedu kdegames kdegraphics kdelibs kdemultimedia kdenetwork kdepim kdepim-runtime kdepimlibs kdeplasma-addons kdesdk kdetoys kdeutils kdevelop kdevplatform kdewebdev koffice konq-plugins kopete-cryptography ktorrent libktorrent oxygen-icons polkit-kde-1 polkit-qt-1 skanlite \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -62,7 +62,7 @@ amarok guidance-power-manager k3b kaudiocreator kdeaccessibility kdeadmin kdeart
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-amarok guidance-power-manager k3b kaudiocreator kdeaccessibility kdeadmin kdeartwork kdebase kdebase-runtime kdebase-workspace kdebindings kdeedu kdegames kdegraphics kdelibs kdemultimedia kdenetwork kdepim kdepim-runtime kdepimlibs kdeplasma-addons kdesdk kdetoys kdeutils kdevelop kdevplatform kdewebdev koffice konq-plugins kopete-cryptography ktorrent oxygen-icons polkit-kde-1 polkit-qt-1 skanlite \
+amarok k3b kaudiocreator kdeaccessibility kdeadmin kdeartwork kdebase kdebase-runtime kdebase-workspace kdebindings kdeedu kdegames kdegraphics kdelibs kdemultimedia kdenetwork kdepim kdepim-runtime kdepimlibs kdeplasma-addons kdesdk kdetoys kdeutils kdevelop kdevplatform kdewebdev koffice konq-plugins kopete-cryptography ktorrent libktorrent oxygen-icons polkit-kde-1 polkit-qt-1 skanlite \
  ; do
  if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
diff --git a/slackware64/kde/maketag.ez b/slackware64/kde/maketag.ez
index 03a71bbc..1b82effe 100644
--- a/slackware64/kde/maketag.ez
+++ b/slackware64/kde/maketag.ez
@@ -15,7 +15,6 @@ the list, and the SPACE key to deselect any items you don't want \
 to install.  Press ENTER when you are done." \
 22 72 9 \
 "amarok" "A media player for KDE" "on" \
-"guidance-power-manager" "KDE frontend for HAL's power features" "on" \
 "k3b" "CD/DVD burning app for KDE" "on" \
 "kaudiocreator" "CD ripper and audio encoder" "on" \
 "kdeaccessibility" "KDE accessibility utilities" "on" \
@@ -45,6 +44,7 @@ to install.  Press ENTER when you are done." \
 "konq-plugins" "Plugins to extend Konqueror" "on" \
 "kopete-cryptography" "Crypto support for Kopete Messenger" "on" \
 "ktorrent" "BitTorrent program for KDE" "on" \
+"libktorrent" "KDE BitTorrent library" "on" \
 "oxygen-icons" "Oxygen icon theme" "on" \
 "polkit-kde-1" "KDE polkit authenticator" "on" \
 "polkit-qt-1" "Qt wrapper for the polkit API" "on" \
@@ -54,7 +54,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-amarok guidance-power-manager k3b kaudiocreator kdeaccessibility kdeadmin kdeartwork kdebase kdebase-runtime kdebase-workspace kdebindings kdeedu kdegames kdegraphics kdelibs kdemultimedia kdenetwork kdepim kdepim-runtime kdepimlibs kdeplasma-addons kdesdk kdetoys kdeutils kdevelop kdevplatform kdewebdev koffice konq-plugins kopete-cryptography ktorrent oxygen-icons polkit-kde-1 polkit-qt-1 skanlite \
+amarok k3b kaudiocreator kdeaccessibility kdeadmin kdeartwork kdebase kdebase-runtime kdebase-workspace kdebindings kdeedu kdegames kdegraphics kdelibs kdemultimedia kdenetwork kdepim kdepim-runtime kdepimlibs kdeplasma-addons kdesdk kdetoys kdeutils kdevelop kdevplatform kdewebdev koffice konq-plugins kopete-cryptography ktorrent libktorrent oxygen-icons polkit-kde-1 polkit-qt-1 skanlite \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -62,7 +62,7 @@ amarok guidance-power-manager k3b kaudiocreator kdeaccessibility kdeadmin kdeart
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-amarok guidance-power-manager k3b kaudiocreator kdeaccessibility kdeadmin kdeartwork kdebase kdebase-runtime kdebase-workspace kdebindings kdeedu kdegames kdegraphics kdelibs kdemultimedia kdenetwork kdepim kdepim-runtime kdepimlibs kdeplasma-addons kdesdk kdetoys kdeutils kdevelop kdevplatform kdewebdev koffice konq-plugins kopete-cryptography ktorrent oxygen-icons polkit-kde-1 polkit-qt-1 skanlite \
+amarok k3b kaudiocreator kdeaccessibility kdeadmin kdeartwork kdebase kdebase-runtime kdebase-workspace kdebindings kdeedu kdegames kdegraphics kdelibs kdemultimedia kdenetwork kdepim kdepim-runtime kdepimlibs kdeplasma-addons kdesdk kdetoys kdeutils kdevelop kdevplatform kdewebdev koffice konq-plugins kopete-cryptography ktorrent libktorrent oxygen-icons polkit-kde-1 polkit-qt-1 skanlite \
  ; do
  if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
diff --git a/slackware64/kde/tagfile b/slackware64/kde/tagfile
index b16b8ab1..2c776299 100644
--- a/slackware64/kde/tagfile
+++ b/slackware64/kde/tagfile
@@ -1,5 +1,4 @@
 amarok:OPT
-guidance-power-manager:REC
 k3b:OPT
 kaudiocreator:REC
 kdeaccessibility:OPT
@@ -29,6 +28,7 @@ koffice:REC
 konq-plugins:REC
 kopete-cryptography:REC
 ktorrent:REC
+libktorrent:REC
 oxygen-icons:REC
 polkit-kde-1:ADD
 polkit-qt-1:ADD
diff --git a/slackware64/kdei/maketag b/slackware64/kdei/maketag
index 246907ad..af2bc2d8 100644
--- a/slackware64/kdei/maketag
+++ b/slackware64/kdei/maketag
@@ -16,7 +16,6 @@ when you are done." 21 74 12 \
 "kde-l10n-ca" "Catalan language support" "off" \
 "kde-l10n-ca@valencia" "Catalan (Valencian) language support" "on" \
 "kde-l10n-cs" "Czech language support" "off" \
-"kde-l10n-csb" "Kashubian language support" "off" \
 "kde-l10n-da" "Danish language support" "off" \
 "kde-l10n-de" "German language support" "off" \
 "kde-l10n-el" "Greek language support" "off" \
@@ -35,6 +34,7 @@ when you are done." 21 74 12 \
 "kde-l10n-hi" "Hindi language support" "off" \
 "kde-l10n-hr" "Croatian language support" "off" \
 "kde-l10n-hu" "Hungarian language support" "off" \
+"kde-l10n-ia" "Interlingua language support" "on" \
 "kde-l10n-id" "Indonesian language support" "on" \
 "kde-l10n-is" "Icelandic language support" "off" \
 "kde-l10n-it" "Italian language support" "off" \
@@ -45,8 +45,6 @@ when you are done." 21 74 12 \
 "kde-l10n-ko" "Korean language support" "off" \
 "kde-l10n-lt" "Lithuanian language support" "off" \
 "kde-l10n-lv" "Latvian language support" "off" \
-"kde-l10n-mai" "Maithili language support" "off" \
-"kde-l10n-mk" "Macedonian language support" "off" \
 "kde-l10n-ml" "Malayalam language support" "off" \
 "kde-l10n-nb" "Norwegian (Bokmaal) language support" "off" \
 "kde-l10n-nds" "Low Saxon language support" "off" \
@@ -58,12 +56,11 @@ when you are done." 21 74 12 \
 "kde-l10n-pt_BR" "Brazil Portuguese language support" "off" \
 "kde-l10n-ro" "Romanian language support" "off" \
 "kde-l10n-ru" "Russian language support" "off" \
-"kde-l10n-si" "Sinhala language support" "on" \
 "kde-l10n-sk" "Slovak language support" "off" \
 "kde-l10n-sl" "Slovenian language support" "off" \
 "kde-l10n-sr" "Serbian language support" "off" \
 "kde-l10n-sv" "Swedish language support" "off" \
-"kde-l10n-tg" "Tajik language support" "off" \
+"kde-l10n-th" "Thai language support" "off" \
 "kde-l10n-tr" "Turkish language support" "off" \
 "kde-l10n-uk" "Ukrainian language support" "off" \
 "kde-l10n-wa" "Walloon language support" "off" \
@@ -78,9 +75,8 @@ when you are done." 21 74 12 \
 "koffice-l10n-es" "Spanish language support" "off" \
 "koffice-l10n-et" "Estonian language support" "off" \
 "koffice-l10n-fr" "French language support" "off" \
-"koffice-l10n-fy" "Abkhasysk language support" "off" \
 "koffice-l10n-gl" "Galician language support" "off" \
-"koffice-l10n-hne" "Chhattisgarhi language support" "off" \
+"koffice-l10n-hu" "Hungarian language support" "off" \
 "koffice-l10n-it" "Italian language support" "off" \
 "koffice-l10n-ja" "Japanese language support" "off" \
 "koffice-l10n-kk" "Kazakh language support" "off" \
@@ -90,6 +86,7 @@ when you are done." 21 74 12 \
 "koffice-l10n-pl" "Polish language support" "off" \
 "koffice-l10n-pt" "Portuguese language support" "off" \
 "koffice-l10n-pt_BR" "Brazil Portuguese language support" "off" \
+"koffice-l10n-ru" "Russian language support" "off" \
 "koffice-l10n-sv" "Swedish language support" "off" \
 "koffice-l10n-tr" "Turkish language support" "off" \
 "koffice-l10n-uk" "Ukrainian language support" "off" \
@@ -101,7 +98,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-kde-l10n-ar kde-l10n-bg kde-l10n-ca kde-l10n-ca@valencia kde-l10n-cs kde-l10n-csb kde-l10n-da kde-l10n-de kde-l10n-el kde-l10n-en_GB kde-l10n-eo kde-l10n-es kde-l10n-et kde-l10n-eu kde-l10n-fi kde-l10n-fr kde-l10n-fy kde-l10n-ga kde-l10n-gl kde-l10n-gu kde-l10n-he kde-l10n-hi kde-l10n-hr kde-l10n-hu kde-l10n-id kde-l10n-is kde-l10n-it kde-l10n-ja kde-l10n-kk kde-l10n-km kde-l10n-kn kde-l10n-ko kde-l10n-lt kde-l10n-lv kde-l10n-mai kde-l10n-mk kde-l10n-ml kde-l10n-nb kde-l10n-nds kde-l10n-nl kde-l10n-nn kde-l10n-pa kde-l10n-pl kde-l10n-pt kde-l10n-pt_BR kde-l10n-ro kde-l10n-ru kde-l10n-si kde-l10n-sk kde-l10n-sl kde-l10n-sr kde-l10n-sv kde-l10n-tg kde-l10n-tr kde-l10n-uk kde-l10n-wa kde-l10n-zh_CN kde-l10n-zh_TW koffice-l10n-ca koffice-l10n-ca@valencia koffice-l10n-da koffice-l10n-de koffice-l10n-el koffice-l10n-en_GB koffice-l10n-es koffice-l10n-et koffice-l10n-fr koffice-l10n-fy koffice-l10n-gl koffice-l10n-hne koffice-l10n-it koffice-l10n-ja koffice-l10n-kk koffice-l10n-nb koffice-l10n-nds koffice-l10n-nl koffice-l10n-pl koffice-l10n-pt koffice-l10n-pt_BR koffice-l10n-sv koffice-l10n-tr koffice-l10n-uk koffice-l10n-wa koffice-l10n-zh_CN koffice-l10n-zh_TW \
+kde-l10n-ar kde-l10n-bg kde-l10n-ca kde-l10n-ca@valencia kde-l10n-cs kde-l10n-da kde-l10n-de kde-l10n-el kde-l10n-en_GB kde-l10n-eo kde-l10n-es kde-l10n-et kde-l10n-eu kde-l10n-fi kde-l10n-fr kde-l10n-fy kde-l10n-ga kde-l10n-gl kde-l10n-gu kde-l10n-he kde-l10n-hi kde-l10n-hr kde-l10n-hu kde-l10n-ia kde-l10n-id kde-l10n-is kde-l10n-it kde-l10n-ja kde-l10n-kk kde-l10n-km kde-l10n-kn kde-l10n-ko kde-l10n-lt kde-l10n-lv kde-l10n-ml kde-l10n-nb kde-l10n-nds kde-l10n-nl kde-l10n-nn kde-l10n-pa kde-l10n-pl kde-l10n-pt kde-l10n-pt_BR kde-l10n-ro kde-l10n-ru kde-l10n-sk kde-l10n-sl kde-l10n-sr kde-l10n-sv kde-l10n-th kde-l10n-tr kde-l10n-uk kde-l10n-wa kde-l10n-zh_CN kde-l10n-zh_TW koffice-l10n-ca koffice-l10n-ca@valencia koffice-l10n-da koffice-l10n-de koffice-l10n-el koffice-l10n-en_GB koffice-l10n-es koffice-l10n-et koffice-l10n-fr koffice-l10n-gl koffice-l10n-hu koffice-l10n-it koffice-l10n-ja koffice-l10n-kk koffice-l10n-nb koffice-l10n-nds koffice-l10n-nl koffice-l10n-pl koffice-l10n-pt koffice-l10n-pt_BR koffice-l10n-ru koffice-l10n-sv koffice-l10n-tr koffice-l10n-uk koffice-l10n-wa koffice-l10n-zh_CN koffice-l10n-zh_TW \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -109,7 +106,7 @@ kde-l10n-ar kde-l10n-bg kde-l10n-ca kde-l10n-ca@valencia kde-l10n-cs kde-l10n-cs
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-kde-l10n-ar kde-l10n-bg kde-l10n-ca kde-l10n-ca@valencia kde-l10n-cs kde-l10n-csb kde-l10n-da kde-l10n-de kde-l10n-el kde-l10n-en_GB kde-l10n-eo kde-l10n-es kde-l10n-et kde-l10n-eu kde-l10n-fi kde-l10n-fr kde-l10n-fy kde-l10n-ga kde-l10n-gl kde-l10n-gu kde-l10n-he kde-l10n-hi kde-l10n-hr kde-l10n-hu kde-l10n-id kde-l10n-is kde-l10n-it kde-l10n-ja kde-l10n-kk kde-l10n-km kde-l10n-kn kde-l10n-ko kde-l10n-lt kde-l10n-lv kde-l10n-mai kde-l10n-mk kde-l10n-ml kde-l10n-nb kde-l10n-nds kde-l10n-nl kde-l10n-nn kde-l10n-pa kde-l10n-pl kde-l10n-pt kde-l10n-pt_BR kde-l10n-ro kde-l10n-ru kde-l10n-si kde-l10n-sk kde-l10n-sl kde-l10n-sr kde-l10n-sv kde-l10n-tg kde-l10n-tr kde-l10n-uk kde-l10n-wa kde-l10n-zh_CN kde-l10n-zh_TW koffice-l10n-ca koffice-l10n-ca@valencia koffice-l10n-da koffice-l10n-de koffice-l10n-el koffice-l10n-en_GB koffice-l10n-es koffice-l10n-et koffice-l10n-fr koffice-l10n-fy koffice-l10n-gl koffice-l10n-hne koffice-l10n-it koffice-l10n-ja koffice-l10n-kk koffice-l10n-nb koffice-l10n-nds koffice-l10n-nl koffice-l10n-pl koffice-l10n-pt koffice-l10n-pt_BR koffice-l10n-sv koffice-l10n-tr koffice-l10n-uk koffice-l10n-wa koffice-l10n-zh_CN koffice-l10n-zh_TW \
+kde-l10n-ar kde-l10n-bg kde-l10n-ca kde-l10n-ca@valencia kde-l10n-cs kde-l10n-da kde-l10n-de kde-l10n-el kde-l10n-en_GB kde-l10n-eo kde-l10n-es kde-l10n-et kde-l10n-eu kde-l10n-fi kde-l10n-fr kde-l10n-fy kde-l10n-ga kde-l10n-gl kde-l10n-gu kde-l10n-he kde-l10n-hi kde-l10n-hr kde-l10n-hu kde-l10n-ia kde-l10n-id kde-l10n-is kde-l10n-it kde-l10n-ja kde-l10n-kk kde-l10n-km kde-l10n-kn kde-l10n-ko kde-l10n-lt kde-l10n-lv kde-l10n-ml kde-l10n-nb kde-l10n-nds kde-l10n-nl kde-l10n-nn kde-l10n-pa kde-l10n-pl kde-l10n-pt kde-l10n-pt_BR kde-l10n-ro kde-l10n-ru kde-l10n-sk kde-l10n-sl kde-l10n-sr kde-l10n-sv kde-l10n-th kde-l10n-tr kde-l10n-uk kde-l10n-wa kde-l10n-zh_CN kde-l10n-zh_TW koffice-l10n-ca koffice-l10n-ca@valencia koffice-l10n-da koffice-l10n-de koffice-l10n-el koffice-l10n-en_GB koffice-l10n-es koffice-l10n-et koffice-l10n-fr koffice-l10n-gl koffice-l10n-hu koffice-l10n-it koffice-l10n-ja koffice-l10n-kk koffice-l10n-nb koffice-l10n-nds koffice-l10n-nl koffice-l10n-pl koffice-l10n-pt koffice-l10n-pt_BR koffice-l10n-ru koffice-l10n-sv koffice-l10n-tr koffice-l10n-uk koffice-l10n-wa koffice-l10n-zh_CN koffice-l10n-zh_TW \
  ; do
  if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
diff --git a/slackware64/kdei/maketag.ez b/slackware64/kdei/maketag.ez
index 246907ad..af2bc2d8 100644
--- a/slackware64/kdei/maketag.ez
+++ b/slackware64/kdei/maketag.ez
@@ -16,7 +16,6 @@ when you are done." 21 74 12 \
 "kde-l10n-ca" "Catalan language support" "off" \
 "kde-l10n-ca@valencia" "Catalan (Valencian) language support" "on" \
 "kde-l10n-cs" "Czech language support" "off" \
-"kde-l10n-csb" "Kashubian language support" "off" \
 "kde-l10n-da" "Danish language support" "off" \
 "kde-l10n-de" "German language support" "off" \
 "kde-l10n-el" "Greek language support" "off" \
@@ -35,6 +34,7 @@ when you are done." 21 74 12 \
 "kde-l10n-hi" "Hindi language support" "off" \
 "kde-l10n-hr" "Croatian language support" "off" \
 "kde-l10n-hu" "Hungarian language support" "off" \
+"kde-l10n-ia" "Interlingua language support" "on" \
 "kde-l10n-id" "Indonesian language support" "on" \
 "kde-l10n-is" "Icelandic language support" "off" \
 "kde-l10n-it" "Italian language support" "off" \
@@ -45,8 +45,6 @@ when you are done." 21 74 12 \
 "kde-l10n-ko" "Korean language support" "off" \
 "kde-l10n-lt" "Lithuanian language support" "off" \
 "kde-l10n-lv" "Latvian language support" "off" \
-"kde-l10n-mai" "Maithili language support" "off" \
-"kde-l10n-mk" "Macedonian language support" "off" \
 "kde-l10n-ml" "Malayalam language support" "off" \
 "kde-l10n-nb" "Norwegian (Bokmaal) language support" "off" \
 "kde-l10n-nds" "Low Saxon language support" "off" \
@@ -58,12 +56,11 @@ when you are done." 21 74 12 \
 "kde-l10n-pt_BR" "Brazil Portuguese language support" "off" \
 "kde-l10n-ro" "Romanian language support" "off" \
 "kde-l10n-ru" "Russian language support" "off" \
-"kde-l10n-si" "Sinhala language support" "on" \
 "kde-l10n-sk" "Slovak language support" "off" \
 "kde-l10n-sl" "Slovenian language support" "off" \
 "kde-l10n-sr" "Serbian language support" "off" \
 "kde-l10n-sv" "Swedish language support" "off" \
-"kde-l10n-tg" "Tajik language support" "off" \
+"kde-l10n-th" "Thai language support" "off" \
 "kde-l10n-tr" "Turkish language support" "off" \
 "kde-l10n-uk" "Ukrainian language support" "off" \
 "kde-l10n-wa" "Walloon language support" "off" \
@@ -78,9 +75,8 @@ when you are done." 21 74 12 \
 "koffice-l10n-es" "Spanish language support" "off" \
 "koffice-l10n-et" "Estonian language support" "off" \
 "koffice-l10n-fr" "French language support" "off" \
-"koffice-l10n-fy" "Abkhasysk language support" "off" \
 "koffice-l10n-gl" "Galician language support" "off" \
-"koffice-l10n-hne" "Chhattisgarhi language support" "off" \
+"koffice-l10n-hu" "Hungarian language support" "off" \
 "koffice-l10n-it" "Italian language support" "off" \
 "koffice-l10n-ja" "Japanese language support" "off" \
 "koffice-l10n-kk" "Kazakh language support" "off" \
@@ -90,6 +86,7 @@ when you are done." 21 74 12 \
 "koffice-l10n-pl" "Polish language support" "off" \
 "koffice-l10n-pt" "Portuguese language support" "off" \
 "koffice-l10n-pt_BR" "Brazil Portuguese language support" "off" \
+"koffice-l10n-ru" "Russian language support" "off" \
 "koffice-l10n-sv" "Swedish language support" "off" \
 "koffice-l10n-tr" "Turkish language support" "off" \
 "koffice-l10n-uk" "Ukrainian language support" "off" \
@@ -101,7 +98,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-kde-l10n-ar kde-l10n-bg kde-l10n-ca kde-l10n-ca@valencia kde-l10n-cs kde-l10n-csb kde-l10n-da kde-l10n-de kde-l10n-el kde-l10n-en_GB kde-l10n-eo kde-l10n-es kde-l10n-et kde-l10n-eu kde-l10n-fi kde-l10n-fr kde-l10n-fy kde-l10n-ga kde-l10n-gl kde-l10n-gu kde-l10n-he kde-l10n-hi kde-l10n-hr kde-l10n-hu kde-l10n-id kde-l10n-is kde-l10n-it kde-l10n-ja kde-l10n-kk kde-l10n-km kde-l10n-kn kde-l10n-ko kde-l10n-lt kde-l10n-lv kde-l10n-mai kde-l10n-mk kde-l10n-ml kde-l10n-nb kde-l10n-nds kde-l10n-nl kde-l10n-nn kde-l10n-pa kde-l10n-pl kde-l10n-pt kde-l10n-pt_BR kde-l10n-ro kde-l10n-ru kde-l10n-si kde-l10n-sk kde-l10n-sl kde-l10n-sr kde-l10n-sv kde-l10n-tg kde-l10n-tr kde-l10n-uk kde-l10n-wa kde-l10n-zh_CN kde-l10n-zh_TW koffice-l10n-ca koffice-l10n-ca@valencia koffice-l10n-da koffice-l10n-de koffice-l10n-el koffice-l10n-en_GB koffice-l10n-es koffice-l10n-et koffice-l10n-fr koffice-l10n-fy koffice-l10n-gl koffice-l10n-hne koffice-l10n-it koffice-l10n-ja koffice-l10n-kk koffice-l10n-nb koffice-l10n-nds koffice-l10n-nl koffice-l10n-pl koffice-l10n-pt koffice-l10n-pt_BR koffice-l10n-sv koffice-l10n-tr koffice-l10n-uk koffice-l10n-wa koffice-l10n-zh_CN koffice-l10n-zh_TW \
+kde-l10n-ar kde-l10n-bg kde-l10n-ca kde-l10n-ca@valencia kde-l10n-cs kde-l10n-da kde-l10n-de kde-l10n-el kde-l10n-en_GB kde-l10n-eo kde-l10n-es kde-l10n-et kde-l10n-eu kde-l10n-fi kde-l10n-fr kde-l10n-fy kde-l10n-ga kde-l10n-gl kde-l10n-gu kde-l10n-he kde-l10n-hi kde-l10n-hr kde-l10n-hu kde-l10n-ia kde-l10n-id kde-l10n-is kde-l10n-it kde-l10n-ja kde-l10n-kk kde-l10n-km kde-l10n-kn kde-l10n-ko kde-l10n-lt kde-l10n-lv kde-l10n-ml kde-l10n-nb kde-l10n-nds kde-l10n-nl kde-l10n-nn kde-l10n-pa kde-l10n-pl kde-l10n-pt kde-l10n-pt_BR kde-l10n-ro kde-l10n-ru kde-l10n-sk kde-l10n-sl kde-l10n-sr kde-l10n-sv kde-l10n-th kde-l10n-tr kde-l10n-uk kde-l10n-wa kde-l10n-zh_CN kde-l10n-zh_TW koffice-l10n-ca koffice-l10n-ca@valencia koffice-l10n-da koffice-l10n-de koffice-l10n-el koffice-l10n-en_GB koffice-l10n-es koffice-l10n-et koffice-l10n-fr koffice-l10n-gl koffice-l10n-hu koffice-l10n-it koffice-l10n-ja koffice-l10n-kk koffice-l10n-nb koffice-l10n-nds koffice-l10n-nl koffice-l10n-pl koffice-l10n-pt koffice-l10n-pt_BR koffice-l10n-ru koffice-l10n-sv koffice-l10n-tr koffice-l10n-uk koffice-l10n-wa koffice-l10n-zh_CN koffice-l10n-zh_TW \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -109,7 +106,7 @@ kde-l10n-ar kde-l10n-bg kde-l10n-ca kde-l10n-ca@valencia kde-l10n-cs kde-l10n-cs
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-kde-l10n-ar kde-l10n-bg kde-l10n-ca kde-l10n-ca@valencia kde-l10n-cs kde-l10n-csb kde-l10n-da kde-l10n-de kde-l10n-el kde-l10n-en_GB kde-l10n-eo kde-l10n-es kde-l10n-et kde-l10n-eu kde-l10n-fi kde-l10n-fr kde-l10n-fy kde-l10n-ga kde-l10n-gl kde-l10n-gu kde-l10n-he kde-l10n-hi kde-l10n-hr kde-l10n-hu kde-l10n-id kde-l10n-is kde-l10n-it kde-l10n-ja kde-l10n-kk kde-l10n-km kde-l10n-kn kde-l10n-ko kde-l10n-lt kde-l10n-lv kde-l10n-mai kde-l10n-mk kde-l10n-ml kde-l10n-nb kde-l10n-nds kde-l10n-nl kde-l10n-nn kde-l10n-pa kde-l10n-pl kde-l10n-pt kde-l10n-pt_BR kde-l10n-ro kde-l10n-ru kde-l10n-si kde-l10n-sk kde-l10n-sl kde-l10n-sr kde-l10n-sv kde-l10n-tg kde-l10n-tr kde-l10n-uk kde-l10n-wa kde-l10n-zh_CN kde-l10n-zh_TW koffice-l10n-ca koffice-l10n-ca@valencia koffice-l10n-da koffice-l10n-de koffice-l10n-el koffice-l10n-en_GB koffice-l10n-es koffice-l10n-et koffice-l10n-fr koffice-l10n-fy koffice-l10n-gl koffice-l10n-hne koffice-l10n-it koffice-l10n-ja koffice-l10n-kk koffice-l10n-nb koffice-l10n-nds koffice-l10n-nl koffice-l10n-pl koffice-l10n-pt koffice-l10n-pt_BR koffice-l10n-sv koffice-l10n-tr koffice-l10n-uk koffice-l10n-wa koffice-l10n-zh_CN koffice-l10n-zh_TW \
+kde-l10n-ar kde-l10n-bg kde-l10n-ca kde-l10n-ca@valencia kde-l10n-cs kde-l10n-da kde-l10n-de kde-l10n-el kde-l10n-en_GB kde-l10n-eo kde-l10n-es kde-l10n-et kde-l10n-eu kde-l10n-fi kde-l10n-fr kde-l10n-fy kde-l10n-ga kde-l10n-gl kde-l10n-gu kde-l10n-he kde-l10n-hi kde-l10n-hr kde-l10n-hu kde-l10n-ia kde-l10n-id kde-l10n-is kde-l10n-it kde-l10n-ja kde-l10n-kk kde-l10n-km kde-l10n-kn kde-l10n-ko kde-l10n-lt kde-l10n-lv kde-l10n-ml kde-l10n-nb kde-l10n-nds kde-l10n-nl kde-l10n-nn kde-l10n-pa kde-l10n-pl kde-l10n-pt kde-l10n-pt_BR kde-l10n-ro kde-l10n-ru kde-l10n-sk kde-l10n-sl kde-l10n-sr kde-l10n-sv kde-l10n-th kde-l10n-tr kde-l10n-uk kde-l10n-wa kde-l10n-zh_CN kde-l10n-zh_TW koffice-l10n-ca koffice-l10n-ca@valencia koffice-l10n-da koffice-l10n-de koffice-l10n-el koffice-l10n-en_GB koffice-l10n-es koffice-l10n-et koffice-l10n-fr koffice-l10n-gl koffice-l10n-hu koffice-l10n-it koffice-l10n-ja koffice-l10n-kk koffice-l10n-nb koffice-l10n-nds koffice-l10n-nl koffice-l10n-pl koffice-l10n-pt koffice-l10n-pt_BR koffice-l10n-ru koffice-l10n-sv koffice-l10n-tr koffice-l10n-uk koffice-l10n-wa koffice-l10n-zh_CN koffice-l10n-zh_TW \
  ; do
  if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
diff --git a/slackware64/kdei/tagfile b/slackware64/kdei/tagfile
index 0af65d55..a469d4ae 100644
--- a/slackware64/kdei/tagfile
+++ b/slackware64/kdei/tagfile
@@ -1,9 +1,8 @@
 kde-l10n-ar:OPT
 kde-l10n-bg:OPT
 kde-l10n-ca:OPT
-kde-l10n-ca@valencia:ADD
+kde-l10n-ca@valencia:OPT
 kde-l10n-cs:OPT
-kde-l10n-csb:OPT
 kde-l10n-da:OPT
 kde-l10n-de:OPT
 kde-l10n-el:OPT
@@ -22,7 +21,8 @@ kde-l10n-he:OPT
 kde-l10n-hi:OPT
 kde-l10n-hr:OPT
 kde-l10n-hu:OPT
-kde-l10n-id:ADD
+kde-l10n-ia:OPT
+kde-l10n-id:OPT
 kde-l10n-is:OPT
 kde-l10n-it:OPT
 kde-l10n-ja:OPT
@@ -32,8 +32,6 @@ kde-l10n-kn:OPT
 kde-l10n-ko:OPT
 kde-l10n-lt:OPT
 kde-l10n-lv:OPT
-kde-l10n-mai:OPT
-kde-l10n-mk:OPT
 kde-l10n-ml:OPT
 kde-l10n-nb:OPT
 kde-l10n-nds:OPT
@@ -45,12 +43,11 @@ kde-l10n-pt:OPT
 kde-l10n-pt_BR:OPT
 kde-l10n-ro:OPT
 kde-l10n-ru:OPT
-kde-l10n-si:ADD
 kde-l10n-sk:OPT
 kde-l10n-sl:OPT
 kde-l10n-sr:OPT
 kde-l10n-sv:OPT
-kde-l10n-tg:OPT
+kde-l10n-th:OPT
 kde-l10n-tr:OPT
 kde-l10n-uk:OPT
 kde-l10n-wa:OPT
@@ -65,9 +62,8 @@ koffice-l10n-en_GB:OPT
 koffice-l10n-es:OPT
 koffice-l10n-et:OPT
 koffice-l10n-fr:OPT
-koffice-l10n-fy:OPT
 koffice-l10n-gl:OPT
-koffice-l10n-hne:OPT
+koffice-l10n-hu:OPT
 koffice-l10n-it:OPT
 koffice-l10n-ja:OPT
 koffice-l10n-kk:OPT
@@ -77,6 +73,7 @@ koffice-l10n-nl:OPT
 koffice-l10n-pl:OPT
 koffice-l10n-pt:OPT
 koffice-l10n-pt_BR:OPT
+koffice-l10n-ru:OPT
 koffice-l10n-sv:OPT
 koffice-l10n-tr:OPT
 koffice-l10n-uk:OPT
diff --git a/slackware64/l/maketag b/slackware64/l/maketag
index ccbdee96..0483f961 100644
--- a/slackware64/l/maketag
+++ b/slackware64/l/maketag
@@ -41,7 +41,6 @@ you are done." 22 74 10 \
 "desktop-file-utils" "Tools for .desktop files" "on" \
 "djvulibre" "Web-centric document and image format" "on" \
 "ebook-tools" "Tools for ebook file formats" "on" \
-"eggdbus" "D-Bus bindings for GObject" "on" \
 "eigen2" "C++ math library" "on" \
 "enchant" "A wrapper for spellcheck libraries" "on" \
 "esound" "Enlightened Sound Daemon" "on" \
@@ -54,6 +53,7 @@ you are done." 22 74 10 \
 "gamin" "a minimalist FAM replacement" "on" \
 "gd" "A graphics library" "on" \
 "gdbm" "The GNU gdbm database library" "on" \
+"gdk-pixbuf2" "Image library used by GTK+2" "on" \
 "gegl" "Generic Graphics Library" "on" \
 "giflib" "GIF image library" "on" \
 "glib" "Support library used by GTK+" "on" \
@@ -91,8 +91,10 @@ you are done." 22 74 10 \
 "libcap" "POSIX capabilities library" "on" \
 "libcddb" "online CD database lookup library" "on" \
 "libcdio" "GNU CD I/O library" "on" \
+"libdbusmenu-qt" "Allows Qt/KDE apps to use DBus for menus" "on" \
 "libdiscid" "Library to generate DiscIDs from audio CDs" "on" \
 "libdvdread" "Library for reading DVDs" "on" \
+"libelf" "ELF object file access library" "on" \
 "libexif" "EXIF (image information) library" "on" \
 "libglade" "An interface construction library" "on" \
 "libgphoto2" "A library for accessing digital cameras" "on" \
@@ -112,17 +114,22 @@ you are done." 22 74 10 \
 "libmcs" "Manages configuration settings" "on" \
 "libmng" "Multiple-image Network Graphics library" "on" \
 "libmowgli" "A collection of programming routines." "on" \
+"libmpc" "Multiple Precision Complex Library" "on" \
 "libmsn" "MSN Messenger protocol implementation" "on" \
 "libmtp" "MTP media device support library" "on" \
 "libnjb" "Creative Nomad and related device library" "on" \
 "libnl" "Netlink socket library" "on" \
 "libnotify" "A library for event notification" "on" \
 "libogg" "Ogg Bitstream library" "on" \
+"liboggz" "Ogg inspect/edit/validate library" "on" \
 "liboil" "CPU optimizations library" "on" \
+"libpcap" "Packet Capture library" "on" \
+"libplist" "Apple Binary and XML Property Lists library" "on" \
 "libpng" "Portable Network Graphics library" "on" \
 "libraw1394" "User space IEEE 1394 driver" "on" \
 "librsvg" "Scalable Vector Graphics library" "on" \
 "libsamplerate" "Digital audio resampling library" "on" \
+"libsndfile" "A library for handling digital audio files" "on" \
 "libspectre" "Ghostscript wrapper library" "on" \
 "libtermcap" "GNU terminal control library" "on" \
 "libtheora" "Theora video codec library" "on" \
@@ -154,6 +161,7 @@ you are done." 22 74 10 \
 "parted" "GNU parted, a partition manipulation program" "on" \
 "pcre" "Perl-compatible regular expression library" "on" \
 "phonon" "Multimedia framework for KDE4" "on" \
+"phonon-mplayer" "MPlayer backend for Phonon" "on" \
 "pil" "Python Imaging Library" "on" \
 "pilot-link" "PalmOS communication library" "on" \
 "polkit" "Authentication policy framework" "on" \
@@ -206,7 +214,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-ConsoleKit M2Crypto PyQt QScintilla aalib akonadi alsa-lib alsa-oss apr apr-util aspell aspell-en atk attica audiofile automoc4 babl boost cairo chmlib clucene db42 db44 dbus-glib dbus-python desktop-file-utils djvulibre ebook-tools eggdbus eigen2 enchant esound exiv2 expat fftw freetype fribidi fuse gamin gd gdbm gegl giflib glib glib2 glibc glibc-i18n glibc-profile gmime gmm gmp gnome-icon-theme gst-plugins-base gst-plugins-good gstreamer gtk+ gtk+2 gtkspell hal hal-info hicolor-icon-theme hunspell icon-naming-utils ilmbase imlib iso-codes jasper jre lcms lesstif libaio libao libarchive libart_lgpl libcaca libcap libcddb libcdio libdiscid libdvdread libexif libglade libgphoto2 libgpod libgsf libical libid3tag libidl libidn libieee1284 libiodbc libjpeg libkarma liblastfm libmad libmcrypt libmcs libmng libmowgli libmsn libmtp libnjb libnl libnotify libogg liboil libpng libraw1394 librsvg libsamplerate libspectre libtermcap libtheora libtiff libusb libvisual libvisual-plugins libvncserver libvorbis libwmf libwmf-docs libwnck libwpd libxklavier libxml2 libxslt libzip loudmouth lzo mhash mm mpfr ncurses neon netpbm notify-python openexr pango parted pcre phonon pil pilot-link polkit polkit-gnome poppler poppler-data popt pycairo pycups pygobject pygtk pyrex qca qca-cyrus-sasl qca-gnupg qca-ossl qimageblitz qt qtscriptgenerator raptor rasqal readline redland sdl seamonkey-solibs shared-desktop-ontologies shared-mime-info sip slang slang1 soprano startup-notification strigi svgalib system-config-printer t1lib taglib taglib-extras tango-icon-theme tango-icon-theme-extras urwid v4l-utils virtuoso-ose vte wavpack wv2 zlib \
+ConsoleKit M2Crypto PyQt QScintilla aalib akonadi alsa-lib alsa-oss apr apr-util aspell aspell-en atk attica audiofile automoc4 babl boost cairo chmlib clucene db42 db44 dbus-glib dbus-python desktop-file-utils djvulibre ebook-tools eigen2 enchant esound exiv2 expat fftw freetype fribidi fuse gamin gd gdbm gdk-pixbuf2 gegl giflib glib glib2 glibc glibc-i18n glibc-profile gmime gmm gmp gnome-icon-theme gst-plugins-base gst-plugins-good gstreamer gtk+ gtk+2 gtkspell hal hal-info hicolor-icon-theme hunspell icon-naming-utils ilmbase imlib iso-codes jasper jre lcms lesstif libaio libao libarchive libart_lgpl libcaca libcap libcddb libcdio libdbusmenu-qt libdiscid libdvdread libelf libexif libglade libgphoto2 libgpod libgsf libical libid3tag libidl libidn libieee1284 libiodbc libjpeg libkarma liblastfm libmad libmcrypt libmcs libmng libmowgli libmpc libmsn libmtp libnjb libnl libnotify libogg liboggz liboil libpcap libplist libpng libraw1394 librsvg libsamplerate libsndfile libspectre libtermcap libtheora libtiff libusb libvisual libvisual-plugins libvncserver libvorbis libwmf libwmf-docs libwnck libwpd libxklavier libxml2 libxslt libzip loudmouth lzo mhash mm mpfr ncurses neon netpbm notify-python openexr pango parted pcre phonon phonon-mplayer pil pilot-link polkit polkit-gnome poppler poppler-data popt pycairo pycups pygobject pygtk pyrex qca qca-cyrus-sasl qca-gnupg qca-ossl qimageblitz qt qtscriptgenerator raptor rasqal readline redland sdl seamonkey-solibs shared-desktop-ontologies shared-mime-info sip slang slang1 soprano startup-notification strigi svgalib system-config-printer t1lib taglib taglib-extras tango-icon-theme tango-icon-theme-extras urwid v4l-utils virtuoso-ose vte wavpack wv2 zlib \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -214,7 +222,7 @@ ConsoleKit M2Crypto PyQt QScintilla aalib akonadi alsa-lib alsa-oss apr apr-util
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-ConsoleKit M2Crypto PyQt QScintilla aalib akonadi alsa-lib alsa-oss apr apr-util aspell aspell-en atk attica audiofile automoc4 babl boost cairo chmlib clucene db42 db44 dbus-glib dbus-python desktop-file-utils djvulibre ebook-tools eggdbus eigen2 enchant esound exiv2 expat fftw freetype fribidi fuse gamin gd gdbm gegl giflib glib glib2 glibc glibc-i18n glibc-profile gmime gmm gmp gnome-icon-theme gst-plugins-base gst-plugins-good gstreamer gtk+ gtk+2 gtkspell hal hal-info hicolor-icon-theme hunspell icon-naming-utils ilmbase imlib iso-codes jasper jre lcms lesstif libaio libao libarchive libart_lgpl libcaca libcap libcddb libcdio libdiscid libdvdread libexif libglade libgphoto2 libgpod libgsf libical libid3tag libidl libidn libieee1284 libiodbc libjpeg libkarma liblastfm libmad libmcrypt libmcs libmng libmowgli libmsn libmtp libnjb libnl libnotify libogg liboil libpng libraw1394 librsvg libsamplerate libspectre libtermcap libtheora libtiff libusb libvisual libvisual-plugins libvncserver libvorbis libwmf libwmf-docs libwnck libwpd libxklavier libxml2 libxslt libzip loudmouth lzo mhash mm mpfr ncurses neon netpbm notify-python openexr pango parted pcre phonon pil pilot-link polkit polkit-gnome poppler poppler-data popt pycairo pycups pygobject pygtk pyrex qca qca-cyrus-sasl qca-gnupg qca-ossl qimageblitz qt qtscriptgenerator raptor rasqal readline redland sdl seamonkey-solibs shared-desktop-ontologies shared-mime-info sip slang slang1 soprano startup-notification strigi svgalib system-config-printer t1lib taglib taglib-extras tango-icon-theme tango-icon-theme-extras urwid v4l-utils virtuoso-ose vte wavpack wv2 zlib \
+ConsoleKit M2Crypto PyQt QScintilla aalib akonadi alsa-lib alsa-oss apr apr-util aspell aspell-en atk attica audiofile automoc4 babl boost cairo chmlib clucene db42 db44 dbus-glib dbus-python desktop-file-utils djvulibre ebook-tools eigen2 enchant esound exiv2 expat fftw freetype fribidi fuse gamin gd gdbm gdk-pixbuf2 gegl giflib glib glib2 glibc glibc-i18n glibc-profile gmime gmm gmp gnome-icon-theme gst-plugins-base gst-plugins-good gstreamer gtk+ gtk+2 gtkspell hal hal-info hicolor-icon-theme hunspell icon-naming-utils ilmbase imlib iso-codes jasper jre lcms lesstif libaio libao libarchive libart_lgpl libcaca libcap libcddb libcdio libdbusmenu-qt libdiscid libdvdread libelf libexif libglade libgphoto2 libgpod libgsf libical libid3tag libidl libidn libieee1284 libiodbc libjpeg libkarma liblastfm libmad libmcrypt libmcs libmng libmowgli libmpc libmsn libmtp libnjb libnl libnotify libogg liboggz liboil libpcap libplist libpng libraw1394 librsvg libsamplerate libsndfile libspectre libtermcap libtheora libtiff libusb libvisual libvisual-plugins libvncserver libvorbis libwmf libwmf-docs libwnck libwpd libxklavier libxml2 libxslt libzip loudmouth lzo mhash mm mpfr ncurses neon netpbm notify-python openexr pango parted pcre phonon phonon-mplayer pil pilot-link polkit polkit-gnome poppler poppler-data popt pycairo pycups pygobject pygtk pyrex qca qca-cyrus-sasl qca-gnupg qca-ossl qimageblitz qt qtscriptgenerator raptor rasqal readline redland sdl seamonkey-solibs shared-desktop-ontologies shared-mime-info sip slang slang1 soprano startup-notification strigi svgalib system-config-printer t1lib taglib taglib-extras tango-icon-theme tango-icon-theme-extras urwid v4l-utils virtuoso-ose vte wavpack wv2 zlib \
  ; do
  if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
diff --git a/slackware64/l/maketag.ez b/slackware64/l/maketag.ez
index ccbdee96..0483f961 100644
--- a/slackware64/l/maketag.ez
+++ b/slackware64/l/maketag.ez
@@ -41,7 +41,6 @@ you are done." 22 74 10 \
 "desktop-file-utils" "Tools for .desktop files" "on" \
 "djvulibre" "Web-centric document and image format" "on" \
 "ebook-tools" "Tools for ebook file formats" "on" \
-"eggdbus" "D-Bus bindings for GObject" "on" \
 "eigen2" "C++ math library" "on" \
 "enchant" "A wrapper for spellcheck libraries" "on" \
 "esound" "Enlightened Sound Daemon" "on" \
@@ -54,6 +53,7 @@ you are done." 22 74 10 \
 "gamin" "a minimalist FAM replacement" "on" \
 "gd" "A graphics library" "on" \
 "gdbm" "The GNU gdbm database library" "on" \
+"gdk-pixbuf2" "Image library used by GTK+2" "on" \
 "gegl" "Generic Graphics Library" "on" \
 "giflib" "GIF image library" "on" \
 "glib" "Support library used by GTK+" "on" \
@@ -91,8 +91,10 @@ you are done." 22 74 10 \
 "libcap" "POSIX capabilities library" "on" \
 "libcddb" "online CD database lookup library" "on" \
 "libcdio" "GNU CD I/O library" "on" \
+"libdbusmenu-qt" "Allows Qt/KDE apps to use DBus for menus" "on" \
 "libdiscid" "Library to generate DiscIDs from audio CDs" "on" \
 "libdvdread" "Library for reading DVDs" "on" \
+"libelf" "ELF object file access library" "on" \
 "libexif" "EXIF (image information) library" "on" \
 "libglade" "An interface construction library" "on" \
 "libgphoto2" "A library for accessing digital cameras" "on" \
@@ -112,17 +114,22 @@ you are done." 22 74 10 \
 "libmcs" "Manages configuration settings" "on" \
 "libmng" "Multiple-image Network Graphics library" "on" \
 "libmowgli" "A collection of programming routines." "on" \
+"libmpc" "Multiple Precision Complex Library" "on" \
 "libmsn" "MSN Messenger protocol implementation" "on" \
 "libmtp" "MTP media device support library" "on" \
 "libnjb" "Creative Nomad and related device library" "on" \
 "libnl" "Netlink socket library" "on" \
 "libnotify" "A library for event notification" "on" \
 "libogg" "Ogg Bitstream library" "on" \
+"liboggz" "Ogg inspect/edit/validate library" "on" \
 "liboil" "CPU optimizations library" "on" \
+"libpcap" "Packet Capture library" "on" \
+"libplist" "Apple Binary and XML Property Lists library" "on" \
 "libpng" "Portable Network Graphics library" "on" \
 "libraw1394" "User space IEEE 1394 driver" "on" \
 "librsvg" "Scalable Vector Graphics library" "on" \
 "libsamplerate" "Digital audio resampling library" "on" \
+"libsndfile" "A library for handling digital audio files" "on" \
 "libspectre" "Ghostscript wrapper library" "on" \
 "libtermcap" "GNU terminal control library" "on" \
 "libtheora" "Theora video codec library" "on" \
@@ -154,6 +161,7 @@ you are done." 22 74 10 \
 "parted" "GNU parted, a partition manipulation program" "on" \
 "pcre" "Perl-compatible regular expression library" "on" \
 "phonon" "Multimedia framework for KDE4" "on" \
+"phonon-mplayer" "MPlayer backend for Phonon" "on" \
 "pil" "Python Imaging Library" "on" \
 "pilot-link" "PalmOS communication library" "on" \
 "polkit" "Authentication policy framework" "on" \
@@ -206,7 +214,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-ConsoleKit M2Crypto PyQt QScintilla aalib akonadi alsa-lib alsa-oss apr apr-util aspell aspell-en atk attica audiofile automoc4 babl boost cairo chmlib clucene db42 db44 dbus-glib dbus-python desktop-file-utils djvulibre ebook-tools eggdbus eigen2 enchant esound exiv2 expat fftw freetype fribidi fuse gamin gd gdbm gegl giflib glib glib2 glibc glibc-i18n glibc-profile gmime gmm gmp gnome-icon-theme gst-plugins-base gst-plugins-good gstreamer gtk+ gtk+2 gtkspell hal hal-info hicolor-icon-theme hunspell icon-naming-utils ilmbase imlib iso-codes jasper jre lcms lesstif libaio libao libarchive libart_lgpl libcaca libcap libcddb libcdio libdiscid libdvdread libexif libglade libgphoto2 libgpod libgsf libical libid3tag libidl libidn libieee1284 libiodbc libjpeg libkarma liblastfm libmad libmcrypt libmcs libmng libmowgli libmsn libmtp libnjb libnl libnotify libogg liboil libpng libraw1394 librsvg libsamplerate libspectre libtermcap libtheora libtiff libusb libvisual libvisual-plugins libvncserver libvorbis libwmf libwmf-docs libwnck libwpd libxklavier libxml2 libxslt libzip loudmouth lzo mhash mm mpfr ncurses neon netpbm notify-python openexr pango parted pcre phonon pil pilot-link polkit polkit-gnome poppler poppler-data popt pycairo pycups pygobject pygtk pyrex qca qca-cyrus-sasl qca-gnupg qca-ossl qimageblitz qt qtscriptgenerator raptor rasqal readline redland sdl seamonkey-solibs shared-desktop-ontologies shared-mime-info sip slang slang1 soprano startup-notification strigi svgalib system-config-printer t1lib taglib taglib-extras tango-icon-theme tango-icon-theme-extras urwid v4l-utils virtuoso-ose vte wavpack wv2 zlib \
+ConsoleKit M2Crypto PyQt QScintilla aalib akonadi alsa-lib alsa-oss apr apr-util aspell aspell-en atk attica audiofile automoc4 babl boost cairo chmlib clucene db42 db44 dbus-glib dbus-python desktop-file-utils djvulibre ebook-tools eigen2 enchant esound exiv2 expat fftw freetype fribidi fuse gamin gd gdbm gdk-pixbuf2 gegl giflib glib glib2 glibc glibc-i18n glibc-profile gmime gmm gmp gnome-icon-theme gst-plugins-base gst-plugins-good gstreamer gtk+ gtk+2 gtkspell hal hal-info hicolor-icon-theme hunspell icon-naming-utils ilmbase imlib iso-codes jasper jre lcms lesstif libaio libao libarchive libart_lgpl libcaca libcap libcddb libcdio libdbusmenu-qt libdiscid libdvdread libelf libexif libglade libgphoto2 libgpod libgsf libical libid3tag libidl libidn libieee1284 libiodbc libjpeg libkarma liblastfm libmad libmcrypt libmcs libmng libmowgli libmpc libmsn libmtp libnjb libnl libnotify libogg liboggz liboil libpcap libplist libpng libraw1394 librsvg libsamplerate libsndfile libspectre libtermcap libtheora libtiff libusb libvisual libvisual-plugins libvncserver libvorbis libwmf libwmf-docs libwnck libwpd libxklavier libxml2 libxslt libzip loudmouth lzo mhash mm mpfr ncurses neon netpbm notify-python openexr pango parted pcre phonon phonon-mplayer pil pilot-link polkit polkit-gnome poppler poppler-data popt pycairo pycups pygobject pygtk pyrex qca qca-cyrus-sasl qca-gnupg qca-ossl qimageblitz qt qtscriptgenerator raptor rasqal readline redland sdl seamonkey-solibs shared-desktop-ontologies shared-mime-info sip slang slang1 soprano startup-notification strigi svgalib system-config-printer t1lib taglib taglib-extras tango-icon-theme tango-icon-theme-extras urwid v4l-utils virtuoso-ose vte wavpack wv2 zlib \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -214,7 +222,7 @@ ConsoleKit M2Crypto PyQt QScintilla aalib akonadi alsa-lib alsa-oss apr apr-util
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-ConsoleKit M2Crypto PyQt QScintilla aalib akonadi alsa-lib alsa-oss apr apr-util aspell aspell-en atk attica audiofile automoc4 babl boost cairo chmlib clucene db42 db44 dbus-glib dbus-python desktop-file-utils djvulibre ebook-tools eggdbus eigen2 enchant esound exiv2 expat fftw freetype fribidi fuse gamin gd gdbm gegl giflib glib glib2 glibc glibc-i18n glibc-profile gmime gmm gmp gnome-icon-theme gst-plugins-base gst-plugins-good gstreamer gtk+ gtk+2 gtkspell hal hal-info hicolor-icon-theme hunspell icon-naming-utils ilmbase imlib iso-codes jasper jre lcms lesstif libaio libao libarchive libart_lgpl libcaca libcap libcddb libcdio libdiscid libdvdread libexif libglade libgphoto2 libgpod libgsf libical libid3tag libidl libidn libieee1284 libiodbc libjpeg libkarma liblastfm libmad libmcrypt libmcs libmng libmowgli libmsn libmtp libnjb libnl libnotify libogg liboil libpng libraw1394 librsvg libsamplerate libspectre libtermcap libtheora libtiff libusb libvisual libvisual-plugins libvncserver libvorbis libwmf libwmf-docs libwnck libwpd libxklavier libxml2 libxslt libzip loudmouth lzo mhash mm mpfr ncurses neon netpbm notify-python openexr pango parted pcre phonon pil pilot-link polkit polkit-gnome poppler poppler-data popt pycairo pycups pygobject pygtk pyrex qca qca-cyrus-sasl qca-gnupg qca-ossl qimageblitz qt qtscriptgenerator raptor rasqal readline redland sdl seamonkey-solibs shared-desktop-ontologies shared-mime-info sip slang slang1 soprano startup-notification strigi svgalib system-config-printer t1lib taglib taglib-extras tango-icon-theme tango-icon-theme-extras urwid v4l-utils virtuoso-ose vte wavpack wv2 zlib \
+ConsoleKit M2Crypto PyQt QScintilla aalib akonadi alsa-lib alsa-oss apr apr-util aspell aspell-en atk attica audiofile automoc4 babl boost cairo chmlib clucene db42 db44 dbus-glib dbus-python desktop-file-utils djvulibre ebook-tools eigen2 enchant esound exiv2 expat fftw freetype fribidi fuse gamin gd gdbm gdk-pixbuf2 gegl giflib glib glib2 glibc glibc-i18n glibc-profile gmime gmm gmp gnome-icon-theme gst-plugins-base gst-plugins-good gstreamer gtk+ gtk+2 gtkspell hal hal-info hicolor-icon-theme hunspell icon-naming-utils ilmbase imlib iso-codes jasper jre lcms lesstif libaio libao libarchive libart_lgpl libcaca libcap libcddb libcdio libdbusmenu-qt libdiscid libdvdread libelf libexif libglade libgphoto2 libgpod libgsf libical libid3tag libidl libidn libieee1284 libiodbc libjpeg libkarma liblastfm libmad libmcrypt libmcs libmng libmowgli libmpc libmsn libmtp libnjb libnl libnotify libogg liboggz liboil libpcap libplist libpng libraw1394 librsvg libsamplerate libsndfile libspectre libtermcap libtheora libtiff libusb libvisual libvisual-plugins libvncserver libvorbis libwmf libwmf-docs libwnck libwpd libxklavier libxml2 libxslt libzip loudmouth lzo mhash mm mpfr ncurses neon netpbm notify-python openexr pango parted pcre phonon phonon-mplayer pil pilot-link polkit polkit-gnome poppler poppler-data popt pycairo pycups pygobject pygtk pyrex qca qca-cyrus-sasl qca-gnupg qca-ossl qimageblitz qt qtscriptgenerator raptor rasqal readline redland sdl seamonkey-solibs shared-desktop-ontologies shared-mime-info sip slang slang1 soprano startup-notification strigi svgalib system-config-printer t1lib taglib taglib-extras tango-icon-theme tango-icon-theme-extras urwid v4l-utils virtuoso-ose vte wavpack wv2 zlib \
  ; do
  if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
diff --git a/slackware64/l/tagfile b/slackware64/l/tagfile
index 244282db..0352996d 100644
--- a/slackware64/l/tagfile
+++ b/slackware64/l/tagfile
@@ -26,7 +26,6 @@ dbus-python:REC
 desktop-file-utils:REC
 djvulibre:REC
 ebook-tools:ADD
-eggdbus:ADD
 eigen2:REC
 enchant:REC
 esound:REC
@@ -39,6 +38,7 @@ fuse:OPT
 gamin:REC
 gd:REC
 gdbm:REC
+gdk-pixbuf2:REC
 gegl:REC
 giflib:REC
 glib:REC
@@ -76,8 +76,10 @@ libcaca:OPT
 libcap:REC
 libcddb:REC
 libcdio:REC
+libdbusmenu-qt:REC
 libdiscid:ADD
 libdvdread:REC
+libelf:REC
 libexif:REC
 libglade:REC
 libgphoto2:REC
@@ -97,17 +99,22 @@ libmcrypt:REC
 libmcs:REC
 libmng:REC
 libmowgli:REC
+libmpc:REC
 libmsn:REC
 libmtp:REC
 libnjb:REC
 libnl:REC
 libnotify:REC
 libogg:REC
+liboggz:REC
 liboil:REC
+libpcap:REC
+libplist:REC
 libpng:REC
 libraw1394:REC
 librsvg:REC
 libsamplerate:REC
+libsndfile:REC
 libspectre:REC
 libtermcap:REC
 libtheora:REC
@@ -139,6 +146,7 @@ pango:REC
 parted:ADD
 pcre:REC
 phonon:REC
+phonon-mplayer:REC
 pil:REC
 pilot-link:REC
 polkit:ADD
diff --git a/slackware64/n/maketag b/slackware64/n/maketag
index de973de0..61789705 100644
--- a/slackware64/n/maketag
+++ b/slackware64/n/maketag
@@ -21,6 +21,7 @@ Press ENTER when you are done." \
 "bootp" "Internet Bootstrap Protocol server" "on" \
 "bridge-utils" "Tools for setting up Ethernet bridges" "on" \
 "bsd-finger" "BSD finger daemon and client" "on" \
+"ca-certificates" "PEM certificates to verify SSL connections" "on" \
 "crda" "Central Regulatory Domain Agent" "on" \
 "curl" "Command-line URL transfer utility" "on" \
 "cyrus-sasl" "SASL email authentication library" "on" \
@@ -41,22 +42,25 @@ Press ENTER when you are done." \
 "htdig" "Indexing and search engine" "on" \
 "httpd" "Apache WWW (HTTP) server" "on" \
 "icmpinfo" "Dump or log ICMP packets" "on" \
+"idnkit" "internationalized domain names toolkit" "on" \
 "imapd" "ipop3d/imapd remote mail access daemons" "on" \
 "inetd" "Internet super server daemon" "on" \
 "iproute2" "Kernel routing and traffic control" "on" \
 "iptables" "Firewall configuration utility" "on" \
-"iptraf" "Network monitoring program" "on" \
+"iptraf-ng" "Network monitoring program" "on" \
 "iputils" "Some common network tools" "on" \
 "ipw2100-fw" "Firmware for Intel ipw2100 wireless." "on" \
 "ipw2200-fw" "Firmware for Intel ipw2200 wireless." "on" \
 "irssi" "IRSSI Internet Relay Chat (IRC) client" "on" \
 "iw" "Utility for mac80211 based wireless devices" "on" \
-"iwlwifi-1000-ucode" "Microcode for Intel 1000 wireless chips." "on" \
-"iwlwifi-3945-ucode" "Microcode for Intel 3945 wireless chips." "on" \
-"iwlwifi-4965-ucode" "Microcode for Intel 4965 wireless chips." "on" \
-"iwlwifi-5000-ucode" "Microcode for Intel 5000 wireless chips." "on" \
-"iwlwifi-5150-ucode" "Microcode for Intel 5150 wireless chips." "on" \
-"iwlwifi-6000-ucode" "Microcode for Intel 6000 wireless chips." "on" \
+"iwlwifi-100-ucode" "Microcode for Intel Centrino N 100 wireless" "on" \
+"iwlwifi-1000-ucode" "Microcode for Intel 1000 wireless chips" "on" \
+"iwlwifi-3945-ucode" "Microcode for Intel 3945 wireless chips" "on" \
+"iwlwifi-4965-ucode" "Microcode for Intel 4965 wireless chips" "on" \
+"iwlwifi-5000-ucode" "Microcode for Intel 5000 wireless chips" "on" \
+"iwlwifi-5150-ucode" "Microcode for Intel 5150 wireless chips" "on" \
+"iwlwifi-6000-ucode" "Microcode for Intel 6000 wireless chips" "on" \
+"iwlwifi-6xxx-ucode" "Microcode for Intel 6XXX wireless chips" "on" \
 "lftp" "Shell-like FTP and HTTP transfer program" "on" \
 "libassuan" "Interprocess Communication Library for GPG" "on" \
 "libgcrypt" "General purpose crypto library" "on" \
@@ -112,6 +116,7 @@ Press ENTER when you are done." \
 "pssh" "Parallel versions of the openssh tools" "on" \
 "pth" "GNU Portable Threads" "on" \
 "rdist" "Remote file distribution utility" "on" \
+"rfkill" "tool to query wireless interfaces" "on" \
 "rp-pppoe" "Connect to ADSL ISPs that use PPPoE" "on" \
 "rsync" "Enhanced replacement for rcp" "on" \
 "rt2860-firmware" "Firmware for rt2860 PCI wireless cards." "on" \
@@ -146,7 +151,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-alpine autofs biff+comsat bind bluez bluez-firmware bluez-hcidump bootp bridge-utils bsd-finger crda curl cyrus-sasl dhcp dhcpcd dirmngr dnsmasq elm epic5 ethtool fetchmail getmail gnupg gnupg2 gnutls gpa gpgme htdig httpd icmpinfo imapd inetd iproute2 iptables iptraf iputils ipw2100-fw ipw2200-fw irssi iw iwlwifi-1000-ucode iwlwifi-3945-ucode iwlwifi-4965-ucode iwlwifi-5000-ucode iwlwifi-5150-ucode iwlwifi-6000-ucode lftp libassuan libgcrypt libgpg-error libksba links lynx mailx mcabber metamail mtr mutt nc ncftp net-snmp net-tools netatalk netdate netkit-bootparamd netkit-ftp netkit-ntalk netkit-routed netkit-rsh netkit-rusers netkit-rwall netkit-rwho netkit-timed netpipes netwatch network-scripts netwrite newspost nfs-utils nmap nn ntp obex-data-server obexfs obexftp openldap-client openobex openssh openssl openvpn php pidentd pinentry popa3d portmap ppp procmail proftpd pssh pth rdist rp-pppoe rsync rt2860-firmware rt2870-firmware rt61-firmware rt71w-firmware samba sendmail sendmail-cf slrn snownews stunnel tcp_wrappers tcpdump telnet tftp-hpa tin traceroute trn uucp vlan vsftpd wget whois wireless-tools wpa_supplicant yptools ytalk zd1211-firmware \
+alpine autofs biff+comsat bind bluez bluez-firmware bluez-hcidump bootp bridge-utils bsd-finger ca-certificates crda curl cyrus-sasl dhcp dhcpcd dirmngr dnsmasq elm epic5 ethtool fetchmail getmail gnupg gnupg2 gnutls gpa gpgme htdig httpd icmpinfo idnkit imapd inetd iproute2 iptables iptraf-ng iputils ipw2100-fw ipw2200-fw irssi iw iwlwifi-100-ucode iwlwifi-1000-ucode iwlwifi-3945-ucode iwlwifi-4965-ucode iwlwifi-5000-ucode iwlwifi-5150-ucode iwlwifi-6000-ucode iwlwifi-6xxx-ucode lftp libassuan libgcrypt libgpg-error libksba links lynx mailx mcabber metamail mtr mutt nc ncftp net-snmp net-tools netatalk netdate netkit-bootparamd netkit-ftp netkit-ntalk netkit-routed netkit-rsh netkit-rusers netkit-rwall netkit-rwho netkit-timed netpipes netwatch network-scripts netwrite newspost nfs-utils nmap nn ntp obex-data-server obexfs obexftp openldap-client openobex openssh openssl openvpn php pidentd pinentry popa3d portmap ppp procmail proftpd pssh pth rdist rfkill rp-pppoe rsync rt2860-firmware rt2870-firmware rt61-firmware rt71w-firmware samba sendmail sendmail-cf slrn snownews stunnel tcp_wrappers tcpdump telnet tftp-hpa tin traceroute trn uucp vlan vsftpd wget whois wireless-tools wpa_supplicant yptools ytalk zd1211-firmware \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -154,7 +159,7 @@ alpine autofs biff+comsat bind bluez bluez-firmware bluez-hcidump bootp bridge-u
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-alpine autofs biff+comsat bind bluez bluez-firmware bluez-hcidump bootp bridge-utils bsd-finger crda curl cyrus-sasl dhcp dhcpcd dirmngr dnsmasq elm epic5 ethtool fetchmail getmail gnupg gnupg2 gnutls gpa gpgme htdig httpd icmpinfo imapd inetd iproute2 iptables iptraf iputils ipw2100-fw ipw2200-fw irssi iw iwlwifi-1000-ucode iwlwifi-3945-ucode iwlwifi-4965-ucode iwlwifi-5000-ucode iwlwifi-5150-ucode iwlwifi-6000-ucode lftp libassuan libgcrypt libgpg-error libksba links lynx mailx mcabber metamail mtr mutt nc ncftp net-snmp net-tools netatalk netdate netkit-bootparamd netkit-ftp netkit-ntalk netkit-routed netkit-rsh netkit-rusers netkit-rwall netkit-rwho netkit-timed netpipes netwatch network-scripts netwrite newspost nfs-utils nmap nn ntp obex-data-server obexfs obexftp openldap-client openobex openssh openssl openvpn php pidentd pinentry popa3d portmap ppp procmail proftpd pssh pth rdist rp-pppoe rsync rt2860-firmware rt2870-firmware rt61-firmware rt71w-firmware samba sendmail sendmail-cf slrn snownews stunnel tcp_wrappers tcpdump telnet tftp-hpa tin traceroute trn uucp vlan vsftpd wget whois wireless-tools wpa_supplicant yptools ytalk zd1211-firmware \
+alpine autofs biff+comsat bind bluez bluez-firmware bluez-hcidump bootp bridge-utils bsd-finger ca-certificates crda curl cyrus-sasl dhcp dhcpcd dirmngr dnsmasq elm epic5 ethtool fetchmail getmail gnupg gnupg2 gnutls gpa gpgme htdig httpd icmpinfo idnkit imapd inetd iproute2 iptables iptraf-ng iputils ipw2100-fw ipw2200-fw irssi iw iwlwifi-100-ucode iwlwifi-1000-ucode iwlwifi-3945-ucode iwlwifi-4965-ucode iwlwifi-5000-ucode iwlwifi-5150-ucode iwlwifi-6000-ucode iwlwifi-6xxx-ucode lftp libassuan libgcrypt libgpg-error libksba links lynx mailx mcabber metamail mtr mutt nc ncftp net-snmp net-tools netatalk netdate netkit-bootparamd netkit-ftp netkit-ntalk netkit-routed netkit-rsh netkit-rusers netkit-rwall netkit-rwho netkit-timed netpipes netwatch network-scripts netwrite newspost nfs-utils nmap nn ntp obex-data-server obexfs obexftp openldap-client openobex openssh openssl openvpn php pidentd pinentry popa3d portmap ppp procmail proftpd pssh pth rdist rfkill rp-pppoe rsync rt2860-firmware rt2870-firmware rt61-firmware rt71w-firmware samba sendmail sendmail-cf slrn snownews stunnel tcp_wrappers tcpdump telnet tftp-hpa tin traceroute trn uucp vlan vsftpd wget whois wireless-tools wpa_supplicant yptools ytalk zd1211-firmware \
  ; do
  if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
diff --git a/slackware64/n/maketag.ez b/slackware64/n/maketag.ez
index de973de0..61789705 100644
--- a/slackware64/n/maketag.ez
+++ b/slackware64/n/maketag.ez
@@ -21,6 +21,7 @@ Press ENTER when you are done." \
 "bootp" "Internet Bootstrap Protocol server" "on" \
 "bridge-utils" "Tools for setting up Ethernet bridges" "on" \
 "bsd-finger" "BSD finger daemon and client" "on" \
+"ca-certificates" "PEM certificates to verify SSL connections" "on" \
 "crda" "Central Regulatory Domain Agent" "on" \
 "curl" "Command-line URL transfer utility" "on" \
 "cyrus-sasl" "SASL email authentication library" "on" \
@@ -41,22 +42,25 @@ Press ENTER when you are done." \
 "htdig" "Indexing and search engine" "on" \
 "httpd" "Apache WWW (HTTP) server" "on" \
 "icmpinfo" "Dump or log ICMP packets" "on" \
+"idnkit" "internationalized domain names toolkit" "on" \
 "imapd" "ipop3d/imapd remote mail access daemons" "on" \
 "inetd" "Internet super server daemon" "on" \
 "iproute2" "Kernel routing and traffic control" "on" \
 "iptables" "Firewall configuration utility" "on" \
-"iptraf" "Network monitoring program" "on" \
+"iptraf-ng" "Network monitoring program" "on" \
 "iputils" "Some common network tools" "on" \
 "ipw2100-fw" "Firmware for Intel ipw2100 wireless." "on" \
 "ipw2200-fw" "Firmware for Intel ipw2200 wireless." "on" \
 "irssi" "IRSSI Internet Relay Chat (IRC) client" "on" \
 "iw" "Utility for mac80211 based wireless devices" "on" \
-"iwlwifi-1000-ucode" "Microcode for Intel 1000 wireless chips." "on" \
-"iwlwifi-3945-ucode" "Microcode for Intel 3945 wireless chips." "on" \
-"iwlwifi-4965-ucode" "Microcode for Intel 4965 wireless chips." "on" \
-"iwlwifi-5000-ucode" "Microcode for Intel 5000 wireless chips." "on" \
-"iwlwifi-5150-ucode" "Microcode for Intel 5150 wireless chips." "on" \
-"iwlwifi-6000-ucode" "Microcode for Intel 6000 wireless chips." "on" \
+"iwlwifi-100-ucode" "Microcode for Intel Centrino N 100 wireless" "on" \
+"iwlwifi-1000-ucode" "Microcode for Intel 1000 wireless chips" "on" \
+"iwlwifi-3945-ucode" "Microcode for Intel 3945 wireless chips" "on" \
+"iwlwifi-4965-ucode" "Microcode for Intel 4965 wireless chips" "on" \
+"iwlwifi-5000-ucode" "Microcode for Intel 5000 wireless chips" "on" \
+"iwlwifi-5150-ucode" "Microcode for Intel 5150 wireless chips" "on" \
+"iwlwifi-6000-ucode" "Microcode for Intel 6000 wireless chips" "on" \
+"iwlwifi-6xxx-ucode" "Microcode for Intel 6XXX wireless chips" "on" \
 "lftp" "Shell-like FTP and HTTP transfer program" "on" \
 "libassuan" "Interprocess Communication Library for GPG" "on" \
 "libgcrypt" "General purpose crypto library" "on" \
@@ -112,6 +116,7 @@ Press ENTER when you are done." \
 "pssh" "Parallel versions of the openssh tools" "on" \
 "pth" "GNU Portable Threads" "on" \
 "rdist" "Remote file distribution utility" "on" \
+"rfkill" "tool to query wireless interfaces" "on" \
 "rp-pppoe" "Connect to ADSL ISPs that use PPPoE" "on" \
 "rsync" "Enhanced replacement for rcp" "on" \
 "rt2860-firmware" "Firmware for rt2860 PCI wireless cards." "on" \
@@ -146,7 +151,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-alpine autofs biff+comsat bind bluez bluez-firmware bluez-hcidump bootp bridge-utils bsd-finger crda curl cyrus-sasl dhcp dhcpcd dirmngr dnsmasq elm epic5 ethtool fetchmail getmail gnupg gnupg2 gnutls gpa gpgme htdig httpd icmpinfo imapd inetd iproute2 iptables iptraf iputils ipw2100-fw ipw2200-fw irssi iw iwlwifi-1000-ucode iwlwifi-3945-ucode iwlwifi-4965-ucode iwlwifi-5000-ucode iwlwifi-5150-ucode iwlwifi-6000-ucode lftp libassuan libgcrypt libgpg-error libksba links lynx mailx mcabber metamail mtr mutt nc ncftp net-snmp net-tools netatalk netdate netkit-bootparamd netkit-ftp netkit-ntalk netkit-routed netkit-rsh netkit-rusers netkit-rwall netkit-rwho netkit-timed netpipes netwatch network-scripts netwrite newspost nfs-utils nmap nn ntp obex-data-server obexfs obexftp openldap-client openobex openssh openssl openvpn php pidentd pinentry popa3d portmap ppp procmail proftpd pssh pth rdist rp-pppoe rsync rt2860-firmware rt2870-firmware rt61-firmware rt71w-firmware samba sendmail sendmail-cf slrn snownews stunnel tcp_wrappers tcpdump telnet tftp-hpa tin traceroute trn uucp vlan vsftpd wget whois wireless-tools wpa_supplicant yptools ytalk zd1211-firmware \
+alpine autofs biff+comsat bind bluez bluez-firmware bluez-hcidump bootp bridge-utils bsd-finger ca-certificates crda curl cyrus-sasl dhcp dhcpcd dirmngr dnsmasq elm epic5 ethtool fetchmail getmail gnupg gnupg2 gnutls gpa gpgme htdig httpd icmpinfo idnkit imapd inetd iproute2 iptables iptraf-ng iputils ipw2100-fw ipw2200-fw irssi iw iwlwifi-100-ucode iwlwifi-1000-ucode iwlwifi-3945-ucode iwlwifi-4965-ucode iwlwifi-5000-ucode iwlwifi-5150-ucode iwlwifi-6000-ucode iwlwifi-6xxx-ucode lftp libassuan libgcrypt libgpg-error libksba links lynx mailx mcabber metamail mtr mutt nc ncftp net-snmp net-tools netatalk netdate netkit-bootparamd netkit-ftp netkit-ntalk netkit-routed netkit-rsh netkit-rusers netkit-rwall netkit-rwho netkit-timed netpipes netwatch network-scripts netwrite newspost nfs-utils nmap nn ntp obex-data-server obexfs obexftp openldap-client openobex openssh openssl openvpn php pidentd pinentry popa3d portmap ppp procmail proftpd pssh pth rdist rfkill rp-pppoe rsync rt2860-firmware rt2870-firmware rt61-firmware rt71w-firmware samba sendmail sendmail-cf slrn snownews stunnel tcp_wrappers tcpdump telnet tftp-hpa tin traceroute trn uucp vlan vsftpd wget whois wireless-tools wpa_supplicant yptools ytalk zd1211-firmware \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -154,7 +159,7 @@ alpine autofs biff+comsat bind bluez bluez-firmware bluez-hcidump bootp bridge-u
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-alpine autofs biff+comsat bind bluez bluez-firmware bluez-hcidump bootp bridge-utils bsd-finger crda curl cyrus-sasl dhcp dhcpcd dirmngr dnsmasq elm epic5 ethtool fetchmail getmail gnupg gnupg2 gnutls gpa gpgme htdig httpd icmpinfo imapd inetd iproute2 iptables iptraf iputils ipw2100-fw ipw2200-fw irssi iw iwlwifi-1000-ucode iwlwifi-3945-ucode iwlwifi-4965-ucode iwlwifi-5000-ucode iwlwifi-5150-ucode iwlwifi-6000-ucode lftp libassuan libgcrypt libgpg-error libksba links lynx mailx mcabber metamail mtr mutt nc ncftp net-snmp net-tools netatalk netdate netkit-bootparamd netkit-ftp netkit-ntalk netkit-routed netkit-rsh netkit-rusers netkit-rwall netkit-rwho netkit-timed netpipes netwatch network-scripts netwrite newspost nfs-utils nmap nn ntp obex-data-server obexfs obexftp openldap-client openobex openssh openssl openvpn php pidentd pinentry popa3d portmap ppp procmail proftpd pssh pth rdist rp-pppoe rsync rt2860-firmware rt2870-firmware rt61-firmware rt71w-firmware samba sendmail sendmail-cf slrn snownews stunnel tcp_wrappers tcpdump telnet tftp-hpa tin traceroute trn uucp vlan vsftpd wget whois wireless-tools wpa_supplicant yptools ytalk zd1211-firmware \
+alpine autofs biff+comsat bind bluez bluez-firmware bluez-hcidump bootp bridge-utils bsd-finger ca-certificates crda curl cyrus-sasl dhcp dhcpcd dirmngr dnsmasq elm epic5 ethtool fetchmail getmail gnupg gnupg2 gnutls gpa gpgme htdig httpd icmpinfo idnkit imapd inetd iproute2 iptables iptraf-ng iputils ipw2100-fw ipw2200-fw irssi iw iwlwifi-100-ucode iwlwifi-1000-ucode iwlwifi-3945-ucode iwlwifi-4965-ucode iwlwifi-5000-ucode iwlwifi-5150-ucode iwlwifi-6000-ucode iwlwifi-6xxx-ucode lftp libassuan libgcrypt libgpg-error libksba links lynx mailx mcabber metamail mtr mutt nc ncftp net-snmp net-tools netatalk netdate netkit-bootparamd netkit-ftp netkit-ntalk netkit-routed netkit-rsh netkit-rusers netkit-rwall netkit-rwho netkit-timed netpipes netwatch network-scripts netwrite newspost nfs-utils nmap nn ntp obex-data-server obexfs obexftp openldap-client openobex openssh openssl openvpn php pidentd pinentry popa3d portmap ppp procmail proftpd pssh pth rdist rfkill rp-pppoe rsync rt2860-firmware rt2870-firmware rt61-firmware rt71w-firmware samba sendmail sendmail-cf slrn snownews stunnel tcp_wrappers tcpdump telnet tftp-hpa tin traceroute trn uucp vlan vsftpd wget whois wireless-tools wpa_supplicant yptools ytalk zd1211-firmware \
  ; do
  if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
diff --git a/slackware64/n/tagfile b/slackware64/n/tagfile
index cd87de84..587eecb7 100644
--- a/slackware64/n/tagfile
+++ b/slackware64/n/tagfile
@@ -8,6 +8,7 @@ bluez-hcidump:ADD
 bootp:OPT
 bridge-utils:OPT
 bsd-finger:OPT
+ca-certificates:REC
 crda:REC
 curl:OPT
 cyrus-sasl:REC
@@ -28,22 +29,25 @@ gpgme:REC
 htdig:OPT
 httpd:OPT
 icmpinfo:OPT
+idnkit:REC
 imapd:OPT
 inetd:REC
 iproute2:OPT
 iptables:ADD
-iptraf:OPT
+iptraf-ng:OPT
 iputils:OPT
 ipw2100-fw:ADD
 ipw2200-fw:ADD
 irssi:OPT
 iw:REC
+iwlwifi-100-ucode:ADD
 iwlwifi-1000-ucode:ADD
 iwlwifi-3945-ucode:ADD
 iwlwifi-4965-ucode:ADD
 iwlwifi-5000-ucode:ADD
 iwlwifi-5150-ucode:ADD
 iwlwifi-6000-ucode:ADD
+iwlwifi-6xxx-ucode:ADD
 lftp:OPT
 libassuan:REC
 libgcrypt:REC
@@ -99,6 +103,7 @@ proftpd:OPT
 pssh:OPT
 pth:REC
 rdist:OPT
+rfkill:REC
 rp-pppoe:OPT
 rsync:OPT
 rt2860-firmware:ADD
diff --git a/slackware64/x/maketag b/slackware64/x/maketag
index 5b8548da..c280295d 100644
--- a/slackware64/x/maketag
+++ b/slackware64/x/maketag
@@ -84,7 +84,6 @@ Press ENTER when you are done." \
 "libSM" "libSM is a library for X" "on" \
 "libX11" "libX11 is a library for X" "on" \
 "libXScrnSaver" "libXScrnSaver is a library for X" "on" \
-"libXTrap" "libXTrap is a library for X" "on" \
 "libXau" "libXau is a library for X" "on" \
 "libXaw" "libXaw is a library for X" "on" \
 "libXcomposite" "libXcomposite is a library for X" "on" \
@@ -102,8 +101,6 @@ Press ENTER when you are done." \
 "libXmu" "libXmu is a library for X" "on" \
 "libXp" "libXp is a library for X" "on" \
 "libXpm" "libXpm is a library for X" "on" \
-"libXprintAppUtil" "libXprintAppUtil is a library for X" "on" \
-"libXprintUtil" "libXprintUtil is a library for X" "on" \
 "libXrandr" "libXrandr is a library for X" "on" \
 "libXrender" "libXrender is a library for X" "on" \
 "libXres" "libXres is a library for X" "on" \
@@ -123,7 +120,6 @@ Press ENTER when you are done." \
 "libpthread-stubs" "libpthread-stubs is a library for X" "on" \
 "libxcb" "libxcb is a library for X" "on" \
 "libxkbfile" "libxkbfile is a library for X" "on" \
-"libxkbui" "libxkbui is a library for X" "on" \
 "listres" "list resources in widgets" "on" \
 "lndir" "create a tree of symlinks to another directory" "on" \
 "luit" "ISO 2022 support for Unicode terminals" "on" \
@@ -136,13 +132,13 @@ Press ENTER when you are done." \
 "oclock" "A clock widget for the X desktop" "on" \
 "pixman" "Low-level pixel manipulation library" "on" \
 "printproto" "Prototype files (.h, .pc) for X" "on" \
+"radeon_ucode" "Microcode for some Radeon graphics cards" "on" \
 "randrproto" "Prototype files (.h, .pc) for X" "on" \
 "recordproto" "Prototype files (.h, .pc) for X" "on" \
 "rendercheck" "simple tests of the X Render extension" "on" \
 "renderproto" "Prototype files (.h, .pc) for X" "on" \
 "resourceproto" "Prototype files (.h, .pc) for X" "on" \
 "rgb" "uncompiles rgb color-name databases" "on" \
-"rstart" "an example of a Remote Start client" "on" \
 "sazanami-fonts-ttf" "Japanese TrueType Unicode fonts" "on" \
 "scim" "Smart Common Input Method platform" "on" \
 "scim-anthy" "a SCIM IMEngine module for anthy" "on" \
@@ -160,7 +156,6 @@ Press ENTER when you are done." \
 "sinhala_lklug-font-ttf" "Sinhala Unicode TrueType font" "on" \
 "smproxy" "Session Manager Proxy" "on" \
 "tibmachuni-font-ttf" "Tibetan Machine Unicode font" "on" \
-"trapproto" "Prototype files (.h, .pc) for X" "on" \
 "ttf-indic-fonts" "Indic script TrueType fonts" "on" \
 "twm" "TWM window manager" "on" \
 "util-macros" "m4 macros needed by X" "on" \
@@ -186,6 +181,7 @@ Press ENTER when you are done." \
 "xcursor-themes" "various cursor themes for X" "on" \
 "xcursorgen" "create an X cursor from PNG files" "on" \
 "xdbedizzy" "demo of DBE creating a spinning scene" "on" \
+"xdg-user-dirs" "A script to manage XDG user directories" "on" \
 "xdg-utils" "Scripts to help with desktop integration" "on" \
 "xditview" "display ditroff output" "on" \
 "xdm" "X Display Manager with support for XDMCP" "on" \
@@ -246,14 +242,11 @@ Press ENTER when you are done." \
 "xf86dgaproto" "Prototype files (.h, .pc) for X" "on" \
 "xf86driproto" "Prototype files (.h, .pc) for X" "on" \
 "xf86miscproto" "Prototype files (.h, .pc) for X" "on" \
-"xf86rushproto" "Prototype files (.h, .pc) for X" "on" \
 "xf86vidmodeproto" "Prototype files (.h, .pc) for X" "on" \
 "xfd" "display all the characters in an X font" "on" \
-"xfindproxy" "locate proxy services" "on" \
 "xfontsel" "point and click selection of X11 font names" "on" \
 "xfs" "X font server" "on" \
 "xfsinfo" "X font server information utility" "on" \
-"xfwp" "X firewall proxy" "on" \
 "xgamma" "Adjust gamma correction through the X server" "on" \
 "xgc" "X graphics demo" "on" \
 "xhost" "server access control program for X" "on" \
@@ -284,26 +277,20 @@ Press ENTER when you are done." \
 "xorg-server-xnest" "a nested X server" "on" \
 "xorg-server-xvfb" "an X server for the framebuffer" "on" \
 "xorg-sgml-doctools" "SGML/DocBook additions for X documentation" "on" \
-"xplsprinters" "shows a list of Xprint printers" "on" \
 "xpr" "print an X window dump" "on" \
-"xprehashprinterlist" "recomputes the list of available printers" "on" \
 "xprop" "property displayer for X" "on" \
 "xproto" "Prototype files (.h, .pc) for X" "on" \
-"xproxymanagementprotocol" "Prototype files (.h, .pc) for X" "on" \
 "xpyb" "Python bindings based on XCB" "on" \
 "xrandr" "command line interface to RandR extension" "on" \
 "xrdb" "X server resource database utility" "on" \
 "xrefresh" "refresh all or part of an X screen" "on" \
 "xscope" "X window protocol viewer" "on" \
 "xset" "user preference utility for X" "on" \
-"xsetmode" "set the mode for an X Input device" "on" \
-"xsetpointer" "set an X Input device as the main pointer" "on" \
 "xsetroot" "root window parameter setting utility for X" "on" \
 "xsm" "X Session Manager" "on" \
 "xstdcmap" "X standard colormap utility" "on" \
 "xterm" "The X terminal emulator" "on" \
 "xtrans" "transport bindings for X" "on" \
-"xtrap" "commands for capturing program events" "on" \
 "xvidtune" "video mode tuner for Xorg" "on" \
 "xvinfo" "print X-Video extension adaptor information" "on" \
 "xwd" "dump an image of an X window" "on" \
@@ -314,7 +301,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-anthy appres bdftopcf beforelight bigreqsproto bitmap compiz compositeproto damageproto dejavu-fonts-ttf dmxproto dri2proto editres encodings evieext fixesproto font-adobe-100dpi font-adobe-75dpi font-adobe-utopia-100dpi font-adobe-utopia-75dpi font-adobe-utopia-type1 font-alias font-arabic-misc font-bh-100dpi font-bh-75dpi font-bh-lucidatypewriter-100dpi font-bh-lucidatypewriter-75dpi font-bh-ttf font-bh-type1 font-bitstream-100dpi font-bitstream-75dpi font-bitstream-speedo font-bitstream-type1 font-cronyx-cyrillic font-cursor-misc font-daewoo-misc font-dec-misc font-ibm-type1 font-isas-misc font-jis-misc font-micro-misc font-misc-cyrillic font-misc-ethiopic font-misc-meltho font-misc-misc font-mutt-misc font-schumacher-misc font-screen-cyrillic font-sony-misc font-sun-misc font-util font-winitzki-cyrillic font-xfree86-type1 fontcacheproto fontconfig fontsproto fonttosfnt fslsfonts fstobdf gccmakedep glew glproto iceauth ico imake inputproto intel-gpu-tools kbproto libFS libICE libSM libX11 libXScrnSaver libXTrap libXau libXaw libXcomposite libXcursor libXdamage libXdmcp libXevie libXext libXfixes libXfont libXfontcache libXft libXi libXinerama libXmu libXp libXpm libXprintAppUtil libXprintUtil libXrandr libXrender libXres libXt libXtst libXv libXvMC libXxf86dga libXxf86misc libXxf86vm libdmx libdrm liberation-fonts-ttf libfontenc libhangul libpciaccess libpthread-stubs libxcb libxkbfile libxkbui listres lndir luit m17n-lib makedepend mesa mkcomposecache mkfontdir mkfontscale oclock pixman printproto randrproto recordproto rendercheck renderproto resourceproto rgb rstart sazanami-fonts-ttf scim scim-anthy scim-bridge scim-hangul scim-input-pad scim-m17n scim-pinyin scim-tables scripts scrnsaverproto sessreg setxkbmap showfont sinhala_lklug-font-ttf smproxy tibmachuni-font-ttf trapproto ttf-indic-fonts twm util-macros videoproto viewres wqy-zenhei-font-ttf x11-skel x11perf xauth xaw3d xbacklight xbiff xbitmaps xcalc xcb-proto xcb-util xclipboard xclock xcmiscproto xcmsdb xcompmgr xconsole xcursor-themes xcursorgen xdbedizzy xdg-utils xditview xdm xdpyinfo xdriinfo xedit xev xextproto xeyes xf86-input-acecad xf86-input-aiptek xf86-input-evdev xf86-input-joystick xf86-input-keyboard xf86-input-mouse xf86-input-penmount xf86-input-synaptics xf86-input-vmmouse xf86-input-void xf86-input-wacom xf86-video-apm xf86-video-ark xf86-video-ast xf86-video-ati xf86-video-chips xf86-video-cirrus xf86-video-dummy xf86-video-glint xf86-video-i128 xf86-video-i740 xf86-video-intel xf86-video-mach64 xf86-video-mga xf86-video-neomagic xf86-video-nouveau xf86-video-nv xf86-video-openchrome xf86-video-r128 xf86-video-radeonhd xf86-video-rendition xf86-video-s3 xf86-video-s3virge xf86-video-savage xf86-video-siliconmotion xf86-video-sis xf86-video-sisusb xf86-video-tdfx xf86-video-tga xf86-video-trident xf86-video-tseng xf86-video-v4l xf86-video-vesa xf86-video-vmware xf86-video-voodoo xf86-video-xgi xf86bigfontproto xf86dga xf86dgaproto xf86driproto xf86miscproto xf86rushproto xf86vidmodeproto xfd xfindproxy xfontsel xfs xfsinfo xfwp xgamma xgc xhost xineramaproto xinit xinput xkbcomp xkbevd xkbprint xkbutils xkeyboard-config xkill xload xlogo xlsatoms xlsclients xlsfonts xmag xman xmessage xmh xmodmap xmore xorg-cf-files xorg-docs xorg-server xorg-server-xephyr xorg-server-xnest xorg-server-xvfb xorg-sgml-doctools xplsprinters xpr xprehashprinterlist xprop xproto xproxymanagementprotocol xpyb xrandr xrdb xrefresh xscope xset xsetmode xsetpointer xsetroot xsm xstdcmap xterm xtrans xtrap xvidtune xvinfo xwd xwininfo xwud \
+anthy appres bdftopcf beforelight bigreqsproto bitmap compiz compositeproto damageproto dejavu-fonts-ttf dmxproto dri2proto editres encodings evieext fixesproto font-adobe-100dpi font-adobe-75dpi font-adobe-utopia-100dpi font-adobe-utopia-75dpi font-adobe-utopia-type1 font-alias font-arabic-misc font-bh-100dpi font-bh-75dpi font-bh-lucidatypewriter-100dpi font-bh-lucidatypewriter-75dpi font-bh-ttf font-bh-type1 font-bitstream-100dpi font-bitstream-75dpi font-bitstream-speedo font-bitstream-type1 font-cronyx-cyrillic font-cursor-misc font-daewoo-misc font-dec-misc font-ibm-type1 font-isas-misc font-jis-misc font-micro-misc font-misc-cyrillic font-misc-ethiopic font-misc-meltho font-misc-misc font-mutt-misc font-schumacher-misc font-screen-cyrillic font-sony-misc font-sun-misc font-util font-winitzki-cyrillic font-xfree86-type1 fontcacheproto fontconfig fontsproto fonttosfnt fslsfonts fstobdf gccmakedep glew glproto iceauth ico imake inputproto intel-gpu-tools kbproto libFS libICE libSM libX11 libXScrnSaver libXau libXaw libXcomposite libXcursor libXdamage libXdmcp libXevie libXext libXfixes libXfont libXfontcache libXft libXi libXinerama libXmu libXp libXpm libXrandr libXrender libXres libXt libXtst libXv libXvMC libXxf86dga libXxf86misc libXxf86vm libdmx libdrm liberation-fonts-ttf libfontenc libhangul libpciaccess libpthread-stubs libxcb libxkbfile listres lndir luit m17n-lib makedepend mesa mkcomposecache mkfontdir mkfontscale oclock pixman printproto radeon_ucode randrproto recordproto rendercheck renderproto resourceproto rgb sazanami-fonts-ttf scim scim-anthy scim-bridge scim-hangul scim-input-pad scim-m17n scim-pinyin scim-tables scripts scrnsaverproto sessreg setxkbmap showfont sinhala_lklug-font-ttf smproxy tibmachuni-font-ttf ttf-indic-fonts twm util-macros videoproto viewres wqy-zenhei-font-ttf x11-skel x11perf xauth xaw3d xbacklight xbiff xbitmaps xcalc xcb-proto xcb-util xclipboard xclock xcmiscproto xcmsdb xcompmgr xconsole xcursor-themes xcursorgen xdbedizzy xdg-user-dirs xdg-utils xditview xdm xdpyinfo xdriinfo xedit xev xextproto xeyes xf86-input-acecad xf86-input-aiptek xf86-input-evdev xf86-input-joystick xf86-input-keyboard xf86-input-mouse xf86-input-penmount xf86-input-synaptics xf86-input-vmmouse xf86-input-void xf86-input-wacom xf86-video-apm xf86-video-ark xf86-video-ast xf86-video-ati xf86-video-chips xf86-video-cirrus xf86-video-dummy xf86-video-glint xf86-video-i128 xf86-video-i740 xf86-video-intel xf86-video-mach64 xf86-video-mga xf86-video-neomagic xf86-video-nouveau xf86-video-nv xf86-video-openchrome xf86-video-r128 xf86-video-radeonhd xf86-video-rendition xf86-video-s3 xf86-video-s3virge xf86-video-savage xf86-video-siliconmotion xf86-video-sis xf86-video-sisusb xf86-video-tdfx xf86-video-tga xf86-video-trident xf86-video-tseng xf86-video-v4l xf86-video-vesa xf86-video-vmware xf86-video-voodoo xf86-video-xgi xf86bigfontproto xf86dga xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto xfd xfontsel xfs xfsinfo xgamma xgc xhost xineramaproto xinit xinput xkbcomp xkbevd xkbprint xkbutils xkeyboard-config xkill xload xlogo xlsatoms xlsclients xlsfonts xmag xman xmessage xmh xmodmap xmore xorg-cf-files xorg-docs xorg-server xorg-server-xephyr xorg-server-xnest xorg-server-xvfb xorg-sgml-doctools xpr xprop xproto xpyb xrandr xrdb xrefresh xscope xset xsetroot xsm xstdcmap xterm xtrans xvidtune xvinfo xwd xwininfo xwud \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -322,7 +309,7 @@ anthy appres bdftopcf beforelight bigreqsproto bitmap compiz compositeproto dama
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-anthy appres bdftopcf beforelight bigreqsproto bitmap compiz compositeproto damageproto dejavu-fonts-ttf dmxproto dri2proto editres encodings evieext fixesproto font-adobe-100dpi font-adobe-75dpi font-adobe-utopia-100dpi font-adobe-utopia-75dpi font-adobe-utopia-type1 font-alias font-arabic-misc font-bh-100dpi font-bh-75dpi font-bh-lucidatypewriter-100dpi font-bh-lucidatypewriter-75dpi font-bh-ttf font-bh-type1 font-bitstream-100dpi font-bitstream-75dpi font-bitstream-speedo font-bitstream-type1 font-cronyx-cyrillic font-cursor-misc font-daewoo-misc font-dec-misc font-ibm-type1 font-isas-misc font-jis-misc font-micro-misc font-misc-cyrillic font-misc-ethiopic font-misc-meltho font-misc-misc font-mutt-misc font-schumacher-misc font-screen-cyrillic font-sony-misc font-sun-misc font-util font-winitzki-cyrillic font-xfree86-type1 fontcacheproto fontconfig fontsproto fonttosfnt fslsfonts fstobdf gccmakedep glew glproto iceauth ico imake inputproto intel-gpu-tools kbproto libFS libICE libSM libX11 libXScrnSaver libXTrap libXau libXaw libXcomposite libXcursor libXdamage libXdmcp libXevie libXext libXfixes libXfont libXfontcache libXft libXi libXinerama libXmu libXp libXpm libXprintAppUtil libXprintUtil libXrandr libXrender libXres libXt libXtst libXv libXvMC libXxf86dga libXxf86misc libXxf86vm libdmx libdrm liberation-fonts-ttf libfontenc libhangul libpciaccess libpthread-stubs libxcb libxkbfile libxkbui listres lndir luit m17n-lib makedepend mesa mkcomposecache mkfontdir mkfontscale oclock pixman printproto randrproto recordproto rendercheck renderproto resourceproto rgb rstart sazanami-fonts-ttf scim scim-anthy scim-bridge scim-hangul scim-input-pad scim-m17n scim-pinyin scim-tables scripts scrnsaverproto sessreg setxkbmap showfont sinhala_lklug-font-ttf smproxy tibmachuni-font-ttf trapproto ttf-indic-fonts twm util-macros videoproto viewres wqy-zenhei-font-ttf x11-skel x11perf xauth xaw3d xbacklight xbiff xbitmaps xcalc xcb-proto xcb-util xclipboard xclock xcmiscproto xcmsdb xcompmgr xconsole xcursor-themes xcursorgen xdbedizzy xdg-utils xditview xdm xdpyinfo xdriinfo xedit xev xextproto xeyes xf86-input-acecad xf86-input-aiptek xf86-input-evdev xf86-input-joystick xf86-input-keyboard xf86-input-mouse xf86-input-penmount xf86-input-synaptics xf86-input-vmmouse xf86-input-void xf86-input-wacom xf86-video-apm xf86-video-ark xf86-video-ast xf86-video-ati xf86-video-chips xf86-video-cirrus xf86-video-dummy xf86-video-glint xf86-video-i128 xf86-video-i740 xf86-video-intel xf86-video-mach64 xf86-video-mga xf86-video-neomagic xf86-video-nouveau xf86-video-nv xf86-video-openchrome xf86-video-r128 xf86-video-radeonhd xf86-video-rendition xf86-video-s3 xf86-video-s3virge xf86-video-savage xf86-video-siliconmotion xf86-video-sis xf86-video-sisusb xf86-video-tdfx xf86-video-tga xf86-video-trident xf86-video-tseng xf86-video-v4l xf86-video-vesa xf86-video-vmware xf86-video-voodoo xf86-video-xgi xf86bigfontproto xf86dga xf86dgaproto xf86driproto xf86miscproto xf86rushproto xf86vidmodeproto xfd xfindproxy xfontsel xfs xfsinfo xfwp xgamma xgc xhost xineramaproto xinit xinput xkbcomp xkbevd xkbprint xkbutils xkeyboard-config xkill xload xlogo xlsatoms xlsclients xlsfonts xmag xman xmessage xmh xmodmap xmore xorg-cf-files xorg-docs xorg-server xorg-server-xephyr xorg-server-xnest xorg-server-xvfb xorg-sgml-doctools xplsprinters xpr xprehashprinterlist xprop xproto xproxymanagementprotocol xpyb xrandr xrdb xrefresh xscope xset xsetmode xsetpointer xsetroot xsm xstdcmap xterm xtrans xtrap xvidtune xvinfo xwd xwininfo xwud \
+anthy appres bdftopcf beforelight bigreqsproto bitmap compiz compositeproto damageproto dejavu-fonts-ttf dmxproto dri2proto editres encodings evieext fixesproto font-adobe-100dpi font-adobe-75dpi font-adobe-utopia-100dpi font-adobe-utopia-75dpi font-adobe-utopia-type1 font-alias font-arabic-misc font-bh-100dpi font-bh-75dpi font-bh-lucidatypewriter-100dpi font-bh-lucidatypewriter-75dpi font-bh-ttf font-bh-type1 font-bitstream-100dpi font-bitstream-75dpi font-bitstream-speedo font-bitstream-type1 font-cronyx-cyrillic font-cursor-misc font-daewoo-misc font-dec-misc font-ibm-type1 font-isas-misc font-jis-misc font-micro-misc font-misc-cyrillic font-misc-ethiopic font-misc-meltho font-misc-misc font-mutt-misc font-schumacher-misc font-screen-cyrillic font-sony-misc font-sun-misc font-util font-winitzki-cyrillic font-xfree86-type1 fontcacheproto fontconfig fontsproto fonttosfnt fslsfonts fstobdf gccmakedep glew glproto iceauth ico imake inputproto intel-gpu-tools kbproto libFS libICE libSM libX11 libXScrnSaver libXau libXaw libXcomposite libXcursor libXdamage libXdmcp libXevie libXext libXfixes libXfont libXfontcache libXft libXi libXinerama libXmu libXp libXpm libXrandr libXrender libXres libXt libXtst libXv libXvMC libXxf86dga libXxf86misc libXxf86vm libdmx libdrm liberation-fonts-ttf libfontenc libhangul libpciaccess libpthread-stubs libxcb libxkbfile listres lndir luit m17n-lib makedepend mesa mkcomposecache mkfontdir mkfontscale oclock pixman printproto radeon_ucode randrproto recordproto rendercheck renderproto resourceproto rgb sazanami-fonts-ttf scim scim-anthy scim-bridge scim-hangul scim-input-pad scim-m17n scim-pinyin scim-tables scripts scrnsaverproto sessreg setxkbmap showfont sinhala_lklug-font-ttf smproxy tibmachuni-font-ttf ttf-indic-fonts twm util-macros videoproto viewres wqy-zenhei-font-ttf x11-skel x11perf xauth xaw3d xbacklight xbiff xbitmaps xcalc xcb-proto xcb-util xclipboard xclock xcmiscproto xcmsdb xcompmgr xconsole xcursor-themes xcursorgen xdbedizzy xdg-user-dirs xdg-utils xditview xdm xdpyinfo xdriinfo xedit xev xextproto xeyes xf86-input-acecad xf86-input-aiptek xf86-input-evdev xf86-input-joystick xf86-input-keyboard xf86-input-mouse xf86-input-penmount xf86-input-synaptics xf86-input-vmmouse xf86-input-void xf86-input-wacom xf86-video-apm xf86-video-ark xf86-video-ast xf86-video-ati xf86-video-chips xf86-video-cirrus xf86-video-dummy xf86-video-glint xf86-video-i128 xf86-video-i740 xf86-video-intel xf86-video-mach64 xf86-video-mga xf86-video-neomagic xf86-video-nouveau xf86-video-nv xf86-video-openchrome xf86-video-r128 xf86-video-radeonhd xf86-video-rendition xf86-video-s3 xf86-video-s3virge xf86-video-savage xf86-video-siliconmotion xf86-video-sis xf86-video-sisusb xf86-video-tdfx xf86-video-tga xf86-video-trident xf86-video-tseng xf86-video-v4l xf86-video-vesa xf86-video-vmware xf86-video-voodoo xf86-video-xgi xf86bigfontproto xf86dga xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto xfd xfontsel xfs xfsinfo xgamma xgc xhost xineramaproto xinit xinput xkbcomp xkbevd xkbprint xkbutils xkeyboard-config xkill xload xlogo xlsatoms xlsclients xlsfonts xmag xman xmessage xmh xmodmap xmore xorg-cf-files xorg-docs xorg-server xorg-server-xephyr xorg-server-xnest xorg-server-xvfb xorg-sgml-doctools xpr xprop xproto xpyb xrandr xrdb xrefresh xscope xset xsetroot xsm xstdcmap xterm xtrans xvidtune xvinfo xwd xwininfo xwud \
  ; do
  if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
diff --git a/slackware64/x/maketag.ez b/slackware64/x/maketag.ez
index 5b8548da..c280295d 100644
--- a/slackware64/x/maketag.ez
+++ b/slackware64/x/maketag.ez
@@ -84,7 +84,6 @@ Press ENTER when you are done." \
 "libSM" "libSM is a library for X" "on" \
 "libX11" "libX11 is a library for X" "on" \
 "libXScrnSaver" "libXScrnSaver is a library for X" "on" \
-"libXTrap" "libXTrap is a library for X" "on" \
 "libXau" "libXau is a library for X" "on" \
 "libXaw" "libXaw is a library for X" "on" \
 "libXcomposite" "libXcomposite is a library for X" "on" \
@@ -102,8 +101,6 @@ Press ENTER when you are done." \
 "libXmu" "libXmu is a library for X" "on" \
 "libXp" "libXp is a library for X" "on" \
 "libXpm" "libXpm is a library for X" "on" \
-"libXprintAppUtil" "libXprintAppUtil is a library for X" "on" \
-"libXprintUtil" "libXprintUtil is a library for X" "on" \
 "libXrandr" "libXrandr is a library for X" "on" \
 "libXrender" "libXrender is a library for X" "on" \
 "libXres" "libXres is a library for X" "on" \
@@ -123,7 +120,6 @@ Press ENTER when you are done." \
 "libpthread-stubs" "libpthread-stubs is a library for X" "on" \
 "libxcb" "libxcb is a library for X" "on" \
 "libxkbfile" "libxkbfile is a library for X" "on" \
-"libxkbui" "libxkbui is a library for X" "on" \
 "listres" "list resources in widgets" "on" \
 "lndir" "create a tree of symlinks to another directory" "on" \
 "luit" "ISO 2022 support for Unicode terminals" "on" \
@@ -136,13 +132,13 @@ Press ENTER when you are done." \
 "oclock" "A clock widget for the X desktop" "on" \
 "pixman" "Low-level pixel manipulation library" "on" \
 "printproto" "Prototype files (.h, .pc) for X" "on" \
+"radeon_ucode" "Microcode for some Radeon graphics cards" "on" \
 "randrproto" "Prototype files (.h, .pc) for X" "on" \
 "recordproto" "Prototype files (.h, .pc) for X" "on" \
 "rendercheck" "simple tests of the X Render extension" "on" \
 "renderproto" "Prototype files (.h, .pc) for X" "on" \
 "resourceproto" "Prototype files (.h, .pc) for X" "on" \
 "rgb" "uncompiles rgb color-name databases" "on" \
-"rstart" "an example of a Remote Start client" "on" \
 "sazanami-fonts-ttf" "Japanese TrueType Unicode fonts" "on" \
 "scim" "Smart Common Input Method platform" "on" \
 "scim-anthy" "a SCIM IMEngine module for anthy" "on" \
@@ -160,7 +156,6 @@ Press ENTER when you are done." \
 "sinhala_lklug-font-ttf" "Sinhala Unicode TrueType font" "on" \
 "smproxy" "Session Manager Proxy" "on" \
 "tibmachuni-font-ttf" "Tibetan Machine Unicode font" "on" \
-"trapproto" "Prototype files (.h, .pc) for X" "on" \
 "ttf-indic-fonts" "Indic script TrueType fonts" "on" \
 "twm" "TWM window manager" "on" \
 "util-macros" "m4 macros needed by X" "on" \
@@ -186,6 +181,7 @@ Press ENTER when you are done." \
 "xcursor-themes" "various cursor themes for X" "on" \
 "xcursorgen" "create an X cursor from PNG files" "on" \
 "xdbedizzy" "demo of DBE creating a spinning scene" "on" \
+"xdg-user-dirs" "A script to manage XDG user directories" "on" \
 "xdg-utils" "Scripts to help with desktop integration" "on" \
 "xditview" "display ditroff output" "on" \
 "xdm" "X Display Manager with support for XDMCP" "on" \
@@ -246,14 +242,11 @@ Press ENTER when you are done." \
 "xf86dgaproto" "Prototype files (.h, .pc) for X" "on" \
 "xf86driproto" "Prototype files (.h, .pc) for X" "on" \
 "xf86miscproto" "Prototype files (.h, .pc) for X" "on" \
-"xf86rushproto" "Prototype files (.h, .pc) for X" "on" \
 "xf86vidmodeproto" "Prototype files (.h, .pc) for X" "on" \
 "xfd" "display all the characters in an X font" "on" \
-"xfindproxy" "locate proxy services" "on" \
 "xfontsel" "point and click selection of X11 font names" "on" \
 "xfs" "X font server" "on" \
 "xfsinfo" "X font server information utility" "on" \
-"xfwp" "X firewall proxy" "on" \
 "xgamma" "Adjust gamma correction through the X server" "on" \
 "xgc" "X graphics demo" "on" \
 "xhost" "server access control program for X" "on" \
@@ -284,26 +277,20 @@ Press ENTER when you are done." \
 "xorg-server-xnest" "a nested X server" "on" \
 "xorg-server-xvfb" "an X server for the framebuffer" "on" \
 "xorg-sgml-doctools" "SGML/DocBook additions for X documentation" "on" \
-"xplsprinters" "shows a list of Xprint printers" "on" \
 "xpr" "print an X window dump" "on" \
-"xprehashprinterlist" "recomputes the list of available printers" "on" \
 "xprop" "property displayer for X" "on" \
 "xproto" "Prototype files (.h, .pc) for X" "on" \
-"xproxymanagementprotocol" "Prototype files (.h, .pc) for X" "on" \
 "xpyb" "Python bindings based on XCB" "on" \
 "xrandr" "command line interface to RandR extension" "on" \
 "xrdb" "X server resource database utility" "on" \
 "xrefresh" "refresh all or part of an X screen" "on" \
 "xscope" "X window protocol viewer" "on" \
 "xset" "user preference utility for X" "on" \
-"xsetmode" "set the mode for an X Input device" "on" \
-"xsetpointer" "set an X Input device as the main pointer" "on" \
 "xsetroot" "root window parameter setting utility for X" "on" \
 "xsm" "X Session Manager" "on" \
 "xstdcmap" "X standard colormap utility" "on" \
 "xterm" "The X terminal emulator" "on" \
 "xtrans" "transport bindings for X" "on" \
-"xtrap" "commands for capturing program events" "on" \
 "xvidtune" "video mode tuner for Xorg" "on" \
 "xvinfo" "print X-Video extension adaptor information" "on" \
 "xwd" "dump an image of an X window" "on" \
@@ -314,7 +301,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-anthy appres bdftopcf beforelight bigreqsproto bitmap compiz compositeproto damageproto dejavu-fonts-ttf dmxproto dri2proto editres encodings evieext fixesproto font-adobe-100dpi font-adobe-75dpi font-adobe-utopia-100dpi font-adobe-utopia-75dpi font-adobe-utopia-type1 font-alias font-arabic-misc font-bh-100dpi font-bh-75dpi font-bh-lucidatypewriter-100dpi font-bh-lucidatypewriter-75dpi font-bh-ttf font-bh-type1 font-bitstream-100dpi font-bitstream-75dpi font-bitstream-speedo font-bitstream-type1 font-cronyx-cyrillic font-cursor-misc font-daewoo-misc font-dec-misc font-ibm-type1 font-isas-misc font-jis-misc font-micro-misc font-misc-cyrillic font-misc-ethiopic font-misc-meltho font-misc-misc font-mutt-misc font-schumacher-misc font-screen-cyrillic font-sony-misc font-sun-misc font-util font-winitzki-cyrillic font-xfree86-type1 fontcacheproto fontconfig fontsproto fonttosfnt fslsfonts fstobdf gccmakedep glew glproto iceauth ico imake inputproto intel-gpu-tools kbproto libFS libICE libSM libX11 libXScrnSaver libXTrap libXau libXaw libXcomposite libXcursor libXdamage libXdmcp libXevie libXext libXfixes libXfont libXfontcache libXft libXi libXinerama libXmu libXp libXpm libXprintAppUtil libXprintUtil libXrandr libXrender libXres libXt libXtst libXv libXvMC libXxf86dga libXxf86misc libXxf86vm libdmx libdrm liberation-fonts-ttf libfontenc libhangul libpciaccess libpthread-stubs libxcb libxkbfile libxkbui listres lndir luit m17n-lib makedepend mesa mkcomposecache mkfontdir mkfontscale oclock pixman printproto randrproto recordproto rendercheck renderproto resourceproto rgb rstart sazanami-fonts-ttf scim scim-anthy scim-bridge scim-hangul scim-input-pad scim-m17n scim-pinyin scim-tables scripts scrnsaverproto sessreg setxkbmap showfont sinhala_lklug-font-ttf smproxy tibmachuni-font-ttf trapproto ttf-indic-fonts twm util-macros videoproto viewres wqy-zenhei-font-ttf x11-skel x11perf xauth xaw3d xbacklight xbiff xbitmaps xcalc xcb-proto xcb-util xclipboard xclock xcmiscproto xcmsdb xcompmgr xconsole xcursor-themes xcursorgen xdbedizzy xdg-utils xditview xdm xdpyinfo xdriinfo xedit xev xextproto xeyes xf86-input-acecad xf86-input-aiptek xf86-input-evdev xf86-input-joystick xf86-input-keyboard xf86-input-mouse xf86-input-penmount xf86-input-synaptics xf86-input-vmmouse xf86-input-void xf86-input-wacom xf86-video-apm xf86-video-ark xf86-video-ast xf86-video-ati xf86-video-chips xf86-video-cirrus xf86-video-dummy xf86-video-glint xf86-video-i128 xf86-video-i740 xf86-video-intel xf86-video-mach64 xf86-video-mga xf86-video-neomagic xf86-video-nouveau xf86-video-nv xf86-video-openchrome xf86-video-r128 xf86-video-radeonhd xf86-video-rendition xf86-video-s3 xf86-video-s3virge xf86-video-savage xf86-video-siliconmotion xf86-video-sis xf86-video-sisusb xf86-video-tdfx xf86-video-tga xf86-video-trident xf86-video-tseng xf86-video-v4l xf86-video-vesa xf86-video-vmware xf86-video-voodoo xf86-video-xgi xf86bigfontproto xf86dga xf86dgaproto xf86driproto xf86miscproto xf86rushproto xf86vidmodeproto xfd xfindproxy xfontsel xfs xfsinfo xfwp xgamma xgc xhost xineramaproto xinit xinput xkbcomp xkbevd xkbprint xkbutils xkeyboard-config xkill xload xlogo xlsatoms xlsclients xlsfonts xmag xman xmessage xmh xmodmap xmore xorg-cf-files xorg-docs xorg-server xorg-server-xephyr xorg-server-xnest xorg-server-xvfb xorg-sgml-doctools xplsprinters xpr xprehashprinterlist xprop xproto xproxymanagementprotocol xpyb xrandr xrdb xrefresh xscope xset xsetmode xsetpointer xsetroot xsm xstdcmap xterm xtrans xtrap xvidtune xvinfo xwd xwininfo xwud \
+anthy appres bdftopcf beforelight bigreqsproto bitmap compiz compositeproto damageproto dejavu-fonts-ttf dmxproto dri2proto editres encodings evieext fixesproto font-adobe-100dpi font-adobe-75dpi font-adobe-utopia-100dpi font-adobe-utopia-75dpi font-adobe-utopia-type1 font-alias font-arabic-misc font-bh-100dpi font-bh-75dpi font-bh-lucidatypewriter-100dpi font-bh-lucidatypewriter-75dpi font-bh-ttf font-bh-type1 font-bitstream-100dpi font-bitstream-75dpi font-bitstream-speedo font-bitstream-type1 font-cronyx-cyrillic font-cursor-misc font-daewoo-misc font-dec-misc font-ibm-type1 font-isas-misc font-jis-misc font-micro-misc font-misc-cyrillic font-misc-ethiopic font-misc-meltho font-misc-misc font-mutt-misc font-schumacher-misc font-screen-cyrillic font-sony-misc font-sun-misc font-util font-winitzki-cyrillic font-xfree86-type1 fontcacheproto fontconfig fontsproto fonttosfnt fslsfonts fstobdf gccmakedep glew glproto iceauth ico imake inputproto intel-gpu-tools kbproto libFS libICE libSM libX11 libXScrnSaver libXau libXaw libXcomposite libXcursor libXdamage libXdmcp libXevie libXext libXfixes libXfont libXfontcache libXft libXi libXinerama libXmu libXp libXpm libXrandr libXrender libXres libXt libXtst libXv libXvMC libXxf86dga libXxf86misc libXxf86vm libdmx libdrm liberation-fonts-ttf libfontenc libhangul libpciaccess libpthread-stubs libxcb libxkbfile listres lndir luit m17n-lib makedepend mesa mkcomposecache mkfontdir mkfontscale oclock pixman printproto radeon_ucode randrproto recordproto rendercheck renderproto resourceproto rgb sazanami-fonts-ttf scim scim-anthy scim-bridge scim-hangul scim-input-pad scim-m17n scim-pinyin scim-tables scripts scrnsaverproto sessreg setxkbmap showfont sinhala_lklug-font-ttf smproxy tibmachuni-font-ttf ttf-indic-fonts twm util-macros videoproto viewres wqy-zenhei-font-ttf x11-skel x11perf xauth xaw3d xbacklight xbiff xbitmaps xcalc xcb-proto xcb-util xclipboard xclock xcmiscproto xcmsdb xcompmgr xconsole xcursor-themes xcursorgen xdbedizzy xdg-user-dirs xdg-utils xditview xdm xdpyinfo xdriinfo xedit xev xextproto xeyes xf86-input-acecad xf86-input-aiptek xf86-input-evdev xf86-input-joystick xf86-input-keyboard xf86-input-mouse xf86-input-penmount xf86-input-synaptics xf86-input-vmmouse xf86-input-void xf86-input-wacom xf86-video-apm xf86-video-ark xf86-video-ast xf86-video-ati xf86-video-chips xf86-video-cirrus xf86-video-dummy xf86-video-glint xf86-video-i128 xf86-video-i740 xf86-video-intel xf86-video-mach64 xf86-video-mga xf86-video-neomagic xf86-video-nouveau xf86-video-nv xf86-video-openchrome xf86-video-r128 xf86-video-radeonhd xf86-video-rendition xf86-video-s3 xf86-video-s3virge xf86-video-savage xf86-video-siliconmotion xf86-video-sis xf86-video-sisusb xf86-video-tdfx xf86-video-tga xf86-video-trident xf86-video-tseng xf86-video-v4l xf86-video-vesa xf86-video-vmware xf86-video-voodoo xf86-video-xgi xf86bigfontproto xf86dga xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto xfd xfontsel xfs xfsinfo xgamma xgc xhost xineramaproto xinit xinput xkbcomp xkbevd xkbprint xkbutils xkeyboard-config xkill xload xlogo xlsatoms xlsclients xlsfonts xmag xman xmessage xmh xmodmap xmore xorg-cf-files xorg-docs xorg-server xorg-server-xephyr xorg-server-xnest xorg-server-xvfb xorg-sgml-doctools xpr xprop xproto xpyb xrandr xrdb xrefresh xscope xset xsetroot xsm xstdcmap xterm xtrans xvidtune xvinfo xwd xwininfo xwud \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -322,7 +309,7 @@ anthy appres bdftopcf beforelight bigreqsproto bitmap compiz compositeproto dama
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-anthy appres bdftopcf beforelight bigreqsproto bitmap compiz compositeproto damageproto dejavu-fonts-ttf dmxproto dri2proto editres encodings evieext fixesproto font-adobe-100dpi font-adobe-75dpi font-adobe-utopia-100dpi font-adobe-utopia-75dpi font-adobe-utopia-type1 font-alias font-arabic-misc font-bh-100dpi font-bh-75dpi font-bh-lucidatypewriter-100dpi font-bh-lucidatypewriter-75dpi font-bh-ttf font-bh-type1 font-bitstream-100dpi font-bitstream-75dpi font-bitstream-speedo font-bitstream-type1 font-cronyx-cyrillic font-cursor-misc font-daewoo-misc font-dec-misc font-ibm-type1 font-isas-misc font-jis-misc font-micro-misc font-misc-cyrillic font-misc-ethiopic font-misc-meltho font-misc-misc font-mutt-misc font-schumacher-misc font-screen-cyrillic font-sony-misc font-sun-misc font-util font-winitzki-cyrillic font-xfree86-type1 fontcacheproto fontconfig fontsproto fonttosfnt fslsfonts fstobdf gccmakedep glew glproto iceauth ico imake inputproto intel-gpu-tools kbproto libFS libICE libSM libX11 libXScrnSaver libXTrap libXau libXaw libXcomposite libXcursor libXdamage libXdmcp libXevie libXext libXfixes libXfont libXfontcache libXft libXi libXinerama libXmu libXp libXpm libXprintAppUtil libXprintUtil libXrandr libXrender libXres libXt libXtst libXv libXvMC libXxf86dga libXxf86misc libXxf86vm libdmx libdrm liberation-fonts-ttf libfontenc libhangul libpciaccess libpthread-stubs libxcb libxkbfile libxkbui listres lndir luit m17n-lib makedepend mesa mkcomposecache mkfontdir mkfontscale oclock pixman printproto randrproto recordproto rendercheck renderproto resourceproto rgb rstart sazanami-fonts-ttf scim scim-anthy scim-bridge scim-hangul scim-input-pad scim-m17n scim-pinyin scim-tables scripts scrnsaverproto sessreg setxkbmap showfont sinhala_lklug-font-ttf smproxy tibmachuni-font-ttf trapproto ttf-indic-fonts twm util-macros videoproto viewres wqy-zenhei-font-ttf x11-skel x11perf xauth xaw3d xbacklight xbiff xbitmaps xcalc xcb-proto xcb-util xclipboard xclock xcmiscproto xcmsdb xcompmgr xconsole xcursor-themes xcursorgen xdbedizzy xdg-utils xditview xdm xdpyinfo xdriinfo xedit xev xextproto xeyes xf86-input-acecad xf86-input-aiptek xf86-input-evdev xf86-input-joystick xf86-input-keyboard xf86-input-mouse xf86-input-penmount xf86-input-synaptics xf86-input-vmmouse xf86-input-void xf86-input-wacom xf86-video-apm xf86-video-ark xf86-video-ast xf86-video-ati xf86-video-chips xf86-video-cirrus xf86-video-dummy xf86-video-glint xf86-video-i128 xf86-video-i740 xf86-video-intel xf86-video-mach64 xf86-video-mga xf86-video-neomagic xf86-video-nouveau xf86-video-nv xf86-video-openchrome xf86-video-r128 xf86-video-radeonhd xf86-video-rendition xf86-video-s3 xf86-video-s3virge xf86-video-savage xf86-video-siliconmotion xf86-video-sis xf86-video-sisusb xf86-video-tdfx xf86-video-tga xf86-video-trident xf86-video-tseng xf86-video-v4l xf86-video-vesa xf86-video-vmware xf86-video-voodoo xf86-video-xgi xf86bigfontproto xf86dga xf86dgaproto xf86driproto xf86miscproto xf86rushproto xf86vidmodeproto xfd xfindproxy xfontsel xfs xfsinfo xfwp xgamma xgc xhost xineramaproto xinit xinput xkbcomp xkbevd xkbprint xkbutils xkeyboard-config xkill xload xlogo xlsatoms xlsclients xlsfonts xmag xman xmessage xmh xmodmap xmore xorg-cf-files xorg-docs xorg-server xorg-server-xephyr xorg-server-xnest xorg-server-xvfb xorg-sgml-doctools xplsprinters xpr xprehashprinterlist xprop xproto xproxymanagementprotocol xpyb xrandr xrdb xrefresh xscope xset xsetmode xsetpointer xsetroot xsm xstdcmap xterm xtrans xtrap xvidtune xvinfo xwd xwininfo xwud \
+anthy appres bdftopcf beforelight bigreqsproto bitmap compiz compositeproto damageproto dejavu-fonts-ttf dmxproto dri2proto editres encodings evieext fixesproto font-adobe-100dpi font-adobe-75dpi font-adobe-utopia-100dpi font-adobe-utopia-75dpi font-adobe-utopia-type1 font-alias font-arabic-misc font-bh-100dpi font-bh-75dpi font-bh-lucidatypewriter-100dpi font-bh-lucidatypewriter-75dpi font-bh-ttf font-bh-type1 font-bitstream-100dpi font-bitstream-75dpi font-bitstream-speedo font-bitstream-type1 font-cronyx-cyrillic font-cursor-misc font-daewoo-misc font-dec-misc font-ibm-type1 font-isas-misc font-jis-misc font-micro-misc font-misc-cyrillic font-misc-ethiopic font-misc-meltho font-misc-misc font-mutt-misc font-schumacher-misc font-screen-cyrillic font-sony-misc font-sun-misc font-util font-winitzki-cyrillic font-xfree86-type1 fontcacheproto fontconfig fontsproto fonttosfnt fslsfonts fstobdf gccmakedep glew glproto iceauth ico imake inputproto intel-gpu-tools kbproto libFS libICE libSM libX11 libXScrnSaver libXau libXaw libXcomposite libXcursor libXdamage libXdmcp libXevie libXext libXfixes libXfont libXfontcache libXft libXi libXinerama libXmu libXp libXpm libXrandr libXrender libXres libXt libXtst libXv libXvMC libXxf86dga libXxf86misc libXxf86vm libdmx libdrm liberation-fonts-ttf libfontenc libhangul libpciaccess libpthread-stubs libxcb libxkbfile listres lndir luit m17n-lib makedepend mesa mkcomposecache mkfontdir mkfontscale oclock pixman printproto radeon_ucode randrproto recordproto rendercheck renderproto resourceproto rgb sazanami-fonts-ttf scim scim-anthy scim-bridge scim-hangul scim-input-pad scim-m17n scim-pinyin scim-tables scripts scrnsaverproto sessreg setxkbmap showfont sinhala_lklug-font-ttf smproxy tibmachuni-font-ttf ttf-indic-fonts twm util-macros videoproto viewres wqy-zenhei-font-ttf x11-skel x11perf xauth xaw3d xbacklight xbiff xbitmaps xcalc xcb-proto xcb-util xclipboard xclock xcmiscproto xcmsdb xcompmgr xconsole xcursor-themes xcursorgen xdbedizzy xdg-user-dirs xdg-utils xditview xdm xdpyinfo xdriinfo xedit xev xextproto xeyes xf86-input-acecad xf86-input-aiptek xf86-input-evdev xf86-input-joystick xf86-input-keyboard xf86-input-mouse xf86-input-penmount xf86-input-synaptics xf86-input-vmmouse xf86-input-void xf86-input-wacom xf86-video-apm xf86-video-ark xf86-video-ast xf86-video-ati xf86-video-chips xf86-video-cirrus xf86-video-dummy xf86-video-glint xf86-video-i128 xf86-video-i740 xf86-video-intel xf86-video-mach64 xf86-video-mga xf86-video-neomagic xf86-video-nouveau xf86-video-nv xf86-video-openchrome xf86-video-r128 xf86-video-radeonhd xf86-video-rendition xf86-video-s3 xf86-video-s3virge xf86-video-savage xf86-video-siliconmotion xf86-video-sis xf86-video-sisusb xf86-video-tdfx xf86-video-tga xf86-video-trident xf86-video-tseng xf86-video-v4l xf86-video-vesa xf86-video-vmware xf86-video-voodoo xf86-video-xgi xf86bigfontproto xf86dga xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto xfd xfontsel xfs xfsinfo xgamma xgc xhost xineramaproto xinit xinput xkbcomp xkbevd xkbprint xkbutils xkeyboard-config xkill xload xlogo xlsatoms xlsclients xlsfonts xmag xman xmessage xmh xmodmap xmore xorg-cf-files xorg-docs xorg-server xorg-server-xephyr xorg-server-xnest xorg-server-xvfb xorg-sgml-doctools xpr xprop xproto xpyb xrandr xrdb xrefresh xscope xset xsetroot xsm xstdcmap xterm xtrans xvidtune xvinfo xwd xwininfo xwud \
  ; do
  if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
diff --git a/slackware64/x/tagfile b/slackware64/x/tagfile
index 3cfa52c5..c4fd74c8 100644
--- a/slackware64/x/tagfile
+++ b/slackware64/x/tagfile
@@ -71,7 +71,6 @@ libICE:REC
 libSM:REC
 libX11:REC
 libXScrnSaver:REC
-libXTrap:REC
 libXau:REC
 libXaw:REC
 libXcomposite:REC
@@ -89,8 +88,6 @@ libXinerama:REC
 libXmu:REC
 libXp:REC
 libXpm:REC
-libXprintAppUtil:REC
-libXprintUtil:REC
 libXrandr:REC
 libXrender:REC
 libXres:REC
@@ -110,7 +107,6 @@ libpciaccess:REC
 libpthread-stubs:REC
 libxcb:REC
 libxkbfile:REC
-libxkbui:REC
 listres:REC
 lndir:REC
 luit:REC
@@ -123,13 +119,13 @@ mkfontscale:REC
 oclock:REC
 pixman:REC
 printproto:REC
+radeon_ucode:ADD
 randrproto:REC
 recordproto:REC
 rendercheck:REC
 renderproto:REC
 resourceproto:REC
 rgb:REC
-rstart:REC
 sazanami-fonts-ttf:REC
 scim:REC
 scim-anthy:REC
@@ -147,7 +143,6 @@ showfont:REC
 sinhala_lklug-font-ttf:REC
 smproxy:REC
 tibmachuni-font-ttf:REC
-trapproto:REC
 ttf-indic-fonts:REC
 twm:REC
 util-macros:REC
@@ -173,7 +168,8 @@ xconsole:REC
 xcursor-themes:REC
 xcursorgen:REC
 xdbedizzy:REC
-xdg-utils:OPT
+xdg-user-dirs:REC
+xdg-utils:REC
 xditview:REC
 xdm:REC
 xdpyinfo:REC
@@ -233,14 +229,11 @@ xf86dga:REC
 xf86dgaproto:REC
 xf86driproto:REC
 xf86miscproto:REC
-xf86rushproto:REC
 xf86vidmodeproto:REC
 xfd:REC
-xfindproxy:REC
 xfontsel:REC
 xfs:REC
 xfsinfo:REC
-xfwp:REC
 xgamma:REC
 xgc:REC
 xhost:REC
@@ -271,26 +264,20 @@ xorg-server-xephyr:ADD
 xorg-server-xnest:REC
 xorg-server-xvfb:REC
 xorg-sgml-doctools:REC
-xplsprinters:REC
 xpr:REC
-xprehashprinterlist:REC
 xprop:REC
 xproto:REC
-xproxymanagementprotocol:REC
 xpyb:ADD
 xrandr:REC
 xrdb:REC
 xrefresh:REC
 xscope:ADD
 xset:REC
-xsetmode:REC
-xsetpointer:REC
 xsetroot:REC
 xsm:REC
 xstdcmap:REC
 xterm:REC
 xtrans:REC
-xtrap:REC
 xvidtune:REC
 xvinfo:REC
 xwd:REC
diff --git a/slackware64/xap/maketag b/slackware64/xap/maketag
index 53ec79d5..ec23d5d8 100644
--- a/slackware64/xap/maketag
+++ b/slackware64/xap/maketag
@@ -27,7 +27,6 @@ Press ENTER when you are done." \
 "gnuplot" "Gnuplot function plotting utility" "on" \
 "gucharmap" "Unicode character map" "on" \
 "gv" ".ps/.pdf viewer based on Ghostview" "on" \
-"gxine" "Multimedia player (GTK+ user interface)" "on" \
 "imagemagick" "ImageMagick image utilities" "on" \
 "mozilla-firefox" "Mozilla Firefox web browser" "on" \
 "mozilla-thunderbird" "Mozilla Thunderbird email client" "on" \
@@ -43,6 +42,7 @@ Press ENTER when you are done." \
 "windowmaker" "GNU window manager for X" "on" \
 "x11-ssh-askpass" "X11-based SSH passphrase dialog" "on" \
 "x3270" "x3270 - IBM host access tool" "on" \
+"xaos" "Fast real-time fractal zoomer/viewer" "on" \
 "xchat" "IRC client for X" "on" \
 "xfce" "A lightweight desktop environment for X" "on" \
 "xfce4-notifyd" "xfce libnotify daemon" "on" \
@@ -64,7 +64,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-MPlayer audacious audacious-plugins blackbox blueman electricsheep fluxbox fvwm geeqie gftp gimp gkrellm gnuchess gnuplot gucharmap gv gxine imagemagick mozilla-firefox mozilla-thunderbird pan pidgin rdesktop rxvt sane seamonkey seyon thunar-volman vim-gvim windowmaker x11-ssh-askpass x3270 xchat xfce xfce4-notifyd xfce4-power-manager xfractint xgames xine-lib xine-ui xlockmore xmms xpaint xpdf xsane xscreensaver xv xxgdb \
+MPlayer audacious audacious-plugins blackbox blueman electricsheep fluxbox fvwm geeqie gftp gimp gkrellm gnuchess gnuplot gucharmap gv imagemagick mozilla-firefox mozilla-thunderbird pan pidgin rdesktop rxvt sane seamonkey seyon thunar-volman vim-gvim windowmaker x11-ssh-askpass x3270 xaos xchat xfce xfce4-notifyd xfce4-power-manager xfractint xgames xine-lib xine-ui xlockmore xmms xpaint xpdf xsane xscreensaver xv xxgdb \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -72,7 +72,7 @@ MPlayer audacious audacious-plugins blackbox blueman electricsheep fluxbox fvwm
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-MPlayer audacious audacious-plugins blackbox blueman electricsheep fluxbox fvwm geeqie gftp gimp gkrellm gnuchess gnuplot gucharmap gv gxine imagemagick mozilla-firefox mozilla-thunderbird pan pidgin rdesktop rxvt sane seamonkey seyon thunar-volman vim-gvim windowmaker x11-ssh-askpass x3270 xchat xfce xfce4-notifyd xfce4-power-manager xfractint xgames xine-lib xine-ui xlockmore xmms xpaint xpdf xsane xscreensaver xv xxgdb \
+MPlayer audacious audacious-plugins blackbox blueman electricsheep fluxbox fvwm geeqie gftp gimp gkrellm gnuchess gnuplot gucharmap gv imagemagick mozilla-firefox mozilla-thunderbird pan pidgin rdesktop rxvt sane seamonkey seyon thunar-volman vim-gvim windowmaker x11-ssh-askpass x3270 xaos xchat xfce xfce4-notifyd xfce4-power-manager xfractint xgames xine-lib xine-ui xlockmore xmms xpaint xpdf xsane xscreensaver xv xxgdb \
  ; do
  if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
diff --git a/slackware64/xap/maketag.ez b/slackware64/xap/maketag.ez
index 53ec79d5..ec23d5d8 100644
--- a/slackware64/xap/maketag.ez
+++ b/slackware64/xap/maketag.ez
@@ -27,7 +27,6 @@ Press ENTER when you are done." \
 "gnuplot" "Gnuplot function plotting utility" "on" \
 "gucharmap" "Unicode character map" "on" \
 "gv" ".ps/.pdf viewer based on Ghostview" "on" \
-"gxine" "Multimedia player (GTK+ user interface)" "on" \
 "imagemagick" "ImageMagick image utilities" "on" \
 "mozilla-firefox" "Mozilla Firefox web browser" "on" \
 "mozilla-thunderbird" "Mozilla Thunderbird email client" "on" \
@@ -43,6 +42,7 @@ Press ENTER when you are done." \
 "windowmaker" "GNU window manager for X" "on" \
 "x11-ssh-askpass" "X11-based SSH passphrase dialog" "on" \
 "x3270" "x3270 - IBM host access tool" "on" \
+"xaos" "Fast real-time fractal zoomer/viewer" "on" \
 "xchat" "IRC client for X" "on" \
 "xfce" "A lightweight desktop environment for X" "on" \
 "xfce4-notifyd" "xfce libnotify daemon" "on" \
@@ -64,7 +64,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-MPlayer audacious audacious-plugins blackbox blueman electricsheep fluxbox fvwm geeqie gftp gimp gkrellm gnuchess gnuplot gucharmap gv gxine imagemagick mozilla-firefox mozilla-thunderbird pan pidgin rdesktop rxvt sane seamonkey seyon thunar-volman vim-gvim windowmaker x11-ssh-askpass x3270 xchat xfce xfce4-notifyd xfce4-power-manager xfractint xgames xine-lib xine-ui xlockmore xmms xpaint xpdf xsane xscreensaver xv xxgdb \
+MPlayer audacious audacious-plugins blackbox blueman electricsheep fluxbox fvwm geeqie gftp gimp gkrellm gnuchess gnuplot gucharmap gv imagemagick mozilla-firefox mozilla-thunderbird pan pidgin rdesktop rxvt sane seamonkey seyon thunar-volman vim-gvim windowmaker x11-ssh-askpass x3270 xaos xchat xfce xfce4-notifyd xfce4-power-manager xfractint xgames xine-lib xine-ui xlockmore xmms xpaint xpdf xsane xscreensaver xv xxgdb \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -72,7 +72,7 @@ MPlayer audacious audacious-plugins blackbox blueman electricsheep fluxbox fvwm
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-MPlayer audacious audacious-plugins blackbox blueman electricsheep fluxbox fvwm geeqie gftp gimp gkrellm gnuchess gnuplot gucharmap gv gxine imagemagick mozilla-firefox mozilla-thunderbird pan pidgin rdesktop rxvt sane seamonkey seyon thunar-volman vim-gvim windowmaker x11-ssh-askpass x3270 xchat xfce xfce4-notifyd xfce4-power-manager xfractint xgames xine-lib xine-ui xlockmore xmms xpaint xpdf xsane xscreensaver xv xxgdb \
+MPlayer audacious audacious-plugins blackbox blueman electricsheep fluxbox fvwm geeqie gftp gimp gkrellm gnuchess gnuplot gucharmap gv imagemagick mozilla-firefox mozilla-thunderbird pan pidgin rdesktop rxvt sane seamonkey seyon thunar-volman vim-gvim windowmaker x11-ssh-askpass x3270 xaos xchat xfce xfce4-notifyd xfce4-power-manager xfractint xgames xine-lib xine-ui xlockmore xmms xpaint xpdf xsane xscreensaver xv xxgdb \
  ; do
  if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
diff --git a/slackware64/xap/tagfile b/slackware64/xap/tagfile
index dda9b2d8..d56c99d4 100644
--- a/slackware64/xap/tagfile
+++ b/slackware64/xap/tagfile
@@ -14,7 +14,6 @@ gnuchess:REC
 gnuplot:OPT
 gucharmap:OPT
 gv:REC
-gxine:OPT
 imagemagick:REC
 mozilla-firefox:REC
 mozilla-thunderbird:REC
@@ -30,6 +29,7 @@ vim-gvim:REC
 windowmaker:REC
 x11-ssh-askpass:REC
 x3270:OPT
+xaos:OPT
 xchat:OPT
 xfce:OPT
 xfce4-notifyd:REC
diff --git a/source/a/aaa_base/aaa_base.SlackBuild b/source/a/aaa_base/aaa_base.SlackBuild
index d8c06b4a..29759144 100755
--- a/source/a/aaa_base/aaa_base.SlackBuild
+++ b/source/a/aaa_base/aaa_base.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,8 +20,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=13.1
-BUILD=${BUILD:-2}
+VERSION=13.37
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -48,7 +48,9 @@ echo "| repackaging aaa_base |"
 echo "+======================+"
 
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/slackware-version > $PKG/etc/slackware-version
+cp -a $CWD/slackware-version $PKG/etc/slackware-version
+chown root:root $PKG/etc/slackware-version
+chmod 644 $PKG/etc/slackware-version
 
 # Add lib64 directories on x86_64:
 if [ "$ARCH" = "x86_64" ]; then
diff --git a/source/a/aaa_base/slackware-version b/source/a/aaa_base/slackware-version
index 11bc56a4..9f526a9a 100644
--- a/source/a/aaa_base/slackware-version
+++ b/source/a/aaa_base/slackware-version
@@ -1 +1 @@
-Slackware 13.1.0
+Slackware 13.37.0
diff --git a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild
index 10bd02ce..09c181ef 100755
--- a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild
+++ b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,8 +21,8 @@
 
 
 PKGNAM=aaa_elflibs
-VERSION=${VERSION:-13.1}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-13.37}
+BUILD=${BUILD:-7}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/a/aaa_elflibs/symlinks-to-tracked-libs b/source/a/aaa_elflibs/symlinks-to-tracked-libs
index 29c8bcc1..ab5ec3d7 100644
--- a/source/a/aaa_elflibs/symlinks-to-tracked-libs
+++ b/source/a/aaa_elflibs/symlinks-to-tracked-libs
@@ -6,6 +6,7 @@
 /lib/libdm.so.0
 /lib/libfuse.so.2
 /lib/libgpm.so.1
+/lib/liblzma.so.0
 /lib/libncurses.so.5
 /lib/libncursesw.so.5
 /lib/libpopt.so.0
@@ -15,6 +16,7 @@
 /usr/lib/libcurl.so.2
 /usr/lib/libcurl.so.3
 /usr/lib/libcurl.so.4
+/usr/lib/libelf.so.0
 /usr/lib/libexpat.so.0
 /usr/lib/libexpat.so.1
 /usr/lib/libform.so.5
@@ -40,10 +42,12 @@
 /usr/lib/libldap-2.3.so.0
 /usr/lib/libldap-2.4.so.2
 /usr/lib/libltdl.so.3
+/usr/lib/libltdl.so.7
 /usr/lib/libmenu.so.5
 /usr/lib/libmenuw.so.5
 /usr/lib/libmm.so.14
 /usr/lib/libmp.so.3
+/usr/lib/libmpfr.so.1
 /usr/lib/libpanel.so.5
 /usr/lib/libpanelw.so.5
 /usr/lib/libpcre.so.0
diff --git a/source/a/aaa_elflibs/tracked-files b/source/a/aaa_elflibs/tracked-files
index 16b731ba..040ecbbc 100644
--- a/source/a/aaa_elflibs/tracked-files
+++ b/source/a/aaa_elflibs/tracked-files
@@ -6,3 +6,4 @@
 /usr/lib/libcups.so.2
 /usr/lib/libcupsimage.so.2
 /usr/lib/libgcc_s.so.1
+/usr/lib/libtalloc.so.2
diff --git a/source/a/aaa_terminfo/aaa_terminfo.SlackBuild b/source/a/aaa_terminfo/aaa_terminfo.SlackBuild
index a1e7d288..291215a9 100755
--- a/source/a/aaa_terminfo/aaa_terminfo.SlackBuild
+++ b/source/a/aaa_terminfo/aaa_terminfo.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2006, 2007, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,19 @@
 
 PKGNAM=aaa_terminfo
 # Note the version of ncurses in use:
-VERSION=${VERSION:-5.7}
-ARCH=${ARCH:-noarch}
+VERSION=${VERSION:-5.8}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 if [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 else
diff --git a/source/a/acl/acl.SlackBuild b/source/a/acl/acl.SlackBuild
index 7ad70d04..a97bf27d 100755
--- a/source/a/acl/acl.SlackBuild
+++ b/source/a/acl/acl.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,10 +20,20 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=2.2.47-1
-ARCH=${ARCH:-x86_64}
+PKGNAM=acl
+VERSION=2.2.50
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-acl
@@ -40,8 +50,8 @@ 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 '-')
+tar xzvf $CWD/acl-$VERSION.src.tar.gz || exit 1
+cd acl-$(echo $VERSION | cut -f 1 -d '-') || exit 1
 
 chown -R root:root .
 find . \
@@ -77,7 +87,7 @@ 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 \
+  README doc/COPYING* doc/PORTING \
   $PKG/usr/doc/acl-$VERSION
 
 ( cd $PKG
diff --git a/source/a/acl/acl.destdir.diff b/source/a/acl/acl.destdir.diff
index df284724..aa4b42e8 100644
--- a/source/a/acl/acl.destdir.diff
+++ b/source/a/acl/acl.destdir.diff
@@ -1,17 +1,6 @@
---- ./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 @@
+--- ./include/builddefs.in.orig	2011-04-08 11:55:52.000000000 -0500
++++ ./include/builddefs.in	2011-04-18 13:41:25.000000000 -0500
+@@ -28,14 +28,14 @@
  PKG_VERSION	= @pkg_version@
  PKG_PLATFORM	= @pkg_platform@
  PKG_DISTRIBUTION= @pkg_distribution@
@@ -34,3 +23,14 @@
  
  CC		= @cc@
  AWK		= @awk@
+--- ./include/buildmacros.orig	2011-04-08 11:55:52.000000000 -0500
++++ ./include/buildmacros	2011-04-18 13:41:54.000000000 -0500
+@@ -40,7 +40,7 @@
+ 	  $(LFILES:.l=.o) \
+ 	  $(YFILES:%.y=%.tab.o)
+ 
+-INSTALL	= $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
++INSTALL	= $(TOPDIR)/include/install-sh
+ 
+ SHELL = /bin/sh
+ IMAGES_DIR = $(TOPDIR)/all-images
diff --git a/source/a/acl/slack-desc b/source/a/acl/slack-desc
index 9609c585..93484df3 100644
--- a/source/a/acl/slack-desc
+++ b/source/a/acl/slack-desc
@@ -15,5 +15,5 @@ acl: discretionary access rights for files and directories.
 acl:
 acl:
 acl:
-acl:
+acl: Homepage:  http://savannah.nongnu.org/projects/acl
 acl:
diff --git a/source/a/acpid/acpid.SlackBuild b/source/a/acpid/acpid.SlackBuild
index cb483138..bd96d8b1 100755
--- a/source/a/acpid/acpid.SlackBuild
+++ b/source/a/acpid/acpid.SlackBuild
@@ -20,11 +20,10 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+PKGNAM=acpid
 VERSION=${VERSION:-$(echo acpid-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
-NUMJOBS=${NUMJOBS:--j8}
-
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -39,6 +38,8 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-acpid
 
+NUMJOBS=${NUMJOBS:--j8}
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
diff --git a/source/a/acpid/slack-desc b/source/a/acpid/slack-desc
index b72ac8e6..1b065fce 100644
--- a/source/a/acpid/slack-desc
+++ b/source/a/acpid/slack-desc
@@ -15,5 +15,5 @@ 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: Homepage:  http://www.tedfelix.com/linux/acpid-netlink.html
 acpid:
diff --git a/source/a/apmd/apmd.SlackBuild b/source/a/apmd/apmd.SlackBuild
index 13e47273..b17ddf36 100755
--- a/source/a/apmd/apmd.SlackBuild
+++ b/source/a/apmd/apmd.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,19 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=${VERSION:-3.2.2}
-ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-3}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-2}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -85,6 +95,10 @@ 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
 
+# Remove this version since the one in pm-utils is better:
+rm -f $PKG/usr/bin/on_ac_power
+rm -f $PKG/usr/man/man1/on_ac_power.1.gz
+
 mkdir -p $PKG/usr/doc/apmd-$VERSION
 cp -a \
   AUTHORS COPYING LSM README apmlib.COPYING apmsleep.README \
diff --git a/source/a/attr/attr.SlackBuild b/source/a/attr/attr.SlackBuild
index 9c16a8d6..1b6fe70b 100755
--- a/source/a/attr/attr.SlackBuild
+++ b/source/a/attr/attr.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,10 +20,20 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=2.4.43-1
-ARCH=${ARCH:-x86_64}
+PKGNAM=attr
+VERSION=2.4.45
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-attr
@@ -39,8 +49,8 @@ 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 '-')
+tar xvf $CWD/attr-$VERSION.src.tar.gz || exit 1
+cd attr-$(echo $VERSION | cut -f 1 -d '-') || exit 1
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -76,7 +86,7 @@ mv $PKG/usr/share/doc $PKG/usr
 #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 \
+  README doc/COPYING* doc/PORTING doc/ea-conv \
   $PKG/usr/doc/attr-$VERSION
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
diff --git a/source/a/attr/attr.destdir.diff b/source/a/attr/attr.destdir.diff
index ced69eef..5065675b 100644
--- a/source/a/attr/attr.destdir.diff
+++ b/source/a/attr/attr.destdir.diff
@@ -1,17 +1,6 @@
---- ./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 @@
+--- ./include/builddefs.in.orig	2011-04-08 11:56:59.000000000 -0500
++++ ./include/builddefs.in	2011-04-18 13:27:35.000000000 -0500
+@@ -40,14 +40,14 @@
  PKG_VERSION	= @pkg_version@
  PKG_PLATFORM	= @pkg_platform@
  PKG_DISTRIBUTION= @pkg_distribution@
@@ -34,3 +23,14 @@
  
  CC		= @cc@
  AWK		= @awk@
+--- ./include/buildmacros.orig	2011-04-08 11:56:59.000000000 -0500
++++ ./include/buildmacros	2011-04-18 13:28:23.000000000 -0500
+@@ -40,7 +40,7 @@
+ 	  $(LFILES:.l=.o) \
+ 	  $(YFILES:%.y=%.tab.o)
+ 
+-INSTALL	= $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
++INSTALL	= $(TOPDIR)/include/install-sh
+ 
+ SHELL = /bin/sh
+ IMAGES_DIR = $(TOPDIR)/all-images
diff --git a/source/a/attr/slack-desc b/source/a/attr/slack-desc
index e9220f2f..ebca0fe7 100644
--- a/source/a/attr/slack-desc
+++ b/source/a/attr/slack-desc
@@ -16,4 +16,4 @@ 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:
+attr: Homepage:  http://savannah.nongnu.org/projects/attr
diff --git a/source/a/bash/bash-4.1-patches/bash41-008 b/source/a/bash/bash-4.1-patches/bash41-008
new file mode 100644
index 00000000..2bec4de4
--- /dev/null
+++ b/source/a/bash/bash-4.1-patches/bash41-008
@@ -0,0 +1,49 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.1
+Patch-ID:	bash41-008
+
+Bug-Reported-by:	Dennis van Dok <dvandok@gmail.com>
+Bug-Reference-ID:	<4BBF2501.5050703@gmail.com>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-04/msg00038.html
+
+Bug-Description:
+
+When declaring an associative array and implicitly assigning a value
+to element "0", bash does not correctly allocate memory, leading to
+a segmentation violation when that element or the array itself is
+unset.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.1-patched/builtins/declare.def	2009-11-25 19:42:00.000000000 -0500
+--- builtins/declare.def	2010-05-30 18:25:21.000000000 -0400
+***************
+*** 513,517 ****
+  	      /* let bind_{array,assoc}_variable take care of this. */
+  	      if (assoc_p (var))
+! 		bind_assoc_variable (var, name, "0", value, aflags);
+  	      else
+  		bind_array_variable (name, 0, value, aflags);
+--- 519,523 ----
+  	      /* let bind_{array,assoc}_variable take care of this. */
+  	      if (assoc_p (var))
+! 		bind_assoc_variable (var, name, savestring ("0"), value, aflags);
+  	      else
+  		bind_array_variable (name, 0, value, aflags);
+*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
+--- patchlevel.h	2010-01-14 09:38:08.000000000 -0500
+***************
+*** 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/bash-4.1-patches/bash41-009 b/source/a/bash/bash-4.1-patches/bash41-009
new file mode 100644
index 00000000..ae0f1e3e
--- /dev/null
+++ b/source/a/bash/bash-4.1-patches/bash41-009
@@ -0,0 +1,48 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.1
+Patch-ID:	bash41-009
+
+Bug-Reported-by:	Tomas Trnka <tomastrnka@gmx.com>
+Bug-Reference-ID:	<201003242030.02166.tomastrnka@gmx.com>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00090.html
+
+Bug-Description:
+
+An arriving SIGCHLD will interrupt `slow' system calls such as write(2) to
+or read(2) from a terminal.  This results in an error message and truncated
+input or output.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.1-patched/sig.c	Fri Aug 14 16:31:52 2009
+--- sig.c	Fri Mar 26 22:34:11 2010
+***************
+*** 655,660 ****
+--- 655,663 ----
+      act.sa_flags |= SA_INTERRUPT;	/* XXX */
+    else
+      act.sa_flags |= SA_RESTART;		/* XXX */
++ #else
++   if (sig == SIGCHLD)
++     act.sa_flags |= SA_RESTART;
+  #endif
+    sigemptyset (&act.sa_mask);
+    sigemptyset (&oact.sa_mask);
+*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
+--- patchlevel.h	2010-01-14 09:38:08.000000000 -0500
+***************
+*** 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/bash-4.1-patches/bash41-010 b/source/a/bash/bash-4.1-patches/bash41-010
new file mode 100644
index 00000000..b5a4b615
--- /dev/null
+++ b/source/a/bash/bash-4.1-patches/bash41-010
@@ -0,0 +1,68 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.1
+Patch-ID:	bash41-010
+
+Bug-Reported-by:	Stephane Jourdois <sjourdois@gmail.com>
+Bug-Reference-ID:	<AANLkTimbh1t2BmCjnCgACpEidArJMBIEtr30Vv3VzHxf@mail.gmail.com>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-05/msg00165.html
+
+Bug-Description:
+
+The expansion of the \W prompt string escape sequence incorrectly used
+strcpy to copy overlapping strings.  Only memmove works in this case.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.1-patched/parse.y	2009-12-30 12:51:42.000000000 -0500
+--- parse.y	2011-02-24 16:40:48.000000000 -0500
+***************
+*** 5153,5157 ****
+  			t = strrchr (t_string, '/');
+  			if (t)
+! 			  strcpy (t_string, t + 1);
+  		      }
+  		  }
+--- 5153,5157 ----
+  			t = strrchr (t_string, '/');
+  			if (t)
+! 			  memmove (t_string, t + 1, strlen (t));
+  		      }
+  		  }
+*** ../bash-4.1-patched/y.tab.c	2009-12-30 12:52:02.000000000 -0500
+--- y.tab.c	2011-02-24 16:50:27.000000000 -0500
+***************
+*** 7482,7486 ****
+  			t = strrchr (t_string, '/');
+  			if (t)
+! 			  strcpy (t_string, t + 1);
+  		      }
+  		  }
+--- 7482,7486 ----
+  			t = strrchr (t_string, '/');
+  			if (t)
+! 			  memmove (t_string, t + 1, strlen (t));
+  		      }
+  		  }
+***************
+*** 8244,8246 ****
+  }
+  #endif /* HANDLE_MULTIBYTE */
+- 
+--- 8244,8245 ----
+*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
+--- patchlevel.h	2010-01-14 09:38:08.000000000 -0500
+***************
+*** 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/bin/bin.SlackBuild b/source/a/bin/bin.SlackBuild
index 69995acc..415e558e 100755
--- a/source/a/bin/bin.SlackBuild
+++ b/source/a/bin/bin.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=11.1
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-bin
diff --git a/source/a/btrfs-progs/btrfs-progs.SlackBuild b/source/a/btrfs-progs/btrfs-progs.SlackBuild
new file mode 100755
index 00000000..ebbd9a53
--- /dev/null
+++ b/source/a/btrfs-progs/btrfs-progs.SlackBuild
@@ -0,0 +1,128 @@
+#!/bin/sh
+# Copyright 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+CWD=$(pwd)
+
+PKGNAM=btrfs-progs
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+# Download the btrfs-progs-unstable Git head if there's no tarball:
+if ! /bin/ls $CWD/btrfs-progs*tar* 1> /dev/null 2> /dev/null ; then
+  git clone git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs-unstable.git
+  rm -r btrfs-progs-unstable/.git
+  tar cf btrfs-progs-$(date +%Y%m%d).tar btrfs-progs-unstable
+  xz -9 btrfs-progs-$(date +%Y%m%d).tar
+  rm -r $CWD/btrfs-progs-unstable
+fi
+
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | cut -f 3 -d - | cut -f 1 -d .)}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ "$TMP" = "" ]; then
+  TMP=/tmp
+fi
+PKG=$TMP/package-${PKGNAM}
+rm -rf $PKG
+mkdir -p $PKG
+
+cd $TMP
+rm -rf btrfs-progs-unstable
+tar xf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
+cd btrfs-progs-unstable
+
+# 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 {} \;
+
+# Build:
+make $NUMJOBS || make || exit 1
+
+# Build ext* conversion utility:
+make $NUMJOBS convert || make convert || exit 1
+
+# Install:
+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
+)
+
+# Move stuff out of /usr/local:
+mv $PKG/usr/local/bin $PKG/sbin
+mv $PKG/usr/local/man $PKG/usr/man
+rmdir $PKG/usr/local
+
+# Add an fsck.btrfs script.  For now this serves to eat options such as -a
+# that would otherwise cause issues for btrfs at boot time.
+cat $CWD/fsck.btrfs > $PKG/sbin/fsck.btrfs
+chmod 755 $PKG/sbin/fsck.btrfs
+
+# 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 \
+  COPYING* INSTALL README* \
+  $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 ../${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/btrfs-progs/fsck.btrfs b/source/a/btrfs-progs/fsck.btrfs
new file mode 100644
index 00000000..779e0b79
--- /dev/null
+++ b/source/a/btrfs-progs/fsck.btrfs
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+# Copyright 2011  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.
+
+# Currently, btrfsck does not recognize any options, so eat any initial options
+# beginning with '-'.  Then, check the remaining args with btrfsck only if they
+# exist and are readable.
+
+# Strip initial args:
+while [ ! -z "$1" ]; do
+  if [ "$(echo $1 | cut -b1)" = "-" ]; then
+    shift # strip option from command line
+  else
+    break
+  fi
+done
+
+# Main filesystem check loop:
+RETVAL=0
+while [ ! -z "$1" ]; do
+  if [ -r "$1" ]; then
+    echo "fsck.btrfs:  Checking filesystem on $1"
+    # Checking the root filesystem (even read-only) will fail, check for that:
+    if ! grep -w "$1" /etc/fstab | grep -wq / ; then
+      btrfsck "$1"
+      ERRCODE=$?
+      if [ ! $ERRCODE = 0 ]; then
+        RETVAL=$ERRCODE
+      fi
+    else
+      echo "  $1 mounted on /, skipped."
+    fi
+  fi
+  shift
+done
+
+# If there was an error, return the most recent error code:
+exit $RETVAL
+
diff --git a/testing/source/btrfs-progs/slack-desc b/source/a/btrfs-progs/slack-desc
index e9088d05..e9088d05 100644
--- a/testing/source/btrfs-progs/slack-desc
+++ b/source/a/btrfs-progs/slack-desc
diff --git a/source/a/bzip2/bzip2-1.0.4.saneso.diff b/source/a/bzip2/bzip2-1.0.4.saneso.diff
deleted file mode 100644
index edbf1ad0..00000000
--- a/source/a/bzip2/bzip2-1.0.4.saneso.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./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
index 465f75e0..46b1b1ef 100755
--- a/source/a/bzip2/bzip2.SlackBuild
+++ b/source/a/bzip2/bzip2.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,11 +20,21 @@
 #  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}
+PKGNAM=bzip2
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+SOLIB=1.0.6
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-bzip2
@@ -40,13 +50,13 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf bzip2-$VERSION
-tar xzvf $CWD/bzip2-$VERSION.tar.gz
-cd bzip2-$VERSION
+tar xzvf $CWD/bzip2-$VERSION.tar.gz || exit 1
+cd bzip2-$VERSION || exit 1
 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
+zcat $CWD/bzip2.saneso.diff.gz | patch -p1 || exit
 make -f Makefile-libbz2_so || exit 1
-make || exit 1
+make -j3 || make || exit 1
 mkdir -p $PKG/usr/include
 cp -a bzlib.h $PKG/usr/include
 chown root:root $PKG/usr/include/bzlib.h
@@ -64,7 +74,7 @@ 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 \
+cp -a CHANGES LICENSE README* \
   bzip2.txt *.html $PKG/usr/doc/bzip2-$VERSION
 chmod 644 $PKG/usr/doc/bzip2-$VERSION/*
 # Link up them links
diff --git a/source/a/bzip2/bzip2.saneso.diff b/source/a/bzip2/bzip2.saneso.diff
new file mode 100644
index 00000000..4f0acc6e
--- /dev/null
+++ b/source/a/bzip2/bzip2.saneso.diff
@@ -0,0 +1,20 @@
+--- ./Makefile-libbz2_so.orig	2010-09-10 18:07:52.000000000 -0500
++++ ./Makefile-libbz2_so	2010-09-20 12:30:10.475525363 -0500
+@@ -35,13 +35,13 @@
+       bzlib.o
+ 
+ all: $(OBJS)
+-	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS)
++	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.6 $(OBJS)
+ 	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
+-	rm -f libbz2.so.1.0
+-	ln -s libbz2.so.1.0.6 libbz2.so.1.0
++	rm -f libbz2.so.1
++	ln -s libbz2.so.1.0.6 libbz2.so.1
+ 
+ clean: 
+-	rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared
++	rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1 bzip2-shared
+ 
+ blocksort.o: blocksort.c
+ 	$(CC) $(CFLAGS) -c blocksort.c
diff --git a/source/a/coreutils/DIR_COLORS b/source/a/coreutils/DIR_COLORS
index 2556aa01..fd77f563 100644
--- a/source/a/coreutils/DIR_COLORS
+++ b/source/a/coreutils/DIR_COLORS
@@ -7,10 +7,9 @@
 # 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 Eterm
+TERM ansi
+TERM color-xterm
 TERM con132x25
 TERM con132x30
 TERM con132x43
@@ -21,18 +20,43 @@ TERM con80x30
 TERM con80x43
 TERM con80x50
 TERM con80x60
+TERM cons25
+TERM console
 TERM cygwin
 TERM dtterm
+TERM eterm-color
+TERM gnome
+TERM gnome-256color
+TERM jfbterm
+TERM konsole
+TERM kterm
+TERM linux
+TERM linux-c
+TERM mach-color
+TERM mlterm
 TERM putty
-TERM xterm
-TERM xterm-color
-TERM xterm-debian
 TERM rxvt
+TERM rxvt-256color
+TERM rxvt-cygwin
+TERM rxvt-cygwin-native
+TERM rxvt-unicode
+TERM rxvt-unicode-256color
+TERM rxvt-unicode256
 TERM screen
+TERM screen-256color
+TERM screen-256color-bce
 TERM screen-bce
 TERM screen-w
+TERM screen.linux
+TERM screen.rxvt
+TERM terminator
 TERM vt100
-TERM Eterm
+TERM xterm
+TERM xterm-16color
+TERM xterm-256color
+TERM xterm-88color
+TERM xterm-color
+TERM xterm-debian
 
 # 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:
@@ -84,15 +108,16 @@ EXEC 01;32     # This is for files with execute permission:
 # archives or compressed (bright red)
 .7z   01;31
 .ace  01;31
+.ACE  01;31
 .arj  01;31
 .bz2  01;31
-.cpio  01;31
+.cpio 01;31
 .deb  01;31
 .dz   01;31
 .gz   01;31
 .jar  01;31
 .lzh  01;31
-.lzma  01;31
+.lzma 01;31
 .rar  01;31
 .RAR  01;31
 .rpm  01;31
@@ -116,87 +141,95 @@ EXEC 01;32     # This is for files with execute permission:
 .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
+.aac  01;35
+.AAC  01;35
+.anx  01;35
+.asf  01;35
+.ASF  01;35
+.au   01;35
+.axa  01;35
+.axv  01;35
+.avi  01;35
+.AVI  01;35
+.bmp  01;35
+.BMP  01;35
+.divx 01;35
+.DIVX 01;35
 .flac 01;35
 .FLAC 01;35
-.gif 01;35
-.GIF 01;35
-.jpg 01;35
-.JPG 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
+.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  01;35
+.midi 01;35
+.mka  01;35
+.mkv  01;35
+.MKV  01;35
+.mov  01;35
+.MOV  01;35
+.mp3  01;35
+.MP3  01;35
+.mp4  01;35
+.MP4  01;35
 .mp4v 01;35
-.mpc 01;35
-.MPC 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
+.mpg  01;35
+.MPG  01;35
+.nuv  01;35
+.oga  01;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   01;35
+.RA   01;35
+.ram  01;35
+.RAM  01;35
+.rm   01;35
+.RM   01;35
+.spx  01;35
+.svg  01;35
 .svgz 01;35
-.tga 01;35
-.TGA 01;35
-.tif 01;35
-.TIF 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
-
+.vob  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 01;35
+.xwd  01;35
+.XWD  01;35
+.xvid 01;35
diff --git a/source/a/coreutils/coreutils.SlackBuild b/source/a/coreutils/coreutils.SlackBuild
index 3d31bf9f..86019984 100755
--- a/source/a/coreutils/coreutils.SlackBuild
+++ b/source/a/coreutils/coreutils.SlackBuild
@@ -22,7 +22,7 @@
 
 PKGNAM=coreutils
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:--j6}
 
@@ -174,7 +174,7 @@ gzip -9 $PKG/usr/info/*
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  ABOUT-NLS AUTHORS COPYING* NEWS README THANKS THANKS-to-translators TODO \
+  AUTHORS COPYING* NEWS README* THANKS THANKS-to-translators TODO \
   $PKG/usr/doc/$PKGNAM-$VERSION
 
 # If there's a ChangeLog, installing at least part of the recent history
diff --git a/source/a/cpio/cpio-2.9.gcc43.diff b/source/a/cpio/cpio-2.9.gcc43.diff
deleted file mode 100644
index cfe02d7f..00000000
--- a/source/a/cpio/cpio-2.9.gcc43.diff
+++ /dev/null
@@ -1,30 +0,0 @@
---- ./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
index 9cb6054b..b078d067 100755
--- a/source/a/cpio/cpio.SlackBuild
+++ b/source/a/cpio/cpio.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PKGNAM=cpio
-VERSION=${VERSION:-2.9}
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-2}
+VERSION=$(ls $PKGNAM-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -50,10 +59,10 @@ fi
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
 cd ${PKGNAM}-$VERSION || exit 1
 
-zcat $CWD/cpio-2.9.gcc43.diff.gz | patch -p1 --verbose || 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 .
@@ -114,10 +123,18 @@ 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 \
+  ABOUT-NLS AUTHORS COPYING* NEWS README* THANKS TODO \
   $PKG/usr/doc/cpio-$VERSION
 chmod 644 $PKG/usr/doc/cpio-$VERSION/*
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source/a/cpufrequtils/cpufrequtils-007.tar.bz2.sign b/source/a/cpufrequtils/cpufrequtils-007.tar.bz2.sign
deleted file mode 100644
index 0f1c2d05..00000000
--- a/source/a/cpufrequtils/cpufrequtils-007.tar.bz2.sign
+++ /dev/null
@@ -1,8 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-Comment: See http://www.kernel.org/signature.html for info
-
-iD8DBQBLUe7ryGugalF9Dw4RAjeTAJ0ZRX3DI6onTBY5uGhNP9xgOrI6TACfcVoa
-+S69xcWuAKSnsqVPuZWZhDM=
-=gD0S
------END PGP SIGNATURE-----
diff --git a/source/a/cpufrequtils/cpufrequtils-008.tar.bz2.sign b/source/a/cpufrequtils/cpufrequtils-008.tar.bz2.sign
new file mode 100644
index 00000000..a242f00c
--- /dev/null
+++ b/source/a/cpufrequtils/cpufrequtils-008.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
+
+iD8DBQBMMf7wyGugalF9Dw4RAi3wAJ0QXH5vw0DN6m1rMXU745McDwHd6ACfeWJP
+atC8wFCUzLZix4bZhYp2Mvw=
+=/hFX
+-----END PGP SIGNATURE-----
diff --git a/source/a/cryptsetup/cryptsetup.SlackBuild b/source/a/cryptsetup/cryptsetup.SlackBuild
index 35b674ae..11370fc6 100755
--- a/source/a/cryptsetup/cryptsetup.SlackBuild
+++ b/source/a/cryptsetup/cryptsetup.SlackBuild
@@ -33,8 +33,8 @@
 # -----------------------------------------------------------------------------
 
 PKGNAM=cryptsetup
-VERSION=${VERSION:-1.1.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.2.0}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -110,7 +110,7 @@ mkdir -p $PKG/sbin
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING* INSTALL NEWS README TODO \
+  AUTHORS COPYING* INSTALL NEWS README TODO FAQ \
   $PKG/usr/doc/$PKGNAM-$VERSION
 
 # If there's a ChangeLog, installing at least part of the recent history
diff --git a/source/a/cryptsetup/slack-desc b/source/a/cryptsetup/slack-desc
index fbc0035b..1dd4eeca 100644
--- a/source/a/cryptsetup/slack-desc
+++ b/source/a/cryptsetup/slack-desc
@@ -15,7 +15,7 @@ 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: cryptsetup home:  http://code.google.com/p/cryptsetup/
 cryptsetup:
 
 
diff --git a/source/a/cups/cups.SlackBuild b/source/a/cups/cups.SlackBuild
index 1c285c63..7af4bd81 100755
--- a/source/a/cups/cups.SlackBuild
+++ b/source/a/cups/cups.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,8 +22,8 @@
 
 # CUPS build script by volkerdi@slackware.com.
 
-VERSION=1.4.3
-BUILD=${BUILD:-3}
+VERSION=1.4.6
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -58,6 +58,9 @@ cd cups-$VERSION
 # Fix the USB backend to use either usblp or libusb:
 zcat $CWD/usb-backend-both-usblp-and-libusb.dpatch.gz | patch -p1 --verbose || exit 1
 
+# Fix locking to avoid crashes with OpenSSL:
+zcat $CWD/cups.fix_broken_locking.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} \
diff --git a/source/a/cups/cups.fix_broken_locking.diff b/source/a/cups/cups.fix_broken_locking.diff
new file mode 100644
index 00000000..44f97533
--- /dev/null
+++ b/source/a/cups/cups.fix_broken_locking.diff
@@ -0,0 +1,256 @@
+Submitted By: DJ Lucas <robert AT linuxfromscratch DOT org>
+Date: 2010-09-13
+Initial Package Version: 1.4.4
+Upstream Status: Unknown
+Origin: https://bugzilla.redhat.com/show_bug.cgi?id=553834
+Description: Bug fix for invalid locking with GCrypt.
+
+diff -Naurp cups-1.4.4-orig/cups/http.c cups-1.4.4/cups/http.c
+--- cups-1.4.4-orig/cups/http.c	2010-06-16 00:27:41.000000000 -0500
++++ cups-1.4.4/cups/http.c	2010-09-13 01:27:03.000000000 -0500
+@@ -83,12 +83,10 @@
+  *   http_debug_hex()     - Do a hex dump of a buffer.
+  *   http_field()         - Return the field index for a field name.
+  *   http_read_ssl()      - Read from a SSL/TLS connection.
+- *   http_locking_cb()    - Lock/unlock a thread's mutex.
+  *   http_send()          - Send a request with all fields and the trailing
+  *                          blank line.
+  *   http_setup_ssl()     - Set up SSL/TLS support on a connection.
+  *   http_shutdown_ssl()  - Shut down SSL/TLS on a connection.
+- *   http_threadid_cb()   - Return the current thread ID.
+  *   http_upgrade()       - Force upgrade to TLS encryption.
+  *   http_write()         - Write a buffer to a HTTP connection.
+  *   http_write_chunk()   - Write a chunked buffer.
+@@ -146,19 +144,6 @@ static int		http_setup_ssl(http_t *http)
+ static void		http_shutdown_ssl(http_t *http);
+ static int		http_upgrade(http_t *http);
+ static int		http_write_ssl(http_t *http, const char *buf, int len);
+-
+-#  ifdef HAVE_GNUTLS
+-#    ifdef HAVE_PTHREAD_H
+-GCRY_THREAD_OPTION_PTHREAD_IMPL;
+-#    endif /* HAVE_PTHREAD_H */
+-
+-#  elif defined(HAVE_LIBSSL) && defined(HAVE_PTHREAD_H)
+-static pthread_mutex_t	*http_locks;	/* OpenSSL lock mutexes */
+-
+-static void		http_locking_cb(int mode, int type, const char *file,
+-					int line);
+-static unsigned long	http_threadid_cb(void);
+-#  endif /* HAVE_GNUTLS */
+ #endif /* HAVE_SSL */
+ 
+ 
+@@ -1188,22 +1173,21 @@ httpHead(http_t     *http,		/* I - Conne
+ void
+ httpInitialize(void)
+ {
+-  static int	initialized = 0;	/* Have we been called before? */
+-#ifdef WIN32
+-  WSADATA	winsockdata;		/* WinSock data */
+-#endif /* WIN32 */
+ #ifdef HAVE_LIBSSL
+-  int		i;			/* Looping var */
+-  unsigned char	data[1024];		/* Seed data */
++#  ifndef WIN32
++  struct timeval        curtime;        /* Current time in microseconds */
++#  endif /* !WIN32 */
++  int                   i;              /* Looping var */
++  unsigned char         data[1024];     /* Seed data */
+ #endif /* HAVE_LIBSSL */
+ 
+-
+-  if (initialized)
+-    return;
+-
+ #ifdef WIN32
+-  WSAStartup(MAKEWORD(2,2), &winsockdata);
++  WSADATA       winsockdata;            /* WinSock data */
++
+ 
++  static int    initialized = 0;        /* Has WinSock been initialized? */
++  if (!initialized)
++    WSAStartup(MAKEWORD(1,1), &winsockdata);
+ #elif !defined(SO_NOSIGPIPE)
+  /*
+   * Ignore SIGPIPE signals...
+@@ -1226,21 +1210,15 @@ httpInitialize(void)
+ #endif /* WIN32 */
+ 
+ #ifdef HAVE_GNUTLS
+- /*
+-  * Make sure we handle threading properly...
+-  */
+-
+-#  ifdef HAVE_PTHREAD_H
+-  gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+-#  endif /* HAVE_PTHREAD_H */
+ 
+  /*
+   * Initialize GNU TLS...
+   */
+ 
+   gnutls_global_init();
++#endif /* HAVE_GNUTLS */
+ 
+-#elif defined(HAVE_LIBSSL)
++#ifdef HAVE_LIBSSL
+  /*
+   * Initialize OpenSSL...
+   */
+@@ -1249,33 +1227,21 @@ httpInitialize(void)
+   SSL_library_init();
+ 
+  /*
+-  * Set the threading callbacks...
+-  */
+-
+-#  ifdef HAVE_PTHREAD_H
+-  http_locks = calloc(CRYPTO_num_locks(), sizeof(pthread_mutex_t));
+-
+-  for (i = 0; i < CRYPTO_num_locks(); i ++)
+-    pthread_mutex_init(http_locks + i, NULL);
+-
+-  CRYPTO_set_id_callback(http_threadid_cb);
+-  CRYPTO_set_locking_callback(http_locking_cb);
+-#  endif /* HAVE_PTHREAD_H */
+-
+- /*
+   * Using the current time is a dubious random seed, but on some systems
+   * it is the best we can do (on others, this seed isn't even used...)
+   */
+ 
+-  CUPS_SRAND(time(NULL));
++#  ifdef WIN32
++#  else
++  gettimeofday(&curtime, NULL);
++  srand(curtime.tv_sec + curtime.tv_usec);
++#  endif /* WIN32 */
+ 
+   for (i = 0; i < sizeof(data); i ++)
+-    data[i] = CUPS_RAND();
++    data[i] = rand();
+ 
+   RAND_seed(data, sizeof(data));
+-#endif /* HAVE_GNUTLS */
+-
+-  initialized = 1;
++#endif /* HAVE_LIBSSL */
+ }
+ 
+ 
+@@ -2834,25 +2800,6 @@ http_read_ssl(http_t *http,		/* I - Conn
+ #endif /* HAVE_SSL */
+ 
+ 
+-#if defined(HAVE_LIBSSL) && defined(HAVE_PTHREAD_H)
+-/*
+- * 'http_locking_cb()' - Lock/unlock a thread's mutex.
+- */
+-
+-static void
+-http_locking_cb(int        mode,	/* I - Lock mode */
+-		int        type,	/* I - Lock type */
+-		const char *file,	/* I - Source file */
+-		int        line)	/* I - Line number */
+-{
+-  if (mode & CRYPTO_LOCK)
+-    pthread_mutex_lock(http_locks + type);
+-  else
+-    pthread_mutex_unlock(http_locks + type);
+-}
+-#endif /* HAVE_LIBSSL && HAVE_PTHREAD_H */
+-
+-
+ /*
+  * 'http_send()' - Send a request with all fields and the trailing blank line.
+  */
+@@ -3224,19 +3171,6 @@ http_shutdown_ssl(http_t *http)		/* I - 
+ #endif /* HAVE_SSL */
+ 
+ 
+-#if defined(HAVE_LIBSSL) && defined(HAVE_PTHREAD_H)
+-/*
+- * 'http_threadid_cb()' - Return the current thread ID.
+- */
+-
+-static unsigned long			/* O - Thread ID */
+-http_threadid_cb(void)
+-{
+-  return ((unsigned long)pthread_self());
+-}
+-#endif /* HAVE_LIBSSL && HAVE_PTHREAD_H */
+-
+-
+ #ifdef HAVE_SSL
+ /*
+  * 'http_upgrade()' - Force upgrade to TLS encryption.
+diff -Naurp cups-1.4.4-orig/cups/http-private.h cups-1.4.4/cups/http-private.h
+--- cups-1.4.4-orig/cups/http-private.h	2010-04-11 23:03:53.000000000 -0500
++++ cups-1.4.4/cups/http-private.h	2010-09-13 01:27:24.000000000 -0500
+@@ -98,7 +98,6 @@ extern BIO_METHOD *_httpBIOMethods(void)
+  * The GNU TLS library is more of a "bare metal" SSL/TLS library...
+  */
+ #    include <gnutls/gnutls.h>
+-#    include <gcrypt.h>
+ 
+ typedef struct
+ {
+diff -Naurp cups-1.4.4-orig/scheduler/main.c cups-1.4.4/scheduler/main.c
+--- cups-1.4.4-orig/scheduler/main.c	2010-04-23 13:56:34.000000000 -0500
++++ cups-1.4.4/scheduler/main.c	2010-09-13 01:27:36.000000000 -0500
+@@ -549,8 +549,6 @@ main(int  argc,				/* I - Number of comm
+   * Startup the server...
+   */
+ 
+-  httpInitialize();
+-
+   cupsdStartServer();
+ 
+  /*
+diff -Naurp cups-1.4.4-orig/scheduler/server.c cups-1.4.4/scheduler/server.c
+--- cups-1.4.4-orig/scheduler/server.c	2010-04-11 23:03:53.000000000 -0500
++++ cups-1.4.4/scheduler/server.c	2010-09-13 01:27:49.000000000 -0500
+@@ -44,6 +44,42 @@ static int	started = 0;
+ void
+ cupsdStartServer(void)
+ {
++#ifdef HAVE_LIBSSL
++  int                   i;              /* Looping var */
++  struct timeval        curtime;        /* Current time in microseconds */
++  unsigned char         data[1024];     /* Seed data */
++#endif /* HAVE_LIBSSL */
++
++
++#ifdef HAVE_LIBSSL
++ /*
++  * Initialize the encryption libraries...
++  */
++
++  SSL_library_init();
++  SSL_load_error_strings();
++
++ /*
++  * Using the current time is a dubious random seed, but on some systems
++  * it is the best we can do (on others, this seed isn't even used...)
++  */
++
++  gettimeofday(&curtime, NULL);
++  srand(curtime.tv_sec + curtime.tv_usec);
++
++  for (i = 0; i < sizeof(data); i ++)
++    data[i] = rand(); /* Yes, this is a poor source of random data... */
++
++  RAND_seed(&data, sizeof(data));
++#elif defined(HAVE_GNUTLS)
++ /*
++  * Initialize the encryption libraries...
++  */
++
++  gnutls_global_init();
++#endif /* HAVE_LIBSSL */
++
++
+  /*
+   * Create the default security profile...
+   */
diff --git a/source/a/cxxlibs/cxxlibs.SlackBuild b/source/a/cxxlibs/cxxlibs.SlackBuild
index 19f8042e..eff5d26c 100755
--- a/source/a/cxxlibs/cxxlibs.SlackBuild
+++ b/source/a/cxxlibs/cxxlibs.SlackBuild
@@ -21,8 +21,8 @@
 
 
 PKGNAM=cxxlibs
-VERSION=${VERSION:-6.0.13}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-6.0.14}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/a/cxxlibs/oldgcc/oldgcc.build b/source/a/cxxlibs/oldgcc/oldgcc.build
deleted file mode 100755
index 471fefa1..00000000
--- a/source/a/cxxlibs/oldgcc/oldgcc.build
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/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/dbus/dbus-1.2.x-allow_root_globally.diff b/source/a/dbus/dbus-1.2.x-allow_root_globally.diff
deleted file mode 100644
index 913a9d2b..00000000
--- a/source/a/dbus/dbus-1.2.x-allow_root_globally.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Allow root to do anything via dbus method calls, since users expect root
-  to be, well, root.  This removes the insanity of adding root to all sorts
-  of system groups in /etc/group.    --rworkman  20091031
-
-diff -Nur dbus-1.2.16.orig/bus/system.conf.in dbus-1.2.16/bus/system.conf.in
---- dbus-1.2.16.orig/bus/system.conf.in	2009-07-13 05:14:40.000000000 -0500
-+++ dbus-1.2.16/bus/system.conf.in	2009-10-31 00:47:34.338981143 -0500
-@@ -70,6 +70,14 @@
-           send_member="UpdateActivationEnvironment"/>
-   </policy>
- 
-+  <!-- Allow root to do anything over the messagebus.
-+       Don't whine about "security" - anyone with root privileges
-+       can edit this file anyway, so -ENOHOLE here. -->
-+  <policy user="root">
-+    <allow send_destination="*"/>
-+    <allow send_interface="*"/>
-+  </policy>
-+  
-   <!-- Config files are placed here that among other things, punch 
-        holes in the above policy for specific services. -->
-   <includedir>system.d</includedir>
diff --git a/source/a/dbus/dbus-1.4.x-allow_root_globally.diff b/source/a/dbus/dbus-1.4.x-allow_root_globally.diff
new file mode 100644
index 00000000..6bd84833
--- /dev/null
+++ b/source/a/dbus/dbus-1.4.x-allow_root_globally.diff
@@ -0,0 +1,18 @@
+diff -Nur dbus-1.4.0.orig//bus/system.conf.in dbus-1.4.0//bus/system.conf.in
+--- dbus-1.4.0.orig//bus/system.conf.in	2010-08-31 16:44:19.000000000 -0500
++++ dbus-1.4.0//bus/system.conf.in	2010-09-14 09:17:56.080373096 -0500
+@@ -70,6 +70,14 @@
+           send_member="UpdateActivationEnvironment"/>
+   </policy>
+ 
++  <!-- Allow root to do anything over the messagebus.
++       Don't whine about "security" - anyone with root privileges
++       can edit this file anyway, so -ENOHOLE here. -->
++  <policy user="root">
++    <allow send_destination="*"/>
++    <allow send_interface="*"/>
++  </policy>
++
+   <!-- Config files are placed here that among other things, punch 
+        holes in the above policy for specific services. -->
+   <includedir>system.d</includedir>
diff --git a/source/a/dbus/dbus.SlackBuild b/source/a/dbus/dbus.SlackBuild
index 533ccd89..b11340cd 100755
--- a/source/a/dbus/dbus.SlackBuild
+++ b/source/a/dbus/dbus.SlackBuild
@@ -22,8 +22,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PKGNAM=dbus
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -68,7 +68,7 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-zcat $CWD/dbus-1.2.x-allow_root_globally.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/dbus-1.4.x-allow_root_globally.diff.gz | patch -p1 --verbose || exit 1
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -94,29 +94,23 @@ 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
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 # 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/$PKGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING HACKING INSTALL NEWS README doc/*.{txt,html,dtd} \
+  AUTHORS COPYING* HACKING INSTALL NEWS README* doc/*.{txt,html,dtd} \
   $PKG/usr/doc/$PKGNAM-$VERSION
-find $PKG/usr/doc/$PKGNAM-$VERSION -type f -exec chmod 644 {} \;
+find $PKG/usr/doc/$PKGNAM-$VERSION -type f -exec chmod 0644 {} \;
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/a/dbus/doinst.sh b/source/a/dbus/doinst.sh
index 71c3d7a0..d12d7756 100644
--- a/source/a/dbus/doinst.sh
+++ b/source/a/dbus/doinst.sh
@@ -18,7 +18,5 @@ if [ -e etc/rc.d/rc.messagebus ]; then
   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/dialog/dialog.SlackBuild b/source/a/dialog/dialog.SlackBuild
index 9c9bd3f6..c79a6c81 100755
--- a/source/a/dialog/dialog.SlackBuild
+++ b/source/a/dialog/dialog.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 
 
 PKGNAM=dialog
-VERSION=${VERSION:-1.1-20080819}
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1,2 -d - | rev)}
+BUILD=${BUILD:-2}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -49,7 +58,7 @@ fi
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1
 cd ${PKGNAM}-$VERSION || exit 1
 
 zcat $CWD/dialog.smaller.min.height.diff.gz | patch -p1 --verbose || exit 1
@@ -108,9 +117,17 @@ fi
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  CHANGES COPYING README VERSION dialog.lsm \
+  COPYING* README* VERSION dialog.lsm \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 
+# If there's a CHANGES file, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r CHANGES ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat CHANGES | head -n 2500 > $DOCSDIR/CHANGES
+  touch -r CHANGES $DOCSDIR/CHANGES
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source/a/dosfstools/dosfstools-3.0.11.tar.bz2.sign b/source/a/dosfstools/dosfstools-3.0.11.tar.bz2.sign
new file mode 100644
index 00000000..ca1fec55
--- /dev/null
+++ b/source/a/dosfstools/dosfstools-3.0.11.tar.bz2.sign
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.10 (GNU/Linux)
+
+iEYEABECAAYFAk0U0YcACgkQ+C5cwEsrK54SwACg2GdKFHonvr+sJx9d6wA+OTwT
+pbUAoK/eDyuvkyfQygxW07g6URh5Adg+
+=eKdA
+-----END PGP SIGNATURE-----
diff --git a/source/a/dosfstools/dosfstools.SlackBuild b/source/a/dosfstools/dosfstools.SlackBuild
index ebe99c68..abb2d85b 100755
--- a/source/a/dosfstools/dosfstools.SlackBuild
+++ b/source/a/dosfstools/dosfstools.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2007-2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,55 +20,116 @@
 #  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}
+
+PKGNAM=dosfstools
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | rev | cut -f 2- -d -)}
+BUILD=${BUILD:-2}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-dosfstools
+PKG=$TMP/package-$PKGNAM
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
 cd $TMP
-rm -rf dosfstools-$VERSION
-tar xzvf $CWD/dosfstools-$VERSION.src.tar.gz
-cd dosfstools-$VERSION
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1
+cd $PKGNAM-$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
+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/dosfstools.paths.diff.gz | patch -p1 --verbose || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+## I do not believe we want these, or it may cause autofscking fat volumes at boot:
+## NOTE: only if it is set in fstab, which is not default.  Some other things need
+## to see fsck.vfat, so allowing it again.
+#rm -f $PKG/sbin/fsck.* $PKG/usr/man/man?/fsck.*
+
+# We can handle this:
+rm -r $PKG/usr/doc
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/$PKGNAM-$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 )
+  COPYING* README* \
+  doc/ANNOUNCE* doc/README* doc/TODO* \
+  $PKG/usr/doc/$PKGNAM-$VERSION
 
+# 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 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 files, if any:
+if [ -d $PKG/usr/info ]; then
+  ( cd $PKG/usr/info
+    rm -f dir
+    gzip -9 *
+  )
+fi
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
-# Build the package:
 cd $PKG
-makepkg -l y -c n $TMP/dosfstools-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz
 
diff --git a/source/a/dosfstools/dosfstools.paths.diff b/source/a/dosfstools/dosfstools.paths.diff
new file mode 100644
index 00000000..cdd473df
--- /dev/null
+++ b/source/a/dosfstools/dosfstools.paths.diff
@@ -0,0 +1,17 @@
+--- ./Makefile.orig	2010-04-04 02:36:49.000000000 -0500
++++ ./Makefile	2011-02-25 13:45:41.443999917 -0600
+@@ -19,10 +19,10 @@
+ # can be found in /usr/share/common-licenses/GPL-3 file.
+ 
+ DESTDIR =
+-PREFIX = /usr/local
+-SBINDIR = $(PREFIX)/sbin
+-DOCDIR = $(PREFIX)/share/doc
+-MANDIR = $(PREFIX)/share/man
++PREFIX = /usr
++SBINDIR = /sbin
++DOCDIR = $(PREFIX)/doc
++MANDIR = $(PREFIX)/man
+ 
+ #OPTFLAGS = -O2 -fomit-frame-pointer -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+ OPTFLAGS = -O2 -fomit-frame-pointer $(shell getconf LFS_CFLAGS)
diff --git a/source/a/e2fsprogs/e2fsprogs.SlackBuild b/source/a/e2fsprogs/e2fsprogs.SlackBuild
index c79c29eb..a14d8e11 100755
--- a/source/a/e2fsprogs/e2fsprogs.SlackBuild
+++ b/source/a/e2fsprogs/e2fsprogs.SlackBuild
@@ -129,11 +129,6 @@ EOF
   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
diff --git a/source/a/ed/ed.SlackBuild b/source/a/ed/ed.SlackBuild
index 534ca116..72f47141 100755
--- a/source/a/ed/ed.SlackBuild
+++ b/source/a/ed/ed.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,19 @@
 
 
 PKGNAM=ed
-VERSION=${VERSION:-1.3}
-ARCH=${ARCH:-x86_64}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
@@ -36,7 +45,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
 cd ${PKGNAM}-$VERSION
 
 # Make sure ownerships and permissions are sane:
@@ -104,9 +113,17 @@ fi
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  AUTHORS COPYING* ChangeLog INSTALL NEWS README TODO \
+  AUTHORS COPYING* INSTALL NEWS README TODO \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source/a/findutils/findutils.SlackBuild b/source/a/findutils/findutils.SlackBuild
index aca93a0c..5aef7e73 100755
--- a/source/a/findutils/findutils.SlackBuild
+++ b/source/a/findutils/findutils.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=4.4.2
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:--j6}
 
 CWD=$(pwd)
diff --git a/source/a/floppy/floppy.SlackBuild b/source/a/floppy/floppy.SlackBuild
index 38a5cc86..04966d1c 100755
--- a/source/a/floppy/floppy.SlackBuild
+++ b/source/a/floppy/floppy.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 VERSION=5.4
 MTOOLS=3.9.8
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-3}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 if [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O -fPIC"
   LIBDIRSUFFIX="64"
diff --git a/source/a/gdisk/gdisk.SlackBuild b/source/a/gdisk/gdisk.SlackBuild
new file mode 100755
index 00000000..841332dd
--- /dev/null
+++ b/source/a/gdisk/gdisk.SlackBuild
@@ -0,0 +1,117 @@
+#!/bin/sh
+
+# Copyright (c) 2011  Eric Hameleers, Eindhoven, NL
+# Copyright 2011  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=gdisk
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION
+
+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 {} \;
+
+export LDFLAGS="$SLKLDFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+export CFLAGS="$SLKCFLAGS"
+make || exit 1
+
+# Manually install the stuff:
+for FILE in gdisk sgdisk ; do
+  install -D $FILE $PKG/sbin/$FILE
+  install -D $FILE.8 $PKG/usr/man/man8/$FILE.8
+done
+
+# Add documentation:
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  COPYING* NEWS README* \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+# 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 if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/gdisk/slack-desc b/source/a/gdisk/slack-desc
new file mode 100644
index 00000000..492b4460
--- /dev/null
+++ b/source/a/gdisk/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------------------------------------------------------|
+gdisk: gdisk (GPT fdisk)
+gdisk:
+gdisk: GPT fdisk (gdisk) is a partitioning tool for disks using a GPT (GUID
+gdisk: Partition Table).  It features a command-line interface, fairly direct
+gdisk: manipulation of partition table structures, recovery tools to help
+gdisk: you deal with corrupt partition tables, and the ability to convert
+gdisk: MBR disks to GPT format.
+gdisk:
+gdisk:
+gdisk: gdisk home: http://www.rodsbooks.com/gdisk/
+gdisk:
diff --git a/source/a/genpower/genpower.SlackBuild b/source/a/genpower/genpower.SlackBuild
index 03f15675..bcf40786 100755
--- a/source/a/genpower/genpower.SlackBuild
+++ b/source/a/genpower/genpower.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=${VERSION:-1.0.5}
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-genpower
diff --git a/source/a/gettext/gettext-tools.SlackBuild b/source/a/gettext/gettext-tools.SlackBuild
index 13406619..0ed840dc 100755
--- a/source/a/gettext/gettext-tools.SlackBuild
+++ b/source/a/gettext/gettext-tools.SlackBuild
@@ -20,8 +20,10 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=0.17
-BUILD=${BUILD:-4}
+VERSION=0.18.1.1
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j6 "}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -77,7 +79,9 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/gettext-tools-$VERSION \
   --build=$ARCH-slackware-linux
-make -j4 || exit 1
+
+make $NUMJOBS || make || exit 1
+
 cd gettext-tools
 make install DESTDIR=$PKG
 
@@ -85,12 +89,12 @@ make install DESTDIR=$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
+
+( cd $PKG/usr/doc/gettext-tools-$VERSION
   # These take up a ton of space otherwise
   tar cf examples.tar examples
   bzip2 -9 examples.tar
@@ -103,12 +107,14 @@ gzip $PKG/usr/man/man?/*
   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
+/sbin/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
index 89de611e..acaf1df1 100755
--- a/source/a/gettext/gettext.SlackBuild
+++ b/source/a/gettext/gettext.SlackBuild
@@ -20,8 +20,10 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=0.17
-BUILD=${BUILD:-3}
+VERSION=0.18.1.1
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j6 "}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -79,32 +81,32 @@ CXXFLAGS="$SLKCFLAGS" \
   --disable-static \
   --build=$ARCH-slackware-linux
 
-make -j4 || exit 1
+make $NUMJOBS || make || 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
+
+( cd $PKG/usr/doc/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
+/sbin/makepkg -l y -c n $TMP/gettext-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source/a/getty-ps/getty-ps.SlackBuild b/source/a/getty-ps/getty-ps.SlackBuild
index 76e4012d..fb1a49f8 100755
--- a/source/a/getty-ps/getty-ps.SlackBuild
+++ b/source/a/getty-ps/getty-ps.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=2.1.0b
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-getty-ps
diff --git a/source/a/gpm/gpm.SlackBuild b/source/a/gpm/gpm.SlackBuild
index b0352fe8..a79ce2b6 100755
--- a/source/a/gpm/gpm.SlackBuild
+++ b/source/a/gpm/gpm.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,9 +23,18 @@
 # by: volkerdi@slackware.com
 
 VERSION=1.20.1
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-5}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-gpm
diff --git a/source/a/grep/grep.SlackBuild b/source/a/grep/grep.SlackBuild
index 1b2ac8e7..b789bc72 100755
--- a/source/a/grep/grep.SlackBuild
+++ b/source/a/grep/grep.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2005-2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,12 +20,22 @@
 #  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}
+PKGNAM=grep
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-grep
@@ -39,13 +49,16 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf grep-$VERSION
-tar xvf $CWD/grep-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/grep-$VERSION.tar.xz || exit 1
 cd grep-$VERSION || exit 1
 chown -R root:root .
 find . \
@@ -60,24 +73,15 @@ CFLAGS="$SLKCFLAGS" \
   --bindir=/bin \
   --mandir=/usr/man \
   --infodir=/usr/info \
-  --disable-perl-regexp \
+  --docdir=/usr/doc/grep-$VERSION \
   --build=$ARCH-slackware-linux
 
-make $NUMJOBS || make || exit 1
+make $NUMJOBS -e LIB_PCRE=/usr/lib${LIBDIRSUFFIX}/libpcre.a || make -e LIB_PCRE=/usr/lib${LIBDIRSUFFIX}/libpcre.a || 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
@@ -98,9 +102,17 @@ gzip -9 $PKG/usr/info/*
 
 mkdir -p $PKG/usr/doc/grep-$VERSION
 cp -a \
-  ABOUT-NLS AUTHORS COPYING* INSTALL NEWS README* THANKS TODO \
+  AUTHORS COPYING* INSTALL NEWS README* THANKS TODO \
   $PKG/usr/doc/grep-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source/a/hdparm/hdparm.SlackBuild b/source/a/hdparm/hdparm.SlackBuild
index fbb2a2f7..951436d1 100755
--- a/source/a/hdparm/hdparm.SlackBuild
+++ b/source/a/hdparm/hdparm.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,9 +20,20 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=${VERSION:-9.27}
-ARCH=${ARCH:-x86_64}
+PKGNAM=hdparm
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:--j7}
 
 CWD=$(pwd)
@@ -34,7 +45,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf hdparm-$VERSION
-tar xvf $CWD/hdparm-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/hdparm-$VERSION.tar.?z* || exit 1
 cd hdparm-$VERSION || exit 1
 chown -R root:root .
 make $NUMJOBS || make || exit 1
@@ -54,6 +65,14 @@ cp -a \
 # 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
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
diff --git a/source/a/infozip/infozip.SlackBuild b/source/a/infozip/infozip.SlackBuild
index 900c4f95..5ac456d1 100755
--- a/source/a/infozip/infozip.SlackBuild
+++ b/source/a/infozip/infozip.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 VERSION=6.0
 ZIP=3.0
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-infozip
diff --git a/source/a/jfsutils/jfsutils.SlackBuild b/source/a/jfsutils/jfsutils.SlackBuild
index d97ebcb6..1795e970 100755
--- a/source/a/jfsutils/jfsutils.SlackBuild
+++ b/source/a/jfsutils/jfsutils.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,10 +21,20 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=${VERSION:-1.1.14}
-ARCH=${ARCH:-x86_64}
+PKGNAM=jfsutils
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-jfsutils
@@ -80,9 +90,17 @@ done
 
 mkdir -p $PKG/usr/doc/jfsutils-$VERSION
 cp -a \
-  AUTHORS COPYING ChangeLog NEWS README \
+  AUTHORS COPYING* NEWS README \
   $PKG/usr/doc/jfsutils-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 ( 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
diff --git a/source/a/lha/lha.SlackBuild b/source/a/lha/lha.SlackBuild
index fb333362..fffdab68 100755
--- a/source/a/lha/lha.SlackBuild
+++ b/source/a/lha/lha.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=114i
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-lha
diff --git a/source/a/libcgroup/doinst.sh b/source/a/libcgroup/doinst.sh
new file mode 100644
index 00000000..0799f0d9
--- /dev/null
+++ b/source/a/libcgroup/doinst.sh
@@ -0,0 +1,43 @@
+#!/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...
+}
+
+# Leave any new rc files with the same permissions as the old ones:
+if [ -e etc/rc.d/rc.cgconfig ]; then
+  if [ -x etc/rc.d/rc.cgconfig ]; then
+    chmod 755 etc/rc.d/rc.cgconfig.new
+  else
+    chmod 644 etc/rc.d/rc.cgconfig.new
+  fi
+fi
+if [ -e etc/rc.d/rc.cgred ]; then
+  if [ -x etc/rc.d/rc.cgred ]; then
+    chmod 755 etc/rc.d/rc.cgred.new
+  else
+    chmod 644 etc/rc.d/rc.cgred.new
+  fi
+fi
+
+# Then config() them:
+config etc/rc.d/rc.cgconfig.new
+config etc/rc.d/rc.cgred.new
+
+# config() the other configuration files:
+config etc/cgconfig.conf.new
+config etc/cgred.conf.new
+config etc/cgrules.conf.new
+config etc/cgsnapshot_blacklist.conf.new
+
+# If there are already installed config files, get rid of the .new ones.
+# There will still be fresh samples in the docs.
+rm -f etc/cgconfig.conf.new etc/cgred.conf.new etc/cgrules.conf.new etc/cgsnapshot_blacklist.conf.new
+
diff --git a/source/a/libcgroup/libcgroup.SlackBuild b/source/a/libcgroup/libcgroup.SlackBuild
new file mode 100755
index 00000000..286a7fa2
--- /dev/null
+++ b/source/a/libcgroup/libcgroup.SlackBuild
@@ -0,0 +1,163 @@
+#!/bin/sh
+
+# Copyright 2011  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=libcgroup
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION
+
+# Remove Red Hat / LSB init-scriptisms:
+zcat $CWD/libcgroup.init.diff.gz | patch -p1 --verbose || exit 1
+
+# Slackware does not use /etc/sysconfig:
+zcat $CWD/libcgroup.conf.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 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --sysconfdir=/etc \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --disable-pam \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# If this directory is empty, do not include it in the package:
+rmdir $PKG/usr/lib${LIBDIRSUFFIX}/security 2> /dev/null
+
+# Install init scripts:
+mkdir -p $PKG/etc/rc.d
+cp -a scripts/init.d/cgconfig $PKG/etc/rc.d/rc.cgconfig.new
+cp -a scripts/init.d/cgred $PKG/etc/rc.d/rc.cgred.new
+chmod 644 $PKG/etc/rc.d/*
+chown -R root:root $PKG/etc/rc.d/*
+
+# Install sample config files:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION/samples
+( cd samples
+  for conffile in cgconfig.conf cgred.conf cgrules.conf cgsnapshot_blacklist.conf ; do
+    cp -a $conffile $PKG/etc/${conffile}.new
+    cp -a $conffile $PKG/usr/doc/${PKGNAM}-$VERSION/samples
+  done
+)
+
+# 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
+)
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  AUTHORS COPYING* INSTALL NEWS README* THANKS TODO \
+  $PKG/usr/doc/${PKGNAM}-$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 files, if any:
+if [ -d $PKG/usr/info ]; then
+  ( cd $PKG/usr/info
+    rm -f dir
+    gzip -9 *
+  )
+fi
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
+mkdir -p $PKG/install
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/libcgroup/libcgroup.conf.diff b/source/a/libcgroup/libcgroup.conf.diff
new file mode 100644
index 00000000..f6e9dd10
--- /dev/null
+++ b/source/a/libcgroup/libcgroup.conf.diff
@@ -0,0 +1,8 @@
+--- ./samples/cgred.conf.orig	2011-01-10 14:16:09.750002388 -0600
++++ ./samples/cgred.conf	2011-01-10 14:16:20.446998061 -0600
+@@ -1,4 +1,4 @@
+-# /etc/sysconfig/cgred.conf - CGroup Rules Engine Daemon configuration file
++# /etc/cgred.conf - CGroup Rules Engine Daemon configuration file
+ # 
+ # The four options listed below (CONFIG_FILE, LOG_FILE, NODAEMON, LOG) are
+ # the only valid ones.  Defining anything else in this file will cause the
diff --git a/source/a/libcgroup/libcgroup.init.diff b/source/a/libcgroup/libcgroup.init.diff
new file mode 100644
index 00000000..75491295
--- /dev/null
+++ b/source/a/libcgroup/libcgroup.init.diff
@@ -0,0 +1,133 @@
+--- ./scripts/init.d/cgred.in.orig	2011-03-03 02:29:41.000000000 -0600
++++ ./scripts/init.d/cgred.in	2011-03-03 14:23:03.000000000 -0600
+@@ -39,9 +39,8 @@
+ # Sanity checks
+ [ -x $CGRED_BIN ] || exit 1
+ 
+-# Source function library & LSB routines
++# Source function library
+ . /etc/rc.d/init.d/functions
+-. /lib/lsb/init-functions
+ 
+ # Read in configuration options.
+ if [ -f "/etc/sysconfig/cgred.conf" ] ; then
+@@ -70,16 +69,16 @@
+ {
+ 	echo -n $"Starting CGroup Rules Engine Daemon: "
+ 	if [ -f "$lockfile" ]; then
+-		log_failure_msg "$servicename is already running with PID `cat ${pidfile}`"
++		echo "$servicename is already running with PID `cat ${pidfile}`"
+ 		return 0
+ 	fi
+ 	if [ ! -s $CGRED_CONF ]; then
+-		log_failure_msg "not configured"
++		echo "not configured"
+ 		return 6
+ 	fi
+ 	if ! grep "^cgroup" /proc/mounts &>/dev/null; then
+ 		echo
+-		log_failure_msg $"Cannot find cgroups, is cgconfig service running?"
++		echo $"Cannot find cgroups, is cgconfig service running?"
+ 		return 1
+ 	fi
+ 	daemon --check $servicename --pidfile $pidfile $CGRED_BIN $OPTIONS
+@@ -100,7 +99,7 @@
+ {
+ 	echo -n $"Stopping CGroup Rules Engine Daemon..."
+ 	if [ ! -f $pidfile ]; then
+-		log_success_msg
++		#log_success_msg
+ 		return 0
+ 	fi
+ 	killproc -p $pidfile -TERM "$processname"
+@@ -146,13 +145,13 @@
+ 			echo $"Reloading rules configuration..."
+ 			kill -s 12 `cat ${pidfile}`
+ 			RETVAL=$?
+-			if [ $RETVAL -eq 0 ] ; then
+-				log_success_msg
+-			else
+-				log_failure_msg
+-			fi
++			#if [ $RETVAL -eq 0 ] ; then
++			#	log_success_msg
++			#else
++			#	log_failure_msg
++			#fi
+ 		else
+-			log_failure_msg "$servicename is not running."
++			echo "$servicename is not running."
+ 		fi
+ 		;;
+ 	*)
+--- ./scripts/init.d/cgconfig.in.orig	2011-03-03 02:29:41.000000000 -0600
++++ ./scripts/init.d/cgconfig.in	2011-03-03 14:21:27.000000000 -0600
+@@ -36,11 +36,6 @@
+ servicename=cgconfig
+ lockfile=/var/lock/subsys/$servicename
+ 
+-#
+-# Source LSB routines
+-#
+-. /lib/lsb/init-functions
+-
+ # read the config
+ CREATE_DEFAULT=yes
+ if [ -e /etc/sysconfig/cgconfig ]; then
+@@ -54,8 +49,8 @@
+ 	    grep -m1 '^\*[[:space:]]\+' /etc/cgrules.conf | \
+ 		    read user ctrl defaultcgroup
+             if [ -n "$defaultcgroup" -a "$defaultcgroup" = "*" ]; then
+-                log_warning_msg "/etc/cgrules.conf incorrect"
+-                log_warning_msg "Overriding it"
++                echo "/etc/cgrules.conf incorrect"
++                echo "Overriding it"
+                 defaultcgroup=
+             fi
+         fi
+@@ -98,20 +93,20 @@
+ start() {
+         echo -n "Starting cgconfig service: "
+ 	if [ -f "$lockfile" ]; then
+-            log_warning_msg "lock file already exists"
++            echo "lock file already exists"
+             return 0
+         fi
+ 
+         if [ $? -eq 0 ]; then
+                 if [ ! -s $CONFIG_FILE ]; then
+-                    log_failure_msg $CONFIG_FILE "is not configured"
++                    echo $CONFIG_FILE "is not configured"
+                     return 6
+                 fi
+ 
+                 $CGCONFIGPARSER_BIN -l $CONFIG_FILE
+                 retval=$?
+                 if [ $retval -ne 0 ]; then
+-                    log_failure_msg "Failed to parse " $CONFIG_FILE
++                    echo "Failed to parse " $CONFIG_FILE
+                     return 1
+                 fi
+         fi
+@@ -123,10 +118,10 @@
+         touch "$lockfile"
+         retval=$?
+         if [ $retval -ne 0 ]; then
+-            log_failure_msg "Failed to touch $lockfile"
++            echo "Failed to touch $lockfile"
+             return 1
+         fi
+-        log_success_msg
++        #log_success_msg
+         return 0
+ }
+ 
+@@ -134,7 +129,7 @@
+     echo -n "Stopping cgconfig service: "
+     cgclear
+     rm -f "$lockfile"
+-    log_success_msg
++    #log_success_msg
+     return 0
+ }
+ 
diff --git a/source/a/libcgroup/slack-desc b/source/a/libcgroup/slack-desc
new file mode 100644
index 00000000..30a43ebe
--- /dev/null
+++ b/source/a/libcgroup/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-------------------------------------------------------|
+libcgroup: libcgroup (library and utilities for kernel control groups)
+libcgroup:
+libcgroup: Control Groups provide a mechanism for aggregating/partitioning sets of
+libcgroup: tasks, and all their future children, into hierarchical groups with
+libcgroup: specialized behaviour.  It makes use of a filesystem interface.
+libcgroup: This package contains a library for developing applications that use
+libcgroup: control groups, as well as some basic userspace tools for controlling
+libcgroup: and monitoring control groups.
+libcgroup:
+libcgroup: Homepage:  http://libcg.sourceforge.net/
+libcgroup:
diff --git a/source/a/lilo/lilo.SlackBuild b/source/a/lilo/lilo.SlackBuild
index e33c8778..2e7902cd 100755
--- a/source/a/lilo/lilo.SlackBuild
+++ b/source/a/lilo/lilo.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
 
 
 VERSION=${VERSION:-22.8}
-BUILD=${BUILD:-15}
+BUILD=${BUILD:-16}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -80,12 +80,11 @@ 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
+for bootsplash in $CWD/*.bmp ; do
+  cp -a $bootsplash $PKG/usr/doc/lilo-$VERSION/sample/$(basename $bootsplash)
+  chown root:root $PKG/usr/doc/lilo-$VERSION/sample/$(basename $bootsplash)
+  chmod 644 $PKG/usr/doc/lilo-$VERSION/sample/$(basename $bootsplash)
+done
 
 mv $PKG/usr/share/man $PKG/usr
 rmdir $PKG/usr/share
diff --git a/source/a/lilo/liloconfig b/source/a/lilo/liloconfig
index e786e752..7dccd3d6 100644
--- a/source/a/lilo/liloconfig
+++ b/source/a/lilo/liloconfig
@@ -2,7 +2,7 @@
 #
 # 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
+# Copyright 2007, 2008, 2011  Patrick Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -46,12 +46,18 @@ if [ ! -d "$T_PX" ]; then
     elif [ -r /usr/lib/setup/setup ]; then
       T_PX=/mnt
     else
-      # We will have to assume we've on an installed and running system.
+      # We will have to assume we're on an installed and running system.
       T_PX=/
     fi
   fi
 fi
 
+# Determine LILO documentation directory:
+LILODOCDIR="$(ls -d /usr/doc/lilo-* | tail -n 1)"
+if [ ! -d "$LILODOCDIR" ]; then
+  LILODOCDIR="/usr/doc/lilo/"
+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
@@ -132,24 +138,26 @@ EO_BMP
 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 \
+  --default-item standard \
   --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 \
+the VESA 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 \
+or monitor supports all of these video modes, and some X drivers could be \
+confused by them.  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" \
+  "ask" "Ask about using VESA modes at boot; time out to standard" \
   "640x480x64k" "Frame buffer console, 640x480x64k" \
   "800x600x64k" "Frame buffer console, 800x600x64k" \
   "1024x768x64k" "Frame buffer console, 1024x768x64k" \
+  "640x480x32k" "Frame buffer console, 640x480x32k" \
+  "800x600x32k" "Frame buffer console, 800x600x32k" \
+  "1024x768x32k" "Frame buffer console, 1024x768x32k" \
+  "640x480x256" "Frame buffer console, 640x480x256" \
+  "800x600x256" "Frame buffer console, 800x600x256" \
+  "1024x768x256" "Frame buffer console, 1024x768x256" \
   2> $TMP/reply
   if [ $? = 1 -o $? = 255 ]; then
     exit
@@ -289,14 +297,28 @@ EOF
 boot = $ROOT_DEVICE
 #delay = 5
 EOF
-   if [ "$CONSOLETYPE" = "standard" ]; then
+   if [ $CONSOLETYPE = standard ]; then
      cat << EOF >> $T_PX/etc/lilo.conf
+# Normal VGA console
 vga = normal
+# Ask for video mode at boot (time out to normal in 30s)
+#vga = ask
+EOF
+   elif [ $CONSOLETYPE = ask ]; then
+     cat << EOF >> $T_PX/etc/lilo.conf
+# Ask for video mode at boot (time out to normal in 30s)
+vga = ask
+# Normal VGA console
+#vga = normal
 EOF
    else
      cat << EOF >> $T_PX/etc/lilo.conf
 # VESA framebuffer at $CONSOLETYPE
 vga = $CONSOLENUM
+# Ask for video mode at boot (time out to normal in 30s)
+#vga = ask
+# Normal VGA console
+#vga = normal
 EOF
    fi
    cat << EOF >> $T_PX/etc/lilo.conf
@@ -406,55 +428,50 @@ timeout = 1200
 change-rules
   reset
 EOF
- if [ "$CONSOLETYPE" = "standard" ]; then
+ 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
+# Ask for video mode at boot (time out to normal in 30s)
+#vga = ask
+EOF
+ elif [ $CONSOLETYPE = ask ]; then
+   cat << EOF >> $T_PX/etc/lilo.conf
+# Ask for video mode at boot (time out to normal in 30s)
+vga = ask
+# Normal VGA console
+#vga = normal
 EOF
  else
    cat << EOF >> $T_PX/etc/lilo.conf
 # VESA framebuffer console @ $CONSOLETYPE
 vga = $CONSOLENUM
 # Normal VGA console
-# vga = normal
+#vga = normal
+# Ask for video mode at boot (time out to normal in 30s)
+#vga = ask
+EOF
+ fi
+cat << EOF >> $T_PX/etc/lilo.conf
 # VESA framebuffer console @ 1024x768x64k
-# vga=791
+#vga=791
 # VESA framebuffer console @ 1024x768x32k
-# vga=790
+#vga=790
 # VESA framebuffer console @ 1024x768x256
-# vga=773
+#vga=773
 # VESA framebuffer console @ 800x600x64k
-# vga=788
+#vga=788
 # VESA framebuffer console @ 800x600x32k
-# vga=787
+#vga=787
 # VESA framebuffer console @ 800x600x256
-# vga=771
+#vga=771
 # VESA framebuffer console @ 640x480x64k
-# vga=785
+#vga=785
 # VESA framebuffer console @ 640x480x32k
-# vga=784
+#vga=784
 # VESA framebuffer console @ 640x480x256
-# vga=769
+#vga=769
 EOF
- fi
 cat << EOF >> $T_PX/etc/lilo.conf
 # End LILO global section
 EOF
@@ -551,8 +568,35 @@ name?" 7 60
  fi
 }
 
+checkbootsplash()
+{
+ if [ "$(uname -m)" = "x86_64" ]; then
+  if [ -r $LILODOCDIR/sample/slack64.bmp ]; then
+   cp -a $LILODOCDIR/sample/slack64.bmp /boot/slack.bmp
+  fi
+ else
+  if [ -r $LILODOCDIR/sample/slack.bmp ]; then
+   cp -a $LILODOCDIR/sample/slack.bmp /boot/slack.bmp
+  fi
+ fi
+ if [ -r $HOME/1337 ]; then
+  if [ -r $LILODOCDIR/sample/sl1337.bmp ]; then
+   cp -a $LILODOCDIR/sample/sl1337.bmp /boot/slack.bmp
+  fi
+ fi
+ # Thanks to amrit@slackware.com:
+ if grep -wq 13.37.0 /etc/slackware-version ; then
+  if ls -l /etc/lilo.conf | grep -q 13:37 ; then
+   if [ -r $LILODOCDIR/sample/sl1337.bmp ]; then
+    cp -a $LILODOCDIR/sample/sl1337.bmp /boot/slack.bmp
+   fi
+  fi
+ fi
+}
+
 installcolor()
 {
+ checkbootsplash;
  dialog --infobox "\nInstalling the Linux Loader..." 5 40
  if [ "$T_PX" = "/" ]; then
   lilo 1> /dev/null 2> /etc/lilo-error.$$
@@ -586,7 +630,7 @@ 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.  \
+LILO man page and documentation in $LILODOCDIR for more help.  \
 The error message may be seen above.
 EOF
   dialog --msgbox "$(cat /etc/lilo-error.$$)" 0 0
@@ -595,6 +639,7 @@ EOF
 
 installtext()
 {
+ checkbootsplash;
  echo "Installing the Linux Loader..."
  if [ "$T_PX" = "/" ]; then
   lilo
@@ -629,7 +674,7 @@ 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
+See the LILO man page and documentation in $LILODOCDIR for more
 help.
 
 EOF
@@ -888,31 +933,27 @@ EOF
      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
+# Ask for video mode at boot (time out to normal in 30s)
+#vga = ask
+EOF
+   elif [ "$CONSOLETYPE" = "ask" ]; then
+     cat << EOF >> $TMP/lilo.conf
+# Ask for video mode at boot (time out to normal in 30s)
+vga = ask
+# Normal VGA console
+#vga = normal
 EOF
    else
      cat << EOF >> $TMP/lilo.conf
 # VESA framebuffer console @ $CONSOLETYPE
 vga = $CONSOLENUM
 # Normal VGA console
-# vga = normal
+#vga = normal
+# Ask for video mode at boot (time out to normal in 30s)
+#vga = ask
+EOF
+   fi
+   cat << EOF >> $TMP/lilo.conf
 # VESA framebuffer console @ 1024x768x64k
 # vga=791
 # VESA framebuffer console @ 1024x768x32k
@@ -932,7 +973,6 @@ vga = $CONSOLENUM
 # VESA framebuffer console @ 640x480x256
 # vga=769
 EOF
-   fi
    cat << EOF >> $TMP/lilo.conf
 # ramdisk = 0     # paranoia setting
 # End LILO global section
@@ -940,14 +980,20 @@ 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 [ "$ROOT_DEVICE" != "" ]; then
+     DEFROOT="--default-item $ROOT_DEVICE"
+    fi
+    echo "dialog --title \"SELECT LINUX PARTITION\" $DEFROOT --menu \\" > $TMP/tmpmsg
+    echo "\"Which Linux partition would you like LILO to boot?\n\
+\n\
+   Partition             Start         End     Sectors   ID\" 22 74 13 \\" >> $TMP/tmpmsg
+    PROBE -l 2> /dev/null | grep "Linux$" | sort | while read STR; do
+     STR1="$(echo -n "$STR" | cut -f 1 -d ' ')"
+     STR2="$(echo -n "$STR" | cut -f 2- -d ' ')"
+     echo "\"$STR1\" \"$STR2\" \\" >> $TMP/tmpmsg
+    done
+    echo "2> $TMP/reply" >> $TMP/tmpmsg
+    . $TMP/tmpmsg
     if [ $? = 1 -o $? = 255 ]; then
      rm $TMP/tmpmsg
      continue
@@ -958,7 +1004,7 @@ EOF
     if [ ! $? = 0 ]; then
      continue;
     fi
-    dialog --title "SELECT PARTITION NAME" --inputbox \
+    dialog --title "SELECT PARTITION NAME FOR $LINUX_PART" --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 \
diff --git a/source/a/lilo/sl1337.bmp b/source/a/lilo/sl1337.bmp
new file mode 100644
index 00000000..34a62d1b
--- /dev/null
+++ b/source/a/lilo/sl1337.bmp
diff --git a/source/a/lilo/slack64.bmp b/source/a/lilo/slack64.bmp
index 464e4683..0d17f234 100644
--- a/source/a/lilo/slack64.bmp
+++ b/source/a/lilo/slack64.bmp
diff --git a/source/a/lrzip/doinst.sh b/source/a/lrzip/doinst.sh
new file mode 100644
index 00000000..6ed464c6
--- /dev/null
+++ b/source/a/lrzip/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/lrzip.conf.new
+
diff --git a/source/a/lrzip/lrzip.SlackBuild b/source/a/lrzip/lrzip.SlackBuild
new file mode 100755
index 00000000..b45a8a5a
--- /dev/null
+++ b/source/a/lrzip/lrzip.SlackBuild
@@ -0,0 +1,131 @@
+#!/bin/sh
+
+# Copyright 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+PKGNAM=lrzip
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION
+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 \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+if [ -r doc/lrzip.conf.example ]; then
+  mkdir -p $PKG/etc
+  cp -a doc/lrzip.conf.example $PKG/etc/lrzip.conf.new
+  chown root:root $PKG/etc/lrzip.conf.new
+  chmod 644 $PKG/etc/lrzip.conf.new
+fi
+
+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
+
+# Restore a few original file timestamps:
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS BUGS COPYING* README* TODO WHATS-NEW \
+  doc/README* doc/lrzip.conf.example doc/magic.header.txt \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
+mkdir -p $PKG/install
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/lrzip/slack-desc b/source/a/lrzip/slack-desc
new file mode 100644
index 00000000..12b1b9d6
--- /dev/null
+++ b/source/a/lrzip/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------------------------------------------------------|
+lrzip: lrzip (Long Range ZIP)
+lrzip:
+lrzip: LRZIP is a file compression program designed to do particularly well
+lrzip: on very large files containing long distance redundancy.  The larger
+lrzip: the file and the more memory you have, the better the compression
+lrzip: advantage this will provide.  A variety of compression options allow
+lrzip: optimizing for size or speed.
+lrzip:
+lrzip: Homepage:  http://ck.kolivas.org/apps/lrzip/
+lrzip:
+lrzip:
diff --git a/source/a/lvm2/build_with_udev_165_and_later.diff b/source/a/lvm2/build_with_udev_165_and_later.diff
new file mode 100644
index 00000000..800e0f9f
--- /dev/null
+++ b/source/a/lvm2/build_with_udev_165_and_later.diff
@@ -0,0 +1,21 @@
+diff -Nur LVM2.2.02.84.orig//configure LVM2.2.02.84/configure
+--- LVM2.2.02.84.orig//configure	2011-02-04 16:17:54.000000000 -0600
++++ LVM2.2.02.84/configure	2011-02-09 20:23:11.818797797 -0600
+@@ -8768,7 +8768,7 @@
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ludev  $LIBS"
++LIBS="-ludev -lrt $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -8799,7 +8799,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_udev_udev_queue_get_udev_is_active" >&5
+ $as_echo "$ac_cv_lib_udev_udev_queue_get_udev_is_active" >&6; }
+ if test "x$ac_cv_lib_udev_udev_queue_get_udev_is_active" = x""yes; then :
+-  UDEV_PC="libudev"; UDEV_LIBS="-ludev"
++  UDEV_PC="libudev"; UDEV_LIBS="-ludev -lrt"
+ else
+   as_fn_error $? "bailing out... libudev library is required" "$LINENO" 5
+ fi
diff --git a/source/a/lvm2/lvm2.SlackBuild b/source/a/lvm2/lvm2.SlackBuild
index 5199f9c7..e72897d0 100755
--- a/source/a/lvm2/lvm2.SlackBuild
+++ b/source/a/lvm2/lvm2.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=$(echo LVM2.*.tar.?z* | cut -f 2- -d . | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
+VERSION=$(echo LVM2.*.tar.xz | cut -f 2- -d . | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -58,7 +58,7 @@ rm -rf $PKG
 mkdir -p $PKG
 cd $TMP
 rm -rf LVM2.$VERSION
-tar xvf $CWD/LVM2.$VERSION.tar.xz
+tar xvf $CWD/LVM2.$VERSION.tar.xz || exit 1
 cd LVM2.$VERSION || exit 1
 
 chown -R root:root .
@@ -68,6 +68,9 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
+# Fix linking of librt until upstream does it correctly :)
+zcat $CWD/build_with_udev_165_and_later.diff.gz | patch -p1 --verbose || exit 1
+
 # uid 0 = root
 # gid 6 = disk
 CFLAGS="$SLKCFLAGS" \
@@ -75,10 +78,12 @@ CFLAGS="$SLKCFLAGS" \
   --disable-readline \
   --enable-cmdlib \
   --enable-dmeventd \
+  --enable-applib \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --with-usrlibdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --enable-static_link \
+  --enable-realtime \
   --with-lvm1=internal \
   --enable-pkgconfig \
   --enable-udev_sync \
@@ -86,7 +91,7 @@ CFLAGS="$SLKCFLAGS" \
   --with-udev-prefix="" \
   --with-device-uid=0 \
   --with-device-gid=6 \
-  --with-device-mode=0664 \
+  --with-device-mode=0660 \
   --build=$ARCH-slackware-linux
 
 make $NUMJOBS || make || exit 1
@@ -94,6 +99,9 @@ make install DESTDIR=$PKG || exit 1
 
 mv $PKG/etc/lvm/lvm.conf $PKG/etc/lvm/lvm.conf.new
 
+# Create default rundir
+mkdir -p $PKG/var/run/lvm
+
 if [ -d $PKG/usr/share/man ]; then # --mandir was ignored
   mv $PKG/usr/share/man $PKG/usr
   rmdir $PKG/usr/share
@@ -106,42 +114,29 @@ mkdir -p $PKG/lib${LIBDIRSUFFIX}
     mv $file ../../lib${LIBDIRSUFFIX}
     ln -sf ../../lib${LIBDIRSUFFIX}/$file .
   done
-  cp -a lib*.so.? ../../lib${LIBDIRSUFFIX}
 )
+
 # The Makefile is DIW.
 ( cd $PKG/usr/lib${LIBDIRSUFFIX}
   find . -name "*.so" -type l | cut -b3- | while read file ; do
-    rm -f $file
-    ln -sf ${file}.?.* $file
+    # These two excluded files are in ./device-mapper/ subdir
+    if [ "$file" != "libdevmapper-event-lvm2mirror.so" -a "$file" != "libdevmapper-event-lvm2snapshot.so" ]; then
+      rm -f $file
+      ln -sf $(basename ../../lib${LIBDIRSUFFIX}/${file}.?.*) $file
+    fi
   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
-)
+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/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
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/install
 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
diff --git a/source/a/mcelog/doinst.sh b/source/a/mcelog/doinst.sh
new file mode 100644
index 00000000..fd9d549a
--- /dev/null
+++ b/source/a/mcelog/doinst.sh
@@ -0,0 +1,24 @@
+#!/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...
+}
+
+# Keep same perms on rc.mcelog.new:
+if [ -e etc/rc.d/rc.mcelog ]; then
+  cp -a etc/rc.d/rc.mcelog etc/rc.d/rc.mcelog.new.incoming
+  cat etc/rc.d/rc.mcelog.new > etc/rc.d/rc.mcelog.new.incoming
+  mv etc/rc.d/rc.mcelog.new.incoming etc/rc.d/rc.mcelog.new
+fi
+
+config etc/logrotate.d/mcelog.new
+config etc/mcelog/mcelog.conf.new
+config etc/rc.d/rc.mcelog.new
+
diff --git a/source/a/mcelog/mcelog-1.0pre3.tar.bz2.sign b/source/a/mcelog/mcelog-1.0pre3.tar.bz2.sign
new file mode 100644
index 00000000..1f9c73a4
--- /dev/null
+++ b/source/a/mcelog/mcelog-1.0pre3.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
+
+iD8DBQBLV9g/yGugalF9Dw4RAlheAJ4t2DqUZX1ySR3QH8RdVHLYyePHawCcC/Ct
+N94+oQu1HHumOx0V6Ft+2Fo=
+=eEE6
+-----END PGP SIGNATURE-----
diff --git a/source/a/mcelog/mcelog.SlackBuild b/source/a/mcelog/mcelog.SlackBuild
new file mode 100755
index 00000000..0a461cd8
--- /dev/null
+++ b/source/a/mcelog/mcelog.SlackBuild
@@ -0,0 +1,90 @@
+
+#!/bin/sh
+
+# Copyright 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+PKGNAM=mcelog
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1
+cd $PKGNAM-$VERSION
+
+zcat $CWD/mcelog.init.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 $NUMJOBS || make || exit 1
+
+mkdir -p $PKG/etc/mcelog $PKG/usr/sbin $PKG/usr/man/man8
+install -m 755 -p mcelog $PKG/usr/sbin/mcelog
+install -m 644 -p mcelog.8 $PKG/usr/man/man8
+gzip -9 $PKG/usr/man/man8/mcelog.8
+install -m 644 -p -b mcelog.conf $PKG/etc/mcelog/mcelog.conf.new
+for i in cache-error-trigger dimm-error-trigger page-error-trigger socket-memory-error-trigger ; do
+  install -m 755 -p -b triggers/$i $PKG/etc/mcelog
+done
+
+mkdir -p $PKG/etc/rc.d
+install -m 755 -p mcelog.init $PKG/etc/rc.d/rc.mcelog.new
+
+mkdir -p $PKG/etc/logrotate.d
+install -m 644 -p mcelog.logrotate $PKG/etc/logrotate.d/mcelog.new
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  CHANGES README* TODO* *.pdf \
+  $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/a/mcelog/mcelog.init.diff b/source/a/mcelog/mcelog.init.diff
new file mode 100644
index 00000000..cc2eee96
--- /dev/null
+++ b/source/a/mcelog/mcelog.init.diff
@@ -0,0 +1,56 @@
+--- ./mcelog.init.orig	2010-01-20 20:36:52.000000000 -0600
++++ ./mcelog.init	2010-09-27 17:23:24.964394022 -0500
+@@ -2,11 +2,6 @@
+ # 
+ # Startup script for mcelog
+ # 
+-# This should be customized for distribution standards
+-# (using rc_status etc.)
+-# The paths are hardcoded and are not automatically adjusted
+-# for different prefix
+-#
+ ### BEGIN INIT INFO
+ # Provides:		mcelog 
+ # Default-Start:	3 5
+@@ -16,8 +11,6 @@
+ #                       This logs and handles CPU hardware errors on x86 systems.
+ ### END INIT INFO
+ 
+-# put this is sysconfig
+-
+ # mcelog mode
+ # valid values: daemon, trigger, cron
+ # Recommended value daemon
+@@ -52,8 +45,8 @@
+ case "$1" in
+ start)
+ 	if [ "$MCELOG_MODE" = "daemon" ] ; then
+-		echo "Starting mcelog daemon"
+-		startproc $MCELOG --daemon $MCELOG_OPTIONS
++		echo "Starting mcelog daemon:  $MCELOG --daemon $MCELOG_OPTIONS"
++		$MCELOG --daemon $MCELOG_OPTIONS
+ 	elif [ -f "$TRIGGER" ] ; then
+ 		echo $MCELOG > "$TRIGGER"
+ 	else
+@@ -62,8 +55,8 @@
+ 	;;
+ stop)
+ 	if [ "$MCELOG_MODE" = "daemon" ] ; then
+-		echo "Stopping mcelog"
+-		killproc -TERM $MCELOG
++		echo "Stopping mcelog daemon:  killall -TERM $MCELOG"
++		killall -TERM $MCELOG
+ 	elif [ "$MCELOG_MODE" = "trigger" -a -f "$TRIGGER" ]; then 
+ 		echo "" > "$TRIGGER"
+ 	else
+@@ -85,8 +78,8 @@
+ 	;;
+ status)
+ 	if [ "$MCELOG_MODE" = "daemon" ] ; then
+-		echo "Checking for mcelog"
+-		checkproc $MCELOG
++		echo "Checking for mcelog:"
++		ps ax | grep $MCELOG | cut -f 1 -d ' '
+ 	fi
+ 	;;
+ *)
diff --git a/source/a/mcelog/slack-desc b/source/a/mcelog/slack-desc
new file mode 100644
index 00000000..0948e268
--- /dev/null
+++ b/source/a/mcelog/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------------------------------------------------------|
+mcelog: mcelog (Machine Check Event logger)
+mcelog:
+mcelog: mcelog is the user space backend for logging machine check errors
+mcelog: reported by the hardware to the kernel.  The kernel does the immediate
+mcelog: actions (like killing processes etc.) and mcelog decodes the logs the
+mcelog: errors.  It primarily handles machine checks and thermal events, which
+mcelog: are reported for errors detected by the CPU.  It is recommended that
+mcelog: mcelog runs on all x86 machines, both 64-bit and 32bit.
+mcelog:
+mcelog: mcelog home:  ftp://ftp.kernel.org:/pub/linux/utils/cpu/mce
+mcelog:
diff --git a/source/a/mdadm/mdadm-2.6.9.tar.bz2.sign b/source/a/mdadm/mdadm-2.6.9.tar.bz2.sign
deleted file mode 100644
index 95c6050d..00000000
--- a/source/a/mdadm/mdadm-2.6.9.tar.bz2.sign
+++ /dev/null
@@ -1,8 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-Comment: See http://www.kernel.org/signature.html for info
-
-iD8DBQBJtgO9yGugalF9Dw4RAjdkAJ9yrZow4cgdSuoqFbXROoDzH9EyTwCfSVY5
-Ew7L5NKxUJZbZVXseX82eT0=
-=X/Wg
------END PGP SIGNATURE-----
diff --git a/source/a/mdadm/mdadm-3.1.5.tar.bz2.sign b/source/a/mdadm/mdadm-3.1.5.tar.bz2.sign
new file mode 100644
index 00000000..e5c72768
--- /dev/null
+++ b/source/a/mdadm/mdadm-3.1.5.tar.bz2.sign
@@ -0,0 +1,8 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+Comment: See http://www.kernel.org/signature.html for info
+
+iD8DBQBNiYLLyGugalF9Dw4RAjiBAJkB62x+h+B7v24ghmwIUa2p44sWNwCeIZfe
+sW9YOnjL/odR4C9Uuzu5pUQ=
+=qI9A
+-----END PGP SIGNATURE-----
diff --git a/source/a/mdadm/mdadm.SlackBuild b/source/a/mdadm/mdadm.SlackBuild
index 4e59b703..71f7c1a3 100755
--- a/source/a/mdadm/mdadm.SlackBuild
+++ b/source/a/mdadm/mdadm.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=2.6.9
+VERSION=3.1.5
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -45,8 +45,10 @@ rm -rf mdadm-$VERSION
 tar xjvf $CWD/mdadm-$VERSION.tar.bz2 || exit 1
 cd mdadm-$VERSION
 
-# Build this static:
-zcat $CWD/mdadm.static.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
+# With glibc on the initrd and installer, there is no longer a
+# good reason to compile this statically.  Commented out.
+## Build this static:
+##zcat $CWD/mdadm.static.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
 
 chown -R root:root .
 find . \
diff --git a/source/a/minicom/doinst.sh b/source/a/minicom/doinst.sh
index f667412e..5961829b 100644
--- a/source/a/minicom/doinst.sh
+++ b/source/a/minicom/doinst.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 config() {
   NEW="$1"
-  OLD="`dirname $NEW`/`basename $NEW .new`"
+  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
+  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...
diff --git a/source/a/minicom/lrzsz_0.12.21-4.diff b/source/a/minicom/lrzsz_0.12.21-4.diff
deleted file mode 100644
index 01c72157..00000000
--- a/source/a/minicom/lrzsz_0.12.21-4.diff
+++ /dev/null
@@ -1,3019 +0,0 @@
---- 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/lrzsz_0.12.21-5.diff b/source/a/minicom/lrzsz_0.12.21-5.diff
new file mode 100644
index 00000000..b2541a91
--- /dev/null
+++ b/source/a/minicom/lrzsz_0.12.21-5.diff
@@ -0,0 +1,4194 @@
+--- lrzsz-0.12.21.orig/po/de.po
++++ lrzsz-0.12.21/po/de.po
+@@ -28,21 +28,21 @@
+ 
+ #: src/lsz.c:422
+ msgid "packetlength"
+-msgstr "Paketlänge"
++msgstr "Paketl?nge"
+ 
+ #: src/lsz.c:427
+ #, c-format
+ msgid "packetlength out of range 24..%ld"
+-msgstr "Argument der Option L außerhalb des Bereichs 24..%ld"
++msgstr "Argument der Option L au?erhalb des Bereichs 24..%ld"
+ 
+ #: src/lsz.c:436
+ msgid "framelength"
+-msgstr "Framelänge"
++msgstr "Framel?nge"
+ 
+ #: src/lsz.c:441
+ #, c-format
+ msgid "framelength out of range 32..%ld"
+-msgstr "Argument der Option l außerhalb des Bereichs 32..%ld"
++msgstr "Argument der Option l au?erhalb des Bereichs 32..%ld"
+ 
+ #: src/lrz.c:318 src/lsz.c:450
+ msgid "min_bps"
+@@ -50,7 +50,7 @@
+ 
+ #: src/lsz.c:452
+ msgid "min_bps must be >= 0"
+-msgstr "minimale BPS-Rate muß >= 0 sein"
++msgstr "minimale BPS-Rate mu? >= 0 sein"
+ 
+ #: src/lrz.c:324 src/lsz.c:458
+ msgid "min_bps_time"
+@@ -58,7 +58,7 @@
+ 
+ #: src/lrz.c:326 src/lsz.c:460
+ msgid "min_bps_time must be > 1"
+-msgstr "Zeitfenster für minimale BPS-Rate muß > 1 Sekunde sein"
++msgstr "Zeitfenster f?r minimale BPS-Rate mu? > 1 Sekunde sein"
+ 
+ #: src/lrz.c:342 src/lsz.c:484
+ msgid "hour to large (0..23)"
+@@ -70,7 +70,7 @@
+ 
+ #: src/lrz.c:348 src/lsz.c:490
+ msgid "minute to large (0..59)"
+-msgstr "Minute zu groß (0..59)"
++msgstr "Minute zu gro? (0..59)"
+ 
+ #: src/lrz.c:358 src/lrz.c:365 src/lsz.c:500 src/lsz.c:507
+ msgid "stop time to small"
+@@ -86,15 +86,15 @@
+ 
+ #: src/lrz.c:396 src/lsz.c:518
+ msgid "timeout out of range 10..1000"
+-msgstr "Argument der Option t außerhalb des Bereichs 10..1000"
++msgstr "Argument der Option t au?erhalb des Bereichs 10..1000"
+ 
+ #: src/lrz.c:412 src/lsz.c:526
+ msgid "security violation: can't do that under restricted shell\n"
+-msgstr "Sicherheitsverstoß: Ausführung unter eingeschränkter Shell verboten\n"
++msgstr "Sicherheitsversto?: Ausf?hrung unter eingeschr?nkter Shell verboten\n"
+ 
+ #: src/lrz.c:402 src/lsz.c:533
+ msgid "window size"
+-msgstr "Fenstergröße"
++msgstr "Fenstergr??e"
+ 
+ #: src/lrz.c:427 src/lrz.c:434 src/lsz.c:556 src/lsz.c:563
+ msgid "cannot turnoff syslog"
+@@ -102,7 +102,7 @@
+ 
+ #: src/lrz.c:449 src/lsz.c:571
+ msgid "startup delay"
+-msgstr "Startverzögerung"
++msgstr "Startverz?gerung"
+ 
+ #: 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
+@@ -117,11 +117,11 @@
+ 
+ #: src/lsz.c:612 src/lsz.c:627
+ msgid "need at least one file to send"
+-msgstr "es muß mindestens ein Name einer zu sendenden Datei angegeben werden"
++msgstr "es mu? mindestens ein Name einer zu sendenden Datei angegeben werden"
+ 
+ #: src/lsz.c:629
+ msgid "Can't send command in restricted mode\n"
+-msgstr "Im eingeschränkten Modus ist das Senden von Kommandos verboten\n"
++msgstr "Im eingeschr?nkten Modus ist das Senden von Kommandos verboten\n"
+ 
+ #: src/lrz.c:527 src/lsz.c:656
+ msgid "hostname too long\n"
+@@ -137,21 +137,21 @@
+ 
+ #: src/lrz.c:574 src/lsz.c:803
+ msgid "Transfer incomplete\n"
+-msgstr "Übertragung nicht abgeschlossen\n"
++msgstr "?bertragung nicht abgeschlossen\n"
+ 
+ #: src/lrz.c:576 src/lsz.c:805
+ msgid "Transfer complete\n"
+-msgstr "Übertragung abgeschlossen\n"
++msgstr "?bertragung abgeschlossen\n"
+ 
+ #: src/lsz.c:838
+ #, c-format
+ msgid "send_pseudo %s: cannot open tmpfile %s: %s"
+-msgstr "send_pseudo %s: kann temporäre Datei %s nicht öffnen: %s"
++msgstr "send_pseudo %s: kann tempor?re Datei %s nicht ?ffnen: %s"
+ 
+ #: src/lsz.c:851
+ #, c-format
+ msgid "send_pseudo %s: cannot lstat tmpfile %s: %s"
+-msgstr "send_pseudo %s: kann lstat nicht auf temporäre Datei %s anwenden: %s"
++msgstr "send_pseudo %s: kann lstat nicht auf tempor?re Datei %s anwenden: %s"
+ 
+ #: src/lsz.c:859
+ #, c-format
+@@ -161,7 +161,7 @@
+ #: src/lsz.c:870
+ #, c-format
+ msgid "send_pseudo %s: cannot write to tmpfile %s: %s"
+-msgstr "send_pseudo %s: kann nicht in temporäre Datei %s schreiben: %s"
++msgstr "send_pseudo %s: kann nicht in tempor?re Datei %s schreiben: %s"
+ 
+ #: src/lsz.c:879
+ #, c-format
+@@ -188,17 +188,17 @@
+ 
+ #: src/lsz.c:953
+ msgid "Can't open any requested files."
+-msgstr "Kann keine der angeforderten Dateien öffnen"
++msgstr "Kann keine der angeforderten Dateien ?ffnen"
+ 
+ #: src/lsz.c:1009
+ #, c-format
+ msgid "security violation: not allowed to upload from %s"
+-msgstr "Sicherheitsverstoß: Ausführung unter eingeschränkter Shell verboten"
++msgstr "Sicherheitsversto?: Ausf?hrung unter eingeschr?nkter Shell verboten"
+ 
+ #: src/lrz.c:1384 src/lsz.c:1027
+ #, c-format
+ msgid "cannot open %s"
+-msgstr "kann %s nicht öffnen"
++msgstr "kann %s nicht ?ffnen"
+ 
+ #: src/lsz.c:1082
+ #, c-format
+@@ -213,12 +213,12 @@
+ #: src/lsz.c:1119
+ #, c-format
+ msgid "skipped: %s"
+-msgstr "übersprungen: %s"
++msgstr "?bersprungen: %s"
+ 
+ #: src/lsz.c:1122
+ #, c-format
+ msgid "%s/%s: skipped"
+-msgstr "%s/%s: übersprungen"
++msgstr "%s/%s: ?bersprungen"
+ 
+ #: src/lsz.c:1149
+ #, c-format
+@@ -228,7 +228,7 @@
+ #: src/lsz.c:1178
+ #, c-format
+ msgid "Sending %s, %ld blocks: "
+-msgstr "Sende %s, %ld Blöcke:"
++msgstr "Sende %s, %ld Bl?cke:"
+ 
+ #: src/lsz.c:1181
+ msgid "Give your local XMODEM receive command now."
+@@ -245,11 +245,11 @@
+ 
+ #: src/lsz.c:1314
+ msgid "Receiver Cancelled"
+-msgstr "Empfänger brach ab"
++msgstr "Empf?nger brach ab"
+ 
+ #: src/lsz.c:1340
+ msgid "No ACK on EOT"
+-msgstr "Keine Bestätigung für Übertragungsende erhalten"
++msgstr "Keine Best?tigung f?r ?bertragungsende erhalten"
+ 
+ #: src/lsz.c:1361
+ #, c-format
+@@ -267,11 +267,11 @@
+ 
+ #: src/lsz.c:1399
+ msgid "Timeout on sector ACK"
+-msgstr "Timeout bei Sektorbestätigung"
++msgstr "Timeout bei Sektorbest?tigung"
+ 
+ #: src/lsz.c:1404
+ msgid "NAK on sector"
+-msgstr "Sektor nicht bestätigt"
++msgstr "Sektor nicht best?tigt"
+ 
+ #: src/lsz.c:1410
+ msgid "Got burst for sector ACK"
+@@ -280,11 +280,11 @@
+ #: src/lsz.c:1412
+ #, c-format
+ msgid "Got %02x for sector ACK"
+-msgstr "Erhielt %02x als Sektorbestätigung"
++msgstr "Erhielt %02x als Sektorbest?tigung"
+ 
+ #: src/lsz.c:1424
+ msgid "Retry Count Exceeded"
+-msgstr "Maximale Wiederholungsanzahl überschritten"
++msgstr "Maximale Wiederholungsanzahl ?berschritten"
+ 
+ #: src/lrz.c:596 src/lsz.c:1502
+ #, c-format
+@@ -308,7 +308,7 @@
+ 
+ #: src/lsz.c:1513
+ msgid "Send file(s) with ZMODEM/YMODEM/XMODEM protocol\n"
+-msgstr "Dateien mit ZMODEM/YMODEM/XMODEM übertragen\n"
++msgstr "Dateien mit ZMODEM/YMODEM/XMODEM ?bertragen\n"
+ 
+ # src/lrz.c:475 src/lsz.c:1330 xx
+ #: src/lrz.c:607 src/lsz.c:1515
+@@ -317,9 +317,9 @@
+ "    (Y) = option applies to YMODEM only\n"
+ "    (Z) = option applies to ZMODEM only\n"
+ msgstr ""
+-"    (X) = Option gilt nur für XMODEM\n"
+-"    (Y) = Option gilt nur für YMODEM\n"
+-"    (Z) = Option gilt nur für ZMODEM\n"
++"    (X) = Option gilt nur f?r XMODEM\n"
++"    (Y) = Option gilt nur f?r YMODEM\n"
++"    (Z) = Option gilt nur f?r ZMODEM\n"
+ 
+ #: src/lsz.c:1521
+ msgid ""
+@@ -347,32 +347,32 @@
+ "  -m, --min-bps N             stop transmission if BPS below N\n"
+ "  -M, --min-bps-time N          for at least N seconds (default: 120)\n"
+ msgstr ""
+-"  -+, --append                an existierende Dateien anhängen (Z)\n"
++"  -+, --append                an existierende Dateien anh?ngen (Z)\n"
+ "  -2, --twostop               zwei Stopbits verwenden\n"
+-"  -4, --try-4k                bis zu 4K Blockgröße verwenden\n"
+-"      --start-4k              mit 4K Blockgröße starten (versucht nicht 8)\n"
+-"  -8, --try-8k                bis zu 8K Blockgröße verwenden\n"
+-"      --start-8k              mit 8K Blockgröße starten\n"
++"  -4, --try-4k                bis zu 4K Blockgr??e verwenden\n"
++"      --start-4k              mit 4K Blockgr??e starten (versucht nicht 8)\n"
++"  -8, --try-8k                bis zu 8K Blockgr??e verwenden\n"
++"      --start-8k              mit 8K Blockgr??e starten\n"
+ "  -a, --ascii                 ASCII: NL nach CR/LF wandeln\n"
+-"  -b, --binary                Binärübertragung erzwingen\n"
++"  -b, --binary                Bin?r?bertragung erzwingen\n"
+ "  -B, --bufsize N             N Bytes puffern (auto: ganze Datei puffern)\n"
+-"  -c, --command COMMAND       Kommando KOMMANDO auf Gegenseite ausführen "
++"  -c, --command COMMAND       Kommando KOMMANDO auf Gegenseite ausf?hren "
+ "(Z)\n"
+-"  -C, --command-tries N       N mal Kommandoausführung versuchen (Z)\n"
++"  -C, --command-tries N       N mal Kommandoausf?hrung versuchen (Z)\n"
+ "  -d, --dot-to-slash C        '.' in Dateinamen nach '/' wandeln (Y/Z)\n"
+ "      --delay-startup N       Bei Programmstart N Sek. schlafen (Debugging)\n"
+ "  -e, --escape                alle Steuerzeichen escapen (Z)\n"
+-"  -E, --rename                Empfänger soll Datei umbenennen falls\n"
++"  -E, --rename                Empf?nger soll Datei umbenennen falls\n"
+ "                              Zieldatei schon existiert\n"
+ "  -f, --full-path             Dateien mit vollen Pfaden senden (Y/Z)\n"
+-"  -i, --immediate-command CMD wie `c', aber sofort zurückkehren (Z)\n"
++"  -i, --immediate-command CMD wie `c', aber sofort zur?ckkehren (Z)\n"
+ "  -h, --help                  diesen Hilfetext ausgeben\n"
+ "  -k, --1k                    1024 Bytes Pakete senden (Y)\n"
+-"  -L, --packetlen N           Unterpaketlänge auf N Bytes beschränken (Z)\n"
+-"  -l, --framelen N            Rahmenlänge auf N Bytes beschränken (l>=L) "
++"  -L, --packetlen N           Unterpaketl?nge auf N Bytes beschr?nken (Z)\n"
++"  -l, --framelen N            Rahmenl?nge auf N Bytes beschr?nken (l>=L) "
+ "(Z)\n"
+-"  -m, --min-bps N             Übertragung abbrechen bei weniger als N BPS\n"
+-"  -M, --min-bps-time N          für mindestens N Sekunden (Default: 120)\n"
++"  -m, --min-bps N             ?bertragung abbrechen bei weniger als N BPS\n"
++"  -M, --min-bps-time N          f?r mindestens N Sekunden (Default: 120)\n"
+ 
+ #: src/lsz.c:1546
+ msgid ""
+@@ -400,28 +400,28 @@
+ "short options use the same arguments as the long ones\n"
+ msgstr ""
+ "  -n, --newer                 Datei senden wenn sie neuer ist (Z)\n"
+-"  -N, --newer-or-longer       Datei senden wenn neuer oder länger (Z)\n"
++"  -N, --newer-or-longer       Datei senden wenn neuer oder l?nger (Z)\n"
+ "  -o, --16-bit-crc            16Bit CRC statt 32Bit CRC verwenden (Z)\n"
+ "  -O, --disable-timeouts      Timeoutbehandlung abschalten\n"
+-"  -p, --protect               existierende Dateien nicht verändern\n"
+-"  -r, --resume                unterbrochene Übertragungen fortsetzen (Z)\n"
+-"  -R, --restricted            eingeschränkter, sichererer Modus\n"
++"  -p, --protect               existierende Dateien nicht ver?ndern\n"
++"  -r, --resume                unterbrochene ?bertragungen fortsetzen (Z)\n"
++"  -R, --restricted            eingeschr?nkter, sichererer Modus\n"
+ "  -q, --quiet                 leise, keine Ausgaben machen\n"
+-"  -s, --stop-at {HH:MM|+N}    Übertragung um HH:MM oder in N Sek. abbrechen\n"
+-"      --tcp-server            Socket öffnen und auf Verbindung warten\n"
+-"      --tcp-client ADDR:PORT  Socket öffnen und verbindung mit ...\n"
+-"  -u, --unlink                Datei nach Übertragung löschen\n"
+-"  -U, --unrestrict            eingeschränkten Modus aufheben (falls "
++"  -s, --stop-at {HH:MM|+N}    ?bertragung um HH:MM oder in N Sek. abbrechen\n"
++"      --tcp-server            Socket ?ffnen und auf Verbindung warten\n"
++"      --tcp-client ADDR:PORT  Socket ?ffnen und verbindung mit ...\n"
++"  -u, --unlink                Datei nach ?bertragung l?schen\n"
++"  -U, --unrestrict            eingeschr?nkten Modus aufheben (falls "
+ "erlaubt)\n"
+ "  -v, --verbose               mehr ausgeben\n"
+-"  -w, --windowsize N          Fenstergröße auf N Bytes setzen (Z)\n"
++"  -w, --windowsize N          Fenstergr??e auf N Bytes setzen (Z)\n"
+ "  -X  --xmodem                XMODEM-Protokoll benutzen\n"
+-"  -y, --overwrite             existierende Dateien überschreiben\n"
+-"  -Y, --overwrite-or-skip     wie `y', aber nicht existierende überspringen\n"
++"  -y, --overwrite             existierende Dateien ?berschreiben\n"
++"  -Y, --overwrite-or-skip     wie `y', aber nicht existierende ?berspringen\n"
+ "      --ymodem                YMODEM-Protokoll benutzen\n"
+ "  -Z, --zmodem                ZMODEM-Protokoll benutzen\n"
+ "\n"
+-"Kurze Optionen benötigen dieselben Argumente wie Lange.\n"
++"Kurze Optionen ben?tigen dieselben Argumente wie Lange.\n"
+ 
+ #: src/lsz.c:1768
+ msgid "got ZRQINIT"
+@@ -434,7 +434,7 @@
+ #: src/lsz.c:1991
+ #, c-format
+ msgid "blklen now %d\n"
+-msgstr "Blockgröße nun %d\n"
++msgstr "Blockgr??e nun %d\n"
+ 
+ #: src/lsz.c:2053
+ #, c-format
+@@ -453,7 +453,7 @@
+ #: src/lsz.c:2223
+ #, c-format
+ msgid "calc_blklen: reduced to %d due to error\n"
+-msgstr "calc_blklen: Blockgrösse auf %d reduziert wegen Fehler\n"
++msgstr "calc_blklen: Blockgr?sse auf %d reduziert wegen Fehler\n"
+ 
+ #: src/lsz.c:2256
+ #, c-format
+@@ -473,7 +473,7 @@
+ #: src/lsz.c:2278
+ #, c-format
+ msgid "calc_blklen: blklen %d, ok %ld, failed %ld -> %lu\n"
+-msgstr "calc_blklen: Blocklänge %d, ok %ld, fehlgeschlagen %ld -> %lu\n"
++msgstr "calc_blklen: Blockl?nge %d, ok %ld, fehlgeschlagen %ld -> %lu\n"
+ 
+ #: src/lsz.c:2290
+ #, c-format
+@@ -512,7 +512,7 @@
+ 
+ #: src/zm.c:712
+ msgid "Garbage count exceeded"
+-msgstr "Maximale Wiederholungsanzahl überschritten"
++msgstr "Maximale Wiederholungsanzahl ?berschritten"
+ 
+ #: src/zm.c:773
+ #, c-format
+@@ -526,11 +526,11 @@
+ 
+ #: src/lrz.c:382
+ msgid "don't have settimeofday, will not set time\n"
+-msgstr "Zeitsynchronisation nicht ausführbar, settimeofday() fehlt\n"
++msgstr "Zeitsynchronisation nicht ausf?hrbar, settimeofday() fehlt\n"
+ 
+ #: src/lrz.c:386
+ msgid "not running as root (this is good!), can not set time\n"
+-msgstr "Zeitsynchronisation mangels Superuserrechten nicht ausführbar\n"
++msgstr "Zeitsynchronisation mangels Superuserrechten nicht ausf?hrbar\n"
+ 
+ #: src/lrz.c:441
+ msgid "bytes_per_error"
+@@ -542,16 +542,16 @@
+ 
+ #: src/lrz.c:455
+ msgid "O_SYNC not supported by the kernel"
+-msgstr "O_SYNC vom Kernel nicht unterstützt"
++msgstr "O_SYNC vom Kernel nicht unterst?tzt"
+ 
+ #: src/lrz.c:497 src/lrz.c:499
+ msgid "garbage on commandline"
+-msgstr "Müll auf der Kommandozeile"
++msgstr "M?ll auf der Kommandozeile"
+ 
+ #: src/lrz.c:604
+ #, c-format
+ msgid "Usage: %s [options] [filename.if.xmodem]\n"
+-msgstr "Benutzung: %s [Optionen] [Dateiname.für.xmodem]\n"
++msgstr "Benutzung: %s [Optionen] [Dateiname.f?r.xmodem]\n"
+ 
+ #: src/lrz.c:605
+ msgid "Receive files with ZMODEM/YMODEM/XMODEM protocol\n"
+@@ -596,44 +596,44 @@
+ "\n"
+ "short options use the same arguments as the long ones\n"
+ msgstr ""
+-"  -+, --append                an existierende Dateien anhängen\n"
+-"  -a, --ascii                 ASCII-Übertragung (CR/LF nach LF wandeln)\n"
+-"  -b, --binary                Binärübertragung (keine Umwandlungen)\n"
++"  -+, --append                an existierende Dateien anh?ngen\n"
++"  -a, --ascii                 ASCII-?bertragung (CR/LF nach LF wandeln)\n"
++"  -b, --binary                Bin?r?bertragung (keine Umwandlungen)\n"
+ "  -B, --bufsize N             N Bytes puffern (auto: ganze Datei puffern)\n"
+-"  -c, --with-crc              16bit CRC statt Prüfsumme verwenden (X)\n"
+-"  -C, --allow-remote-commands Ausführung von Kommandos erlauben (Z)\n"
++"  -c, --with-crc              16bit CRC statt Pr?fsumme verwenden (X)\n"
++"  -C, --allow-remote-commands Ausf?hrung von Kommandos erlauben (Z)\n"
+ "  -D, --null                  empfangene Daten nach /dev/null schreiben\n"
+ "      --delay-startup N       Bei Programmstart N Sek. schlafen (Debugging)\n"
+ "  -e, --escape                Alle Steuerzeichen escapen (Z)\n"
+-"  -E, --rename                Empfänger soll Datei umbenennen falls\n"
++"  -E, --rename                Empf?nger soll Datei umbenennen falls\n"
+ "                              Zieldatei schon existiert\n"
+ "      --errors N              Einen CRC-Fehler alle N Bytes erzeugen\n"
+ "  -h, --help                  Diesen Hilfstext ausgeben\n"
+-"  -m, --min-bps N             Übertragung abbrechen bei weniger als N BPS\n"
+-"  -M, --min-bps-time N          für mindestens N Sekunden (Default: 120)\n"
++"  -m, --min-bps N             ?bertragung abbrechen bei weniger als N BPS\n"
++"  -M, --min-bps-time N          f?r mindestens N Sekunden (Default: 120)\n"
+ "  -O, --disable-timeouts      Timeoutbehandlung abschalten\n"
+ "      --o-sync                Ausgabedatei(en) im synchron schreiben\n"
+-"  -p, --protect               existierende Dateien nicht verändern\n"
++"  -p, --protect               existierende Dateien nicht ver?ndern\n"
+ "  -q, --quiet                 leise, keine Ausgaben machen\n"
+-"  -r, --resume                unterbrochene Übertragungen fortsetzen (Z)\n"
+-"  -R, --restricted            eingeschränkter, sichererer Modus\n"
+-"  -s, --stop-at {HH:MM|+N}    Übertragung um HH:MM oder in N Sek. abbrechen\n"
++"  -r, --resume                unterbrochene ?bertragungen fortsetzen (Z)\n"
++"  -R, --restricted            eingeschr?nkter, sichererer Modus\n"
++"  -s, --stop-at {HH:MM|+N}    ?bertragung um HH:MM oder in N Sek. abbrechen\n"
+ "  -S, --timesync              Zeit anfordern (doppelt: lokale Zeit setzen)\n"
+-"      --syslog[=off]          syslog an- oder ausschalten, wenn möglich\n"
++"      --syslog[=off]          syslog an- oder ausschalten, wenn m?glich\n"
+ "  -t, --timeout N             Timeout auf N Zehntelsekungen setzen\n"
+-"      --tcp-server            Socket öffnen und auf Verbindung warten\n"
+-"      --tcp-client ADDR:PORT  Socket öffnen und verbindung mit ...\n"
++"      --tcp-server            Socket ?ffnen und auf Verbindung warten\n"
++"      --tcp-client ADDR:PORT  Socket ?ffnen und verbindung mit ...\n"
+ "  -u, --keep-uppercase        GROSS geschrieben Dateinamen beibehalten\n"
+-"  -U, --unrestrict            eingeschränkten Modus aufheben (falls "
++"  -U, --unrestrict            eingeschr?nkten Modus aufheben (falls "
+ "erlaubt)\n"
+ "  -v, --verbose               mehr ausgeben\n"
+-"  -w, --windowsize N          Fenstergröße auf N Bytes setzen (Z)\n"
++"  -w, --windowsize N          Fenstergr??e auf N Bytes setzen (Z)\n"
+ "  -X  --xmodem                XMODEM-Protokoll benutzen\n"
+-"  -y, --overwrite             existierende Dateien überschreiben\n"
++"  -y, --overwrite             existierende Dateien ?berschreiben\n"
+ "      --ymodem                YMODEM-Protokoll benutzen\n"
+ "  -Z, --zmodem                ZMODEM-Protokoll benutzen\n"
+ "\n"
+-"Kurze Optionen benötigen dieselben Argumente wie Lange.\n"
++"Kurze Optionen ben?tigen dieselben Argumente wie Lange.\n"
+ 
+ #: src/lrz.c:676
+ #, c-format
+@@ -662,11 +662,11 @@
+ "%s: %s removed.\r\n"
+ msgstr ""
+ "\r\n"
+-"%s: %s gelöscht\r\n"
++"%s: %s gel?scht\r\n"
+ 
+ #: src/lrz.c:856
+ msgid "Pathname fetch returned EOT"
+-msgstr "Ende der Übertragung beim Warten auf Dateinamen"
++msgstr "Ende der ?bertragung beim Warten auf Dateinamen"
+ 
+ #: src/lrz.c:903
+ msgid "Received dup Sector"
+@@ -682,7 +682,7 @@
+ 
+ #: src/lrz.c:976
+ msgid "Checksum"
+-msgstr "Prüfsummenfehler"
++msgstr "Pr?fsummenfehler"
+ 
+ #: src/lrz.c:979
+ msgid "Sector number garbled"
+@@ -695,12 +695,12 @@
+ #: src/lrz.c:1005
+ #, c-format
+ msgid "Got 0%o sector header"
+-msgstr "Erhielt %02x als Sektorbestätigung"
++msgstr "Erhielt %02x als Sektorbest?tigung"
+ 
+ #: src/lrz.c:1113
+ #, c-format
+ msgid "file name ends with a /, skipped: %s\n"
+-msgstr "Dateiname endet mit /, übersprungen: %s\n"
++msgstr "Dateiname endet mit /, ?bersprungen: %s\n"
+ 
+ #: src/lrz.c:1127
+ #, c-format
+@@ -715,7 +715,7 @@
+ #: src/lrz.c:1192 src/lrz.c:1226
+ #, c-format
+ msgid "file exists, skipped: %s\n"
+-msgstr "Datei existiert, übersprungen: %s\n"
++msgstr "Datei existiert, ?bersprungen: %s\n"
+ 
+ #: src/lrz.c:1267
+ #, c-format
+@@ -739,7 +739,7 @@
+ #: src/lrz.c:1545
+ #, c-format
+ msgid "Blocks received: %d"
+-msgstr "Blöcke empfangen: %d"
++msgstr "Bl?cke empfangen: %d"
+ 
+ #: src/lrz.c:1599
+ #, c-format
+@@ -749,15 +749,15 @@
+ #: src/lrz.c:1612 src/lrz.c:1620
+ #, c-format
+ msgid "%s:\tSecurity Violation"
+-msgstr "%s:\tSicherheitsverstoß"
++msgstr "%s:\tSicherheitsversto?"
+ 
+ #: src/lrz.c:1730
+ msgid "remote command execution requested"
+-msgstr "Gegenseite versucht Kommandoausführung"
++msgstr "Gegenseite versucht Kommandoausf?hrung"
+ 
+ #: src/lrz.c:1737
+ msgid "not executed"
+-msgstr "nicht ausgeführt"
++msgstr "nicht ausgef?hrt"
+ 
+ #: src/lrz.c:1768
+ msgid "got ZRINIT"
+@@ -765,7 +765,7 @@
+ 
+ #: src/lrz.c:1817
+ msgid "Skipped"
+-msgstr "Übersprungen"
++msgstr "?bersprungen"
+ 
+ #. too bad
+ #: src/lrz.c:2049
+@@ -785,7 +785,7 @@
+ 
+ #: src/lrz.c:2215
+ msgid "file close error"
+-msgstr "Fehler beim Schließen der Datei"
++msgstr "Fehler beim Schlie?en der Datei"
+ 
+ #~ msgid "tcp protocol init failed\n"
+ #~ msgstr "TCP Protokoll Initialisierung fehlgeschlagen\n"
+@@ -797,7 +797,7 @@
+ #~ msgstr "fgets() bei tcp Protokoll Synchronisation fehlgeschlagen: "
+ 
+ #~ msgid "Transfer complete."
+-#~ msgstr "Übertragung abgeschlossen"
++#~ msgstr "?bertragung abgeschlossen"
+ 
+ #~ msgid "at"
+ #~ msgstr "um"
+@@ -809,4 +809,4 @@
+ #~ msgstr "Zeitsynchronisation: ok\n"
+ 
+ #~ msgid "Falldown to %ld blklen"
+-#~ msgstr "Blockgröße auf %ld gesenkt"
++#~ msgstr "Blockgr??e auf %ld gesenkt"
+--- 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.,  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.
+--- lrzsz-0.12.21.orig/debian/control
++++ lrzsz-0.12.21/debian/control
+@@ -0,0 +1,18 @@
++Source: lrzsz
++Section: comm
++Priority: optional
++Maintainer: Martin A. Godisch <godisch@debian.org>
++Standards-Version: 3.8.3
++Build-Depends: autotools-dev, gettext
++
++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/changelog
++++ lrzsz-0.12.21/debian/changelog
+@@ -0,0 +1,104 @@
++lrzsz (0.12.21-5) unstable; urgency=low
++
++  * New maintainer upload, closes: #556238.
++    Thanks to Josip Rodin for his work.
++  * Removed build-dependency on debhelper.
++  * Added build-dependency on autotools-dev.
++  * Cut Debian diff.gz into pieces.
++  * Updated FSF address in copyright file.
++  * Updated German po file, added build-dependency on gettext.
++    Closes: #313992, thanks to Jens Seidel and Tobias Toedter.
++  * Fixed missing includes (compiler warnings).
++  * Fixed typo in sz manpage.
++  * Fixed linking to libnsl.
++  * Removed changelog emacs settings.
++  * Updated standards version.
++
++ -- Martin A. Godisch <godisch@debian.org>  Sun, 22 Nov 2009 09:35:13 +0100
++
++lrzsz (0.12.21-4.1) unstable; urgency=low
++
++  * Non-maintainer upload.
++  * Rebuilt with current debhelper, finishing the /usr/doc transition.
++    Closes: #322762
++  * Rebuilt with a current toolchain, now it's prelinkable.
++    Closes: #288084
++  * Appled man page typo fix patch from A Costa. Closes: #311459
++
++ -- Joey Hess <joeyh@debian.org>  Tue, 10 Jan 2006 01:35:00 -0500
++
++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
+--- lrzsz-0.12.21.orig/debian/rules
++++ lrzsz-0.12.21/debian/rules
+@@ -0,0 +1,80 @@
++#!/usr/bin/make -f
++
++testdir  = test -f src/lrz.c && test -f debian/rules
++testroot = test x`whoami` = xroot
++
++# FOR AUTOCONF 2.13 ONLY
++ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
++  confflags += $(DEB_HOST_GNU_TYPE)
++else
++  $(error Cannot cross-compile this package out-of-the-box)
++endif
++
++CFLAGS = -Wall -g
++ifneq "$(findstring noopt,$(DEB_BUILD_OPTIONS))" ""
++	CFLAGS += -O0
++else
++	CFLAGS += -O2
++endif
++export CFLAGS
++
++build: build-stamp
++build-stamp:
++	$(testdir)
++	cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub .
++	-cat debian/patches/*.diff | patch -Ntp1 -r debian/rejected --no-backup-if-mismatch
++	./configure $(CONFFLAGS) --prefix=/usr --mandir='$${prefix}/share/man' --program-transform-name=s/l//
++	touch stamp-h.in # to stop autoheader from running
++	touch -d yesterday aclocal.m4 # to stop automake from running
++	$(MAKE)
++	touch $@
++
++clean:
++	$(testdir)
++	$(testroot)
++	cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub .
++	touch stamp-h.in # to stop autoheader from running
++	touch -d yesterday aclocal.m4 # to stop automake from running
++	[ ! -f Makefile ] || $(MAKE) distclean
++	-cat `ls -r debian/patches/*.diff` /dev/null | patch -RNtp1 -r debian/rejected --no-backup-if-mismatch
++	rm -rf debian/tmp
++	rm -f build-stamp config.guess config.sub po/lrzsz.pot po/*.gmo debian/files debian/rejected debian/substvars
++
++binary: binary-arch
++
++binary-indep:
++
++binary-arch: build
++	$(testdir)
++	$(testroot)
++	rm -rf debian/tmp
++
++	$(MAKE) prefix=$(CURDIR)/debian/tmp/usr install
++
++ifeq "$(findstring nostrip,$(DEB_BUILD_OPTIONS))" ""
++	strip -R .comment -R .note debian/tmp/usr/bin/*
++endif
++
++	install -d -m 0755 debian/tmp/usr/share/doc/lrzsz
++	install -p -m 0644 NEWS README README.cvs README.isdn4linux TODO debian/copyright debian/tmp/usr/share/doc/lrzsz
++	install -p -m 0644 -D ChangeLog debian/tmp/usr/share/doc/lrzsz/changelog
++	install -p -m 0644 -D debian/changelog debian/tmp/usr/share/doc/lrzsz/changelog.Debian
++
++	find debian/tmp/usr/share/man -type f -print0 | xargs -0 gzip -9
++	find debian/tmp/usr/share/doc -type f ! -name copyright ! -name '*.html' \
++		\( -name 'changelog*' -o -size +8 \) -print0 | xargs -0 gzip -9
++
++	ln -s rz.1.gz debian/tmp/usr/share/man/man1/rb.1.gz
++	ln -s rz.1.gz debian/tmp/usr/share/man/man1/rx.1.gz
++	ln -s sz.1.gz debian/tmp/usr/share/man/man1/sb.1.gz
++	ln -s sz.1.gz debian/tmp/usr/share/man/man1/sx.1.gz
++
++	install -d -m 0755 debian/tmp/DEBIAN
++	install -p -m 0644 debian/control debian/tmp/DEBIAN
++	cd debian/tmp && find usr -type f -print0 | xargs -0 md5sum > DEBIAN/md5sums
++
++	dpkg-shlibdeps debian/tmp/usr/bin/*
++	dpkg-gencontrol -isp -plrzsz
++	dpkg --build debian/tmp ..
++
++.PHONY: build clean binary binary-indep binary-arch
+--- lrzsz-0.12.21.orig/debian/patches/206648_dszlog.diff.unchecked
++++ lrzsz-0.12.21/debian/patches/206648_dszlog.diff.unchecked
+@@ -0,0 +1,311 @@
++diff -ur lrzsz-0.12.21/src/lrz.c newlrzsz/src/lrz.c
++--- lrzsz-0.12.21/src/lrz.c	2003-08-21 16:22:01.000000000 -0500
+++++ newlrzsz/src/lrz.c	2003-08-21 17:05:53.000000000 -0500
++@@ -68,6 +68,7 @@
++ unsigned Baudrate = 2400;
++ 
++ FILE *fout;
+++char *dszlogpath;
++ 
++ 
++ int Lastrx;
++@@ -192,6 +193,9 @@
++ 		zmputs(Attn);
++ 	canit(STDOUT_FILENO);
++ 	io_mode(0,0);
+++	if (dszlogpath) {
+++		dszlog(dszlogpath, 'L',	0, 0, 0, errors, 0, 0);
+++	}
++ 	error(128+n,0,_("caught signal %d; exiting"), n);
++ }
++ 
++@@ -265,6 +269,13 @@
++ 	if ((cp=getenv("ZMODEM_RESTRICTED"))!=NULL)
++ 		Restricted=2;
++ 
+++	dszlogpath = getenv("DSZLOG");
+++	if (access(dszlogpath, F_OK) == 0) {
+++		if (unlink(dszlogpath) != 0) {
+++			perror("unlink dszlog");
+++		}
+++	}
+++
++ 	/* make temporary and unfinished files */
++ 	umask(0077);
++ 
++@@ -559,6 +570,7 @@
++ 		signal(SIGINT, bibi);
++ 	signal(SIGTERM, bibi);
++ 	signal(SIGPIPE, bibi);
+++	signal(SIGHUP, bibi);
++ 	if (wcreceive(npats, patts)==ERROR) {
++ 		exitcode=0200;
++ 		canit(STDOUT_FILENO);
++@@ -685,9 +697,9 @@
++ #endif
++ 			if (c)
++ 				goto fubar;
++-		} else {
+++		} else {	/* Not Xmodem, not Zmodem, so Ymodem */
++ 			for (;;) {
++-				if (Verbose > 1
+++				if (Verbose > 1 || dszlogpath
++ #ifdef ENABLE_SYSLOG
++ 					|| enable_syslog
++ #endif
++@@ -712,7 +724,7 @@
++ 				if (wcrx(&zi)==ERROR)
++ 					goto fubar;
++ 
++-				if (Verbose > 1
+++				if (Verbose > 1 || dszlogpath
++ #ifdef ENABLE_SYSLOG
++ 					|| enable_syslog
++ #endif
++@@ -734,16 +746,19 @@
++ 						lsyslog(LOG_INFO,"%s/%s: %ld Bytes, %ld BPS",
++ 							shortname,protname(),zi.bytes_received, bps);
++ #endif
+++					if (dszlogpath)	dszlog(dszlogpath, 'R',
+++								zi.bytes_received, zi.fname,
+++								bps, errors, 0, 0);
++ 				}
++ 			}
++ 		}
++-	} else {
+++	} else {	/* Xmodem */
++ 		char dummy[128];
++ 		dummy[0]='\0'; /* pre-ANSI HPUX cc demands this */
++ 		dummy[1]='\0'; /* procheader uses name + 1 + strlen(name) */
++ 		zi.bytes_total = DEFBYTL;
++ 
++-		if (Verbose > 1
+++		if (Verbose > 1 || dszlogpath
++ #ifdef ENABLE_SYSLOG
++ 			|| enable_syslog
++ #endif
++@@ -782,7 +797,7 @@
++ 		if (wcrx(&zi)==ERROR) {
++ 			goto fubar;
++ 		}
++-		if (Verbose > 1
+++		if (Verbose > 1 || dszlogpath
++ #ifdef ENABLE_SYSLOG
++ 			|| enable_syslog
++ #endif
++@@ -803,6 +818,10 @@
++ 				lsyslog(LOG_INFO,"%s/%s: %ld Bytes, %ld BPS",
++ 					shortname,protname(),zi.bytes_received, bps);
++ #endif
+++			if (dszlogpath)	dszlog(dszlogpath, 'R',
+++						zi.bytes_received, zi.fname,
+++						bps, errors, 0, 0);
+++
++ 		}
++ 	}
++ 	return OK;
++@@ -812,6 +831,13 @@
++ 		lsyslog(LOG_ERR,"%s/%s: got error", 
++ 			shortname ? shortname : "no.name", protname());
++ #endif
+++	if (dszlogpath)	{
+++		double d = timing(0,NULL);
+++		dszlog(dszlogpath, 'E', zi.bytes_received, zi.fname,
+++			(zi.bytes_received-zi.bytes_skipped)/((d) ? d : 0.5),
+++			errors, 0, 0);
+++	}
+++
++ 	canit(STDOUT_FILENO);
++ 	if (Topipe && fout) {
++ 		pclose(fout);  return ERROR;
++@@ -1783,10 +1809,18 @@
++ rzfiles(struct zm_fileinfo *zi)
++ {
++ 	register int c;
+++	long bps;
++ 
++ 	for (;;) {
++ 		timing(1,NULL);
++ 		c = rzfile(zi);
+++		{
+++			double d;
+++			d=timing(0,NULL);
+++			if (d==0)
+++				d=0.5; /* can happen if timing uses time() */
+++			bps=(zi->bytes_received-zi->bytes_skipped)/d;
+++		}
++ 		switch (c) {
++ 		case ZEOF:
++ 			if (Verbose > 1
++@@ -1794,12 +1828,6 @@
++ 				|| enable_syslog
++ #endif
++ 	 		) {
++-				double d;
++-				long bps;
++-				d=timing(0,NULL);
++-				if (d==0)
++-					d=0.5; /* can happen if timing uses time() */
++-				bps=(zi->bytes_received-zi->bytes_skipped)/d;
++ 				if (Verbose > 1) {
++ 					vstringf(
++ 						_("\rBytes received: %7ld/%7ld   BPS:%-6ld                \r\n"),
++@@ -1807,6 +1835,8 @@
++ 				}
++ 				DO_SYSLOG_FNAME((LOG_INFO, "%s/%s: %ld Bytes, %ld BPS",shortname,
++ 						   protname(), (long) zi->bytes_total,bps));
+++				if (dszlogpath) dszlog(dszlogpath, 'z', zi->bytes_received,
+++						zi->fname, bps, errors, 0, 0);
++ 			}
++ 			/* FALL THROUGH */
++ 		case ZSKIP:
++@@ -1815,6 +1845,8 @@
++ 				if (Verbose) 
++ 					vstringf(_("Skipped"));
++ 				DO_SYSLOG_FNAME((LOG_INFO, "%s/%s: skipped",shortname,protname()));
+++				if (dszlogpath) dszlog(dszlogpath, 'E', zi->bytes_received,
+++						zi->fname, bps, errors, 0, 0);
++ 			}
++ 			switch (tryz()) {
++ 			case ZCOMPL:
++@@ -1829,6 +1861,8 @@
++ 			return c;
++ 		case ERROR:
++ 			DO_SYSLOG_FNAME((LOG_INFO, "%s/%s: error",shortname,protname()));
+++			if (dszlogpath) dszlog(dszlogpath, 'E', zi->bytes_received,
+++					zi->fname, bps, errors, 0, 0);
++ 			return ERROR;
++ 		}
++ 	}
++diff -ur lrzsz-0.12.21/src/lsyslog.c newlrzsz/src/lsyslog.c
++--- lrzsz-0.12.21/src/lsyslog.c	1998-12-29 11:27:55.000000000 -0600
+++++ newlrzsz/src/lsyslog.c	2003-08-21 16:47:53.000000000 -0500
++@@ -26,6 +26,8 @@
++ #include <string.h>
++ #endif
++ 
+++#include <stdio.h>
+++
++ #if __STDC__
++ #  include <stdarg.h>
++ #  define VA_START(args, lastarg) va_start(args, lastarg)
++@@ -79,3 +81,23 @@
++ #endif
++ }
++ 
+++void dszlog(char *logname, char status, unsigned long num_bytes, char *fname,
+++		int cps, int retry_events, int flow_events, int blocksize) {
+++
+++	FILE *mylog;
+++	if ((mylog = fopen(logname, "a"))) {
+++		fprintf(mylog, "%c %6ld %5ld bps %4ld cps %3d errors %5u %4d %s %ld\r\n",
+++				status,
+++				num_bytes,
+++				cps*8, /* XXX where to get DTE from? */
+++				cps,
+++				retry_events,
+++				flow_events, /* XXX where is flow_control? */
+++				blocksize,
+++				fname,
+++				-1 /* serial number */
+++				);
+++		fclose(mylog);
+++	}
+++}
+++
++diff -ur lrzsz-0.12.21/src/lsz.c newlrzsz/src/lsz.c
++--- lrzsz-0.12.21/src/lsz.c	2003-08-21 16:22:01.000000000 -0500
+++++ newlrzsz/src/lsz.c	2003-08-21 17:02:18.000000000 -0500
++@@ -59,6 +59,8 @@
++ extern int errno;
++ #endif
++ 
+++char *dszlogpath;
+++
++ unsigned Baudrate=2400;	/* Default, should be set by first mode() call */
++ unsigned Txwindow;	/* Control the size of the transmitted window */
++ unsigned Txwspac;	/* Spacing between zcrcq requests */
++@@ -223,6 +225,9 @@
++ 	canit(STDOUT_FILENO);
++ 	fflush (stdout);
++ 	io_mode (io_mode_fd,0);
+++	if (dszlogpath) {
+++		dszlog(dszlogpath, 'L', 0, 0, 0, errors, 0, 0);
+++	}
++ 	if (n == 99)
++ 		error (0, 0, _ ("io_mode(,2) in rbsb.c not implemented\n"));
++ 	else
++@@ -332,6 +337,14 @@
++ 	}
++ 	if ((cp=getenv("ZMODEM_RESTRICTED"))!=NULL)
++ 		Restricted=1;
+++
+++	dszlogpath = getenv("DSZLOG");
+++	if (access(dszlogpath, F_OK) == 0) {
+++		if (unlink(dszlogpath) != 0) {
+++			perror("unlink dszlog");
+++		}
+++	}
+++
++ 	from_cu();
++ 	chkinvok(argv[0]);
++ 
++@@ -1113,6 +1126,12 @@
++ 		if (enable_syslog)
++ 			lsyslog(LOG_INFO, _("%s/%s: error occured"),protname(),shortname);
++ #endif
+++		if (dszlogpath) {
+++			double d = timing(0,NULL);
+++			dszlog(dszlogpath, 'E', zi.bytes_sent, zi.fname,
+++				zi.bytes_sent/((d) ? d : 0.5),
+++				errors, 0, blklen);
+++		}
++ 		return ERROR;
++ 	case ZSKIP:
++ 		error(0,0, _("skipped: %s"),name);
++@@ -1120,6 +1139,13 @@
++ 		if (enable_syslog)
++ 			lsyslog(LOG_INFO, _("%s/%s: skipped"),protname(),shortname);
++ #endif
+++		if (dszlogpath) {
+++			double d = timing(0,NULL);
+++			/* XXX is Zmodem skip really deserving a 'E' ? */
+++			dszlog(dszlogpath, 'E', zi.bytes_sent, zi.fname,
+++				zi.bytes_sent/((d) ? d : 0.5),
+++				errors, 0, blklen);
+++		}
++ 		return OK;
++ 	}
++ 	if (!zmodem_requested && wctx(&zi)==ERROR)
++@@ -1128,12 +1154,18 @@
++ 		if (enable_syslog)
++ 			lsyslog(LOG_INFO, _("%s/%s: error occured"),protname(),shortname);
++ #endif
+++		if (dszlogpath) {
+++			double d = timing(0,NULL);
+++			dszlog(dszlogpath, 'E', zi.bytes_sent, zi.fname,
+++				zi.bytes_sent/((d) ? d : 0.5),
+++				errors, 0, blklen);
+++		}
++ 		return ERROR;
++ 	}
++ 	if (Unlinkafter)
++ 		unlink(oname);
++ 
++-	if (Verbose > 1
+++	if (Verbose > 1 || dszlogpath
++ #ifdef ENABLE_SYSLOG
++ 		|| enable_syslog
++ #endif
++@@ -1152,6 +1184,11 @@
++ 			lsyslog(LOG_INFO, "%s/%s: %ld Bytes, %ld BPS",shortname,
++ 				protname(), (long) zi.bytes_sent,bps);
++ #endif
+++		if (dszlogpath) {
+++			char whichprot = (protocol==ZM_ZMODEM)? 'Z' : 'S';
+++			dszlog(dszlogpath, whichprot, zi.bytes_sent,
+++					zi.fname, bps, errors, 0, blklen);
+++		}
++ 	}
++ 	return 0;
++ }
+--- lrzsz-0.12.21.orig/debian/patches/include.diff
++++ lrzsz-0.12.21/debian/patches/include.diff
+@@ -0,0 +1,20 @@
++--- lrzsz-0.12.21.orig/lib/long-options.c
+++++ lrzsz-0.12.21/lib/long-options.c
++@@ -22,6 +22,7 @@
++ #endif
++ 
++ #include <stdio.h>
+++#include <stdlib.h>
++ #include <getopt.h>
++ #include "long-options.h"
++ 
++--- lrzsz-0.12.21.orig/src/lsyslog.c
+++++ lrzsz-0.12.21/src/lsyslog.c
++@@ -22,6 +22,7 @@
++ #ifdef ENABLE_SYSLOG
++ #include "zglobal.h"
++ #include <pwd.h>
+++#include <stdio.h>
++ #include <stdlib.h>
++ #include <string.h>
++ #endif
+--- lrzsz-0.12.21.orig/debian/patches/mantypos.diff
++++ lrzsz-0.12.21/debian/patches/mantypos.diff
+@@ -0,0 +1,49 @@
++--- lrzsz-0.12.21.orig/man/lsz.1
+++++ lrzsz-0.12.21/man/lsz.1
++@@ -247,7 +247,7 @@
++ Escape all control characters;
++ normally XON, XOFF, DLE, CR-@-CR, and Ctrl-X are escaped.
++ .TP 
++-.B"-E, --rename"
+++.B "-E, --rename"
++ Force the sender to rename the new file if a file with the same
++ name already exists.
++ .TP
++@@ -265,7 +265,7 @@
++ .TP
++ .B "-i COMMAND, --immediate-command COMMAND"
++ Send COMMAND to the receiver for execution, return immediately
++-upon the receiving program's successful recption of the command.
+++upon the receiving program's successful reception of the command.
++ .TP
++ .B "-k, --1k"
++ (XMODEM/YMODEM) Send files using 1024 byte blocks
++@@ -509,7 +509,7 @@
++ .RB ( \-a )
++ to end of line conventions appropriate to the receiving environment.
++ With ZMODEM AutoDownload enabled, Professional-YAM  and ZCOMM
++-will automatically recieve
+++will automatically receive
++ the files after performing a security check.
++ 
++ .br
++@@ -592,8 +592,8 @@
++ the source file.
++ .SH "VMS VERSION"
++ The VMS version does not support wild cards.
++-Because of VMS DCL, upper case option letters muse be represented
++-by \\ proceding the letter.
+++Because of VMS DCL, upper case option letters must be represented
+++by \\ preceding the letter.
++ 
++ The current VMS version does not support XMODEM, XMODEM-1k, or YMODEM.
++ 
++@@ -682,7 +682,7 @@
++ The test mode leaves a zero length file on the receiving system.
++ 
++ A few high speed modems have a firmware bug that drops characters when the
++-direction of high speed transmissson is reversed.
+++direction of high speed transmission is reversed.
++ The environment variable ZNULLS may be used to specify the number of nulls to
++ send before a ZDATA frame.
++ Values of 101 for a 4.77 mHz PC and 124 for an AT are typical.
+--- lrzsz-0.12.21.orig/debian/patches/strstr.diff
++++ lrzsz-0.12.21/debian/patches/strstr.diff
+@@ -0,0 +1,20 @@
++--- 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/debian/patches/build.diff
++++ lrzsz-0.12.21/debian/patches/build.diff
+@@ -0,0 +1,2115 @@
++--- 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
++@@ -1832,108 +1831,14 @@
++   echo "$ac_t""no" 1>&6
++ fi
++ 
++-echo $ac_n "checking for syslog in -lbe""... $ac_c" 1>&6
++-echo "configure:1837: 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
++-else
++-  ac_save_LIBS="$LIBS"
++-LIBS="-lbe  $LIBS"
++-cat > conftest.$ac_ext <<EOF
++-#line 1845 "configure"
++-#include "confdefs.h"
++-/* Override any gcc2 internal prototype to avoid an error.  */
++-/* We use char because int might match the return type of a gcc2
++-    builtin and then its argument prototype would still apply.  */
++-char syslog();
++-
++-int main() {
++-syslog()
++-; return 0; }
++-EOF
++-if { (eval echo configure:1856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++-  rm -rf conftest*
++-  eval "ac_cv_lib_$ac_lib_var=yes"
++-else
++-  echo "configure: failed program was:" >&5
++-  cat conftest.$ac_ext >&5
++-  rm -rf conftest*
++-  eval "ac_cv_lib_$ac_lib_var=no"
++-fi
++-rm -f conftest*
++-LIBS="$ac_save_LIBS"
++-
++-fi
++-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++-  echo "$ac_t""yes" 1>&6
++-    ac_tr_lib=HAVE_LIB`echo be | sed -e 's/[^a-zA-Z0-9_]/_/g' \
++-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
++-  cat >> confdefs.h <<EOF
++-#define $ac_tr_lib 1
++-EOF
++-
++-  LIBS="-lbe $LIBS"
++-
++-else
++-  echo "$ac_t""no" 1>&6
++-fi
++-
++-echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
++-echo "configure:1884: 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
++-else
++-  ac_save_LIBS="$LIBS"
++-LIBS="-lnsl  $LIBS"
++-cat > conftest.$ac_ext <<EOF
++-#line 1892 "configure"
++-#include "confdefs.h"
++-/* Override any gcc2 internal prototype to avoid an error.  */
++-/* We use char because int might match the return type of a gcc2
++-    builtin and then its argument prototype would still apply.  */
++-char gethostbyname();
++-
++-int main() {
++-gethostbyname()
++-; return 0; }
++-EOF
++-if { (eval echo configure:1903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++-  rm -rf conftest*
++-  eval "ac_cv_lib_$ac_lib_var=yes"
++-else
++-  echo "configure: failed program was:" >&5
++-  cat conftest.$ac_ext >&5
++-  rm -rf conftest*
++-  eval "ac_cv_lib_$ac_lib_var=no"
++-fi
++-rm -f conftest*
++-LIBS="$ac_save_LIBS"
++-
++-fi
++-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++-  echo "$ac_t""yes" 1>&6
++-    ac_tr_lib=HAVE_LIB`echo nsl | sed -e 's/[^a-zA-Z0-9_]/_/g' \
++-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
++-  cat >> confdefs.h <<EOF
++-#define $ac_tr_lib 1
++-EOF
++-
++-  LIBS="-lnsl $LIBS"
++-
++-else
++-  echo "$ac_t""no" 1>&6
++-fi
++-
++ 
++ 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 +1846,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 +1863,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 +1881,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 +1902,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 +1913,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 +1940,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 +1981,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 +2021,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 +2061,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 +2101,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 +2139,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 +2172,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 +2205,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 +2239,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 +2294,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 +2307,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 +2328,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 +2342,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 +2364,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 +2385,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 +2410,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 +2424,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 +2445,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 +2458,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 +2480,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 +2515,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 +2523,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 +2537,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 +2562,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 +2584,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 +2606,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 +2645,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 +2673,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 +2698,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 +2706,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 +2846,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 +2871,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 +2904,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 +2937,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 +2969,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 +2999,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 +3027,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 +3054,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 +3062,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 +3081,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 +3103,7 @@
++ fi
++ 
++ cat > conftest.$ac_ext <<EOF
++-#line 3202 "configure"
+++#line 3201 "configure"
++ #include "confdefs.h"
++ #include <utime.h>
++ EOF
++@@ -3216,12 +3121,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 +3149,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 +3176,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 +3204,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 +3231,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 +3259,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 +3286,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 +3314,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 +3343,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 +3371,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 +3399,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 +3427,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 +3457,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 +3485,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 +3500,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 +3508,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 +3537,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 +3571,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 +3610,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 +3668,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 +3708,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 +3736,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 +3765,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 +3793,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 +3827,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 +3860,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 +3880,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 +3899,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 +3926,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 +3954,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 +3962,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 +3973,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 +3989,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 +4002,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 +4013,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 +4052,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 +4086,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 +4114,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 +4141,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 +4177,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 +4209,7 @@
++ fi
++ 
++ 		cat > conftest.$ac_ext <<EOF
++-#line 4308 "configure"
+++#line 4307 "configure"
++ #include "confdefs.h"
++ 
++ int main() {
++@@ -4312,7 +4217,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 +4240,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 +4253,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 +4261,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 +4296,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 +4324,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 +4346,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 +4382,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 +4419,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 +4454,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 +4512,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 +4546,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 +4582,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 +4675,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 +4703,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/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/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/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:
++ 
++ 
+--- lrzsz-0.12.21.orig/debian/patches/cat-id-tbl.diff
++++ lrzsz-0.12.21/debian/patches/cat-id-tbl.diff
+@@ -0,0 +1,118 @@
++--- lrzsz-0.12.21.orig/po/cat-id-tbl.c
+++++ lrzsz-0.12.21/po/cat-id-tbl.c
++@@ -141,22 +141,23 @@
++   {"\
++ \n\
++ countem: Total %d %ld\n", 84},
++-  {"Bad escape sequence %x", 85},
++-  {"Sender Canceled", 86},
++-  {"TIMEOUT", 87},
++-  {"Bad data subpacket", 88},
++-  {"Data subpacket too long", 89},
++-  {"Garbage count exceeded", 90},
++-  {"Got %s", 91},
++-  {"Retry %d: ", 92},
++-  {"don't have settimeofday, will not set time\n", 93},
++-  {"not running as root (this is good!), can not set time\n", 94},
++-  {"bytes_per_error", 95},
++-  {"bytes-per-error should be >100", 96},
++-  {"O_SYNC not supported by the kernel", 97},
++-  {"garbage on commandline", 98},
++-  {"Usage: %s [options] [filename.if.xmodem]\n", 99},
++-  {"Receive files with ZMODEM/YMODEM/XMODEM protocol\n", 100},
+++  {"Bad CRC", 85},
+++  {"Bad escape sequence %x", 86},
+++  {"Sender Canceled", 87},
+++  {"TIMEOUT", 88},
+++  {"Bad data subpacket", 89},
+++  {"Data subpacket too long", 90},
+++  {"Garbage count exceeded", 91},
+++  {"Got %s", 92},
+++  {"Retry %d: ", 93},
+++  {"don't have settimeofday, will not set time\n", 94},
+++  {"not running as root (this is good!), can not set time\n", 95},
+++  {"bytes_per_error", 96},
+++  {"bytes-per-error should be >100", 97},
+++  {"O_SYNC not supported by the kernel", 98},
+++  {"garbage on commandline", 99},
+++  {"Usage: %s [options] [filename.if.xmodem]\n", 100},
+++  {"Receive files with ZMODEM/YMODEM/XMODEM protocol\n", 101},
++   {"\
++   -+, --append                append to existing files\n\
++   -a, --ascii                 ASCII transfer (change CR/LF to LF)\n\
++@@ -193,41 +194,41 @@
++       --ymodem                use YMODEM protocol\n\
++   -Z, --zmodem                use ZMODEM protocol\n\
++ \n\
++-short options use the same arguments as the long ones\n", 101},
++-  {"%s waiting to receive.", 102},
++-  {"\rBytes received: %7ld/%7ld   BPS:%-6ld                \r\n", 103},
++-  {"%s: ready to receive %s", 104},
++-  {"\rBytes received: %7ld   BPS:%-6ld                \r\n", 105},
+++short options use the same arguments as the long ones\n", 102},
+++  {"%s waiting to receive.", 103},
+++  {"\rBytes received: %7ld/%7ld   BPS:%-6ld                \r\n", 104},
+++  {"%s: ready to receive %s", 105},
+++  {"\rBytes received: %7ld   BPS:%-6ld                \r\n", 106},
++   {"\
++ \r\n\
++-%s: %s removed.\r\n", 106},
++-  {"Pathname fetch returned EOT", 107},
++-  {"Received dup Sector", 108},
++-  {"Sync Error", 109},
++-  {"CRC", 110},
++-  {"Checksum", 111},
++-  {"Sector number garbled", 112},
++-  {"Sender Cancelled", 113},
++-  {"Got 0%o sector header", 114},
++-  {"file name ends with a /, skipped: %s\n", 115},
++-  {"zmanag=%d, Lzmanag=%d\n", 116},
++-  {"zconv=%d\n", 117},
++-  {"file exists, skipped: %s\n", 118},
++-  {"TIMESYNC: here %ld, remote %ld, diff %ld seconds\n", 119},
++-  {"TIMESYNC: cannot set time: %s\n", 120},
++-  {"Topipe", 121},
++-  {"Receiving: %s\n", 122},
++-  {"Blocks received: %d", 123},
++-  {"%s: %s exists\n", 124},
++-  {"%s:\tSecurity Violation", 125},
++-  {"remote command execution requested", 126},
++-  {"not executed", 127},
++-  {"got ZRINIT", 128},
++-  {"Skipped", 129},
++-  {"rzfile: bps rate %ld below min %ld", 130},
++-  {"rzfile: reached stop time", 131},
++-  {"\rBytes received: %7ld/%7ld   BPS:%-6ld ETA %02d:%02d  ", 132},
++-  {"file close error", 133},
+++%s: %s removed.\r\n", 107},
+++  {"Pathname fetch returned EOT", 108},
+++  {"Received dup Sector", 109},
+++  {"Sync Error", 110},
+++  {"CRC", 111},
+++  {"Checksum", 112},
+++  {"Sector number garbled", 113},
+++  {"Sender Cancelled", 114},
+++  {"Got 0%o sector header", 115},
+++  {"file name ends with a /, skipped: %s\n", 116},
+++  {"zmanag=%d, Lzmanag=%d\n", 117},
+++  {"zconv=%d\n", 118},
+++  {"file exists, skipped: %s\n", 119},
+++  {"TIMESYNC: here %ld, remote %ld, diff %ld seconds\n", 120},
+++  {"TIMESYNC: cannot set time: %s\n", 121},
+++  {"Topipe", 122},
+++  {"Receiving: %s\n", 123},
+++  {"Blocks received: %d", 124},
+++  {"%s: %s exists\n", 125},
+++  {"%s:\tSecurity Violation", 126},
+++  {"remote command execution requested", 127},
+++  {"not executed", 128},
+++  {"got ZRINIT", 129},
+++  {"Skipped", 130},
+++  {"rzfile: bps rate %ld below min %ld", 131},
+++  {"rzfile: reached stop time", 132},
+++  {"\rBytes received: %7ld/%7ld   BPS:%-6ld ETA %02d:%02d  ", 133},
+++  {"file close error", 134},
++ };
++ 
++-int _msg_tbl_length = 133;
+++int _msg_tbl_length = 134;
+--- lrzsz-0.12.21.orig/debian/patches/206499_ymodemg.diff.unchecked
++++ lrzsz-0.12.21/debian/patches/206499_ymodemg.diff.unchecked
+@@ -0,0 +1,70 @@
++--- org/lrz.c	1998-12-29 23:49:24.000000000 -0800
+++++ lrz.c	2003-08-21 15:15:15.000000000 -0700
++@@ -73,6 +73,7 @@
++ 
++ int Lastrx;
++ int Crcflg;
+++int Optiong;
++ int Firstsec;
++ int errors;
++ int Restricted=1;	/* restricted; no /.. or ../ in filenames */
++@@ -211,6 +212,7 @@
++ 	{"allow-remote-commands", no_argument, NULL, 'C'},
++ 	{"escape", no_argument, NULL, 'e'},
++ 	{"rename", no_argument, NULL, 'E'},
+++	{"go", no_argument, NULL, 'g'},
++ 	{"help", no_argument, NULL, 'h'},
++ 	{"crc-check", no_argument, NULL, 'H'},
++ 	{"junk-path", no_argument, NULL, 'j'},
++@@ -288,7 +290,7 @@
++     parse_long_options (argc, argv, show_version, usage1);
++ 
++ 	while ((c = getopt_long (argc, argv, 
++-		"a+bB:cCDeEhm:M:OprRqs:St:uUvw:XZy",
+++		"a+bB:cCDeEghm:M:OprRqs:St:uUvw:XZy",
++ 		long_options, (int *) 0)) != EOF)
++ 	{
++ 		unsigned long int tmp;
++@@ -313,6 +315,7 @@
++ 		case 'D': Nflag = TRUE; break;
++ 		case 'E': Lzmanag = ZF1_ZMCHNG; break;
++ 		case 'e': Zctlesc = 1; break;
+++		case 'g': Optiong = 1; break;
++ 		case 'h': usage(0,NULL); break;
++ 		case 'H': Lzmanag= ZF1_ZMCRC; break;
++ 		case 'j': junk_path=TRUE; break;
++@@ -617,6 +620,7 @@
++ "  -e, --escape                Escape control characters (Z)\n"
++ "  -E, --rename                rename any files already existing\n"
++ "      --errors N              generate CRC error every N bytes (debugging)\n"
+++"  -g, --go                    use X/YMODEM-g protocol (with CRC)\n"
++ "  -h, --help                  Help, print this usage message\n"
++ "  -m, --min-bps N             stop transmission if BPS below N\n"
++ "  -M, --min-bps-time N          for at least N seconds (default: 120)\n"
++@@ -843,7 +847,7 @@
++ et_tu:
++ 	Firstsec=TRUE;
++ 	zi->eof_seen=FALSE;
++-	sendline(Crcflg?WANTCRC:NAK);
+++	sendline(Optiong?WANTG:(Crcflg?WANTCRC:NAK));
++ 	flushmo();
++ 	purgeline(0); /* Do read next time ... */
++ 	while ((c = wcgetsec(&Blklen, rpn, 100)) != 0) {
++@@ -875,7 +879,7 @@
++ 
++ 	Firstsec=TRUE;sectnum=0; 
++ 	zi->eof_seen=FALSE;
++-	sendchar=Crcflg?WANTCRC:NAK;
+++	sendchar=(Optiong?WANTG:(Crcflg?WANTCRC:NAK));
++ 
++ 	for (;;) {
++ 		sendline(sendchar);	/* send it now, we're ready! */
++@@ -1007,7 +1011,7 @@
++ 				;
++ 		}
++ 		if (Firstsec) {
++-			sendline(Crcflg?WANTCRC:NAK);
+++			sendline(Optiong?WANTG:(Crcflg?WANTCRC:NAK));
++ 			flushmo();
++ 			purgeline(0);	/* Do read next time ... */
++ 		} else {
+--- lrzsz-0.12.21.orig/debian/patches/313992_de_po.diff
++++ lrzsz-0.12.21/debian/patches/313992_de_po.diff
+@@ -0,0 +1,650 @@
++--- lrzsz-0.12.21.orig/po/de.po
+++++ lrzsz-0.12.21/po/de.po
++@@ -1,17 +1,18 @@
++-# german translation of lrzsz output
++-# Copyright (C) 1997 Uwe Ohse
++-# Uwe Ohse <uwe@ohse.de>, 1997.
+++# German translation of lrzsz
+++# Copyright (C) Uwe Ohse <uwe@ohse.de>, 1997.
+++# Copyright (C) Tobias Toedter <t.toedter@gmx.net>, 2005, 2006.
++ #
++ msgid ""
++ msgstr ""
++-"Project-Id-Version: PACKAGE VERSION\n"
+++"Project-Id-Version: lrzsz 0.12.21\n"
++ "POT-Creation-Date: 1999-08-22 21:00+0200\n"
++-"PO-Revision-Date: 1997-06-01 19:00+0200\n"
++-"Last-Translator: FULL NAME <uwe@ohse.de>\n"
++-"Language-Team: none. try <uwe@ohse.de>\n"
+++"PO-Revision-Date: 2006-01-12 10:23+0100\n"
+++"Last-Translator: Tobias Toedter <t.toedter@gmx.net>\n"
+++"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
++ "MIME-Version: 1.0\n"
++-"Content-Type: text/plain; charset=iso-8859-1\n"
+++"Content-Type: text/plain; charset=UTF-8\n"
++ "Content-Transfer-Encoding: 8bit\n"
+++"X-Generator: KBabel 1.10.2\n"
++ 
++ #: src/lsz.c:228
++ msgid "io_mode(,2) in rbsb.c not implemented\n"
++@@ -28,21 +29,21 @@
++ 
++ #: src/lsz.c:422
++ msgid "packetlength"
++-msgstr "Paketl?nge"
+++msgstr "Paketlänge"
++ 
++ #: src/lsz.c:427
++ #, c-format
++ msgid "packetlength out of range 24..%ld"
++-msgstr "Argument der Option L au?erhalb des Bereichs 24..%ld"
+++msgstr "Argument der Option L außerhalb des Bereichs 24..%ld"
++ 
++ #: src/lsz.c:436
++ msgid "framelength"
++-msgstr "Framel?nge"
+++msgstr "Framelänge"
++ 
++ #: src/lsz.c:441
++ #, c-format
++ msgid "framelength out of range 32..%ld"
++-msgstr "Argument der Option l au?erhalb des Bereichs 32..%ld"
+++msgstr "Argument der Option l außerhalb des Bereichs 32..%ld"
++ 
++ #: src/lrz.c:318 src/lsz.c:450
++ msgid "min_bps"
++@@ -50,27 +51,27 @@
++ 
++ #: src/lsz.c:452
++ msgid "min_bps must be >= 0"
++-msgstr "minimale BPS-Rate mu? >= 0 sein"
+++msgstr "minimale BPS-Rate muss >= 0 sein"
++ 
++ #: src/lrz.c:324 src/lsz.c:458
++ msgid "min_bps_time"
++-msgstr ""
+++msgstr "Zeitfenster für minimale BPS-Rate"
++ 
++ #: src/lrz.c:326 src/lsz.c:460
++ msgid "min_bps_time must be > 1"
++-msgstr "Zeitfenster f?r minimale BPS-Rate mu? > 1 Sekunde sein"
+++msgstr "Zeitfenster für minimale BPS-Rate muss > 1 Sekunde sein"
++ 
++ #: src/lrz.c:342 src/lsz.c:484
++ msgid "hour to large (0..23)"
++-msgstr "Stunde zu gross (0..23)"
+++msgstr "Stunde zu groß (0..23)"
++ 
++ #: src/lrz.c:344 src/lsz.c:486
++ msgid "unparsable stop time\n"
++-msgstr "unparsbare Endzeit\n"
+++msgstr "Endzeit nicht auszuwerten\n"
++ 
++ #: src/lrz.c:348 src/lsz.c:490
++ msgid "minute to large (0..59)"
++-msgstr "Minute zu gro? (0..59)"
+++msgstr "Minute zu groß (0..59)"
++ 
++ #: src/lrz.c:358 src/lrz.c:365 src/lsz.c:500 src/lsz.c:507
++ msgid "stop time to small"
++@@ -78,7 +79,7 @@
++ 
++ #: src/lrz.c:363 src/lsz.c:505
++ msgid "stop-at"
++-msgstr ""
+++msgstr "Stopp um"
++ 
++ #: src/lrz.c:394 src/lsz.c:516
++ msgid "timeout"
++@@ -86,15 +87,15 @@
++ 
++ #: src/lrz.c:396 src/lsz.c:518
++ msgid "timeout out of range 10..1000"
++-msgstr "Argument der Option t au?erhalb des Bereichs 10..1000"
+++msgstr "Argument der Option t außerhalb des Bereichs 10..1000"
++ 
++ #: src/lrz.c:412 src/lsz.c:526
++ msgid "security violation: can't do that under restricted shell\n"
++-msgstr "Sicherheitsversto?: Ausf?hrung unter eingeschr?nkter Shell verboten\n"
+++msgstr "Sicherheitsverstoß: Ausführung unter eingeschränkter Shell verboten\n"
++ 
++ #: src/lrz.c:402 src/lsz.c:533
++ msgid "window size"
++-msgstr "Fenstergr??e"
+++msgstr "Fenstergröße"
++ 
++ #: src/lrz.c:427 src/lrz.c:434 src/lsz.c:556 src/lsz.c:563
++ msgid "cannot turnoff syslog"
++@@ -102,7 +103,7 @@
++ 
++ #: src/lrz.c:449 src/lsz.c:571
++ msgid "startup delay"
++-msgstr "Startverz?gerung"
+++msgstr "Startverzögerung"
++ 
++ #: 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
++@@ -117,11 +118,11 @@
++ 
++ #: src/lsz.c:612 src/lsz.c:627
++ msgid "need at least one file to send"
++-msgstr "es mu? mindestens ein Name einer zu sendenden Datei angegeben werden"
+++msgstr "es muss mindestens ein Name einer zu sendenden Datei angegeben werden"
++ 
++ #: src/lsz.c:629
++ msgid "Can't send command in restricted mode\n"
++-msgstr "Im eingeschr?nkten Modus ist das Senden von Kommandos verboten\n"
+++msgstr "Im eingeschränkten Modus ist das Senden von Kommandos verboten\n"
++ 
++ #: src/lrz.c:527 src/lsz.c:656
++ msgid "hostname too long\n"
++@@ -129,7 +130,7 @@
++ 
++ #: src/lrz.c:542 src/lsz.c:671
++ msgid "illegal server address\n"
++-msgstr "Illegale Serveraddresse\n"
+++msgstr "Illegale Serveradresse\n"
++ 
++ #: src/lsz.c:710
++ msgid "can read only one file from stdin"
++@@ -137,21 +138,21 @@
++ 
++ #: src/lrz.c:574 src/lsz.c:803
++ msgid "Transfer incomplete\n"
++-msgstr "?bertragung nicht abgeschlossen\n"
+++msgstr "Ãœbertragung nicht abgeschlossen\n"
++ 
++ #: src/lrz.c:576 src/lsz.c:805
++ msgid "Transfer complete\n"
++-msgstr "?bertragung abgeschlossen\n"
+++msgstr "Ãœbertragung abgeschlossen\n"
++ 
++ #: src/lsz.c:838
++ #, c-format
++ msgid "send_pseudo %s: cannot open tmpfile %s: %s"
++-msgstr "send_pseudo %s: kann tempor?re Datei %s nicht ?ffnen: %s"
+++msgstr "send_pseudo %s: kann temporäre Datei %s nicht öffnen: %s"
++ 
++ #: src/lsz.c:851
++ #, c-format
++ msgid "send_pseudo %s: cannot lstat tmpfile %s: %s"
++-msgstr "send_pseudo %s: kann lstat nicht auf tempor?re Datei %s anwenden: %s"
+++msgstr "send_pseudo %s: kann lstat nicht auf temporäre Datei %s anwenden: %s"
++ 
++ #: src/lsz.c:859
++ #, c-format
++@@ -161,7 +162,7 @@
++ #: src/lsz.c:870
++ #, c-format
++ msgid "send_pseudo %s: cannot write to tmpfile %s: %s"
++-msgstr "send_pseudo %s: kann nicht in tempor?re Datei %s schreiben: %s"
+++msgstr "send_pseudo %s: kann nicht in temporäre Datei %s schreiben: %s"
++ 
++ #: src/lsz.c:879
++ #, c-format
++@@ -188,17 +189,17 @@
++ 
++ #: src/lsz.c:953
++ msgid "Can't open any requested files."
++-msgstr "Kann keine der angeforderten Dateien ?ffnen"
+++msgstr "Kann keine der angeforderten Dateien öffnen"
++ 
++ #: src/lsz.c:1009
++ #, c-format
++ msgid "security violation: not allowed to upload from %s"
++-msgstr "Sicherheitsversto?: Ausf?hrung unter eingeschr?nkter Shell verboten"
+++msgstr "Sicherheitsverstoß: Hochladen von %s nicht erlaubt"
++ 
++ #: src/lrz.c:1384 src/lsz.c:1027
++ #, c-format
++ msgid "cannot open %s"
++-msgstr "kann %s nicht ?ffnen"
+++msgstr "kann %s nicht öffnen"
++ 
++ #: src/lsz.c:1082
++ #, c-format
++@@ -213,12 +214,12 @@
++ #: src/lsz.c:1119
++ #, c-format
++ msgid "skipped: %s"
++-msgstr "?bersprungen: %s"
+++msgstr "übersprungen: %s"
++ 
++ #: src/lsz.c:1122
++ #, c-format
++ msgid "%s/%s: skipped"
++-msgstr "%s/%s: ?bersprungen"
+++msgstr "%s/%s: übersprungen"
++ 
++ #: src/lsz.c:1149
++ #, c-format
++@@ -228,7 +229,7 @@
++ #: src/lsz.c:1178
++ #, c-format
++ msgid "Sending %s, %ld blocks: "
++-msgstr "Sende %s, %ld Bl?cke:"
+++msgstr "Sende %s, %ld Blöcke:"
++ 
++ #: src/lsz.c:1181
++ msgid "Give your local XMODEM receive command now."
++@@ -245,11 +246,11 @@
++ 
++ #: src/lsz.c:1314
++ msgid "Receiver Cancelled"
++-msgstr "Empf?nger brach ab"
+++msgstr "Empfänger brach ab"
++ 
++ #: src/lsz.c:1340
++ msgid "No ACK on EOT"
++-msgstr "Keine Best?tigung f?r ?bertragungsende erhalten"
+++msgstr "Keine Bestätigung für Übertragungsende erhalten"
++ 
++ #: src/lsz.c:1361
++ #, c-format
++@@ -267,24 +268,24 @@
++ 
++ #: src/lsz.c:1399
++ msgid "Timeout on sector ACK"
++-msgstr "Timeout bei Sektorbest?tigung"
+++msgstr "Timeout bei Sektorbestätigung"
++ 
++ #: src/lsz.c:1404
++ msgid "NAK on sector"
++-msgstr "Sektor nicht best?tigt"
+++msgstr "Sektor nicht bestätigt"
++ 
++ #: src/lsz.c:1410
++ msgid "Got burst for sector ACK"
++-msgstr ""
+++msgstr "Erhielt Bruch als Sektorbestätigung"
++ 
++ #: src/lsz.c:1412
++ #, c-format
++ msgid "Got %02x for sector ACK"
++-msgstr "Erhielt %02x als Sektorbest?tigung"
+++msgstr "Erhielt %02x als Sektorbestätigung"
++ 
++ #: src/lsz.c:1424
++ msgid "Retry Count Exceeded"
++-msgstr "Maximale Wiederholungsanzahl ?berschritten"
+++msgstr "Maximale Wiederholungsanzahl überschritten"
++ 
++ #: src/lrz.c:596 src/lsz.c:1502
++ #, c-format
++@@ -304,11 +305,11 @@
++ #: src/lsz.c:1512
++ #, c-format
++ msgid "   or: %s [options] -{c|i} COMMAND\n"
++-msgstr " oder: %s [Optionen] -{c|i} KOMMANDO\n"
+++msgstr " oder: %s [-2Ceqv] -{c|i} KOMMANDO\n"
++ 
++ #: src/lsz.c:1513
++ msgid "Send file(s) with ZMODEM/YMODEM/XMODEM protocol\n"
++-msgstr "Dateien mit ZMODEM/YMODEM/XMODEM ?bertragen\n"
+++msgstr "Dateien mit ZMODEM/YMODEM/XMODEM übertragen\n"
++ 
++ # src/lrz.c:475 src/lsz.c:1330 xx
++ #: src/lrz.c:607 src/lsz.c:1515
++@@ -317,9 +318,9 @@
++ "    (Y) = option applies to YMODEM only\n"
++ "    (Z) = option applies to ZMODEM only\n"
++ msgstr ""
++-"    (X) = Option gilt nur f?r XMODEM\n"
++-"    (Y) = Option gilt nur f?r YMODEM\n"
++-"    (Z) = Option gilt nur f?r ZMODEM\n"
+++"    (X) = Option gilt nur für XMODEM\n"
+++"    (Y) = Option gilt nur für YMODEM\n"
+++"    (Z) = Option gilt nur für ZMODEM\n"
++ 
++ #: src/lsz.c:1521
++ msgid ""
++@@ -347,32 +348,32 @@
++ "  -m, --min-bps N             stop transmission if BPS below N\n"
++ "  -M, --min-bps-time N          for at least N seconds (default: 120)\n"
++ msgstr ""
++-"  -+, --append                an existierende Dateien anh?ngen (Z)\n"
+++"  -+, --append                an existierende Dateien anhängen (Z)\n"
++ "  -2, --twostop               zwei Stopbits verwenden\n"
++-"  -4, --try-4k                bis zu 4K Blockgr??e verwenden\n"
++-"      --start-4k              mit 4K Blockgr??e starten (versucht nicht 8)\n"
++-"  -8, --try-8k                bis zu 8K Blockgr??e verwenden\n"
++-"      --start-8k              mit 8K Blockgr??e starten\n"
+++"  -4, --try-4k                bis zu 4K Blockgröße verwenden\n"
+++"      --start-4k              mit 4K Blockgröße starten (versucht nicht 8)\n"
+++"  -8, --try-8k                bis zu 8K Blockgröße verwenden\n"
+++"      --start-8k              mit 8K Blockgröße starten\n"
++ "  -a, --ascii                 ASCII: NL nach CR/LF wandeln\n"
++-"  -b, --binary                Bin?r?bertragung erzwingen\n"
+++"  -b, --binary                Binärübertragung erzwingen\n"
++ "  -B, --bufsize N             N Bytes puffern (auto: ganze Datei puffern)\n"
++-"  -c, --command COMMAND       Kommando KOMMANDO auf Gegenseite ausf?hren "
+++"  -c, --command COMMAND       Kommando KOMMANDO auf Gegenseite ausführen "
++ "(Z)\n"
++-"  -C, --command-tries N       N mal Kommandoausf?hrung versuchen (Z)\n"
+++"  -C, --command-tries N       N mal Kommandoausführung versuchen (Z)\n"
++ "  -d, --dot-to-slash C        '.' in Dateinamen nach '/' wandeln (Y/Z)\n"
++ "      --delay-startup N       Bei Programmstart N Sek. schlafen (Debugging)\n"
++ "  -e, --escape                alle Steuerzeichen escapen (Z)\n"
++-"  -E, --rename                Empf?nger soll Datei umbenennen falls\n"
+++"  -E, --rename                Empfänger soll Datei umbenennen falls\n"
++ "                              Zieldatei schon existiert\n"
++ "  -f, --full-path             Dateien mit vollen Pfaden senden (Y/Z)\n"
++-"  -i, --immediate-command CMD wie `c', aber sofort zur?ckkehren (Z)\n"
+++"  -i, --immediate-command CMD wie `c', aber sofort zurückkehren (Z)\n"
++ "  -h, --help                  diesen Hilfetext ausgeben\n"
++ "  -k, --1k                    1024 Bytes Pakete senden (Y)\n"
++-"  -L, --packetlen N           Unterpaketl?nge auf N Bytes beschr?nken (Z)\n"
++-"  -l, --framelen N            Rahmenl?nge auf N Bytes beschr?nken (l>=L) "
+++"  -L, --packetlen N           Unterpaketlänge auf N Bytes beschränken (Z)\n"
+++"  -l, --framelen N            Rahmenlänge auf N Bytes beschränken (l>=L) "
++ "(Z)\n"
++-"  -m, --min-bps N             ?bertragung abbrechen bei weniger als N BPS\n"
++-"  -M, --min-bps-time N          f?r mindestens N Sekunden (Default: 120)\n"
+++"  -m, --min-bps N             Ãœbertragung abbrechen bei weniger als N BPS\n"
+++"  -M, --min-bps-time N          für mindestens N Sekunden (Default: 120)\n"
++ 
++ #: src/lsz.c:1546
++ msgid ""
++@@ -400,28 +401,28 @@
++ "short options use the same arguments as the long ones\n"
++ msgstr ""
++ "  -n, --newer                 Datei senden wenn sie neuer ist (Z)\n"
++-"  -N, --newer-or-longer       Datei senden wenn neuer oder l?nger (Z)\n"
+++"  -N, --newer-or-longer       Datei senden wenn neuer oder länger (Z)\n"
++ "  -o, --16-bit-crc            16Bit CRC statt 32Bit CRC verwenden (Z)\n"
++ "  -O, --disable-timeouts      Timeoutbehandlung abschalten\n"
++-"  -p, --protect               existierende Dateien nicht ver?ndern\n"
++-"  -r, --resume                unterbrochene ?bertragungen fortsetzen (Z)\n"
++-"  -R, --restricted            eingeschr?nkter, sichererer Modus\n"
+++"  -p, --protect               existierende Dateien nicht verändern\n"
+++"  -r, --resume                unterbrochene Ãœbertragungen fortsetzen (Z)\n"
+++"  -R, --restricted            eingeschränkter, sichererer Modus\n"
++ "  -q, --quiet                 leise, keine Ausgaben machen\n"
++-"  -s, --stop-at {HH:MM|+N}    ?bertragung um HH:MM oder in N Sek. abbrechen\n"
++-"      --tcp-server            Socket ?ffnen und auf Verbindung warten\n"
++-"      --tcp-client ADDR:PORT  Socket ?ffnen und verbindung mit ...\n"
++-"  -u, --unlink                Datei nach ?bertragung l?schen\n"
++-"  -U, --unrestrict            eingeschr?nkten Modus aufheben (falls "
+++"  -s, --stop-at {HH:MM|+N}    Ãœbertragung um HH:MM oder in N Sek. abbrechen\n"
+++"      --tcp-server            Socket öffnen, Verbindung abwarten (Z)\n"
+++"      --tcp-client ADDR:PORT  Socket öffnen, verbinden mit ... (Z)\n"
+++"  -u, --unlink                Datei nach Übertragung löschen\n"
+++"  -U, --unrestrict            eingeschränkten Modus aufheben (falls "
++ "erlaubt)\n"
++ "  -v, --verbose               mehr ausgeben\n"
++-"  -w, --windowsize N          Fenstergr??e auf N Bytes setzen (Z)\n"
+++"  -w, --windowsize N          Fenstergröße auf N Bytes setzen (Z)\n"
++ "  -X  --xmodem                XMODEM-Protokoll benutzen\n"
++-"  -y, --overwrite             existierende Dateien ?berschreiben\n"
++-"  -Y, --overwrite-or-skip     wie `y', aber nicht existierende ?berspringen\n"
+++"  -y, --overwrite             existierende Dateien überschreiben\n"
+++"  -Y, --overwrite-or-skip     wie `y', aber nicht existierende überspringen\n"
++ "      --ymodem                YMODEM-Protokoll benutzen\n"
++ "  -Z, --zmodem                ZMODEM-Protokoll benutzen\n"
++ "\n"
++-"Kurze Optionen ben?tigen dieselben Argumente wie Lange.\n"
+++"Kurze Optionen benötigen dieselben Argumente wie die langen.\n"
++ 
++ #: src/lsz.c:1768
++ msgid "got ZRQINIT"
++@@ -434,7 +435,7 @@
++ #: src/lsz.c:1991
++ #, c-format
++ msgid "blklen now %d\n"
++-msgstr "Blockgr??e nun %d\n"
+++msgstr "Blockgröße nun %d\n"
++ 
++ #: src/lsz.c:2053
++ #, c-format
++@@ -453,7 +454,7 @@
++ #: src/lsz.c:2223
++ #, c-format
++ msgid "calc_blklen: reduced to %d due to error\n"
++-msgstr "calc_blklen: Blockgr?sse auf %d reduziert wegen Fehler\n"
+++msgstr "calc_blklen: Blockgröße auf %d reduziert wegen Fehler\n"
++ 
++ #: src/lsz.c:2256
++ #, c-format
++@@ -468,12 +469,12 @@
++ #: src/lsz.c:2267
++ #, c-format
++ msgid "calc_blklen: calc total_bytes=%ld, bpe=%ld, ec=%ld\n"
++-msgstr "calc_blklen: kalkuliere gesamt_bytes=%ld, bpe=%le, ec=%ld\n"
+++msgstr "calc_blklen: kalkuliere gesamt_bytes=%ld, bpe=%ld, ec=%ld\n"
++ 
++ #: src/lsz.c:2278
++ #, c-format
++ msgid "calc_blklen: blklen %d, ok %ld, failed %ld -> %lu\n"
++-msgstr "calc_blklen: Blockl?nge %d, ok %ld, fehlgeschlagen %ld -> %lu\n"
+++msgstr "calc_blklen: Blocklänge %d, ok %ld, fehlgeschlagen %ld -> %lu\n"
++ 
++ #: src/lsz.c:2290
++ #, c-format
++@@ -512,7 +513,7 @@
++ 
++ #: src/zm.c:712
++ msgid "Garbage count exceeded"
++-msgstr "Maximale Wiederholungsanzahl ?berschritten"
+++msgstr "Maximale Wiederholungsanzahl überschritten"
++ 
++ #: src/zm.c:773
++ #, c-format
++@@ -526,11 +527,11 @@
++ 
++ #: src/lrz.c:382
++ msgid "don't have settimeofday, will not set time\n"
++-msgstr "Zeitsynchronisation nicht ausf?hrbar, settimeofday() fehlt\n"
+++msgstr "Zeitsynchronisation nicht ausführbar, settimeofday() fehlt\n"
++ 
++ #: src/lrz.c:386
++ msgid "not running as root (this is good!), can not set time\n"
++-msgstr "Zeitsynchronisation mangels Superuserrechten nicht ausf?hrbar\n"
+++msgstr "Zeitsynchronisation mangels Superuserrechten nicht ausführbar\n"
++ 
++ #: src/lrz.c:441
++ msgid "bytes_per_error"
++@@ -542,16 +543,16 @@
++ 
++ #: src/lrz.c:455
++ msgid "O_SYNC not supported by the kernel"
++-msgstr "O_SYNC vom Kernel nicht unterst?tzt"
+++msgstr "O_SYNC vom Kernel nicht unterstützt"
++ 
++ #: src/lrz.c:497 src/lrz.c:499
++ msgid "garbage on commandline"
++-msgstr "M?ll auf der Kommandozeile"
+++msgstr "Müll auf der Kommandozeile"
++ 
++ #: src/lrz.c:604
++ #, c-format
++ msgid "Usage: %s [options] [filename.if.xmodem]\n"
++-msgstr "Benutzung: %s [Optionen] [Dateiname.f?r.xmodem]\n"
+++msgstr "Benutzung: %s [Optionen] [Dateiname.für.xmodem]\n"
++ 
++ #: src/lrz.c:605
++ msgid "Receive files with ZMODEM/YMODEM/XMODEM protocol\n"
++@@ -596,44 +597,44 @@
++ "\n"
++ "short options use the same arguments as the long ones\n"
++ msgstr ""
++-"  -+, --append                an existierende Dateien anh?ngen\n"
++-"  -a, --ascii                 ASCII-?bertragung (CR/LF nach LF wandeln)\n"
++-"  -b, --binary                Bin?r?bertragung (keine Umwandlungen)\n"
+++"  -+, --append                an existierende Dateien anhängen\n"
+++"  -a, --ascii                 ASCII-Ãœbertragung (CR/LF nach LF wandeln)\n"
+++"  -b, --binary                Binärübertragung (keine Umwandlungen)\n"
++ "  -B, --bufsize N             N Bytes puffern (auto: ganze Datei puffern)\n"
++-"  -c, --with-crc              16bit CRC statt Pr?fsumme verwenden (X)\n"
++-"  -C, --allow-remote-commands Ausf?hrung von Kommandos erlauben (Z)\n"
+++"  -c, --with-crc              16bit CRC statt Prüfsumme verwenden (X)\n"
+++"  -C, --allow-remote-commands Ausführung von Kommandos erlauben (Z)\n"
++ "  -D, --null                  empfangene Daten nach /dev/null schreiben\n"
++ "      --delay-startup N       Bei Programmstart N Sek. schlafen (Debugging)\n"
++ "  -e, --escape                Alle Steuerzeichen escapen (Z)\n"
++-"  -E, --rename                Empf?nger soll Datei umbenennen falls\n"
+++"  -E, --rename                Empfänger soll Datei umbenennen, falls\n"
++ "                              Zieldatei schon existiert\n"
++ "      --errors N              Einen CRC-Fehler alle N Bytes erzeugen\n"
++ "  -h, --help                  Diesen Hilfstext ausgeben\n"
++-"  -m, --min-bps N             ?bertragung abbrechen bei weniger als N BPS\n"
++-"  -M, --min-bps-time N          f?r mindestens N Sekunden (Default: 120)\n"
+++"  -m, --min-bps N             Ãœbertragung abbrechen bei weniger als N BPS\n"
+++"  -M, --min-bps-time N          für mindestens N Sekunden (Default: 120)\n"
++ "  -O, --disable-timeouts      Timeoutbehandlung abschalten\n"
++ "      --o-sync                Ausgabedatei(en) im synchron schreiben\n"
++-"  -p, --protect               existierende Dateien nicht ver?ndern\n"
+++"  -p, --protect               existierende Dateien nicht verändern\n"
++ "  -q, --quiet                 leise, keine Ausgaben machen\n"
++-"  -r, --resume                unterbrochene ?bertragungen fortsetzen (Z)\n"
++-"  -R, --restricted            eingeschr?nkter, sichererer Modus\n"
++-"  -s, --stop-at {HH:MM|+N}    ?bertragung um HH:MM oder in N Sek. abbrechen\n"
+++"  -r, --resume                unterbrochene Ãœbertragungen fortsetzen (Z)\n"
+++"  -R, --restricted            eingeschränkter, sichererer Modus\n"
+++"  -s, --stop-at {HH:MM|+N}    Ãœbertragung um HH:MM oder in N Sek. abbrechen\n"
++ "  -S, --timesync              Zeit anfordern (doppelt: lokale Zeit setzen)\n"
++-"      --syslog[=off]          syslog an- oder ausschalten, wenn m?glich\n"
++-"  -t, --timeout N             Timeout auf N Zehntelsekungen setzen\n"
++-"      --tcp-server            Socket ?ffnen und auf Verbindung warten\n"
++-"      --tcp-client ADDR:PORT  Socket ?ffnen und verbindung mit ...\n"
+++"      --syslog[=off]          syslog an- oder ausschalten, wenn möglich\n"
+++"  -t, --timeout N             Timeout auf N Zehntelsekunden setzen\n"
+++"      --tcp-server            Socket öffnen, Verbindung abwarten (Z)\n"
+++"      --tcp-client ADDR:PORT  Socket öffnen, verbinden mit ... (Z)\n"
++ "  -u, --keep-uppercase        GROSS geschrieben Dateinamen beibehalten\n"
++-"  -U, --unrestrict            eingeschr?nkten Modus aufheben (falls "
+++"  -U, --unrestrict            eingeschränkten Modus aufheben (falls "
++ "erlaubt)\n"
++ "  -v, --verbose               mehr ausgeben\n"
++-"  -w, --windowsize N          Fenstergr??e auf N Bytes setzen (Z)\n"
+++"  -w, --windowsize N          Fenstergröße auf N Bytes setzen (Z)\n"
++ "  -X  --xmodem                XMODEM-Protokoll benutzen\n"
++-"  -y, --overwrite             existierende Dateien ?berschreiben\n"
+++"  -y, --overwrite             existierende Dateien überschreiben\n"
++ "      --ymodem                YMODEM-Protokoll benutzen\n"
++ "  -Z, --zmodem                ZMODEM-Protokoll benutzen\n"
++ "\n"
++-"Kurze Optionen ben?tigen dieselben Argumente wie Lange.\n"
+++"Kurze Optionen benötigen dieselben Argumente wie die langen.\n"
++ 
++ #: src/lrz.c:676
++ #, c-format
++@@ -662,11 +663,11 @@
++ "%s: %s removed.\r\n"
++ msgstr ""
++ "\r\n"
++-"%s: %s gel?scht\r\n"
+++"%s: %s gelöscht\r\n"
++ 
++ #: src/lrz.c:856
++ msgid "Pathname fetch returned EOT"
++-msgstr "Ende der ?bertragung beim Warten auf Dateinamen"
+++msgstr "Ende der Ãœbertragung beim Warten auf Dateinamen"
++ 
++ #: src/lrz.c:903
++ msgid "Received dup Sector"
++@@ -682,7 +683,7 @@
++ 
++ #: src/lrz.c:976
++ msgid "Checksum"
++-msgstr "Pr?fsummenfehler"
+++msgstr "Prüfsummenfehler"
++ 
++ #: src/lrz.c:979
++ msgid "Sector number garbled"
++@@ -695,27 +696,27 @@
++ #: src/lrz.c:1005
++ #, c-format
++ msgid "Got 0%o sector header"
++-msgstr "Erhielt %02x als Sektorbest?tigung"
+++msgstr "Erhielt %02x als Sektorbestätigung"
++ 
++ #: src/lrz.c:1113
++ #, c-format
++ msgid "file name ends with a /, skipped: %s\n"
++-msgstr "Dateiname endet mit /, ?bersprungen: %s\n"
+++msgstr "Dateiname endet mit /, übersprungen: %s\n"
++ 
++ #: src/lrz.c:1127
++ #, c-format
++ msgid "zmanag=%d, Lzmanag=%d\n"
++-msgstr ""
+++msgstr "zmanag=%d, Lzmanag=%d\n"
++ 
++ #: src/lrz.c:1128
++ #, c-format
++ msgid "zconv=%d\n"
++-msgstr ""
+++msgstr "zconv=%d\n"
++ 
++ #: src/lrz.c:1192 src/lrz.c:1226
++ #, c-format
++ msgid "file exists, skipped: %s\n"
++-msgstr "Datei existiert, ?bersprungen: %s\n"
+++msgstr "Datei existiert, übersprungen: %s\n"
++ 
++ #: src/lrz.c:1267
++ #, c-format
++@@ -739,7 +740,7 @@
++ #: src/lrz.c:1545
++ #, c-format
++ msgid "Blocks received: %d"
++-msgstr "Bl?cke empfangen: %d"
+++msgstr "Blöcke empfangen: %d"
++ 
++ #: src/lrz.c:1599
++ #, c-format
++@@ -749,15 +750,15 @@
++ #: src/lrz.c:1612 src/lrz.c:1620
++ #, c-format
++ msgid "%s:\tSecurity Violation"
++-msgstr "%s:\tSicherheitsversto?"
+++msgstr "%s:\tSicherheitsverstoß"
++ 
++ #: src/lrz.c:1730
++ msgid "remote command execution requested"
++-msgstr "Gegenseite versucht Kommandoausf?hrung"
+++msgstr "Gegenseite versucht Kommandoausführung"
++ 
++ #: src/lrz.c:1737
++ msgid "not executed"
++-msgstr "nicht ausgef?hrt"
+++msgstr "nicht ausgeführt"
++ 
++ #: src/lrz.c:1768
++ msgid "got ZRINIT"
++@@ -765,7 +766,7 @@
++ 
++ #: src/lrz.c:1817
++ msgid "Skipped"
++-msgstr "?bersprungen"
+++msgstr "Ãœbersprungen"
++ 
++ #. too bad
++ #: src/lrz.c:2049
++@@ -785,7 +786,7 @@
++ 
++ #: src/lrz.c:2215
++ msgid "file close error"
++-msgstr "Fehler beim Schlie?en der Datei"
+++msgstr "Fehler beim Schließen der Datei"
++ 
++ #~ msgid "tcp protocol init failed\n"
++ #~ msgstr "TCP Protokoll Initialisierung fehlgeschlagen\n"
++@@ -796,17 +797,3 @@
++ #~ msgid "fgets for tcp protocol synchronization failed: "
++ #~ msgstr "fgets() bei tcp Protokoll Synchronisation fehlgeschlagen: "
++ 
++-#~ msgid "Transfer complete."
++-#~ msgstr "?bertragung abgeschlossen"
++-
++-#~ msgid "at"
++-#~ msgstr "um"
++-
++-#~ msgid "TIMESYNC: failed\n"
++-#~ msgstr "Zeitsynchronisation: fehlgeschlagen\n"
++-
++-#~ msgid "TIMESYNC: ok\n"
++-#~ msgstr "Zeitsynchronisation: ok\n"
++-
++-#~ msgid "Falldown to %ld blklen"
++-#~ msgstr "Blockgr??e auf %ld gesenkt"
diff --git a/source/a/minicom/minicom.SlackBuild b/source/a/minicom/minicom.SlackBuild
index 91e7baa9..be060ec2 100755
--- a/source/a/minicom/minicom.SlackBuild
+++ b/source/a/minicom/minicom.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,8 +21,10 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=2.1
-BUILD=${BUILD:-4}
+VERSION=2.5
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j6}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -59,97 +61,99 @@ cd minicom-$VERSION
 
 # The following command renames the internal implementation of getline
 # to g_getline as newer versions of Glibc provide an incompatible version:
-sed -i -e "s/getline/g_&/" $(grep -lr getline *)
+#sed -i -e "s/getline/g_&/" $(grep -lr getline *)
 
 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
 
-## Forget it...  it just doesn't help.
-## Remove the autoconf program for this sorry old turd or abandon all hope.
-#touch configure
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --sysconfdir=/etc
-make -j3 || exit 1
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
+
 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?/*.?
+printf "# Machine-generated file - use "minicom -s" to change parameters.\n" \
+       > $PKG/etc/minirc.dfl.new
+
 mkdir -p $PKG/usr/doc/minicom-$VERSION
 cp -a \
-  ABOUT-NLS AUTHORS COPYING ChangeLog FILE_ID.DIZ INSTALL NEWS README TODO \
-  doc \
+  AUTHORS COPYING* ChangeLog FILE_ID.DIZ INSTALL NEWS README* TODO doc \
   $PKG/usr/doc/minicom-$VERSION
+rm -f $PKG/usr/doc/minicom-$VERSION/doc/{ChangeLog.old,Makefile*}
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
 
 # lzrz
-# If autoconf causes failure here (which it probably will),
-# remove it temporarily and the build should work fine...
+# If autotools causes failure here (which it probably will), temporarily 
+# move /usr/bin/auto{conf,header,make} out of the way and it should work... 
+
 cd $TMP
-tar xzvf $CWD/lrzsz_0.12.21.orig.tar.gz || exit 1
+rm -rf lrzsz-990823
+tar xvf $CWD/lrzsz_0.12.21.orig.tar.gz || exit 1
 cd lrzsz-990823
+chown -R root:root .
+
 # 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 .
-#touch configure
+
+# Apply some of the debian patches
+zcat $CWD/lrzsz_0.12.21-5.diff.gz | patch -p1 --verbose || exit 1
+rm -f debian/patches/{206499_ymodemg.diff.unchecked,206648_dszlog.diff.unchecked}
+for i in debian/patches/* ; do patch -p1 < $i || exit 1 ; done
+
 ./configure \
   --prefix=/usr \
-  $ARCH-slackware-linux
-make -j3 || exit 1
-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
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
+
+cp src/lrz src/lsz $PKG/usr/bin
+chmod 0755 $PKG/usr/bin/{lrz,lsz}
+
+cp man/{lrz,lsz}.1 $PKG/usr/man/man1
+echo '.so man1/lrz.1' > $PKG/usr/man/man1/rz.1
+echo '.so man1/lsz.1' > $PKG/usr/man/man1/sz.1
+
 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
+cat po/de.gmo > $PKG/usr/share/locale/de/LC_MESSAGES/lrzsz.mo
 
+mkdir -p $PKG/usr/doc/lrzsz-0.12.21
+cp -a \
+  AUTHORS COMPATABILITY COPYING* INSTALL NEWS README* THANKS TODO \
+  $PKG/usr/doc/lrzsz-0.12.21
+
+( cd $PKG/usr/bin
+  for i in lrb lrx rz ; do ln -s lrz $i ; done
+  for i in lsb lsx sz ; do ln -s lsz $i ; done
+  for i in rx rb ; do ln -s rz $i ; done
+  for i in sb sx ; do ln -s sz $i ; done
+)
 
 ( 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
 )
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+
 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
+/sbin/makepkg -l y -c n $TMP/minicom-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source/a/minicom/minirc.dfl b/source/a/minicom/minirc.dfl
deleted file mode 100644
index 42e9d8fe..00000000
--- a/source/a/minicom/minirc.dfl
+++ /dev/null
@@ -1 +0,0 @@
-# Machine-generated file - use "minicom -s" to change parameters.
diff --git a/source/a/minicom/wintcap.diff b/source/a/minicom/wintcap.diff
deleted file mode 100644
index 40d005b3..00000000
--- a/source/a/minicom/wintcap.diff
+++ /dev/null
@@ -1,44 +0,0 @@
---- 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
index 86d77539..ca95c332 100644
--- a/source/a/mkinitrd/README.initrd
+++ b/source/a/mkinitrd/README.initrd
@@ -1,7 +1,7 @@
 
 Slackware initrd mini HOWTO
 by Patrick Volkerding, volkerdi@slackware.com
-Wed Jun 17 01:49:18 CDT 2009
+Thu Apr  7 06:02:26 CDT 2011
 
 This document describes how to create and install an initrd, which may be 
 required to use the 2.6 kernel.  Also see "man mkinitrd".
@@ -22,7 +22,7 @@ and 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, ext4, 
+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 
@@ -33,15 +33,15 @@ flexible to ship a generic kernel and a set of kernel modules for it.
 
 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
+upgrading to the generic 2.6.37.6 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 kernel-generic-2.6.37.6-i686-1.tgz
+  installpkg kernel-modules-2.6.37.6-i686-1.tgz
   installpkg mkinitrd-1.1.0-i486-1.tgz
 
 Change into the /boot directory:
@@ -52,7 +52,7 @@ 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.32.3 -m reiserfs
+  mkinitrd -c -k 2.6.37.6 -m reiserfs
 
 This should do two things.  First, it will create a directory
 /boot/initrd-tree containing the initrd's filesystem.  Then it will
@@ -61,10 +61,10 @@ 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.32.3
-kernel modules for a system with an ext4 root partition on /dev/sdb3:
+Here's another example:  Build an initrd image using Linux 2.6.37.6
+kernel modules for a system with an ext3 root partition on /dev/sdb3:
 
-  mkinitrd -c -k 2.6.32.3 -m ext4 -f ext4 -r /dev/sdb3
+  mkinitrd -c -k 2.6.37.6 -m ext3 -f ext3 -r /dev/sdb3
 
 
 4.  Now that I've built an initrd, how do I use it?
@@ -76,10 +76,10 @@ 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.32.3
+image = /boot/vmlinuz-generic-2.6.37.6
   initrd = /boot/initrd.gz
-  root = /dev/sdb3
-  label = Lnx26323
+  root = /dev/sda6
+  label = Lnx26376
   read-only
 # Linux bootable partition config ends
 
diff --git a/source/a/mkinitrd/busybox-dot-config b/source/a/mkinitrd/busybox-dot-config
index 65e298b5..35b32a4f 100644
--- a/source/a/mkinitrd/busybox-dot-config
+++ b/source/a/mkinitrd/busybox-dot-config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.15.3
-# Thu Dec 17 17:50:16 2009
+# Busybox version: 1.18.4
+# Fri Mar 25 23:08:06 2011
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -14,6 +14,9 @@ CONFIG_HAVE_DOT_CONFIG=y
 #
 CONFIG_DESKTOP=y
 # CONFIG_EXTRA_COMPAT is not set
+CONFIG_INCLUDE_SUSv2=y
+# CONFIG_USE_PORTABLE_CODE is not set
+CONFIG_PLATFORM_LINUX=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
@@ -21,12 +24,23 @@ CONFIG_SHOW_USAGE=y
 CONFIG_FEATURE_VERBOSE_USAGE=y
 CONFIG_FEATURE_COMPRESS_USAGE=y
 CONFIG_FEATURE_INSTALLER=y
+CONFIG_INSTALL_NO_USR=y
 CONFIG_LOCALE_SUPPORT=y
-# CONFIG_FEATURE_ASSUME_UNICODE is not set
+CONFIG_UNICODE_SUPPORT=y
+# CONFIG_UNICODE_USING_LOCALE is not set
 # CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
+CONFIG_SUBST_WCHAR=63
+CONFIG_LAST_SUPPORTED_WCHAR=767
+# CONFIG_UNICODE_COMBINING_WCHARS is not set
+# CONFIG_UNICODE_WIDE_WCHARS is not set
+# CONFIG_UNICODE_BIDI_SUPPORT is not set
+# CONFIG_UNICODE_NEUTRAL_TABLE is not set
+# CONFIG_UNICODE_PRESERVE_BROKEN is not set
 CONFIG_LONG_OPTS=y
 CONFIG_FEATURE_DEVPTS=y
 # CONFIG_FEATURE_CLEAN_UP is not set
+CONFIG_FEATURE_WTMP=y
+CONFIG_FEATURE_UTMP=y
 CONFIG_FEATURE_PIDFILE=y
 CONFIG_FEATURE_SUID=y
 CONFIG_FEATURE_SUID_CONFIG=y
@@ -59,12 +73,10 @@ CONFIG_EXTRA_CFLAGS=""
 CONFIG_NO_DEBUG_LIB=y
 # CONFIG_DMALLOC is not set
 # CONFIG_EFENCE is not set
-CONFIG_INCLUDE_SUSv2=y
 
 #
-# Installation Options
+# Installation Options ("make install" behavior)
 #
-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
@@ -81,6 +93,7 @@ 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_USE_TERMIOS=y
 CONFIG_FEATURE_EDITING=y
 CONFIG_FEATURE_EDITING_MAX_LEN=1024
 CONFIG_FEATURE_EDITING_VI=y
@@ -104,12 +117,14 @@ CONFIG_IOCTL_HEX2STR_ERROR=y
 #
 # Archival Utilities
 #
+CONFIG_FEATURE_SEAMLESS_XZ=y
 # 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_FEATURE_AR_CREATE is not set
 CONFIG_BUNZIP2=y
 CONFIG_BZIP2=y
 CONFIG_CPIO=y
@@ -120,6 +135,7 @@ CONFIG_FEATURE_CPIO_P=y
 # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
 CONFIG_GUNZIP=y
 CONFIG_GZIP=y
+CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
 CONFIG_LZOP=y
 CONFIG_LZOP_COMPR_HIGH=y
 CONFIG_RPM2CPIO=y
@@ -132,31 +148,48 @@ 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_TO_COMMAND is not set
 CONFIG_FEATURE_TAR_UNAME_GNAME=y
+CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
+# CONFIG_FEATURE_TAR_SELINUX is not set
 CONFIG_UNCOMPRESS=y
 CONFIG_UNLZMA=y
 CONFIG_FEATURE_LZMA_FAST=y
+CONFIG_LZMA=y
+CONFIG_UNXZ=y
+CONFIG_XZ=y
 CONFIG_UNZIP=y
 
 #
 # Coreutils
 #
 CONFIG_BASENAME=y
-CONFIG_CAL=y
 CONFIG_CAT=y
+CONFIG_DATE=y
+CONFIG_FEATURE_DATE_ISOFMT=y
+# CONFIG_FEATURE_DATE_NANO is not set
+# CONFIG_FEATURE_DATE_COMPAT is not set
+CONFIG_TEST=y
+CONFIG_FEATURE_TEST_64=y
+CONFIG_TR=y
+CONFIG_FEATURE_TR_CLASSES=y
+CONFIG_FEATURE_TR_EQUIV=y
+CONFIG_BASE64=y
+CONFIG_CAL=y
 CONFIG_CATV=y
 CONFIG_CHGRP=y
 CONFIG_CHMOD=y
 CONFIG_CHOWN=y
+# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set
 CONFIG_CHROOT=y
 CONFIG_CKSUM=y
 CONFIG_COMM=y
 CONFIG_CP=y
+CONFIG_FEATURE_CP_LONG_OPTIONS=y
 CONFIG_CUT=y
-CONFIG_DATE=y
-CONFIG_FEATURE_DATE_ISOFMT=y
 CONFIG_DD=y
 CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
 CONFIG_FEATURE_DD_IBS_OBS=y
 CONFIG_DF=y
 CONFIG_FEATURE_DF_FANCY=y
@@ -234,12 +267,7 @@ 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
@@ -271,7 +299,7 @@ CONFIG_FEATURE_AUTOWIDTH=y
 CONFIG_FEATURE_HUMAN_READABLE=y
 
 #
-# Common options for md5sum, sha1sum
+# Common options for md5sum, sha1sum, sha256sum, sha512sum
 #
 CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
 
@@ -279,6 +307,7 @@ CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
 # Console Utilities
 #
 CONFIG_CHVT=y
+CONFIG_FGCONSOLE=y
 CONFIG_CLEAR=y
 CONFIG_DEALLOCVT=y
 CONFIG_DUMPKMAP=y
@@ -299,6 +328,12 @@ CONFIG_SETLOGCONS=y
 CONFIG_SHOWKEY=y
 
 #
+# Common options for loadfont and setfont
+#
+# CONFIG_FEATURE_LOADFONT_PSF2 is not set
+CONFIG_FEATURE_LOADFONT_RAW=y
+
+#
 # Debian Utilities
 #
 CONFIG_MKTEMP=y
@@ -314,15 +349,14 @@ CONFIG_WHICH=y
 #
 # Editors
 #
+CONFIG_PATCH=y
 CONFIG_AWK=y
 CONFIG_FEATURE_AWK_LIBM=y
 CONFIG_CMP=y
 CONFIG_DIFF=y
-CONFIG_FEATURE_DIFF_BINARY=y
+# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
 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
@@ -336,6 +370,7 @@ CONFIG_FEATURE_VI_READONLY=y
 CONFIG_FEATURE_VI_SETOPTS=y
 CONFIG_FEATURE_VI_SET=y
 CONFIG_FEATURE_VI_WIN_RESIZE=y
+CONFIG_FEATURE_VI_ASK_TERMINAL=y
 CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
 CONFIG_FEATURE_ALLOW_EXEC=y
 
@@ -364,6 +399,7 @@ CONFIG_FEATURE_FIND_PRUNE=y
 CONFIG_FEATURE_FIND_PATH=y
 CONFIG_FEATURE_FIND_REGEX=y
 # CONFIG_FEATURE_FIND_CONTEXT is not set
+CONFIG_FEATURE_FIND_LINKS=y
 CONFIG_GREP=y
 CONFIG_FEATURE_GREP_EGREP_ALIAS=y
 CONFIG_FEATURE_GREP_FGREP_ALIAS=y
@@ -377,6 +413,12 @@ CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
 #
 # Init Utilities
 #
+# CONFIG_BOOTCHARTD is not set
+# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
+# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
+CONFIG_HALT=y
+# CONFIG_FEATURE_CALL_TELINIT is not set
+CONFIG_TELINIT_PATH=""
 CONFIG_INIT=y
 CONFIG_FEATURE_USE_INITTAB=y
 CONFIG_FEATURE_KILL_REMOVED=y
@@ -386,33 +428,31 @@ 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_FEATURE_CALL_TELINIT is not set
-CONFIG_TELINIT_PATH=""
+CONFIG_INIT_TERMINAL_TYPE="linux"
 CONFIG_MESG=y
 
 #
 # Login/Password Management Utilities
 #
+CONFIG_ADD_SHELL=y
+CONFIG_REMOVE_SHELL=y
 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_USE_BB_CRYPT_SHA=y
-CONFIG_ADDGROUP=y
-CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=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_FEATURE_CHECK_NAMES=y
 CONFIG_FIRST_SYSTEM_ID=1000
 CONFIG_LAST_SYSTEM_ID=12000
+CONFIG_ADDGROUP=y
+CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=y
+CONFIG_FEATURE_ADDUSER_TO_GROUP=y
 CONFIG_DELUSER=y
+CONFIG_DELGROUP=y
+CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
 CONFIG_GETTY=y
-CONFIG_FEATURE_UTMP=y
-CONFIG_FEATURE_WTMP=y
 CONFIG_LOGIN=y
 # CONFIG_PAM is not set
 CONFIG_LOGIN_SCRIPTS=y
@@ -434,10 +474,12 @@ CONFIG_VLOCK=y
 CONFIG_CHATTR=y
 CONFIG_FSCK=y
 CONFIG_LSATTR=y
+CONFIG_TUNE2FS=y
 
 #
 # Linux Module Utilities
 #
+CONFIG_MODINFO=y
 # 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
@@ -453,6 +495,7 @@ CONFIG_DEPMOD=y
 # Options common to multiple modutils
 #
 CONFIG_FEATURE_2_4_MODULES=y
+# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
 # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
 CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y
 # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
@@ -467,6 +510,8 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
 #
 # Linux System Utilities
 #
+CONFIG_BLOCKDEV=y
+CONFIG_REV=y
 CONFIG_ACPID=y
 CONFIG_FEATURE_ACPID_COMPAT=y
 CONFIG_BLKID=y
@@ -484,16 +529,16 @@ CONFIG_FEATURE_FDISK_WRITABLE=y
 # CONFIG_FEATURE_SGI_LABEL is not set
 # CONFIG_FEATURE_SUN_LABEL is not set
 CONFIG_FEATURE_OSF_LABEL=y
+CONFIG_FEATURE_GPT_LABEL=y
 CONFIG_FEATURE_FDISK_ADVANCED=y
 CONFIG_FINDFS=y
+# CONFIG_FLOCK is not set
 CONFIG_FREERAMDISK=y
 CONFIG_FSCK_MINIX=y
+# CONFIG_MKFS_EXT2 is not set
 CONFIG_MKFS_MINIX=y
-
-#
-# Minix filesystem support
-#
 CONFIG_FEATURE_MINIX2=y
+# CONFIG_MKFS_REISER is not set
 CONFIG_MKFS_VFAT=y
 CONFIG_GETOPT=y
 CONFIG_FEATURE_GETOPT_LONG=y
@@ -506,6 +551,8 @@ CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
 CONFIG_IPCRM=y
 CONFIG_IPCS=y
 CONFIG_LOSETUP=y
+CONFIG_LSPCI=y
+CONFIG_LSUSB=y
 CONFIG_MDEV=y
 CONFIG_FEATURE_MDEV_CONF=y
 CONFIG_FEATURE_MDEV_RENAME=y
@@ -515,24 +562,6 @@ CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
 CONFIG_MKSWAP=y
 CONFIG_FEATURE_MKSWAP_UUID=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
@@ -560,13 +589,42 @@ CONFIG_FEATURE_UMOUNT_ALL=y
 # Common options for mount/umount
 #
 CONFIG_FEATURE_MOUNT_LOOP=y
+CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
 CONFIG_FEATURE_MTAB_SUPPORT=y
+CONFIG_VOLUMEID=y
+
+#
+# Filesystem/Volume identification
+#
+CONFIG_FEATURE_VOLUMEID_EXT=y
+# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
+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
 
 #
 # Miscellaneous Utilities
 #
+# CONFIG_CONSPY is not set
+# CONFIG_NANDWRITE is not set
+# CONFIG_NANDDUMP is not set
+# CONFIG_UBIATTACH is not set
+# CONFIG_UBIDETACH is not set
 CONFIG_ADJTIMEX=y
 CONFIG_BBCONFIG=y
+CONFIG_FEATURE_COMPRESS_BBCONFIG=y
 CONFIG_BEEP=y
 CONFIG_FEATURE_BEEP_FREQ=4000
 CONFIG_FEATURE_BEEP_LENGTH_MS=30
@@ -595,6 +653,7 @@ CONFIG_DEVMEM=y
 CONFIG_EJECT=y
 CONFIG_FEATURE_EJECT_SCSI=y
 CONFIG_FBSPLASH=y
+# CONFIG_FLASHCP is not set
 CONFIG_FLASH_LOCK=y
 CONFIG_FLASH_UNLOCK=y
 CONFIG_FLASH_ERASEALL=y
@@ -628,6 +687,7 @@ CONFIG_MOUNTPOINT=y
 CONFIG_MT=y
 CONFIG_RAIDAUTORUN=y
 CONFIG_READAHEAD=y
+# CONFIG_RFKILL is not set
 CONFIG_RUNLEVEL=y
 CONFIG_RX=y
 CONFIG_SETSID=y
@@ -638,11 +698,17 @@ CONFIG_TIME=y
 CONFIG_TIMEOUT=y
 CONFIG_TTYSIZE=y
 CONFIG_VOLNAME=y
+# CONFIG_WALL is not set
 CONFIG_WATCHDOG=y
 
 #
 # Networking Utilities
 #
+CONFIG_NBDCLIENT=y
+CONFIG_NC=y
+CONFIG_NC_SERVER=y
+CONFIG_NC_EXTRA=y
+# CONFIG_NC_110_COMPAT is not set
 CONFIG_FEATURE_IPV6=y
 CONFIG_FEATURE_UNIX_LOCAL=y
 CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
@@ -657,6 +723,7 @@ CONFIG_ETHER_WAKE=y
 CONFIG_FAKEIDENTD=y
 CONFIG_FTPD=y
 CONFIG_FEATURE_FTP_WRITE=y
+CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y
 CONFIG_FTPGET=y
 CONFIG_FTPPUT=y
 CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
@@ -673,6 +740,7 @@ CONFIG_HOSTNAME=y
 # 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_FEATURE_HTTPD_GZIP is not set
 CONFIG_IFCONFIG=y
 CONFIG_FEATURE_IFCONFIG_STATUS=y
 CONFIG_FEATURE_IFCONFIG_SLIP=y
@@ -715,40 +783,49 @@ 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_NTPD is not set
+# CONFIG_FEATURE_NTPD_SERVER is not set
 CONFIG_PING=y
 CONFIG_PING6=y
 CONFIG_FEATURE_FANCY_PING=y
 CONFIG_PSCAN=y
 CONFIG_ROUTE=y
 CONFIG_SLATTACH=y
+CONFIG_TCPSVD=y
 CONFIG_TELNET=y
 CONFIG_FEATURE_TELNET_TTYPE=y
 CONFIG_FEATURE_TELNET_AUTOLOGIN=y
 CONFIG_TELNETD=y
 CONFIG_FEATURE_TELNETD_STANDALONE=y
+# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
 CONFIG_TFTP=y
 # CONFIG_TFTPD is not set
+
+#
+# Common options for tftp/tftpd
+#
 CONFIG_FEATURE_TFTP_GET=y
 CONFIG_FEATURE_TFTP_PUT=y
 CONFIG_FEATURE_TFTP_BLOCKSIZE=y
+CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
 CONFIG_TFTP_DEBUG=y
 CONFIG_TRACEROUTE=y
+CONFIG_TRACEROUTE6=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_TUNCTL=y
+CONFIG_FEATURE_TUNCTL_UG=y
+# CONFIG_UDHCPD is not set
+# CONFIG_DHCPRELAY is not set
+# CONFIG_DUMPLEASES is not set
 # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
 CONFIG_DHCPD_LEASES_FILE=""
-# CONFIG_APP_UDHCPC is not set
+# CONFIG_UDHCPC is not set
 # CONFIG_FEATURE_UDHCPC_ARPING is not set
 # CONFIG_FEATURE_UDHCP_PORT is not set
 CONFIG_UDHCP_DEBUG=0
@@ -756,16 +833,14 @@ CONFIG_UDHCP_DEBUG=0
 CONFIG_UDHCPC_DEFAULT_SCRIPT=""
 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
+CONFIG_UDPSVD=y
 CONFIG_VCONFIG=y
 CONFIG_WGET=y
 CONFIG_FEATURE_WGET_STATUSBAR=y
 CONFIG_FEATURE_WGET_AUTHENTICATION=y
 CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+CONFIG_FEATURE_WGET_TIMEOUT=y
 CONFIG_ZCIP=y
-CONFIG_TCPSVD=y
-CONFIG_TUNCTL=y
-CONFIG_FEATURE_TUNCTL_UG=y
-CONFIG_UDPSVD=y
 
 #
 # Print Utilities
@@ -788,6 +863,11 @@ CONFIG_FEATURE_REFORMIME_COMPAT=y
 #
 # Process Utilities
 #
+CONFIG_IOSTAT=y
+CONFIG_MPSTAT=y
+CONFIG_PMAP=y
+CONFIG_POWERTOP=y
+# CONFIG_SMEMCAP is not set
 CONFIG_FREE=y
 CONFIG_FUSER=y
 CONFIG_KILL=y
@@ -813,6 +893,7 @@ CONFIG_FEATURE_TOP_SMP_CPU=y
 CONFIG_FEATURE_TOP_DECIMALS=y
 CONFIG_FEATURE_TOP_SMP_PROCESS=y
 CONFIG_FEATURE_TOPMEM=y
+CONFIG_FEATURE_SHOW_THREADS=y
 CONFIG_UPTIME=y
 CONFIG_WATCH=y
 
@@ -849,14 +930,9 @@ CONFIG_SOFTLIMIT=y
 #
 # Shells
 #
-CONFIG_FEATURE_SH_IS_ASH=y
-# CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_NONE is not set
 CONFIG_ASH=y
 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_GETOPTS=y
 CONFIG_ASH_BUILTIN_ECHO=y
@@ -867,10 +943,13 @@ CONFIG_ASH_MAIL=y
 CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
 CONFIG_ASH_RANDOM_SUPPORT=y
 CONFIG_ASH_EXPAND_PRMT=y
+CONFIG_CTTYHACK=y
 # CONFIG_HUSH is not set
 # CONFIG_HUSH_BASH_COMPAT is not set
+# CONFIG_HUSH_BRACE_EXPANSION is not set
 # CONFIG_HUSH_HELP is not set
 # CONFIG_HUSH_INTERACTIVE is not set
+# CONFIG_HUSH_SAVEHISTORY is not set
 # CONFIG_HUSH_JOB is not set
 # CONFIG_HUSH_TICK is not set
 # CONFIG_HUSH_IF is not set
@@ -878,15 +957,21 @@ CONFIG_ASH_EXPAND_PRMT=y
 # CONFIG_HUSH_CASE is not set
 # CONFIG_HUSH_FUNCTIONS is not set
 # CONFIG_HUSH_LOCAL is not set
+# CONFIG_HUSH_RANDOM_SUPPORT is not set
 # CONFIG_HUSH_EXPORT_N is not set
-# CONFIG_LASH is not set
+# CONFIG_HUSH_MODE_X is not set
 # CONFIG_MSH is not set
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+# CONFIG_FEATURE_BASH_IS_ASH is not set
+# CONFIG_FEATURE_BASH_IS_HUSH is not set
+CONFIG_FEATURE_BASH_IS_NONE=y
 CONFIG_SH_MATH_SUPPORT=y
 CONFIG_SH_MATH_SUPPORT_64=y
 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
@@ -895,9 +980,11 @@ CONFIG_SYSLOGD=y
 CONFIG_FEATURE_ROTATE_LOGFILE=y
 CONFIG_FEATURE_REMOTE_LOG=y
 # CONFIG_FEATURE_SYSLOGD_DUP is not set
+CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
 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_FEATURE_KLOGD_KLOGCTL=y
 CONFIG_LOGGER=y
diff --git a/source/a/mkinitrd/busybox-dot-config.1.15.x b/source/a/mkinitrd/busybox-dot-config.1.15.x
new file mode 100644
index 00000000..65e298b5
--- /dev/null
+++ b/source/a/mkinitrd/busybox-dot-config.1.15.x
@@ -0,0 +1,903 @@
+#
+# Automatically generated make config: don't edit
+# Busybox version: 1.15.3
+# Thu Dec 17 17:50:16 2009
+#
+CONFIG_HAVE_DOT_CONFIG=y
+
+#
+# Busybox Settings
+#
+
+#
+# General Configuration
+#
+CONFIG_DESKTOP=y
+# CONFIG_EXTRA_COMPAT 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_FEATURE_ASSUME_UNICODE is not set
+# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
+CONFIG_LONG_OPTS=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 is not set
+# 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=""
+CONFIG_EXTRA_CFLAGS=""
+
+#
+# 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="/tmp/package-mkinitrd/usr/share/mkinitrd/initrd-tree"
+
+#
+# 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_EDITING_ASK_TERMINAL=y
+# CONFIG_FEATURE_NON_POSIX_CP is not set
+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_FEATURE_CPIO_P=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_LZOP=y
+CONFIG_LZOP_COMPR_HIGH=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_FANCY=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_FSYNC=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_SHA256SUM=y
+CONFIG_SHA512SUM=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_FEATURE_SETFONT_TEXTUAL_MAP=y
+CONFIG_DEFAULT_SETFONT_DIR="/usr/share/kbd/consolefonts"
+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_LIBM=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_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_FEATURE_CALL_TELINIT is not set
+CONFIG_TELINIT_PATH=""
+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_USE_BB_CRYPT_SHA=y
+CONFIG_ADDGROUP=y
+CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=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_FIRST_SYSTEM_ID=1000
+CONFIG_LAST_SYSTEM_ID=12000
+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_INSMOD=y
+CONFIG_RMMOD=y
+CONFIG_LSMOD=y
+CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
+CONFIG_MODPROBE=y
+CONFIG_FEATURE_MODPROBE_BLACKLIST=y
+CONFIG_DEPMOD=y
+
+#
+# Options common to multiple modutils
+#
+CONFIG_FEATURE_2_4_MODULES=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_FEATURE_CHECK_TAINTED_MODULE=y
+CONFIG_FEATURE_MODUTILS_ALIAS=y
+CONFIG_FEATURE_MODUTILS_SYMBOLS=y
+CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
+CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
+
+#
+# Linux System Utilities
+#
+CONFIG_ACPID=y
+CONFIG_FEATURE_ACPID_COMPAT=y
+CONFIG_BLKID=y
+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_MKFS_VFAT=y
+CONFIG_GETOPT=y
+CONFIG_FEATURE_GETOPT_LONG=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_UUID=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_SCRIPTREPLAY=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_BEEP=y
+CONFIG_FEATURE_BEEP_FREQ=4000
+CONFIG_FEATURE_BEEP_LENGTH_MS=30
+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_FEATURE_CROND_D=y
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+CONFIG_FEATURE_CROND_DIR="/var/spool/cron"
+CONFIG_CRONTAB=y
+CONFIG_DC=y
+CONFIG_FEATURE_DC_LIBM=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_DEVMEM=y
+CONFIG_EJECT=y
+CONFIG_FEATURE_EJECT_SCSI=y
+CONFIG_FBSPLASH=y
+CONFIG_FLASH_LOCK=y
+CONFIG_FLASH_UNLOCK=y
+CONFIG_FLASH_ERASEALL=y
+CONFIG_IONICE=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_MARKS=y
+CONFIG_FEATURE_LESS_REGEXP=y
+CONFIG_FEATURE_LESS_WINCH=y
+CONFIG_FEATURE_LESS_DASHCMD=y
+CONFIG_FEATURE_LESS_LINENUMS=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_TIMEOUT=y
+CONFIG_TTYSIZE=y
+CONFIG_VOLNAME=y
+CONFIG_WATCHDOG=y
+
+#
+# Networking Utilities
+#
+CONFIG_FEATURE_IPV6=y
+CONFIG_FEATURE_UNIX_LOCAL=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_FTPD=y
+CONFIG_FEATURE_FTP_WRITE=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_SETUID is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 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_IFPLUGD=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_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_TFTP_DEBUG=y
+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_UDHCP_DEBUG=0
+# CONFIG_FEATURE_UDHCP_RFC3397 is not set
+CONFIG_UDHCPC_DEFAULT_SCRIPT=""
+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
+CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
+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_TUNCTL=y
+CONFIG_FEATURE_TUNCTL_UG=y
+CONFIG_UDPSVD=y
+
+#
+# Print Utilities
+#
+# CONFIG_LPD is not set
+CONFIG_LPR=y
+# CONFIG_LPQ is not set
+
+#
+# Mail Utilities
+#
+CONFIG_MAKEMIME=y
+CONFIG_FEATURE_MIME_CHARSET="us-ascii"
+CONFIG_POPMAILDIR=y
+CONFIG_FEATURE_POPMAILDIR_DELIVERY=y
+CONFIG_REFORMIME=y
+CONFIG_FEATURE_REFORMIME_COMPAT=y
+# CONFIG_SENDMAIL is not set
+
+#
+# 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_ADDITIONAL_COLUMNS=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_SMP_CPU=y
+CONFIG_FEATURE_TOP_DECIMALS=y
+CONFIG_FEATURE_TOP_SMP_PROCESS=y
+CONFIG_FEATURE_TOPMEM=y
+CONFIG_UPTIME=y
+CONFIG_WATCH=y
+
+#
+# Runit Utilities
+#
+CONFIG_RUNSV=y
+CONFIG_RUNSVDIR=y
+CONFIG_FEATURE_RUNSVDIR_LOG=y
+CONFIG_SV=y
+CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service"
+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
+
+#
+# Shells
+#
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+CONFIG_ASH=y
+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_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_BASH_COMPAT 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_HUSH_FUNCTIONS is not set
+# CONFIG_HUSH_LOCAL is not set
+# CONFIG_HUSH_EXPORT_N is not set
+# CONFIG_LASH is not set
+# CONFIG_MSH is not set
+CONFIG_SH_MATH_SUPPORT=y
+CONFIG_SH_MATH_SUPPORT_64=y
+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
diff --git a/source/a/mkinitrd/busybox-dot-config.1.17.x b/source/a/mkinitrd/busybox-dot-config.1.17.x
new file mode 100644
index 00000000..18cd5e6e
--- /dev/null
+++ b/source/a/mkinitrd/busybox-dot-config.1.17.x
@@ -0,0 +1,970 @@
+#
+# Automatically generated make config: don't edit
+# Busybox version: 1.17.2
+# Sat Aug 28 23:13:46 2010
+#
+CONFIG_HAVE_DOT_CONFIG=y
+
+#
+# Busybox Settings
+#
+
+#
+# General Configuration
+#
+CONFIG_DESKTOP=y
+# CONFIG_EXTRA_COMPAT is not set
+CONFIG_INCLUDE_SUSv2=y
+# CONFIG_USE_PORTABLE_CODE 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_UNICODE_SUPPORT=y
+# CONFIG_UNICODE_USING_LOCALE is not set
+# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
+CONFIG_SUBST_WCHAR=63
+CONFIG_LAST_SUPPORTED_WCHAR=767
+# CONFIG_UNICODE_COMBINING_WCHARS is not set
+# CONFIG_UNICODE_WIDE_WCHARS is not set
+# CONFIG_UNICODE_BIDI_SUPPORT is not set
+# CONFIG_UNICODE_NEUTRAL_TABLE is not set
+# CONFIG_UNICODE_PRESERVE_BROKEN is not set
+CONFIG_LONG_OPTS=y
+CONFIG_FEATURE_DEVPTS=y
+# CONFIG_FEATURE_CLEAN_UP is not set
+CONFIG_FEATURE_UTMP=y
+CONFIG_FEATURE_WTMP=y
+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 is not set
+# 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=""
+CONFIG_EXTRA_CFLAGS=""
+
+#
+# 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
+
+#
+# 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="/tmp/package-mkinitrd/usr/share/mkinitrd/initrd-tree"
+
+#
+# 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_EDITING_ASK_TERMINAL=y
+# CONFIG_FEATURE_NON_POSIX_CP is not set
+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_XZ=y
+# 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_FEATURE_AR_CREATE is not set
+CONFIG_BUNZIP2=y
+CONFIG_BZIP2=y
+CONFIG_CPIO=y
+CONFIG_FEATURE_CPIO_O=y
+CONFIG_FEATURE_CPIO_P=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_FEATURE_GZIP_LONG_OPTIONS=y
+CONFIG_LZOP=y
+CONFIG_LZOP_COMPR_HIGH=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_TO_COMMAND is not set
+CONFIG_FEATURE_TAR_UNAME_GNAME=y
+CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
+# CONFIG_FEATURE_TAR_SELINUX is not set
+CONFIG_UNCOMPRESS=y
+CONFIG_UNLZMA=y
+CONFIG_FEATURE_LZMA_FAST=y
+CONFIG_LZMA=y
+CONFIG_UNXZ=y
+CONFIG_XZ=y
+CONFIG_UNZIP=y
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+CONFIG_CAT=y
+CONFIG_DATE=y
+CONFIG_FEATURE_DATE_ISOFMT=y
+# CONFIG_FEATURE_DATE_NANO is not set
+# CONFIG_FEATURE_DATE_COMPAT is not set
+CONFIG_TEST=y
+CONFIG_FEATURE_TEST_64=y
+CONFIG_TR=y
+CONFIG_FEATURE_TR_CLASSES=y
+CONFIG_FEATURE_TR_EQUIV=y
+CONFIG_CAL=y
+CONFIG_CATV=y
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set
+CONFIG_CHROOT=y
+CONFIG_CKSUM=y
+CONFIG_COMM=y
+CONFIG_CP=y
+CONFIG_FEATURE_CP_LONG_OPTIONS=y
+CONFIG_CUT=y
+CONFIG_DD=y
+CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
+CONFIG_FEATURE_DD_IBS_OBS=y
+CONFIG_DF=y
+CONFIG_FEATURE_DF_FANCY=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_FSYNC=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_SHA256SUM=y
+CONFIG_SHA512SUM=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_TOUCH=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, sha256sum, sha512sum
+#
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+
+#
+# Console Utilities
+#
+CONFIG_CHVT=y
+CONFIG_FGCONSOLE=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_FEATURE_SETFONT_TEXTUAL_MAP=y
+CONFIG_DEFAULT_SETFONT_DIR="/usr/share/kbd/consolefonts"
+CONFIG_SETKEYCODES=y
+CONFIG_SETLOGCONS=y
+CONFIG_SHOWKEY=y
+
+#
+# Common options for loadfont and setfont
+#
+# CONFIG_FEATURE_LOADFONT_PSF2 is not set
+CONFIG_FEATURE_LOADFONT_RAW=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_LIBM=y
+CONFIG_CMP=y
+CONFIG_DIFF=y
+# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
+CONFIG_FEATURE_DIFF_DIR=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_ASK_TERMINAL=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_FEATURE_FIND_LINKS=y
+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_BOOTCHARTD is not set
+# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
+# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
+CONFIG_INIT=y
+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_FEATURE_CALL_TELINIT is not set
+CONFIG_TELINIT_PATH=""
+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_USE_BB_CRYPT_SHA=y
+CONFIG_ADDGROUP=y
+CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=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_FIRST_SYSTEM_ID=1000
+CONFIG_LAST_SYSTEM_ID=12000
+CONFIG_DELUSER=y
+CONFIG_GETTY=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
+CONFIG_TUNE2FS=y
+
+#
+# Linux Module Utilities
+#
+CONFIG_MODINFO=y
+# 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_INSMOD=y
+CONFIG_RMMOD=y
+CONFIG_LSMOD=y
+CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
+CONFIG_MODPROBE=y
+CONFIG_FEATURE_MODPROBE_BLACKLIST=y
+CONFIG_DEPMOD=y
+
+#
+# Options common to multiple modutils
+#
+CONFIG_FEATURE_2_4_MODULES=y
+# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
+# 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_FEATURE_CHECK_TAINTED_MODULE=y
+CONFIG_FEATURE_MODUTILS_ALIAS=y
+CONFIG_FEATURE_MODUTILS_SYMBOLS=y
+CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
+CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
+
+#
+# Linux System Utilities
+#
+CONFIG_REV=y
+CONFIG_ACPID=y
+CONFIG_FEATURE_ACPID_COMPAT=y
+CONFIG_BLKID=y
+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_FLOCK is not set
+CONFIG_FREERAMDISK=y
+CONFIG_FSCK_MINIX=y
+# CONFIG_MKFS_EXT2 is not set
+CONFIG_MKFS_MINIX=y
+CONFIG_FEATURE_MINIX2=y
+# CONFIG_MKFS_REISER is not set
+CONFIG_MKFS_VFAT=y
+CONFIG_GETOPT=y
+CONFIG_FEATURE_GETOPT_LONG=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_LSPCI=y
+CONFIG_LSUSB=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_UUID=y
+CONFIG_MORE=y
+CONFIG_FEATURE_USE_TERMIOS=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_SCRIPTREPLAY=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_MOUNT_LOOP_CREATE=y
+CONFIG_FEATURE_MTAB_SUPPORT=y
+CONFIG_VOLUMEID=y
+
+#
+# Filesystem/Volume identification
+#
+CONFIG_FEATURE_VOLUMEID_EXT=y
+# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
+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
+
+#
+# Miscellaneous Utilities
+#
+# CONFIG_CONSPY is not set
+# CONFIG_UBIATTACH is not set
+# CONFIG_UBIDETACH is not set
+CONFIG_ADJTIMEX=y
+CONFIG_BBCONFIG=y
+CONFIG_BEEP=y
+CONFIG_FEATURE_BEEP_FREQ=4000
+CONFIG_FEATURE_BEEP_LENGTH_MS=30
+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_FEATURE_CROND_D=y
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+CONFIG_FEATURE_CROND_DIR="/var/spool/cron"
+CONFIG_CRONTAB=y
+CONFIG_DC=y
+CONFIG_FEATURE_DC_LIBM=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_DEVMEM=y
+CONFIG_EJECT=y
+CONFIG_FEATURE_EJECT_SCSI=y
+CONFIG_FBSPLASH=y
+# CONFIG_FLASHCP is not set
+CONFIG_FLASH_LOCK=y
+CONFIG_FLASH_UNLOCK=y
+CONFIG_FLASH_ERASEALL=y
+CONFIG_IONICE=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_MARKS=y
+CONFIG_FEATURE_LESS_REGEXP=y
+CONFIG_FEATURE_LESS_WINCH=y
+CONFIG_FEATURE_LESS_DASHCMD=y
+CONFIG_FEATURE_LESS_LINENUMS=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_RFKILL is not set
+CONFIG_RUNLEVEL=y
+CONFIG_RX=y
+CONFIG_SETSID=y
+CONFIG_STRINGS=y
+CONFIG_TASKSET=y
+CONFIG_FEATURE_TASKSET_FANCY=y
+CONFIG_TIME=y
+CONFIG_TIMEOUT=y
+CONFIG_TTYSIZE=y
+CONFIG_VOLNAME=y
+# CONFIG_WALL is not set
+CONFIG_WATCHDOG=y
+
+#
+# Networking Utilities
+#
+CONFIG_NC=y
+CONFIG_NC_SERVER=y
+CONFIG_NC_EXTRA=y
+# CONFIG_NC_110_COMPAT is not set
+CONFIG_FEATURE_IPV6=y
+CONFIG_FEATURE_UNIX_LOCAL=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_FTPD=y
+CONFIG_FEATURE_FTP_WRITE=y
+CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=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_SETUID is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 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_IFPLUGD=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_NETSTAT=y
+# CONFIG_FEATURE_NETSTAT_WIDE is not set
+CONFIG_FEATURE_NETSTAT_PRG=y
+CONFIG_NSLOOKUP=y
+# CONFIG_NTPD is not set
+# CONFIG_FEATURE_NTPD_SERVER is not set
+CONFIG_PING=y
+CONFIG_PING6=y
+CONFIG_FEATURE_FANCY_PING=y
+CONFIG_PSCAN=y
+CONFIG_ROUTE=y
+CONFIG_SLATTACH=y
+CONFIG_TCPSVD=y
+CONFIG_TELNET=y
+CONFIG_FEATURE_TELNET_TTYPE=y
+CONFIG_FEATURE_TELNET_AUTOLOGIN=y
+CONFIG_TELNETD=y
+CONFIG_FEATURE_TELNETD_STANDALONE=y
+# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
+CONFIG_TFTP=y
+# CONFIG_TFTPD is not set
+
+#
+# Common options for tftp/tftpd
+#
+CONFIG_FEATURE_TFTP_GET=y
+CONFIG_FEATURE_TFTP_PUT=y
+CONFIG_FEATURE_TFTP_BLOCKSIZE=y
+CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
+CONFIG_TFTP_DEBUG=y
+CONFIG_TRACEROUTE=y
+CONFIG_TRACEROUTE6=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_TUNCTL=y
+CONFIG_FEATURE_TUNCTL_UG=y
+# CONFIG_UDHCPD is not set
+# CONFIG_DHCPRELAY is not set
+# CONFIG_DUMPLEASES is not set
+# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
+CONFIG_DHCPD_LEASES_FILE=""
+# CONFIG_UDHCPC is not set
+# CONFIG_FEATURE_UDHCPC_ARPING is not set
+# CONFIG_FEATURE_UDHCP_PORT is not set
+CONFIG_UDHCP_DEBUG=0
+# CONFIG_FEATURE_UDHCP_RFC3397 is not set
+CONFIG_UDHCPC_DEFAULT_SCRIPT=""
+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
+CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
+CONFIG_UDPSVD=y
+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
+
+#
+# Print Utilities
+#
+# CONFIG_LPD is not set
+CONFIG_LPR=y
+# CONFIG_LPQ is not set
+
+#
+# Mail Utilities
+#
+CONFIG_MAKEMIME=y
+CONFIG_FEATURE_MIME_CHARSET="us-ascii"
+CONFIG_POPMAILDIR=y
+CONFIG_FEATURE_POPMAILDIR_DELIVERY=y
+CONFIG_REFORMIME=y
+CONFIG_FEATURE_REFORMIME_COMPAT=y
+# CONFIG_SENDMAIL is not set
+
+#
+# Process Utilities
+#
+# CONFIG_SMEMCAP is not set
+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_ADDITIONAL_COLUMNS=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_SMP_CPU=y
+CONFIG_FEATURE_TOP_DECIMALS=y
+CONFIG_FEATURE_TOP_SMP_PROCESS=y
+CONFIG_FEATURE_TOPMEM=y
+CONFIG_FEATURE_SHOW_THREADS=y
+CONFIG_UPTIME=y
+CONFIG_WATCH=y
+
+#
+# Runit Utilities
+#
+CONFIG_RUNSV=y
+CONFIG_RUNSVDIR=y
+CONFIG_FEATURE_RUNSVDIR_LOG=y
+CONFIG_SV=y
+CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service"
+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
+
+#
+# Shells
+#
+CONFIG_ASH=y
+CONFIG_ASH_BASH_COMPAT=y
+CONFIG_ASH_JOB_CONTROL=y
+CONFIG_ASH_ALIAS=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_BASH_COMPAT 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_HUSH_FUNCTIONS is not set
+# CONFIG_HUSH_LOCAL is not set
+# CONFIG_HUSH_EXPORT_N is not set
+# CONFIG_HUSH_RANDOM_SUPPORT is not set
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+# CONFIG_FEATURE_BASH_IS_ASH is not set
+# CONFIG_FEATURE_BASH_IS_HUSH is not set
+CONFIG_FEATURE_BASH_IS_NONE=y
+# CONFIG_LASH is not set
+# CONFIG_MSH is not set
+CONFIG_SH_MATH_SUPPORT=y
+CONFIG_SH_MATH_SUPPORT_64=y
+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_SYSLOGD_READ_BUFFER_SIZE=256
+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
diff --git a/source/a/mkinitrd/init b/source/a/mkinitrd/init
index a6f1091e..2205a592 100755
--- a/source/a/mkinitrd/init
+++ b/source/a/mkinitrd/init
@@ -56,12 +56,7 @@
 # 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.
+#                 A script that uses modprobe to load the desired modules.
 #
 #                 There's an example in here.  To actually use it, you'll
 #                 need to make it executable:  
@@ -138,7 +133,7 @@ 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
-      /sbin/insmod $module
+      /sbin/modprobe $module
     done
     unset module
   fi
@@ -151,11 +146,9 @@ 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 control --property=STARTUP=1
+  /sbin/udevd --daemon --resolve-names=never
   /sbin/udevadm trigger --subsystem-match=block --action=add
   /sbin/udevadm settle --timeout=10
-  /sbin/udevadm control --property=STARTUP=
 else
   [ "$DEVTMPFS" != "1" ] && mdev -s
 fi
@@ -170,7 +163,10 @@ if [ "$RESCUE" = "" ]; then
   # Initialize RAID:
   if [ -x /sbin/mdadm ]; then
     /sbin/mdadm -E -s >/etc/mdadm.conf
+    /sbin/mdadm -S -s
     /sbin/mdadm -A -s
+    # This seems to make the kernel see partitions more reliably:
+    fdisk -l /dev/md* 1> /dev/null 2> /dev/null
   fi
 
   # Unlock any encrypted partitions necessary to access the
@@ -301,6 +297,7 @@ else
 fi
 
 if pgrep udevd >/dev/null ; then
+  /sbin/udevadm settle --timeout=30
   pkill udevd
 fi
 
diff --git a/source/a/mkinitrd/mkinitrd b/source/a/mkinitrd/mkinitrd
index 4cd97296..1a5b7731 100644
--- a/source/a/mkinitrd/mkinitrd
+++ b/source/a/mkinitrd/mkinitrd
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright 2004  Slackware Linux, Inc., Concord, CA, USA
 # Copyright 2004  Patrick J. Volkerding, Concord, CA, USA
-# Copyright 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -43,7 +43,14 @@
 #   load-kernel-modules if that file is executable.
 #   Yada yada yada.
 
-MKINITRD_VERSION=1.4.5
+MKINITRD_VERSION=1.4.6
+
+# Don't include these things from /lib/udev/ in the initrd image
+LIBUDEV_BLACKLIST="\
+  ipod-set-info \
+  check-mtp-camera \
+  check-ptp-camera \
+  udev-configure-printer"
 
 print_usage() {
   cat << EOF
@@ -90,6 +97,7 @@ initrd, and the script is easy to modify.  Be creative.  :-)
           For example, if your USB thumb drive has a FAT partition with label
           "TRAVELSTICK" and the actual keyfile is called "/keys/alien.luks",
           then you need to pass: -K LABEL=TRAVELSTICK:/keys/alien.luks
+  -M      Add the files in /etc/modprobe.d/ to the initrd
   -R      Add support for RAID partitions
   -V      Display version number
 
@@ -97,15 +105,15 @@ 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.6-smp kernel
-modules for a system with an ext3 root partition on /dev/hdb3:
+Another example:  Build an initrd image using Linux 2.6.35.4-smp kernel
+modules for a system with an ext4 root partition on /dev/sdb3:
 
-  mkinitrd -c -k 2.6.29.6-smp -m mbcache:jbd:ext3 -f ext3 -r /dev/hdb3
+  mkinitrd -c -k 2.6.35.4-smp -m mbcache:jbd:ext4 -f ext4 -r /dev/sdb3
 
-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:
+Note that if you are already logged in with /dev/sdb3 as your /
+partition, and it is running ext4, this command works just the same:
 
-  mkinitrd -c -m ext3
+  mkinitrd -c -m ext4
 
 If run without options, mkinitrd will rebuild an initrd image using
 the contents of the $SOURCE_TREE directory, or, if that directory
@@ -187,7 +195,7 @@ unify_libs() {
 
 copy_libs() {
   # First copy the essential glibc files:
-  find /lib* -name "ld-*so*" -o -name "libnss_files*so*" -o -name "libnss_compat*so*" | xargs -I'{}' cp -P --parents '{}' $SOURCE_TREE/
+  find /lib /lib64 -name "ld-*so*" -o -name "libnss_files*so*" -o -name "libnss_compat*so*" 2> /dev/null | xargs -I'{}' cp -P --parents '{}' $SOURCE_TREE/
 
   # Then copy all remaining libs our initrd files link against:
   COUNT=1
@@ -197,11 +205,18 @@ copy_libs() {
   find $SOURCE_TREE -type f -exec ldd {} 2>/dev/null \; | unify_libs > $TMPFILE
   while [ "$COUNT" != "0" ]; do
     COUNT=$((COUNT+1))
-    for i in $(cat $TMPFILE) ; do 
+    for i in $(cat ${TMPFILE}) ; do
       ldd $i 2>/dev/null
     done | unify_libs > ${PRFX}${COUNT}
-    TMPFILE=${PRFX}${COUNT}
-    [ $(cat $TMPFILE | wc -l) -eq 0 ] && COUNT=0
+    if [ $(cat $TMPFILE ${PRFX}${COUNT} | sort |uniq -u | wc -l) -eq 0 ]; then
+      COUNT=0
+    else
+      TMPFILE=${PRFX}${COUNT}
+    fi
+    # emergency eject lever:
+    if [ "$COUNT" = "42" ]; then
+      COUNT=0
+    fi
   done
 
   for i in $(cat ${PRFX}* | sort -u) ; do 
@@ -218,6 +233,11 @@ copy_libs() {
   rm ${PRFX}*
 }
 
+copy_modconf() {
+  mkdir -p $SOURCE_TREE/etc
+  cp -a /etc/modprobe.d $SOURCE_TREE/etc
+}
+     
 # If --help is given, print_usage and exit:
 if echo $* | grep -wq '\--help' ; then
   print_usage
@@ -302,10 +322,8 @@ while [ ! -z "$1" ]; do
       shift 2
       ;;
     -o)
-      OUTPUT_IMAGE="$2"
-      if [ ! "$(echo $OUTPUT_IMAGE | cut -b1)" = "/" ]; then
-        OUTPUT_IMAGE=$(pwd)/$OUTPUT_IMAGE
-      fi
+      # canonicalize filename:
+      OUTPUT_IMAGE="$(readlink -m $2)"
       shift 2
       ;;
     -r)
@@ -313,7 +331,8 @@ while [ ! -z "$1" ]; do
       shift 2
       ;;
     -s)
-      SOURCE_TREE="$2"
+      # canonicalize filename:
+      SOURCE_TREE="$(readlink -m $2)"
       shift 2
       ;;
     -u)
@@ -337,6 +356,10 @@ while [ ! -z "$1" ]; do
       LVM=1
       shift
       ;;
+    -M)
+      MODCONF=1
+      shift
+      ;;
     -R)
       RAID=1
       shift
@@ -449,6 +472,10 @@ fi
 if [ ! -z "$UDEV" ]; then
   cp /sbin/udev* $SOURCE_TREE/sbin/
   cp -a /lib/udev $SOURCE_TREE/lib/
+  # But we don't want all of /lib/udev
+  for file in $(echo $LIBUDEV_BLACKLIST) ; do
+    rm -f $SOURCE_TREE/lib/udev/$file ;
+  done
 fi
 
 # Include LVM support in initrd
@@ -457,7 +484,7 @@ if [ ! -z "$LVM" ]; then
     mkdir -p $SOURCE_TREE/sbin
     cp /sbin/lvm $SOURCE_TREE/sbin/lvm
     cp /sbin/dmsetup $SOURCE_TREE/sbin/dmsetup
-    find /lib* -name "libdevmapper*so*" | xargs -I'{}' cp -P --parents '{}' $SOURCE_TREE/
+    find /lib /lib64 -name "libdevmapper*so*" 2> /dev/null | xargs -I'{}' cp -P --parents '{}' $SOURCE_TREE/
     ( cd $SOURCE_TREE/sbin
       ln -s lvm vgchange 2>/dev/null
       ln -s lvm vgscan 2>/dev/null )
@@ -505,12 +532,12 @@ fi
 # we assume you will want to load the kernel modules mentioned in there.
 # This means, you do not have to explicitly add those on the commandline:
 if [ -x $SOURCE_TREE/load_kernel_modules ]; then
-  MODULE_LIST="${MODULE_LIST}:$(cat $SOURCE_TREE/load_kernel_modules |grep  "^insmod" |rev |cut -d/ -f1 |rev |cut -d. -f1)"
+  MODULE_LIST="${MODULE_LIST}:$(cat $SOURCE_TREE/load_kernel_modules |grep  "^modprobe" |rev |cut -d/ -f1 |rev |cut -d. -f1)"
 fi
 
 # If the module list is not empty, 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
+  if grep -q "#modprobe reiserfs" $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
@@ -522,8 +549,7 @@ if [ ! -z "$MODULE_LIST" ]; then
 
   # Sanitize the modules list first, before any further processing.
   # The awk command eliminates doubles without changing the order:
-  MODULE_LIST=$(echo $MODULE_LIST |tr -s ':' '\n' |awk '!x[$0]++' |tr '\n' ' ')
-  MODULE_LIST=$(echo $MODULE_LIST | tr ' ' ':')
+  MODULE_LIST=$(echo $MODULE_LIST |tr -s ':' '\n' |awk '!x[$0]++' |tr '\n' ':')
   MODULE_LIST=$(echo ${MODULE_LIST%:}) # Weed out a trailing ':'
 
   # Count number of modules
@@ -542,55 +568,63 @@ if [ ! -z "$MODULE_LIST" ]; then
     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
+  # 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
+  # Get MODULE deps and prepare modprobe 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)/")"
+      if ! grep -q "$(basename $SRCMOD .ko)" $SOURCE_TREE/load_kernel_modules 2>/dev/null ; then
+        LINE="$(echo "modprobe -v $(basename $SRCMOD .ko)" )"
 
-      # 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
+        # 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
+      fi
 
-    if ! grep -qx "$LINE" $SOURCE_TREE/load_kernel_modules ; then
-      echo "$LINE" >> $SOURCE_TREE/load_kernel_modules
-    fi
+      if ! grep -qx "$LINE" $SOURCE_TREE/load_kernel_modules ; then
+        echo "$LINE" >> $SOURCE_TREE/load_kernel_modules
+      fi
 
-    if [ ! -f ${SOURCE_TREE}${SRCMOD} ]; then
-      # We did not yet copy this module into the initrd-tree
+      # Try to add the module to the initrd-tree.  This should be done
+      # even if it exists there already as we may have changed compilers
+      # or otherwise caused the modules in the initrd-tree to need
+      # replacement.
       if cp -a --parents $SRCMOD $SOURCE_TREE 2>/dev/null; then
         echo "OK: $SRCMOD added."
       else
         echo "WARNING:  Could not find module \"$SRCMOD\""
       fi
-    fi
 
+    done
   done
 
-done
+  # Pregenerate the module dependency information
+  depmod -a -b $SOURCE_TREE ${KERNEL_VERSION}
+
+  # Copy /etc/modprobe.d/* if desired
+  if [ ! -z $MODCONF ]; then
+    copy_modconf
+  fi
 
 fi
 
diff --git a/source/a/mkinitrd/mkinitrd.SlackBuild b/source/a/mkinitrd/mkinitrd.SlackBuild
index 7beba6c6..953d3cf8 100755
--- a/source/a/mkinitrd/mkinitrd.SlackBuild
+++ b/source/a/mkinitrd/mkinitrd.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,10 +21,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=${VERSION:-1.4.5}
-BB=1.15.3
-NUMJOBS=${NUMJOBS:--j7}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.4.6}
+BB=1.18.4
+BUILD=${BUILD:-11}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -36,6 +35,7 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+NUMJOBS=${NUMJOBS:--j7}
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-mkinitrd
@@ -51,14 +51,9 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf busybox-$BB
-tar xvf $CWD/busybox-$BB.tar.bz2 || exit 1
+tar xvf $CWD/busybox-$BB.tar.?z* || 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"#' \
@@ -71,9 +66,12 @@ 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
+cp -a $CWD/mkinitrd_command_generator.sh $PKG/usr/share/mkinitrd
+chown root:root $PKG/usr/share/mkinitrd/mkinitrd_command_generator.sh
 chmod 755 $PKG/usr/share/mkinitrd/mkinitrd_command_generator.sh
-cp $CWD/keymaps.tar.gz $PKG/usr/share/mkinitrd
+cp -a $CWD/keymaps.tar.gz $PKG/usr/share/mkinitrd
+chown root:root $PKG/usr/share/mkinitrd/keymaps.tar.gz
+chmod 644 $PKG/usr/share/mkinitrd/keymaps.tar.gz
 
 # Zip up the initrd-tree:
 ( cd $PKG/usr/share/mkinitrd/initrd-tree
@@ -85,11 +83,16 @@ rm -rf $PKG/usr/share/mkinitrd/initrd-tree
 
 # Add busybox docs:
 mkdir -p $PKG/usr/doc/busybox-$BB
-cp -a AUTHORS INSTALL LICENSE README \
+cp -a AUTHORS COPYING* INSTALL LICENSE README* \
   $PKG/usr/doc/busybox-$BB
+cp -a e2fsprogs/README $PKG/usr/doc/busybox-$BB/README.e2fsprogs
+cp -a libbb/README $PKG/usr/doc/busybox-$BB/README.libbb
+cp -a shell/README $PKG/usr/doc/busybox-$BB/README.shell
+cp -a testsuite/README $PKG/usr/doc/busybox-$BB/README.testsuite
 
 mkdir -p $PKG/sbin
-cat $CWD/mkinitrd > $PKG/sbin/mkinitrd
+cp -a $CWD/mkinitrd $PKG/sbin/mkinitrd
+chown root:root $PKG/sbin/mkinitrd
 chmod 755 $PKG/sbin/mkinitrd
 
 mkdir -p $PKG/usr/man/man{5,8}
@@ -97,7 +100,9 @@ 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
+cp -a $CWD/mkinitrd.conf.sample $PKG/etc/mkinitrd.conf.sample
+chown root:root $PKG/etc/mkinitrd.conf.sample
+chmod 644 $PKG/etc/mkinitrd.conf.sample
 
 mkdir -p $PKG/usr/doc/mkinitrd-$VERSION
 cp -a $CWD/README.initrd $PKG/usr/doc/mkinitrd-$VERSION
diff --git a/source/a/mkinitrd/mkinitrd.conf.5 b/source/a/mkinitrd/mkinitrd.conf.5
index 7b316d0f..6cfef91a 100644
--- a/source/a/mkinitrd/mkinitrd.conf.5
+++ b/source/a/mkinitrd/mkinitrd.conf.5
@@ -1,5 +1,5 @@
 .\" mkinitrd.5   Robby Workman <rworkman@slackware.com>
-.\" 19 December 2009 "
+.\" 28 August 2010 "
 
 .TH MKINITRD.CONF 5 "27 March 2010" "Slackware 13.1"
 .SH NAME 
@@ -172,7 +172,11 @@ LVM="1"          # Add LVM support to initrd
 .I UDEV
 Use UDEV in the initrd.
 .br
-Example: UDEV="1"
+Examples:
+.br
+UDEV="0"	# Do not use udev in the initrd
+.br
+UDEV="1"	# Use udev in the initrd (this is the default)
 
 .TP 5
 .I WAIT
@@ -188,6 +192,20 @@ The swap partition holding your hibernation image.
 .br
 Example: RESUMEDEV="/dev/sda2"
 
+.TP 5
+.I MODCONF
+This option defines whether to copy the module-init-tools config files
+from /etc/modprobe.d/ into the initrd.  This will not usually be necessary,
+but if you need certain modules to be loaded with special options, and you
+have this configured in a file in /etc/modprobe.d/, this is one way to 
+accomplish the desired goal.
+.br
+Examples:
+.br
+MODCONF="0"	# Do not add /etc/modprobe.d/* to the initrd
+.br
+MODCONF="1"	# Add /etc/modprobe.d/* to the initrd
+
 .SH FILES
 .I /etc/mkinitrd.conf
 .br
diff --git a/source/a/mkinitrd/mkinitrd.conf.sample b/source/a/mkinitrd/mkinitrd.conf.sample
index 4838354b..9bb9f14c 100644
--- a/source/a/mkinitrd/mkinitrd.conf.sample
+++ b/source/a/mkinitrd/mkinitrd.conf.sample
@@ -6,7 +6,7 @@
 #OUTPUT_IMAGE="/boot/initrd.gz"
 #KERNEL_VERSION="$(uname -r)"
 #KEYMAP="us"
-#MODULE_LIST="ext3"
+#MODULE_LIST="ext4"
 #LUKSDEV="/dev/sda2"
 #LUKSKEY="LABEL=TRAVELSTICK:/keys/alienbob.luks"
 #ROOTDEV="/dev/sda1"
@@ -15,4 +15,5 @@
 #RAID="0"
 #LVM="0"
 #UDEV="1"
+#MODCONF="0"
 #WAIT="1"
diff --git a/source/a/mkinitrd/mkinitrd_command_generator.sh b/source/a/mkinitrd/mkinitrd_command_generator.sh
index b26d9109..04c0c2a0 100644
--- a/source/a/mkinitrd/mkinitrd_command_generator.sh
+++ b/source/a/mkinitrd/mkinitrd_command_generator.sh
@@ -1,7 +1,9 @@
 #!/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
+# $Id: mkinitrd_command_generator.sh,v 1.45 2011/02/17 09:27:05 eha Exp eha $
+# Copyright 2008, 2009, 2010, 2011  Eric Hameleers, Eindhoven, Netherlands
+#                                   Contact: <alien@slackware.com>
+# Copyright 2008, 2009  PiterPUNK, Sao Paulo, SP, Brazil
+#                       Contact: <piterpunk@slackware.com>
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -31,7 +33,7 @@
 # -----------------------------------------------------------------------------
 
 # The script's revision number will be displayed in the help text:
-REV=$( echo "$Revision: 1.40 $" | cut -d' '  -f2 )
+REV=$( echo "$Revision: 1.45 $" | cut -d' '  -f2 )
 
 # Define some essential parameter values:
 USING_LVM=""
@@ -47,7 +49,7 @@ FSTAB=${FSTAB:-"/etc/fstab"} # so we can test with alternate fstab files
 SOURCE_TREE=${SOURCE_TREE:-"/boot/initrd-tree"}
 CLEAR_TREE=${CLEAR_TREE:-1}
 KEYMAP=${KEYMAP:-"us"}
-UDEV=${UDEV:-0}
+UDEV=${UDEV:-1}
 WAIT=${WAIT:-1}
 
 # A basic explanation of the commandline parameters:
@@ -117,7 +119,7 @@ extended_usage() {
 	
 	EOT
 
-  echo "  \$($(basename $0) --run /boot/vmlinuz-generic-smp-2.6.24.5-smp)"
+  echo "  \$($(basename $0) --run /boot/vmlinuz-generic-smp-2.6.35.11-smp)"
 
   cat <<-EOT
 	
@@ -130,7 +132,7 @@ extended_usage() {
 	
 	EOT
 
-  echo "  $(basename $0) --lilo /boot/vmlinuz-generic-smp-2.6.24.5-smp >>/etc/lilo.conf"
+  echo "  $(basename $0) --lilo /boot/vmlinuz-generic-smp-2.6.35.11-smp >>/etc/lilo.conf"
 
   cat <<-EOT
 	
@@ -138,11 +140,11 @@ extended_usage() {
 	'/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 created with 'mkinitrd -c -k 2.6.35.11-smp -m ata_generic:pata_amd:mbcache:jbd:ext3 -f ext3 -r /dev/hda7'
+	  image = /boot/vmlinuz-generic-smp-2.6.35.11-smp
 	    initrd = /boot/initrd.gz
 	    root = /dev/hda7
-	    label = 2.6.24.5-smp
+	    label = 2.6.35.11-smp
 	    read-only
 	  # Linux bootable partition config ends
 	
@@ -156,7 +158,7 @@ extended_usage() {
 # 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' ')
+    RD=$(cat $FSTAB |tr '\t' ' ' |grep -v '^ *#' |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"
@@ -171,11 +173,13 @@ get_root_device() {
 
 # 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=
+  if $(type blkid 1>/dev/null 2>&1) ; then
+   blkid -s TYPE -o value $ROOTDEV
+  elif $(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' ' 
+   # As a fallback, use:
+   cat $FSTAB |tr '\t' ' ' |grep -v '^ *#' |tr -s ' ' |grep ' / ' |cut -f3 -d' '
   fi
 }
 
@@ -195,14 +199,16 @@ add_rootfs_module() {
 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.
+  # Thanks to PiterPUNK for help with this 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
+  MLIST=$(for i in $(find /sys/block/*/ -name "device" -print0 | xargs -0 -i'{}' readlink -f '{}' | sort -u); do
+    /sbin/udevadm info --query=all --path=$i --attribute-walk | \
+      sed -ne 's/^[[:blank:]]\+DRIVER[S]*=="\([^"]\+\)"$/\1/p' | \
+      xargs -I@ /sbin/modprobe --set-version $KVER --show-depends @ \
+      2>/dev/null | grep -v "builtin " | \
+      while read LINE ; do 
         echo $(basename $(echo $LINE | cut -d' ' -f2) .ko )
       done
-    done
   done)
   MLIST=$( echo $MLIST | tr ' ' ':' )
   echo $MLIST
@@ -223,7 +229,7 @@ function add_usb_keyboard() {
 # Determine what USB Host Controller is in use
 function add_usb_hcd() {
   local USBMOD
-  for i in `ls -Ld /sys/module/*_hcd/drivers/*`; do 
+  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" \
@@ -239,7 +245,7 @@ check_luks_lvm_raid() {
     # 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 )
+    MYVG=$( echo $(lvdisplay -c $ROOTDEV 2>/dev/null) | cut -d: -f2 )
     for LINE in $(pvdisplay -c) ; do
       VG=$(echo $LINE | cut -d: -f2)
       [ "$VG" = "$MYVG" ] && break
@@ -260,7 +266,7 @@ check_luks_lvm_raid() {
     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
+    for LV in $(lvdisplay -c 2>/dev/null | 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
@@ -272,7 +278,7 @@ check_luks_lvm_raid() {
       # 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 )
+      MYVG=$( echo $(lvdisplay -c $REALDEV 2>/dev/null) | cut -d: -f2 )
       for LINE in $(pvdisplay -c) ; do
         VG=$(echo $LINE | cut -d: -f2)
         [ "$VG" = "$MYVG" ] && break
@@ -312,7 +318,7 @@ while [ ! -z "$1" ]; do
       exit 0
       ;;
     -a)
-      MKINIT_PARAMS=$2
+      MKINIT_PARAMS="$2"
       shift 2
       ;;
     -c|--conf)
@@ -427,6 +433,12 @@ ROOTFS=$(get_rootfs_type)
 # Determine the list of kernel modules needed to support the root device:
 MLIST=$(determine_blockdev_drivers)
 
+# Check if we are running in a kvm guest with virtio block device driver
+# (add all virtio modules, we sort out the doubles later):
+if echo $MLIST | grep -q "virtio"; then
+  MLIST="$MLIST:virtio:virtio_balloon:virtio_blk:virtio_ring:virtio_pci:virtio_net"
+fi
+
 # Determine if a USB keyboard is in use and include usbhid to module list
 MLIST=$(add_usb_keyboard)
 
@@ -533,8 +545,8 @@ 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 \
-"UDEV" "Use UDEV in the initrd for device configuration" off \
-"WAIT" "Add delay to allow detection of slow disks at boot" off)
+"UDEV" "Use UDEV in the initrd for device configuration" $(test $UDEV -eq 1 && echo on || echo off) \
+"WAIT" "Add delay to allow detection of slow disks at boot" $(test WAIT -gt 1 && echo on || echo off) )
   if [ "$?" != "0" ]; then
     exit 1
   fi
@@ -786,8 +798,8 @@ 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:
+if ! echo "$MKINIT_PARAMS" | grep -q -- '-o ' ; then
+  # Add default output filename:
   MKINIT="$MKINIT -o $IMGFILE"
 fi
 if [ -n "$MKINIT_PARAMS" ]; then
diff --git a/source/a/module-init-tools/doinst.sh b/source/a/module-init-tools/doinst.sh
new file mode 100644
index 00000000..f455be89
--- /dev/null
+++ b/source/a/module-init-tools/doinst.sh
@@ -0,0 +1,7 @@
+# Remove/move obsolete configuration:
+if [ -L etc/modprobe.d/modprobe.conf ]; then
+  rm -f etc/modprobe.d/modprobe.conf
+fi
+if [ -e etc/modprobe.conf ]; then
+  mv etc/modprobe.conf etc/modprobe.conf.obsolete
+fi
diff --git a/source/a/module-init-tools/modprobe.ignore_some_suffixes.diff b/source/a/module-init-tools/modprobe.ignore_some_suffixes.diff
index a65fba0a..5517502b 100644
--- a/source/a/module-init-tools/modprobe.ignore_some_suffixes.diff
+++ b/source/a/module-init-tools/modprobe.ignore_some_suffixes.diff
@@ -1,6 +1,6 @@
-diff -Nur module-init-tools-3.11.orig/modprobe.c module-init-tools-3.11.new/modprobe.c
---- module-init-tools-3.11.orig/modprobe.c	2009-10-15 04:59:28.000000000 -0500
-+++ module-init-tools-3.11.new/modprobe.c	2009-10-15 08:14:12.108359199 -0500
+diff -Nur module-init-tools-3.12.orig//modprobe.c module-init-tools-3.12/modprobe.c
+--- module-init-tools-3.12.orig//modprobe.c	2010-05-04 00:19:27.000000000 -0500
++++ module-init-tools-3.12/modprobe.c	2010-06-08 04:32:46.655088739 -0500
 @@ -38,6 +38,7 @@
  #include <asm/unistd.h>
  #include <sys/wait.h>
@@ -9,8 +9,8 @@ diff -Nur module-init-tools-3.11.orig/modprobe.c module-init-tools-3.11.new/modp
  
  #include "util.h"
  #include "elfops.h"
-@@ -861,6 +862,20 @@
- 				 options, commands, aliases, blacklist);
+@@ -789,6 +790,20 @@
+ 	return strsep(string, delim);
  }
  
 +/* Let's exclude a few file extensions */
@@ -28,9 +28,9 @@ diff -Nur module-init-tools-3.11.orig/modprobe.c module-init-tools-3.11.new/modp
 +}
 +
  static int parse_config_scan(const char *filename,
- 			     const char *name,
+ 			     struct modprobe_conf *conf,
  			     int dump_only,
-@@ -887,6 +902,8 @@
+@@ -1066,6 +1081,8 @@
  		while ((i = readdir(dir)) != NULL) {
  			size_t len;
  
diff --git a/source/a/module-init-tools/modprobe.quit.whining.about.modprobe.conf.diff b/source/a/module-init-tools/modprobe.quit.whining.about.modprobe.conf.diff
deleted file mode 100644
index 640ab308..00000000
--- a/source/a/module-init-tools/modprobe.quit.whining.about.modprobe.conf.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./modprobe.c.orig	2010-02-06 13:56:19.000000000 -0600
-+++ ./modprobe.c	2010-02-06 14:00:49.000000000 -0600
-@@ -971,10 +971,8 @@
- 	}
- 
- 	/* deprecated config file */
--	if (parse_config_file("/etc/modprobe.conf", name, dump_only, removing,
--			      options, commands, aliases, blacklist) > 0)
--		warn("Deprecated config file /etc/modprobe.conf, "
--		      "all config files belong into /etc/modprobe.d/.\n");
-+	parse_config_file("/etc/modprobe.conf", name, dump_only, removing,
-+			      options, commands, aliases, blacklist);
- 
- 	/* default config */
- 	parse_config_scan("/etc/modprobe.d", name, dump_only, removing,
diff --git a/source/a/module-init-tools/module-init-tools.SlackBuild b/source/a/module-init-tools/module-init-tools.SlackBuild
index 9b390d11..a8dc73ab 100755
--- a/source/a/module-init-tools/module-init-tools.SlackBuild
+++ b/source/a/module-init-tools/module-init-tools.SlackBuild
@@ -22,7 +22,7 @@
 
 
 VERSION=${VERSION:-$(echo module-init-tools-*.tar.?z* | cut -d - -f 4 | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:--j7}
 
@@ -58,11 +58,6 @@ find . \
 # 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 || exit 1
 
-# Using modprobe.conf still works, so don't whine about it,
-# especially since there's nothing in /etc/modprobe.conf
-# except for comments explaining not to use it.
-zcat $CWD/modprobe.quit.whining.about.modprobe.conf.diff.gz | patch -p1 || exit 1
-
 # Using --bindir=/sbin to make lsmod go there too
 CFLAGS= \
 ./configure \
@@ -106,6 +101,7 @@ if [ -r ChangeLog ]; then
 fi
 
 mkdir -p $PKG/install
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
diff --git a/source/a/mt-st/mt-st.SlackBuild b/source/a/mt-st/mt-st.SlackBuild
index cbf44ec2..a906438d 100755
--- a/source/a/mt-st/mt-st.SlackBuild
+++ b/source/a/mt-st/mt-st.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=${VERSION:-0.9b}
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-mt-st
diff --git a/source/a/mtx/mtx.SlackBuild b/source/a/mtx/mtx.SlackBuild
index c17d1176..6e648f03 100755
--- a/source/a/mtx/mtx.SlackBuild
+++ b/source/a/mtx/mtx.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,9 +27,18 @@
 # ftp://ftp.badtux.net/pub/storage/mtx
  
 PACKAGE=mtx
-VERSION=1.3.9
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-2}
+VERSION=1.3.12
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
diff --git a/source/a/ncompress/ncompress-4.2.4-bssUnderflow.patch b/source/a/ncompress/ncompress-4.2.4-bssUnderflow.patch
deleted file mode 100644
index 0ae7ec59..00000000
--- a/source/a/ncompress/ncompress-4.2.4-bssUnderflow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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
deleted file mode 100644
index fdc96622..00000000
--- a/source/a/ncompress/ncompress-4.2.4-endians.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 8c545caf..00000000
--- a/source/a/ncompress/ncompress.2GB.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
index e8b1c68f..ba6f38d5 100755
--- a/source/a/ncompress/ncompress.SlackBuild
+++ b/source/a/ncompress/ncompress.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,10 +20,19 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=4.2.4
-ARCH=${ARCH:-x86_64}
+VERSION=4.2.4.3
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-ncompress
@@ -42,14 +51,6 @@ find . \
   \( -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
diff --git a/source/a/ncompress/ncompress.filenamelen.diff b/source/a/ncompress/ncompress.filenamelen.diff
deleted file mode 100644
index 67676c7a..00000000
--- a/source/a/ncompress/ncompress.filenamelen.diff
+++ /dev/null
@@ -1,98 +0,0 @@
---- 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
deleted file mode 100644
index 9da42eb5..00000000
--- a/source/a/ncompress/ncompress.lfs2.diff
+++ /dev/null
@@ -1,52 +0,0 @@
---- 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
deleted file mode 100644
index 2a0acc1c..00000000
--- a/source/a/ncompress/ncompress.make.diff
+++ /dev/null
@@ -1,60 +0,0 @@
---- 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
deleted file mode 100644
index 465d67e3..00000000
--- a/source/a/ncompress/ncompress.zerobyteforce.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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/ntfs-3g/ntfs-3g.SlackBuild b/source/a/ntfs-3g/ntfs-3g.SlackBuild
index 93612e0c..ab5b1f71 100755
--- a/source/a/ntfs-3g/ntfs-3g.SlackBuild
+++ b/source/a/ntfs-3g/ntfs-3g.SlackBuild
@@ -99,10 +99,8 @@ cat $CWD/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
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 
 rm -rf $PKG/usr/share/doc
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
diff --git a/source/a/patch/patch.SlackBuild b/source/a/patch/patch.SlackBuild
index fb0c06d9..1175620b 100755
--- a/source/a/patch/patch.SlackBuild
+++ b/source/a/patch/patch.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,10 +20,19 @@
 #  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}
+VERSION=2.6.1
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-patch
@@ -31,23 +40,35 @@ PKG=$TMP/package-patch
 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"
+else
+  SLKCFLAGS="-O2"
+fi
+
 cd $TMP
 rm -rf patch-${VERSION}
-tar xzvf $CWD/patch-${VERSION}.tar.gz
+tar xvf $CWD/patch-${VERSION}.tar.xz || exit 1
 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}/*
+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 \
-  $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
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
+
+make -j4 || make || exit 1
+make install DESTDIR=$PKG
 
 # Strip everything for good measure:
 ( cd $PKG
@@ -55,6 +76,34 @@ cat patch.man  | gzip -9c > $PKG/usr/man/man1/patch.1.gz
   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
+
+mkdir -p $PKG/usr/doc/patch-${VERSION}
+cp -a \
+  AUTHORS COPYING* NEWS README* \
+  $PKG/usr/doc/patch-${VERSION}
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source/a/pcmciautils/pcmciautils-017.tar.sign b/source/a/pcmciautils/pcmciautils-017.tar.sign
new file mode 100644
index 00000000..cd492c77
--- /dev/null
+++ b/source/a/pcmciautils/pcmciautils-017.tar.sign
@@ -0,0 +1,8 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+Comment: See http://www.kernel.org/signature.html for info
+
+iD8DBQBLRLP8yGugalF9Dw4RAn4EAJ96T5HaIjfdqhIfp2/GeL18BgylOwCfZA+R
+sWw0NvzDaf3ZKhgHZHNmGLs=
+=A5s6
+-----END PGP SIGNATURE-----
diff --git a/source/a/pcmciautils/pcmciautils.SlackBuild b/source/a/pcmciautils/pcmciautils.SlackBuild
index dcf70895..fa458172 100755
--- a/source/a/pcmciautils/pcmciautils.SlackBuild
+++ b/source/a/pcmciautils/pcmciautils.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pcmciautils
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,11 +23,21 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=${VERSION:-015}
-ARCH=${ARCH:-x86_64}
+VERSION=${VERSION:-017}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 # parallel build will cause an error building ccdv:
 NUMJOBS=${NUMJOBS:-" -j1 "}
-BUILD=${BUILD:-2}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -37,7 +47,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf pcmciautils-$VERSION
-tar xvf $CWD/pcmciautils-$VERSION.tar.bz2
+tar xvf $CWD/pcmciautils-$VERSION.tar.bz2 || exit 1
 cd pcmciautils-$VERSION
 chown -R root.root .
 find . \
@@ -58,16 +68,19 @@ make install DESTDIR=$PKG || exit 1
 
 # Add some firmware:
 ( cd $PKG
-  tar xvf $CWD/cis-cs-3.2.8.tar.gz
+  tar xvf $CWD/cis-cs-3.2.8.tar.gz || exit 1
   chown -R root:root lib
-)
+) || exit 1
 
 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
+# PCMCIA is the exception rather than the rule in 2011.
+# Don't activate /etc/rc.d/rc.pcmcia on a new package install,
+# leave that for the admin.
+chmod 0644 $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
@@ -77,12 +90,6 @@ 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
 
@@ -102,7 +109,7 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 mkdir -p $PKG/usr/doc/pcmciautils-$VERSION
-cp COPYING* $PKG/usr/doc/pcmciautils-$VERSION
+cp -a COPYING* README* doc/*.txt $PKG/usr/doc/pcmciautils-$VERSION
 
 mkdir $PKG/install
 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
diff --git a/source/a/pkgtools/manpages/installpkg.8 b/source/a/pkgtools/manpages/installpkg.8
index 2d77f10e..534f2084 100644
--- a/source/a/pkgtools/manpages/installpkg.8
+++ b/source/a/pkgtools/manpages/installpkg.8
@@ -28,6 +28,9 @@ installpkg \- install Slackware packages.
 .B \--menu
 ]
 [
+.B \--terse
+]
+[
 .B \--ask
 ]
 [
@@ -47,9 +50,9 @@ 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.
+Generate a list of files that would be overwritten to the standard output, but do
+not actually install the package.  The list is formatted in a suitable fashion to
+use as a list of files to backup.
 .TP
 .B \--md5sum packagename
 Record the package md5sum in the metadata written in /var/log/packages.
@@ -67,6 +70,9 @@ Primarily used when installpkg is called from other scripts.
 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 \--terse
+Install the package displaying only a single description line to stdout.
+.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.
@@ -81,6 +87,20 @@ the values set in the tagfile for the entire package list.
 .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 EXAMPLES
+.TP
+.B Install a font package for X:
+.P
+installpkg font-bh-ttf-1.0.3-noarch-1.txz
+.P
+Note that if a package is already installed, upgradepkg(8) should be used instead.
+.TP
+.B Create a backup of the files that would be overwritten if the package is installed:
+.P
+.nf
+tar czvf /tmp/backup.tar.gz \\
+  $(installpkg --warn font-bh-ttf-1.0.3-noarch-1.txz)
+.fi
 .SH AUTHOR
 Patrick J. Volkerding <volkerdi@slackware.com>
 .SH "SEE ALSO"
diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild
index 46235e16..4d3a07bf 100755
--- a/source/a/pkgtools/pkgtools.SlackBuild
+++ b/source/a/pkgtools/pkgtools.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2005, 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,9 +27,9 @@ fi
 PKG=$TMP/package-pkgtools
 
 # *** UPDATE THESE WITH EACH BUILD:
-VERSION=13.1
+VERSION=13.37
 ARCH=${ARCH:-noarch}
-BUILD=1
+BUILD=9
 
 if [ ! -d $TMP ]; then
   mkdir -p $TMP # location to build the source
diff --git a/source/a/pkgtools/scripts/installpkg b/source/a/pkgtools/scripts/installpkg
index 31bb0b71..2d3f208d 100644
--- a/source/a/pkgtools/scripts/installpkg
+++ b/source/a/pkgtools/scripts/installpkg
@@ -1,7 +1,7 @@
 #!/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 
+# Copyright 2007, 2009, 2011  Patrick Volkerding, Sebeka, MN, USA 
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,6 +21,20 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
+# Fri Apr 22 20:45:45 UTC 2011
+# A stronger formula is needed to regularize output that will be parsed.
+unset LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY \
+  LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT \
+  LC_IDENTIFICATION LC_ALL
+LANG=C
+export LANG
+#
+# Thu Apr 21 17:31:29 UTC 2011
+# Set LC_MESSAGES=C to avoid output parsing issues.
+# Might as well do that right now.
+#LC_MESSAGES=C
+#export LC_MESSAGES
+#
 # Sat Apr 25 21:18:53 UTC 2009
 # Converted to use new pkgbase() function to remove pathname and
 # valid package extensions.
@@ -120,6 +134,7 @@ Installpkg is used to install a .t{gz,bz,lz,xz} package like this:
 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)
+              --terse (display a one-line short description for install)
               --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
@@ -183,6 +198,9 @@ while [ 0 ]; do
   elif [ "$1" = "-infobox" -o "$1" = "--infobox" ]; then
     MODE=infobox
     shift 1
+  elif [ "$1" = "-terse" -o "$1" = "--terse" ]; then
+    MODE=terse
+    shift 1
   elif [ "$1" = "-menu" -o "$1" = "--menu" ]; then
     MODE=menu
     shift 1
@@ -247,7 +265,6 @@ 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)"
@@ -270,21 +287,24 @@ if [ "$MODE" = "warn" ]; then
     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 ' ' '/'
+	for f in `cat $TMP/scan$$/install/delete | cut -f 3,7 -d ' ' | tr ' ' '/'`; do
+	  f="/$f"
+	  if [ -f "$f" -o -L "$f" ]; then
+	    echo "$f"
+	  fi
+	done
       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
+    for f in `( $packagecompression -dc | $TAR tf - ) < $1 | grep -v 'drwx'`; do
+      f="/$f"
+      if [ -f "$f" -o -L "$f" ]; then
+        echo "$f"
+      fi
+    done
     shift 1
   done
   exit
@@ -385,7 +405,7 @@ for package in $* ; do
 
   # 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"
+  COMPRESSED="$(/bin/du -sh "$(readlink -f $package)" | cut -f 1)"
   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
@@ -408,7 +428,14 @@ for package in $* ; do
     rm -f $TMP/tmplist$$ $TMP/tmpsize$$
     continue
   fi
-  UNCOMPRESSED="$(expr $(cat $TMP/tmpsize$$ | head -n 1 | cut -f 1 -d +) / 2)K"
+  UNCOMPRESSED="$(expr $(cat $TMP/tmpsize$$ | head -n 1 | cut -f 1 -d +) / 2)"
+  if [ $UNCOMPRESSED -lt 1024 ]; then
+    UNCOMPRESSED="${UNCOMPRESSED}K"
+  elif [ $UNCOMPRESSED -lt 10239 ]; then
+    UNCOMPRESSED="$(expr $UNCOMPRESSED \* 1000 / 1024 | cut -b1).$(expr $UNCOMPRESSED \* 1000 / 1024 | cut -b2)M"
+  else
+    UNCOMPRESSED="$(expr $UNCOMPRESSED / 1024)M"
+  fi
   rm -f $TMP/tmpsize$$
 
   # If we still don't have a package description, look inside the package.
@@ -472,6 +499,8 @@ EOF
     if [ "$shortname" != "$packagebase" ]; then
       cat $DESCRIPTION | grep "^$shortname:" | uniq | sed "s/^$shortname:/#/g"
     fi
+  elif [ "$MODE" = "terse" ]; then # emit a single description line
+    printf "%-72s %-6s\n" "$(echo $shortname: $(cat $DESCRIPTION | grep "^$packagebase:" | sed "s/^$packagebase: //g" | head -n 1 | tr -d '()' | sed "s/^$packagebase //g" ) | cut -b1-72)" "[${UNCOMPRESSED}]" | cut -b1-80
   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
diff --git a/source/a/pkgtools/scripts/pkgtool b/source/a/pkgtools/scripts/pkgtool
index c0a2a973..a64ef09c 100644
--- a/source/a/pkgtools/scripts/pkgtool
+++ b/source/a/pkgtools/scripts/pkgtool
@@ -4,7 +4,7 @@
 #    1998, 1999  Patrick Volkerding,  Moorhead, MN  USA
 # Copyright 2001, 2004  Slackware Linux, Inc.,  Concord, CA  USA
 #    All rights reserved.
-# Copyright 2007, 2009, 2010  Patrick Volkerding, Sebeka, MN, USA
+# Copyright 2007, 2009, 2010, 2011  Patrick Volkerding, Sebeka, MN, USA
 #
 # Redistribution and use of this script, with or without modification, is 
 # permitted provided that the following conditions are met:
@@ -79,13 +79,15 @@ if [ -L /bin/chmod -a -L /bin/chown ]; then # probably on the bootdisk using bus
   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 "partitions beneath /mnt.  Here are some examples:"
   echo
-  echo "If your root partition is /dev/sda1, and is using ext2fs, you would type:"
-  echo "mount /dev/sda1 /mnt -t ext2"
+  echo "If your root partition is /dev/sda1 you would type:"
+  echo "mount /dev/sda1 /mnt"
+  echo
+  echo "Now you can find a list of all your partitions in /mnt/etc/fstab."
   echo
   echo "Then, supposing your /usr partition is /dev/sda2, you must do this:"
-  echo "mount /dev/sda2 /mnt/usr -t ext2"
+  echo "mount /dev/sda2 /mnt/usr"
   echo
   echo "Please mount your Linux partitions and then run pkgtool again."
   echo
@@ -210,7 +212,7 @@ else  # there were no arguments, so we'll get the needed information from the
  CMD_START="true"
  rm -f $TMP/SeT*
  while [ 0 ]; do
-  dialog --title "Slackware Package Tool (pkgtool version 13.1)" \
+  dialog --title "Slackware Package Tool (pkgtool version 13.37)" \
 --menu "\nWelcome to the Slackware package tool.\n\
 \nWhich option would you like?\n" 17 75 7 \
 "Current" "Install packages from the current directory" \
diff --git a/source/a/procps/procps-3.2.7-ps-cgroup.patch b/source/a/procps/procps-3.2.7-ps-cgroup.patch
new file mode 100644
index 00000000..de5c6b26
--- /dev/null
+++ b/source/a/procps/procps-3.2.7-ps-cgroup.patch
@@ -0,0 +1,65 @@
+diff -burN procps-3.2.8/ps/output.c procps-3.2.8.cgroups/ps/output.c
+--- procps-3.2.8/ps/output.c	2009-05-10 14:24:50.000000000 -0500
++++ procps-3.2.8.cgroups/ps/output.c	2010-12-04 12:35:56.000000000 -0600
+@@ -1099,6 +1099,39 @@
+   return snprintf(outbuf, COLWID, "*");
+ }
+ 
++static int pr_cgroup(char *restrict const outbuf, const proc_t *restrict const pp){
++  char filename[48];
++  FILE *fd;
++  int counter = 0;
++  int c;
++  int is_cgroup = 0;
++
++  outbuf[0]='\0';
++  snprintf(filename, sizeof filename, "/proc/%d/cgroup", pp->tgid);
++  fd = fopen(filename, "r");
++  if (likely(fd == NULL)) goto fail;
++  while (( (c = fgetc(fd)) != EOF) && (counter<665)) {
++    if (is_cgroup == 0) {
++      if (c == ':') {
++        is_cgroup = 1;
++        if (counter>0)
++          outbuf[counter++]=';';
++      }
++    }else
++      if ((c == '\n') || (c == '\0'))
++        is_cgroup = 0;
++      else
++        outbuf[counter++]=c;
++  }
++  outbuf[counter]='\0';
++  close(fd);
++  if (counter>0) 
++    return counter;
++fail:
++  outbuf[0] = '-';
++  outbuf[1] = '\0';
++  return 1;
++}
+ 
+ /****************** FLASK & seLinux security stuff **********************/
+ // move the bulk of this to libproc sometime
+@@ -1293,6 +1326,7 @@
+ {"bsdtime",   "TIME",    pr_bsdtime,  sr_nop,     6,   0,    LNX, ET|RIGHT},
+ {"c",         "C",       pr_c,        sr_pcpu,    2,   0,    SUN, ET|RIGHT},
+ {"caught",    "CAUGHT",  pr_sigcatch, sr_nop,     9,   0,    BSD, TO|SIGNAL}, /*sigcatch*/
++{"cgroup",    "CGROUP",  pr_cgroup,   sr_nop,    35,   0,    LNX, PO|LEFT},  /* cgroups*/
+ {"class",     "CLS",     pr_class,    sr_sched,   3,   0,    XXX, TO|LEFT},
+ {"cls",       "CLS",     pr_class,    sr_sched,   3,   0,    HPU, TO|RIGHT}, /*says HPUX or RT*/
+ {"cmaj_flt",  "-",       pr_nop,      sr_cmaj_flt, 1,  0,    LNX, AN|RIGHT},
+diff -burN procps-3.2.8/ps/ps.1 procps-3.2.8.cgroups/ps/ps.1
+--- procps-3.2.8/ps/ps.1	2009-05-10 14:38:17.000000000 -0500
++++ procps-3.2.8.cgroups/ps/ps.1	2010-12-04 12:43:12.000000000 -0600
+@@ -904,6 +904,10 @@
+ displayed.  (alias\ \fBsig_catch\fR,\ \fBsigcatch\fR).
+ T}
+ 
++cgroup	CGROUP	T{
++display control groups to which the process belongs.
++T}
++
+ class	CLS	T{
+ scheduling class of the process.  (alias\ \fBpolicy\fR,\ \fBcls\fR).
+ Field's possible values are:
diff --git a/source/a/procps/procps-3.2.8-ps-cgroup-suppress-root-group.patch b/source/a/procps/procps-3.2.8-ps-cgroup-suppress-root-group.patch
new file mode 100644
index 00000000..4b192c1f
--- /dev/null
+++ b/source/a/procps/procps-3.2.8-ps-cgroup-suppress-root-group.patch
@@ -0,0 +1,36 @@
+--- procps-3.2.8/ps/output.c	2010-05-18 06:00:18.000000000 +0200
++++ procps-3.2.8.lennart/ps/output.c	2010-05-18 05:59:46.000000000 +0200
+@@ -1109,7 +1109,7 @@
+ static int pr_cgroup(char *restrict const outbuf, const proc_t *restrict const pp){
+   char filename[48];
+   FILE *fd;
+-  int counter = 0;
++  int counter = 0, last_begin = 0, slash = 0;
+   int c;
+   int is_cgroup = 0;
+ 
+@@ -1121,15 +1121,22 @@
+     if (is_cgroup == 0) {
+       if (c == ':') {
+         is_cgroup = 1;
++        slash = 0;
+         if (counter>0)
+           outbuf[counter++]=';';
+       }
+     }else
+-      if ((c == '\n') || (c == '\0'))
+-        is_cgroup = 0;
++      if ((c == '\n') || (c == '\0')){
++        if (slash)  /* if the last char was a / this process is in the root cgroup which we should suppress */
++            counter = last_begin;
+       else
++            last_begin = counter;
++        is_cgroup = 0;
++      } else {
++        slash = c == '/';
+         outbuf[counter++]=c;
+   }
++  }
+   outbuf[counter]='\0';
+   close(fd);
+   if (counter>0) 
diff --git a/source/a/procps/procps-3.2.8.unknown.hz.value.diff b/source/a/procps/procps-3.2.8.unknown.hz.value.diff
new file mode 100644
index 00000000..be283814
--- /dev/null
+++ b/source/a/procps/procps-3.2.8.unknown.hz.value.diff
@@ -0,0 +1,32 @@
+--- procps-3.2.8.orig/proc/sysinfo.c	2008-03-24 04:33:43.000000000 +0000
++++ procps-3.2.8.orig/proc/sysinfo.c	2011-02-07 18:14:16.476982472 +0000
+@@ -212,6 +212,7 @@ static int check_for_privs(void){
+ static void init_libproc(void) __attribute__((constructor));
+ static void init_libproc(void){
+   have_privs = check_for_privs();
++  init_Linux_version();
+   // ought to count CPUs in /proc/stat instead of relying
+   // on glibc, which foolishly tries to parse /proc/cpuinfo
+   //
+--- procps-3.2.8.orig/proc/version.c	2003-01-29 01:11:43.000000000 +0000
++++ procps-3.2.8.orig/proc/version.c	2011-02-07 18:13:12.283649138 +0000
+@@ -33,8 +33,7 @@ void display_version(void) {
+ 
+ int linux_version_code;
+ 
+-static void init_Linux_version(void) __attribute__((constructor));
+-static void init_Linux_version(void) {
++void init_Linux_version(void) {
+     static struct utsname uts;
+     int x = 0, y = 0, z = 0;	/* cleared in case sscanf() < 3 */
+     
+--- procps-3.2.8.orig/proc/version.h	2002-12-15 00:08:32.000000000 +0000
++++ procps-3.2.8.orig/proc/version.h	2011-02-07 18:14:20.263649138 +0000
+@@ -14,6 +14,7 @@ 
+ 
+ EXTERN_C_BEGIN
+ 
++extern void init_Linux_version(void);
+ extern void display_version(void);	/* display suite version */
+ extern const char procps_version[];		/* global buf for suite version */
+ 
diff --git a/source/a/procps/procps.SlackBuild b/source/a/procps/procps.SlackBuild
index a5163bbc..e5e85ffc 100755
--- a/source/a/procps/procps.SlackBuild
+++ b/source/a/procps/procps.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,13 +21,22 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=3.2.7
+VERSION=3.2.8
 # Sometimes this number lags behind...
-SOVER=3.2.7
-PSMISCVER=22.3
-ARCH=${ARCH:-x86_64}
+SOVER=3.2.8
+PSMISCVER=22.13
 BUILD=${BUILD:-3}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-procps
@@ -52,8 +61,8 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf procps-$VERSION
-tar xzvf $CWD/procps-$VERSION.tar.gz
-cd procps-$VERSION
+tar xvf $CWD/procps-$VERSION.tar.?z* || exit 1
+cd procps-$VERSION || exit 1
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -62,9 +71,10 @@ find . \
   -exec chmod 644 {} \;
 
 mkdir -p $PKG/usr/doc/procps-$VERSION
-cp -a BUGS COPYING COPYING.LIB NEWS TODO $PKG/usr/doc/procps-$VERSION
+cp -a BUGS COPYING* 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.
@@ -83,7 +93,14 @@ if [ "$ARCH" = "x86_64" ]; then
   zcat $CWD/procps-3.2.7-ps-eip64.diff.gz | patch -p1 --verbose || exit 1
 fi
 
-make OPT="$SLKCFLAGS"
+# Add support for cgroups display:
+zcat $CWD/procps-3.2.7-ps-cgroup.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/procps-3.2.8-ps-cgroup-suppress-root-group.patch.gz | patch -p1 --verbose || exit 1
+
+# Init contructors in correct order to avoid "Unknown HZ value!":
+zcat $CWD/procps-3.2.8.unknown.hz.value.diff.gz | patch -p1 --verbose || exit 1
+
+make OPT="$SLKCFLAGS" || make OPT="$SLKCFLAGS" || exit 1
 mkdir -p $PKG/lib${LIBDIRSUFFIX} $PKG/bin $PKG/sbin $PKG/usr/bin
 cat free > $PKG/bin/free
 cat ps/ps> $PKG/bin/ps
@@ -123,7 +140,7 @@ echo "| psmisc-$PSMISCVER |"
 echo "+=============+"
 cd $TMP
 rm -rf psmisc-$PSMISCVER
-tar xzvf $CWD/psmisc-$PSMISCVER.tar.gz
+tar xvf $CWD/psmisc-$PSMISCVER.tar.?z* || exit 1
 cd psmisc-$PSMISCVER
 # Maybe we'll turn on NLS when it supports more than
 # just US English. :)
@@ -135,7 +152,7 @@ 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
+make || make || exit 1
 cd src
 strip fuser pstree killall
 cat fuser > $PKG/usr/bin/fuser
@@ -182,10 +199,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 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/quota/quota.SlackBuild b/source/a/quota/quota.SlackBuild
index 0ae450b9..67717b11 100755
--- a/source/a/quota/quota.SlackBuild
+++ b/source/a/quota/quota.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=3.17
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-quota
diff --git a/source/a/reiserfsprogs/reiserfsprogs.SlackBuild b/source/a/reiserfsprogs/reiserfsprogs.SlackBuild
index c56d8f13..fc38990d 100755
--- a/source/a/reiserfsprogs/reiserfsprogs.SlackBuild
+++ b/source/a/reiserfsprogs/reiserfsprogs.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=3.6.21
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
@@ -64,7 +73,7 @@ if [ "$ARCH" = "x86_64" ]; then
   sed -i -e 's?#define HAVE_ASM_UNALIGNED_H 1?/* & */?' config.h
 fi
 
-make $NUMJOBS || make || exit1
+make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/source/a/rpm2tgz/patches/0007-Add-support-for-.txz-packages-and-rpm2txz-symlink.patch b/source/a/rpm2tgz/patches/0007-Add-support-for-.txz-packages-and-rpm2txz-symlink.patch
new file mode 100644
index 00000000..2a8c0537
--- /dev/null
+++ b/source/a/rpm2tgz/patches/0007-Add-support-for-.txz-packages-and-rpm2txz-symlink.patch
@@ -0,0 +1,62 @@
+From 9399788e2b36fc5e345d679f650f8387376987af Mon Sep 17 00:00:00 2001
+From: Igor Murzov <igor@gplsoft.org>
+Date: Thu, 5 Aug 2010 02:09:56 +0400
+Subject: [PATCH 07/09] Add support for .txz packages and rpm2txz symlink
+
+---
+ rpm2targz          |   20 +++++++++++++++-----
+ rpm2tgz.SlackBuild |    1 +
+ 2 files changed, 16 insertions(+), 5 deletions(-)
+
+diff --git a/rpm2targz b/rpm2targz
+index cc25407..45ac1d7 100644
+--- a/rpm2targz
++++ b/rpm2targz
+@@ -23,6 +23,7 @@
+ #
+ 
+ CWD=$(pwd)
++NAME="$(basename $0)"
+ 
+ # Breaking the help out into it's own deal
+ usage() {
+@@ -31,9 +32,13 @@ usage() {
+   echo "            with \"installpkg\", \"removepkg\", \"pkgtool\", or manually"
+   echo "            with \"tar\")"
+   echo
+-  if [ "$(basename $0)" = "rpm2tgz" ]; then
++  if [ "$NAME" = "rpm2tgz" -o "$NAME" = "rpm2txz" ]; then
+     echo "Usage:      $0 [OPTION] <file.rpm>"
+-    echo "            (Outputs \"file.tgz\")"
++    if [ "$NAME" = "rpm2tgz" ]; then
++      echo "            (Outputs \"file.tgz\")"
++    else
++      echo "            (Outputs \"file.txz\")"
++    fi
+     echo
+     echo "  -s    extract the install scripts to /usr/doc/\$PRGNAM-\$VERSION/"
+     echo "          for review."
+@@ -210,15 +215,20 @@ for i in $* ; do
+   # 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
++  if [ "$NAME" = "rpm2tgz" -o "$NAME" = "rpm2txz" ]; then
++    if [ "$NAME" = "rpm2tgz" ]; then
++      EXT=tgz
++    else
++      EXT=txz
++    fi
+     ( 
+       if [ "$META_NAME" = "true" ]; then
+         get_meta_data $i
+         cd $TMPDIR
+-        /sbin/makepkg -l y -c n $CWD/$PRGNAM-$VERSION-$ARCH-${BUILD}.tgz
++        /sbin/makepkg -l y -c n $CWD/$PRGNAM-$VERSION-$ARCH-${BUILD}.$EXT
+       else
+         cd $TMPDIR
+-        /sbin/makepkg -l y -c n $CWD/$(basename $i .rpm).tgz
++        /sbin/makepkg -l y -c n $CWD/$(basename $i .rpm).$EXT
+       fi
+     )
+   else
diff --git a/source/a/rpm2tgz/patches/0008-Avoid-none-values-in-slack-desc.patch b/source/a/rpm2tgz/patches/0008-Avoid-none-values-in-slack-desc.patch
new file mode 100644
index 00000000..575f2bb5
--- /dev/null
+++ b/source/a/rpm2tgz/patches/0008-Avoid-none-values-in-slack-desc.patch
@@ -0,0 +1,36 @@
+From 31205a87c10659e5e4534825e8aece34c5b6dba8 Mon Sep 17 00:00:00 2001
+From: Igor Murzov <igor@gplsoft.org>
+Date: Thu, 5 Aug 2010 11:22:31 +0400
+Subject: [PATCH 08/09] Avoid (none) values in slack-desc
+
+---
+ rpm2targz |   13 ++++++++++++-
+ 1 files changed, 12 insertions(+), 1 deletions(-)
+
+diff --git a/rpm2targz b/rpm2targz
+index 45ac1d7..d9d6a8b 100644
+--- a/rpm2targz
++++ b/rpm2targz
+@@ -209,7 +209,18 @@ for i in $* ; do
+   if [ "$DESC" = "true" ]; then
+     get_meta_data $i
+     mkdir -p $TMPDIR/install
+-    rpm -qp --qf '%{NAME} (%{SUMMARY})\n\n%{DESCRIPTION}\n\n  %{URL}\n' $i | head -n 11 | sed -r "s/^/$PRGNAM: /" > $TMPDIR/install/slack-desc
++    if [ "$(rpm -qp --qf %{SUMMARY} $i )" != '(none)' ] ; then
++      rpm -qp --qf "$PRGNAM (%{SUMMARY})\n\n" $i > $TMPDIR/install/slack-desc
++    else
++      echo -en "$PRGNAM\n\n" > $TMPDIR/install/slack-desc
++    fi
++    if [ "$(rpm -qp --qf %{DESCRIPTION} $i )" != '(none)' ] ; then
++      rpm -qp --qf "%{DESCRIPTION}\n\n" $i >> $TMPDIR/install/slack-desc
++    fi
++    if [ "$(rpm -qp --qf %{URL} $i )" != '(none)' ] ; then
++      rpm -qp --qf "  %{URL}\n" $i >> $TMPDIR/install/slack-desc
++    fi
++    sed -ri "s/^/$PRGNAM: /;11q" $TMPDIR/install/slack-desc
+   fi
+ 
+   # If this program was called as "rpm2targz", then repack as a plain
+-- 
+1.7.1
+
diff --git a/source/a/rpm2tgz/patches/0009-Add-c-option-just-as-makepkg-c-y.patch b/source/a/rpm2tgz/patches/0009-Add-c-option-just-as-makepkg-c-y.patch
new file mode 100644
index 00000000..6768401a
--- /dev/null
+++ b/source/a/rpm2tgz/patches/0009-Add-c-option-just-as-makepkg-c-y.patch
@@ -0,0 +1,70 @@
+From 7664b10014e4ca5b0f498d5c774653a44fdaf0e1 Mon Sep 17 00:00:00 2001
+From: Igor Murzov <igor@gplsoft.org>
+Date: Fri, 6 Aug 2010 01:05:41 +0400
+Subject: [PATCH 09/09] Add -c option (just as makepkg -c y)
+
+---
+ rpm2targz |   17 ++++++++++++++---
+ 1 files changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/rpm2targz b/rpm2targz
+index d9d6a8b..f3e51d6 100644
+--- a/rpm2targz
++++ b/rpm2targz
+@@ -49,6 +49,7 @@ usage() {
+     echo "  -r    extract what the rpm's \"requires\" (dependencies)"
+     echo "          as documention to /usr/doc/\$PRGNAM-\$VERSION/"
+     echo "  -d    attempt a wellformed slack-desc from the rpm meta data"
++    echo "  -c    reset all directory permissions to 755 and ownership to root:root."
+     echo
+   else
+     echo "Usage:      $0 <file.rpm>"
+@@ -98,7 +99,7 @@ if [ "$1" = "" ]; then
+   usage
+ fi
+ 
+-ARGS=$(getopt "hsSndr" $* )
++ARGS=$(getopt "hsSndrc" $* )
+ set -- ${ARGS}
+ for i; do
+   case "$1" in
+@@ -122,6 +123,10 @@ for i; do
+       META_NAME="true"
+       shift
+       ;;
++    -c)
++      CHOWN="true"
++      shift
++      ;;
+     --)
+       shift
+       break
+@@ -223,6 +228,12 @@ for i in $* ; do
+     sed -ri "s/^/$PRGNAM: /;11q" $TMPDIR/install/slack-desc
+   fi
+ 
++  # Supply -c y to makepkg if asked
++  COPT="n"
++  if [ "$CHOWN" = "true" ]; then
++    COPT="y"
++  fi
++
+   # 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:
+@@ -236,10 +247,10 @@ for i in $* ; do
+       if [ "$META_NAME" = "true" ]; then
+         get_meta_data $i
+         cd $TMPDIR
+-        /sbin/makepkg -l y -c n $CWD/$PRGNAM-$VERSION-$ARCH-${BUILD}.$EXT
++        /sbin/makepkg -l y -c $COPT $CWD/$PRGNAM-$VERSION-$ARCH-${BUILD}.$EXT
+       else
+         cd $TMPDIR
+-        /sbin/makepkg -l y -c n $CWD/$(basename $i .rpm).$EXT
++        /sbin/makepkg -l y -c $COPT $CWD/$(basename $i .rpm).$EXT
+       fi
+     )
+   else
+-- 
+1.7.1
+
diff --git a/source/a/rpm2tgz/rpm2tgz.SlackBuild b/source/a/rpm2tgz/rpm2tgz.SlackBuild
index c6d76609..c32e490c 100755
--- a/source/a/rpm2tgz/rpm2tgz.SlackBuild
+++ b/source/a/rpm2tgz/rpm2tgz.SlackBuild
@@ -20,7 +20,7 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=1.2.1
+VERSION=1.2.2
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -61,11 +61,18 @@ cat $CWD/rpm2targz > $PKG/usr/bin/rpm2targz
   # Not applied.  Rationale:  .tgz works with all versions of Slackware.
   # Translated RPMs may be targeting systems with no .txz support.
   #zcat $CWD/patches/0006-should-we-use-.txz-format-in-slackware-current.patch.gz | patch -p1 || exit 1
-  # mv the script back:
+  # OK, I will take this version of the patch, as it doesn't change the
+  # default behaviour of rpm2tgz.
+  # mv the script back (wow, this is rather random ;-)
   mv rpm2tgz rpm2targz
+  zcat $CWD/patches/0007-Add-support-for-.txz-packages-and-rpm2txz-symlink.patch.gz | patch -p1 || exit 1
+  zcat $CWD/patches/0008-Avoid-none-values-in-slack-desc.patch.gz | patch -p1 || exit 1
+  zcat $CWD/patches/0009-Add-c-option-just-as-makepkg-c-y.patch.gz | patch -p1 || exit 1
 ) || exit 1
 
 ( cd $PKG/usr/bin ; ln -sf rpm2targz rpm2tgz )
+( cd $PKG/usr/bin ; ln -sf rpm2targz rpm2txz )
+
 chmod 755 $PKG/usr/bin/{rpmoffset,rpm2targz}
 mkdir -p $PKG/usr/doc/rpm2targz
 cp -a $CWD/rpm2targz.README $PKG/usr/doc/rpm2targz/rpm2targz.README
diff --git a/source/a/shadow/adduser b/source/a/shadow/adduser
index 038a0a94..5b674a85 100644
--- a/source/a/shadow/adduser
+++ b/source/a/shadow/adduser
@@ -36,7 +36,7 @@
 # History #
 ###########
 # v1.13 - 13/01/10
-#       * Fix bug that removed underscore characters from group names.
+#       * Fixed bug that removed underscore characters from UNIX group names.
 #         Thanks to mRgOBLIN for the report and Jim Hawkins for the fix. <sw>
 # v1.12 - 21/07/09
 #       * Adjusted the search of /etc/passwd to exclude the NIS inclusion
diff --git a/source/a/shadow/patches/README_PATCHES b/source/a/shadow/patches/README_PATCHES
new file mode 100644
index 00000000..0c639d1a
--- /dev/null
+++ b/source/a/shadow/patches/README_PATCHES
@@ -0,0 +1,9 @@
+
+r3054.diff: Fixed wrong format string
+r3055.diff: Help output to stderr not stdout.
+r3060.diff: Fix memory leaks
+r3062.diff: Avoid memzero() on a possibly NULL pointer.
+r3096.diff: Fix parsing of gshadow entries. 
+r3160.diff: Fixed limits support (non PAM enabled versions only)
+r3194.diff: shell's name must be -su when a su fakes a login.
+r3299.diff: man/ru/Makefile.am: Remove double inclusion of $(man_nopam) 
diff --git a/source/a/shadow/patches/r3054.diff b/source/a/shadow/patches/r3054.diff
new file mode 100644
index 00000000..dc1eab13
--- /dev/null
+++ b/source/a/shadow/patches/r3054.diff
@@ -0,0 +1,27 @@
+* src/useradd.c: Fixed wrong format string.
+* lib/gshadow.c: Removed declaration of unused variable.
+
+===================================================================
+--- src/useradd.c	(revision 3052)
++++ src/useradd.c	(revision 3054)
+@@ -684,7 +684,7 @@
+ static void usage (void)
+ {
+ 	(void) fprintf (stderr,
+-	                _("Usage: useradd [options] LOGIN\n"
++	                _("Usage: %s [options] LOGIN\n"
+ 	                  "\n"
+ 	                  "Options:\n"),
+ 	                Prog);
+
+===================================================================
+--- lib/gshadow.c	(revision 3052)
++++ lib/gshadow.c	(revision 3054)
+@@ -216,7 +216,6 @@
+ 	static char *buf = NULL;
+ 
+ 	char *cp;
+-	struct sgrp *ret;
+ 
+ 	if (0 == buflen) {
+ 		buf = (char *) malloc (BUFSIZ);
diff --git a/source/a/shadow/patches/r3055.diff b/source/a/shadow/patches/r3055.diff
new file mode 100644
index 00000000..a2af6f39
--- /dev/null
+++ b/source/a/shadow/patches/r3055.diff
@@ -0,0 +1,1515 @@
+===================================================================
+--- src/userdel.c	(revision 3054)
++++ src/userdel.c	(revision 3055)
+@@ -94,7 +94,7 @@
+ static bool spw_locked  = false;
+ 
+ /* local function prototypes */
+-static void usage (void);
++static void usage (int status);
+ static void update_groups (void);
+ static void close_files (void);
+ static void fail_exit (int);
+@@ -111,7 +111,7 @@
+ /*
+  * usage - display usage message and exit
+  */
+-static void usage (void)
++static void usage (int status)
+ {
+ 	fputs (_("Usage: userdel [options] LOGIN\n"
+ 	         "\n"
+@@ -120,8 +120,8 @@
+ 	         "                                even if not owned by user\n"
+ 	         "  -h, --help                    display this help message and exit\n"
+ 	         "  -r, --remove                  remove home directory and mail spool\n"
+-	         "\n"), stderr);
+-	exit (E_USAGE);
++	         "\n"), status ? stderr : stdout);
++	exit (status);
+ }
+ 
+ /*
+@@ -774,17 +774,19 @@
+ 			case 'f':	/* force remove even if not owned by user */
+ 				fflg = true;
+ 				break;
++			case 'h':
++				usage (E_SUCCESS);
+ 			case 'r':	/* remove home dir and mailbox */
+ 				rflg = true;
+ 				break;
+ 			default:
+-				usage ();
++				usage (E_USAGE);
+ 			}
+ 		}
+ 	}
+ 
+ 	if ((optind + 1) != argc) {
+-		usage ();
++		usage (E_USAGE);
+ 	}
+ 
+ 	OPENLOG ("userdel");
+Index: src/lastlog.c
+===================================================================
+--- src/lastlog.c	(revision 3054)
++++ src/lastlog.c	(revision 3055)
+@@ -71,7 +71,7 @@
+ 
+ #define	NOW	(time ((time_t *) 0))
+ 
+-static void usage (void)
++static void usage (int status)
+ {
+ 	fputs (_("Usage: lastlog [options]\n"
+ 	         "\n"
+@@ -80,8 +80,8 @@
+ 	         "  -h, --help                    display this help message and exit\n"
+ 	         "  -t, --time DAYS               print only lastlog records more recent than DAYS\n"
+ 	         "  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
+-	         "\n"), stderr);
+-	exit (EXIT_FAILURE);
++	         "\n"), status ? stderr : stdout);
++	exit (status);
+ }
+ 
+ static void print_one (/*@null@*/const struct passwd *pw)
+@@ -208,7 +208,7 @@
+ 		                         NULL)) != -1) {
+ 			switch (c) {
+ 			case 'h':
+-				usage ();
++				usage (EXIT_SUCCESS);
+ 				break;
+ 			case 't':
+ 			{
+@@ -267,7 +267,7 @@
+ 				break;
+ 			}
+ 			default:
+-				usage ();
++				usage (EXIT_FAILURE);
+ 				break;
+ 			}
+ 		}
+@@ -275,7 +275,7 @@
+ 			fprintf (stderr,
+ 			         _("lastlog: unexpected argument: %s\n"),
+ 			         argv[optind]);
+-			usage();
++			usage (EXIT_FAILURE);
+ 		}
+ 	}
+ 
+Index: src/gpasswd.c
+===================================================================
+--- src/gpasswd.c	(revision 3054)
++++ src/gpasswd.c	(revision 3055)
+@@ -94,7 +94,7 @@
+ #endif
+ 
+ /* local function prototypes */
+-static void usage (void);
++static void usage (int status);
+ static RETSIGTYPE catch_signals (int killed);
+ static bool is_valid_user_list (const char *users);
+ static void process_flags (int argc, char **argv);
+@@ -128,14 +128,15 @@
+ /*
+  * usage - display usage message
+  */
+-static void usage (void)
++static void usage (int status)
+ {
+-	fprintf (stderr,
++	fprintf (status ? stderr : stdout,
+ 	         _("Usage: %s [option] GROUP\n"
+ 	           "\n"
+ 	           "Options:\n"
+ 	           "  -a, --add USER                add USER to GROUP\n"
+ 	           "  -d, --delete USER             remove USER from GROUP\n"
++	           "  -h, --help                    display this help message and exit\n"
+ 	           "  -r, --remove-password         remove the GROUP's password\n"
+ 	           "  -R, --restrict                restrict access to GROUP to its members\n"
+ 	           "  -M, --members USER,...        set the list of members of GROUP\n"
+@@ -150,7 +151,7 @@
+ 	         _("The options cannot be combined.\n")
+ #endif
+ 	        );
+-	exit (E_USAGE);
++	exit (status);
+ }
+ 
+ /*
+@@ -235,6 +236,7 @@
+ 	static struct option long_options[] = {
+ 		{"add", required_argument, NULL, 'a'},
+ 		{"delete", required_argument, NULL, 'd'},
++		{"help", no_argument, NULL, 'h'},
+ 		{"remove-password", no_argument, NULL, 'r'},
+ 		{"restrict", no_argument, NULL, 'R'},
+ 		{"administrators", required_argument, NULL, 'A'},
+@@ -242,7 +244,7 @@
+ 		{NULL, 0, NULL, '\0'}
+ 		};
+ 
+-	while ((flag = getopt_long (argc, argv, "a:A:d:gM:rR", long_options, &option_index)) != -1) {
++	while ((flag = getopt_long (argc, argv, "a:A:d:ghM:rR", long_options, &option_index)) != -1) {
+ 		switch (flag) {
+ 		case 'a':	/* add a user */
+ 			aflg = true;
+@@ -276,6 +278,8 @@
+ 			break;
+ 		case 'g':	/* no-op from normal password */
+ 			break;
++		case 'h':
++			usage (E_SUCCESS);
+ 		case 'M':	/* set the list of members */
+ 			members = optarg;
+ 			if (!is_valid_user_list (members)) {
+@@ -290,7 +294,7 @@
+ 			Rflg = true;
+ 			break;
+ 		default:
+-			usage ();
++			usage (E_USAGE);
+ 		}
+ 	}
+ 
+@@ -325,14 +329,14 @@
+ 		exclusive++;
+ 	}
+ 	if (exclusive > 1) {
+-		usage ();
++		usage (E_USAGE);
+ 	}
+ 
+ 	/*
+ 	 * Make sure one (and only one) group was provided
+ 	 */
+ 	if ((argc != (opt_index+1)) || (NULL == group)) {
+-		usage ();
++		usage (E_USAGE);
+ 	}
+ }
+ 
+Index: src/newusers.c
+===================================================================
+--- src/newusers.c	(revision 3054)
++++ src/newusers.c	(revision 3055)
+@@ -92,7 +92,7 @@
+ static bool spw_locked = false;
+ 
+ /* local function prototypes */
+-static void usage (void);
++static void usage (int status);
+ static void fail_exit (int);
+ static int add_group (const char *, const char *, gid_t *, gid_t);
+ static int get_user_id (const char *, uid_t *);
+@@ -110,15 +110,16 @@
+ /*
+  * usage - display usage message and exit
+  */
+-static void usage (void)
++static void usage (int status)
+ {
+-	(void) fprintf (stderr,
++	FILE *usageout = status ? stderr : stdout;
++	(void) fprintf (usageout,
+ 	                _("Usage: %s [options]\n"
+ 	                  "\n"
+ 	                  "Options:\n"),
+ 	                Prog);
+ #ifndef USE_PAM
+-	(void) fprintf (stderr,
++	(void) fprintf (usageout,
+ 	                _("  -c, --crypt-method            the crypt method (one of %s)\n"),
+ #ifndef USE_SHA_CRYPT
+ 	                "NONE DES MD5"
+@@ -127,18 +128,18 @@
+ #endif				/* USE_SHA_CRYPT */
+ 	               );
+ #endif				/* !USE_PAM */
+-	(void) fputs (_("  -h, --help                    display this help message and exit\n"), stderr);
+-	(void) fputs (_("  -r, --system                  create system accounts\n"), stderr);
++	(void) fputs (_("  -h, --help                    display this help message and exit\n"), usageout);
++	(void) fputs (_("  -r, --system                  create system accounts\n"), usageout);
+ #ifndef USE_PAM
+ #ifdef USE_SHA_CRYPT
+ 	(void) fputs (_("  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+ 	                "                                crypt algorithms\n"),
+-	              stderr);
++	              usageout);
+ #endif				/* USE_SHA_CRYPT */
+ #endif				/* !USE_PAM */
+-	(void) fputs ("\n", stderr);
++	(void) fputs ("\n", usageout);
+ 
+-	exit (EXIT_FAILURE);
++	exit (status);
+ }
+ 
+ /*
+@@ -548,7 +549,7 @@
+ 	                     long_options, &option_index)) != -1) {
+ 		switch (c) {
+ 		case 'h':
+-			usage ();
++			usage (EXIT_SUCCESS);
+ 			break;
+ 		case 'r':
+ 			rflg = true;
+@@ -565,13 +566,13 @@
+ 				fprintf (stderr,
+ 				         _("%s: invalid numeric argument '%s'\n"),
+ 				         Prog, optarg);
+-				usage ();
++				usage (EXIT_FAILURE);
+ 			}
+ 			break;
+ #endif				/* USE_SHA_CRYPT */
+ #endif				/* !USE_PAM */
+ 		default:
+-			usage ();
++			usage (EXIT_FAILURE);
+ 			break;
+ 		}
+ 	}
+@@ -602,7 +603,7 @@
+ 		fprintf (stderr,
+ 		         _("%s: %s flag is only allowed with the %s flag\n"),
+ 		         Prog, "-s", "-c");
+-		usage ();
++		usage (EXIT_FAILURE);
+ 	}
+ #endif				/* USE_SHA_CRYPT */
+ 
+@@ -618,7 +619,7 @@
+ 			fprintf (stderr,
+ 			         _("%s: unsupported crypt method: %s\n"),
+ 			         Prog, crypt_method);
+-			usage ();
++			usage (EXIT_FAILURE);
+ 		}
+ 	}
+ #endif				/* !USE_PAM */
+Index: src/chpasswd.c
+===================================================================
+--- src/chpasswd.c	(revision 3054)
++++ src/chpasswd.c	(revision 3055)
+@@ -74,7 +74,7 @@
+ 
+ /* local function prototypes */
+ static void fail_exit (int code);
+-static void usage (void);
++static void usage (int status);
+ static void process_flags (int argc, char **argv);
+ static void check_flags (void);
+ static void check_perms (void);
+@@ -112,15 +112,16 @@
+ /*
+  * usage - display usage message and exit
+  */
+-static void usage (void)
++static void usage (int status)
+ {
+-	(void) fprintf (stderr,
++	FILE *usageout = status ? stderr : stdout;
++	(void) fprintf (usageout,
+ 	                _("Usage: %s [options]\n"
+ 	                  "\n"
+ 	                  "Options:\n"),
+ 	                Prog);
+ #ifndef USE_PAM
+-	(void) fprintf (stderr,
++	(void) fprintf (usageout,
+ 	                _("  -c, --crypt-method            the crypt method (one of %s)\n"),
+ #ifndef USE_SHA_CRYPT
+ 	                "NONE DES MD5"
+@@ -128,22 +129,22 @@
+ 	                "NONE DES MD5 SHA256 SHA512"
+ #endif				/* USE_SHA_CRYPT */
+ 	               );
+-	(void) fputs (_("  -e, --encrypted               supplied passwords are encrypted\n"), stderr);
++	(void) fputs (_("  -e, --encrypted               supplied passwords are encrypted\n"), usageout);
+ #endif				/* !USE_PAM */
+-	(void) fputs (_("  -h, --help                    display this help message and exit\n"), stderr);
++	(void) fputs (_("  -h, --help                    display this help message and exit\n"), usageout);
+ #ifndef USE_PAM
+ 	(void) fputs (_("  -m, --md5                     encrypt the clear text password using\n"
+ 	                "                                the MD5 algorithm\n"),
+-	              stderr);
++	              usageout);
+ #ifdef USE_SHA_CRYPT
+ 	(void) fputs (_("  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+ 	                "                                crypt algorithms\n"),
+-	              stderr);
++	              usageout);
+ #endif				/* USE_SHA_CRYPT */
+ #endif				/* !USE_PAM */
+-	(void) fputs ("\n", stderr);
++	(void) fputs ("\n", usageout);
+ 
+-	exit (E_USAGE);
++	exit (status);
+ }
+ 
+ /*
+@@ -181,7 +182,7 @@
+ 	                         long_options, &option_index)) != -1) {
+ 		switch (c) {
+ 		case 'h':
+-			usage ();
++			usage (E_SUCCESS);
+ 			break;
+ #ifndef USE_PAM
+ 		case 'c':
+@@ -201,13 +202,13 @@
+ 				fprintf (stderr,
+ 				         _("%s: invalid numeric argument '%s'\n"),
+ 				         Prog, optarg);
+-				usage ();
++				usage (E_USAGE);
+ 			}
+ 			break;
+ #endif				/* USE_SHA_CRYPT */
+ #endif				/* !USE_PAM */
+ 		default:
+-			usage ();
++			usage (E_USAGE);
+ 			break;
+ 		}
+ 	}
+@@ -229,7 +230,7 @@
+ 		fprintf (stderr,
+ 		         _("%s: %s flag is only allowed with the %s flag\n"),
+ 		         Prog, "-s", "-c");
+-		usage ();
++		usage (E_USAGE);
+ 	}
+ #endif
+ 
+@@ -238,7 +239,7 @@
+ 		fprintf (stderr,
+ 		         _("%s: the -c, -e, and -m flags are exclusive\n"),
+ 		         Prog);
+-		usage ();
++		usage (E_USAGE);
+ 	}
+ 
+ 	if (cflg) {
+@@ -253,7 +254,7 @@
+ 			fprintf (stderr,
+ 			         _("%s: unsupported crypt method: %s\n"),
+ 			         Prog, crypt_method);
+-			usage ();
++			usage (E_USAGE);
+ 		}
+ 	}
+ #endif				/* USE_PAM */
+Index: src/groupmems.c
+===================================================================
+--- src/groupmems.c	(revision 3054)
++++ src/groupmems.c	(revision 3055)
+@@ -88,7 +88,7 @@
+                          const struct group *grp);
+ static void purge_members (const struct group *grp);
+ static void display_members (const char *const *members);
+-static void usage (void);
++static void usage (int status);
+ static void process_flags (int argc, char **argv);
+ static void check_perms (void);
+ static void fail_exit (int code);
+@@ -361,7 +361,7 @@
+ 	}
+ }
+ 
+-static void usage (void)
++static void usage (int status)
+ {
+ 	(void) fputs (_("Usage: groupmems [options] [action]\n"
+ 	                "\n"
+@@ -372,10 +372,11 @@
+ 	                "Actions:\n"
+ 	                "  -a, --add username            add username to the members of the group\n"
+ 	                "  -d, --delete username         remove username from the members of the group\n"
++	                "  -h, --help                    display this help message and exit\n"
+ 	                "  -p, --purge                   purge all members from the group\n"
+ 	                "  -l, --list                    list the members of the group\n"
+-	                "\n"), stderr);
+-	fail_exit (EXIT_USAGE);
++	                "\n"), status ? stderr : stdout);
++	fail_exit (status);
+ }
+ 
+ /*
+@@ -389,12 +390,13 @@
+ 		{"add", required_argument, NULL, 'a'},
+ 		{"delete", required_argument, NULL, 'd'},
+ 		{"group", required_argument, NULL, 'g'},
++		{"help", no_argument, NULL, 'h'},
+ 		{"list", no_argument, NULL, 'l'},
+ 		{"purge", no_argument, NULL, 'p'},
+ 		{NULL, 0, NULL, '\0'}
+ 	};
+ 
+-	while ((arg = getopt_long (argc, argv, "a:d:g:lp", long_options,
++	while ((arg = getopt_long (argc, argv, "a:d:g:hlp", long_options,
+ 	                           &option_index)) != EOF) {
+ 		switch (arg) {
+ 		case 'a':
+@@ -408,6 +410,8 @@
+ 		case 'g':
+ 			thisgroup = xstrdup (optarg);
+ 			break;
++		case 'h':
++			usage (EXIT_SUCCESS);
+ 		case 'l':
+ 			list = true;
+ 			++exclusive;
+@@ -417,12 +421,12 @@
+ 			++exclusive;
+ 			break;
+ 		default:
+-			usage ();
++			usage (EXIT_USAGE);
+ 		}
+ 	}
+ 
+ 	if ((exclusive > 1) || (optind < argc)) {
+-		usage ();
++		usage (EXIT_USAGE);
+ 	}
+ 
+ 	/* local, no need for xgetpwnam */
+Index: src/usermod.c
+===================================================================
+--- src/usermod.c	(revision 3054)
++++ src/usermod.c	(revision 3055)
+@@ -149,7 +149,7 @@
+ static void date_to_str (char *buf, size_t maxsize,
+                          long int date, const char *negativ);
+ static int get_groups (char *);
+-static void usage (void);
++static void usage (int status);
+ static void new_pwent (struct passwd *);
+ #ifdef WITH_SELINUX
+ static void selinux_update_mapping (void);
+@@ -300,9 +300,9 @@
+ /*
+  * usage - display usage message and exit
+  */
+-static void usage (void)
++static void usage (int status)
+ {
+-	fprintf (stderr,
++	fprintf (status ? stderr : stdout,
+ 	         _("Usage: usermod [options] LOGIN\n"
+ 	         "\n"
+ 	         "Options:\n"
+@@ -334,7 +334,7 @@
+ 	         ""
+ #endif
+ 	         );
+-	exit (E_USAGE);
++	exit (status);
+ }
+ 
+ /*
+@@ -815,7 +815,7 @@
+ 	bool anyflag = false;
+ 
+ 	if ((1 == argc) || ('-' == argv[argc - 1][0])) {
+-		usage ();
++		usage (E_USAGE);
+ 	}
+ 
+ 	{
+@@ -955,7 +955,7 @@
+ 					fprintf (stderr,
+ 					         _("%s: invalid numeric argument '%s'\n"),
+ 					         Prog, optarg);
+-					usage ();
++					usage (E_USAGE);
+ 				}
+ 				fflg = true;
+ 				break;
+@@ -976,6 +976,8 @@
+ 				}
+ 				Gflg = true;
+ 				break;
++			case 'h':
++				usage (E_SUCCESS);
+ 			case 'l':
+ 				if (!is_valid_user_name (optarg)) {
+ 					fprintf (stderr,
+@@ -1036,7 +1038,7 @@
+ 				break;
+ #endif
+ 			default:
+-				usage ();
++				usage (E_USAGE);
+ 			}
+ 			anyflag = true;
+ 		}
+@@ -1092,14 +1094,14 @@
+ 	}
+ 
+ 	if (optind != argc - 1) {
+-		usage ();
++		usage (E_USAGE);
+ 	}
+ 
+ 	if (aflg && (!Gflg)) {
+ 		fprintf (stderr,
+ 		         _("%s: %s flag is only allowed with the %s flag\n"),
+ 		         Prog, "-a", "-G");
+-		usage ();
++		usage (E_USAGE);
+ 		exit (E_USAGE);
+ 	}
+ 
+@@ -1107,7 +1109,7 @@
+ 		fprintf (stderr,
+ 		         _("%s: the -L, -p, and -U flags are exclusive\n"),
+ 		         Prog);
+-		usage ();
++		usage (E_USAGE);
+ 		exit (E_USAGE);
+ 	}
+ 
+@@ -1115,7 +1117,7 @@
+ 		fprintf (stderr,
+ 		         _("%s: %s flag is only allowed with the %s flag\n"),
+ 		         Prog, "-o", "-u");
+-		usage ();
++		usage (E_USAGE);
+ 		exit (E_USAGE);
+ 	}
+ 
+@@ -1123,7 +1125,7 @@
+ 		fprintf (stderr,
+ 		         _("%s: %s flag is only allowed with the %s flag\n"),
+ 		         Prog, "-m", "-d");
+-		usage ();
++		usage (E_USAGE);
+ 		exit (E_USAGE);
+ 	}
+ 
+Index: src/chgpasswd.c
+===================================================================
+--- src/chgpasswd.c	(revision 3054)
++++ src/chgpasswd.c	(revision 3055)
+@@ -78,7 +78,7 @@
+ 
+ /* local function prototypes */
+ static void fail_exit (int code);
+-static void usage (void);
++static void usage (int status);
+ static void process_flags (int argc, char **argv);
+ static void check_flags (void);
+ static void check_perms (void);
+@@ -114,9 +114,10 @@
+ /*
+  * usage - display usage message and exit
+  */
+-static void usage (void)
++static void usage (int status)
+ {
+-	fprintf (stderr, _("Usage: %s [options]\n"
++	fprintf (status ? stderr : stdout,
++	                 _("Usage: %s [options]\n"
+ 	                   "\n"
+ 	                   "Options:\n"
+ 	                   "  -c, --crypt-method            the crypt method (one of %s)\n"
+@@ -135,7 +136,7 @@
+ 	                   "                                crypt algorithms\n")
+ #endif
+ 	                 );
+-	exit (E_USAGE);
++	exit (status);
+ }
+ 
+ /*
+@@ -174,7 +175,7 @@
+ 			eflg = true;
+ 			break;
+ 		case 'h':
+-			usage ();
++			usage (E_SUCCESS);
+ 			break;
+ 		case 'm':
+ 			md5flg = true;
+@@ -186,12 +187,12 @@
+ 				fprintf (stderr,
+ 				         _("%s: invalid numeric argument '%s'\n"),
+ 				         Prog, optarg);
+-				usage ();
++				usage (E_USAGE);
+ 			}
+ 			break;
+ #endif
+ 		default:
+-			usage ();
++			usage (E_USAGE);
+ 			break;
+ 		}
+ 	}
+@@ -212,7 +213,7 @@
+ 		fprintf (stderr,
+ 		         _("%s: %s flag is only allowed with the %s flag\n"),
+ 		         Prog, "-s", "-c");
+-		usage ();
++		usage (E_USAGE);
+ 	}
+ #endif
+ 
+@@ -221,7 +222,7 @@
+ 		fprintf (stderr,
+ 		         _("%s: the -c, -e, and -m flags are exclusive\n"),
+ 		         Prog);
+-		usage ();
++		usage (E_USAGE);
+ 	}
+ 
+ 	if (cflg) {
+@@ -236,7 +237,7 @@
+ 			fprintf (stderr,
+ 			         _("%s: unsupported crypt method: %s\n"),
+ 			         Prog, crypt_method);
+-			usage ();
++			usage (E_USAGE);
+ 		}
+ 	}
+ }
+Index: src/vipw.c
+===================================================================
+--- src/vipw.c	(revision 3054)
++++ src/vipw.c	(revision 3055)
+@@ -1,7 +1,7 @@
+ /*
+   vipw, vigr  edit the password or group file
+   with -s will edit shadow or gshadow file
+- 
++
+   Copyright (c) 1997       , Guy Maor <maor@ece.utexas.edu>
+   Copyright (c) 1999 - 2000, Marek Michałkiewicz
+   Copyright (c) 2002 - 2006, Tomasz KÅ‚oczko
+@@ -29,8 +29,8 @@
+ 
+ #include <errno.h>
+ #include <getopt.h>
+-#ifdef WITH_SELINUX                                                            
+-#include <selinux/selinux.h>                                                   
++#ifdef WITH_SELINUX
++#include <selinux/selinux.h>
+ #endif
+ #include <signal.h>
+ #include <stdio.h>
+@@ -64,7 +64,7 @@
+ static bool quiet = false;
+ 
+ /* local function prototypes */
+-static void usage (void);
++static void usage (int status);
+ static int create_backup_file (FILE *, const char *, struct stat *);
+ static void vipwexit (const char *msg, int syserr, int ret);
+ static void vipwedit (const char *, int (*)(void), int (*)(void));
+@@ -72,9 +72,9 @@
+ /*
+  * usage - display usage message and exit
+  */
+-static void usage (void)
++static void usage (int status)
+ {
+-	(void) 
++	(void)
+ 	fputs (_("Usage: vipw [options]\n"
+ 	         "\n"
+ 	         "Options:\n"
+@@ -83,8 +83,8 @@
+ 	         "  -p, --passwd                  edit passwd database\n"
+ 	         "  -q, --quiet                   quiet mode\n"
+ 	         "  -s, --shadow                  edit shadow or gshadow database\n"
+-	         "\n"), stderr);
+-	exit (E_USAGE);
++	         "\n"), status ? stderr : stdout);
++	exit (status);
+ }
+ 
+ /*
+@@ -285,8 +285,8 @@
+ 	if (st1.st_mtime == st2.st_mtime) {
+ 		vipwexit (0, 0, 0);
+ 	}
+-#ifdef WITH_SELINUX                                                            
+-	/* unset the fscreatecon */                                             
++#ifdef WITH_SELINUX
++	/* unset the fscreatecon */
+ 	if (is_selinux_enabled ()) {
+ 		if (setfscreatecon (NULL)) {
+ 			vipwexit (_("setfscreatecon () failed"), errno, 1);
+@@ -353,7 +353,7 @@
+ 				do_vipw = false;
+ 				break;
+ 			case 'h':
+-				usage ();
++				usage (E_SUCCESS);
+ 				break;
+ 			case 'p':
+ 				do_vipw = true;
+@@ -365,7 +365,7 @@
+ 				editshadow = true;
+ 				break;
+ 			default:
+-				usage ();
++				usage (E_USAGE);
+ 			}
+ 		}
+ 	}
+Index: src/useradd.c
+===================================================================
+--- src/useradd.c	(revision 3054)
++++ src/useradd.c	(revision 3055)
+@@ -179,7 +179,7 @@
+ static void show_defaults (void);
+ static int set_defaults (void);
+ static int get_groups (char *);
+-static void usage (void);
++static void usage (int status);
+ static void new_pwent (struct passwd *);
+ #ifdef WITH_SELINUX
+ static void selinux_update_mapping (void);
+@@ -681,45 +681,46 @@
+ /*
+  * usage - display usage message and exit
+  */
+-static void usage (void)
++static void usage (int status)
+ {
+-	(void) fprintf (stderr,
++	FILE *usageout = status ? stderr : stdout;
++	(void) fprintf (usageout,
+ 	                _("Usage: %s [options] LOGIN\n"
+ 	                  "\n"
+ 	                  "Options:\n"),
+ 	                Prog);
+ 	(void) fputs (_("  -b, --base-dir BASE_DIR       base directory for the home directory of the\n"
+-	                "                                new account\n"), stderr);
+-	(void) fputs (_("  -c, --comment COMMENT         GECOS field of the new account\n"), stderr);
+-	(void) fputs (_("  -d, --home-dir HOME_DIR       home directory of the new account\n"), stderr);
+-	(void) fputs (_("  -D, --defaults                print or change default useradd configuration\n"), stderr);
+-	(void) fputs (_("  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"), stderr);
+-	(void) fputs (_("  -f, --inactive INACTIVE       password inactivity period of the new account\n"), stderr);
++	                "                                new account\n"), usageout);
++	(void) fputs (_("  -c, --comment COMMENT         GECOS field of the new account\n"), usageout);
++	(void) fputs (_("  -d, --home-dir HOME_DIR       home directory of the new account\n"), usageout);
++	(void) fputs (_("  -D, --defaults                print or change default useradd configuration\n"), usageout);
++	(void) fputs (_("  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"), usageout);
++	(void) fputs (_("  -f, --inactive INACTIVE       password inactivity period of the new account\n"), usageout);
+ 	(void) fputs (_("  -g, --gid GROUP               name or ID of the primary group of the new\n"
+-	                "                                account\n"), stderr);
++	                "                                account\n"), usageout);
+ 	(void) fputs (_("  -G, --groups GROUPS           list of supplementary groups of the new\n"
+-	                "                                account\n"), stderr);
+-	(void) fputs (_("  -h, --help                    display this help message and exit\n"), stderr);
+-	(void) fputs (_("  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"), stderr);
+-	(void) fputs (_("  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"), stderr);
++	                "                                account\n"), usageout);
++	(void) fputs (_("  -h, --help                    display this help message and exit\n"), usageout);
++	(void) fputs (_("  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"), usageout);
++	(void) fputs (_("  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"), usageout);
+ 	(void) fputs (_("  -l, --no-log-init             do not add the user to the lastlog and\n"
+-	                "                                faillog databases\n"), stderr);
+-	(void) fputs (_("  -m, --create-home             create the user's home directory\n"), stderr);
+-	(void) fputs (_("  -M, --no-create-home          do not create the user's home directory\n"), stderr);
++	                "                                faillog databases\n"), usageout);
++	(void) fputs (_("  -m, --create-home             create the user's home directory\n"), usageout);
++	(void) fputs (_("  -M, --no-create-home          do not create the user's home directory\n"), usageout);
+ 	(void) fputs (_("  -N, --no-user-group           do not create a group with the same name as\n"
+-	                "                                the user\n"), stderr);
++	                "                                the user\n"), usageout);
+ 	(void) fputs (_("  -o, --non-unique              allow to create users with duplicate\n"
+-	                "                                (non-unique) UID\n"), stderr);
+-	(void) fputs (_("  -p, --password PASSWORD       encrypted password of the new account\n"), stderr);
+-	(void) fputs (_("  -r, --system                  create a system account\n"), stderr);
+-	(void) fputs (_("  -s, --shell SHELL             login shell of the new account\n"), stderr);
+-	(void) fputs (_("  -u, --uid UID                 user ID of the new account\n"), stderr);
+-	(void) fputs (_("  -U, --user-group              create a group with the same name as the user\n"), stderr);
++	                "                                (non-unique) UID\n"), usageout);
++	(void) fputs (_("  -p, --password PASSWORD       encrypted password of the new account\n"), usageout);
++	(void) fputs (_("  -r, --system                  create a system account\n"), usageout);
++	(void) fputs (_("  -s, --shell SHELL             login shell of the new account\n"), usageout);
++	(void) fputs (_("  -u, --uid UID                 user ID of the new account\n"), usageout);
++	(void) fputs (_("  -U, --user-group              create a group with the same name as the user\n"), usageout);
+ #ifdef WITH_SELINUX
+-	(void) fputs (_("  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user mapping\n"), stderr);
++	(void) fputs (_("  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user mapping\n"), usageout);
+ #endif
+-	(void) fputs ("\n", stderr);
+-	exit (E_USAGE);
++	(void) fputs ("\n", usageout);
++	exit (status);
+ }
+ 
+ /*
+@@ -989,9 +990,9 @@
+ 		};
+ 		while ((c = getopt_long (argc, argv,
+ #ifdef WITH_SELINUX
+-		                         "b:c:d:De:f:g:G:k:K:lmMNop:rs:u:UZ:",
++		                         "b:c:d:De:f:g:G:hk:K:lmMNop:rs:u:UZ:",
+ #else
+-		                         "b:c:d:De:f:g:G:k:K:lmMNop:rs:u:U",
++		                         "b:c:d:De:f:g:G:hk:K:lmMNop:rs:u:U",
+ #endif
+ 		                         long_options, NULL)) != -1) {
+ 			switch (c) {
+@@ -1029,7 +1030,7 @@
+ 				break;
+ 			case 'D':
+ 				if (anyflag) {
+-					usage ();
++					usage (E_USAGE);
+ 				}
+ 				Dflg = true;
+ 				break;
+@@ -1066,7 +1067,7 @@
+ 					fprintf (stderr,
+ 					         _("%s: invalid numeric argument '%s'\n"),
+ 					         Prog, optarg);
+-					usage ();
++					usage (E_USAGE);
+ 				}
+ 				/*
+ 				 * -f -1 is allowed
+@@ -1106,7 +1107,7 @@
+ 				Gflg = true;
+ 				break;
+ 			case 'h':
+-				usage ();
++				usage (E_SUCCESS);
+ 				break;
+ 			case 'k':
+ 				def_template = optarg;
+@@ -1201,7 +1202,7 @@
+ 				break;
+ #endif
+ 			default:
+-				usage ();
++				usage (E_USAGE);
+ 			}
+ 			anyflag = true;
+ 		}
+@@ -1220,31 +1221,31 @@
+ 		fprintf (stderr,
+ 		         _("%s: %s flag is only allowed with the %s flag\n"),
+ 		         Prog, "-o", "-u");
+-		usage ();
++		usage (E_USAGE);
+ 	}
+ 	if (kflg && !mflg) {
+ 		fprintf (stderr,
+ 		         _("%s: %s flag is only allowed with the %s flag\n"),
+ 		         Prog, "-k", "-m");
+-		usage ();
++		usage (E_USAGE);
+ 	}
+ 	if (Uflg && gflg) {
+ 		fprintf (stderr,
+ 		         _("%s: options %s and %s conflict\n"),
+ 		         Prog, "-U", "-g");
+-		usage ();
++		usage (E_USAGE);
+ 	}
+ 	if (Uflg && Nflg) {
+ 		fprintf (stderr,
+ 		         _("%s: options %s and %s conflict\n"),
+ 		         Prog, "-U", "-N");
+-		usage ();
++		usage (E_USAGE);
+ 	}
+ 	if (mflg && Mflg) {
+ 		fprintf (stderr,
+ 		         _("%s: options %s and %s conflict\n"),
+ 		         Prog, "-m", "-M");
+-		usage ();
++		usage (E_USAGE);
+ 	}
+ 
+ 	/*
+@@ -1253,15 +1254,15 @@
+ 	 */
+ 	if (Dflg) {
+ 		if (optind != argc) {
+-			usage ();
++			usage (E_USAGE);
+ 		}
+ 
+ 		if (uflg || oflg || Gflg || dflg || cflg || mflg) {
+-			usage ();
++			usage (E_USAGE);
+ 		}
+ 	} else {
+ 		if (optind != argc - 1) {
+-			usage ();
++			usage (E_USAGE);
+ 		}
+ 
+ 		user_name = argv[optind];
+Index: src/su.c
+===================================================================
+--- src/su.c	(revision 3054)
++++ src/su.c	(revision 3055)
+@@ -323,7 +323,7 @@
+ /*
+  * usage - print command line syntax and exit
+   */
+-static void usage (void)
++static void usage (int status)
+ {
+ 	fputs (_("Usage: su [options] [LOGIN]\n"
+ 	         "\n"
+@@ -335,8 +335,8 @@
+ 	         "  --preserve-environment        do not reset environment variables, and\n"
+ 	         "                                keep the same shell\n"
+ 	         "  -s, --shell SHELL             use SHELL instead of the default in passwd\n"
+-	         "\n"), stderr);
+-	exit (E_USAGE);
++	         "\n"), status ? stderr : stdout);
++	exit (status);
+ }
+ 
+ /*
+@@ -421,7 +421,7 @@
+ 				command = optarg;
+ 				break;
+ 			case 'h':
+-				usage ();
++				usage (E_SUCCESS);
+ 				break;
+ 			case 'l':
+ 				fakelogin = true;
+@@ -438,7 +438,7 @@
+ 				shellstr = optarg;
+ 				break;
+ 			default:
+-				usage ();	/* NOT REACHED */
++				usage (E_USAGE);	/* NOT REACHED */
+ 			}
+ 		}
+ 
+Index: src/groupmod.c
+===================================================================
+--- src/groupmod.c	(revision 3054)
++++ src/groupmod.c	(revision 3055)
+@@ -93,7 +93,7 @@
+     pflg = false;		/* new encrypted password */
+ 
+ /* local function prototypes */
+-static void usage (void);
++static void usage (int status);
+ static void new_grent (struct group *);
+ 
+ #ifdef SHADOWGRP
+@@ -113,21 +113,22 @@
+  * usage - display usage message and exit
+  */
+ 
+-static void usage (void)
++static void usage (int status)
+ {
+-	(void) fprintf (stderr,
++	FILE *usageout = status ? stderr : stdout;
++	(void) fprintf (usageout,
+ 	                _("Usage: %s [options] GROUP\n"
+ 	                  "\n"
+ 	                  "Options:\n"),
+ 	                Prog);
+-	(void) fputs (_("  -g, --gid GID                 change the group ID to GID\n"), stderr);
+-	(void) fputs (_("  -h, --help                    display this help message and exit\n"), stderr);
+-	(void) fputs (_("  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"), stderr);
+-	(void) fputs (_("  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"), stderr);
++	(void) fputs (_("  -g, --gid GID                 change the group ID to GID\n"), usageout);
++	(void) fputs (_("  -h, --help                    display this help message and exit\n"), usageout);
++	(void) fputs (_("  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"), usageout);
++	(void) fputs (_("  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"), usageout);
+ 	(void) fputs (_("  -p, --password PASSWORD       change the password to this (encrypted)\n"
+-	                "                                PASSWORD\n"), stderr);
+-	(void) fputs ("\n", stderr);
+-	exit (E_USAGE);
++	                "                                PASSWORD\n"), usageout);
++	(void) fputs ("\n", usageout);
++	exit (status);
+ }
+ 
+ /*
+@@ -362,6 +363,8 @@
+ 				exit (E_BAD_ARG);
+ 			}
+ 			break;
++		case 'h':
++			usage (E_SUCCESS);
+ 		case 'n':
+ 			nflg = true;
+ 			group_newname = optarg;
+@@ -374,16 +377,16 @@
+ 			pflg = true;
+ 			break;
+ 		default:
+-			usage ();
++			usage (E_USAGE);
+ 		}
+ 	}
+ 
+ 	if (oflg && !gflg) {
+-		usage ();
++		usage (E_USAGE);
+ 	}
+ 
+ 	if (optind != (argc - 1)) {
+-		usage ();
++		usage (E_USAGE);
+ 	}
+ 
+ 	group_name = argv[argc - 1];
+Index: src/passwd.c
+===================================================================
+--- src/passwd.c	(revision 3054)
++++ src/passwd.c	(revision 3055)
+@@ -180,7 +180,7 @@
+ 	         "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+ 	         "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
+ 	         "                                change to MAX_DAYS\n"
+-	         "\n"), stderr);
++	         "\n"), status ? stderr : stdout);
+ 	exit (status);
+ }
+ 
+@@ -811,7 +811,7 @@
+ 			{NULL, 0, NULL, '\0'}
+ 		};
+ 
+-		while ((c = getopt_long (argc, argv, "adei:kln:qr:Suw:x:",
++		while ((c = getopt_long (argc, argv, "adehi:kln:qr:Suw:x:",
+ 		                         long_options, &option_index)) != -1) {
+ 			switch (c) {
+ 			case 'a':
+@@ -897,6 +897,8 @@
+ 				xflg = true;
+ 				anyflag = true;
+ 				break;
++			case 'h':
++				usage (E_SUCCESS);
+ 			default:
+ 				usage (E_BAD_ARG);
+ 			}
+Index: src/groupadd.c
+===================================================================
+--- src/groupadd.c	(revision 3054)
++++ src/groupadd.c	(revision 3055)
+@@ -88,7 +88,7 @@
+ #endif
+ 
+ /* local function prototypes */
+-static void usage (void);
++static void usage (int status);
+ static void new_grent (struct group *grent);
+ 
+ #ifdef SHADOWGRP
+@@ -105,24 +105,25 @@
+ /*
+  * usage - display usage message and exit
+  */
+-static void usage (void)
++static void usage (int status)
+ {
+-	(void) fprintf (stderr,
++	FILE *usageout = status ? stderr : stdout;
++	(void) fprintf (usageout,
+ 	                _("Usage: %s [options] GROUP\n"
+ 	                  "\n"
+ 	                  "Options:\n"),
+ 	                Prog);
+ 	(void) fputs (_("  -f, --force                   exit successfully if the group already exists,\n"
+-	                "                                and cancel -g if the GID is already used\n"), stderr);
+-	(void) fputs (_("  -g, --gid GID                 use GID for the new group\n"), stderr);
+-	(void) fputs (_("  -h, --help                    display this help message and exit\n"), stderr);
+-	(void) fputs (_("  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"), stderr);
++	                "                                and cancel -g if the GID is already used\n"), usageout);
++	(void) fputs (_("  -g, --gid GID                 use GID for the new group\n"), usageout);
++	(void) fputs (_("  -h, --help                    display this help message and exit\n"), usageout);
++	(void) fputs (_("  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"), usageout);
+ 	(void) fputs (_("  -o, --non-unique              allow to create groups with duplicate\n"
+-	                "                                (non-unique) GID\n"), stderr);
+-	(void) fputs (_("  -p, --password PASSWORD       use this encrypted password for the new group\n"), stderr);
+-	(void) fputs (_("  -r, --system                  create a system account\n"), stderr);
+-	(void) fputs ("\n", stderr);
+-	exit (E_USAGE);
++	                "                                (non-unique) GID\n"), usageout);
++	(void) fputs (_("  -p, --password PASSWORD       use this encrypted password for the new group\n"), usageout);
++	(void) fputs (_("  -r, --system                  create a system account\n"), usageout);
++	(void) fputs ("\n", usageout);
++	exit (status);
+ }
+ 
+ /*
+@@ -412,7 +413,7 @@
+ 			}
+ 			break;
+ 		case 'h':
+-			usage ();
++			usage (E_SUCCESS);
+ 			break;
+ 		case 'K':
+ 			/*
+@@ -444,7 +445,7 @@
+ 			rflg = true;
+ 			break;
+ 		default:
+-			usage ();
++			usage (E_USAGE);
+ 		}
+ 	}
+ 
+@@ -452,7 +453,7 @@
+ 	 * Check the flags consistency
+ 	 */
+ 	if (optind != argc - 1) {
+-		usage ();
++		usage (E_USAGE);
+ 	}
+ 	group_name = argv[optind];
+ 
+@@ -468,7 +469,7 @@
+ {
+ 	/* -o does not make sense without -g */
+ 	if (oflg && !gflg) {
+-		usage ();
++		usage (E_USAGE);
+ 	}
+ 
+ 	check_new_name ();
+Index: src/chage.c
+===================================================================
+--- src/chage.c	(revision 3054)
++++ src/chage.c	(revision 3055)
+@@ -91,7 +91,7 @@
+ 
+ /* local function prototypes */
+ static bool isnum (const char *s);
+-static void usage (void);
++static void usage (int status);
+ static void date_to_str (char *buf, size_t maxsize, time_t date);
+ static int new_fields (void);
+ static void print_date (time_t date);
+@@ -152,7 +152,7 @@
+ /*
+  * usage - print command line syntax and exit
+  */
+-static void usage (void)
++static void usage (int status)
+ {
+ 	fputs (_("Usage: chage [options] [LOGIN]\n"
+ 	         "\n"
+@@ -168,8 +168,8 @@
+ 	         "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
+ 	         "                                change to MAX_DAYS\n"
+ 	         "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+-	         "\n"), stderr);
+-	exit (E_USAGE);
++	         "\n"), status ? stderr : stdout);
++	exit (status);
+ }
+ 
+ static void date_to_str (char *buf, size_t maxsize, time_t date)
+@@ -413,7 +413,7 @@
+ 				fprintf (stderr,
+ 				         _("%s: invalid date '%s'\n"),
+ 				         Prog, optarg);
+-				usage ();
++				usage (E_USAGE);
+ 			}
+ 			break;
+ 		case 'E':
+@@ -425,11 +425,11 @@
+ 				fprintf (stderr,
+ 				         _("%s: invalid date '%s'\n"),
+ 				         Prog, optarg);
+-				usage ();
++				usage (E_USAGE);
+ 			}
+ 			break;
+ 		case 'h':
+-			usage ();
++			usage (E_SUCCESS);
+ 			break;
+ 		case 'I':
+ 			Iflg = true;
+@@ -438,7 +438,7 @@
+ 				fprintf (stderr,
+ 				         _("%s: invalid numeric argument '%s'\n"),
+ 				         Prog, optarg);
+-				usage ();
++				usage (E_USAGE);
+ 			}
+ 			break;
+ 		case 'l':
+@@ -451,7 +451,7 @@
+ 				fprintf (stderr,
+ 				         _("%s: invalid numeric argument '%s'\n"),
+ 				         Prog, optarg);
+-				usage ();
++				usage (E_USAGE);
+ 			}
+ 			break;
+ 		case 'M':
+@@ -461,7 +461,7 @@
+ 				fprintf (stderr,
+ 				         _("%s: invalid numeric argument '%s'\n"),
+ 				         Prog, optarg);
+-				usage ();
++				usage (E_USAGE);
+ 			}
+ 			break;
+ 		case 'W':
+@@ -471,11 +471,11 @@
+ 				fprintf (stderr,
+ 				         _("%s: invalid numeric argument '%s'\n"),
+ 				         Prog, optarg);
+-				usage ();
++				usage (E_USAGE);
+ 			}
+ 			break;
+ 		default:
+-			usage ();
++			usage (E_USAGE);
+ 		}
+ 	}
+ 
+@@ -495,14 +495,14 @@
+ 	 */
+ 
+ 	if (argc != opt_index + 1) {
+-		usage ();
++		usage (E_USAGE);
+ 	}
+ 
+ 	if (lflg && (mflg || Mflg || dflg || Wflg || Iflg || Eflg)) {
+ 		fprintf (stderr,
+ 		         _("%s: do not include \"l\" with other flags\n"),
+ 		         Prog);
+-		usage ();
++		usage (E_USAGE);
+ 	}
+ }
+ 
+Index: src/faillog.c
+===================================================================
+--- src/faillog.c	(revision 3054)
++++ src/faillog.c	(revision 3055)
+@@ -47,6 +47,17 @@
+ /*@-exitarg@*/
+ #include "exitcodes.h"
+ 
++/* local function prototypes */
++static void usage (int status);
++static void print_one (/*@null@*/const struct passwd *pw, bool force);
++static void set_locktime (long locktime);
++static bool set_locktime_one (uid_t uid, long locktime);
++static void setmax (int max);
++static bool setmax_one (uid_t uid, int max);
++static void print (void);
++static bool reset_one (uid_t uid);
++static void reset (void);
++
+ /*
+  * Global variables
+  */
+@@ -69,24 +80,25 @@
+ 
+ #define	NOW	(time((time_t *) 0))
+ 
+-static void usage (void)
++static void usage (int status)
+ {
+-	(void) fprintf (stderr,
++	FILE *usageout = status ? stderr : stdout;
++	(void) fprintf (usageout,
+ 	                _("Usage: %s [options]\n"
+ 	                  "\n"
+ 	                  "Options:\n"),
+ 	                "faillog");
+-	(void) fputs (_("  -a, --all                     display faillog records for all users\n"), stderr);
+-	(void) fputs (_("  -h, --help                    display this help message and exit\n"), stderr);
+-	(void) fputs (_("  -l, --lock-time SEC           after failed login lock account for SEC seconds\n"), stderr);
+-	(void) fputs (_("  -m, --maximum MAX             set maximum failed login counters to MAX\n"), stderr);
+-	(void) fputs (_("  -r, --reset                   reset the counters of login failures\n"), stderr);
+-	(void) fputs (_("  -t, --time DAYS               display faillog records more recent than DAYS\n"), stderr);
++	(void) fputs (_("  -a, --all                     display faillog records for all users\n"), usageout);
++	(void) fputs (_("  -h, --help                    display this help message and exit\n"), usageout);
++	(void) fputs (_("  -l, --lock-time SEC           after failed login lock account for SEC seconds\n"), usageout);
++	(void) fputs (_("  -m, --maximum MAX             set maximum failed login counters to MAX\n"), usageout);
++	(void) fputs (_("  -r, --reset                   reset the counters of login failures\n"), usageout);
++	(void) fputs (_("  -t, --time DAYS               display faillog records more recent than DAYS\n"), usageout);
+ 	(void) fputs (_("  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+ 	                "                                counters and limits (if used with -r, -m,\n"
+-	                "                                or -l) only for the specified LOGIN(s)\n"), stderr);
+-	(void) fputs ("\n", stderr);
+-	exit (E_USAGE);
++	                "                                or -l) only for the specified LOGIN(s)\n"), usageout);
++	(void) fputs ("\n", usageout);
++	exit (status);
+ }
+ 
+ static void print_one (/*@null@*/const struct passwd *pw, bool force)
+@@ -495,7 +507,7 @@
+ 				aflg = true;
+ 				break;
+ 			case 'h':
+-				usage ();
++				usage (E_SUCCESS);
+ 				break;
+ 			case 'l':
+ 				if (getlong (optarg, &fail_locktime) == 0) {
+@@ -561,16 +573,16 @@
+ 				break;
+ 			}
+ 			default:
+-				usage ();
++				usage (E_USAGE);
+ 			}
+ 		}
+ 	}
+ 
+ 	if (aflg && uflg) {
+-		usage ();
++		usage (E_USAGE);
+ 	}
+ 	if (tflg && (lflg || mflg || rflg)) {
+-		usage ();
++		usage (E_USAGE);
+ 	}
+ 
+ 	/* Open the faillog database */
+Index: src/chsh.c
+===================================================================
+--- src/chsh.c	(revision 3054)
++++ src/chsh.c	(revision 3055)
+@@ -72,7 +72,7 @@
+ 
+ /* local function prototypes */
+ static void fail_exit (int code);
+-static void usage (void);
++static void usage (int status);
+ static void new_fields (void);
+ static bool shell_is_listed (const char *);
+ static bool is_restricted_shell (const char *);
+@@ -101,15 +101,15 @@
+ /*
+  * usage - print command line syntax and exit
+  */
+-static void usage (void)
++static void usage (int status)
+ {
+ 	fputs (_("Usage: chsh [options] [LOGIN]\n"
+ 	         "\n"
+ 	         "Options:\n"
+ 	         "  -h, --help                    display this help message and exit\n"
+ 	         "  -s, --shell SHELL             new login shell for the user account\n"
+-	         "\n"), stderr);
+-	exit (E_USAGE);
++	         "\n"), status ? stderr : stdout);
++	exit (status);
+ }
+ 
+ /*
+@@ -217,14 +217,14 @@
+ 		             &option_index)) != -1) {
+ 		switch (c) {
+ 		case 'h':
+-			usage ();
++			usage (E_SUCCESS);
+ 			break;
+ 		case 's':
+ 			sflg = true;
+ 			STRFCPY (loginsh, optarg);
+ 			break;
+ 		default:
+-			usage ();
++			usage (E_USAGE);
+ 		}
+ 	}
+ 
+@@ -233,7 +233,7 @@
+ 	 * be the user's name.
+ 	 */
+ 	if (argc > (optind + 1)) {
+-		usage ();
++		usage (E_USAGE);
+ 	}
+ }
+ 
+Index: man/groupmems.8.xml
+===================================================================
+--- man/groupmems.8.xml	(revision 3054)
++++ man/groupmems.8.xml	(revision 3055)
+@@ -114,6 +114,12 @@
+ 	</listitem>
+       </varlistentry>
+       <varlistentry>
++	<term><option>-h</option>, <option>--help</option></term>
++	<listitem>
++	  <para>Display help message and exit.</para>
++	</listitem>
++      </varlistentry>
++      <varlistentry>
+ 	<term><option>-l</option>, <option>--list</option></term>
+ 	<listitem>
+ 	  <para>List the group membership list.</para>
+Index: man/gpasswd.1.xml
+===================================================================
+--- man/gpasswd.1.xml	(revision 3054)
++++ man/gpasswd.1.xml	(revision 3055)
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!--
+    Copyright (c) 1996       , Rafal Maszkowski
+-   Copyright (c) 2007 - 2008, Nicolas François
++   Copyright (c) 2007 - 2009, Nicolas François
+    All rights reserved.
+   
+    Redistribution and use in source and binary forms, with or without
+@@ -148,6 +148,14 @@
+     </variablelist>
+     <variablelist remap='IP'>
+       <varlistentry>
++	<term><option>-h</option>, <option>--help</option></term>
++	<listitem>
++	  <para>Display help message and exit.</para>
++	</listitem>
++      </varlistentry>
++    </variablelist>
++    <variablelist remap='IP'>
++      <varlistentry>
+ 	<term>
+ 	  <option>-r</option>, <option>--remove-password</option>
+ 	</term>
+Index: NEWS
+===================================================================
+--- NEWS	(revision 3054)
++++ NEWS	(revision 3055)
+@@ -1,5 +1,11 @@
+ $Id$
+ 
++shadow-4.1.4.1 -> shadow-4.1.4.2						UNRELEASED
++
++- general
++  * report usage error to stderr, but report usage help to stdout (and return
++    zero) when explicitly requested (e.g. with --help).
++
+ shadow-4.1.4.1 -> shadow-4.1.4.2						2009-07-24
+ 
+ - general
diff --git a/source/a/shadow/patches/r3060.diff b/source/a/shadow/patches/r3060.diff
new file mode 100644
index 00000000..8ece6430
--- /dev/null
+++ b/source/a/shadow/patches/r3060.diff
@@ -0,0 +1,116 @@
+* libmisc/copydir.c, lib/shadowmem.c, lib/groupmem.c, lib/pwmem.c:
+Fix some memory leaks.
+
+Index: libmisc/copydir.c
+===================================================================
+--- libmisc/copydir.c	(revision 3059)
++++ libmisc/copydir.c	(revision 3060)
+@@ -443,6 +443,7 @@
+ 		nchars = readlink (filename, buffer, size);
+ 
+ 		if (nchars < 0) {
++			free(buffer);
+ 			return NULL;
+ 		}
+ 
+
+Index: lib/shadowmem.c
+===================================================================
+--- lib/shadowmem.c	(revision 3059)
++++ lib/shadowmem.c	(revision 3060)
+@@ -52,10 +52,13 @@
+ 	*sp = *spent;
+ 	sp->sp_namp = strdup (spent->sp_namp);
+ 	if (NULL == sp->sp_namp) {
++		free(sp);
+ 		return NULL;
+ 	}
+ 	sp->sp_pwdp = strdup (spent->sp_pwdp);
+ 	if (NULL == sp->sp_pwdp) {
++		free(sp->sp_namp);
++		free(sp);
+ 		return NULL;
+ 	}
+ 
+Index: lib/groupmem.c
+===================================================================
+--- lib/groupmem.c	(revision 3059)
++++ lib/groupmem.c	(revision 3060)
+@@ -51,10 +51,13 @@
+ 	*gr = *grent;
+ 	gr->gr_name = strdup (grent->gr_name);
+ 	if (NULL == gr->gr_name) {
++		free(gr);
+ 		return NULL;
+ 	}
+ 	gr->gr_passwd = strdup (grent->gr_passwd);
+ 	if (NULL == gr->gr_passwd) {
++		free(gr->gr_name);
++		free(gr);
+ 		return NULL;
+ 	}
+ 
+@@ -62,11 +65,21 @@
+ 
+ 	gr->gr_mem = (char **) malloc ((i + 1) * sizeof (char *));
+ 	if (NULL == gr->gr_mem) {
++		free(gr->gr_passwd);
++		free(gr->gr_name);
++		free(gr);
+ 		return NULL;
+ 	}
+ 	for (i = 0; grent->gr_mem[i]; i++) {
+ 		gr->gr_mem[i] = strdup (grent->gr_mem[i]);
+ 		if (NULL == gr->gr_mem[i]) {
++			int j;
++			for (j=0; j<i; j++)
++				free(gr->gr_mem[j]);
++			free(gr->gr_mem);
++			free(gr->gr_passwd);
++			free(gr->gr_name);
++			free(gr);
+ 			return NULL;
+ 		}
+ 	}
+Index: lib/pwmem.c
+===================================================================
+--- lib/pwmem.c	(revision 3059)
++++ lib/pwmem.c	(revision 3060)
+@@ -51,22 +51,37 @@
+ 	*pw = *pwent;
+ 	pw->pw_name = strdup (pwent->pw_name);
+ 	if (NULL == pw->pw_name) {
++		free(pw);
+ 		return NULL;
+ 	}
+ 	pw->pw_passwd = strdup (pwent->pw_passwd);
+ 	if (NULL == pw->pw_passwd) {
++		free(pw->pw_name);
++		free(pw);
+ 		return NULL;
+ 	}
+ 	pw->pw_gecos = strdup (pwent->pw_gecos);
+ 	if (NULL == pw->pw_gecos) {
++		free(pw->pw_passwd);
++		free(pw->pw_name);
++		free(pw);
+ 		return NULL;
+ 	}
+ 	pw->pw_dir = strdup (pwent->pw_dir);
+ 	if (NULL == pw->pw_dir) {
++		free(pw->pw_gecos);
++		free(pw->pw_passwd);
++		free(pw->pw_name);
++		free(pw);
+ 		return NULL;
+ 	}
+ 	pw->pw_shell = strdup (pwent->pw_shell);
+ 	if (NULL == pw->pw_shell) {
++		free(pw->pw_dir);
++		free(pw->pw_gecos);
++		free(pw->pw_passwd);
++		free(pw->pw_name);
++		free(pw);
+ 		return NULL;
+ 	}
+ 
diff --git a/source/a/shadow/patches/r3062.diff b/source/a/shadow/patches/r3062.diff
new file mode 100644
index 00000000..00d9ba3a
--- /dev/null
+++ b/source/a/shadow/patches/r3062.diff
@@ -0,0 +1,139 @@
+Index: lib/shadowmem.c
+===================================================================
+--- lib/shadowmem.c	(revision 3061)
++++ lib/shadowmem.c	(revision 3062)
+@@ -49,8 +49,14 @@
+ 	if (NULL == sp) {
+ 		return NULL;
+ 	}
+-	*sp = *spent;
+-	sp->sp_namp = strdup (spent->sp_namp);
++	sp->sp_lstchg = spent->sp_lstchg;
++	sp->sp_min    = spent->sp_min;
++	sp->sp_max    = spent->sp_max;
++	sp->sp_warn   = spent->sp_warn;
++	sp->sp_inact  = spent->sp_inact;
++	sp->sp_expire = spent->sp_expire;
++	sp->sp_flag   = spent->sp_flag;
++	sp->sp_namp   = strdup (spent->sp_namp);
+ 	if (NULL == sp->sp_namp) {
+ 		free(sp);
+ 		return NULL;
+@@ -68,8 +74,10 @@
+ void spw_free (/*@out@*/ /*@only@*/struct spwd *spent)
+ {
+ 	free (spent->sp_namp);
+-	memzero (spent->sp_pwdp, strlen (spent->sp_pwdp));
+-	free (spent->sp_pwdp);
++	if (NULL != spent->sp_pwdp) {
++		memzero (spent->sp_pwdp, strlen (spent->sp_pwdp));
++		free (spent->sp_pwdp);
++	}
+ 	free (spent);
+ }
+ 
+Index: lib/groupmem.c
+===================================================================
+--- lib/groupmem.c	(revision 3061)
++++ lib/groupmem.c	(revision 3062)
+@@ -48,7 +48,7 @@
+ 	if (NULL == gr) {
+ 		return NULL;
+ 	}
+-	*gr = *grent;
++	gr->gr_gid = grent->gr_gid;
+ 	gr->gr_name = strdup (grent->gr_name);
+ 	if (NULL == gr->gr_name) {
+ 		free(gr);
+@@ -90,13 +90,18 @@
+ 
+ void gr_free (/*@out@*/ /*@only@*/struct group *grent)
+ {
++	size_t i;
+ 	free (grent->gr_name);
+-	memzero (grent->gr_passwd, strlen (grent->gr_passwd));
+-	free (grent->gr_passwd);
+-	while (*(grent->gr_mem)) {
+-		free (*(grent->gr_mem));
+-		grent->gr_mem++;
++	if (NULL != grent->gr_passwd) {
++		memzero (grent->gr_passwd, strlen (grent->gr_passwd));
++		free (grent->gr_passwd);
+ 	}
++	if (NULL != grent->gr_mem) {
++		for (i = 0; NULL != grent->gr_mem[i]; i++) {
++			free (grent->gr_mem[i]);
++		}
++		free (grent->gr_mem);
++	}
+ 	free (grent);
+ }
+ 
+Index: lib/sgroupio.c
+===================================================================
+--- lib/sgroupio.c	(revision 3061)
++++ lib/sgroupio.c	(revision 3062)
+@@ -51,7 +51,6 @@
+ 	if (NULL == sg) {
+ 		return NULL;
+ 	}
+-	*sg = *sgent;
+ 	sg->sg_name = strdup (sgent->sg_name);
+ 	if (NULL == sg->sg_name) {
+ 		free (sg);
+@@ -137,17 +136,20 @@
+ 
+ void sgr_free (/*@out@*/ /*@only@*/struct sgrp *sgent)
+ {
++	size_t i;
+ 	free (sgent->sg_name);
+-	memzero (sgent->sg_passwd, strlen (sgent->sg_passwd));
+-	free (sgent->sg_passwd);
+-	while (NULL != *(sgent->sg_adm)) {
+-		free (*(sgent->sg_adm));
+-		sgent->sg_adm++;
++	if (NULL != sgent->sg_passwd) {
++		memzero (sgent->sg_passwd, strlen (sgent->sg_passwd));
++		free (sgent->sg_passwd);
+ 	}
+-	while (NULL != *(sgent->sg_mem)) {
+-		free (*(sgent->sg_mem));
+-		sgent->sg_mem++;
++	for (i = 0; NULL != sgent->sg_adm[i]; i++) {
++		free (sgent->sg_adm[i]);
+ 	}
++	free (sgent->sg_adm);
++	for (i = 0; NULL != sgent->sg_mem[i]; i++) {
++		free (sgent->sg_mem[i]);
++	}
++	free (sgent->sg_mem);
+ 	free (sgent);
+ }
+ 
+Index: lib/pwmem.c
+===================================================================
+--- lib/pwmem.c	(revision 3061)
++++ lib/pwmem.c	(revision 3062)
+@@ -48,7 +48,8 @@
+ 	if (NULL == pw) {
+ 		return NULL;
+ 	}
+-	*pw = *pwent;
++	pw->pw_uid = pwent->pw_uid;
++	pw->pw_gid = pwent->pw_gid;
+ 	pw->pw_name = strdup (pwent->pw_name);
+ 	if (NULL == pw->pw_name) {
+ 		free(pw);
+@@ -91,8 +92,10 @@
+ void pw_free (/*@out@*/ /*@only@*/struct passwd *pwent)
+ {
+ 	free (pwent->pw_name);
+-	memzero (pwent->pw_passwd, strlen (pwent->pw_passwd));
+-	free (pwent->pw_passwd);
++	if (pwent->pw_passwd) {
++		memzero (pwent->pw_passwd, strlen (pwent->pw_passwd));
++		free (pwent->pw_passwd);
++	}
+ 	free (pwent->pw_gecos);
+ 	free (pwent->pw_dir);
+ 	free (pwent->pw_shell);
diff --git a/source/a/shadow/patches/r3096.diff b/source/a/shadow/patches/r3096.diff
new file mode 100644
index 00000000..0e77ce6f
--- /dev/null
+++ b/source/a/shadow/patches/r3096.diff
@@ -0,0 +1,27 @@
+
+* lib/gshadow.c: Fix parsing of gshadow entries.
+
+Index: lib/gshadow.c
+===================================================================
+--- lib/gshadow.c	(revision 3095)
++++ lib/gshadow.c	(revision 3096)
+@@ -222,6 +222,7 @@
+ 		if (NULL == buf) {
+ 			return NULL;
+ 		}
++		buflen = BUFSIZ;
+ 	}
+ 
+ 	if (NULL == fp) {
+@@ -229,9 +230,9 @@
+ 	}
+ 
+ #ifdef	USE_NIS
+-	while (fgetsx (buf, (int) sizeof buf, fp) == buf)
++	while (fgetsx (buf, (int) buflen, fp) == buf)
+ #else
+-	if (fgetsx (buf, (int) sizeof buf, fp) == buf)
++	if (fgetsx (buf, (int) buflen, fp) == buf)
+ #endif
+ 	{
+ 		while (   ((cp = strrchr (buf, '\n')) == NULL)
diff --git a/source/a/shadow/patches/r3160.diff b/source/a/shadow/patches/r3160.diff
new file mode 100644
index 00000000..5aabbaa9
--- /dev/null
+++ b/source/a/shadow/patches/r3160.diff
@@ -0,0 +1,239 @@
+Index: libmisc/limits.c
+===================================================================
+--- libmisc/limits.c	(revision 3159)
++++ libmisc/limits.c	(revision 3160)
+@@ -33,6 +33,7 @@
+ /*
+  * Separated from setup.c.  --marekm
+  * Resource limits thanks to Cristian Gafton.
++ * Enhancements of resource limit code by Thomas Orgis <thomas@orgis.org> ("thor").
+  */
+ 
+ #include <config.h>
+@@ -44,6 +45,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <stdio.h>
++#include <ctype.h>
+ #include "prototypes.h"
+ #include "defines.h"
+ #include <pwd.h>
+@@ -69,17 +71,37 @@
+ 		 unsigned int multiplier)
+ {
+ 	struct rlimit rlim;
+-	long limit;
++	rlim_t limit;
+ 
+-	if (getlong (value, &limit) == 0) {
+-		return 0;
++	/* The "-" is special, not belonging to a strange negative limit.
++	   It is infinity, in a controlled way. --thor */
++	if(value[0] == '-') {
++		limit = RLIM_INFINITY;
+ 	}
+-	limit *= multiplier;
+-	if (limit != (rlim_t) limit) {
+-		return 0;
++	else {
++		/* We cannot use getlong here because it fails when there
++		   is more to the value than just this number!
++		   Also, we are limited to base 10 here (hex numbers will not
++		   work with the limit string parser as is anyway) --thor */
++		char *endptr;
++		long longlimit = strtol(value, &endptr, 10);
++		if ((0 == longlimit) && (value == endptr)) {
++			/* No argument at all. No-op.
++			   We could instead throw an error, though. --thor */
++			return 0;
++		}
++		longlimit *= multiplier;
++		limit = (rlim_t)longlimit;
++		if(longlimit != limit)
++		{
++			/* Again, silent error handling... I left it that way.
++			   Wouldn't screaming make more sense? --thor */
++			return 0;
++		}
+ 	}
+-	rlim.rlim_cur = (rlim_t) limit;
+-	rlim.rlim_max = (rlim_t) limit;
++
++	rlim.rlim_cur = limit;
++	rlim.rlim_max = limit;
+ 	if (setrlimit (resource, &rlim) != 0) {
+ 		return LOGIN_ERROR_RLIMIT;
+ 	}
+@@ -199,6 +221,9 @@
+  * [Ii]: i = RLIMIT_NICE    max nice value (0..39 translates to 20..-19)
+  * [Oo]: o = RLIMIT_RTPRIO  max real time priority (linux/sched.h 0..MAX_RT_PRIO)
+  *
++ * Remember to extend the "no-limits" string below when adding a new limit...
++ *   --thor
++ *
+  * Return value:
+  *		0 = okay, of course
+  *		LOGIN_ERROR_RLIMIT = error setting some RLIMIT
+@@ -214,7 +239,20 @@
+ 	bool reported = false;
+ 
+ 	pp = buf;
++	/* Skip leading whitespace. --thor */
++	while(*pp == ' ' || *pp == '\t') ++pp;
+ 
++	/* The special limit string "-" results in no limit for all known limits.
++	   We achieve that by parsing a full limit string, parts of it being ignored
++	   if a limit type is not known to the system.
++	   Though, there will be complaining for unknown limit types. --thor */
++	if(strcmp(pp, "-") == 0) {
++		/* Remember to extend this, too, when adding new limits!
++		   Oh... but "unlimited" does not make sense for umask, or does it?
++		   --thor */
++		pp = "A- C- D- F- M- N- R- S- T- P- I- O-";
++	}
++
+ 	while ('\0' != *pp) {
+ 		switch (*pp++) {
+ #ifdef RLIMIT_AS
+@@ -316,6 +354,10 @@
+ 			break;
+ 		default:
+ 			/* Only report invalid strings once */
++			/* Note: A string can be invalid just because a specific (theoretically
++			   valid) setting is not supported by this build.
++			   It is just a warning in syslog anyway. The line is still processed
++			   --thor */
+ 			if (!reported) {
+ 				SYSLOG ((LOG_WARN,
+ 				         "Invalid limit string: '%s'",
+@@ -324,13 +366,51 @@
+ 				retval |= LOGIN_ERROR_RLIMIT;
+ 			}
+ 		}
++		/* After parsing one limit setting (or just complaining about it),
++		   one still needs to skip its argument to prevent a bogus warning on
++		   trying to parse that as limit specification.
++		   So, let's skip all digits, "-" and our limited set of whitespace.
++		   --thor */
++		while(isdigit(*pp) || *pp == '-' || *pp == ' ' || *pp == '\t') {
++			++pp;
++		}
+ 	}
+ 	return retval;
+ }
+ 
++/* Check if user uname is in the group gname.
++ * Can I be sure that gr_mem contains no UID as string?
++ * Returns true when user is in the group, false when not.
++ * Any error is treated as false. --thor
++ */
++static bool user_in_group (const char *uname, const char *gname)
++{
++	struct group *groupdata;
++	char **member;
++	if(uname == NULL || gname == NULL){ 
++		return false;
++	}
++	/* We are not claiming to be re-entrant!
++	 * In case of paranoia or a multithreaded login program,
++	 * one needs to add some mess for getgrnam_r. */
++	groupdata = getgrnam(gname);
++	if(groupdata == NULL) {
++		SYSLOG ((LOG_WARN, "Nonexisting group `%s' in limits file.", gname));
++		return false;
++	}
++	/* Now look for our user in the list of members. */
++	member = groupdata->gr_mem;
++	while(*member != NULL) {
++		if(strcmp(*member, uname) == 0) {
++			return true;
++		}
++		++member;
++	}
++	return false;
++}
++
+ static int setup_user_limits (const char *uname)
+ {
+-	/* TODO: allow and use @group syntax --cristiang */
+ 	FILE *fil;
+ 	char buf[1024];
+ 	char name[1024];
+@@ -352,7 +432,7 @@
+ 	}
+ 	/* The limits file have the following format:
+ 	 * - '#' (comment) chars only as first chars on a line;
+-	 * - username must start on first column
++	 * - username must start on first column (or *, or @group --thor)
+ 	 * A better (smarter) checking should be done --cristiang */
+ 	while (fgets (buf, 1024, fil) != NULL) {
+ 		if (('#' == buf[0]) || ('\n' == buf[0])) {
+@@ -367,6 +447,13 @@
+ 		 * Imposing a limit should be done with care, so a wrong
+ 		 * entry means no care anyway :-). A '-' as a limits
+ 		 * strings means no limits --cristiang */
++		/* In addition to the handling of * as name which was alrady present,
++		   I added handling of the @group syntax.
++		   To clarify: The first entry with matching user name rules,
++		   everything after it is ignored. If there is no user entry,
++		   the last encountered entry for a matching group rules.
++		   If there is no matching group entry, the default limits rule.
++		      --thor. */
+ 		if (sscanf (buf, "%s%[ACDFMNRSTULPIOacdfmnrstulpio0-9 \t-]",
+ 			    name, tempbuf) == 2) {
+ 			if (strcmp (name, uname) == 0) {
+@@ -374,6 +461,12 @@
+ 				break;
+ 			} else if (strcmp (name, "*") == 0) {
+ 				strcpy (deflimits, tempbuf);
++			} else if (name[0] == '@') {
++				/* If the user is in the group, the group limits apply unless
++				   later a line for the specific user is found. --thor */
++				if(user_in_group(uname, name+1)) {
++					strcpy (limits, tempbuf);
++				}
+ 			}
+ 		}
+ 	}
+Index: man/limits.5.xml
+===================================================================
+--- man/limits.5.xml	(revision 3159)
++++ man/limits.5.xml	(revision 3160)
+@@ -64,7 +64,13 @@
+       <emphasis remap='I'>user LIMITS_STRING</emphasis>
+     </para>
+ 
++    <para>or in the form:</para>
++
+     <para>
++      <emphasis remap='I'>@group LIMITS_STRING</emphasis>
++    </para>
++
++    <para>
+       The <emphasis>LIMITS_STRING</emphasis> is a string of a concatenated
+       list of resource limits. Each limit consists of a letter identifier
+       followed by a numerical limit.
+@@ -125,11 +131,23 @@
+     </para>
+ 
+     <para>
++      The limits specified in the form "<replaceable>@group</replaceable>"
++      apply to the members of the specified
++      <replaceable>group</replaceable>.
++    </para>
++
++    <para>
+       To completely disable limits for a user, a single dash
+       "<emphasis>-</emphasis>" will do.
+     </para>
+ 
+     <para>
++      To disable a limit for a user, a single dash
++      "<replaceable>-</replaceable>" can be used instead of the numerical
++      value for this limit.
++    </para>
++
++    <para>
+       Also, please note that all limit settings are set PER LOGIN. They are
+       not global, nor are they permanent. Perhaps global limits will come,
+       but for now this will have to do ;)
diff --git a/source/a/shadow/patches/r3194.diff b/source/a/shadow/patches/r3194.diff
new file mode 100644
index 00000000..0eff631b
--- /dev/null
+++ b/source/a/shadow/patches/r3194.diff
@@ -0,0 +1,15 @@
+* src/su.c: shell's name must be -su when a su fakes a login.
+
+===================================================================
+--- src/su.c	(revision 3193)
++++ src/su.c	(revision 3194)
+@@ -1021,7 +1021,7 @@
+ 		 * Use the shell and create an argv
+ 		 * with the rest of the command line included.
+ 		 */
+-		argv[-1] = shellstr;
++		argv[-1] = cp;
+ #ifndef USE_PAM
+ 		execve_shell (shellstr, &argv[-1], environ);
+ 		err = errno;
+ 
diff --git a/source/a/shadow/patches/r3299.diff b/source/a/shadow/patches/r3299.diff
new file mode 100644
index 00000000..a46b18f0
--- /dev/null
+++ b/source/a/shadow/patches/r3299.diff
@@ -0,0 +1,12 @@
+Index: man/ru/Makefile.am
+===================================================================
+--- man/ru/Makefile.am	(revision 3298)
++++ man/ru/Makefile.am	(revision 3299)
+@@ -1,7 +1,6 @@
+ mandir = @mandir@/ru
+ 
+ man_MANS = \
+-	$(man_nopam) \
+ 	chage.1 \
+ 	chfn.1 \
+ 	chgpasswd.8 \
diff --git a/source/a/shadow/shadow.SlackBuild b/source/a/shadow/shadow.SlackBuild
index 77e34089..c3d2e9c7 100755
--- a/source/a/shadow/shadow.SlackBuild
+++ b/source/a/shadow/shadow.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,10 +20,9 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=4.1.4.2
-BUILD=${BUILD:-3}
-
-NUMJOBS=${NUMJOBS:--j6}
+PKGNAM=shadow
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -35,6 +34,8 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+NUMJOBS=${NUMJOBS:--j6}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-shadow
@@ -56,6 +57,15 @@ rm -rf shadow-$VERSION
 tar xvf $CWD/shadow-$VERSION.tar.?z* || exit 1
 cd shadow-$VERSION
 
+# Apply some patches taken from the svn trunk that
+# fix some of the more serious bugs in 4.1.4.3:
+for patch in $CWD/patches/*.diff.gz ; do
+  zcat $patch | patch -p0 --verbose || exit 1
+done
+
+# Re-run automake because of r3299 patch to man/ru/Makefile.am:
+automake -f
+
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -115,9 +125,8 @@ touch $PKG/var/log/faillog.new
   ln -s ../sbin/lastlog
 )
 
-# Fixup a few permissions:
-chmod 4711 $PKG/bin/su
-chmod 4711 $PKG/usr/bin/*
+# Use 4711 rather than 4755 permissions where setuid root is required:
+find $PKG -type f -perm 4755 -exec chmod 4711 "{}" \;
 
 # Compress and if needed symlink the man pages:
 if [ -d $PKG/usr/man ]; then
@@ -136,13 +145,16 @@ fi
 
 mkdir -p $PKG/usr/doc/shadow-$VERSION
 cp -a \
-  COPYING ChangeLog NEWS README TODO doc/{README*,HOWTO,WISHLIST,*.txt} \
+  COPYING* NEWS README* TODO doc/{README*,HOWTO,WISHLIST,*.txt} \
   $PKG/usr/doc/shadow-$VERSION
-#chmod 0644 $PKG/usr/doc/shadow-$VERSION/*
 
-# The entire ChangeLog is excessive for most users:
-cat $PKG/usr/doc/shadow-$VERSION/ChangeLog | head -n 2000 > $PKG/usr/doc/shadow-$VERSION/CL
-mv $PKG/usr/doc/shadow-$VERSION/CL $PKG/usr/doc/shadow-$VERSION/ChangeLog
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/a/shadow/shadow.url b/source/a/shadow/shadow.url
new file mode 100644
index 00000000..b18864a8
--- /dev/null
+++ b/source/a/shadow/shadow.url
@@ -0,0 +1 @@
+ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow
diff --git a/source/a/sharutils/sharutils.SlackBuild b/source/a/sharutils/sharutils.SlackBuild
index 0d8bd6f0..5c1997ca 100755
--- a/source/a/sharutils/sharutils.SlackBuild
+++ b/source/a/sharutils/sharutils.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,10 +21,20 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=4.7
-ARCH=${ARCH:-x86_64}
+PKGNAM=sharutils
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-sharutils
@@ -45,8 +55,8 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf sharutils-$VERSION
-tar xjvf $CWD/sharutils-$VERSION.tar.bz2
-cd sharutils-$VERSION
+tar xvf $CWD/sharutils-$VERSION.tar.?z* || exit 1
+cd sharutils-$VERSION || exit 1
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -54,15 +64,23 @@ find . \
   \( -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 \
   --infodir=/usr/info \
-  $ARCH-slackware-linux
-make -j3
-make install DESTDIR=$PKG
-make install-man DESTDIR=$PKG
+  --build=$ARCH-slackware-linux
+
+make -j3 || make || exit 1
+make install DESTDIR=$PKG || exit 1
+make install-man DESTDIR=$PKG || exit 1
+
+# I'm not aware of any reason for these include files to exist outside
+# of the sharutils sources:
+if [ -d $PKG/usr/include ]; then
+  rm -rf $PKG/usr/include
+fi
 
 rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/* $PKG/usr/man/man?/*.?
@@ -74,9 +92,17 @@ gzip -9 $PKG/usr/info/* $PKG/usr/man/man?/*.?
 
 mkdir -p $PKG/usr/doc/sharutils-$VERSION
 cp -a \
-  AUTHORS COPYING INSTALL NEWS README README-alpha THANKS TODO \
+  AUTHORS COPYING* INSTALL NEWS README* THANKS TODO \
   $PKG/usr/doc/sharutils-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source/a/slocate/slocate.SlackBuild b/source/a/slocate/slocate.SlackBuild
index 3fec40f2..eef2fd1f 100755
--- a/source/a/slocate/slocate.SlackBuild
+++ b/source/a/slocate/slocate.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=3.1
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-3}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-slocate
diff --git a/source/a/smartmontools/smartmontools.SlackBuild b/source/a/smartmontools/smartmontools.SlackBuild
index 5ebed962..1113e40a 100755
--- a/source/a/smartmontools/smartmontools.SlackBuild
+++ b/source/a/smartmontools/smartmontools.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -58,6 +58,7 @@ chown -R root:root .
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --sysconfdir=/etc \
+  --docdir=/usr/doc/smartmontools-$VERSION \
   --build=$ARCH-slackware-linux
 
 make || exit 1
@@ -68,9 +69,6 @@ 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/smartd.conf
 
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -81,6 +79,12 @@ mkdir -p $PKG/install
 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
+# These have already been copyed, but it is nice to keep the original
+# timestamps if possible, so we will copy over:
+cp -a \
+  AUTHORS CHANGELOG COPYING* INSTALL NEWS README* TODO WARNINGS \
+  $PKG/usr/doc/smartmontools-$VERSION
+
 # If there's a CHANGELOG, installing at least part of the recent history
 # is useful, but don't let it get totally out of control:
 if [ -r CHANGELOG ]; then
diff --git a/source/a/splitvt/splitvt.SlackBuild b/source/a/splitvt/splitvt.SlackBuild
index f643a825..79a628af 100755
--- a/source/a/splitvt/splitvt.SlackBuild
+++ b/source/a/splitvt/splitvt.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=1.6.5
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-splitvt
diff --git a/source/a/sysfsutils/sysfsutils.SlackBuild b/source/a/sysfsutils/sysfsutils.SlackBuild
index 0534b3e2..4d1822ec 100755
--- a/source/a/sysfsutils/sysfsutils.SlackBuild
+++ b/source/a/sysfsutils/sysfsutils.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=2.1.0
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 if [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 else
diff --git a/source/a/sysklogd/config/rc.syslog.new b/source/a/sysklogd/config/rc.syslog.new
new file mode 100644
index 00000000..46208fab
--- /dev/null
+++ b/source/a/sysklogd/config/rc.syslog.new
@@ -0,0 +1,49 @@
+#!/bin/sh
+# Start/stop/restart the system logging daemons.
+#
+# Written for Slackware Linux by Patrick J. Volkerding <volkerdi@slackware.com>.
+
+syslogd_start() {
+  if [ -x /usr/sbin/syslogd -a -x /usr/sbin/klogd ]; then
+    echo -n "Starting sysklogd daemons:  "
+    echo -n "/usr/sbin/syslogd "
+    /usr/sbin/syslogd
+    # prevent syslogd/klogd race condition on SMP kernels
+    if ps acx | grep -q udevd ; then
+      while [ ! -e /dev/log ] ; do
+        sleep 0
+      done
+    else
+      sleep 1
+    fi
+    echo "/usr/sbin/klogd -c 3 -x"
+    # '-c 3' = display level 'error' or higher messages on console
+    # '-x' = turn off broken EIP translation
+    /usr/sbin/klogd -c 3 -x
+  fi
+}
+
+syslogd_stop() {
+  killall syslogd 2> /dev/null
+  killall klogd 2> /dev/null
+}
+
+syslogd_restart() {
+  syslogd_stop
+  sleep 1
+  syslogd_start
+}
+
+case "$1" in
+'start')
+  syslogd_start
+  ;;
+'stop')
+  syslogd_stop
+  ;;
+'restart')
+  syslogd_restart
+  ;;
+*)
+  echo "usage $0 start|stop|restart"
+esac
diff --git a/source/a/sysklogd/config/syslog.conf.new b/source/a/sysklogd/config/syslog.conf.new
new file mode 100644
index 00000000..15bc5ee4
--- /dev/null
+++ b/source/a/sysklogd/config/syslog.conf.new
@@ -0,0 +1,46 @@
+# /etc/syslog.conf
+# For info about the format of this file, see "man syslog.conf"
+# and /usr/doc/sysklogd/README.linux.  Note the '-' prefixing some
+# of these entries;  this omits syncing the file after every logging.
+# In the event of a crash, some log information might be lost, so
+# if this is a concern to you then you might want to remove the '-'.
+# Be advised this will cause a performation loss if you're using
+# programs that do heavy logging.
+
+# Uncomment this to see kernel messages on the console.
+#kern.*							/dev/console
+
+# Log anything 'info' or higher, but lower than 'warn'.
+# Exclude authpriv, cron, mail, and news.  These are logged elsewhere.
+*.info;*.!warn;\
+	authpriv.none;cron.none;mail.none;news.none	-/var/log/messages
+
+# Log anything 'warn' or higher.
+# Exclude authpriv, cron, mail, and news.  These are logged elsewhere.
+*.warn;\
+	authpriv.none;cron.none;mail.none;news.none	-/var/log/syslog
+
+# Debugging information is logged here.
+*.=debug						-/var/log/debug
+
+# Private authentication message logging:
+authpriv.*						-/var/log/secure
+
+# Cron related logs:
+cron.*							-/var/log/cron
+
+# Mail related logs:
+mail.*							-/var/log/maillog
+
+# Emergency level messages go to all users:
+*.emerg							*
+
+# This log is for news and uucp errors:
+uucp,news.crit						-/var/log/spooler
+
+# Uncomment these if you'd like INN to keep logs on everything.
+# You won't need this if you don't run INN (the InterNetNews daemon).
+#news.=crit					-/var/log/news/news.crit
+#news.=err					-/var/log/news/news.err
+#news.notice					-/var/log/news/news.notice
+
diff --git a/source/a/sysklogd/config/syslog.logrotate b/source/a/sysklogd/config/syslog.logrotate
new file mode 100644
index 00000000..031e68df
--- /dev/null
+++ b/source/a/sysklogd/config/syslog.logrotate
@@ -0,0 +1,6 @@
+/var/log/cron /var/log/debug /var/log/maillog /var/log/messages /var/log/secure /var/log/spooler /var/log/syslog {
+    sharedscripts
+    postrotate
+	/bin/kill -HUP `cat /var/run/syslogd.pid 2>/dev/null` 2>/dev/null || true
+    endscript
+}
diff --git a/source/a/sysklogd/doinst.sh b/source/a/sysklogd/doinst.sh
new file mode 100644
index 00000000..fcaf830d
--- /dev/null
+++ b/source/a/sysklogd/doinst.sh
@@ -0,0 +1,31 @@
+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/logrotate.d/syslog.new
+config etc/syslog.conf.new
+config etc/rc.d/rc.syslog.new
+config var/log/cron.new
+config var/log/debug.new
+config var/log/maillog.new
+config var/log/messages.new
+config var/log/secure.new
+config var/log/spooler.new
+config var/log/syslog.new
+
+# Remove any leftover empty files:
+rm -f var/log/cron.new
+rm -f var/log/debug.new
+rm -f var/log/maillog.new
+rm -f var/log/messages.new
+rm -f var/log/secure.new
+rm -f var/log/spooler.new
+rm -f var/log/syslog.new
+
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
deleted file mode 100644
index 26830929..00000000
--- a/source/a/sysklogd/sysklogd-1.4.1-owl-syslogd-crunch_list.diff
+++ /dev/null
@@ -1,90 +0,0 @@
---- ./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
deleted file mode 100644
index 0c3b75f8..00000000
--- a/source/a/sysklogd/sysklogd-1.4.1.lsm
+++ /dev/null
@@ -1,23 +0,0 @@
-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
index 110659e4..a5cd75e2 100755
--- a/source/a/sysklogd/sysklogd.SlackBuild
+++ b/source/a/sysklogd/sysklogd.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=1.4.1
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-10}
+VERSION=1.5
+BUILD=${BUILD:-1}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:--j6}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -31,17 +40,10 @@ 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
+tar xvf $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 \) \
@@ -49,29 +51,53 @@ find . \
   \( -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
+# Use memmove() instead of strcpy() in syslogd.c
+zcat $CWD/use_memmove_not_strcpy.diff.gz | patch -p1 --verbose || exit 1
+
+make all syslog_tst $NUMJOBS || make || exit 1
+
+mkdir -p $PKG/usr/sbin
 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
+chmod 0755 $PKG/usr/sbin/*
+
+mkdir -p $PKG/usr/man/man{5,8}
 cat syslog.conf.5 | gzip -9c > $PKG/usr/man/man5/syslog.conf.5.gz
+cat klogd.8 | gzip -9c > $PKG/usr/man/man8/klogd.8.gz
+cat sysklogd.8 | gzip -9c > $PKG/usr/man/man8/sysklogd.8.gz
+( cd $PKG/usr/man/man8 ; ln -s sysklogd.8.gz syslogd.8.gz )
+
+mkdir -p $PKG/etc
+cat $CWD/config/syslog.conf.new > $PKG/etc/syslog.conf.new
+
+mkdir -p $PKG/etc/logrotate.d
+cat $CWD/config/syslog.logrotate > $PKG/etc/logrotate.d/syslog.new
+
+mkdir -p $PKG/etc/rc.d
+cat $CWD/config/rc.syslog.new > $PKG/etc/rc.d/rc.syslog.new
+chmod 0755 $PKG/etc/rc.d/rc.syslog.new
+
+mkdir -p $PKG/var/log
+for i in cron debug maillog messages secure spooler syslog ; 
+  do touch $PKG/var/log/$i.new ;
+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/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
-)
+cp -a \
+  ANNOUNCE CHANGES COPYING INSTALL MANIFEST NEWS README.1st README.linux \
+  $PKG/usr/doc/sysklogd-$VERSION
+chmod 0644 $PKG/usr/doc/sysklogd-$VERSION/*
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+zcat $CWD/doinst.sh > $PKG/install/doinst.sh
 
-# Build the package:
 cd $PKG
-makepkg -l y -c n $TMP/sysklogd-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/sysklogd-$VERSION-$ARCH-$BUILD.txz
 
 # Clean up the extra stuff:
 if [ "$1" = "--cleanup" ]; then
diff --git a/source/a/sysklogd/sysklogd_1.4.1-20.diff b/source/a/sysklogd/sysklogd_1.4.1-20.diff
deleted file mode 100644
index 9bb27bbb..00000000
--- a/source/a/sysklogd/sysklogd_1.4.1-20.diff
+++ /dev/null
@@ -1,2555 +0,0 @@
---- 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/sysklogd/use_memmove_not_strcpy.diff b/source/a/sysklogd/use_memmove_not_strcpy.diff
new file mode 100644
index 00000000..8fb7c504
--- /dev/null
+++ b/source/a/sysklogd/use_memmove_not_strcpy.diff
@@ -0,0 +1,15 @@
+Adapted from this upstream git commit:  2a80f8117f40dc6a3fce30c6d0f15f3c5af55ccf
+http://git.infodrom.org/?p=infodrom/sysklogd;a=commit;h=2a80f8117f40dc6a3fce30c6d0f15f3c5af55ccf
+
+diff -Nur sysklogd-1.5.orig//syslogd.c sysklogd-1.5/syslogd.c
+--- sysklogd-1.5.orig//syslogd.c	2007-07-04 14:04:01.000000000 -0500
++++ sysklogd-1.5/syslogd.c	2010-10-14 13:12:15.808000011 -0500
+@@ -2392,7 +2392,7 @@
+ 		if (*p == '\0' || *p == '#')
+ 			continue;
+ #if CONT_LINE
+-		strcpy(cline, p);
++		memmove(cline, p, strlen(p)+1);
+ #endif
+ 		for (p = strchr(cline, '\0'); isspace(*--p););
+ #if CONT_LINE
diff --git a/source/a/sysvinit-functions/sysvinit-functions.SlackBuild b/source/a/sysvinit-functions/sysvinit-functions.SlackBuild
index 9af7f9ec..909f8320 100755
--- a/source/a/sysvinit-functions/sysvinit-functions.SlackBuild
+++ b/source/a/sysvinit-functions/sysvinit-functions.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=${VERSION:-8.53}
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-sysvinit-functions
diff --git a/source/a/sysvinit-scripts/doinst.sh b/source/a/sysvinit-scripts/doinst.sh
index ff0ffc28..28fe719a 100644
--- a/source/a/sysvinit-scripts/doinst.sh
+++ b/source/a/sysvinit-scripts/doinst.sh
@@ -18,6 +18,7 @@ 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.loop.new
 config etc/rc.d/rc.sysvinit.new
 
 ( cd etc/rc.d ; rm -rf rc.0 )
diff --git a/source/a/sysvinit-scripts/scripts/inittab b/source/a/sysvinit-scripts/scripts/inittab
index 862f704c..9f8b422d 100644
--- a/source/a/sysvinit-scripts/scripts/inittab
+++ b/source/a/sysvinit-scripts/scripts/inittab
@@ -6,6 +6,7 @@
 #                                       2.10    02/10/95        PV
 #                                       3.00    02/06/1999      PV
 #                                       4.00    04/10/2002      PV
+#                                      13.37    2011-03-25      PJV
 #
 # Author:	Miquel van Smoorenburg, <miquels@drinkel.nl.mugnet.org>
 # Modified by:	Patrick J. Volkerding, <volkerdi@slackware.com>
@@ -48,11 +49,11 @@ pf::powerfail:/sbin/genpowerfail start
 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
+c1:12345:respawn:/sbin/agetty 38400 tty1 linux
+c2:12345:respawn:/sbin/agetty 38400 tty2 linux
+c3:12345:respawn:/sbin/agetty 38400 tty3 linux
+c4:12345:respawn:/sbin/agetty 38400 tty4 linux
+c5:12345:respawn:/sbin/agetty 38400 tty5 linux
 c6:12345:respawn:/sbin/agetty 38400 tty6 linux
 
 # Local serial lines:
@@ -63,12 +64,8 @@ c6:12345:respawn:/sbin/agetty 38400 tty6 linux
 #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.
+# Runlevel 4 also starts /etc/rc.d/rc.4 to run a display manager for X.
+# Display managers are preferred in this order:  gdm, kdm, xdm
 x1:4:respawn:/etc/rc.d/rc.4
 
 # End of /etc/inittab
diff --git a/source/a/sysvinit-scripts/scripts/rc.6 b/source/a/sysvinit-scripts/scripts/rc.6
index e4916016..ca1b4c8e 100644
--- a/source/a/sysvinit-scripts/scripts/rc.6
+++ b/source/a/sysvinit-scripts/scripts/rc.6
@@ -98,9 +98,23 @@ if [ -x /etc/rc.d/rc.messagebus ]; then
   sh /etc/rc.d/rc.messagebus stop
 fi
 
+# Kill any processes (typically gam) that would otherwise prevent
+# unmounting NFS volumes:
+unset FUSER_DELAY
+for dir in $(/bin/mount | grep 'type nfs' | cut -d ' ' -f 3 ) ; do
+  echo "Killing processes holding NFS mount $dir open..."
+  # Background this to prevent fuser from also blocking shutdown:
+  /usr/bin/fuser -k -m $dir &
+  FUSER_DELAY=5
+done
+# If fuser was run, let it have some delay:
+if [ ! -z "$FUSER_DELAY" ]; then
+  sleep $FUSER_DELAY
+fi
+
 # Unmount any NFS, SMB, or CIFS filesystems:
 echo "Unmounting remote filesystems."
-/bin/umount -v -a -r -t nfs,smbfs,cifs
+/bin/umount -v -a -l -f -r -t nfs,smbfs,cifs
 
 # Try to shut down pppd:
 PS="$(ps ax)"
@@ -186,12 +200,6 @@ 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
 
diff --git a/source/a/sysvinit-scripts/scripts/rc.K b/source/a/sysvinit-scripts/scripts/rc.K
index 68609753..8fc63fdf 100644
--- a/source/a/sysvinit-scripts/scripts/rc.K
+++ b/source/a/sysvinit-scripts/scripts/rc.K
@@ -57,9 +57,23 @@ if [ -x /etc/rc.d/rc.nfsd ]; then
   /etc/rc.d/rc.nfsd stop
 fi
 
+# Kill any processes (typically gam) that would otherwise prevent
+# unmounting NFS volumes:
+unset FUSER_DELAY
+for dir in $(/bin/mount | grep 'type nfs' | cut -d ' ' -f 3 ) ; do
+  echo "Killing processes holding NFS mount $dir open..."
+  # Background this to prevent fuser from also blocking shutdown:
+  /usr/bin/fuser -k -m $dir &
+  FUSER_DELAY=5
+done
+# If fuser was run, let it have some delay:
+if [ ! -z "$FUSER_DELAY" ]; then
+  sleep $FUSER_DELAY
+fi
+
 # Unmount any NFS, SMB, or CIFS filesystems:
 echo "Unmounting remote filesystems."
-umount -a -r -t nfs,smbfs,cifs
+/bin/umount -v -a -l -f -r -t nfs,smbfs,cifs
 
 # Shut down PCMCIA devices:
 if [ -x /etc/rc.d/rc.pcmcia ] ; then
diff --git a/source/a/sysvinit-scripts/scripts/rc.M b/source/a/sysvinit-scripts/scripts/rc.M
index ccdcb6f3..8772409e 100644
--- a/source/a/sysvinit-scripts/scripts/rc.M
+++ b/source/a/sysvinit-scripts/scripts/rc.M
@@ -33,6 +33,17 @@ else
   /bin/hostname darkstar
 fi
 
+# Set the permissions on /var/log/dmesg according to whether the kernel
+# permits non-root users to access kernel dmesg information:
+if [ -r /proc/sys/kernel/dmesg_restrict ]; then
+  if [ $(cat /proc/sys/kernel/dmesg_restrict) = 1 ]; then
+    touch /var/log/dmesg
+    chmod 640 /var/log/dmesg
+  fi
+else
+  touch /var/log/dmesg
+  chmod 644 /var/log/dmesg
+fi
 # Save the contents of 'dmesg':
 /bin/dmesg -s 65536 > /var/log/dmesg
 
@@ -100,6 +111,11 @@ fi
 # Mount any additional filesystem types that haven't already been mounted:
 mount -a -v 2> /dev/null | grep -v "already mounted"
 
+# Start the Control Script for automounter:
+if [ -x /etc/rc.d/rc.autofs ]; then
+  sh /etc/rc.d/rc.autofs start
+fi
+
 # Start the Network Time Protocol daemon:
 if [ -x /etc/rc.d/rc.ntpd ]; then
   sh /etc/rc.d/rc.ntpd start
@@ -156,6 +172,11 @@ if [ -x /etc/rc.d/rc.messagebus ]; then
   sh /etc/rc.d/rc.messagebus start
 fi
 
+# Start console-kit-daemon:
+if [ -x /etc/rc.d/rc.consolekit ]; then
+  sh /etc/rc.d/rc.consolekit start
+fi
+
 # Start HAL:
 if [ -x /etc/rc.d/rc.hald ]; then
   sh /etc/rc.d/rc.hald start
@@ -249,9 +270,9 @@ 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.
+# -l notice to -l info to increase the logging level.
 if [ -x /usr/sbin/crond ]; then
-  /usr/sbin/crond -l10 >>/var/log/cron 2>&1
+  /usr/sbin/crond -l notice
 fi
 
 # Start atd (manages jobs scheduled with 'at'):
diff --git a/source/a/sysvinit-scripts/scripts/rc.S b/source/a/sysvinit-scripts/scripts/rc.S
index 7c5c43ed..c02f1e27 100644
--- a/source/a/sysvinit-scripts/scripts/rc.S
+++ b/source/a/sysvinit-scripts/scripts/rc.S
@@ -19,6 +19,11 @@ if [ -d /sys ]; then
   fi
 fi
 
+# Load the loop device kernel module:
+if [ -x /etc/rc.d/rc.loop ]; then
+  . /etc/rc.d/rc.loop start
+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
@@ -37,6 +42,16 @@ if grep -wq sysfs /proc/mounts && grep -q tmpfs /proc/filesystems ; then
   fi
 fi
 
+# Mount Control Groups filesystem interface:
+if grep -wq cgroup /proc/filesystems ; then
+  if [ -d /sys/fs/cgroup ]; then
+    mount -t cgroup cgroup /sys/fs/cgroup
+  else
+    mkdir -p /dev/cgroup
+    mount -t cgroup cgroup /dev/cgroup
+  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
@@ -77,7 +92,7 @@ if [ -f /etc/crypttab -a -x /sbin/cryptsetup ]; then
     if echo $OPTS | grep -wq ro ; then LUKSOPTS="${LUKSOPTS} --readonly" ; fi
 
     # Skip LUKS volumes that were already unlocked (in the initrd):
-    /sbin/cryptsetup status $LUKS 1>/dev/null 2>/dev/null && continue
+    /sbin/cryptsetup status $LUKS 2>/dev/null | head -n 1 | grep -q "is active" && continue
     if /sbin/cryptsetup isLuks $DEV 2>/dev/null ; then
       echo "Unlocking LUKS crypt volume '${LUKS}' on device '$DEV':"
       if [ -n "${PASS}" ]; then
@@ -293,12 +308,10 @@ if [ ! -r /etc/fastboot ]; then
   /sbin/fsck $FORCEFSCK -C -R -A -a
 fi
 
-# Mount usbfs:
+# Mount usbfs only if it is found in /etc/fstab:
 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
+    if grep -wq usbfs /etc/fstab; then
       /sbin/mount -v /proc/bus/usb
     fi
   fi
diff --git a/source/a/sysvinit-scripts/scripts/rc.loop b/source/a/sysvinit-scripts/scripts/rc.loop
new file mode 100644
index 00000000..942fc544
--- /dev/null
+++ b/source/a/sysvinit-scripts/scripts/rc.loop
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# Load the loop device kernel module.
+#
+
+if modinfo loop 1> /dev/null 2> /dev/null ; then
+  if ! lsmod | grep -wq "^loop" ; then
+    modprobe loop
+  fi
+fi
+
diff --git a/source/a/sysvinit-scripts/scripts/rescan-scsi-bus.sh b/source/a/sysvinit-scripts/scripts/rescan-scsi-bus.sh
index 4378e208..5ef34d4d 100644
--- a/source/a/sysvinit-scripts/scripts/rescan-scsi-bus.sh
+++ b/source/a/sysvinit-scripts/scripts/rescan-scsi-bus.sh
@@ -3,7 +3,7 @@
 # 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 $
+# $Id: rescan-scsi-bus.sh,v 1.48 2010/08/10 19:32:22 garloff Exp $
 
 setcolor ()
 {
@@ -20,26 +20,50 @@ unsetcolor ()
   yellow=""; norm=""
 }
 
+# Output some text and return cursor to previous position
+# (only works for simple strings)
+# Stores length of string in LN and returns it
+print_and_scroll_back ()
+{
+  STRG="$1"
+  LN=${#STRG}
+  BK=""
+  declare -i cntr=0
+  while test $cntr -lt $LN; do BK="$BK\e[D"; let cntr+=1; done
+  echo -en "$STRG$BK"
+  return $LN
+}
+
+# Overwrite a text of length $1 (fallback to $LN) with whitespace
+white_out ()
+{
+  BK=""; WH=""
+  if test -n "$1"; then LN=$1; fi
+  declare -i cntr=0
+  while test $cntr -lt $LN; do BK="$BK\e[D"; WH="$WH "; let cntr+=1; done
+  echo -en "$WH$BK"
+}
+
 # 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"
+      hostname="qla2xxx"
     elif [ -f $hostdir/lpfc_drvr_version ] ; then
-	hostname="lpfc"
+      hostname="lpfc"
     else
-        hostname=`cat $hostdir/proc_name`
+      hostname=`cat $hostdir/proc_name`
     fi
     hosts="$hosts $hostno"
     echo "Host adapter $hostno ($hostname) found."
-  done
+  done  
+  if [ -z "$hosts" ] ; then
+    echo "No SCSI host adapters found in sysfs"
+    exit 1;
+  fi
   hosts=`echo $hosts | sed 's/ /\n/g' | sort -n`
 }
 
@@ -65,59 +89,74 @@ findhosts ()
   done
 }
 
+printtype ()
+{
+  local type=$1
+
+  case "$type" in
+    0) echo "Direct-Access    " ;;
+    1) echo "Sequential-Access" ;;
+    2) echo "Printer          " ;;
+    3) echo "Processor        " ;;
+    4) echo "WORM             " ;;
+    5) echo "CD-ROM           " ;;
+    6) echo "Scanner          " ;;
+    7) echo "Optical Device   " ;;
+    8) echo "Medium Changer   " ;;
+    9) echo "Communications   " ;;
+    10) echo "Unknown          " ;;
+    11) echo "Unknown          " ;;
+    12) echo "RAID             " ;;
+    13) echo "Enclosure        " ;;
+    14) echo "Direct-Access-RBC" ;;
+    *) echo "Unknown          " ;;
+  esac
+}
+
+print02i()
+{
+    if [ "$1" = "*" ] ; then 
+        echo "00"
+    else
+        printf "%02i" "$1"
+    fi
+}
+
 # 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`
+  CHANNEL=`print02i "$channel"`
+  ID=`print02i "$id"`
+  LUN=`print02i "$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
+    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
+      fi
+      if [ "$LN" -gt 1 ] ; then
+	ILVL=$(cat ${SCSIPATH}/device/scsi_level)
+	type=$(cat ${SCSIPATH}/device/type)
+	ITYPE=$(printtype $type)
+	SCSITMP=$(printf '  Type:   %-16s                ANSI SCSI revision: %02d' "$ITYPE" "$((ILVL - 1))")
+	SCSISTR="$SCSISTR
 $SCSITMP"
-	  fi
-	      
-      else
-	  return 1
       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"`
+    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
 }
@@ -148,6 +187,7 @@ sgdevice24 ()
 }
 
 # Find sg device that belongs to SCSI device $host $channel $id $lun
+# and return in SGDEV
 sgdevice ()
 {
   SGDEV=
@@ -169,21 +209,38 @@ sgdevice ()
       echo "scsi report-devs 0" >/proc/scsi/scsi
     fi
   fi
-}       
+}
 
 # Test if SCSI device is still responding to commands
 testonline ()
 {
   : testonline
+  RC=0
   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=$?
+  # Handle in progress of becoming ready and unit attention -- wait at max 11s
+  declare -i ctr=0
+  if test $RC = 2 -o $RC = 6; then 
+    RMB=`sg_inq /dev/$SGDEV | grep 'RMB=' | sed 's/^.*RMB=\(.\).*$/\1/'`
+    print_and_scroll_back "$host:$channel:$id:$lun $SGDEV ($RMB) "
+  fi
+  while test $RC = 2 -o $RC = 6 && test $ctr -le 8; do
+    if test $RC = 2 -a "$RMB" != "1"; then echo -n "."; let $LN+=1; sleep 1
+    else usleep 20000; fi
+    let ctr+=1
+    sg_turs /dev/$SGDEV >/dev/null 2>&1
+    RC=$?
+  done
+  if test $ctr != 0; then white_out; fi
   # 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
+  # Reset RC (might be !=0 for passive paths)
+  RC=0
   # OK, device online, compare INQUIRY string
-  INQ=`sg_inq $sg_len_arg /dev/$SGDEV`
+  INQ=`sg_inq $sg_len_arg /dev/$SGDEV 2>/dev/null`
   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/'`
@@ -191,31 +248,33 @@ testonline ()
   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
+    echo -e "\e[A\e[A\e[A\e[A${red}$SGDEV changed: ${bold}LU not available (PQual $IPQUAL)${norm}    \n\n\n"
+    return 2
   fi
 
+  TYPE=$(printtype $IPTYPE)
   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"
+    echo -e "\e[A\e[A\e[A\e[A${red}$SGDEV changed: ${bold}\nfrom:${SCSISTR#* } \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  
+    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 
+# Outputs description from /proc/scsi/scsi (unless arg passed)
+# Returns SCSISTR (empty if no dev)
 testexist ()
 {
   : testexist
   SCSISTR=
-  if procscsiscsi; then
+  if procscsiscsi && test -z "$1"; then
     echo "$SCSISTR" | head -n1
     echo "$SCSISTR" | tail -n2 | pr -o4 -l1
   fi
@@ -230,6 +289,7 @@ chanlist ()
   local tmpchan
 
   for dev in /sys/class/scsi_device/${host}:* ; do
+    [ -d $dev ] || continue;
     hcil=${dev##*/}
     cil=${hcil#*:}
     chan=${cil%%:*}
@@ -242,6 +302,7 @@ chanlist ()
       channelsearch="$channelsearch $chan"
     fi
   done
+  if test -z "$channelsearch"; then channelsearch="0"; fi
 }
 
 # Returns the list of existing targets per host
@@ -254,6 +315,7 @@ idlist ()
   local tmpid
 
   for dev in /sys/class/scsi_device/${host}:${channel}:* ; do
+    [ -d $dev ] || continue;
     hcil=${dev##*/}
     cil=${hcil#*:}
     il=${cil#*:}
@@ -261,6 +323,7 @@ idlist ()
     for tmpid in $idsearch ; do
       if test "$target" -eq $tmpid ; then
 	target=
+	break
       fi
     done
     if test -n "$target" ; then
@@ -269,53 +332,83 @@ idlist ()
   done
 }
 
-# Returns the list of existing LUNs
-getluns ()
+# Returns the list of existing LUNs from device $host $channel $id $lun
+# and returns list to stdout
+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'
+  if test ! -x /usr/bin/sg_luns; then echo 0; return; fi
+  LLUN=`sg_luns -d /dev/$SGDEV 2>/dev/null`
+  if test $? != 0; then echo 0; return; fi
+  echo "$LLUN" | sed -n 's/.*lun=\(.*\)/\1/p'
+}
+
+# Wait for udev to settle (create device nodes etc.)
+udevadm_settle()
+{
+  if test -x /sbin/udevadm; then 
+    print_and_scroll_back " Calling udevadm settle (can take a while) "
+    /sbin/udevadm settle
+    white_out
+  else
+    usleep 20000
+  fi
 }
 
-# Perform scan on a single lun
+# Perform scan on a single lun $host $channel $id $lun
 dolunscan()
 {
   SCSISTR=
   devnr="$host $channel $id $lun"
-  echo "Scanning for device $devnr ..."
+  echo "Scanning for device $devnr ... "
   printf "${yellow}OLD: $norm"
   testexist
+  # Special case: lun 0 just got added (for reportlunscan),
+  # so make sure we correctly treat it as new
+  if test "$lun" = "0" -a "$1"; then
+    SCSISTR=""
+    printf "\r\e[A\e[A\e[A"
+  fi
   : 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
+    RC=$?
+    if test $RC != 0 -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
+	if test $RC -eq 1 -o $lun -eq 0 ; then
+          # Try readding, should fail if device is gone
+          echo "$channel $id $lun" > /sys/class/scsi_host/host${host}/scan
+	fi
+	# FIXME: Can we skip udevadm settle for removal?
+	#udevadm_settle
+	usleep 20000
       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
+	if test $RC -eq 1 -o $lun -eq 0 ; then
+          # Try readding, should fail if device is gone
+          echo "scsi add-single-device $devnr" > /proc/scsi/scsi
+	fi
       fi
     fi
-    if test $RC = 0 ; then
+    if test $RC = 0 -o "$forcerescan" ; 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
+	udevadm_settle
       fi
     fi
-
-    printf "\r\x1b[A\x1b[A\x1b[A${yellow}OLD: $norm"
+    printf "\r\e[A\e[A\e[A${yellow}OLD: $norm"
     testexist
     if test -z "$SCSISTR"; then
       printf "\r${red}DEL: $norm\r\n\n"
       let rmvd+=1;
+      return 1
     fi
   fi
   if test -z "$SCSISTR"; then
@@ -323,13 +416,14 @@ dolunscan()
     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
+      udevadm_settle
     else
       echo "scsi add-single-device $devnr" > /proc/scsi/scsi
     fi
     testexist
     if test -z "$SCSISTR"; then
       # Device not present
-      printf "\r\x1b[A";
+      printf "\r\e[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;
@@ -340,60 +434,74 @@ dolunscan()
   fi
 }
 
-# Perform report lun scan
+# Perform report lun scan on $host $channel $id using REPORT_LUNS
 doreportlun()
 {
   lun=0
   SCSISTR=
   devnr="$host $channel $id $lun"
-  echo "Scanning for device $devnr ..."
-  printf "${yellow}OLD: $norm"
-  testexist
+  echo -en "Scanning for device $devnr ...\r"
+  lun0added=
+  #printf "${yellow}OLD: $norm"
+  # Phase one: If LUN0 does not exist, try to add
+  testexist -q
   if test -z "$SCSISTR"; then
     # Device does not exist, try to add
-    printf "\r${green}NEW: $norm"
+    #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
+      udevadm_settle
     else
       echo "scsi add-single-device $devnr" > /proc/scsi/scsi
     fi
-    testexist
-    if test -z "$SCSISTR"; then
+    testexist -q
+    if test -n "$SCSISTR"; then
+      lun0added=1
+      #testonline
+    else
       # Device not present
-      printf "\r\x1b[A";
-      lunsearch=
-      return
+      # return
+      # Find alternative LUN to send getluns to
+      for dev in /sys/class/scsi_device/${host}:${channel}:${id}:*; do
+        [ -d "$dev" ] || continue
+	lun=${dev##*:}
+        break
+      done
     fi
   fi
-  lunsearch=`getluns`
+  targetluns=`getluns`
   lunremove=
+  #echo "getluns reports " $targetluns
   # Check existing luns
-  for dev in /sys/class/scsi_device/$host\:$channel\:$id\:*; do
+  for dev in /sys/class/scsi_device/${host}:${channel}:${id}:*; do
+    [ -d "$dev" ] || continue
     lun=${dev##*:}
     newsearch=
-    oldsearch="$lunsearch"
-    for tmplun in $lunsearch; do
+    inlist=
+    # OK, is existing $lun (still) in reported list
+    for tmplun in $targetluns; do
       if test $tmplun -eq $lun ; then
-	# Optimization: don't scan lun 0 again
-	if [ $lun -ne 0 ]; then
-	  dolunscan
-	fi
+	inlist=1
+	dolunscan $lun0added
       else
 	newsearch="$newsearch $tmplun"
       fi
     done
-    if [ "${#oldsearch}" = "${#newsearch}" ] ; then
-	# Stale lun
-	lunremove="$lunremove $lun"
+    # OK, we have now done a lunscan on $lun and 
+    # $newsearch is the old $targetluns without $lun
+    if [ -z "$inlist" ]; then
+      # Stale lun
+      lunremove="$lunremove $lun"
     fi
-    lunsearch="$newsearch"
+    # $lun removed from $lunsearch (echo for whitespace cleanup)
+    targetluns=`echo $newsearch`
   done
   # Add new ones and check stale ones
-  for lun in $lunsearch $lunremove; do
-    dolunscan
+  for lun in $targetluns $lunremove; do
+    dolunscan $lun0added
   done
 }
-  
+
 # Perform search (scan $host)
 dosearch ()
 {
@@ -405,7 +513,7 @@ dosearch ()
       idlist
     fi
     for id in $idsearch; do
-      if test -z "$lunsearch"; then
+      if test -z "$lunsearch" ; then
 	doreportlun
       else
 	for lun in $lunsearch; do
@@ -416,18 +524,40 @@ dosearch ()
   done
 }
  
+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
+}
+
 # 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      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 " -w      scan for target device IDs 0--15   [default: 0--7]"
+    echo " -c      enables scanning of channels 0 1   [default: 0 / all detected ones]"
     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 "--forcerescan:   Rescan existing devices"
     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"
@@ -435,6 +565,11 @@ if test @$1 = @--help -o @$1 = @-h -o @$1 = @-?; then
     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 "--sync/nosync:   Issue a sync / no sync [default: sync if remove]"
+    echo "--attachpq3:     Tell kernel to attach sg to LUN 0 that reports PQ=3"
+    echo "--reportlun2:    Tell kernel to try REPORT_LUN even on SCSI2 devices"
+    echo "--largelun:      Tell kernel to support LUNs > 7 even on SCSI2 devs"
+    echo "--sparselun:     Tell kernel to support sparse LUN numbering"
     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"
@@ -442,27 +577,6 @@ if test @$1 = @--help -o @$1 = @-h -o @$1 = @-?; then
     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
@@ -471,22 +585,27 @@ 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
+if test -x /usr/bin/sg_inq; then
+    sg_version=$(sg_inq -V 2>&1 | cut -d " " -f 3)
+    sg_version=${sg_version##0.}
+    #echo "\"$sg_version\""
+    if [ -z "$sg_version" -o "$sg_version" -lt 70 ] ; then
+        sg_len_arg="-36"
+    else
+        sg_len_arg="--len=36"
+    fi
+fi    
 
 # defaults
 unsetcolor
-lunsearch=""
-idsearch=`seq 0 7`
-channelsearch="0"
+lunsearch=
+opt_idsearch=`seq 0 7`
+opt_channelsearch=
 remove=
 forceremove=
 optscan=1
+sync=1
+declare -i scan_flags=0
 if test -d /sys/class/scsi_host; then 
   findhosts_26
 else  
@@ -500,19 +619,26 @@ while test ! -z "$opt" -a -z "${opt##-*}"; do
   case "$opt" in
     l) lunsearch=`seq 0 7` ;;
     L) lunsearch=`seq 0 $2`; shift ;;
-    w) idsearch=`seq 0 15` ;;
-    c) channelsearch="0 1" ;;
+    w) opt_idsearch=`seq 0 15` ;;
+    c) opt_channelsearch="0 1" ;;
     r) remove=1 ;;
     i) lipreset=1 ;;
     -remove)      remove=1 ;;
+    -forcerescan) remove=1; forcerescan=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` ;; 
+    -channels=*)  arg=${opt#-channels=};opt_channelsearch=`expandlist $arg` ;; 
+    -ids=*)   arg=${opt#-ids=};         opt_idsearch=`expandlist $arg` ;; 
     -luns=*)  arg=${opt#-luns=};        lunsearch=`expandlist $arg` ;; 
     -color) setcolor ;;
     -nooptscan) optscan=0 ;;
     -issue-lip) lipreset=1 ;;
+    -sync) sync=2 ;;
+    -nosync) sync=0 ;;
+    -attachpq3) scan_flags=$(($scan_flags|0x1000000)) ;;
+    -reportlun2) scan_flags=$(($scan_flags|0x20000)) ;;
+    -largelun) scan_flags=$(($scan_flags|0x200)) ;;
+    -sparselun) scan_flags=$((scan_flags|0x40)) ;;
     *) echo "Unknown option -$opt !" ;;
   esac
   shift
@@ -521,9 +647,26 @@ done
 
 # Hosts given ?
 if test "@$1" != "@"; then 
-  hosts=$*; 
+  hosts=$*
 fi
 
+if [ -d /sys/class/scsi_host -a ! -w /sys/class/scsi_host ]; then
+  echo "You need to run scsi-rescan-bus.sh as root"
+  exit 2
+fi  
+if test "$sync" = 1 -a "$remove" = 1; then sync=2; fi
+if test "$sync" = 2; then echo "Syncing file systems"; sync; fi
+if test -w /sys/module/scsi_mod/parameters/default_dev_flags -a $scan_flags != 0; then
+  OLD_SCANFLAGS=`cat /sys/module/scsi_mod/parameters/default_dev_flags`
+  NEW_SCANFLAGS=$(($OLD_SCANFLAGS|$scan_flags))
+  if test "$OLD_SCANFLAGS" != "$NEW_SCANFLAGS"; then
+    echo -n "Temporarily setting kernel scanning flags from "
+    printf "0x%08x to 0x%08x\n" $OLD_SCANFLAGS $NEW_SCANFLAGS
+    echo $NEW_SCANFLAGS > /sys/module/scsi_mod/parameters/default_dev_flags
+  else
+    unset OLD_SCANFLAGS
+  fi
+fi  
 echo "Scanning SCSI subsystem for new devices"
 test -z "$remove" || echo " and remove devices that have disappeared"
 declare -i found=0
@@ -534,25 +677,33 @@ for host in $hosts; do
     # 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=""
+    # Always trigger a rescan for FC to update channels and targets
+    echo "- - -" > /sys/class/scsi_host/host$host/scan 2> /dev/null;
+    channelsearch=
+    idsearch=
+    udevadm_settle
+  else
+    channelsearch=$opt_channelsearch
+    idsearch=$opt_idsearch
   fi
   [ -n "$channelsearch" ] && echo -n "channels $channelsearch "
   echo -n "for "
   if [ -n "$idsearch" ] ; then
-      echo -n " SCSI target IDs " $idsearch
+    echo -n " SCSI target IDs " $idsearch
   else
-      echo -n " all SCSI target IDs"
+    echo -n " all SCSI target IDs"
   fi
   if [ -n "$lunsearch" ] ; then
-      echo ", LUNs " $lunsearch
+    echo ", LUNs " $lunsearch
   else
-      echo ", all LUNs"
+    echo ", all LUNs"
   fi
-  dosearch; 
+  dosearch
 done
+if test -n "$OLD_SCANFLAGS"; then
+  echo $OLD_SCANFLAGS > /sys/module/scsi_mod/parameters/default_dev_flags
+fi
 echo "$found new device(s) found.               "
 echo "$rmvd device(s) removed.                 "
 
diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
index 537d8be9..c0b17ad8 100755
--- a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
+++ b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2005-2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 
 VERSION=${VERSION:-1.2}
 ARCH=noarch
-BUILD=${BUILD:-32}
+BUILD=${BUILD:-43}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -34,7 +34,7 @@ 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
+for file in rc.{4,6,K,M,S} rc.local rc.loop 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
diff --git a/source/a/sysvinit/sysvinit.SlackBuild b/source/a/sysvinit/sysvinit.SlackBuild
index 4916e695..194ebf14 100755
--- a/source/a/sysvinit/sysvinit.SlackBuild
+++ b/source/a/sysvinit/sysvinit.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=${VERSION:-2.86}
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-6}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-sysvinit
diff --git a/source/a/tar/tar-1.23-support_txz.diff b/source/a/tar/tar-1.2x.support_txz.diff
index efd720b5..efd720b5 100644
--- a/source/a/tar/tar-1.23-support_txz.diff
+++ b/source/a/tar/tar-1.2x.support_txz.diff
diff --git a/source/a/tar/tar.1 b/source/a/tar/tar.1
index 1d7e02fa..8fe4f8b5 100644
--- a/source/a/tar/tar.1
+++ b/source/a/tar/tar.1
@@ -45,6 +45,9 @@ tar \- The GNU version of the tar archiving utility
 .B -i, --ignore-zeros
 ]
 [
+.B -J, --xz
+]
+[
 .B -j, --bzip2
 ]
 [
diff --git a/source/a/tar/tar.SlackBuild b/source/a/tar/tar.SlackBuild
index 21484f4c..ea608f0b 100755
--- a/source/a/tar/tar.SlackBuild
+++ b/source/a/tar/tar.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2005-2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
 
 # Slackware build script for tar
 
-VERSION=1.23
+VERSION=1.26
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:--j7}
@@ -99,8 +99,9 @@ zcat $CWD/tar.norecordsizespam.diff.gz | patch -p1 --verbose || exit 1
 zcat $CWD/tar.nolonezero.diff.gz | patch -p1 --verbose || exit 1
 
 # Add support for *.txz files (our packages)
-zcat $CWD/tar-1.23-support_txz.diff.gz | patch -p1 --verbose || exit1
+zcat $CWD/tar-1.2x.support_txz.diff.gz | patch -p1 --verbose || exit 1
 
+FORCE_UNSAFE_CONFIGURE=1 \
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
diff --git a/source/a/tar/tar.nolonezero.diff b/source/a/tar/tar.nolonezero.diff
index 0209c692..e1316beb 100644
--- a/source/a/tar/tar.nolonezero.diff
+++ b/source/a/tar/tar.nolonezero.diff
@@ -1,22 +1,21 @@
-diff -Nur tar-1.23.orig//src/list.c tar-1.23//src/list.c
---- tar-1.23.orig//src/list.c	2010-01-26 05:28:09.000000000 -0600
-+++ tar-1.23//src/list.c	2010-03-15 23:46:19.841670026 -0500
-@@ -138,6 +138,14 @@
+--- ./src/list.c.orig	2010-11-01 15:34:59.000000000 -0500
++++ ./src/list.c	2010-11-08 13:42:14.000000000 -0600
+@@ -212,6 +212,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         
++	      /* 
++	       * 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 (&current_header, &current_stat_info, 
-@@ -147,6 +155,7 @@
+ 	      status = read_header (&current_header, &current_stat_info,
+@@ -221,6 +229,7 @@
  	      WARNOPT (WARN_ALONE_ZERO_BLOCK,
  		       (0, 0, _("A lone zero block at %s"),
  			STRINGIFY_BIGINT (current_block_ordinal (), buf)));
diff --git a/source/a/tcsh/tcsh.SlackBuild b/source/a/tcsh/tcsh.SlackBuild
index 65396478..8cf4feb4 100755
--- a/source/a/tcsh/tcsh.SlackBuild
+++ b/source/a/tcsh/tcsh.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,10 +21,19 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=6.15.00
-ARCH=${ARCH:-x86_64}
+VERSION=6.17.00
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-tcsh
@@ -41,7 +50,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf tcsh-$VERSION
-tar xjvf $CWD/tcsh-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/tcsh-$VERSION.tar.?z* || exit 1
 cd tcsh-$VERSION
 
 # The LS_COLORS variable shared by tcsh has new options in recent
diff --git a/source/a/time/time.SlackBuild b/source/a/time/time.SlackBuild
index 108e7a8b..f095088e 100755
--- a/source/a/time/time.SlackBuild
+++ b/source/a/time/time.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=1.7
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-time
diff --git a/source/a/tree/tree.SlackBuild b/source/a/tree/tree.SlackBuild
index d20c3c1e..540b2047 100755
--- a/source/a/tree/tree.SlackBuild
+++ b/source/a/tree/tree.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2007-2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2007-2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,10 +20,19 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=1.5.2.2
-ARCH=${ARCH:-x86_64}
+VERSION=1.5.3
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-tree
@@ -50,7 +59,7 @@ 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 \
+  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
diff --git a/source/a/udev/config/rc.d/rc.udev.new b/source/a/udev/config/rc.d/rc.udev.new
index 40f38d1d..6a6218f6 100644
--- a/source/a/udev/config/rc.d/rc.udev.new
+++ b/source/a/udev/config/rc.d/rc.udev.new
@@ -35,8 +35,8 @@ case "$1" in
 
         # 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 "27" ]; then
-            echo "Sorry, but you need a 2.6.27+ kernel to use udev."
+          if [ "$(uname -r | cut -f 3 -d . | sed 's/[^[:digit:]].*//')" -lt "32" ]; then
+            echo "Sorry, but you need a 2.6.32+ kernel to use this udev."
             echo "Your kernel version is only $(uname -r)."
             echo
             echo "FATAL:  Refusing to run /etc/rc.d/rc.udev."
@@ -48,7 +48,7 @@ case "$1" in
         # 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
+          chmod 0644 /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."
@@ -104,29 +104,21 @@ case "$1" in
           )
 	else	# udev is just now being started, so we'll do some initial setup:
 
-          # Set STARTUP=1 in the environment
-          /sbin/udevadm control --property=STARTUP=1
-
-	  # Set OPT="--action=add" to generate add events on coldplug
-	  OPT="--action=add"
-
-	  # Add the static nodes to $UDEV_ROOT:
-	  cp --preserve=all --recursive --remove-destination /lib/udev/devices/* $UDEV_ROOT
-	  
 	  # 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
+	  echo 'ACTION!="remove", SUBSYSTEM=="block", ENV{MAJOR}=="'$MAJORNUMBER'", ENV{MINOR}=="'$MINORNUMBER'", SYMLINK+="root"' > /dev/.udev/rules.d/61-dev-root-link.rules
+
+	  # Set OPT="--action=add" to generate add events on coldplug
+	  OPT="--action=add"
 
 	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
-        # Unset STARTUP=1 in the environment
-        /sbin/udevadm control --property=STARTUP=
 
 	;;
     stop)
diff --git a/source/a/udev/config/rules.d/40-slackware.rules b/source/a/udev/config/rules.d/40-slackware.rules
index 29b6071e..6883f526 100644
--- a/source/a/udev/config/rules.d/40-slackware.rules
+++ b/source/a/udev/config/rules.d/40-slackware.rules
@@ -14,3 +14,6 @@
 # input devices
 KERNEL=="mice",		SYMLINK+="mouse"
 
+# Set rfkill device writable by netdev group
+KERNEL=="rfkill", GROUP:="netdev", MODE:="0664"
+
diff --git a/source/a/udev/config/udev.conf b/source/a/udev/config/udev.conf
index b0421a08..c8506e4b 100644
--- a/source/a/udev/config/udev.conf
+++ b/source/a/udev/config/udev.conf
@@ -9,6 +9,6 @@ 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>
+# internal state can be changed with:  udevadm control log_priority=<value>
 udev_log="err"
 
diff --git a/source/a/udev/doinst.sh b/source/a/udev/doinst.sh
index 5e737ca0..5b7f5f90 100644
--- a/source/a/udev/doinst.sh
+++ b/source/a/udev/doinst.sh
@@ -37,3 +37,5 @@ config etc/modprobe.d/isapnp.conf.new
 config etc/modprobe.d/psmouse.conf.new
 config etc/modprobe.d/usb-controller.conf.new
 
+/sbin/udevadm info --convert-db 1>/dev/null 2>/dev/null
+
diff --git a/source/a/udev/rule_generator.diff b/source/a/udev/rule_generator.diff
index f3f67516..212c09f1 100644
--- a/source/a/udev/rule_generator.diff
+++ b/source/a/udev/rule_generator.diff
@@ -1,17 +1,17 @@
-diff -Naur udev.orig/extras/rule_generator/write_cd_rules udev/extras/rule_generator/write_cd_rules
---- udev.orig/extras/rule_generator/write_cd_rules	2009-05-19 00:24:39.000000000 -0300
-+++ udev/extras/rule_generator/write_cd_rules	2009-05-19 01:02:17.000000000 -0300
+diff -Nur udev-159.orig//extras/rule_generator/write_cd_rules udev-159/extras/rule_generator/write_cd_rules
+--- udev-159.orig//extras/rule_generator/write_cd_rules	2010-06-25 04:37:36.000000000 -0500
++++ udev-159/extras/rule_generator/write_cd_rules	2010-07-07 02:44:14.501947041 -0500
 @@ -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.
- #
++# by cdrom_id and uses ID_PATH or ID_SERIAL or ID_MODEL and ID_REVISION to
++# identify the device.
+ 
  # (C) 2006 Marco d'Itri <md@Linux.IT>
  #
-@@ -96,18 +97,57 @@
+@@ -105,18 +106,57 @@
  choose_rules_file
  
  link_num=$(find_next_available 'cdrom[0-9]*')
diff --git a/source/a/udev/udev-153.tar.sign b/source/a/udev/udev-153.tar.sign
deleted file mode 100644
index 193f3a0e..00000000
--- a/source/a/udev/udev-153.tar.sign
+++ /dev/null
@@ -1,8 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-Comment: See http://www.kernel.org/signature.html for info
-
-iD8DBQBLzqFNyGugalF9Dw4RApGYAKCVo2YvsfeOD/ozq/rsURNM/AoxrwCcCJl1
-YD0LnOVyqilDyMQdOk2VA7o=
-=hHbP
------END PGP SIGNATURE-----
diff --git a/source/a/udev/udev.SlackBuild b/source/a/udev/udev.SlackBuild
index e891fca3..c6f83a0e 100755
--- a/source/a/udev/udev.SlackBuild
+++ b/source/a/udev/udev.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=${VERSION:-$(echo udev-*.tar.* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -58,6 +58,14 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# So this is a major bug.  At least, it triggers one in the kernel.
+# We'll revert it for now.  If left in place, machines using ATA
+# (especially PATA) are liable to randomly crash on reboot.
+# The last little bit of this patch fails to reverse but it won't matter.
+if [ $VERSION = 165 ]; then
+  zcat $CWD/udev.git-560de575148b7efda3b34a7f7073abd483c5f08e.patch.gz | patch -p1 -R
+fi
+
 # Fixup the rule generator for our use
 zcat $CWD/rule_generator.diff.gz | patch -p1 || exit 1
 
@@ -73,7 +81,7 @@ zcat $CWD/rule_generator.diff.gz | patch -p1 || exit 1
   --disable-introspection \
   --mandir=/usr/man \
   --docdir=/usr/doc/udev-$VERSION \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
@@ -106,6 +114,8 @@ find $PKG/etc -type d -exec chmod 755 {} \;
 chmod 0755 $PKG/etc/rc.d/rc.udev.new
 
 # Add extra device nodes to the package that udev doesn't make:
+# As of 156, some of these aren't be needed any more:
+# removed core@  fd@  stderr@  stdin@  stdout@ 
 tar xvf $CWD/udev-fixed-devices.tar.gz -C $PKG
 
 # Add various helper scripts:
@@ -113,18 +123,15 @@ 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/*
+chmod 0755 $PKG/lib/udev/*
 
 # Move the pkgconfig file to where we expect it
 mv $PKG/usr/share/pkgconfig/* $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
 rmdir $PKG/usr/share/pkgconfig
 
-# Kill the ConsoleKit stuff
-rm -rf $PKG/usr/lib/ConsoleKit ; rmdir $PKG/usr/lib 2>/dev/null
-
 mkdir -p $PKG/usr/doc/udev-$VERSION
 cp -a \
-  COPYING* README* TODO \
+  COPYING* README* TODO extras/keymap/README.keymap.txt \
   $PKG/usr/doc/udev-$VERSION
 
 # Don't package the API docs:
diff --git a/source/a/udev/udev.git-560de575148b7efda3b34a7f7073abd483c5f08e.patch b/source/a/udev/udev.git-560de575148b7efda3b34a7f7073abd483c5f08e.patch
new file mode 100644
index 00000000..fc991b9a
--- /dev/null
+++ b/source/a/udev/udev.git-560de575148b7efda3b34a7f7073abd483c5f08e.patch
@@ -0,0 +1,305 @@
+From 560de575148b7efda3b34a7f7073abd483c5f08e Mon Sep 17 00:00:00 2001
+From: David Zeuthen <davidz@redhat.com>
+Date: Thu, 4 Nov 2010 08:55:58 -0400
+Subject: [PATCH 1/1] Use ata_id, not scsi_id, on ATAPI devices
+
+The major benefit here, is that we get the ATAPI device serial
+number. With SCSI ID we didn't get this since it's not part of the
+SCSI INQUIRY command. Specifically this means that we get symlinks to
+empty optical drives, e.g.
+
+ /dev/disk/by-id/ata-VBOX_CD-ROM_VB2-01700376
+
+which we didn't get earlier. So this is a major win.
+
+Also make ata_id work on CD-ROM devices when using /dev/bsg nodes so
+this works on both the scsi_device as well as the block device. We do
+this, basically, by issuing the ATA IDENTIFY PACKET DEVICE command
+instead of the ATA IDENTIFY command. We also use 16-byte pass-through
+ATA passthrough instead of 12-byte passthrough to avoid clashing with
+the MMC BLANK command.
+
+This means that we get this output
+
+ # udevadm info -q all -p /sys/devices/pci0000:00/0000:00:01.1/host3/target3:0:0/3:0:0:0
+ P: /devices/pci0000:00/0000:00:01.1/host3/target3:0:0/3:0:0:0
+ E: UDEV_LOG=3
+ E: DEVPATH=/devices/pci0000:00/0000:00:01.1/host3/target3:0:0/3:0:0:0
+ E: DEVTYPE=scsi_device
+ E: DRIVER=sr
+ E: MODALIAS=scsi:t-0x05
+ E: SUBSYSTEM=scsi
+ E: ID_ATA=1
+ E: ID_TYPE=cd
+ E: ID_BUS=ata
+ E: ID_MODEL=VBOX_CD-ROM
+ E: ID_MODEL_ENC=VBOX\x20CD-ROM\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x 20\x20\x20\x20\x20\x20\x20
+ E: ID_REVISION=1.0
+ E: ID_SERIAL=VBOX_CD-ROM_VB2-01700376
+ E: ID_SERIAL_SHORT=VB2-01700376
+
+instead of just
+
+ # udevadm info -q all -p /sys/devices/pci0000:00/0000:00:01.1/host3/target3:0:0/3:0:0:0
+ P: /devices/pci0000:00/0000:00:01.1/host3/target3:0:0/3:0:0:0
+ E: UDEV_LOG=3
+ E: DEVPATH=/devices/pci0000:00/0000:00:01.1/host3/target3:0:0/3:0:0:0
+ E: DEVTYPE=scsi_device
+ E: DRIVER=sr
+ E: MODALIAS=scsi:t-0x05
+ E: SUBSYSTEM=scsi
+ E: ID_SCSI=1
+ E: ID_VENDOR=VBOX
+ E: ID_VENDOR_ENC=VBOX\x20\x20\x20\x20
+ E: ID_MODEL=CD-ROM
+ E: ID_MODEL_ENC=CD-ROM\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20
+ E: ID_REVISION=1.0
+ E: ID_TYPE=cd
+
+Signed-off-by: David Zeuthen <davidz@redhat.com>
+---
+ extras/ata_id/ata_id.c                    |  122 ++++++++++++++++++++++++++---
+ rules/rules.d/60-persistent-storage.rules |    4 +
+ 2 files changed, 114 insertions(+), 12 deletions(-)
+
+diff --git a/extras/ata_id/ata_id.c b/extras/ata_id/ata_id.c
+index 41544e9..92387e5 100644
+--- a/extras/ata_id/ata_id.c
++++ b/extras/ata_id/ata_id.c
+@@ -202,6 +202,89 @@ static int disk_identify_command(int	  fd,
+ 	return ret;
+ }
+ 
++static int disk_identify_packet_device_command(int	  fd,
++					       void	 *buf,
++					       size_t	  buf_len)
++{
++	struct sg_io_v4 io_v4;
++	uint8_t cdb[16];
++	uint8_t sense[32];
++	uint8_t *desc = sense+8;
++	int ret;
++
++	/*
++	 * ATA Pass-Through 16 byte command, as described in
++	 *
++	 *  T10 04-262r8 ATA Command Pass-Through
++	 *
++	 * from http://www.t10.org/ftp/t10/document.04/04-262r8.pdf
++	 */
++	memset(cdb, 0, sizeof(cdb));
++	cdb[0] = 0x85;			/* OPERATION CODE: 16 byte pass through */
++	cdb[1] = 4 << 1;		/* PROTOCOL: PIO Data-in */
++	cdb[2] = 0x2e;			/* OFF_LINE=0, CK_COND=1, T_DIR=1, BYT_BLOK=1, T_LENGTH=2 */
++	cdb[3] = 0;			/* FEATURES */
++	cdb[4] = 0;			/* FEATURES */
++	cdb[5] = 0;			/* SECTORS */
++	cdb[6] = 1;			/* SECTORS */
++	cdb[7] = 0;			/* LBA LOW */
++	cdb[8] = 0;			/* LBA LOW */
++	cdb[9] = 0;			/* LBA MID */
++	cdb[10] = 0;			/* LBA MID */
++	cdb[11] = 0;			/* LBA HIGH */
++	cdb[12] = 0;			/* LBA HIGH */
++	cdb[13] = 0;			/* DEVICE */
++	cdb[14] = 0xA1;			/* Command: ATA IDENTIFY PACKET DEVICE */;
++	cdb[15] = 0;			/* CONTROL */
++	memset(sense, 0, sizeof(sense));
++
++	memset(&io_v4, 0, sizeof(struct sg_io_v4));
++	io_v4.guard = 'Q';
++	io_v4.protocol = BSG_PROTOCOL_SCSI;
++	io_v4.subprotocol = BSG_SUB_PROTOCOL_SCSI_CMD;
++	io_v4.request_len = sizeof (cdb);
++	io_v4.request = (uintptr_t) cdb;
++	io_v4.max_response_len = sizeof (sense);
++	io_v4.response = (uintptr_t) sense;
++	io_v4.din_xfer_len = buf_len;
++	io_v4.din_xferp = (uintptr_t) buf;
++	io_v4.timeout = COMMAND_TIMEOUT_MSEC;
++
++	ret = ioctl(fd, SG_IO, &io_v4);
++	if (ret != 0) {
++		/* could be that the driver doesn't do version 4, try version 3 */
++		if (errno == EINVAL) {
++			struct sg_io_hdr io_hdr;
++
++			memset(&io_hdr, 0, sizeof(struct sg_io_hdr));
++			io_hdr.interface_id = 'S';
++			io_hdr.cmdp = (unsigned char*) cdb;
++			io_hdr.cmd_len = sizeof (cdb);
++			io_hdr.dxferp = buf;
++			io_hdr.dxfer_len = buf_len;
++			io_hdr.sbp = sense;
++			io_hdr.mx_sb_len = sizeof (sense);
++			io_hdr.dxfer_direction = SG_DXFER_FROM_DEV;
++			io_hdr.timeout = COMMAND_TIMEOUT_MSEC;
++
++			ret = ioctl(fd, SG_IO, &io_hdr);
++			if (ret != 0)
++				goto out;
++		} else {
++			goto out;
++		}
++	}
++
++	if (!(sense[0] == 0x72 && desc[0] == 0x9 && desc[1] == 0x0c)) {
++		errno = EIO;
++		ret = -1;
++		goto out;
++	}
++
++ out:
++	return ret;
++}
++
+ /**
+  * disk_identify_get_string:
+  * @identify: A block of IDENTIFY data
+@@ -256,31 +339,36 @@ static void disk_identify_fixup_uint16 (uint8_t identify[512], unsigned int offs
+  * @udev: The libudev context.
+  * @fd: File descriptor for the block device.
+  * @out_identify: Return location for IDENTIFY data.
++ * @out_is_packet_device: Return location for whether returned data is from a IDENTIFY PACKET DEVICE.
+  *
+- * Sends the IDENTIFY DEVICE command to the device represented by
+- * @fd. If successful, then the result will be copied into
+- * @out_identify.
++ * Sends the IDENTIFY DEVICE or IDENTIFY PACKET DEVICE command to the
++ * device represented by @fd. If successful, then the result will be
++ * copied into @out_identify and @out_is_packet_device.
+  *
+  * This routine is based on code from libatasmart, Copyright 2008
+  * Lennart Poettering, LGPL v2.1.
+  *
+- * Returns: 0 if the IDENTIFY data was successfully obtained,
+- * otherwise non-zero with errno set.
++ * Returns: 0 if the data was successfully obtained, otherwise
++ * non-zero with errno set.
+  */
+ static int disk_identify (struct udev *udev,
+ 			  int	       fd,
+-			  uint8_t      out_identify[512])
++			  uint8_t      out_identify[512],
++			  int	      *out_is_packet_device)
+ {
+ 	int ret;
+ 	uint8_t inquiry_buf[36];
+ 	int peripheral_device_type;
+ 	int all_nul_bytes;
+ 	int n;
++	int is_packet_device;
+ 
+ 	assert (out_identify != NULL);
++
+ 	/* init results */
+ 	ret = -1;
+ 	memset (out_identify, '\0', 512);
++	is_packet_device = 0;
+ 
+ 	/* If we were to use ATA PASS_THROUGH (12) on an ATAPI device
+ 	 * we could accidentally blank media. This is because MMC's BLANK
+@@ -309,6 +397,12 @@ static int disk_identify (struct udev *udev,
+ 
+ 	/* SPC-4, section 6.4.2: Standard INQUIRY data */
+ 	peripheral_device_type = inquiry_buf[0] & 0x1f;
++	if (peripheral_device_type == 0x05)
++	  {
++	    is_packet_device = 1;
++	    ret = disk_identify_packet_device_command(fd, out_identify, 512);
++	    goto check_nul_bytes;
++	  }
+ 	if (peripheral_device_type != 0x00) {
+ 		ret = -1;
+ 		errno = EIO;
+@@ -320,6 +414,7 @@ static int disk_identify (struct udev *udev,
+ 	if (ret != 0)
+ 		goto out;
+ 
++ check_nul_bytes:
+ 	 /* Check if IDENTIFY data is all NUL bytes - if so, bail */
+ 	all_nul_bytes = 1;
+ 	for (n = 0; n < 512; n++) {
+@@ -336,6 +431,8 @@ static int disk_identify (struct udev *udev,
+ 	}
+ 
+ out:
++	if (out_is_packet_device != NULL)
++	  *out_is_packet_device = is_packet_device;
+ 	return ret;
+ }
+ 
+@@ -350,7 +447,7 @@ int main(int argc, char *argv[])
+ {
+ 	struct udev *udev;
+ 	struct hd_driveid id;
+-	 uint8_t identify[512];
++	uint8_t identify[512];
+ 	char model[41];
+ 	char model_enc[256];
+ 	char serial[21];
+@@ -358,8 +455,9 @@ int main(int argc, char *argv[])
+ 	const char *node = NULL;
+ 	int export = 0;
+ 	int fd;
+-	 uint16_t word;
++	uint16_t word;
+ 	int rc = 0;
++	int is_packet_device = 0;
+ 	static const struct option options[] = {
+ 		{ "export", no_argument, NULL, 'x' },
+ 		{ "help", no_argument, NULL, 'h' },
+@@ -408,7 +506,7 @@ int main(int argc, char *argv[])
+ 		goto exit;
+ 	}
+ 
+-	if (disk_identify(udev, fd, identify) == 0) {
++	if (disk_identify(udev, fd, identify, &is_packet_device) == 0) {
+ 		/*
+ 		 * fix up only the fields from the IDENTIFY data that we are going to
+ 		 * use and copy it into the hd_driveid struct for convenience
+@@ -416,7 +514,7 @@ int main(int argc, char *argv[])
+ 		disk_identify_fixup_string (identify,  10, 20);	/* serial */
+ 		disk_identify_fixup_string (identify,  23,  6);	/* fwrev */
+ 		disk_identify_fixup_string (identify,  27, 40);	/* model */
+-		disk_identify_fixup_uint16 (identify,   0);	/* configuration */
++		disk_identify_fixup_uint16 (identify,	0);	/* configuration */
+ 		disk_identify_fixup_uint16 (identify,  75);	/* queue depth */
+ 		disk_identify_fixup_uint16 (identify,  75);	/* SATA capabilities */
+ 		disk_identify_fixup_uint16 (identify,  82);	/* command set supported */
+@@ -457,8 +555,8 @@ int main(int argc, char *argv[])
+ 	udev_util_replace_chars(revision, NULL);
+ 
+ 	if (export) {
+-		  /* Set this to convey the disk speaks the ATA protocol */
+-		  printf("ID_ATA=1\n");
++		/* Set this to convey the disk speaks the ATA protocol */
++		printf("ID_ATA=1\n");
+ 
+ 		if ((id.config >> 8) & 0x80) {
+ 			/* This is an ATAPI device */
+diff --git a/rules/rules.d/60-persistent-storage.rules b/rules/rules.d/60-persistent-storage.rules
+index d3f2f73..8baabc2 100644
+--- a/rules/rules.d/60-persistent-storage.rules
++++ b/rules/rules.d/60-persistent-storage.rules
+@@ -12,6 +12,8 @@ ACTION=="remove", GOTO="persistent_storage_end"
+ 
+ # run scsi_id and ata_id on the actual SCSI device
+ SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", ENV{ID_SERIAL}!="?*", ATTR{vendor}=="ATA", IMPORT{program}="ata_id --export $root/bsg/$kernel"
++# ATA/ATAPI devices is of type 0x05 and vendor is usually not ATA
++SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", ENV{ID_SERIAL}!="?*", ATTR{type}=="5", IMPORT{program}="ata_id --export $root/bsg/$kernel"
+ SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", ENV{ID_SERIAL}!="?*", IMPORT{program}="scsi_id --whitelisted --export --device $root/bsg/$kernel"
+ 
+ # from this point on, only care about block devices
+@@ -40,6 +42,8 @@ KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="usb", IMPORT{program
+ KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="ata", IMPORT{program}="ata_id --export $tempnode"
+ # ATA devices using the "scsi" subsystem
+ KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", IMPORT{program}="ata_id --export $tempnode"
++# ATA/ATAPI devices using the "scsi" subsystem
++KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="scsi", ATTRS{type}=="5", IMPORT{program}="ata_id --export $tempnode"
+ # scsi devices
+ KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", IMPORT{program}="scsi_id --export --whitelisted -d $tempnode", ENV{ID_BUS}="scsi"
+ KERNEL=="cciss*", ENV{DEVTYPE}=="disk", ENV{ID_SERIAL}!="?*", IMPORT{program}="scsi_id --export --whitelisted -d $tempnode", ENV{ID_BUS}="cciss"
+-- 
+1.7.3.4
+
diff --git a/source/a/unarj/unarj.SlackBuild b/source/a/unarj/unarj.SlackBuild
index 56097eb2..2444052e 100755
--- a/source/a/unarj/unarj.SlackBuild
+++ b/source/a/unarj/unarj.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=265
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-unarj
diff --git a/source/a/usb_modeswitch/device_reference.txt b/source/a/usb_modeswitch/device_reference.txt
new file mode 100644
index 00000000..10fb5fe8
--- /dev/null
+++ b/source/a/usb_modeswitch/device_reference.txt
@@ -0,0 +1,2102 @@
+#
+# Device and Configuration Reference (UTF-8 encoding used)
+#
+# Last modified: 2010-08-26
+#
+# Collection of configurations for usb_modeswitch, a mode switching
+# tool for controlling flip flop (multiple mode) USB devices
+#
+# Detailed instructions and a friendly forum on the homepage:
+# http://www.draisberghof.de/usb_modeswitch
+#
+# You may want to check for a newer version of this file at:
+# http://www.draisberghof.de/usb_modeswitch/device_reference.txt
+
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#
+# Important! This file is just a reference! Use the data package!
+#
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+
+# In order to activate a device included here you might remove the
+# comment signs (";") from the respective entry.
+#
+# It is rather recommended to copy device information to a different
+# file, to ease editing work and oversight and to avoid possible
+# conflicts by activating multiple entries.
+# There is no guarantee that this file is error-free!
+#
+# The actual entries are further down, after the command reference.
+
+
+# For custom settings:
+# Numbers can be decimal or hexadecimal, MessageStrings MUST be
+# hexadecimal without prepended "0x". Digits 9-16 in the known
+# MessageStrings are arbitrary; I set them to "12345678"
+
+# What it all means (short command line flags appended):
+#
+#
+# * DefaultVendor            -v <hex number>
+# * DefaultProduct           -p <hex number>
+#
+# This is the ID the USB device shows after having been plugged in.
+# The program needs this; if not found -> no action.
+#
+#
+# * TargetVendor             -V <hex number>
+# * TargetProduct            -P <hex number>
+#
+# These are the IDs of the USB device after successful mode switching.
+# They are optional, but I recommend to provide them for better analysis.
+# You definitely need them if you enable CheckSuccess (see below)
+#
+#
+# * TargetProductList        (file only) <comma separated hex strings>
+#
+# Like TargetProduct, but more than one possibility. Only used in automated
+# config files (in /etc/usb_modeswitch.d).
+#
+#
+# * TargetClass              -C <hex number>
+#
+# Some weird devices don't change IDs. They only switch the device class.
+# If the device has the target class -> no action (and vice versa)
+#
+#
+# * MessageEndpoint          -m <hex number>
+# 
+# A kind of address inside the interface to which the "message"
+# (the sequence that does the actual switching) is directed.
+# Starting from version 0.9.7 the MessageEndpoint is autodetected
+# if not given
+#
+#
+# * MessageContent           -M <hex string>
+#
+# A hex string containing the "message" sequence; it will be
+# sent as a USB bulk transfer
+#
+#
+# * MessageContent2, ...3    -2/-3 <hex string>
+#
+# Additional "messages". Use with "NeedResponse"!
+#
+#
+# * ReleaseDelay             -w <milliseconds>
+#
+# Waiting time after message transfers. Helps with some sensitive devices
+#
+#
+# * ResponseEndpoint         -r <hex number>
+# * NeedResponse <0/1>       -n
+#
+# Some devices were reported to require receiving the response of the
+# bulk transfer to do the switching properly. Usually not needed.
+# Starting from version 1.0.0 the ResponseEndpoint is autodetected
+# if not given
+#
+#
+# * DetachStorageOnly <0/1>  -d
+#
+# Some devices just need to be detached from the usb-storage
+# driver to initiate the mode switching. Using this feature
+# instead of removing the whole usbstorage module keeps other
+# storage devices working.
+#
+#
+# * HuaweiMode <0/1>         -H
+#
+# Some Huawei devices can be switched by a special control
+# message.
+#
+#
+# * SierraMode <0/1>         -S
+#
+# Some Sierra devices can be switched by a special control
+# message.
+#
+#
+# * SonyMode <0/1>           -O
+#
+# Some Sony-Ericsson devices can be switched by a special control
+# message. This is experimental and might not have a stable result
+#
+# * KobilMode <0/1>         -T
+#
+# Some Kobil devices can be switched by a special control
+# message.
+#
+#
+# * ResetUSB <0/1>           -R
+#
+# Some devices need a rougher treatment. If the switching seems
+# to do something (run udevmonitor), but your system does not reflect
+# it, try this somewhat brutal method to do a reset after switching.
+# Mind that if your device switched OK before, this will probably set
+# it back to storage mode ...
+#
+#
+# * Interface                -i <hex number>
+# * Configuration            -u <hex number>
+# * AltSetting               -a <hex number>
+#
+# More USB parameter to help with tricky devices and for doing lots
+# of cruel experiments ...
+#
+## Note:
+## AltSetting/Configuration changes and ResetUSB are executed after all
+## other steps and can be combined or used on their own (e.g. a reset
+## might have the same effect as a manual replug)
+#
+#
+# * InquireDevice <0|1>      -I (disables inquiry)
+#
+# The standard since 1.0.0 is to do a SCSI inquiry on the default device
+# before other actions. This might be a future way to identify a device
+# without ambiguities. If it causes trouble with your device, just disable.
+#
+#
+# * CheckSuccess             -s <number>
+#
+# Check continuously if the switch succeeded for max <number> seconds.
+# First, an interface access test: most devices vanish after
+# switching and can't be accessed anymore.
+# Second, a recount of target devices: one more than at the initial
+# count, at the same bus with a higher device number -> device
+# switched fine.
+# It's safe to give a higher value than needed; checking stops as
+# soon as the target device is found
+#
+#
+# * NoDriverLoading <0|1>    (no command line parameter)
+#
+# The binary tells the wrapper script NOT to check for and initiate
+# binding of the serial driver after switching.
+# Mostly useful for non-modem devices
+#
+#
+# -> All other entries are just ignored <-
+
+# Additional command line flags:
+# 
+# Verbose output             -W
+# No output at all           -q
+# Other config file          -c <file>
+
+# For filling in all this information for an unknown device,
+# see instructions and links on the homepage:
+# http://www.draisberghof.de/usb_modeswitch
+#
+# If you find working codes and configurations, please contribute
+# them!
+
+
+#######################################################
+# Option GlobeSurfer Icon (aka "Vodafone EasyBox")
+#
+# The message SHOULD be the same for all Option devices
+
+;DefaultVendor=  0x05c6
+;DefaultProduct= 0x1000
+
+;TargetVendor=   0x0af0
+;TargetProduct=  0x6600
+
+;MessageContent="55534243123456780000000000000601000000000000000000000000000000"
+
+
+#######################################################
+# Option GlobeSurfer Icon 7.2 
+#
+# Contributor: The Pharscape Forum
+
+;DefaultVendor=  0x05c6
+;DefaultProduct= 0x1000
+
+;TargetVendor=   0x0af0
+;TargetProduct=  0x6901
+
+;MessageContent="55534243123456780000000000000601000000000000000000000000000000"
+
+
+########################################################
+# Option GlobeTrotter GT MAX 3.6 (aka "T-Mobile Web'n'walk Card Compact II")
+#
+# Contributor: Bernd Holzmüller
+
+;DefaultVendor=  0x05c6
+;DefaultProduct= 0x1000
+
+;TargetVendor=   0x0af0
+;TargetProduct=  0x6600
+
+;MessageContent="55534243123456780000000000000601000000000000000000000000000000"
+
+# ResponseEndpoint=0x84
+
+;NeedResponse=1
+
+
+########################################################
+# Option GlobeTrotter GT MAX "7.2 Ready"
+#
+# Contributors: Lucas Benedicic, Morgwai Kotarbinski
+
+;DefaultVendor=  0x05c6
+;DefaultProduct= 0x1000
+
+;TargetVendor=   0x0af0
+;TargetProduct=  0x6701
+
+;MessageContent="55534243123456780000000000000601000000000000000000000000000000"
+
+
+########################################################
+# Option GlobeTrotter EXPRESS 7.2 (aka "T-Mobile wnw Express II")
+#
+# Contributor: Fridtjof Busse
+
+;DefaultVendor=  0x05c6
+;DefaultProduct= 0x1000
+
+;TargetVendor=   0x0af0
+;TargetProduct=  0x6701
+
+;MessageContent="55534243123456780000000000000601000000000000000000000000000000"
+
+# Response reading needed according to one (1) report
+;NeedResponse=1
+
+
+#######################################################
+# Option GlobeSurfer Icon 7.2, new firmware (HSO driver)
+#
+# Vendor/ProductID don't change when switching, only the device
+# class does. Most new Option devices work with this. Just adapt IDs!
+# HSO driver support is available at Pharscape (www.pharscape.org)
+#
+# Contributor: Paul Hardwick
+
+;DefaultVendor=  0x0af0
+;DefaultProduct= 0x6911
+
+;TargetClass=    0xff
+
+;MessageContent="55534243123456780000000000000601000000000000000000000000000000"
+
+
+########################################################
+# Option iCON 210
+# PROLiNK PHS100 (various looks)
+# Hyundai Mobile MB-810
+#
+# One report of switching with DetachStorageOnly. Needs at least
+# a second to settle before binding to usbserial
+#
+# Contributor: wahlm, Peter Kraker, Pakdhetimin Sekum
+
+;DefaultVendor=  0x1e0e
+;DefaultProduct= 0xf000
+
+;TargetVendor=   0x1e0e
+;TargetProduct=  0x9000
+
+;MessageContent="555342431234567800000000000006bd000000020000000000000000000000"
+
+;NeedResponse=1
+
+
+#######################################################
+# Option iCON 225 HSDPA
+#
+# New Firmware. HSO driver support is available at Pharscape (www.pharscape.org)
+#
+# Contributor: Matti Viljanen
+
+;DefaultVendor=  0x0af0
+;DefaultProduct= 0x6971
+
+;TargetClass=    0xff
+
+;MessageContent="555342431223456780100000080000601000000000000000000000000000000"
+
+
+#######################################################
+# Option GlobeTrotter HSUPA Modem (aka "T-Mobile Web'n'walk Card Compact III')
+#
+# New Firmware. HSO driver support is available at Pharscape (www.pharscape.org)
+#
+# Contributor: Gerold Gruber
+
+;DefaultVendor=  0x0af0
+;DefaultProduct= 0x7011
+
+;TargetClass=    0xff
+
+;MessageContent="55534243785634120100000080000601000000000000000000000000000000"
+
+
+###################################################### 
+# Option iCON 401
+#
+# HSO driver 
+#
+# Contributor: Vincent Teoh
+
+;DefaultVendor=  0x0af0
+;DefaultProduct= 0x7401
+
+;TargetClass=    0xff
+
+;MessageContent="55534243785634120100000080000601000000000000000000000000000000"
+
+;NeedResponse=1
+
+
+######################################################## 
+# Vodafone K3760 (made by Option, HSO driver) 
+#
+# Contributor: The Solutor
+
+;DefaultVendor=  0x0af0
+;DefaultProduct= 0x7501
+
+;TargetClass=    0xff
+
+;MessageContent="55534243785634120100000080000601000000000000000000000000000000"
+
+
+########################################################
+# AT&T USBConnect Quicksilver (made by Option, HSO driver)
+#
+# Contributor: sissie from Bullteam
+
+;DefaultVendor=  0x0af0
+;DefaultProduct= 0xd033
+
+;TargetClass=    0xff
+
+;MessageContent="55534243785634120100000080000601000000000000000000000000000000"
+
+
+########################################################
+# Huawei devices
+#
+# Contributor: Hans Kurent, Denis Sutter, Vincent Teoh
+
+;DefaultVendor=  0x12d1
+;DefaultProduct= 0x1003
+
+;TargetClass=    0xff
+
+;HuaweiMode=1
+
+
+########################################################
+# Huawei E169
+#
+# Contributor: Dale Lane
+
+;DefaultVendor=  0x12d1
+;DefaultProduct= 0x1001
+
+;TargetClass=    0xff
+
+# choose one of these:
+;DetachStorageOnly=1
+;HuaweiMode=1
+
+
+########################################################
+# Huawei E180
+#
+# Contributor: Tom Dawahare
+
+;DefaultVendor=  0x12d1
+;DefaultProduct= 0x1414
+
+;TargetClass=    0xff
+
+;HuaweiMode=1
+
+
+########################################################
+# Huawei E630
+#
+# There seem to be modem-only variants around - no storage,
+# no switching
+#
+# Contributor: Joakim Wenrgren
+
+;DefaultVendor=  0x1033
+;DefaultProduct= 0x0035
+
+;TargetVendor=   0x12d1
+;TargetProduct=  0x1003
+
+;HuaweiMode=1
+
+
+########################################################
+# ZTE MF620 (aka "Onda MH600HS")
+#
+# Probably works with DetachStorageOnly too
+#
+# Contributor: Flávio Moringa and others
+
+;DefaultVendor=  0x19d2
+;DefaultProduct= 0x2000
+
+;TargetVendor=   0x19d2
+;TargetProductList="0001"
+
+;MessageContent="5553424312345678000000000000061e000000000000000000000000000000"
+;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000"
+
+;NeedResponse=1
+
+
+########################################################
+# ZTE MF622 (aka "Onda MDC502HS"), MF100 and others
+#
+# Contributor: andylog
+
+;DefaultVendor=  0x19d2
+;DefaultProduct= 0x2000
+
+;TargetVendor=   0x19d2
+;TargetProduct=  0x0002
+
+;MessageContent="5553424312345678000000000000061e000000000000000000000000000000"
+;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000"
+
+;NeedResponse=1
+
+
+########################################################
+# ZTE MF628
+#
+# Captured with "usbmon". Has a micro SD slot which can be
+# activated alternatively
+#
+# Contributor: Alvaro Lopes <alvieboy at alvie dot com>
+
+;DefaultVendor=  0x19d2
+;DefaultProduct= 0x2000
+
+
+# To modem mode:
+
+;TargetVendor=   0x19d2
+;TargetProduct=  0x0015
+
+;MessageContent="5553424312345678000000000000061e000000000000000000000000000000"
+;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000"
+
+;NeedResponse=1
+
+# To SD slot mode:
+
+;TargetVendor=   0x05c6
+;TargetProduct=  0x2001
+
+;MessageContent="55534243123456782000000080000a86010101180101010101000000000000"
+
+;NeedResponse=1
+
+
+########################################################
+# ZTE MF622 (aka "Onda MDC502HS")
+# ZTE MF626
+# ZTE MF628+ (tested version from Telia / Sweden)
+# ZTE MF633
+# ZTE MF636 (aka "Telstra / BigPond 7.2 Mobile Card")
+# ZTE MF637
+#
+# Contributor: Joakim Wennergren and others
+
+;DefaultVendor=  0x19d2
+;DefaultProduct= 0x2000
+
+;TargetVendor=   0x19d2
+;TargetProduct=  0x0031
+
+;MessageContent="5553424312345678000000000000061e000000000000000000000000000000"
+;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000"
+
+;NeedResponse=1
+
+
+########################################################
+# ZTE MF638 (aka "Onda MDC525UP")
+#
+# Contributor: andylog
+
+;DefaultVendor=  0x19d2
+;DefaultProduct= 0x2000
+
+;TargetVendor=   0x19d2
+;TargetProduct=  0x0037
+
+;MessageContent="5553424312345678000000000000061e000000000000000000000000000000"
+;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000"
+
+;NeedResponse=1
+
+
+########################################################
+# ZTE AC8710
+# ZTE AC2726
+# and others
+#
+# Many new ZTE devices use this sequence. There are
+# several ID combinations; check your default
+#
+# Contributor: Michael Khurtsiya, Amit Pundir and others
+
+;DefaultVendor=  0x19d2
+;DefaultProduct= 0xfff5
+
+;TargetVendor=   0x19d2
+;TargetProduct=  0xffff
+
+# No. 2
+
+;DefaultVendor=  0x19d2
+;DefaultProduct= 0xfff6
+
+;TargetVendor=   0x19d2
+;TargetProduct=  0xfff1
+
+# No. 3
+
+;DefaultVendor=  0x19d2
+;DefaultProduct= 0xfff5
+
+;TargetVendor=   0x19d2
+;TargetProduct=  0xfff1
+
+;MessageContent="5553424312345678c00000008000069f030000000000000000000000000000"
+
+
+########################################################
+# ZTE AC2710 (EVDO) 
+#
+# Contributor: Wasim Baig
+
+;DefaultVendor=  0x19d2
+;DefaultProduct= 0xfff5
+
+;TargetVendor=   0x19d2
+;TargetProduct=  0xffff
+
+;MessageContent="5553424312345678c00000008000069f010000000000000000000000000000"
+
+# Just for information: try it with the message from the AC8710 ...
+
+
+########################################################
+# ZTE 6535-Z
+#
+# Contributor: David Taillandier
+
+;DefaultVendor=  0x19d2
+;DefaultProduct= 0x2000
+
+;TargetVendor=   0x19d2
+;TargetProduct=  0x0052
+
+;MessageContent="5553424312345678000000000000061e000000000000000000000000000000"
+;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000"
+
+;NeedResponse=1
+
+
+########################################################
+# ONDA MT503HS
+#
+# Contributor: Lucio Asnaghi a.k.a. kRAkEn/gORe
+
+;DefaultVendor=  0x19d2
+;DefaultProduct= 0x2000
+
+;TargetVendor=   0x19d2
+;TargetProduct=  0x0002
+
+;MessageContent="5553424312345678000000000000061e000000000000000000000000000000"
+;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000"
+
+;NeedResponse=1
+
+
+########################################################
+# ONDA MT505UP (most likely a ZTE model)
+#
+# Contributor: Alex Scortegagna
+
+;DefaultVendor=  0x19d2
+;DefaultProduct= 0x2000
+
+;TargetVendor=   0x19d2
+;TargetProduct=  0x0002
+
+;MessageContent="5553424312345678000000000000061e000000000000000000000000000000"
+;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000"
+
+;NeedResponse=1
+
+
+########################################################
+# Novatel Wireless Ovation MC950D HSUPA
+# Novatel Wireless Merlin XU950D
+# Novatel Wireless Ovation 930D
+#
+# Contributor: Razvan Dragomirescu, Mike Kirk
+
+;DefaultVendor=  0x1410
+;DefaultProduct= 0x5010
+
+;TargetVendor=   0x1410
+;TargetProduct=  0x4400
+
+;MessageContent="5553424312345678000000000000061b000000020000000000000000000000"
+;NeedResponse=1
+
+
+########################################################
+# Novatel U727 USB modem
+#
+# Modem only versions (no switching required) are around.
+#
+# Contributor: Chris Thielen
+
+;DefaultVendor=  0x1410
+;DefaultProduct= 0x5010
+
+;TargetVendor=   0x1410
+;TargetProduct=  0x4100
+
+;MessageContent="5553424312345678000000000000061b000000020000000000000000000000"
+;NeedResponse=1
+
+
+########################################################
+# Novatel MC990D
+#
+# Contributor: Joakim Wennergren
+
+;DefaultVendor=  0x1410
+;DefaultProduct= 0x5020
+
+;Interface=      5
+
+;MessageContent="5553424312345678000000000000061b000000020000000000000000000000"
+;NeedResponse=1
+
+
+########################################################
+# Novatel U760 USB modem
+#
+# Contributor: Richard Laager
+
+;DefaultVendor=  0x1410
+;DefaultProduct= 0x5030
+
+;TargetVendor=   0x1410
+;TargetProduct=  0x6000
+
+;MessageContent="5553424312345678000000000000061b000000020000000000000000000000"
+;NeedResponse=1
+
+
+########################################################
+# Alcatel One Touch X020 (aka OT-X020, aka MBD-100HU, aka Nuton 3.5G), works with Emobile D11LC
+# Alcatel One Touch X030 (aka OT-X030, aka Nuton NT36HD)
+#
+# Contributor: Aleksandar Samardzic, Marcelo Fernandez
+
+;DefaultVendor=  0x1c9e
+;DefaultProduct= 0x1001
+
+;TargetVendor=   0x1c9e
+;TargetProduct=  0x6061
+
+;MessageContent="55534243123456780000000000000606f50402527000000000000000000000"
+
+
+########################################################
+# Alcatel X200/X060S
+
+;DefaultVendor=  0x1bbb
+;DefaultProduct= 0xf000
+
+;TargetVendor=   0x1bbb
+;TargetProduct=  0x0000
+
+;MessageContent="55534243123456788000000080000606f50402527000000000000000000000"
+
+
+########################################################
+# AnyDATA ADU-500A, ADU-510A, ADU-510L, ADU-520A
+#
+# This ID gets an "Option" treatment by newer kernels.
+# Use module option "option_zero_cd=2" with usb-storage.
+# A kernel patch to fix the problem is pending
+#
+# Contributor: Vladimir Poluektov, Gabriel Smolar
+
+;DefaultVendor=  0x05c6
+;DefaultProduct= 0x1000
+
+;TargetVendor=   0x16d5
+;TargetProduct=  0x6502
+
+;MessageContent="5553424312345678000000000000061b000000020000000000000000000000"
+;NeedResponse=1
+
+
+########################################################
+# BandLuxe C120
+#
+# Reportedly needs several switch calls in a certain order. See
+# http://www.draisberghof.de/usb_modeswitch/bb/viewtopic.php?t=71
+# This might be a case to try the new ResetUSB function
+#
+# Contributor: Alexander Czigler
+
+;DefaultVendor=  0x1a8d
+;DefaultProduct= 0x1000
+
+;TargetVendor=   0x1a8d
+;TargetProduct=  0x1002
+
+;MessageContent="55534243123456781200000080000603000000020000000000000000000000"
+
+;NeedResponse=1
+
+
+########################################################
+# Solomon S3Gm-660
+#
+# Same notes apply as with the BandLuxe C120 above
+#
+# Contributor: Alexander Czigler
+
+;DefaultVendor=  0x1dd6
+;DefaultProduct= 0x1000
+
+;TargetVendor=   0x1dd6
+;TargetProduct=  0x1002
+
+;MessageContent="55534243123456781200000080000603000000020000000000000000000000"
+
+;NeedResponse=1
+
+
+########################################################
+# C-motech D-50 (aka "CDU-680")
+#
+# Interesting notes about the device in the forum post at
+# http://www.draisberghof.de/usb_modeswitch/bb/viewtopic.php?t=69
+#
+# Contributor: Alexander Czigler
+
+;DefaultVendor=  0x16d8
+;DefaultProduct= 0x6803
+
+;TargetVendor=   0x16d8
+;TargetProduct=  0x680a
+
+;MessageContent="555342431234567824000000800008ff524445564348470000000000000000"
+
+
+########################################################
+# C-motech CGU-628 (aka "Franklin Wireless CGU-628A" aka "4G Systems XS Stick W12")
+#
+# Contributor: Mathias Picker
+
+;DefaultVendor=  0x16d8
+;DefaultProduct= 0xf000
+
+;TargetVendor=   0x16d8
+;TargetProduct=  0x6006
+
+;MessageContent="55534243d85dd88524000000800008ff524445564348470000000000000000"
+
+
+########################################################
+# Toshiba G450
+#
+# Contributor: Mijail Anton
+
+;DefaultVendor=  0x0930
+;DefaultProduct= 0x0d46
+
+;TargetVendor=   0x0930
+;TargetProduct=  0x0d45
+
+;MessageContent="5553424312345678000000000000061b000000020000000000000000000000"
+
+;NeedResponse=1
+
+
+########################################################
+# UTStarcom UM175 (distributor "Alltel")
+#
+# Contributor: Mark A. Ziesemer
+
+;DefaultVendor=  0x106c
+;DefaultProduct= 0x3b03
+
+;TargetVendor=   0x106c
+;TargetProduct=  0x3715
+
+;MessageContent="555342431234567824000000800008ff024445564348470000000000000000"
+
+
+########################################################
+# Hummer DTM5731
+#
+# Contributor: "paul"
+
+;DefaultVendor=  0x1ab7
+;DefaultProduct= 0x5700
+
+;TargetVendor=   0x1ab7
+;TargetProduct=  0x5731
+
+;MessageContent="5553424312345678000000000000061b000000020000000000000000000000"
+
+;NeedResponse=1
+
+
+########################################################
+# A-Link 3GU
+#
+# Contributor: A-Link Europe Ltd.
+
+;DefaultVendor=  0x1e0e
+;DefaultProduct= 0xf000
+
+;TargetVendor=   0x1e0e
+;TargetProduct=  0x9200
+
+;MessageContent="5553424312345678000000000000061b000000020000000000000000000000"
+
+;NeedResponse=1
+
+
+########################################################
+# Sierra Wireless Compass 597
+#
+# Contributor: Vincent Teoh
+
+;DefaultVendor=  0x1199
+;DefaultProduct= 0x0fff
+
+;TargetVendor=   0x1199
+;TargetProduct=  0x0023
+
+;SierraMode=1
+
+
+########################################################
+# Sierra Wireless AirCard 881U (most likely 880U too)
+#
+# Contributor: Vincent Teoh
+
+;DefaultVendor=  0x1199
+;DefaultProduct= 0x0fff
+
+;TargetVendor=   0x1199
+;TargetProduct=  0x6856
+
+;SierraMode=1
+
+
+########################################################
+# Sony Ericsson MD400
+#
+# Special procedure, takes around 25 secs. on the whole
+
+;DefaultVendor=  0x0fce
+;DefaultProduct= 0xd0e1
+
+;TargetClass=    0x02
+
+;SonyMode=1
+;Configuration=2
+
+
+########################################################
+# LG LDU-1900D EV-DO (Rev. A)
+#
+# Recommended init command: ATE0V1&D2&C1S0=0
+#
+# Contributor: Jérôme Oufella
+
+;DefaultVendor=  0x1004
+;DefaultProduct= 0x1000
+
+;MessageContent="55534243123456780000000000000aff554d53434847000000000000000000"
+
+
+########################################################
+# Samsung SGH-Z810 USB (with microSD card)
+#
+# This ID gets a wrong "Option" treatment by newer kernels
+# from 2.6.29 to 2.6.31
+# Use module option "option_zero_cd=2" with usb-storage.
+# Problem fixed in 2.6.32
+#
+# Contributor: A Friend
+
+;DefaultVendor=  0x05c6
+;DefaultProduct= 0x1000
+
+;TargetVendor=   0x04e8
+;TargetProduct=  0x6601
+
+;MessageContent="55534243123456780000000000000616000000000000000000000000000000"
+
+
+######################################################## 
+# MobiData MBD-200HU
+#
+# Contributor: Stefan Olejnik
+
+;DefaultVendor=  0x1c9e
+;DefaultProduct= 0xf000
+
+;TargetVendor=   0x1c9e
+;TargetProduct=  0x9000
+
+;MessageContent="55534243123456788000000080000606f50402527000000000000000000000"
+
+
+########################################################
+# ST Mobile Connect HSUPA USB Modem
+#
+# Use /dev/ttyUSB2 for connecting
+#
+# Contributor: Vincent Teoh
+
+;DefaultVendor=  0x1c9e
+;DefaultProduct= 0xf000
+
+;TargetVendor=   0x1c9e
+;TargetProduct=  0x9063
+
+;MessageContent="55534243123456788000000080000606f50402527000000000000000000000"
+
+
+########################################################
+# MyWave SW006 Sport Phone/Modem Combination
+#
+# Has a card reader too, working fine
+# 
+# Contributor: Aaron Guidazzi
+
+;DefaultVendor=  0x1c9e
+;DefaultProduct= 0x9200
+
+;TargetVendor=   0x1c9e
+;TargetProduct=  0x9202
+
+;MessageContent="55534243123456780000000000000606f50402527000000000000000000000"
+
+
+########################################################
+# Cricket A600
+#
+# Switches to ACM device. Might need a ResetUSB after switching - or not
+#
+# Contributor: Jeffrey Hoogland
+
+;DefaultVendor=  0x1f28
+;DefaultProduct= 0x0021
+
+;TargetVendor=   0x1f28
+;TargetProduct=  0x0020
+
+;MessageContent="555342431234567824000000800108df200000000000000000000000000000"
+
+# Afterwards (optional): "usb_modeswitch -v 0x1f28 -p 0x0020 -R"
+
+
+########################################################
+# EpiValley SEC-7089 (featured by Alegro and Starcomms / iZAP)
+#
+# Contributor: Chris Wright
+
+;DefaultVendor=  0x1b7d
+;DefaultProduct= 0x0700
+
+;TargetVendor=   0x1b7d
+;TargetProduct=  0x0001
+
+;MessageContent="555342431234567824000000800008FF05B112AEE102000000000000000000"
+
+
+########################################################
+# Samsung U209
+#
+# Has a modem and a storage device after switching
+#
+# Contributor: Arif Ahmed
+
+;DefaultVendor=  0x04e8
+;DefaultProduct= 0xf000
+
+;TargetVendor=   0x04e8
+;TargetProduct=  0x6601
+
+;MessageContent="55534243123456780000000000000616000000000000000000000000000000"
+
+
+########################################################
+# Huawei E270+  (HSPA+ modem)
+# Huawei E1762
+# Huawei E1820
+#
+# Contributor: Paranoid Paranoia
+
+;DefaultVendor=  0x12d1
+;DefaultProduct= 0x1446
+
+;TargetVendor=   0x12d1
+;TargetProduct=  0x14ac
+
+;MessageContent="55534243123456780000000000000011060000000000000000000000000000"
+
+
+########################################################
+# Huawei E1550
+# Huawei E1750
+#
+# Contributor: Anders Blomdell, Ahmed Soliman
+
+;DefaultVendor=  0x12d1
+;DefaultProduct= 0x1446
+
+;TargetVendor=   0x12d1
+;TargetProduct=  0x1001
+
+;MessageContent="55534243123456780000000000000011060000000000000000000000000000"
+
+
+########################################################
+# ZTE K3520-Z
+#
+# Contributor: Paul McDermott
+
+;DefaultVendor=  0x19d2
+;DefaultProduct= 0x2000
+
+;TargetVendor=   0x19d2
+;TargetProduct=  0x0055
+
+;MessageContent="5553424312345678000000000000061e000000000000000000000000000000"
+;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000"
+
+;NeedResponse=1
+
+
+######################################################## 
+# MobiData MBD-200HU (aka 4G XS Stick W10/W14, aka Micromax MMX 300G,
+# aka ChinaBird CBCPL68)
+#
+# Contributor: Chris
+
+;DefaultVendor=  0x1c9e
+;DefaultProduct= 0xf000
+
+;TargetVendor=   0x1c9e
+;TargetProduct=  0x9603
+
+;MessageContent="55534243123456788000000080000606f50402527000000000000000000000"
+
+
+######################################################## 
+# D-Link DWM-162-U5, Micromax MMX 300c
+#
+# Contributor: Zhang Le
+
+;DefaultVendor=  0x05c6
+;DefaultProduct= 0x2001
+
+;TargetVendor=   0x1e0e
+;TargetProductList="ce16,cefe"
+
+;MessageContent="5553424312345678000000000000061b000000020000000000000000000000"
+
+;NeedResponse=1
+
+
+######################################################## 
+# Novatel MC760 3G
+#
+# Contributor: Matt Roberds
+
+;DefaultVendor=  0x1410
+;DefaultProduct= 0x5031
+
+;TargetVendor=   0x1410
+;TargetProduct=  0x6002
+
+;MessageContent="5553424312345678000000000000061b000000020000000000000000000000"
+
+;NeedResponse=1
+
+
+########################################################
+# ZTE MF110 (Variant)
+#
+# Contributor: Moritz Grosse-Wentrup
+
+;DefaultVendor=  0x19d2
+;DefaultProduct= 0x0053
+
+;TargetVendor=   0x19d2
+;TargetProduct=  0x0031
+
+;MessageContent="5553424312345678000000000000061b000000020000000000000000000000"
+;MessageContent2="55534243876543212000000080000c85010101180101010101000000000000"
+
+;NeedResponse=1
+
+
+########################################################
+# Philips TalkTalk (NXP Semiconductors "Dragonfly")
+#
+
+;DefaultVendor=  0x0471
+;DefaultProduct= 0x1237
+
+;TargetVendor=   0x0471
+;TargetProduct=  0x1234
+
+;MessageContent="5553424312345678000000000000061b000000030000000000000000000000"
+
+;NeedResponse=1
+
+
+########################################################
+# HuaXing E600 (NXP Semiconductors "Dragonfly")
+#
+# Contributor: Emfox Zhou
+
+;DefaultVendor=  0x0471
+;DefaultProduct= 0x1237
+
+;TargetVendor=   0x0471
+;TargetProduct=  0x1206
+
+;MessageContent="5553424312345678000000000000061b000000020000000000000000000000"
+
+;NeedResponse=1
+
+;Configuration=2
+
+
+########################################################
+# ZTE K3565
+#
+
+;DefaultVendor=  0x19d2
+;DefaultProduct= 0x2000
+
+;TargetVendor=   0x19d2
+;TargetProduct=  0x0063
+
+;MessageContent="5553424312345678000000000000061e000000000000000000000000000000"
+;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000"
+
+;NeedResponse=1
+
+
+########################################################
+# Motorola 802.11 bg WLAN (TER/GUSB3-E)
+#
+# Contributor: Prashad Prashant
+
+;DefaultVendor=  0x148f
+;DefaultProduct= 0x2578
+
+;TargetVendor=   0x148f
+;TargetProduct=  0x9021
+
+;MessageContent="5553424312345678000000000000061b000000020000000000000000000000"
+
+;NeedResponse=1
+
+
+########################################################
+# Huawei E1612
+#
+# Contributor: Genar Codina
+
+;DefaultVendor=  0x12d1
+;DefaultProduct= 0x1446
+
+;TargetVendor=   0x12d1
+;TargetProduct=  0x1406
+
+;MessageContent="55534243123456780000000000000011060000000000000000000000000000"
+
+
+########################################################
+# Huawei E1690
+# Huawei E1692
+# Huawei E1762
+#
+# Contributor: Carolin Latze and others
+
+;DefaultVendor=  0x12d1
+;DefaultProduct= 0x1446
+
+;TargetVendor=   0x12d1
+;TargetProduct=  0x140c
+
+;MessageContent="55534243123456780000000000000011060000000000000000000000000000"
+
+
+########################################################
+# C-motech CHU-629S
+#
+
+;DefaultVendor=  0x16d8
+;DefaultProduct= 0x700a
+
+;TargetClass=0xff
+
+;MessageContent="55534243123456782400000080000dfe524445564348473d4e444953000000"
+
+
+########################################################
+# Sagem F@ST 9520-35-GLR
+#
+# Contributor: Yaroslav Levandovskiy
+
+;DefaultVendor=  0x1076
+;DefaultProduct= 0x7f40
+
+;TargetVendor=   0x1076
+;TargetProduct=  0x7f00
+
+;GCTMode=1
+
+
+########################################################
+# Nokia CS-15
+#
+# Contributor: Antti Turunen
+
+;DefaultVendor=  0x0421
+;DefaultProduct= 0x0610
+
+;TargetVendor=   0x0421
+;TargetProduct=  0x0612
+
+;MessageContent="5553424312345678000000000000061b000000020000000000000000000000"
+
+;NeedResponse=1
+
+
+########################################################
+# Huawei K3765
+#
+# Contributor: Felix Schwarz
+
+;DefaultVendor=  0x12d1
+;DefaultProduct= 0x1520
+
+;TargetVendor=   0x12d1
+;TargetProduct=  0x1465
+
+;MessageContent="55534243123456780000000000000011060000000000000000000000000000"
+
+
+########################################################
+# Huawei K4505
+#
+# Contributor: Nikolaos Koutsianas
+
+;DefaultVendor=  0x12d1
+;DefaultProduct= 0x1521
+
+;TargetVendor=   0x12d1
+;TargetProduct=  0x1464
+
+;MessageContent="55534243123456780000000000000011060000000000000000000000000000"
+
+
+#########################################
+# Vodafone MD950 (Wisue Technology)
+#
+# Contributor: Bob Williams
+
+;DefaultVendor=  0x0471
+;DefaultProduct= 0x1210
+
+# The report said that giving the target IDs prevented
+# the device from switching. Got to try it out ...
+
+#TargetVendor=   0x1dbc
+#TargetProduct=  0x0005
+
+;MessageContent="5553424312345678000000000000061b000000020000000000000000000000"
+
+;NeedResponse=1
+
+
+########################################################
+# Siptune LM-75 ("LinuxModem")
+#
+# Contributor: Antti Turunen
+
+;DefaultVendor=  0x05c6
+;DefaultProduct= 0xf000
+
+;TargetVendor=   0x05c6
+;TargetProduct=  0x9000
+
+;MessageContent="5553424312345678000000000000061b000000020000000000000000000000"
+
+
+########################################################
+# Zydas ZD1211RW WLAN USB, Sphairon HomeLink 1202 (Variant 1)
+#
+# WLAN devices from Linux kernel
+
+;DefaultVendor=  0x0ace
+;DefaultProduct= 0x2011
+
+;MessageContent="5553424312345678000000000000061b000000020000000000000000000000"
+
+;NeedResponse=1
+
+
+########################################################
+# Zydas ZD1211RW WLAN USB, Sphairon HomeLink 1202 (Variant 2)
+#
+# WLAN devices from Linux kernel
+
+;DefaultVendor=  0x0ace
+;DefaultProduct= 0x20ff
+
+;MessageContent="5553424312345678000000000000061b000000020000000000000000000000"
+
+;NeedResponse=1
+
+
+########################################################
+# Vertex Wireless 100 Series
+#
+# Contributor: Reinis Danne
+
+;DefaultVendor=  0x05c6
+;DefaultProduct= 0x1000
+
+;TargetVendor=   0x1fe7
+;TargetProduct=  0x0100
+
+;MessageContent="5553424312345678000000000000061b000000020000000000000000000000"
+
+;NeedResponse=1
+
+
+########################################################
+# AVM Fritz!Wlan USB Stick N
+#
+
+;DefaultVendor=  0x057c
+;DefaultProduct= 0x84ff
+
+;TargetVendor=   0x057c
+;TargetProduct=  0x8401
+
+;MessageContent="5553424312345678000000000000061b000000ff0000000000000000000000"
+
+
+########################################################
+# InfoCert Business Key (SmartCard/Reader emulation)
+#
+# Contributor: Bicio
+
+;DefaultVendor=  0x072f
+;DefaultProduct= 0x100d
+
+;TargetVendor=   0x072f
+;TargetProduct=  0x90cc
+
+;MessageContent="01b0000000000000000000000000000000000000000000000000000000000000"
+
+
+########################################################
+# UTStarcom UM185E (distributor "Alltel")
+#
+# Contributor: Jason Smith
+
+;DefaultVendor=  0x106c
+;DefaultProduct= 0x3b06
+
+;TargetVendor=   0x106c
+;TargetProduct=  0x3717
+
+;MessageContent="555342431234567824000000800008ff020000000000000000000000000000
+
+
+########################################################
+# ZTE AC581
+#
+# Contributor: Alberto Maurizi
+
+;DefaultVendor=  0x19d2
+;DefaultProduct= 0x0026
+
+;TargetVendor=   0x19d2
+;TargetProduct=  0x0094
+
+;MessageContent="5553424312345678000000000000061e000000000000000000000000000000"
+;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000"
+
+;NeedResponse=1
+
+
+########################################################
+# Huawei U7510 / U7517
+#
+# Contributor: Isaac Salgado
+
+;DefaultVendor=  0x12d1
+;DefaultProduct= 0x101e
+
+;TargetClass=0xff
+
+;MessageContent="55534243123456780600000080000601000000000000000000000000000000"
+
+
+########################################################
+# Beceem BCSM250
+#
+# Contributor: Alexander Gordeev
+
+;DefaultVendor= 0x198f
+;DefaultProduct=0xbccd
+
+;TargetVendor=  0x198f
+;TargetProduct= 0x0220
+
+MessageContent="555342431234567824000000800006bc626563240000000000000000000000"
+
+
+########################################################
+# LG HDM-2100 (EVDO Rev.A USB modem)
+#
+# Contributor: Jérôme Oufella
+
+;DefaultVendor= 0x1004
+;DefaultProduct=0x607f
+
+;TargetVendor=  0x1004
+;TargetProduct= 0x6114
+
+;MessageContent="1201100102000040041014610000010200018006000100001200"
+
+
+########################################################
+# Kyocera W06K CDMA modem
+#
+# Contributor: Ying-Hung Lo
+
+;DefaultVendor= 0x0482
+;DefaultProduct=0x024d
+
+;Configuration=2
+
+
+########################################################
+# Digicom 8E4455
+#
+# Contributor: Alberto Ciampini
+
+;DefaultVendor= 0x1266
+;DefaultProduct=0x1000
+
+;TargetVendor=  0x1266
+;TargetProduct= 0x1009
+
+;MessageContent="5553424312345678000000000000061e000000000000000000000000000000"
+;MessageContent2="5553424387654321000000000000061b000000020000000000000000000000"
+
+;NeedResponse=1
+
+
+########################################################
+# Sony Ericsson MD300
+#
+# Contributor: Betavine Project
+
+;DefaultVendor= 0x0fce
+;DefaultProduct=0xd0cf
+
+;TargetClass=0x02
+
+;DetachStorageOnly=1
+;Configuration=3
+
+
+########################################################
+# Vodafone (ZTE) K3805-Z
+#
+# Contributor: Betavine Project
+#
+# Note:
+#   This device has multiple USB profiles. Depending upon how it is flipped
+#   from storage mode to modem mode determines its final PID and the packages
+#   shown on its ISO CD image.
+
+DefaultVendor= 0x19d2
+DefaultProduct=0x1001
+
+TargetVendor=  0x19d2
+TargetProduct= 0x1003
+
+MessageContent="5553424312345678000000000000061b000000020000000000000000000000"
+
+NeedResponse=1
+
+
+########################################################
+# Franklin Wireless U210
+#
+# Contributor: Adam J. Porter
+
+;DefaultVendor= 0x1fac
+;DefaultProduct=0x0130
+
+;TargetVendor=  0x1fac
+;TargetProduct= 0x0131
+
+;CheckSuccess=20
+
+;MessageContent="555342431234567824000000800108df200000000000000000000000000000"
+
+
+########################################################
+# Alcatel X220L, X215S
+#
+# Contributor: John Watt
+
+;DefaultVendor=  0x1bbb
+;DefaultProduct= 0xf000
+
+;TargetVendor=   0x1bbb
+;TargetProduct=  0x0017
+
+;MessageContent="55534243123456788000000080000606f50402527000000000000000000000"
+
+
+########################################################
+# ZTE MF112
+#
+# Contributors: Akos Ladanyi, John Talbut
+
+;DefaultVendor=  0x19d2
+;DefaultProduct= 0x0103
+
+;TargetVendor=   0x19d2
+;TargetProduct=  0x0031
+
+;MessageContent="5553424312345678000000000000061b000000020000000000000000000000"
+;MessageContent2="55534243876543212000000080000c85010101180101010101000000000000"
+
+;NeedResponse=1
+
+
+########################################################
+# Olivetti Olicard 100 and others
+#
+# Contributor: Nils Radtke
+
+;DefaultVendor=  0x0b3c
+;DefaultProduct= 0xc700
+
+;TargetVendor=   0x0b3c
+;TargetProductList="c000,c001,c002"
+
+;MessageContent="5553424312345678000000000000061b000000030000000000000000000000"
+
+;NeedResponse=1
+
+
+########################################################
+# ZTE MF110 (Variant)
+#
+# Contributor: uusrlnx
+
+;DefaultVendor=  0x19d2
+;DefaultProduct= 0x0083
+
+;TargetVendor=   0x19d2
+;TargetProduct=  0x0124
+
+;MessageContent="5553424312345678000000000000061b000000020000000000000000000000"
+
+;NeedResponse=1
+
+
+########################################################
+# ZTE MU351
+
+;DefaultVendor=  0x19d2
+;DefaultProduct= 0x0003
+
+;TargetClass=0xff
+
+;MessageContent="5553424312345678000000000000061b000000020000000000000000000000"
+
+;NeedResponse=1
+
+
+########################################################
+# LG L-05A
+
+;DefaultVendor=  0x1004
+;DefaultProduct= 0x613a
+
+;TargetVendor=   0x1004
+;TargetProduct=  0x6124
+
+;MessageContent="5553424312345678000000000000061b000000020000000000000000000000"
+
+;NeedResponse=1
+
+
+########################################################
+# LG LUU-2100TI (aka AT&T USBConnect Turbo)
+#
+# Contributor: Chris Jager
+
+;DefaultVendor=  0x1004
+;DefaultProduct= 0x613f
+
+;TargetVendor=   0x1004
+;TargetProduct=  0x6141
+
+;MessageContent="5553424312345678000000000000061b000000020000000000000000000000"
+
+;NeedResponse=1
+
+
+######################################################## 
+# LG KP500 Cookie Phone  - UNTESTED! Please report!
+#
+# Contributor: Oliver Mattos
+
+;DefaultVendor= 0x1004
+;DefaultProduct=0x607f
+
+;TargetVendor=  0x1004
+;TargetProduct= 0x6000
+
+;MessageContent="555342431234567803000000800006f1022000000000000000000000000000"
+;MessageContent2="555342438765432103000000800006f1010100000000000000000000000000"
+
+;NeedResponse=1
+
+
+########################################################
+# Royaltek Q110 - UNCONFIRMED!
+
+;DefaultVendor=  0x1266
+;DefaultProduct= 0x1000
+
+;TargetVendor=   0x1266
+;TargetProduct=  0x1009
+
+;MessageContent="5553424312345678000000000000061e000000000000000000000000000000"
+;MessageContent2="5553424387654321000000000000061b000000020000000000000000000000"
+
+;NeedResponse=1
+
+
+########################################################
+# Rogers Rocket Stick (a Sony Ericsson device)
+
+;DefaultVendor=  0x0fce
+;DefaultProduct= 0xd103
+
+;TargetClass=    0x02
+
+;SonyMode=1
+
+
+########################################################
+# BandRich BandLuxe C170, BandLuxe C270
+
+;DefaultVendor= 0x1a8d
+;DefaultProduct=0x1000
+
+;TargetVendor=  0x1a8d
+;TargetProduct= 0x1009
+
+;MessageContent="5553424312345678000000000000061e000000000000000000000000000000"
+;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000"
+;ReleaseDelay=4000
+
+;NeedResponse=1
+
+
+########################################################
+# Vodafone (Huawei) K4605
+#
+# Contributor: Betavine Project
+
+DefaultVendor= 0x12d1
+DefaultProduct=0x14c1
+
+TargetVendor=  0x12d1
+TargetProduct= 0x14c6
+
+CheckSuccess=20
+
+MessageContent="55534243123456780000000000000011060000000000000000000000000000"
+
+
+########################################################
+# Huawei R201
+#
+# Contributor: Betavine Project
+
+DefaultVendor= 0x12d1
+DefaultProduct=0x1523
+
+TargetVendor=  0x12d1
+TargetProduct= 0x1491
+
+CheckSuccess=20
+
+MessageContent="55534243123456780000000000000011060000000000000000000000000000"
+
+
+########################################################
+# Atheros Wireless / Netgear WNDA3200
+#
+# Contributor: Sujith Manoharan (Atheros)
+
+DefaultVendor= 0x0cf3
+DefaultProduct=0x20ff
+
+TargetVendor=  0x0cf3
+TargetProduct= 0x7010
+
+CheckSuccess=10
+NoDriverLoading=1
+
+MessageContent="5553424329000000000000000000061b000000020000000000000000000000"
+NeedResponse=1
+
+
+########################################################
+# Onda MW833UP
+#
+# Contributor: Riccardo Sepe aka zeroidle
+
+DefaultVendor= 0x1ee8
+DefaultProduct=0x0013
+
+TargetVendor=  0x1ee8
+TargetProduct= 0x0012
+
+CheckSuccess=20
+
+MessageContent="555342431234567800000000000010ff000000000000000000000000000000"
+ResponseNeeded=1
+
+
+########################################################
+# Huawei U8110 / Joy, Vodafone 845 (Android smartphone)
+#
+# Contributor: David Erosa García
+
+DefaultVendor= 0x12d1
+DefaultProduct=0x1031
+
+TargetVendor=  0x12d1
+TargetProduct= 0x1035
+
+CheckSuccess=20 
+
+MessageContent="55534243123456780600000080010a11060000000000000000000000000000"
+
+# for Android SDK
+NoDriverLoading=1
+
+
+########################################################
+# Nokia CS-10
+#
+# Contributor: Wacław Sierek
+
+DefaultVendor= 0x0421
+DefaultProduct=0x060c
+
+TargetVendor=  0x0421
+TargetProduct= 0x060e
+
+CheckSuccess=20
+
+MessageContent="5553424312345678000000000000061b000000020000000000000000000000"
+
+
+########################################################
+# ZTE WCDMA Stick from BNSL
+#
+# Contributor: Anoop John
+
+;DefaultVendor=  0x19d2
+;DefaultProduct= 0x2000
+
+;TargetVendor=   0x19d2
+;TargetProduct=  0x0108
+
+;MessageContent="5553424312345678000000000000061e000000000000000000000000000000"
+;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000"
+
+;NeedResponse=1
+
+
+########################################################
+# BSNL Capitel
+
+;DefaultVendor=  0x1c9e
+;DefaultProduct= 0x9e00
+
+;TargetClass=0xff
+
+;MessageContent="55534243123456780000000000000606f50402527000000000000000000000"
+
+
+#######################################################
+# Samsung GT-B3730
+#
+# Contributor: Per Øyvind Karlsen
+
+;DefaultVendor= 0x04e8
+;DefaultProduct=0x689a
+
+;TargetVendor=  0x04e8
+;TargetProduct= 0x6889
+
+;MessageContent="55534243785634120100000080000601000000000000000000000000000000"
+
+#######################################################
+# Kobil mIdentity 3G (1)
+#
+# Contributor: Filip Aben
+
+DefaultVendor= 0x0d46
+DefaultProduct=0x45a1
+
+TargetVendor=  0x0d46
+TargetProduct= 0x45a9
+
+KobilMode=1
+
+
+#######################################################
+# Kobil mIdentity 3G (2)
+#
+# Contributor: Filip Aben
+
+DefaultVendor= 0x0d46
+DefaultProduct=0x45a5
+
+TargetVendor=  0x0d46
+TargetProduct= 0x45ad
+
+KobilMode=1
+
+
+########################################################
+# Onda MW833UP
+#
+# Contributor: Enrico Mioso
+
+;DefaultVendor= 0x1ee8
+;DefaultProduct=0x0009
+
+;TargetVendor=  0x1ee8
+;TargetProduct= 0x000b
+
+;MessageContent="555342431234567800000000000010ff000000000000000000000000000000"
+;NeedResponse=1
+
+
+########################################################
+# Olivetti Olicard 145
+#
+# Contributor: Pierre-Andre Cornillon
+
+;DefaultVendor= 0x0b3c
+;DefaultProduct=0xf000
+
+;TargetVendor=  0x0b3c
+;TargetProduct= 0xc003
+
+;MessageContent="5553424312345678c000000080010606f50402527000000000000000000000"
+;NeedResponse=1
+
+
+#######################################################
+# Huawei EC168C (from Zantel)
+#
+# Contributor: Ã…smund Hjulstad
+
+;DefaultVendor= 0x12d1
+;DefaultProduct=0x1446
+
+;TargetVendor=  0x12d1
+;TargetProduct= 0x1412
+
+;MessageContent="55534243123456780000000000000011060000000000000000000000000000"
+
+
+#######################################################
+# Nokia CS-17
+#
+# Contributor: Juho Frits
+
+;DefaultVendor= 0x0421
+;DefaultProduct=0x0622
+
+;TargetVendor=  0x0421
+;TargetProduct= 0x0623
+
+;MessageContent="5553424312345678000000000000061b000000020000000000000000000000"
+
+
+#######################################################
+# Nokia CS-18
+#
+# Contributor: Thomas Behan
+
+;DefaultVendor= 0x0421
+;DefaultProduct=0x0627
+
+;TargetVendor=  0x0421
+;TargetProduct= 0x0612
+
+;MessageContent="5553424312345678000000000000061b000000020000000000000000000000"
+
+
+#######################################################
+# Qtronix EVDO 3G Modem (for TianYi)
+#
+# Contributor: Alexey Charkov
+
+;DefaultVendor= 0x05c7
+;DefaultProduct=0x1000
+
+;TargetVendor=  0x05c7
+;TargetProduct=	0x6000
+
+;MessageContent="5553424312345678c00000008000069f140000000000000000000000000000"
+
+
+#######################################################
+# GW D301 (Advinne AMC)
+#
+
+;DefaultVendor= 0x0fd1
+;DefaultProduct=0x1000
+
+;TargetClass=0xff
+
+;Configuration=3
+
+
+#######################################################
+# LG AD600
+#
+# Contributor: Shawn J. Goff
+
+;DefaultVendor= 0x1004
+;DefaultProduct=0x6190
+
+;TargetVendor=  0x1004
+;TargetProduct= 0x61a7
+
+;MessageContent="5553424312345678000000000000061b000000020000000000000000000000"
+
+
+#######################################################
+# Pantech / UTStarcom UMW190 (Verizon)
+#
+# Contributor: Noel J. Bergman, Gus Esquivel
+
+;DefaultVendor= 0x106c
+;DefaultProduct=0x3b05
+
+;TargetVendor=  0x106c
+;TargetProduct= 0x3716
+
+;MessageContent="555342431234567824000000800008ff020000000000000000000000000000"
+
+
+#######################################################
+# AirPlus MCD-800
+#
+
+;DefaultVendor= 0x1edf
+;DefaultProduct=0x6003
+
+;TargetClass=0xff
+
+;Configuration=3
+
+
+#######################################################
+# Linktop LW272/LW273 (BSNL Teracom)
+#
+# Contributor: Amit Mendapara
+
+;DefaultVendor= 0x230d
+;DefaultProduct=0x0001
+
+;TargetClass=0xff
+
+;Configuration=3
+
+
+########################################################
+# MediaTek Wimax USB Card
+#
+
+;DefaultVendor= 0x0e8d
+;DefaultProduct=0x7109
+
+;TargetVendor=  0x0e8d
+;TargetProduct= 0x7118
+
+;MessageContent="5553424312345678000000000000061e000000000000000000000000000000"
+;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000"
+
+;NoDriverLoading=1
+
+
+########################################################
+# C-motech CHU-628S
+
+;DefaultVendor= 0x16d8
+;DefaultProduct=0x6281
+
+;TargetClass=0xff
+
+;MessageContent="555342431234567824000000800008ff524445564348470000000000000000"
+
diff --git a/source/a/usb_modeswitch/usb_modeswitch.SlackBuild b/source/a/usb_modeswitch/usb_modeswitch.SlackBuild
index f4e6569e..67b2070a 100755
--- a/source/a/usb_modeswitch/usb_modeswitch.SlackBuild
+++ b/source/a/usb_modeswitch/usb_modeswitch.SlackBuild
@@ -24,8 +24,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PKGNAM=usb_modeswitch
-VERSION=${VERSION:-1.1.2}
-DATAVER=${DATAVER:-20100418}
+VERSION=${VERSION:-1.1.6}
+DATAVER=${DATAVER:-20101222}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -83,6 +83,8 @@ mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   COPYING* README* \
   $PKG/usr/doc/$PKGNAM-$VERSION
+# http://www.draisberghof.de/usb_modeswitch/device_reference.txt.gz
+cat $CWD/device_reference.txt.gz > $PKG/usr/doc/$PKGNAM-$VERSION/device_reference.txt
 
 # If there's a ChangeLog, installing at least part of the recent history
 # is useful, but don't let it get totally out of control:
diff --git a/source/a/usbutils/usbutils-002.tar.bz2.sign b/source/a/usbutils/usbutils-002.tar.bz2.sign
new file mode 100644
index 00000000..9d96e9be
--- /dev/null
+++ b/source/a/usbutils/usbutils-002.tar.bz2.sign
@@ -0,0 +1,8 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+Comment: See http://www.kernel.org/signature.html for info
+
+iD8DBQBNgpmUyGugalF9Dw4RAkkCAJ9AOpNKjFebxdbPfj3LYK+roL7UaACgiKtR
+7L3j4M7iAo15yh6B4WP6uCI=
+=fb1T
+-----END PGP SIGNATURE-----
diff --git a/source/a/usbutils/usbutils.SlackBuild b/source/a/usbutils/usbutils.SlackBuild
index 7263b864..163b5378 100755
--- a/source/a/usbutils/usbutils.SlackBuild
+++ b/source/a/usbutils/usbutils.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=${VERSION:-$(echo usbutils-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo usbutils-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:--j7}
@@ -58,7 +58,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf usbutils-$VERSION
-tar xvf $CWD/usbutils-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/usbutils-$VERSION.tar.bz2 || exit 1
 cd usbutils-$VERSION || exit 1
 
 chown -R root:root .
diff --git a/source/a/utempter/utempter.SlackBuild b/source/a/utempter/utempter.SlackBuild
index 7d0d24b7..5d6f054f 100755
--- a/source/a/utempter/utempter.SlackBuild
+++ b/source/a/utempter/utempter.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,10 +21,19 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=1.1.4
-ARCH=${ARCH:-x86_64}
+VERSION=1.1.5
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 if [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 else
diff --git a/source/a/util-linux-ng/slack-desc b/source/a/util-linux-ng/slack-desc
deleted file mode 100644
index e149d7b8..00000000
--- a/source/a/util-linux-ng/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-             |-----handy-ruler------------------------------------------------|
-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
deleted file mode 100755
index 386487ab..00000000
--- a/source/a/util-linux-ng/util-linux-ng.SlackBuild
+++ /dev/null
@@ -1,310 +0,0 @@
-#!/bin/sh
-
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Slackware build script for util-linux-ng
-
-VERSION=${VERSION:-$(echo util-linux-ng*.tar.?z* | cut -d - -f 4  | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-1}
-
-ADJTIMEXVERS=1.23
-SETSERIALVERS=2.17
-ZIPTOOLVERS=1.4.0
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
-    arm*) export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-       *) export ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-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.xz || 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 \
-  --disable-static \
-  --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 \
-  --enable-libblkid \
-  --enable-libuuid \
-  --disable-uuidd \
-  --build=$ARCH-slackware-linux \
-  || exit 1
-
-make || exit 1
-make install DESTDIR=$PKG || make install DESTDIR=$PKG
-
-# Move the libblkid and libuuid libraries to /lib${LIBSUFFIX}
-mkdir -p $PKG/lib${LIBDIRSUFFIX}
-( cd $PKG/usr/lib${LIBDIRSUFFIX}
-  mv libblkid.so.1* $PKG/lib${LIBDIRSUFFIX}
-  mv libuuid.so.1* $PKG/lib${LIBDIRSUFFIX}
-  rm -f libblkid.so libuuid.so
-  ln -sf /lib${LIBDIRSUFFIX}/libblkid.so.1 libblkid.so
-  ln -sf /lib${LIBDIRSUFFIX}/libuuid.so.1 libuuid.so
-)
-
-# 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
-
-# Build ziptool
-cd $TMP || exit 1
-rm -rf ziptool-$ZIPTOOLVERS
-tar xvf $CWD/ziptool-$ZIPTOOLVERS.tar.xz || 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.xz
-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
-zcat $CWD/setserial-undef_TIOCGHAYESESP.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/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 -a AUTHORS COPYING DEPRECATED NEWS README* TODO \
-  docs/v${VERSION}-ReleaseNotes \
-  $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/adjtimex_1.23-1.diff b/source/a/util-linux/adjtimex_1.23-1.diff
index 8c250157..8c250157 100644
--- a/source/a/util-linux-ng/adjtimex_1.23-1.diff
+++ b/source/a/util-linux/adjtimex_1.23-1.diff
diff --git a/source/a/util-linux-ng/doinst.sh b/source/a/util-linux/doinst.sh
index 678c228f..678c228f 100644
--- a/source/a/util-linux-ng/doinst.sh
+++ b/source/a/util-linux/doinst.sh
diff --git a/source/a/util-linux-ng/net-tools.diff b/source/a/util-linux/net-tools.diff
index a19af202..a19af202 100644
--- a/source/a/util-linux-ng/net-tools.diff
+++ b/source/a/util-linux/net-tools.diff
diff --git a/source/a/util-linux-ng/net-tools_1.60-19.diff b/source/a/util-linux/net-tools_1.60-19.diff
index f754f02d..f754f02d 100644
--- a/source/a/util-linux-ng/net-tools_1.60-19.diff
+++ b/source/a/util-linux/net-tools_1.60-19.diff
diff --git a/source/a/util-linux-ng/scsi_ioctl.h b/source/a/util-linux/scsi_ioctl.h
index edb95253..edb95253 100644
--- a/source/a/util-linux-ng/scsi_ioctl.h
+++ b/source/a/util-linux/scsi_ioctl.h
diff --git a/source/a/util-linux-ng/setserial-rc.serial.diff b/source/a/util-linux/setserial-rc.serial.diff
index 248d253b..248d253b 100644
--- a/source/a/util-linux-ng/setserial-rc.serial.diff
+++ b/source/a/util-linux/setserial-rc.serial.diff
diff --git a/source/a/util-linux-ng/setserial-undef_TIOCGHAYESESP.diff b/source/a/util-linux/setserial-undef_TIOCGHAYESESP.diff
index 97f07843..97f07843 100644
--- a/source/a/util-linux-ng/setserial-undef_TIOCGHAYESESP.diff
+++ b/source/a/util-linux/setserial-undef_TIOCGHAYESESP.diff
diff --git a/source/a/util-linux/slack-desc b/source/a/util-linux/slack-desc
new file mode 100644
index 00000000..efa70e34
--- /dev/null
+++ b/source/a/util-linux/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: util-linux (a huge collection of essential utilities) 
+util-linux:
+util-linux: The util-linux package is a huge collection of random utilities
+util-linux: that are essential to run a Linux system.
+util-linux:
+util-linux: http://kernel.org/~kzak/util-linux/
+util-linux:
+util-linux:
+util-linux:
+util-linux:
+util-linux:
diff --git a/source/a/util-linux/util-linux.SlackBuild b/source/a/util-linux/util-linux.SlackBuild
new file mode 100755
index 00000000..42419914
--- /dev/null
+++ b/source/a/util-linux/util-linux.SlackBuild
@@ -0,0 +1,308 @@
+#!/bin/sh
+
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Slackware build script for util-linux
+
+VERSION=${VERSION:-$(echo util-linux*.tar.?z* | cut -d - -f 3  | rev | cut -f 3- -d . | rev)}
+BUILD=${BUILD:-1}
+
+ADJTIMEXVERS=1.23
+SETSERIALVERS=2.17
+ZIPTOOLVERS=1.4.0
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-util-linux
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP || exit 1
+rm -rf util-linux-$VERSION
+tar xvf $CWD/util-linux-$VERSION.tar.xz || exit 1
+cd util-linux-$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.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-$VERSION \
+  --disable-static \
+  --enable-arch \
+  --enable-agetty \
+  --disable-init \
+  --enable-kill \
+  --disable-last \
+  --enable-mesg \
+  --enable-partx \
+  --enable-raw \
+  --enable-rename \
+  --enable-reset \
+  --disable-login-utils \
+  --enable-schedutils \
+  --enable-wall \
+  --enable-write \
+  --enable-use-tty-group \
+  --enable-libblkid \
+  --enable-libmount \
+  --enable-libuuid \
+  --disable-uuidd \
+  --build=$ARCH-slackware-linux \
+  || exit 1
+
+make || exit 1
+make install DESTDIR=$PKG || make install DESTDIR=$PKG
+
+# Move the libblkid, libmount, and libuuid libraries to /lib${LIBSUFFIX}
+mkdir -p $PKG/lib${LIBDIRSUFFIX}
+( cd $PKG/usr/lib${LIBDIRSUFFIX}
+  mv libblkid.so.1* $PKG/lib${LIBDIRSUFFIX}
+  mv libmount.so.1* $PKG/lib${LIBDIRSUFFIX}
+  mv libuuid.so.1* $PKG/lib${LIBDIRSUFFIX}
+  rm -f libblkid.so libmount.so libuuid.so
+  ln -sf ../../lib${LIBDIRSUFFIX}/libblkid.so.1 libblkid.so
+  ln -sf ../../lib${LIBDIRSUFFIX}/libmount.so.1 libmount.so
+  ln -sf ../../lib${LIBDIRSUFFIX}/libuuid.so.1 libuuid.so
+)
+
+# 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
+
+# Build ziptool
+cd $TMP || exit 1
+rm -rf ziptool-$ZIPTOOLVERS
+tar xvf $CWD/ziptool-$ZIPTOOLVERS.tar.xz || 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.xz
+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
+zcat $CWD/setserial-undef_TIOCGHAYESESP.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/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-$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-$VERSION
+cp -a AUTHORS COPYING DEPRECATED NEWS README* TODO \
+  docs/v${VERSION}-ReleaseNotes \
+  $PKG/usr/doc/util-linux-$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-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/util-linux-ng/util-linux-ng.fdisk-no-solaris.diff b/source/a/util-linux/util-linux.fdisk-no-solaris.diff
index a3aa100e..a3aa100e 100644
--- a/source/a/util-linux-ng/util-linux-ng.fdisk-no-solaris.diff
+++ b/source/a/util-linux/util-linux.fdisk-no-solaris.diff
diff --git a/source/a/util-linux-ng/ziptool-fix_build.patch b/source/a/util-linux/ziptool-fix_build.patch
index a2d3d515..a2d3d515 100644
--- a/source/a/util-linux-ng/ziptool-fix_build.patch
+++ b/source/a/util-linux/ziptool-fix_build.patch
diff --git a/source/a/which/which.SlackBuild b/source/a/which/which.SlackBuild
index f86fd1da..08ae4616 100755
--- a/source/a/which/which.SlackBuild
+++ b/source/a/which/which.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=2.20
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-which
diff --git a/source/a/xfsprogs/xfsprogs.SlackBuild b/source/a/xfsprogs/xfsprogs.SlackBuild
index cf832cfb..27af8245 100755
--- a/source/a/xfsprogs/xfsprogs.SlackBuild
+++ b/source/a/xfsprogs/xfsprogs.SlackBuild
@@ -90,6 +90,7 @@ CFLAGS="$SLKCFLAGS" \
 make $NUMJOBS || make || exit 1
 make install DIST_ROOT=$PKG
 make install-dev DIST_ROOT=$PKG
+make install-qa DIST_ROOT=$PKG
 
 mv $PKG/usr/share/doc $PKG/usr
 mv $PKG/usr/doc/xfsprogs $PKG/usr/doc/xfsprogs-$VERSION
diff --git a/source/a/xz/xz.SlackBuild b/source/a/xz/xz.SlackBuild
index 205a12ef..dd996f48 100755
--- a/source/a/xz/xz.SlackBuild
+++ b/source/a/xz/xz.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 
 #   Permission to use, copy, modify, and distribute this software for
@@ -21,8 +21,8 @@
 #   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 #   SUCH DAMAGE.
 
-PRGNAM=xz
-VERSION=${VERSION:-4.999.9beta}
+PKGNAM=xz
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -57,21 +57,23 @@ case "$ARCH" in
   armel)     SLKCFLAGS="-O2 -march=armv4t"
              LIBDIRSUFFIX=""
              ;;
-
+  *)         SLKCFLAGS="-O2"
+             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
+PKG=$TMP/package-$PKGNAM
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
-cd $PRGNAM-$VERSION
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1
+cd $PKGNAM-$VERSION
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -133,15 +135,22 @@ if [ -d $PKG/usr/man ]; then
   )
 fi
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$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 {} \;
+  ABOUT-NLS AUTHORS COPYING* INSTALL* NEWS PACKAGERS README* THANKS \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz
 
diff --git a/source/a/zoo/zoo.SlackBuild b/source/a/zoo/zoo.SlackBuild
index c667b076..177ac4a8 100755
--- a/source/a/zoo/zoo.SlackBuild
+++ b/source/a/zoo/zoo.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,19 @@
 
 
 VERSION=2.10
-DEBPATCH=18
-ARCH=${ARCH:-x86_64}
+DEBPATCH=22
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-zoo
@@ -45,10 +54,11 @@ find . \
   \( -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
+tar xf $CWD/zoo_${VERSION}-${DEBPATCH}.debian.tar.gz
+for diff in debian/patches/*patch ; 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
@@ -74,5 +84,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 # Build the package:
 cd $PKG
-makepkg -l y -c n $TMP/zoo-$VERSION-$ARCH-$BUILD.txz
+makepkg -l y -c n $TMP/zoo-${VERSION}_${DEBPATCH}-$ARCH-$BUILD.txz
 
diff --git a/source/a/zoo/zoo_2.10-18.diff b/source/a/zoo/zoo_2.10-18.diff
deleted file mode 100644
index b0c74134..00000000
--- a/source/a/zoo/zoo_2.10-18.diff
+++ /dev/null
@@ -1,1285 +0,0 @@
---- 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
index b8e5ed18..6df5f4d0 100755
--- a/source/ap/a2ps/a2ps.SlackBuild
+++ b/source/ap/a2ps/a2ps.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,8 +26,17 @@ PKGNAM2=psutils
 VERSION=${VERSION:-4.14}
 A2PS=${A2PS:-4.14}
 PSUTILS=${PSUTILS:-1.17}
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -123,10 +132,18 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \
 
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/a2ps-$VERSION
-cp -a ABOUT-NLS ANNOUNCE AUTHORS COPYING ChangeLog \
+cp -a ABOUT-NLS ANNOUNCE AUTHORS COPYING \
   FAQ INSTALL NEWS README THANKS TODO \
   $PKG/usr/doc/a2ps-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 # Compress info files, if any:
 if [ -d $PKG/usr/info ]; then
   ( cd $PKG/usr/info
diff --git a/source/ap/acct/acct-6.4pre1-6.diff b/source/ap/acct/acct-6.4pre1-6.diff
deleted file mode 100644
index 8db3d7be..00000000
--- a/source/ap/acct/acct-6.4pre1-6.diff
+++ /dev/null
@@ -1,2636 +0,0 @@
---- 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
index 510b22a2..bfdd46fd 100755
--- a/source/ap/acct/acct.SlackBuild
+++ b/source/ap/acct/acct.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2006, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,11 +21,20 @@
 
 
 PKGNAM=acct
-PKGVER=6.4-pre1
-VERSION=6.4pre1
-ARCH=${ARCH:-x86_64}
+PKGVER=6.5.4
+VERSION=6.5.4
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -48,9 +57,6 @@ 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 .
@@ -60,6 +66,10 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
+zcat $CWD/acct.logdir.fhs.diff.gz | patch -p1 || exit 1
+# Need this after patching configure.ac:
+autoreconf
+
 # Configure:
 CFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -125,9 +135,17 @@ fi
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
+  AUTHORS COPYING* INSTALL NEWS README TODO \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source/ap/acct/acct.logdir.fhs.diff b/source/ap/acct/acct.logdir.fhs.diff
index 9fff1bac..1463857e 100644
--- a/source/ap/acct/acct.logdir.fhs.diff
+++ b/source/ap/acct/acct.logdir.fhs.diff
@@ -1,28 +1,28 @@
---- ./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 @@
+--- ./configure.ac.orig	2010-02-12 10:39:09.000000000 -0600
++++ ./configure.ac	2010-07-28 12:35:30.000000000 -0500
+@@ -187,7 +187,7 @@
  
  #ifndef ACCT_FILE
  #  if defined(__FreeBSD__) || defined(__linux__)
--#    define ACCT_FILE "/var/log/account/pacct"
+-#    define ACCT_FILE "/var/account/pacct"
 +#    define ACCT_FILE "/var/log/pacct"
  #  else
  #    if defined(__NetBSD__)
  #      define ACCT_FILE "/var/account/acct"
-@@ -234,7 +234,7 @@
+@@ -207,7 +207,7 @@
  
  #ifndef SAVACCT_FILE
  #  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__)
--#    define SAVACCT_FILE "/var/log/account/savacct"
+-#    define SAVACCT_FILE "/var/account/savacct"
 +#    define SAVACCT_FILE "/var/log/savacct"
  #  else
  #    if defined(sun) || defined(AMIX)
  #      define SAVACCT_FILE "/var/adm/savacct"
-@@ -250,7 +250,7 @@
+@@ -223,7 +223,7 @@
  
  #ifndef USRACCT_FILE
  #  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__)
--#    define USRACCT_FILE "/var/log/account/usracct"
+-#    define USRACCT_FILE "/var/account/usracct"
 +#    define USRACCT_FILE "/var/log/usracct"
  #  else
  #    if defined(sun) || defined(AMIX)
diff --git a/source/ap/alsa-utils/alsa-utils.SlackBuild b/source/ap/alsa-utils/alsa-utils.SlackBuild
index 14398aab..77664487 100755
--- a/source/ap/alsa-utils/alsa-utils.SlackBuild
+++ b/source/ap/alsa-utils/alsa-utils.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -82,9 +82,10 @@ CFLAGS="$SLKCFLAGS" \
 
 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
+chmod 0755 $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
@@ -122,6 +123,7 @@ fi
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/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
index 92e05b83..43aab43b 100644
--- a/source/ap/alsa-utils/alsa-utils.alsaconf.diff
+++ b/source/ap/alsa-utils/alsa-utils.alsaconf.diff
@@ -1,6 +1,32 @@
-diff -Nur alsa-utils-1.0.21.orig/alsaconf/alsaconf.8 alsa-utils-1.0.21/alsaconf/alsaconf.8
---- alsa-utils-1.0.21.orig/alsaconf/alsaconf.8	2009-08-31 10:13:36.000000000 -0500
-+++ alsa-utils-1.0.21/alsaconf/alsaconf.8	2009-11-11 23:45:11.943377777 -0600
+--- ./alsaconf/alsaconf.in.orig	2010-04-16 06:11:06.000000000 -0500
++++ ./alsaconf/alsaconf.in	2010-05-29 21:08:39.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
+@@ -302,10 +304,12 @@
+ else
+ if [ "$distribution" = "gentoo" ]; then
+   cfgfile="/etc/modules.d/alsa"
++elif [ "$distribution" = "slackware" ]; then
++  cfgfile="/etc/modprobe.d/sound.conf"
+ elif [ "$kernel" = "new" ]; then
+   cfgfile="/etc/modprobe.conf"
+   if [ -d /etc/modprobe.d ]; then
+-    cfgout="/etc/modprobe.d/50-sound.conf"
++    cfgout="/etc/modprobe.d/sound.conf"
+     cfgoldout="/etc/modprobe.d/sound"
+     if [ ! -f $cfgout ]; then
+ 	modver=$(modprobe -V | sed -e's/^module-init-tools version //')
+--- ./alsaconf/alsaconf.8.orig	2010-04-16 06:11:06.000000000 -0500
++++ ./alsaconf/alsaconf.8	2010-05-29 21:07:51.000000000 -0500
 @@ -16,8 +16,6 @@
  This manual page documents briefly the
  .B alsaconf
@@ -31,26 +57,3 @@ diff -Nur alsa-utils-1.0.21.orig/alsaconf/alsaconf.8 alsa-utils-1.0.21/alsaconf/
 -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 -Nur alsa-utils-1.0.21.orig/alsaconf/alsaconf.in alsa-utils-1.0.21/alsaconf/alsaconf.in
---- alsa-utils-1.0.21.orig/alsaconf/alsaconf.in	2009-08-31 10:13:36.000000000 -0500
-+++ alsa-utils-1.0.21/alsaconf/alsaconf.in	2009-11-11 23:44:21.081360666 -0600
-@@ -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
-@@ -305,7 +307,7 @@
- elif [ "$kernel" = "new" ]; then
-   cfgfile="/etc/modprobe.conf"
-   if [ -d /etc/modprobe.d ]; then
--    cfgout="/etc/modprobe.d/50-sound.conf"
-+    cfgout="/etc/modprobe.d/sound.conf"
-     cfgoldout="/etc/modprobe.d/sound"
-     if [ ! -f $cfgout ]; then
- 	modver=$(modprobe -V | sed -e's/^module-init-tools version //')
diff --git a/source/ap/alsa-utils/doinst.sh b/source/ap/alsa-utils/doinst.sh
new file mode 100644
index 00000000..0ee74150
--- /dev/null
+++ b/source/ap/alsa-utils/doinst.sh
@@ -0,0 +1,6 @@
+if [ -r etc/asound.state -a ! -r var/lib/alsa/asound.state -a ! -L etc/asound.state ]; then
+  mv etc/asound.state var/lib/alsa
+fi
+# Better a dangling symlink than for nobody to know where this went:
+rm -f etc/asound.state
+( cd etc && ln -sf ../var/lib/alsa/asound.state . )
diff --git a/source/ap/alsa-utils/rc.alsa b/source/ap/alsa-utils/rc.alsa
index 9e3cae30..2a984a51 100644
--- a/source/ap/alsa-utils/rc.alsa
+++ b/source/ap/alsa-utils/rc.alsa
@@ -4,13 +4,13 @@
 
 # A function to load the ALSA mixer settings:
 load_alsa_mixer() {
-  if [ -r /etc/asound.state ]; then
+  if [ -r /var/lib/alsa/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
+    # In that case, do this:  touch /var/lib/alsa/no.asound.state
+    if [ ! -r /var/lib/alsa/no.asound.state ]; then
       echo "Setting default ALSA mixer settings."
       # set default mixer volumes for ALSA
       # Taken from the alsaconfig script.
@@ -61,11 +61,13 @@ EOF
 
 # 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
+  if modprobe -c | tr _ - | grep -wq snd-pcm-oss ; then
+    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
   fi
 }
 
@@ -76,7 +78,7 @@ if [ -d /proc/asound ]; then
   load_alsa_oss_modules
   load_alsa_mixer
 else
-  # If there are ALSA modules defined in /etc/modprobe.conf, but
+  # If there are ALSA modules defined in /etc/modprobe.d/*, 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
diff --git a/source/ap/amp/amp.SlackBuild b/source/ap/amp/amp.SlackBuild
index db7f49fe..2d9cd5ec 100755
--- a/source/ap/amp/amp.SlackBuild
+++ b/source/ap/amp/amp.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=0.7.6
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-amp
diff --git a/source/ap/at/at.SlackBuild b/source/ap/at/at.SlackBuild
index 2751bfc9..02082e75 100755
--- a/source/ap/at/at.SlackBuild
+++ b/source/ap/at/at.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,16 +21,28 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=${VERSION:-3.1.10}
-ARCH=${ARCH:-x86_64}
+PKGNAM=at
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 CWD=$(pwd)
@@ -42,7 +54,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf at-$VERSION
-tar xvf $CWD/at-${VERSION}.tar.bz2 || exit 1
+tar xvf $CWD/at-${VERSION}.tar.?z* || exit 1
 cd at-$VERSION
 
 chown -R root:root .
@@ -59,7 +71,8 @@ chown daemon:daemon /var/spool/at{jobs,spool}
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
-  $ARCH-slackware-linux
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
 
 # Does not like parallel builds:
 make || exit 1
@@ -88,10 +101,8 @@ fi
 rm -rf $PKG/usr/doc/at
 mkdir -p $PKG/usr/doc/at-$VERSION
 cp -a \
-  COPYING ChangeLog debian/copyright Problems README timespec \
+  COPYING* ChangeLog 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
diff --git a/source/ap/aumix/aumix.SlackBuild b/source/ap/aumix/aumix.SlackBuild
index 7261ba64..e500c053 100755
--- a/source/ap/aumix/aumix.SlackBuild
+++ b/source/ap/aumix/aumix.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,9 +20,19 @@
 #  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}
+PKGNAM=aumix
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 if [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
@@ -39,24 +49,31 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf aumix-$VERSION
-tar xjvf $CWD/aumix-$VERSION.tar.bz2
+tar xvf $CWD/aumix-$VERSION.tar.?z* || exit 1
 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
+./configure \
+  --prefix=/usr \
+  --mandir=/usr/man \
+  --without-gtk1 \
+  --build=$ARCH-slackware-linux
+
 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 \
+  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
+mv $PKG/usr/man/man1/mute* $PKG/usr/doc/aumix-$VERSION
+
 gzip -9 $PKG/usr/man/man1/*
 mkdir $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/ap/aumix/aumix.alsa.diff b/source/ap/aumix/aumix.alsa.diff
deleted file mode 100644
index 6d632cf5..00000000
--- a/source/ap/aumix/aumix.alsa.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- ./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/bc/bc.SlackBuild b/source/ap/bc/bc.SlackBuild
index a8ebb8eb..d467d987 100755
--- a/source/ap/bc/bc.SlackBuild
+++ b/source/ap/bc/bc.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 PKGNAM=bc
 VERSION=${VERSION:-1.06.95}
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-${PKGNAM}
@@ -37,6 +46,8 @@ elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 cd $TMP
diff --git a/source/ap/bpe/bpe.SlackBuild b/source/ap/bpe/bpe.SlackBuild
index 44fde4c8..4be1f97d 100755
--- a/source/ap/bpe/bpe.SlackBuild
+++ b/source/ap/bpe/bpe.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,15 +22,26 @@
 
 
 VERSION=2.01.00
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 CWD=$(pwd)
diff --git a/source/ap/cdparanoia/cdparanoia.SlackBuild b/source/ap/cdparanoia/cdparanoia.SlackBuild
index 200fc6bb..0d2ba1a7 100755
--- a/source/ap/cdparanoia/cdparanoia.SlackBuild
+++ b/source/ap/cdparanoia/cdparanoia.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,20 @@
 
 
 VERSION=III-10.2
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-cdparanoia
@@ -39,6 +49,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG
diff --git a/source/ap/cdrdao/cdrdao.SlackBuild b/source/ap/cdrdao/cdrdao.SlackBuild
index fccf3ab8..95216d51 100755
--- a/source/ap/cdrdao/cdrdao.SlackBuild
+++ b/source/ap/cdrdao/cdrdao.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,11 +21,21 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=1.2.1
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+VERSION=1.2.3
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -35,6 +45,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
@@ -46,7 +59,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf cdrdao-$VERSION
-tar xvf $CWD/cdrdao-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/cdrdao-$VERSION.tar.?z* || exit 1
 cd cdrdao-$VERSION
 chown -R root:root .
 find . \
@@ -60,7 +73,7 @@ CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-  $ARCH-slackware-linux
+  --build=$ARCH-slackware-linux
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
@@ -69,7 +82,7 @@ gzip -9 $PKG/usr/man/man1/*.?
 
 mkdir -p $PKG/usr/doc/cdrdao-$VERSION
 cp -a \
-  AUTHORS COPYING CREDITS INSTALL NEWS README* \
+  AUTHORS COPYING* CREDITS INSTALL NEWS README* \
   cdrdao.lsm \
   contrib \
   $PKG/usr/doc/cdrdao-$VERSION
diff --git a/source/ap/cdrtools/cdrtools.SlackBuild b/source/ap/cdrtools/cdrtools.SlackBuild
index b72c8a13..4d3a02ae 100755
--- a/source/ap/cdrtools/cdrtools.SlackBuild
+++ b/source/ap/cdrtools/cdrtools.SlackBuild
@@ -46,7 +46,7 @@ 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
+tar xvf $CWD/cdrtools-$VERSION.tar.?z* || exit 1
 cd cdrtools-$(echo $VERSION | cut -f 1 -d a) || exit 1
 chown -R root:root .
 find . \
@@ -55,10 +55,10 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-make -e $NUMJOBS INS_BASE=/usr || exit 1
+make -e $NUMJOBS INS_BASE=/usr DEFMANBASE=. || exit 1
 # Without this second run, cdda2wav is skipped...
-make -e INS_BASE=/usr || exit 1
-make -e install INS_BASE=/usr DEST_DIR=$PKG || exit 1
+make -e INS_BASE=/usr DEFMANBASE=. || exit 1
+make -e install INS_BASE=/usr DEFMANBASE=. DESTDIR=$PKG || exit 1
 
 # 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.
diff --git a/source/ap/dc3dd/dc3dd.SlackBuild b/source/ap/dc3dd/dc3dd.SlackBuild
index 87324fac..9797e8ef 100755
--- a/source/ap/dc3dd/dc3dd.SlackBuild
+++ b/source/ap/dc3dd/dc3dd.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for dc3dd
 
 # Copyright 2008 Barry J. Grundy <http://www.linuxleo.com>
+# Copyright 2010 Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +23,23 @@
 # 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}	
+PKGNAM=dc3dd		
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
 OUTPUT=${OUTPUT:-/tmp}
  
 if [ "$ARCH" = "i486" ]; then
@@ -41,14 +51,17 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG 
 mkdir -p $TMP $PKG $OUTPUT
-rm -rf $TMP/$PRGNAM-$VERSION
+rm -rf $TMP/$PKGNAM-$VERSION
 cd $TMP 
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* || exit 1
-cd $PRGNAM-$VERSION 
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION 
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -76,16 +89,16 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 )
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$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 {} \;
+    $PKG/usr/doc/$PKGNAM-$VERSION
+find $PKG/usr/doc/$PKGNAM-$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
+/sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source/ap/ddrescue/ddrescue.SlackBuild b/source/ap/ddrescue/ddrescue.SlackBuild
new file mode 100755
index 00000000..16c60201
--- /dev/null
+++ b/source/ap/ddrescue/ddrescue.SlackBuild
@@ -0,0 +1,136 @@
+#!/bin/sh
+
+# Copyright 2011  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=ddrescue
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | rev | cut -f 2- -d -)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION
+
+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} \
+  --localstatedir=/var \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --build=$ARCH-slackware-linux
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* NEWS README* \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+# 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 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 files, if any:
+if [ -d $PKG/usr/info ]; then
+  ( cd $PKG/usr/info
+    rm -f dir
+    gzip -9 *
+  )
+fi
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/ddrescue/slack-desc b/source/ap/ddrescue/slack-desc
new file mode 100644
index 00000000..4ed9d179
--- /dev/null
+++ b/source/ap/ddrescue/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------------------------------------------------------|
+ddrescue: ddrescue (automatic data recovery tool)
+ddrescue:
+ddrescue: GNU ddrescue is a data recovery tool.  It copies data from one file or
+ddrescue: block device (hard disc, cdrom, etc) to another, trying hard to rescue
+ddrescue: data in case of read errors.  Every time you run it on the same output
+ddrescue: file, it tries to fill in the gaps.
+ddrescue:
+ddrescue:
+ddrescue:
+ddrescue: ddrescue home: http://www.gnu.org/software/ddrescue/ddrescue.html
+ddrescue:
diff --git a/source/ap/diffstat/diffstat.SlackBuild b/source/ap/diffstat/diffstat.SlackBuild
index 5066f215..1334f81a 100755
--- a/source/ap/diffstat/diffstat.SlackBuild
+++ b/source/ap/diffstat/diffstat.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +22,20 @@
 
 
 PKGNAM=diffstat
-VERSION=${VERSION:-1.43}
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -40,11 +49,13 @@ elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
 cd ${PKGNAM}-$VERSION
 
 # Make sure ownerships and permissions are sane:
@@ -59,7 +70,8 @@ find . \
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  $ARCH-slackware-linux
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
 
 # Build and install:
 make $NUMJOBS || make || exit 1
diff --git a/source/ap/dmapi/dmapi.SlackBuild b/source/ap/dmapi/dmapi.SlackBuild
index 9b57b2fd..6efdfa77 100755
--- a/source/ap/dmapi/dmapi.SlackBuild
+++ b/source/ap/dmapi/dmapi.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=2.2.10
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 if [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 else
diff --git a/source/ap/dmidecode/dmidecode.SlackBuild b/source/ap/dmidecode/dmidecode.SlackBuild
index 2a897ace..acd07794 100755
--- a/source/ap/dmidecode/dmidecode.SlackBuild
+++ b/source/ap/dmidecode/dmidecode.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +22,20 @@
 
 
 PKGNAM=dmidecode
-VERSION=${VERSION:-2.10}
-ARCH=${ARCH:-x86_64}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:-" -j7 "}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
diff --git a/source/ap/dvd+rw-tools/dvd+rw-tools.SlackBuild b/source/ap/dvd+rw-tools/dvd+rw-tools.SlackBuild
index ac149131..b0cea4da 100755
--- a/source/ap/dvd+rw-tools/dvd+rw-tools.SlackBuild
+++ b/source/ap/dvd+rw-tools/dvd+rw-tools.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,10 +25,19 @@
 VERSION=7.1
 PKGVER=7.1
 DIRVER=7.1
+BUILD=${BUILD:-2}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
-ARCH=${ARCH:-x86_64}
 NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-1}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
diff --git a/source/ap/enscript/enscript.SlackBuild b/source/ap/enscript/enscript.SlackBuild
index e7bc7ff9..5d427a8f 100755
--- a/source/ap/enscript/enscript.SlackBuild
+++ b/source/ap/enscript/enscript.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,17 +20,30 @@
 #  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 "}
+PKGNAM=enscript
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 CWD=$(pwd)
@@ -42,7 +55,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf enscript-$VERSION
-tar xvf $CWD/enscript-$VERSION.tar.gz || exit 1
+tar xvf $CWD/enscript-$VERSION.tar.?z* || exit 1
 cd enscript-$VERSION
 chown -R root:root .
 find . \
@@ -54,41 +67,61 @@ find . \
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
   --with-media=Letter \
   --sysconfdir=/etc \
   --build=$ARCH-slackware-linux
 
 make $NUMJOBS || make || exit 1
-make install prefix=$PKG/usr sysconfdir=$PKG/etc || exit 1
+make install DESTDIR=$PKG || exit 1
+make -i install-man DESTDIR=$PKG
+make -i install-info DESTDIR=$PKG
 
 # 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
+  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/info
-  rm -f dir
-  gzip -9 *
-)
+# 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/enscript-$VERSION
 cp -a \
-  *.txt ABOUT-NLS AUTHORS COPYING ChangeLog docs/FAQ.html INSTALL NEWS \
+  *.txt ABOUT-NLS AUTHORS COPYING* docs/FAQ.html INSTALL NEWS \
   README* THANKS TODO \
   $PKG/usr/doc/enscript-$VERSION
 chmod 644 $PKG/usr/doc/enscript-$VERSION/*
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source/ap/flac/flac.SlackBuild b/source/ap/flac/flac.SlackBuild
index 7f2d02d3..4cc97ea5 100755
--- a/source/ap/flac/flac.SlackBuild
+++ b/source/ap/flac/flac.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,10 +21,21 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=1.2.1
-ARCH=${ARCH:-x86_64}
+PKGNAM=flac
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-3}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-2}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -35,6 +46,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
@@ -46,9 +60,10 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf flac-$VERSION
-tar xvf $CWD/flac-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/flac-$VERSION.tar.?z* || exit 1
 cd flac-$VERSION
-zcat $CWD/flac.man.diff.gz | patch -p1 --verbose --backup --suffix=.orig
+zcat $CWD/flac.man.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
+zcat $CWD/flac.gcc45.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
 
 chown -R root:root .
 find . \
diff --git a/source/ap/flac/flac.gcc45.diff b/source/ap/flac/flac.gcc45.diff
new file mode 100644
index 00000000..a2c241cc
--- /dev/null
+++ b/source/ap/flac/flac.gcc45.diff
@@ -0,0 +1,10 @@
+--- ./examples/cpp/encode/file/main.cpp.orig	2007-09-13 10:58:03.000000000 -0500
++++ ./examples/cpp/encode/file/main.cpp	2011-03-09 14:06:05.329999998 -0600
+@@ -30,6 +30,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <cstring>
+ #include "FLAC++/metadata.h"
+ #include "FLAC++/encoder.h"
+ 
diff --git a/source/ap/ghostscript/ghostscript-pdf2dsc.patch b/source/ap/ghostscript/ghostscript-pdf2dsc.patch
deleted file mode 100644
index 31b6b544..00000000
--- a/source/ap/ghostscript/ghostscript-pdf2dsc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ghostscript-8.71/lib/pdf2dsc.ps.pdf2dsc ghostscript-8.71/lib/pdf2dsc.ps
---- ghostscript-8.71/lib/pdf2dsc.ps.pdf2dsc	2010-02-20 15:50:51.287734970 +0000
-+++ ghostscript-8.71/lib/pdf2dsc.ps	2010-02-20 15:51:02.902609964 +0000
-@@ -116,7 +116,7 @@ systemdict /.setsafe known { .setsafe } 
-    DSCfile PDFname write==only
-    ( \(r\) file { DELAYSAFER { .setsafe } if } stopped pop\n) puts
-    ( pdfopen begin\n) puts
--   ( copy_trailer_attrs\n) puts
-+   ( process_trailer_attrs\n) puts
-    (%%EndSetup\n) puts
- 
-    /.hasPageLabels false def % see "Page Labels" in the PDF Reference
diff --git a/source/ap/ghostscript/ghostscript.SlackBuild b/source/ap/ghostscript/ghostscript.SlackBuild
index a17d3428..ff9fac9e 100755
--- a/source/ap/ghostscript/ghostscript.SlackBuild
+++ b/source/ap/ghostscript/ghostscript.SlackBuild
@@ -22,7 +22,7 @@
 
 
 PKGNAM=ghostscript
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
@@ -57,10 +57,11 @@ fi
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1
 cd ${PKGNAM}-$VERSION
 
-zcat $CWD/ghostscript-pdf2dsc.patch.gz | patch -p1 --verbose || exit 1
+# Bugfix:
+zcat $CWD/ghostscript.rev11948.diff.gz | patch -p1 --verbose || exit 1
 
 ## Regenerate ./configure:
 #sh autogen.sh
diff --git a/source/ap/ghostscript/ghostscript.rev11948.diff b/source/ap/ghostscript/ghostscript.rev11948.diff
new file mode 100644
index 00000000..cc45c154
--- /dev/null
+++ b/source/ap/ghostscript/ghostscript.rev11948.diff
@@ -0,0 +1,13 @@
+--- ./base/gximag3x.c.orig	2010-08-10 11:20:19.000000000 -0500
++++ ./base/gximag3x.c	2010-12-28 13:24:54.000000000 -0600
+@@ -241,7 +241,9 @@
+ 	    const gs_image3x_mask_t *pixm =
+ 		(i == 0 ? &pim->Opacity : &pim->Shape);
+ 
+-	    *(gs_data_image_t *)&mask[i].image = pixm->MaskDict;
++            /* Use memcpy because direct assignment breaks ANSI aliasing */
++            /* rules and causes SEGV with gcc 4.5.1 */
++            memcpy(&mask[i].image, &pixm->MaskDict, sizeof(pixm->MaskDict));
+ 	    mask[i].image.type = type1;
+ 	    mask[i].image.BitsPerComponent = pixm->MaskDict.BitsPerComponent;
+ 	}
diff --git a/source/ap/groff/groff.SlackBuild b/source/ap/groff/groff.SlackBuild
index e9b35d3e..185d67c2 100755
--- a/source/ap/groff/groff.SlackBuild
+++ b/source/ap/groff/groff.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2005-2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,10 +21,20 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=${VERSION:-1.20.1}
-ARCH=${ARCH:-x86_64}
+PKGNAM=groff
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:--j7}
 
 CWD=$(pwd)
@@ -40,6 +50,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG
@@ -47,7 +60,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf groff-$VERSION
-tar xvf $CWD/groff-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/groff-$VERSION.tar.?z* || exit 1
 cd groff-$VERSION || exit 1
 chown -R root:root .
 find . \
@@ -56,9 +69,6 @@ find . \
   \( -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 \
@@ -80,13 +90,21 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \
   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 \
+  BUG-REPORT COPYING* ChangeLog FDL INSTALL* LICENSES MANIFEST MORE.STUFF \
+  NEWS PROBLEMS PROJECTS README* REVISION TODO VERSION \
   $PKG/usr/doc/groff-$VERSION
+mkdir -p $PKG/usr/doc/groff-$VERSION/xditview
 cp -a src/devices/xditview/{README,TODO} $PKG/usr/doc/groff-$VERSION/xditview
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 # 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 \
diff --git a/source/ap/groff/groff.docdir.diff b/source/ap/groff/groff.docdir.diff
deleted file mode 100644
index a73a3bf5..00000000
--- a/source/ap/groff/groff.docdir.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-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/gutenprint/gutenprint.SlackBuild b/source/ap/gutenprint/gutenprint.SlackBuild
index e713eefb..d4876a93 100755
--- a/source/ap/gutenprint/gutenprint.SlackBuild
+++ b/source/ap/gutenprint/gutenprint.SlackBuild
@@ -22,7 +22,7 @@
 
 
 VERSION=${VERSION:-$(echo gutenprint-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -75,7 +75,6 @@ find . \
   --with-cups \
   --with-gimp2 \
   --with-gimp2-as-gutenprint \
-  --disable-libgutenprintui \
   --enable-libgutenprintui2 \
   --enable-escputil \
   --disable-static \
diff --git a/source/ap/hplip/hplip.SlackBuild b/source/ap/hplip/hplip.SlackBuild
index fd944d22..b85e7914 100755
--- a/source/ap/hplip/hplip.SlackBuild
+++ b/source/ap/hplip/hplip.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for hplip
 
 # Copyright 2006-2010  Robby Workman, Northport, Alabama, USA
-# Copyright 2006-2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006-2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 
 PKGNAM=hplip
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -100,6 +100,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-foomatic-drv-install \
   --enable-network-build=yes \
   --enable-qt4 \
+  --enable-policykit \
   --build=$ARCH-slackware-linux \
   --host=$ARCH-slackware-linux \
   || exit 1
diff --git a/source/ap/ispell/ispell.SlackBuild b/source/ap/ispell/ispell.SlackBuild
index cf6b4c6b..44370a94 100755
--- a/source/ap/ispell/ispell.SlackBuild
+++ b/source/ap/ispell/ispell.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2002-2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2002-2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=3.2.06
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-ispell
diff --git a/source/ap/joe/joe.SlackBuild b/source/ap/joe/joe.SlackBuild
index f3672e24..f681cd31 100755
--- a/source/ap/joe/joe.SlackBuild
+++ b/source/ap/joe/joe.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,10 +20,21 @@
 #  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}
+PKGNAM=joe
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-2}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -34,7 +45,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf joe-$VERSION
-tar xvf $CWD/joe-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/joe-$VERSION.tar.?z* || exit 1
 cd joe-$VERSION || exit 1
 
 chown -R root:root .
@@ -46,10 +57,12 @@ find . \
 
 ./configure \
   --prefix=/usr \
+  --docdir=/usr/doc/joe-${VERSION} \
+  --mandir=/usr/man \
   --sysconfdir=/etc \
   --program-prefix="" \
   --program-suffix="" \
-  $ARCH-slackware-linux
+  --build=$ARCH-slackware-linux
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
@@ -66,9 +79,17 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \
 
 mkdir -p $PKG/usr/doc/joe-$VERSION
 cp -a \
-  COPYING HACKING HINTS LIST NEWS README TODO docs/help-system.html \
+  COPYING* HACKING HINTS LIST NEWS README* TODO docs/help-system.html \
   $PKG/usr/doc/joe-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source/ap/jove/jove.SlackBuild b/source/ap/jove/jove.SlackBuild
index 0fa524d0..65714d3c 100755
--- a/source/ap/jove/jove.SlackBuild
+++ b/source/ap/jove/jove.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=4.16.0.70
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-2}
+VERSION=4.16.0.73
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -36,6 +45,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
diff --git a/source/ap/ksh93/ksh93.SlackBuild b/source/ap/ksh93/ksh93.SlackBuild
index 8653c89d..43023ae6 100755
--- a/source/ap/ksh93/ksh93.SlackBuild
+++ b/source/ap/ksh93/ksh93.SlackBuild
@@ -1,7 +1,7 @@
 #!/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
+# Copyright 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,17 +22,29 @@
 #  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
+VERSION=2010-06-21
+PKGVER=2010_06_21
+# Not packaged?
+#KSHLOCALE=2010-02-02
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# ast 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
@@ -55,8 +67,8 @@ find . \
   \( -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
+/bin/ksh bin/package read || exit 1
+/bin/ksh bin/package make || exit 1
 
 mkdir -p $PKG/bin
 cp arch/linux.$SARCH/bin/ksh $PKG/bin/ksh.new
diff --git a/source/ap/libx86/libx86.SlackBuild b/source/ap/libx86/libx86.SlackBuild
index 02c54a09..bd075348 100755
--- a/source/ap/libx86/libx86.SlackBuild
+++ b/source/ap/libx86/libx86.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for libx86
 
 # Copyright 2008  Robby Workman, Northport, Alabama, USA
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,9 +24,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=${VERSION:-1.1}
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-libx86
@@ -40,6 +49,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG
diff --git a/source/ap/linuxdoc-tools/ChangeLog.txt b/source/ap/linuxdoc-tools/ChangeLog.txt
index ef6c0a2c..16d8783f 100644
--- a/source/ap/linuxdoc-tools/ChangeLog.txt
+++ b/source/ap/linuxdoc-tools/ChangeLog.txt
@@ -1,3 +1,55 @@
+Mon Mar 21 17:39:48 UTC 2011
+ Patrick Volkerding <volkerdi@slackware.com>
+ linuxdoc-tools 0.9.66, build 8
+ Upgraded to gnome-doc-utils-0.20.4.
+
+Wed Jan 26 18:08:43 UTC 2011
+ Patrick Volkerding <volkerdi@slackware.com>
+ linuxdoc-tools 0.9.66, build 7
+ Rebuild for perl-5.12.3.
+
+Sat Jan  1 21:44:58 UTC 2011
+ Patrick Volkerding <volkerdi@slackware.com>
+ linuxdoc-tools 0.9.66, build 6
+ Rebuild for perl-5.12.2.
+
+Thu Nov 11 13:37:42 CST 2010
+ Patrick Volkerding <volkerdi@slackware.com>
+ linuxdoc-tools 0.9.66, build 5
+ Fixes:
+  * asciidoc: Patched to revert a change that broke processing the
+    documentation for git.
+
+Tue Oct 19 16:10:42 BST 2010
+ Stuart Winter <mozes@slackware.com>
+ linuxdoc-tools 0.9.66, build 4
+ Upgraded a couple of component packages:
+  * gnome-doc-utils-0.20.2
+  * asciidoc-8.6.2.
+ Fixes:
+  * gtk-doc: Patched to fix a problem with vim.
+    Thanks to Trev Carey-Smith for the report and Robby Workman for
+    finding the patch.
+
+Sun Jul 25 12:40:07 BST 2010
+ Stuart Winter <mozes@slackware.com>
+ linuxdoc-tools 0.9.66, build 3
+ Upgraded a few component packages:
+  * Upgraded to gtk-doc-1.15
+  * Upgraded to asciidoc-8.5.3
+  * Upgraded to gnome-doc-tools-0.20.1
+    Thanks to Steve Kennedy for the notification about the new version.
+  * Updated various packages to include more recent patches from Fedora.
+  * Changed build script to use rpm2cpio instead of rpm2tgz because 
+    with different builds/versions of rpm2tgz (or "rpm" - I'm not sure
+    what causes the change) the "tgz" that is created flips back and
+    forth between having the content in a sub directory, or the root
+    of the archive.
+    Using rpm2cpio means that as a minimum you need seamonkey-solibs
+    installed because rpm2cpio requires libnss3.so.  Mozilla-FireFox
+    & Thunderbird also contain this library.  Slackware is built on a
+    full system, so this shouldn't pose a problem.
+
 Wed Feb 10 10:02:16 GMT 2010
  Stuart Winter <mozes@slackware.com>
  linuxdoc-tools 0.9.66, build 2.
diff --git a/source/ap/linuxdoc-tools/arm/build b/source/ap/linuxdoc-tools/arm/build
index 3f29e62c..eb4f18c8 100755
--- a/source/ap/linuxdoc-tools/arm/build
+++ b/source/ap/linuxdoc-tools/arm/build
@@ -11,7 +11,7 @@ source /usr/share/slackdev/buildkit.sh
 export PKGNAM=linuxdoc-tools
 export VERSION=${VERSION:-0.9.66}
 export PKGARCH=${PKGARCH:-arm}
-export BUILD=${BUILD:-2}
+export BUILD=${BUILD:-4}
 export PKGSERIES=${PKGSERIES:-ap}
 export SLACKPACKAGE=$PKGNAM-$VERSION-$PKGARCH-$BUILD.tgz
 export PKGEXT=${PKGEXT:-tgz}
@@ -45,4 +45,4 @@ BUILDLOG=$( basename $SLACKPACKAGE .tgz ).build.log
 ( ./trackbuild.$PKGNAM ) >& /dev/stdout | tee $BUILDLOG
 
 # Compress the build log:
-bzip2 -9f $BUILDLOG
+bzip2 -9fvz $BUILDLOG
diff --git a/source/ap/linuxdoc-tools/linuxdoc-tools.build b/source/ap/linuxdoc-tools/linuxdoc-tools.build
index cd95c0f0..fe3506cc 100755
--- a/source/ap/linuxdoc-tools/linuxdoc-tools.build
+++ b/source/ap/linuxdoc-tools/linuxdoc-tools.build
@@ -25,11 +25,11 @@ DSSSLSTYLESHEETSVER=1.79
 SGMLCOMMONVER=0.6.3
 OPENJADEVER=1.3.3-pre1
 OPENSPVER=1.5.2
-GNOMEDOCUTILSVER=0.19.1
-GTKDOCVER=1.13
+GNOMEDOCUTILSVER=0.20.4
+GTKDOCVER=1.15
 SGMLSPLVER=1.03ii
 XMLTOVER=0.0.23
-ASCIIDOCVER=8.5.2
+ASCIIDOCVER=8.6.2
 DOCBOOKUTILSVER=0.6.14
 
 # Determine the general CFLAGS for the known architectures:
@@ -70,6 +70,9 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
+# Revert a change that breaks processing the git documentation:
+xz -dc $CWD/sources/asciidoc.asciidoc7compatible.revertbrokenchange.diff.xz | patch --verbose -p1 || exit 1
+
 # Configure:
 ./configure \
   --prefix=/usr \
@@ -93,8 +96,7 @@ cp -fav \
 # patches that we need:
 cd $TMP
 mkdir sgml-common && cd sgml-common
-rpm2tgz $CWD/sources/sgml-common-${SGMLCOMMONVER}*.src.rpm
-tar xvf sgml-common-*src.tgz || exit 1
+rpm2cpio $CWD/sources/sgml-common-${SGMLCOMMONVER}*.src.rpm | cpio -div || exit 1
 # The real source archive is stored inside the source RPM, you see:
 tar xvf sgml-common-$SGMLCOMMONVER.tgz 
 cd sgml-common-$SGMLCOMMONVER || exit 1
@@ -106,23 +108,27 @@ find . \
   -exec chmod 644 {} \;
 
 # Apply patches (these are included in the source rpm):
+# Don't include the XML dir patch because we keep our stuff in /usr/share/sgml.
 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:
+# autoconf doesn't work anymore..
 #aclocal
 #automake --add-missing --copy
-autoreconf -vif
+#autoreconf -vif
+# but this does..
+for file in COPYING INSTALL install-sh missing mkinstalldirs; do
+   rm -f $file
+   cp -fav /usr/share/automake-*/$file .
+done
 ./configure \
   --prefix=/usr \
   --mandir=/usr/man \
   --infodir=/usr/info \
-  --with-docdir=/usr/doc \
   --sysconfdir=/etc \
   || exit 1
 
@@ -149,7 +155,7 @@ 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 
+tar xvf $CWD/sources/docbook_*orig*.tar.*z*
 cd docbook* || exit 1
 chown -R root:root .
 find . \
@@ -253,8 +259,7 @@ EOF
 # Extract source:
 cd $TMP
 mkdir opensp && cd opensp
-rpm2tgz $CWD/sources/opensp-${OPENSPVER}*.src.rpm 
-tar xvf opensp*src.tgz 
+rpm2cpio $CWD/sources/opensp-${OPENSPVER}*.src.rpm | cpio -div || exit 1
 tar xvf OpenSP-$OPENSPVER.tar.gz 
 cd OpenSP-$OPENSPVER || exit 1
 chown -R root:root .
@@ -408,8 +413,8 @@ cp -fav \
 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
+tar xvf $CWD/sources/docbook-dsssl-$DSSSLSTYLESHEETSVER.tar.*z* || exit 1
+tar xvf $CWD/sources/docbook-dsssl-doc-$DSSSLSTYLESHEETSVER.tar.*z* || exit 1
 cd docbook-dsssl-$DSSSLSTYLESHEETSVER || exit 1
 chown -R root:root .
 find . \
@@ -450,8 +455,7 @@ cp -fav \
 # Extract source:
 cd $TMP
 mkdir docbook-utils && cd docbook-utils
-rpm2tgz $CWD/sources/docbook-utils-${DOCBOOKUTILSVER}*.src.rpm
-tar xvf docbook-utils-*src.tgz 
+rpm2cpio $CWD/sources/docbook-utils-${DOCBOOKUTILSVER}*.src.rpm | cpio -div || exit 1
 tar xvf docbook-utils-$DOCBOOKUTILSVER.tar.gz 
 cd docbook-utils-$DOCBOOKUTILSVER || exit 1
 chown -R root:root .
@@ -463,13 +467,15 @@ find . \
 
 # Apply patches:
 for i in \
-  docbook-utils-rtfmanpage.patch \
-  docbook-utils-sgmlinclude.patch \
+  docbook-utils-spaces.patch \
   docbook-utils-2ndspaces.patch \
+  docbook-utils-w3mtxtconvert.patch \
   docbook-utils-grepnocolors.patch \
-  docbook-utils-spaces.patch \
-  docbook-utils-w3mtxtconvert.patch ; do
- patch --verbose -p1 < ../$i
+  docbook-utils-sgmlinclude.patch \
+  docbook-utils-rtfmanpage.patch \
+  docbook-utils-papersize.patch \
+  docbook-utils-nofinalecho.patch ; do
+    patch --verbose -p1 < ../$i
 done || exit 1
 
 # Configure:
@@ -486,6 +492,11 @@ make || exit 1
 # Install:
 make install htmldir=/usr/doc/docbook-utils-$DOCBOOKUTILSVER/html || exit 1
 
+# grep-2.7 demands [[:space:]] instead of [:space:]
+if ! fgrep '[[:space:]]' /usr/bin/jw ; then
+  sed -i "s/\[:space:\]/\[\[:space:\]\]/g" /usr/bin/jw
+fi
+
 # db2html is not just a symlink, as it has to create the output directory:
 rm -f /usr/bin/db2html
 install -vpm755 ../db2html /usr/bin
@@ -661,8 +672,7 @@ cp -favv \
 # Extract source:
 cd $TMP
 mkdir docbook-style-xsl && cd docbook-style-xsl
-rpm2tgz $CWD/sources/docbook-style-xsl-${XSLSTYLESHEETSVER}*.src.rpm 
-tar xvf docbook-style-xsl*.tgz
+rpm2cpio $CWD/sources/docbook-style-xsl-${XSLSTYLESHEETSVER}*.src.rpm | cpio -div || exit 1
 tar xvf docbook-xsl-$XSLSTYLESHEETSVER.tar.bz2
 # This unpacks atop of the main tree:
 tar xvf docbook-xsl-doc-$XSLSTYLESHEETSVER.tar.bz2
@@ -731,7 +741,10 @@ cp -fav doc/* README* RELEASE-NOTES* NEWS* \
 
 # Extract source:
 cd $TMP
-tar xvf $CWD/sources/xmlto-$XMLTOVER.tar.*z*
+mkdir xmlto && cd xmlto
+#tar xvf $CWD/sources/xmlto-$XMLTOVER.tar.*z*
+rpm2cpio $CWD/sources/xmlto-${XMLTOVER}*.src.rpm | cpio -div || exit 1
+tar xvvf xmlto-$XMLTOVER.tar.*z*
 cd xmlto-$XMLTOVER || exit 1
 chown -R root:root .
 find . \
@@ -740,6 +753,9 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
+# Apply patches:
+patch --verbose -p1 < ../xmlto-0.0.23-Lchapterpassivetex.patch || exit 1
+
 # Configure:
 ./configure \
   --prefix=/usr \
@@ -763,7 +779,7 @@ cp -fav \
 
 # Extract source:
 cd $TMP
-tar xvf $CWD/sources/libsgmls-perl_$SGMLSPLVER.orig.tar.gz || exit 1
+tar xvf $CWD/sources/libsgmls-perl_$SGMLSPLVER.orig.tar.*z* || exit 1
 cd libsgmls-perl-$SGMLSPLVER.orig
 chown -R root:root .
 find . \
@@ -771,7 +787,7 @@ find . \
   -exec chmod 755 {} \; -o \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
-zcat $CWD/sources/libsgmls-perl_$SGMLSPLVER-*.diff.gz | patch -p1 || exit 1
+xz -dc $CWD/sources/libsgmls-perl_$SGMLSPLVER-*.diff.xz | patch -p1 || exit 1
 
 # Configure:
 perl Makefile.PL INSTALLDIRS=vendor || exit 1
@@ -798,8 +814,7 @@ cp -fav \
 # Extract source:
 cd $TMP
 mkdir linuxdoc-tools && cd linuxdoc-tools
-rpm2tgz $CWD/sources/linuxdoc-tools-${LINUXDOCTOOLSVER}*.src.rpm
-tar xvf linuxdoc-tools*.src.tgz
+rpm2cpio $CWD/sources/linuxdoc-tools-${LINUXDOCTOOLSVER}*.src.rpm | cpio -div || exit 1
 tar xvf linuxdoc-tools_$LINUXDOCTOOLSVER.tar.gz
 cd linuxdoc-tools-$LINUXDOCTOOLSVER || exit 1
 
@@ -918,8 +933,8 @@ cp -fav \
 
 # Extract source:
 cd $TMP
-tar xvf $CWD/sources/gtk-doc-$GTKDOCVER.tar.bz2 || exit 1
-cd gtk-doc-$GTKDOCVER
+tar xvf $CWD/sources/gtk-doc-$GTKDOCVER.tar.*z* 
+cd gtk-doc-$GTKDOCVER || exit 1
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -927,8 +942,8 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-# Apply an upstreamed fix for gtk-doc-1.13:
-bzcat $CWD/sources/gtkdoc-1.13-fixref.patch.bz2 | patch --verbose -p1 || exit 1
+# Apply patch to fix problem with vim:
+xz -dc $CWD/sources/gtk-doc.patch.xz | patch --verbose -p1 || exit 1
 
 # Configure:
 ./configure \
diff --git a/source/ap/linuxdoc-tools/sources/asciidoc.asciidoc7compatible.revertbrokenchange.diff b/source/ap/linuxdoc-tools/sources/asciidoc.asciidoc7compatible.revertbrokenchange.diff
new file mode 100644
index 00000000..2bdc7de4
--- /dev/null
+++ b/source/ap/linuxdoc-tools/sources/asciidoc.asciidoc7compatible.revertbrokenchange.diff
@@ -0,0 +1,80 @@
+--- a/asciidoc.py       2010-10-17 14:01:35.000000000 +0800
++++ b/asciidoc.py       2010-10-17 14:11:07.000000000 +0800
+@@ -4260,10 +4260,12 @@
+         self.include1 = {}      # Holds include1::[] files for {include1:}.
+         self.dumping = False    # True if asciidoc -c option specified.
+
+-    def load_file(self,fname,dir=None):
++    def load_file(self, fname, dir=None, include=[]):
+         """
+         Loads sections dictionary with sections from file fname.
+         Existing sections are overlaid.
++        The 'include' list contains the section names to be loaded,
++        if 'inlude' is not specified all sections are loaded.
+         Return False if no file was found in any of the locations.
+         """
+         if dir:
+@@ -4317,9 +4319,14 @@
+             else:
+                 sections[section] = contents
+         rdr.close()
++        if include:
++            for s in set(sections) - set(include):
++                del sections[s]
+         attrs = {}
+         self.load_sections(sections,attrs)
+-        self.loaded.append(os.path.realpath(fname))
++        if not include:
++            # If all sections are loaded mark this file as loaded.
++            self.loaded.append(os.path.realpath(fname))
+         document.update_attributes(attrs) # So they are available immediately.
+         return True
+
+@@ -5314,13 +5321,17 @@
+             if o == '-c': config.dumping = True
+             if o == '-s': config.header_footer = False
+             if o == '-v': config.verbose = True
+-        # Check the infile exists.
+-        if infile != '<stdin>' and not os.path.isfile(infile):
+-            raise EAsciiDoc,'input file %s missing' % infile
+-        document.infile = infile
+         # Load asciidoc.conf files.
+         if not config.load_from_dirs('asciidoc.conf'):
+             raise EAsciiDoc,'configuration file asciidoc.conf missing'
++        # Check the infile exists.
++        if infile != '<stdin>':
++            if not os.path.isfile(infile):
++                raise EAsciiDoc,'input file %s missing' % infile
++            indir = os.path.dirname(infile)
++            config.load_file('asciidoc.conf', indir,
++                            ['attributes','titles','specialchars'])
++        document.infile = infile
+         AttributeList.initialize()
+         # Open input file and parse document header.
+         reader.tabsize = config.tabsize
+@@ -5343,10 +5354,9 @@
+             document.load_lang()
+         # Load local conf files (conf files in the input file directory).
+         if infile != '<stdin>':
+-            d =os.path.dirname(infile)
+-            config.load_from_dirs('asciidoc.conf', [d])
+-            config.load_backend([d])
+-            config.load_filters([d])
++            config.load_file('asciidoc.conf', indir)
++            config.load_backend([indir])
++            config.load_filters([indir])
+             # Load document specific configuration files.
+             f = os.path.splitext(infile)[0]
+             config.load_file(f + '.conf')
+--- a/doc/asciidoc.txt  2010-10-17 14:11:34.000000000 +0800
++++ b/doc/asciidoc.txt  2010-10-17 14:13:21.000000000 +0800
+@@ -3632,6 +3632,8 @@
+ the following order:
+
+ - `asciidoc.conf` from locations 1, 2, 3.
++- 'attributes', 'titles' and 'specialcharacters' sections from the
++  `asciidoc.conf` in location 4.
+ - The document header is parsed at this point.
+ - `<backend>.conf` and `<backend>-<doctype>.conf` from locations 1,
+   2,3.
+
diff --git a/source/ap/linuxdoc-tools/sources/gtk-doc.patch b/source/ap/linuxdoc-tools/sources/gtk-doc.patch
new file mode 100644
index 00000000..bf32d557
--- /dev/null
+++ b/source/ap/linuxdoc-tools/sources/gtk-doc.patch
@@ -0,0 +1,25 @@
+From 2bffebcf9c125f5610b8fb660d42c3c5b9dfd4f0 Mon Sep 17 00:00:00 2001
+From: Stefan Kost <ensonic@users.sf.net>
+Date: Thu, 19 Aug 2010 14:45:54 +0000
+Subject: fixxref: tweak the vim invocation
+
+Use specific output-filename to ensure we get what we'll late use. Use "-u NONE"
+instead of -u /dev/null.
+Fixes #627223
+---
+diff --git a/gtkdoc-fixxref.in b/gtkdoc-fixxref.in
+index 33a31b8..9f53852 100755
+--- a/gtkdoc-fixxref.in
++++ b/gtkdoc-fixxref.in
+@@ -464,7 +464,7 @@ sub HighlightSourceVim {
+     close (NEWFILE);
+ 
+     # format source
+-    system "echo 'let html_number_lines=0|let html_use_css=1|let use_xhtml=1|syn on|e $temp_source_file|run! syntax/2html.vim|wa!|qa!' | @HIGHLIGHT@ -n -e -u /dev/null -T xterm >/dev/null";
++    system "echo 'let html_number_lines=0|let html_use_css=1|let use_xhtml=1|syn on|e $temp_source_file|run! syntax/2html.vim|w! $temp_source_file.html|qa!' | @HIGHLIGHT@ -n -e -u NONE -T xterm >/dev/null";
+ 
+     my $highlighted_source;
+     {
+--
+cgit v0.8.3.1
+
diff --git a/source/ap/linuxdoc-tools/sources/gtkdoc-1.13-fixref.patch b/source/ap/linuxdoc-tools/sources/gtkdoc-1.13-fixref.patch
deleted file mode 100644
index 89b062de..00000000
--- a/source/ap/linuxdoc-tools/sources/gtkdoc-1.13-fixref.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -up gtk-doc-1.13/gtkdoc-fixxref.in.fix-fixxref gtk-doc-1.13/gtkdoc-fixxref.in
---- gtk-doc-1.13/gtkdoc-fixxref.in.fix-fixxref	2009-12-17 14:36:51.000000000 -0500
-+++ gtk-doc-1.13/gtkdoc-fixxref.in	2010-01-06 17:56:55.457121567 -0500
-@@ -168,36 +168,38 @@ foreach my $dir (@EXTRA_DIRS) {
-     }
- }
- 
--open (INPUT, "$MODULE-sections.txt")
--	|| die "Can't open $MODULE-sections.txt: $!";
--my $subsection = "";
--while (<INPUT>) {
--    if (m/^#/) {
--        next;
--
--    } elsif (m/^<SECTION>/) {
--        $subsection = "";
--    } elsif (m/^<SUBSECTION\s*(.*)>/i) {
--        $subsection = $1;
--    } elsif (m/^<SUBSECTION>/) {
--        next;
--    } elsif (m/^<TITLE>(.*)<\/TITLE>/) {
--        next;
--    } elsif (m/^<FILE>(.*)<\/FILE>/) {
--        next;
--    } elsif (m/^<INCLUDE>(.*)<\/INCLUDE>/) {
--        next;
--    } elsif (m/^<\/SECTION>/) {
--        next;
--    } elsif (m/^(\S+)/) {
--        my $symbol=CreateValidSGMLID($1);
--
--        if ($subsection eq "Standard" || $subsection eq "Private") {
--            $NoLinks{$symbol} = 1;
-+if (defined($MODULE)) {
-+    open (INPUT, "$MODULE-sections.txt")
-+            || die "Can't open $MODULE-sections.txt: $!";
-+    my $subsection = "";
-+    while (<INPUT>) {
-+        if (m/^#/) {
-+            next;
-+
-+        } elsif (m/^<SECTION>/) {
-+            $subsection = "";
-+        } elsif (m/^<SUBSECTION\s*(.*)>/i) {
-+            $subsection = $1;
-+        } elsif (m/^<SUBSECTION>/) {
-+            next;
-+        } elsif (m/^<TITLE>(.*)<\/TITLE>/) {
-+            next;
-+        } elsif (m/^<FILE>(.*)<\/FILE>/) {
-+            next;
-+        } elsif (m/^<INCLUDE>(.*)<\/INCLUDE>/) {
-+            next;
-+        } elsif (m/^<\/SECTION>/) {
-+            next;
-+        } elsif (m/^(\S+)/) {
-+            my $symbol=CreateValidSGMLID($1);
-+
-+            if ($subsection eq "Standard" || $subsection eq "Private") {
-+                $NoLinks{$symbol} = 1;
-+            }
-         }
-     }
-+    close (INPUT);
- }
--close (INPUT);
- 
- &FixCrossReferences ($MODULE_DIR);
- 
diff --git a/source/ap/linuxdoc-tools/sources/source.download b/source/ap/linuxdoc-tools/sources/source.download
index 41000902..40e05d21 100755
--- a/source/ap/linuxdoc-tools/sources/source.download
+++ b/source/ap/linuxdoc-tools/sources/source.download
@@ -7,8 +7,7 @@
 
 # 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.66-4.fc13.src.rpm
-
+wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/linuxdoc-tools-0.9.66-6.fc14.src.rpm
 
 # OpenSP:
 # http://openjade.sourceforge.net/download.html
@@ -25,7 +24,7 @@ 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-31.fc13.src.rpm
+wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/sgml-common-0.6.3-33.fc14.src.rpm
 
 
 # DocBook docs:
@@ -44,14 +43,12 @@ wget -c ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles/docbook-dsssl-1.79.tar
 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-23.fc13.src.rpm
-
+wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/docbook-utils-0.6.14-24.fc14.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.2-5.fc13.src.rpm
-
+wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/docbook-style-xsl-1.75.2-6.fc14.src.rpm
 
 # We use the Fedora "docbook-style-xsl" SRPM for this rather than the original source which is why
 # these "docbook-xsl*" files aren't in our sources directory.
@@ -60,15 +57,18 @@ wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/
 
 
 # gnome-doc-utils, needed to build gtk-doc:
-wget -c http://ftp.acc.umu.se/pub/GNOME/sources/gnome-doc-utils/0.19/gnome-doc-utils-0.19.1.tar.bz2
-
+# Recompressed with LZMA after download.
+# I guess this mirror is out of date now.  It's easier to just look at Fedora's development
+# directory anyway :-)
+# wget -c http://ftp.acc.umu.se/pub/GNOME/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.0.tar.bz2
+wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/gnome-doc-utils-0.20.1-1.fc14.src.rpm
 
 # gtk-doc:
 # When upgrading this, it's worth checking the Fedora SRPM.  For version 1.13
 # we're carrying a fix for gtk-doc-fixref.  Make sure newer versions don't need
 # any patches!
-wget -c http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.13/gtk-doc-1.13.tar.bz2
-
+wget -c http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.15/gtk-doc-1.15.tar.bz2
+# http://git.gnome.org/browse/gtk-doc/commit/?id=2bffebcf9c125f5610b8fb660d42c3c5b9dfd4f0
 
 # sgmlspl
 # http://www.cs.indiana.edu/~asengupt/sgml/SGMLSpm/DOC/HTML/sgmlspl/sgmlspl.html
@@ -79,9 +79,11 @@ wget -c http://ftp.de.debian.org/debian/pool/main/libs/libsgmls-perl/libsgmls-pe
 
 # xmlto
 # https://fedorahosted.org/releases/x/m/xmlto
-wget -c --no-check-certificate https://fedorahosted.org/releases/x/m/xmlto/xmlto-0.0.23.tar.bz2
+# wget -c --no-check-certificate https://fedorahosted.org/releases/x/m/xmlto/xmlto-0.0.23.tar.bz2
+# Fedora 14 includes a patch, so we'll take it:
+wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/xmlto-0.0.23-3.fc13.src.rpm
 
 
 # AsciiDoc
 # http://www.methods.co.nz/asciidoc/
-wget -c "http://downloads.sourceforge.net/project/asciidoc/asciidoc/8.5.2/asciidoc-8.5.2.tar.gz?use_mirror=ignum"
+wget -c "http://sourceforge.net/projects/asciidoc/files/asciidoc/8.6.2/asciidoc-8.6.2.tar.gz/download"
diff --git a/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools b/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools
index 9533bd86..e6f23002 100755
--- a/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools
+++ b/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools
@@ -14,6 +14,7 @@
 #  a/rpm2tgz to unpack some SRPMs
 #  d/python for AsciiDoc
 #  l/libxslt
+#  l/seamonkey-solibs for rpm2cpio
 #  t/tetex (not required for a bootstrap build, but will be required
 #           later for a full build of this linuxdoc-tools package).
 
@@ -31,7 +32,7 @@ if [ -z "$ARCH" ]; then
 fi
 
 export PKGVERSION=0.9.66 # use the version of linuxdoc-tools as the package version.
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-8}
 PKGEXT=${PKGEXT:-txz}
 
 export CWD=$PWD
@@ -80,4 +81,4 @@ slacktrack $TFS \
    -rYQOcp $PKGNAM-$PKGVERSION-$ARCH-$BUILD.$PKGEXT ./linuxdoc-tools.build
 
 # Compress build log:
-xz -fvz $CWD/build.$ARCH.log
+bzip2 -9fvz $CWD/build.$ARCH.log
diff --git a/source/ap/lsscsi/lsscsi.SlackBuild b/source/ap/lsscsi/lsscsi.SlackBuild
index 102e3da3..e0ed72fe 100755
--- a/source/ap/lsscsi/lsscsi.SlackBuild
+++ b/source/ap/lsscsi/lsscsi.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,19 @@
 
 
 PKGNAM=lsscsi
-VERSION=${VERSION:-0.22}
-ARCH=${ARCH:-x86_64}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
@@ -40,11 +49,13 @@ elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
 cd ${PKGNAM}-$VERSION || exit 1
 
 # Make sure ownerships and permissions are sane:
diff --git a/source/ap/lxc/lxc.SlackBuild b/source/ap/lxc/lxc.SlackBuild
new file mode 100755
index 00000000..15df88c6
--- /dev/null
+++ b/source/ap/lxc/lxc.SlackBuild
@@ -0,0 +1,136 @@
+#!/bin/sh
+
+# Copyright 2011  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=lxc
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | rev | cut -f 2- -d -)}
+BUILD=${BUILD:-2}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION
+
+chown -R root:root .
+find . \
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --sysconfdir=/etc \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --infodir=/usr/info \
+  --build=$ARCH-slackware-linux
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Make configuration directory:
+mkdir -p $PKG/var/lib/lxc
+
+# 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
+)
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  AUTHORS CONTRIBUTING COPYING* INSTALL MAINTAINERS NEWS README* THANKS TODO \
+  doc/FAQ.txt \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
+
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION/examples
+cp -a doc/examples/*.conf $PKG/usr/doc/${PKGNAM}-$VERSION/examples
+
+# 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
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz
+
diff --git a/source/ap/lxc/slack-desc b/source/ap/lxc/slack-desc
new file mode 100644
index 00000000..80ccf820
--- /dev/null
+++ b/source/ap/lxc/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------------------------------------------------------|
+lxc: lxc (Linux Containers)
+lxc:
+lxc: Linux Containers (LXC) are an operating system-level virtualization
+lxc: method for running multiple isolated server installs (containers) on
+lxc: a single control host.  LXC does not provide a virtual machine, but
+lxc: rather provides a virtual environment that has its own process and
+lxc: network space.  It is similar to a chroot, but offers more isolation.
+lxc:
+lxc: Daniel Lezcano is the primary developer of lxc.
+lxc: Homepage:  http://lxc.sourceforge.net/
+lxc:
diff --git a/source/ap/madplay/madplay-0.15.2b-fix-segfault.patch b/source/ap/madplay/madplay-0.15.2b-fix-segfault.patch
new file mode 100644
index 00000000..cb9f3136
--- /dev/null
+++ b/source/ap/madplay/madplay-0.15.2b-fix-segfault.patch
@@ -0,0 +1,11 @@
+--- madplay-0.15.2b/audio_alsa.c.orig	2004-02-23 21:35:23.000000000 +0000
++++ madplay-0.15.2b/audio_alsa.c	2010-04-21 14:26:52.000000000 +0100
+@@ -241,7 +241,7 @@ int config(struct audio_config *config)
+ 		return -1;
+ 	}
+ 
+-	buf = malloc(buffer_size);
++	buf = malloc(buffer_size*sample_size);
+ 	if (buf == NULL) {
+ 		audio_error="unable to allocate output buffer table";
+ 		return -1;
diff --git a/source/ap/madplay/madplay-0.15.2b.tar.gz.sign b/source/ap/madplay/madplay-0.15.2b.tar.gz.sign
deleted file mode 100644
index d8c15332..00000000
--- a/source/ap/madplay/madplay-0.15.2b.tar.gz.sign
+++ /dev/null
@@ -1,7 +0,0 @@
------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
index fb322c83..34d32340 100755
--- a/source/ap/madplay/madplay.SlackBuild
+++ b/source/ap/madplay/madplay.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,19 @@
 
 
 VERSION=0.15.2b
-ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-3}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-2}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -32,6 +42,8 @@ elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 CWD=$(pwd)
@@ -42,8 +54,11 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf madplay-$VERSION
-tar xvf $CWD/madplay-$VERSION.tar.gz || exit 1
+tar xvf $CWD/madplay-$VERSION.tar.?z* || exit 1
 cd madplay-$VERSION || exit 1
+
+zcat $CWD/madplay-0.15.2b-fix-segfault.patch.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 \) \
@@ -68,7 +83,7 @@ gzip -9 $PKG/usr/man/man1/*
 
 mkdir -p $PKG/usr/doc/madplay-$VERSION
 cp -a \
-  CHANGES COPYING COPYRIGHT CREDITS README TODO VERSION \
+  CHANGES COPYING* COPYRIGHT CREDITS README* TODO VERSION \
   $PKG/usr/doc/madplay-$VERSION
 
 mkdir -p $PKG/install
diff --git a/source/ap/man/man.SlackBuild b/source/ap/man/man.SlackBuild
index 6ee765c3..a58b21a2 100755
--- a/source/ap/man/man.SlackBuild
+++ b/source/ap/man/man.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=1.6f
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-2}
+VERSION=1.6g
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -38,13 +47,16 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 cd $TMP
 rm -rf $PKG
 mkdir -p $TMP $PKG
 rm -rf man-$VERSION
-tar xvf $CWD/man-$VERSION.tar.bz2
+tar xvf $CWD/man-$VERSION.tar.xz
 cd man-$VERSION
 
 # In man.conf, set NROFF to "/usr/bin/nroff -mandoc" rather
@@ -59,9 +71,9 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
+# configure doesn't care about CFLAGS
 ./configure +lang all +traditional -confdir /usr/lib${LIBDIRSUFFIX}
-make
+make CFLAGS="$SLKCFLAGS"
 make install PREFIX=$PKG
 mv $PKG/usr/lib${LIBDIRSUFFIX}/man.conf $PKG/usr/lib${LIBDIRSUFFIX}/man.conf.new
 
diff --git a/source/ap/mc/mc.SlackBuild b/source/ap/mc/mc.SlackBuild
index d4f00205..87e929ac 100755
--- a/source/ap/mc/mc.SlackBuild
+++ b/source/ap/mc/mc.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -63,6 +63,9 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
+# Use geeqie instead of gqview as an external image viewer:
+zcat $CWD/mc.ext.in.geeqie.diff.gz | patch -p1 --verbose || exit 1
+
 if [ ! -x ./configure ]; then
   ./autogen.sh
 fi
@@ -82,10 +85,10 @@ CFLAGS="$SLKCFLAGS" \
   --with-ext2undel \
   --with-x=yes \
   --with-vfs \
-  --with-samba \
-  --with-configdir=/etc/samba \
-  --with-codepagedir=/etc/codepages \
-  --build=$ARCH-slackware-linux
+  --enable-vfs-smb \
+  --with-smb-configdir=/etc/samba \
+  --with-smb-codepagedir=/etc/codepages \
+  --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || make || exit 1
 make DESTDIR=$PKG install || exit 1
@@ -97,15 +100,14 @@ 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
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/mc-$VERSION
 cp -a \
@@ -115,7 +117,6 @@ cp -a \
 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/mc.ext.in.geeqie.diff b/source/ap/mc/mc.ext.in.geeqie.diff
new file mode 100644
index 00000000..8cdfecca
--- /dev/null
+++ b/source/ap/mc/mc.ext.in.geeqie.diff
@@ -0,0 +1,11 @@
+--- ./misc/mc.ext.in.orig	2010-11-08 05:46:13.000000000 -0600
++++ ./misc/mc.ext.in	2010-11-11 14:34:30.000000000 -0600
+@@ -391,7 +391,7 @@
+ 	Include=image
+ 
+ include/image
+-	Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (gqview %f &); fi
++	Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (geeqie %f &); fi
+ 	View=%view{ascii} identify %f
+ 	#View=%view{ascii} asciiview %f
+ 
diff --git a/source/ap/moc/moc.SlackBuild b/source/ap/moc/moc.SlackBuild
new file mode 100755
index 00000000..48ae54b9
--- /dev/null
+++ b/source/ap/moc/moc.SlackBuild
@@ -0,0 +1,140 @@
+#!/bin/sh
+
+# Copyright 2011  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=moc
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | rev | cut -f 2- -d -)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION
+
+chown -R root:root .
+find . \
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --sysconfdir=/etc \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --infodir=/usr/info \
+  --build=$ARCH-slackware-linux
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Sometimes --docdir is ignored
+mkdir -p $PKG/usr/doc
+mv $PKG/usr/share/doc/moc $PKG/usr/doc/$PKGNAM-$VERSION 2> /dev/null
+
+# Strip binaries:
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  AUTHORS COPYING* INSTALL NEWS README* THANKS TODO \
+  $PKG/usr/doc/${PKGNAM}-$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 files, if any:
+if [ -d $PKG/usr/info ]; then
+  ( cd $PKG/usr/info
+    rm -f dir
+    gzip -9 *
+  )
+fi
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz
+
diff --git a/source/ap/moc/slack-desc b/source/ap/moc/slack-desc
new file mode 100644
index 00000000..fe894088
--- /dev/null
+++ b/source/ap/moc/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-------------------------------------------------------|
+moc: moc (console audio player)
+moc:
+moc: MOC is a console audio player with a simple ncurses interface.
+moc: It supports OGG, FLAC, WAV, and MP3 formats.  Just run mocp, go to some
+moc: directory using the menu, select a file, and press enter to play it.
+moc: MOC will continue playing the rest of the files in the directory.
+moc:
+moc: MOC was written by Damian Pietras.
+moc:
+moc: Homepage:  http://moc.daper.net
+moc:
diff --git a/source/ap/most/most.SlackBuild b/source/ap/most/most.SlackBuild
index 8d4456a0..59a71679 100755
--- a/source/ap/most/most.SlackBuild
+++ b/source/ap/most/most.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,16 +21,28 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=5.0.0a
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 CWD=$(pwd)
diff --git a/source/ap/mpg123/mpg123.SlackBuild b/source/ap/mpg123/mpg123.SlackBuild
index 5ac3b53a..414ebdb9 100755
--- a/source/ap/mpg123/mpg123.SlackBuild
+++ b/source/ap/mpg123/mpg123.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2006-2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006-2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -146,8 +146,10 @@ fi
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  AUTHORS COPYING INSTALL NEWS* README TODO doc \
+  AUTHORS COPYING* ChangeLog INSTALL NEWS* README* TODO doc \
   $PKG/usr/doc/${PKGNAM}-$VERSION
+#                  ^^^^^^^^^
+# The ChangeLog is only a (small) pointer to an online ChangeLog...
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/ap/mysql/mysql-embedded.build b/source/ap/mysql/mysql-embedded.build
index 2ac77f31..004bb30d 100755
--- a/source/ap/mysql/mysql-embedded.build
+++ b/source/ap/mysql/mysql-embedded.build
@@ -52,8 +52,7 @@ CFLAGS="$SLKCFLAGS -fPIC" CXXFLAGS="$SLKCFLAGS -fPIC" \
     --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-berkeley-db --without-row-based-replication \
+    --with-embedded-server \
     --without-readline --disable-shared --with-charset=utf8 \
     --without-debug --with-pthread --without-ssl --without-query-cache \
     --without-geometry --with-pic
diff --git a/source/ap/mysql/mysql.SlackBuild b/source/ap/mysql/mysql.SlackBuild
index cf846ffe..ce149a15 100755
--- a/source/ap/mysql/mysql.SlackBuild
+++ b/source/ap/mysql/mysql.SlackBuild
@@ -26,7 +26,7 @@
 
 
 VERSION=${VERSION:-$(echo mysql-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/ap/normalize/normalize.SlackBuild b/source/ap/normalize/normalize.SlackBuild
index 0a40ec1e..8fe6ff13 100755
--- a/source/ap/normalize/normalize.SlackBuild
+++ b/source/ap/normalize/normalize.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,10 +21,20 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=0.7.7
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
 elif [ "$ARCH" = "s390" ]; then
diff --git a/source/ap/ntfsprogs/ntfsprogs.SlackBuild b/source/ap/ntfsprogs/ntfsprogs.SlackBuild
index e18fa97d..5c83bd21 100755
--- a/source/ap/ntfsprogs/ntfsprogs.SlackBuild
+++ b/source/ap/ntfsprogs/ntfsprogs.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,20 @@
 
 PKGNAM=ntfsprogs
 VERSION=${VERSION:-2.0.0}
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -35,6 +45,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
diff --git a/source/ap/pm-utils/49bluetooth-generic b/source/ap/pm-utils/49bluetooth-generic
new file mode 100644
index 00000000..e62790e7
--- /dev/null
+++ b/source/ap/pm-utils/49bluetooth-generic
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+. "${PM_FUNCTIONS}"
+
+case "$1" in
+  hibernate|suspend)
+    rfkill block bluetooth
+   ;;
+  thaw|resume)
+    rfkill unblock bluetooth
+    ;;
+  *)
+    ;;
+esac
+
diff --git a/source/ap/pm-utils/README.SLACKWARE b/source/ap/pm-utils/README.SLACKWARE
index 26ff48d8..7f91f228 100644
--- a/source/ap/pm-utils/README.SLACKWARE
+++ b/source/ap/pm-utils/README.SLACKWARE
@@ -1,5 +1,5 @@
 README.SLACKWARE
-20100319 - rworkman@slackware.com
+20101229 - rworkman@slackware.com
 
 ===============================================================================
 PLEASE READ THIS ENTIRE FILE BEFORE REPORTING PROBLEMS OR ASKING FOR HELP!
@@ -29,7 +29,7 @@ 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.33.1-smp
+  image = /boot/vmlinuz-generic-smp-2.6.35.10-smp
     initrd = /boot/initrd.gz
     append = "resume=/dev/sda2"
     root = /dev/sda1
@@ -37,13 +37,13 @@ Stanza in /etc/lilo.conf should look something like this:
     read-only
 
 /etc/mkinitrd.conf should look something like this:
-  MODULE_LIST="jfs"
+  MODULE_LIST="ext4"
   ROOTDEV="/dev/sda1"
-  ROOTFS="jfs"
+  ROOTFS="ext4"
   RESUMEDEV="/dev/sda2"
 
 mkinitrd command invocation would be this:
-  mkinitrd -c -k 2.6.33.1-smp -F
+  mkinitrd -c -k 2.6.35.10-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
@@ -93,6 +93,24 @@ 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)
 
+==============================================================================
+
+The default powersave hooks are in /usr/lib(64)/pm-utils/power.d/ -- if you
+need to override any parameters set in those, you can do so with same-named
+files in /etc/pm/power.d/ (populated with only the parameters you wish to
+change).  As an example, if you wanted to change the hdparm setting for 
+your hard drive's power management setting: rather than copying the entire
+contents of /usr/lib(64)/pm-utils/power.d/harddrive to /etc/pm/power.d/ and
+editing the copy, you could place only these two lines:
+
+  DRIVE_POWER_MGMT_BAT=128	# edit value as desired
+  DRIVE_POWER_MGMT_AC=128	# edit value as desired
+
+Also note that any files in the /etc/pm/ hierarchy must be executable (use 
+chmod +x) in order to be used by pm-utils; otherwise, they will be ignored.
+
+==============================================================================
+
 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
diff --git a/source/ap/pm-utils/fix-wrong-path-in-intel-audio-powersave.patch b/source/ap/pm-utils/fix-wrong-path-in-intel-audio-powersave.patch
new file mode 100644
index 00000000..90039710
--- /dev/null
+++ b/source/ap/pm-utils/fix-wrong-path-in-intel-audio-powersave.patch
@@ -0,0 +1,32 @@
+From 67abbd2f5109a732ab967c94bef4d6d9b2a11541 Mon Sep 17 00:00:00 2001
+From: Florian Kriener <florian@kriener.org>
+Date: Sat, 25 Sep 2010 11:27:30 +0200
+Subject: [PATCH] wrong path in intel-audio-powersave (and a small bug)
+
+Package: pm-utils
+Version: 1.4.1-2
+Severity: normal
+Tags: patch
+---
+ pm/power.d/intel-audio-powersave |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pm/power.d/intel-audio-powersave b/pm/power.d/intel-audio-powersave
+index 36675a8..da63e40 100644
+--- a/pm/power.d/intel-audio-powersave
++++ b/pm/power.d/intel-audio-powersave
+@@ -20,9 +20,9 @@ EOF
+ 
+ audio_powersave() {
+     [ "$INTEL_AUDIO_POWERSAVE" = "true" ] || exit $NA
+-    for dev in /sys/module/snd_*/parameters/power_save; do
++    for dev in /sys/module/snd_*; do
+ 	[ -w "$dev/parameters/power_save" ] || continue
+-	printf "Setting power savings for $s to %d..." "$dev##*/" "$1"
++	printf "Setting power savings for %s to %d..." "${dev##*/}" "$1"
+ 	echo $1 > "$dev/parameters/power_save" && echo Done. || echo Failed.
+     done
+ }
+-- 
+1.7.3.4
+
diff --git a/source/ap/pm-utils/pm-utils.SlackBuild b/source/ap/pm-utils/pm-utils.SlackBuild
index 0b9eacd1..1ae12666 100755
--- a/source/ap/pm-utils/pm-utils.SlackBuild
+++ b/source/ap/pm-utils/pm-utils.SlackBuild
@@ -25,9 +25,9 @@
 
 PKGNAM=pm-utils
 VERSION=$(echo ${PKGNAM}-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
-QUIRKS=20100316	# Version of the quirks database
+QUIRKS=20100619	# Version of the quirks database
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -63,7 +63,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.gz || exit 1
 cd $PKGNAM-$VERSION || exit 1
 chown -R root:root .
 find . \
@@ -72,6 +72,9 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+zcat $CWD/use_more_sane_harddrive_defaults.patch.gz | patch -p1 || exit 1
+zcat $CWD/fix-wrong-path-in-intel-audio-powersave.patch.gz | patch -p1 || exit 1
+
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -86,10 +89,22 @@ make install DESTDIR=$PKG || exit 1
 
 # Now let's add the video quirks
 PM_UTILS_LIBDIR="/usr/lib${LIBDIRSUFFIX}/pm-utils"
-mkdir -p $PKG/$PM_UTILS_LIBDIR/video-quirks
-tar xf $CWD/pm-quirks-$QUIRKS.tar.xz -C $PKG/$PM_UTILS_LIBDIR/video-quirks
+mkdir -p $PKG/$PM_UTILS_LIBDIR
+tar xf $CWD/pm-quirks-$QUIRKS.tar.gz -C $PKG/$PM_UTILS_LIBDIR
 chown -R root:root $PKG/$PM_UTILS_LIBDIR/video-quirks
 
+# Probably this shouldn't be needed, but some bluetooth hardware isn't
+# properly handled during the sleep/wake process
+( cd $PKG/usr/lib${LIBDIRSUFFIX}/pm-utils/sleep.d
+  mv 49bluetooth 49bluetooth-ibm
+  cat $CWD/49bluetooth-generic > 49bluetooth-generic
+  chmod 0755 49bluetooth-generic
+)
+
+# Remove the NetworkManager hook since we don't ship it; 
+# it should be included with NetworkManager
+rm -f $PKG/usr/lib64/pm-utils/sleep.d/55NetworkManager
+
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
diff --git a/source/ap/pm-utils/use_more_sane_harddrive_defaults.patch b/source/ap/pm-utils/use_more_sane_harddrive_defaults.patch
new file mode 100644
index 00000000..3dcc8156
--- /dev/null
+++ b/source/ap/pm-utils/use_more_sane_harddrive_defaults.patch
@@ -0,0 +1,12 @@
+diff -Nur pm-utils-1.4.1.orig//pm/power.d/harddrive pm-utils-1.4.1/pm/power.d/harddrive
+--- pm-utils-1.4.1.orig//pm/power.d/harddrive	2010-07-04 09:50:13.000000000 -0500
++++ pm-utils-1.4.1/pm/power.d/harddrive	2010-12-27 14:23:12.729597017 -0600
+@@ -11,7 +11,7 @@
+ # Default values on battery
+ DRIVE_SPINDOWN_VALUE_BAT="${DRIVE_SPINDOWN_VALUE_BAT:-6}"
+ DRIVE_WRITE_CACHE_BAT="${DRIVE_WRITE_CACHE_BAT:-0}" 
+-DRIVE_POWER_MGMT_BAT="${DRIVE_POWER_MGMT_BAT:-1}"
++DRIVE_POWER_MGMT_BAT="${DRIVE_POWER_MGMT_BAT:-128}"
+ DRIVE_ACOUSTIC_MGMT_BAT="${DRIVE_ACOUSTIC_MGMT_BAT:-254}"
+ 
+ # Default devices to operate on
diff --git a/source/ap/radeontool/radeontool.SlackBuild b/source/ap/radeontool/radeontool.SlackBuild
index 2a5a3fe4..ee4292df 100755
--- a/source/ap/radeontool/radeontool.SlackBuild
+++ b/source/ap/radeontool/radeontool.SlackBuild
@@ -25,12 +25,13 @@
 VERSION=1.6.1
 BUILD=${BUILD:-1}
 
-# Automatically determine architecture for build & packaging:
+# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
-    *)    export ARCH=$( uname -m ) ;;
+       *) export ARCH=$( uname -m ) ;;
   esac
 fi
 
diff --git a/source/ap/rexima/rexima.SlackBuild b/source/ap/rexima/rexima.SlackBuild
index 4ef9ec9e..05133e7c 100755
--- a/source/ap/rexima/rexima.SlackBuild
+++ b/source/ap/rexima/rexima.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=1.4
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-rexima
diff --git a/source/ap/rpm/rpm.SlackBuild b/source/ap/rpm/rpm.SlackBuild
index 68ab36a4..2f930c37 100755
--- a/source/ap/rpm/rpm.SlackBuild
+++ b/source/ap/rpm/rpm.SlackBuild
@@ -22,7 +22,8 @@
 
 # Build RPM (of all things) for Slackware.
 
-VERSION=${VERSION:-4.8.0}
+PKGNAM=rpm
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -119,9 +120,17 @@ 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 \
+  COPYING* CREDITS GROUPS INSTALL README* TODO doc/manual \
     $PKG/usr/doc/rpm-$VERSION
 
+# If there's a CHANGES file, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r CHANGES ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat CHANGES | head -n 1000 > $DOCSDIR/CHANGES
+  touch -r CHANGES $DOCSDIR/CHANGES
+fi
+
 mkdir -p $PKG/install
 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/ap/rzip/rzip.SlackBuild b/source/ap/rzip/rzip.SlackBuild
index adcc2556..2e93fccd 100755
--- a/source/ap/rzip/rzip.SlackBuild
+++ b/source/ap/rzip/rzip.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,16 +22,27 @@
 
 
 VERSION=2.1
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 CWD=$(pwd)
diff --git a/source/ap/sc/sc-7.16-3.diff b/source/ap/sc/sc-7.16-3.diff
new file mode 100644
index 00000000..2de64aae
--- /dev/null
+++ b/source/ap/sc/sc-7.16-3.diff
@@ -0,0 +1,538 @@
+Description: Upstream changes introduced in version 7.16-3
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ sc (7.16-3) unstable; urgency=low
+ .
+   * Changed maintainer to the new email address, recursively.
+   * Fixed old changelog entries' bug closing method
+   * Add patches supplied by Carsten Hey
+     + Stop compressing tutorial.sc file (closes: #514777)
+     + Use default colors (closes: #514775)
+   * Bump Standards to 3.8.4.
+   * Bump dependency of debhelper.
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Adam Majer <adamm@zombino.com>
+Bug-Debian: http://bugs.debian.org/514775
+Bug-Debian: http://bugs.debian.org/514777
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- sc-7.16.orig/abbrev.c
++++ sc-7.16/abbrev.c
+@@ -19,10 +19,15 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <ctype.h>
++#include <curses.h>
++#include <unistd.h>
+ #include "sc.h"
+ 
+ static	struct abbrev *abbr_base;
+ 
++int are_abbrevs(void);
++
++
+ void
+ add_abbr(char *string)
+ {
+@@ -87,7 +92,7 @@ add_abbr(char *string)
+ 	    }
+     }
+     
+-    if (expansion == NULL)
++    if (expansion == NULL){
+ 	if ((a = find_abbr(string, strlen(string), &prev))) {
+ 	    error("abbrev \"%s %s\"", a->abbr, a->exp);
+ 	    return;
+@@ -95,6 +100,7 @@ add_abbr(char *string)
+ 	    error("abreviation \"%s\" doesn't exist", string);
+ 	    return;
+ 	}
++    }
+  
+     if (find_abbr(string, strlen(string), &prev))
+ 	del_abbr(string);
+@@ -122,7 +128,7 @@ void
+ del_abbr(char *abbrev)
+ {
+     struct abbrev *a;
+-    struct abbrev **prev;
++    struct abbrev **prev=0;
+ 
+     if (!(a = find_abbr(abbrev, strlen(abbrev), prev))) 
+ 	return;
+--- sc-7.16.orig/cmds.c
++++ sc-7.16/cmds.c
+@@ -478,7 +478,7 @@ yankrow(int arg)
+     int i, qtmp;
+     char buf[50];
+     struct frange *fr;
+-    struct ent *obuf;
++    struct ent *obuf=0;
+ 
+     if ((fr = find_frange(currow, curcol)))
+ 	rs = fr->or_right->row - currow + 1;
+@@ -535,7 +535,7 @@ yankcol(int arg)
+     int cs = maxcol - curcol + 1;
+     int i, qtmp;
+     char buf[50];
+-    struct ent *obuf;
++    struct ent *obuf=0;
+ 
+     if (cs - arg < 0) {
+     	cs = cs > 0 ? cs : 0;
+@@ -810,7 +810,7 @@ pullcells(int to_insert)
+ 
+     if (to_insert == 'r') {
+ 	insertrow(numrows, 0);
+-	if (fr = find_frange(currow, curcol))
++	if ((fr = find_frange(currow, curcol)))
+ 	    deltac = fr->or_left->col - mincol;
+ 	else {
+ 	    for (i = 0; i < numrows; i++)
+@@ -2279,7 +2279,7 @@ copye(register struct enode *e, int Rdel
+ 	ret->e.r.right.vp = lookat(newrow, newcol);
+ 	ret->e.r.right.vf = e->e.r.right.vf;
+     } else {
+-	struct enode *temprange;
++	struct enode *temprange=0;
+ 
+ 	if (freeenodes) {
+ 	    ret = freeenodes;
+@@ -2337,8 +2337,7 @@ copye(register struct enode *e, int Rdel
+ 		break;
+ 	    case 'f':
+ 	    case 'F':
+-		if (range && ret->op == 'F' ||
+-			!range && ret->op == 'f')
++		if ((range && ret->op == 'F') || (!range && ret->op == 'f'))
+ 		    Rdelta = Cdelta = 0;
+ 		ret->e.o.left = copye(e->e.o.left, Rdelta, Cdelta,
+ 			r1, c1, r2, c2, transpose);
+@@ -2798,7 +2797,7 @@ void
+ write_cells(register FILE *f, int r0, int c0, int rn, int cn, int dr, int dc)
+ {
+     register struct ent **pp;
+-    int r, c, rs, cs, mf;
++    int r, c, rs=0, cs=0, mf;
+     char *dpointptr;
+ 
+     mf = modflg;
+@@ -2861,12 +2860,12 @@ writefile(char *fname, int r0, int c0, i
+ 	if ((plugin = findplugin(p+1, 'w')) != NULL) {
+ 	    if (!plugin_exists(plugin, strlen(plugin), save + 1)) {
+ 		error("plugin not found");
+-		return;
++		return -1;
+ 	    }
+ 	    *save = '|';
+ 	    if ((strlen(save) + strlen(fname) + 20) > PATHLEN) {
+ 		error("Path too long");
+-		return;
++		return -1;
+ 	    }
+ 	    sprintf(save + strlen(save), " %s%d:", coltoa(c0), r0);
+ 	    sprintf(save + strlen(save), "%s%d \"%s\"", coltoa(cn), rn, fname);
+@@ -2883,13 +2882,14 @@ writefile(char *fname, int r0, int c0, i
+     }
+ #endif /* VMS */
+ 
+-    if (*fname == '\0')
++    if (*fname == '\0'){
+ 	if (isatty(STDOUT_FILENO) || *curfile != '\0')
+ 	    fname = curfile;
+ 	else {
+ 	    write_fd(stdout, r0, c0, rn, cn);
+ 	    return (0);
+ 	}
++    }
+ 
+ #ifdef MSDOS
+     namelen = 12;
+@@ -2981,12 +2981,12 @@ readfile(char *fname, int eraseflg)
+ 	if ((plugin = findplugin(p+1, 'r')) != NULL) {
+ 	    if (!(plugin_exists(plugin, strlen(plugin), save + 1))) {
+ 		error("plugin not found");
+-		return;
++		return -1;
+ 	    }
+ 	    *save = '|';
+ 	    if ((strlen(save) + strlen(fname) + 2) > PATHLEN) {
+ 		error("Path too long");
+-		return;
++		return -1;
+ 	    }
+ 	    sprintf(save + strlen(save), " \"%s\"", fname);
+ 	    eraseflg = 0;
+--- sc-7.16.orig/color.c
++++ sc-7.16/color.c
+@@ -19,6 +19,7 @@
+ 
+ #include <curses.h>
+ #include <ctype.h>
++#include <unistd.h>
+ #include "sc.h"
+ 
+ /* a linked list of free [struct ent]'s, uses .next as the pointer */
+@@ -30,6 +31,8 @@ static struct crange	*color_base;
+ void
+ initcolor(int colornum)
+ {
++    use_default_colors();
++
+     if (!colornum) {
+ 	int i;
+ 
+--- sc-7.16.orig/frame.c
++++ sc-7.16/frame.c
+@@ -18,6 +18,9 @@
+ 
+ #include <stdio.h>
+ #include <ctype.h>
++#include <stdlib.h>
++#include <curses.h>
++#include <unistd.h>
+ #include "sc.h"
+ 
+ static struct frange *frame_base;
+--- sc-7.16.orig/help.c
++++ sc-7.16/help.c
+@@ -11,6 +11,7 @@ char	*header = " Quick Reference";
+ char	*revision = "$Revision: 7.16 $";
+ #else
+ #include <curses.h>
++#include <unistd.h>
+ #include "sc.h"
+ #endif /* QREF */
+ 
+--- sc-7.16.orig/interp.c
++++ sc-7.16/interp.c
+@@ -1572,12 +1572,12 @@ void
+ copy(struct ent *dv1, struct ent *dv2, struct ent *v1, struct ent *v2)
+ {
+     struct ent *p;
+-    struct ent *n;
++/*    struct ent *n;*/
+     static int minsr = -1, minsc = -1;
+     static int maxsr = -1, maxsc = -1;
+     int mindr, mindc;
+     int maxdr, maxdc;
+-    int vr, vc;
++/*    int vr, vc;*/
+     int r, c;
+     int deltar, deltac;
+ 
+@@ -2066,7 +2066,7 @@ str_search(char *s, int firstrow, int fi
+ 		    *line = '\0';
+ 	    }
+ 	}
+-	if (!col_hidden[c])
++	if (!col_hidden[c]){
+ 	    if (gs.g_type == G_STR) {
+ 		if (p && p->label
+ #if defined(REGCOMP)
+@@ -2099,6 +2099,7 @@ str_search(char *s, int firstrow, int fi
+ #endif
+ #endif
+ 		    break;
++	}
+ 	if (r == endr && c == endc) {
+ 	    error("String not found");
+ #if defined(REGCOMP)
+@@ -2471,13 +2472,11 @@ clearent(struct ent *v)
+ int
+ constant(register struct enode *e)
+ {
+-    return (
+-	 e == NULL
++    return e == NULL
+ 	 || e->op == O_CONST
+ 	 || e->op == O_SCONST
+-	 || e->op == 'm' && constant(e->e.o.left)
+-	 || (
+-	     e->op != O_VAR
++	 || (e->op == 'm' && constant(e->e.o.left))
++	 || (e->op != O_VAR
+ 	     && !(e->op & REDUCE)
+ 	     && constant(e->e.o.left)
+ 	     && constant(e->e.o.right)
+@@ -2491,9 +2490,7 @@ constant(register struct enode *e)
+ 	     && e->op != LASTCOL
+ 	     && e->op != NUMITER
+ 	     && e->op != FILENAME
+-             && optimize
+-	)
+-    );
++             && optimize );
+ }
+ 
+ void
+--- sc-7.16.orig/lex.c
++++ sc-7.16/lex.c
+@@ -34,6 +34,8 @@
+ #include <signal.h>
+ #include <setjmp.h>
+ #include <ctype.h>
++#include <unistd.h>
++#include <math.h>
+ #include "sc.h"
+ 
+ #ifdef NONOTIMEOUT
+@@ -107,7 +109,7 @@ int
+ yylex()
+ {
+     char *p = line + linelim;
+-    int ret;
++    int ret=0;
+     static int isfunc = 0;
+     static bool isgoto = 0;
+     static bool colstate = 0;
+@@ -326,7 +328,7 @@ plugin_exists(char *name, int len, char
+ 	strcpy((char *)path, HomeDir);
+ 	strcat((char *)path, "/.sc/plugins/");
+ 	strncat((char *)path, name, len);
+-	if (fp = fopen((char *)path, "r")) {
++	if ((fp = fopen((char *)path, "r"))) {
+ 	    fclose(fp);
+ 	    return 1;
+ 	}
+@@ -334,7 +336,7 @@ plugin_exists(char *name, int len, char
+     strcpy((char *)path, LIBDIR);
+     strcat((char *)path, "/plugins/");
+     strncat((char *)path, name, len);
+-    if (fp = fopen((char *)path, "r")) {
++    if ((fp = fopen((char *)path, "r"))) {
+ 	fclose(fp);
+ 	return 1;
+     }
+--- sc-7.16.orig/Makefile
++++ sc-7.16/Makefile
+@@ -32,7 +32,7 @@ MANMODE=644
+ 
+ # This is where the library file (tutorial) goes.
+ #LIBDIR=/usr/local/share/$(name) # reno
+-LIBDIR=${prefix}/lib/$(name)
++LIBDIR=${prefix}/share/doc/$(name)
+ LIBRARY=-DLIBDIR=\"${LIBDIR}\"
+ 
+ # Set SIMPLE for lex.c if you don't want arrow keys or lex.c blows up
+--- sc-7.16.orig/range.c
++++ sc-7.16/range.c
+@@ -18,6 +18,8 @@
+ 
+ #include <stdio.h>
+ #include <ctype.h>
++#include <unistd.h>
++#include <curses.h>
+ #include "sc.h"
+ 
+ static	struct range *rng_base;
+--- sc-7.16.orig/sc.c
++++ sc-7.16/sc.c
+@@ -212,7 +212,7 @@ flush_saved()
+ 
+     if (dbidx < 0)
+ 	return;
+-    if (p = delbuf[dbidx]) {
++    if ((p = delbuf[dbidx])) {
+ 	scxfree(delbuffmt[dbidx]);
+ 	delbuffmt[dbidx] = NULL;
+     }
+@@ -845,7 +845,7 @@ main (int argc, char  **argv)
+ 			    break;
+ 			case 'C':
+ 			    color = !color;
+-			    if (has_colors())
++			    if (has_colors()){
+ 				if (color) {
+ 				    attron(COLOR_PAIR(1));
+ 				    bkgd(COLOR_PAIR(1) | ' ');
+@@ -853,6 +853,7 @@ main (int argc, char  **argv)
+ 				    attron(COLOR_PAIR(0));
+ 				    bkgd(COLOR_PAIR(0) | ' ');
+ 				}
++			    }
+ 			    error("Color %sabled.", color ? "en" : "dis");
+ 			    break;
+ 			case 'N':
+--- sc-7.16.orig/sc.h
++++ sc-7.16/sc.h
+@@ -612,6 +612,9 @@ extern	int  pagesize;	/* If nonzero, use
+ extern	int rowlimit;
+ extern	int collimit;
+ 
++void yankr(struct ent *v1, struct ent *v2);
++
++
+ #if BSD42 || SYSIII
+ 
+ #ifndef cbreak
+--- sc-7.16.orig/screen.c
++++ sc-7.16/screen.c
+@@ -234,11 +234,12 @@ update(int anychanged)		/* did any cell
+ 	    i = stcol;
+ 	    lcols = 0;
+ 	    col = rescol + frcols;
+-	    if (fr && stcol >= fr->or_left->col)
++	    if (fr && stcol >= fr->or_left->col){
+ 		if (stcol < fr->ir_left->col)
+ 		    i = fr->or_left->col;
+ 		else
+ 		    col += flcols;
++	    }
+ 	    for (; (col + fwidth[i] < cols-1 || col_hidden[i] || i < curcol) &&
+ 		    i < maxcols; i++) {
+ 		lcols++;
+@@ -328,11 +329,12 @@ update(int anychanged)		/* did any cell
+ 	    i = stcol;
+ 	    lcols = 0;
+ 	    col = rescol + frcols;
+-	    if (fr && stcol >= fr->or_left->col)
++	    if (fr && stcol >= fr->or_left->col){
+ 		if (stcol < fr->ir_left->col)
+ 		    i = fr->or_left->col;
+ 		else
+ 		    col += flcols;
++	    }
+ 	    for (; (col + fwidth[i] < cols-1 || col_hidden[i] || i < curcol) &&
+ 		    i < maxcols; i++) {
+ 		lcols++;
+@@ -377,11 +379,12 @@ update(int anychanged)		/* did any cell
+ 	    i = strow;
+ 	    rows = 0;
+ 	    row = RESROW + fbrows;
+-	    if (fr && strow >= fr->or_left->row)
++	    if (fr && strow >= fr->or_left->row){
+ 		if (strow < fr->ir_left->row)
+ 		    i = fr->or_left->row;
+ 		else
+ 		    row += ftrows;
++	    }
+ 	    for (; (row < lines || row_hidden[i] || i < currow) && i < maxrows;
+ 		    i++) {
+ 		rows++;
+@@ -460,11 +463,12 @@ update(int anychanged)		/* did any cell
+ 	    i = strow;
+ 	    rows = 0;
+ 	    row = RESROW + fbrows;
+-	    if (fr && strow >= fr->or_left->row)
++	    if (fr && strow >= fr->or_left->row){
+ 		if (strow < fr->ir_left->row)
+ 		    i = fr->or_left->row;
+ 		else
+ 		    row += ftrows;
++	    }
+ 	    for (; (row < lines || row_hidden[i] || i < currow) && i < maxrows;
+ 		    i++) {
+ 		rows++;
+--- sc-7.16.orig/sort.c
++++ sc-7.16/sort.c
+@@ -19,6 +19,8 @@
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <stdlib.h>
++#include <unistd.h>
++#include <curses.h>
+ #include "sc.h"
+ 
+ int compare(const void *row1, const void *row2);
+--- sc-7.16.orig/vi.c
++++ sc-7.16/vi.c
+@@ -17,6 +17,8 @@
+ #include <curses.h>
+ #include <ctype.h>
+ #include <stdlib.h>
++#include <unistd.h>
++#include <sys/wait.h>
+ #include "sc.h"
+ 
+ #if defined(REGCOMP)
+@@ -40,7 +42,7 @@ void gotobottom();
+ 
+ #define istext(a) (isalnum(a) || ((a) == '_'))
+ 
+-#define bool	int
++/*#define bool	int*/
+ #define true	1
+ #define false	0
+ 
+@@ -667,8 +669,10 @@ dotab()
+     static struct range *nextmatch;
+     int len;
+ 
+-    if (linelim > 0 && isalnum(line[linelim-1]) || line[linelim-1] == '_' ||
+-	    (completethis && line[linelim-1] == ' ')) {
++    if ((linelim > 0 && isalnum(line[linelim-1])) || 
++    	line[linelim-1] == '_' ||
++	(completethis && line[linelim-1] == ' ')) {
++
+ 	if (!completethis) {
+ 	    for (completethis = line + linelim - 1; isalnum(*completethis) ||
+ 		    *completethis == '_'; completethis--) /* */;
+@@ -715,7 +719,7 @@ void
+ showdr()
+ {
+     int			minsr, minsc, maxsr, maxsc;
+-    char		*p;
++    /*char		*p;*/
+     char		r[12];
+     struct frange	*fr = find_frange(currow, curcol);
+ 
+@@ -1566,7 +1570,7 @@ static void
+ search_again(bool reverse)
+ {
+     int prev_match;
+-    int found_it;
++    int found_it=0;
+ #if !defined(REGCOMP) && !defined(RE_COMP) && !defined(REGCMP)
+     char *look_here;
+     int do_next;
+@@ -1777,7 +1781,7 @@ to_char(int arg, int n)
+ static void
+ match_paren()
+ {
+-    register int i;
++    /*register int i;*/
+     int nest = 1;
+     int tmp = linelim;
+ 
+--- sc-7.16.orig/vmtbl.c
++++ sc-7.16/vmtbl.c
+@@ -16,6 +16,7 @@
+ # include <curses.h>
+ #endif /* PSC */
+ 
++#include <unistd.h>
+ #include "sc.h"
+ 
+ /*
+--- sc-7.16.orig/xmalloc.c
++++ sc-7.16/xmalloc.c
+@@ -4,11 +4,12 @@
+  */
+ 
+ #include <curses.h>
++#include <stdlib.h>
+ #include "sc.h"
+ 
+-extern char	*malloc();
++/* extern char	*malloc();
+ extern char	*realloc();
+-extern void	free();
++extern void	free(); */
+ void		fatal();
+ 
+ #ifdef SYSV3
diff --git a/source/ap/sc/sc-gcc34.diff b/source/ap/sc/sc-gcc34.diff
deleted file mode 100644
index 28ec8810..00000000
--- a/source/ap/sc/sc-gcc34.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index 2133ed42..00000000
--- a/source/ap/sc/sc-malloc.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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
index 8a8bba72..96fa56ea 100755
--- a/source/ap/sc/sc.SlackBuild
+++ b/source/ap/sc/sc.SlackBuild
@@ -22,9 +22,19 @@
 
 
 VERSION=7.16
-ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-3}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-2}
 
 if [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
@@ -47,9 +57,9 @@ 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
+zcat $CWD/sc-7.16-3.diff.gz | patch -p1 --verbose || exit 1
 
 chown -R root:root .
 find . \
diff --git a/source/ap/screen/screen.SlackBuild b/source/ap/screen/screen.SlackBuild
index a9f05634..3464bc4a 100755
--- a/source/ap/screen/screen.SlackBuild
+++ b/source/ap/screen/screen.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,15 +21,26 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=${VERSION:-4.0.3}
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 CWD=$(pwd)
diff --git a/source/ap/seejpeg/seejpeg.SlackBuild b/source/ap/seejpeg/seejpeg.SlackBuild
index ca745063..64408de5 100755
--- a/source/ap/seejpeg/seejpeg.SlackBuild
+++ b/source/ap/seejpeg/seejpeg.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,10 +21,20 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=1.10
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-seejpeg
diff --git a/source/ap/sox/slack-desc b/source/ap/sox/slack-desc
index 8b36469e..1c775467 100644
--- a/source/ap/sox/slack-desc
+++ b/source/ap/sox/slack-desc
@@ -15,5 +15,5 @@ sox:
 sox:
 sox:
 sox:
-sox:
+sox: Homepage:  http://sox.sourceforge.net/
 sox:
diff --git a/source/ap/sox/sox.SlackBuild b/source/ap/sox/sox.SlackBuild
index fdbb4e55..3bd414f6 100755
--- a/source/ap/sox/sox.SlackBuild
+++ b/source/ap/sox/sox.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,8 +21,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=14.3.0
-BUILD=${BUILD:-3}
+PKGNAM=sox
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -52,15 +53,15 @@ fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-sox
+PKG=$TMP/package-$PKGNAM
 
 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
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -97,10 +98,10 @@ if [ -d $PKG/usr/man ]; then
   )
 fi
 
-mkdir -p $PKG/usr/doc/sox-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING INSTALL NEWS README \
-  $PKG/usr/doc/sox-$VERSION
+  AUTHORS COPYING* INSTALL NEWS README* \
+  $PKG/usr/doc/$PKGNAM-$VERSION
 
 # If there's a ChangeLog, installing at least part of the recent history
 # is useful, but don't let it get totally out of control:
@@ -114,5 +115,5 @@ 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
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source/ap/sqlite/sqlite.SlackBuild b/source/ap/sqlite/sqlite.SlackBuild
index c2754bc2..61f259b0 100755
--- a/source/ap/sqlite/sqlite.SlackBuild
+++ b/source/ap/sqlite/sqlite.SlackBuild
@@ -24,7 +24,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PKGNAM=sqlite
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo $PKGNAM-src-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+OLD_STYLE=$(echo $VERSION | tr 0 . | cut -f 1-3 -d .)
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -57,12 +58,15 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Enable some features:
+SLKCFLAGS="$SLKCFLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_DISABLE_DIRSYNC=1 -DSQLITE_ENABLE_RTREE=1 -DSQLITE_ENABLE_STAT2=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 -DSQLITE_SECURE_DELETE=1"
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
-cd $PKGNAM-$VERSION || exit 1
+tar xvf $CWD/$PKGNAM-src-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-src-$VERSION || exit 1
 chown -R root.root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -78,6 +82,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
+  --mandir=/usr/man \
   --enable-threadsafe \
   --enable-cross-thread-connections \
   --enable-tempstore=yes \
@@ -107,18 +112,18 @@ gzip -9 $PKG/usr/man/man1/sqlite3.1
 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/$PKGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$OLD_STYLE
 cp -a \
   README* VERSION \
-  $PKG/usr/doc/$PKGNAM-$VERSION
+  $PKG/usr/doc/$PKGNAM-$OLD_STYLE
 # Add a COPYRIGHT file -- http://www.sqlite.org/copyright.html
-zcat $CWD/COPYRIGHT.gz > $PKG/usr/doc/$PKGNAM-$VERSION/COPYRIGHT
-rm -rf $PKG/usr/doc/$PKGNAM-$VERSION/CVS
+zcat $CWD/COPYRIGHT.gz > $PKG/usr/doc/$PKGNAM-$OLD_STYLE/COPYRIGHT
+rm -rf $PKG/usr/doc/$PKGNAM-$OLD_STYLE/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/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$OLD_STYLE-$ARCH-$BUILD.txz
 
diff --git a/source/ap/sudo/sudo.SlackBuild b/source/ap/sudo/sudo.SlackBuild
index 4d6b898e..c3b85360 100755
--- a/source/ap/sudo/sudo.SlackBuild
+++ b/source/ap/sudo/sudo.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -42,7 +42,7 @@ TMP=${TMP:-/tmp}
 PKG=$TMP/package-sudo
 
 rm -rf $PKG
-mkdir -p $TMP $PKG
+mkdir -p $TMP $PKG/var/{lib,db}
 
 if [ "$ARCH" = "i386" ]; then
   SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
@@ -58,6 +58,7 @@ 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 \) \
@@ -70,20 +71,16 @@ CFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --sbindir=/usr/sbin \
   --mandir=/usr/man \
-  --with-getpass \
-  --with-C2 \
+  --docdir=/usr/doc/sudo-$VERSION \
   --with-env-editor \
   --disable-pam-session \
   --with-pam=no \
+  --with-timedir=/var/db/sudo \
   --build=$ARCH-slackware-linux
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
-# Create the timestamp directory
-mkdir -p $PKG/var/run/sudo
-chmod 700 $PKG/var/run/sudo
-
 ( cd $PKG/usr/bin
   chmod 4711 sudo
   ln -sf sudo sudoedit
@@ -99,6 +96,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 
 mv $PKG/etc/sudoers $PKG/etc/sudoers.new
 
+rm -r $PKG/usr/doc/sudo-$VERSION
 mkdir -p $PKG/usr/doc/sudo-$VERSION
 cp -a \
   BUGS HISTORY INSTALL LICENSE PORTING README* \
diff --git a/source/ap/texinfo/texinfo.SlackBuild b/source/ap/texinfo/texinfo.SlackBuild
index 8c505a55..efe5ace3 100755
--- a/source/ap/texinfo/texinfo.SlackBuild
+++ b/source/ap/texinfo/texinfo.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,9 +23,19 @@
 
 VERSION=${VERSION:-4.13}
 PKG_VERSION=${PKG_VERSION:-${VERSION}a}
-ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-4}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-3}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -35,6 +45,8 @@ elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 CWD=$(pwd)
diff --git a/source/ap/vbetool/vbetool.SlackBuild b/source/ap/vbetool/vbetool.SlackBuild
index fcd23c9f..619c89bd 100755
--- a/source/ap/vbetool/vbetool.SlackBuild
+++ b/source/ap/vbetool/vbetool.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2008  Robby Workman, Northport, Alabama, USA
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,9 +23,18 @@
 
 
 VERSION=1.1
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-vbetool
@@ -36,6 +45,8 @@ elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 rm -rf $PKG
diff --git a/source/ap/vim/patches/7.2.001 b/source/ap/vim/patches/7.2.001
deleted file mode 100644
index 3bcb7d09..00000000
--- a/source/ap/vim/patches/7.2.001
+++ /dev/null
@@ -1,61 +0,0 @@
-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
deleted file mode 100644
index e1ee32cd..00000000
--- a/source/ap/vim/patches/7.2.002
+++ /dev/null
@@ -1,47 +0,0 @@
-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
deleted file mode 100644
index 626d81e5..00000000
--- a/source/ap/vim/patches/7.2.003
+++ /dev/null
@@ -1,107 +0,0 @@
-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
deleted file mode 100644
index 8e7ed3e9..00000000
--- a/source/ap/vim/patches/7.2.004
+++ /dev/null
@@ -1,103 +0,0 @@
-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
deleted file mode 100644
index 20cce85b..00000000
--- a/source/ap/vim/patches/7.2.005
+++ /dev/null
@@ -1,149 +0,0 @@
-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
deleted file mode 100644
index f22eeae5..00000000
--- a/source/ap/vim/patches/7.2.006
+++ /dev/null
@@ -1,50 +0,0 @@
-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
deleted file mode 100644
index 104b2678..00000000
--- a/source/ap/vim/patches/7.2.007
+++ /dev/null
@@ -1,493 +0,0 @@
-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
deleted file mode 100644
index d3fb58e5..00000000
--- a/source/ap/vim/patches/7.2.008
+++ /dev/null
@@ -1,63 +0,0 @@
-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
deleted file mode 100644
index fa891dcf..00000000
--- a/source/ap/vim/patches/7.2.009
+++ /dev/null
@@ -1,67 +0,0 @@
-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
deleted file mode 100644
index 47315881..00000000
--- a/source/ap/vim/patches/7.2.010
+++ /dev/null
@@ -1,206 +0,0 @@
-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
deleted file mode 100644
index 928f8d63..00000000
--- a/source/ap/vim/patches/7.2.011
+++ /dev/null
@@ -1,105 +0,0 @@
-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
deleted file mode 100644
index fa3ed247..00000000
--- a/source/ap/vim/patches/7.2.012
+++ /dev/null
@@ -1,53 +0,0 @@
-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
deleted file mode 100644
index 2645f0a7..00000000
--- a/source/ap/vim/patches/7.2.013
+++ /dev/null
@@ -1,135 +0,0 @@
-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
deleted file mode 100644
index a0379486..00000000
--- a/source/ap/vim/patches/7.2.014
+++ /dev/null
@@ -1,52 +0,0 @@
-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
deleted file mode 100644
index e03ac156..00000000
--- a/source/ap/vim/patches/7.2.015
+++ /dev/null
@@ -1,82 +0,0 @@
-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
deleted file mode 100644
index 03d5207f..00000000
--- a/source/ap/vim/patches/7.2.016
+++ /dev/null
@@ -1,166 +0,0 @@
-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
deleted file mode 100644
index 99979a15..00000000
--- a/source/ap/vim/patches/7.2.017
+++ /dev/null
@@ -1,162 +0,0 @@
-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
deleted file mode 100644
index b195f09d..00000000
--- a/source/ap/vim/patches/7.2.018
+++ /dev/null
@@ -1,45 +0,0 @@
-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
deleted file mode 100644
index 4404bca4..00000000
--- a/source/ap/vim/patches/7.2.019
+++ /dev/null
@@ -1,65 +0,0 @@
-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
deleted file mode 100644
index fb290407..00000000
--- a/source/ap/vim/patches/7.2.020
+++ /dev/null
@@ -1,54 +0,0 @@
-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
deleted file mode 100644
index fee0bd85..00000000
--- a/source/ap/vim/patches/7.2.021
+++ /dev/null
@@ -1,147 +0,0 @@
-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
deleted file mode 100644
index 39277352..00000000
--- a/source/ap/vim/patches/7.2.022
+++ /dev/null
@@ -1,140 +0,0 @@
-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
deleted file mode 100644
index 0f6ad1e1..00000000
--- a/source/ap/vim/patches/7.2.023
+++ /dev/null
@@ -1,65 +0,0 @@
-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
deleted file mode 100644
index 033b0a26..00000000
--- a/source/ap/vim/patches/7.2.024
+++ /dev/null
@@ -1,50 +0,0 @@
-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
deleted file mode 100644
index dab2cc86..00000000
--- a/source/ap/vim/patches/7.2.025
+++ /dev/null
@@ -1,54 +0,0 @@
-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
deleted file mode 100644
index ec8b1c7b..00000000
--- a/source/ap/vim/patches/7.2.026
+++ /dev/null
@@ -1,105 +0,0 @@
-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
deleted file mode 100644
index 59d708d2..00000000
--- a/source/ap/vim/patches/7.2.027
+++ /dev/null
@@ -1,98 +0,0 @@
-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
deleted file mode 100644
index 4f148e96..00000000
--- a/source/ap/vim/patches/7.2.028
+++ /dev/null
@@ -1,53 +0,0 @@
-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
deleted file mode 100644
index 56e847a7..00000000
--- a/source/ap/vim/patches/7.2.029
+++ /dev/null
@@ -1,44 +0,0 @@
-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
deleted file mode 100644
index 310207ed..00000000
--- a/source/ap/vim/patches/7.2.030
+++ /dev/null
@@ -1,51 +0,0 @@
-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
deleted file mode 100644
index 4b2bca70..00000000
--- a/source/ap/vim/patches/7.2.031
+++ /dev/null
@@ -1,1281 +0,0 @@
-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
deleted file mode 100644
index f4a0d9be..00000000
--- a/source/ap/vim/patches/7.2.032
+++ /dev/null
@@ -1,55 +0,0 @@
-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
deleted file mode 100644
index d96a94b7..00000000
--- a/source/ap/vim/patches/7.2.033
+++ /dev/null
@@ -1,78 +0,0 @@
-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
deleted file mode 100644
index 957fb35d..00000000
--- a/source/ap/vim/patches/7.2.034
+++ /dev/null
@@ -1,81 +0,0 @@
-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
deleted file mode 100644
index e8c73915..00000000
--- a/source/ap/vim/patches/7.2.035
+++ /dev/null
@@ -1,128 +0,0 @@
-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
deleted file mode 100644
index 4db2a26f..00000000
--- a/source/ap/vim/patches/7.2.036
+++ /dev/null
@@ -1,276 +0,0 @@
-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
deleted file mode 100644
index 20a43983..00000000
--- a/source/ap/vim/patches/7.2.037
+++ /dev/null
@@ -1,53 +0,0 @@
-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
deleted file mode 100644
index 449821e8..00000000
--- a/source/ap/vim/patches/7.2.038
+++ /dev/null
@@ -1,86 +0,0 @@
-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
deleted file mode 100644
index f9cb18eb..00000000
--- a/source/ap/vim/patches/7.2.039
+++ /dev/null
@@ -1,46 +0,0 @@
-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
deleted file mode 100644
index 76ea73af..00000000
--- a/source/ap/vim/patches/7.2.040
+++ /dev/null
@@ -1,64 +0,0 @@
-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
deleted file mode 100644
index b562206c..00000000
--- a/source/ap/vim/patches/7.2.041
+++ /dev/null
@@ -1,729 +0,0 @@
-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
deleted file mode 100644
index cd2b5689..00000000
--- a/source/ap/vim/patches/7.2.042
+++ /dev/null
@@ -1,166 +0,0 @@
-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
deleted file mode 100644
index 5c522547..00000000
--- a/source/ap/vim/patches/7.2.043
+++ /dev/null
@@ -1,78 +0,0 @@
-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
deleted file mode 100644
index 4cfe651e..00000000
--- a/source/ap/vim/patches/7.2.044
+++ /dev/null
@@ -1,161 +0,0 @@
-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
deleted file mode 100644
index cf37908d..00000000
--- a/source/ap/vim/patches/7.2.045
+++ /dev/null
@@ -1,67 +0,0 @@
-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
deleted file mode 100644
index 335f814d..00000000
--- a/source/ap/vim/patches/7.2.046
+++ /dev/null
@@ -1,55 +0,0 @@
-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
deleted file mode 100644
index 5826d2a9..00000000
--- a/source/ap/vim/patches/7.2.047
+++ /dev/null
@@ -1,88 +0,0 @@
-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
deleted file mode 100644
index 3975308b..00000000
--- a/source/ap/vim/patches/7.2.048
+++ /dev/null
@@ -1,160 +0,0 @@
-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
deleted file mode 100644
index 0f6efa87..00000000
--- a/source/ap/vim/patches/7.2.049
+++ /dev/null
@@ -1,1193 +0,0 @@
-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
deleted file mode 100644
index 416d32b1..00000000
--- a/source/ap/vim/patches/7.2.050
+++ /dev/null
@@ -1,316 +0,0 @@
-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
deleted file mode 100644
index 7c36dfe9..00000000
--- a/source/ap/vim/patches/7.2.051
+++ /dev/null
@@ -1,411 +0,0 @@
-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
deleted file mode 100644
index eb331f34..00000000
--- a/source/ap/vim/patches/7.2.052
+++ /dev/null
@@ -1,83 +0,0 @@
-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
deleted file mode 100644
index 410d1666..00000000
--- a/source/ap/vim/patches/7.2.053
+++ /dev/null
@@ -1,58 +0,0 @@
-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
deleted file mode 100644
index 98ce9e8f..00000000
--- a/source/ap/vim/patches/7.2.054
+++ /dev/null
@@ -1,68 +0,0 @@
-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
deleted file mode 100644
index ffab9a26..00000000
--- a/source/ap/vim/patches/7.2.055
+++ /dev/null
@@ -1,1271 +0,0 @@
-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
deleted file mode 100644
index 9e23f3da..00000000
--- a/source/ap/vim/patches/7.2.056
+++ /dev/null
@@ -1,57 +0,0 @@
-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
deleted file mode 100644
index 37549121..00000000
--- a/source/ap/vim/patches/7.2.057
+++ /dev/null
@@ -1,111 +0,0 @@
-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
deleted file mode 100644
index 95de243f..00000000
--- a/source/ap/vim/patches/7.2.058
+++ /dev/null
@@ -1,83 +0,0 @@
-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
deleted file mode 100644
index 0012ad6d..00000000
--- a/source/ap/vim/patches/7.2.059
+++ /dev/null
@@ -1,70 +0,0 @@
-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
deleted file mode 100644
index ec6e6b78..00000000
--- a/source/ap/vim/patches/7.2.060
+++ /dev/null
@@ -1,1102 +0,0 @@
-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
deleted file mode 100644
index 787aa66a..00000000
--- a/source/ap/vim/patches/7.2.061
+++ /dev/null
@@ -1,56 +0,0 @@
-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
deleted file mode 100644
index 6b4b8909..00000000
--- a/source/ap/vim/patches/7.2.062
+++ /dev/null
@@ -1,55 +0,0 @@
-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
deleted file mode 100644
index f9515546..00000000
--- a/source/ap/vim/patches/7.2.063
+++ /dev/null
@@ -1,103 +0,0 @@
-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
deleted file mode 100644
index 48ca877e..00000000
--- a/source/ap/vim/patches/7.2.064
+++ /dev/null
@@ -1,66 +0,0 @@
-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
deleted file mode 100644
index d2cac841..00000000
--- a/source/ap/vim/patches/7.2.065
+++ /dev/null
@@ -1,177 +0,0 @@
-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
deleted file mode 100644
index a5991d42..00000000
--- a/source/ap/vim/patches/7.2.066
+++ /dev/null
@@ -1,70 +0,0 @@
-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
deleted file mode 100644
index 079a0530..00000000
--- a/source/ap/vim/patches/7.2.067
+++ /dev/null
@@ -1,52 +0,0 @@
-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
deleted file mode 100644
index 508bac12..00000000
--- a/source/ap/vim/patches/7.2.068
+++ /dev/null
@@ -1,101 +0,0 @@
-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
deleted file mode 100644
index 7714fae9..00000000
--- a/source/ap/vim/patches/7.2.069
+++ /dev/null
@@ -1,52 +0,0 @@
-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
deleted file mode 100644
index 9a7edc78..00000000
--- a/source/ap/vim/patches/7.2.070
+++ /dev/null
@@ -1,566 +0,0 @@
-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
deleted file mode 100644
index 0a1e5137..00000000
--- a/source/ap/vim/patches/7.2.071
+++ /dev/null
@@ -1,81 +0,0 @@
-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
deleted file mode 100644
index 1dffd918..00000000
--- a/source/ap/vim/patches/7.2.072
+++ /dev/null
@@ -1,56 +0,0 @@
-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
deleted file mode 100644
index 16f1297d..00000000
--- a/source/ap/vim/patches/7.2.073
+++ /dev/null
@@ -1,135 +0,0 @@
-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
deleted file mode 100644
index 6000fca5..00000000
--- a/source/ap/vim/patches/7.2.074
+++ /dev/null
@@ -1,54 +0,0 @@
-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
deleted file mode 100644
index 4bec708a..00000000
--- a/source/ap/vim/patches/7.2.075
+++ /dev/null
@@ -1,58 +0,0 @@
-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
deleted file mode 100644
index 5166bbab..00000000
--- a/source/ap/vim/patches/7.2.076
+++ /dev/null
@@ -1,86 +0,0 @@
-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
deleted file mode 100644
index 396444c3..00000000
--- a/source/ap/vim/patches/7.2.077
+++ /dev/null
@@ -1,164 +0,0 @@
-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
deleted file mode 100644
index 0e127bc4..00000000
--- a/source/ap/vim/patches/7.2.078
+++ /dev/null
@@ -1,120 +0,0 @@
-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
deleted file mode 100644
index 60da797d..00000000
--- a/source/ap/vim/patches/7.2.079
+++ /dev/null
@@ -1,229 +0,0 @@
-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
deleted file mode 100644
index 399f9e1c..00000000
--- a/source/ap/vim/patches/7.2.080
+++ /dev/null
@@ -1,365 +0,0 @@
-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
deleted file mode 100644
index 9f1259d7..00000000
--- a/source/ap/vim/patches/7.2.081
+++ /dev/null
@@ -1,60 +0,0 @@
-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
deleted file mode 100644
index c6bf703c..00000000
--- a/source/ap/vim/patches/7.2.082
+++ /dev/null
@@ -1,77 +0,0 @@
-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
deleted file mode 100644
index 5406ebc6..00000000
--- a/source/ap/vim/patches/7.2.083
+++ /dev/null
@@ -1,54 +0,0 @@
-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
deleted file mode 100644
index 4c912ca7..00000000
--- a/source/ap/vim/patches/7.2.084
+++ /dev/null
@@ -1,144 +0,0 @@
-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
deleted file mode 100644
index f9828fa1..00000000
--- a/source/ap/vim/patches/7.2.085
+++ /dev/null
@@ -1,62 +0,0 @@
-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
deleted file mode 100644
index f55efbb2..00000000
--- a/source/ap/vim/patches/7.2.086
+++ /dev/null
@@ -1,98 +0,0 @@
-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
deleted file mode 100644
index 942acca2..00000000
--- a/source/ap/vim/patches/7.2.087
+++ /dev/null
@@ -1,53 +0,0 @@
-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
deleted file mode 100644
index 1cb98511..00000000
--- a/source/ap/vim/patches/7.2.088
+++ /dev/null
@@ -1,99 +0,0 @@
-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
deleted file mode 100644
index 74276c6d..00000000
--- a/source/ap/vim/patches/7.2.089
+++ /dev/null
@@ -1,91 +0,0 @@
-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
deleted file mode 100644
index 59dd7acf..00000000
--- a/source/ap/vim/patches/7.2.090
+++ /dev/null
@@ -1,130 +0,0 @@
-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
deleted file mode 100644
index 766a155e..00000000
--- a/source/ap/vim/patches/7.2.091
+++ /dev/null
@@ -1,63 +0,0 @@
-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
deleted file mode 100644
index 633903ee..00000000
--- a/source/ap/vim/patches/7.2.092
+++ /dev/null
@@ -1,164 +0,0 @@
-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
deleted file mode 100644
index b0f44909..00000000
--- a/source/ap/vim/patches/7.2.093
+++ /dev/null
@@ -1,234 +0,0 @@
-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
deleted file mode 100644
index bc79fa56..00000000
--- a/source/ap/vim/patches/7.2.094
+++ /dev/null
@@ -1,112 +0,0 @@
-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
deleted file mode 100644
index c69cadb3..00000000
--- a/source/ap/vim/patches/7.2.095
+++ /dev/null
@@ -1,63 +0,0 @@
-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
deleted file mode 100644
index e286ca9c..00000000
--- a/source/ap/vim/patches/7.2.096
+++ /dev/null
@@ -1,54 +0,0 @@
-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
deleted file mode 100644
index ac72d5d9..00000000
--- a/source/ap/vim/patches/7.2.097
+++ /dev/null
@@ -1,54 +0,0 @@
-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
deleted file mode 100644
index eed0a65d..00000000
--- a/source/ap/vim/patches/7.2.098
+++ /dev/null
@@ -1,69 +0,0 @@
-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
deleted file mode 100644
index 6f5dae5d..00000000
--- a/source/ap/vim/patches/7.2.099
+++ /dev/null
@@ -1,127 +0,0 @@
-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
deleted file mode 100644
index 0099edb1..00000000
--- a/source/ap/vim/patches/7.2.100
+++ /dev/null
@@ -1,132 +0,0 @@
-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
deleted file mode 100644
index e3526ca8..00000000
--- a/source/ap/vim/patches/7.2.101
+++ /dev/null
@@ -1,47 +0,0 @@
-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
deleted file mode 100644
index 316c32bd..00000000
--- a/source/ap/vim/patches/7.2.102
+++ /dev/null
@@ -1,47 +0,0 @@
-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
deleted file mode 100644
index 25a513a7..00000000
--- a/source/ap/vim/patches/7.2.103
+++ /dev/null
@@ -1,216 +0,0 @@
-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
deleted file mode 100644
index 51c0e097..00000000
--- a/source/ap/vim/patches/7.2.104
+++ /dev/null
@@ -1,51 +0,0 @@
-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
deleted file mode 100644
index 486ffb3f..00000000
--- a/source/ap/vim/patches/7.2.105
+++ /dev/null
@@ -1,72 +0,0 @@
-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
deleted file mode 100644
index 2c547973..00000000
--- a/source/ap/vim/patches/7.2.106
+++ /dev/null
@@ -1,103 +0,0 @@
-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
deleted file mode 100644
index 95673754..00000000
--- a/source/ap/vim/patches/7.2.107
+++ /dev/null
@@ -1,56 +0,0 @@
-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
deleted file mode 100644
index 5164b83c..00000000
--- a/source/ap/vim/patches/7.2.108
+++ /dev/null
@@ -1,55 +0,0 @@
-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
deleted file mode 100644
index 8c3866cf..00000000
--- a/source/ap/vim/patches/7.2.109
+++ /dev/null
@@ -1,423 +0,0 @@
-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
deleted file mode 100644
index 4594e78c..00000000
--- a/source/ap/vim/patches/7.2.110
+++ /dev/null
@@ -1,53 +0,0 @@
-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
deleted file mode 100644
index acc0be42..00000000
--- a/source/ap/vim/patches/7.2.111
+++ /dev/null
@@ -1,88 +0,0 @@
-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
deleted file mode 100644
index 6611999e..00000000
--- a/source/ap/vim/patches/7.2.112
+++ /dev/null
@@ -1,47 +0,0 @@
-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
deleted file mode 100644
index f0e4ebf3..00000000
--- a/source/ap/vim/patches/7.2.113
+++ /dev/null
@@ -1,99 +0,0 @@
-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
deleted file mode 100644
index 9742b52d..00000000
--- a/source/ap/vim/patches/7.2.114
+++ /dev/null
@@ -1,86 +0,0 @@
-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
deleted file mode 100644
index b51a1f50..00000000
--- a/source/ap/vim/patches/7.2.115
+++ /dev/null
@@ -1,133 +0,0 @@
-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
deleted file mode 100644
index edd2bd14..00000000
--- a/source/ap/vim/patches/7.2.116
+++ /dev/null
@@ -1,55 +0,0 @@
-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
deleted file mode 100644
index 4c4e66a0..00000000
--- a/source/ap/vim/patches/7.2.117
+++ /dev/null
@@ -1,107 +0,0 @@
-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
deleted file mode 100644
index 73b6cbbb..00000000
--- a/source/ap/vim/patches/7.2.118
+++ /dev/null
@@ -1,78 +0,0 @@
-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
deleted file mode 100644
index f31f2e66..00000000
--- a/source/ap/vim/patches/7.2.119
+++ /dev/null
@@ -1,51 +0,0 @@
-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
deleted file mode 100644
index cf687f3e..00000000
--- a/source/ap/vim/patches/7.2.120
+++ /dev/null
@@ -1,277 +0,0 @@
-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
deleted file mode 100644
index ea5306f7..00000000
--- a/source/ap/vim/patches/7.2.121
+++ /dev/null
@@ -1,180 +0,0 @@
-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
deleted file mode 100644
index 18f69898..00000000
--- a/source/ap/vim/patches/7.2.122
+++ /dev/null
@@ -1,80 +0,0 @@
-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
deleted file mode 100644
index 4cf9b810..00000000
--- a/source/ap/vim/patches/7.2.123
+++ /dev/null
@@ -1,50 +0,0 @@
-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
deleted file mode 100644
index eca6bec1..00000000
--- a/source/ap/vim/patches/7.2.124
+++ /dev/null
@@ -1,122 +0,0 @@
-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
deleted file mode 100644
index 460bdea5..00000000
--- a/source/ap/vim/patches/7.2.125
+++ /dev/null
@@ -1,161 +0,0 @@
-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
deleted file mode 100644
index fe2dd657..00000000
--- a/source/ap/vim/patches/7.2.126
+++ /dev/null
@@ -1,174 +0,0 @@
-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
deleted file mode 100644
index 662fe0fa..00000000
--- a/source/ap/vim/patches/7.2.127
+++ /dev/null
@@ -1,59 +0,0 @@
-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
deleted file mode 100644
index 0c17f185..00000000
--- a/source/ap/vim/patches/7.2.128
+++ /dev/null
@@ -1,52 +0,0 @@
-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
deleted file mode 100644
index ca756cfa..00000000
--- a/source/ap/vim/patches/7.2.129
+++ /dev/null
@@ -1,73 +0,0 @@
-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
deleted file mode 100644
index 8d654682..00000000
--- a/source/ap/vim/patches/7.2.130
+++ /dev/null
@@ -1,413 +0,0 @@
-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
deleted file mode 100644
index fec2b5e1..00000000
--- a/source/ap/vim/patches/7.2.131
+++ /dev/null
@@ -1,83 +0,0 @@
-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
deleted file mode 100644
index 69e19ee4..00000000
--- a/source/ap/vim/patches/7.2.132
+++ /dev/null
@@ -1,268 +0,0 @@
-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
deleted file mode 100644
index ffb19d71..00000000
--- a/source/ap/vim/patches/7.2.133
+++ /dev/null
@@ -1,53 +0,0 @@
-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
deleted file mode 100644
index fee2789a..00000000
--- a/source/ap/vim/patches/7.2.134
+++ /dev/null
@@ -1,68 +0,0 @@
-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
deleted file mode 100644
index a58e6bb2..00000000
--- a/source/ap/vim/patches/7.2.135
+++ /dev/null
@@ -1,85 +0,0 @@
-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
deleted file mode 100644
index b0045eb9..00000000
--- a/source/ap/vim/patches/7.2.136
+++ /dev/null
@@ -1,47 +0,0 @@
-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
deleted file mode 100644
index 706b046b..00000000
--- a/source/ap/vim/patches/7.2.137
+++ /dev/null
@@ -1,343 +0,0 @@
-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
deleted file mode 100644
index faa7e7a6..00000000
--- a/source/ap/vim/patches/7.2.138
+++ /dev/null
@@ -1,160 +0,0 @@
-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
deleted file mode 100644
index 3366acb7..00000000
--- a/source/ap/vim/patches/7.2.139
+++ /dev/null
@@ -1,79 +0,0 @@
-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
deleted file mode 100644
index 98c12796..00000000
--- a/source/ap/vim/patches/7.2.140
+++ /dev/null
@@ -1,58 +0,0 @@
-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
deleted file mode 100644
index 395d210d..00000000
--- a/source/ap/vim/patches/7.2.141
+++ /dev/null
@@ -1,239 +0,0 @@
-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
deleted file mode 100644
index adfaab61..00000000
--- a/source/ap/vim/patches/7.2.142
+++ /dev/null
@@ -1,61 +0,0 @@
-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
deleted file mode 100644
index 905f1599..00000000
--- a/source/ap/vim/patches/7.2.143
+++ /dev/null
@@ -1,234 +0,0 @@
-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
deleted file mode 100644
index 3a219bd4..00000000
--- a/source/ap/vim/patches/7.2.144
+++ /dev/null
@@ -1,78 +0,0 @@
-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
deleted file mode 100644
index 0f328170..00000000
--- a/source/ap/vim/patches/7.2.145
+++ /dev/null
@@ -1,125 +0,0 @@
-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
deleted file mode 100644
index 96852fbe..00000000
--- a/source/ap/vim/patches/7.2.146
+++ /dev/null
@@ -1,110 +0,0 @@
-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
deleted file mode 100644
index 82a43eea..00000000
--- a/source/ap/vim/patches/7.2.147
+++ /dev/null
@@ -1,53 +0,0 @@
-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
deleted file mode 100644
index 32504997..00000000
--- a/source/ap/vim/patches/7.2.148
+++ /dev/null
@@ -1,145 +0,0 @@
-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
deleted file mode 100644
index 7b51a571..00000000
--- a/source/ap/vim/patches/7.2.149
+++ /dev/null
@@ -1,672 +0,0 @@
-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
deleted file mode 100644
index f2b1174e..00000000
--- a/source/ap/vim/patches/7.2.150
+++ /dev/null
@@ -1,1325 +0,0 @@
-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
deleted file mode 100644
index 214b7609..00000000
--- a/source/ap/vim/patches/7.2.151
+++ /dev/null
@@ -1,53 +0,0 @@
-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
deleted file mode 100644
index 107a0a4b..00000000
--- a/source/ap/vim/patches/7.2.152
+++ /dev/null
@@ -1,104 +0,0 @@
-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
deleted file mode 100644
index 79b2a077..00000000
--- a/source/ap/vim/patches/7.2.153
+++ /dev/null
@@ -1,97 +0,0 @@
-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
deleted file mode 100644
index 73289032..00000000
--- a/source/ap/vim/patches/7.2.154
+++ /dev/null
@@ -1,71 +0,0 @@
-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
deleted file mode 100644
index 00b294df..00000000
--- a/source/ap/vim/patches/7.2.155
+++ /dev/null
@@ -1,45 +0,0 @@
-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
deleted file mode 100644
index 59bb2e9e..00000000
--- a/source/ap/vim/patches/7.2.156
+++ /dev/null
@@ -1,181 +0,0 @@
-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
deleted file mode 100644
index 23843145..00000000
--- a/source/ap/vim/patches/7.2.157
+++ /dev/null
@@ -1,144 +0,0 @@
-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
deleted file mode 100644
index 87daf24d..00000000
--- a/source/ap/vim/patches/7.2.158
+++ /dev/null
@@ -1,63 +0,0 @@
-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
deleted file mode 100644
index 8d496ad8..00000000
--- a/source/ap/vim/patches/7.2.159
+++ /dev/null
@@ -1,71 +0,0 @@
-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
deleted file mode 100644
index 9ef197d4..00000000
--- a/source/ap/vim/patches/7.2.160
+++ /dev/null
@@ -1,52 +0,0 @@
-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
deleted file mode 100644
index 576a03da..00000000
--- a/source/ap/vim/patches/7.2.161
+++ /dev/null
@@ -1,205 +0,0 @@
-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
deleted file mode 100644
index f04d6e1b..00000000
--- a/source/ap/vim/patches/7.2.162
+++ /dev/null
@@ -1,75 +0,0 @@
-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
deleted file mode 100644
index 6db9f098..00000000
--- a/source/ap/vim/patches/7.2.163
+++ /dev/null
@@ -1,51 +0,0 @@
-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
deleted file mode 100644
index f10bd210..00000000
--- a/source/ap/vim/patches/7.2.164
+++ /dev/null
@@ -1,139 +0,0 @@
-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
deleted file mode 100644
index aeded0a0..00000000
--- a/source/ap/vim/patches/7.2.165
+++ /dev/null
@@ -1,58 +0,0 @@
-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
deleted file mode 100644
index 0461b31d..00000000
--- a/source/ap/vim/patches/7.2.166
+++ /dev/null
@@ -1,425 +0,0 @@
-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
deleted file mode 100644
index 9bf08e62..00000000
--- a/source/ap/vim/patches/7.2.167
+++ /dev/null
@@ -1,1873 +0,0 @@
-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
deleted file mode 100644
index 29cafb61..00000000
--- a/source/ap/vim/patches/7.2.168
+++ /dev/null
@@ -1,74 +0,0 @@
-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
deleted file mode 100644
index 4ae90a51..00000000
--- a/source/ap/vim/patches/7.2.169
+++ /dev/null
@@ -1,1214 +0,0 @@
-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
deleted file mode 100644
index 6790be14..00000000
--- a/source/ap/vim/patches/7.2.170
+++ /dev/null
@@ -1,179 +0,0 @@
-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
deleted file mode 100644
index 7d1b8a86..00000000
--- a/source/ap/vim/patches/7.2.171
+++ /dev/null
@@ -1,80 +0,0 @@
-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
deleted file mode 100644
index 1ba814d3..00000000
--- a/source/ap/vim/patches/7.2.172
+++ /dev/null
@@ -1,59 +0,0 @@
-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
deleted file mode 100644
index 331a6e84..00000000
--- a/source/ap/vim/patches/7.2.173
+++ /dev/null
@@ -1,719 +0,0 @@
-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
deleted file mode 100644
index 5f8ccd3a..00000000
--- a/source/ap/vim/patches/7.2.174
+++ /dev/null
@@ -1,1718 +0,0 @@
-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
deleted file mode 100644
index 4ba3a158..00000000
--- a/source/ap/vim/patches/7.2.175
+++ /dev/null
@@ -1,51 +0,0 @@
-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
deleted file mode 100644
index 91c98afb..00000000
--- a/source/ap/vim/patches/7.2.176
+++ /dev/null
@@ -1,207 +0,0 @@
-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
deleted file mode 100644
index 65dc16c2..00000000
--- a/source/ap/vim/patches/7.2.177
+++ /dev/null
@@ -1,2726 +0,0 @@
-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
deleted file mode 100644
index 84fe670f..00000000
--- a/source/ap/vim/patches/7.2.178
+++ /dev/null
@@ -1,150 +0,0 @@
-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
deleted file mode 100644
index 97f94ed1..00000000
--- a/source/ap/vim/patches/7.2.179
+++ /dev/null
@@ -1,100 +0,0 @@
-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
deleted file mode 100644
index f3f3a9ed..00000000
--- a/source/ap/vim/patches/7.2.180
+++ /dev/null
@@ -1,6520 +0,0 @@
-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
deleted file mode 100644
index bf7d5feb..00000000
--- a/source/ap/vim/patches/7.2.181
+++ /dev/null
@@ -1,1978 +0,0 @@
-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
deleted file mode 100644
index 2df64995..00000000
--- a/source/ap/vim/patches/7.2.182
+++ /dev/null
@@ -1,66 +0,0 @@
-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
deleted file mode 100644
index ad1052db..00000000
--- a/source/ap/vim/patches/7.2.183
+++ /dev/null
@@ -1,1846 +0,0 @@
-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
deleted file mode 100644
index 63882157..00000000
--- a/source/ap/vim/patches/7.2.184
+++ /dev/null
@@ -1,3646 +0,0 @@
-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
deleted file mode 100644
index 35dbad05..00000000
--- a/source/ap/vim/patches/7.2.185
+++ /dev/null
@@ -1,305 +0,0 @@
-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
deleted file mode 100644
index c3710425..00000000
--- a/source/ap/vim/patches/7.2.186
+++ /dev/null
@@ -1,331 +0,0 @@
-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
deleted file mode 100644
index 13dfc9f1..00000000
--- a/source/ap/vim/patches/7.2.187
+++ /dev/null
@@ -1,125 +0,0 @@
-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
deleted file mode 100644
index 1aa527da..00000000
--- a/source/ap/vim/patches/7.2.188
+++ /dev/null
@@ -1,278 +0,0 @@
-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
deleted file mode 100644
index c8ad9add..00000000
--- a/source/ap/vim/patches/7.2.189
+++ /dev/null
@@ -1,86 +0,0 @@
-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
deleted file mode 100644
index 2a0aee98..00000000
--- a/source/ap/vim/patches/7.2.190
+++ /dev/null
@@ -1,182 +0,0 @@
-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
deleted file mode 100644
index f9c33571..00000000
--- a/source/ap/vim/patches/7.2.191
+++ /dev/null
@@ -1,3705 +0,0 @@
-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
deleted file mode 100644
index 28cefd5b..00000000
--- a/source/ap/vim/patches/7.2.192
+++ /dev/null
@@ -1,135 +0,0 @@
-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
deleted file mode 100644
index 175a6b88..00000000
--- a/source/ap/vim/patches/7.2.193
+++ /dev/null
@@ -1,53 +0,0 @@
-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
deleted file mode 100644
index 91d438f8..00000000
--- a/source/ap/vim/patches/7.2.194
+++ /dev/null
@@ -1,44 +0,0 @@
-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
deleted file mode 100644
index 5669a65f..00000000
--- a/source/ap/vim/patches/7.2.195
+++ /dev/null
@@ -1,79 +0,0 @@
-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
deleted file mode 100644
index 7be8d95c..00000000
--- a/source/ap/vim/patches/7.2.196
+++ /dev/null
@@ -1,84 +0,0 @@
-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
deleted file mode 100644
index 8e49a530..00000000
--- a/source/ap/vim/patches/7.2.197
+++ /dev/null
@@ -1,53 +0,0 @@
-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
deleted file mode 100644
index cae27ac3..00000000
--- a/source/ap/vim/patches/7.2.198
+++ /dev/null
@@ -1,60 +0,0 @@
-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
deleted file mode 100644
index 391ede6f..00000000
--- a/source/ap/vim/patches/7.2.199
+++ /dev/null
@@ -1,52 +0,0 @@
-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
deleted file mode 100644
index 65cc598e..00000000
--- a/source/ap/vim/patches/7.2.200
+++ /dev/null
@@ -1,348 +0,0 @@
-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
deleted file mode 100644
index cd2df079..00000000
--- a/source/ap/vim/patches/7.2.201
+++ /dev/null
@@ -1,494 +0,0 @@
-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
deleted file mode 100644
index 2c249093..00000000
--- a/source/ap/vim/patches/7.2.202
+++ /dev/null
@@ -1,62 +0,0 @@
-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
deleted file mode 100644
index c1322488..00000000
--- a/source/ap/vim/patches/7.2.203
+++ /dev/null
@@ -1,1496 +0,0 @@
-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
deleted file mode 100644
index ef99c519..00000000
--- a/source/ap/vim/patches/7.2.204
+++ /dev/null
@@ -1,137 +0,0 @@
-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
deleted file mode 100644
index 2af50678..00000000
--- a/source/ap/vim/patches/7.2.205
+++ /dev/null
@@ -1,81 +0,0 @@
-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
deleted file mode 100644
index e16fb7e1..00000000
--- a/source/ap/vim/patches/7.2.206
+++ /dev/null
@@ -1,46 +0,0 @@
-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
deleted file mode 100644
index 528d35da..00000000
--- a/source/ap/vim/patches/7.2.207
+++ /dev/null
@@ -1,69 +0,0 @@
-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
deleted file mode 100644
index 930770d0..00000000
--- a/source/ap/vim/patches/7.2.208
+++ /dev/null
@@ -1,82 +0,0 @@
-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
deleted file mode 100644
index 1cc33935..00000000
--- a/source/ap/vim/patches/7.2.209
+++ /dev/null
@@ -1,82 +0,0 @@
-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
deleted file mode 100644
index 9c51a137..00000000
--- a/source/ap/vim/patches/7.2.210
+++ /dev/null
@@ -1,58 +0,0 @@
-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
deleted file mode 100644
index 05101980..00000000
--- a/source/ap/vim/patches/7.2.211
+++ /dev/null
@@ -1,52 +0,0 @@
-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
deleted file mode 100644
index 33fcb5c4..00000000
--- a/source/ap/vim/patches/7.2.212
+++ /dev/null
@@ -1,62 +0,0 @@
-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
deleted file mode 100644
index 74a0e165..00000000
--- a/source/ap/vim/patches/7.2.213
+++ /dev/null
@@ -1,53 +0,0 @@
-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
deleted file mode 100644
index 17cb1569..00000000
--- a/source/ap/vim/patches/7.2.214
+++ /dev/null
@@ -1,65 +0,0 @@
-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
deleted file mode 100644
index 90e746ce..00000000
--- a/source/ap/vim/patches/7.2.215
+++ /dev/null
@@ -1,310 +0,0 @@
-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
deleted file mode 100644
index 5a7afdff..00000000
--- a/source/ap/vim/patches/7.2.216
+++ /dev/null
@@ -1,137 +0,0 @@
-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
deleted file mode 100644
index 30d8aa6a..00000000
--- a/source/ap/vim/patches/7.2.217
+++ /dev/null
@@ -1,57 +0,0 @@
-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
deleted file mode 100644
index b48d7180..00000000
--- a/source/ap/vim/patches/7.2.218
+++ /dev/null
@@ -1,52 +0,0 @@
-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
deleted file mode 100644
index f9bbec04..00000000
--- a/source/ap/vim/patches/7.2.219
+++ /dev/null
@@ -1,71 +0,0 @@
-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
deleted file mode 100644
index b3d63f35..00000000
--- a/source/ap/vim/patches/7.2.220
+++ /dev/null
@@ -1,95 +0,0 @@
-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
deleted file mode 100644
index 3c6180e3..00000000
--- a/source/ap/vim/patches/7.2.221
+++ /dev/null
@@ -1,247 +0,0 @@
-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
deleted file mode 100644
index dcf0b36c..00000000
--- a/source/ap/vim/patches/7.2.222
+++ /dev/null
@@ -1,59 +0,0 @@
-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
deleted file mode 100644
index cac2126c..00000000
--- a/source/ap/vim/patches/7.2.223
+++ /dev/null
@@ -1,165 +0,0 @@
-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
deleted file mode 100644
index d988eeda..00000000
--- a/source/ap/vim/patches/7.2.224
+++ /dev/null
@@ -1,88 +0,0 @@
-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
deleted file mode 100644
index 32a4d357..00000000
--- a/source/ap/vim/patches/7.2.225
+++ /dev/null
@@ -1,97 +0,0 @@
-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
deleted file mode 100644
index d922a080..00000000
--- a/source/ap/vim/patches/7.2.226
+++ /dev/null
@@ -1,268 +0,0 @@
-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
deleted file mode 100644
index 84992128..00000000
--- a/source/ap/vim/patches/7.2.227
+++ /dev/null
@@ -1,52 +0,0 @@
-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
deleted file mode 100644
index a906bef4..00000000
--- a/source/ap/vim/patches/7.2.228
+++ /dev/null
@@ -1,573 +0,0 @@
-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
deleted file mode 100644
index bafaef0b..00000000
--- a/source/ap/vim/patches/7.2.229
+++ /dev/null
@@ -1,60 +0,0 @@
-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
deleted file mode 100644
index 32379d2c..00000000
--- a/source/ap/vim/patches/7.2.230
+++ /dev/null
@@ -1,87 +0,0 @@
-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
deleted file mode 100644
index 0f9a6d1e..00000000
--- a/source/ap/vim/patches/7.2.231
+++ /dev/null
@@ -1,49 +0,0 @@
-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
deleted file mode 100644
index 02727c74..00000000
--- a/source/ap/vim/patches/7.2.232
+++ /dev/null
@@ -1,102 +0,0 @@
-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
deleted file mode 100644
index f9fbd848..00000000
--- a/source/ap/vim/patches/7.2.233
+++ /dev/null
@@ -1,96 +0,0 @@
-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
deleted file mode 100644
index dd44d5d0..00000000
--- a/source/ap/vim/patches/7.2.234
+++ /dev/null
@@ -1,111 +0,0 @@
-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
deleted file mode 100644
index 6aa8338e..00000000
--- a/source/ap/vim/patches/7.2.235
+++ /dev/null
@@ -1,94 +0,0 @@
-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
deleted file mode 100644
index aeb1f57d..00000000
--- a/source/ap/vim/patches/7.2.236
+++ /dev/null
@@ -1,81 +0,0 @@
-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
deleted file mode 100644
index 3592d3d6..00000000
--- a/source/ap/vim/patches/7.2.237
+++ /dev/null
@@ -1,76 +0,0 @@
-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
deleted file mode 100644
index a70976d8..00000000
--- a/source/ap/vim/patches/7.2.238
+++ /dev/null
@@ -1,117 +0,0 @@
-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
deleted file mode 100644
index 26b80ee2..00000000
--- a/source/ap/vim/patches/7.2.239
+++ /dev/null
@@ -1,145 +0,0 @@
-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
deleted file mode 100644
index 7a1c22e2..00000000
--- a/source/ap/vim/patches/7.2.240
+++ /dev/null
@@ -1,69 +0,0 @@
-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
deleted file mode 100644
index 42e9ade3..00000000
--- a/source/ap/vim/patches/7.2.241
+++ /dev/null
@@ -1,169 +0,0 @@
-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
deleted file mode 100644
index 22341cd2..00000000
--- a/source/ap/vim/patches/7.2.242
+++ /dev/null
@@ -1,89 +0,0 @@
-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
deleted file mode 100644
index 92a6580d..00000000
--- a/source/ap/vim/patches/7.2.243
+++ /dev/null
@@ -1,67 +0,0 @@
-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
deleted file mode 100644
index 6c9b1fb8..00000000
--- a/source/ap/vim/patches/7.2.244
+++ /dev/null
@@ -1,174 +0,0 @@
-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
deleted file mode 100644
index d046c97f..00000000
--- a/source/ap/vim/patches/7.2.245
+++ /dev/null
@@ -1,165 +0,0 @@
-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/patches/7.2.246 b/source/ap/vim/patches/7.2.246
deleted file mode 100644
index 5b1c9786..00000000
--- a/source/ap/vim/patches/7.2.246
+++ /dev/null
@@ -1,53 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.246
-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.246
-Problem:    Cscope home page link is wrong.
-Solution:   Update the URL. (Sergey Khorev)
-Files:	    runtime/doc/if_cscop.txt
-
-
-*** ../vim-7.2.245/runtime/doc/if_cscop.txt	2009-07-09 21:22:36.000000000 +0200
---- runtime/doc/if_cscop.txt	2009-09-11 11:19:31.000000000 +0200
-***************
-*** 481,487 ****
-  any problems, suggestions, patches, et al., you have for the usage of
-  cscope within Vim to him.
-  							*cscope-win32*
-! For a cscope version for Win32 see: http://iamphet.nm.ru/cscope/index.html
-  
-  Win32 support was added by Sergey Khorev <sergey.khorev@gmail.com>.  Contact
-  him if you have Win32-specific issues.
---- 481,488 ----
-  any problems, suggestions, patches, et al., you have for the usage of
-  cscope within Vim to him.
-  							*cscope-win32*
-! For a cscope version for Win32 see:
-! 	http://code.google.com/p/cscope-win32/
-  
-  Win32 support was added by Sergey Khorev <sergey.khorev@gmail.com>.  Contact
-  him if you have Win32-specific issues.
-*** ../vim-7.2.245/src/version.c	2009-07-29 18:24:59.000000000 +0200
---- src/version.c	2009-09-11 11:29:02.000000000 +0200
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     246,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-221. Your wife melts your keyboard in the oven.
-
- /// 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.247 b/source/ap/vim/patches/7.2.247
deleted file mode 100644
index e18926d9..00000000
--- a/source/ap/vim/patches/7.2.247
+++ /dev/null
@@ -1,86 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.247
-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.247
-Problem:    Mzscheme interface minor problem.
-Solution:   Better error message when build fails. (Sergey Khorev)
-Files:	    src/if_mzsch.c
-
-
-*** ../vim-7.2.246/src/if_mzsch.c	2009-07-09 20:06:30.000000000 +0200
---- src/if_mzsch.c	2009-09-11 11:20:39.000000000 +0200
-***************
-*** 635,642 ****
-  #endif /* DYNAMIC_MZSCHEME */
-  
-  /* need to put it here for dynamic stuff to work */
-! #ifdef INCLUDE_MZSCHEME_BASE
-  # include "mzscheme_base.c"
-  #endif
-  
-  /*
---- 635,644 ----
-  #endif /* DYNAMIC_MZSCHEME */
-  
-  /* need to put it here for dynamic stuff to work */
-! #if defined(INCLUDE_MZSCHEME_BASE)
-  # include "mzscheme_base.c"
-+ #elif MZSCHEME_VERSION_MAJOR >= 400
-+ # error MzScheme 4.x must include mzscheme_base.c, for MinGW32 you need to define MZSCHEME_GENERATE_BASE=yes
-  #endif
-  
-  /*
-***************
-*** 875,888 ****
-  #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();
---- 877,890 ----
-  #ifdef INCLUDE_MZSCHEME_BASE
-      {
-  	/*
-! 	 * versions 4.x do not provide Scheme bindings by default
-  	 * 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 mzscheme_base.c */
-  	declare_modules(environment);
-  	scheme_base_symbol = scheme_intern_symbol("scheme/base");
-  	MZ_GC_CHECK();
-*** ../vim-7.2.246/src/version.c	2009-09-11 11:30:12.000000000 +0200
---- src/version.c	2009-09-11 11:53:59.000000000 +0200
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     247,
-  /**/
-
--- 
-Your fault: 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.248 b/source/ap/vim/patches/7.2.248
deleted file mode 100644
index 2254101e..00000000
--- a/source/ap/vim/patches/7.2.248
+++ /dev/null
@@ -1,158 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.248 (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.248 (extra)
-Problem:    Mzscheme interface building minor problems.
-Solution:   Update Win32 makefiles. (Sergey Khorev)
-Files:	    src/Make_cyg.mak, src/Make_ming.mak, src/Make_mvc.mak
-
-
-*** ../vim-7.2.247/src/Make_cyg.mak	2007-09-30 22:28:48.000000000 +0200
---- src/Make_cyg.mak	2009-09-11 11:23:23.000000000 +0200
-***************
-*** 212,224 ****
-  MZSCHEME_VER = 209_000
-  endif
-  
-  ifeq (yes, $(DYNAMIC_MZSCHEME))
-  DEFINES += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"libmzsch$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
-  else
-  ifndef MZSCHEME_DLLS
-  MZSCHEME_DLLS = $(MZSCHEME)
-  endif
-! EXTRA_LIBS += -L$(MZSCHEME_DLLS) -lmzsch$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)
-  endif
-  endif
-  
---- 212,245 ----
-  MZSCHEME_VER = 209_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 (yes, $(DYNAMIC_MZSCHEME))
-  DEFINES += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"libmzsch$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
-  else
-  ifndef MZSCHEME_DLLS
-  MZSCHEME_DLLS = $(MZSCHEME)
-  endif
-! ifeq (yes,$(MZSCHEME_PRECISE_GC))
-! MZSCHEME_LIB=-lmzsch$(MZSCHEME_VER)
-! else
-! MZSCHEME_LIB = -lmzsch$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)
-! endif
-! EXTRA_LIBS += -L$(MZSCHEME_DLLS) -L$(MZSCHEME_DLLS)/lib $(MZSCHEME_LIB)
-! endif
-! ifeq (yes,$(MZSCHEME_GENERATE_BASE))
-! DEFINES += -DINCLUDE_MZSCHEME_BASE
-! MZ_EXTRA_DEP += mzscheme_base.c
-! endif
-! ifeq (yes,$(MZSCHEME_PRECISE_GC))
-! DEFINES += -DMZ_PRECISE_GC
-  endif
-  endif
-  
-***************
-*** 473,478 ****
---- 494,502 ----
-  ifdef PERL
-  	-$(DEL) if_perl.c
-  endif
-+ ifdef MZSCHEME
-+ 	-$(DEL) mzscheme_base.c
-+ endif
-  	-$(DEL) pathdef.c
-  	$(MAKE) -C xxd -f Make_cyg.mak clean
-  	$(MAKE) -C GvimExt -f Make_ming.mak clean
-***************
-*** 523,531 ****
---- 547,561 ----
-  $(OUTDIR)/netbeans.o:	netbeans.c $(INCL) $(NBDEBUG_DEP)
-  	$(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
-+ 
-  $(OUTDIR)/vimrc.o:	vim.rc version.h gui_w32_rc.h
-  	$(RC) $(RCFLAGS) vim.rc -o $(OUTDIR)/vimrc.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.247/src/Make_ming.mak	2009-05-26 22:58:43.000000000 +0200
---- src/Make_ming.mak	2009-09-11 11:23:28.000000000 +0200
-***************
-*** 135,141 ****
-  ifndef MZSCHEME_DLLS
-  MZSCHEME_DLLS=$(MZSCHEME)
-  endif
-! MZSCHEME_LIBDIR=-L$(MZSCHEME_DLLS)
-  endif
-  
-  endif
---- 135,141 ----
-  ifndef MZSCHEME_DLLS
-  MZSCHEME_DLLS=$(MZSCHEME)
-  endif
-! MZSCHEME_LIBDIR=-L$(MZSCHEME_DLLS) -L$(MZSCHEME_DLLS)\lib
-  endif
-  
-  endif
-***************
-*** 563,568 ****
---- 563,571 ----
-  ifdef PERL
-  	-$(DEL) if_perl.c
-  endif
-+ ifdef MZSCHEME
-+ 	-$(DEL) mzscheme_base.c
-+ endif
-  	$(MAKE) -C GvimExt -f Make_ming.mak clean
-  	$(MAKE) -C xxd -f Make_cyg.mak clean
-  
-*** ../vim-7.2.247/src/Make_mvc.mak	2009-06-16 16:45:14.000000000 +0200
---- src/Make_mvc.mak	2009-09-11 11:23:28.000000000 +0200
-***************
-*** 865,870 ****
---- 865,871 ----
-  	- if exist dimm_i.c del dimm_i.c
-  	- if exist dimm.tlb del dimm.tlb
-  	- if exist dosinst.exe del dosinst.exe
-+ 	- if exist mzscheme_base.c del mzscheme_base.c
-  	cd xxd
-  	$(MAKE) /NOLOGO -f Make_mvc.mak clean
-  	cd ..
-*** ../vim-7.2.247/src/version.c	2009-09-11 12:20:47.000000000 +0200
---- src/version.c	2009-09-11 12:48:26.000000000 +0200
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     248,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-222. You send more than 20 personal e-mails a 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.249 b/source/ap/vim/patches/7.2.249
deleted file mode 100644
index 33169f77..00000000
--- a/source/ap/vim/patches/7.2.249
+++ /dev/null
@@ -1,47 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.249
-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.249
-Problem:    The script to check .po files can't handle '%' in plural forms.
-Solution:   Remove "Plural-Forms:" from the checked string.
-Files:	    src/po/check.vim
-
-
-*** ../vim-7.2.248/src/po/check.vim	2008-06-09 14:45:38.000000000 +0200
---- src/po/check.vim	2009-09-11 12:37:56.000000000 +0200
-***************
-*** 23,28 ****
---- 23,31 ----
-    " remove '%', not used for formatting.
-    let idline = substitute(idline, "'%'", '', 'g')
-  
-+   " remove '%' used for plural forms.
-+   let idline = substitute(idline, '\\nPlural-Forms: .\+;\\n', '', '')
-+ 
-    " remove everything but % items.
-    return substitute(idline, '[^%]*\(%[-+ #''.0-9*]*l\=[dsuxXpoc%]\)\=', '\1', 'g')
-  endfunc
-*** ../vim-7.2.248/src/version.c	2009-09-11 12:48:56.000000000 +0200
---- src/version.c	2009-09-11 12:59:18.000000000 +0200
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     249,
-  /**/
-
--- 
-If evolution theories are correct, humans will soon grow a third
-hand for operating the mouse.
-
- /// 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.250 b/source/ap/vim/patches/7.2.250
deleted file mode 100644
index 2f30a240..00000000
--- a/source/ap/vim/patches/7.2.250
+++ /dev/null
@@ -1,55 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.250 (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.250 (extra)
-Problem:    Possible buffer overflow.
-Solution:   Compute the remaining space. (Dominique Pelle)
-Files:	    src/GvimExt/gvimext.cpp
-
-
-*** ../vim-7.2.249/src/GvimExt/gvimext.cpp	2008-07-24 20:51:11.000000000 +0200
---- src/GvimExt/gvimext.cpp	2009-09-11 13:26:27.000000000 +0200
-***************
-*** 635,641 ****
-  	}
-  	// Now concatenate
-  	strncpy(temp, _("Edit with existing Vim - "), BUFSIZE - 1);
-! 	strncat(temp, title, BUFSIZE - 1);
-  	InsertMenu(hMenu,
-  		indexMenu++,
-  		MF_STRING|MF_BYPOSITION,
---- 635,643 ----
-  	}
-  	// Now concatenate
-  	strncpy(temp, _("Edit with existing Vim - "), BUFSIZE - 1);
-! 	temp[BUFSIZE - 1] = '\0';
-! 	strncat(temp, title, BUFSIZE - 1 - strlen(temp));
-! 	temp[BUFSIZE - 1] = '\0';
-  	InsertMenu(hMenu,
-  		indexMenu++,
-  		MF_STRING|MF_BYPOSITION,
-*** ../vim-7.2.249/src/version.c	2009-09-11 12:59:57.000000000 +0200
---- src/version.c	2009-09-11 13:23:45.000000000 +0200
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     250,
-  /**/
-
-
--- 
-hundred-and-one symptoms of being an internet addict:
-223. You set up a web-cam as your home's security 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.251 b/source/ap/vim/patches/7.2.251
deleted file mode 100644
index 00cf0f0f..00000000
--- a/source/ap/vim/patches/7.2.251
+++ /dev/null
@@ -1,71 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.251
-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.251 (after 7.2.044)
-Problem:    Compiler adds invalid memory bounds check.
-Solution:   Remove _FORTIFY_SOURCE=2 from CFLAGS. (Dominique Pelle)
-Files:	    src/auto/configure, src/configure.in
-
-
-*** ../vim-7.2.250/src/auto/configure	2009-07-22 11:16:54.000000000 +0200
---- src/auto/configure	2009-08-07 14:49:52.000000000 +0200
-***************
-*** 17135,17141 ****
-        { $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
---- 17135,17141 ----
-        { $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=`echo "$CFLAGS -D_FORTIFY_SOURCE=1" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g' -e 's/-D_FORTIFY_SOURCE=2//g'`
-      { $as_echo "$as_me:$LINENO: result: yes" >&5
-  $as_echo "yes" >&6; }
-    else
-*** ../vim-7.2.250/src/configure.in	2009-07-22 11:16:54.000000000 +0200
---- src/configure.in	2009-08-07 14:49:47.000000000 +0200
-***************
-*** 3233,3239 ****
-    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)
---- 3233,3239 ----
-    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=`echo "$CFLAGS -D_FORTIFY_SOURCE=1" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g' -e 's/-D_FORTIFY_SOURCE=2//g'`
-      AC_MSG_RESULT(yes)
-    else
-      AC_MSG_RESULT(no)
-*** ../vim-7.2.250/src/version.c	2009-09-11 13:26:38.000000000 +0200
---- src/version.c	2009-09-11 13:43:46.000000000 +0200
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     251,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-225. You sign up for free subscriptions for all the computer magazines
-
- /// 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.252 b/source/ap/vim/patches/7.2.252
deleted file mode 100644
index b7dc7022..00000000
--- a/source/ap/vim/patches/7.2.252
+++ /dev/null
@@ -1,51 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.252
-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.252
-Problem:    When using a multi-byte 'enc' the 'iskeyword' option cannot
-	    contain characters above 128.
-Solution:   Use mb_ptr2char_adv().
-Files:	    src/charset.c
-
-
-*** ../vim-7.2.251/src/charset.c	2009-05-14 22:19:19.000000000 +0200
---- src/charset.c	2009-09-09 21:11:46.000000000 +0200
-***************
-*** 174,179 ****
---- 174,184 ----
-  	    if (VIM_ISDIGIT(*p))
-  		c = getdigits(&p);
-  	    else
-+ #ifdef FEAT_MBYTE
-+ 		 if (has_mbyte)
-+ 		c = mb_ptr2char_adv(&p);
-+ 	    else
-+ #endif
-  		c = *p++;
-  	    c2 = -1;
-  	    if (*p == '-' && p[1] != NUL)
-*** ../vim-7.2.251/src/version.c	2009-09-11 13:44:33.000000000 +0200
---- src/version.c	2009-09-11 14:01:48.000000000 +0200
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     252,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-226. You sit down at the computer right after dinner and your spouse
-     says "See you in the morning."
-
- /// 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.253 b/source/ap/vim/patches/7.2.253
deleted file mode 100644
index 354d444d..00000000
--- a/source/ap/vim/patches/7.2.253
+++ /dev/null
@@ -1,143 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.253
-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.253
-Problem:    Netbeans interface: getLength always uses current buffer.
-Solution:   Use ml_get_buf() instead of ml_get(). (Xavier de Gaye)
-Files:	    src/netbeans.c
-
-
-*** ../vim-7.2.252/src/netbeans.c	2009-06-24 16:49:50.000000000 +0200
---- src/netbeans.c	2009-09-11 13:40:14.000000000 +0200
-***************
-*** 1499,1505 ****
-  		    return FAIL;
-  		}
-  		first = *pos;
-! 		nbdebug(("    FIRST POS: line %d, col %d\n", first.lnum, first.col));
-  		pos = off2pos(buf->bufp, off+count-1);
-  		if (!pos)
-  		{
---- 1499,1506 ----
-  		    return FAIL;
-  		}
-  		first = *pos;
-! 		nbdebug(("    FIRST POS: line %d, col %d\n",
-! 						      first.lnum, first.col));
-  		pos = off2pos(buf->bufp, off+count-1);
-  		if (!pos)
-  		{
-***************
-*** 1510,1516 ****
-  		    return FAIL;
-  		}
-  		last = *pos;
-! 		nbdebug(("    LAST POS: line %d, col %d\n", last.lnum, last.col));
-  		del_from_lnum = first.lnum;
-  		del_to_lnum = last.lnum;
-  		doupdate = 1;
---- 1511,1518 ----
-  		    return FAIL;
-  		}
-  		last = *pos;
-! 		nbdebug(("    LAST POS: line %d, col %d\n",
-! 							last.lnum, last.col));
-  		del_from_lnum = first.lnum;
-  		del_to_lnum = last.lnum;
-  		doupdate = 1;
-***************
-*** 1521,1527 ****
-  		next = off2pos(buf->bufp, off + count);
-  
-  		/* Remove part of the first line. */
-! 		if (first.col != 0 || (next != NULL && first.lnum == next->lnum))
-  		{
-  		    if (first.lnum != last.lnum
-  			    || (next != NULL && first.lnum != next->lnum))
---- 1523,1530 ----
-  		next = off2pos(buf->bufp, off + count);
-  
-  		/* Remove part of the first line. */
-! 		if (first.col != 0
-! 				|| (next != NULL && first.lnum == next->lnum))
-  		{
-  		    if (first.lnum != last.lnum
-  			    || (next != NULL && first.lnum != next->lnum))
-***************
-*** 1584,1590 ****
-  			int id = buf_findsign_id(buf->bufp, (linenr_T)i);
-  			if (id > 0)
-  			{
-! 			    nbdebug(("    Deleting sign %d on line %d\n", id, i));
-  			    buf_delsign(buf->bufp, id);
-  			}
-  			else
---- 1587,1594 ----
-  			int id = buf_findsign_id(buf->bufp, (linenr_T)i);
-  			if (id > 0)
-  			{
-! 			    nbdebug(("    Deleting sign %d on line %d\n",
-! 								      id, i));
-  			    buf_delsign(buf->bufp, id);
-  			}
-  			else
-***************
-*** 1593,1599 ****
-  			}
-  		    }
-  
-! 		    nbdebug(("    Deleting lines %d through %d\n", del_from_lnum, del_to_lnum));
-  		    curwin->w_cursor.lnum = del_from_lnum;
-  		    curwin->w_cursor.col = 0;
-  		    del_lines(del_to_lnum - del_from_lnum + 1, FALSE);
---- 1597,1604 ----
-  			}
-  		    }
-  
-! 		    nbdebug(("    Deleting lines %d through %d\n",
-! 						 del_from_lnum, del_to_lnum));
-  		    curwin->w_cursor.lnum = del_from_lnum;
-  		    curwin->w_cursor.col = 0;
-  		    del_lines(del_to_lnum - del_from_lnum + 1, FALSE);
-***************
-*** 3514,3520 ****
-  	    eol_size = 1;
-  	for (lnum = 1; lnum <= bufp->b_ml.ml_line_count; ++lnum)
-  	{
-! 	    char_count += (long)STRLEN(ml_get(lnum)) + eol_size;
-  	    /* Check for a CTRL-C every 100000 characters */
-  	    if (char_count > last_check)
-  	    {
---- 3519,3526 ----
-  	    eol_size = 1;
-  	for (lnum = 1; lnum <= bufp->b_ml.ml_line_count; ++lnum)
-  	{
-! 	    char_count += (long)STRLEN(ml_get_buf(bufp, lnum, FALSE))
-! 								   + eol_size;
-  	    /* Check for a CTRL-C every 100000 characters */
-  	    if (char_count > last_check)
-  	    {
-*** ../vim-7.2.252/src/version.c	2009-09-11 14:02:25.000000000 +0200
---- src/version.c	2009-09-11 14:18:45.000000000 +0200
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     253,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-227. You sleep next to your monitor.  Or on top of 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.254 b/source/ap/vim/patches/7.2.254
deleted file mode 100644
index c8c57aff..00000000
--- a/source/ap/vim/patches/7.2.254
+++ /dev/null
@@ -1,52 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.254
-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.254
-Problem:    Compiler warning for assigning size_t to int.
-Solution:   Use size_t for the variable. (George Reilly)
-Files:	    src/fileio.c
-
-
-*** ../vim-7.2.253/src/fileio.c	2009-07-29 18:24:59.000000000 +0200
---- src/fileio.c	2009-09-11 13:46:19.000000000 +0200
-***************
-*** 4568,4574 ****
-  	    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);
-  	    }
---- 4568,4574 ----
-  	    c = TRUE;
-  	    if (write_info.bw_conv_error_lnum != 0)
-  	    {
-! 		size_t l = STRLEN(IObuff);
-  		vim_snprintf((char *)IObuff + l, IOSIZE - l, _(" in line %ld;"),
-  			(long)write_info.bw_conv_error_lnum);
-  	    }
-*** ../vim-7.2.253/src/version.c	2009-09-11 14:19:41.000000000 +0200
---- src/version.c	2009-09-11 15:03:42.000000000 +0200
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     254,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-230. You spend your Friday nights typing away at your keyboard
-
- /// 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.255 b/source/ap/vim/patches/7.2.255
deleted file mode 100644
index 1bb85b15..00000000
--- a/source/ap/vim/patches/7.2.255
+++ /dev/null
@@ -1,71 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.255
-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.255 (after 7.2.242)
-Problem:    Setting 'rightleft', 'linebreak' and 'wrap' may cause cursor to be
-	    in wrong place.
-Solution:   Recompute the cursor column for these options.
-Files:	    src/option.c
-
-
-*** ../vim-7.2.254/src/option.c	2009-07-29 15:41:32.000000000 +0200
---- src/option.c	2009-09-11 13:59:55.000000000 +0200
-***************
-*** 7430,7435 ****
---- 7430,7437 ----
-      {
-  	if (curwin->w_p_wrap)
-  	    curwin->w_leftcol = 0;
-+ 	if (curwin->w_curswant != MAXCOL)
-+ 	    curwin->w_set_curswant = TRUE;
-      }
-  
-  #ifdef FEAT_WINDOWS
-***************
-*** 7664,7669 ****
---- 7666,7687 ----
-      }
-  #endif
-  
-+ #ifdef FEAT_LINEBREAK
-+     if ((int *)varp == &curwin->w_p_lbr)
-+     {
-+ 	if (curwin->w_curswant != MAXCOL)
-+ 	    curwin->w_set_curswant = TRUE;
-+     }
-+ #endif
-+ 
-+ #ifdef FEAT_RIGHTLEFT
-+     if ((int *)varp == &curwin->w_p_rl)
-+     {
-+ 	if (curwin->w_curswant != MAXCOL)
-+ 	    curwin->w_set_curswant = TRUE;
-+     }
-+ #endif
-+ 
-      /*
-       * End of handling side effects for bool options.
-       */
-*** ../vim-7.2.254/src/version.c	2009-09-11 15:04:13.000000000 +0200
---- src/version.c	2009-09-11 15:19:40.000000000 +0200
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     255,
-  /**/
-
--- 
-A computer without Windows is like a fish without a bicycle.
-
- /// 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.256 b/source/ap/vim/patches/7.2.256
deleted file mode 100644
index 17361fbf..00000000
--- a/source/ap/vim/patches/7.2.256
+++ /dev/null
@@ -1,59 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.256
-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.256
-Problem:    When 'guifont' was not set GTK font dialog doesn't have a default.
-	    (Andreas Metzler)
-Solution:   Set default to DEFAULT_FONT. (James Vega)
-Files:	    src/gui_gtk_x11.c
-
-
-*** ../vim-7.2.255/src/gui_gtk_x11.c	2009-07-01 18:04:30.000000000 +0200
---- src/gui_gtk_x11.c	2009-09-11 14:21:32.000000000 +0200
-***************
-*** 4729,4734 ****
---- 4729,4737 ----
-      if (oldval != NULL && *oldval != NUL)
-  	gtk_font_selection_dialog_set_font_name(
-  		GTK_FONT_SELECTION_DIALOG(gui.fontdlg), (char *)oldval);
-+     else
-+ 	gtk_font_selection_dialog_set_font_name(
-+ 		GTK_FONT_SELECTION_DIALOG(gui.fontdlg), DEFAULT_FONT);
-  
-      if (gui.fontname)
-      {
-***************
-*** 4816,4821 ****
---- 4819,4827 ----
-  	if (oldname != oldval)
-  	    vim_free(oldname);
-      }
-+     else
-+ 	gtk_font_selection_dialog_set_font_name(
-+ 		GTK_FONT_SELECTION_DIALOG(dialog), DEFAULT_FONT);
-  
-      response = gtk_dialog_run(GTK_DIALOG(dialog));
-  
-*** ../vim-7.2.255/src/version.c	2009-09-11 15:20:22.000000000 +0200
---- src/version.c	2009-09-11 15:45:36.000000000 +0200
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     256,
-  /**/
-
--- 
-Get a life?  What is the URL where it can be downloaded?
-
- /// 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.257 b/source/ap/vim/patches/7.2.257
deleted file mode 100644
index a856a3ac..00000000
--- a/source/ap/vim/patches/7.2.257
+++ /dev/null
@@ -1,61 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.257
-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.257
-Problem:    With GTK 2.17 lots of assertion error messages.
-Solution:   Remove check for static gravity. (Sebastian Droege)
-Files:	    src/gui_gtk_f.c
-
-
-*** ../vim-7.2.256/src/gui_gtk_f.c	2009-05-17 23:25:16.000000000 +0200
---- src/gui_gtk_f.c	2009-09-11 15:15:41.000000000 +0200
-***************
-*** 860,870 ****
-  gtk_form_set_static_gravity(GdkWindow *window, gboolean use_static)
-  {
-  #ifdef HAVE_GTK2
-!     gboolean static_gravity_supported;
-! 
-!     static_gravity_supported = gdk_window_set_static_gravities(window,
-! 							       use_static);
-!     g_return_if_fail(static_gravity_supported);
-  #else
-      XSetWindowAttributes xattributes;
-  
---- 860,868 ----
-  gtk_form_set_static_gravity(GdkWindow *window, gboolean use_static)
-  {
-  #ifdef HAVE_GTK2
-!     /* We don't check if static gravity is actually supported, because it
-!      * results in an annoying assertion error message. */
-!     gdk_window_set_static_gravities(window, use_static);
-  #else
-      XSetWindowAttributes xattributes;
-  
-*** ../vim-7.2.256/src/version.c	2009-09-11 15:46:20.000000000 +0200
---- src/version.c	2009-09-11 16:16:52.000000000 +0200
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     257,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-231. You sprinkle Carpet Fresh on the rugs and put your vacuum cleaner
-     in the front doorway permanently so it always looks like you are
-     actually attempting to do something about that mess that has amassed
-     since you discovered the Internet.
-
- /// 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.258 b/source/ap/vim/patches/7.2.258
deleted file mode 100644
index 98ddab58..00000000
--- a/source/ap/vim/patches/7.2.258
+++ /dev/null
@@ -1,74 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.258
-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.258
-Problem:    v:beval_col and b:beval_text are wrong in UTF-8 text. (Tony
-	    Mechelynck)
-Solution:   Use byte number instead of character number for the column.
-Files:	    src/ui.c
-
-
-*** ../vim-7.2.257/src/ui.c	2009-07-01 18:04:30.000000000 +0200
---- src/ui.c	2009-09-11 16:11:50.000000000 +0200
-***************
-*** 3055,3072 ****
-      int		vcol;
-  {
-      /* try to advance to the specified column */
--     int		col = 0;
-      int		count = 0;
-      char_u	*ptr;
-  
-!     ptr = ml_get_buf(wp->w_buffer, lnum, FALSE);
-      while (count <= vcol && *ptr != NUL)
-      {
-- 	++col;
-  	count += win_lbr_chartabsize(wp, ptr, count, NULL);
-  	mb_ptr_adv(ptr);
-      }
-!     return col;
-  }
-  #endif
-  
---- 3055,3071 ----
-      int		vcol;
-  {
-      /* try to advance to the specified column */
-      int		count = 0;
-      char_u	*ptr;
-+     char_u	*start;
-  
-!     start = ptr = ml_get_buf(wp->w_buffer, lnum, FALSE);
-      while (count <= vcol && *ptr != NUL)
-      {
-  	count += win_lbr_chartabsize(wp, ptr, count, NULL);
-  	mb_ptr_adv(ptr);
-      }
-!     return (int)(ptr - start);
-  }
-  #endif
-  
-*** ../vim-7.2.257/src/version.c	2009-09-11 16:17:36.000000000 +0200
---- src/version.c	2009-09-11 16:45:48.000000000 +0200
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     258,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-232. You start conversations with, "Have you gotten an ISDN line?"
-
- /// 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.259 b/source/ap/vim/patches/7.2.259
deleted file mode 100644
index 0bf0ba13..00000000
--- a/source/ap/vim/patches/7.2.259
+++ /dev/null
@@ -1,160 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.259
-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.259
-Problem:    exists() doesn't work properly for an empty aucmd group.
-Solution:   Change how au_exists() handles a missing pattern.  Also add a
-	    test for this. (Bob Hiestand)
-Files:	    src/fileio.c, src/testdir/Makefile, src/testdir/test67.in,
-	    src/testdir/test67.ok
-
-
-*** ../vim-7.2.258/src/fileio.c	2009-09-11 15:04:13.000000000 +0200
---- src/fileio.c	2009-09-11 16:37:08.000000000 +0200
-***************
-*** 9498,9512 ****
-      ap = first_autopat[(int)event];
-      if (ap == NULL)
-  	goto theend;
--     if (pattern == NULL)
--     {
-- 	retval = TRUE;
-- 	goto theend;
--     }
-  
-      /* if pattern is "<buffer>", special handling is needed which uses curbuf */
-      /* for pattern "<buffer=N>, fnamecmp() will work fine */
-!     if (STRICMP(pattern, "<buffer>") == 0)
-  	buflocal_buf = curbuf;
-  
-      /* Check if there is an autocommand with the given pattern. */
---- 9498,9507 ----
-      ap = first_autopat[(int)event];
-      if (ap == NULL)
-  	goto theend;
-  
-      /* if pattern is "<buffer>", special handling is needed which uses curbuf */
-      /* for pattern "<buffer=N>, fnamecmp() will work fine */
-!     if (pattern != NULL && STRICMP(pattern, "<buffer>") == 0)
-  	buflocal_buf = curbuf;
-  
-      /* Check if there is an autocommand with the given pattern. */
-***************
-*** 9515,9523 ****
-  	/* For buffer-local autocommands, fnamecmp() works fine. */
-  	if (ap->pat != NULL && ap->cmds != NULL
-  	    && (group == AUGROUP_ALL || ap->group == group)
-! 	    && (buflocal_buf == NULL
-! 		 ? fnamecmp(ap->pat, pattern) == 0
-! 		 : ap->buflocal_nr == buflocal_buf->b_fnum))
-  	{
-  	    retval = TRUE;
-  	    break;
---- 9510,9519 ----
-  	/* For buffer-local autocommands, fnamecmp() works fine. */
-  	if (ap->pat != NULL && ap->cmds != NULL
-  	    && (group == AUGROUP_ALL || ap->group == group)
-! 	    && (pattern == NULL
-! 		|| (buflocal_buf == NULL
-! 		    ? fnamecmp(ap->pat, pattern) == 0
-! 		    : ap->buflocal_nr == buflocal_buf->b_fnum)))
-  	{
-  	    retval = TRUE;
-  	    break;
-*** ../vim-7.2.258/src/testdir/Makefile	2009-06-24 18:07:55.000000000 +0200
---- src/testdir/Makefile	2009-09-11 16:31:33.000000000 +0200
-***************
-*** 22,28 ****
-  		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
-  
---- 22,28 ----
-  		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 test67.out
-  
-  SCRIPTS_GUI = test16.out
-  
-*** ../vim-7.2.258/src/testdir/test67.in	2009-09-11 17:23:47.000000000 +0200
---- src/testdir/test67.in	2009-09-11 16:43:11.000000000 +0200
-***************
-*** 0 ****
---- 1,33 ----
-+ Test that groups and patterns are tested correctly when calling exists() for
-+ autocommands.
-+ 
-+ STARTTEST
-+ :so small.vim
-+ :let results=[]
-+ :augroup auexists
-+ :augroup END
-+ :call add(results, "##BufEnter: " . exists("##BufEnter"))
-+ :call add(results, "#BufEnter: " . exists("#BufEnter"))
-+ :au BufEnter * let g:entered=1
-+ :call add(results, "#BufEnter: " . exists("#BufEnter"))
-+ :call add(results, "#auexists#BufEnter: " . exists("#auexists#BufEnter"))
-+ :augroup auexists
-+ :au BufEnter * let g:entered=1
-+ :augroup END
-+ :call add(results, "#auexists#BufEnter: " . exists("#auexists#BufEnter"))
-+ :call add(results, "#BufEnter#*.test: " . exists("#BufEnter#*.test"))
-+ :au BufEnter *.test let g:entered=1
-+ :call add(results, "#BufEnter#*.test: " . exists("#BufEnter#*.test"))
-+ :edit testfile.test
-+ :call add(results, "#BufEnter#<buffer>: " . exists("#BufEnter#<buffer>"))
-+ :au BufEnter <buffer> let g:entered=1
-+ :call add(results, "#BufEnter#<buffer>: " . exists("#BufEnter#<buffer>"))
-+ :edit testfile2.test
-+ :call add(results, "#BufEnter#<buffer>: " . exists("#BufEnter#<buffer>"))
-+ :e test.out
-+ :call append(0, results)
-+ :$d
-+ :w
-+ :qa!
-+ ENDTEST
-+ 
-*** ../vim-7.2.258/src/testdir/test67.ok	2009-09-11 17:23:47.000000000 +0200
---- src/testdir/test67.ok	2009-09-11 16:43:15.000000000 +0200
-***************
-*** 0 ****
---- 1,10 ----
-+ ##BufEnter: 1
-+ #BufEnter: 0
-+ #BufEnter: 1
-+ #auexists#BufEnter: 0
-+ #auexists#BufEnter: 1
-+ #BufEnter#*.test: 0
-+ #BufEnter#*.test: 1
-+ #BufEnter#<buffer>: 0
-+ #BufEnter#<buffer>: 1
-+ #BufEnter#<buffer>: 0
-*** ../vim-7.2.258/src/version.c	2009-09-11 16:48:06.000000000 +0200
---- src/version.c	2009-09-11 17:23:14.000000000 +0200
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     259,
-  /**/
-
--- 
-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.260 b/source/ap/vim/patches/7.2.260
deleted file mode 100644
index 46d4365c..00000000
--- a/source/ap/vim/patches/7.2.260
+++ /dev/null
@@ -1,155 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.260 (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.260 (extra part of 7.2.259)
-Problem:    exists() doesn't work properly for empty aucmd group.
-Solution:   Change how au_exists() handles a missing pattern.  Also add a
-	    test for this. (Bob Hiestand)
-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.259/src/testdir/Make_amiga.mak	2009-03-11 16:36:04.000000000 +0100
---- src/testdir/Make_amiga.mak	2009-09-11 16:29:54.000000000 +0200
-***************
-*** 26,32 ****
-  		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
-  
---- 26,32 ----
-  		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 test67.out
-  
-  .SUFFIXES: .in .out
-  
-***************
-*** 112,114 ****
---- 112,115 ----
-  test64.out: test64.in
-  test65.out: test65.in
-  test66.out: test66.in
-+ test67.out: test67.in
-*** ../vim-7.2.259/src/testdir/Make_dos.mak	2009-03-11 16:36:04.000000000 +0100
---- src/testdir/Make_dos.mak	2009-09-11 16:30:17.000000000 +0200
-***************
-*** 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
-  
---- 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 test67.out
-  
-  SCRIPTS32 =	test50.out
-  
-*** ../vim-7.2.259/src/testdir/Make_ming.mak	2009-03-11 16:36:04.000000000 +0100
---- src/testdir/Make_ming.mak	2009-09-11 16:30:37.000000000 +0200
-***************
-*** 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
-  
---- 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 test67.out
-  
-  SCRIPTS32 =	test50.out
-  
-*** ../vim-7.2.259/src/testdir/Make_os2.mak	2009-03-11 16:36:04.000000000 +0100
---- src/testdir/Make_os2.mak	2009-09-11 16:30:52.000000000 +0200
-***************
-*** 26,32 ****
-  		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
-  
---- 26,32 ----
-  		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 test67.out
-  
-  .SUFFIXES: .in .out
-  
-*** ../vim-7.2.259/src/testdir/Make_vms.mms	2009-03-11 16:36:04.000000000 +0100
---- src/testdir/Make_vms.mms	2009-09-11 16:31:06.000000000 +0200
-***************
-*** 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.
---- 4,10 ----
-  # Authors:	Zoltan Arpadffy, <arpadffy@polarhome.com>
-  #		Sandor Kopanyi,  <sandor.kopanyi@mailbox.hu>
-  #
-! # Last change:  2009 Sep 11
-  #
-  # 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.
-***************
-*** 69,75 ****
-  	 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
---- 69,75 ----
-  	 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 test67.out
-  
-  .IFDEF WANT_GUI
-  SCRIPT_GUI = test16.out
-*** ../vim-7.2.259/src/version.c	2009-09-11 17:24:01.000000000 +0200
---- src/version.c	2009-09-18 14:57:05.000000000 +0200
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     260,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-251. You've never seen your closest friends who usually live WAY too far away.
-
- /// 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.261 b/source/ap/vim/patches/7.2.261
deleted file mode 100644
index 4f8e72d7..00000000
--- a/source/ap/vim/patches/7.2.261
+++ /dev/null
@@ -1,83 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.261
-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.261
-Problem:    When deleting lines with a specific folding configuration E38 may
-	    appear. (Shahaf)
-Solution:   When adjusting nested folds for deleted lines take into account
-	    that they don't start at the top of the enclosing fold.
-Files:	    src/fold.c
-
-
-*** ../vim-7.2.260/src/fold.c	2009-01-06 15:01:58.000000000 +0100
---- src/fold.c	2009-09-18 14:43:23.000000000 +0200
-***************
-*** 1607,1617 ****
-  	    }
-  	    else
-  	    {
-- 		/* 2, 3, or 5: need to correct nested folds too */
-- 		foldMarkAdjustRecurse(&fp->fd_nested, line1 - fp->fd_top,
-- 				  line2 - fp->fd_top, amount, amount_after);
-  		if (fp->fd_top < top)
-  		{
-  		    if (last <= line2)
-  		    {
-  			/* 2. fold contains line1, line2 is below fold */
---- 1607,1617 ----
-  	    }
-  	    else
-  	    {
-  		if (fp->fd_top < top)
-  		{
-+ 		    /* 2 or 3: need to correct nested folds too */
-+ 		    foldMarkAdjustRecurse(&fp->fd_nested, line1 - fp->fd_top,
-+ 				  line2 - fp->fd_top, amount, amount_after);
-  		    if (last <= line2)
-  		    {
-  			/* 2. fold contains line1, line2 is below fold */
-***************
-*** 1628,1634 ****
-  		}
-  		else
-  		{
-! 		    /* 5. fold is below line1 and contains line2 */
-  		    if (amount == MAXLNUM)
-  		    {
-  			fp->fd_len -= line2 - fp->fd_top + 1;
---- 1628,1638 ----
-  		}
-  		else
-  		{
-! 		    /* 5. fold is below line1 and contains line2; need to
-! 		     * correct nested folds too */
-! 		    foldMarkAdjustRecurse(&fp->fd_nested, line1 - fp->fd_top,
-! 				  line2 - fp->fd_top, amount,
-! 				  amount_after + (fp->fd_top - top));
-  		    if (amount == MAXLNUM)
-  		    {
-  			fp->fd_len -= line2 - fp->fd_top + 1;
-*** ../vim-7.2.260/src/version.c	2009-09-18 14:58:26.000000000 +0200
---- src/version.c	2009-09-18 15:14:40.000000000 +0200
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     261,
-  /**/
-
--- 
-Emacs is a nice OS - but it lacks a good text editor.
-That's why I am using Vim.  --Anonymous
-
- /// 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.262 b/source/ap/vim/patches/7.2.262
deleted file mode 100644
index dc73c07b..00000000
--- a/source/ap/vim/patches/7.2.262
+++ /dev/null
@@ -1,189 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.262
-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.262
-Problem:    When using custom completion for a user command the pattern string
-	    goes beyond the cursor position. (Hari Krishna Dara)
-Solution:   Truncate the string at the cursor position.
-Files:	    src/ex_getln.c, src/structs.h
-
-
-*** ../vim-7.2.261/src/ex_getln.c	2009-06-24 17:04:40.000000000 +0200
---- src/ex_getln.c	2009-09-18 16:58:16.000000000 +0200
-***************
-*** 3266,3272 ****
-      int		i, j;
-      char_u	*p1;
-      char_u	*p2;
--     int		oldlen;
-      int		difflen;
-      int		v;
-  
---- 3266,3271 ----
-***************
-*** 3291,3297 ****
-      out_flush();
-  
-      i = (int)(xp->xp_pattern - ccline.cmdbuff);
-!     oldlen = ccline.cmdpos - i;
-  
-      if (type == WILD_NEXT || type == WILD_PREV)
-      {
---- 3290,3296 ----
-      out_flush();
-  
-      i = (int)(xp->xp_pattern - ccline.cmdbuff);
-!     xp->xp_pattern_len = ccline.cmdpos - i;
-  
-      if (type == WILD_NEXT || type == WILD_PREV)
-      {
-***************
-*** 3305,3322 ****
-  	/*
-  	 * Translate string into pattern and expand it.
-  	 */
-! 	if ((p1 = addstar(&ccline.cmdbuff[i], oldlen, xp->xp_context)) == NULL)
-  	    p2 = NULL;
-  	else
-  	{
-! 	    p2 = ExpandOne(xp, p1, vim_strnsave(&ccline.cmdbuff[i], oldlen),
-  		    WILD_HOME_REPLACE|WILD_ADD_SLASH|WILD_SILENT|WILD_ESCAPE
-  							      |options, type);
-  	    vim_free(p1);
-  	    /* longest match: make sure it is not shorter (happens with :help */
-  	    if (p2 != NULL && type == WILD_LONGEST)
-  	    {
-! 		for (j = 0; j < oldlen; ++j)
-  		     if (ccline.cmdbuff[i + j] == '*'
-  			     || ccline.cmdbuff[i + j] == '?')
-  			 break;
---- 3304,3323 ----
-  	/*
-  	 * Translate string into pattern and expand it.
-  	 */
-! 	if ((p1 = addstar(xp->xp_pattern, xp->xp_pattern_len,
-! 						     xp->xp_context)) == NULL)
-  	    p2 = NULL;
-  	else
-  	{
-! 	    p2 = ExpandOne(xp, p1,
-! 			 vim_strnsave(&ccline.cmdbuff[i], xp->xp_pattern_len),
-  		    WILD_HOME_REPLACE|WILD_ADD_SLASH|WILD_SILENT|WILD_ESCAPE
-  							      |options, type);
-  	    vim_free(p1);
-  	    /* longest match: make sure it is not shorter (happens with :help */
-  	    if (p2 != NULL && type == WILD_LONGEST)
-  	    {
-! 		for (j = 0; j < xp->xp_pattern_len; ++j)
-  		     if (ccline.cmdbuff[i + j] == '*'
-  			     || ccline.cmdbuff[i + j] == '?')
-  			 break;
-***************
-*** 3331,3337 ****
-  
-      if (p2 != NULL && !got_int)
-      {
-! 	difflen = (int)STRLEN(p2) - oldlen;
-  	if (ccline.cmdlen + difflen > ccline.cmdbufflen - 4)
-  	{
-  	    v = realloc_cmdbuff(ccline.cmdlen + difflen);
---- 3332,3338 ----
-  
-      if (p2 != NULL && !got_int)
-      {
-! 	difflen = (int)STRLEN(p2) - xp->xp_pattern_len;
-  	if (ccline.cmdlen + difflen > ccline.cmdbufflen - 4)
-  	{
-  	    v = realloc_cmdbuff(ccline.cmdlen + difflen);
-***************
-*** 3620,3625 ****
---- 3621,3627 ----
-      expand_T	*xp;
-  {
-      xp->xp_pattern = NULL;
-+     xp->xp_pattern_len = 0;
-      xp->xp_backslash = XP_BS_NONE;
-  #ifndef BACKSLASH_IN_FILENAME
-      xp->xp_shell = FALSE;
-***************
-*** 4311,4318 ****
-      }
-  
-      /* add star to file name, or convert to regexp if not exp. files. */
-!     file_str = addstar(xp->xp_pattern,
-! 			   (int)(str + col - xp->xp_pattern), xp->xp_context);
-      if (file_str == NULL)
-  	return EXPAND_UNSUCCESSFUL;
-  
---- 4313,4320 ----
-      }
-  
-      /* add star to file name, or convert to regexp if not exp. files. */
-!     xp->xp_pattern_len = (int)(str + col - xp->xp_pattern);
-!     file_str = addstar(xp->xp_pattern, xp->xp_pattern_len, xp->xp_context);
-      if (file_str == NULL)
-  	return EXPAND_UNSUCCESSFUL;
-  
-***************
-*** 4781,4787 ****
-  	sprintf((char *)num, "%d", ccline.cmdpos);
-  	args[1] = ccline.cmdbuff;
-      }
-!     args[0] = xp->xp_pattern;
-      args[2] = num;
-  
-      /* Save the cmdline, we don't know what the function may do. */
---- 4783,4789 ----
-  	sprintf((char *)num, "%d", ccline.cmdpos);
-  	args[1] = ccline.cmdbuff;
-      }
-!     args[0] = vim_strnsave(xp->xp_pattern, xp->xp_pattern_len);
-      args[2] = num;
-  
-      /* Save the cmdline, we don't know what the function may do. */
-***************
-*** 4797,4802 ****
---- 4799,4805 ----
-      if (ccline.cmdbuff != NULL)
-  	ccline.cmdbuff[ccline.cmdlen] = keep;
-  
-+     vim_free(args[0]);
-      return ret;
-  }
-  
-*** ../vim-7.2.261/src/structs.h	2009-07-29 12:09:49.000000000 +0200
---- src/structs.h	2009-09-18 15:33:15.000000000 +0200
-***************
-*** 432,437 ****
---- 432,438 ----
-  {
-      int		xp_context;		/* type of expansion */
-      char_u	*xp_pattern;		/* start of item to expand */
-+     int		xp_pattern_len;		/* bytes in xp_pattern before cursor */
-  #if defined(FEAT_USR_CMDS) && defined(FEAT_EVAL) && defined(FEAT_CMDL_COMPL)
-      char_u	*xp_arg;		/* completion function */
-      int		xp_scriptID;		/* SID for completion function */
-*** ../vim-7.2.261/src/version.c	2009-09-18 15:16:37.000000000 +0200
---- src/version.c	2009-09-18 17:23:20.000000000 +0200
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     262,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-252. You vote for foreign officials.
-
- /// 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.263 b/source/ap/vim/patches/7.2.263
deleted file mode 100644
index fdbfa406..00000000
--- a/source/ap/vim/patches/7.2.263
+++ /dev/null
@@ -1,87 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.263
-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.263
-Problem:    GTK2: when using the -geom argument with an offset from the right
-	    edge and the size is smaller than the default, the Vim window is
-	    not positioned properly.
-Solution:   Use another function to set the size. (Vitaly Minko)
-Files:	    src/gui_gtk_x11.c
-
-
-*** ../vim-7.2.262/src/gui_gtk_x11.c	2009-09-11 15:46:20.000000000 +0200
---- src/gui_gtk_x11.c	2009-09-23 15:43:52.000000000 +0200
-***************
-*** 4066,4071 ****
---- 4066,4073 ----
-  {
-      guicolor_T fg_pixel = INVALCOLOR;
-      guicolor_T bg_pixel = INVALCOLOR;
-+     guint		pixel_width;
-+     guint		pixel_height;
-  
-  #ifdef HAVE_GTK2
-      /*
-***************
-*** 4106,4113 ****
-  	unsigned int	w, h;
-  	int		x = 0;
-  	int		y = 0;
-- 	guint		pixel_width;
-- 	guint		pixel_height;
-  
-  	mask = XParseGeometry((char *)gui.geom, &x, &y, &w, &h);
-  
---- 4108,4113 ----
-***************
-*** 4160,4168 ****
-  	}
-      }
-  
-!     gtk_form_set_size(GTK_FORM(gui.formwin),
-! 	    (guint)(gui_get_base_width() + Columns * gui.char_width),
-! 	    (guint)(gui_get_base_height() + Rows * gui.char_height));
-      update_window_manager_hints(0, 0);
-  
-      if (foreground_argument != NULL)
---- 4160,4175 ----
-  	}
-      }
-  
-!     pixel_width = (guint)(gui_get_base_width() + Columns * gui.char_width);
-!     pixel_height = (guint)(gui_get_base_height() + Rows * gui.char_height);
-! #ifdef HAVE_GTK2
-!     /* For GTK2 changing the size of the form widget doesn't cause window
-!      * resizing. */
-!     if (gtk_socket_id == 0) 
-! 	gtk_window_resize(GTK_WINDOW(gui.mainwin), pixel_width, pixel_height);
-! #else
-!     gtk_form_set_size(GTK_FORM(gui.formwin), pixel_width, pixel_height);
-! #endif
-      update_window_manager_hints(0, 0);
-  
-      if (foreground_argument != NULL)
-*** ../vim-7.2.262/src/version.c	2009-09-18 17:24:54.000000000 +0200
---- src/version.c	2009-09-23 17:34:08.000000000 +0200
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     263,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-267. You get an extra phone line so you can get phone calls.
-
- /// 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.264 b/source/ap/vim/patches/7.2.264
deleted file mode 100644
index 808f2916..00000000
--- a/source/ap/vim/patches/7.2.264
+++ /dev/null
@@ -1,168 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.264
-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.264
-Problem:    GTK2: When the Vim window is maximized setting 'columns' or
-	    'lines' doesn't work.
-Solution:   Unmaximize the window before setting the size. (Vitaly Minko)
-Files:	    src/gui.c, src/gui_gtk_x11.c, src/proto/gui_gtk_x11.pro
-
-
-*** ../vim-7.2.263/src/gui.c	2009-07-29 11:10:31.000000000 +0200
---- src/gui.c	2009-09-23 16:28:09.000000000 +0200
-***************
-*** 1386,1391 ****
---- 1386,1395 ----
-      int		min_height;
-      int		screen_w;
-      int		screen_h;
-+ #ifdef HAVE_GTK2
-+     int		un_maximize = mustset;
-+     int         did_adjust = 0;
-+ #endif
-  
-      if (!gui.shell_created)
-  	return;
-***************
-*** 1425,1446 ****
-  	    if (Columns < MIN_COLUMNS)
-  		Columns = MIN_COLUMNS;
-  	    width = Columns * gui.char_width + base_width;
-  	}
-  	if ((direction & RESIZE_VERT) && height > screen_h)
-  	{
-  	    Rows = (screen_h - base_height) / gui.char_height;
-  	    check_shellsize();
-  	    height = Rows * gui.char_height + base_height;
-  	}
-      }
-      gui.num_cols = Columns;
-      gui.num_rows = Rows;
-  
-      min_width = base_width + MIN_COLUMNS * gui.char_width;
-      min_height = base_height + MIN_LINES * gui.char_height;
-! # ifdef FEAT_WINDOWS
-      min_height += tabline_height() * gui.char_height;
-! # endif
-  
-      gui_mch_set_shellsize(width, height, min_width, min_height,
-  					  base_width, base_height, direction);
---- 1429,1475 ----
-  	    if (Columns < MIN_COLUMNS)
-  		Columns = MIN_COLUMNS;
-  	    width = Columns * gui.char_width + base_width;
-+ #ifdef HAVE_GTK2
-+ 	    ++did_adjust;
-+ #endif
-  	}
-  	if ((direction & RESIZE_VERT) && height > screen_h)
-  	{
-  	    Rows = (screen_h - base_height) / gui.char_height;
-  	    check_shellsize();
-  	    height = Rows * gui.char_height + base_height;
-+ #ifdef HAVE_GTK2
-+ 	    ++did_adjust;
-+ #endif
-  	}
-+ #ifdef HAVE_GTK2
-+ 	if (did_adjust == 2 || (width + gui.char_width >= screen_w
-+ 				     && height + gui.char_height >= screen_h))
-+ 	    /* don't unmaximize if at maximum size */
-+ 	    un_maximize = FALSE;
-+ #endif
-      }
-      gui.num_cols = Columns;
-      gui.num_rows = Rows;
-  
-      min_width = base_width + MIN_COLUMNS * gui.char_width;
-      min_height = base_height + MIN_LINES * gui.char_height;
-! #ifdef FEAT_WINDOWS
-      min_height += tabline_height() * gui.char_height;
-! #endif
-! 
-! #ifdef HAVE_GTK2
-!     if (un_maximize)
-!     {
-! 	/* If the window size is smaller than the screen unmaximize the
-! 	 * window, otherwise resizing won't work. */
-! 	gui_mch_get_screen_dimensions(&screen_w, &screen_h);
-! 	if ((width + gui.char_width < screen_w
-! 				   || height + gui.char_height * 2 < screen_h)
-! 		&& gui_mch_maximized())
-! 	    gui_mch_unmaximize();
-!     }
-! #endif
-  
-      gui_mch_set_shellsize(width, height, min_width, min_height,
-  					  base_width, base_height, direction);
-*** ../vim-7.2.263/src/gui_gtk_x11.c	2009-09-23 17:35:17.000000000 +0200
---- src/gui_gtk_x11.c	2009-09-23 15:43:52.000000000 +0200
-***************
-*** 4376,4381 ****
---- 4376,4404 ----
-  #endif
-  #endif /* HAVE_GTK2 */
-  
-+ #if defined(HAVE_GTK2) || defined(PROTO)
-+ /*
-+  * Return TRUE if the main window is maximized.
-+  */
-+     int
-+ gui_mch_maximized()
-+ {
-+     return (gui.mainwin != NULL && gui.mainwin->window != NULL
-+ 	    && (gdk_window_get_state(gui.mainwin->window)
-+ 					       & GDK_WINDOW_STATE_MAXIMIZED));
-+ }
-+ 
-+ /*
-+  * Unmaximize the main window
-+  */
-+     void
-+ gui_mch_unmaximize()
-+ {
-+     if (gui.mainwin != NULL)
-+ 	gtk_window_unmaximize(GTK_WINDOW(gui.mainwin));
-+ }
-+ #endif
-+ 
-  /*
-   * Set the windows size.
-   */
-*** ../vim-7.2.263/src/proto/gui_gtk_x11.pro	2007-05-05 19:18:54.000000000 +0200
---- src/proto/gui_gtk_x11.pro	2009-09-23 15:43:45.000000000 +0200
-***************
-*** 16,21 ****
---- 16,23 ----
-  void gui_mch_exit __ARGS((int rc));
-  int gui_mch_get_winpos __ARGS((int *x, int *y));
-  void gui_mch_set_winpos __ARGS((int x, int y));
-+ int gui_mch_maximized __ARGS((void));
-+ void gui_mch_unmaximize __ARGS((void));
-  void gui_mch_set_shellsize __ARGS((int width, int height, int min_width, int min_height, int base_width, int base_height, int direction));
-  void gui_mch_get_screen_dimensions __ARGS((int *screen_w, int *screen_h));
-  void gui_mch_settitle __ARGS((char_u *title, char_u *icon));
-*** ../vim-7.2.263/src/version.c	2009-09-23 17:35:17.000000000 +0200
---- src/version.c	2009-09-23 18:12:21.000000000 +0200
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     264,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-268. You get up in the morning and go online before getting your 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.265 b/source/ap/vim/patches/7.2.265
deleted file mode 100644
index 46851502..00000000
--- a/source/ap/vim/patches/7.2.265
+++ /dev/null
@@ -1,56 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.265
-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.265
-Problem:    When using ":silent broken" inside try/catch silency may persist.
-	    (dr-dr xp)
-Solution:   Set msg_silent when there is an error and it's bigger than the
-	    saved value.
-Files:	    src/ex_docmd.c
-
-
-*** ../vim-7.2.264/src/ex_docmd.c	2009-07-09 20:13:59.000000000 +0200
---- src/ex_docmd.c	2009-09-30 11:40:53.000000000 +0200
-***************
-*** 2695,2701 ****
-      {
-  	/* 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)
---- 2695,2701 ----
-      {
-  	/* 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)
-  	    msg_silent = save_msg_silent;
-  	emsg_silent -= did_esilent;
-  	if (emsg_silent < 0)
-*** ../vim-7.2.264/src/version.c	2009-09-23 18:14:13.000000000 +0200
---- src/version.c	2009-09-30 13:22:47.000000000 +0200
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     265,
-  /**/
-
--- 
-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.266 b/source/ap/vim/patches/7.2.266
deleted file mode 100644
index 3a5ba774..00000000
--- a/source/ap/vim/patches/7.2.266
+++ /dev/null
@@ -1,244 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.266
-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.266
-Problem:    When an expression abbreviation is triggered, the typed character
-	    is unknown.
-Solution:   Make the typed character available in v:char.
-Files:	    runtime/doc/map.txt, src/eval.c, src/getchar.c, src/ops.c,
-	    src/proto/eval.pro
-
-
-*** ../vim-7.2.265/runtime/doc/map.txt	2008-08-09 19:36:49.000000000 +0200
---- runtime/doc/map.txt	2009-09-23 19:39:19.000000000 +0200
-***************
-*** 224,229 ****
---- 224,233 ----
-  The result of the InsertDot() function will be inserted.  It could check the
-  text before the cursor and start omni completion when some condition is met.
-  
-+ For abbreviations |v:char| is set to the character that was typed to trigger
-+ the abbreviation.  You can use this to decide how to expand the {lhs}.  You
-+ can't change v:char and you should not insert it.
-+ 
-  Be very careful about side effects!  The expression is evaluated while
-  obtaining characters, you may very well make the command dysfunctional.
-  For this reason the following is blocked:
-*** ../vim-7.2.265/src/eval.c	2009-06-03 14:25:47.000000000 +0200
---- src/eval.c	2009-09-23 19:36:32.000000000 +0200
-***************
-*** 18101,18106 ****
---- 18101,18131 ----
-  }
-  
-  /*
-+  * Set v:char to character "c".
-+  */
-+     void
-+ set_vim_var_char(c)
-+     int c;
-+ {
-+ #ifdef FEAT_MBYTE
-+     char_u	buf[MB_MAXBYTES];
-+ #else
-+     char_u	buf[2];
-+ #endif
-+ 
-+ #ifdef FEAT_MBYTE
-+     if (has_mbyte)
-+ 	buf[(*mb_char2bytes)(c, buf)] = NUL;
-+     else
-+ #endif
-+     {
-+ 	buf[0] = c;
-+ 	buf[1] = NUL;
-+     }
-+     set_vim_var_string(VV_CHAR, buf, -1);
-+ }
-+ 
-+ /*
-   * Set v:count to "count" and v:count1 to "count1".
-   * When "set_prevcount" is TRUE first set v:prevcount from v:count.
-   */
-*** ../vim-7.2.265/src/getchar.c	2009-07-14 13:44:43.000000000 +0200
---- src/getchar.c	2009-09-23 19:35:54.000000000 +0200
-***************
-*** 129,135 ****
-  static void	validate_maphash __ARGS((void));
-  static void	showmap __ARGS((mapblock_T *mp, int local));
-  #ifdef FEAT_EVAL
-! static char_u	*eval_map_expr __ARGS((char_u *str));
-  #endif
-  
-  /*
---- 129,135 ----
-  static void	validate_maphash __ARGS((void));
-  static void	showmap __ARGS((mapblock_T *mp, int local));
-  #ifdef FEAT_EVAL
-! static char_u	*eval_map_expr __ARGS((char_u *str, int c));
-  #endif
-  
-  /*
-***************
-*** 2446,2452 ****
-  			    if (tabuf.typebuf_valid)
-  			    {
-  				vgetc_busy = 0;
-! 				s = eval_map_expr(mp->m_str);
-  				vgetc_busy = save_vgetc_busy;
-  			    }
-  			    else
---- 2446,2452 ----
-  			    if (tabuf.typebuf_valid)
-  			    {
-  				vgetc_busy = 0;
-! 				s = eval_map_expr(mp->m_str, NUL);
-  				vgetc_busy = save_vgetc_busy;
-  			    }
-  			    else
-***************
-*** 4367,4375 ****
-  	     * abbreviation, but is not inserted into the input stream.
-  	     */
-  	    j = 0;
-- 					/* special key code, split up */
-  	    if (c != Ctrl_RSB)
-  	    {
-  		if (IS_SPECIAL(c) || c == K_SPECIAL)
-  		{
-  		    tb[j++] = K_SPECIAL;
---- 4367,4375 ----
-  	     * abbreviation, but is not inserted into the input stream.
-  	     */
-  	    j = 0;
-  	    if (c != Ctrl_RSB)
-  	    {
-+ 					/* special key code, split up */
-  		if (IS_SPECIAL(c) || c == K_SPECIAL)
-  		{
-  		    tb[j++] = K_SPECIAL;
-***************
-*** 4398,4404 ****
-  	    }
-  #ifdef FEAT_EVAL
-  	    if (mp->m_expr)
-! 		s = eval_map_expr(mp->m_str);
-  	    else
-  #endif
-  		s = mp->m_str;
---- 4398,4404 ----
-  	    }
-  #ifdef FEAT_EVAL
-  	    if (mp->m_expr)
-! 		s = eval_map_expr(mp->m_str, c);
-  	    else
-  #endif
-  		s = mp->m_str;
-***************
-*** 4434,4441 ****
-   * special characters.
-   */
-      static char_u *
-! eval_map_expr(str)
-      char_u	*str;
-  {
-      char_u	*res;
-      char_u	*p;
---- 4434,4442 ----
-   * special characters.
-   */
-      static char_u *
-! eval_map_expr(str, c)
-      char_u	*str;
-+     int		c;	    /* NUL or typed character for abbreviation */
-  {
-      char_u	*res;
-      char_u	*p;
-***************
-*** 4452,4457 ****
---- 4453,4459 ----
-  #ifdef FEAT_EX_EXTRA
-      ++ex_normal_lock;
-  #endif
-+     set_vim_var_char(c);  /* set v:char to the typed character */
-      save_cursor = curwin->w_cursor;
-      p = eval_to_string(str, NULL, FALSE);
-      --textlock;
-*** ../vim-7.2.265/src/ops.c	2009-07-01 18:04:30.000000000 +0200
---- src/ops.c	2009-09-23 19:11:40.000000000 +0200
-***************
-*** 4473,4483 ****
-      int		use_sandbox = was_set_insecurely((char_u *)"formatexpr",
-  								   OPT_LOCAL);
-      int		r;
-- #ifdef FEAT_MBYTE
--     char_u	buf[MB_MAXBYTES];
-- #else
--     char_u	buf[2];
-- #endif
-  
-      /*
-       * Set v:lnum to the first line number and v:count to the number of lines.
---- 4473,4478 ----
-***************
-*** 4485,4501 ****
-       */
-      set_vim_var_nr(VV_LNUM, lnum);
-      set_vim_var_nr(VV_COUNT, count);
-! 
-! #ifdef FEAT_MBYTE
-!     if (has_mbyte)
-! 	buf[(*mb_char2bytes)(c, buf)] = NUL;
-!     else
-! #endif
-!     {
-! 	buf[0] = c;
-! 	buf[1] = NUL;
-!     }
-!     set_vim_var_string(VV_CHAR, buf, -1);
-  
-      /*
-       * Evaluate the function.
---- 4480,4486 ----
-       */
-      set_vim_var_nr(VV_LNUM, lnum);
-      set_vim_var_nr(VV_COUNT, count);
-!     set_vim_var_char(c);
-  
-      /*
-       * Evaluate the function.
-*** ../vim-7.2.265/src/proto/eval.pro	2008-11-20 16:11:03.000000000 +0100
---- src/proto/eval.pro	2009-09-23 19:36:30.000000000 +0200
-***************
-*** 61,66 ****
---- 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_vim_var_char __ARGS((int c));
-  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));
-*** ../vim-7.2.265/src/version.c	2009-09-30 13:23:57.000000000 +0200
---- src/version.c	2009-09-30 15:11:29.000000000 +0200
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     266,
-  /**/
-
--- 
-Life would be so much easier if we could just look at the source code.
-
- /// 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.267 b/source/ap/vim/patches/7.2.267
deleted file mode 100644
index 6df92c94..00000000
--- a/source/ap/vim/patches/7.2.267
+++ /dev/null
@@ -1,47 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.267
-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.267
-Problem:    Crash for narrow window and double-width character.
-Solution:   Check for zero width.  (Taro Muraoka)
-Files:	    src/charset.c
-
-
-*** ../vim-7.2.266/src/charset.c	2009-09-11 14:02:25.000000000 +0200
---- src/charset.c	2009-10-07 16:17:27.000000000 +0200
-***************
-*** 1218,1223 ****
---- 1218,1225 ----
-      if ((int)vcol == width1 - 1)
-  	return TRUE;
-      width2 = width1 + win_col_off2(wp);
-+     if (width2 <= 0)
-+ 	return FALSE;
-      return ((vcol - width1) % width2 == width2 - 1);
-  }
-  #endif /* FEAT_MBYTE */
-*** ../vim-7.2.266/src/version.c	2009-09-30 15:15:33.000000000 +0200
---- src/version.c	2009-10-07 16:19:05.000000000 +0200
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     267,
-  /**/
-
--- 
-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.268 b/source/ap/vim/patches/7.2.268
deleted file mode 100644
index 89c50b04..00000000
--- a/source/ap/vim/patches/7.2.268
+++ /dev/null
@@ -1,80 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.268
-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.268
-Problem:    Crash when using Python to set cursor beyond end of line.
-	    (winterTTr)
-Solution:   Check the column to be valid.
-Files:	    src/if_python.c
-
-
-*** ../vim-7.2.267/src/if_python.c	2009-07-09 20:06:30.000000000 +0200
---- src/if_python.c	2009-10-10 14:49:10.000000000 +0200
-***************
-*** 2058,2063 ****
---- 2058,2064 ----
-      {
-  	long lnum;
-  	long col;
-+ 	long len;
-  
-  	if (!PyArg_Parse(val, "(ll)", &lnum, &col))
-  	    return -1;
-***************
-*** 2072,2081 ****
-  	if (VimErrorCheck())
-  	    return -1;
-  
-! 	/* NO CHECK ON COLUMN - SEEMS NOT TO MATTER */
-  
-  	this->win->w_cursor.lnum = lnum;
-  	this->win->w_cursor.col = col;
-  	update_screen(VALID);
-  
-  	return 0;
---- 2073,2088 ----
-  	if (VimErrorCheck())
-  	    return -1;
-  
-! 	/* When column is out of range silently correct it. */
-! 	len = STRLEN(ml_get_buf(this->win->w_buffer, lnum, FALSE));
-! 	if (col > len)
-! 	    col = len;
-  
-  	this->win->w_cursor.lnum = lnum;
-  	this->win->w_cursor.col = col;
-+ #ifdef FEAT_VIRTUALEDIT
-+ 	this->win->w_cursor.coladd = 0;
-+ #endif
-  	update_screen(VALID);
-  
-  	return 0;
-*** ../vim-7.2.267/src/version.c	2009-10-07 16:19:52.000000000 +0200
---- src/version.c	2009-11-03 11:42:08.000000000 +0100
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     268,
-  /**/
-
--- 
-VOICE OVER: As the horrendous Black Beast lunged forward, escape for Arthur
-            and his knights seemed hopeless,  when, suddenly ... the animator
-            suffered a fatal heart attack.
-ANIMATOR:   Aaaaagh!
-VOICE OVER: The cartoon peril was no more ... The Quest for Holy Grail could
-            continue.
-                 "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.269 b/source/ap/vim/patches/7.2.269
deleted file mode 100644
index ec15f454..00000000
--- a/source/ap/vim/patches/7.2.269
+++ /dev/null
@@ -1,261 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.269
-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.269
-Problem:    Many people struggle to find out why Vim startup is slow.
-Solution:   Add the --startuptime command line flag.
-Files:	    runtime/doc/starting.txt, src/globals.h, src/feature.h,
-	    src/main.c, src/macros.h
-
-
-*** ../vim-7.2.268/runtime/doc/starting.txt	2008-11-09 13:43:25.000000000 +0100
---- runtime/doc/starting.txt	2009-10-25 11:57:51.000000000 +0100
-***************
-*** 144,149 ****
---- 144,156 ----
-  			-u NORC			no		    yes
-  			--noplugin		yes		    no
-  
-+ --startuptime={fname}					*--startuptime*
-+ 		During startup write timing messages to the file {fname}.
-+ 		This can be used to find out where time is spent while loading
-+ 		your .vimrc and plugins.
-+ 		When {fname} already exists new messages are appended.
-+ 		{only when compiled with this feature}
-+ 
-  							*--literal*
-  --literal	Take file names literally, don't expand wildcards.  Not needed
-  		for Unix, because Vim always takes file names literally (the
-***************
-*** 471,476 ****
---- 487,493 ----
-  		window title and copy/paste using the X clipboard.  This
-  		avoids a long startup time when running Vim in a terminal
-  		emulator and the connection to the X server is slow.
-+ 		See |--startuptime| to find out if affects you.
-  		Only makes a difference on Unix or VMS, when compiled with the
-  		|+X11| feature.  Otherwise it's ignored.
-  		To disable the connection only for specific terminals, see the
-*** ../vim-7.2.268/src/globals.h	2009-07-29 12:09:49.000000000 +0200
---- src/globals.h	2009-10-10 15:14:31.000000000 +0200
-***************
-*** 1567,1572 ****
---- 1567,1576 ----
-  /* For undo we need to know the lowest time possible. */
-  EXTERN time_t starttime;
-  
-+ #ifdef STARTUPTIME
-+ EXTERN FILE *time_fd INIT(= NULL);  /* where to write startup timing */
-+ #endif
-+ 
-  /*
-   * 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
-*** ../vim-7.2.268/src/feature.h	2008-11-09 13:43:25.000000000 +0100
---- src/feature.h	2009-10-10 16:16:19.000000000 +0200
-***************
-*** 844,853 ****
-  /* #define DEBUG */
-  
-  /*
-!  * STARTUPTIME		Time the startup process.  Writes a "vimstartup" file
-!  *			with timestamps.
-   */
-! /* #define STARTUPTIME "vimstartup" */
-  
-  /*
-   * MEM_PROFILE		Debugging of memory allocation and freeing.
---- 844,857 ----
-  /* #define DEBUG */
-  
-  /*
-!  * STARTUPTIME		Time the startup process.  Writes a file with
-!  *			timestamps.
-   */
-! #if defined(FEAT_NORMAL) \
-! 	&& ((defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H)) \
-! 		|| defined(WIN3264))
-! # define STARTUPTIME 1
-! #endif
-  
-  /*
-   * MEM_PROFILE		Debugging of memory allocation and freeing.
-*** ../vim-7.2.268/src/main.c	2009-05-26 22:58:43.000000000 +0200
---- src/main.c	2009-10-10 16:18:32.000000000 +0200
-***************
-*** 130,139 ****
-  #endif
-  
-  
-- #ifdef STARTUPTIME
-- static FILE *time_fd = NULL;
-- #endif
-- 
-  /*
-   * Different types of error messages.
-   */
---- 130,135 ----
-***************
-*** 173,178 ****
---- 169,177 ----
-      char_u	*fname = NULL;		/* file name from command line */
-      mparm_T	params;			/* various parameters passed between
-  					 * main() and other functions. */
-+ #ifdef STARTUPTIME
-+     int		i;
-+ #endif
-  
-      /*
-       * Do any system-specific initialisations.  These can NOT use IObuff or
-***************
-*** 203,210 ****
-  #endif
-  
-  #ifdef STARTUPTIME
-!     time_fd = mch_fopen(STARTUPTIME, "a");
-!     TIME_MSG("--- VIM STARTING ---");
-  #endif
-      starttime = time(NULL);
-  
---- 202,216 ----
-  #endif
-  
-  #ifdef STARTUPTIME
-!     for (i = 1; i < argc; ++i)
-!     {
-! 	if (STRNICMP(argv[i], "--startuptime=", 14) == 0)
-! 	{
-! 	    time_fd = mch_fopen(argv[i] + 14, "a");
-! 	    TIME_MSG("--- VIM STARTING ---");
-! 	    break;
-! 	}
-!     }
-  #endif
-      starttime = time(NULL);
-  
-***************
-*** 1150,1155 ****
---- 1156,1173 ----
-  	    cursor_on();
-  
-  	    do_redraw = FALSE;
-+ 
-+ #ifdef STARTUPTIME
-+ 	    /* Now that we have drawn the first screen all the startup stuff
-+ 	     * has been done, close any file for startup messages. */
-+ 	    if (time_fd != NULL)
-+ 	    {
-+ 		TIME_MSG("first screen update");
-+ 		TIME_MSG("--- VIM STARTED ---");
-+ 		fclose(time_fd);
-+ 		time_fd = NULL;
-+ 	    }
-+ #endif
-  	}
-  #ifdef FEAT_GUI
-  	if (need_mouse_correct)
-***************
-*** 1743,1748 ****
---- 1761,1770 ----
-  		    /* already processed, skip */
-  		}
-  #endif
-+ 		else if (STRNICMP(argv[0] + argv_idx, "startuptime", 11) == 0)
-+ 		{
-+ 		    /* already processed, skip */
-+ 		}
-  		else
-  		{
-  		    if (argv[0][argv_idx])
-***************
-*** 3211,3216 ****
---- 3233,3252 ----
-  
-  static struct timeval	prev_timeval;
-  
-+ # ifdef WIN3264
-+ /*
-+  * Windows doesn't have gettimeofday(), although it does have struct timeval.
-+  */
-+     static int
-+ gettimeofday(struct timeval *tv, char *dummy)
-+ {
-+     long t = clock();
-+     tv->tv_sec = t / CLOCKS_PER_SEC;
-+     tv->tv_usec = (t - tv->tv_sec * CLOCKS_PER_SEC) * 1000000 / CLOCKS_PER_SEC;
-+     return 0;
-+ }
-+ # endif
-+ 
-  /*
-   * Save the previous time before doing something that could nest.
-   * set "*tv_rel" to the time elapsed so far.
-***************
-*** 3299,3318 ****
-      }
-  }
-  
-- # ifdef WIN3264
-- /*
--  * Windows doesn't have gettimeofday(), although it does have struct timeval.
--  */
--     int
-- gettimeofday(struct timeval *tv, char *dummy)
-- {
--     long t = clock();
--     tv->tv_sec = t / CLOCKS_PER_SEC;
--     tv->tv_usec = (t - tv->tv_sec * CLOCKS_PER_SEC) * 1000000 / CLOCKS_PER_SEC;
--     return 0;
-- }
-- # endif
-- 
-  #endif
-  
-  #if defined(FEAT_CLIENTSERVER) || defined(PROTO)
---- 3335,3340 ----
-*** ../vim-7.2.268/src/macros.h	2009-05-17 13:30:58.000000000 +0200
---- src/macros.h	2009-10-10 15:19:07.000000000 +0200
-***************
-*** 243,249 ****
-  #endif
-  
-  #ifdef STARTUPTIME
-! # define TIME_MSG(s) time_msg(s, NULL)
-  #else
-  # define TIME_MSG(s)
-  #endif
---- 243,249 ----
-  #endif
-  
-  #ifdef STARTUPTIME
-! # define TIME_MSG(s) { if (time_fd != NULL) time_msg(s, NULL); }
-  #else
-  # define TIME_MSG(s)
-  #endif
-*** ../vim-7.2.268/src/version.c	2009-11-03 11:43:05.000000000 +0100
---- src/version.c	2009-11-03 12:06:31.000000000 +0100
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     269,
-  /**/
-
--- 
-BEDEVERE: Look!  It's the old man from scene 24 - what's he Doing here?
-ARTHUR:   He is the keeper of the Bridge.  He asks each traveler five
-          questions ...
-GALAHAD:  Three questions.
-                 "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.270 b/source/ap/vim/patches/7.2.270
deleted file mode 100644
index 7ad6458f..00000000
--- a/source/ap/vim/patches/7.2.270
+++ /dev/null
@@ -1,72 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.270
-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.270
-Problem:    Using ":@c" when the c register contains a CR causes the rest to
-	    be executed later. (Dexter Douglas)
-Solution:   Don't check for typeahead to start with ':', keep executing
-	    commands until all added typeahead has been used.
-Files:	    src/ex_docmd.c
-
-
-*** ../vim-7.2.269/src/ex_docmd.c	2009-09-30 13:23:57.000000000 +0200
---- src/ex_docmd.c	2009-10-28 12:06:54.000000000 +0100
-***************
-*** 8358,8363 ****
---- 8358,8364 ----
-      exarg_T	*eap;
-  {
-      int		c;
-+     int		prev_len = typebuf.tb_len;
-  
-      curwin->w_cursor.lnum = eap->line2;
-  
-***************
-*** 8383,8393 ****
-  
-  	/*
-  	 * Execute from the typeahead buffer.
-! 	 * Originally this didn't check for the typeahead buffer to be empty,
-! 	 * thus could read more Ex commands from stdin.  It's not clear why,
-! 	 * it is certainly unexpected.
-  	 */
-! 	while ((!stuff_empty() || typebuf.tb_len > 0) && vpeekc() == ':')
-  	    (void)do_cmdline(NULL, getexline, NULL, DOCMD_NOWAIT|DOCMD_VERBOSE);
-  
-  	exec_from_reg = save_efr;
---- 8384,8393 ----
-  
-  	/*
-  	 * Execute from the typeahead buffer.
-! 	 * Continue until the stuff buffer is empty and all added characters
-! 	 * have been consumed.
-  	 */
-! 	while (!stuff_empty() || typebuf.tb_len > prev_len)
-  	    (void)do_cmdline(NULL, getexline, NULL, DOCMD_NOWAIT|DOCMD_VERBOSE);
-  
-  	exec_from_reg = save_efr;
-*** ../vim-7.2.269/src/version.c	2009-11-03 12:10:39.000000000 +0100
---- src/version.c	2009-11-03 12:32:47.000000000 +0100
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     270,
-  /**/
-
--- 
-To the optimist, the glass is half full.
-To the pessimist, the glass is half empty.
-To the engineer, the glass is twice as big as it needs to be.
-
- /// 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.271 b/source/ap/vim/patches/7.2.271
deleted file mode 100644
index 07427981..00000000
--- a/source/ap/vim/patches/7.2.271
+++ /dev/null
@@ -1,92 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.271
-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.271
-Problem:    Using freed memory in Motif GUI version when making a choice.
-Solution:   Free memory only after using it. (Dominique Pelle)
-Files:	    src/gui_xmdlg.c
-
-
-*** ../vim-7.2.270/src/gui_xmdlg.c	2009-05-21 23:25:38.000000000 +0200
---- src/gui_xmdlg.c	2009-10-28 21:56:15.000000000 +0100
-***************
-*** 10,16 ****
-  /*
-   * (C) 2001,2005 by Marcin Dalecki <martin@dalecki.de>
-   *
-!  * Implementation of dialogue functions for the Motif GUI variant.
-   *
-   * Note about Lesstif: Apparently lesstif doesn't get the widget layout right,
-   * when using a dynamic scrollbar policy.
---- 10,16 ----
-  /*
-   * (C) 2001,2005 by Marcin Dalecki <martin@dalecki.de>
-   *
-!  * Implementation of dialog functions for the Motif GUI variant.
-   *
-   * Note about Lesstif: Apparently lesstif doesn't get the widget layout right,
-   * when using a dynamic scrollbar policy.
-***************
-*** 633,648 ****
-  	data->sel[which] = XtNewString(sel);
-      else
-      {
-- 	XtFree(data->sel[which]);
-  	if (!strcmp(data->sel[which], sel))
-  	{
-  	    /* unselecting current selection */
-  	    data->sel[which] = NULL;
-  	    if (w)
-  		XmListDeselectItem(w, call_data->item);
-  	}
-  	else
-  	    data->sel[which] = XtNewString(sel);
-      }
-      XtFree(sel);
-  
---- 633,651 ----
-  	data->sel[which] = XtNewString(sel);
-      else
-      {
-  	if (!strcmp(data->sel[which], sel))
-  	{
-  	    /* unselecting current selection */
-+ 	    XtFree(data->sel[which]);
-  	    data->sel[which] = NULL;
-  	    if (w)
-  		XmListDeselectItem(w, call_data->item);
-  	}
-  	else
-+ 	{
-+ 	    XtFree(data->sel[which]);
-  	    data->sel[which] = XtNewString(sel);
-+ 	}
-      }
-      XtFree(sel);
-  
-*** ../vim-7.2.270/src/version.c	2009-11-03 12:38:50.000000000 +0100
---- src/version.c	2009-11-03 12:48:26.000000000 +0100
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     271,
-  /**/
-
--- 
-ROBIN:  (warily) And if you get a question wrong?
-ARTHUR: You are cast into the Gorge of Eternal Peril.
-ROBIN:  Oh ... wacho!
-                 "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.272 b/source/ap/vim/patches/7.2.272
deleted file mode 100644
index 22bebbcc..00000000
--- a/source/ap/vim/patches/7.2.272
+++ /dev/null
@@ -1,82 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.272
-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.272
-Problem:    "_.svz" is not recognized as a swap file. (David M. Besonen)
-Solution:   Accept .s[uvw][a-z] as a swap file name extension.
-Files:	    src/memline.c
-
-
-*** ../vim-7.2.271/src/memline.c	2009-04-22 15:56:27.000000000 +0200
---- src/memline.c	2009-10-29 20:55:08.000000000 +0100
-***************
-*** 864,884 ****
-      recoverymode = TRUE;
-      called_from_main = (curbuf->b_ml.ml_mfp == NULL);
-      attr = hl_attr(HLF_E);
-! /*
-!  * If the file name ends in ".sw?" we use it directly.
-!  * Otherwise a search is done to find the swap file(s).
-!  */
-      fname = curbuf->b_fname;
-      if (fname == NULL)		    /* When there is no file name */
-  	fname = (char_u *)"";
-      len = (int)STRLEN(fname);
-      if (len >= 4 &&
-  #if defined(VMS) || defined(RISCOS)
-! 	    STRNICMP(fname + len - 4, "_sw" , 3)
-  #else
-! 	    STRNICMP(fname + len - 4, ".sw" , 3)
-  #endif
-! 		== 0)
-      {
-  	directly = TRUE;
-  	fname = vim_strsave(fname); /* make a copy for mf_open() */
---- 864,887 ----
-      recoverymode = TRUE;
-      called_from_main = (curbuf->b_ml.ml_mfp == NULL);
-      attr = hl_attr(HLF_E);
-! 
-!     /*
-!      * If the file name ends in ".s[uvw][a-z]" we assume this is the swap file.
-!      * Otherwise a search is done to find the swap file(s).
-!      */
-      fname = curbuf->b_fname;
-      if (fname == NULL)		    /* When there is no file name */
-  	fname = (char_u *)"";
-      len = (int)STRLEN(fname);
-      if (len >= 4 &&
-  #if defined(VMS) || defined(RISCOS)
-! 	    STRNICMP(fname + len - 4, "_s" , 2)
-  #else
-! 	    STRNICMP(fname + len - 4, ".s" , 2)
-  #endif
-! 		== 0
-! 		&& vim_strchr((char_u *)"UVWuvw", fname[len - 2]) != NULL
-! 		&& ASCII_ISALPHA(fname[len - 1]))
-      {
-  	directly = TRUE;
-  	fname = vim_strsave(fname); /* make a copy for mf_open() */
-*** ../vim-7.2.271/src/version.c	2009-11-03 12:53:44.000000000 +0100
---- src/version.c	2009-11-03 13:02:51.000000000 +0100
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     272,
-  /**/
-
--- 
-Sorry, no fortune 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.273 b/source/ap/vim/patches/7.2.273
deleted file mode 100644
index ac00afaa..00000000
--- a/source/ap/vim/patches/7.2.273
+++ /dev/null
@@ -1,130 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.273
-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.273
-Problem:    Crash with redir to unknown array. (Christian Brabandt)
-Solution:   Don't assign the redir result when there was an error.
-Files:	    src/eval.c
-
-
-*** ../vim-7.2.272/src/eval.c	2009-09-30 15:15:33.000000000 +0200
---- src/eval.c	2009-11-03 12:05:07.000000000 +0100
-***************
-*** 988,1000 ****
-      int		err;
-      typval_T	tv;
-  
-!     /* Make sure a valid variable name is specified */
-      if (!eval_isnamec1(*name))
-      {
-  	EMSG(_(e_invarg));
-  	return FAIL;
-      }
-  
-      redir_varname = vim_strsave(name);
-      if (redir_varname == NULL)
-  	return FAIL;
---- 988,1001 ----
-      int		err;
-      typval_T	tv;
-  
-!     /* Catch a bad name early. */
-      if (!eval_isnamec1(*name))
-      {
-  	EMSG(_(e_invarg));
-  	return FAIL;
-      }
-  
-+     /* Make a copy of the name, it is used in redir_lval until redir ends. */
-      redir_varname = vim_strsave(name);
-      if (redir_varname == NULL)
-  	return FAIL;
-***************
-*** 1019,1024 ****
---- 1020,1026 ----
-  	    EMSG(_(e_trailing));
-  	else
-  	    EMSG(_(e_invarg));
-+ 	redir_endp = NULL;  /* don't store a value, only cleanup */
-  	var_redir_stop();
-  	return FAIL;
-      }
-***************
-*** 1037,1042 ****
---- 1039,1045 ----
-      did_emsg |= save_emsg;
-      if (err)
-      {
-+ 	redir_endp = NULL;  /* don't store a value, only cleanup */
-  	var_redir_stop();
-  	return FAIL;
-      }
-***************
-*** 1085,1090 ****
---- 1088,1094 ----
-  
-  /*
-   * Stop redirecting command output to a variable.
-+  * Frees the allocated memory.
-   */
-      void
-  var_redir_stop()
-***************
-*** 1093,1106 ****
-  
-      if (redir_lval != NULL)
-      {
-! 	/* Append the trailing NUL. */
-! 	ga_append(&redir_ga, NUL);
-  
-! 	/* Assign the text to the variable. */
-! 	tv.v_type = VAR_STRING;
-! 	tv.vval.v_string = redir_ga.ga_data;
-! 	set_var_lval(redir_lval, redir_endp, &tv, FALSE, (char_u *)".");
-! 	vim_free(tv.vval.v_string);
-  
-  	clear_lval(redir_lval);
-  	vim_free(redir_lval);
---- 1097,1114 ----
-  
-      if (redir_lval != NULL)
-      {
-! 	/* If there was no error: assign the text to the variable. */
-! 	if (redir_endp != NULL)
-! 	{
-! 	    ga_append(&redir_ga, NUL);  /* Append the trailing NUL. */
-! 	    tv.v_type = VAR_STRING;
-! 	    tv.vval.v_string = redir_ga.ga_data;
-! 	    set_var_lval(redir_lval, redir_endp, &tv, FALSE, (char_u *)".");
-! 	}
-  
-! 	/* free the collected output */
-! 	vim_free(redir_ga.ga_data);
-! 	redir_ga.ga_data = NULL;
-  
-  	clear_lval(redir_lval);
-  	vim_free(redir_lval);
-*** ../vim-7.2.272/src/version.c	2009-11-03 13:06:03.000000000 +0100
---- src/version.c	2009-11-03 14:24:06.000000000 +0100
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     273,
-  /**/
-
--- 
-Permission is granted to read this message out aloud on Kings Cross Road,
-London, under the condition that the orator is properly dressed.
-
- /// 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.274 b/source/ap/vim/patches/7.2.274
deleted file mode 100644
index 809cedcf..00000000
--- a/source/ap/vim/patches/7.2.274
+++ /dev/null
@@ -1,130 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.274
-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.274
-Problem:    Syntax folding doesn't work properly when adding a comment.
-Solution:   Fix it and add a test. (Lech Lorens)
-Files:	    src/fold.c, src/testdir/test45.in, src/testdir/test45.ok
-
-
-*** ../vim-7.2.273/src/fold.c	2009-09-18 15:16:37.000000000 +0200
---- src/fold.c	2009-11-03 12:36:37.000000000 +0100
-***************
-*** 2256,2261 ****
---- 2256,2295 ----
-  	}
-      }
-  
-+     /*
-+      * If folding is defined by the syntax, it is possible that a change in
-+      * one line will cause all sub-folds of the current fold to change (e.g.,
-+      * closing a C-style comment can cause folds in the subsequent lines to
-+      * appear). To take that into account we should adjust the value of "bot"
-+      * to point to the end of the current fold:
-+      */
-+     if (foldlevelSyntax == getlevel)
-+     {
-+ 	garray_T *gap = &wp->w_folds;
-+ 	fold_T	 *fp = NULL;
-+ 	int	  current_fdl = 0;
-+ 	linenr_T  fold_start_lnum = 0;
-+ 	linenr_T  lnum_rel = fline.lnum;
-+ 
-+ 	while (current_fdl < fline.lvl)
-+ 	{
-+ 	    if (!foldFind(gap, lnum_rel, &fp))
-+ 		break;
-+ 	    ++current_fdl;
-+ 
-+ 	    fold_start_lnum += fp->fd_top;
-+ 	    gap = &fp->fd_nested;
-+ 	    lnum_rel -= fp->fd_top;
-+ 	}
-+ 	if (fp != NULL && current_fdl == fline.lvl)
-+ 	{
-+ 	    linenr_T fold_end_lnum = fold_start_lnum + fp->fd_len;
-+ 
-+ 	    if (fold_end_lnum > bot)
-+ 		bot = fold_end_lnum;
-+ 	}
-+     }
-+ 
-      start = fline.lnum;
-      end = bot;
-      /* Do at least one line. */
-*** ../vim-7.2.273/src/testdir/test45.in	2007-09-25 17:58:43.000000000 +0200
---- src/testdir/test45.in	2009-11-03 12:22:38.000000000 +0100
-***************
-*** 28,36 ****
-  k:call append("$", foldlevel("."))
-  :" test syntax folding
-  :set fdm=syntax fdl=0
-! :syn region Hup start="dd" end="hh" fold
-  Gzk:call append("$", "folding " . getline("."))
-  k:call append("$", getline("."))
-  :" test expression folding
-  :fun Flvl()
-    let l = getline(v:lnum)
---- 28,41 ----
-  k:call append("$", foldlevel("."))
-  :" test syntax folding
-  :set fdm=syntax fdl=0
-! :syn region Hup start="dd" end="ii" fold contains=Fd1,Fd2,Fd3
-! :syn region Fd1 start="ee" end="ff" fold contained
-! :syn region Fd2 start="gg" end="hh" fold contained
-! :syn region Fd3 start="commentstart" end="commentend" fold contained
-  Gzk:call append("$", "folding " . getline("."))
-  k:call append("$", getline("."))
-+ jAcommentstart  Acommentend:set fdl=1
-+ 3j:call append("$", getline("."))
-  :" test expression folding
-  :fun Flvl()
-    let l = getline(v:lnum)
-*** ../vim-7.2.273/src/testdir/test45.ok	2004-06-13 17:47:37.000000000 +0200
---- src/testdir/test45.ok	2009-11-03 12:22:50.000000000 +0100
-***************
-*** 8,15 ****
-  0
-  indent 2
-  1
-! folding 8 hh
-      3 cc
-  expr 2
-  1
-  2
---- 8,16 ----
-  0
-  indent 2
-  1
-! folding 9 ii
-      3 cc
-+ 7 gg
-  expr 2
-  1
-  2
-*** ../vim-7.2.273/src/version.c	2009-11-03 14:26:29.000000000 +0100
---- src/version.c	2009-11-03 14:44:21.000000000 +0100
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     274,
-  /**/
-
--- 
-BRIDGEKEEPER: What is your favorite colour?
-LAUNCELOT:    Blue.
-BRIDGEKEEPER: Right.  Off you go.
-                 "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.275 b/source/ap/vim/patches/7.2.275
deleted file mode 100644
index c6c63264..00000000
--- a/source/ap/vim/patches/7.2.275
+++ /dev/null
@@ -1,95 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.275
-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.275
-Problem:    Warning for unused argument and comparing signed and unsigned.
-Solution:   Add type cast.
-Files:	    src/memline.c
-
-
-*** ../vim-7.2.274/src/memline.c	2009-11-03 13:06:03.000000000 +0100
---- src/memline.c	2009-10-29 20:55:08.000000000 +0100
-***************
-*** 1285,1291 ****
-  		    for (i = 0; i < dp->db_line_count; ++i)
-  		    {
-  			txt_start = (dp->db_index[i] & DB_INDEX_MASK);
-! 			if (txt_start <= HEADER_SIZE
-  					  || txt_start >= (int)dp->db_txt_end)
-  			{
-  			    p = (char_u *)"???";
---- 1285,1291 ----
-  		    for (i = 0; i < dp->db_line_count; ++i)
-  		    {
-  			txt_start = (dp->db_index[i] & DB_INDEX_MASK);
-! 			if (txt_start <= (int)HEADER_SIZE
-  					  || txt_start >= (int)dp->db_txt_end)
-  			{
-  			    p = (char_u *)"???";
-***************
-*** 1296,1302 ****
-  			ml_append(lnum++, p, (colnr_T)0, TRUE);
-  		    }
-  		    if (has_error)
-! 			ml_append(lnum++, (char_u *)_("???END"), (colnr_T)0, TRUE);
-  		}
-  	    }
-  	}
---- 1296,1303 ----
-  			ml_append(lnum++, p, (colnr_T)0, TRUE);
-  		    }
-  		    if (has_error)
-! 			ml_append(lnum++, (char_u *)_("???END"),
-! 							    (colnr_T)0, TRUE);
-  		}
-  	    }
-  	}
-***************
-*** 3576,3586 ****
-   * Make swap file name out of the file name and a directory name.
-   * Returns pointer to allocated memory or NULL.
-   */
-- /*ARGSUSED*/
-      char_u *
-  makeswapname(fname, ffname, buf, dir_name)
-      char_u	*fname;
-!     char_u	*ffname;
-      buf_T	*buf;
-      char_u	*dir_name;
-  {
---- 3577,3586 ----
-   * Make swap file name out of the file name and a directory name.
-   * Returns pointer to allocated memory or NULL.
-   */
-      char_u *
-  makeswapname(fname, ffname, buf, dir_name)
-      char_u	*fname;
-!     char_u	*ffname UNUSED;
-      buf_T	*buf;
-      char_u	*dir_name;
-  {
-*** ../vim-7.2.274/src/version.c	2009-11-03 14:46:35.000000000 +0100
---- src/version.c	2009-11-03 15:28:33.000000000 +0100
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     275,
-  /**/
-
--- 
-BRIDGEKEEPER: What is your favorite colour?
-GAWAIN:       Blue ...  No yelloooooww!
-                 "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.276 b/source/ap/vim/patches/7.2.276
deleted file mode 100644
index 15dc68b0..00000000
--- a/source/ap/vim/patches/7.2.276
+++ /dev/null
@@ -1,63 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.276
-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.276
-Problem:    Crash when setting 'isprint' to a small bullet. (Raul Coronado)
-Solution:   Check for the character to be < 256.  Also make it possible to
-	    specify a range of multi-byte characters. (Lech Lorens)
-Files:	    src/charset.c
-
-
-*** ../vim-7.2.275/src/charset.c	2009-10-07 16:19:52.000000000 +0200
---- src/charset.c	2009-11-03 12:46:12.000000000 +0100
-***************
-*** 187,195 ****
-  		if (VIM_ISDIGIT(*p))
-  		    c2 = getdigits(&p);
-  		else
-  		    c2 = *p++;
-  	    }
-! 	    if (c <= 0 || (c2 < c && c2 != -1) || c2 >= 256
-  						 || !(*p == NUL || *p == ','))
-  		return FAIL;
-  
---- 187,200 ----
-  		if (VIM_ISDIGIT(*p))
-  		    c2 = getdigits(&p);
-  		else
-+ #ifdef FEAT_MBYTE
-+ 		     if (has_mbyte)
-+ 		    c2 = mb_ptr2char_adv(&p);
-+ 		else
-+ #endif
-  		    c2 = *p++;
-  	    }
-! 	    if (c <= 0 || c >= 256 || (c2 < c && c2 != -1) || c2 >= 256
-  						 || !(*p == NUL || *p == ','))
-  		return FAIL;
-  
-*** ../vim-7.2.275/src/version.c	2009-11-03 15:32:58.000000000 +0100
---- src/version.c	2009-11-03 16:03:18.000000000 +0100
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     276,
-  /**/
-
--- 
-BRIDGEKEEPER: What is your favorite editor?
-GAWAIN:       Emacs ...  No, Viiiiiiiiiiimmmmmmm!
-           "Monty Python and the Holy editor wars" PYTHON (MONTY) SOFTWARE 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.277 b/source/ap/vim/patches/7.2.277
deleted file mode 100644
index ed3caf4d..00000000
--- a/source/ap/vim/patches/7.2.277
+++ /dev/null
@@ -1,66 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.277
-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.277
-Problem:    CTRL-Y in a diff'ed window may move the cursor outside of the
-	    window. (Lech Lorens)
-Solution:   Limit the number of filler lines to the height of the window.
-	    Don't reset filler lines to zero for an empty buffer.
-Files:	    src/move.c
-
-
-*** ../vim-7.2.276/src/move.c	2009-05-15 21:31:11.000000000 +0200
---- src/move.c	2009-11-03 14:39:55.000000000 +0100
-***************
-*** 183,191 ****
-  	if (curwin->w_topline != 1)
-  	    redraw_later(NOT_VALID);
-  	curwin->w_topline = 1;
-- #ifdef FEAT_DIFF
-- 	curwin->w_topfill = 0;
-- #endif
-  	curwin->w_botline = 2;
-  	curwin->w_valid |= VALID_BOTLINE|VALID_BOTLINE_AP;
-  #ifdef FEAT_SCROLLBIND
---- 183,188 ----
-***************
-*** 1257,1263 ****
-      while (line_count-- > 0)
-      {
-  #ifdef FEAT_DIFF
-! 	if (curwin->w_topfill < diff_check(curwin, curwin->w_topline))
-  	{
-  	    ++curwin->w_topfill;
-  	    ++done;
---- 1254,1261 ----
-      while (line_count-- > 0)
-      {
-  #ifdef FEAT_DIFF
-! 	if (curwin->w_topfill < diff_check(curwin, curwin->w_topline)
-! 		&& curwin->w_topfill < curwin->w_height - 1)
-  	{
-  	    ++curwin->w_topfill;
-  	    ++done;
-*** ../vim-7.2.276/src/version.c	2009-11-03 16:03:59.000000000 +0100
---- src/version.c	2009-11-03 16:22:04.000000000 +0100
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     277,
-  /**/
-
--- 
-SIGFUN -- signature too funny (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.278 b/source/ap/vim/patches/7.2.278
deleted file mode 100644
index edf4e58a..00000000
--- a/source/ap/vim/patches/7.2.278
+++ /dev/null
@@ -1,74 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.278
-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.278
-Problem:    Using magic number in the folding code.
-Solution:   Use the defined MAX_LEVEL.
-Files:	    src/fold.c
-
-
-*** ../vim-7.2.277/src/fold.c	2009-11-03 14:46:35.000000000 +0100
---- src/fold.c	2009-11-03 12:36:37.000000000 +0100
-***************
-*** 1932,1938 ****
-  #ifdef FEAT_EVAL
-      if (*wp->w_p_fdt != NUL)
-      {
-! 	char_u	dashes[51];
-  	win_T	*save_curwin;
-  	int	level;
-  	char_u	*p;
---- 1932,1938 ----
-  #ifdef FEAT_EVAL
-      if (*wp->w_p_fdt != NUL)
-      {
-! 	char_u	dashes[MAX_LEVEL + 2];
-  	win_T	*save_curwin;
-  	int	level;
-  	char_u	*p;
-***************
-*** 1944,1951 ****
-  	/* Set "v:folddashes" to a string of "level" dashes. */
-  	/* Set "v:foldlevel" to "level". */
-  	level = foldinfo->fi_level;
-! 	if (level > 50)
-! 	    level = 50;
-  	vim_memset(dashes, '-', (size_t)level);
-  	dashes[level] = NUL;
-  	set_vim_var_string(VV_FOLDDASHES, dashes, -1);
---- 1944,1951 ----
-  	/* Set "v:folddashes" to a string of "level" dashes. */
-  	/* Set "v:foldlevel" to "level". */
-  	level = foldinfo->fi_level;
-! 	if (level > (int)sizeof(dashes) - 1)
-! 	    level = (int)sizeof(dashes) - 1;
-  	vim_memset(dashes, '-', (size_t)level);
-  	dashes[level] = NUL;
-  	set_vim_var_string(VV_FOLDDASHES, dashes, -1);
-*** ../vim-7.2.277/src/version.c	2009-11-03 16:22:59.000000000 +0100
---- src/version.c	2009-11-03 16:29:08.000000000 +0100
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     278,
-  /**/
-
--- 
-BRIDGEKEEPER: What is the air-speed velocity of an unladen swallow?
-ARTHUR:       What do you mean?  An African or European swallow?
-BRIDGEKEEPER: Er ...  I don't know that ... Aaaaarrrrrrggghhh!
-   BRIDGEKEEPER is cast into the gorge.
-                 "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.279 b/source/ap/vim/patches/7.2.279
deleted file mode 100644
index bdf58fc8..00000000
--- a/source/ap/vim/patches/7.2.279
+++ /dev/null
@@ -1,120 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.279
-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.279
-Problem:    Invalid memory read with visual mode "r". (Dominique Pelle)
-Solution:   Make sure the cursor position is valid.  Don't check the cursor
-	    position but the position being used.  And make sure we get the
-	    right line.
-Files:	    src/misc2.c, src/ops.c
-
-
-*** ../vim-7.2.278/src/misc2.c	2009-05-16 21:06:36.000000000 +0200
---- src/misc2.c	2009-11-03 16:43:10.000000000 +0100
-***************
-*** 156,162 ****
-  		    || ((ve_flags & VE_ONEMORE) && wcol < MAXCOL)
-  #endif
-  		    ;
-!     line = ml_get_curline();
-  
-      if (wcol >= MAXCOL)
-      {
---- 156,162 ----
-  		    || ((ve_flags & VE_ONEMORE) && wcol < MAXCOL)
-  #endif
-  		    ;
-!     line = ml_get_buf(curbuf, pos->lnum, FALSE);
-  
-      if (wcol >= MAXCOL)
-      {
-***************
-*** 332,340 ****
-  #endif
-  
-  #ifdef FEAT_MBYTE
-!     /* prevent cursor from moving on the trail byte */
-      if (has_mbyte)
-! 	mb_adjust_cursor();
-  #endif
-  
-      if (col < wcol)
---- 332,340 ----
-  #endif
-  
-  #ifdef FEAT_MBYTE
-!     /* prevent from moving onto a trail byte */
-      if (has_mbyte)
-! 	mb_adjustpos(pos);
-  #endif
-  
-      if (col < wcol)
-*** ../vim-7.2.278/src/ops.c	2009-09-30 15:15:33.000000000 +0200
---- src/ops.c	2009-11-03 15:18:50.000000000 +0100
-***************
-*** 2020,2025 ****
---- 2020,2026 ----
-  	bd.is_MAX = (curwin->w_curswant == MAXCOL);
-  	for ( ; curwin->w_cursor.lnum <= oap->end.lnum; ++curwin->w_cursor.lnum)
-  	{
-+ 	    curwin->w_cursor.col = 0;  /* make sure cursor position is valid */
-  	    block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE);
-  	    if (bd.textlen == 0 && (!virtual_op || bd.is_MAX))
-  		continue;	    /* nothing to replace */
-***************
-*** 2035,2040 ****
---- 2036,2042 ----
-  	    {
-  		pos_T vpos;
-  
-+ 		vpos.lnum = curwin->w_cursor.lnum;
-  		getvpos(&vpos, oap->start_vcol);
-  		bd.startspaces += vpos.coladd;
-  		n = bd.startspaces;
-***************
-*** 2693,2703 ****
-  			 * initial coladd offset as part of "startspaces" */
-  			if (bd.is_short)
-  			{
-! 			    linenr_T lnum = curwin->w_cursor.lnum;
-! 
-! 			    curwin->w_cursor.lnum = linenr;
-  			    (void)getvpos(&vpos, oap->start_vcol);
-- 			    curwin->w_cursor.lnum = lnum;
-  			}
-  			else
-  			    vpos.coladd = 0;
---- 2695,2702 ----
-  			 * initial coladd offset as part of "startspaces" */
-  			if (bd.is_short)
-  			{
-! 			    vpos.lnum = linenr;
-  			    (void)getvpos(&vpos, oap->start_vcol);
-  			}
-  			else
-  			    vpos.coladd = 0;
-*** ../vim-7.2.278/src/version.c	2009-11-03 16:29:48.000000000 +0100
---- src/version.c	2009-11-03 16:41:53.000000000 +0100
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     279,
-  /**/
-
--- 
-BEDEVERE: How do you know so much about swallows?
-ARTHUR:   Well you have to know these things when you're a king, you know.
-                 "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.280 b/source/ap/vim/patches/7.2.280
deleted file mode 100644
index 6223ac45..00000000
--- a/source/ap/vim/patches/7.2.280
+++ /dev/null
@@ -1,251 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.280
-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.280
-Problem:    A redraw in a custom statusline with %! may cause a crash.
-            (Yukihiro Nakadaira)
-Solution:   Make a copy of 'statusline'.  Also fix typo in function name
-            redraw_custum_statusline. (party by Dominique Pelle)
-Files:      src/screen.c
-
-
-*** ../vim-7.2.279/src/screen.c	2009-07-29 16:13:35.000000000 +0200
---- src/screen.c	2009-11-03 17:13:16.000000000 +0100
-***************
-*** 132,138 ****
-  static void draw_vsep_win __ARGS((win_T *wp, int row));
-  #endif
-  #ifdef FEAT_STL_OPT
-! static void redraw_custum_statusline __ARGS((win_T *wp));
-  #endif
-  #ifdef FEAT_SEARCH_EXTRA
-  #define SEARCH_HL_PRIORITY 0
---- 132,138 ----
-  static void draw_vsep_win __ARGS((win_T *wp, int row));
-  #endif
-  #ifdef FEAT_STL_OPT
-! static void redraw_custom_statusline __ARGS((win_T *wp));
-  #endif
-  #ifdef FEAT_SEARCH_EXTRA
-  #define SEARCH_HL_PRIORITY 0
-***************
-*** 5772,5778 ****
-      else if (*p_stl != NUL || *wp->w_p_stl != NUL)
-      {
-  	/* redraw custom status line */
-! 	redraw_custum_statusline(wp);
-      }
-  #endif
-      else
---- 5794,5800 ----
-      else if (*p_stl != NUL || *wp->w_p_stl != NUL)
-      {
-  	/* redraw custom status line */
-! 	redraw_custom_statusline(wp);
-      }
-  #endif
-      else
-***************
-*** 5897,5914 ****
-   * errors encountered.
-   */
-      static void
-! redraw_custum_statusline(wp)
-      win_T	    *wp;
-  {
-!     int	save_called_emsg = called_emsg;
-  
-      called_emsg = FALSE;
-      win_redr_custom(wp, FALSE);
-      if (called_emsg)
-  	set_string_option_direct((char_u *)"statusline", -1,
-  		(char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL
-  					? OPT_LOCAL : OPT_GLOBAL), SID_ERROR);
-      called_emsg |= save_called_emsg;
-  }
-  #endif
-  
---- 5919,5949 ----
-   * errors encountered.
-   */
-      static void
-! redraw_custom_statusline(wp)
-      win_T	    *wp;
-  {
-!     static int	    entered = FALSE;
-!     int		    save_called_emsg = called_emsg;
-! 
-!     /* When called recursively return.  This can happen when the statusline
-!      * contains an expression that triggers a redraw. */
-!     if (entered)
-! 	return;
-!     entered = TRUE;
-  
-      called_emsg = FALSE;
-      win_redr_custom(wp, FALSE);
-      if (called_emsg)
-+     {
-+ 	/* When there is an error disable the statusline, otherwise the
-+ 	 * display is messed up with errors and a redraw triggers the problem
-+ 	 * again and again. */
-  	set_string_option_direct((char_u *)"statusline", -1,
-  		(char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL
-  					? OPT_LOCAL : OPT_GLOBAL), SID_ERROR);
-+     }
-      called_emsg |= save_called_emsg;
-+     entered = FALSE;
-  }
-  #endif
-  
-***************
-*** 6016,6021 ****
---- 6051,6057 ----
-      int		len;
-      int		fillchar;
-      char_u	buf[MAXPATHL];
-+     char_u	*stl;
-      char_u	*p;
-      struct	stl_hlrec hltab[STL_MAX_ITEM];
-      struct	stl_hlrec tabtab[STL_MAX_ITEM];
-***************
-*** 6025,6031 ****
-      if (wp == NULL)
-      {
-  	/* Use 'tabline'.  Always at the first line of the screen. */
-! 	p = p_tal;
-  	row = 0;
-  	fillchar = ' ';
-  	attr = hl_attr(HLF_TPF);
---- 6061,6067 ----
-      if (wp == NULL)
-      {
-  	/* Use 'tabline'.  Always at the first line of the screen. */
-! 	stl = p_tal;
-  	row = 0;
-  	fillchar = ' ';
-  	attr = hl_attr(HLF_TPF);
-***************
-*** 6042,6058 ****
-  
-  	if (draw_ruler)
-  	{
-! 	    p = p_ruf;
-  	    /* advance past any leading group spec - implicit in ru_col */
-! 	    if (*p == '%')
-  	    {
-! 		if (*++p == '-')
-! 		    p++;
-! 		if (atoi((char *) p))
-! 		    while (VIM_ISDIGIT(*p))
-! 			p++;
-! 		if (*p++ != '(')
-! 		    p = p_ruf;
-  	    }
-  #ifdef FEAT_VERTSPLIT
-  	    col = ru_col - (Columns - W_WIDTH(wp));
---- 6078,6094 ----
-  
-  	if (draw_ruler)
-  	{
-! 	    stl = p_ruf;
-  	    /* advance past any leading group spec - implicit in ru_col */
-! 	    if (*stl == '%')
-  	    {
-! 		if (*++stl == '-')
-! 		    stl++;
-! 		if (atoi((char *)stl))
-! 		    while (VIM_ISDIGIT(*stl))
-! 			stl++;
-! 		if (*stl++ != '(')
-! 		    stl = p_ruf;
-  	    }
-  #ifdef FEAT_VERTSPLIT
-  	    col = ru_col - (Columns - W_WIDTH(wp));
-***************
-*** 6081,6089 ****
-  	else
-  	{
-  	    if (*wp->w_p_stl != NUL)
-! 		p = wp->w_p_stl;
-  	    else
-! 		p = p_stl;
-  # ifdef FEAT_EVAL
-  	    use_sandbox = was_set_insecurely((char_u *)"statusline",
-  					 *wp->w_p_stl == NUL ? 0 : OPT_LOCAL);
---- 6117,6125 ----
-  	else
-  	{
-  	    if (*wp->w_p_stl != NUL)
-! 		stl = wp->w_p_stl;
-  	    else
-! 		stl = p_stl;
-  # ifdef FEAT_EVAL
-  	    use_sandbox = was_set_insecurely((char_u *)"statusline",
-  					 *wp->w_p_stl == NUL ? 0 : OPT_LOCAL);
-***************
-*** 6098,6107 ****
-      if (maxwidth <= 0)
-  	return;
-  
-      width = build_stl_str_hl(wp == NULL ? curwin : wp,
-  				buf, sizeof(buf),
-! 				p, use_sandbox,
-  				fillchar, maxwidth, hltab, tabtab);
-      len = (int)STRLEN(buf);
-  
-      while (width < maxwidth && len < (int)sizeof(buf) - 1)
---- 6134,6147 ----
-      if (maxwidth <= 0)
-  	return;
-  
-+     /* Make a copy, because the statusline may include a function call that
-+      * might change the option value and free the memory. */
-+     stl = vim_strsave(stl);
-      width = build_stl_str_hl(wp == NULL ? curwin : wp,
-  				buf, sizeof(buf),
-! 				stl, use_sandbox,
-  				fillchar, maxwidth, hltab, tabtab);
-+     vim_free(stl);
-      len = (int)STRLEN(buf);
-  
-      while (width < maxwidth && len < (int)sizeof(buf) - 1)
-***************
-*** 9465,9471 ****
-  #if defined(FEAT_STL_OPT) && defined(FEAT_WINDOWS)
-      if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height)
-      {
-! 	redraw_custum_statusline(curwin);
-      }
-      else
-  #endif
---- 9505,9511 ----
-  #if defined(FEAT_STL_OPT) && defined(FEAT_WINDOWS)
-      if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height)
-      {
-! 	redraw_custom_statusline(curwin);
-      }
-      else
-  #endif
-*** ../vim-7.2.279/src/version.c	2009-11-03 16:44:04.000000000 +0100
---- src/version.c	2009-11-03 17:15:35.000000000 +0100
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     280,
-  /**/
-
--- 
-Every exit is an entrance into something else.
-
- /// 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.281 b/source/ap/vim/patches/7.2.281
deleted file mode 100644
index f73d7a54..00000000
--- a/source/ap/vim/patches/7.2.281
+++ /dev/null
@@ -1,81 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.281
-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.281
-Problem:    'cursorcolumn' highlighting is wrong in diff mode.
-Solution:   Adjust the column computation. (Lech Lorens)
-Files:	    src/screen.c
-
-
-*** ../vim-7.2.280/src/screen.c	2009-11-03 17:20:18.000000000 +0100
---- src/screen.c	2009-11-03 17:13:16.000000000 +0100
-***************
-*** 3008,3018 ****
-  	    mb_ptr_adv(ptr);
-  	}
-  
-! #ifdef FEAT_VIRTUALEDIT
-! 	/* When 'virtualedit' is set the end of the line may be before the
-! 	 * start of the displayed part. */
-! 	if (vcol < v && *ptr == NUL && virtual_active())
-  	    vcol = v;
-  #endif
-  
-  	/* Handle a character that's not completely on the screen: Put ptr at
---- 3008,3040 ----
-  	    mb_ptr_adv(ptr);
-  	}
-  
-! #if defined(FEAT_SYN_HL) || defined(FEAT_VIRTUALEDIT) || defined(FEAT_VISUAL)
-! 	/* When:
-! 	 * - 'cuc' is set, or
-! 	 * - 'virtualedit' is set, or
-! 	 * - the visual mode is active,
-! 	 * the end of the line may be before the start of the displayed part.
-! 	 */
-! 	if (vcol < v && (
-! # ifdef FEAT_SYN_HL
-! 	     wp->w_p_cuc
-! #  if defined(FEAT_VIRTUALEDIT) || defined(FEAT_VISUAL)
-! 	     ||
-! #  endif
-! # endif
-! # ifdef FEAT_VIRTUALEDIT
-! 	     virtual_active()
-! #  ifdef FEAT_VISUAL
-! 	     ||
-! #  endif
-! # endif
-! # ifdef FEAT_VISUAL
-! 	     (VIsual_active && wp->w_buffer == curwin->w_buffer)
-! # endif
-! 	     ))
-! 	{
-  	    vcol = v;
-+ 	}
-  #endif
-  
-  	/* Handle a character that's not completely on the screen: Put ptr at
-*** ../vim-7.2.280/src/version.c	2009-11-03 17:20:18.000000000 +0100
---- src/version.c	2009-11-03 17:34:54.000000000 +0100
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     281,
-  /**/
-
--- 
-Every person is responsible for the choices he makes.
-
- /// 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.282 b/source/ap/vim/patches/7.2.282
deleted file mode 100644
index dd4dc647..00000000
--- a/source/ap/vim/patches/7.2.282
+++ /dev/null
@@ -1,47 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.282
-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.282
-Problem:    A fold can't be closed.
-Solution:   Initialize fd_small to MAYBE. (Lech Lorens)
-Files:	    src/fold.c
-
-
-*** ../vim-7.2.281/src/fold.c	2009-11-03 16:29:48.000000000 +0100
---- src/fold.c	2009-11-03 17:41:50.000000000 +0100
-***************
-*** 2851,2856 ****
---- 2851,2858 ----
-      fp[1].fd_top = bot + 1;
-      fp[1].fd_len = fp->fd_len - (fp[1].fd_top - fp->fd_top);
-      fp[1].fd_flags = fp->fd_flags;
-+     fp[1].fd_small = MAYBE;
-+     fp->fd_small = MAYBE;
-  
-      /* Move nested folds below bot to new fold.  There can't be
-       * any between top and bot, they have been removed by the caller. */
-*** ../vim-7.2.281/src/version.c	2009-11-03 17:36:09.000000000 +0100
---- src/version.c	2009-11-03 17:59:12.000000000 +0100
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     282,
-  /**/
-
--- 
-You can be stopped by the police for biking over 65 miles per hour.
-You are not allowed to walk across a street on your hands.
-		[real standing laws in Connecticut, 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.283 b/source/ap/vim/patches/7.2.283
deleted file mode 100644
index 0d6f6058..00000000
--- a/source/ap/vim/patches/7.2.283
+++ /dev/null
@@ -1,73 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.283
-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.283
-Problem:    Changing font while the window is maximized doesn't keep the
-	    window maximized.
-Solution:   Recompute number of lines and columns after changing font. (James
-	    Vega)
-Files:	    src/gui_gtk_x11.c
-
-
-*** ../vim-7.2.282/src/gui_gtk_x11.c	2009-09-23 18:14:13.000000000 +0200
---- src/gui_gtk_x11.c	2009-11-03 17:56:27.000000000 +0100
-***************
-*** 5267,5274 ****
-  # endif
-  #endif /* !HAVE_GTK2 */
-  
-!     /* Preserve the logical dimensions of the screen. */
-!     update_window_manager_hints(0, 0);
-  
-      return OK;
-  }
---- 5267,5290 ----
-  # endif
-  #endif /* !HAVE_GTK2 */
-  
-! #ifdef HAVE_GTK2
-!     if (gui_mch_maximized())
-!     {
-! 	int w, h;
-! 
-! 	/* Update lines and columns in accordance with the new font, keep the
-! 	 * window maximized. */
-! 	gtk_window_get_size(GTK_WINDOW(gui.mainwin), &w, &h);
-! 	w -= get_menu_tool_width();
-! 	h -= get_menu_tool_height();
-! 	gui_resize_shell(w, h);
-!     }
-!     else
-! #endif
-!     {
-! 	/* Preserve the logical dimensions of the screen. */
-! 	update_window_manager_hints(0, 0);
-!     }
-  
-      return OK;
-  }
-*** ../vim-7.2.282/src/version.c	2009-11-03 18:04:26.000000000 +0100
---- src/version.c	2009-11-03 18:11:53.000000000 +0100
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     283,
-  /**/
-
--- 
-If an elephant is left tied to a parking meter, the parking fee has to be paid
-just as it would for a vehicle.
-		[real standing law in Florida, 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.284 b/source/ap/vim/patches/7.2.284
deleted file mode 100644
index 5b4336b1..00000000
--- a/source/ap/vim/patches/7.2.284
+++ /dev/null
@@ -1,52 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.284
-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.284
-Problem:    When editing the same buffer in two windows, one with folding,
-	    display may be wrong after changes.
-Solution:   Call set_topline() to take care of side effects. (Lech Lorens)
-Files:	    src/misc1.c
-
-
-*** ../vim-7.2.283/src/misc1.c	2009-07-22 11:03:38.000000000 +0200
---- src/misc1.c	2009-11-03 18:38:15.000000000 +0100
-***************
-*** 2886,2891 ****
---- 2886,2898 ----
-  		    }
-  #endif
-  		}
-+ 
-+ #ifdef FEAT_FOLDING
-+ 	    /* Take care of side effects for setting w_topline when folds have
-+ 	     * changed.  Esp. when the buffer was changed in another window. */
-+ 	    if (hasAnyFolding(wp))
-+ 		set_topline(wp, wp->w_topline);
-+ #endif
-  	}
-      }
-  
-*** ../vim-7.2.283/src/version.c	2009-11-03 18:13:36.000000000 +0100
---- src/version.c	2009-11-03 18:44:12.000000000 +0100
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     284,
-  /**/
-
--- 
-Men may not be seen publicly in any kind of strapless gown.
-		[real standing law in Florida, 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.285 b/source/ap/vim/patches/7.2.285
deleted file mode 100644
index 2a34e17e..00000000
--- a/source/ap/vim/patches/7.2.285
+++ /dev/null
@@ -1,56 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.285
-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.285 (after 7.2.169)
-Problem:    CTRL-U in Insert mode also deletes indent. (Andrey Voropaev)
-Solution:   Fix mistake made in patch 7.2.169.
-Files:	    src/edit.c
-
-
-*** ../vim-7.2.284/src/edit.c	2009-07-09 18:15:19.000000000 +0200
---- src/edit.c	2009-11-05 20:25:15.000000000 +0100
-***************
-*** 8519,8525 ****
-  	{
-  	    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;
-  	}
---- 8519,8525 ----
-  	{
-  	    save_col = curwin->w_cursor.col;
-  	    beginline(BL_WHITE);
-! 	    if (curwin->w_cursor.col < save_col)
-  		mincol = curwin->w_cursor.col;
-  	    curwin->w_cursor.col = save_col;
-  	}
-*** ../vim-7.2.284/src/version.c	2009-11-03 18:46:53.000000000 +0100
---- src/version.c	2009-11-11 13:21:25.000000000 +0100
-***************
-*** 678,679 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     285,
-  /**/
-
--- 
-(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.286 b/source/ap/vim/patches/7.2.286
deleted file mode 100644
index 7577502f..00000000
--- a/source/ap/vim/patches/7.2.286
+++ /dev/null
@@ -1,227 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.286
-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.286 (after 7.2.269)
-Problem:    The "--startuptime=<file>" argument is not consistent with other
-	    arguments.
-Solution:   Use "--startuptime <file>".  Added the +startuptime feature.
-Files:	    runtime/doc/eval.txt, runtime/doc/starting.txt,
-	    runtime/doc/various.txt, src/eval.c, src/main.c, src/version.c
-
-
-*** ../vim-7.2.285/runtime/doc/eval.txt	2009-04-22 12:53:31.000000000 +0200
---- runtime/doc/eval.txt	2009-11-11 13:01:58.000000000 +0100
-***************
-*** 5869,5874 ****
---- 5881,5887 ----
-  signs			Compiled with |:sign| support.
-  smartindent		Compiled with 'smartindent' support.
-  sniff			Compiled with SNiFF interface support.
-+ startuptime		Compiled with |--startuptime| support.
-  statusline		Compiled with support for 'statusline', 'rulerformat'
-  			and special formats of 'titlestring' and 'iconstring'.
-  sun_workshop		Compiled with support for Sun |workshop|.
-*** ../vim-7.2.285/runtime/doc/starting.txt	2009-11-03 12:10:39.000000000 +0100
---- runtime/doc/starting.txt	2009-11-11 13:20:56.000000000 +0100
-***************
-*** 144,155 ****
-  			-u NORC			no		    yes
-  			--noplugin		yes		    no
-  
-! --startuptime={fname}					*--startuptime*
-  		During startup write timing messages to the file {fname}.
-  		This can be used to find out where time is spent while loading
-! 		your .vimrc and plugins.
-  		When {fname} already exists new messages are appended.
-! 		{only when compiled with this feature}
-  
-  							*--literal*
-  --literal	Take file names literally, don't expand wildcards.  Not needed
---- 144,156 ----
-  			-u NORC			no		    yes
-  			--noplugin		yes		    no
-  
-! --startuptime {fname}					*--startuptime*
-  		During startup write timing messages to the file {fname}.
-  		This can be used to find out where time is spent while loading
-! 		your .vimrc, plugins and opening the first file.
-  		When {fname} already exists new messages are appended.
-! 		(Only available when compiled with the |+startuptime|
-! 		feature).
-  
-  							*--literal*
-  --literal	Take file names literally, don't expand wildcards.  Not needed
-*** ../vim-7.2.285/runtime/doc/various.txt	2009-07-09 15:55:34.000000000 +0200
---- runtime/doc/various.txt	2009-11-11 13:03:52.000000000 +0100
-***************
-*** 374,379 ****
---- 374,380 ----
-  B  *+signs*		|:sign|
-  N  *+smartindent*	|'smartindent'|
-  m  *+sniff*		SniFF interface |sniff|
-+ N  *+startuptime*	|--startuptime| argument
-  N  *+statusline*	Options 'statusline', 'rulerformat' and special
-  			formats of 'titlestring' and 'iconstring'
-  m  *+sun_workshop*	|workshop|
-*** ../vim-7.2.285/src/eval.c	2009-11-03 14:26:29.000000000 +0100
---- src/eval.c	2009-11-11 12:59:53.000000000 +0100
-***************
-*** 11736,11741 ****
---- 11736,11744 ----
-  #ifdef FEAT_SNIFF
-  	"sniff",
-  #endif
-+ #ifdef STARTUPTIME
-+ 	"startuptime",
-+ #endif
-  #ifdef FEAT_STL_OPT
-  	"statusline",
-  #endif
-*** ../vim-7.2.285/src/main.c	2009-11-03 12:10:39.000000000 +0100
---- src/main.c	2009-11-08 12:57:46.000000000 +0100
-***************
-*** 204,212 ****
-  #ifdef STARTUPTIME
-      for (i = 1; i < argc; ++i)
-      {
-! 	if (STRNICMP(argv[i], "--startuptime=", 14) == 0)
-  	{
-! 	    time_fd = mch_fopen(argv[i] + 14, "a");
-  	    TIME_MSG("--- VIM STARTING ---");
-  	    break;
-  	}
---- 204,212 ----
-  #ifdef STARTUPTIME
-      for (i = 1; i < argc; ++i)
-      {
-! 	if (STRICMP(argv[i], "--startuptime") == 0 && i + 1 < argc)
-  	{
-! 	    time_fd = mch_fopen(argv[i + 1], "a");
-  	    TIME_MSG("--- VIM STARTING ---");
-  	    break;
-  	}
-***************
-*** 1726,1731 ****
---- 1726,1736 ----
-  		    want_argument = TRUE;
-  		    argv_idx += 3;
-  		}
-+ 		else if (STRNICMP(argv[0] + argv_idx, "startuptime", 11) == 0)
-+ 		{
-+ 		    want_argument = TRUE;
-+ 		    argv_idx += 11;
-+ 		}
-  #ifdef FEAT_CLIENTSERVER
-  		else if (STRNICMP(argv[0] + argv_idx, "serverlist", 10) == 0)
-  		    ; /* already processed -- no arg */
-***************
-*** 1761,1770 ****
-  		    /* already processed, skip */
-  		}
-  #endif
-- 		else if (STRNICMP(argv[0] + argv_idx, "startuptime", 11) == 0)
-- 		{
-- 		    /* already processed, skip */
-- 		}
-  		else
-  		{
-  		    if (argv[0][argv_idx])
---- 1766,1771 ----
-***************
-*** 2061,2067 ****
-  		    mainerr(ME_GARBAGE, (char_u *)argv[0]);
-  
-  		--argc;
-! 		if (argc < 1 && c != 'S')
-  		    mainerr_arg_missing((char_u *)argv[0]);
-  		++argv;
-  		argv_idx = -1;
---- 2062,2068 ----
-  		    mainerr(ME_GARBAGE, (char_u *)argv[0]);
-  
-  		--argc;
-! 		if (argc < 1 && c != 'S')  /* -S has an optional argument */
-  		    mainerr_arg_missing((char_u *)argv[0]);
-  		++argv;
-  		argv_idx = -1;
-***************
-*** 2102,2112 ****
-  							    (char_u *)argv[0];
-  		    break;
-  
-! 		case '-':	/* "--cmd {command}" execute command */
-! 		    if (parmp->n_pre_commands >= MAX_ARG_CMDS)
-! 			mainerr(ME_EXTRA_CMD, NULL);
-! 		    parmp->pre_commands[parmp->n_pre_commands++] =
-  							    (char_u *)argv[0];
-  		    break;
-  
-  	    /*	case 'd':   -d {device} is handled in mch_check_win() for the
---- 2103,2118 ----
-  							    (char_u *)argv[0];
-  		    break;
-  
-! 		case '-':
-! 		    if (argv[-1][2] == 'c')
-! 		    {
-! 			/* "--cmd {command}" execute command */
-! 			if (parmp->n_pre_commands >= MAX_ARG_CMDS)
-! 			    mainerr(ME_EXTRA_CMD, NULL);
-! 			parmp->pre_commands[parmp->n_pre_commands++] =
-  							    (char_u *)argv[0];
-+ 		    }
-+ 		    /* "--startuptime <file>" already handled */
-  		    break;
-  
-  	    /*	case 'd':   -d {device} is handled in mch_check_win() for the
-***************
-*** 3144,3149 ****
---- 3150,3158 ----
-      main_msg(_("--serverlist\t\tList available Vim server names and exit"));
-      main_msg(_("--servername <name>\tSend to/become the Vim server <name>"));
-  #endif
-+ #ifdef STARTUPTIME
-+     main_msg(_("--startuptime=<file>\tWrite startup timing messages to <file>"));
-+ #endif
-  #ifdef FEAT_VIMINFO
-      main_msg(_("-i <viminfo>\t\tUse <viminfo> instead of .viminfo"));
-  #endif
-*** ../vim-7.2.285/src/version.c	2009-11-11 13:22:09.000000000 +0100
---- src/version.c	2009-11-11 14:17:28.000000000 +0100
-***************
-*** 494,499 ****
---- 494,504 ----
-  #else
-  	"-sniff",
-  #endif
-+ #ifdef STARTUPTIME
-+ 	"+startuptime",
-+ #else
-+ 	"-startuptime",
-+ #endif
-  #ifdef FEAT_STL_OPT
-  	"+statusline",
-  #else
-*** ../vim-7.2.285/src/version.c	2009-11-11 13:22:09.000000000 +0100
---- src/version.c	2009-11-11 14:17:28.000000000 +0100
-***************
-*** 678,679 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     286,
-  /**/
-
--- 
-A fool must search for a greater fool to find admiration.
-
- /// 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.287 b/source/ap/vim/patches/7.2.287
deleted file mode 100644
index 0f8e170c..00000000
--- a/source/ap/vim/patches/7.2.287
+++ /dev/null
@@ -1,54 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.287
-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.287
-Problem:    Warning from gcc 3.4 about uninitialized variable.
-Solution:   Move assignment outside of #ifdef.
-Files:	    src/if_perl.xs
-
-
-*** ../vim-7.2.286/src/if_perl.xs	2009-07-14 16:05:14.000000000 +0200
---- src/if_perl.xs	2009-11-11 12:29:32.000000000 +0100
-***************
-*** 720,727 ****
-  #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
---- 720,728 ----
-  #ifdef HAVE_SANDBOX
-      if (sandbox)
-      {
-+ 	safe = perl_get_sv( "VIM::safe", FALSE );
-  # ifndef MAKE_TEST  /* avoid a warning for unreachable code */
-! 	if (safe == NULL || !SvTRUE(safe))
-  	    EMSG(_("E299: Perl evaluation forbidden in sandbox without the Safe module"));
-  	else
-  # endif
-*** ../vim-7.2.286/src/version.c	2009-11-11 14:21:48.000000000 +0100
---- src/version.c	2009-11-11 14:44:49.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     287,
-  /**/
-
--- 
-The most powerful force in the universe is gossip.
-
- /// 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.288 b/source/ap/vim/patches/7.2.288
deleted file mode 100644
index ab9ecdaf..00000000
--- a/source/ap/vim/patches/7.2.288
+++ /dev/null
@@ -1,52 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.288
-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.288
-Problem:    Python 2.6 pyconfig.h redefines macros.
-Solution:   Undefine the macros before including pyconfig.h.
-Files:      src/if_python.c
-
-
-*** ../vim-7.2.287/src/if_python.c	2009-11-03 11:43:05.000000000 +0100
---- src/if_python.c	2009-11-11 12:33:37.000000000 +0100
-***************
-*** 37,42 ****
---- 37,48 ----
-  #ifdef HAVE_STDARG_H
-  # undef HAVE_STDARG_H	/* Python's config.h defines it as well. */
-  #endif
-+ #ifdef _POSIX_C_SOURCE
-+ # undef _POSIX_C_SOURCE	/* pyconfig.h defines it as well. */
-+ #endif
-+ #ifdef _XOPEN_SOURCE
-+ # undef _XOPEN_SOURCE	/* pyconfig.h defines it as well. */
-+ #endif
-  
-  #define PY_SSIZE_T_CLEAN
-  
-*** ../vim-7.2.287/src/version.c	2009-11-11 14:45:36.000000000 +0100
---- src/version.c	2009-11-11 15:05:51.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     288,
-  /**/
-
--- 
-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.289 b/source/ap/vim/patches/7.2.289
deleted file mode 100644
index 4009bb9b..00000000
--- a/source/ap/vim/patches/7.2.289
+++ /dev/null
@@ -1,120 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.289
-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.289
-Problem:    Checking wrong struct member.
-Solution:   Change tb_buf to tb_noremap. (Dominique Pelle)
-Files:	    src/getchar.c
-
-
-*** ../vim-7.2.288/src/getchar.c	2009-09-30 15:15:33.000000000 +0200
---- src/getchar.c	2009-11-11 12:50:58.000000000 +0100
-***************
-*** 22,28 ****
-   * These buffers are used for storing:
-   * - stuffed characters: A command that is translated into another command.
-   * - redo characters: will redo the last change.
-!  * - recorded chracters: for the "q" command.
-   *
-   * The bytes are stored like in the typeahead buffer:
-   * - K_SPECIAL introduces a special key (two more bytes follow).  A literal
---- 22,28 ----
-   * These buffers are used for storing:
-   * - stuffed characters: A command that is translated into another command.
-   * - redo characters: will redo the last change.
-!  * - recorded characters: for the "q" command.
-   *
-   * The bytes are stored like in the typeahead buffer:
-   * - K_SPECIAL introduces a special key (two more bytes follow).  A literal
-***************
-*** 1283,1289 ****
-  	EMSG2(_(e_intern2), "Free typebuf 1");
-      else
-  	vim_free(typebuf.tb_buf);
-!     if (typebuf.tb_buf == noremapbuf_init)
-  	EMSG2(_(e_intern2), "Free typebuf 2");
-      else
-  	vim_free(typebuf.tb_noremap);
---- 1283,1289 ----
-  	EMSG2(_(e_intern2), "Free typebuf 1");
-      else
-  	vim_free(typebuf.tb_buf);
-!     if (typebuf.tb_noremap == noremapbuf_init)
-  	EMSG2(_(e_intern2), "Free typebuf 2");
-      else
-  	vim_free(typebuf.tb_noremap);
-***************
-*** 1516,1522 ****
-   * wanted.
-   * This translates escaped K_SPECIAL and CSI bytes to a K_SPECIAL or CSI byte.
-   * Collects the bytes of a multibyte character into the whole character.
-!  * Returns the modifers in the global "mod_mask".
-   */
-      int
-  vgetc()
---- 1516,1522 ----
-   * wanted.
-   * This translates escaped K_SPECIAL and CSI bytes to a K_SPECIAL or CSI byte.
-   * Collects the bytes of a multibyte character into the whole character.
-!  * Returns the modifiers in the global "mod_mask".
-   */
-      int
-  vgetc()
-***************
-*** 3320,3326 ****
-  			    retval = 1;
-  			    goto theend;
-  			}
-! 	    /* An abbrevation cannot contain white space. */
-  	    for (n = 0; n < len; ++n)
-  		if (vim_iswhite(keys[n]))
-  		{
---- 3320,3326 ----
-  			    retval = 1;
-  			    goto theend;
-  			}
-! 	    /* An abbreviation cannot contain white space. */
-  	    for (n = 0; n < len; ++n)
-  		if (vim_iswhite(keys[n]))
-  		{
-***************
-*** 4272,4278 ****
-  
-      /*
-       * Check for word before the cursor: If it ends in a keyword char all
-!      * chars before it must be al keyword chars or non-keyword chars, but not
-       * white space. If it ends in a non-keyword char we accept any characters
-       * before it except white space.
-       */
---- 4272,4278 ----
-  
-      /*
-       * Check for word before the cursor: If it ends in a keyword char all
-!      * chars before it must be keyword chars or non-keyword chars, but not
-       * white space. If it ends in a non-keyword char we accept any characters
-       * before it except white space.
-       */
-*** ../vim-7.2.288/src/version.c	2009-11-11 15:06:59.000000000 +0100
---- src/version.c	2009-11-11 16:19:12.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     289,
-  /**/
-
--- 
-A M00se once bit my sister ...
-                 "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.290 b/source/ap/vim/patches/7.2.290
deleted file mode 100644
index ba4fd62d..00000000
--- a/source/ap/vim/patches/7.2.290
+++ /dev/null
@@ -1,157 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.290
-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.290
-Problem:    Not freeing memory from ":lmap", ":xmap" and ":menutranslate".
-Solution:   Free the memory when exiting. (Dominique Pelle)
-Files:	    src/misc2.c
-
-
-*** ../vim-7.2.289/src/misc2.c	2009-11-03 16:44:04.000000000 +0100
---- src/misc2.c	2009-11-11 16:49:13.000000000 +0100
-***************
-*** 1005,1013 ****
---- 1005,1018 ----
-  # ifdef FEAT_MENU
-      /* Clear menus. */
-      do_cmdline_cmd((char_u *)"aunmenu *");
-+ #  ifdef FEAT_MULTI_LANG
-+     do_cmdline_cmd((char_u *)"menutranslate clear");
-+ #  endif
-  # endif
-  
-      /* Clear mappings, abbreviations, breakpoints. */
-+     do_cmdline_cmd((char_u *)"lmapclear");
-+     do_cmdline_cmd((char_u *)"xmapclear");
-      do_cmdline_cmd((char_u *)"mapclear");
-      do_cmdline_cmd((char_u *)"mapclear!");
-      do_cmdline_cmd((char_u *)"abclear");
-***************
-*** 1282,1288 ****
-  
-  /*
-   * Escape "string" for use as a shell argument with system().
-!  * This uses single quotes, except when we know we need to use double qoutes
-   * (MS-DOS and MS-Windows without 'shellslash' set).
-   * Escape a newline, depending on the 'shell' option.
-   * When "do_special" is TRUE also replace "!", "%", "#" and things starting
---- 1287,1293 ----
-  
-  /*
-   * Escape "string" for use as a shell argument with system().
-!  * This uses single quotes, except when we know we need to use double quotes
-   * (MS-DOS and MS-Windows without 'shellslash' set).
-   * Escape a newline, depending on the 'shell' option.
-   * When "do_special" is TRUE also replace "!", "%", "#" and things starting
-***************
-*** 1537,1543 ****
-  #if defined(FEAT_VISUALEXTRA) || defined(PROTO)
-  /*
-   * Copy a character a number of times.
-!  * Does not work for multi-byte charactes!
-   */
-      void
-  copy_chars(ptr, count, c)
---- 1542,1548 ----
-  #if defined(FEAT_VISUALEXTRA) || defined(PROTO)
-  /*
-   * Copy a character a number of times.
-!  * Does not work for multi-byte characters!
-   */
-      void
-  copy_chars(ptr, count, c)
-***************
-*** 4260,4266 ****
-  	 * or '**76' is transposed to '**N'( 'N' is ASCII value 76).
-  	 * For EBCDIC you get different character values.
-  	 * If no restrict is given after '**' the default is used.
-! 	 * Due to this technic the path looks awful if you print it as a
-  	 * string.
-  	 */
-  	len = 0;
---- 4265,4271 ----
-  	 * or '**76' is transposed to '**N'( 'N' is ASCII value 76).
-  	 * For EBCDIC you get different character values.
-  	 * If no restrict is given after '**' the default is used.
-! 	 * Due to this technique the path looks awful if you print it as a
-  	 * string.
-  	 */
-  	len = 0;
-***************
-*** 4649,4655 ****
-  				      && !mch_isdir(stackp->ffs_filearray[i]))
-  			    continue;   /* not a directory */
-  
-! 			/* prepare the filename to be checked for existance
-  			 * below */
-  			STRCPY(file_path, stackp->ffs_filearray[i]);
-  			add_pathsep(file_path);
---- 4654,4660 ----
-  				      && !mch_isdir(stackp->ffs_filearray[i]))
-  			    continue;   /* not a directory */
-  
-! 			/* prepare the filename to be checked for existence
-  			 * below */
-  			STRCPY(file_path, stackp->ffs_filearray[i]);
-  			add_pathsep(file_path);
-***************
-*** 5438,5444 ****
-  #if defined(MSWIN) || defined(MSDOS) || defined(OS2)
-  	    /* handle "\tmp" as absolute path */
-  	    || vim_ispathsep(ff_file_to_find[0])
-! 	    /* handle "c:name" as absulute path */
-  	    || (ff_file_to_find[0] != NUL && ff_file_to_find[1] == ':')
-  #endif
-  #ifdef AMIGA
---- 5443,5449 ----
-  #if defined(MSWIN) || defined(MSDOS) || defined(OS2)
-  	    /* handle "\tmp" as absolute path */
-  	    || vim_ispathsep(ff_file_to_find[0])
-! 	    /* handle "c:name" as absolute path */
-  	    || (ff_file_to_find[0] != NUL && ff_file_to_find[1] == ':')
-  #endif
-  #ifdef AMIGA
-***************
-*** 5681,5687 ****
-  		p2 = (char_u *)base + (j + gap) * elm_size;
-  		if ((*cmp)((void *)p1, (void *)p2) <= 0)
-  		    break;
-! 		/* Exchange the elemets. */
-  		mch_memmove(buf, p1, elm_size);
-  		mch_memmove(p1, p2, elm_size);
-  		mch_memmove(p2, buf, elm_size);
---- 5686,5692 ----
-  		p2 = (char_u *)base + (j + gap) * elm_size;
-  		if ((*cmp)((void *)p1, (void *)p2) <= 0)
-  		    break;
-! 		/* Exchange the elements. */
-  		mch_memmove(buf, p1, elm_size);
-  		mch_memmove(p1, p2, elm_size);
-  		mch_memmove(p2, buf, elm_size);
-*** ../vim-7.2.289/src/version.c	2009-11-11 16:23:37.000000000 +0100
---- src/version.c	2009-11-11 16:54:53.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     290,
-  /**/
-
--- 
-ARTHUR: It is I, Arthur, son of Uther Pendragon, from the castle of Camelot.
-        King of all Britons, defeator of the Saxons, sovereign of all England!
-   [Pause]
-SOLDIER: Get away!
-                 "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.291 b/source/ap/vim/patches/7.2.291
deleted file mode 100644
index bab6e3bf..00000000
--- a/source/ap/vim/patches/7.2.291
+++ /dev/null
@@ -1,53 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.291
-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.291
-Problem:    Reading uninitialised memory in arabic mode.
-Solution:   Use utfc_ptr2char_len() rather than utfc_ptr2char().  (Dominique
-	    Pelle)
-Files:	    src/screen.c
-
-
-*** ../vim-7.2.290/src/screen.c	2009-11-03 17:36:09.000000000 +0100
---- src/screen.c	2009-11-11 17:04:53.000000000 +0100
-***************
-*** 6413,6419 ****
-  		    }
-  		    else
-  		    {
-! 			nc = utfc_ptr2char(ptr + mbyte_blen, pcc);
-  			nc1 = pcc[0];
-  		    }
-  		    pc = prev_c;
---- 6413,6420 ----
-  		    }
-  		    else
-  		    {
-! 			nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc,
-! 				      (int)((text + len) - ptr - mbyte_blen));
-  			nc1 = pcc[0];
-  		    }
-  		    pc = prev_c;
-*** ../vim-7.2.290/src/version.c	2009-11-11 16:56:13.000000000 +0100
---- src/version.c	2009-11-11 17:06:48.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     291,
-  /**/
-
--- 
-The problem with political jokes is that they get elected.
-
- /// 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.292 b/source/ap/vim/patches/7.2.292
deleted file mode 100644
index c5761904..00000000
--- a/source/ap/vim/patches/7.2.292
+++ /dev/null
@@ -1,55 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.292
-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.292
-Problem:    Block right-shift doesn't work properly with multi-byte encoding
-	    and 'list' set.
-Solution:   Add the missing "else". (Lech Lorens)
-Files:	    src/ops.c
-
-
-*** ../vim-7.2.291/src/ops.c	2009-11-03 16:44:04.000000000 +0100
---- src/ops.c	2009-11-11 17:15:04.000000000 +0100
-***************
-*** 422,429 ****
-  #ifdef FEAT_MBYTE
-  	    if (has_mbyte)
-  		bd.textstart += (*mb_ptr2len)(bd.textstart);
-  #endif
-! 	    ++bd.textstart;
-  	}
-  	for ( ; vim_iswhite(*bd.textstart); )
-  	{
---- 422,430 ----
-  #ifdef FEAT_MBYTE
-  	    if (has_mbyte)
-  		bd.textstart += (*mb_ptr2len)(bd.textstart);
-+ 	    else
-  #endif
-! 		++bd.textstart;
-  	}
-  	for ( ; vim_iswhite(*bd.textstart); )
-  	{
-*** ../vim-7.2.291/src/version.c	2009-11-11 17:07:25.000000000 +0100
---- src/version.c	2009-11-11 17:21:31.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     292,
-  /**/
-
--- 
-Computers make very fast, very accurate, mistakes.
-
- /// 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.293 b/source/ap/vim/patches/7.2.293
deleted file mode 100644
index 0f41435a..00000000
--- a/source/ap/vim/patches/7.2.293
+++ /dev/null
@@ -1,66 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.293
-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.293
-Problem:    When setting 'comments' option it may be used in a wrong way. 
-Solution:   Don't increment after skipping over digets. (Yukihiro Nakadaira)
-Files:	    src/misc1.c
-
-
-*** ../vim-7.2.292/src/misc1.c	2009-11-03 18:46:53.000000000 +0100
---- src/misc1.c	2009-11-11 17:27:38.000000000 +0100
-***************
-*** 1026,1037 ****
-  		    int		c = 0;
-  		    int		off = 0;
-  
-! 		    for (p = lead_flags; *p && *p != ':'; ++p)
-  		    {
-  			if (*p == COM_RIGHT || *p == COM_LEFT)
-! 			    c = *p;
-  			else if (VIM_ISDIGIT(*p) || *p == '-')
-  			    off = getdigits(&p);
-  		    }
-  		    if (c == COM_RIGHT)    /* right adjusted leader */
-  		    {
---- 1026,1039 ----
-  		    int		c = 0;
-  		    int		off = 0;
-  
-! 		    for (p = lead_flags; *p != NUL && *p != ':'; )
-  		    {
-  			if (*p == COM_RIGHT || *p == COM_LEFT)
-! 			    c = *p++;
-  			else if (VIM_ISDIGIT(*p) || *p == '-')
-  			    off = getdigits(&p);
-+ 			else
-+ 			    ++p;
-  		    }
-  		    if (c == COM_RIGHT)    /* right adjusted leader */
-  		    {
-*** ../vim-7.2.292/src/version.c	2009-11-11 17:22:30.000000000 +0100
---- src/version.c	2009-11-11 17:29:24.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     293,
-  /**/
-
--- 
-SOLDIER: What?  Ridden on a horse?
-ARTHUR:  Yes!
-SOLDIER: You're using coconuts!
-                 "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.294 b/source/ap/vim/patches/7.2.294
deleted file mode 100644
index fef1e6bf..00000000
--- a/source/ap/vim/patches/7.2.294
+++ /dev/null
@@ -1,285 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.294
-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.294
-Problem:    When using TEMPDIRS dir name could get too long.
-Solution:   Overwrite tail instead of appending each time.  Use mkdtemp() when
-	    available. (James Vega)
-Files:	    src/auto/configure, src/config.h.in, src/configure.in, src/fileio.c
-
-
-*** ../vim-7.2.293/src/auto/configure	2009-09-11 13:44:33.000000000 +0200
---- src/auto/configure	2009-11-17 12:03:15.000000000 +0100
-***************
-*** 14019,14027 ****
-  
-  
-  
-  for ac_func in bcmp fchdir fchown fseeko fsync ftello getcwd getpseudotty \
-  	getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \
-! 	memset nanosleep opendir putenv qsort readlink select setenv \
-  	setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
-  	sigvec strcasecmp strerror strftime stricmp strncasecmp \
-  	strnicmp strpbrk strtol tgetent towlower towupper iswupper \
---- 14019,14028 ----
-  
-  
-  
-+ 
-  for ac_func in bcmp fchdir fchown fseeko fsync ftello getcwd getpseudotty \
-  	getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \
-! 	memset mkdtemp nanosleep opendir putenv qsort readlink select setenv \
-  	setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
-  	sigvec strcasecmp strerror strftime stricmp strncasecmp \
-  	strnicmp strpbrk strtol tgetent towlower towupper iswupper \
-*** ../vim-7.2.293/src/config.h.in	2009-05-21 23:25:38.000000000 +0200
---- src/config.h.in	2009-11-11 17:40:21.000000000 +0100
-***************
-*** 157,162 ****
---- 157,163 ----
-  #undef HAVE_LSTAT
-  #undef HAVE_MEMCMP
-  #undef HAVE_MEMSET
-+ #undef HAVE_MKDTEMP
-  #undef HAVE_NANOSLEEP
-  #undef HAVE_OPENDIR
-  #undef HAVE_FLOAT_FUNCS
-*** ../vim-7.2.293/src/configure.in	2009-09-11 13:44:33.000000000 +0200
---- src/configure.in	2009-11-11 17:40:21.000000000 +0100
-***************
-*** 2635,2641 ****
-  dnl Check for functions in one big call, to reduce the size of configure
-  AC_CHECK_FUNCS(bcmp fchdir fchown fseeko fsync ftello getcwd getpseudotty \
-  	getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \
-! 	memset nanosleep opendir putenv qsort readlink select setenv \
-  	setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
-  	sigvec strcasecmp strerror strftime stricmp strncasecmp \
-  	strnicmp strpbrk strtol tgetent towlower towupper iswupper \
---- 2635,2641 ----
-  dnl Check for functions in one big call, to reduce the size of configure
-  AC_CHECK_FUNCS(bcmp fchdir fchown fseeko fsync ftello getcwd getpseudotty \
-  	getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \
-! 	memset mkdtemp nanosleep opendir putenv qsort readlink select setenv \
-  	setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
-  	sigvec strcasecmp strerror strftime stricmp strncasecmp \
-  	strnicmp strpbrk strtol tgetent towlower towupper iswupper \
-*** ../vim-7.2.293/src/fileio.c	2009-09-11 17:24:01.000000000 +0200
---- src/fileio.c	2009-11-11 18:01:22.000000000 +0100
-***************
-*** 146,151 ****
---- 146,152 ----
-  # endif
-  #endif
-  static int move_lines __ARGS((buf_T *frombuf, buf_T *tobuf));
-+ static void vim_settempdir __ARGS((char_u *tempdir));
-  #ifdef FEAT_AUTOCMD
-  static char *e_auchangedbuf = N_("E812: Autocommands changed buffer or buffer name");
-  #endif
-***************
-*** 6987,6992 ****
---- 6988,7020 ----
-  #endif
-  
-  /*
-+  * Directory "tempdir" was created.  Expand this name to a full path and put
-+  * it in "vim_tempdir".  This avoids that using ":cd" would confuse us.
-+  * "tempdir" must be no longer than MAXPATHL.
-+  */
-+     static void
-+ vim_settempdir(tempdir)
-+     char_u	*tempdir;
-+ {
-+     char_u	*buf;
-+ 
-+     buf = alloc((unsigned)MAXPATHL + 2);
-+     if (buf != NULL)
-+     {
-+ 	if (vim_FullName(tempdir, buf, MAXPATHL, FALSE) == FAIL)
-+ 	    STRCPY(buf, tempdir);
-+ # ifdef __EMX__
-+ 	if (vim_strchr(buf, '/') != NULL)
-+ 	    STRCAT(buf, "/");
-+ 	else
-+ # endif
-+ 	    add_pathsep(buf);
-+ 	vim_tempdir = vim_strsave(buf);
-+ 	vim_free(buf);
-+     }
-+ }
-+ 
-+ /*
-   * vim_tempname(): Return a unique name that can be used for a temp file.
-   *
-   * The temp file is NOT created.
-***************
-*** 7007,7014 ****
-  #ifdef TEMPDIRNAMES
-      static char	*(tempdirs[]) = {TEMPDIRNAMES};
-      int		i;
--     long	nr;
--     long	off;
-  # ifndef EEXIST
-      struct stat	st;
-  # endif
---- 7035,7040 ----
-***************
-*** 7027,7032 ****
---- 7053,7064 ----
-  	 */
-  	for (i = 0; i < (int)(sizeof(tempdirs) / sizeof(char *)); ++i)
-  	{
-+ 	    size_t	itmplen;
-+ # ifndef HAVE_MKDTEMP
-+ 	    long	nr;
-+ 	    long	off;
-+ # endif
-+ 
-  	    /* expand $TMP, leave room for "/v1100000/999999999" */
-  	    expand_env((char_u *)tempdirs[i], itmp, TEMPNAMELEN - 20);
-  	    if (mch_isdir(itmp))		/* directory exists */
-***************
-*** 7040,7046 ****
---- 7072,7085 ----
-  		else
-  # endif
-  		    add_pathsep(itmp);
-+ 		itmplen = STRLEN(itmp);
-  
-+ # ifdef HAVE_MKDTEMP
-+ 		/* Leave room for filename */
-+ 		STRCAT(itmp, "vXXXXXX");
-+ 		if (mkdtemp((char *)itmp) != NULL)
-+ 		    vim_settempdir(itmp);
-+ # else
-  		/* Get an arbitrary number of up to 6 digits.  When it's
-  		 * unlikely that it already exists it will be faster,
-  		 * otherwise it doesn't matter.  The use of mkdir() avoids any
-***************
-*** 7052,7110 ****
-  		for (off = 0; off < 10000L; ++off)
-  		{
-  		    int		r;
-! #if defined(UNIX) || defined(VMS)
-  		    mode_t	umask_save;
-! #endif
-  
-! 		    sprintf((char *)itmp + STRLEN(itmp), "v%ld", nr + off);
-! # ifndef EEXIST
-  		    /* If mkdir() does not set errno to EEXIST, check for
-  		     * existing file here.  There is a race condition then,
-  		     * although it's fail-safe. */
-  		    if (mch_stat((char *)itmp, &st) >= 0)
-  			continue;
-! # endif
-! #if defined(UNIX) || defined(VMS)
-  		    /* Make sure the umask doesn't remove the executable bit.
-  		     * "repl" has been reported to use "177". */
-  		    umask_save = umask(077);
-! #endif
-  		    r = vim_mkdir(itmp, 0700);
-! #if defined(UNIX) || defined(VMS)
-  		    (void)umask(umask_save);
-! #endif
-  		    if (r == 0)
-  		    {
-! 			char_u	*buf;
-! 
-! 			/* Directory was created, use this name.
-! 			 * Expand to full path; When using the current
-! 			 * directory a ":cd" would confuse us. */
-! 			buf = alloc((unsigned)MAXPATHL + 1);
-! 			if (buf != NULL)
-! 			{
-! 			    if (vim_FullName(itmp, buf, MAXPATHL, FALSE)
-! 								      == FAIL)
-! 				STRCPY(buf, itmp);
-! # ifdef __EMX__
-! 			    if (vim_strchr(buf, '/') != NULL)
-! 				STRCAT(buf, "/");
-! 			    else
-! # endif
-! 				add_pathsep(buf);
-! 			    vim_tempdir = vim_strsave(buf);
-! 			    vim_free(buf);
-! 			}
-  			break;
-  		    }
-! # ifdef EEXIST
-  		    /* If the mkdir() didn't fail because the file/dir exists,
-  		     * we probably can't create any dir here, try another
-  		     * place. */
-  		    if (errno != EEXIST)
-! # endif
-  			break;
-  		}
-  		if (vim_tempdir != NULL)
-  		    break;
-  	    }
---- 7091,7131 ----
-  		for (off = 0; off < 10000L; ++off)
-  		{
-  		    int		r;
-! #  if defined(UNIX) || defined(VMS)
-  		    mode_t	umask_save;
-! #  endif
-  
-! 		    sprintf((char *)itmp + itmplen, "v%ld", nr + off);
-! #  ifndef EEXIST
-  		    /* If mkdir() does not set errno to EEXIST, check for
-  		     * existing file here.  There is a race condition then,
-  		     * although it's fail-safe. */
-  		    if (mch_stat((char *)itmp, &st) >= 0)
-  			continue;
-! #  endif
-! #  if defined(UNIX) || defined(VMS)
-  		    /* Make sure the umask doesn't remove the executable bit.
-  		     * "repl" has been reported to use "177". */
-  		    umask_save = umask(077);
-! #  endif
-  		    r = vim_mkdir(itmp, 0700);
-! #  if defined(UNIX) || defined(VMS)
-  		    (void)umask(umask_save);
-! #  endif
-  		    if (r == 0)
-  		    {
-! 			vim_settempdir(itmp);
-  			break;
-  		    }
-! #  ifdef EEXIST
-  		    /* If the mkdir() didn't fail because the file/dir exists,
-  		     * we probably can't create any dir here, try another
-  		     * place. */
-  		    if (errno != EEXIST)
-! #  endif
-  			break;
-  		}
-+ # endif /* HAVE_MKDTEMP */
-  		if (vim_tempdir != NULL)
-  		    break;
-  	    }
-*** ../vim-7.2.293/src/version.c	2009-11-11 17:30:05.000000000 +0100
---- src/version.c	2009-11-17 11:54:49.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     294,
-  /**/
-
--- 
-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.295 b/source/ap/vim/patches/7.2.295
deleted file mode 100644
index 331498ff..00000000
--- a/source/ap/vim/patches/7.2.295
+++ /dev/null
@@ -1,142 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.295
-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.295
-Problem:    When using map() on a List the index is not known.
-Solution:   Set v:key to the  index. (Hari Krishna Dara)
-Files:	    runtime/doc/eval.txt, src/eval.c
-
-
-*** ../vim-7.2.294/runtime/doc/eval.txt	2009-11-11 14:21:48.000000000 +0100
---- runtime/doc/eval.txt	2009-11-11 18:22:54.000000000 +0100
-***************
-*** 3802,3808 ****
-  		Replace each item in {expr} with the result of evaluating
-  		{string}.
-  		Inside {string} |v:val| has the value of the current item.
-! 		For a |Dictionary| |v:key| has the key of the current item.
-  		Example: >
-  			:call map(mylist, '"> " . v:val . " <"')
-  <		This puts "> " before and " <" after each item in "mylist".
---- 3812,3819 ----
-  		Replace each item in {expr} with the result of evaluating
-  		{string}.
-  		Inside {string} |v:val| has the value of the current item.
-! 		For a |Dictionary| |v:key| has the key of the current item
-! 		and for a |List| |v:key| has the index of the current item.
-  		Example: >
-  			:call map(mylist, '"> " . v:val . " <"')
-  <		This puts "> " before and " <" after each item in "mylist".
-*** ../vim-7.2.294/src/eval.c	2009-11-11 14:21:48.000000000 +0100
---- src/eval.c	2009-11-11 18:22:49.000000000 +0100
-***************
-*** 9928,9933 ****
---- 9928,9934 ----
-      int		todo;
-      char_u	*ermsg = map ? (char_u *)"map()" : (char_u *)"filter()";
-      int		save_did_emsg;
-+     int		index = 0;
-  
-      if (argvars[0].v_type == VAR_LIST)
-      {
-***************
-*** 9961,9969 ****
-  	save_did_emsg = did_emsg;
-  	did_emsg = FALSE;
-  
-  	if (argvars[0].v_type == VAR_DICT)
-  	{
-- 	    prepare_vimvar(VV_KEY, &save_key);
-  	    vimvars[VV_KEY].vv_type = VAR_STRING;
-  
-  	    ht = &d->dv_hashtab;
---- 9962,9970 ----
-  	save_did_emsg = did_emsg;
-  	did_emsg = FALSE;
-  
-+ 	prepare_vimvar(VV_KEY, &save_key);
-  	if (argvars[0].v_type == VAR_DICT)
-  	{
-  	    vimvars[VV_KEY].vv_type = VAR_STRING;
-  
-  	    ht = &d->dv_hashtab;
-***************
-*** 9987,10010 ****
-  		}
-  	    }
-  	    hash_unlock(ht);
-- 
-- 	    restore_vimvar(VV_KEY, &save_key);
-  	}
-  	else
-  	{
-  	    for (li = l->lv_first; li != NULL; li = nli)
-  	    {
-  		if (tv_check_lock(li->li_tv.v_lock, ermsg))
-  		    break;
-  		nli = li->li_next;
-  		if (filter_map_one(&li->li_tv, expr, map, &rem) == FAIL
-  								  || did_emsg)
-  		    break;
-  		if (!map && rem)
-  		    listitem_remove(l, li);
-  	    }
-  	}
-  
-  	restore_vimvar(VV_VAL, &save_val);
-  
-  	did_emsg |= save_did_emsg;
---- 9988,10014 ----
-  		}
-  	    }
-  	    hash_unlock(ht);
-  	}
-  	else
-  	{
-+ 	    vimvars[VV_KEY].vv_type = VAR_NUMBER;
-+ 
-  	    for (li = l->lv_first; li != NULL; li = nli)
-  	    {
-  		if (tv_check_lock(li->li_tv.v_lock, ermsg))
-  		    break;
-  		nli = li->li_next;
-+ 		vimvars[VV_KEY].vv_nr = index;
-  		if (filter_map_one(&li->li_tv, expr, map, &rem) == FAIL
-  								  || did_emsg)
-  		    break;
-  		if (!map && rem)
-  		    listitem_remove(l, li);
-+ 		++index;
-  	    }
-  	}
-  
-+ 	restore_vimvar(VV_KEY, &save_key);
-  	restore_vimvar(VV_VAL, &save_val);
-  
-  	did_emsg |= save_did_emsg;
-*** ../vim-7.2.294/src/version.c	2009-11-17 12:08:48.000000000 +0100
---- src/version.c	2009-11-17 12:18:08.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     295,
-  /**/
-
--- 
-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.296 b/source/ap/vim/patches/7.2.296
deleted file mode 100644
index 5fc3cb3c..00000000
--- a/source/ap/vim/patches/7.2.296
+++ /dev/null
@@ -1,53 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.296
-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.296
-Problem:    Help message about startuptime is wrong. (Dominique Pelle)
-Solution:   Remove the equal sign.
-Files:	    src/main.c
-
-
-*** ../vim-7.2.295/src/main.c	2009-11-11 14:21:48.000000000 +0100
---- src/main.c	2009-11-11 22:51:04.000000000 +0100
-***************
-*** 3151,3157 ****
-      main_msg(_("--servername <name>\tSend to/become the Vim server <name>"));
-  #endif
-  #ifdef STARTUPTIME
-!     main_msg(_("--startuptime=<file>\tWrite startup timing messages to <file>"));
-  #endif
-  #ifdef FEAT_VIMINFO
-      main_msg(_("-i <viminfo>\t\tUse <viminfo> instead of .viminfo"));
---- 3151,3157 ----
-      main_msg(_("--servername <name>\tSend to/become the Vim server <name>"));
-  #endif
-  #ifdef STARTUPTIME
-!     main_msg(_("--startuptime <file>\tWrite startup timing messages to <file>"));
-  #endif
-  #ifdef FEAT_VIMINFO
-      main_msg(_("-i <viminfo>\t\tUse <viminfo> instead of .viminfo"));
-*** ../vim-7.2.295/src/version.c	2009-11-17 12:20:30.000000000 +0100
---- src/version.c	2009-11-17 12:30:29.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     296,
-  /**/
-
--- 
-BLACK KNIGHT: I'm invincible!
-ARTHUR:       You're a looney.
-                 "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.297 b/source/ap/vim/patches/7.2.297
deleted file mode 100644
index cc8d7899..00000000
--- a/source/ap/vim/patches/7.2.297
+++ /dev/null
@@ -1,70 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.297
-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.297
-Problem:    Reading freed memory when writing ":reg" output to a register.
-	    (Dominique Pelle)
-Solution:   Skip the register being written to.
-Files:	    src/ops.c
-
-
-*** ../vim-7.2.296/src/ops.c	2009-11-11 17:22:30.000000000 +0100
---- src/ops.c	2009-11-11 19:30:47.000000000 +0100
-***************
-*** 3991,3996 ****
---- 3991,4004 ----
-  	}
-  	else
-  	    yb = &(y_regs[i]);
-+ 
-+ #ifdef FEAT_EVAL
-+ 	if (name == MB_TOLOWER(redir_reg)
-+ 		|| (redir_reg == '"' && yb == y_previous))
-+ 	    continue;	    /* do not list register being written to, the
-+ 			     * pointer can be freed */
-+ #endif
-+ 
-  	if (yb->y_array != NULL)
-  	{
-  	    msg_putchar('\n');
-***************
-*** 6090,6096 ****
-      long	maxlen;
-  #endif
-  
-!     if (y_ptr->y_array == NULL)		/* NULL means emtpy register */
-  	y_ptr->y_size = 0;
-  
-      /*
---- 6098,6104 ----
-      long	maxlen;
-  #endif
-  
-!     if (y_ptr->y_array == NULL)		/* NULL means empty register */
-  	y_ptr->y_size = 0;
-  
-      /*
-*** ../vim-7.2.296/src/version.c	2009-11-17 12:31:30.000000000 +0100
---- src/version.c	2009-11-17 12:42:28.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     297,
-  /**/
-
--- 
-"Beware of bugs in the above code; I have only proved
-it correct, not tried it." -- Donald Knuth
-
- /// 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.298 b/source/ap/vim/patches/7.2.298
deleted file mode 100644
index 0aabd7ac..00000000
--- a/source/ap/vim/patches/7.2.298
+++ /dev/null
@@ -1,48 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.298
-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.298
-Problem:    ":vimgrep" crashes when there is an autocommand that sets a
-	    window-local variable.
-Solution:   Initialize the w: hashtab for re-use. (Yukihiro Nakadaira)
-Files:	    src/fileio.c
-
-
-*** ../vim-7.2.297/src/fileio.c	2009-11-17 12:08:48.000000000 +0100
---- src/fileio.c	2009-11-17 13:22:06.000000000 +0100
-***************
-*** 8597,8602 ****
---- 8605,8611 ----
-  	    curwin = firstwin;
-  # ifdef FEAT_EVAL
-  	vars_clear(&aucmd_win->w_vars.dv_hashtab);  /* free all w: variables */
-+ 	hash_init(&aucmd_win->w_vars.dv_hashtab);   /* re-use the hashtab */
-  # endif
-  #else
-  	curwin = aco->save_curwin;
-*** ../vim-7.2.297/src/version.c	2009-11-17 12:43:19.000000000 +0100
---- src/version.c	2009-11-17 14:56:19.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     298,
-  /**/
-
--- 
-Eye have a spelling checker, it came with my PC;
-It plainly marks four my revue mistakes I cannot sea.
-I've run this poem threw it, I'm sure your please to no,
-It's letter perfect in it's weigh, my checker tolled me sew!
-
- /// 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.299 b/source/ap/vim/patches/7.2.299
deleted file mode 100644
index 88f9e705..00000000
--- a/source/ap/vim/patches/7.2.299
+++ /dev/null
@@ -1,54 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.299
-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.299
-Problem:    Crash when comment middle is longer than start.
-Solution:   Fix size computation. (Lech Lorens)
-Files:	    src/misc1.c
-
-
-*** ../vim-7.2.298/src/misc1.c	2009-11-11 17:30:05.000000000 +0100
---- src/misc1.c	2009-11-17 15:59:28.000000000 +0100
-***************
-*** 1121,1127 ****
-  			    if (i != lead_repl_len)
-  			    {
-  				mch_memmove(p + lead_repl_len, p + i,
-! 				       (size_t)(lead_len - i - (leader - p)));
-  				lead_len += lead_repl_len - i;
-  			    }
-  			}
---- 1121,1127 ----
-  			    if (i != lead_repl_len)
-  			    {
-  				mch_memmove(p + lead_repl_len, p + i,
-! 				       (size_t)(lead_len - i - (p - leader)));
-  				lead_len += lead_repl_len - i;
-  			    }
-  			}
-*** ../vim-7.2.298/src/version.c	2009-11-17 14:57:19.000000000 +0100
---- src/version.c	2009-11-17 16:01:07.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     299,
-  /**/
-
--- 
-BLACK KNIGHT: The Black Knight always triumphs. Have at you!
-   ARTHUR takes his last leg off.  The BLACK KNIGHT's body lands upright.
-BLACK KNIGHT: All right, we'll call it a draw.
-                 "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.300 b/source/ap/vim/patches/7.2.300
deleted file mode 100644
index f88035e6..00000000
--- a/source/ap/vim/patches/7.2.300
+++ /dev/null
@@ -1,201 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.300
-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.300
-Problem:    Vim doesn't close file descriptors when forking and executing
-	    another command, e.g., ":shell".
-Solution:   Use FD_CLOEXEC when available. (James Vega)
-Files:	    src/auto/configure, src/config.h.in, src/configure.in,
-	    src/ex_cmdds2.c, src/fileio.c, src/memfile.c, src/memline.c
-
-
-*** ../vim-7.2.299/src/auto/configure	2009-11-17 12:08:48.000000000 +0100
---- src/auto/configure	2009-11-17 13:09:03.000000000 +0100
-***************
-*** 15174,15179 ****
---- 15174,15231 ----
-  $as_echo "yes" >&6; }
-  fi
-  
-+ { $as_echo "$as_me:$LINENO: checking for FD_CLOEXEC" >&5
-+ $as_echo_n "checking for FD_CLOEXEC... " >&6; }
-+ cat >conftest.$ac_ext <<_ACEOF
-+ /* confdefs.h.  */
-+ _ACEOF
-+ cat confdefs.h >>conftest.$ac_ext
-+ cat >>conftest.$ac_ext <<_ACEOF
-+ /* end confdefs.h.  */
-+ #if HAVE_FCNTL_H
-+ # include <fcntl.h>
-+ #endif
-+ int
-+ main ()
-+ {
-+ 	int flag = FD_CLOEXEC;
-+   ;
-+   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_FD_CLOEXEC 1
-+ _ACEOF
-+ 
-+ else
-+   $as_echo "$as_me: failed program was:" >&5
-+ sed 's/^/| /' conftest.$ac_ext >&5
-+ 
-+ 	{ $as_echo "$as_me:$LINENO: result: not usable" >&5
-+ $as_echo "not usable" >&6; }
-+ fi
-+ 
-+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ 
-  { $as_echo "$as_me:$LINENO: checking for rename" >&5
-  $as_echo_n "checking for rename... " >&6; }
-  cat >conftest.$ac_ext <<_ACEOF
-*** ../vim-7.2.299/src/config.h.in	2009-11-17 12:08:48.000000000 +0100
---- src/config.h.in	2009-11-17 13:01:36.000000000 +0100
-***************
-*** 388,390 ****
---- 388,393 ----
-  
-  /* Define if you want XSMP interaction as well as vanilla swapfile safety */
-  #undef USE_XSMP_INTERACT
-+ 
-+ /* Define if fcntl()'s F_SETFD command knows about FD_CLOEXEC */
-+ #undef HAVE_FD_CLOEXEC
-*** ../vim-7.2.299/src/configure.in	2009-11-17 12:08:48.000000000 +0100
---- src/configure.in	2009-11-17 13:01:36.000000000 +0100
-***************
-*** 2855,2860 ****
---- 2855,2870 ----
-    AC_MSG_RESULT(yes)
-  fi
-  
-+ dnl make sure the FD_CLOEXEC flag for fcntl()'s F_SETFD command is known
-+ AC_MSG_CHECKING(for FD_CLOEXEC)
-+ AC_TRY_COMPILE(
-+ [#if HAVE_FCNTL_H
-+ # include <fcntl.h>
-+ #endif],
-+ [	int flag = FD_CLOEXEC;],
-+ 	AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FD_CLOEXEC),
-+ 	AC_MSG_RESULT(not usable))
-+ 
-  dnl rename needs to be checked separately to work on Nextstep with cc
-  AC_MSG_CHECKING(for rename)
-  AC_TRY_LINK([#include <stdio.h>], [rename("this", "that")],
-*** ../vim-7.2.299/src/fileio.c	2009-11-17 14:57:19.000000000 +0100
---- src/fileio.c	2009-11-17 13:22:06.000000000 +0100
-***************
-*** 2254,2259 ****
---- 2254,2267 ----
-  
-      if (!read_buffer && !read_stdin)
-  	close(fd);				/* errors are ignored */
-+ #ifdef HAVE_FD_CLOEXEC
-+     else
-+     {
-+ 	int fdflags = fcntl(fd, F_GETFD);
-+ 	if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0)
-+ 	    fcntl(fd, F_SETFD, fdflags | FD_CLOEXEC);
-+     }
-+ #endif
-      vim_free(buffer);
-  
-  #ifdef HAVE_DUP
-*** ../vim-7.2.299/src/memfile.c	2008-07-13 19:39:39.000000000 +0200
---- src/memfile.c	2009-11-17 13:22:15.000000000 +0100
-***************
-*** 1343,1348 ****
---- 1343,1353 ----
-      }
-      else
-      {
-+ #ifdef HAVE_FD_CLOEXEC
-+ 	int fdflags = fcntl(mfp->mf_fd, F_GETFD);
-+ 	if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0)
-+ 	    fcntl(mfp->mf_fd, F_SETFD, fdflags | FD_CLOEXEC);
-+ #endif
-  #ifdef HAVE_SELINUX
-  	mch_copy_sec(fname, mfp->mf_fname);
-  #endif
-*** ../vim-7.2.299/src/memline.c	2009-11-03 15:32:58.000000000 +0100
---- src/memline.c	2009-11-17 13:21:40.000000000 +0100
-***************
-*** 382,388 ****
-      dp->db_index[0] = --dp->db_txt_start;	/* at end of block */
-      dp->db_free -= 1 + INDEX_SIZE;
-      dp->db_line_count = 1;
-!     *((char_u *)dp + dp->db_txt_start) = NUL;	/* emtpy line */
-  
-      return OK;
-  
---- 382,388 ----
-      dp->db_index[0] = --dp->db_txt_start;	/* at end of block */
-      dp->db_free -= 1 + INDEX_SIZE;
-      dp->db_line_count = 1;
-!     *((char_u *)dp + dp->db_txt_start) = NUL;	/* empty line */
-  
-      return OK;
-  
-***************
-*** 490,495 ****
---- 490,502 ----
-  	    EMSG(_("E301: Oops, lost the swap file!!!"));
-  	    return;
-  	}
-+ #ifdef HAVE_FD_CLOEXEC
-+ 	{
-+ 	    int fdflags = fcntl(mfp->mf_fd, F_GETFD);
-+ 	    if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0)
-+ 		fcntl(mfp->mf_fd, F_SETFD, fdflags | FD_CLOEXEC);
-+ 	}
-+ #endif
-      }
-      if (!success)
-  	EMSG(_("E302: Could not rename swap file"));
-*** ../vim-7.2.299/src/version.c	2009-11-17 16:08:12.000000000 +0100
---- src/version.c	2009-11-17 17:09:43.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     300,
-  /**/
-
--- 
-            |
-
-Ceci n'est pas une pipe.
-
- /// 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.301 b/source/ap/vim/patches/7.2.301
deleted file mode 100644
index e63cc088..00000000
--- a/source/ap/vim/patches/7.2.301
+++ /dev/null
@@ -1,777 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.301
-Fcc: outbox
-From: Bram Moolenaar <Bram@moolenaar.net>
-Mime-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-------------
-
-NOTE: some mail and patch programs may have a problem with the non-ASCII
-characters in this patch.  You can fetch the patch from
-ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.301  and/or fetch the updated
-files from CVS.  http://www.vim.org/cvs.php
-
-
-Patch 7.2.301
-Problem:    Formatting is wrong when 'tw' is set to a small value.
-Solution:   Fix it and add tests.  Also fix behavior of "1" in 'fo'. (Yukihiro
-	    Nakadaira)
-Files:	    src/edit.c, src/testdir/Makefile, src/testdir/test68.in,
-	    src/testdir/test68.ok, src/testdir/test69.in,
-	    src/testdir/test69.ok
-
-
-*** ../vim-7.2.300/src/edit.c	2009-11-11 13:22:32.000000000 +0100
---- src/edit.c	2009-11-17 15:34:47.000000000 +0100
-***************
-*** 181,187 ****
-  static void ins_ctrl_v __ARGS((void));
-  static void undisplay_dollar __ARGS((void));
-  static void insert_special __ARGS((int, int, int));
-! static void internal_format __ARGS((int textwidth, int second_indent, int flags, int format_only));
-  static void check_auto_format __ARGS((int));
-  static void redo_literal __ARGS((int c));
-  static void start_arrow __ARGS((pos_T *end_insert_pos));
---- 181,187 ----
-  static void ins_ctrl_v __ARGS((void));
-  static void undisplay_dollar __ARGS((void));
-  static void insert_special __ARGS((int, int, int));
-! static void internal_format __ARGS((int textwidth, int second_indent, int flags, int format_only, int c));
-  static void check_auto_format __ARGS((int));
-  static void redo_literal __ARGS((int c));
-  static void start_arrow __ARGS((pos_T *end_insert_pos));
-***************
-*** 2164,2170 ****
-      int		i, c;
-      int		actual_len;		/* Take multi-byte characters */
-      int		actual_compl_length;	/* into account. */
-!     int		*wca;		        /* Wide character array. */
-      int		has_lower = FALSE;
-      int		was_letter = FALSE;
-  
---- 2164,2170 ----
-      int		i, c;
-      int		actual_len;		/* Take multi-byte characters */
-      int		actual_compl_length;	/* into account. */
-!     int		*wca;			/* Wide character array. */
-      int		has_lower = FALSE;
-      int		was_letter = FALSE;
-  
-***************
-*** 5558,5564 ****
-  	}
-  	if (do_internal)
-  #endif
-! 	    internal_format(textwidth, second_indent, flags, c == NUL);
-      }
-  
-      if (c == NUL)	    /* only formatting was wanted */
---- 5558,5564 ----
-  	}
-  	if (do_internal)
-  #endif
-! 	    internal_format(textwidth, second_indent, flags, c == NUL, c);
-      }
-  
-      if (c == NUL)	    /* only formatting was wanted */
-***************
-*** 5738,5748 ****
-   * Format text at the current insert position.
-   */
-      static void
-! internal_format(textwidth, second_indent, flags, format_only)
-      int		textwidth;
-      int		second_indent;
-      int		flags;
-      int		format_only;
-  {
-      int		cc;
-      int		save_char = NUL;
---- 5738,5749 ----
-   * Format text at the current insert position.
-   */
-      static void
-! internal_format(textwidth, second_indent, flags, format_only, c)
-      int		textwidth;
-      int		second_indent;
-      int		flags;
-      int		format_only;
-+     int		c; /* character to be inserted (can be NUL) */
-  {
-      int		cc;
-      int		save_char = NUL;
-***************
-*** 5763,5769 ****
-       * When 'ai' is off we don't want a space under the cursor to be
-       * deleted.  Replace it with an 'x' temporarily.
-       */
-!     if (!curbuf->b_p_ai)
-      {
-  	cc = gchar_cursor();
-  	if (vim_iswhite(cc))
---- 5764,5774 ----
-       * When 'ai' is off we don't want a space under the cursor to be
-       * deleted.  Replace it with an 'x' temporarily.
-       */
-!     if (!curbuf->b_p_ai
-! #ifdef FEAT_VREPLACE
-! 	    && !(State & VREPLACE_FLAG)
-! #endif
-! 	    )
-      {
-  	cc = gchar_cursor();
-  	if (vim_iswhite(cc))
-***************
-*** 5789,5797 ****
-  	char_u	*saved_text = NULL;
-  #endif
-  	colnr_T	col;
-  
-! 	virtcol = get_nolist_virtcol();
-! 	if (virtcol < (colnr_T)textwidth)
-  	    break;
-  
-  #ifdef FEAT_COMMENTS
---- 5794,5804 ----
-  	char_u	*saved_text = NULL;
-  #endif
-  	colnr_T	col;
-+ 	colnr_T	end_col;
-  
-! 	virtcol = get_nolist_virtcol()
-! 		+ char2cells(c != NUL ? c : gchar_cursor());
-! 	if (virtcol <= (colnr_T)textwidth)
-  	    break;
-  
-  #ifdef FEAT_COMMENTS
-***************
-*** 5831,5842 ****
-  	coladvance((colnr_T)textwidth);
-  	wantcol = curwin->w_cursor.col;
-  
-! 	curwin->w_cursor.col = startcol - 1;
-! #ifdef FEAT_MBYTE
-! 	/* Correct cursor for multi-byte character. */
-! 	if (has_mbyte)
-! 	    mb_adjust_cursor();
-! #endif
-  	foundcol = 0;
-  
-  	/*
---- 5838,5844 ----
-  	coladvance((colnr_T)textwidth);
-  	wantcol = curwin->w_cursor.col;
-  
-! 	curwin->w_cursor.col = startcol;
-  	foundcol = 0;
-  
-  	/*
-***************
-*** 5847,5857 ****
-  		    || curwin->w_cursor.lnum != Insstart.lnum
-  		    || curwin->w_cursor.col >= Insstart.col)
-  	{
-! 	    cc = gchar_cursor();
-  	    if (WHITECHAR(cc))
-  	    {
-  		/* remember position of blank just before text */
-! 		end_foundcol = curwin->w_cursor.col;
-  
-  		/* find start of sequence of blanks */
-  		while (curwin->w_cursor.col > 0 && WHITECHAR(cc))
---- 5849,5862 ----
-  		    || curwin->w_cursor.lnum != Insstart.lnum
-  		    || curwin->w_cursor.col >= Insstart.col)
-  	{
-! 	    if (curwin->w_cursor.col == startcol && c != NUL)
-! 		cc = c;
-! 	    else
-! 		cc = gchar_cursor();
-  	    if (WHITECHAR(cc))
-  	    {
-  		/* remember position of blank just before text */
-! 		end_col = curwin->w_cursor.col;
-  
-  		/* find start of sequence of blanks */
-  		while (curwin->w_cursor.col > 0 && WHITECHAR(cc))
-***************
-*** 5871,5877 ****
-  		    /* do not break after one-letter words */
-  		    if (curwin->w_cursor.col == 0)
-  			break;	/* one-letter word at begin */
-! 
-  		    col = curwin->w_cursor.col;
-  		    dec_cursor();
-  		    cc = gchar_cursor();
---- 5876,5886 ----
-  		    /* do not break after one-letter words */
-  		    if (curwin->w_cursor.col == 0)
-  			break;	/* one-letter word at begin */
-! #ifdef FEAT_COMMENTS
-! 		    /* do not break "#a b" when 'tw' is 2 */
-! 		    if (curwin->w_cursor.col <= leader_len)
-! 			break;
-! #endif
-  		    col = curwin->w_cursor.col;
-  		    dec_cursor();
-  		    cc = gchar_cursor();
-***************
-*** 5880,5905 ****
-  			continue;	/* one-letter, continue */
-  		    curwin->w_cursor.col = col;
-  		}
-! #ifdef FEAT_MBYTE
-! 		if (has_mbyte)
-! 		    foundcol = curwin->w_cursor.col
-! 					 + (*mb_ptr2len)(ml_get_cursor());
-! 		else
-! #endif
-! 		    foundcol = curwin->w_cursor.col + 1;
-! 		if (curwin->w_cursor.col < (colnr_T)wantcol)
-  		    break;
-  	    }
-  #ifdef FEAT_MBYTE
-! 	    else if (cc >= 0x100 && fo_multibyte
-! 			      && curwin->w_cursor.col <= (colnr_T)wantcol)
-  	    {
-  		/* Break after or before a multi-byte character. */
-  		foundcol = curwin->w_cursor.col;
-- 		if (curwin->w_cursor.col < (colnr_T)wantcol)
-- 		    foundcol += (*mb_char2len)(cc);
-  		end_foundcol = foundcol;
-! 		break;
-  	    }
-  #endif
-  	    if (curwin->w_cursor.col == 0)
---- 5889,5948 ----
-  			continue;	/* one-letter, continue */
-  		    curwin->w_cursor.col = col;
-  		}
-! 
-! 		inc_cursor();
-! 
-! 		end_foundcol = end_col + 1;
-! 		foundcol = curwin->w_cursor.col;
-! 		if (curwin->w_cursor.col <= (colnr_T)wantcol)
-  		    break;
-  	    }
-  #ifdef FEAT_MBYTE
-! 	    else if (cc >= 0x100 && fo_multibyte)
-  	    {
-  		/* Break after or before a multi-byte character. */
-+ 		if (curwin->w_cursor.col != startcol)
-+ 		{
-+ #ifdef FEAT_COMMENTS
-+ 		    /* Don't break until after the comment leader */
-+ 		    if (curwin->w_cursor.col < leader_len)
-+ 			break;
-+ #endif
-+ 		    col = curwin->w_cursor.col;
-+ 		    inc_cursor();
-+ 		    /* Don't change end_foundcol if already set. */
-+ 		    if (foundcol != curwin->w_cursor.col)
-+ 		    {
-+ 			foundcol = curwin->w_cursor.col;
-+ 			end_foundcol = foundcol;
-+ 			if (curwin->w_cursor.col <= (colnr_T)wantcol)
-+ 			    break;
-+ 		    }
-+ 		    curwin->w_cursor.col = col;
-+ 		}
-+ 
-+ 		if (curwin->w_cursor.col == 0)
-+ 		    break;
-+ 
-+ 		col = curwin->w_cursor.col;
-+ 
-+ 		dec_cursor();
-+ 		cc = gchar_cursor();
-+ 
-+ 		if (WHITECHAR(cc))
-+ 		    continue;		/* break with space */
-+ #ifdef FEAT_COMMENTS
-+ 		/* Don't break until after the comment leader */
-+ 		if (curwin->w_cursor.col < leader_len)
-+ 		    break;
-+ #endif
-+ 
-+ 		curwin->w_cursor.col = col;
-+ 
-  		foundcol = curwin->w_cursor.col;
-  		end_foundcol = foundcol;
-! 		if (curwin->w_cursor.col <= (colnr_T)wantcol)
-! 		    break;
-  	    }
-  #endif
-  	    if (curwin->w_cursor.col == 0)
-***************
-*** 5926,5939 ****
-  	    orig_col = startcol;	/* Will start backspacing from here */
-  	else
-  #endif
-! 	    replace_offset = startcol - end_foundcol - 1;
-  
-  	/*
-  	 * adjust startcol for spaces that will be deleted and
-  	 * characters that will remain on top line
-  	 */
-  	curwin->w_cursor.col = foundcol;
-! 	while (cc = gchar_cursor(), WHITECHAR(cc))
-  	    inc_cursor();
-  	startcol -= curwin->w_cursor.col;
-  	if (startcol < 0)
---- 5969,5983 ----
-  	    orig_col = startcol;	/* Will start backspacing from here */
-  	else
-  #endif
-! 	    replace_offset = startcol - end_foundcol;
-  
-  	/*
-  	 * adjust startcol for spaces that will be deleted and
-  	 * characters that will remain on top line
-  	 */
-  	curwin->w_cursor.col = foundcol;
-! 	while ((cc = gchar_cursor(), WHITECHAR(cc))
-! 		    && (!fo_white_par || curwin->w_cursor.col < startcol))
-  	    inc_cursor();
-  	startcol -= curwin->w_cursor.col;
-  	if (startcol < 0)
-***************
-*** 8509,8515 ****
-  	if (mode == BACKSPACE_LINE
-  		&& (curbuf->b_p_ai
-  #ifdef FEAT_CINDENT
-!                     || cindent_on()
-  #endif
-  		   )
-  #ifdef FEAT_RIGHTLEFT
---- 8553,8559 ----
-  	if (mode == BACKSPACE_LINE
-  		&& (curbuf->b_p_ai
-  #ifdef FEAT_CINDENT
-! 		    || cindent_on()
-  #endif
-  		   )
-  #ifdef FEAT_RIGHTLEFT
-*** ../vim-7.2.300/src/testdir/Makefile	2009-11-17 17:36:13.000000000 +0100
---- src/testdir/Makefile	2009-11-17 15:11:26.000000000 +0100
-***************
-*** 22,28 ****
-  		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 test67.out
-  
-  SCRIPTS_GUI = test16.out
-  
---- 22,29 ----
-  		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 test67.out test68.out \
-! 		test69.out
-  
-  SCRIPTS_GUI = test16.out
-  
-*** ../vim-7.2.300/src/testdir/test68.in	2009-11-17 17:39:36.000000000 +0100
---- src/testdir/test68.in	2009-11-17 15:39:09.000000000 +0100
-***************
-*** 0 ****
---- 1,56 ----
-+ Test for text formatting.
-+ 
-+ Results of test68:
-+ 
-+ STARTTEST
-+ :so small.vim
-+ /^{/+1
-+ :set noai tw=2 fo=t
-+ gRa b
-+ ENDTEST
-+ 
-+ {
-+     
-+ 
-+ }
-+ 
-+ STARTTEST
-+ /^{/+1
-+ :set ai tw=2 fo=tw
-+ gqgqjjllab
-+ ENDTEST
-+ 
-+ {
-+ a  b  
-+ 
-+ a    
-+ }
-+ 
-+ STARTTEST
-+ /^{/+1
-+ :set tw=3 fo=t
-+ gqgqo
-+ a 

-+ ENDTEST
-+ 
-+ {
-+ a 

-+ }
-+ 
-+ STARTTEST
-+ /^{/+1
-+ :set tw=2 fo=tcq1 comments=:#
-+ gqgqjgqgqo
-+ a b
-+ #a b
-+ ENDTEST
-+ 
-+ {
-+ a b
-+ #a b
-+ }
-+ 
-+ STARTTEST
-+ :g/^STARTTEST/.,/^ENDTEST/d
-+ :1;/^Results/,$wq! test.out
-+ ENDTEST
-*** ../vim-7.2.300/src/testdir/test68.ok	2009-11-17 17:39:36.000000000 +0100
---- src/testdir/test68.ok	2009-11-17 15:11:26.000000000 +0100
-***************
-*** 0 ****
---- 1,35 ----
-+ Results of test68:
-+ 
-+ 
-+ {
-+ a
-+ b
-+ }
-+ 
-+ 
-+ {
-+ a  
-+ b  
-+ 
-+ a  
-+ b
-+ }
-+ 
-+ 
-+ {
-+ a
-+ 

-+ 
-+ a
-+ 

-+ }
-+ 
-+ 
-+ {
-+ a b
-+ #a b
-+ 
-+ a b
-+ #a b
-+ }
-+ 
-*** ../vim-7.2.300/src/testdir/test69.in	2009-11-17 17:39:36.000000000 +0100
---- src/testdir/test69.in	2009-11-17 15:11:26.000000000 +0100
-***************
-*** 0 ****
---- 1,139 ----
-+ Test for multi-byte text formatting.
-+ 
-+ STARTTEST
-+ :so mbyte.vim
-+ :set encoding=utf-8
-+ ENDTEST
-+ 
-+ Results of test69:
-+ 
-+ STARTTEST
-+ /^{/+1
-+ :set tw=2 fo=t
-+ gqgqjgqgqo
-+ ＸＹＺ
-+ abc ＸＹＺ
-+ ENDTEST
-+ 
-+ {
-+ ＸＹＺ
-+ abc ＸＹＺ
-+ }
-+ 
-+ STARTTEST
-+ /^{/+1
-+ :set tw=1 fo=tm
-+ gqgqjgqgqjgqgqjgqgqjgqgqo
-+ Ｘ
-+ Ｘa
-+ Ｘ a
-+ ＸＹ
-+ Ｘ Ｙ
-+ ENDTEST
-+ 
-+ {
-+ Ｘ
-+ Ｘa
-+ Ｘ a
-+ ＸＹ
-+ Ｘ Ｙ
-+ }
-+ 
-+ STARTTEST
-+ /^{/+1
-+ :set tw=2 fo=tm
-+ gqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqo
-+ Ｘ
-+ Ｘa
-+ Ｘ a
-+ ＸＹ
-+ Ｘ Ｙ
-+ aＸ
-+ abＸ
-+ abcＸ
-+ abＸ c
-+ abＸＹ
-+ ENDTEST
-+ 
-+ {
-+ Ｘ
-+ Ｘa
-+ Ｘ a
-+ ＸＹ
-+ Ｘ Ｙ
-+ aＸ
-+ abＸ
-+ abcＸ
-+ abＸ c
-+ abＸＹ
-+ }
-+ 
-+ STARTTEST
-+ /^{/+1
-+ :set ai tw=2 fo=tm
-+ gqgqjgqgqo
-+ Ｘ
-+ Ｘa
-+ ENDTEST
-+ 
-+ {
-+   Ｘ
-+   Ｘa
-+ }
-+ 
-+ STARTTEST
-+ /^{/+1
-+ :set noai tw=2 fo=tm
-+ gqgqjgqgqo
-+   Ｘ
-+   Ｘa
-+ ENDTEST
-+ 
-+ {
-+   Ｘ
-+   Ｘa
-+ }
-+ 
-+ STARTTEST
-+ /^{/+1
-+ :set tw=2 fo=cqm comments=n:Ｘ
-+ gqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqo
-+ Ｘ
-+ Ｘa
-+ ＸaＹ
-+ ＸＹ
-+ ＸＹＺ
-+ Ｘ Ｙ
-+ Ｘ ＹＺ
-+ ＸＸ
-+ ＸＸa
-+ ＸＸＹ
-+ ENDTEST
-+ 
-+ {
-+ Ｘ
-+ Ｘa
-+ ＸaＹ
-+ ＸＹ
-+ ＸＹＺ
-+ Ｘ Ｙ
-+ Ｘ ＹＺ
-+ ＸＸ
-+ ＸＸa
-+ ＸＸＹ
-+ }
-+ 
-+ STARTTEST
-+ /^{/+1
-+ :set tw=2 fo=tm
-+ RＸa
-+ ENDTEST
-+ 
-+ {
-+ 
-+ }
-+ 
-+ STARTTEST
-+ :g/^STARTTEST/.,/^ENDTEST/d
-+ :1;/^Results/,$wq! test.out
-+ ENDTEST
-*** ../vim-7.2.300/src/testdir/test69.ok	2009-11-17 17:39:36.000000000 +0100
---- src/testdir/test69.ok	2009-11-17 15:11:26.000000000 +0100
-***************
-*** 0 ****
---- 1,142 ----
-+ Results of test69:
-+ 
-+ 
-+ {
-+ ＸＹＺ
-+ abc
-+ ＸＹＺ
-+ 
-+ ＸＹＺ
-+ abc
-+ ＸＹＺ
-+ }
-+ 
-+ 
-+ {
-+ Ｘ
-+ Ｘ
-+ a
-+ Ｘ
-+ a
-+ Ｘ
-+ ï¼¹
-+ Ｘ
-+ ï¼¹
-+ 
-+ Ｘ
-+ Ｘ
-+ a
-+ Ｘ
-+ a
-+ Ｘ
-+ ï¼¹
-+ Ｘ
-+ ï¼¹
-+ }
-+ 
-+ 
-+ {
-+ Ｘ
-+ Ｘ
-+ a
-+ Ｘ
-+ a
-+ Ｘ
-+ ï¼¹
-+ Ｘ
-+ ï¼¹
-+ a
-+ Ｘ
-+ ab
-+ Ｘ
-+ abc
-+ Ｘ
-+ ab
-+ Ｘ
-+ c
-+ ab
-+ Ｘ
-+ ï¼¹
-+ 
-+ Ｘ
-+ Ｘ
-+ a
-+ Ｘ
-+ a
-+ Ｘ
-+ ï¼¹
-+ Ｘ
-+ ï¼¹
-+ a
-+ Ｘ
-+ ab
-+ Ｘ
-+ abc
-+ Ｘ
-+ ab
-+ Ｘ
-+ c
-+ ab
-+ Ｘ
-+ ï¼¹
-+ }
-+ 
-+ 
-+ {
-+   Ｘ
-+   Ｘ
-+   a
-+ 
-+   Ｘ
-+   Ｘ
-+   a
-+ }
-+ 
-+ 
-+ {
-+   Ｘ
-+   Ｘ
-+ a
-+ 
-+   Ｘ
-+   Ｘ
-+ a
-+ }
-+ 
-+ 
-+ {
-+ Ｘ
-+ Ｘa
-+ Ｘa
-+ ＸＹ
-+ ＸＹ
-+ ＸＹ
-+ ＸＺ
-+ Ｘ Ｙ
-+ Ｘ Ｙ
-+ Ｘ Ｚ
-+ ＸＸ
-+ ＸＸa
-+ ＸＸＹ
-+ 
-+ Ｘ
-+ Ｘa
-+ Ｘa
-+ ＸＹ
-+ ＸＹ
-+ ＸＹ
-+ ＸＺ
-+ Ｘ Ｙ
-+ Ｘ Ｙ
-+ Ｘ Ｚ
-+ ＸＸ
-+ ＸＸa
-+ ＸＸＹ
-+ }
-+ 
-+ 
-+ {
-+ Ｘ
-+ a
-+ }
-+ 
-*** ../vim-7.2.300/src/version.c	2009-11-17 17:37:34.000000000 +0100
---- src/version.c	2009-11-17 17:26:35.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     301,
-  /**/
diff --git a/source/ap/vim/patches/7.2.302 b/source/ap/vim/patches/7.2.302
deleted file mode 100644
index c4d5a99d..00000000
--- a/source/ap/vim/patches/7.2.302
+++ /dev/null
@@ -1,140 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.302 (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.302 (extra part of 7.2.301)
-Problem:    Formatting wrong with small 'tw' value.
-Solution:   Add build rules for tests.
-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.301/src/testdir/Make_amiga.mak	2009-09-18 14:58:26.000000000 +0200
---- src/testdir/Make_amiga.mak	2009-11-17 15:29:05.000000000 +0100
-***************
-*** 26,32 ****
-  		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 test67.out
-  
-  .SUFFIXES: .in .out
-  
---- 26,32 ----
-  		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 test67.out test68.out test69.out
-  
-  .SUFFIXES: .in .out
-  
-***************
-*** 113,115 ****
---- 113,117 ----
-  test65.out: test65.in
-  test66.out: test66.in
-  test67.out: test67.in
-+ test68.out: test68.in
-+ test69.out: test69.in
-*** ../vim-7.2.301/src/testdir/Make_dos.mak	2009-09-18 14:58:26.000000000 +0200
---- src/testdir/Make_dos.mak	2009-11-17 15:29:54.000000000 +0100
-***************
-*** 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 test67.out
-  
-  SCRIPTS32 =	test50.out
-  
---- 26,33 ----
-  		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 test67.out \
-! 		test68.out test69.out
-  
-  SCRIPTS32 =	test50.out
-  
-*** ../vim-7.2.301/src/testdir/Make_ming.mak	2009-09-18 14:58:26.000000000 +0200
---- src/testdir/Make_ming.mak	2009-11-17 15:30:07.000000000 +0100
-***************
-*** 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 test67.out
-  
-  SCRIPTS32 =	test50.out
-  
---- 45,52 ----
-  		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 test67.out \
-! 		test68.out test69.out
-  
-  SCRIPTS32 =	test50.out
-  
-*** ../vim-7.2.301/src/testdir/Make_os2.mak	2009-09-18 14:58:26.000000000 +0200
---- src/testdir/Make_os2.mak	2009-11-17 15:11:26.000000000 +0100
-***************
-*** 26,32 ****
-  		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 test67.out
-  
-  .SUFFIXES: .in .out
-  
---- 26,32 ----
-  		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 test67.out test68.out test69.out
-  
-  .SUFFIXES: .in .out
-  
-*** ../vim-7.2.301/src/testdir/Make_vms.mms	2009-09-18 14:58:26.000000000 +0200
---- src/testdir/Make_vms.mms	2009-11-17 15:11:26.000000000 +0100
-***************
-*** 69,75 ****
-  	 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 test67.out
-  
-  .IFDEF WANT_GUI
-  SCRIPT_GUI = test16.out
---- 69,75 ----
-  	 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 test67.out test68.out test69.out
-  
-  .IFDEF WANT_GUI
-  SCRIPT_GUI = test16.out
-*** ../vim-7.2.301/src/version.c	2009-11-17 17:40:34.000000000 +0100
---- src/version.c	2009-11-17 17:43:26.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     302,
-  /**/
-
--- 
-Hacker: Someone skilled in computer programming (good guy).
-Cracker: A hacker that uses his skills to crack software (bad guy).
-
- /// 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.303 b/source/ap/vim/patches/7.2.303
deleted file mode 100644
index b53d1981..00000000
--- a/source/ap/vim/patches/7.2.303
+++ /dev/null
@@ -1,70 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.303
-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.303 (after 7.2.294)
-Problem:    Can't build on MS-Windows.
-Solution:   Add #ifdef around vim_settempdir(). (James Vega)
-Files:	    src/fileio.c
-
-
-*** ../vim-7.2.302/src/fileio.c	2009-11-17 17:13:03.000000000 +0100
---- src/fileio.c	2009-11-18 20:06:55.000000000 +0100
-***************
-*** 146,152 ****
---- 146,154 ----
-  # endif
-  #endif
-  static int move_lines __ARGS((buf_T *frombuf, buf_T *tobuf));
-+ #ifdef TEMPDIRNAMES
-  static void vim_settempdir __ARGS((char_u *tempdir));
-+ #endif
-  #ifdef FEAT_AUTOCMD
-  static char *e_auchangedbuf = N_("E812: Autocommands changed buffer or buffer name");
-  #endif
-***************
-*** 6995,7000 ****
---- 6997,7003 ----
-  }
-  #endif
-  
-+ #ifdef TEMPDIRNAMES
-  /*
-   * Directory "tempdir" was created.  Expand this name to a full path and put
-   * it in "vim_tempdir".  This avoids that using ":cd" would confuse us.
-***************
-*** 7021,7026 ****
---- 7024,7030 ----
-  	vim_free(buf);
-      }
-  }
-+ #endif
-  
-  /*
-   * vim_tempname(): Return a unique name that can be used for a temp file.
-*** ../vim-7.2.302/src/version.c	2009-11-17 17:57:10.000000000 +0100
---- src/version.c	2009-11-18 20:07:58.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     303,
-  /**/
-
--- 
-BEDEVERE:        Why do you think she is a witch?
-SECOND VILLAGER: She turned me into a newt.
-BEDEVERE:        A newt?
-SECOND VILLAGER: (After looking at himself for some time) I got better.
-                 "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.304 b/source/ap/vim/patches/7.2.304
deleted file mode 100644
index 8a138c04..00000000
--- a/source/ap/vim/patches/7.2.304
+++ /dev/null
@@ -1,58 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.304
-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.304
-Problem:    Compiler warning for bad pointer cast.
-Solution:   Use another variable for int pointer.
-Files:	    src/ops.c
-
-
-*** ../vim-7.2.303/src/ops.c	2009-11-17 12:43:19.000000000 +0100
---- src/ops.c	2009-11-18 15:40:26.000000000 +0100
-***************
-*** 5597,5603 ****
-  	    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);
---- 5597,5606 ----
-  	    vc.vc_type = CONV_NONE;
-  	    if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK)
-  	    {
-! 	        int intlen = len;
-! 
-! 		conv_str = string_convert(&vc, str, &intlen);
-! 		len = intlen;
-  		if (conv_str != NULL)
-  		{
-  		    vim_free(str);
-*** ../vim-7.2.303/src/version.c	2009-11-18 20:12:15.000000000 +0100
---- src/version.c	2009-11-25 12:37:36.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     304,
-  /**/
-
--- 
-I recommend ordering large cargo containers of paper towels to make up
-whatever budget underruns you have.  Paper products are always useful and they
-have the advantage of being completely flushable if you need to make room in
-the storage area later.
-				(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.305 b/source/ap/vim/patches/7.2.305
deleted file mode 100644
index c8ad7084..00000000
--- a/source/ap/vim/patches/7.2.305
+++ /dev/null
@@ -1,105 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.305
-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.305
-Problem:    Recursively redrawing causes a memory leak. (Dominique Pelle)
-Solution:   Disallow recursive screen updating.
-Files:	    src/screen.c
-
-
-*** ../vim-7.2.304/src/screen.c	2009-11-11 17:07:25.000000000 +0100
---- src/screen.c	2009-11-17 16:30:53.000000000 +0100
-***************
-*** 323,328 ****
---- 323,329 ----
-      int		did_one;
-  #endif
-  
-+     /* Don't do anything if the screen structures are (not yet) valid. */
-      if (!screen_valid(TRUE))
-  	return;
-  
-***************
-*** 342,348 ****
-      if (curwin->w_lines_valid == 0 && type < NOT_VALID)
-  	type = NOT_VALID;
-  
-!     if (!redrawing())
-      {
-  	redraw_later(type);		/* remember type for next time */
-  	must_redraw = type;
---- 343,351 ----
-      if (curwin->w_lines_valid == 0 && type < NOT_VALID)
-  	type = NOT_VALID;
-  
-!     /* Postpone the redrawing when it's not needed and when being called
-!      * recursively. */
-!     if (!redrawing() || updating_screen)
-      {
-  	redraw_later(type);		/* remember type for next time */
-  	must_redraw = type;
-***************
-*** 582,587 ****
---- 585,591 ----
-  
-  /*
-   * Prepare for updating one or more windows.
-+  * Caller must check for "updating_screen" already set to avoid recursiveness.
-   */
-      static void
-  update_prepare()
-***************
-*** 663,669 ****
-  	    doit = TRUE;
-      }
-  
-!     if (!doit)
-  	return;
-  
-      /* update all windows that need updating */
---- 667,675 ----
-  	    doit = TRUE;
-      }
-  
-!     /* Return when there is nothing to do or screen updating already
-!      * happening. */
-!     if (!doit || updating_screen)
-  	return;
-  
-      /* update all windows that need updating */
-***************
-*** 696,701 ****
---- 702,711 ----
-  updateWindow(wp)
-      win_T	*wp;
-  {
-+     /* return if already busy updating */
-+     if (updating_screen)
-+ 	return;
-+ 
-      update_prepare();
-  
-  #ifdef FEAT_CLIPBOARD
-*** ../vim-7.2.304/src/version.c	2009-11-25 12:38:49.000000000 +0100
---- src/version.c	2009-11-25 13:01:48.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     305,
-  /**/
-
--- 
-If the Universe is constantly expanding, why can't I ever find a parking space?
-
- /// 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.306 b/source/ap/vim/patches/7.2.306
deleted file mode 100644
index d54e90d3..00000000
--- a/source/ap/vim/patches/7.2.306
+++ /dev/null
@@ -1,48 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.306
-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.306
-Problem:    shellescape("10%%", 1) only escapes first %. (Christian Brabandt)
-Solution:   Don't copy the character after the escaped one.
-Files:	    src/misc2.c
-
-
-*** ../vim-7.2.305/src/misc2.c	2009-11-11 16:56:13.000000000 +0100
---- src/misc2.c	2009-11-25 17:11:49.000000000 +0100
-***************
-*** 1390,1395 ****
---- 1390,1396 ----
-  		*d++ = '\\';		/* insert backslash */
-  		while (--l >= 0)	/* copy the var */
-  		    *d++ = *p++;
-+ 		continue;
-  	    }
-  
-  	    MB_COPY_CHAR(p, d);
-*** ../vim-7.2.305/src/version.c	2009-11-25 13:03:29.000000000 +0100
---- src/version.c	2009-11-25 17:13:54.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     306,
-  /**/
-
--- 
-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.307 b/source/ap/vim/patches/7.2.307
deleted file mode 100644
index 23504e2c..00000000
--- a/source/ap/vim/patches/7.2.307
+++ /dev/null
@@ -1,181 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.307
-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.307
-Problem:    Crash with a very long syntax match statement. (Guy Gur Ari)
-Solution:   When the offset does not fit in the two bytes available give an
-            error instead of continuing with invalid pointers.
-Files:      src/regexp.c
-
-
-*** ../vim-7.2.306/src/regexp.c	2009-05-15 21:31:11.000000000 +0200
---- src/regexp.c	2009-11-25 18:13:03.000000000 +0100
-***************
-*** 583,588 ****
---- 583,589 ----
-  #endif
-  static char_u	*regcode;	/* Code-emit pointer, or JUST_CALC_SIZE */
-  static long	regsize;	/* Code size. */
-+ static int	reg_toolong;	/* TRUE when offset out of range */
-  static char_u	had_endbrace[NSUBEXP];	/* flags, TRUE if end of () found */
-  static unsigned	regflags;	/* RF_ flags for prog */
-  static long	brace_min[10];	/* Minimums for complex brace repeats */
-***************
-*** 1028,1036 ****
-      regcomp_start(expr, re_flags);
-      regcode = r->program;
-      regc(REGMAGIC);
-!     if (reg(REG_NOPAREN, &flags) == NULL)
-      {
-  	vim_free(r);
-  	return NULL;
-      }
-  
---- 1029,1039 ----
-      regcomp_start(expr, re_flags);
-      regcode = r->program;
-      regc(REGMAGIC);
-!     if (reg(REG_NOPAREN, &flags) == NULL || reg_toolong)
-      {
-  	vim_free(r);
-+ 	if (reg_toolong)
-+ 	    EMSG_RET_NULL(_("E339: Pattern too long"));
-  	return NULL;
-      }
-  
-***************
-*** 1141,1146 ****
---- 1144,1150 ----
-      re_has_z = 0;
-  #endif
-      regsize = 0L;
-+     reg_toolong = FALSE;
-      regflags = 0;
-  #if defined(FEAT_SYN_HL) || defined(PROTO)
-      had_eol = FALSE;
-***************
-*** 1228,1234 ****
-      {
-  	skipchr();
-  	br = regbranch(&flags);
-! 	if (br == NULL)
-  	    return NULL;
-  	regtail(ret, br);	/* BRANCH -> BRANCH. */
-  	if (!(flags & HASWIDTH))
---- 1232,1238 ----
-      {
-  	skipchr();
-  	br = regbranch(&flags);
-! 	if (br == NULL || reg_toolong)
-  	    return NULL;
-  	regtail(ret, br);	/* BRANCH -> BRANCH. */
-  	if (!(flags & HASWIDTH))
-***************
-*** 1313,1318 ****
---- 1317,1324 ----
-  	    break;
-  	skipchr();
-  	regtail(latest, regnode(END)); /* operand ends */
-+ 	if (reg_toolong)
-+ 	    break;
-  	reginsert(MATCH, latest);
-  	chain = latest;
-      }
-***************
-*** 1382,1388 ****
-  			    break;
-  	    default:
-  			    latest = regpiece(&flags);
-! 			    if (latest == NULL)
-  				return NULL;
-  			    *flagp |= flags & (HASWIDTH | HASNL | HASLOOKBH);
-  			    if (chain == NULL)	/* First piece. */
---- 1388,1394 ----
-  			    break;
-  	    default:
-  			    latest = regpiece(&flags);
-! 			    if (latest == NULL || reg_toolong)
-  				return NULL;
-  			    *flagp |= flags & (HASWIDTH | HASNL | HASLOOKBH);
-  			    if (chain == NULL)	/* First piece. */
-***************
-*** 2540,2547 ****
-  	offset = (int)(scan - val);
-      else
-  	offset = (int)(val - scan);
-!     *(scan + 1) = (char_u) (((unsigned)offset >> 8) & 0377);
-!     *(scan + 2) = (char_u) (offset & 0377);
-  }
-  
-  /*
---- 2546,2561 ----
-  	offset = (int)(scan - val);
-      else
-  	offset = (int)(val - scan);
-!     /* When the offset uses more than 16 bits it can no longer fit in the two
-!      * bytes avaliable.  Use a global flag to avoid having to check return
-!      * values in too many places. */
-!     if (offset > 0xffff)
-! 	reg_toolong = TRUE;
-!     else
-!     {
-! 	*(scan + 1) = (char_u) (((unsigned)offset >> 8) & 0377);
-! 	*(scan + 2) = (char_u) (offset & 0377);
-!     }
-  }
-  
-  /*
-***************
-*** 5764,5769 ****
---- 5778,5785 ----
-  
-  /*
-   * regnext - dig the "next" pointer out of a node
-+  * Returns NULL when calculating size, when there is no next item and when
-+  * there is an error.
-   */
-      static char_u *
-  regnext(p)
-***************
-*** 5771,5777 ****
-  {
-      int	    offset;
-  
-!     if (p == JUST_CALC_SIZE)
-  	return NULL;
-  
-      offset = NEXT(p);
---- 5787,5793 ----
-  {
-      int	    offset;
-  
-!     if (p == JUST_CALC_SIZE || reg_toolong)
-  	return NULL;
-  
-      offset = NEXT(p);
-*** ../vim-7.2.306/src/version.c	2009-11-25 17:15:16.000000000 +0100
---- src/version.c	2009-11-25 18:14:32.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     307,
-  /**/
-
--- 
-The fastest way to get an engineer to solve a problem is to declare that the
-problem is unsolvable.  No engineer can walk away from an unsolvable problem
-until it's solved.
-				(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.308 b/source/ap/vim/patches/7.2.308
deleted file mode 100644
index 1e19b21d..00000000
--- a/source/ap/vim/patches/7.2.308
+++ /dev/null
@@ -1,182 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.308
-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.308
-Problem:    When using a regexp in the "\=" expression of a substitute
-	    command, submatch() returns empty strings for further lines.
-	    (Clockwork Jam)
-Solution:   Save and restore the line number and line count when calling
-	    reg_getline().
-Files:	    src/regexp.c
-
-
-*** ../vim-7.2.307/src/regexp.c	2009-11-25 18:21:48.000000000 +0100
---- src/regexp.c	2009-11-25 19:45:07.000000000 +0100
-***************
-*** 6828,6833 ****
---- 6828,6835 ----
-   * that contains a call to substitute() and submatch(). */
-  static regmatch_T	*submatch_match;
-  static regmmatch_T	*submatch_mmatch;
-+ static linenr_T		submatch_firstlnum;
-+ static linenr_T		submatch_maxline;
-  #endif
-  
-  #if defined(FEAT_MODIFY_FNAME) || defined(FEAT_EVAL) || defined(PROTO)
-***************
-*** 6941,6947 ****
-  	}
-  	else
-  	{
-- 	    linenr_T	save_reg_maxline;
-  	    win_T	*save_reg_win;
-  	    int		save_ireg_ic;
-  
---- 6943,6948 ----
-***************
-*** 6953,6959 ****
-  	     * vim_regexec_multi() can't be called recursively. */
-  	    submatch_match = reg_match;
-  	    submatch_mmatch = reg_mmatch;
-! 	    save_reg_maxline = reg_maxline;
-  	    save_reg_win = reg_win;
-  	    save_ireg_ic = ireg_ic;
-  	    can_f_submatch = TRUE;
---- 6954,6961 ----
-  	     * vim_regexec_multi() can't be called recursively. */
-  	    submatch_match = reg_match;
-  	    submatch_mmatch = reg_mmatch;
-! 	    submatch_firstlnum = reg_firstlnum;
-! 	    submatch_maxline = reg_maxline;
-  	    save_reg_win = reg_win;
-  	    save_ireg_ic = ireg_ic;
-  	    can_f_submatch = TRUE;
-***************
-*** 6976,6982 ****
-  
-  	    reg_match = submatch_match;
-  	    reg_mmatch = submatch_mmatch;
-! 	    reg_maxline = save_reg_maxline;
-  	    reg_win = save_reg_win;
-  	    ireg_ic = save_ireg_ic;
-  	    can_f_submatch = FALSE;
---- 6978,6985 ----
-  
-  	    reg_match = submatch_match;
-  	    reg_mmatch = submatch_mmatch;
-! 	    reg_firstlnum = submatch_firstlnum;
-! 	    reg_maxline = submatch_maxline;
-  	    reg_win = save_reg_win;
-  	    ireg_ic = save_ireg_ic;
-  	    can_f_submatch = FALSE;
-***************
-*** 7212,7217 ****
---- 7215,7243 ----
-  
-  #ifdef FEAT_EVAL
-  /*
-+  * Call reg_getline() with the line numbers from the submatch.  If a
-+  * substitute() was used the reg_maxline and other values have been
-+  * overwritten.
-+  */
-+     static char_u *
-+ reg_getline_submatch(lnum)
-+     linenr_T	lnum;
-+ {
-+     char_u *s;
-+     linenr_T save_first = reg_firstlnum;
-+     linenr_T save_max = reg_maxline;
-+ 
-+     reg_firstlnum = submatch_firstlnum;
-+     reg_maxline = submatch_maxline;
-+ 
-+     s = reg_getline(lnum);
-+ 
-+     reg_firstlnum = save_first;
-+     reg_maxline = save_max;
-+     return s;
-+ }
-+ 
-+ /*
-   * Used for the submatch() function: get the string from the n'th submatch in
-   * allocated memory.
-   * Returns NULL when not in a ":s" command and for a non-existing submatch.
-***************
-*** 7241,7247 ****
-  	    if (lnum < 0 || submatch_mmatch->endpos[no].lnum < 0)
-  		return NULL;
-  
-! 	    s = reg_getline(lnum) + submatch_mmatch->startpos[no].col;
-  	    if (s == NULL)  /* anti-crash check, cannot happen? */
-  		break;
-  	    if (submatch_mmatch->endpos[no].lnum == lnum)
---- 7267,7273 ----
-  	    if (lnum < 0 || submatch_mmatch->endpos[no].lnum < 0)
-  		return NULL;
-  
-! 	    s = reg_getline_submatch(lnum) + submatch_mmatch->startpos[no].col;
-  	    if (s == NULL)  /* anti-crash check, cannot happen? */
-  		break;
-  	    if (submatch_mmatch->endpos[no].lnum == lnum)
-***************
-*** 7267,7273 ****
-  		++lnum;
-  		while (lnum < submatch_mmatch->endpos[no].lnum)
-  		{
-! 		    s = reg_getline(lnum++);
-  		    if (round == 2)
-  			STRCPY(retval + len, s);
-  		    len += (int)STRLEN(s);
---- 7293,7299 ----
-  		++lnum;
-  		while (lnum < submatch_mmatch->endpos[no].lnum)
-  		{
-! 		    s = reg_getline_submatch(lnum++);
-  		    if (round == 2)
-  			STRCPY(retval + len, s);
-  		    len += (int)STRLEN(s);
-***************
-*** 7276,7282 ****
-  		    ++len;
-  		}
-  		if (round == 2)
-! 		    STRNCPY(retval + len, reg_getline(lnum),
-  					     submatch_mmatch->endpos[no].col);
-  		len += submatch_mmatch->endpos[no].col;
-  		if (round == 2)
---- 7302,7308 ----
-  		    ++len;
-  		}
-  		if (round == 2)
-! 		    STRNCPY(retval + len, reg_getline_submatch(lnum),
-  					     submatch_mmatch->endpos[no].col);
-  		len += submatch_mmatch->endpos[no].col;
-  		if (round == 2)
-*** ../vim-7.2.307/src/version.c	2009-11-25 18:21:48.000000000 +0100
---- src/version.c	2009-11-25 19:50:16.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     308,
-  /**/
-
--- 
-Engineers are always delighted to share wisdom, even in areas in which they
-have no experience whatsoever.  Their logic provides them with inherent
-insight into any field of expertise.  This can be a problem when dealing with
-the illogical people who believe that knowledge can only be derived through
-experience.
-				(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.309 b/source/ap/vim/patches/7.2.309
deleted file mode 100644
index a1713b75..00000000
--- a/source/ap/vim/patches/7.2.309
+++ /dev/null
@@ -1,48 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.309
-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.309 (after 7.2.308)
-Problem:    Warning for missing function prototype. (Patrick Texier)
-Solution:   Add the prototype.
-Files:	    src/regexp.c
-
-
-*** ../vim-7.2.308/src/regexp.c	2009-11-25 19:51:56.000000000 +0100
---- src/regexp.c	2009-11-26 20:39:18.000000000 +0100
-***************
-*** 7214,7219 ****
---- 7214,7221 ----
-  }
-  
-  #ifdef FEAT_EVAL
-+ static char_u *reg_getline_submatch __ARGS((linenr_T lnum));
-+ 
-  /*
-   * Call reg_getline() with the line numbers from the submatch.  If a
-   * substitute() was used the reg_maxline and other values have been
-*** ../vim-7.2.308/src/version.c	2009-11-25 19:51:56.000000000 +0100
---- src/version.c	2009-11-26 20:40:11.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     309,
-  /**/
-
--- 
-Female engineers become irresistible at the age of consent and remain that
-way until about thirty minutes after their clinical death.  Longer if it's a
-warm day.
-				(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.310 b/source/ap/vim/patches/7.2.310
deleted file mode 100644
index 52734ddf..00000000
--- a/source/ap/vim/patches/7.2.310
+++ /dev/null
@@ -1,63 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.310
-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.310
-Problem:    When a filetype plugin in ~/.vim/ftdetect uses ":setfiletype" and
-	    the file starts with a "# comment" it gets "conf" filetype.
-Solution:   Check for "conf" filetype after using ftdetect plugins.
-Files:	    runtime/filetype.vim
-
-
-*** ../vim-7.2.309/runtime/filetype.vim	2008-08-06 18:56:36.000000000 +0200
---- runtime/filetype.vim	2009-12-02 12:08:42.000000000 +0100
-***************
-*** 2400,2405 ****
---- 2435,2446 ----
-  au BufNewFile,BufRead zsh*,zlog*		call s:StarSetf('zsh')
-  
-  
-+ 
-+ " Use the filetype detect plugins.  They may overrule any of the previously
-+ " detected filetypes.
-+ runtime! ftdetect/*.vim
-+ 
-+ 
-  " Generic configuration file (check this last, it's just guessing!)
-  au BufNewFile,BufRead,StdinReadPost *
-  	\ if !did_filetype() && expand("<amatch>") !~ g:ft_ignore_pat
-***************
-*** 2408,2417 ****
-  	\   setf conf |
-  	\ endif
-  
-- " Use the plugin-filetype checks last, they may overrule any of the previously
-- " detected filetypes.
-- runtime! ftdetect/*.vim
-- 
-  augroup END
-  
-  
---- 2449,2454 ----
-*** ../vim-7.2.309/src/version.c	2009-11-26 20:41:19.000000000 +0100
---- src/version.c	2009-12-02 12:05:27.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     310,
-  /**/
-
--- 
-A)bort, R)etry, P)lease don't bother 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.311 b/source/ap/vim/patches/7.2.311
deleted file mode 100644
index 9e27a739..00000000
--- a/source/ap/vim/patches/7.2.311
+++ /dev/null
@@ -1,52 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.311
-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.311
-Problem:    Can't compile with FreeMiNT.
-Solution:   Change #ifdef for limits.h. (Alan Hourihane)
-Files:	    src/fileio.c
-
-
-*** ../vim-7.2.310/src/fileio.c	2009-11-18 20:12:15.000000000 +0100
---- src/fileio.c	2009-12-02 13:30:07.000000000 +0100
-***************
-*** 21,27 ****
-  
-  #include "vim.h"
-  
-! #ifdef __TANDEM
-  # include <limits.h>		/* for SSIZE_MAX */
-  #endif
-  
---- 21,27 ----
-  
-  #include "vim.h"
-  
-! #if defined(__TANDEM) || defined(__MINT__)
-  # include <limits.h>		/* for SSIZE_MAX */
-  #endif
-  
-*** ../vim-7.2.310/src/version.c	2009-12-02 12:08:57.000000000 +0100
---- src/version.c	2009-12-02 13:31:46.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     311,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-3. Your bookmark takes 15 minutes to scroll from top to bottom.
-
- /// 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.312 b/source/ap/vim/patches/7.2.312
deleted file mode 100644
index 8b95868d..00000000
--- a/source/ap/vim/patches/7.2.312
+++ /dev/null
@@ -1,312 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.312
-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.312
-Problem:    iconv() returns an invalid character sequence when conversion
-	    fails.  It should return an empty string. (Yongwei Wu)
-Solution:   Be more strict about invalid characters in the input.
-Files:	    src/mbyte.c
-
-
-*** ../vim-7.2.311/src/mbyte.c	2009-06-16 15:23:07.000000000 +0200
---- src/mbyte.c	2009-11-25 16:10:44.000000000 +0100
-***************
-*** 133,154 ****
-  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
-!  * the first byte of a UTF-8 string.  Bytes which are illegal when used as the
-!  * first byte have a one, because these will be used separately. */
-  static char utf8len_tab[256] =
-  {
-      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-!     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /*bogus*/
-!     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /*bogus*/
-      2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-      3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,6,6,1,1,
-  };
-  
-  /*
-   * XIM often causes trouble.  Define XIM_DEBUG to get a log of XIM callbacks
-   * in the "xim.log" file.
-   */
---- 133,172 ----
-  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
-!  * the first byte of a UTF-8 string.
-!  * Bytes which are illegal when used as the first byte have a 1.
-!  * The NUL byte has length 1.
-!  */
-  static char utf8len_tab[256] =
-  {
-      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-!     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-!     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-      2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-      3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,6,6,1,1,
-  };
-  
-  /*
-+  * Like utf8len_tab above, but using a zero for illegal lead bytes.
-+  */
-+ static char utf8len_tab_zero[256] =
-+ {
-+     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-+     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-+     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-+     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-+     2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-+     3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,6,6,0,0,
-+ };
-+ 
-+ /*
-   * XIM often causes trouble.  Define XIM_DEBUG to get a log of XIM callbacks
-   * in the "xim.log" file.
-   */
-***************
-*** 1352,1358 ****
-      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)
---- 1370,1376 ----
-      if (size > 0 && *p >= 0x80)
-      {
-  	if (utf_ptr2len_len(p, size) < utf8len_tab[*p])
-! 	    return 1;  /* truncated */
-  	c = utf_ptr2char(p);
-  	/* An illegal byte is displayed as <xx>. */
-  	if (utf_ptr2len(p) == 1 || c == NUL)
-***************
-*** 1473,1479 ****
-      if (p[0] < 0x80)	/* be quick for ASCII */
-  	return p[0];
-  
-!     len = utf8len_tab[p[0]];
-      if (len > 1 && (p[1] & 0xc0) == 0x80)
-      {
-  	if (len == 2)
---- 1491,1497 ----
-      if (p[0] < 0x80)	/* be quick for ASCII */
-  	return p[0];
-  
-!     len = utf8len_tab_zero[p[0]];
-      if (len > 1 && (p[1] & 0xc0) == 0x80)
-      {
-  	if (len == 2)
-***************
-*** 1723,1728 ****
---- 1741,1747 ----
-  /*
-   * Return length of UTF-8 character, obtained from the first byte.
-   * "b" must be between 0 and 255!
-+  * Returns 1 for an invalid first byte value.
-   */
-      int
-  utf_byte2len(b)
-***************
-*** 1737,1742 ****
---- 1756,1762 ----
-   * Returns 1 for "".
-   * Returns 1 for an illegal byte sequence (also in incomplete byte seq.).
-   * Returns number > "size" for an incomplete byte sequence.
-+  * Never returns zero.
-   */
-      int
-  utf_ptr2len_len(p, size)
-***************
-*** 1747,1757 ****
-      int		i;
-      int		m;
-  
-!     if (*p == NUL)
-! 	return 1;
-!     m = len = utf8len_tab[*p];
-      if (len > size)
-  	m = size;	/* incomplete byte sequence. */
-      for (i = 1; i < m; ++i)
-  	if ((p[i] & 0xc0) != 0x80)
-  	    return 1;
---- 1767,1779 ----
-      int		i;
-      int		m;
-  
-!     len = utf8len_tab[*p];
-!     if (len == 1)
-! 	return 1;	/* NUL, ascii or illegal lead byte */
-      if (len > size)
-  	m = size;	/* incomplete byte sequence. */
-+     else
-+ 	m = len;
-      for (i = 1; i < m; ++i)
-  	if ((p[i] & 0xc0) != 0x80)
-  	    return 1;
-***************
-*** 2505,2510 ****
---- 2527,2533 ----
-  /*
-   * mb_head_off() function pointer.
-   * Return offset from "p" to the first byte of the character it points into.
-+  * If "p" points to the NUL at the end of the string return 0.
-   * Returns 0 when already at the first byte of a character.
-   */
-      int
-***************
-*** 2524,2530 ****
-  
-      /* It can't be a trailing byte when not using DBCS, at the start of the
-       * string or the previous byte can't start a double-byte. */
-!     if (p <= base || MB_BYTE2LEN(p[-1]) == 1)
-  	return 0;
-  
-      /* This is slow: need to start at the base and go forward until the
---- 2547,2553 ----
-  
-      /* It can't be a trailing byte when not using DBCS, at the start of the
-       * string or the previous byte can't start a double-byte. */
-!     if (p <= base || MB_BYTE2LEN(p[-1]) == 1 || *p == NUL)
-  	return 0;
-  
-      /* This is slow: need to start at the base and go forward until the
-***************
-*** 2552,2558 ****
-       * lead byte in the current cell. */
-      if (p <= base
-  	    || (enc_dbcs == DBCS_JPNU && p[-1] == 0x8e)
-! 	    || MB_BYTE2LEN(p[-1]) == 1)
-  	return 0;
-  
-      /* This is slow: need to start at the base and go forward until the
---- 2575,2582 ----
-       * lead byte in the current cell. */
-      if (p <= base
-  	    || (enc_dbcs == DBCS_JPNU && p[-1] == 0x8e)
-! 	    || MB_BYTE2LEN(p[-1]) == 1
-! 	    || *p == NUL)
-  	return 0;
-  
-      /* This is slow: need to start at the base and go forward until the
-***************
-*** 2578,2583 ****
---- 2602,2608 ----
-      char_u	*q;
-      char_u	*s;
-      int		c;
-+     int		len;
-  #ifdef FEAT_ARABIC
-      char_u	*j;
-  #endif
-***************
-*** 2597,2604 ****
-  	    --q;
-  	/* Check for illegal sequence. Do allow an illegal byte after where we
-  	 * started. */
-! 	if (utf8len_tab[*q] != (int)(s - q + 1)
-! 				       && utf8len_tab[*q] != (int)(p - q + 1))
-  	    return 0;
-  
-  	if (q <= base)
---- 2622,2629 ----
-  	    --q;
-  	/* Check for illegal sequence. Do allow an illegal byte after where we
-  	 * started. */
-! 	len = utf8len_tab[*q];
-! 	if (len != (int)(s - q + 1) && len != (int)(p - q + 1))
-  	    return 0;
-  
-  	if (q <= base)
-***************
-*** 2810,2818 ****
-  
-      while (end == NULL ? *p != NUL : p < end)
-      {
-! 	if ((*p & 0xc0) == 0x80)
-  	    return FALSE;	/* invalid lead byte */
-- 	l = utf8len_tab[*p];
-  	if (end != NULL && p + l > end)
-  	    return FALSE;	/* incomplete byte sequence */
-  	++p;
---- 2835,2843 ----
-  
-      while (end == NULL ? *p != NUL : p < end)
-      {
-! 	l = utf8len_tab_zero[*p];
-! 	if (l == 0)
-  	    return FALSE;	/* invalid lead byte */
-  	if (end != NULL && p + l > end)
-  	    return FALSE;	/* incomplete byte sequence */
-  	++p;
-***************
-*** 6117,6128 ****
-  	    d = retval;
-  	    for (i = 0; i < len; ++i)
-  	    {
-! 		l = utf_ptr2len(ptr + i);
-  		if (l == 0)
-  		    *d++ = NUL;
-  		else if (l == 1)
-  		{
-! 		    if (unconvlenp != NULL && utf8len_tab[ptr[i]] > len - i)
-  		    {
-  			/* Incomplete sequence at the end. */
-  			*unconvlenp = len - i;
---- 6142,6161 ----
-  	    d = retval;
-  	    for (i = 0; i < len; ++i)
-  	    {
-! 		l = utf_ptr2len_len(ptr + i, len - i);
-  		if (l == 0)
-  		    *d++ = NUL;
-  		else if (l == 1)
-  		{
-! 		    int l_w = utf8len_tab_zero[ptr[i]];
-! 
-! 		    if (l_w == 0)
-! 		    {
-! 			/* Illegal utf-8 byte cannot be converted */
-! 			vim_free(retval);
-! 			return NULL;
-! 		    }
-! 		    if (unconvlenp != NULL && l_w > len - i)
-  		    {
-  			/* Incomplete sequence at the end. */
-  			*unconvlenp = len - i;
-*** ../vim-7.2.311/src/version.c	2009-12-02 13:32:10.000000000 +0100
---- src/version.c	2009-12-02 15:00:23.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     312,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-6. You refuse to go to a vacation spot with no electricity and no phone lines.
-
- /// 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.313 b/source/ap/vim/patches/7.2.313
deleted file mode 100644
index 77b9103a..00000000
--- a/source/ap/vim/patches/7.2.313
+++ /dev/null
@@ -1,117 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.313
-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.313
-Problem:    Command line completion doesn't work after "%:h" and similar.
-Solution:   Expand these items before doing the completion.
-Files:	    src/ex_getln.c, src/misc1.c, src/proto/misc1.pro
-
-
-*** ../vim-7.2.312/src/ex_getln.c	2009-09-18 17:24:54.000000000 +0200
---- src/ex_getln.c	2009-12-02 16:40:06.000000000 +0100
-***************
-*** 4422,4428 ****
-  	    flags |= EW_FILE;
-  	else
-  	    flags = (flags | EW_DIR) & ~EW_FILE;
-! 	ret = expand_wildcards(1, &pat, num_file, file, flags);
-  	if (free_pat)
-  	    vim_free(pat);
-  	return ret;
---- 4422,4429 ----
-  	    flags |= EW_FILE;
-  	else
-  	    flags = (flags | EW_DIR) & ~EW_FILE;
-! 	/* Expand wildcards, supporting %:h and the like. */
-! 	ret = expand_wildcards_eval(&pat, num_file, file, flags);
-  	if (free_pat)
-  	    vim_free(pat);
-  	return ret;
-*** ../vim-7.2.312/src/misc1.c	2009-11-17 16:08:12.000000000 +0100
---- src/misc1.c	2009-12-02 17:06:49.000000000 +0100
-***************
-*** 8447,8452 ****
---- 8447,8492 ----
-  }
-  
-  /*
-+  * Invoke expand_wildcards() for one pattern.
-+  * Expand items like "%:h" before the expansion.
-+  * Returns OK or FAIL.
-+  */
-+     int
-+ expand_wildcards_eval(pat, num_file, file, flags)
-+     char_u	 **pat;		/* pointer to input pattern */
-+     int		  *num_file;	/* resulting number of files */
-+     char_u	***file;	/* array of resulting files */
-+     int		   flags;	/* EW_DIR, etc. */
-+ {
-+     int		ret = FAIL;
-+     char_u	*eval_pat = NULL;
-+     char_u	*exp_pat = *pat;
-+     char_u      *ignored_msg;
-+     int		usedlen;
-+ 
-+     if (*exp_pat == '%' || *exp_pat == '#' || *exp_pat == '<')
-+     {
-+ 	++emsg_off;
-+ 	eval_pat = eval_vars(exp_pat, exp_pat, &usedlen,
-+ 						    NULL, &ignored_msg, NULL);
-+ 	--emsg_off;
-+ 	if (eval_pat != NULL)
-+ 	    exp_pat = concat_str(eval_pat, exp_pat + usedlen);
-+     }
-+ 
-+     if (exp_pat != NULL)
-+ 	ret = expand_wildcards(1, &exp_pat, num_file, file, flags);
-+ 
-+     if (eval_pat != NULL)
-+     {
-+ 	vim_free(exp_pat);
-+ 	vim_free(eval_pat);
-+     }
-+ 
-+     return ret;
-+ }
-+ 
-+ /*
-   * Expand wildcards.  Calls gen_expand_wildcards() and removes files matching
-   * 'wildignore'.
-   * Returns OK or FAIL.
-*** ../vim-7.2.312/src/proto/misc1.pro	2007-09-26 22:36:32.000000000 +0200
---- src/proto/misc1.pro	2009-12-02 16:41:52.000000000 +0100
-***************
-*** 85,90 ****
---- 85,91 ----
-  int vim_fexists __ARGS((char_u *fname));
-  void line_breakcheck __ARGS((void));
-  void fast_breakcheck __ARGS((void));
-+ int expand_wildcards_eval __ARGS((char_u **pat, int *num_file, char_u ***file, int flags));
-  int expand_wildcards __ARGS((int num_pat, char_u **pat, int *num_file, char_u ***file, int flags));
-  int match_suffix __ARGS((char_u *fname));
-  int unix_expandpath __ARGS((garray_T *gap, char_u *path, int wildoff, int flags, int didstar));
-*** ../vim-7.2.312/src/version.c	2009-12-02 15:03:24.000000000 +0100
---- src/version.c	2009-12-02 17:14:02.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     313,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-8. You spend half of the plane trip with your laptop on your lap...and your
-   child in the overhead compartment.
-
- /// 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.314 b/source/ap/vim/patches/7.2.314
deleted file mode 100644
index 490605d0..00000000
--- a/source/ap/vim/patches/7.2.314
+++ /dev/null
@@ -1,56 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.314
-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.314
-Problem:    Missing function in small build.
-Solution:   Always include concat_str.
-Files:	    src/misc1.c
-
-
-*** ../vim-7.2.313/src/misc1.c	2009-12-02 17:15:04.000000000 +0100
---- src/misc1.c	2009-12-02 17:44:55.000000000 +0100
-***************
-*** 4666,4672 ****
-      return dest;
-  }
-  
-- #if defined(FEAT_EVAL) || defined(FEAT_GETTEXT) || defined(PROTO)
-  /*
-   * Concatenate two strings and return the result in allocated memory.
-   * Returns NULL when out of memory.
---- 4666,4671 ----
-***************
-*** 4687,4693 ****
-      }
-      return dest;
-  }
-- #endif
-  
-  /*
-   * Add a path separator to a file name, unless it already ends in a path
---- 4686,4691 ----
-*** ../vim-7.2.313/src/version.c	2009-12-02 17:15:04.000000000 +0100
---- src/version.c	2009-12-02 17:47:18.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     314,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-9. All your daydreaming is preoccupied with getting a faster connection to the
-   net: 28.8...ISDN...cable modem...T1...T3.
-
- /// 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.315 b/source/ap/vim/patches/7.2.315
deleted file mode 100644
index 6a5e7c7b..00000000
--- a/source/ap/vim/patches/7.2.315
+++ /dev/null
@@ -1,134 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.315
-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.315
-Problem:    Python libs can't be found on 64 bit system.
-Solution:   Add lib64 to the list of directories. (Michael Henry)
-Files:	    src/auto/configure, src/configure.in
-
-
-*** ../vim-7.2.314/src/auto/configure	2009-11-17 17:13:03.000000000 +0100
---- src/auto/configure	2009-12-02 17:21:20.000000000 +0100
-***************
-*** 5126,5132 ****
-  
-  	vi_cv_path_python_conf=
-  	for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
-! 	  for subdir in lib share; do
-  	    d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
-  	    if test -d "$d" && test -f "$d/config.c"; then
-  	      vi_cv_path_python_conf="$d"
---- 5126,5132 ----
-  
-  	vi_cv_path_python_conf=
-  	for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
-! 	  for subdir in lib64 lib share; do
-  	    d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
-  	    if test -d "$d" && test -f "$d/config.c"; then
-  	      vi_cv_path_python_conf="$d"
-***************
-*** 13718,13725 ****
-  $as_echo "pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group" >&6; }
-        else
-  	vim_cv_tty_group=world
-! 	{ $as_echo "$as_me:$LINENO: result: ptys are world accessable" >&5
-! $as_echo "ptys are world accessable" >&6; }
-        fi
-  
-  else
---- 13718,13725 ----
-  $as_echo "pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group" >&6; }
-        else
-  	vim_cv_tty_group=world
-! 	{ $as_echo "$as_me:$LINENO: result: ptys are world accessible" >&5
-! $as_echo "ptys are world accessible" >&6; }
-        fi
-  
-  else
-***************
-*** 13730,13737 ****
-  ( exit $ac_status )
-  
-        vim_cv_tty_group=world
-!       { $as_echo "$as_me:$LINENO: result: can't determine - assume ptys are world accessable" >&5
-! $as_echo "can't determine - assume ptys are world accessable" >&6; }
-  
-  fi
-  rm -rf conftest.dSYM
---- 13730,13737 ----
-  ( exit $ac_status )
-  
-        vim_cv_tty_group=world
-!       { $as_echo "$as_me:$LINENO: result: can't determine - assume ptys are world accessible" >&5
-! $as_echo "can't determine - assume ptys are world accessible" >&6; }
-  
-  fi
-  rm -rf conftest.dSYM
-*** ../vim-7.2.314/src/configure.in	2009-11-17 17:13:03.000000000 +0100
---- src/configure.in	2009-12-02 17:21:10.000000000 +0100
-***************
-*** 686,692 ****
-        [
-  	vi_cv_path_python_conf=
-  	for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
-! 	  for subdir in lib share; do
-  	    d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
-  	    if test -d "$d" && test -f "$d/config.c"; then
-  	      vi_cv_path_python_conf="$d"
---- 686,692 ----
-        [
-  	vi_cv_path_python_conf=
-  	for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
-! 	  for subdir in lib64 lib share; do
-  	    d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
-  	    if test -d "$d" && test -f "$d/config.c"; then
-  	      vi_cv_path_python_conf="$d"
-***************
-*** 2557,2567 ****
-  	AC_MSG_RESULT([pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group])
-        else
-  	vim_cv_tty_group=world
-! 	AC_MSG_RESULT([ptys are world accessable])
-        fi
-      ],[
-        vim_cv_tty_group=world
-!       AC_MSG_RESULT([can't determine - assume ptys are world accessable])
-      ],[
-        AC_MSG_ERROR(cross-compiling: please set 'vim_cv_tty_group' and 'vim_cv_tty_mode')
-      ])
---- 2557,2567 ----
-  	AC_MSG_RESULT([pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group])
-        else
-  	vim_cv_tty_group=world
-! 	AC_MSG_RESULT([ptys are world accessible])
-        fi
-      ],[
-        vim_cv_tty_group=world
-!       AC_MSG_RESULT([can't determine - assume ptys are world accessible])
-      ],[
-        AC_MSG_ERROR(cross-compiling: please set 'vim_cv_tty_group' and 'vim_cv_tty_mode')
-      ])
-*** ../vim-7.2.314/src/version.c	2009-12-02 17:47:46.000000000 +0100
---- src/version.c	2009-12-02 17:57:39.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     315,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-10. And even your night dreams are 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.316 b/source/ap/vim/patches/7.2.316
deleted file mode 100644
index 34e629fe..00000000
--- a/source/ap/vim/patches/7.2.316
+++ /dev/null
@@ -1,83 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.316
-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.316
-Problem:    May get multiple _FORTIFY_SOURCE arguments. (Tony Mechelynck)
-Solution:   First remove all these arguments and then add the one we want.
-	    (Dominique Pelle)
-Files:	    src/auto/configure, src/configure.in
-
-
-*** ../vim-7.2.315/src/auto/configure	2009-12-02 17:59:08.000000000 +0100
---- src/auto/configure	2009-12-16 17:05:59.000000000 +0100
-***************
-*** 17185,17194 ****
-      { $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=`echo "$CFLAGS -D_FORTIFY_SOURCE=1" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g' -e 's/-D_FORTIFY_SOURCE=2//g'`
-      { $as_echo "$as_me:$LINENO: result: yes" >&5
-  $as_echo "yes" >&6; }
-    else
---- 17185,17194 ----
-      { $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=`echo "$CFLAGS" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=.//g' -e 's/-D_FORTIFY_SOURCE=.//g' -e 's/$/ -D_FORTIFY_SOURCE=1/'`
-      { $as_echo "$as_me:$LINENO: result: yes" >&5
-  $as_echo "yes" >&6; }
-    else
-*** ../vim-7.2.315/src/configure.in	2009-12-02 17:59:08.000000000 +0100
---- src/configure.in	2009-12-16 17:05:55.000000000 +0100
-***************
-*** 3241,3249 ****
-    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=`echo "$CFLAGS -D_FORTIFY_SOURCE=1" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g' -e 's/-D_FORTIFY_SOURCE=2//g'`
-      AC_MSG_RESULT(yes)
-    else
-      AC_MSG_RESULT(no)
---- 3241,3250 ----
-    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.
-+   dnl Also remove duplicate _FORTIFY_SOURCE arguments.
-    AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1)
-    if test "$gccmajor" -gt "3"; then
-!     CFLAGS=`echo "$CFLAGS" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=.//g' -e 's/-D_FORTIFY_SOURCE=.//g' -e 's/$/ -D_FORTIFY_SOURCE=1/'`
-      AC_MSG_RESULT(yes)
-    else
-      AC_MSG_RESULT(no)
-*** ../vim-7.2.315/src/version.c	2009-12-02 17:59:08.000000000 +0100
---- src/version.c	2009-12-16 17:12:25.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     316,
-  /**/
-
--- 
-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.317 b/source/ap/vim/patches/7.2.317
deleted file mode 100644
index bc0ceeea..00000000
--- a/source/ap/vim/patches/7.2.317
+++ /dev/null
@@ -1,148 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.317
-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.317
-Problem:    Memory leak when adding a highlight group with unprintable
-	    characters, resulting in E669.
-Solution:   Free the memory.  And fix a few typos. (Dominique Pelle)
-Files:	    src/syntax.c
-
-
-*** ../vim-7.2.316/src/syntax.c	2009-05-17 13:30:58.000000000 +0200
---- src/syntax.c	2009-12-16 18:09:05.000000000 +0100
-***************
-*** 206,212 ****
-  static int current_attr = 0;	    /* attr of current syntax word */
-  #ifdef FEAT_EVAL
-  static int current_id = 0;	    /* ID of current char for syn_get_id() */
-! static int current_trans_id = 0;    /* idem, transparancy removed */
-  #endif
-  
-  typedef struct syn_cluster_S
---- 206,212 ----
-  static int current_attr = 0;	    /* attr of current syntax word */
-  #ifdef FEAT_EVAL
-  static int current_id = 0;	    /* ID of current char for syn_get_id() */
-! static int current_trans_id = 0;    /* idem, transparency removed */
-  #endif
-  
-  typedef struct syn_cluster_S
-***************
-*** 282,288 ****
-      int		si_idx;			/* index of syntax pattern or
-  					   KEYWORD_IDX */
-      int		si_id;			/* highlight group ID for keywords */
-!     int		si_trans_id;		/* idem, transparancy removed */
-      int		si_m_lnum;		/* lnum of the match */
-      int		si_m_startcol;		/* starting column of the match */
-      lpos_T	si_m_endpos;		/* just after end posn of the match */
---- 282,288 ----
-      int		si_idx;			/* index of syntax pattern or
-  					   KEYWORD_IDX */
-      int		si_id;			/* highlight group ID for keywords */
-!     int		si_trans_id;		/* idem, transparency removed */
-      int		si_m_lnum;		/* lnum of the match */
-      int		si_m_startcol;		/* starting column of the match */
-      lpos_T	si_m_endpos;		/* just after end posn of the match */
-***************
-*** 1274,1280 ****
-  	dist = syn_buf->b_ml.ml_line_count / (syn_buf->b_sst_len - Rows) + 1;
-  
-      /*
-!      * Go throught the list to find the "tick" for the oldest entry that can
-       * be removed.  Set "above" when the "tick" for the oldest entry is above
-       * "b_sst_lasttick" (the display tick wraps around).
-       */
---- 1274,1280 ----
-  	dist = syn_buf->b_ml.ml_line_count / (syn_buf->b_sst_len - Rows) + 1;
-  
-      /*
-!      * Go through the list to find the "tick" for the oldest entry that can
-       * be removed.  Set "above" when the "tick" for the oldest entry is above
-       * "b_sst_lasttick" (the display tick wraps around).
-       */
-***************
-*** 2319,2325 ****
-  		    ? (syn_buf->b_spell_cluster_id == 0)
-  		    : (syn_buf->b_syn_spell == SYNSPL_TOP);
-  
-!     /* nextgroup ends at end of line, unless "skipnl" or "skipemtpy" present */
-      if (current_next_list != NULL
-  	    && syn_getcurline()[current_col + 1] == NUL
-  	    && !(current_next_flags & (HL_SKIPNL | HL_SKIPEMPTY)))
---- 2319,2325 ----
-  		    ? (syn_buf->b_spell_cluster_id == 0)
-  		    : (syn_buf->b_syn_spell == SYNSPL_TOP);
-  
-!     /* nextgroup ends at end of line, unless "skipnl" or "skipempty" present */
-      if (current_next_list != NULL
-  	    && syn_getcurline()[current_col + 1] == NUL
-  	    && !(current_next_flags & (HL_SKIPNL | HL_SKIPEMPTY)))
-***************
-*** 6108,6114 ****
-      win_T	*wp;
-      long	lnum;
-      colnr_T	col;
-!     int		trans;	     /* remove transparancy */
-      int		*spellp;     /* return: can do spell checking */
-      int		keep_state;  /* keep state of char at "col" */
-  {
---- 6108,6114 ----
-      win_T	*wp;
-      long	lnum;
-      colnr_T	col;
-!     int		trans;	     /* remove transparency */
-      int		*spellp;     /* return: can do spell checking */
-      int		keep_state;  /* keep state of char at "col" */
-  {
-***************
-*** 7523,7529 ****
-  #if defined(FEAT_GUI) || defined(PROTO)
-  /*
-   * Set the normal foreground and background colors according to the "Normal"
-!  * highlighighting group.  For X11 also set "Menu", "Scrollbar", and
-   * "Tooltip" colors.
-   */
-      void
---- 7523,7529 ----
-  #if defined(FEAT_GUI) || defined(PROTO)
-  /*
-   * Set the normal foreground and background colors according to the "Normal"
-!  * highlighting group.  For X11 also set "Menu", "Scrollbar", and
-   * "Tooltip" colors.
-   */
-      void
-***************
-*** 8647,8652 ****
---- 8647,8653 ----
-  	if (!vim_isprintc(*p))
-  	{
-  	    EMSG(_("E669: Unprintable character in group name"));
-+ 	    vim_free(name);
-  	    return 0;
-  	}
-  	else if (!ASCII_ISALNUM(*p) && *p != '_')
-*** ../vim-7.2.316/src/version.c	2009-12-16 17:14:08.000000000 +0100
---- src/version.c	2009-12-16 18:09:14.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     317,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-35. Your husband tells you he's had the beard for 2 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.318 b/source/ap/vim/patches/7.2.318
deleted file mode 100644
index 43018360..00000000
--- a/source/ap/vim/patches/7.2.318
+++ /dev/null
@@ -1,91 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.318
-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.318
-Problem:    Wrong locale value breaks floating point numbers for gvim.
-Solution:   Set the locale again after doing GUI inits. (Dominique Pelle)
-Files:	    src/main.c
-
-
-*** ../vim-7.2.317/src/main.c	2009-11-17 12:31:30.000000000 +0100
---- src/main.c	2009-12-16 18:23:46.000000000 +0100
-***************
-*** 366,379 ****
-       * Check if the GUI can be started.  Reset gui.starting if not.
-       * Don't know about other systems, stay on the safe side and don't check.
-       */
-!     if (gui.starting && gui_init_check() == FAIL)
-      {
-! 	gui.starting = FALSE;
-  
-! 	/* When running "evim" or "gvim -y" we need the menus, exit if we
-! 	 * don't have them. */
-! 	if (params.evim_mode)
-! 	    mch_exit(1);
-      }
-  # endif
-  #endif
---- 366,386 ----
-       * Check if the GUI can be started.  Reset gui.starting if not.
-       * Don't know about other systems, stay on the safe side and don't check.
-       */
-!     if (gui.starting)
-      {
-! 	if (gui_init_check() == FAIL)
-! 	{
-! 	    gui.starting = FALSE;
-  
-! 	    /* When running "evim" or "gvim -y" we need the menus, exit if we
-! 	     * don't have them. */
-! 	    if (params.evim_mode)
-! 		mch_exit(1);
-! 	}
-! #  if defined(HAVE_LOCALE_H) || defined(X_LOCALE)
-! 	/* Re-initialize locale, it may have been altered by gui_init_check() */
-! 	init_locale();
-! #  endif
-      }
-  # endif
-  #endif
-***************
-*** 3685,3691 ****
-  	}
-  	else if (STRICMP(argv[i], "--servername") == 0)
-  	{
-! 	    /* Alredy processed. Take it out of the command line */
-  	    i++;
-  	    continue;
-  	}
---- 3692,3698 ----
-  	}
-  	else if (STRICMP(argv[i], "--servername") == 0)
-  	{
-! 	    /* Already processed. Take it out of the command line */
-  	    i++;
-  	    continue;
-  	}
-*** ../vim-7.2.317/src/version.c	2009-12-16 18:13:04.000000000 +0100
---- src/version.c	2009-12-16 18:26:24.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     318,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-36. You miss more than five meals a week downloading the latest games from
-    Apogee.
-
- /// 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.319 b/source/ap/vim/patches/7.2.319
deleted file mode 100644
index 3cbfd42e..00000000
--- a/source/ap/vim/patches/7.2.319
+++ /dev/null
@@ -1,63 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.319
-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.319
-Problem:    Motif: accessing freed memory when cancelling font dialog.
-Solution:   Destroy the widget only after accessing it. (Dominique Pelle)
-Files:	    src/gui_xmdlg.c
-
-
-*** ../vim-7.2.318/src/gui_xmdlg.c	2009-11-03 12:53:44.000000000 +0100
---- src/gui_xmdlg.c	2009-12-16 18:39:21.000000000 +0100
-***************
-*** 1274,1286 ****
-  	XtAppProcessEvent(XtWidgetToApplicationContext(data->dialog),
-  							(XtInputMask)XtIMAll);
-  
--     XtDestroyWidget(data->dialog);
-- 
-      if (data->old)
-      {
-  	XFreeFont(XtDisplay(data->dialog),  data->old);
-  	XmFontListFree(data->old_list);
-      }
-  
-      gui_motif_synch_fonts();
-  
---- 1274,1285 ----
-  	XtAppProcessEvent(XtWidgetToApplicationContext(data->dialog),
-  							(XtInputMask)XtIMAll);
-  
-      if (data->old)
-      {
-  	XFreeFont(XtDisplay(data->dialog),  data->old);
-  	XmFontListFree(data->old_list);
-      }
-+     XtDestroyWidget(data->dialog);
-  
-      gui_motif_synch_fonts();
-  
-*** ../vim-7.2.318/src/version.c	2009-12-16 18:27:29.000000000 +0100
---- src/version.c	2009-12-16 18:40:06.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     319,
-  /**/
-
--- 
-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.320 b/source/ap/vim/patches/7.2.320
deleted file mode 100644
index 73f62247..00000000
--- a/source/ap/vim/patches/7.2.320
+++ /dev/null
@@ -1,199 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.320
-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.320
-Problem:    Unused function in Mzscheme interface.
-Solution:   Remove the function and what depends on it. (Dominique Pelle)
-Files:	    src/if_mzsch.c, src/proto/if_mzsch.pro
-
-
-*** ../vim-7.2.319/src/if_mzsch.c	2009-09-11 12:20:47.000000000 +0200
---- src/if_mzsch.c	2009-12-16 19:01:04.000000000 +0100
-***************
-*** 70,83 ****
-      Scheme_Object   *port;
-  } Port_Info;
-  
-- /* info for do_apply */
-- typedef struct
-- {
--     Scheme_Object   *proc;
--     int		    argc;
--     Scheme_Object   **argv;
-- } Apply_Info;
-- 
-  /*
-   *========================================================================
-   *  Vim-Control Commands
---- 70,75 ----
-***************
-*** 160,166 ****
-  static Scheme_Object *extract_exn_message(Scheme_Object *v);
-  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);
---- 152,157 ----
-***************
-*** 1056,1062 ****
-  	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();
---- 1047,1053 ----
-  	MZ_GC_REG();
-  	config = scheme_config;
-  	MZ_GC_CHECK();
-! 	/* recreate ports each call effectively clearing these ones */
-  	curout = scheme_make_string_output_port();
-  	MZ_GC_CHECK();
-  	curerr = scheme_make_string_output_port();
-***************
-*** 1196,1231 ****
-      }
-  }
-  
-- /*
--  * apply MzScheme procedure with arguments,
--  * handling errors
--  */
--     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)
-  {
---- 1187,1192 ----
-***************
-*** 1257,1263 ****
-  	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;
---- 1218,1224 ----
-  	MZ_GC_CHECK();
-      }
-  
-!     /* errors will be caught in do_mzscheme_command and ex_mzfile */
-      scheme_close_input_port(pinfo->port);
-      MZ_GC_CHECK();
-      pinfo->port = NULL;
-***************
-*** 1348,1360 ****
-      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);
-- }
-- 
-  /*
-   *========================================================================
-   *  3.  MzScheme I/O Handlers
---- 1309,1314 ----
-***************
-*** 2128,2134 ****
-      static Scheme_Object *
-  set_buffer_line(void *data, int argc, Scheme_Object **argv)
-  {
-!     /* First of all, we check the the of the supplied MzScheme object.
-       * There are three cases:
-       *	  1. #f - this is a deletion.
-       *	  2. A string	   - this is a replacement.
---- 2082,2088 ----
-      static Scheme_Object *
-  set_buffer_line(void *data, int argc, Scheme_Object **argv)
-  {
-!     /* First of all, we check the value of the supplied MzScheme object.
-       * There are three cases:
-       *	  1. #f - this is a deletion.
-       *	  2. A string	   - this is a replacement.
-***************
-*** 2428,2434 ****
-  /*
-   * (insert-buff-line-list {linenr} {string/string-list} [buffer])
-   *
-!  * Insert a number of lines into the specified buffer after the specifed line.
-   * The line number is in Vim format (1-based). The lines to be inserted are
-   * given as an MzScheme list of string objects or as a single string. The lines
-   * to be added are checked for validity and correct format. Errors are
---- 2382,2388 ----
-  /*
-   * (insert-buff-line-list {linenr} {string/string-list} [buffer])
-   *
-!  * Insert a number of lines into the specified buffer after the specified line.
-   * The line number is in Vim format (1-based). The lines to be inserted are
-   * given as an MzScheme list of string objects or as a single string. The lines
-   * to be added are checked for validity and correct format. Errors are
-*** ../vim-7.2.319/src/proto/if_mzsch.pro	2009-05-26 22:58:43.000000000 +0200
---- src/proto/if_mzsch.pro	2009-12-16 19:01:01.000000000 +0100
-***************
-*** 13,20 ****
-  void mzvim_check_threads __ARGS((void));
-  void mzvim_reset_timer __ARGS((void));
-  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 : */
---- 13,18 ----
-*** ../vim-7.2.319/src/version.c	2009-12-16 18:49:09.000000000 +0100
---- src/version.c	2009-12-16 18:53:48.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     320,
-  /**/
-
--- 
-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.321 b/source/ap/vim/patches/7.2.321
deleted file mode 100644
index 69c08f48..00000000
--- a/source/ap/vim/patches/7.2.321
+++ /dev/null
@@ -1,59 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.321
-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.321
-Problem:    histadd() and searching with "*" fails to add entry to history
-	    when it is empty.
-Solution:   Initialize the history. (Lech Lorens)
-Files:	    src/eval.c, src/normal.c
-
-
-*** ../vim-7.2.320/src/eval.c	2009-11-17 12:20:30.000000000 +0100
---- src/eval.c	2009-12-24 14:37:50.000000000 +0100
-***************
-*** 12014,12019 ****
---- 12014,12020 ----
-  	str = get_tv_string_buf(&argvars[1], buf);
-  	if (*str != NUL)
-  	{
-+ 	    init_history();
-  	    add_to_history(histype, str, FALSE, NUL);
-  	    rettv->vval.v_number = TRUE;
-  	    return;
-*** ../vim-7.2.320/src/normal.c	2009-05-17 13:30:58.000000000 +0200
---- src/normal.c	2009-12-24 14:38:28.000000000 +0100
-***************
-*** 5602,5607 ****
---- 5602,5608 ----
-  	    STRCAT(buf, "\\>");
-  #ifdef FEAT_CMDHIST
-  	/* put pattern in search history */
-+ 	init_history();
-  	add_to_history(HIST_SEARCH, buf, TRUE, NUL);
-  #endif
-  	normal_search(cap, cmdchar == '*' ? '/' : '?', buf, 0);
-*** ../vim-7.2.320/src/version.c	2009-12-16 19:02:05.000000000 +0100
---- src/version.c	2009-12-24 14:39:46.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     321,
-  /**/
-
--- 
-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.322 b/source/ap/vim/patches/7.2.322
deleted file mode 100644
index 57f27fcd..00000000
--- a/source/ap/vim/patches/7.2.322
+++ /dev/null
@@ -1,49 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.322
-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.322
-Problem:    Wrong indenting in virtual replace mode with CTRL-Y below a short
-	    line.
-Solution:   Check for character to be NUL. (suggested by Lech Lorens)
-Files:	    src/edit.c
-
-
-*** ../vim-7.2.321/src/edit.c	2009-11-17 17:40:34.000000000 +0100
---- src/edit.c	2009-12-24 15:18:23.000000000 +0100
-***************
-*** 7397,7402 ****
---- 7397,7406 ----
-      int		icase;
-      int		i;
-  
-+     if (keytyped == NUL)
-+ 	/* Can happen with CTRL-Y and CTRL-E on a short line. */
-+ 	return FALSE;
-+ 
-  #ifdef FEAT_EVAL
-      if (*curbuf->b_p_inde != NUL)
-  	look = curbuf->b_p_indk;	/* 'indentexpr' set: use 'indentkeys' */
-*** ../vim-7.2.321/src/version.c	2009-12-24 15:00:31.000000000 +0100
---- src/version.c	2009-12-24 15:44:46.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     322,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-45. You buy a Captain Kirk chair with a built-in keyboard and mouse.
-
- /// 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.323 b/source/ap/vim/patches/7.2.323
deleted file mode 100644
index fc432461..00000000
--- a/source/ap/vim/patches/7.2.323
+++ /dev/null
@@ -1,95 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.323 (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.323 (extra)
-Problem:    Balloon evaluation crashes on Win64.
-Solution:   Change pointer types. (Sergey Khorev)
-Files:	    src/gui_w32.c
-
-
-*** ../vim-7.2.322/src/gui_w32.c	2009-01-28 21:22:20.000000000 +0100
---- src/gui_w32.c	2009-12-24 16:06:41.000000000 +0100
-***************
-*** 212,223 ****
-      DWORD dwPlatformID;
-  } DLLVERSIONINFO;
-  
-  typedef struct tagTOOLINFOA_NEW
-  {
-  	UINT cbSize;
-  	UINT uFlags;
-  	HWND hwnd;
-! 	UINT uId;
-  	RECT rect;
-  	HINSTANCE hinst;
-  	LPSTR lpszText;
---- 212,225 ----
-      DWORD dwPlatformID;
-  } DLLVERSIONINFO;
-  
-+ #include <poppack.h>
-+ 
-  typedef struct tagTOOLINFOA_NEW
-  {
-  	UINT cbSize;
-  	UINT uFlags;
-  	HWND hwnd;
-! 	UINT_PTR uId;
-  	RECT rect;
-  	HINSTANCE hinst;
-  	LPSTR lpszText;
-***************
-*** 227,241 ****
-  typedef struct tagNMTTDISPINFO_NEW
-  {
-      NMHDR      hdr;
-!     LPTSTR     lpszText;
-      char       szText[80];
-      HINSTANCE  hinst;
-      UINT       uFlags;
-      LPARAM     lParam;
-  } NMTTDISPINFO_NEW;
-  
-- #include <poppack.h>
-- 
-  typedef HRESULT (WINAPI* DLLGETVERSIONPROC)(DLLVERSIONINFO *);
-  #ifndef TTM_SETMAXTIPWIDTH
-  # define TTM_SETMAXTIPWIDTH	(WM_USER+24)
---- 229,241 ----
-  typedef struct tagNMTTDISPINFO_NEW
-  {
-      NMHDR      hdr;
-!     LPSTR      lpszText;
-      char       szText[80];
-      HINSTANCE  hinst;
-      UINT       uFlags;
-      LPARAM     lParam;
-  } NMTTDISPINFO_NEW;
-  
-  typedef HRESULT (WINAPI* DLLGETVERSIONPROC)(DLLVERSIONINFO *);
-  #ifndef TTM_SETMAXTIPWIDTH
-  # define TTM_SETMAXTIPWIDTH	(WM_USER+24)
-*** ../vim-7.2.322/src/version.c	2009-12-24 15:45:53.000000000 +0100
---- src/version.c	2009-12-24 16:08:33.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     323,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-46. Your wife makes a new rule: "The computer cannot come 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.324 b/source/ap/vim/patches/7.2.324
deleted file mode 100644
index 8f61b8ac..00000000
--- a/source/ap/vim/patches/7.2.324
+++ /dev/null
@@ -1,66 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.324
-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.324
-Problem:    A negative column argument in setpos() may cause a crash.
-Solution:   Check for invalid column number. (James Vega)
-Files:	    src/eval.c, src/misc2.c
-
-
-*** ../vim-7.2.323/src/eval.c	2009-12-24 15:00:31.000000000 +0100
---- src/eval.c	2009-12-31 13:09:19.000000000 +0100
-***************
-*** 15542,15548 ****
-      {
-  	if (list2fpos(&argvars[1], &pos, &fnum) == OK)
-  	{
-! 	    --pos.col;
-  	    if (name[0] == '.' && name[1] == NUL)
-  	    {
-  		/* set cursor */
---- 15542,15549 ----
-      {
-  	if (list2fpos(&argvars[1], &pos, &fnum) == OK)
-  	{
-! 	    if (--pos.col < 0)
-! 		pos.col = 0;
-  	    if (name[0] == '.' && name[1] == NUL)
-  	    {
-  		/* set cursor */
-*** ../vim-7.2.323/src/misc2.c	2009-11-25 17:15:16.000000000 +0100
---- src/misc2.c	2009-12-31 13:12:36.000000000 +0100
-***************
-*** 528,533 ****
---- 528,535 ----
-  #endif
-  	}
-      }
-+     else if (curwin->w_cursor.col < 0)
-+ 	curwin->w_cursor.col = 0;
-  
-  #ifdef FEAT_VIRTUALEDIT
-      /* If virtual editing is on, we can leave the cursor on the old position,
-*** ../vim-7.2.323/src/version.c	2009-12-24 16:11:24.000000000 +0100
---- src/version.c	2009-12-31 13:17:25.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     324,
-  /**/
-
--- 
-"Thou shalt not follow the Null Pointer, for at its end Chaos and
-Madness lie."
-
- /// 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.325 b/source/ap/vim/patches/7.2.325
deleted file mode 100644
index 77a6e089..00000000
--- a/source/ap/vim/patches/7.2.325
+++ /dev/null
@@ -1,52 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.325
-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.325
-Problem:    A stray "w" in the startup vimrc file causes the edited file to be
-	    replaced with an empty file. (Stone Kang).
-Solution:   Do not write a buffer when it has never been loaded.
-Files:	    src/fileio.c
-
-
-*** ../vim-7.2.324/src/fileio.c	2009-12-02 13:32:10.000000000 +0100
---- src/fileio.c	2009-12-31 14:08:31.000000000 +0100
-***************
-*** 2981,2986 ****
---- 2981,2993 ----
-  
-      if (fname == NULL || *fname == NUL)	/* safety check */
-  	return FAIL;
-+     if (buf->b_ml.ml_mfp == NULL)
-+     {
-+ 	/* This can happen during startup when there is a stray "w" in the
-+ 	 * vimrc file. */
-+ 	EMSG(_(e_emptybuf));
-+ 	return FAIL;
-+     }
-  
-      /*
-       * Disallow writing from .exrc and .vimrc in current directory for
-*** ../vim-7.2.324/src/version.c	2009-12-31 13:18:05.000000000 +0100
---- src/version.c	2009-12-31 14:52:29.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     325,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-74. Your most erotic dreams are about cybersex
-
- /// 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.326 b/source/ap/vim/patches/7.2.326
deleted file mode 100644
index 8e988a8d..00000000
--- a/source/ap/vim/patches/7.2.326
+++ /dev/null
@@ -1,54 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.326
-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.326
-Problem:    Win32: $HOME doesn't work when %HOMEPATH% is not defined.
-Solution:   Use "\" for %HOMEPATH% when it is not defined.
-Files:	    src/misc1.c
-
-
-*** ../vim-7.2.325/src/misc1.c	2009-12-02 17:47:46.000000000 +0100
---- src/misc1.c	2010-01-05 19:53:23.000000000 +0100
-***************
-*** 3470,3476 ****
-  
-  	homedrive = mch_getenv((char_u *)"HOMEDRIVE");
-  	homepath = mch_getenv((char_u *)"HOMEPATH");
-! 	if (homedrive != NULL && homepath != NULL
-  			   && STRLEN(homedrive) + STRLEN(homepath) < MAXPATHL)
-  	{
-  	    sprintf((char *)NameBuff, "%s%s", homedrive, homepath);
---- 3470,3478 ----
-  
-  	homedrive = mch_getenv((char_u *)"HOMEDRIVE");
-  	homepath = mch_getenv((char_u *)"HOMEPATH");
-! 	if (homepath == NULL || *homepath == NUL)
-! 	    homepath = "\\";
-! 	if (homedrive != NULL
-  			   && STRLEN(homedrive) + STRLEN(homepath) < MAXPATHL)
-  	{
-  	    sprintf((char *)NameBuff, "%s%s", homedrive, homepath);
-*** ../vim-7.2.325/src/version.c	2009-12-31 14:52:48.000000000 +0100
---- src/version.c	2010-01-06 17:39:23.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     326,
-  /**/
-
--- 
-From "know your smileys":
- :q	vi user saying, "How do I get out of this damn emacs editor?"
-
- /// 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.327 b/source/ap/vim/patches/7.2.327
deleted file mode 100644
index 4bfb077c..00000000
--- a/source/ap/vim/patches/7.2.327
+++ /dev/null
@@ -1,323 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.327
-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.327
-Problem:    Unused functions in Workshop.
-Solution:   Add "#if 0" and minor cleanup. (Dominique Pelle)
-Files:	    src/workshop.c, src/integration.c, src/ingegration.h
-
-
-*** ../vim-7.2.326/src/workshop.c	2009-05-21 23:25:38.000000000 +0200
---- src/workshop.c	2010-01-06 18:10:10.000000000 +0100
-***************
-*** 56,67 ****
-  static void	 load_window(char *, int lnum);
-  static void	 warp_to_pc(int);
-  #ifdef FEAT_BEVAL
-! void		workshop_beval_cb(BalloonEval *, int);
-  #endif
-  static char	*fixAccelText(char *);
-  static void	 addMenu(char *, char *, char *);
-  static char	*lookupVerb(char *, int);
-- static int	 computeIndex(int, char_u *, int);
-  static void	 coloncmd(char *, Boolean);
-  
-  extern Widget	 vimShell;
---- 56,67 ----
-  static void	 load_window(char *, int lnum);
-  static void	 warp_to_pc(int);
-  #ifdef FEAT_BEVAL
-! void		 workshop_beval_cb(BalloonEval *, int);
-! static int	 computeIndex(int, char_u *, int);
-  #endif
-  static char	*fixAccelText(char *);
-  static void	 addMenu(char *, char *, char *);
-  static char	*lookupVerb(char *, int);
-  static void	 coloncmd(char *, Boolean);
-  
-  extern Widget	 vimShell;
-***************
-*** 1624,1631 ****
-  	}
-      }
-  }
-- #endif
-- 
-  
-      static int
-  computeIndex(
---- 1624,1629 ----
-***************
-*** 1649,1654 ****
---- 1647,1653 ----
-  
-      return -1;
-  }
-+ #endif
-  
-      static void
-  addMenu(
-*** ../vim-7.2.326/src/integration.c	2008-06-24 22:27:10.000000000 +0200
---- src/integration.c	2010-01-06 18:18:11.000000000 +0100
-***************
-*** 78,84 ****
-  
-  /* Functions private to this file */
-  static void workshop_connection_closed(void);
-! static void messageFromEserve(XtPointer clientData, int *NOTUSED1, XtInputId *NOTUSED2);
-  static void workshop_disconnect(void);
-  static void workshop_sensitivity(int num, char *table);
-  static void adjust_sign_name(char *filename);
---- 78,84 ----
-  
-  /* Functions private to this file */
-  static void workshop_connection_closed(void);
-! static void messageFromEserve(XtPointer clientData, int *dum1, XtInputId *dum2);
-  static void workshop_disconnect(void);
-  static void workshop_sensitivity(int num, char *table);
-  static void adjust_sign_name(char *filename);
-***************
-*** 157,165 ****
-  
-  }
-  
-- /*ARGSUSED*/
-  void
-! messageFromEserve(XtPointer clientData, int *NOTUSED1, XtInputId *NOTUSED2)
-  {
-  	char	*cmd;		/* the 1st word of the command */
-  
---- 157,166 ----
-  
-  }
-  
-  void
-! messageFromEserve(XtPointer clientData UNUSED,
-! 		  int *dum1 UNUSED,
-! 		  XtInputId *dum2 UNUSED)
-  {
-  	char	*cmd;		/* the 1st word of the command */
-  
-***************
-*** 199,205 ****
-  			if (sign) {
-  				sign++;
-  			}
-! 			/* Change sign name to accomodate a different size? */
-  			adjust_sign_name(sign);
-  			workshop_add_mark_type(idx, color, sign);
-  		}
---- 200,206 ----
-  			if (sign) {
-  				sign++;
-  			}
-! 			/* Change sign name to accommodate a different size? */
-  			adjust_sign_name(sign);
-  			workshop_add_mark_type(idx, color, sign);
-  		}
-***************
-*** 580,586 ****
-  #endif
-  
-  
-! /* Change sign name to accomodate a different size:
-   * Create the filename based on the height. The filename format
-   * of multisize icons are:
-   *    x.xpm   : largest icon
---- 581,587 ----
-  #endif
-  
-  
-! /* Change sign name to accommodate a different size:
-   * Create the filename based on the height. The filename format
-   * of multisize icons are:
-   *    x.xpm   : largest icon
-***************
-*** 614,619 ****
---- 615,621 ----
-  		strcpy(s, ".xpm");
-  }
-  
-+ #if 0
-  /* Were we invoked by WorkShop? This function can be used early during startup
-     if you want to do things differently if the editor is started standalone
-     or in WorkShop mode. For example, in standalone mode you may not want to
-***************
-*** 627,632 ****
---- 629,635 ----
-  	}
-  	return result;
-  }
-+ #endif
-  
-  /* Connect back to eserve */
-  void	workshop_connect(XtAppContext context)
-***************
-*** 750,755 ****
---- 753,759 ----
-   * Utility functions
-   */
-  
-+ #if 0
-  /* Set icon for the window */
-  void
-  workshop_set_icon(Display *display, Widget shell, char **xpmdata,
-***************
-*** 793,798 ****
---- 797,803 ----
-  	}
-  	XtFree((char *)xpmAttributes.colorsymbols);
-  }
-+ #endif
-  
-  /* Minimize and maximize shells. From libutil's shell.cc. */
-  
-***************
-*** 927,933 ****
-  	return success;
-  }
-  
-! 
-  Boolean workshop_get_rows_cols(int *rows, int *cols)
-  {
-  	static int	r = 0;
---- 932,938 ----
-  	return success;
-  }
-  
-! #if 0
-  Boolean workshop_get_rows_cols(int *rows, int *cols)
-  {
-  	static int	r = 0;
-***************
-*** 958,963 ****
---- 963,969 ----
-  	}
-  	return success;
-  }
-+ #endif
-  
-  /*
-   * Toolbar code
-***************
-*** 1043,1054 ****
-  }
-  
-  
-! 
-  /*
-   * Send information to eserve on certain editor events
-   * You must make sure these are called when necessary
-   */
-- 
-  void workshop_file_closed(char *filename)
-  {
-  	char buffer[2*MAXPATHLEN];
---- 1049,1059 ----
-  }
-  
-  
-! #if 0
-  /*
-   * Send information to eserve on certain editor events
-   * You must make sure these are called when necessary
-   */
-  void workshop_file_closed(char *filename)
-  {
-  	char buffer[2*MAXPATHLEN];
-***************
-*** 1056,1061 ****
---- 1061,1067 ----
-  			NOCATGETS("deletedFile %s\n"), filename);
-  	write(sd, buffer, strlen(buffer));
-  }
-+ #endif
-  
-  void workshop_file_closed_lineno(char *filename, int lineno)
-  {
-***************
-*** 1086,1106 ****
-  	workshop_moved_marks(filename);
-  }
-  
-! void workshop_move_mark(char *filename, int markId, int newLineno)
-  {
-  	char buffer[2*MAXPATHLEN];
-  	vim_snprintf(buffer, sizeof(buffer),
-! 			NOCATGETS("moveMark %s %d %d\n"), filename, markId, newLineno);
-  	write(sd, buffer, strlen(buffer));
-  }
-  
-! void workshop_file_modified(char *filename)
-  {
-  	char buffer[2*MAXPATHLEN];
-  	vim_snprintf(buffer, sizeof(buffer),
-! 			NOCATGETS("modifiedFile %s\n"), filename);
-  	write(sd, buffer, strlen(buffer));
-  }
-  
-  void workshop_frame_moved(int new_x, int new_y, int new_w, int new_h)
-  {
---- 1092,1114 ----
-  	workshop_moved_marks(filename);
-  }
-  
-! #if 0
-! void workshop_file_modified(char *filename)
-  {
-  	char buffer[2*MAXPATHLEN];
-  	vim_snprintf(buffer, sizeof(buffer),
-! 			NOCATGETS("modifiedFile %s\n"), filename);
-  	write(sd, buffer, strlen(buffer));
-  }
-  
-! void workshop_move_mark(char *filename, int markId, int newLineno)
-  {
-  	char buffer[2*MAXPATHLEN];
-  	vim_snprintf(buffer, sizeof(buffer),
-! 	       NOCATGETS("moveMark %s %d %d\n"), filename, markId, newLineno);
-  	write(sd, buffer, strlen(buffer));
-  }
-+ #endif
-  
-  void workshop_frame_moved(int new_x, int new_y, int new_w, int new_h)
-  {
-***************
-*** 1179,1188 ****
---- 1187,1198 ----
-  }
-  
-  /* Send a message to eserve */
-+ #if defined(NOHANDS_SUPPORT_FUNCTIONS) || defined(FEAT_BEVAL)
-  void workshop_send_message(char *buf)
-  {
-  	write(sd, buf, strlen(buf));
-  }
-+ #endif
-  
-  /* Some methods, like currentFile, cursorPos, etc. are missing here.
-   * But it looks like these are used for NoHands testing only so we
-*** ../vim-7.2.326/src/version.c	2010-01-06 17:46:03.000000000 +0100
---- src/version.c	2010-01-06 18:20:41.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     327,
-  /**/
-
--- 
-From "know your smileys":
- (:-#	Said something he shouldn't have
-
- /// 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.328 b/source/ap/vim/patches/7.2.328
deleted file mode 100644
index f547fb94..00000000
--- a/source/ap/vim/patches/7.2.328
+++ /dev/null
@@ -1,52 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.328
-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.328
-Problem:    has("win64") does not return 1 on 64 bit MS-Windows version.
-Solution:   Also check for _WIN64 besides WIN64.
-Files:	    src/eval.c
-
-
-*** ../vim-7.2.327/src/eval.c	2009-12-31 13:18:05.000000000 +0100
---- src/eval.c	2010-01-06 16:28:23.000000000 +0100
-***************
-*** 11453,11459 ****
-  #if defined(UNIX) && (defined(__CYGWIN32__) || defined(__CYGWIN__))
-  	"win32unix",
-  #endif
-! #ifdef WIN64
-  	"win64",
-  #endif
-  #ifdef EBCDIC
---- 11453,11459 ----
-  #if defined(UNIX) && (defined(__CYGWIN32__) || defined(__CYGWIN__))
-  	"win32unix",
-  #endif
-! #if defined(WIN64) || defined(_WIN64)
-  	"win64",
-  #endif
-  #ifdef EBCDIC
-*** ../vim-7.2.327/src/version.c	2010-01-06 18:24:53.000000000 +0100
---- src/version.c	2010-01-12 12:10:06.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     328,
-  /**/
-
--- 
-From "know your smileys":
- :.-(	Crying
-
- /// 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.329 b/source/ap/vim/patches/7.2.329
deleted file mode 100644
index f92bc655..00000000
--- a/source/ap/vim/patches/7.2.329
+++ /dev/null
@@ -1,48 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.329
-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.329
-Problem:    "g_" doesn't position cursor correctly when in Visual mode and
-	    'selection' is "exclusive". (Ben Fritz)
-Solution:   Call adjust_for_sel().
-Files:	    src/normal.c
-
-
-*** ../vim-7.2.328/src/normal.c	2009-12-24 15:00:31.000000000 +0100
---- src/normal.c	2010-01-09 15:19:47.000000000 +0100
-***************
-*** 7873,7878 ****
---- 7873,7881 ----
-  				    && vim_iswhite(ptr[curwin->w_cursor.col]))
-  		--curwin->w_cursor.col;
-  	    curwin->w_set_curswant = TRUE;
-+ #ifdef FEAT_VISUAL
-+ 	    adjust_for_sel(cap);
-+ #endif
-  	}
-  	break;
-  
-*** ../vim-7.2.328/src/version.c	2010-01-12 12:48:40.000000000 +0100
---- src/version.c	2010-01-12 15:41:13.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     329,
-  /**/
-
--- 
-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.330 b/source/ap/vim/patches/7.2.330
deleted file mode 100644
index 0d9c3f1e..00000000
--- a/source/ap/vim/patches/7.2.330
+++ /dev/null
@@ -1,1531 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.330
-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.330
-Problem:    Tables for Unicode case operators are outdated.
-Solution:   Add a Vim script for generating the tables.  Include tables for
-	    Unicode 5.2.
-Files:	    runtime/tools/README.txt, runtime/tools/unicode.vim, src/mbyte.c
-
-
-*** ../vim-7.2.329/runtime/tools/README.txt	2005-12-02 01:47:43.000000000 +0100
---- runtime/tools/README.txt	2010-01-12 19:43:13.000000000 +0100
-***************
-*** 32,35 ****
---- 32,37 ----
-  xcmdsrv_client.c:  Example for a client program that communicates with a Vim
-  		   server through the X-Windows interface.
-  
-+ unicode.vim	Vim script to generate tables for src/mbyte.c.
-+ 
-  [xxd (and tee for OS/2) can be found in the src directory]
-*** ../vim-7.2.329/runtime/tools/unicode.vim	2010-01-12 19:47:33.000000000 +0100
---- runtime/tools/unicode.vim	2010-01-12 19:42:14.000000000 +0100
-***************
-*** 0 ****
---- 1,280 ----
-+ " Script to extract tables from Unicode .txt files, to be used in src/mbyte.c.
-+ " The format of the UnicodeData.txt file is explained here:
-+ " http://www.unicode.org/Public/5.1.0/ucd/UCD.html
-+ " For the other files see the header.
-+ "
-+ " Usage: Vim -S <this-file>
-+ "
-+ " Author: Bram Moolenaar
-+ " Last Update: 2010 Jan 12
-+ 
-+ " Parse lines of UnicodeData.txt.  Creates a list of lists in s:dataprops.
-+ func! ParseDataToProps()
-+   let s:dataprops = []
-+   let lnum = 1
-+   while lnum <= line('$')
-+     let l = split(getline(lnum), '\s*;\s*', 1)
-+     if len(l) != 15
-+       echoerr 'Found ' . len(l) . ' items in line ' . lnum . ', expected 15'
-+       return
-+     endif
-+     call add(s:dataprops, l)
-+     let lnum += 1
-+   endwhile
-+ endfunc
-+ 
-+ " Parse lines of CaseFolding.txt.  Creates a list of lists in s:foldprops.
-+ func! ParseFoldProps()
-+   let s:foldprops = []
-+   let lnum = 1
-+   while lnum <= line('$')
-+     let line = getline(lnum)
-+     if line !~ '^#' && line !~ '^\s*$'
-+       let l = split(line, '\s*;\s*', 1)
-+       if len(l) != 4
-+ 	echoerr 'Found ' . len(l) . ' items in line ' . lnum . ', expected 4'
-+ 	return
-+       endif
-+       call add(s:foldprops, l)
-+     endif
-+     let lnum += 1
-+   endwhile
-+ endfunc
-+ 
-+ " Parse lines of EastAsianWidth.txt.  Creates a list of lists in s:widthprops.
-+ func! ParseWidthProps()
-+   let s:widthprops = []
-+   let lnum = 1
-+   while lnum <= line('$')
-+     let line = getline(lnum)
-+     if line !~ '^#' && line !~ '^\s*$'
-+       let l = split(line, '\s*;\s*', 1)
-+       if len(l) != 2
-+ 	echoerr 'Found ' . len(l) . ' items in line ' . lnum . ', expected 2'
-+ 	return
-+       endif
-+       call add(s:widthprops, l)
-+     endif
-+     let lnum += 1
-+   endwhile
-+ endfunc
-+ 
-+ " Build the toLower or toUpper table in a new buffer.
-+ " Uses s:dataprops.
-+ func! BuildCaseTable(name, index)
-+   let start = -1
-+   let end = -1
-+   let step = 0
-+   let add = -1
-+   let ranges = []
-+   for p in s:dataprops
-+     if p[a:index] != ''
-+       let n = ('0x' . p[0]) + 0
-+       let nl = ('0x' . p[a:index]) + 0
-+       if start >= 0 && add == nl - n && (step == 0 || n - end == step)
-+ 	" continue with same range.
-+ 	let step = n - end
-+ 	let end = n
-+       else
-+ 	if start >= 0
-+ 	  " produce previous range
-+ 	  call Range(ranges, start, end, step, add)
-+ 	endif
-+ 	let start = n
-+ 	let end = n
-+ 	let step = 0
-+ 	let add = nl - n
-+       endif
-+     endif
-+   endfor
-+   if start >= 0
-+     call Range(ranges, start, end, step, add)
-+   endif
-+ 
-+   " New buffer to put the result in.
-+   new
-+   exe "file to" . a:name
-+   call setline(1, "static convertStruct to" . a:name . "[] =")
-+   call setline(2, "{")
-+   call append('$', ranges)
-+   call setline('$', getline('$')[:-2])  " remove last comma
-+   call setline(line('$') + 1, "};")
-+   wincmd p
-+ endfunc
-+ 
-+ " Build the foldCase table in a new buffer.
-+ " Uses s:foldprops.
-+ func! BuildFoldTable()
-+   let start = -1
-+   let end = -1
-+   let step = 0
-+   let add = -1
-+   let ranges = []
-+   for p in s:foldprops
-+     if p[1] == 'C' || p[1] == 'S'
-+       let n = ('0x' . p[0]) + 0
-+       let nl = ('0x' . p[2]) + 0
-+       if start >= 0 && add == nl - n && (step == 0 || n - end == step)
-+ 	" continue with same range.
-+ 	let step = n - end
-+ 	let end = n
-+       else
-+ 	if start >= 0
-+ 	  " produce previous range
-+ 	  call Range(ranges, start, end, step, add)
-+ 	endif
-+ 	let start = n
-+ 	let end = n
-+ 	let step = 0
-+ 	let add = nl - n
-+       endif
-+     endif
-+   endfor
-+   if start >= 0
-+     call Range(ranges, start, end, step, add)
-+   endif
-+ 
-+   " New buffer to put the result in.
-+   new
-+   file foldCase
-+   call setline(1, "static convertStruct foldCase[] =")
-+   call setline(2, "{")
-+   call append('$', ranges)
-+   call setline('$', getline('$')[:-2])  " remove last comma
-+   call setline(line('$') + 1, "};")
-+   wincmd p
-+ endfunc
-+ 
-+ func! Range(ranges, start, end, step, add)
-+   let s = printf("\t{0x%x,0x%x,%d,%d},", a:start, a:end, a:step == 0 ? -1 : a:step, a:add)
-+   call add(a:ranges, s)
-+ endfunc
-+ 
-+ " Build the combining table.
-+ " Uses s:dataprops.
-+ func! BuildCombiningTable()
-+   let start = -1
-+   let end = -1
-+   let ranges = []
-+   for p in s:dataprops
-+     if p[2] == 'Mn' || p[2] == 'Mc' || p[2] == 'Me'
-+       let n = ('0x' . p[0]) + 0
-+       if start >= 0 && end + 1 == n
-+ 	" continue with same range.
-+ 	let end = n
-+       else
-+ 	if start >= 0
-+ 	  " produce previous range
-+ 	  call add(ranges, printf("\t{0x%04x, 0x%04x},", start, end))
-+ 	endif
-+ 	let start = n
-+ 	let end = n
-+       endif
-+     endif
-+   endfor
-+   if start >= 0
-+     call add(ranges, printf("\t{0x%04x, 0x%04x},", start, end))
-+   endif
-+ 
-+   " New buffer to put the result in.
-+   new
-+   file combining
-+   call setline(1, "    static struct interval combining[] =")
-+   call setline(2, "    {")
-+   call append('$', ranges)
-+   call setline('$', getline('$')[:-2])  " remove last comma
-+   call setline(line('$') + 1, "    };")
-+   wincmd p
-+ endfunc
-+ 
-+ " Build the ambiguous table in a new buffer.
-+ " Uses s:widthprops and s:dataprops.
-+ func! BuildAmbiguousTable()
-+   let start = -1
-+   let end = -1
-+   let ranges = []
-+   let dataidx = 0
-+   for p in s:widthprops
-+     if p[1][0] == 'A'
-+       let n = ('0x' . p[0]) + 0
-+       " Find this char in the data table.
-+       while 1
-+ 	let dn = ('0x' . s:dataprops[dataidx][0]) + 0
-+ 	if dn >= n
-+ 	  break
-+ 	endif
-+ 	let dataidx += 1
-+       endwhile
-+       if dn != n
-+ 	echoerr "Cannot find character " . n . " in data table"
-+       endif
-+       " Only use the char when it's not a composing char.
-+       let dp = s:dataprops[dataidx]
-+       if dp[2] != 'Mn' && dp[2] != 'Mc' && dp[2] != 'Me'
-+ 	if start >= 0 && end + 1 == n
-+ 	  " continue with same range.
-+ 	  let end = n
-+ 	else
-+ 	  if start >= 0
-+ 	    " produce previous range
-+ 	    call add(ranges, printf("\t{0x%04x, 0x%04x},", start, end))
-+ 	  endif
-+ 	  let start = n
-+ 	  if p[0] =~ '\.\.'
-+ 	    let end = ('0x' . substitute(p[0], '.*\.\.', '', '')) + 0
-+ 	  else
-+ 	    let end = n
-+ 	  endif
-+ 	endif
-+       endif
-+     endif
-+   endfor
-+   if start >= 0
-+     call add(ranges, printf("\t{0x%04x, 0x%04x},", start, end))
-+   endif
-+ 
-+   " New buffer to put the result in.
-+   new
-+   file ambiguous
-+   call setline(1, "    static struct interval ambiguous[] =")
-+   call setline(2, "    {")
-+   call append('$', ranges)
-+   call setline('$', getline('$')[:-2])  " remove last comma
-+   call setline(line('$') + 1, "    };")
-+   wincmd p
-+ endfunc
-+ 
-+ 
-+ 
-+ " Edit the Unicode text file.  Requires the netrw plugin.
-+ edit http://unicode.org/Public/UNIDATA/UnicodeData.txt
-+ 
-+ " Parse each line, create a list of lists.
-+ call ParseDataToProps()
-+ 
-+ " Build the toLower table.
-+ call BuildCaseTable("Lower", 13)
-+ 
-+ " Build the toUpper table.
-+ call BuildCaseTable("Upper", 12)
-+ 
-+ " Build the ranges of composing chars.
-+ call BuildCombiningTable()
-+ 
-+ " Edit the case folding text file.  Requires the netrw plugin.
-+ edit http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
-+ 
-+ " Parse each line, create a list of lists.
-+ call ParseFoldProps()
-+ 
-+ " Build the foldCase table.
-+ call BuildFoldTable()
-+ 
-+ " Edit the width text file.  Requires the netrw plugin.
-+ edit http://www.unicode.org/Public/UNIDATA/EastAsianWidth.txt
-+ 
-+ " Parse each line, create a list of lists.
-+ call ParseWidthProps()
-+ 
-+ " Build the ambiguous table.
-+ call BuildAmbiguousTable()
-*** ../vim-7.2.329/src/mbyte.c	2009-12-02 15:03:24.000000000 +0100
---- src/mbyte.c	2010-01-12 19:35:49.000000000 +0100
-***************
-*** 26,32 ****
-   *		    Recognizing bytes is easy: 0xxx.xxxx is a single-byte
-   *		    char, 10xx.xxxx is a trailing byte, 11xx.xxxx is a leading
-   *		    byte of a multi-byte character.
-!  *		    To make things complicated, up to two composing characters
-   *		    are allowed.  These are drawn on top of the first char.
-   *		    For most editing the sequence of bytes with composing
-   *		    characters included is considered to be one character.
---- 26,32 ----
-   *		    Recognizing bytes is easy: 0xxx.xxxx is a single-byte
-   *		    char, 10xx.xxxx is a trailing byte, 11xx.xxxx is a leading
-   *		    byte of a multi-byte character.
-!  *		    To make things complicated, up to six composing characters
-   *		    are allowed.  These are drawn on top of the first char.
-   *		    For most editing the sequence of bytes with composing
-   *		    characters included is considered to be one character.
-***************
-*** 1153,1160 ****
-  
-  struct interval
-  {
-!     unsigned short first;
-!     unsigned short last;
-  };
-  static int intable __ARGS((struct interval *table, size_t size, int c));
-  
---- 1153,1160 ----
-  
-  struct interval
-  {
-!     long first;
-!     long last;
-  };
-  static int intable __ARGS((struct interval *table, size_t size, int c));
-  
-***************
-*** 1200,1261 ****
-  utf_char2cells(c)
-      int		c;
-  {
-!     /* sorted list of non-overlapping intervals of East Asian Ambiguous
-!      * characters, generated with:
-!      * "uniset +WIDTH-A -cat=Me -cat=Mn -cat=Cf c" */
-!     static struct interval ambiguous[] = {
-! 	{0x00A1, 0x00A1}, {0x00A4, 0x00A4}, {0x00A7, 0x00A8},
-! 	{0x00AA, 0x00AA}, {0x00AE, 0x00AE}, {0x00B0, 0x00B4},
-! 	{0x00B6, 0x00BA}, {0x00BC, 0x00BF}, {0x00C6, 0x00C6},
-! 	{0x00D0, 0x00D0}, {0x00D7, 0x00D8}, {0x00DE, 0x00E1},
-! 	{0x00E6, 0x00E6}, {0x00E8, 0x00EA}, {0x00EC, 0x00ED},
-! 	{0x00F0, 0x00F0}, {0x00F2, 0x00F3}, {0x00F7, 0x00FA},
-! 	{0x00FC, 0x00FC}, {0x00FE, 0x00FE}, {0x0101, 0x0101},
-! 	{0x0111, 0x0111}, {0x0113, 0x0113}, {0x011B, 0x011B},
-! 	{0x0126, 0x0127}, {0x012B, 0x012B}, {0x0131, 0x0133},
-! 	{0x0138, 0x0138}, {0x013F, 0x0142}, {0x0144, 0x0144},
-! 	{0x0148, 0x014B}, {0x014D, 0x014D}, {0x0152, 0x0153},
-! 	{0x0166, 0x0167}, {0x016B, 0x016B}, {0x01CE, 0x01CE},
-! 	{0x01D0, 0x01D0}, {0x01D2, 0x01D2}, {0x01D4, 0x01D4},
-! 	{0x01D6, 0x01D6}, {0x01D8, 0x01D8}, {0x01DA, 0x01DA},
-! 	{0x01DC, 0x01DC}, {0x0251, 0x0251}, {0x0261, 0x0261},
-! 	{0x02C4, 0x02C4}, {0x02C7, 0x02C7}, {0x02C9, 0x02CB},
-! 	{0x02CD, 0x02CD}, {0x02D0, 0x02D0}, {0x02D8, 0x02DB},
-! 	{0x02DD, 0x02DD}, {0x02DF, 0x02DF}, {0x0391, 0x03A1},
-! 	{0x03A3, 0x03A9}, {0x03B1, 0x03C1}, {0x03C3, 0x03C9},
-! 	{0x0401, 0x0401}, {0x0410, 0x044F}, {0x0451, 0x0451},
-! 	{0x2010, 0x2010}, {0x2013, 0x2016}, {0x2018, 0x2019},
-! 	{0x201C, 0x201D}, {0x2020, 0x2022}, {0x2024, 0x2027},
-! 	{0x2030, 0x2030}, {0x2032, 0x2033}, {0x2035, 0x2035},
-! 	{0x203B, 0x203B}, {0x203E, 0x203E}, {0x2074, 0x2074},
-! 	{0x207F, 0x207F}, {0x2081, 0x2084}, {0x20AC, 0x20AC},
-! 	{0x2103, 0x2103}, {0x2105, 0x2105}, {0x2109, 0x2109},
-! 	{0x2113, 0x2113}, {0x2116, 0x2116}, {0x2121, 0x2122},
-! 	{0x2126, 0x2126}, {0x212B, 0x212B}, {0x2153, 0x2154},
-! 	{0x215B, 0x215E}, {0x2160, 0x216B}, {0x2170, 0x2179},
-! 	{0x2190, 0x2199}, {0x21B8, 0x21B9}, {0x21D2, 0x21D2},
-! 	{0x21D4, 0x21D4}, {0x21E7, 0x21E7}, {0x2200, 0x2200},
-! 	{0x2202, 0x2203}, {0x2207, 0x2208}, {0x220B, 0x220B},
-! 	{0x220F, 0x220F}, {0x2211, 0x2211}, {0x2215, 0x2215},
-! 	{0x221A, 0x221A}, {0x221D, 0x2220}, {0x2223, 0x2223},
-! 	{0x2225, 0x2225}, {0x2227, 0x222C}, {0x222E, 0x222E},
-! 	{0x2234, 0x2237}, {0x223C, 0x223D}, {0x2248, 0x2248},
-! 	{0x224C, 0x224C}, {0x2252, 0x2252}, {0x2260, 0x2261},
-! 	{0x2264, 0x2267}, {0x226A, 0x226B}, {0x226E, 0x226F},
-! 	{0x2282, 0x2283}, {0x2286, 0x2287}, {0x2295, 0x2295},
-! 	{0x2299, 0x2299}, {0x22A5, 0x22A5}, {0x22BF, 0x22BF},
-! 	{0x2312, 0x2312}, {0x2460, 0x24E9}, {0x24EB, 0x254B},
-! 	{0x2550, 0x2573}, {0x2580, 0x258F}, {0x2592, 0x2595},
-! 	{0x25A0, 0x25A1}, {0x25A3, 0x25A9}, {0x25B2, 0x25B3},
-! 	{0x25B6, 0x25B7}, {0x25BC, 0x25BD}, {0x25C0, 0x25C1},
-! 	{0x25C6, 0x25C8}, {0x25CB, 0x25CB}, {0x25CE, 0x25D1},
-! 	{0x25E2, 0x25E5}, {0x25EF, 0x25EF}, {0x2605, 0x2606},
-! 	{0x2609, 0x2609}, {0x260E, 0x260F}, {0x2614, 0x2615},
-! 	{0x261C, 0x261C}, {0x261E, 0x261E}, {0x2640, 0x2640},
-! 	{0x2642, 0x2642}, {0x2660, 0x2661}, {0x2663, 0x2665},
-! 	{0x2667, 0x266A}, {0x266C, 0x266D}, {0x266F, 0x266F},
-! 	{0x273D, 0x273D}, {0x2776, 0x277F}, {0xE000, 0xF8FF},
-! 	{0xFFFD, 0xFFFD}, /* {0xF0000, 0xFFFFD}, {0x100000, 0x10FFFD} */
-      };
-  
-      if (c >= 0x100)
---- 1200,1390 ----
-  utf_char2cells(c)
-      int		c;
-  {
-!     /* Sorted list of non-overlapping intervals of East Asian Ambiguous
-!      * characters, generated with ../runtime/tools/unicode.vim. */
-!     static struct interval ambiguous[] =
-!     {
-! 	{0x00a1, 0x00a1},
-! 	{0x00a4, 0x00a4},
-! 	{0x00a7, 0x00a8},
-! 	{0x00aa, 0x00aa},
-! 	{0x00ad, 0x00ae},
-! 	{0x00b0, 0x00b4},
-! 	{0x00b6, 0x00ba},
-! 	{0x00bc, 0x00bf},
-! 	{0x00c6, 0x00c6},
-! 	{0x00d0, 0x00d0},
-! 	{0x00d7, 0x00d8},
-! 	{0x00de, 0x00e1},
-! 	{0x00e6, 0x00e6},
-! 	{0x00e8, 0x00ea},
-! 	{0x00ec, 0x00ed},
-! 	{0x00f0, 0x00f0},
-! 	{0x00f2, 0x00f3},
-! 	{0x00f7, 0x00fa},
-! 	{0x00fc, 0x00fc},
-! 	{0x00fe, 0x00fe},
-! 	{0x0101, 0x0101},
-! 	{0x0111, 0x0111},
-! 	{0x0113, 0x0113},
-! 	{0x011b, 0x011b},
-! 	{0x0126, 0x0127},
-! 	{0x012b, 0x012b},
-! 	{0x0131, 0x0133},
-! 	{0x0138, 0x0138},
-! 	{0x013f, 0x0142},
-! 	{0x0144, 0x0144},
-! 	{0x0148, 0x014b},
-! 	{0x014d, 0x014d},
-! 	{0x0152, 0x0153},
-! 	{0x0166, 0x0167},
-! 	{0x016b, 0x016b},
-! 	{0x01ce, 0x01ce},
-! 	{0x01d0, 0x01d0},
-! 	{0x01d2, 0x01d2},
-! 	{0x01d4, 0x01d4},
-! 	{0x01d6, 0x01d6},
-! 	{0x01d8, 0x01d8},
-! 	{0x01da, 0x01da},
-! 	{0x01dc, 0x01dc},
-! 	{0x0251, 0x0251},
-! 	{0x0261, 0x0261},
-! 	{0x02c4, 0x02c4},
-! 	{0x02c7, 0x02c7},
-! 	{0x02c9, 0x02cb},
-! 	{0x02cd, 0x02cd},
-! 	{0x02d0, 0x02d0},
-! 	{0x02d8, 0x02db},
-! 	{0x02dd, 0x02dd},
-! 	{0x02df, 0x02df},
-! 	{0x0391, 0x03a1},
-! 	{0x03a3, 0x03a9},
-! 	{0x03b1, 0x03c1},
-! 	{0x03c3, 0x03c9},
-! 	{0x0401, 0x0401},
-! 	{0x0410, 0x044f},
-! 	{0x0451, 0x0451},
-! 	{0x2010, 0x2010},
-! 	{0x2013, 0x2016},
-! 	{0x2018, 0x2019},
-! 	{0x201c, 0x201d},
-! 	{0x2020, 0x2022},
-! 	{0x2024, 0x2027},
-! 	{0x2030, 0x2030},
-! 	{0x2032, 0x2033},
-! 	{0x2035, 0x2035},
-! 	{0x203b, 0x203b},
-! 	{0x203e, 0x203e},
-! 	{0x2074, 0x2074},
-! 	{0x207f, 0x207f},
-! 	{0x2081, 0x2084},
-! 	{0x20ac, 0x20ac},
-! 	{0x2103, 0x2103},
-! 	{0x2105, 0x2105},
-! 	{0x2109, 0x2109},
-! 	{0x2113, 0x2113},
-! 	{0x2116, 0x2116},
-! 	{0x2121, 0x2122},
-! 	{0x2126, 0x2126},
-! 	{0x212b, 0x212b},
-! 	{0x2153, 0x2154},
-! 	{0x215b, 0x215e},
-! 	{0x2160, 0x216b},
-! 	{0x2170, 0x2179},
-! 	{0x2189, 0x2189},
-! 	{0x2190, 0x2199},
-! 	{0x21b8, 0x21b9},
-! 	{0x21d2, 0x21d2},
-! 	{0x21d4, 0x21d4},
-! 	{0x21e7, 0x21e7},
-! 	{0x2200, 0x2200},
-! 	{0x2202, 0x2203},
-! 	{0x2207, 0x2208},
-! 	{0x220b, 0x220b},
-! 	{0x220f, 0x220f},
-! 	{0x2211, 0x2211},
-! 	{0x2215, 0x2215},
-! 	{0x221a, 0x221a},
-! 	{0x221d, 0x2220},
-! 	{0x2223, 0x2223},
-! 	{0x2225, 0x2225},
-! 	{0x2227, 0x222c},
-! 	{0x222e, 0x222e},
-! 	{0x2234, 0x2237},
-! 	{0x223c, 0x223d},
-! 	{0x2248, 0x2248},
-! 	{0x224c, 0x224c},
-! 	{0x2252, 0x2252},
-! 	{0x2260, 0x2261},
-! 	{0x2264, 0x2267},
-! 	{0x226a, 0x226b},
-! 	{0x226e, 0x226f},
-! 	{0x2282, 0x2283},
-! 	{0x2286, 0x2287},
-! 	{0x2295, 0x2295},
-! 	{0x2299, 0x2299},
-! 	{0x22a5, 0x22a5},
-! 	{0x22bf, 0x22bf},
-! 	{0x2312, 0x2312},
-! 	{0x2460, 0x24e9},
-! 	{0x24eb, 0x254b},
-! 	{0x2550, 0x2573},
-! 	{0x2580, 0x258f},
-! 	{0x2592, 0x2595},
-! 	{0x25a0, 0x25a1},
-! 	{0x25a3, 0x25a9},
-! 	{0x25b2, 0x25b3},
-! 	{0x25b6, 0x25b7},
-! 	{0x25bc, 0x25bd},
-! 	{0x25c0, 0x25c1},
-! 	{0x25c6, 0x25c8},
-! 	{0x25cb, 0x25cb},
-! 	{0x25ce, 0x25d1},
-! 	{0x25e2, 0x25e5},
-! 	{0x25ef, 0x25ef},
-! 	{0x2605, 0x2606},
-! 	{0x2609, 0x2609},
-! 	{0x260e, 0x260f},
-! 	{0x2614, 0x2615},
-! 	{0x261c, 0x261c},
-! 	{0x261e, 0x261e},
-! 	{0x2640, 0x2640},
-! 	{0x2642, 0x2642},
-! 	{0x2660, 0x2661},
-! 	{0x2663, 0x2665},
-! 	{0x2667, 0x266a},
-! 	{0x266c, 0x266d},
-! 	{0x266f, 0x266f},
-! 	{0x269e, 0x269f},
-! 	{0x26be, 0x26bf},
-! 	{0x26c4, 0x26cd},
-! 	{0x26cf, 0x26e1},
-! 	{0x26e3, 0x26e3},
-! 	{0x26e8, 0x26ff},
-! 	{0x273d, 0x273d},
-! 	{0x2757, 0x2757},
-! 	{0x2776, 0x277f},
-! 	{0x2b55, 0x2b59},
-! 	{0x3248, 0x324f},
-! 	{0xe000, 0xf8ff},
-! 	{0xfffd, 0xfffd},
-! 	{0x1f100, 0x1f10a},
-! 	{0x1f110, 0x1f12d},
-! 	{0x1f131, 0x1f131},
-! 	{0x1f13d, 0x1f13d},
-! 	{0x1f13f, 0x1f13f},
-! 	{0x1f142, 0x1f142},
-! 	{0x1f146, 0x1f146},
-! 	{0x1f14a, 0x1f14e},
-! 	{0x1f157, 0x1f157},
-! 	{0x1f15f, 0x1f15f},
-! 	{0x1f179, 0x1f179},
-! 	{0x1f17b, 0x1f17c},
-! 	{0x1f17f, 0x1f17f},
-! 	{0x1f18a, 0x1f18d},
-! 	{0x1f190, 0x1f190},
-! 	{0xf0000, 0xffffd},
-! 	{0x100000, 0x10fffd}
-      };
-  
-      if (c >= 0x100)
-***************
-*** 1807,1813 ****
-  	return 1;
-  
-      /*
-!      * Check for composing characters.  We can handle only the first two, but
-       * skip all of them (otherwise the cursor would get stuck).
-       */
-  #ifdef FEAT_ARABIC
---- 1936,1942 ----
-  	return 1;
-  
-      /*
-!      * Check for composing characters.  We can handle only the first six, but
-       * skip all of them (otherwise the cursor would get stuck).
-       */
-  #ifdef FEAT_ARABIC
-***************
-*** 1855,1861 ****
-  	return 1;
-  
-      /*
-!      * Check for composing characters.  We can handle only the first two, but
-       * skip all of them (otherwise the cursor would get stuck).
-       */
-  #ifdef FEAT_ARABIC
---- 1984,1990 ----
-  	return 1;
-  
-      /*
-!      * Check for composing characters.  We can handle only the first six, but
-       * skip all of them (otherwise the cursor would get stuck).
-       */
-  #ifdef FEAT_ARABIC
-***************
-*** 1973,2010 ****
-  utf_iscomposing(c)
-      int		c;
-  {
-!     /* sorted list of non-overlapping intervals */
-      static struct interval combining[] =
-      {
-! 	{0x0300, 0x034f}, {0x0360, 0x036f}, {0x0483, 0x0486}, {0x0488, 0x0489},
-! 	{0x0591, 0x05a1}, {0x05a3, 0x05b9}, {0x05bb, 0x05bd}, {0x05bf, 0x05bf},
-! 	{0x05c1, 0x05c2}, {0x05c4, 0x05c4}, {0x0610, 0x0615}, {0x064b, 0x0658},
-! 	{0x0670, 0x0670}, {0x06d6, 0x06dc}, {0x06de, 0x06e4}, {0x06e7, 0x06e8},
-! 	{0x06ea, 0x06ed}, {0x0711, 0x0711}, {0x0730, 0x074a}, {0x07a6, 0x07b0},
-! 	{0x0901, 0x0903}, {0x093c, 0x093c}, {0x093e, 0x094d}, {0x0951, 0x0954},
-! 	{0x0962, 0x0963}, {0x0981, 0x0983}, {0x09bc, 0x09bc}, {0x09be, 0x09c4},
-! 	{0x09c7, 0x09c8}, {0x09cb, 0x09cd}, {0x09d7, 0x09d7}, {0x09e2, 0x09e3},
-! 	{0x0a01, 0x0a03}, {0x0a3c, 0x0a3c}, {0x0a3e, 0x0a42}, {0x0a47, 0x0a48},
-! 	{0x0a4b, 0x0a4d}, {0x0a70, 0x0a71}, {0x0a81, 0x0a83}, {0x0abc, 0x0abc},
-! 	{0x0abe, 0x0ac5}, {0x0ac7, 0x0ac9}, {0x0acb, 0x0acd}, {0x0ae2, 0x0ae3},
-! 	{0x0b01, 0x0b03}, {0x0b3c, 0x0b3c}, {0x0b3e, 0x0b43}, {0x0b47, 0x0b48},
-! 	{0x0b4b, 0x0b4d}, {0x0b56, 0x0b57}, {0x0b82, 0x0b82}, {0x0bbe, 0x0bc2},
-! 	{0x0bc6, 0x0bc8}, {0x0bca, 0x0bcd}, {0x0bd7, 0x0bd7}, {0x0c01, 0x0c03},
-! 	{0x0c3e, 0x0c44}, {0x0c46, 0x0c48}, {0x0c4a, 0x0c4d}, {0x0c55, 0x0c56},
-! 	{0x0c82, 0x0c83}, {0x0cbc, 0x0cbc}, {0x0cbe, 0x0cc4}, {0x0cc6, 0x0cc8},
-! 	{0x0cca, 0x0ccd}, {0x0cd5, 0x0cd6}, {0x0d02, 0x0d03}, {0x0d3e, 0x0d43},
-! 	{0x0d46, 0x0d48}, {0x0d4a, 0x0d4d}, {0x0d57, 0x0d57}, {0x0d82, 0x0d83},
-! 	{0x0dca, 0x0dca}, {0x0dcf, 0x0dd4}, {0x0dd6, 0x0dd6}, {0x0dd8, 0x0ddf},
-! 	{0x0df2, 0x0df3}, {0x0e31, 0x0e31}, {0x0e34, 0x0e3a}, {0x0e47, 0x0e4e},
-! 	{0x0eb1, 0x0eb1}, {0x0eb4, 0x0eb9}, {0x0ebb, 0x0ebc}, {0x0ec8, 0x0ecd},
-! 	{0x0f18, 0x0f19}, {0x0f35, 0x0f35}, {0x0f37, 0x0f37}, {0x0f39, 0x0f39},
-! 	{0x0f3e, 0x0f3f}, {0x0f71, 0x0f84}, {0x0f86, 0x0f87}, {0x0f90, 0x0f97},
-! 	{0x0f99, 0x0fbc}, {0x0fc6, 0x0fc6}, {0x102c, 0x1032}, {0x1036, 0x1039},
-! 	{0x1056, 0x1059}, {0x1712, 0x1714}, {0x1732, 0x1734}, {0x1752, 0x1753},
-! 	{0x1772, 0x1773}, {0x17b6, 0x17d3}, {0x17dd, 0x17dd}, {0x180b, 0x180d},
-! 	{0x18a9, 0x18a9}, {0x1920, 0x192b}, {0x1930, 0x193b}, {0x20d0, 0x20ea},
-! 	{0x302a, 0x302f}, {0x3099, 0x309a}, {0xfb1e, 0xfb1e}, {0xfe00, 0xfe0f},
-! 	{0xfe20, 0xfe23},
-      };
-  
-      return intable(combining, sizeof(combining), c);
---- 2102,2299 ----
-  utf_iscomposing(c)
-      int		c;
-  {
-!     /* Sorted list of non-overlapping intervals.
-!      * Generated by ../runtime/tools/unicode.vim. */
-      static struct interval combining[] =
-      {
-! 	{0x0300, 0x036f},
-! 	{0x0483, 0x0489},
-! 	{0x0591, 0x05bd},
-! 	{0x05bf, 0x05bf},
-! 	{0x05c1, 0x05c2},
-! 	{0x05c4, 0x05c5},
-! 	{0x05c7, 0x05c7},
-! 	{0x0610, 0x061a},
-! 	{0x064b, 0x065e},
-! 	{0x0670, 0x0670},
-! 	{0x06d6, 0x06dc},
-! 	{0x06de, 0x06e4},
-! 	{0x06e7, 0x06e8},
-! 	{0x06ea, 0x06ed},
-! 	{0x0711, 0x0711},
-! 	{0x0730, 0x074a},
-! 	{0x07a6, 0x07b0},
-! 	{0x07eb, 0x07f3},
-! 	{0x0816, 0x0819},
-! 	{0x081b, 0x0823},
-! 	{0x0825, 0x0827},
-! 	{0x0829, 0x082d},
-! 	{0x0900, 0x0903},
-! 	{0x093c, 0x093c},
-! 	{0x093e, 0x094e},
-! 	{0x0951, 0x0955},
-! 	{0x0962, 0x0963},
-! 	{0x0981, 0x0983},
-! 	{0x09bc, 0x09bc},
-! 	{0x09be, 0x09c4},
-! 	{0x09c7, 0x09c8},
-! 	{0x09cb, 0x09cd},
-! 	{0x09d7, 0x09d7},
-! 	{0x09e2, 0x09e3},
-! 	{0x0a01, 0x0a03},
-! 	{0x0a3c, 0x0a3c},
-! 	{0x0a3e, 0x0a42},
-! 	{0x0a47, 0x0a48},
-! 	{0x0a4b, 0x0a4d},
-! 	{0x0a51, 0x0a51},
-! 	{0x0a70, 0x0a71},
-! 	{0x0a75, 0x0a75},
-! 	{0x0a81, 0x0a83},
-! 	{0x0abc, 0x0abc},
-! 	{0x0abe, 0x0ac5},
-! 	{0x0ac7, 0x0ac9},
-! 	{0x0acb, 0x0acd},
-! 	{0x0ae2, 0x0ae3},
-! 	{0x0b01, 0x0b03},
-! 	{0x0b3c, 0x0b3c},
-! 	{0x0b3e, 0x0b44},
-! 	{0x0b47, 0x0b48},
-! 	{0x0b4b, 0x0b4d},
-! 	{0x0b56, 0x0b57},
-! 	{0x0b62, 0x0b63},
-! 	{0x0b82, 0x0b82},
-! 	{0x0bbe, 0x0bc2},
-! 	{0x0bc6, 0x0bc8},
-! 	{0x0bca, 0x0bcd},
-! 	{0x0bd7, 0x0bd7},
-! 	{0x0c01, 0x0c03},
-! 	{0x0c3e, 0x0c44},
-! 	{0x0c46, 0x0c48},
-! 	{0x0c4a, 0x0c4d},
-! 	{0x0c55, 0x0c56},
-! 	{0x0c62, 0x0c63},
-! 	{0x0c82, 0x0c83},
-! 	{0x0cbc, 0x0cbc},
-! 	{0x0cbe, 0x0cc4},
-! 	{0x0cc6, 0x0cc8},
-! 	{0x0cca, 0x0ccd},
-! 	{0x0cd5, 0x0cd6},
-! 	{0x0ce2, 0x0ce3},
-! 	{0x0d02, 0x0d03},
-! 	{0x0d3e, 0x0d44},
-! 	{0x0d46, 0x0d48},
-! 	{0x0d4a, 0x0d4d},
-! 	{0x0d57, 0x0d57},
-! 	{0x0d62, 0x0d63},
-! 	{0x0d82, 0x0d83},
-! 	{0x0dca, 0x0dca},
-! 	{0x0dcf, 0x0dd4},
-! 	{0x0dd6, 0x0dd6},
-! 	{0x0dd8, 0x0ddf},
-! 	{0x0df2, 0x0df3},
-! 	{0x0e31, 0x0e31},
-! 	{0x0e34, 0x0e3a},
-! 	{0x0e47, 0x0e4e},
-! 	{0x0eb1, 0x0eb1},
-! 	{0x0eb4, 0x0eb9},
-! 	{0x0ebb, 0x0ebc},
-! 	{0x0ec8, 0x0ecd},
-! 	{0x0f18, 0x0f19},
-! 	{0x0f35, 0x0f35},
-! 	{0x0f37, 0x0f37},
-! 	{0x0f39, 0x0f39},
-! 	{0x0f3e, 0x0f3f},
-! 	{0x0f71, 0x0f84},
-! 	{0x0f86, 0x0f87},
-! 	{0x0f90, 0x0f97},
-! 	{0x0f99, 0x0fbc},
-! 	{0x0fc6, 0x0fc6},
-! 	{0x102b, 0x103e},
-! 	{0x1056, 0x1059},
-! 	{0x105e, 0x1060},
-! 	{0x1062, 0x1064},
-! 	{0x1067, 0x106d},
-! 	{0x1071, 0x1074},
-! 	{0x1082, 0x108d},
-! 	{0x108f, 0x108f},
-! 	{0x109a, 0x109d},
-! 	{0x135f, 0x135f},
-! 	{0x1712, 0x1714},
-! 	{0x1732, 0x1734},
-! 	{0x1752, 0x1753},
-! 	{0x1772, 0x1773},
-! 	{0x17b6, 0x17d3},
-! 	{0x17dd, 0x17dd},
-! 	{0x180b, 0x180d},
-! 	{0x18a9, 0x18a9},
-! 	{0x1920, 0x192b},
-! 	{0x1930, 0x193b},
-! 	{0x19b0, 0x19c0},
-! 	{0x19c8, 0x19c9},
-! 	{0x1a17, 0x1a1b},
-! 	{0x1a55, 0x1a5e},
-! 	{0x1a60, 0x1a7c},
-! 	{0x1a7f, 0x1a7f},
-! 	{0x1b00, 0x1b04},
-! 	{0x1b34, 0x1b44},
-! 	{0x1b6b, 0x1b73},
-! 	{0x1b80, 0x1b82},
-! 	{0x1ba1, 0x1baa},
-! 	{0x1c24, 0x1c37},
-! 	{0x1cd0, 0x1cd2},
-! 	{0x1cd4, 0x1ce8},
-! 	{0x1ced, 0x1ced},
-! 	{0x1cf2, 0x1cf2},
-! 	{0x1dc0, 0x1de6},
-! 	{0x1dfd, 0x1dff},
-! 	{0x20d0, 0x20f0},
-! 	{0x2cef, 0x2cf1},
-! 	{0x2de0, 0x2dff},
-! 	{0x302a, 0x302f},
-! 	{0x3099, 0x309a},
-! 	{0xa66f, 0xa672},
-! 	{0xa67c, 0xa67d},
-! 	{0xa6f0, 0xa6f1},
-! 	{0xa802, 0xa802},
-! 	{0xa806, 0xa806},
-! 	{0xa80b, 0xa80b},
-! 	{0xa823, 0xa827},
-! 	{0xa880, 0xa881},
-! 	{0xa8b4, 0xa8c4},
-! 	{0xa8e0, 0xa8f1},
-! 	{0xa926, 0xa92d},
-! 	{0xa947, 0xa953},
-! 	{0xa980, 0xa983},
-! 	{0xa9b3, 0xa9c0},
-! 	{0xaa29, 0xaa36},
-! 	{0xaa43, 0xaa43},
-! 	{0xaa4c, 0xaa4d},
-! 	{0xaa7b, 0xaa7b},
-! 	{0xaab0, 0xaab0},
-! 	{0xaab2, 0xaab4},
-! 	{0xaab7, 0xaab8},
-! 	{0xaabe, 0xaabf},
-! 	{0xaac1, 0xaac1},
-! 	{0xabe3, 0xabea},
-! 	{0xabec, 0xabed},
-! 	{0xfb1e, 0xfb1e},
-! 	{0xfe00, 0xfe0f},
-! 	{0xfe20, 0xfe26},
-! 	{0x101fd, 0x101fd},
-! 	{0x10a01, 0x10a03},
-! 	{0x10a05, 0x10a06},
-! 	{0x10a0c, 0x10a0f},
-! 	{0x10a38, 0x10a3a},
-! 	{0x10a3f, 0x10a3f},
-! 	{0x11080, 0x11082},
-! 	{0x110b0, 0x110ba},
-! 	{0x1d165, 0x1d169},
-! 	{0x1d16d, 0x1d172},
-! 	{0x1d17b, 0x1d182},
-! 	{0x1d185, 0x1d18b},
-! 	{0x1d1aa, 0x1d1ad},
-! 	{0x1d242, 0x1d244},
-! 	{0xe0100, 0xe01ef}
-      };
-  
-      return intable(combining, sizeof(combining), c);
-***************
-*** 2152,2166 ****
-   * Code for Unicode case-dependent operations.  Based on notes in
-   * http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
-   * This code uses simple case folding, not full case folding.
-   */
-  
-  /*
-!  * The following table is built by foldExtract.pl < CaseFolding.txt .
-!  * It must be in numeric order, because we use binary search on it.
-!  * An entry such as {0x41,0x5a,1,32} means that UCS-4 characters in the range
-!  * from 0x41 to 0x5a inclusive, stepping by 1, are folded by adding 32.
-   */
-- 
-  typedef struct
-  {
-      int rangeStart;
---- 2441,2456 ----
-   * Code for Unicode case-dependent operations.  Based on notes in
-   * http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
-   * This code uses simple case folding, not full case folding.
-+  * Last updated for Unicode 5.2.
-   */
-  
-  /*
-!  * The following tables are built by ../runtime/tools/unicode.vim.
-!  * They must be in numeric order, because we use binary search.
-!  * An entry such as {0x41,0x5a,1,32} means that Unicode characters in the
-!  * range from 0x41 to 0x5a inclusive, stepping by 1, are changed to
-!  * folded/upper/lower by adding 32.
-   */
-  typedef struct
-  {
-      int rangeStart;
-***************
-*** 2171,2211 ****
-  
-  static convertStruct foldCase[] =
-  {
-! 	{0x41,0x5a,1,32}, {0xc0,0xd6,1,32}, {0xd8,0xde,1,32},
-! 	{0x100,0x12e,2,1}, {0x130,0x130,-1,-199}, {0x132,0x136,2,1},
-! 	{0x139,0x147,2,1}, {0x14a,0x176,2,1}, {0x178,0x178,-1,-121},
-! 	{0x179,0x17d,2,1}, {0x181,0x181,-1,210}, {0x182,0x184,2,1},
-! 	{0x186,0x186,-1,206}, {0x187,0x187,-1,1}, {0x189,0x18a,1,205},
-! 	{0x18b,0x18b,-1,1}, {0x18e,0x18e,-1,79}, {0x18f,0x18f,-1,202},
-! 	{0x190,0x190,-1,203}, {0x191,0x191,-1,1}, {0x193,0x193,-1,205},
-! 	{0x194,0x194,-1,207}, {0x196,0x196,-1,211}, {0x197,0x197,-1,209},
-! 	{0x198,0x198,-1,1}, {0x19c,0x19c,-1,211}, {0x19d,0x19d,-1,213},
-! 	{0x19f,0x19f,-1,214}, {0x1a0,0x1a4,2,1}, {0x1a6,0x1a6,-1,218},
-! 	{0x1a7,0x1a7,-1,1}, {0x1a9,0x1a9,-1,218}, {0x1ac,0x1ac,-1,1},
-! 	{0x1ae,0x1ae,-1,218}, {0x1af,0x1af,-1,1}, {0x1b1,0x1b2,1,217},
-! 	{0x1b3,0x1b5,2,1}, {0x1b7,0x1b7,-1,219}, {0x1b8,0x1bc,4,1},
-! 	{0x1c4,0x1c4,-1,2}, {0x1c5,0x1c5,-1,1}, {0x1c7,0x1c7,-1,2},
-! 	{0x1c8,0x1c8,-1,1}, {0x1ca,0x1ca,-1,2}, {0x1cb,0x1db,2,1},
-! 	{0x1de,0x1ee,2,1}, {0x1f1,0x1f1,-1,2}, {0x1f2,0x1f4,2,1},
-! 	{0x1f6,0x1f6,-1,-97}, {0x1f7,0x1f7,-1,-56}, {0x1f8,0x21e,2,1},
-! 	{0x220,0x220,-1,-130}, {0x222,0x232,2,1}, {0x386,0x386,-1,38},
-! 	{0x388,0x38a,1,37}, {0x38c,0x38c,-1,64}, {0x38e,0x38f,1,63},
-! 	{0x391,0x3a1,1,32}, {0x3a3,0x3ab,1,32}, {0x3d8,0x3ee,2,1},
-! 	{0x3f4,0x3f4,-1,-60}, {0x3f7,0x3f7,-1,1}, {0x3f9,0x3f9,-1,-7},
-! 	{0x3fa,0x3fa,-1,1}, {0x400,0x40f,1,80}, {0x410,0x42f,1,32},
-! 	{0x460,0x480,2,1}, {0x48a,0x4be,2,1}, {0x4c1,0x4cd,2,1},
-! 	{0x4d0,0x4f4,2,1}, {0x4f8,0x500,8,1}, {0x502,0x50e,2,1},
-! 	{0x531,0x556,1,48}, {0x1e00,0x1e94,2,1}, {0x1ea0,0x1ef8,2,1},
-! 	{0x1f08,0x1f0f,1,-8}, {0x1f18,0x1f1d,1,-8}, {0x1f28,0x1f2f,1,-8},
-! 	{0x1f38,0x1f3f,1,-8}, {0x1f48,0x1f4d,1,-8}, {0x1f59,0x1f5f,2,-8},
-! 	{0x1f68,0x1f6f,1,-8}, {0x1f88,0x1f8f,1,-8}, {0x1f98,0x1f9f,1,-8},
-! 	{0x1fa8,0x1faf,1,-8}, {0x1fb8,0x1fb9,1,-8}, {0x1fba,0x1fbb,1,-74},
-! 	{0x1fbc,0x1fbc,-1,-9}, {0x1fc8,0x1fcb,1,-86}, {0x1fcc,0x1fcc,-1,-9},
-! 	{0x1fd8,0x1fd9,1,-8}, {0x1fda,0x1fdb,1,-100}, {0x1fe8,0x1fe9,1,-8},
-! 	{0x1fea,0x1feb,1,-112}, {0x1fec,0x1fec,-1,-7}, {0x1ff8,0x1ff9,1,-128},
-! 	{0x1ffa,0x1ffb,1,-126}, {0x1ffc,0x1ffc,-1,-9}, {0x2126,0x2126,-1,-7517},
-! 	{0x212a,0x212a,-1,-8383}, {0x212b,0x212b,-1,-8262},
-! 	{0x2160,0x216f,1,16}, {0x24b6,0x24cf,1,26}, {0xff21,0xff3a,1,32},
-  	{0x10400,0x10427,1,40}
-  };
-  
---- 2461,2621 ----
-  
-  static convertStruct foldCase[] =
-  {
-! 	{0x41,0x5a,1,32},
-! 	{0xb5,0xb5,-1,775},
-! 	{0xc0,0xd6,1,32},
-! 	{0xd8,0xde,1,32},
-! 	{0x100,0x12e,2,1},
-! 	{0x132,0x136,2,1},
-! 	{0x139,0x147,2,1},
-! 	{0x14a,0x176,2,1},
-! 	{0x178,0x178,-1,-121},
-! 	{0x179,0x17d,2,1},
-! 	{0x17f,0x17f,-1,-268},
-! 	{0x181,0x181,-1,210},
-! 	{0x182,0x184,2,1},
-! 	{0x186,0x186,-1,206},
-! 	{0x187,0x187,-1,1},
-! 	{0x189,0x18a,1,205},
-! 	{0x18b,0x18b,-1,1},
-! 	{0x18e,0x18e,-1,79},
-! 	{0x18f,0x18f,-1,202},
-! 	{0x190,0x190,-1,203},
-! 	{0x191,0x191,-1,1},
-! 	{0x193,0x193,-1,205},
-! 	{0x194,0x194,-1,207},
-! 	{0x196,0x196,-1,211},
-! 	{0x197,0x197,-1,209},
-! 	{0x198,0x198,-1,1},
-! 	{0x19c,0x19c,-1,211},
-! 	{0x19d,0x19d,-1,213},
-! 	{0x19f,0x19f,-1,214},
-! 	{0x1a0,0x1a4,2,1},
-! 	{0x1a6,0x1a6,-1,218},
-! 	{0x1a7,0x1a7,-1,1},
-! 	{0x1a9,0x1a9,-1,218},
-! 	{0x1ac,0x1ac,-1,1},
-! 	{0x1ae,0x1ae,-1,218},
-! 	{0x1af,0x1af,-1,1},
-! 	{0x1b1,0x1b2,1,217},
-! 	{0x1b3,0x1b5,2,1},
-! 	{0x1b7,0x1b7,-1,219},
-! 	{0x1b8,0x1bc,4,1},
-! 	{0x1c4,0x1c4,-1,2},
-! 	{0x1c5,0x1c5,-1,1},
-! 	{0x1c7,0x1c7,-1,2},
-! 	{0x1c8,0x1c8,-1,1},
-! 	{0x1ca,0x1ca,-1,2},
-! 	{0x1cb,0x1db,2,1},
-! 	{0x1de,0x1ee,2,1},
-! 	{0x1f1,0x1f1,-1,2},
-! 	{0x1f2,0x1f4,2,1},
-! 	{0x1f6,0x1f6,-1,-97},
-! 	{0x1f7,0x1f7,-1,-56},
-! 	{0x1f8,0x21e,2,1},
-! 	{0x220,0x220,-1,-130},
-! 	{0x222,0x232,2,1},
-! 	{0x23a,0x23a,-1,10795},
-! 	{0x23b,0x23b,-1,1},
-! 	{0x23d,0x23d,-1,-163},
-! 	{0x23e,0x23e,-1,10792},
-! 	{0x241,0x241,-1,1},
-! 	{0x243,0x243,-1,-195},
-! 	{0x244,0x244,-1,69},
-! 	{0x245,0x245,-1,71},
-! 	{0x246,0x24e,2,1},
-! 	{0x345,0x345,-1,116},
-! 	{0x370,0x372,2,1},
-! 	{0x376,0x376,-1,1},
-! 	{0x386,0x386,-1,38},
-! 	{0x388,0x38a,1,37},
-! 	{0x38c,0x38c,-1,64},
-! 	{0x38e,0x38f,1,63},
-! 	{0x391,0x3a1,1,32},
-! 	{0x3a3,0x3ab,1,32},
-! 	{0x3c2,0x3c2,-1,1},
-! 	{0x3cf,0x3cf,-1,8},
-! 	{0x3d0,0x3d0,-1,-30},
-! 	{0x3d1,0x3d1,-1,-25},
-! 	{0x3d5,0x3d5,-1,-15},
-! 	{0x3d6,0x3d6,-1,-22},
-! 	{0x3d8,0x3ee,2,1},
-! 	{0x3f0,0x3f0,-1,-54},
-! 	{0x3f1,0x3f1,-1,-48},
-! 	{0x3f4,0x3f4,-1,-60},
-! 	{0x3f5,0x3f5,-1,-64},
-! 	{0x3f7,0x3f7,-1,1},
-! 	{0x3f9,0x3f9,-1,-7},
-! 	{0x3fa,0x3fa,-1,1},
-! 	{0x3fd,0x3ff,1,-130},
-! 	{0x400,0x40f,1,80},
-! 	{0x410,0x42f,1,32},
-! 	{0x460,0x480,2,1},
-! 	{0x48a,0x4be,2,1},
-! 	{0x4c0,0x4c0,-1,15},
-! 	{0x4c1,0x4cd,2,1},
-! 	{0x4d0,0x524,2,1},
-! 	{0x531,0x556,1,48},
-! 	{0x10a0,0x10c5,1,7264},
-! 	{0x1e00,0x1e94,2,1},
-! 	{0x1e9b,0x1e9b,-1,-58},
-! 	{0x1e9e,0x1e9e,-1,-7615},
-! 	{0x1ea0,0x1efe,2,1},
-! 	{0x1f08,0x1f0f,1,-8},
-! 	{0x1f18,0x1f1d,1,-8},
-! 	{0x1f28,0x1f2f,1,-8},
-! 	{0x1f38,0x1f3f,1,-8},
-! 	{0x1f48,0x1f4d,1,-8},
-! 	{0x1f59,0x1f5f,2,-8},
-! 	{0x1f68,0x1f6f,1,-8},
-! 	{0x1f88,0x1f8f,1,-8},
-! 	{0x1f98,0x1f9f,1,-8},
-! 	{0x1fa8,0x1faf,1,-8},
-! 	{0x1fb8,0x1fb9,1,-8},
-! 	{0x1fba,0x1fbb,1,-74},
-! 	{0x1fbc,0x1fbc,-1,-9},
-! 	{0x1fbe,0x1fbe,-1,-7173},
-! 	{0x1fc8,0x1fcb,1,-86},
-! 	{0x1fcc,0x1fcc,-1,-9},
-! 	{0x1fd8,0x1fd9,1,-8},
-! 	{0x1fda,0x1fdb,1,-100},
-! 	{0x1fe8,0x1fe9,1,-8},
-! 	{0x1fea,0x1feb,1,-112},
-! 	{0x1fec,0x1fec,-1,-7},
-! 	{0x1ff8,0x1ff9,1,-128},
-! 	{0x1ffa,0x1ffb,1,-126},
-! 	{0x1ffc,0x1ffc,-1,-9},
-! 	{0x2126,0x2126,-1,-7517},
-! 	{0x212a,0x212a,-1,-8383},
-! 	{0x212b,0x212b,-1,-8262},
-! 	{0x2132,0x2132,-1,28},
-! 	{0x2160,0x216f,1,16},
-! 	{0x2183,0x2183,-1,1},
-! 	{0x24b6,0x24cf,1,26},
-! 	{0x2c00,0x2c2e,1,48},
-! 	{0x2c60,0x2c60,-1,1},
-! 	{0x2c62,0x2c62,-1,-10743},
-! 	{0x2c63,0x2c63,-1,-3814},
-! 	{0x2c64,0x2c64,-1,-10727},
-! 	{0x2c67,0x2c6b,2,1},
-! 	{0x2c6d,0x2c6d,-1,-10780},
-! 	{0x2c6e,0x2c6e,-1,-10749},
-! 	{0x2c6f,0x2c6f,-1,-10783},
-! 	{0x2c70,0x2c70,-1,-10782},
-! 	{0x2c72,0x2c75,3,1},
-! 	{0x2c7e,0x2c7f,1,-10815},
-! 	{0x2c80,0x2ce2,2,1},
-! 	{0x2ceb,0x2ced,2,1},
-! 	{0xa640,0xa65e,2,1},
-! 	{0xa662,0xa66c,2,1},
-! 	{0xa680,0xa696,2,1},
-! 	{0xa722,0xa72e,2,1},
-! 	{0xa732,0xa76e,2,1},
-! 	{0xa779,0xa77b,2,1},
-! 	{0xa77d,0xa77d,-1,-35332},
-! 	{0xa77e,0xa786,2,1},
-! 	{0xa78b,0xa78b,-1,1},
-! 	{0xff21,0xff3a,1,32},
-  	{0x10400,0x10427,1,40}
-  };
-  
-***************
-*** 2253,2337 ****
-      return utf_convert(a, foldCase, sizeof(foldCase));
-  }
-  
-- /*
--  * The following tables are built by upperLowerExtract.pl < UnicodeData.txt .
--  * They must be in numeric order, because we use binary search on them.
--  * An entry such as {0x41,0x5a,1,32} means that UCS-4 characters in the range
--  * from 0x41 to 0x5a inclusive, stepping by 1, are switched to lower (for
--  * example) by adding 32.
--  */
-  static convertStruct toLower[] =
-  {
-! 	{0x41,0x5a,1,32}, {0xc0,0xd6,1,32}, {0xd8,0xde,1,32},
-! 	{0x100,0x12e,2,1}, {0x130,0x130,-1,-199}, {0x132,0x136,2,1},
-! 	{0x139,0x147,2,1}, {0x14a,0x176,2,1}, {0x178,0x178,-1,-121},
-! 	{0x179,0x17d,2,1}, {0x181,0x181,-1,210}, {0x182,0x184,2,1},
-! 	{0x186,0x186,-1,206}, {0x187,0x187,-1,1}, {0x189,0x18a,1,205},
-! 	{0x18b,0x18b,-1,1}, {0x18e,0x18e,-1,79}, {0x18f,0x18f,-1,202},
-! 	{0x190,0x190,-1,203}, {0x191,0x191,-1,1}, {0x193,0x193,-1,205},
-! 	{0x194,0x194,-1,207}, {0x196,0x196,-1,211}, {0x197,0x197,-1,209},
-! 	{0x198,0x198,-1,1}, {0x19c,0x19c,-1,211}, {0x19d,0x19d,-1,213},
-! 	{0x19f,0x19f,-1,214}, {0x1a0,0x1a4,2,1}, {0x1a6,0x1a6,-1,218},
-! 	{0x1a7,0x1a7,-1,1}, {0x1a9,0x1a9,-1,218}, {0x1ac,0x1ac,-1,1},
-! 	{0x1ae,0x1ae,-1,218}, {0x1af,0x1af,-1,1}, {0x1b1,0x1b2,1,217},
-! 	{0x1b3,0x1b5,2,1}, {0x1b7,0x1b7,-1,219}, {0x1b8,0x1bc,4,1},
-! 	{0x1c4,0x1ca,3,2}, {0x1cd,0x1db,2,1}, {0x1de,0x1ee,2,1},
-! 	{0x1f1,0x1f1,-1,2}, {0x1f4,0x1f4,-1,1}, {0x1f6,0x1f6,-1,-97},
-! 	{0x1f7,0x1f7,-1,-56}, {0x1f8,0x21e,2,1}, {0x220,0x220,-1,-130},
-! 	{0x222,0x232,2,1}, {0x386,0x386,-1,38}, {0x388,0x38a,1,37},
-! 	{0x38c,0x38c,-1,64}, {0x38e,0x38f,1,63}, {0x391,0x3a1,1,32},
-! 	{0x3a3,0x3ab,1,32}, {0x3d8,0x3ee,2,1}, {0x3f4,0x3f4,-1,-60},
-! 	{0x3f7,0x3f7,-1,1}, {0x3f9,0x3f9,-1,-7}, {0x3fa,0x3fa,-1,1},
-! 	{0x400,0x40f,1,80}, {0x410,0x42f,1,32}, {0x460,0x480,2,1},
-! 	{0x48a,0x4be,2,1}, {0x4c1,0x4cd,2,1}, {0x4d0,0x4f4,2,1},
-! 	{0x4f8,0x500,8,1}, {0x502,0x50e,2,1}, {0x531,0x556,1,48},
-! 	{0x1e00,0x1e94,2,1}, {0x1ea0,0x1ef8,2,1}, {0x1f08,0x1f0f,1,-8},
-! 	{0x1f18,0x1f1d,1,-8}, {0x1f28,0x1f2f,1,-8}, {0x1f38,0x1f3f,1,-8},
-! 	{0x1f48,0x1f4d,1,-8}, {0x1f59,0x1f5f,2,-8}, {0x1f68,0x1f6f,1,-8},
-! 	{0x1fb8,0x1fb9,1,-8}, {0x1fba,0x1fbb,1,-74}, {0x1fc8,0x1fcb,1,-86},
-! 	{0x1fd8,0x1fd9,1,-8}, {0x1fda,0x1fdb,1,-100}, {0x1fe8,0x1fe9,1,-8},
-! 	{0x1fea,0x1feb,1,-112}, {0x1fec,0x1fec,-1,-7}, {0x1ff8,0x1ff9,1,-128},
-! 	{0x1ffa,0x1ffb,1,-126}, {0x2126,0x2126,-1,-7517}, {0x212a,0x212a,-1,-8383},
-! 	{0x212b,0x212b,-1,-8262}, {0xff21,0xff3a,1,32}, {0x10400,0x10427,1,40}
-  };
-  
-  static convertStruct toUpper[] =
-  {
-! 	{0x61,0x7a,1,-32}, {0xb5,0xb5,-1,743}, {0xe0,0xf6,1,-32},
-! 	{0xf8,0xfe,1,-32}, {0xff,0xff,-1,121}, {0x101,0x12f,2,-1},
-! 	{0x131,0x131,-1,-232}, {0x133,0x137,2,-1}, {0x13a,0x148,2,-1},
-! 	{0x14b,0x177,2,-1}, {0x17a,0x17e,2,-1}, {0x17f,0x17f,-1,-300},
-! 	{0x183,0x185,2,-1}, {0x188,0x18c,4,-1}, {0x192,0x192,-1,-1},
-! 	{0x195,0x195,-1,97}, {0x199,0x199,-1,-1}, {0x19e,0x19e,-1,130},
-! 	{0x1a1,0x1a5,2,-1}, {0x1a8,0x1ad,5,-1}, {0x1b0,0x1b4,4,-1},
-! 	{0x1b6,0x1b9,3,-1}, {0x1bd,0x1bd,-1,-1}, {0x1bf,0x1bf,-1,56},
-! 	{0x1c5,0x1c6,1,-1}, {0x1c8,0x1c9,1,-1}, {0x1cb,0x1cc,1,-1},
-! 	{0x1ce,0x1dc,2,-1}, {0x1dd,0x1dd,-1,-79}, {0x1df,0x1ef,2,-1},
-! 	{0x1f2,0x1f3,1,-1}, {0x1f5,0x1f9,4,-1}, {0x1fb,0x21f,2,-1},
-! 	{0x223,0x233,2,-1}, {0x253,0x253,-1,-210}, {0x254,0x254,-1,-206},
-! 	{0x256,0x257,1,-205}, {0x259,0x259,-1,-202}, {0x25b,0x25b,-1,-203},
-! 	{0x260,0x260,-1,-205}, {0x263,0x263,-1,-207}, {0x268,0x268,-1,-209},
-! 	{0x269,0x26f,6,-211}, {0x272,0x272,-1,-213}, {0x275,0x275,-1,-214},
-! 	{0x280,0x283,3,-218}, {0x288,0x288,-1,-218}, {0x28a,0x28b,1,-217},
-! 	{0x292,0x292,-1,-219}, {0x3ac,0x3ac,-1,-38}, {0x3ad,0x3af,1,-37},
-! 	{0x3b1,0x3c1,1,-32}, {0x3c2,0x3c2,-1,-31}, {0x3c3,0x3cb,1,-32},
-! 	{0x3cc,0x3cc,-1,-64}, {0x3cd,0x3ce,1,-63}, {0x3d0,0x3d0,-1,-62},
-! 	{0x3d1,0x3d1,-1,-57}, {0x3d5,0x3d5,-1,-47}, {0x3d6,0x3d6,-1,-54},
-! 	{0x3d9,0x3ef,2,-1}, {0x3f0,0x3f0,-1,-86}, {0x3f1,0x3f1,-1,-80},
-! 	{0x3f2,0x3f2,-1,7}, {0x3f5,0x3f5,-1,-96}, {0x3f8,0x3fb,3,-1},
-! 	{0x430,0x44f,1,-32}, {0x450,0x45f,1,-80}, {0x461,0x481,2,-1},
-! 	{0x48b,0x4bf,2,-1}, {0x4c2,0x4ce,2,-1}, {0x4d1,0x4f5,2,-1},
-! 	{0x4f9,0x501,8,-1}, {0x503,0x50f,2,-1}, {0x561,0x586,1,-48},
-! 	{0x1e01,0x1e95,2,-1}, {0x1e9b,0x1e9b,-1,-59}, {0x1ea1,0x1ef9,2,-1},
-! 	{0x1f00,0x1f07,1,8}, {0x1f10,0x1f15,1,8}, {0x1f20,0x1f27,1,8},
-! 	{0x1f30,0x1f37,1,8}, {0x1f40,0x1f45,1,8}, {0x1f51,0x1f57,2,8},
-! 	{0x1f60,0x1f67,1,8}, {0x1f70,0x1f71,1,74}, {0x1f72,0x1f75,1,86},
-! 	{0x1f76,0x1f77,1,100}, {0x1f78,0x1f79,1,128}, {0x1f7a,0x1f7b,1,112},
-! 	{0x1f7c,0x1f7d,1,126}, {0x1f80,0x1f87,1,8}, {0x1f90,0x1f97,1,8},
-! 	{0x1fa0,0x1fa7,1,8}, {0x1fb0,0x1fb1,1,8}, {0x1fb3,0x1fb3,-1,9},
-! 	{0x1fbe,0x1fbe,-1,-7205}, {0x1fc3,0x1fc3,-1,9}, {0x1fd0,0x1fd1,1,8},
-! 	{0x1fe0,0x1fe1,1,8}, {0x1fe5,0x1fe5,-1,7}, {0x1ff3,0x1ff3,-1,9},
-! 	{0xff41,0xff5a,1,-32}, {0x10428,0x1044f,1,-40}
-  };
-  
-  /*
---- 2663,2968 ----
-      return utf_convert(a, foldCase, sizeof(foldCase));
-  }
-  
-  static convertStruct toLower[] =
-  {
-! 	{0x41,0x5a,1,32},
-! 	{0xc0,0xd6,1,32},
-! 	{0xd8,0xde,1,32},
-! 	{0x100,0x12e,2,1},
-! 	{0x130,0x130,-1,-199},
-! 	{0x132,0x136,2,1},
-! 	{0x139,0x147,2,1},
-! 	{0x14a,0x176,2,1},
-! 	{0x178,0x178,-1,-121},
-! 	{0x179,0x17d,2,1},
-! 	{0x181,0x181,-1,210},
-! 	{0x182,0x184,2,1},
-! 	{0x186,0x186,-1,206},
-! 	{0x187,0x187,-1,1},
-! 	{0x189,0x18a,1,205},
-! 	{0x18b,0x18b,-1,1},
-! 	{0x18e,0x18e,-1,79},
-! 	{0x18f,0x18f,-1,202},
-! 	{0x190,0x190,-1,203},
-! 	{0x191,0x191,-1,1},
-! 	{0x193,0x193,-1,205},
-! 	{0x194,0x194,-1,207},
-! 	{0x196,0x196,-1,211},
-! 	{0x197,0x197,-1,209},
-! 	{0x198,0x198,-1,1},
-! 	{0x19c,0x19c,-1,211},
-! 	{0x19d,0x19d,-1,213},
-! 	{0x19f,0x19f,-1,214},
-! 	{0x1a0,0x1a4,2,1},
-! 	{0x1a6,0x1a6,-1,218},
-! 	{0x1a7,0x1a7,-1,1},
-! 	{0x1a9,0x1a9,-1,218},
-! 	{0x1ac,0x1ac,-1,1},
-! 	{0x1ae,0x1ae,-1,218},
-! 	{0x1af,0x1af,-1,1},
-! 	{0x1b1,0x1b2,1,217},
-! 	{0x1b3,0x1b5,2,1},
-! 	{0x1b7,0x1b7,-1,219},
-! 	{0x1b8,0x1bc,4,1},
-! 	{0x1c4,0x1c4,-1,2},
-! 	{0x1c5,0x1c5,-1,1},
-! 	{0x1c7,0x1c7,-1,2},
-! 	{0x1c8,0x1c8,-1,1},
-! 	{0x1ca,0x1ca,-1,2},
-! 	{0x1cb,0x1db,2,1},
-! 	{0x1de,0x1ee,2,1},
-! 	{0x1f1,0x1f1,-1,2},
-! 	{0x1f2,0x1f4,2,1},
-! 	{0x1f6,0x1f6,-1,-97},
-! 	{0x1f7,0x1f7,-1,-56},
-! 	{0x1f8,0x21e,2,1},
-! 	{0x220,0x220,-1,-130},
-! 	{0x222,0x232,2,1},
-! 	{0x23a,0x23a,-1,10795},
-! 	{0x23b,0x23b,-1,1},
-! 	{0x23d,0x23d,-1,-163},
-! 	{0x23e,0x23e,-1,10792},
-! 	{0x241,0x241,-1,1},
-! 	{0x243,0x243,-1,-195},
-! 	{0x244,0x244,-1,69},
-! 	{0x245,0x245,-1,71},
-! 	{0x246,0x24e,2,1},
-! 	{0x370,0x372,2,1},
-! 	{0x376,0x376,-1,1},
-! 	{0x386,0x386,-1,38},
-! 	{0x388,0x38a,1,37},
-! 	{0x38c,0x38c,-1,64},
-! 	{0x38e,0x38f,1,63},
-! 	{0x391,0x3a1,1,32},
-! 	{0x3a3,0x3ab,1,32},
-! 	{0x3cf,0x3cf,-1,8},
-! 	{0x3d8,0x3ee,2,1},
-! 	{0x3f4,0x3f4,-1,-60},
-! 	{0x3f7,0x3f7,-1,1},
-! 	{0x3f9,0x3f9,-1,-7},
-! 	{0x3fa,0x3fa,-1,1},
-! 	{0x3fd,0x3ff,1,-130},
-! 	{0x400,0x40f,1,80},
-! 	{0x410,0x42f,1,32},
-! 	{0x460,0x480,2,1},
-! 	{0x48a,0x4be,2,1},
-! 	{0x4c0,0x4c0,-1,15},
-! 	{0x4c1,0x4cd,2,1},
-! 	{0x4d0,0x524,2,1},
-! 	{0x531,0x556,1,48},
-! 	{0x10a0,0x10c5,1,7264},
-! 	{0x1e00,0x1e94,2,1},
-! 	{0x1e9e,0x1e9e,-1,-7615},
-! 	{0x1ea0,0x1efe,2,1},
-! 	{0x1f08,0x1f0f,1,-8},
-! 	{0x1f18,0x1f1d,1,-8},
-! 	{0x1f28,0x1f2f,1,-8},
-! 	{0x1f38,0x1f3f,1,-8},
-! 	{0x1f48,0x1f4d,1,-8},
-! 	{0x1f59,0x1f5f,2,-8},
-! 	{0x1f68,0x1f6f,1,-8},
-! 	{0x1f88,0x1f8f,1,-8},
-! 	{0x1f98,0x1f9f,1,-8},
-! 	{0x1fa8,0x1faf,1,-8},
-! 	{0x1fb8,0x1fb9,1,-8},
-! 	{0x1fba,0x1fbb,1,-74},
-! 	{0x1fbc,0x1fbc,-1,-9},
-! 	{0x1fc8,0x1fcb,1,-86},
-! 	{0x1fcc,0x1fcc,-1,-9},
-! 	{0x1fd8,0x1fd9,1,-8},
-! 	{0x1fda,0x1fdb,1,-100},
-! 	{0x1fe8,0x1fe9,1,-8},
-! 	{0x1fea,0x1feb,1,-112},
-! 	{0x1fec,0x1fec,-1,-7},
-! 	{0x1ff8,0x1ff9,1,-128},
-! 	{0x1ffa,0x1ffb,1,-126},
-! 	{0x1ffc,0x1ffc,-1,-9},
-! 	{0x2126,0x2126,-1,-7517},
-! 	{0x212a,0x212a,-1,-8383},
-! 	{0x212b,0x212b,-1,-8262},
-! 	{0x2132,0x2132,-1,28},
-! 	{0x2160,0x216f,1,16},
-! 	{0x2183,0x2183,-1,1},
-! 	{0x24b6,0x24cf,1,26},
-! 	{0x2c00,0x2c2e,1,48},
-! 	{0x2c60,0x2c60,-1,1},
-! 	{0x2c62,0x2c62,-1,-10743},
-! 	{0x2c63,0x2c63,-1,-3814},
-! 	{0x2c64,0x2c64,-1,-10727},
-! 	{0x2c67,0x2c6b,2,1},
-! 	{0x2c6d,0x2c6d,-1,-10780},
-! 	{0x2c6e,0x2c6e,-1,-10749},
-! 	{0x2c6f,0x2c6f,-1,-10783},
-! 	{0x2c70,0x2c70,-1,-10782},
-! 	{0x2c72,0x2c75,3,1},
-! 	{0x2c7e,0x2c7f,1,-10815},
-! 	{0x2c80,0x2ce2,2,1},
-! 	{0x2ceb,0x2ced,2,1},
-! 	{0xa640,0xa65e,2,1},
-! 	{0xa662,0xa66c,2,1},
-! 	{0xa680,0xa696,2,1},
-! 	{0xa722,0xa72e,2,1},
-! 	{0xa732,0xa76e,2,1},
-! 	{0xa779,0xa77b,2,1},
-! 	{0xa77d,0xa77d,-1,-35332},
-! 	{0xa77e,0xa786,2,1},
-! 	{0xa78b,0xa78b,-1,1},
-! 	{0xff21,0xff3a,1,32},
-! 	{0x10400,0x10427,1,40}
-  };
-  
-  static convertStruct toUpper[] =
-  {
-! 	{0x61,0x7a,1,-32},
-! 	{0xb5,0xb5,-1,743},
-! 	{0xe0,0xf6,1,-32},
-! 	{0xf8,0xfe,1,-32},
-! 	{0xff,0xff,-1,121},
-! 	{0x101,0x12f,2,-1},
-! 	{0x131,0x131,-1,-232},
-! 	{0x133,0x137,2,-1},
-! 	{0x13a,0x148,2,-1},
-! 	{0x14b,0x177,2,-1},
-! 	{0x17a,0x17e,2,-1},
-! 	{0x17f,0x17f,-1,-300},
-! 	{0x180,0x180,-1,195},
-! 	{0x183,0x185,2,-1},
-! 	{0x188,0x18c,4,-1},
-! 	{0x192,0x192,-1,-1},
-! 	{0x195,0x195,-1,97},
-! 	{0x199,0x199,-1,-1},
-! 	{0x19a,0x19a,-1,163},
-! 	{0x19e,0x19e,-1,130},
-! 	{0x1a1,0x1a5,2,-1},
-! 	{0x1a8,0x1ad,5,-1},
-! 	{0x1b0,0x1b4,4,-1},
-! 	{0x1b6,0x1b9,3,-1},
-! 	{0x1bd,0x1bd,-1,-1},
-! 	{0x1bf,0x1bf,-1,56},
-! 	{0x1c5,0x1c5,-1,-1},
-! 	{0x1c6,0x1c6,-1,-2},
-! 	{0x1c8,0x1c8,-1,-1},
-! 	{0x1c9,0x1c9,-1,-2},
-! 	{0x1cb,0x1cb,-1,-1},
-! 	{0x1cc,0x1cc,-1,-2},
-! 	{0x1ce,0x1dc,2,-1},
-! 	{0x1dd,0x1dd,-1,-79},
-! 	{0x1df,0x1ef,2,-1},
-! 	{0x1f2,0x1f2,-1,-1},
-! 	{0x1f3,0x1f3,-1,-2},
-! 	{0x1f5,0x1f9,4,-1},
-! 	{0x1fb,0x21f,2,-1},
-! 	{0x223,0x233,2,-1},
-! 	{0x23c,0x23c,-1,-1},
-! 	{0x23f,0x240,1,10815},
-! 	{0x242,0x247,5,-1},
-! 	{0x249,0x24f,2,-1},
-! 	{0x250,0x250,-1,10783},
-! 	{0x251,0x251,-1,10780},
-! 	{0x252,0x252,-1,10782},
-! 	{0x253,0x253,-1,-210},
-! 	{0x254,0x254,-1,-206},
-! 	{0x256,0x257,1,-205},
-! 	{0x259,0x259,-1,-202},
-! 	{0x25b,0x25b,-1,-203},
-! 	{0x260,0x260,-1,-205},
-! 	{0x263,0x263,-1,-207},
-! 	{0x268,0x268,-1,-209},
-! 	{0x269,0x269,-1,-211},
-! 	{0x26b,0x26b,-1,10743},
-! 	{0x26f,0x26f,-1,-211},
-! 	{0x271,0x271,-1,10749},
-! 	{0x272,0x272,-1,-213},
-! 	{0x275,0x275,-1,-214},
-! 	{0x27d,0x27d,-1,10727},
-! 	{0x280,0x283,3,-218},
-! 	{0x288,0x288,-1,-218},
-! 	{0x289,0x289,-1,-69},
-! 	{0x28a,0x28b,1,-217},
-! 	{0x28c,0x28c,-1,-71},
-! 	{0x292,0x292,-1,-219},
-! 	{0x345,0x345,-1,84},
-! 	{0x371,0x373,2,-1},
-! 	{0x377,0x377,-1,-1},
-! 	{0x37b,0x37d,1,130},
-! 	{0x3ac,0x3ac,-1,-38},
-! 	{0x3ad,0x3af,1,-37},
-! 	{0x3b1,0x3c1,1,-32},
-! 	{0x3c2,0x3c2,-1,-31},
-! 	{0x3c3,0x3cb,1,-32},
-! 	{0x3cc,0x3cc,-1,-64},
-! 	{0x3cd,0x3ce,1,-63},
-! 	{0x3d0,0x3d0,-1,-62},
-! 	{0x3d1,0x3d1,-1,-57},
-! 	{0x3d5,0x3d5,-1,-47},
-! 	{0x3d6,0x3d6,-1,-54},
-! 	{0x3d7,0x3d7,-1,-8},
-! 	{0x3d9,0x3ef,2,-1},
-! 	{0x3f0,0x3f0,-1,-86},
-! 	{0x3f1,0x3f1,-1,-80},
-! 	{0x3f2,0x3f2,-1,7},
-! 	{0x3f5,0x3f5,-1,-96},
-! 	{0x3f8,0x3fb,3,-1},
-! 	{0x430,0x44f,1,-32},
-! 	{0x450,0x45f,1,-80},
-! 	{0x461,0x481,2,-1},
-! 	{0x48b,0x4bf,2,-1},
-! 	{0x4c2,0x4ce,2,-1},
-! 	{0x4cf,0x4cf,-1,-15},
-! 	{0x4d1,0x525,2,-1},
-! 	{0x561,0x586,1,-48},
-! 	{0x1d79,0x1d79,-1,35332},
-! 	{0x1d7d,0x1d7d,-1,3814},
-! 	{0x1e01,0x1e95,2,-1},
-! 	{0x1e9b,0x1e9b,-1,-59},
-! 	{0x1ea1,0x1eff,2,-1},
-! 	{0x1f00,0x1f07,1,8},
-! 	{0x1f10,0x1f15,1,8},
-! 	{0x1f20,0x1f27,1,8},
-! 	{0x1f30,0x1f37,1,8},
-! 	{0x1f40,0x1f45,1,8},
-! 	{0x1f51,0x1f57,2,8},
-! 	{0x1f60,0x1f67,1,8},
-! 	{0x1f70,0x1f71,1,74},
-! 	{0x1f72,0x1f75,1,86},
-! 	{0x1f76,0x1f77,1,100},
-! 	{0x1f78,0x1f79,1,128},
-! 	{0x1f7a,0x1f7b,1,112},
-! 	{0x1f7c,0x1f7d,1,126},
-! 	{0x1f80,0x1f87,1,8},
-! 	{0x1f90,0x1f97,1,8},
-! 	{0x1fa0,0x1fa7,1,8},
-! 	{0x1fb0,0x1fb1,1,8},
-! 	{0x1fb3,0x1fb3,-1,9},
-! 	{0x1fbe,0x1fbe,-1,-7205},
-! 	{0x1fc3,0x1fc3,-1,9},
-! 	{0x1fd0,0x1fd1,1,8},
-! 	{0x1fe0,0x1fe1,1,8},
-! 	{0x1fe5,0x1fe5,-1,7},
-! 	{0x1ff3,0x1ff3,-1,9},
-! 	{0x214e,0x214e,-1,-28},
-! 	{0x2170,0x217f,1,-16},
-! 	{0x2184,0x2184,-1,-1},
-! 	{0x24d0,0x24e9,1,-26},
-! 	{0x2c30,0x2c5e,1,-48},
-! 	{0x2c61,0x2c61,-1,-1},
-! 	{0x2c65,0x2c65,-1,-10795},
-! 	{0x2c66,0x2c66,-1,-10792},
-! 	{0x2c68,0x2c6c,2,-1},
-! 	{0x2c73,0x2c76,3,-1},
-! 	{0x2c81,0x2ce3,2,-1},
-! 	{0x2cec,0x2cee,2,-1},
-! 	{0x2d00,0x2d25,1,-7264},
-! 	{0xa641,0xa65f,2,-1},
-! 	{0xa663,0xa66d,2,-1},
-! 	{0xa681,0xa697,2,-1},
-! 	{0xa723,0xa72f,2,-1},
-! 	{0xa733,0xa76f,2,-1},
-! 	{0xa77a,0xa77c,2,-1},
-! 	{0xa77f,0xa787,2,-1},
-! 	{0xa78c,0xa78c,-1,-1},
-! 	{0xff41,0xff5a,1,-32},
-! 	{0x10428,0x1044f,1,-40}
-  };
-  
-  /*
-*** ../vim-7.2.329/src/version.c	2010-01-12 15:42:03.000000000 +0100
---- src/version.c	2010-01-12 18:16:55.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     330,
-  /**/
-
--- 
-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.331 b/source/ap/vim/patches/7.2.331
deleted file mode 100644
index 82f40a26..00000000
--- a/source/ap/vim/patches/7.2.331
+++ /dev/null
@@ -1,47 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.331
-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.331
-Problem:    Can't interrupt "echo list" for a very long list.
-Solution:   Call line_breakcheck() in list_join().
-Files:	    src/eval.c
-
-
-*** ../vim-7.2.330/src/eval.c	2010-01-12 12:48:40.000000000 +0100
---- src/eval.c	2010-01-12 15:59:28.000000000 +0100
-***************
-*** 6475,6480 ****
---- 6475,6481 ----
-  	vim_free(tofree);
-  	if (s == NULL)
-  	    return FAIL;
-+ 	line_breakcheck();
-      }
-      return OK;
-  }
-*** ../vim-7.2.330/src/version.c	2010-01-12 19:48:57.000000000 +0100
---- src/version.c	2010-01-19 12:44:02.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     331,
-  /**/
-
-
--- 
-hundred-and-one symptoms of being an internet addict:
-116. You are living with your boyfriend who networks your respective
-     computers so you can sit in separate rooms and email each other
-
- /// 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.332 b/source/ap/vim/patches/7.2.332
deleted file mode 100644
index 7956d1ed..00000000
--- a/source/ap/vim/patches/7.2.332
+++ /dev/null
@@ -1,101 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.332
-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.332
-Problem:    Crash when spell correcting triggers an autocommand that reloads
-	    the buffer.
-Solution:   Make a copy of the line to be modified. (Dominique Pelle)
-Files:	    src/spell.c
-
-
-*** ../vim-7.2.331/src/spell.c	2009-07-22 11:03:38.000000000 +0200
---- src/spell.c	2010-01-19 12:44:42.000000000 +0100
-***************
-*** 10306,10312 ****
-      /* Figure out if the word should be capitalised. */
-      need_cap = check_need_cap(curwin->w_cursor.lnum, curwin->w_cursor.col);
-  
-!     line = ml_get_curline();
-  
-      /* Get the list of suggestions.  Limit to 'lines' - 2 or the number in
-       * 'spellsuggest', whatever is smaller. */
---- 10306,10315 ----
-      /* Figure out if the word should be capitalised. */
-      need_cap = check_need_cap(curwin->w_cursor.lnum, curwin->w_cursor.col);
-  
-!     /* Make a copy of current line since autocommands may free the line. */
-!     line = vim_strsave(ml_get_curline());
-!     if (line == NULL)
-! 	goto skip;
-  
-      /* Get the list of suggestions.  Limit to 'lines' - 2 or the number in
-       * 'spellsuggest', whatever is smaller. */
-***************
-*** 10470,10475 ****
---- 10473,10480 ----
-  	curwin->w_cursor = prev_cursor;
-  
-      spell_find_cleanup(&sug);
-+ skip:
-+     vim_free(line);
-  }
-  
-  /*
-***************
-*** 10931,10937 ****
-  	    rescore_suggestions(su);
-  
-  	/*
-! 	 * While going throught the soundfold tree "su_maxscore" is the score
-  	 * for the soundfold word, limits the changes that are being tried,
-  	 * and "su_sfmaxscore" the rescored score, which is set by
-  	 * cleanup_suggestions().
---- 10936,10942 ----
-  	    rescore_suggestions(su);
-  
-  	/*
-! 	 * While going through the soundfold tree "su_maxscore" is the score
-  	 * for the soundfold word, limits the changes that are being tried,
-  	 * and "su_sfmaxscore" the rescored score, which is set by
-  	 * cleanup_suggestions().
-***************
-*** 11415,11421 ****
-      char_u	tword[MAXWLEN];	    /* good word collected so far */
-      trystate_T	stack[MAXWLEN];
-      char_u	preword[MAXWLEN * 3]; /* word found with proper case;
-! 				       * concatanation of prefix compound
-  				       * words and split word.  NUL terminated
-  				       * when going deeper but not when coming
-  				       * back. */
---- 11420,11426 ----
-      char_u	tword[MAXWLEN];	    /* good word collected so far */
-      trystate_T	stack[MAXWLEN];
-      char_u	preword[MAXWLEN * 3]; /* word found with proper case;
-! 				       * concatenation of prefix compound
-  				       * words and split word.  NUL terminated
-  				       * when going deeper but not when coming
-  				       * back. */
-*** ../vim-7.2.331/src/version.c	2010-01-19 12:46:51.000000000 +0100
---- src/version.c	2010-01-19 13:05:32.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     332,
-  /**/
-
--- 
-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.333 b/source/ap/vim/patches/7.2.333
deleted file mode 100644
index 02273b64..00000000
--- a/source/ap/vim/patches/7.2.333
+++ /dev/null
@@ -1,371 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.333
-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.333
-Problem:    Warnings from static code analysis.
-Solution:   Small changes to various lines. (Dominique Pelle)
-Files:	    src/buffer.c, src/edit.c, src/ex_getln.c, src/fileio.c,
-	    src/if_cscope.c, src/netbeans.c, src/ops.c, src/quickfix.c,
-	    src/syntax.c, src/ui.c
-
-
-*** ../vim-7.2.332/src/buffer.c	2009-05-17 13:30:58.000000000 +0200
---- src/buffer.c	2010-01-19 12:50:24.000000000 +0100
-***************
-*** 315,321 ****
-  {
-  #ifdef FEAT_AUTOCMD
-      int		is_curbuf;
-!     int		nwindows = buf->b_nwindows;
-  #endif
-      int		unload_buf = (action != 0);
-      int		del_buf = (action == DOBUF_DEL || action == DOBUF_WIPE);
---- 315,321 ----
-  {
-  #ifdef FEAT_AUTOCMD
-      int		is_curbuf;
-!     int		nwindows;
-  #endif
-      int		unload_buf = (action != 0);
-      int		del_buf = (action == DOBUF_DEL || action == DOBUF_WIPE);
-*** ../vim-7.2.332/src/edit.c	2009-12-24 15:45:53.000000000 +0100
---- src/edit.c	2010-01-19 12:53:18.000000000 +0100
-***************
-*** 4048,4054 ****
-  	    save_p_ic = p_ic;
-  	    p_ic = ignorecase(compl_pattern);
-  
-! 	    /* Find up to TAG_MANY matches.  Avoids that an enourmous number
-  	     * of matches is found when compl_pattern is empty */
-  	    if (find_tags(compl_pattern, &num_matches, &matches,
-  		    TAG_REGEXP | TAG_NAMES | TAG_NOIC |
---- 4048,4054 ----
-  	    save_p_ic = p_ic;
-  	    p_ic = ignorecase(compl_pattern);
-  
-! 	    /* Find up to TAG_MANY matches.  Avoids that an enormous number
-  	     * of matches is found when compl_pattern is empty */
-  	    if (find_tags(compl_pattern, &num_matches, &matches,
-  		    TAG_REGEXP | TAG_NAMES | TAG_NOIC |
-***************
-*** 4219,4225 ****
-  						 || IObuff[len - 2] == '!'))))
-  					IObuff[len++] = ' ';
-  				}
-! 				/* copy as much as posible of the new word */
-  				if (tmp_ptr - ptr >= IOSIZE - len)
-  				    tmp_ptr = ptr + IOSIZE - len - 1;
-  				STRNCPY(IObuff + len, ptr, tmp_ptr - ptr);
---- 4219,4225 ----
-  						 || IObuff[len - 2] == '!'))))
-  					IObuff[len++] = ' ';
-  				}
-! 				/* copy as much as possible of the new word */
-  				if (tmp_ptr - ptr >= IOSIZE - len)
-  				    tmp_ptr = ptr + IOSIZE - len - 1;
-  				STRNCPY(IObuff + len, ptr, tmp_ptr - ptr);
-***************
-*** 5827,5836 ****
-  #endif
-  		&& !has_format_option(FO_WRAP))
-  
-- 	{
-- 	    textwidth = 0;
-  	    break;
-- 	}
-  	if ((startcol = curwin->w_cursor.col) == 0)
-  	    break;
-  
---- 5827,5833 ----
-*** ../vim-7.2.332/src/ex_getln.c	2009-12-02 17:15:04.000000000 +0100
---- src/ex_getln.c	2010-01-19 12:54:47.000000000 +0100
-***************
-*** 2193,2199 ****
-      {
-  	if (ga_grow(&line_ga, 40) == FAIL)
-  	    break;
-- 	pend = (char_u *)line_ga.ga_data + line_ga.ga_len;
-  
-  	/* Get one character at a time.  Don't use inchar(), it can't handle
-  	 * special characters. */
---- 2193,2198 ----
-***************
-*** 3314,3320 ****
-  		    WILD_HOME_REPLACE|WILD_ADD_SLASH|WILD_SILENT|WILD_ESCAPE
-  							      |options, type);
-  	    vim_free(p1);
-! 	    /* longest match: make sure it is not shorter (happens with :help */
-  	    if (p2 != NULL && type == WILD_LONGEST)
-  	    {
-  		for (j = 0; j < xp->xp_pattern_len; ++j)
---- 3313,3319 ----
-  		    WILD_HOME_REPLACE|WILD_ADD_SLASH|WILD_SILENT|WILD_ESCAPE
-  							      |options, type);
-  	    vim_free(p1);
-! 	    /* longest match: make sure it is not shorter, happens with :help */
-  	    if (p2 != NULL && type == WILD_LONGEST)
-  	    {
-  		for (j = 0; j < xp->xp_pattern_len; ++j)
-*** ../vim-7.2.332/src/fileio.c	2009-12-31 14:52:48.000000000 +0100
---- src/fileio.c	2010-01-19 12:56:59.000000000 +0100
-***************
-*** 7072,7079 ****
-  	 */
-  	for (i = 0; i < (int)(sizeof(tempdirs) / sizeof(char *)); ++i)
-  	{
-- 	    size_t	itmplen;
-  # ifndef HAVE_MKDTEMP
-  	    long	nr;
-  	    long	off;
-  # endif
---- 7072,7079 ----
-  	 */
-  	for (i = 0; i < (int)(sizeof(tempdirs) / sizeof(char *)); ++i)
-  	{
-  # ifndef HAVE_MKDTEMP
-+ 	    size_t	itmplen;
-  	    long	nr;
-  	    long	off;
-  # endif
-***************
-*** 7091,7097 ****
-  		else
-  # endif
-  		    add_pathsep(itmp);
-- 		itmplen = STRLEN(itmp);
-  
-  # ifdef HAVE_MKDTEMP
-  		/* Leave room for filename */
---- 7091,7096 ----
-***************
-*** 7104,7109 ****
---- 7103,7109 ----
-  		 * otherwise it doesn't matter.  The use of mkdir() avoids any
-  		 * security problems because of the predictable number. */
-  		nr = (mch_get_pid() + (long)time(NULL)) % 1000000L;
-+ 		itmplen = STRLEN(itmp);
-  
-  		/* Try up to 10000 different values until we find a name that
-  		 * doesn't exist. */
-*** ../vim-7.2.332/src/if_cscope.c	2009-07-09 21:22:36.000000000 +0200
---- src/if_cscope.c	2010-01-19 12:57:58.000000000 +0100
-***************
-*** 2069,2075 ****
-  	    continue;
-  	(void)strcpy(tbuf, matches[idx]);
-  
-! 	if ((fname = strtok(tbuf, (const char *)"\t")) == NULL)
-  	    continue;
-  	if ((fname = strtok(NULL, (const char *)"\t")) == NULL)
-  	    continue;
---- 2069,2075 ----
-  	    continue;
-  	(void)strcpy(tbuf, matches[idx]);
-  
-! 	if (strtok(tbuf, (const char *)"\t") == NULL)
-  	    continue;
-  	if ((fname = strtok(NULL, (const char *)"\t")) == NULL)
-  	    continue;
-*** ../vim-7.2.332/src/netbeans.c	2009-09-11 14:19:41.000000000 +0200
---- src/netbeans.c	2010-01-19 13:57:11.000000000 +0100
-***************
-*** 873,879 ****
-      {
-  #ifdef NBDEBUG
-  	/*
-! 	 * This happens because the ExtEd can send a cammand or 2 after
-  	 * doing a stopDocumentListen command. It doesn't harm anything
-  	 * so I'm disabling it except for debugging.
-  	 */
---- 883,889 ----
-      {
-  #ifdef NBDEBUG
-  	/*
-! 	 * This happens because the ExtEd can send a command or 2 after
-  	 * doing a stopDocumentListen command. It doesn't harm anything
-  	 * so I'm disabling it except for debugging.
-  	 */
-***************
-*** 1174,1180 ****
-  		break;
-  	}
-      }
-!     *q++ = '\0';
-  
-      return buf;
-  }
---- 1184,1190 ----
-  		break;
-  	}
-      }
-!     *q = '\0';
-  
-      return buf;
-  }
-***************
-*** 3070,3076 ****
-  }
-  
-  /*
-!  * Send netbeans an unmodufied command.
-   */
-      void
-  netbeans_unmodified(buf_T *bufp UNUSED)
---- 3080,3086 ----
-  }
-  
-  /*
-!  * Send netbeans an unmodified command.
-   */
-      void
-  netbeans_unmodified(buf_T *bufp UNUSED)
-***************
-*** 3366,3372 ****
-  
-  
-  /*
-!  * Add a sign of the reqested type at the requested location.
-   *
-   * Reverse engineering:
-   * Apparently an annotation is defined the first time it is used in a buffer.
---- 3380,3386 ----
-  
-  
-  /*
-!  * Add a sign of the requested type at the requested location.
-   *
-   * Reverse engineering:
-   * Apparently an annotation is defined the first time it is used in a buffer.
-*** ../vim-7.2.332/src/ops.c	2009-11-25 12:38:49.000000000 +0100
---- src/ops.c	2010-01-19 13:04:46.000000000 +0100
-***************
-*** 5591,5603 ****
-  	 */
-  	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)
-  	    {
-! 	        int intlen = len;
-  
-  		conv_str = string_convert(&vc, str, &intlen);
-  		len = intlen;
---- 5598,5610 ----
-  	 */
-  	if (has_mbyte)
-  	{
-  	    vimconv_T	vc;
-  
-  	    vc.vc_type = CONV_NONE;
-  	    if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK)
-  	    {
-! 		int	intlen = len;
-! 		char_u	*conv_str;
-  
-  		conv_str = string_convert(&vc, str, &intlen);
-  		len = intlen;
-*** ../vim-7.2.332/src/quickfix.c	2009-06-24 17:31:27.000000000 +0200
---- src/quickfix.c	2010-01-19 13:12:29.000000000 +0100
-***************
-*** 1899,1905 ****
-      int		i;
-      int		idx1 = 1;
-      int		idx2 = -1;
--     int		need_return = TRUE;
-      char_u	*arg = eap->arg;
-      int		all = eap->forceit;	/* if not :cl!, only show
-  						   recognised errors */
---- 1899,1904 ----
-***************
-*** 1939,1951 ****
-      {
-  	if ((qfp->qf_valid || all) && idx1 <= i && i <= idx2)
-  	{
-! 	    if (need_return)
-! 	    {
-! 		msg_putchar('\n');
-! 		if (got_int)
-! 		    break;
-! 		need_return = FALSE;
-! 	    }
-  
-  	    fname = NULL;
-  	    if (qfp->qf_fnum != 0
---- 1938,1946 ----
-      {
-  	if ((qfp->qf_valid || all) && idx1 <= i && i <= idx2)
-  	{
-! 	    msg_putchar('\n');
-! 	    if (got_int)
-! 		break;
-  
-  	    fname = NULL;
-  	    if (qfp->qf_fnum != 0
-***************
-*** 1988,1994 ****
-  							      IObuff, IOSIZE);
-  	    msg_prt_line(IObuff, FALSE);
-  	    out_flush();		/* show one line at a time */
-- 	    need_return = TRUE;
-  	}
-  
-  	qfp = qfp->qf_next;
---- 1983,1988 ----
-*** ../vim-7.2.332/src/syntax.c	2009-12-16 18:13:04.000000000 +0100
---- src/syntax.c	2010-01-19 13:12:56.000000000 +0100
-***************
-*** 4167,4173 ****
-  	if (!HASHITEM_EMPTY(hi))
-  	{
-  	    --todo;
-- 	    kp = HI2KE(hi);
-  	    for (kp = HI2KE(hi); kp != NULL; kp = kp_next)
-  	    {
-  		kp_next = kp->ke_next;
---- 4167,4172 ----
-*** ../vim-7.2.332/src/ui.c	2009-09-11 16:48:06.000000000 +0200
---- src/ui.c	2010-01-19 13:14:04.000000000 +0100
-***************
-*** 2383,2389 ****
-  	 * 'enc' anyway. */
-  	if (has_mbyte)
-  	{
-! 	    char_u	*conv_buf = buffer;
-  	    vimconv_T	vc;
-  
-  	    vc.vc_type = CONV_NONE;
---- 2383,2389 ----
-  	 * 'enc' anyway. */
-  	if (has_mbyte)
-  	{
-! 	    char_u	*conv_buf;
-  	    vimconv_T	vc;
-  
-  	    vc.vc_type = CONV_NONE;
-*** ../vim-7.2.332/src/version.c	2010-01-19 13:06:42.000000000 +0100
---- src/version.c	2010-01-19 14:55:50.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     333,
-  /**/
-
--- 
-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/patches/7.2.334 b/source/ap/vim/patches/7.2.334
deleted file mode 100644
index 1b88bbd6..00000000
--- a/source/ap/vim/patches/7.2.334
+++ /dev/null
@@ -1,347 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.334
-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.334
-Problem:    Postponing keys in Netbeans interface does not work properly.
-Solution:   Store the key string instead of the number.  Avoid an infinite
-	    loop. (Mostly by Xavier de Gaye)
-Files:	    src/netbeans.c, src/proto/netbeans.pro
-
-
-*** ../vim-7.2.333/src/netbeans.c	2010-01-19 14:59:14.000000000 +0100
---- src/netbeans.c	2010-01-19 15:12:17.000000000 +0100
-***************
-*** 70,76 ****
-  static pos_T *off2pos __ARGS((buf_T *, long));
-  static pos_T *get_off_or_lnum __ARGS((buf_T *buf, char_u **argp));
-  static long get_buf_size __ARGS((buf_T *));
-! static void netbeans_keystring __ARGS((int key, char *keystr));
-  static void special_keys __ARGS((char_u *args));
-  
-  static void netbeans_connect __ARGS((void));
---- 70,77 ----
-  static pos_T *off2pos __ARGS((buf_T *, long));
-  static pos_T *get_off_or_lnum __ARGS((buf_T *buf, char_u **argp));
-  static long get_buf_size __ARGS((buf_T *));
-! static int netbeans_keystring __ARGS((char_u *keystr));
-! static void postpone_keycommand __ARGS((char_u *keystr));
-  static void special_keys __ARGS((char_u *args));
-  
-  static void netbeans_connect __ARGS((void));
-***************
-*** 502,508 ****
-  
-  struct keyqueue
-  {
-!     int		     key;
-      struct keyqueue *next;
-      struct keyqueue *prev;
-  };
---- 503,509 ----
-  
-  struct keyqueue
-  {
-!     char_u	    *keystr;
-      struct keyqueue *next;
-      struct keyqueue *prev;
-  };
-***************
-*** 514,526 ****
-  
-  /*
-   * Queue up key commands sent from netbeans.
-   */
-      static void
-! postpone_keycommand(int key)
-  {
-      keyQ_T *node;
-  
-      node = (keyQ_T *)alloc(sizeof(keyQ_T));
-  
-      if (keyHead.next == NULL) /* initialize circular queue */
-      {
---- 515,531 ----
-  
-  /*
-   * Queue up key commands sent from netbeans.
-+  * We store the string, because it may depend on the global mod_mask and
-+  * :nbkey doesn't have a key number.
-   */
-      static void
-! postpone_keycommand(char_u *keystr)
-  {
-      keyQ_T *node;
-  
-      node = (keyQ_T *)alloc(sizeof(keyQ_T));
-+     if (node == NULL)
-+ 	return;  /* out of memory, drop the key */
-  
-      if (keyHead.next == NULL) /* initialize circular queue */
-      {
-***************
-*** 534,540 ****
-      keyHead.prev->next = node;
-      keyHead.prev = node;
-  
-!     node->key = key;
-  }
-  
-  /*
---- 539,545 ----
-      keyHead.prev->next = node;
-      keyHead.prev = node;
-  
-!     node->keystr = vim_strsave(keystr);
-  }
-  
-  /*
-***************
-*** 543,557 ****
-      static void
-  handle_key_queue(void)
-  {
-!     while (keyHead.next && keyHead.next != &keyHead)
-      {
-  	/* first, unlink the node */
-  	keyQ_T *node = keyHead.next;
-  	keyHead.next = node->next;
-  	node->next->prev = node->prev;
-  
-! 	/* now, send the keycommand */
-! 	netbeans_keycommand(node->key);
-  
-  	/* Finally, dispose of the node */
-  	vim_free(node);
---- 548,567 ----
-      static void
-  handle_key_queue(void)
-  {
-!     int postponed = FALSE;
-! 
-!     while (!postponed && keyHead.next && keyHead.next != &keyHead)
-      {
-  	/* first, unlink the node */
-  	keyQ_T *node = keyHead.next;
-  	keyHead.next = node->next;
-  	node->next->prev = node->prev;
-  
-! 	/* Now, send the keycommand.  This may cause it to be postponed again
-! 	 * and change keyHead. */
-! 	if (node->keystr != NULL)
-! 	    postponed = !netbeans_keystring(node->keystr);
-! 	vim_free(node->keystr);
-  
-  	/* Finally, dispose of the node */
-  	vim_free(node);
-***************
-*** 2495,2501 ****
-  	    }
-  	    else
-  	    {
-! 	        nbdebug(("    Buffer has no changes!\n"));
-  	    }
-  /* =====================================================================*/
-  	}
---- 2505,2511 ----
-  	    }
-  	    else
-  	    {
-! 		nbdebug(("    Buffer has no changes!\n"));
-  	    }
-  /* =====================================================================*/
-  	}
-***************
-*** 2658,2664 ****
-  ex_nbkey(eap)
-      exarg_T	*eap;
-  {
-!     netbeans_keystring(0, (char *)eap->arg);
-  }
-  
-  
---- 2668,2674 ----
-  ex_nbkey(eap)
-      exarg_T	*eap;
-  {
-!     (void)netbeans_keystring(eap->arg);
-  }
-  
-  
-***************
-*** 2680,2686 ****
-  }
-  
-  /*
-!  * Convert key to netbeans name.
-   */
-      static void
-  netbeans_keyname(int key, char *buf)
---- 2690,2696 ----
-  }
-  
-  /*
-!  * Convert key to netbeans name.  This uses the global "mod_mask".
-   */
-      static void
-  netbeans_keyname(int key, char *buf)
-***************
-*** 3127,3149 ****
-  /*
-   * Send a keypress event back to netbeans. This usually simulates some
-   * kind of function key press. This function operates on a key code.
-   */
-!     void
-  netbeans_keycommand(int key)
-  {
-      char	keyName[60];
-  
-      netbeans_keyname(key, keyName);
-!     netbeans_keystring(key, keyName);
-  }
-  
-  
-  /*
-   * Send a keypress event back to netbeans. This usually simulates some
-   * kind of function key press. This function operates on a key string.
-   */
-!     static void
-! netbeans_keystring(int key, char *keyName)
-  {
-      char	buf[2*MAXPATHL];
-      int		bufno = nb_getbufno(curbuf);
---- 3137,3163 ----
-  /*
-   * Send a keypress event back to netbeans. This usually simulates some
-   * kind of function key press. This function operates on a key code.
-+  * Return TRUE when the key was sent, FALSE when the command has been
-+  * postponed.
-   */
-!     int
-  netbeans_keycommand(int key)
-  {
-      char	keyName[60];
-  
-      netbeans_keyname(key, keyName);
-!     return netbeans_keystring((char_u *)keyName);
-  }
-  
-  
-  /*
-   * Send a keypress event back to netbeans. This usually simulates some
-   * kind of function key press. This function operates on a key string.
-+  * Return TRUE when the key was sent, FALSE when the command has been
-+  * postponed.
-   */
-!     static int
-! netbeans_keystring(char_u *keyName)
-  {
-      char	buf[2*MAXPATHL];
-      int		bufno = nb_getbufno(curbuf);
-***************
-*** 3151,3157 ****
-      char_u	*q;
-  
-      if (!haveConnection)
-! 	return;
-  
-  
-      if (bufno == -1)
---- 3165,3171 ----
-      char_u	*q;
-  
-      if (!haveConnection)
-! 	return TRUE;
-  
-  
-      if (bufno == -1)
-***************
-*** 3160,3166 ****
-  	q = curbuf->b_ffname == NULL ? (char_u *)""
-  						 : nb_quote(curbuf->b_ffname);
-  	if (q == NULL)
-! 	    return;
-  	vim_snprintf(buf, sizeof(buf), "0:fileOpened=%d \"%s\" %s %s\n", 0,
-  		q,
-  		"T",  /* open in NetBeans */
---- 3174,3180 ----
-  	q = curbuf->b_ffname == NULL ? (char_u *)""
-  						 : nb_quote(curbuf->b_ffname);
-  	if (q == NULL)
-! 	    return TRUE;
-  	vim_snprintf(buf, sizeof(buf), "0:fileOpened=%d \"%s\" %s %s\n", 0,
-  		q,
-  		"T",  /* open in NetBeans */
-***************
-*** 3170,3178 ****
-  	nbdebug(("EVT: %s", buf));
-  	nb_send(buf, "netbeans_keycommand");
-  
-! 	if (key > 0)
-! 	    postpone_keycommand(key);
-! 	return;
-      }
-  
-      /* sync the cursor position */
---- 3184,3191 ----
-  	nbdebug(("EVT: %s", buf));
-  	nb_send(buf, "netbeans_keycommand");
-  
-! 	postpone_keycommand(keyName);
-! 	return FALSE;
-      }
-  
-      /* sync the cursor position */
-***************
-*** 3198,3203 ****
---- 3211,3217 ----
-  		off, (long)curwin->w_cursor.lnum, (long)curwin->w_cursor.col);
-      nbdebug(("EVT: %s", buf));
-      nb_send(buf, "netbeans_keycommand");
-+     return TRUE;
-  }
-  
-  
-*** ../vim-7.2.333/src/proto/netbeans.pro	2009-01-06 16:13:42.000000000 +0100
---- src/proto/netbeans.pro	2010-01-19 13:31:01.000000000 +0100
-***************
-*** 16,22 ****
-  void netbeans_removed __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, long len));
-  void netbeans_unmodified __ARGS((buf_T *bufp));
-  void netbeans_button_release __ARGS((int button));
-! void netbeans_keycommand __ARGS((int key));
-  void netbeans_save_buffer __ARGS((buf_T *bufp));
-  void netbeans_deleted_all_lines __ARGS((buf_T *bufp));
-  int netbeans_is_guarded __ARGS((linenr_T top, linenr_T bot));
---- 16,22 ----
-  void netbeans_removed __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, long len));
-  void netbeans_unmodified __ARGS((buf_T *bufp));
-  void netbeans_button_release __ARGS((int button));
-! int netbeans_keycommand __ARGS((int key));
-  void netbeans_save_buffer __ARGS((buf_T *bufp));
-  void netbeans_deleted_all_lines __ARGS((buf_T *bufp));
-  int netbeans_is_guarded __ARGS((linenr_T top, linenr_T bot));
-*** ../vim-7.2.333/src/version.c	2010-01-19 14:59:14.000000000 +0100
---- src/version.c	2010-01-19 15:08:44.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     334,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-119. You are reading a book and look for the scroll bar to get to
-     the next 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.335 b/source/ap/vim/patches/7.2.335
deleted file mode 100644
index df7f641c..00000000
--- a/source/ap/vim/patches/7.2.335
+++ /dev/null
@@ -1,103 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.335
-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.335
-Problem:    The CTRL-] command escapes too many characters.
-Solution:   Use a different list of characters to be escaped. (Sergey Khorev)
-Files:	    src/normal.c
-
-
-*** ../vim-7.2.334/src/normal.c	2010-01-12 15:42:03.000000000 +0100
---- src/normal.c	2010-01-19 15:20:11.000000000 +0100
-***************
-*** 5406,5411 ****
---- 5406,5412 ----
-      int		n = 0;		/* init for GCC */
-      int		cmdchar;
-      int		g_cmd;		/* "g" command */
-+     int		tag_cmd = FALSE;
-      char_u	*aux_ptr;
-      int		isman;
-      int		isman_s;
-***************
-*** 5515,5520 ****
---- 5516,5522 ----
-  	    break;
-  
-  	case ']':
-+ 	    tag_cmd = TRUE;
-  #ifdef FEAT_CSCOPE
-  	    if (p_cst)
-  		STRCPY(buf, "cstag ");
-***************
-*** 5526,5535 ****
-  	default:
-  	    if (curbuf->b_help)
-  		STRCPY(buf, "he! ");
-- 	    else if (g_cmd)
-- 		STRCPY(buf, "tj ");
-  	    else
-! 		sprintf((char *)buf, "%ldta ", cap->count0);
-      }
-  
-      /*
---- 5528,5541 ----
-  	default:
-  	    if (curbuf->b_help)
-  		STRCPY(buf, "he! ");
-  	    else
-! 	    {
-! 		tag_cmd = TRUE;
-! 		if (g_cmd)
-! 		    STRCPY(buf, "tj ");
-! 		else
-! 		    sprintf((char *)buf, "%ldta ", cap->count0);
-! 	    }
-      }
-  
-      /*
-***************
-*** 5562,5569 ****
-  	    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);
---- 5568,5577 ----
-  	    aux_ptr = (char_u *)(p_magic ? "/.*~[^$\\" : "/^$\\");
-  	else if (cmdchar == '#')
-  	    aux_ptr = (char_u *)(p_magic ? "/?.*~[^$\\" : "/?^$\\");
-! 	else if (tag_cmd)
-  	    /* Don't escape spaces and Tabs in a tag with a backslash */
-+ 	    aux_ptr = (char_u *)"\\|\"\n[";
-+ 	else
-  	    aux_ptr = (char_u *)"\\|\"\n*?[";
-  
-  	p = buf + STRLEN(buf);
-*** ../vim-7.2.334/src/version.c	2010-01-19 15:12:33.000000000 +0100
---- src/version.c	2010-01-19 15:22:44.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     335,
-  /**/
-
--- 
-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.336 b/source/ap/vim/patches/7.2.336
deleted file mode 100644
index a6765922..00000000
--- a/source/ap/vim/patches/7.2.336
+++ /dev/null
@@ -1,841 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.336
-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.336
-Problem:    MzScheme interface can't evaluate an expression.
-Solution:   Add mzeval(). (Sergey Khorev)
-Files:	    runtime/doc/eval.txt, runtime/doc/if_mzsch.txt,
-	    runtime/doc/usr_41.txt, src/eval.c, src/if_mzsch.c,
-	    src/proto/eval.pro, src/proto/if_mzsch.pro,
-	    src/testdir/Make_dos.mak, src/testdir/Make_ming.mak,
-	    src/testdir/Makefile, src/testdir/main.aap, src/testdir/test1.in,
-	    src/testdir/test70.in, src/testdir/test70.ok
-
-
-*** ../vim-7.2.335/runtime/doc/eval.txt	2009-11-17 12:20:30.000000000 +0100
---- runtime/doc/eval.txt	2010-01-19 15:30:50.000000000 +0100
-***************
-*** 1815,1825 ****
-  				List	match and submatches of {pat} in {expr}
-  matchstr( {expr}, {pat}[, {start}[, {count}]])
-  				String	{count}'th match of {pat} in {expr}
-! max({list})			Number	maximum value of items in {list}
-! min({list})			Number	minimum value of items in {list}
-! mkdir({name} [, {path} [, {prot}]])
-  				Number	create directory {name}
-  mode( [expr])			String	current editing mode
-  nextnonblank( {lnum})		Number	line nr of non-blank line >= {lnum}
-  nr2char( {expr})		String	single char with ASCII value {expr}
-  pathshorten( {expr})		String	shorten directory names in a path
---- 1821,1832 ----
-  				List	match and submatches of {pat} in {expr}
-  matchstr( {expr}, {pat}[, {start}[, {count}]])
-  				String	{count}'th match of {pat} in {expr}
-! max( {list})			Number	maximum value of items in {list}
-! min( {list})			Number	minimum value of items in {list}
-! mkdir( {name} [, {path} [, {prot}]])
-  				Number	create directory {name}
-  mode( [expr])			String	current editing mode
-+ mzeval( {expr})			any	evaluate |MzScheme| expression
-  nextnonblank( {lnum})		Number	line nr of non-blank line >= {lnum}
-  nr2char( {expr})		String	single char with ASCII value {expr}
-  pathshorten( {expr})		String	shorten directory names in a path
-***************
-*** 4090,4095 ****
---- 4103,4125 ----
-  		"c" or "n".
-  		Also see |visualmode()|.
-  
-+ mzeval({expr})							*mzeval()*
-+ 		Evaluate MzScheme expression {expr} and return its result
-+ 		convert to Vim data structures.
-+ 		Numbers and strings are returned as they are.
-+ 		Pairs (including lists and improper lists) and vectors are
-+ 		returned as Vim |Lists|.
-+ 		Hash tables are represented as Vim |Dictionary| type with keys
-+ 		converted to strings.
-+ 		All other types are converted to string with display function.
-+ 		Examples: >
-+ 		    :mz (define l (list 1 2 3))
-+ 		    :mz (define h (make-hash)) (hash-set! h "list" l)
-+ 		    :echo mzeval("l")
-+ 		    :echo mzeval("h")
-+ <
-+ 		{only available when compiled with the |+mzscheme| feature}
-+ 
-  nextnonblank({lnum})					*nextnonblank()*
-  		Return the line number of the first line at or below {lnum}
-  		that is not blank.  Example: >
-*** ../vim-7.2.335/runtime/doc/if_mzsch.txt	2009-06-24 17:51:01.000000000 +0200
---- runtime/doc/if_mzsch.txt	2010-01-19 15:33:00.000000000 +0100
-***************
-*** 1,4 ****
-! *if_mzsch.txt*  For Vim version 7.2.  Last change: 2009 Jun 24
-  
-  
-  		  VIM REFERENCE MANUAL    by Sergey Khorev
---- 1,4 ----
-! *if_mzsch.txt*  For Vim version 7.2.  Last change: 2010 Jan 19
-  
-  
-  		  VIM REFERENCE MANUAL    by Sergey Khorev
-***************
-*** 9,16 ****
-  1. Commands				|mzscheme-commands|
-  2. Examples				|mzscheme-examples|
-  3. Threads				|mzscheme-threads|
-! 4. The Vim access procedures		|mzscheme-vim|
-! 5. Dynamic loading			|mzscheme-dynamic|
-  
-  {Vi does not have any of these commands}
-  
---- 9,17 ----
-  1. Commands				|mzscheme-commands|
-  2. Examples				|mzscheme-examples|
-  3. Threads				|mzscheme-threads|
-! 4. Vim access from MzScheme		|mzscheme-vim|
-! 5. mzeval() Vim function		|mzscheme-mzeval|
-! 6. Dynamic loading			|mzscheme-dynamic|
-  
-  {Vi does not have any of these commands}
-  
-***************
-*** 142,148 ****
-  GUI version.
-  
-  ==============================================================================
-! 5. VIM Functions					*mzscheme-vim*
-  
-  							*mzscheme-vimext*
-  The 'vimext' module provides access to procedures defined in the MzScheme
---- 143,149 ----
-  GUI version.
-  
-  ==============================================================================
-! 4. Vim access from MzScheme				*mzscheme-vim*
-  
-  							*mzscheme-vimext*
-  The 'vimext' module provides access to procedures defined in the MzScheme
-***************
-*** 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|.
---- 232,244 ----
-      (set-cursor (line . col) [window])  Set cursor position.
-  
-  ==============================================================================
-! 5. mzeval() Vim function				    *mzscheme-mzeval*
-! 
-! To facilitate bi-directional interface, you can use |mzeval| function to
-! evaluate MzScheme expressions and pass their values to VimL.
-! 
-! ==============================================================================
-! 6. 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.335/runtime/doc/usr_41.txt	2008-08-09 19:36:54.000000000 +0200
---- runtime/doc/usr_41.txt	2010-01-19 15:29:01.000000000 +0100
-***************
-*** 868,873 ****
---- 868,875 ----
-  	taglist()		get list of matching tags
-  	tagfiles()		get a list of tags files
-  
-+ 	mzeval()		evaluate |MzScheme| expression
-+ 
-  ==============================================================================
-  *41.7*	Defining a function
-  
-*** ../vim-7.2.335/src/eval.c	2010-01-19 12:46:51.000000000 +0100
---- src/eval.c	2010-01-19 15:48:12.000000000 +0100
-***************
-*** 433,439 ****
-  static long list_find_nr __ARGS((list_T *l, long idx, int *errorp));
-  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_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));
---- 433,438 ----
-***************
-*** 448,459 ****
-  static void set_ref_in_item __ARGS((typval_T *tv, int copyID));
-  static void dict_unref __ARGS((dict_T *d));
-  static void dict_free __ARGS((dict_T *d, int recurse));
-- static dictitem_T *dictitem_alloc __ARGS((char_u *key));
-  static dictitem_T *dictitem_copy __ARGS((dictitem_T *org));
-  static void dictitem_remove __ARGS((dict_T *dict, dictitem_T *item));
-- static void dictitem_free __ARGS((dictitem_T *item));
-  static dict_T *dict_copy __ARGS((dict_T *orig, int deep, int copyID));
-- static int dict_add __ARGS((dict_T *d, dictitem_T *item));
-  static long dict_len __ARGS((dict_T *d));
-  static dictitem_T *dict_find __ARGS((dict_T *d, char_u *key, int len));
-  static char_u *dict2string __ARGS((typval_T *tv, int copyID));
---- 447,455 ----
-***************
-*** 628,633 ****
---- 624,632 ----
-  static void f_mkdir __ARGS((typval_T *argvars, typval_T *rettv));
-  #endif
-  static void f_mode __ARGS((typval_T *argvars, typval_T *rettv));
-+ #ifdef FEAT_MZSCHEME
-+ static void f_mzeval __ARGS((typval_T *argvars, typval_T *rettv));
-+ #endif
-  static void f_nextnonblank __ARGS((typval_T *argvars, typval_T *rettv));
-  static void f_nr2char __ARGS((typval_T *argvars, typval_T *rettv));
-  static void f_pathshorten __ARGS((typval_T *argvars, typval_T *rettv));
-***************
-*** 764,770 ****
-  static int var_check_ro __ARGS((int flags, char_u *name));
-  static int var_check_fixed __ARGS((int flags, char_u *name));
-  static int tv_check_lock __ARGS((int lock, char_u *name));
-- static void copy_tv __ARGS((typval_T *from, typval_T *to));
-  static int item_copy __ARGS((typval_T *from, typval_T *to, int deep, int copyID));
-  static char_u *find_option_end __ARGS((char_u **arg, int *opt_flags));
-  static char_u *trans_function_name __ARGS((char_u **pp, int skip, int flags, funcdict_T *fd));
---- 763,768 ----
-***************
-*** 6155,6161 ****
-   * Append typval_T "tv" to the end of list "l".
-   * Return FAIL when out of memory.
-   */
-!     static int
-  list_append_tv(l, tv)
-      list_T	*l;
-      typval_T	*tv;
---- 6153,6159 ----
-   * Append typval_T "tv" to the end of list "l".
-   * Return FAIL when out of memory.
-   */
-!     int
-  list_append_tv(l, tv)
-      list_T	*l;
-      typval_T	*tv;
-***************
-*** 6812,6818 ****
-   * Note that the value of the item "di_tv" still needs to be initialized!
-   * Returns NULL when out of memory.
-   */
-!     static dictitem_T *
-  dictitem_alloc(key)
-      char_u	*key;
-  {
---- 6810,6816 ----
-   * Note that the value of the item "di_tv" still needs to be initialized!
-   * Returns NULL when out of memory.
-   */
-!     dictitem_T *
-  dictitem_alloc(key)
-      char_u	*key;
-  {
-***************
-*** 6868,6874 ****
-  /*
-   * Free a dict item.  Also clears the value.
-   */
-!     static void
-  dictitem_free(item)
-      dictitem_T *item;
-  {
---- 6866,6872 ----
-  /*
-   * Free a dict item.  Also clears the value.
-   */
-!     void
-  dictitem_free(item)
-      dictitem_T *item;
-  {
-***************
-*** 6948,6954 ****
-   * Add item "item" to Dictionary "d".
-   * Returns FAIL when out of memory and when key already existed.
-   */
-!     static int
-  dict_add(d, item)
-      dict_T	*d;
-      dictitem_T	*item;
---- 6946,6952 ----
-   * Add item "item" to Dictionary "d".
-   * Returns FAIL when out of memory and when key already existed.
-   */
-!     int
-  dict_add(d, item)
-      dict_T	*d;
-      dictitem_T	*item;
-***************
-*** 7699,7704 ****
---- 7697,7705 ----
-      {"mkdir",		1, 3, f_mkdir},
-  #endif
-      {"mode",		0, 1, f_mode},
-+ #ifdef FEAT_MZSCHEME
-+     {"mzeval",		1, 1, f_mzeval},
-+ #endif
-      {"nextnonblank",	1, 1, f_nextnonblank},
-      {"nr2char",		1, 1, f_nr2char},
-      {"pathshorten",	1, 1, f_pathshorten},
-***************
-*** 13591,13596 ****
---- 13592,13614 ----
-      rettv->v_type = VAR_STRING;
-  }
-  
-+ #ifdef FEAT_MZSCHEME
-+ /*
-+  * "mzeval()" function
-+  */
-+     static void
-+ f_mzeval(argvars, rettv)
-+     typval_T	*argvars;
-+     typval_T	*rettv;
-+ {
-+     char_u	*str;
-+     char_u	buf[NUMBUFLEN];
-+ 
-+     str = get_tv_string_buf(&argvars[0], buf);
-+     do_mzeval(str, rettv);
-+ }
-+ #endif
-+ 
-  /*
-   * "nextnonblank()" function
-   */
-***************
-*** 19274,19280 ****
-   * 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)
-      typval_T *from;
-      typval_T *to;
---- 19292,19298 ----
-   * It is OK for "from" and "to" to point to the same item.  This is used to
-   * make a copy later.
-   */
-!     void
-  copy_tv(from, to)
-      typval_T *from;
-      typval_T *to;
-*** ../vim-7.2.335/src/if_mzsch.c	2009-12-16 19:02:05.000000000 +0100
---- src/if_mzsch.c	2010-01-19 15:43:05.000000000 +0100
-***************
-*** 170,175 ****
---- 170,177 ----
-  #ifdef FEAT_EVAL
-  static Scheme_Object *vim_to_mzscheme(typval_T *vim_value, int depth,
-  	Scheme_Hash_Table *visited);
-+ static int mzscheme_to_vim(Scheme_Object *obj, typval_T *tv, int depth,
-+ 	Scheme_Hash_Table *visited);
-  #endif
-  
-  #ifdef MZ_PRECISE_GC
-***************
-*** 2733,2738 ****
---- 2735,2959 ----
-      MZ_GC_UNREG();
-      return result;
-  }
-+ 
-+     static int
-+ mzscheme_to_vim(Scheme_Object *obj, typval_T *tv, int depth,
-+ 	Scheme_Hash_Table *visited)
-+ {
-+     int		status = OK;
-+     typval_T	*found;
-+     MZ_GC_CHECK();
-+     if (depth > 100) /* limit the deepest recursion level */
-+     {
-+ 	tv->v_type = VAR_NUMBER;
-+ 	tv->vval.v_number = 0;
-+ 	return FAIL;
-+     }
-+ 
-+     found = (typval_T *)scheme_hash_get(visited, obj);
-+     if (found != NULL)
-+ 	copy_tv(found, tv);
-+     else if (SCHEME_VOIDP(obj))
-+     {
-+ 	tv->v_type = VAR_NUMBER;
-+ 	tv->vval.v_number = 0;
-+     }
-+     else if (SCHEME_INTP(obj))
-+     {
-+ 	tv->v_type = VAR_NUMBER;
-+ 	tv->vval.v_number = SCHEME_INT_VAL(obj);
-+     }
-+     else if (SCHEME_BOOLP(obj))
-+     {
-+ 	tv->v_type = VAR_NUMBER;
-+ 	tv->vval.v_number = SCHEME_TRUEP(obj);
-+     }
-+ # ifdef FEAT_FLOAT
-+     else if (SCHEME_DBLP(obj))
-+     {
-+ 	tv->v_type = VAR_FLOAT;
-+ 	tv->vval.v_float = SCHEME_DBL_VAL(obj);
-+     }
-+ # endif
-+     else if (SCHEME_STRINGP(obj))
-+     {
-+ 	tv->v_type = VAR_STRING;
-+ 	tv->vval.v_string = vim_strsave((char_u *)SCHEME_STR_VAL(obj));
-+     }
-+     else if (SCHEME_VECTORP(obj) || SCHEME_NULLP(obj)
-+ 	    || SCHEME_PAIRP(obj) || SCHEME_MUTABLE_PAIRP(obj))
-+     {
-+ 	list_T  *list = list_alloc();
-+ 	if (list == NULL)
-+ 	    status = FAIL;
-+ 	else
-+ 	{
-+ 	    int		    i;
-+ 	    Scheme_Object   *curr = NULL;
-+ 	    Scheme_Object   *cval = NULL;
-+ 	    /* temporary var to hold current element of vectors and pairs */
-+ 	    typval_T	    *v;
-+ 
-+ 	    MZ_GC_DECL_REG(2);
-+ 	    MZ_GC_VAR_IN_REG(0, curr);
-+ 	    MZ_GC_VAR_IN_REG(1, cval);
-+ 	    MZ_GC_REG();
-+ 
-+ 	    tv->v_type = VAR_LIST;
-+ 	    tv->vval.v_list = list;
-+ 	    ++list->lv_refcount;
-+ 
-+ 	    v = (typval_T *)alloc(sizeof(typval_T));
-+ 	    if (v == NULL)
-+ 		status = FAIL;
-+ 	    else
-+ 	    {
-+ 		/* add the value in advance to allow handling of self-referencial
-+ 		 * data structures */
-+ 		typval_T    *visited_tv = (typval_T *)alloc(sizeof(typval_T));
-+ 		copy_tv(tv, visited_tv);
-+ 		scheme_hash_set(visited, obj, (Scheme_Object *)visited_tv);
-+ 
-+ 		if (SCHEME_VECTORP(obj))
-+ 		{
-+ 		    for (i = 0; i < SCHEME_VEC_SIZE(obj); ++i)
-+ 		    {
-+ 			cval = SCHEME_VEC_ELS(obj)[i];
-+ 			status = mzscheme_to_vim(cval, v, depth + 1, visited);
-+ 			if (status == FAIL)
-+ 			    break;
-+ 			status = list_append_tv(list, v);
-+ 			clear_tv(v);
-+ 			if (status == FAIL)
-+ 			    break;
-+ 		    }
-+ 		}
-+ 		else if (SCHEME_PAIRP(obj) || SCHEME_MUTABLE_PAIRP(obj))
-+ 		{
-+ 		    for (curr = obj;
-+ 			    SCHEME_PAIRP(curr) || SCHEME_MUTABLE_PAIRP(curr);
-+ 			    curr = SCHEME_CDR(curr))
-+ 		    {
-+ 			cval = SCHEME_CAR(curr);
-+ 			status = mzscheme_to_vim(cval, v, depth + 1, visited);
-+ 			if (status == FAIL)
-+ 			    break;
-+ 			status = list_append_tv(list, v);
-+ 			clear_tv(v);
-+ 			if (status == FAIL)
-+ 			    break;
-+ 		    }
-+ 		    /* impoper list not terminated with null
-+ 		     * need to handle the last element */
-+ 		    if (status == OK && !SCHEME_NULLP(curr))
-+ 		    {
-+ 			status = mzscheme_to_vim(cval, v, depth + 1, visited);
-+ 			if (status == OK)
-+ 			{
-+ 			    status = list_append_tv(list, v);
-+ 			    clear_tv(v);
-+ 			}
-+ 		    }
-+ 		}
-+ 		/* nothing to do for scheme_null */
-+ 		vim_free(v);
-+ 	    }
-+ 	    MZ_GC_UNREG();
-+ 	}
-+     }
-+     else if (SCHEME_HASHTP(obj))
-+     {
-+ 	int		i;
-+ 	dict_T		*dict;
-+ 	Scheme_Object   *key = NULL;
-+ 	Scheme_Object   *val = NULL;
-+ 
-+ 	MZ_GC_DECL_REG(2);
-+ 	MZ_GC_VAR_IN_REG(0, key);
-+ 	MZ_GC_VAR_IN_REG(1, val);
-+ 	MZ_GC_REG();
-+ 
-+ 	dict = dict_alloc();
-+ 	if (dict == NULL)
-+ 	    status = FAIL;
-+ 	else
-+ 	{
-+ 	    typval_T    *visited_tv = (typval_T *)alloc(sizeof(typval_T));
-+ 
-+ 	    tv->v_type = VAR_DICT;
-+ 	    tv->vval.v_dict = dict;
-+ 	    ++dict->dv_refcount;
-+ 
-+ 	    copy_tv(tv, visited_tv);
-+ 	    scheme_hash_set(visited, obj, (Scheme_Object *)visited_tv);
-+ 
-+ 	    for (i = 0; i < ((Scheme_Hash_Table *)obj)->size; ++i)
-+ 	    {
-+ 		if (((Scheme_Hash_Table *) obj)->vals[i] != NULL)
-+ 		{
-+ 		    /* generate item for `diplay'ed Scheme key */
-+ 		    dictitem_T  *item = dictitem_alloc((char_u *)string_to_line(
-+ 				((Scheme_Hash_Table *) obj)->keys[i]));
-+ 		    /* convert Scheme val to Vim and add it to the dict */
-+ 		    if (mzscheme_to_vim(((Scheme_Hash_Table *) obj)->vals[i],
-+ 				    &item->di_tv, depth + 1, visited) == FAIL
-+ 			    || dict_add(dict, item) == FAIL)
-+ 		    {
-+ 			dictitem_free(item);
-+ 			status = FAIL;
-+ 			break;
-+ 		    }
-+ 		}
-+ 
-+ 	    }
-+ 	}
-+ 	MZ_GC_UNREG();
-+     }
-+     else
-+     {
-+ 	/* `display' any other value to string */
-+ 	tv->v_type = VAR_STRING;
-+ 	tv->vval.v_string = (char_u *)string_to_line(obj);
-+     }
-+     return status;
-+ }
-+ 
-+     void
-+ do_mzeval(char_u *str, typval_T *rettv)
-+ {
-+     int i;
-+     Scheme_Object	*ret = NULL;
-+     Scheme_Hash_Table	*visited = NULL;
-+ 
-+     MZ_GC_DECL_REG(2);
-+     MZ_GC_VAR_IN_REG(0, ret);
-+     MZ_GC_VAR_IN_REG(0, visited);
-+     MZ_GC_REG();
-+ 
-+     if (mzscheme_init())
-+     {
-+ 	MZ_GC_UNREG();
-+ 	return;
-+     }
-+ 
-+     MZ_GC_CHECK();
-+     visited = scheme_make_hash_table(SCHEME_hash_ptr);
-+     MZ_GC_CHECK();
-+ 
-+     if (eval_with_exn_handling(str, do_eval, &ret) == OK)
-+ 	mzscheme_to_vim(ret, rettv, 1, visited);
-+ 
-+     for (i = 0; i < visited->size; ++i)
-+     {
-+ 	/* free up remembered objects */
-+ 	if (visited->vals[i] != NULL)
-+ 	{
-+ 	    free_tv((typval_T *)visited->vals[i]);
-+ 	}
-+     }
-+ 
-+     MZ_GC_UNREG();
-+ }
-  #endif
-  
-  /*
-*** ../vim-7.2.335/src/proto/eval.pro	2009-09-30 15:15:33.000000000 +0200
---- src/proto/eval.pro	2010-01-19 15:45:39.000000000 +0100
-***************
-*** 47,56 ****
---- 47,60 ----
-  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_tv __ARGS((list_T *l, typval_T *tv));
-  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));
-+ dictitem_T *dictitem_alloc __ARGS((char_u *key));
-+ void dictitem_free __ARGS((dictitem_T *item));
-+ int dict_add __ARGS((dict_T *d, dictitem_T *item));
-  int dict_add_nr_str __ARGS((dict_T *d, char *key, long nr, char_u *str));
-  char_u *get_dict_string __ARGS((dict_T *d, char_u *key, int save));
-  long get_dict_number __ARGS((dict_T *d, char_u *key));
-***************
-*** 77,82 ****
---- 81,87 ----
-  void new_script_vars __ARGS((scid_T id));
-  void init_var_dict __ARGS((dict_T *dict, dictitem_T *dict_var));
-  void vars_clear __ARGS((hashtab_T *ht));
-+ void copy_tv __ARGS((typval_T *from, typval_T *to));
-  void ex_echo __ARGS((exarg_T *eap));
-  void ex_echohl __ARGS((exarg_T *eap));
-  void ex_execute __ARGS((exarg_T *eap));
-*** ../vim-7.2.335/src/proto/if_mzsch.pro	2009-12-16 19:02:05.000000000 +0100
---- src/proto/if_mzsch.pro	2010-01-19 15:29:01.000000000 +0100
-***************
-*** 15,18 ****
---- 15,19 ----
-  void *mzvim_eval_string __ARGS((char_u *str));
-  int mzthreads_allowed __ARGS((void));
-  void mzscheme_main __ARGS((void));
-+ void do_mzeval __ARGS((char_u *str, typval_T *rettv));
-  /* vim: set ft=c : */
-*** ../vim-7.2.335/src/testdir/Make_dos.mak	2009-11-17 17:57:10.000000000 +0100
---- src/testdir/Make_dos.mak	2010-01-19 15:43:48.000000000 +0100
-***************
-*** 29,35 ****
-  		test42.out test52.out test65.out test66.out test67.out \
-  		test68.out test69.out
-  
-! SCRIPTS32 =	test50.out
-  
-  SCRIPTS_GUI = test16.out
-  
---- 29,35 ----
-  		test42.out test52.out test65.out test66.out test67.out \
-  		test68.out test69.out
-  
-! SCRIPTS32 =	test50.out test70.out
-  
-  SCRIPTS_GUI = test16.out
-  
-*** ../vim-7.2.335/src/testdir/Make_ming.mak	2009-11-17 17:57:10.000000000 +0100
---- src/testdir/Make_ming.mak	2010-01-19 15:29:01.000000000 +0100
-***************
-*** 48,54 ****
-  		test42.out test52.out test65.out test66.out test67.out \
-  		test68.out test69.out
-  
-! SCRIPTS32 =	test50.out
-  
-  SCRIPTS_GUI = test16.out
-  
---- 48,54 ----
-  		test42.out test52.out test65.out test66.out test67.out \
-  		test68.out test69.out
-  
-! SCRIPTS32 =	test50.out test70.out
-  
-  SCRIPTS_GUI = test16.out
-  
-***************
-*** 78,83 ****
---- 78,84 ----
-  	-$(DEL) small.vim
-  	-$(DEL) tiny.vim
-  	-$(DEL) mbyte.vim
-+ 	-$(DEL) mzscheme.vim
-  	-$(DEL) X*
-  	-$(DEL) viminfo
-  
-*** ../vim-7.2.335/src/testdir/Makefile	2009-11-17 17:40:34.000000000 +0100
---- src/testdir/Makefile	2010-01-19 15:29:01.000000000 +0100
-***************
-*** 23,29 ****
-  		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 test67.out test68.out \
-! 		test69.out
-  
-  SCRIPTS_GUI = test16.out
-  
---- 23,29 ----
-  		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 test67.out test68.out \
-! 		test69.out test70.out
-  
-  SCRIPTS_GUI = test16.out
-  
-***************
-*** 44,53 ****
-  $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
-  
-  clean:
-! 	-rm -rf *.out *.failed *.rej *.orig test.log tiny.vim small.vim mbyte.vim test.ok X* valgrind.pid* viminfo
-  
-  test1.out: test1.in
-! 	-rm -f $*.failed tiny.vim small.vim mbyte.vim test.ok X* viminfo
-  	$(VALGRIND) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in $*.in
-  	@/bin/sh -c "if diff test.out $*.ok; \
-  		then mv -f test.out $*.out; \
---- 44,53 ----
-  $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
-  
-  clean:
-! 	-rm -rf *.out *.failed *.rej *.orig test.log tiny.vim small.vim mbyte.vim mzscheme.vim test.ok X* valgrind.pid* viminfo
-  
-  test1.out: test1.in
-! 	-rm -f $*.failed tiny.vim small.vim mbyte.vim mzscheme.vim test.ok X* viminfo
-  	$(VALGRIND) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in $*.in
-  	@/bin/sh -c "if diff test.out $*.ok; \
-  		then mv -f test.out $*.out; \
-*** ../vim-7.2.335/src/testdir/main.aap	2004-06-13 21:05:31.000000000 +0200
---- src/testdir/main.aap	2010-01-19 15:29:01.000000000 +0100
-***************
-*** 32,42 ****
-  $Scripts $ScriptsGUI: $VimProg
-  
-  clean:
-! 	:del {r}{force} *.out test.log tiny.vim small.vim mbyte.vim test.ok X*
-  
-  # test1 is special, it checks for features
-  test1.out: test1.in
-! 	:del {force} test1.failed tiny.vim small.vim mbyte.vim
-  	:sys {i} $VimProg -u unix.vim -U NONE --noplugin -s dotest.in test1.in
-  	@if os.system("diff test.out test1.ok") != 0:
-  		:error test1 FAILED - Something basic is wrong
---- 32,42 ----
-  $Scripts $ScriptsGUI: $VimProg
-  
-  clean:
-! 	:del {r}{force} *.out test.log tiny.vim small.vim mbyte.vim mzscheme.vim test.ok X*
-  
-  # test1 is special, it checks for features
-  test1.out: test1.in
-! 	:del {force} test1.failed tiny.vim small.vim mbyte.vim mzscheme.vim
-  	:sys {i} $VimProg -u unix.vim -U NONE --noplugin -s dotest.in test1.in
-  	@if os.system("diff test.out test1.ok") != 0:
-  		:error test1 FAILED - Something basic is wrong
-*** ../vim-7.2.335/src/testdir/test1.in	2004-06-13 20:19:23.000000000 +0200
---- src/testdir/test1.in	2010-01-19 15:38:44.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  
-  If Vim was not compiled with the +multi_byte feature, the mbyte.vim script will be set like small.vim above.  mbyte.vim is sourced by tests that require the
-  +multi_byte feature.
-+ Similar logic is applied to the +mzscheme feature, using mzscheme.vim.
-  
-  STARTTEST
-  :" Write a single line to test.out to check if testing works at all.
-***************
-*** 25,32 ****
---- 26,36 ----
-  w! test.out
-  qa!
-  :w! mbyte.vim
-+ :w! mzscheme.vim
-  :" If +multi_byte feature supported, make mbyte.vim empty.
-  :if has("multi_byte") | sp another | w! mbyte.vim | q | endif
-+ :" If +mzscheme feature supported, make mzscheme.vim empty.
-+ :if has("mzscheme") | sp another | w! mzscheme.vim | q | endif
-  :" If +eval feature supported quit here, leaving tiny.vim and small.vim empty.
-  :" Otherwise write small.vim to skip the test.
-  :if 1 | q! | endif
-*** ../vim-7.2.335/src/testdir/test70.in	2010-01-19 15:47:24.000000000 +0100
---- src/testdir/test70.in	2010-01-19 15:29:01.000000000 +0100
-***************
-*** 0 ****
---- 1,53 ----
-+ Smoke test for MzScheme interface and mzeval() function
-+ 
-+ STARTTEST
-+ :so mzscheme.vim
-+ :set nocompatible viminfo+=nviminfo
-+ :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))
-+ :mz (require r5rs)
-+ :endif
-+ :endfunction
-+ :silent call MzRequire()
-+ :mz (define l '("item0" "dictionary with list OK" "item2"))
-+ :mz (define h (make-hash))
-+ :mz (hash-set! h "list" l)
-+ /^1
-+ :" change buffer contents
-+ :mz (vim-set-buff-line (vim-eval "line('.')") "1 changed line 1")
-+ :" scalar test
-+ :let tmp_string = mzeval('"string"')
-+ :let tmp_1000 = mzeval('1000')
-+ :if tmp_string . tmp_1000 == "string1000"
-+ :let scalar_res = "OK"
-+ :else
-+ :let scalar_res = "FAILED"
-+ :endif
-+ :call append(search("^1"), "scalar test " . scalar_res)
-+ :" dictionary containing a list
-+ :let tmp = mzeval("h")["list"][1]
-+ :/^2/put =tmp
-+ :" circular list (at the same time test lists containing lists)
-+ :mz (set-car! (cddr l) l)
-+ :let l2 = mzeval("h")["list"]
-+ :if l2[2] == l2
-+ :let res = "OK"
-+ :else
-+ :let res = "FAILED"
-+ :endif
-+ :call setline(search("^3"), "circular test " . res)
-+ :?^1?,$w! test.out
-+ :qa!
-+ ENDTEST
-+ 
-+ 1 line 1
-+ 2 line 2
-+ 3 line 3
-*** ../vim-7.2.335/src/testdir/test70.ok	2010-01-19 15:47:24.000000000 +0100
---- src/testdir/test70.ok	2010-01-19 15:29:01.000000000 +0100
-***************
-*** 0 ****
---- 1,5 ----
-+ 1 changed line 1
-+ scalar test OK
-+ 2 line 2
-+ dictionary with list OK
-+ circular test OK
-*** ../vim-7.2.335/src/version.c	2010-01-19 15:23:38.000000000 +0100
---- src/version.c	2010-01-19 15:46:44.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     336,
-  /**/
-
--- 
-"Computers in the future may weigh no more than 1.5 tons."
-                                   Popular Mechanics, 1949
-
- /// 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.337 b/source/ap/vim/patches/7.2.337
deleted file mode 100644
index e7452854..00000000
--- a/source/ap/vim/patches/7.2.337
+++ /dev/null
@@ -1,112 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.337
-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.337
-Problem:    The :compiler command doesn't function properly when invoked in a
-	    function.
-Solution:   Add "g:" before "current_compiler". (Yukihiro Nakadaira)
-Files:	    src/ex_cmds2.c
-
-
-*** ../vim-7.2.336/src/ex_cmds2.c	2009-05-16 21:16:12.000000000 +0200
---- src/ex_cmds2.c	2010-01-19 16:02:53.000000000 +0100
-***************
-*** 2496,2509 ****
-  		 * To remain backwards compatible "current_compiler" is always
-  		 * used.  A user's compiler plugin may set it, the distributed
-  		 * plugin will then skip the settings.  Afterwards set
-! 		 * "b:current_compiler" and restore "current_compiler". */
-! 		old_cur_comp = get_var_value((char_u *)"current_compiler");
-  		if (old_cur_comp != NULL)
-  		    old_cur_comp = vim_strsave(old_cur_comp);
-  		do_cmdline_cmd((char_u *)
-  			      "command -nargs=* CompilerSet setlocal <args>");
-  	    }
-! 	    do_unlet((char_u *)"current_compiler", TRUE);
-  	    do_unlet((char_u *)"b:current_compiler", TRUE);
-  
-  	    sprintf((char *)buf, "compiler/%s.vim", eap->arg);
---- 2496,2510 ----
-  		 * To remain backwards compatible "current_compiler" is always
-  		 * used.  A user's compiler plugin may set it, the distributed
-  		 * plugin will then skip the settings.  Afterwards set
-! 		 * "b:current_compiler" and restore "current_compiler".
-! 		 * Explicitly prepend "g:" to make it work in a function. */
-! 		old_cur_comp = get_var_value((char_u *)"g:current_compiler");
-  		if (old_cur_comp != NULL)
-  		    old_cur_comp = vim_strsave(old_cur_comp);
-  		do_cmdline_cmd((char_u *)
-  			      "command -nargs=* CompilerSet setlocal <args>");
-  	    }
-! 	    do_unlet((char_u *)"g:current_compiler", TRUE);
-  	    do_unlet((char_u *)"b:current_compiler", TRUE);
-  
-  	    sprintf((char *)buf, "compiler/%s.vim", eap->arg);
-***************
-*** 2514,2520 ****
-  	    do_cmdline_cmd((char_u *)":delcommand CompilerSet");
-  
-  	    /* Set "b:current_compiler" from "current_compiler". */
-! 	    p = get_var_value((char_u *)"current_compiler");
-  	    if (p != NULL)
-  		set_internal_string_var((char_u *)"b:current_compiler", p);
-  
---- 2515,2521 ----
-  	    do_cmdline_cmd((char_u *)":delcommand CompilerSet");
-  
-  	    /* Set "b:current_compiler" from "current_compiler". */
-! 	    p = get_var_value((char_u *)"g:current_compiler");
-  	    if (p != NULL)
-  		set_internal_string_var((char_u *)"b:current_compiler", p);
-  
-***************
-*** 2523,2534 ****
-  	    {
-  		if (old_cur_comp != NULL)
-  		{
-! 		    set_internal_string_var((char_u *)"current_compiler",
-  								old_cur_comp);
-  		    vim_free(old_cur_comp);
-  		}
-  		else
-! 		    do_unlet((char_u *)"current_compiler", TRUE);
-  	    }
-  	}
-      }
---- 2524,2535 ----
-  	    {
-  		if (old_cur_comp != NULL)
-  		{
-! 		    set_internal_string_var((char_u *)"g:current_compiler",
-  								old_cur_comp);
-  		    vim_free(old_cur_comp);
-  		}
-  		else
-! 		    do_unlet((char_u *)"g:current_compiler", TRUE);
-  	    }
-  	}
-      }
-*** ../vim-7.2.336/src/version.c	2010-01-19 15:51:29.000000000 +0100
---- src/version.c	2010-01-19 16:11:20.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     337,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-121. You ask for e-mail adresses instead of telephone numbers.
-
- /// 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.338 b/source/ap/vim/patches/7.2.338
deleted file mode 100644
index ac0223f2..00000000
--- a/source/ap/vim/patches/7.2.338
+++ /dev/null
@@ -1,129 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.338
-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.338 (after 7.2.300)
-Problem:    Part of FD_CLOEXEC change is missing.
-Solution:   Include source file skipped because of typo.
-Files:	    src/ex_cmds2.c
-
-
-*** ../vim-7.2.337/src/ex_cmds2.c	2010-01-19 16:12:53.000000000 +0100
---- src/ex_cmds2.c	2010-01-19 16:02:53.000000000 +0100
-***************
-*** 2802,2821 ****
-  
-  static char_u *get_one_sourceline __ARGS((struct source_cookie *sp));
-  
-! #if defined(WIN32) && defined(FEAT_CSCOPE)
-  static FILE *fopen_noinh_readbin __ARGS((char *filename));
-  
-  /*
-   * Special function to open a file without handle inheritance.
-   */
-      static FILE *
-  fopen_noinh_readbin(filename)
-      char    *filename;
-  {
-!     int	fd_tmp = mch_open(filename, O_RDONLY | O_BINARY | O_NOINHERIT, 0);
-  
-      if (fd_tmp == -1)
-  	return NULL;
-      return fdopen(fd_tmp, READBIN);
-  }
-  #endif
---- 2802,2836 ----
-  
-  static char_u *get_one_sourceline __ARGS((struct source_cookie *sp));
-  
-! #if (defined(WIN32) && defined(FEAT_CSCOPE)) || defined(HAVE_FD_CLOEXEC)
-! # define USE_FOPEN_NOINH
-  static FILE *fopen_noinh_readbin __ARGS((char *filename));
-  
-  /*
-   * Special function to open a file without handle inheritance.
-+  * When possible the handle is closed on exec().
-   */
-      static FILE *
-  fopen_noinh_readbin(filename)
-      char    *filename;
-  {
-!     int	fd_tmp = mch_open(filename, O_RDONLY
-! # ifdef WIN32
-! 			  O_BINARY | O_NOINHERIT
-! # endif
-! 			  , 0);
-  
-      if (fd_tmp == -1)
-  	return NULL;
-+ 
-+ # ifdef HAVE_FD_CLOEXEC
-+     {
-+ 	int fdflags = fcntl(fd_tmp, F_GETFD);
-+ 	if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0)
-+ 	    fcntl(fd_tmp, F_SETFD, fdflags | FD_CLOEXEC);
-+     }
-+ # endif
-+ 
-      return fdopen(fd_tmp, READBIN);
-  }
-  #endif
-***************
-*** 2895,2901 ****
-      apply_autocmds(EVENT_SOURCEPRE, fname_exp, fname_exp, FALSE, curbuf);
-  #endif
-  
-! #if defined(WIN32) && defined(FEAT_CSCOPE)
-      cookie.fp = fopen_noinh_readbin((char *)fname_exp);
-  #else
-      cookie.fp = mch_fopen((char *)fname_exp, READBIN);
---- 2910,2916 ----
-      apply_autocmds(EVENT_SOURCEPRE, fname_exp, fname_exp, FALSE, curbuf);
-  #endif
-  
-! #ifdef USE_FOPEN_NOINH
-      cookie.fp = fopen_noinh_readbin((char *)fname_exp);
-  #else
-      cookie.fp = mch_fopen((char *)fname_exp, READBIN);
-***************
-*** 2916,2922 ****
-  		*p = '.';
-  	    else
-  		*p = '_';
-! #if defined(WIN32) && defined(FEAT_CSCOPE)
-  	    cookie.fp = fopen_noinh_readbin((char *)fname_exp);
-  #else
-  	    cookie.fp = mch_fopen((char *)fname_exp, READBIN);
---- 2931,2937 ----
-  		*p = '.';
-  	    else
-  		*p = '_';
-! #ifdef USE_FOPEN_NOINH
-  	    cookie.fp = fopen_noinh_readbin((char *)fname_exp);
-  #else
-  	    cookie.fp = mch_fopen((char *)fname_exp, READBIN);
-*** ../vim-7.2.337/src/version.c	2010-01-19 16:12:53.000000000 +0100
---- src/version.c	2010-01-19 16:20:08.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     338,
-  /**/
-
--- 
-~
-~
-~
-".signature" 4 lines, 50 characters written
-
- /// 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.339 b/source/ap/vim/patches/7.2.339
deleted file mode 100644
index 77aa94db..00000000
--- a/source/ap/vim/patches/7.2.339
+++ /dev/null
@@ -1,78 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.339
-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.339 (after 7.2.269)
-Problem:    Part of --startuptime patch is missing.
-Solution:   Add check for time_fd.
-Files:	    src/ex_cmds2.c
-
-
-*** ../vim-7.2.338/src/ex_cmds2.c	2010-01-19 16:21:55.000000000 +0100
---- src/ex_cmds2.c	2010-01-19 16:02:53.000000000 +0100
-***************
-*** 3036,3042 ****
-  #endif
-  
-  #ifdef STARTUPTIME
-!     time_push(&tv_rel, &tv_start);
-  #endif
-  
-  #ifdef FEAT_EVAL
---- 3036,3043 ----
-  #endif
-  
-  #ifdef STARTUPTIME
-!     if (time_fd != NULL)
-! 	time_push(&tv_rel, &tv_start);
-  #endif
-  
-  #ifdef FEAT_EVAL
-***************
-*** 3162,3170 ****
-  	verbose_leave();
-      }
-  #ifdef STARTUPTIME
-!     vim_snprintf((char *)IObuff, IOSIZE, "sourcing %s", fname);
-!     time_msg((char *)IObuff, &tv_start);
-!     time_pop(&tv_rel);
-  #endif
-  
-  #ifdef FEAT_EVAL
---- 3163,3174 ----
-  	verbose_leave();
-      }
-  #ifdef STARTUPTIME
-!     if (time_fd != NULL)
-!     {
-! 	vim_snprintf((char *)IObuff, IOSIZE, "sourcing %s", fname);
-! 	time_msg((char *)IObuff, &tv_start);
-! 	time_pop(&tv_rel);
-!     }
-  #endif
-  
-  #ifdef FEAT_EVAL
-*** ../vim-7.2.338/src/version.c	2010-01-19 16:21:55.000000000 +0100
---- src/version.c	2010-01-19 16:25:39.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     339,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-122. You ask if the Netaholics Anonymous t-shirt you ordered can be
-     sent to you via 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.340 b/source/ap/vim/patches/7.2.340
deleted file mode 100644
index b0f4babb..00000000
--- a/source/ap/vim/patches/7.2.340
+++ /dev/null
@@ -1,54 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.340
-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.340
-Problem:    Gcc warning for condition that can never be true. (James Vega)
-Solution:   Use start_lvl instead flp->lvl.
-Files:	    src/fold.c
-
-
-*** ../vim-7.2.339/src/fold.c	2009-11-03 18:04:26.000000000 +0100
---- src/fold.c	2010-01-19 16:45:13.000000000 +0100
-***************
-*** 3239,3246 ****
-  		    flp->lvl = n;
-  		    flp->lvl_next = n - 1;
-  		    /* never start a fold with an end marker */
-! 		    if (flp->lvl_next > flp->lvl)
-! 			flp->lvl_next = flp->lvl;
-  		}
-  	    }
-  	    else
---- 3239,3246 ----
-  		    flp->lvl = n;
-  		    flp->lvl_next = n - 1;
-  		    /* never start a fold with an end marker */
-! 		    if (flp->lvl_next > start_lvl)
-! 			flp->lvl_next = start_lvl;
-  		}
-  	    }
-  	    else
-*** ../vim-7.2.339/src/version.c	2010-01-19 16:31:10.000000000 +0100
---- src/version.c	2010-01-19 17:23:40.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     340,
-  /**/
-
--- 
-Would you care for a drink?   I mean, if it were, like,
-disabled and you had to look after 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.341 b/source/ap/vim/patches/7.2.341
deleted file mode 100644
index 67d5e81d..00000000
--- a/source/ap/vim/patches/7.2.341
+++ /dev/null
@@ -1,69 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.341
-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.341
-Problem:    Popup menu wraps to next line when double-wide character doesn't
-	    fit. (Jiang Ma)
-Solution:   Display a ">" instead. (Dominique Pelle)
-Files:	    src/screen.c
-
-
-*** ../vim-7.2.340/src/screen.c	2009-11-25 13:03:29.000000000 +0100
---- src/screen.c	2010-01-19 17:34:21.000000000 +0100
-***************
-*** 6434,6439 ****
---- 6434,6446 ----
-  		else
-  		    prev_c = u8c;
-  # endif
-+ 		if (col + mbyte_cells > screen_Columns)
-+ 		{
-+ 		    /* Only 1 cell left, but character requires 2 cells:
-+ 		     * display a '>' in the last column to avoid wrapping. */
-+ 		    c = '>';
-+ 		    mbyte_cells = 1;
-+ 		}
-  	    }
-  	}
-  #endif
-***************
-*** 9210,9216 ****
-      int	    force;
-  {
-      /*
-!      * Don't delete it right now, when not redrawing or insided a mapping.
-       */
-      if (!redrawing() || (!force && char_avail() && !KeyTyped))
-  	redraw_cmdline = TRUE;		/* delete mode later */
---- 9217,9223 ----
-      int	    force;
-  {
-      /*
-!      * Don't delete it right now, when not redrawing or inside a mapping.
-       */
-      if (!redrawing() || (!force && char_avail() && !KeyTyped))
-  	redraw_cmdline = TRUE;		/* delete mode later */
-*** ../vim-7.2.340/src/version.c	2010-01-19 17:24:20.000000000 +0100
---- src/version.c	2010-01-19 17:39:56.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     341,
-  /**/
-
--- 
-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.342 b/source/ap/vim/patches/7.2.342
deleted file mode 100644
index 72bf253e..00000000
--- a/source/ap/vim/patches/7.2.342
+++ /dev/null
@@ -1,95 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.342
-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.342
-Problem:    Popup menu displayed wrong in 'rightleft' mode when there are
-	    multi-byte characters.
-Solution:   Adjust the column computations. (Dominique Pelle)
-Files:	    src/popupmnu.c
-
-
-*** ../vim-7.2.341/src/popupmnu.c	2008-11-15 14:10:23.000000000 +0100
---- src/popupmnu.c	2010-01-19 17:57:05.000000000 +0100
-***************
-*** 345,365 ****
-  			    if (st != NULL)
-  			    {
-  				char_u	*rt = reverse_text(st);
-- 				char_u	*rt_saved = rt;
-- 				int	len, j;
-  
-  				if (rt != NULL)
-  				{
-! 				    len = (int)STRLEN(rt);
-! 				    if (len > pum_width)
-  				    {
-! 					for (j = pum_width; j < len; ++j)
-  					    mb_ptr_adv(rt);
-! 					len = pum_width;
-  				    }
-! 				    screen_puts_len(rt, len, row,
-! 							col - len + 1, attr);
-! 				    vim_free(rt_saved);
-  				}
-  				vim_free(st);
-  			    }
---- 345,380 ----
-  			    if (st != NULL)
-  			    {
-  				char_u	*rt = reverse_text(st);
-  
-  				if (rt != NULL)
-  				{
-! 				    char_u	*rt_start = rt;
-! 				    int		size;
-! 
-! 				    size = vim_strsize(rt);
-! 				    if (size > pum_width)
-  				    {
-! 					do
-! 					{
-! 					    size -= has_mbyte
-! 						    ? (*mb_ptr2cells)(rt) : 1;
-  					    mb_ptr_adv(rt);
-! 					} while (size > pum_width);
-! 
-! 					if (size < pum_width)
-! 					{
-! 					    /* Most left character requires
-! 					     * 2-cells but only 1 cell is
-! 					     * available on screen.  Put a
-! 					     * '<' on the left of the pum
-! 					     * item */
-! 					    *(--rt) = '<';
-! 					    size++;
-! 					}
-  				    }
-! 				    screen_puts_len(rt, (int)STRLEN(rt),
-! 						   row, col - size + 1, attr);
-! 				    vim_free(rt_start);
-  				}
-  				vim_free(st);
-  			    }
-*** ../vim-7.2.341/src/version.c	2010-01-19 17:40:39.000000000 +0100
---- src/version.c	2010-01-19 18:03:22.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     342,
-  /**/
-
--- 
-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.343 b/source/ap/vim/patches/7.2.343
deleted file mode 100644
index 22031519..00000000
--- a/source/ap/vim/patches/7.2.343
+++ /dev/null
@@ -1,51 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.343
-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.343 (after 7.2.338)
-Problem:    Can't compile on Win32.
-Solution:   Insert the missing '|'.
-Files:	    src/ex_cmds2.c
-
-
-*** ../vim-7.2.342/src/ex_cmds2.c	2010-01-19 16:31:10.000000000 +0100
---- src/ex_cmds2.c	2010-01-19 23:22:40.000000000 +0100
-***************
-*** 2816,2822 ****
-  {
-      int	fd_tmp = mch_open(filename, O_RDONLY
-  # ifdef WIN32
-! 			  O_BINARY | O_NOINHERIT
-  # endif
-  			  , 0);
-  
---- 2816,2822 ----
-  {
-      int	fd_tmp = mch_open(filename, O_RDONLY
-  # ifdef WIN32
-! 			  | O_BINARY | O_NOINHERIT
-  # endif
-  			  , 0);
-  
-*** ../vim-7.2.342/src/version.c	2010-01-19 18:05:05.000000000 +0100
---- src/version.c	2010-01-19 23:24:05.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     343,
-  /**/
-
--- 
-I'm writing a book.  I've got the page numbers done.
-
- /// 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.344 b/source/ap/vim/patches/7.2.344
deleted file mode 100644
index 788bbc41..00000000
--- a/source/ap/vim/patches/7.2.344
+++ /dev/null
@@ -1,60 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.344
-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.344 (after 7.2.343)
-Problem:    Can't compile on some systems
-Solution:   Move the #ifdef outside of the mch_open macro. (Patrick Texier)
-Files:	    src/ex_cmds2.c
-
-
-*** ../vim-7.2.343/src/ex_cmds2.c	2010-01-19 23:25:18.000000000 +0100
---- src/ex_cmds2.c	2010-01-20 21:38:19.000000000 +0100
-***************
-*** 2814,2824 ****
-  fopen_noinh_readbin(filename)
-      char    *filename;
-  {
--     int	fd_tmp = mch_open(filename, O_RDONLY
-  # ifdef WIN32
-! 			  | O_BINARY | O_NOINHERIT
-  # endif
-- 			  , 0);
-  
-      if (fd_tmp == -1)
-  	return NULL;
---- 2814,2824 ----
-  fopen_noinh_readbin(filename)
-      char    *filename;
-  {
-  # ifdef WIN32
-!     int	fd_tmp = mch_open(filename, O_RDONLY | O_BINARY | O_NOINHERIT, 0);
-! # else
-!     int	fd_tmp = mch_open(filename, O_RDONLY, 0);
-  # endif
-  
-      if (fd_tmp == -1)
-  	return NULL;
-*** ../vim-7.2.343/src/version.c	2010-01-19 23:25:18.000000000 +0100
---- src/version.c	2010-01-20 21:38:23.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     344,
-  /**/
-
--- 
-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.345 b/source/ap/vim/patches/7.2.345
deleted file mode 100644
index a3b7acf7..00000000
--- a/source/ap/vim/patches/7.2.345
+++ /dev/null
@@ -1,47 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.345
-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.345
-Problem:    Tab line is not updated when the value of 'bt' is changed.
-Solution:   Call redraw_titles(). (Lech Lorens)
-Files:	    src/option.c
-
-
-*** ../vim-7.2.344/src/option.c	2009-09-11 15:20:22.000000000 +0200
---- src/option.c	2010-01-27 15:52:45.000000000 +0100
-***************
-*** 6410,6415 ****
---- 6410,6418 ----
-  	    }
-  # endif
-  	    curbuf->b_help = (curbuf->b_p_bt[0] == 'h');
-+ # ifdef FEAT_TITLE
-+ 	    redraw_titles();
-+ # endif
-  	}
-      }
-  #endif
-*** ../vim-7.2.344/src/version.c	2010-01-20 21:41:40.000000000 +0100
---- src/version.c	2010-01-27 15:57:06.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     345,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-154. You fondle your mouse.
-
- /// 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.346 b/source/ap/vim/patches/7.2.346
deleted file mode 100644
index 479aac63..00000000
--- a/source/ap/vim/patches/7.2.346
+++ /dev/null
@@ -1,110 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.346
-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.346
-Problem:    Repeating a command with @: causes a mapping to be applied twice.
-Solution:   Do not remap characters inserted in the typeahead buffer. (Kana
-	    Natsuno)
-Files:	    src/ops.c
-
-
-*** ../vim-7.2.345/src/ops.c	2010-01-19 14:59:14.000000000 +0100
---- src/ops.c	2010-01-19 13:04:46.000000000 +0100
-***************
-*** 1301,1310 ****
-      }
-  }
-  
-      static int
-  put_in_typebuf(s, esc, colon, silent)
-      char_u	*s;
-!     int		esc;	    /* Escape CSI characters */
-      int		colon;	    /* add ':' before the line */
-      int		silent;
-  {
---- 1301,1316 ----
-      }
-  }
-  
-+ /*
-+  * Insert register contents "s" into the typeahead buffer, so that it will be
-+  * executed again.
-+  * When "esc" is TRUE it is to be taken literally: Escape CSI characters and
-+  * no remapping.
-+  */
-      static int
-  put_in_typebuf(s, esc, colon, silent)
-      char_u	*s;
-!     int		esc;
-      int		colon;	    /* add ':' before the line */
-      int		silent;
-  {
-***************
-*** 1312,1318 ****
-  
-      put_reedit_in_typebuf(silent);
-      if (colon)
-! 	retval = ins_typebuf((char_u *)"\n", REMAP_YES, 0, TRUE, silent);
-      if (retval == OK)
-      {
-  	char_u	*p;
---- 1318,1324 ----
-  
-      put_reedit_in_typebuf(silent);
-      if (colon)
-! 	retval = ins_typebuf((char_u *)"\n", REMAP_NONE, 0, TRUE, silent);
-      if (retval == OK)
-      {
-  	char_u	*p;
-***************
-*** 1324,1335 ****
-  	if (p == NULL)
-  	    retval = FAIL;
-  	else
-! 	    retval = ins_typebuf(p, REMAP_YES, 0, TRUE, silent);
-  	if (esc)
-  	    vim_free(p);
-      }
-      if (colon && retval == OK)
-! 	retval = ins_typebuf((char_u *)":", REMAP_YES, 0, TRUE, silent);
-      return retval;
-  }
-  
---- 1330,1342 ----
-  	if (p == NULL)
-  	    retval = FAIL;
-  	else
-! 	    retval = ins_typebuf(p, esc ? REMAP_NONE : REMAP_YES,
-! 							     0, TRUE, silent);
-  	if (esc)
-  	    vim_free(p);
-      }
-      if (colon && retval == OK)
-! 	retval = ins_typebuf((char_u *)":", REMAP_NONE, 0, TRUE, silent);
-      return retval;
-  }
-  
-*** ../vim-7.2.345/src/version.c	2010-01-27 15:57:17.000000000 +0100
---- src/version.c	2010-01-27 16:25:55.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     346,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-155. You forget to eat because you're too busy surfing 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.347 b/source/ap/vim/patches/7.2.347
deleted file mode 100644
index e5fa17d4..00000000
--- a/source/ap/vim/patches/7.2.347
+++ /dev/null
@@ -1,138 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.347
-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.347
-Problem:    Crash when executing <expr> mapping redefines that same mapping.
-Solution:   Save the values used before evaluating the expression.
-Files:	    src/getchar.c
-
-
-*** ../vim-7.2.346/src/getchar.c	2009-11-11 16:23:37.000000000 +0100
---- src/getchar.c	2010-01-27 17:30:42.000000000 +0100
-***************
-*** 2389,2394 ****
---- 2389,2405 ----
-  		    /* complete match */
-  		    if (keylen >= 0 && keylen <= typebuf.tb_len)
-  		    {
-+ #ifdef FEAT_EVAL
-+ 			int save_m_expr;
-+ 			int save_m_noremap;
-+ 			int save_m_silent;
-+ 			char_u *save_m_keys;
-+ 			char_u *save_m_str;
-+ #else
-+ # define save_m_noremap mp->m_noremap
-+ # define save_m_silent mp->m_silent
-+ #endif
-+ 
-  			/* write chars to script file(s) */
-  			if (keylen > typebuf.tb_maplen)
-  			    gotchars(typebuf.tb_buf + typebuf.tb_off
-***************
-*** 2431,2436 ****
---- 2442,2457 ----
-  #endif
-  
-  #ifdef FEAT_EVAL
-+ 			/* Copy the values from *mp that are used, because
-+ 			 * evaluating the expression may invoke a function
-+ 			 * that redefines the mapping, thereby making *mp
-+ 			 * invalid. */
-+ 			save_m_expr = mp->m_expr;
-+ 			save_m_noremap = mp->m_noremap;
-+ 			save_m_silent = mp->m_silent;
-+ 			save_m_keys = NULL;  /* only saved when needed */
-+ 			save_m_str = NULL;  /* only saved when needed */
-+ 
-  			/*
-  			 * Handle ":map <expr>": evaluate the {rhs} as an
-  			 * expression.  Save and restore the typeahead so that
-***************
-*** 2446,2452 ****
-  			    if (tabuf.typebuf_valid)
-  			    {
-  				vgetc_busy = 0;
-! 				s = eval_map_expr(mp->m_str, NUL);
-  				vgetc_busy = save_vgetc_busy;
-  			    }
-  			    else
---- 2467,2475 ----
-  			    if (tabuf.typebuf_valid)
-  			    {
-  				vgetc_busy = 0;
-! 				save_m_keys = vim_strsave(mp->m_keys);
-! 				save_m_str = vim_strsave(mp->m_str);
-! 				s = eval_map_expr(save_m_str, NUL);
-  				vgetc_busy = save_vgetc_busy;
-  			    }
-  			    else
-***************
-*** 2470,2486 ****
-  			else
-  			{
-  			    i = ins_typebuf(s,
-! 				    mp->m_noremap != REMAP_YES
-! 					    ? mp->m_noremap
-! 					    : STRNCMP(s, mp->m_keys,
-  							  (size_t)keylen) != 0
-  						     ? REMAP_YES : REMAP_SKIP,
-! 				0, TRUE, cmd_silent || mp->m_silent);
-  #ifdef FEAT_EVAL
-! 			    if (mp->m_expr)
-  				vim_free(s);
-  #endif
-  			}
-  			if (i == FAIL)
-  			{
-  			    c = -1;
---- 2493,2517 ----
-  			else
-  			{
-  			    i = ins_typebuf(s,
-! 				    save_m_noremap != REMAP_YES
-! 					    ? save_m_noremap
-! 					    : STRNCMP(s,
-! #ifdef FEAT_EVAL
-! 					   save_m_keys != NULL ? save_m_keys :
-! #endif
-! 						      mp->m_keys,
-  							  (size_t)keylen) != 0
-  						     ? REMAP_YES : REMAP_SKIP,
-! 				0, TRUE, cmd_silent || save_m_silent);
-  #ifdef FEAT_EVAL
-! 			    if (save_m_expr)
-  				vim_free(s);
-  #endif
-  			}
-+ #ifdef FEAT_EVAL
-+ 			vim_free(save_m_keys);
-+ 			vim_free(save_m_str);
-+ #endif
-  			if (i == FAIL)
-  			{
-  			    c = -1;
-*** ../vim-7.2.346/src/version.c	2010-01-27 16:31:00.000000000 +0100
---- src/version.c	2010-01-27 17:27:32.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     347,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-156. You forget your friend's name but not her e-mail 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.348 b/source/ap/vim/patches/7.2.348
deleted file mode 100644
index 5f4ffbd0..00000000
--- a/source/ap/vim/patches/7.2.348
+++ /dev/null
@@ -1,254 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.348 (after 7.2.330)
-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.348 (after 7.2.330)
-Problem:    Unicode double-width characters are not up-to date.
-Solution:   Produce the double-width table like the others.
-Files:	    runtime/tools/unicode.vim, src/mbyte.c
-
-
-*** ../vim-7.2.347/runtime/tools/unicode.vim	2010-01-12 19:48:57.000000000 +0100
---- runtime/tools/unicode.vim	2010-01-27 17:57:17.000000000 +0100
-***************
-*** 187,202 ****
-    wincmd p
-  endfunc
-  
-! " Build the ambiguous table in a new buffer.
-  " Uses s:widthprops and s:dataprops.
-! func! BuildAmbiguousTable()
-    let start = -1
-    let end = -1
-    let ranges = []
-    let dataidx = 0
-    for p in s:widthprops
-!     if p[1][0] == 'A'
-!       let n = ('0x' . p[0]) + 0
-        " Find this char in the data table.
-        while 1
-  	let dn = ('0x' . s:dataprops[dataidx][0]) + 0
---- 187,213 ----
-    wincmd p
-  endfunc
-  
-! " Build the double width or ambiguous width table in a new buffer.
-  " Uses s:widthprops and s:dataprops.
-! func! BuildWidthTable(pattern, tableName)
-    let start = -1
-    let end = -1
-    let ranges = []
-    let dataidx = 0
-    for p in s:widthprops
-!     if p[1][0] =~ a:pattern
-!       if p[0] =~ '\.\.'
-! 	" It is a range.  we don't check for composing char then.
-! 	let rng = split(p[0], '\.\.')
-! 	if len(rng) != 2
-! 	  echoerr "Cannot parse range: '" . p[0] . "' in width table"
-! 	endif
-! 	let n = ('0x' . rng[0]) + 0
-! 	let n_last =  ('0x' . rng[1]) + 0
-!       else
-! 	let n = ('0x' . p[0]) + 0
-! 	let n_last = n
-!       endif
-        " Find this char in the data table.
-        while 1
-  	let dn = ('0x' . s:dataprops[dataidx][0]) + 0
-***************
-*** 205,231 ****
-  	endif
-  	let dataidx += 1
-        endwhile
-!       if dn != n
-  	echoerr "Cannot find character " . n . " in data table"
-        endif
-        " Only use the char when it's not a composing char.
-        let dp = s:dataprops[dataidx]
-!       if dp[2] != 'Mn' && dp[2] != 'Mc' && dp[2] != 'Me'
-  	if start >= 0 && end + 1 == n
-  	  " continue with same range.
-- 	  let end = n
-  	else
-  	  if start >= 0
-  	    " produce previous range
-  	    call add(ranges, printf("\t{0x%04x, 0x%04x},", start, end))
-  	  endif
-  	  let start = n
-- 	  if p[0] =~ '\.\.'
-- 	    let end = ('0x' . substitute(p[0], '.*\.\.', '', '')) + 0
-- 	  else
-- 	    let end = n
-- 	  endif
-  	endif
-        endif
-      endif
-    endfor
---- 216,238 ----
-  	endif
-  	let dataidx += 1
-        endwhile
-!       if dn != n && n_last == n
-  	echoerr "Cannot find character " . n . " in data table"
-        endif
-        " Only use the char when it's not a composing char.
-+       " But use all chars from a range.
-        let dp = s:dataprops[dataidx]
-!       if n_last > n || (dp[2] != 'Mn' && dp[2] != 'Mc' && dp[2] != 'Me')
-  	if start >= 0 && end + 1 == n
-  	  " continue with same range.
-  	else
-  	  if start >= 0
-  	    " produce previous range
-  	    call add(ranges, printf("\t{0x%04x, 0x%04x},", start, end))
-  	  endif
-  	  let start = n
-  	endif
-+ 	let end = n_last
-        endif
-      endif
-    endfor
-***************
-*** 235,242 ****
-  
-    " New buffer to put the result in.
-    new
-!   file ambiguous
-!   call setline(1, "    static struct interval ambiguous[] =")
-    call setline(2, "    {")
-    call append('$', ranges)
-    call setline('$', getline('$')[:-2])  " remove last comma
---- 242,249 ----
-  
-    " New buffer to put the result in.
-    new
-!   exe "file " . a:tableName
-!   call setline(1, "    static struct interval " . a:tableName . "[] =")
-    call setline(2, "    {")
-    call append('$', ranges)
-    call setline('$', getline('$')[:-2])  " remove last comma
-***************
-*** 276,280 ****
-  " Parse each line, create a list of lists.
-  call ParseWidthProps()
-  
-! " Build the ambiguous table.
-! call BuildAmbiguousTable()
---- 283,290 ----
-  " Parse each line, create a list of lists.
-  call ParseWidthProps()
-  
-! " Build the double width table.
-! call BuildWidthTable('[WF]', 'doublewidth')
-! 
-! " Build the ambiguous width table.
-! call BuildWidthTable('A', 'ambiguous')
-*** ../vim-7.2.347/src/mbyte.c	2010-01-12 19:48:57.000000000 +0100
---- src/mbyte.c	2010-01-27 18:06:35.000000000 +0100
-***************
-*** 1200,1205 ****
---- 1200,1248 ----
-  utf_char2cells(c)
-      int		c;
-  {
-+     /* Sorted list of non-overlapping intervals of East Asian double width
-+      * characters, generated with ../runtime/tools/unicode.vim. */
-+     static struct interval doublewidth[] =
-+     {
-+ 	{0x1100, 0x115f},
-+ 	{0x11a3, 0x11a7},
-+ 	{0x11fa, 0x11ff},
-+ 	{0x2329, 0x232a},
-+ 	{0x2e80, 0x2e99},
-+ 	{0x2e9b, 0x2ef3},
-+ 	{0x2f00, 0x2fd5},
-+ 	{0x2ff0, 0x2ffb},
-+ 	{0x3000, 0x3029},
-+ 	{0x3030, 0x303e},
-+ 	{0x3041, 0x3096},
-+ 	{0x309b, 0x30ff},
-+ 	{0x3105, 0x312d},
-+ 	{0x3131, 0x318e},
-+ 	{0x3190, 0x31b7},
-+ 	{0x31c0, 0x31e3},
-+ 	{0x31f0, 0x321e},
-+ 	{0x3220, 0x3247},
-+ 	{0x3250, 0x32fe},
-+ 	{0x3300, 0x4dbf},
-+ 	{0x4e00, 0xa48c},
-+ 	{0xa490, 0xa4c6},
-+ 	{0xa960, 0xa97c},
-+ 	{0xac00, 0xd7a3},
-+ 	{0xd7b0, 0xd7c6},
-+ 	{0xd7cb, 0xd7fb},
-+ 	{0xf900, 0xfaff},
-+ 	{0xfe10, 0xfe19},
-+ 	{0xfe30, 0xfe52},
-+ 	{0xfe54, 0xfe66},
-+ 	{0xfe68, 0xfe6b},
-+ 	{0xff01, 0xff60},
-+ 	{0xffe0, 0xffe6},
-+ 	{0x1f200, 0x1f200},
-+ 	{0x1f210, 0x1f231},
-+ 	{0x1f240, 0x1f248},
-+ 	{0x20000, 0x2fffd},
-+ 	{0x30000, 0x3fffd}
-+     };
-      /* Sorted list of non-overlapping intervals of East Asian Ambiguous
-       * characters, generated with ../runtime/tools/unicode.vim. */
-      static struct interval ambiguous[] =
-***************
-*** 1403,1422 ****
-  #else
-  	if (!utf_printable(c))
-  	    return 6;		/* unprintable, displays <xxxx> */
-! 	if (c >= 0x1100
-! 	    && (c <= 0x115f			/* Hangul Jamo */
-! 		|| c == 0x2329
-! 		|| c == 0x232a
-! 		|| (c >= 0x2e80 && c <= 0xa4cf
-! 		    && c != 0x303f)		/* CJK ... Yi */
-! 		|| (c >= 0xac00 && c <= 0xd7a3)	/* Hangul Syllables */
-! 		|| (c >= 0xf900 && c <= 0xfaff)	/* CJK Compatibility
-! 						   Ideographs */
-! 		|| (c >= 0xfe30 && c <= 0xfe6f)	/* CJK Compatibility Forms */
-! 		|| (c >= 0xff00 && c <= 0xff60)	/* Fullwidth Forms */
-! 		|| (c >= 0xffe0 && c <= 0xffe6)
-! 		|| (c >= 0x20000 && c <= 0x2fffd)
-! 		|| (c >= 0x30000 && c <= 0x3fffd)))
-  	    return 2;
-  #endif
-      }
---- 1446,1452 ----
-  #else
-  	if (!utf_printable(c))
-  	    return 6;		/* unprintable, displays <xxxx> */
-! 	if (intable(doublewidth, sizeof(doublewidth), c))
-  	    return 2;
-  #endif
-      }
-*** ../vim-7.2.347/src/version.c	2010-01-27 17:31:38.000000000 +0100
---- src/version.c	2010-01-27 18:25:50.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     348,
-  /**/
-
--- 
-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.349 b/source/ap/vim/patches/7.2.349
deleted file mode 100644
index 7d0be020..00000000
--- a/source/ap/vim/patches/7.2.349
+++ /dev/null
@@ -1,53 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.349
-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.349
-Problem:    CTRL-W gf doesn't put the new tab in the same place as "tab split"
-	    and "gf". (Tony Mechelynck)
-Solution:   Store the tab number in cmdmod.tab.
-Files:	    src/window.c
-
-
-*** ../vim-7.2.348/src/window.c	2009-06-24 17:31:27.000000000 +0200
---- src/window.c	2010-01-27 20:23:22.000000000 +0100
-***************
-*** 626,632 ****
-  #ifdef FEAT_SEARCHPATH
-  		    case 'f':	    /* CTRL-W gf: "gf" in a new tab page */
-  		    case 'F':	    /* CTRL-W gF: "gF" in a new tab page */
-! 			cmdmod.tab = TRUE;
-  			nchar = xchar;
-  			goto wingotofile;
-  #endif
---- 626,632 ----
-  #ifdef FEAT_SEARCHPATH
-  		    case 'f':	    /* CTRL-W gf: "gf" in a new tab page */
-  		    case 'F':	    /* CTRL-W gF: "gF" in a new tab page */
-! 			cmdmod.tab = tabpage_index(curtab) + 1;
-  			nchar = xchar;
-  			goto wingotofile;
-  #endif
-*** ../vim-7.2.348/src/version.c	2010-01-27 18:29:21.000000000 +0100
---- src/version.c	2010-01-27 20:25:43.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     349,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-159. You get excited whenever discussing your hard drive.
-
- /// 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.350 b/source/ap/vim/patches/7.2.350
deleted file mode 100644
index 7715eb30..00000000
--- a/source/ap/vim/patches/7.2.350
+++ /dev/null
@@ -1,86 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.350
-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.350
-Problem:    Win32: When changing font the window may jump from the secondary
-	    to the primary screen. (Michael Wookey)
-Solution:   When the screen position was negative don't correct it to zero.
-Files:	    src/gui.c
-
-
-*** ../vim-7.2.349/src/gui.c	2009-09-23 18:14:13.000000000 +0200
---- src/gui.c	2010-01-27 21:02:32.000000000 +0100
-***************
-*** 1390,1395 ****
---- 1390,1396 ----
-      int		un_maximize = mustset;
-      int         did_adjust = 0;
-  #endif
-+     int		x = -1, y = -1;
-  
-      if (!gui.shell_created)
-  	return;
-***************
-*** 1406,1411 ****
---- 1407,1416 ----
-  
-      base_width = gui_get_base_width();
-      base_height = gui_get_base_height();
-+     if (fit_to_display)
-+ 	/* Remember the original window position. */
-+ 	gui_mch_get_winpos(&x, &y);
-+ 
-  #ifdef USE_SUN_WORKSHOP
-      if (!mustset && usingSunWorkShop
-  				&& workshop_get_width_height(&width, &height))
-***************
-*** 1473,1483 ****
-  
-      gui_mch_set_shellsize(width, height, min_width, min_height,
-  					  base_width, base_height, direction);
--     if (fit_to_display)
--     {
-- 	int	    x, y;
-  
-! 	/* Some window managers put the Vim window left of/above the screen. */
-  	gui_mch_update();
-  	if (gui_mch_get_winpos(&x, &y) == OK && (x < 0 || y < 0))
-  	    gui_mch_set_winpos(x < 0 ? 0 : x, y < 0 ? 0 : y);
---- 1478,1489 ----
-  
-      gui_mch_set_shellsize(width, height, min_width, min_height,
-  					  base_width, base_height, direction);
-  
-!     if (fit_to_display && x >= 0 && y >= 0)
-!     {
-! 	/* Some window managers put the Vim window left of/above the screen.
-! 	 * Only change the position if it wasn't already negative before
-! 	 * (happens on MS-Windows with a secondary monitor). */
-  	gui_mch_update();
-  	if (gui_mch_get_winpos(&x, &y) == OK && (x < 0 || y < 0))
-  	    gui_mch_set_winpos(x < 0 ? 0 : x, y < 0 ? 0 : y);
-*** ../vim-7.2.349/src/version.c	2010-01-27 20:26:41.000000000 +0100
---- src/version.c	2010-01-27 21:03:41.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     350,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-160. You get in the elevator and double-click the button for the floor
-     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.351 b/source/ap/vim/patches/7.2.351
deleted file mode 100644
index 55b28f6a..00000000
--- a/source/ap/vim/patches/7.2.351
+++ /dev/null
@@ -1,78 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.351 (after 7.2.347)
-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.351 (after 7.2.347)
-Problem:    Can't build with some compilers.
-Solution:   Move the #ifdef outside of a macro.  Cleanup the code.
-Files:	    src/getchar.c
-
-
-*** ../vim-7.2.350/src/getchar.c	2010-01-27 17:31:38.000000000 +0100
---- src/getchar.c	2010-01-28 22:42:22.000000000 +0100
-***************
-*** 2492,2508 ****
-  			    i = FAIL;
-  			else
-  			{
-! 			    i = ins_typebuf(s,
-! 				    save_m_noremap != REMAP_YES
-! 					    ? save_m_noremap
-! 					    : STRNCMP(s,
-  #ifdef FEAT_EVAL
-! 					   save_m_keys != NULL ? save_m_keys :
-  #endif
-! 						      mp->m_keys,
-! 							  (size_t)keylen) != 0
-! 						     ? REMAP_YES : REMAP_SKIP,
-! 				0, TRUE, cmd_silent || save_m_silent);
-  #ifdef FEAT_EVAL
-  			    if (save_m_expr)
-  				vim_free(s);
---- 2492,2515 ----
-  			    i = FAIL;
-  			else
-  			{
-! 			    int noremap;
-! 
-! 			    if (save_m_noremap != REMAP_YES)
-! 				noremap = save_m_noremap;
-! 			    else if (
-  #ifdef FEAT_EVAL
-! 				STRNCMP(s, save_m_keys != NULL
-! 						   ? save_m_keys : mp->m_keys,
-! 							 (size_t)keylen)
-! #else
-! 				STRNCMP(s, mp->m_keys, (size_t)keylen)
-  #endif
-! 				   != 0)
-! 				noremap = REMAP_YES;
-! 			    else
-! 				noremap = REMAP_SKIP;
-! 			    i = ins_typebuf(s, noremap,
-! 					0, TRUE, cmd_silent || save_m_silent);
-  #ifdef FEAT_EVAL
-  			    if (save_m_expr)
-  				vim_free(s);
-*** ../vim-7.2.350/src/version.c	2010-01-27 21:04:58.000000000 +0100
---- src/version.c	2010-01-28 22:50:53.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     351,
-  /**/
-
--- 
-"Hit any key to continue" it said, but nothing happened after F sharp.
-
- /// 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.352 b/source/ap/vim/patches/7.2.352
deleted file mode 100644
index d2e22f2d..00000000
--- a/source/ap/vim/patches/7.2.352
+++ /dev/null
@@ -1,62 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.352
-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.352
-Problem:    Win64: Vim doesn't work when cross-compiled with MingW libraries.
-Solution:   Always return TRUE for the WM_NCCREATE message. (Andy Kittner)
-Files:	    src/gui_w48.c
-
-
-*** ../vim-7.2.351/src/gui_w48.c	2009-01-28 21:22:20.000000000 +0100
---- src/gui_w48.c	2010-02-03 12:07:11.000000000 +0100
-***************
-*** 1084,1092 ****
-  	case WM_NOTIFY: Handle_WM_Notify(hwnd, (LPNMHDR)lParam);
-  	    return TRUE;
-  #endif
-  
-!     default:
-! 	return MyWindowProc(hwnd, uMsg, wParam, lParam);
-      }
-  }
-  
---- 1084,1098 ----
-  	case WM_NOTIFY: Handle_WM_Notify(hwnd, (LPNMHDR)lParam);
-  	    return TRUE;
-  #endif
-+ 	/* Workaround for the problem that MyWindowProc() returns FALSE on 64
-+ 	 * bit windows when cross-compiled using Mingw libraries. (Andy
-+ 	 * Kittner) */
-+ 	case WM_NCCREATE:
-+ 	    MyWindowProc(hwnd, uMsg, wParam, lParam);
-+ 	    return TRUE;
-  
-! 	default:
-! 	    return MyWindowProc(hwnd, uMsg, wParam, lParam);
-      }
-  }
-  
-*** ../vim-7.2.351/src/version.c	2010-01-28 22:58:10.000000000 +0100
---- src/version.c	2010-02-03 12:16:30.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     352,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-185. You order fast food over the Internet
-
- /// 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.353 b/source/ap/vim/patches/7.2.353
deleted file mode 100644
index 06f9f171..00000000
--- a/source/ap/vim/patches/7.2.353
+++ /dev/null
@@ -1,173 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.353
-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.353
-Problem:    No command line completion for ":profile".
-Solution:   Complete the subcommand and file name.
-Files:	    src/ex_docmd.c, src/ex_cmds2.c, src/ex_getln.c,
-	    src/proto/ex_cmds2.pro, src/vim.h
-
-
-*** ../vim-7.2.352/src/ex_docmd.c	2009-11-03 12:38:50.000000000 +0100
---- src/ex_docmd.c	2010-02-03 14:40:14.000000000 +0100
-***************
-*** 3804,3809 ****
---- 3804,3814 ----
-  		xp->xp_context = EXPAND_NOTHING;
-  	    break;
-  #endif
-+ #if defined(FEAT_PROFILE)
-+ 	case CMD_profile:
-+ 	    set_context_in_profile_cmd(xp, arg);
-+ 	    break;
-+ #endif
-  
-  #endif /* FEAT_CMDL_COMPL */
-  
-*** ../vim-7.2.352/src/ex_cmds2.c	2010-01-20 21:41:40.000000000 +0100
---- src/ex_cmds2.c	2010-02-03 14:50:08.000000000 +0100
-***************
-*** 1115,1120 ****
---- 1115,1193 ----
-      }
-  }
-  
-+ /* Command line expansion for :profile. */
-+ static enum
-+ {
-+     PEXP_SUBCMD,	/* expand :profile sub-commands */
-+     PEXP_FUNC,		/* expand :profile func {funcname} */
-+ } pexpand_what;
-+ 
-+ static char *pexpand_cmds[] = {
-+ 			"start",
-+ #define PROFCMD_START	0
-+ 			"pause",
-+ #define PROFCMD_PAUSE	1
-+ 			"continue",
-+ #define PROFCMD_CONTINUE 2
-+ 			"func",
-+ #define PROFCMD_FUNC	3
-+ 			"file",
-+ #define PROFCMD_FILE	4
-+ 			NULL
-+ #define PROFCMD_LAST	5
-+ };
-+ 
-+ /*
-+  * Function given to ExpandGeneric() to obtain the profile command
-+  * specific expansion.
-+  */
-+     char_u *
-+ get_profile_name(xp, idx)
-+     expand_T	*xp UNUSED;
-+     int		idx;
-+ {
-+     switch (pexpand_what)
-+     {
-+     case PEXP_SUBCMD:
-+ 	return (char_u *)pexpand_cmds[idx];
-+     /* case PEXP_FUNC: TODO */
-+     default:
-+ 	return NULL;
-+     }
-+ }
-+ 
-+ /*
-+  * Handle command line completion for :profile command.
-+  */
-+     void
-+ set_context_in_profile_cmd(xp, arg)
-+     expand_T	*xp;
-+     char_u	*arg;
-+ {
-+     char_u	*end_subcmd;
-+     int		len;
-+ 
-+     /* Default: expand subcommands. */
-+     xp->xp_context = EXPAND_PROFILE;
-+     pexpand_what = PEXP_SUBCMD;
-+     xp->xp_pattern = arg;
-+ 
-+     end_subcmd = skiptowhite(arg);
-+     if (*end_subcmd == NUL)
-+ 	return;
-+ 
-+     len = end_subcmd - arg;
-+     if (len == 5 && STRNCMP(arg, "start", 5) == 0)
-+     {
-+ 	xp->xp_context = EXPAND_FILES;
-+ 	xp->xp_pattern = skipwhite(end_subcmd);
-+ 	return;
-+     }
-+ 
-+     /* TODO: expand function names after "func" */
-+     xp->xp_context = EXPAND_NOTHING;
-+ }
-+ 
-  /*
-   * Dump the profiling info.
-   */
-*** ../vim-7.2.352/src/ex_getln.c	2010-01-19 14:59:14.000000000 +0100
---- src/ex_getln.c	2010-02-03 14:38:43.000000000 +0100
-***************
-*** 4522,4527 ****
---- 4522,4530 ----
-  #ifdef FEAT_SIGNS
-  	    {EXPAND_SIGN, get_sign_name, TRUE},
-  #endif
-+ #ifdef FEAT_PROFILE
-+ 	    {EXPAND_PROFILE, get_profile_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.352/src/proto/ex_cmds2.pro	2008-01-06 20:07:25.000000000 +0100
---- src/proto/ex_cmds2.pro	2010-02-03 14:43:12.000000000 +0100
-***************
-*** 24,29 ****
---- 24,31 ----
-  int profile_equal __ARGS((proftime_T *tm1, proftime_T *tm2));
-  int profile_cmp __ARGS((proftime_T *tm1, proftime_T *tm2));
-  void ex_profile __ARGS((exarg_T *eap));
-+ char_u *get_profile_name __ARGS((expand_T *xp, int idx));
-+ void set_context_in_profile_cmd __ARGS((expand_T *xp, char_u *arg));
-  void profile_dump __ARGS((void));
-  void script_prof_save __ARGS((proftime_T *tm));
-  void script_prof_restore __ARGS((proftime_T *tm));
-*** ../vim-7.2.352/src/vim.h	2009-06-16 11:08:13.000000000 +0200
---- src/vim.h	2010-02-03 14:40:42.000000000 +0100
-***************
-*** 718,723 ****
---- 718,724 ----
-  #define EXPAND_SHELLCMD		32
-  #define EXPAND_CSCOPE		33
-  #define EXPAND_SIGN		34
-+ #define EXPAND_PROFILE		35
-  
-  /* Values for exmode_active (0 is no exmode) */
-  #define EXMODE_NORMAL		1
-*** ../vim-7.2.352/src/version.c	2010-02-03 12:23:16.000000000 +0100
---- src/version.c	2010-02-03 15:07:26.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     353,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-188. You purchase a laptop so you can surf while sitting on the can.
-
- /// 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.354 b/source/ap/vim/patches/7.2.354
deleted file mode 100644
index b4f50664..00000000
--- a/source/ap/vim/patches/7.2.354
+++ /dev/null
@@ -1,78 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.354
-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.354
-Problem:    Japanese single-width double-byte characters not handled correctly.
-Solution:   Put 0x8e in ScreenLines[] and the second byte in ScreenLines2[].
-	    (partly by Kikuchan)
-Files:	    src/screen.c
-
-
-*** ../vim-7.2.353/src/screen.c	2010-01-19 17:40:39.000000000 +0100
---- src/screen.c	2010-02-03 15:47:19.000000000 +0100
-***************
-*** 2335,2347 ****
-  		if (cells > 1)
-  		    ScreenLines[idx + 1] = 0;
-  	    }
-! 	    else if (cells > 1)	    /* double-byte character */
-! 	    {
-! 		if (enc_dbcs == DBCS_JPNU && *p == 0x8e)
-! 		    ScreenLines2[idx] = p[1];
-! 		else
-! 		    ScreenLines[idx + 1] = p[1];
-! 	    }
-  	    col += cells;
-  	    idx += cells;
-  	    p += c_len;
---- 2335,2346 ----
-  		if (cells > 1)
-  		    ScreenLines[idx + 1] = 0;
-  	    }
-! 	    else if (enc_dbcs == DBCS_JPNU && *p == 0x8e)
-! 		/* double-byte single width character */
-! 		ScreenLines2[idx] = p[1];
-! 	    else if (cells > 1)
-! 		/* double-width character */
-! 		ScreenLines[idx + 1] = p[1];
-  	    col += cells;
-  	    idx += cells;
-  	    p += c_len;
-***************
-*** 4631,4637 ****
---- 4630,4640 ----
-  	    ScreenLines[off] = c;
-  #ifdef FEAT_MBYTE
-  	    if (enc_dbcs == DBCS_JPNU)
-+ 	    {
-+ 		if ((mb_c & 0xff00) == 0x8e00)
-+ 		    ScreenLines[off] = 0x8e;
-  		ScreenLines2[off] = mb_c & 0xff;
-+ 	    }
-  	    else if (enc_utf8)
-  	    {
-  		if (mb_utf8)
-*** ../vim-7.2.353/src/version.c	2010-02-03 15:14:15.000000000 +0100
---- src/version.c	2010-02-03 15:43:43.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     354,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-189. You put your e-mail address in the upper left-hand corner of envelopes.
-
- /// 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.355 b/source/ap/vim/patches/7.2.355
deleted file mode 100644
index b23d44ae..00000000
--- a/source/ap/vim/patches/7.2.355
+++ /dev/null
@@ -1,88 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.355
-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.355
-Problem:    Computing the cursor column in validate_cursor_col() is wrong when
-	    line numbers are used and 'n' is not in 'cpoptions', causing the
-	    popup menu to be positioned wrong.
-Solution:   Correctly use the offset. (partly by Dominique Pelle)
-Files:	    src/move.c
-
-
-*** ../vim-7.2.354/src/move.c	2009-11-03 16:22:59.000000000 +0100
---- src/move.c	2010-02-03 17:15:16.000000000 +0100
-***************
-*** 889,894 ****
---- 889,895 ----
-  {
-      colnr_T off;
-      colnr_T col;
-+     int     width;
-  
-      validate_virtcol();
-      if (!(curwin->w_valid & VALID_WCOL))
-***************
-*** 896,910 ****
-  	col = curwin->w_virtcol;
-  	off = curwin_col_off();
-  	col += off;
-  
-  	/* long line wrapping, adjust curwin->w_wrow */
-  	if (curwin->w_p_wrap
-  		&& col >= (colnr_T)W_WIDTH(curwin)
-! 		&& W_WIDTH(curwin) - off + curwin_col_off2() > 0)
-! 	{
-! 	    col -= W_WIDTH(curwin);
-! 	    col = col % (W_WIDTH(curwin) - off + curwin_col_off2());
-! 	}
-  	if (col > (int)curwin->w_leftcol)
-  	    col -= curwin->w_leftcol;
-  	else
---- 897,910 ----
-  	col = curwin->w_virtcol;
-  	off = curwin_col_off();
-  	col += off;
-+ 	width = W_WIDTH(curwin) - off + curwin_col_off2();
-  
-  	/* long line wrapping, adjust curwin->w_wrow */
-  	if (curwin->w_p_wrap
-  		&& col >= (colnr_T)W_WIDTH(curwin)
-! 		&& width > 0)
-! 	    /* use same formula as what is used in curs_columns() */
-! 	    col -= ((col - W_WIDTH(curwin)) / width + 1) * width;
-  	if (col > (int)curwin->w_leftcol)
-  	    col -= curwin->w_leftcol;
-  	else
-***************
-*** 1041,1046 ****
---- 1041,1047 ----
-  	/* long line wrapping, adjust curwin->w_wrow */
-  	if (curwin->w_wcol >= W_WIDTH(curwin))
-  	{
-+ 	    /* this same formula is used in validate_cursor_col() */
-  	    n = (curwin->w_wcol - W_WIDTH(curwin)) / width + 1;
-  	    curwin->w_wcol -= n * width;
-  	    curwin->w_wrow += n;
-*** ../vim-7.2.354/src/version.c	2010-02-03 15:47:59.000000000 +0100
---- src/version.c	2010-02-03 17:40:39.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     355,
-  /**/
-
--- 
-I'm in shape.  Round IS a shape.
-
- /// 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.356 b/source/ap/vim/patches/7.2.356
deleted file mode 100644
index 51b646cd..00000000
--- a/source/ap/vim/patches/7.2.356
+++ /dev/null
@@ -1,69 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.356
-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.356
-Problem:    When 'foldmethod' is changed not all folds are closed as expected.
-Solution:   In foldUpdate() correct the start position and reset fd_flags when
-	    w_foldinvalid is set. (Lech Lorens)
-Files:	    src/fold.c
-
-
-*** ../vim-7.2.355/src/fold.c	2010-01-19 17:24:20.000000000 +0100
---- src/fold.c	2010-02-03 18:08:11.000000000 +0100
-***************
-*** 849,859 ****
-      fold_T	*fp;
-  
-      /* Mark all folds from top to bot as maybe-small. */
-!     (void)foldFind(&curwin->w_folds, curwin->w_cursor.lnum, &fp);
-      while (fp < (fold_T *)curwin->w_folds.ga_data + curwin->w_folds.ga_len
-  	    && fp->fd_top < bot)
-      {
-  	fp->fd_small = MAYBE;
-  	++fp;
-      }
-  
---- 849,865 ----
-      fold_T	*fp;
-  
-      /* Mark all folds from top to bot as maybe-small. */
-!     (void)foldFind(&curwin->w_folds, top, &fp);
-      while (fp < (fold_T *)curwin->w_folds.ga_data + curwin->w_folds.ga_len
-  	    && fp->fd_top < bot)
-      {
-  	fp->fd_small = MAYBE;
-+ 
-+ 	/* Not sure if this is the right place to reset fd_flags (suggested by
-+ 	 * Lech Lorens). */
-+         if (wp->w_foldinvalid)
-+             fp->fd_flags = FD_LEVEL;
-+ 
-  	++fp;
-      }
-  
-*** ../vim-7.2.355/src/version.c	2010-02-03 17:42:59.000000000 +0100
---- src/version.c	2010-02-03 18:12:34.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     356,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-190. You quickly hand over your wallet, leather jacket, and car keys
-     during a mugging, then proceed to beat the crap out of your
-     assailant when he asks for 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.357 b/source/ap/vim/patches/7.2.357
deleted file mode 100644
index e1998a8f..00000000
--- a/source/ap/vim/patches/7.2.357
+++ /dev/null
@@ -1,49 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.357
-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.357
-Problem:    When changing 'fileformat' from/to "mac" and there is a CR in the
-	    text the display is wrong.
-Solution:   Redraw the text when 'fileformat' is changed. (Ben Schmidt)
-Files:	    src/option.c
-
-
-*** ../vim-7.2.356/src/option.c	2010-01-27 15:57:17.000000000 +0100
---- src/option.c	2010-02-11 16:57:19.000000000 +0100
-***************
-*** 5867,5872 ****
---- 5867,5876 ----
-  #endif
-  	    /* update flag in swap file */
-  	    ml_setflags(curbuf);
-+ 	    /* Redraw needed when switching to/from "mac": a CR in the text
-+ 	     * will be displayed differently. */
-+ 	    if (get_fileformat(curbuf) == EOL_MAC || *oldval == 'm')
-+ 		redraw_curbuf_later(NOT_VALID);
-  	}
-      }
-  
-*** ../vim-7.2.356/src/version.c	2010-02-03 18:14:41.000000000 +0100
---- src/version.c	2010-02-11 17:01:36.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     357,
-  /**/
-
--- 
-From the classified section of a city newspaper:
-Dog for sale: eats anything and is fond of children.
-
- /// 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.358 b/source/ap/vim/patches/7.2.358
deleted file mode 100644
index 524049d6..00000000
--- a/source/ap/vim/patches/7.2.358
+++ /dev/null
@@ -1,78 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.358
-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.358
-Problem:    Compiler warnings on VMS. (Zoltan Arpadffy)
-Solution:   Pass array itself instead its address.  Return a value.
-Files:	    src/gui_gtk_x11.c, src/os_unix.c
-
-
-*** ../vim-7.2.357/src/gui_gtk_x11.c	2009-11-03 18:13:36.000000000 +0100
---- src/gui_gtk_x11.c	2010-02-11 18:00:28.000000000 +0100
-***************
-*** 6190,6196 ****
-  		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;
---- 6190,6196 ----
-  		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;
-*** ../vim-7.2.357/src/os_unix.c	2009-07-22 13:27:50.000000000 +0200
---- src/os_unix.c	2010-02-11 18:10:20.000000000 +0100
-***************
-*** 1471,1476 ****
---- 1471,1479 ----
-  {
-      /* This function should not return, it causes exit().  Longjump instead. */
-      LONGJMP(lc_jump_env, 1);
-+ #  ifdef VMS
-+     return 0;  /* avoid the compiler complains about missing return value */
-+ #  endif
-  }
-  # endif
-  
-***************
-*** 1490,1495 ****
---- 1493,1501 ----
-  
-      /* This function should not return, it causes exit().  Longjump instead. */
-      LONGJMP(x_jump_env, 1);
-+ # ifdef VMS
-+     return 0;  /* avoid the compiler complains about missing return value */
-+ # endif
-  }
-  #endif
-  
-*** ../vim-7.2.357/src/version.c	2010-02-11 17:02:04.000000000 +0100
---- src/version.c	2010-02-11 18:10:45.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     358,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-221. Your wife melts your keyboard in the oven.
-
- /// 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.359 b/source/ap/vim/patches/7.2.359
deleted file mode 100644
index eb7ade2a..00000000
--- a/source/ap/vim/patches/7.2.359
+++ /dev/null
@@ -1,68 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.359
-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.359
-Problem:    Crash when using the Netbeans join command.
-Solution:   Make sure the ml_flush_line() function is not used recursively.
-	    (Xavier de Gaye)
-Files:	    src/memline.c
-
-
-*** ../vim-7.2.358/src/memline.c	2009-11-17 17:13:03.000000000 +0100
---- src/memline.c	2010-02-11 18:47:48.000000000 +0100
-***************
-*** 3087,3098 ****
---- 3087,3105 ----
-      int		start;
-      int		count;
-      int		i;
-+     static int  entered = FALSE;
-  
-      if (buf->b_ml.ml_line_lnum == 0 || buf->b_ml.ml_mfp == NULL)
-  	return;		/* nothing to do */
-  
-      if (buf->b_ml.ml_flags & ML_LINE_DIRTY)
-      {
-+ 	/* This code doesn't work recursively, but Netbeans may call back here
-+ 	 * when obtaining the cursor position. */
-+ 	if (entered)
-+ 	    return;
-+ 	entered = TRUE;
-+ 
-  	lnum = buf->b_ml.ml_line_lnum;
-  	new_line = buf->b_ml.ml_line_ptr;
-  
-***************
-*** 3160,3165 ****
---- 3167,3174 ----
-  	    }
-  	}
-  	vim_free(new_line);
-+ 
-+ 	entered = FALSE;
-      }
-  
-      buf->b_ml.ml_line_lnum = 0;
-*** ../vim-7.2.358/src/version.c	2010-02-11 18:19:32.000000000 +0100
---- src/version.c	2010-02-11 18:53:55.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     359,
-  /**/
-
--- 
-Your fault: 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.360 b/source/ap/vim/patches/7.2.360
deleted file mode 100644
index 7cf46205..00000000
--- a/source/ap/vim/patches/7.2.360
+++ /dev/null
@@ -1,96 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.360
-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.360
-Problem:    Ruby on MS-Windows: can't use sockets.
-Solution:   Call NtInitialize() during initialization. (Ariya Mizutani)
-Files:	    src/if_ruby.c
-
-
-*** ../vim-7.2.359/src/if_ruby.c	2009-05-22 18:20:23.000000000 +0200
---- src/if_ruby.c	2010-02-17 15:04:00.000000000 +0100
-***************
-*** 48,53 ****
---- 48,58 ----
-  # endif
-  #endif
-  
-+ /* suggested by Ariya Mizutani */
-+ #if (_MSC_VER == 1200)
-+ # undef _WIN32_WINNT
-+ #endif
-+ 
-  #include <ruby.h>
-  
-  #undef EXTERN
-***************
-*** 132,137 ****
---- 137,143 ----
-  #define ruby_errinfo			(*dll_ruby_errinfo)
-  #define ruby_init			dll_ruby_init
-  #define ruby_init_loadpath		dll_ruby_init_loadpath
-+ #define NtInitialize			dll_NtInitialize
-  #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
-  # define rb_w32_snprintf		dll_rb_w32_snprintf
-  #endif
-***************
-*** 186,191 ****
---- 192,198 ----
-  static VALUE *dll_ruby_errinfo;
-  static void (*dll_ruby_init) (void);
-  static void (*dll_ruby_init_loadpath) (void);
-+ static void (*dll_NtInitialize) (int*, char***);
-  #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
-  static int (*dll_rb_w32_snprintf)(char*, size_t, const char*, ...);
-  #endif
-***************
-*** 248,253 ****
---- 255,261 ----
-      {"ruby_errinfo", (RUBY_PROC*)&dll_ruby_errinfo},
-      {"ruby_init", (RUBY_PROC*)&dll_ruby_init},
-      {"ruby_init_loadpath", (RUBY_PROC*)&dll_ruby_init_loadpath},
-+     {"NtInitialize", (RUBY_PROC*)&dll_NtInitialize},
-  #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
-      {"rb_w32_snprintf", (RUBY_PROC*)&dll_rb_w32_snprintf},
-  #endif
-***************
-*** 414,419 ****
---- 422,433 ----
-  	if (ruby_enabled(TRUE))
-  	{
-  #endif
-+ #ifdef _WIN32
-+ 	    /* suggested by Ariya Mizutani */
-+ 	    int argc = 1;
-+ 	    char *argv[] = {"gvim.exe"};
-+ 	    NtInitialize(&argc, &argv);
-+ #endif
-  	    ruby_init();
-  	    ruby_init_loadpath();
-  	    ruby_io_init();
-*** ../vim-7.2.359/src/version.c	2010-02-11 18:54:38.000000000 +0100
---- src/version.c	2010-02-17 15:10:22.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     360,
-  /**/
-
--- 
-"After a few years of marriage a man can look right at a woman
-without seeing her and a woman can see right through a man
-without looking at him."
- - Helen Rowland
-
- /// 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.361 b/source/ap/vim/patches/7.2.361
deleted file mode 100644
index ddc58579..00000000
--- a/source/ap/vim/patches/7.2.361
+++ /dev/null
@@ -1,763 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.361
-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.361
-Problem:    Ruby 1.9 is not supported.
-Solution:   Add Ruby 1.9 support. (Msaki Suketa)
-Files:	    src/Makefile, src/auto/configure, src/configure.in, src/if_ruby.c
-
-
-*** ../vim-7.2.360/src/Makefile	2010-02-17 15:12:22.000000000 +0100
---- src/Makefile	2010-02-17 16:21:01.000000000 +0100
-***************
-*** 395,401 ****
-  
-  # RUBY
-  # Uncomment this when you want to include the Ruby interface.
-! #CONF_OPT_RUBY = --enable-rubyinterp
-  
-  # MZSCHEME
-  # Uncomment this when you want to include the MzScheme interface.
---- 395,403 ----
-  
-  # RUBY
-  # Uncomment this when you want to include the Ruby interface.
-! # Note: you need the development package (e.g., ruby1.9.1-dev on Ubuntu).
-! # CONF_OPT_RUBY = --enable-rubyinterp
-! # CONF_OPT_RUBY = --enable-rubyinterp --with-ruby-command=ruby1.9.1
-  
-  # MZSCHEME
-  # Uncomment this when you want to include the MzScheme interface.
-*** ../vim-7.2.360/src/auto/configure	2009-12-16 17:14:08.000000000 +0100
---- src/auto/configure	2010-02-17 16:08:59.000000000 +0100
-***************
-*** 793,798 ****
---- 793,799 ----
-  enable_tclinterp
-  with_tclsh
-  enable_rubyinterp
-+ with_ruby_command
-  enable_cscope
-  enable_workshop
-  enable_netbeans
-***************
-*** 1503,1508 ****
---- 1504,1510 ----
-    --with-plthome=PLTHOME   Use PLTHOME.
-    --with-python-config-dir=PATH  Python's config directory
-    --with-tclsh=PATH       which tclsh to use (default: tclsh8.0)
-+   --with-ruby-command=RUBY  name of the Ruby command (default: ruby)
-    --with-x                use the X Window System
-    --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)
-    --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)
-***************
-*** 5703,5711 ****
-  { $as_echo "$as_me:$LINENO: result: $enable_rubyinterp" >&5
-  $as_echo "$enable_rubyinterp" >&6; }
-  if test "$enable_rubyinterp" = "yes"; then
-  
-!   # Extract the first word of "ruby", so it can be a program name with args.
-! set dummy ruby; ac_word=$2
-  { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-  $as_echo_n "checking for $ac_word... " >&6; }
-  if test "${ac_cv_path_vi_cv_path_ruby+set}" = set; then
---- 5705,5725 ----
-  { $as_echo "$as_me:$LINENO: result: $enable_rubyinterp" >&5
-  $as_echo "$enable_rubyinterp" >&6; }
-  if test "$enable_rubyinterp" = "yes"; then
-+   { $as_echo "$as_me:$LINENO: checking --with-ruby-command argument" >&5
-+ $as_echo_n "checking --with-ruby-command argument... " >&6; }
-  
-! # Check whether --with-ruby-command was given.
-! if test "${with_ruby_command+set}" = set; then
-!   withval=$with_ruby_command; RUBY_CMD="$withval"; { $as_echo "$as_me:$LINENO: result: $RUBY_CMD" >&5
-! $as_echo "$RUBY_CMD" >&6; }
-! else
-!   RUBY_CMD="ruby"; { $as_echo "$as_me:$LINENO: result: defaulting to $RUBY_CMD" >&5
-! $as_echo "defaulting to $RUBY_CMD" >&6; }
-! fi
-! 
-! 
-!   # Extract the first word of "$RUBY_CMD", so it can be a program name with args.
-! set dummy $RUBY_CMD; ac_word=$2
-  { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-  $as_echo_n "checking for $ac_word... " >&6; }
-  if test "${ac_cv_path_vi_cv_path_ruby+set}" = set; then
-***************
-*** 5752,5762 ****
-  $as_echo "OK" >&6; }
-        { $as_echo "$as_me:$LINENO: checking Ruby header files" >&5
-  $as_echo_n "checking Ruby header files... " >&6; }
-!       rubyhdrdir=`$vi_cv_path_ruby -r mkmf -e 'print Config::CONFIG["archdir"] || $hdrdir' 2>/dev/null`
-        if test "X$rubyhdrdir" != "X"; then
-  	{ $as_echo "$as_me:$LINENO: result: $rubyhdrdir" >&5
-  $as_echo "$rubyhdrdir" >&6; }
-  	RUBY_CFLAGS="-I$rubyhdrdir"
-  	rubylibs=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["LIBS"]'`
-  	if test "X$rubylibs" != "X"; then
-  	  RUBY_LIBS="$rubylibs"
---- 5766,5782 ----
-  $as_echo "OK" >&6; }
-        { $as_echo "$as_me:$LINENO: checking Ruby header files" >&5
-  $as_echo_n "checking Ruby header files... " >&6; }
-!       rubyhdrdir=`$vi_cv_path_ruby -r mkmf -e 'print Config::CONFIG["rubyhdrdir"] || Config::CONFIG["archdir"] || $hdrdir' 2>/dev/null`
-        if test "X$rubyhdrdir" != "X"; then
-  	{ $as_echo "$as_me:$LINENO: result: $rubyhdrdir" >&5
-  $as_echo "$rubyhdrdir" >&6; }
-  	RUBY_CFLAGS="-I$rubyhdrdir"
-+         rubyarch=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["arch"]'`
-+         if test -d "$rubyhdrdir/$rubyarch"; then
-+           RUBY_CFLAGS="$RUBY_CFLAGS -I$rubyhdrdir/$rubyarch"
-+         fi
-+         rubyversion=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["ruby_version"].gsub(/\./, "")[0,2]'`
-+         RUBY_CFLAGS="$RUBY_CFLAGS -DRUBY_VERSION=$rubyversion"
-  	rubylibs=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["LIBS"]'`
-  	if test "X$rubylibs" != "X"; then
-  	  RUBY_LIBS="$rubylibs"
-***************
-*** 5793,5800 ****
-  _ACEOF
-  
-        else
-! 	{ $as_echo "$as_me:$LINENO: result: not found" >&5
-! $as_echo "not found" >&6; }
-        fi
-      else
-        { $as_echo "$as_me:$LINENO: result: too old; need Ruby version 1.6.0 or later" >&5
---- 5813,5820 ----
-  _ACEOF
-  
-        else
-! 	{ $as_echo "$as_me:$LINENO: result: not found; disabling Ruby" >&5
-! $as_echo "not found; disabling Ruby" >&6; }
-        fi
-      else
-        { $as_echo "$as_me:$LINENO: result: too old; need Ruby version 1.6.0 or later" >&5
-*** ../vim-7.2.360/src/configure.in	2009-12-16 17:14:08.000000000 +0100
---- src/configure.in	2010-02-17 16:00:58.000000000 +0100
-***************
-*** 949,965 ****
-  	[enable_rubyinterp="no"])
-  AC_MSG_RESULT($enable_rubyinterp)
-  if test "$enable_rubyinterp" = "yes"; then
-    AC_SUBST(vi_cv_path_ruby)
-!   AC_PATH_PROG(vi_cv_path_ruby, ruby)
-    if test "X$vi_cv_path_ruby" != "X"; then
-      AC_MSG_CHECKING(Ruby version)
-      if $vi_cv_path_ruby -e '(VERSION rescue RUBY_VERSION) >= "1.6.0" or exit 1' >/dev/null 2>/dev/null; then
-        AC_MSG_RESULT(OK)
-        AC_MSG_CHECKING(Ruby header files)
-!       rubyhdrdir=`$vi_cv_path_ruby -r mkmf -e 'print Config::CONFIG[["archdir"]] || $hdrdir' 2>/dev/null`
-        if test "X$rubyhdrdir" != "X"; then
-  	AC_MSG_RESULT($rubyhdrdir)
-  	RUBY_CFLAGS="-I$rubyhdrdir"
-  	rubylibs=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG[["LIBS"]]'`
-  	if test "X$rubylibs" != "X"; then
-  	  RUBY_LIBS="$rubylibs"
---- 949,975 ----
-  	[enable_rubyinterp="no"])
-  AC_MSG_RESULT($enable_rubyinterp)
-  if test "$enable_rubyinterp" = "yes"; then
-+   AC_MSG_CHECKING(--with-ruby-command argument)
-+   AC_ARG_WITH(ruby-command, [  --with-ruby-command=RUBY  name of the Ruby command (default: ruby)],
-+ 	RUBY_CMD="$withval"; AC_MSG_RESULT($RUBY_CMD),
-+ 	RUBY_CMD="ruby"; AC_MSG_RESULT(defaulting to $RUBY_CMD))
-    AC_SUBST(vi_cv_path_ruby)
-!   AC_PATH_PROG(vi_cv_path_ruby, $RUBY_CMD)
-    if test "X$vi_cv_path_ruby" != "X"; then
-      AC_MSG_CHECKING(Ruby version)
-      if $vi_cv_path_ruby -e '(VERSION rescue RUBY_VERSION) >= "1.6.0" or exit 1' >/dev/null 2>/dev/null; then
-        AC_MSG_RESULT(OK)
-        AC_MSG_CHECKING(Ruby header files)
-!       rubyhdrdir=`$vi_cv_path_ruby -r mkmf -e 'print Config::CONFIG[["rubyhdrdir"]] || Config::CONFIG[["archdir"]] || $hdrdir' 2>/dev/null`
-        if test "X$rubyhdrdir" != "X"; then
-  	AC_MSG_RESULT($rubyhdrdir)
-  	RUBY_CFLAGS="-I$rubyhdrdir"
-+         rubyarch=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG[["arch"]]'`
-+         if test -d "$rubyhdrdir/$rubyarch"; then
-+           RUBY_CFLAGS="$RUBY_CFLAGS -I$rubyhdrdir/$rubyarch"
-+         fi
-+         rubyversion=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG[["ruby_version"]].gsub(/\./, "")[[0,2]]'`
-+         RUBY_CFLAGS="$RUBY_CFLAGS -DRUBY_VERSION=$rubyversion"
-  	rubylibs=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG[["LIBS"]]'`
-  	if test "X$rubylibs" != "X"; then
-  	  RUBY_LIBS="$rubylibs"
-***************
-*** 997,1003 ****
-  	RUBY_PRO="if_ruby.pro"
-  	AC_DEFINE(FEAT_RUBY)
-        else
-! 	AC_MSG_RESULT(not found, disabling Ruby)
-        fi
-      else
-        AC_MSG_RESULT(too old; need Ruby version 1.6.0 or later)
---- 1007,1013 ----
-  	RUBY_PRO="if_ruby.pro"
-  	AC_DEFINE(FEAT_RUBY)
-        else
-! 	AC_MSG_RESULT(not found; disabling Ruby)
-        fi
-      else
-        AC_MSG_RESULT(too old; need Ruby version 1.6.0 or later)
-*** ../vim-7.2.360/src/if_ruby.c	2010-02-17 15:11:35.000000000 +0100
---- src/if_ruby.c	2010-02-17 16:08:47.000000000 +0100
-***************
-*** 54,59 ****
---- 54,62 ----
-  #endif
-  
-  #include <ruby.h>
-+ #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
-+ # include <ruby/encoding.h>
-+ #endif
-  
-  #undef EXTERN
-  #undef _
-***************
-*** 65,70 ****
---- 68,95 ----
-  # define __OPENTRANSPORTPROVIDERS__
-  #endif
-  
-+ /*
-+  * Backward compatiblity for Ruby 1.8 and earlier.
-+  * Ruby 1.9 does not provide STR2CSTR, instead StringValuePtr is provided.
-+  * Ruby 1.9 does not provide RXXX(s)->len and RXXX(s)->ptr, instead
-+  * RXXX_LEN(s) and RXXX_PTR(s) are provided.
-+  */
-+ #ifndef StringValuePtr
-+ # define StringValuePtr(s) STR2CSTR(s)
-+ #endif
-+ #ifndef RARRAY_LEN
-+ # define RARRAY_LEN(s) RARRAY(s)->len
-+ #endif
-+ #ifndef RARRAY_PTR
-+ # define RARRAY_PTR(s) RARRAY(s)->ptr
-+ #endif
-+ #ifndef RSTRING_LEN
-+ # define RSTRING_LEN(s) RSTRING(s)->len
-+ #endif
-+ #ifndef RSTRING_PTR
-+ # define RSTRING_PTR(s) RSTRING(s)->ptr
-+ #endif
-+ 
-  #include "vim.h"
-  #include "version.h"
-  
-***************
-*** 134,140 ****
-  #define rb_str_concat			dll_rb_str_concat
-  #define rb_str_new			dll_rb_str_new
-  #define rb_str_new2			dll_rb_str_new2
-! #define ruby_errinfo			(*dll_ruby_errinfo)
-  #define ruby_init			dll_ruby_init
-  #define ruby_init_loadpath		dll_ruby_init_loadpath
-  #define NtInitialize			dll_NtInitialize
---- 159,169 ----
-  #define rb_str_concat			dll_rb_str_concat
-  #define rb_str_new			dll_rb_str_new
-  #define rb_str_new2			dll_rb_str_new2
-! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
-! # define rb_errinfo			dll_rb_errinfo
-! #else
-! # define ruby_errinfo			(*dll_ruby_errinfo)
-! #endif
-  #define ruby_init			dll_ruby_init
-  #define ruby_init_loadpath		dll_ruby_init_loadpath
-  #define NtInitialize			dll_NtInitialize
-***************
-*** 142,147 ****
---- 171,184 ----
-  # define rb_w32_snprintf		dll_rb_w32_snprintf
-  #endif
-  
-+ #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
-+ # define ruby_script			dll_ruby_script
-+ # define rb_enc_find_index		dll_rb_enc_find_index
-+ # define rb_enc_find			dll_rb_enc_find
-+ # define rb_enc_str_new			dll_rb_enc_str_new
-+ # define rb_sprintf			dll_rb_sprintf
-+ #endif
-+ 
-  /*
-   * Pointers for dynamic link
-   */
-***************
-*** 189,195 ****
---- 226,236 ----
-  static VALUE (*dll_rb_str_concat) (VALUE, VALUE);
-  static VALUE (*dll_rb_str_new) (const char*, long);
-  static VALUE (*dll_rb_str_new2) (const char*);
-+ #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
-+ static VALUE (*dll_rb_errinfo) (void);
-+ #else
-  static VALUE *dll_ruby_errinfo;
-+ #endif
-  static void (*dll_ruby_init) (void);
-  static void (*dll_ruby_init_loadpath) (void);
-  static void (*dll_NtInitialize) (int*, char***);
-***************
-*** 197,202 ****
---- 238,251 ----
-  static int (*dll_rb_w32_snprintf)(char*, size_t, const char*, ...);
-  #endif
-  
-+ #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
-+ static void (*dll_ruby_script) (const char*);
-+ static int (*dll_rb_enc_find_index) (const char*);
-+ static rb_encoding* (*dll_rb_enc_find) (const char*);
-+ static VALUE (*dll_rb_enc_str_new) (const char*, long, rb_encoding*);
-+ static VALUE (*dll_rb_sprintf) (const char*, ...);
-+ #endif
-+ 
-  static HINSTANCE hinstRuby = 0; /* Instance of ruby.dll */
-  
-  /*
-***************
-*** 252,264 ****
---- 301,324 ----
-      {"rb_str_concat", (RUBY_PROC*)&dll_rb_str_concat},
-      {"rb_str_new", (RUBY_PROC*)&dll_rb_str_new},
-      {"rb_str_new2", (RUBY_PROC*)&dll_rb_str_new2},
-+ #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
-+     {"rb_errinfo", (RUBY_PROC*)&dll_rb_errinfo},
-+ #else
-      {"ruby_errinfo", (RUBY_PROC*)&dll_ruby_errinfo},
-+ #endif
-      {"ruby_init", (RUBY_PROC*)&dll_ruby_init},
-      {"ruby_init_loadpath", (RUBY_PROC*)&dll_ruby_init_loadpath},
-      {"NtInitialize", (RUBY_PROC*)&dll_NtInitialize},
-  #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
-      {"rb_w32_snprintf", (RUBY_PROC*)&dll_rb_w32_snprintf},
-  #endif
-+ #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
-+     {"ruby_script", (RUBY_PROC*)&dll_ruby_script},
-+     {"rb_enc_find_index", (RUBY_PROC*)&dll_rb_enc_find_index},
-+     {"rb_enc_find", (RUBY_PROC*)&dll_rb_enc_find},
-+     {"rb_enc_str_new", (RUBY_PROC*)&dll_rb_enc_str_new},
-+     {"rb_sprintf", (RUBY_PROC*)&dll_rb_sprintf},
-+ #endif
-      {"", NULL},
-  };
-  
-***************
-*** 348,353 ****
---- 408,465 ----
-      vim_free(script);
-  }
-  
-+ /*
-+  *  In Ruby 1.9 or later, ruby String object has encoding.
-+  *  conversion buffer string of vim to ruby String object using
-+  *  VIM encoding option.
-+  */
-+     static VALUE
-+ vim_str2rb_enc_str(const char *s)
-+ {
-+ #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
-+     int isnum;
-+     long lval;
-+     char_u *sval;
-+     rb_encoding *enc;
-+ 
-+     isnum = get_option_value((char_u *)"enc", &lval, &sval, 0);
-+     if (isnum == 0)
-+     {
-+ 	enc = rb_enc_find((char *)sval);
-+ 	vim_free(sval);
-+ 	if (enc) {
-+ 	    return rb_enc_str_new(s, strlen(s), enc);
-+ 	}
-+     }
-+ #endif
-+     return rb_str_new2(s);
-+ }
-+ 
-+     static VALUE
-+ eval_enc_string_protect(const char *str, int *state)
-+ {
-+ #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
-+     int isnum;
-+     long lval;
-+     char_u *sval;
-+     rb_encoding *enc;
-+     VALUE v;
-+ 
-+     isnum = get_option_value((char_u *)"enc", &lval, &sval, 0);
-+     if (isnum == 0)
-+     {
-+ 	enc = rb_enc_find((char *)sval);
-+ 	vim_free(sval);
-+ 	if (enc)
-+ 	{
-+ 	    v = rb_sprintf("#-*- coding:%s -*-\n%s", rb_enc_name(enc), str);
-+ 	    return rb_eval_string_protect(StringValuePtr(v), state);
-+ 	}
-+     }
-+ #endif
-+     return rb_eval_string_protect(str, state);
-+ }
-+ 
-  void ex_rubydo(exarg_T *eap)
-  {
-      int state;
-***************
-*** 360,368 ****
-  	for (i = eap->line1; i <= eap->line2; i++) {
-  	    VALUE line, oldline;
-  
-! 	    line = oldline = rb_str_new2((char *)ml_get(i));
-  	    rb_lastline_set(line);
-! 	    rb_eval_string_protect((char *) eap->arg, &state);
-  	    if (state) {
-  		error_print(state);
-  		break;
---- 472,480 ----
-  	for (i = eap->line1; i <= eap->line2; i++) {
-  	    VALUE line, oldline;
-  
-! 	    line = oldline = vim_str2rb_enc_str((char *)ml_get(i));
-  	    rb_lastline_set(line);
-! 	    eval_enc_string_protect((char *) eap->arg, &state);
-  	    if (state) {
-  		error_print(state);
-  		break;
-***************
-*** 373,379 ****
-  		    EMSG(_("E265: $_ must be an instance of String"));
-  		    return;
-  		}
-! 		ml_replace(i, (char_u *) STR2CSTR(line), 1);
-  		changed();
-  #ifdef SYNTAX_HL
-  		syn_changed(i); /* recompute syntax hl. for this line */
---- 485,491 ----
-  		    EMSG(_("E265: $_ must be an instance of String"));
-  		    return;
-  		}
-! 		ml_replace(i, (char_u *) StringValuePtr(line), 1);
-  		changed();
-  #ifdef SYNTAX_HL
-  		syn_changed(i); /* recompute syntax hl. for this line */
-***************
-*** 428,436 ****
---- 540,557 ----
-  	    char *argv[] = {"gvim.exe"};
-  	    NtInitialize(&argc, &argv);
-  #endif
-+ #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
-+ 	    RUBY_INIT_STACK;
-+ #endif
-  	    ruby_init();
-+ #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
-+ 	    ruby_script("vim-ruby");
-+ #endif
-  	    ruby_init_loadpath();
-  	    ruby_io_init();
-+ #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
-+ 	    rb_enc_find_index("encdb");
-+ #endif
-  	    ruby_vim_init();
-  	    ruby_initialized = 1;
-  #ifdef DYNAMIC_RUBY
-***************
-*** 448,455 ****
---- 569,578 ----
-  static void error_print(int state)
-  {
-  #ifndef DYNAMIC_RUBY
-+ #if !(defined(RUBY_VERSION) &&  RUBY_VERSION >= 19)
-      RUBYEXTERN VALUE ruby_errinfo;
-  #endif
-+ #endif
-      VALUE eclass;
-      VALUE einfo;
-      char buff[BUFSIZ];
-***************
-*** 482,490 ****
-  	break;
-      case TAG_RAISE:
-      case TAG_FATAL:
-  	eclass = CLASS_OF(ruby_errinfo);
-  	einfo = rb_obj_as_string(ruby_errinfo);
-! 	if (eclass == rb_eRuntimeError && RSTRING(einfo)->len == 0) {
-  	    EMSG(_("E272: unhandled exception"));
-  	}
-  	else {
---- 605,618 ----
-  	break;
-      case TAG_RAISE:
-      case TAG_FATAL:
-+ #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
-+ 	eclass = CLASS_OF(rb_errinfo());
-+ 	einfo = rb_obj_as_string(rb_errinfo());
-+ #else
-  	eclass = CLASS_OF(ruby_errinfo);
-  	einfo = rb_obj_as_string(ruby_errinfo);
-! #endif
-! 	if (eclass == rb_eRuntimeError && RSTRING_LEN(einfo) == 0) {
-  	    EMSG(_("E272: unhandled exception"));
-  	}
-  	else {
-***************
-*** 493,499 ****
-  
-  	    epath = rb_class_path(eclass);
-  	    vim_snprintf(buff, BUFSIZ, "%s: %s",
-! 		     RSTRING(epath)->ptr, RSTRING(einfo)->ptr);
-  	    p = strchr(buff, '\n');
-  	    if (p) *p = '\0';
-  	    EMSG(buff);
---- 621,627 ----
-  
-  	    epath = rb_class_path(eclass);
-  	    vim_snprintf(buff, BUFSIZ, "%s: %s",
-! 		     RSTRING_PTR(epath), RSTRING_PTR(einfo));
-  	    p = strchr(buff, '\n');
-  	    if (p) *p = '\0';
-  	    EMSG(buff);
-***************
-*** 511,518 ****
-      char *buff, *p;
-  
-      str = rb_obj_as_string(str);
-!     buff = ALLOCA_N(char, RSTRING(str)->len);
-!     strcpy(buff, RSTRING(str)->ptr);
-      p = strchr(buff, '\n');
-      if (p) *p = '\0';
-      MSG(buff);
---- 639,646 ----
-      char *buff, *p;
-  
-      str = rb_obj_as_string(str);
-!     buff = ALLOCA_N(char, RSTRING_LEN(str));
-!     strcpy(buff, RSTRING_PTR(str));
-      p = strchr(buff, '\n');
-      if (p) *p = '\0';
-      MSG(buff);
-***************
-*** 521,541 ****
-  
-  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);
-  
-      if (value != NULL)
-      {
---- 649,669 ----
-  
-  static VALUE vim_set_option(VALUE self UNUSED, VALUE str)
-  {
-!     do_set((char_u *)StringValuePtr(str), 0);
-      update_screen(NOT_VALID);
-      return Qnil;
-  }
-  
-  static VALUE vim_command(VALUE self UNUSED, VALUE str)
-  {
-!     do_cmdline_cmd((char_u *)StringValuePtr(str));
-      return Qnil;
-  }
-  
-  static VALUE vim_evaluate(VALUE self UNUSED, VALUE str)
-  {
-  #ifdef FEAT_EVAL
-!     char_u *value = eval_to_string((char_u *)StringValuePtr(str), NULL, TRUE);
-  
-      if (value != NULL)
-      {
-***************
-*** 640,648 ****
-      if (n > 0 && n <= buf->b_ml.ml_line_count)
-      {
-  	char *line = (char *)ml_get_buf(buf, n, FALSE);
-! 	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
---- 768,776 ----
-      if (n > 0 && n <= buf->b_ml.ml_line_count)
-      {
-  	char *line = (char *)ml_get_buf(buf, n, FALSE);
-! 	return line ? vim_str2rb_enc_str(line) : Qnil;
-      }
-!     rb_raise(rb_eIndexError, "line number %ld out of range", (long)n);
-  #ifndef __GNUC__
-      return Qnil; /* For stop warning */
-  #endif
-***************
-*** 659,665 ****
-  
-  static VALUE set_buffer_line(buf_T *buf, linenr_T n, VALUE str)
-  {
-!     char	*line = STR2CSTR(str);
-      aco_save_T	aco;
-  
-      if (n > 0 && n <= buf->b_ml.ml_line_count && line != NULL)
---- 787,793 ----
-  
-  static VALUE set_buffer_line(buf_T *buf, linenr_T n, VALUE str)
-  {
-!     char	*line = StringValuePtr(str);
-      aco_save_T	aco;
-  
-      if (n > 0 && n <= buf->b_ml.ml_line_count && line != NULL)
-***************
-*** 683,689 ****
-      }
-      else
-      {
-! 	rb_raise(rb_eIndexError, "index %d out of buffer", n);
-  #ifndef __GNUC__
-  	return Qnil; /* For stop warning */
-  #endif
---- 811,817 ----
-      }
-      else
-      {
-! 	rb_raise(rb_eIndexError, "line number %ld out of range", (long)n);
-  #ifndef __GNUC__
-  	return Qnil; /* For stop warning */
-  #endif
-***************
-*** 729,735 ****
-      }
-      else
-      {
-! 	rb_raise(rb_eIndexError, "index %d out of buffer", n);
-      }
-      return Qnil;
-  }
---- 857,863 ----
-      }
-      else
-      {
-! 	rb_raise(rb_eIndexError, "line number %ld out of range", n);
-      }
-      return Qnil;
-  }
-***************
-*** 737,747 ****
-  static VALUE buffer_append(VALUE self, VALUE num, VALUE str)
-  {
-      buf_T	*buf = get_buf(self);
-!     char	*line = STR2CSTR(str);
-      long	n = NUM2LONG(num);
-      aco_save_T	aco;
-  
-!     if (n >= 0 && n <= buf->b_ml.ml_line_count && line != NULL)
-      {
-  	/* set curwin/curbuf for "buf" and save some things */
-  	aucmd_prepbuf(&aco, buf);
---- 865,878 ----
-  static VALUE buffer_append(VALUE self, VALUE num, VALUE str)
-  {
-      buf_T	*buf = get_buf(self);
-!     char	*line = StringValuePtr(str);
-      long	n = NUM2LONG(num);
-      aco_save_T	aco;
-  
-!     if (line != NULL) {
-! 	rb_raise(rb_eIndexError, "NULL line");
-!     }
-!     else if (n >= 0 && n <= buf->b_ml.ml_line_count)
-      {
-  	/* set curwin/curbuf for "buf" and save some things */
-  	aucmd_prepbuf(&aco, buf);
-***************
-*** 763,769 ****
-  	update_curbuf(NOT_VALID);
-      }
-      else {
-! 	rb_raise(rb_eIndexError, "index %d out of buffer", n);
-      }
-      return str;
-  }
---- 894,900 ----
-  	update_curbuf(NOT_VALID);
-      }
-      else {
-! 	rb_raise(rb_eIndexError, "line number %ld out of range", n);
-      }
-      return str;
-  }
-***************
-*** 904,913 ****
-      win_T *win = get_win(self);
-  
-      Check_Type(pos, T_ARRAY);
-!     if (RARRAY(pos)->len != 2)
-  	rb_raise(rb_eArgError, "array length must be 2");
-!     lnum = RARRAY(pos)->ptr[0];
-!     col = RARRAY(pos)->ptr[1];
-      win->w_cursor.lnum = NUM2LONG(lnum);
-      win->w_cursor.col = NUM2UINT(col);
-      check_cursor();		    /* put cursor on an existing line */
---- 1035,1044 ----
-      win_T *win = get_win(self);
-  
-      Check_Type(pos, T_ARRAY);
-!     if (RARRAY_LEN(pos) != 2)
-  	rb_raise(rb_eArgError, "array length must be 2");
-!     lnum = RARRAY_PTR(pos)[0];
-!     col = RARRAY_PTR(pos)[1];
-      win->w_cursor.lnum = NUM2LONG(lnum);
-      win->w_cursor.col = NUM2UINT(col);
-      check_cursor();		    /* put cursor on an existing line */
-***************
-*** 924,930 ****
-  	if (i > 0) rb_str_cat(str, ", ", 2);
-  	rb_str_concat(str, rb_inspect(argv[i]));
-      }
-!     MSG(RSTRING(str)->ptr);
-      return Qnil;
-  }
-  
---- 1055,1061 ----
-  	if (i > 0) rb_str_cat(str, ", ", 2);
-  	rb_str_concat(str, rb_inspect(argv[i]));
-      }
-!     MSG(RSTRING_PTR(str));
-      return Qnil;
-  }
-  
-*** ../vim-7.2.360/src/version.c	2010-02-17 15:11:35.000000000 +0100
---- src/version.c	2010-02-17 15:59:12.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     361,
-  /**/
-
--- 
-"Marriage is when a man and woman become as one; the trouble starts
-when they try to decide which one"
-
- /// 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.362 b/source/ap/vim/patches/7.2.362
deleted file mode 100644
index 2f62cf62..00000000
--- a/source/ap/vim/patches/7.2.362
+++ /dev/null
@@ -1,95 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.362 (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.362 (extra, after 7.2.352)
-Problem:    Win64: Vim doesn't work when cross-compiled with MingW libraries.
-Solution:   Instead of handling WM_NCCREATE, create wide text area window
-            class if the parent window iw side. (Sergey Khorev)
-Files:      src/gui_w32.c, src/gui_w48.c
-
-
-*** ../vim-7.2.361/src/gui_w32.c	2009-12-24 16:11:24.000000000 +0100
---- src/gui_w32.c	2010-02-17 16:26:58.000000000 +0100
-***************
-*** 1329,1334 ****
---- 1329,1335 ----
-      WNDCLASS wndclass;
-  #ifdef FEAT_MBYTE
-      const WCHAR szVimWndClassW[] = VIM_CLASSW;
-+     const WCHAR szTextAreaClassW[] = L"VimTextArea";
-      WNDCLASSW wndclassw;
-  #endif
-  #ifdef GLOBAL_IME
-***************
-*** 1479,1484 ****
---- 1480,1507 ----
-  #endif
-  
-      /* Create the text area window */
-+ #ifdef FEAT_MBYTE
-+     if (wide_WindowProc)
-+     {
-+ 	if (GetClassInfoW(s_hinst, szTextAreaClassW, &wndclassw) == 0)
-+ 	{
-+ 	    wndclassw.style = CS_OWNDC;
-+ 	    wndclassw.lpfnWndProc = _TextAreaWndProc;
-+ 	    wndclassw.cbClsExtra = 0;
-+ 	    wndclassw.cbWndExtra = 0;
-+ 	    wndclassw.hInstance = s_hinst;
-+ 	    wndclassw.hIcon = NULL;
-+ 	    wndclassw.hCursor = LoadCursor(NULL, IDC_ARROW);
-+ 	    wndclassw.hbrBackground = NULL;
-+ 	    wndclassw.lpszMenuName = NULL;
-+ 	    wndclassw.lpszClassName = szTextAreaClassW;
-+ 
-+ 	    if (RegisterClassW(&wndclassw) == 0)
-+ 		return FAIL;
-+ 	}
-+     }
-+     else
-+ #endif
-      if (GetClassInfo(s_hinst, szTextAreaClass, &wndclass) == 0)
-      {
-  	wndclass.style = CS_OWNDC;
-*** ../vim-7.2.361/src/gui_w48.c	2010-02-03 12:23:16.000000000 +0100
---- src/gui_w48.c	2010-02-17 16:27:21.000000000 +0100
-***************
-*** 1084,1096 ****
-  	case WM_NOTIFY: Handle_WM_Notify(hwnd, (LPNMHDR)lParam);
-  	    return TRUE;
-  #endif
-- 	/* Workaround for the problem that MyWindowProc() returns FALSE on 64
-- 	 * bit windows when cross-compiled using Mingw libraries. (Andy
-- 	 * Kittner) */
-- 	case WM_NCCREATE:
-- 	    MyWindowProc(hwnd, uMsg, wParam, lParam);
-- 	    return TRUE;
-- 
-  	default:
-  	    return MyWindowProc(hwnd, uMsg, wParam, lParam);
-      }
---- 1084,1089 ----
-*** ../vim-7.2.361/src/version.c	2010-02-17 16:23:03.000000000 +0100
---- src/version.c	2010-02-17 16:30:52.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     362,
-  /**/
-
--- 
-"Marriage is the process of finding out what kind of man your wife
-would have preferred"
-
- /// 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.363 b/source/ap/vim/patches/7.2.363
deleted file mode 100644
index 2447103b..00000000
--- a/source/ap/vim/patches/7.2.363
+++ /dev/null
@@ -1,70 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.363
-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.363
-Problem:    Can't dynamically load Perl 5.10.
-Solution:   Add the function Perl_croak_xs_usage. (Sergey Khorev)
-Files:	    src/if_perl.xs
-
-
-*** ../vim-7.2.362/src/if_perl.xs	2009-11-11 14:45:36.000000000 +0100
---- src/if_perl.xs	2010-02-17 16:33:16.000000000 +0100
-***************
-*** 93,98 ****
---- 93,101 ----
-  # define perl_free dll_perl_free
-  # define Perl_get_context dll_Perl_get_context
-  # define Perl_croak dll_Perl_croak
-+ # if (PERL_REVISION == 5) && (PERL_VERSION >= 10)
-+ #  define Perl_croak_xs_usage dll_Perl_croak_xs_usage
-+ # endif
-  # ifndef PROTO
-  #  define Perl_croak_nocontext dll_Perl_croak_nocontext
-  #  define Perl_call_argv dll_Perl_call_argv
-***************
-*** 202,207 ****
---- 205,213 ----
-  static int (*perl_parse)(PerlInterpreter*, XSINIT_t, int, char**, char**);
-  static void* (*Perl_get_context)(void);
-  static void (*Perl_croak)(pTHX_ const char*, ...);
-+ #if (PERL_REVISION == 5) && (PERL_VERSION >= 10)
-+ static void (*Perl_croak_xs_usage)(pTHX_ const CV *const, const char *const params);
-+ #endif
-  static void (*Perl_croak_nocontext)(const char*, ...);
-  static I32 (*Perl_dowantarray)(pTHX);
-  static void (*Perl_free_tmps)(pTHX);
-***************
-*** 306,311 ****
---- 312,320 ----
-      {"perl_parse", (PERL_PROC*)&perl_parse},
-      {"Perl_get_context", (PERL_PROC*)&Perl_get_context},
-      {"Perl_croak", (PERL_PROC*)&Perl_croak},
-+ #if (PERL_REVISION == 5) && (PERL_VERSION >= 10)
-+     {"Perl_croak_xs_usage", (PERL_PROC*)&Perl_croak_xs_usage},
-+ #endif
-      {"Perl_croak_nocontext", (PERL_PROC*)&Perl_croak_nocontext},
-      {"Perl_dowantarray", (PERL_PROC*)&Perl_dowantarray},
-      {"Perl_free_tmps", (PERL_PROC*)&Perl_free_tmps},
-*** ../vim-7.2.362/src/version.c	2010-02-17 16:31:27.000000000 +0100
---- src/version.c	2010-02-17 16:35:39.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     363,
-  /**/
-
--- 
-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.364 b/source/ap/vim/patches/7.2.364
deleted file mode 100644
index c3c6e8b6..00000000
--- a/source/ap/vim/patches/7.2.364
+++ /dev/null
@@ -1,91 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.364 (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.364 (extra)
-Problem:    Can't build gvimext.dll on Win 7 x64 using MinGW (John Marriott)
-Solution:   Check if _MSC_VER is defined. (Andy Kittner)
-Files:	    src/GvimExt/gvimext.h
-
-
-*** ../vim-7.2.363/src/GvimExt/gvimext.h	2006-04-24 21:23:03.000000000 +0200
---- src/GvimExt/gvimext.h	2010-02-17 17:20:00.000000000 +0100
-***************
-*** 14,22 ****
-  #if !defined(AFX_STDAFX_H__3389658B_AD83_11D3_9C1E_0090278BBD99__INCLUDED_)
-  #define AFX_STDAFX_H__3389658B_AD83_11D3_9C1E_0090278BBD99__INCLUDED_
-  
-! #if _MSC_VER > 1000
-  #pragma once
-! #endif // _MSC_VER > 1000
-  
-  // Insert your headers here
-  // #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
---- 14,22 ----
-  #if !defined(AFX_STDAFX_H__3389658B_AD83_11D3_9C1E_0090278BBD99__INCLUDED_)
-  #define AFX_STDAFX_H__3389658B_AD83_11D3_9C1E_0090278BBD99__INCLUDED_
-  
-! #if defined(_MSC_VER) && _MSC_VER > 1000
-  #pragma once
-! #endif
-  
-  // Insert your headers here
-  // #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
-***************
-*** 34,40 ****
-  #define INC_OLE2	// WIN32, get ole2 from windows.h
-  
-  /* Visual Studio 2005 has 'deprecated' many of the standard CRT functions */
-! #if _MSC_VER >= 1400
-  # define _CRT_SECURE_NO_DEPRECATE
-  # define _CRT_NONSTDC_NO_DEPRECATE
-  #endif
---- 34,40 ----
-  #define INC_OLE2	// WIN32, get ole2 from windows.h
-  
-  /* Visual Studio 2005 has 'deprecated' many of the standard CRT functions */
-! #if defined(_MSC_VER) && _MSC_VER >= 1400
-  # define _CRT_SECURE_NO_DEPRECATE
-  # define _CRT_NONSTDC_NO_DEPRECATE
-  #endif
-***************
-*** 44,50 ****
-  #include <shlobj.h>
-  
-  /* Accommodate old versions of VC that don't have a modern Platform SDK */
-! #if _MSC_VER < 1300
-  # undef  UINT_PTR
-  # define UINT_PTR UINT
-  #endif
---- 44,50 ----
-  #include <shlobj.h>
-  
-  /* Accommodate old versions of VC that don't have a modern Platform SDK */
-! #if defined(_MSC_VER) && _MSC_VER < 1300
-  # undef  UINT_PTR
-  # define UINT_PTR UINT
-  #endif
-*** ../vim-7.2.363/src/version.c	2010-02-17 16:40:47.000000000 +0100
---- src/version.c	2010-02-17 17:23:15.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     364,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-245. You use Real Audio to listen to a radio station from a distant
-     city rather than turn on your stereo 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.365 b/source/ap/vim/patches/7.2.365
deleted file mode 100644
index e48990b9..00000000
--- a/source/ap/vim/patches/7.2.365
+++ /dev/null
@@ -1,71 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.365 (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.365 (extra)
-Problem:    MS-Windows with MingW: "File->Save As" does not work. (John
-	    Marriott)
-Solution:   Correctly fill in structure size. (Andy Kittner)
-Files:	    src/gui_w48.c
-
-
-*** ../vim-7.2.364/src/gui_w48.c	2010-02-17 16:31:27.000000000 +0100
---- src/gui_w48.c	2010-02-17 17:30:15.000000000 +0100
-***************
-*** 3345,3351 ****
-  #ifdef OPENFILENAME_SIZE_VERSION_400
-      /* be compatible with Windows NT 4.0 */
-      /* TODO: what to use for OPENFILENAMEW??? */
-!     fileStruct.lStructSize = sizeof(OPENFILENAME_SIZE_VERSION_400);
-  #else
-      fileStruct.lStructSize = sizeof(fileStruct);
-  #endif
---- 3345,3351 ----
-  #ifdef OPENFILENAME_SIZE_VERSION_400
-      /* be compatible with Windows NT 4.0 */
-      /* TODO: what to use for OPENFILENAMEW??? */
-!     fileStruct.lStructSize = OPENFILENAME_SIZE_VERSION_400;
-  #else
-      fileStruct.lStructSize = sizeof(fileStruct);
-  #endif
-***************
-*** 3506,3512 ****
-      memset(&fileStruct, 0, sizeof(OPENFILENAME));
-  #ifdef OPENFILENAME_SIZE_VERSION_400
-      /* be compatible with Windows NT 4.0 */
-!     fileStruct.lStructSize = sizeof(OPENFILENAME_SIZE_VERSION_400);
-  #else
-      fileStruct.lStructSize = sizeof(fileStruct);
-  #endif
---- 3506,3512 ----
-      memset(&fileStruct, 0, sizeof(OPENFILENAME));
-  #ifdef OPENFILENAME_SIZE_VERSION_400
-      /* be compatible with Windows NT 4.0 */
-!     fileStruct.lStructSize = OPENFILENAME_SIZE_VERSION_400;
-  #else
-      fileStruct.lStructSize = sizeof(fileStruct);
-  #endif
-*** ../vim-7.2.364/src/version.c	2010-02-17 17:24:23.000000000 +0100
---- src/version.c	2010-02-17 17:31:54.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     365,
-  /**/
-
-
--- 
-hundred-and-one symptoms of being an internet addict:
-246. You use up your free 100 hours in less than a 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.366 b/source/ap/vim/patches/7.2.366
deleted file mode 100644
index 952a0f2f..00000000
--- a/source/ap/vim/patches/7.2.366
+++ /dev/null
@@ -1,134 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.366
-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.366
-Problem:    CTRL-B doesn't go back to the first line of the buffer.
-Solution:   Avoid an overflow when adding MAXCOL.
-Files:	    src/move.c
-
-
-*** ../vim-7.2.365/src/move.c	2010-02-03 17:42:59.000000000 +0100
---- src/move.c	2010-02-17 17:49:34.000000000 +0100
-***************
-*** 1610,1616 ****
-   * Add one line above "lp->lnum".  This can be a filler line, a closed fold or
-   * a (wrapped) text line.  Uses and sets "lp->fill".
-   * Returns the height of the added line in "lp->height".
-!  * Lines above the first one are incredibly high.
-   */
-      static void
-  topline_back(lp)
---- 1610,1616 ----
-   * Add one line above "lp->lnum".  This can be a filler line, a closed fold or
-   * a (wrapped) text line.  Uses and sets "lp->fill".
-   * Returns the height of the added line in "lp->height".
-!  * Lines above the first one are incredibly high: MAXCOL.
-   */
-      static void
-  topline_back(lp)
-***************
-*** 1942,1948 ****
-  	{
-  	    loff.lnum = curwin->w_topline;
-  	    topline_back(&loff);
-! 	    if (used + loff.height > curwin->w_height)
-  		break;
-  	    used += loff.height;
-  #ifdef FEAT_DIFF
---- 1942,1948 ----
-  	{
-  	    loff.lnum = curwin->w_topline;
-  	    topline_back(&loff);
-! 	    if (loff.height == MAXCOL || used + loff.height > curwin->w_height)
-  		break;
-  	    used += loff.height;
-  #ifdef FEAT_DIFF
-***************
-*** 2021,2027 ****
-  
-  	/* Add one line above */
-  	topline_back(&loff);
-! 	used += loff.height;
-  	if (used > curwin->w_height)
-  	    break;
-  	if (loff.lnum >= curwin->w_botline
---- 2021,2030 ----
-  
-  	/* Add one line above */
-  	topline_back(&loff);
-! 	if (loff.height == MAXCOL)
-! 	    used = MAXCOL;
-! 	else
-! 	    used += loff.height;
-  	if (used > curwin->w_height)
-  	    break;
-  	if (loff.lnum >= curwin->w_botline
-***************
-*** 2175,2181 ****
-  	if (below > above)	    /* add a line above the cursor */
-  	{
-  	    topline_back(&loff);
-! 	    used += loff.height;
-  	    if (used > curwin->w_height)
-  		break;
-  	    above += loff.height;
---- 2178,2187 ----
-  	if (below > above)	    /* add a line above the cursor */
-  	{
-  	    topline_back(&loff);
-! 	    if (loff.height == MAXCOL)
-! 		used = MAXCOL;
-! 	    else
-! 		used += loff.height;
-  	    if (used > curwin->w_height)
-  		break;
-  	    above += loff.height;
-***************
-*** 2472,2480 ****
-  	    while (n <= curwin->w_height && loff.lnum >= 1)
-  	    {
-  		topline_back(&loff);
-! 		n += loff.height;
-  	    }
-! 	    if (n <= curwin->w_height)		    /* at begin of file */
-  	    {
-  		curwin->w_topline = 1;
-  #ifdef FEAT_DIFF
---- 2478,2489 ----
-  	    while (n <= curwin->w_height && loff.lnum >= 1)
-  	    {
-  		topline_back(&loff);
-! 		if (loff.height == MAXCOL)
-! 		    n = MAXCOL;
-! 		else
-! 		    n += loff.height;
-  	    }
-! 	    if (loff.lnum < 1)			/* at begin of file */
-  	    {
-  		curwin->w_topline = 1;
-  #ifdef FEAT_DIFF
-*** ../vim-7.2.365/src/version.c	2010-02-17 17:34:38.000000000 +0100
---- src/version.c	2010-02-17 18:13:22.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     366,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-247. You use www.switchboard.com instead of dialing 411 and 555-12-12
-     for directory assistance.
-
- /// 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.367 b/source/ap/vim/patches/7.2.367
deleted file mode 100644
index 6d461c98..00000000
--- a/source/ap/vim/patches/7.2.367
+++ /dev/null
@@ -1,77 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.367
-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.367
-Problem:    "xxd -r -p" doesn't work as documented.
-Solution:   Skip white space. (James Vega)
-Files:	    src/xxd/xxd.c
-
-
-*** ../vim-7.2.366/src/xxd/xxd.c	2009-06-16 18:29:37.000000000 +0200
---- src/xxd/xxd.c	2010-02-17 18:25:11.000000000 +0100
-***************
-*** 231,237 ****
-    fprintf(stderr, "    or\n       %s -r [-s [-]offset] [-c cols] [-ps] [infile [outfile]]\n", pname);
-    fprintf(stderr, "Options:\n");
-    fprintf(stderr, "    -a          toggle autoskip: A single '*' replaces nul-lines. Default off.\n");
-!   fprintf(stderr, "    -b          binary digit dump (incompatible with -p,-i,-r). Default hex.\n");
-    fprintf(stderr, "    -c cols     format <cols> octets per line. Default 16 (-i: 12, -ps: 30).\n");
-    fprintf(stderr, "    -E          show characters in EBCDIC. Default ASCII.\n");
-    fprintf(stderr, "    -g          number of octets per group in normal output. Default 2.\n");
---- 231,237 ----
-    fprintf(stderr, "    or\n       %s -r [-s [-]offset] [-c cols] [-ps] [infile [outfile]]\n", pname);
-    fprintf(stderr, "Options:\n");
-    fprintf(stderr, "    -a          toggle autoskip: A single '*' replaces nul-lines. Default off.\n");
-!   fprintf(stderr, "    -b          binary digit dump (incompatible with -ps,-i,-r). Default hex.\n");
-    fprintf(stderr, "    -c cols     format <cols> octets per line. Default 16 (-i: 12, -ps: 30).\n");
-    fprintf(stderr, "    -E          show characters in EBCDIC. Default ASCII.\n");
-    fprintf(stderr, "    -g          number of octets per group in normal output. Default 2.\n");
-***************
-*** 276,286 ****
-        if (c == '\r')	/* Doze style input file? */
-  	continue;
-  
-! #if 0	/* this doesn't work when there is normal text after the hex codes in
-! 	   the last line that looks like hex */
-!       if (c == ' ' || c == '\n' || c == '\t')  /* allow multiple spaces */
-  	continue;
-- #endif
-  
-        n3 = n2;
-        n2 = n1;
---- 276,286 ----
-        if (c == '\r')	/* Doze style input file? */
-  	continue;
-  
-!       /* Allow multiple spaces.  This doesn't work when there is normal text
-!        * after the hex codes in the last line that looks like hex, thus only
-!        * use it for PostScript format. */
-!       if (hextype == HEX_POSTSCRIPT && (c == ' ' || c == '\n' || c == '\t'))
-  	continue;
-  
-        n3 = n2;
-        n2 = n1;
-*** ../vim-7.2.366/src/version.c	2010-02-17 18:20:23.000000000 +0100
---- src/version.c	2010-02-17 18:26:35.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     367,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-248. You sign your letters with your e-mail address instead of your 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.368 b/source/ap/vim/patches/7.2.368
deleted file mode 100644
index 43107699..00000000
--- a/source/ap/vim/patches/7.2.368
+++ /dev/null
@@ -1,52 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.368
-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.368 (after 7.2.361)
-Problem:    Ruby interface: Appending line doesn't work. (Michael Henry)
-Solution:   Reverse check for NULL line. (James Vega)
-Files:      src/if_ruby.c
-
-
-*** ../vim-7.2.367/src/if_ruby.c	2010-02-17 16:23:03.000000000 +0100
---- src/if_ruby.c	2010-02-18 15:47:42.000000000 +0100
-***************
-*** 869,875 ****
-      long	n = NUM2LONG(num);
-      aco_save_T	aco;
-  
-!     if (line != NULL) {
-  	rb_raise(rb_eIndexError, "NULL line");
-      }
-      else if (n >= 0 && n <= buf->b_ml.ml_line_count)
---- 869,875 ----
-      long	n = NUM2LONG(num);
-      aco_save_T	aco;
-  
-!     if (line == NULL) {
-  	rb_raise(rb_eIndexError, "NULL line");
-      }
-      else if (n >= 0 && n <= buf->b_ml.ml_line_count)
-*** ../vim-7.2.367/src/version.c	2010-02-17 18:28:06.000000000 +0100
---- src/version.c	2010-02-18 15:48:09.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     368,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-251. You've never seen your closest friends who usually live WAY too far away.
-
- /// 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.369 b/source/ap/vim/patches/7.2.369
deleted file mode 100644
index adcab24e..00000000
--- a/source/ap/vim/patches/7.2.369
+++ /dev/null
@@ -1,55 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.369
-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.369
-Problem:    Error message is not easy to understand.
-Solution:   Add quotes. (SungHyun Nam)
-Files:	    src/ex_cmds2.c
-
-
-*** ../vim-7.2.368/src/ex_cmds2.c	2010-02-03 15:14:15.000000000 +0100
---- src/ex_cmds2.c	2010-02-18 21:16:20.000000000 +0100
-***************
-*** 1092,1098 ****
-  	set_vim_var_nr(VV_PROFILING, 1L);
-      }
-      else if (do_profiling == PROF_NONE)
-! 	EMSG(_("E750: First use :profile start <fname>"));
-      else if (STRCMP(eap->arg, "pause") == 0)
-      {
-  	if (do_profiling == PROF_YES)
---- 1092,1098 ----
-  	set_vim_var_nr(VV_PROFILING, 1L);
-      }
-      else if (do_profiling == PROF_NONE)
-! 	EMSG(_("E750: First use \":profile start {fname}\""));
-      else if (STRCMP(eap->arg, "pause") == 0)
-      {
-  	if (do_profiling == PROF_YES)
-*** ../vim-7.2.368/src/version.c	2010-02-18 15:51:25.000000000 +0100
---- src/version.c	2010-02-24 13:58:28.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     369,
-  /**/
-
--- 
-MAN:     You don't frighten us, English pig-dog!  Go and boil your bottoms,
-         son of a silly person.  I blow my nose on you, so-called Arthur-king,
-         you and your silly English K...kaniggets.
-   He puts hands to his ears and blows a raspberry.
-                 "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.370 b/source/ap/vim/patches/7.2.370
deleted file mode 100644
index 3e8457e0..00000000
--- a/source/ap/vim/patches/7.2.370
+++ /dev/null
@@ -1,156 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.370
-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.370 (after 7.2.356)
-Problem:    A redraw may cause folds to be closed.
-Solution:   Revert part of the previous patch.  Add a test. (Lech Lorens)
-Files:	    src/diff.c, src/fold.c, src/option.c, src/testdir/test45.in,
-	    src/testdir/test45.ok
-
-
-*** ../vim-7.2.369/src/diff.c	2009-07-22 16:22:33.000000000 +0200
---- src/diff.c	2010-02-24 14:31:12.000000000 +0100
-***************
-*** 1117,1142 ****
-      win_T	*wp;
-      int		addbuf;		/* Add buffer to diff. */
-  {
-      wp->w_p_diff = TRUE;
-      wp->w_p_scb = TRUE;
-      wp->w_p_wrap = FALSE;
-  # ifdef FEAT_FOLDING
-!     {
-! 	win_T	    *old_curwin = curwin;
-! 
-! 	curwin = wp;
-! 	curbuf = curwin->w_buffer;
-! 	set_string_option_direct((char_u *)"fdm", -1, (char_u *)"diff",
-  						       OPT_LOCAL|OPT_FREE, 0);
-! 	curwin = old_curwin;
-! 	curbuf = curwin->w_buffer;
-! 	wp->w_p_fdc = diff_foldcolumn;
-! 	wp->w_p_fen = TRUE;
-! 	wp->w_p_fdl = 0;
-! 	foldUpdateAll(wp);
-! 	/* make sure topline is not halfway a fold */
-! 	changed_window_setting_win(wp);
-!     }
-  # endif
-  #ifdef FEAT_SCROLLBIND
-      if (vim_strchr(p_sbo, 'h') == NULL)
---- 1117,1147 ----
-      win_T	*wp;
-      int		addbuf;		/* Add buffer to diff. */
-  {
-+ # ifdef FEAT_FOLDING
-+     win_T *old_curwin = curwin;
-+ 
-+     /* close the manually opened folds */
-+     curwin = wp;
-+     newFoldLevel();
-+     curwin = old_curwin;
-+ # endif
-+ 
-      wp->w_p_diff = TRUE;
-      wp->w_p_scb = TRUE;
-      wp->w_p_wrap = FALSE;
-  # ifdef FEAT_FOLDING
-!     curwin = wp;
-!     curbuf = curwin->w_buffer;
-!     set_string_option_direct((char_u *)"fdm", -1, (char_u *)"diff",
-  						       OPT_LOCAL|OPT_FREE, 0);
-!     curwin = old_curwin;
-!     curbuf = curwin->w_buffer;
-!     wp->w_p_fdc = diff_foldcolumn;
-!     wp->w_p_fen = TRUE;
-!     wp->w_p_fdl = 0;
-!     foldUpdateAll(wp);
-!     /* make sure topline is not halfway a fold */
-!     changed_window_setting_win(wp);
-  # endif
-  #ifdef FEAT_SCROLLBIND
-      if (vim_strchr(p_sbo, 'h') == NULL)
-*** ../vim-7.2.369/src/fold.c	2010-02-03 18:14:41.000000000 +0100
---- src/fold.c	2010-02-24 13:09:04.000000000 +0100
-***************
-*** 854,865 ****
-  	    && fp->fd_top < bot)
-      {
-  	fp->fd_small = MAYBE;
-- 
-- 	/* Not sure if this is the right place to reset fd_flags (suggested by
-- 	 * Lech Lorens). */
--         if (wp->w_foldinvalid)
--             fp->fd_flags = FD_LEVEL;
-- 
-  	++fp;
-      }
-  
---- 854,859 ----
-*** ../vim-7.2.369/src/option.c	2010-02-11 17:02:04.000000000 +0100
---- src/option.c	2010-02-24 13:09:44.000000000 +0100
-***************
-*** 6586,6592 ****
---- 6586,6596 ----
-  		|| *curwin->w_p_fdm == NUL)
-  	    errmsg = e_invarg;
-  	else
-+ 	{
-  	    foldUpdateAll(curwin);
-+ 	    if (foldmethodIsDiff(curwin))
-+ 		newFoldLevel();
-+ 	}
-      }
-  # ifdef FEAT_EVAL
-      /* 'foldexpr' */
-*** ../vim-7.2.369/src/testdir/test45.in	2009-11-03 14:46:35.000000000 +0100
---- src/testdir/test45.in	2010-02-24 13:02:39.000000000 +0100
-***************
-*** 36,41 ****
---- 36,43 ----
-  k:call append("$", getline("."))
-  jAcommentstart  Acommentend:set fdl=1
-  3j:call append("$", getline("."))
-+ :set fdl=0
-+ zOj:call append("$", getline("."))
-  :" test expression folding
-  :fun Flvl()
-    let l = getline(v:lnum)
-*** ../vim-7.2.369/src/testdir/test45.ok	2009-11-03 14:46:35.000000000 +0100
---- src/testdir/test45.ok	2010-02-24 12:58:55.000000000 +0100
-***************
-*** 11,16 ****
---- 11,17 ----
-  folding 9 ii
-      3 cc
-  7 gg
-+ 8 hh
-  expr 2
-  1
-  2
-*** ../vim-7.2.369/src/version.c	2010-02-24 13:59:09.000000000 +0100
---- src/version.c	2010-02-24 14:28:20.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     370,
-  /**/
-
--- 
-MAN:    Fetchez la vache!
-GUARD:  Quoi?
-MAN:    Fetchez la vache!
-                 "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.371 b/source/ap/vim/patches/7.2.371
deleted file mode 100644
index db875b62..00000000
--- a/source/ap/vim/patches/7.2.371
+++ /dev/null
@@ -1,322 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.371
-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.371
-Problem:    Build problems on Tandem NonStop.
-Solution:   A few changes to #ifdefs (Joachim Schmitz)
-Files:	    src/auto/configure, src/configure.in, src/config.h.in, src/vim.h,
-	    src/if_cscope.c, src/osdef1.h.in, src/tag.c
-
-
-*** ../vim-7.2.370/src/auto/configure	2010-02-17 16:23:03.000000000 +0100
---- src/auto/configure	2010-02-24 14:27:00.000000000 +0100
-***************
-*** 14038,14046 ****
-  
-  
-  
-! 
-! 
-! for ac_func in bcmp fchdir fchown fseeko fsync ftello getcwd getpseudotty \
-  	getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \
-  	memset mkdtemp nanosleep opendir putenv qsort readlink select setenv \
-  	setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
---- 14038,14044 ----
-  
-  
-  
-! for ac_func in bcmp fchdir fchown fsync getcwd getpseudotty \
-  	getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \
-  	memset mkdtemp nanosleep opendir putenv qsort readlink select setenv \
-  	setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
-***************
-*** 14146,14151 ****
---- 14144,14281 ----
-  fi
-  done
-  
-+ { $as_echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-+ $as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; }
-+ if test "${ac_cv_sys_largefile_source+set}" = set; then
-+   $as_echo_n "(cached) " >&6
-+ else
-+   while :; do
-+   cat >conftest.$ac_ext <<_ACEOF
-+ /* confdefs.h.  */
-+ _ACEOF
-+ cat confdefs.h >>conftest.$ac_ext
-+ cat >>conftest.$ac_ext <<_ACEOF
-+ /* end confdefs.h.  */
-+ #include <sys/types.h> /* for off_t */
-+      #include <stdio.h>
-+ int
-+ main ()
-+ {
-+ int (*fp) (FILE *, off_t, int) = fseeko;
-+      return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
-+   ;
-+   return 0;
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext 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>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_exeext && {
-+ 	 test "$cross_compiling" = yes ||
-+ 	 $as_test_x conftest$ac_exeext
-+        }; then
-+   ac_cv_sys_largefile_source=no; break
-+ else
-+   $as_echo "$as_me: failed program was:" >&5
-+ sed 's/^/| /' conftest.$ac_ext >&5
-+ 
-+ 
-+ fi
-+ 
-+ rm -rf conftest.dSYM
-+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+       conftest$ac_exeext conftest.$ac_ext
-+   cat >conftest.$ac_ext <<_ACEOF
-+ /* confdefs.h.  */
-+ _ACEOF
-+ cat confdefs.h >>conftest.$ac_ext
-+ cat >>conftest.$ac_ext <<_ACEOF
-+ /* end confdefs.h.  */
-+ #define _LARGEFILE_SOURCE 1
-+ #include <sys/types.h> /* for off_t */
-+      #include <stdio.h>
-+ int
-+ main ()
-+ {
-+ int (*fp) (FILE *, off_t, int) = fseeko;
-+      return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
-+   ;
-+   return 0;
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext 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>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_exeext && {
-+ 	 test "$cross_compiling" = yes ||
-+ 	 $as_test_x conftest$ac_exeext
-+        }; then
-+   ac_cv_sys_largefile_source=1; break
-+ else
-+   $as_echo "$as_me: failed program was:" >&5
-+ sed 's/^/| /' conftest.$ac_ext >&5
-+ 
-+ 
-+ fi
-+ 
-+ rm -rf conftest.dSYM
-+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+       conftest$ac_exeext conftest.$ac_ext
-+   ac_cv_sys_largefile_source=unknown
-+   break
-+ done
-+ fi
-+ { $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5
-+ $as_echo "$ac_cv_sys_largefile_source" >&6; }
-+ case $ac_cv_sys_largefile_source in #(
-+   no | unknown) ;;
-+   *)
-+ cat >>confdefs.h <<_ACEOF
-+ #define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source
-+ _ACEOF
-+ ;;
-+ esac
-+ rm -rf conftest*
-+ 
-+ # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
-+ # in glibc 2.1.3, but that breaks too many other things.
-+ # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-+ if test $ac_cv_sys_largefile_source != unknown; then
-+ 
-+ cat >>confdefs.h <<\_ACEOF
-+ #define HAVE_FSEEKO 1
-+ _ACEOF
-+ 
-+ fi
-+ 
-  
-  { $as_echo "$as_me:$LINENO: checking for st_blksize" >&5
-  $as_echo_n "checking for st_blksize... " >&6; }
-*** ../vim-7.2.370/src/configure.in	2010-02-17 16:23:03.000000000 +0100
---- src/configure.in	2010-02-24 14:18:49.000000000 +0100
-***************
-*** 2642,2655 ****
-    AC_DEFINE(BAD_GETCWD)
-  fi
-  
-! dnl Check for functions in one big call, to reduce the size of configure
-! AC_CHECK_FUNCS(bcmp fchdir fchown fseeko fsync ftello getcwd getpseudotty \
-  	getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \
-  	memset mkdtemp nanosleep opendir putenv qsort readlink select setenv \
-  	setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
-  	sigvec strcasecmp strerror strftime stricmp strncasecmp \
-  	strnicmp strpbrk strtol tgetent towlower towupper iswupper \
-  	usleep utime utimes)
-  
-  dnl fstatfs() can take 2 to 4 arguments, try to use st_blksize if possible
-  AC_MSG_CHECKING(for st_blksize)
---- 2642,2657 ----
-    AC_DEFINE(BAD_GETCWD)
-  fi
-  
-! dnl Check for functions in one big call, to reduce the size of configure.
-! dnl Can only be used for functions that do not require any include.
-! AC_CHECK_FUNCS(bcmp fchdir fchown fsync getcwd getpseudotty \
-  	getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \
-  	memset mkdtemp nanosleep opendir putenv qsort readlink select setenv \
-  	setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
-  	sigvec strcasecmp strerror strftime stricmp strncasecmp \
-  	strnicmp strpbrk strtol tgetent towlower towupper iswupper \
-  	usleep utime utimes)
-+ AC_FUNC_FSEEKO
-  
-  dnl fstatfs() can take 2 to 4 arguments, try to use st_blksize if possible
-  AC_MSG_CHECKING(for st_blksize)
-*** ../vim-7.2.370/src/config.h.in	2009-11-17 17:13:03.000000000 +0100
---- src/config.h.in	2010-02-24 14:20:26.000000000 +0100
-***************
-*** 144,150 ****
-  #undef HAVE_FCHOWN
-  #undef HAVE_FSEEKO
-  #undef HAVE_FSYNC
-- #undef HAVE_FTELLO
-  #undef HAVE_GETCWD
-  #undef HAVE_GETPSEUDOTTY
-  #undef HAVE_GETPWNAM
---- 144,149 ----
-*** ../vim-7.2.370/src/vim.h	2010-02-03 15:14:15.000000000 +0100
---- src/vim.h	2010-02-24 14:08:14.000000000 +0100
-***************
-*** 52,58 ****
-  
-  /* user ID of root is usually zero, but not for everybody */
-  #ifdef __TANDEM
-! # define _TANDEM_SOURCE
-  # include <floss.h>
-  # define ROOT_UID 65535
-  #else
---- 52,60 ----
-  
-  /* user ID of root is usually zero, but not for everybody */
-  #ifdef __TANDEM
-! # ifndef _TANDEM_SOURCE
-! #  define _TANDEM_SOURCE
-! # endif
-  # include <floss.h>
-  # define ROOT_UID 65535
-  #else
-*** ../vim-7.2.370/src/if_cscope.c	2010-01-19 14:59:14.000000000 +0100
---- src/if_cscope.c	2010-02-24 14:10:21.000000000 +0100
-***************
-*** 2278,2284 ****
---- 2278,2288 ----
-  	/* Use sigaction() to limit the waiting time to two seconds. */
-  	sigemptyset(&sa.sa_mask);
-  	sa.sa_handler = sig_handler;
-+ #  ifdef SA_NODEFER
-  	sa.sa_flags = SA_NODEFER;
-+ #  else
-+ 	sa.sa_flags = 0;
-+ #  endif
-  	sigaction(SIGALRM, &sa, &old);
-  	alarm(2); /* 2 sec timeout */
-  
-*** ../vim-7.2.370/src/osdef1.h.in	2007-02-27 16:47:59.000000000 +0100
---- src/osdef1.h.in	2010-02-24 14:20:50.000000000 +0100
-***************
-*** 25,31 ****
-  extern int	fseeko __ARGS((FILE *, off_t, int));
-  #endif
-  extern long	ftell __ARGS((FILE *));
-! #ifdef HAVE_FTELLO
-  extern off_t	ftello __ARGS((FILE *));
-  #endif
-  extern void	rewind __ARGS((FILE *));
---- 25,31 ----
-  extern int	fseeko __ARGS((FILE *, off_t, int));
-  #endif
-  extern long	ftell __ARGS((FILE *));
-! #ifdef HAVE_FSEEKO
-  extern off_t	ftello __ARGS((FILE *));
-  #endif
-  extern void	rewind __ARGS((FILE *));
-*** ../vim-7.2.370/src/tag.c	2009-05-17 13:30:58.000000000 +0200
---- src/tag.c	2010-02-24 14:20:12.000000000 +0100
-***************
-*** 90,97 ****
-  /*
-   * We use ftello() here, if available.  It returns off_t instead of long,
-   * which helps if long is 32 bit and off_t is 64 bit.
-   */
-! #ifdef HAVE_FTELLO
-  # define ftell ftello
-  #endif
-  
---- 90,98 ----
-  /*
-   * We use ftello() here, if available.  It returns off_t instead of long,
-   * which helps if long is 32 bit and off_t is 64 bit.
-+  * We assume that when fseeko() is available then ftello() is too.
-   */
-! #ifdef HAVE_FSEEKO
-  # define ftell ftello
-  #endif
-  
-*** ../vim-7.2.370/src/version.c	2010-02-24 14:34:10.000000000 +0100
---- src/version.c	2010-02-24 14:45:37.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     371,
-  /**/
-
--- 
-   A cow comes flying over the battlements,  lowing aggressively.  The cow
-   lands on GALAHAD'S PAGE, squashing him completely.
-                 "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.372 b/source/ap/vim/patches/7.2.372
deleted file mode 100644
index 064893c8..00000000
--- a/source/ap/vim/patches/7.2.372
+++ /dev/null
@@ -1,303 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.372 (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.372 (extra)
-Problem:    Cross-compiling GvimExt and xxd doesn't work.
-Solution:   Change the build files. (Markus Heidelberg)
-Files:	    src/INSTALLpc.txt, src/GvimExt/Make_ming.mak, src/Make_cyg.mak,
-	    src/Make_ming.mak, src/xxd/Make_cyg.mak
-
-
-*** ../vim-7.2.371/src/INSTALLpc.txt	2008-07-13 19:20:53.000000000 +0200
---- src/INSTALLpc.txt	2010-01-19 12:37:03.000000000 +0100
-***************
-*** 215,222 ****
-  
-  You should not need to do *any* editing of any files to get vim compiled this
-  way.  If, for some reason, you want the console-mode-only version of vim (this
-! is NOT recommended on Win32, especially on '95/'98!!!), you need only change
-! the 'gvim.exe' to 'vim.exe' in the 'make' commands given above.
-  
-  If you are dismayed by how big the EXE is, I strongly recommend you get 'UPX'
-  (also free!) and compress the file (typical compression is 50%). UPX can be
---- 215,223 ----
-  
-  You should not need to do *any* editing of any files to get vim compiled this
-  way.  If, for some reason, you want the console-mode-only version of vim (this
-! is NOT recommended on Win32, especially on '95/'98!!!), you can use:
-! 
-!     make -f Make_ming.mak GUI=no vim.exe
-  
-  If you are dismayed by how big the EXE is, I strongly recommend you get 'UPX'
-  (also free!) and compress the file (typical compression is 50%). UPX can be
-***************
-*** 240,246 ****
-  The Cygnus one many not fully work yet.
-  With Cygnus gcc you can use the Unix Makefile instead (you need to get the
-  Unix archive then).  Then you get a Cygwin application (feels like Vim is
-! runnin on Unix), while with Make_cyg.mak you get a Windows application (like
-  with the other makefiles).
-  
-  
---- 241,247 ----
-  The Cygnus one many not fully work yet.
-  With Cygnus gcc you can use the Unix Makefile instead (you need to get the
-  Unix archive then).  Then you get a Cygwin application (feels like Vim is
-! running on Unix), while with Make_cyg.mak you get a Windows application (like
-  with the other makefiles).
-  
-  
-***************
-*** 259,268 ****
---- 260,272 ----
-  If you like, you can compile the 'mingw' Win32 version from the comfort of
-  your Linux (or other unix) box.  To do this, you need to follow a few steps:
-      1) Install the mingw32 cross-compiler. See
-+ 	http://www.mingw.org/wiki/LinuxCrossMinGW
-  	http://www.libsdl.org/extras/win32/cross/README.txt
-      2) Get and unpack both the Unix sources and the extra archive
-      3) in 'Make_ming.mak', set 'CROSS' to 'yes' instead of 'no'.
-         Make further changes to 'Make_ming.mak' as you wish.
-+        If your cross-compiler prefix differs from the predefined value,
-+        set 'CROSS_COMPILE' corresponding.
-      4) make -f Make_ming.mak gvim.exe
-  
-  Now you have created the Windows binary from your Linux box!  Have fun...
-*** ../vim-7.2.371/src/GvimExt/Make_ming.mak	2005-01-09 22:15:44.000000000 +0100
---- src/GvimExt/Make_ming.mak	2010-02-24 14:56:37.000000000 +0100
-***************
-*** 20,36 ****
-  ifeq ($(CROSS),yes)
-  DEL = rm
-  ifeq ($(MINGWOLD),yes)
-- CXX = i586-mingw32msvc-g++
-  CXXFLAGS := -O2 -mno-cygwin -fvtable-thunks
-- WINDRES = i586-mingw32msvc-windres
-  else
-- CXX = i386-mingw32msvc-g++
-  CXXFLAGS := -O2 -mno-cygwin
-- WINDRES = i386-mingw32msvc-windres
-  endif
-  else
-- CXX := g++
-- WINDRES := windres
-  CXXFLAGS := -O2 -mno-cygwin
-  ifneq (sh.exe, $(SHELL))
-  DEL = rm
---- 20,30 ----
-***************
-*** 38,43 ****
---- 32,39 ----
-  DEL = del
-  endif
-  endif
-+ CXX := $(CROSS_COMPILE)g++
-+ WINDRES := $(CROSS_COMPILE)windres
-  LIBS :=  -luuid
-  RES  := gvimext.res
-  DEFFILE = gvimext_ming.def
-*** ../vim-7.2.371/src/Make_cyg.mak	2009-09-11 12:48:56.000000000 +0200
---- src/Make_cyg.mak	2010-02-24 14:59:02.000000000 +0100
-***************
-*** 1,6 ****
-  #
-  # Makefile for VIM on Win32, using Cygnus gcc
-! # Last updated by Dan Sharp.  Last Change: 2007 Sep 29
-  #
-  # Also read INSTALLpc.txt!
-  #
---- 1,6 ----
-  #
-  # Makefile for VIM on Win32, using Cygnus gcc
-! # Last updated by Dan Sharp.  Last Change: 2010 Feb 24
-  #
-  # Also read INSTALLpc.txt!
-  #
-***************
-*** 32,40 ****
-  # OLE		no or yes: set to yes to make OLE gvim (no)
-  # DEBUG		no or yes: set to yes if you wish a DEBUGging build (no)
-  # CPUNR		No longer supported, use ARCH.
-! # ARCH		i386 through pentium4: select -march argument to compile with (i386)
-  # USEDLL	no or yes: set to yes to use the Runtime library DLL (no)
-  #		For USEDLL=yes the cygwin1.dll is required to run Vim.
-  # POSTSCRIPT	no or yes: set to yes for PostScript printing (no)
-  # FEATURES	TINY, SMALL, NORMAL, BIG or HUGE (BIG)
-  # WINVER	Lowest Win32 version to support.  (0x0400)
---- 32,43 ----
-  # OLE		no or yes: set to yes to make OLE gvim (no)
-  # DEBUG		no or yes: set to yes if you wish a DEBUGging build (no)
-  # CPUNR		No longer supported, use ARCH.
-! # ARCH		i386 through pentium4: select -march argument to compile with
-! #               (i386)
-  # USEDLL	no or yes: set to yes to use the Runtime library DLL (no)
-  #		For USEDLL=yes the cygwin1.dll is required to run Vim.
-+ #		"no" does not work with latest version of Cygwin, use
-+ #		Make_ming.mak instead.  Or set CC to gcc-3.
-  # POSTSCRIPT	no or yes: set to yes for PostScript printing (no)
-  # FEATURES	TINY, SMALL, NORMAL, BIG or HUGE (BIG)
-  # WINVER	Lowest Win32 version to support.  (0x0400)
-***************
-*** 99,104 ****
---- 102,108 ----
-  INCLUDES = -march=$(ARCH) -Iproto
-  
-  #>>>>> name of the compiler and linker, name of lib directory
-+ CROSS_COMPILE =
-  CC = gcc
-  RC = windres
-  
-***************
-*** 467,476 ****
-  	$(CC) $(CFLAGS) -o $(EXE) $(OBJ) $(LIBS) -luuid -lole32 $(EXTRA_LIBS)
-  
-  xxd/xxd.exe: xxd/xxd.c
-! 	$(MAKE) -C xxd -f Make_cyg.mak USEDLL=$(USEDLL)
-  
-  GvimExt/gvimext.dll: GvimExt/gvimext.cpp GvimExt/gvimext.rc GvimExt/gvimext.h
-! 	$(MAKE) -C GvimExt -f Make_ming.mak
-  
-  vimrun.exe: vimrun.c
-  	$(CC) $(CFLAGS) -o vimrun.exe vimrun.c  $(LIBS)
---- 471,480 ----
-  	$(CC) $(CFLAGS) -o $(EXE) $(OBJ) $(LIBS) -luuid -lole32 $(EXTRA_LIBS)
-  
-  xxd/xxd.exe: xxd/xxd.c
-! 	$(MAKE) -C xxd -f Make_cyg.mak CC=$(CC) USEDLL=$(USEDLL)
-  
-  GvimExt/gvimext.dll: GvimExt/gvimext.cpp GvimExt/gvimext.rc GvimExt/gvimext.h
-! 	$(MAKE) -C GvimExt -f Make_ming.mak CROSS_COMPILE=$(CROSS_COMPILE)
-  
-  vimrun.exe: vimrun.c
-  	$(CC) $(CFLAGS) -o vimrun.exe vimrun.c  $(LIBS)
-*** ../vim-7.2.371/src/Make_ming.mak	2009-09-11 12:48:56.000000000 +0200
---- src/Make_ming.mak	2010-02-24 15:01:31.000000000 +0100
-***************
-*** 241,255 ****
-  DEFINES=-DWIN32 -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) \
-  	-DHAVE_PATHDEF -DFEAT_$(FEATURES)
-  ifeq ($(CROSS),yes)
-! # cross-compiler:
-! CC = i586-pc-mingw32msvc-gcc
-  DEL = rm
-  MKDIR = mkdir -p
-! WINDRES = i586-pc-mingw32msvc-windres
-  else
-  # normal (Windows) compilation:
-- CC = gcc
-  ifneq (sh.exe, $(SHELL))
-  DEL = rm
-  MKDIR = mkdir -p
-  DIRSLASH = /
---- 241,255 ----
-  DEFINES=-DWIN32 -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) \
-  	-DHAVE_PATHDEF -DFEAT_$(FEATURES)
-  ifeq ($(CROSS),yes)
-! # cross-compiler prefix:
-! CROSS_COMPILE = i586-pc-mingw32msvc-
-  DEL = rm
-  MKDIR = mkdir -p
-! DIRSLASH = /
-  else
-  # normal (Windows) compilation:
-  ifneq (sh.exe, $(SHELL))
-+ CROSS_COMPILE =
-  DEL = rm
-  MKDIR = mkdir -p
-  DIRSLASH = /
-***************
-*** 258,265 ****
-  MKDIR = mkdir
-  DIRSLASH = \\
-  endif
-- WINDRES = windres
-  endif
-  
-  #>>>>> end of choices
-  ###########################################################################
---- 258,266 ----
-  MKDIR = mkdir
-  DIRSLASH = \\
-  endif
-  endif
-+ CC := $(CROSS_COMPILE)gcc
-+ WINDRES := $(CROSS_COMPILE)windres
-  
-  #>>>>> end of choices
-  ###########################################################################
-***************
-*** 549,558 ****
-  	upx vim.exe
-  
-  xxd/xxd.exe: xxd/xxd.c
-! 	$(MAKE) -C xxd -f Make_cyg.mak
-  
-  GvimExt/gvimext.dll: GvimExt/gvimext.cpp GvimExt/gvimext.rc GvimExt/gvimext.h
-  	$(MAKE) -C GvimExt -f Make_ming.mak
-  
-  clean:
-  	-$(DEL) $(OUTDIR)$(DIRSLASH)*.o
---- 550,560 ----
-  	upx vim.exe
-  
-  xxd/xxd.exe: xxd/xxd.c
-! 	$(MAKE) -C xxd -f Make_cyg.mak CC=$(CC)
-  
-  GvimExt/gvimext.dll: GvimExt/gvimext.cpp GvimExt/gvimext.rc GvimExt/gvimext.h
-  	$(MAKE) -C GvimExt -f Make_ming.mak
-+ 	$(MAKE) -C GvimExt -f Make_ming.mak CROSS=$(CROSS) CROSS_COMPILE=$(CROSS_COMPILE)
-  
-  clean:
-  	-$(DEL) $(OUTDIR)$(DIRSLASH)*.o
-*** ../vim-7.2.371/src/xxd/Make_cyg.mak	2004-06-13 17:48:52.000000000 +0200
---- src/xxd/Make_cyg.mak	2010-02-24 15:05:24.000000000 +0100
-***************
-*** 12,17 ****
---- 12,18 ----
-  LIBS    =
-  endif
-  
-+ CC = gcc
-  CFLAGS = -O2 -Wall -DWIN32 $(DEFINES)
-  
-  ifneq (sh.exe, $(SHELL))
-***************
-*** 21,27 ****
-  endif
-  
-  xxd.exe: xxd.c
-! 	gcc $(CFLAGS) -s -o xxd.exe xxd.c $(LIBS)
-  
-  clean:
-  	-$(DEL) xxd.exe
---- 22,28 ----
-  endif
-  
-  xxd.exe: xxd.c
-! 	$(CC) $(CFLAGS) -s -o xxd.exe xxd.c $(LIBS)
-  
-  clean:
-  	-$(DEL) xxd.exe
-*** ../vim-7.2.371/src/version.c	2010-02-24 14:46:58.000000000 +0100
---- src/version.c	2010-02-24 15:05:48.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     372,
-  /**/
-
--- 
-Ten bugs in the hand is better than one as yet undetected.
-
- /// 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.373 b/source/ap/vim/patches/7.2.373
deleted file mode 100644
index 1bb4773d..00000000
--- a/source/ap/vim/patches/7.2.373
+++ /dev/null
@@ -1,54 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.373
-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.373
-Problem:    Gcc 4.5 adds more error messages. (Chris Indy)
-Solution:   Update default 'errorformat'.
-Files:	    src/option.h
-
-
-*** ../vim-7.2.372/src/option.h	2008-06-24 23:59:49.000000000 +0200
---- src/option.h	2010-02-24 15:20:03.000000000 +0100
-***************
-*** 33,39 ****
-  #     ifdef EBCDIC
-  #define DFLT_EFM	"%*[^ ] %*[^ ] %f:%l%*[ ]%m,%*[^\"]\"%f\"%*\\D%l: %m,\"%f\"%*\\D%l: %m,%f:%l:%c:%m,%f(%l):%m,%f:%l:%m,\"%f\"\\, line %l%*\\D%c%*[^ ] %m,%D%*\\a[%*\\d]: Entering directory `%f',%X%*\\a[%*\\d]: Leaving directory `%f',%DMaking %*\\a in %f,%f|%l| %m"
-  #     else
-! #define DFLT_EFM	"%*[^\"]\"%f\"%*\\D%l: %m,\"%f\"%*\\D%l: %m,%-G%f:%l: (Each undeclared identifier is reported only once,%-G%f:%l: for each function it appears in.),%f:%l:%c:%m,%f(%l):%m,%f:%l:%m,\"%f\"\\, line %l%*\\D%c%*[^ ] %m,%D%*\\a[%*\\d]: Entering directory `%f',%X%*\\a[%*\\d]: Leaving directory `%f',%D%*\\a: Entering directory `%f',%X%*\\a: Leaving directory `%f',%DMaking %*\\a in %f,%f|%l| %m"
-  #     endif
-  #    endif
-  #   endif
---- 33,39 ----
-  #     ifdef EBCDIC
-  #define DFLT_EFM	"%*[^ ] %*[^ ] %f:%l%*[ ]%m,%*[^\"]\"%f\"%*\\D%l: %m,\"%f\"%*\\D%l: %m,%f:%l:%c:%m,%f(%l):%m,%f:%l:%m,\"%f\"\\, line %l%*\\D%c%*[^ ] %m,%D%*\\a[%*\\d]: Entering directory `%f',%X%*\\a[%*\\d]: Leaving directory `%f',%DMaking %*\\a in %f,%f|%l| %m"
-  #     else
-! #define DFLT_EFM	"%*[^\"]\"%f\"%*\\D%l: %m,\"%f\"%*\\D%l: %m,%-G%f:%l: (Each undeclared identifier is reported only once,%-G%f:%l: for each function it appears in.),%-GIn file included from %f:%l:%c,%-GIn file included from %f:%l,%-Gfrom %f:%l:%c,%-Gfrom %f:%l,%f:%l:%c:%m,%f(%l):%m,%f:%l:%m,\"%f\"\\, line %l%*\\D%c%*[^ ] %m,%D%*\\a[%*\\d]: Entering directory `%f',%X%*\\a[%*\\d]: Leaving directory `%f',%D%*\\a: Entering directory `%f',%X%*\\a: Leaving directory `%f',%DMaking %*\\a in %f,%f|%l| %m"
-  #     endif
-  #    endif
-  #   endif
-*** ../vim-7.2.372/src/version.c	2010-02-24 15:07:45.000000000 +0100
---- src/version.c	2010-02-24 15:24:43.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     373,
-  /**/
-
--- 
-ARTHUR: Right! Knights! Forward!
-   ARTHUR leads a charge toward the castle.  Various shots of them battling on,
-   despite being hit by a variety of farm animals.
-                 "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.374 b/source/ap/vim/patches/7.2.374
deleted file mode 100644
index 50d3e74d..00000000
--- a/source/ap/vim/patches/7.2.374
+++ /dev/null
@@ -1,168 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.374
-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.374
-Problem:    Ruby eval() doesn't understand Vim types.
-Solution:   Add the vim_to_ruby() function.  (George Gensure)
-Files:	    src/eval.c, src/if_ruby.c
-
-
-*** ../vim-7.2.373/src/eval.c	2010-01-19 15:51:29.000000000 +0100
---- src/eval.c	2010-02-24 15:36:40.000000000 +0100
-***************
-*** 5872,5878 ****
-      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.
-   */
---- 5872,5879 ----
-      return item1 == NULL && item2 == NULL;
-  }
-  
-! #if defined(FEAT_RUBY) || defined(FEAT_PYTHON) || defined(FEAT_MZSCHEME) \
-! 	|| defined(PROTO)
-  /*
-   * Return the dictitem that an entry in a hashtable points to.
-   */
-*** ../vim-7.2.373/src/if_ruby.c	2010-02-18 15:51:25.000000000 +0100
---- src/if_ruby.c	2010-02-24 15:45:15.000000000 +0100
-***************
-*** 660,679 ****
-      return Qnil;
-  }
-  
-  static VALUE vim_evaluate(VALUE self UNUSED, VALUE str)
-  {
-  #ifdef FEAT_EVAL
-!     char_u *value = eval_to_string((char_u *)StringValuePtr(str), NULL, TRUE);
-  
-!     if (value != NULL)
-      {
-! 	VALUE val = rb_str_new2((char *)value);
-! 	vim_free(value);
-! 	return val;
-      }
-!     else
-  #endif
-- 	return Qnil;
-  }
-  
-  static VALUE buffer_new(buf_T *buf)
---- 660,747 ----
-      return Qnil;
-  }
-  
-+ #ifdef FEAT_EVAL
-+ static VALUE vim_to_ruby(typval_T *tv)
-+ {
-+     VALUE result = Qnil;
-+ 
-+     if (tv->v_type == VAR_STRING)
-+     {
-+         result = rb_str_new2((char *)tv->vval.v_string);
-+     }
-+     else if (tv->v_type == VAR_NUMBER)
-+     {
-+         result = INT2NUM(tv->vval.v_number);
-+     }
-+ # ifdef FEAT_FLOAT
-+     else if (tv->v_type == VAR_FLOAT)
-+     {
-+         result = rb_float_new(tv->vval.v_float);
-+     }
-+ # endif
-+     else if (tv->v_type == VAR_LIST)
-+     {
-+         list_T      *list = tv->vval.v_list;
-+         listitem_T  *curr;
-+ 
-+         result = rb_ary_new();
-+ 
-+         if (list != NULL)
-+         {
-+             for (curr = list->lv_first; curr != NULL; curr = curr->li_next)
-+             {
-+                 rb_ary_push(result, vim_to_ruby(&curr->li_tv));
-+             }
-+         }
-+     }
-+     else if (tv->v_type == VAR_DICT)
-+     {
-+         result = rb_hash_new();
-+ 
-+         if (tv->vval.v_dict != NULL)
-+         {
-+             hashtab_T   *ht = &tv->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);
-+                     rb_hash_aset(result, rb_str_new2((char *)hi->hi_key),
-+ 						     vim_to_ruby(&di->di_tv));
-+                 }
-+             }
-+         }
-+     } /* else return Qnil; */
-+ 
-+     return result;
-+ }
-+ #endif
-+ 
-  static VALUE vim_evaluate(VALUE self UNUSED, VALUE str)
-  {
-  #ifdef FEAT_EVAL
-!     typval_T    *tv;
-!     VALUE       result;
-  
-!     tv = eval_expr((char_u *)StringValuePtr(str), NULL);
-!     if (tv == NULL)
-      {
-!         return Qnil;
-      }
-!     result = vim_to_ruby(tv);
-! 
-!     free_tv(tv);
-! 
-!     return result;
-! #else
-!     return Qnil;
-  #endif
-  }
-  
-  static VALUE buffer_new(buf_T *buf)
-*** ../vim-7.2.373/src/version.c	2010-02-24 15:25:13.000000000 +0100
---- src/version.c	2010-02-24 15:46:57.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     374,
-  /**/
-
--- 
-ARTHUR: (as the MAN next to him is squashed by a sheep) Knights!  Run away!
-   Midst echoing shouts of "run away" the KNIGHTS retreat to cover with the odd
-   cow or goose hitting them still.  The KNIGHTS crouch down under cover.
-                 "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.375 b/source/ap/vim/patches/7.2.375
deleted file mode 100644
index 3374cd1b..00000000
--- a/source/ap/vim/patches/7.2.375
+++ /dev/null
@@ -1,64 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.375
-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.375
-Problem:    ml_get errors when using ":bprevious" in a BufEnter autocmd.
-	    (Dominique Pelle)
-Solution:   Clear w_valid when entering another buffer.
-Files:	    src/buffer.c
-
-
-*** ../vim-7.2.374/src/buffer.c	2010-01-19 14:59:14.000000000 +0100
---- src/buffer.c	2010-02-24 16:29:22.000000000 +0100
-***************
-*** 115,121 ****
-  #endif
-  
-      /* mark cursor position as being invalid */
-!     changed_line_abv_curs();
-  
-      if (curbuf->b_ffname != NULL
-  #ifdef FEAT_NETBEANS_INTG
---- 115,121 ----
-  #endif
-  
-      /* mark cursor position as being invalid */
-!     curwin->w_valid = 0;
-  
-      if (curbuf->b_ffname != NULL
-  #ifdef FEAT_NETBEANS_INTG
-***************
-*** 1399,1404 ****
---- 1399,1407 ----
-      curwin->w_topline_was_set = FALSE;
-  #endif
-  
-+     /* mark cursor position as being invalid */
-+     curwin->w_valid = 0;
-+ 
-      /* Make sure the buffer is loaded. */
-      if (curbuf->b_ml.ml_mfp == NULL)	/* need to load the file */
-      {
-*** ../vim-7.2.374/src/version.c	2010-02-24 15:47:58.000000000 +0100
---- src/version.c	2010-02-24 16:30:03.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     375,
-  /**/
-
--- 
-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.376 b/source/ap/vim/patches/7.2.376
deleted file mode 100644
index 718875b2..00000000
--- a/source/ap/vim/patches/7.2.376
+++ /dev/null
@@ -1,50 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.376
-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.376
-Problem:    ml_get error when using SiSU syntax. (Nathan Thomas)
-Solution:   If the match ends below the last line move it to the end of the
-	    last line.
-Files:	    src/syntax.c
-
-
-*** ../vim-7.2.375/src/syntax.c	2010-01-19 14:59:14.000000000 +0100
---- src/syntax.c	2010-02-24 17:14:13.000000000 +0100
-***************
-*** 3086,3091 ****
---- 3086,3097 ----
-  	col = regmatch->startpos[0].col;
-  	off = spp->sp_offsets[idx];
-      }
-+     if (result->lnum > syn_buf->b_ml.ml_line_count)
-+     {
-+ 	/* a "\n" at the end of the pattern may take us below the last line */
-+ 	result->lnum = syn_buf->b_ml.ml_line_count;
-+ 	col = STRLEN(ml_get_buf(syn_buf, result->lnum, FALSE));
-+     }
-      if (off != 0)
-      {
-  	base = ml_get_buf(syn_buf, result->lnum, FALSE);
-*** ../vim-7.2.375/src/version.c	2010-02-24 16:58:30.000000000 +0100
---- src/version.c	2010-02-24 17:15:48.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     376,
-  /**/
-
--- 
-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.377 b/source/ap/vim/patches/7.2.377
deleted file mode 100644
index e854ce71..00000000
--- a/source/ap/vim/patches/7.2.377
+++ /dev/null
@@ -1,66 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.377 (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.377 (extra, after 7.2.372)
-Problem:    Misplaced assignment.  Duplicate build line for gvimext.dll.
-Solution:   Move setting CROSS_COMPILE to before ifneq.  Remove the wrong
-	    build line. (Markus Heidelberg)
-Files:	    src/Make_ming.mak
-
-
-*** ../vim-7.2.376/src/Make_ming.mak	2010-02-24 15:07:45.000000000 +0100
---- src/Make_ming.mak	2010-02-26 22:01:07.000000000 +0100
-***************
-*** 248,255 ****
-  DIRSLASH = /
-  else
-  # normal (Windows) compilation:
-- ifneq (sh.exe, $(SHELL))
-  CROSS_COMPILE =
-  DEL = rm
-  MKDIR = mkdir -p
-  DIRSLASH = /
---- 248,255 ----
-  DIRSLASH = /
-  else
-  # normal (Windows) compilation:
-  CROSS_COMPILE =
-+ ifneq (sh.exe, $(SHELL))
-  DEL = rm
-  MKDIR = mkdir -p
-  DIRSLASH = /
-***************
-*** 553,559 ****
-  	$(MAKE) -C xxd -f Make_cyg.mak CC=$(CC)
-  
-  GvimExt/gvimext.dll: GvimExt/gvimext.cpp GvimExt/gvimext.rc GvimExt/gvimext.h
-- 	$(MAKE) -C GvimExt -f Make_ming.mak
-  	$(MAKE) -C GvimExt -f Make_ming.mak CROSS=$(CROSS) CROSS_COMPILE=$(CROSS_COMPILE)
-  
-  clean:
---- 553,558 ----
-*** ../vim-7.2.376/src/version.c	2010-02-24 17:22:14.000000000 +0100
---- src/version.c	2010-02-26 22:01:45.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     377,
-  /**/
-
--- 
-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.378 b/source/ap/vim/patches/7.2.378
deleted file mode 100644
index de2251f4..00000000
--- a/source/ap/vim/patches/7.2.378
+++ /dev/null
@@ -1,69 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.378
-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.378
-Problem:    C function declaration indented too much. (Rui)
-Solution:   Don't see a line containing { or } as a type. (Matt Wozniski)
-Files:	    src/misc1.c
-
-
-*** ../vim-7.2.377/src/misc1.c	2010-01-06 17:46:03.000000000 +0100
---- src/misc1.c	2010-02-26 22:36:50.000000000 +0100
-***************
-*** 7727,7737 ****
-  	/*
-  	 * If the NEXT line is a function declaration, the current
-  	 * line needs to be indented as a function type spec.
-! 	 * Don't do this if the current line looks like a comment
-! 	 * or if the current line is terminated, ie. ends in ';'.
-  	 */
-  	else if (cur_curpos.lnum < curbuf->b_ml.ml_line_count
-  		&& !cin_nocode(theline)
-  		&& !cin_ends_in(theline, (char_u *)":", NULL)
-  		&& !cin_ends_in(theline, (char_u *)",", NULL)
-  		&& cin_isfuncdecl(NULL, cur_curpos.lnum + 1)
---- 7727,7740 ----
-  	/*
-  	 * If the NEXT line is a function declaration, the current
-  	 * line needs to be indented as a function type spec.
-! 	 * Don't do this if the current line looks like a comment or if the
-! 	 * current line is terminated, ie. ends in ';', or if the current line
-! 	 * contains { or }: "void f() {\n if (1)"
-  	 */
-  	else if (cur_curpos.lnum < curbuf->b_ml.ml_line_count
-  		&& !cin_nocode(theline)
-+ 		&& vim_strchr(theline, '{') == NULL
-+ 		&& vim_strchr(theline, '}') == NULL
-  		&& !cin_ends_in(theline, (char_u *)":", NULL)
-  		&& !cin_ends_in(theline, (char_u *)",", NULL)
-  		&& cin_isfuncdecl(NULL, cur_curpos.lnum + 1)
-*** ../vim-7.2.377/src/version.c	2010-02-26 22:05:17.000000000 +0100
---- src/version.c	2010-03-02 12:30:30.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     378,
-  /**/
-
--- 
-   An extraordinary TALL KNIGHT in all black (possibly John with Mike on his
-   shoulders) walks out from the dark trees.  He is extremely fierce and
-   gruesome countenance.  He walks towards KING ARTHUR and PATSY, who are
-   wazzing like mad.  (Salopian slang, meaning very scared.  almost to the
-   point of wetting oneself, e.g. before an important football match or
-   prior to a postering.  Salopian slang meaning a beating by the school
-   praeposters.  Sorry about the Salopian slant to this stage direction - Ed.)
-                 "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.379 b/source/ap/vim/patches/7.2.379
deleted file mode 100644
index 8a600e9e..00000000
--- a/source/ap/vim/patches/7.2.379
+++ /dev/null
@@ -1,55 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.379
-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.379
-Problem:    'eventignore' is set to an invalid value inside ":doau". (Antony
-	    Scriven)
-Solution:   Don't include the leading comma when the option was empty.
-Files:	    src/fileio.c
-
-
-*** ../vim-7.2.378/src/fileio.c	2010-01-19 14:59:14.000000000 +0100
---- src/fileio.c	2010-03-01 21:01:04.000000000 +0100
-***************
-*** 7925,7931 ****
-  	new_ei = vim_strnsave(p_ei, (int)(STRLEN(p_ei) + STRLEN(what)));
-  	if (new_ei != NULL)
-  	{
-! 	    STRCAT(new_ei, what);
-  	    set_string_option_direct((char_u *)"ei", -1, new_ei,
-  							  OPT_FREE, SID_NONE);
-  	    vim_free(new_ei);
---- 7925,7934 ----
-  	new_ei = vim_strnsave(p_ei, (int)(STRLEN(p_ei) + STRLEN(what)));
-  	if (new_ei != NULL)
-  	{
-! 	    if (*what == ',' && *p_ei == NUL)
-! 		STRCPY(new_ei, what + 1);
-! 	    else
-! 		STRCAT(new_ei, what);
-  	    set_string_option_direct((char_u *)"ei", -1, new_ei,
-  							  OPT_FREE, SID_NONE);
-  	    vim_free(new_ei);
-*** ../vim-7.2.378/src/version.c	2010-03-02 12:37:01.000000000 +0100
---- src/version.c	2010-03-02 12:46:45.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     379,
-  /**/
-
--- 
-Back up my hard drive?  I can't find the reverse switch!
-
- /// 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.380 b/source/ap/vim/patches/7.2.380
deleted file mode 100644
index 2cdd8318..00000000
--- a/source/ap/vim/patches/7.2.380
+++ /dev/null
@@ -1,104 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.380
-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.380 (after 7.2.363)
-Problem:    Perl interface builds with 5.10.1 but not with 5.10.0.
-Solution:   Change the #ifdefs. (Sergey Khorev)
-Files:	    src/if_perl.xs
-
-
-*** ../vim-7.2.379/src/if_perl.xs	2010-02-17 16:40:47.000000000 +0100
---- src/if_perl.xs	2010-03-02 15:07:01.000000000 +0100
-***************
-*** 62,67 ****
---- 62,72 ----
-  # define PERL589_OR_LATER
-  #endif
-  
-+ #if (PERL_REVISION == 5) && ((PERL_VERSION > 10) || \
-+     (PERL_VERSION == 10) && (PERL_SUBVERSION >= 1))
-+ # define PERL5101_OR_LATER
-+ #endif
-+ 
-  #ifndef pTHX
-  #    define pTHX void
-  #    define pTHX_
-***************
-*** 93,99 ****
-  # define perl_free dll_perl_free
-  # define Perl_get_context dll_Perl_get_context
-  # define Perl_croak dll_Perl_croak
-! # if (PERL_REVISION == 5) && (PERL_VERSION >= 10)
-  #  define Perl_croak_xs_usage dll_Perl_croak_xs_usage
-  # endif
-  # ifndef PROTO
---- 98,104 ----
-  # define perl_free dll_perl_free
-  # define Perl_get_context dll_Perl_get_context
-  # define Perl_croak dll_Perl_croak
-! # ifdef PERL5101_OR_LATER
-  #  define Perl_croak_xs_usage dll_Perl_croak_xs_usage
-  # endif
-  # ifndef PROTO
-***************
-*** 205,211 ****
-  static int (*perl_parse)(PerlInterpreter*, XSINIT_t, int, char**, char**);
-  static void* (*Perl_get_context)(void);
-  static void (*Perl_croak)(pTHX_ const char*, ...);
-! #if (PERL_REVISION == 5) && (PERL_VERSION >= 10)
-  static void (*Perl_croak_xs_usage)(pTHX_ const CV *const, const char *const params);
-  #endif
-  static void (*Perl_croak_nocontext)(const char*, ...);
---- 210,216 ----
-  static int (*perl_parse)(PerlInterpreter*, XSINIT_t, int, char**, char**);
-  static void* (*Perl_get_context)(void);
-  static void (*Perl_croak)(pTHX_ const char*, ...);
-! #ifdef PERL5101_OR_LATER
-  static void (*Perl_croak_xs_usage)(pTHX_ const CV *const, const char *const params);
-  #endif
-  static void (*Perl_croak_nocontext)(const char*, ...);
-***************
-*** 312,318 ****
-      {"perl_parse", (PERL_PROC*)&perl_parse},
-      {"Perl_get_context", (PERL_PROC*)&Perl_get_context},
-      {"Perl_croak", (PERL_PROC*)&Perl_croak},
-! #if (PERL_REVISION == 5) && (PERL_VERSION >= 10)
-      {"Perl_croak_xs_usage", (PERL_PROC*)&Perl_croak_xs_usage},
-  #endif
-      {"Perl_croak_nocontext", (PERL_PROC*)&Perl_croak_nocontext},
---- 317,323 ----
-      {"perl_parse", (PERL_PROC*)&perl_parse},
-      {"Perl_get_context", (PERL_PROC*)&Perl_get_context},
-      {"Perl_croak", (PERL_PROC*)&Perl_croak},
-! #ifdef PERL5101_OR_LATER
-      {"Perl_croak_xs_usage", (PERL_PROC*)&Perl_croak_xs_usage},
-  #endif
-      {"Perl_croak_nocontext", (PERL_PROC*)&Perl_croak_nocontext},
-*** ../vim-7.2.379/src/version.c	2010-03-02 12:47:58.000000000 +0100
---- src/version.c	2010-03-02 15:13:21.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     380,
-  /**/
-
--- 
-FATHER:       Make sure the Prince doesn't leave this room until I come and
-              get him.
-FIRST GUARD:  Not ... to leave the room ... even if you come and get him.
-FATHER:       No.  Until I come and get him.
-SECOND GUARD: Hic.
-                 "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.381 b/source/ap/vim/patches/7.2.381
deleted file mode 100644
index 977a8ecd..00000000
--- a/source/ap/vim/patches/7.2.381
+++ /dev/null
@@ -1,218 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.381
-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.381
-Problem:    No completion for :behave.
-Solution:   Add :behave completion.  Minor related fixes. (Dominique Pelle)
-Files:	    src/ex_docmd.c, src/ex_getln.c, src/proto/ex_docmd.pro, src/vim.h
-
-
-*** ../vim-7.2.380/src/ex_docmd.c	2010-02-03 15:14:15.000000000 +0100
---- src/ex_docmd.c	2010-03-02 15:55:05.000000000 +0100
-***************
-*** 26,35 ****
-      long_u	uc_argt;	/* The argument type */
-      char_u	*uc_rep;	/* The command's replacement string */
-      long	uc_def;		/* The default value for a range/count */
--     scid_T	uc_scriptID;	/* SID where the command was defined */
-      int		uc_compl;	/* completion type */
-! # if defined(FEAT_EVAL) && defined(FEAT_CMDL_COMPL)
-      char_u	*uc_compl_arg;	/* completion argument if any */
-  # endif
-  } ucmd_T;
-  
---- 26,37 ----
-      long_u	uc_argt;	/* The argument type */
-      char_u	*uc_rep;	/* The command's replacement string */
-      long	uc_def;		/* The default value for a range/count */
-      int		uc_compl;	/* completion type */
-! # ifdef FEAT_EVAL
-!     scid_T	uc_scriptID;	/* SID where the command was defined */
-! #  ifdef FEAT_CMDL_COMPL
-      char_u	*uc_compl_arg;	/* completion argument if any */
-+ #  endif
-  # endif
-  } ucmd_T;
-  
-***************
-*** 3156,3172 ****
-  	    return NULL;
-  	}
-  	for (ea.cmdidx = (cmdidx_T)0; (int)ea.cmdidx < (int)CMD_SIZE;
-! 					 ea.cmdidx = (cmdidx_T)((int)ea.cmdidx + 1))
-! 	    if (STRNCMP(cmdnames[(int)ea.cmdidx].cmd_name, cmd, (size_t)len) == 0)
-  		break;
-  
-  #ifdef FEAT_USR_CMDS
-  	if (cmd[0] >= 'A' && cmd[0] <= 'Z')
-- 	{
-  	    while (ASCII_ISALNUM(*p) || *p == '*')	/* Allow * wild card */
-  		++p;
-- 	    len = (int)(p - cmd);
-- 	}
-  #endif
-      }
-  
---- 3158,3172 ----
-  	    return NULL;
-  	}
-  	for (ea.cmdidx = (cmdidx_T)0; (int)ea.cmdidx < (int)CMD_SIZE;
-! 				   ea.cmdidx = (cmdidx_T)((int)ea.cmdidx + 1))
-! 	    if (STRNCMP(cmdnames[(int)ea.cmdidx].cmd_name, cmd,
-! 							    (size_t)len) == 0)
-  		break;
-  
-  #ifdef FEAT_USR_CMDS
-  	if (cmd[0] >= 'A' && cmd[0] <= 'Z')
-  	    while (ASCII_ISALNUM(*p) || *p == '*')	/* Allow * wild card */
-  		++p;
-  #endif
-      }
-  
-***************
-*** 3809,3814 ****
---- 3809,3817 ----
-  	    set_context_in_profile_cmd(xp, arg);
-  	    break;
-  #endif
-+ 	case CMD_behave:
-+ 	    xp->xp_context = EXPAND_BEHAVE;
-+ 	    break;
-  
-  #endif /* FEAT_CMDL_COMPL */
-  
-***************
-*** 10847,10852 ****
---- 10850,10873 ----
-  	EMSG2(_(e_invarg2), eap->arg);
-  }
-  
-+ #if defined(FEAT_CMDL_COMPL) || defined(PROTO)
-+ /*
-+  * Function given to ExpandGeneric() to obtain the possible arguments of the
-+  * ":behave {mswin,xterm}" command.
-+  */
-+     char_u *
-+ get_behave_arg(xp, idx)
-+     expand_T	*xp UNUSED;
-+     int		idx;
-+ {
-+     if (idx == 0)
-+ 	return (char_u *)"mswin";
-+     if (idx == 1)
-+ 	return (char_u *)"xterm";
-+     return NULL;
-+ }
-+ #endif
-+ 
-  #ifdef FEAT_AUTOCMD
-  static int filetype_detect = FALSE;
-  static int filetype_plugin = FALSE;
-*** ../vim-7.2.380/src/ex_getln.c	2010-02-03 15:14:15.000000000 +0100
---- src/ex_getln.c	2010-03-02 15:28:13.000000000 +0100
-***************
-*** 4492,4497 ****
---- 4492,4498 ----
-  	} tab[] =
-  	{
-  	    {EXPAND_COMMANDS, get_command_name, FALSE},
-+ 	    {EXPAND_BEHAVE, get_behave_arg, TRUE},
-  #ifdef FEAT_USR_CMDS
-  	    {EXPAND_USER_COMMANDS, get_user_commands, FALSE},
-  	    {EXPAND_USER_CMD_FLAGS, get_user_cmd_flags, FALSE},
-*** ../vim-7.2.380/src/proto/ex_docmd.pro	2008-07-04 11:43:13.000000000 +0200
---- src/proto/ex_docmd.pro	2010-03-02 15:37:37.000000000 +0100
-***************
-*** 52,55 ****
---- 52,56 ----
-  int put_eol __ARGS((FILE *fd));
-  int put_line __ARGS((FILE *fd, char *s));
-  void dialog_msg __ARGS((char_u *buff, char *format, char_u *fname));
-+ char_u *get_behave_arg __ARGS((expand_T *xp, int idx));
-  /* vim: set ft=c : */
-*** ../vim-7.2.380/src/vim.h	2010-02-24 14:46:58.000000000 +0100
---- src/vim.h	2010-03-02 15:30:13.000000000 +0100
-***************
-*** 595,601 ****
-  
-  /*
-   * Terminal highlighting attribute bits.
-!  * Attibutes above HL_ALL are used for syntax highlighting.
-   */
-  #define HL_NORMAL		0x00
-  #define HL_INVERSE		0x01
---- 595,601 ----
-  
-  /*
-   * Terminal highlighting attribute bits.
-!  * Attributes above HL_ALL are used for syntax highlighting.
-   */
-  #define HL_NORMAL		0x00
-  #define HL_INVERSE		0x01
-***************
-*** 721,726 ****
---- 721,727 ----
-  #define EXPAND_CSCOPE		33
-  #define EXPAND_SIGN		34
-  #define EXPAND_PROFILE		35
-+ #define EXPAND_BEHAVE		36
-  
-  /* Values for exmode_active (0 is no exmode) */
-  #define EXMODE_NORMAL		1
-***************
-*** 1262,1268 ****
-  } hlf_T;
-  
-  /* The HL_FLAGS must be in the same order as the HLF_ enums!
-!  * When chainging this also adjust the default for 'highlight'. */
-  #define HL_FLAGS {'8', '@', 'd', 'e', 'h', 'i', 'l', 'm', 'M', \
-  		  'n', 'r', 's', 'S', 'c', 't', 'v', 'V', 'w', 'W', \
-  		  'f', 'F', 'A', 'C', 'D', 'T', '>', \
---- 1263,1269 ----
-  } hlf_T;
-  
-  /* The HL_FLAGS must be in the same order as the HLF_ enums!
-!  * When changing this also adjust the default for 'highlight'. */
-  #define HL_FLAGS {'8', '@', 'd', 'e', 'h', 'i', 'l', 'm', 'M', \
-  		  'n', 'r', 's', 'S', 'c', 't', 'v', 'V', 'w', 'W', \
-  		  'f', 'F', 'A', 'C', 'D', 'T', '>', \
-***************
-*** 1430,1436 ****
-  #ifdef FEAT_MBYTE
-  /* We need to call mb_stricmp() even when we aren't dealing with a multi-byte
-   * encoding because mb_stricmp() takes care of all ascii and non-ascii
-!  * encodings, including characters with umluats in latin1, etc., while
-   * STRICMP() only handles the system locale version, which often does not
-   * handle non-ascii properly. */
-  
---- 1431,1437 ----
-  #ifdef FEAT_MBYTE
-  /* We need to call mb_stricmp() even when we aren't dealing with a multi-byte
-   * encoding because mb_stricmp() takes care of all ascii and non-ascii
-!  * encodings, including characters with umlauts in latin1, etc., while
-   * STRICMP() only handles the system locale version, which often does not
-   * handle non-ascii properly. */
-  
-*** ../vim-7.2.380/src/version.c	2010-03-02 15:14:22.000000000 +0100
---- src/version.c	2010-03-02 15:51:24.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     381,
-  /**/
-
--- 
-I'd like to meet the man who invented sex and see what he's working on now.
-
- /// 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.382 b/source/ap/vim/patches/7.2.382
deleted file mode 100644
index 56fcfa44..00000000
--- a/source/ap/vim/patches/7.2.382
+++ /dev/null
@@ -1,58 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.382
-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.382
-Problem:    Accessing freed memory when closing the cmdline window when
-	    'bufhide' is set to "wipe".
-Solution:   Check if the buffer still exists before invoking close_buffer()
-	    (Dominique Pelle)
-Files:	    src/ex_getln.c
-
-
-*** ../vim-7.2.381/src/ex_getln.c	2010-03-02 15:55:51.000000000 +0100
---- src/ex_getln.c	2010-03-02 16:29:38.000000000 +0100
-***************
-*** 6252,6258 ****
-  	bp = curbuf;
-  	win_goto(old_curwin);
-  	win_close(wp, TRUE);
-! 	close_buffer(NULL, bp, DOBUF_WIPE);
-  
-  	/* Restore window sizes. */
-  	win_size_restore(&winsizes);
---- 6252,6262 ----
-  	bp = curbuf;
-  	win_goto(old_curwin);
-  	win_close(wp, TRUE);
-! 
-! 	/* win_close() may have already wiped the buffer when 'bh' is
-! 	 * set to 'wipe' */
-! 	if (buf_valid(bp))
-! 	    close_buffer(NULL, bp, DOBUF_WIPE);
-  
-  	/* Restore window sizes. */
-  	win_size_restore(&winsizes);
-*** ../vim-7.2.381/src/version.c	2010-03-02 15:55:51.000000000 +0100
---- src/version.c	2010-03-02 17:22:11.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     382,
-  /**/
-
--- 
-You had connectors?  Eeee, when I were a lad we 'ad to carry the
-bits between the computer and the terminal with a spoon...
-
- /// 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.383 b/source/ap/vim/patches/7.2.383
deleted file mode 100644
index 25fa7142..00000000
--- a/source/ap/vim/patches/7.2.383
+++ /dev/null
@@ -1,101 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.383
-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.383
-Problem:    Vim doesn't build cleanly with MSVC 2010.
-Solution:   Change a few types. (George Reilly)
-Files:	    src/ex_cmds2.c, src/if_python.c, src/syntax.c
-
-
-*** ../vim-7.2.382/src/ex_cmds2.c	2010-02-24 13:59:08.000000000 +0100
---- src/ex_cmds2.c	2010-03-02 17:42:54.000000000 +0100
-***************
-*** 1165,1171 ****
-      char_u	*arg;
-  {
-      char_u	*end_subcmd;
--     int		len;
-  
-      /* Default: expand subcommands. */
-      xp->xp_context = EXPAND_PROFILE;
---- 1165,1170 ----
-***************
-*** 1176,1183 ****
-      if (*end_subcmd == NUL)
-  	return;
-  
-!     len = end_subcmd - arg;
-!     if (len == 5 && STRNCMP(arg, "start", 5) == 0)
-      {
-  	xp->xp_context = EXPAND_FILES;
-  	xp->xp_pattern = skipwhite(end_subcmd);
---- 1175,1181 ----
-      if (*end_subcmd == NUL)
-  	return;
-  
-!     if (end_subcmd - arg == 5 && STRNCMP(arg, "start", 5) == 0)
-      {
-  	xp->xp_context = EXPAND_FILES;
-  	xp->xp_pattern = skipwhite(end_subcmd);
-*** ../vim-7.2.382/src/if_python.c	2009-11-11 15:06:59.000000000 +0100
---- src/if_python.c	2010-03-02 17:43:39.000000000 +0100
-***************
-*** 2080,2086 ****
-  	    return -1;
-  
-  	/* When column is out of range silently correct it. */
-! 	len = STRLEN(ml_get_buf(this->win->w_buffer, lnum, FALSE));
-  	if (col > len)
-  	    col = len;
-  
---- 2080,2086 ----
-  	    return -1;
-  
-  	/* When column is out of range silently correct it. */
-! 	len = (long)STRLEN(ml_get_buf(this->win->w_buffer, lnum, FALSE));
-  	if (col > len)
-  	    col = len;
-  
-*** ../vim-7.2.382/src/syntax.c	2010-02-24 17:22:14.000000000 +0100
---- src/syntax.c	2010-03-02 17:45:25.000000000 +0100
-***************
-*** 3090,3096 ****
-      {
-  	/* a "\n" at the end of the pattern may take us below the last line */
-  	result->lnum = syn_buf->b_ml.ml_line_count;
-! 	col = STRLEN(ml_get_buf(syn_buf, result->lnum, FALSE));
-      }
-      if (off != 0)
-      {
---- 3090,3096 ----
-      {
-  	/* a "\n" at the end of the pattern may take us below the last line */
-  	result->lnum = syn_buf->b_ml.ml_line_count;
-! 	col = (int)STRLEN(ml_get_buf(syn_buf, result->lnum, FALSE));
-      }
-      if (off != 0)
-      {
-*** ../vim-7.2.382/src/version.c	2010-03-02 17:23:10.000000000 +0100
---- src/version.c	2010-03-02 17:48:50.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     383,
-  /**/
-
--- 
-You were lucky to have a LAKE! There were a hundred and sixty of
-us living in a small shoebox in the middle of the road.
-
- /// 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.384 b/source/ap/vim/patches/7.2.384
deleted file mode 100644
index 24fc6807..00000000
--- a/source/ap/vim/patches/7.2.384
+++ /dev/null
@@ -1,59 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.384 (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.384 (extra)
-Problem:    Vim doesn't build properly with MSVC 2010.
-Solution:   Add the nmake version to the build file. (George Reilly)
-Files:	    src/Make_mvc.mak, src/testdir/Make_dos.mak
-
-
-*** ../vim-7.2.383/src/Make_mvc.mak	2009-09-11 12:48:56.000000000 +0200
---- src/Make_mvc.mak	2010-03-02 17:44:22.000000000 +0100
-***************
-*** 361,366 ****
---- 361,369 ----
-  !if "$(_NMAKE_VER)" == "10.00.20506.01"
-  MSVCVER = 10.0
-  !endif
-+ !if "$(_NMAKE_VER)" == "10.00.30128.01"
-+ MSVCVER = 10.0
-+ !endif
-  !endif
-  
-  # Abort bulding VIM if version of VC is unrecognised.
-*** ../vim-7.2.383/src/testdir/Make_dos.mak	2010-01-19 15:51:29.000000000 +0100
---- src/testdir/Make_dos.mak	2010-03-02 17:45:48.000000000 +0100
-***************
-*** 56,61 ****
---- 56,62 ----
-  	-if exist small.vim del small.vim
-  	-if exist tiny.vim del tiny.vim
-  	-if exist mbyte.vim del mbyte.vim
-+ 	-if exist mzscheme.vim del mzscheme.vim
-  	-del X*
-  	-if exist viminfo del viminfo
-  
-*** ../vim-7.2.383/src/version.c	2010-03-02 17:50:30.000000000 +0100
---- src/version.c	2010-03-02 17:59:09.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     384,
-  /**/
-
--- 
-Yah, well, we had to carve our electrons out of driftwood we'd
-find.  In the winter.  Uphill.  Both ways.
-
- /// 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.385 b/source/ap/vim/patches/7.2.385
deleted file mode 100644
index 9f9a9178..00000000
--- a/source/ap/vim/patches/7.2.385
+++ /dev/null
@@ -1,63 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.385
-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.385
-Problem:    When in the command line window dragging status line only works
-	    for last-but-one window. (Jean Johner)
-Solution:   Remove the code that disallows this.
-Files:	    src/ui.c
-
-
-*** ../vim-7.2.384/src/ui.c	2010-01-19 14:59:14.000000000 +0100
---- src/ui.c	2010-03-02 18:06:30.000000000 +0100
-***************
-*** 2598,2611 ****
-  	if (cmdwin_type != 0 && wp != curwin)
-  	{
-  	    /* A click outside the command-line window: Use modeless
-! 	     * selection if possible.  Allow dragging the status line of
-! 	     * windows just above the command-line window. */
-! 	    if (wp->w_winrow + wp->w_height
-! 		       != curwin->w_prev->w_winrow + curwin->w_prev->w_height)
-! 	    {
-! 		on_status_line = 0;
-! 		dragwin = NULL;
-! 	    }
-  # ifdef FEAT_VERTSPLIT
-  	    on_sep_line = 0;
-  # endif
---- 2598,2604 ----
-  	if (cmdwin_type != 0 && wp != curwin)
-  	{
-  	    /* A click outside the command-line window: Use modeless
-! 	     * selection if possible.  Allow dragging the status lines. */
-  # ifdef FEAT_VERTSPLIT
-  	    on_sep_line = 0;
-  # endif
-*** ../vim-7.2.384/src/version.c	2010-03-02 17:59:39.000000000 +0100
---- src/version.c	2010-03-02 18:14:29.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     385,
-  /**/
-
--- 
-You were lucky. We lived for three months in a brown paper bag in a 
-septic tank. We used to have to get up at six o'clock in the morning, 
-clean the bag, eat a crust of stale bread, go to work down mill for 
-fourteen hours a day week in-week out. When we got home, our Dad
-would thrash us to sleep with his belt!
-
- /// 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.386 b/source/ap/vim/patches/7.2.386
deleted file mode 100644
index 7212b27c..00000000
--- a/source/ap/vim/patches/7.2.386
+++ /dev/null
@@ -1,61 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.386
-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.386
-Problem:    Focus hack for KDE 3.1 causes problems for other window managers.
-Solution:   Remove the hack. (forwarded by Joel Bradshaw)
-Files:	    src/gui_gtk.c
-
-
-*** ../vim-7.2.385/src/gui_gtk.c	2009-05-17 16:23:20.000000000 +0200
---- src/gui_gtk.c	2010-03-10 12:07:59.000000000 +0100
-***************
-*** 2313,2331 ****
-  	gtk_widget_destroy(dialog);
-      }
-  
--     /* Terrible hack: When the text area still has focus when we remove the
--      * dialog, somehow gvim loses window focus.  This is with "point to type"
--      * in the KDE 3.1 window manager.  Warp the mouse pointer to outside the
--      * window and back to avoid that. */
--     if (!gui.in_focus)
--     {
-- 	int x, y;
-- 
-- 	gdk_window_get_pointer(gui.drawarea->window, &x, &y, NULL);
-- 	gui_mch_setmouse(-100, -100);
-- 	gui_mch_setmouse(x, y);
--     }
-- 
-      return response > 0 ? response : 0;
-  }
-  
---- 2313,2318 ----
-*** ../vim-7.2.385/src/version.c	2010-03-02 18:15:47.000000000 +0100
---- src/version.c	2010-03-10 12:09:00.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     386,
-  /**/
-
--- 
-ARTHUR:  Well, I AM king...
-DENNIS:  Oh king, eh, very nice.  An' how'd you get that, eh?  By exploitin'
-         the workers -- by 'angin' on to outdated imperialist dogma which
-         perpetuates the economic an' social differences in our society!  If
-         there's ever going to be any progress--
-                                  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.387 b/source/ap/vim/patches/7.2.387
deleted file mode 100644
index ccbd6e4c..00000000
--- a/source/ap/vim/patches/7.2.387
+++ /dev/null
@@ -1,238 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.387
-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.387
-Problem:    Ruby with MingW still doesn't build all versions.
-Solution:   More #ifdefs for the  Ruby code. (Sergey Khorev)
-Files:	    src/if_ruby.c
-
-
-*** ../vim-7.2.386/src/if_ruby.c	2010-02-24 15:47:58.000000000 +0100
---- src/if_ruby.c	2010-03-10 12:40:30.000000000 +0100
-***************
-*** 39,46 ****
-  # define rb_cTrueClass		(*dll_rb_cTrueClass)
-  # if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
-  /*
-!  * On ver 1.8, all Ruby functions are exported with "__declspce(dllimport)"
-!  * in ruby.h.  But it cause trouble for these variables, because it is
-   * defined in this file.  When defined this RUBY_EXPORT it modified to
-   * "extern" and be able to avoid this problem.
-   */
---- 39,46 ----
-  # define rb_cTrueClass		(*dll_rb_cTrueClass)
-  # if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
-  /*
-!  * On ver 1.8, all Ruby functions are exported with "__declspec(dllimport)"
-!  * in ruby.h.  But it causes trouble for these variables, because it is
-   * defined in this file.  When defined this RUBY_EXPORT it modified to
-   * "extern" and be able to avoid this problem.
-   */
-***************
-*** 53,58 ****
---- 53,65 ----
-  # undef _WIN32_WINNT
-  #endif
-  
-+ #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
-+ /* Ruby 1.9 defines a number of static functions which use rb_num2long and
-+  * rb_int2big */
-+ # define rb_num2long rb_num2long_stub
-+ # define rb_int2big rb_int2big_stub
-+ #endif
-+ 
-  #include <ruby.h>
-  #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
-  # include <ruby/encoding.h>
-***************
-*** 159,165 ****
-  #define rb_str_concat			dll_rb_str_concat
-  #define rb_str_new			dll_rb_str_new
-  #define rb_str_new2			dll_rb_str_new2
-! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
-  # define rb_errinfo			dll_rb_errinfo
-  #else
-  # define ruby_errinfo			(*dll_ruby_errinfo)
---- 166,179 ----
-  #define rb_str_concat			dll_rb_str_concat
-  #define rb_str_new			dll_rb_str_new
-  #define rb_str_new2			dll_rb_str_new2
-! #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
-! # define rb_string_value_ptr		dll_rb_string_value_ptr
-! # define rb_float_new			dll_rb_float_new
-! # define rb_ary_new			dll_rb_ary_new
-! # define rb_ary_push			dll_rb_ary_push
-! #endif
-! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19 \
-!     || defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
-  # define rb_errinfo			dll_rb_errinfo
-  #else
-  # define ruby_errinfo			(*dll_ruby_errinfo)
-***************
-*** 226,232 ****
-  static VALUE (*dll_rb_str_concat) (VALUE, VALUE);
-  static VALUE (*dll_rb_str_new) (const char*, long);
-  static VALUE (*dll_rb_str_new2) (const char*);
-! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
-  static VALUE (*dll_rb_errinfo) (void);
-  #else
-  static VALUE *dll_ruby_errinfo;
---- 240,247 ----
-  static VALUE (*dll_rb_str_concat) (VALUE, VALUE);
-  static VALUE (*dll_rb_str_new) (const char*, long);
-  static VALUE (*dll_rb_str_new2) (const char*);
-! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19 \
-!     || defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
-  static VALUE (*dll_rb_errinfo) (void);
-  #else
-  static VALUE *dll_ruby_errinfo;
-***************
-*** 235,240 ****
---- 250,264 ----
-  static void (*dll_ruby_init_loadpath) (void);
-  static void (*dll_NtInitialize) (int*, char***);
-  #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
-+ static char * (*dll_rb_string_value_ptr) (volatile VALUE*);
-+ static VALUE (*dll_rb_float_new) (double);
-+ static VALUE (*dll_rb_ary_new) (void);
-+ static VALUE (*dll_rb_ary_push) (VALUE, VALUE);
-+ #endif
-+ #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
-+ static VALUE (*dll_rb_int2big)(SIGNED_VALUE);
-+ #endif
-+ #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
-  static int (*dll_rb_w32_snprintf)(char*, size_t, const char*, ...);
-  #endif
-  
-***************
-*** 246,251 ****
---- 270,286 ----
-  static VALUE (*dll_rb_sprintf) (const char*, ...);
-  #endif
-  
-+ #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
-+ static SIGNED_VALUE rb_num2long_stub(VALUE x)
-+ {
-+     return dll_rb_num2long(x);
-+ }
-+ static VALUE rb_int2big_stub(SIGNED_VALUE x)
-+ {
-+     return dll_rb_int2big(x);
-+ }
-+ #endif
-+ 
-  static HINSTANCE hinstRuby = 0; /* Instance of ruby.dll */
-  
-  /*
-***************
-*** 301,317 ****
-      {"rb_str_concat", (RUBY_PROC*)&dll_rb_str_concat},
-      {"rb_str_new", (RUBY_PROC*)&dll_rb_str_new},
-      {"rb_str_new2", (RUBY_PROC*)&dll_rb_str_new2},
-! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
-      {"rb_errinfo", (RUBY_PROC*)&dll_rb_errinfo},
-  #else
-      {"ruby_errinfo", (RUBY_PROC*)&dll_ruby_errinfo},
-  #endif
-      {"ruby_init", (RUBY_PROC*)&dll_ruby_init},
-      {"ruby_init_loadpath", (RUBY_PROC*)&dll_ruby_init_loadpath},
-!     {"NtInitialize", (RUBY_PROC*)&dll_NtInitialize},
-  #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
-      {"rb_w32_snprintf", (RUBY_PROC*)&dll_rb_w32_snprintf},
-  #endif
-  #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
-      {"ruby_script", (RUBY_PROC*)&dll_ruby_script},
-      {"rb_enc_find_index", (RUBY_PROC*)&dll_rb_enc_find_index},
---- 336,368 ----
-      {"rb_str_concat", (RUBY_PROC*)&dll_rb_str_concat},
-      {"rb_str_new", (RUBY_PROC*)&dll_rb_str_new},
-      {"rb_str_new2", (RUBY_PROC*)&dll_rb_str_new2},
-! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19 \
-!     || defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
-      {"rb_errinfo", (RUBY_PROC*)&dll_rb_errinfo},
-  #else
-      {"ruby_errinfo", (RUBY_PROC*)&dll_ruby_errinfo},
-  #endif
-      {"ruby_init", (RUBY_PROC*)&dll_ruby_init},
-      {"ruby_init_loadpath", (RUBY_PROC*)&dll_ruby_init_loadpath},
-!     {
-! #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER < 19
-!     "NtInitialize",
-! #else
-!     "ruby_sysinit",
-! #endif
-! 			(RUBY_PROC*)&dll_NtInitialize},
-  #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
-      {"rb_w32_snprintf", (RUBY_PROC*)&dll_rb_w32_snprintf},
-  #endif
-+ #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
-+     {"rb_string_value_ptr", (RUBY_PROC*)&dll_rb_string_value_ptr},
-+     {"rb_float_new", (RUBY_PROC*)&dll_rb_float_new},
-+     {"rb_ary_new", (RUBY_PROC*)&dll_rb_ary_new},
-+     {"rb_ary_push", (RUBY_PROC*)&dll_rb_ary_push},
-+ #endif
-+ #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
-+     {"rb_int2big", (RUBY_PROC*)&dll_rb_int2big},
-+ #endif
-  #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
-      {"ruby_script", (RUBY_PROC*)&dll_ruby_script},
-      {"rb_enc_find_index", (RUBY_PROC*)&dll_rb_enc_find_index},
-***************
-*** 569,575 ****
-  static void error_print(int state)
-  {
-  #ifndef DYNAMIC_RUBY
-! #if !(defined(RUBY_VERSION) &&  RUBY_VERSION >= 19)
-      RUBYEXTERN VALUE ruby_errinfo;
-  #endif
-  #endif
---- 620,627 ----
-  static void error_print(int state)
-  {
-  #ifndef DYNAMIC_RUBY
-! #if !(defined(RUBY_VERSION) && RUBY_VERSION >= 19) \
-!     && !(defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19)
-      RUBYEXTERN VALUE ruby_errinfo;
-  #endif
-  #endif
-***************
-*** 605,611 ****
-  	break;
-      case TAG_RAISE:
-      case TAG_FATAL:
-! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
-  	eclass = CLASS_OF(rb_errinfo());
-  	einfo = rb_obj_as_string(rb_errinfo());
-  #else
---- 657,664 ----
-  	break;
-      case TAG_RAISE:
-      case TAG_FATAL:
-! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19 \
-!     || defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
-  	eclass = CLASS_OF(rb_errinfo());
-  	einfo = rb_obj_as_string(rb_errinfo());
-  #else
-*** ../vim-7.2.386/src/version.c	2010-03-10 12:24:44.000000000 +0100
---- src/version.c	2010-03-10 12:45:55.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     387,
-  /**/
-
--- 
-Vim is like Emacs without all the typing.  (John "Johann" Spetz)
-
- /// 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.388 b/source/ap/vim/patches/7.2.388
deleted file mode 100644
index 1a8a7a88..00000000
--- a/source/ap/vim/patches/7.2.388
+++ /dev/null
@@ -1,86 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.388 (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.388 (extra part of 7.2.387)
-Problem:    Ruby with MingW still doesn't build all versions.
-Solution:   Different approach to build file. (Sergey Khorev)
-Files:	    src/Make_ming.mak
-
-
-*** ../vim-7.2.387/src/Make_ming.mak	2010-02-26 22:05:17.000000000 +0100
---- src/Make_ming.mak	2010-03-10 12:34:25.000000000 +0100
-***************
-*** 212,234 ****
-  RUBY_VER_LONG = 1.6
-  endif
-  
-- ifeq ($(RUBY_VER), 16)
-  ifndef RUBY_PLATFORM
-  RUBY_PLATFORM = i586-mswin32
-! endif
-! ifndef RUBY_INSTALL_NAME
-! RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_VER)
-! endif
-  else
-- ifndef RUBY_PLATFORM
-  RUBY_PLATFORM = i386-mswin32
-  endif
-  ifndef RUBY_INSTALL_NAME
-  RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_VER)
-  endif
-  endif
-  
-! RUBYINC =-I $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/$(RUBY_PLATFORM)
-  ifeq (no, $(DYNAMIC_RUBY))
-  RUBYLIB = -L$(RUBY)/lib -l$(RUBY_INSTALL_NAME)
-  endif
---- 212,236 ----
-  RUBY_VER_LONG = 1.6
-  endif
-  
-  ifndef RUBY_PLATFORM
-+ ifeq ($(RUBY_VER), 16)
-  RUBY_PLATFORM = i586-mswin32
-! else ifneq ("X$(wildcard, $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/i386-mingw32)", X)
-! RUBY_PLATFORM = i386-mingw32
-  else
-  RUBY_PLATFORM = i386-mswin32
-  endif
-+ endif
-+ 
-  ifndef RUBY_INSTALL_NAME
-+ ifeq ($(RUBY_VER), 16)
-+ RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_VER)
-+ else
-  RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_VER)
-  endif
-  endif
-  
-! RUBYINC =-I $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/$(RUBY_PLATFORM) -I $(RUBY)/include/ruby-$(RUBY_VER_LONG) -I $(RUBY)/include/ruby-$(RUBY_VER_LONG)/$(RUBY_PLATFORM)
-  ifeq (no, $(DYNAMIC_RUBY))
-  RUBYLIB = -L$(RUBY)/lib -l$(RUBY_INSTALL_NAME)
-  endif
-*** ../vim-7.2.387/src/version.c	2010-03-10 12:46:38.000000000 +0100
---- src/version.c	2010-03-10 13:18:38.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     388,
-  /**/
-
--- 
-Q: Is selling software the same as selling hardware?
-A: No, good hardware is sold new, good software has already been used by many.
-
- /// 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.389 b/source/ap/vim/patches/7.2.389
deleted file mode 100644
index a4af355f..00000000
--- a/source/ap/vim/patches/7.2.389
+++ /dev/null
@@ -1,161 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.389
-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.389
-Problem:    synIDattr() cannot return the font.
-Solution:   Support the "font" argument. (Christian Brabandt)
-Files:	    runtime/doc/eval.txt, src/eval.c, src/syntax.c
-
-
-*** ../vim-7.2.388/runtime/doc/eval.txt	2010-01-19 15:51:29.000000000 +0100
---- runtime/doc/eval.txt	2010-03-10 12:52:12.000000000 +0100
-***************
-*** 5370,5375 ****
---- 5388,5395 ----
-  				the color, cterm: color number as a string,
-  				term: empty string)
-  		"bg"		background color (as with "fg")
-+ 		"font"		font name (only available in the GUI)
-+ 				|highlight-font|
-  		"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
-***************
-*** 5379,5384 ****
---- 5399,5405 ----
-  		"italic"	"1" if italic
-  		"reverse"	"1" if reverse
-  		"inverse"	"1" if inverse (= reverse)
-+ 		"standout"	"1" if standout
-  		"underline"	"1" if underlined
-  		"undercurl"	"1" if undercurled
-  
-*** ../vim-7.2.388/src/eval.c	2010-02-24 15:47:58.000000000 +0100
---- src/eval.c	2010-03-10 12:54:27.000000000 +0100
-***************
-*** 16627,16633 ****
-  		    p = highlight_has_attr(id, HL_BOLD, modec);
-  		break;
-  
-! 	case 'f':					/* fg[#] */
-  		p = highlight_color(id, what, modec);
-  		break;
-  
---- 16627,16633 ----
-  		    p = highlight_has_attr(id, HL_BOLD, modec);
-  		break;
-  
-! 	case 'f':					/* fg[#] or font */
-  		p = highlight_color(id, what, modec);
-  		break;
-  
-*** ../vim-7.2.388/src/syntax.c	2010-03-02 17:50:30.000000000 +0100
---- src/syntax.c	2010-03-10 13:05:39.000000000 +0100
-***************
-*** 8326,8332 ****
-      char_u *
-  highlight_color(id, what, modec)
-      int		id;
-!     char_u	*what;	/* "fg", "bg", "sp", "fg#", "bg#" or "sp#" */
-      int		modec;	/* 'g' for GUI, 'c' for cterm, 't' for term */
-  {
-      static char_u	name[20];
---- 8326,8332 ----
-      char_u *
-  highlight_color(id, what, modec)
-      int		id;
-!     char_u	*what;	/* "font", "fg", "bg", "sp", "fg#", "bg#" or "sp#" */
-      int		modec;	/* 'g' for GUI, 'c' for cterm, 't' for term */
-  {
-      static char_u	name[20];
-***************
-*** 8334,8353 ****
-      int			fg = FALSE;
-  # ifdef FEAT_GUI
-      int			sp = FALSE;
-  # endif
-  
-      if (id <= 0 || id > highlight_ga.ga_len)
-  	return NULL;
-  
-!     if (TOLOWER_ASC(what[0]) == 'f')
-  	fg = TRUE;
-  # ifdef FEAT_GUI
-!     else if (TOLOWER_ASC(what[0]) == 's')
-  	sp = TRUE;
-      if (modec == 'g')
-      {
-  	/* return #RRGGBB form (only possible when GUI is running) */
-! 	if (gui.in_use && what[1] && what[2] == '#')
-  	{
-  	    guicolor_T		color;
-  	    long_u		rgb;
---- 8334,8363 ----
-      int			fg = FALSE;
-  # ifdef FEAT_GUI
-      int			sp = FALSE;
-+     int			font = FALSE;
-  # endif
-  
-      if (id <= 0 || id > highlight_ga.ga_len)
-  	return NULL;
-  
-!     if (TOLOWER_ASC(what[0]) == 'f' && TOLOWER_ASC(what[1]) == 'g')
-  	fg = TRUE;
-  # ifdef FEAT_GUI
-!     else if (TOLOWER_ASC(what[0]) == 'f' && TOLOWER_ASC(what[1]) == 'o'
-!              && TOLOWER_ASC(what[2]) == 'n' && TOLOWER_ASC(what[3]) == 't')
-! 	font = TRUE;
-!     else if (TOLOWER_ASC(what[0]) == 's' && TOLOWER_ASC(what[1]) == 'p')
-  	sp = TRUE;
-+     else if (!(TOLOWER_ASC(what[0]) == 'b' && TOLOWER_ASC(what[1]) == 'g'))
-+ 	return NULL;
-      if (modec == 'g')
-      {
-+ 	/* return font name */
-+ 	if (font)
-+ 	    return HL_TABLE()[id - 1].sg_font_name;
-+ 
-  	/* return #RRGGBB form (only possible when GUI is running) */
-! 	if (gui.in_use && what[2] == '#')
-  	{
-  	    guicolor_T		color;
-  	    long_u		rgb;
-***************
-*** 8374,8379 ****
---- 8384,8391 ----
-  	    return (HL_TABLE()[id - 1].sg_gui_sp_name);
-  	return (HL_TABLE()[id - 1].sg_gui_bg_name);
-      }
-+     if (font || sp)
-+ 	return NULL;
-  # endif
-      if (modec == 'c')
-      {
-*** ../vim-7.2.388/src/version.c	2010-03-10 13:19:28.000000000 +0100
---- src/version.c	2010-03-10 13:33:25.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     389,
-  /**/
-
--- 
-WOMAN:   Dennis, there's some lovely filth down here.  Oh -- how d'you do?
-ARTHUR:  How do you do, good lady.  I am Arthur, King of the Britons.
-         Who's castle is that?
-WOMAN:   King of the who?
-                                  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.390 b/source/ap/vim/patches/7.2.390
deleted file mode 100644
index d10ed2a4..00000000
--- a/source/ap/vim/patches/7.2.390
+++ /dev/null
@@ -1,72 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.390
-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.390
-Problem:    In some situations the popup menu can be displayed wrong.
-Solution:   Remove the popup menu if the cursor moved. (Lech Lorens)
-Files:	    src/edit.c
-
-
-*** ../vim-7.2.389/src/edit.c	2010-01-19 14:59:14.000000000 +0100
---- src/edit.c	2010-03-10 14:09:56.000000000 +0100
-***************
-*** 4684,4689 ****
---- 4684,4690 ----
-      int		startcol = 0;	    /* column where searched text starts */
-      colnr_T	curs_col;	    /* cursor column */
-      int		n;
-+     int		save_w_wrow;
-  
-      compl_direction = ins_compl_key2dir(c);
-      if (!compl_started)
-***************
-*** 5067,5072 ****
---- 5068,5074 ----
-      /*
-       * Find next match (and following matches).
-       */
-+     save_w_wrow = curwin->w_wrow;
-      n = ins_compl_next(TRUE, ins_compl_key2count(c), ins_compl_use_match(c));
-  
-      /* may undisplay the popup menu */
-***************
-*** 5220,5225 ****
---- 5222,5233 ----
-  	/* RedrawingDisabled may be set when invoked through complete(). */
-  	n = RedrawingDisabled;
-  	RedrawingDisabled = 0;
-+ 
-+ 	/* If the cursor moved we need to remove the pum first. */
-+ 	setcursor();
-+ 	if (save_w_wrow != curwin->w_wrow)
-+ 	    ins_compl_del_pum();
-+ 
-  	ins_compl_show_pum();
-  	setcursor();
-  	RedrawingDisabled = n;
-*** ../vim-7.2.389/src/version.c	2010-03-10 13:43:22.000000000 +0100
---- src/version.c	2010-03-10 14:13:55.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     390,
-  /**/
-
--- 
-`When any government, or any church for that matter, undertakes to say to
- its subjects, "This you may not read, this you must not see, this you are
- forbidden to know," the end result is tyranny and oppression no matter how
- holy the motives' -- Robert A Heinlein, "If this goes on --"
-
- /// 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.391 b/source/ap/vim/patches/7.2.391
deleted file mode 100644
index 731408de..00000000
--- a/source/ap/vim/patches/7.2.391
+++ /dev/null
@@ -1,121 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.391
-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.391
-Problem:    Internal alloc(0) error when doing "CTRL-V $ c". (Martti Kuparinen)
-Solution:   Fix computations in getvcol(). (partly by Lech Lorens)
-Files:	    src/charset.c, src/memline.c
-
-
-*** ../vim-7.2.390/src/charset.c	2009-11-03 16:03:59.000000000 +0100
---- src/charset.c	2010-03-10 14:38:14.000000000 +0100
-***************
-*** 1255,1261 ****
-  
-      vcol = 0;
-      ptr = ml_get_buf(wp->w_buffer, pos->lnum, FALSE);
-!     posptr = ptr + pos->col;
-  
-      /*
-       * This function is used very often, do some speed optimizations.
---- 1255,1264 ----
-  
-      vcol = 0;
-      ptr = ml_get_buf(wp->w_buffer, pos->lnum, FALSE);
-!     if (pos->col == MAXCOL)
-! 	posptr = NULL;  /* continue until the NUL */
-!     else
-! 	posptr = ptr + pos->col;
-  
-      /*
-       * This function is used very often, do some speed optimizations.
-***************
-*** 1313,1319 ****
-  		    incr = CHARSIZE(c);
-  	    }
-  
-! 	    if (ptr >= posptr)	/* character at pos->col */
-  		break;
-  
-  	    vcol += incr;
---- 1316,1322 ----
-  		    incr = CHARSIZE(c);
-  	    }
-  
-! 	    if (posptr != NULL && ptr >= posptr) /* character at pos->col */
-  		break;
-  
-  	    vcol += incr;
-***************
-*** 1334,1340 ****
-  		break;
-  	    }
-  
-! 	    if (ptr >= posptr)	/* character at pos->col */
-  		break;
-  
-  	    vcol += incr;
---- 1337,1343 ----
-  		break;
-  	    }
-  
-! 	    if (posptr != NULL && ptr >= posptr) /* character at pos->col */
-  		break;
-  
-  	    vcol += incr;
-*** ../vim-7.2.390/src/memline.c	2010-02-11 18:54:38.000000000 +0100
---- src/memline.c	2010-03-10 14:38:25.000000000 +0100
-***************
-*** 2113,2124 ****
-      if (buf->b_ml.ml_mfp == NULL)	/* there are no lines */
-  	return (char_u *)"";
-  
-! /*
-!  * See if it is the same line as requested last time.
-!  * Otherwise may need to flush last used line.
-!  * Don't use the last used line when 'swapfile' is reset, need to load all
-!  * blocks.
-!  */
-      if (buf->b_ml.ml_line_lnum != lnum || mf_dont_release)
-      {
-  	ml_flush_line(buf);
---- 2113,2124 ----
-      if (buf->b_ml.ml_mfp == NULL)	/* there are no lines */
-  	return (char_u *)"";
-  
-!     /*
-!      * See if it is the same line as requested last time.
-!      * Otherwise may need to flush last used line.
-!      * Don't use the last used line when 'swapfile' is reset, need to load all
-!      * blocks.
-!      */
-      if (buf->b_ml.ml_line_lnum != lnum || mf_dont_release)
-      {
-  	ml_flush_line(buf);
-*** ../vim-7.2.390/src/version.c	2010-03-10 14:15:28.000000000 +0100
---- src/version.c	2010-03-10 14:31:02.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     391,
-  /**/
-
--- 
-WOMAN:   King of the who?
-ARTHUR:  The Britons.
-WOMAN:   Who are the Britons?
-ARTHUR:  Well, we all are. we're all Britons and 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.392 b/source/ap/vim/patches/7.2.392
deleted file mode 100644
index c253d91b..00000000
--- a/source/ap/vim/patches/7.2.392
+++ /dev/null
@@ -1,184 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.392
-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.392
-Problem:    Netbeans hangs reading from a socket at the maximum block size.
-Solution:   Use select() or poll(). (Xavier de Gaye)
-Files:	    src/vim.h, src/os_unixx.h, src/if_xcmdsrv.c, src/netbeans.c
-
-
-*** ../vim-7.2.391/src/vim.h	2010-03-02 15:55:51.000000000 +0100
---- src/vim.h	2010-03-10 15:14:03.000000000 +0100
-***************
-*** 477,482 ****
---- 477,499 ----
-  # include <stdarg.h>
-  #endif
-  
-+ # if defined(HAVE_SYS_SELECT_H) && \
-+ 	(!defined(HAVE_SYS_TIME_H) || defined(SYS_SELECT_WITH_SYS_TIME))
-+ #  include <sys/select.h>
-+ # endif
-+ 
-+ # ifndef HAVE_SELECT
-+ #  ifdef HAVE_SYS_POLL_H
-+ #   include <sys/poll.h>
-+ #   define HAVE_POLL
-+ #  else
-+ #   ifdef HAVE_POLL_H
-+ #    include <poll.h>
-+ #    define HAVE_POLL
-+ #   endif
-+ #  endif
-+ # endif
-+ 
-  /* ================ end of the header file puzzle =============== */
-  
-  /*
-*** ../vim-7.2.391/src/os_unixx.h	2006-03-25 22:48:00.000000000 +0100
---- src/os_unixx.h	2010-03-10 15:14:49.000000000 +0100
-***************
-*** 28,38 ****
-  #  include <sys/wait.h>
-  # endif
-  
-- # if defined(HAVE_SYS_SELECT_H) && \
-- 	(!defined(HAVE_SYS_TIME_H) || defined(SYS_SELECT_WITH_SYS_TIME))
-- #  include <sys/select.h>
-- # endif
-- 
-  # ifndef WEXITSTATUS
-  #  ifdef HAVE_UNION_WAIT
-  #   define WEXITSTATUS(stat_val) ((stat_val).w_T.w_Retcode)
---- 28,33 ----
-***************
-*** 65,80 ****
-  # include <string.h>
-  #endif
-  
-- #ifndef HAVE_SELECT
-- # ifdef HAVE_SYS_POLL_H
-- #  include <sys/poll.h>
-- # else
-- #  ifdef HAVE_POLL_H
-- #   include <poll.h>
-- #  endif
-- # endif
-- #endif
-- 
-  #ifdef HAVE_SYS_STREAM_H
-  # include <sys/stream.h>
-  #endif
---- 60,65 ----
-*** ../vim-7.2.391/src/if_xcmdsrv.c	2009-05-16 17:29:37.000000000 +0200
---- src/if_xcmdsrv.c	2010-03-10 15:14:09.000000000 +0100
-***************
-*** 21,41 ****
-  #  include <X11/Xatom.h>
-  # endif
-  
-- # if defined(HAVE_SYS_SELECT_H) && \
-- 	(!defined(HAVE_SYS_TIME_H) || defined(SYS_SELECT_WITH_SYS_TIME))
-- #  include <sys/select.h>
-- # endif
-- 
-- # ifndef HAVE_SELECT
-- #  ifdef HAVE_SYS_POLL_H
-- #   include <sys/poll.h>
-- #  else
-- #   ifdef HAVE_POLL_H
-- #    include <poll.h>
-- #   endif
-- #  endif
-- # endif
-- 
-  /*
-   * This file provides procedures that implement the command server
-   * functionality of Vim when in contact with an X11 server.
---- 21,26 ----
-*** ../vim-7.2.391/src/netbeans.c	2010-01-19 15:12:33.000000000 +0100
---- src/netbeans.c	2010-03-10 15:21:37.000000000 +0100
-***************
-*** 736,741 ****
---- 736,749 ----
-  #ifndef FEAT_GUI_GTK
-      static int		level = 0;
-  #endif
-+ #ifdef HAVE_SELECT
-+     struct timeval	tval;
-+     fd_set		rfds;
-+ #else
-+ # ifdef HAVE_POLL
-+     struct pollfd	fds;
-+ # endif
-+ #endif
-  
-      if (sd < 0)
-      {
-***************
-*** 755,763 ****
-  	    return;	/* out of memory! */
-      }
-  
-!     /* Keep on reading for as long as there is something to read. */
-      for (;;)
-      {
-  	len = sock_read(sd, buf, MAXMSGSIZE);
-  	if (len <= 0)
-  	    break;	/* error or nothing more to read */
---- 763,788 ----
-  	    return;	/* out of memory! */
-      }
-  
-!     /* Keep on reading for as long as there is something to read.
-!      * Use select() or poll() to avoid blocking on a message that is exactly
-!      * MAXMSGSIZE long. */
-      for (;;)
-      {
-+ #ifdef HAVE_SELECT
-+ 	FD_ZERO(&rfds);
-+         FD_SET(sd, &rfds);
-+         tval.tv_sec = 0;
-+         tval.tv_usec = 0;
-+         if (select(sd + 1, &rfds, NULL, NULL, &tval) <= 0)
-+             break;
-+ #else
-+ # ifdef HAVE_POLL
-+ 	fds.fd = sd;
-+ 	fds.events = POLLIN;
-+         if (poll(&fds, 1, 0) <= 0)
-+             break;
-+ # endif
-+ #endif
-  	len = sock_read(sd, buf, MAXMSGSIZE);
-  	if (len <= 0)
-  	    break;	/* error or nothing more to read */
-*** ../vim-7.2.391/src/version.c	2010-03-10 14:46:21.000000000 +0100
---- src/version.c	2010-03-10 16:10:48.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     392,
-  /**/
-
--- 
-WOMAN:   I didn't know we had a king. I thought we were an autonomous
-         collective.
-DENNIS:  You're fooling yourself.  We're living in a dictatorship.  A
-         self-perpetuating autocracy in which the working classes--
-WOMAN:   Oh there you go, bringing class into it again.
-DENNIS:  That's what it's all about if only people would--
-                                  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.393 b/source/ap/vim/patches/7.2.393
deleted file mode 100644
index 796f6548..00000000
--- a/source/ap/vim/patches/7.2.393
+++ /dev/null
@@ -1,281 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.393
-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.393
-Problem:    Mac: Can't build with different Xcode developer tools directory.
-Solution:   make "Developer" directory name configurable. (Rainer Muller)
-Files:	    src/configure.in, src/auto/configure
-
-
-*** ../vim-7.2.392/src/configure.in	2010-02-24 14:46:58.000000000 +0100
---- src/configure.in	2010-03-10 16:16:48.000000000 +0100
-***************
-*** 116,121 ****
---- 116,137 ----
-  	MACARCH="$withval"; AC_MSG_RESULT($MACARCH),
-  	MACARCH="current"; AC_MSG_RESULT(defaulting to $MACARCH))
-  
-+   AC_MSG_CHECKING(--with-developer-dir argument)
-+   AC_ARG_WITH(developer-dir, [  --with-developer-dir=PATH    use PATH as location for Xcode developer tools],
-+ 	DEVELOPER_DIR="$withval"; AC_MSG_RESULT($DEVELOPER_DIR),
-+         DEVELOPER_DIR=""; AC_MSG_RESULT(not present))
-+   
-+   if test "x$DEVELOPER_DIR" = "x"; then
-+     AC_PATH_PROG(XCODE_SELECT, xcode-select)
-+     if test "x$XCODE_SELECT" != "x"; then
-+       AC_MSG_CHECKING(for developer dir using xcode-select)
-+       DEVELOPER_DIR=`$XCODE_SELECT -print-path`
-+       AC_MSG_RESULT([$DEVELOPER_DIR])
-+     else
-+       DEVELOPER_DIR=/Developer
-+     fi
-+   fi
-+ 
-    if test "x$MACARCH" = "xboth"; then
-      AC_MSG_CHECKING(for 10.4 universal SDK)
-      dnl There is a terrible inconsistency (but we appear to get away with it):
-***************
-*** 127,133 ****
-      save_cppflags="$CPPFLAGS"
-      save_cflags="$CFLAGS"
-      save_ldflags="$LDFLAGS"
-!     CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
-      AC_TRY_LINK([ ], [ ],
-  	AC_MSG_RESULT(found, will make universal binary),
-  
---- 143,149 ----
-      save_cppflags="$CPPFLAGS"
-      save_cflags="$CFLAGS"
-      save_ldflags="$LDFLAGS"
-!     CFLAGS="$CFLAGS -isysroot $DEVELOPER_DIR/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
-      AC_TRY_LINK([ ], [ ],
-  	AC_MSG_RESULT(found, will make universal binary),
-  
-***************
-*** 157,165 ****
-      dnl TODO: use -arch i386 on Intel machines
-      CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX -no-cpp-precomp"
-      if test "x$MACARCH" = "xboth"; then
-!       CPPFLAGS="$CPPFLAGS -I/Developer/SDKs/MacOSX10.4u.sdk/Developer/Headers/FlatCarbon"
-      else
-!       CPPFLAGS="$CPPFLAGS -I/Developer/Headers/FlatCarbon"
-      fi
-  
-      dnl If Carbon is found, assume we don't want X11
---- 173,181 ----
-      dnl TODO: use -arch i386 on Intel machines
-      CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX -no-cpp-precomp"
-      if test "x$MACARCH" = "xboth"; then
-!       CPPFLAGS="$CPPFLAGS -I$DEVELOPER_DIR/SDKs/MacOSX10.4u.sdk/Developer/Headers/FlatCarbon"
-      else
-!       CPPFLAGS="$CPPFLAGS -I$DEVELOPER_DIR/Headers/FlatCarbon"
-      fi
-  
-      dnl If Carbon is found, assume we don't want X11
-***************
-*** 3233,3239 ****
-    fi
-  fi
-  if test "x$MACARCH" = "xboth"; then
-!   LDFLAGS="$LDFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
-  fi
-  
-  dnl gcc 3.1 changed the meaning of -MM.  The only solution appears to be to
---- 3249,3255 ----
-    fi
-  fi
-  if test "x$MACARCH" = "xboth"; then
-!   LDFLAGS="$LDFLAGS -isysroot $DEVELOPER_DIR/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
-  fi
-  
-  dnl gcc 3.1 changed the meaning of -MM.  The only solution appears to be to
-*** ../vim-7.2.392/src/auto/configure	2010-02-24 14:46:58.000000000 +0100
---- src/auto/configure	2010-03-10 16:19:47.000000000 +0100
-***************
-*** 718,723 ****
---- 718,724 ----
-  VIMNAME
-  OS_EXTRA_OBJ
-  OS_EXTRA_SRC
-+ XCODE_SELECT
-  CPP_MM
-  STRIP
-  AWK
-***************
-*** 774,779 ****
---- 775,781 ----
-  enable_option_checking
-  enable_darwin
-  with_mac_arch
-+ with_developer_dir
-  with_local_dir
-  with_vim_name
-  with_ex_name
-***************
-*** 1492,1497 ****
---- 1494,1500 ----
-    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-    --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-    --with-mac-arch=ARCH    current, intel, ppc or both
-+   --with-developer-dir=PATH    use PATH as location for Xcode developer tools
-    --with-local-dir=PATH   search PATH instead of /usr/local for local libraries.
-    --without-local-dir     do not search /usr/local for local libraries.
-    --with-vim-name=NAME    what to call the Vim executable
-***************
-*** 3833,3845 ****
-  fi
-  
-  
-    if test "x$MACARCH" = "xboth"; then
-      { $as_echo "$as_me:$LINENO: checking for 10.4 universal SDK" >&5
-  $as_echo_n "checking for 10.4 universal SDK... " >&6; }
-                              save_cppflags="$CPPFLAGS"
-      save_cflags="$CFLAGS"
-      save_ldflags="$LDFLAGS"
-!     CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
-      cat >conftest.$ac_ext <<_ACEOF
-  /* confdefs.h.  */
-  _ACEOF
---- 3836,3913 ----
-  fi
-  
-  
-+   { $as_echo "$as_me:$LINENO: checking --with-developer-dir argument" >&5
-+ $as_echo_n "checking --with-developer-dir argument... " >&6; }
-+ 
-+ # Check whether --with-developer-dir was given.
-+ if test "${with_developer_dir+set}" = set; then
-+   withval=$with_developer_dir; DEVELOPER_DIR="$withval"; { $as_echo "$as_me:$LINENO: result: $DEVELOPER_DIR" >&5
-+ $as_echo "$DEVELOPER_DIR" >&6; }
-+ else
-+   DEVELOPER_DIR=""; { $as_echo "$as_me:$LINENO: result: not present" >&5
-+ $as_echo "not present" >&6; }
-+ fi
-+ 
-+ 
-+   if test "x$DEVELOPER_DIR" = "x"; then
-+     # Extract the first word of "xcode-select", so it can be a program name with args.
-+ set dummy xcode-select; ac_word=$2
-+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+ $as_echo_n "checking for $ac_word... " >&6; }
-+ if test "${ac_cv_path_XCODE_SELECT+set}" = set; then
-+   $as_echo_n "(cached) " >&6
-+ else
-+   case $XCODE_SELECT in
-+   [\\/]* | ?:[\\/]*)
-+   ac_cv_path_XCODE_SELECT="$XCODE_SELECT" # Let the user override the test with a path.
-+   ;;
-+   *)
-+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+ for as_dir in $PATH
-+ do
-+   IFS=$as_save_IFS
-+   test -z "$as_dir" && as_dir=.
-+   for ac_exec_ext in '' $ac_executable_extensions; do
-+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+     ac_cv_path_XCODE_SELECT="$as_dir/$ac_word$ac_exec_ext"
-+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+     break 2
-+   fi
-+ done
-+ done
-+ IFS=$as_save_IFS
-+ 
-+   ;;
-+ esac
-+ fi
-+ XCODE_SELECT=$ac_cv_path_XCODE_SELECT
-+ if test -n "$XCODE_SELECT"; then
-+   { $as_echo "$as_me:$LINENO: result: $XCODE_SELECT" >&5
-+ $as_echo "$XCODE_SELECT" >&6; }
-+ else
-+   { $as_echo "$as_me:$LINENO: result: no" >&5
-+ $as_echo "no" >&6; }
-+ fi
-+ 
-+ 
-+     if test "x$XCODE_SELECT" != "x"; then
-+       { $as_echo "$as_me:$LINENO: checking for developer dir using xcode-select" >&5
-+ $as_echo_n "checking for developer dir using xcode-select... " >&6; }
-+       DEVELOPER_DIR=`$XCODE_SELECT -print-path`
-+       { $as_echo "$as_me:$LINENO: result: $DEVELOPER_DIR" >&5
-+ $as_echo "$DEVELOPER_DIR" >&6; }
-+     else
-+       DEVELOPER_DIR=/Developer
-+     fi
-+   fi
-+ 
-    if test "x$MACARCH" = "xboth"; then
-      { $as_echo "$as_me:$LINENO: checking for 10.4 universal SDK" >&5
-  $as_echo_n "checking for 10.4 universal SDK... " >&6; }
-                              save_cppflags="$CPPFLAGS"
-      save_cflags="$CFLAGS"
-      save_ldflags="$LDFLAGS"
-!     CFLAGS="$CFLAGS -isysroot $DEVELOPER_DIR/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
-      cat >conftest.$ac_ext <<_ACEOF
-  /* confdefs.h.  */
-  _ACEOF
-***************
-*** 3960,3968 ****
-      OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o"
-          CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX -no-cpp-precomp"
-      if test "x$MACARCH" = "xboth"; then
-!       CPPFLAGS="$CPPFLAGS -I/Developer/SDKs/MacOSX10.4u.sdk/Developer/Headers/FlatCarbon"
-      else
-!       CPPFLAGS="$CPPFLAGS -I/Developer/Headers/FlatCarbon"
-      fi
-  
-                  # On IRIX 5.3, sys/types and inttypes.h are conflicting.
---- 4028,4036 ----
-      OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o"
-          CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX -no-cpp-precomp"
-      if test "x$MACARCH" = "xboth"; then
-!       CPPFLAGS="$CPPFLAGS -I$DEVELOPER_DIR/SDKs/MacOSX10.4u.sdk/Developer/Headers/FlatCarbon"
-      else
-!       CPPFLAGS="$CPPFLAGS -I$DEVELOPER_DIR/Headers/FlatCarbon"
-      fi
-  
-                  # On IRIX 5.3, sys/types and inttypes.h are conflicting.
-***************
-*** 17319,17325 ****
-    fi
-  fi
-  if test "x$MACARCH" = "xboth"; then
-!   LDFLAGS="$LDFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
-  fi
-  
-  DEPEND_CFLAGS_FILTER=
---- 17387,17393 ----
-    fi
-  fi
-  if test "x$MACARCH" = "xboth"; then
-!   LDFLAGS="$LDFLAGS -isysroot $DEVELOPER_DIR/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
-  fi
-  
-  DEPEND_CFLAGS_FILTER=
-*** ../vim-7.2.392/src/version.c	2010-03-10 16:11:57.000000000 +0100
---- src/version.c	2010-03-10 16:26:00.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     393,
-  /**/
-
--- 
-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.394 b/source/ap/vim/patches/7.2.394
deleted file mode 100644
index 50235e04..00000000
--- a/source/ap/vim/patches/7.2.394
+++ /dev/null
@@ -1,99 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.394
-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.394
-Problem:    .lzma and .xz files are not supported.
-Solution:   Recognize .lzma and .xz files so that they can be edited.
-Files:      runtime/plugin/gzip.vim
-
-
-*** ../vim-7.2.393/runtime/plugin/gzip.vim	2005-07-27 23:12:49.000000000 +0200
---- runtime/plugin/gzip.vim	2010-03-10 17:07:22.000000000 +0100
-***************
-*** 1,6 ****
-  " Vim plugin for editing compressed files.
-  " Maintainer: Bram Moolenaar <Bram@vim.org>
-! " Last Change: 2005 Jul 26
-  
-  " Exit quickly when:
-  " - this plugin was already loaded
---- 1,6 ----
-  " Vim plugin for editing compressed files.
-  " Maintainer: Bram Moolenaar <Bram@vim.org>
-! " Last Change: 2010 Mar 10
-  
-  " Exit quickly when:
-  " - this plugin was already loaded
-***************
-*** 20,36 ****
-    "
-    " Set binary mode before reading the file.
-    " Use "gzip -d", gunzip isn't always available.
-!   autocmd BufReadPre,FileReadPre	*.gz,*.bz2,*.Z setlocal bin
-    autocmd BufReadPost,FileReadPost	*.gz  call gzip#read("gzip -dn")
-    autocmd BufReadPost,FileReadPost	*.bz2 call gzip#read("bzip2 -d")
-    autocmd BufReadPost,FileReadPost	*.Z   call gzip#read("uncompress")
-    autocmd BufWritePost,FileWritePost	*.gz  call gzip#write("gzip")
-    autocmd BufWritePost,FileWritePost	*.bz2 call gzip#write("bzip2")
-    autocmd BufWritePost,FileWritePost	*.Z   call gzip#write("compress -f")
-    autocmd FileAppendPre			*.gz  call gzip#appre("gzip -dn")
-    autocmd FileAppendPre			*.bz2 call gzip#appre("bzip2 -d")
-    autocmd FileAppendPre			*.Z   call gzip#appre("uncompress")
-    autocmd FileAppendPost		*.gz  call gzip#write("gzip")
-    autocmd FileAppendPost		*.bz2 call gzip#write("bzip2")
-    autocmd FileAppendPost		*.Z   call gzip#write("compress -f")
-  augroup END
---- 20,44 ----
-    "
-    " Set binary mode before reading the file.
-    " Use "gzip -d", gunzip isn't always available.
-!   autocmd BufReadPre,FileReadPre	*.gz,*.bz2,*.Z,*.lzma,*.xz setlocal bin
-    autocmd BufReadPost,FileReadPost	*.gz  call gzip#read("gzip -dn")
-    autocmd BufReadPost,FileReadPost	*.bz2 call gzip#read("bzip2 -d")
-    autocmd BufReadPost,FileReadPost	*.Z   call gzip#read("uncompress")
-+   autocmd BufReadPost,FileReadPost	*.lzma call gzip#read("lzma -d")
-+   autocmd BufReadPost,FileReadPost	*.xz  call gzip#read("xz -d")
-    autocmd BufWritePost,FileWritePost	*.gz  call gzip#write("gzip")
-    autocmd BufWritePost,FileWritePost	*.bz2 call gzip#write("bzip2")
-    autocmd BufWritePost,FileWritePost	*.Z   call gzip#write("compress -f")
-+   autocmd BufWritePost,FileWritePost	*.lzma call gzip#write("lzma -z")
-+   autocmd BufWritePost,FileWritePost	*.xz  call gzip#write("xz -z")
-    autocmd FileAppendPre			*.gz  call gzip#appre("gzip -dn")
-    autocmd FileAppendPre			*.bz2 call gzip#appre("bzip2 -d")
-    autocmd FileAppendPre			*.Z   call gzip#appre("uncompress")
-+   autocmd FileAppendPre			*.lzma call gzip#appre("lzma -d")
-+   autocmd FileAppendPre			*.xz   call gzip#appre("xz -d")
-    autocmd FileAppendPost		*.gz  call gzip#write("gzip")
-    autocmd FileAppendPost		*.bz2 call gzip#write("bzip2")
-    autocmd FileAppendPost		*.Z   call gzip#write("compress -f")
-+   autocmd FileAppendPost		*.lzma call gzip#write("lzma -z")
-+   autocmd FileAppendPost		*.xz call gzip#write("xz -z")
-  augroup END
-*** ../vim-7.2.393/src/version.c	2010-03-10 16:27:27.000000000 +0100
---- src/version.c	2010-03-10 17:12:43.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     394,
-  /**/
-
--- 
-ARTHUR:  Be quiet!
-DENNIS:  --but by a two-thirds majority in the case of more--
-ARTHUR:  Be quiet!  I order you to be quiet!
-WOMAN:   Order, eh -- who does he think he is?
-ARTHUR:  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.395 b/source/ap/vim/patches/7.2.395
deleted file mode 100644
index 1b5b1bae..00000000
--- a/source/ap/vim/patches/7.2.395
+++ /dev/null
@@ -1,60 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.395
-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.395
-Problem:    In help CTRL=] on g?g? escapes the ?, causing it to fail. (Tony
-	    Mechelynck)
-Solution:   Don't escape ? for a help command. (Sergey Khorev)
-Files:	    src/normal.c
-
-
-*** ../vim-7.2.394/src/normal.c	2010-01-19 15:23:38.000000000 +0100
---- src/normal.c	2010-03-13 13:04:46.000000000 +0100
-***************
-*** 5526,5536 ****
-  	    break;
-  
-  	default:
-  	    if (curbuf->b_help)
-  		STRCPY(buf, "he! ");
-  	    else
-  	    {
-- 		tag_cmd = TRUE;
-  		if (g_cmd)
-  		    STRCPY(buf, "tj ");
-  		else
---- 5526,5536 ----
-  	    break;
-  
-  	default:
-+ 	    tag_cmd = TRUE;
-  	    if (curbuf->b_help)
-  		STRCPY(buf, "he! ");
-  	    else
-  	    {
-  		if (g_cmd)
-  		    STRCPY(buf, "tj ");
-  		else
-*** ../vim-7.2.394/src/version.c	2010-03-10 17:14:07.000000000 +0100
---- src/version.c	2010-03-17 13:05:11.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     395,
-  /**/
-
--- 
-There are three kinds of people: Those who can count & those who can'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.396 b/source/ap/vim/patches/7.2.396
deleted file mode 100644
index f1269231..00000000
--- a/source/ap/vim/patches/7.2.396
+++ /dev/null
@@ -1,51 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.396
-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.396
-Problem:    Get E38 errors. (Dasn)
-Solution:   Set cursor to line 1 instead of 0. (Dominique Pelle)
-Files:	    src/popupmnu.c
-
-
-*** ../vim-7.2.395/src/popupmnu.c	2010-01-19 18:05:05.000000000 +0100
---- src/popupmnu.c	2010-03-17 12:59:01.000000000 +0100
-***************
-*** 640,646 ****
-  
-  		    curbuf->b_changed = 0;
-  		    curbuf->b_p_ma = FALSE;
-! 		    curwin->w_cursor.lnum = 0;
-  		    curwin->w_cursor.col = 0;
-  
-  		    if (curwin != curwin_save && win_valid(curwin_save))
---- 640,646 ----
-  
-  		    curbuf->b_changed = 0;
-  		    curbuf->b_p_ma = FALSE;
-! 		    curwin->w_cursor.lnum = 1;
-  		    curwin->w_cursor.col = 0;
-  
-  		    if (curwin != curwin_save && win_valid(curwin_save))
-*** ../vim-7.2.395/src/version.c	2010-03-17 13:07:01.000000000 +0100
---- src/version.c	2010-03-17 14:47:30.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     396,
-  /**/
-
--- 
-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.397 b/source/ap/vim/patches/7.2.397
deleted file mode 100644
index 218a069a..00000000
--- a/source/ap/vim/patches/7.2.397
+++ /dev/null
@@ -1,67 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.397
-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.397
-Problem:    Redundant check for w_lines_valid.
-Solution:   Remove the if.  (Lech Lorens)
-Files:	    src/fold.c
-
-
-*** ../vim-7.2.396/src/fold.c	2010-02-24 14:34:10.000000000 +0100
---- src/fold.c	2010-03-17 13:03:00.000000000 +0100
-***************
-*** 1053,1067 ****
-  {
-      int		i;
-  
-!     if (win->w_lines_valid > 0)
-! 	for (i = 0; i < win->w_lines_valid; ++i)
-! 	    if (win->w_lines[i].wl_valid)
-! 	    {
-! 		if (lnum < win->w_lines[i].wl_lnum)
-! 		    return -1;
-! 		if (lnum <= win->w_lines[i].wl_lastlnum)
-! 		    return i;
-! 	    }
-      return -1;
-  }
-  
---- 1053,1066 ----
-  {
-      int		i;
-  
-!     for (i = 0; i < win->w_lines_valid; ++i)
-! 	if (win->w_lines[i].wl_valid)
-! 	{
-! 	    if (lnum < win->w_lines[i].wl_lnum)
-! 		return -1;
-! 	    if (lnum <= win->w_lines[i].wl_lastlnum)
-! 		return i;
-! 	}
-      return -1;
-  }
-  
-*** ../vim-7.2.396/src/version.c	2010-03-17 14:47:56.000000000 +0100
---- src/version.c	2010-03-17 16:43:34.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     397,
-  /**/
-
--- 
-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.398 b/source/ap/vim/patches/7.2.398
deleted file mode 100644
index a0ccc96c..00000000
--- a/source/ap/vim/patches/7.2.398
+++ /dev/null
@@ -1,152 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.398
-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.398
-Problem:    When moving windows the cursor ends up in the wrong line.
-Solution:   Set the window width and height properly. (Lech Lorens)
-Files:	    src/window.c
-
-
-*** ../vim-7.2.397/src/window.c	2010-01-27 20:26:41.000000000 +0100
---- src/window.c	2010-03-17 16:40:06.000000000 +0100
-***************
-*** 991,1018 ****
-  	wp->w_p_scr = curwin->w_p_scr;
-  	if (need_status)
-  	{
-! 	    --oldwin->w_height;
-  	    oldwin->w_status_height = need_status;
-  	}
-  	if (flags & (WSP_TOP | WSP_BOT))
-  	{
-  	    /* set height and row of new window to full height */
-  	    wp->w_winrow = tabline_height();
-! 	    wp->w_height = curfrp->fr_height - (p_ls > 0);
-  	    wp->w_status_height = (p_ls > 0);
-  	}
-  	else
-  	{
-  	    /* height and row of new window is same as current window */
-  	    wp->w_winrow = oldwin->w_winrow;
-! 	    wp->w_height = oldwin->w_height;
-  	    wp->w_status_height = oldwin->w_status_height;
-  	}
-  	frp->fr_height = curfrp->fr_height;
-  
-  	/* "new_size" of the current window goes to the new window, use
-  	 * one column for the vertical separator */
-! 	wp->w_width = new_size;
-  	if (before)
-  	    wp->w_vsep_width = 1;
-  	else
---- 991,1018 ----
-  	wp->w_p_scr = curwin->w_p_scr;
-  	if (need_status)
-  	{
-! 	    win_new_height(oldwin, oldwin->w_height - 1);
-  	    oldwin->w_status_height = need_status;
-  	}
-  	if (flags & (WSP_TOP | WSP_BOT))
-  	{
-  	    /* set height and row of new window to full height */
-  	    wp->w_winrow = tabline_height();
-! 	    win_new_height(wp, curfrp->fr_height - (p_ls > 0));
-  	    wp->w_status_height = (p_ls > 0);
-  	}
-  	else
-  	{
-  	    /* height and row of new window is same as current window */
-  	    wp->w_winrow = oldwin->w_winrow;
-! 	    win_new_height(wp, oldwin->w_height);
-  	    wp->w_status_height = oldwin->w_status_height;
-  	}
-  	frp->fr_height = curfrp->fr_height;
-  
-  	/* "new_size" of the current window goes to the new window, use
-  	 * one column for the vertical separator */
-! 	win_new_width(wp, new_size);
-  	if (before)
-  	    wp->w_vsep_width = 1;
-  	else
-***************
-*** 1049,1061 ****
-  	if (flags & (WSP_TOP | WSP_BOT))
-  	{
-  	    wp->w_wincol = 0;
-! 	    wp->w_width = Columns;
-  	    wp->w_vsep_width = 0;
-  	}
-  	else
-  	{
-  	    wp->w_wincol = oldwin->w_wincol;
-! 	    wp->w_width = oldwin->w_width;
-  	    wp->w_vsep_width = oldwin->w_vsep_width;
-  	}
-  	frp->fr_width = curfrp->fr_width;
---- 1049,1061 ----
-  	if (flags & (WSP_TOP | WSP_BOT))
-  	{
-  	    wp->w_wincol = 0;
-! 	    win_new_width(wp, Columns);
-  	    wp->w_vsep_width = 0;
-  	}
-  	else
-  	{
-  	    wp->w_wincol = oldwin->w_wincol;
-! 	    win_new_width(wp, oldwin->w_width);
-  	    wp->w_vsep_width = oldwin->w_vsep_width;
-  	}
-  	frp->fr_width = curfrp->fr_width;
-***************
-*** 1111,1117 ****
-      }
-  
-      /*
-!      * make the new window the current window and redraw
-       */
-      if (do_equal || dir != 0)
-  	win_equal(wp, TRUE,
---- 1111,1117 ----
-      }
-  
-      /*
-!      * equalize the window sizes.
-       */
-      if (do_equal || dir != 0)
-  	win_equal(wp, TRUE,
-***************
-*** 1143,1148 ****
---- 1143,1152 ----
-  	if (size != 0)
-  	    p_wh = size;
-      }
-+ 
-+     /*
-+      * make the new window the current window
-+      */
-      win_enter(wp, FALSE);
-  #ifdef FEAT_VERTSPLIT
-      if (flags & WSP_VERT)
-*** ../vim-7.2.397/src/version.c	2010-03-17 16:45:04.000000000 +0100
---- src/version.c	2010-03-17 16:53:51.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     398,
-  /**/
-
--- 
-It's not hard to meet expenses, they're everywhere.
-
- /// 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.399 b/source/ap/vim/patches/7.2.399
deleted file mode 100644
index 16ffa0f4..00000000
--- a/source/ap/vim/patches/7.2.399
+++ /dev/null
@@ -1,63 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.399 (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.399 (extra, after 7.2.388)
-Problem:    Cannot compile on MingW.
-Solution:   Move ifneq to separate line. (Vlad Sandrini, Dominique Pelle)
-Files:	    src/Make_ming.mak
-
-
-*** ../vim-7.2.398/src/Make_ming.mak	2010-03-10 13:19:28.000000000 +0100
---- src/Make_ming.mak	2010-03-17 17:23:31.000000000 +0100
-***************
-*** 215,226 ****
-  ifndef RUBY_PLATFORM
-  ifeq ($(RUBY_VER), 16)
-  RUBY_PLATFORM = i586-mswin32
-! else ifneq ("X$(wildcard, $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/i386-mingw32)", X)
-  RUBY_PLATFORM = i386-mingw32
-  else
-  RUBY_PLATFORM = i386-mswin32
-  endif
-  endif
-  
-  ifndef RUBY_INSTALL_NAME
-  ifeq ($(RUBY_VER), 16)
---- 215,228 ----
-  ifndef RUBY_PLATFORM
-  ifeq ($(RUBY_VER), 16)
-  RUBY_PLATFORM = i586-mswin32
-! else
-! ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/i386-mingw32),)
-  RUBY_PLATFORM = i386-mingw32
-  else
-  RUBY_PLATFORM = i386-mswin32
-  endif
-  endif
-+ endif
-  
-  ifndef RUBY_INSTALL_NAME
-  ifeq ($(RUBY_VER), 16)
-*** ../vim-7.2.398/src/version.c	2010-03-17 16:54:51.000000000 +0100
---- src/version.c	2010-03-17 17:23:40.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     399,
-  /**/
-
--- 
-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.400 b/source/ap/vim/patches/7.2.400
deleted file mode 100644
index 0c3c5487..00000000
--- a/source/ap/vim/patches/7.2.400
+++ /dev/null
@@ -1,454 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.400
-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.400 (after 7.2.387)
-Problem:    Dynamic Ruby is not initialised properly for version 1.9.1.
-	    Ruby cannot create strings from NULL.
-Solution:   Cleanup #ifdefs.  Handle NULL like an empty string.  Add
-	    ruby_init_stack. (Sergey Khorev)
-Files:	    src/if_ruby.c
-
-
-*** ../vim-7.2.399/src/if_ruby.c	2010-03-10 12:46:38.000000000 +0100
---- src/if_ruby.c	2010-03-17 17:37:53.000000000 +0100
-***************
-*** 53,58 ****
---- 53,63 ----
-  # undef _WIN32_WINNT
-  #endif
-  
-+ #if (defined(RUBY_VERSION) && RUBY_VERSION >= 19) \
-+     || (defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19)
-+ # define RUBY19_OR_LATER 1
-+ #endif
-+ 
-  #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
-  /* Ruby 1.9 defines a number of static functions which use rb_num2long and
-   * rb_int2big */
-***************
-*** 61,67 ****
-  #endif
-  
-  #include <ruby.h>
-! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
-  # include <ruby/encoding.h>
-  #endif
-  
---- 66,72 ----
-  #endif
-  
-  #include <ruby.h>
-! #ifdef RUBY19_OR_LATER
-  # include <ruby/encoding.h>
-  #endif
-  
-***************
-*** 172,179 ****
-  # define rb_ary_new			dll_rb_ary_new
-  # define rb_ary_push			dll_rb_ary_push
-  #endif
-! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19 \
-!     || defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
-  # define rb_errinfo			dll_rb_errinfo
-  #else
-  # define ruby_errinfo			(*dll_ruby_errinfo)
---- 177,183 ----
-  # define rb_ary_new			dll_rb_ary_new
-  # define rb_ary_push			dll_rb_ary_push
-  #endif
-! #ifdef RUBY19_OR_LATER
-  # define rb_errinfo			dll_rb_errinfo
-  #else
-  # define ruby_errinfo			(*dll_ruby_errinfo)
-***************
-*** 185,196 ****
-  # define rb_w32_snprintf		dll_rb_w32_snprintf
-  #endif
-  
-! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
-  # define ruby_script			dll_ruby_script
-  # define rb_enc_find_index		dll_rb_enc_find_index
-  # define rb_enc_find			dll_rb_enc_find
-  # define rb_enc_str_new			dll_rb_enc_str_new
-  # define rb_sprintf			dll_rb_sprintf
-  #endif
-  
-  /*
---- 189,201 ----
-  # define rb_w32_snprintf		dll_rb_w32_snprintf
-  #endif
-  
-! #ifdef RUBY19_OR_LATER
-  # define ruby_script			dll_ruby_script
-  # define rb_enc_find_index		dll_rb_enc_find_index
-  # define rb_enc_find			dll_rb_enc_find
-  # define rb_enc_str_new			dll_rb_enc_str_new
-  # define rb_sprintf			dll_rb_sprintf
-+ # define ruby_init_stack		dll_ruby_init_stack
-  #endif
-  
-  /*
-***************
-*** 240,247 ****
-  static VALUE (*dll_rb_str_concat) (VALUE, VALUE);
-  static VALUE (*dll_rb_str_new) (const char*, long);
-  static VALUE (*dll_rb_str_new2) (const char*);
-! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19 \
-!     || defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
-  static VALUE (*dll_rb_errinfo) (void);
-  #else
-  static VALUE *dll_ruby_errinfo;
---- 245,251 ----
-  static VALUE (*dll_rb_str_concat) (VALUE, VALUE);
-  static VALUE (*dll_rb_str_new) (const char*, long);
-  static VALUE (*dll_rb_str_new2) (const char*);
-! #ifdef RUBY19_OR_LATER
-  static VALUE (*dll_rb_errinfo) (void);
-  #else
-  static VALUE *dll_ruby_errinfo;
-***************
-*** 255,276 ****
-  static VALUE (*dll_rb_ary_new) (void);
-  static VALUE (*dll_rb_ary_push) (VALUE, VALUE);
-  #endif
-! #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
-  static VALUE (*dll_rb_int2big)(SIGNED_VALUE);
-  #endif
-  #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
-  static int (*dll_rb_w32_snprintf)(char*, size_t, const char*, ...);
-  #endif
-  
-! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
-  static void (*dll_ruby_script) (const char*);
-  static int (*dll_rb_enc_find_index) (const char*);
-  static rb_encoding* (*dll_rb_enc_find) (const char*);
-  static VALUE (*dll_rb_enc_str_new) (const char*, long, rb_encoding*);
-  static VALUE (*dll_rb_sprintf) (const char*, ...);
-  #endif
-  
-! #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
-  static SIGNED_VALUE rb_num2long_stub(VALUE x)
-  {
-      return dll_rb_num2long(x);
---- 259,281 ----
-  static VALUE (*dll_rb_ary_new) (void);
-  static VALUE (*dll_rb_ary_push) (VALUE, VALUE);
-  #endif
-! #ifdef RUBY19_OR_LATER
-  static VALUE (*dll_rb_int2big)(SIGNED_VALUE);
-  #endif
-  #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
-  static int (*dll_rb_w32_snprintf)(char*, size_t, const char*, ...);
-  #endif
-  
-! #ifdef RUBY19_OR_LATER
-  static void (*dll_ruby_script) (const char*);
-  static int (*dll_rb_enc_find_index) (const char*);
-  static rb_encoding* (*dll_rb_enc_find) (const char*);
-  static VALUE (*dll_rb_enc_str_new) (const char*, long, rb_encoding*);
-  static VALUE (*dll_rb_sprintf) (const char*, ...);
-+ static void (*ruby_init_stack)(VALUE*);
-  #endif
-  
-! #ifdef RUBY19_OR_LATER
-  static SIGNED_VALUE rb_num2long_stub(VALUE x)
-  {
-      return dll_rb_num2long(x);
-***************
-*** 336,343 ****
-      {"rb_str_concat", (RUBY_PROC*)&dll_rb_str_concat},
-      {"rb_str_new", (RUBY_PROC*)&dll_rb_str_new},
-      {"rb_str_new2", (RUBY_PROC*)&dll_rb_str_new2},
-! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19 \
-!     || defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
-      {"rb_errinfo", (RUBY_PROC*)&dll_rb_errinfo},
-  #else
-      {"ruby_errinfo", (RUBY_PROC*)&dll_ruby_errinfo},
---- 341,347 ----
-      {"rb_str_concat", (RUBY_PROC*)&dll_rb_str_concat},
-      {"rb_str_new", (RUBY_PROC*)&dll_rb_str_new},
-      {"rb_str_new2", (RUBY_PROC*)&dll_rb_str_new2},
-! #ifdef RUBY19_OR_LATER
-      {"rb_errinfo", (RUBY_PROC*)&dll_rb_errinfo},
-  #else
-      {"ruby_errinfo", (RUBY_PROC*)&dll_ruby_errinfo},
-***************
-*** 360,374 ****
-      {"rb_ary_new", (RUBY_PROC*)&dll_rb_ary_new},
-      {"rb_ary_push", (RUBY_PROC*)&dll_rb_ary_push},
-  #endif
-! #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
-      {"rb_int2big", (RUBY_PROC*)&dll_rb_int2big},
-- #endif
-- #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
-      {"ruby_script", (RUBY_PROC*)&dll_ruby_script},
-      {"rb_enc_find_index", (RUBY_PROC*)&dll_rb_enc_find_index},
-      {"rb_enc_find", (RUBY_PROC*)&dll_rb_enc_find},
-      {"rb_enc_str_new", (RUBY_PROC*)&dll_rb_enc_str_new},
-      {"rb_sprintf", (RUBY_PROC*)&dll_rb_sprintf},
-  #endif
-      {"", NULL},
-  };
---- 364,377 ----
-      {"rb_ary_new", (RUBY_PROC*)&dll_rb_ary_new},
-      {"rb_ary_push", (RUBY_PROC*)&dll_rb_ary_push},
-  #endif
-! #ifdef RUBY19_OR_LATER
-      {"rb_int2big", (RUBY_PROC*)&dll_rb_int2big},
-      {"ruby_script", (RUBY_PROC*)&dll_ruby_script},
-      {"rb_enc_find_index", (RUBY_PROC*)&dll_rb_enc_find_index},
-      {"rb_enc_find", (RUBY_PROC*)&dll_rb_enc_find},
-      {"rb_enc_str_new", (RUBY_PROC*)&dll_rb_enc_str_new},
-      {"rb_sprintf", (RUBY_PROC*)&dll_rb_sprintf},
-+     {"ruby_init_stack", (RUBY_PROC*)&dll_ruby_init_stack},
-  #endif
-      {"", NULL},
-  };
-***************
-*** 467,473 ****
-      static VALUE
-  vim_str2rb_enc_str(const char *s)
-  {
-! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
-      int isnum;
-      long lval;
-      char_u *sval;
---- 470,476 ----
-      static VALUE
-  vim_str2rb_enc_str(const char *s)
-  {
-! #ifdef RUBY19_OR_LATER
-      int isnum;
-      long lval;
-      char_u *sval;
-***************
-*** 489,495 ****
-      static VALUE
-  eval_enc_string_protect(const char *str, int *state)
-  {
-! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
-      int isnum;
-      long lval;
-      char_u *sval;
---- 492,498 ----
-      static VALUE
-  eval_enc_string_protect(const char *str, int *state)
-  {
-! #ifdef RUBY19_OR_LATER
-      int isnum;
-      long lval;
-      char_u *sval;
-***************
-*** 591,606 ****
-  	    char *argv[] = {"gvim.exe"};
-  	    NtInitialize(&argc, &argv);
-  #endif
-! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
-  	    RUBY_INIT_STACK;
-  #endif
-  	    ruby_init();
-! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
-  	    ruby_script("vim-ruby");
-  #endif
-  	    ruby_init_loadpath();
-  	    ruby_io_init();
-! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
-  	    rb_enc_find_index("encdb");
-  #endif
-  	    ruby_vim_init();
---- 594,609 ----
-  	    char *argv[] = {"gvim.exe"};
-  	    NtInitialize(&argc, &argv);
-  #endif
-! #ifdef RUBY19_OR_LATER
-  	    RUBY_INIT_STACK;
-  #endif
-  	    ruby_init();
-! #ifdef RUBY19_OR_LATER
-  	    ruby_script("vim-ruby");
-  #endif
-  	    ruby_init_loadpath();
-  	    ruby_io_init();
-! #ifdef RUBY19_OR_LATER
-  	    rb_enc_find_index("encdb");
-  #endif
-  	    ruby_vim_init();
-***************
-*** 657,664 ****
-  	break;
-      case TAG_RAISE:
-      case TAG_FATAL:
-! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19 \
-!     || defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
-  	eclass = CLASS_OF(rb_errinfo());
-  	einfo = rb_obj_as_string(rb_errinfo());
-  #else
---- 660,666 ----
-  	break;
-      case TAG_RAISE:
-      case TAG_FATAL:
-! #ifdef RUBY19_OR_LATER
-  	eclass = CLASS_OF(rb_errinfo());
-  	einfo = rb_obj_as_string(rb_errinfo());
-  #else
-***************
-*** 720,775 ****
-  
-      if (tv->v_type == VAR_STRING)
-      {
-!         result = rb_str_new2((char *)tv->vval.v_string);
-      }
-      else if (tv->v_type == VAR_NUMBER)
-      {
-!         result = INT2NUM(tv->vval.v_number);
-      }
-  # ifdef FEAT_FLOAT
-      else if (tv->v_type == VAR_FLOAT)
-      {
-!         result = rb_float_new(tv->vval.v_float);
-      }
-  # endif
-      else if (tv->v_type == VAR_LIST)
-      {
-!         list_T      *list = tv->vval.v_list;
-!         listitem_T  *curr;
-  
-!         result = rb_ary_new();
-  
-!         if (list != NULL)
-!         {
-!             for (curr = list->lv_first; curr != NULL; curr = curr->li_next)
-!             {
-!                 rb_ary_push(result, vim_to_ruby(&curr->li_tv));
-!             }
-!         }
-      }
-      else if (tv->v_type == VAR_DICT)
-      {
-!         result = rb_hash_new();
-  
-!         if (tv->vval.v_dict != NULL)
-!         {
-!             hashtab_T   *ht = &tv->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);
-!                     rb_hash_aset(result, rb_str_new2((char *)hi->hi_key),
-  						     vim_to_ruby(&di->di_tv));
-!                 }
-!             }
-!         }
-      } /* else return Qnil; */
-  
-      return result;
---- 722,778 ----
-  
-      if (tv->v_type == VAR_STRING)
-      {
-! 	result = rb_str_new2((char *)(tv->vval.v_string == NULL
-! 						   ? "" : tv->vval.v_string));
-      }
-      else if (tv->v_type == VAR_NUMBER)
-      {
-! 	result = INT2NUM(tv->vval.v_number);
-      }
-  # ifdef FEAT_FLOAT
-      else if (tv->v_type == VAR_FLOAT)
-      {
-! 	result = rb_float_new(tv->vval.v_float);
-      }
-  # endif
-      else if (tv->v_type == VAR_LIST)
-      {
-! 	list_T      *list = tv->vval.v_list;
-! 	listitem_T  *curr;
-  
-! 	result = rb_ary_new();
-  
-! 	if (list != NULL)
-! 	{
-! 	    for (curr = list->lv_first; curr != NULL; curr = curr->li_next)
-! 	    {
-! 		rb_ary_push(result, vim_to_ruby(&curr->li_tv));
-! 	    }
-! 	}
-      }
-      else if (tv->v_type == VAR_DICT)
-      {
-! 	result = rb_hash_new();
-  
-! 	if (tv->vval.v_dict != NULL)
-! 	{
-! 	    hashtab_T   *ht = &tv->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);
-! 		    rb_hash_aset(result, rb_str_new2((char *)hi->hi_key),
-  						     vim_to_ruby(&di->di_tv));
-! 		}
-! 	    }
-! 	}
-      } /* else return Qnil; */
-  
-      return result;
-***************
-*** 785,791 ****
-      tv = eval_expr((char_u *)StringValuePtr(str), NULL);
-      if (tv == NULL)
-      {
-!         return Qnil;
-      }
-      result = vim_to_ruby(tv);
-  
---- 788,794 ----
-      tv = eval_expr((char_u *)StringValuePtr(str), NULL);
-      if (tv == NULL)
-      {
-! 	return Qnil;
-      }
-      result = vim_to_ruby(tv);
-  
-*** ../vim-7.2.399/src/version.c	2010-03-17 17:24:58.000000000 +0100
---- src/version.c	2010-03-17 18:14:31.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     400,
-  /**/
-
--- 
-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.401 b/source/ap/vim/patches/7.2.401
deleted file mode 100644
index 032076ab..00000000
--- a/source/ap/vim/patches/7.2.401
+++ /dev/null
@@ -1,61 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.401
-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.401
-Problem:    ":e dir<Tab>" with 'wildmode' set to "list" doesn't highlight
-	    directory names with a space. (Alexandre Provencio)
-Solution:   Remove the backslash before checking if the name is a directory.
-	    (Dominique Pelle)
-Files:	    src/ex_getln.c
-
-
-*** ../vim-7.2.400/src/ex_getln.c	2010-03-02 17:23:10.000000000 +0100
---- src/ex_getln.c	2010-03-17 19:00:54.000000000 +0100
-***************
-*** 3948,3955 ****
-  					  || xp->xp_context == EXPAND_SHELLCMD
-  					  || xp->xp_context == EXPAND_BUFFERS)
-  		{
-! 			    /* highlight directories */
-! 		    j = (mch_isdir(files_found[k]));
-  		    if (showtail)
-  			p = L_SHOWFILE(k);
-  		    else
---- 3948,3959 ----
-  					  || xp->xp_context == EXPAND_SHELLCMD
-  					  || xp->xp_context == EXPAND_BUFFERS)
-  		{
-! 		    char_u	*halved_slash;
-! 
-! 		    /* highlight directories */
-! 		    halved_slash = backslash_halve_save(files_found[k]);
-! 		    j = mch_isdir(halved_slash);
-! 		    vim_free(halved_slash);
-  		    if (showtail)
-  			p = L_SHOWFILE(k);
-  		    else
-*** ../vim-7.2.400/src/version.c	2010-03-17 18:15:17.000000000 +0100
---- src/version.c	2010-03-17 19:12:22.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     401,
-  /**/
-
--- 
-Two cows are standing together in a field.  One asks the other:
-"So what do you think about this Mad Cow Disease?"
-The other replies: "That doesn't concern me. I'm a helicopter."
-
- /// 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.402 b/source/ap/vim/patches/7.2.402
deleted file mode 100644
index 7c256bb1..00000000
--- a/source/ap/vim/patches/7.2.402
+++ /dev/null
@@ -1,91 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.402
-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.402
-Problem:    This gives a #705 error: let X = function('haslocaldir')
-	    let X = function('getcwd')
-Solution:   Don't give E705 when the name is found in the hashtab. (Sergey
-	    Khorev)
-Files:	    src/eval.c
-
-
-*** ../vim-7.2.401/src/eval.c	2010-03-10 13:43:22.000000000 +0100
---- src/eval.c	2010-03-17 19:35:01.000000000 +0100
-***************
-*** 19103,19108 ****
---- 19103,19116 ----
-      hashtab_T	*ht;
-      char_u	*p;
-  
-+     ht = find_var_ht(name, &varname);
-+     if (ht == NULL || *varname == NUL)
-+     {
-+ 	EMSG2(_(e_illvar), name);
-+ 	return;
-+     }
-+     v = find_var_in_ht(ht, varname, TRUE);
-+ 
-      if (tv->v_type == VAR_FUNC)
-      {
-  	if (!(vim_strchr((char_u *)"wbs", name[0]) != NULL && name[1] == ':')
-***************
-*** 19112,19118 ****
-  	    EMSG2(_("E704: Funcref variable name must start with a capital: %s"), name);
-  	    return;
-  	}
-! 	if (function_exists(name))
-  	{
-  	    EMSG2(_("E705: Variable name conflicts with existing function: %s"),
-  									name);
---- 19120,19129 ----
-  	    EMSG2(_("E704: Funcref variable name must start with a capital: %s"), name);
-  	    return;
-  	}
-! 	/* Don't allow hiding a function.  When "v" is not NULL we migth be
-! 	 * assigning another function to the same var, the type is checked
-! 	 * below. */
-! 	if (v == NULL && function_exists(name))
-  	{
-  	    EMSG2(_("E705: Variable name conflicts with existing function: %s"),
-  									name);
-***************
-*** 19120,19133 ****
-  	}
-      }
-  
--     ht = find_var_ht(name, &varname);
--     if (ht == NULL || *varname == NUL)
--     {
-- 	EMSG2(_(e_illvar), name);
-- 	return;
--     }
-- 
--     v = find_var_in_ht(ht, varname, TRUE);
-      if (v != NULL)
-      {
-  	/* existing variable, need to clear the value */
---- 19131,19136 ----
-*** ../vim-7.2.401/src/version.c	2010-03-17 19:13:19.000000000 +0100
---- src/version.c	2010-03-17 19:36:09.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     402,
-  /**/
-
--- 
-Michael: There is no such thing as a dump question.
-Bernard: Sure there is.  For example "what is a core dump?"
-
- /// 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.403 b/source/ap/vim/patches/7.2.403
deleted file mode 100644
index d2949dbc..00000000
--- a/source/ap/vim/patches/7.2.403
+++ /dev/null
@@ -1,53 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.403
-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.403 (after 7.2.400)
-Problem:    Compiler warning for pointer type. (Tony Mechelynck)
-Solution:   Move type cast to the right place.
-Files:	    src/if_ruby.c
-
-
-*** ../vim-7.2.402/src/if_ruby.c	2010-03-17 18:15:17.000000000 +0100
---- src/if_ruby.c	2010-03-19 23:08:06.000000000 +0100
-***************
-*** 722,729 ****
-  
-      if (tv->v_type == VAR_STRING)
-      {
-! 	result = rb_str_new2((char *)(tv->vval.v_string == NULL
-! 						   ? "" : tv->vval.v_string));
-      }
-      else if (tv->v_type == VAR_NUMBER)
-      {
---- 722,729 ----
-  
-      if (tv->v_type == VAR_STRING)
-      {
-! 	result = rb_str_new2(tv->vval.v_string == NULL
-! 					  ? "" : (char *)(tv->vval.v_string));
-      }
-      else if (tv->v_type == VAR_NUMBER)
-      {
-*** ../vim-7.2.402/src/version.c	2010-03-17 19:53:44.000000000 +0100
---- src/version.c	2010-03-19 23:07:13.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     403,
-  /**/
-
--- 
-If "R" is Reverse, how come "D" is FORWARD?
-
- /// 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.404 b/source/ap/vim/patches/7.2.404
deleted file mode 100644
index fa1a0b6b..00000000
--- a/source/ap/vim/patches/7.2.404
+++ /dev/null
@@ -1,54 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.404
-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.404
-Problem:    Pointers for composing characters are not properly initialized.
-Solution:   Compute the size of the pointer, not what it points to. (Yukihiro
-	    Nakadaira)
-Files:	    src/screen.c
-
-
-*** ../vim-7.2.403/src/screen.c	2010-02-03 15:47:59.000000000 +0100
---- src/screen.c	2010-03-23 13:48:05.000000000 +0100
-***************
-*** 7536,7542 ****
-      new_ScreenLines = (schar_T *)lalloc((long_u)(
-  			      (Rows + 1) * Columns * sizeof(schar_T)), FALSE);
-  #ifdef FEAT_MBYTE
-!     vim_memset(new_ScreenLinesC, 0, sizeof(u8char_T) * MAX_MCO);
-      if (enc_utf8)
-      {
-  	new_ScreenLinesUC = (u8char_T *)lalloc((long_u)(
---- 7536,7542 ----
-      new_ScreenLines = (schar_T *)lalloc((long_u)(
-  			      (Rows + 1) * Columns * sizeof(schar_T)), FALSE);
-  #ifdef FEAT_MBYTE
-!     vim_memset(new_ScreenLinesC, 0, sizeof(u8char_T *) * MAX_MCO);
-      if (enc_utf8)
-      {
-  	new_ScreenLinesUC = (u8char_T *)lalloc((long_u)(
-*** ../vim-7.2.403/src/version.c	2010-03-19 23:08:22.000000000 +0100
---- src/version.c	2010-03-23 13:54:47.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     404,
-  /**/
-
--- 
-LAUNCELOT: Isn't there a St. Aaaaarrrrrrggghhh's in Cornwall?
-ARTHUR:    No, that's Saint Ives.
-                 "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.405 b/source/ap/vim/patches/7.2.405
deleted file mode 100644
index b79a19aa..00000000
--- a/source/ap/vim/patches/7.2.405
+++ /dev/null
@@ -1,48 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.405
-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.405
-Problem:    When built with small features the matching text is not
-	    highlighted for ":s/pat/repl/c".
-Solution:   Remove the #ifdef for IncSearch. (James Vega)
-Files:	    src/syntax.c
-
-
-*** ../vim-7.2.404/src/syntax.c	2010-03-10 13:43:22.000000000 +0100
---- src/syntax.c	2010-03-23 14:36:10.000000000 +0100
-***************
-*** 6205,6214 ****
-      {
-  	CENT("ErrorMsg term=standout ctermbg=DarkRed ctermfg=White",
-  	     "ErrorMsg term=standout ctermbg=DarkRed ctermfg=White guibg=Red guifg=White"),
-- #ifdef FEAT_SEARCH_EXTRA
-  	CENT("IncSearch term=reverse cterm=reverse",
-  	     "IncSearch term=reverse cterm=reverse gui=reverse"),
-- #endif
-  	CENT("ModeMsg term=bold cterm=bold",
-  	     "ModeMsg term=bold cterm=bold gui=bold"),
-  	CENT("NonText term=bold ctermfg=Blue",
---- 6205,6212 ----
-*** ../vim-7.2.404/src/version.c	2010-03-23 13:56:53.000000000 +0100
---- src/version.c	2010-03-23 14:37:08.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     405,
-  /**/
-
--- 
-Dreams are free, but there's a small charge for alterations.
-
- /// 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.406 b/source/ap/vim/patches/7.2.406
deleted file mode 100644
index cff265f5..00000000
--- a/source/ap/vim/patches/7.2.406
+++ /dev/null
@@ -1,123 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.406
-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.406
-Problem:    Patch 7.2.119 introduces uninit mem read. (Dominique Pelle)
-Solution:   Only used ScreeenLinesC when ScreeenLinesUC is not zero. (Yukihiro
-	    Nakadaira)  Also clear ScreeenLinesC when allocating.
-Files:	    src/screen.c
-
-
-*** ../vim-7.2.405/src/screen.c	2010-03-23 13:56:53.000000000 +0100
---- src/screen.c	2010-03-23 15:26:44.000000000 +0100
-***************
-*** 25,34 ****
-   * one character which occupies two display cells.
-   * For UTF-8 a multi-byte character is converted to Unicode and stored in
-   * ScreenLinesUC[].  ScreenLines[] contains the first byte only.  For an ASCII
-!  * character without composing chars ScreenLinesUC[] will be 0.  When the
-!  * character occupies two display cells the next byte in ScreenLines[] is 0.
-   * ScreenLinesC[][] contain up to 'maxcombine' composing characters
-!  * (drawn on top of the first character).  They are 0 when not used.
-   * ScreenLines2[] is only used for euc-jp to store the second byte if the
-   * first byte is 0x8e (single-width character).
-   *
---- 25,35 ----
-   * one character which occupies two display cells.
-   * For UTF-8 a multi-byte character is converted to Unicode and stored in
-   * ScreenLinesUC[].  ScreenLines[] contains the first byte only.  For an ASCII
-!  * character without composing chars ScreenLinesUC[] will be 0 and
-!  * ScreenLinesC[][] is not used.  When the character occupies two display
-!  * cells the next byte in ScreenLines[] is 0.
-   * ScreenLinesC[][] contain up to 'maxcombine' composing characters
-!  * (drawn on top of the first character).  There is 0 after the last one used.
-   * ScreenLines2[] is only used for euc-jp to store the second byte if the
-   * first byte is 0x8e (single-width character).
-   *
-***************
-*** 4893,4898 ****
---- 4894,4900 ----
-  
-  /*
-   * Return if the composing characters at "off_from" and "off_to" differ.
-+  * Only to be used when ScreenLinesUC[off_from] != 0.
-   */
-      static int
-  comp_char_differs(off_from, off_to)
-***************
-*** 6281,6286 ****
---- 6283,6289 ----
-  /*
-   * Return TRUE if composing characters for screen posn "off" differs from
-   * composing characters in "u8cc".
-+  * Only to be used when ScreenLinesUC[off] != 0.
-   */
-      static int
-  screen_comp_differs(off, u8cc)
-***************
-*** 6461,6468 ****
-  		    && 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
-  		|| exmode_active;
---- 6464,6473 ----
-  		    && c == 0x8e
-  		    && ScreenLines2[off] != ptr[1])
-  		|| (enc_utf8
-! 		    && (ScreenLinesUC[off] !=
-! 				(u8char_T)(c < 0x80 && u8cc[0] == 0 ? 0 : u8c)
-! 			|| (ScreenLinesUC[off] != 0
-! 					  && screen_comp_differs(off, u8cc))))
-  #endif
-  		|| ScreenAttrs[off] != attr
-  		|| exmode_active;
-***************
-*** 7542,7548 ****
-  	new_ScreenLinesUC = (u8char_T *)lalloc((long_u)(
-  			     (Rows + 1) * Columns * sizeof(u8char_T)), FALSE);
-  	for (i = 0; i < p_mco; ++i)
-! 	    new_ScreenLinesC[i] = (u8char_T *)lalloc((long_u)(
-  			     (Rows + 1) * Columns * sizeof(u8char_T)), FALSE);
-      }
-      if (enc_dbcs == DBCS_JPNU)
---- 7547,7553 ----
-  	new_ScreenLinesUC = (u8char_T *)lalloc((long_u)(
-  			     (Rows + 1) * Columns * sizeof(u8char_T)), FALSE);
-  	for (i = 0; i < p_mco; ++i)
-! 	    new_ScreenLinesC[i] = (u8char_T *)lalloc_clear((long_u)(
-  			     (Rows + 1) * Columns * sizeof(u8char_T)), FALSE);
-      }
-      if (enc_dbcs == DBCS_JPNU)
-*** ../vim-7.2.405/src/version.c	2010-03-23 14:39:07.000000000 +0100
---- src/version.c	2010-03-23 15:34:11.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     406,
-  /**/
-
--- 
-VOICE OVER: As the horrendous Black Beast lunged forward, escape for Arthur
-            and his knights seemed hopeless,  when, suddenly ... the animator
-            suffered a fatal heart attack.
-ANIMATOR:   Aaaaagh!
-VOICE OVER: The cartoon peril was no more ... The Quest for Holy Grail could
-            continue.
-                 "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.407 b/source/ap/vim/patches/7.2.407
deleted file mode 100644
index 0237a9d1..00000000
--- a/source/ap/vim/patches/7.2.407
+++ /dev/null
@@ -1,69 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.407
-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.407
-Problem:    When using an expression in ":s" backslashes in the result are
-	    dropped. (Sergey Goldgaber, Christian Brabandt)
-Solution:   Double backslashes.
-Files:	    src/regexp.c
-
-
-*** ../vim-7.2.406/src/regexp.c	2009-11-26 20:41:19.000000000 +0100
---- src/regexp.c	2010-03-23 16:22:35.000000000 +0100
-***************
-*** 6963,6968 ****
---- 6963,6970 ----
-  	    eval_result = eval_to_string(source + 2, NULL, TRUE);
-  	    if (eval_result != NULL)
-  	    {
-+ 		int had_backslash = FALSE;
-+ 
-  		for (s = eval_result; *s != NUL; mb_ptr_adv(s))
-  		{
-  		    /* Change NL to CR, so that it becomes a line break.
-***************
-*** 6970,6976 ****
---- 6972,6991 ----
-  		    if (*s == NL)
-  			*s = CAR;
-  		    else if (*s == '\\' && s[1] != NUL)
-+ 		    {
-  			++s;
-+ 			had_backslash = TRUE;
-+ 		    }
-+ 		}
-+ 		if (had_backslash && backslash)
-+ 		{
-+ 		    /* Backslashes will be consumed, need to double them. */
-+ 		    s = vim_strsave_escaped(eval_result, (char_u *)"\\");
-+ 		    if (s != NULL)
-+ 		    {
-+ 			vim_free(eval_result);
-+ 			eval_result = s;
-+ 		    }
-  		}
-  
-  		dst += STRLEN(eval_result);
-*** ../vim-7.2.406/src/version.c	2010-03-23 15:36:29.000000000 +0100
---- src/version.c	2010-03-23 16:26:22.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     407,
-  /**/
-
--- 
-Sorry, no fortune 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.408 b/source/ap/vim/patches/7.2.408
deleted file mode 100644
index 25ac3a9c..00000000
--- a/source/ap/vim/patches/7.2.408
+++ /dev/null
@@ -1,73 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.408
-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.408
-Problem:    With ":g/the/s/foo/bar/" the '[ and '] marks can be set to a line
-	    that was not changed.
-Solution:   Only set '[ and '] marks when a substitution was done.
-Files:	    src/ex_cmds.c
-
-
-*** ../vim-7.2.407/src/ex_cmds.c	2009-07-09 20:06:30.000000000 +0200
---- src/ex_cmds.c	2010-03-23 17:31:17.000000000 +0100
-***************
-*** 4238,4243 ****
---- 4238,4244 ----
-      char_u	*sub_firstline;		/* allocated copy of first sub line */
-      int		endcolumn = FALSE;	/* cursor in last column when done */
-      pos_T	old_cursor = curwin->w_cursor;
-+     int		start_nsubs;
-  
-      cmd = eap->arg;
-      if (!global_busy)
-***************
-*** 4245,4250 ****
---- 4246,4252 ----
-  	sub_nsubs = 0;
-  	sub_nlines = 0;
-      }
-+     start_nsubs = sub_nsubs;
-  
-      if (eap->cmdidx == CMD_tilde)
-  	which_pat = RE_LAST;	/* use last used regexp */
-***************
-*** 5106,5112 ****
-      if (do_count)
-  	curwin->w_cursor = old_cursor;
-  
-!     if (sub_nsubs)
-      {
-  	/* Set the '[ and '] marks. */
-  	curbuf->b_op_start.lnum = eap->line1;
---- 5108,5114 ----
-      if (do_count)
-  	curwin->w_cursor = old_cursor;
-  
-!     if (sub_nsubs > start_nsubs)
-      {
-  	/* Set the '[ and '] marks. */
-  	curbuf->b_op_start.lnum = eap->line1;
-*** ../vim-7.2.407/src/version.c	2010-03-23 16:27:15.000000000 +0100
---- src/version.c	2010-03-23 17:35:40.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     408,
-  /**/
-
--- 
-Permission is granted to read this message out aloud on Kings Cross Road,
-London, under the condition that the orator is properly dressed.
-
- /// 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.409 b/source/ap/vim/patches/7.2.409
deleted file mode 100644
index fdda4a00..00000000
--- a/source/ap/vim/patches/7.2.409
+++ /dev/null
@@ -1,60 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.409
-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.409
-Problem:    Summary of number of substitutes is incorrect for ":folddo". (Jean
-	    Johner)
-Solution:   Reset sub_nsubs and sub_nlines in global_exe().
-Files:	    src/ex_cmds.c
-
-
-*** ../vim-7.2.408/src/ex_cmds.c	2010-03-23 17:36:24.000000000 +0100
---- src/ex_cmds.c	2010-03-23 17:42:49.000000000 +0100
-***************
-*** 5238,5245 ****
-  	type = *eap->cmd;
-      cmd = eap->arg;
-      which_pat = RE_LAST;	    /* default: use last used regexp */
--     sub_nsubs = 0;
--     sub_nlines = 0;
-  
-      /*
-       * undocumented vi feature:
---- 5238,5243 ----
-***************
-*** 5343,5348 ****
---- 5341,5348 ----
-      /* When the command writes a message, don't overwrite the command. */
-      msg_didout = TRUE;
-  
-+     sub_nsubs = 0;
-+     sub_nlines = 0;
-      global_need_beginline = FALSE;
-      global_busy = 1;
-      old_lcount = curbuf->b_ml.ml_line_count;
-*** ../vim-7.2.408/src/version.c	2010-03-23 17:36:24.000000000 +0100
---- src/version.c	2010-03-23 17:47:53.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     409,
-  /**/
-
--- 
-BRIDGEKEEPER: What is your favorite colour?
-LAUNCELOT:    Blue.
-BRIDGEKEEPER: Right.  Off you go.
-                 "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.410 b/source/ap/vim/patches/7.2.410
deleted file mode 100644
index 660b0681..00000000
--- a/source/ap/vim/patches/7.2.410
+++ /dev/null
@@ -1,78 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.410
-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.410
-Problem:    Highlighting directories for completion doesn't work properly.
-Solution:   Don't halve backslashes when not needed, expaned "~/".
-	    (Dominique Pelle)
-Files:	    src/ex_getln.c
-
-
-*** ../vim-7.2.409/src/ex_getln.c	2010-03-17 19:13:19.000000000 +0100
---- src/ex_getln.c	2010-03-23 18:00:56.000000000 +0100
-***************
-*** 3948,3959 ****
-  					  || xp->xp_context == EXPAND_SHELLCMD
-  					  || xp->xp_context == EXPAND_BUFFERS)
-  		{
-- 		    char_u	*halved_slash;
-- 
-  		    /* highlight directories */
-! 		    halved_slash = backslash_halve_save(files_found[k]);
-! 		    j = mch_isdir(halved_slash);
-! 		    vim_free(halved_slash);
-  		    if (showtail)
-  			p = L_SHOWFILE(k);
-  		    else
---- 3948,3973 ----
-  					  || xp->xp_context == EXPAND_SHELLCMD
-  					  || xp->xp_context == EXPAND_BUFFERS)
-  		{
-  		    /* highlight directories */
-! 		    if (xp->xp_numfiles != -1)
-! 		    {
-! 			char_u	*halved_slash;
-! 			char_u	*exp_path;
-! 
-! 			/* Expansion was done before and special characters
-! 			 * were escaped, need to halve backslashes.  Also
-! 			 * $HOME has been replaced with ~/. */
-! 			exp_path = expand_env_save_opt(files_found[k], TRUE);
-! 			halved_slash = backslash_halve_save(
-! 				exp_path != NULL ? exp_path : files_found[k]);
-! 			j = mch_isdir(halved_slash != NULL ? halved_slash
-! 							    : files_found[k]);
-! 			vim_free(exp_path);
-! 			vim_free(halved_slash);
-! 		    }
-! 		    else
-! 			/* Expansion was done here, file names are literal. */
-! 			j = mch_isdir(files_found[k]);
-  		    if (showtail)
-  			p = L_SHOWFILE(k);
-  		    else
-*** ../vim-7.2.409/src/version.c	2010-03-23 17:49:19.000000000 +0100
---- src/version.c	2010-03-23 18:04:25.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     410,
-  /**/
-
--- 
-BRIDGEKEEPER: What is your favorite colour?
-GAWAIN:       Blue ...  No yelloooooww!
-                 "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.411 b/source/ap/vim/patches/7.2.411
deleted file mode 100644
index 4a619ee7..00000000
--- a/source/ap/vim/patches/7.2.411
+++ /dev/null
@@ -1,47 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.411
-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.411
-Problem:    When parsing 'cino' a comma isn't skipped properly.
-Solution:   Skip the comma. (Lech Lorens)
-Files:	    src/misc1.c
-
-
-*** ../vim-7.2.410/src/misc1.c	2010-03-02 12:37:01.000000000 +0100
---- src/misc1.c	2010-03-23 18:18:15.000000000 +0100
-***************
-*** 6270,6275 ****
---- 6270,6277 ----
-  	    case 'l': ind_keep_case_label = n; break;
-  	    case '#': ind_hash_comment = n; break;
-  	}
-+ 	if (*options == ',')
-+ 	    ++options;
-      }
-  
-      /* remember where the cursor was when we started */
-*** ../vim-7.2.410/src/version.c	2010-03-23 18:06:47.000000000 +0100
---- src/version.c	2010-03-23 18:22:13.000000000 +0100
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     411,
-  /**/
-
--- 
-BRIDGEKEEPER: What is your favorite editor?
-GAWAIN:       Emacs ...  No, Viiiiiiiiiiimmmmmmm!
-           "Monty Python and the Holy editor wars" PYTHON (MONTY) SOFTWARE 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.412 b/source/ap/vim/patches/7.2.412
deleted file mode 100644
index d4676950..00000000
--- a/source/ap/vim/patches/7.2.412
+++ /dev/null
@@ -1,85 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.412
-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.412
-Problem:    [ or ] followed by mouse click doesn't work.
-Solution:   Reverse check for key being a mouse event. (Dominique Pelle)
-Files:	    src/normal.c
-
-
-*** ../vim-7.2.411/src/normal.c	2010-03-17 13:07:01.000000000 +0100
---- src/normal.c	2010-05-07 15:46:54.000000000 +0200
-***************
-*** 3196,3202 ****
-       * There are a few special cases where we want certain combinations of
-       * characters to be considered as a single word.  These are things like
-       * "->", "/ *", "*=", "+=", "&=", "<=", ">=", "!=" etc.  Otherwise, each
-!      * character is in it's own class.
-       */
-      if (c != NUL && vim_strchr((char_u *)"-+*/%<>&|^!=", c) != NULL)
-  	return 1;
---- 3196,3202 ----
-       * There are a few special cases where we want certain combinations of
-       * characters to be considered as a single word.  These are things like
-       * "->", "/ *", "*=", "+=", "&=", "<=", ">=", "!=" etc.  Otherwise, each
-!      * character is in its own class.
-       */
-      if (c != NUL && vim_strchr((char_u *)"-+*/%<>&|^!=", c) != NULL)
-  	return 1;
-***************
-*** 4085,4091 ****
-  /*
-   * Command character that's ignored.
-   * Used for CTRL-Q and CTRL-S to avoid problems with terminals that use
-!  * xon/xoff
-   */
-      static void
-  nv_ignore(cap)
---- 4085,4091 ----
-  /*
-   * Command character that's ignored.
-   * Used for CTRL-Q and CTRL-S to avoid problems with terminals that use
-!  * xon/xoff.
-   */
-      static void
-  nv_ignore(cap)
-***************
-*** 6523,6529 ****
-       * [ or ] followed by a middle mouse click: put selected text with
-       * indent adjustment.  Any other button just does as usual.
-       */
-!     else if (cap->nchar >= K_LEFTMOUSE && cap->nchar <= K_RIGHTRELEASE)
-      {
-  	(void)do_mouse(cap->oap, cap->nchar,
-  		       (cap->cmdchar == ']') ? FORWARD : BACKWARD,
---- 6523,6529 ----
-       * [ or ] followed by a middle mouse click: put selected text with
-       * indent adjustment.  Any other button just does as usual.
-       */
-!     else if (cap->nchar >= K_RIGHTRELEASE && cap->nchar <= K_LEFTMOUSE)
-      {
-  	(void)do_mouse(cap->oap, cap->nchar,
-  		       (cap->cmdchar == ']') ? FORWARD : BACKWARD,
-*** ../vim-7.2.411/src/version.c	2010-03-23 18:22:40.000000000 +0100
---- src/version.c	2010-05-07 15:51:35.000000000 +0200
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     412,
-  /**/
-
--- 
-I have a drinking problem -- I don't have a drink!
-
- /// 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.413 b/source/ap/vim/patches/7.2.413
deleted file mode 100644
index 40a65925..00000000
--- a/source/ap/vim/patches/7.2.413
+++ /dev/null
@@ -1,452 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.413
-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.413
-Problem:    Large file support is incorrect.
-Solution:   Add AC_SYS_LARGEFILE to configure. (James Vega)
-Files:      src/configure.in, src/config.h.in, src/auto/configure
-    
-
-*** ../vim-7.2.412/src/configure.in	2010-03-10 16:27:27.000000000 +0100
---- src/configure.in	2010-04-01 15:06:04.000000000 +0200
-***************
-*** 2669,2674 ****
---- 2669,2678 ----
-  	usleep utime utimes)
-  AC_FUNC_FSEEKO
-  
-+ dnl define _LARGE_FILES, _FILE_OFFSET_BITS and _LARGEFILE_SOURCE when
-+ dnl appropriate, so that off_t is 64 bits when needed.
-+ AC_SYS_LARGEFILE
-+ 
-  dnl fstatfs() can take 2 to 4 arguments, try to use st_blksize if possible
-  AC_MSG_CHECKING(for st_blksize)
-  AC_TRY_COMPILE(
-*** ../vim-7.2.412/src/config.h.in	2010-02-24 14:46:58.000000000 +0100
---- src/config.h.in	2010-04-01 15:10:49.000000000 +0200
-***************
-*** 196,201 ****
---- 196,206 ----
-  #undef HAVE_UTIME
-  #undef HAVE_BIND_TEXTDOMAIN_CODESET
-  
-+ /* Define, if needed, for accessing large files. */
-+ #undef _LARGE_FILES
-+ #undef _FILE_OFFSET_BITS
-+ #undef _LARGEFILE_SOURCE
-+ 
-  /* Define if you do not have utime(), but do have the utimes() function. */
-  #undef HAVE_UTIMES
-  
-*** ../vim-7.2.412/src/auto/configure	2010-03-10 16:27:27.000000000 +0100
---- src/auto/configure	2010-05-07 16:01:08.000000000 +0200
-***************
-*** 821,826 ****
---- 821,827 ----
-  with_gnome
-  with_motif_lib
-  with_tlib
-+ enable_largefile
-  enable_acl
-  enable_gpm
-  enable_sysmouse
-***************
-*** 1485,1490 ****
---- 1486,1492 ----
-    --enable-nextaw-check   If auto-select GUI, check for neXtaw default=yes
-    --enable-carbon-check   If auto-select GUI, check for Carbon default=yes
-    --disable-gtktest       Do not try to compile and run a test GTK program
-+   --disable-largefile     omit support for large files
-    --disable-acl           Don't check for ACL support.
-    --disable-gpm           Don't use gpm (Linux mouse daemon).
-    --disable-sysmouse    Don't use sysmouse (mouse in *BSD console).
-***************
-*** 14345,14350 ****
---- 14347,14709 ----
-  fi
-  
-  
-+ # Check whether --enable-largefile was given.
-+ if test "${enable_largefile+set}" = set; then
-+   enableval=$enable_largefile;
-+ fi
-+ 
-+ if test "$enable_largefile" != no; then
-+ 
-+   { $as_echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
-+ $as_echo_n "checking for special C compiler options needed for large files... " >&6; }
-+ if test "${ac_cv_sys_largefile_CC+set}" = set; then
-+   $as_echo_n "(cached) " >&6
-+ else
-+   ac_cv_sys_largefile_CC=no
-+      if test "$GCC" != yes; then
-+        ac_save_CC=$CC
-+        while :; do
-+ 	 # IRIX 6.2 and later do not support large files by default,
-+ 	 # so use the C compiler's -n32 option if that helps.
-+ 	 cat >conftest.$ac_ext <<_ACEOF
-+ /* confdefs.h.  */
-+ _ACEOF
-+ cat confdefs.h >>conftest.$ac_ext
-+ cat >>conftest.$ac_ext <<_ACEOF
-+ /* end confdefs.h.  */
-+ #include <sys/types.h>
-+  /* Check that off_t can represent 2**63 - 1 correctly.
-+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+     since some C++ compilers masquerading as C compilers
-+     incorrectly reject 9223372036854775807.  */
-+ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+ 		       && LARGE_OFF_T % 2147483647 == 1)
-+ 		      ? 1 : -1];
-+ int
-+ main ()
-+ {
-+ 
-+   ;
-+   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
-+   break
-+ else
-+   $as_echo "$as_me: failed program was:" >&5
-+ sed 's/^/| /' conftest.$ac_ext >&5
-+ 
-+ 
-+ fi
-+ 
-+ rm -f core conftest.err conftest.$ac_objext
-+ 	 CC="$CC -n32"
-+ 	 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_sys_largefile_CC=' -n32'; break
-+ else
-+   $as_echo "$as_me: failed program was:" >&5
-+ sed 's/^/| /' conftest.$ac_ext >&5
-+ 
-+ 
-+ fi
-+ 
-+ rm -f core conftest.err conftest.$ac_objext
-+ 	 break
-+        done
-+        CC=$ac_save_CC
-+        rm -f conftest.$ac_ext
-+     fi
-+ fi
-+ { $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
-+ $as_echo "$ac_cv_sys_largefile_CC" >&6; }
-+   if test "$ac_cv_sys_largefile_CC" != no; then
-+     CC=$CC$ac_cv_sys_largefile_CC
-+   fi
-+ 
-+   { $as_echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-+ $as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
-+ if test "${ac_cv_sys_file_offset_bits+set}" = set; then
-+   $as_echo_n "(cached) " >&6
-+ else
-+   while :; do
-+   cat >conftest.$ac_ext <<_ACEOF
-+ /* confdefs.h.  */
-+ _ACEOF
-+ cat confdefs.h >>conftest.$ac_ext
-+ cat >>conftest.$ac_ext <<_ACEOF
-+ /* end confdefs.h.  */
-+ #include <sys/types.h>
-+  /* Check that off_t can represent 2**63 - 1 correctly.
-+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+     since some C++ compilers masquerading as C compilers
-+     incorrectly reject 9223372036854775807.  */
-+ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+ 		       && LARGE_OFF_T % 2147483647 == 1)
-+ 		      ? 1 : -1];
-+ int
-+ main ()
-+ {
-+ 
-+   ;
-+   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_sys_file_offset_bits=no; break
-+ else
-+   $as_echo "$as_me: failed program was:" >&5
-+ sed 's/^/| /' conftest.$ac_ext >&5
-+ 
-+ 
-+ fi
-+ 
-+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+   cat >conftest.$ac_ext <<_ACEOF
-+ /* confdefs.h.  */
-+ _ACEOF
-+ cat confdefs.h >>conftest.$ac_ext
-+ cat >>conftest.$ac_ext <<_ACEOF
-+ /* end confdefs.h.  */
-+ #define _FILE_OFFSET_BITS 64
-+ #include <sys/types.h>
-+  /* Check that off_t can represent 2**63 - 1 correctly.
-+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+     since some C++ compilers masquerading as C compilers
-+     incorrectly reject 9223372036854775807.  */
-+ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+ 		       && LARGE_OFF_T % 2147483647 == 1)
-+ 		      ? 1 : -1];
-+ int
-+ main ()
-+ {
-+ 
-+   ;
-+   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_sys_file_offset_bits=64; break
-+ else
-+   $as_echo "$as_me: failed program was:" >&5
-+ sed 's/^/| /' conftest.$ac_ext >&5
-+ 
-+ 
-+ fi
-+ 
-+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+   ac_cv_sys_file_offset_bits=unknown
-+   break
-+ done
-+ fi
-+ { $as_echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
-+ $as_echo "$ac_cv_sys_file_offset_bits" >&6; }
-+ case $ac_cv_sys_file_offset_bits in #(
-+   no | unknown) ;;
-+   *)
-+ cat >>confdefs.h <<_ACEOF
-+ #define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
-+ _ACEOF
-+ ;;
-+ esac
-+ rm -rf conftest*
-+   if test $ac_cv_sys_file_offset_bits = unknown; then
-+     { $as_echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
-+ $as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
-+ if test "${ac_cv_sys_large_files+set}" = set; then
-+   $as_echo_n "(cached) " >&6
-+ else
-+   while :; do
-+   cat >conftest.$ac_ext <<_ACEOF
-+ /* confdefs.h.  */
-+ _ACEOF
-+ cat confdefs.h >>conftest.$ac_ext
-+ cat >>conftest.$ac_ext <<_ACEOF
-+ /* end confdefs.h.  */
-+ #include <sys/types.h>
-+  /* Check that off_t can represent 2**63 - 1 correctly.
-+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+     since some C++ compilers masquerading as C compilers
-+     incorrectly reject 9223372036854775807.  */
-+ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+ 		       && LARGE_OFF_T % 2147483647 == 1)
-+ 		      ? 1 : -1];
-+ int
-+ main ()
-+ {
-+ 
-+   ;
-+   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_sys_large_files=no; break
-+ else
-+   $as_echo "$as_me: failed program was:" >&5
-+ sed 's/^/| /' conftest.$ac_ext >&5
-+ 
-+ 
-+ fi
-+ 
-+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+   cat >conftest.$ac_ext <<_ACEOF
-+ /* confdefs.h.  */
-+ _ACEOF
-+ cat confdefs.h >>conftest.$ac_ext
-+ cat >>conftest.$ac_ext <<_ACEOF
-+ /* end confdefs.h.  */
-+ #define _LARGE_FILES 1
-+ #include <sys/types.h>
-+  /* Check that off_t can represent 2**63 - 1 correctly.
-+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+     since some C++ compilers masquerading as C compilers
-+     incorrectly reject 9223372036854775807.  */
-+ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+ 		       && LARGE_OFF_T % 2147483647 == 1)
-+ 		      ? 1 : -1];
-+ int
-+ main ()
-+ {
-+ 
-+   ;
-+   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_sys_large_files=1; break
-+ else
-+   $as_echo "$as_me: failed program was:" >&5
-+ sed 's/^/| /' conftest.$ac_ext >&5
-+ 
-+ 
-+ fi
-+ 
-+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+   ac_cv_sys_large_files=unknown
-+   break
-+ done
-+ fi
-+ { $as_echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
-+ $as_echo "$ac_cv_sys_large_files" >&6; }
-+ case $ac_cv_sys_large_files in #(
-+   no | unknown) ;;
-+   *)
-+ cat >>confdefs.h <<_ACEOF
-+ #define _LARGE_FILES $ac_cv_sys_large_files
-+ _ACEOF
-+ ;;
-+ esac
-+ rm -rf conftest*
-+   fi
-+ fi
-+ 
-+ 
-  { $as_echo "$as_me:$LINENO: checking for st_blksize" >&5
-  $as_echo_n "checking for st_blksize... " >&6; }
-  cat >conftest.$ac_ext <<_ACEOF
-*** ../vim-7.2.412/src/version.c	2010-05-07 15:51:59.000000000 +0200
---- src/version.c	2010-05-07 16:04:29.000000000 +0200
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     413,
-  /**/
-
--- 
-How To Keep A Healthy Level Of Insanity:
-2. Page yourself over the intercom. Don't disguise your voice.
-
- /// 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.414 b/source/ap/vim/patches/7.2.414
deleted file mode 100644
index 9d5666c3..00000000
--- a/source/ap/vim/patches/7.2.414
+++ /dev/null
@@ -1,93 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.414
-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.414
-Problem:    CTRK-K <space> <space> does not produce 0xa0 as expected. (Tony
-	    Mechelynck)
-Solution:   Remove the Unicode range 0xe000 - 0xefff from digraphs, these are
-	    not valid characters.
-Files:	    src/digraph.c
-
-
-*** ../vim-7.2.413/src/digraph.c	2009-05-13 14:12:14.000000000 +0200
---- src/digraph.c	2010-04-11 17:28:22.000000000 +0200
-***************
-*** 1933,1977 ****
-  	{'7', 'c', 0x3226},
-  	{'8', 'c', 0x3227},
-  	{'9', 'c', 0x3228},
-! 	{' ', ' ', 0xe000},
-! 	{'/', 'c', 0xe001},
-! 	{'U', 'A', 0xe002},
-! 	{'U', 'B', 0xe003},
-! 	{'"', '3', 0xe004},
-! 	{'"', '1', 0xe005},
-! 	{'"', '!', 0xe006},
-! 	{'"', '\'', 0xe007},
-! 	{'"', '>', 0xe008},
-! 	{'"', '?', 0xe009},
-! 	{'"', '-', 0xe00a},
-! 	{'"', '(', 0xe00b},
-! 	{'"', '.', 0xe00c},
-! 	{'"', ':', 0xe00d},
-! 	{'"', '0', 0xe00e},
-! 	{'"', '"', 0xe00f},
-! 	{'"', '<', 0xe010},
-! 	{'"', ',', 0xe011},
-! 	{'"', ';', 0xe012},
-! 	{'"', '_', 0xe013},
-! 	{'"', '=', 0xe014},
-! 	{'"', '/', 0xe015},
-! 	{'"', 'i', 0xe016},
-! 	{'"', 'd', 0xe017},
-! 	{'"', 'p', 0xe018},
-! 	{';', ';', 0xe019},
-! 	{',', ',', 0xe01a},
-! 	{'b', '3', 0xe01b},
-! 	{'C', 'i', 0xe01c},
-! 	{'f', '(', 0xe01d},
-! 	{'e', 'd', 0xe01e},
-! 	{'a', 'm', 0xe01f},
-! 	{'p', 'm', 0xe020},
-! 	{'F', 'l', 0xe023},
-! 	{'G', 'F', 0xe024},
-! 	{'>', 'V', 0xe025},
-! 	{'!', '*', 0xe026},
-! 	{'?', '*', 0xe027},
-! 	{'J', '<', 0xe028},
-  	{'f', 'f', 0xfb00},
-  	{'f', 'i', 0xfb01},
-  	{'f', 'l', 0xfb02},
---- 1933,1940 ----
-  	{'7', 'c', 0x3226},
-  	{'8', 'c', 0x3227},
-  	{'9', 'c', 0x3228},
-! 	/* code points 0xe000 - 0xefff excluded, they have no assigned
-! 	 * characters, only used in proposals. */
-  	{'f', 'f', 0xfb00},
-  	{'f', 'i', 0xfb01},
-  	{'f', 'l', 0xfb02},
-*** ../vim-7.2.413/src/version.c	2010-05-07 16:05:48.000000000 +0200
---- src/version.c	2010-05-07 16:17:26.000000000 +0200
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     414,
-  /**/
-
--- 
-How To Keep A Healthy Level Of Insanity:
-4. Put your garbage can on your desk and label 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.415 b/source/ap/vim/patches/7.2.415
deleted file mode 100644
index 87e7c0b5..00000000
--- a/source/ap/vim/patches/7.2.415
+++ /dev/null
@@ -1,69 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.415
-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.415
-Problem:    Win32: Can't open a remote file when starting Vim.
-Solution:   Don't invoke cygwin_conv_path() for URLs. (Tomoya Adachi)
-Files:	    src/main.c
-
-
-*** ../vim-7.2.414/src/main.c	2009-12-16 18:27:29.000000000 +0100
---- src/main.c	2010-04-12 20:57:44.000000000 +0200
-***************
-*** 1477,1483 ****
-  	++initstr;
-      }
-  
-!     /* Avoid using evim mode for "editor". */
-      if (TOLOWER_ASC(initstr[0]) == 'e'
-  	    && (TOLOWER_ASC(initstr[1]) == 'v'
-  		|| TOLOWER_ASC(initstr[1]) == 'g'))
---- 1477,1483 ----
-  	++initstr;
-      }
-  
-!     /* Use evim mode for "evim" and "egvim", not for "editor". */
-      if (TOLOWER_ASC(initstr[0]) == 'e'
-  	    && (TOLOWER_ASC(initstr[1]) == 'v'
-  		|| TOLOWER_ASC(initstr[1]) == 'g'))
-***************
-*** 2262,2268 ****
-  	     * Look for evidence of non-Cygwin paths before we bother.
-  	     * This is only for when using the Unix files.
-  	     */
-! 	    if (strpbrk(p, "\\:") != NULL)
-  	    {
-  		char posix_path[PATH_MAX];
-  
---- 2262,2268 ----
-  	     * Look for evidence of non-Cygwin paths before we bother.
-  	     * This is only for when using the Unix files.
-  	     */
-! 	    if (strpbrk(p, "\\:") != NULL && !path_with_url(p))
-  	    {
-  		char posix_path[PATH_MAX];
-  
-*** ../vim-7.2.414/src/version.c	2010-05-07 16:18:08.000000000 +0200
---- src/version.c	2010-05-07 16:34:22.000000000 +0200
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     415,
-  /**/
-
--- 
-How To Keep A Healthy Level Of Insanity:
-6. In the memo field of all your checks, write "for sexual favors".
-
- /// 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.416 b/source/ap/vim/patches/7.2.416
deleted file mode 100644
index 67bb8080..00000000
--- a/source/ap/vim/patches/7.2.416
+++ /dev/null
@@ -1,69 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.416
-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.416
-Problem:    Logtalk.dict is not installed.
-Solution:   Add it to the install target. (Markus Heidelberg)
-Files:      src/Makefile
-
-
-*** ../vim-7.2.415/src/Makefile	2010-05-07 16:35:12.000000000 +0200
---- src/Makefile	2010-04-06 20:19:48.000000000 +0200
-***************
-*** 30,36 ****
-  #	  want to disable using X11 libraries.	This speeds up starting Vim,
-  #	  but the window title will not be set and the X11 selection can not
-  #	  used.
-! #	- Uncomment the line "CONF_OPT_XSMP = --without-xsmp" if you have the
-  #	  X11 Session Management Protocol (XSMP) library (libSM) but do not
-  #	  want to use it.
-  #	  This can speedup Vim startup but Vim loses the ability to catch the
---- 30,36 ----
-  #	  want to disable using X11 libraries.	This speeds up starting Vim,
-  #	  but the window title will not be set and the X11 selection can not
-  #	  used.
-! #	- Uncomment the line "CONF_OPT_XSMP = --disable-xsmp" if you have the
-  #	  X11 Session Management Protocol (XSMP) library (libSM) but do not
-  #	  want to use it.
-  #	  This can speedup Vim startup but Vim loses the ability to catch the
-***************
-*** 1882,1888 ****
-  	cd $(PLUGSOURCE); $(INSTALL_DATA) *.vim README.txt $(DEST_PLUG)
-  	cd $(DEST_PLUG); chmod $(HELPMOD) *.vim README.txt
-  # install the ftplugin files
-! 	cd $(FTPLUGSOURCE); $(INSTALL_DATA) *.vim README.txt $(DEST_FTP)
-  	cd $(DEST_FTP); chmod $(HELPMOD) *.vim README.txt
-  # install the compiler files
-  	cd $(COMPSOURCE); $(INSTALL_DATA) *.vim README.txt $(DEST_COMP)
---- 1882,1888 ----
-  	cd $(PLUGSOURCE); $(INSTALL_DATA) *.vim README.txt $(DEST_PLUG)
-  	cd $(DEST_PLUG); chmod $(HELPMOD) *.vim README.txt
-  # install the ftplugin files
-! 	cd $(FTPLUGSOURCE); $(INSTALL_DATA) *.vim README.txt logtalk.dict $(DEST_FTP)
-  	cd $(DEST_FTP); chmod $(HELPMOD) *.vim README.txt
-  # install the compiler files
-  	cd $(COMPSOURCE); $(INSTALL_DATA) *.vim README.txt $(DEST_COMP)
-*** ../vim-7.2.415/src/version.c	2010-05-07 16:34:59.000000000 +0200
---- src/version.c	2010-05-07 16:53:17.000000000 +0200
-***************
-*** 683,684 ****
---- 683,686 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     416,
-  /**/
-
--- 
-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.3.001 b/source/ap/vim/patches/7.3.001
new file mode 100644
index 00000000..470fec6b
--- /dev/null
+++ b/source/ap/vim/patches/7.3.001
@@ -0,0 +1,55 @@
+To: vim-dev@vim.org
+Subject: Patch 7.3.001
+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.3.001
+Problem:    When editing "src/main.c" and 'path' set to "./proto",
+	    ":find e<C-D" shows ./proto/eval.pro instead of eval.pro.
+Solution:   Check for path separator when comparing names. (Nazri Ramliy)
+Files:	    src/misc1.c
+
+
+*** ../vim-7.3.000/src/misc1.c	2010-08-15 21:57:27.000000000 +0200
+--- src/misc1.c	2010-08-16 20:43:25.000000000 +0200
+***************
+*** 9317,9323 ****
+  	    continue;  /* it's different when it's shorter */
+  
+  	rival = other_paths[j] + other_path_len - candidate_len;
+! 	if (fnamecmp(maybe_unique, rival) == 0)
+  	    return FALSE;  /* match */
+      }
+  
+--- 9317,9324 ----
+  	    continue;  /* it's different when it's shorter */
+  
+  	rival = other_paths[j] + other_path_len - candidate_len;
+! 	if (fnamecmp(maybe_unique, rival) == 0
+! 		&& (rival == other_paths[j] || vim_ispathsep(*(rival - 1))))
+  	    return FALSE;  /* match */
+      }
+  
+*** ../vim-7.3.000/src/version.c	2010-08-15 21:57:25.000000000 +0200
+--- src/version.c	2010-08-16 20:53:09.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     1,
+  /**/
+
+
+-- 
+From "know your smileys":
+ (:-#	Said something he shouldn't have
+
+ /// 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.3.002 b/source/ap/vim/patches/7.3.002
new file mode 100644
index 00000000..012fed2f
--- /dev/null
+++ b/source/ap/vim/patches/7.3.002
@@ -0,0 +1,55 @@
+To: vim-dev@vim.org
+Subject: Patch 7.3.002
+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.3.002
+Problem:    ":find" completion doesn't work when halfway an environment
+	    variable. (Dominique Pelle)
+Solution:   Only use in-path completion when expanding file names. (Nazri
+	    Ramliy)
+Files:	    src/ex_docmd.c
+
+
+*** ../vim-7.3.001/src/ex_docmd.c	2010-08-15 21:57:27.000000000 +0200
+--- src/ex_docmd.c	2010-08-16 20:51:22.000000000 +0200
+***************
+*** 3465,3471 ****
+  	case CMD_find:
+  	case CMD_sfind:
+  	case CMD_tabfind:
+! 	    xp->xp_context = EXPAND_FILES_IN_PATH;
+  	    break;
+  	case CMD_cd:
+  	case CMD_chdir:
+--- 3465,3472 ----
+  	case CMD_find:
+  	case CMD_sfind:
+  	case CMD_tabfind:
+! 	    if (xp->xp_context == EXPAND_FILES)
+! 		xp->xp_context = EXPAND_FILES_IN_PATH;
+  	    break;
+  	case CMD_cd:
+  	case CMD_chdir:
+*** ../vim-7.3.001/src/version.c	2010-08-16 21:46:12.000000000 +0200
+--- src/version.c	2010-08-16 22:33:13.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     2,
+  /**/
+
+-- 
+Warning label on a superhero Halloween costume:
+"Caution: Cape does not enable user to fly."
+
+ /// 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.3.003 b/source/ap/vim/patches/7.3.003
new file mode 100644
index 00000000..8bc9f471
--- /dev/null
+++ b/source/ap/vim/patches/7.3.003
@@ -0,0 +1,45 @@
+To: vim-dev@vim.org
+Subject: Patch 7.3.003
+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.1.003
+Problem:    Crash with specific BufWritePost autocmd. (Peter Odding)
+Solution:   Don't free the quickfix title twice. (Lech Lorens)
+Files:	    src/quickfix.c
+
+
+*** ../vim-7.3.002/src/quickfix.c	2010-08-15 21:57:26.000000000 +0200
+--- src/quickfix.c	2010-08-16 21:15:44.000000000 +0200
+***************
+*** 2125,2130 ****
+--- 2125,2131 ----
+  	--qi->qf_lists[idx].qf_count;
+      }
+      vim_free(qi->qf_lists[idx].qf_title);
++     qi->qf_lists[idx].qf_title = NULL;
+  }
+  
+  /*
+*** ../vim-7.3.002/src/version.c	2010-08-16 22:33:55.000000000 +0200
+--- src/version.c	2010-08-17 20:23:05.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     3,
+  /**/
+
+-- 
+From "know your smileys":
+ :-X	My lips are sealed
+
+ /// 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.3.004 b/source/ap/vim/patches/7.3.004
new file mode 100644
index 00000000..9c6318a0
--- /dev/null
+++ b/source/ap/vim/patches/7.3.004
@@ -0,0 +1,44 @@
+To: vim-dev@vim.org
+Subject: Patch 7.3.004
+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.3.004
+Problem:    Crash when using very long regexp. (Peter Odding)
+Solution:   Reset reg_toolong. (Carlo Teubner)
+Files:	    src/regexp.c
+
+
+*** ../vim-7.3.003/src/regexp.c	2010-08-15 21:57:29.000000000 +0200
+--- src/regexp.c	2010-09-14 10:51:22.000000000 +0200
+***************
+*** 3538,3543 ****
+--- 3538,3544 ----
+  
+      regline = line;
+      reglnum = 0;
++     reg_toolong = FALSE;
+  
+      /* Simplest case: Anchored match need be tried only once. */
+      if (prog->reganch)
+*** ../vim-7.3.003/src/version.c	2010-08-17 20:23:18.000000000 +0200
+--- src/version.c	2010-09-14 10:52:09.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     4,
+  /**/
+
+-- 
+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.3.005 b/source/ap/vim/patches/7.3.005
new file mode 100644
index 00000000..df2026d2
--- /dev/null
+++ b/source/ap/vim/patches/7.3.005
@@ -0,0 +1,96 @@
+To: vim-dev@vim.org
+Subject: Patch 7.3.005
+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.3.005
+Problem:    Crash when using undotree(). (Christian Brabandt)
+Solution:   Increase the list reference count.  Add a test for undotree() 
+            (Lech Lorens)
+Files:      src/eval.c, src/testdir/Makefile, src/testdir/test61.in
+
+
+*** ../vim-7.3.004/src/eval.c	2010-08-15 21:57:26.000000000 +0200
+--- src/eval.c	2010-09-14 12:43:04.000000000 +0200
+***************
+*** 7075,7081 ****
+  }
+  
+  /*
+!  * Add a list  entry to dictionary "d".
+   * Returns FAIL when out of memory and when key already exists.
+   */
+      int
+--- 7075,7081 ----
+  }
+  
+  /*
+!  * Add a list entry to dictionary "d".
+   * Returns FAIL when out of memory and when key already exists.
+   */
+      int
+***************
+*** 7097,7102 ****
+--- 7097,7103 ----
+  	dictitem_free(item);
+  	return FAIL;
+      }
++     ++list->lv_refcount;
+      return OK;
+  }
+  
+*** ../vim-7.3.004/src/testdir/Makefile	2010-08-15 21:57:29.000000000 +0200
+--- src/testdir/Makefile	2010-09-14 12:38:56.000000000 +0200
+***************
+*** 44,50 ****
+  $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
+  
+  clean:
+! 	-rm -rf *.out *.failed *.rej *.orig test.log tiny.vim small.vim mbyte.vim mzscheme.vim test.ok X* valgrind.pid* viminfo
+  
+  test1.out: test1.in
+  	-rm -f $*.failed tiny.vim small.vim mbyte.vim mzscheme.vim test.ok X* viminfo
+--- 44,50 ----
+  $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
+  
+  clean:
+! 	-rm -rf *.out *.failed *.rej *.orig test.log tiny.vim small.vim mbyte.vim mzscheme.vim test.ok X* valgrind.* viminfo
+  
+  test1.out: test1.in
+  	-rm -f $*.failed tiny.vim small.vim mbyte.vim mzscheme.vim test.ok X* viminfo
+*** ../vim-7.3.004/src/testdir/test61.in	2010-08-15 21:57:29.000000000 +0200
+--- src/testdir/test61.in	2010-09-14 12:38:56.000000000 +0200
+***************
+*** 4,9 ****
+--- 4,13 ----
+  Also tests :earlier and :later.
+  
+  STARTTEST
++ :echo undotree().entries
++ ENDTEST
++ 
++ STARTTEST
+  :" Delete three characters and undo
+  Gx:set ul=100
+  x:set ul=100
+*** ../vim-7.3.004/src/version.c	2010-09-14 10:55:24.000000000 +0200
+--- src/version.c	2010-09-14 12:39:59.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     5,
+  /**/
+
+-- 
+I'm writing a book.  I've got the page numbers done.
+
+ /// 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.3.006 b/source/ap/vim/patches/7.3.006
new file mode 100644
index 00000000..41eb7567
--- /dev/null
+++ b/source/ap/vim/patches/7.3.006
@@ -0,0 +1,117 @@
+To: vim-dev@vim.org
+Subject: Patch 7.3.006
+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.3.006
+Problem:    Can't build some multi-byte code with C89.
+Solution:   Move code to after declarations. (Joachim Schmitz)
+Files:	    src/mbyte.c, src/spell.c
+
+
+*** ../vim-7.3.005/src/mbyte.c	2010-08-15 21:57:28.000000000 +0200
+--- src/mbyte.c	2010-09-18 13:32:40.000000000 +0200
+***************
+*** 5167,5182 ****
+      void
+  xim_set_preedit()
+  {
+-     if (xic == NULL)
+- 	return;
+- 
+-     xim_set_focus(TRUE);
+- 
+      XVaNestedList attr_list;
+      XRectangle spot_area;
+      XPoint over_spot;
+      int line_space;
+  
+      if (!xim_has_focus)
+      {
+  	/* hide XIM cursor */
+--- 5167,5182 ----
+      void
+  xim_set_preedit()
+  {
+      XVaNestedList attr_list;
+      XRectangle spot_area;
+      XPoint over_spot;
+      int line_space;
+  
++     if (xic == NULL)
++ 	return;
++ 
++     xim_set_focus(TRUE);
++ 
+      if (!xim_has_focus)
+      {
+  	/* hide XIM cursor */
+***************
+*** 5554,5565 ****
+      void
+  xim_set_status_area()
+  {
+-     if (xic == NULL)
+- 	return;
+- 
+      XVaNestedList preedit_list = 0, status_list = 0, list = 0;
+      XRectangle pre_area, status_area;
+  
+      if (input_style & XIMStatusArea)
+      {
+  	if (input_style & XIMPreeditArea)
+--- 5554,5565 ----
+      void
+  xim_set_status_area()
+  {
+      XVaNestedList preedit_list = 0, status_list = 0, list = 0;
+      XRectangle pre_area, status_area;
+  
++     if (xic == NULL)
++ 	return;
++ 
+      if (input_style & XIMStatusArea)
+      {
+  	if (input_style & XIMPreeditArea)
+*** ../vim-7.3.005/src/spell.c	2010-08-15 21:57:32.000000000 +0200
+--- src/spell.c	2010-09-18 13:34:11.000000000 +0200
+***************
+*** 4679,4685 ****
+      buf_T	*buf;
+      char_u	fname[MAXPATHL];
+  
+!     /* Go through all buffers and handle 'spelllang'. */ //<VN>
+      for (buf = firstbuf; buf != NULL; buf = buf->b_next)
+  	ga_clear(&buf->b_s.b_langp);
+  
+--- 4679,4685 ----
+      buf_T	*buf;
+      char_u	fname[MAXPATHL];
+  
+!     /* Go through all buffers and handle 'spelllang'. <VN> */
+      for (buf = firstbuf; buf != NULL; buf = buf->b_next)
+  	ga_clear(&buf->b_s.b_langp);
+  
+*** ../vim-7.3.005/src/version.c	2010-09-14 12:47:30.000000000 +0200
+--- src/version.c	2010-09-18 13:34:23.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     6,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+163. You go outside for the fresh air (at -30 degrees) but open the
+     window first to hear new mail arrive.
+
+ /// 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.3.007 b/source/ap/vim/patches/7.3.007
new file mode 100644
index 00000000..30b3745c
--- /dev/null
+++ b/source/ap/vim/patches/7.3.007
@@ -0,0 +1,187 @@
+To: vim-dev@vim.org
+Subject: Patch 7.3.007
+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.3.007
+Problem:    Python code defines global "buffer".  Re-implements a grow-array.
+Solution:   Use a grow-array instead of coding the same functionality.  Handle
+	    out-of-memory situation properly.
+Files:	    src/if_py_both.h
+
+
+*** ../vim-7.3.006/src/if_py_both.h	2010-08-15 21:57:27.000000000 +0200
+--- src/if_py_both.h	2010-09-21 16:00:54.000000000 +0200
+***************
+*** 34,39 ****
+--- 34,40 ----
+  static PyObject *OutputWrite(PyObject *, PyObject *);
+  static PyObject *OutputWritelines(PyObject *, PyObject *);
+  
++ /* Function to write a line, points to either msg() or emsg(). */
+  typedef void (*writefn)(char_u *);
+  static void writer(writefn fn, char_u *str, PyInt n);
+  
+***************
+*** 122,173 ****
+      return Py_None;
+  }
+  
+! static char_u *buffer = NULL;
+! static PyInt buffer_len = 0;
+! static PyInt buffer_size = 0;
+! 
+  static writefn old_fn = NULL;
+  
+      static void
+- buffer_ensure(PyInt n)
+- {
+-     PyInt new_size;
+-     char_u *new_buffer;
+- 
+-     if (n < buffer_size)
+- 	return;
+- 
+-     new_size = buffer_size;
+-     while (new_size < n)
+- 	new_size += 80;
+- 
+-     if (new_size != buffer_size)
+-     {
+- 	new_buffer = alloc((unsigned)new_size);
+- 	if (new_buffer == NULL)
+- 	    return;
+- 
+- 	if (buffer)
+- 	{
+- 	    memcpy(new_buffer, buffer, buffer_len);
+- 	    vim_free(buffer);
+- 	}
+- 
+- 	buffer = new_buffer;
+- 	buffer_size = new_size;
+-     }
+- }
+- 
+-     static void
+  PythonIO_Flush(void)
+  {
+!     if (old_fn && buffer_len)
+      {
+! 	buffer[buffer_len] = 0;
+! 	old_fn(buffer);
+      }
+! 
+!     buffer_len = 0;
+  }
+  
+      static void
+--- 123,141 ----
+      return Py_None;
+  }
+  
+! /* Buffer IO, we write one whole line at a time. */
+! static garray_T io_ga = {0, 0, 1, 80, NULL};
+  static writefn old_fn = NULL;
+  
+      static void
+  PythonIO_Flush(void)
+  {
+!     if (old_fn != NULL && io_ga.ga_len > 0)
+      {
+! 	((char_u *)io_ga.ga_data)[io_ga.ga_len] = NUL;
+! 	old_fn((char_u *)io_ga.ga_data);
+      }
+!     io_ga.ga_len = 0;
+  }
+  
+      static void
+***************
+*** 175,204 ****
+  {
+      char_u *ptr;
+  
+!     if (fn != old_fn && old_fn != NULL)
+  	PythonIO_Flush();
+- 
+      old_fn = fn;
+  
+      while (n > 0 && (ptr = memchr(str, '\n', n)) != NULL)
+      {
+  	PyInt len = ptr - str;
+  
+! 	buffer_ensure(buffer_len + len + 1);
+  
+! 	memcpy(buffer + buffer_len, str, len);
+! 	buffer_len += len;
+! 	buffer[buffer_len] = 0;
+! 	fn(buffer);
+  	str = ptr + 1;
+  	n -= len + 1;
+! 	buffer_len = 0;
+      }
+  
+!     /* Put the remaining text into the buffer for later printing */
+!     buffer_ensure(buffer_len + n + 1);
+!     memcpy(buffer + buffer_len, str, n);
+!     buffer_len += n;
+  }
+  
+  /***************/
+--- 143,176 ----
+  {
+      char_u *ptr;
+  
+!     /* Flush when switching output function. */
+!     if (fn != old_fn)
+  	PythonIO_Flush();
+      old_fn = fn;
+  
++     /* Write each NL separated line.  Text after the last NL is kept for
++      * writing later. */
+      while (n > 0 && (ptr = memchr(str, '\n', n)) != NULL)
+      {
+  	PyInt len = ptr - str;
+  
+! 	if (ga_grow(&io_ga, len + 1) == FAIL)
+! 	    break;
+  
+! 	mch_memmove(((char *)io_ga.ga_data) + io_ga.ga_len, str, (size_t)len);
+! 	((char *)io_ga.ga_data)[io_ga.ga_len + len] = NUL;
+! 	fn((char_u *)io_ga.ga_data);
+  	str = ptr + 1;
+  	n -= len + 1;
+! 	io_ga.ga_len = 0;
+      }
+  
+!     /* Put the remaining text into io_ga for later printing. */
+!     if (n > 0 && ga_grow(&io_ga, n + 1) == OK)
+!     {
+! 	mch_memmove(((char *)io_ga.ga_data) + io_ga.ga_len, str, (size_t)n);
+! 	io_ga.ga_len += n;
+!     }
+  }
+  
+  /***************/
+*** ../vim-7.3.006/src/version.c	2010-09-18 13:36:41.000000000 +0200
+--- src/version.c	2010-09-21 16:49:13.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     7,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+180. You maintain more than six e-mail addresses.
+
+ /// 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.3.008 b/source/ap/vim/patches/7.3.008
new file mode 100644
index 00000000..5df7daa8
--- /dev/null
+++ b/source/ap/vim/patches/7.3.008
@@ -0,0 +1,439 @@
+To: vim-dev@vim.org
+Subject: Patch 7.3.008
+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.3.008
+Problem:    'cursorbind' is kept in places where 'scrollbind' is reset.
+Solution:   Reset 'cursorbind'.
+Files:	    src/buffer.c, src/diff.c, src/ex_cmds.c, src/ex_cmds2.c,
+	    src/ex_docmd.c, src/ex_getln.c, src/if_cscope.c, src/macros.h,
+	    src/quickfix.c, src/search.c, src/tag.c, src/window.c
+
+
+*** ../vim-7.3.007/src/buffer.c	2010-08-15 21:57:32.000000000 +0200
+--- src/buffer.c	2010-09-21 16:54:19.000000000 +0200
+***************
+*** 1288,1296 ****
+      /* Go to the other buffer. */
+      set_curbuf(buf, action);
+  
+! #if defined(FEAT_LISTCMDS) && defined(FEAT_SCROLLBIND)
+      if (action == DOBUF_SPLIT)
+! 	curwin->w_p_scb = FALSE;	/* reset 'scrollbind' */
+  #endif
+  
+  #if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL)
+--- 1288,1299 ----
+      /* Go to the other buffer. */
+      set_curbuf(buf, action);
+  
+! #if defined(FEAT_LISTCMDS) \
+! 	&& (defined(FEAT_SCROLLBIND) || defined(FEAT_CURSORBIND))
+      if (action == DOBUF_SPLIT)
+!     {
+! 	RESET_BINDING(curwin);	/* reset 'scrollbind' and 'cursorbind' */
+!     }
+  #endif
+  
+  #if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL)
+***************
+*** 1917,1925 ****
+  		tabpage_new();
+  	    else if (win_split(0, 0) == FAIL)	/* Open in a new window */
+  		return FAIL;
+! # ifdef FEAT_SCROLLBIND
+! 	    curwin->w_p_scb = FALSE;
+! # endif
+  	}
+      }
+  #endif
+--- 1920,1926 ----
+  		tabpage_new();
+  	    else if (win_split(0, 0) == FAIL)	/* Open in a new window */
+  		return FAIL;
+! 	    RESET_BINDING(curwin);
+  	}
+      }
+  #endif
+*** ../vim-7.3.007/src/diff.c	2010-08-15 21:57:32.000000000 +0200
+--- src/diff.c	2010-09-21 16:14:07.000000000 +0200
+***************
+*** 1127,1137 ****
+  # endif
+  
+      wp->w_p_diff = TRUE;
+  #ifdef FEAT_CURSORBIND
+-     /* Use cursorbind if it's available */
+      wp->w_p_crb = TRUE;
+  #endif
+-     wp->w_p_scb = TRUE;
+      wp->w_p_wrap = FALSE;
+  # ifdef FEAT_FOLDING
+      curwin = wp;
+--- 1127,1139 ----
+  # endif
+  
+      wp->w_p_diff = TRUE;
++     /* Use 'scrollbind' and 'cursorbind' when available */
++ #ifdef FEAT_SCROLLBIND
++     wp->w_p_scb = TRUE;
++ #endif
+  #ifdef FEAT_CURSORBIND
+      wp->w_p_crb = TRUE;
+  #endif
+      wp->w_p_wrap = FALSE;
+  # ifdef FEAT_FOLDING
+      curwin = wp;
+***************
+*** 1177,1186 ****
+  	{
+  	    /* Set 'diff', 'scrollbind' off and 'wrap' on. */
+  	    wp->w_p_diff = FALSE;
+! #ifdef FEAT_CURSORBIND
+! 	    wp->w_p_crb = FALSE;
+! #endif
+! 	    wp->w_p_scb = FALSE;
+  	    wp->w_p_wrap = TRUE;
+  #ifdef FEAT_FOLDING
+  	    curwin = wp;
+--- 1179,1185 ----
+  	{
+  	    /* Set 'diff', 'scrollbind' off and 'wrap' on. */
+  	    wp->w_p_diff = FALSE;
+! 	    RESET_BINDING(wp);
+  	    wp->w_p_wrap = TRUE;
+  #ifdef FEAT_FOLDING
+  	    curwin = wp;
+*** ../vim-7.3.007/src/ex_cmds.c	2010-08-15 21:57:26.000000000 +0200
+--- src/ex_cmds.c	2010-09-21 16:15:07.000000000 +0200
+***************
+*** 3498,3506 ****
+  	curbuf->b_p_bin = FALSE;	/* reset 'bin' before reading file */
+  	curwin->w_p_nu = 0;		/* no line numbers */
+  	curwin->w_p_rnu = 0;		/* no relative line numbers */
+! #ifdef FEAT_SCROLLBIND
+! 	curwin->w_p_scb = FALSE;	/* no scroll binding */
+! #endif
+  #ifdef FEAT_ARABIC
+  	curwin->w_p_arab = FALSE;	/* no arabic mode */
+  #endif
+--- 3498,3504 ----
+  	curbuf->b_p_bin = FALSE;	/* reset 'bin' before reading file */
+  	curwin->w_p_nu = 0;		/* no line numbers */
+  	curwin->w_p_rnu = 0;		/* no relative line numbers */
+! 	RESET_BINDING(curwin);		/* no scroll or cursor binding */
+  #ifdef FEAT_ARABIC
+  	curwin->w_p_arab = FALSE;	/* no arabic mode */
+  #endif
+***************
+*** 5471,5479 ****
+  		return FALSE;
+  	    curwin->w_p_pvw = TRUE;
+  	    curwin->w_p_wfh = TRUE;
+! # ifdef FEAT_SCROLLBIND
+! 	    curwin->w_p_scb = FALSE;	    /* don't take over 'scrollbind' */
+! # endif
+  # ifdef FEAT_DIFF
+  	    curwin->w_p_diff = FALSE;	    /* no 'diff' */
+  # endif
+--- 5469,5476 ----
+  		return FALSE;
+  	    curwin->w_p_pvw = TRUE;
+  	    curwin->w_p_wfh = TRUE;
+! 	    RESET_BINDING(curwin);	    /* don't take over 'scrollbind'
+! 					       and 'cursorbind' */
+  # ifdef FEAT_DIFF
+  	    curwin->w_p_diff = FALSE;	    /* no 'diff' */
+  # endif
+*** ../vim-7.3.007/src/ex_cmds2.c	2010-08-15 21:57:31.000000000 +0200
+--- src/ex_cmds2.c	2010-09-21 16:15:17.000000000 +0200
+***************
+*** 2165,2173 ****
+  	{
+  	    if (win_split(0, 0) == FAIL)
+  		return;
+! # ifdef FEAT_SCROLLBIND
+! 	    curwin->w_p_scb = FALSE;
+! # endif
+  	}
+  	else
+  #endif
+--- 2165,2171 ----
+  	{
+  	    if (win_split(0, 0) == FAIL)
+  		return;
+! 	    RESET_BINDING(curwin);
+  	}
+  	else
+  #endif
+*** ../vim-7.3.007/src/ex_docmd.c	2010-08-16 22:33:55.000000000 +0200
+--- src/ex_docmd.c	2010-09-21 16:15:39.000000000 +0200
+***************
+*** 6898,6906 ****
+  # ifdef FEAT_WINDOWS
+  	if (win_split(0, 0) == FAIL)
+  	    return;
+! #  ifdef FEAT_SCROLLBIND
+! 	curwin->w_p_scb = FALSE;
+! #  endif
+  
+  	/* When splitting the window, create a new alist.  Otherwise the
+  	 * existing one is overwritten. */
+--- 6898,6904 ----
+  # ifdef FEAT_WINDOWS
+  	if (win_split(0, 0) == FAIL)
+  	    return;
+! 	RESET_BINDING(curwin);
+  
+  	/* When splitting the window, create a new alist.  Otherwise the
+  	 * existing one is overwritten. */
+***************
+*** 7300,7306 ****
+  		|| cmdmod.browse
+  #  endif
+  	   )
+! 	    curwin->w_p_scb = FALSE;
+  	else
+  	    do_check_scrollbind(FALSE);
+  # endif
+--- 7298,7306 ----
+  		|| cmdmod.browse
+  #  endif
+  	   )
+! 	{
+! 	    RESET_BINDING(curwin);
+! 	}
+  	else
+  	    do_check_scrollbind(FALSE);
+  # endif
+*** ../vim-7.3.007/src/ex_getln.c	2010-08-15 21:57:28.000000000 +0200
+--- src/ex_getln.c	2010-09-21 16:15:55.000000000 +0200
+***************
+*** 6147,6155 ****
+      curwin->w_p_rl = cmdmsg_rl;
+      cmdmsg_rl = FALSE;
+  # endif
+! # ifdef FEAT_SCROLLBIND
+!     curwin->w_p_scb = FALSE;
+! # endif
+  
+  # ifdef FEAT_AUTOCMD
+      /* Do execute autocommands for setting the filetype (load syntax). */
+--- 6147,6153 ----
+      curwin->w_p_rl = cmdmsg_rl;
+      cmdmsg_rl = FALSE;
+  # endif
+!     RESET_BINDING(curwin);
+  
+  # ifdef FEAT_AUTOCMD
+      /* Do execute autocommands for setting the filetype (load syntax). */
+*** ../vim-7.3.007/src/if_cscope.c	2010-08-15 21:57:32.000000000 +0200
+--- src/if_cscope.c	2010-09-21 16:16:26.000000000 +0200
+***************
+*** 1274,1282 ****
+  		{
+  		    win_split(postponed_split > 0 ? postponed_split : 0,
+  						       postponed_split_flags);
+! #  ifdef FEAT_SCROLLBIND
+! 		    curwin->w_p_scb = FALSE;
+! #  endif
+  		    postponed_split = 0;
+  		}
+  # endif
+--- 1274,1280 ----
+  		{
+  		    win_split(postponed_split > 0 ? postponed_split : 0,
+  						       postponed_split_flags);
+! 		    RESET_BINDING(curwin);
+  		    postponed_split = 0;
+  		}
+  # endif
+*** ../vim-7.3.007/src/macros.h	2010-08-15 21:57:28.000000000 +0200
+--- src/macros.h	2010-09-21 16:13:10.000000000 +0200
+***************
+*** 285,287 ****
+--- 285,301 ----
+  #else
+  # define DO_AUTOCHDIR
+  #endif
++ 
++ #if defined(FEAT_SCROLLBIND) && defined(FEAT_CURSORBIND)
++ # define RESET_BINDING(wp)  (wp)->w_p_scb = FALSE; (wp)->w_p_crb = FALSE
++ #else
++ # if defined(FEAT_SCROLLBIND)
++ #  define RESET_BINDING(wp)  (wp)->w_p_scb = FALSE
++ # else
++ #  if defined(FEAT_CURSORBIND)
++ #   define RESET_BINDING(wp)  (wp)->w_p_crb = FALSE
++ #  else
++ #   define RESET_BINDING(wp)
++ #  endif
++ # endif
++ #endif
+*** ../vim-7.3.007/src/quickfix.c	2010-08-17 20:23:18.000000000 +0200
+--- src/quickfix.c	2010-09-21 16:17:17.000000000 +0200
+***************
+*** 1656,1664 ****
+  	    opened_window = TRUE;	/* close it when fail */
+  	    p_swb = empty_option;	/* don't split again */
+  	    swb_flags = 0;
+! # ifdef FEAT_SCROLLBIND
+! 	    curwin->w_p_scb = FALSE;
+! # endif
+  	    if (ll_ref != NULL)
+  	    {
+  		/* The new window should use the location list from the
+--- 1656,1662 ----
+  	    opened_window = TRUE;	/* close it when fail */
+  	    p_swb = empty_option;	/* don't split again */
+  	    swb_flags = 0;
+! 	    RESET_BINDING(curwin);
+  	    if (ll_ref != NULL)
+  	    {
+  		/* The new window should use the location list from the
+***************
+*** 2334,2342 ****
+  	    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)
+  	{
+--- 2332,2338 ----
+  	    win_goto(lastwin);
+  	if (win_split(height, WSP_BELOW | WSP_NEWLOC) == FAIL)
+  	    return;		/* not enough room for window */
+! 	RESET_BINDING(curwin);
+  
+  	if (eap->cmdidx == CMD_lopen || eap->cmdidx == CMD_lwindow)
+  	{
+*** ../vim-7.3.007/src/search.c	2010-08-15 21:57:32.000000000 +0200
+--- src/search.c	2010-09-21 16:17:28.000000000 +0200
+***************
+*** 5075,5083 ****
+  			if (win_split(0, 0) == FAIL)
+  #endif
+  			    break;
+! #ifdef FEAT_SCROLLBIND
+! 			curwin->w_p_scb = FALSE;
+! #endif
+  		    }
+  		    if (depth == -1)
+  		    {
+--- 5075,5081 ----
+  			if (win_split(0, 0) == FAIL)
+  #endif
+  			    break;
+! 			RESET_BINDING(curwin);
+  		    }
+  		    if (depth == -1)
+  		    {
+*** ../vim-7.3.007/src/tag.c	2010-08-15 21:57:25.000000000 +0200
+--- src/tag.c	2010-09-21 16:17:51.000000000 +0200
+***************
+*** 3143,3151 ****
+      {
+  	win_split(postponed_split > 0 ? postponed_split : 0,
+  						       postponed_split_flags);
+! # ifdef FEAT_SCROLLBIND
+! 	curwin->w_p_scb = FALSE;
+! # endif
+      }
+  #endif
+  
+--- 3143,3149 ----
+      {
+  	win_split(postponed_split > 0 ? postponed_split : 0,
+  						       postponed_split_flags);
+! 	RESET_BINDING(curwin);
+      }
+  #endif
+  
+*** ../vim-7.3.007/src/window.c	2010-08-15 21:57:32.000000000 +0200
+--- src/window.c	2010-09-21 16:18:44.000000000 +0200
+***************
+*** 525,533 ****
+  		    setpcmark();
+  		    if (win_split(0, 0) == OK)
+  		    {
+! # 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)
+--- 525,531 ----
+  		    setpcmark();
+  		    if (win_split(0, 0) == OK)
+  		    {
+! 			RESET_BINDING(curwin);
+  			(void)do_ecmd(0, ptr, NULL, NULL, ECMD_LASTL,
+  							   ECMD_HIDE, NULL);
+  			if (nchar == 'F' && lnum >= 0)
+***************
+*** 3277,3285 ****
+      if (aucmd_win != NULL)
+      {
+  	win_init_some(aucmd_win, curwin);
+! # ifdef FEAT_SCROLLBIND
+! 	aucmd_win->w_p_scb = FALSE;
+! # endif
+  	new_frame(aucmd_win);
+      }
+  }
+--- 3275,3281 ----
+      if (aucmd_win != NULL)
+      {
+  	win_init_some(aucmd_win, curwin);
+! 	RESET_BINDING(aucmd_win);
+  	new_frame(aucmd_win);
+      }
+  }
+***************
+*** 3320,3329 ****
+  	/* 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. */
+! 	curwin->w_p_scb = FALSE;
+! # endif
+      }
+  #endif
+  
+--- 3316,3323 ----
+  	/* First window in new tab page, initialize it from "oldwin". */
+  	win_init(curwin, oldwin, 0);
+  
+! 	/* We don't want cursor- and scroll-binding in the first window. */
+! 	RESET_BINDING(curwin);
+      }
+  #endif
+  
+*** ../vim-7.3.007/src/version.c	2010-09-21 16:49:29.000000000 +0200
+--- src/version.c	2010-09-21 16:53:16.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     8,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+181. You make up words that go with the "happy tune" your modem makes
+     while dialing your ISP.
+
+ /// 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.3.009 b/source/ap/vim/patches/7.3.009
new file mode 100644
index 00000000..317677d0
--- /dev/null
+++ b/source/ap/vim/patches/7.3.009
@@ -0,0 +1,99 @@
+To: vim-dev@vim.org
+Subject: Patch 7.3.009
+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.3.009
+Problem:    Win32: Crash on Windows when using a bad argument for strftime().
+	    (Christian Brabandt)
+Solution:   Use the bad_param_handler(). (Mike Williams)
+Files:	    src/os_win32.c
+
+
+*** ../vim-7.3.008/src/os_win32.c	2010-08-15 21:57:27.000000000 +0200
+--- src/os_win32.c	2010-09-21 17:02:54.000000000 +0200
+***************
+*** 1615,1620 ****
+--- 1615,1649 ----
+      return TRUE;
+  }
+  
++ #if ((defined(__MINGW32__) || defined (__CYGWIN32__)) && \
++         __MSVCRT_VERSION__ >= 0x800) || (defined(_MSC_VER) && _MSC_VER >= 1400)
++ /*
++  * Bad parameter handler.
++  *
++  * Certain MS CRT functions will intentionally crash when passed invalid
++  * parameters to highlight possible security holes.  Setting this function as
++  * the bad parameter handler will prevent the crash.
++  *
++  * In debug builds the parameters contain CRT information that might help track
++  * down the source of a problem, but in non-debug builds the arguments are all
++  * NULL/0.  Debug builds will also produce assert dialogs from the CRT, it is
++  * worth allowing these to make debugging of issues easier.
++  */
++     static void
++ bad_param_handler(const wchar_t *expression,
++     const wchar_t *function,
++     const wchar_t *file,
++     unsigned int line,
++     uintptr_t pReserved)
++ {
++ }
++ 
++ # define SET_INVALID_PARAM_HANDLER \
++ 	((void)_set_invalid_parameter_handler(bad_param_handler))
++ #else
++ # define SET_INVALID_PARAM_HANDLER
++ #endif
++ 
+  #ifdef FEAT_GUI_W32
+  
+  /*
+***************
+*** 1627,1632 ****
+--- 1656,1664 ----
+      extern int _fmode;
+  #endif
+  
++     /* Silently handle invalid parameters to CRT functions */
++     SET_INVALID_PARAM_HANDLER;
++ 
+      /* Let critical errors result in a failure, not in a dialog box.  Required
+       * for the timestamp test to work on removed floppies. */
+      SetErrorMode(SEM_FAILCRITICALERRORS);
+***************
+*** 2103,2108 ****
+--- 2135,2143 ----
+      extern int _fmode;
+  #endif
+  
++     /* Silently handle invalid parameters to CRT functions */
++     SET_INVALID_PARAM_HANDLER;
++ 
+      /* Let critical errors result in a failure, not in a dialog box.  Required
+       * for the timestamp test to work on removed floppies. */
+      SetErrorMode(SEM_FAILCRITICALERRORS);
+*** ../vim-7.3.008/src/version.c	2010-09-21 16:56:29.000000000 +0200
+--- src/version.c	2010-09-21 17:27:36.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     9,
+  /**/
+
+-- 
+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.3.010 b/source/ap/vim/patches/7.3.010
new file mode 100644
index 00000000..be0167ae
--- /dev/null
+++ b/source/ap/vim/patches/7.3.010
@@ -0,0 +1,167 @@
+To: vim-dev@vim.org
+Subject: Patch 7.3.010
+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.3.010
+Problem:    Mac GUI: Missing break statements.
+Solution:   Add the break statements. (Dominique Pelle)
+Files:	    src/gui_mac.c
+
+
+*** ../vim-7.3.009/src/gui_mac.c	2010-08-15 21:57:28.000000000 +0200
+--- src/gui_mac.c	2010-09-21 17:33:13.000000000 +0200
+***************
+*** 1480,1486 ****
+   *
+   *  Returns the index inside the menu wher
+   */
+!     short /* Shoulde we return MenuItemIndex? */
+  gui_mac_get_menu_item_index(vimmenu_T *pMenu)
+  {
+      short	index;
+--- 1480,1486 ----
+   *
+   *  Returns the index inside the menu wher
+   */
+!     short /* Should we return MenuItemIndex? */
+  gui_mac_get_menu_item_index(vimmenu_T *pMenu)
+  {
+      short	index;
+***************
+*** 1823,1829 ****
+  	p.h += gui.scrollbar_width;
+      if (gui.which_scrollbars[SBAR_RIGHT])
+  	p.h += gui.scrollbar_width;
+!     /* ideal height is as heigh as we can get */
+      p.v = 15 * 1024;
+  
+      thePart = IsWindowInStandardState(whichWindow, &p, &r)
+--- 1823,1829 ----
+  	p.h += gui.scrollbar_width;
+      if (gui.which_scrollbars[SBAR_RIGHT])
+  	p.h += gui.scrollbar_width;
+!     /* ideal height is as high as we can get */
+      p.v = 15 * 1024;
+  
+      thePart = IsWindowInStandardState(whichWindow, &p, &r)
+***************
+*** 4481,4487 ****
+  	 * event arrives.  No need to check for input_buf_full because we are
+  	 * returning as soon as it contains a single char.
+  	 */
+! 	/* TODO: reduce wtime accordinly???  */
+  	if (wtime > -1)
+  	    sleeppyTick = 60 * wtime / 1000;
+  	else
+--- 4481,4487 ----
+  	 * event arrives.  No need to check for input_buf_full because we are
+  	 * returning as soon as it contains a single char.
+  	 */
+! 	/* TODO: reduce wtime accordingly???  */
+  	if (wtime > -1)
+  	    sleeppyTick = 60 * wtime / 1000;
+  	else
+***************
+*** 5723,5735 ****
+      iconDITL = GetResource('DITL', 131);
+      switch (type)
+      {
+! 	case VIM_GENERIC:  useIcon = kNoteIcon;
+! 	case VIM_ERROR:    useIcon = kStopIcon;
+! 	case VIM_WARNING:  useIcon = kCautionIcon;
+! 	case VIM_INFO:     useIcon = kNoteIcon;
+! 	case VIM_QUESTION: useIcon = kNoteIcon;
+! 	default:      useIcon = kStopIcon;
+!     };
+      AppendDITL(theDialog, iconDITL, overlayDITL);
+      ReleaseResource(iconDITL);
+      GetDialogItem(theDialog, iconItm.idx, &itemType, &itemHandle, &box);
+--- 5723,5735 ----
+      iconDITL = GetResource('DITL', 131);
+      switch (type)
+      {
+! 	case VIM_GENERIC:
+! 	case VIM_INFO:
+! 	case VIM_QUESTION: useIcon = kNoteIcon; break;
+! 	case VIM_WARNING:  useIcon = kCautionIcon; break;
+! 	case VIM_ERROR:    useIcon = kStopIcon; break;
+! 	default:           useIcon = kStopIcon;
+!     }
+      AppendDITL(theDialog, iconDITL, overlayDITL);
+      ReleaseResource(iconDITL);
+      GetDialogItem(theDialog, iconItm.idx, &itemType, &itemHandle, &box);
+***************
+*** 5892,5898 ****
+  
+      return itemHit;
+  /*
+!  * Usefull thing which could be used
+   * SetDialogTimeout(): Auto click a button after timeout
+   * SetDialogTracksCursor() : Get the I-beam cursor over input box
+   * MoveDialogItem():	    Probably better than SetDialogItem
+--- 5892,5898 ----
+  
+      return itemHit;
+  /*
+!  * Useful thing which could be used
+   * SetDialogTimeout(): Auto click a button after timeout
+   * SetDialogTracksCursor() : Get the I-beam cursor over input box
+   * MoveDialogItem():	    Probably better than SetDialogItem
+***************
+*** 6100,6106 ****
+  #endif
+  
+  /*
+!  * Transfered from os_mac.c for MacOS X using os_unix.c prep work
+   */
+  
+      int
+--- 6100,6106 ----
+  #endif
+  
+  /*
+!  * Transferred from os_mac.c for MacOS X using os_unix.c prep work
+   */
+  
+      int
+***************
+*** 6543,6549 ****
+  static ControlRef dataBrowser = NULL;
+  
+  // when the tabline is hidden, vim doesn't call update_tabline(). When
+! // the tabline is shown again, show_tabline() is called before upate_tabline(),
+  // and because of this, the tab labels and vims internal tabs are out of sync
+  // for a very short time. to prevent inconsistent state, we store the labels
+  // of the tabs, not pointers to the tabs (which are invalid for a short time).
+--- 6543,6549 ----
+  static ControlRef dataBrowser = NULL;
+  
+  // when the tabline is hidden, vim doesn't call update_tabline(). When
+! // the tabline is shown again, show_tabline() is called before update_tabline(),
+  // and because of this, the tab labels and vims internal tabs are out of sync
+  // for a very short time. to prevent inconsistent state, we store the labels
+  // of the tabs, not pointers to the tabs (which are invalid for a short time).
+*** ../vim-7.3.009/src/version.c	2010-09-21 17:29:19.000000000 +0200
+--- src/version.c	2010-09-21 17:33:22.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     10,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+182. You may not know what is happening in the world, but you know
+     every bit of net-gossip there is.
+
+ /// 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.3.011 b/source/ap/vim/patches/7.3.011
new file mode 100644
index 00000000..0f40a3f2
--- /dev/null
+++ b/source/ap/vim/patches/7.3.011
@@ -0,0 +1,290 @@
+To: vim-dev@vim.org
+Subject: Patch 7.3.011
+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.3.011
+Problem:    X11 clipboard doesn't work in Athena/Motif GUI.  First selection
+	    after a shell command doesn't work.
+Solution:   When using the GUI use XtLastTimestampProcessed() instead of
+	    changing a property.  (partly by Toni Ronkko)
+	    When executing a shell command disown the selection.
+Files:	    src/ui.c, src/os_unix.c
+
+
+*** ../vim-7.3.010/src/ui.c	2010-08-15 21:57:31.000000000 +0200
+--- src/ui.c	2010-09-21 22:08:22.000000000 +0200
+***************
+*** 469,475 ****
+       */
+  #ifdef FEAT_X11
+      /* Always own the selection, we might have lost it without being
+!      * notified. */
+      if (cbd->available)
+      {
+  	int was_owned = cbd->owned;
+--- 469,475 ----
+       */
+  #ifdef FEAT_X11
+      /* Always own the selection, we might have lost it without being
+!      * notified, e.g. during a ":sh" command. */
+      if (cbd->available)
+      {
+  	int was_owned = cbd->owned;
+***************
+*** 1944,1953 ****
+   */
+  
+  static Boolean	clip_x11_convert_selection_cb __ARGS((Widget, Atom *, Atom *, Atom *, XtPointer *, long_u *, int *));
+- 
+  static void  clip_x11_lose_ownership_cb __ARGS((Widget, Atom *));
+- 
+  static void clip_x11_timestamp_cb __ARGS((Widget w, XtPointer n, XEvent *event, Boolean *cont));
+  
+  /*
+   * Property callback to get a timestamp for XtOwnSelection.
+--- 1944,1952 ----
+   */
+  
+  static Boolean	clip_x11_convert_selection_cb __ARGS((Widget, Atom *, Atom *, Atom *, XtPointer *, long_u *, int *));
+  static void  clip_x11_lose_ownership_cb __ARGS((Widget, Atom *));
+  static void clip_x11_timestamp_cb __ARGS((Widget w, XtPointer n, XEvent *event, Boolean *cont));
++ static void  clip_x11_request_selection_cb __ARGS((Widget, XtPointer, Atom *, Atom *, XtPointer, long_u *, int *));
+  
+  /*
+   * Property callback to get a timestamp for XtOwnSelection.
+***************
+*** 1985,1992 ****
+  	return;
+  
+      /* Get the selection, using the event timestamp. */
+!     XtOwnSelection(w, xproperty->atom, xproperty->time,
+! 	    clip_x11_convert_selection_cb, clip_x11_lose_ownership_cb, NULL);
+  }
+  
+      void
+--- 1984,2000 ----
+  	return;
+  
+      /* Get the selection, using the event timestamp. */
+!     if (XtOwnSelection(w, xproperty->atom, xproperty->time,
+! 	    clip_x11_convert_selection_cb, clip_x11_lose_ownership_cb,
+! 	    NULL) == OK)
+!     {
+! 	/* Set the "owned" flag now, there may have been a call to
+! 	 * lose_ownership_cb in between. */
+! 	if (xproperty->atom == clip_plus.sel_atom)
+! 	    clip_plus.owned = TRUE;
+! 	else
+! 	    clip_star.owned = TRUE;
+!     }
+  }
+  
+      void
+***************
+*** 1997,2004 ****
+  	    /*(XtEventHandler)*/clip_x11_timestamp_cb, (XtPointer)NULL);
+  }
+  
+- 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)
+--- 2005,2010 ----
+***************
+*** 2336,2342 ****
+  
+      void
+  clip_x11_lose_selection(myShell, cbd)
+!     Widget	myShell;
+      VimClipboard	*cbd;
+  {
+      XtDisownSelection(myShell, cbd->sel_atom, CurrentTime);
+--- 2342,2348 ----
+  
+      void
+  clip_x11_lose_selection(myShell, cbd)
+!     Widget		myShell;
+      VimClipboard	*cbd;
+  {
+      XtDisownSelection(myShell, cbd->sel_atom, CurrentTime);
+***************
+*** 2344,2357 ****
+  
+      int
+  clip_x11_own_selection(myShell, cbd)
+!     Widget	myShell;
+      VimClipboard	*cbd;
+  {
+!     /* Get the time by a zero-length append, clip_x11_timestamp_cb will be
+!      * called with the current timestamp.  */
+!     if (!XChangeProperty(XtDisplay(myShell), XtWindow(myShell), cbd->sel_atom,
+! 	    timestamp_atom, 32, PropModeAppend, NULL, 0))
+  	return FAIL;
+      /* Flush is required in a terminal as nothing else is doing it. */
+      XFlush(XtDisplay(myShell));
+      return OK;
+--- 2350,2378 ----
+  
+      int
+  clip_x11_own_selection(myShell, cbd)
+!     Widget		myShell;
+      VimClipboard	*cbd;
+  {
+!     /* When using the GUI we have proper timestamps, use the one of the last
+!      * event.  When in the console we don't get events (the terminal gets
+!      * them), Get the time by a zero-length append, clip_x11_timestamp_cb will
+!      * be called with the current timestamp.  */
+! #ifdef FEAT_GUI
+!     if (gui.in_use)
+!     {
+! 	if (XtOwnSelection(myShell, cbd->sel_atom,
+! 	       XtLastTimestampProcessed(XtDisplay(myShell)),
+! 	       clip_x11_convert_selection_cb, clip_x11_lose_ownership_cb,
+! 	       NULL) == False)
+  	return FAIL;
++     }
++     else
++ #endif
++     {
++ 	if (!XChangeProperty(XtDisplay(myShell), XtWindow(myShell),
++ 		  cbd->sel_atom, timestamp_atom, 32, PropModeAppend, NULL, 0))
++ 	return FAIL;
++     }
+      /* Flush is required in a terminal as nothing else is doing it. */
+      XFlush(XtDisplay(myShell));
+      return OK;
+*** ../vim-7.3.010/src/os_unix.c	2010-08-15 21:57:30.000000000 +0200
+--- src/os_unix.c	2010-09-21 21:59:25.000000000 +0200
+***************
+*** 1123,1128 ****
+--- 1123,1152 ----
+  }
+  #endif
+  
++ # if defined(FEAT_CLIPBOARD) && defined(FEAT_X11)
++ static void loose_clipboard __ARGS((void));
++ 
++ /*
++  * Called when Vim is going to sleep or execute a shell command.
++  * We can't respond to requests for the X selections.  Lose them, otherwise
++  * other applications will hang.  But first copy the text to cut buffer 0.
++  */
++     static void
++ loose_clipboard()
++ {
++     if (clip_star.owned || clip_plus.owned)
++     {
++ 	x11_export_final_selection();
++ 	if (clip_star.owned)
++ 	    clip_lose_selection(&clip_star);
++ 	if (clip_plus.owned)
++ 	    clip_lose_selection(&clip_plus);
++ 	if (x11_display != NULL)
++ 	    XFlush(x11_display);
++     }
++ }
++ #endif
++ 
+  /*
+   * If the machine has job control, use it to suspend the program,
+   * otherwise fake it by starting a new shell.
+***************
+*** 1137,1155 ****
+      out_flush();	    /* needed to disable mouse on some systems */
+  
+  # if defined(FEAT_CLIPBOARD) && defined(FEAT_X11)
+!     /* Since we are going to sleep, we can't respond to requests for the X
+!      * selections.  Lose them, otherwise other applications will hang.  But
+!      * first copy the text to cut buffer 0. */
+!     if (clip_star.owned || clip_plus.owned)
+!     {
+! 	x11_export_final_selection();
+! 	if (clip_star.owned)
+! 	    clip_lose_selection(&clip_star);
+! 	if (clip_plus.owned)
+! 	    clip_lose_selection(&clip_plus);
+! 	if (x11_display != NULL)
+! 	    XFlush(x11_display);
+!     }
+  # endif
+  
+  # if defined(_REENTRANT) && defined(SIGCONT)
+--- 1161,1167 ----
+      out_flush();	    /* needed to disable mouse on some systems */
+  
+  # if defined(FEAT_CLIPBOARD) && defined(FEAT_X11)
+!     loose_clipboard();
+  # endif
+  
+  # if defined(_REENTRANT) && defined(SIGCONT)
+***************
+*** 3706,3711 ****
+--- 3718,3727 ----
+      if (options & SHELL_COOKED)
+  	settmode(TMODE_COOK);	    /* set to normal mode */
+  
++ # if defined(FEAT_CLIPBOARD) && defined(FEAT_X11)
++     loose_clipboard();
++ # endif
++ 
+  # ifdef __EMX__
+      if (cmd == NULL)
+  	x = system("");	/* this starts an interactive shell in emx */
+***************
+*** 3814,3826 ****
+  # endif
+      int		did_settmode = FALSE;	/* settmode(TMODE_RAW) called */
+  
+      out_flush();
+      if (options & SHELL_COOKED)
+  	settmode(TMODE_COOK);		/* set to normal mode */
+  
+!     newcmd = vim_strsave(p_sh);
+!     if (newcmd == NULL)		/* out of memory */
+! 	goto error;
+  
+      /*
+       * Do this loop twice:
+--- 3830,3846 ----
+  # endif
+      int		did_settmode = FALSE;	/* settmode(TMODE_RAW) called */
+  
++     newcmd = vim_strsave(p_sh);
++     if (newcmd == NULL)		/* out of memory */
++ 	goto error;
++ 
+      out_flush();
+      if (options & SHELL_COOKED)
+  	settmode(TMODE_COOK);		/* set to normal mode */
+  
+! # if defined(FEAT_CLIPBOARD) && defined(FEAT_X11)
+!     loose_clipboard();
+! # endif
+  
+      /*
+       * Do this loop twice:
+*** ../vim-7.3.010/src/version.c	2010-09-21 17:34:26.000000000 +0200
+--- src/version.c	2010-09-21 20:45:02.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     11,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+184. You no longer ask prospective dates what their sign is, instead
+     your line is "Hi, what's 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.3.012 b/source/ap/vim/patches/7.3.012
new file mode 100644
index 00000000..b0b13ffd
--- /dev/null
+++ b/source/ap/vim/patches/7.3.012
@@ -0,0 +1,71 @@
+To: vim-dev@vim.org
+Subject: Patch 7.3.012
+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.3.012
+Problem:    Problems building with MingW.
+Solution:   Adjust the MingW makefiles. (Jon)
+Files:	    src/Make_ming.mak, src/GvimExt/Make_ming.mak
+
+
+*** ../vim-7.3.011/src/Make_ming.mak	2010-08-15 21:57:32.000000000 +0200
+--- src/Make_ming.mak	2010-09-29 12:32:13.000000000 +0200
+***************
+*** 303,309 ****
+  endif
+  endif
+  CC := $(CROSS_COMPILE)gcc
+! WINDRES := $(CROSS_COMPILE)windres
+  
+  #>>>>> end of choices
+  ###########################################################################
+--- 303,309 ----
+  endif
+  endif
+  CC := $(CROSS_COMPILE)gcc
+! WINDRES := $(CROSS_COMPILE)windres --preprocessor="$(CC) -E -xc" -
+  
+  #>>>>> end of choices
+  ###########################################################################
+*** ../vim-7.3.011/src/GvimExt/Make_ming.mak	2010-08-15 21:57:29.000000000 +0200
+--- src/GvimExt/Make_ming.mak	2010-09-29 12:31:07.000000000 +0200
+***************
+*** 33,39 ****
+  endif
+  endif
+  CXX := $(CROSS_COMPILE)g++
+! WINDRES := $(CROSS_COMPILE)windres
+  LIBS :=  -luuid
+  RES  := gvimext.res
+  DEFFILE = gvimext_ming.def
+--- 33,39 ----
+  endif
+  endif
+  CXX := $(CROSS_COMPILE)g++
+! WINDRES := $(CROSS_COMPILE)windres --preprocessor="$(CXX) -E -xc" -
+  LIBS :=  -luuid
+  RES  := gvimext.res
+  DEFFILE = gvimext_ming.def
+*** ../vim-7.3.011/src/version.c	2010-09-21 22:09:28.000000000 +0200
+--- src/version.c	2010-09-29 12:36:42.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     12,
+  /**/
+
+-- 
+If evolution theories are correct, humans will soon grow a third
+hand for operating the mouse.
+
+ /// 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.3.013 b/source/ap/vim/patches/7.3.013
new file mode 100644
index 00000000..489aa0ee
--- /dev/null
+++ b/source/ap/vim/patches/7.3.013
@@ -0,0 +1,208 @@
+To: vim-dev@vim.org
+Subject: Patch 7.3.013
+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.3.013
+Problem:    Dynamic loading with Ruby doesn't work for 1.9.2.
+Solution:   Handle rb_str2cstr differently.  Also support dynamic loading on
+	    Unix. (Jon Maken)
+Files:	    src/if_ruby.c
+
+
+*** ../vim-7.3.012/src/if_ruby.c	2010-08-15 21:57:25.000000000 +0200
+--- src/if_ruby.c	2010-09-29 12:49:50.000000000 +0200
+***************
+*** 4,9 ****
+--- 4,10 ----
+   *
+   * Ruby interface by Shugo Maeda
+   *   with improvements by SegPhault (Ryan Paul)
++  *   with improvements by Jon Maken
+   *
+   * Do ":help uganda"  in Vim to read copying and usage conditions.
+   * Do ":help credits" in Vim to see a list of people who contributed.
+***************
+*** 26,37 ****
+  # define RUBYEXTERN extern
+  #endif
+  
+  /*
+   * This is tricky.  In ruby.h there is (inline) function rb_class_of()
+   * definition.  This function use these variables.  But we want function to
+   * use dll_* variables.
+   */
+- #ifdef DYNAMIC_RUBY
+  # define rb_cFalseClass		(*dll_rb_cFalseClass)
+  # define rb_cFixnum		(*dll_rb_cFixnum)
+  # define rb_cNilClass		(*dll_rb_cNilClass)
+--- 27,38 ----
+  # define RUBYEXTERN extern
+  #endif
+  
++ #ifdef DYNAMIC_RUBY
+  /*
+   * This is tricky.  In ruby.h there is (inline) function rb_class_of()
+   * definition.  This function use these variables.  But we want function to
+   * use dll_* variables.
+   */
+  # define rb_cFalseClass		(*dll_rb_cFalseClass)
+  # define rb_cFixnum		(*dll_rb_cFixnum)
+  # define rb_cNilClass		(*dll_rb_cNilClass)
+***************
+*** 46,53 ****
+--- 47,67 ----
+   */
+  #  define RUBY_EXPORT
+  # endif
++ 
++ #if !(defined(WIN32) || defined(_WIN64))
++ # include <dlfcn.h>
++ # define HANDLE void*
++ # define load_dll(n) dlopen((n), RTLD_LAZY|RTLD_GLOBAL)
++ # define symbol_from_dll dlsym
++ # define close_dll dlclose
++ #else
++ # define load_dll LoadLibrary
++ # define symbol_from_dll GetProcAddress
++ # define close_dll FreeLibrary
+  #endif
+  
++ #endif  /* ifdef DYNAMIC_RUBY */
++ 
+  /* suggested by Ariya Mizutani */
+  #if (_MSC_VER == 1200)
+  # undef _WIN32_WINNT
+***************
+*** 166,172 ****
+  #define rb_obj_as_string		dll_rb_obj_as_string
+  #define rb_obj_id			dll_rb_obj_id
+  #define rb_raise			dll_rb_raise
+- #define rb_str2cstr			dll_rb_str2cstr
+  #define rb_str_cat			dll_rb_str_cat
+  #define rb_str_concat			dll_rb_str_concat
+  #define rb_str_new			dll_rb_str_new
+--- 180,185 ----
+***************
+*** 178,187 ****
+--- 191,203 ----
+  # define rb_str_new2			dll_rb_str_new2
+  #endif
+  #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
++ # define rb_string_value		dll_rb_string_value
+  # define rb_string_value_ptr		dll_rb_string_value_ptr
+  # define rb_float_new			dll_rb_float_new
+  # define rb_ary_new			dll_rb_ary_new
+  # define rb_ary_push			dll_rb_ary_push
++ #else
++ # define rb_str2cstr			dll_rb_str2cstr
+  #endif
+  #ifdef RUBY19_OR_LATER
+  # define rb_errinfo			dll_rb_errinfo
+***************
+*** 246,252 ****
+--- 262,272 ----
+  static VALUE (*dll_rb_obj_as_string) (VALUE);
+  static VALUE (*dll_rb_obj_id) (VALUE);
+  static void (*dll_rb_raise) (VALUE, const char*, ...);
++ #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
++ static VALUE (*dll_rb_string_value) (volatile VALUE*);
++ #else
+  static char *(*dll_rb_str2cstr) (VALUE,int*);
++ #endif
+  static VALUE (*dll_rb_str_cat) (VALUE, const char*, long);
+  static VALUE (*dll_rb_str_concat) (VALUE, VALUE);
+  static VALUE (*dll_rb_str_new) (const char*, long);
+***************
+*** 347,353 ****
+--- 367,377 ----
+      {"rb_obj_as_string", (RUBY_PROC*)&dll_rb_obj_as_string},
+      {"rb_obj_id", (RUBY_PROC*)&dll_rb_obj_id},
+      {"rb_raise", (RUBY_PROC*)&dll_rb_raise},
++ #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
++     {"rb_string_value", (RUBY_PROC*)&dll_rb_string_value},
++ #else
+      {"rb_str2cstr", (RUBY_PROC*)&dll_rb_str2cstr},
++ #endif
+      {"rb_str_cat", (RUBY_PROC*)&dll_rb_str_cat},
+      {"rb_str_concat", (RUBY_PROC*)&dll_rb_str_concat},
+      {"rb_str_new", (RUBY_PROC*)&dll_rb_str_new},
+***************
+*** 399,405 ****
+  {
+      if (hinstRuby)
+      {
+! 	FreeLibrary(hinstRuby);
+  	hinstRuby = 0;
+      }
+  }
+--- 423,429 ----
+  {
+      if (hinstRuby)
+      {
+! 	close_dll(hinstRuby);
+  	hinstRuby = 0;
+      }
+  }
+***************
+*** 416,422 ****
+  
+      if (hinstRuby)
+  	return OK;
+!     hinstRuby = LoadLibrary(libname);
+      if (!hinstRuby)
+      {
+  	if (verbose)
+--- 440,446 ----
+  
+      if (hinstRuby)
+  	return OK;
+!     hinstRuby = load_dll(libname);
+      if (!hinstRuby)
+      {
+  	if (verbose)
+***************
+*** 426,435 ****
+  
+      for (i = 0; ruby_funcname_table[i].ptr; ++i)
+      {
+! 	if (!(*ruby_funcname_table[i].ptr = GetProcAddress(hinstRuby,
+  			ruby_funcname_table[i].name)))
+  	{
+! 	    FreeLibrary(hinstRuby);
+  	    hinstRuby = 0;
+  	    if (verbose)
+  		EMSG2(_(e_loadfunc), ruby_funcname_table[i].name);
+--- 450,459 ----
+  
+      for (i = 0; ruby_funcname_table[i].ptr; ++i)
+      {
+! 	if (!(*ruby_funcname_table[i].ptr = symbol_from_dll(hinstRuby,
+  			ruby_funcname_table[i].name)))
+  	{
+! 	    close_dll(hinstRuby);
+  	    hinstRuby = 0;
+  	    if (verbose)
+  		EMSG2(_(e_loadfunc), ruby_funcname_table[i].name);
+*** ../vim-7.3.012/src/version.c	2010-09-29 12:37:53.000000000 +0200
+--- src/version.c	2010-09-29 13:00:42.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     13,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+223. You set up a web-cam as your home's security 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.3.014 b/source/ap/vim/patches/7.3.014
new file mode 100644
index 00000000..a60d4769
--- /dev/null
+++ b/source/ap/vim/patches/7.3.014
@@ -0,0 +1,87 @@
+To: vim-dev@vim.org
+Subject: Patch 7.3.014
+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.3.014
+Problem:    Ending a line in a backslash inside an ":append" or ":insert" 
+            command in Ex mode doesn't work properly. (Ray Frush)
+Solution:   Halve the number of backslashes, only insert a NUL after an odd 
+            number of backslashes.
+Files:      src/ex_getln.c
+
+
+*** ../vim-7.3.013/src/ex_getln.c	2010-09-21 16:56:29.000000000 +0200
+--- src/ex_getln.c	2010-09-29 15:47:56.000000000 +0200
+***************
+*** 2342,2356 ****
+  	windgoto(msg_row, msg_col);
+  	pend = (char_u *)(line_ga.ga_data) + line_ga.ga_len;
+  
+! 	/* we are done when a NL is entered, but not when it comes after a
+! 	 * backslash */
+! 	if (line_ga.ga_len > 0 && pend[-1] == '\n'
+! 		&& (line_ga.ga_len <= 1 || pend[-2] != '\\'))
+! 	{
+! 	    --line_ga.ga_len;
+! 	    --pend;
+! 	    *pend = NUL;
+! 	    break;
+  	}
+      }
+  
+--- 2342,2372 ----
+  	windgoto(msg_row, msg_col);
+  	pend = (char_u *)(line_ga.ga_data) + line_ga.ga_len;
+  
+! 	/* We are done when a NL is entered, but not when it comes after an
+! 	 * odd number of backslashes, that results in a NUL. */
+! 	if (line_ga.ga_len > 0 && pend[-1] == '\n')
+! 	{
+! 	    int bcount = 0;
+! 
+! 	    while (line_ga.ga_len - 2 >= bcount && pend[-2 - bcount] == '\\')
+! 		++bcount;
+! 
+! 	    if (bcount > 0)
+! 	    {
+! 		/* Halve the number of backslashes: "\NL" -> "NUL", "\\NL" ->
+! 		 * "\NL", etc. */
+! 		line_ga.ga_len -= (bcount + 1) / 2;
+! 		pend -= (bcount + 1) / 2;
+! 		pend[-1] = '\n';
+! 	    }
+! 
+! 	    if ((bcount & 1) == 0)
+! 	    {
+! 		--line_ga.ga_len;
+! 		--pend;
+! 		*pend = NUL;
+! 		break;
+! 	    }
+  	}
+      }
+  
+*** ../vim-7.3.013/src/version.c	2010-09-29 13:02:48.000000000 +0200
+--- src/version.c	2010-09-29 15:45:57.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     14,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+224. You set up your own Web page. You set up a Web page for each
+     of your kids... and your pets.
+
+ /// 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.3.015 b/source/ap/vim/patches/7.3.015
new file mode 100644
index 00000000..0b5f6606
--- /dev/null
+++ b/source/ap/vim/patches/7.3.015
@@ -0,0 +1,68 @@
+To: vim-dev@vim.org
+Subject: Patch 7.3.015
+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.3.015
+Problem:    Test is using error message that no longer exists.
+Solution:   Change E106 to E121. (Dominique Pelle)
+Files:	    src/testdir/test49.vim
+
+
+*** ../vim-7.3.014/src/testdir/test49.vim	2010-08-15 21:57:29.000000000 +0200
+--- src/testdir/test49.vim	2010-09-29 16:52:06.000000000 +0200
+***************
+*** 1,6 ****
+  " Vim script language tests
+  " Author:	Servatius Brandt <Servatius.Brandt@fujitsu-siemens.com>
+! " Last Change:	2006 Apr 28
+  
+  "-------------------------------------------------------------------------------
+  " Test environment							    {{{1
+--- 1,6 ----
+  " Vim script language tests
+  " Author:	Servatius Brandt <Servatius.Brandt@fujitsu-siemens.com>
+! " Last Change:	2010 Sep 29
+  
+  "-------------------------------------------------------------------------------
+  " Test environment							    {{{1
+***************
+*** 8711,8717 ****
+  		endif
+  	    else
+  		if cmd == "let"
+! 		    let match = MATCH(0, thrmsg, 'E106', "Unknown variable")
+  		elseif cmd == "unlet"
+  		    let match = MATCH(0, thrmsg, 'E108', "No such variable")
+  		endif
+--- 8711,8717 ----
+  		endif
+  	    else
+  		if cmd == "let"
+! 		    let match = MATCH(0, thrmsg, 'E121', "Undefined variable")
+  		elseif cmd == "unlet"
+  		    let match = MATCH(0, thrmsg, 'E108', "No such variable")
+  		endif
+*** ../vim-7.3.014/src/version.c	2010-09-29 15:50:14.000000000 +0200
+--- src/version.c	2010-09-29 16:55:03.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     15,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+228. You spend Saturday night making the counter on your home page
+     pass that 2000 mark.
+
+ /// 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.3.016 b/source/ap/vim/patches/7.3.016
new file mode 100644
index 00000000..1d087d5a
--- /dev/null
+++ b/source/ap/vim/patches/7.3.016
@@ -0,0 +1,240 @@
+To: vim-dev@vim.org
+Subject: Patch 7.3.016
+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.3.016
+Problem:    Netbeans doesn't work under Athena.
+Solution:   Support Athena, just like Motif. (Xavier de Gaye)
+Files:      runtime/doc/netbeans.txt, src/gui.c, src/main.c, src/netbeans.c
+
+
+*** ../vim-7.3.015/runtime/doc/netbeans.txt	2010-08-15 21:57:13.000000000 +0200
+--- runtime/doc/netbeans.txt	2010-09-29 17:13:43.000000000 +0200
+***************
+*** 1,4 ****
+! *netbeans.txt*  For Vim version 7.3.  Last change: 2010 Jul 20
+  
+  
+  		  VIM REFERENCE MANUAL    by Gordon Prieur et al.
+--- 1,4 ----
+! *netbeans.txt*  For Vim version 7.3.  Last change: 2010 Aug 20
+  
+  
+  		  VIM REFERENCE MANUAL    by Gordon Prieur et al.
+***************
+*** 118,124 ****
+  uncommenting a line with "--disable-netbeans" in the Makefile.
+  
+  Currently the NetBeans interface is supported by Vim running in a terminal and
+! by GVim when it is run with one of the following GUIs: GTK, GNOME, and Motif.
+  
+  If Motif support is required the user must supply XPM libraries.  See
+  |workshop-xpm| for details on obtaining the latest version of XPM.
+--- 118,125 ----
+  uncommenting a line with "--disable-netbeans" in the Makefile.
+  
+  Currently the NetBeans interface is supported by Vim running in a terminal and
+! by GVim when it is run with one of the following GUIs: GTK, GNOME, Windows,
+! Athena and Motif.
+  
+  If Motif support is required the user must supply XPM libraries.  See
+  |workshop-xpm| for details on obtaining the latest version of XPM.
+*** ../vim-7.3.015/src/gui.c	2010-08-15 21:57:28.000000000 +0200
+--- src/gui.c	2010-09-29 17:13:43.000000000 +0200
+***************
+*** 2352,2358 ****
+      if (draw_sign)
+  	/* Draw the sign on top of the spaces. */
+  	gui_mch_drawsign(gui.row, col, gui.highlight_mask);
+! # if defined(FEAT_NETBEANS_INTG) && (defined(FEAT_GUI_MOTIF) \
+  	|| defined(FEAT_GUI_GTK) || defined(FEAT_GUI_W32))
+      if (multi_sign)
+  	netbeans_draw_multisign_indicator(gui.row);
+--- 2352,2358 ----
+      if (draw_sign)
+  	/* Draw the sign on top of the spaces. */
+  	gui_mch_drawsign(gui.row, col, gui.highlight_mask);
+! # if defined(FEAT_NETBEANS_INTG) && (defined(FEAT_GUI_X11) \
+  	|| defined(FEAT_GUI_GTK) || defined(FEAT_GUI_W32))
+      if (multi_sign)
+  	netbeans_draw_multisign_indicator(gui.row);
+*** ../vim-7.3.015/src/main.c	2010-08-15 21:57:28.000000000 +0200
+--- src/main.c	2010-09-29 17:13:43.000000000 +0200
+***************
+*** 940,946 ****
+      if (netbeansArg != NULL && strncmp("-nb", netbeansArg, 3) == 0)
+      {
+  # ifdef FEAT_GUI
+! #  if !defined(FEAT_GUI_MOTIF) && !defined(FEAT_GUI_GTK)  \
+  		&& !defined(FEAT_GUI_W32)
+  	if (gui.in_use)
+  	{
+--- 940,946 ----
+      if (netbeansArg != NULL && strncmp("-nb", netbeansArg, 3) == 0)
+      {
+  # ifdef FEAT_GUI
+! #  if !defined(FEAT_GUI_X11) && !defined(FEAT_GUI_GTK)  \
+  		&& !defined(FEAT_GUI_W32)
+  	if (gui.in_use)
+  	{
+*** ../vim-7.3.015/src/netbeans.c	2010-08-15 21:57:26.000000000 +0200
+--- src/netbeans.c	2010-09-29 17:13:43.000000000 +0200
+***************
+*** 87,93 ****
+  static void nb_init_graphics __ARGS((void));
+  static void coloncmd __ARGS((char *cmd, ...));
+  static void nb_set_curbuf __ARGS((buf_T *buf));
+! #ifdef FEAT_GUI_MOTIF
+  static void messageFromNetbeans __ARGS((XtPointer, int *, XtInputId *));
+  #endif
+  #ifdef FEAT_GUI_GTK
+--- 87,93 ----
+  static void nb_init_graphics __ARGS((void));
+  static void coloncmd __ARGS((char *cmd, ...));
+  static void nb_set_curbuf __ARGS((buf_T *buf));
+! #ifdef FEAT_GUI_X11
+  static void messageFromNetbeans __ARGS((XtPointer, int *, XtInputId *));
+  #endif
+  #ifdef FEAT_GUI_GTK
+***************
+*** 112,118 ****
+  static NBSOCK nbsock = -1;		/* socket fd for Netbeans connection */
+  #define NETBEANS_OPEN (nbsock != -1)
+  
+! #ifdef FEAT_GUI_MOTIF
+  static XtInputId inputHandler = (XtInputId)NULL;  /* Cookie for input */
+  #endif
+  #ifdef FEAT_GUI_GTK
+--- 112,118 ----
+  static NBSOCK nbsock = -1;		/* socket fd for Netbeans connection */
+  #define NETBEANS_OPEN (nbsock != -1)
+  
+! #ifdef FEAT_GUI_X11
+  static XtInputId inputHandler = (XtInputId)NULL;  /* Cookie for input */
+  #endif
+  #ifdef FEAT_GUI_GTK
+***************
+*** 143,149 ****
+  
+      netbeans_send_disconnect();
+  
+! #ifdef FEAT_GUI_MOTIF
+      if (inputHandler != (XtInputId)NULL)
+      {
+  	XtRemoveInput(inputHandler);
+--- 143,149 ----
+  
+      netbeans_send_disconnect();
+  
+! #ifdef FEAT_GUI_X11
+      if (inputHandler != (XtInputId)NULL)
+      {
+  	XtRemoveInput(inputHandler);
+***************
+*** 700,706 ****
+  /*
+   * Read a command from netbeans.
+   */
+! #ifdef FEAT_GUI_MOTIF
+      static void
+  messageFromNetbeans(XtPointer clientData UNUSED,
+  		    int *unused1 UNUSED,
+--- 700,706 ----
+  /*
+   * Read a command from netbeans.
+   */
+! #ifdef FEAT_GUI_X11
+      static void
+  messageFromNetbeans(XtPointer clientData UNUSED,
+  		    int *unused1 UNUSED,
+***************
+*** 2937,2943 ****
+      if (!NB_HAS_GUI || !NETBEANS_OPEN)
+  	return;
+  
+! # ifdef FEAT_GUI_MOTIF
+      /* tell notifier we are interested in being called
+       * when there is input on the editor connection socket
+       */
+--- 2937,2943 ----
+      if (!NB_HAS_GUI || !NETBEANS_OPEN)
+  	return;
+  
+! # ifdef FEAT_GUI_X11
+      /* tell notifier we are interested in being called
+       * when there is input on the editor connection socket
+       */
+***************
+*** 3027,3033 ****
+      }
+  }
+  
+! #if defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_W32) || defined(PROTO)
+  /*
+   * Tell netbeans that the window was moved or resized.
+   */
+--- 3027,3033 ----
+      }
+  }
+  
+! #if defined(FEAT_GUI_X11) || defined(FEAT_GUI_W32) || defined(PROTO)
+  /*
+   * Tell netbeans that the window was moved or resized.
+   */
+***************
+*** 3458,3464 ****
+      return FALSE;
+  }
+  
+! #if defined(FEAT_GUI_MOTIF) || defined(PROTO)
+  /*
+   * We have multiple signs to draw at the same location. Draw the
+   * multi-sign indicator instead. This is the Motif version.
+--- 3458,3464 ----
+      return FALSE;
+  }
+  
+! #if defined(FEAT_GUI_X11) || defined(PROTO)
+  /*
+   * We have multiple signs to draw at the same location. Draw the
+   * multi-sign indicator instead. This is the Motif version.
+***************
+*** 3487,3493 ****
+      XDrawPoint(gui.dpy, gui.wid, gui.text_gc, x+3, y++);
+      XDrawPoint(gui.dpy, gui.wid, gui.text_gc, x+2, y);
+  }
+! #endif /* FEAT_GUI_MOTIF */
+  
+  #if defined(FEAT_GUI_GTK) && !defined(PROTO)
+  /*
+--- 3487,3493 ----
+      XDrawPoint(gui.dpy, gui.wid, gui.text_gc, x+3, y++);
+      XDrawPoint(gui.dpy, gui.wid, gui.text_gc, x+2, y);
+  }
+! #endif /* FEAT_GUI_X11 */
+  
+  #if defined(FEAT_GUI_GTK) && !defined(PROTO)
+  /*
+*** ../vim-7.3.015/src/version.c	2010-09-29 16:55:45.000000000 +0200
+--- src/version.c	2010-09-29 17:14:47.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     16,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+229. You spend so much time thinking what to add on this 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.3.017 b/source/ap/vim/patches/7.3.017
new file mode 100644
index 00000000..4434ae1d
--- /dev/null
+++ b/source/ap/vim/patches/7.3.017
@@ -0,0 +1,124 @@
+To: vim-dev@vim.org
+Subject: Patch 7.3.017
+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.3.017
+Problem:    smatch reports errors.
+Solution:   Fix the reported errors. (Dominique Pelle)
+Files:	    src/spell.c, src/syntax.c
+
+
+*** ../vim-7.3.016/src/spell.c	2010-09-18 13:36:41.000000000 +0200
+--- src/spell.c	2010-09-29 18:25:09.000000000 +0200
+***************
+*** 4951,4957 ****
+      char_u	*si_info;	/* info text chars or NULL  */
+      int		si_region_count; /* number of regions supported (1 when there
+  				    are no regions) */
+!     char_u	si_region_name[16]; /* region names; used only if
+  				     * si_region_count > 1) */
+  
+      garray_T	si_rep;		/* list of fromto_T entries from REP lines */
+--- 4951,4957 ----
+      char_u	*si_info;	/* info text chars or NULL  */
+      int		si_region_count; /* number of regions supported (1 when there
+  				    are no regions) */
+!     char_u	si_region_name[17]; /* region names; used only if
+  				     * si_region_count > 1) */
+  
+      garray_T	si_rep;		/* list of fromto_T entries from REP lines */
+***************
+*** 9530,9536 ****
+  	    if (aspath)
+  		/* Use directory of an entry with path, e.g., for
+  		 * "/dir/lg.utf-8.spl" use "/dir". */
+! 		vim_strncpy(buf, curbuf->b_s.b_p_spl, lstart - curbuf->b_s.b_p_spl - 1);
+  	    else
+  		/* Copy the path from 'runtimepath' to buf[]. */
+  		copy_option_part(&rtp, buf, MAXPATHL, ",");
+--- 9530,9537 ----
+  	    if (aspath)
+  		/* Use directory of an entry with path, e.g., for
+  		 * "/dir/lg.utf-8.spl" use "/dir". */
+! 		vim_strncpy(buf, curbuf->b_s.b_p_spl,
+! 					    lstart - curbuf->b_s.b_p_spl - 1);
+  	    else
+  		/* Copy the path from 'runtimepath' to buf[]. */
+  		copy_option_part(&rtp, buf, MAXPATHL, ",");
+***************
+*** 9539,9551 ****
+  		/* Use the first language name from 'spelllang' and the
+  		 * encoding used in the first loaded .spl file. */
+  		if (aspath)
+! 		    vim_strncpy(buf, curbuf->b_s.b_p_spl, lend - curbuf->b_s.b_p_spl);
+  		else
+  		{
+  		    /* Create the "spell" directory if it doesn't exist yet. */
+  		    l = (int)STRLEN(buf);
+  		    vim_snprintf((char *)buf + l, MAXPATHL - l, "/spell");
+! 		    if (!filewritable(buf) != 2)
+  			vim_mkdir(buf, 0755);
+  
+  		    l = (int)STRLEN(buf);
+--- 9540,9553 ----
+  		/* Use the first language name from 'spelllang' and the
+  		 * encoding used in the first loaded .spl file. */
+  		if (aspath)
+! 		    vim_strncpy(buf, curbuf->b_s.b_p_spl,
+! 						  lend - curbuf->b_s.b_p_spl);
+  		else
+  		{
+  		    /* Create the "spell" directory if it doesn't exist yet. */
+  		    l = (int)STRLEN(buf);
+  		    vim_snprintf((char *)buf + l, MAXPATHL - l, "/spell");
+! 		    if (filewritable(buf) != 2)
+  			vim_mkdir(buf, 0755);
+  
+  		    l = (int)STRLEN(buf);
+*** ../vim-7.3.016/src/syntax.c	2010-08-15 21:57:32.000000000 +0200
+--- src/syntax.c	2010-09-29 18:28:26.000000000 +0200
+***************
+*** 7600,7609 ****
+  		/*
+  		 * Copy characters from arg[] to buf[], translating <> codes.
+  		 */
+! 		for (p = arg, off = 0; off < 100 && *p; )
+  		{
+  		    len = trans_special(&p, buf + off, FALSE);
+! 		    if (len)		    /* recognized special char */
+  			off += len;
+  		    else		    /* copy as normal char */
+  			buf[off++] = *p++;
+--- 7600,7609 ----
+  		/*
+  		 * Copy characters from arg[] to buf[], translating <> codes.
+  		 */
+! 		for (p = arg, off = 0; off < 100 - 6 && *p; )
+  		{
+  		    len = trans_special(&p, buf + off, FALSE);
+! 		    if (len > 0)	    /* recognized special char */
+  			off += len;
+  		    else		    /* copy as normal char */
+  			buf[off++] = *p++;
+*** ../vim-7.3.016/src/version.c	2010-09-29 17:26:57.000000000 +0200
+--- src/version.c	2010-09-29 17:47:27.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     17,
+  /**/
+
+-- 
+A computer without Windows is like a fish without a bicycle.
+
+ /// 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.3.018 b/source/ap/vim/patches/7.3.018
new file mode 100644
index 00000000..5079e821
--- /dev/null
+++ b/source/ap/vim/patches/7.3.018
@@ -0,0 +1,74 @@
+To: vim-dev@vim.org
+Subject: Patch 7.3.018
+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.3.018 (after 7.3.012)
+Problem:    Missing argument to windres in MingW makefiles.
+Solution:   Add the argument that was wrapped in the patch. (Jon Maken)
+Files:	    src/Make_ming.mak, src/GvimExt/Make_ming.mak
+
+
+*** ../vim-7.3.017/src/Make_ming.mak	2010-09-29 12:37:53.000000000 +0200
+--- src/Make_ming.mak	2010-09-29 18:37:08.000000000 +0200
+***************
+*** 303,309 ****
+  endif
+  endif
+  CC := $(CROSS_COMPILE)gcc
+! WINDRES := $(CROSS_COMPILE)windres --preprocessor="$(CC) -E -xc" -
+  
+  #>>>>> end of choices
+  ###########################################################################
+--- 303,309 ----
+  endif
+  endif
+  CC := $(CROSS_COMPILE)gcc
+! WINDRES := $(CROSS_COMPILE)windres --preprocessor="$(CC) -E -xc" -DRC_INVOKED
+  
+  #>>>>> end of choices
+  ###########################################################################
+*** ../vim-7.3.017/src/GvimExt/Make_ming.mak	2010-09-29 12:37:53.000000000 +0200
+--- src/GvimExt/Make_ming.mak	2010-09-29 18:36:39.000000000 +0200
+***************
+*** 33,39 ****
+  endif
+  endif
+  CXX := $(CROSS_COMPILE)g++
+! WINDRES := $(CROSS_COMPILE)windres --preprocessor="$(CXX) -E -xc" -
+  LIBS :=  -luuid
+  RES  := gvimext.res
+  DEFFILE = gvimext_ming.def
+--- 33,39 ----
+  endif
+  endif
+  CXX := $(CROSS_COMPILE)g++
+! WINDRES := $(CROSS_COMPILE)windres --preprocessor="$(CXX) -E -xc" -DRC_INVOKED
+  LIBS :=  -luuid
+  RES  := gvimext.res
+  DEFFILE = gvimext_ming.def
+*** ../vim-7.3.017/src/version.c	2010-09-29 18:32:47.000000000 +0200
+--- src/version.c	2010-09-29 18:41:53.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     18,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+231. You sprinkle Carpet Fresh on the rugs and put your vacuum cleaner
+     in the front doorway permanently so it always looks like you are
+     actually attempting to do something about that mess that has amassed
+     since you discovered the Internet.
+
+ /// 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.3.019 b/source/ap/vim/patches/7.3.019
new file mode 100644
index 00000000..6a26d6a2
--- /dev/null
+++ b/source/ap/vim/patches/7.3.019
@@ -0,0 +1,55 @@
+To: vim-dev@vim.org
+Subject: Patch 7.3.019
+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.3.019
+Problem:    ":nbstart" can fail silently.
+Solution:   Give an error when netbeans is not supported by the GUI. (Xavier
+	    de Gaye)
+Files:	    src/netbeans.c
+
+
+*** ../vim-7.3.018/src/netbeans.c	2010-09-29 17:26:57.000000000 +0200
+--- src/netbeans.c	2010-09-29 17:35:37.000000000 +0200
+***************
+*** 2773,2778 ****
+--- 2773,2788 ----
+  ex_nbstart(eap)
+      exarg_T	*eap;
+  {
++ #ifdef FEAT_GUI
++ # if !defined(FEAT_GUI_X11) && !defined(FEAT_GUI_GTK)  \
++                 && !defined(FEAT_GUI_W32)
++     if (gui.in_use)
++     {
++         EMSG(_("E838: netbeans is not supported with this GUI"));
++         return;
++     }
++ # endif
++ #endif
+      netbeans_open((char *)eap->arg, FALSE);
+  }
+  
+*** ../vim-7.3.018/src/version.c	2010-09-29 18:42:25.000000000 +0200
+--- src/version.c	2010-09-30 21:02:03.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     19,
+  /**/
+
+-- 
+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.3.020 b/source/ap/vim/patches/7.3.020
new file mode 100644
index 00000000..7c6de549
--- /dev/null
+++ b/source/ap/vim/patches/7.3.020
@@ -0,0 +1,131 @@
+To: vim-dev@vim.org
+Subject: Patch 7.3.020
+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.3.020
+Problem:    Cursor position wrong when joining multiple lines and
+	    'formatoptions' contains "a". (Moshe Kamensky)
+Solution:   Adjust cursor position for skipped indent. (Carlo Teubner)
+Files:	    src/ops.c, src/testdir/test68.in, src/testdir/test68.ok
+
+
+*** ../vim-7.3.019/src/ops.c	2010-08-15 21:57:28.000000000 +0200
+--- src/ops.c	2010-10-09 17:00:35.000000000 +0200
+***************
+*** 4153,4161 ****
+      int	    save_undo;
+  {
+      char_u	*curr = NULL;
+      char_u	*cend;
+      char_u	*newp;
+!     char_u	*spaces;	/* number of spaces inserte before a line */
+      int		endcurr1 = NUL;
+      int		endcurr2 = NUL;
+      int		currsize = 0;	/* size of the current line */
+--- 4153,4162 ----
+      int	    save_undo;
+  {
+      char_u	*curr = NULL;
++     char_u      *curr_start = NULL;
+      char_u	*cend;
+      char_u	*newp;
+!     char_u	*spaces;	/* number of spaces inserted before a line */
+      int		endcurr1 = NUL;
+      int		endcurr2 = NUL;
+      int		currsize = 0;	/* size of the current line */
+***************
+*** 4181,4187 ****
+       */
+      for (t = 0; t < count; ++t)
+      {
+! 	curr = ml_get((linenr_T)(curwin->w_cursor.lnum + t));
+  	if (insert_space && t > 0)
+  	{
+  	    curr = skipwhite(curr);
+--- 4182,4188 ----
+       */
+      for (t = 0; t < count; ++t)
+      {
+! 	curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t));
+  	if (insert_space && t > 0)
+  	{
+  	    curr = skipwhite(curr);
+***************
+*** 4265,4274 ****
+  	    copy_spaces(cend, (size_t)(spaces[t]));
+  	}
+  	mark_col_adjust(curwin->w_cursor.lnum + t, (colnr_T)0, (linenr_T)-t,
+! 				 (long)(cend - newp + spaces[t]));
+  	if (t == 0)
+  	    break;
+! 	curr = ml_get((linenr_T)(curwin->w_cursor.lnum + t - 1));
+  	if (insert_space && t > 1)
+  	    curr = skipwhite(curr);
+  	currsize = (int)STRLEN(curr);
+--- 4266,4275 ----
+  	    copy_spaces(cend, (size_t)(spaces[t]));
+  	}
+  	mark_col_adjust(curwin->w_cursor.lnum + t, (colnr_T)0, (linenr_T)-t,
+! 			 (long)(cend - newp + spaces[t] - (curr - curr_start)));
+  	if (t == 0)
+  	    break;
+! 	curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t - 1));
+  	if (insert_space && t > 1)
+  	    curr = skipwhite(curr);
+  	currsize = (int)STRLEN(curr);
+*** ../vim-7.3.019/src/testdir/test68.in	2010-08-15 21:57:29.000000000 +0200
+--- src/testdir/test68.in	2010-10-09 16:53:02.000000000 +0200
+***************
+*** 51,56 ****
+--- 51,67 ----
+  }
+  
+  STARTTEST
++ /^{/+2
++ :set tw& fo=a
++ I^^
++ ENDTEST
++ 
++ {
++    1aa
++    2bb
++ }
++ 
++ STARTTEST
+  :g/^STARTTEST/.,/^ENDTEST/d
+  :1;/^Results/,$wq! test.out
+  ENDTEST
+*** ../vim-7.3.019/src/testdir/test68.ok	2010-08-15 21:57:29.000000000 +0200
+--- src/testdir/test68.ok	2010-10-09 16:53:02.000000000 +0200
+***************
+*** 33,35 ****
+--- 33,38 ----
+  #a b
+  }
+  
++ 
++ { 1aa ^^2bb }
++ 
+*** ../vim-7.3.019/src/version.c	2010-09-30 21:03:13.000000000 +0200
+--- src/version.c	2010-10-09 17:05:31.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     20,
+  /**/
+
+-- 
+Did you hear about the new 3 million dollar West Virginia State Lottery?
+The winner gets 3 dollars a year for a million years.
+
+ /// 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.3.021 b/source/ap/vim/patches/7.3.021
new file mode 100644
index 00000000..479c9e68
--- /dev/null
+++ b/source/ap/vim/patches/7.3.021
@@ -0,0 +1,70 @@
+To: vim-dev@vim.org
+Subject: Patch 7.3.021
+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.3.021
+Problem:    Conflict for defining Boolean in Mac header files.
+Solution:   Define NO_X11_INCLUDES. (Rainer Muller)
+Files:	    src/os_macosx.m, src/vim.h
+
+
+*** ../vim-7.3.020/src/os_macosx.m	2010-08-15 21:57:29.000000000 +0200
+--- src/os_macosx.m	2010-10-10 17:01:55.000000000 +0200
+***************
+*** 15,20 ****
+--- 15,24 ----
+      Error: MACOS 9 is no longer supported in Vim 7
+  #endif
+  
++ /* Avoid a conflict for the definition of Boolean between Mac header files and
++  * X11 header files. */
++ #define NO_X11_INCLUDES
++ 
+  #include "vim.h"
+  #import <Cocoa/Cocoa.h>
+  
+*** ../vim-7.3.020/src/vim.h	2010-08-15 21:57:29.000000000 +0200
+--- src/vim.h	2010-10-10 17:02:56.000000000 +0200
+***************
+*** 192,199 ****
+  #endif
+  
+  #ifdef NO_X11_INCLUDES
+!     /* In os_mac_conv.c NO_X11_INCLUDES is defined to avoid X11 headers.
+!      * Disable all X11 related things to avoid conflicts. */
+  # ifdef FEAT_X11
+  #  undef FEAT_X11
+  # endif
+--- 192,199 ----
+  #endif
+  
+  #ifdef NO_X11_INCLUDES
+!     /* In os_mac_conv.c and os_macosx.m NO_X11_INCLUDES is defined to avoid
+!      * X11 headers.  Disable all X11 related things to avoid conflicts. */
+  # ifdef FEAT_X11
+  #  undef FEAT_X11
+  # endif
+*** ../vim-7.3.020/src/version.c	2010-10-09 17:21:42.000000000 +0200
+--- src/version.c	2010-10-10 17:05:19.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     21,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+259. When you enter your name in the AltaVista search engine, the top ten
+     matches do indeed refer 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.3.022 b/source/ap/vim/patches/7.3.022
new file mode 100644
index 00000000..aefdf1c2
--- /dev/null
+++ b/source/ap/vim/patches/7.3.022
@@ -0,0 +1,54 @@
+To: vim-dev@vim.org
+Subject: Patch 7.3.022
+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.3.022
+Problem:    When opening a new window the 'spellcapcheck' option is cleared.
+Solution:   Copy the correct option value. (Christian Brabandt)
+Files:	    src/option.c
+
+
+*** ../vim-7.3.021/src/option.c	2010-08-15 21:57:28.000000000 +0200
+--- src/option.c	2010-10-13 13:48:46.000000000 +0200
+***************
+*** 10011,10017 ****
+  	    buf->b_p_smc = p_smc;
+  #endif
+  #ifdef FEAT_SPELL
+! 	    buf->b_s.b_p_spc = vim_strsave(p_spf);
+  	    (void)compile_cap_prog(&buf->b_s);
+  	    buf->b_s.b_p_spf = vim_strsave(p_spf);
+  	    buf->b_s.b_p_spl = vim_strsave(p_spl);
+--- 10011,10017 ----
+  	    buf->b_p_smc = p_smc;
+  #endif
+  #ifdef FEAT_SPELL
+! 	    buf->b_s.b_p_spc = vim_strsave(p_spc);
+  	    (void)compile_cap_prog(&buf->b_s);
+  	    buf->b_s.b_p_spf = vim_strsave(p_spf);
+  	    buf->b_s.b_p_spl = vim_strsave(p_spl);
+*** ../vim-7.3.021/src/version.c	2010-10-10 17:08:28.000000000 +0200
+--- src/version.c	2010-10-13 14:02:08.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     22,
+  /**/
+
+-- 
+GALAHAD:   Camelot ...
+LAUNCELOT: Camelot ...
+GAWAIN:    It's only a model.
+                 "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.3.023 b/source/ap/vim/patches/7.3.023
new file mode 100644
index 00000000..e26d1b8f
--- /dev/null
+++ b/source/ap/vim/patches/7.3.023
@@ -0,0 +1,69 @@
+To: vim-dev@vim.org
+Subject: Patch 7.3.023
+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.3.023
+Problem:    External program may hang when it tries to write to the tty.
+Solution:   Don't close the slave tty until after the child exits. (Nikola
+	    Knezevic)
+Files:	    src/os_unix.c
+
+
+*** ../vim-7.3.022/src/os_unix.c	2010-09-21 22:09:28.000000000 +0200
+--- src/os_unix.c	2010-10-13 16:17:33.000000000 +0200
+***************
+*** 4168,4174 ****
+  # ifdef FEAT_GUI
+  		if (pty_master_fd >= 0)
+  		{
+- 		    close(pty_slave_fd);	/* close slave side of pty */
+  		    fromshell_fd = pty_master_fd;
+  		    toshell_fd = dup(pty_master_fd);
+  		}
+--- 4168,4173 ----
+***************
+*** 4637,4642 ****
+--- 4636,4649 ----
+  		    break;
+  	    }
+  
++ # ifdef FEAT_GUI
++ 	    /* Close slave side of pty.  Only do this after the child has
++ 	     * exited, otherwise the child may hang when it tries to write on
++ 	     * the pty. */
++ 	    if (pty_master_fd >= 0)
++ 		close(pty_slave_fd);
++ # endif
++ 
+  	    /* Make sure the child that writes to the external program is
+  	     * dead. */
+  	    if (wpid > 0)
+*** ../vim-7.3.022/src/version.c	2010-10-13 14:05:29.000000000 +0200
+--- src/version.c	2010-10-13 16:20:48.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     23,
+  /**/
+
+-- 
+       We're knights of the Round Table
+       Our shows are formidable
+       But many times
+       We're given rhymes
+       That are quite unsingable
+       We're opera mad in Camelot
+       We sing from the diaphragm a lot.
+                 "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.3.024 b/source/ap/vim/patches/7.3.024
new file mode 100644
index 00000000..60ae64ea
--- /dev/null
+++ b/source/ap/vim/patches/7.3.024
@@ -0,0 +1,115 @@
+To: vim-dev@vim.org
+Subject: Patch 7.3.024
+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.3.024
+Problem:    Named signs do not use a negative number as intended.
+Solution:   Fix the numbering of named signs. (Xavier de Gaye)
+Files:	    src/ex_cmds.c
+
+
+*** ../vim-7.3.023/src/ex_cmds.c	2010-09-21 16:56:29.000000000 +0200
+--- src/ex_cmds.c	2010-10-13 16:37:18.000000000 +0200
+***************
+*** 6670,6680 ****
+  		    sp = (sign_T *)alloc_clear((unsigned)sizeof(sign_T));
+  		    if (sp == NULL)
+  			return;
+- 		    if (sp_prev == NULL)
+- 			first_sign = sp;
+- 		    else
+- 			sp_prev->sn_next = sp;
+- 		    sp->sn_name = vim_strnsave(arg, (int)(p - arg));
+  
+  		    /* If the name is a number use that for the typenr,
+  		     * otherwise use a negative number. */
+--- 6670,6675 ----
+***************
+*** 6687,6699 ****
+  
+  			for (lp = first_sign; lp != NULL; lp = lp->sn_next)
+  			{
+! 			    if (lp->sn_typenr == last_sign_typenr)
+  			    {
+  				--last_sign_typenr;
+  				if (last_sign_typenr == 0)
+  				    last_sign_typenr = MAX_TYPENR;
+  				if (last_sign_typenr == start)
+  				{
+  				    EMSG(_("E612: Too many signs defined"));
+  				    return;
+  				}
+--- 6682,6695 ----
+  
+  			for (lp = first_sign; lp != NULL; lp = lp->sn_next)
+  			{
+! 			    if (lp->sn_typenr == -last_sign_typenr)
+  			    {
+  				--last_sign_typenr;
+  				if (last_sign_typenr == 0)
+  				    last_sign_typenr = MAX_TYPENR;
+  				if (last_sign_typenr == start)
+  				{
++ 				    vim_free(sp);
+  				    EMSG(_("E612: Too many signs defined"));
+  				    return;
+  				}
+***************
+*** 6702,6711 ****
+  			    }
+  			}
+  
+! 			sp->sn_typenr = last_sign_typenr--;
+! 			if (last_sign_typenr == 0)
+  			    last_sign_typenr = MAX_TYPENR; /* wrap around */
+  		    }
+  		}
+  
+  		/* set values for a defined sign. */
+--- 6698,6714 ----
+  			    }
+  			}
+  
+! 			sp->sn_typenr = -last_sign_typenr;
+! 			if (--last_sign_typenr == 0)
+  			    last_sign_typenr = MAX_TYPENR; /* wrap around */
+  		    }
++ 
++ 		    /* add the new sign to the list of signs */
++ 		    if (sp_prev == NULL)
++ 			first_sign = sp;
++ 		    else
++ 			sp_prev->sn_next = sp;
++ 		    sp->sn_name = vim_strnsave(arg, (int)(p - arg));
+  		}
+  
+  		/* set values for a defined sign. */
+*** ../vim-7.3.023/src/version.c	2010-10-13 16:22:05.000000000 +0200
+--- src/version.c	2010-10-13 16:42:14.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     24,
+  /**/
+
+-- 
+       In war we're tough and able.
+       Quite indefatigable
+       Between our quests
+       We sequin vests
+       And impersonate Clark Gable
+       It's a busy life in Camelot.
+       I have to push the pram a lot.
+                 "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.3.025 b/source/ap/vim/patches/7.3.025
new file mode 100644
index 00000000..0fb3bee6
--- /dev/null
+++ b/source/ap/vim/patches/7.3.025
@@ -0,0 +1,136 @@
+To: vim-dev@vim.org
+Subject: Patch 7.3.025
+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.3.025
+Problem:    ":mksession" does not square brackets escape file name properly.
+Solution:   Improve escapging of file names. (partly by Peter Odding)
+Files:	    src/ex_docmd.c
+
+
+*** ../vim-7.3.024/src/ex_docmd.c	2010-09-21 16:56:29.000000000 +0200
+--- src/ex_docmd.c	2010-10-13 17:39:17.000000000 +0200
+***************
+*** 10708,10714 ****
+   * Write a file name to the session file.
+   * Takes care of the "slash" option in 'sessionoptions' and escapes special
+   * characters.
+!  * Returns FAIL if writing fails.
+   */
+      static int
+  ses_put_fname(fd, name, flagp)
+--- 10708,10714 ----
+   * Write a file name to the session file.
+   * Takes care of the "slash" option in 'sessionoptions' and escapes special
+   * characters.
+!  * Returns FAIL if writing fails or out of memory.
+   */
+      static int
+  ses_put_fname(fd, name, flagp)
+***************
+*** 10717,10765 ****
+      unsigned	*flagp;
+  {
+      char_u	*sname;
+      int		retval = OK;
+-     int		c;
+  
+      sname = home_replace_save(NULL, name);
+!     if (sname != NULL)
+! 	name = sname;
+!     while (*name != NUL)
+!     {
+! #ifdef FEAT_MBYTE
+! 	{
+! 	    int l;
+  
+! 	    if (has_mbyte && (l = (*mb_ptr2len)(name)) > 1)
+! 	    {
+! 		/* copy a multibyte char */
+! 		while (--l >= 0)
+! 		{
+! 		    if (putc(*name, fd) != *name)
+! 			retval = FAIL;
+! 		    ++name;
+! 		}
+! 		continue;
+! 	    }
+! 	}
+! #endif
+! 	c = *name++;
+! 	if (c == '\\' && (*flagp & SSOP_SLASH))
+! 	    /* change a backslash to a forward slash */
+! 	    c = '/';
+! 	else if ((vim_strchr(escape_chars, c) != NULL
+! #ifdef BACKSLASH_IN_FILENAME
+! 		    && c != '\\'
+! #endif
+! 		 ) || c == '#' || c == '%')
+! 	{
+! 	    /* escape a special character with a backslash */
+! 	    if (putc('\\', fd) != '\\')
+! 		retval = FAIL;
+! 	}
+! 	if (putc(c, fd) != c)
+! 	    retval = FAIL;
+      }
+      vim_free(sname);
+      return retval;
+  }
+  
+--- 10717,10748 ----
+      unsigned	*flagp;
+  {
+      char_u	*sname;
++     char_u	*p;
+      int		retval = OK;
+  
+      sname = home_replace_save(NULL, name);
+!     if (sname == NULL)
+! 	return FAIL;
+  
+!     if (*flagp & SSOP_SLASH)
+!     {
+! 	/* change all backslashes to forward slashes */
+! 	for (p = sname; *p != NUL; mb_ptr_adv(p))
+! 	    if (*p == '\\')
+! 		*p = '/';
+      }
++ 
++     /* escapse special characters */
++     p = vim_strsave_fnameescape(sname, FALSE);
+      vim_free(sname);
++     if (p == NULL)
++ 	return FAIL;
++ 
++     /* write the result */
++     if (fputs((char *)p, fd) < 0)
++ 	retval = FAIL;
++ 
++     vim_free(p);
+      return retval;
+  }
+  
+*** ../vim-7.3.024/src/version.c	2010-10-13 16:44:17.000000000 +0200
+--- src/version.c	2010-10-13 17:49:15.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     25,
+  /**/
+
+-- 
+"Time flies like an arrow".  So I put an arrow on my desk, now
+awaiting one of these time flies showing up.
+
+ /// 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.3.026 b/source/ap/vim/patches/7.3.026
new file mode 100644
index 00000000..b47198c5
--- /dev/null
+++ b/source/ap/vim/patches/7.3.026
@@ -0,0 +1,61 @@
+To: vim-dev@vim.org
+Subject: Patch 7.3.026
+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.3.026
+Problem:    CTRL-] in a help file doesn't always work. (Tony Mechelynck)
+Solution:   Don't escape special characters. (Carlo Teubner)
+Files:	    src/normal.c
+
+
+*** ../vim-7.3.025/src/normal.c	2010-08-15 21:57:28.000000000 +0200
+--- src/normal.c	2010-10-13 18:01:03.000000000 +0200
+***************
+*** 5666,5673 ****
+  	else if (cmdchar == '#')
+  	    aux_ptr = (char_u *)(p_magic ? "/?.*~[^$\\" : "/?^$\\");
+  	else if (tag_cmd)
+! 	    /* Don't escape spaces and Tabs in a tag with a backslash */
+! 	    aux_ptr = (char_u *)"\\|\"\n[";
+  	else
+  	    aux_ptr = (char_u *)"\\|\"\n*?[";
+  
+--- 5666,5678 ----
+  	else if (cmdchar == '#')
+  	    aux_ptr = (char_u *)(p_magic ? "/?.*~[^$\\" : "/?^$\\");
+  	else if (tag_cmd)
+! 	{
+! 	    if (curbuf->b_help)
+! 		/* ":help" handles unescaped argument */
+! 		aux_ptr = (char_u *)"";
+! 	    else
+! 		aux_ptr = (char_u *)"\\|\"\n[";
+! 	}
+  	else
+  	    aux_ptr = (char_u *)"\\|\"\n*?[";
+  
+*** ../vim-7.3.025/src/version.c	2010-10-13 17:50:02.000000000 +0200
+--- src/version.c	2010-10-13 18:04:54.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     26,
+  /**/
+
+-- 
+MAN:    Fetchez la vache!
+GUARD:  Quoi?
+MAN:    Fetchez la vache!
+                 "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.3.027 b/source/ap/vim/patches/7.3.027
new file mode 100644
index 00000000..3d2538d2
--- /dev/null
+++ b/source/ap/vim/patches/7.3.027
@@ -0,0 +1,88 @@
+To: vim-dev@vim.org
+Subject: Patch 7.3.027
+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.3.027
+Problem:    Opening a file on a network share is very slow.
+Solution:   When fixing file name case append "\*" to directory, server and
+	    network share names. (David Anderson, John Beckett)
+Files:	    src/os_win32.c
+
+
+*** ../vim-7.3.026/src/os_win32.c	2010-09-21 17:29:19.000000000 +0200
+--- src/os_win32.c	2010-10-13 20:31:32.000000000 +0200
+***************
+*** 2308,2319 ****
+--- 2308,2321 ----
+      int		len)
+  {
+      char		szTrueName[_MAX_PATH + 2];
++     char		szTrueNameTemp[_MAX_PATH + 2];
+      char		*ptrue, *ptruePrev;
+      char		*porig, *porigPrev;
+      int			flen;
+      WIN32_FIND_DATA	fb;
+      HANDLE		hFind;
+      int			c;
++     int			slen;
+  
+      flen = (int)STRLEN(name);
+      if (flen == 0 || flen > _MAX_PATH)
+***************
+*** 2358,2369 ****
+  	}
+  	*ptrue = NUL;
+  
+  	/* Skip "", "." and "..". */
+  	if (ptrue > ptruePrev
+  		&& (ptruePrev[0] != '.'
+  		    || (ptruePrev[1] != NUL
+  			&& (ptruePrev[1] != '.' || ptruePrev[2] != NUL)))
+! 		&& (hFind = FindFirstFile(szTrueName, &fb))
+  						      != INVALID_HANDLE_VALUE)
+  	{
+  	    c = *porig;
+--- 2360,2378 ----
+  	}
+  	*ptrue = NUL;
+  
++ 	/* To avoid a slow failure append "\*" when searching a directory,
++ 	 * server or network share. */
++ 	STRCPY(szTrueNameTemp, szTrueName);
++ 	slen = strlen(szTrueNameTemp);
++ 	if (*porig == psepc && slen + 2 < _MAX_PATH)
++ 	    STRCPY(szTrueNameTemp + slen, "\\*");
++ 
+  	/* Skip "", "." and "..". */
+  	if (ptrue > ptruePrev
+  		&& (ptruePrev[0] != '.'
+  		    || (ptruePrev[1] != NUL
+  			&& (ptruePrev[1] != '.' || ptruePrev[2] != NUL)))
+! 		&& (hFind = FindFirstFile(szTrueNameTemp, &fb))
+  						      != INVALID_HANDLE_VALUE)
+  	{
+  	    c = *porig;
+*** ../vim-7.3.026/src/version.c	2010-10-13 18:06:42.000000000 +0200
+--- src/version.c	2010-10-13 20:37:00.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     27,
+  /**/
+
+-- 
+   A cow comes flying over the battlements,  lowing aggressively.  The cow
+   lands on GALAHAD'S PAGE, squashing him completely.
+                 "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.3.028 b/source/ap/vim/patches/7.3.028
new file mode 100644
index 00000000..a4f987c6
--- /dev/null
+++ b/source/ap/vim/patches/7.3.028
@@ -0,0 +1,179 @@
+To: vim-dev@vim.org
+Subject: Patch 7.3.028
+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.3.028 (after 7.3.024)
+Problem:    Signs don't show up. (Charles Campbell)
+Solution:   Don't use negative numbers.  Also assign a number to signs that
+	    have a name of all digits to avoid using a sign number twice.
+Files:	    src/ex_cmds.c
+
+
+*** ../vim-7.3.027/src/ex_cmds.c	2010-10-13 16:44:17.000000000 +0200
+--- src/ex_cmds.c	2010-10-14 20:59:04.000000000 +0200
+***************
+*** 6569,6575 ****
+  };
+  
+  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));
+--- 6569,6575 ----
+  };
+  
+  static sign_T	*first_sign = NULL;
+! static int	next_sign_typenr = 1;
+  
+  static int sign_cmd_idx __ARGS((char_u *begin_cmd, char_u *end_cmd));
+  static void sign_list_defined __ARGS((sign_T *sp));
+***************
+*** 6651,6659 ****
+--- 6651,6664 ----
+  	    EMSG(_("E156: Missing sign name"));
+  	else
+  	{
++ 	    /* Isolate the sign name.  If it's a number skip leading zeroes,
++ 	     * so that "099" and "99" are the same sign.  But keep "0". */
+  	    p = skiptowhite(arg);
+  	    if (*p != NUL)
+  		*p++ = NUL;
++ 	    while (arg[0] == '0' && arg[1] != NUL)
++ 		++arg;
++ 
+  	    sp_prev = NULL;
+  	    for (sp = first_sign; sp != NULL; sp = sp->sn_next)
+  	    {
+***************
+*** 6666,6706 ****
+  		/* ":sign define {name} ...": define a sign */
+  		if (sp == NULL)
+  		{
+  		    /* Allocate a new sign. */
+  		    sp = (sign_T *)alloc_clear((unsigned)sizeof(sign_T));
+  		    if (sp == NULL)
+  			return;
+  
+! 		    /* If the name is a number use that for the typenr,
+! 		     * otherwise use a negative number. */
+! 		    if (VIM_ISDIGIT(*arg))
+! 			sp->sn_typenr = atoi((char *)arg);
+! 		    else
+  		    {
+! 			sign_T	*lp;
+! 			int	start = last_sign_typenr;
+! 
+! 			for (lp = first_sign; lp != NULL; lp = lp->sn_next)
+  			{
+! 			    if (lp->sn_typenr == -last_sign_typenr)
+  			    {
+! 				--last_sign_typenr;
+! 				if (last_sign_typenr == 0)
+! 				    last_sign_typenr = MAX_TYPENR;
+! 				if (last_sign_typenr == start)
+! 				{
+! 				    vim_free(sp);
+! 				    EMSG(_("E612: Too many signs defined"));
+! 				    return;
+! 				}
+! 				lp = first_sign;
+! 				continue;
+  			    }
+  			}
+  
+! 			sp->sn_typenr = -last_sign_typenr;
+! 			if (--last_sign_typenr == 0)
+! 			    last_sign_typenr = MAX_TYPENR; /* wrap around */
+  		    }
+  
+  		    /* add the new sign to the list of signs */
+--- 6671,6715 ----
+  		/* ":sign define {name} ...": define a sign */
+  		if (sp == NULL)
+  		{
++ 		    sign_T	*lp;
++ 		    int		start = next_sign_typenr;
++ 
+  		    /* Allocate a new sign. */
+  		    sp = (sign_T *)alloc_clear((unsigned)sizeof(sign_T));
+  		    if (sp == NULL)
+  			return;
+  
+! 		    /* Check that next_sign_typenr is not already being used.
+! 		     * This only happens after wrapping around.  Hopefully
+! 		     * another one got deleted and we can use its number. */
+! 		    for (lp = first_sign; lp != NULL; )
+  		    {
+! 			if (lp->sn_typenr == next_sign_typenr)
+  			{
+! 			    ++next_sign_typenr;
+! 			    if (next_sign_typenr == MAX_TYPENR)
+! 				next_sign_typenr = 1;
+! 			    if (next_sign_typenr == start)
+  			    {
+! 				vim_free(sp);
+! 				EMSG(_("E612: Too many signs defined"));
+! 				return;
+  			    }
++ 			    lp = first_sign;  /* start all over */
++ 			    continue;
+  			}
++ 			lp = lp->sn_next;
++ 		    }
++ 
++ 		    sp->sn_typenr = next_sign_typenr;
++ 		    if (++next_sign_typenr == MAX_TYPENR)
++ 			next_sign_typenr = 1; /* wrap around */
+  
+! 		    sp->sn_name = vim_strsave(arg);
+! 		    if (sp->sn_name == NULL)  /* out of memory */
+! 		    {
+! 			vim_free(sp);
+! 			return;
+  		    }
+  
+  		    /* add the new sign to the list of signs */
+***************
+*** 6708,6714 ****
+  			first_sign = sp;
+  		    else
+  			sp_prev->sn_next = sp;
+- 		    sp->sn_name = vim_strnsave(arg, (int)(p - arg));
+  		}
+  
+  		/* set values for a defined sign. */
+--- 6717,6722 ----
+***************
+*** 6886,6891 ****
+--- 6894,6901 ----
+  		arg = skiptowhite(arg);
+  		if (*arg != NUL)
+  		    *arg++ = NUL;
++ 		while (sign_name[0] == '0' && sign_name[1] != NUL)
++ 		    ++sign_name;
+  	    }
+  	    else if (STRNCMP(arg, "file=", 5) == 0)
+  	    {
+*** ../vim-7.3.027/src/version.c	2010-10-13 20:37:37.000000000 +0200
+--- src/version.c	2010-10-14 20:50:54.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     28,
+  /**/
+
+-- 
+This is an airconditioned room, do not open Windows.
+
+ /// 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.3.029 b/source/ap/vim/patches/7.3.029
new file mode 100644
index 00000000..702c7cce
--- /dev/null
+++ b/source/ap/vim/patches/7.3.029
@@ -0,0 +1,177 @@
+To: vim-dev@vim.org
+Subject: Patch 7.3.029
+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.3.029
+Problem:    ":sort n" sorts lines without a number as number zero. (Beeyawned)
+Solution:   Make lines without a number sort before lines with a number.  Also
+	    fix sorting negative numbers.
+Files:	    src/ex_cmds.c, src/testdir/test57.in, src/testdir/test57.ok
+
+
+*** ../vim-7.3.028/src/ex_cmds.c	2010-10-14 21:29:31.000000000 +0200
+--- src/ex_cmds.c	2010-10-15 20:04:25.000000000 +0200
+***************
+*** 323,329 ****
+      /* When sorting numbers "start_col_nr" is the number, not the column
+       * number. */
+      if (sort_nr)
+! 	result = l1.start_col_nr - l2.start_col_nr;
+      else
+      {
+  	/* We need to copy one line into "sortbuf1", because there is no
+--- 323,330 ----
+      /* When sorting numbers "start_col_nr" is the number, not the column
+       * number. */
+      if (sort_nr)
+! 	result = l1.start_col_nr == l2.start_col_nr ? 0
+! 				 : l1.start_col_nr > l2.start_col_nr ? 1 : -1;
+      else
+      {
+  	/* We need to copy one line into "sortbuf1", because there is no
+***************
+*** 482,488 ****
+  	     * of the match, by temporarily terminating the string there */
+  	    s2 = s + end_col;
+  	    c = *s2;
+! 	    (*s2) = 0;
+  	    /* Sorting on number: Store the number itself. */
+  	    p = s + start_col;
+  	    if (sort_hex)
+--- 483,489 ----
+  	     * of the match, by temporarily terminating the string there */
+  	    s2 = s + end_col;
+  	    c = *s2;
+! 	    *s2 = NUL;
+  	    /* Sorting on number: Store the number itself. */
+  	    p = s + start_col;
+  	    if (sort_hex)
+***************
+*** 491,499 ****
+  		s = skiptodigit(p);
+  	    if (s > p && s[-1] == '-')
+  		--s;  /* include preceding negative sign */
+! 	    vim_str2nr(s, NULL, NULL, sort_oct, sort_hex,
+! 					&nrs[lnum - eap->line1].start_col_nr, NULL);
+! 	    (*s2) = c;
+  	}
+  	else
+  	{
+--- 492,504 ----
+  		s = skiptodigit(p);
+  	    if (s > p && s[-1] == '-')
+  		--s;  /* include preceding negative sign */
+! 	    if (*s == NUL)
+! 		/* empty line should sort before any number */
+! 		nrs[lnum - eap->line1].start_col_nr = -MAXLNUM;
+! 	    else
+! 		vim_str2nr(s, NULL, NULL, sort_oct, sort_hex,
+! 				  &nrs[lnum - eap->line1].start_col_nr, NULL);
+! 	    *s2 = c;
+  	}
+  	else
+  	{
+***************
+*** 6556,6563 ****
+  struct sign
+  {
+      sign_T	*sn_next;	/* next sign in list */
+!     int		sn_typenr;	/* type number of sign (negative if not equal
+! 				   to name) */
+      char_u	*sn_name;	/* name of sign */
+      char_u	*sn_icon;	/* name of pixmap */
+  #ifdef FEAT_SIGN_ICONS
+--- 6561,6567 ----
+  struct sign
+  {
+      sign_T	*sn_next;	/* next sign in list */
+!     int		sn_typenr;	/* type number of sign */
+      char_u	*sn_name;	/* name of sign */
+      char_u	*sn_icon;	/* name of pixmap */
+  #ifdef FEAT_SIGN_ICONS
+*** ../vim-7.3.028/src/testdir/test57.in	2010-08-15 21:57:29.000000000 +0200
+--- src/testdir/test57.in	2010-10-15 20:12:23.000000000 +0200
+***************
+*** 53,67 ****
+  t02: numeric
+  abc
+  ab
+- a
+  a321
+  a123
+  a122
+  b321
+  b123
+  c123d
+   123b
+  c321d
+  b322b
+  b321
+  b321b
+--- 53,71 ----
+  t02: numeric
+  abc
+  ab
+  a321
+  a123
+  a122
++ a
++ x-22
+  b321
+  b123
++ 
+  c123d
++ -24
+   123b
+  c321d
++ 0
+  b322b
+  b321
+  b321b
+*** ../vim-7.3.028/src/testdir/test57.ok	2010-08-15 21:57:29.000000000 +0200
+--- src/testdir/test57.ok	2010-10-15 20:11:42.000000000 +0200
+***************
+*** 21,26 ****
+--- 21,30 ----
+  a
+  
+  
++ 
++ -24
++ x-22
++ 0
+  a122
+  a123
+  b123
+*** ../vim-7.3.028/src/version.c	2010-10-14 21:29:31.000000000 +0200
+--- src/version.c	2010-10-15 20:13:52.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     29,
+  /**/
+
+-- 
+       When danger reared its ugly head,
+       He bravely turned his tail and fled
+       Yes, Brave Sir Robin turned about
+       And gallantly he chickened out
+       Bravely taking to his feet
+       He beat a very brave retreat
+       Bravest of the brave Sir Robin
+       Petrified of being dead
+       Soiled his pants then brave Sir Robin
+       Turned away and fled.
+                 "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.3.030 b/source/ap/vim/patches/7.3.030
new file mode 100644
index 00000000..8d6a5f1b
--- /dev/null
+++ b/source/ap/vim/patches/7.3.030
@@ -0,0 +1,366 @@
+To: vim-dev@vim.org
+Subject: Patch 7.3.030
+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.3.030
+Problem:    Cannot store Dict and List in viminfo file.
+Solution:   Add support for this. (Christian Brabandt)
+Files:	    runtime/doc/options.txt, src/eval.c, 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,
+	    src/testdir/Makefile, src/testdir/main.aap, src/testdir/test74.in,
+	    src/testdir/test74.ok
+
+
+*** ../vim-7.3.029/runtime/doc/options.txt	2010-08-15 21:57:17.000000000 +0200
+--- runtime/doc/options.txt	2010-10-20 17:41:18.000000000 +0200
+***************
+*** 7530,7537 ****
+  	!	When included, save and restore global variables that start
+  		with an uppercase letter, and don't contain a lowercase
+  		letter.  Thus "KEEPTHIS and "K_L_M" are stored, but "KeepThis"
+! 		and "_K_L_M" are not.  Only String and Number types are
+! 		stored.
+  	"	Maximum number of lines saved for each register.  Old name of
+  		the '<' item, with the disadvantage that you need to put a
+  		backslash before the ", otherwise it will be recognized as the
+--- 7530,7538 ----
+  	!	When included, save and restore global variables that start
+  		with an uppercase letter, and don't contain a lowercase
+  		letter.  Thus "KEEPTHIS and "K_L_M" are stored, but "KeepThis"
+! 		and "_K_L_M" are not.  Nested List and Dict items may not be
+! 		read back correctly, you end up with a string representation
+! 		instead.
+  	"	Maximum number of lines saved for each register.  Old name of
+  		the '<' item, with the disadvantage that you need to put a
+  		backslash before the ", otherwise it will be recognized as the
+*** ../vim-7.3.029/src/eval.c	2010-09-14 12:47:30.000000000 +0200
+--- src/eval.c	2010-10-20 16:25:54.000000000 +0200
+***************
+*** 22520,22537 ****
+  	if (tab != NULL)
+  	{
+  	    *tab++ = '\0';	/* isolate the variable name */
+! 	    if (*tab == 'S')	/* string var */
+! 		type = VAR_STRING;
+  #ifdef FEAT_FLOAT
+! 	    else if (*tab == 'F')
+! 		type = VAR_FLOAT;
+  #endif
+  
+  	    tab = vim_strchr(tab, '\t');
+  	    if (tab != NULL)
+  	    {
+  		tv.v_type = type;
+! 		if (type == VAR_STRING)
+  		    tv.vval.v_string = viminfo_readstring(virp,
+  				       (int)(tab - virp->vir_line + 1), TRUE);
+  #ifdef FEAT_FLOAT
+--- 22520,22540 ----
+  	if (tab != NULL)
+  	{
+  	    *tab++ = '\0';	/* isolate the variable name */
+! 	    switch (*tab)
+! 	    {
+! 		case 'S': type = VAR_STRING; break;
+  #ifdef FEAT_FLOAT
+! 		case 'F': type = VAR_FLOAT; break;
+  #endif
++ 		case 'D': type = VAR_DICT; break;
++ 		case 'L': type = VAR_LIST; break;
++ 	    }
+  
+  	    tab = vim_strchr(tab, '\t');
+  	    if (tab != NULL)
+  	    {
+  		tv.v_type = type;
+! 		if (type == VAR_STRING || type == VAR_DICT || type == VAR_LIST)
+  		    tv.vval.v_string = viminfo_readstring(virp,
+  				       (int)(tab - virp->vir_line + 1), TRUE);
+  #ifdef FEAT_FLOAT
+***************
+*** 22540,22548 ****
+  #endif
+  		else
+  		    tv.vval.v_number = atol((char *)tab + 1);
+  		set_var(virp->vir_line + 1, &tv, FALSE);
+! 		if (type == VAR_STRING)
+  		    vim_free(tv.vval.v_string);
+  	    }
+  	}
+      }
+--- 22543,22569 ----
+  #endif
+  		else
+  		    tv.vval.v_number = atol((char *)tab + 1);
++ 		if (type == VAR_DICT || type == VAR_LIST)
++ 		{
++ 		    typval_T *etv = eval_expr(tv.vval.v_string, NULL);
++ 
++ 		    if (etv == NULL)
++ 			/* Failed to parse back the dict or list, use it as a
++ 			 * string. */
++ 			tv.v_type = VAR_STRING;
++ 		    else
++ 		    {
++ 			vim_free(tv.vval.v_string);
++ 			tv = *etv;
++ 		    }
++ 		}
++ 
+  		set_var(virp->vir_line + 1, &tv, FALSE);
+! 
+! 		if (tv.v_type == VAR_STRING)
+  		    vim_free(tv.vval.v_string);
++ 		else if (tv.v_type == VAR_DICT || tv.v_type == VAR_LIST)
++ 		    clear_tv(&tv);
+  	    }
+  	}
+      }
+***************
+*** 22584,22591 ****
+  		    case VAR_STRING: s = "STR"; break;
+  		    case VAR_NUMBER: s = "NUM"; break;
+  #ifdef FEAT_FLOAT
+! 		    case VAR_FLOAT: s = "FLO"; break;
+  #endif
+  		    default: continue;
+  		}
+  		fprintf(fp, "!%s\t%s\t", this_var->di_key, s);
+--- 22605,22614 ----
+  		    case VAR_STRING: s = "STR"; break;
+  		    case VAR_NUMBER: s = "NUM"; break;
+  #ifdef FEAT_FLOAT
+! 		    case VAR_FLOAT:  s = "FLO"; break;
+  #endif
++ 		    case VAR_DICT:   s = "DIC"; break;
++ 		    case VAR_LIST:   s = "LIS"; break;
+  		    default: continue;
+  		}
+  		fprintf(fp, "!%s\t%s\t", this_var->di_key, s);
+*** ../vim-7.3.029/src/testdir/Make_amiga.mak	2010-08-15 21:57:29.000000000 +0200
+--- src/testdir/Make_amiga.mak	2010-10-20 16:27:19.000000000 +0200
+***************
+*** 27,33 ****
+  		test56.out test57.out test58.out test59.out test60.out \
+  		test61.out test62.out test63.out test64.out test65.out \
+  		test66.out test67.out test68.out test69.out test70.out \
+! 		test71.out test72.out test73.out
+  
+  .SUFFIXES: .in .out
+  
+--- 27,33 ----
+  		test56.out test57.out test58.out test59.out test60.out \
+  		test61.out test62.out test63.out test64.out test65.out \
+  		test66.out test67.out test68.out test69.out test70.out \
+! 		test71.out test72.out test73.out test74.out
+  
+  .SUFFIXES: .in .out
+  
+***************
+*** 120,122 ****
+--- 120,123 ----
+  test71.out: test71.in
+  test72.out: test72.in
+  test73.out: test73.in
++ test74.out: test74.in
+*** ../vim-7.3.029/src/testdir/Make_dos.mak	2010-08-15 21:57:29.000000000 +0200
+--- src/testdir/Make_dos.mak	2010-10-20 16:13:35.000000000 +0200
+***************
+*** 27,33 ****
+  		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 test67.out \
+! 		test68.out test69.out test71.out test72.out test73.out
+  
+  SCRIPTS32 =	test50.out test70.out
+  
+--- 27,34 ----
+  		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 test67.out \
+! 		test68.out test69.out test71.out test72.out test73.out \
+! 		test74.out
+  
+  SCRIPTS32 =	test50.out test70.out
+  
+*** ../vim-7.3.029/src/testdir/Make_ming.mak	2010-08-15 21:57:29.000000000 +0200
+--- src/testdir/Make_ming.mak	2010-10-20 16:26:54.000000000 +0200
+***************
+*** 47,53 ****
+  		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 test67.out \
+! 		test68.out test69.out test71.out test72.out test72.out
+  
+  SCRIPTS32 =	test50.out test70.out
+  
+--- 47,54 ----
+  		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 test67.out \
+! 		test68.out test69.out test71.out test72.out test73.out \
+! 		test74.out
+  
+  SCRIPTS32 =	test50.out test70.out
+  
+*** ../vim-7.3.029/src/testdir/Make_os2.mak	2010-08-15 21:57:29.000000000 +0200
+--- src/testdir/Make_os2.mak	2010-10-20 16:13:35.000000000 +0200
+***************
+*** 27,33 ****
+  		test56.out test57.out test58.out test59.out test60.out \
+  		test61.out test62.out test63.out test64.out test65.out \
+  		test66.out test67.out test68.out test69.out test70.out \
+! 		test71.out test72.out test73.out
+  
+  .SUFFIXES: .in .out
+  
+--- 27,33 ----
+  		test56.out test57.out test58.out test59.out test60.out \
+  		test61.out test62.out test63.out test64.out test65.out \
+  		test66.out test67.out test68.out test69.out test70.out \
+! 		test71.out test72.out test73.out test74.out
+  
+  .SUFFIXES: .in .out
+  
+*** ../vim-7.3.029/src/testdir/Make_vms.mms	2010-08-15 21:57:29.000000000 +0200
+--- src/testdir/Make_vms.mms	2010-10-20 16:13:35.000000000 +0200
+***************
+*** 74,80 ****
+  	 test56.out test57.out test60.out \
+  	 test61.out test62.out test63.out test64.out test65.out \
+  	 test66.out test67.out test68.out test69.out \
+! 	 test71.out test72.out
+  
+  # Known problems:
+  # Test 30: a problem around mac format - unknown reason
+--- 74,80 ----
+  	 test56.out test57.out test60.out \
+  	 test61.out test62.out test63.out test64.out test65.out \
+  	 test66.out test67.out test68.out test69.out \
+! 	 test71.out test72.out test74.out
+  
+  # Known problems:
+  # Test 30: a problem around mac format - unknown reason
+*** ../vim-7.3.029/src/testdir/Makefile	2010-09-14 12:47:30.000000000 +0200
+--- src/testdir/Makefile	2010-10-20 16:13:35.000000000 +0200
+***************
+*** 10,15 ****
+--- 10,16 ----
+  #   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 \
+  		test12.out  test13.out test14.out test15.out test17.out \
+***************
+*** 23,29 ****
+  		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 test67.out test68.out \
+! 		test69.out test70.out test71.out test72.out test73.out
+  
+  SCRIPTS_GUI = test16.out
+  
+--- 24,31 ----
+  		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 test67.out test68.out \
+! 		test69.out test70.out test71.out test72.out test73.out \
+! 		test74.out
+  
+  SCRIPTS_GUI = test16.out
+  
+*** ../vim-7.3.029/src/testdir/main.aap	2010-08-15 21:57:29.000000000 +0200
+--- src/testdir/main.aap	2010-10-20 16:13:35.000000000 +0200
+***************
+*** 13,19 ****
+  		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 test47.out
+! 		test48.out test49.out
+  
+  ScriptsGUI = test16.out
+  
+--- 13,19 ----
+  		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 test47.out
+! 		test48.out test49.out test74.out
+  
+  ScriptsGUI = test16.out
+  
+*** ../vim-7.3.029/src/testdir/test74.in	2010-10-20 17:41:30.000000000 +0200
+--- src/testdir/test74.in	2010-10-20 17:37:52.000000000 +0200
+***************
+*** 0 ****
+--- 1,36 ----
++ " Tests for storing global variables in the .viminfo file vim: set ft=vim:
++ 
++ STARTTEST
++ :so small.vim
++ :" Do all test in a separate window to avoid E211 when we recursively
++ :" delete the Xfind directory during cleanup
++ :"
++ :" This will cause a few errors, do it silently.
++ :set visualbell
++ :set nocp viminfo+=!,nviminfo
++ :let MY_GLOBAL_DICT={'foo': 1, 'bar': 0, 'longvarible': 1000}
++ :" store a really long list, so line wrapping will occur in viminfo file
++ :let MY_GLOBAL_LIST=range(1,100)
++ :wv! Xviminfo
++ :unlet MY_GLOBAL_DICT
++ :unlet MY_GLOBAL_LIST
++ :rv! Xviminfo
++ :call delete('Xviminfo')
++ :if exists("MY_GLOBAL_DICT")
++ :redir >> test.out
++ :echo MY_GLOBAL_DICT
++ :redir end
++ :endif
++ :if exists("MY_GLOBAL_LIST")
++ :redir >> test.out
++ :echo MY_GLOBAL_LIST
++ :redir end
++ :endif
++ :redir >> test.out
++ :echo "foobar"
++ :redir end
++ :endif
++ :qa!
++ ENDTEST
++ 
++ eof
+*** ../vim-7.3.029/src/testdir/test74.ok	2010-10-20 17:41:30.000000000 +0200
+--- src/testdir/test74.ok	2010-10-20 17:36:57.000000000 +0200
+***************
+*** 0 ****
+--- 1,5 ----
++ 
++ {'foo': 1, 'longvarible': 1000, 'bar': 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, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100]
++ 
++ foobar
+*** ../vim-7.3.029/src/version.c	2010-10-15 20:20:00.000000000 +0200
+--- src/version.c	2010-10-20 17:23:54.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     30,
+  /**/
+
+-- 
+Not too long ago, cut and paste was done with scissors and glue...
+
+ /// 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.3.031 b/source/ap/vim/patches/7.3.031
new file mode 100644
index 00000000..abe99464
--- /dev/null
+++ b/source/ap/vim/patches/7.3.031
@@ -0,0 +1,121 @@
+To: vim-dev@vim.org
+Subject: Patch 7.3.031
+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.3.031
+Problem:    Can't pass the X window ID to another application.
+Solution:   Add v:windowid. (Christian J. Robinson, Lech Lorens)
+Files:	    runtime/doc/eval.txt, src/eval.c, src/gui.c, src/vim.h,
+	    src/os_unix.c
+
+
+*** ../vim-7.3.030/runtime/doc/eval.txt	2010-08-15 21:57:15.000000000 +0200
+--- runtime/doc/eval.txt	2010-10-20 19:11:03.000000000 +0200
+***************
+*** 1657,1662 ****
+--- 1657,1667 ----
+  					*v:warningmsg* *warningmsg-variable*
+  v:warningmsg	Last given warning message.  It's allowed to set this variable.
+  
++ 					*v:windowid* *windowid-variable*
++ v:windowid	When any X11 based GUI is running or when running in a
++ 		terminal and Vim connects to the X server (|-X|) this will be
++ 		set to the window ID.  Otherwise the value is zero.
++ 
+  ==============================================================================
+  4. Builtin Functions					*functions*
+  
+*** ../vim-7.3.030/src/eval.c	2010-10-20 17:44:01.000000000 +0200
+--- src/eval.c	2010-10-20 18:48:40.000000000 +0200
+***************
+*** 362,367 ****
+--- 362,368 ----
+      {VV_NAME("operator",	 VAR_STRING), VV_RO},
+      {VV_NAME("searchforward",	 VAR_NUMBER), 0},
+      {VV_NAME("oldfiles",	 VAR_LIST), 0},
++     {VV_NAME("windowid",	 VAR_NUMBER), VV_RO},
+  };
+  
+  /* shorthand */
+*** ../vim-7.3.030/src/gui.c	2010-09-29 17:26:57.000000000 +0200
+--- src/gui.c	2010-10-20 19:15:56.000000000 +0200
+***************
+*** 105,112 ****
+--- 105,122 ----
+  
+  #if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_X11)
+      if (gui.in_use)
++     {
++ # ifdef FEAT_EVAL
++ 	Window	x11_window;
++ 	Display	*x11_display;
++ 
++ 	if (gui_get_x11_windis(&x11_window, &x11_display) == OK)
++ 	    set_vim_var_nr(VV_WINDOWID, (long)x11_window);
++ # endif
++ 
+  	/* Display error messages in a dialog now. */
+  	display_errors();
++     }
+  #endif
+  
+  #if defined(MAY_FORK) && !defined(__QNXNTO__)
+*** ../vim-7.3.030/src/vim.h	2010-10-10 17:08:28.000000000 +0200
+--- src/vim.h	2010-10-20 18:48:40.000000000 +0200
+***************
+*** 1842,1848 ****
+  #define VV_OP		52
+  #define VV_SEARCHFORWARD 53
+  #define VV_OLDFILES	54
+! #define VV_LEN		55	/* number of v: vars */
+  
+  #ifdef FEAT_CLIPBOARD
+  
+--- 1842,1849 ----
+  #define VV_OP		52
+  #define VV_SEARCHFORWARD 53
+  #define VV_OLDFILES	54
+! #define VV_WINDOWID	55
+! #define VV_LEN		56	/* number of v: vars */
+  
+  #ifdef FEAT_CLIPBOARD
+  
+*** ../vim-7.3.030/src/os_unix.c	2010-10-13 16:22:05.000000000 +0200
+--- src/os_unix.c	2010-10-20 19:15:46.000000000 +0200
+***************
+*** 1738,1743 ****
+--- 1738,1748 ----
+      }
+      if (x11_window == 0 || x11_display == NULL)
+  	return (result = FAIL);
++ 
++ # ifdef FEAT_EVAL
++     set_vim_var_nr(VV_WINDOWID, (long)x11_window);
++ # endif
++ 
+      return (result = OK);
+  }
+  
+*** ../vim-7.3.030/src/version.c	2010-10-20 17:44:01.000000000 +0200
+--- src/version.c	2010-10-20 19:11:31.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     31,
+  /**/
+
+-- 
+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.3.032 b/source/ap/vim/patches/7.3.032
new file mode 100644
index 00000000..74647989
--- /dev/null
+++ b/source/ap/vim/patches/7.3.032
@@ -0,0 +1,704 @@
+To: vim-dev@vim.org
+Subject: Patch 7.3.032
+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.3.032
+Problem:    maparg() doesn't return the flags, such as <buffer>, <script>,
+	    <silent>.  These are needed to save and restore a mapping.
+Solution:   Improve maparg(). (also by Christian Brabandt)
+Files:	    runtime/doc/eval.txt, src/eval.c, src/getchar.c, src/gui_w48.c, src/message.c, src/proto/getchar.pro, src/proto/message.pro, src/structs.h src/testdir/test75.in, src/testdir/test75.ok
+
+
+*** ../vim-7.3.031/runtime/doc/eval.txt	2010-10-20 19:17:43.000000000 +0200
+--- runtime/doc/eval.txt	2010-10-20 19:44:41.000000000 +0200
+***************
+*** 1827,1833 ****
+  log( {expr})			Float	natural logarithm (base e) of {expr}
+  log10( {expr})			Float	logarithm of Float {expr} to base 10
+  map( {expr}, {string})		List/Dict  change each item in {expr} to {expr}
+! maparg( {name}[, {mode} [, {abbr}]])
+  				String	rhs of mapping {name} in mode {mode}
+  mapcheck( {name}[, {mode} [, {abbr}]])
+  				String	check for mappings matching {name}
+--- 1827,1833 ----
+  log( {expr})			Float	natural logarithm (base e) of {expr}
+  log10( {expr})			Float	logarithm of Float {expr} to base 10
+  map( {expr}, {string})		List/Dict  change each item in {expr} to {expr}
+! maparg( {name}[, {mode} [, {abbr} [, {dict}]]])
+  				String	rhs of mapping {name} in mode {mode}
+  mapcheck( {name}[, {mode} [, {abbr}]])
+  				String	check for mappings matching {name}
+***************
+*** 3971,3993 ****
+  		further items in {expr} are processed.
+  
+  
+! maparg({name}[, {mode} [, {abbr}]])			*maparg()*
+! 		Return the rhs of mapping {name} in mode {mode}.  When there
+! 		is no mapping for {name}, an empty String is returned.
+  		{mode} can be one of these strings:
+  			"n"	Normal
+! 			"v"	Visual
+  			"o"	Operator-pending
+  			"i"	Insert
+  			"c"	Cmd-line
+  			"l"	langmap |language-mapping|
+  			""	Normal, Visual and Operator-pending
+  		When {mode} is omitted, the modes for "" are used.
+  		When {abbr} is there and it is non-zero use abbreviations
+  		instead of mappings.
+! 		The {name} can have special key names, like in the ":map"
+! 		command.  The returned String has special characters
+! 		translated like in the output of the ":map" command listing.
+  		The mappings local to the current buffer are checked first,
+  		then the global mappings.
+  		This function can be used to map a key even when it's already
+--- 3972,4022 ----
+  		further items in {expr} are processed.
+  
+  
+! maparg({name}[, {mode} [, {abbr} [, {dict}]]])			*maparg()*
+! 		When {dict} is omitted or zero: Return the rhs of mapping
+! 		{name} in mode {mode}.  The returned String has special
+! 		characters translated like in the output of the ":map" command
+! 		listing.
+! 		
+! 		When there is no mapping for {name}, an empty String is
+! 		returned.
+! 
+! 		The {name} can have special key names, like in the ":map"
+! 		command.
+! 
+  		{mode} can be one of these strings:
+  			"n"	Normal
+! 			"v"	Visual (including Select)
+  			"o"	Operator-pending
+  			"i"	Insert
+  			"c"	Cmd-line
++ 			"s"	Select
++ 			"x"	Visual
+  			"l"	langmap |language-mapping|
+  			""	Normal, Visual and Operator-pending
+  		When {mode} is omitted, the modes for "" are used.
++ 
+  		When {abbr} is there and it is non-zero use abbreviations
+  		instead of mappings.
+! 
+! 		When {dict} is there and it is non-zero return a dictionary
+! 		containing all the information of the mapping with the
+! 		following items:
+! 		  "lhs"	     The {lhs} of the mapping.
+! 		  "rhs"	     The {rhs} of the mapping as typed.
+! 		  "silent"   1 for a |:map-silent| mapping, else 0.
+! 		  "noremap"  1 if the {rhs} of the mapping is remappable.
+! 		  "expr"     1 for an expression mapping (|:map-<expr>|).
+! 		  "buffer"   1 for a buffer local mapping (|:map-local|).
+! 		  "mode"     Modes for which the mapping is defined. In
+! 			     addition to the modes mentioned above, these
+! 			     characters will be used:
+! 			     " "     Normal, Visual and Operator-pending
+! 			     "!"     Insert and Commandline mode
+! 				     (|mapmpde-ic|)
+! 		  "sid"	     the Script local ID, used for <sid> mappings
+! 			     (|<SID>|)
+! 
+  		The mappings local to the current buffer are checked first,
+  		then the global mappings.
+  		This function can be used to map a key even when it's already
+*** ../vim-7.3.031/src/eval.c	2010-10-20 19:17:43.000000000 +0200
+--- src/eval.c	2010-10-20 21:15:55.000000000 +0200
+***************
+*** 7804,7810 ****
+      {"log10",		1, 1, f_log10},
+  #endif
+      {"map",		2, 2, f_map},
+!     {"maparg",		1, 3, f_maparg},
+      {"mapcheck",	1, 3, f_mapcheck},
+      {"match",		2, 4, f_match},
+      {"matchadd",	2, 4, f_matchadd},
+--- 7804,7810 ----
+      {"log10",		1, 1, f_log10},
+  #endif
+      {"map",		2, 2, f_map},
+!     {"maparg",		1, 4, f_maparg},
+      {"mapcheck",	1, 3, f_mapcheck},
+      {"match",		2, 4, f_match},
+      {"matchadd",	2, 4, f_matchadd},
+***************
+*** 13292,13299 ****
+      char_u	*keys_buf = NULL;
+      char_u	*rhs;
+      int		mode;
+-     garray_T	ga;
+      int		abbr = FALSE;
+  
+      /* return empty string for failure */
+      rettv->v_type = VAR_STRING;
+--- 13292,13301 ----
+      char_u	*keys_buf = NULL;
+      char_u	*rhs;
+      int		mode;
+      int		abbr = FALSE;
++     int         get_dict = FALSE;
++     mapblock_T	*mp;
++     int		buffer_local;
+  
+      /* return empty string for failure */
+      rettv->v_type = VAR_STRING;
+***************
+*** 13307,13313 ****
+--- 13309,13319 ----
+      {
+  	which = get_tv_string_buf_chk(&argvars[1], buf);
+  	if (argvars[2].v_type != VAR_UNKNOWN)
++ 	{
+  	    abbr = get_tv_number(&argvars[2]);
++ 	    if (argvars[3].v_type != VAR_UNKNOWN)
++ 		get_dict = get_tv_number(&argvars[3]);
++ 	}
+      }
+      else
+  	which = (char_u *)"";
+***************
+*** 13317,13335 ****
+      mode = get_map_mode(&which, 0);
+  
+      keys = replace_termcodes(keys, &keys_buf, TRUE, TRUE, FALSE);
+!     rhs = check_map(keys, mode, exact, FALSE, abbr);
+      vim_free(keys_buf);
+-     if (rhs != NULL)
+-     {
+- 	ga_init(&ga);
+- 	ga.ga_itemsize = 1;
+- 	ga.ga_growsize = 40;
+  
+! 	while (*rhs != NUL)
+! 	    ga_concat(&ga, str2special(&rhs, FALSE));
+  
+! 	ga_append(&ga, NUL);
+! 	rettv->vval.v_string = (char_u *)ga.ga_data;
+      }
+  }
+  
+--- 13323,13356 ----
+      mode = get_map_mode(&which, 0);
+  
+      keys = replace_termcodes(keys, &keys_buf, TRUE, TRUE, FALSE);
+!     rhs = check_map(keys, mode, exact, FALSE, abbr, &mp, &buffer_local);
+      vim_free(keys_buf);
+  
+!     if (!get_dict)
+!     {
+! 	/* Return a string. */
+! 	if (rhs != NULL)
+! 	    rettv->vval.v_string = str2special_save(rhs, FALSE);
+! 
+!     }
+!     else if (rettv_dict_alloc(rettv) != FAIL && rhs != NULL)
+!     {
+! 	/* Return a dictionary. */
+! 	char_u	    *lhs = str2special_save(mp->m_keys, TRUE);
+! 	char_u	    *mapmode = map_mode_to_chars(mp->m_mode);
+! 	dict_T	    *dict = rettv->vval.v_dict;
+! 
+! 	dict_add_nr_str(dict, "lhs",	 0L, lhs);
+! 	dict_add_nr_str(dict, "rhs",     0L, mp->m_orig_str);
+! 	dict_add_nr_str(dict, "noremap", mp->m_noremap ? 1L : 0L , NULL);
+! 	dict_add_nr_str(dict, "expr",    mp->m_expr    ? 1L : 0L, NULL);
+! 	dict_add_nr_str(dict, "silent",  mp->m_silent  ? 1L : 0L, NULL);
+! 	dict_add_nr_str(dict, "sid",     (long)mp->m_script_ID, NULL);
+! 	dict_add_nr_str(dict, "buffer",  (long)buffer_local, NULL);
+! 	dict_add_nr_str(dict, "mode",    0L, mapmode);
+  
+! 	vim_free(lhs);
+! 	vim_free(mapmode);
+      }
+  }
+  
+*** ../vim-7.3.031/src/getchar.c	2010-08-15 21:57:25.000000000 +0200
+--- src/getchar.c	2010-10-20 21:16:24.000000000 +0200
+***************
+*** 3168,3173 ****
+--- 3168,3174 ----
+      int		expr = FALSE;
+  #endif
+      int		noremap;
++     char_u      *orig_rhs;
+  
+      keys = arg;
+      map_table = maphash;
+***************
+*** 3266,3271 ****
+--- 3267,3273 ----
+      }
+      if (*p != NUL)
+  	*p++ = NUL;
++ 
+      p = skipwhite(p);
+      rhs = p;
+      hasarg = (*rhs != NUL);
+***************
+*** 3290,3295 ****
+--- 3292,3298 ----
+  	keys = replace_termcodes(keys, &keys_buf, TRUE, TRUE, special);
+      if (hasarg)
+      {
++ 	orig_rhs = rhs;
+  	if (STRICMP(rhs, "<nop>") == 0)	    /* "<Nop>" means nothing */
+  	    rhs = (char_u *)"";
+  	else
+***************
+*** 3298,3304 ****
+  
+  #ifdef FEAT_FKMAP
+      /*
+!      * when in right-to-left mode and alternate keymap option set,
+       * reverse the character flow in the rhs in Farsi.
+       */
+      if (p_altkeymap && curwin->w_p_rl)
+--- 3301,3307 ----
+  
+  #ifdef FEAT_FKMAP
+      /*
+!      * When in right-to-left mode and alternate keymap option set,
+       * reverse the character flow in the rhs in Farsi.
+       */
+      if (p_altkeymap && curwin->w_p_rl)
+***************
+*** 3556,3561 ****
+--- 3559,3566 ----
+  				}
+  				vim_free(mp->m_str);
+  				mp->m_str = newstr;
++ 				vim_free(mp->m_orig_str);
++ 				mp->m_orig_str = vim_strsave(orig_rhs);
+  				mp->m_noremap = noremap;
+  				mp->m_silent = silent;
+  				mp->m_mode = mode;
+***************
+*** 3633,3642 ****
+--- 3638,3649 ----
+  
+      mp->m_keys = vim_strsave(keys);
+      mp->m_str = vim_strsave(rhs);
++     mp->m_orig_str = vim_strsave(orig_rhs);
+      if (mp->m_keys == NULL || mp->m_str == NULL)
+      {
+  	vim_free(mp->m_keys);
+  	vim_free(mp->m_str);
++ 	vim_free(mp->m_orig_str);
+  	vim_free(mp);
+  	retval = 4;	/* no mem */
+  	goto theend;
+***************
+*** 3682,3687 ****
+--- 3689,3695 ----
+      mp = *mpp;
+      vim_free(mp->m_keys);
+      vim_free(mp->m_str);
++     vim_free(mp->m_orig_str);
+      *mpp = mp->m_next;
+      vim_free(mp);
+  }
+***************
+*** 3851,3862 ****
+      }
+  }
+  
+      static void
+  showmap(mp, local)
+      mapblock_T	*mp;
+      int		local;	    /* TRUE for buffer-local map */
+  {
+!     int len = 1;
+  
+      if (msg_didout || msg_silent != 0)
+      {
+--- 3859,3915 ----
+      }
+  }
+  
++ /*
++  * Return characters to represent the map mode in an allocated string.
++  * Returns NULL when out of memory.
++  */
++     char_u *
++ map_mode_to_chars(mode)
++     int mode;
++ {
++     garray_T    mapmode;
++ 
++     ga_init2(&mapmode, 1, 7);
++ 
++     if ((mode & (INSERT + CMDLINE)) == INSERT + CMDLINE)
++ 	ga_append(&mapmode, '!');			/* :map! */
++     else if (mode & INSERT)
++ 	ga_append(&mapmode, 'i');			/* :imap */
++     else if (mode & LANGMAP)
++ 	ga_append(&mapmode, 'l');			/* :lmap */
++     else if (mode & CMDLINE)
++ 	ga_append(&mapmode, 'c');			/* :cmap */
++     else if ((mode & (NORMAL + VISUAL + SELECTMODE + OP_PENDING))
++ 				 == NORMAL + VISUAL + SELECTMODE + OP_PENDING)
++ 	ga_append(&mapmode, ' ');			/* :map */
++     else
++     {
++ 	if (mode & NORMAL)
++ 	    ga_append(&mapmode, 'n');			/* :nmap */
++ 	if (mode & OP_PENDING)
++ 	    ga_append(&mapmode, 'o');			/* :omap */
++ 	if ((mode & (VISUAL + SELECTMODE)) == VISUAL + SELECTMODE)
++ 	    ga_append(&mapmode, 'v');			/* :vmap */
++ 	else
++ 	{
++ 	    if (mode & VISUAL)
++ 		ga_append(&mapmode, 'x');		/* :xmap */
++ 	    if (mode & SELECTMODE)
++ 		ga_append(&mapmode, 's');		/* :smap */
++ 	}
++     }
++ 
++     ga_append(&mapmode, NUL);
++     return (char_u *)mapmode.ga_data;
++ }
++ 
+      static void
+  showmap(mp, local)
+      mapblock_T	*mp;
+      int		local;	    /* TRUE for buffer-local map */
+  {
+!     int		len = 1;
+!     char_u	*mapchars;
+  
+      if (msg_didout || msg_silent != 0)
+      {
+***************
+*** 3864,3912 ****
+  	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)
+! 	msg_putchar('i');			/* :imap */
+!     else if (mp->m_mode & LANGMAP)
+! 	msg_putchar('l');			/* :lmap */
+!     else if (mp->m_mode & CMDLINE)
+! 	msg_putchar('c');			/* :cmap */
+!     else if ((mp->m_mode & (NORMAL + VISUAL + SELECTMODE + OP_PENDING))
+! 				 == NORMAL + VISUAL + SELECTMODE + OP_PENDING)
+! 	msg_putchar(' ');			/* :map */
+!     else
+      {
+! 	len = 0;
+! 	if (mp->m_mode & NORMAL)
+! 	{
+! 	    msg_putchar('n');		/* :nmap */
+! 	    ++len;
+! 	}
+! 	if (mp->m_mode & OP_PENDING)
+! 	{
+! 	    msg_putchar('o');		/* :omap */
+! 	    ++len;
+! 	}
+! 	if ((mp->m_mode & (VISUAL + SELECTMODE)) == VISUAL + SELECTMODE)
+! 	{
+! 	    msg_putchar('v');		/* :vmap */
+! 	    ++len;
+! 	}
+! 	else
+! 	{
+! 	    if (mp->m_mode & VISUAL)
+! 	    {
+! 		msg_putchar('x');		/* :xmap */
+! 		++len;
+! 	    }
+! 	    if (mp->m_mode & SELECTMODE)
+! 	    {
+! 		msg_putchar('s');		/* :smap */
+! 		++len;
+! 	    }
+! 	}
+      }
+      while (++len <= 3)
+  	msg_putchar(' ');
+  
+--- 3917,3931 ----
+  	if (got_int)	    /* 'q' typed at MORE prompt */
+  	    return;
+      }
+! 
+!     mapchars = map_mode_to_chars(mp->m_mode);
+!     if (mapchars != NULL)
+      {
+! 	msg_puts(mapchars);
+! 	len = STRLEN(mapchars);
+! 	vim_free(mapchars);
+      }
++ 
+      while (++len <= 3)
+  	msg_putchar(' ');
+  
+***************
+*** 3931,3938 ****
+  	msg_putchar(' ');
+  
+      /* Use FALSE below if we only want things like <Up> to show up as such on
+!      * the rhs, and not M-x etc, TRUE gets both -- webb
+!      */
+      if (*mp->m_str == NUL)
+  	msg_puts_attr((char_u *)"<Nop>", hl_attr(HLF_8));
+      else
+--- 3950,3956 ----
+  	msg_putchar(' ');
+  
+      /* Use FALSE below if we only want things like <Up> to show up as such on
+!      * the rhs, and not M-x etc, TRUE gets both -- webb */
+      if (*mp->m_str == NUL)
+  	msg_puts_attr((char_u *)"<Nop>", hl_attr(HLF_8));
+      else
+***************
+*** 4995,5013 ****
+      sourcing_name = save_name;
+  }
+  
+! #ifdef FEAT_EVAL
+  /*
+!  * Check the string "keys" against the lhs of all mappings
+!  * Return pointer to rhs of mapping (mapblock->m_str)
+!  * NULL otherwise
+   */
+      char_u *
+! check_map(keys, mode, exact, ign_mod, abbr)
+      char_u	*keys;
+      int		mode;
+      int		exact;		/* require exact match */
+      int		ign_mod;	/* ignore preceding modifier */
+      int		abbr;		/* do abbreviations */
+  {
+      int		hash;
+      int		len, minlen;
+--- 5013,5033 ----
+      sourcing_name = save_name;
+  }
+  
+! #if defined(FEAT_EVAL) || defined(PROTO)
+  /*
+!  * Check the string "keys" against the lhs of all mappings.
+!  * Return pointer to rhs of mapping (mapblock->m_str).
+!  * NULL when no mapping found.
+   */
+      char_u *
+! check_map(keys, mode, exact, ign_mod, abbr, mp_ptr, local_ptr)
+      char_u	*keys;
+      int		mode;
+      int		exact;		/* require exact match */
+      int		ign_mod;	/* ignore preceding modifier */
+      int		abbr;		/* do abbreviations */
++     mapblock_T	**mp_ptr;	/* return: pointer to mapblock or NULL */
++     int		*local_ptr;	/* return: buffer-local mapping or NULL */
+  {
+      int		hash;
+      int		len, minlen;
+***************
+*** 5062,5068 ****
+--- 5082,5094 ----
+  			    minlen = mp->m_keylen - 3;
+  		    }
+  		    if (STRNCMP(s, keys, minlen) == 0)
++ 		    {
++ 			if (mp_ptr != NULL)
++ 			    *mp_ptr = mp;
++ 			if (local_ptr != NULL)
++ 			    *local_ptr = local;
+  			return mp->m_str;
++ 		    }
+  		}
+  	    }
+  	}
+*** ../vim-7.3.031/src/gui_w48.c	2010-08-15 21:57:29.000000000 +0200
+--- src/gui_w48.c	2010-10-20 20:29:20.000000000 +0200
+***************
+*** 1810,1816 ****
+  		 * mapped we want to use the mapping instead. */
+  		if (vk == VK_F10
+  			&& gui.menu_is_active
+! 			&& check_map(k10, State, FALSE, TRUE, FALSE) == NULL)
+  		    break;
+  #endif
+  		if (GetKeyState(VK_SHIFT) & 0x8000)
+--- 1810,1817 ----
+  		 * mapped we want to use the mapping instead. */
+  		if (vk == VK_F10
+  			&& gui.menu_is_active
+! 			&& check_map(k10, State, FALSE, TRUE, FALSE,
+! 							  NULL, NULL) == NULL)
+  		    break;
+  #endif
+  		if (GetKeyState(VK_SHIFT) & 0x8000)
+***************
+*** 1924,1930 ****
+      /* Check for <F10>: Default effect is to select the menu.  When <F10> is
+       * mapped we need to stop it here to avoid strange effects (e.g., for the
+       * key-up event) */
+!     if (vk != VK_F10 || check_map(k10, State, FALSE, TRUE, FALSE) == NULL)
+  #endif
+  	DispatchMessage(&msg);
+  }
+--- 1925,1932 ----
+      /* Check for <F10>: Default effect is to select the menu.  When <F10> is
+       * mapped we need to stop it here to avoid strange effects (e.g., for the
+       * key-up event) */
+!     if (vk != VK_F10 || check_map(k10, State, FALSE, TRUE, FALSE,
+! 							  NULL, NULL) == NULL)
+  #endif
+  	DispatchMessage(&msg);
+  }
+*** ../vim-7.3.031/src/message.c	2010-08-15 21:57:29.000000000 +0200
+--- src/message.c	2010-10-20 20:31:33.000000000 +0200
+***************
+*** 1477,1482 ****
+--- 1477,1503 ----
+      return retval;
+  }
+  
++ #if defined(FEAT_EVAL) || defined(PROTO)
++ /*
++  * Return the lhs or rhs of a mapping, with the key codes turned into printable
++  * strings, in an allocated string.
++  */
++     char_u *
++ str2special_save(str, is_lhs)
++     char_u  *str;
++     int	    is_lhs;  /* TRUE for lhs, FALSE for rhs */
++ {
++     garray_T	ga;
++     char_u	*p = str;
++ 
++     ga_init2(&ga, 1, 40);
++     while (*p != NUL)
++ 	ga_concat(&ga, str2special(&p, is_lhs));
++     ga_append(&ga, NUL);
++     return (char_u *)ga.ga_data;
++ }
++ #endif
++ 
+  /*
+   * Return the printable string for the key codes at "*sp".
+   * Used for translating the lhs or rhs of a mapping to printable chars.
+*** ../vim-7.3.031/src/proto/getchar.pro	2010-08-15 21:57:28.000000000 +0200
+--- src/proto/getchar.pro	2010-10-20 21:06:01.000000000 +0200
+***************
+*** 51,56 ****
+--- 51,57 ----
+  int get_map_mode __ARGS((char_u **cmdp, int forceit));
+  void map_clear __ARGS((char_u *cmdp, char_u *arg, int forceit, int abbr));
+  void map_clear_int __ARGS((buf_T *buf, int mode, int local, int abbr));
++ char_u *map_mode_to_chars __ARGS((int mode));
+  int map_to_exists __ARGS((char_u *str, char_u *modechars, int abbr));
+  int map_to_exists_mode __ARGS((char_u *rhs, int mode, int abbr));
+  char_u *set_context_in_map_cmd __ARGS((expand_T *xp, char_u *cmd, char_u *arg, int forceit, int isabbrev, int isunmap, cmdidx_T cmdidx));
+***************
+*** 61,67 ****
+  int makemap __ARGS((FILE *fd, buf_T *buf));
+  int put_escstr __ARGS((FILE *fd, char_u *strstart, int what));
+  void check_map_keycodes __ARGS((void));
+! char_u *check_map __ARGS((char_u *keys, int mode, int exact, int ign_mod, int abbr));
+  void init_mappings __ARGS((void));
+  void add_map __ARGS((char_u *map, int mode));
+  /* vim: set ft=c : */
+--- 62,68 ----
+  int makemap __ARGS((FILE *fd, buf_T *buf));
+  int put_escstr __ARGS((FILE *fd, char_u *strstart, int what));
+  void check_map_keycodes __ARGS((void));
+! char_u *check_map __ARGS((char_u *keys, int mode, int exact, int ign_mod, int abbr, mapblock_T **mp_ptr, int *local_ptr));
+  void init_mappings __ARGS((void));
+  void add_map __ARGS((char_u *map, int mode));
+  /* vim: set ft=c : */
+*** ../vim-7.3.031/src/proto/message.pro	2010-08-15 21:57:28.000000000 +0200
+--- src/proto/message.pro	2010-10-20 20:31:25.000000000 +0200
+***************
+*** 33,38 ****
+--- 33,39 ----
+  int msg_outtrans_len_attr __ARGS((char_u *msgstr, int len, int attr));
+  void msg_make __ARGS((char_u *arg));
+  int msg_outtrans_special __ARGS((char_u *strstart, int from));
++ char_u *str2special_save __ARGS((char_u *str, int is_lhs));
+  char_u *str2special __ARGS((char_u **sp, int from));
+  void str2specialbuf __ARGS((char_u *sp, char_u *buf, int len));
+  void msg_prt_line __ARGS((char_u *s, int list));
+*** ../vim-7.3.031/src/structs.h	2010-08-15 21:57:28.000000000 +0200
+--- src/structs.h	2010-10-20 20:23:38.000000000 +0200
+***************
+*** 979,987 ****
+  struct mapblock
+  {
+      mapblock_T	*m_next;	/* next mapblock in list */
+!     char_u	*m_keys;	/* mapped from */
+      int		m_keylen;	/* strlen(m_keys) */
+!     char_u	*m_str;		/* mapped to */
+      int		m_mode;		/* valid mode */
+      int		m_noremap;	/* if non-zero no re-mapping for m_str */
+      char	m_silent;	/* <silent> used, don't echo commands */
+--- 979,988 ----
+  struct mapblock
+  {
+      mapblock_T	*m_next;	/* next mapblock in list */
+!     char_u	*m_keys;	/* mapped from, lhs */
+      int		m_keylen;	/* strlen(m_keys) */
+!     char_u	*m_str;		/* mapped to, rhs */
+!     char_u	*m_orig_str;	/* rhs as entered by the user */
+      int		m_mode;		/* valid mode */
+      int		m_noremap;	/* if non-zero no re-mapping for m_str */
+      char	m_silent;	/* <silent> used, don't echo commands */
+*** ../vim-7.3.031/src/testdir/test75.in	2010-10-20 21:13:30.000000000 +0200
+--- src/testdir/test75.in	2010-10-20 20:54:04.000000000 +0200
+***************
+*** 0 ****
+--- 1,16 ----
++ " Tests for functions.
++ 
++ STARTTEST
++ :so small.vim
++ :" Test maparg() with a string result
++ :map foo<C-V> is<F4>foo
++ :vnoremap <script> <buffer> <expr> <silent> bar isbar
++ :call append('$', maparg('foo<C-V>'))
++ :call append('$', string(maparg('foo<C-V>', '', 0, 1)))
++ :call append('$', string(maparg('bar', '', 0, 1)))
++ :"
++ :/^eof/+1,$w! test.out
++ :qa!
++ ENDTEST
++ 
++ eof
+*** ../vim-7.3.031/src/testdir/test75.ok	2010-10-20 21:13:30.000000000 +0200
+--- src/testdir/test75.ok	2010-10-20 20:54:08.000000000 +0200
+***************
+*** 0 ****
+--- 1,3 ----
++ is<F4>foo
++ {'silent': 0, 'noremap': 0, 'lhs': 'foo<C-V>', 'mode': ' ', 'expr': 0, 'sid': 0, 'rhs': 'is<F4>foo', 'buffer': 0}
++ {'silent': 1, 'noremap': 1, 'lhs': 'bar', 'mode': 'v', 'expr': 1, 'sid': 0, 'rhs': 'isbar', 'buffer': 1}
+*** ../vim-7.3.031/src/version.c	2010-10-20 19:17:43.000000000 +0200
+--- src/version.c	2010-10-20 21:13:18.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     32,
+  /**/
+
+-- 
+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.3.033 b/source/ap/vim/patches/7.3.033
new file mode 100644
index 00000000..cffbb45d
--- /dev/null
+++ b/source/ap/vim/patches/7.3.033
@@ -0,0 +1,49 @@
+To: vim-dev@vim.org
+Subject: Patch 7.3.033
+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.3.033 (after 7.3.032)
+Problem:    Can't build without FEAT_LOCALMAP.
+Solution:   Add an #ifdef. (John Marriott)
+Files:	    src/getchar.c
+
+
+*** ../vim-7.3.032/src/getchar.c	2010-10-20 21:22:17.000000000 +0200
+--- src/getchar.c	2010-10-22 22:09:40.000000000 +0200
+***************
+*** 5086,5092 ****
+--- 5086,5096 ----
+  			if (mp_ptr != NULL)
+  			    *mp_ptr = mp;
+  			if (local_ptr != NULL)
++ #ifdef FEAT_LOCALMAP
+  			    *local_ptr = local;
++ #else
++ 			    *local_ptr = 0;
++ #endif
+  			return mp->m_str;
+  		    }
+  		}
+*** ../vim-7.3.032/src/version.c	2010-10-20 21:22:17.000000000 +0200
+--- src/version.c	2010-10-22 21:18:30.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     33,
+  /**/
+
+-- 
+Futility Factor: No experiment is ever a complete failure - it can always
+serve as a negative example.
+
+ /// 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.3.034 b/source/ap/vim/patches/7.3.034
new file mode 100644
index 00000000..c81890e1
--- /dev/null
+++ b/source/ap/vim/patches/7.3.034
@@ -0,0 +1,431 @@
+To: vim-dev@vim.org
+Subject: Patch 7.3.034
+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.3.034
+Problem:    Win32: may be loading .dll from the wrong directory.
+Solution:   Go to the Vim executable directory when opening a library.
+Files:	    src/gui_w32.c, src/if_lua.c, src/if_mzsch.c, src/if_perl.xs,
+	    src/if_python.c, src/if_python3.c, src/if_ruby.c, src/mbyte.c,
+	    src/os_mswin.c, src/os_win32.c, src/proto/os_win32.pro
+
+
+*** ../vim-7.3.033/src/gui_w32.c	2010-08-15 21:57:25.000000000 +0200
+--- src/gui_w32.c	2010-10-22 21:49:27.000000000 +0200
+***************
+*** 1260,1266 ****
+  
+      /* try and load the user32.dll library and get the entry points for
+       * multi-monitor-support. */
+!     if ((user32_lib = LoadLibrary("User32.dll")) != NULL)
+      {
+  	pMonitorFromWindow = (TMonitorFromWindow)GetProcAddress(user32_lib,
+  							 "MonitorFromWindow");
+--- 1260,1266 ----
+  
+      /* try and load the user32.dll library and get the entry points for
+       * multi-monitor-support. */
+!     if ((user32_lib = vimLoadLib("User32.dll")) != NULL)
+      {
+  	pMonitorFromWindow = (TMonitorFromWindow)GetProcAddress(user32_lib,
+  							 "MonitorFromWindow");
+***************
+*** 4188,4194 ****
+      static void
+  dyn_imm_load(void)
+  {
+!     hLibImm = LoadLibrary("imm32.dll");
+      if (hLibImm == NULL)
+  	return;
+  
+--- 4188,4194 ----
+      static void
+  dyn_imm_load(void)
+  {
+!     hLibImm = vimLoadLib("imm32.dll");
+      if (hLibImm == NULL)
+  	return;
+  
+*** ../vim-7.3.033/src/if_lua.c	2010-08-15 21:57:28.000000000 +0200
+--- src/if_lua.c	2010-10-22 21:49:39.000000000 +0200
+***************
+*** 49,55 ****
+  # define symbol_from_dll dlsym
+  # define close_dll dlclose
+  #else
+! # define load_dll LoadLibrary
+  # define symbol_from_dll GetProcAddress
+  # define close_dll FreeLibrary
+  #endif
+--- 49,55 ----
+  # define symbol_from_dll dlsym
+  # define close_dll dlclose
+  #else
+! # define load_dll vimLoadLib
+  # define symbol_from_dll GetProcAddress
+  # define close_dll FreeLibrary
+  #endif
+*** ../vim-7.3.033/src/if_mzsch.c	2010-08-15 21:57:32.000000000 +0200
+--- src/if_mzsch.c	2010-10-22 21:49:53.000000000 +0200
+***************
+*** 556,563 ****
+  
+      if (hMzGC && hMzSch)
+  	return OK;
+!     hMzSch = LoadLibrary(sch_dll);
+!     hMzGC = LoadLibrary(gc_dll);
+  
+      if (!hMzSch)
+      {
+--- 556,563 ----
+  
+      if (hMzGC && hMzSch)
+  	return OK;
+!     hMzSch = vimLoadLib(sch_dll);
+!     hMzGC = vimLoadLib(gc_dll);
+  
+      if (!hMzSch)
+      {
+*** ../vim-7.3.033/src/if_perl.xs	2010-08-15 21:57:30.000000000 +0200
+--- src/if_perl.xs	2010-10-22 21:53:06.000000000 +0200
+***************
+*** 106,112 ****
+  #define close_dll dlclose
+  #else
+  #define PERL_PROC FARPROC
+! #define load_dll LoadLibrary
+  #define symbol_from_dll GetProcAddress
+  #define close_dll FreeLibrary
+  #endif
+--- 106,112 ----
+  #define close_dll dlclose
+  #else
+  #define PERL_PROC FARPROC
+! #define load_dll vimLoadLib
+  #define symbol_from_dll GetProcAddress
+  #define close_dll FreeLibrary
+  #endif
+*** ../vim-7.3.033/src/if_python.c	2010-08-15 21:57:28.000000000 +0200
+--- src/if_python.c	2010-10-22 21:49:57.000000000 +0200
+***************
+*** 110,116 ****
+  #  define close_dll dlclose
+  #  define symbol_from_dll dlsym
+  # else
+! #  define load_dll LoadLibrary
+  #  define close_dll FreeLibrary
+  #  define symbol_from_dll GetProcAddress
+  # endif
+--- 110,116 ----
+  #  define close_dll dlclose
+  #  define symbol_from_dll dlsym
+  # else
+! #  define load_dll vimLoadLib
+  #  define close_dll FreeLibrary
+  #  define symbol_from_dll GetProcAddress
+  # endif
+*** ../vim-7.3.033/src/if_python3.c	2010-08-15 21:57:28.000000000 +0200
+--- src/if_python3.c	2010-10-22 21:50:01.000000000 +0200
+***************
+*** 88,94 ****
+  #  define close_dll dlclose
+  #  define symbol_from_dll dlsym
+  # else
+! #  define load_dll LoadLibrary
+  #  define close_dll FreeLibrary
+  #  define symbol_from_dll GetProcAddress
+  # endif
+--- 88,94 ----
+  #  define close_dll dlclose
+  #  define symbol_from_dll dlsym
+  # else
+! #  define load_dll vimLoadLib
+  #  define close_dll FreeLibrary
+  #  define symbol_from_dll GetProcAddress
+  # endif
+*** ../vim-7.3.033/src/if_ruby.c	2010-09-29 13:02:48.000000000 +0200
+--- src/if_ruby.c	2010-10-22 21:50:04.000000000 +0200
+***************
+*** 55,61 ****
+  # define symbol_from_dll dlsym
+  # define close_dll dlclose
+  #else
+! # define load_dll LoadLibrary
+  # define symbol_from_dll GetProcAddress
+  # define close_dll FreeLibrary
+  #endif
+--- 55,61 ----
+  # define symbol_from_dll dlsym
+  # define close_dll dlclose
+  #else
+! # define load_dll vimLoadLib
+  # define symbol_from_dll GetProcAddress
+  # define close_dll FreeLibrary
+  #endif
+*** ../vim-7.3.033/src/mbyte.c	2010-09-18 13:36:41.000000000 +0200
+--- src/mbyte.c	2010-10-22 21:50:09.000000000 +0200
+***************
+*** 4159,4169 ****
+  {
+      if (hIconvDLL != 0 && hMsvcrtDLL != 0)
+  	return TRUE;
+!     hIconvDLL = LoadLibrary(DYNAMIC_ICONV_DLL);
+      if (hIconvDLL == 0)		/* sometimes it's called libiconv.dll */
+! 	hIconvDLL = LoadLibrary(DYNAMIC_ICONV_DLL_ALT);
+      if (hIconvDLL != 0)
+! 	hMsvcrtDLL = LoadLibrary(DYNAMIC_MSVCRT_DLL);
+      if (hIconvDLL == 0 || hMsvcrtDLL == 0)
+      {
+  	/* Only give the message when 'verbose' is set, otherwise it might be
+--- 4159,4169 ----
+  {
+      if (hIconvDLL != 0 && hMsvcrtDLL != 0)
+  	return TRUE;
+!     hIconvDLL = vimLoadLib(DYNAMIC_ICONV_DLL);
+      if (hIconvDLL == 0)		/* sometimes it's called libiconv.dll */
+! 	hIconvDLL = vimLoadLib(DYNAMIC_ICONV_DLL_ALT);
+      if (hIconvDLL != 0)
+! 	hMsvcrtDLL = vimLoadLib(DYNAMIC_MSVCRT_DLL);
+      if (hIconvDLL == 0 || hMsvcrtDLL == 0)
+      {
+  	/* Only give the message when 'verbose' is set, otherwise it might be
+*** ../vim-7.3.033/src/os_mswin.c	2010-08-15 21:57:29.000000000 +0200
+--- src/os_mswin.c	2010-10-22 22:03:26.000000000 +0200
+***************
+*** 817,823 ****
+--- 817,827 ----
+      BOOL fRunTimeLinkSuccess = FALSE;
+  
+      // Get a handle to the DLL module.
++ # ifdef WIN16
+      hinstLib = LoadLibrary(libname);
++ # else
++     hinstLib = vimLoadLib(libname);
++ # endif
+  
+      // If the handle is valid, try to get the function address.
+      if (hinstLib != NULL)
+*** ../vim-7.3.033/src/os_win32.c	2010-10-13 20:37:37.000000000 +0200
+--- src/os_win32.c	2010-10-23 13:16:55.000000000 +0200
+***************
+*** 206,247 ****
+  static int suppress_winsize = 1;	/* don't fiddle with console */
+  #endif
+  
+      static void
+  get_exe_name(void)
+  {
+!     char	temp[256];
+!     static int	did_set_PATH = FALSE;
+  
+      if (exe_name == NULL)
+      {
+  	/* store the name of the executable, may be used for $VIM */
+! 	GetModuleFileName(NULL, temp, 255);
+  	if (*temp != NUL)
+  	    exe_name = FullName_save((char_u *)temp, FALSE);
+      }
+  
+!     if (!did_set_PATH && exe_name != NULL)
+      {
+! 	char_u	    *p;
+! 	char_u	    *newpath;
+! 
+! 	/* Append our starting directory to $PATH, so that when doing "!xxd"
+! 	 * it's found in our starting directory.  Needed because SearchPath()
+! 	 * also looks there. */
+! 	p = mch_getenv("PATH");
+! 	newpath = alloc((unsigned)(STRLEN(p) + STRLEN(exe_name) + 2));
+! 	if (newpath != NULL)
+! 	{
+! 	    STRCPY(newpath, p);
+! 	    STRCAT(newpath, ";");
+! 	    vim_strncpy(newpath + STRLEN(newpath), exe_name,
+! 					    gettail_sep(exe_name) - exe_name);
+! 	    vim_setenv((char_u *)"PATH", newpath);
+! 	    vim_free(newpath);
+  	}
+  
+! 	did_set_PATH = TRUE;
+      }
+  }
+  
+  #if defined(DYNAMIC_GETTEXT) || defined(PROTO)
+--- 206,268 ----
+  static int suppress_winsize = 1;	/* don't fiddle with console */
+  #endif
+  
++ static char_u *exe_path = NULL;
++ 
+      static void
+  get_exe_name(void)
+  {
+!     char	temp[MAXPATHL];
+!     char_u	*p;
+  
+      if (exe_name == NULL)
+      {
+  	/* store the name of the executable, may be used for $VIM */
+! 	GetModuleFileName(NULL, temp, MAXPATHL - 1);
+  	if (*temp != NUL)
+  	    exe_name = FullName_save((char_u *)temp, FALSE);
+      }
+  
+!     if (exe_path == NULL && exe_name != NULL)
+      {
+! 	exe_path = vim_strnsave(exe_name, gettail_sep(exe_name) - exe_name);
+! 	if (exe_path != NULL)
+! 	{
+! 	    /* Append our starting directory to $PATH, so that when doing
+! 	     * "!xxd" it's found in our starting directory.  Needed because
+! 	     * SearchPath() also looks there. */
+! 	    p = mch_getenv("PATH");
+! 	    if (STRLEN(p) + STRLEN(exe_path) + 2 < MAXPATHL);
+! 	    {
+! 		STRCPY(temp, p);
+! 		STRCAT(temp, ";");
+! 		STRCAT(temp, exe_path);
+! 		vim_setenv((char_u *)"PATH", temp);
+! 	    }
+  	}
++     }
++ }
++ 
++ /*
++  * Load library "name".
++  */
++     HINSTANCE
++ vimLoadLib(char *name)
++ {
++     HINSTANCE dll = NULL;
++     char old_dir[MAXPATHL];
+  
+!     if (exe_path == NULL)
+! 	get_exe_name();
+!     if (exe_path != NULL && mch_dirname(old_dir, MAXPATHL) == OK)
+!     {
+! 	/* Change directory to where the executable is, both to make sure we
+! 	 * find a .dll there and to avoid looking for a .dll in the current
+! 	 * directory. */
+! 	mch_chdir(exe_path);
+! 	dll = LoadLibrary(name);
+! 	mch_chdir(old_dir);
+      }
++     return dll;
+  }
+  
+  #if defined(DYNAMIC_GETTEXT) || defined(PROTO)
+***************
+*** 254,260 ****
+  static char *null_libintl_bindtextdomain(const char *, const char *);
+  static char *null_libintl_bind_textdomain_codeset(const char *, const char *);
+  
+! static HINSTANCE hLibintlDLL = 0;
+  char *(*dyn_libintl_gettext)(const char *) = null_libintl_gettext;
+  char *(*dyn_libintl_textdomain)(const char *) = null_libintl_textdomain;
+  char *(*dyn_libintl_bindtextdomain)(const char *, const char *)
+--- 275,281 ----
+  static char *null_libintl_bindtextdomain(const char *, const char *);
+  static char *null_libintl_bind_textdomain_codeset(const char *, const char *);
+  
+! static HINSTANCE hLibintlDLL = NULL;
+  char *(*dyn_libintl_gettext)(const char *) = null_libintl_gettext;
+  char *(*dyn_libintl_textdomain)(const char *) = null_libintl_textdomain;
+  char *(*dyn_libintl_bindtextdomain)(const char *, const char *)
+***************
+*** 282,307 ****
+      if (hLibintlDLL)
+  	return 1;
+      /* Load gettext library (libintl.dll) */
+!     hLibintlDLL = LoadLibrary(libname != NULL ? libname : GETTEXT_DLL);
+      if (!hLibintlDLL)
+      {
+! 	char_u	    dirname[_MAX_PATH];
+! 
+! 	/* Try using the path from gvim.exe to find the .dll there. */
+! 	get_exe_name();
+! 	STRCPY(dirname, exe_name);
+! 	STRCPY(gettail(dirname), GETTEXT_DLL);
+! 	hLibintlDLL = LoadLibrary((char *)dirname);
+! 	if (!hLibintlDLL)
+  	{
+! 	    if (p_verbose > 0)
+! 	    {
+! 		verbose_enter();
+! 		EMSG2(_(e_loadlib), GETTEXT_DLL);
+! 		verbose_leave();
+! 	    }
+! 	    return 0;
+  	}
+      }
+      for (i = 0; libintl_entry[i].name != NULL
+  					 && libintl_entry[i].ptr != NULL; ++i)
+--- 303,318 ----
+      if (hLibintlDLL)
+  	return 1;
+      /* Load gettext library (libintl.dll) */
+!     hLibintlDLL = vimLoadLib(libname != NULL ? libname : GETTEXT_DLL);
+      if (!hLibintlDLL)
+      {
+! 	if (p_verbose > 0)
+  	{
+! 	    verbose_enter();
+! 	    EMSG2(_(e_loadlib), GETTEXT_DLL);
+! 	    verbose_leave();
+  	}
++ 	return 0;
+      }
+      for (i = 0; libintl_entry[i].name != NULL
+  					 && libintl_entry[i].ptr != NULL; ++i)
+***************
+*** 430,436 ****
+  	     * Seems like a lot of overhead to load/unload ADVAPI32.DLL each
+  	     * time we verify security...
+  	     */
+! 	    advapi_lib = LoadLibrary("ADVAPI32.DLL");
+  	    if (advapi_lib != NULL)
+  	    {
+  		pSetNamedSecurityInfo = (PSNSECINFO)GetProcAddress(advapi_lib,
+--- 441,447 ----
+  	     * Seems like a lot of overhead to load/unload ADVAPI32.DLL each
+  	     * time we verify security...
+  	     */
+! 	    advapi_lib = vimLoadLib("ADVAPI32.DLL");
+  	    if (advapi_lib != NULL)
+  	    {
+  		pSetNamedSecurityInfo = (PSNSECINFO)GetProcAddress(advapi_lib,
+*** ../vim-7.3.033/src/proto/os_win32.pro	2010-08-15 21:57:28.000000000 +0200
+--- src/proto/os_win32.pro	2010-10-22 22:05:35.000000000 +0200
+***************
+*** 1,4 ****
+--- 1,5 ----
+  /* os_win32.c */
++ HINSTANCE vimLoadLib __ARGS((char *name));
+  int dyn_libintl_init __ARGS((char *libname));
+  void dyn_libintl_end __ARGS((void));
+  void PlatformId __ARGS((void));
+*** ../vim-7.3.033/src/version.c	2010-10-22 22:13:47.000000000 +0200
+--- src/version.c	2010-10-23 13:55:21.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     34,
+  /**/
+
+-- 
+This is the polymorph virus!  Follow these instructions carefully:
+1. Send this message to everybody you know.
+2. Format your harddisk.
+Thank you for your cooperation in spreading the most powerful virus ever!
+
+ /// 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.3.035 b/source/ap/vim/patches/7.3.035
new file mode 100644
index 00000000..00f0cc54
--- /dev/null
+++ b/source/ap/vim/patches/7.3.035
@@ -0,0 +1,58 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.035
+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.3.035 (after 7.3.034)
+Problem:    Stray semicolon after if statement. (Hari G)
+Solution:   Remove the semicolon.
+Files:	    src/os_win32.c
+
+
+*** ../vim-7.3.034/src/os_win32.c	2010-10-23 14:02:48.000000000 +0200
+--- src/os_win32.c	2010-10-24 14:31:04.000000000 +0200
+***************
+*** 231,237 ****
+  	     * "!xxd" it's found in our starting directory.  Needed because
+  	     * SearchPath() also looks there. */
+  	    p = mch_getenv("PATH");
+! 	    if (STRLEN(p) + STRLEN(exe_path) + 2 < MAXPATHL);
+  	    {
+  		STRCPY(temp, p);
+  		STRCAT(temp, ";");
+--- 231,237 ----
+  	     * "!xxd" it's found in our starting directory.  Needed because
+  	     * SearchPath() also looks there. */
+  	    p = mch_getenv("PATH");
+! 	    if (STRLEN(p) + STRLEN(exe_path) + 2 < MAXPATHL)
+  	    {
+  		STRCPY(temp, p);
+  		STRCAT(temp, ";");
+*** ../vim-7.3.034/src/version.c	2010-10-23 14:02:48.000000000 +0200
+--- src/version.c	2010-10-24 14:32:04.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     35,
+  /**/
+
+-- 
+    [clop clop]
+ARTHUR:  Old woman!
+DENNIS:  Man!
+ARTHUR:  Man, sorry.  What knight lives in that castle over there?
+DENNIS:  I'm thirty seven.
+ARTHUR:  What?
+DENNIS:  I'm thirty seven -- I'm not old!
+                                  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.3.036 b/source/ap/vim/patches/7.3.036
new file mode 100644
index 00000000..21ab47a1
--- /dev/null
+++ b/source/ap/vim/patches/7.3.036
@@ -0,0 +1,68 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.036
+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.3.036
+Problem:    Win32 GUI: When building without menus, the font for dialogs and
+	    tab page headers also changes.
+Solution:   Define USE_SYSMENU_FONT always. (Harig G.)
+Files:	    src/gui_w32.c
+
+
+*** ../vim-7.3.035/src/gui_w32.c	2010-10-23 14:02:48.000000000 +0200
+--- src/gui_w32.c	2010-10-25 20:29:15.000000000 +0200
+***************
+*** 289,301 ****
+  
+  #ifdef FEAT_MENU
+  static UINT	s_menu_id = 100;
+  
+  /*
+   * Use the system font for dialogs and tear-off menus.  Remove this line to
+   * use DLG_FONT_NAME.
+   */
+! # define USE_SYSMENU_FONT
+! #endif
+  
+  #define VIM_NAME	"vim"
+  #define VIM_CLASS	"Vim"
+--- 289,301 ----
+  
+  #ifdef FEAT_MENU
+  static UINT	s_menu_id = 100;
++ #endif
+  
+  /*
+   * Use the system font for dialogs and tear-off menus.  Remove this line to
+   * use DLG_FONT_NAME.
+   */
+! #define USE_SYSMENU_FONT
+  
+  #define VIM_NAME	"vim"
+  #define VIM_CLASS	"Vim"
+*** ../vim-7.3.035/src/version.c	2010-10-24 14:33:38.000000000 +0200
+--- src/version.c	2010-10-27 12:14:39.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     36,
+  /**/
+
+-- 
+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.3.037 b/source/ap/vim/patches/7.3.037
new file mode 100644
index 00000000..488934ef
--- /dev/null
+++ b/source/ap/vim/patches/7.3.037
@@ -0,0 +1,137 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.037
+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.3.037
+Problem:    Compiler warnings for loss of data. (Mike Williams)
+Solution:   Add type casts.
+Files:	    src/if_py_both.h, src/getchar.c, src/os_win32.c
+
+
+*** ../vim-7.3.036/src/if_py_both.h	2010-09-21 16:49:29.000000000 +0200
+--- src/if_py_both.h	2010-10-25 20:37:07.000000000 +0200
+***************
+*** 154,160 ****
+      {
+  	PyInt len = ptr - str;
+  
+! 	if (ga_grow(&io_ga, len + 1) == FAIL)
+  	    break;
+  
+  	mch_memmove(((char *)io_ga.ga_data) + io_ga.ga_len, str, (size_t)len);
+--- 154,160 ----
+      {
+  	PyInt len = ptr - str;
+  
+! 	if (ga_grow(&io_ga, (int)(len + 1)) == FAIL)
+  	    break;
+  
+  	mch_memmove(((char *)io_ga.ga_data) + io_ga.ga_len, str, (size_t)len);
+***************
+*** 166,175 ****
+      }
+  
+      /* Put the remaining text into io_ga for later printing. */
+!     if (n > 0 && ga_grow(&io_ga, n + 1) == OK)
+      {
+  	mch_memmove(((char *)io_ga.ga_data) + io_ga.ga_len, str, (size_t)n);
+! 	io_ga.ga_len += n;
+      }
+  }
+  
+--- 166,175 ----
+      }
+  
+      /* Put the remaining text into io_ga for later printing. */
+!     if (n > 0 && ga_grow(&io_ga, (int)(n + 1)) == OK)
+      {
+  	mch_memmove(((char *)io_ga.ga_data) + io_ga.ga_len, str, (size_t)n);
+! 	io_ga.ga_len += (int)n;
+      }
+  }
+  
+*** ../vim-7.3.036/src/getchar.c	2010-10-22 22:13:47.000000000 +0200
+--- src/getchar.c	2010-10-25 20:39:31.000000000 +0200
+***************
+*** 3922,3928 ****
+      if (mapchars != NULL)
+      {
+  	msg_puts(mapchars);
+! 	len = STRLEN(mapchars);
+  	vim_free(mapchars);
+      }
+  
+--- 3922,3928 ----
+      if (mapchars != NULL)
+      {
+  	msg_puts(mapchars);
+! 	len = (int)STRLEN(mapchars);
+  	vim_free(mapchars);
+      }
+  
+*** ../vim-7.3.036/src/os_win32.c	2010-10-24 14:33:38.000000000 +0200
+--- src/os_win32.c	2010-10-25 20:38:49.000000000 +0200
+***************
+*** 224,230 ****
+  
+      if (exe_path == NULL && exe_name != NULL)
+      {
+! 	exe_path = vim_strnsave(exe_name, gettail_sep(exe_name) - exe_name);
+  	if (exe_path != NULL)
+  	{
+  	    /* Append our starting directory to $PATH, so that when doing
+--- 224,231 ----
+  
+      if (exe_path == NULL && exe_name != NULL)
+      {
+! 	exe_path = vim_strnsave(exe_name,
+! 				     (int)(gettail_sep(exe_name) - exe_name));
+  	if (exe_path != NULL)
+  	{
+  	    /* Append our starting directory to $PATH, so that when doing
+***************
+*** 2374,2380 ****
+  	/* To avoid a slow failure append "\*" when searching a directory,
+  	 * server or network share. */
+  	STRCPY(szTrueNameTemp, szTrueName);
+! 	slen = strlen(szTrueNameTemp);
+  	if (*porig == psepc && slen + 2 < _MAX_PATH)
+  	    STRCPY(szTrueNameTemp + slen, "\\*");
+  
+--- 2375,2381 ----
+  	/* To avoid a slow failure append "\*" when searching a directory,
+  	 * server or network share. */
+  	STRCPY(szTrueNameTemp, szTrueName);
+! 	slen = (int)strlen(szTrueNameTemp);
+  	if (*porig == psepc && slen + 2 < _MAX_PATH)
+  	    STRCPY(szTrueNameTemp + slen, "\\*");
+  
+*** ../vim-7.3.036/src/version.c	2010-10-27 12:15:28.000000000 +0200
+--- src/version.c	2010-10-27 12:16:53.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     37,
+  /**/
+
+-- 
+ARTHUR:  You fight with the strength of many men, Sir knight.
+         I am Arthur, King of the Britons.  [pause]
+         I seek the finest and the bravest knights in the land to join me
+         in my Court of Camelot.  [pause]
+         You have proved yourself worthy; will you join me?  [pause]
+         You make me sad.  So be it.  Come, Patsy.
+BLACK KNIGHT:  None shall pass.
+                                  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.3.038 b/source/ap/vim/patches/7.3.038
new file mode 100644
index 00000000..cea2cf9e
--- /dev/null
+++ b/source/ap/vim/patches/7.3.038
@@ -0,0 +1,76 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.038
+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.3.038
+Problem:    v:windowid isn't set on MS-Windows.
+Solution:   Set it to the window handle. (Chris Sutcliffe)
+Files:	    runtime/doc/eval.txt, src/gui_w32.c
+
+
+*** ../vim-7.3.037/runtime/doc/eval.txt	2010-10-20 21:22:17.000000000 +0200
+--- runtime/doc/eval.txt	2010-10-27 12:23:37.000000000 +0200
+***************
+*** 1660,1666 ****
+  					*v:windowid* *windowid-variable*
+  v:windowid	When any X11 based GUI is running or when running in a
+  		terminal and Vim connects to the X server (|-X|) this will be
+! 		set to the window ID.  Otherwise the value is zero.
+  
+  ==============================================================================
+  4. Builtin Functions					*functions*
+--- 1660,1670 ----
+  					*v:windowid* *windowid-variable*
+  v:windowid	When any X11 based GUI is running or when running in a
+  		terminal and Vim connects to the X server (|-X|) this will be
+! 		set to the window ID.
+! 		When an MS-Windows GUI is running this will be set to the
+! 		window handle.
+! 		Otherwise the value is zero.
+! 		Note: for windows inside Vim use |winnr()|.
+  
+  ==============================================================================
+  4. Builtin Functions					*functions*
+*** ../vim-7.3.037/src/gui_w32.c	2010-10-27 12:15:28.000000000 +0200
+--- src/gui_w32.c	2010-10-27 12:21:22.000000000 +0200
+***************
+*** 1573,1578 ****
+--- 1573,1583 ----
+  # endif
+  #endif
+  
++ #ifdef FEAT_EVAL
++     /* set the v:windowid variable */
++     set_vim_var_nr(VV_WINDOWID, (long)s_hwnd);
++ #endif
++ 
+  theend:
+      /* Display any pending error messages */
+      display_errors();
+*** ../vim-7.3.037/src/version.c	2010-10-27 12:17:54.000000000 +0200
+--- src/version.c	2010-10-27 12:24:38.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     38,
+  /**/
+
+-- 
+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.3.039 b/source/ap/vim/patches/7.3.039
new file mode 100644
index 00000000..2414fc7b
--- /dev/null
+++ b/source/ap/vim/patches/7.3.039
@@ -0,0 +1,90 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.039
+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.3.039
+Problem:    Crash when using skk.vim plugin.
+Solution:   Get length of expression evaluation result only after checking for
+	    NULL.  (Noriaki Yagi, Dominique Pelle)
+Files:	    src/ex_getln.c
+
+
+*** ../vim-7.3.038/src/ex_getln.c	2010-09-29 15:50:14.000000000 +0200
+--- src/ex_getln.c	2010-10-27 12:42:00.000000000 +0200
+***************
+*** 688,711 ****
+  		    p = get_expr_line();
+  		    --textlock;
+  		    restore_cmdline(&save_ccline);
+- 		    len = (int)STRLEN(p);
+  
+! 		    if (p != NULL && realloc_cmdbuff(len + 1) == OK)
+  		    {
+! 			ccline.cmdlen = len;
+! 			STRCPY(ccline.cmdbuff, p);
+! 			vim_free(p);
+! 
+! 			/* Restore the cursor or use the position set with
+! 			 * set_cmdline_pos(). */
+! 			if (new_cmdpos > ccline.cmdlen)
+! 			    ccline.cmdpos = ccline.cmdlen;
+! 			else
+! 			    ccline.cmdpos = new_cmdpos;
+! 
+! 			KeyTyped = FALSE;	/* Don't do p_wc completion. */
+! 			redrawcmd();
+! 			goto cmdline_changed;
+  		    }
+  		}
+  		beep_flush();
+--- 688,714 ----
+  		    p = get_expr_line();
+  		    --textlock;
+  		    restore_cmdline(&save_ccline);
+  
+! 		    if (p != NULL)
+  		    {
+! 			len = (int)STRLEN(p);
+! 			if (realloc_cmdbuff(len + 1) == OK)
+! 			{
+! 			    ccline.cmdlen = len;
+! 			    STRCPY(ccline.cmdbuff, p);
+! 			    vim_free(p);
+! 
+! 			    /* Restore the cursor or use the position set with
+! 			     * set_cmdline_pos(). */
+! 			    if (new_cmdpos > ccline.cmdlen)
+! 				ccline.cmdpos = ccline.cmdlen;
+! 			    else
+! 				ccline.cmdpos = new_cmdpos;
+! 
+! 			    KeyTyped = FALSE;	/* Don't do p_wc completion. */
+! 			    redrawcmd();
+! 			    goto cmdline_changed;
+! 			}
+  		    }
+  		}
+  		beep_flush();
+*** ../vim-7.3.038/src/version.c	2010-10-27 12:33:12.000000000 +0200
+--- src/version.c	2010-10-27 12:43:40.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     39,
+  /**/
+
+-- 
+"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.3.040 b/source/ap/vim/patches/7.3.040
new file mode 100644
index 00000000..6174cbd9
--- /dev/null
+++ b/source/ap/vim/patches/7.3.040
@@ -0,0 +1,48 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.040
+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.3.040
+Problem:    Comparing strings while ignoring case goes beyond end of the
+	    string when there are illegal bytes. (Dominique Pelle)
+Solution:   Explicitly check for illegal bytes.
+Files:	    src/mbyte.c
+
+
+*** ../vim-7.3.039/src/mbyte.c	2010-10-23 14:02:48.000000000 +0200
+--- src/mbyte.c	2010-10-27 13:34:16.000000000 +0200
+***************
+*** 3124,3129 ****
+--- 3124,3132 ----
+  		/* If one of the two characters is incomplete return -1. */
+  		if (incomplete || i + utf_byte2len(s2[i]) > n)
+  		    return -1;
++ 		/* Don't case-fold illegal bytes or truncated characters. */
++ 		if (utf_ptr2len(s1 + i) < l || utf_ptr2len(s2 + i) < l)
++ 		    return -1;
+  		cdiff = utf_fold(utf_ptr2char(s1 + i))
+  					     - utf_fold(utf_ptr2char(s2 + i));
+  		if (cdiff != 0)
+*** ../vim-7.3.039/src/version.c	2010-10-27 12:58:19.000000000 +0200
+--- src/version.c	2010-10-27 13:25:16.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     40,
+  /**/
+
+-- 
+    With sufficient thrust, pigs fly just fine.
+                   -- RFC 1925
+
+ /// 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.3.041 b/source/ap/vim/patches/7.3.041
new file mode 100644
index 00000000..60a987d9
--- /dev/null
+++ b/source/ap/vim/patches/7.3.041
@@ -0,0 +1,57 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.041
+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.3.041
+Problem:    Compiler warning for accessing mediumVersion. (Tony Mechelynck)
+Solution:   Use the pointer instead of the array itself. (Dominique Pelle)
+Files:	    src/version.c
+
+
+*** ../vim-7.3.040/src/version.c	2010-10-27 13:37:39.000000000 +0200
+--- src/version.c	2010-10-27 15:58:26.000000000 +0200
+***************
+*** 1342,1350 ****
+  	if (highest_patch())
+  	{
+  	    /* Check for 9.9x or 9.9xx, alpha/beta version */
+! 	    if (isalpha((int)mediumVersion[3]))
+  	    {
+! 		if (isalpha((int)mediumVersion[4]))
+  		    sprintf((char *)vers + 5, ".%d%s", highest_patch(),
+  							   mediumVersion + 5);
+  		else
+--- 1344,1352 ----
+  	if (highest_patch())
+  	{
+  	    /* Check for 9.9x or 9.9xx, alpha/beta version */
+! 	    if (isalpha((int)vers[3]))
+  	    {
+! 		if (isalpha((int)vers[4]))
+  		    sprintf((char *)vers + 5, ".%d%s", highest_patch(),
+  							   mediumVersion + 5);
+  		else
+*** ../vim-7.3.040/src/version.c	2010-10-27 13:37:39.000000000 +0200
+--- src/version.c	2010-10-27 15:58:26.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     41,
+  /**/
+
+-- 
+ARTHUR:        I command you as King of the Britons to stand aside!
+BLACK KNIGHT:  I move for no man.
+                                  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.3.042 b/source/ap/vim/patches/7.3.042
new file mode 100644
index 00000000..6f8ab375
--- /dev/null
+++ b/source/ap/vim/patches/7.3.042
@@ -0,0 +1,65 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.042
+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.3.042
+Problem:    No spell highlighting when re-using an empty buffer.
+Solution:   Clear the spell checking info only when clearing the options for a
+	    buffer. (James Vega)
+Files:	    src/buffer.c
+
+
+*** ../vim-7.3.041/src/buffer.c	2010-09-21 16:56:29.000000000 +0200
+--- src/buffer.c	2010-10-27 16:09:26.000000000 +0200
+***************
+*** 639,644 ****
+--- 639,647 ----
+      {
+  	clear_wininfo(buf);		/* including window-local options */
+  	free_buf_options(buf, TRUE);
++ #ifdef FEAT_SPELL
++ 	ga_clear(&buf->b_s.b_langp);
++ #endif
+      }
+  #ifdef FEAT_EVAL
+      vars_clear(&buf->b_vars.dv_hashtab); /* free all internal variables */
+***************
+*** 661,669 ****
+      vim_free(buf->b_start_fenc);
+      buf->b_start_fenc = NULL;
+  #endif
+- #ifdef FEAT_SPELL
+-     ga_clear(&buf->b_s.b_langp);
+- #endif
+  }
+  
+  /*
+--- 664,669 ----
+*** ../vim-7.3.041/src/version.c	2010-10-27 16:01:17.000000000 +0200
+--- src/version.c	2010-10-27 16:10:33.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     42,
+  /**/
+
+-- 
+BLACK KNIGHT:  I move for no man.
+ARTHUR:        So be it!
+    [hah] [parry thrust]
+    [ARTHUR chops the BLACK KNIGHT's left arm off]
+ARTHUR:        Now stand aside, worthy adversary.
+BLACK KNIGHT:  'Tis but a scratch.
+                                  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.3.043 b/source/ap/vim/patches/7.3.043
new file mode 100644
index 00000000..0bdbec56
--- /dev/null
+++ b/source/ap/vim/patches/7.3.043
@@ -0,0 +1,460 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.043
+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.3.043
+Problem:    Can't load Ruby dynamically on Unix.
+Solution:   Adjust the configure script. (James Vega)
+Files:	    src/Makefile, src/config.h.in, src/configure.in,
+	    src/auto/configure, src/if_ruby.c
+
+
+*** ../vim-7.3.042/src/Makefile	2010-08-16 21:59:00.000000000 +0200
+--- src/Makefile	2010-10-27 16:46:41.000000000 +0200
+***************
+*** 414,425 ****
+--- 414,429 ----
+  # However, this may still cause problems, such as "import termios" failing.
+  # Build two separate versions of Vim in that case.
+  #CONF_OPT_PYTHON = --enable-pythoninterp
++ #CONF_OPT_PYTHON = --enable-pythoninterp=dynamic
+  #CONF_OPT_PYTHON3 = --enable-python3interp
++ #CONF_OPT_PYTHON3 = --enable-python3interp=dynamic
+  
+  # RUBY
+  # Uncomment this when you want to include the Ruby interface.
++ # First one for static linking, second one for loading when used.
+  # Note: you need the development package (e.g., ruby1.9.1-dev on Ubuntu).
+  #CONF_OPT_RUBY = --enable-rubyinterp
++ #CONF_OPT_RUBY = --enable-rubyinterp=dynamic
+  #CONF_OPT_RUBY = --enable-rubyinterp --with-ruby-command=ruby1.9.1
+  
+  # TCL
+***************
+*** 1047,1054 ****
+  INSTALL_DATA	= cp
+  INSTALL_DATA_R	= cp -r
+  
+! ### Program to run on installed binary
+  #STRIP = strip
+  
+  ### Permissions for binaries  {{{1
+  BINMOD = 755
+--- 1051,1059 ----
+  INSTALL_DATA	= cp
+  INSTALL_DATA_R	= cp -r
+  
+! ### Program to run on installed binary.  Use the second one to disable strip.
+  #STRIP = strip
++ #STRIP = /bin/true
+  
+  ### Permissions for binaries  {{{1
+  BINMOD = 755
+***************
+*** 1321,1327 ****
+  .SUFFIXES: .c .o .pro
+  
+  PRE_DEFS = -Iproto $(DEFS) $(GUI_DEFS) $(GUI_IPATH) $(CPPFLAGS) $(EXTRA_IPATHS)
+! POST_DEFS = $(X_CFLAGS) $(MZSCHEME_CFLAGS) $(TCL_CFLAGS) $(RUBY_CFLAGS) $(EXTRA_DEFS)
+  
+  ALL_CFLAGS = $(PRE_DEFS) $(CFLAGS) $(PROFILE_CFLAGS) $(POST_DEFS)
+  
+--- 1326,1332 ----
+  .SUFFIXES: .c .o .pro
+  
+  PRE_DEFS = -Iproto $(DEFS) $(GUI_DEFS) $(GUI_IPATH) $(CPPFLAGS) $(EXTRA_IPATHS)
+! POST_DEFS = $(X_CFLAGS) $(MZSCHEME_CFLAGS) $(TCL_CFLAGS) $(EXTRA_DEFS)
+  
+  ALL_CFLAGS = $(PRE_DEFS) $(CFLAGS) $(PROFILE_CFLAGS) $(POST_DEFS)
+  
+***************
+*** 1329,1335 ****
+  # with "-E".
+  OSDEF_CFLAGS = $(PRE_DEFS) $(POST_DEFS)
+  
+! LINT_CFLAGS = -DLINT -I. $(PRE_DEFS) $(POST_DEFS) $(LUA_CFLAGS) $(PERL_CFLAGS) $(PYTHON_CFLAGS) -Dinline= -D__extension__= -Dalloca=alloca
+  
+  LINT_EXTRA = -DUSE_SNIFF -DHANGUL_INPUT -D"__attribute__(x)="
+  
+--- 1334,1340 ----
+  # with "-E".
+  OSDEF_CFLAGS = $(PRE_DEFS) $(POST_DEFS)
+  
+! LINT_CFLAGS = -DLINT -I. $(PRE_DEFS) $(POST_DEFS) $(RUBY_CFLAGS) $(LUA_CFLAGS) $(PERL_CFLAGS) $(PYTHON_CFLAGS) -Dinline= -D__extension__= -Dalloca=alloca
+  
+  LINT_EXTRA = -DUSE_SNIFF -DHANGUL_INPUT -D"__attribute__(x)="
+  
+***************
+*** 2532,2538 ****
+  	$(CCC) $(PYTHON3_CFLAGS) $(PYTHON3_CFLAGS_EXTRA) -o $@ if_python3.c
+  
+  objects/if_ruby.o: if_ruby.c
+! 	$(CCC) -o $@ if_ruby.c
+  
+  objects/if_sniff.o: if_sniff.c
+  	$(CCC) -o $@ if_sniff.c
+--- 2537,2543 ----
+  	$(CCC) $(PYTHON3_CFLAGS) $(PYTHON3_CFLAGS_EXTRA) -o $@ if_python3.c
+  
+  objects/if_ruby.o: if_ruby.c
+! 	$(CCC) $(RUBY_CFLAGS) -o $@ if_ruby.c
+  
+  objects/if_sniff.o: if_sniff.c
+  	$(CCC) -o $@ if_sniff.c
+*** ../vim-7.3.042/src/config.h.in	2010-08-15 21:57:32.000000000 +0200
+--- src/config.h.in	2010-10-27 16:21:24.000000000 +0200
+***************
+*** 349,354 ****
+--- 349,357 ----
+  /* Define if you want to include the Ruby interpreter. */
+  #undef FEAT_RUBY
+  
++ /* Define for linking via dlopen() or LoadLibrary() */
++ #undef DYNAMIC_RUBY
++ 
+  /* Define if you want to include the Tcl interpreter. */
+  #undef FEAT_TCL
+  
+*** ../vim-7.3.042/src/configure.in	2010-08-15 21:57:28.000000000 +0200
+--- src/configure.in	2010-10-27 16:20:53.000000000 +0200
+***************
+*** 1299,1308 ****
+  
+  AC_MSG_CHECKING(--enable-rubyinterp argument)
+  AC_ARG_ENABLE(rubyinterp,
+! 	[  --enable-rubyinterp     Include Ruby interpreter.], ,
+  	[enable_rubyinterp="no"])
+  AC_MSG_RESULT($enable_rubyinterp)
+! if test "$enable_rubyinterp" = "yes"; then
+    AC_MSG_CHECKING(--with-ruby-command argument)
+    AC_ARG_WITH(ruby-command, [  --with-ruby-command=RUBY  name of the Ruby command (default: ruby)],
+  	RUBY_CMD="$withval"; AC_MSG_RESULT($RUBY_CMD),
+--- 1299,1308 ----
+  
+  AC_MSG_CHECKING(--enable-rubyinterp argument)
+  AC_ARG_ENABLE(rubyinterp,
+! 	[  --enable-rubyinterp[=OPTS]     Include Ruby interpreter.  [default=no] [OPTS=no/yes/dynamic]], ,
+  	[enable_rubyinterp="no"])
+  AC_MSG_RESULT($enable_rubyinterp)
+! if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
+    AC_MSG_CHECKING(--with-ruby-command argument)
+    AC_ARG_WITH(ruby-command, [  --with-ruby-command=RUBY  name of the Ruby command (default: ruby)],
+  	RUBY_CMD="$withval"; AC_MSG_RESULT($RUBY_CMD),
+***************
+*** 1360,1365 ****
+--- 1360,1371 ----
+  	RUBY_OBJ="objects/if_ruby.o"
+  	RUBY_PRO="if_ruby.pro"
+  	AC_DEFINE(FEAT_RUBY)
++ 	if test "$enable_rubyinterp" = "dynamic"; then
++ 	  libruby=`$vi_cv_path_ruby -r rbconfig -e 'printf "lib%s.%s\n", Config::CONFIG[["RUBY_SO_NAME"]], Config::CONFIG[["DLEXT"]]'`
++ 	  AC_DEFINE(DYNAMIC_RUBY)
++ 	  RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby\\\" -DDYNAMIC_RUBY_VER=$rubyversion $RUBY_CFLAGS"
++ 	  RUBY_LIBS=
++ 	fi
+        else
+  	AC_MSG_RESULT(not found; disabling Ruby)
+        fi
+*** ../vim-7.3.042/src/auto/configure	2010-08-15 21:57:27.000000000 +0200
+--- src/auto/configure	2010-10-27 16:28:10.000000000 +0200
+***************
+*** 1427,1433 ****
+    --enable-pythoninterp=OPTS   Include Python interpreter. default=no OPTS=no/yes/dynamic
+    --enable-python3interp=OPTS   Include Python3 interpreter. default=no OPTS=no/yes/dynamic
+    --enable-tclinterp      Include Tcl interpreter.
+!   --enable-rubyinterp     Include Ruby interpreter.
+    --enable-cscope         Include cscope interface.
+    --enable-workshop       Include Sun Visual Workshop support.
+    --disable-netbeans      Disable NetBeans integration support.
+--- 1427,1433 ----
+    --enable-pythoninterp=OPTS   Include Python interpreter. default=no OPTS=no/yes/dynamic
+    --enable-python3interp=OPTS   Include Python3 interpreter. default=no OPTS=no/yes/dynamic
+    --enable-tclinterp      Include Tcl interpreter.
+!   --enable-rubyinterp=OPTS     Include Ruby interpreter.  default=no OPTS=no/yes/dynamic
+    --enable-cscope         Include cscope interface.
+    --enable-workshop       Include Sun Visual Workshop support.
+    --disable-netbeans      Disable NetBeans integration support.
+***************
+*** 6103,6109 ****
+  
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_rubyinterp" >&5
+  $as_echo "$enable_rubyinterp" >&6; }
+! if test "$enable_rubyinterp" = "yes"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-ruby-command argument" >&5
+  $as_echo_n "checking --with-ruby-command argument... " >&6; }
+  
+--- 6103,6109 ----
+  
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_rubyinterp" >&5
+  $as_echo "$enable_rubyinterp" >&6; }
+! if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-ruby-command argument" >&5
+  $as_echo_n "checking --with-ruby-command argument... " >&6; }
+  
+***************
+*** 6209,6214 ****
+--- 6209,6221 ----
+  	RUBY_PRO="if_ruby.pro"
+  	$as_echo "#define FEAT_RUBY 1" >>confdefs.h
+  
++ 	if test "$enable_rubyinterp" = "dynamic"; then
++ 	  libruby=`$vi_cv_path_ruby -r rbconfig -e 'printf "lib%s.%s\n", Config::CONFIG["RUBY_SO_NAME"], Config::CONFIG["DLEXT"]'`
++ 	  $as_echo "#define DYNAMIC_RUBY 1" >>confdefs.h
++ 
++ 	  RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby\\\" -DDYNAMIC_RUBY_VER=$rubyversion $RUBY_CFLAGS"
++ 	  RUBY_LIBS=
++ 	fi
+        else
+  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found; disabling Ruby" >&5
+  $as_echo "not found; disabling Ruby" >&6; }
+*** ../vim-7.3.042/src/if_ruby.c	2010-10-23 14:02:48.000000000 +0200
+--- src/if_ruby.c	2010-10-27 16:40:27.000000000 +0200
+***************
+*** 14,19 ****
+--- 14,21 ----
+  #include <stdio.h>
+  #include <string.h>
+  
++ #include "auto/config.h"
++ 
+  #ifdef _WIN32
+  # if !defined(DYNAMIC_RUBY_VER) || (DYNAMIC_RUBY_VER < 18)
+  #   define NT
+***************
+*** 48,60 ****
+  #  define RUBY_EXPORT
+  # endif
+  
+! #if !(defined(WIN32) || defined(_WIN64))
+  # include <dlfcn.h>
+! # define HANDLE void*
+  # define load_dll(n) dlopen((n), RTLD_LAZY|RTLD_GLOBAL)
+  # define symbol_from_dll dlsym
+  # define close_dll dlclose
+  #else
+  # define load_dll vimLoadLib
+  # define symbol_from_dll GetProcAddress
+  # define close_dll FreeLibrary
+--- 50,64 ----
+  #  define RUBY_EXPORT
+  # endif
+  
+! #ifndef WIN3264
+  # include <dlfcn.h>
+! # define HINSTANCE void*
+! # define RUBY_PROC void*
+  # define load_dll(n) dlopen((n), RTLD_LAZY|RTLD_GLOBAL)
+  # define symbol_from_dll dlsym
+  # define close_dll dlclose
+  #else
++ # define RUBY_PROC FARPROC
+  # define load_dll vimLoadLib
+  # define symbol_from_dll GetProcAddress
+  # define close_dll FreeLibrary
+***************
+*** 174,180 ****
+--- 178,186 ----
+  #define rb_lastline_get			dll_rb_lastline_get
+  #define rb_lastline_set			dll_rb_lastline_set
+  #define rb_load_protect			dll_rb_load_protect
++ #ifndef RUBY19_OR_LATER
+  #define rb_num2long			dll_rb_num2long
++ #endif
+  #define rb_num2ulong			dll_rb_num2ulong
+  #define rb_obj_alloc			dll_rb_obj_alloc
+  #define rb_obj_as_string		dll_rb_obj_as_string
+***************
+*** 186,191 ****
+--- 192,200 ----
+  #ifdef rb_str_new2
+  /* Ruby may #define rb_str_new2 to use rb_str_new_cstr. */
+  # define need_rb_str_new_cstr 1
++ /* Ruby's headers #define rb_str_new_cstr to make use of GCC's
++  * __builtin_constant_p extension. */
++ # undef rb_str_new_cstr
+  # define rb_str_new_cstr		dll_rb_str_new_cstr
+  #else
+  # define rb_str_new2			dll_rb_str_new2
+***************
+*** 206,214 ****
+  #endif
+  #define ruby_init			dll_ruby_init
+  #define ruby_init_loadpath		dll_ruby_init_loadpath
+! #define NtInitialize			dll_NtInitialize
+! #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
+! # define rb_w32_snprintf		dll_rb_w32_snprintf
+  #endif
+  
+  #ifdef RUBY19_OR_LATER
+--- 215,225 ----
+  #endif
+  #define ruby_init			dll_ruby_init
+  #define ruby_init_loadpath		dll_ruby_init_loadpath
+! #ifdef WIN3264
+! # define NtInitialize			dll_NtInitialize
+! # if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
+! #  define rb_w32_snprintf		dll_rb_w32_snprintf
+! # endif
+  #endif
+  
+  #ifdef RUBY19_OR_LATER
+***************
+*** 283,289 ****
+--- 294,305 ----
+  #endif
+  static void (*dll_ruby_init) (void);
+  static void (*dll_ruby_init_loadpath) (void);
++ #ifdef WIN3264
+  static void (*dll_NtInitialize) (int*, char***);
++ # if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
++ static int (*dll_rb_w32_snprintf)(char*, size_t, const char*, ...);
++ # endif
++ #endif
+  #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
+  static char * (*dll_rb_string_value_ptr) (volatile VALUE*);
+  static VALUE (*dll_rb_float_new) (double);
+***************
+*** 293,301 ****
+  #ifdef RUBY19_OR_LATER
+  static VALUE (*dll_rb_int2big)(SIGNED_VALUE);
+  #endif
+- #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
+- static int (*dll_rb_w32_snprintf)(char*, size_t, const char*, ...);
+- #endif
+  
+  #ifdef RUBY19_OR_LATER
+  static void (*dll_ruby_script) (const char*);
+--- 309,314 ----
+***************
+*** 317,328 ****
+  }
+  #endif
+  
+! static HINSTANCE hinstRuby = 0; /* Instance of ruby.dll */
+  
+  /*
+   * Table of name to function pointer of ruby.
+   */
+- #define RUBY_PROC FARPROC
+  static struct
+  {
+      char *name;
+--- 330,340 ----
+  }
+  #endif
+  
+! static HINSTANCE hinstRuby = NULL; /* Instance of ruby.dll */
+  
+  /*
+   * Table of name to function pointer of ruby.
+   */
+  static struct
+  {
+      char *name;
+***************
+*** 387,401 ****
+  #endif
+      {"ruby_init", (RUBY_PROC*)&dll_ruby_init},
+      {"ruby_init_loadpath", (RUBY_PROC*)&dll_ruby_init_loadpath},
+      {
+! #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER < 19
+      "NtInitialize",
+! #else
+      "ruby_sysinit",
+! #endif
+  			(RUBY_PROC*)&dll_NtInitialize},
+! #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
+      {"rb_w32_snprintf", (RUBY_PROC*)&dll_rb_w32_snprintf},
+  #endif
+  #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
+      {"rb_string_value_ptr", (RUBY_PROC*)&dll_rb_string_value_ptr},
+--- 399,415 ----
+  #endif
+      {"ruby_init", (RUBY_PROC*)&dll_ruby_init},
+      {"ruby_init_loadpath", (RUBY_PROC*)&dll_ruby_init_loadpath},
++ #ifdef WIN3264
+      {
+! # if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER < 19
+      "NtInitialize",
+! # else
+      "ruby_sysinit",
+! # endif
+  			(RUBY_PROC*)&dll_NtInitialize},
+! # if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
+      {"rb_w32_snprintf", (RUBY_PROC*)&dll_rb_w32_snprintf},
++ # endif
+  #endif
+  #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
+      {"rb_string_value_ptr", (RUBY_PROC*)&dll_rb_string_value_ptr},
+***************
+*** 424,430 ****
+      if (hinstRuby)
+      {
+  	close_dll(hinstRuby);
+! 	hinstRuby = 0;
+      }
+  }
+  
+--- 438,444 ----
+      if (hinstRuby)
+      {
+  	close_dll(hinstRuby);
+! 	hinstRuby = NULL;
+      }
+  }
+  
+***************
+*** 454,460 ****
+  			ruby_funcname_table[i].name)))
+  	{
+  	    close_dll(hinstRuby);
+! 	    hinstRuby = 0;
+  	    if (verbose)
+  		EMSG2(_(e_loadfunc), ruby_funcname_table[i].name);
+  	    return FAIL;
+--- 468,474 ----
+  			ruby_funcname_table[i].name)))
+  	{
+  	    close_dll(hinstRuby);
+! 	    hinstRuby = NULL;
+  	    if (verbose)
+  		EMSG2(_(e_loadfunc), ruby_funcname_table[i].name);
+  	    return FAIL;
+***************
+*** 936,944 ****
+  	return line ? vim_str2rb_enc_str(line) : Qnil;
+      }
+      rb_raise(rb_eIndexError, "line number %ld out of range", (long)n);
+- #ifndef __GNUC__
+      return Qnil; /* For stop warning */
+- #endif
+  }
+  
+  static VALUE buffer_aref(VALUE self, VALUE num)
+--- 950,956 ----
+*** ../vim-7.3.042/src/version.c	2010-10-27 16:17:56.000000000 +0200
+--- src/version.c	2010-10-27 16:45:28.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     43,
+  /**/
+
+-- 
+ARTHUR:        A scratch?  Your arm's off!
+BLACK KNIGHT:  No, it isn't.
+ARTHUR:        Well, what's that then?
+BLACK KNIGHT:  I've had worse.
+                                  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.3.044 b/source/ap/vim/patches/7.3.044
new file mode 100644
index 00000000..6a66763d
--- /dev/null
+++ b/source/ap/vim/patches/7.3.044
@@ -0,0 +1,58 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.044
+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.3.044
+Problem:    The preview window opened by the popup menu is larger than
+	    specified with 'previewheight'. (Benjamin Haskell)
+Solution:   Use 'previewheight' if it's set and smaller.
+Files:	    src/popupmnu.c
+
+
+*** ../vim-7.3.043/src/popupmnu.c	2010-08-15 21:57:25.000000000 +0200
+--- src/popupmnu.c	2010-10-27 17:04:31.000000000 +0200
+***************
+*** 558,565 ****
+  	    win_T	*curwin_save = curwin;
+  	    int		res = OK;
+  
+! 	    /* Open a preview window.  3 lines by default. */
+  	    g_do_tagpreview = 3;
+  	    resized = prepare_tagpreview(FALSE);
+  	    g_do_tagpreview = 0;
+  
+--- 558,568 ----
+  	    win_T	*curwin_save = curwin;
+  	    int		res = OK;
+  
+! 	    /* Open a preview window.  3 lines by default.  Prefer
+! 	     * 'previewheight' if set and smaller. */
+  	    g_do_tagpreview = 3;
++ 	    if (p_pvh > 0 && p_pvh < g_do_tagpreview)
++ 		g_do_tagpreview = p_pvh;
+  	    resized = prepare_tagpreview(FALSE);
+  	    g_do_tagpreview = 0;
+  
+*** ../vim-7.3.043/src/version.c	2010-10-27 16:49:41.000000000 +0200
+--- src/version.c	2010-10-27 17:08:37.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     44,
+  /**/
+
+-- 
+"It's so simple to be wise.  Just think of something stupid to say
+and then don't say it."        -- Sam Levenson
+
+ /// 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.3.045 b/source/ap/vim/patches/7.3.045
new file mode 100644
index 00000000..e8112b97
--- /dev/null
+++ b/source/ap/vim/patches/7.3.045
@@ -0,0 +1,57 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.045
+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.3.045
+Problem:    Compiler warning for uninitialized variable.
+Solution:   Initialize the variable always.
+Files:	    src/getchar.c
+
+
+*** ../vim-7.3.044/src/getchar.c	2010-10-27 12:17:54.000000000 +0200
+--- src/getchar.c	2010-10-27 17:28:45.000000000 +0200
+***************
+*** 3290,3298 ****
+       */
+      if (haskey)
+  	keys = replace_termcodes(keys, &keys_buf, TRUE, TRUE, special);
+      if (hasarg)
+      {
+- 	orig_rhs = rhs;
+  	if (STRICMP(rhs, "<nop>") == 0)	    /* "<Nop>" means nothing */
+  	    rhs = (char_u *)"";
+  	else
+--- 3290,3298 ----
+       */
+      if (haskey)
+  	keys = replace_termcodes(keys, &keys_buf, TRUE, TRUE, special);
++     orig_rhs = rhs;
+      if (hasarg)
+      {
+  	if (STRICMP(rhs, "<nop>") == 0)	    /* "<Nop>" means nothing */
+  	    rhs = (char_u *)"";
+  	else
+*** ../vim-7.3.044/src/version.c	2010-10-27 17:11:11.000000000 +0200
+--- src/version.c	2010-10-27 17:30:11.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     45,
+  /**/
+
+-- 
+MARTHA'S WAY: Don't throw out all that leftover wine. Freeze into ice cubes
+              for future use in casseroles and sauces.
+MY WAY:       What leftover wine?
+
+ /// 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.3.046 b/source/ap/vim/patches/7.3.046
new file mode 100644
index 00000000..41d4f66e
--- /dev/null
+++ b/source/ap/vim/patches/7.3.046
@@ -0,0 +1,76 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.046
+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.3.046 (after 7.3.043)
+Problem:    Can't build Ruby on MS-Windows.
+Solution:   Add #ifdef, don't use WIN3264 before including vim.h.
+Files:	    src/if_ruby.c
+
+
+*** ../vim-7.3.045/src/if_ruby.c	2010-10-27 16:49:41.000000000 +0200
+--- src/if_ruby.c	2010-10-27 17:37:05.000000000 +0200
+***************
+*** 14,20 ****
+  #include <stdio.h>
+  #include <string.h>
+  
+! #include "auto/config.h"
+  
+  #ifdef _WIN32
+  # if !defined(DYNAMIC_RUBY_VER) || (DYNAMIC_RUBY_VER < 18)
+--- 14,22 ----
+  #include <stdio.h>
+  #include <string.h>
+  
+! #ifdef HAVE_CONFIG_H
+! # include "auto/config.h"
+! #endif
+  
+  #ifdef _WIN32
+  # if !defined(DYNAMIC_RUBY_VER) || (DYNAMIC_RUBY_VER < 18)
+***************
+*** 50,56 ****
+  #  define RUBY_EXPORT
+  # endif
+  
+! #ifndef WIN3264
+  # include <dlfcn.h>
+  # define HINSTANCE void*
+  # define RUBY_PROC void*
+--- 52,58 ----
+  #  define RUBY_EXPORT
+  # endif
+  
+! #if !(defined(WIN32) || defined(_WIN64))
+  # include <dlfcn.h>
+  # define HINSTANCE void*
+  # define RUBY_PROC void*
+*** ../vim-7.3.045/src/version.c	2010-10-27 17:39:00.000000000 +0200
+--- src/version.c	2010-10-27 17:39:59.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     46,
+  /**/
+
+-- 
+BLACK KNIGHT:  Come on you pansy!
+    [hah] [parry thrust]
+    [ARTHUR chops the BLACK KNIGHT's right arm off]
+ARTHUR:        Victory is mine!  [kneeling]
+               We thank thee Lord, that in thy merc-
+    [Black Knight kicks Arthur in the head while he is praying]
+                                  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.3.047 b/source/ap/vim/patches/7.3.047
new file mode 100644
index 00000000..6f6e32d4
--- /dev/null
+++ b/source/ap/vim/patches/7.3.047
@@ -0,0 +1,172 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.047
+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.3.047 (after 7.3.032)
+Problem:    Missing makefile updates for test 75.
+Solution:   Update the makefiles.
+Files:	    src/testdir/Make_amiga.mak, src/testdir/Make_dos.mak,
+	    src/testdir/Makefile, src/testdir/Make_ming.mak,
+	    src/testdir/Make_os2.mak, src/testdir/Make_vms.mms
+
+
+*** ../vim-7.3.046/src/testdir/Make_amiga.mak	2010-10-20 17:44:01.000000000 +0200
+--- src/testdir/Make_amiga.mak	2010-10-20 20:43:25.000000000 +0200
+***************
+*** 27,33 ****
+  		test56.out test57.out test58.out test59.out test60.out \
+  		test61.out test62.out test63.out test64.out test65.out \
+  		test66.out test67.out test68.out test69.out test70.out \
+! 		test71.out test72.out test73.out test74.out
+  
+  .SUFFIXES: .in .out
+  
+--- 27,33 ----
+  		test56.out test57.out test58.out test59.out test60.out \
+  		test61.out test62.out test63.out test64.out test65.out \
+  		test66.out test67.out test68.out test69.out test70.out \
+! 		test71.out test72.out test73.out test74.out test75.out
+  
+  .SUFFIXES: .in .out
+  
+***************
+*** 121,123 ****
+--- 121,124 ----
+  test72.out: test72.in
+  test73.out: test73.in
+  test74.out: test74.in
++ test75.out: test75.in
+*** ../vim-7.3.046/src/testdir/Make_dos.mak	2010-10-20 17:44:01.000000000 +0200
+--- src/testdir/Make_dos.mak	2010-10-20 20:43:48.000000000 +0200
+***************
+*** 28,34 ****
+  		test37.out test38.out test39.out test40.out test41.out \
+  		test42.out test52.out test65.out test66.out test67.out \
+  		test68.out test69.out test71.out test72.out test73.out \
+! 		test74.out
+  
+  SCRIPTS32 =	test50.out test70.out
+  
+--- 28,34 ----
+  		test37.out test38.out test39.out test40.out test41.out \
+  		test42.out test52.out test65.out test66.out test67.out \
+  		test68.out test69.out test71.out test72.out test73.out \
+! 		test74.out test75.out
+  
+  SCRIPTS32 =	test50.out test70.out
+  
+*** ../vim-7.3.046/src/testdir/Makefile	2010-10-20 17:44:01.000000000 +0200
+--- src/testdir/Makefile	2010-10-20 20:44:10.000000000 +0200
+***************
+*** 25,31 ****
+  		test59.out test60.out test61.out test62.out test63.out \
+  		test64.out test65.out test66.out test67.out test68.out \
+  		test69.out test70.out test71.out test72.out test73.out \
+! 		test74.out
+  
+  SCRIPTS_GUI = test16.out
+  
+--- 25,31 ----
+  		test59.out test60.out test61.out test62.out test63.out \
+  		test64.out test65.out test66.out test67.out test68.out \
+  		test69.out test70.out test71.out test72.out test73.out \
+! 		test74.out test75.out
+  
+  SCRIPTS_GUI = test16.out
+  
+*** ../vim-7.3.046/src/testdir/Make_ming.mak	2010-10-20 17:44:01.000000000 +0200
+--- src/testdir/Make_ming.mak	2010-10-20 20:43:53.000000000 +0200
+***************
+*** 48,54 ****
+  		test37.out test38.out test39.out test40.out test41.out \
+  		test42.out test52.out test65.out test66.out test67.out \
+  		test68.out test69.out test71.out test72.out test73.out \
+! 		test74.out
+  
+  SCRIPTS32 =	test50.out test70.out
+  
+--- 48,54 ----
+  		test37.out test38.out test39.out test40.out test41.out \
+  		test42.out test52.out test65.out test66.out test67.out \
+  		test68.out test69.out test71.out test72.out test73.out \
+! 		test74.out test75.out
+  
+  SCRIPTS32 =	test50.out test70.out
+  
+*** ../vim-7.3.046/src/testdir/Make_os2.mak	2010-10-20 17:44:01.000000000 +0200
+--- src/testdir/Make_os2.mak	2010-10-20 20:44:00.000000000 +0200
+***************
+*** 27,33 ****
+  		test56.out test57.out test58.out test59.out test60.out \
+  		test61.out test62.out test63.out test64.out test65.out \
+  		test66.out test67.out test68.out test69.out test70.out \
+! 		test71.out test72.out test73.out test74.out
+  
+  .SUFFIXES: .in .out
+  
+--- 27,33 ----
+  		test56.out test57.out test58.out test59.out test60.out \
+  		test61.out test62.out test63.out test64.out test65.out \
+  		test66.out test67.out test68.out test69.out test70.out \
+! 		test71.out test72.out test73.out test74.out test75.out
+  
+  .SUFFIXES: .in .out
+  
+*** ../vim-7.3.046/src/testdir/Make_vms.mms	2010-10-20 17:44:01.000000000 +0200
+--- src/testdir/Make_vms.mms	2010-10-20 20:44:05.000000000 +0200
+***************
+*** 4,10 ****
+  # Authors:	Zoltan Arpadffy, <arpadffy@polarhome.com>
+  #		Sandor Kopanyi,  <sandor.kopanyi@mailbox.hu>
+  #
+! # Last change:  2010 Aug 04
+  #
+  # 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:  2010 Oct 20
+  #
+  # 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.
+***************
+*** 74,80 ****
+  	 test56.out test57.out test60.out \
+  	 test61.out test62.out test63.out test64.out test65.out \
+  	 test66.out test67.out test68.out test69.out \
+! 	 test71.out test72.out test74.out
+  
+  # Known problems:
+  # Test 30: a problem around mac format - unknown reason
+--- 74,80 ----
+  	 test56.out test57.out test60.out \
+  	 test61.out test62.out test63.out test64.out test65.out \
+  	 test66.out test67.out test68.out test69.out \
+! 	 test71.out test72.out test74.out test75.out
+  
+  # Known problems:
+  # Test 30: a problem around mac format - unknown reason
+*** ../vim-7.3.046/src/version.c	2010-10-27 17:40:53.000000000 +0200
+--- src/version.c	2010-10-27 18:34:20.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     47,
+  /**/
+
+-- 
+5 out of 4 people have trouble with fractions.
+
+ /// 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.3.048 b/source/ap/vim/patches/7.3.048
new file mode 100644
index 00000000..db84480f
--- /dev/null
+++ b/source/ap/vim/patches/7.3.048
@@ -0,0 +1,109 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.048
+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.3.048
+Problem:    ":earlier 1f" doesn't work after loading undo file.
+Solution:   Set b_u_save_nr_cur when loading an undo file. (Christian
+	    Brabandt)
+	    Fix only showing time in ":undolist"
+Files:	    src/undo.c
+
+
+*** ../vim-7.3.047/src/undo.c	2010-08-15 21:57:28.000000000 +0200
+--- src/undo.c	2010-11-03 19:26:38.000000000 +0100
+***************
+*** 1861,1866 ****
+--- 1861,1867 ----
+      curbuf->b_u_seq_cur = seq_cur;
+      curbuf->b_u_time_cur = seq_time;
+      curbuf->b_u_save_nr_last = last_save_nr;
++     curbuf->b_u_save_nr_cur = last_save_nr;
+  
+      curbuf->b_u_synced = TRUE;
+      vim_free(uhp_table);
+***************
+*** 2794,2800 ****
+  								uhp->uh_time);
+  	    if (uhp->uh_save_nr > 0)
+  	    {
+! 		while (STRLEN(IObuff) < 32)
+  		    STRCAT(IObuff, " ");
+  		vim_snprintf_add((char *)IObuff, IOSIZE,
+  						   "  %3ld", uhp->uh_save_nr);
+--- 2795,2801 ----
+  								uhp->uh_time);
+  	    if (uhp->uh_save_nr > 0)
+  	    {
+! 		while (STRLEN(IObuff) < 33)
+  		    STRCAT(IObuff, " ");
+  		vim_snprintf_add((char *)IObuff, IOSIZE,
+  						   "  %3ld", uhp->uh_save_nr);
+***************
+*** 2849,2855 ****
+  	sort_strings((char_u **)ga.ga_data, ga.ga_len);
+  
+  	msg_start();
+! 	msg_puts_attr((char_u *)_("number changes  time            saved"),
+  							      hl_attr(HLF_T));
+  	for (i = 0; i < ga.ga_len && !got_int; ++i)
+  	{
+--- 2850,2856 ----
+  	sort_strings((char_u **)ga.ga_data, ga.ga_len);
+  
+  	msg_start();
+! 	msg_puts_attr((char_u *)_("number changes  when               saved"),
+  							      hl_attr(HLF_T));
+  	for (i = 0; i < ga.ga_len && !got_int; ++i)
+  	{
+***************
+*** 2879,2885 ****
+      if (time(NULL) - tt >= 100)
+      {
+  	curtime = localtime(&tt);
+! 	(void)strftime((char *)buf, buflen, "%H:%M:%S", curtime);
+      }
+      else
+  #endif
+--- 2880,2894 ----
+      if (time(NULL) - tt >= 100)
+      {
+  	curtime = localtime(&tt);
+! 	if (time(NULL) - tt < (60L * 60L * 12L))
+! 	    /* within 12 hours */
+! 	    (void)strftime((char *)buf, buflen, "%H:%M:%S", curtime);
+! 	else if (time(NULL) - tt < (60L * 60L * 24L * 180L))
+! 	    /* within 6 months */
+! 	    (void)strftime((char *)buf, buflen, "%m/%d %H:%M:%S", curtime);
+! 	else
+! 	    /* long ago */
+! 	    (void)strftime((char *)buf, buflen, "%y/%m/%d %H:%M:%S", curtime);
+      }
+      else
+  #endif
+*** ../vim-7.3.047/src/version.c	2010-10-27 18:36:32.000000000 +0200
+--- src/version.c	2010-11-03 19:27:07.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     48,
+  /**/
+
+-- 
+TIM: To the north there lies a cave,  the cave of Caerbannog, wherein, carved
+     in mystic runes, upon the very living rock, the last words of Olfin
+     Bedwere of Rheged make plain the last resting place of the most Holy
+     Grail.
+                 "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.3.049 b/source/ap/vim/patches/7.3.049
new file mode 100644
index 00000000..365aeaba
--- /dev/null
+++ b/source/ap/vim/patches/7.3.049
@@ -0,0 +1,495 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.049
+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.3.049
+Problem:    PLT has rebranded their Scheme to Racket.
+Solution:   Add support for Racket 5.x. (Sergey Khorev)
+Files:	    src/Make_cyg.mak, src/Make_ming.mak, src/Make_mvc.mak,
+	    src/auto/configure, src/configure.in, src/if_mzsch.c
+
+
+*** ../vim-7.3.048/src/Make_cyg.mak	2010-08-15 21:57:27.000000000 +0200
+--- src/Make_cyg.mak	2010-11-03 21:50:42.000000000 +0100
+***************
+*** 1,6 ****
+  #
+  # Makefile for VIM on Win32, using Cygnus gcc
+! # Last updated by Dan Sharp.  Last Change: 2010 Feb 24
+  #
+  # Also read INSTALLpc.txt!
+  #
+--- 1,6 ----
+  #
+  # Makefile for VIM on Win32, using Cygnus gcc
+! # Last updated by Dan Sharp.  Last Change: 2010 Nov 03
+  #
+  # Also read INSTALLpc.txt!
+  #
+***************
+*** 27,32 ****
+--- 27,33 ----
+  #   MZSCHEME_VER      define to version of MzScheme being used (209_000)
+  #   DYNAMIC_MZSCHEME  no or yes: use yes to load the MzScheme DLLs dynamically (yes)
+  #   MZSCHEME_DLLS     path to MzScheme DLLs (libmzgc and libmzsch), for "static" build.
++ #   MZSCHEME_USE_RACKET  define to use "racket" instead of "mzsch".
+  # LUA	define to path to Lua dir to get Lua support (not defined)
+  #   LUA_VER	    define to version of Lua being used (51)
+  #   DYNAMIC_LUA  no or yes: use yes to load the Lua DLL dynamically (yes)
+***************
+*** 254,269 ****
+  MZSCHEME_GENERATE_BASE=no
+  endif
+  
+  ifeq (yes, $(DYNAMIC_MZSCHEME))
+! DEFINES += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"libmzsch$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
+  else
+  ifndef MZSCHEME_DLLS
+  MZSCHEME_DLLS = $(MZSCHEME)
+  endif
+  ifeq (yes,$(MZSCHEME_PRECISE_GC))
+! MZSCHEME_LIB=-lmzsch$(MZSCHEME_VER)
+  else
+! MZSCHEME_LIB = -lmzsch$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)
+  endif
+  EXTRA_LIBS += -L$(MZSCHEME_DLLS) -L$(MZSCHEME_DLLS)/lib $(MZSCHEME_LIB)
+  endif
+--- 255,276 ----
+  MZSCHEME_GENERATE_BASE=no
+  endif
+  
++ ifndef MZSCHEME_USE_RACKET
++ MZSCHEME_MAIN_LIB=mzsch
++ else
++ MZSCHEME_MAIN_LIB=racket
++ endif
++ 
+  ifeq (yes, $(DYNAMIC_MZSCHEME))
+! DEFINES += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
+  else
+  ifndef MZSCHEME_DLLS
+  MZSCHEME_DLLS = $(MZSCHEME)
+  endif
+  ifeq (yes,$(MZSCHEME_PRECISE_GC))
+! MZSCHEME_LIB=-l$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER)
+  else
+! MZSCHEME_LIB = -l$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)
+  endif
+  EXTRA_LIBS += -L$(MZSCHEME_DLLS) -L$(MZSCHEME_DLLS)/lib $(MZSCHEME_LIB)
+  endif
+*** ../vim-7.3.048/src/Make_ming.mak	2010-09-29 18:42:25.000000000 +0200
+--- src/Make_ming.mak	2010-11-03 21:48:14.000000000 +0100
+***************
+*** 141,151 ****
+  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
+--- 141,157 ----
+  MZSCHEME_GENERATE_BASE=no
+  endif
+  
++ ifndef MZSCHEME_USE_RACKET
++ MZSCHEME_MAIN_LIB=mzsch
++ else
++ MZSCHEME_MAIN_LIB=racket
++ endif
++ 
+  ifeq (no,$(DYNAMIC_MZSCHEME))
+  ifeq (yes,$(MZSCHEME_PRECISE_GC))
+! MZSCHEME_LIB=-l$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER)
+  else
+! MZSCHEME_LIB = -l$(MZSCHEME_MAIN_LIB)$(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
+***************
+*** 343,349 ****
+  ifdef MZSCHEME
+  CFLAGS += -I$(MZSCHEME)/include -DFEAT_MZSCHEME -DMZSCHEME_COLLECTS=\"$(MZSCHEME)/collects\"
+  ifeq (yes, $(DYNAMIC_MZSCHEME))
+! CFLAGS += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"libmzsch$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
+  endif
+  endif
+  
+--- 349,355 ----
+  ifdef MZSCHEME
+  CFLAGS += -I$(MZSCHEME)/include -DFEAT_MZSCHEME -DMZSCHEME_COLLECTS=\"$(MZSCHEME)/collects\"
+  ifeq (yes, $(DYNAMIC_MZSCHEME))
+! CFLAGS += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
+  endif
+  endif
+  
+*** ../vim-7.3.048/src/Make_mvc.mak	2010-08-15 21:57:27.000000000 +0200
+--- src/Make_mvc.mak	2010-11-03 21:48:14.000000000 +0100
+***************
+*** 705,716 ****
+  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
+--- 705,722 ----
+  MZSCHEME_VER = 205_000
+  !endif
+  CFLAGS = $(CFLAGS) -DFEAT_MZSCHEME -I $(MZSCHEME)\include
+! !if EXIST("$(MZSCHEME)\collects\scheme\base.ss") \
+! 	|| EXIST("$(MZSCHEME)\collects\scheme\base.rkt") 
+! # for MzScheme >= 4 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")
+! MZSCHEME_MAIN_LIB=mzsch
+! !else
+! MZSCHEME_MAIN_LIB=racket
+! !endif
+! !if EXIST("$(MZSCHEME)\lib\msvc\lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).lib") \
+  	&& !EXIST("$(MZSCHEME)\lib\msvc\libmzgc$(MZSCHEME_VER).lib")
+  !message Building with Precise GC
+  MZSCHEME_PRECISE_GC = yes
+***************
+*** 722,728 ****
+  !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"
+--- 728,734 ----
+  !endif
+  !message MzScheme DLLs will be loaded dynamically
+  CFLAGS = $(CFLAGS) -DDYNAMIC_MZSCHEME \
+! 		-DDYNAMIC_MZSCH_DLL=\"lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).dll\" \
+  		-DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
+  !else
+  !if "$(MZSCHEME_DEBUG)" == "yes"
+***************
+*** 730,739 ****
+  !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
+--- 736,745 ----
+  !endif
+  !if "$(MZSCHEME_PRECISE_GC)" == "yes"
+  # Precise GC does not use separate dll
+! MZSCHEME_LIB = $(MZSCHEME)\lib\msvc\lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).lib
+  !else
+  MZSCHEME_LIB = $(MZSCHEME)\lib\msvc\libmzgc$(MZSCHEME_VER).lib \
+! 		$(MZSCHEME)\lib\msvc\lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).lib
+  !endif
+  !endif
+  MZSCHEME_OBJ = $(OUTDIR)\if_mzsch.obj
+*** ../vim-7.3.048/src/auto/configure	2010-10-27 16:49:41.000000000 +0200
+--- src/auto/configure	2010-11-03 21:53:09.000000000 +0100
+***************
+*** 4862,4877 ****
+        else
+  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  $as_echo "no" >&6; }
+! 	{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: yes" >&5
+  $as_echo "yes" >&6; }
+! 	  SCHEME_INC=/usr/include/plt
+  	else
+  	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  $as_echo "no" >&6; }
+! 	  vi_cv_path_mzscheme_pfx=
+  	fi
+        fi
+      fi
+--- 4862,4897 ----
+        else
+  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  $as_echo "no" >&6; }
+! 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/racket" >&5
+! $as_echo_n "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/racket... " >&6; }
+! 	if test -f $vi_cv_path_mzscheme_pfx/include/racket/scheme.h; then
+  	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+  $as_echo "yes" >&6; }
+! 	  SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/racket
+  	else
+  	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  $as_echo "no" >&6; }
+! 	  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: yes" >&5
+! $as_echo "yes" >&6; }
+! 	    SCHEME_INC=/usr/include/plt
+! 	  else
+! 	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+! $as_echo "no" >&6; }
+! 	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in /usr/include/racket/" >&5
+! $as_echo_n "checking if scheme.h can be found in /usr/include/racket/... " >&6; }
+! 	    if test -f /usr/include/racket/scheme.h; then
+! 	      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+! $as_echo "yes" >&6; }
+! 	      SCHEME_INC=/usr/include/racket
+! 	    else
+! 	      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+! $as_echo "no" >&6; }
+! 	      vi_cv_path_mzscheme_pfx=
+! 	    fi
+! 	  fi
+  	fi
+        fi
+      fi
+***************
+*** 4883,4894 ****
+      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
+--- 4903,4924 ----
+      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/libracket3m.a"; then
+!       MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libracket3m.a"
+!       MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
+!     elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket.a"; then
+!       MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libracket.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
+!     elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.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"
++       elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket3m.so"; then
++         MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lracket3m"
++ 	MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
++       elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket.so"; then
++         MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lracket -lmzgc"
+        else
+          MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc"
+        fi
+***************
+*** 4901,4910 ****
+      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} \
+--- 4931,4950 ----
+      fi
+      if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then
+        SCHEME_COLLECTS=lib/plt/
++     else
++       if test -d $vi_cv_path_mzscheme_pfx/lib/racket/collects; then
++ 	SCHEME_COLLECTS=lib/racket/
++       fi
+      fi
+      if test -f "${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects/scheme/base.ss" ; then
+!       MZSCHEME_EXTRA="mzscheme_base.c"
+!     else
+!       if test -f "${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects/scheme/base.rkt" ; then
+! 	MZSCHEME_EXTRA="mzscheme_base.c"
+!       fi
+!     fi
+!     if test "X$MZSCHEME_EXTRA" != "X" ; then
+!             MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -DINCLUDE_MZSCHEME_BASE"
+        MZSCHEME_MZC="${vi_cv_path_mzscheme_pfx}/bin/mzc"
+      fi
+      MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -I${SCHEME_INC} \
+*** ../vim-7.3.048/src/configure.in	2010-10-27 16:49:41.000000000 +0200
+--- src/configure.in	2010-11-03 21:48:14.000000000 +0100
+***************
+*** 568,580 ****
+  	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
+--- 568,594 ----
+  	SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/plt
+        else
+  	AC_MSG_RESULT(no)
+! 	AC_MSG_CHECKING(if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/racket)
+! 	if test -f $vi_cv_path_mzscheme_pfx/include/racket/scheme.h; then
+  	  AC_MSG_RESULT(yes)
+! 	  SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/racket
+  	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)
+! 	    AC_MSG_CHECKING(if scheme.h can be found in /usr/include/racket/)
+! 	    if test -f /usr/include/racket/scheme.h; then
+! 	      AC_MSG_RESULT(yes)
+! 	      SCHEME_INC=/usr/include/racket
+! 	    else
+! 	      AC_MSG_RESULT(no)
+! 	      vi_cv_path_mzscheme_pfx=
+! 	    fi
+! 	  fi
+  	fi
+        fi
+      fi
+***************
+*** 586,598 ****
+      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
+--- 600,622 ----
+      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/libracket3m.a"; then
+!       MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libracket3m.a"
+!       MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
+!     elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket.a"; then
+!       MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libracket.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
+!     elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.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"
++       elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket3m.so"; then
++         MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lracket3m"
++ 	MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
++       elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket.so"; then
++         MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lracket -lmzgc"
+        else
+          MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc"
+        fi
+***************
+*** 607,616 ****
+      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
+--- 631,650 ----
+      fi
+      if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then
+        SCHEME_COLLECTS=lib/plt/
++     else
++       if test -d $vi_cv_path_mzscheme_pfx/lib/racket/collects; then
++ 	SCHEME_COLLECTS=lib/racket/
++       fi
+      fi
+      if test -f "${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects/scheme/base.ss" ; then
+        MZSCHEME_EXTRA="mzscheme_base.c"
++     else
++       if test -f "${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects/scheme/base.rkt" ; then
++ 	MZSCHEME_EXTRA="mzscheme_base.c"
++       fi
++     fi
++     if test "X$MZSCHEME_EXTRA" != "X" ; then
++       dnl need to generate bytecode for MzScheme base
+        MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -DINCLUDE_MZSCHEME_BASE"
+        MZSCHEME_MZC="${vi_cv_path_mzscheme_pfx}/bin/mzc"
+      fi
+*** ../vim-7.3.048/src/if_mzsch.c	2010-10-23 14:02:48.000000000 +0200
+--- src/if_mzsch.c	2010-11-03 21:48:14.000000000 +0100
+***************
+*** 794,802 ****
+--- 794,809 ----
+  #endif
+  }
+  
++ #if MZSCHEME_VERSION_MAJOR >= 500 && defined(WIN32) && defined(USE_THREAD_LOCAL)
++ static __declspec(thread) void *tls_space;
++ #endif
++ 
+      void
+  mzscheme_main(void)
+  {
++ #if MZSCHEME_VERSION_MAJOR >= 500 && defined(WIN32) && defined(USE_THREAD_LOCAL)
++     scheme_register_tls_space(&tls_space, 0);
++ #endif
+  #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);
+*** ../vim-7.3.048/src/version.c	2010-11-03 19:32:36.000000000 +0100
+--- src/version.c	2010-11-03 21:57:04.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     49,
+  /**/
+
+-- 
+TIM: But follow only if you are men of valour.  For the entrance to this cave
+     is guarded by a monster, a creature so foul and cruel that no man yet has
+     fought with it and lived.  Bones of full fifty men lie strewn about its
+     lair ...
+                 "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.3.050 b/source/ap/vim/patches/7.3.050
new file mode 100644
index 00000000..cccb836c
--- /dev/null
+++ b/source/ap/vim/patches/7.3.050
@@ -0,0 +1,199 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.050
+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.3.050
+Problem:    The link script is clumsy.
+Solution:   Use the --as-needed linker option if available. (Kirill A.
+	    Shutemov)
+Files:	    src/Makefile, src/auto/configure, src/config.mk.in,
+	    src/configure.in, src/link.sh
+
+
+*** ../vim-7.3.049/src/Makefile	2010-10-27 16:49:41.000000000 +0200
+--- src/Makefile	2010-11-03 22:26:45.000000000 +0100
+***************
+*** 1700,1706 ****
+  	$(CCC) version.c -o objects/version.o
+  	@LINK="$(PURIFY) $(SHRPENV) $(CClink) $(ALL_LIB_DIRS) $(LDFLAGS) \
+  		-o $(VIMTARGET) $(OBJ) objects/version.o $(ALL_LIBS)" \
+! 		MAKE="$(MAKE)" sh $(srcdir)/link.sh
+  
+  xxd/xxd$(EXEEXT): xxd/xxd.c
+  	cd xxd; CC="$(CC)" CFLAGS="$(CPPFLAGS) $(CFLAGS)" \
+--- 1700,1707 ----
+  	$(CCC) version.c -o objects/version.o
+  	@LINK="$(PURIFY) $(SHRPENV) $(CClink) $(ALL_LIB_DIRS) $(LDFLAGS) \
+  		-o $(VIMTARGET) $(OBJ) objects/version.o $(ALL_LIBS)" \
+! 		MAKE="$(MAKE)" LINK_AS_NEEDED=$(LINK_AS_NEEDED) \
+! 		sh $(srcdir)/link.sh
+  
+  xxd/xxd$(EXEEXT): xxd/xxd.c
+  	cd xxd; CC="$(CC)" CFLAGS="$(CPPFLAGS) $(CFLAGS)" \
+*** ../vim-7.3.049/src/auto/configure	2010-11-03 21:59:23.000000000 +0100
+--- src/auto/configure	2010-11-03 22:28:03.000000000 +0100
+***************
+*** 593,598 ****
+--- 593,599 ----
+  
+  ac_subst_vars='LTLIBOBJS
+  LIBOBJS
++ LINK_AS_NEEDED
+  DEPEND_CFLAGS_FILTER
+  MAKEMO
+  MSGFMT
+***************
+*** 12404,12409 ****
+--- 12405,12427 ----
+  fi
+  
+  
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking linker --as-needed support" >&5
++ $as_echo_n "checking linker --as-needed support... " >&6; }
++ LINK_AS_NEEDED=
++ # Check if linker supports --as-needed and --no-as-needed options
++ if $CC -Wl,--help 2>/dev/null | grep as-needed > /dev/null; then
++   LDFLAGS="$LDFLAGS -Wl,--as-needed"
++   LINK_AS_NEEDED=yes
++ fi
++ if test "$LINK_AS_NEEDED" = yes; then
++   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++ $as_echo "yes" >&6; }
++ else
++   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++ $as_echo "no" >&6; }
++ fi
++ 
++ 
+  ac_config_files="$ac_config_files auto/config.mk:config.mk.in"
+  
+  cat >confcache <<\_ACEOF
+*** ../vim-7.3.049/src/config.mk.in	2010-08-15 21:57:28.000000000 +0200
+--- src/config.mk.in	2010-11-03 22:26:24.000000000 +0100
+***************
+*** 30,35 ****
+--- 30,36 ----
+  CPP		= @CPP@
+  CPP_MM		= @CPP_MM@
+  DEPEND_CFLAGS_FILTER = @DEPEND_CFLAGS_FILTER@
++ LINK_AS_NEEDED	= @LINK_AS_NEEDED@
+  X_CFLAGS	= @X_CFLAGS@
+  X_LIBS_DIR	= @X_LIBS@
+  X_PRE_LIBS	= @X_PRE_LIBS@
+*** ../vim-7.3.049/src/configure.in	2010-11-03 21:59:23.000000000 +0100
+--- src/configure.in	2010-11-03 22:26:16.000000000 +0100
+***************
+*** 3527,3532 ****
+--- 3527,3549 ----
+  fi
+  AC_SUBST(DEPEND_CFLAGS_FILTER)
+  
++ dnl link.sh tries to avoid overlinking in a hackish way.
++ dnl At least GNU ld supports --as-needed which provides the same functionality
++ dnl at linker level. Let's use it.
++ AC_MSG_CHECKING(linker --as-needed support)
++ LINK_AS_NEEDED=
++ # Check if linker supports --as-needed and --no-as-needed options
++ if $CC -Wl,--help 2>/dev/null | grep as-needed > /dev/null; then
++   LDFLAGS="$LDFLAGS -Wl,--as-needed"
++   LINK_AS_NEEDED=yes
++ fi
++ if test "$LINK_AS_NEEDED" = yes; then
++   AC_MSG_RESULT(yes)
++ else
++   AC_MSG_RESULT(no)
++ fi
++ AC_SUBST(LINK_AS_NEEDED)
++ 
+  dnl write output files
+  AC_OUTPUT(auto/config.mk:config.mk.in)
+  
+*** ../vim-7.3.049/src/link.sh	2010-08-15 21:57:25.000000000 +0200
+--- src/link.sh	2010-11-03 22:26:08.000000000 +0100
+***************
+*** 5,11 ****
+  # libraries when they exist, but this doesn't mean they are needed for Vim.
+  #
+  #      Author: Bram Moolenaar
+! # Last change: 2006 Sep 26
+  #     License: Public domain
+  #
+  # Warning: This fails miserably if the linker doesn't return an error code!
+--- 5,11 ----
+  # libraries when they exist, but this doesn't mean they are needed for Vim.
+  #
+  #      Author: Bram Moolenaar
+! # Last change: 2010 Nov 03
+  #     License: Public domain
+  #
+  # Warning: This fails miserably if the linker doesn't return an error code!
+***************
+*** 16,26 ****
+  echo "$LINK " >link.cmd
+  exit_value=0
+  
+  #
+  # If auto/link.sed already exists, use it.  We assume a previous run of
+  # link.sh has found the correct set of libraries.
+  #
+- if test -f auto/link.sed; then
+    echo "link.sh: The file 'auto/link.sed' exists, which is going to be used now."
+    echo "link.sh: If linking fails, try deleting the auto/link.sed file."
+    echo "link.sh: If this fails too, try creating an empty auto/link.sed file."
+--- 16,38 ----
+  echo "$LINK " >link.cmd
+  exit_value=0
+  
++ if test "$LINK_AS_NEEDED" = yes; then
++   echo "link.sh: \$LINK_AS_NEEDED set to 'yes': invoking linker directly."
++   cat link.cmd
++   if sh link.cmd; then
++     exit_value=0
++     echo "link.sh: Linked fine"
++   else
++     exit_value=$?
++     echo "link.sh: Linking failed"
++   fi
++ else
++   if test -f auto/link.sed; then
++ 
+  #
+  # If auto/link.sed already exists, use it.  We assume a previous run of
+  # link.sh has found the correct set of libraries.
+  #
+    echo "link.sh: The file 'auto/link.sed' exists, which is going to be used now."
+    echo "link.sh: If linking fails, try deleting the auto/link.sed file."
+    echo "link.sh: If this fails too, try creating an empty auto/link.sed file."
+***************
+*** 124,129 ****
+--- 136,143 ----
+    fi
+  fi
+  
++ fi
++ 
+  #
+  # cleanup
+  #
+*** ../vim-7.3.049/src/version.c	2010-11-03 21:59:23.000000000 +0100
+--- src/version.c	2010-11-03 22:30:17.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     50,
+  /**/
+
+-- 
+Save the plankton - eat a whale.
+
+ /// 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.3.051 b/source/ap/vim/patches/7.3.051
new file mode 100644
index 00000000..ebf3680b
--- /dev/null
+++ b/source/ap/vim/patches/7.3.051
@@ -0,0 +1,111 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.051
+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.3.051
+Problem:    Crash when $PATH is empty.
+Solution:   Check for vim_getenv() returning NULL. (Yasuhiro Matsumoto)
+Files:	    src/ex_getln.c, src/os_win32.c
+
+
+*** ../vim-7.3.050/src/ex_getln.c	2010-10-27 12:58:19.000000000 +0200
+--- src/ex_getln.c	2010-11-10 15:31:33.000000000 +0100
+***************
+*** 4747,4753 ****
+--- 4747,4757 ----
+  			    || (pat[1] == '.' && vim_ispathsep(pat[2])))))
+  	path = (char_u *)".";
+      else
++     {
+  	path = vim_getenv((char_u *)"PATH", &mustfree);
++ 	if (path == NULL)
++ 	    path = (char_u *)"";
++     }
+  
+      /*
+       * Go over all directories in $PATH.  Expand matches in that directory and
+*** ../vim-7.3.050/src/os_win32.c	2010-10-27 12:17:54.000000000 +0200
+--- src/os_win32.c	2010-11-10 15:30:36.000000000 +0100
+***************
+*** 211,223 ****
+      static void
+  get_exe_name(void)
+  {
+!     char	temp[MAXPATHL];
+      char_u	*p;
+  
+      if (exe_name == NULL)
+      {
+  	/* store the name of the executable, may be used for $VIM */
+! 	GetModuleFileName(NULL, temp, MAXPATHL - 1);
+  	if (*temp != NUL)
+  	    exe_name = FullName_save((char_u *)temp, FALSE);
+      }
+--- 211,226 ----
+      static void
+  get_exe_name(void)
+  {
+!     /* Maximum length of $PATH is more than MAXPATHL.  8191 is often mentioned
+!      * as the maximum length that works (plus a NUL byte). */
+! #define MAX_ENV_PATH_LEN 8192
+!     char	temp[MAX_ENV_PATH_LEN];
+      char_u	*p;
+  
+      if (exe_name == NULL)
+      {
+  	/* store the name of the executable, may be used for $VIM */
+! 	GetModuleFileName(NULL, temp, MAX_ENV_PATH_LEN - 1);
+  	if (*temp != NUL)
+  	    exe_name = FullName_save((char_u *)temp, FALSE);
+      }
+***************
+*** 232,241 ****
+  	     * "!xxd" it's found in our starting directory.  Needed because
+  	     * SearchPath() also looks there. */
+  	    p = mch_getenv("PATH");
+! 	    if (STRLEN(p) + STRLEN(exe_path) + 2 < MAXPATHL)
+  	    {
+! 		STRCPY(temp, p);
+! 		STRCAT(temp, ";");
+  		STRCAT(temp, exe_path);
+  		vim_setenv((char_u *)"PATH", temp);
+  	    }
+--- 235,250 ----
+  	     * "!xxd" it's found in our starting directory.  Needed because
+  	     * SearchPath() also looks there. */
+  	    p = mch_getenv("PATH");
+! 	    if (p == NULL
+! 		       || STRLEN(p) + STRLEN(exe_path) + 2 < MAX_ENV_PATH_LEN)
+  	    {
+! 		if (p == NULL || *p == NUL)
+! 		    temp[0] = NUL;
+! 		else
+! 		{
+! 		    STRCPY(temp, p);
+! 		    STRCAT(temp, ";");
+! 		}
+  		STRCAT(temp, exe_path);
+  		vim_setenv((char_u *)"PATH", temp);
+  	    }
+*** ../vim-7.3.050/src/version.c	2010-11-03 22:32:18.000000000 +0100
+--- src/version.c	2010-11-10 15:34:43.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     51,
+  /**/
+
+-- 
+SIGFUN -- signature too funny (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.3.052 b/source/ap/vim/patches/7.3.052
new file mode 100644
index 00000000..be0691fa
--- /dev/null
+++ b/source/ap/vim/patches/7.3.052
@@ -0,0 +1,345 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.052
+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.3.052
+Problem:    When 'completefunc' opens a new window all kinds of errors follow.
+	    (Xavier Deguillard)
+Solution:   When 'completefunc' goes to another window or buffer and when it
+	    deletes text abort completion.  Add a test for 'completefunc'.
+Files:	    src/edit.c, 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, src/testdir/Makefile,
+	    src/testdir/test76.in, src/testdir/test76.ok
+
+
+*** ../vim-7.3.051/src/edit.c	2010-08-15 21:57:25.000000000 +0200
+--- src/edit.c	2010-11-10 16:50:12.000000000 +0100
+***************
+*** 58,63 ****
+--- 58,67 ----
+  };
+  
+  static char e_hitend[] = N_("Hit end of paragraph");
++ #ifdef FEAT_COMPL_FUNC
++ static char e_complwin[] = N_("E839: Completion function changed window");
++ static char e_compldel[] = N_("E840: Completion function deleted text");
++ #endif
+  
+  /*
+   * Structure used to store one match for insert completion.
+***************
+*** 3833,3838 ****
+--- 3837,3844 ----
+      char_u	*args[2];
+      char_u	*funcname;
+      pos_T	pos;
++     win_T	*curwin_save;
++     buf_T	*curbuf_save;
+  
+      funcname = (type == CTRL_X_FUNCTION) ? curbuf->b_p_cfu : curbuf->b_p_ofu;
+      if (*funcname == NUL)
+***************
+*** 3843,3855 ****
+      args[1] = base;
+  
+      pos = curwin->w_cursor;
+      matchlist = call_func_retlist(funcname, 2, args, FALSE);
+      curwin->w_cursor = pos;	/* restore the cursor position */
+!     if (matchlist == NULL)
+! 	return;
+  
+!     ins_compl_add_list(matchlist);
+!     list_unref(matchlist);
+  }
+  #endif /* FEAT_COMPL_FUNC */
+  
+--- 3849,3875 ----
+      args[1] = base;
+  
+      pos = curwin->w_cursor;
++     curwin_save = curwin;
++     curbuf_save = curbuf;
+      matchlist = call_func_retlist(funcname, 2, args, FALSE);
++     if (curwin_save != curwin || curbuf_save != curbuf)
++     {
++ 	EMSG(_(e_complwin));
++ 	goto theend;
++     }
+      curwin->w_cursor = pos;	/* restore the cursor position */
+!     check_cursor();
+!     if (!equalpos(curwin->w_cursor, pos))
+!     {
+! 	EMSG(_(e_compldel));
+! 	goto theend;
+!     }
+!     if (matchlist != NULL)
+! 	ins_compl_add_list(matchlist);
+  
+! theend:
+!     if (matchlist != NULL)
+! 	list_unref(matchlist);
+  }
+  #endif /* FEAT_COMPL_FUNC */
+  
+***************
+*** 4994,4999 ****
+--- 5014,5021 ----
+  	    int		col;
+  	    char_u	*funcname;
+  	    pos_T	pos;
++ 	    win_T	*curwin_save;
++ 	    buf_T	*curbuf_save;
+  
+  	    /* Call 'completefunc' or 'omnifunc' and get pattern length as a
+  	     * string */
+***************
+*** 5009,5016 ****
+--- 5031,5051 ----
+  	    args[0] = (char_u *)"1";
+  	    args[1] = NULL;
+  	    pos = curwin->w_cursor;
++ 	    curwin_save = curwin;
++ 	    curbuf_save = curbuf;
+  	    col = call_func_retnr(funcname, 2, args, FALSE);
++ 	    if (curwin_save != curwin || curbuf_save != curbuf)
++ 	    {
++ 		EMSG(_(e_complwin));
++ 		return FAIL;
++ 	    }
+  	    curwin->w_cursor = pos;	/* restore the cursor position */
++ 	    check_cursor();
++ 	    if (!equalpos(curwin->w_cursor, pos))
++ 	    {
++ 		EMSG(_(e_compldel));
++ 		return FAIL;
++ 	    }
+  
+  	    if (col < 0)
+  		col = curs_col;
+*** ../vim-7.3.051/src/testdir/Make_amiga.mak	2010-10-27 18:36:32.000000000 +0200
+--- src/testdir/Make_amiga.mak	2010-11-10 15:48:30.000000000 +0100
+***************
+*** 27,33 ****
+  		test56.out test57.out test58.out test59.out test60.out \
+  		test61.out test62.out test63.out test64.out test65.out \
+  		test66.out test67.out test68.out test69.out test70.out \
+! 		test71.out test72.out test73.out test74.out test75.out
+  
+  .SUFFIXES: .in .out
+  
+--- 27,34 ----
+  		test56.out test57.out test58.out test59.out test60.out \
+  		test61.out test62.out test63.out test64.out test65.out \
+  		test66.out test67.out test68.out test69.out test70.out \
+! 		test71.out test72.out test73.out test74.out test75.out \
+! 		test76.out
+  
+  .SUFFIXES: .in .out
+  
+***************
+*** 122,124 ****
+--- 123,126 ----
+  test73.out: test73.in
+  test74.out: test74.in
+  test75.out: test75.in
++ test76.out: test76.in
+*** ../vim-7.3.051/src/testdir/Make_dos.mak	2010-10-27 18:36:32.000000000 +0200
+--- src/testdir/Make_dos.mak	2010-11-10 15:48:38.000000000 +0100
+***************
+*** 28,34 ****
+  		test37.out test38.out test39.out test40.out test41.out \
+  		test42.out test52.out test65.out test66.out test67.out \
+  		test68.out test69.out test71.out test72.out test73.out \
+! 		test74.out test75.out
+  
+  SCRIPTS32 =	test50.out test70.out
+  
+--- 28,34 ----
+  		test37.out test38.out test39.out test40.out test41.out \
+  		test42.out test52.out test65.out test66.out test67.out \
+  		test68.out test69.out test71.out test72.out test73.out \
+! 		test74.out test75.out test76.out
+  
+  SCRIPTS32 =	test50.out test70.out
+  
+*** ../vim-7.3.051/src/testdir/Make_ming.mak	2010-10-27 18:36:32.000000000 +0200
+--- src/testdir/Make_ming.mak	2010-11-10 15:48:53.000000000 +0100
+***************
+*** 48,54 ****
+  		test37.out test38.out test39.out test40.out test41.out \
+  		test42.out test52.out test65.out test66.out test67.out \
+  		test68.out test69.out test71.out test72.out test73.out \
+! 		test74.out test75.out
+  
+  SCRIPTS32 =	test50.out test70.out
+  
+--- 48,54 ----
+  		test37.out test38.out test39.out test40.out test41.out \
+  		test42.out test52.out test65.out test66.out test67.out \
+  		test68.out test69.out test71.out test72.out test73.out \
+! 		test74.out test75.out test76.out
+  
+  SCRIPTS32 =	test50.out test70.out
+  
+*** ../vim-7.3.051/src/testdir/Make_os2.mak	2010-10-27 18:36:32.000000000 +0200
+--- src/testdir/Make_os2.mak	2010-11-10 15:49:10.000000000 +0100
+***************
+*** 27,33 ****
+  		test56.out test57.out test58.out test59.out test60.out \
+  		test61.out test62.out test63.out test64.out test65.out \
+  		test66.out test67.out test68.out test69.out test70.out \
+! 		test71.out test72.out test73.out test74.out test75.out
+  
+  .SUFFIXES: .in .out
+  
+--- 27,34 ----
+  		test56.out test57.out test58.out test59.out test60.out \
+  		test61.out test62.out test63.out test64.out test65.out \
+  		test66.out test67.out test68.out test69.out test70.out \
+! 		test71.out test72.out test73.out test74.out test75.out \
+! 		test76.out
+  
+  .SUFFIXES: .in .out
+  
+*** ../vim-7.3.051/src/testdir/Make_vms.mms	2010-10-27 18:36:32.000000000 +0200
+--- src/testdir/Make_vms.mms	2010-11-10 15:49:32.000000000 +0100
+***************
+*** 4,10 ****
+  # Authors:	Zoltan Arpadffy, <arpadffy@polarhome.com>
+  #		Sandor Kopanyi,  <sandor.kopanyi@mailbox.hu>
+  #
+! # Last change:  2010 Oct 20
+  #
+  # 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:  2010 Nov 10
+  #
+  # 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.
+***************
+*** 74,80 ****
+  	 test56.out test57.out test60.out \
+  	 test61.out test62.out test63.out test64.out test65.out \
+  	 test66.out test67.out test68.out test69.out \
+! 	 test71.out test72.out test74.out test75.out
+  
+  # Known problems:
+  # Test 30: a problem around mac format - unknown reason
+--- 74,80 ----
+  	 test56.out test57.out test60.out \
+  	 test61.out test62.out test63.out test64.out test65.out \
+  	 test66.out test67.out test68.out test69.out \
+! 	 test71.out test72.out test74.out test75.out test76.out
+  
+  # Known problems:
+  # Test 30: a problem around mac format - unknown reason
+*** ../vim-7.3.051/src/testdir/Makefile	2010-10-27 18:36:32.000000000 +0200
+--- src/testdir/Makefile	2010-11-10 15:47:32.000000000 +0100
+***************
+*** 25,31 ****
+  		test59.out test60.out test61.out test62.out test63.out \
+  		test64.out test65.out test66.out test67.out test68.out \
+  		test69.out test70.out test71.out test72.out test73.out \
+! 		test74.out test75.out
+  
+  SCRIPTS_GUI = test16.out
+  
+--- 25,31 ----
+  		test59.out test60.out test61.out test62.out test63.out \
+  		test64.out test65.out test66.out test67.out test68.out \
+  		test69.out test70.out test71.out test72.out test73.out \
+! 		test74.out test75.out test76.out
+  
+  SCRIPTS_GUI = test16.out
+  
+*** ../vim-7.3.051/src/testdir/test76.in	2010-11-10 16:51:45.000000000 +0100
+--- src/testdir/test76.in	2010-11-10 16:38:45.000000000 +0100
+***************
+*** 0 ****
+--- 1,46 ----
++ Tests for completefunc/omnifunc. vim: set ft=vim :
++ 
++ STARTTEST
++ :"Test that nothing happens if the 'completefunc' opens
++ :"a new window (no completion, no crash)
++ :so small.vim
++ :function! DummyCompleteOne(findstart, base)
++ :  if a:findstart
++ :    return 0
++ :  else
++ :    wincmd n
++ :    return ['onedef', 'oneDEF']
++ :  endif
++ :endfunction
++ :setlocal completefunc=DummyCompleteOne
++ /^one
++ A:q!
++ :function! DummyCompleteTwo(findstart, base)
++ :  if a:findstart
++ :    wincmd n
++ :    return 0
++ :  else
++ :    return ['twodef', 'twoDEF']
++ :  endif
++ :endfunction
++ :setlocal completefunc=DummyCompleteTwo
++ /^two
++ A:q!
++ :"Test that 'completefunc' works when it's OK.
++ :function! DummyCompleteThree(findstart, base)
++ :  if a:findstart
++ :    return 0
++ :  else
++ :    return ['threedef', 'threeDEF']
++ :  endif
++ :endfunction
++ :setlocal completefunc=DummyCompleteThree
++ /^three
++ A:/^+++/,/^three/w! test.out
++ :qa!
++ ENDTEST
++ 
++ +++
++ one
++ two
++ three
+*** ../vim-7.3.051/src/testdir/test76.ok	2010-11-10 16:51:45.000000000 +0100
+--- src/testdir/test76.ok	2010-11-10 16:38:58.000000000 +0100
+***************
+*** 0 ****
+--- 1,4 ----
++ +++
++ 
++ two
++ threeDEF
+*** ../vim-7.3.051/src/version.c	2010-11-10 15:37:00.000000000 +0100
+--- src/version.c	2010-11-10 16:40:29.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     52,
+  /**/
+
+-- 
+BRIDGEKEEPER: What is the air-speed velocity of an unladen swallow?
+ARTHUR:       What do you mean?  An African or European swallow?
+BRIDGEKEEPER: Er ...  I don't know that ... Aaaaarrrrrrggghhh!
+   BRIDGEKEEPER is cast into the gorge.
+                 "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.3.053 b/source/ap/vim/patches/7.3.053
new file mode 100644
index 00000000..687b39d2
--- /dev/null
+++ b/source/ap/vim/patches/7.3.053
@@ -0,0 +1,89 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.053
+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.3.053
+Problem:    complete() function doesn't reset complete direction.  Can't use
+	    an empty string in the list of matches.
+Solution:   Set compl_direction to FORWARD.  Add "empty" key to allow empty
+	    words. (Kikuchan)
+Files:	    src/edit.c
+
+
+*** ../vim-7.3.052/src/edit.c	2010-11-10 16:54:16.000000000 +0100
+--- src/edit.c	2010-11-10 17:03:23.000000000 +0100
+***************
+*** 2662,2667 ****
+--- 2662,2668 ----
+      if (stop_arrow() == FAIL)
+  	return;
+  
++     compl_direction = FORWARD;
+      if (startcol > curwin->w_cursor.col)
+  	startcol = curwin->w_cursor.col;
+      compl_col = startcol;
+***************
+*** 3909,3914 ****
+--- 3910,3916 ----
+      char_u	*word;
+      int		icase = FALSE;
+      int		adup = FALSE;
++     int		aempty = FALSE;
+      char_u	*(cptext[CPT_COUNT]);
+  
+      if (tv->v_type == VAR_DICT && tv->vval.v_dict != NULL)
+***************
+*** 3926,3938 ****
+  	    icase = get_dict_number(tv->vval.v_dict, (char_u *)"icase");
+  	if (get_dict_string(tv->vval.v_dict, (char_u *)"dup", FALSE) != NULL)
+  	    adup = get_dict_number(tv->vval.v_dict, (char_u *)"dup");
+      }
+      else
+      {
+  	word = get_tv_string_chk(tv);
+  	vim_memset(cptext, 0, sizeof(cptext));
+      }
+!     if (word == NULL || *word == NUL)
+  	return FAIL;
+      return ins_compl_add(word, -1, icase, NULL, cptext, dir, 0, adup);
+  }
+--- 3928,3942 ----
+  	    icase = get_dict_number(tv->vval.v_dict, (char_u *)"icase");
+  	if (get_dict_string(tv->vval.v_dict, (char_u *)"dup", FALSE) != NULL)
+  	    adup = get_dict_number(tv->vval.v_dict, (char_u *)"dup");
++ 	if (get_dict_string(tv->vval.v_dict, (char_u *)"empty", FALSE) != NULL)
++ 	    aempty = get_dict_number(tv->vval.v_dict, (char_u *)"empty");
+      }
+      else
+      {
+  	word = get_tv_string_chk(tv);
+  	vim_memset(cptext, 0, sizeof(cptext));
+      }
+!     if (word == NULL || (!aempty && *word == NUL))
+  	return FAIL;
+      return ins_compl_add(word, -1, icase, NULL, cptext, dir, 0, adup);
+  }
+*** ../vim-7.3.052/src/version.c	2010-11-10 16:54:16.000000000 +0100
+--- src/version.c	2010-11-10 17:10:39.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     53,
+  /**/
+
+-- 
+BEDEVERE: How do you know so much about swallows?
+ARTHUR:   Well you have to know these things when you're a king, you know.
+                 "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.3.054 b/source/ap/vim/patches/7.3.054
new file mode 100644
index 00000000..2fd7236a
--- /dev/null
+++ b/source/ap/vim/patches/7.3.054
@@ -0,0 +1,112 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.054
+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.3.054
+Problem:    Can define a user command for :Print, but it doesn't work. (Aaron
+	    Thoma)
+Solution:   Let user command :Print overrule the builtin command (Christian
+	    Brabandt)  Disallow :X and :Next as a user defined command.
+Files:	    src/ex_docmd.c
+
+
+*** ../vim-7.3.053/src/ex_docmd.c	2010-10-13 17:50:02.000000000 +0200
+--- src/ex_docmd.c	2010-11-10 18:33:18.000000000 +0100
+***************
+*** 2871,2878 ****
+  	    }
+  
+  #ifdef FEAT_USR_CMDS
+! 	/* Look for a user defined command as a last resort */
+! 	if (eap->cmdidx == CMD_SIZE && *eap->cmd >= 'A' && *eap->cmd <= 'Z')
+  	{
+  	    /* User defined commands may contain digits. */
+  	    while (ASCII_ISALNUM(*p))
+--- 2871,2880 ----
+  	    }
+  
+  #ifdef FEAT_USR_CMDS
+! 	/* Look for a user defined command as a last resort.  Let ":Print" be
+! 	 * overruled by a user defined command. */
+! 	if ((eap->cmdidx == CMD_SIZE || eap->cmdidx == CMD_Print)
+! 		&& *eap->cmd >= 'A' && *eap->cmd <= 'Z')
+  	{
+  	    /* User defined commands may contain digits. */
+  	    while (ASCII_ISALNUM(*p))
+***************
+*** 5588,5593 ****
+--- 5590,5596 ----
+      int	    compl = EXPAND_NOTHING;
+      char_u  *compl_arg = NULL;
+      int	    has_attr = (eap->arg[0] == '-');
++     int	    name_len;
+  
+      p = eap->arg;
+  
+***************
+*** 5613,5618 ****
+--- 5616,5622 ----
+  	return;
+      }
+      end = p;
++     name_len = (int)(end - name);
+  
+      /* If there is nothing after the name, and no attributes were specified,
+       * we are listing commands
+***************
+*** 5627,5632 ****
+--- 5631,5643 ----
+  	EMSG(_("E183: User defined commands must start with an uppercase letter"));
+  	return;
+      }
++     else if ((name_len == 1 && *name == 'X')
++ 	  || (name_len <= 4
++ 		  && STRNCMP(name, "Next", name_len > 4 ? 4 : name_len) == 0))
++     {
++ 	EMSG(_("E841: Reserved name, cannot be used for user defined command"));
++ 	return;
++     }
+      else
+  	uc_add_command(name, end - name, p, argt, def, flags, compl, compl_arg,
+  								eap->forceit);
+***************
+*** 9394,9400 ****
+  ex_ptag(eap)
+      exarg_T	*eap;
+  {
+!     g_do_tagpreview = p_pvh;
+      ex_tag_cmd(eap, cmdnames[eap->cmdidx].cmd_name + 1);
+  }
+  
+--- 9405,9411 ----
+  ex_ptag(eap)
+      exarg_T	*eap;
+  {
+!     g_do_tagpreview = p_pvh;  /* will be reset to 0 in ex_tag_cmd() */
+      ex_tag_cmd(eap, cmdnames[eap->cmdidx].cmd_name + 1);
+  }
+  
+*** ../vim-7.3.053/src/version.c	2010-11-10 17:11:29.000000000 +0100
+--- src/version.c	2010-11-10 18:58:28.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     54,
+  /**/
+
+-- 
+You can be stopped by the police for biking over 65 miles per hour.
+You are not allowed to walk across a street on your hands.
+		[real standing laws in Connecticut, 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.3.055 b/source/ap/vim/patches/7.3.055
new file mode 100644
index 00000000..5e6ca16c
--- /dev/null
+++ b/source/ap/vim/patches/7.3.055
@@ -0,0 +1,359 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.055
+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.3.055
+Problem:    Recursively nested lists and dictionaries cause a near-endless
+	    loop when comparing them with a copy. (ZyX)
+Solution:   Limit recursiveness in a way that non-recursive structures can
+	    still be nested very deep.
+Files:	    src/eval.c, src/testdir/test55.in, src/testdir/test55.ok
+
+
+*** ../vim-7.3.054/src/eval.c	2010-10-20 21:22:17.000000000 +0200
+--- src/eval.c	2010-11-10 20:02:57.000000000 +0100
+***************
+*** 434,442 ****
+  static void listitem_free __ARGS((listitem_T *item));
+  static void listitem_remove __ARGS((list_T *l, listitem_T *item));
+  static long list_len __ARGS((list_T *l));
+! static int list_equal __ARGS((list_T *l1, list_T *l2, int ic));
+! static int dict_equal __ARGS((dict_T *d1, dict_T *d2, int ic));
+! static int tv_equal __ARGS((typval_T *tv1, typval_T *tv2, int ic));
+  static listitem_T *list_find __ARGS((list_T *l, long n));
+  static long list_find_nr __ARGS((list_T *l, long idx, int *errorp));
+  static long list_idx_of_item __ARGS((list_T *l, listitem_T *item));
+--- 434,442 ----
+  static void listitem_free __ARGS((listitem_T *item));
+  static void listitem_remove __ARGS((list_T *l, listitem_T *item));
+  static long list_len __ARGS((list_T *l));
+! static int list_equal __ARGS((list_T *l1, list_T *l2, int ic, int recursive));
+! static int dict_equal __ARGS((dict_T *d1, dict_T *d2, int ic, int recursive));
+! static int tv_equal __ARGS((typval_T *tv1, typval_T *tv2, int ic, int recursive));
+  static listitem_T *list_find __ARGS((list_T *l, long n));
+  static long list_find_nr __ARGS((list_T *l, long idx, int *errorp));
+  static long list_idx_of_item __ARGS((list_T *l, listitem_T *item));
+***************
+*** 4350,4356 ****
+  		else
+  		{
+  		    /* Compare two Lists for being equal or unequal. */
+! 		    n1 = list_equal(rettv->vval.v_list, var2.vval.v_list, ic);
+  		    if (type == TYPE_NEQUAL)
+  			n1 = !n1;
+  		}
+--- 4350,4357 ----
+  		else
+  		{
+  		    /* Compare two Lists for being equal or unequal. */
+! 		    n1 = list_equal(rettv->vval.v_list, var2.vval.v_list,
+! 								   ic, FALSE);
+  		    if (type == TYPE_NEQUAL)
+  			n1 = !n1;
+  		}
+***************
+*** 4379,4385 ****
+  		else
+  		{
+  		    /* Compare two Dictionaries for being equal or unequal. */
+! 		    n1 = dict_equal(rettv->vval.v_dict, var2.vval.v_dict, ic);
+  		    if (type == TYPE_NEQUAL)
+  			n1 = !n1;
+  		}
+--- 4380,4387 ----
+  		else
+  		{
+  		    /* Compare two Dictionaries for being equal or unequal. */
+! 		    n1 = dict_equal(rettv->vval.v_dict, var2.vval.v_dict,
+! 								   ic, FALSE);
+  		    if (type == TYPE_NEQUAL)
+  			n1 = !n1;
+  		}
+***************
+*** 5914,5923 ****
+   * Return TRUE when two lists have exactly the same values.
+   */
+      static int
+! list_equal(l1, l2, ic)
+      list_T	*l1;
+      list_T	*l2;
+      int		ic;	/* ignore case for strings */
+  {
+      listitem_T	*item1, *item2;
+  
+--- 5916,5926 ----
+   * Return TRUE when two lists have exactly the same values.
+   */
+      static int
+! list_equal(l1, l2, ic, recursive)
+      list_T	*l1;
+      list_T	*l2;
+      int		ic;	/* ignore case for strings */
++     int		recursive;  /* TRUE when used recursively */
+  {
+      listitem_T	*item1, *item2;
+  
+***************
+*** 5931,5937 ****
+      for (item1 = l1->lv_first, item2 = l2->lv_first;
+  	    item1 != NULL && item2 != NULL;
+  			       item1 = item1->li_next, item2 = item2->li_next)
+! 	if (!tv_equal(&item1->li_tv, &item2->li_tv, ic))
+  	    return FALSE;
+      return item1 == NULL && item2 == NULL;
+  }
+--- 5934,5940 ----
+      for (item1 = l1->lv_first, item2 = l2->lv_first;
+  	    item1 != NULL && item2 != NULL;
+  			       item1 = item1->li_next, item2 = item2->li_next)
+! 	if (!tv_equal(&item1->li_tv, &item2->li_tv, ic, recursive))
+  	    return FALSE;
+      return item1 == NULL && item2 == NULL;
+  }
+***************
+*** 5953,5962 ****
+   * Return TRUE when two dictionaries have exactly the same key/values.
+   */
+      static int
+! dict_equal(d1, d2, ic)
+      dict_T	*d1;
+      dict_T	*d2;
+      int		ic;	/* ignore case for strings */
+  {
+      hashitem_T	*hi;
+      dictitem_T	*item2;
+--- 5956,5966 ----
+   * Return TRUE when two dictionaries have exactly the same key/values.
+   */
+      static int
+! dict_equal(d1, d2, ic, recursive)
+      dict_T	*d1;
+      dict_T	*d2;
+      int		ic;	/* ignore case for strings */
++     int		recursive; /* TRUE when used recursively */
+  {
+      hashitem_T	*hi;
+      dictitem_T	*item2;
+***************
+*** 5977,5983 ****
+  	    item2 = dict_find(d2, hi->hi_key, -1);
+  	    if (item2 == NULL)
+  		return FALSE;
+! 	    if (!tv_equal(&HI2DI(hi)->di_tv, &item2->di_tv, ic))
+  		return FALSE;
+  	    --todo;
+  	}
+--- 5981,5987 ----
+  	    item2 = dict_find(d2, hi->hi_key, -1);
+  	    if (item2 == NULL)
+  		return FALSE;
+! 	    if (!tv_equal(&HI2DI(hi)->di_tv, &item2->di_tv, ic, recursive))
+  		return FALSE;
+  	    --todo;
+  	}
+***************
+*** 5985,6025 ****
+      return TRUE;
+  }
+  
+  /*
+   * Return TRUE if "tv1" and "tv2" have the same value.
+   * Compares the items just like "==" would compare them, but strings and
+   * numbers are different.  Floats and numbers are also different.
+   */
+      static int
+! tv_equal(tv1, tv2, ic)
+      typval_T *tv1;
+      typval_T *tv2;
+!     int	    ic;	    /* ignore case */
+  {
+      char_u	buf1[NUMBUFLEN], buf2[NUMBUFLEN];
+      char_u	*s1, *s2;
+!     static int  recursive = 0;	    /* cach recursive loops */
+      int		r;
+  
+      if (tv1->v_type != tv2->v_type)
+  	return FALSE;
+      /* Catch lists and dicts that have an endless loop by limiting
+!      * recursiveness to 1000.  We guess they are equal then. */
+!     if (recursive >= 1000)
+  	return TRUE;
+  
+      switch (tv1->v_type)
+      {
+  	case VAR_LIST:
+! 	    ++recursive;
+! 	    r = list_equal(tv1->vval.v_list, tv2->vval.v_list, ic);
+! 	    --recursive;
+  	    return r;
+  
+  	case VAR_DICT:
+! 	    ++recursive;
+! 	    r = dict_equal(tv1->vval.v_dict, tv2->vval.v_dict, ic);
+! 	    --recursive;
+  	    return r;
+  
+  	case VAR_FUNC:
+--- 5989,6042 ----
+      return TRUE;
+  }
+  
++ static int tv_equal_recurse_limit;
++ 
+  /*
+   * Return TRUE if "tv1" and "tv2" have the same value.
+   * Compares the items just like "==" would compare them, but strings and
+   * numbers are different.  Floats and numbers are also different.
+   */
+      static int
+! tv_equal(tv1, tv2, ic, recursive)
+      typval_T *tv1;
+      typval_T *tv2;
+!     int	     ic;	    /* ignore case */
+!     int	     recursive;	    /* TRUE when used recursively */
+  {
+      char_u	buf1[NUMBUFLEN], buf2[NUMBUFLEN];
+      char_u	*s1, *s2;
+!     static int  recursive_cnt = 0;	    /* catch recursive loops */
+      int		r;
+  
+      if (tv1->v_type != tv2->v_type)
+  	return FALSE;
++ 
+      /* Catch lists and dicts that have an endless loop by limiting
+!      * recursiveness to a limit.  We guess they are equal then.
+!      * A fixed limit has the problem of still taking an awful long time.
+!      * Reduce the limit every time running into it. That should work fine for
+!      * deeply linked structures that are not recursively linked and catch
+!      * recursiveness quickly. */
+!     if (!recursive)
+! 	tv_equal_recurse_limit = 1000;
+!     if (recursive_cnt >= tv_equal_recurse_limit)
+!     {
+! 	--tv_equal_recurse_limit;
+  	return TRUE;
++     }
+  
+      switch (tv1->v_type)
+      {
+  	case VAR_LIST:
+! 	    ++recursive_cnt;
+! 	    r = list_equal(tv1->vval.v_list, tv2->vval.v_list, ic, TRUE);
+! 	    --recursive_cnt;
+  	    return r;
+  
+  	case VAR_DICT:
+! 	    ++recursive_cnt;
+! 	    r = dict_equal(tv1->vval.v_dict, tv2->vval.v_dict, ic, TRUE);
+! 	    --recursive_cnt;
+  	    return r;
+  
+  	case VAR_FUNC:
+***************
+*** 9391,9397 ****
+  	    }
+  
+  	    for ( ; li != NULL; li = li->li_next)
+! 		if (tv_equal(&li->li_tv, &argvars[1], ic))
+  		    ++n;
+  	}
+      }
+--- 9408,9414 ----
+  	    }
+  
+  	    for ( ; li != NULL; li = li->li_next)
+! 		if (tv_equal(&li->li_tv, &argvars[1], ic, FALSE))
+  		    ++n;
+  	}
+      }
+***************
+*** 9418,9424 ****
+  		if (!HASHITEM_EMPTY(hi))
+  		{
+  		    --todo;
+! 		    if (tv_equal(&HI2DI(hi)->di_tv, &argvars[1], ic))
+  			++n;
+  		}
+  	    }
+--- 9435,9441 ----
+  		if (!HASHITEM_EMPTY(hi))
+  		{
+  		    --todo;
+! 		    if (tv_equal(&HI2DI(hi)->di_tv, &argvars[1], ic, FALSE))
+  			++n;
+  		}
+  	    }
+***************
+*** 12574,12580 ****
+  	}
+  
+  	for ( ; item != NULL; item = item->li_next, ++idx)
+! 	    if (tv_equal(&item->li_tv, &argvars[1], ic))
+  	    {
+  		rettv->vval.v_number = idx;
+  		break;
+--- 12591,12597 ----
+  	}
+  
+  	for ( ; item != NULL; item = item->li_next, ++idx)
+! 	    if (tv_equal(&item->li_tv, &argvars[1], ic, FALSE))
+  	    {
+  		rettv->vval.v_number = idx;
+  		break;
+*** ../vim-7.3.054/src/testdir/test55.in	2010-08-15 21:57:29.000000000 +0200
+--- src/testdir/test55.in	2010-11-10 20:15:27.000000000 +0100
+***************
+*** 342,348 ****
+--- 342,359 ----
+  :$put =(d == d)
+  :$put =(l != deepcopy(l))
+  :$put =(d != deepcopy(d))
++ :"
++ :" compare complex recursively linked list and dict
++ :let l = []
++ :call add(l, l)
++ :let dict4 = {"l": l}
++ :call add(dict4.l, dict4)
++ :let lcopy = deepcopy(l)
++ :let dict4copy = deepcopy(dict4)
++ :$put =(l == lcopy)
++ :$put =(dict4 == dict4copy)
+  :endfun
++ :"
+  :call Test(1, 2, [3, 4], {5: 6})  " This may take a while
+  :"
+  :delfunc Test
+*** ../vim-7.3.054/src/testdir/test55.ok	2010-08-15 21:57:29.000000000 +0200
+--- src/testdir/test55.ok	2010-11-10 20:16:37.000000000 +0100
+***************
+*** 109,111 ****
+--- 109,113 ----
+  1
+  0
+  0
++ 1
++ 1
+*** ../vim-7.3.054/src/version.c	2010-11-10 18:59:50.000000000 +0100
+--- src/version.c	2010-11-10 20:10:51.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     55,
+  /**/
+
+-- 
+A special law prohibits unmarried women from parachuting on Sunday or she
+shall risk arrest, fine, and/or jailing.
+		[real standing law in Florida, 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.3.056 b/source/ap/vim/patches/7.3.056
new file mode 100644
index 00000000..49c91b62
--- /dev/null
+++ b/source/ap/vim/patches/7.3.056
@@ -0,0 +1,542 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.056
+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.3.056
+Problem:    "getline" argument in do_cmdline() shadows global.
+Solution:   Rename the argument.
+Files:	    src/ex_docmd.c
+
+
+*** ../vim-7.3.055/src/ex_docmd.c	2010-11-10 18:59:50.000000000 +0100
+--- src/ex_docmd.c	2010-11-16 11:24:40.000000000 +0100
+***************
+*** 733,739 ****
+   * do_cmdline(): execute one Ex command line
+   *
+   * 1. Execute "cmdline" when it is not NULL.
+!  *    If "cmdline" is NULL, or more lines are needed, getline() is used.
+   * 2. Split up in parts separated with '|'.
+   *
+   * This function can be called recursively!
+--- 733,739 ----
+   * do_cmdline(): execute one Ex command line
+   *
+   * 1. Execute "cmdline" when it is not NULL.
+!  *    If "cmdline" is NULL, or more lines are needed, fgetline() is used.
+   * 2. Split up in parts separated with '|'.
+   *
+   * This function can be called recursively!
+***************
+*** 741,747 ****
+   * flags:
+   * DOCMD_VERBOSE  - The command will be included in the error message.
+   * DOCMD_NOWAIT   - Don't call wait_return() and friends.
+!  * DOCMD_REPEAT   - Repeat execution until getline() returns NULL.
+   * DOCMD_KEYTYPED - Don't reset KeyTyped.
+   * DOCMD_EXCRESET - Reset the exception environment (used for debugging).
+   * DOCMD_KEEPLINE - Store first typed line (for repeating with ".").
+--- 741,747 ----
+   * flags:
+   * DOCMD_VERBOSE  - The command will be included in the error message.
+   * DOCMD_NOWAIT   - Don't call wait_return() and friends.
+!  * DOCMD_REPEAT   - Repeat execution until fgetline() returns NULL.
+   * DOCMD_KEYTYPED - Don't reset KeyTyped.
+   * DOCMD_EXCRESET - Reset the exception environment (used for debugging).
+   * DOCMD_KEEPLINE - Store first typed line (for repeating with ".").
+***************
+*** 749,763 ****
+   * return FAIL if cmdline could not be executed, OK otherwise
+   */
+      int
+! do_cmdline(cmdline, getline, cookie, flags)
+      char_u	*cmdline;
+!     char_u	*(*getline) __ARGS((int, void *, int));
+!     void	*cookie;		/* argument for getline() */
+      int		flags;
+  {
+      char_u	*next_cmdline;		/* next cmd to execute */
+      char_u	*cmdline_copy = NULL;	/* copy of cmd line */
+!     int		used_getline = FALSE;	/* used "getline" to obtain command */
+      static int	recursive = 0;		/* recursive depth */
+      int		msg_didout_before_start = 0;
+      int		count = 0;		/* line number count */
+--- 749,763 ----
+   * return FAIL if cmdline could not be executed, OK otherwise
+   */
+      int
+! do_cmdline(cmdline, fgetline, cookie, flags)
+      char_u	*cmdline;
+!     char_u	*(*fgetline) __ARGS((int, void *, int));
+!     void	*cookie;		/* argument for fgetline() */
+      int		flags;
+  {
+      char_u	*next_cmdline;		/* next cmd to execute */
+      char_u	*cmdline_copy = NULL;	/* copy of cmd line */
+!     int		used_getline = FALSE;	/* used "fgetline" to obtain command */
+      static int	recursive = 0;		/* recursive depth */
+      int		msg_didout_before_start = 0;
+      int		count = 0;		/* line number count */
+***************
+*** 775,788 ****
+      struct msglist	**saved_msg_list = NULL;
+      struct msglist	*private_msg_list;
+  
+!     /* "getline" and "cookie" passed to do_one_cmd() */
+      char_u	*(*cmd_getline) __ARGS((int, void *, int));
+      void	*cmd_cookie;
+      struct loop_cookie cmd_loop_cookie;
+      void	*real_cookie;
+      int		getline_is_func;
+  #else
+! # define cmd_getline getline
+  # define cmd_cookie cookie
+  #endif
+      static int	call_depth = 0;		/* recursiveness */
+--- 775,788 ----
+      struct msglist	**saved_msg_list = NULL;
+      struct msglist	*private_msg_list;
+  
+!     /* "fgetline" and "cookie" passed to do_one_cmd() */
+      char_u	*(*cmd_getline) __ARGS((int, void *, int));
+      void	*cmd_cookie;
+      struct loop_cookie cmd_loop_cookie;
+      void	*real_cookie;
+      int		getline_is_func;
+  #else
+! # define cmd_getline fgetline
+  # define cmd_cookie cookie
+  #endif
+      static int	call_depth = 0;		/* recursiveness */
+***************
+*** 822,831 ****
+      cstack.cs_lflags = 0;
+      ga_init2(&lines_ga, (int)sizeof(wcmd_T), 10);
+  
+!     real_cookie = getline_cookie(getline, cookie);
+  
+      /* Inside a function use a higher nesting level. */
+!     getline_is_func = getline_equal(getline, cookie, get_func_line);
+      if (getline_is_func && ex_nesting_level == func_level(real_cookie))
+  	++ex_nesting_level;
+  
+--- 822,831 ----
+      cstack.cs_lflags = 0;
+      ga_init2(&lines_ga, (int)sizeof(wcmd_T), 10);
+  
+!     real_cookie = getline_cookie(fgetline, cookie);
+  
+      /* Inside a function use a higher nesting level. */
+!     getline_is_func = getline_equal(fgetline, cookie, get_func_line);
+      if (getline_is_func && ex_nesting_level == func_level(real_cookie))
+  	++ex_nesting_level;
+  
+***************
+*** 837,843 ****
+  	breakpoint = func_breakpoint(real_cookie);
+  	dbg_tick = func_dbg_tick(real_cookie);
+      }
+!     else if (getline_equal(getline, cookie, getsourceline))
+      {
+  	fname = sourcing_name;
+  	breakpoint = source_breakpoint(real_cookie);
+--- 837,843 ----
+  	breakpoint = func_breakpoint(real_cookie);
+  	dbg_tick = func_dbg_tick(real_cookie);
+      }
+!     else if (getline_equal(fgetline, cookie, getsourceline))
+      {
+  	fname = sourcing_name;
+  	breakpoint = source_breakpoint(real_cookie);
+***************
+*** 881,887 ****
+       * KeyTyped is only set when calling vgetc().  Reset it here when not
+       * calling vgetc() (sourced command lines).
+       */
+!     if (!(flags & DOCMD_KEYTYPED) && !getline_equal(getline, cookie, getexline))
+  	KeyTyped = FALSE;
+  
+      /*
+--- 881,888 ----
+       * KeyTyped is only set when calling vgetc().  Reset it here when not
+       * calling vgetc() (sourced command lines).
+       */
+!     if (!(flags & DOCMD_KEYTYPED)
+! 			       && !getline_equal(fgetline, cookie, getexline))
+  	KeyTyped = FALSE;
+  
+      /*
+***************
+*** 894,900 ****
+      do
+      {
+  #ifdef FEAT_EVAL
+! 	getline_is_func = getline_equal(getline, cookie, get_func_line);
+  #endif
+  
+  	/* stop skipping cmds for an error msg after all endif/while/for */
+--- 895,901 ----
+      do
+      {
+  #ifdef FEAT_EVAL
+! 	getline_is_func = getline_equal(fgetline, cookie, get_func_line);
+  #endif
+  
+  	/* stop skipping cmds for an error msg after all endif/while/for */
+***************
+*** 909,915 ****
+  
+  	/*
+  	 * 1. If repeating a line in a loop, get a line from lines_ga.
+! 	 * 2. If no line given: Get an allocated line with getline().
+  	 * 3. If a line is given: Make a copy, so we can mess with it.
+  	 */
+  
+--- 910,916 ----
+  
+  	/*
+  	 * 1. If repeating a line in a loop, get a line from lines_ga.
+! 	 * 2. If no line given: Get an allocated line with fgetline().
+  	 * 3. If a line is given: Make a copy, so we can mess with it.
+  	 */
+  
+***************
+*** 938,949 ****
+  	    }
+  #ifdef FEAT_PROFILE
+  	    else if (do_profiling == PROF_YES
+! 			     && getline_equal(getline, cookie, getsourceline))
+  		script_line_end();
+  #endif
+  
+  	    /* Check if a sourced file hit a ":finish" command. */
+! 	    if (source_finished(getline, cookie))
+  	    {
+  		retval = FAIL;
+  		break;
+--- 939,950 ----
+  	    }
+  #ifdef FEAT_PROFILE
+  	    else if (do_profiling == PROF_YES
+! 			    && getline_equal(fgetline, cookie, getsourceline))
+  		script_line_end();
+  #endif
+  
+  	    /* Check if a sourced file hit a ":finish" command. */
+! 	    if (source_finished(fgetline, cookie))
+  	    {
+  		retval = FAIL;
+  		break;
+***************
+*** 954,960 ****
+  						   && *dbg_tick != debug_tick)
+  	    {
+  		*breakpoint = dbg_find_breakpoint(
+! 				getline_equal(getline, cookie, getsourceline),
+  							fname, sourcing_lnum);
+  		*dbg_tick = debug_tick;
+  	    }
+--- 955,961 ----
+  						   && *dbg_tick != debug_tick)
+  	    {
+  		*breakpoint = dbg_find_breakpoint(
+! 				getline_equal(fgetline, cookie, getsourceline),
+  							fname, sourcing_lnum);
+  		*dbg_tick = debug_tick;
+  	    }
+***************
+*** 969,975 ****
+  		dbg_breakpoint(fname, sourcing_lnum);
+  		/* Find next breakpoint. */
+  		*breakpoint = dbg_find_breakpoint(
+! 				getline_equal(getline, cookie, getsourceline),
+  							fname, sourcing_lnum);
+  		*dbg_tick = debug_tick;
+  	    }
+--- 970,976 ----
+  		dbg_breakpoint(fname, sourcing_lnum);
+  		/* Find next breakpoint. */
+  		*breakpoint = dbg_find_breakpoint(
+! 			       getline_equal(fgetline, cookie, getsourceline),
+  							fname, sourcing_lnum);
+  		*dbg_tick = debug_tick;
+  	    }
+***************
+*** 978,984 ****
+  	    {
+  		if (getline_is_func)
+  		    func_line_start(real_cookie);
+! 		else if (getline_equal(getline, cookie, getsourceline))
+  		    script_line_start();
+  	    }
+  # endif
+--- 979,985 ----
+  	    {
+  		if (getline_is_func)
+  		    func_line_start(real_cookie);
+! 		else if (getline_equal(fgetline, cookie, getsourceline))
+  		    script_line_start();
+  	    }
+  # endif
+***************
+*** 987,993 ****
+  	if (cstack.cs_looplevel > 0)
+  	{
+  	    /* Inside a while/for loop we need to store the lines and use them
+! 	     * again.  Pass a different "getline" function to do_one_cmd()
+  	     * below, so that it stores lines in or reads them from
+  	     * "lines_ga".  Makes it possible to define a function inside a
+  	     * while/for loop. */
+--- 988,994 ----
+  	if (cstack.cs_looplevel > 0)
+  	{
+  	    /* Inside a while/for loop we need to store the lines and use them
+! 	     * again.  Pass a different "fgetline" function to do_one_cmd()
+  	     * below, so that it stores lines in or reads them from
+  	     * "lines_ga".  Makes it possible to define a function inside a
+  	     * while/for loop. */
+***************
+*** 995,1021 ****
+  	    cmd_cookie = (void *)&cmd_loop_cookie;
+  	    cmd_loop_cookie.lines_gap = &lines_ga;
+  	    cmd_loop_cookie.current_line = current_line;
+! 	    cmd_loop_cookie.getline = getline;
+  	    cmd_loop_cookie.cookie = cookie;
+  	    cmd_loop_cookie.repeating = (current_line < lines_ga.ga_len);
+  	}
+  	else
+  	{
+! 	    cmd_getline = getline;
+  	    cmd_cookie = cookie;
+  	}
+  #endif
+  
+! 	/* 2. If no line given, get an allocated line with getline(). */
+  	if (next_cmdline == NULL)
+  	{
+  	    /*
+  	     * Need to set msg_didout for the first line after an ":if",
+  	     * otherwise the ":if" will be overwritten.
+  	     */
+! 	    if (count == 1 && getline_equal(getline, cookie, getexline))
+  		msg_didout = TRUE;
+! 	    if (getline == NULL || (next_cmdline = getline(':', cookie,
+  #ifdef FEAT_EVAL
+  		    cstack.cs_idx < 0 ? 0 : (cstack.cs_idx + 1) * 2
+  #else
+--- 996,1022 ----
+  	    cmd_cookie = (void *)&cmd_loop_cookie;
+  	    cmd_loop_cookie.lines_gap = &lines_ga;
+  	    cmd_loop_cookie.current_line = current_line;
+! 	    cmd_loop_cookie.getline = fgetline;
+  	    cmd_loop_cookie.cookie = cookie;
+  	    cmd_loop_cookie.repeating = (current_line < lines_ga.ga_len);
+  	}
+  	else
+  	{
+! 	    cmd_getline = fgetline;
+  	    cmd_cookie = cookie;
+  	}
+  #endif
+  
+! 	/* 2. If no line given, get an allocated line with fgetline(). */
+  	if (next_cmdline == NULL)
+  	{
+  	    /*
+  	     * Need to set msg_didout for the first line after an ":if",
+  	     * otherwise the ":if" will be overwritten.
+  	     */
+! 	    if (count == 1 && getline_equal(fgetline, cookie, getexline))
+  		msg_didout = TRUE;
+! 	    if (fgetline == NULL || (next_cmdline = fgetline(':', cookie,
+  #ifdef FEAT_EVAL
+  		    cstack.cs_idx < 0 ? 0 : (cstack.cs_idx + 1) * 2
+  #else
+***************
+*** 1142,1148 ****
+  	     * If the command was typed, remember it for the ':' register.
+  	     * Do this AFTER executing the command to make :@: work.
+  	     */
+! 	    if (getline_equal(getline, cookie, getexline)
+  						  && new_last_cmdline != NULL)
+  	    {
+  		vim_free(last_cmdline);
+--- 1143,1149 ----
+  	     * If the command was typed, remember it for the ':' register.
+  	     * Do this AFTER executing the command to make :@: work.
+  	     */
+! 	    if (getline_equal(fgetline, cookie, getexline)
+  						  && new_last_cmdline != NULL)
+  	    {
+  		vim_free(last_cmdline);
+***************
+*** 1163,1169 ****
+  #ifdef FEAT_EVAL
+  	/* reset did_emsg for a function that is not aborted by an error */
+  	if (did_emsg && !force_abort
+! 		&& getline_equal(getline, cookie, get_func_line)
+  					      && !func_has_abort(real_cookie))
+  	    did_emsg = FALSE;
+  
+--- 1164,1170 ----
+  #ifdef FEAT_EVAL
+  	/* reset did_emsg for a function that is not aborted by an error */
+  	if (did_emsg && !force_abort
+! 		&& getline_equal(fgetline, cookie, get_func_line)
+  					      && !func_has_abort(real_cookie))
+  	    did_emsg = FALSE;
+  
+***************
+*** 1202,1208 ****
+  		    if (breakpoint != NULL)
+  		    {
+  			*breakpoint = dbg_find_breakpoint(
+! 				getline_equal(getline, cookie, getsourceline),
+  									fname,
+  			   ((wcmd_T *)lines_ga.ga_data)[current_line].lnum-1);
+  			*dbg_tick = debug_tick;
+--- 1203,1209 ----
+  		    if (breakpoint != NULL)
+  		    {
+  			*breakpoint = dbg_find_breakpoint(
+! 			       getline_equal(fgetline, cookie, getsourceline),
+  									fname,
+  			   ((wcmd_T *)lines_ga.ga_data)[current_line].lnum-1);
+  			*dbg_tick = debug_tick;
+***************
+*** 1296,1303 ****
+  #endif
+  	    )
+  	    && !(did_emsg && used_getline
+! 			  && (getline_equal(getline, cookie, getexmodeline)
+! 				|| getline_equal(getline, cookie, getexline)))
+  	    && (next_cmdline != NULL
+  #ifdef FEAT_EVAL
+  			|| cstack.cs_idx >= 0
+--- 1297,1304 ----
+  #endif
+  	    )
+  	    && !(did_emsg && used_getline
+! 			    && (getline_equal(fgetline, cookie, getexmodeline)
+! 			       || getline_equal(fgetline, cookie, getexline)))
+  	    && (next_cmdline != NULL
+  #ifdef FEAT_EVAL
+  			|| cstack.cs_idx >= 0
+***************
+*** 1316,1324 ****
+  	 * unclosed conditional.
+  	 */
+  	if (!got_int && !did_throw
+! 		&& ((getline_equal(getline, cookie, getsourceline)
+! 			&& !source_finished(getline, cookie))
+! 		    || (getline_equal(getline, cookie, get_func_line)
+  					    && !func_has_ended(real_cookie))))
+  	{
+  	    if (cstack.cs_flags[cstack.cs_idx] & CSF_TRY)
+--- 1317,1325 ----
+  	 * unclosed conditional.
+  	 */
+  	if (!got_int && !did_throw
+! 		&& ((getline_equal(fgetline, cookie, getsourceline)
+! 			&& !source_finished(fgetline, cookie))
+! 		    || (getline_equal(fgetline, cookie, get_func_line)
+  					    && !func_has_ended(real_cookie))))
+  	{
+  	    if (cstack.cs_flags[cstack.cs_idx] & CSF_TRY)
+***************
+*** 1354,1360 ****
+      /* If a missing ":endtry", ":endwhile", ":endfor", or ":endif" or a memory
+       * lack was reported above and the error message is to be converted to an
+       * exception, do this now after rewinding the cstack. */
+!     do_errthrow(&cstack, getline_equal(getline, cookie, get_func_line)
+  				  ? (char_u *)"endfunction" : (char_u *)NULL);
+  
+      if (trylevel == 0)
+--- 1355,1361 ----
+      /* If a missing ":endtry", ":endwhile", ":endfor", or ":endif" or a memory
+       * lack was reported above and the error message is to be converted to an
+       * exception, do this now after rewinding the cstack. */
+!     do_errthrow(&cstack, getline_equal(fgetline, cookie, get_func_line)
+  				  ? (char_u *)"endfunction" : (char_u *)NULL);
+  
+      if (trylevel == 0)
+***************
+*** 1449,1457 ****
+       */
+      if (did_throw)
+  	need_rethrow = TRUE;
+!     if ((getline_equal(getline, cookie, getsourceline)
+  		&& ex_nesting_level > source_level(real_cookie))
+! 	    || (getline_equal(getline, cookie, get_func_line)
+  		&& ex_nesting_level > func_level(real_cookie) + 1))
+      {
+  	if (!did_throw)
+--- 1450,1458 ----
+       */
+      if (did_throw)
+  	need_rethrow = TRUE;
+!     if ((getline_equal(fgetline, cookie, getsourceline)
+  		&& ex_nesting_level > source_level(real_cookie))
+! 	    || (getline_equal(fgetline, cookie, get_func_line)
+  		&& ex_nesting_level > func_level(real_cookie) + 1))
+      {
+  	if (!did_throw)
+***************
+*** 1460,1475 ****
+      else
+      {
+  	/* When leaving a function, reduce nesting level. */
+! 	if (getline_equal(getline, cookie, get_func_line))
+  	    --ex_nesting_level;
+  	/*
+  	 * Go to debug mode when returning from a function in which we are
+  	 * single-stepping.
+  	 */
+! 	if ((getline_equal(getline, cookie, getsourceline)
+! 		    || getline_equal(getline, cookie, get_func_line))
+  		&& ex_nesting_level + 1 <= debug_break_level)
+! 	    do_debug(getline_equal(getline, cookie, getsourceline)
+  		    ? (char_u *)_("End of sourced file")
+  		    : (char_u *)_("End of function"));
+      }
+--- 1461,1476 ----
+      else
+      {
+  	/* When leaving a function, reduce nesting level. */
+! 	if (getline_equal(fgetline, cookie, get_func_line))
+  	    --ex_nesting_level;
+  	/*
+  	 * Go to debug mode when returning from a function in which we are
+  	 * single-stepping.
+  	 */
+! 	if ((getline_equal(fgetline, cookie, getsourceline)
+! 		    || getline_equal(fgetline, cookie, get_func_line))
+  		&& ex_nesting_level + 1 <= debug_break_level)
+! 	    do_debug(getline_equal(fgetline, cookie, getsourceline)
+  		    ? (char_u *)_("End of sourced file")
+  		    : (char_u *)_("End of function"));
+      }
+*** ../vim-7.3.055/src/version.c	2010-11-16 11:28:33.000000000 +0100
+--- src/version.c	2010-11-16 11:27:09.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     56,
+  /**/
+
+-- 
+Lawmakers made it obligatory for everybody to take at least one bath
+each week -- on Saturday night.
+		[real standing law in Vermont, United States of America]
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.057 b/source/ap/vim/patches/7.3.057
new file mode 100644
index 00000000..d4ea2bc0
--- /dev/null
+++ b/source/ap/vim/patches/7.3.057
@@ -0,0 +1,62 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.057
+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.3.057
+Problem:    Segfault with command line abbreviation. (Randy Morris)
+Solution:   Don't retrigger the abbreviation when abandoning the command line.
+            Continue editing the command line after the error.
+Files:      src/ex_getln.c
+    
+
+*** ../vim-7.3.056/src/ex_getln.c	2010-11-10 15:37:00.000000000 +0100
+--- src/ex_getln.c	2010-11-16 14:03:09.000000000 +0100
+***************
+*** 712,718 ****
+  		    }
+  		}
+  		beep_flush();
+! 		c = ESC;
+  	    }
+  #endif
+  	    else
+--- 712,722 ----
+  		    }
+  		}
+  		beep_flush();
+! 		got_int = FALSE;	/* don't abandon the command line */
+! 		did_emsg = FALSE;
+! 		emsg_on_display = FALSE;
+! 		redrawcmd();
+! 		goto cmdline_not_changed;
+  	    }
+  #endif
+  	    else
+*** ../vim-7.3.056/src/version.c	2010-11-16 11:29:30.000000000 +0100
+--- src/version.c	2010-11-16 14:04:25.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     57,
+  /**/
+
+-- 
+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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.058 b/source/ap/vim/patches/7.3.058
new file mode 100644
index 00000000..b1ede331
--- /dev/null
+++ b/source/ap/vim/patches/7.3.058
@@ -0,0 +1,158 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.058
+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.3.058
+Problem:    Error "code converter not found" when loading Ruby script.
+Solution:   Load Gem module. (Yasuhiro Matsumoto)
+Files:	    src/if_ruby.c
+
+
+*** ../vim-7.3.057/src/if_ruby.c	2010-10-27 17:40:53.000000000 +0200
+--- src/if_ruby.c	2010-11-16 14:37:48.000000000 +0100
+***************
+*** 229,234 ****
+--- 229,237 ----
+  # define rb_enc_find_index		dll_rb_enc_find_index
+  # define rb_enc_find			dll_rb_enc_find
+  # define rb_enc_str_new			dll_rb_enc_str_new
++ # define rb_intern2			dll_rb_intern2
++ # define rb_const_remove		dll_rb_const_remove
++ # define Init_prelude			dll_Init_prelude
+  # define rb_sprintf			dll_rb_sprintf
+  # define ruby_init_stack		dll_ruby_init_stack
+  #endif
+***************
+*** 317,322 ****
+--- 320,328 ----
+  static int (*dll_rb_enc_find_index) (const char*);
+  static rb_encoding* (*dll_rb_enc_find) (const char*);
+  static VALUE (*dll_rb_enc_str_new) (const char*, long, rb_encoding*);
++ static ID (*dll_rb_intern2) (const char*, long);
++ static void (*dll_Init_prelude) (void);
++ static VALUE (*dll_rb_const_remove) (VALUE, ID);
+  static VALUE (*dll_rb_sprintf) (const char*, ...);
+  static void (*ruby_init_stack)(VALUE*);
+  #endif
+***************
+*** 425,430 ****
+--- 431,439 ----
+      {"rb_enc_find_index", (RUBY_PROC*)&dll_rb_enc_find_index},
+      {"rb_enc_find", (RUBY_PROC*)&dll_rb_enc_find},
+      {"rb_enc_str_new", (RUBY_PROC*)&dll_rb_enc_str_new},
++     {"rb_intern2", (RUBY_PROC*)&dll_rb_intern2},
++     {"rb_const_remove", (RUBY_PROC*)&dll_rb_const_remove},
++     {"Init_prelude", (RUBY_PROC*)&dll_Init_prelude},
+      {"rb_sprintf", (RUBY_PROC*)&dll_rb_sprintf},
+      {"ruby_init_stack", (RUBY_PROC*)&dll_ruby_init_stack},
+  #endif
+***************
+*** 662,667 ****
+--- 671,682 ----
+  	    ruby_io_init();
+  #ifdef RUBY19_OR_LATER
+  	    rb_enc_find_index("encdb");
++ 
++ 	    /* This avoids the error "Encoding::ConverterNotFoundError: code
++ 	     * converter not found (UTF-16LE to ASCII-8BIT)". */
++ 	    rb_define_module("Gem");
++ 	    Init_prelude();
++ 	    rb_const_remove(rb_cObject, rb_intern2("TMP_RUBY_PREFIX", 15));
+  #endif
+  	    ruby_vim_init();
+  	    ruby_initialized = 1;
+***************
+*** 946,958 ****
+  
+  static VALUE get_buffer_line(buf_T *buf, linenr_T n)
+  {
+!     if (n > 0 && n <= buf->b_ml.ml_line_count)
+!     {
+! 	char *line = (char *)ml_get_buf(buf, n, FALSE);
+! 	return line ? vim_str2rb_enc_str(line) : Qnil;
+!     }
+!     rb_raise(rb_eIndexError, "line number %ld out of range", (long)n);
+!     return Qnil; /* For stop warning */
+  }
+  
+  static VALUE buffer_aref(VALUE self, VALUE num)
+--- 961,969 ----
+  
+  static VALUE get_buffer_line(buf_T *buf, linenr_T n)
+  {
+!     if (n <= 0 || n > buf->b_ml.ml_line_count)
+! 	rb_raise(rb_eIndexError, "line number %ld out of range", (long)n);
+!     return vim_str2rb_enc_str((char *)ml_get_buf(buf, n, FALSE));
+  }
+  
+  static VALUE buffer_aref(VALUE self, VALUE num)
+***************
+*** 991,999 ****
+      else
+      {
+  	rb_raise(rb_eIndexError, "line number %ld out of range", (long)n);
+- #ifndef __GNUC__
+- 	return Qnil; /* For stop warning */
+- #endif
+      }
+      return str;
+  }
+--- 1002,1007 ----
+***************
+*** 1048,1054 ****
+      long	n = NUM2LONG(num);
+      aco_save_T	aco;
+  
+!     if (line == NULL) {
+  	rb_raise(rb_eIndexError, "NULL line");
+      }
+      else if (n >= 0 && n <= buf->b_ml.ml_line_count)
+--- 1056,1063 ----
+      long	n = NUM2LONG(num);
+      aco_save_T	aco;
+  
+!     if (line == NULL)
+!     {
+  	rb_raise(rb_eIndexError, "NULL line");
+      }
+      else if (n >= 0 && n <= buf->b_ml.ml_line_count)
+***************
+*** 1072,1078 ****
+  
+  	update_curbuf(NOT_VALID);
+      }
+!     else {
+  	rb_raise(rb_eIndexError, "line number %ld out of range", n);
+      }
+      return str;
+--- 1081,1088 ----
+  
+  	update_curbuf(NOT_VALID);
+      }
+!     else
+!     {
+  	rb_raise(rb_eIndexError, "line number %ld out of range", n);
+      }
+      return str;
+*** ../vim-7.3.057/src/version.c	2010-11-16 14:05:48.000000000 +0100
+--- src/version.c	2010-11-16 14:44:42.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     58,
+  /**/
+
+-- 
+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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.059 b/source/ap/vim/patches/7.3.059
new file mode 100644
index 00000000..6e99f876
--- /dev/null
+++ b/source/ap/vim/patches/7.3.059
@@ -0,0 +1,116 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.059
+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.3.059
+Problem:    Netbeans: Problem with recursively handling messages for Athena 
+            and Motif.
+Solution:   Call netbeans_parse_messages() in the main loop, like it's done 
+            for GTK. (Xavier de Gaye)
+Files:      src/gui_x11.c, src/netbeans.c
+
+
+*** ../vim-7.3.058/src/gui_x11.c	2010-08-15 21:57:25.000000000 +0200
+--- src/gui_x11.c	2010-11-16 14:53:18.000000000 +0100
+***************
+*** 2895,2900 ****
+--- 2895,2905 ----
+  	    focus = gui.in_focus;
+  	}
+  
++ #if defined(FEAT_NETBEANS_INTG)
++ 	/* Process any 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 XtAppProcessEvent() to hang until an
+*** ../vim-7.3.058/src/netbeans.c	2010-09-30 21:03:13.000000000 +0200
+--- src/netbeans.c	2010-11-16 14:52:55.000000000 +0100
+***************
+*** 726,734 ****
+      static char_u	*buf = NULL;
+      int			len = 0;
+      int			readlen = 0;
+- #if defined(NB_HAS_GUI) && !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_W32)
+-     static int		level = 0;
+- #endif
+  #ifdef HAVE_SELECT
+      struct timeval	tval;
+      fd_set		rfds;
+--- 726,731 ----
+***************
+*** 744,756 ****
+  	return;
+      }
+  
+- #if defined(NB_HAS_GUI) && !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_W32)
+-     /* recursion guard; this will be called from the X event loop at unknown
+-      * moments */
+-     if (NB_HAS_GUI)
+- 	++level;
+- #endif
+- 
+      /* Allocate a buffer to read into. */
+      if (buf == NULL)
+      {
+--- 741,746 ----
+***************
+*** 803,823 ****
+  	return; /* don't try to parse it */
+      }
+  
+! #if defined(NB_HAS_GUI) && !defined(FEAT_GUI_W32)
+!     /* Let the main loop handle messages. */
+!     if (NB_HAS_GUI)
+!     {
+! # ifdef FEAT_GUI_GTK
+! 	if (gtk_main_level() > 0)
+! 	    gtk_main_quit();
+! # else
+! 	/* Parse the messages now, but avoid recursion. */
+! 	if (level == 1)
+! 	    netbeans_parse_messages();
+! 
+! 	--level;
+! # endif
+!     }
+  #endif
+  }
+  
+--- 793,801 ----
+  	return; /* don't try to parse it */
+      }
+  
+! #if defined(NB_HAS_GUI) && defined(FEAT_GUI_GTK)
+!     if (NB_HAS_GUI && gtk_main_level() > 0)
+!         gtk_main_quit();
+  #endif
+  }
+  
+*** ../vim-7.3.058/src/version.c	2010-11-16 14:46:14.000000000 +0100
+--- src/version.c	2010-11-16 14:50:57.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     59,
+  /**/
+
+
+-- 
+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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.060 b/source/ap/vim/patches/7.3.060
new file mode 100644
index 00000000..0edf20ce
--- /dev/null
+++ b/source/ap/vim/patches/7.3.060
@@ -0,0 +1,227 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.060
+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.3.060
+Problem:    Netbeans: crash when socket is disconnected unexpectedly.
+Solution:   Don't cleanup when a read fails, put a message in the queue and
+	    disconnect later. (Xavier de Gaye)
+Files:	    src/netbeans.c
+
+
+*** ../vim-7.3.059/src/netbeans.c	2010-11-16 15:04:51.000000000 +0100
+--- src/netbeans.c	2010-11-16 15:48:36.000000000 +0100
+***************
+*** 135,148 ****
+  static int needupdate = 0;
+  static int inAtomic = 0;
+  
+      static void
+! netbeans_close(void)
+  {
+-     if (!NETBEANS_OPEN)
+- 	return;
+- 
+-     netbeans_send_disconnect();
+- 
+  #ifdef FEAT_GUI_X11
+      if (inputHandler != (XtInputId)NULL)
+      {
+--- 135,146 ----
+  static int needupdate = 0;
+  static int inAtomic = 0;
+  
++ /*
++  * Close the socket and remove the input handlers.
++  */
+      static void
+! nb_close_socket(void)
+  {
+  #ifdef FEAT_GUI_X11
+      if (inputHandler != (XtInputId)NULL)
+      {
+***************
+*** 167,179 ****
+  # endif
+  #endif
+  
+  #ifdef FEAT_BEVAL
+      bevalServers &= ~BEVAL_NETBEANS;
+  #endif
+  
+-     sock_close(nbsock);
+-     nbsock = -1;
+- 
+      needupdate = 0;
+      inAtomic = 0;
+      nb_free();
+--- 165,191 ----
+  # endif
+  #endif
+  
++     sock_close(nbsock);
++     nbsock = -1;
++ }
++ 
++ /*
++  * Close the connection and cleanup.
++  * May be called when nb_close_socket() was called earlier.
++  */
++     static void
++ netbeans_close(void)
++ {
++     if (NETBEANS_OPEN)
++     {
++ 	netbeans_send_disconnect();
++ 	nb_close_socket();
++     }
++ 
+  #ifdef FEAT_BEVAL
+      bevalServers &= ~BEVAL_NETBEANS;
+  #endif
+  
+      needupdate = 0;
+      inAtomic = 0;
+      nb_free();
+***************
+*** 632,640 ****
+      char_u	*p;
+      queue_T	*node;
+  
+-     if (!NETBEANS_OPEN)
+- 	return;
+- 
+      while (head.next != NULL && head.next != &head)
+      {
+  	node = head.next;
+--- 644,649 ----
+***************
+*** 720,725 ****
+--- 729,736 ----
+  }
+  #endif
+  
++ #define DETACH_MSG "DETACH\n"
++ 
+      void
+  netbeans_read()
+  {
+***************
+*** 780,801 ****
+  	    break;	/* did read everything that's available */
+      }
+  
+      if (readlen <= 0)
+      {
+! 	/* read error or didn't read anything */
+! 	netbeans_close();
+! 	nbdebug(("messageFromNetbeans: Error in read() from socket\n"));
+  	if (len < 0)
+  	{
+  	    nbdebug(("read from Netbeans socket\n"));
+  	    PERROR(_("read from Netbeans socket"));
+  	}
+- 	return; /* don't try to parse it */
+      }
+  
+  #if defined(NB_HAS_GUI) && defined(FEAT_GUI_GTK)
+      if (NB_HAS_GUI && gtk_main_level() > 0)
+!         gtk_main_quit();
+  #endif
+  }
+  
+--- 791,822 ----
+  	    break;	/* did read everything that's available */
+      }
+  
++     /* Reading a socket disconnection (readlen == 0), or a socket error. */
+      if (readlen <= 0)
+      {
+! 	/* Queue a "DETACH" netbeans message in the command queue in order to
+! 	 * terminate the netbeans session later. Do not end the session here
+! 	 * directly as we may be running in the context of a call to
+! 	 * netbeans_parse_messages():
+! 	 *	netbeans_parse_messages
+! 	 *	    -> autocmd triggered while processing the netbeans cmd
+! 	 *		-> ui_breakcheck
+! 	 *		    -> gui event loop or select loop
+! 	 *			-> netbeans_read()
+! 	 */
+! 	save((char_u *)DETACH_MSG, strlen(DETACH_MSG));
+! 	nb_close_socket();
+! 
+  	if (len < 0)
+  	{
+  	    nbdebug(("read from Netbeans socket\n"));
+  	    PERROR(_("read from Netbeans socket"));
+  	}
+      }
+  
+  #if defined(NB_HAS_GUI) && defined(FEAT_GUI_GTK)
+      if (NB_HAS_GUI && gtk_main_level() > 0)
+! 	gtk_main_quit();
+  #endif
+  }
+  
+***************
+*** 1164,1169 ****
+--- 1185,1194 ----
+  
+      nbdebug(("REP %d: <none>\n", cmdno));
+  
++     /* Avoid printing an annoying error message. */
++     if (!NETBEANS_OPEN)
++ 	return;
++ 
+      sprintf(reply, "%d\n", cmdno);
+      nb_send(reply, "nb_reply_nil");
+  }
+***************
+*** 2753,2763 ****
+  {
+  #ifdef FEAT_GUI
+  # if !defined(FEAT_GUI_X11) && !defined(FEAT_GUI_GTK)  \
+!                 && !defined(FEAT_GUI_W32)
+      if (gui.in_use)
+      {
+!         EMSG(_("E838: netbeans is not supported with this GUI"));
+!         return;
+      }
+  # endif
+  #endif
+--- 2778,2788 ----
+  {
+  #ifdef FEAT_GUI
+  # if !defined(FEAT_GUI_X11) && !defined(FEAT_GUI_GTK)  \
+! 		&& !defined(FEAT_GUI_W32)
+      if (gui.in_use)
+      {
+! 	EMSG(_("E838: netbeans is not supported with this GUI"));
+! 	return;
+      }
+  # endif
+  #endif
+*** ../vim-7.3.059/src/version.c	2010-11-16 15:04:51.000000000 +0100
+--- src/version.c	2010-11-16 15:22:39.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     60,
+  /**/
+
+-- 
+   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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.061 b/source/ap/vim/patches/7.3.061
new file mode 100644
index 00000000..2b0bdacf
--- /dev/null
+++ b/source/ap/vim/patches/7.3.061
@@ -0,0 +1,89 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.061
+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.3.061
+Problem:    Remote ":drop" does not respect 'autochdir'. (Peter Odding)
+Solution:   Don't restore the directory when 'autochdir' is set. (Benjamin
+	    Fritz)
+Files:	    src/main.c
+
+
+*** ../vim-7.3.060/src/main.c	2010-09-29 17:26:57.000000000 +0200
+--- src/main.c	2010-11-16 16:16:11.000000000 +0100
+***************
+*** 3817,3822 ****
+--- 3817,3824 ----
+      /* Check if we have at least one argument. */
+      if (filec <= 0)
+  	mainerr_arg_missing((char_u *)filev[-1]);
++ 
++     /* Temporarily cd to the current directory to handle relative file names. */
+      if (mch_dirname(cwd, MAXPATHL) != OK)
+  	return NULL;
+      if ((p = vim_strsave_escaped_ext(cwd,
+***************
+*** 3858,3870 ****
+  	ga_concat(&ga, p);
+  	vim_free(p);
+      }
+      /* The :drop commands goes to Insert mode when 'insertmode' is set, use
+       * CTRL-\ CTRL-N again. */
+!     ga_concat(&ga, (char_u *)"|if exists('*inputrestore')|call inputrestore()|endif<CR>");
+!     ga_concat(&ga, (char_u *)"<C-\\><C-N>:cd -");
+      if (sendReply)
+! 	ga_concat(&ga, (char_u *)"<CR>:call SetupRemoteReplies()");
+!     ga_concat(&ga, (char_u *)"<CR>:");
+      if (inicmd != NULL)
+      {
+  	/* Can't use <CR> after "inicmd", because an "startinsert" would cause
+--- 3860,3879 ----
+  	ga_concat(&ga, p);
+  	vim_free(p);
+      }
++     ga_concat(&ga, (char_u *)"|if exists('*inputrestore')|call inputrestore()|endif<CR>");
++ 
+      /* The :drop commands goes to Insert mode when 'insertmode' is set, use
+       * CTRL-\ CTRL-N again. */
+!     ga_concat(&ga, (char_u *)"<C-\\><C-N>");
+! 
+!     /* Switch back to the correct current directory (prior to temporary path
+!      * switch) unless 'autochdir' is set, in which case it will already be
+!      * correct after the :drop command. */
+!     ga_concat(&ga, (char_u *)":if !exists('+acd')||!&acd|cd -|endif<CR>");
+! 
+      if (sendReply)
+! 	ga_concat(&ga, (char_u *)":call SetupRemoteReplies()<CR>");
+!     ga_concat(&ga, (char_u *)":");
+      if (inicmd != NULL)
+      {
+  	/* Can't use <CR> after "inicmd", because an "startinsert" would cause
+*** ../vim-7.3.060/src/version.c	2010-11-16 15:48:57.000000000 +0100
+--- src/version.c	2010-11-16 16:19:58.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     61,
+  /**/
+
+-- 
+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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.062 b/source/ap/vim/patches/7.3.062
new file mode 100644
index 00000000..ee69b3ae
--- /dev/null
+++ b/source/ap/vim/patches/7.3.062
@@ -0,0 +1,609 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.062
+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.3.062
+Problem:    Python doesn't work properly when installed in another directory
+	    than expected.
+Solution:   Figure out home directory in configure and use Py_SetPythonHome()
+	    at runtime. (Roland Puntaier)
+Files:	    src/configure.in, src/auto/configure, src/if_python.c,
+	    src/if_python3.c
+
+
+*** ../vim-7.3.061/src/configure.in	2010-11-03 22:32:18.000000000 +0100
+--- src/configure.in	2010-11-16 17:47:36.000000000 +0100
+***************
+*** 891,899 ****
+  
+  	PYTHON_LIBS="${vi_cv_path_python_plibs}"
+  	if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then
+! 	  PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version}"
+  	else
+! 	  PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version}"
+  	fi
+  	PYTHON_SRC="if_python.c"
+  	dnl For Mac OSX 10.2 config.o is included in the Python library.
+--- 891,899 ----
+  
+  	PYTHON_LIBS="${vi_cv_path_python_plibs}"
+  	if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then
+! 	  PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME=\\\"${vi_cv_path_python_pfx}\\\""
+  	else
+! 	  PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME=\\\"${vi_cv_path_python_pfx}\\\""
+  	fi
+  	PYTHON_SRC="if_python.c"
+  	dnl For Mac OSX 10.2 config.o is included in the Python library.
+***************
+*** 905,911 ****
+  	if test "${vi_cv_var_python_version}" = "1.4"; then
+  	   PYTHON_OBJ="$PYTHON_OBJ objects/py_getpath.o"
+  	fi
+! 	PYTHON_GETPATH_CFLAGS="-DPYTHONPATH='\"${vi_cv_path_pythonpath}\"' -DPREFIX='\"${vi_cv_path_python_pfx}\"' -DEXEC_PREFIX='\"${vi_cv_path_python_epfx}\"'"
+  
+  	dnl On FreeBSD linking with "-pthread" is required to use threads.
+  	dnl _THREAD_SAFE must be used for compiling then.
+--- 905,911 ----
+  	if test "${vi_cv_var_python_version}" = "1.4"; then
+  	   PYTHON_OBJ="$PYTHON_OBJ objects/py_getpath.o"
+  	fi
+!     PYTHON_GETPATH_CFLAGS="-DPYTHONPATH='\"${vi_cv_path_pythonpath}\"' -DPREFIX='\"${vi_cv_path_python_pfx}\"' -DEXEC_PREFIX='\"${vi_cv_path_python_epfx}\"'"
+  
+  	dnl On FreeBSD linking with "-pthread" is required to use threads.
+  	dnl _THREAD_SAFE must be used for compiling then.
+***************
+*** 1063,1071 ****
+  
+        PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
+        if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
+!         PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}"
+        else
+!         PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version}"
+        fi
+        PYTHON3_SRC="if_python3.c"
+        dnl For Mac OSX 10.2 config.o is included in the Python library.
+--- 1063,1071 ----
+  
+        PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
+        if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
+!         PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
+        else
+!         PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
+        fi
+        PYTHON3_SRC="if_python3.c"
+        dnl For Mac OSX 10.2 config.o is included in the Python library.
+***************
+*** 1143,1151 ****
+  if test "$python_ok" = yes && test "$python3_ok" = yes; then
+    AC_DEFINE(DYNAMIC_PYTHON)
+    AC_DEFINE(DYNAMIC_PYTHON3)
+!   AC_MSG_CHECKING(whether we can do without RTLD_GLOBAL)
+    cflags_save=$CFLAGS
+!   CFLAGS="$CFLAGS $PYTHON3_CFLAGS"
+    ldflags_save=$LDFLAGS
+    LDFLAGS="$LDFLAGS -ldl"
+    AC_RUN_IFELSE([
+--- 1143,1151 ----
+  if test "$python_ok" = yes && test "$python3_ok" = yes; then
+    AC_DEFINE(DYNAMIC_PYTHON)
+    AC_DEFINE(DYNAMIC_PYTHON3)
+!   AC_MSG_CHECKING(whether we can do without RTLD_GLOBAL for Python)
+    cflags_save=$CFLAGS
+!   CFLAGS="$CFLAGS $PYTHON_CFLAGS"
+    ldflags_save=$LDFLAGS
+    LDFLAGS="$LDFLAGS -ldl"
+    AC_RUN_IFELSE([
+***************
+*** 1156,1170 ****
+       * Only the first pyhton version used will be switched on.
+       */
+  
+!     int no_rtl_global_needed_for(char *python_instsoname)
+      {
+        int needed = 0;
+        void* pylib = dlopen(python_instsoname, RTLD_LAZY);
+        if (pylib != 0)
+        {
+            void (*init)(void) = dlsym(pylib, "Py_Initialize");
+            int (*simple)(char*) = dlsym(pylib, "PyRun_SimpleString");
+            void (*final)(void) = dlsym(pylib, "Py_Finalize");
+            (*init)();
+            needed = (*simple)("import termios") == -1;
+            (*final)();
+--- 1156,1172 ----
+       * Only the first pyhton version used will be switched on.
+       */
+  
+!     int no_rtl_global_needed_for(char *python_instsoname, char *prefix)
+      {
+        int needed = 0;
+        void* pylib = dlopen(python_instsoname, RTLD_LAZY);
+        if (pylib != 0)
+        {
++           void (*pfx)(char *home) = dlsym(pylib, "Py_SetPythonHome");
+            void (*init)(void) = dlsym(pylib, "Py_Initialize");
+            int (*simple)(char*) = dlsym(pylib, "PyRun_SimpleString");
+            void (*final)(void) = dlsym(pylib, "Py_Finalize");
++           (*pfx)(prefix);
+            (*init)();
+            needed = (*simple)("import termios") == -1;
+            (*final)();
+***************
+*** 1176,1188 ****
+      int main(int argc, char** argv)
+      {
+        int not_needed = 0;
+!       if (no_rtl_global_needed_for("libpython2.7.so.1.0") && no_rtl_global_needed_for("libpython3.1.so.1.0"))
+              not_needed = 1;
+        return !not_needed;
+      }],
+      [AC_MSG_RESULT(yes);AC_DEFINE(PY_NO_RTLD_GLOBAL)], [AC_MSG_RESULT(no)])
+    CFLAGS=$cflags_save
+    LDFLAGS=$ldflags_save
+    PYTHON_SRC="if_python.c"
+    PYTHON_OBJ="objects/if_python.o"
+    PYTHON_CFLAGS="$PYTHON_CFLAGS -DDYNAMIC_PYTHON_DLL=\\\"${python_INSTSONAME}\\\""
+--- 1178,1237 ----
+      int main(int argc, char** argv)
+      {
+        int not_needed = 0;
+!       if (no_rtl_global_needed_for("${python_INSTSONAME}", "${vi_cv_path_python_pfx}"))
+              not_needed = 1;
+        return !not_needed;
+      }],
+      [AC_MSG_RESULT(yes);AC_DEFINE(PY_NO_RTLD_GLOBAL)], [AC_MSG_RESULT(no)])
++ 
+    CFLAGS=$cflags_save
+    LDFLAGS=$ldflags_save
++ 
++   AC_MSG_CHECKING(whether we can do without RTLD_GLOBAL for Python3)
++   cflags_save=$CFLAGS
++   CFLAGS="$CFLAGS $PYTHON3_CFLAGS"
++   ldflags_save=$LDFLAGS
++   LDFLAGS="$LDFLAGS -ldl"
++   AC_RUN_IFELSE([
++     #include <dlfcn.h>
++     #include <wchar.h>
++     /* If this program fails, then RTLD_GLOBAL is needed.
++      * RTLD_GLOBAL will be used and then it is not possible to
++      * have both python versions enabled in the same vim instance.
++      * Only the first pyhton version used will be switched on.
++      */
++ 
++     int no_rtl_global_needed_for(char *python_instsoname, wchar_t *prefix)
++     {
++       int needed = 0;
++       void* pylib = dlopen(python_instsoname, RTLD_LAZY);
++       if (pylib != 0)
++       {
++           void (*pfx)(wchar_t *home) = dlsym(pylib, "Py_SetPythonHome");
++           void (*init)(void) = dlsym(pylib, "Py_Initialize");
++           int (*simple)(char*) = dlsym(pylib, "PyRun_SimpleString");
++           void (*final)(void) = dlsym(pylib, "Py_Finalize");
++           (*pfx)(prefix);
++           (*init)();
++           needed = (*simple)("import termios") == -1;
++           (*final)();
++           dlclose(pylib);
++       }
++       return !needed;
++     }
++ 
++     int main(int argc, char** argv)
++     {
++       int not_needed = 0;
++       if (no_rtl_global_needed_for("${python3_INSTSONAME}", L"${vi_cv_path_python3_pfx}"))
++             not_needed = 1;
++       return !not_needed;
++     }],
++     [AC_MSG_RESULT(yes);AC_DEFINE(PY3_NO_RTLD_GLOBAL)], [AC_MSG_RESULT(no)])
++ 
++   CFLAGS=$cflags_save
++   LDFLAGS=$ldflags_save
++ 
+    PYTHON_SRC="if_python.c"
+    PYTHON_OBJ="objects/if_python.o"
+    PYTHON_CFLAGS="$PYTHON_CFLAGS -DDYNAMIC_PYTHON_DLL=\\\"${python_INSTSONAME}\\\""
+*** ../vim-7.3.061/src/auto/configure	2010-11-03 22:32:18.000000000 +0100
+--- src/auto/configure	2010-11-16 17:47:42.000000000 +0100
+***************
+*** 5326,5334 ****
+  
+  	PYTHON_LIBS="${vi_cv_path_python_plibs}"
+  	if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then
+! 	  PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version}"
+  	else
+! 	  PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version}"
+  	fi
+  	PYTHON_SRC="if_python.c"
+  		if test "x$MACOSX" = "xyes"; then
+--- 5326,5334 ----
+  
+  	PYTHON_LIBS="${vi_cv_path_python_plibs}"
+  	if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then
+! 	  PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME=\\\"${vi_cv_path_python_pfx}\\\""
+  	else
+! 	  PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME=\\\"${vi_cv_path_python_pfx}\\\""
+  	fi
+  	PYTHON_SRC="if_python.c"
+  		if test "x$MACOSX" = "xyes"; then
+***************
+*** 5339,5345 ****
+  	if test "${vi_cv_var_python_version}" = "1.4"; then
+  	   PYTHON_OBJ="$PYTHON_OBJ objects/py_getpath.o"
+  	fi
+! 	PYTHON_GETPATH_CFLAGS="-DPYTHONPATH='\"${vi_cv_path_pythonpath}\"' -DPREFIX='\"${vi_cv_path_python_pfx}\"' -DEXEC_PREFIX='\"${vi_cv_path_python_epfx}\"'"
+  
+  								{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if -pthread should be used" >&5
+  $as_echo_n "checking if -pthread should be used... " >&6; }
+--- 5339,5345 ----
+  	if test "${vi_cv_var_python_version}" = "1.4"; then
+  	   PYTHON_OBJ="$PYTHON_OBJ objects/py_getpath.o"
+  	fi
+!     PYTHON_GETPATH_CFLAGS="-DPYTHONPATH='\"${vi_cv_path_pythonpath}\"' -DPREFIX='\"${vi_cv_path_python_pfx}\"' -DEXEC_PREFIX='\"${vi_cv_path_python_epfx}\"'"
+  
+  								{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if -pthread should be used" >&5
+  $as_echo_n "checking if -pthread should be used... " >&6; }
+***************
+*** 5601,5609 ****
+  
+        PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
+        if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
+!         PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}"
+        else
+!         PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version}"
+        fi
+        PYTHON3_SRC="if_python3.c"
+              if test "x$MACOSX" = "xyes"; then
+--- 5601,5609 ----
+  
+        PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
+        if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
+!         PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
+        else
+!         PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
+        fi
+        PYTHON3_SRC="if_python3.c"
+              if test "x$MACOSX" = "xyes"; then
+***************
+*** 5708,5717 ****
+  
+    $as_echo "#define DYNAMIC_PYTHON3 1" >>confdefs.h
+  
+!   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can do without RTLD_GLOBAL" >&5
+! $as_echo_n "checking whether we can do without RTLD_GLOBAL... " >&6; }
+    cflags_save=$CFLAGS
+!   CFLAGS="$CFLAGS $PYTHON3_CFLAGS"
+    ldflags_save=$LDFLAGS
+    LDFLAGS="$LDFLAGS -ldl"
+    if test "$cross_compiling" = yes; then :
+--- 5708,5717 ----
+  
+    $as_echo "#define DYNAMIC_PYTHON3 1" >>confdefs.h
+  
+!   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can do without RTLD_GLOBAL for Python" >&5
+! $as_echo_n "checking whether we can do without RTLD_GLOBAL for Python... " >&6; }
+    cflags_save=$CFLAGS
+!   CFLAGS="$CFLAGS $PYTHON_CFLAGS"
+    ldflags_save=$LDFLAGS
+    LDFLAGS="$LDFLAGS -ldl"
+    if test "$cross_compiling" = yes; then :
+***************
+*** 5730,5744 ****
+       * Only the first pyhton version used will be switched on.
+       */
+  
+!     int no_rtl_global_needed_for(char *python_instsoname)
+      {
+        int needed = 0;
+        void* pylib = dlopen(python_instsoname, RTLD_LAZY);
+        if (pylib != 0)
+        {
+            void (*init)(void) = dlsym(pylib, "Py_Initialize");
+            int (*simple)(char*) = dlsym(pylib, "PyRun_SimpleString");
+            void (*final)(void) = dlsym(pylib, "Py_Finalize");
+            (*init)();
+            needed = (*simple)("import termios") == -1;
+            (*final)();
+--- 5730,5746 ----
+       * Only the first pyhton version used will be switched on.
+       */
+  
+!     int no_rtl_global_needed_for(char *python_instsoname, char *prefix)
+      {
+        int needed = 0;
+        void* pylib = dlopen(python_instsoname, RTLD_LAZY);
+        if (pylib != 0)
+        {
++           void (*pfx)(char *home) = dlsym(pylib, "Py_SetPythonHome");
+            void (*init)(void) = dlsym(pylib, "Py_Initialize");
+            int (*simple)(char*) = dlsym(pylib, "PyRun_SimpleString");
+            void (*final)(void) = dlsym(pylib, "Py_Finalize");
++           (*pfx)(prefix);
+            (*init)();
+            needed = (*simple)("import termios") == -1;
+            (*final)();
+***************
+*** 5750,5756 ****
+      int main(int argc, char** argv)
+      {
+        int not_needed = 0;
+!       if (no_rtl_global_needed_for("libpython2.7.so.1.0") && no_rtl_global_needed_for("libpython3.1.so.1.0"))
+              not_needed = 1;
+        return !not_needed;
+      }
+--- 5752,5758 ----
+      int main(int argc, char** argv)
+      {
+        int not_needed = 0;
+!       if (no_rtl_global_needed_for("${python_INSTSONAME}", "${vi_cv_path_python_pfx}"))
+              not_needed = 1;
+        return !not_needed;
+      }
+***************
+*** 5767,5774 ****
+--- 5769,5844 ----
+    conftest.$ac_objext conftest.beam conftest.$ac_ext
+  fi
+  
++ 
+    CFLAGS=$cflags_save
+    LDFLAGS=$ldflags_save
++ 
++   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can do without RTLD_GLOBAL for Python3" >&5
++ $as_echo_n "checking whether we can do without RTLD_GLOBAL for Python3... " >&6; }
++   cflags_save=$CFLAGS
++   CFLAGS="$CFLAGS $PYTHON3_CFLAGS"
++   ldflags_save=$LDFLAGS
++   LDFLAGS="$LDFLAGS -ldl"
++   if test "$cross_compiling" = yes; then :
++   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++ as_fn_error "cannot run test program while cross compiling
++ See \`config.log' for more details." "$LINENO" 5; }
++ else
++   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ /* end confdefs.h.  */
++ 
++     #include <dlfcn.h>
++     #include <wchar.h>
++     /* If this program fails, then RTLD_GLOBAL is needed.
++      * RTLD_GLOBAL will be used and then it is not possible to
++      * have both python versions enabled in the same vim instance.
++      * Only the first pyhton version used will be switched on.
++      */
++ 
++     int no_rtl_global_needed_for(char *python_instsoname, wchar_t *prefix)
++     {
++       int needed = 0;
++       void* pylib = dlopen(python_instsoname, RTLD_LAZY);
++       if (pylib != 0)
++       {
++           void (*pfx)(wchar_t *home) = dlsym(pylib, "Py_SetPythonHome");
++           void (*init)(void) = dlsym(pylib, "Py_Initialize");
++           int (*simple)(char*) = dlsym(pylib, "PyRun_SimpleString");
++           void (*final)(void) = dlsym(pylib, "Py_Finalize");
++           (*pfx)(prefix);
++           (*init)();
++           needed = (*simple)("import termios") == -1;
++           (*final)();
++           dlclose(pylib);
++       }
++       return !needed;
++     }
++ 
++     int main(int argc, char** argv)
++     {
++       int not_needed = 0;
++       if (no_rtl_global_needed_for("${python3_INSTSONAME}", L"${vi_cv_path_python3_pfx}"))
++             not_needed = 1;
++       return !not_needed;
++     }
++ _ACEOF
++ if ac_fn_c_try_run "$LINENO"; then :
++   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++ $as_echo "yes" >&6; };$as_echo "#define PY3_NO_RTLD_GLOBAL 1" >>confdefs.h
++ 
++ else
++   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++ $as_echo "no" >&6; }
++ fi
++ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++   conftest.$ac_objext conftest.beam conftest.$ac_ext
++ fi
++ 
++ 
++   CFLAGS=$cflags_save
++   LDFLAGS=$ldflags_save
++ 
+    PYTHON_SRC="if_python.c"
+    PYTHON_OBJ="objects/if_python.o"
+    PYTHON_CFLAGS="$PYTHON_CFLAGS -DDYNAMIC_PYTHON_DLL=\\\"${python_INSTSONAME}\\\""
+*** ../vim-7.3.061/src/if_python.c	2010-10-23 14:02:48.000000000 +0200
+--- src/if_python.c	2010-11-16 17:07:00.000000000 +0100
+***************
+*** 102,108 ****
+  #  include <dlfcn.h>
+  #  define FARPROC void*
+  #  define HINSTANCE void*
+! #  ifdef PY_NO_RTLD_GLOBAL
+  #   define load_dll(n) dlopen((n), RTLD_LAZY)
+  #  else
+  #   define load_dll(n) dlopen((n), RTLD_LAZY|RTLD_GLOBAL)
+--- 102,108 ----
+  #  include <dlfcn.h>
+  #  define FARPROC void*
+  #  define HINSTANCE void*
+! #  if defined(PY_NO_RTLD_GLOBAL) && defined(PY3_NO_RTLD_GLOBAL)
+  #   define load_dll(n) dlopen((n), RTLD_LAZY)
+  #  else
+  #   define load_dll(n) dlopen((n), RTLD_LAZY|RTLD_GLOBAL)
+***************
+*** 168,173 ****
+--- 168,174 ----
+  # define Py_BuildValue dll_Py_BuildValue
+  # define Py_FindMethod dll_Py_FindMethod
+  # define Py_InitModule4 dll_Py_InitModule4
++ # define Py_SetPythonHome dll_Py_SetPythonHome
+  # define Py_Initialize dll_Py_Initialize
+  # define Py_Finalize dll_Py_Finalize
+  # define Py_IsInitialized dll_Py_IsInitialized
+***************
+*** 226,231 ****
+--- 227,233 ----
+  static PyObject*(*dll_Py_BuildValue)(char *, ...);
+  static PyObject*(*dll_Py_FindMethod)(struct PyMethodDef[], PyObject *, char *);
+  static PyObject*(*dll_Py_InitModule4)(char *, struct PyMethodDef *, char *, PyObject *, int);
++ static void(*dll_Py_SetPythonHome)(char *home);
+  static void(*dll_Py_Initialize)(void);
+  static void(*dll_Py_Finalize)(void);
+  static int(*dll_Py_IsInitialized)(void);
+***************
+*** 310,315 ****
+--- 312,318 ----
+  # else
+      {"Py_InitModule4", (PYTHON_PROC*)&dll_Py_InitModule4},
+  # endif
++     {"Py_SetPythonHome", (PYTHON_PROC*)&dll_Py_SetPythonHome},
+      {"Py_Initialize", (PYTHON_PROC*)&dll_Py_Initialize},
+      {"Py_Finalize", (PYTHON_PROC*)&dll_Py_Finalize},
+      {"Py_IsInitialized", (PYTHON_PROC*)&dll_Py_IsInitialized},
+***************
+*** 349,355 ****
+  {
+      int i;
+  
+! #if !defined(PY_NO_RTLD_GLOBAL) && defined(UNIX) && defined(FEAT_PYTHON3)
+      /* Can't have Python and Python3 loaded at the same time.
+       * It cause a crash, because RTLD_GLOBAL is needed for
+       * standard C extension libraries of one or both python versions. */
+--- 352,358 ----
+  {
+      int i;
+  
+! #if !(defined(PY_NO_RTLD_GLOBAL) && defined(PY3_NO_RTLD_GLOBAL)) && defined(UNIX) && defined(FEAT_PYTHON3)
+      /* Can't have Python and Python3 loaded at the same time.
+       * It cause a crash, because RTLD_GLOBAL is needed for
+       * standard C extension libraries of one or both python versions. */
+***************
+*** 543,548 ****
+--- 546,555 ----
+  	}
+  #endif
+  
++ #ifdef PYTHON_HOME
++ 	Py_SetPythonHome(PYTHON_HOME);
++ #endif
++ 
+  	init_structs();
+  
+  #if !defined(MACOS) || defined(MACOS_X_UNIX)
+*** ../vim-7.3.061/src/if_python3.c	2010-10-23 14:02:48.000000000 +0200
+--- src/if_python3.c	2010-11-16 17:07:26.000000000 +0100
+***************
+*** 80,86 ****
+  #  include <dlfcn.h>
+  #  define FARPROC void*
+  #  define HINSTANCE void*
+! #  ifdef PY_NO_RTLD_GLOBAL
+  #   define load_dll(n) dlopen((n), RTLD_LAZY)
+  #  else
+  #   define load_dll(n) dlopen((n), RTLD_LAZY|RTLD_GLOBAL)
+--- 80,86 ----
+  #  include <dlfcn.h>
+  #  define FARPROC void*
+  #  define HINSTANCE void*
+! #  if defined(PY_NO_RTLD_GLOBAL) && defined(PY3_NO_RTLD_GLOBAL)
+  #   define load_dll(n) dlopen((n), RTLD_LAZY)
+  #  else
+  #   define load_dll(n) dlopen((n), RTLD_LAZY|RTLD_GLOBAL)
+***************
+*** 132,137 ****
+--- 132,138 ----
+  # define PyType_Ready py3_PyType_Ready
+  #undef Py_BuildValue
+  # define Py_BuildValue py3_Py_BuildValue
++ # define Py_SetPythonHome py3_Py_SetPythonHome
+  # define Py_Initialize py3_Py_Initialize
+  # define Py_Finalize py3_Py_Finalize
+  # define Py_IsInitialized py3_Py_IsInitialized
+***************
+*** 170,175 ****
+--- 171,177 ----
+   * Pointers for dynamic link
+   */
+  static int (*py3_PySys_SetArgv)(int, wchar_t **);
++ static void (*py3_Py_SetPythonHome)(wchar_t *home);
+  static void (*py3_Py_Initialize)(void);
+  static PyObject* (*py3_PyList_New)(Py_ssize_t size);
+  static PyGILState_STATE (*py3_PyGILState_Ensure)(void);
+***************
+*** 254,259 ****
+--- 256,262 ----
+  } py3_funcname_table[] =
+  {
+      {"PySys_SetArgv", (PYTHON_PROC*)&py3_PySys_SetArgv},
++     {"Py_SetPythonHome", (PYTHON_PROC*)&py3_Py_SetPythonHome},
+      {"Py_Initialize", (PYTHON_PROC*)&py3_Py_Initialize},
+      {"PyArg_ParseTuple", (PYTHON_PROC*)&py3_PyArg_ParseTuple},
+      {"PyList_New", (PYTHON_PROC*)&py3_PyList_New},
+***************
+*** 336,342 ****
+      int i;
+      void *ucs_from_string, *ucs_from_string_and_size;
+  
+! # if !defined(PY_NO_RTLD_GLOBAL) && defined(UNIX) && defined(FEAT_PYTHON)
+      /* Can't have Python and Python3 loaded at the same time.
+       * It cause a crash, because RTLD_GLOBAL is needed for
+       * standard C extension libraries of one or both python versions. */
+--- 339,345 ----
+      int i;
+      void *ucs_from_string, *ucs_from_string_and_size;
+  
+! # if !(defined(PY_NO_RTLD_GLOBAL) && defined(PY3_NO_RTLD_GLOBAL)) && defined(UNIX) && defined(FEAT_PYTHON)
+      /* Can't have Python and Python3 loaded at the same time.
+       * It cause a crash, because RTLD_GLOBAL is needed for
+       * standard C extension libraries of one or both python versions. */
+***************
+*** 539,544 ****
+--- 542,552 ----
+  
+  	init_structs();
+  
++ 
++ #ifdef PYTHON3_HOME
++ 	Py_SetPythonHome(PYTHON3_HOME);
++ #endif
++ 
+  	/* initialise threads */
+  	PyEval_InitThreads();
+  
+*** ../vim-7.3.061/src/version.c	2010-11-16 16:25:46.000000000 +0100
+--- src/version.c	2010-11-16 17:12:40.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     62,
+  /**/
+
+-- 
+ARTHUR: CHARGE!
+   [The mighty ARMY charges.  Thundering noise of feet.  Clatter of coconuts.
+   Shouts etc.   Suddenly there is a wail of a siren and a couple of police
+   cars roar round in front of the charging ARMY and the POLICE leap out and
+   stop them.  TWO POLICEMAN and the HISTORIAN'S WIFE.  Black Marias skid up
+   behind them.]
+HISTORIAN'S WIFE: They're the ones, I'm sure.
+                 "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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.063 b/source/ap/vim/patches/7.3.063
new file mode 100644
index 00000000..27516ff2
--- /dev/null
+++ b/source/ap/vim/patches/7.3.063
@@ -0,0 +1,59 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.063
+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.3.063
+Problem:    Win32: Running a filter command makes Vim lose focus.
+Solution:   Use SW_SHOWMINNOACTIVE instead of SW_SHOWMINIMIZED. (Hong Xu)
+Files:	    src/os_win32.c
+
+
+*** ../vim-7.3.062/src/os_win32.c	2010-11-10 15:37:00.000000000 +0100
+--- src/os_win32.c	2010-11-24 12:31:46.000000000 +0100
+***************
+*** 3185,3193 ****
+       * It's nicer to run a filter command in a minimized window, but in
+       * Windows 95 this makes the command MUCH slower.  We can't do it under
+       * Win32s either as it stops the synchronous spawn workaround working.
+       */
+      if ((options & SHELL_DOOUT) && !mch_windows95() && !gui_is_win32s())
+! 	si.wShowWindow = SW_SHOWMINIMIZED;
+      else
+  	si.wShowWindow = SW_SHOWNORMAL;
+      si.cbReserved2 = 0;
+--- 3185,3194 ----
+       * It's nicer to run a filter command in a minimized window, but in
+       * Windows 95 this makes the command MUCH slower.  We can't do it under
+       * Win32s either as it stops the synchronous spawn workaround working.
++      * Don't activate the window to keep focus on Vim.
+       */
+      if ((options & SHELL_DOOUT) && !mch_windows95() && !gui_is_win32s())
+! 	si.wShowWindow = SW_SHOWMINNOACTIVE;
+      else
+  	si.wShowWindow = SW_SHOWNORMAL;
+      si.cbReserved2 = 0;
+*** ../vim-7.3.062/src/version.c	2010-11-16 19:25:56.000000000 +0100
+--- src/version.c	2010-11-24 12:32:52.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     63,
+  /**/
+
+-- 
+SOLDIER: Where did you get the coconuts?
+ARTHUR:  Through ... We found them.
+SOLDIER: Found them?  In Mercea.  The coconut's tropical!
+                 "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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.064 b/source/ap/vim/patches/7.3.064
new file mode 100644
index 00000000..cbd49ad9
--- /dev/null
+++ b/source/ap/vim/patches/7.3.064
@@ -0,0 +1,72 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.064
+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.3.064
+Problem:    Win32: ":dis +" shows nothing, but "+p does insert text.
+Solution:   Display the * register, since that's what will be inserted.
+	    (Christian Brabandt)
+Files:	    src/globals.h, src/ops.c
+
+
+*** ../vim-7.3.063/src/globals.h	2010-08-15 21:57:27.000000000 +0200
+--- src/globals.h	2010-11-24 14:06:47.000000000 +0100
+***************
+*** 510,515 ****
+--- 510,516 ----
+  EXTERN VimClipboard clip_plus;	/* CLIPBOARD selection in X11 */
+  # else
+  #  define clip_plus clip_star	/* there is only one clipboard */
++ #  define ONE_CLIPBOARD
+  # endif
+  EXTERN int	clip_unnamed INIT(= FALSE);
+  EXTERN int	clip_autoselect INIT(= FALSE);
+*** ../vim-7.3.063/src/ops.c	2010-10-09 17:21:42.000000000 +0200
+--- src/ops.c	2010-11-24 14:26:25.000000000 +0100
+***************
+*** 3979,3985 ****
+      for (i = -1; i < NUM_REGISTERS && !got_int; ++i)
+      {
+  	name = get_register_name(i);
+! 	if (arg != NULL && vim_strchr(arg, name) == NULL)
+  	    continue;	    /* did not ask for this register */
+  
+  #ifdef FEAT_CLIPBOARD
+--- 3979,3990 ----
+      for (i = -1; i < NUM_REGISTERS && !got_int; ++i)
+      {
+  	name = get_register_name(i);
+! 	if (arg != NULL && vim_strchr(arg, name) == NULL
+! #ifdef ONE_CLIPBOARD
+! 	    /* Star register and plus register contain the same thing. */
+! 		&& (name != '*' || vim_strchr(arg, '+') == NULL)
+! #endif
+! 		)
+  	    continue;	    /* did not ask for this register */
+  
+  #ifdef FEAT_CLIPBOARD
+*** ../vim-7.3.063/src/version.c	2010-11-24 12:35:14.000000000 +0100
+--- src/version.c	2010-11-24 14:24:03.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     64,
+  /**/
+
+-- 
+FIRST SOLDIER:  So they wouldn't be able to bring a coconut back anyway.
+SECOND SOLDIER: Wait a minute! Suppose two swallows carried it together?
+FIRST SOLDIER:  No, they'd have to have it on a line.
+                 "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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.065 b/source/ap/vim/patches/7.3.065
new file mode 100644
index 00000000..cd9b2a75
--- /dev/null
+++ b/source/ap/vim/patches/7.3.065
@@ -0,0 +1,120 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.065
+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.3.065
+Problem:    Can't get current line number in a source file.
+Solution:   Add the <slnum> item, similar to <sfile>.
+Files:	    src/ex_docmd.c
+
+
+*** ../vim-7.3.064/src/ex_docmd.c	2010-11-16 11:29:30.000000000 +0100
+--- src/ex_docmd.c	2010-11-24 15:41:51.000000000 +0100
+***************
+*** 9538,9554 ****
+  #define SPEC_CFILE  4
+  		    "<sfile>",		/* ":so" file name */
+  #define SPEC_SFILE  5
+  #ifdef FEAT_AUTOCMD
+  		    "<afile>",		/* autocommand file name */
+! # define SPEC_AFILE 6
+  		    "<abuf>",		/* autocommand buffer number */
+! # define SPEC_ABUF  7
+  		    "<amatch>",		/* autocommand match name */
+! # define SPEC_AMATCH 8
+  #endif
+  #ifdef FEAT_CLIENTSERVER
+  		    "<client>"
+! # define SPEC_CLIENT 9
+  #endif
+      };
+  
+--- 9538,9560 ----
+  #define SPEC_CFILE  4
+  		    "<sfile>",		/* ":so" file name */
+  #define SPEC_SFILE  5
++ 		    "<slnum>",		/* ":so" file line number */
++ #define SPEC_SLNUM  6
+  #ifdef FEAT_AUTOCMD
+  		    "<afile>",		/* autocommand file name */
+! # define SPEC_AFILE 7
+  		    "<abuf>",		/* autocommand buffer number */
+! # define SPEC_ABUF  8
+  		    "<amatch>",		/* autocommand match name */
+! # define SPEC_AMATCH 9
+  #endif
+  #ifdef FEAT_CLIENTSERVER
+  		    "<client>"
+! # ifdef FEAT_AUTOCMD
+! #  define SPEC_CLIENT 10
+! # else
+! #  define SPEC_CLIENT 7
+! # endif
+  #endif
+      };
+  
+***************
+*** 9573,9578 ****
+--- 9579,9585 ----
+   *	  '<cWORD>' to WORD under the cursor
+   *	  '<cfile>' to path name under the cursor
+   *	  '<sfile>' to sourced file name
++  *	  '<slnum>' to sourced file line number
+   *	  '<afile>' to file name for autocommand
+   *	  '<abuf>'  to buffer number for autocommand
+   *	  '<amatch>' to matching name for autocommand
+***************
+*** 9604,9613 ****
+  #ifdef FEAT_MODIFY_FNAME
+      int		skip_mod = FALSE;
+  #endif
+- 
+- #if defined(FEAT_AUTOCMD) || defined(FEAT_CLIENTSERVER)
+      char_u	strbuf[30];
+- #endif
+  
+      *errormsg = NULL;
+      if (escaped != NULL)
+--- 9611,9617 ----
+***************
+*** 9796,9801 ****
+--- 9800,9814 ----
+  		    return NULL;
+  		}
+  		break;
++ 	case SPEC_SLNUM:	/* line in file for ":so" command */
++ 		if (sourcing_name == NULL || sourcing_lnum == 0)
++ 		{
++ 		    *errormsg = (char_u *)_("E842: no line number to use for \"<slnum>\"");
++ 		    return NULL;
++ 		}
++ 		sprintf((char *)strbuf, "%ld", (long)sourcing_lnum);
++ 		result = strbuf;
++ 		break;
+  #if defined(FEAT_CLIENTSERVER)
+  	case SPEC_CLIENT:	/* Source of last submitted input */
+  		sprintf((char *)strbuf, PRINTF_HEX_LONG_U,
+*** ../vim-7.3.064/src/version.c	2010-11-24 14:28:53.000000000 +0100
+--- src/version.c	2010-11-24 15:49:57.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     65,
+  /**/
+
+
+-- 
+If you don't get everything you want, think of
+everything you didn't get and don't want.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.066 b/source/ap/vim/patches/7.3.066
new file mode 100644
index 00000000..f4a6fd0b
--- /dev/null
+++ b/source/ap/vim/patches/7.3.066
@@ -0,0 +1,90 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.066
+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.3.066
+Problem:    Crash when changing to another window while in a :vimgrep command.
+	    (Christian Brabandt)
+Solution:   When wiping out the dummy before, remove it from aucmd_win.
+Files:	    src/quickfix.c
+
+
+*** ../vim-7.3.065/src/quickfix.c	2010-09-21 16:56:29.000000000 +0200
+--- src/quickfix.c	2010-11-24 16:27:40.000000000 +0100
+***************
+*** 3432,3437 ****
+--- 3432,3438 ----
+      char_u	*fname;
+  {
+      buf_T	*newbuf;
++     buf_T	*newbuf_to_wipe = NULL;
+      int		failed = TRUE;
+      aco_save_T	aco;
+  
+***************
+*** 3468,3482 ****
+  	    failed = FALSE;
+  	    if (curbuf != newbuf)
+  	    {
+! 		/* Bloody autocommands changed the buffer! */
+! 		if (buf_valid(newbuf))
+! 		    wipe_buffer(newbuf, FALSE);
+  		newbuf = curbuf;
+  	    }
+  	}
+  
+  	/* restore curwin/curbuf and a few other things */
+  	aucmd_restbuf(&aco);
+      }
+  
+      if (!buf_valid(newbuf))
+--- 3469,3487 ----
+  	    failed = FALSE;
+  	    if (curbuf != newbuf)
+  	    {
+! 		/* Bloody autocommands changed the buffer!  Can happen when
+! 		 * using netrw and editing a remote file.  Use the current
+! 		 * buffer instead, delete the dummy one after restoring the
+! 		 * window stuff. */
+! 		newbuf_to_wipe = newbuf;
+  		newbuf = curbuf;
+  	    }
+  	}
+  
+  	/* restore curwin/curbuf and a few other things */
+  	aucmd_restbuf(&aco);
++ 	if (newbuf_to_wipe != NULL && buf_valid(newbuf_to_wipe))
++ 	    wipe_buffer(newbuf_to_wipe, FALSE);
+      }
+  
+      if (!buf_valid(newbuf))
+*** ../vim-7.3.065/src/version.c	2010-11-24 15:50:54.000000000 +0100
+--- src/version.c	2010-11-24 16:30:44.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     66,
+  /**/
+
+-- 
+CART DRIVER: Bring out your dead!
+   We follow the cart through a wretched, impoverished plague-ridden village.
+   A few starved mongrels run about in the mud scavenging.  In the open
+   doorway of one house perhaps we jug glimpse a pair of legs dangling from
+   the ceiling.  In another doorway an OLD WOMAN is beating a cat against a
+   wall rather like one does with a mat.  The cart passes round a dead donkey
+   or cow in the mud.  And a MAN tied to a cart is being hammered to death by
+   four NUNS with huge mallets.
+                 "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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.067 b/source/ap/vim/patches/7.3.067
new file mode 100644
index 00000000..c32c645a
--- /dev/null
+++ b/source/ap/vim/patches/7.3.067
@@ -0,0 +1,68 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.067
+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.3.067 (after 7.3.058)
+Problem:    Ruby: Init_prelude is not always available.
+Solution:   Remove use of Init_prelude. (Yasuhiro Matsumoto)
+Files:	    src/if_ruby.c
+
+
+*** ../vim-7.3.066/src/if_ruby.c	2010-11-16 14:46:14.000000000 +0100
+--- src/if_ruby.c	2010-11-24 16:53:06.000000000 +0100
+***************
+*** 231,237 ****
+  # define rb_enc_str_new			dll_rb_enc_str_new
+  # define rb_intern2			dll_rb_intern2
+  # define rb_const_remove		dll_rb_const_remove
+- # define Init_prelude			dll_Init_prelude
+  # define rb_sprintf			dll_rb_sprintf
+  # define ruby_init_stack		dll_ruby_init_stack
+  #endif
+--- 231,236 ----
+***************
+*** 433,439 ****
+      {"rb_enc_str_new", (RUBY_PROC*)&dll_rb_enc_str_new},
+      {"rb_intern2", (RUBY_PROC*)&dll_rb_intern2},
+      {"rb_const_remove", (RUBY_PROC*)&dll_rb_const_remove},
+-     {"Init_prelude", (RUBY_PROC*)&dll_Init_prelude},
+      {"rb_sprintf", (RUBY_PROC*)&dll_rb_sprintf},
+      {"ruby_init_stack", (RUBY_PROC*)&dll_ruby_init_stack},
+  #endif
+--- 432,437 ----
+***************
+*** 675,681 ****
+  	    /* This avoids the error "Encoding::ConverterNotFoundError: code
+  	     * converter not found (UTF-16LE to ASCII-8BIT)". */
+  	    rb_define_module("Gem");
+- 	    Init_prelude();
+  	    rb_const_remove(rb_cObject, rb_intern2("TMP_RUBY_PREFIX", 15));
+  #endif
+  	    ruby_vim_init();
+--- 673,678 ----
+*** ../vim-7.3.066/src/version.c	2010-11-24 16:31:55.000000000 +0100
+--- src/version.c	2010-11-24 16:53:35.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     67,
+  /**/
+
+-- 
+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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.068 b/source/ap/vim/patches/7.3.068
new file mode 100644
index 00000000..8acbcab9
--- /dev/null
+++ b/source/ap/vim/patches/7.3.068
@@ -0,0 +1,50 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.068
+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.3.068
+Problem:    Using freed memory when doing ":saveas" and an autocommand sets
+	    'autochdir'. (Kevin Klement)
+Solution:   Get the value of fname again after executing autocommands.
+Files:	    src/ex_cmds.c
+
+
+*** ../vim-7.3.067/src/ex_cmds.c	2010-10-15 20:20:00.000000000 +0200
+--- src/ex_cmds.c	2010-11-24 17:53:07.000000000 +0100
+***************
+*** 2705,2710 ****
+--- 2705,2714 ----
+  									TRUE);
+  		do_modelines(0);
+  	    }
++ 
++ 	    /* Autocommands may have changed buffer names, esp. when
++ 	     * 'autochdir' is set. */
++ 	    fname = curbuf->b_sfname;
+  #endif
+  	}
+  
+*** ../vim-7.3.067/src/version.c	2010-11-24 17:03:34.000000000 +0100
+--- src/version.c	2010-11-24 17:55:11.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     68,
+  /**/
+
+-- 
+I used to wonder about the meaning of life.  But I looked it
+up in the dictionary under "L" and there it was - the meaning
+of life.  It was less than I expected.              - Dogbert
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.069 b/source/ap/vim/patches/7.3.069
new file mode 100644
index 00000000..d7761290
--- /dev/null
+++ b/source/ap/vim/patches/7.3.069
@@ -0,0 +1,49 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.069
+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.3.069
+Problem:    GTK: pressing Enter in inputdialog() doesn't work like clicking OK
+	    as documented.
+Solution:   call gtk_entry_set_activates_default(). (Britton Kerin)
+Files:	    src/gui_gtk.c
+
+
+*** ../vim-7.3.068/src/gui_gtk.c	2010-08-15 21:57:32.000000000 +0200
+--- src/gui_gtk.c	2010-11-24 18:44:21.000000000 +0100
+***************
+*** 1287,1292 ****
+--- 1287,1295 ----
+  	entry = gtk_entry_new();
+  	gtk_widget_show(entry);
+  
++ 	/* Make Enter work like pressing OK. */
++         gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
++ 
+  	text = CONVERT_TO_UTF8(textfield);
+  	gtk_entry_set_text(GTK_ENTRY(entry), (const char *)text);
+  	CONVERT_TO_UTF8_FREE(text);
+*** ../vim-7.3.068/src/version.c	2010-11-24 17:59:27.000000000 +0100
+--- src/version.c	2010-11-24 18:46:39.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     69,
+  /**/
+
+-- 
+Why I like vim:
+> I like VIM because, when I ask a question in this newsgroup, I get a
+> one-line answer.  With xemacs, I get a 1Kb lisp script with bugs in it ;-)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.070 b/source/ap/vim/patches/7.3.070
new file mode 100644
index 00000000..0da893f9
--- /dev/null
+++ b/source/ap/vim/patches/7.3.070
@@ -0,0 +1,53 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.070
+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.3.070
+Problem:    Can set environment variables in the sandbox, could be abused.
+Solution:   Disallow it.
+Files:	    src/eval.c
+
+
+*** ../vim-7.3.069/src/eval.c	2010-11-10 20:31:24.000000000 +0100
+--- src/eval.c	2010-12-02 14:42:31.000000000 +0100
+***************
+*** 2326,2332 ****
+  	    else if (endchars != NULL
+  			     && vim_strchr(endchars, *skipwhite(arg)) == NULL)
+  		EMSG(_(e_letunexp));
+! 	    else
+  	    {
+  		c1 = name[len];
+  		name[len] = NUL;
+--- 2326,2332 ----
+  	    else if (endchars != NULL
+  			     && vim_strchr(endchars, *skipwhite(arg)) == NULL)
+  		EMSG(_(e_letunexp));
+! 	    else if (!check_secure())
+  	    {
+  		c1 = name[len];
+  		name[len] = NUL;
+*** ../vim-7.3.069/src/version.c	2010-11-24 18:48:08.000000000 +0100
+--- src/version.c	2010-12-02 14:46:44.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     70,
+  /**/
+
+-- 
+The only way the average employee can speak to an executive is by taking a
+second job as a golf caddie.
+				(Scott Adams - The Dilbert principle)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.071 b/source/ap/vim/patches/7.3.071
new file mode 100644
index 00000000..75b6979f
--- /dev/null
+++ b/source/ap/vim/patches/7.3.071
@@ -0,0 +1,65 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.071
+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.3.071
+Problem:    Editing a file in a window that's in diff mode resets 'diff'
+	    but not cursor binding.
+Solution:   Reset cursor binding in two more places.
+Files:	    src/quickfix.c, src/option.c
+
+
+*** ../vim-7.3.070/src/quickfix.c	2010-11-24 16:31:55.000000000 +0100
+--- src/quickfix.c	2010-12-02 15:02:00.000000000 +0100
+***************
+*** 2359,2364 ****
+--- 2359,2365 ----
+  	    set_option_value((char_u *)"bt", 0L, (char_u *)"quickfix",
+  								   OPT_LOCAL);
+  	    set_option_value((char_u *)"bh", 0L, (char_u *)"wipe", OPT_LOCAL);
++ 	    RESET_BINDING(curwin);
+  #ifdef FEAT_DIFF
+  	    curwin->w_p_diff = FALSE;
+  #endif
+*** ../vim-7.3.070/src/option.c	2010-10-13 14:05:29.000000000 +0200
+--- src/option.c	2010-12-02 15:12:02.000000000 +0100
+***************
+*** 9756,9761 ****
+--- 9759,9767 ----
+  #ifdef FEAT_SCROLLBIND
+      to->wo_scb = from->wo_scb;
+  #endif
++ #ifdef FEAT_CURSORBIND
++     to->wo_crb = from->wo_crb;
++ #endif
+  #ifdef FEAT_SPELL
+      to->wo_spell = from->wo_spell;
+  #endif
+*** ../vim-7.3.070/src/version.c	2010-12-02 14:47:56.000000000 +0100
+--- src/version.c	2010-12-02 15:31:12.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     71,
+  /**/
+
+-- 
+A salesperson says:            Translation:
+"backward compatible"          Old technology
+"Premium"                      Overpriced
+"Can't keep it on the shelf"   Unavailable
+"Stands alone"                 Piece of shit
+"Proprietary"                  Incompatible
+				(Scott Adams - The Dilbert principle)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.072 b/source/ap/vim/patches/7.3.072
new file mode 100644
index 00000000..88e54f9e
--- /dev/null
+++ b/source/ap/vim/patches/7.3.072
@@ -0,0 +1,295 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.072
+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.3.072
+Problem:    Can't complete file names while ignoring case.
+Solution:   Add 'wildignorecase'.
+Files:	    src/ex_docmd.c, src/ex_getln.c, src/misc1.c, src/option.c,
+	    src/option.h, src/vim.h, runtime/doc/options.txt
+
+
+*** ../vim-7.3.071/src/ex_docmd.c	2010-11-24 15:50:54.000000000 +0100
+--- src/ex_docmd.c	2010-12-02 15:58:10.000000000 +0100
+***************
+*** 4524,4535 ****
+  		else /* n == 2 */
+  		{
+  		    expand_T	xpc;
+  
+  		    ExpandInit(&xpc);
+  		    xpc.xp_context = EXPAND_FILES;
+  		    p = ExpandOne(&xpc, eap->arg, NULL,
+! 					    WILD_LIST_NOTFOUND|WILD_ADD_SLASH,
+! 						   WILD_EXPAND_FREE);
+  		    if (p == NULL)
+  			return FAIL;
+  		}
+--- 4524,4537 ----
+  		else /* n == 2 */
+  		{
+  		    expand_T	xpc;
++ 		    int		options = WILD_LIST_NOTFOUND|WILD_ADD_SLASH;
+  
+  		    ExpandInit(&xpc);
+  		    xpc.xp_context = EXPAND_FILES;
++ 		    if (p_wic)
++ 			options += WILD_ICASE;
+  		    p = ExpandOne(&xpc, eap->arg, NULL,
+! 						   options, WILD_EXPAND_FREE);
+  		    if (p == NULL)
+  			return FAIL;
+  		}
+*** ../vim-7.3.071/src/ex_getln.c	2010-11-16 14:05:48.000000000 +0100
+--- src/ex_getln.c	2010-11-28 15:07:49.000000000 +0100
+***************
+*** 3339,3348 ****
+  	    p2 = NULL;
+  	else
+  	{
+  	    p2 = ExpandOne(xp, p1,
+  			 vim_strnsave(&ccline.cmdbuff[i], xp->xp_pattern_len),
+! 		    WILD_HOME_REPLACE|WILD_ADD_SLASH|WILD_SILENT|WILD_ESCAPE
+! 							      |options, type);
+  	    vim_free(p1);
+  	    /* longest match: make sure it is not shorter, happens with :help */
+  	    if (p2 != NULL && type == WILD_LONGEST)
+--- 3339,3352 ----
+  	    p2 = NULL;
+  	else
+  	{
++ 	    int use_options = options |
++ 		    WILD_HOME_REPLACE|WILD_ADD_SLASH|WILD_SILENT|WILD_ESCAPE;
++ 
++ 	    if (p_wic)
++ 		use_options += WILD_ICASE;
+  	    p2 = ExpandOne(xp, p1,
+  			 vim_strnsave(&ccline.cmdbuff[i], xp->xp_pattern_len),
+! 							   use_options, type);
+  	    vim_free(p1);
+  	    /* longest match: make sure it is not shorter, happens with :help */
+  	    if (p2 != NULL && type == WILD_LONGEST)
+***************
+*** 3428,3433 ****
+--- 3432,3438 ----
+   * options = WILD_KEEP_ALL:	    don't remove 'wildignore' entries
+   * options = WILD_SILENT:	    don't print warning messages
+   * options = WILD_ESCAPE:	    put backslash before special chars
++  * options = WILD_ICASE:	    ignore case for files
+   *
+   * The variables xp->xp_context and xp->xp_backslash must have been set!
+   */
+***************
+*** 4361,4366 ****
+--- 4366,4372 ----
+      char_u	***matches;	/* return: array of pointers to matches */
+  {
+      char_u	*file_str = NULL;
++     int		options = WILD_ADD_SLASH|WILD_SILENT;
+  
+      if (xp->xp_context == EXPAND_UNSUCCESSFUL)
+      {
+***************
+*** 4379,4387 ****
+      if (file_str == NULL)
+  	return EXPAND_UNSUCCESSFUL;
+  
+      /* find all files that match the description */
+!     if (ExpandFromContext(xp, file_str, matchcount, matches,
+! 					  WILD_ADD_SLASH|WILD_SILENT) == FAIL)
+      {
+  	*matchcount = 0;
+  	*matches = NULL;
+--- 4385,4395 ----
+      if (file_str == NULL)
+  	return EXPAND_UNSUCCESSFUL;
+  
++     if (p_wic)
++ 	options += WILD_ICASE;
++ 
+      /* find all files that match the description */
+!     if (ExpandFromContext(xp, file_str, matchcount, matches, options) == FAIL)
+      {
+  	*matchcount = 0;
+  	*matches = NULL;
+***************
+*** 4433,4439 ****
+      char_u	*pat;
+      int		*num_file;
+      char_u	***file;
+!     int		options;
+  {
+  #ifdef FEAT_CMDL_COMPL
+      regmatch_T	regmatch;
+--- 4441,4447 ----
+      char_u	*pat;
+      int		*num_file;
+      char_u	***file;
+!     int		options;  /* EW_ flags */
+  {
+  #ifdef FEAT_CMDL_COMPL
+      regmatch_T	regmatch;
+***************
+*** 4487,4492 ****
+--- 4495,4503 ----
+  	    flags |= (EW_FILE | EW_PATH);
+  	else
+  	    flags = (flags | EW_DIR) & ~EW_FILE;
++ 	if (options & WILD_ICASE)
++ 	    flags |= EW_ICASE;
++ 
+  	/* Expand wildcards, supporting %:h and the like. */
+  	ret = expand_wildcards_eval(&pat, num_file, file, flags);
+  	if (free_pat)
+*** ../vim-7.3.071/src/misc1.c	2010-08-16 21:46:12.000000000 +0200
+--- src/misc1.c	2010-11-28 15:02:57.000000000 +0100
+***************
+*** 9161,9167 ****
+  #ifdef CASE_INSENSITIVE_FILENAME
+      regmatch.rm_ic = TRUE;		/* Behave like Terminal.app */
+  #else
+!     regmatch.rm_ic = FALSE;		/* Don't ever ignore case */
+  #endif
+      regmatch.regprog = vim_regcomp(pat, RE_MAGIC);
+      vim_free(pat);
+--- 9161,9170 ----
+  #ifdef CASE_INSENSITIVE_FILENAME
+      regmatch.rm_ic = TRUE;		/* Behave like Terminal.app */
+  #else
+!     if (flags & EW_ICASE)
+! 	regmatch.rm_ic = TRUE;		/* 'wildignorecase' set */
+!     else
+! 	regmatch.rm_ic = FALSE;		/* Don't ignore case */
+  #endif
+      regmatch.regprog = vim_regcomp(pat, RE_MAGIC);
+      vim_free(pat);
+***************
+*** 9643,9649 ****
+      if (paths == NULL)
+  	return 0;
+  
+!     files = globpath(paths, pattern, 0);
+      vim_free(paths);
+      if (files == NULL)
+  	return 0;
+--- 9646,9652 ----
+      if (paths == NULL)
+  	return 0;
+  
+!     files = globpath(paths, pattern, (flags & EW_ICASE) ? WILD_ICASE : 0);
+      vim_free(paths);
+      if (files == NULL)
+  	return 0;
+*** ../vim-7.3.071/src/option.c	2010-12-02 15:33:10.000000000 +0100
+--- src/option.c	2010-12-02 15:12:02.000000000 +0100
+***************
+*** 2740,2746 ****
+  			    (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,
+--- 2740,2746 ----
+  			    (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,
+***************
+*** 2750,2755 ****
+--- 2750,2758 ----
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+  			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
++     {"wildignorecase", "wic", P_BOOL|P_VI_DEF,
++ 			    (char_u *)&p_wic, PV_NONE,
++ 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"wildmenu",    "wmnu", P_BOOL|P_VI_DEF,
+  #ifdef FEAT_WILDMENU
+  			    (char_u *)&p_wmnu, PV_NONE,
+*** ../vim-7.3.071/src/option.h	2010-08-15 21:57:28.000000000 +0200
+--- src/option.h	2010-11-28 14:29:18.000000000 +0100
+***************
+*** 872,877 ****
+--- 872,878 ----
+  EXTERN char_u	*p_ww;		/* 'whichwrap' */
+  EXTERN long	p_wc;		/* 'wildchar' */
+  EXTERN long	p_wcm;		/* 'wildcharm' */
++ EXTERN long	p_wic;		/* 'wildignorecase' */
+  EXTERN char_u	*p_wim;		/* 'wildmode' */
+  #ifdef FEAT_WILDMENU
+  EXTERN int	p_wmnu;		/* 'wildmenu' */
+*** ../vim-7.3.071/src/vim.h	2010-10-20 19:17:43.000000000 +0200
+--- src/vim.h	2010-11-28 14:49:02.000000000 +0100
+***************
+*** 798,803 ****
+--- 798,804 ----
+  #define WILD_KEEP_ALL		32
+  #define WILD_SILENT		64
+  #define WILD_ESCAPE		128
++ #define WILD_ICASE		256
+  
+  /* Flags for expand_wildcards() */
+  #define EW_DIR		0x01	/* include directory names */
+***************
+*** 808,813 ****
+--- 809,815 ----
+  #define EW_SILENT	0x20	/* don't print "1 returned" from shell */
+  #define EW_EXEC		0x40	/* executable files */
+  #define EW_PATH		0x80	/* search in 'path' too */
++ #define EW_ICASE	0x100	/* ignore case */
+  /* Note: mostly EW_NOTFOUND and EW_SILENT are mutually exclusive: EW_NOTFOUND
+   * is used when executing commands and EW_SILENT for interactive expanding. */
+  
+*** ../vim-7.3.071/runtime/doc/options.txt	2010-10-20 17:44:01.000000000 +0200
+--- runtime/doc/options.txt	2010-12-02 11:15:01.000000000 +0100
+***************
+*** 7748,7753 ****
+--- 7756,7772 ----
+  	a pattern from the list.  This avoids problems when a future version
+  	uses another default.
+  
++ 
++ 			*'wildignorecase* *'wic'* *'nowildignorecase* *'nowic'*
++ 'wildignorecase' 'wic'	boolean	(default off)
++ 			global
++ 			{not in Vi}
++ 	When set case is ignored when completing file names and directories.
++ 	Has no effect on systems where file name case is generally ignored.
++ 	Does not apply when the shell is used to expand wildcards, which
++ 	happens when there are special characters.
++ 
++ 
+  				*'wildmenu'* *'wmnu'* *'nowildmenu'* *'nowmnu'*
+  'wildmenu' 'wmnu'	boolean	(default off)
+  			global
+*** ../vim-7.3.071/src/version.c	2010-12-02 15:33:10.000000000 +0100
+--- src/version.c	2010-12-02 15:57:14.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     72,
+  /**/
+
+-- 
+I recommend ordering large cargo containers of paper towels to make up
+whatever budget underruns you have.  Paper products are always useful and they
+have the advantage of being completely flushable if you need to make room in
+the storage area later.
+				(Scott Adams - The Dilbert principle)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.073 b/source/ap/vim/patches/7.3.073
new file mode 100644
index 00000000..4a79e20b
--- /dev/null
+++ b/source/ap/vim/patches/7.3.073
@@ -0,0 +1,92 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.073
+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.3.073
+Problem:    Double free memory when netbeans command follows DETACH.
+Solution:   Only free the node when owned. (Xavier de Gaye)
+Files:	    src/netbeans.c
+
+
+*** ../vim-7.3.072/src/netbeans.c	2010-11-16 15:48:57.000000000 +0100
+--- src/netbeans.c	2010-12-02 16:59:11.000000000 +0100
+***************
+*** 643,648 ****
+--- 643,649 ----
+  {
+      char_u	*p;
+      queue_T	*node;
++     int		own_node;
+  
+      while (head.next != NULL && head.next != &head)
+      {
+***************
+*** 681,700 ****
+  	    *p++ = NUL;
+  	    if (*p == NUL)
+  	    {
+  		head.next = node->next;
+  		node->next->prev = node->prev;
+  	    }
+  
+  	    /* now, parse and execute the commands */
+  	    nb_parse_cmd(node->buffer);
+  
+! 	    if (*p == NUL)
+  	    {
+  		/* buffer finished, dispose of the node and buffer */
+  		vim_free(node->buffer);
+  		vim_free(node);
+  	    }
+! 	    else
+  	    {
+  		/* more follows, move to the start */
+  		STRMOVE(node->buffer, p);
+--- 682,706 ----
+  	    *p++ = NUL;
+  	    if (*p == NUL)
+  	    {
++ 		own_node = TRUE;
+  		head.next = node->next;
+  		node->next->prev = node->prev;
+  	    }
++ 	    else
++ 		own_node = FALSE;
+  
+  	    /* now, parse and execute the commands */
+  	    nb_parse_cmd(node->buffer);
+  
+! 	    if (own_node)
+  	    {
+  		/* buffer finished, dispose of the node and buffer */
+  		vim_free(node->buffer);
+  		vim_free(node);
+  	    }
+! 	    /* Check that "head" wasn't changed under our fingers, e.g. when a
+! 	     * DETACH command was handled. */
+! 	    else if (head.next == node)
+  	    {
+  		/* more follows, move to the start */
+  		STRMOVE(node->buffer, p);
+*** ../vim-7.3.072/src/version.c	2010-12-02 16:01:23.000000000 +0100
+--- src/version.c	2010-12-02 17:00:29.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     73,
+  /**/
+
+-- 
+If the Universe is constantly expanding, why can't I ever find a parking space?
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.074 b/source/ap/vim/patches/7.3.074
new file mode 100644
index 00000000..1223d6dc
--- /dev/null
+++ b/source/ap/vim/patches/7.3.074
@@ -0,0 +1,235 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.074
+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.3.074
+Problem:    Can't use the "+ register like "* for yank and put.
+Solution:   Add "unnamedplus" to the 'clipboard' option. (Ivan Krasilnikov)
+Files:	    runtime/doc/options.txt, src/eval.c, src/globals.h, src/ops.c,
+	    src/option.c
+
+
+*** ../vim-7.3.073/runtime/doc/options.txt	2010-12-02 16:01:23.000000000 +0100
+--- runtime/doc/options.txt	2010-12-02 21:22:48.000000000 +0100
+***************
+*** 1434,1439 ****
+--- 1434,1448 ----
+  			explicitly accessed using the "* notation.  Also see
+  			|gui-clipboard|.
+  
++ 	unnamedplus	A variant of "unnamed" flag which uses the clipboard
++ 			register '+' (|quoteplus|) instead of register '*' for
++ 			all operations except yank.  Yank shall copy the text
++ 			into register '+' and also into '*' when "unnamed" is
++ 			included.
++ 			Only available with the |+x11| feature.
++ 			Availability can be checked with: >
++ 				if has('unnamedplus')
++ <
+  	autoselect	Works like the 'a' flag in 'guioptions': If present,
+  			then whenever Visual mode is started, or the Visual
+  			area extended, Vim tries to become the owner of the
+*** ../vim-7.3.073/src/eval.c	2010-12-02 14:47:56.000000000 +0100
+--- src/eval.c	2010-12-02 17:30:23.000000000 +0100
+***************
+*** 12135,12140 ****
+--- 12139,12147 ----
+  #ifdef FEAT_TOOLBAR
+  	"toolbar",
+  #endif
++ #if defined(FEAT_CLIPBOARD) && defined(FEAT_X11)
++ 	"unnamedplus",
++ #endif
+  #ifdef FEAT_USR_CMDS
+  	"user-commands",    /* was accidentally included in 5.4 */
+  	"user_commands",
+*** ../vim-7.3.073/src/globals.h	2010-11-24 14:28:53.000000000 +0100
+--- src/globals.h	2010-12-02 20:07:42.000000000 +0100
+***************
+*** 512,518 ****
+  #  define clip_plus clip_star	/* there is only one clipboard */
+  #  define ONE_CLIPBOARD
+  # endif
+! EXTERN int	clip_unnamed INIT(= FALSE);
+  EXTERN int	clip_autoselect INIT(= FALSE);
+  EXTERN int	clip_autoselectml INIT(= FALSE);
+  EXTERN int	clip_html INIT(= FALSE);
+--- 512,522 ----
+  #  define clip_plus clip_star	/* there is only one clipboard */
+  #  define ONE_CLIPBOARD
+  # endif
+! 
+! #define CLIP_UNNAMED      1
+! #define CLIP_UNNAMED_PLUS 2
+! EXTERN int	clip_unnamed INIT(= 0); /* above two values or'ed */
+! 
+  EXTERN int	clip_autoselect INIT(= FALSE);
+  EXTERN int	clip_autoselectml INIT(= FALSE);
+  EXTERN int	clip_html INIT(= FALSE);
+*** ../vim-7.3.073/src/ops.c	2010-11-24 14:28:53.000000000 +0100
+--- src/ops.c	2010-12-02 21:33:04.000000000 +0100
+***************
+*** 1584,1592 ****
+  adjust_clip_reg(rp)
+      int		*rp;
+  {
+!     /* If no reg. specified, and "unnamed" is in 'clipboard', use '*' reg. */
+!     if (*rp == 0 && clip_unnamed)
+! 	*rp = '*';
+      if (!clip_star.available && *rp == '*')
+  	*rp = 0;
+      if (!clip_plus.available && *rp == '+')
+--- 1584,1594 ----
+  adjust_clip_reg(rp)
+      int		*rp;
+  {
+!     /* If no reg. specified, and "unnamed" or "unnamedplus" is in 'clipboard',
+!      * use '*' or '+' reg, respectively. "unnamedplus" prevails. */
+!     if (*rp == 0 && clip_unnamed != 0)
+! 	*rp = ((clip_unnamed & CLIP_UNNAMED_PLUS) && clip_plus.available)
+! 								  ? '+' : '*';
+      if (!clip_star.available && *rp == '*')
+  	*rp = 0;
+      if (!clip_plus.available && *rp == '+')
+***************
+*** 2842,2847 ****
+--- 2844,2850 ----
+      char_u		*p;
+      char_u		*pnew;
+      struct block_def	bd;
++     int			did_star = FALSE;
+  
+  				    /* check for read-only register */
+      if (oap->regname != 0 && !valid_yank_reg(oap->regname, TRUE))
+***************
+*** 3115,3121 ****
+       */
+      if (clip_star.available
+  	    && (curr == &(y_regs[STAR_REGISTER])
+! 		|| (!deleting && oap->regname == 0 && clip_unnamed)))
+      {
+  	if (curr != &(y_regs[STAR_REGISTER]))
+  	    /* Copy the text from register 0 to the clipboard register. */
+--- 3118,3125 ----
+       */
+      if (clip_star.available
+  	    && (curr == &(y_regs[STAR_REGISTER])
+! 		|| (!deleting && oap->regname == 0
+! 					   && (clip_unnamed & CLIP_UNNAMED))))
+      {
+  	if (curr != &(y_regs[STAR_REGISTER]))
+  	    /* Copy the text from register 0 to the clipboard register. */
+***************
+*** 3123,3128 ****
+--- 3127,3133 ----
+  
+  	clip_own_selection(&clip_star);
+  	clip_gen_set_selection(&clip_star);
++ 	did_star = TRUE;
+      }
+  
+  # ifdef FEAT_X11
+***************
+*** 3130,3141 ****
+       * If we were yanking to the '+' register, send result to selection.
+       * Also copy to the '*' register, in case auto-select is off.
+       */
+!     else if (clip_plus.available && curr == &(y_regs[PLUS_REGISTER]))
+      {
+  	/* No need to copy to * register upon 'unnamed' now - see below */
+  	clip_own_selection(&clip_plus);
+  	clip_gen_set_selection(&clip_plus);
+! 	if (!clip_isautosel())
+  	{
+  	    copy_yank_reg(&(y_regs[STAR_REGISTER]));
+  	    clip_own_selection(&clip_star);
+--- 3135,3153 ----
+       * If we were yanking to the '+' register, send result to selection.
+       * Also copy to the '*' register, in case auto-select is off.
+       */
+!     if (clip_plus.available
+! 	    && (curr == &(y_regs[PLUS_REGISTER])
+! 		|| (!deleting && oap->regname == 0
+! 				      && (clip_unnamed & CLIP_UNNAMED_PLUS))))
+      {
++ 	if (curr != &(y_regs[PLUS_REGISTER]))
++ 	    /* Copy the text from register 0 to the clipboard register. */
++ 	    copy_yank_reg(&(y_regs[PLUS_REGISTER]));
++ 
+  	/* No need to copy to * register upon 'unnamed' now - see below */
+  	clip_own_selection(&clip_plus);
+  	clip_gen_set_selection(&clip_plus);
+! 	if (!clip_isautosel() && !did_star)
+  	{
+  	    copy_yank_reg(&(y_regs[STAR_REGISTER]));
+  	    clip_own_selection(&clip_star);
+*** ../vim-7.3.073/src/option.c	2010-12-02 16:01:23.000000000 +0100
+--- src/option.c	2010-12-02 21:41:32.000000000 +0100
+***************
+*** 7307,7313 ****
+      static char_u *
+  check_clipboard_option()
+  {
+!     int		new_unnamed = FALSE;
+      int		new_autoselect = FALSE;
+      int		new_autoselectml = FALSE;
+      int		new_html = FALSE;
+--- 7307,7313 ----
+      static char_u *
+  check_clipboard_option()
+  {
+!     int		new_unnamed = 0;
+      int		new_autoselect = FALSE;
+      int		new_autoselectml = FALSE;
+      int		new_html = FALSE;
+***************
+*** 7319,7327 ****
+      {
+  	if (STRNCMP(p, "unnamed", 7) == 0 && (p[7] == ',' || p[7] == NUL))
+  	{
+! 	    new_unnamed = TRUE;
+  	    p += 7;
+  	}
+  	else if (STRNCMP(p, "autoselect", 10) == 0
+  					&& (p[10] == ',' || p[10] == NUL))
+  	{
+--- 7319,7333 ----
+      {
+  	if (STRNCMP(p, "unnamed", 7) == 0 && (p[7] == ',' || p[7] == NUL))
+  	{
+! 	    new_unnamed |= CLIP_UNNAMED;
+  	    p += 7;
+  	}
++         else if (STRNCMP(p, "unnamedplus", 11) == 0
++ 					    && (p[11] == ',' || p[11] == NUL))
++ 	{
++ 	    new_unnamed |= CLIP_UNNAMED_PLUS;
++ 	    p += 11;
++ 	}
+  	else if (STRNCMP(p, "autoselect", 10) == 0
+  					&& (p[10] == ',' || p[10] == NUL))
+  	{
+*** ../vim-7.3.073/src/version.c	2010-12-02 17:09:48.000000000 +0100
+--- src/version.c	2010-12-02 21:34:40.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     74,
+  /**/
+
+-- 
+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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.075 b/source/ap/vim/patches/7.3.075
new file mode 100644
index 00000000..91cbb516
--- /dev/null
+++ b/source/ap/vim/patches/7.3.075
@@ -0,0 +1,132 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.075
+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.3.075 (after 7.3.072)
+Problem:    Missing part of 'wildignorecase'
+Solution:   Also adjust expand()
+Files:	    src/eval.c
+
+
+*** ../vim-7.3.074/src/eval.c	2010-12-02 21:43:10.000000000 +0100
+--- src/eval.c	2010-12-02 17:30:23.000000000 +0100
+***************
+*** 9876,9882 ****
+      char_u	*s;
+      int		len;
+      char_u	*errormsg;
+!     int		flags = WILD_SILENT|WILD_USE_NL|WILD_LIST_NOTFOUND;
+      expand_T	xpc;
+      int		error = FALSE;
+  
+--- 9876,9882 ----
+      char_u	*s;
+      int		len;
+      char_u	*errormsg;
+!     int		options = WILD_SILENT|WILD_USE_NL|WILD_LIST_NOTFOUND;
+      expand_T	xpc;
+      int		error = FALSE;
+  
+***************
+*** 9894,9905 ****
+  	 * 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;
+  	if (!error)
+  	{
+  	    ExpandInit(&xpc);
+  	    xpc.xp_context = EXPAND_FILES;
+! 	    rettv->vval.v_string = ExpandOne(&xpc, s, NULL, flags, WILD_ALL);
+  	}
+  	else
+  	    rettv->vval.v_string = NULL;
+--- 9894,9907 ----
+  	 * 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))
+! 	    options |= WILD_KEEP_ALL;
+  	if (!error)
+  	{
+  	    ExpandInit(&xpc);
+  	    xpc.xp_context = EXPAND_FILES;
+! 	    if (p_wic)
+! 		options += WILD_ICASE;
+! 	    rettv->vval.v_string = ExpandOne(&xpc, s, NULL, options, WILD_ALL);
+  	}
+  	else
+  	    rettv->vval.v_string = NULL;
+***************
+*** 11672,11678 ****
+      typval_T	*argvars;
+      typval_T	*rettv;
+  {
+!     int		flags = WILD_SILENT|WILD_USE_NL;
+      expand_T	xpc;
+      int		error = FALSE;
+  
+--- 11674,11680 ----
+      typval_T	*argvars;
+      typval_T	*rettv;
+  {
+!     int		options = WILD_SILENT|WILD_USE_NL;
+      expand_T	xpc;
+      int		error = FALSE;
+  
+***************
+*** 11680,11693 ****
+      * 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;
+--- 11682,11697 ----
+      * 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))
+! 	options |= WILD_KEEP_ALL;
+      rettv->v_type = VAR_STRING;
+      if (!error)
+      {
+  	ExpandInit(&xpc);
+  	xpc.xp_context = EXPAND_FILES;
++ 	if (p_wic)
++ 	    options += WILD_ICASE;
+  	rettv->vval.v_string = ExpandOne(&xpc, get_tv_string(&argvars[0]),
+! 						     NULL, options, WILD_ALL);
+      }
+      else
+  	rettv->vval.v_string = NULL;
+*** ../vim-7.3.074/src/version.c	2010-12-02 21:43:10.000000000 +0100
+--- src/version.c	2010-12-02 21:43:59.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     75,
+  /**/
+
+-- 
+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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.076 b/source/ap/vim/patches/7.3.076
new file mode 100644
index 00000000..9ec7db42
--- /dev/null
+++ b/source/ap/vim/patches/7.3.076
@@ -0,0 +1,203 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.076
+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.3.076
+Problem:    Clang warnings for dead code.
+Solution:   Remove it. (Carlo Teubner)
+Files:	    src/gui_gtk.c, src/if_ruby.c, src/misc2.c, src/netbeans.c,
+	    src/spell.c
+
+
+*** ../vim-7.3.075/src/gui_gtk.c	2010-11-24 18:48:08.000000000 +0100
+--- src/gui_gtk.c	2010-12-08 12:25:17.000000000 +0100
+***************
+*** 1798,1804 ****
+      char_u		*repl_text;
+      gboolean		direction_down;
+      SharedFindReplace	*sfr;
+-     int			rc;
+  
+      flags = (int)(long)data;	    /* avoid a lint warning here */
+  
+--- 1798,1803 ----
+***************
+*** 1824,1830 ****
+  
+      repl_text = CONVERT_FROM_UTF8(repl_text);
+      find_text = CONVERT_FROM_UTF8(find_text);
+!     rc = gui_do_findrepl(flags, find_text, repl_text, direction_down);
+      CONVERT_FROM_UTF8_FREE(repl_text);
+      CONVERT_FROM_UTF8_FREE(find_text);
+  }
+--- 1823,1829 ----
+  
+      repl_text = CONVERT_FROM_UTF8(repl_text);
+      find_text = CONVERT_FROM_UTF8(find_text);
+!     gui_do_findrepl(flags, find_text, repl_text, direction_down);
+      CONVERT_FROM_UTF8_FREE(repl_text);
+      CONVERT_FROM_UTF8_FREE(find_text);
+  }
+*** ../vim-7.3.075/src/if_ruby.c	2010-11-24 17:03:34.000000000 +0100
+--- src/if_ruby.c	2010-12-08 12:30:38.000000000 +0100
+***************
+*** 586,594 ****
+  	if (u_save(eap->line1 - 1, eap->line2 + 1) != OK)
+  	    return;
+  	for (i = eap->line1; i <= eap->line2; i++) {
+! 	    VALUE line, oldline;
+  
+! 	    line = oldline = vim_str2rb_enc_str((char *)ml_get(i));
+  	    rb_lastline_set(line);
+  	    eval_enc_string_protect((char *) eap->arg, &state);
+  	    if (state) {
+--- 586,594 ----
+  	if (u_save(eap->line1 - 1, eap->line2 + 1) != OK)
+  	    return;
+  	for (i = eap->line1; i <= eap->line2; i++) {
+! 	    VALUE line;
+  
+! 	    line = vim_str2rb_enc_str((char *)ml_get(i));
+  	    rb_lastline_set(line);
+  	    eval_enc_string_protect((char *) eap->arg, &state);
+  	    if (state) {
+*** ../vim-7.3.075/src/misc2.c	2010-08-15 21:57:32.000000000 +0200
+--- src/misc2.c	2010-12-08 12:42:44.000000000 +0100
+***************
+*** 200,206 ****
+  	}
+  #endif
+  
+- 	idx = -1;
+  	ptr = line;
+  	while (col <= wcol && *ptr != NUL)
+  	{
+--- 200,205 ----
+***************
+*** 1223,1229 ****
+  #endif
+  
+  /*
+!  * copy a string into newly allocated memory
+   */
+      char_u *
+  vim_strsave(string)
+--- 1222,1228 ----
+  #endif
+  
+  /*
+!  * Copy "string" into newly allocated memory.
+   */
+      char_u *
+  vim_strsave(string)
+***************
+*** 1239,1244 ****
+--- 1238,1249 ----
+      return p;
+  }
+  
++ /*
++  * Copy up to "len" bytes of "string" into newly allocated memory and
++  * terminate with a NUL.
++  * The allocated memory always has size "len + 1", also when "string" is
++  * shorter.
++  */
+      char_u *
+  vim_strnsave(string, len)
+      char_u	*string;
+*** ../vim-7.3.075/src/netbeans.c	2010-12-02 17:09:48.000000000 +0100
+--- src/netbeans.c	2010-12-08 12:43:57.000000000 +0100
+***************
+*** 960,966 ****
+      keyQ_T *key_node = keyHead.next;
+      queue_T *cmd_node = head.next;
+      nbbuf_T buf;
+-     buf_T *bufp;
+      int i;
+  
+      /* free the netbeans buffer list */
+--- 960,965 ----
+***************
+*** 969,975 ****
+  	buf = buf_list[i];
+  	vim_free(buf.displayname);
+  	vim_free(buf.signmap);
+! 	if ((bufp=buf.bufp) != NULL)
+  	{
+  	    buf.bufp->b_netbeans_file = FALSE;
+  	    buf.bufp->b_was_netbeans_file = FALSE;
+--- 968,974 ----
+  	buf = buf_list[i];
+  	vim_free(buf.displayname);
+  	vim_free(buf.signmap);
+! 	if (buf.bufp != NULL)
+  	{
+  	    buf.bufp->b_netbeans_file = FALSE;
+  	    buf.bufp->b_was_netbeans_file = FALSE;
+*** ../vim-7.3.075/src/spell.c	2010-09-29 18:32:47.000000000 +0200
+--- src/spell.c	2010-12-08 12:47:13.000000000 +0100
+***************
+*** 9839,9848 ****
+  	{
+  	    /* be quick for ASCII */
+  	    if (wp->w_s->b_spell_ismw[*p])
+- 	    {
+  		s = p + 1;		/* skip a mid-word character */
+- 		l = MB_BYTE2LEN(*s);
+- 	    }
+  	}
+  	else
+  	{
+--- 9839,9845 ----
+***************
+*** 9850,9859 ****
+  	    if (c < 256 ? wp->w_s->b_spell_ismw[c]
+  		    : (wp->w_s->b_spell_ismw_mb != NULL
+  			   && vim_strchr(wp->w_s->b_spell_ismw_mb, c) != NULL))
+- 	    {
+  		s = p + l;
+- 		l = MB_BYTE2LEN(*s);
+- 	    }
+  	}
+  
+  	c = mb_ptr2char(s);
+--- 9847,9853 ----
+***************
+*** 13813,13823 ****
+  		    su->su_sfmaxscore = cleanup_suggestions(gap,
+  				      su->su_sfmaxscore, SUG_CLEAN_COUNT(su));
+  		else
+- 		{
+- 		    i = su->su_maxscore;
+  		    su->su_maxscore = cleanup_suggestions(gap,
+  					su->su_maxscore, SUG_CLEAN_COUNT(su));
+- 		}
+  	    }
+  	}
+      }
+--- 13807,13814 ----
+*** ../vim-7.3.075/src/version.c	2010-12-02 21:44:35.000000000 +0100
+--- src/version.c	2010-12-08 13:10:00.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     76,
+  /**/
+
+-- 
+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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.077 b/source/ap/vim/patches/7.3.077
new file mode 100644
index 00000000..c0af4b96
--- /dev/null
+++ b/source/ap/vim/patches/7.3.077
@@ -0,0 +1,134 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.077
+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.3.077
+Problem:    When updating crypt of swapfile fails there is no error message.
+	    (Carlo Teubner)
+Solution:   Add the error message.
+Files:	    src/memline.c
+
+
+*** ../vim-7.3.076/src/memline.c	2010-08-15 21:57:31.000000000 +0200
+--- src/memline.c	2010-12-08 12:39:10.000000000 +0100
+***************
+*** 582,587 ****
+--- 582,590 ----
+  	    idx = ip->ip_index + 1;	    /* go to next index */
+  	    page_count = 1;
+  	}
++ 
++ 	if (error > 0)
++ 	    EMSG(_("E843: Error while updating swap file crypt"));
+      }
+  
+      mfp->mf_old_key = NULL;
+***************
+*** 2384,2390 ****
+   * Make a copy of the line if necessary.
+   */
+  /*
+!  * get a pointer to a (read-only copy of a) line
+   *
+   * On failure an error message is given and IObuff is returned (to avoid
+   * having to check for error everywhere).
+--- 2387,2393 ----
+   * Make a copy of the line if necessary.
+   */
+  /*
+!  * Return a pointer to a (read-only copy of a) line.
+   *
+   * On failure an error message is given and IObuff is returned (to avoid
+   * having to check for error everywhere).
+***************
+*** 2397,2403 ****
+  }
+  
+  /*
+!  * ml_get_pos: get pointer to position 'pos'
+   */
+      char_u *
+  ml_get_pos(pos)
+--- 2400,2406 ----
+  }
+  
+  /*
+!  * Return pointer to position "pos".
+   */
+      char_u *
+  ml_get_pos(pos)
+***************
+*** 2407,2413 ****
+  }
+  
+  /*
+!  * ml_get_curline: get pointer to cursor line.
+   */
+      char_u *
+  ml_get_curline()
+--- 2410,2416 ----
+  }
+  
+  /*
+!  * Return pointer to cursor line.
+   */
+      char_u *
+  ml_get_curline()
+***************
+*** 2416,2422 ****
+  }
+  
+  /*
+!  * ml_get_cursor: get pointer to cursor position
+   */
+      char_u *
+  ml_get_cursor()
+--- 2419,2425 ----
+  }
+  
+  /*
+!  * Return pointer to cursor position.
+   */
+      char_u *
+  ml_get_cursor()
+***************
+*** 2426,2432 ****
+  }
+  
+  /*
+!  * get a pointer to a line in a specific buffer
+   *
+   * "will_change": if TRUE mark the buffer dirty (chars in the line will be
+   * changed)
+--- 2429,2435 ----
+  }
+  
+  /*
+!  * Return a pointer to a line in a specific buffer
+   *
+   * "will_change": if TRUE mark the buffer dirty (chars in the line will be
+   * changed)
+*** ../vim-7.3.076/src/version.c	2010-12-08 13:11:15.000000000 +0100
+--- src/version.c	2010-12-08 13:15:44.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     77,
+  /**/
+
+-- 
+An operatingsystem is just a name you give to the rest of bloating
+idiosyncratic machine-based-features you left out of your editor.
+			(author unknown)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.078 b/source/ap/vim/patches/7.3.078
new file mode 100644
index 00000000..ae8a9dad
--- /dev/null
+++ b/source/ap/vim/patches/7.3.078
@@ -0,0 +1,58 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.078
+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.3.078
+Problem:    Warning for unused variable.
+Solution:   Adjuste #ifdefs.
+Files:	    src/ops.c
+
+
+*** ../vim-7.3.077/src/ops.c	2010-12-02 21:43:10.000000000 +0100
+--- src/ops.c	2010-12-08 14:21:48.000000000 +0100
+***************
+*** 2844,2850 ****
+--- 2844,2852 ----
+      char_u		*p;
+      char_u		*pnew;
+      struct block_def	bd;
++ #if defined(FEAT_CLIPBOARD) && defined(FEAT_X11)
+      int			did_star = FALSE;
++ #endif
+  
+  				    /* check for read-only register */
+      if (oap->regname != 0 && !valid_yank_reg(oap->regname, TRUE))
+***************
+*** 3127,3133 ****
+--- 3129,3137 ----
+  
+  	clip_own_selection(&clip_star);
+  	clip_gen_set_selection(&clip_star);
++ # ifdef FEAT_X11
+  	did_star = TRUE;
++ # endif
+      }
+  
+  # ifdef FEAT_X11
+*** ../vim-7.3.077/src/version.c	2010-12-08 13:16:58.000000000 +0100
+--- src/version.c	2010-12-08 14:22:42.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     78,
+  /**/
+
+-- 
+A)bort, R)etry, D)o it right this time
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.079 b/source/ap/vim/patches/7.3.079
new file mode 100644
index 00000000..493d52f3
--- /dev/null
+++ b/source/ap/vim/patches/7.3.079
@@ -0,0 +1,50 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.079
+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.3.079
+Problem:    Duplicate lines in makefile.
+Solution:   Remove the lines. (Hong Xu)
+Files:	    src/Make_mvc.mak
+
+
+*** ../vim-7.3.078/src/Make_mvc.mak	2010-11-03 21:59:23.000000000 +0100
+--- src/Make_mvc.mak	2010-12-08 14:53:16.000000000 +0100
+***************
+*** 380,388 ****
+  !if "$(_NMAKE_VER)" == "10.00.30319.01"
+  MSVCVER = 10.0
+  !endif
+- !if "$(_NMAKE_VER)" == "9.00.30729.01"
+- MSVCVER = 9.0
+- !endif
+  !endif
+  
+  # Abort bulding VIM if version of VC is unrecognised.
+--- 380,385 ----
+*** ../vim-7.3.078/src/version.c	2010-12-08 14:23:08.000000000 +0100
+--- src/version.c	2010-12-08 14:54:02.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     79,
+  /**/
+
+-- 
+login: yes
+password: I don't know, please tell me
+password is incorrect
+login: yes
+password: incorrect
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.080 b/source/ap/vim/patches/7.3.080
new file mode 100644
index 00000000..6cf9f6d7
--- /dev/null
+++ b/source/ap/vim/patches/7.3.080
@@ -0,0 +1,205 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.080
+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.3.080
+Problem:    Spell doesn't work on VMS.
+Solution:   Use different file names. (Zoltan Bartos, Zoltan Arpadffy)
+Files:	    src/spell.c
+
+
+*** ../vim-7.3.079/src/spell.c	2010-12-08 13:11:15.000000000 +0100
+--- src/spell.c	2010-12-08 17:01:13.000000000 +0100
+***************
+*** 327,332 ****
+--- 327,342 ----
+  typedef long idx_T;
+  #endif
+  
++ #ifdef VMS
++ # define SPL_FNAME_TMPL  "%s_%s.spl"
++ # define SPL_FNAME_ADD   "_add."
++ # define SPL_FNAME_ASCII "_ascii."
++ #else
++ # define SPL_FNAME_TMPL  "%s.%s.spl"
++ # define SPL_FNAME_ADD   ".add."
++ # define SPL_FNAME_ASCII ".ascii."
++ #endif
++ 
+  /* Flags used for a word.  Only the lowest byte can be used, the region byte
+   * comes above it. */
+  #define WF_REGION   0x01	/* region byte follows */
+***************
+*** 2471,2484 ****
+  	 * Find the first spell file for "lang" in 'runtimepath' and load it.
+  	 */
+  	vim_snprintf((char *)fname_enc, sizeof(fname_enc) - 5,
+! 					"spell/%s.%s.spl", lang, spell_enc());
+  	r = do_in_runtimepath(fname_enc, FALSE, spell_load_cb, &sl);
+  
+  	if (r == FAIL && *sl.sl_lang != NUL)
+  	{
+  	    /* Try loading the ASCII version. */
+  	    vim_snprintf((char *)fname_enc, sizeof(fname_enc) - 5,
+! 						  "spell/%s.ascii.spl", lang);
+  	    r = do_in_runtimepath(fname_enc, FALSE, spell_load_cb, &sl);
+  
+  #ifdef FEAT_AUTOCMD
+--- 2481,2504 ----
+  	 * Find the first spell file for "lang" in 'runtimepath' and load it.
+  	 */
+  	vim_snprintf((char *)fname_enc, sizeof(fname_enc) - 5,
+! #ifdef VMS
+! 					"spell/%s_%s.spl",
+! #else
+! 					"spell/%s.%s.spl",
+! #endif
+! 							   lang, spell_enc());
+  	r = do_in_runtimepath(fname_enc, FALSE, spell_load_cb, &sl);
+  
+  	if (r == FAIL && *sl.sl_lang != NUL)
+  	{
+  	    /* Try loading the ASCII version. */
+  	    vim_snprintf((char *)fname_enc, sizeof(fname_enc) - 5,
+! #ifdef VMS
+! 						  "spell/%s_ascii.spl",
+! #else
+! 						  "spell/%s.ascii.spl",
+! #endif
+! 									lang);
+  	    r = do_in_runtimepath(fname_enc, FALSE, spell_load_cb, &sl);
+  
+  #ifdef FEAT_AUTOCMD
+***************
+*** 2496,2502 ****
+  
+      if (r == FAIL)
+      {
+! 	smsg((char_u *)_("Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""),
+  						     lang, spell_enc(), lang);
+      }
+      else if (sl.sl_slang != NULL)
+--- 2516,2527 ----
+  
+      if (r == FAIL)
+      {
+! 	smsg((char_u *)
+! #ifdef VMS
+! 	_("Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""),
+! #else
+! 	_("Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""),
+! #endif
+  						     lang, spell_enc(), lang);
+      }
+      else if (sl.sl_slang != NULL)
+***************
+*** 2530,2536 ****
+  int_wordlist_spl(fname)
+      char_u	    *fname;
+  {
+!     vim_snprintf((char *)fname, MAXPATHL, "%s.%s.spl",
+  						  int_wordlist, spell_enc());
+  }
+  
+--- 2555,2561 ----
+  int_wordlist_spl(fname)
+      char_u	    *fname;
+  {
+!     vim_snprintf((char *)fname, MAXPATHL, SPL_FNAME_TMPL,
+  						  int_wordlist, spell_enc());
+  }
+  
+***************
+*** 2785,2792 ****
+  	if (lp->sl_fname == NULL)
+  	    goto endFAIL;
+  
+! 	/* Check for .add.spl. */
+! 	lp->sl_add = strstr((char *)gettail(fname), ".add.") != NULL;
+      }
+      else
+  	lp = old_lp;
+--- 2810,2817 ----
+  	if (lp->sl_fname == NULL)
+  	    goto endFAIL;
+  
+! 	/* Check for .add.spl (_add.spl for VMS). */
+! 	lp->sl_add = strstr((char *)gettail(fname), SPL_FNAME_ADD) != NULL;
+      }
+      else
+  	lp = old_lp;
+***************
+*** 9109,9116 ****
+  	    /* For ":mkspell path/vim" output file is "path/vim.latin1.spl". */
+  	    innames = &fnames[0];
+  	    incount = 1;
+! 	    vim_snprintf((char *)wfname, sizeof(wfname), "%s.%s.spl", fnames[0],
+! 			     spin.si_ascii ? (char_u *)"ascii" : spell_enc());
+  	}
+  	else if (len > 4 && STRCMP(fnames[0] + len - 4, ".spl") == 0)
+  	{
+--- 9134,9141 ----
+  	    /* For ":mkspell path/vim" output file is "path/vim.latin1.spl". */
+  	    innames = &fnames[0];
+  	    incount = 1;
+! 	    vim_snprintf((char *)wfname, sizeof(wfname), SPL_FNAME_TMPL,
+! 		  fnames[0], spin.si_ascii ? (char_u *)"ascii" : spell_enc());
+  	}
+  	else if (len > 4 && STRCMP(fnames[0] + len - 4, ".spl") == 0)
+  	{
+***************
+*** 9119,9133 ****
+  	}
+  	else
+  	    /* Name should be language, make the file name from it. */
+! 	    vim_snprintf((char *)wfname, sizeof(wfname), "%s.%s.spl", fnames[0],
+! 			     spin.si_ascii ? (char_u *)"ascii" : spell_enc());
+  
+  	/* Check for .ascii.spl. */
+! 	if (strstr((char *)gettail(wfname), ".ascii.") != NULL)
+  	    spin.si_ascii = TRUE;
+  
+  	/* Check for .add.spl. */
+! 	if (strstr((char *)gettail(wfname), ".add.") != NULL)
+  	    spin.si_add = TRUE;
+      }
+  
+--- 9144,9158 ----
+  	}
+  	else
+  	    /* Name should be language, make the file name from it. */
+! 	    vim_snprintf((char *)wfname, sizeof(wfname), SPL_FNAME_TMPL,
+! 		  fnames[0], spin.si_ascii ? (char_u *)"ascii" : spell_enc());
+  
+  	/* Check for .ascii.spl. */
+! 	if (strstr((char *)gettail(wfname), SPL_FNAME_ASCII) != NULL)
+  	    spin.si_ascii = TRUE;
+  
+  	/* Check for .add.spl. */
+! 	if (strstr((char *)gettail(wfname), SPL_FNAME_ADD) != NULL)
+  	    spin.si_add = TRUE;
+      }
+  
+*** ../vim-7.3.079/src/version.c	2010-12-08 14:54:58.000000000 +0100
+--- src/version.c	2010-12-08 16:58:03.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     80,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+5. You find yourself brainstorming for new subjects to search.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.081 b/source/ap/vim/patches/7.3.081
new file mode 100644
index 00000000..635b9b50
--- /dev/null
+++ b/source/ap/vim/patches/7.3.081
@@ -0,0 +1,84 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.081
+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.3.081
+Problem:    Non-printable characters in 'statusline' cause trouble. (ZyX)
+Solution:   Use transstr(). (partly by Caio Ariede)
+Files:	    src/screen.c
+
+
+*** ../vim-7.3.080/src/screen.c	2010-08-15 21:57:32.000000000 +0200
+--- src/screen.c	2010-12-08 19:27:20.000000000 +0100
+***************
+*** 3405,3413 ****
+  # endif
+  		   )
+  		{
+! 		    int_u	text_sign;
+  # ifdef FEAT_SIGN_ICONS
+! 		    int_u	icon_sign;
+  # endif
+  
+  		    /* Draw two cells with the sign value or blank. */
+--- 3405,3413 ----
+  # endif
+  		   )
+  		{
+! 		    int	text_sign;
+  # ifdef FEAT_SIGN_ICONS
+! 		    int	icon_sign;
+  # endif
+  
+  		    /* Draw two cells with the sign value or blank. */
+***************
+*** 6522,6529 ****
+  				stl, use_sandbox,
+  				fillchar, maxwidth, hltab, tabtab);
+      vim_free(stl);
+-     len = (int)STRLEN(buf);
+  
+      while (width < maxwidth && len < (int)sizeof(buf) - 1)
+      {
+  #ifdef FEAT_MBYTE
+--- 6522,6538 ----
+  				stl, use_sandbox,
+  				fillchar, maxwidth, hltab, tabtab);
+      vim_free(stl);
+  
++     /* Make all characters printable. */
++     p = transstr(buf);
++     if (p != NULL)
++     {
++ 	vim_strncpy(buf, p, sizeof(buf) - 1);
++ 	vim_free(p);
++     }
++ 
++     /* fill up with "fillchar" */
++     len = (int)STRLEN(buf);
+      while (width < maxwidth && len < (int)sizeof(buf) - 1)
+      {
+  #ifdef FEAT_MBYTE
+*** ../vim-7.3.080/src/version.c	2010-12-08 17:09:27.000000000 +0100
+--- src/version.c	2010-12-08 19:31:40.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     81,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+6. You refuse to go to a vacation spot with no electricity and no phone lines.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.082 b/source/ap/vim/patches/7.3.082
new file mode 100644
index 00000000..5753c05e
--- /dev/null
+++ b/source/ap/vim/patches/7.3.082
@@ -0,0 +1,51 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.082
+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.3.082
+Problem:    Leaking file descriptor when hostname doesn't exist.
+Solution:   Remove old debugging lines.
+Files:	    src/netbeans.c
+
+
+*** ../vim-7.3.081/src/netbeans.c	2010-12-08 13:11:15.000000000 +0100
+--- src/netbeans.c	2010-12-17 12:13:32.000000000 +0100
+***************
+*** 323,334 ****
+      server.sin_port = htons(port);
+      if ((host = gethostbyname(hostname)) == NULL)
+      {
+- 	if (mch_access(hostname, R_OK) >= 0)
+- 	{
+- 	    /* DEBUG: input file */
+- 	    sd = mch_open(hostname, O_RDONLY, 0);
+- 	    goto theend;
+- 	}
+  	nbdebug(("error in gethostbyname() in netbeans_connect()\n"));
+  	PERROR("gethostbyname() in netbeans_connect()");
+  	goto theend;
+--- 323,328 ----
+*** ../vim-7.3.081/src/version.c	2010-12-08 19:56:52.000000000 +0100
+--- src/version.c	2010-12-17 12:17:11.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     82,
+  /**/
+
+-- 
+How To Keep A Healthy Level Of Insanity:
+1. At lunch time, sit in your parked car with sunglasses on and point
+   a hair dryer at passing cars. See if they slow down.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.083 b/source/ap/vim/patches/7.3.083
new file mode 100644
index 00000000..f337d210
--- /dev/null
+++ b/source/ap/vim/patches/7.3.083
@@ -0,0 +1,362 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.083
+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.3.083
+Problem:    When a read() or write() is interrupted by a signal it fails.
+Solution:   Add read_eintr() and write_eintr().
+Files:	    src/fileio.c, src/proto/fileio.pro, src/memfile.c, src/memline.c,
+	    src/os_unix.c, src/undo.c, src/vim.h
+
+
+*** ../vim-7.3.082/src/fileio.c	2010-08-15 21:57:26.000000000 +0200
+--- src/fileio.c	2010-12-17 16:04:30.000000000 +0100
+***************
+*** 918,924 ****
+  	    {
+  		/* Read the first line (and a bit more).  Immediately rewind to
+  		 * the start of the file.  If the read() fails "len" is -1. */
+! 		len = vim_read(fd, firstline, 80);
+  		lseek(fd, (off_t)0L, SEEK_SET);
+  		for (p = firstline; p < firstline + len; ++p)
+  		    if (*p >= 0x80)
+--- 918,924 ----
+  	    {
+  		/* Read the first line (and a bit more).  Immediately rewind to
+  		 * the start of the file.  If the read() fails "len" is -1. */
+! 		len = read_eintr(fd, firstline, 80);
+  		lseek(fd, (off_t)0L, SEEK_SET);
+  		for (p = firstline; p < firstline + len; ++p)
+  		    if (*p >= 0x80)
+***************
+*** 1373,1379 ****
+  		    /*
+  		     * Read bytes from the file.
+  		     */
+! 		    size = vim_read(fd, ptr, size);
+  		}
+  
+  		if (size <= 0)
+--- 1373,1379 ----
+  		    /*
+  		     * Read bytes from the file.
+  		     */
+! 		    size = read_eintr(fd, ptr, size);
+  		}
+  
+  		if (size <= 0)
+***************
+*** 4000,4006 ****
+  #ifdef HAS_BW_FLAGS
+  			write_info.bw_flags = FIO_NOCONVERT;
+  #endif
+! 			while ((write_info.bw_len = vim_read(fd, copybuf,
+  								BUFSIZE)) > 0)
+  			{
+  			    if (buf_write_bytes(&write_info) == FAIL)
+--- 4000,4006 ----
+  #ifdef HAS_BW_FLAGS
+  			write_info.bw_flags = FIO_NOCONVERT;
+  #endif
+! 			while ((write_info.bw_len = read_eintr(fd, copybuf,
+  								BUFSIZE)) > 0)
+  			{
+  			    if (buf_write_bytes(&write_info) == FAIL)
+***************
+*** 4813,4819 ****
+  #ifdef HAS_BW_FLAGS
+  			write_info.bw_flags = FIO_NOCONVERT;
+  #endif
+! 			while ((write_info.bw_len = vim_read(fd, smallbuf,
+  						      SMBUFSIZE)) > 0)
+  			    if (buf_write_bytes(&write_info) == FAIL)
+  				break;
+--- 4813,4819 ----
+  #ifdef HAS_BW_FLAGS
+  			write_info.bw_flags = FIO_NOCONVERT;
+  #endif
+! 			while ((write_info.bw_len = read_eintr(fd, smallbuf,
+  						      SMBUFSIZE)) > 0)
+  			    if (buf_write_bytes(&write_info) == FAIL)
+  				break;
+***************
+*** 5330,5336 ****
+  
+  /*
+   * Call write() to write a number of bytes to the file.
+!  * Also handles encryption and 'encoding' conversion.
+   *
+   * Return FAIL for failure, OK otherwise.
+   */
+--- 5330,5336 ----
+  
+  /*
+   * Call write() to write a number of bytes to the file.
+!  * Handles encryption and 'encoding' conversion.
+   *
+   * Return FAIL for failure, OK otherwise.
+   */
+***************
+*** 5702,5717 ****
+  	crypt_encode(buf, len, buf);
+  #endif
+  
+!     /* Repeat the write(), it may be interrupted by a signal. */
+!     while (len > 0)
+!     {
+! 	wlen = vim_write(ip->bw_fd, buf, len);
+! 	if (wlen <= 0)		    /* error! */
+! 	    return FAIL;
+! 	len -= wlen;
+! 	buf += wlen;
+!     }
+!     return OK;
+  }
+  
+  #ifdef FEAT_MBYTE
+--- 5702,5709 ----
+  	crypt_encode(buf, len, buf);
+  #endif
+  
+!     wlen = write_eintr(ip->bw_fd, buf, len);
+!     return (wlen < len) ? FAIL : OK;
+  }
+  
+  #ifdef FEAT_MBYTE
+***************
+*** 6662,6669 ****
+  	return -1;
+      }
+  
+!     while ((n = vim_read(fd_in, buffer, BUFSIZE)) > 0)
+! 	if (vim_write(fd_out, buffer, n) != n)
+  	{
+  	    errmsg = _("E208: Error writing to \"%s\"");
+  	    break;
+--- 6654,6661 ----
+  	return -1;
+      }
+  
+!     while ((n = read_eintr(fd_in, buffer, BUFSIZE)) > 0)
+! 	if (write_eintr(fd_out, buffer, n) != n)
+  	{
+  	    errmsg = _("E208: Error writing to \"%s\"");
+  	    break;
+***************
+*** 10304,10306 ****
+--- 10296,10350 ----
+      }
+      return reg_pat;
+  }
++ 
++ #if defined(EINTR) || defined(PROTO)
++ /*
++  * Version of read() that retries when interrupted by EINTR (possibly
++  * by a SIGWINCH).
++  */
++     long
++ read_eintr(fd, buf, bufsize)
++     int	    fd;
++     void    *buf;
++     size_t  bufsize;
++ {
++     long ret;
++ 
++     for (;;)
++     {
++ 	ret = vim_read(fd, buf, bufsize);
++ 	if (ret >= 0 || errno != EINTR)
++ 	    break;
++     }
++     return ret;
++ }
++ 
++ /*
++  * Version of write() that retries when interrupted by EINTR (possibly
++  * by a SIGWINCH).
++  */
++     long
++ write_eintr(fd, buf, bufsize)
++     int	    fd;
++     void    *buf;
++     size_t  bufsize;
++ {
++     long    ret = 0;
++     long    wlen;
++ 
++     /* Repeat the write() so long it didn't fail, other than being interrupted
++      * by a signal. */
++     while (ret < (long)bufsize)
++     {
++ 	wlen = vim_write(fd, buf + ret, bufsize - ret);
++ 	if (wlen < 0)
++ 	{
++ 	    if (errno != EINTR)
++ 		break;
++ 	}
++ 	else
++ 	    ret += wlen;
++     }
++     return ret;
++ }
++ #endif
+*** ../vim-7.3.082/src/proto/fileio.pro	2010-08-15 21:57:28.000000000 +0200
+--- src/proto/fileio.pro	2010-12-17 15:01:26.000000000 +0100
+***************
+*** 54,57 ****
+--- 54,59 ----
+  int match_file_pat __ARGS((char_u *pattern, regprog_T *prog, char_u *fname, char_u *sfname, char_u *tail, int allow_dirs));
+  int match_file_list __ARGS((char_u *list, char_u *sfname, char_u *ffname));
+  char_u *file_pat_to_reg_pat __ARGS((char_u *pat, char_u *pat_end, char *allow_dirs, int no_bslash));
++ long read_eintr __ARGS((int fd, void *buf, size_t bufsize));
++ long write_eintr __ARGS((int fd, void *buf, size_t bufsize));
+  /* vim: set ft=c : */
+*** ../vim-7.3.082/src/memfile.c	2010-08-15 21:57:25.000000000 +0200
+--- src/memfile.c	2010-12-17 16:02:54.000000000 +0100
+***************
+*** 1049,1055 ****
+  	PERROR(_("E294: Seek error in swap file read"));
+  	return FAIL;
+      }
+!     if ((unsigned)vim_read(mfp->mf_fd, hp->bh_data, size) != size)
+      {
+  	PERROR(_("E295: Read error in swap file"));
+  	return FAIL;
+--- 1049,1055 ----
+  	PERROR(_("E294: Seek error in swap file read"));
+  	return FAIL;
+      }
+!     if ((unsigned)read_eintr(mfp->mf_fd, hp->bh_data, size) != size)
+      {
+  	PERROR(_("E295: Read error in swap file"));
+  	return FAIL;
+***************
+*** 1168,1174 ****
+      }
+  #endif
+  
+!     if ((unsigned)vim_write(mfp->mf_fd, data, size) != size)
+  	result = FAIL;
+  
+  #ifdef FEAT_CRYPT
+--- 1168,1174 ----
+      }
+  #endif
+  
+!     if ((unsigned)write_eintr(mfp->mf_fd, data, size) != size)
+  	result = FAIL;
+  
+  #ifdef FEAT_CRYPT
+*** ../vim-7.3.082/src/memline.c	2010-12-08 13:16:58.000000000 +0100
+--- src/memline.c	2010-12-17 15:46:49.000000000 +0100
+***************
+*** 2062,2068 ****
+      fd = mch_open((char *)fname, O_RDONLY | O_EXTRA, 0);
+      if (fd >= 0)
+      {
+! 	if (read(fd, (char *)&b0, sizeof(b0)) == sizeof(b0))
+  	{
+  	    if (STRNCMP(b0.b0_version, "VIM 3.0", 7) == 0)
+  	    {
+--- 2062,2068 ----
+      fd = mch_open((char *)fname, O_RDONLY | O_EXTRA, 0);
+      if (fd >= 0)
+      {
+! 	if (read_eintr(fd, &b0, sizeof(b0)) == sizeof(b0))
+  	{
+  	    if (STRNCMP(b0.b0_version, "VIM 3.0", 7) == 0)
+  	    {
+***************
+*** 4392,4398 ****
+  		fd = mch_open((char *)fname, O_RDONLY | O_EXTRA, 0);
+  		if (fd >= 0)
+  		{
+! 		    if (read(fd, (char *)&b0, sizeof(b0)) == sizeof(b0))
+  		    {
+  			/*
+  			 * If the swapfile has the same directory as the
+--- 4392,4398 ----
+  		fd = mch_open((char *)fname, O_RDONLY | O_EXTRA, 0);
+  		if (fd >= 0)
+  		{
+! 		    if (read_eintr(fd, &b0, sizeof(b0)) == sizeof(b0))
+  		    {
+  			/*
+  			 * If the swapfile has the same directory as the
+*** ../vim-7.3.082/src/os_unix.c	2010-10-20 19:17:43.000000000 +0200
+--- src/os_unix.c	2010-12-17 16:17:43.000000000 +0100
+***************
+*** 4454,4460 ****
+  		    ++noread_cnt;
+  		    while (RealWaitForChar(fromshell_fd, 10L, NULL))
+  		    {
+! 			len = read(fromshell_fd, (char *)buffer
+  # ifdef FEAT_MBYTE
+  				+ buffer_off, (size_t)(BUFLEN - buffer_off)
+  # else
+--- 4454,4460 ----
+  		    ++noread_cnt;
+  		    while (RealWaitForChar(fromshell_fd, 10L, NULL))
+  		    {
+! 			len = read_eintr(fromshell_fd, buffer
+  # ifdef FEAT_MBYTE
+  				+ buffer_off, (size_t)(BUFLEN - buffer_off)
+  # else
+*** ../vim-7.3.082/src/undo.c	2010-11-03 19:32:36.000000000 +0100
+--- src/undo.c	2010-12-17 15:39:24.000000000 +0100
+***************
+*** 1386,1392 ****
+  		char_u	mbuf[UF_START_MAGIC_LEN];
+  		int	len;
+  
+! 		len = vim_read(fd, mbuf, UF_START_MAGIC_LEN);
+  		close(fd);
+  		if (len < UF_START_MAGIC_LEN
+  		      || memcmp(mbuf, UF_START_MAGIC, UF_START_MAGIC_LEN) != 0)
+--- 1386,1392 ----
+  		char_u	mbuf[UF_START_MAGIC_LEN];
+  		int	len;
+  
+! 		len = read_eintr(fd, mbuf, UF_START_MAGIC_LEN);
+  		close(fd);
+  		if (len < UF_START_MAGIC_LEN
+  		      || memcmp(mbuf, UF_START_MAGIC, UF_START_MAGIC_LEN) != 0)
+*** ../vim-7.3.082/src/vim.h	2010-12-02 16:01:23.000000000 +0100
+--- src/vim.h	2010-12-17 14:55:04.000000000 +0100
+***************
+*** 1642,1647 ****
+--- 1642,1652 ----
+  # define USE_INPUT_BUF
+  #endif
+  
++ #ifndef EINTR
++ # define read_eintr(fd, buf, count) vim_read((fd), (buf), (count))
++ # define write_eintr(fd, buf, count) vim_write((fd), (buf), (count))
++ #endif
++ 
+  #ifdef MSWIN
+  /* On MS-Windows the third argument isn't size_t.  This matters for Win64,
+   * where sizeof(size_t)==8, not 4 */
+*** ../vim-7.3.082/src/version.c	2010-12-17 12:19:14.000000000 +0100
+--- src/version.c	2010-12-17 16:10:58.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     83,
+  /**/
+
+-- 
+How To Keep A Healthy Level Of Insanity:
+9. As often as possible, skip rather than walk.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.084 b/source/ap/vim/patches/7.3.084
new file mode 100644
index 00000000..a46892e3
--- /dev/null
+++ b/source/ap/vim/patches/7.3.084
@@ -0,0 +1,123 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.084
+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.3.084
+Problem:    When splitting the window, the new one scrolls with the cursor at
+	    the top.
+Solution:   Compute w_fraction before setting the new height.
+Files:	    src/window.c
+
+
+*** ../vim-7.3.083/src/window.c	2010-09-21 16:56:29.000000000 +0200
+--- src/window.c	2010-12-17 17:09:51.000000000 +0100
+***************
+*** 70,76 ****
+  #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 "://" */
+  #define URL_BACKSLASH	2		/* path_is_url() has found ":\\" */
+--- 70,77 ----
+  #endif /* FEAT_WINDOWS */
+  
+  static win_T *win_alloc __ARGS((win_T *after, int hidden));
+! static void set_fraction __ARGS((win_T *wp));
+! static void win_new_height __ARGS((win_T *wp, int height));
+  
+  #define URL_SLASH	1		/* path_is_url() has found "://" */
+  #define URL_BACKSLASH	2		/* path_is_url() has found ":\\" */
+***************
+*** 983,992 ****
+--- 984,999 ----
+      else
+  	frame_append(curfrp, frp);
+  
++     /* Set w_fraction now so that the cursor keeps the same relative
++      * vertical position. */
++     set_fraction(oldwin);
++     wp->w_fraction = oldwin->w_fraction;
++ 
+  #ifdef FEAT_VERTSPLIT
+      if (flags & WSP_VERT)
+      {
+  	wp->w_p_scr = curwin->w_p_scr;
++ 
+  	if (need_status)
+  	{
+  	    win_new_height(oldwin, oldwin->w_height - 1);
+***************
+*** 5453,5458 ****
+--- 5460,5478 ----
+  
+  #endif /* FEAT_WINDOWS */
+  
++ #define FRACTION_MULT	16384L
++ 
++ /*
++  * Set wp->w_fraction for the current w_wrow and w_height.
++  */
++     static void
++ set_fraction(wp)
++     win_T	*wp;
++ {
++     wp->w_fraction = ((long)wp->w_wrow * FRACTION_MULT
++ 				    + FRACTION_MULT / 2) / (long)wp->w_height;
++ }
++ 
+  /*
+   * Set the height of a window.
+   * This takes care of the things inside the window, not what happens to the
+***************
+*** 5465,5471 ****
+  {
+      linenr_T	lnum;
+      int		sline, line_size;
+- #define FRACTION_MULT	16384L
+  
+      /* Don't want a negative height.  Happens when splitting a tiny window.
+       * Will equalize heights soon to fix it. */
+--- 5485,5490 ----
+***************
+*** 5475,5482 ****
+  	return;	    /* nothing to do */
+  
+      if (wp->w_wrow != wp->w_prev_fraction_row && wp->w_height > 0)
+! 	wp->w_fraction = ((long)wp->w_wrow * FRACTION_MULT
+! 				    + FRACTION_MULT / 2) / (long)wp->w_height;
+  
+      wp->w_height = height;
+      wp->w_skipcol = 0;
+--- 5494,5500 ----
+  	return;	    /* nothing to do */
+  
+      if (wp->w_wrow != wp->w_prev_fraction_row && wp->w_height > 0)
+! 	set_fraction(wp);
+  
+      wp->w_height = height;
+      wp->w_skipcol = 0;
+*** ../vim-7.3.083/src/version.c	2010-12-17 16:27:10.000000000 +0100
+--- src/version.c	2010-12-17 17:14:19.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     84,
+  /**/
+
+-- 
+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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.085 b/source/ap/vim/patches/7.3.085
new file mode 100644
index 00000000..15fb87ff
--- /dev/null
+++ b/source/ap/vim/patches/7.3.085
@@ -0,0 +1,313 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.085
+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.3.085 (after 7.3.083)
+Problem:    Inconsistency with preproc symbols.  void * computation.
+Solution:   Include vimio.h from vim.h.  Add type cast.
+Files:      src/eval.c, src/ex_cmds.c, src/ex_cmds2.c, src/fileio.c,
+            src/if_cscope.c, src/if_sniff.c, src/main.c, src/memfile.c,
+            src/memline.c, src/netbeans.c, src/os_msdos.c, src/os_mswin.c,
+            src/os_win16.c, src/os_win32.c, src/spell.c, src/tag.c,
+            src/undo.c, src/vim.h
+
+
+*** ../vim-7.3.084/src/eval.c	2010-12-02 21:44:35.000000000 +0100
+--- src/eval.c	2010-12-17 17:45:37.000000000 +0100
+***************
+*** 10,18 ****
+  /*
+   * eval.c: Expression evaluation.
+   */
+- #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
+- # include "vimio.h"	/* for mch_open(), must be before vim.h */
+- #endif
+  
+  #include "vim.h"
+  
+--- 10,15 ----
+*** ../vim-7.3.084/src/ex_cmds.c	2010-11-24 17:59:27.000000000 +0100
+--- src/ex_cmds.c	2010-12-17 17:46:09.000000000 +0100
+***************
+*** 11,20 ****
+   * ex_cmds.c: some functions for command line commands
+   */
+  
+- #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
+- # include "vimio.h"	/* for mch_open(), must be before vim.h */
+- #endif
+- 
+  #include "vim.h"
+  #include "version.h"
+  
+--- 11,16 ----
+*** ../vim-7.3.084/src/ex_cmds2.c	2010-09-21 16:56:29.000000000 +0200
+--- src/ex_cmds2.c	2010-12-17 17:46:26.000000000 +0100
+***************
+*** 11,20 ****
+   * ex_cmds2.c: some more functions for command line commands
+   */
+  
+- #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
+- # include "vimio.h"	/* for mch_open(), must be before vim.h */
+- #endif
+- 
+  #include "vim.h"
+  #include "version.h"
+  
+--- 11,16 ----
+*** ../vim-7.3.084/src/fileio.c	2010-12-17 16:27:09.000000000 +0100
+--- src/fileio.c	2010-12-17 17:52:42.000000000 +0100
+***************
+*** 11,24 ****
+   * fileio.c: read from and write to a file
+   */
+  
+- #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
+- # include "vimio.h"	/* for lseek(), must be before vim.h */
+- #endif
+- 
+- #if defined __EMX__
+- # include "vimio.h"	/* for mktemp(), CJW 1997-12-03 */
+- #endif
+- 
+  #include "vim.h"
+  
+  #if defined(__TANDEM) || defined(__MINT__)
+--- 11,16 ----
+***************
+*** 10336,10342 ****
+       * by a signal. */
+      while (ret < (long)bufsize)
+      {
+! 	wlen = vim_write(fd, buf + ret, bufsize - ret);
+  	if (wlen < 0)
+  	{
+  	    if (errno != EINTR)
+--- 10328,10334 ----
+       * by a signal. */
+      while (ret < (long)bufsize)
+      {
+! 	wlen = vim_write(fd, (char *)buf + ret, bufsize - ret);
+  	if (wlen < 0)
+  	{
+  	    if (errno != EINTR)
+*** ../vim-7.3.084/src/if_cscope.c	2010-09-21 16:56:29.000000000 +0200
+--- src/if_cscope.c	2010-12-17 17:47:02.000000000 +0100
+***************
+*** 20,28 ****
+  #include <sys/stat.h>
+  #if defined(UNIX)
+  # include <sys/wait.h>
+- #else
+-     /* not UNIX, must be WIN32 */
+- # include "vimio.h"
+  #endif
+  #include "if_cscope.h"
+  
+--- 20,25 ----
+*** ../vim-7.3.084/src/if_sniff.c	2010-08-15 21:57:25.000000000 +0200
+--- src/if_sniff.c	2010-12-17 17:47:20.000000000 +0100
+***************
+*** 9,15 ****
+  
+  #ifdef WIN32
+  # include <stdio.h>
+- # include "vimio.h"
+  # include <process.h>
+  # include <string.h>
+  # include <assert.h>
+--- 9,14 ----
+*** ../vim-7.3.084/src/main.c	2010-11-16 16:25:46.000000000 +0100
+--- src/main.c	2010-12-17 17:47:41.000000000 +0100
+***************
+*** 7,16 ****
+   * See README.txt for an overview of the Vim source code.
+   */
+  
+- #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
+- # include "vimio.h"		/* for close() and dup() */
+- #endif
+- 
+  #define EXTERN
+  #include "vim.h"
+  
+--- 7,12 ----
+*** ../vim-7.3.084/src/memfile.c	2010-12-17 16:27:10.000000000 +0100
+--- src/memfile.c	2010-12-17 17:47:54.000000000 +0100
+***************
+*** 32,41 ****
+   * file is opened.
+   */
+  
+- #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
+- # include "vimio.h"	/* for lseek(), must be before vim.h */
+- #endif
+- 
+  #include "vim.h"
+  
+  /*
+--- 32,37 ----
+*** ../vim-7.3.084/src/memline.c	2010-12-17 16:27:10.000000000 +0100
+--- src/memline.c	2010-12-17 17:48:06.000000000 +0100
+***************
+*** 42,51 ****
+   *  mf_get().
+   */
+  
+- #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
+- # include "vimio.h"	/* for mch_open(), must be before vim.h */
+- #endif
+- 
+  #include "vim.h"
+  
+  #ifndef UNIX		/* it's in os_unix.h for Unix */
+--- 42,47 ----
+*** ../vim-7.3.084/src/netbeans.c	2010-12-17 12:19:14.000000000 +0100
+--- src/netbeans.c	2010-12-17 17:48:19.000000000 +0100
+***************
+*** 16,25 ****
+   * See ":help netbeans-protocol" for explanation.
+   */
+  
+- #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
+- # include "vimio.h"	/* for mch_open(), must be before vim.h */
+- #endif
+- 
+  #include "vim.h"
+  
+  #if defined(FEAT_NETBEANS_INTG) || defined(PROTO)
+--- 16,21 ----
+*** ../vim-7.3.084/src/os_msdos.c	2010-08-15 21:57:25.000000000 +0200
+--- src/os_msdos.c	2010-12-17 17:48:40.000000000 +0100
+***************
+*** 21,27 ****
+   * Some functions are also used for Win16 (MS-Windows 3.1).
+   */
+  
+- #include "vimio.h"
+  #include "vim.h"
+  
+  #include <conio.h>
+--- 21,26 ----
+*** ../vim-7.3.084/src/os_mswin.c	2010-10-23 14:02:48.000000000 +0200
+--- src/os_mswin.c	2010-12-17 17:48:51.000000000 +0100
+***************
+*** 22,28 ****
+  # endif
+  #endif
+  
+- #include "vimio.h"
+  #include "vim.h"
+  
+  #ifdef WIN16
+--- 22,27 ----
+*** ../vim-7.3.084/src/os_win16.c	2010-08-15 21:57:32.000000000 +0200
+--- src/os_win16.c	2010-12-17 17:49:02.000000000 +0100
+***************
+*** 20,26 ****
+  # pragma warn -obs
+  #endif
+  
+- #include "vimio.h"
+  #include "vim.h"
+  
+  #include <dos.h>
+--- 20,25 ----
+*** ../vim-7.3.084/src/os_win32.c	2010-11-24 12:35:14.000000000 +0100
+--- src/os_win32.c	2010-12-17 17:49:11.000000000 +0100
+***************
+*** 20,26 ****
+   * Roger Knobbe <rogerk@wonderware.com> did the initial port of Vim 3.0.
+   */
+  
+- #include "vimio.h"
+  #include "vim.h"
+  
+  #ifdef FEAT_MZSCHEME
+--- 20,25 ----
+*** ../vim-7.3.084/src/spell.c	2010-12-08 17:09:27.000000000 +0100
+--- src/spell.c	2010-12-17 17:49:24.000000000 +0100
+***************
+*** 303,312 ****
+   *			    few bytes as possible, see offset2bytes())
+   */
+  
+- #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
+- # include "vimio.h"	/* for lseek(), must be before vim.h */
+- #endif
+- 
+  #include "vim.h"
+  
+  #if defined(FEAT_SPELL) || defined(PROTO)
+--- 303,308 ----
+*** ../vim-7.3.084/src/tag.c	2010-09-21 16:56:29.000000000 +0200
+--- src/tag.c	2010-12-17 17:49:35.000000000 +0100
+***************
+*** 11,20 ****
+   * Code to handle tags and the tag stack
+   */
+  
+- #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
+- # include "vimio.h"	/* for lseek(), must be before vim.h */
+- #endif
+- 
+  #include "vim.h"
+  
+  /*
+--- 11,16 ----
+*** ../vim-7.3.084/src/undo.c	2010-12-17 16:27:10.000000000 +0100
+--- src/undo.c	2010-12-17 17:49:59.000000000 +0100
+***************
+*** 81,90 ****
+  #define UH_MAGIC 0x18dade	/* value for uh_magic when in use */
+  #define UE_MAGIC 0xabc123	/* value for ue_magic when in use */
+  
+- #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
+- # include "vimio.h"	/* for vim_read(), must be before vim.h */
+- #endif
+- 
+  #include "vim.h"
+  
+  static void u_unch_branch __ARGS((u_header_T *uhp));
+--- 81,86 ----
+*** ../vim-7.3.084/src/vim.h	2010-12-17 16:27:10.000000000 +0100
+--- src/vim.h	2010-12-17 17:51:43.000000000 +0100
+***************
+*** 27,32 ****
+--- 27,37 ----
+  # endif
+  #endif
+  
++ #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64) \
++ 	|| defined(__EMX__)
++ # include "vimio.h"
++ #endif
++ 
+  /* ============ the header file puzzle (ca. 50-100 pieces) ========= */
+  
+  #ifdef HAVE_CONFIG_H	/* GNU autoconf (or something else) was here */
+*** ../vim-7.3.084/src/version.c	2010-12-17 17:35:05.000000000 +0100
+--- src/version.c	2010-12-17 17:55:39.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     85,
+  /**/
+
+-- 
+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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.086 b/source/ap/vim/patches/7.3.086
new file mode 100644
index 00000000..cf494e00
--- /dev/null
+++ b/source/ap/vim/patches/7.3.086
@@ -0,0 +1,138 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.086
+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.3.086
+Problem:    When using a mapping with an expression and there was no count,
+	    v:count has the value of the previous command. (ZyX)
+Solution:   Also set v:count and v:count1 before getting the character that
+	    could be a command or a count.
+Files:	    src/normal.c
+
+
+*** ../vim-7.3.085/src/normal.c	2010-10-13 18:06:42.000000000 +0200
+--- src/normal.c	2010-12-17 18:46:56.000000000 +0100
+***************
+*** 25,30 ****
+--- 25,33 ----
+  static int	restart_VIsual_select = 0;
+  #endif
+  
++ #ifdef FEAT_EVAL
++ static void	set_vcount_ca __ARGS((cmdarg_T *cap, int *set_prevcount));
++ #endif
+  static int
+  # ifdef __BORLANDC__
+  _RTLENTRYF
+***************
+*** 648,653 ****
+--- 651,664 ----
+      dont_scroll = FALSE;	/* allow scrolling here */
+  #endif
+  
++ #ifdef FEAT_EVAL
++     /* Set v:count here, when called from main() and not a stuffed
++      * command, so that v:count can be used in an expression mapping
++      * when there is no count. */
++     if (toplevel && stuff_empty())
++ 	set_vcount_ca(&ca, &set_prevcount);
++ #endif
++ 
+      /*
+       * Get the command character from the user.
+       */
+***************
+*** 725,739 ****
+  	     * 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)
+  	    {
+--- 736,742 ----
+  	     * command, so that v:count can be used in an expression mapping
+  	     * right after the count. */
+  	    if (toplevel && stuff_empty())
+! 		set_vcount_ca(&ca, &set_prevcount);
+  #endif
+  	    if (ctrl_w)
+  	    {
+***************
+*** 1386,1391 ****
+--- 1389,1414 ----
+      opcount = ca.opcount;
+  }
+  
++ #ifdef FEAT_EVAL
++ /*
++  * Set v:count and v:count1 according to "cap".
++  * Set v:prevcount only when "set_prevcount" is TRUE.
++  */
++     static void
++ set_vcount_ca(cap, set_prevcount)
++     cmdarg_T	*cap;
++     int		*set_prevcount;
++ {
++     long count = cap->count0;
++ 
++     /* multiply with cap->opcount the same way as above */
++     if (cap->opcount != 0)
++ 	count = cap->opcount * (count == 0 ? 1 : count);
++     set_vcount(count, count == 0 ? 1 : count, *set_prevcount);
++     *set_prevcount = FALSE;  /* only set v:prevcount once */
++ }
++ #endif
++ 
+  /*
+   * Handle an operator after visual mode or when the movement is finished
+   */
+***************
+*** 8529,8535 ****
+      else
+  	curwin->w_curswant = 0;
+      /* keep curswant at the column where we wanted to go, not where
+!        we ended; differs if line is too short */
+      curwin->w_set_curswant = FALSE;
+  }
+  
+--- 8552,8558 ----
+      else
+  	curwin->w_curswant = 0;
+      /* keep curswant at the column where we wanted to go, not where
+!      * we ended; differs if line is too short */
+      curwin->w_set_curswant = FALSE;
+  }
+  
+*** ../vim-7.3.085/src/version.c	2010-12-17 18:06:00.000000000 +0100
+--- src/version.c	2010-12-17 18:51:20.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     86,
+  /**/
+
+-- 
+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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.087 b/source/ap/vim/patches/7.3.087
new file mode 100644
index 00000000..e0497dbd
--- /dev/null
+++ b/source/ap/vim/patches/7.3.087
@@ -0,0 +1,152 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.087
+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.3.087
+Problem:    EINTR is not always defined.
+Solution:   Include errno.h in vim.h.
+Files:	    src/if_cscope.c, src/if_tcl.c, src/integration.c, src/memline.c,
+	    src/os_mswin.c, src/os_win16.c, src/os_win32.c, src/vim.h,
+	    src/workshop.c
+
+
+*** ../vim-7.3.086/src/if_cscope.c	2010-12-17 18:06:00.000000000 +0100
+--- src/if_cscope.c	2010-12-17 20:06:01.000000000 +0100
+***************
+*** 13,20 ****
+  
+  #if defined(FEAT_CSCOPE) || defined(PROTO)
+  
+- #include <string.h>
+- #include <errno.h>
+  #include <assert.h>
+  #include <sys/types.h>
+  #include <sys/stat.h>
+--- 13,18 ----
+*** ../vim-7.3.086/src/if_tcl.c	2010-08-15 21:57:27.000000000 +0200
+--- src/if_tcl.c	2010-12-17 20:06:56.000000000 +0100
+***************
+*** 74,80 ****
+  #endif
+  
+  #include <tcl.h>
+- #include <errno.h>
+  #include <string.h>
+  
+  typedef struct
+--- 74,79 ----
+*** ../vim-7.3.086/src/integration.c	2010-08-15 21:57:29.000000000 +0200
+--- src/integration.c	2010-12-17 20:07:12.000000000 +0100
+***************
+*** 33,39 ****
+  #include <sys/un.h>
+  #endif
+  
+- #include <errno.h>
+  #include <sys/types.h>
+  #include <sys/socket.h>
+  #include <sys/param.h>
+--- 33,38 ----
+*** ../vim-7.3.086/src/memline.c	2010-12-17 18:06:00.000000000 +0100
+--- src/memline.c	2010-12-17 20:07:31.000000000 +0100
+***************
+*** 52,61 ****
+  # include <proto/dos.h>	    /* for Open() and Close() */
+  #endif
+  
+- #ifdef HAVE_ERRNO_H
+- # include <errno.h>
+- #endif
+- 
+  typedef struct block0		ZERO_BL;    /* contents of the first block */
+  typedef struct pointer_block	PTR_BL;	    /* contents of a pointer block */
+  typedef struct data_block	DATA_BL;    /* contents of a data block */
+--- 52,57 ----
+*** ../vim-7.3.086/src/os_mswin.c	2010-12-17 18:06:00.000000000 +0100
+--- src/os_mswin.c	2010-12-17 20:08:14.000000000 +0100
+***************
+*** 30,36 ****
+  # include <string.h>
+  #endif
+  #include <sys/types.h>
+- #include <errno.h>
+  #include <signal.h>
+  #include <limits.h>
+  #include <process.h>
+--- 30,35 ----
+*** ../vim-7.3.086/src/os_win16.c	2010-12-17 18:06:00.000000000 +0100
+--- src/os_win16.c	2010-12-17 20:08:53.000000000 +0100
+***************
+*** 25,31 ****
+  #include <dos.h>
+  #include <string.h>
+  #include <sys/types.h>
+- #include <errno.h>
+  #include <signal.h>
+  #include <limits.h>
+  #include <process.h>
+--- 25,30 ----
+*** ../vim-7.3.086/src/os_win32.c	2010-12-17 18:06:00.000000000 +0100
+--- src/os_win32.c	2010-12-17 20:09:18.000000000 +0100
+***************
+*** 27,33 ****
+  #endif
+  
+  #include <sys/types.h>
+- #include <errno.h>
+  #include <signal.h>
+  #include <limits.h>
+  #include <process.h>
+--- 27,32 ----
+*** ../vim-7.3.086/src/vim.h	2010-12-17 18:06:00.000000000 +0100
+--- src/vim.h	2010-12-17 20:09:56.000000000 +0100
+***************
+*** 480,485 ****
+--- 480,490 ----
+  # include <sys/stat.h>
+  #endif
+  
++ #if defined(HAVE_ERRNO_H) || defined(DJGPP) || defined(WIN16) \
++ 	|| defined(WIN32) || defined(_WIN64) || defined(__EMX__)
++ # include <errno.h>
++ #endif
++ 
+  /*
+   * Allow other (non-unix) systems to configure themselves now
+   * These are also in os_unix.h, because osdef.sh needs them there.
+*** ../vim-7.3.086/src/workshop.c	2010-08-15 21:57:26.000000000 +0200
+--- src/workshop.c	2010-12-17 20:09:31.000000000 +0100
+***************
+*** 16,22 ****
+  #include <sys/types.h>
+  #include <netdb.h>
+  #include <netinet/in.h>
+- #include <errno.h>
+  #include <sys/socket.h>
+  #ifdef HAVE_LIBGEN_H
+  # include <libgen.h>
+--- 16,21 ----
+*** ../vim-7.3.086/src/version.c	2010-12-17 18:52:56.000000000 +0100
+--- src/version.c	2010-12-17 20:14:49.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     87,
+  /**/
+
+-- 
+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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.088 b/source/ap/vim/patches/7.3.088
new file mode 100644
index 00000000..98acc7c1
--- /dev/null
+++ b/source/ap/vim/patches/7.3.088
@@ -0,0 +1,152 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.088
+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.3.088
+Problem:    Ruby can't load Gems sometimes, may cause a crash.
+Solution:   Undefine off_t.  Use ruby_process_options(). (Yasuhiro Matsumoto)
+Files:	    src/if_ruby.c
+
+
+*** ../vim-7.3.087/src/if_ruby.c	2010-12-08 13:11:15.000000000 +0100
+--- src/if_ruby.c	2010-12-24 12:18:31.000000000 +0100
+***************
+*** 90,95 ****
+--- 90,96 ----
+  # include <ruby/encoding.h>
+  #endif
+  
++ #undef off_t	/* ruby defines off_t as _int64, Mingw uses long */
+  #undef EXTERN
+  #undef _
+  
+***************
+*** 229,238 ****
+  # define rb_enc_find_index		dll_rb_enc_find_index
+  # define rb_enc_find			dll_rb_enc_find
+  # define rb_enc_str_new			dll_rb_enc_str_new
+- # define rb_intern2			dll_rb_intern2
+- # define rb_const_remove		dll_rb_const_remove
+  # define rb_sprintf			dll_rb_sprintf
+  # define ruby_init_stack		dll_ruby_init_stack
+  #endif
+  
+  /*
+--- 230,239 ----
+  # define rb_enc_find_index		dll_rb_enc_find_index
+  # define rb_enc_find			dll_rb_enc_find
+  # define rb_enc_str_new			dll_rb_enc_str_new
+  # define rb_sprintf			dll_rb_sprintf
++ # define rb_require			dll_rb_require
+  # define ruby_init_stack		dll_ruby_init_stack
++ # define ruby_process_options		dll_ruby_process_options
+  #endif
+  
+  /*
+***************
+*** 319,329 ****
+  static int (*dll_rb_enc_find_index) (const char*);
+  static rb_encoding* (*dll_rb_enc_find) (const char*);
+  static VALUE (*dll_rb_enc_str_new) (const char*, long, rb_encoding*);
+- static ID (*dll_rb_intern2) (const char*, long);
+- static void (*dll_Init_prelude) (void);
+- static VALUE (*dll_rb_const_remove) (VALUE, ID);
+  static VALUE (*dll_rb_sprintf) (const char*, ...);
+  static void (*ruby_init_stack)(VALUE*);
+  #endif
+  
+  #ifdef RUBY19_OR_LATER
+--- 320,329 ----
+  static int (*dll_rb_enc_find_index) (const char*);
+  static rb_encoding* (*dll_rb_enc_find) (const char*);
+  static VALUE (*dll_rb_enc_str_new) (const char*, long, rb_encoding*);
+  static VALUE (*dll_rb_sprintf) (const char*, ...);
++ static VALUE (*dll_rb_require) (const char*);
+  static void (*ruby_init_stack)(VALUE*);
++ static void* (*ruby_process_options)(int, char**);
+  #endif
+  
+  #ifdef RUBY19_OR_LATER
+***************
+*** 430,439 ****
+      {"rb_enc_find_index", (RUBY_PROC*)&dll_rb_enc_find_index},
+      {"rb_enc_find", (RUBY_PROC*)&dll_rb_enc_find},
+      {"rb_enc_str_new", (RUBY_PROC*)&dll_rb_enc_str_new},
+-     {"rb_intern2", (RUBY_PROC*)&dll_rb_intern2},
+-     {"rb_const_remove", (RUBY_PROC*)&dll_rb_const_remove},
+      {"rb_sprintf", (RUBY_PROC*)&dll_rb_sprintf},
+      {"ruby_init_stack", (RUBY_PROC*)&dll_ruby_init_stack},
+  #endif
+      {"", NULL},
+  };
+--- 430,439 ----
+      {"rb_enc_find_index", (RUBY_PROC*)&dll_rb_enc_find_index},
+      {"rb_enc_find", (RUBY_PROC*)&dll_rb_enc_find},
+      {"rb_enc_str_new", (RUBY_PROC*)&dll_rb_enc_str_new},
+      {"rb_sprintf", (RUBY_PROC*)&dll_rb_sprintf},
++     {"rb_require", (RUBY_PROC*)&dll_rb_require},
+      {"ruby_init_stack", (RUBY_PROC*)&dll_ruby_init_stack},
++     {"ruby_process_options", (RUBY_PROC*)&dll_ruby_process_options},
+  #endif
+      {"", NULL},
+  };
+***************
+*** 663,680 ****
+  		ruby_init();
+  	    }
+  #ifdef RUBY19_OR_LATER
+  	    ruby_script("vim-ruby");
+! #endif
+  	    ruby_init_loadpath();
+- 	    ruby_io_init();
+- #ifdef RUBY19_OR_LATER
+- 	    rb_enc_find_index("encdb");
+- 
+- 	    /* This avoids the error "Encoding::ConverterNotFoundError: code
+- 	     * converter not found (UTF-16LE to ASCII-8BIT)". */
+- 	    rb_define_module("Gem");
+- 	    rb_const_remove(rb_cObject, rb_intern2("TMP_RUBY_PREFIX", 15));
+  #endif
+  	    ruby_vim_init();
+  	    ruby_initialized = 1;
+  #ifdef DYNAMIC_RUBY
+--- 663,678 ----
+  		ruby_init();
+  	    }
+  #ifdef RUBY19_OR_LATER
++ 	    {
++ 		int dummy_argc = 2;
++ 		char *dummy_argv[] = {"vim-ruby", "-e0"};
++ 		ruby_process_options(dummy_argc, dummy_argv);
++ 	    }
+  	    ruby_script("vim-ruby");
+! #else
+  	    ruby_init_loadpath();
+  #endif
++ 	    ruby_io_init();
+  	    ruby_vim_init();
+  	    ruby_initialized = 1;
+  #ifdef DYNAMIC_RUBY
+*** ../vim-7.3.087/src/version.c	2010-12-17 20:23:56.000000000 +0100
+--- src/version.c	2010-12-24 13:38:51.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     88,
+  /**/
+
+-- 
+It is hard to understand how a cemetery raised its burial
+cost and blamed it on the cost of living.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.089 b/source/ap/vim/patches/7.3.089
new file mode 100644
index 00000000..47b894af
--- /dev/null
+++ b/source/ap/vim/patches/7.3.089
@@ -0,0 +1,52 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.089
+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.3.089
+Problem:    Compiler warning on 64 bit MS-Windows.
+Solution:   Add type cast. (Mike Williams)
+Files:	    src/netbeans.c
+
+
+*** ../vim-7.3.088/src/netbeans.c	2010-12-17 18:06:00.000000000 +0100
+--- src/netbeans.c	2010-12-17 20:21:05.000000000 +0100
+***************
+*** 800,806 ****
+  	 *		    -> gui event loop or select loop
+  	 *			-> netbeans_read()
+  	 */
+! 	save((char_u *)DETACH_MSG, strlen(DETACH_MSG));
+  	nb_close_socket();
+  
+  	if (len < 0)
+--- 800,806 ----
+  	 *		    -> gui event loop or select loop
+  	 *			-> netbeans_read()
+  	 */
+! 	save((char_u *)DETACH_MSG, (int)strlen(DETACH_MSG));
+  	nb_close_socket();
+  
+  	if (len < 0)
+*** ../vim-7.3.088/src/version.c	2010-12-24 13:39:29.000000000 +0100
+--- src/version.c	2010-12-24 13:59:03.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     89,
+  /**/
+
+-- 
+The 50-50-90 rule: Anytime you have a 50-50 chance of getting
+something right, there's a 90% probability you'll get it wrong.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.090 b/source/ap/vim/patches/7.3.090
new file mode 100644
index 00000000..cf68d620
--- /dev/null
+++ b/source/ap/vim/patches/7.3.090
@@ -0,0 +1,68 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.090
+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.3.090
+Problem:    Wrong help text for Cscope.
+Solution:   Adjust the help text for "t". (Dominique Pelle)
+Files:	    src/if_cscope.c
+
+
+*** ../vim-7.3.089/src/if_cscope.c	2010-12-17 20:23:56.000000000 +0100
+--- src/if_cscope.c	2010-12-30 11:35:37.000000000 +0100
+***************
+*** 1346,1352 ****
+  		       "       g: Find this definition\n"
+  		       "       i: Find files #including this file\n"
+  		       "       s: Find this C symbol\n"
+! 		       "       t: Find assignments to\n"));
+  
+  	cmdp++;
+      }
+--- 1346,1352 ----
+  		       "       g: Find this definition\n"
+  		       "       i: Find files #including this file\n"
+  		       "       s: Find this C symbol\n"
+! 		       "       t: Find this text string\n"));
+  
+  	cmdp++;
+      }
+***************
+*** 1657,1663 ****
+  /*
+   * PRIVATE: cs_make_vim_style_matches
+   *
+!  * convert the cscope output into into a ctags style entry (as might be found
+   * in a ctags tags file).  there's one catch though: cscope doesn't tell you
+   * the type of the tag you are looking for.  for example, in Darren Hiebert's
+   * ctags (the one that comes with vim), #define's use a line number to find the
+--- 1657,1663 ----
+  /*
+   * PRIVATE: cs_make_vim_style_matches
+   *
+!  * convert the cscope output into a ctags style entry (as might be found
+   * in a ctags tags file).  there's one catch though: cscope doesn't tell you
+   * the type of the tag you are looking for.  for example, in Darren Hiebert's
+   * ctags (the one that comes with vim), #define's use a line number to find the
+*** ../vim-7.3.089/src/version.c	2010-12-24 14:00:09.000000000 +0100
+--- src/version.c	2010-12-30 11:36:33.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     90,
+  /**/
+
+-- 
+ERROR 047: Keyboard not found.  Press RETURN to continue.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.091 b/source/ap/vim/patches/7.3.091
new file mode 100644
index 00000000..f0aac0d9
--- /dev/null
+++ b/source/ap/vim/patches/7.3.091
@@ -0,0 +1,321 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.091
+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.3.091
+Problem:    "vim -w foo" writes special key codes for removed escape
+	    sequences. (Josh Triplett)
+Solution:   Don't write K_IGNORE codes.
+Files:	    src/getchar.c, src/misc1.c, src/term.c, src/vim.h
+
+
+*** ../vim-7.3.090/src/getchar.c	2010-10-27 17:39:00.000000000 +0200
+--- src/getchar.c	2010-12-30 12:16:36.000000000 +0100
+***************
+*** 1506,1514 ****
+      }
+  }
+  
+- #define KL_PART_KEY -1		/* keylen value for incomplete key-code */
+- #define KL_PART_MAP -2		/* keylen value for incomplete mapping */
+- 
+  /*
+   * Get the next input character.
+   * Can return a special key or a multi-byte character.
+--- 1506,1511 ----
+***************
+*** 2171,2177 ****
+  					if (!timedout)
+  					{
+  					    /* break at a partly match */
+! 					    keylen = KL_PART_MAP;
+  					    break;
+  					}
+  				    }
+--- 2168,2174 ----
+  					if (!timedout)
+  					{
+  					    /* break at a partly match */
+! 					    keylen = KEYLEN_PART_MAP;
+  					    break;
+  					}
+  				    }
+***************
+*** 2192,2198 ****
+  
+  			/* If no partly match found, use the longest full
+  			 * match. */
+! 			if (keylen != KL_PART_MAP)
+  			{
+  			    mp = mp_match;
+  			    keylen = mp_match_len;
+--- 2189,2195 ----
+  
+  			/* If no partly match found, use the longest full
+  			 * match. */
+! 			if (keylen != KEYLEN_PART_MAP)
+  			{
+  			    mp = mp_match;
+  			    keylen = mp_match_len;
+***************
+*** 2230,2236 ****
+  			}
+  			/* Need more chars for partly match. */
+  			if (mlen == typebuf.tb_len)
+! 			    keylen = KL_PART_KEY;
+  			else if (max_mlen < mlen)
+  			    /* no match, may have to check for termcode at
+  			     * next character */
+--- 2227,2233 ----
+  			}
+  			/* Need more chars for partly match. */
+  			if (mlen == typebuf.tb_len)
+! 			    keylen = KEYLEN_PART_KEY;
+  			else if (max_mlen < mlen)
+  			    /* no match, may have to check for termcode at
+  			     * next character */
+***************
+*** 2238,2244 ****
+  		    }
+  
+  		    if ((mp == NULL || max_mlen >= mp_match_len)
+! 						     && keylen != KL_PART_MAP)
+  		    {
+  			int	save_keylen = keylen;
+  
+--- 2235,2241 ----
+  		    }
+  
+  		    if ((mp == NULL || max_mlen >= mp_match_len)
+! 						 && keylen != KEYLEN_PART_MAP)
+  		    {
+  			int	save_keylen = keylen;
+  
+***************
+*** 2264,2271 ****
+  			    /* If no termcode matched but 'pastetoggle'
+  			     * matched partially it's like an incomplete key
+  			     * sequence. */
+! 			    if (keylen == 0 && save_keylen == KL_PART_KEY)
+! 				keylen = KL_PART_KEY;
+  
+  			    /*
+  			     * When getting a partial match, but the last
+--- 2261,2268 ----
+  			    /* If no termcode matched but 'pastetoggle'
+  			     * matched partially it's like an incomplete key
+  			     * sequence. */
+! 			    if (keylen == 0 && save_keylen == KEYLEN_PART_KEY)
+! 				keylen = KEYLEN_PART_KEY;
+  
+  			    /*
+  			     * When getting a partial match, but the last
+***************
+*** 2302,2308 ****
+  				    continue;
+  				}
+  				if (*s == NUL)	    /* need more characters */
+! 				    keylen = KL_PART_KEY;
+  			    }
+  			    if (keylen >= 0)
+  #endif
+--- 2299,2305 ----
+  				    continue;
+  				}
+  				if (*s == NUL)	    /* need more characters */
+! 				    keylen = KEYLEN_PART_KEY;
+  			    }
+  			    if (keylen >= 0)
+  #endif
+***************
+*** 2339,2345 ****
+  			if (keylen > 0)	    /* full matching terminal code */
+  			{
+  #if defined(FEAT_GUI) && defined(FEAT_MENU)
+! 			    if (typebuf.tb_buf[typebuf.tb_off] == K_SPECIAL
+  					 && typebuf.tb_buf[typebuf.tb_off + 1]
+  								   == KS_MENU)
+  			    {
+--- 2336,2343 ----
+  			if (keylen > 0)	    /* full matching terminal code */
+  			{
+  #if defined(FEAT_GUI) && defined(FEAT_MENU)
+! 			    if (typebuf.tb_len >= 2
+! 				&& typebuf.tb_buf[typebuf.tb_off] == K_SPECIAL
+  					 && typebuf.tb_buf[typebuf.tb_off + 1]
+  								   == KS_MENU)
+  			    {
+***************
+*** 2381,2387 ****
+  			/* Partial match: get some more characters.  When a
+  			 * matching mapping was found use that one. */
+  			if (mp == NULL || keylen < 0)
+! 			    keylen = KL_PART_KEY;
+  			else
+  			    keylen = mp_match_len;
+  		    }
+--- 2379,2385 ----
+  			/* Partial match: get some more characters.  When a
+  			 * matching mapping was found use that one. */
+  			if (mp == NULL || keylen < 0)
+! 			    keylen = KEYLEN_PART_KEY;
+  			else
+  			    keylen = mp_match_len;
+  		    }
+***************
+*** 2553,2559 ****
+  #endif
+  			&& typebuf.tb_maplen == 0
+  			&& (State & INSERT)
+! 			&& (p_timeout || (keylen == KL_PART_KEY && p_ttimeout))
+  			&& (c = inchar(typebuf.tb_buf + typebuf.tb_off
+  						     + typebuf.tb_len, 3, 25L,
+  						 typebuf.tb_change_cnt)) == 0)
+--- 2551,2558 ----
+  #endif
+  			&& typebuf.tb_maplen == 0
+  			&& (State & INSERT)
+! 			&& (p_timeout
+! 			    || (keylen == KEYLEN_PART_KEY && p_ttimeout))
+  			&& (c = inchar(typebuf.tb_buf + typebuf.tb_off
+  						     + typebuf.tb_len, 3, 25L,
+  						 typebuf.tb_change_cnt)) == 0)
+***************
+*** 2783,2791 ****
+  			    ? 0
+  			    : ((typebuf.tb_len == 0
+  				    || !(p_timeout || (p_ttimeout
+! 						   && keylen == KL_PART_KEY)))
+  				    ? -1L
+! 				    : ((keylen == KL_PART_KEY && p_ttm >= 0)
+  					    ? p_ttm
+  					    : p_tm)), typebuf.tb_change_cnt);
+  
+--- 2782,2790 ----
+  			    ? 0
+  			    : ((typebuf.tb_len == 0
+  				    || !(p_timeout || (p_ttimeout
+! 					       && keylen == KEYLEN_PART_KEY)))
+  				    ? -1L
+! 				    : ((keylen == KEYLEN_PART_KEY && p_ttm >= 0)
+  					    ? p_ttm
+  					    : p_tm)), typebuf.tb_change_cnt);
+  
+*** ../vim-7.3.090/src/misc1.c	2010-12-02 16:01:23.000000000 +0100
+--- src/misc1.c	2010-12-30 12:28:59.000000000 +0100
+***************
+*** 3114,3123 ****
+  	       && (!p_ttimeout || waited * 100L < (p_ttm < 0 ? p_tm : p_ttm)))
+  	    continue;
+  
+! 	/* found a termcode: adjust length */
+! 	if (n > 0)
+  	    len = n;
+! 	if (len == 0)	    /* nothing typed yet */
+  	    continue;
+  
+  	/* Handle modifier and/or special key code. */
+--- 3114,3124 ----
+  	       && (!p_ttimeout || waited * 100L < (p_ttm < 0 ? p_tm : p_ttm)))
+  	    continue;
+  
+! 	if (n == KEYLEN_REMOVED)  /* key code removed */
+! 	    continue;
+! 	if (n > 0)		/* found a termcode: adjust length */
+  	    len = n;
+! 	if (len == 0)		/* nothing typed yet */
+  	    continue;
+  
+  	/* Handle modifier and/or special key code. */
+*** ../vim-7.3.090/src/term.c	2010-08-15 21:57:32.000000000 +0200
+--- src/term.c	2010-12-30 12:14:48.000000000 +0100
+***************
+*** 3828,3833 ****
+--- 3831,3837 ----
+   * Check from typebuf.tb_buf[typebuf.tb_off] to typebuf.tb_buf[typebuf.tb_off
+   * + max_offset].
+   * Return 0 for no match, -1 for partial match, > 0 for full match.
++  * Return KEYLEN_REMOVED when a key code was deleted.
+   * With a match, the match is removed, the replacement code is inserted in
+   * typebuf.tb_buf[] and the number of characters in typebuf.tb_buf[] is
+   * returned.
+***************
+*** 3845,3850 ****
+--- 3849,3855 ----
+      int		slen = 0;	/* init for GCC */
+      int		modslen;
+      int		len;
++     int		retval = 0;
+      int		offset;
+      char_u	key_name[2];
+      int		modifiers;
+***************
+*** 4940,4945 ****
+--- 4945,4957 ----
+  #endif
+  		string[new_slen++] = key_name[1];
+  	}
++ 	else if (new_slen == 0 && key_name[0] == KS_EXTRA
++ 						  && key_name[1] == KE_IGNORE)
++ 	{
++ 	    /* Do not put K_IGNORE into the buffer, do return KEYLEN_REMOVED
++ 	     * to indicate what happened. */
++ 	    retval = KEYLEN_REMOVED;
++ 	}
+  	else
+  	{
+  	    string[new_slen++] = K_SPECIAL;
+***************
+*** 4976,4982 ****
+  						   (size_t)(buflen - offset));
+  	    mch_memmove(buf + offset, string, (size_t)new_slen);
+  	}
+! 	return (len + extra + offset);
+      }
+  
+      return 0;			    /* no match found */
+--- 4988,4994 ----
+  						   (size_t)(buflen - offset));
+  	    mch_memmove(buf + offset, string, (size_t)new_slen);
+  	}
+! 	return retval == 0 ? (len + extra + offset) : retval;
+      }
+  
+      return 0;			    /* no match found */
+*** ../vim-7.3.090/src/vim.h	2010-12-17 20:23:56.000000000 +0100
+--- src/vim.h	2010-12-30 12:06:45.000000000 +0100
+***************
+*** 2211,2214 ****
+--- 2211,2218 ----
+  #define MSCR_LEFT	-1
+  #define MSCR_RIGHT	-2
+  
++ #define KEYLEN_PART_KEY -1	/* keylen value for incomplete key-code */
++ #define KEYLEN_PART_MAP -2	/* keylen value for incomplete mapping */
++ #define KEYLEN_REMOVED  9999	/* keylen value for removed sequence */
++ 
+  #endif /* VIM__H */
+*** ../vim-7.3.090/src/version.c	2010-12-30 11:41:05.000000000 +0100
+--- src/version.c	2010-12-30 12:24:56.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     91,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+56. You leave the modem speaker on after connecting because you think it
+    sounds like the ocean wind...the perfect soundtrack for "surfing the net".
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.092 b/source/ap/vim/patches/7.3.092
new file mode 100644
index 00000000..d100b00b
--- /dev/null
+++ b/source/ap/vim/patches/7.3.092
@@ -0,0 +1,62 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.092
+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.3.092
+Problem:    Resizing the window when exiting.
+Solution:   Don't resize when exiting.
+Files:	    src/term.c
+
+
+*** ../vim-7.3.091/src/term.c	2010-12-30 12:30:26.000000000 +0100
+--- src/term.c	2010-12-30 12:14:48.000000000 +0100
+***************
+*** 3053,3062 ****
+      int		old_Rows = Rows;
+      int		old_Columns = Columns;
+  
+!     (void)ui_get_shellsize();
+!     check_shellsize();
+!     if (old_Rows != Rows || old_Columns != Columns)
+! 	shell_resized();
+  }
+  
+  /*
+--- 3053,3065 ----
+      int		old_Rows = Rows;
+      int		old_Columns = Columns;
+  
+!     if (!exiting)
+!     {
+! 	(void)ui_get_shellsize();
+! 	check_shellsize();
+! 	if (old_Rows != Rows || old_Columns != Columns)
+! 	    shell_resized();
+!     }
+  }
+  
+  /*
+*** ../vim-7.3.091/src/version.c	2010-12-30 12:30:26.000000000 +0100
+--- src/version.c	2010-12-30 14:47:04.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     92,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+57. You begin to wonder how on earth your service provider is allowed to call
+    200 hours per month "unlimited."
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.093 b/source/ap/vim/patches/7.3.093
new file mode 100644
index 00000000..9bf0fe8a
--- /dev/null
+++ b/source/ap/vim/patches/7.3.093
@@ -0,0 +1,201 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.093
+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.3.093
+Problem:    New DLL dependencies in MingW with gcc 4.5.0.
+Solution:   Add STATIC_STDCPLUS, LDFLAGS and split up WINDRES. (Guopeng Wen)
+Files:      src/GvimExt/Make_ming.mak, src/Make_ming.mak
+
+
+*** ../vim-7.3.092/src/GvimExt/Make_ming.mak	2010-09-29 18:42:25.000000000 +0200
+--- src/GvimExt/Make_ming.mak	2010-12-30 14:42:51.000000000 +0100
+***************
+*** 17,22 ****
+--- 17,33 ----
+  # check also the executables
+  MINGWOLD = no
+  
++ # Link against the shared versions of libgcc/libstdc++ by default.  Set
++ # STATIC_STDCPLUS to "yes" to link against static versions instead.
++ STATIC_STDCPLUS=no
++ #STATIC_STDCPLUS=yes
++ 
++ # Note: -static-libstdc++ is not available until gcc 4.5.x.
++ LDFLAGS += -shared
++ ifeq (yes, $(STATIC_STDCPLUS))
++ LDFLAGS += -static-libgcc -static-libstdc++
++ endif
++ 
+  ifeq ($(CROSS),yes)
+  DEL = rm
+  ifeq ($(MINGWOLD),yes)
+***************
+*** 33,39 ****
+  endif
+  endif
+  CXX := $(CROSS_COMPILE)g++
+! WINDRES := $(CROSS_COMPILE)windres --preprocessor="$(CXX) -E -xc" -DRC_INVOKED
+  LIBS :=  -luuid
+  RES  := gvimext.res
+  DEFFILE = gvimext_ming.def
+--- 44,52 ----
+  endif
+  endif
+  CXX := $(CROSS_COMPILE)g++
+! WINDRES := $(CROSS_COMPILE)windres
+! WINDRES_CXX = $(CXX)
+! WINDRES_FLAGS = --preprocessor="$(WINDRES_CXX) -E -xc" -DRC_INVOKED
+  LIBS :=  -luuid
+  RES  := gvimext.res
+  DEFFILE = gvimext_ming.def
+***************
+*** 46,52 ****
+  all: all-before $(DLL) all-after
+  
+  $(DLL): $(OBJ) $(RES) $(DEFFILE)
+! 	$(CXX) -shared $(CXXFLAGS) -s -o $@ \
+  		-Wl,--enable-auto-image-base \
+  		-Wl,--enable-auto-import \
+  		-Wl,--whole-archive \
+--- 59,65 ----
+  all: all-before $(DLL) all-after
+  
+  $(DLL): $(OBJ) $(RES) $(DEFFILE)
+! 	$(CXX) $(LDFLAGS) $(CXXFLAGS) -s -o $@ \
+  		-Wl,--enable-auto-image-base \
+  		-Wl,--enable-auto-import \
+  		-Wl,--whole-archive \
+***************
+*** 58,64 ****
+  	$(CXX) $(CXXFLAGS) -DFEAT_GETTEXT -c $? -o $@
+  
+  $(RES): gvimext_ming.rc
+! 	$(WINDRES) --input-format=rc --output-format=coff -DMING $? -o $@
+  
+  clean: clean-custom
+  	-$(DEL)  $(OBJ) $(RES) $(DLL)
+--- 71,77 ----
+  	$(CXX) $(CXXFLAGS) -DFEAT_GETTEXT -c $? -o $@
+  
+  $(RES): gvimext_ming.rc
+! 	$(WINDRES) $(WINDRES_FLAGS) --input-format=rc --output-format=coff -DMING $? -o $@
+  
+  clean: clean-custom
+  	-$(DEL)  $(OBJ) $(RES) $(DLL)
+*** ../vim-7.3.092/src/Make_ming.mak	2010-11-03 21:59:23.000000000 +0100
+--- src/Make_ming.mak	2010-12-30 14:42:51.000000000 +0100
+***************
+*** 56,61 ****
+--- 56,67 ----
+  NETBEANS=$(GUI)
+  
+  
++ # Link against the shared version of libstdc++ by default.  Set
++ # STATIC_STDCPLUS to "yes" to link against static version instead.
++ ifndef STATIC_STDCPLUS
++ STATIC_STDCPLUS=no
++ endif
++ 
+  # If the user doesn't want gettext, undefine it.
+  ifeq (no, $(GETTEXT))
+  GETTEXT=
+***************
+*** 309,320 ****
+  endif
+  endif
+  CC := $(CROSS_COMPILE)gcc
+! WINDRES := $(CROSS_COMPILE)windres --preprocessor="$(CC) -E -xc" -DRC_INVOKED
+  
+  #>>>>> end of choices
+  ###########################################################################
+  
+  CFLAGS = -Iproto $(DEFINES) -pipe -w -march=$(ARCH) -Wall
+  
+  ifdef GETTEXT
+  DEFINES += -DHAVE_GETTEXT -DHAVE_LOCALE_H
+--- 315,328 ----
+  endif
+  endif
+  CC := $(CROSS_COMPILE)gcc
+! WINDRES := $(CROSS_COMPILE)windres
+! WINDRES_CC = $(CC)
+  
+  #>>>>> end of choices
+  ###########################################################################
+  
+  CFLAGS = -Iproto $(DEFINES) -pipe -w -march=$(ARCH) -Wall
++ WINDRES_FLAGS = --preprocessor="$(WINDRES_CC) -E -xc" -DRC_INVOKED
+  
+  ifdef GETTEXT
+  DEFINES += -DHAVE_GETTEXT -DHAVE_LOCALE_H
+***************
+*** 577,584 ****
+  endif
+  
+  ifeq (yes, $(OLE))
+! LIB += -loleaut32 -lstdc++
+  OBJ += $(OUTDIR)/if_ole.o
+  endif
+  
+  ifeq (yes, $(MBYTE))
+--- 585,597 ----
+  endif
+  
+  ifeq (yes, $(OLE))
+! LIB += -loleaut32
+  OBJ += $(OUTDIR)/if_ole.o
++ ifeq (yes, $(STATIC_STDCPLUS))
++ LIB += -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic
++ else
++ LIB += -lstdc++
++ endif
+  endif
+  
+  ifeq (yes, $(MBYTE))
+***************
+*** 656,665 ****
+  	$(CC) -c $(CFLAGS) $< -o $@
+  
+  $(OUTDIR)/vimres.res: vim.rc version.h gui_w32_rc.h
+! 	$(WINDRES) $(DEFINES) vim.rc $(OUTDIR)/vimres.res
+  
+  $(OUTDIR)/vimrc.o: $(OUTDIR)/vimres.res
+! 	$(WINDRES) $(OUTDIR)/vimres.res $(OUTDIR)/vimrc.o
+  
+  $(OUTDIR):
+  	$(MKDIR) $(OUTDIR)
+--- 669,678 ----
+  	$(CC) -c $(CFLAGS) $< -o $@
+  
+  $(OUTDIR)/vimres.res: vim.rc version.h gui_w32_rc.h
+! 	$(WINDRES) $(WINDRES_FLAGS) $(DEFINES) vim.rc $(OUTDIR)/vimres.res
+  
+  $(OUTDIR)/vimrc.o: $(OUTDIR)/vimres.res
+! 	$(WINDRES) $(WINDRES_FLAGS) $(OUTDIR)/vimres.res $(OUTDIR)/vimrc.o
+  
+  $(OUTDIR):
+  	$(MKDIR) $(OUTDIR)
+*** ../vim-7.3.092/src/version.c	2010-12-30 14:47:32.000000000 +0100
+--- src/version.c	2010-12-30 14:48:34.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     93,
+  /**/
+
+-- 
+Creating the world with Emacs:   M-x let-there-be-light
+Creating the world with Vim:     :make world
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.094 b/source/ap/vim/patches/7.3.094
new file mode 100644
index 00000000..e95122bb
--- /dev/null
+++ b/source/ap/vim/patches/7.3.094
@@ -0,0 +1,70 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.094
+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.3.094
+Problem:    Using abs() requires type cast to int.
+Solution:   Use labs() so that the value remains long. (Hong Xu)
+Files:	    src/screen.c
+
+
+*** ../vim-7.3.093/src/screen.c	2010-12-08 19:56:52.000000000 +0100
+--- src/screen.c	2010-12-30 14:54:08.000000000 +0100
+***************
+*** 2317,2323 ****
+  		num = (long)lnum;
+  	    else
+  		/* 'relativenumber', don't use negative numbers */
+! 		num = (long)abs((int)get_cursor_rel_lnum(wp, lnum));
+  
+  	    sprintf((char *)buf, "%*ld ", w, num);
+  #ifdef FEAT_RIGHTLEFT
+--- 2317,2323 ----
+  		num = (long)lnum;
+  	    else
+  		/* 'relativenumber', don't use negative numbers */
+! 		num = labs((long)get_cursor_rel_lnum(wp, lnum));
+  
+  	    sprintf((char *)buf, "%*ld ", w, num);
+  #ifdef FEAT_RIGHTLEFT
+***************
+*** 3475,3482 ****
+  			    num = (long)lnum;
+  			else
+  			    /* 'relativenumber', don't use negative numbers */
+! 			    num = (long)abs((int)get_cursor_rel_lnum(wp,
+! 								    lnum));
+  
+  			sprintf((char *)extra, "%*ld ",
+  						number_width(wp), num);
+--- 3475,3481 ----
+  			    num = (long)lnum;
+  			else
+  			    /* 'relativenumber', don't use negative numbers */
+! 			    num = labs((long)get_cursor_rel_lnum(wp, lnum));
+  
+  			sprintf((char *)extra, "%*ld ",
+  						number_width(wp), num);
+*** ../vim-7.3.093/src/version.c	2010-12-30 14:50:46.000000000 +0100
+--- src/version.c	2010-12-30 14:56:32.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     94,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+58. You turn on your computer and turn off your wife.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.095 b/source/ap/vim/patches/7.3.095
new file mode 100644
index 00000000..2ea34924
--- /dev/null
+++ b/source/ap/vim/patches/7.3.095
@@ -0,0 +1,70 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.095
+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.3.095
+Problem:    Win32: In Chinese tear-off menu doesn't work. (Weasley)
+Solution:   Use menu_name_equal().  (Alex Jakushev)
+Files:	    src/menu.c
+
+
+*** ../vim-7.3.094/src/menu.c	2010-08-15 21:57:25.000000000 +0200
+--- src/menu.c	2011-01-04 17:41:38.000000000 +0100
+***************
+*** 1512,1519 ****
+  {
+  #ifdef FEAT_MULTI_LANG
+      if (menu->en_name != NULL
+! 	    && (menu_namecmp(name,menu->en_name)
+! 		|| menu_namecmp(name,menu->en_dname)))
+  	return TRUE;
+  #endif
+      return menu_namecmp(name, menu->name) || menu_namecmp(name, menu->dname);
+--- 1512,1519 ----
+  {
+  #ifdef FEAT_MULTI_LANG
+      if (menu->en_name != NULL
+! 	    && (menu_namecmp(name, menu->en_name)
+! 		|| menu_namecmp(name, menu->en_dname)))
+  	return TRUE;
+  #endif
+      return menu_namecmp(name, menu->name) || menu_namecmp(name, menu->dname);
+***************
+*** 2342,2348 ****
+  
+  	while (menu != NULL)
+  	{
+! 	    if (STRCMP(name, menu->name) == 0 || STRCMP(name, menu->dname) == 0)
+  	    {
+  		if (menu->children == NULL)
+  		{
+--- 2342,2348 ----
+  
+  	while (menu != NULL)
+  	{
+! 	    if (menu_name_equal(name, menu))
+  	    {
+  		if (menu->children == NULL)
+  		{
+*** ../vim-7.3.094/src/version.c	2010-12-30 14:57:03.000000000 +0100
+--- src/version.c	2011-01-04 17:43:41.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     95,
+  /**/
+
+-- 
+If your nose runs, and your feet smell, you might be upside down.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.096 b/source/ap/vim/patches/7.3.096
new file mode 100644
index 00000000..b8b541b7
--- /dev/null
+++ b/source/ap/vim/patches/7.3.096
@@ -0,0 +1,97 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.096
+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.3.096
+Problem:    "gvim -nb" is not interruptable.  Leaking file descriptor on
+	    netbeans connection error.
+Solution:   Check for CTRL-C typed.  Free file descriptor.  (Xavier de Gaye)
+Files:	    src/netbeans.c
+
+
+*** ../vim-7.3.095/src/netbeans.c	2010-12-24 14:00:09.000000000 +0100
+--- src/netbeans.c	2011-01-04 18:00:35.000000000 +0100
+***************
+*** 321,326 ****
+--- 321,327 ----
+      {
+  	nbdebug(("error in gethostbyname() in netbeans_connect()\n"));
+  	PERROR("gethostbyname() in netbeans_connect()");
++ 	sock_close(sd);
+  	goto theend;
+      }
+      memcpy((char *)&server.sin_addr, host->h_addr, host->h_length);
+***************
+*** 370,384 ****
+  							 || (errno == EINTR)))
+  		{
+  		    nbdebug(("retrying...\n"));
+! 		    sleep(5);
+! 		    if (!doabort)
+  		    {
+! 			ui_breakcheck();
+! 			if (got_int)
+! 			{
+! 			    errno = EINTR;
+! 			    break;
+! 			}
+  		    }
+  		    if (connect(sd, (struct sockaddr *)&server,
+  							 sizeof(server)) == 0)
+--- 371,382 ----
+  							 || (errno == EINTR)))
+  		{
+  		    nbdebug(("retrying...\n"));
+! 		    mch_delay(3000L, TRUE);
+! 		    ui_breakcheck();
+! 		    if (got_int)
+  		    {
+! 			errno = EINTR;
+! 			break;
+  		    }
+  		    if (connect(sd, (struct sockaddr *)&server,
+  							 sizeof(server)) == 0)
+***************
+*** 393,398 ****
+--- 391,397 ----
+  		    /* Get here when the server can't be found. */
+  		    nbdebug(("Cannot connect to Netbeans #2\n"));
+  		    PERROR(_("Cannot connect to Netbeans #2"));
++ 		    sock_close(sd);
+  		    if (doabort)
+  			getout(1);
+  		    goto theend;
+***************
+*** 403,408 ****
+--- 402,408 ----
+  	{
+  	    nbdebug(("Cannot connect to Netbeans\n"));
+  	    PERROR(_("Cannot connect to Netbeans"));
++ 	    sock_close(sd);
+  	    if (doabort)
+  		getout(1);
+  	    goto theend;
+*** ../vim-7.3.095/src/version.c	2011-01-04 17:49:25.000000000 +0100
+--- src/version.c	2011-01-04 18:09:46.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     96,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+85. Choice between paying Compuserve bill and paying for kids education
+    is a no brainer -- although a bit painful for your kids.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.097 b/source/ap/vim/patches/7.3.097
new file mode 100644
index 00000000..2ee20a32
--- /dev/null
+++ b/source/ap/vim/patches/7.3.097
@@ -0,0 +1,54 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.097
+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.3.097
+Problem:    Using ":call" inside "if 0" does not see that a function returns a
+	    Dict and gives error for "." as string concatenation.
+Solution:   Use eval0() to skip over the expression.  (Yasuhiro Matsumoto)
+Files:	    src/eval.c
+
+
+*** ../vim-7.3.096/src/eval.c	2010-12-17 18:06:00.000000000 +0100
+--- src/eval.c	2011-01-04 18:54:27.000000000 +0100
+***************
+*** 3335,3340 ****
+--- 3335,3349 ----
+      int		failed = FALSE;
+      funcdict_T	fudi;
+  
++     if (eap->skip)
++     {
++ 	/* trans_function_name() doesn't work well when skipping, use eval0()
++ 	 * instead to skip to any following command, e.g. for:
++ 	 *   :if 0 | call dict.foo().bar() | endif  */
++ 	eval0(eap->arg, &rettv, &eap->nextcmd, FALSE);
++ 	return;
++     }
++ 
+      tofree = trans_function_name(&arg, eap->skip, TFN_INT, &fudi);
+      if (fudi.fd_newkey != NULL)
+      {
+*** ../vim-7.3.096/src/version.c	2011-01-04 18:11:39.000000000 +0100
+--- src/version.c	2011-01-04 19:00:21.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     97,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+86. E-mail Deficiency Depression (EDD) forces you to e-mail yourself.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.098 b/source/ap/vim/patches/7.3.098
new file mode 100644
index 00000000..9e6435eb
--- /dev/null
+++ b/source/ap/vim/patches/7.3.098
@@ -0,0 +1,61 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.098
+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.3.098
+Problem:    Function that ignores error still causes called_emsg to be set.
+	    E.g. when expand() fails the status line is disabled.
+Solution:   Move check for emsg_not_now() up. (James Vega)
+Files:	    src/message.c
+
+
+*** ../vim-7.3.097/src/message.c	2010-10-20 21:22:17.000000000 +0200
+--- src/message.c	2011-01-04 19:19:04.000000000 +0100
+***************
+*** 569,574 ****
+--- 569,578 ----
+      int		severe;
+  #endif
+  
++     /* Skip this if not giving error messages at the moment. */
++     if (emsg_not_now())
++ 	return TRUE;
++ 
+      called_emsg = TRUE;
+      ex_exitval = 1;
+  
+***************
+*** 581,590 ****
+      emsg_severe = FALSE;
+  #endif
+  
+-     /* Skip this if not giving error messages at the moment. */
+-     if (emsg_not_now())
+- 	return TRUE;
+- 
+      if (!emsg_off || vim_strchr(p_debug, 't') != NULL)
+      {
+  #ifdef FEAT_EVAL
+--- 585,590 ----
+*** ../vim-7.3.097/src/version.c	2011-01-04 19:03:22.000000000 +0100
+--- src/version.c	2011-01-04 19:24:30.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     98,
+  /**/
+
+-- 
+Ed's Radiator Shop: The Best Place in Town to Take a Leak.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.099 b/source/ap/vim/patches/7.3.099
new file mode 100644
index 00000000..84aa2a3f
--- /dev/null
+++ b/source/ap/vim/patches/7.3.099
@@ -0,0 +1,54 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.099
+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.3.099
+Problem:    Crash when splitting a window with zero height. (Yukihiro
+	    Nakadaira)
+Solution:   Don't set the fraction in a window with zero height.
+Files:	    src/window.c
+
+
+*** ../vim-7.3.098/src/window.c	2010-12-17 17:35:05.000000000 +0100
+--- src/window.c	2011-01-08 14:41:32.000000000 +0100
+***************
+*** 986,992 ****
+  
+      /* Set w_fraction now so that the cursor keeps the same relative
+       * vertical position. */
+!     set_fraction(oldwin);
+      wp->w_fraction = oldwin->w_fraction;
+  
+  #ifdef FEAT_VERTSPLIT
+--- 986,993 ----
+  
+      /* Set w_fraction now so that the cursor keeps the same relative
+       * vertical position. */
+!     if (oldwin->w_height > 0)
+! 	set_fraction(oldwin);
+      wp->w_fraction = oldwin->w_fraction;
+  
+  #ifdef FEAT_VERTSPLIT
+*** ../vim-7.3.098/src/version.c	2011-01-04 19:25:46.000000000 +0100
+--- src/version.c	2011-01-08 14:44:02.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     99,
+  /**/
+
+-- 
+From "know your smileys":
+ 8-O 	"Omigod!!" (done "rm -rf *" ?)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.100 b/source/ap/vim/patches/7.3.100
new file mode 100644
index 00000000..2b6e8b04
--- /dev/null
+++ b/source/ap/vim/patches/7.3.100
@@ -0,0 +1,52 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.100
+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.3.100 
+Problem:    When using :normal v:count isn't set. 
+Solution:   Call normal_cmd() with toplevel set to TRUE. 
+Files:      src/ex_docmd.c 
+    
+
+*** ../vim-7.3.099/src/ex_docmd.c	2010-12-02 16:01:23.000000000 +0100
+--- src/ex_docmd.c	2011-01-06 17:23:43.000000000 +0100
+***************
+*** 9310,9316 ****
+  								  && !got_int)
+      {
+  	update_topline_cursor();
+! 	normal_cmd(&oa, FALSE);	/* execute a Normal mode cmd */
+      }
+  }
+  #endif
+--- 9310,9316 ----
+  								  && !got_int)
+      {
+  	update_topline_cursor();
+! 	normal_cmd(&oa, TRUE);	/* execute a Normal mode cmd */
+      }
+  }
+  #endif
+*** ../vim-7.3.099/src/version.c	2011-01-08 14:45:57.000000000 +0100
+--- src/version.c	2011-01-17 19:49:07.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     100,
+  /**/
+
+-- 
+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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.101 b/source/ap/vim/patches/7.3.101
new file mode 100644
index 00000000..8869baf1
--- /dev/null
+++ b/source/ap/vim/patches/7.3.101
@@ -0,0 +1,92 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.1
+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.3.101
+Problem:    ino_t defined with wrong size.
+Solution:   Move including auto/config.h before other includes. (Marius
+            Geminas)
+Files:      src/if_ruby.c, src/if_lua.c
+	        
+
+*** ../vim-7.3.100/src/if_ruby.c	2010-12-24 13:39:29.000000000 +0100
+--- src/if_ruby.c	2011-01-09 14:43:14.000000000 +0100
+***************
+*** 11,23 ****
+   * See README.txt for an overview of the Vim source code.
+   */
+  
+- #include <stdio.h>
+- #include <string.h>
+- 
+  #ifdef HAVE_CONFIG_H
+  # include "auto/config.h"
+  #endif
+  
+  #ifdef _WIN32
+  # if !defined(DYNAMIC_RUBY_VER) || (DYNAMIC_RUBY_VER < 18)
+  #   define NT
+--- 11,23 ----
+   * See README.txt for an overview of the Vim source code.
+   */
+  
+  #ifdef HAVE_CONFIG_H
+  # include "auto/config.h"
+  #endif
+  
++ #include <stdio.h>
++ #include <string.h>
++ 
+  #ifdef _WIN32
+  # if !defined(DYNAMIC_RUBY_VER) || (DYNAMIC_RUBY_VER < 18)
+  #   define NT
+*** ../vim-7.3.100/src/if_lua.c	2010-10-23 14:02:48.000000000 +0200
+--- src/if_lua.c	2011-01-09 14:46:46.000000000 +0100
+***************
+*** 9,20 ****
+   * See README.txt for an overview of the Vim source code.
+   */
+  
+! #include <stdio.h>
+! #include <string.h>
+  #include <lua.h>
+  #include <lualib.h>
+  #include <lauxlib.h>
+- #include "vim.h"
+  
+  /* Only do the following when the feature is enabled.  Needed for "make
+   * depend". */
+--- 9,19 ----
+   * See README.txt for an overview of the Vim source code.
+   */
+  
+! #include "vim.h"
+! 
+  #include <lua.h>
+  #include <lualib.h>
+  #include <lauxlib.h>
+  
+  /* Only do the following when the feature is enabled.  Needed for "make
+   * depend". */
+*** ../vim-7.3.100/src/version.c	2011-01-17 19:50:01.000000000 +0100
+--- src/version.c	2011-01-17 19:51:40.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     101,
+  /**/
+
+-- 
+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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.102 b/source/ap/vim/patches/7.3.102
new file mode 100644
index 00000000..785e597b
--- /dev/null
+++ b/source/ap/vim/patches/7.3.102
@@ -0,0 +1,615 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.102
+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.3.102
+Problem:    When using ":make", typing the next command and then getting the
+            "reload" prompt the next command is (partly) eaten by the reload
+            prompt.
+Solution:   Accept ':' as a special character at the reload prompt to accept
+            the default choice and execute the command.
+Files:      src/eval.c, src/fileio.c, src/gui.c, src/gui_xmdlg.c,
+            src/memline.c, src/message.c, src/proto/message.pro,
+            src/gui_athena.c, src/gui_gtk.c, src/gui_mac.c, src/gui_motif.c,
+            src/gui_photon.c, src/gui_w16.c, src/gui_w32.c, src/os_mswin.c
+            src/proto/gui_athena.pro, src/proto/gui_gtk.pro,
+            src/proto/gui_mac.pro, src/proto/gui_motif.pro,
+            src/proto/gui_photon.pro, src/proto/gui_w16.pro,
+            src/proto/gui_w32.pro
+
+
+*** ../vim-7.3.101/src/eval.c	2011-01-04 19:03:22.000000000 +0100
+--- src/eval.c	2011-01-16 00:14:21.000000000 +0100
+***************
+*** 9323,9329 ****
+  
+      if (!error)
+  	rettv->vval.v_number = do_dialog(type, NULL, message, buttons,
+! 								   def, NULL);
+  #endif
+  }
+  
+--- 9323,9329 ----
+  
+      if (!error)
+  	rettv->vval.v_number = do_dialog(type, NULL, message, buttons,
+! 							    def, NULL, FALSE);
+  #endif
+  }
+  
+***************
+*** 12744,12750 ****
+  	    IObuff[0] = NUL;
+  	if (message != NULL && defstr != NULL
+  		&& do_dialog(VIM_QUESTION, NULL, message,
+! 				(char_u *)_("&OK\n&Cancel"), 1, IObuff) == 1)
+  	    rettv->vval.v_string = vim_strsave(IObuff);
+  	else
+  	{
+--- 12744,12750 ----
+  	    IObuff[0] = NUL;
+  	if (message != NULL && defstr != NULL
+  		&& do_dialog(VIM_QUESTION, NULL, message,
+! 			  (char_u *)_("&OK\n&Cancel"), 1, IObuff, FALSE) == 1)
+  	    rettv->vval.v_string = vim_strsave(IObuff);
+  	else
+  	{
+*** ../vim-7.3.101/src/fileio.c	2010-12-17 18:06:00.000000000 +0100
+--- src/fileio.c	2011-01-16 00:14:37.000000000 +0100
+***************
+*** 7008,7014 ****
+  		    STRCAT(tbuf, mesg2);
+  		}
+  		if (do_dialog(VIM_WARNING, (char_u *)_("Warning"), tbuf,
+! 				(char_u *)_("&OK\n&Load File"), 1, NULL) == 2)
+  		    reload = TRUE;
+  	    }
+  	    else
+--- 7008,7014 ----
+  		    STRCAT(tbuf, mesg2);
+  		}
+  		if (do_dialog(VIM_WARNING, (char_u *)_("Warning"), tbuf,
+! 			  (char_u *)_("&OK\n&Load File"), 1, NULL, TRUE) == 2)
+  		    reload = TRUE;
+  	    }
+  	    else
+*** ../vim-7.3.101/src/gui.c	2010-10-20 19:17:43.000000000 +0200
+--- src/gui.c	2011-01-16 00:14:56.000000000 +0100
+***************
+*** 4903,4909 ****
+  		if (STRLEN(p) > 2000)
+  		    STRCPY(p + 2000 - 14, "...(truncated)");
+  		(void)do_dialog(VIM_ERROR, (char_u *)_("Error"),
+! 					      p, (char_u *)_("&Ok"), 1, NULL);
+  		break;
+  	    }
+  	ga_clear(&error_ga);
+--- 4903,4909 ----
+  		if (STRLEN(p) > 2000)
+  		    STRCPY(p + 2000 - 14, "...(truncated)");
+  		(void)do_dialog(VIM_ERROR, (char_u *)_("Error"),
+! 				       p, (char_u *)_("&Ok"), 1, NULL, FALSE);
+  		break;
+  	    }
+  	ga_clear(&error_ga);
+*** ../vim-7.3.101/src/gui_xmdlg.c	2010-08-15 21:57:32.000000000 +0200
+--- src/gui_xmdlg.c	2011-01-16 00:15:33.000000000 +0100
+***************
+*** 688,694 ****
+  	    do_dialog(VIM_ERROR,
+  		    (char_u *)_("Error"),
+  		    (char_u *)_("Invalid font specification"),
+! 		    (char_u *)_("&Dismiss"), 1, NULL);
+  
+  	return True;
+      }
+--- 688,694 ----
+  	    do_dialog(VIM_ERROR,
+  		    (char_u *)_("Error"),
+  		    (char_u *)_("Invalid font specification"),
+! 		    (char_u *)_("&Dismiss"), 1, NULL, FALSE);
+  
+  	return True;
+      }
+***************
+*** 807,813 ****
+  	do_dialog(VIM_ERROR,
+  		(char_u *)_("Error"),
+  		(char_u *)_("Invalid font specification"),
+! 		(char_u *)_("&Dismiss"), 1, NULL);
+  	XFreeFontNames(name);
+      }
+      else
+--- 807,813 ----
+  	do_dialog(VIM_ERROR,
+  		(char_u *)_("Error"),
+  		(char_u *)_("Invalid font specification"),
+! 		(char_u *)_("&Dismiss"), 1, NULL, FALSE);
+  	XFreeFontNames(name);
+      }
+      else
+*** ../vim-7.3.101/src/memline.c	2010-12-17 20:23:56.000000000 +0100
+--- src/memline.c	2011-01-16 00:15:47.000000000 +0100
+***************
+*** 4516,4522 ****
+  				    process_still_running
+  					? (char_u *)_("&Open Read-Only\n&Edit anyway\n&Recover\n&Quit\n&Abort") :
+  # endif
+! 					(char_u *)_("&Open Read-Only\n&Edit anyway\n&Recover\n&Delete it\n&Quit\n&Abort"), 1, NULL);
+  
+  # if defined(UNIX) || defined(__EMX__) || defined(VMS)
+  			if (process_still_running && choice >= 4)
+--- 4516,4522 ----
+  				    process_still_running
+  					? (char_u *)_("&Open Read-Only\n&Edit anyway\n&Recover\n&Quit\n&Abort") :
+  # endif
+! 					(char_u *)_("&Open Read-Only\n&Edit anyway\n&Recover\n&Delete it\n&Quit\n&Abort"), 1, NULL, FALSE);
+  
+  # if defined(UNIX) || defined(__EMX__) || defined(VMS)
+  			if (process_still_running && choice >= 4)
+*** ../vim-7.3.101/src/message.c	2011-01-04 19:25:46.000000000 +0100
+--- src/message.c	2011-01-17 19:57:30.000000000 +0100
+***************
+*** 3315,3321 ****
+   * different letter.
+   */
+      int
+! do_dialog(type, title, message, buttons, dfltbutton, textfield)
+      int		type UNUSED;
+      char_u	*title UNUSED;
+      char_u	*message;
+--- 3315,3321 ----
+   * different letter.
+   */
+      int
+! do_dialog(type, title, message, buttons, dfltbutton, textfield, ex_cmd)
+      int		type UNUSED;
+      char_u	*title UNUSED;
+      char_u	*message;
+***************
+*** 3323,3328 ****
+--- 3323,3330 ----
+      int		dfltbutton;
+      char_u	*textfield UNUSED;	/* IObuff for inputdialog(), NULL
+  					   otherwise */
++     int		ex_cmd;	    /* when TRUE pressing : accepts default and starts
++ 			       Ex command */
+  {
+      int		oldState;
+      int		retval = 0;
+***************
+*** 3341,3347 ****
+      if (gui.in_use && vim_strchr(p_go, GO_CONDIALOG) == NULL)
+      {
+  	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;
+--- 3343,3349 ----
+      if (gui.in_use && vim_strchr(p_go, GO_CONDIALOG) == NULL)
+      {
+  	c = gui_mch_dialog(type, title, message, buttons, dfltbutton,
+! 							   textfield, ex_cmd);
+  	/* avoid a hit-enter prompt without clearing the cmdline */
+  	need_wait_return = FALSE;
+  	emsg_on_display = FALSE;
+***************
+*** 3388,3393 ****
+--- 3390,3402 ----
+  	    default:		/* Could be a hotkey? */
+  		if (c < 0)	/* special keys are ignored here */
+  		    continue;
++ 		if (c == ':' && ex_cmd)
++ 		{
++ 		    retval = dfltbutton;
++ 		    ins_char_typebuf(':');
++ 		    break;
++ 		}
++ 
+  		/* Make the character lowercase, as chars in "hotkeys" are. */
+  		c = MB_TOLOWER(c);
+  		retval = 1;
+***************
+*** 3661,3667 ****
+      if (do_dialog(type,
+  		title == NULL ? (char_u *)_("Question") : title,
+  		message,
+! 		(char_u *)_("&Yes\n&No"), dflt, NULL) == 1)
+  	return VIM_YES;
+      return VIM_NO;
+  }
+--- 3670,3676 ----
+      if (do_dialog(type,
+  		title == NULL ? (char_u *)_("Question") : title,
+  		message,
+! 		(char_u *)_("&Yes\n&No"), dflt, NULL, FALSE) == 1)
+  	return VIM_YES;
+      return VIM_NO;
+  }
+***************
+*** 3676,3682 ****
+      switch (do_dialog(type,
+  		title == NULL ? (char_u *)_("Question") : title,
+  		message,
+! 		(char_u *)_("&Yes\n&No\n&Cancel"), dflt, NULL))
+      {
+  	case 1: return VIM_YES;
+  	case 2: return VIM_NO;
+--- 3685,3691 ----
+      switch (do_dialog(type,
+  		title == NULL ? (char_u *)_("Question") : title,
+  		message,
+! 		(char_u *)_("&Yes\n&No\n&Cancel"), dflt, NULL, FALSE))
+      {
+  	case 1: return VIM_YES;
+  	case 2: return VIM_NO;
+***************
+*** 3695,3701 ****
+  		title == NULL ? (char_u *)"Question" : title,
+  		message,
+  		(char_u *)_("&Yes\n&No\nSave &All\n&Discard All\n&Cancel"),
+! 								  dflt, NULL))
+      {
+  	case 1: return VIM_YES;
+  	case 2: return VIM_NO;
+--- 3704,3710 ----
+  		title == NULL ? (char_u *)"Question" : title,
+  		message,
+  		(char_u *)_("&Yes\n&No\nSave &All\n&Discard All\n&Cancel"),
+! 							   dflt, NULL, FALSE))
+      {
+  	case 1: return VIM_YES;
+  	case 2: return VIM_NO;
+*** ../vim-7.3.101/src/proto/message.pro	2010-10-20 21:22:17.000000000 +0200
+--- src/proto/message.pro	2011-01-16 00:22:36.000000000 +0100
+***************
+*** 64,70 ****
+  int verbose_open __ARGS((void));
+  void give_warning __ARGS((char_u *message, int hl));
+  void msg_advance __ARGS((int col));
+! int do_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield));
+  void display_confirm_msg __ARGS((void));
+  int vim_dialog_yesno __ARGS((int type, char_u *title, char_u *message, int dflt));
+  int vim_dialog_yesnocancel __ARGS((int type, char_u *title, char_u *message, int dflt));
+--- 64,70 ----
+  int verbose_open __ARGS((void));
+  void give_warning __ARGS((char_u *message, int hl));
+  void msg_advance __ARGS((int col));
+! int do_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield, int ex_cmd));
+  void display_confirm_msg __ARGS((void));
+  int vim_dialog_yesno __ARGS((int type, char_u *title, char_u *message, int dflt));
+  int vim_dialog_yesnocancel __ARGS((int type, char_u *title, char_u *message, int dflt));
+*** ../vim-7.3.101/src/gui_athena.c	2010-08-15 21:57:25.000000000 +0200
+--- src/gui_athena.c	2011-01-16 00:18:47.000000000 +0100
+***************
+*** 2117,2129 ****
+  }
+  
+      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;
+      char_u		*p, *next;
+--- 2117,2130 ----
+  }
+  
+      int
+! gui_mch_dialog(type, title, message, buttons, dfltbutton, textfield, ex_cmd)
+      int		type UNUSED;
+      char_u	*title;
+      char_u	*message;
+      char_u	*buttons;
+      int		dfltbutton UNUSED;
+      char_u	*textfield;
++     int		ex_cmd UNUSED;
+  {
+      char_u		*buts;
+      char_u		*p, *next;
+*** ../vim-7.3.101/src/gui_gtk.c	2010-12-08 13:11:15.000000000 +0100
+--- src/gui_gtk.c	2011-01-16 00:24:44.000000000 +0100
+***************
+*** 1268,1274 ****
+  	       char_u	*message,   /* message text */
+  	       char_u	*buttons,   /* names of buttons */
+  	       int	def_but,    /* default button */
+! 	       char_u	*textfield) /* text for textfield or NULL */
+  {
+      GtkWidget	*dialog;
+      GtkWidget	*entry = NULL;
+--- 1268,1275 ----
+  	       char_u	*message,   /* message text */
+  	       char_u	*buttons,   /* names of buttons */
+  	       int	def_but,    /* default button */
+! 	       char_u	*textfield, /* text for textfield or NULL */
+! 	       int	ex_cmd UNUSED)
+  {
+      GtkWidget	*dialog;
+      GtkWidget	*entry = NULL;
+*** ../vim-7.3.101/src/gui_mac.c	2010-09-21 17:34:26.000000000 +0200
+--- src/gui_mac.c	2011-01-16 00:19:52.000000000 +0100
+***************
+*** 5583,5589 ****
+      char_u	*message,
+      char_u	*buttons,
+      int		dfltbutton,
+!     char_u	*textfield)
+  {
+      Handle	buttonDITL;
+      Handle	iconDITL;
+--- 5583,5590 ----
+      char_u	*message,
+      char_u	*buttons,
+      int		dfltbutton,
+!     char_u	*textfield,
+!     int		ex_cmd)
+  {
+      Handle	buttonDITL;
+      Handle	iconDITL;
+*** ../vim-7.3.101/src/gui_motif.c	2010-08-15 21:57:28.000000000 +0200
+--- src/gui_motif.c	2011-01-16 00:20:14.000000000 +0100
+***************
+*** 2549,2561 ****
+  #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;
+      int		dfltbutton;
+      char_u	*textfield;		/* buffer of size IOSIZE */
+  {
+      char_u		*buts;
+      char_u		*p, *next;
+--- 2549,2562 ----
+  #endif
+  
+      int
+! gui_mch_dialog(type, title, message, button_names, dfltbutton, textfield, ex_cmd)
+      int		type UNUSED;
+      char_u	*title;
+      char_u	*message;
+      char_u	*button_names;
+      int		dfltbutton;
+      char_u	*textfield;		/* buffer of size IOSIZE */
++     int		ex_cmd UNUSED;
+  {
+      char_u		*buts;
+      char_u		*p, *next;
+*** ../vim-7.3.101/src/gui_photon.c	2010-08-15 21:57:27.000000000 +0200
+--- src/gui_photon.c	2011-01-16 00:20:28.000000000 +0100
+***************
+*** 1502,1508 ****
+  	char_u	*message,
+  	char_u	*buttons,
+  	int	default_button,
+! 	char_u	*textfield)
+  {
+      char_u	*str;
+      char_u	**button_array;
+--- 1502,1509 ----
+  	char_u	*message,
+  	char_u	*buttons,
+  	int	default_button,
+! 	char_u	*textfield,
+! 	int	ex_cmd)
+  {
+      char_u	*str;
+      char_u	**button_array;
+*** ../vim-7.3.101/src/gui_w16.c	2010-08-15 21:57:28.000000000 +0200
+--- src/gui_w16.c	2011-01-16 00:20:48.000000000 +0100
+***************
+*** 1098,1104 ****
+      char_u	*message,
+      char_u	*buttons,
+      int		 dfltbutton,
+!     char_u	*textfield)
+  {
+      FARPROC	dp;
+      LPWORD	p, pnumitems;
+--- 1098,1105 ----
+      char_u	*message,
+      char_u	*buttons,
+      int		 dfltbutton,
+!     char_u	*textfield,
+!     int		ex_cmd)
+  {
+      FARPROC	dp;
+      LPWORD	p, pnumitems;
+*** ../vim-7.3.101/src/gui_w32.c	2010-10-27 12:33:12.000000000 +0200
+--- src/gui_w32.c	2011-01-16 00:21:08.000000000 +0100
+***************
+*** 3005,3011 ****
+      char_u	*message,
+      char_u	*buttons,
+      int		 dfltbutton,
+!     char_u	*textfield)
+  {
+      WORD	*p, *pdlgtemplate, *pnumitems;
+      DWORD	*dwp;
+--- 3005,3012 ----
+      char_u	*message,
+      char_u	*buttons,
+      int		 dfltbutton,
+!     char_u	*textfield,
+!     int		ex_cmd)
+  {
+      WORD	*p, *pdlgtemplate, *pnumitems;
+      DWORD	*dwp;
+*** ../vim-7.3.101/src/os_mswin.c	2010-12-17 20:23:56.000000000 +0100
+--- src/os_mswin.c	2011-01-16 00:21:41.000000000 +0100
+***************
+*** 593,599 ****
+  				     gui.starting ? (char_u *)_("Message") :
+  #endif
+  					     (char_u *)_("Error"),
+! 				     p, (char_u *)_("&Ok"), 1, NULL);
+  		break;
+  	    }
+  	ga_clear(&error_ga);
+--- 593,599 ----
+  				     gui.starting ? (char_u *)_("Message") :
+  #endif
+  					     (char_u *)_("Error"),
+! 				     p, (char_u *)_("&Ok"), 1, NULL, FALSE);
+  		break;
+  	    }
+  	ga_clear(&error_ga);
+*** ../vim-7.3.101/src/proto/gui_athena.pro	2010-08-15 21:57:28.000000000 +0200
+--- src/proto/gui_athena.pro	2011-01-16 00:23:00.000000000 +0100
+***************
+*** 27,31 ****
+  void gui_mch_set_scrollbar_colors __ARGS((scrollbar_T *sb));
+  Window gui_x11_get_wid __ARGS((void));
+  char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
+! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield));
+  /* vim: set ft=c : */
+--- 27,31 ----
+  void gui_mch_set_scrollbar_colors __ARGS((scrollbar_T *sb));
+  Window gui_x11_get_wid __ARGS((void));
+  char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
+! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield, int ex_cmd));
+  /* vim: set ft=c : */
+*** ../vim-7.3.101/src/proto/gui_gtk.pro	2010-08-15 21:57:28.000000000 +0200
+--- src/proto/gui_gtk.pro	2011-01-16 00:22:57.000000000 +0100
+***************
+*** 13,19 ****
+  void gui_mch_destroy_scrollbar __ARGS((scrollbar_T *sb));
+  char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
+  char_u *gui_mch_browsedir __ARGS((char_u *title, char_u *initdir));
+! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int def_but, char_u *textfield));
+  void gui_mch_show_popupmenu __ARGS((vimmenu_T *menu));
+  void gui_make_popup __ARGS((char_u *path_name, int mouse_pos));
+  void gui_mch_find_dialog __ARGS((exarg_T *eap));
+--- 13,19 ----
+  void gui_mch_destroy_scrollbar __ARGS((scrollbar_T *sb));
+  char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
+  char_u *gui_mch_browsedir __ARGS((char_u *title, char_u *initdir));
+! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int def_but, char_u *textfield, int ex_cmd));
+  void gui_mch_show_popupmenu __ARGS((vimmenu_T *menu));
+  void gui_make_popup __ARGS((char_u *path_name, int mouse_pos));
+  void gui_mch_find_dialog __ARGS((exarg_T *eap));
+*** ../vim-7.3.101/src/proto/gui_mac.pro	2010-08-15 21:57:28.000000000 +0200
+--- src/proto/gui_mac.pro	2011-01-16 00:31:46.000000000 +0100
+***************
+*** 81,87 ****
+  int gui_mch_get_mouse_y __ARGS((void));
+  void gui_mch_setmouse __ARGS((int x, int y));
+  void gui_mch_show_popupmenu __ARGS((vimmenu_T *menu));
+! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield));
+  char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
+  void gui_mch_set_foreground __ARGS((void));
+  void gui_mch_show_tabline __ARGS((int showit));
+--- 81,87 ----
+  int gui_mch_get_mouse_y __ARGS((void));
+  void gui_mch_setmouse __ARGS((int x, int y));
+  void gui_mch_show_popupmenu __ARGS((vimmenu_T *menu));
+! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield, int ex_cmd));
+  char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
+  void gui_mch_set_foreground __ARGS((void));
+  void gui_mch_show_tabline __ARGS((int showit));
+*** ../vim-7.3.101/src/proto/gui_motif.pro	2010-08-15 21:57:28.000000000 +0200
+--- src/proto/gui_motif.pro	2011-01-16 00:22:58.000000000 +0100
+***************
+*** 29,35 ****
+  void gui_mch_set_scrollbar_colors __ARGS((scrollbar_T *sb));
+  Window gui_x11_get_wid __ARGS((void));
+  char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
+! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *button_names, int dfltbutton, char_u *textfield));
+  void gui_mch_enable_footer __ARGS((int showit));
+  void gui_mch_set_footer __ARGS((char_u *s));
+  void gui_mch_show_toolbar __ARGS((int showit));
+--- 29,35 ----
+  void gui_mch_set_scrollbar_colors __ARGS((scrollbar_T *sb));
+  Window gui_x11_get_wid __ARGS((void));
+  char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
+! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *button_names, int dfltbutton, char_u *textfield, int ex_cmd));
+  void gui_mch_enable_footer __ARGS((int showit));
+  void gui_mch_set_footer __ARGS((char_u *s));
+  void gui_mch_show_toolbar __ARGS((int showit));
+*** ../vim-7.3.101/src/proto/gui_photon.pro	2010-08-15 21:57:28.000000000 +0200
+--- src/proto/gui_photon.pro	2011-01-16 00:32:33.000000000 +0100
+***************
+*** 8,14 ****
+  void gui_mch_update __ARGS((void));
+  int gui_mch_wait_for_chars __ARGS((int wtime));
+  char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *default_name, char_u *ext, char_u *initdir, char_u *filter));
+! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int default_button, char_u *textfield));
+  int gui_mch_get_winpos __ARGS((int *x, int *y));
+  void gui_mch_set_winpos __ARGS((int x, int y));
+  void gui_mch_set_shellsize __ARGS((int width, int height, int min_width, int min_height, int base_width, int base_height, int direction));
+--- 8,14 ----
+  void gui_mch_update __ARGS((void));
+  int gui_mch_wait_for_chars __ARGS((int wtime));
+  char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *default_name, char_u *ext, char_u *initdir, char_u *filter));
+! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int default_button, char_u *textfield, int ex_cmd));
+  int gui_mch_get_winpos __ARGS((int *x, int *y));
+  void gui_mch_set_winpos __ARGS((int x, int y));
+  void gui_mch_set_shellsize __ARGS((int width, int height, int min_width, int min_height, int base_width, int base_height, int direction));
+*** ../vim-7.3.101/src/proto/gui_w16.pro	2010-08-15 21:57:28.000000000 +0200
+--- src/proto/gui_w16.pro	2011-01-16 00:34:36.000000000 +0100
+***************
+*** 74,79 ****
+  void gui_mch_add_menu_item __ARGS((vimmenu_T *menu, int idx));
+  void gui_mch_destroy_menu __ARGS((vimmenu_T *menu));
+  void gui_mch_menu_grey __ARGS((vimmenu_T *menu, int grey));
+! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield));
+  void gui_mch_set_foreground __ARGS((void));
+  /* vim: set ft=c : */
+--- 74,79 ----
+  void gui_mch_add_menu_item __ARGS((vimmenu_T *menu, int idx));
+  void gui_mch_destroy_menu __ARGS((vimmenu_T *menu));
+  void gui_mch_menu_grey __ARGS((vimmenu_T *menu, int grey));
+! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield, int ex_cmd));
+  void gui_mch_set_foreground __ARGS((void));
+  /* vim: set ft=c : */
+*** ../vim-7.3.101/src/proto/gui_w32.pro	2010-08-15 21:57:28.000000000 +0200
+--- src/proto/gui_w32.pro	2011-01-16 00:33:12.000000000 +0100
+***************
+*** 81,87 ****
+  void gui_mch_add_menu_item __ARGS((vimmenu_T *menu, int idx));
+  void gui_mch_destroy_menu __ARGS((vimmenu_T *menu));
+  void gui_mch_menu_grey __ARGS((vimmenu_T *menu, int grey));
+! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield));
+  void gui_mch_set_foreground __ARGS((void));
+  void gui_mch_drawsign __ARGS((int row, int col, int typenr));
+  void *gui_mch_register_sign __ARGS((char_u *signfile));
+--- 81,87 ----
+  void gui_mch_add_menu_item __ARGS((vimmenu_T *menu, int idx));
+  void gui_mch_destroy_menu __ARGS((vimmenu_T *menu));
+  void gui_mch_menu_grey __ARGS((vimmenu_T *menu, int grey));
+! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield, int ex_cmd));
+  void gui_mch_set_foreground __ARGS((void));
+  void gui_mch_drawsign __ARGS((int row, int col, int typenr));
+  void *gui_mch_register_sign __ARGS((char_u *signfile));
+*** ../vim-7.3.101/src/version.c	2011-01-17 19:53:20.000000000 +0100
+--- src/version.c	2011-01-17 20:05:02.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     102,
+  /**/
+
+-- 
+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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.103 b/source/ap/vim/patches/7.3.103
new file mode 100644
index 00000000..f9e086fa
--- /dev/null
+++ b/source/ap/vim/patches/7.3.103
@@ -0,0 +1,145 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.103
+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.3.103
+Problem:    Changing 'fileformat' and then using ":w" in an empty file sets
+            the 'modified' option.
+Solution:   In unchanged() don't ignore 'ff' for an empty file.
+Files:      src/misc1.c, src/option.c, src/proto/option.pro, src/undo.c
+
+
+*** ../vim-7.3.102/src/misc1.c	2010-12-30 12:30:26.000000000 +0100
+--- src/misc1.c	2011-01-22 00:00:24.000000000 +0100
+***************
+*** 2919,2925 ****
+      buf_T	*buf;
+      int		ff;	/* also reset 'fileformat' */
+  {
+!     if (buf->b_changed || (ff && file_ff_differs(buf)))
+      {
+  	buf->b_changed = 0;
+  	ml_setflags(buf);
+--- 2919,2925 ----
+      buf_T	*buf;
+      int		ff;	/* also reset 'fileformat' */
+  {
+!     if (buf->b_changed || (ff && file_ff_differs(buf, FALSE)))
+      {
+  	buf->b_changed = 0;
+  	ml_setflags(buf);
+*** ../vim-7.3.102/src/option.c	2010-12-02 21:43:10.000000000 +0100
+--- src/option.c	2011-01-22 00:03:40.000000000 +0100
+***************
+*** 11296,11311 ****
+   * from when editing started (save_file_ff() called).
+   * Also when 'endofline' was changed and 'binary' is set, or when 'bomb' was
+   * changed and 'binary' is not set.
+!  * Don't consider a new, empty buffer to be changed.
+   */
+      int
+! file_ff_differs(buf)
+      buf_T	*buf;
+  {
+      /* In a buffer that was never loaded the options are not valid. */
+      if (buf->b_flags & BF_NEVERLOADED)
+  	return FALSE;
+!     if ((buf->b_flags & BF_NEW)
+  	    && buf->b_ml.ml_line_count == 1
+  	    && *ml_get_buf(buf, (linenr_T)1, FALSE) == NUL)
+  	return FALSE;
+--- 11296,11314 ----
+   * from when editing started (save_file_ff() called).
+   * Also when 'endofline' was changed and 'binary' is set, or when 'bomb' was
+   * changed and 'binary' is not set.
+!  * When "ignore_empty" is true don't consider a new, empty buffer to be
+!  * changed.
+   */
+      int
+! file_ff_differs(buf, ignore_empty)
+      buf_T	*buf;
++     int		ignore_empty;
+  {
+      /* In a buffer that was never loaded the options are not valid. */
+      if (buf->b_flags & BF_NEVERLOADED)
+  	return FALSE;
+!     if (ignore_empty
+! 	    && (buf->b_flags & BF_NEW)
+  	    && buf->b_ml.ml_line_count == 1
+  	    && *ml_get_buf(buf, (linenr_T)1, FALSE) == NUL)
+  	return FALSE;
+*** ../vim-7.3.102/src/proto/option.pro	2010-08-15 21:57:28.000000000 +0200
+--- src/proto/option.pro	2011-01-22 00:04:35.000000000 +0100
+***************
+*** 54,59 ****
+  int option_was_set __ARGS((char_u *name));
+  int can_bs __ARGS((int what));
+  void save_file_ff __ARGS((buf_T *buf));
+! int file_ff_differs __ARGS((buf_T *buf));
+  int check_ff_value __ARGS((char_u *p));
+  /* vim: set ft=c : */
+--- 54,59 ----
+  int option_was_set __ARGS((char_u *name));
+  int can_bs __ARGS((int what));
+  void save_file_ff __ARGS((buf_T *buf));
+! int file_ff_differs __ARGS((buf_T *buf, int ignore_empty));
+  int check_ff_value __ARGS((char_u *p));
+  /* vim: set ft=c : */
+*** ../vim-7.3.102/src/undo.c	2010-12-17 18:06:00.000000000 +0100
+--- src/undo.c	2011-01-22 00:03:58.000000000 +0100
+***************
+*** 3304,3310 ****
+  #ifdef FEAT_QUICKFIX
+  	    !bt_dontwrite(buf) &&
+  #endif
+! 	    (buf->b_changed || file_ff_differs(buf));
+  }
+  
+      int
+--- 3304,3310 ----
+  #ifdef FEAT_QUICKFIX
+  	    !bt_dontwrite(buf) &&
+  #endif
+! 	    (buf->b_changed || file_ff_differs(buf, TRUE));
+  }
+  
+      int
+***************
+*** 3314,3320 ****
+  #ifdef FEAT_QUICKFIX
+  	!bt_dontwrite(curbuf) &&
+  #endif
+! 	(curbuf->b_changed || file_ff_differs(curbuf));
+  }
+  
+  #if defined(FEAT_EVAL) || defined(PROTO)
+--- 3314,3320 ----
+  #ifdef FEAT_QUICKFIX
+  	!bt_dontwrite(curbuf) &&
+  #endif
+! 	(curbuf->b_changed || file_ff_differs(curbuf, TRUE));
+  }
+  
+  #if defined(FEAT_EVAL) || defined(PROTO)
+*** ../vim-7.3.102/src/version.c	2011-01-17 20:08:03.000000000 +0100
+--- src/version.c	2011-01-22 00:07:56.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     103,
+  /**/
+
+-- 
+In a world without fences, who needs Gates and Windows?
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.104 b/source/ap/vim/patches/7.3.104
new file mode 100644
index 00000000..1e719bd7
--- /dev/null
+++ b/source/ap/vim/patches/7.3.104
@@ -0,0 +1,50 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.104
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Problem:    Conceal: using Tab for cchar causes problems. (ZyX)
+Solution:   Do not accept a control character for cchar.
+Files:      src/syntax.c
+
+
+*** ../vim-7.3.103/src/syntax.c	2010-09-29 18:32:47.000000000 +0200
+--- src/syntax.c	2011-01-22 00:50:20.000000000 +0100
+***************
+*** 4537,4542 ****
+--- 4537,4549 ----
+  		;
+  #endif
+  	    }
++ #ifdef FEAT_CONCEAL
++ 	    if (!vim_isprintc_strict(*conceal_char))
++ 	    {
++ 		EMSG(_("E844: invalid cchar value"));
++ 		return NULL;
++ 	    }
++ #endif
+  	    arg = skipwhite(arg + 7);
+  	}
+  	else
+*** ../vim-7.3.103/src/version.c	2011-01-22 00:11:42.000000000 +0100
+--- src/version.c	2011-01-22 00:54:56.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     104,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+132. You come back and check this list every half-hour.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.105 b/source/ap/vim/patches/7.3.105
new file mode 100644
index 00000000..abf69ac5
--- /dev/null
+++ b/source/ap/vim/patches/7.3.105
@@ -0,0 +1,50 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.105
+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.3.105
+Problem:    Can't get the value of "b:changedtick" with getbufvar().
+Solution:   Make it work. (Christian Brabandt)
+Files:      src/eval.c
+
+
+*** ../vim-7.3.104/src/eval.c	2011-01-17 20:08:03.000000000 +0100
+--- src/eval.c	2011-01-22 01:10:42.000000000 +0100
+***************
+*** 10866,10871 ****
+--- 10866,10876 ----
+  
+  	if (*varname == '&')	/* buffer-local-option */
+  	    get_option_tv(&varname, rettv, TRUE);
++ 	else if (STRCMP(varname, "changedtick") == 0)
++ 	{
++ 	    rettv->v_type = VAR_NUMBER;
++ 	    rettv->vval.v_number = curbuf->b_changedtick;
++ 	}
+  	else
+  	{
+  	    if (*varname == NUL)
+*** ../vim-7.3.104/src/version.c	2011-01-22 00:58:15.000000000 +0100
+--- src/version.c	2011-01-22 01:13:19.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     105,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+133. You communicate with people on other continents more than you
+     do with your own neighbors.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.106 b/source/ap/vim/patches/7.3.106
new file mode 100644
index 00000000..f98df307
--- /dev/null
+++ b/source/ap/vim/patches/7.3.106
@@ -0,0 +1,58 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.106
+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.3.106
+Problem:    When 'cursorbind' is set another window may scroll unexpectedly
+            when 'scrollbind' is also set. (Xavier Wang)
+Solution:   Don't call update_topline() if 'scrollbind' is set.
+Files:      src/move.c
+
+
+*** ../vim-7.3.105/src/move.c	2010-08-15 21:57:29.000000000 +0200
+--- src/move.c	2011-01-22 20:58:50.000000000 +0100
+***************
+*** 2882,2890 ****
+  	    if (has_mbyte)
+  		mb_adjust_cursor();
+  # endif
+- 
+  	    redraw_later(VALID);
+! 	    update_topline();
+  # ifdef FEAT_WINDOWS
+  	    curwin->w_redr_status = TRUE;
+  # endif
+--- 2882,2892 ----
+  	    if (has_mbyte)
+  		mb_adjust_cursor();
+  # endif
+  	    redraw_later(VALID);
+! 
+! 	    /* Only scroll when 'scrollbind' hasn't done this. */
+! 	    if (!curwin->w_p_scb)
+! 		update_topline();
+  # ifdef FEAT_WINDOWS
+  	    curwin->w_redr_status = TRUE;
+  # endif
+*** ../vim-7.3.105/src/version.c	2011-01-22 01:13:33.000000000 +0100
+--- src/version.c	2011-01-22 21:03:21.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     106,
+  /**/
+
+-- 
+Never eat yellow snow.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.107 b/source/ap/vim/patches/7.3.107
new file mode 100644
index 00000000..1256b817
--- /dev/null
+++ b/source/ap/vim/patches/7.3.107
@@ -0,0 +1,58 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.107
+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.3.107
+Problem:    Year number for :undolist can be confused with month or day.
+Solution:   Change "%y" to "%Y".
+Files:      src/undo.c
+
+
+*** ../vim-7.3.106/src/undo.c	2011-01-22 00:11:42.000000000 +0100
+--- src/undo.c	2011-01-22 00:03:58.000000000 +0100
+***************
+*** 2884,2890 ****
+  	    (void)strftime((char *)buf, buflen, "%m/%d %H:%M:%S", curtime);
+  	else
+  	    /* long ago */
+! 	    (void)strftime((char *)buf, buflen, "%y/%m/%d %H:%M:%S", curtime);
+      }
+      else
+  #endif
+--- 2884,2890 ----
+  	    (void)strftime((char *)buf, buflen, "%m/%d %H:%M:%S", curtime);
+  	else
+  	    /* long ago */
+! 	    (void)strftime((char *)buf, buflen, "%Y/%m/%d %H:%M:%S", curtime);
+      }
+      else
+  #endif
+*** ../vim-7.3.106/src/version.c	2011-01-22 21:05:02.000000000 +0100
+--- src/version.c	2011-01-22 21:24:07.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     107,
+  /**/
+
+-- 
+"The sun oozed over the horizon, shoved aside darkness, crept along the
+greensward, and, with sickly fingers, pushed through the castle window,
+revealing the pillaged princess, hand at throat, crown asunder, gaping
+in frenzied horror at the sated, sodden amphibian lying beside her,
+disbelieving the magnitude of the frog's deception, screaming madly,
+"You lied!"
+    - Winner of the Bulwer-Lytton contest (San Jose State University),
+      wherein one writes only the first line of a bad novel
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.108 b/source/ap/vim/patches/7.3.108
new file mode 100644
index 00000000..91f3ceb9
--- /dev/null
+++ b/source/ap/vim/patches/7.3.108
@@ -0,0 +1,111 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.108
+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.3.108
+Problem:    Useless check for NULL when calling vim_free().
+Solution:   Remove the check. (Dominique Pelle)
+Files:	    src/eval.c, src/ex_cmds.c, src/os_win32.c
+
+
+*** ../vim-7.3.107/src/eval.c	2011-01-22 01:13:33.000000000 +0100
+--- src/eval.c	2011-01-30 21:37:53.000000000 +0100
+***************
+*** 5106,5114 ****
+  	    else
+  		ret = OK;
+  	}
+! 
+! 	if (alias != NULL)
+! 	    vim_free(alias);
+      }
+  
+      *arg = skipwhite(*arg);
+--- 5106,5112 ----
+  	    else
+  		ret = OK;
+  	}
+! 	vim_free(alias);
+      }
+  
+      *arg = skipwhite(*arg);
+***************
+*** 19807,19813 ****
+  	    EMSG2(_("E704: Funcref variable name must start with a capital: %s"), name);
+  	    return;
+  	}
+! 	/* Don't allow hiding a function.  When "v" is not NULL we migth be
+  	 * assigning another function to the same var, the type is checked
+  	 * below. */
+  	if (v == NULL && function_exists(name))
+--- 19805,19811 ----
+  	    EMSG2(_("E704: Funcref variable name must start with a capital: %s"), name);
+  	    return;
+  	}
+! 	/* Don't allow hiding a function.  When "v" is not NULL we might be
+  	 * assigning another function to the same var, the type is checked
+  	 * below. */
+  	if (v == NULL && function_exists(name))
+*** ../vim-7.3.107/src/ex_cmds.c	2010-12-17 18:06:00.000000000 +0100
+--- src/ex_cmds.c	2011-01-30 21:37:53.000000000 +0100
+***************
+*** 5412,5418 ****
+      vir_T	*virp;
+      int		force;
+  {
+!     if (old_sub != NULL && force)
+  	vim_free(old_sub);
+      if (force || old_sub == NULL)
+  	old_sub = viminfo_readstring(virp, 1, TRUE);
+--- 5412,5418 ----
+      vir_T	*virp;
+      int		force;
+  {
+!     if (force)
+  	vim_free(old_sub);
+      if (force || old_sub == NULL)
+  	old_sub = viminfo_readstring(virp, 1, TRUE);
+*** ../vim-7.3.107/src/os_win32.c	2010-12-17 20:23:56.000000000 +0100
+--- src/os_win32.c	2011-01-30 21:37:53.000000000 +0100
+***************
+*** 1886,1893 ****
+  	cb->BufferSize.X = cb->Info.dwSize.X;
+  	cb->BufferSize.Y = cb->Info.dwSize.Y;
+  	NumCells = cb->BufferSize.X * cb->BufferSize.Y;
+! 	if (cb->Buffer != NULL)
+! 	    vim_free(cb->Buffer);
+  	cb->Buffer = (PCHAR_INFO)alloc(NumCells * sizeof(CHAR_INFO));
+  	if (cb->Buffer == NULL)
+  	    return FALSE;
+--- 1886,1892 ----
+  	cb->BufferSize.X = cb->Info.dwSize.X;
+  	cb->BufferSize.Y = cb->Info.dwSize.Y;
+  	NumCells = cb->BufferSize.X * cb->BufferSize.Y;
+! 	vim_free(cb->Buffer);
+  	cb->Buffer = (PCHAR_INFO)alloc(NumCells * sizeof(CHAR_INFO));
+  	if (cb->Buffer == NULL)
+  	    return FALSE;
+*** ../vim-7.3.107/src/version.c	2011-01-22 21:25:07.000000000 +0100
+--- src/version.c	2011-02-01 13:47:07.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     108,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+173. You keep tracking down the email addresses of all your friends
+     (even childhood friends).
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.109 b/source/ap/vim/patches/7.3.109
new file mode 100644
index 00000000..ce35fb0a
--- /dev/null
+++ b/source/ap/vim/patches/7.3.109
@@ -0,0 +1,266 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.109
+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.3.109
+Problem:    Processing new Esperanto spell file fails and crashes Vim.
+	    (Dominique Pelle)
+Solution:   When running out of memory give an error.  Handle '?' in
+	    COMPOUNDRULE properly.
+Files:	    src/spell.c
+
+
+*** ../vim-7.3.108/src/spell.c	2010-12-17 18:06:00.000000000 +0100
+--- src/spell.c	2011-02-01 13:43:52.000000000 +0100
+***************
+*** 3634,3640 ****
+  	}
+  
+  	/* Add all flags to "sl_compallflags". */
+! 	if (vim_strchr((char_u *)"+*[]/", c) == NULL
+  		&& !byte_in_str(slang->sl_compallflags, c))
+  	{
+  	    *ap++ = c;
+--- 3634,3640 ----
+  	}
+  
+  	/* Add all flags to "sl_compallflags". */
+! 	if (vim_strchr((char_u *)"?*+[]/", c) == NULL
+  		&& !byte_in_str(slang->sl_compallflags, c))
+  	{
+  	    *ap++ = c;
+***************
+*** 3664,3670 ****
+  	/* 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;
+--- 3664,3670 ----
+  	/* Copy flag to "sl_comprules", unless we run into a wildcard. */
+  	if (crp != NULL)
+  	{
+! 	    if (c == '?' || c == '+' || c == '*')
+  	    {
+  		vim_free(slang->sl_comprules);
+  		slang->sl_comprules = NULL;
+***************
+*** 3682,3689 ****
+  	}
+  	else		    /* normal char, "[abc]" and '*' are copied as-is */
+  	{
+! 	    if (c == '+' || c == '~')
+! 		*pp++ = '\\';	    /* "a+" becomes "a\+" */
+  #ifdef FEAT_MBYTE
+  	    if (enc_utf8)
+  		pp += mb_char2bytes(c, pp);
+--- 3682,3689 ----
+  	}
+  	else		    /* normal char, "[abc]" and '*' are copied as-is */
+  	{
+! 	    if (c == '?' || c == '+' || c == '~')
+! 		*pp++ = '\\';	    /* "a?" becomes "a\?", "a+" becomes "a\+" */
+  #ifdef FEAT_MBYTE
+  	    if (enc_utf8)
+  		pp += mb_char2bytes(c, pp);
+***************
+*** 4951,4956 ****
+--- 4951,4958 ----
+  
+      sblock_T	*si_blocks;	/* memory blocks used */
+      long	si_blocks_cnt;	/* memory blocks allocated */
++     int		si_did_emsg;	/* TRUE when ran out of memory */
++ 
+      long	si_compress_cnt;    /* words to add before lowering
+  				       compression limit */
+      wordnode_T	*si_first_free; /* List of nodes that have been freed during
+***************
+*** 5477,5497 ****
+  	    }
+  	    else if (is_aff_rule(items, itemcnt, "COMPOUNDRULE", 2))
+  	    {
+! 		/* Concatenate this string to previously defined ones, using a
+! 		 * slash to separate them. */
+! 		l = (int)STRLEN(items[1]) + 1;
+! 		if (compflags != NULL)
+! 		    l += (int)STRLEN(compflags) + 1;
+! 		p = getroom(spin, l, FALSE);
+! 		if (p != NULL)
+  		{
+  		    if (compflags != NULL)
+  		    {
+! 			STRCPY(p, compflags);
+! 			STRCAT(p, "/");
+  		    }
+- 		    STRCAT(p, items[1]);
+- 		    compflags = p;
+  		}
+  	    }
+  	    else if (is_aff_rule(items, itemcnt, "COMPOUNDWORDMAX", 2)
+--- 5479,5503 ----
+  	    }
+  	    else if (is_aff_rule(items, itemcnt, "COMPOUNDRULE", 2))
+  	    {
+! 		/* Don't use the first rule if it is a number. */
+! 		if (compflags != NULL || *skipdigits(items[1]) != NUL)
+  		{
++ 		    /* Concatenate this string to previously defined ones,
++ 		     * using a slash to separate them. */
++ 		    l = (int)STRLEN(items[1]) + 1;
+  		    if (compflags != NULL)
++ 			l += (int)STRLEN(compflags) + 1;
++ 		    p = getroom(spin, l, FALSE);
++ 		    if (p != NULL)
+  		    {
+! 			if (compflags != NULL)
+! 			{
+! 			    STRCPY(p, compflags);
+! 			    STRCAT(p, "/");
+! 			}
+! 			STRCAT(p, items[1]);
+! 			compflags = p;
+  		    }
+  		}
+  	    }
+  	    else if (is_aff_rule(items, itemcnt, "COMPOUNDWORDMAX", 2)
+***************
+*** 6291,6297 ****
+  
+      for (p = compflags; *p != NUL; )
+      {
+! 	if (vim_strchr((char_u *)"/*+[]", *p) != NULL)
+  	    /* Copy non-flag characters directly. */
+  	    *tp++ = *p++;
+  	else
+--- 6297,6303 ----
+  
+      for (p = compflags; *p != NUL; )
+      {
+! 	if (vim_strchr((char_u *)"/?*+[]", *p) != NULL)
+  	    /* Copy non-flag characters directly. */
+  	    *tp++ = *p++;
+  	else
+***************
+*** 6320,6326 ****
+  		    {
+  			check_renumber(spin);
+  			id = spin->si_newcompID--;
+! 		    } while (vim_strchr((char_u *)"/+*[]\\-^", id) != NULL);
+  		    ci->ci_newID = id;
+  		    hash_add(&aff->af_comp, ci->ci_key);
+  		}
+--- 6326,6332 ----
+  		    {
+  			check_renumber(spin);
+  			id = spin->si_newcompID--;
+! 		    } while (vim_strchr((char_u *)"/?*+[]\\-^", id) != NULL);
+  		    ci->ci_newID = id;
+  		    hash_add(&aff->af_comp, ci->ci_key);
+  		}
+***************
+*** 7364,7373 ****
+  
+      if (bl == NULL || bl->sb_used + len > SBLOCKSIZE)
+      {
+! 	/* Allocate a block of memory. This is not freed until much later. */
+! 	bl = (sblock_T *)alloc_clear((unsigned)(sizeof(sblock_T) + SBLOCKSIZE));
+  	if (bl == NULL)
+  	    return NULL;
+  	bl->sb_next = spin->si_blocks;
+  	spin->si_blocks = bl;
+  	bl->sb_used = 0;
+--- 7370,7390 ----
+  
+      if (bl == NULL || bl->sb_used + len > SBLOCKSIZE)
+      {
+! 	if (len >= SBLOCKSIZE)
+! 	    bl = NULL;
+! 	else
+! 	    /* Allocate a block of memory. It is not freed until much later. */
+! 	    bl = (sblock_T *)alloc_clear(
+! 				   (unsigned)(sizeof(sblock_T) + SBLOCKSIZE));
+  	if (bl == NULL)
++ 	{
++ 	    if (!spin->si_did_emsg)
++ 	    {
++ 		EMSG(_("E845: Insufficient memory, word list will be incomplete"));
++ 		spin->si_did_emsg = TRUE;
++ 	    }
+  	    return NULL;
++ 	}
+  	bl->sb_next = spin->si_blocks;
+  	spin->si_blocks = bl;
+  	bl->sb_used = 0;
+***************
+*** 7382,7387 ****
+--- 7399,7405 ----
+  
+  /*
+   * Make a copy of a string into memory allocated with getroom().
++  * Returns NULL when out of memory.
+   */
+      static char_u *
+  getroom_save(spin, s)
+***************
+*** 7416,7421 ****
+--- 7434,7440 ----
+  
+  /*
+   * Allocate the root of a word tree.
++  * Returns NULL when out of memory.
+   */
+      static wordnode_T *
+  wordtree_alloc(spin)
+***************
+*** 7700,7705 ****
+--- 7719,7725 ----
+  /*
+   * Get a wordnode_T, either from the list of previously freed nodes or
+   * allocate a new one.
++  * Returns NULL when out of memory.
+   */
+      static wordnode_T *
+  get_wordnode(spin)
+***************
+*** 7717,7723 ****
+  	--spin->si_free_count;
+      }
+  #ifdef SPELL_PRINTTREE
+!     n->wn_nr = ++spin->si_wordnode_nr;
+  #endif
+      return n;
+  }
+--- 7737,7744 ----
+  	--spin->si_free_count;
+      }
+  #ifdef SPELL_PRINTTREE
+!     if (n != NULL)
+! 	n->wn_nr = ++spin->si_wordnode_nr;
+  #endif
+      return n;
+  }
+*** ../vim-7.3.108/src/version.c	2011-02-01 13:48:47.000000000 +0100
+--- src/version.c	2011-02-01 13:56:38.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     109,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+174. You know what a listserv is.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.110 b/source/ap/vim/patches/7.3.110
new file mode 100644
index 00000000..3ffc7f2c
--- /dev/null
+++ b/source/ap/vim/patches/7.3.110
@@ -0,0 +1,76 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.110
+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.3.110
+Problem:    The "nbsp" item in 'listchars' isn't used for ":list".
+Solution:   Make it work. (Christian Brabandt)
+Files:	    src/message.c
+
+
+*** ../vim-7.3.109/src/message.c	2011-01-17 20:08:03.000000000 +0100
+--- src/message.c	2011-02-01 17:06:21.000000000 +0100
+***************
+*** 1637,1644 ****
+  	else if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1)
+  	{
+  	    col += (*mb_ptr2cells)(s);
+! 	    mch_memmove(buf, s, (size_t)l);
+! 	    buf[l] = NUL;
+  	    msg_puts(buf);
+  	    s += l;
+  	    continue;
+--- 1637,1652 ----
+  	else if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1)
+  	{
+  	    col += (*mb_ptr2cells)(s);
+! 	    if (lcs_nbsp != NUL && list && mb_ptr2char(s) == 160)
+! 	    {
+! 		mb_char2bytes(lcs_nbsp, buf);
+! 		buf[(*mb_ptr2len)(buf)] = NUL;
+! 	    }
+! 	    else
+! 	    {
+! 		mch_memmove(buf, s, (size_t)l);
+! 		buf[l] = NUL;
+! 	    }
+  	    msg_puts(buf);
+  	    s += l;
+  	    continue;
+***************
+*** 1664,1669 ****
+--- 1672,1682 ----
+  		    attr = hl_attr(HLF_8);
+  		}
+  	    }
++ 	    else if (c == 160 && list && lcs_nbsp != NUL)
++ 	    {
++ 		c = lcs_nbsp;
++ 		attr = hl_attr(HLF_8);
++ 	    }
+  	    else if (c == NUL && list && lcs_eol != NUL)
+  	    {
+  		p_extra = (char_u *)"";
+*** ../vim-7.3.109/src/version.c	2011-02-01 13:59:44.000000000 +0100
+--- src/version.c	2011-02-01 17:08:31.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     110,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+176. You lie, even to user-friends, about how long you were online yesterday.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.111 b/source/ap/vim/patches/7.3.111
new file mode 100644
index 00000000..e3cf717c
--- /dev/null
+++ b/source/ap/vim/patches/7.3.111
@@ -0,0 +1,121 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.111
+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.3.111 (after 7.3.100)
+Problem:    Executing a :normal command in 'statusline' evaluation causes the
+	    cursor to move. (Dominique Pelle)
+Solution:   When updating the cursor for 'cursorbind' allow the cursor beyond
+	    the end of the line.  When evaluating 'statusline' temporarily
+	    reset 'cursorbind'.
+Files:	    src/move.c, src/screen.c
+
+
+*** ../vim-7.3.110/src/move.c	2011-01-22 21:05:02.000000000 +0100
+--- src/move.c	2011-02-01 17:36:10.000000000 +0100
+***************
+*** 2846,2851 ****
+--- 2846,2852 ----
+      colnr_T	col =  curwin->w_cursor.col;
+      win_T	*old_curwin = curwin;
+      buf_T	*old_curbuf = curbuf;
++     int		restart_edit_save;
+  # ifdef FEAT_VISUAL
+      int		old_VIsual_select = VIsual_select;
+      int		old_VIsual_active = VIsual_active;
+***************
+*** 2875,2882 ****
+  		curwin->w_cursor.lnum = line;
+  	    curwin->w_cursor.col = col;
+  
+! 	    /* Make sure the cursor is in a valid position. */
+  	    check_cursor();
+  # ifdef FEAT_MBYTE
+  	    /* Correct cursor for multi-byte character. */
+  	    if (has_mbyte)
+--- 2876,2887 ----
+  		curwin->w_cursor.lnum = line;
+  	    curwin->w_cursor.col = col;
+  
+! 	    /* Make sure the cursor is in a valid position.  Temporarily set
+! 	     * "restart_edit" to allow the cursor to be beyond the EOL. */
+! 	    restart_edit_save = restart_edit;
+! 	    restart_edit = TRUE;
+  	    check_cursor();
++ 	    restart_edit = restart_edit_save;
+  # ifdef FEAT_MBYTE
+  	    /* Correct cursor for multi-byte character. */
+  	    if (has_mbyte)
+*** ../vim-7.3.110/src/screen.c	2010-12-30 14:57:03.000000000 +0100
+--- src/screen.c	2011-02-01 17:45:45.000000000 +0100
+***************
+*** 6435,6440 ****
+--- 6435,6442 ----
+      struct	stl_hlrec hltab[STL_MAX_ITEM];
+      struct	stl_hlrec tabtab[STL_MAX_ITEM];
+      int		use_sandbox = FALSE;
++     win_T	*ewp;
++     int		p_crb_save;
+  
+      /* setup environment for the task at hand */
+      if (wp == NULL)
+***************
+*** 6513,6526 ****
+      if (maxwidth <= 0)
+  	return;
+  
+      /* Make a copy, because the statusline may include a function call that
+       * might change the option value and free the memory. */
+      stl = vim_strsave(stl);
+!     width = build_stl_str_hl(wp == NULL ? curwin : wp,
+! 				buf, sizeof(buf),
+  				stl, use_sandbox,
+  				fillchar, maxwidth, hltab, tabtab);
+      vim_free(stl);
+  
+      /* Make all characters printable. */
+      p = transstr(buf);
+--- 6515,6534 ----
+      if (maxwidth <= 0)
+  	return;
+  
++     /* Temporarily reset 'cursorbind', we don't want a side effect from moving
++      * the cursor away and back. */
++     ewp = wp == NULL ? curwin : wp;
++     p_crb_save = ewp->w_p_crb;
++     ewp->w_p_crb = FALSE;
++ 
+      /* Make a copy, because the statusline may include a function call that
+       * might change the option value and free the memory. */
+      stl = vim_strsave(stl);
+!     width = build_stl_str_hl(ewp, buf, sizeof(buf),
+  				stl, use_sandbox,
+  				fillchar, maxwidth, hltab, tabtab);
+      vim_free(stl);
++     ewp->w_p_crb = p_crb_save;
+  
+      /* Make all characters printable. */
+      p = transstr(buf);
+*** ../vim-7.3.110/src/version.c	2011-02-01 17:12:20.000000000 +0100
+--- src/version.c	2011-02-01 18:00:14.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     111,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+177. You log off of your system because it's time to go to work.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.112 b/source/ap/vim/patches/7.3.112
new file mode 100644
index 00000000..af9b8818
--- /dev/null
+++ b/source/ap/vim/patches/7.3.112
@@ -0,0 +1,63 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.112
+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.3.112
+Problem:    Setting 'statusline' to "%!'asdf%' reads uninitialized memory.
+Solution:   Check for NUL after %.
+Files:	    src/buffer.c
+
+
+*** ../vim-7.3.111/src/buffer.c	2010-10-27 16:17:56.000000000 +0200
+--- src/buffer.c	2011-02-01 21:40:17.000000000 +0100
+***************
+*** 3364,3370 ****
+   * 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[] */
+--- 3364,3371 ----
+   * 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[] */
+***************
+*** 3474,3479 ****
+--- 3475,3482 ----
+  	 * Handle one '%' item.
+  	 */
+  	s++;
++ 	if (*s == NUL)  /* ignore trailing % */
++ 	    break;
+  	if (*s == '%')
+  	{
+  	    if (p + 1 >= out + outlen)
+*** ../vim-7.3.111/src/version.c	2011-02-01 18:01:06.000000000 +0100
+--- src/version.c	2011-02-01 21:54:01.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     112,
+  /**/
+
+-- 
+Rule #1: Don't give somebody a tool that he's going to hurt himself with.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.113 b/source/ap/vim/patches/7.3.113
new file mode 100644
index 00000000..a4383ad9
--- /dev/null
+++ b/source/ap/vim/patches/7.3.113
@@ -0,0 +1,55 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.113
+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.3.113
+Problem:    Windows: Fall back directory for creating temp file is wrong.
+Solution:   Use "." instead of empty string. (Hong Xu)
+Files:	    src/fileio.c
+
+
+*** ../vim-7.3.112/src/fileio.c	2011-01-17 20:08:03.000000000 +0100
+--- src/fileio.c	2011-02-06 13:14:25.000000000 +0100
+***************
+*** 7459,7465 ****
+  
+      STRCPY(itmp, "");
+      if (GetTempPath(_MAX_PATH, szTempFile) == 0)
+! 	szTempFile[0] = NUL;	/* GetTempPath() failed, use current dir */
+      strcpy(buf4, "VIM");
+      buf4[2] = extra_char;   /* make it "VIa", "VIb", etc. */
+      if (GetTempFileName(szTempFile, buf4, 0, itmp) == 0)
+--- 7459,7468 ----
+  
+      STRCPY(itmp, "");
+      if (GetTempPath(_MAX_PATH, szTempFile) == 0)
+!     {
+! 	szTempFile[0] = '.';	/* GetTempPath() failed, use current dir */
+! 	szTempFile[1] = NUL;
+!     }
+      strcpy(buf4, "VIM");
+      buf4[2] = extra_char;   /* make it "VIa", "VIb", etc. */
+      if (GetTempFileName(szTempFile, buf4, 0, itmp) == 0)
+*** ../vim-7.3.112/src/version.c	2011-02-01 21:54:56.000000000 +0100
+--- src/version.c	2011-02-09 14:46:12.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     113,
+  /**/
+
+-- 
+'Psychologist' -- Someone who looks at everyone else when
+an attractive woman enters the room.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.114 b/source/ap/vim/patches/7.3.114
new file mode 100644
index 00000000..34bdd364
--- /dev/null
+++ b/source/ap/vim/patches/7.3.114
@@ -0,0 +1,50 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.114
+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.3.114
+Problem:    Potential problem in initialization when giving an error message
+	    early.
+Solution:   Initialize 'verbosefile' empty. (Ben Schmidt)
+Files:	    src/option.h
+
+
+*** ../vim-7.3.113/src/option.h	2010-12-02 16:01:23.000000000 +0100
+--- src/option.h	2011-02-09 15:37:36.000000000 +0100
+***************
+*** 854,860 ****
+--- 854,864 ----
+  # define VE_ONEMORE	8
+  #endif
+  EXTERN long	p_verbose;	/* 'verbose' */
++ #ifdef IN_OPTION_C
++ char_u	*p_vfile = (char_u *)""; /* used before options are initialized */
++ #else
+  EXTERN char_u	*p_vfile;	/* 'verbosefile' */
++ #endif
+  EXTERN int	p_warn;		/* 'warn' */
+  #ifdef FEAT_CMDL_COMPL
+  EXTERN char_u	*p_wop;		/* 'wildoptions' */
+*** ../vim-7.3.113/src/version.c	2011-02-09 14:46:58.000000000 +0100
+--- src/version.c	2011-02-09 15:46:17.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     114,
+  /**/
+
+-- 
+From the classified section of a city newspaper:
+Dog for sale: eats anything and is fond of children.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.115 b/source/ap/vim/patches/7.3.115
new file mode 100644
index 00000000..dd36df30
--- /dev/null
+++ b/source/ap/vim/patches/7.3.115
@@ -0,0 +1,58 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.115
+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.3.115
+Problem:    Vim can crash when tmpnam() returns NULL.
+Solution:   Check for NULL. (Hong Xu)
+Files:	    src/fileio.c
+
+
+*** ../vim-7.3.114/src/fileio.c	2011-02-09 14:46:58.000000000 +0100
+--- src/fileio.c	2011-02-09 16:14:35.000000000 +0100
+***************
+*** 7483,7490 ****
+  # else /* WIN3264 */
+  
+  #  ifdef USE_TMPNAM
+      /* tmpnam() will make its own name */
+!     if (*tmpnam((char *)itmp) == NUL)
+  	return NULL;
+  #  else
+      char_u	*p;
+--- 7483,7493 ----
+  # else /* WIN3264 */
+  
+  #  ifdef USE_TMPNAM
++     char_u	*p;
++ 
+      /* tmpnam() will make its own name */
+!     p = tmpnam((char *)itmp);
+!     if (p == NULL || *p == NUL)
+  	return NULL;
+  #  else
+      char_u	*p;
+*** ../vim-7.3.114/src/version.c	2011-02-09 15:59:32.000000000 +0100
+--- src/version.c	2011-02-09 16:44:11.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     115,
+  /**/
+
+-- 
+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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.116 b/source/ap/vim/patches/7.3.116
new file mode 100644
index 00000000..ee9543af
--- /dev/null
+++ b/source/ap/vim/patches/7.3.116
@@ -0,0 +1,58 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.116
+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.3.116
+Problem:    'cursorline' is displayed too short when there are concealed
+	    characters and 'list' is set.  (Dennis Preiser)
+Solution:   Check for 'cursorline' when 'list' is set. (Christian Brabandt)
+Files:	    src/screen.c
+
+
+*** ../vim-7.3.115/src/screen.c	2011-02-01 18:01:06.000000000 +0100
+--- src/screen.c	2011-02-09 16:59:28.000000000 +0100
+***************
+*** 5099,5105 ****
+  #ifdef FEAT_DIFF
+  		    || filler_todo > 0
+  #endif
+! 		    || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str)
+  		    || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL)))
+  		)
+  	{
+--- 5099,5109 ----
+  #ifdef FEAT_DIFF
+  		    || filler_todo > 0
+  #endif
+! 		    || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str
+! #ifdef FEAT_SYN_HL
+! 			   && !wp->w_p_cul
+! #endif
+! 			)
+  		    || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL)))
+  		)
+  	{
+*** ../vim-7.3.115/src/version.c	2011-02-09 16:44:45.000000000 +0100
+--- src/version.c	2011-02-09 17:08:58.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     116,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+219. Your spouse has his or her lawyer deliver the divorce papers...
+     via e-mail.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.117 b/source/ap/vim/patches/7.3.117
new file mode 100644
index 00000000..19fcf739
--- /dev/null
+++ b/source/ap/vim/patches/7.3.117
@@ -0,0 +1,89 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.117
+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.3.117
+Problem:    On some systems --as-needed does not work, because the "tinfo"
+	    library is included indirectly from "ncurses". (Charles Campbell)
+Solution:   In configure prefer using "tinfo" instead of "ncurses".
+Files:	    src/configure.in, src/auto/configure
+
+
+*** ../vim-7.3.116/src/configure.in	2010-11-16 19:25:56.000000000 +0100
+--- src/configure.in	2011-02-09 17:28:16.000000000 +0100
+***************
+*** 2618,2630 ****
+    AC_MSG_RESULT([empty: automatic terminal library selection])
+    dnl  On HP-UX 10.10 termcap or termlib should be used instead of
+    dnl  curses, because curses is much slower.
+!   dnl  Newer versions of ncurses are preferred over anything.
+    dnl  Older versions of ncurses have bugs, get a new one!
+    dnl  Digital Unix (OSF1) should use curses (Ronald Schild).
+    dnl  On SCO Openserver should prefer termlib (Roger Cornelius).
+    case "`uname -s 2>/dev/null`" in
+! 	OSF1|SCO_SV)	tlibs="ncurses curses termlib termcap";;
+! 	*)	tlibs="ncurses termlib termcap curses";;
+    esac
+    for libname in $tlibs; do
+      AC_CHECK_LIB(${libname}, tgetent,,)
+--- 2618,2631 ----
+    AC_MSG_RESULT([empty: automatic terminal library selection])
+    dnl  On HP-UX 10.10 termcap or termlib should be used instead of
+    dnl  curses, because curses is much slower.
+!   dnl  Newer versions of ncurses are preferred over anything, except
+!   dnl  when tinfo has been split off, it conains all we need.
+    dnl  Older versions of ncurses have bugs, get a new one!
+    dnl  Digital Unix (OSF1) should use curses (Ronald Schild).
+    dnl  On SCO Openserver should prefer termlib (Roger Cornelius).
+    case "`uname -s 2>/dev/null`" in
+! 	OSF1|SCO_SV)	tlibs="tinfo ncurses curses termlib termcap";;
+! 	*)	tlibs="tinfo ncurses termlib termcap curses";;
+    esac
+    for libname in $tlibs; do
+      AC_CHECK_LIB(${libname}, tgetent,,)
+*** ../vim-7.3.116/src/auto/configure	2010-11-16 19:25:56.000000000 +0100
+--- src/auto/configure	2011-02-09 17:29:13.000000000 +0100
+***************
+*** 9886,9894 ****
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: empty: automatic terminal library selection" >&5
+  $as_echo "empty: automatic terminal library selection" >&6; }
+!               case "`uname -s 2>/dev/null`" in
+! 	OSF1|SCO_SV)	tlibs="ncurses curses termlib termcap";;
+! 	*)	tlibs="ncurses termlib termcap curses";;
+    esac
+    for libname in $tlibs; do
+      as_ac_Lib=`$as_echo "ac_cv_lib_${libname}''_tgetent" | $as_tr_sh`
+--- 9886,9894 ----
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: empty: automatic terminal library selection" >&5
+  $as_echo "empty: automatic terminal library selection" >&6; }
+!                 case "`uname -s 2>/dev/null`" in
+! 	OSF1|SCO_SV)	tlibs="tinfo ncurses curses termlib termcap";;
+! 	*)	tlibs="tinfo ncurses termlib termcap curses";;
+    esac
+    for libname in $tlibs; do
+      as_ac_Lib=`$as_echo "ac_cv_lib_${libname}''_tgetent" | $as_tr_sh`
+*** ../vim-7.3.116/src/version.c	2011-02-09 17:09:26.000000000 +0100
+--- src/version.c	2011-02-09 17:41:37.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     117,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+220. Your wife asks for sex and you tell her where to find you on IRC.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.118 b/source/ap/vim/patches/7.3.118
new file mode 100644
index 00000000..fecb948b
--- /dev/null
+++ b/source/ap/vim/patches/7.3.118
@@ -0,0 +1,69 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.118
+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.3.118
+Problem:    Ruby uses SIGVTALARM which makes Vim exit. (Alec Tica)
+Solution:   Ignore SIGVTALARM. (Dominique Pelle)
+Files:	    src/os_unix.c
+
+
+*** ../vim-7.3.117/src/os_unix.c	2010-12-17 16:27:10.000000000 +0100
+--- src/os_unix.c	2011-02-09 18:19:57.000000000 +0100
+***************
+*** 283,289 ****
+  #ifdef SIGTERM
+      {SIGTERM,	    "TERM",	TRUE},
+  #endif
+! #ifdef SIGVTALRM
+      {SIGVTALRM,	    "VTALRM",	TRUE},
+  #endif
+  #if defined(SIGPROF) && !defined(FEAT_MZSCHEME) && !defined(WE_ARE_PROFILING)
+--- 283,289 ----
+  #ifdef SIGTERM
+      {SIGTERM,	    "TERM",	TRUE},
+  #endif
+! #if defined(SIGVTALRM) && !defined(FEAT_RUBY)
+      {SIGVTALRM,	    "VTALRM",	TRUE},
+  #endif
+  #if defined(SIGPROF) && !defined(FEAT_MZSCHEME) && !defined(WE_ARE_PROFILING)
+***************
+*** 1107,1113 ****
+   * 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);
+--- 1107,1113 ----
+   * On Linux, signal is not always handled immediately either.
+   * See https://bugs.launchpad.net/bugs/291373
+   *
+!  * volatile because it is used in signal handler sigcont_handler().
+   */
+  static volatile int sigcont_received;
+  static RETSIGTYPE sigcont_handler __ARGS(SIGPROTOARG);
+*** ../vim-7.3.117/src/version.c	2011-02-09 17:42:53.000000000 +0100
+--- src/version.c	2011-02-09 18:46:53.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     118,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+221. Your wife melts your keyboard in the oven.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.119 b/source/ap/vim/patches/7.3.119
new file mode 100644
index 00000000..1547625d
--- /dev/null
+++ b/source/ap/vim/patches/7.3.119
@@ -0,0 +1,52 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.1
+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.3.119
+Problem:    Build problem on Mac. (Nicholas Stallard)
+Solution:   Use "extern" instead of "EXTERN" for p_vfile.
+Files:	    src/option.h
+
+
+*** ../vim-7.3.118/src/option.h	2011-02-09 15:59:32.000000000 +0100
+--- src/option.h	2011-02-12 13:56:50.000000000 +0100
+***************
+*** 857,863 ****
+  #ifdef IN_OPTION_C
+  char_u	*p_vfile = (char_u *)""; /* used before options are initialized */
+  #else
+! EXTERN char_u	*p_vfile;	/* 'verbosefile' */
+  #endif
+  EXTERN int	p_warn;		/* 'warn' */
+  #ifdef FEAT_CMDL_COMPL
+--- 857,863 ----
+  #ifdef IN_OPTION_C
+  char_u	*p_vfile = (char_u *)""; /* used before options are initialized */
+  #else
+! extern char_u	*p_vfile;	/* 'verbosefile' */
+  #endif
+  EXTERN int	p_warn;		/* 'warn' */
+  #ifdef FEAT_CMDL_COMPL
+*** ../vim-7.3.118/src/version.c	2011-02-09 18:47:36.000000000 +0100
+--- src/version.c	2011-02-12 13:59:41.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     119,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+237. You tattoo your email address on your forehead.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.120 b/source/ap/vim/patches/7.3.120
new file mode 100644
index 00000000..04e2f633
--- /dev/null
+++ b/source/ap/vim/patches/7.3.120
@@ -0,0 +1,59 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.120
+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.3.120
+Problem:    The message for an existing swap file is too long to fit in a 25
+	    line terminal.
+Solution:   Make the message shorter. (Chad Miller)
+Files:	    src/memline.c
+
+
+*** ../vim-7.3.119/src/memline.c	2011-01-17 20:08:03.000000000 +0100
+--- src/memline.c	2011-02-13 14:18:08.000000000 +0100
+***************
+*** 4071,4079 ****
+      }
+      /* Some of these messages are long to allow translation to
+       * other languages. */
+!     MSG_PUTS(_("\n(1) Another program may be editing the same file.\n    If this is the case, be careful not to end up with two\n    different instances of the same file when making changes.\n"));
+!     MSG_PUTS(_("    Quit, or continue with caution.\n"));
+!     MSG_PUTS(_("\n(2) An edit session for this file crashed.\n"));
+      MSG_PUTS(_("    If this is the case, use \":recover\" or \"vim -r "));
+      msg_outtrans(buf->b_fname);
+      MSG_PUTS(_("\"\n    to recover the changes (see \":help recovery\").\n"));
+--- 4071,4079 ----
+      }
+      /* Some of these messages are long to allow translation to
+       * other languages. */
+!     MSG_PUTS(_("\n(1) Another program may be editing the same file.  If this is the case,\n    be careful not to end up with two different instances of the same\n    file when making changes."));
+!     MSG_PUTS(_("  Quit, or continue with caution.\n"));
+!     MSG_PUTS(_("(2) An edit session for this file crashed.\n"));
+      MSG_PUTS(_("    If this is the case, use \":recover\" or \"vim -r "));
+      msg_outtrans(buf->b_fname);
+      MSG_PUTS(_("\"\n    to recover the changes (see \":help recovery\").\n"));
+*** ../vim-7.3.119/src/version.c	2011-02-12 13:59:55.000000000 +0100
+--- src/version.c	2011-02-15 11:56:14.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     120,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+257. Your "hundred-and-one" lists include well over 101 items, since you
+     automatically interpret all numbers in hexadecimal notation.
+     (hex 101 = decimal 257)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.121 b/source/ap/vim/patches/7.3.121
new file mode 100644
index 00000000..f51a7747
--- /dev/null
+++ b/source/ap/vim/patches/7.3.121
@@ -0,0 +1,57 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.121
+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.3.121
+Problem:    Complicated 'statusline' causes a crash. (Christian Brabandt)
+Solution:   Check that the number of items is not too big.
+Files:	    src/buffer.c
+
+
+*** ../vim-7.3.120/src/buffer.c	2011-02-01 21:54:56.000000000 +0100
+--- src/buffer.c	2011-02-15 14:00:51.000000000 +0100
+***************
+*** 3460,3465 ****
+--- 3461,3478 ----
+      prevchar_isitem = FALSE;
+      for (s = usefmt; *s; )
+      {
++ 	if (curitem == STL_MAX_ITEM)
++ 	{
++ 	    /* There are too many items.  Add the error code to the statusline
++ 	     * to give the user a hint about what went wrong. */
++ 	    if (p + 6 < out + outlen)
++ 	    {
++ 		mch_memmove(p, " E541", (size_t)5);
++ 		p += 5;
++ 	    }
++ 	    break;
++ 	}
++ 
+  	if (*s != NUL && *s != '%')
+  	    prevchar_isflag = prevchar_isitem = FALSE;
+  
+*** ../vim-7.3.120/src/version.c	2011-02-15 11:56:56.000000000 +0100
+--- src/version.c	2011-02-15 14:23:39.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     121,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+265. Your reason for not staying in touch with family is that
+     they do not have e-mail addresses.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.122 b/source/ap/vim/patches/7.3.122
new file mode 100644
index 00000000..02e9759b
--- /dev/null
+++ b/source/ap/vim/patches/7.3.122
@@ -0,0 +1,100 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.122
+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.3.122
+Problem:    Having auto/config.mk in the repository causes problems.
+Solution:   Remove auto/config.mk from the distribution.  In the toplevel
+	    Makefile copy it from the "dist" file.
+Files:	    Makefile, src/Makefile, src/auto/config.mk
+
+
+*** ../vim-7.3.121/Makefile	2010-08-15 21:57:20.000000000 +0200
+--- Makefile	2011-02-12 14:28:09.000000000 +0100
+***************
+*** 23,28 ****
+--- 23,31 ----
+  # has run can result in compiling with $(CC) empty.
+  
+  first:
++ 	@if test ! -f src/auto/config.mk; then \
++ 		cp src/config.mk.dist src/auto/config.mk; \
++ 	fi
+  	@echo "Starting make in the src directory."
+  	@echo "If there are problems, cd to the src directory and run make there"
+  	cd src && $(MAKE) $@
+***************
+*** 30,35 ****
+--- 33,41 ----
+  # Some make programs use the last target for the $@ default; put the other
+  # targets separately to always let $@ expand to "first" by default.
+  all install uninstall tools config configure reconfig proto depend lint tags types test testclean clean distclean:
++ 	@if test ! -f src/auto/config.mk; then \
++ 		cp src/config.mk.dist src/auto/config.mk; \
++ 	fi
+  	@echo "Starting make in the src directory."
+  	@echo "If there are problems, cd to the src directory and run make there"
+  	cd src && $(MAKE) $@
+*** ../vim-7.3.121/src/Makefile	2010-11-03 22:32:18.000000000 +0100
+--- src/Makefile	2011-02-15 15:21:37.000000000 +0100
+***************
+*** 283,294 ****
+  
+  ######################## auto/config.mk ######################## {{{1
+  # At this position auto/config.mk is included. When starting from the
+! # distribution it is almost empty. After running auto/configure it contains
+! # settings that have been discovered for your system. Settings below this
+! # include override settings in auto/config.mk!
+! 
+! # Note: if auto/config.mk is lost somehow (e.g., because configure was
+! # interrupted), create an empty auto/config.mk file and do "make config".
+  
+  # (X) How to include auto/config.mk depends on the version of "make" you have,
+  #     if the current choice doesn't work, try the other one.
+--- 283,295 ----
+  
+  ######################## auto/config.mk ######################## {{{1
+  # At this position auto/config.mk is included. When starting from the
+! # toplevel Makefile it is almost empty. After running auto/configure it
+! # contains settings that have been discovered for your system. Settings below
+! # this include override settings in auto/config.mk!
+! 
+! # Note: If make fails because auto/config.mk does not exist (it is not
+! # included in the repository), do:
+! #    cp config.mk.dist auto/config.mk
+  
+  # (X) How to include auto/config.mk depends on the version of "make" you have,
+  #     if the current choice doesn't work, try the other one.
+*** ../vim-7.3.121/src/auto/config.mk	2010-08-16 21:59:00.000000000 +0200
+--- src/auto/config.mk	1970-01-01 01:00:00.000000000 +0100
+***************
+*** 1,5 ****
+- the first targets to make vim are: scratch config myself
+- srcdir = .
+- VIMNAME = vim
+- EXNAME = ex
+- VIEWNAME = view
+--- 0 ----
+*** ../vim-7.3.121/src/version.c	2011-02-15 14:24:42.000000000 +0100
+--- src/version.c	2011-02-15 15:25:07.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     122,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+267. You get an extra phone line so you can get phone calls.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.123 b/source/ap/vim/patches/7.3.123
new file mode 100644
index 00000000..0bca41b8
--- /dev/null
+++ b/source/ap/vim/patches/7.3.123
@@ -0,0 +1,55 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.123
+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.3.123
+Problem:    ml_get error when executing register being recorded into, deleting
+	    lines and 'conceallevel' is set. (ZyX)
+Solution:   Don't redraw a line for concealing when it doesn't exist.
+Files:	    src/main.c
+
+
+*** ../vim-7.3.122/src/main.c	2010-12-17 18:06:00.000000000 +0100
+--- src/main.c	2011-02-15 16:09:41.000000000 +0100
+***************
+*** 1198,1204 ****
+  			|| conceal_cursor_line(curwin)
+  			|| need_cursor_line_redraw))
+  	    {
+! 		if (conceal_old_cursor_line != conceal_new_cursor_line)
+  		    update_single_line(curwin, conceal_old_cursor_line);
+  		update_single_line(curwin, conceal_new_cursor_line);
+  		curwin->w_valid &= ~VALID_CROW;
+--- 1198,1206 ----
+  			|| conceal_cursor_line(curwin)
+  			|| need_cursor_line_redraw))
+  	    {
+! 		if (conceal_old_cursor_line != conceal_new_cursor_line
+! 			&& conceal_old_cursor_line
+! 						<= curbuf->b_ml.ml_line_count)
+  		    update_single_line(curwin, conceal_old_cursor_line);
+  		update_single_line(curwin, conceal_new_cursor_line);
+  		curwin->w_valid &= ~VALID_CROW;
+*** ../vim-7.3.122/src/version.c	2011-02-15 15:27:00.000000000 +0100
+--- src/version.c	2011-02-15 16:15:28.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     123,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+268. You get up in the morning and go online before getting your coffee.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.124 b/source/ap/vim/patches/7.3.124
new file mode 100644
index 00000000..738c2a16
--- /dev/null
+++ b/source/ap/vim/patches/7.3.124
@@ -0,0 +1,229 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.124
+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.3.124
+Problem:    When writing a file in binary mode it may be missing the final EOL
+	    if a file previously read was missing the EOL. (Kevin Goodsell)
+Solution:   Move the write_no_eol_lnum into the buffer struct.
+Files:	    src/structs.h, src/fileio.c, src/globals.h, src/os_unix.c
+
+
+*** ../vim-7.3.123/src/structs.h	2010-10-20 21:22:17.000000000 +0200
+--- src/structs.h	2011-02-15 17:06:34.000000000 +0100
+***************
+*** 1564,1569 ****
+--- 1564,1572 ----
+  
+      /* end of buffer options */
+  
++     linenr_T	b_no_eol_lnum;	/* non-zero lnum when last line of next binary
++ 				 * write should not have an end-of-line */
++ 
+      int		b_start_eol;	/* last line had eol when it was read */
+      int		b_start_ffc;	/* first char of 'ff' when edit started */
+  #ifdef FEAT_MBYTE
+*** ../vim-7.3.123/src/fileio.c	2011-02-09 16:44:45.000000000 +0100
+--- src/fileio.c	2011-02-15 17:30:54.000000000 +0100
+***************
+*** 317,323 ****
+      int		using_b_fname;
+  #endif
+  
+!     write_no_eol_lnum = 0;	/* in case it was set by the previous read */
+  
+      /*
+       * If there is no file name yet, use the one for the read file.
+--- 317,323 ----
+      int		using_b_fname;
+  #endif
+  
+!     curbuf->b_no_eol_lnum = 0;	/* in case it was set by the previous read */
+  
+      /*
+       * If there is no file name yet, use the one for the read file.
+***************
+*** 2599,2608 ****
+  
+      /*
+       * Trick: We remember if the last line of the read didn't have
+!      * an eol for when writing it again.  This is required for
+       * ":autocmd FileReadPost *.gz set bin|'[,']!gunzip" to work.
+       */
+!     write_no_eol_lnum = read_no_eol_lnum;
+  
+      /* When reloading a buffer put the cursor at the first line that is
+       * different. */
+--- 2599,2609 ----
+  
+      /*
+       * Trick: We remember if the last line of the read didn't have
+!      * an eol even when 'binary' is off, for when writing it again with
+!      * 'binary' on.  This is required for
+       * ":autocmd FileReadPost *.gz set bin|'[,']!gunzip" to work.
+       */
+!     curbuf->b_no_eol_lnum = read_no_eol_lnum;
+  
+      /* When reloading a buffer put the cursor at the first line that is
+       * different. */
+***************
+*** 2650,2662 ****
+  							    FALSE, NULL, eap);
+  	if (msg_scrolled == n)
+  	    msg_scroll = m;
+! #ifdef FEAT_EVAL
+  	if (aborting())	    /* autocmds may abort script processing */
+  	    return FAIL;
+! #endif
+      }
+  #endif
+  
+      if (recoverymode && error)
+  	return FAIL;
+      return OK;
+--- 2651,2667 ----
+  							    FALSE, NULL, eap);
+  	if (msg_scrolled == n)
+  	    msg_scroll = m;
+! # ifdef FEAT_EVAL
+  	if (aborting())	    /* autocmds may abort script processing */
+  	    return FAIL;
+! # endif
+      }
+  #endif
+  
++     /* Reset now, following writes should not omit the EOL.  Also, the line
++      * number will become invalid because of edits. */
++     curbuf->b_no_eol_lnum = 0;
++ 
+      if (recoverymode && error)
+  	return FAIL;
+      return OK;
+***************
+*** 4560,4566 ****
+  	if (end == 0
+  		|| (lnum == end
+  		    && write_bin
+! 		    && (lnum == write_no_eol_lnum
+  			|| (lnum == buf->b_ml.ml_line_count && !buf->b_p_eol))))
+  	{
+  	    ++lnum;			/* written the line, count it */
+--- 4565,4571 ----
+  	if (end == 0
+  		|| (lnum == end
+  		    && write_bin
+! 		    && (lnum == buf->b_no_eol_lnum
+  			|| (lnum == buf->b_ml.ml_line_count && !buf->b_p_eol))))
+  	{
+  	    ++lnum;			/* written the line, count it */
+***************
+*** 5086,5093 ****
+      {
+  	aco_save_T	aco;
+  
+- 	write_no_eol_lnum = 0;	/* in case it was set by the previous read */
+- 
+  	/*
+  	 * Apply POST autocommands.
+  	 * Careful: The autocommands may call buf_write() recursively!
+--- 5091,5096 ----
+***************
+*** 7256,7263 ****
+  write_lnum_adjust(offset)
+      linenr_T	offset;
+  {
+!     if (write_no_eol_lnum != 0)		/* only if there is a missing eol */
+! 	write_no_eol_lnum += offset;
+  }
+  
+  #if defined(TEMPDIRNAMES) || defined(PROTO)
+--- 7259,7266 ----
+  write_lnum_adjust(offset)
+      linenr_T	offset;
+  {
+!     if (curbuf->b_no_eol_lnum != 0)	/* only if there is a missing eol */
+! 	curbuf->b_no_eol_lnum += offset;
+  }
+  
+  #if defined(TEMPDIRNAMES) || defined(PROTO)
+*** ../vim-7.3.123/src/globals.h	2010-12-02 21:43:10.000000000 +0100
+--- src/globals.h	2011-02-15 17:06:06.000000000 +0100
+***************
+*** 1057,1066 ****
+  			;
+  #endif
+  
+- EXTERN linenr_T	write_no_eol_lnum INIT(= 0); /* non-zero lnum when last line
+- 						of next binary write should
+- 						not have an end-of-line */
+- 
+  #ifdef FEAT_WINDOWS
+  EXTERN int	postponed_split INIT(= 0);  /* for CTRL-W CTRL-] command */
+  EXTERN int	postponed_split_flags INIT(= 0);  /* args for win_split() */
+--- 1057,1062 ----
+*** ../vim-7.3.123/src/os_unix.c	2011-02-09 18:47:36.000000000 +0100
+--- src/os_unix.c	2011-02-15 17:07:22.000000000 +0100
+***************
+*** 4245,4251 ****
+  				 * should not have one. */
+  				if (lnum != curbuf->b_op_end.lnum
+  					|| !curbuf->b_p_bin
+! 					|| (lnum != write_no_eol_lnum
+  					    && (lnum !=
+  						    curbuf->b_ml.ml_line_count
+  						    || curbuf->b_p_eol)))
+--- 4245,4251 ----
+  				 * should not have one. */
+  				if (lnum != curbuf->b_op_end.lnum
+  					|| !curbuf->b_p_bin
+! 					|| (lnum != curbuf->b_no_eol_lnum
+  					    && (lnum !=
+  						    curbuf->b_ml.ml_line_count
+  						    || curbuf->b_p_eol)))
+***************
+*** 4588,4597 ****
+  		    {
+  			append_ga_line(&ga);
+  			/* remember that the NL was missing */
+! 			write_no_eol_lnum = curwin->w_cursor.lnum;
+  		    }
+  		    else
+! 			write_no_eol_lnum = 0;
+  		    ga_clear(&ga);
+  		}
+  
+--- 4588,4597 ----
+  		    {
+  			append_ga_line(&ga);
+  			/* remember that the NL was missing */
+! 			curbuf->b_no_eol_lnum = curwin->w_cursor.lnum;
+  		    }
+  		    else
+! 			curbuf->b_no_eol_lnum = 0;
+  		    ga_clear(&ga);
+  		}
+  
+*** ../vim-7.3.123/src/version.c	2011-02-15 16:29:54.000000000 +0100
+--- src/version.c	2011-02-15 17:37:38.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     124,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+270. You are subscribed to a mailing list for every piece of software
+     you use.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.125 b/source/ap/vim/patches/7.3.125
new file mode 100644
index 00000000..719fc95e
--- /dev/null
+++ b/source/ap/vim/patches/7.3.125
@@ -0,0 +1,66 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.125
+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.3.125
+Problem:    MSVC: Problem with quotes in link argument.
+Solution:   Escape backslashes and quotes. (Weasley)
+Files:	    src/Make_mvc.mak
+
+
+*** ../vim-7.3.124/src/Make_mvc.mak	2010-12-08 14:54:58.000000000 +0100
+--- src/Make_mvc.mak	2011-02-15 17:55:24.000000000 +0100
+***************
+*** 1159,1164 ****
+--- 1159,1168 ----
+  E0_CFLAGS = $(CFLAGS:\=\\)
+  E_CFLAGS = $(E0_CFLAGS:"=\")
+  # ") stop the string
++ # $LINKARGS2 may contain backslashes and double quotes, escape them both.
++ E0_LINKARGS2 = $(LINKARGS2:\=\\)
++ E_LINKARGS2 = $(E0_LINKARGS2:"=\")
++ # ") stop the string
+  
+  $(PATHDEF_SRC): auto
+  	@echo creating $(PATHDEF_SRC)
+***************
+*** 1167,1173 ****
+  	@echo char_u *default_vim_dir = (char_u *)"$(VIMRCLOC:\=\\)"; >> $(PATHDEF_SRC)
+  	@echo char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR:\=\\)"; >> $(PATHDEF_SRC)
+  	@echo char_u *all_cflags = (char_u *)"$(CC:\=\\) $(E_CFLAGS)"; >> $(PATHDEF_SRC)
+! 	@echo char_u *all_lflags = (char_u *)"$(link:\=\\) $(LINKARGS1:\=\\) $(LINKARGS2:\=\\)"; >> $(PATHDEF_SRC)
+  	@echo char_u *compiled_user = (char_u *)"$(USERNAME)"; >> $(PATHDEF_SRC)
+  	@echo char_u *compiled_sys = (char_u *)"$(USERDOMAIN)"; >> $(PATHDEF_SRC)
+  
+--- 1171,1177 ----
+  	@echo char_u *default_vim_dir = (char_u *)"$(VIMRCLOC:\=\\)"; >> $(PATHDEF_SRC)
+  	@echo char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR:\=\\)"; >> $(PATHDEF_SRC)
+  	@echo char_u *all_cflags = (char_u *)"$(CC:\=\\) $(E_CFLAGS)"; >> $(PATHDEF_SRC)
+! 	@echo char_u *all_lflags = (char_u *)"$(link:\=\\) $(LINKARGS1:\=\\) $(E_LINKARGS2)"; >> $(PATHDEF_SRC)
+  	@echo char_u *compiled_user = (char_u *)"$(USERNAME)"; >> $(PATHDEF_SRC)
+  	@echo char_u *compiled_sys = (char_u *)"$(USERDOMAIN)"; >> $(PATHDEF_SRC)
+  
+*** ../vim-7.3.124/src/version.c	2011-02-15 17:39:14.000000000 +0100
+--- src/version.c	2011-02-15 17:55:49.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     125,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+271. You collect hilarious signatures from all 250 mailing lists you
+     are subscribed to.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.126 b/source/ap/vim/patches/7.3.126
new file mode 100644
index 00000000..89d9684f
--- /dev/null
+++ b/source/ap/vim/patches/7.3.126
@@ -0,0 +1,63 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.126
+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.3.126
+Problem:    Compiler warning for signed pointer.
+Solution:   Use unsigned int argument for sscanf().
+Files:	    src/blowfish.c
+
+
+*** ../vim-7.3.125/src/blowfish.c	2010-08-15 21:57:28.000000000 +0200
+--- src/blowfish.c	2010-12-17 19:58:18.000000000 +0100
+***************
+*** 413,418 ****
+--- 413,419 ----
+      int    salt_len;
+  {
+      int      i, j, keypos = 0;
++     unsigned u;
+      UINT32_T val, data_l, data_r;
+      char_u   *key;
+      int      keylen;
+***************
+*** 432,439 ****
+      }
+      for (i = 0; i < keylen; i++)
+      {
+! 	sscanf((char *)&key[i * 2], "%2x", &j);
+! 	key[i] = j;
+      }
+  
+      mch_memmove(sbx, sbi, 4 * 4 * 256);
+--- 433,440 ----
+      }
+      for (i = 0; i < keylen; i++)
+      {
+! 	sscanf((char *)&key[i * 2], "%2x", &u);
+! 	key[i] = u;
+      }
+  
+      mch_memmove(sbx, sbi, 4 * 4 * 256);
+*** ../vim-7.3.125/src/version.c	2011-02-15 18:06:11.000000000 +0100
+--- src/version.c	2011-02-25 14:40:22.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     126,
+  /**/
+
+-- 
+Why doesn't Tarzan have a beard?
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.127 b/source/ap/vim/patches/7.3.127
new file mode 100644
index 00000000..518d2f7c
--- /dev/null
+++ b/source/ap/vim/patches/7.3.127
@@ -0,0 +1,55 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.127
+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.3.127
+Problem:    Compiler complains about comma.
+Solution:   Remove comma after last enum element.
+Files:	    src/ex_cmds2.c
+
+
+*** ../vim-7.3.126/src/ex_cmds2.c	2010-12-17 18:06:00.000000000 +0100
+--- src/ex_cmds2.c	2010-12-17 19:58:37.000000000 +0100
+***************
+*** 1115,1121 ****
+  static enum
+  {
+      PEXP_SUBCMD,	/* expand :profile sub-commands */
+!     PEXP_FUNC,		/* expand :profile func {funcname} */
+  } pexpand_what;
+  
+  static char *pexpand_cmds[] = {
+--- 1115,1121 ----
+  static enum
+  {
+      PEXP_SUBCMD,	/* expand :profile sub-commands */
+!     PEXP_FUNC		/* expand :profile func {funcname} */
+  } pexpand_what;
+  
+  static char *pexpand_cmds[] = {
+*** ../vim-7.3.126/src/version.c	2011-02-25 14:40:51.000000000 +0100
+--- src/version.c	2011-02-25 14:45:19.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     127,
+  /**/
+
+-- 
+   LAUNCELOT leaps into SHOT with a mighty cry and runs the GUARD through and
+   hacks him to the floor.  Blood.  Swashbuckling music (perhaps).
+   LAUNCELOT races through into the castle screaming.
+SECOND SENTRY: Hey!
+                 "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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.128 b/source/ap/vim/patches/7.3.128
new file mode 100644
index 00000000..d4438688
--- /dev/null
+++ b/source/ap/vim/patches/7.3.128
@@ -0,0 +1,58 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.128
+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.3.128
+Problem:    Another compiler warning for signed pointer.
+Solution:   Use unsigned int argument for sscanf().
+Files:	    src/mark.c
+
+
+*** ../vim-7.3.127/src/mark.c	2010-08-15 21:57:25.000000000 +0200
+--- src/mark.c	2010-12-17 20:00:05.000000000 +0100
+***************
+*** 1750,1756 ****
+  	    {
+  		if (line[1] != NUL)
+  		{
+! 		    sscanf((char *)line + 2, "%ld %u", &pos.lnum, &pos.col);
+  		    switch (line[1])
+  		    {
+  			case '"': curbuf->b_last_cursor = pos; break;
+--- 1750,1759 ----
+  	    {
+  		if (line[1] != NUL)
+  		{
+! 		    unsigned u;
+! 
+! 		    sscanf((char *)line + 2, "%ld %u", &pos.lnum, &u);
+! 		    pos.col = u;
+  		    switch (line[1])
+  		    {
+  			case '"': curbuf->b_last_cursor = pos; break;
+*** ../vim-7.3.127/src/version.c	2011-02-25 14:46:06.000000000 +0100
+--- src/version.c	2011-02-25 15:10:34.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     128,
+  /**/
+
+-- 
+FATHER:    Who are you?
+PRINCE:    I'm ... your son ...
+FATHER:    Not you.
+LAUNCELOT: I'm ... er ... Sir Launcelot, sir.
+                 "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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.129 b/source/ap/vim/patches/7.3.129
new file mode 100644
index 00000000..10f11d61
--- /dev/null
+++ b/source/ap/vim/patches/7.3.129
@@ -0,0 +1,241 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.129
+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.3.129
+Problem:    Using integer like a boolean.
+Solution:   Nicer check for integer being non-zero.
+Files:	    src/tag.c
+
+
+*** ../vim-7.3.128/src/tag.c	2010-12-17 18:06:00.000000000 +0100
+--- src/tag.c	2010-12-17 17:49:35.000000000 +0100
+***************
+*** 204,210 ****
+      else
+      {
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 	if (g_do_tagpreview)
+  	    use_tagstack = FALSE;
+  	else
+  #endif
+--- 204,210 ----
+      else
+      {
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 	if (g_do_tagpreview != 0)
+  	    use_tagstack = FALSE;
+  	else
+  #endif
+***************
+*** 222,228 ****
+  		    ))
+  	{
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 	    if (g_do_tagpreview)
+  	    {
+  		if (ptag_entry.tagname != NULL
+  			&& STRCMP(ptag_entry.tagname, tag) == 0)
+--- 222,228 ----
+  		    ))
+  	{
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 	    if (g_do_tagpreview != 0)
+  	    {
+  		if (ptag_entry.tagname != NULL
+  			&& STRCMP(ptag_entry.tagname, tag) == 0)
+***************
+*** 278,284 ****
+  	{
+  	    if (
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 		    g_do_tagpreview ? ptag_entry.tagname == NULL :
+  #endif
+  		    tagstacklen == 0)
+  	    {
+--- 278,284 ----
+  	{
+  	    if (
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 		    g_do_tagpreview != 0 ? ptag_entry.tagname == NULL :
+  #endif
+  		    tagstacklen == 0)
+  	    {
+***************
+*** 361,367 ****
+  	       )
+  	    {
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 		if (g_do_tagpreview)
+  		{
+  		    cur_match = ptag_entry.cur_match;
+  		    cur_fnum = ptag_entry.cur_fnum;
+--- 361,367 ----
+  	       )
+  	    {
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 		if (g_do_tagpreview != 0)
+  		{
+  		    cur_match = ptag_entry.cur_match;
+  		    cur_fnum = ptag_entry.cur_fnum;
+***************
+*** 399,405 ****
+  		prevtagstackidx = tagstackidx;
+  
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 		if (g_do_tagpreview)
+  		{
+  		    cur_match = ptag_entry.cur_match;
+  		    cur_fnum = ptag_entry.cur_fnum;
+--- 399,405 ----
+  		prevtagstackidx = tagstackidx;
+  
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 		if (g_do_tagpreview != 0)
+  		{
+  		    cur_match = ptag_entry.cur_match;
+  		    cur_fnum = ptag_entry.cur_fnum;
+***************
+*** 437,443 ****
+  	}
+  
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 	if (g_do_tagpreview)
+  	{
+  	    if (type != DT_SELECT && type != DT_JUMP)
+  	    {
+--- 437,443 ----
+  	}
+  
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 	if (g_do_tagpreview != 0)
+  	{
+  	    if (type != DT_SELECT && type != DT_JUMP)
+  	    {
+***************
+*** 492,498 ****
+  	if (use_tagstack)
+  	    name = tagstack[tagstackidx].tagname;
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 	else if (g_do_tagpreview)
+  	    name = ptag_entry.tagname;
+  #endif
+  	else
+--- 492,498 ----
+  	if (use_tagstack)
+  	    name = tagstack[tagstackidx].tagname;
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 	else if (g_do_tagpreview != 0)
+  	    name = ptag_entry.tagname;
+  #endif
+  	else
+***************
+*** 620,626 ****
+  		    parse_match(matches[i], &tagp);
+  		    if (!new_tag && (
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 				(g_do_tagpreview
+  				 && i == ptag_entry.cur_match) ||
+  #endif
+  				(use_tagstack
+--- 620,626 ----
+  		    parse_match(matches[i], &tagp);
+  		    if (!new_tag && (
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 				(g_do_tagpreview != 0
+  				 && i == ptag_entry.cur_match) ||
+  #endif
+  				(use_tagstack
+***************
+*** 962,968 ****
+  		++tagstackidx;
+  	    }
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 	    else if (g_do_tagpreview)
+  	    {
+  		ptag_entry.cur_match = cur_match;
+  		ptag_entry.cur_fnum = cur_fnum;
+--- 962,968 ----
+  		++tagstackidx;
+  	    }
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 	    else if (g_do_tagpreview != 0)
+  	    {
+  		ptag_entry.cur_match = cur_match;
+  		ptag_entry.cur_fnum = cur_fnum;
+***************
+*** 3110,3116 ****
+  #endif
+  
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+!     if (g_do_tagpreview)
+      {
+  	postponed_split = 0;	/* don't split again below */
+  	curwin_save = curwin;	/* Save current window */
+--- 3110,3116 ----
+  #endif
+  
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+!     if (g_do_tagpreview != 0)
+      {
+  	postponed_split = 0;	/* don't split again below */
+  	curwin_save = curwin;	/* Save current window */
+***************
+*** 3148,3154 ****
+  	/* A :ta from a help file will keep the b_help flag set.  For ":ptag"
+  	 * we need to use the flag from the window where we came from. */
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 	if (g_do_tagpreview)
+  	    keep_help_flag = curwin_save->w_buffer->b_help;
+  	else
+  #endif
+--- 3148,3154 ----
+  	/* A :ta from a help file will keep the b_help flag set.  For ":ptag"
+  	 * we need to use the flag from the window where we came from. */
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 	if (g_do_tagpreview != 0)
+  	    keep_help_flag = curwin_save->w_buffer->b_help;
+  	else
+  #endif
+***************
+*** 3322,3328 ****
+  	}
+  
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 	if (g_do_tagpreview && curwin != curwin_save && win_valid(curwin_save))
+  	{
+  	    /* Return cursor to where we were */
+  	    validate_cursor();
+--- 3322,3329 ----
+  	}
+  
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 	if (g_do_tagpreview != 0
+! 			   && curwin != curwin_save && win_valid(curwin_save))
+  	{
+  	    /* Return cursor to where we were */
+  	    validate_cursor();
+*** ../vim-7.3.128/src/version.c	2011-02-25 15:11:17.000000000 +0100
+--- src/version.c	2011-02-25 15:12:25.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     129,
+  /**/
+
+-- 
+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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.130 b/source/ap/vim/patches/7.3.130
new file mode 100644
index 00000000..3f7db765
--- /dev/null
+++ b/source/ap/vim/patches/7.3.130
@@ -0,0 +1,74 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.130
+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.3.130
+Problem:    Variable misplaced in #ifdef.
+Solution:   Move clipboard_event_time outside of #ifdef.
+Files:	    src/gui_gtk_x11.c
+
+
+*** ../vim-7.3.129/src/gui_gtk_x11.c	2010-08-15 21:57:31.000000000 +0200
+--- src/gui_gtk_x11.c	2010-12-04 15:26:41.000000000 +0100
+***************
+*** 86,94 ****
+  
+  #ifdef HAVE_X11_SUNKEYSYM_H
+  # include <X11/Sunkeysym.h>
+- static guint32 clipboard_event_time = CurrentTime;
+  #endif
+  
+  /*
+   * Easy-to-use macro for multihead support.
+   */
+--- 86,95 ----
+  
+  #ifdef HAVE_X11_SUNKEYSYM_H
+  # include <X11/Sunkeysym.h>
+  #endif
+  
++ static guint32 clipboard_event_time = CurrentTime;
++ 
+  /*
+   * Easy-to-use macro for multihead support.
+   */
+***************
+*** 5419,5425 ****
+  	}
+  
+  #if defined(FEAT_NETBEANS_INTG)
+! 	/* Process the queued netbeans messages. */
+  	netbeans_parse_messages();
+  #endif
+  
+--- 5420,5426 ----
+  	}
+  
+  #if defined(FEAT_NETBEANS_INTG)
+! 	/* Process any queued netbeans messages. */
+  	netbeans_parse_messages();
+  #endif
+  
+*** ../vim-7.3.129/src/version.c	2011-02-25 15:13:43.000000000 +0100
+--- src/version.c	2011-02-25 15:15:02.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     130,
+  /**/
+
+-- 
+A vacation is a period of travel during which you find that you
+took twice as many clothes and half as much money as you needed.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.131 b/source/ap/vim/patches/7.3.131
new file mode 100644
index 00000000..e142059f
--- /dev/null
+++ b/source/ap/vim/patches/7.3.131
@@ -0,0 +1,47 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.131
+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.3.131
+Problem:    Including errno.h too often.
+Solution:   Don't include errno.h in Unix header file.
+Files:	    src/os_unix.h
+
+
+*** ../vim-7.3.130/src/os_unix.h	2010-08-15 21:57:28.000000000 +0200
+--- src/os_unix.h	2010-12-17 20:05:34.000000000 +0100
+***************
+*** 184,193 ****
+  
+  #define BASENAMELEN	(MAXNAMLEN - 5)
+  
+- #ifdef HAVE_ERRNO_H
+- # include <errno.h>
+- #endif
+- 
+  #ifdef HAVE_PWD_H
+  # include <pwd.h>
+  #endif
+--- 184,189 ----
+*** ../vim-7.3.130/src/version.c	2011-02-25 15:15:43.000000000 +0100
+--- src/version.c	2011-02-25 15:16:49.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     131,
+  /**/
+
+-- 
+Overflow on /dev/null, please empty the bit bucket.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.132 b/source/ap/vim/patches/7.3.132
new file mode 100644
index 00000000..2f0753df
--- /dev/null
+++ b/source/ap/vim/patches/7.3.132
@@ -0,0 +1,82 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.132
+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.3.132
+Problem:    C++ style comments.
+Solution:   Change to C comments.
+Files:	    src/if_python3.c
+
+
+*** ../vim-7.3.131/src/if_python3.c	2010-11-16 19:25:56.000000000 +0100
+--- src/if_python3.c	2011-01-16 01:28:35.000000000 +0100
+***************
+*** 22,29 ****
+   * Adaptations to support both python3.x and python2.x
+   */
+  
+! // uncomment this if used with the debug version of python
+! // #define Py_DEBUG
+  
+  #include "vim.h"
+  
+--- 22,29 ----
+   * Adaptations to support both python3.x and python2.x
+   */
+  
+! /* uncomment this if used with the debug version of python */
+! /* #define Py_DEBUG */
+  
+  #include "vim.h"
+  
+***************
+*** 74,80 ****
+  #define PyString_Size(obj) PyUnicode_GET_SIZE(obj)
+  #define PyString_FromString(repr) PyUnicode_FromString(repr)
+  
+! #if defined(DYNAMIC_PYTHON3)
+  
+  # ifndef WIN3264
+  #  include <dlfcn.h>
+--- 74,80 ----
+  #define PyString_Size(obj) PyUnicode_GET_SIZE(obj)
+  #define PyString_FromString(repr) PyUnicode_FromString(repr)
+  
+! #if defined(DYNAMIC_PYTHON3) || defined(PROTO)
+  
+  # ifndef WIN3264
+  #  include <dlfcn.h>
+*** ../vim-7.3.131/src/version.c	2011-02-25 15:17:14.000000000 +0100
+--- src/version.c	2011-02-25 15:18:18.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     132,
+  /**/
+
+-- 
+        **  Hello and Welcome to the Psychiatric Hotline **
+If you are obsessive-compulsive, please press 1 repeatedly.
+If you are co-dependent, please ask someone to press 2.
+If you have multiple personalities, please press 3, 4, 5 and 6.
+If you are paranoid-delusional, we know who you are and what you want
+       - just stay on the line so we can trace the call.
+If you are schizophrenic, listen carefully and a little voice will
+       tell you which number to press next.
+If you are manic-depressive, it doesn't matter which number you press
+       - no one will answer.
+If you suffer from panic attacks, push every button you can find.
+If you are sane, please hold on - we have the rest of humanity on the
+        other line and they desparately want to ask you a few questions.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.133 b/source/ap/vim/patches/7.3.133
new file mode 100644
index 00000000..d7d99518
--- /dev/null
+++ b/source/ap/vim/patches/7.3.133
@@ -0,0 +1,122 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.133
+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.3.133
+Problem:    When using encryption it's not clear what method was used.
+Solution:   In the file message show "blowfish" when using blowfish.
+Files:	    src/fileio.c
+
+
+*** ../vim-7.3.132/src/fileio.c	2011-02-15 17:39:14.000000000 +0100
+--- src/fileio.c	2011-02-25 16:30:19.000000000 +0100
+***************
+*** 250,255 ****
+--- 250,256 ----
+  #ifdef FEAT_CRYPT
+      char_u	*cryptkey = NULL;
+      int		did_ask_for_key = FALSE;
++     int		crypt_method_used;
+  #endif
+  #ifdef FEAT_PERSISTENT_UNDO
+      context_sha256_T sha_ctx;
+***************
+*** 2289,2294 ****
+--- 2290,2296 ----
+  	save_file_ff(curbuf);		/* remember the current file format */
+  
+  #ifdef FEAT_CRYPT
++     crypt_method_used = use_crypt_method;
+      if (cryptkey != NULL)
+      {
+  	crypt_pop_state();
+***************
+*** 2483,2489 ****
+  #ifdef FEAT_CRYPT
+  	    if (cryptkey != NULL)
+  	    {
+! 		STRCAT(IObuff, _("[crypted]"));
+  		c = TRUE;
+  	    }
+  #endif
+--- 2485,2494 ----
+  #ifdef FEAT_CRYPT
+  	    if (cryptkey != NULL)
+  	    {
+! 		if (crypt_method_used == 1)
+! 		    STRCAT(IObuff, _("[blowfish]"));
+! 		else
+! 		    STRCAT(IObuff, _("[crypted]"));
+  		c = TRUE;
+  	    }
+  #endif
+***************
+*** 3199,3204 ****
+--- 3204,3212 ----
+      int		    write_undo_file = FALSE;
+      context_sha256_T sha_ctx;
+  #endif
++ #ifdef FEAT_CRYPT
++     int		    crypt_method_used;
++ #endif
+  
+      if (fname == NULL || *fname == NUL)	/* safety check */
+  	return FAIL;
+***************
+*** 4728,4733 ****
+--- 4736,4742 ----
+  	mch_set_acl(wfname, acl);
+  #endif
+  #ifdef FEAT_CRYPT
++     crypt_method_used = use_crypt_method;
+      if (wb_flags & FIO_ENCRYPTED)
+  	crypt_pop_state();
+  #endif
+***************
+*** 4882,4888 ****
+  #ifdef FEAT_CRYPT
+  	if (wb_flags & FIO_ENCRYPTED)
+  	{
+! 	    STRCAT(IObuff, _("[crypted]"));
+  	    c = TRUE;
+  	}
+  #endif
+--- 4891,4900 ----
+  #ifdef FEAT_CRYPT
+  	if (wb_flags & FIO_ENCRYPTED)
+  	{
+! 	    if (crypt_method_used == 1)
+! 		STRCAT(IObuff, _("[blowfish]"));
+! 	    else
+! 		STRCAT(IObuff, _("[crypted]"));
+  	    c = TRUE;
+  	}
+  #endif
+*** ../vim-7.3.132/src/version.c	2011-02-25 15:18:46.000000000 +0100
+--- src/version.c	2011-02-25 16:42:58.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     133,
+  /**/
+
+-- 
+    [clop clop]
+GUARD #1:  Halt!  Who goes there?
+ARTHUR:    It is I, Arthur, son of Uther Pendragon, from the castle of
+           Camelot.  King of the Britons, defeator of the Saxons, sovereign of
+           all England!
+GUARD #1:  Pull the other one!
+                                  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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.134 b/source/ap/vim/patches/7.3.134
new file mode 100644
index 00000000..cb20ce43
--- /dev/null
+++ b/source/ap/vim/patches/7.3.134
@@ -0,0 +1,51 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.134
+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.3.134
+Problem:    Drag-n-drop doesn't work in KDE Dolphin.
+Solution:   Add GDK_ACTION_MOVE flag. (Florian Degner)
+Files:	    src/gui_gtk_x11.c
+
+
+*** ../vim-7.3.133/src/gui_gtk_x11.c	2011-02-25 15:15:43.000000000 +0100
+--- src/gui_gtk_x11.c	2011-02-25 17:07:36.000000000 +0100
+***************
+*** 3094,3100 ****
+      gtk_drag_dest_set(gui.drawarea,
+  		      GTK_DEST_DEFAULT_ALL,
+  		      targets, n_targets,
+! 		      GDK_ACTION_COPY);
+  }
+  
+  /*
+--- 3094,3100 ----
+      gtk_drag_dest_set(gui.drawarea,
+  		      GTK_DEST_DEFAULT_ALL,
+  		      targets, n_targets,
+! 		      GDK_ACTION_COPY | GDK_ACTION_MOVE);
+  }
+  
+  /*
+*** ../vim-7.3.133/src/version.c	2011-02-25 16:52:13.000000000 +0100
+--- src/version.c	2011-02-25 17:08:35.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     134,
+  /**/
+
+-- 
+Proverb: A nightingale that forgets the lyrics is a hummingbird.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.135 b/source/ap/vim/patches/7.3.135
new file mode 100644
index 00000000..ca1ebd68
--- /dev/null
+++ b/source/ap/vim/patches/7.3.135
@@ -0,0 +1,90 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.135
+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.3.135
+Problem:    When there is no previous substitute pattern, the previous search
+	    pattern is used.  The other way around doesn't work.
+Solution:   When there is no previous search pattern, use the previous
+	    substitute pattern if possible. (Christian Brabandt)
+Files:	    src/search.c
+
+
+*** ../vim-7.3.134/src/search.c	2010-09-21 16:56:29.000000000 +0200
+--- src/search.c	2011-02-25 18:36:56.000000000 +0100
+***************
+*** 1161,1172 ****
+  	{
+  	    if (spats[RE_SEARCH].pat == NULL)	    /* no previous pattern */
+  	    {
+! 		EMSG(_(e_noprevre));
+! 		retval = 0;
+! 		goto end_do_search;
+  	    }
+- 	    /* make search_regcomp() use spats[RE_SEARCH].pat */
+- 	    searchstr = (char_u *)"";
+  	}
+  
+  	if (pat != NULL && *pat != NUL)	/* look for (new) offset */
+--- 1161,1180 ----
+  	{
+  	    if (spats[RE_SEARCH].pat == NULL)	    /* no previous pattern */
+  	    {
+! 		pat = spats[RE_SUBST].pat;
+! 		if (pat == NULL)
+! 		{
+! 		    EMSG(_(e_noprevre));
+! 		    retval = 0;
+! 		    goto end_do_search;
+! 		}
+! 		searchstr = pat;
+! 	    }
+! 	    else
+! 	    {
+! 		/* make search_regcomp() use spats[RE_SEARCH].pat */
+! 		searchstr = (char_u *)"";
+  	    }
+  	}
+  
+  	if (pat != NULL && *pat != NUL)	/* look for (new) offset */
+***************
+*** 4527,4533 ****
+  #if defined(FEAT_FIND_ID) || defined(PROTO)
+  /*
+   * 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,
+--- 4535,4541 ----
+  #if defined(FEAT_FIND_ID) || defined(PROTO)
+  /*
+   * 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,
+*** ../vim-7.3.134/src/version.c	2011-02-25 17:10:22.000000000 +0100
+--- src/version.c	2011-02-25 18:35:30.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     135,
+  /**/
+
+-- 
+A real patriot is the fellow who gets a parking ticket and rejoices
+that the system works.
+
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.136 b/source/ap/vim/patches/7.3.136
new file mode 100644
index 00000000..87acecb6
--- /dev/null
+++ b/source/ap/vim/patches/7.3.136
@@ -0,0 +1,51 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.136
+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.3.136
+Problem:    Duplicate include of assert.h.
+Solution:   Remove it.
+Files:	    src/if_cscope.c
+
+
+*** ../vim-7.3.135/src/if_cscope.c	2010-12-30 11:41:05.000000000 +0100
+--- src/if_cscope.c	2011-03-03 15:01:15.000000000 +0100
+***************
+*** 13,19 ****
+  
+  #if defined(FEAT_CSCOPE) || defined(PROTO)
+  
+- #include <assert.h>
+  #include <sys/types.h>
+  #include <sys/stat.h>
+  #if defined(UNIX)
+--- 13,18 ----
+*** ../vim-7.3.135/src/version.c	2011-02-25 18:38:29.000000000 +0100
+--- src/version.c	2011-03-03 14:59:32.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     136,
+  /**/
+
+-- 
+ARTHUR:  You fight with the strength of many men, Sir knight.
+         I am Arthur, King of the Britons.  [pause]
+         I seek the finest and the bravest knights in the land to join me
+         in my Court of Camelot.  [pause]
+         You have proved yourself worthy; will you join me?  [pause]
+         You make me sad.  So be it.  Come, Patsy.
+BLACK KNIGHT:  None shall pass.
+                                  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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.137 b/source/ap/vim/patches/7.3.137
new file mode 100644
index 00000000..91f68ed3
--- /dev/null
+++ b/source/ap/vim/patches/7.3.137
@@ -0,0 +1,81 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.137
+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.3.137 (after 7.3.091)
+Problem:    When 'lazyredraw' is set the screen may not be updated. (Ivan
+	    Krasilnikov)
+Solution:   Call update_screen() before waiting for input.
+Files:	    src/misc1.c, src/getchar.c
+
+
+*** ../vim-7.3.136/src/misc1.c	2011-01-22 00:11:42.000000000 +0100
+--- src/misc1.c	2011-03-03 14:02:02.000000000 +0100
+***************
+*** 3115,3121 ****
+--- 3115,3129 ----
+  	    continue;
+  
+  	if (n == KEYLEN_REMOVED)  /* key code removed */
++ 	{
++ 	    if (must_redraw)
++ 	    {
++ 		/* Redrawing was postponed, do it now. */
++ 		update_screen(0);
++ 		setcursor(); /* put cursor back where it belongs */
++ 	    }
+  	    continue;
++ 	}
+  	if (n > 0)		/* found a termcode: adjust length */
+  	    len = n;
+  	if (len == 0)		/* nothing typed yet */
+*** ../vim-7.3.136/src/getchar.c	2010-12-30 12:30:26.000000000 +0100
+--- src/getchar.c	2011-03-03 14:01:26.000000000 +0100
+***************
+*** 2710,2717 ****
+  		 * are still available.  But when those available characters
+  		 * are part of a mapping, and we are going to do a blocking
+  		 * wait here.  Need to update the screen to display the
+! 		 * changed text so far. */
+! 		if ((State & INSERT) && advance && must_redraw != 0)
+  		{
+  		    update_screen(0);
+  		    setcursor(); /* put cursor back where it belongs */
+--- 2710,2719 ----
+  		 * are still available.  But when those available characters
+  		 * are part of a mapping, and we are going to do a blocking
+  		 * wait here.  Need to update the screen to display the
+! 		 * changed text so far. Also for when 'lazyredraw' is set and
+! 		 * redrawing was postponed because there was something in the
+! 		 * input buffer (e.g., termresponse). */
+! 		if (((State & INSERT) || p_lz) && advance && must_redraw != 0)
+  		{
+  		    update_screen(0);
+  		    setcursor(); /* put cursor back where it belongs */
+*** ../vim-7.3.136/src/version.c	2011-03-03 15:01:25.000000000 +0100
+--- src/version.c	2011-03-03 15:02:45.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     137,
+  /**/
+
+-- 
+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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.138 b/source/ap/vim/patches/7.3.138
new file mode 100644
index 00000000..e045e790
--- /dev/null
+++ b/source/ap/vim/patches/7.3.138
@@ -0,0 +1,69 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.138
+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.3.138
+Problem:    ":com" changes the multi-byte text of :echo. (Dimitar Dimitrov)
+Solution:   Search for K_SPECIAL as a byte, not a character. (Ben Schmidt)
+Files:	    src/ex_docmd.c
+
+
+*** ../vim-7.3.137/src/ex_docmd.c	2011-01-17 19:50:01.000000000 +0100
+--- src/ex_docmd.c	2011-03-03 15:47:00.000000000 +0100
+***************
+*** 6054,6068 ****
+  		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. */
+--- 6054,6070 ----
+  		end = vim_strchr(start + 1, '>');
+  	    if (buf != NULL)
+  	    {
+! 		for (ksp = p; *ksp != NUL && *ksp != K_SPECIAL; ++ksp)
+! 		    ;
+! 		if (*ksp == K_SPECIAL
+! 			&& (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 has 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. */
+*** ../vim-7.3.137/src/version.c	2011-03-03 15:04:01.000000000 +0100
+--- src/version.c	2011-03-03 15:53:41.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     138,
+  /**/
+
+-- 
+    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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.139 b/source/ap/vim/patches/7.3.139
new file mode 100644
index 00000000..057bf655
--- /dev/null
+++ b/source/ap/vim/patches/7.3.139
@@ -0,0 +1,111 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.139
+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.3.139 (after 7.3.137)
+Problem:    When 'lazyredraw' is set ":ver" output can't be read.
+Solution:   Don't redraw the screen when at a prompt or command line.
+Files:      src/getchar.c, src/message.c, src/misc1.c
+
+
+*** ../vim-7.3.138/src/getchar.c	2011-03-03 15:04:01.000000000 +0100
+--- src/getchar.c	2011-03-22 12:16:23.000000000 +0100
+***************
+*** 2713,2719 ****
+  		 * changed text so far. Also for when 'lazyredraw' is set and
+  		 * redrawing was postponed because there was something in the
+  		 * input buffer (e.g., termresponse). */
+! 		if (((State & INSERT) || p_lz) && advance && must_redraw != 0)
+  		{
+  		    update_screen(0);
+  		    setcursor(); /* put cursor back where it belongs */
+--- 2713,2720 ----
+  		 * changed text so far. Also for when 'lazyredraw' is set and
+  		 * redrawing was postponed because there was something in the
+  		 * input buffer (e.g., termresponse). */
+! 		if (((State & INSERT) != 0 || p_lz) && (State & CMDLINE) == 0
+! 			  && advance && must_redraw != 0 && !need_wait_return)
+  		{
+  		    update_screen(0);
+  		    setcursor(); /* put cursor back where it belongs */
+*** ../vim-7.3.138/src/message.c	2011-02-01 17:12:20.000000000 +0100
+--- src/message.c	2011-03-22 13:06:24.000000000 +0100
+***************
+*** 879,894 ****
+      if (msg_silent != 0)
+  	return;
+  
+! /*
+!  * With the global command (and some others) we only need one return at the
+!  * end. Adjust cmdline_row to avoid the next message overwriting the last one.
+!  * When inside vgetc(), we can't wait for a typed character at all.
+!  */
+      if (vgetc_busy > 0)
+  	return;
+      if (no_wait_return)
+      {
+- 	need_wait_return = TRUE;
+  	if (!exmode_active)
+  	    cmdline_row = msg_row;
+  	return;
+--- 879,895 ----
+      if (msg_silent != 0)
+  	return;
+  
+!     /*
+!      * When inside vgetc(), we can't wait for a typed character at all.
+!      * With the global command (and some others) we only need one return at
+!      * the end. Adjust cmdline_row to avoid the next message overwriting the
+!      * last one.
+!      */
+      if (vgetc_busy > 0)
+  	return;
++     need_wait_return = TRUE;
+      if (no_wait_return)
+      {
+  	if (!exmode_active)
+  	    cmdline_row = msg_row;
+  	return;
+*** ../vim-7.3.138/src/misc1.c	2011-03-03 15:04:01.000000000 +0100
+--- src/misc1.c	2011-03-22 12:15:26.000000000 +0100
+***************
+*** 3116,3122 ****
+  
+  	if (n == KEYLEN_REMOVED)  /* key code removed */
+  	{
+! 	    if (must_redraw)
+  	    {
+  		/* Redrawing was postponed, do it now. */
+  		update_screen(0);
+--- 3116,3122 ----
+  
+  	if (n == KEYLEN_REMOVED)  /* key code removed */
+  	{
+! 	    if (must_redraw != 0 && !need_wait_return && (State & CMDLINE) == 0)
+  	    {
+  		/* Redrawing was postponed, do it now. */
+  		update_screen(0);
+*** ../vim-7.3.138/src/version.c	2011-03-03 15:54:45.000000000 +0100
+--- src/version.c	2011-03-22 13:06:33.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     139,
+  /**/
+
+-- 
+"Software is like sex... it's better when it's free."
+		-- Linus Torvalds, initiator of the free Linux OS
+Makes me wonder what FSF stands for...?
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.140 b/source/ap/vim/patches/7.3.140
new file mode 100644
index 00000000..53c3aafb
--- /dev/null
+++ b/source/ap/vim/patches/7.3.140
@@ -0,0 +1,58 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.140
+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.3.140
+Problem:    Crash when drawing the "$" at end-of-line for list mode just after
+	    the window border and 'cursorline' is set.
+Solution:   Don't check for 'cursorline'. (Quentin Carbonneaux)
+Files:	    src/screen.c
+
+
+*** ../vim-7.3.139/src/screen.c	2011-02-09 17:09:26.000000000 +0100
+--- src/screen.c	2011-03-22 13:29:04.000000000 +0100
+***************
+*** 5099,5109 ****
+  #ifdef FEAT_DIFF
+  		    || filler_todo > 0
+  #endif
+! 		    || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str
+! #ifdef FEAT_SYN_HL
+! 			   && !wp->w_p_cul
+! #endif
+! 			)
+  		    || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL)))
+  		)
+  	{
+--- 5099,5105 ----
+  #ifdef FEAT_DIFF
+  		    || filler_todo > 0
+  #endif
+! 		    || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str)
+  		    || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL)))
+  		)
+  	{
+*** ../vim-7.3.139/src/version.c	2011-03-22 13:07:19.000000000 +0100
+--- src/version.c	2011-03-22 13:27:26.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     140,
+  /**/
+
+-- 
+Lawmakers made it obligatory for everybody to take at least one bath
+each week -- on Saturday night.
+		[real standing law in Vermont, United States of America]
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.141 b/source/ap/vim/patches/7.3.141
new file mode 100644
index 00000000..deb001b7
--- /dev/null
+++ b/source/ap/vim/patches/7.3.141
@@ -0,0 +1,94 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.141
+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.3.141
+Problem:    When a key code is not set get a confusing error message.
+Solution:   Change the error message to say the key code is not set.
+Files:	    src/option.c, runtime/doc/options.txt
+
+
+*** ../vim-7.3.140/src/option.c	2011-01-22 00:11:42.000000000 +0100
+--- src/option.c	2011-03-22 14:25:52.000000000 +0100
+***************
+*** 4352,4358 ****
+  		    p = find_termcode(key_name);
+  		    if (p == NULL)
+  		    {
+! 			errmsg = (char_u *)N_("E518: Unknown option");
+  			goto skip;
+  		    }
+  		    else
+--- 4352,4358 ----
+  		    p = find_termcode(key_name);
+  		    if (p == NULL)
+  		    {
+! 			errmsg = (char_u *)N_("E846: Key code not set");
+  			goto skip;
+  		    }
+  		    else
+***************
+*** 4700,4707 ****
+  						|| s[i] == ','
+  						|| s[i] == NUL))
+  					break;
+! 				    /* Count backspaces.  Only a comma with an
+! 				     * even number of backspaces before it is
+  				     * recognized as a separator */
+  				    if (s > origval && s[-1] == '\\')
+  					++bs;
+--- 4700,4707 ----
+  						|| s[i] == ','
+  						|| s[i] == NUL))
+  					break;
+! 				    /* Count backslashes.  Only a comma with an
+! 				     * even number of backslashes before it is
+  				     * recognized as a separator */
+  				    if (s > origval && s[-1] == '\\')
+  					++bs;
+*** ../vim-7.3.140/runtime/doc/options.txt	2010-12-02 21:43:10.000000000 +0100
+--- runtime/doc/options.txt	2011-03-22 14:32:14.000000000 +0100
+***************
+*** 150,155 ****
+--- 150,167 ----
+  (the ^[ is a real <Esc> here, use CTRL-V <Esc> to enter it)
+  The advantage over a mapping is that it works in all situations.
+  
++ You can define any key codes, e.g.: >
++ 	:set t_xy=^[foo;
++ There is no warning for using a name that isn't recognized.  You can map these
++ codes as you like: >
++ 	:map <t_xy> something
++ <								*E846*
++ When a key code is not set, it's like it does not exist.  Trying to get its
++ value will result in an error: >
++ 	:set t_kb=
++ 	:set t_kb
++ 	E846: Key code not set: t_kb
++ 
+  The t_xx options cannot be set from a |modeline| or in the |sandbox|, for
+  security reasons.
+  
+*** ../vim-7.3.140/src/version.c	2011-03-22 13:29:20.000000000 +0100
+--- src/version.c	2011-03-22 14:32:59.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     141,
+  /**/
+
+-- 
+"I know that there are people who don't love their fellow man,
+and I hate those people!" - Tom Lehrer
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.142 b/source/ap/vim/patches/7.3.142
new file mode 100644
index 00000000..6574f71f
--- /dev/null
+++ b/source/ap/vim/patches/7.3.142
@@ -0,0 +1,85 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.142
+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.3.142
+Problem:    Python stdout doesn't have a flush() method, causing an import to
+	    fail.
+Solution:   Add a dummy flush() method. (Tobias Columbus)
+Files:	    src/if_py_both.h
+
+
+*** ../vim-7.3.141/src/if_py_both.h	2010-10-27 12:17:54.000000000 +0200
+--- src/if_py_both.h	2011-03-22 15:37:43.000000000 +0100
+***************
+*** 33,38 ****
+--- 33,39 ----
+  
+  static PyObject *OutputWrite(PyObject *, PyObject *);
+  static PyObject *OutputWritelines(PyObject *, PyObject *);
++ static PyObject *OutputFlush(PyObject *, PyObject *);
+  
+  /* Function to write a line, points to either msg() or emsg(). */
+  typedef void (*writefn)(char_u *);
+***************
+*** 47,55 ****
+  
+  static struct PyMethodDef OutputMethods[] = {
+      /* name,	    function,		calling,    documentation */
+!     {"write",	    OutputWrite,	1,	    "" },
+!     {"writelines",  OutputWritelines,	1,	    "" },
+!     { NULL,	    NULL,		0,	    NULL }
+  };
+  
+  #define PyErr_SetVim(str) PyErr_SetString(VimError, str)
+--- 48,57 ----
+  
+  static struct PyMethodDef OutputMethods[] = {
+      /* name,	    function,		calling,    documentation */
+!     {"write",	    OutputWrite,	1,	    ""},
+!     {"writelines",  OutputWritelines,	1,	    ""},
+!     {"flush",       OutputFlush,        1,          ""},
+!     { NULL,	    NULL,		0,	    NULL}
+  };
+  
+  #define PyErr_SetVim(str) PyErr_SetString(VimError, str)
+***************
+*** 123,128 ****
+--- 125,139 ----
+      return Py_None;
+  }
+  
++     static PyObject *
++ OutputFlush(PyObject *self UNUSED, PyObject *args UNUSED)
++ {
++     /* do nothing */
++     Py_INCREF(Py_None);
++     return Py_None;
++ }
++ 
++ 
+  /* Buffer IO, we write one whole line at a time. */
+  static garray_T io_ga = {0, 0, 1, 80, NULL};
+  static writefn old_fn = NULL;
+*** ../vim-7.3.141/src/version.c	2011-03-22 14:35:01.000000000 +0100
+--- src/version.c	2011-03-22 15:45:38.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     142,
+  /**/
+
+-- 
+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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.143 b/source/ap/vim/patches/7.3.143
new file mode 100644
index 00000000..82585b0e
--- /dev/null
+++ b/source/ap/vim/patches/7.3.143
@@ -0,0 +1,1520 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.143
+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.3.143
+Problem:    Memfile is not tested sufficiently.  Looking up blocks in a
+	    memfile is slow when there are many blocks.
+Solution:   Add high level test and unittest.  Adjust the number of hash
+	    buckets to the number of blocks.  (Ivan Krasilnikov)
+Files:	    Filelist, src/Makefile, src/main.c, src/memfile.c,
+	    src/memfile_test.c src/structs.h src/testdir/Make_amiga.mak,
+	    src/testdir/Make_dos.mak, src/testdir/Make_ming.mak,
+	    src/testdir/Make_os2.mak, src/testdir/Make_vms.mak,
+	    src/testdir/Makefile, src/testdir/test77.in, src/testdir/test77.ok
+
+
+*** ../vim-7.3.142/Filelist	2010-08-15 21:57:20.000000000 +0200
+--- Filelist	2011-03-22 17:39:22.000000000 +0100
+***************
+*** 39,44 ****
+--- 39,45 ----
+  		src/mark.c \
+  		src/mbyte.c \
+  		src/memfile.c \
++ 		src/memfile_test.c \
+  		src/memline.c \
+  		src/menu.c \
+  		src/message.c \
+***************
+*** 686,691 ****
+--- 687,694 ----
+  		runtime/tutor/tutor.utf-8 \
+  		runtime/tutor/tutor.?? \
+  		runtime/tutor/tutor.??.* \
++ 		runtime/tutor/tutor.bar \
++ 		runtime/tutor/tutor.bar.* \
+  		runtime/spell/README.txt \
+  		runtime/spell/??/*.diff \
+  		runtime/spell/??/main.aap \
+*** ../vim-7.3.142/src/Makefile	2011-02-15 15:27:00.000000000 +0100
+--- src/Makefile	2011-03-22 18:07:25.000000000 +0100
+***************
+*** 561,567 ****
+  #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 -D_FORTIFY_SOURCE=1 -DU_DEBUG
+  #CFLAGS = -g -O2 -Wall -Wextra -Wmissing-prototypes -D_FORTIFY_SOURCE=1 -DU_DEBUG
+  #PYTHON_CFLAGS_EXTRA = -Wno-missing-field-initializers
+  #MZSCHEME_CFLAGS_EXTRA = -Wno-unreachable-code -Wno-unused-parameter
+--- 561,567 ----
+  #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 -D_FORTIFY_SOURCE=1
+  #CFLAGS = -g -O2 -Wall -Wextra -Wmissing-prototypes -D_FORTIFY_SOURCE=1 -DU_DEBUG
+  #PYTHON_CFLAGS_EXTRA = -Wno-missing-field-initializers
+  #MZSCHEME_CFLAGS_EXTRA = -Wno-unreachable-code -Wno-unused-parameter
+***************
+*** 594,601 ****
+  
+  # PROFILING - Uncomment the next two lines to do profiling with gcc and gprof.
+  # Might not work with GUI or Perl.
+! # For unknown reasons adding "-lc" fixes a linking problem with GCC.  That's
+! # probably a bug in the "-pg" implementation.
+  # Need to recompile everything after changing this: "make clean" "make".
+  #PROFILE_CFLAGS = -pg -g -DWE_ARE_PROFILING
+  #PROFILE_LIBS = -pg
+--- 594,602 ----
+  
+  # PROFILING - Uncomment the next two lines to do profiling with gcc and gprof.
+  # Might not work with GUI or Perl.
+! # For unknown reasons adding "-lc" fixes a linking problem with some versions
+! # of GCC.  That's probably a bug in the "-pg" implementation.
+! # After running Vim see the profile result with: gmon vim gmon.out | vim -
+  # Need to recompile everything after changing this: "make clean" "make".
+  #PROFILE_CFLAGS = -pg -g -DWE_ARE_PROFILING
+  #PROFILE_LIBS = -pg
+***************
+*** 606,613 ****
+  # Configuration is in the .ccmalloc or ~/.ccmalloc file.
+  # Doesn't work very well, since memory linked to from global variables
+  # (in libraries) is also marked as leaked memory.
+! #PROFILE_CFLAGS = -DEXITFREE
+! #PROFILE_LIBS = -lccmalloc
+  
+  #####################################################
+  ###  Specific systems, check if yours is listed!  ### {{{
+--- 607,614 ----
+  # Configuration is in the .ccmalloc or ~/.ccmalloc file.
+  # Doesn't work very well, since memory linked to from global variables
+  # (in libraries) is also marked as leaked memory.
+! #LEAK_CFLAGS = -DEXITFREE
+! #LEAK_LIBS = -lccmalloc
+  
+  #####################################################
+  ###  Specific systems, check if yours is listed!  ### {{{
+***************
+*** 1329,1335 ****
+  PRE_DEFS = -Iproto $(DEFS) $(GUI_DEFS) $(GUI_IPATH) $(CPPFLAGS) $(EXTRA_IPATHS)
+  POST_DEFS = $(X_CFLAGS) $(MZSCHEME_CFLAGS) $(TCL_CFLAGS) $(EXTRA_DEFS)
+  
+! ALL_CFLAGS = $(PRE_DEFS) $(CFLAGS) $(PROFILE_CFLAGS) $(POST_DEFS)
+  
+  # Exclude $CFLAGS for osdef.sh, for Mac 10.4 some flags don't work together
+  # with "-E".
+--- 1330,1336 ----
+  PRE_DEFS = -Iproto $(DEFS) $(GUI_DEFS) $(GUI_IPATH) $(CPPFLAGS) $(EXTRA_IPATHS)
+  POST_DEFS = $(X_CFLAGS) $(MZSCHEME_CFLAGS) $(TCL_CFLAGS) $(EXTRA_DEFS)
+  
+! ALL_CFLAGS = $(PRE_DEFS) $(CFLAGS) $(PROFILE_CFLAGS) $(LEAK_CFLAGS) $(POST_DEFS)
+  
+  # Exclude $CFLAGS for osdef.sh, for Mac 10.4 some flags don't work together
+  # with "-E".
+***************
+*** 1358,1364 ****
+  	   $(PYTHON3_LIBS) \
+  	   $(TCL_LIBS) \
+  	   $(RUBY_LIBS) \
+! 	   $(PROFILE_LIBS)
+  
+  # abbreviations
+  DEST_BIN = $(DESTDIR)$(BINDIR)
+--- 1359,1366 ----
+  	   $(PYTHON3_LIBS) \
+  	   $(TCL_LIBS) \
+  	   $(RUBY_LIBS) \
+! 	   $(PROFILE_LIBS) \
+! 	   $(LEAK_LIBS)
+  
+  # abbreviations
+  DEST_BIN = $(DESTDIR)$(BINDIR)
+***************
+*** 1480,1487 ****
+  	    if_python.c if_python3.c if_tcl.c if_ruby.c if_sniff.c \
+  	    gui_beval.c workshop.c wsdebug.c integration.c netbeans.c
+  
+  # All sources, also the ones that are not configured
+! ALL_SRC = $(BASIC_SRC) $(ALL_GUI_SRC) $(EXTRA_SRC)
+  
+  # Which files to check with lint.  Select one of these three lines.  ALL_SRC
+  # checks more, but may not work well for checking a GUI that wasn't configured.
+--- 1482,1496 ----
+  	    if_python.c if_python3.c if_tcl.c if_ruby.c if_sniff.c \
+  	    gui_beval.c workshop.c wsdebug.c integration.c netbeans.c
+  
++ # Unittest files
++ MEMFILE_TEST_SRC = memfile_test.c
++ MEMFILE_TEST_TARGET = memfile_test$(EXEEXT)
++ 
++ UNITTEST_SRC = $(MEMFILE_TEST_SRC)
++ UNITTEST_TARGETS = $(MEMFILE_TEST_TARGET)
++ 
+  # All sources, also the ones that are not configured
+! ALL_SRC = $(BASIC_SRC) $(ALL_GUI_SRC) $(UNITTEST_SRC) $(EXTRA_SRC)
+  
+  # Which files to check with lint.  Select one of these three lines.  ALL_SRC
+  # checks more, but may not work well for checking a GUI that wasn't configured.
+***************
+*** 1492,1498 ****
+  #LINT_SRC = $(ALL_SRC)
+  #LINT_SRC = $(BASIC_SRC)
+  
+! OBJ = \
+  	objects/buffer.o \
+  	objects/blowfish.o \
+  	objects/charset.o \
+--- 1501,1507 ----
+  #LINT_SRC = $(ALL_SRC)
+  #LINT_SRC = $(BASIC_SRC)
+  
+! OBJ_COMMON = \
+  	objects/buffer.o \
+  	objects/blowfish.o \
+  	objects/charset.o \
+***************
+*** 1513,1522 ****
+  	$(HANGULIN_OBJ) \
+  	objects/if_cscope.o \
+  	objects/if_xcmdsrv.o \
+- 	objects/main.o \
+  	objects/mark.o \
+! 	objects/memfile.o \
+! 	objects/memline.o \
+  	objects/menu.o \
+  	objects/message.o \
+  	objects/misc1.o \
+--- 1522,1529 ----
+  	$(HANGULIN_OBJ) \
+  	objects/if_cscope.o \
+  	objects/if_xcmdsrv.o \
+  	objects/mark.o \
+!         objects/memline.o \
+  	objects/menu.o \
+  	objects/message.o \
+  	objects/misc1.o \
+***************
+*** 1541,1546 ****
+--- 1548,1554 ----
+  	objects/term.o \
+  	objects/ui.o \
+  	objects/undo.o \
++ 	objects/version.o \
+  	objects/window.o \
+  	$(GUI_OBJ) \
+  	$(LUA_OBJ) \
+***************
+*** 1555,1560 ****
+--- 1563,1575 ----
+  	$(NETBEANS_OBJ) \
+  	$(WSDEBUG_OBJ)
+  
++ OBJ = $(OBJ_COMMON) \
++ 	objects/main.o \
++ 	objects/memfile.o \
++ 
++ MEMFILE_TEST_OBJ = $(OBJ_COMMON) \
++         objects/memfile_test.o
++ 
+  PRO_AUTO = \
+  	blowfish.pro \
+  	buffer.pro \
+***************
+*** 1700,1706 ****
+  $(VIMTARGET): auto/config.mk objects $(OBJ) version.c version.h
+  	$(CCC) version.c -o objects/version.o
+  	@LINK="$(PURIFY) $(SHRPENV) $(CClink) $(ALL_LIB_DIRS) $(LDFLAGS) \
+! 		-o $(VIMTARGET) $(OBJ) objects/version.o $(ALL_LIBS)" \
+  		MAKE="$(MAKE)" LINK_AS_NEEDED=$(LINK_AS_NEEDED) \
+  		sh $(srcdir)/link.sh
+  
+--- 1715,1721 ----
+  $(VIMTARGET): auto/config.mk objects $(OBJ) version.c version.h
+  	$(CCC) version.c -o objects/version.o
+  	@LINK="$(PURIFY) $(SHRPENV) $(CClink) $(ALL_LIB_DIRS) $(LDFLAGS) \
+! 		-o $(VIMTARGET) $(OBJ) $(ALL_LIBS)" \
+  		MAKE="$(MAKE)" LINK_AS_NEEDED=$(LINK_AS_NEEDED) \
+  		sh $(srcdir)/link.sh
+  
+***************
+*** 1825,1830 ****
+--- 1840,1854 ----
+  		ln -s $(VIMTARGET) vim; \
+  	fi
+  	cd testdir; $(MAKE) -f Makefile $(GUI_TESTTARGET) VIMPROG=../$(VIMTARGET) $(GUI_TESTARG)
++ 	$(MAKE) -f Makefile unittest
++ 
++ unittesttargets:
++ 	$(MAKE) -f Makefile $(UNITTEST_TARGETS)
++ 
++ unittest unittests: $(UNITTEST_TARGETS)
++ 	@for t in $(UNITTEST_TARGETS); do \
++ 		./$$t || exit 1; echo $$t passed; \
++ 	done
+  
+  testclean:
+  	cd testdir; $(MAKE) -f Makefile clean
+***************
+*** 1832,1837 ****
+--- 1856,1872 ----
+  		cd $(PODIR); $(MAKE) checkclean; \
+  	fi
+  
++ # Unittests
++ # It's build just like Vim to satisfy all dependencies.
++ $(MEMFILE_TEST_TARGET): auto/config.mk objects $(MEMFILE_TEST_OBJ)
++ 	$(CCC) version.c -o objects/version.o
++ 	@LINK="$(PURIFY) $(SHRPENV) $(CClink) $(ALL_LIB_DIRS) $(LDFLAGS) \
++ 		-o $(MEMFILE_TEST_TARGET) $(MEMFILE_TEST_OBJ) $(ALL_LIBS)" \
++ 		MAKE="$(MAKE)" LINK_AS_NEEDED=$(LINK_AS_NEEDED) \
++ 		sh $(srcdir)/link.sh
++ 
++ # install targets
++ 
+  install: $(GUI_INSTALL)
+  
+  install_normal: installvim installtools $(INSTALL_LANGS) install-icons
+***************
+*** 2265,2270 ****
+--- 2300,2306 ----
+  	-rm -f *.o objects/* core $(VIMTARGET).core $(VIMTARGET) vim xxd/*.o
+  	-rm -f $(TOOLS) auto/osdef.h auto/pathdef.c auto/if_perl.c
+  	-rm -f conftest* *~ auto/link.sed
++ 	-rm -f $(UNITTEST_TARGETS)
+  	-rm -f runtime pixmaps
+  	-rm -rf $(APPDIR)
+  	-rm -rf mzscheme_base.c
+***************
+*** 2559,2564 ****
+--- 2595,2603 ----
+  objects/memfile.o: memfile.c
+  	$(CCC) -o $@ memfile.c
+  
++ objects/memfile_test.o: memfile_test.c
++ 	$(CCC) -o $@ memfile_test.c
++ 
+  objects/memline.o: memline.c
+  	$(CCC) -o $@ memline.c
+  
+***************
+*** 2877,2883 ****
+  objects/os_unix.o: os_unix.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
+   ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
+   gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \
+!  arabic.h if_mzsch.h os_unixx.h
+  objects/pathdef.o: auto/pathdef.c vim.h auto/config.h feature.h os_unix.h \
+   auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
+   regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \
+--- 2916,2922 ----
+  objects/os_unix.o: os_unix.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
+   ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
+   gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \
+!  arabic.h os_unixx.h
+  objects/pathdef.o: auto/pathdef.c vim.h auto/config.h feature.h os_unix.h \
+   auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
+   regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \
+***************
+*** 3016,3021 ****
+--- 3055,3064 ----
+  objects/pty.o: pty.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii.h \
+   keymap.h term.h macros.h option.h structs.h regexp.h gui.h gui_beval.h \
+   proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h arabic.h
++ objects/memfile_test.o: memfile_test.c main.c vim.h auto/config.h feature.h \
++  os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h \
++  structs.h regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h \
++  proto.h globals.h farsi.h arabic.h farsi.c arabic.c memfile.c
+  objects/hangulin.o: hangulin.c vim.h auto/config.h feature.h os_unix.h \
+   auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
+   regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \
+***************
+*** 3027,3033 ****
+  objects/if_mzsch.o: if_mzsch.c vim.h auto/config.h feature.h os_unix.h \
+   auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
+   regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \
+!  globals.h farsi.h arabic.h if_mzsch.h mzscheme_base.c
+  objects/if_perl.o: auto/if_perl.c vim.h auto/config.h feature.h os_unix.h \
+   auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
+   regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \
+--- 3070,3076 ----
+  objects/if_mzsch.o: if_mzsch.c vim.h auto/config.h feature.h os_unix.h \
+   auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
+   regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \
+!  globals.h farsi.h arabic.h if_mzsch.h
+  objects/if_perl.o: auto/if_perl.c vim.h auto/config.h feature.h os_unix.h \
+   auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
+   regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \
+***************
+*** 3048,3054 ****
+   ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
+   gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \
+   arabic.h
+! objects/if_ruby.o: if_ruby.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
+   ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
+   gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \
+   arabic.h version.h
+--- 3091,3097 ----
+   ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
+   gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \
+   arabic.h
+! objects/if_ruby.o: if_ruby.c auto/config.h vim.h feature.h os_unix.h auto/osdef.h \
+   ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
+   gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \
+   arabic.h version.h
+*** ../vim-7.3.142/src/main.c	2011-02-15 16:29:54.000000000 +0100
+--- src/main.c	2011-03-18 13:19:48.000000000 +0100
+***************
+*** 92,128 ****
+  #define EDIT_TAG    3	    /* tag name argument given, use tagname */
+  #define EDIT_QF	    4	    /* start in quickfix mode */
+  
+! #if defined(UNIX) || defined(VMS)
+  static int file_owned __ARGS((char *fname));
+  #endif
+  static void mainerr __ARGS((int, char_u *));
+  static void main_msg __ARGS((char *s));
+  static void usage __ARGS((void));
+  static int get_number_arg __ARGS((char_u *p, int *idx, int def));
+! #if defined(HAVE_LOCALE_H) || defined(X_LOCALE)
+  static void init_locale __ARGS((void));
+! #endif
+  static void parse_command_name __ARGS((mparm_T *parmp));
+  static void early_arg_scan __ARGS((mparm_T *parmp));
+  static void command_line_scan __ARGS((mparm_T *parmp));
+  static void check_tty __ARGS((mparm_T *parmp));
+  static void read_stdin __ARGS((void));
+  static void create_windows __ARGS((mparm_T *parmp));
+! #ifdef FEAT_WINDOWS
+  static void edit_buffers __ARGS((mparm_T *parmp));
+! #endif
+  static void exe_pre_commands __ARGS((mparm_T *parmp));
+  static void exe_commands __ARGS((mparm_T *parmp));
+  static void source_startup_scripts __ARGS((mparm_T *parmp));
+  static void main_start_gui __ARGS((void));
+! #if defined(HAS_SWAP_EXISTS_ACTION)
+  static void check_swap_exists_action __ARGS((void));
+! #endif
+! #ifdef FEAT_CLIENTSERVER
+  static void exec_on_server __ARGS((mparm_T *parmp));
+  static void prepare_server __ARGS((mparm_T *parmp));
+  static void cmdsrv_main __ARGS((int *argc, char **argv, char_u *serverName_arg, char_u **serverStr));
+  static char_u *serverMakeName __ARGS((char_u *arg, char *cmd));
+  #endif
+  
+  
+--- 92,130 ----
+  #define EDIT_TAG    3	    /* tag name argument given, use tagname */
+  #define EDIT_QF	    4	    /* start in quickfix mode */
+  
+! #if (defined(UNIX) || defined(VMS)) && !defined(NO_VIM_MAIN)
+  static int file_owned __ARGS((char *fname));
+  #endif
+  static void mainerr __ARGS((int, char_u *));
++ #ifndef NO_VIM_MAIN
+  static void main_msg __ARGS((char *s));
+  static void usage __ARGS((void));
+  static int get_number_arg __ARGS((char_u *p, int *idx, int def));
+! # if defined(HAVE_LOCALE_H) || defined(X_LOCALE)
+  static void init_locale __ARGS((void));
+! # endif
+  static void parse_command_name __ARGS((mparm_T *parmp));
+  static void early_arg_scan __ARGS((mparm_T *parmp));
+  static void command_line_scan __ARGS((mparm_T *parmp));
+  static void check_tty __ARGS((mparm_T *parmp));
+  static void read_stdin __ARGS((void));
+  static void create_windows __ARGS((mparm_T *parmp));
+! # ifdef FEAT_WINDOWS
+  static void edit_buffers __ARGS((mparm_T *parmp));
+! # endif
+  static void exe_pre_commands __ARGS((mparm_T *parmp));
+  static void exe_commands __ARGS((mparm_T *parmp));
+  static void source_startup_scripts __ARGS((mparm_T *parmp));
+  static void main_start_gui __ARGS((void));
+! # if defined(HAS_SWAP_EXISTS_ACTION)
+  static void check_swap_exists_action __ARGS((void));
+! # endif
+! # if defined(FEAT_CLIENTSERVER) || defined(PROTO)
+  static void exec_on_server __ARGS((mparm_T *parmp));
+  static void prepare_server __ARGS((mparm_T *parmp));
+  static void cmdsrv_main __ARGS((int *argc, char **argv, char_u *serverName_arg, char_u **serverStr));
+  static char_u *serverMakeName __ARGS((char_u *arg, char *cmd));
++ # endif
+  #endif
+  
+  
+***************
+*** 145,151 ****
+  #define ME_INVALID_ARG		5
+  };
+  
+! #ifndef PROTO	    /* don't want a prototype for main() */
+      int
+  # ifdef VIMDLL
+  _export
+--- 147,154 ----
+  #define ME_INVALID_ARG		5
+  };
+  
+! #ifndef NO_VIM_MAIN	/* skip this for unittests */
+! #ifndef PROTO		/* don't want a prototype for main() */
+      int
+  # ifdef VIMDLL
+  _export
+***************
+*** 966,971 ****
+--- 969,975 ----
+      return 0;
+  }
+  #endif /* PROTO */
++ #endif /* NO_VIM_MAIN */
+  
+  /*
+   * Main loop: Execute Normal mode commands until exiting Vim.
+***************
+*** 1430,1435 ****
+--- 1434,1440 ----
+      mch_exit(exitval);
+  }
+  
++ #ifndef NO_VIM_MAIN
+  /*
+   * Get a (optional) count for a Vim argument.
+   */
+***************
+*** 2994,2999 ****
+--- 2999,3006 ----
+  #endif
+  }
+  
++ #endif  /* NO_VIM_MAIN */
++ 
+  /*
+   * Get an environment variable, and execute it as Ex commands.
+   * Returns FAIL if the environment variable was not executed, OK otherwise.
+***************
+*** 3033,3039 ****
+      return FAIL;
+  }
+  
+! #if defined(UNIX) || defined(VMS)
+  /*
+   * Return TRUE if we are certain the user owns the file "fname".
+   * Used for ".vimrc" and ".exrc".
+--- 3040,3046 ----
+      return FAIL;
+  }
+  
+! #if (defined(UNIX) || defined(VMS)) && !defined(NO_VIM_MAIN)
+  /*
+   * Return TRUE if we are certain the user owns the file "fname".
+   * Used for ".vimrc" and ".exrc".
+***************
+*** 3091,3096 ****
+--- 3098,3104 ----
+      mainerr(ME_ARG_MISSING, str);
+  }
+  
++ #ifndef NO_VIM_MAIN
+  /*
+   * print a message with three spaces prepended and '\n' appended.
+   */
+***************
+*** 3311,3316 ****
+--- 3319,3326 ----
+  }
+  #endif
+  
++ #endif
++ 
+  #if defined(STARTUPTIME) || defined(PROTO)
+  static void time_diff __ARGS((struct timeval *then, struct timeval *now));
+  
+***************
+*** 3420,3426 ****
+  
+  #endif
+  
+! #if defined(FEAT_CLIENTSERVER) || defined(PROTO)
+  
+  /*
+   * Common code for the X command server and the Win32 command server.
+--- 3430,3436 ----
+  
+  #endif
+  
+! #if (defined(FEAT_CLIENTSERVER) && !defined(NO_VIM_MAIN)) || defined(PROTO)
+  
+  /*
+   * Common code for the X command server and the Win32 command server.
+***************
+*** 3888,3893 ****
+--- 3898,3929 ----
+  }
+  
+  /*
++  * Make our basic server name: use the specified "arg" if given, otherwise use
++  * the tail of the command "cmd" we were started with.
++  * Return the name in allocated memory.  This doesn't include a serial number.
++  */
++     static char_u *
++ serverMakeName(arg, cmd)
++     char_u	*arg;
++     char	*cmd;
++ {
++     char_u *p;
++ 
++     if (arg != NULL && *arg != NUL)
++ 	p = vim_strsave_up(arg);
++     else
++     {
++ 	p = vim_strsave_up(gettail((char_u *)cmd));
++ 	/* Remove .exe or .bat from the name. */
++ 	if (p != NULL && vim_strchr(p, '.') != NULL)
++ 	    *vim_strchr(p, '.') = NUL;
++     }
++     return p;
++ }
++ #endif /* FEAT_CLIENTSERVER */
++ 
++ #if defined(FEAT_CLIENTSERVER) || defined(PROTO)
++ /*
+   * Replace termcodes such as <CR> and insert as key presses if there is room.
+   */
+      void
+***************
+*** 3998,4029 ****
+  # endif
+      return res;
+  }
+! 
+! 
+! /*
+!  * Make our basic server name: use the specified "arg" if given, otherwise use
+!  * the tail of the command "cmd" we were started with.
+!  * Return the name in allocated memory.  This doesn't include a serial number.
+!  */
+!     static char_u *
+! serverMakeName(arg, cmd)
+!     char_u	*arg;
+!     char	*cmd;
+! {
+!     char_u *p;
+! 
+!     if (arg != NULL && *arg != NUL)
+! 	p = vim_strsave_up(arg);
+!     else
+!     {
+! 	p = vim_strsave_up(gettail((char_u *)cmd));
+! 	/* Remove .exe or .bat from the name. */
+! 	if (p != NULL && vim_strchr(p, '.') != NULL)
+! 	    *vim_strchr(p, '.') = NUL;
+!     }
+!     return p;
+! }
+! #endif /* FEAT_CLIENTSERVER */
+  
+  /*
+   * When FEAT_FKMAP is defined, also compile the Farsi source code.
+--- 4034,4040 ----
+  # endif
+      return res;
+  }
+! #endif
+  
+  /*
+   * When FEAT_FKMAP is defined, also compile the Farsi source code.
+*** ../vim-7.3.142/src/memfile.c	2010-12-17 18:06:00.000000000 +0100
+--- src/memfile.c	2011-03-03 18:47:39.000000000 +0100
+***************
+*** 84,89 ****
+--- 84,96 ----
+  static int  mf_write_block __ARGS((memfile_T *mfp, bhdr_T *hp, off_t offset, unsigned size));
+  static int  mf_trans_add __ARGS((memfile_T *, bhdr_T *));
+  static void mf_do_open __ARGS((memfile_T *, char_u *, int));
++ static void mf_hash_init __ARGS((mf_hashtab_T *));
++ static void mf_hash_free __ARGS((mf_hashtab_T *));
++ static void mf_hash_free_all __ARGS((mf_hashtab_T *));
++ static mf_hashitem_T *mf_hash_find __ARGS((mf_hashtab_T *, blocknr_T));
++ static void mf_hash_add_item __ARGS((mf_hashtab_T *, mf_hashitem_T *));
++ static void mf_hash_rem_item __ARGS((mf_hashtab_T *, mf_hashitem_T *));
++ static int mf_hash_grow __ARGS((mf_hashtab_T *));
+  
+  /*
+   * The functions for using a memfile:
+***************
+*** 119,125 ****
+      int		flags;
+  {
+      memfile_T		*mfp;
+-     int			i;
+      off_t		size;
+  #if defined(STATFS) && defined(UNIX) && !defined(__QNX__)
+  # define USE_FSTATFS
+--- 126,131 ----
+***************
+*** 152,162 ****
+      mfp->mf_used_last = NULL;
+      mfp->mf_dirty = FALSE;
+      mfp->mf_used_count = 0;
+!     for (i = 0; i < MEMHASHSIZE; ++i)
+!     {
+! 	mfp->mf_hash[i] = NULL;		/* hash lists are empty */
+! 	mfp->mf_trans[i] = NULL;	/* trans lists are empty */
+!     }
+      mfp->mf_page_size = MEMFILE_PAGE_SIZE;
+  #ifdef FEAT_CRYPT
+      mfp->mf_old_key = NULL;
+--- 158,165 ----
+      mfp->mf_used_last = NULL;
+      mfp->mf_dirty = FALSE;
+      mfp->mf_used_count = 0;
+!     mf_hash_init(&mfp->mf_hash);
+!     mf_hash_init(&mfp->mf_trans);
+      mfp->mf_page_size = MEMFILE_PAGE_SIZE;
+  #ifdef FEAT_CRYPT
+      mfp->mf_old_key = NULL;
+***************
+*** 242,249 ****
+      int		del_file;
+  {
+      bhdr_T	*hp, *nextp;
+-     NR_TRANS	*tp, *tpnext;
+-     int		i;
+  
+      if (mfp == NULL)		    /* safety check */
+  	return;
+--- 245,250 ----
+***************
+*** 263,274 ****
+      }
+      while (mfp->mf_free_first != NULL)	    /* free entries in free list */
+  	vim_free(mf_rem_free(mfp));
+!     for (i = 0; i < MEMHASHSIZE; ++i)	    /* free entries in trans lists */
+! 	for (tp = mfp->mf_trans[i]; tp != NULL; tp = tpnext)
+! 	{
+! 	    tpnext = tp->nt_next;
+! 	    vim_free(tp);
+! 	}
+      vim_free(mfp->mf_fname);
+      vim_free(mfp->mf_ffname);
+      vim_free(mfp);
+--- 264,271 ----
+      }
+      while (mfp->mf_free_first != NULL)	    /* free entries in free list */
+  	vim_free(mf_rem_free(mfp));
+!     mf_hash_free(&mfp->mf_hash);
+!     mf_hash_free_all(&mfp->mf_trans);	    /* free hashtable and its items */
+      vim_free(mfp->mf_fname);
+      vim_free(mfp->mf_ffname);
+      vim_free(mfp);
+***************
+*** 743,758 ****
+      memfile_T	*mfp;
+      bhdr_T	*hp;
+  {
+!     bhdr_T	*hhp;
+!     int		hash;
+! 
+!     hash = MEMHASH(hp->bh_bnum);
+!     hhp = mfp->mf_hash[hash];
+!     hp->bh_hash_next = hhp;
+!     hp->bh_hash_prev = NULL;
+!     if (hhp != NULL)
+! 	hhp->bh_hash_prev = hp;
+!     mfp->mf_hash[hash] = hp;
+  }
+  
+  /*
+--- 740,746 ----
+      memfile_T	*mfp;
+      bhdr_T	*hp;
+  {
+!     mf_hash_add_item(&mfp->mf_hash, (mf_hashitem_T *)hp);
+  }
+  
+  /*
+***************
+*** 763,775 ****
+      memfile_T	*mfp;
+      bhdr_T	*hp;
+  {
+!     if (hp->bh_hash_prev == NULL)
+! 	mfp->mf_hash[MEMHASH(hp->bh_bnum)] = hp->bh_hash_next;
+!     else
+! 	hp->bh_hash_prev->bh_hash_next = hp->bh_hash_next;
+! 
+!     if (hp->bh_hash_next)
+! 	hp->bh_hash_next->bh_hash_prev = hp->bh_hash_prev;
+  }
+  
+  /*
+--- 751,757 ----
+      memfile_T	*mfp;
+      bhdr_T	*hp;
+  {
+!     mf_hash_rem_item(&mfp->mf_hash, (mf_hashitem_T *)hp);
+  }
+  
+  /*
+***************
+*** 780,791 ****
+      memfile_T	*mfp;
+      blocknr_T	nr;
+  {
+!     bhdr_T	*hp;
+! 
+!     for (hp = mfp->mf_hash[MEMHASH(nr)]; hp != NULL; hp = hp->bh_hash_next)
+! 	if (hp->bh_bnum == nr)
+! 	    break;
+!     return hp;
+  }
+  
+  /*
+--- 762,768 ----
+      memfile_T	*mfp;
+      blocknr_T	nr;
+  {
+!     return (bhdr_T *)mf_hash_find(&mfp->mf_hash, nr);
+  }
+  
+  /*
+***************
+*** 1187,1193 ****
+  {
+      bhdr_T	*freep;
+      blocknr_T	new_bnum;
+-     int		hash;
+      NR_TRANS	*np;
+      int		page_count;
+  
+--- 1164,1169 ----
+***************
+*** 1235,1246 ****
+      hp->bh_bnum = new_bnum;
+      mf_ins_hash(mfp, hp);		    /* insert in new hash list */
+  
+!     hash = MEMHASH(np->nt_old_bnum);	    /* insert in trans list */
+!     np->nt_next = mfp->mf_trans[hash];
+!     mfp->mf_trans[hash] = np;
+!     if (np->nt_next != NULL)
+! 	np->nt_next->nt_prev = np;
+!     np->nt_prev = NULL;
+  
+      return OK;
+  }
+--- 1211,1218 ----
+      hp->bh_bnum = new_bnum;
+      mf_ins_hash(mfp, hp);		    /* insert in new hash list */
+  
+!     /* Insert "np" into "mf_trans" hashtable with key "np->nt_old_bnum" */
+!     mf_hash_add_item(&mfp->mf_trans, (mf_hashitem_T *)np);
+  
+      return OK;
+  }
+***************
+*** 1255,1279 ****
+      memfile_T	*mfp;
+      blocknr_T	old_nr;
+  {
+-     int		hash;
+      NR_TRANS	*np;
+      blocknr_T	new_bnum;
+  
+!     hash = MEMHASH(old_nr);
+!     for (np = mfp->mf_trans[hash]; np != NULL; np = np->nt_next)
+! 	if (np->nt_old_bnum == old_nr)
+! 	    break;
+      if (np == NULL)		/* not found */
+  	return old_nr;
+  
+      mfp->mf_neg_count--;
+      new_bnum = np->nt_new_bnum;
+!     if (np->nt_prev != NULL)		/* remove entry from the trans list */
+! 	np->nt_prev->nt_next = np->nt_next;
+!     else
+! 	mfp->mf_trans[hash] = np->nt_next;
+!     if (np->nt_next != NULL)
+! 	np->nt_next->nt_prev = np->nt_prev;
+      vim_free(np);
+  
+      return new_bnum;
+--- 1227,1246 ----
+      memfile_T	*mfp;
+      blocknr_T	old_nr;
+  {
+      NR_TRANS	*np;
+      blocknr_T	new_bnum;
+  
+!     np = (NR_TRANS *)mf_hash_find(&mfp->mf_trans, old_nr);
+! 
+      if (np == NULL)		/* not found */
+  	return old_nr;
+  
+      mfp->mf_neg_count--;
+      new_bnum = np->nt_new_bnum;
+! 
+!     /* remove entry from the trans list */
+!     mf_hash_rem_item(&mfp->mf_trans, (mf_hashitem_T *)np);
+! 
+      vim_free(np);
+  
+      return new_bnum;
+***************
+*** 1397,1399 ****
+--- 1364,1570 ----
+  	mch_hide(mfp->mf_fname);    /* try setting the 'hidden' flag */
+      }
+  }
++ 
++ /*
++  * Implementation of mf_hashtab_T follows.
++  */
++ 
++ /*
++  * The number of buckets in the hashtable is increased by a factor of
++  * MHT_GROWTH_FACTOR when the average number of items per bucket
++  * exceeds 2 ^ MHT_LOG_LOAD_FACTOR.
++  */
++ #define MHT_LOG_LOAD_FACTOR 6
++ #define MHT_GROWTH_FACTOR   2   /* must be a power of two */
++ 
++ /*
++  * Initialize an empty hash table.
++  */
++     static void
++ mf_hash_init(mht)
++     mf_hashtab_T *mht;
++ {
++     vim_memset(mht, 0, sizeof(mf_hashtab_T));
++     mht->mht_buckets = mht->mht_small_buckets;
++     mht->mht_mask = MHT_INIT_SIZE - 1;
++ }
++ 
++ /*
++  * Free the array of a hash table.  Does not free the items it contains!
++  * The hash table must not be used again without another mf_hash_init() call.
++  */
++     static void
++ mf_hash_free(mht)
++     mf_hashtab_T *mht;
++ {
++     if (mht->mht_buckets != mht->mht_small_buckets)
++ 	vim_free(mht->mht_buckets);
++ }
++ 
++ /*
++  * Free the array of a hash table and all the items it contains.
++  */
++     static void
++ mf_hash_free_all(mht)
++     mf_hashtab_T    *mht;
++ {
++     long_u	    idx;
++     mf_hashitem_T   *mhi;
++     mf_hashitem_T   *next;
++ 
++     for (idx = 0; idx <= mht->mht_mask; idx++)
++ 	for (mhi = mht->mht_buckets[idx]; mhi != NULL; mhi = next)
++ 	{
++ 	    next = mhi->mhi_next;
++ 	    vim_free(mhi);
++ 	}
++ 
++     mf_hash_free(mht);
++ }
++ 
++ /*
++  * Find "key" in hashtable "mht".
++  * Returns a pointer to a mf_hashitem_T or NULL if the item was not found.
++  */
++     static mf_hashitem_T *
++ mf_hash_find(mht, key)
++     mf_hashtab_T    *mht;
++     blocknr_T	    key;
++ {
++     mf_hashitem_T   *mhi;
++ 
++     mhi = mht->mht_buckets[key & mht->mht_mask];
++     while (mhi != NULL && mhi->mhi_key != key)
++ 	mhi = mhi->mhi_next;
++ 
++     return mhi;
++ }
++ 
++ /*
++  * Add item "mhi" to hashtable "mht".
++  * "mhi" must not be NULL.
++  */
++     static void
++ mf_hash_add_item(mht, mhi)
++     mf_hashtab_T    *mht;
++     mf_hashitem_T   *mhi;
++ {
++     long_u	    idx;
++ 
++     idx = mhi->mhi_key & mht->mht_mask;
++     mhi->mhi_next = mht->mht_buckets[idx];
++     mhi->mhi_prev = NULL;
++     if (mhi->mhi_next != NULL)
++ 	mhi->mhi_next->mhi_prev = mhi;
++     mht->mht_buckets[idx] = mhi;
++ 
++     mht->mht_count++;
++ 
++     /*
++      * Grow hashtable when we have more thank 2^MHT_LOG_LOAD_FACTOR
++      * items per bucket on average
++      */
++     if (mht->mht_fixed == 0
++ 	&& (mht->mht_count >> MHT_LOG_LOAD_FACTOR) > mht->mht_mask)
++     {
++ 	if (mf_hash_grow(mht) == FAIL)
++ 	{
++ 	    /* stop trying to grow after first failure to allocate memory */
++ 	    mht->mht_fixed = 1;
++ 	}
++     }
++ }
++ 
++ /*
++  * Remove item "mhi" from hashtable "mht".
++  * "mhi" must not be NULL and must have been inserted into "mht".
++  */
++     static void
++ mf_hash_rem_item(mht, mhi)
++     mf_hashtab_T    *mht;
++     mf_hashitem_T   *mhi;
++ {
++     if (mhi->mhi_prev == NULL)
++ 	mht->mht_buckets[mhi->mhi_key & mht->mht_mask] = mhi->mhi_next;
++     else
++ 	mhi->mhi_prev->mhi_next = mhi->mhi_next;
++ 
++     if (mhi->mhi_next != NULL)
++ 	mhi->mhi_next->mhi_prev = mhi->mhi_prev;
++ 
++     mht->mht_count--;
++ 
++     /* We could shrink the table here, but it typically takes little memory,
++      * so why bother?  */
++ }
++ 
++ /*
++  * Increase number of buckets in the hashtable by MHT_GROWTH_FACTOR and
++  * rehash items.
++  * Returns FAIL when out of memory.
++  */
++     static int
++ mf_hash_grow(mht)
++     mf_hashtab_T    *mht;
++ {
++     long_u	    i, j;
++     int		    shift;
++     mf_hashitem_T   *mhi;
++     mf_hashitem_T   *tails[MHT_GROWTH_FACTOR];
++     mf_hashitem_T   **buckets;
++     size_t	    size;
++ 
++     size = (mht->mht_mask + 1) * MHT_GROWTH_FACTOR * sizeof(void *);
++     buckets = (mf_hashitem_T **)lalloc_clear(size, FALSE);
++     if (buckets == NULL)
++ 	return FAIL;
++ 
++     shift = 0;
++     while ((mht->mht_mask >> shift) != 0)
++ 	shift++;
++ 
++     for (i = 0; i <= mht->mht_mask; i++)
++     {
++ 	/*
++ 	 * Traverse the items in the i-th original bucket and move them into
++ 	 * MHT_GROWTH_FACTOR new buckets, preserving their relative order
++ 	 * within each new bucket.  Preserving the order is important because
++ 	 * mf_get() tries to keep most recently used items at the front of
++ 	 * each bucket.
++ 	 *
++ 	 * Here we strongly rely on the fact the hashes are computed modulo
++ 	 * a power of two.
++ 	 */
++ 
++ 	vim_memset(tails, 0, sizeof(tails));
++ 
++ 	for (mhi = mht->mht_buckets[i]; mhi != NULL; mhi = mhi->mhi_next)
++ 	{
++ 	    j = (mhi->mhi_key >> shift) & (MHT_GROWTH_FACTOR - 1);
++ 	    if (tails[j] == NULL)
++ 	    {
++ 		buckets[i + (j << shift)] = mhi;
++ 		tails[j] = mhi;
++ 		mhi->mhi_prev = NULL;
++ 	    }
++ 	    else
++ 	    {
++ 		tails[j]->mhi_next = mhi;
++ 		mhi->mhi_prev = tails[j];
++ 		tails[j] = mhi;
++ 	    }
++ 	}
++ 
++ 	for (j = 0; j < MHT_GROWTH_FACTOR; j++)
++ 	    if (tails[j] != NULL)
++ 		tails[j]->mhi_next = NULL;
++     }
++ 
++     if (mht->mht_buckets != mht->mht_small_buckets)
++ 	vim_free(mht->mht_buckets);
++ 
++     mht->mht_buckets = buckets;
++     mht->mht_mask = (mht->mht_mask + 1) * MHT_GROWTH_FACTOR - 1;
++ 
++     return OK;
++ }
+*** ../vim-7.3.142/src/memfile_test.c	2011-03-03 21:58:14.000000000 +0100
+--- src/memfile_test.c	2011-03-03 20:40:29.000000000 +0100
+***************
+*** 0 ****
+--- 1,145 ----
++ /* vi:set ts=8 sts=4 sw=4:
++  *
++  * VIM - Vi IMproved	by Bram Moolenaar
++  *
++  * Do ":help uganda"  in Vim to read copying and usage conditions.
++  * Do ":help credits" in Vim to see a list of people who contributed.
++  * See README.txt for an overview of the Vim source code.
++  */
++ 
++ /*
++  * memfile_test.c: Unittests for memfile.c
++  * Mostly by Ivan Krasilnikov.
++  */
++ 
++ #undef NDEBUG
++ #include <assert.h>
++ 
++ /* Must include main.c because it contains much more than just main() */
++ #define NO_VIM_MAIN
++ #include "main.c"
++ 
++ /* This file has to be included because the tested functions are static */
++ #include "memfile.c"
++ 
++ #define index_to_key(i) ((i) ^ 15167)
++ #define TEST_COUNT 50000
++ 
++ static void test_mf_hash __ARGS((void));
++ 
++ /*
++  * Test mf_hash_*() functions.
++  */
++     static void
++ test_mf_hash()
++ {
++     mf_hashtab_T   ht;
++     mf_hashitem_T  *item;
++     blocknr_T      key;
++     long_u	   i;
++     long_u	   num_buckets;
++ 
++     mf_hash_init(&ht);
++ 
++     /* insert some items and check invariants */
++     for (i = 0; i < TEST_COUNT; i++)
++     {
++ 	assert(ht.mht_count == i);
++ 
++ 	/* check that number of buckets is a power of 2 */
++ 	num_buckets = ht.mht_mask + 1;
++ 	assert(num_buckets > 0 && (num_buckets & (num_buckets - 1)) == 0);
++ 
++ 	/* check load factor */
++ 	assert(ht.mht_count <= (num_buckets << MHT_LOG_LOAD_FACTOR));
++ 
++ 	if (i < (MHT_INIT_SIZE << MHT_LOG_LOAD_FACTOR))
++ 	{
++ 	    /* first expansion shouldn't have occurred yet */
++ 	    assert(num_buckets == MHT_INIT_SIZE);
++ 	    assert(ht.mht_buckets == ht.mht_small_buckets);
++ 	}
++ 	else
++ 	{
++ 	    assert(num_buckets > MHT_INIT_SIZE);
++ 	    assert(ht.mht_buckets != ht.mht_small_buckets);
++ 	}
++ 
++ 	key = index_to_key(i);
++ 	assert(mf_hash_find(&ht, key) == NULL);
++ 
++ 	/* allocate and add new item */
++ 	item = (mf_hashitem_T *)lalloc_clear(sizeof(mf_hashtab_T), FALSE);
++ 	assert(item != NULL);
++ 	item->mhi_key = key;
++ 	mf_hash_add_item(&ht, item);
++ 
++ 	assert(mf_hash_find(&ht, key) == item);
++ 
++ 	if (ht.mht_mask + 1 != num_buckets)
++ 	{
++ 	    /* hash table was expanded */
++ 	    assert(ht.mht_mask + 1 == num_buckets * MHT_GROWTH_FACTOR);
++ 	    assert(i + 1 == (num_buckets << MHT_LOG_LOAD_FACTOR));
++ 	}
++     }
++ 
++     /* check presence of inserted items */
++     for (i = 0; i < TEST_COUNT; i++)
++     {
++ 	key = index_to_key(i);
++ 	item = mf_hash_find(&ht, key);
++ 	assert(item != NULL);
++ 	assert(item->mhi_key == key);
++     }
++ 
++     /* delete some items */
++     for (i = 0; i < TEST_COUNT; i++)
++     {
++ 	if (i % 100 < 70)
++ 	{
++ 	    key = index_to_key(i);
++ 	    item = mf_hash_find(&ht, key);
++ 	    assert(item != NULL);
++ 	    assert(item->mhi_key == key);
++ 
++ 	    mf_hash_rem_item(&ht, item);
++ 	    assert(mf_hash_find(&ht, key) == NULL);
++ 
++ 	    mf_hash_add_item(&ht, item);
++ 	    assert(mf_hash_find(&ht, key) == item);
++ 
++ 	    mf_hash_rem_item(&ht, item);
++ 	    assert(mf_hash_find(&ht, key) == NULL);
++ 
++ 	    vim_free(item);
++ 	}
++     }
++ 
++     /* check again */
++     for (i = 0; i < TEST_COUNT; i++)
++     {
++ 	key = index_to_key(i);
++ 	item = mf_hash_find(&ht, key);
++ 
++ 	if (i % 100 < 70)
++ 	{
++ 	    assert(item == NULL);
++ 	}
++ 	else
++ 	{
++ 	    assert(item != NULL);
++ 	    assert(item->mhi_key == key);
++ 	}
++     }
++ 
++     /* free hash table and all remaining items */
++     mf_hash_free_all(&ht);
++ }
++ 
++     int
++ main()
++ {
++     test_mf_hash();
++     return 0;
++ }
+*** ../vim-7.3.142/src/structs.h	2011-02-15 17:39:14.000000000 +0100
+--- src/structs.h	2011-03-03 18:49:01.000000000 +0100
+***************
+*** 378,383 ****
+--- 378,412 ----
+  typedef long		    blocknr_T;
+  
+  /*
++  * mf_hashtab_T is a chained hashtable with blocknr_T key and arbitrary
++  * structures as items.  This is an intrusive data structure: we require
++  * that items begin with mf_hashitem_T which contains the key and linked
++  * list pointers.  List of items in each bucket is doubly-linked.
++  */
++ 
++ typedef struct mf_hashitem_S mf_hashitem_T;
++ 
++ struct mf_hashitem_S
++ {
++     mf_hashitem_T   *mhi_next;
++     mf_hashitem_T   *mhi_prev;
++     blocknr_T	    mhi_key;
++ };
++ 
++ #define MHT_INIT_SIZE   64
++ 
++ typedef struct mf_hashtab_S
++ {
++     long_u	    mht_mask;	    /* mask used for hash value (nr of items
++ 				     * in array is "mht_mask" + 1) */
++     long_u	    mht_count;	    /* nr of items inserted into hashtable */
++     mf_hashitem_T   **mht_buckets;  /* points to mht_small_buckets or
++ 				     *dynamically allocated array */
++     mf_hashitem_T   *mht_small_buckets[MHT_INIT_SIZE];   /* initial buckets */
++     char	    mht_fixed;	    /* non-zero value forbids growth */
++ } mf_hashtab_T;
++ 
++ /*
+   * for each (previously) used block in the memfile there is one block header.
+   *
+   * The block may be linked in the used list OR in the free list.
+***************
+*** 394,404 ****
+  
+  struct block_hdr
+  {
+      bhdr_T	*bh_next;	    /* next block_hdr in free or used list */
+      bhdr_T	*bh_prev;	    /* previous block_hdr in used list */
+-     bhdr_T	*bh_hash_next;	    /* next block_hdr in hash list */
+-     bhdr_T	*bh_hash_prev;	    /* previous block_hdr in hash list */
+-     blocknr_T	bh_bnum;	    /* block number */
+      char_u	*bh_data;	    /* pointer to memory (for used block) */
+      int		bh_page_count;	    /* number of pages in this block */
+  
+--- 423,433 ----
+  
+  struct block_hdr
+  {
++     mf_hashitem_T bh_hashitem;      /* header for hash table and key */
++ #define bh_bnum bh_hashitem.mhi_key /* block number, part of bh_hashitem */
++ 
+      bhdr_T	*bh_next;	    /* next block_hdr in free or used list */
+      bhdr_T	*bh_prev;	    /* previous block_hdr in used list */
+      char_u	*bh_data;	    /* pointer to memory (for used block) */
+      int		bh_page_count;	    /* number of pages in this block */
+  
+***************
+*** 417,425 ****
+  
+  struct nr_trans
+  {
+!     NR_TRANS	*nt_next;		/* next nr_trans in hash list */
+!     NR_TRANS	*nt_prev;		/* previous nr_trans in hash list */
+!     blocknr_T	nt_old_bnum;		/* old, negative, number */
+      blocknr_T	nt_new_bnum;		/* new, positive, number */
+  };
+  
+--- 446,454 ----
+  
+  struct nr_trans
+  {
+!     mf_hashitem_T nt_hashitem;		/* header for hash table and key */
+! #define nt_old_bnum nt_hashitem.mhi_key	/* old, negative, number */
+! 
+      blocknr_T	nt_new_bnum;		/* new, positive, number */
+  };
+  
+***************
+*** 499,510 ****
+  
+  typedef struct file_buffer buf_T;  /* forward declaration */
+  
+- /*
+-  * Simplistic hashing scheme to quickly locate the blocks in the used list.
+-  * 64 blocks are found directly (64 * 4K = 256K, most files are smaller).
+-  */
+- #define MEMHASHSIZE	64
+- #define MEMHASH(nr)	((nr) & (MEMHASHSIZE - 1))
+  #define MF_SEED_LEN	8
+  
+  struct memfile
+--- 528,533 ----
+***************
+*** 517,524 ****
+      bhdr_T	*mf_used_last;		/* lru block_hdr in used list */
+      unsigned	mf_used_count;		/* number of pages in used list */
+      unsigned	mf_used_count_max;	/* maximum number of pages in memory */
+!     bhdr_T	*mf_hash[MEMHASHSIZE];	/* array of hash lists */
+!     NR_TRANS	*mf_trans[MEMHASHSIZE];	/* array of trans lists */
+      blocknr_T	mf_blocknr_max;		/* highest positive block number + 1*/
+      blocknr_T	mf_blocknr_min;		/* lowest negative block number - 1 */
+      blocknr_T	mf_neg_count;		/* number of negative blocks numbers */
+--- 540,547 ----
+      bhdr_T	*mf_used_last;		/* lru block_hdr in used list */
+      unsigned	mf_used_count;		/* number of pages in used list */
+      unsigned	mf_used_count_max;	/* maximum number of pages in memory */
+!     mf_hashtab_T mf_hash;		/* hash lists */
+!     mf_hashtab_T mf_trans;		/* trans lists */
+      blocknr_T	mf_blocknr_max;		/* highest positive block number + 1*/
+      blocknr_T	mf_blocknr_min;		/* lowest negative block number - 1 */
+      blocknr_T	mf_neg_count;		/* number of negative blocks numbers */
+*** ../vim-7.3.142/src/testdir/Make_amiga.mak	2010-11-10 16:54:16.000000000 +0100
+--- src/testdir/Make_amiga.mak	2011-03-03 17:04:14.000000000 +0100
+***************
+*** 28,34 ****
+  		test61.out test62.out test63.out test64.out test65.out \
+  		test66.out test67.out test68.out test69.out test70.out \
+  		test71.out test72.out test73.out test74.out test75.out \
+! 		test76.out
+  
+  .SUFFIXES: .in .out
+  
+--- 28,34 ----
+  		test61.out test62.out test63.out test64.out test65.out \
+  		test66.out test67.out test68.out test69.out test70.out \
+  		test71.out test72.out test73.out test74.out test75.out \
+! 		test76.out test77.out
+  
+  .SUFFIXES: .in .out
+  
+***************
+*** 124,126 ****
+--- 124,127 ----
+  test74.out: test74.in
+  test75.out: test75.in
+  test76.out: test76.in
++ test77.out: test77.in
+*** ../vim-7.3.142/src/testdir/Make_dos.mak	2010-11-10 16:54:16.000000000 +0100
+--- src/testdir/Make_dos.mak	2011-03-03 17:04:20.000000000 +0100
+***************
+*** 28,34 ****
+  		test37.out test38.out test39.out test40.out test41.out \
+  		test42.out test52.out test65.out test66.out test67.out \
+  		test68.out test69.out test71.out test72.out test73.out \
+! 		test74.out test75.out test76.out
+  
+  SCRIPTS32 =	test50.out test70.out
+  
+--- 28,34 ----
+  		test37.out test38.out test39.out test40.out test41.out \
+  		test42.out test52.out test65.out test66.out test67.out \
+  		test68.out test69.out test71.out test72.out test73.out \
+! 		test74.out test75.out test76.out test77.out
+  
+  SCRIPTS32 =	test50.out test70.out
+  
+*** ../vim-7.3.142/src/testdir/Make_ming.mak	2010-11-10 16:54:16.000000000 +0100
+--- src/testdir/Make_ming.mak	2011-03-03 17:04:32.000000000 +0100
+***************
+*** 48,54 ****
+  		test37.out test38.out test39.out test40.out test41.out \
+  		test42.out test52.out test65.out test66.out test67.out \
+  		test68.out test69.out test71.out test72.out test73.out \
+! 		test74.out test75.out test76.out
+  
+  SCRIPTS32 =	test50.out test70.out
+  
+--- 48,54 ----
+  		test37.out test38.out test39.out test40.out test41.out \
+  		test42.out test52.out test65.out test66.out test67.out \
+  		test68.out test69.out test71.out test72.out test73.out \
+! 		test74.out test75.out test76.out test77.out
+  
+  SCRIPTS32 =	test50.out test70.out
+  
+*** ../vim-7.3.142/src/testdir/Make_os2.mak	2010-11-10 16:54:16.000000000 +0100
+--- src/testdir/Make_os2.mak	2011-03-03 17:04:48.000000000 +0100
+***************
+*** 28,34 ****
+  		test61.out test62.out test63.out test64.out test65.out \
+  		test66.out test67.out test68.out test69.out test70.out \
+  		test71.out test72.out test73.out test74.out test75.out \
+! 		test76.out
+  
+  .SUFFIXES: .in .out
+  
+--- 28,34 ----
+  		test61.out test62.out test63.out test64.out test65.out \
+  		test66.out test67.out test68.out test69.out test70.out \
+  		test71.out test72.out test73.out test74.out test75.out \
+! 		test76.out test77.out
+  
+  .SUFFIXES: .in .out
+  
+*** ../vim-7.3.142/src/testdir/Makefile	2010-11-10 16:54:16.000000000 +0100
+--- src/testdir/Makefile	2011-03-22 17:03:25.000000000 +0100
+***************
+*** 25,31 ****
+  		test59.out test60.out test61.out test62.out test63.out \
+  		test64.out test65.out test66.out test67.out test68.out \
+  		test69.out test70.out test71.out test72.out test73.out \
+! 		test74.out test75.out test76.out
+  
+  SCRIPTS_GUI = test16.out
+  
+--- 25,31 ----
+  		test59.out test60.out test61.out test62.out test63.out \
+  		test64.out test65.out test66.out test67.out test68.out \
+  		test69.out test70.out test71.out test72.out test73.out \
+! 		test74.out test75.out test76.out test77.out
+  
+  SCRIPTS_GUI = test16.out
+  
+***************
+*** 71,77 ****
+  		  fi \
+  		else echo $* NO OUTPUT >>test.log; \
+  		fi"
+! 	-rm -rf X* test.ok viminfo
+  
+  test49.out: test49.vim
+  
+--- 71,77 ----
+  		  fi \
+  		else echo $* NO OUTPUT >>test.log; \
+  		fi"
+! #	-rm -rf X* test.ok viminfo
+  
+  test49.out: test49.vim
+  
+*** ../vim-7.3.142/src/testdir/test77.in	2011-03-03 21:59:10.000000000 +0100
+--- src/testdir/test77.in	2011-03-22 17:12:38.000000000 +0100
+***************
+*** 0 ****
+--- 1,27 ----
++ Inserts 2 million lines with consecutive integers starting from 1
++ (essentially, the output of GNU's seq 1 2000000), writes them to Xtest
++ and writes its cksum to test.out.
++ 
++ We need 2 million lines to trigger a call to mf_hash_grow().  If it would mess
++ up the lines the checksum would differ.
++ 
++ cksum is part of POSIX and so should be available on most Unixes.
++ If it isn't available then the test will be skipped.
++ 
++ STARTTEST
++ :so small.vim
++ :if !executable("cksum")
++ : e! test.ok
++ : w! test.out
++ : qa!
++ :endif
++ :set fileformat=unix undolevels=-1
++ ggdG
++ :let i = 1
++ :while i <= 2000000 | call append(i, range(i, i + 99)) | let i += 100 | endwhile
++ ggdd
++ :w! Xtest
++ :!cksum Xtest > test.out
++ :qa!
++ ENDTEST
++ 
+*** ../vim-7.3.142/src/testdir/test77.ok	2011-03-03 21:59:10.000000000 +0100
+--- src/testdir/test77.ok	2011-03-22 17:10:14.000000000 +0100
+***************
+*** 0 ****
+--- 1 ----
++ 3678979763 14888896 Xtest
+*** ../vim-7.3.142/src/version.c	2011-03-22 15:47:18.000000000 +0100
+--- src/version.c	2011-03-22 18:01:48.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     143,
+  /**/
+
+-- 
+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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.144 b/source/ap/vim/patches/7.3.144
new file mode 100644
index 00000000..3bdea8da
--- /dev/null
+++ b/source/ap/vim/patches/7.3.144
@@ -0,0 +1,80 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.144
+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.3.144
+Problem:    Crash with ":python help(dir)". (Kearn Holliday)
+Solution:   Fix the way the type is set on objects. (Tobias Columbus)
+Files:	    src/if_python.c
+
+
+*** ../vim-7.3.143/src/if_python.c	2010-11-16 19:25:56.000000000 +0100
+--- src/if_python.c	2011-03-26 13:54:22.000000000 +0100
+***************
+*** 780,786 ****
+  PythonIO_Init(void)
+  {
+      /* Fixups... */
+!     OutputType.ob_type = &PyType_Type;
+  
+      return PythonIO_Init_io();
+  }
+--- 780,786 ----
+  PythonIO_Init(void)
+  {
+      /* Fixups... */
+!     PyType_Ready(&OutputType);
+  
+      return PythonIO_Init_io();
+  }
+***************
+*** 1402,1413 ****
+      static char *(argv[2]) = {"/must>not&exist/foo", NULL};
+  
+      /* Fixups... */
+!     BufferType.ob_type = &PyType_Type;
+!     RangeType.ob_type = &PyType_Type;
+!     WindowType.ob_type = &PyType_Type;
+!     BufListType.ob_type = &PyType_Type;
+!     WinListType.ob_type = &PyType_Type;
+!     CurrentType.ob_type = &PyType_Type;
+  
+      /* Set sys.argv[] to avoid a crash in warn(). */
+      PySys_SetArgv(1, argv);
+--- 1402,1413 ----
+      static char *(argv[2]) = {"/must>not&exist/foo", NULL};
+  
+      /* Fixups... */
+!     PyType_Ready(&BufferType);
+!     PyType_Ready(&RangeType);
+!     PyType_Ready(&WindowType);
+!     PyType_Ready(&BufListType);
+!     PyType_Ready(&WinListType);
+!     PyType_Ready(&CurrentType);
+  
+      /* Set sys.argv[] to avoid a crash in warn(). */
+      PySys_SetArgv(1, argv);
+*** ../vim-7.3.143/src/version.c	2011-03-22 18:10:34.000000000 +0100
+--- src/version.c	2011-03-26 13:56:15.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     144,
+  /**/
+
+-- 
+The chat program is in public domain.  This is not the GNU public license.
+If it breaks then you get to keep both pieces.
+		-- Copyright notice for the chat program
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.145 b/source/ap/vim/patches/7.3.145
new file mode 100644
index 00000000..a435fc28
--- /dev/null
+++ b/source/ap/vim/patches/7.3.145
@@ -0,0 +1,64 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.145
+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.3.145 (after 7.3.144)
+Problem:    Can't build with Python dynamically loading.
+Solution:   Add dll_PyType_Ready.
+Files:	    src/if_python.c
+
+
+*** ../vim-7.3.144/src/if_python.c	2011-03-26 13:56:41.000000000 +0100
+--- src/if_python.c	2011-03-26 18:10:00.000000000 +0100
+***************
+*** 165,170 ****
+--- 165,171 ----
+  # define PySys_SetObject dll_PySys_SetObject
+  # define PySys_SetArgv dll_PySys_SetArgv
+  # define PyType_Type (*dll_PyType_Type)
++ # define PyType_Ready (*dll_PyType_Ready)
+  # define Py_BuildValue dll_Py_BuildValue
+  # define Py_FindMethod dll_Py_FindMethod
+  # define Py_InitModule4 dll_Py_InitModule4
+***************
+*** 224,229 ****
+--- 225,231 ----
+  static int(*dll_PySys_SetObject)(char *, PyObject *);
+  static int(*dll_PySys_SetArgv)(int, char **);
+  static PyTypeObject* dll_PyType_Type;
++ static int (*dll_PyType_Ready)(PyTypeObject *type);
+  static PyObject*(*dll_Py_BuildValue)(char *, ...);
+  static PyObject*(*dll_Py_FindMethod)(struct PyMethodDef[], PyObject *, char *);
+  static PyObject*(*dll_Py_InitModule4)(char *, struct PyMethodDef *, char *, PyObject *, int);
+***************
+*** 305,310 ****
+--- 307,313 ----
+      {"PySys_SetObject", (PYTHON_PROC*)&dll_PySys_SetObject},
+      {"PySys_SetArgv", (PYTHON_PROC*)&dll_PySys_SetArgv},
+      {"PyType_Type", (PYTHON_PROC*)&dll_PyType_Type},
++     {"PyType_Ready", (PYTHON_PROC*)&dll_PyType_Ready},
+      {"Py_BuildValue", (PYTHON_PROC*)&dll_Py_BuildValue},
+      {"Py_FindMethod", (PYTHON_PROC*)&dll_Py_FindMethod},
+  # if (PY_VERSION_HEX >= 0x02050000) && SIZEOF_SIZE_T != SIZEOF_INT
+*** ../vim-7.3.144/src/version.c	2011-03-26 13:56:41.000000000 +0100
+--- src/version.c	2011-03-26 18:11:19.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     145,
+  /**/
+
+-- 
+This message contains 78% recycled characters.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.146 b/source/ap/vim/patches/7.3.146
new file mode 100644
index 00000000..0a7390ce
--- /dev/null
+++ b/source/ap/vim/patches/7.3.146
@@ -0,0 +1,224 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.146
+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.3.146
+Problem:    It's possible to assign to a read-only member of a dict.
+	    It's possible to create a global variable "0". (ZyX)
+            It's possible to add a v: variable with ":let v:.name = 1".
+Solution:   Add check for dict item being read-only.
+	    Check the name of g: variables.
+	    Disallow adding v: variables.
+Files:	    src/eval.c
+
+
+*** ../vim-7.3.145/src/eval.c	2011-02-01 13:48:47.000000000 +0100
+--- src/eval.c	2011-03-27 15:56:44.000000000 +0200
+***************
+*** 789,794 ****
+--- 789,796 ----
+  static void set_var __ARGS((char_u *name, typval_T *varp, int copy));
+  static int var_check_ro __ARGS((int flags, char_u *name));
+  static int var_check_fixed __ARGS((int flags, char_u *name));
++ static int var_check_func_name __ARGS((char_u *name, int new_var));
++ static int valid_varname __ARGS((char_u *varname));
+  static int tv_check_lock __ARGS((int lock, char_u *name));
+  static int item_copy __ARGS((typval_T *from, typval_T *to, int deep, int copyID));
+  static char_u *find_option_end __ARGS((char_u **arg, int *opt_flags));
+***************
+*** 2716,2723 ****
+--- 2718,2744 ----
+  	    lp->ll_list = NULL;
+  	    lp->ll_dict = lp->ll_tv->vval.v_dict;
+  	    lp->ll_di = dict_find(lp->ll_dict, key, len);
++ 
++ 	    /* When assigning to g: check that a function and variable name is
++ 	     * valid. */
++ 	    if (rettv != NULL && lp->ll_dict == &globvardict)
++ 	    {
++ 		if (rettv->v_type == VAR_FUNC
++ 			       && var_check_func_name(key, lp->ll_di == NULL))
++ 		    return NULL;
++ 		if (!valid_varname(key))
++ 		    return NULL;
++ 	    }
++ 
+  	    if (lp->ll_di == NULL)
+  	    {
++ 		/* Can't add "v:" variable. */
++ 		if (lp->ll_dict == &vimvardict)
++ 		{
++ 		    EMSG2(_(e_illvar), name);
++ 		    return NULL;
++ 		}
++ 
+  		/* Key does not exist in dict: may need to add it. */
+  		if (*p == '[' || *p == '.' || unlet)
+  		{
+***************
+*** 2737,2742 ****
+--- 2758,2767 ----
+  		    p = NULL;
+  		break;
+  	    }
++ 	    /* existing variable, need to check if it can be changed */
++ 	    else if (var_check_ro(lp->ll_di->di_flags, name))
++ 		return NULL;
++ 
+  	    if (len == -1)
+  		clear_tv(&var1);
+  	    lp->ll_tv = &lp->ll_di->di_tv;
+***************
+*** 19786,19792 ****
+      dictitem_T	*v;
+      char_u	*varname;
+      hashtab_T	*ht;
+-     char_u	*p;
+  
+      ht = find_var_ht(name, &varname);
+      if (ht == NULL || *varname == NUL)
+--- 19811,19816 ----
+***************
+*** 19796,19820 ****
+      }
+      v = find_var_in_ht(ht, varname, TRUE);
+  
+!     if (tv->v_type == VAR_FUNC)
+!     {
+! 	if (!(vim_strchr((char_u *)"wbs", name[0]) != NULL && name[1] == ':')
+! 		&& !ASCII_ISUPPER((name[0] != NUL && name[1] == ':')
+! 							 ? name[2] : name[0]))
+! 	{
+! 	    EMSG2(_("E704: Funcref variable name must start with a capital: %s"), name);
+! 	    return;
+! 	}
+! 	/* Don't allow hiding a function.  When "v" is not NULL we might be
+! 	 * assigning another function to the same var, the type is checked
+! 	 * below. */
+! 	if (v == NULL && function_exists(name))
+! 	{
+! 	    EMSG2(_("E705: Variable name conflicts with existing function: %s"),
+! 									name);
+! 	    return;
+! 	}
+!     }
+  
+      if (v != NULL)
+      {
+--- 19820,19827 ----
+      }
+      v = find_var_in_ht(ht, varname, TRUE);
+  
+!     if (tv->v_type == VAR_FUNC && var_check_func_name(name, v == NULL))
+! 	return;
+  
+      if (v != NULL)
+      {
+***************
+*** 19880,19892 ****
+  	}
+  
+  	/* Make sure the variable name is valid. */
+! 	for (p = varname; *p != NUL; ++p)
+! 	    if (!eval_isnamec1(*p) && (p == varname || !VIM_ISDIGIT(*p))
+! 						       && *p != AUTOLOAD_CHAR)
+! 	    {
+! 		EMSG2(_(e_illvar), varname);
+! 		return;
+! 	    }
+  
+  	v = (dictitem_T *)alloc((unsigned)(sizeof(dictitem_T)
+  							  + STRLEN(varname)));
+--- 19887,19894 ----
+  	}
+  
+  	/* Make sure the variable name is valid. */
+! 	if (!valid_varname(varname))
+! 	    return;
+  
+  	v = (dictitem_T *)alloc((unsigned)(sizeof(dictitem_T)
+  							  + STRLEN(varname)));
+***************
+*** 19951,19956 ****
+--- 19953,20007 ----
+  }
+  
+  /*
++  * Check if a funcref is assigned to a valid variable name.
++  * Return TRUE and give an error if not.
++  */
++     static int
++ var_check_func_name(name, new_var)
++     char_u *name;    /* points to start of variable name */
++     int    new_var;  /* TRUE when creating the variable */
++ {
++     if (!(vim_strchr((char_u *)"wbs", name[0]) != NULL && name[1] == ':')
++ 	    && !ASCII_ISUPPER((name[0] != NUL && name[1] == ':')
++ 						     ? name[2] : name[0]))
++     {
++ 	EMSG2(_("E704: Funcref variable name must start with a capital: %s"),
++ 									name);
++ 	return TRUE;
++     }
++     /* Don't allow hiding a function.  When "v" is not NULL we might be
++      * assigning another function to the same var, the type is checked
++      * below. */
++     if (new_var && function_exists(name))
++     {
++ 	EMSG2(_("E705: Variable name conflicts with existing function: %s"),
++ 								    name);
++ 	return TRUE;
++     }
++     return FALSE;
++ }
++ 
++ /*
++  * Check if a variable name is valid.
++  * Return FALSE and give an error if not.
++  */
++     static int
++ valid_varname(varname)
++     char_u *varname;
++ {
++     char_u *p;
++ 
++     for (p = varname; *p != NUL; ++p)
++ 	if (!eval_isnamec1(*p) && (p == varname || !VIM_ISDIGIT(*p))
++ 						   && *p != AUTOLOAD_CHAR)
++ 	{
++ 	    EMSG2(_(e_illvar), varname);
++ 	    return FALSE;
++ 	}
++     return TRUE;
++ }
++ 
++ /*
+   * Return TRUE if typeval "tv" is set to be locked (immutable).
+   * Also give an error message, using "name".
+   */
+*** ../vim-7.3.145/src/version.c	2011-03-26 18:32:00.000000000 +0100
+--- src/version.c	2011-03-27 16:01:03.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     146,
+  /**/
+
+-- 
+ARTHUR: It is I, Arthur, son of Uther Pendragon, from the castle of Camelot.
+        King of all Britons, defeator of the Saxons, sovereign of all England!
+   [Pause]
+SOLDIER: Get away!
+                 "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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.147 b/source/ap/vim/patches/7.3.147
new file mode 100644
index 00000000..b6fd756a
--- /dev/null
+++ b/source/ap/vim/patches/7.3.147
@@ -0,0 +1,53 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.147
+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.3.147 (after 7.3.143)
+Problem:    Can't build on HP-UX.
+Solution:   Remove an unnecessary backslash. (John Marriott)
+Files:	    src/Makefile
+
+
+*** ../vim-7.3.146/src/Makefile	2011-03-22 18:10:34.000000000 +0100
+--- src/Makefile	2011-04-01 13:00:58.000000000 +0200
+***************
+*** 1565,1571 ****
+  
+  OBJ = $(OBJ_COMMON) \
+  	objects/main.o \
+! 	objects/memfile.o \
+  
+  MEMFILE_TEST_OBJ = $(OBJ_COMMON) \
+          objects/memfile_test.o
+--- 1565,1571 ----
+  
+  OBJ = $(OBJ_COMMON) \
+  	objects/main.o \
+! 	objects/memfile.o
+  
+  MEMFILE_TEST_OBJ = $(OBJ_COMMON) \
+          objects/memfile_test.o
+*** ../vim-7.3.146/src/version.c	2011-03-27 16:03:09.000000000 +0200
+--- src/version.c	2011-04-01 13:05:18.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     147,
+  /**/
+
+-- 
+DENNIS: You can't expect to wield supreme executive power just 'cause some
+        watery tart threw a sword at you!
+                 "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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.148 b/source/ap/vim/patches/7.3.148
new file mode 100644
index 00000000..30492c0b
--- /dev/null
+++ b/source/ap/vim/patches/7.3.148
@@ -0,0 +1,252 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.148
+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.3.148
+Problem:    A syntax file with a huge number of items or clusters causes weird
+	    behavior, a hang or a crash. (Yukihiro Nakadaira)
+Solution:   Check running out of IDs. (partly by Ben Schmidt)
+Files:	    src/syntax.c
+
+
+*** ../vim-7.3.147/src/syntax.c	2011-01-22 00:58:15.000000000 +0100
+--- src/syntax.c	2011-04-01 14:25:39.000000000 +0200
+***************
+*** 219,234 ****
+  
+  /*
+   * Syntax group IDs have different types:
+!  *     0 -  9999  normal syntax groups
+!  * 10000 - 14999  ALLBUT indicator (current_syn_inc_tag added)
+!  * 15000 - 19999  TOP indicator (current_syn_inc_tag added)
+!  * 20000 - 24999  CONTAINED indicator (current_syn_inc_tag added)
+!  * >= 25000	  cluster IDs (subtract SYNID_CLUSTER for the cluster ID)
+!  */
+! #define SYNID_ALLBUT	10000	    /* syntax group ID for contains=ALLBUT */
+! #define SYNID_TOP	15000	    /* syntax group ID for contains=TOP */
+! #define SYNID_CONTAINED	20000	    /* syntax group ID for contains=CONTAINED */
+! #define SYNID_CLUSTER	25000	    /* first syntax group ID for clusters */
+  
+  /*
+   * Annoying Hack(TM):  ":syn include" needs this pointer to pass to
+--- 219,238 ----
+  
+  /*
+   * Syntax group IDs have different types:
+!  *     0 - 19999  normal syntax groups
+!  * 20000 - 20999  ALLBUT indicator (current_syn_inc_tag added)
+!  * 21000 - 21999  TOP indicator (current_syn_inc_tag added)
+!  * 22000 - 22999  CONTAINED indicator (current_syn_inc_tag added)
+!  * 23000 - 32767  cluster IDs (subtract SYNID_CLUSTER for the cluster ID)
+!  */
+! #define SYNID_ALLBUT	20000	    /* syntax group ID for contains=ALLBUT */
+! #define SYNID_TOP	21000	    /* syntax group ID for contains=TOP */
+! #define SYNID_CONTAINED	22000	    /* syntax group ID for contains=CONTAINED */
+! #define SYNID_CLUSTER	23000	    /* first syntax group ID for clusters */
+! 
+! #define MAX_SYNID       SYNID_ALLBUT
+! #define MAX_SYN_INC_TAG	999	    /* maximum before the above overflow */
+! #define MAX_CLUSTER_ID  (32767 - SYNID_CLUSTER)
+  
+  /*
+   * Annoying Hack(TM):  ":syn include" needs this pointer to pass to
+***************
+*** 3442,3447 ****
+--- 3446,3454 ----
+      /* free the stored states */
+      syn_stack_free_all(block);
+      invalidate_current_state();
++ 
++     /* Reset the counter for ":syn include" */
++     running_syn_inc_tag = 0;
+  }
+  
+  /*
+***************
+*** 4661,4666 ****
+--- 4668,4675 ----
+  	    return;
+  	}
+  	sgl_id = syn_check_cluster(arg, (int)(group_name_end - arg));
++ 	if (sgl_id == 0)
++ 	    return;
+  	/* separate_nextcmd() and expand_filename() depend on this */
+  	eap->arg = rest;
+      }
+***************
+*** 4689,4694 ****
+--- 4698,4708 ----
+       * Save and restore the existing top-level grouplist id and ":syn
+       * include" tag around the actual inclusion.
+       */
++     if (running_syn_inc_tag >= MAX_SYN_INC_TAG)
++     {
++ 	EMSG((char_u *)_("E847: Too many syntax includes"));
++ 	return;
++     }
+      prev_syn_inc_tag = current_syn_inc_tag;
+      current_syn_inc_tag = ++running_syn_inc_tag;
+      prev_toplvl_grp = curwin->w_s->b_syn_topgrp;
+***************
+*** 4712,4718 ****
+      char_u	*group_name_end;
+      int		syn_id;
+      char_u	*rest;
+!     char_u	*keyword_copy;
+      char_u	*p;
+      char_u	*kw;
+      syn_opt_arg_T syn_opt_arg;
+--- 4726,4732 ----
+      char_u	*group_name_end;
+      int		syn_id;
+      char_u	*rest;
+!     char_u	*keyword_copy = NULL;
+      char_u	*p;
+      char_u	*kw;
+      syn_opt_arg_T syn_opt_arg;
+***************
+*** 4724,4732 ****
+      if (rest != NULL)
+      {
+  	syn_id = syn_check_group(arg, (int)(group_name_end - arg));
+! 
+! 	/* allocate a buffer, for removing the backslashes in the keyword */
+! 	keyword_copy = alloc((unsigned)STRLEN(rest) + 1);
+  	if (keyword_copy != NULL)
+  	{
+  	    syn_opt_arg.flags = 0;
+--- 4738,4746 ----
+      if (rest != NULL)
+      {
+  	syn_id = syn_check_group(arg, (int)(group_name_end - arg));
+! 	if (syn_id != 0)
+! 	    /* allocate a buffer, for removing backslashes in the keyword */
+! 	    keyword_copy = alloc((unsigned)STRLEN(rest) + 1);
+  	if (keyword_copy != NULL)
+  	{
+  	    syn_opt_arg.flags = 0;
+***************
+*** 5133,5139 ****
+  			    (item == ITEM_SKIP) ? SPTYPE_SKIP : SPTYPE_END;
+  		    SYN_ITEMS(curwin->w_s)[idx].sp_flags |= syn_opt_arg.flags;
+  		    SYN_ITEMS(curwin->w_s)[idx].sp_syn.id = syn_id;
+! 		    SYN_ITEMS(curwin->w_s)[idx].sp_syn.inc_tag = current_syn_inc_tag;
+  		    SYN_ITEMS(curwin->w_s)[idx].sp_syn_match_id =
+  							ppp->pp_matchgroup_id;
+  #ifdef FEAT_CONCEAL
+--- 5147,5154 ----
+  			    (item == ITEM_SKIP) ? SPTYPE_SKIP : SPTYPE_END;
+  		    SYN_ITEMS(curwin->w_s)[idx].sp_flags |= syn_opt_arg.flags;
+  		    SYN_ITEMS(curwin->w_s)[idx].sp_syn.id = syn_id;
+! 		    SYN_ITEMS(curwin->w_s)[idx].sp_syn.inc_tag =
+! 							  current_syn_inc_tag;
+  		    SYN_ITEMS(curwin->w_s)[idx].sp_syn_match_id =
+  							ppp->pp_matchgroup_id;
+  #ifdef FEAT_CONCEAL
+***************
+*** 5426,5431 ****
+--- 5441,5454 ----
+  	curwin->w_s->b_syn_clusters.ga_growsize = 10;
+      }
+  
++     len = curwin->w_s->b_syn_clusters.ga_len;
++     if (len >= MAX_CLUSTER_ID)
++     {
++ 	EMSG((char_u *)_("E848: Too many syntax clusters"));
++ 	vim_free(name);
++ 	return 0;
++     }
++ 
+      /*
+       * Make room for at least one other cluster entry.
+       */
+***************
+*** 5434,5440 ****
+  	vim_free(name);
+  	return 0;
+      }
+-     len = curwin->w_s->b_syn_clusters.ga_len;
+  
+      vim_memset(&(SYN_CLSTR(curwin->w_s)[len]), 0, sizeof(syn_cluster_T));
+      SYN_CLSTR(curwin->w_s)[len].scl_name = name;
+--- 5457,5462 ----
+***************
+*** 5476,5483 ****
+  
+      if (rest != NULL)
+      {
+! 	scl_id = syn_check_cluster(arg, (int)(group_name_end - arg))
+! 							      - SYNID_CLUSTER;
+  
+  	for (;;)
+  	{
+--- 5498,5507 ----
+  
+      if (rest != NULL)
+      {
+! 	scl_id = syn_check_cluster(arg, (int)(group_name_end - arg));
+! 	if (scl_id == 0)
+! 	    return;
+! 	scl_id -= SYNID_CLUSTER;
+  
+  	for (;;)
+  	{
+***************
+*** 5516,5522 ****
+  	if (got_clstr)
+  	{
+  	    redraw_curbuf_later(SOME_VALID);
+! 	    syn_stack_free_all(curwin->w_s);	/* Need to recompute all syntax. */
+  	}
+      }
+  
+--- 5540,5546 ----
+  	if (got_clstr)
+  	{
+  	    redraw_curbuf_later(SOME_VALID);
+! 	    syn_stack_free_all(curwin->w_s);	/* Need to recompute all. */
+  	}
+      }
+  
+***************
+*** 8972,8977 ****
+--- 8996,9008 ----
+  	highlight_ga.ga_growsize = 10;
+      }
+  
++     if (highlight_ga.ga_len >= MAX_SYNID)
++     {
++ 	EMSG(_("E849: Too many syntax groups"));
++ 	vim_free(name);
++ 	return 0;
++     }
++ 
+      /*
+       * Make room for at least one other syntax_highlight entry.
+       */
+*** ../vim-7.3.147/src/version.c	2011-04-01 13:05:37.000000000 +0200
+--- src/version.c	2011-04-01 14:26:44.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     148,
+  /**/
+
+-- 
+BLACK KNIGHT: None shall pass.
+ARTHUR:       I have no quarrel with you, brave Sir knight, but I must cross
+              this bridge.
+BLACK KNIGHT: Then you shall die.
+                 "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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.149 b/source/ap/vim/patches/7.3.149
new file mode 100644
index 00000000..1901a74f
--- /dev/null
+++ b/source/ap/vim/patches/7.3.149
@@ -0,0 +1,78 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.149
+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.3.149
+Problem:    The cursor disappears after the processing of the 'setDot'
+	    netbeans command when vim runs in a terminal.
+Solution:   Show the cursor after a screen update. (Xavier de Gaye, 2011
+Files:	    src/netbeans.c
+
+
+*** ../vim-7.3.148/src/netbeans.c	2011-01-04 18:11:39.000000000 +0100
+--- src/netbeans.c	2011-04-01 15:33:49.000000000 +0200
+***************
+*** 191,196 ****
+--- 191,197 ----
+      changed_window_setting();
+      update_screen(CLEAR);
+      setcursor();
++     cursor_on();
+      out_flush();
+  #ifdef FEAT_GUI
+      if (gui.in_use)
+***************
+*** 2248,2253 ****
+--- 2249,2255 ----
+  	    update_topline();		/* scroll to show the line */
+  	    update_screen(VALID);
+  	    setcursor();
++ 	    cursor_on();
+  	    out_flush();
+  #ifdef FEAT_GUI
+  	    if (gui.in_use)
+***************
+*** 2642,2647 ****
+--- 2644,2650 ----
+      {
+  	update_screen(NOT_VALID);
+  	setcursor();
++ 	cursor_on();
+  	out_flush();
+  #ifdef FEAT_GUI
+  	if (gui.in_use)
+***************
+*** 3008,3013 ****
+--- 3011,3017 ----
+      changed_window_setting();
+      update_screen(CLEAR);
+      setcursor();
++     cursor_on();
+      out_flush();
+  #ifdef FEAT_GUI
+      if (gui.in_use)
+*** ../vim-7.3.148/src/version.c	2011-04-01 14:44:54.000000000 +0200
+--- src/version.c	2011-04-01 15:33:21.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     149,
+  /**/
+
+-- 
+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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.150 b/source/ap/vim/patches/7.3.150
new file mode 100644
index 00000000..83a8bf28
--- /dev/null
+++ b/source/ap/vim/patches/7.3.150
@@ -0,0 +1,113 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.150
+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.3.150
+Problem:    readline() does not return the last line when the NL is missing.
+	    (Hong Xu)
+Solution:   When at the end of the file Also check for a previous line.
+Files:	    src/eval.c
+
+
+*** ../vim-7.3.149/src/eval.c	2011-03-27 16:03:09.000000000 +0200
+--- src/eval.c	2011-04-01 16:06:04.000000000 +0200
+***************
+*** 14305,14313 ****
+  	{
+  	    if (buf[filtd] == '\n' || readlen <= 0)
+  	    {
+! 		/* Only when in binary mode add an empty list item when the
+! 		 * last line ends in a '\n'. */
+! 		if (!binary && readlen == 0 && filtd == 0)
+  		    break;
+  
+  		/* Found end-of-line or end-of-file: add a text line to the
+--- 14305,14313 ----
+  	{
+  	    if (buf[filtd] == '\n' || readlen <= 0)
+  	    {
+! 		/* In binary mode add an empty list item when the last
+! 		 * non-empty line ends in a '\n'. */
+! 		if (!binary && readlen == 0 && filtd == 0 && prev == NULL)
+  		    break;
+  
+  		/* Found end-of-line or end-of-file: add a text line to the
+***************
+*** 14372,14396 ****
+  
+  	if (tolist == 0)
+  	{
+! 	    /* "buf" is full, need to move text to an allocated buffer */
+! 	    if (prev == NULL)
+  	    {
+! 		prev = vim_strnsave(buf, buflen);
+! 		prevlen = buflen;
+! 	    }
+! 	    else
+! 	    {
+! 		s = alloc((unsigned)(prevlen + buflen));
+! 		if (s != NULL)
+  		{
+! 		    mch_memmove(s, prev, prevlen);
+! 		    mch_memmove(s + prevlen, buf, buflen);
+! 		    vim_free(prev);
+! 		    prev = s;
+! 		    prevlen += buflen;
+  		}
+  	    }
+- 	    filtd = 0;
+  	}
+  	else
+  	{
+--- 14372,14399 ----
+  
+  	if (tolist == 0)
+  	{
+! 	    if (buflen >= FREAD_SIZE / 2)
+  	    {
+! 		/* "buf" is full, need to move text to an allocated buffer */
+! 		if (prev == NULL)
+! 		{
+! 		    prev = vim_strnsave(buf, buflen);
+! 		    prevlen = buflen;
+! 		}
+! 		else
+  		{
+! 		    s = alloc((unsigned)(prevlen + buflen));
+! 		    if (s != NULL)
+! 		    {
+! 			mch_memmove(s, prev, prevlen);
+! 			mch_memmove(s + prevlen, buf, buflen);
+! 			vim_free(prev);
+! 			prev = s;
+! 			prevlen += buflen;
+! 		    }
+  		}
++ 		filtd = 0;
+  	    }
+  	}
+  	else
+  	{
+*** ../vim-7.3.149/src/version.c	2011-04-01 15:33:54.000000000 +0200
+--- src/version.c	2011-04-01 16:04:42.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     150,
+  /**/
+
+-- 
+ARTHUR: What are you going to do. bleed on me?
+                 "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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.151 b/source/ap/vim/patches/7.3.151
new file mode 100644
index 00000000..20f51051
--- /dev/null
+++ b/source/ap/vim/patches/7.3.151
@@ -0,0 +1,59 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.151
+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.3.151 (after 7.3.074)
+Problem:    When "unnamedplus" is in 'clipboard' the selection is sometimes
+	    also copied to the star register.
+Solution:   Avoid copy to the star register when undesired. (James Vega)
+Files:	    src/ops.c
+
+
+*** ../vim-7.3.150/src/ops.c	2010-12-08 14:23:08.000000000 +0100
+--- src/ops.c	2011-04-01 16:23:10.000000000 +0200
+***************
+*** 3148,3157 ****
+  	    /* Copy the text from register 0 to the clipboard register. */
+  	    copy_yank_reg(&(y_regs[PLUS_REGISTER]));
+  
+- 	/* No need to copy to * register upon 'unnamed' now - see below */
+  	clip_own_selection(&clip_plus);
+  	clip_gen_set_selection(&clip_plus);
+! 	if (!clip_isautosel() && !did_star)
+  	{
+  	    copy_yank_reg(&(y_regs[STAR_REGISTER]));
+  	    clip_own_selection(&clip_star);
+--- 3148,3156 ----
+  	    /* Copy the text from register 0 to the clipboard register. */
+  	    copy_yank_reg(&(y_regs[PLUS_REGISTER]));
+  
+  	clip_own_selection(&clip_plus);
+  	clip_gen_set_selection(&clip_plus);
+! 	if (!clip_isautosel() && !did_star && curr == &(y_regs[PLUS_REGISTER]))
+  	{
+  	    copy_yank_reg(&(y_regs[STAR_REGISTER]));
+  	    clip_own_selection(&clip_star);
+*** ../vim-7.3.150/src/version.c	2011-04-01 16:07:41.000000000 +0200
+--- src/version.c	2011-04-01 16:25:40.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     151,
+  /**/
+
+-- 
+BLACK KNIGHT: I'm invincible!
+ARTHUR:       You're a looney.
+                 "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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.152 b/source/ap/vim/patches/7.3.152
new file mode 100644
index 00000000..fdc58a08
--- /dev/null
+++ b/source/ap/vim/patches/7.3.152
@@ -0,0 +1,643 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.152
+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.3.152
+Problem:    Xxd does not check for errors from library functions.
+Solution:   Add error checks. (Florian Zumbiehl)
+Files:	    src/xxd/xxd.c
+
+
+*** ../vim-7.3.151/src/xxd/xxd.c	2010-08-15 21:57:25.000000000 +0200
+--- src/xxd/xxd.c	2011-04-01 18:56:11.000000000 +0200
+***************
+*** 49,54 ****
+--- 49,56 ----
+   *	    option -b added: 01000101 binary output in normal format.
+   * 16.05.00 Added VAXC changes by Stephen P. Wall
+   * 16.05.00 Improved MMS file and merge for VMS by Zoltan Arpadffy
++  * 2011 March  Better error handling by Florian Zumbiehl.
++  * 2011 April  Formatting by Bram Moolenaar
+   *
+   * (c) 1990-1998 by Juergen Weigert (jnweiger@informatik.uni-erlangen.de)
+   *
+***************
+*** 207,214 ****
+  
+  /* Let's collect some prototypes */
+  /* CodeWarrior is really picky about missing prototypes */
+! static void exit_with_usage __P((char *));
+! static int huntype __P((FILE *, FILE *, FILE *, char *, int, int, long));
+  static void xxdline __P((FILE *, char *, int));
+  
+  #define TRY_SEEK	/* attempt to use lseek, or skip forward by reading */
+--- 209,216 ----
+  
+  /* Let's collect some prototypes */
+  /* CodeWarrior is really picky about missing prototypes */
+! static void exit_with_usage __P((void));
+! static int huntype __P((FILE *, FILE *, FILE *, int, int, long));
+  static void xxdline __P((FILE *, char *, int));
+  
+  #define TRY_SEEK	/* attempt to use lseek, or skip forward by reading */
+***************
+*** 223,231 ****
+  #define HEX_CINCLUDE 2
+  #define HEX_BITS 3		/* not hex a dump, but bits: 01111001 */
+  
+! static void
+! exit_with_usage(pname)
+! char *pname;
+  {
+    fprintf(stderr, "Usage:\n       %s [options] [infile [outfile]]\n", pname);
+    fprintf(stderr, "    or\n       %s -r [-s [-]offset] [-c cols] [-ps] [infile [outfile]]\n", pname);
+--- 225,234 ----
+  #define HEX_CINCLUDE 2
+  #define HEX_BITS 3		/* not hex a dump, but bits: 01111001 */
+  
+! static char *pname;
+! 
+!   static void
+! exit_with_usage()
+  {
+    fprintf(stderr, "Usage:\n       %s [options] [infile [outfile]]\n", pname);
+    fprintf(stderr, "    or\n       %s -r [-s [-]offset] [-c cols] [-ps] [infile [outfile]]\n", pname);
+***************
+*** 252,257 ****
+--- 255,269 ----
+    exit(1);
+  }
+  
++   static void
++ die(ret)
++   int ret;
++ {
++   fprintf(stderr, "%s: ", pname);
++   perror(NULL);
++   exit(ret);
++ }
++ 
+  /*
+   * Max. cols binary characters are decoded from the input stream per line.
+   * Two adjacent garbage characters after evaluated data delimit valid data.
+***************
+*** 259,270 ****
+   *
+   * The name is historic and came from 'undo type opt h'.
+   */
+! static int
+! huntype(fpi, fpo, fperr, pname, cols, hextype, base_off)
+! FILE *fpi, *fpo, *fperr;
+! char *pname;
+! int cols, hextype;
+! long base_off;
+  {
+    int c, ign_garb = 1, n1 = -1, n2 = 0, n3, p = cols;
+    long have_off = 0, want_off = 0;
+--- 271,281 ----
+   *
+   * The name is historic and came from 'undo type opt h'.
+   */
+!   static int
+! huntype(fpi, fpo, fperr, cols, hextype, base_off)
+!   FILE *fpi, *fpo, *fperr;
+!   int cols, hextype;
+!   long base_off;
+  {
+    int c, ign_garb = 1, n1 = -1, n2 = 0, n3, p = cols;
+    long have_off = 0, want_off = 0;
+***************
+*** 318,324 ****
+  
+        if (base_off + want_off != have_off)
+  	{
+! 	  fflush(fpo);
+  #ifdef TRY_SEEK
+  	  c = fseek(fpo, base_off + want_off - have_off, 1);
+  	  if (c >= 0)
+--- 329,336 ----
+  
+        if (base_off + want_off != have_off)
+  	{
+! 	  if (fflush(fpo) != 0)
+! 	    die(3);
+  #ifdef TRY_SEEK
+  	  c = fseek(fpo, base_off + want_off - have_off, 1);
+  	  if (c >= 0)
+***************
+*** 330,341 ****
+  	      return 5;
+  	    }
+  	  for (; have_off < base_off + want_off; have_off++)
+! 	    putc(0, fpo);
+  	}
+  
+        if (n2 >= 0 && n1 >= 0)
+  	{
+! 	  putc((n2 << 4) | n1, fpo);
+  	  have_off++;
+  	  want_off++;
+  	  n1 = -1;
+--- 342,355 ----
+  	      return 5;
+  	    }
+  	  for (; have_off < base_off + want_off; have_off++)
+! 	    if (putc(0, fpo) == EOF)
+! 	      die(3);
+  	}
+  
+        if (n2 >= 0 && n1 >= 0)
+  	{
+! 	  if (putc((n2 << 4) | n1, fpo) == EOF)
+! 	    die(3);
+  	  have_off++;
+  	  want_off++;
+  	  n1 = -1;
+***************
+*** 345,350 ****
+--- 359,366 ----
+  	      want_off = 0;
+  	      while ((c = getc(fpi)) != '\n' && c != EOF)
+  		;
++ 	      if (c == EOF && ferror(fpi))
++ 		die(2);
+  	      ign_garb = 1;
+  	    }
+  	}
+***************
+*** 355,369 ****
+  	    want_off = 0;
+  	  while ((c = getc(fpi)) != '\n' && c != EOF)
+  	    ;
+  	  ign_garb = 1;
+  	}
+      }
+!   fflush(fpo);
+  #ifdef TRY_SEEK
+    fseek(fpo, 0L, 2);
+  #endif
+!   fclose(fpo);
+!   fclose(fpi);
+    return 0;
+  }
+  
+--- 371,390 ----
+  	    want_off = 0;
+  	  while ((c = getc(fpi)) != '\n' && c != EOF)
+  	    ;
++ 	  if (c == EOF && ferror(fpi))
++ 	    die(2);
+  	  ign_garb = 1;
+  	}
+      }
+!   if (fflush(fpo) != 0)
+!     die(3);
+  #ifdef TRY_SEEK
+    fseek(fpo, 0L, 2);
+  #endif
+!   if (fclose(fpo) != 0)
+!     die(3);
+!   if (fclose(fpi) != 0)
+!     die(2);
+    return 0;
+  }
+  
+***************
+*** 379,389 ****
+   *
+   * If nz is always positive, lines are never suppressed.
+   */
+! static void
+  xxdline(fp, l, nz)
+! FILE *fp;
+! char *l;
+! int nz;
+  {
+    static char z[LLEN+1];
+    static int zero_seen = 0;
+--- 400,410 ----
+   *
+   * If nz is always positive, lines are never suppressed.
+   */
+!   static void
+  xxdline(fp, l, nz)
+!   FILE *fp;
+!   char *l;
+!   int nz;
+  {
+    static char z[LLEN+1];
+    static int zero_seen = 0;
+***************
+*** 398,409 ****
+  	  if (nz < 0)
+  	    zero_seen--;
+  	  if (zero_seen == 2)
+! 	    fputs(z, fp);
+  	  if (zero_seen > 2)
+! 	    fputs("*\n", fp);
+  	}
+        if (nz >= 0 || zero_seen > 0)
+! 	fputs(l, fp);
+        if (nz)
+  	zero_seen = 0;
+      }
+--- 419,433 ----
+  	  if (nz < 0)
+  	    zero_seen--;
+  	  if (zero_seen == 2)
+! 	    if (fputs(z, fp) == EOF)
+! 	      die(3);
+  	  if (zero_seen > 2)
+! 	    if (fputs("*\n", fp) == EOF)
+! 	      die(3);
+  	}
+        if (nz >= 0 || zero_seen > 0)
+! 	if (fputs(l, fp) == EOF)
+! 	  die(3);
+        if (nz)
+  	zero_seen = 0;
+      }
+***************
+*** 439,448 ****
+      0070,0071,0372,0373,0374,0375,0376,0377
+  };
+  
+! int
+  main(argc, argv)
+! int argc;
+! char *argv[];
+  {
+    FILE *fp, *fpo;
+    int c, e, p = 0, relseek = 1, negseek = 0, revert = 0;
+--- 463,472 ----
+      0070,0071,0372,0373,0374,0375,0376,0377
+  };
+  
+!   int
+  main(argc, argv)
+!   int argc;
+!   char *argv[];
+  {
+    FILE *fp, *fpo;
+    int c, e, p = 0, relseek = 1, negseek = 0, revert = 0;
+***************
+*** 452,458 ****
+    int grplen;		/* total chars per octet group */
+    long length = -1, n = 0, seekoff = 0;
+    char l[LLEN+1];
+!   char *pname, *pp;
+  
+  #ifdef AMIGA
+    /* This program doesn't work when started from the Workbench */
+--- 476,482 ----
+    int grplen;		/* total chars per octet group */
+    long length = -1, n = 0, seekoff = 0;
+    char l[LLEN+1];
+!   char *pp;
+  
+  #ifdef AMIGA
+    /* This program doesn't work when started from the Workbench */
+***************
+*** 495,501 ****
+  	  else
+  	    {
+  	      if (!argv[2])
+! 		exit_with_usage(pname);
+  	      cols = (int)strtol(argv[2], NULL, 0);
+  	      argv++;
+  	      argc--;
+--- 519,525 ----
+  	  else
+  	    {
+  	      if (!argv[2])
+! 		exit_with_usage();
+  	      cols = (int)strtol(argv[2], NULL, 0);
+  	      argv++;
+  	      argc--;
+***************
+*** 508,514 ****
+  	  else
+  	    {
+  	      if (!argv[2])
+! 		exit_with_usage(pname);
+  	      octspergrp = (int)strtol(argv[2], NULL, 0);
+  	      argv++;
+  	      argc--;
+--- 532,538 ----
+  	  else
+  	    {
+  	      if (!argv[2])
+! 		exit_with_usage();
+  	      octspergrp = (int)strtol(argv[2], NULL, 0);
+  	      argv++;
+  	      argc--;
+***************
+*** 531,537 ****
+  	  else
+  	    {
+  	      if (!argv[2])
+! 		exit_with_usage(pname);
+  #ifdef TRY_SEEK
+  	      if (argv[2][0] == '+')
+  		relseek++;
+--- 555,561 ----
+  	  else
+  	    {
+  	      if (!argv[2])
+! 		exit_with_usage();
+  #ifdef TRY_SEEK
+  	      if (argv[2][0] == '+')
+  		relseek++;
+***************
+*** 550,556 ****
+  	  else
+  	    {
+  	      if (!argv[2])
+! 		exit_with_usage(pname);
+  	      length = strtol(argv[2], (char **)NULL, 0);
+  	      argv++;
+  	      argc--;
+--- 574,580 ----
+  	  else
+  	    {
+  	      if (!argv[2])
+! 		exit_with_usage();
+  	      length = strtol(argv[2], (char **)NULL, 0);
+  	      argv++;
+  	      argc--;
+***************
+*** 563,569 ****
+  	  break;
+  	}
+        else if (pp[0] == '-' && pp[1])	/* unknown option */
+! 	exit_with_usage(pname);
+        else
+  	break;				/* not an option */
+  
+--- 587,593 ----
+  	  break;
+  	}
+        else if (pp[0] == '-' && pp[1])	/* unknown option */
+! 	exit_with_usage();
+        else
+  	break;				/* not an option */
+  
+***************
+*** 602,608 ****
+      octspergrp = cols;
+  
+    if (argc > 3)
+!     exit_with_usage(pname);
+  
+    if (argc == 1 || (argv[1][0] == '-' && !argv[1][1]))
+      BIN_ASSIGN(fp = stdin, !revert);
+--- 626,632 ----
+      octspergrp = cols;
+  
+    if (argc > 3)
+!     exit_with_usage();
+  
+    if (argc == 1 || (argv[1][0] == '-' && !argv[1][1]))
+      BIN_ASSIGN(fp = stdin, !revert);
+***************
+*** 640,646 ****
+  	  fprintf(stderr, "%s: sorry, cannot revert this type of hexdump\n", pname);
+  	  return -1;
+  	}
+!       return huntype(fp, fpo, stderr, pname, cols, hextype,
+  		negseek ? -seekoff : seekoff);
+      }
+  
+--- 664,670 ----
+  	  fprintf(stderr, "%s: sorry, cannot revert this type of hexdump\n", pname);
+  	  return -1;
+  	}
+!       return huntype(fp, fpo, stderr, cols, hextype,
+  		negseek ? -seekoff : seekoff);
+      }
+  
+***************
+*** 664,670 ****
+  	  long s = seekoff;
+  
+  	  while (s--)
+! 	    (void)getc(fp);
+  	}
+      }
+  
+--- 688,703 ----
+  	  long s = seekoff;
+  
+  	  while (s--)
+! 	    if (getc(fp) == EOF)
+! 	      if (ferror(fp))
+! 		{
+! 		  die(2);
+! 		}
+! 	      else
+! 		{
+! 		  fprintf(stderr, "%s: sorry cannot seek.\n", pname);
+! 		  return 4;
+! 		}
+  	}
+      }
+  
+***************
+*** 672,725 ****
+      {
+        if (fp != stdin)
+  	{
+! 	  fprintf(fpo, "unsigned char %s", isdigit((int)argv[1][0]) ? "__" : "");
+  	  for (e = 0; (c = argv[1][e]) != 0; e++)
+! 	    putc(isalnum(c) ? c : '_', fpo);
+! 	  fputs("[] = {\n", fpo);
+  	}
+  
+        p = 0;
+        while ((length < 0 || p < length) && (c = getc(fp)) != EOF)
+  	{
+! 	  fprintf(fpo, (hexx == hexxa) ? "%s0x%02x" : "%s0X%02X",
+! 	    (p % cols) ? ", " : ",\n  "+2*!p,  c);
+  	  p++;
+  	}
+  
+        if (p)
+! 	fputs("\n};\n"+3*(fp == stdin), fpo);
+  
+        if (fp != stdin)
+  	{
+! 	  fprintf(fpo, "unsigned int %s", isdigit((int)argv[1][0]) ? "__" : "");
+  	  for (e = 0; (c = argv[1][e]) != 0; e++)
+! 	    putc(isalnum(c) ? c : '_', fpo);
+! 	  fprintf(fpo, "_len = %d;\n", p);
+  	}
+  
+!       fclose(fp);
+!       fclose(fpo);
+        return 0;
+      }
+  
+    if (hextype == HEX_POSTSCRIPT)
+      {
+        p = cols;
+        while ((length < 0 || n < length) && (e = getc(fp)) != EOF)
+  	{
+! 	  putchar(hexx[(e >> 4) & 0xf]);
+! 	  putchar(hexx[(e     ) & 0xf]);
+  	  n++;
+  	  if (!--p)
+  	    {
+! 	      putchar('\n');
+  	      p = cols;
+  	    }
+  	}
+        if (p < cols)
+! 	putchar('\n');
+!       fclose(fp);
+!       fclose(fpo);
+        return 0;
+      }
+  
+--- 705,779 ----
+      {
+        if (fp != stdin)
+  	{
+! 	  if (fprintf(fpo, "unsigned char %s", isdigit((int)argv[1][0]) ? "__" : "") < 0)
+! 	    die(3);
+  	  for (e = 0; (c = argv[1][e]) != 0; e++)
+! 	    if (putc(isalnum(c) ? c : '_', fpo) == EOF)
+! 	      die(3);
+! 	  if (fputs("[] = {\n", fpo) == EOF)
+! 	    die(3);
+  	}
+  
+        p = 0;
++       c = 0;
+        while ((length < 0 || p < length) && (c = getc(fp)) != EOF)
+  	{
+! 	  if (fprintf(fpo, (hexx == hexxa) ? "%s0x%02x" : "%s0X%02X",
+! 		(p % cols) ? ", " : ",\n  "+2*!p,  c) < 0)
+! 	    die(3);
+  	  p++;
+  	}
++       if (c == EOF && ferror(fp))
++ 	die(2);
+  
+        if (p)
+! 	if (fputs("\n};\n" + 3 * (fp == stdin), fpo) == EOF)
+! 	  die(3);
+  
+        if (fp != stdin)
+  	{
+! 	  if (fprintf(fpo, "unsigned int %s", isdigit((int)argv[1][0]) ? "__" : "") < 0)
+! 	    die(3);
+  	  for (e = 0; (c = argv[1][e]) != 0; e++)
+! 	    if (putc(isalnum(c) ? c : '_', fpo) == EOF)
+! 	      die(3);
+! 	  if (fprintf(fpo, "_len = %d;\n", p) < 0)
+! 	    die(3);
+  	}
+  
+!       if (fclose(fp))
+! 	die(2);
+!       if (fclose(fpo))
+! 	die(3);
+        return 0;
+      }
+  
+    if (hextype == HEX_POSTSCRIPT)
+      {
+        p = cols;
++       e = 0;
+        while ((length < 0 || n < length) && (e = getc(fp)) != EOF)
+  	{
+! 	  if (putc(hexx[(e >> 4) & 0xf], fpo) == EOF
+! 		  || putc(hexx[e & 0xf], fpo) == EOF)
+! 	    die(3);
+  	  n++;
+  	  if (!--p)
+  	    {
+! 	      if (putc('\n', fpo) == EOF)
+! 		die(3);
+  	      p = cols;
+  	    }
+  	}
++       if (e == EOF && ferror(fp))
++ 	die(2);
+        if (p < cols)
+! 	if (putc('\n', fpo) == EOF)
+! 	  die(3);
+!       if (fclose(fp))
+! 	die(2);
+!       if (fclose(fpo))
+! 	die(3);
+        return 0;
+      }
+  
+***************
+*** 730,735 ****
+--- 784,790 ----
+    else	/* hextype == HEX_BITS */
+      grplen = 8 * octspergrp + 1;
+  
++   e = 0;
+    while ((length < 0 || n < length) && (e = getc(fp)) != EOF)
+      {
+        if (p == 0)
+***************
+*** 771,776 ****
+--- 826,833 ----
+  	  p = 0;
+  	}
+      }
++   if (e == EOF && ferror(fp))
++     die(2);
+    if (p)
+      {
+        l[c = (11 + (grplen * cols - 1)/octspergrp + p)] = '\n'; l[++c] = '\0';
+***************
+*** 779,785 ****
+    else if (autoskip)
+      xxdline(fpo, l, -1);	/* last chance to flush out suppressed lines */
+  
+!   fclose(fp);
+!   fclose(fpo);
+    return 0;
+  }
+--- 836,846 ----
+    else if (autoskip)
+      xxdline(fpo, l, -1);	/* last chance to flush out suppressed lines */
+  
+!   if (fclose(fp))
+!     die(2);
+!   if (fclose(fpo))
+!     die(3);
+    return 0;
+  }
++ 
++ /* vi:set ts=8 sw=4 sts=2 cino+={2 cino+=n-2 : */
+*** ../vim-7.3.151/src/version.c	2011-04-01 16:28:33.000000000 +0200
+--- src/version.c	2011-04-01 19:00:26.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     152,
+  /**/
+
+-- 
+Eye have a spelling checker, it came with my PC;
+It plainly marks four my revue mistakes I cannot sea.
+I've run this poem threw it, I'm sure your please to no,
+It's letter perfect in it's weigh, my checker tolled me sew!
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.153 b/source/ap/vim/patches/7.3.153
new file mode 100644
index 00000000..9f76b518
--- /dev/null
+++ b/source/ap/vim/patches/7.3.153
@@ -0,0 +1,66 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.153
+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.3.153 (after 7.3.152)
+Problem:    Compiler warning for ambiguous else, missing prototype.
+Solution:   Add braces. (Dominique Pelle)  Add prototype for die().
+Files:	    src/xxd/xxd.c
+
+
+*** ../vim-7.3.152/src/xxd/xxd.c	2011-04-01 19:14:35.000000000 +0200
+--- src/xxd/xxd.c	2011-04-02 14:42:54.000000000 +0200
+***************
+*** 210,215 ****
+--- 210,216 ----
+  /* Let's collect some prototypes */
+  /* CodeWarrior is really picky about missing prototypes */
+  static void exit_with_usage __P((void));
++ static void die __P((int));
+  static int huntype __P((FILE *, FILE *, FILE *, int, int, long));
+  static void xxdline __P((FILE *, char *, int));
+  
+***************
+*** 689,694 ****
+--- 690,696 ----
+  
+  	  while (s--)
+  	    if (getc(fp) == EOF)
++ 	    {
+  	      if (ferror(fp))
+  		{
+  		  die(2);
+***************
+*** 698,703 ****
+--- 700,706 ----
+  		  fprintf(stderr, "%s: sorry cannot seek.\n", pname);
+  		  return 4;
+  		}
++ 	    }
+  	}
+      }
+  
+*** ../vim-7.3.152/src/version.c	2011-04-01 19:14:35.000000000 +0200
+--- src/version.c	2011-04-02 14:41:12.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     153,
+  /**/
+
+-- 
+            |
+
+Ceci n'est pas une pipe.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.3.154 b/source/ap/vim/patches/7.3.154
new file mode 100644
index 00000000..e7c88620
--- /dev/null
+++ b/source/ap/vim/patches/7.3.154
@@ -0,0 +1,106 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.154
+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.3.154 (after 7.3.148)
+Problem:    Can't compile with tiny features. (Tony Mechelynck)
+Solution:   Move #define outside of #ifdef.
+Files:	    src/syntax.c
+
+
+*** ../vim-7.3.153/src/syntax.c	2011-04-01 14:44:54.000000000 +0200
+--- src/syntax.c	2011-04-02 15:11:47.000000000 +0200
+***************
+*** 68,73 ****
+--- 68,75 ----
+  
+  #define HL_TABLE() ((struct hl_group *)((highlight_ga.ga_data)))
+  
++ #define MAX_HL_ID       20000	/* maximum value for a highlight ID. */
++ 
+  #ifdef FEAT_CMDL_COMPL
+  /* Flags to indicate an additional string for highlight name completion. */
+  static int include_none = 0;	/* when 1 include "None" */
+***************
+*** 225,236 ****
+   * 22000 - 22999  CONTAINED indicator (current_syn_inc_tag added)
+   * 23000 - 32767  cluster IDs (subtract SYNID_CLUSTER for the cluster ID)
+   */
+! #define SYNID_ALLBUT	20000	    /* syntax group ID for contains=ALLBUT */
+  #define SYNID_TOP	21000	    /* syntax group ID for contains=TOP */
+  #define SYNID_CONTAINED	22000	    /* syntax group ID for contains=CONTAINED */
+  #define SYNID_CLUSTER	23000	    /* first syntax group ID for clusters */
+  
+- #define MAX_SYNID       SYNID_ALLBUT
+  #define MAX_SYN_INC_TAG	999	    /* maximum before the above overflow */
+  #define MAX_CLUSTER_ID  (32767 - SYNID_CLUSTER)
+  
+--- 227,237 ----
+   * 22000 - 22999  CONTAINED indicator (current_syn_inc_tag added)
+   * 23000 - 32767  cluster IDs (subtract SYNID_CLUSTER for the cluster ID)
+   */
+! #define SYNID_ALLBUT	MAX_HL_ID   /* syntax group ID for contains=ALLBUT */
+  #define SYNID_TOP	21000	    /* syntax group ID for contains=TOP */
+  #define SYNID_CONTAINED	22000	    /* syntax group ID for contains=CONTAINED */
+  #define SYNID_CLUSTER	23000	    /* first syntax group ID for clusters */
+  
+  #define MAX_SYN_INC_TAG	999	    /* maximum before the above overflow */
+  #define MAX_CLUSTER_ID  (32767 - SYNID_CLUSTER)
+  
+***************
+*** 6462,6468 ****
+  
+  #endif /* FEAT_SYN_HL */
+  
+- 
+  /**************************************
+   *  Highlighting stuff		      *
+   **************************************/
+--- 6463,6468 ----
+***************
+*** 8996,9004 ****
+  	highlight_ga.ga_growsize = 10;
+      }
+  
+!     if (highlight_ga.ga_len >= MAX_SYNID)
+      {
+! 	EMSG(_("E849: Too many syntax groups"));
+  	vim_free(name);
+  	return 0;
+      }
+--- 8996,9004 ----
+  	highlight_ga.ga_growsize = 10;
+      }
+  
+!     if (highlight_ga.ga_len >= MAX_HL_ID)
+      {
+! 	EMSG(_("E849: Too many highlight and syntax groups"));
+  	vim_free(name);
+  	return 0;
+      }
+*** ../vim-7.3.153/src/version.c	2011-04-02 14:44:50.000000000 +0200
+--- src/version.c	2011-04-02 14:52:33.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     154,
+  /**/
+
+-- 
+BEDEVERE:        Why do you think she is a witch?
+SECOND VILLAGER: She turned me into a newt.
+BEDEVERE:        A newt?
+SECOND VILLAGER: (After looking at himself for some time) I got better.
+                 "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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/vim-gvim.SlackBuild b/source/ap/vim/vim-gvim.SlackBuild
index 31ceb1de..f5a5185a 100755
--- a/source/ap/vim/vim-gvim.SlackBuild
+++ b/source/ap/vim/vim-gvim.SlackBuild
@@ -21,9 +21,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VIMVER=7.2
+VIMVER=7.3
 # This is the directory in the VIM source archive to cd into.
-DIRVER=72
+DIRVER=73
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -69,7 +69,6 @@ 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" \
diff --git a/source/ap/vim/vim-runtime-syntax-20100510.diff b/source/ap/vim/vim-runtime-syntax-20100510.diff
deleted file mode 100644
index f8d901d7..00000000
--- a/source/ap/vim/vim-runtime-syntax-20100510.diff
+++ /dev/null
@@ -1,7471 +0,0 @@
-diff -u -r --new-file runtime/syntax.orig/2html.vim runtime/syntax/2html.vim
---- runtime/syntax.orig/2html.vim	2008-07-17 16:03:05.000000000 -0500
-+++ runtime/syntax/2html.vim	2009-07-26 06:44:10.000000000 -0500
-@@ -1,13 +1,18 @@
- " Vim syntax support file
- " Maintainer: Bram Moolenaar <Bram@vim.org>
--" Last Change: 2008 Jul 17
-+" Last Change: 2009 Jul 14
- "	       (modified by David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>)
- "	       (XHTML support by Panagiotis Issaris <takis@lumumba.luc.ac.be>)
- "	       (made w3 compliant by Edd Barrett <vext01@gmail.com>)
- "	       (added html_font. Edd Barrett <vext01@gmail.com>)
-+"	       (dynamic folding by Ben Fritz <fritzophrenic@gmail.com>)
- 
- " Transform a file into HTML, using the current syntax highlighting.
- 
-+" this file uses line continuations
-+let s:cpo_sav = &cpo
-+set cpo-=C
-+
- " Number lines when explicitely requested or when `number' is set
- if exists("html_number_lines")
-   let s:numblines = html_number_lines
-@@ -22,6 +27,37 @@
-   let s:htmlfont = "monospace"
- endif
- 
-+" make copies of the user-defined settings that we may overrule
-+if exists("html_dynamic_folds")
-+  let s:html_dynamic_folds = 1
-+endif
-+if exists("html_hover_unfold")
-+  let s:html_hover_unfold = 1
-+endif
-+if exists("html_use_css")
-+  let s:html_use_css = 1
-+endif
-+
-+" hover opening implies dynamic folding
-+if exists("s:html_hover_unfold")
-+  let s:html_dynamic_folds = 1
-+endif
-+
-+" dynamic folding with no foldcolumn implies hover opens
-+if exists("s:html_dynamic_folds") && exists("html_no_foldcolumn")
-+  let s:html_hover_unfold = 1
-+endif
-+
-+" ignore folding overrides dynamic folding
-+if exists("html_ignore_folding") && exists("s:html_dynamic_folds")
-+  unlet s:html_dynamic_folds
-+endif
-+
-+" dynamic folding implies css
-+if exists("s:html_dynamic_folds")
-+  let s:html_use_css = 1
-+endif
-+
- " When not in gui we can only guess the colors.
- if has("gui_running")
-   let s:whatterm = "gui"
-@@ -62,7 +98,7 @@
-   endfun
- endif
- 
--if !exists("html_use_css")
-+if !exists("s:html_use_css")
-   " Return opening HTML tag for given highlight id
-   function! s:HtmlOpening(id)
-     let a = ""
-@@ -150,6 +186,26 @@
-   return a
- endfun
- 
-+if exists("s:html_dynamic_folds")
-+
-+  " compares two folds as stored in our list of folds
-+  " A fold is "less" than another if it starts at an earlier line number,
-+  " or ends at a later line number, ties broken by fold level
-+  function! s:FoldCompare(f1, f2)
-+    if a:f1.firstline != a:f2.firstline
-+      " put it before if it starts earlier
-+      return a:f1.firstline - a:f2.firstline
-+    elseif a:f1.lastline != a:f2.lastline
-+      " put it before if it ends later
-+      return a:f2.lastline - a:f1.lastline
-+    else
-+      " if folds begin and end on the same lines, put lowest fold level first
-+      return a:f1.level - a:f2.level
-+    endif
-+  endfunction
-+
-+endif
-+
- " Figure out proper MIME charset from the 'encoding' option.
- if exists("html_use_encoding")
-   let s:html_encoding = html_use_encoding
-@@ -223,13 +279,13 @@
-   let s:tag_close = '>'
- endif
- 
--" Cache html_no_pre incase we have to turn it on for non-css mode
-+" Cache html_no_pre in case we have to turn it on for non-css mode
- if exists("html_no_pre")
-   let s:old_html_no_pre = html_no_pre
- endif
- 
--if !exists("html_use_css")
--  " Cant put font tags in <pre>
-+if !exists("s:html_use_css")
-+  " Can't put font tags in <pre>
-   let html_no_pre=1
- endif
- 
-@@ -251,9 +307,86 @@
-   exe "normal! a<meta http-equiv=\"content-type\" content=\"text/html; charset=" . s:html_encoding . '"' . s:tag_close . "\n\e"
- endif
- 
--if exists("html_use_css")
--  exe "normal! a<style type=\"text/css\">\n<!--\n-->\n</style>\n\e"
-+if exists("s:html_use_css")
-+  if exists("s:html_dynamic_folds")
-+    if exists("s:html_hover_unfold")
-+      " if we are doing hover_unfold, use css 2 with css 1 fallback for IE6
-+      exe "normal! a".
-+	  \ "<style type=\"text/css\">\n<!--\n".
-+	  \ ".FoldColumn { text-decoration: none; white-space: pre; }\n\n".
-+	  \ "body * { margin: 0; padding: 0; }\n".
-+	  \ "\n".
-+	  \ ".open-fold   > .Folded { display: none;  }\n".
-+	  \ ".open-fold   > .fulltext { display: inline; }\n".
-+	  \ ".closed-fold > .fulltext { display: none;  }\n".
-+	  \ ".closed-fold > .Folded { display: inline; }\n".
-+	  \ "\n".
-+	  \ ".open-fold   > .toggle-open   { display: none;   }\n".
-+	  \ ".open-fold   > .toggle-closed { display: inline; }\n".
-+	  \ ".closed-fold > .toggle-open   { display: inline; }\n".
-+	  \ ".closed-fold > .toggle-closed { display: none;   }\n"
-+      exe "normal! a\n/* opening a fold while hovering won't be supported by IE6 and other\n".
-+	  \ "similar browsers, but it should fail gracefully. */\n".
-+	  \ ".closed-fold:hover > .fulltext { display: inline; }\n".
-+	  \ ".closed-fold:hover > .toggle-filler { display: none; }\n".
-+	  \ ".closed-fold:hover > .Folded { display: none; }\n"
-+      exe "normal! a-->\n</style>\n"
-+      exe "normal! a<!--[if lt IE 7]>".
-+	  \ "<style type=\"text/css\">\n".
-+	  \ ".open-fold   .Folded      { display: none; }\n".
-+	  \ ".open-fold   .fulltext      { display: inline; }\n".
-+	  \ ".open-fold   .toggle-open   { display: none; }\n".
-+	  \ ".closed-fold .toggle-closed { display: inline; }\n".
-+	  \ "\n".
-+	  \ ".closed-fold .fulltext      { display: none; }\n".
-+	  \ ".closed-fold .Folded      { display: inline; }\n".
-+	  \ ".closed-fold .toggle-open   { display: inline; }\n".
-+	  \ ".closed-fold .toggle-closed { display: none; }\n".
-+	  \ "</style>\n".
-+	  \ "<![endif]-->\n"
-+    else
-+      " if we aren't doing hover_unfold, use CSS 1 only
-+      exe "normal! a<style type=\"text/css\">\n<!--\n".
-+	    \ ".FoldColumn { text-decoration: none; white-space: pre; }\n\n".
-+	    \ ".open-fold   .Folded      { display: none; }\n".
-+	    \ ".open-fold   .fulltext      { display: inline; }\n".
-+	    \ ".open-fold   .toggle-open   { display: none; }\n".
-+	    \ ".closed-fold .toggle-closed { display: inline; }\n".
-+	    \ "\n".
-+	    \ ".closed-fold .fulltext      { display: none; }\n".
-+	    \ ".closed-fold .Folded      { display: inline; }\n".
-+	    \ ".closed-fold .toggle-open   { display: inline; }\n".
-+	    \ ".closed-fold .toggle-closed { display: none; }\n".
-+	    \ "-->\n</style>\n"
-+    endif
-+  else
-+    " if we aren't doing any dynamic folding, no need for any special rules
-+    exe "normal! a<style type=\"text/css\">\n<!--\n-->\n</style>\n\e"
-+  endif
-+endif
-+
-+" insert javascript to toggle folds open and closed
-+if exists("s:html_dynamic_folds")
-+  exe "normal! a\n".
-+	\ "<script type='text/javascript'>\n".
-+	\ "<!--\n".
-+	\ "function toggleFold(objID)\n".
-+	\ "{\n".
-+	\ "  var fold;\n".
-+	\ "  fold = document.getElementById(objID);\n".
-+	\ "  if(fold.className == 'closed-fold')\n".
-+	\ "  {\n".
-+	\ "    fold.className = 'open-fold';\n".
-+	\ "  }\n".
-+	\ "  else if (fold.className == 'open-fold')\n".
-+	\ "  {\n".
-+	\ "    fold.className = 'closed-fold';\n".
-+	\ "  }\n".
-+	\ "}\n".
-+	\ "-->\n".
-+	\ "</script>\n\e"
- endif
-+
- if exists("html_no_pre")
-   exe "normal! a</head>\n<body>\n\e"
- else
-@@ -265,7 +398,81 @@
- " List of all id's
- let s:idlist = ","
- 
--" Loop over all lines in the original text.
-+" First do some preprocessing for dynamic folding. Do this for the entire file
-+" so we don't accidentally start within a closed fold or something.
-+let s:allfolds = []
-+
-+if exists("s:html_dynamic_folds")
-+  let s:lnum = 1
-+  let s:end = line('$')
-+  " save the fold text and set it to the default so we can find fold levels
-+  let s:foldtext_save = &foldtext
-+  set foldtext&
-+
-+  " we will set the foldcolumn in the html to the greater of the maximum fold
-+  " level and the current foldcolumn setting
-+  let s:foldcolumn = &foldcolumn
-+
-+  " get all info needed to describe currently closed folds
-+  while s:lnum < s:end
-+    if foldclosed(s:lnum) == s:lnum
-+      " default fold text has '+-' and then a number of dashes equal to fold
-+      " level, so subtract 2 from index of first non-dash after the dashes
-+      " in order to get the fold level of the current fold
-+      let s:level = match(foldtextresult(s:lnum), '+-*\zs[^-]') - 2
-+      if s:level+1 > s:foldcolumn
-+	let s:foldcolumn = s:level+1
-+      endif
-+      " store fold info for later use
-+      let s:newfold = {'firstline': s:lnum, 'lastline': foldclosedend(s:lnum), 'level': s:level,'type': "closed-fold"}
-+      call add(s:allfolds, s:newfold)
-+      " open the fold so we can find any contained folds
-+      execute s:lnum."foldopen"
-+    else
-+      let s:lnum = s:lnum + 1
-+    endif
-+  endwhile
-+
-+  " close all folds to get info for originally open folds
-+  silent! %foldclose!
-+  let s:lnum = 1
-+
-+  " the originally open folds will be all folds we encounter that aren't
-+  " already in the list of closed folds
-+  while s:lnum < s:end
-+    if foldclosed(s:lnum) == s:lnum
-+      " default fold text has '+-' and then a number of dashes equal to fold
-+      " level, so subtract 2 from index of first non-dash after the dashes
-+      " in order to get the fold level of the current fold
-+      let s:level = match(foldtextresult(s:lnum), '+-*\zs[^-]') - 2
-+      if s:level+1 > s:foldcolumn
-+	let s:foldcolumn = s:level+1
-+      endif
-+      let s:newfold = {'firstline': s:lnum, 'lastline': foldclosedend(s:lnum), 'level': s:level,'type': "closed-fold"}
-+      " only add the fold if we don't already have it
-+      if empty(s:allfolds) || index(s:allfolds, s:newfold) == -1
-+	let s:newfold.type = "open-fold"
-+	call add(s:allfolds, s:newfold)
-+      endif
-+      " open the fold so we can find any contained folds
-+      execute s:lnum."foldopen"
-+    else
-+      let s:lnum = s:lnum + 1
-+    endif
-+  endwhile
-+
-+  " sort the folds so that we only ever need to look at the first item in the
-+  " list of folds
-+  call sort(s:allfolds, "s:FoldCompare")
-+
-+  let &foldtext = s:foldtext_save
-+  unlet s:foldtext_save
-+
-+  " close all folds again so we can get the fold text as we go
-+  silent! %foldclose! 
-+endif
-+
-+" Now loop over all lines in the original text to convert to html.
- " Use html_start_line and html_end_line if they are set.
- if exists("html_start_line")
-   let s:lnum = html_start_line
-@@ -284,6 +491,15 @@
-   let s:end = line("$")
- endif
- 
-+" stack to keep track of all the folds containing the current line
-+let s:foldstack = []
-+
-+if s:numblines
-+  let s:margin = strlen(s:end) + 1
-+else
-+  let s:margin = 0
-+endif
-+
- if has('folding') && !exists('html_ignore_folding')
-   let s:foldfillchar = &fillchars[matchend(&fillchars, 'fold:')]
-   if s:foldfillchar == ''
-@@ -295,6 +511,7 @@
-   let s:difffillchar = '-'
- endif
- 
-+let s:foldId = 0
- 
- while s:lnum <= s:end
- 
-@@ -303,12 +520,7 @@
-   if s:filler > 0
-     let s:n = s:filler
-     while s:n > 0
--      if s:numblines
--	" Indent if line numbering is on
--	let s:new = repeat(s:LeadingSpace, strlen(s:end) + 1) . repeat(s:difffillchar, 3)
--      else
--	let s:new = repeat(s:difffillchar, 3)
--      endif
-+      let s:new = repeat(s:difffillchar, 3)
- 
-       if s:n > 2 && s:n < s:filler && !exists("html_whole_filler")
- 	let s:new = s:new . " " . s:filler . " inserted lines "
-@@ -317,10 +529,16 @@
- 
-       if !exists("html_no_pre")
- 	" HTML line wrapping is off--go ahead and fill to the margin
--	let s:new = s:new . repeat(s:difffillchar, &columns - strlen(s:new))
-+	let s:new = s:new . repeat(s:difffillchar, &columns - strlen(s:new) - s:margin)
-+      else
-+	let s:new = s:new . repeat(s:difffillchar, 3)
-       endif
- 
-       let s:new = s:HtmlFormat(s:new, "DiffDelete")
-+      if s:numblines
-+	" Indent if line numbering is on; must be after escaping.
-+	let s:new = repeat(s:LeadingSpace, s:margin) . s:new
-+      endif
-       exe s:newwin . "wincmd w"
-       exe "normal! a" . s:new . s:HtmlEndline . "\n\e"
-       exe s:orgwin . "wincmd w"
-@@ -333,16 +551,18 @@
- 
-   " Start the line with the line number.
-   if s:numblines
--    let s:new = repeat(' ', strlen(s:end) - strlen(s:lnum)) . s:lnum . ' '
-+    let s:numcol = repeat(' ', s:margin - 1 - strlen(s:lnum)) . s:lnum . ' '
-   else
--    let s:new = ""
-+    let s:numcol = ""
-   endif
- 
--  if has('folding') && !exists('html_ignore_folding') && foldclosed(s:lnum) > -1
-+  let s:new = ""
-+
-+  if has('folding') && !exists('html_ignore_folding') && foldclosed(s:lnum) > -1 && !exists('s:html_dynamic_folds')
-     "
--    " This is the beginning of a folded block
-+    " This is the beginning of a folded block (with no dynamic folding)
-     "
--    let s:new = s:new . foldtextresult(s:lnum)
-+    let s:new = s:numcol . foldtextresult(s:lnum)
-     if !exists("html_no_pre")
-       " HTML line wrapping is off--go ahead and fill to the margin
-       let s:new = s:new . repeat(s:foldfillchar, &columns - strlen(s:new))
-@@ -355,14 +575,96 @@
- 
-   else
-     "
--    " A line that is not folded.
-+    " A line that is not folded, or doing dynamic folding.
-     "
-     let s:line = getline(s:lnum)
--
-     let s:len = strlen(s:line)
- 
-+    if exists("s:html_dynamic_folds")
-+      " First insert a closing for any open folds that end on this line
-+      while !empty(s:foldstack) && get(s:foldstack,0).lastline == s:lnum-1
-+	let s:new = s:new."</span></span>"
-+	call remove(s:foldstack, 0)
-+      endwhile
-+
-+      " Now insert an opening any new folds that start on this line
-+      let s:firstfold = 1
-+      while !empty(s:allfolds) && get(s:allfolds,0).firstline == s:lnum
-+	let s:foldId = s:foldId + 1
-+	let s:new = s:new . "<span id='fold".s:foldId."' class='".s:allfolds[0].type."'>"
-+
-+	" Unless disabled, add a fold column for the opening line of a fold.
-+	"
-+	" Note that dynamic folds require using css so we just use css to take
-+	" care of the leading spaces rather than using &nbsp; in the case of
-+	" html_no_pre to make it easier
-+	if !exists("html_no_foldcolumn")
-+	  " add fold column that can open the new fold
-+	  if s:allfolds[0].level > 1 && s:firstfold
-+	    let s:new = s:new . "<a class='toggle-open FoldColumn' href='javascript:toggleFold(\"fold".s:foldstack[0].id."\")'>"
-+	    let s:new = s:new . repeat('|', s:allfolds[0].level - 1) . "</a>"
-+	  endif
-+	  let s:new = s:new . "<a class='toggle-open FoldColumn' href='javascript:toggleFold(\"fold".s:foldId."\")'>+</a>"
-+	  let s:new = s:new . "<a class='toggle-open "
-+	  " If this is not the last fold we're opening on this line, we need
-+	  " to keep the filler spaces hidden if the fold is opened by mouse
-+	  " hover. If it is the last fold to open in the line, we shouldn't hide
-+	  " them, so don't apply the toggle-filler class.
-+	  if get(s:allfolds, 1, {'firstline': 0}).firstline == s:lnum
-+	    let s:new = s:new . "toggle-filler "
-+	  endif
-+	  let s:new = s:new . "FoldColumn' href='javascript:toggleFold(\"fold".s:foldId."\")'>"
-+	  let s:new = s:new . repeat(" ", s:foldcolumn - s:allfolds[0].level) . "</a>"
-+
-+	  " add fold column that can close the new fold
-+	  let s:new = s:new . "<a class='toggle-closed FoldColumn' href='javascript:toggleFold(\"fold".s:foldId."\")'>"
-+	  if s:firstfold
-+	    let s:new = s:new . repeat('|', s:allfolds[0].level - 1)
-+	  endif
-+	  let s:new = s:new . "-"
-+	  " only add spaces if we aren't opening another fold on the same line
-+	  if get(s:allfolds, 1, {'firstline': 0}).firstline != s:lnum
-+	    let s:new = s:new . repeat(" ", s:foldcolumn - s:allfolds[0].level)
-+	  endif
-+	  let s:new = s:new . "</a>"
-+	  let s:firstfold = 0
-+	endif
-+
-+	" add fold text, moving the span ending to the next line so collapsing
-+	" of folds works correctly
-+	let s:new = s:new . substitute(s:HtmlFormat(s:numcol . foldtextresult(s:lnum), "Folded"), '</span>', s:HtmlEndline.'\r\0', '')
-+	let s:new = s:new . "<span class='fulltext'>"
-+
-+	" open the fold now that we have the fold text to allow retrieval of
-+	" fold text for subsequent folds
-+	execute s:lnum."foldopen"
-+	call insert(s:foldstack, remove(s:allfolds,0))
-+	let s:foldstack[0].id = s:foldId
-+      endwhile
-+
-+      " Unless disabled, add a fold column for other lines.
-+      "
-+      " Note that dynamic folds require using css so we just use css to take
-+      " care of the leading spaces rather than using &nbsp; in the case of
-+      " html_no_pre to make it easier
-+      if !exists("html_no_foldcolumn")
-+	if empty(s:foldstack)
-+	  " add the empty foldcolumn for unfolded lines
-+	  let s:new = s:new . s:HtmlFormat(repeat(' ', s:foldcolumn), "FoldColumn")
-+	else
-+	  " add the fold column for folds not on the opening line
-+	  if get(s:foldstack, 0).firstline < s:lnum
-+	    let s:new = s:new . "<a class='FoldColumn' href='javascript:toggleFold(\"fold".s:foldstack[0].id."\")'>"
-+	    let s:new = s:new . repeat('|', s:foldstack[0].level)
-+	    let s:new = s:new . repeat(' ', s:foldcolumn - s:foldstack[0].level) . "</a>"
-+	  endif
-+	endif
-+      endif
-+    endif
-+
-+    " Now continue with the unfolded line text
-     if s:numblines
--      let s:new = s:HtmlFormat(s:new, "lnr")
-+      let s:new = s:new . s:HtmlFormat(s:numcol, "lnr")
-     endif
- 
-     " Get the diff attribute, if any.
-@@ -380,7 +682,7 @@
- 	while s:col <= s:len && s:id == diff_hlID(s:lnum, s:col) | let s:col = s:col + 1 | endwhile
- 	if s:len < &columns && !exists("html_no_pre")
- 	  " Add spaces at the end to mark the changed line.
--	  let s:line = s:line . repeat(' ', &columns - s:len)
-+	  let s:line = s:line . repeat(' ', &columns - virtcol([s:lnum, s:len]) - s:margin)
- 	  let s:len = &columns
- 	endif
-       else
-@@ -393,11 +695,27 @@
- 
-       " Expand tabs
-       let s:expandedtab = strpart(s:line, s:startcol - 1, s:col - s:startcol)
--      let idx = stridx(s:expandedtab, "\t")
--      while idx >= 0
--	let i = &ts - ((idx + s:startcol - 1) % &ts)
--	let s:expandedtab = substitute(s:expandedtab, '\t', repeat(' ', i), '')
--	let idx = stridx(s:expandedtab, "\t")
-+      let s:offset = 0
-+      let s:idx = stridx(s:expandedtab, "\t")
-+      while s:idx >= 0
-+	if has("multi_byte_encoding")
-+	  if s:startcol + s:idx == 1
-+	    let s:i = &ts
-+	  else
-+	    if s:idx == 0
-+	      let s:prevc = matchstr(s:line, '.\%' . (s:startcol + s:idx + s:offset) . 'c')
-+	    else
-+	      let s:prevc = matchstr(s:expandedtab, '.\%' . (s:idx + 1) . 'c')
-+	    endif
-+	    let s:vcol = virtcol([s:lnum, s:startcol + s:idx + s:offset - len(s:prevc)])
-+	    let s:i = &ts - (s:vcol % &ts)
-+	  endif
-+	  let s:offset -= s:i - 1
-+	else
-+	  let s:i = &ts - ((s:idx + s:startcol - 1) % &ts)
-+	endif
-+	let s:expandedtab = substitute(s:expandedtab, '\t', repeat(' ', s:i), '')
-+	let s:idx = stridx(s:expandedtab, "\t")
-       endwhile
- 
-       " Output the text with the same synID, with class set to {s:id_name}
-@@ -415,8 +733,22 @@
- " Finish with the last line
- exe s:newwin . "wincmd w"
- 
-+if exists("s:html_dynamic_folds")
-+  " finish off any open folds
-+  while !empty(s:foldstack)
-+    exe "normal! a</span></span>"
-+    call remove(s:foldstack, 0)
-+  endwhile
-+
-+  " add fold column to the style list if not already there
-+  let s:id = hlID('FoldColumn')
-+  if stridx(s:idlist, "," . s:id . ",") == -1
-+    let s:idlist = s:idlist . s:id . ","
-+  endif
-+endif
-+
- " Close off the font tag that encapsulates the whole <body>
--if !exists("html_use_css")
-+if !exists("s:html_use_css")
-   exe "normal! a</font>\e"
- endif
- 
-@@ -428,7 +760,7 @@
- 
- 
- " Now, when we finally know which, we define the colors and styles
--if exists("html_use_css")
-+if exists("s:html_use_css")
-   1;/<style type="text/+1
- endif
- 
-@@ -445,7 +777,7 @@
- " Normal/global attributes
- " For Netscape 4, set <body> attributes too, though, strictly speaking, it's
- " incorrect.
--if exists("html_use_css")
-+if exists("s:html_use_css")
-   if exists("html_no_pre")
-     execute "normal! A\nbody { color: " . s:fgc . "; background-color: " . s:bgc . "; font-family: ". s:htmlfont ."; }\e"
-   else
-@@ -455,12 +787,12 @@
-     execute "normal! ^cwbody\e"
-   endif
- else
--    execute '%s:<body>:<body bgcolor="' . s:bgc . '" text="' . s:fgc . '"><font face="'. s:htmlfont .'">'
-+  execute '%s:<body>:<body bgcolor="' . s:bgc . '" text="' . s:fgc . '"><font face="'. s:htmlfont .'">'
- endif
- 
- " Line numbering attributes
- if s:numblines
--  if exists("html_use_css")
-+  if exists("s:html_use_css")
-     execute "normal! A\n.lnr { " . s:CSS1(hlID("LineNr")) . "}\e"
-   else
-     execute '%s+^<span class="lnr">\([^<]*\)</span>+' . s:HtmlOpening(hlID("LineNr")) . '\1' . s:HtmlClosing(hlID("LineNr")) . '+g'
-@@ -479,14 +811,14 @@
-   " If the class has some attributes, export the style, otherwise DELETE all
-   " its occurences to make the HTML shorter
-   if s:attr != ""
--    if exists("html_use_css")
-+    if exists("s:html_use_css")
-       execute "normal! A\n." . s:id_name . " { " . s:attr . "}"
-     else
-       execute '%s+<span class="' . s:id_name . '">\([^<]*\)</span>+' . s:HtmlOpening(s:id) . '\1' . s:HtmlClosing(s:id) . '+g'
-     endif
-   else
-     execute '%s+<span class="' . s:id_name . '">\([^<]*\)</span>+\1+ge'
--    if exists("html_use_css")
-+    if exists("s:html_use_css")
-       1;/<style type="text/+1
-     endif
-   endif
-@@ -531,16 +863,28 @@
- " Save a little bit of memory (worth doing?)
- unlet s:htmlfont
- unlet s:old_et s:old_paste s:old_icon s:old_report s:old_title s:old_search
--unlet s:whatterm s:idlist s:lnum s:end s:fgc s:bgc s:old_magic
-+unlet s:whatterm s:idlist s:lnum s:end s:margin s:fgc s:bgc s:old_magic
- unlet! s:col s:id s:attr s:len s:line s:new s:expandedtab s:numblines
--unlet s:orgwin s:newwin s:orgbufnr
-+unlet! s:orgwin s:newwin s:orgbufnr s:idx s:i s:offset
- if !v:profiling
-   delfunc s:HtmlColor
-   delfunc s:HtmlFormat
-   delfunc s:CSS1
--  if !exists("html_use_css")
-+  if !exists("s:html_use_css")
-     delfunc s:HtmlOpening
-     delfunc s:HtmlClosing
-   endif
- endif
--silent! unlet s:diffattr s:difffillchar s:foldfillchar s:HtmlSpace s:LeadingSpace s:HtmlEndline
-+silent! unlet s:diffattr s:difffillchar s:foldfillchar s:HtmlSpace s:LeadingSpace s:HtmlEndline s:firstfold s:foldcolumn
-+unlet s:foldstack s:allfolds s:foldId s:numcol
-+
-+if exists("s:html_dynamic_folds")
-+  delfunc s:FoldCompare
-+endif
-+
-+silent! unlet s:html_dynamic_folds s:html_hover_unfold s:html_use_css
-+
-+let &cpo = s:cpo_sav
-+unlet s:cpo_sav
-+
-+" vim: noet sw=2 sts=2
-diff -u -r --new-file runtime/syntax.orig/asm.vim runtime/syntax/asm.vim
---- runtime/syntax.orig/asm.vim	2004-06-07 09:32:35.000000000 -0500
-+++ runtime/syntax/asm.vim	2010-01-12 14:45:24.000000000 -0600
-@@ -1,10 +1,12 @@
- " Vim syntax file
- " Language:	GNU Assembler
--" Maintainer:	Kevin Dahlhausen <kdahlhaus@yahoo.com>
--" Last Change:	2002 Sep 19
-+" Maintainer:	Erik Wognsen <erik.wognsen@gmail.com>
-+"		Previous maintainer:
-+"		Kevin Dahlhausen <kdahlhaus@yahoo.com>
-+" Last Change:	2010 Jan 9
- 
- " For version 5.x: Clear all syntax items
--" For version 6.x: Quit when a syntax file was already loaded
-+" For version 6.0 and later: Quit when a syntax file was already loaded
- if version < 600
-   syntax clear
- elseif exists("b:current_syntax")
-@@ -13,7 +15,6 @@
- 
- syn case ignore
- 
--
- " storage types
- syn match asmType "\.long"
- syn match asmType "\.ascii"
-@@ -44,9 +45,8 @@
- syn match hexNumber		"0[xX][0-9a-fA-F]\+"
- syn match binNumber		"0[bB][0-1]*"
- 
--
--syn match asmSpecialComment	";\*\*\*.*"
--syn match asmComment		";.*"hs=s+1
-+syn match asmComment		"#.*"
-+syn region asmComment		start="/\*" end="\*/"
- 
- syn match asmInclude		"\.include"
- syn match asmCond		"\.if"
-@@ -86,15 +86,9 @@
-   HiLink octNumber	Number
-   HiLink binNumber	Number
- 
--  HiLink asmSpecialComment Comment
-   HiLink asmIdentifier Identifier
-   HiLink asmType	Type
- 
--  " My default color overrides:
--  " hi asmSpecialComment ctermfg=red
--  " hi asmIdentifier ctermfg=lightcyan
--  " hi asmType ctermbg=black ctermfg=brown
--
-   delcommand HiLink
- endif
- 
-diff -u -r --new-file runtime/syntax.orig/bzr.vim runtime/syntax/bzr.vim
---- runtime/syntax.orig/bzr.vim	2008-07-30 14:47:17.000000000 -0500
-+++ runtime/syntax/bzr.vim	2009-01-28 10:23:50.000000000 -0600
-@@ -2,9 +2,14 @@
- " Language:     Bazaar (bzr) commit file
- " Maintainer:   Dmitry Vasiliev <dima at hlabs dot spb dot ru>
- " URL:          http://www.hlabs.spb.ru/vim/bzr.vim
--" Revision:     $Id: bzr.vim 683 2008-07-30 11:52:38Z hdima $
-+" Last Change:  2009-01-27
- " Filenames:    bzr_log.*
--" Version:      1.1
-+" Version:      1.2.1
-+"
-+" Thanks:
-+"
-+"    Gioele Barabucci
-+"       for idea of diff highlighting
- 
- " For version 5.x: Clear all syntax items.
- " For version 6.x: Quit when a syntax file was already loaded.
-@@ -14,13 +19,21 @@
-   finish
- endif
- 
--syn region bzrRegion   start="^-\{14} This line and the following will be ignored -\{14}$" end="\%$" contains=ALL contains=@NoSpell
-+if exists("bzr_highlight_diff")
-+  syn include @Diff syntax/diff.vim
-+endif
-+
- syn match bzrRemoved   "^removed:$" contained
- syn match bzrAdded     "^added:$" contained
- syn match bzrRenamed   "^renamed:$" contained
- syn match bzrModified  "^modified:$" contained
- syn match bzrUnchanged "^unchanged:$" contained
- syn match bzrUnknown   "^unknown:$" contained
-+syn cluster Statuses contains=bzrRemoved,bzrAdded,bzrRenamed,bzrModified,bzrUnchanged,bzrUnknown
-+if exists("bzr_highlight_diff")
-+  syn cluster Statuses add=@Diff
-+endif
-+syn region bzrRegion   start="^-\{14} This line and the following will be ignored -\{14}$" end="\%$" contains=@NoSpell,@Statuses
- 
- " Synchronization.
- syn sync clear
-@@ -37,7 +50,6 @@
-     command -nargs=+ HiLink hi def link <args>
-   endif
- 
--  HiLink bzrRegion     Comment
-   HiLink bzrRemoved    Constant
-   HiLink bzrAdded      Identifier
-   HiLink bzrModified   Special
-diff -u -r --new-file runtime/syntax.orig/c.vim runtime/syntax/c.vim
---- runtime/syntax.orig/c.vim	2008-03-19 15:44:52.000000000 -0500
-+++ runtime/syntax/c.vim	2009-11-28 06:31:38.000000000 -0600
-@@ -1,7 +1,7 @@
- " Vim syntax file
- " Language:	C
- " Maintainer:	Bram Moolenaar <Bram@vim.org>
--" Last Change:	2008 Mar 19
-+" Last Change:	2009 Nov 17
- 
- " Quit when a (custom) syntax file was already loaded
- if exists("b:current_syntax")
-@@ -16,8 +16,13 @@
- 
- syn keyword	cTodo		contained TODO FIXME XXX
- 
-+" It's easy to accidentally add a space after a backslash that was intended
-+" for line continuation.  Some compilers allow it, which makes it
-+" unpredicatable and should be avoided.
-+syn match	cBadContinuation contained "\\\s\+$"
-+
- " cCommentGroup allows adding matches for special things in comments
--syn cluster	cCommentGroup	contains=cTodo
-+syn cluster	cCommentGroup	contains=cTodo,cBadContinuation
- 
- " String and Character constants
- " Highlight special characters (those which have a backslash) differently
-@@ -265,7 +270,7 @@
- endif
- 
- " Accept %: for # (C99)
--syn region	cPreCondit	start="^\s*\(%:\|#\)\s*\(if\|ifdef\|ifndef\|elif\)\>" skip="\\$" end="$" end="//"me=s-1 contains=cComment,cCppString,cCharacter,cCppParen,cParenError,cNumbers,cCommentError,cSpaceError
-+syn region	cPreCondit	start="^\s*\(%:\|#\)\s*\(if\|ifdef\|ifndef\|elif\)\>" skip="\\$" end="$"  contains=cComment,cCommentL,cCppString,cCharacter,cCppParen,cParenError,cNumbers,cCommentError,cSpaceError
- syn match	cPreCondit	display "^\s*\(%:\|#\)\s*\(else\|endif\)\>"
- if !exists("c_no_if0")
-   if !exists("c_no_if0_fold")
-@@ -281,7 +286,7 @@
- syn match	cInclude	display "^\s*\(%:\|#\)\s*include\>\s*["<]" contains=cIncluded
- "syn match cLineSkip	"\\$"
- syn cluster	cPreProcGroup	contains=cPreCondit,cIncluded,cInclude,cDefine,cErrInParen,cErrInBracket,cUserLabel,cSpecial,cOctalZero,cCppOut,cCppOut2,cCppSkip,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom,cString,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cParen,cBracket,cMulti
--syn region	cDefine		start="^\s*\(%:\|#\)\s*\(define\|undef\)\>" skip="\\$" end="$" end="//"me=s-1 keepend contains=ALLBUT,@cPreProcGroup,@Spell
-+syn region	cDefine		start="^\s*\(%:\|#\)\s*\(define\|undef\)\>" skip="\\$" end="$" keepend contains=ALLBUT,@cPreProcGroup,@Spell
- syn region	cPreProc	start="^\s*\(%:\|#\)\s*\(pragma\>\|line\>\|warning\>\|warn\>\|error\>\)" skip="\\$" end="$" keepend contains=ALLBUT,@cPreProcGroup,@Spell
- 
- " Highlight User Labels
-@@ -359,6 +364,7 @@
- hi def link cComment		Comment
- hi def link cSpecial		SpecialChar
- hi def link cTodo		Todo
-+hi def link cBadContinuation	Error
- hi def link cCppSkip		cCppOut
- hi def link cCppOut2		cCppOut
- hi def link cCppOut		Comment
-diff -u -r --new-file runtime/syntax.orig/cf.vim runtime/syntax/cf.vim
---- runtime/syntax.orig/cf.vim	2007-11-19 16:27:33.000000000 -0600
-+++ runtime/syntax/cf.vim	2010-03-02 09:17:43.000000000 -0600
-@@ -1,321 +1,440 @@
- " Vim syntax file
--"    Language: ColdFusion
--"  Maintainer: Toby Woodwark (toby.woodwark+vim@gmail.com)
--" Last Change: 2007 Nov 19
--"   Filenames: *.cfc *.cfm
--"     Version: Macromedia ColdFusion MX 7
--"       Usage: Note that ColdFusion has its own comment syntax
--"              i.e. <!--- --->
--
--" For version 5.x, clear all syntax items.
--" For version 6.x+, quit if a syntax file is already loaded.
--if version < 600
--  syntax clear
--elseif exists("b:current_syntax")
-+" Language:	CFML
-+" Maintainer:	Toby Woodwark (toby.woodwark+vim@gmail.com)
-+" Last Change:	2010-03-02
-+" Filenames:	*.cfc *.cfm
-+" Version:	Adobe ColdFusion 9
-+" Usage:	This file contains both syntax definitions
-+" 		and a list of known builtin tags, functions and keywords.
-+" 		Refs - 
-+" http://help.adobe.com/en_US/ColdFusion/9.0/Developing/WS8f0cc78011fffa71866534d11cdad96e4e-8000.html
-+" http://help.adobe.com/en_US/ColdFusion/9.0/CFMLRef/WSc3ff6d0ea77859461172e0811cbec17324-8000.html
-+" TODO: 
-+" 		Support the limited array literal and struct literal syntax in CF8+.
-+" 		Highlight namespaced tags fom cfimport.
-+" 		Complete CF9+ cfscript support.
-+" 		Railo support.
-+" Options:
-+"	d_noinclude_html - set to prevent HTML highlighting.	Use this if you are not working on HTML.
-+
-+" Quit if a syntax file is already loaded.
-+if exists("b:current_syntax")
-   finish
- endif
- 
--" Use all the stuff from the HTML syntax file.
--" TODO remove this; CFML is not a superset of HTML
--if version < 600
--  source <sfile>:p:h/html.vim
-+if exists("d_noinclude_html")
-+  " Define alternatives to the HTML syntax file.
-+
-+  " Copied from html.vim - the rules for matching a CF tag match	those for HTML/SGML.
-+  " CFML syntax is more permissive when it comes to superfluous <> chars.
-+  syn region	htmlString	contained start=+"+ end=+"+ contains=@htmlPreproc
-+  syn region	htmlString	contained start=+'+ end=+'+ contains=@htmlPreproc
-+  syn match	htmlValue	contained "=[\t ]*[^'" \t>][^ \t>]*"hs=s+1	contains=@htmlPreproc
-+  " Hacked htmlTag so that it only matches cf tags and not random <> chars.
-+  syn region	htmlEndTag	start=+</cf+	end=+>+ contains=htmlTagN,htmlTagError
-+  syn region	htmlTag		start=+<\s*cf[^/]+	end=+>+ contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,@htmlPreproc,@htmlArgCluster
-+  syn match	htmlTagN	contained +<\s*[-a-zA-Z0-9]\++hs=s+1 contains=htmlTagName,@htmlTagNameCluster
-+  syn match	htmlTagN	contained +</\s*[-a-zA-Z0-9]\++hs=s+2 contains=htmlTagName,@htmlTagNameCluster
-+  syn match	htmlTagError	contained "[^>]<"ms=s+1
- else
-+  " Use all the stuff from the HTML syntax file.
-+  " This means eg HTML comments are highlighted as comments, even if they include cf tags.
-   runtime! syntax/html.vim
- endif
- 
--syn sync fromstart
--syn sync maxlines=200
--syn case ignore
-+syn sync	fromstart
-+syn sync	maxlines=200
-+syn case	ignore
- 
- " Scopes and keywords.
--syn keyword cfScope contained cgi cffile cookie request caller this thistag
--syn keyword cfScope contained cfcatch variables application server session client form url attributes
--syn keyword cfScope contained arguments
--syn keyword cfBool contained yes no true false
-+syn keyword	cfScope		contained cgi cffile cookie request caller this thistag
-+syn keyword	cfScope		contained cfcatch variables application server session client form url local
-+syn keyword	cfScope		contained arguments super cfhttp attributes error
-+syn keyword	cfBool		contained yes no true false
- 
- " Operator strings.
--syn keyword cfOperator contained xor eqv and or lt le lte gt ge gte equal eq neq not is mod contains
--syn match cfOperatorMatch contained "\<does\_s\+not\_s\+contain\>"
--syn match cfOperatorMatch contained "\<\(greater\|less\)\_s\+than\(\_s\+or\_s\+equal\_s\+to\)\?\>"
--syn match cfOperatorMatch contained "[\+\-\*\/\\\^\&][\+\-\*\/\\\^\&]\@!"
--syn cluster cfOperatorCluster contains=cfOperator,cfOperatorMatch
-+" ColdFusion <=7:
-+syn keyword	cfOperator		contained xor eqv and or lt le lte gt ge gte equal eq neq not is mod contains
-+syn match	cfOperatorMatch		contained "+" 
-+syn match	cfOperatorMatch		contained "\-"
-+syn match	cfOperatorMatch		contained "[\*\/\\\^\&][\+\-\*\/\\\^\&]\@!"
-+syn match	cfOperatorMatch		contained "\<\(not\_s\+\)\?equal\>"
-+syn match	cfOperatorMatch		contained "\<does\_s\+not\_s\+contain\>"
-+syn match	cfOperatorMatch		contained "\<\(greater\|less\)\_s\+than\(\_s\+or\_s\+equal\_s\+to\)\?\>"
-+" ColdFusion 8:
-+syn keyword	cfOperator		contained imp
-+syn match	cfOperatorMatch		contained "[?%:!]"
-+syn match	cfOperatorMatch		contained "[\+\-\*\/\&]=" 
-+syn match	cfOperatorMatch		contained "++"
-+syn match	cfOperatorMatch		contained "--"
-+syn match	cfOperatorMatch	 	contained "&&"
-+syn match	cfOperatorMatch	 	contained "||"
-+
-+syn cluster	cfOperatorCluster	contains=cfOperator,cfOperatorMatch
-+
-+" Custom tags called with the <cf_xxx> syntax.
-+syn match	cfCustomTagName		contained "\<cf_[a-zA-Z0-9_]\+\>"
-+" (TODO match	namespaced tags imported using cfimport, similarly.)
- 
- " Tag names.
--syn keyword cfTagName contained cfabort cfapplet cfapplication cfargument cfassociate
--syn keyword cfTagName contained cfbreak cfcache cfcalendar cfcase cfcatch
--syn keyword cfTagName contained cfchart cfchartdata cfchartseries cfcol cfcollection
--syn keyword cfTagName contained cfcomponent cfcontent cfcookie cfdefaultcase cfdirectory
--syn keyword cfTagName contained cfdocument cfdocumentitem cfdocumentsection cfdump cfelse
--syn keyword cfTagName contained cfelseif cferror cfexecute cfexit cffile cfflush cfform
--syn keyword cfTagName contained cfformgroup cfformitem cfftp cffunction cfgraph cfgraphdata
--syn keyword cfTagName contained cfgrid cfgridcolumn cfgridrow cfgridupdate cfheader
--syn keyword cfTagName contained cfhtmlhead cfhttp cfhttpparam cfif cfimport
--syn keyword cfTagName contained cfinclude cfindex cfinput cfinsert cfinvoke cfinvokeargument
--syn keyword cfTagName contained cfldap cflocation cflock cflog cflogin cfloginuser cflogout
--syn keyword cfTagName contained cfloop cfmail cfmailparam cfmailpart cfmodule
--syn keyword cfTagName contained cfNTauthenticate cfobject cfobjectcache cfoutput cfparam
--syn keyword cfTagName contained cfpop cfprocessingdirective cfprocparam cfprocresult
--syn keyword cfTagName contained cfproperty cfquery cfqueryparam cfregistry cfreport
--syn keyword cfTagName contained cfreportparam cfrethrow cfreturn cfsavecontent cfschedule
--syn keyword cfTagName contained cfscript cfsearch cfselect cfservlet cfservletparam cfset
--syn keyword cfTagName contained cfsetting cfsilent cfslider cfstoredproc cfswitch cftable
--syn keyword cfTagName contained cftextarea cftextinput cfthrow cftimer cftrace cftransaction
--syn keyword cfTagName contained cftree cftreeitem cftry cfupdate cfwddx cfxml
--
--" Tag parameters.
--syn keyword cfArg contained abort accept access accessible action addnewline addtoken
--syn keyword cfArg contained agentname align appendkey appletsource application
--syn keyword cfArg contained applicationtimeout applicationtoken archive
--syn keyword cfArg contained argumentcollection arguments asciiextensionlist
--syn keyword cfArg contained attachmentpath attributecollection attributes autowidth
--syn keyword cfArg contained backgroundvisible basetag bcc bgcolor bind bindingname
--syn keyword cfArg contained blockfactor body bold border branch cachedafter cachedwithin
--syn keyword cfArg contained casesensitive category categorytree cc cfsqltype charset
--syn keyword cfArg contained chartheight chartwidth checked class clientmanagement
--syn keyword cfArg contained clientstorage codebase colheaderalign colheaderbold
--syn keyword cfArg contained colheaderfont colheaderfontsize colheaderitalic colheaders
--syn keyword cfArg contained colheadertextcolor collection colorlist colspacing columns
--syn keyword cfArg contained completepath component condition connection contentid
--syn keyword cfArg contained context contextbytes contexthighlightbegin
--syn keyword cfArg contained contexthighlightend contextpassages cookiedomain criteria
--syn keyword cfArg contained custom1 custom2 custom3 custom4 data dataalign
--syn keyword cfArg contained databackgroundcolor datacollection datasource daynames
--syn keyword cfArg contained dbname dbserver dbtype dbvarname debug default delete
--syn keyword cfArg contained deletebutton deletefile delimiter delimiters description
--syn keyword cfArg contained destination detail directory disabled display displayname
--syn keyword cfArg contained disposition dn domain editable enablecab enablecfoutputonly
--syn keyword cfArg contained enabled encoded encryption enctype enddate endrange endtime
--syn keyword cfArg contained entry errorcode exception existing expand expires expireurl
--syn keyword cfArg contained expression extendedinfo extends extensions external
--syn keyword cfArg contained failifexists failto file filefield filename filter
--syn keyword cfArg contained firstdayofweek firstrowasheaders fixnewline font fontbold
--syn keyword cfArg contained fontembed fontitalic fontsize foregroundcolor format
--syn keyword cfArg contained formfields formula from generateuniquefilenames getasbinary
--syn keyword cfArg contained grid griddataalign gridlines groovecolor group
--syn keyword cfArg contained groupcasesensitive header headeralign headerbold headerfont
--syn keyword cfArg contained headerfontsize headeritalic headerlines headertextcolor
--syn keyword cfArg contained height highlighthref hint href hrefkey hscroll hspace html
--syn keyword cfArg contained htmltable id idletimeout img imgopen imgstyle index inline
--syn keyword cfArg contained input insert insertbutton interval isolation italic item
--syn keyword cfArg contained itemcolumn key keyonly label labelformat language list
--syn keyword cfArg contained listgroups locale localfile log loginstorage lookandfeel
--syn keyword cfArg contained mailerid mailto marginbottom marginleft marginright
--syn keyword cfArg contained margintop markersize markerstyle mask max maxlength maxrows
--syn keyword cfArg contained message messagenumber method mimeattach mimetype min mode
--syn keyword cfArg contained modifytype monthnames multipart multiple name nameconflict
--syn keyword cfArg contained namespace new newdirectory notsupported null numberformat
--syn keyword cfArg contained object omit onblur onchange onclick onerror onfocus
--syn keyword cfArg contained onkeydown onkeyup onload onmousedown onmouseup onreset
--syn keyword cfArg contained onsubmit onvalidate operation orderby orientation output
--syn keyword cfArg contained outputfile overwrite ownerpassword pageencoding pageheight
--syn keyword cfArg contained pagetype pagewidth paintstyle param_1 param_2 param_3
--syn keyword cfArg contained param_4 param_5 param_6 param_7 param_8 param_9 parent
--syn keyword cfArg contained parrent passive passthrough password path pattern
--syn keyword cfArg contained permissions picturebar pieslicestyle port porttypename
--syn keyword cfArg contained prefix preloader preservedata previouscriteria procedure
--syn keyword cfArg contained protocol provider providerdsn proxybypass proxypassword
--syn keyword cfArg contained proxyport proxyserver proxyuser publish query queryasroot
--syn keyword cfArg contained queryposition range rebind recurse redirect referral
--syn keyword cfArg contained refreshlabel remotefile replyto report requesttimeout
--syn keyword cfArg contained required reset resoleurl resolveurl result resultset
--syn keyword cfArg contained retrycount returnasbinary returncode returntype
--syn keyword cfArg contained returnvariable roles rotated rowheaderalign rowheaderbold
--syn keyword cfArg contained rowheaderfont rowheaderfontsize rowheaderitalic rowheaders
--syn keyword cfArg contained rowheadertextcolor rowheaderwidth rowheight scale scalefrom
--syn keyword cfArg contained scaleto scope scriptprotect scriptsrc secure securitycontext
--syn keyword cfArg contained select selectcolor selected selecteddate selectedindex
--syn keyword cfArg contained selectmode separator seriescolor serieslabel seriesplacement
--syn keyword cfArg contained server serviceport serviceportname sessionmanagement
--syn keyword cfArg contained sessiontimeout setclientcookies setcookie setdomaincookies
--syn keyword cfArg contained show3d showborder showdebugoutput showerror showlegend
--syn keyword cfArg contained showmarkers showxgridlines showygridlines size skin sort
--syn keyword cfArg contained sortascendingbutton sortcontrol sortdescendingbutton
--syn keyword cfArg contained sortxaxis source spoolenable sql src srcfile start startdate
--syn keyword cfArg contained startrange startrow starttime status statuscode statustext
--syn keyword cfArg contained step stoponerror style subject suggestions
--syn keyword cfArg contained suppresswhitespace tablename tableowner tablequalifier
--syn keyword cfArg contained taglib target task template text textcolor textqualifier
--syn keyword cfArg contained throwonerror throwonerror throwonfailure throwontimeout
--syn keyword cfArg contained timeout timespan tipbgcolor tipstyle title to tooltip
--syn keyword cfArg contained toplevelvariable transfermode type uid unit url urlpath
--syn keyword cfArg contained useragent username userpassword usetimezoneinfo validate
--syn keyword cfArg contained validateat value valuecolumn values valuesdelimiter
--syn keyword cfArg contained valuesdisplay var variable vertical visible vscroll vspace
--syn keyword cfArg contained webservice width wmode wraptext wsdlfile xaxistitle
--syn keyword cfArg contained xaxistype xoffset yaxistitle yaxistype yoffset
--
--" ColdFusion Functions.
--syn keyword cfFunctionName contained ACos ASin Abs AddSOAPRequestHeader AddSOAPResponseHeader
--syn keyword cfFunctionName contained ArrayAppend ArrayAvg ArrayClear ArrayDeleteAt ArrayInsertAt
--syn keyword cfFunctionName contained ArrayIsEmpty ArrayLen ArrayMax ArrayMin ArrayNew
--syn keyword cfFunctionName contained ArrayPrepend ArrayResize ArraySet ArraySort ArraySum
--syn keyword cfFunctionName contained ArraySwap ArrayToList Asc Atn AuthenticatedContext
--syn keyword cfFunctionName contained AuthenticatedUser BinaryDecode BinaryEncode BitAnd
--syn keyword cfFunctionName contained BitMaskClear BitMaskRead BitMaskSet BitNot BitOr BitSHLN
--syn keyword cfFunctionName contained BitSHRN BitXor CJustify Ceiling CharsetDecode CharsetEncode
--syn keyword cfFunctionName contained Chr Compare CompareNoCase Cos CreateDate CreateDateTime
--syn keyword cfFunctionName contained CreateODBCDate CreateODBCDateTime CreateODBCTime
--syn keyword cfFunctionName contained CreateObject CreateTime CreateTimeSpan CreateUUID DE DateAdd
--syn keyword cfFunctionName contained DateCompare DateConvert DateDiff DateFormat DatePart Day
--syn keyword cfFunctionName contained DayOfWeek DayOfWeekAsString DayOfYear DaysInMonth DaysInYear
--syn keyword cfFunctionName contained DecimalFormat DecrementValue Decrypt DecryptBinary
--syn keyword cfFunctionName contained DeleteClientVariable DirectoryExists DollarFormat Duplicate
--syn keyword cfFunctionName contained Encrypt EncryptBinary Evaluate Exp ExpandPath FileExists
--syn keyword cfFunctionName contained Find FindNoCase FindOneOf FirstDayOfMonth Fix FormatBaseN
--syn keyword cfFunctionName contained GenerateSecretKey GetAuthUser GetBaseTagData GetBaseTagList
--syn keyword cfFunctionName contained GetBaseTemplatePath GetClientVariablesList GetContextRoot
--syn keyword cfFunctionName contained GetCurrentTemplatePath GetDirectoryFromPath GetEncoding
--syn keyword cfFunctionName contained GetException GetFileFromPath GetFunctionList
--syn keyword cfFunctionName contained GetGatewayHelper GetHttpRequestData GetHttpTimeString
--syn keyword cfFunctionName contained GetLocalHostIP
--syn keyword cfFunctionName contained GetLocale GetLocaleDisplayName GetMetaData GetMetricData
--syn keyword cfFunctionName contained GetPageContext GetProfileSections GetProfileString
--syn keyword cfFunctionName contained GetSOAPRequest GetSOAPRequestHeader GetSOAPResponse
--syn keyword cfFunctionName contained GetSOAPResponseHeader GetTempDirectory GetTempFile
--syn keyword cfFunctionName contained GetTickCount GetTimeZoneInfo GetToken
--syn keyword cfFunctionName contained HTMLCodeFormat HTMLEditFormat Hash Hour IIf IncrementValue
--syn keyword cfFunctionName contained InputBaseN Insert Int IsArray IsAuthenticated IsAuthorized
--syn keyword cfFunctionName contained IsBinary IsBoolean IsCustomFunction IsDate IsDebugMode
--syn keyword cfFunctionName contained IsDefined
--syn keyword cfFunctionName contained IsLeapYear IsLocalHost IsNumeric
--syn keyword cfFunctionName contained IsNumericDate IsObject IsProtected IsQuery IsSOAPRequest
--syn keyword cfFunctionName contained IsSimpleValue IsStruct IsUserInRole IsValid IsWDDX IsXML
--syn keyword cfFunctionName contained IsXmlAttribute IsXmlDoc IsXmlElem IsXmlNode IsXmlRoot
--syn keyword cfFunctionName contained JSStringFormat JavaCast LCase LJustify LSCurrencyFormat
--syn keyword cfFunctionName contained LSDateFormat LSEuroCurrencyFormat LSIsCurrency LSIsDate
--syn keyword cfFunctionName contained LSIsNumeric LSNumberFormat LSParseCurrency LSParseDateTime
--syn keyword cfFunctionName contained LSParseEuroCurrency LSParseNumber LSTimeFormat LTrim Left
--syn keyword cfFunctionName contained Len ListAppend ListChangeDelims ListContains
--syn keyword cfFunctionName contained ListContainsNoCase ListDeleteAt ListFind ListFindNoCase
--syn keyword cfFunctionName contained ListFirst ListGetAt ListInsertAt ListLast ListLen
--syn keyword cfFunctionName contained ListPrepend ListQualify ListRest ListSetAt ListSort
--syn keyword cfFunctionName contained ListToArray ListValueCount ListValueCountNoCase Log Log10
--syn keyword cfFunctionName contained Max Mid Min Minute Month MonthAsString Now NumberFormat
--syn keyword cfFunctionName contained ParagraphFormat ParseDateTime Pi
--syn keyword cfFunctionName contained PreserveSingleQuotes Quarter QueryAddColumn QueryAddRow
--syn keyword cfFunctionName contained QueryNew QuerySetCell QuotedValueList REFind REFindNoCase
--syn keyword cfFunctionName contained REReplace REReplaceNoCase RJustify RTrim Rand RandRange
--syn keyword cfFunctionName contained Randomize ReleaseComObject RemoveChars RepeatString Replace
--syn keyword cfFunctionName contained ReplaceList ReplaceNoCase Reverse Right Round Second
--syn keyword cfFunctionName contained SendGatewayMessage SetEncoding SetLocale SetProfileString
--syn keyword cfFunctionName contained SetVariable Sgn Sin SpanExcluding SpanIncluding Sqr StripCR
--syn keyword cfFunctionName contained StructAppend StructClear StructCopy StructCount StructDelete
--syn keyword cfFunctionName contained StructFind StructFindKey StructFindValue StructGet
--syn keyword cfFunctionName contained StructInsert StructIsEmpty StructKeyArray StructKeyExists
--syn keyword cfFunctionName contained StructKeyList StructNew StructSort StructUpdate Tan
--syn keyword cfFunctionName contained TimeFormat ToBase64 ToBinary ToScript ToString Trim UCase
--syn keyword cfFunctionName contained URLDecode URLEncodedFormat URLSessionFormat Val ValueList
--syn keyword cfFunctionName contained Week Wrap WriteOutput XmlChildPos XmlElemNew XmlFormat
--syn keyword cfFunctionName contained XmlGetNodeType XmlNew XmlParse XmlSearch XmlTransform
--syn keyword cfFunctionName contained XmlValidate Year YesNoFormat
--
--" Deprecated tags and functions.
--syn keyword cfDeprecated contained cfauthenticate cfimpersonate cfgraph cfgraphdata
--syn keyword cfDeprecated contained cfservlet cfservletparam cftextinput
--syn keyword cfDeprecated contained GetK2ServerDocCount GetK2ServerDocCountLimit GetTemplatePath
--syn keyword cfDeprecated contained IsK2ServerABroker IsK2ServerDocCountExceeded IsK2ServerOnline
--syn keyword cfDeprecated contained ParameterExists
--
--syn cluster htmlTagNameCluster add=cfTagName
--syn cluster htmlArgCluster add=cfArg,cfHashRegion,cfScope
--syn cluster htmlPreproc add=cfHashRegion
-+" ColdFusion <=7:
-+syn keyword	cfTagName	contained cfabort cfapplet cfapplication cfargument cfassociate
-+syn keyword	cfTagName	contained cfbreak cfcache cfcalendar cfcase cfcatch
-+syn keyword	cfTagName	contained cfchart cfchartdata cfchartseries cfcol cfcollection
-+syn keyword	cfTagName	contained cfcomponent cfcontent cfcookie cfdefaultcase cfdirectory
-+syn keyword	cfTagName	contained cfdocument cfdocumentitem cfdocumentsection cfdump cfelse
-+syn keyword	cfTagName	contained cfelseif cferror cfexecute cfexit cffile cfflush cfform
-+syn keyword	cfTagName	contained cfformgroup cfformitem cfftp cffunction
-+syn keyword	cfTagName	contained cfgrid cfgridcolumn cfgridrow cfgridupdate cfheader
-+syn keyword	cfTagName	contained cfhtmlhead cfhttp cfhttpparam cfif cfimport
-+syn keyword	cfTagName	contained cfinclude cfindex cfinput cfinsert cfinvoke cfinvokeargument
-+syn keyword	cfTagName	contained cfldap cflocation cflock cflog cflogin cfloginuser cflogout
-+syn keyword	cfTagName	contained cfloop cfmail cfmailparam cfmailpart cfmodule
-+syn keyword	cfTagName	contained cfNTauthenticate cfobject cfobjectcache cfoutput cfparam
-+syn keyword	cfTagName	contained cfpop cfprocessingdirective cfprocparam cfprocresult
-+syn keyword	cfTagName	contained cfproperty cfquery cfqueryparam cfregistry cfreport
-+syn keyword	cfTagName	contained cfreportparam cfrethrow cfreturn cfsavecontent cfschedule
-+syn keyword	cfTagName	contained cfscript cfsearch cfselect cfservletparam cfset
-+syn keyword	cfTagName	contained cfsetting cfsilent cfslider cfstoredproc cfswitch cftable
-+syn keyword	cfTagName	contained cftextarea cftextinput cfthrow cftimer cftrace cftransaction
-+syn keyword	cfTagName	contained cftree cftreeitem cftry cfupdate cfwddx cfxml
-+" ColdFusion 8:
-+syn keyword	cfTagName	contained cfajaximport cfajaxproxy cfdbinfo cfdiv cfexchangecalendar
-+syn keyword	cfTagName	contained cfexchangeconnection cfexchangecontact cfexchangefilter 
-+syn keyword	cfTagName	contained cfexchangemail cfexchangetask cffeed
-+syn keyword	cfTagName	contained cfinterface cflayout cflayoutarea cfmenu cfmenuitem
-+syn keyword	cfTagName	contained cfpdf cfpdfform cfpdfformparam cfpdfparam cfpdfsubform cfpod
-+syn keyword	cfTagName	contained cfpresentation cfpresentationslide cfpresenter cfprint
-+syn keyword	cfTagName	contained cfsprydataset cfthread cftooltip cfwindow cfzip cfzipparam
-+" ColdFusion 9:
-+syn keyword	cfTagName	contained cfcontinue cffileupload cffinally
-+syn keyword	cfTagName	contained cfimage cfimap 
-+syn keyword	cfTagName	contained cfmap cfmapitem cfmediaplayer cfmessagebox
-+syn keyword	cfTagName	contained cfprocparam cfprogressbar
-+syn keyword	cfTagName	contained cfsharepoint cfspreadsheet
-+
-+" Tag attributes.
-+" XXX Not updated for ColdFusion 8/9.
-+" These are becoming a headache to maintain, so might be removed.
-+syn keyword	cfArg		contained abort accept access accessible action addnewline addtoken
-+syn keyword	cfArg		contained agentname align appendkey appletsource application
-+syn keyword	cfArg		contained applicationtimeout applicationtoken archive
-+syn keyword	cfArg		contained argumentcollection arguments asciiextensionlist
-+syn keyword	cfArg		contained attachmentpath attributecollection attributes autowidth
-+syn keyword	cfArg		contained backgroundvisible basetag bcc bgcolor bind bindingname
-+syn keyword	cfArg		contained blockfactor body bold border branch cachedafter cachedwithin
-+syn keyword	cfArg		contained casesensitive category categorytree cc cfsqltype charset
-+syn keyword	cfArg		contained chartheight chartwidth checked class clientmanagement
-+syn keyword	cfArg		contained clientstorage codebase colheaderalign colheaderbold
-+syn keyword	cfArg		contained colheaderfont colheaderfontsize colheaderitalic colheaders
-+syn keyword	cfArg		contained colheadertextcolor collection colorlist colspacing columns
-+syn keyword	cfArg		contained completepath component condition connection contentid
-+syn keyword	cfArg		contained context contextbytes contexthighlightbegin
-+syn keyword	cfArg		contained contexthighlightend contextpassages cookiedomain criteria
-+syn keyword	cfArg		contained custom1 custom2 custom3 custom4 data dataalign
-+syn keyword	cfArg		contained databackgroundcolor datacollection datasource daynames
-+syn keyword	cfArg		contained dbname dbserver dbtype dbvarname debug default delete
-+syn keyword	cfArg		contained deletebutton deletefile delimiter delimiters description
-+syn keyword	cfArg		contained destination detail directory disabled display displayname
-+syn keyword	cfArg		contained disposition dn domain editable enablecab enablecfoutputonly
-+syn keyword	cfArg		contained enabled encoded encryption enctype enddate endrange endtime
-+syn keyword	cfArg		contained entry errorcode exception existing expand expires expireurl
-+syn keyword	cfArg		contained expression extendedinfo extends extensions external
-+syn keyword	cfArg		contained failifexists failto file filefield filename filter
-+syn keyword	cfArg		contained firstdayofweek firstrowasheaders fixnewline font fontbold
-+syn keyword	cfArg		contained fontembed fontitalic fontsize foregroundcolor format
-+syn keyword	cfArg		contained formfields formula from generateuniquefilenames getasbinary
-+syn keyword	cfArg		contained grid griddataalign gridlines groovecolor group
-+syn keyword	cfArg		contained groupcasesensitive header headeralign headerbold headerfont
-+syn keyword	cfArg		contained headerfontsize headeritalic headerlines headertextcolor
-+syn keyword	cfArg		contained height highlighthref hint href hrefkey hscroll hspace html
-+syn keyword	cfArg		contained htmltable id idletimeout img imgopen imgstyle index inline
-+syn keyword	cfArg		contained input insert insertbutton interval isolation italic item
-+syn keyword	cfArg		contained itemcolumn key keyonly label labelformat language list
-+syn keyword	cfArg		contained listgroups locale localfile log loginstorage lookandfeel
-+syn keyword	cfArg		contained mailerid mailto marginbottom marginleft marginright
-+syn keyword	cfArg		contained margintop markersize markerstyle mask max maxlength maxrows
-+syn keyword	cfArg		contained message messagenumber method mimeattach mimetype min mode
-+syn keyword	cfArg		contained modifytype monthnames multipart multiple name nameconflict
-+syn keyword	cfArg		contained namespace new newdirectory notsupported null numberformat
-+syn keyword	cfArg		contained object omit onblur onchange onclick onerror onfocus
-+syn keyword	cfArg		contained onkeydown onkeyup onload onmousedown onmouseup onreset
-+syn keyword	cfArg		contained onsubmit onvalidate operation orderby orientation output
-+syn keyword	cfArg		contained outputfile overwrite ownerpassword pageencoding pageheight
-+syn keyword	cfArg		contained pagetype pagewidth paintstyle param_1 param_2 param_3
-+syn keyword	cfArg		contained param_4 param_5 param_6 param_7 param_8 param_9 parent
-+syn keyword	cfArg		contained parrent passive passthrough password path pattern
-+syn keyword	cfArg		contained permissions picturebar pieslicestyle port porttypename
-+syn keyword	cfArg		contained prefix preloader preservedata previouscriteria procedure
-+syn keyword	cfArg		contained protocol provider providerdsn proxybypass proxypassword
-+syn keyword	cfArg		contained proxyport proxyserver proxyuser publish query queryasroot
-+syn keyword	cfArg		contained queryposition range rebind recurse redirect referral
-+syn keyword	cfArg		contained refreshlabel remotefile replyto report requesttimeout
-+syn keyword	cfArg		contained required reset resoleurl resolveurl result resultset
-+syn keyword	cfArg		contained retrycount returnasbinary returncode returntype
-+syn keyword	cfArg		contained returnvariable roles rotated rowheaderalign rowheaderbold
-+syn keyword	cfArg		contained rowheaderfont rowheaderfontsize rowheaderitalic rowheaders
-+syn keyword	cfArg		contained rowheadertextcolor rowheaderwidth rowheight scale scalefrom
-+syn keyword	cfArg		contained scaleto scope scriptprotect scriptsrc secure securitycontext
-+syn keyword	cfArg		contained select selectcolor selected selecteddate selectedindex
-+syn keyword	cfArg		contained selectmode separator seriescolor serieslabel seriesplacement
-+syn keyword	cfArg		contained server serviceport serviceportname sessionmanagement
-+syn keyword	cfArg		contained sessiontimeout setclientcookies setcookie setdomaincookies
-+syn keyword	cfArg		contained show3d showborder showdebugoutput showerror showlegend
-+syn keyword	cfArg		contained showmarkers showxgridlines showygridlines size skin sort
-+syn keyword	cfArg		contained sortascendingbutton sortcontrol sortdescendingbutton
-+syn keyword	cfArg		contained sortxaxis source spoolenable sql src srcfile start startdate
-+syn keyword	cfArg		contained startrange startrow starttime status statuscode statustext
-+syn keyword	cfArg		contained step stoponerror style subject suggestions
-+syn keyword	cfArg		contained suppresswhitespace tablename tableowner tablequalifier
-+syn keyword	cfArg		contained taglib target task template text textcolor textqualifier
-+syn keyword	cfArg		contained throwonerror throwonerror throwonfailure throwontimeout
-+syn keyword	cfArg		contained timeout timespan tipbgcolor tipstyle title to tooltip
-+syn keyword	cfArg		contained toplevelvariable transfermode type uid unit url urlpath
-+syn keyword	cfArg		contained useragent username userpassword usetimezoneinfo validate
-+syn keyword	cfArg		contained validateat value valuecolumn values valuesdelimiter
-+syn keyword	cfArg		contained valuesdisplay var variable vertical visible vscroll vspace
-+syn keyword	cfArg		contained webservice width wmode wraptext wsdlfile xaxistitle
-+syn keyword	cfArg		contained xaxistype xoffset yaxistitle yaxistype yoffset
-+
-+" Functions.
-+" ColdFusion <=7:
-+syn keyword	cfFunctionName		contained ACos ASin Abs AddSOAPRequestHeader AddSOAPResponseHeader
-+syn keyword	cfFunctionName		contained ArrayAppend ArrayAvg ArrayClear ArrayDeleteAt ArrayInsertAt
-+syn keyword	cfFunctionName		contained ArrayIsEmpty ArrayLen ArrayMax ArrayMin ArrayNew
-+syn keyword	cfFunctionName		contained ArrayPrepend ArrayResize ArraySet ArraySort ArraySum
-+syn keyword	cfFunctionName		contained ArraySwap ArrayToList Asc Atn AuthenticatedContext
-+syn keyword	cfFunctionName		contained AuthenticatedUser BinaryDecode BinaryEncode BitAnd
-+syn keyword	cfFunctionName		contained BitMaskClear BitMaskRead BitMaskSet BitNot BitOr BitSHLN
-+syn keyword	cfFunctionName		contained BitSHRN BitXor CJustify Ceiling CharsetDecode CharsetEncode
-+syn keyword	cfFunctionName		contained Chr Compare CompareNoCase Cos CreateDate CreateDateTime
-+syn keyword	cfFunctionName		contained CreateODBCDate CreateODBCDateTime CreateODBCTime
-+syn keyword	cfFunctionName		contained CreateObject CreateTime CreateTimeSpan CreateUUID DE DateAdd
-+syn keyword	cfFunctionName		contained DateCompare DateConvert DateDiff DateFormat DatePart Day
-+syn keyword	cfFunctionName		contained DayOfWeek DayOfWeekAsString DayOfYear DaysInMonth DaysInYear
-+syn keyword	cfFunctionName		contained DecimalFormat DecrementValue Decrypt DecryptBinary
-+syn keyword	cfFunctionName		contained DeleteClientVariable DirectoryExists DollarFormat Duplicate
-+syn keyword	cfFunctionName		contained Encrypt EncryptBinary Evaluate Exp ExpandPath FileExists
-+syn keyword	cfFunctionName		contained Find FindNoCase FindOneOf FirstDayOfMonth Fix FormatBaseN
-+syn keyword	cfFunctionName		contained GenerateSecretKey GetAuthUser GetBaseTagData GetBaseTagList
-+syn keyword	cfFunctionName		contained GetBaseTemplatePath GetClientVariablesList GetContextRoot
-+syn keyword	cfFunctionName		contained GetCurrentTemplatePath GetDirectoryFromPath GetEncoding
-+syn keyword	cfFunctionName		contained GetException GetFileFromPath GetFunctionList
-+syn keyword	cfFunctionName		contained GetGatewayHelper GetHttpRequestData GetHttpTimeString
-+syn keyword	cfFunctionName		contained GetLocalHostIP
-+syn keyword	cfFunctionName		contained GetLocale GetLocaleDisplayName GetMetaData GetMetricData
-+syn keyword	cfFunctionName		contained GetPageContext GetProfileSections GetProfileString
-+syn keyword	cfFunctionName		contained GetSOAPRequest GetSOAPRequestHeader GetSOAPResponse
-+syn keyword	cfFunctionName		contained GetSOAPResponseHeader GetTempDirectory GetTempFile
-+syn keyword	cfFunctionName		contained GetTickCount GetTimeZoneInfo GetToken
-+syn keyword	cfFunctionName		contained HTMLCodeFormat HTMLEditFormat Hash Hour IIf IncrementValue
-+syn keyword	cfFunctionName		contained InputBaseN Insert Int IsArray IsAuthenticated IsAuthorized
-+syn keyword	cfFunctionName		contained IsBinary IsBoolean IsCustomFunction IsDate IsDebugMode
-+syn keyword	cfFunctionName		contained IsDefined
-+syn keyword	cfFunctionName		contained IsLeapYear IsLocalHost IsNumeric
-+syn keyword	cfFunctionName		contained IsNumericDate IsObject IsProtected IsQuery IsSOAPRequest
-+syn keyword	cfFunctionName		contained IsSimpleValue IsStruct IsUserInRole IsValid IsWDDX IsXML
-+syn keyword	cfFunctionName		contained IsXmlAttribute IsXmlDoc IsXmlElem IsXmlNode IsXmlRoot
-+syn keyword	cfFunctionName		contained JSStringFormat JavaCast LCase LJustify LSCurrencyFormat
-+syn keyword	cfFunctionName		contained LSDateFormat LSEuroCurrencyFormat LSIsCurrency LSIsDate
-+syn keyword	cfFunctionName		contained LSIsNumeric LSNumberFormat LSParseCurrency LSParseDateTime
-+syn keyword	cfFunctionName		contained LSParseEuroCurrency LSParseNumber LSTimeFormat LTrim Left
-+syn keyword	cfFunctionName		contained Len ListAppend ListChangeDelims ListContains
-+syn keyword	cfFunctionName		contained ListContainsNoCase ListDeleteAt ListFind ListFindNoCase
-+syn keyword	cfFunctionName		contained ListFirst ListGetAt ListInsertAt ListLast ListLen
-+syn keyword	cfFunctionName		contained ListPrepend ListQualify ListRest ListSetAt ListSort
-+syn keyword	cfFunctionName		contained ListToArray ListValueCount ListValueCountNoCase Log Log10
-+syn keyword	cfFunctionName		contained Max Mid Min Minute Month MonthAsString Now NumberFormat
-+syn keyword	cfFunctionName		contained ParagraphFormat ParseDateTime Pi
-+syn keyword	cfFunctionName		contained PreserveSingleQuotes Quarter QueryAddColumn QueryAddRow
-+syn keyword	cfFunctionName		contained QueryNew QuerySetCell QuotedValueList REFind REFindNoCase
-+syn keyword	cfFunctionName		contained REReplace REReplaceNoCase RJustify RTrim Rand RandRange
-+syn keyword	cfFunctionName		contained Randomize ReleaseComObject RemoveChars RepeatString Replace
-+syn keyword	cfFunctionName		contained ReplaceList ReplaceNoCase Reverse Right Round Second
-+syn keyword	cfFunctionName		contained SendGatewayMessage SetEncoding SetLocale SetProfileString
-+syn keyword	cfFunctionName		contained SetVariable Sgn Sin SpanExcluding SpanIncluding Sqr StripCR
-+syn keyword	cfFunctionName		contained StructAppend StructClear StructCopy StructCount StructDelete
-+syn keyword	cfFunctionName		contained StructFind StructFindKey StructFindValue StructGet
-+syn keyword	cfFunctionName		contained StructInsert StructIsEmpty StructKeyArray StructKeyExists
-+syn keyword	cfFunctionName		contained StructKeyList StructNew StructSort StructUpdate Tan
-+syn keyword	cfFunctionName		contained TimeFormat ToBase64 ToBinary ToScript ToString Trim UCase
-+syn keyword	cfFunctionName		contained URLDecode URLEncodedFormat URLSessionFormat Val ValueList
-+syn keyword	cfFunctionName		contained Week Wrap WriteOutput XmlChildPos XmlElemNew XmlFormat
-+syn keyword	cfFunctionName		contained XmlGetNodeType XmlNew XmlParse XmlSearch XmlTransform
-+syn keyword	cfFunctionName		contained XmlValidate Year YesNoFormat
-+" ColdFusion 8:
-+syn keyword	cfFunctionName		contained AjaxLink AjaxOnLoad ArrayIsDefined BinaryDecode BinaryEncode CharsetDecode CharsetEncode 
-+syn keyword	cfFunctionName		contained DecryptBinary DeserializeJSON DotNetToCFType EncryptBinary FileClose FileCopy FileDelete
-+syn keyword	cfFunctionName		contained FileIsEOF FileMove FileOpen FileRead FileReadBinary FileReadLine FileSetAccessMode FileSetAttribute
-+syn keyword	cfFunctionName		contained FileSetLastModified FileWrite GenerateSecretKey GetGatewayHelper GetAuthUser GetComponentMetaData
-+syn keyword	cfFunctionName		contained GetContextRoot GetEncoding GetFileInfo GetLocaleDisplayName GetLocalHostIP GetMetaData
-+syn keyword	cfFunctionName		contained GetPageContext GetPrinterInfo GetProfileSections GetReadableImageFormats GetSOAPRequest
-+syn keyword	cfFunctionName		contained GetSOAPRequestHeader GetSOAPResponse GetSOAPResponseHeader GetUserRoles GetWriteableImageFormats
-+syn keyword	cfFunctionName		contained ImageAddBorder ImageBlur ImageClearRect ImageCopy ImageCrop ImageDrawArc ImageDrawBeveledRect
-+syn keyword	cfFunctionName		contained ImageDrawCubicCurve ImageDrawPoint ImageDrawLine ImageDrawLines ImageDrawOval
-+syn keyword	cfFunctionName		contained ImageDrawQuadraticCurve ImageDrawRect ImageDrawRoundRect ImageDrawText ImageFlip ImageGetBlob
-+syn keyword	cfFunctionName		contained ImageGetBufferedImage ImageGetEXIFMetadata ImageGetEXIFTag ImageGetHeight ImageGetIPTCMetadata
-+syn keyword	cfFunctionName		contained ImageGetIPTCTag ImageGetWidth ImageGrayscale ImageInfo ImageNegative ImageNew ImageOverlay
-+syn keyword	cfFunctionName		contained ImagePaste ImageRead ImageReadBase64 ImageResize ImageRotate ImageRotateDrawingAxis ImageScaleToFit 
-+" ColdFusion 9:
-+syn keyword	cfFunctionName		contained ApplicationStop ArrayContains ArrayDelete ArrayFind ArrayFindNoCase IsSpreadsheetFile
-+syn keyword	cfFunctionName		contained IsSpreadsheetObject FileSkipBytes Location ObjectLoad SpreadsheetFormatColumn
-+syn keyword	cfFunctionName		contained SpreadsheetFormatColumns SpreadsheetFormatRow SpreadsheetFormatRows SpreadsheetGetCellComment
-+syn keyword	cfFunctionName		contained CacheGetAllIds CacheGetMetadata CacheGetProperties CacheGet CachePut ObjectSave ORMClearSession
-+syn keyword	cfFunctionName		contained ORMCloseSession ORMEvictQueries ORMEvictCollection SpreadsheetGetCellFormula SpreadsheetGetCellValue
-+syn keyword	cfFunctionName		contained SpreadsheetInfo SpreadsheetMergeCells SpreadsheetNew CacheRemove CacheSetProperties DirectoryCreate
-+syn keyword	cfFunctionName		contained DirectoryDelete DirectoryExists ORMEvictEntity ORMEvictQueries ORMExecuteQuery ORMFlush
-+syn keyword	cfFunctionName		contained ORMGetSession SpreadsheetRead SpreadsheetReadBinary SpreadsheetSetActiveSheetNumber
-+syn keyword	cfFunctionName		contained SpreadsheetSetCellComment SpreadsheetSetCellFormula DirectoryList DirectoryRename EntityDelete
-+syn keyword	cfFunctionName		contained EntityLoad EntityLoadByExample ORMGetSessionFactory ORMReload ObjectEquals SpreadsheetAddColumn
-+syn keyword	cfFunctionName		contained SpreadsheetAddFreezePane SpreadsheetSetCellValue SpreadsheetSetActiveSheet SpreadsheetSetFooter
-+syn keyword	cfFunctionName		contained SpreadsheetSetHeader SpreadsheetSetColumnWidth EntityLoadByPK EntityMerge EntityNew EntityReload
-+syn keyword	cfFunctionName		contained EntitySave SpreadsheetAddImage SpreadsheetAddInfo SpreadsheetAddRow SpreadsheetAddRows
-+syn keyword	cfFunctionName		contained SpreadsheetAddSplitPane SpreadsheetShiftColumns SpreadsheetShiftRows SpreadsheetSetRowHeight
-+syn keyword	cfFunctionName		contained SpreadsheetWrite Trace FileDelete FileSeek FileWriteLine GetFunctionCalledName GetVFSMetaData IsIPv6
-+syn keyword	cfFunctionName		contained IsNull SpreadsheetCreateSheet SpreadsheetDeleteColumn SpreadsheetDeleteColumns SpreadsheetDeleteRow
-+syn keyword	cfFunctionName		contained SpreadsheetDeleteRows SpreadsheetFormatCell TransactionCommit TransactionRollback
-+syn keyword	cfFunctionName		contained TransactionSetSavePoint ThreadTerminate ThreadJoin Throw Writedump Writelog 
-+
-+" Deprecated or obsoleted tags and functions.
-+syn keyword	cfDeprecatedTag		contained cfauthenticate cfimpersonate cfgraph cfgraphdata
-+syn keyword	cfDeprecatedTag		contained cfservlet cfservletparam cftextinput
-+syn keyword	cfDeprecatedTag		contained cfinternaladminsecurity cfnewinternaladminsecurity
-+syn keyword	cfDeprecatedFunction	contained GetK2ServerDocCount GetK2ServerDocCountLimit GetTemplatePath
-+syn keyword	cfDeprecatedFunction	contained IsK2ServerABroker IsK2ServerDocCountExceeded IsK2ServerOnline
-+syn keyword	cfDeprecatedFunction	contained ParameterExists AuthenticatedContext AuthenticatedUser
-+syn keyword	cfDeprecatedFunction	contained isAuthenticated isAuthorized isProtected
-+
-+" Add to the HTML clusters.
-+syn cluster	htmlTagNameCluster	add=cfTagName,cfCustomTagName,cfDeprecatedTag
-+syn cluster	htmlArgCluster		add=cfArg,cfHashRegion,cfScope
-+syn cluster	htmlPreproc		add=cfHashRegion
- 
--syn cluster cfExpressionCluster contains=cfFunctionName,cfScope,@cfOperatorCluster,cfScriptStringD,cfScriptStringS,cfScriptNumber,cfBool
-+syn cluster	cfExpressionCluster	contains=cfFunctionName,cfScope,@cfOperatorCluster,cfScriptStringD,cfScriptStringS,cfScriptNumber,cfBool,cfComment
- 
- " Evaluation; skip strings ( this helps with cases like nested IIf() )
--syn region cfHashRegion start=+#+ skip=+"[^"]*"\|'[^']*'+ end=+#+ contains=@cfExpressionCluster,cfScriptParenError
-+"		containedin to add to the TOP of cfOutputRegion.
-+syn region	cfHashRegion		start=+#+ skip=+"[^"]*"\|'[^']*'+ end=+#+ contained containedin=cfOutputRegion contains=@cfExpressionCluster,cfScriptParenError
-+
-+" Hashmarks are significant inside cfoutput tags.
-+" cfoutput tags may be nested indefinitely.
-+syn region	cfOutputRegion		matchgroup=NONE transparent start=+<cfoutput>+ end=+</cfoutput>+ contains=TOP
- 
- " <cfset>, <cfif>, <cfelseif>, <cfreturn> are analogous to hashmarks (implicit
- " evaluation) and have 'var'
--syn region cfSetRegion start="<cfset " start="<cfreturn " start="<cfelseif " start="<cfif " end='>' keepend contains=@cfExpressionCluster,cfSetLHSRegion,cfSetTagEnd,cfScriptType
--syn region cfSetLHSRegion contained start="<cfreturn" start="<cfelseif" start="<cfif" start="<cfset" end=" " keepend contains=cfTagName,htmlTag
--syn match  cfSetTagEnd contained '>'
--
--" CF comments: similar to SGML comments
--syn region  cfComment     start='<!---' end='--->' keepend contains=cfCommentTodo
--syn keyword cfCommentTodo contained TODO FIXME XXX TBD WTF 
-+syn region	cfSetRegion		start="<cfset\>" start="<cfreturn\>" start="<cfelseif\>" start="<cfif\>" end='>' keepend contains=@cfExpressionCluster,cfSetLHSRegion,cfSetTagEnd,cfScriptStatement
-+syn region	cfSetLHSRegion		contained start="<cfreturn" start="<cfelseif" start="<cfif" start="<cfset" end="." keepend contains=cfTagName,htmlTag
-+syn match	cfSetTagEnd		contained '>'
-+
-+" CF comments: similar to SGML comments, but can be nested.
-+syn region	cfComment		start='<!---' end='--->' contains=cfCommentTodo,cfComment
-+syn keyword	cfCommentTodo		contained TODO FIXME XXX TBD WTF 
- 
- " CFscript 
--syn match   cfScriptLineComment      contained "\/\/.*$" contains=cfCommentTodo
--syn region  cfScriptComment	     contained start="/\*"  end="\*/" contains=cfCommentTodo
-+" TODO better support for new component/function def syntax
-+" TODO better support for 'new'
-+" TODO highlight metadata (@ ...) inside comments.
-+syn match	cfScriptLineComment	contained "\/\/.*$" contains=cfCommentTodo
-+syn region	cfScriptComment		contained start="/\*"	end="\*/" contains=cfCommentTodo
-+syn match	cfScriptBraces		contained "[{}]"
-+syn keyword	cfScriptStatement	contained return var
- " in CF, quotes are escaped by doubling
--syn region  cfScriptStringD	     contained start=+"+  skip=+\\\\\|""+  end=+"+  extend contains=@htmlPreproc,cfHashRegion
--syn region  cfScriptStringS	     contained start=+'+  skip=+\\\\\|''+  end=+'+  extend contains=@htmlPreproc,cfHashRegion
--syn match   cfScriptNumber	     contained "\<\d\+\>"
--syn keyword cfScriptConditional      contained if else
--syn keyword cfScriptRepeat	     contained while for in
--syn keyword cfScriptBranch	     contained break switch case default try catch continue
--syn keyword cfScriptFunction	     contained function
--syn keyword cfScriptType	     contained var
--syn match   cfScriptBraces	     contained "[{}]"
--syn keyword cfScriptStatement        contained return
-+syn region	cfScriptStringD		contained start=+"+	skip=+\\\\\|""+	end=+"+	extend contains=@htmlPreproc,cfHashRegion
-+syn region	cfScriptStringS		contained start=+'+	skip=+\\\\\|''+	end=+'+	extend contains=@htmlPreproc,cfHashRegion
-+syn match	cfScriptNumber		contained "\<\d\+\>"
-+syn keyword	cfScriptConditional	contained if else
-+syn keyword	cfScriptRepeat		contained while for in
-+syn keyword	cfScriptBranch		contained break switch case default try catch continue finally
-+syn keyword	cfScriptKeyword		contained function
-+" argumentCollection is a special argument to function calls
-+syn keyword	cfScriptSpecial		contained argumentcollection
-+" ColdFusion 9:
-+syn keyword	cfScriptStatement	contained new import
-+" CFscript equivalents of some tags
-+syn keyword	cfScriptKeyword		contained abort component exit import include
-+syn keyword	cfScriptKeyword		contained interface param pageencoding property rethrow thread transaction
-+" function/component syntax
-+syn keyword	cfScriptSpecial		contained required extends
- 
--syn cluster cfScriptCluster contains=cfScriptParen,cfScriptLineComment,cfScriptComment,cfScriptStringD,cfScriptStringS,cfScriptFunction,cfScriptNumber,cfScriptRegexpString,cfScriptBoolean,cfScriptBraces,cfHashRegion,cfFunctionName,cfScope,@cfOperatorCluster,cfScriptConditional,cfScriptRepeat,cfScriptBranch,cfScriptType,@cfExpressionCluster,cfScriptStatement
-+
-+syn cluster	cfScriptCluster	contains=cfScriptParen,cfScriptLineComment,cfScriptComment,cfScriptStringD,cfScriptStringS,cfScriptFunction,cfScriptNumber,cfScriptRegexpString,cfScriptBoolean,cfScriptBraces,cfHashRegion,cfFunctionName,cfDeprecatedFunction,cfScope,@cfOperatorCluster,cfScriptConditional,cfScriptRepeat,cfScriptBranch,@cfExpressionCluster,cfScriptStatement,cfScriptSpecial,cfScriptKeyword
- 
- " Errors caused by wrong parenthesis; skip strings
--syn region  cfScriptParen       contained transparent skip=+"[^"]*"\|'[^']*'+ start=+(+ end=+)+ contains=@cfScriptCluster
--syn match   cfScrParenError 	contained +)+
-+syn region	cfScriptParen	contained transparent skip=+"[^"]*"\|'[^']*'+ start=+(+ end=+)+ contains=@cfScriptCluster
-+syn match	cfScrParenError	contained +)+
- 
--syn region cfscriptBlock matchgroup=NONE start="<cfscript>"  end="<\/cfscript>"me=s-1 keepend contains=@cfScriptCluster,cfscriptTag,cfScrParenError
--syn region  cfscriptTag contained start='<cfscript' end='>' keepend contains=cfTagName,htmlTag
-+syn region	cfscriptBlock	matchgroup=NONE start="<cfscript>"	end="<\/cfscript>"me=s-1 keepend contains=@cfScriptCluster,cfscriptTag,cfScrParenError
-+syn region	cfscriptTag	contained start='<cfscript' end='>' keepend contains=cfTagName,htmlTag
- 
- " CFML
--syn cluster cfmlCluster contains=cfComment,@htmlTagNameCluster,@htmlPreproc,cfSetRegion,cfscriptBlock
-+syn cluster	cfmlCluster	contains=cfComment,@htmlTagNameCluster,@htmlPreproc,cfSetRegion,cfscriptBlock,cfOutputRegion
- 
--" cfquery = sql
--unlet b:current_syntax
--syn include @cfSql <sfile>:p:h/sql.vim
-+" cfquery = sql syntax
-+if exists("b:current_syntax")
-+  unlet b:current_syntax
-+endif
-+syn include @cfSql $VIMRUNTIME/syntax/sql.vim
- unlet b:current_syntax
--syn region  cfqueryTag  contained start=+<cfquery+ end=+>+    keepend   contains=cfTagName,htmlTag
--syn region  cfSqlregion start=+<cfquery[^>]*>+ keepend end=+<\/cfquery>+me=s-1 matchgroup=NONE contains=@cfSql,cfComment,@htmlTagNameCluster,cfqueryTag
-+syn region	cfqueryTag	contained start=+<cfquery+ end=+>+ keepend contains=cfTagName,htmlTag
-+syn region	cfSqlregion	start=+<cfquery\_[^>]*>+ keepend end=+</cfquery>+me=s-1 matchgroup=NONE contains=@cfSql,cfComment,@htmlTagNameCluster,cfqueryTag,cfHashRegion
-+
-+" Define the highlighting.
-+command -nargs=+ CfHiLink hi def link <args>
- 
--" Define the default highlighting.
--if version >= 508 || !exists("did_cf_syn_inits")
--  if version < 508
--    let did_cf_syn_inits = 1
--    command -nargs=+ HiLink hi link <args>
--  else
--    command -nargs=+ HiLink hi def link <args>
--  endif
--
--  HiLink cfTagName 		Statement
--  HiLink cfArg 			Type
--  HiLink cfFunctionName 	Function
--  HiLink cfHashRegion 		PreProc
--  HiLink cfComment 		Comment
--  HiLink cfCommentTodo 		Todo
--  HiLink cfOperator		Operator
--  HiLink cfOperatorMatch	Operator
--  HiLink cfScope		Title
--  HiLink cfBool			Constant
--
--  HiLink cfscriptBlock 		Special
--  HiLink cfscriptTag 		htmlTag
--  HiLink cfSetRegion 		PreProc
--  HiLink cfSetLHSRegion 	htmlTag
--  HiLink cfSetTagEnd		htmlTag
--
--  HiLink cfScriptLineComment	Comment
--  HiLink cfScriptComment	Comment
--  HiLink cfScriptStringS	String
--  HiLink cfScriptStringD	String
--  HiLink cfScriptNumber	     	cfScriptValue
--  HiLink cfScriptConditional	Conditional
--  HiLink cfScriptRepeat	     	Repeat
--  HiLink cfScriptBranch	     	Conditional
--  HiLink cfScriptType		Type
--  HiLink cfScriptStatement	Statement
--  HiLink cfScriptBraces	     	Function
--  HiLink cfScriptFunction    	Function
--  HiLink cfScriptError	     	Error
--  HiLink cfDeprecated	     	Error
--  HiLink cfScrParenError	cfScriptError
--
--  HiLink cfqueryTag htmlTag
--  
--  delcommand HiLink
-+if exists("d_noinclude_html")
-+  " The default html-style highlighting copied from html.vim.
-+  CfHiLink htmlTag		Function
-+  CfHiLink htmlEndTag		Identifier
-+  CfHiLink htmlArg		Type
-+  CfHiLink htmlTagName		htmlStatement
-+  CfHiLink htmlValue		String
-+  CfHiLink htmlPreProc		PreProc
-+  CfHiLink htmlString		String
-+  CfHiLink htmlStatement	Statement
-+  CfHiLink htmlValue		String
-+  CfHiLink htmlTagError		htmlError
-+  CfHiLink htmlError		Error
- endif
- 
-+CfHiLink cfTagName		Statement
-+CfHiLink cfCustomTagName	Statement
-+CfHiLink cfArg			Type
-+CfHiLink cfFunctionName		Function
-+CfHiLink cfHashRegion		PreProc
-+CfHiLink cfComment		Comment
-+CfHiLink cfCommentTodo		Todo
-+CfHiLink cfOperator		Operator
-+CfHiLink cfOperatorMatch	Operator
-+CfHiLink cfScope		Title
-+CfHiLink cfBool			Constant
-+
-+CfHiLink cfscriptBlock		Special
-+CfHiLink cfscriptTag		htmlTag
-+CfHiLink cfSetRegion		PreProc
-+CfHiLink cfSetLHSRegion		htmlTag
-+CfHiLink cfSetTagEnd		htmlTag
-+
-+CfHiLink cfScriptLineComment	Comment
-+CfHiLink cfScriptComment	Comment
-+CfHiLink cfScriptStringS	String
-+CfHiLink cfScriptStringD	String
-+CfHiLink cfScriptNumber		cfScriptValue
-+CfHiLink cfScriptConditional	Conditional
-+CfHiLink cfScriptRepeat		Repeat
-+CfHiLink cfScriptBranch		Conditional
-+CfHiLink cfScriptSpecial	Type
-+CfHiLink cfScriptStatement	Statement
-+CfHiLink cfScriptBraces		Function
-+CfHiLink cfScriptKeyword	Function
-+CfHiLink cfScriptError		Error
-+CfHiLink cfDeprecatedTag	Error
-+CfHiLink cfDeprecatedFunction	Error
-+CfHiLink cfScrParenError	cfScriptError
-+
-+CfHiLink cfqueryTag		htmlTag
-+
-+delcommand CfHiLink
-+
- let b:current_syntax = "cf"
- 
--" vim: ts=8 sw=2
-+" vim: nowrap sw=2 ts=8 noet
-diff -u -r --new-file runtime/syntax.orig/config.vim runtime/syntax/config.vim
---- runtime/syntax.orig/config.vim	2004-06-07 09:32:35.000000000 -0500
-+++ runtime/syntax/config.vim	2008-09-06 07:19:33.000000000 -0500
-@@ -1,7 +1,7 @@
- " Vim syntax file
- " Language:		configure.in script: M4 with sh
- " Maintainer:	Christian Hammesr <ch@lathspell.westend.com>
--" Last Change:	2001 May 09
-+" Last Change:	2008 Sep 03
- 
- " Well, I actually even do not know much about m4. This explains why there
- " is probably very much missing here, yet !
-@@ -26,7 +26,7 @@
- syn keyword configkeyword   if then else fi test for in do done
- syn keyword configspecial   cat rm eval
- syn region  configstring    start=+"+ skip=+\\"+ end=+"+
--syn region  configstring    start=+`+ skip=+\\'+ end=+'+
-+syn region  configstring    start=+'+ skip=+\\'+ end=+'+
- syn region  configstring    start=+`+ skip=+\\'+ end=+`+
- 
- " Define the default highlighting.
-diff -u -r --new-file runtime/syntax.orig/cs.vim runtime/syntax/cs.vim
---- runtime/syntax.orig/cs.vim	2006-05-03 16:20:02.000000000 -0500
-+++ runtime/syntax/cs.vim	2009-09-18 05:28:22.000000000 -0500
-@@ -2,7 +2,7 @@
- " Language:	C#
- " Maintainer:	Anduin Withers <awithers@anduin.com>
- " Former Maintainer:	Johannes Zellner <johannes@zellner.org>
--" Last Change:	Sun Apr 30 19:26:18 PDT 2006
-+" Last Change:	Fri Aug 14 13:56:37 PDT 2009
- " Filenames:	*.cs
- " $Id: cs.vim,v 1.4 2006/05/03 21:20:02 vimboss Exp $
- "
-@@ -78,8 +78,8 @@
- syn cluster xmlTagHook add=csXmlTag
- 
- syn match   csXmlCommentLeader	+\/\/\/+    contained
--syn match   csXmlComment	+\/\/\/.*$+ contains=csXmlCommentLeader,@csXml
--syntax include @csXml <sfile>:p:h/xml.vim
-+syn match   csXmlComment	+\/\/\/.*$+ contains=csXmlCommentLeader,@csXml,@Spell
-+syntax include @csXml syntax/xml.vim
- hi def link xmlRegion Comment
- 
- 
-@@ -100,7 +100,7 @@
- " unicode characters
- syn match   csUnicodeNumber	+\\\(u\x\{4}\|U\x\{8}\)+ contained contains=csUnicodeSpecifier
- syn match   csUnicodeSpecifier	+\\[uU]+ contained
--syn region  csVerbatimString	start=+@"+ end=+"+ end=+$+ skip=+""+ contains=csVerbatimSpec,@Spell
-+syn region  csVerbatimString	start=+@"+ end=+"+ skip=+""+ contains=csVerbatimSpec,@Spell
- syn match   csVerbatimSpec	+@"+he=s+1 contained
- syn region  csString		start=+"+  end=+"+ end=+$+ contains=csSpecialChar,csSpecialError,csUnicodeNumber,@Spell
- syn match   csCharacter		"'[^']*'" contains=csSpecialChar,csSpecialCharError
-diff -u -r --new-file runtime/syntax.orig/cucumber.vim runtime/syntax/cucumber.vim
---- runtime/syntax.orig/cucumber.vim	1969-12-31 18:00:00.000000000 -0600
-+++ runtime/syntax/cucumber.vim	2010-03-02 09:17:43.000000000 -0600
-@@ -0,0 +1,117 @@
-+" Vim syntax file
-+" Language:     Cucumber
-+" Maintainer:   Tim Pope <vimNOSPAM@tpope.org>
-+" Filenames:    *.feature
-+
-+if exists("b:current_syntax")
-+    finish
-+endif
-+
-+syn case match
-+syn sync minlines=20
-+
-+let g:cucumber_languages = {
-+      \"en": {"and": "And\\>", "background": "Background\\>", "but": "But\\>", "examples": "Scenarios\\>\\|Examples\\>", "feature": "Feature\\>", "given": "Given\\>", "scenario": "Scenario\\>", "scenario_outline": "Scenario Outline\\>", "then": "Then\\>", "when": "When\\>"},
-+      \"ar": {"and": "\\%u0648\\>", "background": "\\%u0627\\%u0644\\%u062e\\%u0644\\%u0641\\%u064a\\%u0629\\>", "but": "\\%u0644\\%u0643\\%u0646\\>", "examples": "\\%u0627\\%u0645\\%u062b\\%u0644\\%u0629\\>", "feature": "\\%u062e\\%u0627\\%u0635\\%u064a\\%u0629\\>", "given": "\\%u0628\\%u0641\\%u0631\\%u0636\\>", "scenario": "\\%u0633\\%u064a\\%u0646\\%u0627\\%u0631\\%u064a\\%u0648\\>", "scenario_outline": "\\%u0633\\%u064a\\%u0646\\%u0627\\%u0631\\%u064a\\%u0648 \\%u0645\\%u062e\\%u0637\\%u0637\\>", "then": "\\%u0627\\%u0630\\%u0627\\%u064b\\>\\|\\%u062b\\%u0645\\>", "when": "\\%u0639\\%u0646\\%u062f\\%u0645\\%u0627\\>\\|\\%u0645\\%u062a\\%u0649\\>"},
-+      \"bg": {"and": "\\%u0418\\>", "background": "\\%u041f\\%u0440\\%u0435\\%u0434\\%u0438\\%u0441\\%u0442\\%u043e\\%u0440\\%u0438\\%u044f\\>", "but": "\\%u041d\\%u043e\\>", "examples": "\\%u041f\\%u0440\\%u0438\\%u043c\\%u0435\\%u0440\\%u0438\\>", "feature": "\\%u0424\\%u0443\\%u043d\\%u043a\\%u0446\\%u0438\\%u043e\\%u043d\\%u0430\\%u043b\\%u043d\\%u043e\\%u0441\\%u0442\\>", "given": "\\%u0414\\%u0430\\%u0434\\%u0435\\%u043d\\%u043e\\>", "scenario": "\\%u0421\\%u0446\\%u0435\\%u043d\\%u0430\\%u0440\\%u0438\\%u0439\\>", "scenario_outline": "\\%u0420\\%u0430\\%u043c\\%u043a\\%u0430 \\%u043d\\%u0430 \\%u0441\\%u0446\\%u0435\\%u043d\\%u0430\\%u0440\\%u0438\\%u0439\\>", "then": "\\%u0422\\%u043e\\>", "when": "\\%u041a\\%u043e\\%u0433\\%u0430\\%u0442\\%u043e\\>"},
-+      \"cat": {"and": "I\\>", "background": "Antecedents\\>\\|Rerefons\\>", "but": "Per\\%u00f2\\>", "examples": "Exemples\\>", "feature": "Caracter\\%u00edstica\\>", "given": "Donada\\>\\|Donat\\>", "scenario": "Escenari\\>", "scenario_outline": "Esquema de l'escenari\\>", "then": "Aleshores\\>", "when": "Quan\\>"},
-+      \"cs": {"and": "A tak\\%u00e9\\>\\|A\\>", "background": "Pozad\\%u00ed\\>\\|Kontext\\>", "but": "Ale\\>", "examples": "P\\%u0159\\%u00edklady\\>", "feature": "Po\\%u017eadavek\\>", "given": "Pokud\\>", "scenario": "Sc\\%u00e9n\\%u00e1\\%u0159\\>", "scenario_outline": "N\\%u00e1\\%u010drt Sc\\%u00e9n\\%u00e1\\%u0159e\\>\\|Osnova sc\\%u00e9n\\%u00e1\\%u0159e\\>", "then": "Pak\\>", "when": "Kdy\\%u017e\\>"},
-+      \"cy": {"and": "A\\>", "background": "Cefndir\\>", "but": "Ond\\>", "examples": "Enghreifftiau\\>", "feature": "Arwedd\\>", "given": "anrhegedig a\\>", "scenario": "Scenario\\>", "scenario_outline": "Scenario Amlinellol\\>", "then": "Yna\\>", "when": "Pryd\\>"},
-+      \"da": {"and": "Og\\>", "background": "Baggrund\\>", "but": "Men\\>", "examples": "Eksempler\\>", "feature": "Egenskab\\>", "given": "Givet\\>", "scenario": "Scenarie\\>", "scenario_outline": "Abstrakt Scenario\\>", "then": "S\\%u00e5\\>", "when": "N\\%u00e5r\\>"},
-+      \"de": {"and": "Und\\>", "background": "Grundlage\\>", "but": "Aber\\>", "examples": "Beispiele\\>", "feature": "Funktionalit\\%u00e4t\\>", "given": "Gegeben sei\\>", "scenario": "Szenario\\>", "scenario_outline": "Szenariogrundriss\\>", "then": "Dann\\>", "when": "Wenn\\>"},
-+      \"en-au": {"and": "N\\>", "background": "Background\\>", "but": "Cept\\>", "examples": "Cobber\\>", "feature": "Crikey\\>", "given": "Ya know how\\>", "scenario": "Mate\\>", "scenario_outline": "Blokes\\>", "then": "Ya gotta\\>", "when": "When\\>"},
-+      \"en-lol": {"and": "AN\\>", "background": "B4\\>", "but": "BUT\\>", "examples": "EXAMPLZ\\>", "feature": "OH HAI\\>", "given": "I CAN HAZ\\>", "scenario": "MISHUN\\>", "scenario_outline": "MISHUN SRSLY\\>", "then": "DEN\\>", "when": "WEN\\>"},
-+      \"es": {"and": "Y\\>", "background": "Antecedentes\\>", "but": "Pero\\>", "examples": "Ejemplos\\>", "feature": "Caracter\\%u00edstica\\>", "given": "Dado\\>", "scenario": "Escenario\\>", "scenario_outline": "Esquema del escenario\\>", "then": "Entonces\\>", "when": "Cuando\\>"},
-+      \"et": {"and": "Ja\\>", "background": "Taust\\>", "but": "Kuid\\>", "examples": "Juhtumid\\>", "feature": "Omadus\\>", "given": "Eeldades\\>", "scenario": "Stsenaarium\\>", "scenario_outline": "Raamstsenaarium\\>", "then": "Siis\\>", "when": "Kui\\>"},
-+      \"fi": {"and": "Ja\\>", "background": "Tausta\\>", "but": "Mutta\\>", "examples": "Tapaukset\\>", "feature": "Ominaisuus\\>", "given": "Oletetaan\\>", "scenario": "Tapaus\\>", "scenario_outline": "Tapausaihio\\>", "then": "Niin\\>", "when": "Kun\\>"},
-+      \"fr": {"and": "Et\\>", "background": "Contexte\\>", "but": "Mais\\>", "examples": "Exemples\\>", "feature": "Fonctionnalit\\%u00e9\\>", "given": "Etant donn\\%u00e9\\>\\|Soit\\>", "scenario": "Sc\\%u00e9nario\\>", "scenario_outline": "Plan du sc\\%u00e9nario\\>\\|Plan du Sc\\%u00e9nario\\>", "then": "Alors\\>", "when": "Lorsqu'\\|Lorsque\\>\\|Quand\\>"},
-+      \"he": {"and": "\\%u05d5\\%u05d2\\%u05dd\\>", "background": "\\%u05e8\\%u05e7\\%u05e2\\>", "but": "\\%u05d0\\%u05d1\\%u05dc\\>", "examples": "\\%u05d3\\%u05d5\\%u05d2\\%u05de\\%u05d0\\%u05d5\\%u05ea\\>", "feature": "\\%u05ea\\%u05db\\%u05d5\\%u05e0\\%u05d4\\>", "given": "\\%u05d1\\%u05d4\\%u05d9\\%u05e0\\%u05ea\\%u05df\\>", "scenario": "\\%u05ea\\%u05e8\\%u05d7\\%u05d9\\%u05e9\\>", "scenario_outline": "\\%u05ea\\%u05d1\\%u05e0\\%u05d9\\%u05ea \\%u05ea\\%u05e8\\%u05d7\\%u05d9\\%u05e9\\>", "then": "\\%u05d0\\%u05d6\\%u05d9\\>\\|\\%u05d0\\%u05d6\\>", "when": "\\%u05db\\%u05d0\\%u05e9\\%u05e8\\>"},
-+      \"hr": {"and": "I\\>", "background": "Pozadina\\>", "but": "Ali\\>", "examples": "Scenariji\\>\\|Primjeri\\>", "feature": "Mogu\\%u0107nost\\>\\|Mogucnost\\>\\|Osobina\\>", "given": "Zadano\\>\\|Zadani\\>\\|Zadan\\>", "scenario": "Scenarij\\>", "scenario_outline": "Koncept\\>\\|Skica\\>", "then": "Onda\\>", "when": "Kada\\>\\|Kad\\>"},
-+      \"hu": {"and": "\\%u00c9s\\>", "background": "H\\%u00e1tt\\%u00e9r\\>", "but": "De\\>", "examples": "P\\%u00e9ld\\%u00e1k\\>", "feature": "Jellemz\\%u0151\\>", "given": "Ha\\>", "scenario": "Forgat\\%u00f3k\\%u00f6nyv\\>", "scenario_outline": "Forgat\\%u00f3k\\%u00f6nyv v\\%u00e1zlat\\>", "then": "Akkor\\>", "when": "Majd\\>"},
-+      \"id": {"and": "Dan\\>", "background": "Dasar\\>", "but": "Tapi\\>", "examples": "Contoh\\>", "feature": "Fitur\\>", "given": "Dengan\\>", "scenario": "Skenario\\>", "scenario_outline": "Skenario konsep\\>", "then": "Maka\\>", "when": "Ketika\\>"},
-+      \"it": {"and": "E\\>", "background": "Contesto\\>", "but": "Ma\\>", "examples": "Esempi\\>", "feature": "Funzionalit\\%u00e0\\>", "given": "Dato\\>", "scenario": "Scenario\\>", "scenario_outline": "Schema dello scenario\\>", "then": "Allora\\>", "when": "Quando\\>"},
-+      \"ja": {"and": "\\%u304b\\%u3064", "background": "\\%u80cc\\%u666f\\>", "but": "\\%u3057\\%u304b\\%u3057\\|\\%u305f\\%u3060\\%u3057\\|\\%u4f46\\%u3057", "examples": "\\%u30b5\\%u30f3\\%u30d7\\%u30eb\\>\\|\\%u4f8b\\>", "feature": "\\%u30d5\\%u30a3\\%u30fc\\%u30c1\\%u30e3\\>\\|\\%u6a5f\\%u80fd\\>", "given": "\\%u524d\\%u63d0", "scenario": "\\%u30b7\\%u30ca\\%u30ea\\%u30aa\\>", "scenario_outline": "\\%u30b7\\%u30ca\\%u30ea\\%u30aa\\%u30a2\\%u30a6\\%u30c8\\%u30e9\\%u30a4\\%u30f3\\>\\|\\%u30b7\\%u30ca\\%u30ea\\%u30aa\\%u30c6\\%u30f3\\%u30d7\\%u30ec\\%u30fc\\%u30c8\\>\\|\\%u30b7\\%u30ca\\%u30ea\\%u30aa\\%u30c6\\%u30f3\\%u30d7\\%u30ec\\>\\|\\%u30c6\\%u30f3\\%u30d7\\%u30ec\\>", "then": "\\%u306a\\%u3089\\%u3070", "when": "\\%u3082\\%u3057"},
-+      \"ko": {"and": "\\%uadf8\\%ub9ac\\%uace0", "background": "\\%ubc30\\%uacbd\\>", "but": "\\%ud558\\%uc9c0\\%ub9cc", "examples": "\\%uc608\\>", "feature": "\\%uae30\\%ub2a5\\>", "given": "\\%uc870\\%uac74", "scenario": "\\%uc2dc\\%ub098\\%ub9ac\\%uc624\\>", "scenario_outline": "\\%uc2dc\\%ub098\\%ub9ac\\%uc624 \\%uac1c\\%uc694\\>", "then": "\\%uadf8\\%ub7ec\\%uba74", "when": "\\%ub9cc\\%uc77c"},
-+      \"lt": {"and": "Ir\\>", "background": "Kontekstas\\>", "but": "Bet\\>", "examples": "Pavyzd\\%u017eiai\\>\\|Scenarijai\\>\\|Variantai\\>", "feature": "Savyb\\%u0117\\>", "given": "Duota\\>", "scenario": "Scenarijus\\>", "scenario_outline": "Scenarijaus \\%u0161ablonas\\>", "then": "Tada\\>", "when": "Kai\\>"},
-+      \"lv": {"and": "Un\\>", "background": "Situ\\%u0101cija\\>\\|Konteksts\\>", "but": "Bet\\>", "examples": "Piem\\%u0113ri\\>\\|Paraugs\\>", "feature": "Funkcionalit\\%u0101te\\>\\|F\\%u012b\\%u010da\\>", "given": "Kad\\>", "scenario": "Scen\\%u0101rijs\\>", "scenario_outline": "Scen\\%u0101rijs p\\%u0113c parauga\\>", "then": "Tad\\>", "when": "Ja\\>"},
-+      \"nl": {"and": "En\\>", "background": "Achtergrond\\>", "but": "Maar\\>", "examples": "Voorbeelden\\>", "feature": "Functionaliteit\\>", "given": "Gegeven\\>\\|Stel\\>", "scenario": "Scenario\\>", "scenario_outline": "Abstract Scenario\\>", "then": "Dan\\>", "when": "Als\\>"},
-+      \"no": {"and": "Og\\>", "background": "Bakgrunn\\>", "but": "Men\\>", "examples": "Eksempler\\>", "feature": "Egenskap\\>", "given": "Gitt\\>", "scenario": "Scenario\\>", "scenario_outline": "Abstrakt Scenario\\>", "then": "S\\%u00e5\\>", "when": "N\\%u00e5r\\>"},
-+      \"pl": {"and": "Oraz\\>", "background": "Za\\%u0142o\\%u017cenia\\>", "but": "Ale\\>", "examples": "Przyk\\%u0142ady\\>", "feature": "W\\%u0142a\\%u015bciwo\\%u015b\\%u0107\\>", "given": "Zak\\%u0142adaj\\%u0105c\\>", "scenario": "Scenariusz\\>", "scenario_outline": "Szablon scenariusza\\>", "then": "Wtedy\\>", "when": "Je\\%u017celi\\>"},
-+      \"pt": {"and": "E\\>", "background": "Contexto\\>", "but": "Mas\\>", "examples": "Exemplos\\>", "feature": "Funcionalidade\\>", "given": "Dado\\>", "scenario": "Cen\\%u00e1rio\\>\\|Cenario\\>", "scenario_outline": "Esquema do Cen\\%u00e1rio\\>\\|Esquema do Cenario\\>", "then": "Ent\\%u00e3o\\>\\|Entao\\>", "when": "Quando\\>"},
-+      \"ro": {"and": "Si\\>", "background": "Conditii\\>", "but": "Dar\\>", "examples": "Exemplele\\>", "feature": "Functionalitate\\>", "given": "Daca\\>", "scenario": "Scenariu\\>", "scenario_outline": "Scenariul de sablon\\>", "then": "Atunci\\>", "when": "Cand\\>"},
-+      \"ro2": {"and": "\\%u0218i\\>", "background": "Condi\\%u0163ii\\>", "but": "Dar\\>", "examples": "Exemplele\\>", "feature": "Func\\%u021bionalitate\\>", "given": "Dac\\%u0103\\>", "scenario": "Scenariu\\>", "scenario_outline": "Scenariul de \\%u015fablon\\>", "then": "Atunci\\>", "when": "C\\%u00e2nd\\>"},
-+      \"ru": {"and": "\\%u041a \\%u0442\\%u043e\\%u043c\\%u0443 \\%u0436\\%u0435\\>\\|\\%u0418\\>", "background": "\\%u041f\\%u0440\\%u0435\\%u0434\\%u044b\\%u0441\\%u0442\\%u043e\\%u0440\\%u0438\\%u044f\\>", "but": "\\%u041d\\%u043e\\>\\|\\%u0410\\>", "examples": "\\%u0417\\%u043d\\%u0430\\%u0447\\%u0435\\%u043d\\%u0438\\%u044f\\>", "feature": "\\%u0424\\%u0443\\%u043d\\%u043a\\%u0446\\%u0438\\%u043e\\%u043d\\%u0430\\%u043b\\>", "given": "\\%u0414\\%u043e\\%u043f\\%u0443\\%u0441\\%u0442\\%u0438\\%u043c\\>", "scenario": "\\%u0421\\%u0446\\%u0435\\%u043d\\%u0430\\%u0440\\%u0438\\%u0439\\>", "scenario_outline": "\\%u0421\\%u0442\\%u0440\\%u0443\\%u043a\\%u0442\\%u0443\\%u0440\\%u0430 \\%u0441\\%u0446\\%u0435\\%u043d\\%u0430\\%u0440\\%u0438\\%u044f\\>", "then": "\\%u0422\\%u043e\\>", "when": "\\%u0415\\%u0441\\%u043b\\%u0438\\>"},
-+      \"se": {"and": "Och\\>", "background": "Bakgrund\\>", "but": "Men\\>", "examples": "Exempel\\>", "feature": "Egenskap\\>", "given": "Givet\\>", "scenario": "Scenario\\>", "scenario_outline": "Abstrakt Scenario\\>", "then": "S\\%u00e5\\>", "when": "N\\%u00e4r\\>"},
-+      \"sk": {"and": "A\\>", "background": "Pozadie\\>", "but": "Ale\\>", "examples": "Pr\\%u00edklady\\>", "feature": "Po\\%u017eiadavka\\>", "given": "Pokia\\%u013e\\>", "scenario": "Scen\\%u00e1r\\>", "scenario_outline": "N\\%u00e1\\%u010drt Scen\\%u00e1ru\\>", "then": "Tak\\>", "when": "Ke\\%u010f\\>"},
-+      \"sr": {"and": "\\%u0418\\>", "background": "\\%u041a\\%u043e\\%u043d\\%u0442\\%u0435\\%u043a\\%u0441\\%u0442\\>\\|\\%u041f\\%u043e\\%u0437\\%u0430\\%u0434\\%u0438\\%u043d\\%u0430\\>\\|\\%u041e\\%u0441\\%u043d\\%u043e\\%u0432\\%u0430\\>", "but": "\\%u0410\\%u043b\\%u0438\\>", "examples": "\\%u0421\\%u0446\\%u0435\\%u043d\\%u0430\\%u0440\\%u0438\\%u0458\\%u0438\\>\\|\\%u041f\\%u0440\\%u0438\\%u043c\\%u0435\\%u0440\\%u0438\\>", "feature": "\\%u0424\\%u0443\\%u043d\\%u043a\\%u0446\\%u0438\\%u043e\\%u043d\\%u0430\\%u043b\\%u043d\\%u043e\\%u0441\\%u0442\\>\\|\\%u041c\\%u043e\\%u0433\\%u0443\\%u045b\\%u043d\\%u043e\\%u0441\\%u0442\\>\\|\\%u041e\\%u0441\\%u043e\\%u0431\\%u0438\\%u043d\\%u0430\\>", "given": "\\%u0417\\%u0430\\%u0434\\%u0430\\%u0442\\%u043e\\>\\|\\%u0417\\%u0430\\%u0434\\%u0430\\%u0442\\%u0435\\>\\|\\%u0417\\%u0430\\%u0434\\%u0430\\%u0442\\%u0438\\>", "scenario": "\\%u0421\\%u0446\\%u0435\\%u043d\\%u0430\\%u0440\\%u0438\\%u043e\\>\\|\\%u041f\\%u0440\\%u0438\\%u043c\\%u0435\\%u0440\\>", "scenario_outline": "\\%u0421\\%u0442\\%u0440\\%u0443\\%u043a\\%u0442\\%u0443\\%u0440\\%u0430 \\%u0441\\%u0446\\%u0435\\%u043d\\%u0430\\%u0440\\%u0438\\%u0458\\%u0430\\>\\|\\%u041a\\%u043e\\%u043d\\%u0446\\%u0435\\%u043f\\%u0442\\>\\|\\%u0421\\%u043a\\%u0438\\%u0446\\%u0430\\>", "then": "\\%u041e\\%u043d\\%u0434\\%u0430\\>", "when": "\\%u041a\\%u0430\\%u0434\\%u0430\\>\\|\\%u041a\\%u0430\\%u0434\\>"},
-+      \"sr-Latn": {"and": "I\\>", "background": "Kontekst\\>\\|Pozadina\\>\\|Osnova\\>", "but": "Ali\\>", "examples": "Scenariji\\>\\|Primeri\\>", "feature": "Mogu\\%u0107nost\\>\\|Funkcionalnost\\>\\|Mogucnost\\>\\|Osobina\\>", "given": "Zadato\\>\\|Zadate\\>\\|Zatati\\>", "scenario": "Scenario\\>\\|Primer\\>", "scenario_outline": "Struktura scenarija\\>\\|Koncept\\>\\|Skica\\>", "then": "Onda\\>", "when": "Kada\\>\\|Kad\\>"},
-+      \"tr": {"and": "Ve\\>", "background": "Ge\\%u00e7mi\\%u015f\\>", "but": "Fakat\\>\\|Ama\\>", "examples": "\\%u00d6rnekler\\>", "feature": "\\%u00d6zellik\\>", "given": "Diyelim ki\\>", "scenario": "Senaryo\\>", "scenario_outline": "Senaryo tasla\\%u011f\\%u0131\\>", "then": "O zaman\\>", "when": "E\\%u011fer ki\\>"},
-+      \"uz": {"and": "\\%u0412\\%u0430\\>", "background": "\\%u0422\\%u0430\\%u0440\\%u0438\\%u0445\\>", "but": "\\%u041b\\%u0435\\%u043a\\%u0438\\%u043d\\>\\|\\%u0411\\%u0438\\%u0440\\%u043e\\%u043a\\>\\|\\%u0410\\%u043c\\%u043c\\%u043e\\>", "examples": "\\%u041c\\%u0438\\%u0441\\%u043e\\%u043b\\%u043b\\%u0430\\%u0440\\>", "feature": "\\%u0424\\%u0443\\%u043d\\%u043a\\%u0446\\%u0438\\%u043e\\%u043d\\%u0430\\%u043b\\>", "given": "\\%u0410\\%u0433\\%u0430\\%u0440\\>", "scenario": "\\%u0421\\%u0446\\%u0435\\%u043d\\%u0430\\%u0440\\%u0438\\%u0439\\>", "scenario_outline": "\\%u0421\\%u0446\\%u0435\\%u043d\\%u0430\\%u0440\\%u0438\\%u0439 \\%u0441\\%u0442\\%u0440\\%u0443\\%u043a\\%u0442\\%u0443\\%u0440\\%u0430\\%u0441\\%u0438\\>", "then": "\\%u0423\\%u043d\\%u0434\\%u0430\\>", "when": "\\%u0410\\%u0433\\%u0430\\%u0440\\>"},
-+      \"vi": {"and": "V\\%u00e0\\>", "background": "B\\%u1ed1i c\\%u1ea3nh\\>", "but": "Nh\\%u01b0ng\\>", "examples": "D\\%u1eef li\\%u1ec7u\\>", "feature": "T\\%u00ednh n\\%u0103ng\\>", "given": "Bi\\%u1ebft\\>\\|Cho\\>", "scenario": "T\\%u00ecnh hu\\%u1ed1ng\\>\\|K\\%u1ecbch b\\%u1ea3n\\>", "scenario_outline": "Khung t\\%u00ecnh hu\\%u1ed1ng\\>\\|Khung k\\%u1ecbch b\\%u1ea3n\\>", "then": "Th\\%u00ec\\>", "when": "Khi\\>"},
-+      \"zh-CN": {"and": "\\%u800c\\%u4e14", "background": "\\%u80cc\\%u666f\\>", "but": "\\%u4f46\\%u662f", "examples": "\\%u4f8b\\%u5b50\\>", "feature": "\\%u529f\\%u80fd\\>", "given": "\\%u5047\\%u5982", "scenario": "\\%u573a\\%u666f\\>", "scenario_outline": "\\%u573a\\%u666f\\%u5927\\%u7eb2\\>", "then": "\\%u90a3\\%u4e48", "when": "\\%u5f53"},
-+      \"zh-TW": {"and": "\\%u800c\\%u4e14\\|\\%u4e26\\%u4e14", "background": "\\%u80cc\\%u666f\\>", "but": "\\%u4f46\\%u662f", "examples": "\\%u4f8b\\%u5b50\\>", "feature": "\\%u529f\\%u80fd\\>", "given": "\\%u5047\\%u8a2d", "scenario": "\\%u5834\\%u666f\\>\\|\\%u5287\\%u672c\\>", "scenario_outline": "\\%u5834\\%u666f\\%u5927\\%u7db1\\>\\|\\%u5287\\%u672c\\%u5927\\%u7db1\\>", "then": "\\%u90a3\\%u9ebc", "when": "\\%u7576"}}
-+
-+function! s:pattern(key)
-+  let language = matchstr(getline(1),'#\s*language:\s*\zs\S\+')
-+  if has_key(g:cucumber_languages, language)
-+    let languages = [g:cucumber_languages[language]]
-+  else
-+    let languages = values(g:cucumber_languages)
-+  end
-+  return '\<\%('.join(map(languages,'get(v:val,a:key,"\\%(a\\&b\\)")'),'\|').'\)'
-+endfunction
-+
-+function! s:Add(name)
-+  let next = " skipempty skipwhite nextgroup=".join(map(["Region","AndRegion","ButRegion","Comment","Table"],'"cucumber".a:name.v:val'),",")
-+  exe "syn region cucumber".a:name.'Region matchgroup=cucumber'.a:name.' start="\%(^\s*\)\@<=\%('.s:pattern(tolower(a:name)).'\)" end="$"'.next
-+  exe 'syn region cucumber'.a:name.'AndRegion matchgroup=cucumber'.a:name.'And start="\%(^\s*\)\@<='.s:pattern('and').'" end="$" contained'.next
-+  exe 'syn region cucumber'.a:name.'ButRegion matchgroup=cucumber'.a:name.'But start="\%(^\s*\)\@<='.s:pattern('but').'" end="$" contained'.next
-+  exe 'syn match cucumber'.a:name.'Comment "\%(^\s*\)\@<=#.*" contained'.next
-+  exe 'syn match cucumber'.a:name.'Table "\%(^\s*\)\@<=|.*" contained contains=cucumberDelimiter'.next
-+  exe 'hi def link cucumber'.a:name.'Comment cucumberComment'
-+  exe 'hi def link cucumber'.a:name.'But cucumber'.a:name.'And'
-+  exe 'hi def link cucumber'.a:name.'And cucumber'.a:name
-+  exe 'syn cluster cucumberStepRegions add=cucumber'.a:name.'Region,cucumber'.a:name.'AndRegion,cucumber'.a:name.'ButRegion'
-+endfunction
-+
-+syn match   cucumberComment  "\%(^\s*\)\@<=#.*"
-+syn match   cucumberComment  "\%(\%^\s*\)\@<=#.*" contains=cucumberLanguage
-+syn match   cucumberLanguage "\%(#\s*\)\@<=language:" contained
-+syn match   cucumberUnparsed "\S.*" nextgroup=cucumberUnparsedComment,cucumberUnparsed,cucumberTags,cucumberBackground,cucumberScenario,cucumberScenarioOutline,cucumberExamples skipwhite skipempty contained
-+syn match   cucumberUnparsedComment "#.*" nextgroup=cucumberUnparsedComment,cucumberUnparsed,cucumberTags,cucumberBackground,cucumberScenario,cucumberScenarioOutline,cucumberExamples skipwhite skipempty contained
-+
-+exe 'syn match cucumberFeature "\%(^\s*\)\@<='.s:pattern('feature').':" nextgroup=cucumberUnparsedComment,cucumberUnparsed,cucumberBackground,cucumberScenario,cucumberScenarioOutline,cucumberExamples skipwhite skipempty'
-+exe 'syn match cucumberBackground "\%(^\s*\)\@<='.s:pattern('background').':"'
-+exe 'syn match cucumberScenario "\%(^\s*\)\@<='.s:pattern('scenario').':"'
-+exe 'syn match cucumberScenarioOutline "\%(^\s*\)\@<='.s:pattern('scenario_outline').':"'
-+exe 'syn match cucumberExamples "\%(^\s*\)\@<='.s:pattern('examples').':" nextgroup=cucumberExampleTable skipempty skipwhite'
-+
-+syn match   cucumberPlaceholder   "<[^<>]*>" contained containedin=@cucumberStepRegions
-+syn match   cucumberExampleTable  "\%(^\s*\)\@<=|.*" contains=cucumberDelimiter
-+syn match   cucumberDelimiter     "|" contained
-+syn match   cucumberTags          "\%(^\s*\)\@<=\%(@[^@[:space:]]\+\s\+\)*@[^@[:space:]]\+\s*$"
-+syn region  cucumberString   start=+\%(^\s*\)\@<="""+ end=+"""+
-+
-+call s:Add('Then')
-+call s:Add('When')
-+call s:Add('Given')
-+
-+hi def link cucumberUnparsedComment   cucumberComment
-+hi def link cucumberComment           Comment
-+hi def link cucumberLanguage          SpecialComment
-+hi def link cucumberFeature           Macro
-+hi def link cucumberBackground        Define
-+hi def link cucumberScenario          Define
-+hi def link cucumberScenarioOutline   Define
-+hi def link cucumberExamples          Define
-+hi def link cucumberPlaceholder       Constant
-+hi def link cucumberDelimiter         Delimiter
-+hi def link cucumberTags              Tag
-+hi def link cucumberString            String
-+hi def link cucumberGiven             Conditional
-+hi def link cucumberWhen              Function
-+hi def link cucumberThen              Type
-+
-+let b:current_syntax = "cucumber"
-+
-+" vim:set sts=2 sw=2:
-diff -u -r --new-file runtime/syntax.orig/d.vim runtime/syntax/d.vim
---- runtime/syntax.orig/d.vim	2006-04-30 11:01:36.000000000 -0500
-+++ runtime/syntax/d.vim	2010-01-16 07:33:01.000000000 -0600
-@@ -1,29 +1,44 @@
--" Vim syntax file for the D programming language (version 0.149).
-+" Vim syntax file for the D programming language (version 1.053 and 2.039).
- "
- " Language:	D
--" Maintainer:	Jason Mills<jmills@cs.mun.ca>
--"   When emailing me, please put the word vim somewhere in the subject
--"   to ensure the email does not get marked as spam.
--" Last Change:	2006 Apr 30
--" Version:	0.15
-+" Maintainer:	Jason Mills<jasonmills@nf.sympatico.ca>
-+" Last Change:	2010 Jan 07
-+" Version:	0.18
-+"
-+" Contributors:
-+"   - Kirk McDonald: version 0.17 updates, with minor modifications
-+"     (http://paste.dprogramming.com/dplmb7qx?view=hidelines)
-+"   - Jesse K. Phillips: patch for some keywords and attributes (annotations), with modifications
-+"   - Tim Keating: patch to fix a bug in highlighting the `\` literal
-+"   - Frank Benoit: Fixed a bug that caused some identifiers and numbers to highlight as octal number errors.
-+"
-+" Please email me with bugs, comments, and suggestions.
- "
- " Options:
--"   d_comment_strings - set to highlight strings and numbers in comments
-+"   d_comment_strings - Set to highlight strings and numbers in comments.
- "
--"   d_hl_operator_overload - set to highlight D's specially named functions
--"   that when overloaded implement unary and binary operators (e.g. cmp).
-+"   d_hl_operator_overload - Set to highlight D's specially named functions
-+"   that when overloaded implement unary and binary operators (e.g. opCmp).
- "
- " Todo:
--"   - Must determine a better method of sync'ing than simply setting minlines
--"   to a large number for /+ +/.
-+"   - Determine a better method of sync'ing than simply setting minlines
-+"   to a large number.
- "
--"   - Several keywords (namely, in and out) are both storage class and
--"   statements, depending on their context. Must use some matching to figure
--"   out which and highlight appropriately. For now I have made such keywords
--"   statements.
-+"   - Several keywords (e.g., in, out, inout) are both storage class and
-+"   statements, depending on their context. Perhaps use pattern matching to
-+"   figure out which and highlight appropriately. For now I have made such
-+"   keywords storage classes so their highlighting is consistent with other
-+"   keywords that are commonly used with them, but are true storage classes,
-+"   such as lazy. Similarly, I made some statement keywords (e.g. body) storage
-+"   classes.
- "
- "   - Mark contents of the asm statement body as special
- "
-+"   - Maybe highlight the 'exit', 'failure', and 'success' parts of the
-+"   scope() statement.
-+"
-+"   - Highlighting DDoc comments.
-+"
- 
- " Quit when a syntax file was already loaded
- if exists("b:current_syntax")
-@@ -33,46 +48,59 @@
- " Keyword definitions
- "
- syn keyword dExternal		import package module extern
--syn keyword dConditional	if else switch iftype
-+syn keyword dConditional	if else switch
- syn keyword dBranch		goto break continue
--syn keyword dRepeat		while for do foreach
-+syn keyword dRepeat		while for do foreach foreach_reverse
- syn keyword dBoolean		true false
- syn keyword dConstant		null
--syn keyword dConstant		__FILE__ __LINE__ __DATE__ __TIME__ __TIMESTAMP__
-+syn keyword dConstant		__FILE__ __LINE__ __EOF__ __VERSION__
-+syn keyword dConstant		__DATE__ __TIME__ __TIMESTAMP__ __VENDOR__
-+
- syn keyword dTypedef		alias typedef
--syn keyword dStructure		template interface class enum struct union
-+syn keyword dStructure		template interface class struct union
-+syn keyword dEnum		enum
- syn keyword dOperator		new delete typeof typeid cast align is
- syn keyword dOperator		this super
- if exists("d_hl_operator_overload")
-   syn keyword dOpOverload	opNeg opCom opPostInc opPostDec opCast opAdd opSub opSub_r
-   syn keyword dOpOverload	opMul opDiv opDiv_r opMod opMod_r opAnd opOr opXor
-   syn keyword dOpOverload	opShl opShl_r opShr opShr_r opUShr opUShr_r opCat
--  syn keyword dOpOverload	opCat_r opEquals opEquals opCmp opCmp opCmp opCmp
--  syn keyword dOpOverload	opAddAssign opSubAssign opMulAssign opDivAssign
-+  syn keyword dOpOverload	opCat_r opEquals opEquals opCmp
-+  syn keyword dOpOverload	opAssign opAddAssign opSubAssign opMulAssign opDivAssign
-   syn keyword dOpOverload	opModAssign opAndAssign opOrAssign opXorAssign
-   syn keyword dOpOverload	opShlAssign opShrAssign opUShrAssign opCatAssign
-   syn keyword dOpOverload	opIndex opIndexAssign opCall opSlice opSliceAssign opPos
--  syn keyword dOpOverload	opAdd_r opMul_r opAnd_r opOr_r opXor_r 
-+  syn keyword dOpOverload	opAdd_r opMul_r opAnd_r opOr_r opXor_r opIn opIn_r
-+  syn keyword dOpOverload	opPow opDispatch opStar opDot opApply opApplyReverse
- endif
- syn keyword dType		ushort int uint long ulong float
- syn keyword dType		void byte ubyte double bit char wchar ucent cent
--syn keyword dType		short bool dchar
-+syn keyword dType		short bool dchar string wstring dstring
- syn keyword dType		real ireal ifloat idouble creal cfloat cdouble
- syn keyword dDebug		deprecated unittest
- syn keyword dExceptions		throw try catch finally
- syn keyword dScopeDecl		public protected private export
--syn keyword dStatement		version debug return with invariant body scope
--syn keyword dStatement		in out inout asm mixin
--syn keyword dStatement		function delegate
--syn keyword dStorageClass	auto static override final const abstract volatile
--syn keyword dStorageClass	synchronized
-+syn keyword dStatement		version debug return with
-+syn keyword dStatement		function delegate __traits asm mixin macro
-+syn keyword dStorageClass	in out inout ref lazy scope body
-+syn keyword dStorageClass	pure nothrow
-+syn keyword dStorageClass	auto static override final abstract volatile __gshared __thread
-+syn keyword dStorageClass	synchronized immutable shared const invariant lazy
- syn keyword dPragma		pragma
- 
-+" Attributes/annotations
-+syn match dAnnotation	"@[_$a-zA-Z][_$a-zA-Z0-9_]*\>"
- 
- " Assert is a statement and a module name.
- syn match dAssert "^assert\>"
- syn match dAssert "[^.]\s*\<assert\>"ms=s+1
- 
-+" dTokens is used by the token string highlighting
-+syn cluster dTokens contains=dExternal,dConditional,dBranch,dRepeat,dBoolean
-+syn cluster dTokens add=dConstant,dTypedef,dStructure,dOperator,dOpOverload
-+syn cluster dTokens add=dType,dDebug,dExceptions,dScopeDecl,dStatement
-+syn cluster dTokens add=dStorageClass,dPragma,dAssert,dAnnotation
-+
- " Marks contents of the asm statment body as special
- "
- " TODO
-@@ -85,12 +113,14 @@
- " Labels
- "
- " We contain dScopeDecl so public: private: etc. are not highlighted like labels
--syn match dUserLabel	"^\s*[_$a-zA-Z][_$a-zA-Z0-9_]*\s*:"he=e-1 contains=dLabel,dScopeDecl
-+syn match dUserLabel    "^\s*[_$a-zA-Z][_$a-zA-Z0-9_]*\s*:"he=e-1 contains=dLabel,dScopeDecl,dEnum
- syn keyword dLabel	case default
- 
-+syn cluster dTokens add=dUserLabel,dLabel
-+
- " Comments
- "
--syn keyword dTodo	contained TODO FIXME TEMP XXX
-+syn keyword dTodo	contained TODO FIXME TEMP REFACTOR REVIEW HACK BUG XXX
- syn match dCommentStar	contained "^\s*\*[^/]"me=e-1
- syn match dCommentStar	contained "^\s*\*$"
- syn match dCommentPlus	contained "^\s*+[^/]"me=e-1
-@@ -114,6 +144,8 @@
- hi link dCommentStar		dBlockComment
- hi link dCommentPlus		dNestedComment
- 
-+syn cluster dTokens add=dBlockComment,dNestedComment,dLineComment
-+
- " /+ +/ style comments and strings that span multiple lines can cause
- " problems. To play it safe, set minlines to a large number.
- syn sync minlines=200
-@@ -125,24 +157,55 @@
- syn match dSpecialCharError contained "[^']"
- 
- " Escape sequences (oct,specal char,hex,wchar, character entities \&xxx;)
--" These are not contained because they are considered string litterals
-+" These are not contained because they are considered string literals.
- syn match dEscSequence	"\\\(\o\{1,3}\|[\"\\'\\?ntbrfva]\|u\x\{4}\|U\x\{8}\|x\x\x\)"
--syn match dEscSequence "\\&[^;& \t]\+;"
-+syn match dEscSequence	"\\&[^;& \t]\+;"
- syn match dCharacter	"'[^']*'" contains=dEscSequence,dSpecialCharError
- syn match dCharacter	"'\\''" contains=dEscSequence
- syn match dCharacter	"'[^\\]'"
- 
-+syn cluster dTokens add=dEscSequence,dCharacter
-+
- " Unicode characters
- "
- syn match dUnicode "\\u\d\{4\}"
- 
--
- " String.
- "
--syn region dString	start=+"+ end=+"[cwd]\=+ contains=dEscSequence,@Spell
--syn region dRawString	start=+`+ skip=+\\`+ end=+`[cwd]\=+ contains=@Spell
--syn region dRawString	start=+r"+ skip=+\\"+ end=+"[cwd]\=+ contains=@Spell
--syn region dHexString	start=+x"+ skip=+\\"+ end=+"[cwd]\=+ contains=@Spell
-+syn region dString	start=+"+ end=+"[cwd]\=+ skip=+\\\\\|\\"+ contains=dEscSequence,@Spell
-+syn region dRawString	start=+`+ end=+`[cwd]\=+ contains=@Spell
-+syn region dRawString	start=+r"+ end=+"[cwd]\=+ contains=@Spell
-+syn region dHexString	start=+x"+ end=+"[cwd]\=+ contains=@Spell
-+syn region dDelimString	start=+q"\z(.\)+ end=+\z1"+ contains=@Spell
-+syn region dHereString	start=+q"\z(\I\i*\)\n+ end=+\n\z1"+ contains=@Spell
-+
-+" Nesting delimited string contents
-+"
-+syn region dNestParenString start=+(+ end=+)+ contained transparent contains=dNestParenString,@Spell
-+syn region dNestBrackString start=+\[+ end=+\]+ contained transparent contains=dNestBrackString,@Spell
-+syn region dNestAngleString start=+<+ end=+>+ contained transparent contains=dNestAngleString,@Spell
-+syn region dNestCurlyString start=+{+ end=+}+ contained transparent contains=dNestCurlyString,@Spell
-+
-+" Nesting delimited strings
-+"
-+syn region dParenString	matchgroup=dParenString start=+q"(+ end=+)"+ contains=dNestParenString,@Spell
-+syn region dBrackString	matchgroup=dBrackString start=+q"\[+ end=+\]"+ contains=dNestBrackString,@Spell
-+syn region dAngleString	matchgroup=dAngleString start=+q"<+ end=+>"+ contains=dNestAngleString,@Spell
-+syn region dCurlyString	matchgroup=dCurlyString start=+q"{+ end=+}"+ contains=dNestCurlyString,@Spell
-+
-+hi link dParenString dNestString
-+hi link dBrackString dNestString
-+hi link dAngleString dNestString
-+hi link dCurlyString dNestString
-+
-+syn cluster dTokens add=dString,dRawString,dHexString,dDelimString,dNestString
-+
-+" Token strings
-+"
-+syn region dNestTokenString start=+{+ end=+}+ contained contains=dNestTokenString,@dTokens
-+syn region dTokenString matchgroup=dTokenStringBrack transparent start=+q{+ end=+}+ contains=dNestTokenString,@dTokens
-+
-+syn cluster dTokens add=dTokenString
- 
- " Numbers
- "
-@@ -177,6 +240,8 @@
- "floating point number, without dot, with exponent
- syn match dHexFloat	display "\<0x[0-9a-f_]\+p[-+]\=[0-9_]\+[fl]\=i\=\>"
- 
-+syn cluster dTokens add=dDec,dHex,dOctal,dOctalError,dBinary,dFloat,dHexFloat
-+
- syn case match
- 
- " Pragma (preprocessor) support
-@@ -205,6 +270,10 @@
- hi def link dStorageClass	StorageClass
- hi def link dBoolean		Boolean
- hi def link dUnicode		Special
-+hi def link dTokenStringBrack	String
-+hi def link dHereString		String
-+hi def link dNestString		String
-+hi def link dDelimString	String
- hi def link dRawString		String
- hi def link dString		String
- hi def link dHexString		String
-@@ -213,9 +282,10 @@
- hi def link dSpecialCharError	Error
- hi def link dOctalError		Error
- hi def link dOperator		Operator
--hi def link dOpOverload		Operator
-+hi def link dOpOverload		Identifier
- hi def link dConstant		Constant
- hi def link dTypedef		Typedef
-+hi def link dEnum		Structure
- hi def link dStructure		Structure
- hi def link dTodo		Todo
- hi def link dType		Type
-@@ -224,7 +294,8 @@
- hi def link dNestedComment	Comment
- hi def link dExternal		Include
- hi def link dPragma		PreProc
-+hi def link dAnnotation		PreProc
- 
- let b:current_syntax = "d"
--   
-+
- " vim: ts=8 noet
-diff -u -r --new-file runtime/syntax.orig/debchangelog.vim runtime/syntax/debchangelog.vim
---- runtime/syntax.orig/debchangelog.vim	2008-07-06 12:51:40.000000000 -0500
-+++ runtime/syntax/debchangelog.vim	2009-09-18 05:28:22.000000000 -0500
-@@ -3,7 +3,7 @@
- " Maintainer:  Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
- " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
- "                     Wichert Akkerman <wakkerma@debian.org>
--" Last Change: 2008-01-16
-+" Last Change: 2009 Jun 05
- " URL: http://git.debian.org/?p=pkg-vim/vim.git;a=blob_plain;f=runtime/syntax/debchangelog.vim;hb=debian
- 
- " Standard syntax initialization
-@@ -17,9 +17,9 @@
- syn case ignore
- 
- " Define some common expressions we can use later on
--syn match debchangelogName	contained "^[[:alpha:]][[:alnum:].+-]\+ "
-+syn match debchangelogName	contained "^[[:alnum:]][[:alnum:].+-]\+ "
- syn match debchangelogUrgency	contained "; urgency=\(low\|medium\|high\|critical\|emergency\)\( \S.*\)\="
--syn match debchangelogTarget	contained "\v %(%(old)=stable|frozen|unstable|%(testing-|%(old)=stable-)=proposed-updates|experimental|%(sarge|etch|lenny)-%(backports|volatile)|%(testing|%(old)=stable)-security|%(dapper|feisty|gutsy|hardy|intrepid)%(-%(security|proposed|updates|backports|commercial|partner))=)+"
-+syn match debchangelogTarget	contained "\v %(frozen|unstable|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|%(etch|lenny)-%(backports|volatile)|%(dapper|hardy|intrepid|jaunty|karmic)%(-%(security|proposed|updates|backports|commercial|partner))=)+"
- syn match debchangelogVersion	contained "(.\{-})"
- syn match debchangelogCloses	contained "closes:\_s*\(bug\)\=#\=\_s\=\d\+\(,\_s*\(bug\)\=#\=\_s\=\d\+\)*"
- syn match debchangelogLP	contained "\clp:\s\+#\d\+\(,\s*#\d\+\)*"
-diff -u -r --new-file runtime/syntax.orig/debcontrol.vim runtime/syntax/debcontrol.vim
---- runtime/syntax.orig/debcontrol.vim	2008-07-06 12:51:40.000000000 -0500
-+++ runtime/syntax/debcontrol.vim	2009-09-18 05:30:48.000000000 -0500
-@@ -3,7 +3,7 @@
- " Maintainer:  Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
- " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
- "                     Wichert Akkerman <wakkerma@debian.org>
--" Last Change: 2008-02-23
-+" Last Change: 2009 July 14
- " URL: http://git.debian.org/?p=pkg-vim/vim.git;a=blob_plain;f=runtime/ftplugin/debcontrol.vim;hb=debian
- 
- " Comments are very welcome - but please make sure that you are commenting on
-@@ -28,10 +28,10 @@
- syn match debControlSpace " "
- 
- " Define some common expressions we can use later on
--syn match debcontrolArchitecture contained "\(all\|any\|alpha\|amd64\|arm\(e[bl]\)\=\|hppa\|i386\|ia64\|m32r\|m68k\|mipsel\|mips\|powerpc\|ppc64\|s390x\=\|sh[34]\(eb\)\=\|sh\|sparc64\|sparc\|hurd-i386\|kfreebsd-\(i386\|gnu\)\|knetbsd-i386\|netbsd-\(alpha\|i386\)\)"
-+syn match debcontrolArchitecture contained "\(all\|any\|alpha\|amd64\|arm\(e[bl]\)\=\|avr32\|hppa\|i386\|ia64\|m32r\|m68k\|mipsel\|mips\|powerpc\|ppc64\|s390x\=\|sh[34]\(eb\)\=\|sh\|sparc64\|sparc\|hurd-i386\|kfreebsd-\(i386\|amd64\|gnu\)\|knetbsd-i386\|netbsd-\(alpha\|i386\)\)"
- syn match debcontrolName contained "[a-z0-9][a-z0-9+.-]\+"
- syn match debcontrolPriority contained "\(extra\|important\|optional\|required\|standard\)"
--syn match debcontrolSection contained "\(\(contrib\|non-free\|non-US/main\|non-US/contrib\|non-US/non-free\|restricted\|universe\|multiverse\)/\)\=\(admin\|base\|comm\|devel\|doc\|editors\|electronics\|embedded\|games\|gnome\|graphics\|hamradio\|interpreters\|kde\|libs\|libdevel\|mail\|math\|misc\|net\|news\|oldlibs\|otherosfs\|perl\|python\|science\|shells\|sound\|text\|tex\|utils\|web\|x11\|debian-installer\)"
-+syn match debcontrolSection contained "\v((contrib|non-free|non-US/main|non-US/contrib|non-US/non-free|restricted|universe|multiverse)/)?(admin|cli-mono|comm|database|debian-installer|debug|devel|doc|editors|electronics|embedded|fonts|games|gnome|gnustep|gnu-r|graphics|hamradio|haskell|httpd|interpreters|java|kde|kernel|libs|libdevel|lisp|localization|mail|math|misc|net|news|ocaml|oldlibs|otherosfs|perl|php|python|ruby|science|shells|sound|text|tex|utils|vcs|video|web|x11|xfce|zope)"
- syn match debcontrolPackageType contained "u\?deb"
- syn match debcontrolVariable contained "\${.\{-}}"
- syn match debcontrolDmUpload contained "\cyes"
-@@ -41,7 +41,7 @@
- syn match debcontrolHTTPUrl contained "\vhttps?://[[:alnum:]][-[:alnum:]]*[[:alnum:]]?(\.[[:alnum:]][-[:alnum:]]*[[:alnum:]]?)*\.[[:alpha:]][-[:alnum:]]*[[:alpha:]]?(:\d+)?(/[^[:space:]]*)?$"
- syn match debcontrolVcsSvn contained "\vsvn%(\+ssh)?://[[:alnum:]][-[:alnum:]]*[[:alnum:]]?(\.[[:alnum:]][-[:alnum:]]*[[:alnum:]]?)*\.[[:alpha:]][-[:alnum:]]*[[:alpha:]]?(:\d+)?(/[^[:space:]]*)?$"
- syn match debcontrolVcsCvs contained "\v%(\-d *)?:pserver:[^@]+\@[[:alnum:]][-[:alnum:]]*[[:alnum:]]?(\.[[:alnum:]][-[:alnum:]]*[[:alnum:]]?)*\.[[:alpha:]][-[:alnum:]]*[[:alpha:]]?:/[^[:space:]]*%( [^[:space:]]+)?$"
--syn match debcontrolVcsGit contained "\vgit://[[:alnum:]][-[:alnum:]]*[[:alnum:]]?(\.[[:alnum:]][-[:alnum:]]*[[:alnum:]]?)*\.[[:alpha:]][-[:alnum:]]*[[:alpha:]]?(:\d+)?(/[^[:space:]]*)?$"
-+syn match debcontrolVcsGit contained "\v%(git|http)://[[:alnum:]][-[:alnum:]]*[[:alnum:]]?(\.[[:alnum:]][-[:alnum:]]*[[:alnum:]]?)*\.[[:alpha:]][-[:alnum:]]*[[:alpha:]]?(:\d+)?(/[^[:space:]]*)?$"
- 
- " An email address
- syn match	debcontrolEmail	"[_=[:alnum:]\.+-]\+@[[:alnum:]\./\-]\+"
-@@ -53,7 +53,7 @@
- syn case ignore
- 
- " List of all legal keys
--syn match debcontrolKey contained "^\(Source\|Package\|Section\|Priority\|Maintainer\|Uploaders\|Build-Depends\|Build-Conflicts\|Build-Depends-Indep\|Build-Conflicts-Indep\|Standards-Version\|Pre-Depends\|Depends\|Recommends\|Suggests\|Provides\|Replaces\|Conflicts\|Essential\|Architecture\|Description\|Bugs\|Origin\|Enhances\|Homepage\|\(XS-\)\=Vcs-\(Browser\|Arch\|Bzr\|Cvs\|Darcs\|Git\|Hg\|Mtn\|Svn\)\|XC-Package-Type\|\%(XS-\)\=DM-Upload-Allowed\): *"
-+syn match debcontrolKey contained "^\%(Source\|Package\|Section\|Priority\|\%(XSBC-Original-\)\=Maintainer\|Uploaders\|Build-\%(Conflicts\|Depends\)\%(-Indep\)\=\|Standards-Version\|\%(Pre-\)\=Depends\|Recommends\|Suggests\|Provides\|Replaces\|Conflicts\|Enhances\|Essential\|Architecture\|Description\|Bugs\|Origin\|X[SB]-Python-Version\|Homepage\|\(XS-\)\=Vcs-\(Browser\|Arch\|Bzr\|Cvs\|Darcs\|Git\|Hg\|Mtn\|Svn\)\|XC-Package-Type\|\%(XS-\)\=DM-Upload-Allowed\): *"
- 
- " Fields for which we do strict syntax checking
- syn region debcontrolStrictField start="^Architecture" end="$" contains=debcontrolKey,debcontrolArchitecture,debcontrolSpace oneline
-@@ -62,15 +62,15 @@
- syn region debcontrolStrictField start="^Section" end="$" contains=debcontrolKey,debcontrolSection oneline
- syn region debcontrolStrictField start="^XC-Package-Type" end="$" contains=debcontrolKey,debcontrolPackageType oneline
- syn region debcontrolStrictField start="^Homepage" end="$" contains=debcontrolKey,debcontrolHTTPUrl oneline keepend
--syn region debcontrolStrictField start="^\%(XS-\)\?Vcs-\%(Browser\|Arch\|Bzr\|Darcs\|Hg\)" end="$" contains=debcontrolKey,debcontrolHTTPUrl oneline keepend
--syn region debcontrolStrictField start="^\%(XS-\)\?Vcs-Svn" end="$" contains=debcontrolKey,debcontrolVcsSvn,debcontrolHTTPUrl oneline keepend
--syn region debcontrolStrictField start="^\%(XS-\)\?Vcs-Cvs" end="$" contains=debcontrolKey,debcontrolVcsCvs oneline keepend
--syn region debcontrolStrictField start="^\%(XS-\)\?Vcs-Git" end="$" contains=debcontrolKey,debcontrolVcsGit oneline keepend
--syn region debcontrolStrictField start="^\%(XS-\)\?DM-Upload-Allowed" end="$" contains=debcontrolKey,debcontrolDmUpload oneline
-+syn region debcontrolStrictField start="^\%(XS-\)\=Vcs-\%(Browser\|Arch\|Bzr\|Darcs\|Hg\)" end="$" contains=debcontrolKey,debcontrolHTTPUrl oneline keepend
-+syn region debcontrolStrictField start="^\%(XS-\)\=Vcs-Svn" end="$" contains=debcontrolKey,debcontrolVcsSvn,debcontrolHTTPUrl oneline keepend
-+syn region debcontrolStrictField start="^\%(XS-\)\=Vcs-Cvs" end="$" contains=debcontrolKey,debcontrolVcsCvs oneline keepend
-+syn region debcontrolStrictField start="^\%(XS-\)\=Vcs-Git" end="$" contains=debcontrolKey,debcontrolVcsGit oneline keepend
-+syn region debcontrolStrictField start="^\%(XS-\)\=DM-Upload-Allowed" end="$" contains=debcontrolKey,debcontrolDmUpload oneline
- 
- " Catch-all for the other legal fields
--syn region debcontrolField start="^\(Maintainer\|Standards-Version\|Essential\|Bugs\|Origin\|X\(S\|B\)-Python-Version\|XSBC-Original-Maintainer\|\(XS-\)\?Vcs-Mtn\):" end="$" contains=debcontrolKey,debcontrolVariable,debcontrolEmail oneline
--syn region debcontrolMultiField start="^\(Build-\(Conflicts\|Depends\)\(-Indep\)\=\|\(Pre-\)\=Depends\|Recommends\|Suggests\|Provides\|Replaces\|Conflicts\|Enhances\|Uploaders\|Description\):" skip="^ " end="^$"me=s-1 end="^[^ ]"me=s-1 contains=debcontrolKey,debcontrolEmail,debcontrolVariable
-+syn region debcontrolField start="^\%(\%(XSBC-Original-\)\=Maintainer\|Standards-Version\|Essential\|Bugs\|Origin\|X[SB]-Python-Version\|\%(XS-\)\=Vcs-Mtn\):" end="$" contains=debcontrolKey,debcontrolVariable,debcontrolEmail oneline
-+syn region debcontrolMultiField start="^\%(Build-\%(Conflicts\|Depends\)\%(-Indep\)\=\|\%(Pre-\)\=Depends\|Recommends\|Suggests\|Provides\|Replaces\|Conflicts\|Enhances\|Uploaders\|Description\):" skip="^ " end="^$"me=s-1 end="^[^ #]"me=s-1 contains=debcontrolKey,debcontrolEmail,debcontrolVariable,debcontrolComment
- 
- " Associate our matches and regions with pretty colours
- if version >= 508 || !exists("did_debcontrol_syn_inits")
-diff -u -r --new-file runtime/syntax.orig/debsources.vim runtime/syntax/debsources.vim
---- runtime/syntax.orig/debsources.vim	2008-07-06 12:51:40.000000000 -0500
-+++ runtime/syntax/debsources.vim	2009-09-18 05:28:22.000000000 -0500
-@@ -2,7 +2,7 @@
- " Language:     Debian sources.list
- " Maintainer:   Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
- " Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl>
--" Last Change: 2008-04-25
-+" Last Change: 2009 Apr 17
- " URL: http://git.debian.org/?p=pkg-vim/vim.git;a=blob_plain;f=runtime/syntax/debsources.vim;hb=debian
- 
- " Standard syntax initialization
-@@ -19,11 +19,11 @@
- syn match debsourcesKeyword        /\(deb-src\|deb\|main\|contrib\|non-free\|restricted\|universe\|multiverse\)/
- 
- " Match comments
--syn match debsourcesComment        /#.*/
-+syn match debsourcesComment        /#.*/  contains=@Spell
- 
- " Match uri's
- syn match debsourcesUri            +\(http://\|ftp://\|[rs]sh://\|debtorrent://\|\(cdrom\|copy\|file\):\)[^' 	<>"]\++
--syn match debsourcesDistrKeyword   +\([[:alnum:]_./]*\)\(sarge\|etch\|lenny\|\(old\)\=stable\|testing\|unstable\|sid\|experimental\|dapper\|feisty\|gutsy\|hardy\|intrepid\)\([-[:alnum:]_./]*\)+
-+syn match debsourcesDistrKeyword   +\([[:alnum:]_./]*\)\(etch\|lenny\|squeeze\|\(old\)\=stable\|testing\|unstable\|sid\|experimental\|dapper\|hardy\|intrepid\|jaunty\|karmic\)\([-[:alnum:]_./]*\)+
- 
- " Associate our matches and regions with pretty colours
- hi def link debsourcesLine            Error
-diff -u -r --new-file runtime/syntax.orig/django.vim runtime/syntax/django.vim
---- runtime/syntax.orig/django.vim	2007-05-06 05:32:18.000000000 -0500
-+++ runtime/syntax/django.vim	2009-01-14 14:15:05.000000000 -0600
-@@ -1,7 +1,7 @@
- " Vim syntax file
- " Language:	Django template
- " Maintainer:	Dave Hodder <dmh@dmh.org.uk>
--" Last Change:	2007 Apr 21
-+" Last Change:	2008 Dec 18
- 
- " For version 5.x: Clear all syntax items
- " For version 6.x: Quit when a syntax file was already loaded
-@@ -18,8 +18,9 @@
- 
- " Django template built-in tags and parameters
- " 'comment' doesn't appear here because it gets special treatment
-+syn keyword djangoStatement contained autoescape on off endautoescape
- syn keyword djangoStatement contained and as block endblock by cycle debug else
--syn keyword djangoStatement contained extends filter endfilter firstof for
-+syn keyword djangoStatement contained extends filter endfilter firstof for empty
- syn keyword djangoStatement contained endfor if endif ifchanged endifchanged
- syn keyword djangoStatement contained ifequal endifequal ifnotequal
- syn keyword djangoStatement contained endifnotequal in include load not now or
-@@ -35,15 +36,15 @@
- " Django templete built-in filters
- syn keyword djangoFilter contained add addslashes capfirst center cut date
- syn keyword djangoFilter contained default default_if_none dictsort
--syn keyword djangoFilter contained dictsortreversed divisibleby escape
-+syn keyword djangoFilter contained dictsortreversed divisibleby escape escapejs
- syn keyword djangoFilter contained filesizeformat first fix_ampersands
--syn keyword djangoFilter contained floatformat get_digit join length length_is
-+syn keyword djangoFilter contained floatformat force_escape get_digit iriencode join last length length_is
- syn keyword djangoFilter contained linebreaks linebreaksbr linenumbers ljust
- syn keyword djangoFilter contained lower make_list phone2numeric pluralize
--syn keyword djangoFilter contained pprint random removetags rjust slice slugify
-+syn keyword djangoFilter contained pprint random removetags rjust safe slice slugify
- syn keyword djangoFilter contained stringformat striptags
- syn keyword djangoFilter contained time timesince timeuntil title
--syn keyword djangoFilter contained truncatewords unordered_list upper urlencode
-+syn keyword djangoFilter contained truncatewords truncatewords_html unordered_list upper urlencode
- syn keyword djangoFilter contained urlize urlizetrunc wordcount wordwrap yesno
- 
- " Keywords to highlight within comments
-diff -u -r --new-file runtime/syntax.orig/dosbatch.vim runtime/syntax/dosbatch.vim
---- runtime/syntax.orig/dosbatch.vim	2008-05-10 15:38:38.000000000 -0500
-+++ runtime/syntax/dosbatch.vim	2009-09-18 05:28:22.000000000 -0500
-@@ -2,7 +2,7 @@
- " Language:	MSDOS batch file (with NT command extensions)
- " Maintainer:	Mike Williams <mrw@eandem.co.uk>
- " Filenames:    *.bat
--" Last Change:	10th May 2008
-+" Last Change:	6th September 2009
- " Web Page:     http://www.eandem.co.uk/mrw/vim
- "
- " Options Flags:
-@@ -36,7 +36,7 @@
- syn case match
- syn keyword dosbatchOperator    EQU NEQ LSS LEQ GTR GEQ
- syn case ignore
--syn match dosbatchOperator      "\s[-+\*/%]\s"
-+syn match dosbatchOperator      "\s[-+\*/%!~]\s"
- syn match dosbatchOperator      "="
- syn match dosbatchOperator      "[-+\*/%]="
- syn match dosbatchOperator      "\s\(&\||\|^\|<<\|>>\)=\=\s"
-@@ -51,10 +51,10 @@
- syn match dosbatchCmd		"(\s*'[^']*'"lc=1 contains=dosbatchString,dosbatchVariable,dosBatchArgument,@dosbatchNumber,dosbatchImplicit,dosbatchStatement,dosbatchConditional,dosbatchRepeat,dosbatchOperator
- 
- " Numbers - surround with ws to not include in dir and filenames
--syn match dosbatchInteger       "[[:space:]=(/:]\d\+"lc=1
--syn match dosbatchHex		"[[:space:]=(/:]0x\x\+"lc=1
--syn match dosbatchBinary	"[[:space:]=(/:]0b[01]\+"lc=1
--syn match dosbatchOctal		"[[:space:]=(/:]0\o\+"lc=1
-+syn match dosbatchInteger       "[[:space:]=(/:,!~-]\d\+"lc=1
-+syn match dosbatchHex		"[[:space:]=(/:,!~-]0x\x\+"lc=1
-+syn match dosbatchBinary	"[[:space:]=(/:,!~-]0b[01]\+"lc=1
-+syn match dosbatchOctal		"[[:space:]=(/:,!~-]0\o\+"lc=1
- syn cluster dosbatchNumber      contains=dosbatchInteger,dosbatchHex,dosbatchBinary,dosbatchOctal
- 
- " Command line switches
-@@ -69,15 +69,15 @@
- syn match dosbatchIdentifier    contained "\s\h\w*\>"
- syn match dosbatchVariable	"%\h\w*%"
- syn match dosbatchVariable	"%\h\w*:\*\=[^=]*=[^%]*%"
--syn match dosbatchVariable	"%\h\w*:\~\d\+,\d\+%" contains=dosbatchInteger
-+syn match dosbatchVariable	"%\h\w*:\~[-]\=\d\+\(,[-]\=\d\+\)\=%" contains=dosbatchInteger
- syn match dosbatchVariable	"!\h\w*!"
--syn match dosbatchVariable	"!\h\w*:\*\=[^=]*=[^%]*!"
--syn match dosbatchVariable	"!\h\w*:\~\d\+,\d\+!" contains=dosbatchInteger
-+syn match dosbatchVariable	"!\h\w*:\*\=[^=]*=[^!]*!"
-+syn match dosbatchVariable	"!\h\w*:\~[-]\=\d\+\(,[-]\=\d\+\)\=!" contains=dosbatchInteger
- syn match dosbatchSet		"\s\h\w*[+-]\==\{-1}" contains=dosbatchIdentifier,dosbatchOperator
- 
- " Args to bat files and for loops, etc
- syn match dosbatchArgument	"%\(\d\|\*\)"
--syn match dosbatchArgument	"%%[a-z]\>"
-+syn match dosbatchArgument	"%[a-z]\>"
- if dosbatch_cmdextversion == 1
-   syn match dosbatchArgument	"%\~[fdpnxs]\+\(\($PATH:\)\=[a-z]\|\d\)\>"
- else
-@@ -92,7 +92,9 @@
- 
- " Comments - usual rem but also two colons as first non-space is an idiom
- syn match dosbatchComment	"^rem\($\|\s.*$\)"lc=3 contains=dosbatchTodo,dosbatchSpecialChar,@dosbatchNumber,dosbatchVariable,dosbatchArgument,@Spell
-+syn match dosbatchComment	"^@rem\($\|\s.*$\)"lc=4 contains=dosbatchTodo,@dosbatchNumber,dosbatchVariable,dosbatchArgument,@Spell
- syn match dosbatchComment	"\srem\($\|\s.*$\)"lc=4 contains=dosbatchTodo,dosbatchSpecialChar,@dosbatchNumber,dosbatchVariable,dosbatchArgument,@Spell
-+syn match dosbatchComment	"\s@rem\($\|\s.*$\)"lc=5 contains=dosbatchTodo,@dosbatchNumber,dosbatchVariable,dosbatchArgument,@Spell
- syn match dosbatchComment	"\s*:\s*:.*$" contains=dosbatchTodo,dosbatchSpecialChar,@dosbatchNumber,dosbatchVariable,dosbatchArgument,@Spell
- 
- " Comments in ()'s - still to handle spaces before rem
-diff -u -r --new-file runtime/syntax.orig/doxygen.vim runtime/syntax/doxygen.vim
---- runtime/syntax.orig/doxygen.vim	2008-07-22 13:41:00.000000000 -0500
-+++ runtime/syntax/doxygen.vim	2009-01-28 10:23:36.000000000 -0600
-@@ -2,8 +2,8 @@
- " Language:     doxygen on top of c, cpp, idl, java, php
- " Maintainer:   Michael Geddes <vimmer@frog.wheelycreek.net>
- " Author:       Michael Geddes
--" Last Change:  July 2008
--" Version:      1.22
-+" Last Change:  Jan 2009
-+" Version:      1.23
- "
- " Copyright 2004-2008 Michael Geddes
- " Please feel free to use, modify & distribute all or part of this script,
-@@ -239,7 +239,7 @@
-   " #Link hilighting.
-   syn match doxygenHashLink /\([a-zA-Z_][0-9a-zA-Z_]*\)\?#\(\.[0-9a-zA-Z_]\@=\|[a-zA-Z0-9_]\+\|::\|()\)\+/ contained contains=doxygenHashSpecial
-   syn match doxygenHashSpecial /#/ contained
--  syn match doxygenHyperLink /\(\s\|^\s*\*\?\)\@<=\(http\|https\|ftp\):\/\/[-0-9a-zA-Z_?&=+#%/.!':;@]\+/ contained
-+  syn match doxygenHyperLink /\(\s\|^\s*\*\?\)\@<=\(http\|https\|ftp\):\/\/[-0-9a-zA-Z_?&=+#%/.!':;@~]\+/ contained
- 
-   " Handle \page.  This does not use doxygenBrief.
-   syn match doxygenPage "[\\@]page\>"me=s+1 contained skipwhite nextgroup=doxygenPagePage
-diff -u -r --new-file runtime/syntax.orig/erlang.vim runtime/syntax/erlang.vim
---- runtime/syntax.orig/erlang.vim	2008-03-15 09:01:37.000000000 -0500
-+++ runtime/syntax/erlang.vim	2009-11-28 06:33:42.000000000 -0600
-@@ -50,7 +50,7 @@
-     " Operators
-     syn match   erlangOperator         "+\|-\|\*\|\/"
-     syn keyword erlangOperator         div rem or xor bor bxor bsl bsr
--    syn keyword erlangOperator         and band not bnot
-+    syn keyword erlangOperator         and band not bnot andalso orelse
-     syn match   erlangOperator         "==\|/=\|=:=\|=/=\|<\|=<\|>\|>="
-     syn match   erlangOperator         "++\|--\|=\|!\|<-"
- 
-@@ -123,7 +123,7 @@
- 
- if ! exists ("erlang_keywords")
-     " Constants and Directives
--    syn match   erlangDirective  "-behaviour\|-behaviour"
-+    syn match   erlangDirective  "-behaviour\|-behavior"
-     syn match   erlangDirective  "-compile\|-define\|-else\|-endif\|-export\|-file"
-     syn match   erlangDirective  "-ifdef\|-ifndef\|-import\|-include_lib\|-include"
-     syn match   erlangDirective  "-module\|-record\|-undef"
-diff -u -r --new-file runtime/syntax.orig/form.vim runtime/syntax/form.vim
---- runtime/syntax.orig/form.vim	2004-06-07 09:32:35.000000000 -0500
-+++ runtime/syntax/form.vim	2009-12-16 14:38:20.000000000 -0600
-@@ -1,7 +1,10 @@
- " Vim syntax file
- " Language:	FORM
-+" Version: 2.0
- " Maintainer:	Michael M. Tung <michael.tung@uni-mainz.de>
--" Last Change:	2001 May 10
-+" Last Change: <Thu Oct 23 13:11:21 CEST 2008>
-+" Past Change: <October 2008 Thomas Reiter thomasr@nikhef.nl>
-+" Past Change: <Wed, 2005/05/25 09:24:58 arwagner wptx44>
- 
- " First public release based on 'Symbolic Manipulation with FORM'
- " by J.A.M. Vermaseren, CAN, Netherlands, 1991.
-@@ -18,30 +21,73 @@
- 
- syn case ignore
- 
--" A bunch of useful FORM keywords
-+" a bunch of useful FORM keywords
- syn keyword formType		global local
- syn keyword formHeaderStatement	symbol symbols cfunction cfunctions
- syn keyword formHeaderStatement	function functions vector vectors
--syn keyword formHeaderStatement	set sets index indices
-+syn keyword formHeaderStatement tensor tensors ctensor ctensors
-+syn keyword formHeaderStatement	set sets index indices table ctable
- syn keyword formHeaderStatement	dimension dimensions unittrace
--syn keyword formStatement	id identify drop skip
--syn keyword formStatement	write nwrite
--syn keyword formStatement	format print nprint load save
--syn keyword formStatement	bracket brackets
--syn keyword formStatement	multiply count match only discard
--syn keyword formStatement	trace4 traceN contract symmetrize antisymmetrize
--syn keyword formConditional	if else endif while
-+syn keyword formConditional	if else elseif endif while
- syn keyword formConditional	repeat endrepeat label goto
-+syn keyword formConditional     argument endargument exit
-+syn keyword formConditional     inexpression inside term
-+syn keyword formConditional     endinexpression endinside endterm
-+syn keyword formStatement       abrackets also antibrackets antisymmetrize
-+syn keyword formStatement       argexplode argimplode apply auto autodeclare
-+syn keyword formStatement       brackets chainin chainout chisholm cleartable
-+syn keyword formStatement       collect commuting compress contract
-+syn keyword formStatement       cyclesymmetrize deallocatetable delete
-+syn keyword formStatement       dimension discard disorder drop factarg fill
-+syn keyword formStatement       fillexpression fixindex format funpowers hide
-+syn keyword formStatement       identify idnew idold ifmatch inparallel
-+syn keyword formStatement       insidefirst keep load makeinteger many metric
-+syn keyword formStatement       moduleoption modulus multi multiply ndrop
-+syn keyword formStatement       nfunctions nhide normalize notinparallel
-+syn keyword formStatement       nprint nskip ntable ntensors nunhide nwrite
-+syn keyword formStatement       off on once only polyfun pophide print
-+syn keyword formStatement       printtable propercount pushhide ratio
-+syn keyword formStatement       rcyclesymmetrize redefine renumber
-+syn keyword formStatement       replaceinarg replaceloop save select
-+syn keyword formStatement       setexitflag skip slavepatchsize sort splitarg
-+syn keyword formStatement       splitfirstarg splitlastarg sum symmetrize
-+syn keyword formStatement       tablebase testuse threadbucketsize totensor
-+syn keyword formStatement       tovector trace4 tracen tryreplace unhide
-+syn keyword formStatement       unittrace vectors write
-+" for compatibility with older FORM versions:
-+syn keyword formStatement       id bracket count match traceN
- 
- " some special functions
--syn keyword formStatement	g_ gi_ g5_ g6_ g7_ 5_ 6_ 7_
--syn keyword formStatement	e_ d_ delta_ theta_ sum_ sump_
-+syn keyword formStatement       abs_ bernoulli_ binom_ conjg_ count_
-+syn keyword formStatement       d_ dd_ delta_ deltap_ denom_ distrib_
-+syn keyword formStatement       dum_ dummy_ dummyten_ e_ exp_ fac_
-+syn keyword formStatement       factorin_ firstbracket_ g5_ g6_ g7_
-+syn keyword formStatement       g_ gcd_ gi_ integer_ invfac_ match_
-+syn keyword formStatement       max_ maxpowerof_ min_ minpowerof_
-+syn keyword formStatement       mod_ nargs_ nterms_ pattern_ poly_
-+syn keyword formStatement       polyadd_ polydiv_ polygcd_ polyintfac_
-+syn keyword formStatement       polymul_ polynorm_ polyrem_ polysub_
-+syn keyword formStatement       replace_ reverse_ root_ setfun_ sig_
-+syn keyword formStatement       sign_ sum_ sump_ table_ tbl_ term_
-+syn keyword formStatement       termsin_ termsinbracket_ theta_ thetap_ 
-+syn keyword formStatement	5_ 6_ 7_
-+
-+syn keyword formReserved        sqrt_ ln_ sin_ cos_ tan_ asin_ acos_
-+syn keyword formReserved        atan_ atan2_ sinh_ cosh_ tanh_ asinh_
-+syn keyword formReserved        acosh_ atanh_ li2_ lin_ 
-+
-+syn keyword formTodo            contained TODO FIXME XXX
-+
-+syn match   formSpecial         display contained "\\\(n\|t\|b\|\\\|\"\)"
-+syn match   formSpecial         display contained "%\(%\|e\|E\|s\|f\|\$\)"
-+syn match   formSpecial         "\<N\d\+_[?]"
- 
- " pattern matching for keywords
--syn match   formComment		"^\ *\*.*$"
--syn match   formComment		"\;\ *\*.*$"
--syn region  formString		start=+"+  end=+"+
-+syn match   formComment		"^\ *\*.*$" contains=formTodo
-+syn match   formComment		"\;\ *\*.*$" contains=formTodo
-+syn region  formString		start=+"+  end=+"+ contains=formSpecial
- syn region  formString		start=+'+  end=+'+
-+syn region  formNestedString	start=+`+  end=+'+ contains=formNestedString
- syn match   formPreProc		"^\=\#[a-zA-z][a-zA-Z0-9]*\>"
- syn match   formNumber		"\<\d\+\>"
- syn match   formNumber		"\<\d\+\.\d*\>"
-@@ -50,6 +96,13 @@
- syn match   formNumber		"-\.\d" contains=Number
- syn match   formNumber		"i_\+\>"
- syn match   formNumber		"fac_\+\>"
-+" pattern matching wildcards
-+syn match   formNumber		"?[A-z0-9]*"
-+" dollar-variables (new in 3.x)
-+syn match   formNumber		"\\$[A-z0-9]*"
-+" scalar products
-+syn match   formNumber		"^\=[a-zA-z][a-zA-Z0-9]*\.[a-zA-z][a-zA-Z0-9]*\>"
-+
- syn match   formDirective	"^\=\.[a-zA-z][a-zA-Z0-9]*\>"
- 
- " hi User Labels
-@@ -74,6 +127,10 @@
-   HiLink formDirective		PreProc
-   HiLink formType		Type
-   HiLink formString		String
-+  HiLink formNestedString	String
-+  HiLink formReserved           Error
-+  HiLink formTodo               Todo
-+  HiLink formSpecial            SpecialChar
- 
-   if !exists("form_enhanced_color")
-     HiLink formHeaderStatement	Statement
-diff -u -r --new-file runtime/syntax.orig/fortran.vim runtime/syntax/fortran.vim
---- runtime/syntax.orig/fortran.vim	2006-04-22 06:22:12.000000000 -0500
-+++ runtime/syntax/fortran.vim	2008-11-06 10:05:04.000000000 -0600
-@@ -2,7 +2,7 @@
- " Language:	Fortran95 (and Fortran90, Fortran77, F and elf90)
- " Version:	0.88
- " URL:		http://www.unb.ca/chem/ajit/syntax/fortran.vim
--" Last Change:	2006 Apr. 22
-+" Last Change:	2008 Nov 01
- " Maintainer:	Ajit J. Thakkar (ajit AT unb.ca); <http://www.unb.ca/chem/ajit/>
- " Usage:	Do :help fortran-syntax from Vim
- " Credits:
-@@ -300,7 +300,7 @@
-     syn match fortranLabelError	"^.\{-,4}[^0-9 ]" contains=fortranTab
-     syn match fortranLabelError	"^.\{4}\d\S"
-   endif
--  syn match fortranComment		excludenl "^[!c*].*$" contains=@fortranCommentGroup
-+  syn match fortranComment		excludenl "^[!c*].*$" contains=@fortranCommentGroup,@spell
-   syn match fortranLeftMargin		transparent "^ \{5}"
-   syn match fortranContinueMark		display "^.\{5}\S"lc=5
- else
-diff -u -r --new-file runtime/syntax.orig/fstab.vim runtime/syntax/fstab.vim
---- runtime/syntax.orig/fstab.vim	2008-01-16 14:52:16.000000000 -0600
-+++ runtime/syntax/fstab.vim	2009-02-12 16:23:26.000000000 -0600
-@@ -2,14 +2,15 @@
- " Language: fstab file
- " Maintaner: Radu Dineiu <radu.dineiu@gmail.com>
- " URL: http://ld.yi.org/vim/fstab.vim
--" Last Change: 2008 Jan 16
--" Version: 0.92
-+" Last Change: 2009 Feb 04
-+" Version: 0.93
- "
- " Credits:
- "   David Necas (Yeti) <yeti@physics.muni.cz>
- "   Stefano Zacchiroli <zack@debian.org>
- "   Georgi Georgiev <chutz@gg3.net>
- "   James Vega <jamessan@debian.org>
-+"   Elias Probst <mail@eliasprobst.eu>
- "
- " Options:
- "   let fstab_unknown_fs_errors = 1
-@@ -46,7 +47,7 @@
- " Type
- syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeUnknown
- syn match fsTypeUnknown /\s\+\zs\w\+/ contained
--syn keyword fsTypeKeyword contained adfs ados affs atfs audiofs auto autofs befs bfs cd9660 cfs cifs coda cramfs devfs devpts e2compr efs ext2 ext2fs ext3 fdesc ffs filecore fuse hfs hpfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix msdos ncpfs nfs none ntfs null nwfs overlay ovlfs portal proc procfs ptyfs qnx4 reiserfs romfs shm smbfs sshfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xfs zisofs
-+syn keyword fsTypeKeyword contained adfs ados affs atfs audiofs auto autofs befs bfs cd9660 cfs cifs coda cramfs devfs devpts e2compr efs ext2 ext2fs ext3 ext4 fdesc ffs filecore fuse hfs hpfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix msdos ncpfs nfs none ntfs null nwfs overlay ovlfs portal proc procfs ptyfs qnx4 reiserfs romfs shm smbfs sshfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xfs zisofs
- 
- " Options
- " -------
-@@ -91,7 +92,21 @@
- syn match fsOptionsKeywords contained /\<commit=/ nextgroup=fsOptionsNumber
- syn keyword fsOptionsExt3Journal contained update inum
- syn keyword fsOptionsExt3Data contained journal ordered writeback
--syn keyword fsOptionsKeywords contained noload
-+syn keyword fsOptionsKeywords contained noload user_xattr nouser_xattr acl noacl
-+
-+" Options: ext4
-+syn match fsOptionsKeywords contained /\<journal=/ nextgroup=fsOptionsExt4Journal
-+syn match fsOptionsKeywords contained /\<data=/ nextgroup=fsOptionsExt4Data
-+syn match fsOptionsKeywords contained /\<barrier=/ nextgroup=fsOptionsExt4Barrier
-+syn match fsOptionsKeywords contained /\<journal_dev=/ nextgroup=fsOptionsNumber
-+syn match fsOptionsKeywords contained /\<resuid=/ nextgroup=fsOptionsNumber
-+syn match fsOptionsKeywords contained /\<resgid=/ nextgroup=fsOptionsNumber
-+syn match fsOptionsKeywords contained /\<sb=/ nextgroup=fsOptionsNumber
-+syn match fsOptionsKeywords contained /\<commit=/ nextgroup=fsOptionsNumber
-+syn keyword fsOptionsExt4Journal contained update inum
-+syn keyword fsOptionsExt4Data contained journal ordered writeback
-+syn match fsOptionsExt4Barrier /[0-1]/
-+syn keyword fsOptionsKeywords contained noload extents orlov oldalloc user_xattr nouser_xattr acl noacl reservation noreservation bsddf minixdf check=none nocheck debug grpid nogroupid sysvgroups bsdgroups quota noquota grpquota usrquota bh nobh
- 
- " Options: fat
- syn match fsOptionsKeywords contained /\<blocksize=/ nextgroup=fsOptionsSize
-@@ -241,6 +256,9 @@
- 	HiLink fsOptionsExt2Errors String
- 	HiLink fsOptionsExt3Journal String
- 	HiLink fsOptionsExt3Data String
-+	HiLink fsOptionsExt4Journal String
-+	HiLink fsOptionsExt4Data String
-+	HiLink fsOptionsExt4Barrier Number
- 	HiLink fsOptionsFatCheck String
- 	HiLink fsOptionsConv String
- 	HiLink fsOptionsFatType Number
-diff -u -r --new-file runtime/syntax.orig/gdb.vim runtime/syntax/gdb.vim
---- runtime/syntax.orig/gdb.vim	2004-06-07 09:32:35.000000000 -0500
-+++ runtime/syntax/gdb.vim	2009-06-03 05:05:43.000000000 -0500
-@@ -2,7 +2,7 @@
- " Language:	GDB command files
- " Maintainer:	Claudio Fleiner <claudio@fleiner.com>
- " URL:		http://www.fleiner.com/vim/syntax/gdb.vim
--" Last Change:	2003 Jan 04
-+" Last Change:	2009 May 25
- 
- " For version 5.x: Clear all syntax items
- " For version 6.x: Quit when a syntax file was already loaded
-@@ -35,7 +35,7 @@
- " some commonly used abreviations
- syn keyword gdbStatement c disp undisp disas p
- 
--syn region gdbDocument matchgroup=gdbFuncDef start="\<document\>.*$" matchgroup=gdbFuncDef end="^end$"
-+syn region gdbDocument matchgroup=gdbFuncDef start="\<document\>.*$" matchgroup=gdbFuncDef end="^end\s*$"
- 
- syn match gdbStatement "\<add-shared-symbol-files\>"
- syn match gdbStatement "\<add-symbol-file\>"
-diff -u -r --new-file runtime/syntax.orig/git.vim runtime/syntax/git.vim
---- runtime/syntax.orig/git.vim	2008-04-15 22:15:49.000000000 -0500
-+++ runtime/syntax/git.vim	2009-12-24 10:29:21.000000000 -0600
-@@ -1,7 +1,7 @@
- " Vim syntax file
- " Language:	generic git output
--" Maintainer:	Tim Pope <vimNOSPAM@tpope.info>
--" Last Change:	2008 Mar 21
-+" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
-+" Last Change:	2009 Dec 24
- 
- if exists("b:current_syntax")
-     finish
-@@ -13,14 +13,19 @@
- syn include @gitDiff syntax/diff.vim
- 
- syn region gitHead start=/\%^/ end=/^$/
--syn region gitHead start=/\%(^commit \x\{40\}$\)\@=/ end=/^$/
-+syn region gitHead start=/\%(^commit \x\{40\}\%(\s*(.*)\)\=$\)\@=/ end=/^$/
- 
- " For git reflog and git show ...^{tree}, avoid sync issues
- syn match gitHead /^\d\{6\} \%(\w\{4} \)\=\x\{40\}\%( [0-3]\)\=\t.*/
- syn match gitHead /^\x\{40\} \x\{40}\t.*/
- 
--syn region gitDiff start=/^\%(diff --git \)\@=/ end=/^\%(diff --git \|$\)\@=/ contains=@gitDiff fold
--syn region gitDiff start=/^\%(@@ -\)\@=/ end=/^\%(diff --git \|$\)\@=/ contains=@gitDiff
-+syn region gitDiff start=/^\%(diff --git \)\@=/ end=/^\%(diff --\|$\)\@=/ contains=@gitDiff fold
-+syn region gitDiff start=/^\%(@@ -\)\@=/ end=/^\%(diff --\%(git\|cc\|combined\) \|$\)\@=/ contains=@gitDiff
-+
-+syn region gitDiffMerge start=/^\%(diff --\%(cc\|combined\) \)\@=/ end=/^\%(diff --\|$\)\@=/ contains=@gitDiff
-+syn region gitDiffMerge start=/^\%(@@@@* -\)\@=/ end=/^\%(diff --\|$\)\@=/ contains=@gitDiff
-+syn match gitDiffAdded "^ \++.*" contained containedin=gitDiffMerge
-+syn match gitDiffRemoved "^ \+-.*" contained containedin=gitDiffMerge
- 
- syn match  gitKeyword /^\%(object\|type\|tag\|commit\|tree\|parent\|encoding\)\>/ contained containedin=gitHead nextgroup=gitHash,gitType skipwhite
- syn match  gitKeyword /^\%(tag\>\|ref:\)/ contained containedin=gitHead nextgroup=gitReference skipwhite
-@@ -29,8 +34,6 @@
- syn match  gitIdentityKeyword /^\%(author\|committer\|tagger\)\>/ contained containedin=gitHead nextgroup=gitIdentity skipwhite
- syn match  gitIdentityHeader /^\%(Author\|Commit\|Tagger\):/ contained containedin=gitHead nextgroup=gitIdentity skipwhite
- syn match  gitDateHeader /^\%(AuthorDate\|CommitDate\|Date\):/ contained containedin=gitHead nextgroup=gitDate skipwhite
--syn match  gitIdentity /\S.\{-\} <[^>]*>/ contained nextgroup=gitDate skipwhite
--syn region gitEmail matchgroup=gitEmailDelimiter start=/</ end=/>/ keepend oneline contained containedin=gitIdentity
- 
- syn match  gitReflogHeader /^Reflog:/ contained containedin=gitHead nextgroup=gitReflogMiddle skipwhite
- syn match  gitReflogHeader /^Reflog message:/ contained containedin=gitHead skipwhite
-@@ -42,14 +45,20 @@
- syn match  gitType      /\<\%(tag\|commit\|tree\|blob\)\>/     contained nextgroup=gitHash skipwhite
- syn match  gitStage     /\<\d\t\@=/                            contained
- syn match  gitReference /\S\+\S\@!/                            contained
--syn match  gitHash      /\<\x\{40\}\>/                         contained nextgroup=gitIdentity,gitStage skipwhite
-+syn match  gitHash      /\<\x\{40\}\>/                         contained nextgroup=gitIdentity,gitStage,gitHash skipwhite
- syn match  gitHash      /^\<\x\{40\}\>/ containedin=gitHead contained nextgroup=gitHash skipwhite
-+syn match  gitHashAbbrev /\<\x\{4,40\}\>/           contained nextgroup=gitHashAbbrev skipwhite
- syn match  gitHashAbbrev /\<\x\{4,39\}\.\.\./he=e-3 contained nextgroup=gitHashAbbrev skipwhite
--syn match  gitHashAbbrev /\<\x\{40\}\>/             contained nextgroup=gitHashAbbrev skipwhite
-+
-+syn match  gitIdentity /\S.\{-\} <[^>]*>/ contained nextgroup=gitDate skipwhite
-+syn region gitEmail matchgroup=gitEmailDelimiter start=/</ end=/>/ keepend oneline contained containedin=gitIdentity
-+
-+syn match  gitNotesHeader /^Notes:\ze\n    /
- 
- hi def link gitDateHeader        gitIdentityHeader
- hi def link gitIdentityHeader    gitIdentityKeyword
- hi def link gitIdentityKeyword   Label
-+hi def link gitNotesHeader       gitKeyword
- hi def link gitReflogHeader      gitKeyword
- hi def link gitKeyword           Keyword
- hi def link gitIdentity          String
-@@ -63,5 +72,7 @@
- hi def link gitReference         Function
- hi def link gitStage             gitType
- hi def link gitType              Type
-+hi def link gitDiffAdded         diffAdded
-+hi def link gitDiffRemoved       diffRemoved
- 
- let b:current_syntax = "git"
-diff -u -r --new-file runtime/syntax.orig/gitcommit.vim runtime/syntax/gitcommit.vim
---- runtime/syntax.orig/gitcommit.vim	2008-04-15 17:46:45.000000000 -0500
-+++ runtime/syntax/gitcommit.vim	2009-12-24 10:29:21.000000000 -0600
-@@ -1,8 +1,8 @@
- " Vim syntax file
- " Language:	git commit file
--" Maintainer:	Tim Pope <vimNOSPAM@tpope.info>
-+" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
- " Filenames:	*.git/COMMIT_EDITMSG
--" Last Change:	2008 Apr 09
-+" Last Change:	2009 Dec 24
- 
- if exists("b:current_syntax")
-     finish
-@@ -16,48 +16,66 @@
- endif
- 
- syn include @gitcommitDiff syntax/diff.vim
--syn region gitcommitDiff start=/\%(^diff --git \)\@=/ end=/^$\|^#\@=/ contains=@gitcommitDiff
-+syn region gitcommitDiff start=/\%(^diff --\%(git\|cc\|combined\) \)\@=/ end=/^$\|^#\@=/ contains=@gitcommitDiff
- 
- syn match   gitcommitFirstLine	"\%^[^#].*"  nextgroup=gitcommitBlank skipnl
--syn match   gitcommitSummary  	"^.\{0,50\}" contained containedin=gitcommitFirstLine nextgroup=gitcommitOverflow contains=@Spell
-+syn match   gitcommitSummary	"^.\{0,50\}" contained containedin=gitcommitFirstLine nextgroup=gitcommitOverflow contains=@Spell
- syn match   gitcommitOverflow	".*" contained contains=@Spell
- syn match   gitcommitBlank	"^[^#].*" contained contains=@Spell
- syn match   gitcommitComment	"^#.*"
--syn region  gitcommitHead	start=/^#   / end=/^#$/ contained transparent
-+syn match   gitcommitHead	"^\%(#   .*\n\)\+#$" contained transparent
- syn match   gitcommitOnBranch	"\%(^# \)\@<=On branch" contained containedin=gitcommitComment nextgroup=gitcommitBranch skipwhite
--syn match   gitcommitBranch	"\S\+" contained
-+syn match   gitcommitOnBranch	"\%(^# \)\@<=Your branch .\{-\} '" contained containedin=gitcommitComment nextgroup=gitcommitBranch skipwhite
-+syn match   gitcommitBranch	"[^ \t']\+" contained
-+syn match   gitcommitNoBranch	"\%(^# \)\@<=Not currently on any branch." contained containedin=gitcommitComment
- syn match   gitcommitHeader	"\%(^# \)\@<=.*:$"	contained containedin=gitcommitComment
-+syn region  gitcommitAuthor	matchgroup=gitCommitHeader start=/\%(^# \)\@<=Author:/ end=/$/ keepend oneline contained containedin=gitcommitComment transparent
-+syn match   gitcommitNoChanges	"\%(^# \)\@<=No changes$" contained containedin=gitcommitComment
- 
- syn region  gitcommitUntracked	start=/^# Untracked files:/ end=/^#$\|^#\@!/ contains=gitcommitHeader,gitcommitHead,gitcommitUntrackedFile fold
- syn match   gitcommitUntrackedFile  "\t\@<=.*"	contained
- 
- syn region  gitcommitDiscarded	start=/^# Changed but not updated:/ end=/^#$\|^#\@!/ contains=gitcommitHeader,gitcommitHead,gitcommitDiscardedType fold
- syn region  gitcommitSelected	start=/^# Changes to be committed:/ end=/^#$\|^#\@!/ contains=gitcommitHeader,gitcommitHead,gitcommitSelectedType fold
-+syn region  gitcommitUnmerged	start=/^# Unmerged paths:/ end=/^#$\|^#\@!/ contains=gitcommitHeader,gitcommitHead,gitcommitUnmergedType fold
- 
- syn match   gitcommitDiscardedType	"\t\@<=[a-z][a-z ]*[a-z]: "he=e-2	contained containedin=gitcommitComment nextgroup=gitcommitDiscardedFile skipwhite
- syn match   gitcommitSelectedType	"\t\@<=[a-z][a-z ]*[a-z]: "he=e-2	contained containedin=gitcommitComment nextgroup=gitcommitSelectedFile skipwhite
-+syn match   gitcommitUnmergedType	"\t\@<=[a-z][a-z ]*[a-z]: "he=e-2	contained containedin=gitcommitComment nextgroup=gitcommitUnmergedFile skipwhite
- syn match   gitcommitDiscardedFile	".\{-\}\%($\| -> \)\@=" contained nextgroup=gitcommitDiscardedArrow
- syn match   gitcommitSelectedFile	".\{-\}\%($\| -> \)\@=" contained nextgroup=gitcommitSelectedArrow
-+syn match   gitcommitUnmergedFile	".\{-\}\%($\| -> \)\@=" contained nextgroup=gitcommitSelectedArrow
- syn match   gitcommitDiscardedArrow	" -> " contained nextgroup=gitcommitDiscardedFile
- syn match   gitcommitSelectedArrow	" -> " contained nextgroup=gitcommitSelectedFile
-+syn match   gitcommitUnmergedArrow	" -> " contained nextgroup=gitcommitSelectedFile
-+
-+syn match   gitcommitWarning		"\%^[^#].*: needs merge$" nextgroup=gitcommitWarning skipnl
-+syn match   gitcommitWarning		"^[^#].*: needs merge$" nextgroup=gitcommitWarning skipnl contained
-+syn match   gitcommitWarning		"^\%(no changes added to commit\|nothing \%(added \)\=to commit\)\>.*\%$"
- 
- hi def link gitcommitSummary		Keyword
- hi def link gitcommitComment		Comment
- hi def link gitcommitUntracked		gitcommitComment
- hi def link gitcommitDiscarded		gitcommitComment
- hi def link gitcommitSelected		gitcommitComment
-+hi def link gitcommitUnmerged		gitcommitComment
- hi def link gitcommitOnBranch		Comment
- hi def link gitcommitBranch		Special
-+hi def link gitcommitNoBranch		gitCommitBranch
- hi def link gitcommitDiscardedType	gitcommitType
- hi def link gitcommitSelectedType	gitcommitType
-+hi def link gitcommitUnmergedType	gitcommitType
- hi def link gitcommitType		Type
-+hi def link gitcommitNoChanges		gitcommitHeader
- hi def link gitcommitHeader		PreProc
- hi def link gitcommitUntrackedFile	gitcommitFile
- hi def link gitcommitDiscardedFile	gitcommitFile
- hi def link gitcommitSelectedFile	gitcommitFile
-+hi def link gitcommitUnmergedFile	gitcommitFile
- hi def link gitcommitFile		Constant
- hi def link gitcommitDiscardedArrow	gitcommitArrow
- hi def link gitcommitSelectedArrow	gitcommitArrow
-+hi def link gitcommitUnmergedArrow	gitcommitArrow
- hi def link gitcommitArrow		gitcommitComment
- "hi def link gitcommitOverflow		Error
- hi def link gitcommitBlank		Error
-diff -u -r --new-file runtime/syntax.orig/gitconfig.vim runtime/syntax/gitconfig.vim
---- runtime/syntax.orig/gitconfig.vim	2008-06-04 10:45:44.000000000 -0500
-+++ runtime/syntax/gitconfig.vim	2009-12-24 10:29:21.000000000 -0600
-@@ -1,8 +1,8 @@
- " Vim syntax file
- " Language:	git config file
--" Maintainer:	Tim Pope <vimNOSPAM@tpope.info>
-+" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
- " Filenames:	gitconfig, .gitconfig, *.git/config
--" Last Change:	2008 Jun 04
-+" Last Change:	2009 Dec 24
- 
- if exists("b:current_syntax")
-     finish
-diff -u -r --new-file runtime/syntax.orig/gitrebase.vim runtime/syntax/gitrebase.vim
---- runtime/syntax.orig/gitrebase.vim	2008-04-16 03:12:25.000000000 -0500
-+++ runtime/syntax/gitrebase.vim	2009-12-24 10:29:21.000000000 -0600
-@@ -1,8 +1,8 @@
- " Vim syntax file
- " Language:	git rebase --interactive
--" Maintainer:	Tim Pope <vimNOSPAM@tpope.info>
-+" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
- " Filenames:	git-rebase-todo
--" Last Change:	2008 Apr 16
-+" Last Change:	2009 Dec 24
- 
- if exists("b:current_syntax")
-     finish
-@@ -14,6 +14,7 @@
- syn match   gitrebaseCommit "\v<\x{7,40}>"  nextgroup=gitrebaseSummary skipwhite
- syn match   gitrebasePick   "\v^p%(ick)=>"   nextgroup=gitrebaseCommit skipwhite
- syn match   gitrebaseEdit   "\v^e%(dit)=>"   nextgroup=gitrebaseCommit skipwhite
-+syn match   gitrebaseReword "\v^r%(eword)=>" nextgroup=gitrebaseCommit skipwhite
- syn match   gitrebaseSquash "\v^s%(quash)=>" nextgroup=gitrebaseCommit skipwhite
- syn match   gitrebaseSummary ".*"               contains=gitrebaseHash contained
- syn match   gitrebaseComment "^#.*"             contains=gitrebaseHash
-@@ -23,9 +24,10 @@
- hi def link gitrebaseHash           Identifier
- hi def link gitrebasePick           Statement
- hi def link gitrebaseEdit           PreProc
-+hi def link gitrebaseReword         Special
- hi def link gitrebaseSquash         Type
- hi def link gitrebaseSummary        String
- hi def link gitrebaseComment        Comment
--hi def link gitrebaseSquashError     Error
-+hi def link gitrebaseSquashError    Error
- 
- let b:current_syntax = "gitrebase"
-diff -u -r --new-file runtime/syntax.orig/groovy.vim runtime/syntax/groovy.vim
---- runtime/syntax.orig/groovy.vim	2006-03-24 10:29:41.000000000 -0600
-+++ runtime/syntax/groovy.vim	2009-11-28 06:33:43.000000000 -0600
-@@ -228,6 +228,7 @@
-   " syntax include @groovyHtml <sfile>:p:h/html.vim
-    syntax include @groovyHtml runtime! syntax/html.vim
-   unlet b:current_syntax
-+  syntax spell default  " added by Bram
-   syn region  groovyDocComment    start="/\*\*"  end="\*/" keepend contains=groovyCommentTitle,@groovyHtml,groovyDocTags,groovyTodo,@Spell
-   syn region  groovyCommentTitle  contained matchgroup=groovyDocComment start="/\*\*"   matchgroup=groovyCommentTitle keepend end="\.$" end="\.[ \t\r<&]"me=e-1 end="[^{]@"me=s-2,he=s-1 end="\*/"me=s-1,he=s-1 contains=@groovyHtml,groovyCommentStar,groovyTodo,@Spell,groovyDocTags
- 
-diff -u -r --new-file runtime/syntax.orig/haskell.vim runtime/syntax/haskell.vim
---- runtime/syntax.orig/haskell.vim	2004-06-07 09:32:35.000000000 -0500
-+++ runtime/syntax/haskell.vim	2009-01-14 14:15:20.000000000 -0600
-@@ -1,7 +1,7 @@
- " Vim syntax file
- " Language:		Haskell
- " Maintainer:		Haskell Cafe mailinglist <haskell-cafe@haskell.org>
--" Last Change:		2004 Feb 23
-+" Last Change:		2008 Dec 15
- " Original Author:	John Williams <jrw@pobox.com>
- "
- " Thanks to Ryan Crumley for suggestions and John Meacham for
-@@ -30,6 +30,7 @@
- "	       in eol comment character class
- " 2004 Feb 23: Made the leading comments somewhat clearer where it comes
- "	       to attribution of work.
-+" 2008 Dec 15: Added comments as contained element in import statements
- 
- " Remove any old syntax stuff hanging around
- if version < 600
-@@ -67,7 +68,7 @@
- " because otherwise they would match as keywords at the start of a
- " "literate" comment (see lhs.vim).
- syn match hsModule		"\<module\>"
--syn match hsImport		"\<import\>.*"he=s+6 contains=hsImportMod
-+syn match hsImport		"\<import\>.*"he=s+6 contains=hsImportMod,hsLineComment,hsBlockComment
- syn match hsImportMod		contained "\<\(as\|qualified\|hiding\)\>"
- syn match hsInfix		"\<\(infix\|infixl\|infixr\)\>"
- syn match hsStructure		"\<\(class\|data\|deriving\|instance\|default\|where\)\>"
-diff -u -r --new-file runtime/syntax.orig/help.vim runtime/syntax/help.vim
---- runtime/syntax.orig/help.vim	2006-05-13 01:42:22.000000000 -0500
-+++ runtime/syntax/help.vim	2009-06-03 05:07:39.000000000 -0500
-@@ -1,14 +1,14 @@
- " Vim syntax file
- " Language:	Vim help file
- " Maintainer:	Bram Moolenaar (Bram@vim.org)
--" Last Change:	2006 May 13
-+" Last Change:	2009 May 18
- 
- " Quit when a (custom) syntax file was already loaded
- if exists("b:current_syntax")
-   finish
- endif
- 
--syn match helpHeadline		"^[-A-Z .]\+[ \t]\+\*"me=e-1
-+syn match helpHeadline		"^[-A-Z .][-A-Z0-9 .()]*[ \t]\+\*"me=e-1
- syn match helpSectionDelim	"^=\{3,}.*===$"
- syn match helpSectionDelim	"^-\{3,}.*--$"
- syn region helpExample		matchgroup=helpIgnore start=" >$" start="^>$" end="^[^ \t]"me=e-1 end="^<"
-diff -u -r --new-file runtime/syntax.orig/indent.vim runtime/syntax/indent.vim
---- runtime/syntax.orig/indent.vim	2007-06-17 10:02:22.000000000 -0500
-+++ runtime/syntax/indent.vim	2010-02-11 06:48:22.000000000 -0600
-@@ -1,7 +1,7 @@
- " Vim syntax file
- " Language:         indent(1) configuration file
- " Maintainer:       Nikolai Weibull <now@bitwi.se>
--" Latest Revision:  2007-06-17
-+" Latest Revision:  2010-01-23
- "   indent_is_bsd:  If exists, will change somewhat to match BSD implementation
- "
- " TODO: is the deny-all (a la lilo.vim nice or no?)...
-@@ -27,7 +27,7 @@
-                           \ contains=indentTodo,@Spell
- 
- if !exists("indent_is_bsd")
--  syn match indentOptions '-i\|--indentation-level'
-+  syn match indentOptions '-i\|--indentation-level\|-il\|--indent-level'
-                         \ nextgroup=indentNumber skipwhite skipempty
- endif
- syn match   indentOptions '-\%(bli\|c\%([bl]i\|[dip]\)\=\|di\=\|ip\=\|lc\=\|pp\=i\|sbi\|ts\|-\%(brace-indent\|comment-indentation\|case-brace-indentation\|declaration-comment-column\|continuation-indentation\|case-indentation\|else-endif-column\|line-comments-indentation\|declaration-indentation\|indent-level\|parameter-indentation\|line-length\|comment-line-length\|paren-indentation\|preprocessor-indentation\|struct-brace-indentation\|tab-size\)\)'
-@@ -123,6 +123,7 @@
-                         \ -ut --use-tabs
-                         \ -v --verbose
-                         \ -version --version
-+                        \ -linux --linux-style
- 
- if exists("indent_is_bsd")
-   syn keyword indentOptions -ip -ei -nei
-diff -u -r --new-file runtime/syntax.orig/java.vim runtime/syntax/java.vim
---- runtime/syntax.orig/java.vim	2007-12-20 17:14:48.000000000 -0600
-+++ runtime/syntax/java.vim	2009-03-22 14:39:44.000000000 -0500
-@@ -2,7 +2,7 @@
- " Language:     Java
- " Maintainer:   Claudio Fleiner <claudio@fleiner.com>
- " URL:		http://www.fleiner.com/vim/syntax/java.vim
--" Last Change:  2007 Dec 21
-+" Last Change:  2009 Mar 14
- 
- " Please check :help java.vim for comments on some of the options available.
- 
-@@ -15,6 +15,7 @@
-   endif
-   " we define it here so that included files can test for it
-   let main_syntax='java'
-+  syn region javaFold start="{" end="}" transparent fold
- endif
- 
- " don't use standard HiLink, it will not work with included syntax files
-@@ -58,7 +59,7 @@
- syn keyword javaClassDecl	enum
- syn match   javaClassDecl	"^class\>"
- syn match   javaClassDecl	"[^.]\s*\<class\>"ms=s+1
--syn match   javaAnnotation      "@[_$a-zA-Z][_$a-zA-Z0-9_]*\>"
-+syn match   javaAnnotation      "@\([_$a-zA-Z][_$a-zA-Z0-9]*\.\)*[_$a-zA-Z][_$a-zA-Z0-9]*\>"
- syn match   javaClassDecl       "@interface\>"
- syn keyword javaBranch		break continue nextgroup=javaUserLabelRef skipwhite
- syn match   javaUserLabelRef	"\k\+" contained
-@@ -121,11 +122,6 @@
- syn keyword javaLabel		default
- 
- if !exists("java_allow_cpp_keywords")
--  " The default used to be to highlight C++ keywords.  But several people
--  " don't like that, so default to not highlighting these.
--  let java_allow_cpp_keywords = 1
--endif
--if !java_allow_cpp_keywords
-   syn keyword javaError auto delete extern friend inline redeclared
-   syn keyword javaError register signed sizeof struct template typedef union
-   syn keyword javaError unsigned operator
-@@ -161,6 +157,11 @@
-   " syntax coloring for javadoc comments (HTML)
-   syntax include @javaHtml <sfile>:p:h/html.vim
-   unlet b:current_syntax
-+  " HTML enables spell checking for all text that is not in a syntax item. This
-+  " is wrong for Java (all identifiers would be spell-checked), so it's undone
-+  " here.
-+  syntax spell default
-+
-   syn region  javaDocComment    start="/\*\*"  end="\*/" keepend contains=javaCommentTitle,@javaHtml,javaDocTags,javaDocSeeTag,javaTodo,@Spell
-   syn region  javaCommentTitle  contained matchgroup=javaDocComment start="/\*\*"   matchgroup=javaCommentTitle keepend end="\.$" end="\.[ \t\r<&]"me=e-1 end="[^{]@"me=s-2,he=s-1 end="\*/"me=s-1,he=s-1 contains=@javaHtml,javaCommentStar,javaTodo,@Spell,javaDocTags,javaDocSeeTag
- 
-@@ -179,7 +180,7 @@
- " Strings and constants
- syn match   javaSpecialError     contained "\\."
- syn match   javaSpecialCharError contained "[^']"
--syn match   javaSpecialChar      contained "\\\([4-9]\d\|[0-3]\d\d\|[\"\\'ntbrf]\|u\x\{4\}\)"
-+syn match   javaSpecialChar      contained "\\\([4-9]\d\|[0-3]\d\d\|[\"\\'ntbrf]\|u\+\x\{4\}\)"
- syn region  javaString		start=+"+ end=+"+ end=+$+ contains=javaSpecialChar,javaSpecialError,@Spell
- " next line disabled, it can cause a crash for a long line
- "syn match   javaStringError	  +"\([^"\\]\|\\.\)*$+
-@@ -192,7 +193,7 @@
- syn match   javaNumber		 "\<\d\+\([eE][-+]\=\d\+\)\=[fFdD]\>"
- 
- " unicode characters
--syn match   javaSpecial "\\u\d\{4\}"
-+syn match   javaSpecial "\\u\+\d\{4\}"
- 
- syn cluster javaTop add=javaString,javaCharacter,javaNumber,javaSpecial,javaStringError
- 
-diff -u -r --new-file runtime/syntax.orig/kconfig.vim runtime/syntax/kconfig.vim
---- runtime/syntax.orig/kconfig.vim	2006-04-19 15:49:04.000000000 -0500
-+++ runtime/syntax/kconfig.vim	2009-06-03 05:05:43.000000000 -0500
-@@ -1,6 +1,6 @@
- " Vim syntax file
- " Maintainer:       Nikolai Weibull <now@bitwi.se>
--" Latest Revision:  2006-04-14
-+" Latest Revision:  2009-05-25
- 
- if exists("b:current_syntax")
-   finish
-@@ -666,9 +666,9 @@
- 
- syn match   kconfigComment            display '#.*$' contains=kconfigTodo
- 
--syn keyword kconfigKeyword            config menuconfig comment menu mainmenu
-+syn keyword kconfigKeyword            config menuconfig comment mainmenu
- 
--syn keyword kconfigConditional        choice endchoice if endif
-+syn keyword kconfigConditional        menu endmenu choice endchoice if endif
- 
- syn keyword kconfigPreProc            source
-                                       \ nextgroup=kconfigPath
-diff -u -r --new-file runtime/syntax.orig/lex.vim runtime/syntax/lex.vim
---- runtime/syntax.orig/lex.vim	2005-09-06 12:27:26.000000000 -0500
-+++ runtime/syntax/lex.vim	2009-10-08 16:18:57.000000000 -0500
-@@ -1,8 +1,8 @@
- " Vim syntax file
- " Language:	Lex
--" Maintainer:	Dr. Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz>
--" Last Change:	Sep 06, 2005
--" Version:	7
-+" Maintainer:	Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz>
-+" Last Change:	Sep 11, 2009
-+" Version:	10
- " URL:	http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax
- "
- " Option:
-@@ -16,7 +16,7 @@
-   finish
- endif
- 
--" Read the C syntax to start with
-+" Read the C/C++ syntax to start with
- if version >= 600
-   if exists("lex_uses_cpp")
-     runtime! syntax/cpp.vim
-@@ -36,32 +36,60 @@
- " --- Lex stuff ---
- " --- ========= ---
- 
--"I'd prefer to use lex.* , but it doesn't handle forward definitions yet
-+"I'd prefer to use lex.* , but vim doesn't handle forward definitions yet
- syn cluster lexListGroup		contains=lexAbbrvBlock,lexAbbrv,lexAbbrv,lexAbbrvRegExp,lexInclude,lexPatBlock,lexPat,lexBrace,lexPatString,lexPatTag,lexPatTag,lexPatComment,lexPatCodeLine,lexMorePat,lexPatSep,lexSlashQuote,lexPatCode,cInParen,cUserLabel,cOctalZero,cCppSkip,cErrInBracket,cErrInParen,cOctalError,cCppOut2,cCommentStartError,cParenError
--syn cluster lexListPatCodeGroup	contains=lexAbbrvBlock,lexAbbrv,lexAbbrv,lexAbbrvRegExp,lexInclude,lexPatBlock,lexPat,lexBrace,lexPatTag,lexPatTag,lexPatComment,lexPatCodeLine,lexMorePat,lexPatSep,lexSlashQuote,cInParen,cUserLabel,cOctalZero,cCppSkip,cErrInBracket,cErrInParen,cOctalError,cCppOut2,cCommentStartError,cParenError
-+syn cluster lexListPatCodeGroup	contains=lexAbbrvBlock,lexAbbrv,lexAbbrv,lexAbbrvRegExp,lexInclude,lexPatBlock,lexPat,lexBrace,lexPatTag,lexPatTag,lexPatTagZoneStart,lexPatComment,lexPatCodeLine,lexMorePat,lexPatSep,lexSlashQuote,cInParen,cUserLabel,cOctalZero,cCppSkip,cErrInBracket,cErrInParen,cOctalError,cCppOut2,cCommentStartError,cParenError
- 
- " Abbreviations Section
--syn region lexAbbrvBlock	start="^\(\h\+\s\|%{\)" end="^\ze%%$"	skipnl	nextgroup=lexPatBlock contains=lexAbbrv,lexInclude,lexAbbrvComment,lexStartState
-+if has("folding")
-+ syn region lexAbbrvBlock	fold start="^\(\h\+\s\|%{\)"	end="^\ze%%$"	skipnl	nextgroup=lexPatBlock contains=lexAbbrv,lexInclude,lexAbbrvComment,lexStartState
-+else
-+ syn region lexAbbrvBlock	start="^\(\h\+\s\|%{\)"	end="^\ze%%$"	skipnl	nextgroup=lexPatBlock contains=lexAbbrv,lexInclude,lexAbbrvComment,lexStartState
-+endif
- syn match  lexAbbrv		"^\I\i*\s"me=e-1			skipwhite	contained nextgroup=lexAbbrvRegExp
- syn match  lexAbbrv		"^%[sx]"					contained
- syn match  lexAbbrvRegExp	"\s\S.*$"lc=1				contained nextgroup=lexAbbrv,lexInclude
--syn region lexInclude	matchgroup=lexSep	start="^%{" end="%}"	contained	contains=ALLBUT,@lexListGroup
--syn region lexAbbrvComment	start="^\s\+/\*"	end="\*/"			contains=@Spell
--syn region lexStartState	matchgroup=lexAbbrv	start="^%\a\+"	end="$"			contained
-+if has("folding")
-+ syn region lexInclude	fold matchgroup=lexSep	start="^%{"	end="%}"	contained	contains=ALLBUT,@lexListGroup
-+ syn region lexAbbrvComment	fold			start="^\s\+/\*"	end="\*/"	contains=@Spell
-+ syn region lexStartState	fold matchgroup=lexAbbrv	start="^%\a\+"	end="$"	contained
-+else
-+ syn region lexInclude	matchgroup=lexSep		start="^%{"	end="%}"	contained	contains=ALLBUT,@lexListGroup
-+ syn region lexAbbrvComment				start="^\s\+/\*"	end="\*/"	contains=@Spell
-+ syn region lexStartState	matchgroup=lexAbbrv		start="^%\a\+"	end="$"	contained
-+endif
- 
- "%% : Patterns {Actions}
--syn region lexPatBlock	matchgroup=Todo	start="^%%$" matchgroup=Todo end="^%%$"	skipnl skipwhite contains=lexPat,lexPatTag,lexPatComment
--syn region lexPat		start=+\S+ skip="\\\\\|\\."	end="\s"me=e-1	contained nextgroup=lexMorePat,lexPatSep contains=lexPatString,lexSlashQuote,lexBrace
--syn region lexBrace	start="\[" skip=+\\\\\|\\+		end="]"		contained
--syn region lexPatString	matchgroup=String start=+"+	skip=+\\\\\|\\"+	matchgroup=String end=+"+	contained
--syn match  lexPatTag	"^<\I\i*\(,\I\i*\)*>*"			contained nextgroup=lexPat,lexPatTag,lexMorePat,lexPatSep
-+if has("folding")
-+ syn region lexPatBlock	fold matchgroup=Todo	start="^%%$" matchgroup=Todo	end="^%%$"	skipnl skipwhite	contains=lexPatTag,lexPatTagZone,lexPatComment,lexPat
-+ syn region lexPat		fold			start=+\S+ skip="\\\\\|\\."	end="\s"me=e-1		contained nextgroup=lexMorePat,lexPatSep contains=lexPatTag,lexPatString,lexSlashQuote,lexBrace
-+ syn region lexBrace	fold			start="\[" skip=+\\\\\|\\+	end="]"			contained
-+ syn region lexPatString	fold matchgroup=String	start=+"+	skip=+\\\\\|\\"+	matchgroup=String end=+"+	contained
-+else
-+ syn region lexPatBlock	matchgroup=Todo		start="^%%$" matchgroup=Todo	end="^%%$"	skipnl skipwhite	contains=lexPatTag,lexPatTagZone,lexPatComment,lexPat
-+ syn region lexPat					start=+\S+ skip="\\\\\|\\."	end="\s"me=e-1		contained nextgroup=lexMorePat,lexPatSep contains=lexPatTag,lexPatString,lexSlashQuote,lexBrace
-+ syn region lexBrace				start="\[" skip=+\\\\\|\\+	end="]"			contained
-+ syn region lexPatString	matchgroup=String		start=+"+	skip=+\\\\\|\\"+	matchgroup=String end=+"+	contained
-+endif
-+syn match  lexPatTag	"^<\I\i*\(,\I\i*\)*>"			contained nextgroup=lexPat,lexPatTag,lexMorePat,lexPatSep
-+syn match  lexPatTagZone	"^<\I\i*\(,\I\i*\)*>\s*\ze{"		contained nextgroup=lexPatTagZoneStart
- syn match  lexPatTag	+^<\I\i*\(,\I\i*\)*>*\(\\\\\)*\\"+		contained nextgroup=lexPat,lexPatTag,lexMorePat,lexPatSep
--syn region lexPatComment	start="^\s*/\*" end="\*/"		skipnl	contained contains=cTodo skipwhite nextgroup=lexPatComment,lexPat,@Spell
-+if has("folding")
-+ syn region  lexPatTagZoneStart matchgroup=lexPatTag	fold	start='{' end='}'	contained contains=lexPat,lexPatComment
-+ syn region lexPatComment	start="\s\+/\*" end="\*/"	fold	skipnl	contained contains=cTodo skipwhite nextgroup=lexPatComment,lexPat,@Spell
-+else
-+ syn region  lexPatTagZoneStart matchgroup=lexPatTag		start='{' end='}'	contained contains=lexPat,lexPatComment
-+ syn region lexPatComment	start="\s\+/\*" end="\*/"		skipnl	contained contains=cTodo skipwhite nextgroup=lexPatComment,lexPat,@Spell
-+endif
- syn match  lexPatCodeLine	".*$"					contained contains=ALLBUT,@lexListGroup
- syn match  lexMorePat	"\s*|\s*$"			skipnl	contained nextgroup=lexPat,lexPatTag,lexPatComment
- syn match  lexPatSep	"\s\+"					contained nextgroup=lexMorePat,lexPatCode,lexPatCodeLine
- syn match  lexSlashQuote	+\(\\\\\)*\\"+				contained
--syn region lexPatCode matchgroup=Delimiter start="{" matchgroup=Delimiter end="}"	skipnl contained contains=ALLBUT,@lexListPatCodeGroup
-+if has("folding")
-+ syn region lexPatCode matchgroup=Delimiter start="{" end="}"	fold	skipnl contained contains=ALLBUT,@lexListPatCodeGroup
-+else
-+ syn region lexPatCode matchgroup=Delimiter start="{" end="}"		skipnl contained contains=ALLBUT,@lexListPatCodeGroup
-+endif
- 
- syn keyword lexCFunctions	BEGIN	input	unput	woutput	yyleng	yylook	yytext
- syn keyword lexCFunctions	ECHO	output	winput	wunput	yyless	yymore	yywrap
-@@ -80,9 +108,10 @@
- syn sync match lexSyncPat	groupthere lexPatBlock	"^%%$"
- 
- " The default highlighting.
--hi def link lexSlashQuote	lexPat
--hi def link lexBrace	lexPat
- hi def link lexAbbrvComment	lexPatComment
-+hi def link lexBrace	lexPat
-+hi def link lexPatTagZone	lexPatTag
-+hi def link lexSlashQuote	lexPat
- 
- hi def link lexAbbrvRegExp	Macro
- hi def link lexAbbrv	SpecialChar
-diff -u -r --new-file runtime/syntax.orig/lhaskell.vim runtime/syntax/lhaskell.vim
---- runtime/syntax.orig/lhaskell.vim	2008-07-01 12:47:29.000000000 -0500
-+++ runtime/syntax/lhaskell.vim	2009-05-14 13:53:07.000000000 -0500
-@@ -4,8 +4,8 @@
- "			\begin{code} \end{code} blocks
- " Maintainer:		Haskell Cafe mailinglist <haskell-cafe@haskell.org>
- " Original Author:	Arthur van Leeuwen <arthurvl@cs.uu.nl>
--" Last Change:		2008 Jul 01
--" Version:		1.02
-+" Last Change:		2009 May 08
-+" Version:		1.04
- "
- " Thanks to Ian Lynagh for thoughtful comments on initial versions and
- " for the inspiration for writing this in the first place.
-@@ -29,8 +29,10 @@
- " 2004 February 20: Cleaned up the guessing and overriding a bit
- " 2004 February 23: Cleaned up syntax highlighting for \begin{code} and
- "		    \end{code}, added some clarification to the attributions
--" 2008 July 1:      Removed % from guess list, as it totally breaks  plain
--"		    text markup guessing
-+" 2008 July 1:      Removed % from guess list, as it totally breaks plain
-+"                   text markup guessing
-+" 2009 April 29:    Fixed highlighting breakage in TeX mode, 
-+"                   thanks to Kalman Noel
- "
- 
- 
-@@ -73,14 +75,14 @@
- "   - \begin{env}       (for env != code)
- "   - \part, \chapter, \section, \subsection, \subsubsection, etc
- if b:lhs_markup == "unknown"
--    if search('\\documentclass\|\\begin{\(code}\)\@!\|\\\(sub \)*section\|\\chapter|\\part','W') != 0
-+    if search('\\documentclass\|\\begin{\(code}\)\@!\|\\\(sub\)*section\|\\chapter|\\part','W') != 0
- 	let b:lhs_markup = "tex"
-     else
- 	let b:lhs_markup = "plain"
-     endif
- endif
- 
--" If user wants us to highlight TeX syntax or guess thinks it's TeX,  read it.
-+" If user wants us to highlight TeX syntax or guess thinks it's TeX, read it.
- if b:lhs_markup == "tex"
-     if version < 600
- 	source <sfile>:p:h/tex.vim
-@@ -91,6 +93,9 @@
- 	" Tex.vim removes "_" from 'iskeyword', but we need it for Haskell.
- 	setlocal isk+=_
-     endif
-+    syntax cluster lhsTeXContainer contains=tex.*Zone,texAbstract
-+else
-+    syntax cluster lhsTeXContainer contains=.*
- endif
- 
- " Literate Haskell is Haskell in between text, so at least read Haskell
-@@ -101,8 +106,8 @@
-     syntax include @haskellTop syntax/haskell.vim
- endif
- 
--syntax region lhsHaskellBirdTrack start="^>" end="\%(^[^>]\)\@=" contains=@haskellTop,lhsBirdTrack
--syntax region lhsHaskellBeginEndBlock start="^\\begin{code}\s*$" matchgroup=NONE end="\%(^\\end{code}.*$\)\@=" contains=@haskellTop,@beginCode
-+syntax region lhsHaskellBirdTrack start="^>" end="\%(^[^>]\)\@=" contains=@haskellTop,lhsBirdTrack containedin=@lhsTeXContainer
-+syntax region lhsHaskellBeginEndBlock start="^\\begin{code}\s*$" matchgroup=NONE end="\%(^\\end{code}.*$\)\@=" contains=@haskellTop,@beginCode containedin=@lhsTeXContainer
- 
- syntax match lhsBirdTrack "^>" contained
- 
-diff -u -r --new-file runtime/syntax.orig/lilo.vim runtime/syntax/lilo.vim
---- runtime/syntax.orig/lilo.vim	2004-07-20 12:53:05.000000000 -0500
-+++ runtime/syntax/lilo.vim	2010-02-11 06:45:15.000000000 -0600
-@@ -1,10 +1,8 @@
- " Vim syntax file
--" This is a GENERATED FILE. Please always refer to source file at the URI below.
- " Language: lilo configuration (lilo.conf)
--" Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
--" Last Change: 2004-07-20
--" URL: http://trific.ath.cx/Ftp/vim/syntax/lilo.vim
--
-+" Maintainer: Niels Horn <niels.horn@gmail.com>
-+" Previous Maintainer: David Necas (Yeti) <yeti@physics.muni.cz>
-+" Last Change: 2010-02-03
- 
- " Setup
- if version >= 600
-@@ -64,7 +62,7 @@
- 
- " String
- syn keyword liloOption menu-title nextgroup=liloEqString,liloEqStringComment,liloError skipwhite skipempty
--syn keyword liloKernelOpt append nextgroup=liloEqString,liloEqStringComment,liloError skipwhite skipempty
-+syn keyword liloKernelOpt append addappend nextgroup=liloEqString,liloEqStringComment,liloError skipwhite skipempty
- syn keyword liloImageOpt fallback literal nextgroup=liloEqString,liloEqStringComment,liloError skipwhite skipempty
- 
- " Hex number
-diff -u -r --new-file runtime/syntax.orig/lisp.vim runtime/syntax/lisp.vim
---- runtime/syntax.orig/lisp.vim	2007-11-14 10:37:14.000000000 -0600
-+++ runtime/syntax/lisp.vim	2009-03-22 14:39:57.000000000 -0500
-@@ -1,8 +1,8 @@
- " Vim syntax file
- " Language:    Lisp
- " Maintainer:  Dr. Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz>
--" Last Change: Oct 19, 2007
--" Version:     20
-+" Last Change: Mar 05, 2009
-+" Version:     21
- " URL:	       http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax
- "
- "  Thanks to F Xavier Noria for a list of 978 Common Lisp symbols
-@@ -534,7 +534,8 @@
- 
- " ---------------------------------------------------------------------
- " Numbers: supporting integers and floating point numbers {{{1
--syn match lispNumber		"-\=\(\.\d\+\|\d\+\(\.\d*\)\=\)\(e[-+]\=\d\+\)\="
-+syn match lispNumber		"-\=\(\.\d\+\|\d\+\(\.\d*\)\=\)\([dDeEfFlL][-+]\=\d\+\)\="
-+syn match lispNumber		"-\=\(\d\+/\d\+\)"
- 
- syn match lispSpecial		"\*\w[a-z_0-9-]*\*"
- syn match lispSpecial		!#|[^()'`,"; \t]\+|#!
-diff -u -r --new-file runtime/syntax.orig/logtalk.vim runtime/syntax/logtalk.vim
---- runtime/syntax.orig/logtalk.vim	2008-07-06 13:09:17.000000000 -0500
-+++ runtime/syntax/logtalk.vim	2008-11-06 10:05:14.000000000 -0600
-@@ -2,7 +2,7 @@
- "
- " Language:	Logtalk
- " Maintainer:	Paulo Moura <pmoura@logtalk.org>
--" Last Change:	June 16, 2008
-+" Last Change:	Oct 31, 2008
- 
- 
- " Quit when a syntax file was already loaded:
-@@ -51,9 +51,9 @@
- 
- " Logtalk opening entity directives
- 
--syn region	logtalkOpenEntityDir	matchgroup=logtalkOpenEntityDirTag	start=":- object("	matchgroup=logtalkOpenEntityDirTag	end=")\."	contains=logtalkEntity,logtalkVariable,logtalkNumber,logtalkOperator,logtalkString,logtalkAtom,logtalkEntityRel
--syn region	logtalkOpenEntityDir	matchgroup=logtalkOpenEntityDirTag	start=":- protocol("	matchgroup=logtalkOpenEntityDirTag	end=")\."	contains=logtalkEntity,logtalkVariable,logtalkNumber,logtalkOperator,logtalkEntityRel
--syn region	logtalkOpenEntityDir	matchgroup=logtalkOpenEntityDirTag	start=":- category("	matchgroup=logtalkOpenEntityDirTag	end=")\."	contains=logtalkEntity,logtalkVariable,logtalkNumber,logtalkOperator,logtalkEntityRel
-+syn region	logtalkOpenEntityDir	matchgroup=logtalkOpenEntityDirTag	start=":- object("	matchgroup=logtalkOpenEntityDirTag	end=")\."	contains=logtalkEntity,logtalkVariable,logtalkNumber,logtalkOperator,logtalkString,logtalkAtom,logtalkEntityRel,logtalkLineComment
-+syn region	logtalkOpenEntityDir	matchgroup=logtalkOpenEntityDirTag	start=":- protocol("	matchgroup=logtalkOpenEntityDirTag	end=")\."	contains=logtalkEntity,logtalkVariable,logtalkNumber,logtalkOperator,logtalkEntityRel,logtalkLineComment
-+syn region	logtalkOpenEntityDir	matchgroup=logtalkOpenEntityDirTag	start=":- category("	matchgroup=logtalkOpenEntityDirTag	end=")\."	contains=logtalkEntity,logtalkVariable,logtalkNumber,logtalkOperator,logtalkEntityRel,logtalkLineComment
- 
- 
- " Logtalk closing entity directives
-diff -u -r --new-file runtime/syntax.orig/mail.vim runtime/syntax/mail.vim
---- runtime/syntax.orig/mail.vim	2008-01-18 06:28:18.000000000 -0600
-+++ runtime/syntax/mail.vim	2008-11-09 07:12:28.000000000 -0600
-@@ -2,7 +2,7 @@
- " Language:		Mail file
- " Previous Maintainer:	Felix von Leitner <leitner@math.fu-berlin.de>
- " Maintainer:		Gautam Iyer <gi1242@users.sourceforge.net>
--" Last Change:		Thu 17 Jan 2008 11:25:44 AM PST
-+" Last Change:		Thu 06 Nov 2008 10:10:55 PM PST
- 
- " Quit when a syntax file was already loaded
- if exists("b:current_syntax")
-@@ -24,28 +24,35 @@
- " emails
- " According to RFC 2822 any printable ASCII character can appear in a field
- " name, except ':'.
--syn region	mailHeader	contains=@mailHeaderFields,@NoSpell start="^From .*\d\d\d\d$" skip="^\s" end="\v^[!-9;-~]*([^!-~]|$)"me=s-1
-+syn region	mailHeader	contains=@mailHeaderFields,@NoSpell start="^From .*\d\d\d\d$" skip="^\s" end="\v^[!-9;-~]*([^!-~]|$)"me=s-1 fold
- syn match	mailHeaderKey	contained contains=mailEmail,@NoSpell "^From\s.*\d\d\d\d$"
-+
-+" Nothing else depends on case. 
-+syn case ignore
-+
-+" Headers in properly quoted (with "> " or ">") emails are matched
-+syn region	mailHeader	keepend contains=@mailHeaderFields,@mailQuoteExps,@NoSpell start="^\z(\(> \?\)*\)\v(newsgroups|x-([a-z\-])*|path|xref|message-id|from|((in-)?reply-)?to|b?cc|subject|return-path|received|date|replied):" skip="^\z1\s" end="\v^\z1[!-9;-~]*([^!-~]|$)"me=s-1 end="\v^\z1@!"me=s-1 end="\v^\z1(\> ?)+"me=s-1 fold
-+
- " Usenet headers
- syn match	mailHeaderKey	contained contains=mailHeaderEmail,mailEmail,@NoSpell "\v(^(\> ?)*)@<=(Newsgroups|Followup-To|Message-ID|Supersedes|Control):.*$"
- 
--syn case ignore
--" Nothing else depends on case. Headers in properly quoted (with "> " or ">")
--" emails are matched
--syn region	mailHeader	keepend contains=@mailHeaderFields,@mailQuoteExps,@NoSpell start="^\z(\(> \?\)*\)\v(newsgroups|x-([a-z\-])*|path|xref|message-id|from|((in-)?reply-)?to|b?cc|subject|return-path|received|date|replied):" skip="^\z1\s" end="\v^\z1[!-9;-~]*([^!-~]|$)"me=s-1 end="\v^\z1@!"me=s-1 end="\v^\z1(\> ?)+"me=s-1
- 
- syn region	mailHeaderKey	contained contains=mailHeaderEmail,mailEmail,@mailQuoteExps,@NoSpell start="\v(^(\> ?)*)@<=(to|b?cc):" skip=",$" end="$"
--syn match	mailHeaderKey	contained contains=mailHeaderEmail,mailEmail,@NoSpell "\v(^(\> ?)*)@<=(from|reply-to):.*$"
-+syn match	mailHeaderKey	contained contains=mailHeaderEmail,mailEmail,@NoSpell "\v(^(\> ?)*)@<=(from|reply-to):.*$" fold
- syn match	mailHeaderKey	contained contains=@NoSpell "\v(^(\> ?)*)@<=date:"
--syn match	mailSubject	contained "\v^subject:.*$"
-+syn match	mailSubject	contained "\v^subject:.*$" fold
- syn match	mailSubject	contained contains=@NoSpell "\v(^(\> ?)+)@<=subject:.*$"
- 
- " Anything in the header between < and > is an email address
- syn match	mailHeaderEmail	contained contains=@NoSpell "<.\{-}>"
- 
- " Mail Signatures. (Begin with "-- ", end with change in quote level)
--syn region	mailSignature	keepend contains=@mailLinks,@mailQuoteExps start="^--\s$" end="^$" end="^\(> \?\)\+"me=s-1
--syn region	mailSignature	keepend contains=@mailLinks,@mailQuoteExps,@NoSpell start="^\z(\(> \?\)\+\)--\s$" end="^\z1$" end="^\z1\@!"me=s-1 end="^\z1\(> \?\)\+"me=s-1
-+syn region	mailSignature	keepend contains=@mailLinks,@mailQuoteExps start="^--\s$" end="^$" end="^\(> \?\)\+"me=s-1 fold
-+syn region	mailSignature	keepend contains=@mailLinks,@mailQuoteExps,@NoSpell start="^\z(\(> \?\)\+\)--\s$" end="^\z1$" end="^\z1\@!"me=s-1 end="^\z1\(> \?\)\+"me=s-1 fold
-+
-+" Treat verbatim Text special.
-+syn region	mailVerbatim	contains=@NoSpell keepend start="^#v+$" end="^#v-$" fold 
-+syn region	mailVerbatim	contains=@mailQuoteExps,@NoSpell start="^\z(\(> \?\)\+\)#v+$" end="\z1#v-$" fold 
- 
- " URLs start with a known protocol or www,web,w3.
- syn match mailURL contains=@NoSpell `\v<(((https?|ftp|gopher)://|(mailto|file|news):)[^' 	<>"]+|(www|web|w3)[a-z0-9_-]*\.[a-z0-9._-]+\.[^' 	<>"]+)[a-z0-9/]`
-@@ -59,13 +66,13 @@
- syn match mailQuoteExp5	contained "\v^(\> ?){5}"
- syn match mailQuoteExp6	contained "\v^(\> ?){6}"
- 
--" Even and odd quoted lines. order is imporant here!
--syn match mailQuoted1	contains=mailHeader,@mailLinks,mailSignature,@NoSpell "^\([a-z]\+>\|[]|}>]\).*$"
--syn match mailQuoted2	contains=mailHeader,@mailLinks,mailSignature,@NoSpell "^\(\([a-z]\+>\|[]|}>]\)[ \t]*\)\{2}.*$"
--syn match mailQuoted3	contains=mailHeader,@mailLinks,mailSignature,@NoSpell "^\(\([a-z]\+>\|[]|}>]\)[ \t]*\)\{3}.*$"
--syn match mailQuoted4	contains=mailHeader,@mailLinks,mailSignature,@NoSpell "^\(\([a-z]\+>\|[]|}>]\)[ \t]*\)\{4}.*$"
--syn match mailQuoted5	contains=mailHeader,@mailLinks,mailSignature,@NoSpell "^\(\([a-z]\+>\|[]|}>]\)[ \t]*\)\{5}.*$"
--syn match mailQuoted6	contains=mailHeader,@mailLinks,mailSignature,@NoSpell "^\(\([a-z]\+>\|[]|}>]\)[ \t]*\)\{6}.*$"
-+" Even and odd quoted lines. Order is important here!
-+syn region	mailQuoted6	keepend contains=mailVerbatim,mailHeader,@mailLinks,mailSignature,@NoSpell start="^\z(\(\([a-z]\+>\|[]|}>]\)[ \t]*\)\{5}\([a-z]\+>\|[]|}>]\)\)" end="^\z1\@!" fold
-+syn region	mailQuoted5	keepend contains=mailQuoted6,mailVerbatim,mailHeader,@mailLinks,mailSignature,@NoSpell start="^\z(\(\([a-z]\+>\|[]|}>]\)[ \t]*\)\{4}\([a-z]\+>\|[]|}>]\)\)" end="^\z1\@!" fold
-+syn region	mailQuoted4	keepend contains=mailQuoted5,mailQuoted6,mailVerbatim,mailHeader,@mailLinks,mailSignature,@NoSpell start="^\z(\(\([a-z]\+>\|[]|}>]\)[ \t]*\)\{3}\([a-z]\+>\|[]|}>]\)\)" end="^\z1\@!" fold
-+syn region	mailQuoted3	keepend contains=mailQuoted4,mailQuoted5,mailQuoted6,mailVerbatim,mailHeader,@mailLinks,mailSignature,@NoSpell start="^\z(\(\([a-z]\+>\|[]|}>]\)[ \t]*\)\{2}\([a-z]\+>\|[]|}>]\)\)" end="^\z1\@!" fold
-+syn region	mailQuoted2	keepend contains=mailQuoted3,mailQuoted4,mailQuoted5,mailQuoted6,mailVerbatim,mailHeader,@mailLinks,mailSignature,@NoSpell start="^\z(\(\([a-z]\+>\|[]|}>]\)[ \t]*\)\{1}\([a-z]\+>\|[]|}>]\)\)" end="^\z1\@!" fold
-+syn region	mailQuoted1	keepend contains=mailQuoted2,mailQuoted3,mailQuoted4,mailQuoted5,mailQuoted6,mailVerbatim,mailHeader,@mailLinks,mailSignature,@NoSpell start="^\z([a-z]\+>\|[]|}>]\)" end="^\z1\@!" fold
- 
- " Need to sync on the header. Assume we can do that within 100 lines
- if exists("mail_minlines")
-@@ -75,6 +82,7 @@
- endif
- 
- " Define the default highlighting.
-+hi def link mailVerbatim	Special
- hi def link mailHeader		Statement
- hi def link mailHeaderKey	Type
- hi def link mailSignature	PreProc
-diff -u -r --new-file runtime/syntax.orig/man.vim runtime/syntax/man.vim
---- runtime/syntax.orig/man.vim	2007-12-30 07:19:15.000000000 -0600
-+++ runtime/syntax/man.vim	2008-09-18 13:56:38.000000000 -0500
-@@ -1,9 +1,9 @@
- " Vim syntax file
- " Language:	Man page
--" Maintainer:	Nam SungHyun <namsh@kldp.org>
-+" Maintainer:	SungHyun Nam <goweol@gmail.com>
- " Previous Maintainer:	Gautam H. Mudunuri <gmudunur@informatica.com>
- " Version Info:
--" Last Change:	2007 Dec 30
-+" Last Change:	2008 Sep 17
- 
- " Additional highlighting by Johannes Tanzler <johannes.tanzler@aon.at>:
- "	* manSubHeading
-diff -u -r --new-file runtime/syntax.orig/matlab.vim runtime/syntax/matlab.vim
---- runtime/syntax.orig/matlab.vim	2004-06-07 09:32:35.000000000 -0500
-+++ runtime/syntax/matlab.vim	2010-01-16 07:33:01.000000000 -0600
-@@ -1,8 +1,10 @@
- " Vim syntax file
- " Language:	Matlab
--" Maintainer:	Preben 'Peppe' Guldberg <peppe-vim@wielders.org>
-+" Maintainer:	Maurizio Tranchero - maurizio(.)tranchero(@)gmail(.)com
-+" Credits:	Preben 'Peppe' Guldberg <peppe-vim@wielders.org>
- "		Original author: Mario Eusebio
--" Last Change:	30 May 2003
-+" Last Change:	Wed Jan 13 11:12:34 CET 2010
-+" 		- 'global' and 'persistent' keyword are now recognized
- 
- " For version 5.x: Clear all syntax items
- " For version 6.x: Quit when a syntax file was already loaded
-@@ -16,8 +18,12 @@
- syn keyword matlabLabel			case switch
- syn keyword matlabConditional		else elseif end if otherwise
- syn keyword matlabRepeat		do for while
-+" MT_ADDON - added exception-specific keywords
-+syn keyword matlabExceptions		try catch
-+syn keyword matlabOO			classdef properties events methods
- 
- syn keyword matlabTodo			contained  TODO
-+syn keyword matlabScope			global persistent
- 
- " If you do not want these operators lit, uncommment them and the "hi link" below
- syn match matlabArithmeticOperator	"[-+]"
-@@ -31,7 +37,8 @@
- "syn match matlabIdentifier		"\<\a\w*\>"
- 
- " String
--syn region matlabString			start=+'+ end=+'+	oneline
-+" MT_ADDON - added 'skip' in order to deal with 'tic' escaping sequence 
-+syn region matlabString			start=+'+ end=+'+	oneline skip=+''+
- 
- " If you don't like tabs
- syn match matlabTab			"\t"
-@@ -51,6 +58,9 @@
- syn match matlabSemicolon		";"
- 
- syn match matlabComment			"%.*$"	contains=matlabTodo,matlabTab
-+" MT_ADDON - correctly highlights words after '...' as comments
-+syn match matlabComment			"\.\.\..*$"	contains=matlabTodo,matlabTab
-+syn region matlabMultilineComment	start=+%{+ end=+%}+ contains=matlabTodo,matlabTab
- 
- syn keyword matlabOperator		break zeros default margin round ones rand
- syn keyword matlabOperator		ceil floor size clear zeros eye mean std cov
-@@ -75,10 +85,11 @@
-   endif
- 
-   HiLink matlabTransposeOperator	matlabOperator
--  HiLink matlabOperator		Operator
--  HiLink matlabLineContinuation	Special
-+  HiLink matlabOperator			Operator
-+  HiLink matlabLineContinuation		Special
-   HiLink matlabLabel			Label
-   HiLink matlabConditional		Conditional
-+  HiLink matlabExceptions		Conditional
-   HiLink matlabRepeat			Repeat
-   HiLink matlabTodo			Todo
-   HiLink matlabString			String
-@@ -86,12 +97,15 @@
-   HiLink matlabTransposeOther		Identifier
-   HiLink matlabNumber			Number
-   HiLink matlabFloat			Float
--  HiLink matlabFunction		Function
-+  HiLink matlabFunction			Function
-   HiLink matlabError			Error
--  HiLink matlabImplicit		matlabStatement
-+  HiLink matlabImplicit			matlabStatement
-   HiLink matlabStatement		Statement
-+  HiLink matlabOO			Statement
-   HiLink matlabSemicolon		SpecialChar
-   HiLink matlabComment			Comment
-+  HiLink matlabMultilineComment		Comment
-+  HiLink matlabScope			Type
- 
-   HiLink matlabArithmeticOperator	matlabOperator
-   HiLink matlabRelationalOperator	matlabOperator
-diff -u -r --new-file runtime/syntax.orig/maxima.vim runtime/syntax/maxima.vim
---- runtime/syntax.orig/maxima.vim	2006-04-10 03:17:50.000000000 -0500
-+++ runtime/syntax/maxima.vim	2009-11-28 06:36:52.000000000 -0600
-@@ -227,7 +227,7 @@
- " Comments:
- " maxima supports /* ... */ (like C)
- syn keyword maximaTodo contained	TODO Todo DEBUG
--syn region  maximaCommentBlock	start="/\*" end="\*/"	contains=maximaString,maximaTodo
-+syn region  maximaCommentBlock	start="/\*" end="\*/"	contains=maximaString,maximaTodo,maximaCommentBlock
- 
- " synchronizing
- syn sync match maximaSyncComment	grouphere maximaCommentBlock "/*"
-diff -u -r --new-file runtime/syntax.orig/mysql.vim runtime/syntax/mysql.vim
---- runtime/syntax.orig/mysql.vim	2007-12-19 22:09:52.000000000 -0600
-+++ runtime/syntax/mysql.vim	2009-07-02 13:05:29.000000000 -0500
-@@ -1,7 +1,7 @@
- " Vim syntax file
- " Language:     mysql
- " Maintainer:   Kenneth J. Pronovici <pronovic@ieee.org>
--" Last Change:  $LastChangedDate: 2007-12-19 10:59:39 -0600 (Wed, 19 Dec 2007) $
-+" Last Change:  $LastChangedDate: 2009-06-29 23:08:37 -0500 (Mon, 29 Jun 2009) $
- " Filenames:    *.mysql
- " URL:          ftp://cedar-solutions.com/software/mysql.vim
- " Note:         The definitions below are taken from the mysql user manual as of April 2002, for version 3.23
-@@ -36,7 +36,7 @@
- syn keyword mysqlKeyword         natural no
- syn keyword mysqlKeyword         on optimize option optionally order outer outfile
- syn keyword mysqlKeyword         pack_keys partial password primary privileges procedure process processlist
--syn keyword mysqlKeyword         read references reload rename replace restrict returns revoke row rows
-+syn keyword mysqlKeyword         read references reload rename replace restrict returns revoke right row rows
- syn keyword mysqlKeyword         second select show shutdown soname sql_big_result sql_big_selects sql_big_tables sql_log_off
- syn keyword mysqlKeyword         sql_log_update sql_low_priority_updates sql_select_limit sql_small_result sql_warnings starting
- syn keyword mysqlKeyword         status straight_join string
-@@ -57,7 +57,7 @@
- " Numbers and hexidecimal values
- syn match mysqlNumber            "-\=\<[0-9]*\>"
- syn match mysqlNumber            "-\=\<[0-9]*\.[0-9]*\>"
--syn match mysqlNumber            "-\=\<[0-9]*e[+-]\=[0-9]*\>"
-+syn match mysqlNumber            "-\=\<[0-9][0-9]*e[+-]\=[0-9]*\>"
- syn match mysqlNumber            "-\=\<[0-9]*\.[0-9]*e[+-]\=[0-9]*\>"
- syn match mysqlNumber            "\<0x[abcdefABCDEF0-9]*\>"
- 
-diff -u -r --new-file runtime/syntax.orig/netrc.vim runtime/syntax/netrc.vim
---- runtime/syntax.orig/netrc.vim	2006-04-21 07:39:13.000000000 -0500
-+++ runtime/syntax/netrc.vim	2010-01-12 14:39:39.000000000 -0600
-@@ -1,7 +1,7 @@
- " Vim syntax file
- " Language:         netrc(5) configuration file
- " Maintainer:       Nikolai Weibull <now@bitwi.se>
--" Latest Revision:  2006-04-19
-+" Latest Revision:  2010-01-03
- 
- if exists("b:current_syntax")
-   finish
-@@ -11,12 +11,13 @@
- set cpo&vim
- 
- syn keyword netrcKeyword    machine nextgroup=netrcMachine skipwhite skipnl
--syn keyword netrcKeyword    login nextgroup=netrcLogin,netrcSpecial
--                            \ skipwhite skipnl
-+syn keyword netrcKeyword    account
-+                          \ login
-+                          \ nextgroup=netrcLogin,netrcSpecial skipwhite skipnl
- syn keyword netrcKeyword    password nextgroup=netrcPassword skipwhite skipnl
- syn keyword netrcKeyword    default
--syn keyword netrcKeyword    macdef nextgroup=netrcInit,netrcMacroName
--                            \ skipwhite skipnl
-+syn keyword netrcKeyword    macdef
-+                          \ nextgroup=netrcInit,netrcMacroName skipwhite skipnl
- syn region  netrcMacro      contained start='.' end='^$'
- 
- syn match   netrcMachine    contained display '\S\+'
-@@ -25,14 +26,14 @@
- syn match   netrcLogin      contained display '"[^\\"]*\(\\.[^\\"]*\)*"'
- syn match   netrcPassword   contained display '\S\+'
- syn match   netrcPassword   contained display '"[^\\"]*\(\\.[^\\"]*\)*"'
--syn match   netrcMacroName  contained display '\S\+' nextgroup=netrcMacro
--                            \ skipwhite skipnl
-+syn match   netrcMacroName  contained display '\S\+'
-+                          \ nextgroup=netrcMacro skipwhite skipnl
- syn match   netrcMacroName  contained display '"[^\\"]*\(\\.[^\\"]*\)*"'
--                            \ nextgroup=netrcMacro skipwhite skipnl
-+                          \ nextgroup=netrcMacro skipwhite skipnl
- 
- syn keyword netrcSpecial    contained anonymous
--syn match   netrcInit       contained '\<init$' nextgroup=netrcMacro
--                            \ skipwhite skipnl
-+syn match   netrcInit       contained '\<init$'
-+                          \ nextgroup=netrcMacro skipwhite skipnl
- 
- syn sync fromstart
- 
-diff -u -r --new-file runtime/syntax.orig/netrw.vim runtime/syntax/netrw.vim
---- runtime/syntax.orig/netrw.vim	2008-03-28 13:35:41.000000000 -0500
-+++ runtime/syntax/netrw.vim	2010-01-12 14:33:53.000000000 -0600
-@@ -1,7 +1,7 @@
- " Language   : Netrw Remote-Directory Listing Syntax
- " Maintainer : Charles E. Campbell, Jr.
--" Last change: Feb 06, 2008
--" Version    : 12
-+" Last change: Jan 14, 2009
-+" Version    : 16
- " ---------------------------------------------------------------------
- 
- " Syntax Clearing: {{{1
-@@ -16,85 +16,91 @@
- syn cluster NetrwGroup		contains=netrwHide,netrwSortBy,netrwSortSeq,netrwQuickHelp,netrwVersion,netrwCopyTgt
- syn cluster NetrwTreeGroup	contains=netrwDir,netrwSymLink,netrwExe
- 
--syn match  netrwSpecial		"\%(\S\+ \)*\S\+[*|=]\ze\%(\s\{2,}\|$\)"		contains=netrwClassify
--syn match  netrwDir		"\.\{1,2}/"						contains=netrwClassify
--syn match  netrwDir		"\%(\S\+ \)*\S\+/"					contains=netrwClassify
--syn match  netrwSizeDate	"\<\d\+\s\d\{1,2}/\d\{1,2}/\d\{4}\s"			contains=netrwDateSep skipwhite nextgroup=netrwTime
--syn match  netrwSymLink		"\%(\S\+ \)*\S\+@\ze\%(\s\{2,}\|$\)"  			contains=netrwClassify
--syn match  netrwExe		"\%(\S\+ \)*\S\+\*\ze\%(\s\{2,}\|$\)" 			contains=netrwClassify
--syn match  netrwTreeBar		"^\%(| \)*"						contains=netrwTreeBarSpace	nextgroup=@netrwTreeGroup
--syn match  netrwTreeBarSpace	" "				contained
--
--syn match  netrwClassify	"[*=|@/]\ze\%(\s\{2,}\|$\)"	contained
--syn match  netrwDateSep		"/"				contained
--syn match  netrwTime		"\d\{1,2}:\d\{2}:\d\{2}"	contained		contains=netrwTimeSep
-+syn match  netrwPlain		"\(\S\+ \)*\S\+"					contains=@NoSpell
-+syn match  netrwSpecial		"\%(\S\+ \)*\S\+[*|=]\ze\%(\s\{2,}\|$\)"		contains=netrwClassify,@NoSpell
-+syn match  netrwDir		"\.\{1,2}/"						contains=netrwClassify,@NoSpell
-+syn match  netrwDir		"\%(\S\+ \)*\S\+/"					contains=netrwClassify,@NoSpell
-+syn match  netrwSizeDate	"\<\d\+\s\d\{1,2}/\d\{1,2}/\d\{4}\s"	skipwhite	contains=netrwDateSep,@NoSpell	nextgroup=netrwTime
-+syn match  netrwSymLink		"\%(\S\+ \)*\S\+@\ze\%(\s\{2,}\|$\)"  			contains=netrwClassify,@NoSpell
-+syn match  netrwExe		"\%(\S\+ \)*\S\+\*\ze\%(\s\{2,}\|$\)" 			contains=netrwClassify,@NoSpell
-+syn match  netrwTreeBar		"^\%([-+|] \)\+"					contains=netrwTreeBarSpace	nextgroup=@netrwTreeGroup
-+syn match  netrwTreeBarSpace	" "					contained
-+
-+syn match  netrwClassify	"[*=|@/]\ze\%(\s\{2,}\|$\)"		contained
-+syn match  netrwDateSep		"/"					contained
-+syn match  netrwTime		"\d\{1,2}:\d\{2}:\d\{2}"		contained	contains=netrwTimeSep
- syn match  netrwTimeSep		":"
- 
--syn match  netrwComment		'".*\%(\t\|$\)'						contains=@NetrwGroup
--syn match  netrwHide		'^"\s*\(Hid\|Show\)ing:'	skipwhite nextgroup=netrwHidePat
-+syn match  netrwComment		'".*\%(\t\|$\)'						contains=@NetrwGroup,@NoSpell
-+syn match  netrwHide		'^"\s*\(Hid\|Show\)ing:'	skipwhite		contains=@NoSpell		nextgroup=netrwHidePat
- syn match  netrwSlash		"/"				contained
--syn match  netrwHidePat		"[^,]\+"			contained skipwhite nextgroup=netrwHideSep
--syn match  netrwHideSep		","				contained transparent skipwhite nextgroup=netrwHidePat
--syn match  netrwSortBy		"Sorted by"			contained transparent skipwhite nextgroup=netrwList
--syn match  netrwSortSeq		"Sort sequence:"		contained transparent skipwhite nextgroup=netrwList
--syn match  netrwCopyTgt		"Copy/Move Tgt:"		contained transparent skipwhite nextgroup=netrwList
--syn match  netrwList		".*$"				contained		contains=netrwComma
-+syn match  netrwHidePat		"[^,]\+"			contained skipwhite	contains=@NoSpell		nextgroup=netrwHideSep
-+syn match  netrwHideSep		","				contained skipwhite					nextgroup=netrwHidePat
-+syn match  netrwSortBy		"Sorted by"			contained transparent skipwhite				nextgroup=netrwList
-+syn match  netrwSortSeq		"Sort sequence:"		contained transparent skipwhite			 	nextgroup=netrwList
-+syn match  netrwCopyTgt		"Copy/Move Tgt:"		contained transparent skipwhite				nextgroup=netrwList
-+syn match  netrwList		".*$"				contained		contains=netrwComma,@NoSpell
- syn match  netrwComma		","				contained
--syn region netrwQuickHelp	matchgroup=Comment start="Quick Help:\s\+" end="$"	contains=netrwHelpCmd keepend contained
--syn match  netrwHelpCmd		"\S\ze:"			contained skipwhite nextgroup=netrwCmdSep
-+syn region netrwQuickHelp	matchgroup=Comment start="Quick Help:\s\+" end="$"	contains=netrwHelpCmd,@NoSpell	keepend contained
-+syn match  netrwHelpCmd		"\S\ze:"			contained skipwhite	contains=@NoSpell		nextgroup=netrwCmdSep
- syn match  netrwCmdSep		":"				contained nextgroup=netrwCmdNote
--syn match  netrwCmdNote		".\{-}\ze  "			contained
--syn match  netrwVersion		"(netrw.*)"			contained
-+syn match  netrwCmdNote		".\{-}\ze  "			contained		contains=@NoSpell
-+syn match  netrwVersion		"(netrw.*)"			contained		contains=@NoSpell
- 
- " -----------------------------
- " Special filetype highlighting {{{1
- " -----------------------------
- if exists("g:netrw_special_syntax") && netrw_special_syntax
-- syn match netrwBak		"\(\S\+ \)*\S\+\.bak\>"				contains=netrwTreeBar
-- syn match netrwCompress	"\(\S\+ \)*\S\+\.\%(gz\|bz2\|Z\|zip\)\>"	contains=netrwTreeBar
-- syn match netrwData		"\(\S\+ \)*\S\+\.dat\>"				contains=netrwTreeBar
-- syn match netrwHdr		"\(\S\+ \)*\S\+\.h\>"				contains=netrwTreeBar
-- syn match netrwLib		"\(\S\+ \)*\S*\.\%(a\|so\|lib\|dll\)\>"		contains=netrwTreeBar
-- syn match netrwMakeFile	"\<[mM]akefile\>\|\(\S\+ \)*\S\+\.mak\>"	contains=netrwTreeBar
-- syn match netrwObj		"\(\S\+ \)*\S*\.\%(o\|obj\)\>"			contains=netrwTreeBar
-- syn match netrwTags    	"\<tags\>"					contains=netrwTreeBar
-- syn match netrwTags		"\<\(ANmenu\|ANtags\)\>"			contains=netrwTreeBar
-- syn match netrwTilde		"\(\S\+ \)*\S\+\~\>"				contains=netrwTreeBar
-- syn match netrwTmp		"\<tmp\(\S\+ \)*\S\+\>\|\(\S\+ \)*\S*tmp\>"	contains=netrwTreeBar
-+ syn match netrwBak		"\(\S\+ \)*\S\+\.bak\>"				contains=netrwTreeBar,@NoSpell
-+ syn match netrwCompress	"\(\S\+ \)*\S\+\.\%(gz\|bz2\|Z\|zip\)\>"	contains=netrwTreeBar,@NoSpell
-+ if has("unix")
-+  syn match netrwCoreDump	"\<core\%(\.\d\+\)\=\>"				contains=netrwTreeBar,@NoSpell
-+ endif
-+ syn match netrwData		"\(\S\+ \)*\S\+\.dat\>"				contains=netrwTreeBar,@NoSpell
-+ syn match netrwHdr		"\(\S\+ \)*\S\+\.h\>"				contains=netrwTreeBar,@NoSpell
-+ syn match netrwLib		"\(\S\+ \)*\S*\.\%(a\|so\|lib\|dll\)\>"		contains=netrwTreeBar,@NoSpell
-+ syn match netrwMakeFile	"\<[mM]akefile\>\|\(\S\+ \)*\S\+\.mak\>"	contains=netrwTreeBar,@NoSpell
-+ syn match netrwObj		"\(\S\+ \)*\S*\.\%(o\|obj\)\>"			contains=netrwTreeBar,@NoSpell
-+ syn match netrwTags    	"\<tags\>"					contains=netrwTreeBar,@NoSpell
-+ syn match netrwTags		"\<\(ANmenu\|ANtags\)\>"			contains=netrwTreeBar,@NoSpell
-+ syn match netrwTilde		"\(\S\+ \)*\S\+\~\>"				contains=netrwTreeBar,@NoSpell
-+ syn match netrwTmp		"\<tmp\(\S\+ \)*\S\+\>\|\(\S\+ \)*\S*tmp\>"	contains=netrwTreeBar,@NoSpell
- endif
- 
- " ---------------------------------------------------------------------
- " Highlighting Links: {{{1
- if !exists("did_drchip_netrwlist_syntax")
-  let did_drchip_netrwlist_syntax= 1
-- hi link netrwClassify	Function
-- hi link netrwCmdSep	Delimiter
-- hi link netrwComment	Comment
-- hi link netrwDir	Directory
-- hi link netrwHelpCmd	Function
-- hi link netrwHidePat	Statement
-- hi link netrwList	Statement
-- hi link netrwVersion	Identifier
-- hi link netrwSymLink	Question
-- hi link netrwExe	PreProc
-- hi link netrwDateSep	Delimiter
--
-- hi link netrwTreeBar	Special
-- hi link netrwTimeSep	netrwDateSep
-- hi link netrwComma	netrwComment
-- hi link netrwHide	netrwComment
-- hi link netrwMarkFile	Identifier
-+ hi default link netrwClassify	Function
-+ hi default link netrwCmdSep	Delimiter
-+ hi default link netrwComment	Comment
-+ hi default link netrwDir	Directory
-+ hi default link netrwHelpCmd	Function
-+ hi default link netrwHidePat	Statement
-+ hi default link netrwHideSep	netrwComment
-+ hi default link netrwList	Statement
-+ hi default link netrwVersion	Identifier
-+ hi default link netrwSymLink	Question
-+ hi default link netrwExe	PreProc
-+ hi default link netrwDateSep	Delimiter
-+
-+ hi default link netrwTreeBar	Special
-+ hi default link netrwTimeSep	netrwDateSep
-+ hi default link netrwComma	netrwComment
-+ hi default link netrwHide	netrwComment
-+ hi default link netrwMarkFile	Identifier
- 
-  " special syntax highlighting (see :he g:netrw_special_syntax)
-- hi link netrwBak	NonText
-- hi link netrwCompress	Folded
-- hi link netrwData	DiffChange
-- hi link netrwLib	DiffChange
-- hi link netrwMakefile	DiffChange
-- hi link netrwObj	Folded
-- hi link netrwTilde	Folded
-- hi link netrwTmp	Folded
-- hi link netrwTags	Folded
-+ hi default link netrwBak	NonText
-+ hi default link netrwCompress	Folded
-+ hi default link netrwCoreDump	WarningMsg
-+ hi default link netrwData	DiffChange
-+ hi default link netrwLib	DiffChange
-+ hi default link netrwMakefile	DiffChange
-+ hi default link netrwObj	Folded
-+ hi default link netrwTilde	Folded
-+ hi default link netrwTmp	Folded
-+ hi default link netrwTags	Folded
- endif
- 
- " Current Syntax: {{{1
-diff -u -r --new-file runtime/syntax.orig/papp.vim runtime/syntax/papp.vim
---- runtime/syntax.orig/papp.vim	2004-06-07 09:32:35.000000000 -0500
-+++ runtime/syntax/papp.vim	2009-11-28 06:31:38.000000000 -0600
-@@ -2,7 +2,7 @@
- "
- " Language:	papp
- " Maintainer:	Marc Lehmann <pcg@goof.com>
--" Last Change:	2003 May 11
-+" Last Change:	2009 Nov 11
- " Filenames:    *.papp *.pxml *.pxsl
- " URL:		http://papp.plan9.de/
- 
-@@ -37,6 +37,7 @@
-     syn include @PAppHtml syntax/html.vim
-   endif
-   unlet b:current_syntax
-+  syntax spell default  " added by Bram
- endif
- 
- if version < 600
-diff -u -r --new-file runtime/syntax.orig/po.vim runtime/syntax/po.vim
---- runtime/syntax.orig/po.vim	2008-06-15 06:29:12.000000000 -0500
-+++ runtime/syntax/po.vim	2008-09-18 13:56:38.000000000 -0500
-@@ -1,10 +1,10 @@
- " Vim syntax file
- " Language:	po (gettext)
- " Maintainer:	Dwayne Bailey <dwayne@translate.org.za>
--" Last Change:	2008 Jan 08
-+" Last Change:	2008 Sep 17
- " Contributors: Dwayne Bailey (Most advanced syntax highlighting)
- "               Leonardo Fontenelle (Spell checking)
--"               Nam SungHyun <namsh@kldp.org> (Original maintainer)
-+"               SungHyun Nam <goweol@gmail.com> (Original maintainer)
- 
- " For version 5.x: Clear all syntax items
- " For version 6.x: Quit when a syntax file was already loaded
-diff -u -r --new-file runtime/syntax.orig/prolog.vim runtime/syntax/prolog.vim
---- runtime/syntax.orig/prolog.vim	2008-05-04 14:21:09.000000000 -0500
-+++ runtime/syntax/prolog.vim	2009-12-16 14:38:21.000000000 -0600
-@@ -1,8 +1,8 @@
- " Vim syntax file
- " Language:    PROLOG
- " Maintainers: Thomas Koehler <jean-luc@picard.franken.de>
--" Last Change: 2008 April 5
--" URL:	       http://gott-gehabt/800_wer_wir_sind/thomas/Homepage/Computer/vim/syntax/prolog.vim
-+" Last Change: 2009 Dec 04
-+" URL:	       http://gott-gehabt.de/800_wer_wir_sind/thomas/Homepage/Computer/vim/syntax/prolog.vim
- 
- " There are two sets of highlighting in here:
- " If the "prolog_highlighting_clean" variable exists, it is rather sparse.
-@@ -63,7 +63,7 @@
-   syn match   prologOperator "=\\=\|=:=\|\\==\|=<\|==\|>=\|\\=\|\\+\|<\|>\|="
-   syn match   prologAsIs     "===\|\\===\|<=\|=>"
- 
--  syn match   prologNumber	      "\<[0123456789]*\>"
-+  syn match   prologNumber	      "\<[0123456789]*\>'\@!"
-   syn match   prologCommentError      "\*/"
-   syn match   prologSpecialCharacter  ";"
-   syn match   prologSpecialCharacter  "!"
-diff -u -r --new-file runtime/syntax.orig/pyrex.vim runtime/syntax/pyrex.vim
---- runtime/syntax.orig/pyrex.vim	2004-06-07 09:32:36.000000000 -0500
-+++ runtime/syntax/pyrex.vim	2009-11-28 06:31:38.000000000 -0600
-@@ -2,7 +2,7 @@
- " Language:	Pyrex
- " Maintainer:	Marco Barisione <marco.bari@people.it>
- " URL:		http://marcobari.altervista.org/pyrex_vim.html
--" Last Change:	2004 May 16
-+" Last Change:	2009 Nov 09
- 
- " For version 5.x: Clear all syntax items
- " For version 6.x: Quit when a syntax file was already loaded
-@@ -25,7 +25,7 @@
- syn keyword pyrexType		int long short float double char object void
- syn keyword pyrexType		signed unsigned
- syn keyword pyrexStructure	struct union enum
--syn keyword pyrexPrecondit	include cimport
-+syn keyword pyrexInclude	include cimport
- syn keyword pyrexAccess		public private property readonly extern
- " If someome wants Python's built-ins highlighted probably he
- " also wants Pyrex's built-ins highlighted
-@@ -35,9 +35,9 @@
- 
- " This deletes "from" from the keywords and re-adds it as a
- " match with lower priority than pyrexForFrom
--syn clear   pythonPreCondit
--syn keyword pythonPreCondit     import
--syn match   pythonPreCondit     "from"
-+syn clear   pythonInclude
-+syn keyword pythonInclude     import
-+syn match   pythonInclude     "from"
- 
- " With "for[^:]*\zsfrom" VIM does not match "for" anymore, so
- " I used the slower "\@<=" form
-@@ -54,7 +54,7 @@
-   HiLink pyrexStatement		Statement
-   HiLink pyrexType		Type
-   HiLink pyrexStructure		Structure
--  HiLink pyrexPrecondit		PreCondit
-+  HiLink pyrexInclude		PreCondit
-   HiLink pyrexAccess		pyrexStatement
-   if exists("python_highlight_builtins") || exists("pyrex_highlight_builtins")
-       HiLink pyrexBuiltin	Function
-diff -u -r --new-file runtime/syntax.orig/python.vim runtime/syntax/python.vim
---- runtime/syntax.orig/python.vim	2006-10-15 16:04:19.000000000 -0500
-+++ runtime/syntax/python.vim	2009-10-28 15:56:59.000000000 -0500
-@@ -1,143 +1,252 @@
- " Vim syntax file
- " Language:	Python
- " Maintainer:	Neil Schemenauer <nas@python.ca>
--" Updated:	2006-10-15
--"		Added Python 2.4 features 2006 May 4 (Dmitry Vasiliev)
-+" Last Change:	2009-10-13
-+" Credits:	Zvezdan Petkovic <zpetkovic@acm.org>
-+"		Neil Schemenauer <nas@python.ca>
-+"		Dmitry Vasiliev
- "
--" Options to control Python syntax highlighting:
-+"		This version is a major rewrite by Zvezdan Petkovic.
- "
--" For highlighted numbers:
-+"		- introduced highlighting of doctests
-+"		- updated keywords, built-ins, and exceptions
-+"		- corrected regular expressions for
- "
--"    let python_highlight_numbers = 1
-+"		  * functions
-+"		  * decorators
-+"		  * strings
-+"		  * escapes
-+"		  * numbers
-+"		  * space error
- "
--" For highlighted builtin functions:
-+"		- corrected synchronization
-+"		- more highlighting is ON by default, except
-+"		- space error highlighting is OFF by default
- "
--"    let python_highlight_builtins = 1
-+" Optional highlighting can be controlled using these variables.
- "
--" For highlighted standard exceptions:
-+"   let python_no_builtin_highlight = 1
-+"   let python_no_doctest_code_highlight = 1
-+"   let python_no_doctest_highlight = 1
-+"   let python_no_exception_highlight = 1
-+"   let python_no_number_highlight = 1
-+"   let python_space_error_highlight = 1
- "
--"    let python_highlight_exceptions = 1
-+" All the options above can be switched on together.
- "
--" Highlight erroneous whitespace:
--"
--"    let python_highlight_space_errors = 1
--"
--" If you want all possible Python highlighting (the same as setting the
--" preceding options):
--"
--"    let python_highlight_all = 1
-+"   let python_highlight_all = 1
- "
- 
--" For version 5.x: Clear all syntax items
--" For version 6.x: Quit when a syntax file was already loaded
-+" For version 5.x: Clear all syntax items.
-+" For version 6.x: Quit when a syntax file was already loaded.
- if version < 600
-   syntax clear
- elseif exists("b:current_syntax")
-   finish
- endif
- 
--
--syn keyword pythonStatement	break continue del
--syn keyword pythonStatement	except exec finally
--syn keyword pythonStatement	pass print raise
--syn keyword pythonStatement	return try with
--syn keyword pythonStatement	global assert
--syn keyword pythonStatement	lambda yield
--syn keyword pythonStatement	def class nextgroup=pythonFunction skipwhite
--syn match   pythonFunction	"[a-zA-Z_][a-zA-Z0-9_]*" contained
-+" Keep Python keywords in alphabetical order inside groups for easy
-+" comparison with the table in the 'Python Language Reference'
-+" http://docs.python.org/reference/lexical_analysis.html#keywords.
-+" Groups are in the order presented in NAMING CONVENTIONS in syntax.txt.
-+" Exceptions come last at the end of each group (class and def below).
-+"
-+" Keywords 'with' and 'as' are new in Python 2.6
-+" (use 'from __future__ import with_statement' in Python 2.5).
-+"
-+" Some compromises had to be made to support both Python 3.0 and 2.6.
-+" We include Python 3.0 features, but when a definition is duplicated,
-+" the last definition takes precedence.
-+"
-+" - 'False', 'None', and 'True' are keywords in Python 3.0 but they are
-+"   built-ins in 2.6 and will be highlighted as built-ins below.
-+" - 'exec' is a built-in in Python 3.0 and will be highlighted as
-+"   built-in below.
-+" - 'nonlocal' is a keyword in Python 3.0 and will be highlighted.
-+" - 'print' is a built-in in Python 3.0 and will be highlighted as
-+"   built-in below (use 'from __future__ import print_function' in 2.6)
-+"
-+syn keyword pythonStatement	False, None, True
-+syn keyword pythonStatement	as assert break continue del exec global
-+syn keyword pythonStatement	lambda nonlocal pass print return with yield
-+syn keyword pythonStatement	class def nextgroup=pythonFunction skipwhite
-+syn keyword pythonConditional	elif else if
- syn keyword pythonRepeat	for while
--syn keyword pythonConditional	if elif else
- syn keyword pythonOperator	and in is not or
--" AS will be a keyword in Python 3
--syn keyword pythonPreCondit	import from as
--syn match   pythonComment	"#.*$" contains=pythonTodo,@Spell
--syn keyword pythonTodo		TODO FIXME XXX contained
-+syn keyword pythonException	except finally raise try
-+syn keyword pythonInclude	from import
- 
- " Decorators (new in Python 2.4)
- syn match   pythonDecorator	"@" display nextgroup=pythonFunction skipwhite
-+" The zero-length non-grouping match before the function name is
-+" extremely important in pythonFunction.  Without it, everything is
-+" interpreted as a function inside the contained environment of
-+" doctests.
-+" A dot must be allowed because of @MyClass.myfunc decorators.
-+syn match   pythonFunction
-+      \ "\%(\%(def\s\|class\s\|@\)\s*\)\@<=\h\%(\w\|\.\)*" contained
-+
-+syn match   pythonComment	"#.*$" contains=pythonTodo,@Spell
-+syn keyword pythonTodo		FIXME NOTE NOTES TODO XXX contained
- 
--" strings
--syn region pythonString		matchgroup=Normal start=+[uU]\='+ end=+'+ skip=+\\\\\|\\'+ contains=pythonEscape,@Spell
--syn region pythonString		matchgroup=Normal start=+[uU]\="+ end=+"+ skip=+\\\\\|\\"+ contains=pythonEscape,@Spell
--syn region pythonString		matchgroup=Normal start=+[uU]\="""+ end=+"""+ contains=pythonEscape,@Spell
--syn region pythonString		matchgroup=Normal start=+[uU]\='''+ end=+'''+ contains=pythonEscape,@Spell
--syn region pythonRawString	matchgroup=Normal start=+[uU]\=[rR]'+ end=+'+ skip=+\\\\\|\\'+ contains=@Spell
--syn region pythonRawString	matchgroup=Normal start=+[uU]\=[rR]"+ end=+"+ skip=+\\\\\|\\"+ contains=@Spell
--syn region pythonRawString	matchgroup=Normal start=+[uU]\=[rR]"""+ end=+"""+ contains=@Spell
--syn region pythonRawString	matchgroup=Normal start=+[uU]\=[rR]'''+ end=+'''+ contains=@Spell
--syn match  pythonEscape		+\\[abfnrtv'"\\]+ contained
--syn match  pythonEscape		"\\\o\{1,3}" contained
--syn match  pythonEscape		"\\x\x\{2}" contained
--syn match  pythonEscape		"\(\\u\x\{4}\|\\U\x\{8}\)" contained
--syn match  pythonEscape		"\\$"
-+" Triple-quoted strings can contain doctests.
-+syn region  pythonString
-+      \ start=+[uU]\=\z(['"]\)+ end="\z1" skip="\\\\\|\\\z1"
-+      \ contains=pythonEscape,@Spell
-+syn region  pythonString
-+      \ start=+[uU]\=\z('''\|"""\)+ end="\z1" keepend
-+      \ contains=pythonEscape,pythonSpaceError,pythonDoctest,@Spell
-+syn region  pythonRawString
-+      \ start=+[uU]\=[rR]\z(['"]\)+ end="\z1" skip="\\\\\|\\\z1"
-+      \ contains=@Spell
-+syn region  pythonRawString
-+      \ start=+[uU]\=[rR]\z('''\|"""\)+ end="\z1" keepend
-+      \ contains=pythonSpaceError,pythonDoctest,@Spell
-+
-+syn match   pythonEscape	+\\[abfnrtv'"\\]+ contained
-+syn match   pythonEscape	"\\\o\{1,3}" contained
-+syn match   pythonEscape	"\\x\x\{2}" contained
-+syn match   pythonEscape	"\%(\\u\x\{4}\|\\U\x\{8}\)" contained
-+" Python allows case-insensitive Unicode IDs: http://www.unicode.org/charts/
-+syn match   pythonEscape	"\\N{\a\+\%(\s\a\+\)*}" contained
-+syn match   pythonEscape	"\\$"
- 
- if exists("python_highlight_all")
--  let python_highlight_numbers = 1
--  let python_highlight_builtins = 1
--  let python_highlight_exceptions = 1
--  let python_highlight_space_errors = 1
-+  if exists("python_no_builtin_highlight")
-+    unlet python_no_builtin_highlight
-+  endif
-+  if exists("python_no_doctest_code_highlight")
-+    unlet python_no_doctest_code_highlight
-+  endif
-+  if exists("python_no_doctest_highlight")
-+    unlet python_no_doctest_highlight
-+  endif
-+  if exists("python_no_exception_highlight")
-+    unlet python_no_exception_highlight
-+  endif
-+  if exists("python_no_number_highlight")
-+    unlet python_no_number_highlight
-+  endif
-+  let python_space_error_highlight = 1
- endif
- 
--if exists("python_highlight_numbers")
-+" It is very important to understand all details before changing the
-+" regular expressions below or their order.
-+" The word boundaries are *not* the floating-point number boundaries
-+" because of a possible leading or trailing decimal point.
-+" The expressions below ensure that all valid number literals are
-+" highlighted, and invalid number literals are not.  For example,
-+"
-+" - a decimal point in '4.' at the end of a line is highlighted,
-+" - a second dot in 1.0.0 is not highlighted,
-+" - 08 is not highlighted,
-+" - 08e0 or 08j are highlighted,
-+"
-+" and so on, as specified in the 'Python Language Reference'.
-+" http://docs.python.org/reference/lexical_analysis.html#numeric-literals
-+if !exists("python_no_number_highlight")
-   " numbers (including longs and complex)
--  syn match   pythonNumber	"\<0x\x\+[Ll]\=\>"
--  syn match   pythonNumber	"\<\d\+[LljJ]\=\>"
--  syn match   pythonNumber	"\.\d\+\([eE][+-]\=\d\+\)\=[jJ]\=\>"
--  syn match   pythonNumber	"\<\d\+\.\([eE][+-]\=\d\+\)\=[jJ]\=\>"
--  syn match   pythonNumber	"\<\d\+\.\d\+\([eE][+-]\=\d\+\)\=[jJ]\=\>"
--endif
--
--if exists("python_highlight_builtins")
--  " builtin functions, types and objects, not really part of the syntax
--  syn keyword pythonBuiltin	True False bool enumerate set frozenset help
--  syn keyword pythonBuiltin	reversed sorted sum
--  syn keyword pythonBuiltin	Ellipsis None NotImplemented __import__ abs
--  syn keyword pythonBuiltin	apply buffer callable chr classmethod cmp
--  syn keyword pythonBuiltin	coerce compile complex delattr dict dir divmod
--  syn keyword pythonBuiltin	eval execfile file filter float getattr globals
--  syn keyword pythonBuiltin	hasattr hash hex id input int intern isinstance
--  syn keyword pythonBuiltin	issubclass iter len list locals long map max
--  syn keyword pythonBuiltin	min object oct open ord pow property range
--  syn keyword pythonBuiltin	raw_input reduce reload repr round setattr
--  syn keyword pythonBuiltin	slice staticmethod str super tuple type unichr
--  syn keyword pythonBuiltin	unicode vars xrange zip
--endif
--
--if exists("python_highlight_exceptions")
--  " builtin exceptions and warnings
--  syn keyword pythonException	ArithmeticError AssertionError AttributeError
--  syn keyword pythonException	DeprecationWarning EOFError EnvironmentError
--  syn keyword pythonException	Exception FloatingPointError IOError
--  syn keyword pythonException	ImportError IndentationError IndexError
--  syn keyword pythonException	KeyError KeyboardInterrupt LookupError
--  syn keyword pythonException	MemoryError NameError NotImplementedError
--  syn keyword pythonException	OSError OverflowError OverflowWarning
--  syn keyword pythonException	ReferenceError RuntimeError RuntimeWarning
--  syn keyword pythonException	StandardError StopIteration SyntaxError
--  syn keyword pythonException	SyntaxWarning SystemError SystemExit TabError
--  syn keyword pythonException	TypeError UnboundLocalError UnicodeError
--  syn keyword pythonException	UnicodeEncodeError UnicodeDecodeError
--  syn keyword pythonException	UnicodeTranslateError
--  syn keyword pythonException	UserWarning ValueError Warning WindowsError
--  syn keyword pythonException	ZeroDivisionError
-+  syn match   pythonNumber	"\<0[oO]\=\o\+[Ll]\=\>"
-+  syn match   pythonNumber	"\<0[xX]\x\+[Ll]\=\>"
-+  syn match   pythonNumber	"\<0[bB][01]\+[Ll]\=\>"
-+  syn match   pythonNumber	"\<\%([1-9]\d*\|0\)[Ll]\=\>"
-+  syn match   pythonNumber	"\<\d\+[jJ]\>"
-+  syn match   pythonNumber	"\<\d\+[eE][+-]\=\d\+[jJ]\=\>"
-+  syn match   pythonNumber
-+	\ "\<\d\+\.\%([eE][+-]\=\d\+\)\=[jJ]\=\%(\W\|$\)\@="
-+  syn match   pythonNumber
-+	\ "\%(^\|\W\)\@<=\d*\.\d\+\%([eE][+-]\=\d\+\)\=[jJ]\=\>"
-+endif
-+
-+" Group the built-ins in the order in the 'Python Library Reference' for
-+" easier comparison.
-+" http://docs.python.org/library/constants.html
-+" http://docs.python.org/library/functions.html
-+" http://docs.python.org/library/functions.html#non-essential-built-in-functions
-+" Python built-in functions are in alphabetical order.
-+if !exists("python_no_builtin_highlight")
-+  " built-in constants
-+  " 'False', 'True', and 'None' are also reserved words in Python 3.0
-+  syn keyword pythonBuiltin	False True None
-+  syn keyword pythonBuiltin	NotImplemented Ellipsis __debug__
-+  " built-in functions
-+  syn keyword pythonBuiltin	abs all any bin bool chr classmethod
-+  syn keyword pythonBuiltin	compile complex delattr dict dir divmod
-+  syn keyword pythonBuiltin	enumerate eval filter float format
-+  syn keyword pythonBuiltin	frozenset getattr globals hasattr hash
-+  syn keyword pythonBuiltin	help hex id input int isinstance
-+  syn keyword pythonBuiltin	issubclass iter len list locals map max
-+  syn keyword pythonBuiltin	min next object oct open ord pow print
-+  syn keyword pythonBuiltin	property range repr reversed round set
-+  syn keyword pythonBuiltin	setattr slice sorted staticmethod str
-+  syn keyword pythonBuiltin	sum super tuple type vars zip __import__
-+  " Python 2.6 only
-+  syn keyword pythonBuiltin	basestring callable cmp execfile file
-+  syn keyword pythonBuiltin	long raw_input reduce reload unichr
-+  syn keyword pythonBuiltin	unicode xrange
-+  " Python 3.0 only
-+  syn keyword pythonBuiltin	ascii bytearray bytes exec memoryview
-+  " non-essential built-in functions; Python 2.6 only
-+  syn keyword pythonBuiltin	apply buffer coerce intern
-+endif
-+
-+" From the 'Python Library Reference' class hierarchy at the bottom.
-+" http://docs.python.org/library/exceptions.html
-+if !exists("python_no_exception_highlight")
-+  " builtin base exceptions (only used as base classes for other exceptions)
-+  syn keyword pythonExceptions	BaseException Exception
-+  syn keyword pythonExceptions	ArithmeticError EnvironmentError
-+  syn keyword pythonExceptions	LookupError
-+  " builtin base exception removed in Python 3.0
-+  syn keyword pythonExceptions	StandardError
-+  " builtin exceptions (actually raised)
-+  syn keyword pythonExceptions	AssertionError AttributeError BufferError
-+  syn keyword pythonExceptions	EOFError FloatingPointError GeneratorExit
-+  syn keyword pythonExceptions	IOError ImportError IndentationError
-+  syn keyword pythonExceptions	IndexError KeyError KeyboardInterrupt
-+  syn keyword pythonExceptions	MemoryError NameError NotImplementedError
-+  syn keyword pythonExceptions	OSError OverflowError ReferenceError
-+  syn keyword pythonExceptions	RuntimeError StopIteration SyntaxError
-+  syn keyword pythonExceptions	SystemError SystemExit TabError TypeError
-+  syn keyword pythonExceptions	UnboundLocalError UnicodeError
-+  syn keyword pythonExceptions	UnicodeDecodeError UnicodeEncodeError
-+  syn keyword pythonExceptions	UnicodeTranslateError ValueError VMSError
-+  syn keyword pythonExceptions	WindowsError ZeroDivisionError
-+  " builtin warnings
-+  syn keyword pythonExceptions	BytesWarning DeprecationWarning FutureWarning
-+  syn keyword pythonExceptions	ImportWarning PendingDeprecationWarning
-+  syn keyword pythonExceptions	RuntimeWarning SyntaxWarning UnicodeWarning
-+  syn keyword pythonExceptions	UserWarning Warning
- endif
- 
--if exists("python_highlight_space_errors")
-+if exists("python_space_error_highlight")
-   " trailing whitespace
--  syn match   pythonSpaceError   display excludenl "\S\s\+$"ms=s+1
-+  syn match   pythonSpaceError	display excludenl "\s\+$"
-   " mixed tabs and spaces
--  syn match   pythonSpaceError   display " \+\t"
--  syn match   pythonSpaceError   display "\t\+ "
-+  syn match   pythonSpaceError	display " \+\t"
-+  syn match   pythonSpaceError	display "\t\+ "
- endif
- 
--" This is fast but code inside triple quoted strings screws it up. It
--" is impossible to fix because the only way to know if you are inside a
--" triple quoted string is to start from the beginning of the file. If
--" you have a fast machine you can try uncommenting the "sync minlines"
--" and commenting out the rest.
--syn sync match pythonSync grouphere NONE "):$"
--syn sync maxlines=200
--"syn sync minlines=2000
-+" Do not spell doctests inside strings.
-+" Notice that the end of a string, either ''', or """, will end the contained
-+" doctest too.  Thus, we do *not* need to have it as an end pattern.
-+if !exists("python_no_doctest_highlight")
-+  if !exists("python_no_doctest_code_higlight")
-+    syn region pythonDoctest
-+	  \ start="^\s*>>>\s" end="^\s*$"
-+	  \ contained contains=ALLBUT,pythonDoctest,@Spell
-+    syn region pythonDoctestValue
-+	  \ start=+^\s*\%(>>>\s\|\.\.\.\s\|"""\|'''\)\@!\S\++ end="$"
-+	  \ contained
-+  else
-+    syn region pythonDoctest
-+	  \ start="^\s*>>>" end="^\s*$"
-+	  \ contained contains=@NoSpell
-+  endif
-+endif
-+
-+" Sync at the beginning of class, function, or method definition.
-+syn sync match pythonSync grouphere NONE "^\s*\%(def\|class\)\s\+\h\w*\s*("
- 
- if version >= 508 || !exists("did_python_syn_inits")
-   if version <= 508
-@@ -147,35 +256,40 @@
-     command -nargs=+ HiLink hi def link <args>
-   endif
- 
--  " The default methods for highlighting.  Can be overridden later
-+  " The default highlight links.  Can be overridden later.
-   HiLink pythonStatement	Statement
--  HiLink pythonFunction		Function
-   HiLink pythonConditional	Conditional
-   HiLink pythonRepeat		Repeat
--  HiLink pythonString		String
--  HiLink pythonRawString	String
--  HiLink pythonEscape		Special
-   HiLink pythonOperator		Operator
--  HiLink pythonPreCondit	PreCondit
-+  HiLink pythonException	Exception
-+  HiLink pythonInclude		Include
-+  HiLink pythonDecorator	Define
-+  HiLink pythonFunction		Function
-   HiLink pythonComment		Comment
-   HiLink pythonTodo		Todo
--  HiLink pythonDecorator	Define
--  if exists("python_highlight_numbers")
--    HiLink pythonNumber	Number
-+  HiLink pythonString		String
-+  HiLink pythonRawString	String
-+  HiLink pythonEscape		Special
-+  if !exists("python_no_number_highlight")
-+    HiLink pythonNumber		Number
-   endif
--  if exists("python_highlight_builtins")
-+  if !exists("python_no_builtin_highlight")
-     HiLink pythonBuiltin	Function
-   endif
--  if exists("python_highlight_exceptions")
--    HiLink pythonException	Exception
-+  if !exists("python_no_exception_highlight")
-+    HiLink pythonExceptions	Structure
-   endif
--  if exists("python_highlight_space_errors")
-+  if exists("python_space_error_highlight")
-     HiLink pythonSpaceError	Error
-   endif
-+  if !exists("python_no_doctest_highlight")
-+    HiLink pythonDoctest	Special
-+    HiLink pythonDoctestValue	Define
-+  endif
- 
-   delcommand HiLink
- endif
- 
- let b:current_syntax = "python"
- 
--" vim: ts=8
-+" vim:set sw=2 sts=2 ts=8 noet:
-diff -u -r --new-file runtime/syntax.orig/readline.vim runtime/syntax/readline.vim
---- runtime/syntax.orig/readline.vim	2007-06-17 10:03:20.000000000 -0500
-+++ runtime/syntax/readline.vim	2009-06-13 07:38:40.000000000 -0500
-@@ -1,7 +1,7 @@
- " Vim syntax file
- " Language:         readline(3) configuration file
- " Maintainer:       Nikolai Weibull <now@bitwi.se>
--" Latest Revision:  2007-06-17
-+" Latest Revision:  2009-05-25
- "   readline_has_bash - if defined add support for bash specific
- "                       settings/functions
- 
-@@ -128,6 +128,7 @@
-                                 \ arrow-key-prefix vi-back-to-indent vi-bword
-                                 \ vi-bWord vi-eword vi-eWord vi-fword vi-fWord
-                                 \ vi-next-word
-+                                \ vi-movement-mode
- 
- if exists("readline_has_bash")
-   syn keyword readlineFunctions contained
-diff -u -r --new-file runtime/syntax.orig/remind.vim runtime/syntax/remind.vim
---- runtime/syntax.orig/remind.vim	2006-05-12 12:55:59.000000000 -0500
-+++ runtime/syntax/remind.vim	2009-10-08 16:18:08.000000000 -0500
-@@ -1,12 +1,13 @@
- " Vim syntax file
- " Language:	Remind
- " Maintainer:	Davide Alberani <alberanid@libero.it>
--" Last Change:	10 May 2006
--" Version:	0.3
-+" Last Change:	18 Sep 2009
-+" Version:	0.5
- " URL:		http://erlug.linux.it/~da/vim/syntax/remind.vim
- "
--" remind is a sophisticated reminder service; you can download remind from:
--" http://www.roaringpenguin.com/penguin/open_source_remind.php
-+" remind is a sophisticated reminder service
-+" you can download remind from:
-+"   http://www.roaringpenguin.com/penguin/open_source_remind.php
- 
- if version < 600
-   syntax clear
-@@ -14,24 +15,30 @@
-   finish
- endif
- 
--" shut case off
-+" shut case off.
- syn case ignore
- 
- syn keyword remindCommands	REM OMIT SET FSET UNSET
--syn keyword remindExpiry	UNTIL SCANFROM SCAN WARN SCHED
-+syn keyword remindExpiry	UNTIL FROM SCANFROM SCAN WARN SCHED
- syn keyword remindTag		PRIORITY TAG
- syn keyword remindTimed		AT DURATION
- syn keyword remindMove		ONCE SKIP BEFORE AFTER
--syn keyword remindSpecial	INCLUDE INC BANNER PUSH-OMIT-CONTEXT PUSH CLEAR-OMIT-CONTEXT CLEAR POP-OMIT-CONTEXT POP
-+syn keyword remindSpecial	INCLUDE INC BANNER PUSH-OMIT-CONTEXT PUSH CLEAR-OMIT-CONTEXT CLEAR POP-OMIT-CONTEXT POP COLOR
- syn keyword remindRun		MSG MSF RUN CAL SATISFY SPECIAL PS PSFILE SHADE MOON
- syn keyword remindConditional	IF ELSE ENDIF IFTRIG
-+syn keyword remindDebug		DEBUG DUMPVARS DUMP ERRMSG FLUSH PRESERVE
- syn match remindComment		"#.*$"
- syn region remindString		start=+'+ end=+'+ skip=+\\\\\|\\'+ oneline
- syn region remindString		start=+"+ end=+"+ skip=+\\\\\|\\"+ oneline
--syn keyword remindDebug		DEBUG DUMPVARS DUMP ERRMSG FLUSH PRESERVE
- syn match remindVar		"\$[_a-zA-Z][_a-zA-Z0-9]*"
- syn match remindSubst		"%[^ ]"
- syn match remindAdvanceNumber	"\(\*\|+\|-\|++\|--\)[0-9]\+"
-+" XXX: use different separators for dates and times?
-+syn match remindDateSeparators	"[/:@\.-]" contained
-+syn match remindTimes		"[0-9]\{1,2}[:\.][0-9]\{1,2}" contains=remindDateSeparators
-+" XXX: why not match only valid dates?  Ok, checking for 'Feb the 30' would
-+"       be impossible, but at least check for valid months and times.
-+syn match remindDates		"'[0-9]\{4}[/-][0-9]\{1,2}[/-][0-9]\{1,2}\(@[0-9]\{1,2}[:\.][0-9]\{1,2}\)\?'" contains=remindDateSeparators
- " This will match trailing whitespaces that seem to break rem2ps.
- " Courtesy of Michael Dunn.
- syn match remindWarning		display excludenl "\S\s\+$"ms=s+1
-@@ -54,11 +61,14 @@
-   HiLink remindRun		Function
-   HiLink remindConditional	Conditional
-   HiLink remindComment		Comment
-+  HiLink remindTimes		String
-   HiLink remindString		String
-   HiLink remindDebug		Debug
-   HiLink remindVar		Identifier
-   HiLink remindSubst		Constant
-   HiLink remindAdvanceNumber	Number
-+  HiLink remindDateSeparators	Comment
-+  HiLink remindDates		String
-   HiLink remindWarning		Error
- 
-   delcommand HiLink
-diff -u -r --new-file runtime/syntax.orig/rhelp.vim runtime/syntax/rhelp.vim
---- runtime/syntax.orig/rhelp.vim	2008-04-10 14:24:17.000000000 -0500
-+++ runtime/syntax/rhelp.vim	2009-05-14 13:53:07.000000000 -0500
-@@ -1,13 +1,14 @@
- " Vim syntax file
- " Language:    R Help File
- " Maintainer:  Johannes Ranke <jranke@uni-bremen.de>
--" Last Change: 2008 Apr 10
--" Version:     0.7.1
--" SVN:		   $Id: rhelp.vim 81 2008-04-10 08:30:11Z ranke $
-+" Last Change: 2009 Mai 12
-+" Version:     0.7.2
-+" SVN:		   $Id: rhelp.vim 86 2009-05-12 19:23:47Z ranke $
- " Remarks:     - Now includes R syntax highlighting in the appropriate
- "                sections if an r.vim file is in the same directory or in the
- "                default debian location.
- "              - There is no Latex markup in equations
-+"              - Thanks to Will Gray for finding and fixing a bug
- 
- " Version Clears: {{{1
- " For version 5.x: Clear all syntax items
-@@ -57,7 +58,7 @@
- 
- " Links {{{1
- syn region rhelpLink matchgroup=rhelpSection start="\\link{" end="}" contained keepend
--syn region rhelpLink matchgroup=rhelpSection start="\\link\[.*\]{" end="}" contained keepend
-+syn region rhelpLink matchgroup=rhelpSection start="\\link\[.\{-}\]{" end="}" contained keepend
- syn region rhelpLink matchgroup=rhelpSection start="\\linkS4class{" end="}" contained keepend
- 
- " Type Styles {{{1
-diff -u -r --new-file runtime/syntax.orig/rnoweb.vim runtime/syntax/rnoweb.vim
---- runtime/syntax.orig/rnoweb.vim	2007-05-05 12:55:31.000000000 -0500
-+++ runtime/syntax/rnoweb.vim	2009-05-05 14:48:52.000000000 -0500
-@@ -1,9 +1,9 @@
- " Vim syntax file
- " Language:    R noweb Files
- " Maintainer:  Johannes Ranke <jranke@uni-bremen.de>
--" Last Change: 2007 Mär 30
--" Version:     0.8
--" SVN:	       $Id: rnoweb.vim,v 1.3 2007/05/05 17:55:31 vimboss Exp $
-+" Last Change: 2009 May 05
-+" Version:     0.9
-+" SVN:	       $Id: rnoweb.vim 84 2009-05-03 19:52:47Z ranke $
- " Remarks:     - This file is inspired by the proposal of 
- "				 Fernando Henrique Ferraz Pereira da Rosa <feferraz@ime.usp.br>
- "			     http://www.ime.usp.br/~feferraz/en/sweavevim.html
-@@ -25,6 +25,7 @@
- unlet b:current_syntax
- 
- syn cluster texMatchGroup add=@rnoweb
-+syn cluster texMathMatchGroup add=rnowebSexpr
- syn cluster texEnvGroup add=@rnoweb
- syn cluster texFoldGroup add=@rnoweb
- syn cluster texDocGroup		add=@rnoweb
-diff -u -r --new-file runtime/syntax.orig/rst.vim runtime/syntax/rst.vim
---- runtime/syntax.orig/rst.vim	2006-07-03 18:49:39.000000000 -0500
-+++ runtime/syntax/rst.vim	2010-02-11 06:41:37.000000000 -0600
-@@ -1,7 +1,7 @@
- " Vim syntax file
- " Language:         reStructuredText documentation format
- " Maintainer:       Nikolai Weibull <now@bitwi.se>
--" Latest Revision:  2006-07-04
-+" Latest Revision:  2010-01-23
- 
- if exists("b:current_syntax")
-   finish
-@@ -12,12 +12,9 @@
- 
- syn case ignore
- 
--" FIXME: The problem with these two is that Vim doesn’t seem to like
--" matching across line boundaries.
--"
--" syn match   rstSections /^.*\n[=`:.'"~^_*+#-]\+$/
-+syn match   rstSections "^\%(\([=`:.'"~^_*+#-]\)\1\+\n\)\=.\+\n\([=`:.'"~^_*+#-]\)\2\+$"
- 
--" syn match   rstTransition  /^\s*[=`:.'"~^_*+#-]\{4,}\s*$/
-+syn match   rstTransition  /^[=`:.'"~^_*+#-]\{4,}\s*$/
- 
- syn cluster rstCruft                contains=rstEmphasis,rstStrongEmphasis,
-       \ rstInterpretedText,rstInlineLiteral,rstSubstitutionReference,
-@@ -140,12 +137,12 @@
- 
- " TODO: Use better syncing.  I don’t know the specifics of syncing well enough,
- " though.
--syn sync minlines=50
-+syn sync minlines=50 linebreaks=1
- 
- hi def link rstTodo                         Todo
- hi def link rstComment                      Comment
--"hi def link rstSections                     Type
--"hi def link rstTransition                   Type
-+hi def link rstSections                     Type
-+hi def link rstTransition                   Type
- hi def link rstLiteralBlock                 String
- hi def link rstQuotedLiteralBlock           String
- hi def link rstDoctestBlock                 PreProc
-diff -u -r --new-file runtime/syntax.orig/samba.vim runtime/syntax/samba.vim
---- runtime/syntax.orig/samba.vim	2004-09-21 04:51:35.000000000 -0500
-+++ runtime/syntax/samba.vim	2009-09-18 05:27:18.000000000 -0500
-@@ -2,8 +2,10 @@
- " Language:	samba configuration files (smb.conf)
- " Maintainer:	Rafael Garcia-Suarez <rgarciasuarez@free.fr>
- " URL:		http://rgarciasuarez.free.fr/vim/syntax/samba.vim
--" Last change:	2004 September 21
--
-+" Last change:	2009 Aug 06
-+"
-+"               New maintainer wanted!
-+"
- " Don't forget to run your config file through testparm(1)!
- 
- " For version 5.x: Clear all syntax items
-@@ -51,7 +53,7 @@
- syn keyword sambaKeyword contained netbios nis notify nt null offset ok ole
- syn keyword sambaKeyword contained only open oplock oplocks options order os
- syn keyword sambaKeyword contained output packet page panic passwd password
--syn keyword sambaKeyword contained passwords path permissions pipe port
-+syn keyword sambaKeyword contained passwords path permissions pipe port ports
- syn keyword sambaKeyword contained postexec postscript prediction preexec
- syn keyword sambaKeyword contained prefered preferred preload preserve print
- syn keyword sambaKeyword contained printable printcap printer printers
-diff -u -r --new-file runtime/syntax.orig/scheme.vim runtime/syntax/scheme.vim
---- runtime/syntax.orig/scheme.vim	2007-06-16 15:09:14.000000000 -0500
-+++ runtime/syntax/scheme.vim	2009-11-28 06:33:43.000000000 -0600
-@@ -1,6 +1,6 @@
- " Vim syntax file
--" Language:	Scheme (R5RS)
--" Last Change:	2007 Jun 16
-+" Language:	Scheme (R5RS + some R6RS extras)
-+" Last Change:	2009 Nov 27
- " Maintainer:	Sergey Khorev <sergey.khorev@gmail.com>
- " Original author:	Dirk van Deun <dirk@igwe.vub.ac.be>
- 
-@@ -26,8 +26,8 @@
- 
- " Fascist highlighting: everything that doesn't fit the rules is an error...
- 
--syn match	schemeError	oneline    ![^ \t()\[\]";]*!
--syn match	schemeError	oneline    ")"
-+syn match	schemeError	![^ \t()\[\]";]*!
-+syn match	schemeError	")"
- 
- " Quoted and backquoted stuff
- 
-@@ -71,6 +71,8 @@
- syn keyword schemeSyntax begin do delay set! else =>
- syn keyword schemeSyntax quote quasiquote unquote unquote-splicing
- syn keyword schemeSyntax define-syntax let-syntax letrec-syntax syntax-rules
-+" R6RS
-+syn keyword schemeSyntax define-record-type fields protocol
- 
- syn keyword schemeFunc not boolean? eq? eqv? equal? pair? cons car cdr set-car!
- syn keyword schemeFunc set-cdr! caar cadr cdar cddr caaar caadr cadar caddr
-@@ -109,30 +111,39 @@
- syn keyword schemeFunc dynamic-wind port? values call-with-values
- syn keyword schemeFunc scheme-report-environment null-environment
- syn keyword schemeFunc interaction-environment
-+" R6RS
-+syn keyword schemeFunc make-eq-hashtable make-eqv-hashtable make-hashtable
-+syn keyword schemeFunc hashtable? hashtable-size hashtable-ref hashtable-set!
-+syn keyword schemeFunc hashtable-delete! hashtable-contains? hashtable-update!
-+syn keyword schemeFunc hashtable-copy hashtable-clear! hashtable-keys
-+syn keyword schemeFunc hashtable-entries hashtable-equivalence-function hashtable-hash-function
-+syn keyword schemeFunc hashtable-mutable? equal-hash string-hash string-ci-hash symbol-hash 
-+syn keyword schemeFunc find for-all exists filter partition fold-left fold-right
-+syn keyword schemeFunc remp remove remv remq memp assp cons*
- 
- " ... so that a single + or -, inside a quoted context, would not be
- " interpreted as a number (outside such contexts, it's a schemeFunc)
- 
--syn match	schemeDelimiter	oneline    !\.[ \t\[\]()";]!me=e-1
--syn match	schemeDelimiter	oneline    !\.$!
-+syn match	schemeDelimiter	!\.[ \t\[\]()";]!me=e-1
-+syn match	schemeDelimiter	!\.$!
- " ... and a single dot is not a number but a delimiter
- 
- " This keeps all other stuff unhighlighted, except *stuff* and <stuff>:
- 
--syn match	schemeOther	oneline    ,[a-z!$%&*/:<=>?^_~+@#%-][-a-z!$%&*/:<=>?^_~0-9+.@#%]*,
--syn match	schemeError	oneline    ,[a-z!$%&*/:<=>?^_~+@#%-][-a-z!$%&*/:<=>?^_~0-9+.@#%]*[^-a-z!$%&*/:<=>?^_~0-9+.@ \t\[\]()";]\+[^ \t\[\]()";]*,
-+syn match	schemeOther	,[a-z!$%&*/:<=>?^_~+@#%-][-a-z!$%&*/:<=>?^_~0-9+.@#%]*,
-+syn match	schemeError	,[a-z!$%&*/:<=>?^_~+@#%-][-a-z!$%&*/:<=>?^_~0-9+.@#%]*[^-a-z!$%&*/:<=>?^_~0-9+.@ \t\[\]()";]\+[^ \t\[\]()";]*,
- 
--syn match	schemeOther	oneline    "\.\.\."
--syn match	schemeError	oneline    !\.\.\.[^ \t\[\]()";]\+!
-+syn match	schemeOther	"\.\.\."
-+syn match	schemeError	!\.\.\.[^ \t\[\]()";]\+!
- " ... a special identifier
- 
--syn match	schemeConstant	oneline    ,\*[-a-z!$%&*/:<=>?^_~0-9+.@]*\*[ \t\[\]()";],me=e-1
--syn match	schemeConstant	oneline    ,\*[-a-z!$%&*/:<=>?^_~0-9+.@]*\*$,
--syn match	schemeError	oneline    ,\*[-a-z!$%&*/:<=>?^_~0-9+.@]*\*[^-a-z!$%&*/:<=>?^_~0-9+.@ \t\[\]()";]\+[^ \t\[\]()";]*,
--
--syn match	schemeConstant	oneline    ,<[-a-z!$%&*/:<=>?^_~0-9+.@]*>[ \t\[\]()";],me=e-1
--syn match	schemeConstant	oneline    ,<[-a-z!$%&*/:<=>?^_~0-9+.@]*>$,
--syn match	schemeError	oneline    ,<[-a-z!$%&*/:<=>?^_~0-9+.@]*>[^-a-z!$%&*/:<=>?^_~0-9+.@ \t\[\]()";]\+[^ \t\[\]()";]*,
-+syn match	schemeConstant	,\*[-a-z!$%&*/:<=>?^_~0-9+.@]\+\*[ \t\[\]()";],me=e-1
-+syn match	schemeConstant	,\*[-a-z!$%&*/:<=>?^_~0-9+.@]\+\*$,
-+syn match	schemeError	,\*[-a-z!$%&*/:<=>?^_~0-9+.@]*\*[^-a-z!$%&*/:<=>?^_~0-9+.@ \t\[\]()";]\+[^ \t\[\]()";]*,
-+
-+syn match	schemeConstant	,<[-a-z!$%&*/:<=>?^_~0-9+.@]*>[ \t\[\]()";],me=e-1
-+syn match	schemeConstant	,<[-a-z!$%&*/:<=>?^_~0-9+.@]*>$,
-+syn match	schemeError	,<[-a-z!$%&*/:<=>?^_~0-9+.@]*>[^-a-z!$%&*/:<=>?^_~0-9+.@ \t\[\]()";]\+[^ \t\[\]()";]*,
- 
- " Non-quoted lists, and strings:
- 
-@@ -153,23 +164,27 @@
- " Writing out the complete description of Scheme numerals without
- " using variables is a day's work for a trained secretary...
- 
--syn match	schemeOther	oneline    ![+-][ \t\[\]()";]!me=e-1
--syn match	schemeOther	oneline    ![+-]$!
-+syn match	schemeOther	![+-][ \t\[\]()";]!me=e-1
-+syn match	schemeOther	![+-]$!
- "
- " This is a useful lax approximation:
--syn match	schemeNumber	oneline    "[-#+0-9.][-#+/0-9a-f@i.boxesfdl]*"
--syn match	schemeError	oneline    ![-#+0-9.][-#+/0-9a-f@i.boxesfdl]*[^-#+/0-9a-f@i.boxesfdl \t\[\]()";][^ \t\[\]()";]*!
-+syn match	schemeNumber	"[-#+.]\=[0-9][-#+/0-9a-f@i.boxesfdl]*"
-+syn match	schemeError	![-#+0-9.][-#+/0-9a-f@i.boxesfdl]*[^-#+/0-9a-f@i.boxesfdl \t\[\]()";][^ \t\[\]()";]*!
- 
--syn match	schemeBoolean	oneline    "#[tf]"
--syn match	schemeError	oneline    !#[tf][^ \t\[\]()";]\+!
-+syn match	schemeBoolean	"#[tf]"
-+syn match	schemeError	!#[tf][^ \t\[\]()";]\+!
-+
-+syn match	schemeCharacter	"#\\"
-+syn match	schemeCharacter	"#\\."
-+syn match       schemeError	!#\\.[^ \t\[\]()";]\+!
-+syn match	schemeCharacter	"#\\space"
-+syn match	schemeError	!#\\space[^ \t\[\]()";]\+!
-+syn match	schemeCharacter	"#\\newline"
-+syn match	schemeError	!#\\newline[^ \t\[\]()";]\+!
-+
-+" R6RS
-+syn match schemeCharacter "#\\x[0-9a-fA-F]\+"
- 
--syn match	schemeChar	oneline    "#\\"
--syn match	schemeChar	oneline    "#\\."
--syn match       schemeError	oneline    !#\\.[^ \t\[\]()";]\+!
--syn match	schemeChar	oneline    "#\\space"
--syn match	schemeError	oneline    !#\\space[^ \t\[\]()";]\+!
--syn match	schemeChar	oneline    "#\\newline"
--syn match	schemeError	oneline    !#\\newline[^ \t\[\]()";]\+!
- 
- if exists("b:is_mzscheme") || exists("is_mzscheme")
-     " MzScheme extensions
-@@ -177,11 +192,11 @@
-     syn region	schemeComment start="#|" end="|#"
- 
-     " #%xxx are the special MzScheme identifiers
--    syn match schemeOther oneline    "#%[-a-z!$%&*/:<=>?^_~0-9+.@#%]\+"
-+    syn match schemeOther "#%[-a-z!$%&*/:<=>?^_~0-9+.@#%]\+"
-     " anything limited by |'s is identifier
--    syn match schemeOther oneline    "|[^|]\+|"
-+    syn match schemeOther "|[^|]\+|"
- 
--    syn match	schemeChar	oneline    "#\\\%(return\|tab\)"
-+    syn match	schemeCharacter	"#\\\%(return\|tab\)"
- 
-     " Modules require stmt
-     syn keyword schemeExtSyntax module require dynamic-require lib prefix all-except prefix-all-except rename
-@@ -234,8 +249,8 @@
-     " multiline comment
-     syntax region schemeMultilineComment start=/#|/ end=/|#/ contains=schemeMultilineComment
- 
--    syn match schemeOther oneline    "##[-a-z!$%&*/:<=>?^_~0-9+.@#%]\+"
--    syn match schemeExtSyntax oneline    "#:[-a-z!$%&*/:<=>?^_~0-9+.@#%]\+"
-+    syn match schemeOther "##[-a-z!$%&*/:<=>?^_~0-9+.@#%]\+"
-+    syn match schemeExtSyntax "#:[-a-z!$%&*/:<=>?^_~0-9+.@#%]\+"
- 
-     syn keyword schemeExtSyntax unit uses declare hide foreign-declare foreign-parse foreign-parse/spec
-     syn keyword schemeExtSyntax foreign-lambda foreign-lambda* define-external define-macro load-library
-@@ -266,7 +281,7 @@
-     endif
- 
-     " suggested by Alex Queiroz
--    syn match schemeExtSyntax oneline    "#![-a-z!$%&*/:<=>?^_~0-9+.@#%]\+"
-+    syn match schemeExtSyntax "#![-a-z!$%&*/:<=>?^_~0-9+.@#%]\+"
-     syn region schemeString start=+#<#\s*\z(.*\)+ end=+^\z1$+ 
- endif
- 
-@@ -290,7 +305,7 @@
-   HiLink schemeFunc		Function
- 
-   HiLink schemeString		String
--  HiLink schemeChar		Character
-+  HiLink schemeCharacter	Character
-   HiLink schemeNumber		Number
-   HiLink schemeBoolean		Boolean
- 
-diff -u -r --new-file runtime/syntax.orig/screen.vim runtime/syntax/screen.vim
---- runtime/syntax.orig/screen.vim	2006-04-21 07:41:02.000000000 -0500
-+++ runtime/syntax/screen.vim	2010-01-12 14:33:53.000000000 -0600
-@@ -1,7 +1,7 @@
- " Vim syntax file
- " Language:         screen(1) configuration file
- " Maintainer:       Nikolai Weibull <now@bitwi.se>
--" Latest Revision:  2006-04-19
-+" Latest Revision:  2010-01-03
- 
- if exists("b:current_syntax")
-   finish
-@@ -15,54 +15,219 @@
- syn keyword screenTodo      contained TODO FIXME XXX NOTE
- 
- syn region  screenComment   display oneline start='#' end='$'
--                            \ contains=screenTodo,@Spell
-+                          \ contains=screenTodo,@Spell
- 
- syn region  screenString    display oneline start=+"+ skip=+\\"+ end=+"+
--                            \ contains=screenVariable,screenSpecial
-+                          \ contains=screenVariable,screenSpecial
- 
- syn region  screenLiteral   display oneline start=+'+ skip=+\\'+ end=+'+
- 
--syn match   screenVariable  contained display '$\(\h\w*\|{\h\w*}\)'
-+syn match   screenVariable  contained display '$\%(\h\w*\|{\h\w*}\)'
- 
- syn keyword screenBoolean   on off
- 
- syn match   screenNumbers   display '\<\d\+\>'
- 
- syn match   screenSpecials  contained
--                            \ '%\([%aAdDhlmMstuwWyY?:{]\|[0-9]*n\|0?cC\)'
-+                          \ '%\%([%aAdDhlmMstuwWyY?:{]\|[0-9]*n\|0?cC\)'
- 
--syn keyword screenCommands  acladd aclchg acldel aclgrp aclumask activity
--                            \ addacl allpartial at attrcolor autodetach
--                            \ bell_msg bind bindkey bufferfile caption chacl
--                            \ chdir clear colon command compacthist console
--                            \ copy copy_regcrlf debug detach digraph dinfo
--                            \ crlf displays dumptermcap echo exec fit focus
--                            \ height help history info kill lastmsg license
--                            \ lockscreen markkeys meta msgminwait msgwait
--                            \ multiuser nethack next nonblock number only
--                            \ other partial_state password paste pastefont
--                            \ pow_break pow_detach_msg prev printcmd process
--                            \ quit readbuf readreg redisplay register
--                            \ remove removebuf reset resize screen select
--                            \ sessionname setenv shelltitle silencewait
--                            \ verbose sleep sorendition split startup_message
--                            \ stuff su suspend time title umask version wall
--                            \ width writebuf xoff xon defmode hardstatus
--                            \ altscreen break breaktype copy_reg defbreaktype
--                            \ defencoding deflog encoding eval ignorecase
--                            \ ins_reg maxwin partial pow_detach setsid source
--                            \ unsetenv windowlist windows defautonuke autonuke
--                            \ defbce bce defc1 c1 defcharset charset defescape
--                            \ escape defflow flow defkanji kanji deflogin
--                            \ login defmonitor monitor defhstatus hstatus
--                            \ defobuflimit obuflimit defscrollback scrollback
--                            \ defshell shell defsilence silence defslowpaste
--                            \ slowpaste defutf8 utf8 defwrap wrap defwritelock
--                            \ writelock defzombie zombie defgr gr hardcopy
--                            \ hardcopy_append hardcopydir hardstatus log
--                            \ logfile login logtstamp mapdefault mapnotnext
--                            \ maptimeout term termcap terminfo termcapinfo
--                            \ vbell vbell_msg vbellwait
-+syn keyword screenCommands
-+                          \ acladd
-+                          \ aclchg
-+                          \ acldel
-+                          \ aclgrp
-+                          \ aclumask
-+                          \ activity
-+                          \ addacl
-+                          \ allpartial
-+                          \ altscreen
-+                          \ at
-+                          \ attrcolor
-+                          \ autodetach
-+                          \ autonuke
-+                          \ backtick
-+                          \ bce
-+                          \ bd_bc_down
-+                          \ bd_bc_left
-+                          \ bd_bc_right
-+                          \ bd_bc_up
-+                          \ bd_bell
-+                          \ bd_braille_table
-+                          \ bd_eightdot
-+                          \ bd_info
-+                          \ bd_link
-+                          \ bd_lower_left
-+                          \ bd_lower_right
-+                          \ bd_ncrc
-+                          \ bd_port
-+                          \ bd_scroll
-+                          \ bd_skip
-+                          \ bd_start_braille
-+                          \ bd_type
-+                          \ bd_upper_left
-+                          \ bd_upper_right
-+                          \ bd_width
-+                          \ bell
-+                          \ bell_msg
-+                          \ bind
-+                          \ bindkey
-+                          \ blanker
-+                          \ blankerprg
-+                          \ break
-+                          \ breaktype
-+                          \ bufferfile
-+                          \ c1
-+                          \ caption
-+                          \ chacl
-+                          \ charset
-+                          \ chdir
-+                          \ clear
-+                          \ colon
-+                          \ command
-+                          \ compacthist
-+                          \ console
-+                          \ copy
-+                          \ crlf
-+                          \ debug
-+                          \ defautonuke
-+                          \ defbce
-+                          \ defbreaktype
-+                          \ defc1
-+                          \ defcharset
-+                          \ defencoding
-+                          \ defescape
-+                          \ defflow
-+                          \ defgr
-+                          \ defhstatus
-+                          \ defkanji
-+                          \ deflog
-+                          \ deflogin
-+                          \ defmode
-+                          \ defmonitor
-+                          \ defnonblock
-+                          \ defobuflimit
-+                          \ defscrollback
-+                          \ defshell
-+                          \ defsilence
-+                          \ defslowpaste
-+                          \ defutf8
-+                          \ defwrap
-+                          \ defwritelock
-+                          \ detach
-+                          \ digraph
-+                          \ dinfo
-+                          \ displays
-+                          \ dumptermcap
-+                          \ echo
-+                          \ encoding
-+                          \ escape
-+                          \ eval
-+                          \ exec
-+                          \ fit
-+                          \ flow
-+                          \ focus
-+                          \ gr
-+                          \ hardcopy
-+                          \ hardcopy_append
-+                          \ hardcopydir
-+                          \ hardstatus
-+                          \ height
-+                          \ help
-+                          \ history
-+                          \ hstatus
-+                          \ idle
-+                          \ ignorecase
-+                          \ info
-+                          \ kanji
-+                          \ kill
-+                          \ lastmsg
-+                          \ layout
-+                          \ license
-+                          \ lockscreen
-+                          \ log
-+                          \ logfile
-+                          \ login
-+                          \ logtstamp
-+                          \ mapdefault
-+                          \ mapnotnext
-+                          \ maptimeout
-+                          \ markkeys
-+                          \ maxwin
-+                          \ meta
-+                          \ monitor
-+                          \ msgminwait
-+                          \ msgwait
-+                          \ multiuser
-+                          \ nethack
-+                          \ next
-+                          \ nonblock
-+                          \ number
-+                          \ obuflimit
-+                          \ only
-+                          \ other
-+                          \ partial
-+                          \ password
-+                          \ paste
-+                          \ pastefont
-+                          \ pow_break
-+                          \ pow_detach
-+                          \ pow_detach_msg
-+                          \ prev
-+                          \ printcmd
-+                          \ process
-+                          \ quit
-+                          \ readbuf
-+                          \ readreg
-+                          \ redisplay
-+                          \ register
-+                          \ remove
-+                          \ removebuf
-+                          \ reset
-+                          \ resize
-+                          \ screen
-+                          \ scrollback
-+                          \ select
-+                          \ sessionname
-+                          \ setenv
-+                          \ setsid
-+                          \ shell
-+                          \ shelltitle
-+                          \ silence
-+                          \ silencewait
-+                          \ sleep
-+                          \ slowpaste
-+                          \ sorendition
-+                          \ source
-+                          \ split
-+                          \ startup_message
-+                          \ stuff
-+                          \ su
-+                          \ suspend
-+                          \ term
-+                          \ termcap
-+                          \ termcapinfo
-+                          \ terminfo
-+                          \ time
-+                          \ title
-+                          \ umask
-+                          \ unsetenv
-+                          \ utf8
-+                          \ vbell
-+                          \ vbell_msg
-+                          \ vbellwait
-+                          \ verbose
-+                          \ version
-+                          \ wall
-+                          \ width
-+                          \ windowlist
-+                          \ windows
-+                          \ wrap
-+                          \ writebuf
-+                          \ writelock
-+                          \ xoff
-+                          \ xon
-+                          \ zmodem
-+                          \ zombie
- 
- hi def link screenEscape    Special
- hi def link screenComment   Comment
-diff -u -r --new-file runtime/syntax.orig/sdc.vim runtime/syntax/sdc.vim
---- runtime/syntax.orig/sdc.vim	1969-12-31 18:00:00.000000000 -0600
-+++ runtime/syntax/sdc.vim	2009-05-05 13:28:48.000000000 -0500
-@@ -0,0 +1,41 @@
-+" Vim syntax file
-+" Language:     SDC - Synopsys Design Constraints
-+" Maintainer:   Maurizio Tranchero - maurizio.tranchero@gmail.com
-+" Last Change:  Thu Mar  25 17:35:16 CET 2009
-+" Credits:      based on TCL Vim syntax file
-+" Version:	0.3
-+
-+" Quit when a syntax file was already loaded
-+if exists("b:current_syntax")
-+  finish
-+endif
-+
-+" Read the TCL syntax to start with
-+runtime! syntax/tcl.vim
-+
-+" SDC-specific keywords
-+syn keyword sdcCollections	foreach_in_collection
-+syn keyword sdcObjectsQuery	get_clocks get_ports
-+syn keyword sdcObjectsInfo	get_point_info get_node_info get_path_info
-+syn keyword sdcObjectsInfo	get_timing_paths set_attribute
-+syn keyword sdcConstraints	set_false_path
-+syn keyword sdcNonIdealities	set_min_delay set_max_delay
-+syn keyword sdcNonIdealities	set_input_delay set_output_delay
-+syn keyword sdcNonIdealities	set_load set_min_capacitance set_max_capacitance
-+syn keyword sdcCreateOperations	create_clock create_timing_netlist update_timing_netlist
-+
-+" command flags highlighting
-+syn match sdcFlags		"[[:space:]]-[[:alpha:]]*\>"
-+
-+" Define the default highlighting.
-+hi def link sdcCollections      Repeat
-+hi def link sdcObjectsInfo      Operator
-+hi def link sdcCreateOperations	Operator
-+hi def link sdcObjectsQuery	Operator
-+hi def link sdcConstraints	Operator
-+hi def link sdcNonIdealities	Operator
-+hi def link sdcFlags		Special
-+
-+let b:current_syntax = "sdc"
-+
-+" vim: ts=8
-diff -u -r --new-file runtime/syntax.orig/sgmllnx.vim runtime/syntax/sgmllnx.vim
---- runtime/syntax.orig/sgmllnx.vim	2004-06-07 09:32:35.000000000 -0500
-+++ runtime/syntax/sgmllnx.vim	2008-09-18 13:56:21.000000000 -0500
-@@ -1,8 +1,8 @@
- " Vim syntax file
- " Language:	SGML-linuxdoc (supported by old sgmltools-1.x)
- "		(for more information, visit www.sgmltools.org)
--" Maintainer:	Nam SungHyun <namsh@kldp.org>
--" Last Change:	2001 Apr 26
-+" Maintainer:	SungHyun Nam <goweol@gmail.com>
-+" Last Change:	2008 Sep 17
- 
- " For version 5.x: Clear all syntax items
- " For version 6.x: Quit when a syntax file was already loaded
-diff -u -r --new-file runtime/syntax.orig/sh.vim runtime/syntax/sh.vim
---- runtime/syntax.orig/sh.vim	2008-07-14 15:23:42.000000000 -0500
-+++ runtime/syntax/sh.vim	2010-01-12 14:45:24.000000000 -0600
-@@ -2,8 +2,8 @@
- " Language:		shell (sh) Korn shell (ksh) bash (sh)
- " Maintainer:		Dr. Charles E. Campbell, Jr.  <NdrOchipS@PcampbellAfamily.Mbiz>
- " Previous Maintainer:	Lennart Schultz <Lennart.Schultz@ecmwf.int>
--" Last Change:		Jul 11, 2008
--" Version:		102
-+" Last Change:		Nov 17, 2009
-+" Version:		110
- " URL:		http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax
- " For options and settings, please use:      :help ft-sh-syntax
- " This file includes many ideas from Éric Brunet (eric.brunet@ens.fr)
-@@ -67,13 +67,13 @@
- 
- " Clusters: contains=@... clusters {{{1
- "==================================
--syn cluster shErrorList	contains=shDoError,shIfError,shInError,shCaseError,shEsacError,shCurlyError,shParenError,shTestError
-+syn cluster shErrorList	contains=shDoError,shIfError,shInError,shCaseError,shEsacError,shCurlyError,shParenError,shTestError,shOK
- if exists("b:is_kornshell")
-  syn cluster ErrorList add=shDTestError
- endif
--syn cluster shArithParenList	contains=shArithmetic,shDeref,shDerefSimple,shEscape,shNumber,shOperator,shPosnParm,shExSingleQuote,shSingleQuote,shDoubleQuote,shStatement,shVariable,shAlias,shTest,shCtrlSeq,shSpecial,shParen
-+syn cluster shArithParenList	contains=shArithmetic,shCaseEsac,shDeref,shDerefSimple,shEcho,shEscape,shNumber,shOperator,shPosnParm,shExSingleQuote,shRedir,shSingleQuote,shDoubleQuote,shStatement,shVariable,shAlias,shTest,shCtrlSeq,shSpecial,shParen,bashSpecialVariables,bashStatement
- syn cluster shArithList	contains=@shArithParenList,shParenError
--syn cluster shCaseEsacList	contains=shCaseStart,shCase,shCaseBar,shCaseIn,shComment,shDeref,shDerefSimple,shCaseCommandSub,shCaseExSingleQuote,shCaseSingleQuote,shCaseDoubleQuote,shCtrlSeq,@shErrorList,shStringSpecial
-+syn cluster shCaseEsacList	contains=shCaseStart,shCase,shCaseBar,shCaseIn,shComment,shDeref,shDerefSimple,shCaseCommandSub,shCaseExSingleQuote,shCaseSingleQuote,shCaseDoubleQuote,shCtrlSeq,@shErrorList,shStringSpecial,shCaseRange
- syn cluster shCaseList	contains=@shCommandSubList,shCaseEsac,shColon,shCommandSub,shCommandSub,shComment,shDo,shEcho,shExpr,shFor,shHereDoc,shIf,shRedir,shSetList,shSource,shStatement,shVariable,shCtrlSeq
- syn cluster shColonList	contains=@shCaseList
- syn cluster shCommandSubList	contains=shArithmetic,shDeref,shDerefSimple,shEscape,shNumber,shOperator,shPosnParm,shExSingleQuote,shSingleQuote,shDoubleQuote,shStatement,shVariable,shSubSh,shAlias,shTest,shCtrlSeq,shSpecial
-@@ -84,7 +84,7 @@
- syn cluster shEchoList	contains=shArithmetic,shCommandSub,shDeref,shDerefSimple,shExpr,shExSingleQuote,shSingleQuote,shDoubleQuote,shCtrlSeq,shEchoQuote
- syn cluster shExprList1	contains=shCharClass,shNumber,shOperator,shExSingleQuote,shSingleQuote,shDoubleQuote,shExpr,shDblBrace,shDeref,shDerefSimple,shCtrlSeq
- syn cluster shExprList2	contains=@shExprList1,@shCaseList,shTest
--syn cluster shFunctionList	contains=@shCommandSubList,shCaseEsac,shColon,shCommandSub,shCommandSub,shComment,shDo,shEcho,shExpr,shFor,shHereDoc,shIf,shRedir,shSetList,shSource,shStatement,shVariable,shOperator,shCtrlSeq
-+syn cluster shFunctionList	contains=@shCommandSubList,shCaseEsac,shColon,shCommandSub,shCommandSub,shComment,shDo,shEcho,shExpr,shFor,shHereDoc,shIf,shOption,shRedir,shSetList,shSource,shStatement,shVariable,shOperator,shCtrlSeq
- if exists("b:is_kornshell") || exists("b:is_bash")
-  syn cluster shFunctionList	add=shRepeat
-  syn cluster shFunctionList	add=shDblBrace,shDblParen
-@@ -94,19 +94,18 @@
- syn cluster shHereListDQ	contains=shBeginHere,@shDblQuoteList,shHerePayload
- syn cluster shIdList	contains=shCommandSub,shWrapLineOperator,shSetOption,shDeref,shDerefSimple,shRedir,shExSingleQuote,shSingleQuote,shDoubleQuote,shExpr,shCtrlSeq,shStringSpecial
- syn cluster shLoopList	contains=@shCaseList,shTestOpr,shExpr,shDblBrace,shConditional,shCaseEsac,shTest,@shErrorList,shSet
--syn cluster shSubShList	contains=@shCaseList,shOperator
-+syn cluster shSubShList	contains=@shCommandSubList,shCaseEsac,shColon,shCommandSub,shCommandSub,shComment,shDo,shEcho,shExpr,shFor,shIf,shRedir,shSetList,shSource,shStatement,shVariable,shCtrlSeq,shOperator
- syn cluster shTestList	contains=shCharClass,shComment,shCommandSub,shDeref,shDerefSimple,shDoubleQuote,shExpr,shExpr,shNumber,shOperator,shExSingleQuote,shSingleQuote,shTestOpr,shTest,shCtrlSeq
- 
--
- " Echo: {{{1
- " ====
- " This one is needed INSIDE a CommandSub, so that `echo bla` be correct
--syn region shEcho matchgroup=shStatement start="\<echo\>"  skip="\\$" matchgroup=shOperator end="$" matchgroup=NONE end="[<>;&|()]"me=e-1 end="\d[<>]"me=e-2 end="#"me=e-1 contains=@shEchoList skipwhite nextgroup=shQuickComment
--syn region shEcho matchgroup=shStatement start="\<print\>" skip="\\$" matchgroup=shOperator end="$" matchgroup=NONE end="[<>;&|()]"me=e-1 end="\d[<>]"me=e-2 end="#"me=e-1 contains=@shEchoList skipwhite nextgroup=shQuickComment
--syn match  shEchoQuote contained	'\%(\\\\\)*\\["`']'
-+syn region shEcho matchgroup=shStatement start="\<echo\>"  skip="\\$" matchgroup=shOperator end="$" matchgroup=NONE end="[<>;&|()]"me=e-1 end="\d[<>]"me=e-2 end="\s#"me=e-2 contains=@shEchoList skipwhite nextgroup=shQuickComment
-+syn region shEcho matchgroup=shStatement start="\<print\>" skip="\\$" matchgroup=shOperator end="$" matchgroup=NONE end="[<>;&|()]"me=e-1 end="\d[<>]"me=e-2 end="\s#"me=e-2 contains=@shEchoList skipwhite nextgroup=shQuickComment
-+syn match  shEchoQuote contained	'\%(\\\\\)*\\["`'()]'
- 
- " This must be after the strings, so that ... \" will be correct
--syn region shEmbeddedEcho contained matchgroup=shStatement start="\<print\>" skip="\\$" matchgroup=shOperator end="$" matchgroup=NONE end="[<>;&|`)]"me=e-1 end="\d[<>]"me=e-2 end="#"me=e-1 contains=shNumber,shExSingleQuote,shSingleQuote,shDeref,shDerefSimple,shSpecialVar,shOperator,shDoubleQuote,shCharClass,shCtrlSeq
-+syn region shEmbeddedEcho contained matchgroup=shStatement start="\<print\>" skip="\\$" matchgroup=shOperator end="$" matchgroup=NONE end="[<>;&|`)]"me=e-1 end="\d[<>]"me=e-2 end="\s#"me=e-2 contains=shNumber,shExSingleQuote,shSingleQuote,shDeref,shDerefSimple,shSpecialVar,shOperator,shDoubleQuote,shCharClass,shCtrlSeq
- 
- " Alias: {{{1
- " =====
-@@ -125,6 +124,7 @@
- syn match   shEsacError "\<esac\>"
- syn match   shCurlyError "}"
- syn match   shParenError ")"
-+syn match   shOK	'\.\(done\|fi\|in\|esac\)'
- if exists("b:is_kornshell")
-  syn match     shDTestError "]]"
- endif
-@@ -152,14 +152,13 @@
- 
- " Subshells: {{{1
- " ==========
--syn region shExpr  transparent matchgroup=shExprRegion  start="{" end="}"	contains=@shExprList2
--syn region shSubSh transparent matchgroup=shSubShRegion start="(" end=")"	contains=@shSubShList
-+syn region shExpr  transparent matchgroup=shExprRegion  start="{" end="}"	contains=@shExprList2 nextgroup=shMoreSpecial
-+syn region shSubSh transparent matchgroup=shSubShRegion start="(" end=")"	contains=@shSubShList nextgroup=shMoreSpecial
- 
- " Tests: {{{1
- "=======
--"syn region  shExpr transparent matchgroup=shRange start="\[" skip=+\\\\\|\\$+ end="\]" contains=@shTestList
--syn region shExpr	matchgroup=shRange start="\[" skip=+\\\\\|\\$+ end="\]" contains=@shTestList
--syn region shTest	transparent matchgroup=shStatement start="\<test\>" skip=+\\\\\|\\$+ matchgroup=NONE end="[;&|]"me=e-1 end="$" contains=@shExprList1
-+syn region shExpr	matchgroup=shRange start="\[" skip=+\\\\\|\\$+ end="\]" contains=@shTestList,shSpecial
-+syn region shTest	transparent matchgroup=shStatement start="\<test\s" skip=+\\\\\|\\$+ matchgroup=NONE end="[;&|]"me=e-1 end="$" contains=@shExprList1
- syn match  shTestOpr	contained	"<=\|>=\|!=\|==\|-.\>\|-\(nt\|ot\|ef\|eq\|ne\|lt\|le\|gt\|ge\)\>\|[!<>]"
- syn match  shTestOpr	contained	'=' skipwhite nextgroup=shTestDoubleQuote,shTestSingleQuote,shTestPattern
- syn match  shTestPattern	contained	'\w\+'
-@@ -203,10 +202,11 @@
- " ====
- syn match   shCaseBar	contained skipwhite "\(^\|[^\\]\)\(\\\\\)*\zs|"		nextgroup=shCase,shCaseStart,shCaseBar,shComment,shCaseExSingleQuote,shCaseSingleQuote,shCaseDoubleQuote
- syn match   shCaseStart	contained skipwhite skipnl "("			nextgroup=shCase,shCaseBar
--syn region  shCase	contained skipwhite skipnl matchgroup=shSnglCase start="\%(\\.\|[^#$()'" \t]\)\{-}\zs)"  end=";;" end="esac"me=s-1 contains=@shCaseList nextgroup=shCaseStart,shCase,shComment
- if (g:sh_fold_enabled % (s:sh_fold_ifdofor * 2))/s:sh_fold_ifdofor
-+ syn region  shCase	fold contained skipwhite skipnl matchgroup=shSnglCase start="\%(\\.\|[^#$()'" \t]\)\{-}\zs)"  end=";;" end="esac"me=s-1 contains=@shCaseList nextgroup=shCaseStart,shCase,shComment
-  syn region  shCaseEsac	fold matchgroup=shConditional start="\<case\>" end="\<esac\>"	contains=@shCaseEsacList
- else
-+ syn region  shCase	contained skipwhite skipnl matchgroup=shSnglCase start="\%(\\.\|[^#$()'" \t]\)\{-}\zs)"  end=";;" end="esac"me=s-1 contains=@shCaseList nextgroup=shCaseStart,shCase,shComment
-  syn region  shCaseEsac	matchgroup=shConditional start="\<case\>" end="\<esac\>"	contains=@shCaseEsacList
- endif
- syn keyword shCaseIn	contained skipwhite skipnl in			nextgroup=shCase,shCaseStart,shCaseBar,shComment,shCaseExSingleQuote,shCaseSingleQuote,shCaseDoubleQuote
-@@ -218,6 +218,7 @@
- syn region  shCaseSingleQuote	matchgroup=shOperator start=+'+ end=+'+		contains=shStringSpecial		skipwhite skipnl nextgroup=shCaseBar	contained
- syn region  shCaseDoubleQuote	matchgroup=shOperator start=+"+ skip=+\\\\\|\\.+ end=+"+	contains=@shDblQuoteList,shStringSpecial	skipwhite skipnl nextgroup=shCaseBar	contained
- syn region  shCaseCommandSub	start=+`+ skip=+\\\\\|\\.+ end=+`+		contains=@shCommandSubList		skipwhite skipnl nextgroup=shCaseBar	contained
-+syn region  shCaseRange	matchgroup=Delimiter start=+\[+ skip=+\\\\+ end=+]+	contained
- 
- " Misc: {{{1
- "======
-@@ -256,34 +257,36 @@
- 
- syn match   shSource	"^\.\s"
- syn match   shSource	"\s\.\s"
--syn region  shColon	start="^\s*:" end="$\|" end="#"me=e-1 contains=@shColonList
-+"syn region  shColon	start="^\s*:" end="$" end="\s#"me=e-2 contains=@shColonList
-+syn region  shColon	start="^\s*\zs:" end="$" end="\s#"me=e-2
- 
- " String And Character Constants: {{{1
- "================================
- syn match   shNumber	"-\=\<\d\+\>#\="
- syn match   shCtrlSeq	"\\\d\d\d\|\\[abcfnrtv0]"		contained
- if exists("b:is_bash")
-- syn match   shSpecial	"\\\o\o\o\|\\x\x\x\|\\c.\|\\[abefnrtv]"	contained
-+ syn match   shSpecial	"\\\o\o\o\|\\x\x\x\|\\c[^"]\|\\[abefnrtv]"	contained
- endif
- if exists("b:is_bash")
-  syn region  shExSingleQuote	matchgroup=shOperator start=+\$'+ skip=+\\\\\|\\.+ end=+'+	contains=shStringSpecial,shSpecial
- else
-  syn region  shExSingleQuote	matchGroup=Error start=+\$'+ skip=+\\\\\|\\.+ end=+'+	contains=shStringSpecial
- endif
--syn region  shSingleQuote	matchgroup=shOperator start=+'+ end=+'+		contains=shStringSpecial,@Spell
-+syn region  shSingleQuote	matchgroup=shOperator start=+'+ end=+'+		contains=@Spell
- syn region  shDoubleQuote	matchgroup=shOperator start=+"+ skip=+\\"+ end=+"+	contains=@shDblQuoteList,shStringSpecial,@Spell
- syn match   shStringSpecial	"[^[:print:] \t]"	contained
- syn match   shStringSpecial	"\%(\\\\\)*\\[\\"'`$()#]"
--syn match   shSpecial	"[^\\]\zs\%(\\\\\)*\\[\\"'`$()#]"
-+syn match   shSpecial	"[^\\]\zs\%(\\\\\)*\\[\\"'`$()#]" nextgroup=shMoreSpecial
- syn match   shSpecial	"^\%(\\\\\)*\\[\\"'`$()#]"
-+syn match   shMoreSpecial	"\%(\\\\\)*\\[\\"'`$()#]" nextgroup=shMoreSpecial contained
- 
- " Comments: {{{1
- "==========
--syn cluster    shCommentGroup	contains=shTodo,@Spell
--syn keyword    shTodo	contained	COMBAK FIXME TODO XXX
--syn match      shComment	"^\s*\zs#.*$"	contains=@shCommentGroup
--syn match      shComment	"\s\zs#.*$"	contains=@shCommentGroup
--syn match      shQuickComment	contained	"#.*$"
-+syn cluster	shCommentGroup	contains=shTodo,@Spell
-+syn keyword	shTodo	contained		COMBAK FIXME TODO XXX
-+syn match	shComment		"^\s*\zs#.*$"	contains=@shCommentGroup
-+syn match	shComment		"\s\zs#.*$"	contains=@shCommentGroup
-+syn match	shQuickComment	contained	"#.*$"
- 
- " Here Documents: {{{1
- " =========================================
-@@ -338,13 +341,13 @@
- syn match  shVariable	"\<\([bwglsav]:\)\=[a-zA-Z0-9.!@_%+,]*\ze="	nextgroup=shSetIdentifier
- syn match  shSetIdentifier	"="		contained	nextgroup=shPattern,shDeref,shDerefSimple,shDoubleQuote,shSingleQuote,shExSingleQuote
- if exists("b:is_bash")
-- syn region shSetList oneline matchgroup=shSet start="\<\(declare\|typeset\|local\|export\|unset\)\>\ze[^/]" end="$"	matchgroup=shOperator end="\ze[}|);&]" matchgroup=NONE end="\ze#\|=" contains=@shIdList
-- syn region shSetList oneline matchgroup=shSet start="\<set\>\ze[^/]" end="\ze[;|)]\|$"			matchgroup=shOperator end="\ze[}|);&]" matchgroup=NONE end="\ze[#=]" contains=@shIdList
-+ syn region shSetList oneline matchgroup=shSet start="\<\(declare\|typeset\|local\|export\|unset\)\>\ze[^/]" end="$"	matchgroup=shOperator end="\ze[}|);&]" matchgroup=NONE end="\ze\s\+#\|=" contains=@shIdList
-+ syn region shSetList oneline matchgroup=shSet start="\<set\>\ze[^/]" end="\ze[;|)]\|$"			matchgroup=shOperator end="\ze[}|);&]" matchgroup=NONE end="\ze\s\+[#=]" contains=@shIdList
- elseif exists("b:is_kornshell")
-- syn region shSetList oneline matchgroup=shSet start="\<\(typeset\|export\|unset\)\>\ze[^/]" end="$"		matchgroup=shOperator end="\ze[}|);&]" matchgroup=NONE end="\ze[#=]" contains=@shIdList
-- syn region shSetList oneline matchgroup=shSet start="\<set\>\ze[^/]" end="$"				matchgroup=shOperator end="\ze[}|);&]" matchgroup=NONE end="\ze[#=]" contains=@shIdList
-+ syn region shSetList oneline matchgroup=shSet start="\<\(typeset\|export\|unset\)\>\ze[^/]" end="$"		matchgroup=shOperator end="\ze[}|);&]" matchgroup=NONE end="\ze\s\+[#=]" contains=@shIdList
-+ syn region shSetList oneline matchgroup=shSet start="\<set\>\ze[^/]" end="$"				matchgroup=shOperator end="\ze[}|);&]" matchgroup=NONE end="\ze\s\+[#=]" contains=@shIdList
- else
-- syn region shSetList oneline matchgroup=shSet start="\<\(set\|export\|unset\)\>\ze[^/]" end="$"		matchgroup=shOperator end="\ze[}|);&]" matchgroup=NONE end="\ze[#=]" contains=@shIdList
-+ syn region shSetList oneline matchgroup=shSet start="\<\(set\|export\|unset\)\>\ze[^/]" end="$"		matchgroup=shOperator end="\ze[}|);&]" matchgroup=NONE end="\ze\s\+[#=]" contains=@shIdList
- endif
- 
- " Functions: {{{1
-@@ -492,7 +495,7 @@
- hi def link shCaseSingleQuote	shSingleQuote
- hi def link shCaseStart	shConditional
- hi def link shCmdSubRegion	shShellVariables
--hi def link shColon	shStatement
-+hi def link shColon	shComment
- hi def link shDerefOp	shOperator
- hi def link shDerefPOL	shDerefOp
- hi def link shDerefPPS	shDerefOp
-@@ -511,6 +514,7 @@
- hi def link shHereDoc	shString
- hi def link shHerePayload	shHereDoc
- hi def link shLoop	shStatement
-+hi def link shMoreSpecial	shSpecial
- hi def link shOption	shCommandSub
- hi def link shPattern	shString
- hi def link shParen	shArithmetic
-diff -u -r --new-file runtime/syntax.orig/sisu.vim runtime/syntax/sisu.vim
---- runtime/syntax.orig/sisu.vim	2008-05-27 14:24:19.000000000 -0500
-+++ runtime/syntax/sisu.vim	2008-11-09 07:12:28.000000000 -0600
-@@ -1,6 +1,6 @@
- "SiSU Vim syntax file
- "SiSU Maintainer: Ralph Amissah <ralph@amissah.com>
--"SiSU Markup:     SiSU (sisu-0.66.0, 2008-02-24)
-+"SiSU Markup:     SiSU (sisu-0.69.0, 2008-09-16)
- "(originally looked at Ruby Vim by Mirko Nasato)
- 
- if version < 600
-@@ -81,6 +81,7 @@
- syn region sisu_comment matchgroup=sisu_comment start="^%\{1,2\} " end="$"
- "font face curly brackets
- "syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_sem start="\S\+:{" end="}:[^<>,.!?:; ]\+" oneline
-+syn region sisu_index matchgroup=sisu_index_block start="^={" end="}"
- syn region sisu_control contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="\*{" end="}\*"
- syn region sisu_control contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="!{" end="}!"
- syn region sisu_underline contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="_{" end="}_"
-@@ -162,7 +163,6 @@
- hi def link sisu_fontface         Include
- hi def link sisu_strikeout        DiffDelete
- hi def link sisu_content_alt      Special
--hi def link sisu_sem_content      String
- hi def link sisu_sem_content      SpecialKey
- hi def link sisu_sem_block        Special
- hi def link sisu_sem_marker       Visual
-@@ -173,6 +173,8 @@
- hi def link sisu_sem_ex_content   Comment
- "hi def link sisu_sem_ex_content   SpecialKey
- hi def link sisu_sem_ex_block     Comment
-+hi def link sisu_index            SpecialKey
-+hi def link sisu_index_block      Visual
- hi def link sisu_content_endnote  Special
- hi def link sisu_control          Define
- hi def link sisu_ocn              Include
-diff -u -r --new-file runtime/syntax.orig/spec.vim runtime/syntax/spec.vim
---- runtime/syntax.orig/spec.vim	2005-01-04 03:46:51.000000000 -0600
-+++ runtime/syntax/spec.vim	2009-12-16 14:42:02.000000000 -0600
-@@ -1,8 +1,7 @@
- " Filename:    spec.vim
- " Purpose:     Vim syntax file
- " Language:    SPEC: Build/install scripts for Linux RPM packages
--" Maintainer:  Donovan Rebbechi elflord@pegasus.rutgers.edu
--" URL:	       http://pegasus.rutgers.edu/~elflord/vim/syntax/spec.vim
-+" Maintainer:  Donovan Rebbechi elflord@panix.com
- " Last Change: Fri Dec 3 11:54 EST 2004 Marcin Dalecki
- 
- " For version 5.x: Clear all syntax items
-diff -u -r --new-file runtime/syntax.orig/spyce.vim runtime/syntax/spyce.vim
---- runtime/syntax.orig/spyce.vim	2004-06-07 09:32:36.000000000 -0500
-+++ runtime/syntax/spyce.vim	2009-11-28 06:33:43.000000000 -0600
-@@ -2,7 +2,7 @@
- " Language:	   SPYCE
- " Maintainer:	 Rimon Barr <rimon AT acm DOT org>
- " URL:		     http://spyce.sourceforge.net
--" Last Change: 2003 May 11
-+" Last Change: 2009 Nov 11
- 
- " For version 5.x: Clear all syntax items
- " For version 6.x: Quit when a syntax file was already loaded
-@@ -25,6 +25,7 @@
- else
-   runtime! syntax/html.vim
-   unlet b:current_syntax
-+  syntax spell default  " added by Bram
- endif
- 
- " include python
-diff -u -r --new-file runtime/syntax.orig/sqlanywhere.vim runtime/syntax/sqlanywhere.vim
---- runtime/syntax.orig/sqlanywhere.vim	2008-02-06 14:32:21.000000000 -0600
-+++ runtime/syntax/sqlanywhere.vim	2009-10-08 16:18:57.000000000 -0500
-@@ -2,10 +2,11 @@
- " Vim syntax file
- " Language:    SQL, Adaptive Server Anywhere
- " Maintainer:  David Fishburn <fishburn at ianywhere dot com>
--" Last Change: Tue 29 Jan 2008 12:54:19 PM Eastern Standard Time
--" Version:     10.0.1
-+" Last Change: 2009 Mar 15
-+" Version:     11.0.1
- 
--" Description: Updated to Adaptive Server Anywhere 10.0.1
-+" Description: Updated to Adaptive Server Anywhere 11.0.1
-+"              Updated to Adaptive Server Anywhere 10.0.1
- "              Updated to Adaptive Server Anywhere  9.0.2
- "              Updated to Adaptive Server Anywhere  9.0.1
- "              Updated to Adaptive Server Anywhere  9.0.0
-@@ -54,20 +55,24 @@
- syn keyword sqlFunction	 strtouuid varexists
- 
- " 9.0.1 functions
--syn keyword sqlFunction	 acos asin atan atn2 cast ceiling convert cos cot 
-+syn keyword sqlFunction	 acos asin atan atn2 cast ceiling convert cos cot
- syn keyword sqlFunction	 char_length coalesce dateformat datetime degrees exp
--syn keyword sqlFunction	 floor getdate insertstr 
-+syn keyword sqlFunction	 floor getdate insertstr
- syn keyword sqlFunction	 log log10 lower mod pi power
--syn keyword sqlFunction	 property radians replicate round sign sin 
-+syn keyword sqlFunction	 property radians replicate round sign sin
- syn keyword sqlFunction	 sqldialect tan truncate truncnum
- syn keyword sqlFunction	 base64_encode base64_decode
- syn keyword sqlFunction	 hash compress decompress encrypt decrypt
- 
-+" 11.0.1 functions
-+syn keyword sqlFunction	 connection_extended_property text_handle_vector_match
-+syn keyword sqlFunction	 read_client_file write_client_file
-+
- " string functions
- syn keyword sqlFunction	 ascii char left ltrim repeat
- syn keyword sqlFunction	 space right rtrim trim lcase ucase
- syn keyword sqlFunction	 locate charindex patindex replace
--syn keyword sqlFunction	 errormsg csconvert 
-+syn keyword sqlFunction	 errormsg csconvert
- 
- " property functions
- syn keyword sqlFunction	 db_id db_name property_name
-@@ -358,125 +363,135 @@
- syn keyword sqlFunction	 sa_set_http_header sa_set_http_option
- syn keyword sqlFunction	 sa_http_variable_info sa_http_header_info
- 
--" http functions 9.0.1 
-+" http functions 9.0.1
- syn keyword sqlFunction	 http_encode http_decode
- syn keyword sqlFunction	 html_encode html_decode
- 
- " keywords
--syn keyword sqlKeyword	 absolute accent action activ add address after
--syn keyword sqlKeyword	 algorithm allow_dup_row
--syn keyword sqlKeyword	 alter and any as append asc ascii ase at atomic
--syn keyword sqlKeyword	 attach attended audit authorization 
-+syn keyword sqlKeyword	 absolute accent action active add address aes_decrypt
-+syn keyword sqlKeyword	 after aggregate algorithm allow_dup_row allowed
-+syn keyword sqlKeyword	 alter and ansi_substring any as append apply asc ascii ase
-+syn keyword sqlKeyword	 assign at atan2 atomic attach attended audit authorization
- syn keyword sqlKeyword	 autoincrement autostop batch bcp before
--syn keyword sqlKeyword	 between blank blanks block
--syn keyword sqlKeyword	 both bottom unbounded break bufferpool
-+syn keyword sqlKeyword	 between bit_and bit_length bit_or bit_substr bit_xor
-+syn keyword sqlKeyword	 blank blanks block
-+syn keyword sqlKeyword	 both bottom unbounded break breaker bufferpool
- syn keyword sqlKeyword	 build bulk by byte bytes cache calibrate calibration
- syn keyword sqlKeyword	 cancel capability cascade cast
--syn keyword sqlKeyword	 catalog changes char char_convert check checksum
-+syn keyword sqlKeyword	 catalog ceil changes char char_convert check checksum
- syn keyword sqlKeyword	 class classes client cmp
--syn keyword sqlKeyword	 cluster clustered collation column columns
-+syn keyword sqlKeyword	 cluster clustered collation
-+syn keyword sqlKeyword	 column columns
- syn keyword sqlKeyword	 command comment committed comparisons
- syn keyword sqlKeyword	 compatible component compressed compute computes
--syn keyword sqlKeyword	 concat confirm conflict connection
-+syn keyword sqlKeyword	 concat configuration confirm conflict connection
- syn keyword sqlKeyword	 console consolidate consolidated
--syn keyword sqlKeyword	 constraint constraints continue
--syn keyword sqlKeyword	 convert copy count crc cross cube
-+syn keyword sqlKeyword	 constraint constraints content continue
-+syn keyword sqlKeyword	 convert coordinator copy count count_set_bits
-+syn keyword sqlKeyword	 crc createtime cross cube cume_dist
- syn keyword sqlKeyword	 current cursor data data database
- syn keyword sqlKeyword	 current_timestamp current_user
--syn keyword sqlKeyword	 datatype dba dbfile
--syn keyword sqlKeyword	 dbspace dbspacename debug decoupled
--syn keyword sqlKeyword	 decrypted default defaults deferred definition
-+syn keyword sqlKeyword	 databases datatype dba dbfile
-+syn keyword sqlKeyword	 dbspace dbspaces dbspacename debug decoupled
-+syn keyword sqlKeyword	 decrypted default defaults default_dbspace deferred
-+syn keyword sqlKeyword	 definer definition
- syn keyword sqlKeyword	 delay deleting delimited dependencies desc
- syn keyword sqlKeyword	 description detach deterministic directory
--syn keyword sqlKeyword	 disable disabled distinct do domain download
-+syn keyword sqlKeyword	 disable disabled distinct do domain download duplicate
- syn keyword sqlKeyword	 dsetpass dttm dynamic each editproc ejb
--syn keyword sqlKeyword	 else elseif enable encapsulated encrypted end 
--syn keyword sqlKeyword	 encoding endif engine erase error escape escapes event
--syn keyword sqlKeyword	 every except exception exclude exclusive exec 
--syn keyword sqlKeyword	 existing exists expanded express
-+syn keyword sqlKeyword	 else elseif empty enable encapsulated encrypted end
-+syn keyword sqlKeyword	 encoding endif engine environment erase error escape escapes event
-+syn keyword sqlKeyword	 event_parameter every except exception exclude excluded exclusive exec
-+syn keyword sqlKeyword	 existing exists expanded expiry express exprtype extended_property
- syn keyword sqlKeyword	 external externlogin factor failover false
--syn keyword sqlKeyword	 fastfirstrow fieldproc file filler
--syn keyword sqlKeyword	 fillfactor finish first first_keyword 
--syn keyword sqlKeyword	 following force foreign format 
--syn keyword sqlKeyword	 freepage french fresh full function go global
--syn keyword sqlKeyword	 group handler hash having header hexadecimal 
--syn keyword sqlKeyword	 hidden high history hold holdlock
--syn keyword sqlKeyword	 hours id identified identity ignore
-+syn keyword sqlKeyword	 fastfirstrow fieldproc file files filler
-+syn keyword sqlKeyword	 fillfactor finish first first_keyword first_value
-+syn keyword sqlKeyword	 following force foreign format forxml forxml_sep fp frame
-+syn keyword sqlKeyword	 freepage french fresh full function gb get_bit go global
-+syn keyword sqlKeyword	 group handler hash having header hexadecimal
-+syn keyword sqlKeyword	 hidden high history hg hng hold holdlock host
-+syn keyword sqlKeyword	 hours http_body http_session_timeout id identified identity ignore
- syn keyword sqlKeyword	 ignore_dup_key ignore_dup_row immediate
--syn keyword sqlKeyword	 in inactive inactivity incremental index info 
-+syn keyword sqlKeyword	 in inactiv inactive inactivity included incremental
-+syn keyword sqlKeyword	 index index_enabled index_lparen indexonly info
- syn keyword sqlKeyword	 inline inner inout insensitive inserting
- syn keyword sqlKeyword	 instead integrated
--syn keyword sqlKeyword	 internal into introduced iq is isolation jar java
-+syn keyword sqlKeyword	 internal intersection into introduced invoker iq is isolation
-+syn keyword sqlKeyword	 jar java java_location java_main_userid java_vm_options
- syn keyword sqlKeyword	 jconnect jdk join kb key keep kerberos language last
--syn keyword sqlKeyword	 last_keyword lateral left level like
--syn keyword sqlKeyword	 limit local location log 
--syn keyword sqlKeyword	 logging login logscan long low lru main
--syn keyword sqlKeyword	 match materialized max maximum membership 
--syn keyword sqlKeyword	 minutes mirror mode modify monitor  mru
--syn keyword sqlKeyword	 name named national native natural new next no
-+syn keyword sqlKeyword	 last_keyword last_value lateral ld left len lf ln level like
-+syn keyword sqlKeyword	 limit local location log
-+syn keyword sqlKeyword	 logging login logscan long low lru main manual mark
-+syn keyword sqlKeyword	 match matched materialized max maximum mb membership
-+syn keyword sqlKeyword	 merge metadata methods minimum minutes mirror mode modify monitor move mru
-+syn keyword sqlKeyword	 multiplex name named national native natural new next no
- syn keyword sqlKeyword	 noholdlock nolock nonclustered none not
--syn keyword sqlKeyword	 notify null nulls of off old on
--syn keyword sqlKeyword	 only optimization optimizer option
-+syn keyword sqlKeyword	 notify null nullable_constant nulls object oem_string of off offline
-+syn keyword sqlKeyword	 old on online only openstring optimization optimizer option
- syn keyword sqlKeyword	 or order others out outer over
- syn keyword sqlKeyword	 package packetsize padding page pages
--syn keyword sqlKeyword	 paglock parallel part partition partner password path
--syn keyword sqlKeyword	 pctfree plan preceding precision prefetch prefix
--syn keyword sqlKeyword	 preserve preview primary 
--syn keyword sqlKeyword	 prior priqty private privileges procedure profile
--syn keyword sqlKeyword	 public publication publish publisher
--syn keyword sqlKeyword	 quote quotes range readcommitted readonly
-+syn keyword sqlKeyword	 paglock parallel part partial partition partitions partner password path
-+syn keyword sqlKeyword	 pctfree plan policy populate port postfilter preceding precision
-+syn keyword sqlKeyword	 prefetch prefilter prefix preserve preview primary
-+syn keyword sqlKeyword	 prior priority priqty private privileges procedure profile
-+syn keyword sqlKeyword	 property_is_cumulative property_is_numeric public publication publish publisher
-+syn keyword sqlKeyword	 quiesce quote quotes range readclientfile readcommitted reader readfile readonly
- syn keyword sqlKeyword	 readpast readuncommitted readwrite rebuild
- syn keyword sqlKeyword	 received recompile recover recursive references
--syn keyword sqlKeyword	 referencing refresh relative relocate
-+syn keyword sqlKeyword	 referencing refresh regex regexp regexp_substr relative relocate
- syn keyword sqlKeyword	 rename repeatable repeatableread
--syn keyword sqlKeyword	 replicate rereceive resend reserve reset
-+syn keyword sqlKeyword	 replicate request_timeout required rereceive resend reserve reset
- syn keyword sqlKeyword	 resizing resolve resource respect
- syn keyword sqlKeyword	 restrict result retain
--syn keyword sqlKeyword	 returns right 
--syn keyword sqlKeyword	 rollup root row rowlock rows save 
--syn keyword sqlKeyword	 schedule schema scripted scroll seconds secqty
-+syn keyword sqlKeyword	 returns reverse right role
-+syn keyword sqlKeyword	 rollup root row row_number rowlock rows save
-+syn keyword sqlKeyword	 sa_index_hash sa_internal_fk_verify sa_internal_termbreak
-+syn keyword sqlKeyword	 sa_order_preserving_hash sa_order_preserving_hash_big sa_order_preserving_hash_prefix
-+syn keyword sqlKeyword	 schedule schema scope scripted scroll seconds secqty security
- syn keyword sqlKeyword	 send sensitive sent serializable
--syn keyword sqlKeyword	 server server session sets 
-+syn keyword sqlKeyword	 server server session set_bit set_bits sets
- syn keyword sqlKeyword	 share simple since site size skip
--syn keyword sqlKeyword	 snapshot soapheader some sorted_data 
--syn keyword sqlKeyword	 sqlcode sqlid sqlstate stacker stale statement
--syn keyword sqlKeyword	 statistics status stogroup store
--syn keyword sqlKeyword	 strip subpages subscribe subscription
--syn keyword sqlKeyword	 subtransaction synchronization
-+syn keyword sqlKeyword	 snapshot soapheader soap_header split some sorted_data
-+syn keyword sqlKeyword	 sqlcode sqlid sqlflagger sqlstate sqrt square
-+syn keyword sqlKeyword	 stacker stale statement statistics status stddev_pop stddev_samp
-+syn keyword sqlKeyword	 stemmer stogroup stoplist store
-+syn keyword sqlKeyword	 strip stripesizekb striping subpages subscribe subscription
-+syn keyword sqlKeyword	 subtransaction suser_id suser_name synchronization
- syn keyword sqlKeyword	 syntax_error table tablock
--syn keyword sqlKeyword	 tablockx tb temp template temporary then
--syn keyword sqlKeyword	 ties timezone to top tracing
--syn keyword sqlKeyword	 transaction transactional tries true 
-+syn keyword sqlKeyword	 tablockx tb temp template temporary term then
-+syn keyword sqlKeyword	 ties timezone to to_char to_nchar top traced_plan tracing
-+syn keyword sqlKeyword	 transfer transaction transactional tries true
- syn keyword sqlKeyword	 tsequal type tune uncommitted unconditionally
--syn keyword sqlKeyword	 unenforced unique union unknown unload 
--syn keyword sqlKeyword	 updating updlock upgrade upload use user
-+syn keyword sqlKeyword	 unenforced unicode unique union unistr unknown unlimited unload
-+syn keyword sqlKeyword	 unpartition unquiesce updatetime updating updlock upgrade upload
-+syn keyword sqlKeyword	 upper use user
- syn keyword sqlKeyword	 using utc utilities validproc
- syn keyword sqlKeyword	 value values varchar variable
--syn keyword sqlKeyword	 varying vcat verify view virtual wait 
--syn keyword sqlKeyword	 warning web when where window with with_auto
-+syn keyword sqlKeyword	 varying var_pop var_samp vcat verify versions view virtual wait
-+syn keyword sqlKeyword	 warning wd web when where window with with_auto
- syn keyword sqlKeyword	 with_auto with_cube with_rollup without
--syn keyword sqlKeyword	 with_lparen within word work workload writefile 
--syn keyword sqlKeyword	 writers writeserver xlock zeros
-+syn keyword sqlKeyword	 with_lparen within word work workload write writefile
-+syn keyword sqlKeyword	 writeclientfile writer writers writeserver xlock zeros
- " XML function support
--syn keyword sqlFunction	 openxml xmlelement xmlforest xmlgen xmlconcat xmlagg 
--syn keyword sqlFunction	 xmlattributes 
-+syn keyword sqlFunction	 openxml xmlelement xmlforest xmlgen xmlconcat xmlagg
-+syn keyword sqlFunction	 xmlattributes
- syn keyword sqlKeyword	 raw auto elements explicit
- " HTTP support
--syn keyword sqlKeyword	 authorization secure url service
-+syn keyword sqlKeyword	 authorization secure url service next_soap_header
- " HTTP 9.0.2 new procedure keywords
- syn keyword sqlKeyword	 namespace certificate clientport proxy
- " OLAP support 9.0.0
--syn keyword sqlKeyword	 covar_pop covar_samp corr regr_slope regr_intercept 
-+syn keyword sqlKeyword	 covar_pop covar_samp corr regr_slope regr_intercept
- syn keyword sqlKeyword	 regr_count regr_r2 regr_avgx regr_avgy
- syn keyword sqlKeyword	 regr_sxx regr_syy regr_sxy
- 
- " Alternate keywords
- syn keyword sqlKeyword	 character dec options proc reference
--syn keyword sqlKeyword	 subtrans tran syn keyword 
-+syn keyword sqlKeyword	 subtrans tran syn keyword
- 
- 
- syn keyword sqlOperator	 in any some all between exists
--syn keyword sqlOperator	 like escape not is and or 
-+syn keyword sqlOperator	 like escape not is and or
- syn keyword sqlOperator  intersect minus
- syn keyword sqlOperator  prior distinct
- 
-@@ -496,43 +511,38 @@
- 
- 
- syn keyword sqlType	 char long varchar text
--syn keyword sqlType	 bigint decimal double float int integer numeric 
-+syn keyword sqlType	 bigint decimal double float int integer numeric
- syn keyword sqlType	 smallint tinyint real
- syn keyword sqlType	 money smallmoney
--syn keyword sqlType	 bit 
--syn keyword sqlType	 date datetime smalldate time timestamp 
-+syn keyword sqlType	 bit
-+syn keyword sqlType	 date datetime smalldate time timestamp
- syn keyword sqlType	 binary image varbinary uniqueidentifier
- syn keyword sqlType	 xml unsigned
- " New types 10.0.0
- syn keyword sqlType	 varbit nchar nvarchar
- 
- syn keyword sqlOption    Allow_nulls_by_default
-+syn keyword sqlOption    Allow_read_client_file
-+syn keyword sqlOption    Allow_snapshot_isolation
-+syn keyword sqlOption    Allow_write_client_file
- syn keyword sqlOption    Ansi_blanks
- syn keyword sqlOption    Ansi_close_cursors_on_rollback
--syn keyword sqlOption    Ansi_integer_overflow
- syn keyword sqlOption    Ansi_permissions
-+syn keyword sqlOption    Ansi_substring
- syn keyword sqlOption    Ansi_update_constraints
- syn keyword sqlOption    Ansinull
--syn keyword sqlOption    Assume_distinct_servers
- syn keyword sqlOption    Auditing
- syn keyword sqlOption    Auditing_options
--syn keyword sqlOption    Auto_commit
--syn keyword sqlOption    Auto_refetch
--syn keyword sqlOption    Automatic_timestamp
- syn keyword sqlOption    Background_priority
--syn keyword sqlOption    Bell
--syn keyword sqlOption    Blob_threshold
- syn keyword sqlOption    Blocking
- syn keyword sqlOption    Blocking_timeout
- syn keyword sqlOption    Chained
--syn keyword sqlOption    Char_OEM_Translation
- syn keyword sqlOption    Checkpoint_time
- syn keyword sqlOption    Cis_option
- syn keyword sqlOption    Cis_rowset_size
- syn keyword sqlOption    Close_on_endtrans
--syn keyword sqlOption    Command_delimiter
--syn keyword sqlOption    Commit_on_exit
--syn keyword sqlOption    Compression
-+syn keyword sqlOption    Collect_statistics_on_dml_updates
-+syn keyword sqlOption    Conn_auditing
- syn keyword sqlOption    Connection_authentication
- syn keyword sqlOption    Continue_after_raiserror
- syn keyword sqlOption    Conversion_error
-@@ -543,125 +553,90 @@
- syn keyword sqlOption    Date_order
- syn keyword sqlOption    Debug_messages
- syn keyword sqlOption    Dedicated_task
-+syn keyword sqlOption    Default_dbspace
- syn keyword sqlOption    Default_timestamp_increment
- syn keyword sqlOption    Delayed_commit_timeout
- syn keyword sqlOption    Delayed_commits
--syn keyword sqlOption    Delete_old_logs
--syn keyword sqlOption    Describe_Java_Format
--syn keyword sqlOption    Divide_by_zero_error
--syn keyword sqlOption    Echo
- syn keyword sqlOption    Escape_character
- syn keyword sqlOption    Exclude_operators
- syn keyword sqlOption    Extended_join_syntax
--syn keyword sqlOption    External_remote_options
- syn keyword sqlOption    Fire_triggers
- syn keyword sqlOption    First_day_of_week
--syn keyword sqlOption    Float_as_double
- syn keyword sqlOption    For_xml_null_treatment
- syn keyword sqlOption    Force_view_creation
- syn keyword sqlOption    Global_database_id
--syn keyword sqlOption    Headings
--syn keyword sqlOption    Input_format
-+syn keyword sqlOption    Http_session_timeout
- syn keyword sqlOption    Integrated_server_name
- syn keyword sqlOption    Isolation_level
--syn keyword sqlOption    ISQL_command_timing
--syn keyword sqlOption    ISQL_escape_character
--syn keyword sqlOption    ISQL_field_separator
--syn keyword sqlOption    ISQL_log
--syn keyword sqlOption    ISQL_plan
--syn keyword sqlOption    ISQL_plan_cursor_sensitivity
--syn keyword sqlOption    ISQL_plan_cursor_writability
--syn keyword sqlOption    ISQL_quote
--syn keyword sqlOption    Java_heap_size
--syn keyword sqlOption    Java_input_output
--syn keyword sqlOption    Java_namespace_size
--syn keyword sqlOption    Java_page_buffer_size
-+syn keyword sqlOption    Java_location
-+syn keyword sqlOption    Java_main_userid
-+syn keyword sqlOption    Java_vm_options
- syn keyword sqlOption    Lock_rejected_rows
- syn keyword sqlOption    Log_deadlocks
--syn keyword sqlOption    Log_detailed_plans
--syn keyword sqlOption    Log_max_requests
- syn keyword sqlOption    Login_mode
- syn keyword sqlOption    Login_procedure
-+syn keyword sqlOption    Materialized_view_optimization
-+syn keyword sqlOption    Max_client_statements_cached
- syn keyword sqlOption    Max_cursor_count
- syn keyword sqlOption    Max_hash_size
- syn keyword sqlOption    Max_plans_cached
-+syn keyword sqlOption    Max_priority
-+syn keyword sqlOption    Max_query_tasks
- syn keyword sqlOption    Max_recursive_iterations
- syn keyword sqlOption    Max_statement_count
--syn keyword sqlOption    Max_work_table_hash_size
-+syn keyword sqlOption    Max_temp_space
- syn keyword sqlOption    Min_password_length
- syn keyword sqlOption    Nearest_century
- syn keyword sqlOption    Non_keywords
--syn keyword sqlOption    NULLS
--syn keyword sqlOption    ODBC_describe_binary_as_varbinary
--syn keyword sqlOption    ODBC_distinguish_char_and_varchar
--syn keyword sqlOption    On_Charset_conversion_failure
--syn keyword sqlOption    On_error
-+syn keyword sqlOption    Odbc_describe_binary_as_varbinary
-+syn keyword sqlOption    Odbc_distinguish_char_and_varchar
-+syn keyword sqlOption    Oem_string
-+syn keyword sqlOption    On_charset_conversion_failure
- syn keyword sqlOption    On_tsql_error
--syn keyword sqlOption    Optimistic_wait_for_commit
- syn keyword sqlOption    Optimization_goal
- syn keyword sqlOption    Optimization_level
--syn keyword sqlOption    Optimization_logging
- syn keyword sqlOption    Optimization_workload
--syn keyword sqlOption    Output_format
--syn keyword sqlOption    Output_length
--syn keyword sqlOption    Output_nulls
--syn keyword sqlOption    Percent_as_comment
- syn keyword sqlOption    Pinned_cursor_percent_of_cache
-+syn keyword sqlOption    Post_login_procedure
- syn keyword sqlOption    Precision
- syn keyword sqlOption    Prefetch
- syn keyword sqlOption    Preserve_source_format
- syn keyword sqlOption    Prevent_article_pkey_update
--syn keyword sqlOption    Qualify_owners
--syn keyword sqlOption    Query_plan_on_open
--syn keyword sqlOption    Quiet
--syn keyword sqlOption    Quote_all_identifiers
-+syn keyword sqlOption    Priority
-+syn keyword sqlOption    Query_mem_timeout
- syn keyword sqlOption    Quoted_identifier
- syn keyword sqlOption    Read_past_deleted
- syn keyword sqlOption    Recovery_time
- syn keyword sqlOption    Remote_idle_timeout
- syn keyword sqlOption    Replicate_all
--syn keyword sqlOption    Replication_error
--syn keyword sqlOption    Replication_error_piece
-+syn keyword sqlOption    Request_timeout
- syn keyword sqlOption    Return_date_time_as_string
--syn keyword sqlOption    Return_java_as_string
--syn keyword sqlOption    RI_Trigger_time
- syn keyword sqlOption    Rollback_on_deadlock
- syn keyword sqlOption    Row_counts
--syn keyword sqlOption    Save_remote_passwords
- syn keyword sqlOption    Scale
--syn keyword sqlOption    Screen_format
--syn keyword sqlOption    Sort_Collation
--syn keyword sqlOption    SQL_flagger_error_level
--syn keyword sqlOption    SQL_flagger_warning_level
--syn keyword sqlOption    SQLConnect
--syn keyword sqlOption    SQLStart
--syn keyword sqlOption    SR_Date_Format
--syn keyword sqlOption    SR_Time_Format
--syn keyword sqlOption    SR_TimeStamp_Format
--syn keyword sqlOption    Statistics
-+syn keyword sqlOption    Secure_feature_key
-+syn keyword sqlOption    Sort_collation
-+syn keyword sqlOption    Sql_flagger_error_level
-+syn keyword sqlOption    Sql_flagger_warning_level
- syn keyword sqlOption    String_rtruncation
--syn keyword sqlOption    Subscribe_by_remote
- syn keyword sqlOption    Subsume_row_locks
--syn keyword sqlOption    Suppress_TDS_debugging
--syn keyword sqlOption    TDS_Empty_string_is_null
-+syn keyword sqlOption    Suppress_tds_debugging
-+syn keyword sqlOption    Synchronize_mirror_on_commit
-+syn keyword sqlOption    Tds_empty_string_is_null
- syn keyword sqlOption    Temp_space_limit_check
--syn keyword sqlOption    Thread_count
--syn keyword sqlOption    Thread_stack
--syn keyword sqlOption    Thread_swaps
- syn keyword sqlOption    Time_format
- syn keyword sqlOption    Time_zone_adjustment
- syn keyword sqlOption    Timestamp_format
--syn keyword sqlOption    Truncate_date_values
- syn keyword sqlOption    Truncate_timestamp_values
--syn keyword sqlOption    Truncate_with_auto_commit
--syn keyword sqlOption    Truncation_length
--syn keyword sqlOption    Tsql_hex_constant
-+syn keyword sqlOption    Tsql_outer_joins
- syn keyword sqlOption    Tsql_variables
-+syn keyword sqlOption    Updatable_statement_isolation
- syn keyword sqlOption    Update_statistics
-+syn keyword sqlOption    Upgrade_database_capability
- syn keyword sqlOption    User_estimates
--syn keyword sqlOption    Verify_all_columns
--syn keyword sqlOption    Verify_threshold
-+syn keyword sqlOption    Verify_password_function
- syn keyword sqlOption    Wait_for_commit
-+syn keyword sqlOption    Webservice_namespace_host
- 
- " Strings and characters:
- syn region sqlString		start=+"+    end=+"+ contains=@Spell
-diff -u -r --new-file runtime/syntax.orig/sshconfig.vim runtime/syntax/sshconfig.vim
---- runtime/syntax.orig/sshconfig.vim	2006-03-05 15:55:08.000000000 -0600
-+++ runtime/syntax/sshconfig.vim	2009-07-26 06:44:10.000000000 -0500
-@@ -1,23 +1,21 @@
- " Vim syntax file
--" This is a GENERATED FILE. Please always refer to source file at the URI below.
--" Language: OpenSSH server configuration file (ssh_config)
--" Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
--" Last Change: 2006-03-05
--" URL: http://trific.ath.cx/Ftp/vim/syntax/sshconfig.vim
-+" Language: OpenSSH client configuration file (ssh_config)
-+" Maintainer: David Necas (Yeti) <yeti@physics.muni.cz>
-+" Last Change: 2009-07-09
- 
- " Setup
- if version >= 600
--	if exists("b:current_syntax")
--		finish
--	endif
-+  if exists("b:current_syntax")
-+    finish
-+  endif
- else
--	syntax clear
-+  syntax clear
- endif
- 
- if version >= 600
--	setlocal iskeyword=_,-,a-z,A-Z,48-57
-+  setlocal iskeyword=_,-,a-z,A-Z,48-57
- else
--	set iskeyword=_,-,a-z,A-Z,48-57
-+  set iskeyword=_,-,a-z,A-Z,48-57
- endif
- 
- syn case ignore
-@@ -28,19 +26,21 @@
- 
- " Constants
- syn keyword sshconfigYesNo yes no ask
--syn keyword sshconfigCipher blowfish des 3des
-+syn keyword sshconfigYesNo any auto
- syn keyword sshconfigCipher aes128-cbc 3des-cbc blowfish-cbc cast128-cbc
- syn keyword sshconfigCipher aes192-cbc aes256-cbc aes128-ctr aes256-ctr
- syn keyword sshconfigCipher arcfour arcfour128 arcfour256 cast128-cbc
- syn keyword sshconfigMAC hmac-md5 hmac-sha1 hmac-ripemd160 hmac-sha1-96
- syn keyword sshconfigMAC hmac-md5-96
-+syn match sshconfigMAC "\<umac-64@openssh\.com\>"
- syn keyword sshconfigHostKeyAlg ssh-rsa ssh-dss
- syn keyword sshconfigPreferredAuth hostbased publickey password
- syn keyword sshconfigPreferredAuth keyboard-interactive
- syn keyword sshconfigLogLevel QUIET FATAL ERROR INFO VERBOSE
- syn keyword sshconfigLogLevel DEBUG DEBUG1 DEBUG2 DEBUG3
--syn keyword sshconfigSysLogFacility DAEMON USER AUTH LOCAL0 LOCAL1 LOCAL2
--syn keyword sshconfigSysLogFacility LOCAL3 LOCAL4 LOCAL5 LOCAL6 LOCAL7
-+syn keyword sshconfigSysLogFacility DAEMON USER AUTH AUTHPRIV LOCAL0 LOCAL1
-+syn keyword sshconfigSysLogFacility LOCAL2 LOCAL3 LOCAL4 LOCAL5 LOCAL6 LOCAL7
-+syn match sshconfigVar "%[rhpldun]\>"
- syn match sshconfigSpecial "[*?]"
- syn match sshconfigNumber "\d\+"
- syn match sshconfigHostPort "\<\(\d\{1,3}\.\)\{3}\d\{1,3}\(:\d\+\)\?\>"
-@@ -49,57 +49,68 @@
- 
- " Keywords
- syn keyword sshconfigHostSect Host
--syn keyword sshconfigKeyword AddressFamily BatchMode BindAddress
-+syn keyword sshconfigKeyword AddressFamily
-+syn keyword sshconfigKeyword BatchMode BindAddress
- syn keyword sshconfigKeyword ChallengeResponseAuthentication CheckHostIP
- syn keyword sshconfigKeyword Cipher Ciphers ClearAllForwardings
- syn keyword sshconfigKeyword Compression CompressionLevel ConnectTimeout
- syn keyword sshconfigKeyword ConnectionAttempts ControlMaster
--syn keyword sshconfigKeyword ControlPath DynamicForward EnableSSHKeysign
--syn keyword sshconfigKeyword EscapeChar ForwardAgent ForwardX11
--syn keyword sshconfigKeyword ForwardX11Trusted GSSAPIAuthentication
-+syn keyword sshconfigKeyword ControlPath DynamicForward
-+syn keyword sshconfigKeyword EnableSSHKeysign EscapeChar ExitOnForwardFailure
-+syn keyword sshconfigKeyword ForwardAgent ForwardX11
-+syn keyword sshconfigKeyword ForwardX11Trusted
-+syn keyword sshconfigKeyword GSSAPIAuthentication
- syn keyword sshconfigKeyword GSSAPIDelegateCredentials GatewayPorts
--syn keyword sshconfigKeyword GlobalKnownHostsFile HostKeyAlgorithms
--syn keyword sshconfigKeyword HashKnownHosts KbdInteractiveDevices
-+syn keyword sshconfigKeyword GlobalKnownHostsFile
-+syn keyword sshconfigKeyword HostKeyAlgorithms HashKnownHosts
- syn keyword sshconfigKeyword HostKeyAlias HostName HostbasedAuthentication
--syn keyword sshconfigKeyword IdentitiesOnly IdentityFile LocalForward
--syn keyword sshconfigKeyword LogLevel MACs NoHostAuthenticationForLocalhost
--syn keyword sshconfigKeyword NumberOfPasswordPrompts PasswordAuthentication
-+syn keyword sshconfigKeyword IdentitiesOnly IdentityFile
-+syn keyword sshconfigKeyword KbdInteractiveAuthentication KbdInteractiveDevices
-+syn keyword sshconfigKeyword LocalCommand LocalForward LogLevel
-+syn keyword sshconfigKeyword MACs
-+syn keyword sshconfigKeyword NoHostAuthenticationForLocalhost
-+syn keyword sshconfigKeyword NumberOfPasswordPrompts
-+syn keyword sshconfigKeyword PasswordAuthentication PermitLocalCommand
- syn keyword sshconfigKeyword Port PreferredAuthentications Protocol
- syn keyword sshconfigKeyword ProxyCommand PubkeyAuthentication
--syn keyword sshconfigKeyword RSAAuthentication RemoteForward
--syn keyword sshconfigKeyword RhostsAuthentication RhostsRSAAuthentication
-+syn keyword sshconfigKeyword PermitLocalCommand
-+syn keyword sshconfigKeyword RSAAuthentication RemoteForward RekeyLimit
-+syn keyword sshconfigKeyword RhostsRSAAuthentication
- syn keyword sshconfigKeyword SendEnv ServerAliveCountMax ServerAliveInterval
- syn keyword sshconfigKeyword SmartcardDevice StrictHostKeyChecking
-+syn keyword sshconfigKeyword Tunnel TunnelDevice
- syn keyword sshconfigKeyword TCPKeepAlive UsePrivilegedPort User
--syn keyword sshconfigKeyword UserKnownHostsFile VerifyHostKeyDNS XAuthLocation
-+syn keyword sshconfigKeyword UserKnownHostsFile
-+syn keyword sshconfigKeyword VerifyHostKeyDNS VisualHostKey
-+syn keyword sshconfigKeyword XAuthLocation
- 
- " Define the default highlighting
- if version >= 508 || !exists("did_sshconfig_syntax_inits")
--	if version < 508
--		let did_sshconfig_syntax_inits = 1
--		command -nargs=+ HiLink hi link <args>
--	else
--		command -nargs=+ HiLink hi def link <args>
--	endif
--
--	HiLink sshconfigComment Comment
--	HiLink sshconfigTodo Todo
--	HiLink sshconfigHostPort sshconfigConstant
--	HiLink sshconfigNumber sshconfigConstant
--	HiLink sshconfigConstant Constant
--	HiLink sshconfigYesNo sshconfigEnum
--	HiLink sshconfigCipher sshconfigEnum
--	HiLink sshconfigMAC sshconfigEnum
--	HiLink sshconfigHostKeyAlg sshconfigEnum
--	HiLink sshconfigLogLevel sshconfigEnum
--	HiLink sshconfigSysLogFacility sshconfigEnum
--	HiLink sshconfigPreferredAuth sshconfigEnum
--	HiLink sshconfigEnum Function
--	HiLink sshconfigSpecial Special
--	HiLink sshconfigKeyword Keyword
--	HiLink sshconfigHostSect Type
--	delcommand HiLink
-+  if version < 508
-+    let did_sshconfig_syntax_inits = 1
-+    command -nargs=+ HiLink hi link <args>
-+  else
-+    command -nargs=+ HiLink hi def link <args>
-+  endif
-+
-+  HiLink sshconfigComment        Comment
-+  HiLink sshconfigTodo           Todo
-+  HiLink sshconfigHostPort       sshconfigConstant
-+  HiLink sshconfigNumber         sshconfigConstant
-+  HiLink sshconfigConstant       Constant
-+  HiLink sshconfigYesNo          sshconfigEnum
-+  HiLink sshconfigCipher         sshconfigEnum
-+  HiLink sshconfigMAC            sshconfigEnum
-+  HiLink sshconfigHostKeyAlg     sshconfigEnum
-+  HiLink sshconfigLogLevel       sshconfigEnum
-+  HiLink sshconfigSysLogFacility sshconfigEnum
-+  HiLink sshconfigPreferredAuth  sshconfigEnum
-+  HiLink sshconfigVar            sshconfigEnum
-+  HiLink sshconfigEnum           Identifier
-+  HiLink sshconfigSpecial        Special
-+  HiLink sshconfigKeyword        Keyword
-+  HiLink sshconfigHostSect       Type
-+  delcommand HiLink
- endif
- 
- let b:current_syntax = "sshconfig"
--
-diff -u -r --new-file runtime/syntax.orig/sshdconfig.vim runtime/syntax/sshdconfig.vim
---- runtime/syntax.orig/sshdconfig.vim	2006-03-05 15:55:08.000000000 -0600
-+++ runtime/syntax/sshdconfig.vim	2009-07-26 06:41:55.000000000 -0500
-@@ -1,23 +1,21 @@
- " Vim syntax file
--" This is a GENERATED FILE. Please always refer to source file at the URI below.
- " Language: OpenSSH server configuration file (sshd_config)
--" Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
--" Last Change: 2006-03-05
--" URL: http://trific.ath.cx/Ftp/vim/syntax/sshdconfig.vim
-+" Maintainer: David Necas (Yeti) <yeti@physics.muni.cz>
-+" Last Change: 2009-07-09
- 
- " Setup
- if version >= 600
--	if exists("b:current_syntax")
--		finish
--	endif
-+  if exists("b:current_syntax")
-+    finish
-+  endif
- else
--	syntax clear
-+  syntax clear
- endif
- 
- if version >= 600
--	setlocal iskeyword=_,-,a-z,A-Z,48-57
-+  setlocal iskeyword=_,-,a-z,A-Z,48-57
- else
--	set iskeyword=_,-,a-z,A-Z,48-57
-+  set iskeyword=_,-,a-z,A-Z,48-57
- endif
- 
- syn case ignore
-@@ -27,78 +25,87 @@
- syn keyword sshdconfigTodo TODO FIXME NOT contained
- 
- " Constants
--syn keyword sshdconfigYesNo yes no
-+syn keyword sshdconfigYesNo yes no none
-+syn keyword sshdconfigAddressFamily any inet inet6
- syn keyword sshdconfigCipher aes128-cbc 3des-cbc blowfish-cbc cast128-cbc
- syn keyword sshdconfigCipher aes192-cbc aes256-cbc aes128-ctr aes256-ctr
- syn keyword sshdconfigCipher arcfour arcfour128 arcfour256 cast128-cbc
- syn keyword sshdconfigMAC hmac-md5 hmac-sha1 hmac-ripemd160 hmac-sha1-96
- syn keyword sshdconfigMAC hmac-md5-96
-+syn match sshdconfigMAC "\<umac-64@openssh\.com\>"
- syn keyword sshdconfigRootLogin without-password forced-commands-only
- syn keyword sshdconfigLogLevel QUIET FATAL ERROR INFO VERBOSE
- syn keyword sshdconfigLogLevel DEBUG DEBUG1 DEBUG2 DEBUG3
--syn keyword sshdconfigSysLogFacility DAEMON USER AUTH LOCAL0 LOCAL1 LOCAL2
--syn keyword sshdconfigSysLogFacility LOCAL3 LOCAL4 LOCAL5 LOCAL6 LOCAL7
-+syn keyword sshdconfigSysLogFacility DAEMON USER AUTH AUTHPRIV LOCAL0 LOCAL1
-+syn keyword sshdconfigSysLogFacility LOCAL2 LOCAL3 LOCAL4 LOCAL5 LOCAL6 LOCAL7
- syn match sshdconfigSpecial "[*?]"
- syn match sshdconfigNumber "\d\+"
- syn match sshdconfigHostPort "\<\(\d\{1,3}\.\)\{3}\d\{1,3}\(:\d\+\)\?\>"
- syn match sshdconfigHostPort "\<\([-a-zA-Z0-9]\+\.\)\+[-a-zA-Z0-9]\{2,}\(:\d\+\)\?\>"
-+" FIXME: this matches quite a few things which are NOT valid IPv6 addresses
- syn match sshdconfigHostPort "\<\(\x\{,4}:\)\+\x\{,4}:\d\+\>"
- syn match sshdconfigTime "\<\(\d\+[sSmMhHdDwW]\)\+\>"
- 
- " Keywords
--syn keyword sshdconfigKeyword AcceptEnv AddressFamily
-+syn keyword sshdconfigMatch Host User Group Address
-+syn keyword sshdconfigKeyword AcceptEnv AddressFamily AllowAgentForwarding
- syn keyword sshdconfigKeyword AllowGroups AllowTcpForwarding
--syn keyword sshdconfigKeyword AllowUsers AuthorizedKeysFile Banner
--syn keyword sshdconfigKeyword ChallengeResponseAuthentication
-+syn keyword sshdconfigKeyword AllowUsers AuthorizedKeysFile
-+syn keyword sshdconfigKeyword Banner
-+syn keyword sshdconfigKeyword ChallengeResponseAuthentication ChrootDirectory
- syn keyword sshdconfigKeyword Ciphers ClientAliveCountMax
- syn keyword sshdconfigKeyword ClientAliveInterval Compression
--syn keyword sshdconfigKeyword DenyGroups DenyUsers GSSAPIAuthentication
--syn keyword sshdconfigKeyword GSSAPICleanupCredentials GatewayPorts
--syn keyword sshdconfigKeyword HostKey HostbasedAuthentication
-+syn keyword sshdconfigKeyword DenyGroups DenyUsers
-+syn keyword sshdconfigKeyword ForceCommand
-+syn keyword sshdconfigKeyword GatewayPorts GSSAPIAuthentication
-+syn keyword sshdconfigKeyword GSSAPICleanupCredentials
-+syn keyword sshdconfigKeyword HostbasedAuthentication HostKey
- syn keyword sshdconfigKeyword IgnoreRhosts IgnoreUserKnownHosts
--syn keyword sshdconfigKeyword KerberosAuthentication KerberosOrLocalPasswd
--syn keyword sshdconfigKeyword KerberosTgtPassing KerberosTicketCleanup
--syn keyword sshdconfigKeyword KerberosGetAFSToken
--syn keyword sshdconfigKeyword KeyRegenerationInterval ListenAddress
--syn keyword sshdconfigKeyword LogLevel LoginGraceTime MACs MaxAuthTries
--syn keyword sshdconfigKeyword MaxStartups PasswordAuthentication
--syn keyword sshdconfigKeyword PermitEmptyPasswords PermitRootLogin
-+syn keyword sshdconfigKeyword KerberosAuthentication KerberosGetAFSToken
-+syn keyword sshdconfigKeyword KerberosOrLocalPasswd KerberosTicketCleanup
-+syn keyword sshdconfigKeyword KeyRegenerationInterval
-+syn keyword sshdconfigKeyword ListenAddress LoginGraceTime LogLevel
-+syn keyword sshdconfigKeyword MACs Match MaxAuthTries MaxSessions MaxStartups
-+syn keyword sshdconfigKeyword PasswordAuthentication PermitEmptyPasswords
-+syn keyword sshdconfigKeyword PermitRootLogin PermitOpen PermitTunnel
- syn keyword sshdconfigKeyword PermitUserEnvironment PidFile Port
- syn keyword sshdconfigKeyword PrintLastLog PrintMotd Protocol
--syn keyword sshdconfigKeyword PubkeyAuthentication RSAAuthentication
--syn keyword sshdconfigKeyword RhostsAuthentication RhostsRSAAuthentication
--syn keyword sshdconfigKeyword ServerKeyBits StrictModes Subsystem
--syn keyword sshdconfigKeyword ShowPatchLevel
--syn keyword sshdconfigKeyword SyslogFacility TCPKeepAlive UseDNS
--syn keyword sshdconfigKeyword UseLogin UsePAM UsePrivilegeSeparation
-+syn keyword sshdconfigKeyword PubkeyAuthentication
-+syn keyword sshdconfigKeyword RhostsRSAAuthentication RSAAuthentication
-+syn keyword sshdconfigKeyword ServerKeyBits ShowPatchLevel StrictModes
-+syn keyword sshdconfigKeyword Subsystem SyslogFacility
-+syn keyword sshdconfigKeyword TCPKeepAlive
-+syn keyword sshdconfigKeyword UseDNS UseLogin UsePAM UsePrivilegeSeparation
- syn keyword sshdconfigKeyword X11DisplayOffset X11Forwarding
- syn keyword sshdconfigKeyword X11UseLocalhost XAuthLocation
- 
- " Define the default highlighting
- if version >= 508 || !exists("did_sshdconfig_syntax_inits")
--	if version < 508
--		let did_sshdconfig_syntax_inits = 1
--		command -nargs=+ HiLink hi link <args>
--	else
--		command -nargs=+ HiLink hi def link <args>
--	endif
--
--	HiLink sshdconfigComment Comment
--	HiLink sshdconfigTodo Todo
--	HiLink sshdconfigHostPort sshdconfigConstant
--	HiLink sshdconfigTime sshdconfigConstant
--	HiLink sshdconfigNumber sshdconfigConstant
--	HiLink sshdconfigConstant Constant
--	HiLink sshdconfigYesNo sshdconfigEnum
--	HiLink sshdconfigCipher sshdconfigEnum
--	HiLink sshdconfigMAC sshdconfigEnum
--	HiLink sshdconfigRootLogin sshdconfigEnum
--	HiLink sshdconfigLogLevel sshdconfigEnum
--	HiLink sshdconfigSysLogFacility sshdconfigEnum
--	HiLink sshdconfigEnum Function
--	HiLink sshdconfigSpecial Special
--	HiLink sshdconfigKeyword Keyword
--	delcommand HiLink
-+  if version < 508
-+    let did_sshdconfig_syntax_inits = 1
-+    command -nargs=+ HiLink hi link <args>
-+  else
-+    command -nargs=+ HiLink hi def link <args>
-+  endif
-+
-+  HiLink sshdconfigComment        Comment
-+  HiLink sshdconfigTodo           Todo
-+  HiLink sshdconfigHostPort       sshdconfigConstant
-+  HiLink sshdconfigTime           sshdconfigConstant
-+  HiLink sshdconfigNumber         sshdconfigConstant
-+  HiLink sshdconfigConstant       Constant
-+  HiLink sshdconfigYesNo          sshdconfigEnum
-+  HiLink sshdconfigAddressFamily  sshdconfigEnum
-+  HiLink sshdconfigCipher         sshdconfigEnum
-+  HiLink sshdconfigMAC            sshdconfigEnum
-+  HiLink sshdconfigRootLogin      sshdconfigEnum
-+  HiLink sshdconfigLogLevel       sshdconfigEnum
-+  HiLink sshdconfigSysLogFacility sshdconfigEnum
-+  HiLink sshdconfigEnum           Function
-+  HiLink sshdconfigSpecial        Special
-+  HiLink sshdconfigKeyword        Keyword
-+  HiLink sshdconfigMatch          Type
-+  delcommand HiLink
- endif
- 
- let b:current_syntax = "sshdconfig"
-diff -u -r --new-file runtime/syntax.orig/taskdata.vim runtime/syntax/taskdata.vim
---- runtime/syntax.orig/taskdata.vim	1969-12-31 18:00:00.000000000 -0600
-+++ runtime/syntax/taskdata.vim	2009-07-26 06:44:44.000000000 -0500
-@@ -0,0 +1,43 @@
-+" Vim syntax file
-+" Language:	task data
-+" Maintainer:	John Florian <jflorian@doubledog.org>
-+" Updated:	Wed Jul  8 19:46:20 EDT 2009
-+
-+
-+" For version 5.x: Clear all syntax items.
-+" For version 6.x: Quit when a syntax file was already loaded.
-+if version < 600
-+  syntax clear
-+elseif exists("b:current_syntax")
-+  finish
-+endif
-+
-+" Key Names for values.
-+syn keyword taskdataKey		description due end entry imask mask parent
-+syn keyword taskdataKey		priority project recur start status tags uuid
-+syn match taskdataKey		"annotation_\d\+"
-+syn match taskdataUndo		"^time.*$"
-+syn match taskdataUndo		"^\(old \|new \|---\)"
-+
-+" Values associated with key names.
-+"
-+" Strings
-+syn region taskdataString	matchgroup=Normal start=+"+ end=+"+
-+			\	contains=taskdataEncoded,taskdataUUID,@Spell
-+"
-+" Special Embedded Characters (e.g., "&comma;")
-+syn match taskdataEncoded	"&\a\+;" contained
-+" UUIDs
-+syn match taskdataUUID		"\x\{8}-\(\x\{4}-\)\{3}\x\{12}" contained
-+
-+
-+" The default methods for highlighting.  Can be overridden later.
-+hi def link taskdataEncoded	Function
-+hi def link taskdataKey		Statement
-+hi def link taskdataString 	String
-+hi def link taskdataUUID 	Special
-+hi def link taskdataUndo 	Type
-+
-+let b:current_syntax = "taskdata"
-+
-+" vim:noexpandtab
-diff -u -r --new-file runtime/syntax.orig/taskedit.vim runtime/syntax/taskedit.vim
---- runtime/syntax.orig/taskedit.vim	1969-12-31 18:00:00.000000000 -0600
-+++ runtime/syntax/taskedit.vim	2009-07-26 06:44:44.000000000 -0500
-@@ -0,0 +1,35 @@
-+" Vim syntax file
-+" Language:	support for 'task 42 edit'
-+" Maintainer:	John Florian <jflorian@doubledog.org>
-+" Updated:	Wed Jul  8 19:46:32 EDT 2009
-+
-+
-+" For version 5.x: Clear all syntax items.
-+" For version 6.x: Quit when a syntax file was already loaded.
-+if version < 600
-+  syntax clear
-+elseif exists("b:current_syntax")
-+  finish
-+endif
-+
-+syn match taskeditHeading	"^\s*#\s*Name\s\+Editable details\s*$" contained
-+syn match taskeditHeading	"^\s*#\s*-\+\s\+-\+\s*$" contained
-+syn match taskeditReadOnly	"^\s*#\s*\(UU\)\?ID:.*$" contained
-+syn match taskeditReadOnly	"^\s*#\s*Status:.*$" contained
-+syn match taskeditReadOnly	"^\s*#\s*i\?Mask:.*$" contained
-+syn match taskeditKey		"^ *.\{-}:" nextgroup=taskeditString
-+syn match taskeditComment	"^\s*#.*$"
-+			\	contains=taskeditReadOnly,taskeditHeading
-+syn match taskeditString	".*$" contained contains=@Spell
-+
-+
-+" The default methods for highlighting.  Can be overridden later.
-+hi def link taskeditComment	Comment
-+hi def link taskeditHeading	Function
-+hi def link taskeditKey		Statement
-+hi def link taskeditReadOnly	Special
-+hi def link taskeditString	String
-+
-+let b:current_syntax = "taskedit"
-+
-+" vim:noexpandtab
-diff -u -r --new-file runtime/syntax.orig/tcl.vim runtime/syntax/tcl.vim
---- runtime/syntax.orig/tcl.vim	2006-11-17 13:25:54.000000000 -0600
-+++ runtime/syntax/tcl.vim	2009-06-03 05:07:39.000000000 -0500
-@@ -1,13 +1,16 @@
- " Vim syntax file
--" Language:	TCL/TK
--" Maintainer:	Brett Cannon <brett@python.org>
-+" Language:	Tcl/Tk
-+" Maintainer:	Taylor Venable <taylor@metasyntax.net>
-+" 		(previously Brett Cannon <brett@python.org>)
- " 		(previously Dean Copsey <copsey@cs.ucdavis.edu>)
- "		(previously Matt Neumann <mattneu@purpleturtle.com>)
- "		(previously Allan Kelly <allan@fruitloaf.co.uk>)
- " Original:	Robin Becker <robin@jessikat.demon.co.uk>
--" Last Change:	2006 Nov 17
-+" Last Change:	2009/04/06 02:38:36
-+" Version:	1.13
-+" URL:		http://real.metasyntax.net:2357/cvs/cvsweb.cgi/Config/vim/syntax/tcl.vim
- "
--" Keywords TODO: format clock click anchor
-+" Keywords TODO: click anchor
- 
- " For version 5.x: Clear all syntax items
- " For version 6.x: Quit when a syntax file was already loaded
-@@ -17,19 +20,40 @@
-   finish
- endif
- 
--" A bunch of useful keywords
--syn keyword tclStatement  tell socket subst open eof pwd glob list exec pid
--syn keyword tclStatement  auto_load_index time unknown eval lrange fblocked
--syn keyword tclStatement  lsearch auto_import gets lappend proc variable llength
--syn keyword tclStatement  auto_execok return linsert error catch clock info
--syn keyword tclStatement  split array fconfigure concat join lreplace source
--syn keyword tclStatement  fcopy global auto_qualify update close cd auto_load
--syn keyword tclStatement  file append format read package set binary namespace
--syn keyword tclStatement  scan trace seek flush after vwait uplevel lset rename
--syn keyword tclStatement  fileevent regexp upvar unset encoding expr load regsub
--syn keyword tclStatement interp exit puts incr lindex lsort tclLog string
-+" Basic Tcl commands: http://www.tcl.tk/man/tcl8.5/TclCmd/contents.htm
-+syn keyword tclCommand		after append apply array bgerror binary catch cd chan clock
-+syn keyword tclCommand		close concat dde dict encoding eof error eval exec exit
-+syn keyword tclCommand		expr fblocked fconfigure fcopy file fileevent filename flush
-+syn keyword tclCommand		format gets glob global history incr info interp join
-+syn keyword tclCommand		lappend lassign lindex linsert list llength load lrange lrepeat
-+syn keyword tclCommand		lreplace lreverse lsearch lset lsort memory namespace open package
-+syn keyword tclCommand		pid proc puts pwd read regexp registry regsub rename return
-+syn keyword tclCommand		scan seek set socket source split string subst tell time
-+syn keyword tclCommand		trace unknown unload unset update uplevel upvar variable vwait
-+
-+" The 'Tcl Standard Library' commands: http://www.tcl.tk/man/tcl8.5/TclCmd/library.htm
-+syn keyword tclCommand		auto_execok auto_import auto_load auto_mkindex auto_mkindex_old
-+syn keyword tclCommand		auto_qualify auto_reset parray tcl_endOfWord tcl_findLibrary
-+syn keyword tclCommand		tcl_startOfNextWord tcl_startOfPreviousWord tcl_wordBreakAfter
-+syn keyword tclCommand		tcl_wordBreakBefore
-+
-+" Commands that were added in Tcl 8.6
-+
-+syn keyword tclCommand		my oo::copy oo::define oo::objdefine self
-+syn keyword tclCommand		coroutine tailcall throw yield
-+
-+" Global variables used by Tcl: http://www.tcl.tk/man/tcl8.5/TclCmd/tclvars.htm
-+syn keyword tclVars		env errorCode errorInfo tcl_library tcl_patchLevel tcl_pkgPath
-+syn keyword tclVars		tcl_platform tcl_precision tcl_rcFileName tcl_traceCompile
-+syn keyword tclVars		tcl_traceExec tcl_wordchars tcl_nonwordchars tcl_version argc argv
-+syn keyword tclVars		argv0 tcl_interactive geometry
-+
-+" Strings which expr accepts as boolean values, aside from zero / non-zero.
-+syn keyword tclBoolean		true false on off yes no
-+
- syn keyword tclLabel		case default
- syn keyword tclConditional	if then else elseif switch
-+syn keyword tclConditional	try finally
- syn keyword tclRepeat		while for foreach break continue
- syn keyword tcltkSwitch	contained	insert create polygon fill outline tag
- 
-@@ -63,9 +87,14 @@
- syn keyword tcltkWidgetSwitch contained delete names types create
- " variable reference
- 	" ::optional::namespaces
--syn match tclVarRef "$\(\(::\)\?\([[:alnum:]_.]*::\)*\)\a[a-zA-Z0-9_.]*"
-+syn match tclVarRef "$\(\(::\)\?\([[:alnum:]_]*::\)*\)\a[[:alnum:]_]*"
- 	" ${...} may contain any character except '}'
- syn match tclVarRef "${[^}]*}"
-+
-+" The syntactic unquote-splicing replacement for [expand].
-+syn match tclExpand '\s{\*}'
-+syn match tclExpand '^{\*}'
-+
- " menu, mane add
- syn keyword tcltkWidgetSwitch contained active end last none cascade checkbutton command radiobutton separator
- syn keyword tcltkWidgetSwitch contained activebackground actveforeground accelerator background bitmap columnbreak
-@@ -130,11 +159,10 @@
- 
- " EXPR
- " commands associated with expr
--syn keyword tcltkMaths	contained	acos	cos	hypot	sinh
--syn keyword tcltkMaths	contained	asin	cosh	log	sqrt
--syn keyword tcltkMaths	contained	atan	exp	log10	tan
--syn keyword tcltkMaths	contained	atan2	floor	pow	tanh
--syn keyword tcltkMaths	contained	ceil	fmod	sin
-+syn keyword tcltkMaths contained	abs acos asin atan atan2 bool ceil cos cosh double entier
-+syn keyword tcltkMaths contained	exp floor fmod hypot int isqrt log log10 max min pow rand
-+syn keyword tcltkMaths contained	round sin sinh sqrt srand tan tanh wide
-+
- syn region tcltkCommand matchgroup=tcltkCommandColor start="\<expr\>" matchgroup=NONE skip="^\s*$" end="]\|[^\\]*\s*$"me=e-1  contains=tclLineContinue,tcltkMaths,tclNumber,tclVarRef,tclString,tcltlWidgetSwitch,tcltkCommand,tcltkPackConf
- 
- " format
-@@ -165,17 +193,26 @@
- 
- syn keyword tclTodo contained	TODO
- 
-+" Sequences which are backslash-escaped: http://www.tcl.tk/man/tcl8.5/TclCmd/Tcl.htm#M16
-+" Octal, hexadecimal, unicode codepoints, and the classics.
-+" Tcl takes as many valid characters in a row as it can, so \xAZ in a string is newline followed by 'Z'.
-+syn match   tclSpecial contained '\\\([0-7]\{1,3}\|x\x\{1,2}\|u\x\{1,4}\|[abfnrtv]\)'
-+syn match   tclSpecial contained '\\[\[\]\{\}\"\$]'
- 
--" String and Character contstants
--" Highlight special characters (those which have a backslash) differently
--syn match   tclSpecial contained "\\\d\d\d\=\|\\."
-+" Command appearing inside another command or inside a string.
-+syn region tclEmbeddedStatement	start='\[' end='\]' contained contains=tclCommand,tclNumber,tclLineContinue,tclString,tclVarRef,tclEmbeddedStatement
- " A string needs the skip argument as it may legitimately contain \".
- " Match at start of line
- syn region  tclString		  start=+^"+ end=+"+ contains=tclSpecial skip=+\\\\\|\\"+
- "Match all other legal strings.
--syn region  tclString		  start=+[^\\]"+ms=s+1  end=+"+ contains=tclSpecial skip=+\\\\\|\\"+
-+syn region  tclString		  start=+[^\\]"+ms=s+1  end=+"+ contains=tclSpecial,tclVarRef,tclEmbeddedStatement skip=+\\\\\|\\"+
-+
-+" Line continuation is backslash immediately followed by newline.
-+syn match tclLineContinue '\\$'
- 
--syn match   tclLineContinue "\\\s*$"
-+if exists('g:tcl_warn_continuation')
-+    syn match tclNotLineContinue '\\\s\+$'
-+endif
- 
- "integer number, or floating point number without a dot and with "f".
- syn case ignore
-@@ -208,13 +245,13 @@
-   endif
- 
-   HiLink tcltkSwitch		Special
-+  HiLink tclExpand		Special
-   HiLink tclLabel		Label
-   HiLink tclConditional		Conditional
-   HiLink tclRepeat		Repeat
-   HiLink tclNumber		Number
-   HiLink tclError		Error
--  HiLink tclStatement		Statement
--  "HiLink tclStatementColor	Statement
-+  HiLink tclCommand		Statement
-   HiLink tclString		String
-   HiLink tclComment		Comment
-   HiLink tclSpecial		Special
-@@ -223,6 +260,9 @@
-   HiLink tcltkCommandColor	Statement
-   HiLink tcltkWidgetColor	Structure
-   HiLink tclLineContinue	WarningMsg
-+if exists('g:tcl_warn_continuation')
-+  HiLink tclNotLineContinue	ErrorMsg
-+endif
-   HiLink tcltkStringSwitch	Special
-   HiLink tcltkArraySwitch	Special
-   HiLink tcltkLsortSwitch	Special
-@@ -232,7 +272,6 @@
-   HiLink tcltkNamespaceSwitch	Special
-   HiLink tcltkWidgetSwitch	Special
-   HiLink tcltkPackConfColor	Identifier
--  "HiLink tcltkLsort		Statement
-   HiLink tclVarRef		Identifier
- 
-   delcommand HiLink
-@@ -240,4 +279,4 @@
- 
- let b:current_syntax = "tcl"
- 
--" vim: ts=8
-+" vim: ts=8 noet
-diff -u -r --new-file runtime/syntax.orig/tcsh.vim runtime/syntax/tcsh.vim
---- runtime/syntax.orig/tcsh.vim	2007-06-17 06:20:06.000000000 -0500
-+++ runtime/syntax/tcsh.vim	2009-12-24 10:29:21.000000000 -0600
-@@ -1,6 +1,6 @@
- " tcsh.vim: Vim syntax file for tcsh scripts
--" Maintainer:	Gautam Iyer <gi1242@users.sourceforge.net>
--" Modified:	Sat 16 Jun 2007 04:52:12 PM PDT
-+" Maintainer:	Gautam Iyer <gi1242@gmail.com>
-+" Modified:	Thu 17 Dec 2009 06:05:07 PM EST
- "
- " Description: We break up each statement into a "command" and an "end" part.
- " All groups are either a "command" or part of the "end" of a statement (ie
-@@ -60,7 +60,7 @@
- " alias and unalias (contains special aliases)
- syn keyword tcshAliases contained beepcmd cwdcmd jobcmd helpcommand periodic precmd postcmd shell
- syn keyword tcshBuiltin	nextgroup=tcshAliCmd skipwhite alias unalias
--syn match   tcshAliCmd	contained nextgroup=tcshAliEnd skipwhite '\v[\w-]+' contains=tcshAliases
-+syn match   tcshAliCmd	contained nextgroup=tcshAliEnd skipwhite '\v(\w|-)+' contains=tcshAliases
- syn region  tcshAliEnd	contained transparent matchgroup=tcshBuiltin start='' skip='\\$' end='$\|;' contains=@tcshStatementEnds
- 
- " if statements
-@@ -197,7 +197,11 @@
- 
- " ----- Synchronising -----
- if exists('tcsh_minlines')
--    exec 'syn sync minlines=' . tcsh_minlines
-+    if tcsh_minlines == 'fromstart'
-+	syn sync fromstart
-+    else
-+	exec 'syn sync minlines=' . tcsh_minlines
-+    endif
- else
-     syn sync minlines=100	" Some completions can be quite long
- endif
-diff -u -r --new-file runtime/syntax.orig/tex.vim runtime/syntax/tex.vim
---- runtime/syntax.orig/tex.vim	2008-07-29 14:43:38.000000000 -0500
-+++ runtime/syntax/tex.vim	2010-01-12 14:39:39.000000000 -0600
-@@ -1,8 +1,8 @@
- " Vim syntax file
- " Language:	TeX
- " Maintainer:	Dr. Charles E. Campbell, Jr. <NdrchipO@ScampbellPfamily.AbizM>
--" Last Change:	Jun 03, 2008
--" Version:	41
-+" Last Change:	Dec 28, 2009
-+" Version:	46
- " URL:		http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax
- "
- " Notes: {{{1
-@@ -103,6 +103,7 @@
- syn cluster texEnvGroup		contains=texMatcher,texMathDelim,texSpecialChar,texStatement
- syn cluster texFoldGroup	contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texInputFile,texLength,texLigature,texMatcher,texMathZoneV,texMathZoneW,texMathZoneX,texMathZoneY,texMathZoneZ,texNewCmd,texNewEnv,texOnlyMath,texOption,texParen,texRefZone,texSection,texSectionMarker,texSectionZone,texSpaceCode,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,@texMathZones,texTitle,texAbstract
- syn cluster texMatchGroup	contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texMatcher,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,texInputFile,texOption,@Spell
-+syn cluster texStyleGroup	contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,texInputFile,texOption,texStyleStatement,@Spell,texStyleMatcher
- syn cluster texRefGroup		contains=texMatcher,texComment,texDelimiter
- if !exists("tex_no_math")
-  syn cluster texMathZones	contains=texMathZoneV,texMathZoneW,texMathZoneX,texMathZoneY,texMathZoneZ
-@@ -179,24 +180,24 @@
- 
- " \begin{}/\end{} section markers: {{{1
- syn match  texSectionMarker	"\\begin\>\|\\end\>" nextgroup=texSectionName
--syn region texSectionName	matchgroup=Delimiter start="{" end="}"  contained nextgroup=texSectionModifier
--syn region texSectionModifier	matchgroup=Delimiter start="\[" end="]" contained
-+syn region texSectionName	matchgroup=Delimiter start="{" end="}"  contained	nextgroup=texSectionModifier	contains=texComment
-+syn region texSectionModifier	matchgroup=Delimiter start="\[" end="]" contained	contains=texComment
- 
- " \documentclass, \documentstyle, \usepackage: {{{1
- syn match  texDocType		"\\documentclass\>\|\\documentstyle\>\|\\usepackage\>"	nextgroup=texSectionName,texDocTypeArgs
--syn region texDocTypeArgs	matchgroup=Delimiter start="\[" end="]"			contained	nextgroup=texSectionName
-+syn region texDocTypeArgs	matchgroup=Delimiter start="\[" end="]"			contained	nextgroup=texSectionName	contains=texComment
- 
- " Preamble syntax-based folding support: {{{1
- if g:tex_fold_enabled && has("folding")
-- syn region texPreamble	transparent fold	start='\zs\\documentclass\>' end='\ze\\begin{document}'	contains=@texMatchGroup
-+ syn region texPreamble	transparent fold	start='\zs\\documentclass\>' end='\ze\\begin{document}'	contains=texStyle,@texMatchGroup
- endif
- 
- " TeX input: {{{1
- syn match texInput		"\\input\s\+[a-zA-Z/.0-9_^]\+"hs=s+7				contains=texStatement
--syn match texInputFile		"\\include\(graphics\|list\)\=\(\[.\{-}\]\)\=\s*{.\{-}}"	contains=texStatement,texInputCurlies
-+syn match texInputFile		"\\include\(graphics\|list\)\=\(\[.\{-}\]\)\=\s*{.\{-}}"	contains=texStatement,texInputCurlies,texInputFileOpt
- syn match texInputFile		"\\\(epsfig\|input\|usepackage\)\s*\(\[.*\]\)\={.\{-}}"		contains=texStatement,texInputCurlies,texInputFileOpt
- syn match texInputCurlies	"[{}]"								contained
--syn region texInputFileOpt	matchgroup=Delimiter start="\[" end="\]"			contained
-+syn region texInputFileOpt	matchgroup=Delimiter start="\[" end="\]"			contained	contains=texComment
- 
- " Type Styles (LaTeX 2.09): {{{1
- syn match texTypeStyle		"\\rm\>"
-@@ -309,7 +310,7 @@
-    exe 'syn region '.grpname.' start='."'".'\\begin\s*{\s*'.a:mathzone.'\s*}'."'".' end='."'".'\\end\s*{\s*'.a:mathzone.'\s*}'."'".' keepend contains=@texMathZoneGroup'.foldcmd
-    exe 'syn sync match '.syncname.' grouphere '.grpname.' "\\begin\s*{\s*'.a:mathzone.'\*\s*}"'
-    exe 'syn sync match '.syncname.' grouphere '.grpname.' "\\begin\s*{\s*'.a:mathzone.'\*\s*}"'
--   exe 'HiLink '.grpname.' texMath'
-+   exe 'hi def link '.grpname.' texMath'
-    if a:starform
-     let grpname  = "texMathZone".a:sfx.'S'
-     let syncname = "texSyncMathZone".a:sfx.'S'
-@@ -317,7 +318,7 @@
-     exe 'syn region '.grpname.' start='."'".'\\begin\s*{\s*'.a:mathzone.'\*\s*}'."'".' end='."'".'\\end\s*{\s*'.a:mathzone.'\*\s*}'."'".' keepend contains=@texMathZoneGroup'.foldcmd
-     exe 'syn sync match '.syncname.' grouphere '.grpname.' "\\begin\s*{\s*'.a:mathzone.'\*\s*}"'
-     exe 'syn sync match '.syncname.' grouphere '.grpname.' "\\begin\s*{\s*'.a:mathzone.'\*\s*}"'
--    exe 'HiLink '.grpname.' texMath'
-+    exe 'hi def link '.grpname.' texMath'
-    endif
-  endfun
- 
-@@ -399,7 +400,7 @@
- " Separate lines used for verb` and verb# so that the end conditions {{{1
- " will appropriately terminate.  Ideally vim would let me save a
- " character from the start pattern and re-use it in the end-pattern.
--syn region texZone		start="\\begin{verbatim}"		end="\\end{verbatim}\|%stopzone\>"	contains=@Spell
-+syn region texZone		start="\\begin{[vV]erbatim}"		end="\\end{[vV]erbatim}\|%stopzone\>"	contains=@Spell
- " listings package:
- syn region texZone		start="\\begin{lstlisting}"		end="\\end{lstlisting}\|%stopzone\>"	contains=@Spell
- " moreverb package:
-@@ -456,6 +457,14 @@
- " TeX String Delimiters: {{{1
- syn match texString		"\(``\|''\|,,\)"
- 
-+" makeatletter -- makeatother sections
-+if !exists("g:tex_no_error")
-+ syn region texStyle			matchgroup=texStatement start='\\makeatletter' end='\\makeatother'	contains=@texStyleGroup contained
-+ syn match  texStyleStatement		"\\[a-zA-Z@]\+"	contained
-+ syn region texStyleMatcher		matchgroup=Delimiter start="{" skip="\\\\\|\\[{}]"	end="}"		contains=@texStyleGroup,texError	contained
-+ syn region texStyleMatcher		matchgroup=Delimiter start="\["				end="]"		contains=@texStyleGroup,texError	contained
-+endif
-+
- " LaTeX synchronization: {{{1
- syn sync maxlines=200
- syn sync minlines=50
-@@ -507,6 +516,7 @@
-    HiLink texMathDelimSet2	texMathDelim
-    HiLink texMathDelimKey	texMathDelim
-    HiLink texMathMatcher	texMath
-+   HiLink texMathZoneV		texMath
-    HiLink texMathZoneW		texMath
-    HiLink texMathZoneX		texMath
-    HiLink texMathZoneY		texMath
-@@ -516,6 +526,7 @@
-   HiLink texSectionMarker	texCmdName
-   HiLink texSectionName		texSection
-   HiLink texSpaceCode		texStatement
-+  HiLink texStyleStatement	texStatement
-   HiLink texTypeSize		texType
-   HiLink texTypeStyle		texType
- 
-diff -u -r --new-file runtime/syntax.orig/uil.vim runtime/syntax/uil.vim
---- runtime/syntax.orig/uil.vim	2004-06-07 09:32:35.000000000 -0500
-+++ runtime/syntax/uil.vim	2009-12-16 14:38:21.000000000 -0600
-@@ -1,8 +1,9 @@
- " Vim syntax file
- " Language:	Motif UIL (User Interface Language)
- " Maintainer:	Thomas Koehler <jean-luc@picard.franken.de>
--" Last Change:	2002 Sep 20
--" URL:		http://jeanluc-picard.de/vim/syntax/uil.vim
-+" Last Change:	2009 Dec 04
-+" URL:		http://gott-gehabt.de/800_wer_wir_sind/thomas/Homepage/Computer/vim/syntax/uil.vim
-+
- 
- " Quit when a syntax file was already loaded
- if version < 600
-diff -u -r --new-file runtime/syntax.orig/updatedb.vim runtime/syntax/updatedb.vim
---- runtime/syntax.orig/updatedb.vim	2007-10-25 09:36:25.000000000 -0500
-+++ runtime/syntax/updatedb.vim	2009-06-13 07:38:40.000000000 -0500
-@@ -1,7 +1,7 @@
- " Vim syntax file
- " Language:         updatedb.conf(5) configuration file
- " Maintainer:       Nikolai Weibull <now@bitwi.se>
--" Latest Revision:  2007-10-25
-+" Latest Revision:  2009-05-25
- 
- if exists("b:current_syntax")
-   finish
-@@ -18,7 +18,11 @@
- syn match   updatedbBegin   display '^'
-                             \ nextgroup=updatedbName,updatedbComment skipwhite
- 
--syn keyword updatedbName    contained PRUNEFS PRUNEPATHS PRUNE_BIND_MOUNTS
-+syn keyword updatedbName    contained
-+                            \ PRUNEFS
-+                            \ PRUNENAMES
-+                            \ PRUNEPATHS
-+                            \ PRUNE_BIND_MOUNTS
-                             \ nextgroup=updatedbNameEq
- 
- syn match   updatedbNameEq  contained display '=' nextgroup=updatedbValue
-diff -u -r --new-file runtime/syntax.orig/vim.vim runtime/syntax/vim.vim
---- runtime/syntax.orig/vim.vim	2008-07-29 14:43:38.000000000 -0500
-+++ runtime/syntax/vim.vim	2010-01-12 14:33:53.000000000 -0600
-@@ -1,8 +1,8 @@
- " Vim syntax file
- " Language:	Vim 7.2 script
- " Maintainer:	Dr. Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz>
--" Last Change:	July 29, 2008
--" Version:	7.2-82
-+" Last Change:	Nov 18, 2009
-+" Version:	7.2-95
- " Automatically generated keyword lists: {{{1
- 
- " Quit when a syntax file was already loaded {{{2
-@@ -16,11 +16,11 @@
- syn cluster vimCommentGroup	contains=vimTodo,@Spell
- 
- " regular vim commands {{{2
--syn keyword vimCommand contained	abc[lear] argdo argu[ment] bel[owright] bN[ext] breakd[el] b[uffer] caddb[uffer] cb[uffer] cex[pr] cg[etfile] checkt[ime] cnew[er] col[der] con[tinue] cq[uit] delc[ommand] diffoff diffu[pdate] dr[op] echom[sg] em[enu] endt[ry] exu[sage] fin[d] foldc[lose] fu[nction] ha[rdcopy] helpt[ags] if is[earch] ju[mps] kee[pmarks] lan[guage] lc[d] lefta[bove] lgetb[uffer] lgrepa[dd] lla[st] lmapc[lear] lnf[ile] loc[kmarks] lpf[ile] lt[ag] mak[e] menut[ranslate] mkvie[w] mzf[ile] n[ext] nu[mber] opt[ions] perld[o] pp[op] P[rint] promptr[epl] ptj[ump] ptp[revious] pw[d] q[uit] redi[r] reg[isters] rew[ind] rubyd[o] sal[l] sba[ll] sbn[ext] sb[uffer] setf[iletype] sfir[st] sim[alt] sm[ap] sn[ext] snor[emap] so[urce] spellr[epall] spr[evious] star[tinsert] stopi[nsert] sunmenu t tabe[dit] tabm[ove] tabo[nly] ta[g] tclf[ile] tj[ump] tn[ext] tr[ewind] tu[nmenu] undol[ist] verb[ose] vim[grep] vmapc[lear] wh[ile] win[size] wq wv[iminfo] xm[ap] XMLent xnoremenu
--syn keyword vimCommand contained	abo[veleft] arge[dit] as[cii] bf[irst] bo[tright] breakl[ist] buffers cad[dexpr] cc cf[ile] c[hange] cla[st] cn[ext] colo[rscheme] cope[n] cr[ewind] d[elete] diffpatch dig[raphs] ds[earch] echon emenu* endw[hile] f[ile] fini[sh] folddoc[losed] go[to] h[elp] hid[e] ij[ump] isp[lit] k laddb[uffer] la[st] lch[dir] lex[pr] lgete[xpr] lh[elpgrep] lli[st] lnew[er] lNf[ile] lockv[ar] lp[revious] lv[imgrep] ma[rk] mk[exrc] mkv[imrc] mz[scheme] N[ext] omapc[lear] pc[lose] po[p] pre[serve] profd[el] ps[earch] ptl[ast] ptr[ewind] pyf[ile] quita[ll] red[o] res[ize] ri[ght] rubyf[ile] san[dbox] sbf[irst] sbN[ext] scripte[ncoding] setg[lobal] sh[ell] sla[st] smapc[lear] sN[ext] snoreme spelld[ump] spellu[ndo] sre[wind] startr[eplace] sts[elect] sus[pend] tab tabf[ind] tabnew tabp[revious] tags te[aroff] tl[ast] tN[ext] try una[bbreviate] unh[ide] ve[rsion] vimgrepa[dd] vne[w] winc[md] wn[ext] wqa[ll] X xmapc[lear] XMLns xunme
--syn keyword vimCommand contained	al[l] argg[lobal] bad[d] bl[ast] bp[revious] br[ewind] bun[load] caddf[ile] ccl[ose] cfir[st] changes cl[ist] cN[ext] comc[lear] co[py] cuna[bbrev] delf[unction] diffpu[t] di[splay] dsp[lit] e[dit] endfo[r] ene[w] files fir[st] foldd[oopen] gr[ep] helpf[ind] his[tory] il[ist] iuna[bbrev] keepalt lad[dexpr] later lcl[ose] lf[ile] lg[etfile] l[ist] lmak[e] lne[xt] ln[oremap] lol[der] lr[ewind] lvimgrepa[dd] marks mks[ession] mod[e] nbkey nmapc[lear] on[ly] ped[it] popu prev[ious] prof[ile] pta[g] ptn[ext] pts[elect] py[thon] r[ead] redr[aw] ret[ab] rightb[elow] ru[ntime] sa[rgument] sbl[ast] sbp[revious] scrip[tnames] setl[ocal] sign sl[eep] sme sni[ff] snoremenu spe[llgood] spellw[rong] sta[g] stj[ump] sun[hide] sv[iew] tabc[lose] tabfir[st] tabn[ext] tabr[ewind] tc[l] tf[irst] tm to[pleft] ts[elect] u[ndo] unlo[ckvar] vert[ical] vi[sual] vs[plit] windo wN[ext] w[rite] xa[ll] xme xn[oremap] xunmenu
--syn keyword vimCommand contained	arga[dd] argl[ocal] ba[ll] bm[odified] brea[k] bro[wse] bw[ipeout] cal[l] cd cgetb[uffer] chd[ir] clo[se] cnf[ile] comp[iler] cpf[ile] cw[indow] delm[arks] diffsplit dj[ump] earlier el[se] endf[unction] ex filetype fix[del] foldo[pen] grepa[dd] helpg[rep] iabc[lear] imapc[lear] j[oin] keepj[umps] laddf[ile] lb[uffer] le[ft] lfir[st] lgr[ep] ll lm[ap] lN[ext] lo[adview] lop[en] ls lw[indow] mat[ch] mksp[ell] m[ove] new noh[lsearch] o[pen] pe[rl] popu[p] p[rint] promptf[ind] ptf[irst] ptN[ext] pu[t] qa[ll] rec[over] redraws[tatus] retu[rn] rub[y] rv[iminfo] sav[eas] sbm[odified] sbr[ewind] se[t] sf[ind] sil[ent] sm[agic] smenu sno[magic] sor[t] spelli[nfo] sp[lit] startg[replace] st[op] sunme syncbind tabd[o] tabl[ast] tabN[ext] tabs tcld[o] th[row] tm[enu] tp[revious] tu undoj[oin] up[date] vie[w] viu[sage] wa[ll] winp[os] wp[revious] ws[verb] x[it] xmenu xnoreme y[ank]
--syn keyword vimCommand contained	argd[elete] ar[gs] bd[elete] bn[ext] breaka[dd] bufdo cabc[lear] cat[ch] ce[nter] cgete[xpr] che[ckpath] cmapc[lear] cNf[ile] conf[irm] cp[revious] debugg[reedy] diffg[et] diffthis dl[ist] echoe[rr] elsei[f] en[dif] exi[t] fina[lly] fo[ld] for 
-+syn keyword vimCommand contained	abc[lear] argdo argu[ment] bel[owright] bN[ext] breakd[el] b[uffer] caddb[uffer] cb[uffer] cex[pr] cg[etfile] checkt[ime] cnew[er] col[der] con[tinue] cq[uit] delc[ommand] diffoff diffu[pdate] dr[op] echom[sg] em[enu] en[dif] ex files fini[sh] foldc[lose] for grepa[dd] helpg[rep] iabc[lear] imapc[lear] j[oin] keepj[umps] laddf[ile] lb[uffer] le[ft] lfir[st] lgr[ep] ll lmapc[lear] lnf[ile] lockv[ar] lp[revious] lv[imgrep] ma[rk] mk[exrc] mkv[imrc] mz[scheme] N[ext] ol[dfiles] opt[ions] perld[o] pp[op] P[rint] promptr[epl] ptj[ump] ptp[revious] pw[d] q[uit] redi[r] reg[isters] rew[ind] rubyd[o] sal[l] sba[ll] sbn[ext] sb[uffer] setf[iletype] sfir[st] sim[alt] sm[ap] sN[ext] snoremenu spe[llgood] spellw[rong] sta[g] stj[ump] sun[hide] sv[iew] tabc[lose] tabfir[st] tabn[ext] tabr[ewind] tc[l] tf[irst] tm to[pleft] ts[elect] u[ndo] unlo[ckvar] vert[ical] vi[sual] vs[plit] windo wN[ext] w[rite] xa[ll] xmenu xnoremenu
-+syn keyword vimCommand contained	abo[veleft] arge[dit] as[cii] bf[irst] bo[tright] breakl[ist] buffers cad[dexpr] cc cf[ile] c[hange] cla[st] cn[ext] colo[rscheme] cope[n] cr[ewind] d[elete] diffpatch dig[raphs] ds[earch] echon emenu* endt[ry] exi[t] filetype fir[st] folddoc[losed] fu[nction] ha[rdcopy] helpt[ags] if is[earch] ju[mps] kee[pmarks] lan[guage] lc[d] lefta[bove] lgetb[uffer] lgrepa[dd] lla[st] lnew[er] lNf[ile] lol[der] lr[ewind] lvimgrepa[dd] marks mks[ession] mod[e] nbkey nmapc[lear] omapc[lear] pc[lose] po[p] pre[serve] profd[el] ps[earch] ptl[ast] ptr[ewind] pyf[ile] quita[ll] red[o] res[ize] ri[ght] rubyf[ile] san[dbox] sbf[irst] sbN[ext] scripte[ncoding] setg[lobal] sh[ell] sla[st] sme sni[ff] sor[t] spelli[nfo] sp[lit] startg[replace] st[op] sunme syncbind tabd[o] tabl[ast] tabN[ext] tabs tcld[o] th[row] tm[enu] tp[revious] tu undoj[oin] up[date] vie[w] viu[sage] wa[ll] winp[os] wp[revious] ws[verb] x[it] XMLent xunme
-+syn keyword vimCommand contained	al[l] argg[lobal] bad[d] bl[ast] bp[revious] br[ewind] bun[load] caddf[ile] ccl[ose] cfir[st] changes cl[ist] cN[ext] comc[lear] co[py] cuna[bbrev] delf[unction] diffpu[t] di[splay] dsp[lit] e[dit] endfo[r] endw[hile] exu[sage] fina[lly] fix[del] foldd[oopen] go[to] h[elp] hid[e] ij[ump] isp[lit] k laddb[uffer] la[st] lch[dir] lex[pr] lgete[xpr] lh[elpgrep] lli[st] lne[xt] lo[adview] lop[en] ls lw[indow] mat[ch] mksp[ell] m[ove] new noh[lsearch] on[ly] ped[it] popu prev[ious] prof[ile] pta[g] ptn[ext] pts[elect] py[thon] r[ead] redr[aw] ret[ab] rightb[elow] ru[ntime] sa[rgument] sbl[ast] sbp[revious] scrip[tnames] setl[ocal] sign sl[eep] smenu sno[magic] so[urce] spellr[epall] spr[evious] star[tinsert] stopi[nsert] sunmenu t tabe[dit] tabm[ove] tabo[nly] ta[g] tclf[ile] tj[ump] tn[ext] tr[ewind] tu[nmenu] undol[ist] verb[ose] vim[grep] vmapc[lear] wh[ile] win[size] wq wv[iminfo] xmapc[lear] XMLns xunmenu
-+syn keyword vimCommand contained	arga[dd] argl[ocal] ba[ll] bm[odified] brea[k] bro[wse] bw[ipeout] cal[l] cd cgetb[uffer] chd[ir] clo[se] cnf[ile] comp[iler] cpf[ile] cw[indow] delm[arks] diffsplit dj[ump] earlier el[se] endf[unction] ene[w] f[ile] fin[d] fo[ld] foldo[pen] gr[ep] helpf[ind] his[tory] il[ist] iuna[bbrev] keepalt lad[dexpr] later lcl[ose] lf[ile] lg[etfile] l[ist] lmak[e] lN[ext] loc[kmarks] lpf[ile] lt[ag] mak[e] menut[ranslate] mkvie[w] mzf[ile] n[ext] nu[mber] o[pen] pe[rl] popu[p] p[rint] promptf[ind] ptf[irst] ptN[ext] pu[t] qa[ll] rec[over] redraws[tatus] retu[rn] rub[y] rv[iminfo] sav[eas] sbm[odified] sbr[ewind] se[t] sf[ind] sil[ent] sm[agic] sn[ext] snoreme spelld[ump] spellu[ndo] sre[wind] startr[eplace] sts[elect] sus[pend] tab tabf[ind] tabnew tabp[revious] tags te[aroff] tl[ast] tN[ext] try una[bbreviate] unh[ide] ve[rsion] vimgrepa[dd] vne[w] winc[md] wn[ext] wqa[ll] X xme xnoreme y[ank]
-+syn keyword vimCommand contained	argd[elete] ar[gs] bd[elete] bn[ext] breaka[dd] bufdo cabc[lear] cat[ch] ce[nter] cgete[xpr] che[ckpath] cmapc[lear] cNf[ile] conf[irm] cp[revious] debugg[reedy] diffg[et] diffthis dl[ist] echoe[rr] elsei[f] 
- syn match   vimCommand contained	"\<z[-+^.=]"
- 
- " vimOptions are caught only when contained in a vimSet {{{2
-@@ -33,7 +33,7 @@
- syn keyword vimOption contained	altkeymap arabic autowrite backupcopy bdir bin bomb bt cd ci cinw co completefunc cp cscopetag csto debug dict dir eb enc errorbells expandtab fdl fenc fileformat fml foldignore foldopen fs gfn grepprg guiheadroom helplang history hls imactivatekey iminsert inde insertmode iskeyword keymodel laststatus lisp lpl magic maxfuncdepth menuitems mm modifiable mousem mps number opendevice paste pex pmbcs printencoding prompt rdt ri 
- 
- " vimOptions: These are the turn-off setting variants {{{2
--syn keyword vimOption contained	noacd noallowrevins noantialias noarabic noarshape noautoread noaw noballooneval nobinary nobk nobuflisted nocin noconfirm nocopyindent nocscopeverbose nocuc nocursorline nodg nodisable noeb noedcompatible noendofline noequalalways noesckeys noex noexrc nofk nofoldenable nogdefault nohid nohk nohkmapp nohls noic noignorecase noimc noimd noinf noinsertmode nojoinspaces nolazyredraw nolinebreak nolist nolpl noma nomagic noml nomodeline nomodified nomousef nomousehide nonumber noopendevice nopi nopreviewwindow nopvw noremap norevins norightleft norl noro noru nosb noscb noscs nosft noshelltemp noshortname noshowfulltag noshowmode nosm nosmartindent nosmd nosol nosplitbelow nospr nossl nostartofline noswapfile nota notagrelative notbi notbs noterse notextmode notgst notimeout noto notr nottybuiltin notx novisualbell nowarn noweirdinvert nowfw nowinfixheight nowiv nowrap nowrite nowritebackup
-+syn keyword vimOption contained	noacd noallowrevins noantialias noarabic noarshape noautoread noaw noballooneval nobinary nobk nobuflisted nocin noconfirm nocopyindent nocscopeverbose nocuc nocursorline nodg noimdisable noeb noedcompatible noendofline noequalalways noesckeys noex noexrc nofk nofoldenable nogdefault nohid nohk nohkmapp nohls noic noignorecase noimc noimd noinf noinsertmode nojoinspaces nolazyredraw nolinebreak nolist nolpl noma nomagic noml nomodeline nomodified nomousef nomousehide nonumber noopendevice nopi nopreviewwindow nopvw noremap norevins norightleft norl noro noru nosb noscb noscs nosft noshelltemp noshortname noshowfulltag noshowmode nosm nosmartindent nosmd nosol nosplitbelow nospr nossl nostartofline noswapfile nota notagrelative notbi notbs noterse notextmode notgst notimeout noto notr nottybuiltin notx novisualbell nowarn noweirdinvert nowfw nowinfixheight nowiv nowrap nowrite nowritebackup
- syn keyword vimOption contained	noai noaltkeymap noar noarabicshape noautochdir noautowrite noawa nobeval nobiosk nobl nocf nocindent noconsk nocp nocst nocul nodeco nodiff noea noed noek noeol noerrorbells noet noexpandtab nofen nofkmap nogd noguipty nohidden nohkmap nohkp nohlsearch noicon noim noimcmdline noincsearch noinfercase nois nojs nolbr nolisp noloadplugins nolz nomacatsui nomh nomod nomodifiable nomore nomousefocus nonu noodev nopaste nopreserveindent noprompt noreadonly norestorescreen nori norightleftcmd norlc nors noruler nosc noscrollbind nosecure noshellslash noshiftround noshowcmd noshowmatch nosi nosmartcase nosmarttab nosn nospell nosplitright nosr nosta nostmp noswf notagbsearch notagstack notbidi notermbidi notextauto notf notildeop notitle notop nottimeout nottyfast novb nowa nowb nowfh nowildmenu nowinfixwidth nowmnu nowrapscan nowriteany nows
- syn keyword vimOption contained	noakm noanti noarab noari noautoindent noautowriteall nobackup nobin nobioskey nobomb noci nocompatible noconskey nocscopetag nocsverb nocursorcolumn nodelcombine nodigraph 
- 
-@@ -62,7 +62,7 @@
- syn keyword vimAutoEvent contained	BufAdd BufCreate BufDelete BufEnter BufFilePost BufFilePre BufHidden BufLeave BufNew BufNewFile BufRead BufReadCmd BufReadPost BufReadPre BufUnload BufWinEnter BufWinLeave BufWipeout BufWrite BufWriteCmd BufWritePost BufWritePre Cmd-event CmdwinEnter CmdwinLeave ColorScheme CursorHold CursorHoldI CursorMoved CursorMovedI EncodingChanged FileAppendCmd FileAppendPost FileAppendPre FileChangedRO FileChangedShell FileChangedShellPost FileEncoding FileReadCmd FileReadPost FileReadPre FileType FileWriteCmd FileWritePost FileWritePre FilterReadPost FilterReadPre FilterWritePost FilterWritePre FocusGained FocusLost FuncUndefined GUIEnter GUIFailed InsertChange InsertEnter InsertLeave MenuPopup QuickFixCmdPost QuickFixCmdPre RemoteReply SessionLoadPost ShellCmdPost ShellFilterPost SourceCmd SourcePre SpellFileMissing StdinReadPost StdinReadPre SwapExists Syntax TabEnter TabLeave TermChanged TermResponse User UserGettingBored VimEnter VimLeave VimLeavePre VimResized WinEnter WinLeave 
- 
- " Highlight commonly used Groupnames {{{2
--syn keyword vimGroup contained	Comment Constant String Character Number Boolean Float Identifier Function Statement Conditional Repeat Label Operator Keyword Exception PreProc Include Define Macro PreCondit Type StorageClass Structure Typedef Special SpecialChar Tag Delimiter SpecialComment Debug Underlined Ignore Error Todo 
-+syn keyword vimGroup contained	Comment Constant String Character Number Boolean Float Identifier Function Statement Conditional Repeat Label Operator Keyword Exception PreProc Include Define Macro PreCondit Type StorageClass Structure Typedef Special SpecialChar Tag Delimiter SpecialComment Debug Underlined Ignore Error Todo None
- 
- " Default highlighting groups {{{2
- syn keyword vimHLGroup contained	Cursor CursorColumn CursorIM CursorLine DiffAdd DiffChange DiffDelete DiffText Directory ErrorMsg FoldColumn Folded IncSearch LineNr MatchParen Menu ModeMsg MoreMsg NonText Normal Pmenu PmenuSbar PmenuSel PmenuThumb Question Scrollbar Search SignColumn SpecialKey SpellBad SpellCap SpellLocal SpellRare StatusLine StatusLineNC TabLine TabLineFill TabLineSel Title Tooltip VertSplit Visual VisualNOS WarningMsg WildMenu 
-@@ -99,8 +99,9 @@
- syn match vimCmdSep	"[:|]\+"	skipwhite nextgroup=vimAddress,vimAutoCmd,vimCommand,vimExtCmd,vimFilter,vimLet,vimMap,vimMark,vimSet,vimSyntax,vimUserCmd
- syn match vimIsCommand	"\<\h\w*\>"	contains=vimCommand
- syn match vimVar		"\<[bwglsav]:\K\k*\>"
--syn match vimVar contained	"\<\K\k*\>"
--syn keyword vimCommand contained	in
-+syn match vimVar        contained	"\<\K\k*\>"
-+syn match vimFBVar      contained   "\<[bwglsav]:\K\k*\>"
-+syn keyword vimCommand  contained	in
- 
- " Insertions And Appends: insert append {{{2
- " =======================
-@@ -127,7 +128,7 @@
- 
- " Augroup : vimAugroupError removed because long augroups caused sync'ing problems. {{{2
- " ======= : Trade-off: Increasing synclines with slower editing vs augroup END error checking.
--syn cluster vimAugroupList	contains=vimIsCommand,vimFunction,vimFunctionError,vimLineComment,vimSpecFile,vimOper,vimNumber,vimComment,vimString,vimSubst,vimMark,vimRegister,vimAddress,vimFilter,vimCmplxRepeat,vimComment,vimLet,vimSet,vimAutoCmd,vimRegion,vimSynLine,vimNotation,vimCtrlChar,vimFuncVar,vimContinue
-+syn cluster vimAugroupList	contains=vimIsCommand,vimFuncName,vimFunction,vimFunctionError,vimLineComment,vimSpecFile,vimOper,vimNumber,vimOperParen,vimComment,vimString,vimSubst,vimMark,vimRegister,vimAddress,vimFilter,vimCmplxRepeat,vimComment,vimLet,vimSet,vimAutoCmd,vimRegion,vimSynLine,vimNotation,vimCtrlChar,vimFuncVar,vimContinue
- if exists("g:vimsyn_folding") && g:vimsyn_folding =~ 'a'
-  syn region  vimAugroup	fold start="\<aug\%[roup]\>\s\+\K\k*" end="\<aug\%[roup]\>\s\+[eE][nN][dD]\>"	contains=vimAugroupKey,vimAutoCmd,@vimAugroupList keepend
- else
-@@ -141,156 +142,154 @@
- 
- " Operators: {{{2
- " =========
--syn cluster vimOperGroup	contains=vimOper,vimOperParen,vimNumber,vimString,vimRegister,vimContinue
--syn match  vimOper	"\(==\|!=\|>=\|<=\|=\~\|!\~\|>\|<\|=\)[?#]\{0,2}"	skipwhite nextgroup=vimString,vimSpecFile
--syn match  vimOper	"||\|&&\|[-+.]"	skipwhite nextgroup=vimString,vimSpecFile
--syn region vimOperParen 	oneline matchgroup=vimOper start="(" end=")" contains=@vimOperGroup
--syn region vimOperParen	oneline matchgroup=vimSep  start="{" end="}" contains=@vimOperGroup nextgroup=vimVar
-+syn cluster	vimOperGroup	contains=vimFunc,vimFuncVar,vimOper,vimOperParen,vimNumber,vimString,vimRegister,vimContinue
-+syn match	vimOper	"\(==\|!=\|>=\|<=\|=\~\|!\~\|>\|<\|=\)[?#]\{0,2}"	skipwhite nextgroup=vimString,vimSpecFile
-+syn match	vimOper	"||\|&&\|[-+.]"	skipwhite nextgroup=vimString,vimSpecFile
-+syn region	vimOperParen 	oneline matchgroup=vimParenSep	start="(" end=")" contains=@vimOperGroup
-+syn region	vimOperParen	oneline matchgroup=vimSep	start="{" end="}" contains=@vimOperGroup nextgroup=vimVar,vimFuncVar
- if !exists("g:vimsyn_noerror")
-- syn match  vimOperError	")"
-+ syn match	vimOperError	")"
- endif
- 
- " Functions : Tag is provided for those who wish to highlight tagged functions {{{2
- " =========
--syn cluster vimFuncList	contains=vimCommand,vimFuncKey,Tag,vimFuncSID
--syn cluster vimFuncBodyList	contains=vimAddress,vimAutoCmd,vimCmplxRepeat,vimComment,vimComment,vimContinue,vimCtrlChar,vimEcho,vimEchoHL,vimExecute,vimIf,vimFunc,vimFunction,vimFunctionError,vimFuncVar,vimIsCommand,vimLet,vimLineComment,vimMap,vimMark,vimNorm,vimNotation,vimNotFunc,vimNumber,vimOper,vimOperParen,vimRegion,vimRegister,vimSet,vimSpecFile,vimString,vimSubst,vimSynLine,vimUserCommand
--if !exists("g:vimsyn_noerror")
-- syn match   vimFunctionError	"\<fu\%[nction]!\=\s\+\zs\U\i\{-}\ze\s*("                	contains=vimFuncKey,vimFuncBlank nextgroup=vimFuncBody
--endif
--syn match   vimFunction	"\<fu\%[nction]!\=\s\+\(\(<[sS][iI][dD]>\|[Ss]:\|\u\|\i\+#\)\i*\|\(g:\)\=\(\I\i*\.\)\+\I\i*\)\ze\s*("	contains=@vimFuncList nextgroup=vimFuncBody
-+syn cluster	vimFuncList	contains=vimCommand,vimFunctionError,vimFuncKey,Tag,vimFuncSID
-+syn cluster	vimFuncBodyList	contains=vimAbb,vimAddress,vimAugroupKey,vimAutoCmd,vimCmplxRepeat,vimComment,vimComment,vimContinue,vimCtrlChar,vimEcho,vimEchoHL,vimExecute,vimIf,vimIsCommand,vimFBVar,vimFunc,vimFunction,vimFuncVar,vimHighlight,vimIsCommand,vimLet,vimLineComment,vimMap,vimMark,vimNorm,vimNotation,vimNotFunc,vimNumber,vimOper,vimOperParen,vimRegion,vimRegister,vimSet,vimSpecFile,vimString,vimSubst,vimSynLine,vimUserCommand
-+syn match	vimFunction	"\<fu\%[nction]!\=\s\+\%(<[sS][iI][dD]>\|[sSgGbBwWtTlL]:\)\=\%(\i\|[#.]\|{.\{-1,}}\)*\ze\s*("	contains=@vimFuncList nextgroup=vimFuncBody
-+
- if exists("g:vimsyn_folding") && g:vimsyn_folding =~ 'f'
-- syn region  vimFuncBody  contained	fold start="\ze("	matchgroup=vimCommand end="\<\(endf\>\|endfu\%[nction]\>\)"		contains=@vimFuncBodyList
-+ syn region	vimFuncBody  contained	fold start="\ze("	matchgroup=vimCommand end="\<\(endf\>\|endfu\%[nction]\>\)"		contains=@vimFuncBodyList
- else                                                                                                          
-- syn region  vimFuncBody  contained	start="\ze("	matchgroup=vimCommand end="\<\(endf\>\|endfu\%[nction]\>\)"		contains=@vimFuncBodyList
-+ syn region	vimFuncBody  contained	start="\ze("	matchgroup=vimCommand end="\<\(endf\>\|endfu\%[nction]\>\)"		contains=@vimFuncBodyList
- endif
--syn match   vimFuncVar   contained	"a:\(\I\i*\|\d\+\)"
--syn match   vimFuncSID   contained	"\c<sid>\|\<s:"
--syn keyword vimFuncKey   contained	fu[nction]
--syn match   vimFuncBlank contained	"\s\+"
-+syn match	vimFuncVar   contained	"a:\(\K\k*\|\d\+\)"
-+syn match	vimFuncSID   contained	"\c<sid>\|\<s:"
-+syn keyword	vimFuncKey   contained	fu[nction]
-+syn match	vimFuncBlank contained	"\s\+"
- 
--syn keyword vimPattern   contained	start	skip	end
-+syn keyword	vimPattern   contained	start	skip	end
- 
- " Special Filenames, Modifiers, Extension Removal: {{{2
- " ===============================================
--syn match vimSpecFile	"<c\(word\|WORD\)>"	nextgroup=vimSpecFileMod,vimSubst
--syn match vimSpecFile	"<\([acs]file\|amatch\|abuf\)>"	nextgroup=vimSpecFileMod,vimSubst
--syn match vimSpecFile	"\s%[ \t:]"ms=s+1,me=e-1	nextgroup=vimSpecFileMod,vimSubst
--syn match vimSpecFile	"\s%$"ms=s+1	nextgroup=vimSpecFileMod,vimSubst
--syn match vimSpecFile	"\s%<"ms=s+1,me=e-1	nextgroup=vimSpecFileMod,vimSubst
--syn match vimSpecFile	"#\d\+\|[#%]<\>"	nextgroup=vimSpecFileMod,vimSubst
--syn match vimSpecFileMod	"\(:[phtre]\)\+"	contained
-+syn match	vimSpecFile	"<c\(word\|WORD\)>"	nextgroup=vimSpecFileMod,vimSubst
-+syn match	vimSpecFile	"<\([acs]file\|amatch\|abuf\)>"	nextgroup=vimSpecFileMod,vimSubst
-+syn match	vimSpecFile	"\s%[ \t:]"ms=s+1,me=e-1	nextgroup=vimSpecFileMod,vimSubst
-+syn match	vimSpecFile	"\s%$"ms=s+1	nextgroup=vimSpecFileMod,vimSubst
-+syn match	vimSpecFile	"\s%<"ms=s+1,me=e-1	nextgroup=vimSpecFileMod,vimSubst
-+syn match	vimSpecFile	"#\d\+\|[#%]<\>"	nextgroup=vimSpecFileMod,vimSubst
-+syn match	vimSpecFileMod	"\(:[phtre]\)\+"	contained
- 
- " User-Specified Commands: {{{2
- " =======================
--syn cluster vimUserCmdList	contains=vimAddress,vimSyntax,vimHighlight,vimAutoCmd,vimCmplxRepeat,vimComment,vimCtrlChar,vimEscapeBrace,vimFilter,vimFunc,vimFunction,vimIsCommand,vimMark,vimNotation,vimNumber,vimOper,vimRegion,vimRegister,vimLet,vimSet,vimSetEqual,vimSetString,vimSpecFile,vimString,vimSubst,vimSubstRep,vimSubstRange,vimSynLine
--syn keyword vimUserCommand	contained	com[mand]
--syn match   vimUserCmd	"\<com\%[mand]!\=\>.*$"	contains=vimUserAttrb,vimUserCommand,@vimUserCmdList
--syn match   vimUserAttrb	contained	"-n\%[args]=[01*?+]"	contains=vimUserAttrbKey,vimOper
--syn match   vimUserAttrb	contained	"-com\%[plete]="	contains=vimUserAttrbKey,vimOper nextgroup=vimUserAttrbCmplt,vimUserCmdError
--syn match   vimUserAttrb	contained	"-ra\%[nge]\(=%\|=\d\+\)\="	contains=vimNumber,vimOper,vimUserAttrbKey
--syn match   vimUserAttrb	contained	"-cou\%[nt]=\d\+"	contains=vimNumber,vimOper,vimUserAttrbKey
--syn match   vimUserAttrb	contained	"-bang\=\>"	contains=vimOper,vimUserAttrbKey
--syn match   vimUserAttrb	contained	"-bar\>"	contains=vimOper,vimUserAttrbKey
--syn match   vimUserAttrb	contained	"-re\%[gister]\>"	contains=vimOper,vimUserAttrbKey
-+syn cluster	vimUserCmdList	contains=vimAddress,vimSyntax,vimHighlight,vimAutoCmd,vimCmplxRepeat,vimComment,vimCtrlChar,vimEscapeBrace,vimFilter,vimFunc,vimFuncName,vimFunction,vimFunctionError,vimIsCommand,vimMark,vimNotation,vimNumber,vimOper,vimRegion,vimRegister,vimLet,vimSet,vimSetEqual,vimSetString,vimSpecFile,vimString,vimSubst,vimSubstRep,vimSubstRange,vimSynLine
-+syn keyword	vimUserCommand	contained	com[mand]
-+syn match	vimUserCmd	"\<com\%[mand]!\=\>.*$"	contains=vimUserAttrb,vimUserCommand,@vimUserCmdList
-+syn match	vimUserAttrb	contained	"-n\%[args]=[01*?+]"	contains=vimUserAttrbKey,vimOper
-+syn match	vimUserAttrb	contained	"-com\%[plete]="	contains=vimUserAttrbKey,vimOper nextgroup=vimUserAttrbCmplt,vimUserCmdError
-+syn match	vimUserAttrb	contained	"-ra\%[nge]\(=%\|=\d\+\)\="	contains=vimNumber,vimOper,vimUserAttrbKey
-+syn match	vimUserAttrb	contained	"-cou\%[nt]=\d\+"	contains=vimNumber,vimOper,vimUserAttrbKey
-+syn match	vimUserAttrb	contained	"-bang\=\>"	contains=vimOper,vimUserAttrbKey
-+syn match	vimUserAttrb	contained	"-bar\>"	contains=vimOper,vimUserAttrbKey
-+syn match	vimUserAttrb	contained	"-re\%[gister]\>"	contains=vimOper,vimUserAttrbKey
- if !exists("g:vimsyn_noerror")
-- syn match   vimUserCmdError	contained	"\S\+\>"
-+ syn match	vimUserCmdError	contained	"\S\+\>"
- endif
- syn case ignore
--syn keyword vimUserAttrbKey   contained	bar	ban[g]	cou[nt]	ra[nge] com[plete]	n[args]	re[gister]
--syn keyword vimUserAttrbCmplt contained	augroup buffer command dir environment event expression file function help highlight mapping menu option something tag tag_listfiles var
--syn keyword vimUserAttrbCmplt contained	custom customlist nextgroup=vimUserAttrbCmpltFunc,vimUserCmdError
--syn match   vimUserAttrbCmpltFunc contained	",\%([sS]:\|<[sS][iI][dD]>\)\=\%(\h\w*\%(#\u\w*\)\+\|\u\w*\)"hs=s+1 nextgroup=vimUserCmdError
-+syn keyword	vimUserAttrbKey   contained	bar	ban[g]	cou[nt]	ra[nge] com[plete]	n[args]	re[gister]
-+syn keyword	vimUserAttrbCmplt contained	augroup buffer command dir environment event expression file function help highlight mapping menu option shellcmd something tag tag_listfiles var
-+syn keyword	vimUserAttrbCmplt contained	custom customlist nextgroup=vimUserAttrbCmpltFunc,vimUserCmdError
-+syn match	vimUserAttrbCmpltFunc contained	",\%([sS]:\|<[sS][iI][dD]>\)\=\%(\h\w*\%(#\u\w*\)\+\|\u\w*\)"hs=s+1 nextgroup=vimUserCmdError
- 
- syn case match
--syn match   vimUserAttrbCmplt contained	"custom,\u\w*"
-+syn match	vimUserAttrbCmplt contained	"custom,\u\w*"
- 
- " Lower Priority Comments: after some vim commands... {{{2
- " =======================
--syn match  vimComment	excludenl +\s"[^\-:.%#=*].*$+lc=1	contains=@vimCommentGroup,vimCommentString
--syn match  vimComment	+\<endif\s\+".*$+lc=5	contains=@vimCommentGroup,vimCommentString
--syn match  vimComment	+\<else\s\+".*$+lc=4	contains=@vimCommentGroup,vimCommentString
--syn region vimCommentString	contained oneline start='\S\s\+"'ms=e	end='"'
-+syn match	vimComment	excludenl +\s"[^\-:.%#=*].*$+lc=1	contains=@vimCommentGroup,vimCommentString
-+syn match	vimComment	+\<endif\s\+".*$+lc=5	contains=@vimCommentGroup,vimCommentString
-+syn match	vimComment	+\<else\s\+".*$+lc=4	contains=@vimCommentGroup,vimCommentString
-+syn region	vimCommentString	contained oneline start='\S\s\+"'ms=e	end='"'
- 
- " Environment Variables: {{{2
- " =====================
--syn match vimEnvvar	"\$\I\i*"
--syn match vimEnvvar	"\${\I\i*}"
-+syn match	vimEnvvar	"\$\I\i*"
-+syn match	vimEnvvar	"\${\I\i*}"
- 
- " In-String Specials: {{{2
- " Try to catch strings, if nothing else matches (therefore it must precede the others!)
- "  vimEscapeBrace handles ["]  []"] (ie. "s don't terminate string inside [])
--syn region vimEscapeBrace	oneline   contained transparent start="[^\\]\(\\\\\)*\[\zs\^\=\]\=" skip="\\\\\|\\\]" end="]"me=e-1
--syn match  vimPatSepErr	contained	"\\)"
--syn match  vimPatSep	contained	"\\|"
--syn region vimPatSepZone	oneline   contained   matchgroup=vimPatSepZ start="\\%\=\ze(" skip="\\\\" end="\\)\|[^\]['"]"	contains=@vimStringGroup
--syn region vimPatRegion	contained transparent matchgroup=vimPatSepR start="\\[z%]\=(" end="\\)"	contains=@vimSubstList oneline
--syn match  vimNotPatSep	contained	"\\\\"
--syn cluster vimStringGroup	contains=vimEscapeBrace,vimPatSep,vimNotPatSep,vimPatSepErr,vimPatSepZone,@Spell
--syn region vimString	oneline keepend	start=+[^:a-zA-Z>!\\@]"+lc=1 skip=+\\\\\|\\"+ end=+"+	contains=@vimStringGroup
--syn region vimString	oneline keepend	start=+[^:a-zA-Z>!\\@]'+lc=1 end=+'+
--syn region vimString	oneline	start=+=!+lc=1	skip=+\\\\\|\\!+ end=+!+	contains=@vimStringGroup
--syn region vimString	oneline	start="=+"lc=1	skip="\\\\\|\\+" end="+"	contains=@vimStringGroup
--syn region vimString	oneline	start="\s/\s*\A"lc=1 skip="\\\\\|\\+" end="/"	contains=@vimStringGroup
--syn match  vimString	contained	+"[^"]*\\$+	skipnl nextgroup=vimStringCont
--syn match  vimStringCont	contained	+\(\\\\\|.\)\{-}[^\\]"+
-+syn region	vimEscapeBrace	oneline   contained transparent start="[^\\]\(\\\\\)*\[\zs\^\=\]\=" skip="\\\\\|\\\]" end="]"me=e-1
-+syn match	vimPatSepErr	contained	"\\)"
-+syn match	vimPatSep	contained	"\\|"
-+syn region	vimPatSepZone	oneline   contained   matchgroup=vimPatSepZ start="\\%\=\ze(" skip="\\\\" end="\\)\|[^\]['"]"	contains=@vimStringGroup
-+syn region	vimPatRegion	contained transparent matchgroup=vimPatSepR start="\\[z%]\=(" end="\\)"	contains=@vimSubstList oneline
-+syn match	vimNotPatSep	contained	"\\\\"
-+syn cluster	vimStringGroup	contains=vimEscapeBrace,vimPatSep,vimNotPatSep,vimPatSepErr,vimPatSepZone,@Spell
-+syn region	vimString	oneline keepend	start=+[^:a-zA-Z>!\\@]"+lc=1 skip=+\\\\\|\\"+ end=+"+	contains=@vimStringGroup
-+syn region	vimString	oneline keepend	start=+[^:a-zA-Z>!\\@]'+lc=1 end=+'+
-+syn region	vimString	oneline	start=+=!+lc=1	skip=+\\\\\|\\!+ end=+!+	contains=@vimStringGroup
-+syn region	vimString	oneline	start="=+"lc=1	skip="\\\\\|\\+" end="+"	contains=@vimStringGroup
-+syn region	vimString	oneline	start="\s/\s*\A"lc=1 skip="\\\\\|\\+" end="/"	contains=@vimStringGroup
-+syn match	vimString	contained	+"[^"]*\\$+	skipnl nextgroup=vimStringCont
-+syn match	vimStringCont	contained	+\(\\\\\|.\)\{-}[^\\]"+
- 
- " Substitutions: {{{2
- " =============
--syn cluster vimSubstList	contains=vimPatSep,vimPatRegion,vimPatSepErr,vimSubstTwoBS,vimSubstRange,vimNotation
--syn cluster vimSubstRepList	contains=vimSubstSubstr,vimSubstTwoBS,vimNotation
--syn cluster vimSubstList	add=vimCollection
--syn match   vimSubst	"\(:\+\s*\|^\s*\||\s*\)\<s\%[ubstitute][:[:alpha:]]\@!" nextgroup=vimSubstPat
--syn match   vimSubst	"s\%[ubstitute][:[:alpha:]]\@!"	nextgroup=vimSubstPat contained
--syn match   vimSubst	"/\zss\%[ubstitute]\ze/"	nextgroup=vimSubstPat
--syn match   vimSubst1       contained	"s\%[ubstitute]\>"	nextgroup=vimSubstPat
--syn region  vimSubstPat     contained	matchgroup=vimSubstDelim start="\z([^a-zA-Z( \t[\]&]\)"rs=s+1 skip="\\\\\|\\\z1" end="\z1"re=e-1,me=e-1	 contains=@vimSubstList	nextgroup=vimSubstRep4	oneline
--syn region  vimSubstRep4    contained	matchgroup=vimSubstDelim start="\z(.\)" skip="\\\\\|\\\z1" end="\z1" matchgroup=vimNotation end="<[cC][rR]>" contains=@vimSubstRepList	nextgroup=vimSubstFlagErr	oneline
--syn region  vimCollection   contained transparent	start="\\\@<!\[" skip="\\\[" end="\]"	contains=vimCollClass
--syn match   vimCollClassErr contained	"\[:.\{-\}:\]"
--syn match   vimCollClass    contained transparent	"\[:\(alnum\|alpha\|blank\|cntrl\|digit\|graph\|lower\|print\|punct\|space\|upper\|xdigit\|return\|tab\|escape\|backspace\):\]"
--syn match   vimSubstSubstr  contained	"\\z\=\d"
--syn match   vimSubstTwoBS   contained	"\\\\"
--syn match   vimSubstFlagErr contained	"[^< \t\r|]\+" contains=vimSubstFlags
--syn match   vimSubstFlags   contained	"[&cegiIpr]\+"
-+syn cluster	vimSubstList	contains=vimPatSep,vimPatRegion,vimPatSepErr,vimSubstTwoBS,vimSubstRange,vimNotation
-+syn cluster	vimSubstRepList	contains=vimSubstSubstr,vimSubstTwoBS,vimNotation
-+syn cluster	vimSubstList	add=vimCollection
-+syn match	vimSubst	"\(:\+\s*\|^\s*\||\s*\)\<s\%[ubstitute][:[:alpha:]]\@!" nextgroup=vimSubstPat
-+syn match	vimSubst	"s\%[ubstitute][:#[:alpha:]]\@!"	nextgroup=vimSubstPat contained
-+syn match	vimSubst	"/\zss\%[ubstitute]\ze/"	nextgroup=vimSubstPat
-+syn match	vimSubst1       contained	"s\%[ubstitute]\>"	nextgroup=vimSubstPat
-+syn region	vimSubstPat     contained	matchgroup=vimSubstDelim start="\z([^a-zA-Z( \t[\]&]\)"rs=s+1 skip="\\\\\|\\\z1" end="\z1"re=e-1,me=e-1	 contains=@vimSubstList	nextgroup=vimSubstRep4	oneline
-+syn region	vimSubstRep4    contained	matchgroup=vimSubstDelim start="\z(.\)" skip="\\\\\|\\\z1" end="\z1" matchgroup=vimNotation end="<[cC][rR]>" contains=@vimSubstRepList	nextgroup=vimSubstFlagErr	oneline
-+syn region	vimCollection   contained transparent	start="\\\@<!\[" skip="\\\[" end="\]"	contains=vimCollClass
-+syn match	vimCollClassErr contained	"\[:.\{-\}:\]"
-+syn match	vimCollClass    contained transparent	"\[:\(alnum\|alpha\|blank\|cntrl\|digit\|graph\|lower\|print\|punct\|space\|upper\|xdigit\|return\|tab\|escape\|backspace\):\]"
-+syn match	vimSubstSubstr  contained	"\\z\=\d"
-+syn match	vimSubstTwoBS   contained	"\\\\"
-+syn match	vimSubstFlagErr contained	"[^< \t\r|]\+" contains=vimSubstFlags
-+syn match	vimSubstFlags   contained	"[&cegiIpr]\+"
- 
- " 'String': {{{2
--syn match  vimString	"[^(,]'[^']\{-}\zs'"
-+syn match	vimString	"[^(,]'[^']\{-}\zs'"
- 
- " Marks, Registers, Addresses, Filters: {{{2
--syn match  vimMark	"'[a-zA-Z0-9]\ze[-+,!]"	nextgroup=vimOper,vimMarkNumber,vimSubst
--syn match  vimMark	"'[<>]\ze[-+,!]"		nextgroup=vimOper,vimMarkNumber,vimSubst
--syn match  vimMark	",\zs'[<>]\ze"		nextgroup=vimOper,vimMarkNumber,vimSubst
--syn match  vimMark	"[!,:]\zs'[a-zA-Z0-9]"	nextgroup=vimOper,vimMarkNumber,vimSubst
--syn match  vimMark	"\<norm\%[al]\s\zs'[a-zA-Z0-9]"	nextgroup=vimOper,vimMarkNumber,vimSubst
--syn match  vimMarkNumber	"[-+]\d\+"		nextgroup=vimSubst contained contains=vimOper
--syn match  vimPlainMark contained	"'[a-zA-Z0-9]"
--
--syn match  vimRegister	'[^,;]\zs"[a-zA-Z0-9.%#:_\-/]\ze[^a-zA-Z_":]'
--syn match  vimRegister	'\<norm\s\+\zs"[a-zA-Z0-9]'
--syn match  vimRegister	'\<normal\s\+\zs"[a-zA-Z0-9]'
--syn match  vimRegister	'@"'
--syn match  vimPlainRegister contained	'"[a-zA-Z0-9\-:.%#*+=]'
-+syn match	vimMark	"'[a-zA-Z0-9]\ze[-+,!]"	nextgroup=vimOper,vimMarkNumber,vimSubst
-+syn match	vimMark	"'[<>]\ze[-+,!]"		nextgroup=vimOper,vimMarkNumber,vimSubst
-+syn match	vimMark	",\zs'[<>]\ze"		nextgroup=vimOper,vimMarkNumber,vimSubst
-+syn match	vimMark	"[!,:]\zs'[a-zA-Z0-9]"	nextgroup=vimOper,vimMarkNumber,vimSubst
-+syn match	vimMark	"\<norm\%[al]\s\zs'[a-zA-Z0-9]"	nextgroup=vimOper,vimMarkNumber,vimSubst
-+syn match	vimMarkNumber	"[-+]\d\+"		nextgroup=vimSubst contained contains=vimOper
-+syn match	vimPlainMark contained	"'[a-zA-Z0-9]"
-+
-+syn match	vimRegister	'[^,;[{]\zs"[a-zA-Z0-9.%#:_\-/]\ze[^a-zA-Z_":]'
-+syn match	vimRegister	'\<norm\s\+\zs"[a-zA-Z0-9]'
-+syn match	vimRegister	'\<normal\s\+\zs"[a-zA-Z0-9]'
-+syn match	vimRegister	'@"'
-+syn match	vimPlainRegister contained	'"[a-zA-Z0-9\-:.%#*+=]'
- 
--syn match  vimAddress	",\zs[.$]"	skipwhite nextgroup=vimSubst1
--syn match  vimAddress	"%\ze\a"	skipwhite nextgroup=vimString,vimSubst1
-+syn match	vimAddress	",\zs[.$]"	skipwhite nextgroup=vimSubst1
-+syn match	vimAddress	"%\ze\a"	skipwhite nextgroup=vimString,vimSubst1
- 
--syn match  vimFilter contained	"^!.\{-}\(|\|$\)"		contains=vimSpecFile
--syn match  vimFilter contained	"\A!.\{-}\(|\|$\)"ms=s+1	contains=vimSpecFile
-+syn match	vimFilter contained	"^!.\{-}\(|\|$\)"		contains=vimSpecFile
-+syn match	vimFilter contained	"\A!.\{-}\(|\|$\)"ms=s+1	contains=vimSpecFile
- 
- " Complex repeats (:h complex-repeat) {{{2
--"syn match  vimCmplxRepeat	'[^a-zA-Z_/\\()]q[0-9a-zA-Z"]'lc=1
--"syn match  vimCmplxRepeat	'@[0-9a-z".=@:]\ze\($\|[^a-zA-Z]\)'
-+syn match	vimCmplxRepeat	'[^a-zA-Z_/\\()]q[0-9a-zA-Z"]'lc=1
-+syn match	vimCmplxRepeat	'@[0-9a-z".=@:]\ze\($\|[^a-zA-Z]\)'
- 
- " Set command and associated set-options (vimOptions) with comment {{{2
--syn region vimSet		matchgroup=vimCommand start="\<\%(setl\%[ocal]\|setg\%[lobal]\|set\)\>" skip="\%(\\\\\)*\\." end="$" matchgroup=vimNotation end="<[cC][rR]>" keepend oneline contains=vimSetEqual,vimOption,vimErrSetting,vimComment,vimSetString,vimSetMod
--syn region vimSetEqual  contained	start="="	skip="\\\\\|\\\s" end="[| \t]\|$"me=e-1 contains=vimCtrlChar,vimSetSep,vimNotation oneline
--syn region vimSetString contained	start=+="+hs=s+1	skip=+\\\\\|\\"+  end=+"+	contains=vimCtrlChar
--syn match  vimSetSep    contained	"[,:]"
--syn match  vimSetMod	contained	"&vim\|[!&]\|all&"
-+syn region	vimSet		matchgroup=vimCommand start="\<\%(setl\%[ocal]\|setg\%[lobal]\|set\)\>" skip="\%(\\\\\)*\\." end="$" matchgroup=vimNotation end="<[cC][rR]>" keepend oneline contains=vimSetEqual,vimOption,vimErrSetting,vimComment,vimSetString,vimSetMod
-+syn region	vimSetEqual	contained	start="[=:]\|[-+^]=" skip="\\\\\|\\\s" end="[| \t]\|$"me=e-1 contains=vimCtrlChar,vimSetSep,vimNotation oneline
-+syn region	vimSetString	contained	start=+="+hs=s+1	skip=+\\\\\|\\"+  end=+"+	contains=vimCtrlChar
-+syn match	vimSetSep	contained	"[,:]"
-+syn match	vimSetMod	contained	"&vim\=\|[!&?<]\|all&"
- 
- " Let {{{2
- " ===
--syn keyword vimLet	let	unl[et]	skipwhite nextgroup=vimVar
-+syn keyword	vimLet	let	unl[et]	skipwhite nextgroup=vimVar,vimFuncVar
- 
- " Abbreviations {{{2
- " =============
-@@ -298,232 +297,235 @@
- 
- " Autocmd {{{2
- " =======
--syn match   vimAutoEventList	contained	"\(!\s\+\)\=\(\a\+,\)*\a\+"	contains=vimAutoEvent nextgroup=vimAutoCmdSpace
--syn match   vimAutoCmdSpace	contained	"\s\+"	nextgroup=vimAutoCmdSfxList
--syn match   vimAutoCmdSfxList	contained	"\S*"
--syn keyword vimAutoCmd	au[tocmd] do[autocmd] doautoa[ll]	skipwhite nextgroup=vimAutoEventList
-+syn match	vimAutoEventList	contained	"\(!\s\+\)\=\(\a\+,\)*\a\+"	contains=vimAutoEvent nextgroup=vimAutoCmdSpace
-+syn match	vimAutoCmdSpace	contained	"\s\+"	nextgroup=vimAutoCmdSfxList
-+syn match	vimAutoCmdSfxList	contained	"\S*"
-+syn keyword	vimAutoCmd	au[tocmd] do[autocmd] doautoa[ll]	skipwhite nextgroup=vimAutoEventList
- 
- " Echo and Execute -- prefer strings! {{{2
- " ================
--syn region  vimEcho	oneline excludenl matchgroup=vimCommand start="\<ec\%[ho]\>" skip="\(\\\\\)*\\|" end="$\||" contains=vimFunc,vimString,varVar
--syn region  vimExecute	oneline excludenl matchgroup=vimCommand start="\<exe\%[cute]\>" skip="\(\\\\\)*\\|" end="$\||\|<[cC][rR]>" contains=vimIsCommand,vimString,vimOper,vimVar,vimNotation,vimOperParen
--syn match   vimEchoHL	"echohl\="	skipwhite nextgroup=vimGroup,vimHLGroup,vimEchoHLNone
-+syn region	vimEcho	oneline excludenl matchgroup=vimCommand start="\<ec\%[ho]\>" skip="\(\\\\\)*\\|" end="$\||" contains=vimFunc,vimFuncVar,vimString,vimVar
-+syn region	vimExecute	oneline excludenl matchgroup=vimCommand start="\<exe\%[cute]\>" skip="\(\\\\\)*\\|" end="$\||\|<[cC][rR]>" contains=vimFuncVar,vimIsCommand,vimOper,vimNotation,vimOperParen,vimString,vimVar
-+syn match	vimEchoHL	"echohl\="	skipwhite nextgroup=vimGroup,vimHLGroup,vimEchoHLNone
- syn case ignore
--syn keyword vimEchoHLNone	none
-+syn keyword	vimEchoHLNone	none
- syn case match
- 
- " Maps {{{2
- " ====
--syn match   vimMap	"\<map\>!\=\ze\s*[^(]" skipwhite nextgroup=vimMapMod,vimMapLhs
--syn keyword vimMap	cm[ap] cno[remap] im[ap] ino[remap] ln[oremap] nm[ap] nn[oremap] no[remap] om[ap] ono[remap] snor[emap] vm[ap] vn[oremap] xn[oremap] skipwhite nextgroup=vimMapBang,vimMapMod,vimMapLhs
--syn keyword vimMap	mapc[lear]
--syn match   vimMapLhs    contained	"\S\+"	contains=vimNotation,vimCtrlChar skipwhite nextgroup=vimMapRhs
--syn match   vimMapBang   contained	"!"	skipwhite nextgroup=vimMapMod,vimMapLhs
--syn match   vimMapMod    contained	"\c<\(buffer\|expr\|\(local\)\=leader\|plug\|script\|sid\|unique\|silent\)\+>" contains=vimMapModKey,vimMapModErr skipwhite nextgroup=vimMapMod,vimMapLhs
--syn match   vimMapRhs    contained  ".*" contains=vimNotation,vimCtrlChar skipnl nextgroup=vimMapRhsExtend
--syn match   vimMapRhsExtend contained "^\s*\\.*$" contains=vimContinue
-+syn match	vimMap		"\<map\>!\=\ze\s*[^(]" skipwhite nextgroup=vimMapMod,vimMapLhs
-+syn keyword	vimMap		cm[ap] cno[remap] im[ap] ino[remap] lm[ap] ln[oremap] nm[ap] nn[oremap] no[remap] om[ap] ono[remap] smap snor[emap] vm[ap] vn[oremap] xm[ap] xn[oremap] skipwhite nextgroup=vimMapBang,vimMapMod,vimMapLhs
-+syn keyword	vimMap		mapc[lear]
-+syn keyword	vimUnmap		cu[nmap] iu[nmap] lu[nmap] nun[map] ou[nmap] sunm[ap] unm[ap] unm[ap] vu[nmap] xu[nmap] skipwhite nextgroup=vimMapBang,vimMapMod,vimMapLhs
-+syn match	vimMapLhs	contained	"\S\+"			contains=vimNotation,vimCtrlChar skipwhite nextgroup=vimMapRhs
-+syn match	vimMapBang	contained	"!"			skipwhite nextgroup=vimMapMod,vimMapLhs
-+syn match	vimMapMod	contained	"\c<\(buffer\|expr\|\(local\)\=leader\|plug\|script\|sid\|unique\|silent\)\+>" contains=vimMapModKey,vimMapModErr skipwhite nextgroup=vimMapMod,vimMapLhs
-+syn match	vimMapRhs	contained	".*" contains=vimNotation,vimCtrlChar	skipnl nextgroup=vimMapRhsExtend
-+syn match	vimMapRhsExtend	contained	"^\s*\\.*$"			contains=vimContinue
- syn case ignore
--syn keyword vimMapModKey contained	buffer	expr	leader	localleader	plug	script	sid	silent	unique
-+syn keyword	vimMapModKey	contained	buffer	expr	leader	localleader	plug	script	sid	silent	unique
- syn case match
- 
- " Menus {{{2
- " =====
--syn cluster vimMenuList contains=vimMenuBang,vimMenuPriority,vimMenuName,vimMenuMod
--syn keyword vimCommand	am[enu] an[oremenu] aun[menu] cme[nu] cnoreme[nu] cunme[nu] ime[nu] inoreme[nu] iunme[nu] me[nu] nme[nu] nnoreme[nu] noreme[nu] nunme[nu] ome[nu] onoreme[nu] ounme[nu] unme[nu] vme[nu] vnoreme[nu] vunme[nu] skipwhite nextgroup=@vimMenuList
--syn match   vimMenuName	"[^ \t\\<]\+"	contained nextgroup=vimMenuNameMore,vimMenuMap
--syn match   vimMenuPriority	"\d\+\(\.\d\+\)*"	contained skipwhite nextgroup=vimMenuName
--syn match   vimMenuNameMore	"\c\\\s\|<tab>\|\\\."	contained nextgroup=vimMenuName,vimMenuNameMore contains=vimNotation
--syn match   vimMenuMod    contained	"\c<\(script\|silent\)\+>"  skipwhite contains=vimMapModKey,vimMapModErr nextgroup=@vimMenuList
--syn match   vimMenuMap	"\s"	contained skipwhite nextgroup=vimMenuRhs
--syn match   vimMenuRhs	".*$"	contained contains=vimString,vimComment,vimIsCommand
--syn match   vimMenuBang	"!"	contained skipwhite nextgroup=@vimMenuList
-+syn cluster	vimMenuList contains=vimMenuBang,vimMenuPriority,vimMenuName,vimMenuMod
-+syn keyword	vimCommand	am[enu] an[oremenu] aun[menu] cme[nu] cnoreme[nu] cunme[nu] ime[nu] inoreme[nu] iunme[nu] me[nu] nme[nu] nnoreme[nu] noreme[nu] nunme[nu] ome[nu] onoreme[nu] ounme[nu] unme[nu] vme[nu] vnoreme[nu] vunme[nu] skipwhite nextgroup=@vimMenuList
-+syn match	vimMenuName	"[^ \t\\<]\+"	contained nextgroup=vimMenuNameMore,vimMenuMap
-+syn match	vimMenuPriority	"\d\+\(\.\d\+\)*"	contained skipwhite nextgroup=vimMenuName
-+syn match	vimMenuNameMore	"\c\\\s\|<tab>\|\\\."	contained nextgroup=vimMenuName,vimMenuNameMore contains=vimNotation
-+syn match	vimMenuMod    contained	"\c<\(script\|silent\)\+>"  skipwhite contains=vimMapModKey,vimMapModErr nextgroup=@vimMenuList
-+syn match	vimMenuMap	"\s"	contained skipwhite nextgroup=vimMenuRhs
-+syn match	vimMenuRhs	".*$"	contained contains=vimString,vimComment,vimIsCommand
-+syn match	vimMenuBang	"!"	contained skipwhite nextgroup=@vimMenuList
- 
- " Angle-Bracket Notation (tnx to Michael Geddes) {{{2
- " ======================
- syn case ignore
--syn match vimNotation	"\(\\\|<lt>\)\=<\([scamd]-\)\{0,4}x\=\(f\d\{1,2}\|[^ \t:]\|cr\|lf\|linefeed\|return\|k\=del\%[ete]\|bs\|backspace\|tab\|esc\|right\|left\|help\|undo\|insert\|ins\|k\=home\|k\=end\|kplus\|kminus\|kdivide\|kmultiply\|kenter\|space\|k\=\(page\)\=\(\|down\|up\)\)>" contains=vimBracket
--syn match vimNotation	"\(\\\|<lt>\)\=<\([scam2-4]-\)\{0,4}\(right\|left\|middle\)\(mouse\)\=\(drag\|release\)\=>"	contains=vimBracket
--syn match vimNotation	"\(\\\|<lt>\)\=<\(bslash\|plug\|sid\|space\|bar\|nop\|nul\|lt\)>"		contains=vimBracket
--syn match vimNotation	'\(\\\|<lt>\)\=<C-R>[0-9a-z"%#:.\-=]'he=e-1			contains=vimBracket
--syn match vimNotation	'\(\\\|<lt>\)\=<\%(q-\)\=\(line[12]\|count\|bang\|reg\|args\|f-args\|lt\)>'	contains=vimBracket
--syn match vimNotation	"\(\\\|<lt>\)\=<\([cas]file\|abuf\|amatch\|cword\|cWORD\|client\)>"		contains=vimBracket
--syn match vimBracket contained	"[\\<>]"
-+syn match	vimNotation	"\(\\\|<lt>\)\=<\([scamd]-\)\{0,4}x\=\(f\d\{1,2}\|[^ \t:]\|cr\|lf\|linefeed\|return\|k\=del\%[ete]\|bs\|backspace\|tab\|esc\|right\|left\|help\|undo\|insert\|ins\|k\=home\|k\=end\|kplus\|kminus\|kdivide\|kmultiply\|kenter\|space\|k\=\(page\)\=\(\|down\|up\)\)>" contains=vimBracket
-+syn match	vimNotation	"\(\\\|<lt>\)\=<\([scam2-4]-\)\{0,4}\(right\|left\|middle\)\(mouse\)\=\(drag\|release\)\=>"	contains=vimBracket
-+syn match	vimNotation	"\(\\\|<lt>\)\=<\(bslash\|plug\|sid\|space\|bar\|nop\|nul\|lt\)>"		contains=vimBracket
-+syn match	vimNotation	'\(\\\|<lt>\)\=<C-R>[0-9a-z"%#:.\-=]'he=e-1			contains=vimBracket
-+syn match	vimNotation	'\(\\\|<lt>\)\=<\%(q-\)\=\(line[12]\|count\|bang\|reg\|args\|f-args\|lt\)>'	contains=vimBracket
-+syn match	vimNotation	"\(\\\|<lt>\)\=<\([cas]file\|abuf\|amatch\|cword\|cWORD\|client\)>"		contains=vimBracket
-+syn match	vimBracket contained	"[\\<>]"
- syn case match
- 
- " User Function Highlighting {{{2
- " (following Gautam Iyer's suggestion)
- " ==========================
--syn match vimFunc		"\%(\%([gGsS]:\|<[sS][iI][dD]>\)\=\%([a-zA-Z0-9_.]\+\.\)*\I[a-zA-Z0-9_.]*\)\ze\s*("		contains=vimFuncName,vimUserFunc,vimExecute
--syn match vimUserFunc contained	"\%(\%([gGsS]:\|<[sS][iI][dD]>\)\=\%([a-zA-Z0-9_.]\+\.\)*\I[a-zA-Z0-9_.]*\)\|\<\u[a-zA-Z0-9.]*\>\|\<if\>"	contains=vimNotation
--syn match vimNotFunc	"\<if\>\|\<el\%[seif]\>"
-+syn match vimFunc		"\%(\%([sSgGbBwWtTlL]:\|<[sS][iI][dD]>\)\=\%([a-zA-Z0-9_.]\+\.\)*\I[a-zA-Z0-9_.]*\)\ze\s*("		contains=vimFuncName,vimUserFunc,vimExecute
-+syn match vimUserFunc contained	"\%(\%([sSgGbBwWtTlL]:\|<[sS][iI][dD]>\)\=\%([a-zA-Z0-9_.]\+\.\)*\I[a-zA-Z0-9_.]*\)\|\<\u[a-zA-Z0-9.]*\>\|\<if\>"	contains=vimNotation
-+syn match vimNotFunc	"\<if\>\|\<el\%[seif]\>\|\<return\>\|\<while\>"
- 
- " Errors And Warnings: {{{2
- " ====================
- if !exists("g:vimsyn_noerror")
-- syn match vimElseIfErr	"\<else\s\+if\>"
-- syn match vimBufnrWarn	/\<bufnr\s*(\s*["']\.['"]\s*)/
-+ syn match	vimFunctionError	"\s\zs[a-z0-9]\i\{-}\ze\s*("			contained contains=vimFuncKey,vimFuncBlank
-+" syn match	vimFunctionError	"\s\zs\%(<[sS][iI][dD]>\|[sSgGbBwWtTlL]:\)[0-9]\i\{-}\ze\s*("	contained contains=vimFuncKey,vimFuncBlank
-+ syn match	vimElseIfErr	"\<else\s\+if\>"
-+ syn match	vimBufnrWarn	/\<bufnr\s*(\s*["']\.['"]\s*)/
- endif
- 
- " Norm {{{2
- " ====
--syn match vimNorm		"\<norm\%[al]!\=" skipwhite nextgroup=vimNormCmds
--syn match vimNormCmds contained	".*$"
-+syn match	vimNorm		"\<norm\%[al]!\=" skipwhite nextgroup=vimNormCmds
-+syn match	vimNormCmds contained	".*$"
- 
- " Syntax {{{2
- "=======
--syn match   vimGroupList	contained	"@\=[^ \t,]*"	contains=vimGroupSpecial,vimPatSep
--syn match   vimGroupList	contained	"@\=[^ \t,]*,"	nextgroup=vimGroupList contains=vimGroupSpecial,vimPatSep
--syn keyword vimGroupSpecial	contained	ALL	ALLBUT
--if !exists("g:vimsyn_noerror")
-- syn match   vimSynError	contained	"\i\+"
-- syn match   vimSynError	contained	"\i\+="	nextgroup=vimGroupList
--endif
--syn match   vimSynContains	contained	"\<contain\(s\|edin\)="	nextgroup=vimGroupList
--syn match   vimSynKeyContainedin	contained	"\<containedin="	nextgroup=vimGroupList
--syn match   vimSynNextgroup	contained	"nextgroup="	nextgroup=vimGroupList
-+syn match	vimGroupList	contained	"@\=[^ \t,]*"	contains=vimGroupSpecial,vimPatSep
-+syn match	vimGroupList	contained	"@\=[^ \t,]*,"	nextgroup=vimGroupList contains=vimGroupSpecial,vimPatSep
-+syn keyword	vimGroupSpecial	contained	ALL	ALLBUT	CONTAINED	TOP
-+if !exists("g:vimsyn_noerror")
-+ syn match	vimSynError	contained	"\i\+"
-+ syn match	vimSynError	contained	"\i\+="	nextgroup=vimGroupList
-+endif
-+syn match	vimSynContains	contained	"\<contain\(s\|edin\)="	nextgroup=vimGroupList
-+syn match	vimSynKeyContainedin	contained	"\<containedin="	nextgroup=vimGroupList
-+syn match	vimSynNextgroup	contained	"nextgroup="	nextgroup=vimGroupList
- 
--syn match   vimSyntax	"\<sy\%[ntax]\>"	contains=vimCommand skipwhite nextgroup=vimSynType,vimComment
--syn match   vimAuSyntax	contained	"\s+sy\%[ntax]"	contains=vimCommand skipwhite nextgroup=vimSynType,vimComment
-+syn match	vimSyntax	"\<sy\%[ntax]\>"	contains=vimCommand skipwhite nextgroup=vimSynType,vimComment
-+syn match	vimAuSyntax	contained	"\s+sy\%[ntax]"	contains=vimCommand skipwhite nextgroup=vimSynType,vimComment
- 
- " Syntax: case {{{2
--syn keyword vimSynType	contained	case	skipwhite nextgroup=vimSynCase,vimSynCaseError
-+syn keyword	vimSynType	contained	case	skipwhite nextgroup=vimSynCase,vimSynCaseError
- if !exists("g:vimsyn_noerror")
-- syn match   vimSynCaseError	contained	"\i\+"
-+ syn match	vimSynCaseError	contained	"\i\+"
- endif
--syn keyword vimSynCase	contained	ignore	match
-+syn keyword	vimSynCase	contained	ignore	match
- 
- " Syntax: clear {{{2
--syn keyword vimSynType	contained	clear	skipwhite nextgroup=vimGroupList
-+syn keyword	vimSynType	contained	clear	skipwhite nextgroup=vimGroupList
- 
- " Syntax: cluster {{{2
--syn keyword vimSynType	contained	cluster	skipwhite nextgroup=vimClusterName
--syn region  vimClusterName	contained	matchgroup=vimGroupName start="\k\+" skip="\\\\\|\\|" matchgroup=vimSep end="$\||" contains=vimGroupAdd,vimGroupRem,vimSynContains,vimSynError
--syn match   vimGroupAdd	contained	"add="	nextgroup=vimGroupList
--syn match   vimGroupRem	contained	"remove="	nextgroup=vimGroupList
-+syn keyword	vimSynType	contained	cluster	skipwhite nextgroup=vimClusterName
-+syn region	vimClusterName	contained	matchgroup=vimGroupName start="\k\+" skip="\\\\\|\\|" matchgroup=vimSep end="$\||" contains=vimGroupAdd,vimGroupRem,vimSynContains,vimSynError
-+syn match	vimGroupAdd	contained	"add="	nextgroup=vimGroupList
-+syn match	vimGroupRem	contained	"remove="	nextgroup=vimGroupList
- 
- " Syntax: include {{{2
--syn keyword vimSynType	contained	include	skipwhite nextgroup=vimGroupList
-+syn keyword	vimSynType	contained	include	skipwhite nextgroup=vimGroupList
- 
- " Syntax: keyword {{{2
--syn cluster vimSynKeyGroup	contains=vimSynNextgroup,vimSynKeyOpt,vimSynKeyContainedin
--syn keyword vimSynType	contained	keyword	skipwhite nextgroup=vimSynKeyRegion
--syn region  vimSynKeyRegion	contained oneline keepend	matchgroup=vimGroupName start="\k\+" skip="\\\\\|\\|" matchgroup=vimSep end="|\|$" contains=@vimSynKeyGroup
--syn match   vimSynKeyOpt	contained	"\<\(conceal\|contained\|transparent\|skipempty\|skipwhite\|skipnl\)\>"
-+syn cluster	vimSynKeyGroup	contains=vimSynNextgroup,vimSynKeyOpt,vimSynKeyContainedin
-+syn keyword	vimSynType	contained	keyword	skipwhite nextgroup=vimSynKeyRegion
-+syn region	vimSynKeyRegion	contained oneline keepend	matchgroup=vimGroupName start="\k\+" skip="\\\\\|\\|" matchgroup=vimSep end="|\|$" contains=@vimSynKeyGroup
-+syn match	vimSynKeyOpt	contained	"\<\(conceal\|contained\|transparent\|skipempty\|skipwhite\|skipnl\)\>"
- 
- " Syntax: match {{{2
--syn cluster vimSynMtchGroup	contains=vimMtchComment,vimSynContains,vimSynError,vimSynMtchOpt,vimSynNextgroup,vimSynRegPat,vimNotation
--syn keyword vimSynType	contained	match	skipwhite nextgroup=vimSynMatchRegion
--syn region  vimSynMatchRegion	contained keepend	matchgroup=vimGroupName start="\k\+" matchgroup=vimSep end="|\|$" contains=@vimSynMtchGroup
--syn match   vimSynMtchOpt	contained	"\<\(conceal\|transparent\|contained\|excludenl\|skipempty\|skipwhite\|display\|extend\|skipnl\|fold\)\>"
-+syn cluster	vimSynMtchGroup	contains=vimMtchComment,vimSynContains,vimSynError,vimSynMtchOpt,vimSynNextgroup,vimSynRegPat,vimNotation
-+syn keyword	vimSynType	contained	match	skipwhite nextgroup=vimSynMatchRegion
-+syn region	vimSynMatchRegion	contained keepend	matchgroup=vimGroupName start="\k\+" matchgroup=vimSep end="|\|$" contains=@vimSynMtchGroup
-+syn match	vimSynMtchOpt	contained	"\<\(conceal\|transparent\|contained\|excludenl\|skipempty\|skipwhite\|display\|extend\|skipnl\|fold\)\>"
- if has("conceal")
-- syn match   vimSynMtchOpt	contained	"\<cchar="	nextgroup=VimSynMtchCchar
-- syn match   vimSynMtchCchar	contained	"."
-+ syn match	vimSynMtchOpt	contained	"\<cchar="	nextgroup=VimSynMtchCchar
-+ syn match	vimSynMtchCchar	contained	"\S"
- endif
- 
- " Syntax: off and on {{{2
--syn keyword vimSynType	contained	enable	list	manual	off	on	reset
-+syn keyword	vimSynType	contained	enable	list	manual	off	on	reset
- 
- " Syntax: region {{{2
--syn cluster vimSynRegPatGroup	contains=vimPatSep,vimNotPatSep,vimSynPatRange,vimSynNotPatRange,vimSubstSubstr,vimPatRegion,vimPatSepErr,vimNotation
--syn cluster vimSynRegGroup	contains=vimSynContains,vimSynNextgroup,vimSynRegOpt,vimSynReg,vimSynMtchGrp
--syn keyword vimSynType	contained	region	skipwhite nextgroup=vimSynRegion
--syn region  vimSynRegion	contained keepend	matchgroup=vimGroupName start="\k\+" skip="\\\\\|\\|" end="|\|$" contains=@vimSynRegGroup
--syn match   vimSynRegOpt	contained	"\<\(conceal\(ends\)\=\|transparent\|contained\|excludenl\|skipempty\|skipwhite\|display\|keepend\|oneline\|extend\|skipnl\|fold\)\>"
--syn match   vimSynReg	contained	"\(start\|skip\|end\)="he=e-1	nextgroup=vimSynRegPat
--syn match   vimSynMtchGrp	contained	"matchgroup="	nextgroup=vimGroup,vimHLGroup
--syn region  vimSynRegPat	contained extend	start="\z([-`~!@#$%^&*_=+;:'",./?]\)"  skip="\\\\\|\\\z1"  end="\z1"  contains=@vimSynRegPatGroup skipwhite nextgroup=vimSynPatMod,vimSynReg
--syn match   vimSynPatMod	contained	"\(hs\|ms\|me\|hs\|he\|rs\|re\)=[se]\([-+]\d\+\)\="
--syn match   vimSynPatMod	contained	"\(hs\|ms\|me\|hs\|he\|rs\|re\)=[se]\([-+]\d\+\)\=," nextgroup=vimSynPatMod
--syn match   vimSynPatMod	contained	"lc=\d\+"
--syn match   vimSynPatMod	contained	"lc=\d\+," nextgroup=vimSynPatMod
--syn region  vimSynPatRange	contained	start="\["	skip="\\\\\|\\]"   end="]"
--syn match   vimSynNotPatRange	contained	"\\\\\|\\\["
--syn match   vimMtchComment	contained	'"[^"]\+$'
-+syn cluster	vimSynRegPatGroup	contains=vimPatSep,vimNotPatSep,vimSynPatRange,vimSynNotPatRange,vimSubstSubstr,vimPatRegion,vimPatSepErr,vimNotation
-+syn cluster	vimSynRegGroup	contains=vimSynContains,vimSynNextgroup,vimSynRegOpt,vimSynReg,vimSynMtchGrp
-+syn keyword	vimSynType	contained	region	skipwhite nextgroup=vimSynRegion
-+syn region	vimSynRegion	contained keepend	matchgroup=vimGroupName start="\k\+" skip="\\\\\|\\|" end="|\|$" contains=@vimSynRegGroup
-+syn match	vimSynRegOpt	contained	"\<\(conceal\(ends\)\=\|transparent\|contained\|excludenl\|skipempty\|skipwhite\|display\|keepend\|oneline\|extend\|skipnl\|fold\)\>"
-+syn match	vimSynReg	contained	"\(start\|skip\|end\)="he=e-1	nextgroup=vimSynRegPat
-+syn match	vimSynMtchGrp	contained	"matchgroup="	nextgroup=vimGroup,vimHLGroup
-+syn region	vimSynRegPat	contained extend	start="\z([-`~!@#$%^&*_=+;:'",./?]\)"  skip="\\\\\|\\\z1"  end="\z1"  contains=@vimSynRegPatGroup skipwhite nextgroup=vimSynPatMod,vimSynReg
-+syn match	vimSynPatMod	contained	"\(hs\|ms\|me\|hs\|he\|rs\|re\)=[se]\([-+]\d\+\)\="
-+syn match	vimSynPatMod	contained	"\(hs\|ms\|me\|hs\|he\|rs\|re\)=[se]\([-+]\d\+\)\=," nextgroup=vimSynPatMod
-+syn match	vimSynPatMod	contained	"lc=\d\+"
-+syn match	vimSynPatMod	contained	"lc=\d\+," nextgroup=vimSynPatMod
-+syn region	vimSynPatRange	contained	start="\["	skip="\\\\\|\\]"   end="]"
-+syn match	vimSynNotPatRange	contained	"\\\\\|\\\["
-+syn match	vimMtchComment	contained	'"[^"]\+$'
- 
- " Syntax: sync {{{2
- " ============
- syn keyword vimSynType	contained	sync	skipwhite	nextgroup=vimSyncC,vimSyncLines,vimSyncMatch,vimSyncError,vimSyncLinebreak,vimSyncLinecont,vimSyncRegion
- if !exists("g:vimsyn_noerror")
-- syn match   vimSyncError	contained	"\i\+"
-+ syn match	vimSyncError	contained	"\i\+"
- endif
--syn keyword vimSyncC	contained	ccomment	clear	fromstart
--syn keyword vimSyncMatch	contained	match	skipwhite	nextgroup=vimSyncGroupName
--syn keyword vimSyncRegion	contained	region	skipwhite	nextgroup=vimSynReg
--syn match   vimSyncLinebreak	contained	"\<linebreaks="	skipwhite	nextgroup=vimNumber
--syn keyword vimSyncLinecont	contained	linecont	skipwhite	nextgroup=vimSynRegPat
--syn match   vimSyncLines	contained	"\(min\|max\)\=lines="	nextgroup=vimNumber
--syn match   vimSyncGroupName	contained	"\k\+"	skipwhite	nextgroup=vimSyncKey
--syn match   vimSyncKey	contained	"\<groupthere\|grouphere\>"	skipwhite nextgroup=vimSyncGroup
--syn match   vimSyncGroup	contained	"\k\+"	skipwhite	nextgroup=vimSynRegPat,vimSyncNone
--syn keyword vimSyncNone	contained	NONE
-+syn keyword	vimSyncC	contained	ccomment	clear	fromstart
-+syn keyword	vimSyncMatch	contained	match	skipwhite	nextgroup=vimSyncGroupName
-+syn keyword	vimSyncRegion	contained	region	skipwhite	nextgroup=vimSynReg
-+syn match	vimSyncLinebreak	contained	"\<linebreaks="	skipwhite	nextgroup=vimNumber
-+syn keyword	vimSyncLinecont	contained	linecont	skipwhite	nextgroup=vimSynRegPat
-+syn match	vimSyncLines	contained	"\(min\|max\)\=lines="	nextgroup=vimNumber
-+syn match	vimSyncGroupName	contained	"\k\+"	skipwhite	nextgroup=vimSyncKey
-+syn match	vimSyncKey	contained	"\<groupthere\|grouphere\>"	skipwhite nextgroup=vimSyncGroup
-+syn match	vimSyncGroup	contained	"\k\+"	skipwhite	nextgroup=vimSynRegPat,vimSyncNone
-+syn keyword	vimSyncNone	contained	NONE
- 
- " Additional IsCommand, here by reasons of precedence {{{2
- " ====================
--syn match vimIsCommand	"<Bar>\s*\a\+"	transparent contains=vimCommand,vimNotation
-+syn match	vimIsCommand	"<Bar>\s*\a\+"	transparent contains=vimCommand,vimNotation
- 
- " Highlighting {{{2
- " ============
--syn cluster vimHighlightCluster	contains=vimHiLink,vimHiClear,vimHiKeyList,vimComment
--syn match   vimHighlight	"\<hi\%[ghlight]\>" skipwhite nextgroup=vimHiBang,@vimHighlightCluster
--syn match   vimHiBang	contained	"!"	  skipwhite nextgroup=@vimHighlightCluster
--
--syn match   vimHiGroup	contained	"\i\+"
-+syn cluster	vimHighlightCluster		contains=vimHiLink,vimHiClear,vimHiKeyList,vimComment
-+syn match	vimHighlight	"\<hi\%[ghlight]\>"	skipwhite nextgroup=vimHiBang,@vimHighlightCluster
-+syn match	vimHiBang	contained	"!"	skipwhite nextgroup=@vimHighlightCluster
-+       	
-+syn match	vimHiGroup	contained	"\i\+"
- syn case ignore
--syn keyword vimHiAttrib	contained	none bold inverse italic reverse standout underline undercurl
--syn keyword vimFgBgAttrib	contained	none bg background fg foreground
-+syn keyword	vimHiAttrib	contained	none bold inverse italic reverse standout underline undercurl
-+syn keyword	vimFgBgAttrib	contained	none bg background fg foreground
- syn case match
--syn match   vimHiAttribList	contained	"\i\+"	contains=vimHiAttrib
--syn match   vimHiAttribList	contained	"\i\+,"he=e-1	contains=vimHiAttrib nextgroup=vimHiAttribList
-+syn match	vimHiAttribList	contained	"\i\+"	contains=vimHiAttrib
-+syn match	vimHiAttribList	contained	"\i\+,"he=e-1	contains=vimHiAttrib nextgroup=vimHiAttribList
- syn case ignore
--syn keyword vimHiCtermColor	contained	black blue brown cyan darkBlue darkcyan darkgray darkgreen darkgrey darkmagenta darkred darkyellow gray green grey lightblue lightcyan lightgray lightgreen lightgrey lightmagenta lightred magenta red white yellow
-+syn keyword	vimHiCtermColor	contained	black blue brown cyan darkBlue darkcyan darkgray darkgreen darkgrey darkmagenta darkred darkyellow gray green grey lightblue lightcyan lightgray lightgreen lightgrey lightmagenta lightred magenta red white yellow
- 
- syn case match
--syn match   vimHiFontname	contained	"[a-zA-Z\-*]\+"
--syn match   vimHiGuiFontname	contained	"'[a-zA-Z\-* ]\+'"
--syn match   vimHiGuiRgb	contained	"#\x\{6}"
-+syn match	vimHiFontname	contained	"[a-zA-Z\-*]\+"
-+syn match	vimHiGuiFontname	contained	"'[a-zA-Z\-* ]\+'"
-+syn match	vimHiGuiRgb	contained	"#\x\{6}"
- if !exists("g:vimsyn_noerror")
-- syn match   vimHiCtermError	contained	"[^0-9]\i*"
-+ syn match	vimHiCtermError	contained	"[^0-9]\i*"
- endif
- 
- " Highlighting: hi group key=arg ... {{{2
--syn cluster vimHiCluster contains=vimHiGroup,vimHiTerm,vimHiCTerm,vimHiStartStop,vimHiCtermFgBg,vimHiGui,vimHiGuiFont,vimHiGuiFgBg,vimHiKeyError,vimNotation
--syn region vimHiKeyList	contained oneline start="\i\+" skip="\\\\\|\\|" end="$\||"	contains=@vimHiCluster
-+syn cluster	vimHiCluster contains=vimGroup,vimHiGroup,vimHiTerm,vimHiCTerm,vimHiStartStop,vimHiCtermFgBg,vimHiGui,vimHiGuiFont,vimHiGuiFgBg,vimHiKeyError,vimNotation
-+syn region	vimHiKeyList	contained oneline start="\i\+" skip="\\\\\|\\|" end="$\||"	contains=@vimHiCluster
- if !exists("g:vimsyn_noerror")
-- syn match  vimHiKeyError	contained	"\i\+="he=e-1
-+ syn match	vimHiKeyError	contained	"\i\+="he=e-1
- endif
--syn match  vimHiTerm	contained	"\cterm="he=e-1		nextgroup=vimHiAttribList
--syn match  vimHiStartStop	contained	"\c\(start\|stop\)="he=e-1	nextgroup=vimHiTermcap,vimOption
--syn match  vimHiCTerm	contained	"\ccterm="he=e-1		nextgroup=vimHiAttribList
--syn match  vimHiCtermFgBg	contained	"\ccterm[fb]g="he=e-1	nextgroup=vimNumber,vimHiCtermColor,vimFgBgAttrib,vimHiCtermError
--syn match  vimHiGui	contained	"\cgui="he=e-1		nextgroup=vimHiAttribList
--syn match  vimHiGuiFont	contained	"\cfont="he=e-1		nextgroup=vimHiFontname
--syn match  vimHiGuiFgBg	contained	"\cgui\%([fb]g\|sp\)="he=e-1	nextgroup=vimHiGroup,vimHiGuiFontname,vimHiGuiRgb,vimFgBgAttrib
--syn match  vimHiTermcap	contained	"\S\+"		contains=vimNotation
-+syn match	vimHiTerm	contained	"\cterm="he=e-1		nextgroup=vimHiAttribList
-+syn match	vimHiStartStop	contained	"\c\(start\|stop\)="he=e-1	nextgroup=vimHiTermcap,vimOption
-+syn match	vimHiCTerm	contained	"\ccterm="he=e-1		nextgroup=vimHiAttribList
-+syn match	vimHiCtermFgBg	contained	"\ccterm[fb]g="he=e-1	nextgroup=vimNumber,vimHiCtermColor,vimFgBgAttrib,vimHiCtermError
-+syn match	vimHiGui	contained	"\cgui="he=e-1		nextgroup=vimHiAttribList
-+syn match	vimHiGuiFont	contained	"\cfont="he=e-1		nextgroup=vimHiFontname
-+syn match	vimHiGuiFgBg	contained	"\cgui\%([fb]g\|sp\)="he=e-1	nextgroup=vimHiGroup,vimHiGuiFontname,vimHiGuiRgb,vimFgBgAttrib
-+syn match	vimHiTermcap	contained	"\S\+"		contains=vimNotation
- 
- " Highlight: clear {{{2
--syn keyword vimHiClear	contained	clear	nextgroup=vimHiGroup
-+syn keyword	vimHiClear	contained	clear	nextgroup=vimHiGroup
- 
- " Highlight: link {{{2
--syn region vimHiLink	contained oneline matchgroup=vimCommand start="\<\(def\s\+\)\=link\>\|\<def\>" end="$"	contains=vimHiGroup,vimGroup,vimHLGroup,vimNotation
-+syn region	vimHiLink	contained oneline matchgroup=vimCommand start="\<\(def\s\+\)\=link\>\|\<def\>" end="$"	contains=vimHiGroup,vimGroup,vimHLGroup,vimNotation
- 
- " Control Characters {{{2
- " ==================
--syn match vimCtrlChar	"[
--]"
-+syn match	vimCtrlChar	"[
--]"
- 
- " Beginners - Patterns that involve ^ {{{2
- " =========
--syn match  vimLineComment	+^[ \t:]*".*$+	contains=@vimCommentGroup,vimCommentString,vimCommentTitle
--syn match  vimCommentTitle	'"\s*\%([sS]:\|\h\w*#\)\=\u\w*\(\s\+\u\w*\)*:'hs=s+1	contained contains=vimCommentTitleLeader,vimTodo,@vimCommentGroup
--syn match  vimContinue	"^\s*\\"
--syn region vimString	start="^\s*\\\z(['"]\)" skip='\\\\\|\\\z1' end="\z1" oneline keepend contains=@vimStringGroup,vimContinue
--syn match  vimCommentTitleLeader	'"\s\+'ms=s+1	contained
-+syn match	vimLineComment	+^[ \t:]*".*$+	contains=@vimCommentGroup,vimCommentString,vimCommentTitle
-+syn match	vimCommentTitle	'"\s*\%([sS]:\|\h\w*#\)\=\u\w*\(\s\+\u\w*\)*:'hs=s+1	contained contains=vimCommentTitleLeader,vimTodo,@vimCommentGroup
-+syn match	vimContinue	"^\s*\\"
-+syn region	vimString	start="^\s*\\\z(['"]\)" skip='\\\\\|\\\z1' end="\z1" oneline keepend contains=@vimStringGroup,vimContinue
-+syn match	vimCommentTitleLeader	'"\s\+'ms=s+1	contained
- 
- " Searches And Globals: {{{2
- " ====================
--syn match vimSearch	'^\s*[/?].*'		contains=vimSearchDelim
--syn match vimSearchDelim	'^\s*\zs[/?]\|[/?]$'	contained
--syn region vimGlobal	matchgroup=Statement start='\<g\%[lobal]!\=/' skip='\\.' end='/'
--syn region vimGlobal	matchgroup=Statement start='\<v\%[global]!\=/' skip='\\.' end='/'
-+syn match	vimSearch	'^\s*[/?].*'		contains=vimSearchDelim
-+syn match	vimSearchDelim	'^\s*\zs[/?]\|[/?]$'	contained
-+syn region	vimGlobal	matchgroup=Statement start='\<g\%[lobal]!\=/' skip='\\.' end='/'
-+syn region	vimGlobal	matchgroup=Statement start='\<v\%[global]!\=/' skip='\\.' end='/'
- 
- " Scripts  : perl,ruby : Benoit Cerrina {{{2
- " =======    python,tcl: Johannes Zellner
-@@ -541,94 +543,127 @@
- endif
- 
- " [-- perl --] {{{3
--if (g:vimsyn_embed =~ 'p' && has("perl")) && filereadable(expand("<sfile>:p:h")."/perl.vim")
-+let s:perlpath= expand("<sfile>:p:h")."/perl.vim"
-+if !filereadable(s:perlpath)
-+ let s:perlpath= globpath(&rtp,"syntax/perl.vim")
-+endif
-+if (g:vimsyn_embed =~ 'p' && has("perl")) && filereadable(s:perlpath)
-  unlet! b:current_syntax
-- syn include @vimPerlScript <sfile>:p:h/perl.vim
-+ exe "syn include @vimPerlScript ".s:perlpath
-  if exists("g:vimsyn_folding") && g:vimsyn_folding =~ 'p'
--  syn region vimPerlRegion fold matchgroup=vimScriptDelim start=+pe\%[rl]\s*<<\s*\z(.*\)$+ end=+^\z1$+ contains=@vimPerlScript
--  syn region vimPerlRegion fold matchgroup=vimScriptDelim start=+pe\%[rl]\s*<<\s*$+ end=+\.$+ contains=@vimPerlScript
-+  syn region vimPerlRegion fold matchgroup=vimScriptDelim start=+pe\%[rl]\s*<<\s*\z(.*\)$+ end=+^\z1$+	contains=@vimPerlScript
-+  syn region vimPerlRegion fold matchgroup=vimScriptDelim start=+pe\%[rl]\s*<<\s*$+ end=+\.$+	contains=@vimPerlScript
-  else
--  syn region vimPerlRegion matchgroup=vimScriptDelim start=+pe\%[rl]\s*<<\s*\z(.*\)$+ end=+^\z1$+ contains=@vimPerlScript
--  syn region vimPerlRegion matchgroup=vimScriptDelim start=+pe\%[rl]\s*<<\s*$+ end=+\.$+ contains=@vimPerlScript
-+  syn region vimPerlRegion matchgroup=vimScriptDelim start=+pe\%[rl]\s*<<\s*\z(.*\)$+ end=+^\z1$+	contains=@vimPerlScript
-+  syn region vimPerlRegion matchgroup=vimScriptDelim start=+pe\%[rl]\s*<<\s*$+ end=+\.$+		contains=@vimPerlScript
-  endif
-+ syn cluster vimFuncBodyList	add=vimPerlRegion
- else
-  syn region vimEmbedError start=+pe\%[rl]\s*<<\s*\z(.*\)$+ end=+^\z1$+
-  syn region vimEmbedError start=+pe\%[rl]\s*<<\s*$+ end=+\.$+
- endif
-+unlet s:perlpath
- 
- " [-- ruby --] {{{3
--if (g:vimsyn_embed =~ 'r' && has("ruby")) && filereadable(expand("<sfile>:p:h")."/ruby.vim")
-+let s:rubypath= expand("<sfile>:p:h")."/ruby.vim"
-+if !filereadable(s:rubypath)
-+ let s:rubypath= globpath(&rtp,"syntax/ruby.vim")
-+endif
-+if (g:vimsyn_embed =~ 'r' && has("ruby")) && filereadable(s:rubypath)
-  unlet! b:current_syntax
-- syn include @vimRubyScript <sfile>:p:h/ruby.vim
-+ exe "syn include @vimRubyScript ".s:rubypath
-  if exists("g:vimsyn_folding") && g:vimsyn_folding =~ 'r'
--  syn region vimRubyRegion fold matchgroup=vimScriptDelim start=+rub[y]\s*<<\s*\z(.*\)$+ end=+^\z1$+ contains=@vimRubyScript
-+  syn region vimRubyRegion fold matchgroup=vimScriptDelim start=+rub[y]\s*<<\s*\z(.*\)$+ end=+^\z1$+	contains=@vimRubyScript
-  else
--  syn region vimRubyRegion matchgroup=vimScriptDelim start=+rub[y]\s*<<\s*\z(.*\)$+ end=+^\z1$+ contains=@vimRubyScript
-+  syn region vimRubyRegion matchgroup=vimScriptDelim start=+rub[y]\s*<<\s*\z(.*\)$+ end=+^\z1$+	contains=@vimRubyScript
-  endif
-- syn region vimRubyRegion matchgroup=vimScriptDelim start=+rub[y]\s*<<\s*$+ end=+\.$+ contains=@vimRubyScript
-+ syn region vimRubyRegion matchgroup=vimScriptDelim start=+rub[y]\s*<<\s*$+ end=+\.$+		contains=@vimRubyScript
-+ syn cluster vimFuncBodyList	add=vimRubyRegion
- else
-  syn region vimEmbedError start=+rub[y]\s*<<\s*\z(.*\)$+ end=+^\z1$+
-  syn region vimEmbedError start=+rub[y]\s*<<\s*$+ end=+\.$+
- endif
-+unlet s:rubypath
- 
- " [-- python --] {{{3
--if (g:vimsyn_embed =~ 'P' && has("python")) && filereadable(expand("<sfile>:p:h")."/python.vim")
-+let s:pythonpath= expand("<sfile>:p:h")."/python.vim"
-+if !filereadable(s:pythonpath)
-+ let s:pythonpath= globpath(&rtp,"syntax/python.vim")
-+endif
-+if (g:vimsyn_embed =~ 'P' && has("python")) && filereadable(s:pythonpath)
-  unlet! b:current_syntax
-- syn include @vimPythonScript <sfile>:p:h/python.vim
-+ exe "syn include @vimPythonScript ".s:pythonpath
-  if exists("g:vimsyn_folding") && g:vimsyn_folding =~ 'P'
--  syn region vimPythonRegion fold matchgroup=vimScriptDelim start=+py\%[thon]\s*<<\s*\z(.*\)$+ end=+^\z1$+ contains=@vimPythonScript
--  syn region vimPythonRegion fold matchgroup=vimScriptDelim start=+py\%[thon]\s*<<\s*$+ end=+\.$+ contains=@vimPythonScript
-+  syn region vimPythonRegion fold matchgroup=vimScriptDelim start=+py\%[thon]\s*<<\s*\z(.*\)$+ end=+^\z1$+	contains=@vimPythonScript
-+  syn region vimPythonRegion fold matchgroup=vimScriptDelim start=+py\%[thon]\s*<<\s*$+ end=+\.$+	contains=@vimPythonScript
-  else
--  syn region vimPythonRegion matchgroup=vimScriptDelim start=+py\%[thon]\s*<<\s*\z(.*\)$+ end=+^\z1$+ contains=@vimPythonScript
--  syn region vimPythonRegion matchgroup=vimScriptDelim start=+py\%[thon]\s*<<\s*$+ end=+\.$+ contains=@vimPythonScript
-+  syn region vimPythonRegion matchgroup=vimScriptDelim start=+py\%[thon]\s*<<\s*\z(.*\)$+ end=+^\z1$+	contains=@vimPythonScript
-+  syn region vimPythonRegion matchgroup=vimScriptDelim start=+py\%[thon]\s*<<\s*$+ end=+\.$+	contains=@vimPythonScript
-  endif
-+ syn cluster vimFuncBodyList	add=vimPythonRegion
- else
-  syn region vimEmbedError start=+py\%[thon]\s*<<\s*\z(.*\)$+ end=+^\z1$+
-  syn region vimEmbedError start=+py\%[thon]\s*<<\s*$+ end=+\.$+
- endif
-+unlet s:pythonpath
- 
- " [-- tcl --] {{{3
- if has("win32") || has("win95") || has("win64") || has("win16")
-  " apparently has("tcl") has been hanging vim on some windows systems with cygwin
-- let trytcl= (&shell !~ '\<\%(bash\>\|4[nN][tT]\|\<zsh\)\>\%(\.exe\)\=$')
-+ let s:trytcl= (&shell !~ '\<\%(bash\>\|4[nN][tT]\|\<zsh\)\>\%(\.exe\)\=$')
- else
-- let trytcl= 1
-+ let s:trytcl= 1
- endif
--if trytcl
-- if (g:vimsyn_embed =~ 't' && has("tcl")) && filereadable(expand("<sfile>:p:h")."/tcl.vim")
-+if s:trytcl
-+ let s:tclpath= expand("<sfile>:p:h")."/tcl.vim"
-+ if !filereadable(s:tclpath)
-+  let s:tclpath= globpath(&rtp,"syntax/tcl.vim")
-+ endif
-+ if (g:vimsyn_embed =~ 't' && has("tcl")) && filereadable(s:tclpath)
-   unlet! b:current_syntax
--  syn include @vimTclScript <sfile>:p:h/tcl.vim
-+  exe "syn include @vimTclScript ".s:tclpath
-   if exists("g:vimsyn_folding") && g:vimsyn_folding =~ 't'
--   syn region vimTclRegion fold matchgroup=vimScriptDelim start=+tc[l]\=\s*<<\s*\z(.*\)$+ end=+^\z1$+ contains=@vimTclScript
--   syn region vimTclRegion fold matchgroup=vimScriptDelim start=+tc[l]\=\s*<<\s*$+ end=+\.$+ contains=@vimTclScript
-+   syn region vimTclRegion fold matchgroup=vimScriptDelim start=+tc[l]\=\s*<<\s*\z(.*\)$+ end=+^\z1$+	contains=@vimTclScript
-+   syn region vimTclRegion fold matchgroup=vimScriptDelim start=+tc[l]\=\s*<<\s*$+ end=+\.$+	contains=@vimTclScript
-   else
--   syn region vimTclRegion matchgroup=vimScriptDelim start=+tc[l]\=\s*<<\s*\z(.*\)$+ end=+^\z1$+ contains=@vimTclScript
--   syn region vimTclRegion matchgroup=vimScriptDelim start=+tc[l]\=\s*<<\s*$+ end=+\.$+ contains=@vimTclScript
-+   syn region vimTclRegion matchgroup=vimScriptDelim start=+tc[l]\=\s*<<\s*\z(.*\)$+ end=+^\z1$+	contains=@vimTclScript
-+   syn region vimTclRegion matchgroup=vimScriptDelim start=+tc[l]\=\s*<<\s*$+ end=+\.$+		contains=@vimTclScript
-   endif
-+  syn cluster vimFuncBodyList	add=vimTclScript
-+ else
-+  syn region vimEmbedError start=+tc[l]\=\s*<<\s*\z(.*\)$+ end=+^\z1$+
-+  syn region vimEmbedError start=+tc[l]\=\s*<<\s*$+ end=+\.$+
-  endif
-+ unlet s:tclpath
- else
-  syn region vimEmbedError start=+tc[l]\=\s*<<\s*\z(.*\)$+ end=+^\z1$+
-  syn region vimEmbedError start=+tc[l]\=\s*<<\s*$+ end=+\.$+
- endif
--unlet trytcl
-+unlet s:trytcl
- 
- " [-- mzscheme --] {{{3
--if (g:vimsyn_embed =~ 'm' && has("mzscheme")) && filereadable(expand("<sfile>:p:h")."/scheme.vim")
-+let s:mzschemepath= expand("<sfile>:p:h")."/scheme.vim"
-+if !filereadable(s:mzschemepath)
-+ let s:mzschemepath= globpath(&rtp,"syntax/scheme.vim")
-+endif
-+if (g:vimsyn_embed =~ 'm' && has("mzscheme")) && filereadable(s:mzschemepath)
-  unlet! b:current_syntax
-  let iskKeep= &isk
-- syn include @vimMzSchemeScript <sfile>:p:h/scheme.vim
-+ exe "syn include @vimMzSchemeScript ".s:mzschemepath
-  let &isk= iskKeep
-  if exists("g:vimsyn_folding") && g:vimsyn_folding =~ 'm'
--  syn region vimMzSchemeRegion fold matchgroup=vimScriptDelim start=+mz\%[scheme]\s*<<\s*\z(.*\)$+ end=+^\z1$+ contains=@vimMzSchemeScript
--  syn region vimMzSchemeRegion fold matchgroup=vimScriptDelim start=+mz\%[scheme]\s*<<\s*$+ end=+\.$+ contains=@vimMzSchemeScript
-+  syn region vimMzSchemeRegion fold matchgroup=vimScriptDelim start=+mz\%[scheme]\s*<<\s*\z(.*\)$+ end=+^\z1$+	contains=@vimMzSchemeScript
-+  syn region vimMzSchemeRegion fold matchgroup=vimScriptDelim start=+mz\%[scheme]\s*<<\s*$+ end=+\.$+		contains=@vimMzSchemeScript
-  else
--  syn region vimMzSchemeRegion matchgroup=vimScriptDelim start=+mz\%[scheme]\s*<<\s*\z(.*\)$+ end=+^\z1$+ contains=@vimMzSchemeScript
--  syn region vimMzSchemeRegion matchgroup=vimScriptDelim start=+mz\%[scheme]\s*<<\s*$+ end=+\.$+ contains=@vimMzSchemeScript
-+  syn region vimMzSchemeRegion matchgroup=vimScriptDelim start=+mz\%[scheme]\s*<<\s*\z(.*\)$+ end=+^\z1$+		contains=@vimMzSchemeScript
-+  syn region vimMzSchemeRegion matchgroup=vimScriptDelim start=+mz\%[scheme]\s*<<\s*$+ end=+\.$+		contains=@vimMzSchemeScript
-  endif
-+ syn cluster vimFuncBodyList	add=vimMzSchemeRegion
- else
-  syn region vimEmbedError start=+mz\%[scheme]\s*<<\s*\z(.*\)$+ end=+^\z1$+
-  syn region vimEmbedError start=+mz\%[scheme]\s*<<\s*$+ end=+\.$+
- endif
-+unlet s:mzschemepath
- 
- " Synchronize (speed) {{{2
- "============
-@@ -643,6 +678,7 @@
- syn sync linecont	"^\s\+\\"
- syn sync match vimAugroupSyncA	groupthere NONE	"\<aug\%[roup]\>\s\+[eE][nN][dD]"
- 
-+" ====================
- " Highlighting Settings {{{2
- " ====================
- 
-@@ -709,15 +745,15 @@
- hi def link vimMenuNameMore	vimMenuName
- hi def link vimMtchComment	vimComment
- hi def link vimNorm	vimCommand
-+hi def link vimNotFunc	vimCommand
- hi def link vimNotPatSep	vimString
--hi def link vimPatSepR	vimPatSep
--hi def link vimPatSepZ	vimPatSep
- hi def link vimPatSepErr	vimPatSep
-+hi def link vimPatSepR	vimPatSep
- hi def link vimPatSepZone	vimString
-+hi def link vimPatSepZ	vimPatSep
- hi def link vimPlainMark	vimMark
- hi def link vimPlainRegister	vimRegister
- hi def link vimSearch	vimString
--hi def link vimSearchDelim	Statement
- hi def link vimSetMod	vimOption
- hi def link vimSetString	vimString
- hi def link vimSpecFileMod	vimSpecFile
-@@ -738,11 +774,11 @@
- hi def link vimSynRegPat	vimString
- hi def link vimSyntax	vimCommand
- hi def link vimSynType	vimSpecial
-+hi def link vimUnmap	vimMap
- hi def link vimUserAttrbCmplt	vimSpecial
- hi def link vimUserAttrbKey	vimOption
- hi def link vimUserAttrb	vimSpecial
- hi def link vimUserCommand	vimCommand
--hi def link vimUserFunc	Normal
- 
- hi def link vimAutoEvent	Type
- hi def link vimBracket	Delimiter
-@@ -759,24 +795,25 @@
- hi def link vimFuncName	Function
- hi def link vimFuncSID	Special
- hi def link vimFuncVar	Identifier
--hi def link vimGroup	Type
- hi def link vimGroupSpecial	Special
--hi def link vimHLMod	PreProc
-+hi def link vimGroup	Type
- hi def link vimHiAttrib	PreProc
- hi def link vimHiTerm	Type
-+hi def link vimHLMod	PreProc
- hi def link vimKeyword	Statement
- hi def link vimMark	Number
- hi def link vimMenuName	PreProc
- hi def link vimNotation	Special
--hi def link vimNotFunc	vimCommand
- hi def link vimNumber	Number
-+hi def link vimOperError	Error
- hi def link vimOper	Operator
- hi def link vimOption	PreProc
--hi def link vimOperError	Error
-+hi def link vimParenSep	Delimiter
- hi def link vimPatSep	SpecialChar
- hi def link vimPattern	Type
- hi def link vimRegister	SpecialChar
- hi def link vimScriptDelim	Comment
-+hi def link vimSearchDelim	Statement
- hi def link vimSep	Delimiter
- hi def link vimSetSep	Statement
- hi def link vimSpecFile	Identifier
-@@ -786,18 +823,19 @@
- hi def link vimSubstDelim	Delimiter
- hi def link vimSubstFlags	Special
- hi def link vimSubstSubstr	SpecialChar
--hi def link vimSynCase	Type
- hi def link vimSynCaseError	Error
--hi def link vimSynError	Error
--hi def link vimSynOption	Special
--hi def link vimSynReg	Type
-+hi def link vimSynCase	Type
- hi def link vimSyncC	Type
- hi def link vimSyncError	Error
- hi def link vimSyncKey	Type
- hi def link vimSyncNone	Type
-+hi def link vimSynError	Error
-+hi def link vimSynOption	Special
-+hi def link vimSynReg	Type
- hi def link vimTodo	Todo
--hi def link vimUserCmdError	Error
- hi def link vimUserAttrbCmpltFunc	Special
-+hi def link vimUserCmdError	Error
-+hi def link vimUserFunc	Normal
- hi def link vimWarn	WarningMsg
- 
- " Current Syntax Variable: {{{2
-diff -u -r --new-file runtime/syntax.orig/xml.vim runtime/syntax/xml.vim
---- runtime/syntax.orig/xml.vim	2006-04-11 16:32:00.000000000 -0500
-+++ runtime/syntax/xml.vim	2009-07-26 06:44:44.000000000 -0500
-@@ -3,7 +3,7 @@
- " Maintainer:	Johannes Zellner <johannes@zellner.org>
- "		Author and previous maintainer:
- "		Paul Siegmann <pauls@euronet.nl>
--" Last Change:	Mi, 13 Apr 2005 22:40:09 CEST
-+" Last Change:	2009-07-13 21:26:55
- " Filenames:	*.xml
- " $Id: xml.vim,v 1.3 2006/04/11 21:32:00 vimboss Exp $
- 
-@@ -216,7 +216,7 @@
-     syn region  xmlComment
- 	\ start=+<!+
- 	\ end=+>+
--	\ contains=xmlCommentPart,xmlCommentError
-+	\ contains=xmlCommentStart,xmlCommentError
- 	\ extend
- 	\ fold
- 
-@@ -228,11 +228,12 @@
-     syn region  xmlComment
- 	\ start=+<!+
- 	\ end=+>+
--	\ contains=xmlCommentPart,xmlCommentError
-+	\ contains=xmlCommentStart,xmlCommentError
- 	\ extend
- 
- endif
- 
-+syn match xmlCommentStart   contained "<!" nextgroup=xmlCommentPart
- syn keyword xmlTodo         contained TODO FIXME XXX
- syn match   xmlCommentError contained "[^><!]"
- syn region  xmlCommentPart
-@@ -320,6 +321,7 @@
- 
- hi def link xmlString		String
- hi def link xmlComment		Comment
-+hi def link xmlCommentStart	xmlComment
- hi def link xmlCommentPart	Comment
- hi def link xmlCommentError	Error
- hi def link xmlError		Error
-diff -u -r --new-file runtime/syntax.orig/yacc.vim runtime/syntax/yacc.vim
---- runtime/syntax.orig/yacc.vim	2008-03-03 14:33:51.000000000 -0600
-+++ runtime/syntax/yacc.vim	2008-12-08 15:08:36.000000000 -0600
-@@ -1,95 +1,85 @@
- " Vim syntax file
- " Language:	Yacc
- " Maintainer:	Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz>
--" Last Change:	Jan 09, 2008
--" Version:	5
-+" Last Change:	Oct 21, 2008
-+" Version:	7
- " URL:	http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax
- "
- " Options: {{{1
- "   g:yacc_uses_cpp : if this variable exists, then C++ is loaded rather than C
--"   g:yacc_minlines : see :help :he syn-sync-minlines -- default 50
--"   g:yacc_maxlines : see :help :he syn-sync-maxlines -- default 200
- 
- " ---------------------------------------------------------------------
--" For version 5.x: Clear all syntax items {{{1
--" For version 6.x: Quit when a syntax file was already loaded
-+" this version of syntax/yacc.vim requires 6.0 or later
- if version < 600
--  syntax clear
--elseif exists("b:current_syntax")
--  finish
-+ finish
-+endif
-+if exists("b:current_syntax")
-+ syntax clear
-+endif
-+
-+" ---------------------------------------------------------------------
-+"  Folding Support {{{1
-+if has("folding")
-+ com! -nargs=+ HiFold	<args> fold
-+else
-+ com! -nargs=+ HiFold	<args>
- endif
- 
- " ---------------------------------------------------------------------
- " Read the C syntax to start with {{{1
--if version >= 600
--  if exists("g:yacc_uses_cpp")
--    runtime! syntax/cpp.vim
--  else
--    runtime! syntax/c.vim
--  endif
--elseif exists("g:yacc_uses_cpp")
--  so <sfile>:p:h/cpp.vim
-+if exists("g:yacc_uses_cpp")
-+ syn include @yaccCode	<sfile>:p:h/cpp.vim
- else
--  so <sfile>:p:h/c.vim
-+ syn include @yaccCode	<sfile>:p:h/c.vim
- endif
- 
- " ---------------------------------------------------------------------
--" Clusters {{{1
--syn cluster	yaccActionGroup	contains=yaccDelim,cInParen,cTodo,cIncluded,yaccDelim,yaccCurlyError,yaccUnionCurly,yaccUnion,cUserLabel,cOctalZero,cCppOut2,cCppSkip,cErrInBracket,cErrInParen,cOctalError,cCommentStartError,cParenError
--syn cluster	yaccUnionGroup	contains=yaccKey,cComment,yaccCurly,cType,cStructure,cStorageClass,yaccUnionCurly
--
--" ---------------------------------------------------------------------
--" Yacc stuff {{{1
--syn match	yaccDelim	"^\s*[:|;]"
--syn match	yaccOper	"@\d\+"
--
--syn match	yaccKey	"^\s*%\(token\|type\|left\|right\|start\|ident\|nonassoc\)\>"
--syn match	yaccKey	"\s%\(prec\|expect\)\>"
--syn match	yaccKey	"\$\(<[a-zA-Z_][a-zA-Z_0-9]*>\)\=[\$0-9]\+"
--syn keyword	yaccKeyActn	yyerrok yyclearin
--
--syn match	yaccUnionStart	"^%union"	skipwhite skipnl nextgroup=yaccUnion
--syn region	yaccUnion	contained matchgroup=yaccCurly start="{" matchgroup=yaccCurly end="}"	contains=@yaccUnionGroup
--syn region	yaccUnionCurly	contained matchgroup=yaccCurly start="{" matchgroup=yaccCurly end="}" contains=@yaccUnionGroup
--syn match	yaccBrkt	contained "[<>]"
--syn match	yaccType	"<[a-zA-Z_][a-zA-Z0-9_]*>"	contains=yaccBrkt
--syn match	yaccDefinition	"^[A-Za-z][A-Za-z0-9_]*\_s*:"
--
--" ---------------------------------------------------------------------
--" special Yacc separators {{{1
--syn match	yaccSectionSep	"^[ \t]*%%"
--syn match	yaccSep	"^[ \t]*%{"
--syn match	yaccSep	"^[ \t]*%}"
-+"  Yacc Clusters: {{{1
-+syn cluster yaccInitCluster	contains=yaccKey,yaccKeyActn,yaccBrkt,yaccType,yaccString,yaccUnionStart,yaccHeader2,yaccComment
-+syn cluster yaccRulesCluster	contains=yaccNonterminal,yaccString
-+
-+" ---------------------------------------------------------------------
-+"  Yacc Sections: {{{1
-+HiFold syn	region	yaccInit	start='.'ms=s-1,rs=s-1	matchgroup=yaccSectionSep	end='^%%$'me=e-2,re=e-2	contains=@yaccInitCluster	nextgroup=yaccRules	skipwhite skipempty contained
-+HiFold syn	region	yaccInit2      start='\%^.'ms=s-1,rs=s-1	matchgroup=yaccSectionSep	end='^%%$'me=e-2,re=e-2	contains=@yaccInitCluster	nextgroup=yaccRules	skipwhite skipempty
-+HiFold syn	region	yaccHeader2	matchgroup=yaccSep	start="^\s*\zs%{"	end="^\s*%}"		contains=@yaccCode	nextgroup=yaccInit	skipwhite skipempty contained
-+HiFold syn	region	yaccHeader	matchgroup=yaccSep	start="^\s*\zs%{"	end="^\s*%}"		contains=@yaccCode	nextgroup=yaccInit	skipwhite skipempty
-+HiFold syn	region	yaccRules	matchgroup=yaccSectionSep	start='^%%$'		end='^%%$'me=e-2,re=e-2	contains=@yaccRulesCluster	nextgroup=yaccEndCode	skipwhite skipempty contained
-+HiFold syn	region	yaccEndCode	matchgroup=yaccSectionSep	start='^%%$'		end='\%$'		contains=@yaccCode	contained
-+
-+" ---------------------------------------------------------------------
-+" Yacc Commands: {{{1
-+syn	match	yaccDelim	"[:|]"	contained
-+syn	match	yaccOper	"@\d\+"	contained
-+
-+syn	match	yaccKey	"^\s*%\(token\|type\|left\|right\|start\|ident\|nonassoc\)\>"	contained
-+syn	match	yaccKey	"\s%\(prec\|expect\)\>"	contained
-+syn	match	yaccKey	"\$\(<[a-zA-Z_][a-zA-Z_0-9]*>\)\=[\$0-9]\+"	contained
-+syn	keyword	yaccKeyActn	yyerrok yyclearin	contained
-+
-+syn	match	yaccUnionStart	"^%union"	skipwhite skipnl nextgroup=yaccUnion	contained
-+HiFold syn	region	yaccUnion	matchgroup=yaccCurly start="{" matchgroup=yaccCurly end="}" contains=@yaccCode	contained
-+syn	match	yaccBrkt	"[<>]"	contained
-+syn	match	yaccType	"<[a-zA-Z_][a-zA-Z0-9_]*>"	contains=yaccBrkt	contained
-+
-+HiFold syn	region	yaccNonterminal	start="^\s*\a\w*\ze\_s*\(/\*\_.\{-}\*/\)\=\_s*:"	matchgroup=yaccDelim end=";"	matchgroup=yaccSectionSep end='^%%$'me=e-2,re=e-2 contains=yaccAction,yaccDelim,yaccString,yaccComment	contained
-+syn	region	yaccComment	start="/\*"	end="\*/"
-+syn	match	yaccString	"'[^']*'"	contained
-+
- 
- " ---------------------------------------------------------------------
- " I'd really like to highlight just the outer {}.  Any suggestions??? {{{1
--syn match	yaccCurlyError	"[{}]"
--syn region	yaccAction	matchgroup=yaccCurly start="{" end="}" contains=ALLBUT,@yaccActionGroup
-+syn	match	yaccCurlyError	"[{}]"
-+HiFold syn	region	yaccAction	matchgroup=yaccCurly start="{" end="}" contains=@yaccCode	contained
- 
- " ---------------------------------------------------------------------
- " Yacc synchronization: {{{1
--if exists("g:yacc_maxlines")
-- exe "syn sync maxlines=".g:yacc_maxlines
--else
-- syn sync maxlines=200
--endif
--if exists("g:yacc_minlines")
-- exe "syn sync minlines=".g:yacc_minlines
--else
-- syn sync minlines=50
--endif
-+syn sync fromstart
- 
- " ---------------------------------------------------------------------
- " Define the default highlighting. {{{1
--" For version 5.7 and earlier: only when not done already
--" For version 5.8 and later: only when an item doesn't have highlighting yet
--if version >= 508 || !exists("did_yacc_syn_inits")
--  if version < 508
--    let did_yacchdl_syn_inits = 1
--    command -nargs=+ HiLink hi link <args>
--  else
--    command -nargs=+ HiLink hi def link <args>
--  endif
-+if !exists("did_yacc_syn_inits")
-+  command -nargs=+ HiLink hi def link <args>
- 
-   " Internal yacc highlighting links {{{2
-   HiLink yaccBrkt	yaccStmt
-@@ -98,13 +88,15 @@
-   HiLink yaccUnionStart	yaccKey
- 
-   " External yacc highlighting links {{{2
-+  HiLink yaccComment	Comment
-   HiLink yaccCurly	Delimiter
-   HiLink yaccCurlyError	Error
--  HiLink yaccDefinition	Function
--  HiLink yaccDelim	Function
-+  HiLink yaccNonterminal	Function
-+  HiLink yaccDelim	Delimiter
-   HiLink yaccKeyActn	Special
-   HiLink yaccSectionSep	Todo
-   HiLink yaccSep	Delimiter
-+  HiLink yaccString	String
-   HiLink yaccStmt	Statement
-   HiLink yaccType	Type
- 
-@@ -113,6 +105,10 @@
- 
-   delcommand HiLink
- endif
-+
-+" ---------------------------------------------------------------------
-+"  Cleanup: {{{1
-+delcommand HiFold
- let b:current_syntax = "yacc"
- 
- " ---------------------------------------------------------------------
-diff -u -r --new-file runtime/syntax.orig/zsh.vim runtime/syntax/zsh.vim
---- runtime/syntax.orig/zsh.vim	2008-07-18 09:48:32.000000000 -0500
-+++ runtime/syntax/zsh.vim	2010-02-11 06:45:15.000000000 -0600
-@@ -1,7 +1,7 @@
- " Vim syntax file
- " Language:         Zsh shell script
- " Maintainer:       Nikolai Weibull <now@bitwi.se>
--" Latest Revision:  2008-07-17
-+" Latest Revision:  2010-01-23
- 
- if exists("b:current_syntax")
-   finish
-@@ -14,7 +14,7 @@
- 
- syn keyword zshTodo             contained TODO FIXME XXX NOTE
- 
--syn region  zshComment          display oneline start='\%(^\|\s\)#' end='$'
-+syn region  zshComment          oneline start='\%(^\|\s\)#' end='$'
-                                 \ contains=zshTodo,@Spell
- 
- syn match   zshPreProc          '^\%1l#\%(!\|compdef\|autoload\).*$'
diff --git a/source/ap/vim/vim-runtime-syntax-20110328.diff b/source/ap/vim/vim-runtime-syntax-20110328.diff
new file mode 100644
index 00000000..fa196e31
--- /dev/null
+++ b/source/ap/vim/vim-runtime-syntax-20110328.diff
@@ -0,0 +1,2487 @@
+diff -u -r --new-file runtime/syntax.orig/2html.vim runtime/syntax/2html.vim
+--- runtime/syntax.orig/2html.vim	2010-08-12 14:57:26.000000000 -0500
++++ runtime/syntax/2html.vim	2011-01-08 08:36:35.000000000 -0600
+@@ -1,6 +1,6 @@
+ " Vim syntax support file
+ " Maintainer: Ben Fritz <fritzophrenic@gmail.com>
+-" Last Change: 2010 Aug 12
++" Last Change: 2011 Jan 06
+ "
+ " Additional contributors:
+ "
+@@ -124,7 +124,18 @@
+   let l:style_name = a:style_name . (a:diff_style_name == '' ? '' : ' ') . a:diff_style_name
+ 
+   " Replace the reserved html characters
+-  let formatted = substitute(substitute(substitute(substitute(substitute(formatted, '&', '\&amp;', 'g'), '<', '\&lt;', 'g'), '>', '\&gt;', 'g'), '"', '\&quot;', 'g'), "\x0c", '<hr class="PAGE-BREAK">', 'g')
++  let formatted = substitute(formatted, '&', '\&amp;',  'g')
++  let formatted = substitute(formatted, '<', '\&lt;',   'g')
++  let formatted = substitute(formatted, '>', '\&gt;',   'g')
++  let formatted = substitute(formatted, '"', '\&quot;', 'g')
++  " TODO: Use &apos; for "'"?
++
++  " Replace a "form feed" character with HTML to do a page break
++  let formatted = substitute(formatted, "\x0c", '<hr class="PAGE-BREAK">', 'g')
++
++  " Mangle modelines so Vim doesn't try to use HTML text as a modeline if
++  " editing this file in the future
++  let formatted = substitute(formatted, '\v(\s+%(vim?|ex)):', '\1\&#0058;', 'g')
+ 
+   " Replace double spaces, leading spaces, and trailing spaces if needed
+   if ' ' != s:HtmlSpace
+@@ -265,6 +276,19 @@
+ let s:old_magic = &magic
+ set magic
+ 
++" set the fileencoding to match the charset we'll be using
++let &l:fileencoding=s:settings.vim_encoding
++
++" According to http://www.w3.org/TR/html4/charset.html#doc-char-set, the byte
++" order mark is highly recommend on the web when using multibyte encodings. But,
++" it is not a good idea to include it on UTF-8 files. Otherwise, let Vim
++" determine when it is actually inserted.
++if s:settings.vim_encoding == 'utf-8'
++  setlocal nobomb
++else
++  setlocal bomb
++endif
++
+ let s:lines = []
+ 
+ if s:settings.use_xhtml
+@@ -545,9 +569,6 @@
+       " level, so subtract 2 from index of first non-dash after the dashes
+       " in order to get the fold level of the current fold
+       let s:level = match(foldtextresult(s:lnum), '+-*\zs[^-]') - 2
+-      if s:level+1 > s:foldcolumn
+-	let s:foldcolumn = s:level+1
+-      endif
+       " store fold info for later use
+       let s:newfold = {'firstline': s:lnum, 'lastline': foldclosedend(s:lnum), 'level': s:level,'type': "closed-fold"}
+       call add(s:allfolds, s:newfold)
+@@ -577,9 +598,6 @@
+       " level, so subtract 2 from index of first non-dash after the dashes
+       " in order to get the fold level of the current fold
+       let s:level = match(foldtextresult(s:lnum), '+-*\zs[^-]') - 2
+-      if s:level+1 > s:foldcolumn
+-	let s:foldcolumn = s:level+1
+-      endif
+       let s:newfold = {'firstline': s:lnum, 'lastline': foldclosedend(s:lnum), 'level': s:level,'type': "closed-fold"}
+       " only add the fold if we don't already have it
+       if empty(s:allfolds) || index(s:allfolds, s:newfold) == -1
+@@ -609,6 +627,48 @@
+ 
+   " close all folds again so we can get the fold text as we go
+   silent! %foldclose!
++
++  for afold in s:allfolds
++    let removed = 0
++    if exists("g:html_start_line") && exists("g:html_end_line")
++      if afold.firstline < g:html_start_line
++	if afold.lastline < g:html_end_line && afold.lastline > g:html_start_line
++	  " if a fold starts before the range to convert but stops within the
++	  " range, we need to include it. Make it start on the first converted
++	  " line.
++	  let afold.firstline = g:html_start_line
++	else
++	  " if the fold lies outside the range or the start and stop enclose
++	  " the entire range, don't bother parsing it
++	  call remove(s:allfolds, index(s:allfolds, afold))
++	  let removed = 1
++	endif
++      elseif afold.firstline > g:html_end_line
++	" If the entire fold lies outside the range we need to remove it.
++	call remove(s:allfolds, index(s:allfolds, afold))
++	let removed = 1
++      endif
++    elseif exists("g:html_start_line")
++      if afold.firstline < g:html_start_line
++	" if there is no last line, but there is a first line, the end of the
++	" fold will always lie within the region of interest, so keep it
++	let afold.firstline = g:html_start_line
++      endif
++    elseif exists("g:html_end_line")
++      " if there is no first line we default to the first line in the buffer so
++      " the fold start will always be included if the fold itself is included.
++      " If however the entire fold lies outside the range we need to remove it.
++      if afold.firstline > g:html_end_line
++	call remove(s:allfolds, index(s:allfolds, afold))
++	let removed = 1
++      endif
++    endif
++    if !removed
++      if afold.level+1 > s:foldcolumn
++	let s:foldcolumn = afold.level+1
++      endif
++    endif
++  endfor
+ endif
+ 
+ " Now loop over all lines in the original text to convert to html.
+@@ -656,6 +716,13 @@
+ 
+ let s:foldId = 0
+ 
++if !s:settings.expand_tabs
++  " If keeping tabs, add them to printable characters so we keep them when
++  " formatting text (strtrans() doesn't replace printable chars)
++  let s:old_isprint = &isprint
++  setlocal isprint+=9
++endif
++
+ while s:lnum <= s:end
+ 
+   " If there are filler lines for diff mode, show these above the line.
+@@ -734,7 +801,7 @@
+ 	call remove(s:foldstack, 0)
+       endwhile
+ 
+-      " Now insert an opening any new folds that start on this line
++      " Now insert an opening for any new folds that start on this line
+       let s:firstfold = 1
+       while !empty(s:allfolds) && get(s:allfolds,0).firstline == s:lnum
+ 	let s:foldId = s:foldId + 1
+@@ -871,30 +938,32 @@
+       endif
+ 
+       if s:settings.ignore_conceal || !s:concealinfo[0]
+-	" Expand tabs
++	" Expand tabs if needed
+ 	let s:expandedtab = strpart(s:line, s:startcol - 1, s:col - s:startcol)
+-	let s:offset = 0
+-	let s:idx = stridx(s:expandedtab, "\t")
+-	while s:idx >= 0
+-	  if has("multi_byte_encoding")
+-	    if s:startcol + s:idx == 1
+-	      let s:i = &ts
+-	    else
+-	      if s:idx == 0
+-		let s:prevc = matchstr(s:line, '.\%' . (s:startcol + s:idx + s:offset) . 'c')
++	if s:settings.expand_tabs
++	  let s:offset = 0
++	  let s:idx = stridx(s:expandedtab, "\t")
++	  while s:idx >= 0
++	    if has("multi_byte_encoding")
++	      if s:startcol + s:idx == 1
++		let s:i = &ts
+ 	      else
+-		let s:prevc = matchstr(s:expandedtab, '.\%' . (s:idx + 1) . 'c')
++		if s:idx == 0
++		  let s:prevc = matchstr(s:line, '.\%' . (s:startcol + s:idx + s:offset) . 'c')
++		else
++		  let s:prevc = matchstr(s:expandedtab, '.\%' . (s:idx + 1) . 'c')
++		endif
++		let s:vcol = virtcol([s:lnum, s:startcol + s:idx + s:offset - len(s:prevc)])
++		let s:i = &ts - (s:vcol % &ts)
+ 	      endif
+-	      let s:vcol = virtcol([s:lnum, s:startcol + s:idx + s:offset - len(s:prevc)])
+-	      let s:i = &ts - (s:vcol % &ts)
++	      let s:offset -= s:i - 1
++	    else
++	      let s:i = &ts - ((s:idx + s:startcol - 1) % &ts)
+ 	    endif
+-	    let s:offset -= s:i - 1
+-	  else
+-	    let s:i = &ts - ((s:idx + s:startcol - 1) % &ts)
+-	  endif
+-	  let s:expandedtab = substitute(s:expandedtab, '\t', repeat(' ', s:i), '')
+-	  let s:idx = stridx(s:expandedtab, "\t")
+-	endwhile
++	    let s:expandedtab = substitute(s:expandedtab, '\t', repeat(' ', s:i), '')
++	    let s:idx = stridx(s:expandedtab, "\t")
++	  endwhile
++	end
+ 
+ 	" get the highlight group name to use
+ 	let s:id = synIDtrans(s:id)
+@@ -1060,7 +1129,7 @@
+ " Cleanup
+ %s:\s\+$::e
+ 
+-" Restore old settings
++" Restore old settings (new window first)
+ let &l:foldenable = s:old_fen
+ let &l:foldmethod = s:old_fdm
+ let &report = s:old_report
+@@ -1070,21 +1139,31 @@
+ let &magic = s:old_magic
+ let @/ = s:old_search
+ let &more = s:old_more
++
++" switch to original window to restore those settings
+ exe s:orgwin . "wincmd w"
++
++if !s:settings.expand_tabs
++  let &l:isprint = s:old_isprint
++endif
++let &l:stl = s:origwin_stl
+ let &l:et = s:old_et
+ let &l:scrollbind = s:old_bind
++
++" and back to the new window again to end there
+ exe s:newwin . "wincmd w"
++
++let &l:stl = s:newwin_stl
+ exec 'resize' s:old_winheight
+ let &l:winfixheight = s:old_winfixheight
+ 
+-call setwinvar(s:orgwin,'&stl', s:origwin_stl)
+-call setwinvar(s:newwin,'&stl', s:newwin_stl)
+ let &ls=s:ls
+ 
+ " Save a little bit of memory (worth doing?)
+ unlet s:htmlfont
+ unlet s:old_et s:old_paste s:old_icon s:old_report s:old_title s:old_search
+ unlet s:old_magic s:old_more s:old_fdm s:old_fen s:old_winheight
++unlet! s:old_isprint
+ unlet s:whatterm s:idlist s:lnum s:end s:margin s:fgc s:bgc s:old_winfixheight
+ unlet! s:col s:id s:attr s:len s:line s:new s:expandedtab s:concealinfo
+ unlet! s:orgwin s:newwin s:orgbufnr s:idx s:i s:offset s:ls s:origwin_stl
+diff -u -r --new-file runtime/syntax.orig/d.vim runtime/syntax/d.vim
+--- runtime/syntax.orig/d.vim	2010-05-15 06:03:56.000000000 -0500
++++ runtime/syntax/d.vim	2010-09-22 15:54:05.000000000 -0500
+@@ -1,16 +1,19 @@
+-" Vim syntax file for the D programming language (version 1.053 and 2.039).
++" Vim syntax file for the D programming language (version 1.053 and 2.047).
+ "
+-" Language:	D
+-" Maintainer:	Jason Mills<jasonmills@nf.sympatico.ca>
+-" Last Change:	2010 Jan 07
+-" Version:	0.18
++" Language:     D
++" Maintainer:   Jesse Phillips <Jesse.K.Phillips+D@gmail.com>
++" Last Change:  2010 Sep 21
++" Version:      0.22
+ "
+ " Contributors:
++"   - Jason Mills <jasonmills@nf.sympatico.ca>: original Maintainer
+ "   - Kirk McDonald: version 0.17 updates, with minor modifications
+ "     (http://paste.dprogramming.com/dplmb7qx?view=hidelines)
+-"   - Jesse K. Phillips: patch for some keywords and attributes (annotations), with modifications
+ "   - Tim Keating: patch to fix a bug in highlighting the `\` literal
+ "   - Frank Benoit: Fixed a bug that caused some identifiers and numbers to highlight as octal number errors.
++"   - Shougo Matsushita <Shougo.Matsu@gmail.com>: updates for latest 2.047 highlighting
++"   - Ellery Newcomer: Fixed some highlighting bugs.
++"   - Steven N. Oliver: #! highlighting
+ "
+ " Please email me with bugs, comments, and suggestions.
+ "
+@@ -47,52 +50,89 @@
+ 
+ " Keyword definitions
+ "
+-syn keyword dExternal		import package module extern
+-syn keyword dConditional	if else switch
+-syn keyword dBranch		goto break continue
+-syn keyword dRepeat		while for do foreach foreach_reverse
+-syn keyword dBoolean		true false
+-syn keyword dConstant		null
+-syn keyword dConstant		__FILE__ __LINE__ __EOF__ __VERSION__
+-syn keyword dConstant		__DATE__ __TIME__ __TIMESTAMP__ __VENDOR__
+-
+-syn keyword dTypedef		alias typedef
+-syn keyword dStructure		template interface class struct union
+-syn keyword dEnum		enum
+-syn keyword dOperator		new delete typeof typeid cast align is
+-syn keyword dOperator		this super
++syn keyword dExternal              import package module extern
++syn keyword dConditional           if else switch
++syn keyword dBranch                goto break continue
++syn keyword dRepeat                while for do foreach foreach_reverse
++syn keyword dBoolean               true false
++syn keyword dConstant              null
++syn keyword dConstant              __FILE__ __LINE__ __EOF__ __VERSION__
++syn keyword dConstant              __DATE__ __TIME__ __TIMESTAMP__ __VENDOR__
++syn keyword dTypedef               alias typedef
++syn keyword dStructure             template interface class struct union
++syn keyword dEnum                  enum
++syn keyword dOperator              new delete typeof typeid cast align is
++syn keyword dOperator              this super
+ if exists("d_hl_operator_overload")
+-  syn keyword dOpOverload	opNeg opCom opPostInc opPostDec opCast opAdd opSub opSub_r
+-  syn keyword dOpOverload	opMul opDiv opDiv_r opMod opMod_r opAnd opOr opXor
+-  syn keyword dOpOverload	opShl opShl_r opShr opShr_r opUShr opUShr_r opCat
+-  syn keyword dOpOverload	opCat_r opEquals opEquals opCmp
+-  syn keyword dOpOverload	opAssign opAddAssign opSubAssign opMulAssign opDivAssign
+-  syn keyword dOpOverload	opModAssign opAndAssign opOrAssign opXorAssign
+-  syn keyword dOpOverload	opShlAssign opShrAssign opUShrAssign opCatAssign
+-  syn keyword dOpOverload	opIndex opIndexAssign opCall opSlice opSliceAssign opPos
+-  syn keyword dOpOverload	opAdd_r opMul_r opAnd_r opOr_r opXor_r opIn opIn_r
+-  syn keyword dOpOverload	opPow opDispatch opStar opDot opApply opApplyReverse
++  syn keyword dOpOverload          opNeg opCom opPostInc opPostDec opCast opAdd
++  syn keyword dOpOverload          opSub opSub_r opMul opDiv opDiv_r opMod 
++  syn keyword dOpOverload          opMod_r opAnd opOr opXor opShl opShl_r opShr
++  syn keyword dOpOverload          opShr_r opUShr opUShr_r opCat
++  syn keyword dOpOverload          opCat_r opEquals opEquals opCmp
++  syn keyword dOpOverload          opAssign opAddAssign opSubAssign opMulAssign
++  syn keyword dOpOverload          opDivAssign opModAssign opAndAssign 
++  syn keyword dOpOverload          opOrAssign opXorAssign opShlAssign 
++  syn keyword dOpOverload          opShrAssign opUShrAssign opCatAssign
++  syn keyword dOpOverload          opIndex opIndexAssign opIndexOpAssign
++  syn keyword dOpOverload          opCall opSlice opSliceAssign opSliceOpAssign 
++  syn keyword dOpOverload          opPos opAdd_r opMul_r opAnd_r opOr_r opXor_r
++  syn keyword dOpOverload          opIn opIn_r opPow opDispatch opStar opDot 
++  syn keyword dOpOverload          opApply opApplyReverse
++  syn keyword dOpOverload          opUnary opIndexUnary opSliceUnary
++  syn keyword dOpOverload          opBinary opBinaryRight
+ endif
+-syn keyword dType		ushort int uint long ulong float
+-syn keyword dType		void byte ubyte double bit char wchar ucent cent
+-syn keyword dType		short bool dchar string wstring dstring
+-syn keyword dType		real ireal ifloat idouble creal cfloat cdouble
+-syn keyword dDebug		deprecated unittest
+-syn keyword dExceptions		throw try catch finally
+-syn keyword dScopeDecl		public protected private export
+-syn keyword dStatement		version debug return with
+-syn keyword dStatement		function delegate __traits asm mixin macro
+-syn keyword dStorageClass	in out inout ref lazy scope body
+-syn keyword dStorageClass	pure nothrow
+-syn keyword dStorageClass	auto static override final abstract volatile __gshared __thread
+-syn keyword dStorageClass	synchronized immutable shared const invariant lazy
+-syn keyword dPragma		pragma
++
++syn keyword dType                  void ushort int uint long ulong float
++syn keyword dType                  byte ubyte double bit char wchar ucent cent
++syn keyword dType                  short bool dchar wstring dstring
++syn keyword dType                  real ireal ifloat idouble
++syn keyword dType                  creal cfloat cdouble
++syn keyword dDebug                 deprecated unittest invariant
++syn keyword dExceptions            throw try catch finally
++syn keyword dScopeDecl             public protected private export
++syn keyword dStatement             debug return with
++syn keyword dStatement             function delegate __traits mixin macro
++syn keyword dStorageClass          in out inout ref lazy body
++syn keyword dStorageClass          pure nothrow
++syn keyword dStorageClass          auto static override final abstract volatile
++syn keyword dStorageClass          __gshared __thread
++syn keyword dStorageClass          synchronized shared immutable const lazy
++syn keyword dPragma                pragma
++syn keyword dIdentifier            _arguments _argptr __vptr __monitor _ctor _dtor
++syn keyword dScopeIdentifier       contained exit success failure
++syn keyword dAttribute             contained safe trusted system
++syn keyword dAttribute             contained property disable
++syn keyword dVersionIdentifier     contained DigitalMars GNU LDC LLVM
++syn keyword dVersionIdentifier     contained X86 X86_64 Windows Win32 Win64 
++syn keyword dVersionIdentifier     contained linux Posix OSX FreeBSD
++syn keyword dVersionIdentifier     contained LittleEndian BigEndian D_Coverage
++syn keyword dVersionIdentifier     contained D_Ddoc D_InlineAsm_X86
++syn keyword dVersionIdentifier     contained D_InlineAsm_X86_64 D_LP64 D_PIC
++syn keyword dVersionIdentifier     contained unittest D_Version2 none all
++
++" Highlight the sharpbang
++syn match dSharpBang "\%^#!.*"     display
+ 
+ " Attributes/annotations
+-syn match dAnnotation	"@[_$a-zA-Z][_$a-zA-Z0-9_]*\>"
++syn match dAnnotation	"@[_$a-zA-Z][_$a-zA-Z0-9_]*\>" contains=dAttribute
++
++" Version Identifiers
++syn match dVersion   "[^.]version" nextgroup=dVersionInside
++syn match dVersion   "^version" nextgroup=dVersionInside
++syn match dVersionInside  "([_a-zA-Z][_a-zA-Z0-9]*\>" transparent contained contains=dVersionIdentifier
++
++" Scope StorageClass
++syn match dStorageClass   "scope"
++
++" Scope Identifiers
++syn match dScope	"scope\s*([_a-zA-Z][_a-zA-Z0-9]*\>"he=s+5 contains=dScopeIdentifier
++
++" String is a statement and a module name.
++syn match dType "^string"
++syn match dType "[^.]\s*\<string\>"ms=s+1
+ 
+ " Assert is a statement and a module name.
+-syn match dAssert "^assert\>"
++syn match dAssert "^assert"
+ syn match dAssert "[^.]\s*\<assert\>"ms=s+1
+ 
+ " dTokens is used by the token string highlighting
+@@ -101,26 +141,18 @@
+ syn cluster dTokens add=dType,dDebug,dExceptions,dScopeDecl,dStatement
+ syn cluster dTokens add=dStorageClass,dPragma,dAssert,dAnnotation
+ 
+-" Marks contents of the asm statment body as special
+-"
+-" TODO
+-"syn match dAsmStatement "\<asm\>"
+-"syn region dAsmBody start="asm[\n]*\s*{"hs=e+1 end="}"he=e-1 contains=dAsmStatement
+-"
+-"hi def link dAsmBody dUnicode
+-"hi def link dAsmStatement dStatement
+ 
+ " Labels
+ "
+ " We contain dScopeDecl so public: private: etc. are not highlighted like labels
+ syn match dUserLabel    "^\s*[_$a-zA-Z][_$a-zA-Z0-9_]*\s*:"he=e-1 contains=dLabel,dScopeDecl,dEnum
+-syn keyword dLabel	case default
++syn keyword dLabel      case default
+ 
+ syn cluster dTokens add=dUserLabel,dLabel
+ 
+ " Comments
+ "
+-syn keyword dTodo	contained TODO FIXME TEMP REFACTOR REVIEW HACK BUG XXX
++syn keyword dTodo                                                                contained TODO FIXME TEMP REFACTOR REVIEW HACK BUG XXX
+ syn match dCommentStar	contained "^\s*\*[^/]"me=e-1
+ syn match dCommentStar	contained "^\s*\*$"
+ syn match dCommentPlus	contained "^\s*+[^/]"me=e-1
+@@ -251,51 +283,184 @@
+ 
+ " The default highlighting.
+ "
+-hi def link dBinary		Number
+-hi def link dDec		Number
+-hi def link dHex		Number
+-hi def link dOctal		Number
+-hi def link dFloat		Float
+-hi def link dHexFloat		Float
+-hi def link dDebug		Debug
+-hi def link dBranch		Conditional
+-hi def link dConditional	Conditional
+-hi def link dLabel		Label
+-hi def link dUserLabel		Label
+-hi def link dRepeat		Repeat
+-hi def link dExceptions		Exception
+-hi def link dAssert		Statement
+-hi def link dStatement		Statement
+-hi def link dScopeDecl		dStorageClass
+-hi def link dStorageClass	StorageClass
+-hi def link dBoolean		Boolean
+-hi def link dUnicode		Special
+-hi def link dTokenStringBrack	String
+-hi def link dHereString		String
+-hi def link dNestString		String
+-hi def link dDelimString	String
+-hi def link dRawString		String
+-hi def link dString		String
+-hi def link dHexString		String
+-hi def link dCharacter		Character
+-hi def link dEscSequence	SpecialChar
+-hi def link dSpecialCharError	Error
+-hi def link dOctalError		Error
+-hi def link dOperator		Operator
+-hi def link dOpOverload		Identifier
+-hi def link dConstant		Constant
+-hi def link dTypedef		Typedef
+-hi def link dEnum		Structure
+-hi def link dStructure		Structure
+-hi def link dTodo		Todo
+-hi def link dType		Type
+-hi def link dLineComment	Comment
+-hi def link dBlockComment	Comment
+-hi def link dNestedComment	Comment
+-hi def link dExternal		Include
+-hi def link dPragma		PreProc
+-hi def link dAnnotation		PreProc
++hi def link dBinary              Number
++hi def link dDec                 Number
++hi def link dHex                 Number
++hi def link dOctal               Number
++hi def link dFloat               Float
++hi def link dHexFloat            Float
++hi def link dDebug               Debug
++hi def link dBranch              Conditional
++hi def link dConditional         Conditional
++hi def link dLabel               Label
++hi def link dUserLabel           Label
++hi def link dRepeat              Repeat
++hi def link dExceptions          Exception
++hi def link dAssert              Statement
++hi def link dStatement           Statement
++hi def link dScopeDecl           dStorageClass
++hi def link dStorageClass        StorageClass
++hi def link dBoolean             Boolean
++hi def link dUnicode             Special
++hi def link dTokenStringBrack    String
++hi def link dHereString          String
++hi def link dNestString          String
++hi def link dDelimString         String
++hi def link dRawString           String
++hi def link dString              String
++hi def link dHexString           String
++hi def link dCharacter           Character
++hi def link dEscSequence         SpecialChar
++hi def link dSpecialCharError    Error
++hi def link dOctalError          Error
++hi def link dOperator            Operator
++hi def link dOpOverload          Identifier
++hi def link dConstant            Constant
++hi def link dTypedef             Typedef
++hi def link dEnum                Structure
++hi def link dStructure           Structure
++hi def link dTodo                Todo
++hi def link dType                Type
++hi def link dLineComment         Comment
++hi def link dBlockComment        Comment
++hi def link dNestedComment       Comment
++hi def link dExternal            Include
++hi def link dPragma              PreProc
++hi def link dAnnotation          PreProc
++hi def link dSharpBang           PreProc
++hi def link dAttribute           StorageClass
++hi def link dIdentifier          Identifier
++hi def link dVersionIdentifier   Identifier
++hi def link dVersion             dStatement
++hi def link dScopeIdentifier     dStatement
++hi def link dScope               dStorageClass
+ 
+ let b:current_syntax = "d"
+ 
+-" vim: ts=8 noet
++" Marks contents of the asm statment body as special
++
++syn match dAsmStatement "\<asm\>"
++syn region dAsmBody start="asm[\n]*\s*{"hs=e+1 end="}"he=e-1 contains=dAsmStatement,dAsmOpCode
++
++hi def link dAsmBody dUnicode
++hi def link dAsmStatement dStatement
++hi def link dAsmOpCode Identifier
++
++syn keyword dAsmOpCode contained	aaa  	aad  	aam  	aas  	adc
++syn keyword dAsmOpCode contained	add 	addpd 	addps 	addsd 	addss
++syn keyword dAsmOpCode contained	and 	andnpd 	andnps 	andpd 	andps
++syn keyword dAsmOpCode contained	arpl 	bound 	bsf 	bsr 	bswap
++syn keyword dAsmOpCode contained	bt 	btc 	btr 	bts 	call
++syn keyword dAsmOpCode contained	cbw 	cdq 	clc 	cld 	clflush
++syn keyword dAsmOpCode contained	cli 	clts 	cmc 	cmova 	cmovae
++syn keyword dAsmOpCode contained	cmovb 	cmovbe 	cmovc 	cmove 	cmovg
++syn keyword dAsmOpCode contained	cmovge 	cmovl 	cmovle 	cmovna 	cmovnae
++syn keyword dAsmOpCode contained	cmovnb 	cmovnbe 	cmovnc 	cmovne 	cmovng
++syn keyword dAsmOpCode contained	cmovnge 	cmovnl 	cmovnle 	cmovno 	cmovnp
++syn keyword dAsmOpCode contained	cmovns 	cmovnz 	cmovo 	cmovp 	cmovpe
++syn keyword dAsmOpCode contained	cmovpo 	cmovs 	cmovz 	cmp 	cmppd
++syn keyword dAsmOpCode contained	cmpps 	cmps 	cmpsb 	cmpsd 	cmpss
++syn keyword dAsmOpCode contained	cmpsw 	cmpxch8b 	cmpxchg 	comisd 	comiss
++syn keyword dAsmOpCode contained	cpuid 	cvtdq2pd 	cvtdq2ps 	cvtpd2dq 	cvtpd2pi
++syn keyword dAsmOpCode contained	cvtpd2ps 	cvtpi2pd 	cvtpi2ps 	cvtps2dq 	cvtps2pd
++syn keyword dAsmOpCode contained	cvtps2pi 	cvtsd2si 	cvtsd2ss 	cvtsi2sd 	cvtsi2ss
++syn keyword dAsmOpCode contained	cvtss2sd 	cvtss2si 	cvttpd2dq 	cvttpd2pi 	cvttps2dq
++syn keyword dAsmOpCode contained	cvttps2pi 	cvttsd2si 	cvttss2si 	cwd 	cwde
++syn keyword dAsmOpCode contained	da 	daa 	das 	db 	dd
++syn keyword dAsmOpCode contained	de 	dec 	df 	di 	div
++syn keyword dAsmOpCode contained	divpd 	divps 	divsd 	divss 	dl
++syn keyword dAsmOpCode contained	dq 	ds 	dt 	dw 	emms
++syn keyword dAsmOpCode contained	enter 	f2xm1 	fabs 	fadd 	faddp
++syn keyword dAsmOpCode contained	fbld 	fbstp 	fchs 	fclex 	fcmovb
++syn keyword dAsmOpCode contained	fcmovbe 	fcmove 	fcmovnb 	fcmovnbe 	fcmovne
++syn keyword dAsmOpCode contained	fcmovnu 	fcmovu 	fcom 	fcomi 	fcomip
++syn keyword dAsmOpCode contained	fcomp 	fcompp 	fcos 	fdecstp 	fdisi
++syn keyword dAsmOpCode contained	fdiv 	fdivp 	fdivr 	fdivrp 	feni
++syn keyword dAsmOpCode contained	ffree 	fiadd 	ficom 	ficomp 	fidiv
++syn keyword dAsmOpCode contained	fidivr 	fild 	fimul 	fincstp 	finit
++syn keyword dAsmOpCode contained	fist 	fistp 	fisub 	fisubr 	fld
++syn keyword dAsmOpCode contained	fld1 	fldcw 	fldenv 	fldl2e 	fldl2t
++syn keyword dAsmOpCode contained	fldlg2 	fldln2 	fldpi 	fldz 	fmul
++syn keyword dAsmOpCode contained	fmulp 	fnclex 	fndisi 	fneni 	fninit
++syn keyword dAsmOpCode contained	fnop 	fnsave 	fnstcw 	fnstenv 	fnstsw
++syn keyword dAsmOpCode contained	fpatan 	fprem 	fprem1 	fptan 	frndint
++syn keyword dAsmOpCode contained	frstor 	fsave 	fscale 	fsetpm 	fsin
++syn keyword dAsmOpCode contained	fsincos 	fsqrt 	fst 	fstcw 	fstenv
++syn keyword dAsmOpCode contained	fstp 	fstsw 	fsub 	fsubp 	fsubr
++syn keyword dAsmOpCode contained	fsubrp 	ftst 	fucom 	fucomi 	fucomip
++syn keyword dAsmOpCode contained	fucomp 	fucompp 	fwait 	fxam 	fxch
++syn keyword dAsmOpCode contained	fxrstor 	fxsave 	fxtract 	fyl2x 	fyl2xp1
++syn keyword dAsmOpCode contained	hlt 	idiv 	imul 	in 	inc
++syn keyword dAsmOpCode contained	ins 	insb 	insd 	insw 	int
++syn keyword dAsmOpCode contained	into 	invd 	invlpg 	iret 	iretd
++syn keyword dAsmOpCode contained	ja 	jae 	jb 	jbe 	jc
++syn keyword dAsmOpCode contained	jcxz 	je 	jecxz 	jg 	jge
++syn keyword dAsmOpCode contained	jl 	jle 	jmp 	jna 	jnae
++syn keyword dAsmOpCode contained	jnb 	jnbe 	jnc 	jne 	jng
++syn keyword dAsmOpCode contained	jnge 	jnl 	jnle 	jno 	jnp
++syn keyword dAsmOpCode contained	jns 	jnz 	jo 	jp 	jpe
++syn keyword dAsmOpCode contained	jpo 	js 	jz 	lahf 	lar
++syn keyword dAsmOpCode contained	ldmxcsr 	lds 	lea 	leave 	les
++syn keyword dAsmOpCode contained	lfence 	lfs 	lgdt 	lgs 	lidt
++syn keyword dAsmOpCode contained	lldt 	lmsw 	lock 	lods 	lodsb
++syn keyword dAsmOpCode contained	lodsd 	lodsw 	loop 	loope 	loopne
++syn keyword dAsmOpCode contained	loopnz 	loopz 	lsl 	lss 	ltr
++syn keyword dAsmOpCode contained	maskmovdqu 	maskmovq 	maxpd 	maxps 	maxsd
++syn keyword dAsmOpCode contained	maxss 	mfence 	minpd 	minps 	minsd
++syn keyword dAsmOpCode contained	minss 	mov 	movapd 	movaps 	movd
++syn keyword dAsmOpCode contained	movdq2q 	movdqa 	movdqu 	movhlps 	movhpd
++syn keyword dAsmOpCode contained	movhps 	movlhps 	movlpd 	movlps 	movmskpd
++syn keyword dAsmOpCode contained	movmskps 	movntdq 	movnti 	movntpd 	movntps
++syn keyword dAsmOpCode contained	movntq 	movq 	movq2dq 	movs 	movsb
++syn keyword dAsmOpCode contained	movsd 	movss 	movsw 	movsx 	movupd
++syn keyword dAsmOpCode contained	movups 	movzx 	mul 	mulpd 	mulps
++syn keyword dAsmOpCode contained	mulsd 	mulss 	neg 	nop 	not
++syn keyword dAsmOpCode contained	or 	orpd 	orps 	out 	outs
++syn keyword dAsmOpCode contained	outsb 	outsd 	outsw 	packssdw 	packsswb
++syn keyword dAsmOpCode contained	packuswb 	paddb 	paddd 	paddq 	paddsb
++syn keyword dAsmOpCode contained	paddsw 	paddusb 	paddusw 	paddw 	pand
++syn keyword dAsmOpCode contained	pandn 	pavgb 	pavgw 	pcmpeqb 	pcmpeqd
++syn keyword dAsmOpCode contained	pcmpeqw 	pcmpgtb 	pcmpgtd 	pcmpgtw 	pextrw
++syn keyword dAsmOpCode contained	pinsrw 	pmaddwd 	pmaxsw 	pmaxub 	pminsw
++syn keyword dAsmOpCode contained	pminub 	pmovmskb 	pmulhuw 	pmulhw 	pmullw
++syn keyword dAsmOpCode contained	pmuludq 	pop 	popa 	popad 	popf
++syn keyword dAsmOpCode contained	popfd 	por 	prefetchnta 	prefetcht0 	prefetcht1
++syn keyword dAsmOpCode contained	prefetcht2 	psadbw 	pshufd 	pshufhw 	pshuflw
++syn keyword dAsmOpCode contained	pshufw 	pslld 	pslldq 	psllq 	psllw
++syn keyword dAsmOpCode contained	psrad 	psraw 	psrld 	psrldq 	psrlq
++syn keyword dAsmOpCode contained	psrlw 	psubb 	psubd 	psubq 	psubsb
++syn keyword dAsmOpCode contained	psubsw 	psubusb 	psubusw 	psubw 	punpckhbw
++syn keyword dAsmOpCode contained	punpckhdq 	punpckhqdq 	punpckhwd 	punpcklbw 	punpckldq
++syn keyword dAsmOpCode contained	punpcklqdq 	punpcklwd 	push 	pusha 	pushad
++syn keyword dAsmOpCode contained	pushf 	pushfd 	pxor 	rcl 	rcpps
++syn keyword dAsmOpCode contained	rcpss 	rcr 	rdmsr 	rdpmc 	rdtsc
++syn keyword dAsmOpCode contained	rep 	repe 	repne 	repnz 	repz
++syn keyword dAsmOpCode contained	ret 	retf 	rol 	ror 	rsm
++syn keyword dAsmOpCode contained	rsqrtps 	rsqrtss 	sahf 	sal 	sar
++syn keyword dAsmOpCode contained	sbb 	scas 	scasb 	scasd 	scasw
++syn keyword dAsmOpCode contained	seta 	setae 	setb 	setbe 	setc
++syn keyword dAsmOpCode contained	sete 	setg 	setge 	setl 	setle
++syn keyword dAsmOpCode contained	setna 	setnae 	setnb 	setnbe 	setnc
++syn keyword dAsmOpCode contained	setne 	setng 	setnge 	setnl 	setnle
++syn keyword dAsmOpCode contained	setno 	setnp 	setns 	setnz 	seto
++syn keyword dAsmOpCode contained	setp 	setpe 	setpo 	sets 	setz
++syn keyword dAsmOpCode contained	sfence 	sgdt 	shl 	shld 	shr
++syn keyword dAsmOpCode contained	shrd 	shufpd 	shufps 	sidt 	sldt
++syn keyword dAsmOpCode contained	smsw 	sqrtpd 	sqrtps 	sqrtsd 	sqrtss
++syn keyword dAsmOpCode contained	stc 	std 	sti 	stmxcsr 	stos
++syn keyword dAsmOpCode contained	stosb 	stosd 	stosw 	str 	sub
++syn keyword dAsmOpCode contained	subpd 	subps 	subsd 	subss 	sysenter
++syn keyword dAsmOpCode contained	sysexit 	test 	ucomisd 	ucomiss 	ud2
++syn keyword dAsmOpCode contained	unpckhpd 	unpckhps 	unpcklpd 	unpcklps 	verr
++syn keyword dAsmOpCode contained	verw 	wait 	wbinvd 	wrmsr 	xadd
++syn keyword dAsmOpCode contained	xchg 	xlat 	xlatb 	xor 	xorpd
++syn keyword dAsmOpCode contained	xorps 				
++syn keyword dAsmOpCode contained	addsubpd 	addsubps 	fisttp 	haddpd 	haddps
++syn keyword dAsmOpCode contained	hsubpd 	hsubps 	lddqu 	monitor 	movddup
++syn keyword dAsmOpCode contained	movshdup 	movsldup 	mwait 		
++syn keyword dAsmOpCode contained	pavgusb 	pf2id 	pfacc 	pfadd 	pfcmpeq
++syn keyword dAsmOpCode contained	pfcmpge 	pfcmpgt 	pfmax 	pfmin 	pfmul
++syn keyword dAsmOpCode contained	pfnacc 	pfpnacc 	pfrcp 	pfrcpit1 	pfrcpit2
++syn keyword dAsmOpCode contained	pfrsqit1 	pfrsqrt 	pfsub 	pfsubr 	pi2fd
++syn keyword dAsmOpCode contained	pmulhrw 	pswapd
++
+diff -u -r --new-file runtime/syntax.orig/debchangelog.vim runtime/syntax/debchangelog.vim
+--- runtime/syntax.orig/debchangelog.vim	2010-05-15 06:03:56.000000000 -0500
++++ runtime/syntax/debchangelog.vim	2011-01-08 08:32:57.000000000 -0600
+@@ -3,8 +3,8 @@
+ " Maintainer:  Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
+ " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
+ "                     Wichert Akkerman <wakkerma@debian.org>
+-" Last Change: 2010 May 06
+-" URL: http://hg.debian.org/hg/pkg-vim/vim/raw-file/tip/runtime/syntax/debchangelog.vim
++" Last Change: 2010 Oct 21
++" URL: http://hg.debian.org/hg/pkg-vim/vim/raw-file/unstable/runtime/syntax/debchangelog.vim
+ 
+ " Standard syntax initialization
+ if version < 600
+@@ -19,7 +19,7 @@
+ " Define some common expressions we can use later on
+ syn match debchangelogName	contained "^[[:alnum:]][[:alnum:].+-]\+ "
+ syn match debchangelogUrgency	contained "; urgency=\(low\|medium\|high\|critical\|emergency\)\( \S.*\)\="
+-syn match debchangelogTarget	contained "\v %(frozen|unstable|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|%(etch|lenny)-%(backports|volatile)|%(dapper|hardy|jaunty|karmic|lucid|maverick)%(-%(security|proposed|updates|backports|commercial|partner))=)+"
++syn match debchangelogTarget	contained "\v %(frozen|unstable|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|%(lenny|squeeze)-%(backports%(-sloppy)=|volatile)|%(dapper|hardy|jaunty|karmic|lucid|maverick|natty)%(-%(security|proposed|updates|backports|commercial|partner))=)+"
+ syn match debchangelogVersion	contained "(.\{-})"
+ syn match debchangelogCloses	contained "closes:\_s*\(bug\)\=#\=\_s\=\d\+\(,\_s*\(bug\)\=#\=\_s\=\d\+\)*"
+ syn match debchangelogLP	contained "\clp:\s\+#\d\+\(,\s*#\d\+\)*"
+diff -u -r --new-file runtime/syntax.orig/debcontrol.vim runtime/syntax/debcontrol.vim
+--- runtime/syntax.orig/debcontrol.vim	2010-05-15 06:03:57.000000000 -0500
++++ runtime/syntax/debcontrol.vim	2011-01-08 08:40:13.000000000 -0600
+@@ -3,8 +3,8 @@
+ " Maintainer:  Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
+ " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
+ "                     Wichert Akkerman <wakkerma@debian.org>
+-" Last Change: 2009 Aug 17
+-" URL: http://hg.debian.org/hg/pkg-vim/vim/raw-file/tip/runtime/syntax/debcontrol.vim
++" Last Change: 2010 Oct 21
++" URL: http://hg.debian.org/hg/pkg-vim/vim/raw-file/unstable/runtime/syntax/debcontrol.vim
+ 
+ " Standard syntax initialization
+ if version < 600
+@@ -27,7 +27,7 @@
+ syn match debcontrolArchitecture contained "\%(all\|any\|alpha\|amd64\|arm\%(e[bl]\)\=\|avr32\|hppa\|i386\|ia64\|lpia\|m32r\|m68k\|mips\%(el\)\=\|powerpc\|ppc64\|s390x\=\|sh[34]\(eb\)\=\|sh\|sparc\%(64\)\=\|hurd-i386\|kfreebsd-\%(i386\|amd64\|gnu\)\|knetbsd-i386\|kopensolaris-i386\|netbsd-\%(alpha\|i386\)\)"
+ syn match debcontrolName contained "[a-z0-9][a-z0-9+.-]\+"
+ syn match debcontrolPriority contained "\(extra\|important\|optional\|required\|standard\)"
+-syn match debcontrolSection contained "\v((contrib|non-free|non-US/main|non-US/contrib|non-US/non-free|restricted|universe|multiverse)/)?(admin|cli-mono|comm|database|debian-installer|debug|devel|doc|editors|electronics|embedded|fonts|games|gnome|gnustep|gnu-r|graphics|hamradio|haskell|httpd|interpreters|java|kde|kernel|libs|libdevel|lisp|localization|mail|math|misc|net|news|ocaml|oldlibs|otherosfs|perl|php|python|ruby|science|shells|sound|text|tex|utils|vcs|video|web|x11|xfce|zope)"
++syn match debcontrolSection contained "\v((contrib|non-free|non-US/main|non-US/contrib|non-US/non-free|restricted|universe|multiverse)/)?(admin|cli-mono|comm|database|debian-installer|debug|devel|doc|editors|electronics|embedded|fonts|games|gnome|gnustep|gnu-r|graphics|hamradio|haskell|httpd|interpreters|java|kde|kernel|libs|libdevel|lisp|localization|mail|math|metapackages|misc|net|news|ocaml|oldlibs|otherosfs|perl|php|python|ruby|science|shells|sound|text|tex|utils|vcs|video|web|x11|xfce|zope)"
+ syn match debcontrolPackageType contained "u\?deb"
+ syn match debcontrolVariable contained "\${.\{-}}"
+ syn match debcontrolDmUpload contained "\cyes"
+diff -u -r --new-file runtime/syntax.orig/debsources.vim runtime/syntax/debsources.vim
+--- runtime/syntax.orig/debsources.vim	2010-05-15 06:03:57.000000000 -0500
++++ runtime/syntax/debsources.vim	2011-01-08 08:35:02.000000000 -0600
+@@ -2,8 +2,8 @@
+ " Language:     Debian sources.list
+ " Maintainer:   Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
+ " Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl>
+-" Last Change: 2010 May 06
+-" URL: http://hg.debian.org/hg/pkg-vim/vim/raw-file/tip/runtime/syntax/debsources.vim
++" Last Change: 2010 Oct 21
++" URL: http://hg.debian.org/hg/pkg-vim/vim/raw-file/unstable/runtime/syntax/debsources.vim
+ 
+ " Standard syntax initialization
+ if version < 600
+@@ -23,7 +23,7 @@
+ 
+ " Match uri's
+ syn match debsourcesUri            +\(http://\|ftp://\|[rs]sh://\|debtorrent://\|\(cdrom\|copy\|file\):\)[^' 	<>"]\++
+-syn match debsourcesDistrKeyword   +\([[:alnum:]_./]*\)\(etch\|lenny\|squeeze\|\(old\)\=stable\|testing\|unstable\|sid\|rc-buggy\|experimental\|dapper\|hardy\|jaunty\|karmic\|lucid\|maverick\)\([-[:alnum:]_./]*\)+
++syn match debsourcesDistrKeyword   +\([[:alnum:]_./]*\)\(lenny\|squeeze\|\(old\)\=stable\|testing\|unstable\|sid\|rc-buggy\|experimental\|dapper\|hardy\|jaunty\|karmic\|lucid\|maverick\|natty\)\([-[:alnum:]_./]*\)+
+ 
+ " Associate our matches and regions with pretty colours
+ hi def link debsourcesLine            Error
+diff -u -r --new-file runtime/syntax.orig/falcon.vim runtime/syntax/falcon.vim
+--- runtime/syntax.orig/falcon.vim	1969-12-31 18:00:00.000000000 -0600
++++ runtime/syntax/falcon.vim	2011-01-08 08:23:05.000000000 -0600
+@@ -0,0 +1,155 @@
++" Vim syntax file
++" Language:     Falcon
++" Maintainer:   Steven Oliver <oliver.steven@gmail.com>
++" Website:      http://github.com/steveno/vim-files/blob/master/syntax/falcon.vim
++" Credits:      Thanks the ruby.vim authors, I borrowed a lot!
++" -------------------------------------------------------------------------------
++" GetLatestVimScripts: 2745 1 :AutoInstall: falcon.vim
++
++" When wanted, highlight the trailing whitespace.
++if exists("c_space_errors")
++    if !exists("c_no_trail_space_error")
++        syn match falconSpaceError "\s\+$"
++    endif
++
++    if !exists("c_no_tab_space_error")
++        syn match falconSpaceError " \+\t"me=e-1
++    endif
++endif
++
++" Symbols
++syn match falconSymbol "\(;\|,\|\.\)"
++syn match falconSymbolOther "\(#\|@\)" display
++
++" Operators
++syn match falconOperator "\(+\|-\|\*\|/\|=\|<\|>\|\*\*\|!=\|\~=\)"
++syn match falconOperator "\(<=\|>=\|=>\|\.\.\|<<\|>>\|\"\)"
++
++" Clusters
++syn region falconSymbol start="[]})\"':]\@<!:\"" end="\"" skip="\\\\\|\\\"" contains=@falconStringSpecial fold
++syn case match
++
++" Keywords
++syn keyword falconKeyword all allp any anyp as attributes brigade cascade catch choice class const
++syn keyword falconKeyword continue def directive do list dropping enum eq eval exit export from function
++syn keyword falconKeyword give global has hasnt in init innerfunc lambda launch launch len List list
++syn keyword falconKeyword load notin object pass print printl provides raise return self sender static to
++syn keyword falconKeyword try xamp
++
++" Error Type Keywords
++syn keyword falconKeyword CloneError CodeError Error InterruprtedError IoError MathError
++syn keyword falconKeyword ParamError RangeError SyntaxError TraceStep TypeError
++
++" Todo
++syn keyword falconTodo DEBUG FIXME NOTE TODO XXX
++
++" Conditionals
++syn keyword falconConditional and case default else end if iff
++syn keyword falconConditional elif or not switch select
++syn match   falconConditional "end\s\if"
++
++" Loops
++syn keyword falconRepeat break for loop forfirst forlast formiddle while
++
++" Booleans
++syn keyword falconBool true false
++
++" Constants
++syn keyword falconConst PI E nil
++
++" Comments
++syn match falconCommentSkip contained "^\s*\*\($\|\s\+\)"
++syn region falconComment start="/\*" end="\*/" contains=@falconCommentGroup,falconSpaceError,falconTodo
++syn region falconCommentL start="//" end="$" keepend contains=@falconCommentGroup,falconSpaceError,falconTodo
++syn match falconSharpBang "\%^#!.*" display
++syn sync ccomment falconComment
++
++" Numbers
++syn match falconNumbers transparent "\<[+-]\=\d\|[+-]\=\.\d" contains=falconIntLiteral,falconFloatLiteral,falconHexadecimal,falconOctal
++syn match falconNumbersCom contained transparent "\<[+-]\=\d\|[+-]\=\.\d" contains=falconIntLiteral,falconFloatLiteral,falconHexadecimal,falconOctal
++syn match falconHexadecimal contained "\<0x\x\+\>"
++syn match falconOctal contained "\<0\o\+\>"
++syn match falconIntLiteral contained "[+-]\<d\+\(\d\+\)\?\>"
++syn match falconFloatLiteral contained "[+-]\=\d\+\.\d*"
++syn match falconFloatLiteral contained "[+-]\=\d*\.\d*"
++
++" Includes
++syn keyword falconInclude load import
++
++" Expression Substitution and Backslash Notation
++syn match falconStringEscape "\\\\\|\\[abefnrstv]\|\\\o\{1,3}\|\\x\x\{1,2}" contained display
++syn match falconStringEscape "\%(\\M-\\C-\|\\C-\\M-\|\\M-\\c\|\\c\\M-\|\\c\|\\C-\|\\M-\)\%(\\\o\{1,3}\|\\x\x\{1,2}\|\\\=\S\)" contained display
++syn region falconSymbol start="[]})\"':]\@<!:\"" end="\"" skip="\\\\\|\\\"" contains=falconStringEscape fold
++
++" Normal String and Shell Command Output
++syn region falconString matchgroup=falconStringDelimiter start="\"" end="\"" skip="\\\\\|\\\"" contains=falconStringEscape fold
++syn region falconString matchgroup=falconStringDelimiter start="'" end="'" skip="\\\\\|\\'" fold
++syn region falconString matchgroup=falconStringDelimiter start="`" end="`" skip="\\\\\|\\`" contains=falconStringEscape fold
++
++" Generalized Single Quoted String, Symbol and Array of Strings
++syn region falconString matchgroup=falconStringDelimiter start="%[qw]\z([~`!@#$%^&*_\-+=|\:;"',.?/]\)"  end="\z1" skip="\\\\\|\\\z1" fold
++syn region falconString matchgroup=falconStringDelimiter start="%[qw]{" end="}" skip="\\\\\|\\}" fold contains=falconDelimEscape
++syn region falconString matchgroup=falconStringDelimiter start="%[qw]<" end=">" skip="\\\\\|\\>" fold contains=falconDelimEscape
++syn region falconString matchgroup=falconStringDelimiter start="%[qw]\[" end="\]" skip="\\\\\|\\\]" fold contains=falconDelimEscape
++syn region falconString matchgroup=falconStringDelimiter start="%[qw](" end=")" skip="\\\\\|\\)" fold contains=falconDelimEscape
++syn region falconSymbol matchgroup=falconSymbolDelimiter start="%[s]\z([~`!@#$%^&*_\-+=|\:;"',.?/]\)" end="\z1" skip="\\\\\|\\\z1" fold
++syn region falconSymbol matchgroup=falconSymbolDelimiter start="%[s]{" end="}" skip="\\\\\|\\}" fold contains=falconDelimEscape
++syn region falconSymbol matchgroup=falconSymbolDelimiter start="%[s]<" end=">" skip="\\\\\|\\>" fold contains=falconDelimEscape
++syn region falconSymbol matchgroup=falconSymbolDelimiter start="%[s]\[" end="\]" skip="\\\\\|\\\]" fold contains=falconDelimEscape
++syn region falconSymbol matchgroup=falconSymbolDelimiter start="%[s](" end=")" skip="\\\\\|\\)" fold contains=falconDelimEscape
++
++" Generalized Double Quoted String and Array of Strings and Shell Command Output
++syn region falconString matchgroup=falconStringDelimiter start="%\z([~`!@#$%^&*_\-+|\:;"',.?/]\)" end="\z1" skip="\\\\\|\\\z1" contains=falconStringEscape fold
++syn region falconString matchgroup=falconStringDelimiter start="%[QWx]\z([~`!@#$%^&*_\-+=|\:;"',.?/]\)" end="\z1" skip="\\\\\|\\\z1" contains=falconStringEscape fold
++syn region falconString matchgroup=falconStringDelimiter start="%[QWx]\={" end="}" skip="\\\\\|\\}" contains=falconStringEscape,falconDelimEscape fold
++syn region falconString matchgroup=falconStringDelimiter start="%[QWx]\=<" end=">" skip="\\\\\|\\>" contains=falconStringEscape,falconDelimEscape fold
++syn region falconString matchgroup=falconStringDelimiter start="%[QWx]\=\[" end="\]" skip="\\\\\|\\\]" contains=falconStringEscape,falconDelimEscape fold
++syn region falconString matchgroup=falconStringDelimiter start="%[QWx]\=(" end=")" skip="\\\\\|\\)" contains=falconStringEscape,falconDelimEscape fold
++
++syn region falconString start=+\%(\%(class\s*\|\%([]})"'.]\|::\)\)\_s*\|\w\)\@<!<<\z(\h\w*\)\ze+hs=s+2 matchgroup=falconStringDelimiter end=+^\z1$+ contains=falconStringEscape fold keepend
++syn region falconString start=+\%(\%(class\s*\|\%([]})"'.]\|::\)\)\_s*\|\w\)\@<!<<"\z([^"]*\)"\ze+hs=s+2  matchgroup=falconStringDelimiter end=+^\z1$+ contains=falconStringEscape fold keepend
++syn region falconString start=+\%(\%(class\s*\|\%([]})"'.]\|::\)\)\_s*\|\w\)\@<!<<'\z([^']*\)'\ze+hs=s+2  matchgroup=falconStringDelimiter end=+^\z1$+ fold keepend
++syn region falconString start=+\%(\%(class\s*\|\%([]})"'.]\|::\)\)\_s*\|\w\)\@<!<<`\z([^`]*\)`\ze+hs=s+2  matchgroup=falconStringDelimiter end=+^\z1$+ contains=falconStringEscape fold keepend
++
++syn region falconString start=+\%(\%(class\s*\|\%([]}).]\|::\)\)\_s*\|\w\)\@<!<<-\z(\h\w*\)\ze+hs=s+3 matchgroup=falconStringDelimiter end=+^\s*\zs\z1$+ contains=falconStringEscape fold keepend
++syn region falconString start=+\%(\%(class\s*\|\%([]}).]\|::\)\)\_s*\|\w\)\@<!<<-"\z([^"]*\)"\ze+hs=s+3  matchgroup=falconStringDelimiter end=+^\s*\zs\z1$+ contains=falconStringEscape fold keepend
++syn region falconString start=+\%(\%(class\s*\|\%([]}).]\|::\)\)\_s*\|\w\)\@<!<<-'\z([^']*\)'\ze+hs=s+3  matchgroup=falconStringDelimiter end=+^\s*\zs\z1$+ fold keepend
++syn region falconString start=+\%(\%(class\s*\|\%([]}).]\|::\)\)\_s*\|\w\)\@<!<<-`\z([^`]*\)`\ze+hs=s+3  matchgroup=falconStringDelimiter end=+^\s*\zs\z1$+ contains=falconStringEscape fold keepend
++
++" Syntax Synchronizing
++syn sync minlines=10 maxlines=100
++
++" Define the default highlighting
++if !exists("did_falcon_syn_inits")
++    command -nargs=+ HiLink hi def link <args>
++
++    HiLink falconKeyword          Keyword
++    HiLink falconCommentString    String
++    HiLink falconTodo             Todo
++    HiLink falconConditional      Keyword
++    HiLink falconRepeat           Repeat
++    HiLink falconcommentSkip      Comment
++    HiLink falconComment          Comment
++    HiLink falconCommentL         Comment
++    HiLink falconConst            Constant
++    HiLink falconOperator         Operator
++    HiLink falconSymbol           Normal
++    HiLink falconSpaceError       Error
++    HiLink falconHexadecimal      Number
++    HiLink falconOctal            Number
++    HiLink falconIntLiteral       Number
++    HiLink falconFloatLiteral     Float
++    HiLink falconStringEscape     Special
++    HiLink falconStringDelimiter  Delimiter
++    HiLink falconString           String
++    HiLink falconBool             Constant
++    HiLink falconSharpBang        PreProc
++    HiLink falconInclude          Include
++    HiLink falconSymbol           Constant
++    HiLink falconSymbolOther      Delimiter
++    delcommand HiLink
++endif
++
++let b:current_syntax = "falcon"
++
++" vim: set sw=4 sts=4 et tw=80 :
+diff -u -r --new-file runtime/syntax.orig/gpg.vim runtime/syntax/gpg.vim
+--- runtime/syntax.orig/gpg.vim	2010-05-15 06:03:56.000000000 -0500
++++ runtime/syntax/gpg.vim	2011-01-08 08:36:35.000000000 -0600
+@@ -1,7 +1,7 @@
+ " Vim syntax file
+ " Language:         gpg(1) configuration file
+ " Maintainer:       Nikolai Weibull <now@bitwi.se>
+-" Latest Revision:  2007-06-17
++" Latest Revision:  2010-10-14
+ 
+ if exists("b:current_syntax")
+   finish
+@@ -54,7 +54,7 @@
+                         \ personal-digest-preferences photo-viewer
+                         \ recipient s2k-cipher-algo s2k-digest-algo s2k-mode
+                         \ secret-keyring set-filename set-policy-url status-fd
+-                        \ trusted-key verify-options
++                        \ trusted-key verify-options keyid-format list-options
+ syn keyword gpgOption   contained skipwhite nextgroup=gpgArgError
+                         \ allow-freeform-uid allow-non-selfsigned-uid
+                         \ allow-secret-key-import always-trust
+diff -u -r --new-file runtime/syntax.orig/groovy.vim runtime/syntax/groovy.vim
+--- runtime/syntax.orig/groovy.vim	2010-05-15 06:03:56.000000000 -0500
++++ runtime/syntax/groovy.vim	2011-01-08 08:36:35.000000000 -0600
+@@ -1,10 +1,13 @@
+ " Vim syntax file
+ " Language:	Groovy
+-" Maintainer:	Alessio Pace <billy.corgan@tiscali.it>
+-" Version: 	0.1.9b
++" Original Author:	Alessio Pace <billy.corgan@tiscali.it>
++" Maintainer:	Tobias Rapp <yahuxo@gmx.de>
++" Version: 	0.1.10
+ " URL:	  http://www.vim.org/scripts/script.php?script_id=945	
+-" Last Change:	6/4/2004
++" Last Change:	2010 Nov 29
+ 
++" THE ORIGINAL AUTHOR'S NOTES:
++"
+ " This is my very first vim script, I hope to have
+ " done it the right way.
+ " 
+@@ -16,8 +19,7 @@
+ " For version 5.x: Clear all syntax items
+ " For version 6.x: Quit when a syntax file was already loaded
+ "
+-" HOWTO USE IT (INSTALL):
+-" [groovy is still not recognized by vim! :-( ]
++" HOWTO USE IT (INSTALL) when not part of the distribution:
+ "
+ " 1) copy the file in the (global or user's $HOME/.vim/syntax/) syntax folder
+ " 
+@@ -247,7 +249,9 @@
+ syn match   groovySpecialCharError contained "[^']"
+ syn match   groovySpecialChar      contained "\\\([4-9]\d\|[0-3]\d\d\|[\"\\'ntbrf]\|u\x\{4\}\)"
+ syn region  groovyString          start=+"+ end=+"+ end=+$+ contains=groovySpecialChar,groovySpecialError,@Spell,groovyELExpr
+-syn region  groovyString          start=+'+ end=+'+ end=+$+ contains=groovySpecialChar,groovySpecialError,@Spell,groovyELExpr
++syn region  groovyString          start=+'+ end=+'+ end=+$+ contains=groovySpecialChar,groovySpecialError,@Spell
++syn region  groovyString          start=+"""+ end=+"""+ contains=groovySpecialChar,groovySpecialError,@Spell,groovyELExpr
++syn region  groovyString          start=+'''+ end=+'''+ contains=groovySpecialChar,groovySpecialError,@Spell
+ " syn region groovyELExpr start=+${+ end=+}+ keepend contained
+  syn match groovyELExpr /\${.\{-}}/ contained
+ GroovyHiLink groovyELExpr Identifier
+diff -u -r --new-file runtime/syntax.orig/help.vim runtime/syntax/help.vim
+--- runtime/syntax.orig/help.vim	2010-07-18 16:18:04.000000000 -0500
++++ runtime/syntax/help.vim	2011-01-08 08:40:13.000000000 -0600
+@@ -1,7 +1,7 @@
+ " Vim syntax file
+ " Language:	Vim help file
+ " Maintainer:	Bram Moolenaar (Bram@vim.org)
+-" Last Change:	2009 May 18
++" Last Change:	2010 Nov 03
+ 
+ " Quit when a (custom) syntax file was already loaded
+ if exists("b:current_syntax")
+@@ -30,6 +30,7 @@
+ syn match helpOption		"'[a-z]\{2,\}'"
+ syn match helpOption		"'t_..'"
+ syn match helpHeader		"\s*\zs.\{-}\ze\s\=\~$" nextgroup=helpIgnore
++syn match helpGraphic		".* \ze`$" nextgroup=helpIgnore
+ syn match helpIgnore		"." contained conceal
+ syn keyword helpNote		note Note NOTE note: Note: NOTE: Notes Notes:
+ syn match helpSpecial		"\<N\>"
+diff -u -r --new-file runtime/syntax.orig/lex.vim runtime/syntax/lex.vim
+--- runtime/syntax.orig/lex.vim	2010-05-15 06:03:56.000000000 -0500
++++ runtime/syntax/lex.vim	2011-01-08 08:40:13.000000000 -0600
+@@ -1,8 +1,8 @@
+ " Vim syntax file
+ " Language:	Lex
+ " Maintainer:	Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz>
+-" Last Change:	Sep 11, 2009
+-" Version:	10
++" Last Change:	Nov 01, 2010
++" Version:	12
+ " URL:	http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax
+ "
+ " Option:
+@@ -36,6 +36,9 @@
+ " --- Lex stuff ---
+ " --- ========= ---
+ 
++" Options Section
++syn match lexOptions '^%\s*option\>.*$' contains=lexPatString
++
+ "I'd prefer to use lex.* , but vim doesn't handle forward definitions yet
+ syn cluster lexListGroup		contains=lexAbbrvBlock,lexAbbrv,lexAbbrv,lexAbbrvRegExp,lexInclude,lexPatBlock,lexPat,lexBrace,lexPatString,lexPatTag,lexPatTag,lexPatComment,lexPatCodeLine,lexMorePat,lexPatSep,lexSlashQuote,lexPatCode,cInParen,cUserLabel,cOctalZero,cCppSkip,cErrInBracket,cErrInParen,cOctalError,cCppOut2,cCommentStartError,cParenError
+ syn cluster lexListPatCodeGroup	contains=lexAbbrvBlock,lexAbbrv,lexAbbrv,lexAbbrvRegExp,lexInclude,lexPatBlock,lexPat,lexBrace,lexPatTag,lexPatTag,lexPatTagZoneStart,lexPatComment,lexPatCodeLine,lexMorePat,lexPatSep,lexSlashQuote,cInParen,cUserLabel,cOctalZero,cCppSkip,cErrInBracket,cErrInParen,cOctalError,cCppOut2,cCommentStartError,cParenError
+@@ -61,13 +64,15 @@
+ 
+ "%% : Patterns {Actions}
+ if has("folding")
+- syn region lexPatBlock	fold matchgroup=Todo	start="^%%$" matchgroup=Todo	end="^%%$"	skipnl skipwhite	contains=lexPatTag,lexPatTagZone,lexPatComment,lexPat
++ syn region lexPatBlock	fold matchgroup=Todo	start="^%%$" matchgroup=Todo	end="^%%$"	skipnl	skipwhite	contains=lexPatTag,lexPatTagZone,lexPatComment,lexPat,lexPatInclude
+  syn region lexPat		fold			start=+\S+ skip="\\\\\|\\."	end="\s"me=e-1		contained nextgroup=lexMorePat,lexPatSep contains=lexPatTag,lexPatString,lexSlashQuote,lexBrace
++ syn region lexPatInclude	fold matchgroup=lexSep	start="^%{"	end="%}"	contained	contains=lexPatCode
+  syn region lexBrace	fold			start="\[" skip=+\\\\\|\\+	end="]"			contained
+  syn region lexPatString	fold matchgroup=String	start=+"+	skip=+\\\\\|\\"+	matchgroup=String end=+"+	contained
+ else
+- syn region lexPatBlock	matchgroup=Todo		start="^%%$" matchgroup=Todo	end="^%%$"	skipnl skipwhite	contains=lexPatTag,lexPatTagZone,lexPatComment,lexPat
++ syn region lexPatBlock	matchgroup=Todo		start="^%%$" matchgroup=Todo	end="^%%$"	skipnl	skipwhite	contains=lexPatTag,lexPatTagZone,lexPatComment,lexPat,lexPatInclude
+  syn region lexPat					start=+\S+ skip="\\\\\|\\."	end="\s"me=e-1		contained nextgroup=lexMorePat,lexPatSep contains=lexPatTag,lexPatString,lexSlashQuote,lexBrace
++ syn region lexPatInclude	matchgroup=lexSep		start="^%{"	end="%}"	contained	contains=lexPatCode
+  syn region lexBrace				start="\[" skip=+\\\\\|\\+	end="]"			contained
+  syn region lexPatString	matchgroup=String		start=+"+	skip=+\\\\\|\\"+	matchgroup=String end=+"+	contained
+ endif
+@@ -117,6 +122,7 @@
+ hi def link lexAbbrv	SpecialChar
+ hi def link lexCFunctions	Function
+ hi def link lexMorePat	SpecialChar
++hi def link lexOptions	PreProc
+ hi def link lexPatComment	Comment
+ hi def link lexPat		Function
+ hi def link lexPatString	Function
+diff -u -r --new-file runtime/syntax.orig/lisp.vim runtime/syntax/lisp.vim
+--- runtime/syntax.orig/lisp.vim	2010-05-15 06:03:56.000000000 -0500
++++ runtime/syntax/lisp.vim	2011-01-08 08:32:58.000000000 -0600
+@@ -1,8 +1,8 @@
+ " Vim syntax file
+ " Language:    Lisp
+ " Maintainer:  Dr. Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz>
+-" Last Change: Mar 05, 2009
+-" Version:     21
++" Last Change: Nov 16, 2010
++" Version:     22
+ " URL:	       http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax
+ "
+ "  Thanks to F Xavier Noria for a list of 978 Common Lisp symbols
+@@ -32,7 +32,7 @@
+ " ---------------------------------------------------------------------
+ " Clusters: {{{1
+ syn cluster			lispAtomCluster		contains=lispAtomBarSymbol,lispAtomList,lispAtomNmbr0,lispComment,lispDecl,lispFunc,lispLeadWhite
+-syn cluster			lispBaseListCluster	contains=lispAtom,lispAtomBarSymbol,lispAtomMark,lispBQList,lispBarSymbol,lispComment,lispConcat,lispDecl,lispFunc,lispKey,lispList,lispNumber,lispSpecial,lispSymbol,lispVar,lispLeadWhite
++syn cluster			lispBaseListCluster	contains=lispAtom,lispAtomBarSymbol,lispAtomMark,lispBQList,lispBarSymbol,lispComment,lispConcat,lispDecl,lispFunc,lispKey,lispList,lispNumber,lispEscapeSpecial,lispSymbol,lispVar,lispLeadWhite
+ if exists("g:lisp_instring")
+  syn cluster			lispListCluster		contains=@lispBaseListCluster,lispString,lispInString,lispInStringString
+ else
+@@ -68,7 +68,7 @@
+ syn match lispAtom			"'[^ \t()]\+"			contains=lispAtomMark
+ syn match lispAtomBarSymbol		!'|..\{-}|!			contains=lispAtomMark
+ syn region lispAtom			start=+'"+			skip=+\\"+ end=+"+
+-syn region lispAtomList			contained			matchgroup=Special start="("	skip="|.\{-}|" matchgroup=Special end=")"	contains=@lispAtomCluster,lispString,lispSpecial
++syn region lispAtomList			contained			matchgroup=Special start="("	skip="|.\{-}|" matchgroup=Special end=")"	contains=@lispAtomCluster,lispString,lispEscapeSpecial
+ syn match lispAtomNmbr			contained			"\<\d\+"
+ syn match lispLeadWhite			contained			"^\s\+"
+ 
+@@ -537,16 +537,16 @@
+ syn match lispNumber		"-\=\(\.\d\+\|\d\+\(\.\d*\)\=\)\([dDeEfFlL][-+]\=\d\+\)\="
+ syn match lispNumber		"-\=\(\d\+/\d\+\)"
+ 
+-syn match lispSpecial		"\*\w[a-z_0-9-]*\*"
+-syn match lispSpecial		!#|[^()'`,"; \t]\+|#!
+-syn match lispSpecial		!#x\x\+!
+-syn match lispSpecial		!#o\o\+!
+-syn match lispSpecial		!#b[01]\+!
+-syn match lispSpecial		!#\\[ -}\~]!
+-syn match lispSpecial		!#[':][^()'`,"; \t]\+!
+-syn match lispSpecial		!#([^()'`,"; \t]\+)!
+-syn match lispSpecial		!#\\\%(Space\|Newline\|Tab\|Page\|Rubout\|Linefeed\|Return\|Backspace\)!
+-syn match lispSpecial		"\<+[a-zA-Z_][a-zA-Z_0-9-]*+\>"
++syn match lispEscapeSpecial		"\*\w[a-z_0-9-]*\*"
++syn match lispEscapeSpecial		!#|[^()'`,"; \t]\+|#!
++syn match lispEscapeSpecial		!#x\x\+!
++syn match lispEscapeSpecial		!#o\o\+!
++syn match lispEscapeSpecial		!#b[01]\+!
++syn match lispEscapeSpecial		!#\\[ -}\~]!
++syn match lispEscapeSpecial		!#[':][^()'`,"; \t]\+!
++syn match lispEscapeSpecial		!#([^()'`,"; \t]\+)!
++syn match lispEscapeSpecial		!#\\\%(Space\|Newline\|Tab\|Page\|Rubout\|Linefeed\|Return\|Backspace\)!
++syn match lispEscapeSpecial		"\<+[a-zA-Z_][a-zA-Z_0-9-]*+\>"
+ 
+ syn match lispConcat		"\s\.\s"
+ syn match lispParenError	")"
+@@ -585,7 +585,7 @@
+   HiLink lispMark		Delimiter
+   HiLink lispNumber		Number
+   HiLink lispParenError		Error
+-  HiLink lispSpecial		Type
++  HiLink lispEscapeSpecial	Type
+   HiLink lispString		String
+   HiLink lispTodo		Todo
+   HiLink lispVar		Statement
+diff -u -r --new-file runtime/syntax.orig/logindefs.vim runtime/syntax/logindefs.vim
+--- runtime/syntax.orig/logindefs.vim	2010-05-15 06:03:57.000000000 -0500
++++ runtime/syntax/logindefs.vim	2011-01-08 08:36:35.000000000 -0600
+@@ -1,7 +1,7 @@
+ " Vim syntax file
+ " Language:         login.defs(5) configuration file
+ " Maintainer:       Nikolai Weibull <now@bitwi.se>
+-" Latest Revision:  2006-04-19
++" Latest Revision:  2010-11-29
+ 
+ if exists("b:current_syntax")
+   finish
+@@ -10,83 +10,163 @@
+ let s:cpo_save = &cpo
+ set cpo&vim
+ 
+-syn keyword logindefsTodo       contained TODO FIXME XXX NOTE
+-
+-syn region  logindefsComment    display oneline start='^\s*#' end='$'
+-                                \ contains=logindefsTodo,@Spell
+-
+-syn match   logindefsString     contained '[[:graph:]]\+'
+-
+-syn match   logindefsPath       contained '[[:graph:]]\+'
+-
+-syn match   logindefsPaths      contained '[[:graph:]]\+'
+-                                \ nextgroup=logindefsPathDelim
+-
+-syn match   logindefsPathDelim  contained ':' nextgroup=logindefsPaths
+-
+-syn keyword logindefsBoolean    contained yes no
+-
+-syn match   logindefsDecimal    contained '\<\d\+\>'
+-
+-syn match   logindefsOctal      contained display '\<0\o\+\>'
+-                                \ contains=logindefsOctalZero
+-syn match   logindefsOctalZero  contained display '\<0'
+-syn match   logindefsOctalError contained display '\<0\o*[89]\d*\>'
+-
+-syn match   logindefsHex        contained display '\<0x\x\+\>'
+-
+-syn cluster logindefsNumber     contains=logindefsDecimal,logindefsOctal,
+-                                \ logindefsOctalError,logindefsHex
+-
+-syn match   logindefsBegin      display '^'
+-                                \ nextgroup=logindefsKeyword,logindefsComment
+-                                \ skipwhite
+-
+-syn keyword logindefsKeyword    contained CHFN_AUTH CLOSE_SESSIONS CREATE_HOME
+-                                \ DEFAULT_HOME FAILLOG_ENAB LASTLOG_ENAB
+-                                \ LOG_OK_LOGINS LOG_UNKFAIL_ENAB MAIL_CHECK_ENAB
+-                                \ MD5_CRYPT_ENAB OBSCURE_CHECKS_ENAB
+-                                \ PASS_ALWAYS_WARN PORTTIME_CHECKS_ENAB
+-                                \ QUOTAS_ENAB SU_WHEEL_ONLY SYSLOG_SG_ENAB
+-                                \ SYSLOG_SU_ENAB USERGROUPS_ENAB
+-                                \ nextgroup=logindefsBoolean skipwhite
+-
+-syn keyword logindefsKeyword    contained CHFN_RESTRICT CONSOLE CONSOLE_GROUPS
+-                                \ ENV_TZ ENV_HZ FAKE_SHELL SU_NAME LOGIN_STRING
+-                                \ NOLOGIN_STR TTYGROUP USERDEL_CMD
+-                                \ nextgroup=logindefsString skipwhite
+-
+-syn keyword logindefsKeyword    contained ENVIRON_FILE FTMP_FILE HUSHLOGIN_FILE
+-                                \ ISSUE_FILE MAIL_DIR MAIL_FILE NOLOGINS_FILE
+-                                \ NOLOGINS_FILE TTYTYPE_FILE QMAIL_DIR
+-                                \ SULOG_FILE
+-                                \ nextgroup=logindefsPath skipwhite
+-
+-syn keyword logindefsKeyword    contained CRACKLIB_DICTPATH ENV_PATH
+-                                \ ENV_ROOTPATH ENV_SUPATH MOTD_FILE
+-                                \ nextgroup=logindefsPaths skipwhite
+-
+-syn keyword logindefsKeyword    contained ERASECHAR FAIL_DELAY GETPASS_ASTERISKS
+-                                \ GID_MAX GID_MIN KILLCHAR LOGIN_RETRIES
+-                                \ LOGIN_TIMEOUT PASS_CHANGE_TRIES PASS_MAX_DAYS
+-                                \ PASS_MAX_LEN PASS_MIN_DAYS PASS_MIN_LEN
+-                                \ PASS_WARN_AGE TTYPERM UID_MAX UID_MIN ULIMIT
+-                                \ UMASK
+-                                \ nextgroup=@logindefsNumber skipwhite
+-
+-hi def link logindefsTodo       Todo
+-hi def link logindefsComment    Comment
+-hi def link logindefsString     String
+-hi def link logindefsPath       String
+-hi def link logindefsPaths      logindefsPath
+-hi def link logindefsPathDelim  Delimiter
+-hi def link logindefsBoolean    Boolean
+-hi def link logindefsDecimal    Number
+-hi def link logindefsOctal      Number
+-hi def link logindefsOctalZero  PreProc
+-hi def link logindefsOctalError Error
+-hi def link logindefsHex        Number
+-hi def link logindefsKeyword    Keyword
++syn match   logindefsBegin          display '^'
++                                    \ nextgroup=
++                                    \   logindefsComment,
++                                    \   @logindefsKeyword
++                                    \ skipwhite
++
++syn region  logindefsComment        display oneline start='^\s*#' end='$'
++                                    \ contains=logindefsTodo,@Spell
++
++syn keyword logindefsTodo           contained TODO FIXME XXX NOTE
++
++syn cluster logindefsKeyword        contains=
++                                    \ logindefsBooleanKeyword,
++                                    \ logindefsEncryptKeyword,
++                                    \ logindefsNumberKeyword,
++                                    \ logindefsPathKeyword,
++                                    \ logindefsPathsKeyword,
++                                    \ logindefsStringKeyword
++
++syn keyword logindefsBooleanKeyword contained
++                                    \ CHFN_AUTH
++                                    \ CHSH_AUTH
++                                    \ CREATE_HOME
++                                    \ DEFAULT_HOME
++                                    \ FAILLOG_ENAB
++                                    \ LASTLOG_ENAB
++                                    \ LOG_OK_LOGINS
++                                    \ LOG_UNKFAIL_ENAB
++                                    \ MAIL_CHECK_ENAB
++                                    \ MD5_CRYPT_ENAB
++                                    \ OBSCURE_CHECKS_ENAB
++                                    \ PASS_ALWAYS_WARN
++                                    \ PORTTIME_CHECKS_ENAB
++                                    \ QUOTAS_ENAB
++                                    \ SU_WHEEL_ONLY
++                                    \ SYSLOG_SG_ENAB
++                                    \ SYSLOG_SU_ENAB
++                                    \ USERGROUPS_ENAB
++                                    \ nextgroup=logindefsBoolean skipwhite
++
++syn keyword logindefsBoolean        contained yes no
++
++syn keyword logindefsEncryptKeyword contained
++                                    \ ENCRYPT_METHOD
++                                    \ nextgroup=logindefsEncryptMethod skipwhite
++
++syn keyword logindefsEncryptMethod  contained
++                                    \ DES
++                                    \ MD5
++                                    \ SHA256
++                                    \ SHA512
++
++syn keyword logindefsNumberKeyword  contained
++                                    \ ERASECHAR
++                                    \ FAIL_DELAY
++                                    \ GID_MAX
++                                    \ GID_MIN
++                                    \ KILLCHAR
++                                    \ LOGIN_RETRIES
++                                    \ LOGIN_TIMEOUT
++                                    \ MAX_MEMBERS_PER_GROUP
++                                    \ PASS_CHANGE_TRIES
++                                    \ PASS_MAX_DAYS
++                                    \ PASS_MIN_DAYS
++                                    \ PASS_WARN_AGE
++                                    \ PASS_MAX_LEN
++                                    \ PASS_MIN_LEN
++                                    \ SHA_CRYPT_MAX_ROUNDS
++                                    \ SHA_CRYPT_MIN_ROUNDS
++                                    \ SYS_GID_MAX
++                                    \ SYS_GID_MIN
++                                    \ SYS_UID_MAX
++                                    \ SYS_UID_MIN
++                                    \ UID_MAX
++                                    \ UID_MIN
++                                    \ ULIMIT
++                                    \ UMASK
++                                    \ nextgroup=@logindefsNumber skipwhite
++
++syn cluster logindefsNumber         contains=
++                                    \ logindefsDecimal,
++                                    \ logindefsHex,
++                                    \ logindefsOctal,
++                                    \ logindefsOctalError
++
++syn match   logindefsDecimal        contained '\<\d\+\>'
++
++syn match   logindefsHex            contained display '\<0x\x\+\>'
++
++syn match   logindefsOctal          contained display '\<0\o\+\>'
++                                    \ contains=logindefsOctalZero
++syn match   logindefsOctalZero      contained display '\<0'
++
++syn match   logindefsOctalError     contained display '\<0\o*[89]\d*\>'
++
++syn keyword logindefsPathKeyword    contained
++                                    \ ENVIRON_FILE
++                                    \ FAKE_SHELL
++                                    \ FTMP_FILE
++                                    \ HUSHLOGIN_FILE
++                                    \ ISSUE_FILE
++                                    \ MAIL_DIR
++                                    \ MAIL_FILE
++                                    \ NOLOGINS_FILE
++                                    \ SULOG_FILE
++                                    \ TTYTYPE_FILE
++                                    \ nextgroup=logindefsPath skipwhite
++
++syn match   logindefsPath           contained '[[:graph:]]\+'
++
++syn keyword logindefsPathsKeyword   contained
++                                    \ CONSOLE
++                                    \ ENV_PATH
++                                    \ ENV_SUPATH
++                                    \ MOTD_FILE
++                                    \ nextgroup=logindefsPaths skipwhite
++
++syn match   logindefsPaths          contained '[^:]\+'
++                                    \ nextgroup=logindefsPathDelim
++
++syn match   logindefsPathDelim      contained ':' nextgroup=logindefsPaths
++
++syn keyword logindefsStringKeyword  contained
++                                    \ CHFN_RESTRICT
++                                    \ CONSOLE_GROUPS
++                                    \ ENV_HZ
++                                    \ ENV_TZ
++                                    \ LOGIN_STRING
++                                    \ SU_NAME
++                                    \ TTYGROUP
++                                    \ TTYPERM
++                                    \ USERDEL_CMD
++                                    \ nextgroup=logindefsString skipwhite
++
++syn match   logindefsString         contained '[[:graph:]]\+'
++
++hi def link logindefsComment        Comment
++hi def link logindefsTodo           Todo
++hi def link logindefsKeyword        Keyword
++hi def link logindefsBooleanKeyword logindefsKeyword
++hi def link logindefsEncryptKeyword logindefsKeyword
++hi def link logindefsNumberKeyword  logindefsKeyword
++hi def link logindefsPathKeyword    logindefsKeyword
++hi def link logindefsPathsKeyword   logindefsKeyword
++hi def link logindefsStringKeyword  logindefsKeyword
++hi def link logindefsBoolean        Boolean
++hi def link logindefsEncryptMethod  Type
++hi def link logindefsNumber         Number
++hi def link logindefsDecimal        logindefsNumber
++hi def link logindefsHex            logindefsNumber
++hi def link logindefsOctal          logindefsNumber
++hi def link logindefsOctalZero      PreProc
++hi def link logindefsOctalError     Error
++hi def link logindefsPath           String
++hi def link logindefsPaths          logindefsPath
++hi def link logindefsPathDelim      Delimiter
++hi def link logindefsString         String
+ 
+ let b:current_syntax = "logindefs"
+ 
+diff -u -r --new-file runtime/syntax.orig/nasm.vim runtime/syntax/nasm.vim
+--- runtime/syntax.orig/nasm.vim	2010-05-15 06:03:56.000000000 -0500
++++ runtime/syntax/nasm.vim	2011-01-08 08:27:46.000000000 -0600
+@@ -1,9 +1,10 @@
+ " Vim syntax file
+ " Language:	NASM - The Netwide Assembler (v0.98)
+-" Maintainer:	Manuel M.H. Stol	<mmh.stol@gmx.net>
+-" Last Change:	2003 May 11
+-" Vim URL:	http://www.vim.org/lang.html
+-" NASM Home:	http://www.cryogen.com/Nasm/
++" Maintainer:	Andriy Sokolov	<andriy145@gmail.com>
++" Original Author:	Manuel M.H. Stol	<Manuel.Stol@allieddata.nl>
++" Former Maintainer:	Manuel M.H. Stol	<Manuel.Stol@allieddata.nl>
++" Last Change:	2010 Sep 24
++" NASM Home:	http://www.nasm.us/
+ 
+ 
+ 
+@@ -160,6 +161,7 @@
+ "syn region  nasmInMacStrucDef	contained transparent matchgroup=nasmStructure keepend start="^\s*UNION\>"hs=e-4 end="^\s*ENDUNION\>"re=e-8 contains=@nasmGrpCntnMacro
+ "syn region  nasmInMacStrucDef	contained transparent matchgroup=nasmStructure keepend start="\<IUNION\>" end="\<IEND\(UNION\)\=\>" contains=@nasmGrpCntnMacro,nasmInStructure
+ syn region  nasmInMacPreConDef	contained transparent matchgroup=nasmInMacPreCondit start="^\s*%ifnidni\>"hs=e-7 start="^\s*%if\(idni\|n\(ctx\|def\|idn\|num\|str\)\)\>"hs=e-6 start="^\s*%if\(ctx\|def\|idn\|nid\|num\|str\)\>"hs=e-5 start="^\s*%ifid\>"hs=e-4 start="^\s*%if\>"hs=e-2 end="%endif\>" contains=@nasmGrpCntnMacro,nasmInMacPreCondit,nasmInPreCondit
++" Todo: allow STRUC/ISTRUC to be used inside preprocessor conditional block
+ syn match   nasmInMacPreCondit	contained transparent "ctx\s"lc=3 skipwhite nextgroup=@nasmGrpNxtCtx
+ syn match   nasmInMacPreCondit	contained "^\s*%elifctx\>"hs=e-7 skipwhite nextgroup=@nasmGrpNxtCtx
+ syn match   nasmInMacPreCondit	contained "^\s*%elifnctx\>"hs=e-8 skipwhite nextgroup=@nasmGrpNxtCtx
+@@ -210,15 +212,17 @@
+ syn cluster nasmGrpPreCondits	contains=nasmPreConditDef,@nasmGrpInPreCondits,nasmCtxPreProc,nasmCtxLocLabel
+ 
+ "  Other pre-processor statements
+-syn match   nasmPreProc		"^\s*%rep\>"hs=e-3
++syn match   nasmPreProc		"^\s*%\(rep\|use\)\>"hs=e-3
+ syn match   nasmPreProc		"^\s*%line\>"hs=e-4
+-syn match   nasmPreProc		"^\s*%\(clear\|error\)\>"hs=e-5
+-syn match   nasmPreProc		"^\s*%endrep\>"hs=e-6
+-syn match   nasmPreProc		"^\s*%exitrep\>"hs=e-7
++syn match   nasmPreProc		"^\s*%\(clear\|error\|fatal\)\>"hs=e-5
++syn match   nasmPreProc		"^\s*%\(endrep\|strlen\|substr\)\>"hs=e-6
++syn match   nasmPreProc		"^\s*%\(exitrep\|warning\)\>"hs=e-7
+ syn match   nasmDefine		"^\s*%undef\>"hs=e-5
+ syn match   nasmDefine		"^\s*%\(assign\|define\)\>"hs=e-6
+ syn match   nasmDefine		"^\s*%i\(assign\|define\)\>"hs=e-7
++syn match   nasmDefine		"^\s*%unmacro\>"hs=e-7
+ syn match   nasmInclude		"^\s*%include\>"hs=e-7
++" Todo: Treat the line tail after %fatal, %error, %warning as text
+ 
+ "  Multiple pre-processor instructions on single line detection (obsolete)
+ "syn match   nasmPreProcError	+^\s*\([^\t "%';][^"%';]*\|[^\t "';][^"%';]\+\)%\a\+\>+
+@@ -231,6 +235,7 @@
+ syn match   nasmGen08Register	"\<[A-D][HL]\>"
+ syn match   nasmGen16Register	"\<\([A-D]X\|[DS]I\|[BS]P\)\>"
+ syn match   nasmGen32Register	"\<E\([A-D]X\|[DS]I\|[BS]P\)\>"
++syn match   nasmGen64Register	"\<R\([A-D]X\|[DS]I\|[BS]P\|[89]\|1[0-5]\|[89][WD]\|1[0-5][WD]\)\>"
+ syn match   nasmSegRegister	"\<[C-GS]S\>"
+ syn match   nasmSpcRegister	"\<E\=IP\>"
+ syn match   nasmFpuRegister	"\<ST\o\>"
+@@ -298,20 +303,21 @@
+ syn match   nasmStdInstruction	"\<POP\>"
+ syn keyword nasmStdInstruction	AAA AAD AAM AAS ADC ADD AND
+ syn keyword nasmStdInstruction	BOUND BSF BSR BSWAP BT[C] BTR BTS
+-syn keyword nasmStdInstruction	CALL CBW CDQ CLC CLD CMC CMP CMPSB CMPSD CMPSW
+-syn keyword nasmStdInstruction	CMPXCHG CMPXCHG8B CPUID CWD[E]
++syn keyword nasmStdInstruction	CALL CBW CDQ CLC CLD CMC CMP CMPSB CMPSD CMPSW CMPSQ
++syn keyword nasmStdInstruction	CMPXCHG CMPXCHG8B CPUID CWD[E] CQO
+ syn keyword nasmStdInstruction	DAA DAS DEC DIV ENTER
+-syn keyword nasmStdInstruction	IDIV IMUL INC INT[O] IRET[D] IRETW
++syn keyword nasmStdInstruction	IDIV IMUL INC INT[O] IRET[D] IRETW IRETQ
+ syn keyword nasmStdInstruction	JCXZ JECXZ JMP
+-syn keyword nasmStdInstruction	LAHF LDS LEA LEAVE LES LFS LGS LODSB LODSD
++syn keyword nasmStdInstruction	LAHF LDS LEA LEAVE LES LFS LGS LODSB LODSD LODSQ
+ syn keyword nasmStdInstruction	LODSW LOOP[E] LOOPNE LOOPNZ LOOPZ LSS
+-syn keyword nasmStdInstruction	MOVSB MOVSD MOVSW MOVSX MOVZX MUL NEG NOP NOT
+-syn keyword nasmStdInstruction	OR POPA[D] POPAW POPF[D] POPFW
+-syn keyword nasmStdInstruction	PUSH[AD] PUSHAW PUSHF[D] PUSHFW
++syn keyword nasmStdInstruction	MOVSB MOVSD MOVSW MOVSX MOVSQ MOVZX MUL NEG NOP NOT
++syn keyword nasmStdInstruction	OR POPA[D] POPAW POPF[D] POPFW POPFQ
++syn keyword nasmStdInstruction	PUSH[AD] PUSHAW PUSHF[D] PUSHFW PUSHFQ
+ syn keyword nasmStdInstruction	RCL RCR RETF RET[N] ROL ROR
+ syn keyword nasmStdInstruction	SAHF SAL SAR SBB SCASB SCASD SCASW
+-syn keyword nasmStdInstruction	SHL[D] SHR[D] STC STD STOSB STOSD STOSW SUB
++syn keyword nasmStdInstruction	SHL[D] SHR[D] STC STD STOSB STOSD STOSW STOSQ SUB
+ syn keyword nasmStdInstruction	TEST XADD XCHG XLATB XOR
++syn keyword nasmStdInstruction	LFENCE MFENCE SFENCE
+ 
+ 
+ " System Instructions: (usually privileged)
+diff -u -r --new-file runtime/syntax.orig/po.vim runtime/syntax/po.vim
+--- runtime/syntax.orig/po.vim	2010-05-15 06:03:57.000000000 -0500
++++ runtime/syntax/po.vim	2010-09-22 15:54:05.000000000 -0500
+@@ -1,10 +1,10 @@
+ " Vim syntax file
+ " Language:	po (gettext)
+ " Maintainer:	Dwayne Bailey <dwayne@translate.org.za>
+-" Last Change:	2008 Sep 17
++" Last Change:	2010 Sep 21
+ " Contributors: Dwayne Bailey (Most advanced syntax highlighting)
+ "               Leonardo Fontenelle (Spell checking)
+-"               SungHyun Nam <goweol@gmail.com> (Original maintainer)
++"               Nam SungHyun <namsh@kldp.org> (Original maintainer)
+ 
+ " For version 5.x: Clear all syntax items
+ " For version 6.x: Quit when a syntax file was already loaded
+@@ -39,7 +39,7 @@
+                             \ contains=@Spell,poSpecial,poFormat,poHeaderItem,poCommentKDEError,poHeaderUndefined,poPluralKDEError,poMsguniqError,poKDEdesktopFile,poHtml,poAcceleratorStr,poHtmlNot,poVariable
+ 
+ " Header and Copyright
+-syn match     poHeaderItem "\(Project-Id-Version\|Report-Msgid-Bugs-To\|POT-Creation-Date\|PO-Revision-Date\|Last-Translator\|Language-Team\|MIME-Version\|Content-Type\|Content-Transfer-Encoding\|Plural-Forms\|X-Generator\): " contained
++syn match     poHeaderItem "\(Project-Id-Version\|Report-Msgid-Bugs-To\|POT-Creation-Date\|PO-Revision-Date\|Last-Translator\|Language-Team\|Language\|MIME-Version\|Content-Type\|Content-Transfer-Encoding\|Plural-Forms\|X-Generator\): " contained
+ syn match     poHeaderUndefined "\(PACKAGE VERSION\|YEAR-MO-DA HO:MI+ZONE\|FULL NAME <EMAIL@ADDRESS>\|LANGUAGE <LL@li.org>\|CHARSET\|ENCODING\|INTEGER\|EXPRESSION\)" contained
+ syn match     poCopyrightUnset "SOME DESCRIPTIVE TITLE\|FIRST AUTHOR <EMAIL@ADDRESS>, YEAR\|Copyright (C) YEAR Free Software Foundation, Inc\|YEAR THE PACKAGE\'S COPYRIGHT HOLDER\|PACKAGE" contained
+ 
+diff -u -r --new-file runtime/syntax.orig/python.vim runtime/syntax/python.vim
+--- runtime/syntax.orig/python.vim	2010-05-15 06:03:57.000000000 -0500
++++ runtime/syntax/python.vim	2010-09-22 15:49:19.000000000 -0500
+@@ -1,7 +1,7 @@
+ " Vim syntax file
+ " Language:	Python
+ " Maintainer:	Neil Schemenauer <nas@python.ca>
+-" Last Change:	2009-10-13
++" Last Change:	2010 Sep 21
+ " Credits:	Zvezdan Petkovic <zpetkovic@acm.org>
+ "		Neil Schemenauer <nas@python.ca>
+ "		Dmitry Vasiliev
+@@ -45,6 +45,11 @@
+   finish
+ endif
+ 
++" We need nocompatible mode in order to continue lines with backslashes.
++" Original setting will be restored.
++let s:cpo_save = &cpo
++set cpo&vim
++
+ " Keep Python keywords in alphabetical order inside groups for easy
+ " comparison with the table in the 'Python Language Reference'
+ " http://docs.python.org/reference/lexical_analysis.html#keywords.
+@@ -292,4 +297,7 @@
+ 
+ let b:current_syntax = "python"
+ 
++let &cpo = s:cpo_save
++unlet s:cpo_save
++
+ " vim:set sw=2 sts=2 ts=8 noet:
+diff -u -r --new-file runtime/syntax.orig/r.vim runtime/syntax/r.vim
+--- runtime/syntax.orig/r.vim	2010-05-15 06:03:56.000000000 -0500
++++ runtime/syntax/r.vim	2011-01-08 08:45:55.000000000 -0600
+@@ -1,111 +1,137 @@
+ " Vim syntax file
+-" Language:	R (GNU S)
+-" Maintainer:	Vaidotas Zemlys <zemlys@gmail.com>
+-" Last Change:  2006 Apr 30
+-" Filenames:	*.R *.Rout *.r *.Rhistory *.Rt *.Rout.save *.Rout.fail
+-" URL:		http://uosis.mif.vu.lt/~zemlys/vim-syntax/r.vim
+-
+-" First maintainer Tom Payne <tom@tompayne.org>
+-" Modified to make syntax less colourful and added the highlighting of
+-" R assignment arrow
+-
+-" For version 5.x: Clear all syntax items
+-" For version 6.x: Quit when a syntax file was already loaded
+-if version < 600
+-  syntax clear
+-elseif exists("b:current_syntax")
++" Language:	      R (GNU S)
++" Maintainer:	      Jakson Aquino <jalvesaq@gmail.com>
++" Former Maintainers: Vaidotas Zemlys <zemlys@gmail.com>
++" 		      Tom Payne <tom@tompayne.org>
++" Last Change:	      Wed Sep 29, 2010  09:31AM
++" Filenames:	      *.R *.r *.Rhistory *.Rt
++" 
++" NOTE: The highlighting of R functions is defined in the
++" r-plugin/functions.vim, which is part of vim-r-plugin2:
++" http://www.vim.org/scripts/script.php?script_id=2628
++"
++" Some lines of code were borrowed from Zhuojun Chen.
++
++if exists("b:current_syntax")
+   finish
+ endif
+ 
+-if version >= 600
+-  setlocal iskeyword=@,48-57,_,.
+-else
+-  set iskeyword=@,48-57,_,.
+-endif
++setlocal iskeyword=@,48-57,_,.
+ 
+ syn case match
+ 
+ " Comment
+-syn match rComment /\#.*/
++syn match rComment contains=@Spell "\#.*"
+ 
+-" Constant
+ " string enclosed in double quotes
+-syn region rString start=/"/ skip=/\\\\\|\\"/ end=/"/
++syn region rString contains=rSpecial,rStrError,@Spell start=/"/ skip=/\\\\\|\\"/ end=/"/
+ " string enclosed in single quotes
+-syn region rString start=/'/ skip=/\\\\\|\\'/ end=/'/
+-" number with no fractional part or exponent
+-syn match rNumber /\d\+/
+-" floating point number with integer and fractional parts and optional exponent
+-syn match rFloat /\d\+\.\d*\([Ee][-+]\=\d\+\)\=/
+-" floating point number with no integer part and optional exponent
+-syn match rFloat /\.\d\+\([Ee][-+]\=\d\+\)\=/
+-" floating point number with no fractional part and optional exponent
+-syn match rFloat /\d\+[Ee][-+]\=\d\+/
++syn region rString contains=rSpecial,rStrError,@Spell start=/'/ skip=/\\\\\|\\'/ end=/'/
+ 
+-" Identifier
+-" identifier with leading letter and optional following keyword characters
+-syn match rIdentifier /\a\k*/
+-" identifier with leading period, one or more digits, and at least one non-digit keyword character
+-syn match rIdentifier /\.\d*\K\k*/
++syn match rStrError display contained "\\."
++
++" New line, carriage return, tab, backspace, bell, feed, vertical tab, backslash
++syn match rSpecial display contained "\\\(n\|r\|t\|b\|a\|f\|v\|'\|\"\)\|\\\\"
++
++" Hexadecimal and Octal digits
++syn match rSpecial display contained "\\\(x\x\{1,2}\|[0-8]\{1,3}\)"
++
++" Unicode characters
++syn match rSpecial display contained "\\u\x\{1,4}"
++syn match rSpecial display contained "\\U\x\{1,8}"
++syn match rSpecial display contained "\\u{\x\{1,4}}"
++syn match rSpecial display contained "\\U{\x\{1,8}}"
++
++
++syn match rDollar "\$"
+ 
+ " Statement
+ syn keyword rStatement   break next return
+ syn keyword rConditional if else
+ syn keyword rRepeat      for in repeat while
+ 
++" Constant (not really)
++syn keyword rConstant T F LETTERS letters month.ab month.name pi
++syn keyword rConstant R.version.string
++
+ " Constant
+-syn keyword rConstant LETTERS letters month.ab month.name pi
+ syn keyword rConstant NULL
+ syn keyword rBoolean  FALSE TRUE
+-syn keyword rNumber   NA
+-syn match rArrow /<\{1,2}-/
++syn keyword rNumber   NA NA_integer_ NA_real_ NA_complex_ NA_character_ 
++syn keyword rNumber   Inf NaN 
+ 
+-" Type
+-syn keyword rType array category character complex double function integer list logical matrix numeric vector data.frame 
++" integer
++syn match rInteger "\<\d\+L"
++syn match rInteger "\<0x\([0-9]\|[a-f]\|[A-F]\)\+L"
++syn match rInteger "\<\d\+[Ee]+\=\d\+L"
++
++syn match rOperator    "[\*\!\&\+\-\<\>\=\^\|\~\`/:@]"
++syn match rOperator    "%\{2}\|%\*%\|%\/%\|%in%\|%o%\|%x%"
++
++syn match rComplex "\<\d\+i"
++syn match rComplex "\<0x\([0-9]\|[a-f]\|[A-F]\)\+i"
++syn match rComplex "\<\d\+\.\d*\([Ee][-+]\=\d\+\)\=i"
++syn match rComplex "\<\.\d\+\([Ee][-+]\=\d\+\)\=i"
++syn match rComplex "\<\d\+[Ee][-+]\=\d\+i"
++
++" number with no fractional part or exponent
++syn match rNumber "\<\d\+\>"
++" hexadecimal number 
++syn match rNumber "\<0x\([0-9]\|[a-f]\|[A-F]\)\+"
++
++" floating point number with integer and fractional parts and optional exponent
++syn match rFloat "\<\d\+\.\d*\([Ee][-+]\=\d\+\)\="
++" floating point number with no integer part and optional exponent
++syn match rFloat "\<\.\d\+\([Ee][-+]\=\d\+\)\="
++" floating point number with no fractional part and optional exponent
++syn match rFloat "\<\d\+[Ee][-+]\=\d\+"
++
++syn match rArrow "<\{1,2}-"
++syn match rArrow "->\{1,2}"
+ 
+ " Special
+-syn match rDelimiter /[,;:]/
++syn match rDelimiter "[,;:]"
+ 
+ " Error
+ syn region rRegion matchgroup=Delimiter start=/(/ matchgroup=Delimiter end=/)/ transparent contains=ALLBUT,rError,rBraceError,rCurlyError
+ syn region rRegion matchgroup=Delimiter start=/{/ matchgroup=Delimiter end=/}/ transparent contains=ALLBUT,rError,rBraceError,rParenError
+ syn region rRegion matchgroup=Delimiter start=/\[/ matchgroup=Delimiter end=/]/ transparent contains=ALLBUT,rError,rCurlyError,rParenError
+-syn match rError      /[)\]}]/
+-syn match rBraceError /[)}]/ contained
+-syn match rCurlyError /[)\]]/ contained
+-syn match rParenError /[\]}]/ contained
++syn match rError      "[)\]}]"
++syn match rBraceError "[)}]" contained
++syn match rCurlyError "[)\]]" contained
++syn match rParenError "[\]}]" contained
++
++" Functions that may add new objects
++syn keyword rPreProc     library require attach detach source
++
++" Type
++syn keyword rType array category character complex double function integer list logical matrix numeric vector data.frame 
+ 
+ " Define the default highlighting.
+-" For version 5.7 and earlier: only when not done already
+-" For version 5.8 and later: only when an item doesn't have highlighting yet
+-if version >= 508 || !exists("did_r_syn_inits")
+-  if version < 508
+-    let did_r_syn_inits = 1
+-    command -nargs=+ HiLink hi link <args>
+-  else
+-    command -nargs=+ HiLink hi def link <args>
+-  endif
+-  HiLink rComment     Comment
+-  HiLink rConstant    Constant
+-  HiLink rString      String
+-  HiLink rNumber      Number
+-  HiLink rBoolean     Boolean
+-  HiLink rFloat       Float
+-  HiLink rStatement   Statement
+-  HiLink rConditional Conditional
+-  HiLink rRepeat      Repeat
+-  HiLink rIdentifier  Normal
+-  HiLink rArrow	      Statement	
+-  HiLink rType        Type
+-  HiLink rDelimiter   Delimiter
+-  HiLink rError       Error
+-  HiLink rBraceError  Error
+-  HiLink rCurlyError  Error
+-  HiLink rParenError  Error
+-  delcommand HiLink
+-endif
++hi def link rArrow       Statement	
++hi def link rBoolean     Boolean
++hi def link rBraceError  Error
++hi def link rComment     Comment
++hi def link rComplex     Number
++hi def link rConditional Conditional
++hi def link rConstant    Constant
++hi def link rCurlyError  Error
++hi def link rDelimiter   Delimiter
++hi def link rDollar      SpecialChar
++hi def link rError       Error
++hi def link rFloat       Float
++hi def link rInteger     Number
++hi def link rNumber      Number
++hi def link rOperator    Operator
++hi def link rParenError  Error
++hi def link rPreProc     PreProc
++hi def link rRepeat      Repeat
++hi def link rSpecial     SpecialChar
++hi def link rStatement   Statement
++hi def link rString      String
++hi def link rStrError    Error
++hi def link rType        Type
+ 
+ let b:current_syntax="r"
+ 
+ " vim: ts=8 sw=2
+-
+diff -u -r --new-file runtime/syntax.orig/rhelp.vim runtime/syntax/rhelp.vim
+--- runtime/syntax.orig/rhelp.vim	2010-05-15 06:03:56.000000000 -0500
++++ runtime/syntax/rhelp.vim	2011-01-08 08:36:35.000000000 -0600
+@@ -1,10 +1,10 @@
+ " Vim syntax file
+ " Language:    R Help File
+ " Maintainer:  Johannes Ranke <jranke@uni-bremen.de>
+-" Last Change: 2010 Apr 22
+-" Version:     0.7.3
+-" SVN:		   $Id: rhelp.vim 88 2010-04-22 19:37:09Z ranke $
+-" Remarks:     - Now includes R syntax highlighting in the appropriate
++" Last Change: 2010 Nov 22
++" Version:     0.7.4
++" SVN:		   $Id: rhelp.vim 90 2010-11-22 10:58:11Z ranke $
++" Remarks:     - Includes R syntax highlighting in the appropriate
+ "                sections if an r.vim file is in the same directory or in the
+ "                default debian location.
+ "              - There is no Latex markup in equations
+@@ -28,19 +28,19 @@
+ syn region rhelpIdentifier matchgroup=rhelpSection	start="\\name{" end="}" 
+ syn region rhelpIdentifier matchgroup=rhelpSection	start="\\alias{" end="}" 
+ syn region rhelpIdentifier matchgroup=rhelpSection	start="\\pkg{" end="}" 
+-syn region rhelpIdentifier matchgroup=rhelpSection	start="\\item{" end="}" contained contains=rhelpDots
+-syn region rhelpIdentifier matchgroup=rhelpSection start="\\method{" end=/}/ contained
++syn region rhelpIdentifier matchgroup=rhelpSection start="\\method{" end="}" contained
++syn region rhelpIdentifier matchgroup=rhelpSection start="\\Rdversion{" end="}"
+ 
+ " Highlighting of R code using an existing r.vim syntax file if available {{{1
+ syn include @R syntax/r.vim
+ syn match rhelpDots		"\\dots" containedin=@R
+-syn region rhelpRcode matchgroup=Delimiter start="\\examples{" matchgroup=Delimiter transparent end=/}/ contains=@R,rhelpSection
+-syn region rhelpRcode matchgroup=Delimiter start="\\usage{" matchgroup=Delimiter transparent end=/}/ contains=@R,rhelpIdentifier,rhelpS4method
+-syn region rhelpRcode matchgroup=Delimiter start="\\synopsis{" matchgroup=Delimiter transparent end=/}/ contains=@R
+-syn region rhelpRcode matchgroup=Delimiter start="\\special{" matchgroup=Delimiter transparent end=/}/ contains=@R contained
+-syn region rhelpRcode matchgroup=Delimiter start="\\code{" matchgroup=Delimiter transparent end=/}/ contains=@R,rhelpLink contained
+-syn region rhelpS4method matchgroup=Delimiter start="\\S4method{.*}(" matchgroup=Delimiter transparent end=/)/ contains=@R,rhelpDots contained
+-syn region rhelpSexpr matchgroup=Delimiter start="\\Sexpr{" matchgroup=Delimiter transparent end=/}/ contains=@R
++syn region rhelpRcode matchgroup=Delimiter start="\\examples{" matchgroup=Delimiter transparent end="}" contains=@R,rhelpSection
++syn region rhelpRcode matchgroup=Delimiter start="\\usage{" matchgroup=Delimiter transparent end="}" contains=@R,rhelpIdentifier,rhelpS4method
++syn region rhelpRcode matchgroup=Delimiter start="\\synopsis{" matchgroup=Delimiter transparent end="}" contains=@R
++syn region rhelpRcode matchgroup=Delimiter start="\\special{" matchgroup=Delimiter transparent end="}" contains=@R contained
++syn region rhelpRcode matchgroup=Delimiter start="\\code{" matchgroup=Delimiter transparent end="}" contains=@R,rhelpLink contained
++syn region rhelpS4method matchgroup=Delimiter start="\\S4method{.*}(" matchgroup=Delimiter transparent end=")" contains=@R,rhelpDots contained
++syn region rhelpSexpr matchgroup=Delimiter start="\\Sexpr{" matchgroup=Delimiter transparent end="}" contains=@R
+ 
+ " Strings {{{1
+ syn region rhelpString start=/"/ end=/"/ 
+@@ -53,7 +53,7 @@
+ syn match rhelpDelimiter		"\\tab "
+ 
+ " Keywords {{{1
+-syn match rhelpKeyword	"\\R"
++syn match rhelpKeyword	"\\R" contained
+ syn match rhelpKeyword	"\\ldots"
+ syn match rhelpKeyword  "--"
+ syn match rhelpKeyword  "---"
+@@ -129,10 +129,13 @@
+ syn match rhelpType		"\\file\>"
+ syn match rhelpType		"\\email\>"
+ syn match rhelpType		"\\url\>"
++syn match rhelpType		"\\href\>"
+ syn match rhelpType		"\\var\>"
+ syn match rhelpType		"\\env\>"
+ syn match rhelpType		"\\option\>"
+ syn match rhelpType		"\\command\>"
++syn match rhelpType		"\\newcommand\>"
++syn match rhelpType		"\\renewcommand\>"
+ syn match rhelpType		"\\dfn\>"
+ syn match rhelpType		"\\cite\>"
+ syn match rhelpType		"\\acronym\>"
+@@ -140,6 +143,7 @@
+ " rhelp sections {{{1
+ syn match rhelpSection		"\\encoding\>"
+ syn match rhelpSection		"\\title\>"
++syn match rhelpSection		"\\item\>"
+ syn match rhelpSection		"\\description\>"
+ syn match rhelpSection		"\\concept\>"
+ syn match rhelpSection		"\\arguments\>"
+@@ -153,11 +157,11 @@
+ syn match rhelpSection		"\\docType\>"
+ syn match rhelpSection		"\\format\>"
+ syn match rhelpSection		"\\source\>"
+-syn match rhelpSection     "\\itemize\>"
+-syn match rhelpSection     "\\describe\>"
+-syn match rhelpSection     "\\enumerate\>"
+-syn match rhelpSection     "\\item "
+-syn match rhelpSection     "\\item$"
++syn match rhelpSection    "\\itemize\>"
++syn match rhelpSection    "\\describe\>"
++syn match rhelpSection    "\\enumerate\>"
++syn match rhelpSection    "\\item "
++syn match rhelpSection    "\\item$"
+ syn match rhelpSection		"\\tabular{[lcr]*}"
+ syn match rhelpSection		"\\dontrun\>"
+ syn match rhelpSection		"\\dontshow\>"
+@@ -165,11 +169,11 @@
+ syn match rhelpSection		"\\donttest\>"
+ 
+ " Freely named Sections {{{1
+-syn region rhelpFreesec matchgroup=Delimiter start="\\section{" matchgroup=Delimiter transparent end=/}/ 
+-syn region rhelpFreesubsec matchgroup=Delimiter start="\\subsection{" matchgroup=Delimiter transparent end=/}/ 
++syn region rhelpFreesec matchgroup=Delimiter start="\\section{" matchgroup=Delimiter transparent end="}"
++syn region rhelpFreesubsec matchgroup=Delimiter start="\\subsection{" matchgroup=Delimiter transparent end="}" 
+ 
+ " R help file comments {{{1
+-syn match rhelpComment /%.*$/ contained 
++syn match rhelpComment /%.*$/
+ 
+ " Error {{{1
+ syn region rhelpRegion matchgroup=Delimiter start=/(/ matchgroup=Delimiter end=/)/ transparent contains=ALLBUT,rhelpError,rhelpBraceError,rhelpCurlyError
+diff -u -r --new-file runtime/syntax.orig/tex.vim runtime/syntax/tex.vim
+--- runtime/syntax.orig/tex.vim	2010-08-13 06:58:36.000000000 -0500
++++ runtime/syntax/tex.vim	2011-01-08 08:36:35.000000000 -0600
+@@ -1,8 +1,8 @@
+ " Vim syntax file
+ " Language:	TeX
+ " Maintainer:	Dr. Charles E. Campbell, Jr. <NdrchipO@ScampbellPfamily.AbizM>
+-" Last Change:	Aug 12, 2010 
+-" Version:	57
++" Last Change:	Sep 17, 2010 
++" Version:	60
+ " URL:		http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax
+ "
+ " Notes: {{{1
+@@ -67,11 +67,11 @@
+ "   g:tex_stylish to 1      (for    "*.sty" mode)
+ "    or to           0 else (normal "*.tex" mode)
+ " or on a buffer-by-buffer basis with b:tex_stylish
+-let b:extfname=expand("%:e")
++let s:extfname=expand("%:e")
+ if exists("g:tex_stylish")
+  let b:tex_stylish= g:tex_stylish
+ elseif !exists("b:tex_stylish")
+- if b:extfname == "sty" || b:extfname == "cls" || b:extfname == "clo" || b:extfname == "dtx" || b:extfname == "ltx"
++ if s:extfname == "sty" || s:extfname == "cls" || s:extfname == "clo" || s:extfname == "dtx" || s:extfname == "ltx"
+   let b:tex_stylish= 1
+  else
+   let b:tex_stylish= 0
+@@ -92,12 +92,12 @@
+ " (La)TeX keywords: only use the letters a-zA-Z {{{1
+ " but _ is the only one that causes problems.
+ if version < 600
+-  set isk-=_
++  set isk=a-z,A-Z
+   if b:tex_stylish
+     set isk+=@
+   endif
+ else
+-  setlocal isk-=_
++  setlocal isk=a-z,A-Z
+   if b:tex_stylish
+     setlocal isk+=@
+   endif
+@@ -300,7 +300,7 @@
+ 
+ " Bad Math (mismatched): {{{1
+ if !exists("tex_no_math")
+- syn match texBadMath		"\\end\s*{\s*\(array\|gathered\|bBpvV]matrix\|split\|subequations\|smallmatrix\|xxalignat\)\s*}"
++ syn match texBadMath		"\\end\s*{\s*\(array\|gathered\|bBpvV]matrix\|split\|smallmatrix\|xxalignat\)\s*}"
+  syn match texBadMath		"\\end\s*{\s*\(align\|alignat\|displaymath\|displaymath\|eqnarray\|equation\|flalign\|gather\|math\|multline\|xalignat\)\*\=\s*}"
+  syn match texBadMath		"\\[\])]"
+ endif
+@@ -345,7 +345,6 @@
+  call TexNewMathZone("G","gather",1)
+  call TexNewMathZone("H","math",1)
+  call TexNewMathZone("I","multline",1)
+- call TexNewMathZone("J","subequations",0)
+  call TexNewMathZone("K","xalignat",1)
+  call TexNewMathZone("L","xxalignat",0)
+ 
+@@ -412,7 +411,7 @@
+ syn case ignore
+ syn keyword texTodo		contained		combak	fixme	todo	xxx
+ syn case match
+-if b:extfname == "dtx"
++if s:extfname == "dtx"
+   syn match texComment		"\^\^A.*$"	contains=@texCommentGroup
+   syn match texComment		"^%\+"		contains=@texCommentGroup
+ else
+@@ -468,15 +467,16 @@
+ endif
+ 
+ " Tex Reference Zones: {{{1
+-syn region texZone		matchgroup=texStatement start="@samp{"			end="}\|%stopzone\>"	contains=@texRefGroup
+-syn region texRefZone		matchgroup=texStatement start="\\nocite{"		end="}\|%stopzone\>"	contains=@texRefGroup
+-syn region texRefZone		matchgroup=texStatement start="\\bibliography{"		end="}\|%stopzone\>"	contains=@texRefGroup
+-syn region texRefZone		matchgroup=texStatement start="\\label{"		end="}\|%stopzone\>"	contains=@texRefGroup
+-syn region texRefZone		matchgroup=texStatement start="\\\(page\|eq\)ref{"	end="}\|%stopzone\>"	contains=@texRefGroup
+-syn region texRefZone		matchgroup=texStatement start="\\v\=ref{"		end="}\|%stopzone\>"	contains=@texRefGroup
+-syn match  texRefZone		'\\cite\%([tp]\*\=\)\=' nextgroup=texRefOption,texCite
+-syn region texRefOption	contained	matchgroup=Delimiter start='\[' end=']'		contains=@texRefGroup,texRefZone	nextgroup=texRefOption,texCite
+-syn region texCite	contained	matchgroup=Delimiter start='{' end='}'		contains=@texRefGroup,texRefZone,texCite
++syn match texRefZone		'\\@samp\>'		skipwhite	nextgroup=texRefLabel
++syn match texRefZone		'\\nocite\>'		skipwhite	nextgroup=texRefLabel
++syn match texRefZone		'\\bibliography\>'	skipwhite	nextgroup=texRefLabel
++syn match texRefZone		'\\label\>'		skipwhite	nextgroup=texRefLabel
++syn match texRefZone		'\\\(page\|eq\)ref\>'	skipwhite	nextgroup=texRefLabel
++syn match texRefZone		'\\v\=ref'		skipwhite	nextgroup=texRefLabel
++syn match texRefZone		'\\cite\%([tp]\*\=\)\='	skipwhite	nextgroup=texCiteOption,texCite
++syn region texRefLabel		contained matchgroup=Delimiter start='{'	end='}'	contains=@texRefGroup
++syn region texCiteOption	contained matchgroup=Delimiter start='\['	end=']'	contains=@Spell,@texRefGroup,@texMathZones,texRefZone	nextgroup=texCiteOption,texCite
++syn region texCite		contained matchgroup=Delimiter start='{'	end='}'	contains=@texRefGroup,texCite
+ 
+ " Handle newcommand, newenvironment : {{{1
+ syn match  texNewCmd				"\\newcommand\>"			nextgroup=texCmdName skipwhite skipnl
+@@ -753,7 +753,11 @@
+     \ ['wedge'		, '∧'],
+     \ ['wr'		, '≀']]
+   for texmath in s:texMathList
+-   exe "syn match texMathSymbol '\\\\".texmath[0]."\\>' contained conceal cchar=".texmath[1]
++   if texmath[0] =~ '\w$'
++    exe "syn match texMathSymbol '\\\\".texmath[0]."\\>' contained conceal cchar=".texmath[1]
++   else
++    exe "syn match texMathSymbol '\\\\".texmath[0]."' contained conceal cchar=".texmath[1]
++   endif
+   endfor
+ 
+   if &ambw == "double"
+@@ -1027,7 +1031,6 @@
+    HiLink texError		Error
+   endif
+ 
+-  HiLink texCite		texRefZone
+   HiLink texDefCmd		texDef
+   HiLink texDefName		texDef
+   HiLink texDocType		texCmdName
+@@ -1052,6 +1055,7 @@
+    HiLink texMathZoneV		texMath
+    HiLink texMathZoneZ		texMath
+   endif
++  HiLink texRefZone		Identifier
+   HiLink texSectionMarker	texCmdName
+   HiLink texSectionName		texSection
+   HiLink texSpaceCode		texStatement
+@@ -1060,6 +1064,7 @@
+   HiLink texTypeStyle		texType
+ 
+    " Basic TeX highlighting groups
++  HiLink texCite		Special
+   HiLink texCmdArgs		Number
+   HiLink texCmdName		Statement
+   HiLink texComment		Comment
+@@ -1075,7 +1080,7 @@
+   HiLink texNewCmd		Statement
+   HiLink texNewEnv		Statement
+   HiLink texOption		Number
+-  HiLink texRefZone		Special
++  HiLink texRefLabel		Special
+   HiLink texSection		PreCondit
+   HiLink texSpaceCodeChar	Special
+   HiLink texSpecialChar		SpecialChar
+@@ -1089,6 +1094,6 @@
+ endif
+ 
+ " Current Syntax: {{{1
+-unlet b:extfname
++unlet s:extfname
+ let   b:current_syntax = "tex"
+ " vim: ts=8 fdm=marker
+diff -u -r --new-file runtime/syntax.orig/vim.vim runtime/syntax/vim.vim
+--- runtime/syntax.orig/vim.vim	2010-08-04 15:21:21.000000000 -0500
++++ runtime/syntax/vim.vim	2011-01-08 08:32:58.000000000 -0600
+@@ -1,8 +1,8 @@
+ " Vim syntax file
+ " Language:	Vim 7.3 script
+ " Maintainer:	Dr. Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz>
+-" Last Change:	August 04, 2010
+-" Version:	7.3-04
++" Last Change:	August 20, 2010
++" Version:	7.3-05
+ " Automatically generated keyword lists: {{{1
+ 
+ " Quit when a syntax file was already loaded {{{2
+@@ -16,12 +16,14 @@
+ syn cluster vimCommentGroup	contains=vimTodo,@Spell
+ 
+ " regular vim commands {{{2
+-syn keyword vimCommand contained	abc[lear] argdo argu[ment] bel[owright] bN[ext] breakd[el] b[uffer] caddb[uffer] cb[uffer] cex[pr] cg[etfile] checkt[ime] cnew[er] col[der] con[tinue] cq[uit] delc[ommand] diffoff diffu[pdate] dr[op] echom[sg] em[enu] endt[ry] exi[t] fina[lly] fix[del] foldd[oopen] go[to] hid[e] ij[ump] isp[lit] k laddb[uffer] la[st] lch[dir] lex[pr] lgete[xpr] l[ist] lmak[e] lN[ext] loc[kmarks] lpf[ile] lt[ag] lv[imgrep] ma[rk] mk[exrc] mkv[imrc] mz[scheme] new noh[lsearch] on[ly] ped[it] popu prev[ious] prof[ile] pta[g] ptn[ext] pts[elect] py[thon] r[ead] redr[aw] ret[ab] rightb[elow] rundo san[dbox] sbf[irst] sbN[ext] scripte[ncoding] setg[lobal] sh[ell] sla[st] sme sni[ff] sor[t] spelli[nfo] sp[lit] startg[replace] st[op] sunme syncbind tabd[o] tabl[ast] tabN[ext] tabs tcld[o] th[row] tm[enu] tp[revious] tu undoj[oin] uns[ilent] vert[ical] vi[sual] wa[ll] winp[os] wp[revious] ws[verb] xa[ll] xmenu xnoremenu
+-syn keyword vimCommand contained	abo[veleft] arge[dit] as[cii] bf[irst] bo[tright] breakl[ist] buffers cad[dexpr] cc cf[ile] c[hange] cla[st] cn[ext] colo[rscheme] cope[n] cr[ewind] d[elete] diffpatch dig[raphs] ds[earch] echon emenu* endw[hile] f[ile] fin[d] fo[ld] foldo[pen] gr[ep] his[tory] il[ist] iuna[bbrev] keepalt lad[dexpr] later lcl[ose] lf[ile] lg[etfile] ll lmapc[lear] lnf[ile] lockv[ar] lp[revious] lua lvimgrepa[dd] marks mks[ession] mod[e] nbc[lose] n[ext] nu[mber] o[pen] pe[rl] popu[p] p[rint] promptf[ind] ptf[irst] ptN[ext] pu[t] qa[ll] rec[over] redraws[tatus] retu[rn] rub[y] ru[ntime] sa[rgument] sbl[ast] sbp[revious] scrip[tnames] setl[ocal] sign sl[eep] smenu sno[magic] so[urce] spellr[epall] spr[evious] star[tinsert] stopi[nsert] sunmenu t tabe[dit] tabm[ove] tabo[nly] ta[g] tclf[ile] tj[ump] tn[ext] tr[ewind] tu[nmenu] undol[ist] up[date] vie[w] vmapc[lear] wh[ile] win[size] wq wundo x[it] XMLent xunme
+-syn keyword vimCommand contained	al[l] argg[lobal] bad[d] bl[ast] bp[revious] br[ewind] bun[load] caddf[ile] ccl[ose] cfir[st] changes cl[ist] cN[ext] comc[lear] co[py] cuna[bbrev] delf[unction] diffpu[t] di[splay] dsp[lit] e[dit] endfo[r] ene[w] files fini[sh] foldc[lose] for grepa[dd] iabc[lear] imapc[lear] j[oin] keepj[umps] laddf[ile] lb[uffer] le[ft] lfir[st] lgr[ep] lla[st] lnew[er] lNf[ile] lol[der] lr[ewind] luado lw[indow] mat[ch] mksp[ell] m[ove] nb[key] N[ext] ol[dfiles] opt[ions] perld[o] pp[op] P[rint] promptr[epl] ptj[ump] ptp[revious] pw[d] q[uit] redi[r] reg[isters] rew[ind] rubyd[o] rv[iminfo] sav[eas] sbm[odified] sbr[ewind] se[t] sf[ind] sil[ent] sm[agic] sn[ext] snoreme spelld[ump] spellu[ndo] sre[wind] startr[eplace] sts[elect] sus[pend] tab tabf[ind] tabnew tabp[revious] tags te[aroff] tl[ast] tN[ext] try una[bbreviate] unh[ide] verb[ose] vim[grep] vne[w] winc[md] wn[ext] wqa[ll] wv[iminfo] xmapc[lear] XMLns xunmenu
+-syn keyword vimCommand contained	arga[dd] argl[ocal] ba[ll] bm[odified] brea[k] bro[wse] bw[ipeout] cal[l] cd cgetb[uffer] chd[ir] clo[se] cnf[ile] comp[iler] cpf[ile] cw[indow] delm[arks] diffsplit dj[ump] earlier el[se] endf[unction] ex filetype fir[st] folddoc[losed] fu[nction] ha[rdcopy] if is[earch] ju[mps] kee[pmarks] lan[guage] lc[d] lefta[bove] lgetb[uffer] lgrepa[dd] lli[st] lne[xt] lo[adview] lop[en] ls luafile mak[e] menut[ranslate] mkvie[w] mzf[ile] nbs[tart] nmapc[lear] omapc[lear] pc[lose] po[p] pre[serve] profd[el] ps[earch] ptl[ast] ptr[ewind] pyf[ile] quita[ll] red[o] res[ize] ri[ght] rubyf[ile] sal[l] sba[ll] sbn[ext] sb[uffer] setf[iletype] sfir[st] sim[alt] sm[ap] sN[ext] snoremenu spe[llgood] spellw[rong] sta[g] stj[ump] sun[hide] sv[iew] tabc[lose] tabfir[st] tabn[ext] tabr[ewind] tc[l] tf[irst] tm to[pleft] ts[elect] u[ndo] unlo[ckvar] ve[rsion] vimgrepa[dd] vs[plit] windo wN[ext] w[rite] X xme xnoreme y[ank]
+-syn keyword vimCommand contained	argd[elete] ar[gs] bd[elete] bn[ext] breaka[dd] bufdo cabc[lear] cat[ch] ce[nter] cgete[xpr] che[ckpath] cmapc[lear] cNf[ile] conf[irm] cp[revious] debugg[reedy] diffg[et] diffthis dl[ist] echoe[rr] elsei[f] en[dif] 
+-syn match   vimCommand contained	"\<z[-+^.=]"
++syn keyword vimCommand contained	a arga[dd] argu[ment] bd[elete] bN[ext] breakd[el] buf c cal[l] ce[nter] cg[etfile] cl cn cNf comc[lear] cope[n] cr[ewind] d d[elete] diffo diffsplit di[splay] ds[earch] ec e:e:e en endt[ry] exu[sage] filetype fix[del] for go[to] h hi if intro k la lan[guage] lch[dir] let@ lg[etfile] lla[st] lnew[er] lNf[ile] loc[kmarks] lr[ewind] lv[imgrep] ma[rk] messages mkv mv n new noautocmd on[ly] p:~ perld[o] popu[p] p[rint] promptr[epl] ptl[ast] ptr[ewind] py3file q[uit] r[ead] redraws[tatus] ret[ab] r:r:r ru[ntime] sba[ll] sbp[revious] scs sf[ind] sil[ent] sm[ap] sno[magic] so[urce] spellr[epall] st startr[eplace] sunme sw[apname] t tabf[ind] tabn[ext] ta[g] tf[irst] tn tp[revious] tu undoj[oin] up[date] vi vmapc[lear] win wN[ext] wundo xmapc[lear] xnoremenu
++syn keyword vimCommand contained	ab argd[elete] as[cii] bel[owright] bo[tright] breakl[ist] bufdo cabc[lear] cat[ch] cex[pr] c[hange] cla[st] cN cnf[ile] comment co[py] cs de delf diffoff difft dj[ump] dsp[lit] echoe[rr] e:e:r endf endw[hile] f fin fo[ld] fu gr[ep] ha[rdcopy] hid[e] ij[ump] is[earch] keepa lad la[st] lcl[ose] lex[pr] lgr[ep] lli[st] lne[xt] lo lockv[ar] ls lvimgrepa[dd] marks mk mkvie[w] Mycmd N n[ext] noh[lsearch] o[pen] P p:gs? pp[op] P[rint] ps[earch] ptn pts[elect] pyf[ile] quita[ll] rec[over] reg[isters] retu[rn] ru rv[iminfo] sbf[irst] sbr[ewind] scscope sfir[st] sim[alt] sme snoreme s?pat?sub? spellu[ndo] sta[g] stj[ump] sunmenu sy ta tabfir[st] tabN[ext] tags th[row] tN tr tu[nmenu] undol[ist] v vie[w] vne[w] winc[md] wp[revious] wv[iminfo] xme xterm
++syn keyword vimCommand contained	abc[lear] argdo au bf[irst] bp[revious] br[ewind] b[uffer] cad cb[uffer] cf[ile] changes cl[ist] cnew[er] cNf[ile] comp[iler] count cscope debug delf[unction] DiffOrig diffthis dl[ist] dwim echom[sg] el[se] endfo[r] ene[w] f[ile] fina[lly] foldc[lose] fun grepa[dd] h[elp] his[tory] il[ist] isp[lit] keepalt laddb[uffer] lat lcs lf[ile] lgrepa[dd] lmak[e] lN[ext] loadk lol[der] lt[ag] lw[indow] mat[ch] mkdir mkv[imrc] MyCommand nbc[lose] N[ext] nu[mber] opt[ions] pc[lose] p:h pr pro p:t ptN pu[t] py[thon] quote red Ren rew[ind] rub[y] sal[l] sbl[ast] sb[uffer] se[t] sh[ell] sl smenu snoremenu spe spellw[rong] star st[op] sus[pend] syn tab tabl[ast] tabo[nly] tc[l] tj[ump] tn[ext] t:r u unh[ide] ve vim[grep] vs[plit] windo wq x xmenu xunme
++syn keyword vimCommand contained	abo[veleft] arge[dit] bad[d] bl[ast] br bro[wse] buffers caddb[uffer] cc cfir[st] chd[ir] clo[se] cn[ext] col[der] con cpf[ile] cstag debugg[reedy] delm[arks] diffp diffu[pdate] do e echon elsei[f] endfun Error filename fin[d] folddoc[losed] fu[nction] gs?pat?sub? helpf[ind] i imapc[lear] iuna[bbrev] keepj[umps] lad[dexpr] later lcscope lfir[st] lh[elpgrep] lmapc[lear] lnf loadkeymap lop[en] lua ma menut mk[exrc] mo mz nb[key] nkf o ownsyntax pe p:h:h p:r profd[el] pta[g] ptn[ext] pw[d] python3 r redi[r] Rena ri[ght] rubyd[o] san[dbox] sbm[odified] scrip setf[iletype] si sla[st] sn[ext] s@\n@\=\r" spelld[ump] sp[lit] start stopi[nsert] s?version?main? sync tabc[lose] tabm[ove] tabp[revious] tcld[o] tl[ast] tN[ext] tr[ewind] un unl verb[ose] vimgrepa[dd] w winp[os] wqa[ll] X XMLent xunmenu
++syn keyword vimCommand contained	al[l] argg[lobal] ba[ll] bm[odified] brea[k] browseset bun[load] cad[dexpr] ccl[ose] cgetb[uffer] che[ckpath] cmapc[lear] cN[ext] colo[rscheme] conf[irm] cp[revious] cuna[bbrev] del di diffpatch dig doau ea e[dit] em[enu] endf[unction] ex files fini[sh] foldd[oopen] g gui helpg[rep] ia in j[oin] kee[pmarks] laddf[ile] lb[uffer] le[ft] lgetb[uffer] l[ist] lN lNf lo[adview] lpf[ile] luado mak[e] menut[ranslate] mks[ession] mod[e] mzf[ile] nbs[tart] nmapc[lear] ol[dfiles] p ped[it] po[p] pre[serve] prof[ile] ptf[irst] ptN[ext] py q re red[o] Renu rightb[elow] rubyf[ile] sa[rgument] sbn[ext] scripte[ncoding] setg[lobal] sig sl[eep] sN[ext] so spe[llgood] spr[evious] startg[replace] sts[elect] s?version?main?:p syncbind tabd[o] tabN tabr[ewind] tclf[ile] tm TOhtml try una[bbreviate] unlo[ckvar] ve[rsion] vi[sual] wa[ll] win[size] w[rite] xa[ll] XMLns xwininfo
++syn keyword vimCommand contained	Allargs argl[ocal] bar bn[ext] breaka[dd] bu bw[ipeout] caddf[ile] cd cgete[xpr] checkt[ime] cmdname cnf com con[tinue] cq[uit] cw[indow] delc[ommand] diffg[et] diffpu[t] dig[raphs] dr[op] earlier e:e emenu* en[dif] exi[t] filet fir[st] foldo[pen] get gvim helpt[ags] iabc[lear] index ju[mps] l lan lc[d] lefta[bove] lgete[xpr] ll lne lnf[ile] locale lp[revious] luafile Man mes mksp[ell] m[ove] mz[scheme] ne noa omapc[lear] p: pe[rl] popu prev[ious] promptf[ind] ptj[ump] ptp[revious] py3 qa[ll] r:e redr[aw] res[ize] r:r rundo sav[eas] sbN[ext] scrip[tnames] setl[ocal] sign sm[agic] sni[ff] sor[t] spelli[nfo] sre[wind] star[tinsert] sun[hide] sv[iew] synlist tabe[dit] tabnew tabs te[aroff] tm[enu] to[pleft] ts[elect] u[ndo] uns[ilent] vert[ical] viu[sage] wh[ile] wn[ext] ws[verb] x[it] xnoreme y[ank]
++syn keyword vimCommand contained	ar ar[gs] 
++syn match   vimCommand contained	"\<z[-+^.=]\="
+ 
+ " vimOptions are caught only when contained in a vimSet {{{2
+ syn keyword vimOption contained	acd ambiwidth arabicshape autowriteall backupdir bdlay binary breakat bufhidden cd ci cinw co commentstring confirm cpoptions cscopetag csto cwh dg dip eadirection ek equalprg ex fdi fen fileencodings flp foldexpr foldnestmax fp gfm grepformat guifontwide helpheight highlight hlg im imi incsearch infercase isk keymap langmenu linespace loadplugins macatsui maxcombine mef mls modelines mousehide mp nu omnifunc paragraphs penc pm printdevice printoptions quoteescape restorescreen rnu rulerformat scr sect sft shellredir shm showmode sj smd spell splitbelow ssl stl sw sxq tabpagemax tags tbis terse thesaurus titleold toolbariconsize tsr ttyfast tx undofile ut verbosefile virtualedit wb wfw wildcharm winaltkeys winminwidth wmnu write
+@@ -318,7 +320,7 @@
+ " ====
+ syn match	vimMap		"\<map\>!\=\ze\s*[^(]" skipwhite nextgroup=vimMapMod,vimMapLhs
+ syn keyword	vimMap		cm[ap] cno[remap] im[ap] ino[remap] lm[ap] ln[oremap] nm[ap] nn[oremap] no[remap] om[ap] ono[remap] smap snor[emap] vm[ap] vn[oremap] xm[ap] xn[oremap] skipwhite nextgroup=vimMapBang,vimMapMod,vimMapLhs
+-syn keyword	vimMap		mapc[lear]
++syn keyword	vimMap		mapc[lear] smapc[lear]
+ syn keyword	vimUnmap		cu[nmap] iu[nmap] lu[nmap] nun[map] ou[nmap] sunm[ap] unm[ap] unm[ap] vu[nmap] xu[nmap] skipwhite nextgroup=vimMapBang,vimMapMod,vimMapLhs
+ syn match	vimMapLhs	contained	"\S\+"			contains=vimNotation,vimCtrlChar skipwhite nextgroup=vimMapRhs
+ syn match	vimMapBang	contained	"!"			skipwhite nextgroup=vimMapMod,vimMapLhs
+@@ -552,7 +554,7 @@
+ if !filereadable(s:luapath)
+  let s:luapath= globpath(&rtp,"syntax/lua.vim")
+ endif
+-if (g:vimsyn_embed =~ 'p' && has("lua")) && filereadable(s:luapath)
++if (g:vimsyn_embed =~ 'l' && has("lua")) && filereadable(s:luapath)
+  unlet! b:current_syntax
+  exe "syn include @vimLuaScript ".s:luapath
+  if exists("g:vimsyn_folding") && g:vimsyn_folding =~ 'l'
+diff -u -r --new-file runtime/syntax.orig/xf86conf.vim runtime/syntax/xf86conf.vim
+--- runtime/syntax.orig/xf86conf.vim	2010-05-15 06:03:56.000000000 -0500
++++ runtime/syntax/xf86conf.vim	2011-01-08 08:35:02.000000000 -0600
+@@ -1,8 +1,8 @@
+ " Vim syntax file
+ " This is a GENERATED FILE. Please always refer to source file at the URI below.
+ " Language: XF86Config (XFree86 configuration file)
+-" Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
+-" Last Change: 2005 Jul 12
++" Former Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
++" Last Change: 2010 Nov 01
+ " URL: http://trific.ath.cx/Ftp/vim/syntax/xf86conf.vim
+ " Required Vim Version: 6.0
+ "
+@@ -63,7 +63,7 @@
+ 
+ " Sections and subsections
+ if b:xf86conf_xfree86_version >= 4
+-	syn region xf86confSection matchgroup=xf86confSectionDelim start="^\s*Section\s\+\"\(Files\|Server[_ ]*Flags\|Input[_ ]*Device\|Device\|Video[_ ]*Adaptor\|Server[_ ]*Layout\|DRI\|Extensions\|Vendor\|Keyboard\|Pointer\)\"" end="^\s*EndSection\>" skip="#.*$\|\"[^\"]*\"" contains=xf86confComment,xf86confOption,xf86confKeyword,xf86confSectionError
++	syn region xf86confSection matchgroup=xf86confSectionDelim start="^\s*Section\s\+\"\(Files\|Server[_ ]*Flags\|Input[_ ]*Device\|Device\|Video[_ ]*Adaptor\|Server[_ ]*Layout\|DRI\|Extensions\|Vendor\|Keyboard\|Pointer\|InputClass\)\"" end="^\s*EndSection\>" skip="#.*$\|\"[^\"]*\"" contains=xf86confComment,xf86confOption,xf86confKeyword,xf86confSectionError
+ 	syn region xf86confSectionModule matchgroup=xf86confSectionDelim start="^\s*Section\s\+\"Module\"" end="^\s*EndSection\>" skip="#.*$\|\"[^\"]*\"" contains=xf86confSubsectionAny,xf86confComment,xf86confOption,xf86confKeyword
+ 	syn region xf86confSectionMonitor matchgroup=xf86confSectionDelim start="^\s*Section\s\+\"Monitor\"" end="^\s*EndSection\>" skip="#.*$\|\"[^\"]*\"" contains=xf86confSubsectionMode,xf86confModeLine,xf86confComment,xf86confOption,xf86confKeyword
+ 	syn region xf86confSectionModes matchgroup=xf86confSectionDelim start="^\s*Section\s\+\"Modes\"" end="^\s*EndSection\>" skip="#.*$\|\"[^\"]*\"" contains=xf86confSubsectionMode,xf86confModeLine,xf86confComment
+@@ -165,7 +165,7 @@
+ 
+ " Synchronization
+ if b:xf86conf_xfree86_version >= 4
+-	syn sync match xf86confSyncSection grouphere xf86confSection "^\s*Section\s\+\"\(Files\|Server[_ ]*Flags\|Input[_ ]*Device\|Device\|Video[_ ]*Adaptor\|Server[_ ]*Layout\|DRI\|Extensions\|Vendor\|Keyboard\|Pointer\)\""
++	syn sync match xf86confSyncSection grouphere xf86confSection "^\s*Section\s\+\"\(Files\|Server[_ ]*Flags\|Input[_ ]*Device\|Device\|Video[_ ]*Adaptor\|Server[_ ]*Layout\|DRI\|Extensions\|Vendor\|Keyboard\|Pointer\|InputClass\)\""
+ 	syn sync match xf86confSyncSectionModule grouphere xf86confSectionModule "^\s*Section\s\+\"Module\""
+ 	syn sync match xf86confSyncSectionModes groupthere xf86confSectionModes "^\s*Section\s\+\"Modes\""
+ else
+diff -u -r --new-file runtime/syntax.orig/xquery.vim runtime/syntax/xquery.vim
+--- runtime/syntax.orig/xquery.vim	2010-05-15 06:03:56.000000000 -0500
++++ runtime/syntax/xquery.vim	2011-01-08 08:23:05.000000000 -0600
+@@ -1,10 +1,11 @@
+ " Vim syntax file
+ " Language:	XQuery
+-" Author:	Jean-Marc Vanel <http://jmvanel.free.fr/>
+-" Last Change:	mar jui 12 18:04:05 CEST 2005
++" Author: René Neumann <necoro@necoro.eu>
++" Author: Steve Spigarelli <http://spig.net/>
++" Original Author:	Jean-Marc Vanel <http://jmvanel.free.fr/>
++" Last Change:	December 11, 2010
+ " Filenames:	*.xq
+ " URL:		http://jmvanel.free.fr/vim/xquery.vim
+-" $Id: xquery.vim,v 1.1 2005/07/18 21:44:56 vimboss Exp $
+ 
+ " REFERENCES:
+ "   [1] http://www.w3.org/TR/xquery/
+@@ -14,22 +15,26 @@
+     finish
+ endif
+ 
++" - is allowed in keywords
++setlocal iskeyword+=-
++
+ runtime syntax/xml.vim
+ 
+ syn case match
+ 
+ " From XQuery grammar:
+-syn	keyword	xqueryStatement ancestor ancestor-or-self and as ascending at attribute base-uri by case cast castable child collation construction declare default descendant descendant-or-self descending div document element else empty encoding eq every except external following following-sibling for function ge greatest gt idiv if import in inherit-namespaces instance intersect is le least let lt mod module namespace ne no of or order ordered ordering parent preceding preceding-sibling preserve return satisfies schema self some stable strip then to treat typeswitch union unordered validate variable version where xmlspace xquery yes
++syn keyword xqStatement ancestor ancestor-or-self and as ascending at attribute base-uri boundary-space by case cast castable child collation construction declare default descendant descendant-or-self descending div document element else empty encoding eq every except external following following-sibling for function ge greatest gt idiv if import in inherit-namespaces instance intersect is le least let lt mod module namespace ne no of or order ordered ordering parent preceding preceding-sibling preserve return satisfies schema self some stable strip then to treat typeswitch union unordered validate variable version where xmlspace xquery yes
+ 
+ " TODO contains clashes with vim keyword
+-syn	keyword	xqueryFunction abs adjust-date-to-timezone adjust-date-to-timezone adjust-dateTime-to-timezone adjust-dateTime-to-timezone adjust-time-to-timezone adjust-time-to-timezone avg base-uri base-uri boolean ceiling codepoint-equal codepoints-to-string collection collection compare concat count current-date current-dateTime current-time data dateTime day-from-date day-from-dateTime days-from-duration deep-equal deep-equal default-collation distinct-values distinct-values doc doc-available document-uri empty ends-with ends-with error error error error escape-uri exactly-one exists false floor hours-from-dateTime hours-from-duration hours-from-time id id idref idref implicit-timezone in-scope-prefixes index-of index-of insert-before lang lang last local-name local-name local-name-from-QName lower-case matches matches max max min min minutes-from-dateTime minutes-from-duration minutes-from-time month-from-date month-from-dateTime months-from-duration name name namespace-uri namespace-uri namespace-uri-for-prefix namespace-uri-from-QName nilled node-name normalize-space normalize-space normalize-unicode normalize-unicode not number number one-or-more position prefix-from-QName QName remove replace replace resolve-QName resolve-uri resolve-uri reverse root root round round-half-to-even round-half-to-even seconds-from-dateTime seconds-from-duration seconds-from-time starts-with starts-with static-base-uri string string string-join string-length string-length string-to-codepoints subsequence subsequence substring substring substring-after substring-after substring-before substring-before sum sum timezone-from-date timezone-from-dateTime timezone-from-time tokenize tokenize trace translate true unordered upper-case year-from-date year-from-dateTime years-from-duration zero-or-one
++syn	keyword	xqFunction abs adjust-date-to-timezone adjust-date-to-timezone adjust-dateTime-to-timezone adjust-dateTime-to-timezone adjust-time-to-timezone adjust-time-to-timezone avg base-uri base-uri boolean ceiling codepoint-equal codepoints-to-string collection collection compare concat count current-date current-dateTime current-time data dateTime day-from-date day-from-dateTime days-from-duration deep-equal deep-equal default-collation distinct-values distinct-values doc doc-available document-uri empty ends-with ends-with error error error error escape-uri exactly-one exists false floor hours-from-dateTime hours-from-duration hours-from-time id id idref idref implicit-timezone in-scope-prefixes index-of index-of insert-before lang lang last local-name local-name local-name-from-QName lower-case matches matches max max min min minutes-from-dateTime minutes-from-duration minutes-from-time month-from-date month-from-dateTime months-from-duration name name namespace-uri namespace-uri namespace-uri-for-prefix namespace-uri-from-QName nilled node-name normalize-space normalize-space normalize-unicode normalize-unicode not number number one-or-more position prefix-from-QName QName remove replace replace resolve-QName resolve-uri resolve-uri reverse root root round round-half-to-even round-half-to-even seconds-from-dateTime seconds-from-duration seconds-from-time starts-with starts-with static-base-uri string string string-join string-length string-length string-to-codepoints subsequence subsequence substring substring substring-after substring-after substring-before substring-before sum sum timezone-from-date timezone-from-dateTime timezone-from-time tokenize tokenize trace translate true unordered upper-case year-from-date year-from-dateTime years-from-duration zero-or-one
++
++syn keyword xqOperator add-dayTimeDuration-to-date add-dayTimeDuration-to-dateTime add-dayTimeDuration-to-time add-dayTimeDurations add-yearMonthDuration-to-date add-yearMonthDuration-to-dateTime add-yearMonthDurations base64Binary-equal boolean-equal boolean-greater-than boolean-less-than concatenate date-equal date-greater-than date-less-than dateTime-equal dateTime-greater-than dateTime-less-than dayTimeDuration-equal dayTimeDuration-greater-than dayTimeDuration-less-than divide-dayTimeDuration divide-dayTimeDuration-by-dayTimeDuration divide-yearMonthDuration divide-yearMonthDuration-by-yearMonthDuration except gDay-equal gMonth-equal gMonthDay-equal gYear-equal gYearMonth-equal hexBinary-equal intersect is-same-node multiply-dayTimeDuration multiply-yearMonthDuration node-after node-before NOTATION-equal numeric-add numeric-divide numeric-equal numeric-greater-than numeric-integer-divide numeric-less-than numeric-mod numeric-multiply numeric-subtract numeric-unary-minus numeric-unary-plus QName-equal subtract-dates-yielding-dayTimeDuration subtract-dateTimes-yielding-dayTimeDuration subtract-dayTimeDuration-from-date subtract-dayTimeDuration-from-dateTime subtract-dayTimeDuration-from-time subtract-dayTimeDurations subtract-times subtract-yearMonthDuration-from-date subtract-yearMonthDuration-from-dateTime subtract-yearMonthDurations time-equal time-greater-than time-less-than to union yearMonthDuration-equal yearMonthDuration-greater-than yearMonthDuration-less-than
+ 
+-syn	keyword	xqueryOperator add-dayTimeDuration-to-date add-dayTimeDuration-to-dateTime add-dayTimeDuration-to-time add-dayTimeDurations add-yearMonthDuration-to-date add-yearMonthDuration-to-dateTime add-yearMonthDurations base64Binary-equal boolean-equal boolean-greater-than boolean-less-than concatenate date-equal date-greater-than date-less-than dateTime-equal dateTime-greater-than dateTime-less-than dayTimeDuration-equal dayTimeDuration-greater-than dayTimeDuration-less-than divide-dayTimeDuration divide-dayTimeDuration-by-dayTimeDuration divide-yearMonthDuration divide-yearMonthDuration-by-yearMonthDuration except gDay-equal gMonth-equal gMonthDay-equal gYear-equal gYearMonth-equal hexBinary-equal intersect is-same-node multiply-dayTimeDuration multiply-yearMonthDuration node-after node-before NOTATION-equal numeric-add numeric-divide numeric-equal numeric-greater-than numeric-integer-divide numeric-less-than numeric-mod numeric-multiply numeric-subtract numeric-unary-minus numeric-unary-plus QName-equal subtract-dates-yielding-dayTimeDuration subtract-dateTimes-yielding-dayTimeDuration subtract-dayTimeDuration-from-date subtract-dayTimeDuration-from-dateTime subtract-dayTimeDuration-from-time subtract-dayTimeDurations subtract-times subtract-yearMonthDuration-from-date subtract-yearMonthDuration-from-dateTime subtract-yearMonthDurations time-equal time-greater-than time-less-than to union yearMonthDuration-equal yearMonthDuration-greater-than yearMonthDuration-less-than
++syn match xqType "xs:\(\|Datatype\|primitive\|string\|boolean\|float\|double\|decimal\|duration\|dateTime\|time\|date\|gYearMonth\|gYear\|gMonthDay\|gDay\|gMonth\|hexBinary\|base64Binary\|anyURI\|QName\|NOTATION\|\|normalizedString\|token\|language\|IDREFS\|ENTITIES\|NMTOKEN\|NMTOKENS\|Name\|NCName\|ID\|IDREF\|ENTITY\|integer\|nonPositiveInteger\|negativeInteger\|long\|int\|short\|byte\|nonNegativeInteger\|unsignedLong\|unsignedInt\|unsignedShort\|unsignedByte\|positiveInteger\)"
+ 
+-syn	match	xqueryType "xs:\(\|Datatype\|primitive\|string\|boolean\|float\|double\|decimal\|duration\|dateTime\|time\|date\|gYearMonth\|gYear\|gMonthDay\|gDay\|gMonth\|hexBinary\|base64Binary\|anyURI\|QName\|NOTATION\|\|normalizedString\|token\|language\|IDREFS\|ENTITIES\|NMTOKEN\|NMTOKENS\|Name\|NCName\|ID\|IDREF\|ENTITY\|integer\|nonPositiveInteger\|negativeInteger\|long\|int\|short\|byte\|nonNegativeInteger\|unsignedLong\|unsignedInt\|unsignedShort\|unsignedByte\|positiveInteger\)"
+ 
+ " From XPath grammar:
+-syn	keyword	xqueryXPath some every in in satisfies if then else to div idiv mod union intersect except instance of treat castable cast eq ne lt le gt ge is child descendant attribute self descendant-or-self following-sibling following namespace parent ancestor preceding-sibling preceding ancestor-or-self void item node document-node text comment processing-instruction attribute schema-attribute schema-element
++syn keyword xqXPath some every in in satisfies if then else to div idiv mod union intersect except instance of treat castable cast eq ne lt le gt ge is child descendant attribute self descendant-or-self following-sibling following namespace parent ancestor preceding-sibling preceding ancestor-or-self void item node document-node text comment processing-instruction attribute schema-attribute schema-element
+ 
+ " eXist extensions
+ syn	match xqExist "&="
+@@ -37,44 +42,41 @@
+ " XQdoc
+ syn	match	XQdoc contained "@\(param\|return\|author\)\>" 
+ 
+-highlight def link	xqueryStatement	Statement
+-highlight def link	xqueryFunction	Function
+-highlight def link	xqueryOperator	Operator
+-highlight def link	xqueryType		Type
+-highlight def link	xqueryXPath		Operator
+-highlight def link	XQdoc			Special
+-highlight def link	xqExist			Operator
+-
+-
+-"floating point number, with dot, optional exponent
+-syn match	cFloat		"\d\+\.\d*\(e[-+]\=\d\+\)\=[fl]\="
+-"floating point number, starting with a dot, optional exponent
+-syn match	cFloat		"\.\d\+\(e[-+]\=\d\+\)\=[fl]\=\>"
+-"floating point number, without dot, with exponent
+-syn match	cFloat		"\d\+e[-+]\=\d\+[fl]\=\>"
+-syn match	cNumber		"0x\x\+\(u\=l\{0,2}\|ll\=u\)\>"
+-syn match	cNumber		 "\<\d\+\>"
+-highlight def link	cNumber	Number
+-highlight def link	cFloat	Number
+-
+-syn region	xqComment	start='(:' excludenl end=':)' contains=XQdoc
+-highlight def link	xqComment	Comment
+-" syntax match	xqVariable	"$\w\+"
+-syntax match	xqVariable	+$\<[a-zA-Z:_][-.0-9a-zA-Z0-9:_]*\>+
+-highlight def link	xqVariable	Identifier
+-
+-" Redefine the default XML highlighting:
+-highlight def link	xmlTag		Structure
+-highlight def link	xmlTagName	Structure
+-highlight def link	xmlEndTag	Structure
+-
+-syntax match	xqSeparator	",\|;"
+-highlight link	xqSeparator	Operator
+-
+-syn region	xqCode	transparent contained start='{' excludenl end='}' contains=xmlRegionBis,xqComment,xqueryStatement,xmlString,xqSeparator,cNumber,xqVariable keepend extend
++" floating point number, with dot, optional exponent
++syn match xqFloat   "\d\+\.\d*\(e[-+]\=\d\+\)\=[fl]\="
++" floating point number, starting with a dot, optional exponent
++syn match xqFloat   "\.\d\+\(e[-+]\=\d\+\)\=[fl]\=\>"
++" floating point number, without dot, with exponent
++syn match xqFloat   "\d\+e[-+]\=\d\+[fl]\=\>"
++syn match xqNumber  "0x\x\+\(u\=l\{0,2}\|ll\=u\)\>"
++syn match xqNumber  "\<\d\+\>"
++
++syn region xqString  start=+"+ end=+"+
++syn region xqComment start='(:' excludenl end=':)' contains=XQdoc
++
++syn match xqVariable "$\<[a-zA-Z:_][-.0-9a-zA-Z0-9:_]*\>"
++syn match xqSeparator ",\|;"
++syn region xqCode transparent contained start='{' excludenl end='}' contains=xqFunction,xqCode,xmlRegionBis,xqComment,xqStatement,xmlString,xqSeparator,xqNumber,xqVariable,xqString keepend extend
+ 
+ syn region xmlRegionBis start=+<\z([^ /!?<>"']\+\)+ skip=+<!--\_.\{-}-->+ end=+</\z1\_\s\{-}>+ end=+/>+ fold contains=xmlTag,xmlEndTag,xmlCdata,xmlRegionBis,xmlComment,xmlEntity,xmlProcessing,xqCode keepend extend
+ 
+-syn region	List	transparent start='(' excludenl end=')' contains=xqCode,xmlRegion,xqComment,xqSeparator,xqueryStatement,xqVariable,xqueryType  keepend extend
+-
++hi def link xqNumber    Number
++hi def link xqFloat     Number
++hi def link xqString    String
++hi def link xqVariable  Identifier
++hi def link xqComment   Comment
++hi def link xqSeparator Operator
++hi def link xqStatement Statement
++hi def link xqFunction  Function
++hi def link xqOperator  Operator
++hi def link xqType      Type
++hi def link xqXPath     Operator
++hi def link XQdoc       Special
++hi def link xqExist     Operator
++
++" override the xml highlighting
++"hi link xmlTag      Structure
++"hi link xmlTagName  Structure
++"hi link xmlEndTag   Structure
+ 
++let b:current_syntax = "xquery"
+diff -u -r --new-file runtime/syntax.orig/yacc.vim runtime/syntax/yacc.vim
+--- runtime/syntax.orig/yacc.vim	2010-08-02 10:40:18.000000000 -0500
++++ runtime/syntax/yacc.vim	2011-01-08 08:23:05.000000000 -0600
+@@ -1,12 +1,22 @@
+ " Vim syntax file
+ " Language:	Yacc
+ " Maintainer:	Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz>
+-" Last Change:	Aug 2, 2010
+-" Version:	8
++" Last Change:	Aug 12, 2010
++" Version:	9
+ " URL:	http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax
+ "
+ " Options: {{{1
+ "   g:yacc_uses_cpp : if this variable exists, then C++ is loaded rather than C
++"
++" Overall layout of a bison/yacc grammer:
++"   %{
++"    Prolog
++"   %}
++"   Bison/Yacc Declarations
++"   %%
++"   Grammar Rules
++"   %%
++"   Epilogue
+ 
+ " ---------------------------------------------------------------------
+ " this version of syntax/yacc.vim requires 6.0 or later
+@@ -35,7 +45,7 @@
+ 
+ " ---------------------------------------------------------------------
+ "  Yacc Clusters: {{{1
+-syn cluster yaccInitCluster	contains=yaccKey,yaccKeyActn,yaccBrkt,yaccType,yaccString,yaccUnionStart,yaccHeader2,yaccComment,yaccDefines,yaccParseParam
++syn cluster yaccInitCluster	contains=yaccKey,yaccKeyActn,yaccBrkt,yaccType,yaccString,yaccUnionStart,yaccHeader2,yaccComment,yaccDefines,yaccParseParam,yaccParseOption
+ syn cluster yaccRulesCluster	contains=yaccNonterminal,yaccString
+ 
+ " ---------------------------------------------------------------------
+@@ -50,7 +60,8 @@
+ " ---------------------------------------------------------------------
+ " Yacc Commands: {{{1
+ syn	match	yaccDefines	'^%define\s\+.*$'
+-syn	match	yaccParseParam	'%parse-param\>'	skipwhite	nextgroup=yaccParseParamStr
++syn	match	yaccParseParam	'%\(parse\|lex\)-param\>'		skipwhite	nextgroup=yaccParseParamStr
++syn	match	yaccParseOption '%\%(api\.pure\|pure-parser\|locations\|error-verbose\)\>'
+ syn	region	yaccParseParamStr	contained matchgroup=Delimiter	start='{'	end='}'	contains=cStructure
+ 
+ syn	match	yaccDelim	"[:|]"	contained
+@@ -96,7 +107,8 @@
+   HiLink yaccCurly	Delimiter
+   HiLink yaccCurlyError	Error
+   HiLink yaccDefines	cDefine
+-  HiLink yaccParseParam	cDefine
++  HiLink yaccParseParam	yaccParseOption
++  HiLink yaccParseOption	cDefine
+   HiLink yaccNonterminal	Function
+   HiLink yaccDelim	Delimiter
+   HiLink yaccKeyActn	Special
+diff -u -r --new-file runtime/syntax.orig/yaml.vim runtime/syntax/yaml.vim
+--- runtime/syntax.orig/yaml.vim	2010-08-13 07:54:35.000000000 -0500
++++ runtime/syntax/yaml.vim	2011-01-08 08:40:13.000000000 -0600
+@@ -1,86 +1,186 @@
+ " Vim syntax file
+-" Language:         YAML (YAML Ain't Markup Language)
+-" Maintainer:       Nikolai Weibull <now@bitwi.se>
+-" Latest Revision:  2010-08-12
++" Language:         YAML (YAML Ain't Markup Language) 1.2
++" Maintainer:       Nikolai Pavlov <zyx.vim@gmail.com>
++" First author:     Nikolai Weibull <now@bitwi.se>
++" Latest Revision:  2010-10-08
+ 
+-if exists("b:current_syntax")
+-  finish
++if exists('b:current_syntax')
++    finish
+ endif
+ 
+ let s:cpo_save = &cpo
+ set cpo&vim
+ 
+-syn keyword yamlTodo            contained TODO FIXME XXX NOTE
++let s:ns_char = '\%(\%([\n\r\uFEFF \t]\)\@!\p\)'
++let s:ns_word_char = '\%(\w\|-\)'
++let s:ns_uri_char  = '\%(%\x\x\|'.s:ns_word_char.'\|[#/;?:@&=+$,.!~*''()\[\]]\)'
++let s:ns_tag_char  = '\%(%\x\x\|'.s:ns_word_char.'\|[#/;?:@&=+$.~*''()]\)'
++let s:c_ns_anchor_char = '\%(\%([\n\r\uFEFF \t,\[\]{}]\)\@!\p\)'
++let s:c_indicator      = '[\-?:,\[\]{}#&*!|>''"%@`]'
++let s:c_flow_indicator = '[,\[\]{}]'
++
++let s:c_verbatim_tag = '!<'.s:ns_uri_char.'\+>'
++let s:c_named_tag_handle     = '!'.s:ns_word_char.'\+!'
++let s:c_secondary_tag_handle = '!!'
++let s:c_primary_tag_handle   = '!'
++let s:c_tag_handle = '\%('.s:c_named_tag_handle.
++            \         '\|'.s:c_secondary_tag_handle.
++            \         '\|'.s:c_primary_tag_handle.'\)'
++let s:c_ns_shorthand_tag = s:c_tag_handle . s:ns_tag_char.'\+'
++let s:c_non_specific_tag = '!'
++let s:c_ns_tag_property = s:c_verbatim_tag.
++            \        '\|'.s:c_ns_shorthand_tag.
++            \        '\|'.s:c_non_specific_tag
++
++let s:c_ns_anchor_name = s:c_ns_anchor_char.'\+'
++let s:c_ns_anchor_property =  '&'.s:c_ns_anchor_name
++let s:c_ns_alias_node      = '\*'.s:c_ns_anchor_name
++
++let s:ns_directive_name = s:ns_char.'\+'
++
++let s:ns_local_tag_prefix  = '!'.s:ns_uri_char.'*'
++let s:ns_global_tag_prefix = s:ns_tag_char.s:ns_uri_char.'*'
++let s:ns_tag_prefix = s:ns_local_tag_prefix.
++            \    '\|'.s:ns_global_tag_prefix
++
++let s:ns_plain_safe_out = s:ns_char
++let s:ns_plain_safe_in  = '\%('.s:c_flow_indicator.'\@!'.s:ns_char.'\)'
++
++let s:ns_plain_first_in  = '\%('.s:c_indicator.'\@!'.s:ns_char.'\|[?:\-]\%('.s:ns_plain_safe_in.'\)\@=\)'
++let s:ns_plain_first_out = '\%('.s:c_indicator.'\@!'.s:ns_char.'\|[?:\-]\%('.s:ns_plain_safe_out.'\)\@=\)'
++
++let s:ns_plain_char_in  = '\%('.s:ns_char.'#\|:'.s:ns_plain_safe_in.'\|[:#]\@!'.s:ns_plain_safe_in.'\)'
++let s:ns_plain_char_out = '\%('.s:ns_char.'#\|:'.s:ns_plain_safe_out.'\|[:#]\@!'.s:ns_plain_safe_out.'\)'
+ 
+-syn region  yamlComment         display oneline start='\%(^\|\s\)#' end='$'
+-                                \ contains=yamlTodo,@Spell
++let s:ns_plain_out = s:ns_plain_first_out . s:ns_plain_char_out.'*'
++let s:ns_plain_in  = s:ns_plain_first_in  . s:ns_plain_char_in.'*'
+ 
+-syn match   yamlNodeProperty    '!\%(![^\\^%     ]\+\|[^!][^:/   ]*\)'
+ 
+-syn match   yamlAnchor          '&.\+'
++syn keyword yamlTodo            contained TODO FIXME XXX NOTE
+ 
+-syn match   yamlAlias           '\*.\+'
++syn region  yamlComment         display oneline start='\%\(^\|\s\)#' end='$'
++            \                   contains=yamlTodo
+ 
+-syn match   yamlDelimiter       '[-,:]'
+-syn match   yamlBlock           '[\[\]{}>|]'
+-syn match   yamlOperator        '[?+-]'
+-syn match   yamlKey             '\w\+\(\s\+\w\+\)*\ze\s*:'
+-
+-syn region  yamlString          matchgroup=yamlStringDelimiter
+-                                \ start=+"+ skip=+\\"+ end=+"+
+-                                \ contains=yamlEscape
+-syn region  yamlString          matchgroup=yamlStringDelimiter
+-                                \ start=+'+ skip=+''+ end=+'+
+-                                \ contains=yamlSingleEscape
+-syn match   yamlEscape          contained display +\\[\\"abefnrtv^0_ NLP]+
+-syn match   yamlEscape          contained display '\\x\x\{2}'
+-syn match   yamlEscape          contained display '\\u\x\{4}'
+-syn match   yamlEscape          contained display '\\U\x\{8}'
+-" TODO: how do we get 0x85, 0x2028, and 0x2029 into this?
+-syn match   yamlEscape          display '\\\%(\r\n\|[\r\n]\)'
+-syn match   yamlSingleEscape    contained +''+
+-
+-" TODO: sexagecimal and fixed (20:30.15 and 1,230.15)
+-syn match   yamlNumber          display
+-                                \ '\<[+-]\=\d\+\%(\.\d\+\%([eE][+-]\=\d\+\)\=\)\='
+-syn match   yamlNumber          display '0\o\+'
+-syn match   yamlNumber          display '0x\x\+'
+-syn match   yamlNumber          display '([+-]\=[iI]nf)'
+-syn match   yamlNumber          display '(NaN)'
+-
+-syn match   yamlConstant        '\<[~yn]\>'
+-syn keyword yamlConstant        true True TRUE false False FALSE
+-syn keyword yamlConstant        yes Yes on ON no No off OFF
+-syn keyword yamlConstant        null Null NULL nil Nil NIL
+-
+-syn match   yamlTimestamp       '\d\d\d\d-\%(1[0-2]\|\d\)-\%(3[0-2]\|2\d\|1\d\|\d\)\%( \%([01]\d\|2[0-3]\):[0-5]\d:[0-5]\d.\d\d [+-]\%([01]\d\|2[0-3]\):[0-5]\d\|t\%([01]\d\|2[0-3]\):[0-5]\d:[0-5]\d.\d\d[+-]\%([01]\d\|2[0-3]\):[0-5]\d\|T\%([01]\d\|2[0-3]\):[0-5]\d:[0-5]\d.\dZ\)\='
+-
+-syn region  yamlDocumentHeader  start='---' end='$' contains=yamlDirective
+-syn match   yamlDocumentEnd     '\.\.\.'
+-
+-syn match   yamlDirective       contained '%[^:]\+:.\+'
+-
+-hi def link yamlTodo            Todo
+-hi def link yamlComment         Comment
+-hi def link yamlDocumentHeader  PreProc
+-hi def link yamlDocumentEnd     PreProc
+-hi def link yamlDirective       Keyword
+-hi def link yamlNodeProperty    Type
+-hi def link yamlAnchor          Type
+-hi def link yamlAlias           Type
+-hi def link yamlDelimiter       Delimiter
+-hi def link yamlBlock           Operator
+-hi def link yamlOperator        Operator
+-hi def link yamlKey             Identifier
+-hi def link yamlString          String
+-hi def link yamlStringDelimiter yamlString
+-hi def link yamlEscape          SpecialChar
+-hi def link yamlSingleEscape    SpecialChar
+-hi def link yamlNumber          Number
+-hi def link yamlConstant        Constant
+-hi def link yamlTimestamp       Number
++execute 'syn region yamlDirective oneline start='.string('^\ze%'.s:ns_directive_name.'\s\+').' '.
++            \                            'end="$" '.
++            \                            'contains=yamlTAGDirective,'.
++            \                                     'yamlYAMLDirective,'.
++            \                                     'yamlReservedDirective '.
++            \                            'keepend'
++
++syn match yamlTAGDirective '%TAG\s\+' contained nextgroup=yamlTagHandle
++execute 'syn match yamlTagHandle contained nextgroup=yamlTagPrefix '.string(s:c_tag_handle.'\s\+')
++execute 'syn match yamlTagPrefix contained nextgroup=yamlComment ' . string(s:ns_tag_prefix)
++
++syn match yamlYAMLDirective '%YAML\s\+'  contained nextgroup=yamlYAMLVersion
++syn match yamlYAMLVersion   '\d\+\.\d\+' contained nextgroup=yamlComment
++
++execute 'syn match yamlReservedDirective contained nextgroup=yamlComment '.
++            \string('%\%(\%(TAG\|YAML\)\s\)\@!'.s:ns_directive_name)
++
++syn region yamlFlowString matchgroup=yamlFlowStringDelimiter start='"' skip='\\"' end='"'
++            \ contains=yamlEscape
++            \ nextgroup=yamlKeyValueDelimiter
++syn region yamlFlowString matchgroup=yamlFlowStringDelimiter start="'" skip="''"  end="'"
++            \ contains=yamlSingleEscape
++            \ nextgroup=yamlKeyValueDelimiter
++syn match  yamlEscape contained '\\\%([\\"abefnrtv\^0_ NLP\n]\|x\x\x\|u\x\{4}\|U\x\{8}\)'
++syn match  yamlSingleEscape contained "''"
++
++syn match yamlBlockScalarHeader contained '\s\+\zs[|>]\%([+-]\=[1-9]\|[1-9]\=[+-]\)\='
++
++syn cluster yamlFlow contains=yamlFlowString,yamlFlowMapping,yamlFlowCollection
++syn cluster yamlFlow      add=yamlFlowMappingKey,yamlFlowMappingMerge
++syn cluster yamlFlow      add=yamlConstant,yamlPlainScalar,yamlFloat
++syn cluster yamlFlow      add=yamlTimestamp,yamlInteger,yamlMappingKeyStart
++syn cluster yamlFlow      add=yamlComment
++syn region yamlFlowMapping    matchgroup=yamlFlowIndicator start='{' end='}' contains=@yamlFlow
++syn region yamlFlowCollection matchgroup=yamlFlowIndicator start='\[' end='\]' contains=@yamlFlow
++
++execute 'syn match yamlPlainScalar /'.s:ns_plain_out.'/'
++execute 'syn match yamlPlainScalar contained /'.s:ns_plain_in.'/'
++
++syn match yamlMappingKeyStart '?\ze\s'
++syn match yamlMappingKeyStart '?' contained
++
++execute 'syn match yamlFlowMappingKey /'.s:ns_plain_in.'\ze\s*:/ contained '.
++            \'nextgroup=yamlKeyValueDelimiter'
++syn match yamlFlowMappingMerge /<<\ze\s*:/ contained nextgroup=yamlKeyValueDelimiter
++
++syn match yamlBlockCollectionItemStart '^\s*\zs-\%(\s\+-\)*\s' nextgroup=yamlBlockMappingKey,yamlBlockMappingMerge
++execute 'syn match yamlBlockMappingKey /^\s*\zs'.s:ns_plain_out.'\ze\s*:\%(\s\|$\)/ '.
++            \'nextgroup=yamlKeyValueDelimiter'
++execute 'syn match yamlBlockMappingKey /\s*\zs'.s:ns_plain_out.'\ze\s*:\%(\s\|$\)/ contained '.
++            \'nextgroup=yamlKeyValueDelimiter'
++syn match yamlBlockMappingMerge /^\s*\zs<<\ze:\%(\s\|$\)/ nextgroup=yamlKeyValueDelimiter
++syn match yamlBlockMappingMerge /<<\ze\s*:\%(\s\|$\)/ nextgroup=yamlKeyValueDelimiter contained
++
++syn match   yamlKeyValueDelimiter /\s*:/ contained
++syn match   yamlKeyValueDelimiter /\s*:/ contained
++
++syn keyword yamlConstant true True TRUE false False FALSE
++syn keyword yamlConstant null Null NULL
++syn match   yamlConstant '\<\~\>'
++
++syn match   yamlTimestamp /\%([\[\]{}, \t]\@!\p\)\@<!\%(\d\{4}-\d\d\=-\d\d\=\%(\%([Tt]\|\s\+\)\%(\d\d\=\):\%(\d\d\):\%(\d\d\)\%(\.\%(\d*\)\)\=\%(\s*\%(Z\|[+-]\d\d\=\%(:\d\d\)\=\)\)\=\)\=\)\%([\[\]{}, \t]\@!\p\)\@!/
++
++syn match   yamlInteger /\%([\[\]{}, \t]\@!\p\)\@<!\%([+-]\=\%(0\%(b[0-1_]\+\|[0-7_]\+\|x[0-9a-fA-F_]\+\)\=\|\%([1-9][0-9_]*\%(:[0-5]\=\d\)\+\)\)\|[1-9][0-9_]*\)\%([\[\]{}, \t]\@!\p\)\@!/
++syn match   yamlFloat   /\%([\[\]{}, \t]\@!\p\)\@<!\%([+-]\=\%(\%(\d[0-9_]*\)\.[0-9_]*\%([eE][+-]\d\+\)\=\|\.[0-9_]\+\%([eE][-+][0-9]\+\)\=\|\d[0-9_]*\%(:[0-5]\=\d\)\+\.[0-9_]*\|\.\%(inf\|Inf\|INF\)\)\|\%(\.\%(nan\|NaN\|NAN\)\)\)\%([\[\]{}, \t]\@!\p\)\@!/
++
++execute 'syn match yamlNodeTag '.string(s:c_ns_tag_property)
++execute 'syn match yamlAnchor  '.string(s:c_ns_anchor_property)
++execute 'syn match yamlAlias   '.string(s:c_ns_alias_node)
++
++syn match yamlDocumentStart '^---\ze\%(\s\|$\)'
++syn match yamlDocumentEnd   '^\.\.\.\ze\%(\s\|$\)'
++
++hi def link yamlTodo                     Todo
++hi def link yamlComment                  Comment
++
++hi def link yamlDocumentStart            PreProc
++hi def link yamlDocumentEnd              PreProc
++
++hi def link yamlDirectiveName            Keyword
++
++hi def link yamlTAGDirective             yamlDirectiveName
++hi def link yamlTagHandle                String
++hi def link yamlTagPrefix                String
++
++hi def link yamlYAMLDirective            yamlDirectiveName
++hi def link yamlReservedDirective        Error
++hi def link yamlYAMLVersion              Number
++
++hi def link yamlString                   String
++hi def link yamlFlowString               yamlString
++hi def link yamlFlowStringDelimiter      yamlString
++hi def link yamlEscape                   SpecialChar
++hi def link yamlSingleEscape             SpecialChar
++
++hi def link yamlBlockCollectionItemStart Label
++hi def link yamlBlockMappingKey          Identifier
++hi def link yamlBlockMappingMerge        Special
++
++hi def link yamlFlowMappingKey           Identifier
++hi def link yamlFlowMappingMerge         Special
++
++hi def link yamlMappingKeyStart          Special
++hi def link yamlFlowIndicator            Special
++hi def link yamlKeyValueDelimiter        Special
++
++hi def link yamlConstant                 Constant
++
++hi def link yamlAnchor                   Type
++hi def link yamlAlias                    Type
++hi def link yamlNodeTag                  Type
++
++hi def link yamlInteger                  Number
++hi def link yamlFloat                    Float
++hi def link yamlTimestamp                Number
+ 
+ let b:current_syntax = "yaml"
+ 
++unlet s:ns_word_char s:ns_uri_char s:c_verbatim_tag s:c_named_tag_handle s:c_secondary_tag_handle s:c_primary_tag_handle s:c_tag_handle s:ns_tag_char s:c_ns_shorthand_tag s:c_non_specific_tag s:c_ns_tag_property s:c_ns_anchor_char s:c_ns_anchor_name s:c_ns_anchor_property s:c_ns_alias_node s:ns_char s:ns_directive_name s:ns_local_tag_prefix s:ns_global_tag_prefix s:ns_tag_prefix s:c_indicator s:ns_plain_safe_out s:c_flow_indicator s:ns_plain_safe_in s:ns_plain_first_in s:ns_plain_first_out s:ns_plain_char_in s:ns_plain_char_out s:ns_plain_out s:ns_plain_in
++
+ let &cpo = s:cpo_save
+ unlet s:cpo_save
++
diff --git a/source/ap/vim/vim.SlackBuild b/source/ap/vim/vim.SlackBuild
index 15904bcd..bf2e5422 100755
--- a/source/ap/vim/vim.SlackBuild
+++ b/source/ap/vim/vim.SlackBuild
@@ -20,10 +20,10 @@
 #  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
+VIMVER=7.3
+CTAGSVER=5.8
 # This is the directory in the VIM source archive to cd into.
-DIRVER=72
+DIRVER=73
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -97,7 +97,6 @@ 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" \
diff --git a/source/ap/vorbis-tools/vorbis-tools.SlackBuild b/source/ap/vorbis-tools/vorbis-tools.SlackBuild
index 65c551a8..4e0534c6 100755
--- a/source/ap/vorbis-tools/vorbis-tools.SlackBuild
+++ b/source/ap/vorbis-tools/vorbis-tools.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,11 +21,21 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=1.2.0
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+VERSION=1.4.0
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-vorbis-tools
@@ -35,7 +45,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf vorbis-tools-$VERSION
-tar xvf $CWD/vorbis-tools-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/vorbis-tools-$VERSION.tar.?z* || exit 1
 cd vorbis-tools-$VERSION || exit 1
 chown -R root:root .
 find . \
diff --git a/source/ap/workbone/workbone.SlackBuild b/source/ap/workbone/workbone.SlackBuild
index b2de0b48..95751145 100755
--- a/source/ap/workbone/workbone.SlackBuild
+++ b/source/ap/workbone/workbone.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,9 +26,19 @@ PKG=$TMP/package-workbone
 
 VERSION=2.40
 SRCVER=2.4
-ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-4}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-3}
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
@@ -43,7 +53,7 @@ find . \
   \( -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_$VERSION-9.diff.gz | patch -p1 --verbose || exit 1
 zcat $CWD/workbone.1.diff.gz | patch -p1 --verbose || exit 1
 
 make $NUMJOBS || make || exit 1
diff --git a/source/ap/workbone/workbone_2.40-3.diff b/source/ap/workbone/workbone_2.40-3.diff
deleted file mode 100644
index ed32b269..00000000
--- a/source/ap/workbone/workbone_2.40-3.diff
+++ /dev/null
@@ -1,294 +0,0 @@
---- 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/workbone/workbone_2.40-9.diff b/source/ap/workbone/workbone_2.40-9.diff
new file mode 100644
index 00000000..324ef93a
--- /dev/null
+++ b/source/ap/workbone/workbone_2.40-9.diff
@@ -0,0 +1,432 @@
+--- 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)
+@@ -187,8 +187,15 @@
+ 					strcpy(realname, cd_device);
+ 
+ 					fprintf(stderr,
+-		"As root, please run\n\nchmod 666 %s\n\n%s\n", realname,
+-		"to give yourself permission to access the CD-ROM device.");
++  "In order to have permission to access the CD-ROM device, please run the\n"
++  "following commands as root:\n"
++  "\n"						
++  "chgrp --dereference cdrom %s\n"
++  "chmod g+w %s\n"
++  "adduser $USER cdrom\n"
++  "\n"						
++  "After this, log in again and restart workbone.\n",
++						realname, realname);
+ 					warned++;
+ 				}
+ 			}
+@@ -611,7 +618,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.1
++++ workbone-2.40/workbone.1
+@@ -54,7 +54,7 @@
+ is ideal for those who just want to play music with minimal fuss.
+ .br
+ .SH USAGE
+-If no device is specified with the -d switch, 
++If no device is specified with the \-d switch, 
+ .B WorkBone
+ expects to find the device: /dev/cdrom (linux) or /dev/rsr0 (other).
+ If you don't have this device, change to /dev and soft link your current
+@@ -62,7 +62,7 @@
+ your cdrom device 'mcd0', then do the following:
+ .sp
+                cd /dev
+-               ln -sf mcd0 cdrom
++               ln \-sf mcd0 cdrom
+ .PP
+ Alternatively, just edit 'hardware.c'  to reflect the
+ name of your cdrom device and recompile. 
+@@ -122,10 +122,10 @@
+ functions as per WorkMan proper. The display code
+ was written specifically for the Linux console.
+ Portability was not a concern. :-) However,
+-the `-a' option will put 
++the `\-a' option will put 
+ .B WorkBone
+ into the 7-bit mode for use
+-with any terminal, and using the `-p' switch, it will
++with any terminal, and using the `\-p' switch, it will
+ even run without a terminal. ;).
+ .br
+ .SH
+--- 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 ();
+@@ -450,7 +467,7 @@
+     "|\021", "\tprevious selection",
+     "\020|", "\tnext selection",
+     "\021\021", "\tgo backward 15 seconds",
+-    "\020\020", "\tgo foreward 15 seconds",
++    "\020\020", "\tgo forward  15 seconds",
+     "..", "\tabort workbone",
+     "quit", "\texit workbone (music continues)",
+     "?", "\tdisplay help screen", NULL};
+--- workbone-2.40.orig/debian/compat
++++ workbone-2.40/debian/compat
+@@ -0,0 +1 @@
++5
+--- workbone-2.40.orig/debian/menu
++++ workbone-2.40/debian/menu
+@@ -0,0 +1,3 @@
++?package(workbone):command="/usr/bin/workbone" needs="text" \
++    section="Applications/Sound" title="WorkBone"
++
+--- workbone-2.40.orig/debian/changelog
++++ workbone-2.40/debian/changelog
+@@ -0,0 +1,118 @@
++workbone (2.40-9) unstable; urgency=low
++
++  * QA upload.
++  * Reverting incorrect and unnecessary fix for #427592 (Closes: #483982)
++
++ -- Mike O'Connor <stew@debian.org>  Wed, 04 Jun 2008 19:59:34 -0400
++
++workbone (2.40-8) unstable; urgency=low
++
++  * QA upload.
++  * hardware.c - Replace deprecated ustat.h with statfs.h (Closes: #427592).
++  * Update FSF address in copyright.
++  * Debhelperize build-system.
++  * Add build-dep on debhelper and set compat to 5.
++  * Escape - in manpage.
++  * Bump Standards Version to 3.7.3.
++    + Update for menu policy.
++
++ -- Barry deFreese <bddebian@comcast.net>  Sun, 03 Feb 2008 10:24:28 -0500
++
++workbone (2.40-7) unstable; urgency=low
++
++  * Orphaning, see #429178.
++
++ -- Antti-Juhani Kaijanaho <ajk@debian.org>  Sat, 16 Jun 2007 11:34:26 +0300
++
++workbone (2.40-6) unstable; urgency=low
++
++  * workbone.c (help): Spelling fix (foreward -> forward).
++    Closes: #272397 (Minor spelling error on help screen)
++    [ Reported by Brian Potkin ]
++
++ -- Antti-Juhani Kaijanaho <ajk@debian.org>  Fri, 31 Dec 2004 08:39:55 +0200
++
++workbone (2.40-5) unstable; urgency=low
++
++  * hardware.c (cd_status): Give sane advice about dealing
++    without access to the cdrom drive; thanks to Josip Rodin.
++    Closes: #149371 (faulty advice about accessing the CD)
++  
++ -- Antti-Juhani Kaijanaho <ajk@debian.org>  Thu,  1 Jul 2004 17:14:02 +0300
++
++workbone (2.40-4) unstable; urgency=low
++
++  * New maintainer
++    Closes: #227782 (ITA: workbone -- A simple text-based CD player)
++  * debian/{postinst,prerm}: No longer set the /usr/doc link.
++  * debian/{menu,rules,postinst,postrm}: Install a menu entry
++    Closes: #182225 (workbone: Please add a menu entry)
++  * debian/copyright: Add proper licensing information
++  * debian/control (Standards-Version): 3.6.1, no changes required
++
++ -- Antti-Juhani Kaijanaho <ajk@debian.org>  Sat, 17 Jan 2004 23:09:16 +0200
++
++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/copyright
++++ workbone-2.40/debian/copyright
+@@ -0,0 +1,31 @@
++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 was then maintained by Martin Mitchell <martin@debian.org>.
++It is currently being maintained by Antti-Juhani Kaijanaho <ajk@debian.org>.
++
++Authors:
++   Dirk Foersterling (Workman hardware support)
++   Thomas McWilliams (Workbone interface)
++
++
++Copyright:
++   Copyright (c) 1994  Thomas McWilliams
++   Currently maintained by Bernhard Rosenkraenzer (bero@bero-online.ml.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, 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, 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
++
++A copy of the GNU General Public License, version 2 or later, can be
++found in /usr/share/common-licenses/GPL.
+--- workbone-2.40.orig/debian/install
++++ workbone-2.40/debian/install
+@@ -0,0 +1,2 @@
++workbone usr/bin/
++
+--- workbone-2.40.orig/debian/docs
++++ workbone-2.40/debian/docs
+@@ -0,0 +1 @@
++README
+--- workbone-2.40.orig/debian/postrm
++++ workbone-2.40/debian/postrm
+@@ -0,0 +1,8 @@
++#!/bin/sh
++
++set -e
++
++if test -x /usr/bin/update-menus; then update-menus; 
++fi
++#DEBHELPER#
++
+--- 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/rules
++++ workbone-2.40/debian/rules
+@@ -0,0 +1,64 @@
++#!/usr/bin/make -f
++# -*- makefile -*-
++
++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
++
++
++build:
++	dh_testdir
++
++	$(MAKE) CFLAGS='$(CFLAGS)' LDFLAGS=""
++
++	touch build
++
++clean:
++	dh_testdir
++	dh_testroot
++
++	rm -f build
++
++	$(MAKE) clean
++
++	dh_clean
++
++install: build
++	dh_testdir
++	dh_testroot
++	dh_clean -k
++	dh_installdirs
++
++	dh_install --list-missing
++
++binary-indep:  build install
++# There are no architecture-independent files to be uploaded
++# generated by this package.  If there were any they would be
++# made here.
++
++binary-arch: build install
++	dh_testdir -a
++	dh_testroot -a
++	dh_installchangelogs -a CHANGES
++	dh_installdocs -a
++	dh_installmenu -a
++	dh_installman -a workbone.1
++	dh_desktop -a
++	dh_strip -a
++	dh_compress -a
++	dh_fixperms -a
++	dh_installdeb -a
++	dh_shlibdeps -a
++	dh_gencontrol -a
++	dh_md5sums -a
++	dh_builddeb -a
++
++binary: binary-indep binary-arch
++.PHONY: build clean binary-indep binary-arch binary install
+--- workbone-2.40.orig/debian/postinst
++++ workbone-2.40/debian/postinst
+@@ -0,0 +1,11 @@
++#!/bin/sh
++
++set -e
++
++if test -x /usr/bin/update-menus; then update-menus; fi
++
++if [ ! -e /dev/cdrom ]
++then
++echo "Please link /dev/cdrom to your CDROM device before running workbone."
++fi
++#DEBHELPER#
+--- workbone-2.40.orig/debian/control
++++ workbone-2.40/debian/control
+@@ -0,0 +1,15 @@
++Source: workbone
++Section: sound
++Priority: optional
++Maintainer: Debian QA Group <packages@qa.debian.org>
++Build-Depends: debhelper (>> 5.0.0)
++Standards-Version: 3.7.3
++
++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.  
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
deleted file mode 100644
index a30665a0..00000000
--- a/source/ap/zsh/zsh-4.3.10-add_new_pkg_completion.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-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
index 2a874fbf..dc6dcf2a 100755
--- a/source/ap/zsh/zsh.SlackBuild
+++ b/source/ap/zsh/zsh.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,11 +20,22 @@
 #  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 "}
+PKGNAM=zsh
+VERSION=${VERSION:-$(echo ${PKGNAM}-4.*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -34,6 +45,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
@@ -54,8 +68,8 @@ find . \
   \( -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
+# fix regex crash:
+zcat $CWD/zsh.regex.oh.bah.diff.gz | patch -p0 --verbose || exit 1
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -81,6 +95,14 @@ 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
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/usr/info
 cp -a Doc/*info* $PKG/usr/info
 
diff --git a/source/ap/zsh/zsh.regex.oh.bah.diff b/source/ap/zsh/zsh.regex.oh.bah.diff
new file mode 100644
index 00000000..15e3d5b4
--- /dev/null
+++ b/source/ap/zsh/zsh.regex.oh.bah.diff
@@ -0,0 +1,12 @@
+--- ./Src/text.c.orig	2010-09-14 09:46:26.000000000 -0500
++++ ./Src/text.c	2011-03-19 18:50:22.270001467 -0500
+@@ -785,8 +785,7 @@
+ 			    taddstr(" ");
+ 			    taddstr(ecgetstr(state, EC_NODUP, NULL));
+ 			    if (ctype == COND_STREQ ||
+-				ctype == COND_STRNEQ ||
+-				ctype == COND_REGEX)
++				ctype == COND_STRNEQ)
+ 				state->pc++;
+ 			} else {
+ 			    /* Unary test: `-f foo' etc. */ 
diff --git a/source/d/autoconf/autoconf.SlackBuild b/source/d/autoconf/autoconf.SlackBuild
index 7ed33f75..d71daa50 100755
--- a/source/d/autoconf/autoconf.SlackBuild
+++ b/source/d/autoconf/autoconf.SlackBuild
@@ -21,7 +21,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=2.65
+PKGNAM=autoconf
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -60,7 +61,7 @@ find . \
   --prefix=/usr \
   --infodir=/usr/info \
   --mandir=/usr/man \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
@@ -71,9 +72,17 @@ gzip -9 $PKG/usr/man/man1/*.?
 
 mkdir -p $PKG/usr/doc/autoconf-$VERSION
 cp -a \
-  AUTHORS BUGS COPYING* NEWS README THANKS TODO \
+  AUTHORS BUGS COPYING* NEWS README* THANKS TODO \
   $PKG/usr/doc/autoconf-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/d/automake/automake.SlackBuild b/source/d/automake/automake.SlackBuild
index b7ef13c6..55353a40 100755
--- a/source/d/automake/automake.SlackBuild
+++ b/source/d/automake/automake.SlackBuild
@@ -23,7 +23,7 @@
 
 VERSION=1.11.1
 NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Note: the package is _built_ as 'noarch'
 # Automatically determine architecture for build & packaging:
@@ -79,6 +79,13 @@ SHORTNAME=$(echo $VERSION | cut -f1,2 -d .)
 mkdir -p $PKG/usr/share/aclocal
 touch $PKG/usr/share/aclocal
 
+# Compress manual pages:
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do
+  ln -s $( readlink $i ).gz $i.gz
+  rm $i
+done
+
 mkdir -p $PKG/usr/doc/automake-$VERSION
 mv $PKG/usr/share/doc/automake/* $PKG/usr/doc/automake-$VERSION
 cp -a \
diff --git a/source/d/binutils/binutils-2.20.51.0.8.tar.sign b/source/d/binutils/binutils-2.20.51.0.8.tar.sign
deleted file mode 100644
index 32143426..00000000
--- a/source/d/binutils/binutils-2.20.51.0.8.tar.sign
+++ /dev/null
@@ -1,8 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-Comment: See http://www.kernel.org/signature.html for info
-
-iD8DBQBLxPBQyGugalF9Dw4RAq+mAKCJbsksL4Hlb/tH9dL7kTbFE/BO8QCfXStv
-0oOljJ/jyU8Z8SlaEywyfys=
-=qMqR
------END PGP SIGNATURE-----
diff --git a/source/d/binutils/binutils-2.21.51.0.6.tar.sign b/source/d/binutils/binutils-2.21.51.0.6.tar.sign
new file mode 100644
index 00000000..f5824788
--- /dev/null
+++ b/source/d/binutils/binutils-2.21.51.0.6.tar.sign
@@ -0,0 +1,8 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+Comment: See http://www.kernel.org/signature.html for info
+
+iD8DBQBNNlEFyGugalF9Dw4RAiCTAJ4iU8QPmGnj/bIA+qXwpNK926m3ywCeMEGE
++3QFy1J7SclHy+sNNX0unSA=
+=OHU3
+-----END PGP SIGNATURE-----
diff --git a/source/d/binutils/binutils.SlackBuild b/source/d/binutils/binutils.SlackBuild
index b0ffefb6..a5616ea2 100755
--- a/source/d/binutils/binutils.SlackBuild
+++ b/source/d/binutils/binutils.SlackBuild
@@ -37,8 +37,27 @@ fi
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
+# Uncomment this to include the experimental gold linker:
+GOLD=" --enable-gold=yes --enable-ld=default "
+
+# Set to ld.gold or ld.bfd:
+DEFAULT_LD=ld.bfd
+
+# The --enable-initfini-array option was added in binutils-2.21.51.0.3.
+# This option currently causes a world of hurt trying to compile glibc,
+# and might break static libraries or cause other ill effects.  There
+# is an upstream patch for glibc but it does not avoid all of the known
+# problems (and there may be some unknown ones, too), so we will avoid
+# introducing this feature for now.
+# References:
+# http://sourceware.org/bugzilla/show_bug.cgi?id=12343
+# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46770
+NO_INITFINI=" --disable-initfini-array "
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  # The config option below is currently needed to compile on x86:
+  WERROR="--enable-werror=no"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
@@ -78,7 +97,12 @@ CFLAGS="$SLKCFLAGS" \
   --enable-shared \
   --enable-multilib \
   --enable-64-bit-bfd \
+  --enable-plugins \
+  --enable-threads \
   --enable-targets=$ARCH-slackware-linux \
+  $GOLD \
+  $NO_INITFINI \
+  $WERROR \
   --build=$ARCH-slackware-linux \
   || exit 1
 
@@ -97,13 +121,19 @@ cp -a include/libiberty.h $PKG/usr/include/libiberty.h
 mv $PKG/usr/${ARCH}-slackware-linux/lib/ldscripts $PKG/usr/lib${LIBDIRSUFFIX}
 ( cd $PKG/usr/${ARCH}-slackware-linux
   ln -s /usr/lib${LIBDIRSUFFIX}/ldscripts lib/ldscripts
-  for FILE in ar as ld nm objcopy objdump ranlib strip ; do
+  for FILE in ar as ld ld.bfd ld.gold nm objcopy objdump ranlib strip ; do
     if [ -r "/usr/bin/$FILE" ]; then
       rm -f bin/$FILE
       ln -s /usr/bin/$FILE bin/$FILE
     fi
   done
 )
+
+# If the requested default linker is present, make it the default:
+# Set the link differently on the system to change the default at runtime.
+if [ -r $PKG/usr/bin/$DEFAULT_LD ]; then
+  ( cd $PKG/usr/bin ; rm -f ld ; ln -sf $DEFAULT_LD ld )
+fi
       
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
diff --git a/source/d/binutils/release.binutils-2.20.51.0.8 b/source/d/binutils/release.binutils-2.20.51.0.8
deleted file mode 100644
index d3d2bd8a..00000000
--- a/source/d/binutils/release.binutils-2.20.51.0.8
+++ /dev/null
@@ -1,491 +0,0 @@
-This is the beta release of binutils 2.20.51.0.8 for Linux, which is
-based on binutils 2010 0412 in CVS on sourceware.org plus various
-changes. It is purely for Linux.
-
-All relevant patches in patches have been applied to the source tree.
-You can take a look at patches/README to see what have been applied and
-in what order they have been applied.
-
-Starting from the 2.20.51.0.4 release, no diffs against the previous
-release will be provided.
-
-You can enable both gold and bfd ld with --enable-gold=both.  Gold will
-be installed as ld.gold and bfd ld will be installed as ld.bfd.  By
-default, ld.gold will be installed as ld.  You can use the configure
-option, --enable-gold=both/bfd to choose bfd ld as the default linker,
-ld.  IA-32 binary and X64_64 binary tar balls are configured with
---enable-gold=both/bfd --enable-plugins --enable-threads.
-
-Starting from the 2.18.50.0.4 release, the x86 assembler no longer
-accepts
-
-	fnstsw %eax
-
-fnstsw stores 16bit into %ax and the upper 16bit of %eax is unchanged.
-Please use
-
-	fnstsw %ax
-
-Starting from the 2.17.50.0.4 release, the default output section LMA
-(load memory address) has changed for allocatable sections from being
-equal to VMA (virtual memory address), to keeping the difference between
-LMA and VMA the same as the previous output section in the same region.
-
-For
-
-.data.init_task : { *(.data.init_task) }
-
-LMA of .data.init_task section is equal to its VMA with the old linker.
-With the new linker, it depends on the previous output section. You
-can use
-
-.data.init_task : AT (ADDR(.data.init_task)) { *(.data.init_task) }
-
-to ensure that LMA of .data.init_task section is always equal to its
-VMA. The linker script in the older 2.6 x86-64 kernel depends on the
-old behavior.  You can add AT (ADDR(section)) to force LMA of
-.data.init_task section equal to its VMA. It will work with both old
-and new linkers. The x86-64 kernel linker script in kernel 2.6.13 and
-above is OK.
-
-The new x86_64 assembler no longer accepts
-
-	monitor %eax,%ecx,%edx
-
-You should use
-
-	monitor %rax,%ecx,%edx
-
-or
-	monitor
-
-which works with both old and new x86_64 assemblers. They should
-generate the same opcode.
-
-The new i386/x86_64 assemblers no longer accept instructions for moving
-between a segment register and a 32bit memory location, i.e.,
-
-	movl (%eax),%ds
-	movl %ds,(%eax)
-
-To generate instructions for moving between a segment register and a
-16bit memory location without the 16bit operand size prefix, 0x66,
-
-	mov (%eax),%ds
-	mov %ds,(%eax)
-
-should be used. It will work with both new and old assemblers. The
-assembler starting from 2.16.90.0.1 will also support
-
-	movw (%eax),%ds
-	movw %ds,(%eax)
-
-without the 0x66 prefix. Patches for 2.4 and 2.6 Linux kernels are
-available at
-
-http://www.kernel.org/pub/linux/devel/binutils/linux-2.4-seg-4.patch
-http://www.kernel.org/pub/linux/devel/binutils/linux-2.6-seg-5.patch
-
-The ia64 assembler is now defaulted to tune for Itanium 2 processors.
-To build a kernel for Itanium 1 processors, you will need to add
-
-ifeq ($(CONFIG_ITANIUM),y)
-	CFLAGS += -Wa,-mtune=itanium1
-	AFLAGS += -Wa,-mtune=itanium1
-endif
-
-to arch/ia64/Makefile in your kernel source tree.
-
-Please report any bugs related to binutils 2.20.51.0.8 to
-hjl.tools@gmail.com
-
-and
-
-http://www.sourceware.org/bugzilla/
-
-Changes from binutils 2.20.51.0.7:
-
-1. Update from binutils 2010 0412.
-2. Don't bind unique symbol locally. PR 11434.
-3. Add DWARF 4 support to linker and readelf.
-4. Fix --no-export-dynamic for PIE. PR 11413.
-5. Speed up x86 assembler.
-6. Use memmove instead of memcpy to copy overlap memory in assembler.
-PR 11456.
-7. Improve gold.
-8. Improve VMS support.
-9. Improve PE support.
-10. Add TI C6X support.
-11. Improve arm support.
-12. Improve cris support.
-13. Improve ppc support.
-
-Changes from binutils 2.20.51.0.6:
-
-1. Update from binutils 2010 0318.
-2. Don't set ELFOSABI_LINUX for undefined STT_GNU_IFUNC symbols.
-3. Improve x86 assembler error messages.
-4. Support vpermilp[ds] for x86.
-5. Fix strip for group sections.
-6. Fix objcopy for PE PIE.  PR 11396.
-7. Avoid 32bit overflow in linker.
-8. Correct backslash quote logic in assembler.  PR 11356.
-9. Improve linker --section-start support.  PR 11304.
-10. Properly update LMA.  PR 11219.
-11. Don't combine .init_array/.fini_array sections for relocatable link.
-12. Add Solaris Sparc/x86 linker support.
-13. Support dumping .ARM.exidx/.ARM.extab.
-14. Add STT_GNU_IFUNC support for Sparc.
-15. Improve gold.
-16. Improve arm support.
-17. Improve avr support.
-18. Improve mips support.
-19. Improve ppc support.
-20. Improve xtensa support.
-
-Changes from binutils 2.20.51.0.5:
-
-1. Update from binutils 2010 0205.
-2. Support x86 XSAVE extended state core dump.
-3. Add an option, -mavxscalar=, to x86 assembler to encoding AVX
-scalar instructions with VL=256 and update x86 disassembler.
-4. Add xsave64/xrstor64 to x86 assembler/disassembler.
-5. Add all the possible aliases for VPCOM* insns to x86 assembler.
-5. Fix --gc-sections to detect unresolved symbol in DSO.  PR 11218.
-6. Support number of ELF program segments > 64K.
-7. Support BSD4.4 extended archive write.
-8. Report error on bad section name with "objdump -j". PR 11225.
-9. Linker now checks if all files are present and indicates those missing.
-PR 4437.
-10. Allow adding section from empy file with objcopy.
-11. Update C++ demangler to support vector.
-12. Improve gold.
-13. Improve arm support.
-14. Improve hppa support.
-15. Improve ppc support.
-16. Improve s390 support.
-
-Changes from binutils 2.20.51.0.4:
-
-1. Update from binutils 2010 0115.
-2. Optimize x86 assembler/disassembler.
-3. Add a new program, elfedit, to edit ELF files.  PR 11131.
-4. Add --dyn-syms to readelf.  PR 11146.
-5. Remove "Warning: " from objcopy error message.  PR 11130.
-6. Fix linker --gc-sections with undefined __start_XXX/__stop_XXX symbols.
-PR 11133.
-7. Fix linker --gc-sections with SHT_NOTE section.  PR 11143.
-8. Fix a c++filt bug.  PR 11137.
-9. Fix assembler listing.  PR 11122.
-10. Improve gold. Change --enable-gold to --enable-gold=[both[/{gold,bfd}]].
-11. Improve arm support.
-12. Improve mips support.
-13. Improve ppc support.
-14. Improve MacOS support.
-
-Changes from binutils 2.20.51.0.3:
-
-1. Update from binutils 2009 1214.
-2. Update x86 assembler to check lockable instructions for lock prefix.
-3. Update x86 disassembler to display all prefixes.
-4. Support AMD XOP new instructions.
-5. Fix an x86 assembler regression on Intel syntax.  PR 11037.
-6. Improve ia64 linker relaxation.  PR 10955.
-7. Add --no-relax linker option.
-8. Update readelf to dump .debug_pubtype sections.
-9. Improve gold:
-	a. Support linking against STT_GNU_IFUNC symbols defined in
-	   shared libraries.
-	b. Support linking with STB_GNU_UNIQUE symbols.
-10. Improve arm support.
-11. Improve m68k support.
-12. Improve mips support.
-13. Improve ppc support.
-
-Changes from binutils 2.20.51.0.2:
-
-1. Update from binutils 2009 1109.
-2. Fix "ld -s -static" with STT_GNU_IFUNC symbols.  PR 10911.
-3. Fix file permission on PIE with objcopy. PR 10802.
-4. Fix x86 Intel syntax assembler with relocation.  PR 10856.
-5. Fix x86 Intel syntax assembler with far jump.  PR 10740.
-6. Add AMD LWP support.
-7. Renamed linker option --add-needed to --copy-dt-needed-entries.
-8. Support enabling both ld and gold with --enable-gold=both and
---enable-linker=[bfd,gold].
-9. Improve gold.
-10. Improve arm support.
-11. Improve cris support.
-12. Improve hppa support.
-13. Improve m68k support.
-14. Improve RX support.
-15. Improve spu support.
-16. Improve vax support.
-17. Improve MacOS support.
-18. Improve Windows support.
-
-Changes from binutils 2.20.51.0.1:
-
-1. Update from binutils 2009 1009.
-2. Add .cfi_sections to assembler.
-3. Fix a linker bug with local dynamic symbols. PR 10630.
-4. Add DWARF-3/DWARF-4 support.
-5. Fix the x86 assembler PIC bug. PR 10677.
-6. Fix the x86-64 displacement assembler bug.  PR 10636.
-7. Fix the x86 assembler bug with Intel memory syntax.  PR 10637.
-8. Fix the x86 PIC assembler bug with Intel syntax. PR 10704.
-9. Add RX support.
-10. Improve gold.
-11. Improve arm support.
-12. Improve bfin support.
-13. Improve cr16 support.
-14. Improve m68k support.
-15. Improve mips support.
-16. Improve ppc support.
-
-Changes from binutils 2.19.51.0.14:
-
-1. Update from binutils 2009 0905.
-2. Add Intel L1OM support.
-3. Add MicroBlaze support.
-4. Fix assembler for DWARF info without .file/.loc directives.  PR 10531.
-5. Improve -pie with TLS relocations on ia32 and x86-64.  PRs 6443/10434.
-6. Fix linker page size support.  PR 10569.
-7. Fix wildcard in linker version script.  PR 10518.
-8. Fix strip with STB_GNU_UNIQUE. PR 10492.
-9. Fix strip on unwriteable files.  PR 10364.
-10. Fix crash with "ld --build-id /usr/lib/libc.a".  PR 10555.
-11. Fix linker for Linux kernel build.  PR 10429.
-12. Support string merge on .comment section.
-13. Improve build with C++ compiler.
-14. Improve gold.
-15. Improve arm support.
-16. Improve bfin support.
-11. Improve m32c support.
-17. Improve m68k support.
-18. Improve mep support.
-19. Improve mips support.
-20. Improve ppc support.
-21. Improve spu support.
-22. Improve xtensa support.
-
-Changes from binutils 2.19.51.0.13:
-
-1. Update from binutils 2009 0722.
-2. Fix linker for STT_GNU_IFUNC symbols in static executables.  PR 10433.
-3. Fix linker bug for Linux kernel build.  PR 10429.
-
-Changes from binutils 2.19.51.0.12:
-
-1. Update from binutils 2009 0721.
-2. Fix linker for undefined STT_GNU_IFUNC symbols.  PR 10426.
-3. Fix x86 assembler for nops in 64bit.  PR 10420.
-4. Add a new option, --insn-width, to objdump.
-5. Improve arm support.
-6. Improve mips support.
-7. Improve gold support.
-
-Changes from binutils 2.19.51.0.11:
-
-1. Update from binutils 2009 0716.
-2. Fix x86 assembler for jumping to local STT_GNU_IFUNC symbols.
-3. Fix x86 linker for relocatable link with local STT_GNU_IFUNC symbols.
-4. Implement ppc STT_GNU_IFUNC support.
-5. Support x86 FMA4.
-6. Fix linker regression with Linux kernel build.
-7. Support unordered references in DWARF reader.
-8. Improve PE/COFF support.
-8. Improve arm support.
-9. Improve m10300 support.
-10. Improve ppc support.
-11. Improve spu support.
-12. Improve gold support.
-
-Changes from binutils 2.19.51.0.10:
-
-1. Update from binutils 2009 0627.
-2. Fix strip on static executable with STT_GNU_IFUNC symbol.  PR 10337.
-3. Add STB_GNU_UNIQUE support.
-4. Fix objcopy on empty file.  PR 10321.
-5. Fix debug section for PE-COFF.
-6. Suport build with gcc 4.5.0.
-7. Improve arm support.
-8. Improve ppc support.
-9. Improve m10300 support.
-10. Improve mep support.
-11. Improve MacOS support.
-12. Improve gold support.
-
-Changes from binutils 2.19.51.0.9:
-
-1. Update from binutils 2009 0618.
-2. Update STT_GNU_IFUNC symbol support.  PR 10269/10270.
-3. Fix an assembler CFI bug.  PR 10255.
-4. Improve objdump.  PR 10263/10288
-5. Improve readelf.
-6. Improve arm support.
-7. Improve moxie support.
-8. Improve spu support.
-9. Improve vax support.
-10. Improve COFF/PE support.
-11. Improve MacOS support.
-
-Changes from binutils 2.19.51.0.8:
-
-1. Update from binutils 2009 0606.
-2. Update STT_GNU_IFUNC symbol support.
-
-Changes from binutils 2.19.51.0.7:
-
-1. Update from binutils 2009 0603.
-2. Fix STT_GNU_IFUNC symbol with pointer equality.
-
-Changes from binutils 2.19.51.0.6:
-
-1. Update from binutils 2009 0601.
-2. Update STT_GNU_IFUNC support. PR 10205.
-3. Fix x86 asssembler Intel syntax regression with '$'. PR 10198.
-
-Changes from binutils 2.19.51.0.5:
-
-1. Update from binutils 2009 0529.
-2. Rewrite STT_GNU_IFUNC, R_386_IRELATIVE and R_X86_64_IRELATIVE linker
-support for STT_GNU_IFUNC symbols in shared library, dynamic executable
-and static executable.
-3. Add plugin support.
-4. Improve spu support.
-
-Changes from binutils 2.19.51.0.4:
-
-1. Update from binutils 2009 0525.
-2. Add STT_GNU_IFUNC, R_386_IRELATIVE and R_X86_64_IRELATIVE support to
-assembler and linker.
-3. Add LD_AS_NEEDED support to linker.
-4. Remove AMD SSE5 support.
-5. A new Intel syntax parser in x86 assembler.
-6. Add DWARF discriminator support.
-7. Add --64 support for x86 PE/COFF assembler.
-8. Support common symbol with alignment for PE/COFF.
-9. Improve gold support.
-10. Improve arm support.
-11. Improve mep support.
-12. Improve mips support.
-13. Improve ppc support.
-14. Improve spu support.
-
-Changes from binutils 2.19.51.0.3:
-
-1. Update from binutils 2009 0418.
-2. Remove EFI targets and use PEI targets for EFI. Add --file-alignment,
---heap, --image-base, --section-alignment, --stack and --subsystem command
-line options for objcopy.  PR 10074.
-3. Update linker to warn alternate ELF machine code.
-4. Fix x86 linker TLS transition.  PR 9938.
-5. Improve DWARF dumper to check relocations against STT_SECTION
-symbol.
-6. Guard DWARF dumper on bad DWARF input.
-7. Add EM_ETPU and EM_SLE9X.  Reserve 3 ELF machine types for Intel.
-8. Adding a linker missing entry symbol warning for -pie. PR 9970.
-9. Make the -e option for linker to imply -u.  PR 6766.
-10. Properly handle paging for PEI targets.
-11. Fix assembler listing with input from stdin.
-12. Update objcopy/string to generate symbol table if there is any
-relocation in output.  PR 9945.
-13. Require texinfo 4.7 for build.  PR 10039.
-14. Add moxie support.
-15. Improve gold support.
-16. Improve AIX support.
-17. Improve arm support.
-18. Improve cris support.
-19. Improve crx support.
-20. Improve mips support.
-21. Improve ppc support.
-22. Improve s390 support.
-23. Improve spu support.
-24. Improve vax support.
-
-Changes from binutils 2.19.51.0.2:
-
-1. Update from binutils 2009 0310.
-2. Fix strip on common symbols in relocatable file.  PR 9933.
-3. Fix --enable-targets=all build.
-4. Fix ia64 build with -Wformat-security.  PR 9874.
-5. Add REGION_ALIAS support in linker script.
-6. Add think archive support to readelf.
-7. Improve DWARF support in objdump.
-8. Improve alpha support.
-9. Improve arm support.
-10. Improve hppa support.
-11. Improve m68k support.
-12. Improve mips support.
-13. Improve ppc support.
-14. Improve xtensa support.
-15. Add score 7 support.
-
-Changes from binutils 2.19.51.0.1:
-
-1. Update from binutils 2009 0204.
-2. Support AVX Programming Reference (January, 2009)
-3. Improve .s suffix support in x86 disassembler.
-4. Add --prefix/--prefix-strip for objdump -S.  PR 9784.
-5. Change "ld --as-needed" to resolve undefined references in DSO.
-6. Add -Ttext-segment to ld to set address of text segment.
-7. Fix "ld -r --gc-sections --entry" crash with COMDAT group.  PR 9727.
-8. Improve linker compatibility for g++ 3.4 `.gnu.linkonce.r.*.
-9. Add VMS/ia64 support.
-10. Improve arm support.
-11. Improve cris support.
-12. Improve m68k support.
-13. Improve mips support.
-14. Improve spu support.
-
-Changes from binutils 2.19.50.0.1:
-
-1. Update from binutils 2009 0106.
-2. Support AVX Programming Reference (December, 2008)
-2. Encode AVX insns with 2byte VEX prefix if possible.
-4. Add .s suffix support to swap register operands to x86 assembler.
-5. Properly select NOP insns for code alignment in x86 assembler.
-6. Fix 2 symbol visibility linker bugs.  PRs 9676/9679.
-7. Fix an ia64 linker relaxation bug.  PR 7036.
-8. Fix a symbol versioning bug. PR 7047.
-9. Fix unitialized data in linker.  PR 7028.
-10. Avoid a linker crash on bad input.  PR 7023.
-11. Fix a linker memory leak.  PR 7012.
-12. Fix strip/objcopy crash on PT_GNU_RELRO.  PR 7011.
-13. Improve MacOS support.
-14. Fix a COFF linker bug.  PR 6945.
-15. Add LM32 support.
-16. Fix various arm bugs.
-17. Fix various avr bugs.
-18. Fix various CR16  bugs.
-19. Fix various cris bugs.
-20. Fix various m32c bugs.
-21. Fix various m68k bugs.
-22. Fix various mips bugs.
-23. Fix various ppc bugs.
-24. Fix various s390 bugs.
-25. Fix various sparc bugs.
-26. Fix various spu bugs.
-27. Fix various xtensa bugs.
-
-The file list:
-
-1. binutils-2.20.51.0.8.tar.bz2. Source code.
-2. binutils-2.20.51.0.8.i686.tar.bz2. IA-32 binary tar ball for RedHat
-   EL 5.
-3. binutils-2.20.51.0.8.ia64.tar.bz2. IA-64 binary tar ball for RedHat
-   EL 5.
-4. binutils-2.20.51.0.8.x86_64.tar.bz2. X64_64 binary tar ball for RedHat
-   EL 5.
-
-The primary sites for the beta Linux binutils are:
-
-1. http://www.kernel.org/pub/linux/devel/binutils/
-
-Thanks.
-
-
-H.J. Lu
-hjl.tools@gmail.com
-04/13/2010
diff --git a/source/d/binutils/release.binutils-2.21.51.0.6 b/source/d/binutils/release.binutils-2.21.51.0.6
new file mode 100644
index 00000000..38a38474
--- /dev/null
+++ b/source/d/binutils/release.binutils-2.21.51.0.6
@@ -0,0 +1,257 @@
+This is the beta release of binutils 2.21.51.0.6 for Linux, which is
+based on binutils 2011 0118 in CVS on sourceware.org plus various
+changes. It is purely for Linux.
+
+All relevant patches in patches have been applied to the source tree.
+You can take a look at patches/README to see what have been applied and
+in what order they have been applied.
+
+Starting from the 2.21.51.0.3 release, you must remove .ctors/.dtors
+section sentinels when building glibc or other C run-time libraries.
+Otherwise, you will run into:
+
+http://sourceware.org/bugzilla/show_bug.cgi?id=12343
+
+Starting from the 2.21.51.0.2 release, BFD linker has the working LTO
+plugin support. It can be used with GCC 4.5 and above. For GCC 4.5, you
+need to configure GCC with --enable-gold to enable LTO plugin support.
+
+Starting from the 2.21.51.0.2 release, binutils fully supports compressed
+debug sections.  However, compressed debug section isn't turned on by
+default in assembler. I am planning to turn it on for x86 assembler in
+the future release, which may lead to the Linux kernel bug messages like
+
+WARNING: lib/ts_kmp.o (.zdebug_aranges): unexpected non-allocatable section.
+
+But the resulting kernel works fine.
+
+Starting from the 2.20.51.0.4 release, no diffs against the previous
+release will be provided.
+
+You can enable both gold and bfd ld with --enable-gold=both.  Gold will
+be installed as ld.gold and bfd ld will be installed as ld.bfd.  By
+default, ld.bfd will be installed as ld.  You can use the configure
+option, --enable-gold=both/gold to choose gold as the default linker,
+ld.  IA-32 binary and X64_64 binary tar balls are configured with
+--enable-gold=both/ld --enable-plugins --enable-threads.
+
+Starting from the 2.18.50.0.4 release, the x86 assembler no longer
+accepts
+
+	fnstsw %eax
+
+fnstsw stores 16bit into %ax and the upper 16bit of %eax is unchanged.
+Please use
+
+	fnstsw %ax
+
+Starting from the 2.17.50.0.4 release, the default output section LMA
+(load memory address) has changed for allocatable sections from being
+equal to VMA (virtual memory address), to keeping the difference between
+LMA and VMA the same as the previous output section in the same region.
+
+For
+
+.data.init_task : { *(.data.init_task) }
+
+LMA of .data.init_task section is equal to its VMA with the old linker.
+With the new linker, it depends on the previous output section. You
+can use
+
+.data.init_task : AT (ADDR(.data.init_task)) { *(.data.init_task) }
+
+to ensure that LMA of .data.init_task section is always equal to its
+VMA. The linker script in the older 2.6 x86-64 kernel depends on the
+old behavior.  You can add AT (ADDR(section)) to force LMA of
+.data.init_task section equal to its VMA. It will work with both old
+and new linkers. The x86-64 kernel linker script in kernel 2.6.13 and
+above is OK.
+
+The new x86_64 assembler no longer accepts
+
+	monitor %eax,%ecx,%edx
+
+You should use
+
+	monitor %rax,%ecx,%edx
+
+or
+	monitor
+
+which works with both old and new x86_64 assemblers. They should
+generate the same opcode.
+
+The new i386/x86_64 assemblers no longer accept instructions for moving
+between a segment register and a 32bit memory location, i.e.,
+
+	movl (%eax),%ds
+	movl %ds,(%eax)
+
+To generate instructions for moving between a segment register and a
+16bit memory location without the 16bit operand size prefix, 0x66,
+
+	mov (%eax),%ds
+	mov %ds,(%eax)
+
+should be used. It will work with both new and old assemblers. The
+assembler starting from 2.16.90.0.1 will also support
+
+	movw (%eax),%ds
+	movw %ds,(%eax)
+
+without the 0x66 prefix. Patches for 2.4 and 2.6 Linux kernels are
+available at
+
+http://www.kernel.org/pub/linux/devel/binutils/linux-2.4-seg-4.patch
+http://www.kernel.org/pub/linux/devel/binutils/linux-2.6-seg-5.patch
+
+The ia64 assembler is now defaulted to tune for Itanium 2 processors.
+To build a kernel for Itanium 1 processors, you will need to add
+
+ifeq ($(CONFIG_ITANIUM),y)
+	CFLAGS += -Wa,-mtune=itanium1
+	AFLAGS += -Wa,-mtune=itanium1
+endif
+
+to arch/ia64/Makefile in your kernel source tree.
+
+Please report any bugs related to binutils 2.21.51.0.6 to
+hjl.tools@gmail.com
+
+and
+
+http://www.sourceware.org/bugzilla/
+
+Changes from binutils 2.21.51.0.5:
+
+1. Update from binutils 2011 0118.
+2. Fix x32 (ILP32) support.  Renamed assembler option to --x32.  It
+can create working static and dynamic x32 executables.
+3. Add BMI and TBM new instruction support.
+4. Fix x86 disassembler to properly display sign-extended byte.
+5. Improve IFUNC linker support.  PRs 12366/12371.
+6. Fix readelf bug on archive. PR 12408.
+7. Fix a assembler when compressing empty debug sections.  PR 12409.
+8. Fix a warning symbol linker bug.  PR 12339.
+9. Fix a duplicated assert message linker bug.  PR 12380.
+10. Fix plugin linker build.  PR 12391.
+11. Fix a plugin linker crash.  PR 12364.
+12. Improve plugin linker.
+13. Improve gold.
+14. Improve arm support.
+15. Improve mips support.
+16. Improve rx support.
+
+Changes from binutils 2.21.51.0.4:
+
+1. Update from binutils 2011 0104.
+2. Add ILP32 support:
+
+http://www.kernel.org/pub/linux/devel/binutils/ilp32/abi.pdf
+
+to Linux/x86-64.
+3. Prevent the Linux x86-64 kernel build failure and remove
+__ld_compatibility support.  PR 12356.
+4. Improve gold.
+5. Improve Windows support.
+6. Improve hppa support.
+7. Improve mips support.
+
+Changes from binutils 2.21.51.0.3:
+
+1. Update from binutils 2010 1217.
+2. Fix the Linux relocatable kernel build.  PR 12327.
+3. Improve mips support.
+
+Changes from binutils 2.21.51.0.2:
+
+1. Update from binutils 2010 1215.
+2. Add BFD linker support for placing input .ctors/.dtors sections in
+output .init_array/.fini_array section.  Add SORT_BY_INIT_PRIORITY.  The
+benefits are
+   a. Avoid output .ctors/.dtors section in executables and shared
+      libraries.
+   b. Allow mixing input .ctors/.dtors sections with input
+   .init_array/.fini_array sectiobs.  GCC PR 46770.
+3. Add BFD linker support for "ld -r" on mixed IR/non-IR objects. Add
+the new ELF section type SHT_GNU_OBJECT_ONLY (0x6ffffff8). See
+
+http://sourceware.org/bugzilla/show_bug.cgi?id=12291
+
+4. Update BFD linker to accept -flto and -flto-partition= for GCC LTO
+option compatibility.
+5. Fix BFD linker to avoid touching uncompressed section content when
+relocating DWARF debug sections for errror reporting.
+6. Mark .gnu.lto_* sections with SHF_EXCLUDE.
+7. Add --target option to ar.
+8. Improve gold.
+9. Improve AIX support.
+10. Improve Windows support.
+11. Improve mips support.
+
+Changes from binutils 2.21.51.0.1:
+
+1. Update from binutils 2010 1206.
+2. Fix BFD and GOLD linker for compressed debug section support.
+3. Fix BFD linker plugin support.  PR ld/12246, ld/12247, ld/12248,
+ld/12277, ld/12288 and ld/12289.
+4. Update BFD linker to group .text.exit, text.startup and .text.hot
+sections.
+5. Fix linker for W_EH_PE_datarel handling.  PR ld/12253.
+6. Fix array access bug in readelf/elfedit.  PR binutils/11742 and
+binutils/12235.
+7. Support dumping GDB .gdb_index section.
+8. Install plugin-api.h.
+9. Improve gold.
+10. Improve Solaris support.
+11. Improve VMS support.
+12. Improve Windows support.
+13. Improve arm support.
+14. Improve bfin support.
+15. Improve mips support.
+16. Improve s390 support.
+17. Improve z80 support.
+
+Changes from binutils 2.20.51.0.12:
+
+1. Update from binutils 2010 1110.
+2. Fix ld plugin support.  PRs lto/46291 and lto/46319.
+3. Fix x86 assembler to properly fold _GLOBAL_OFFSET_TABLE_ in Intel
+syntax.  PR 12186.
+4. Update assembler to ensure that group signature symbols have the name
+of the group.
+5. Avoid unnecessary relaxation in assembler.  PR 12049.
+6. Update linker NOLOAD processing.
+7. Update linker not to include archive members when symbols therein have
+already been defined.  PR 12001.
+8. Change objdump to display compressed section names without 'z'.
+9. Improve gold.
+10. Improve Solaris support.
+11. Improve VMS support.
+12. Improve Windows support.
+13. Improve arm support.
+14. Improve cr16 support.
+15. Improve mips support.
+16. Improve ppc support.
+17. Improve tic6x support.
+
+The file list:
+
+1. binutils-2.21.51.0.6.tar.bz2. Source code.
+2. binutils-2.21.51.0.6.i686.tar.bz2. IA-32 binary tar ball for RedHat
+   EL 5.
+3. binutils-2.21.51.0.6.ia64.tar.bz2. IA-64 binary tar ball for RedHat
+   EL 5.
+4. binutils-2.21.51.0.6.x86_64.tar.bz2. X64_64 binary tar ball for RedHat
+   EL 5.
+
+The primary sites for the beta Linux binutils are:
+
+1. http://www.kernel.org/pub/linux/devel/binutils/
+
+Thanks.
+
+
+H.J. Lu
+hjl.tools@gmail.com
+01/18/2011
diff --git a/source/d/bison/bison.SlackBuild b/source/d/bison/bison.SlackBuild
index d4143625..b4835eed 100755
--- a/source/d/bison/bison.SlackBuild
+++ b/source/d/bison/bison.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2005-2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,8 +21,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=2.4.2
-BUILD=${BUILD:-1}
+PKGNAM=bison
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:--j6}
 
@@ -84,12 +85,21 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \
 rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*
 gzip -9 $PKG/usr/man/man1/bison.1
+gzip -9 $PKG/usr/man/man1/yacc.1
 
 mkdir -p $PKG/usr/doc/bison-$VERSION
 cp -a \
-  AUTHORS COPYING* INSTALL NEWS README REFERENCES THANKS doc/FAQ \
+  AUTHORS COPYING* INSTALL NEWS README* REFERENCES THANKS doc/FAQ \
   $PKG/usr/doc/bison-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source/d/ccache/ccache.SlackBuild b/source/d/ccache/ccache.SlackBuild
index c7898ee8..ea0e5a69 100755
--- a/source/d/ccache/ccache.SlackBuild
+++ b/source/d/ccache/ccache.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,21 +20,32 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=2.4
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+PKGNAM=ccache
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-ccache
 
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf ccache-$VERSION
-tar xvf $CWD/ccache-$VERSION.tar.gz || exit 1
+tar xvf $CWD/ccache-$VERSION.tar.xz || exit 1
 cd ccache-$VERSION || exit 1
 chown -R root:root .
 find . \
@@ -43,16 +54,31 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-./configure --prefix=/usr
+./configure \
+  --prefix=/usr \
+  --mandir=/usr/man
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
-gzip -9 $PKG/usr/man/man1/*.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/ccache-$VERSION
 cp -a \
-  web/index.html README \
+  *.txt \
   $PKG/usr/doc/ccache-$VERSION
 
 # Strip binaries:
diff --git a/source/d/clisp/clisp.SlackBuild b/source/d/clisp/clisp.SlackBuild
index 4d6b43f4..c94838fa 100755
--- a/source/d/clisp/clisp.SlackBuild
+++ b/source/d/clisp/clisp.SlackBuild
@@ -21,8 +21,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=2.48
-DIRNAME=2.48
+VERSION=2.49
+DIRNAME=2.49
 BUILD=${BUILD:-1}
 
 # Bundled libraries:
diff --git a/source/d/cmake/cmake.SlackBuild b/source/d/cmake/cmake.SlackBuild
index 25fd3b4f..e3e1504e 100755
--- a/source/d/cmake/cmake.SlackBuild
+++ b/source/d/cmake/cmake.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -75,7 +75,8 @@ CXXFLAGS="$SLKCFLAGS" \
   ../configure \
   --prefix=/usr \
   --docdir=/doc/$PKGNAM-$VERSION \
-  $SLKCONFIGFLAGS \
+  --qt-gui \
+  --system-libs \
   --build=$ARCH-slackware-linux
 
 make $NUMJOBS || make || exit 1
@@ -89,6 +90,10 @@ if [ -r ../ChangeLog.txt ]; then
   touch -r ../ChangeLog.txt $DOCSDIR/ChangeLog.txt
 fi
 
+# How many redundant docs do we need?
+# If you really require the docbook, it is in the source.
+rm -f $PKG/usr/doc/$PKGNAM-$VERSION/*.docbook
+
 # Compress and link manpages, if any:
 if [ -d $PKG/usr/man ]; then
   ( cd $PKG/usr/man
diff --git a/source/d/cvs/cvs.SlackBuild b/source/d/cvs/cvs.SlackBuild
index f7cec7ac..4c3528cb 100755
--- a/source/d/cvs/cvs.SlackBuild
+++ b/source/d/cvs/cvs.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,16 +22,28 @@
 
 
 VERSION=1.11.23
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 CWD=$(pwd)
diff --git a/source/d/dev86/dev86.SlackBuild b/source/d/dev86/dev86.SlackBuild
index e4c06882..5c4e1555 100755
--- a/source/d/dev86/dev86.SlackBuild
+++ b/source/d/dev86/dev86.SlackBuild
@@ -24,9 +24,18 @@
 PRGNAM=dev86
 SRCNAM=Dev86src
 VERSION=0.16.17
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PRGNAM
@@ -41,6 +50,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
diff --git a/source/d/distcc/distcc.SlackBuild b/source/d/distcc/distcc.SlackBuild
index e6523385..c432cddb 100755
--- a/source/d/distcc/distcc.SlackBuild
+++ b/source/d/distcc/distcc.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,20 @@
 
 
 VERSION=2.18.3
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-distcc
diff --git a/source/d/doxygen/doxygen.SlackBuild b/source/d/doxygen/doxygen.SlackBuild
index 66ae4d36..97db3b10 100755
--- a/source/d/doxygen/doxygen.SlackBuild
+++ b/source/d/doxygen/doxygen.SlackBuild
@@ -87,11 +87,20 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 # If there are misplaced man pages, fix that:
 mv $PKG/usr/*.1 $PKG/usr/man/man1
 
-# 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 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/doxygen-$VERSION
 cp -a \
diff --git a/source/d/flex/flex.SlackBuild b/source/d/flex/flex.SlackBuild
index 8c1d1ec9..f46b24e9 100755
--- a/source/d/flex/flex.SlackBuild
+++ b/source/d/flex/flex.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,20 @@
 
 PKGNAM=flex
 VERSION=${VERSION:-2.5.35}
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-${PKGNAM}
@@ -43,6 +53,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 cd $TMP
diff --git a/source/d/gcc/ecj-4.3.jar b/source/d/gcc/ecj-4.3.jar
deleted file mode 100644
index db02a5e2..00000000
--- a/source/d/gcc/ecj-4.3.jar
+++ /dev/null
diff --git a/source/d/gcc/ecj-4.5.jar b/source/d/gcc/ecj-4.5.jar
new file mode 100644
index 00000000..8d5ed17a
--- /dev/null
+++ b/source/d/gcc/ecj-4.5.jar
diff --git a/source/d/gcc/fastjar-patches/1000-fastjar-0.97-segfault.patch b/source/d/gcc/fastjar-patches/1000-fastjar-0.97-segfault.patch
new file mode 100644
index 00000000..ab626240
--- /dev/null
+++ b/source/d/gcc/fastjar-patches/1000-fastjar-0.97-segfault.patch
@@ -0,0 +1,29 @@
+2009-01-14  Jakub Jelinek  <jakub@redhat.com>
+
+	* jartool.c (make_manifest): Initialize current_time before
+	calling unix2dostime on it.
+
+--- fastjar-0.97/jartool.c.jj	2008-10-15 18:35:37.000000000 +0200
++++ fastjar-0.97/jartool.c	2009-01-14 15:40:50.000000000 +0100
+@@ -820,6 +820,10 @@ int make_manifest(int jfd, const char *m
+   int mod_time; /* file modification time */
+   struct zipentry *ze;
+ 
++  current_time = time(NULL);
++  if(current_time == (time_t)-1)
++    exit_on_error("time");
++
+   mod_time = unix2dostime(&current_time);  
+   
+   /* If we are creating a new manifest, create a META-INF directory entry */
+@@ -828,10 +832,6 @@ int make_manifest(int jfd, const char *m
+ 
+     memset((file_header + 12), '\0', 16); /*clear mod time, crc, size fields*/
+   
+-    current_time = time(NULL);
+-    if(current_time == (time_t)-1)
+-      exit_on_error("time");
+-
+     PACK_UB2(file_header, LOC_EXTRA, 0);
+     PACK_UB2(file_header, LOC_COMP, 0);
+     PACK_UB2(file_header, LOC_FNLEN, nlen);
diff --git a/source/d/gcc/fastjar-patches/1001-fastjar-0.97-len1.patch b/source/d/gcc/fastjar-patches/1001-fastjar-0.97-len1.patch
new file mode 100644
index 00000000..722351d3
--- /dev/null
+++ b/source/d/gcc/fastjar-patches/1001-fastjar-0.97-len1.patch
@@ -0,0 +1,16 @@
+2009-12-21  Chris Ball  <cjb@laptop.org>
+
+	* jartool.c (add_file_to_jar): Test write return value against -1
+	instead of 1.
+
+--- fastjar-0.97/jartool.c.jj	2008-10-15 12:35:37.000000000 -0400
++++ fastjar-0.97/jartool.c	2009-12-22 06:48:09.309530000 -0500
+@@ -1257,7 +1257,7 @@ int add_file_to_jar(int jfd, int ffd, co
+       exit_on_error("write");
+ 
+   /* write the file name to the zip file */
+-  if (1 == write(jfd, fname, file_name_length))
++  if (-1 == write(jfd, fname, file_name_length))
+     exit_on_error("write");
+ 
+   if(verbose){
diff --git a/source/d/gcc/fastjar-patches/1002-fastjar-0.97-filename0.patch b/source/d/gcc/fastjar-patches/1002-fastjar-0.97-filename0.patch
new file mode 100644
index 00000000..34a02a74
--- /dev/null
+++ b/source/d/gcc/fastjar-patches/1002-fastjar-0.97-filename0.patch
@@ -0,0 +1,14 @@
+2010-03-01  Richard Guenther  <rguenther@suse.de>
+
+	* jartool.c (read_entries): Properly zero-terminate filename.
+
+--- fastjar-0.97/jartool.c	6 Sep 2009 22:16:00 -0000	1.59
++++ fastjar-0.97/jartool.c	1 Mar 2010 15:38:43 -0000	1.60
+@@ -790,6 +790,7 @@ int read_entries (int fd)
+ 		   progname, jarfile);
+ 	  return 1;
+ 	}
++      ze->filename[len] = '\0';
+       len = UNPACK_UB4(header, CEN_EFLEN);
+       len += UNPACK_UB4(header, CEN_COMLEN);
+       if (lseek (fd, len, SEEK_CUR) == -1)
diff --git a/source/d/gcc/fastjar-patches/1003-fastjar-CVE-2010-0831.patch b/source/d/gcc/fastjar-patches/1003-fastjar-CVE-2010-0831.patch
new file mode 100644
index 00000000..2c6e23c7
--- /dev/null
+++ b/source/d/gcc/fastjar-patches/1003-fastjar-CVE-2010-0831.patch
@@ -0,0 +1,102 @@
+2010-06-10  Jakub Jelinek  <jakub@redhat.com>
+	    Dan Rosenberg  <dan.j.rosenberg@gmail.com>
+
+	* jartool.c (extract_jar): Fix up checks for traversal to parent
+	directories, disallow absolute paths, make the code slightly more
+	efficient.
+
+--- fastjar-0.97/jartool.c.jj	2009-09-07 00:10:47.000000000 +0200
++++ fastjar-0.97/jartool.c	2010-06-08 20:00:29.000000000 +0200
+@@ -1730,7 +1730,17 @@ int extract_jar(int fd, const char **fil
+       struct stat sbuf;
+       int depth = 0;
+ 
+-      tmp_buff = malloc(sizeof(char) * strlen((const char *)filename));
++      if(*filename == '/'){
++	fprintf(stderr, "Absolute path names are not allowed.\n");
++	exit(EXIT_FAILURE);
++      }
++
++      tmp_buff = malloc(strlen((const char *)filename));
++
++      if(tmp_buff == NULL) {
++	fprintf(stderr, "Out of memory.\n");
++	exit(EXIT_FAILURE);
++      }
+ 
+       for(;;){
+         const ub1 *idx = (const unsigned char *)strchr((const char *)start, '/');
+@@ -1738,25 +1748,28 @@ int extract_jar(int fd, const char **fil
+         if(idx == NULL)
+           break;
+         else if(idx == start){
++	  tmp_buff[idx - filename] = '/';
+           start++;
+           continue;
+         }
+-        start = idx + 1;
+ 
+-        strncpy(tmp_buff, (const char *)filename, (idx - filename));
+-        tmp_buff[(idx - filename)] = '\0';
++	memcpy(tmp_buff + (start - filename), (const char *)start, (idx - start));
++	tmp_buff[idx - filename] = '\0';
+ 
+ #ifdef DEBUG    
+         printf("checking the existance of %s\n", tmp_buff);
+ #endif
+-	if(strcmp(tmp_buff, "..") == 0){
++	if(idx - start == 2 && memcmp(start, "..", 2) == 0){
+ 	  --depth;
+ 	  if (depth < 0){
+ 	    fprintf(stderr, "Traversal to parent directories during unpacking!\n");
+ 	    exit(EXIT_FAILURE);
+ 	  }
+-	} else if (strcmp(tmp_buff, ".") != 0)
++	} else if (idx - start != 1 || *start != '.')
+ 	  ++depth;
++
++        start = idx + 1;
++
+         if(stat(tmp_buff, &sbuf) < 0){
+           if(errno != ENOENT)
+             exit_on_error("stat");
+@@ -1765,6 +1778,7 @@ int extract_jar(int fd, const char **fil
+ #ifdef DEBUG    
+           printf("Directory exists\n");
+ #endif
++	  tmp_buff[idx - filename] = '/';
+           continue;
+         }else {
+           fprintf(stderr, "Hmmm.. %s exists but isn't a directory!\n",
+@@ -1781,10 +1795,11 @@ int extract_jar(int fd, const char **fil
+         if(verbose && handle)
+           printf("%10s: %s/\n", "created", tmp_buff);
+ 
++	tmp_buff[idx - filename] = '/';
+       }
+ 
+       /* only a directory */
+-      if(strlen((const char *)start) == 0)
++      if(*start == '\0')
+         dir = TRUE;
+ 
+ #ifdef DEBUG    
+@@ -1792,7 +1807,7 @@ int extract_jar(int fd, const char **fil
+ #endif
+ 
+       /* If the entry was just a directory, don't write to file, etc */
+-      if(strlen((const char *)start) == 0)
++      if(*start == '\0')
+         f_fd = -1;
+ 
+       free(tmp_buff);
+@@ -1876,7 +1891,8 @@ int extract_jar(int fd, const char **fil
+       exit(EXIT_FAILURE);
+     }
+ 
+-    close(f_fd);
++    if (f_fd != -1)
++      close(f_fd);
+ 
+     if(verbose && dir == FALSE && handle)
+       printf("%10s: %s\n",
diff --git a/source/d/gcc/fastjar-patches/1004-fastjar-man.patch b/source/d/gcc/fastjar-patches/1004-fastjar-man.patch
new file mode 100644
index 00000000..34bf704d
--- /dev/null
+++ b/source/d/gcc/fastjar-patches/1004-fastjar-man.patch
@@ -0,0 +1,27 @@
+2010-03-24  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* Makefile.am (POD2MAN): Provide --date from ChangeLog.
+	* Makefile.in: Regenerate.
+
+--- fastjar-0.97/Makefile.am.jj	2008-10-16 04:24:55.000000000 -0400
++++ fastjar-0.97/Makefile.am	2010-06-21 09:29:41.021398000 -0400
+@@ -39,7 +39,7 @@ EXTRA_DIST = \
+ 	texi2pod.pl
+ 
+ TEXI2POD = perl $(srcdir)/texi2pod.pl
+-POD2MAN = pod2man --center="GNU" --release=@VERSION@
++POD2MAN = pod2man --center="GNU" --release=@VERSION@ --date=$(shell sed -n '1s/ .*//p' <$(srcdir)/ChangeLog)
+ 
+ .pod.1:
+ 	-($(POD2MAN) --section=1 $< > $(@).T$$$$ && \
+--- fastjar-0.97/Makefile.in.jj	2008-10-16 04:15:16.000000000 -0400
++++ fastjar-0.97/Makefile.in	2010-06-21 09:30:15.882810000 -0400
+@@ -515,7 +515,7 @@ EXTRA_DIST = \
+ 	texi2pod.pl
+ 
+ TEXI2POD = perl $(srcdir)/texi2pod.pl
+-POD2MAN = pod2man --center="GNU" --release=@VERSION@
++POD2MAN = pod2man --center="GNU" --release=@VERSION@ --date=$(shell sed -n '1s/ .*//p' <$(srcdir)/ChangeLog)
+ 
+ #SPLINT_FLAGS=-I . -I $(srcdir)/lib -I $(srcdir) -DHAVE_CONFIG_H +posixlib +weak
+ SPLINT_FLAGS = -I . -I $(srcdir)/lib -I $(srcdir) -DHAVE_CONFIG_H -DPRIx32= -warnposix +weak
diff --git a/source/d/gcc/gcc-no_fixincludes.diff b/source/d/gcc/gcc-no_fixincludes.diff
index 917b14f0..52b66161 100644
--- a/source/d/gcc/gcc-no_fixincludes.diff
+++ b/source/d/gcc/gcc-no_fixincludes.diff
@@ -1,6 +1,6 @@
---- ./gcc/Makefile.in.orig	2008-12-04 17:00:19.000000000 -0600
-+++ ./gcc/Makefile.in	2009-01-29 01:17:33.000000000 -0600
-@@ -3441,9 +3441,9 @@
+--- ./gcc/Makefile.in.orig	2010-04-02 02:49:06.000000000 -0500
++++ ./gcc/Makefile.in	2010-08-01 16:55:30.088318841 -0500
+@@ -3864,9 +3864,9 @@
  	  chmod a+r $${fix_dir}/limits.h; \
  	done
  # Install the README
@@ -13,13 +13,13 @@
  	$(STAMP) $@
  
  .PHONY: install-gcc-tooldir
-@@ -3523,10 +3523,7 @@
- 	    chmod a+rx $${fix_dir} || true; \
+@@ -3947,10 +3947,7 @@
  	    (TARGET_MACHINE='$(target)'; srcdir=`cd $(srcdir); ${PWD_COMMAND}`; \
  	      SHELL='$(SHELL)'; MACRO_LIST=`${PWD_COMMAND}`/macro_list ; \
+ 	      gcc_dir=`${PWD_COMMAND}` ; \
 -	      export TARGET_MACHINE srcdir SHELL MACRO_LIST && \
 -	      cd $(build_objdir)/fixincludes && \
--	      $(SHELL) ./fixinc.sh ../../gcc/$${fix_dir} \
+-	      $(SHELL) ./fixinc.sh "$${gcc_dir}/$${fix_dir}" \
 -	        $(SYSTEM_HEADER_DIR) $(OTHER_FIXINCLUDES_DIRS) ); \
 +	      export TARGET_MACHINE srcdir SHELL MACRO_LIST ); \
  	    rm -f $${fix_dir}/syslimits.h; \
diff --git a/source/d/gcc/gcc.SlackBuild b/source/d/gcc/gcc.SlackBuild
index b11a7c6c..8288a2a4 100755
--- a/source/d/gcc/gcc.SlackBuild
+++ b/source/d/gcc/gcc.SlackBuild
@@ -2,7 +2,7 @@
 # GCC package build script (written by volkerdi@slackware.com)
 #
 # Copyright 2003, 2004  Slackware Linux, Inc., Concord, California, USA
-# Copyright 2005, 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -42,11 +42,12 @@
 # I see no reason to continue 386 support in the latest Slackware (and indeed
 # it's no longer easily possible).
 
-VERSION=4.4.4
-BUILD=${BUILD:-1}
+PKGNAM=gcc
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
 
 # How many jobs to run in parallel:
-NUMJOB=" -j 4 "
+NUMJOBS=" -j 7 "
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -119,7 +120,7 @@ tar xvf $CWD/gcc-$VERSION.tar.?z*
 
 # Copy ecj.jar into the TLD of the source. Needed for java compiler.
 # This can be retrieved from ftp://sourceware.org/pub/java
-cp $CWD/ecj-4.3.jar gcc-$VERSION/ecj.jar
+cp $CWD/ecj-4.5.jar gcc-$VERSION/ecj.jar
 
 # install docs
 ( cd gcc-$VERSION
@@ -154,7 +155,7 @@ cp $CWD/ecj-4.3.jar gcc-$VERSION/ecj.jar
   mkdir -p $PKG1/usr/doc/gcc-${VERSION}/gcc
   ( cd gcc
     cp -a \
-      ABOUT* COPYING* LANG* ONEWS README* SERVICE \
+      ABOUT* COPYING* DATESTAMP DEV-PHASE LANG* ONEWS README* SERVICE \
     $PKG1/usr/doc/gcc-$VERSION/gcc
          
     mkdir -p $PKG3/usr/doc/gcc-${VERSION}/gcc/fortran
@@ -207,11 +208,11 @@ cp $CWD/ecj-4.3.jar gcc-$VERSION/ecj.jar
     fi
   )
 
-  mkdir -p $PKG3/usr/doc/gcc-${VERSION}/libada
+  mkdir -p $PKG4/usr/doc/gcc-${VERSION}/libada
   ( cd libada
     if [ -r ChangeLog ]; then
-      cat ChangeLog | head -n 1000 > $PKG3/usr/doc/gcc-${VERSION}/libada/ChangeLog
-      touch -r ChangeLog $PKG3/usr/doc/gcc-${VERSION}/libada/ChangeLog
+      cat ChangeLog | head -n 1000 > $PKG4/usr/doc/gcc-${VERSION}/libada/ChangeLog
+      touch -r ChangeLog $PKG4/usr/doc/gcc-${VERSION}/libada/ChangeLog
     fi
   )
 
@@ -270,7 +271,7 @@ cp $CWD/ecj-4.3.jar gcc-$VERSION/ecj.jar
   ( cd libstdc++-v3
     cp -a \
       README* \
-      docs/html/faq \
+      doc/html/faq.html \
     $PKG2/usr/doc/gcc-${VERSION}/libstdc++-v3
     if [ -r ChangeLog ]; then
       cat ChangeLog | head -n 1000 > $PKG2/usr/doc/gcc-${VERSION}/libstdc++-v3/ChangeLog
@@ -278,6 +279,72 @@ cp $CWD/ecj-4.3.jar gcc-$VERSION/ecj.jar
     fi
   )
 )
+
+# Add fastjar to the gcc-java package:
+( cd $TMP
+  FASTJARVER=$(echo $CWD/fastjar-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
+  echo
+  echo "Building fastjar-$FASTJARVER first"
+  echo
+  rm -rf fastjar-$FASTJARVER
+  tar xvf $CWD/fastjar-$FASTJARVER.tar.xz || exit 1
+  cd fastjar-$FASTJARVER || 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 {} \;
+  for patch in $CWD/fastjar-patches/*.gz ; do
+    zcat $patch | patch -p1 --verbose || exit 1
+  done
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  ./configure \
+     --prefix=/usr \
+     --libdir=/usr/lib$LIBDIRSUFFIX \
+     --mandir=/usr/man \
+     --infodir=/usr/info \
+     --build=$ARCH-slackware-linux
+  make $NUMJOBS || exit 1
+  make install DESTDIR=$PKG5 || exit 1
+  mkdir -p $PKG5/usr/doc/fastjar-$FASTJARVER
+  cp -a \
+    AUTHORS CHANGES COPYING* INSTALL NEWS README* TODO \
+    $PKG5/usr/doc/fastjar-$FASTJARVER
+  # If there's a ChangeLog, installing at least part of the recent history
+  # is useful, but don't let it get totally out of control:
+  if [ -r ChangeLog ]; then
+    DOCSDIR=$(echo $PKG5/usr/doc/fastjar-$FASTJARVER)
+    cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+    touch -r ChangeLog $DOCSDIR/ChangeLog
+  fi
+  find $PKG5 | 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 $PKG5/usr/man ]; then
+    ( cd $PKG5/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 $PKG5/usr/info ]; then
+    ( cd $PKG5/usr/info
+      rm -f dir
+      gzip -9 *
+    )
+  fi
+  echo
+) || exit 1
+
 # build gcc
 ( mkdir gcc.build.lnx;
   cd gcc.build.lnx;
@@ -301,9 +368,11 @@ cp $CWD/ecj-4.3.jar gcc-$VERSION/ecj.jar
   CXXFLAGS="$SLKCFLAGS" \
   ../gcc-$VERSION/configure --prefix=/usr \
      --libdir=/usr/lib$LIBDIRSUFFIX \
+     --mandir=/usr/man \
+     --infodir=/usr/info \
      --enable-shared \
      --enable-bootstrap \
-     --enable-languages=ada,c,c++,fortran,java,objc \
+     --enable-languages=ada,c,c++,fortran,java,objc,lto \
      --enable-threads=posix \
      --enable-checking=release \
      --with-system-zlib \
@@ -311,6 +380,7 @@ cp $CWD/ecj-4.3.jar gcc-$VERSION/ecj.jar
      --disable-libunwind-exceptions \
      --enable-__cxa_atexit \
      --enable-libssp \
+     --enable-lto \
      --with-gnu-ld \
      --verbose \
      $GCC_ARCHOPTS \
@@ -321,26 +391,32 @@ cp $CWD/ecj-4.3.jar gcc-$VERSION/ecj.jar
   # Start the build:
 
   # Include all debugging info (for now):
-  make $NUMJOB bootstrap;
+  make $NUMJOBS bootstrap;
 
   ( cd gcc
-    make $NUMJOB gnatlib GNATLIBCFLAGS="$SLKCFLAGS"
+    make $NUMJOBS gnatlib GNATLIBCFLAGS="$SLKCFLAGS"
     # This wants a shared -ladd2line?
     #make gnatlib-shared
     
     CFLAGS="$SLKCFLAGS" \
     CXXFLAGS="$SLKCFLAGS" \
-    make $NUMJOB gnattools
+    make $NUMJOBS gnattools
   )
   make info
 
   # Set GCCCHECK=something to run the tests
   if [ ! -z $GCCCHECK ]; then
-    make $NUMJOB check
+    make $NUMJOBS check
   fi
 
   make install DESTDIR=$PKG1
 
+# KLUDGE ALERT
+# These *gdb.py files are causing ldconfig to complain, so they are going
+# to be REMOVED for now...  at some point, they might be moved somewhere
+# else, in which case things should Just Work(tm).  Keep an eye on it.
+rm -f $PKG1/usr/lib${LIBDIRSUFFIX}/*gdb.py
+
 # Be sure the "specs" file is installed.
 if [ ! -r $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/${ARCH}-slackware-linux/${VERSION}/specs ]; then
   cat stage1-gcc/specs > $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/${ARCH}-slackware-linux/${VERSION}/specs
@@ -354,58 +430,65 @@ fi
 
 #  make ada.install-common DESTDIR=$PKG1
 #  make install-gnatlib DESTDIR=$PKG1
-  make -i install-info DESTDIR=$PKG1
+make -i install-info DESTDIR=$PKG1
 
-  chmod 755 $PKG1/usr/lib${LIBDIRSUFFIX}/libgcc_s.so.1
+chmod 755 $PKG1/usr/lib${LIBDIRSUFFIX}/libgcc_s.so.1
 
-  # This is provided by binutils, so delete it here:
-  rm -f $PKG1/usr/lib${LIBDIRSUFFIX}/libiberty.a
-  rm -f $PKG1/usr/lib/libiberty.a # catch-all
+# The (huge) static GNU java libraries are not packaged.  In nearly all
+# cases one or more dependencies will not be available as static anyway.
+rm -f $PKG1/usr/lib${LIBDIRSUFFIX}/libgcj.a
+rm -f $PKG1/usr/lib${LIBDIRSUFFIX}/libgcj-tools.a
 
-  # Fix stuff up:
-  ( cd $PKG1/usr/info ; rm dir ; gzip -9 * )
-  ( cd $PKG1
-    # *not* ${LIBDIRSUFFIX}
-    mkdir -p lib
-    cd lib
-    ln -sf /usr/bin/cpp .
-  )
-  ( cd $PKG1/usr/bin
-    mv g++ g++-gcc-$VERSION
-    mv gcc gcc-$VERSION
-    mv ${TARGET}-gfortran gfortran-gcc-$VERSION
-    ln -sf g++-gcc-$VERSION g++
-    ln -sf gcc-$VERSION gcc
-    ln -sf g++ c++
-    ln -sf gcc cc
-    ln -sf gcc-$VERSION ${TARGET}-gcc
-    ln -sf gcc-$VERSION ${TARGET}-gcc-$VERSION
-    ln -sf gcj ${TARGET}-gcj
-    ln -sf gcjh ${TARGET}-gcjh
-    ln -sf g++-gcc-$VERSION ${TARGET}-c++
-    ln -sf g++-gcc-$VERSION ${TARGET}-g++
-    ln -sf gfortran-gcc-$VERSION gfortran
-    ln -sf gfortran-gcc-$VERSION ${TARGET}-gfortran
-    ln -sf gfortran-gcc-$VERSION ${TARGET}-gfortran-$VERSION
-    ln -sf gfortran-gcc-$VERSION ${TARGET}-g95
-    ln -sf gfortran g95
-    ln -sf gfortran f95
-    ln -sf gfortran-gcc-$VERSION ${TARGET}-g77
-    ln -sf gfortran g77
-    ln -sf gfortran f77
-  )
-  ( cd $PKG1/usr/man
-    gzip -9 */*
-    cd man1
-    ln -sf g++.1.gz c++.1.gz
-    ln -sf gcc.1.gz cc.1.gz
-  )  
-
-  ## build the txz package
-  #(
-  #  cd $PKG1;
-  #  makepkg -l y -c n $TMP/gcc-$VERSION-$ARCH-$BUILD.txz
-  #)
+# This is provided by binutils, so delete it here:
+rm -f $PKG1/usr/lib${LIBDIRSUFFIX}/libiberty.a
+rm -f $PKG1/usr/lib/libiberty.a # catch-all
+
+# Fix stuff up:
+( cd $PKG1/usr/info ; rm dir ; gzip -9 * )
+( cd $PKG1
+  # *not* ${LIBDIRSUFFIX}
+  mkdir -p lib
+  cd lib
+  ln -sf /usr/bin/cpp .
+)
+
+( cd $PKG1/usr/bin
+  mv g++ g++-gcc-$VERSION
+  mv gcc gcc-$VERSION
+  mv ${TARGET}-gfortran gfortran-gcc-$VERSION
+  ln -sf g++-gcc-$VERSION g++
+  ln -sf gcc-$VERSION gcc
+  ln -sf g++ c++
+  ln -sf gcc cc
+  ln -sf gcc-$VERSION ${TARGET}-gcc
+  ln -sf gcc-$VERSION ${TARGET}-gcc-$VERSION
+  ln -sf gcj ${TARGET}-gcj
+  ln -sf gcjh ${TARGET}-gcjh
+  ln -sf g++-gcc-$VERSION ${TARGET}-c++
+  ln -sf g++-gcc-$VERSION ${TARGET}-g++
+  ln -sf gfortran-gcc-$VERSION gfortran
+  ln -sf gfortran-gcc-$VERSION ${TARGET}-gfortran
+  ln -sf gfortran-gcc-$VERSION ${TARGET}-gfortran-$VERSION
+  ln -sf gfortran-gcc-$VERSION ${TARGET}-g95
+  ln -sf gfortran g95
+  ln -sf gfortran f95
+  ln -sf gfortran-gcc-$VERSION ${TARGET}-g77
+  ln -sf gfortran g77
+  ln -sf gfortran f77
+)
+
+( cd $PKG1/usr/man
+  gzip -9 */*
+  cd man1
+  ln -sf g++.1.gz c++.1.gz
+  ln -sf gcc.1.gz cc.1.gz
+)  
+
+## build the txz package
+#(
+#  cd $PKG1;
+#  makepkg -l y -c n $TMP/gcc-$VERSION-$ARCH-$BUILD.txz
+#)
 # keep a log
 ) 2>&1 | tee $TMP/gcc.build.log
 
diff --git a/source/d/gdb/gdb.SlackBuild b/source/d/gdb/gdb.SlackBuild
index cad8c97c..6e418a4b 100755
--- a/source/d/gdb/gdb.SlackBuild
+++ b/source/d/gdb/gdb.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 
 PKGNAM=gdb
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -66,6 +66,7 @@ find . \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --infodir=/usr/info \
+  --without-python \
   --build=$ARCH-slackware-linux
 
 ( cd readline ; make )
diff --git a/source/d/gettext-tools b/source/d/gettext-tools
new file mode 120000
index 00000000..a9cb440b
--- /dev/null
+++ b/source/d/gettext-tools
@@ -0,0 +1 @@
+../a/gettext
\ No newline at end of file
diff --git a/source/d/git/git-1.7.1.tar.sign b/source/d/git/git-1.7.1.tar.sign
deleted file mode 100644
index 57c6f697..00000000
--- a/source/d/git/git-1.7.1.tar.sign
+++ /dev/null
@@ -1,8 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-Comment: See http://www.kernel.org/signature.html for info
-
-iD8DBQBL0lwtyGugalF9Dw4RAtrvAKCGeAZD3xiFceJH1b9YUEgIdo0S9QCfVoJM
-Yp82hUEP7iNvKovjEKccemc=
-=zw7F
------END PGP SIGNATURE-----
diff --git a/source/d/git/git-1.7.4.4.tar.sign b/source/d/git/git-1.7.4.4.tar.sign
new file mode 100644
index 00000000..5f44bdd4
--- /dev/null
+++ b/source/d/git/git-1.7.4.4.tar.sign
@@ -0,0 +1,8 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+Comment: See http://www.kernel.org/signature.html for info
+
+iD8DBQBNnMpoyGugalF9Dw4RAmY4AJ9IRB87m9225xl29RAHxv2GPl7WpgCdFz47
+lh3KZrjZ5s7H4ZQSDncWQyU=
+=tRV0
+-----END PGP SIGNATURE-----
diff --git a/source/d/git/git.SlackBuild b/source/d/git/git.SlackBuild
index 7c8e9e34..daa0cac7 100755
--- a/source/d/git/git.SlackBuild
+++ b/source/d/git/git.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -91,6 +91,7 @@ make $NUMJOBS \
   mandir=/usr/man \
   CFLAGS="$SLKCFLAGS" \
   INSTALLDIRS=vendor \
+  ASCIIDOC8=YesPlease \
   all doc || exit 1
 
 make \
@@ -98,6 +99,7 @@ make \
   mandir=/usr/man \
   "CFLAGS=$SLKCFLAGS" \
   INSTALLDIRS=vendor \
+  ASCIIDOC8=YesPlease \
   install \
   install-doc \
   DESTDIR=$PKG || exit 1
diff --git a/source/d/gperf/gperf.SlackBuild b/source/d/gperf/gperf.SlackBuild
index f1784317..62062dff 100755
--- a/source/d/gperf/gperf.SlackBuild
+++ b/source/d/gperf/gperf.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +22,20 @@
 
 
 PKGNAM=gperf
-VERSION=${VERSION:-3.0.3}
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -40,11 +49,13 @@ elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
 cd ${PKGNAM}-$VERSION
 
 # Make sure ownerships and permissions are sane:
@@ -63,7 +74,7 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --infodir=/usr/info \
   --docdir=/usr/doc/gperf-$VERSION \
-  $ARCH-slackware-linux
+  --build=$ARCH-slackware-linux
 
 # Build and install:
 make $NUMJOBS || make || exit 1
diff --git a/source/d/guile/guile.SlackBuild b/source/d/guile/guile.SlackBuild
index ec6cd977..03433ee5 100755
--- a/source/d/guile/guile.SlackBuild
+++ b/source/d/guile/guile.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,8 +21,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=1.8.7
-BUILD=${BUILD:-3}
+PKGNAM=guile
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -108,7 +109,7 @@ fi
 mkdir -p $PKG/usr/doc/guile-$VERSION
 cp -a \
   AUTHORS COPYING* FAQ GUILE-VERSION \
-  HACKING INSTALL LICENSE NEWS README THANKS \
+  HACKING INSTALL LICENSE NEWS README* THANKS \
   $PKG/usr/doc/guile-$VERSION
 
 mkdir -p $PKG/install
diff --git a/source/d/indent/indent.SlackBuild b/source/d/indent/indent.SlackBuild
index 6223b3eb..d8bdbf19 100755
--- a/source/d/indent/indent.SlackBuild
+++ b/source/d/indent/indent.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,17 @@
 
 
 VERSION=${VERSION:-2.2.10}
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
-NUMJOBS=${NUMJOBS:-" -j7 "}
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -35,8 +42,12 @@ elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-indent
diff --git a/source/d/libtool/libtool.SlackBuild b/source/d/libtool/libtool.SlackBuild
index 75a0ff2c..9849df42 100755
--- a/source/d/libtool/libtool.SlackBuild
+++ b/source/d/libtool/libtool.SlackBuild
@@ -20,8 +20,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=${VERSION:-$(echo libtool-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-$(echo libtool-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:--j6}
 
@@ -58,7 +58,7 @@ mkdir -p $TMP $PKG
 cd $TMP
 rm -rf libtool-$VERSION
 
-tar xvf $CWD/libtool-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/libtool-$VERSION.tar.xz || exit 1
 
 cd libtool-$VERSION
 chown -R root:root .
@@ -75,21 +75,24 @@ CFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --infodir=/usr/info \
+  --mandir=/usr/man \
   --docdir=/usr/doc/libtool-$VERSION \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG
+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/man?/*.?
+
 rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*
 
 mkdir -p $PKG/usr/doc/libtool-$VERSION
 cp -a \
-  AUTHORS COPYING NEWS README THANKS TODO \
+  AUTHORS COPYING* NEWS README* THANKS TODO \
     $PKG/usr/doc/libtool-$VERSION
 
 mkdir $PKG/install
diff --git a/source/d/libtool/libtool.no.moved.warning.diff b/source/d/libtool/libtool.no.moved.warning.diff
index f6a82285..80077516 100644
--- a/source/d/libtool/libtool.no.moved.warning.diff
+++ b/source/d/libtool/libtool.no.moved.warning.diff
@@ -1,44 +1,44 @@
---- ./libltdl/config/ltmain.m4sh.orig	2009-11-16 07:17:22.000000000 -0600
-+++ ./libltdl/config/ltmain.m4sh	2010-02-06 18:13:00.000000000 -0600
-@@ -4965,7 +4965,7 @@
+--- ./libltdl/config/ltmain.m4sh.orig	2010-09-22 09:45:18.000000000 -0500
++++ ./libltdl/config/ltmain.m4sh	2010-11-06 13:38:09.000000000 -0500
+@@ -5710,7 +5710,7 @@
  	# Find the relevant object directory and library name.
  	if test "X$installed" = Xyes; then
- 	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+ 	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
 -	    func_warning "library \`$lib' was moved."
-+	    # func_warning "library \`$lib' was moved."
++	    #func_warning "library \`$lib' was moved."
  	    dir="$ladir"
  	    absdir="$abs_ladir"
  	    libdir="$abs_ladir"
-@@ -5496,8 +5496,8 @@
+@@ -6277,8 +6277,8 @@
  		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
  		  test -z "$libdir" && \
  		    func_fatal_error "\`$deplib' is not a valid libtool archive"
 -		  test "$absdir" != "$libdir" && \
 -		    func_warning "\`$deplib' seems to be moved"
-+		  # test "$absdir" != "$libdir" && \
-+		  #   func_warning "\`$deplib' seems to be moved"
++		  #test "$absdir" != "$libdir" && \
++		  #  func_warning "\`$deplib' seems to be moved"
  
  		  path="-L$absdir"
  		fi
---- ./libltdl/config/ltmain.sh.orig	2009-11-16 07:23:18.000000000 -0600
-+++ ./libltdl/config/ltmain.sh	2010-02-06 18:13:26.000000000 -0600
-@@ -5407,7 +5407,7 @@
+--- ./libltdl/config/ltmain.sh.orig	2010-09-22 09:45:43.000000000 -0500
++++ ./libltdl/config/ltmain.sh	2010-11-06 13:38:49.000000000 -0500
+@@ -6499,7 +6499,7 @@
  	# Find the relevant object directory and library name.
  	if test "X$installed" = Xyes; then
- 	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+ 	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
 -	    func_warning "library \`$lib' was moved."
-+	    # func_warning "library \`$lib' was moved."
++	    #func_warning "library \`$lib' was moved."
  	    dir="$ladir"
  	    absdir="$abs_ladir"
  	    libdir="$abs_ladir"
-@@ -5938,8 +5938,8 @@
+@@ -7066,8 +7066,8 @@
  		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
  		  test -z "$libdir" && \
  		    func_fatal_error "\`$deplib' is not a valid libtool archive"
 -		  test "$absdir" != "$libdir" && \
 -		    func_warning "\`$deplib' seems to be moved"
-+		  # test "$absdir" != "$libdir" && \
-+		  #   func_warning "\`$deplib' seems to be moved"
++		  #test "$absdir" != "$libdir" && \
++		  #  func_warning "\`$deplib' seems to be moved"
  
  		  path="-L$absdir"
  		fi
diff --git a/source/d/m4/m4.SlackBuild b/source/d/m4/m4.SlackBuild
index f74e022f..5623854c 100755
--- a/source/d/m4/m4.SlackBuild
+++ b/source/d/m4/m4.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,7 +20,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=1.4.14
+PKGNAM=m4
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -58,7 +59,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf m4-$VERSION
-tar xvf $CWD/m4-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/m4-$VERSION.tar.xz || exit 1
 cd m4-$VERSION || exit 1
 chown -R root:root .
 find . \
@@ -74,7 +75,7 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --infodir=/usr/info \
   --docdir=/usr/doc/m4-$VERSION \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
@@ -115,11 +116,16 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 
 mkdir -p $PKG/usr/doc/m4-$VERSION
 cp -a \
-  BACKLOG COPYING* NEWS README THANKS TODO examples \
+  BACKLOG COPYING* NEWS README* THANKS TODO examples \
   $PKG/usr/doc/m4-$VERSION
-head -n 357 ChangeLog > $PKG/usr/doc/m4-$VERSION/ChangeLog
-touch -r ChangeLog $PKG/usr/doc/m4-$VERSION/ChangeLog
-chmod 0644 $PKG/usr/doc/m4-$VERSION/COPYING*
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/d/make/make.SlackBuild b/source/d/make/make.SlackBuild
index 15f4b610..97cbd99c 100755
--- a/source/d/make/make.SlackBuild
+++ b/source/d/make/make.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,19 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=3.81
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-1}
+PKGNAM=make
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -31,12 +41,19 @@ PKG=$TMP/package-make
 
 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"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG
@@ -44,8 +61,8 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf make-$VERSION
-tar xjvf $CWD/make-$VERSION.tar.bz2
-cd make-$VERSION
+tar xvf $CWD/make-$VERSION.tar.bz2 || exit 1
+cd make-$VERSION || exit 1
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -56,9 +73,13 @@ find . \
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  $ARCH-slackware-linux
-make
-make install DESTDIR=$PKG
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --build=$ARCH-slackware-linux
+
+make -j6 || 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
@@ -73,7 +94,7 @@ gzip -9 $PKG/usr/info/*
   ln -sf make gmake )
 mkdir -p $PKG/usr/doc/make-$VERSION
 cp -a \
-  ABOUT-NLS AUTHORS COPYING NEWS README* \
+  ABOUT-NLS AUTHORS COPYING* NEWS README* \
   $PKG/usr/doc/make-$VERSION/
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/d/nasm/nasm.SlackBuild b/source/d/nasm/nasm.SlackBuild
index 73e1e37a..d4162c0e 100755
--- a/source/d/nasm/nasm.SlackBuild
+++ b/source/d/nasm/nasm.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,7 +21,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=2.07
+PKGNAM=nasm
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -48,7 +49,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf nasm-$VERSION
-tar xvf $CWD/nasm-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/nasm-$VERSION.tar.?z* || exit 1
 cd nasm-$VERSION
 chown -R root:root .
 find . \
@@ -71,7 +72,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \
 
 mkdir -p $PKG/usr/doc/nasm-$VERSION
 cp -a \
-  AUTHORS CHANGES COPYING INSTALL LICENSE README TODO \
+  AUTHORS CHANGES COPYING* INSTALL LICENSE README* TODO \
   $PKG/usr/doc/nasm-$VERSION
 
 ( cd doc
diff --git a/source/d/oprofile/oprofile.SlackBuild b/source/d/oprofile/oprofile.SlackBuild
index 8a9d2bef..df18feef 100755
--- a/source/d/oprofile/oprofile.SlackBuild
+++ b/source/d/oprofile/oprofile.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2005-2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
 
 
 VERSION=${VERSION:-$(echo oprofile-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-5}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
diff --git a/source/d/p2c/p2c.SlackBuild b/source/d/p2c/p2c.SlackBuild
index 11bdee85..4c2508d3 100755
--- a/source/d/p2c/p2c.SlackBuild
+++ b/source/d/p2c/p2c.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,10 +27,20 @@
 # ftp://ftp.obspm.fr/pub1/computing/gnu/hurd/p2c-1.21alpha2.tar.gz
 
 VERSION=${VERSION:-1.21alpha2}
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
 BUILD=${BUILD:-3}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -40,6 +50,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
diff --git a/source/d/perl/perl.SlackBuild b/source/d/perl/perl.SlackBuild
index a58d8a7e..ca044b91 100755
--- a/source/d/perl/perl.SlackBuild
+++ b/source/d/perl/perl.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,12 +24,21 @@
 # originally by:  David Cantrell <david@slackware.com>
 # maintained by:  <volkerdi@slackware.com>
 
-VERSION=5.10.1
-# IMPORTANT: also update -Dinc_version_list in ./configure below!
-
-ARCH=${ARCH:-x86_64}
+VERSION=5.12.3
+# IMPORTANT: also update -Dinc_version_list with the previous Slackware
+# perl version in ./configure below!
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:--j6}
 
 CWD=$(pwd)
@@ -37,10 +46,10 @@ TMP=${TMP:-/tmp}
 PKG=$TMP/package-perl
 
 # Additional required modules:
-DBDMYSQL=4.013
-DBI=1.609
-URI=1.40
-XMLPARSER=2.36
+DBDMYSQL=4.018
+DBI=1.616
+URI=1.58
+XMLPARSER=2.40
 XMLSIMPLE=2.18
 
 if [ "$ARCH" = "i386" ]; then
@@ -117,7 +126,7 @@ fi
   -Doptimize="$SLKCFLAGS" \
   $USE_THREADS \
   -Dpager='/usr/bin/less -isr' \
-  -Dinc_version_list='5.10.0 5.8.8 5.8.7 5.8.6 5.8.5 5.8.4 5.8.3 5.8.2 5.8.1 5.8.0' \
+  -Dinc_version_list='5.12.2 5.12.1 5.12.0 5.10.1 5.10.0 5.8.8 5.8.7 5.8.6 5.8.5 5.8.4 5.8.3 5.8.2 5.8.1 5.8.0' \
   -Darchname=$ARCH-linux
 
 # Kludge for gcc-4.2.4's needlessly changed output:
@@ -228,8 +237,8 @@ mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/perl5/vendor_perl/${VERSION}/${ARCH}-linux-
 # Install documentation
 mkdir -p $PKG/usr/doc/perl-$VERSION
 cp -a \
-  AUTHORS Artistic Copying INSTALL MANIFEST README README.Y2K README.cn \
-  README.jp README.ko README.micro README.tw Todo.micro \
+  AUTHORS Artistic Changes Copying INSTALL MANIFEST \
+  README README.{cn,jp,ko,tw} README.linux \
   $PKG/usr/doc/perl-$VERSION
 
 # We follow LSB with symlinks in /usr/share:
diff --git a/source/d/pkg-config/pkg-config.SlackBuild b/source/d/pkg-config/pkg-config.SlackBuild
index 0a86febc..0c42ef57 100755
--- a/source/d/pkg-config/pkg-config.SlackBuild
+++ b/source/d/pkg-config/pkg-config.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,9 +20,19 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=${VERSION:-0.23}
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-3}
+PKGNAM=pkg-config
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -47,11 +57,14 @@ elif [ "$ARCH" = "arm" ]; then
 elif [ "$ARCH" = "armel" ]; then
   SLKCFLAGS="-O2 -march=armv4t"
   LIBDIRSUFFIX=""
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 cd $TMP
 rm -rf pkg-config-$VERSION
-tar xvf $CWD/pkg-config-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/pkg-config-$VERSION.tar.?z* || exit 1
 cd pkg-config-$VERSION || exit 1
 chown -R root:root .
 find . \
@@ -65,6 +78,7 @@ CFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
+  --docdir=/usr/doc/pkg-config-$VERSION \
   --build=${ARCH}-slackware-linux
 
 make $NUMJOBS || make || exit 1
diff --git a/source/d/pmake/pmake.SlackBuild b/source/d/pmake/pmake.SlackBuild
index a5d1e27e..23cc58d4 100755
--- a/source/d/pmake/pmake.SlackBuild
+++ b/source/d/pmake/pmake.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006-2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006-2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,17 @@
 
 PKGNAM=pmake
 VERSION=${VERSION:-1.111}
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -42,6 +51,8 @@ elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2 -Wall -DMACHINE_ARCH=\\\"${ARCH}\\\" -DHAVE_SETENV -DHAVE_STRERROR -DHAVE_STRDUP -DHAVE_STRFTIME -DHAVE_VSNPRINTF -D_GNU_SOURCE"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC -Wall -DMACHINE_ARCH=\\\"${ARCH}\\\" -DHAVE_SETENV -DHAVE_STRERROR -DHAVE_STRDUP -DHAVE_STRFTIME -DHAVE_VSNPRINTF -D_GNU_SOURCE"
+else
+  SLKCFLAGS="-O2 -Wall -DMACHINE_ARCH=\\\"${ARCH}\\\" -DHAVE_SETENV -DHAVE_STRERROR -DHAVE_STRDUP -DHAVE_STRFTIME -DHAVE_VSNPRINTF -D_GNU_SOURCE"
 fi
 
 cd $TMP
diff --git a/source/d/python/python.SlackBuild b/source/d/python/python.SlackBuild
index faa2b252..debd7e95 100755
--- a/source/d/python/python.SlackBuild
+++ b/source/d/python/python.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=${VERSION:-2.6.4}
+VERSION=${VERSION:-2.6.6}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
diff --git a/source/d/python/python.pure64.diff b/source/d/python/python.pure64.diff
index a0d06aac..7e4821af 100644
--- a/source/d/python/python.pure64.diff
+++ b/source/d/python/python.pure64.diff
@@ -1,6 +1,5 @@
-diff -uar Python-2.6.2.orig/Lib/distutils/command/install.py Python-2.6.2/Lib/distutils/command/install.py
---- Python-2.6.2.orig/Lib/distutils/command/install.py	2009-04-29 22:15:21.000000000 +0200
-+++ Python-2.6.2/Lib/distutils/command/install.py	2009-04-29 22:14:14.000000000 +0200
+--- ./Lib/distutils/command/install.py.orig	2010-11-27 17:21:23.000000000 -0600
++++ ./Lib/distutils/command/install.py	2010-11-27 17:25:02.000000000 -0600
 @@ -41,14 +41,14 @@
  
  INSTALL_SCHEMES = {
@@ -18,10 +17,9 @@ diff -uar Python-2.6.2.orig/Lib/distutils/command/install.py Python-2.6.2/Lib/di
          'platlib': '$base/lib64/python',
          'headers': '$base/include/python/$dist_name',
          'scripts': '$base/bin',
-diff -uar Python-2.6.2.orig/Lib/distutils/sysconfig.py Python-2.6.2/Lib/distutils/sysconfig.py
---- Python-2.6.2.orig/Lib/distutils/sysconfig.py	2009-04-29 22:15:21.000000000 +0200
-+++ Python-2.6.2/Lib/distutils/sysconfig.py	2009-04-29 22:14:14.000000000 +0200
-@@ -118,7 +118,7 @@
+--- ./Lib/distutils/sysconfig.py.orig	2010-11-27 17:21:23.000000000 -0600
++++ ./Lib/distutils/sysconfig.py	2010-11-27 17:25:02.000000000 -0600
+@@ -122,7 +122,7 @@
          if plat_specific or standard_lib:
              lib = "lib64"
          else:
diff --git a/source/d/python/python.readline.set_pre_input_hook.diff b/source/d/python/python.readline.set_pre_input_hook.diff
index 8af4b4be..8f5570c9 100644
--- a/source/d/python/python.readline.set_pre_input_hook.diff
+++ b/source/d/python/python.readline.set_pre_input_hook.diff
@@ -1,5 +1,5 @@
---- ./Modules/readline.c.orig	2008-11-04 14:43:31.000000000 -0600
-+++ ./Modules/readline.c	2009-06-09 14:23:16.000000000 -0500
+--- ./Modules/readline.c.orig	2010-05-09 10:15:40.000000000 -0500
++++ ./Modules/readline.c	2010-11-27 17:08:38.000000000 -0600
 @@ -11,6 +11,9 @@
  #include <errno.h>
  #include <sys/time.h>
diff --git a/source/d/python/python.x86_64.diff b/source/d/python/python.x86_64.diff
index 712a5d1b..cb6bf258 100644
--- a/source/d/python/python.x86_64.diff
+++ b/source/d/python/python.x86_64.diff
@@ -1,68 +1,10 @@
-diff -uar Python-2.6.2.orig/Lib/distutils/command/install.py Python-2.6.2/Lib/distutils/command/install.py
---- Python-2.6.2.orig/Lib/distutils/command/install.py	2008-05-07 00:41:46.000000000 +0200
-+++ Python-2.6.2/Lib/distutils/command/install.py	2009-04-29 22:05:43.000000000 +0200
-@@ -42,14 +42,14 @@
- INSTALL_SCHEMES = {
-     'unix_prefix': {
-         'purelib': '$base/lib/python$py_version_short/site-packages',
--        'platlib': '$platbase/lib/python$py_version_short/site-packages',
-+        'platlib': '$platbase/lib64/python$py_version_short/site-packages',
-         'headers': '$base/include/python$py_version_short/$dist_name',
-         'scripts': '$base/bin',
-         'data'   : '$base',
-         },
-     'unix_home': {
-         'purelib': '$base/lib/python',
--        'platlib': '$base/lib/python',
-+        'platlib': '$base/lib64/python',
-         'headers': '$base/include/python/$dist_name',
-         'scripts': '$base/bin',
-         'data'   : '$base',
-diff -uar Python-2.6.2.orig/Lib/distutils/sysconfig.py Python-2.6.2/Lib/distutils/sysconfig.py
---- Python-2.6.2.orig/Lib/distutils/sysconfig.py	2009-02-10 13:33:42.000000000 +0100
-+++ Python-2.6.2/Lib/distutils/sysconfig.py	2009-04-29 22:05:43.000000000 +0200
-@@ -115,8 +115,12 @@
-         prefix = plat_specific and EXEC_PREFIX or PREFIX
- 
-     if os.name == "posix":
-+        if plat_specific or standard_lib:
-+            lib = "lib64"
-+        else:
-+            lib = "lib"
-         libpython = os.path.join(prefix,
--                                 "lib", "python" + get_python_version())
-+                                 lib, "python" + get_python_version())
-         if standard_lib:
-             return libpython
-         else:
-diff -uar Python-2.6.2.orig/Lib/site.py Python-2.6.2/Lib/site.py
---- Python-2.6.2.orig/Lib/site.py	2008-05-10 19:36:24.000000000 +0200
-+++ Python-2.6.2/Lib/site.py	2009-04-29 22:05:43.000000000 +0200
-@@ -265,12 +265,16 @@
-         if sys.platform in ('os2emx', 'riscos'):
-             sitedirs.append(os.path.join(prefix, "Lib", "site-packages"))
-         elif os.sep == '/':
-+            sitedirs.append(os.path.join(prefix, "lib64",
-+                                        "python" + sys.version[:3],
-+                                        "site-packages"))
-             sitedirs.append(os.path.join(prefix, "lib",
-                                         "python" + sys.version[:3],
-                                         "site-packages"))
-             sitedirs.append(os.path.join(prefix, "lib", "site-python"))
-         else:
-             sitedirs.append(prefix)
-+            sitedirs.append(os.path.join(prefix, "lib64", "site-packages"))
-             sitedirs.append(os.path.join(prefix, "lib", "site-packages"))
- 
-         if sys.platform == "darwin":
-diff -uar Python-2.6.2.orig/Makefile.pre.in Python-2.6.2/Makefile.pre.in
---- Python-2.6.2.orig/Makefile.pre.in	2009-02-24 12:07:44.000000000 +0100
-+++ Python-2.6.2/Makefile.pre.in	2009-04-29 22:05:43.000000000 +0200
+--- ./Makefile.pre.in.orig	2010-08-01 17:05:31.000000000 -0500
++++ ./Makefile.pre.in	2010-11-27 17:22:05.000000000 -0600
 @@ -87,11 +87,11 @@
  
  # Expanded directories
- BINDIR=		$(exec_prefix)/bin
--LIBDIR=		$(exec_prefix)/lib
+ BINDIR=		@bindir@
+-LIBDIR=		@libdir@
 +LIBDIR=		$(exec_prefix)/lib64
  MANDIR=		@mandir@
  INCLUDEDIR=	@includedir@
@@ -72,30 +14,8 @@ diff -uar Python-2.6.2.orig/Makefile.pre.in Python-2.6.2/Makefile.pre.in
  
  # Detailed destination directories
  BINLIBDEST=	$(LIBDIR)/python$(VERSION)
-diff -uar Python-2.6.2.orig/Modules/Setup.dist Python-2.6.2/Modules/Setup.dist
---- Python-2.6.2.orig/Modules/Setup.dist	2008-11-27 11:15:12.000000000 +0100
-+++ Python-2.6.2/Modules/Setup.dist	2009-04-29 22:10:31.000000000 +0200
-@@ -414,7 +414,7 @@
- #DB=/usr/local/BerkeleyDB.4.0
- #DBLIBVER=4.0
- #DBINC=$(DB)/include
--#DBLIB=$(DB)/lib
-+#DBLIB=$(DB)/lib64
- #_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
- 
- # Historical Berkeley DB 1.85
-@@ -460,7 +460,7 @@
- # Andrew Kuchling's zlib module.
- # This require zlib 1.1.3 (or later).
- # See http://www.gzip.org/zlib/
--#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
-+#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz
- 
- # Interface to the Expat XML parser
- #
-diff -uar Python-2.6.2.orig/Modules/getpath.c Python-2.6.2/Modules/getpath.c
---- Python-2.6.2.orig/Modules/getpath.c	2007-03-10 08:38:14.000000000 +0100
-+++ Python-2.6.2/Modules/getpath.c	2009-04-29 22:05:43.000000000 +0200
+--- ./Modules/getpath.c.orig	2010-07-24 05:09:36.000000000 -0500
++++ ./Modules/getpath.c	2010-11-27 17:23:13.000000000 -0600
 @@ -117,8 +117,8 @@
  #endif
  
@@ -122,7 +42,7 @@ diff -uar Python-2.6.2.orig/Modules/getpath.c Python-2.6.2/Modules/getpath.c
          strncpy(zip_path, PREFIX, MAXPATHLEN);
 -    joinpath(zip_path, "lib/python00.zip");
 +    joinpath(zip_path, "lib64/python00.zip");
-     bufsz = strlen(zip_path);	/* Replace "00" with version */
+     bufsz = strlen(zip_path);   /* Replace "00" with version */
      zip_path[bufsz - 6] = VERSION[0];
      zip_path[bufsz - 5] = VERSION[2];
 @@ -534,7 +534,7 @@
@@ -134,10 +54,29 @@ diff -uar Python-2.6.2.orig/Modules/getpath.c Python-2.6.2/Modules/getpath.c
      }
      /* If we found EXEC_PREFIX do *not* reduce it!  (Yet.) */
  
-diff -uar Python-2.6.2.orig/setup.py Python-2.6.2/setup.py
---- Python-2.6.2.orig/setup.py	2009-03-31 20:20:48.000000000 +0200
-+++ Python-2.6.2/setup.py	2009-04-29 22:05:43.000000000 +0200
-@@ -310,7 +310,7 @@
+--- ./Modules/Setup.dist.orig	2008-11-27 04:15:12.000000000 -0600
++++ ./Modules/Setup.dist	2010-11-27 17:21:23.000000000 -0600
+@@ -414,7 +414,7 @@
+ #DB=/usr/local/BerkeleyDB.4.0
+ #DBLIBVER=4.0
+ #DBINC=$(DB)/include
+-#DBLIB=$(DB)/lib
++#DBLIB=$(DB)/lib64
+ #_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
+ 
+ # Historical Berkeley DB 1.85
+@@ -460,7 +460,7 @@
+ # Andrew Kuchling's zlib module.
+ # This require zlib 1.1.3 (or later).
+ # See http://www.gzip.org/zlib/
+-#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
++#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz
+ 
+ # Interface to the Expat XML parser
+ #
+--- ./setup.py.orig	2010-07-17 07:31:09.000000000 -0500
++++ ./setup.py	2010-11-27 17:21:23.000000000 -0600
+@@ -356,7 +356,7 @@
  
      def detect_modules(self):
          # Ensure that /usr/local is always used
@@ -146,9 +85,9 @@ diff -uar Python-2.6.2.orig/setup.py Python-2.6.2/setup.py
          add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
  
          # Add paths specified in the environment variables LDFLAGS and
-@@ -585,11 +585,11 @@
-             elif self.compiler.find_library_file(lib_dirs, 'curses'):
-                 readline_libs.append('curses')
+@@ -662,11 +662,11 @@
+             elif curses_library:
+                 readline_libs.append(curses_library)
              elif self.compiler.find_library_file(lib_dirs +
 -                                               ['/usr/lib/termcap'],
 +                                               ['/usr/lib64/termcap'],
@@ -160,7 +99,7 @@ diff -uar Python-2.6.2.orig/setup.py Python-2.6.2/setup.py
                                     extra_link_args=readline_extra_link_args,
                                     libraries=readline_libs) )
          else:
-@@ -626,8 +626,8 @@
+@@ -703,8 +703,8 @@
              if krb5_h:
                  ssl_incs += krb5_h
          ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
@@ -171,3 +110,57 @@ diff -uar Python-2.6.2.orig/setup.py Python-2.6.2/setup.py
                                       ] )
  
          if (ssl_incs is not None and
+--- ./Lib/distutils/command/install.py.orig	2008-05-06 17:41:46.000000000 -0500
++++ ./Lib/distutils/command/install.py	2010-11-27 17:21:23.000000000 -0600
+@@ -42,14 +42,14 @@
+ INSTALL_SCHEMES = {
+     'unix_prefix': {
+         'purelib': '$base/lib/python$py_version_short/site-packages',
+-        'platlib': '$platbase/lib/python$py_version_short/site-packages',
++        'platlib': '$platbase/lib64/python$py_version_short/site-packages',
+         'headers': '$base/include/python$py_version_short/$dist_name',
+         'scripts': '$base/bin',
+         'data'   : '$base',
+         },
+     'unix_home': {
+         'purelib': '$base/lib/python',
+-        'platlib': '$base/lib/python',
++        'platlib': '$base/lib64/python',
+         'headers': '$base/include/python/$dist_name',
+         'scripts': '$base/bin',
+         'data'   : '$base',
+--- ./Lib/distutils/sysconfig.py.orig	2010-08-03 16:18:06.000000000 -0500
++++ ./Lib/distutils/sysconfig.py	2010-11-27 17:21:23.000000000 -0600
+@@ -119,8 +119,12 @@
+         prefix = plat_specific and EXEC_PREFIX or PREFIX
+ 
+     if os.name == "posix":
++        if plat_specific or standard_lib:
++            lib = "lib64"
++        else:
++            lib = "lib"
+         libpython = os.path.join(prefix,
+-                                 "lib", "python" + get_python_version())
++                                 lib, "python" + get_python_version())
+         if standard_lib:
+             return libpython
+         else:
+--- ./Lib/site.py.orig	2010-03-21 09:02:32.000000000 -0500
++++ ./Lib/site.py	2010-11-27 17:21:23.000000000 -0600
+@@ -265,12 +265,16 @@
+         if sys.platform in ('os2emx', 'riscos'):
+             sitedirs.append(os.path.join(prefix, "Lib", "site-packages"))
+         elif os.sep == '/':
++            sitedirs.append(os.path.join(prefix, "lib64",
++                                        "python" + sys.version[:3],
++                                        "site-packages"))
+             sitedirs.append(os.path.join(prefix, "lib",
+                                         "python" + sys.version[:3],
+                                         "site-packages"))
+             sitedirs.append(os.path.join(prefix, "lib", "site-python"))
+         else:
+             sitedirs.append(prefix)
++            sitedirs.append(os.path.join(prefix, "lib64", "site-packages"))
+             sitedirs.append(os.path.join(prefix, "lib", "site-packages"))
+ 
+         if sys.platform == "darwin":
diff --git a/source/d/ruby/ruby.SlackBuild b/source/d/ruby/ruby.SlackBuild
index 0ff66210..c9a25654 100755
--- a/source/d/ruby/ruby.SlackBuild
+++ b/source/d/ruby/ruby.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -42,13 +42,21 @@ TMP=${TMP:-/tmp}
 PKG=$TMP/package-ruby
 
 if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  # -O3 works around a compile failure due to a miniruby segfault
+  # when trying to build ruby with gcc-4.4 or newer.  Evidently
+  # -O0 also works, but...
+  # other distributions also use -fno-strict-aliasing which helps stability
+  SLKCFLAGS="-march=i486 -mtune=i686 -O3 -fno-strict-aliasing"
+  OPTFLAGS=-O3
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
+  # Unknown if s390 is needs -O3.  Check to see if it compiles with -O2.
+  SLKCFLAGS="-O3 -fno-strict-aliasing"
+  OPTFLAGS=-O3
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O3 -fPIC -fno-strict-aliasing"
+  OPTFLAGS=-O3
   LIBDIRSUFFIX="64"
 fi
 
@@ -70,6 +78,7 @@ find . \
 # Seems suboptimal to me... 
 
 CFLAGS="$SLKCFLAGS" \
+optflags=$OPTFLAGS \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/extra/slacktrack/OVERVIEW b/source/d/slacktrack/OVERVIEW
index 5e0f5d61..5e0f5d61 100644
--- a/extra/slacktrack/OVERVIEW
+++ b/source/d/slacktrack/OVERVIEW
diff --git a/source/d/slacktrack/slacktrack.SlackBuild b/source/d/slacktrack/slacktrack.SlackBuild
new file mode 100755
index 00000000..50d52ca0
--- /dev/null
+++ b/source/d/slacktrack/slacktrack.SlackBuild
@@ -0,0 +1,19 @@
+#!/bin/sh
+# Set initial variables:
+CWD=`pwd`
+if [ "$TMP" = "" ]; then
+  TMP=/tmp
+fi
+
+export VERSION=2.08
+
+if [ ! -d $TMP ]; then
+  mkdir -p $TMP # location to build the source
+fi
+cd $TMP
+rm -rf slacktrack
+tar xvf $CWD/slacktrack-$VERSION-source.tar.xz
+cd slacktrack || exit 1
+
+# Start the "real" SlackBuild:
+./slacktrack.SlackBuild
diff --git a/source/d/strace/strace.SlackBuild b/source/d/strace/strace.SlackBuild
index 18affdaa..97b08183 100755
--- a/source/d/strace/strace.SlackBuild
+++ b/source/d/strace/strace.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,17 +20,30 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=4.5.18
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+PKGNAM=strace
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 CWD=$(pwd)
@@ -53,7 +66,7 @@ find . \
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
-   --prefix=/usr \
+  --prefix=/usr \
   --mandir=/usr/man \
   --build=$ARCH-slackware-linux
 
@@ -64,12 +77,11 @@ strip $PKG/usr/bin/strace
 
 mkdir -p $PKG/usr/doc/strace-$VERSION
 cp -a \
-  COPYRIGHT CREDITS NEWS PORTING \
-  README README-CVS README-freebsd README-linux README-sunos4 README-svr4 TODO \
+  COPYRIGHT CREDITS NEWS PORTING README* TODO \
   $PKG/usr/doc/strace-$VERSION
 chmod 644 $PKG/usr/doc/strace-$VERSION/*
 
-gzip -9 $PKG/usr/man/man1/strace.1
+gzip -9 $PKG/usr/man/man1/*
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/d/subversion/subversion.SlackBuild b/source/d/subversion/subversion.SlackBuild
index c2b01e83..27f52fd8 100755
--- a/source/d/subversion/subversion.SlackBuild
+++ b/source/d/subversion/subversion.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/source/d/swig/swig.SlackBuild b/source/d/swig/swig.SlackBuild
index 44f3d53f..aa4ea374 100755
--- a/source/d/swig/swig.SlackBuild
+++ b/source/d/swig/swig.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2009  Robby Workman, Northport, Alabama, USA
-# Copyright 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,19 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=1.3.38
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-1}
+PKGNAM=swig
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -35,6 +45,8 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 NUMJOBS=${NUMJOBS:--j6}
diff --git a/extra/source/yasm/slack-desc b/source/d/yasm/slack-desc
index fc28253f..fc28253f 100644
--- a/extra/source/yasm/slack-desc
+++ b/source/d/yasm/slack-desc
diff --git a/source/d/yasm/yasm.SlackBuild b/source/d/yasm/yasm.SlackBuild
new file mode 100755
index 00000000..b178fdb4
--- /dev/null
+++ b/source/d/yasm/yasm.SlackBuild
@@ -0,0 +1,216 @@
+#!/bin/sh
+# $Id: yasm.SlackBuild,v 1.7 2009/05/12 20:24:31 root Exp root $
+# Copyright (c) 2008 Eric Hameleers <alien@slackware.com>
+# Copyright 2010  Patrick 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.
+# -----------------------------------------------------------------------------
+#
+# Slackware SlackBuild script 
+# ===========================
+# By:         Eric Hameleers <alien@slackware.com>
+# For:        yasm
+# Descr:      complete rewrite of the NASM assembler
+# URL:        http://www.tortall.net/projects/yasm/
+# Needs:      
+# Changelog:  
+# 0.7.1-1:    16/Jun/2008 by Eric Hameleers <alien@slackware.com>
+#             * Initial build.
+# 0.7.2-1:    08/dec/2008 by Eric Hameleers <alien@slackware.com>
+#             * Update.
+# 0.8.0-1:    12/may/2009 by Eric Hameleers <alien@slackware.com>
+#             * Update.
+# 1.1.0-1:    2010-08-31 by volkerdi@slackware.com
+#             * Update.
+# 
+# Run 'sh yasm.SlackBuild' to build a Slackware package.
+# The package (.txz) plus descriptive .txt file are created in /tmp .
+# Install using 'installpkg'. 
+#
+# -----------------------------------------------------------------------------
+
+PKGNAM=yasm
+VERSION=${VERSION:-1.1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+DOCS="ABOUT-NLS AUTHORS ChangeLog COPYING GNU_* NEWS README *.txt"
+
+# If you want to disable python bindings, set ENABLE_PYTHON to "NO".
+# Building python support requires Cython, which is not shipped with Slackware.
+ENABLE_PYTHON=${ENABLE_PYTHON:-"'NO"}
+
+# Where do we look for sources?
+SRCDIR=$(cd $(dirname $0); pwd)
+
+# Place to build (TMP) package (PKG) and output (OUTPUT) the program:
+TMP=${TMP:-/tmp/build}
+PKG=$TMP/package-$PKGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+SOURCE="$SRCDIR/${PKGNAM}-${VERSION}.tar.xz"
+SRCURL="http://www.tortall.net/projects/${PKGNAM}/releases/${PKGNAM}-${VERSION}.tar.gz"
+
+##
+## --- with a little luck, you won't have to edit below this point --- ##
+##
+
+# Exit the script on errors:
+set -e
+trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PKGNAM}.log' ERR
+# Catch unitialized variables:
+set -u
+P1=${1:-1}
+
+case "$ARCH" in
+  i486)      SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+  s390)      SLKCFLAGS="-O2"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+  powerpc)   SLKCFLAGS="-O2"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+  x86_64)    SLKCFLAGS="-O2 -fPIC"
+             SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
+             ;;
+  athlon-xp) SLKCFLAGS="-march=athlon-xp -O3 -pipe -fomit-frame-pointer"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+esac
+
+# Create working directories:
+mkdir -p $OUTPUT          # place for the package to be saved
+mkdir -p $TMP/tmp-$PKGNAM # location to build the source
+mkdir -p $PKG             # place for the package to be built
+rm -rf $PKG/*             # always erase old package's contents
+rm -rf $TMP/tmp-$PKGNAM/* # remove the remnants of previous build
+
+# Source file availability:
+if ! [ -f ${SOURCE} ]; then
+  if ! [ "x${SRCURL}" == "x" ]; then
+    # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
+    [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)"
+    echo "Source '$(basename ${SOURCE})' not available yet..."
+    echo "Will download file to $(dirname $SOURCE)"
+    wget -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true
+    if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then
+      echo "Downloading '$(basename ${SOURCE})' failed... aborting the build."
+      mv -f "${SOURCE}" "${SOURCE}".FAIL
+      exit 1
+    fi
+  else
+    echo "File '$(basename ${SOURCE})' not available... aborting the build."
+    exit 1
+  fi
+fi
+
+if [ "$P1" == "--download" ]; then
+  echo "Download complete."
+  exit 0
+fi
+
+# --- PACKAGE BUILDING ---
+
+echo "++"
+echo "|| $PKGNAM-$VERSION"
+echo "++"
+
+cd $TMP/tmp-$PKGNAM
+echo "Extracting the source archive(s) for $PKGNAM..."
+tar xvf ${SOURCE}
+cd ${PKGNAM}-${VERSION}
+chown -R root:root .
+chmod -R u+w,go+r-w,a-s .
+
+if [ "$ENABLE_PYTHON" = "YES" ]; then
+  PYTHONSTUFF="--enable-python --enable-python-bindings"
+else
+  PYTHONSTUFF=""
+fi
+
+echo Building ...
+LDFLAGS="$SLKLDFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS" \
+./configure --prefix=/usr \
+            --libdir=/usr/lib${LIBDIRSUFFIX} \
+            --localstatedir=/var \
+            --sysconfdir=/etc \
+            --mandir=/usr/man \
+            ${PYTHONSTUFF} \
+            --program-prefix= \
+            --program-suffix= \
+            --build=$ARCH-slackware-linux \
+            2>&1 | tee $OUTPUT/configure-${PKGNAM}.log
+make 2>&1 | tee $OUTPUT/make-${PKGNAM}.log
+
+# Install all the needed stuff to the package dir
+# Use installwatch if available, to produce a logfile of the installation
+# process that is more easily readable:
+if $(which installwatch > /dev/null 2>&1); then
+  installwatch -o $OUTPUT/install-${PKGNAM}.log make DESTDIR=$PKG install
+else
+  make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PKGNAM}.log
+fi
+
+# Add documentation:
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PKGNAM-$VERSION || true
+cp -a $SRCDIR/$(basename $0) $PKG/usr/doc/$PKGNAM-$VERSION/$PKGNAM.SlackBuild
+chown -R root:root $PKG/usr/doc/$PKGNAM-$VERSION
+find $PKG/usr/doc -type f -exec chmod 644 {} \;
+
+# Remove empty share directory:
+rmdir $PKG/usr/share || true
+
+# Compress the man page(s):
+if [ -d $PKG/usr/man ]; then
+  find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
+  for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+fi
+
+# 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 package description:
+mkdir -p $PKG/install
+cat $SRCDIR/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg --linkadd y --chown n $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz 2>&1 | tee $OUTPUT/makepkg-${PKGNAM}.log
+cd $OUTPUT
+md5sum ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz > ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz.md5
+cd -
+cat $PKG/install/slack-desc | grep "^${PKGNAM}" > $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
+
diff --git a/source/e/emacs/emacs.SlackBuild b/source/e/emacs/emacs.SlackBuild
index 77b1fb63..8040b006 100755
--- a/source/e/emacs/emacs.SlackBuild
+++ b/source/e/emacs/emacs.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@
 # Modified by Patrick Volkerding <volkerdi@slackware.com>
 
 PKGNAM=emacs
-VERSION=${VERSION:-23.2}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -106,9 +106,6 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-zcat $CWD/emacs.gtk-menu.patch.gz | patch -p1 || exit 1
-zcat $CWD/emacs.libpng14.patch.gz | patch -p1 || exit 1
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -154,9 +151,17 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING* ChangeLog INSTALL README \
+  AUTHORS COPYING* INSTALL README* \
   $PKG/usr/doc/$PKGNAM-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
diff --git a/source/e/emacs/emacs.info b/source/e/emacs/emacs.info
deleted file mode 100644
index 645fd7f0..00000000
--- a/source/e/emacs/emacs.info
+++ /dev/null
@@ -1,8 +0,0 @@
-PRGNAM="emacs"
-VERSION="22.2"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-DOWNLOAD="http://ftp.gnu.org/pub/gnu/emacs/emacs-22.2.tar.gz"
-MD5SUM="d6ee586b8752351334ebf072904c4d51"
-MAINTAINER="Dušan Stefanović"
-EMAIL="stefanovic.dusan@gmail.com"
-APPROVED="rworkman"
diff --git a/source/installer/busybox-dot-config b/source/installer/busybox-dot-config
index 4c77cb6f..cad9b5db 100644
--- a/source/installer/busybox-dot-config
+++ b/source/installer/busybox-dot-config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.15.3
-# Wed Dec 30 20:01:35 2009
+# Busybox version: 1.18.4
+# Mon Apr 11 19:18:17 2011
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -14,6 +14,9 @@ CONFIG_HAVE_DOT_CONFIG=y
 #
 CONFIG_DESKTOP=y
 # CONFIG_EXTRA_COMPAT is not set
+CONFIG_INCLUDE_SUSv2=y
+# CONFIG_USE_PORTABLE_CODE is not set
+CONFIG_PLATFORM_LINUX=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
@@ -21,12 +24,23 @@ CONFIG_SHOW_USAGE=y
 CONFIG_FEATURE_VERBOSE_USAGE=y
 CONFIG_FEATURE_COMPRESS_USAGE=y
 CONFIG_FEATURE_INSTALLER=y
+CONFIG_INSTALL_NO_USR=y
 CONFIG_LOCALE_SUPPORT=y
-# CONFIG_FEATURE_ASSUME_UNICODE is not set
+CONFIG_UNICODE_SUPPORT=y
+# CONFIG_UNICODE_USING_LOCALE is not set
 # CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
+CONFIG_SUBST_WCHAR=63
+CONFIG_LAST_SUPPORTED_WCHAR=767
+# CONFIG_UNICODE_COMBINING_WCHARS is not set
+# CONFIG_UNICODE_WIDE_WCHARS is not set
+# CONFIG_UNICODE_BIDI_SUPPORT is not set
+# CONFIG_UNICODE_NEUTRAL_TABLE is not set
+# CONFIG_UNICODE_PRESERVE_BROKEN is not set
 CONFIG_LONG_OPTS=y
 CONFIG_FEATURE_DEVPTS=y
 # CONFIG_FEATURE_CLEAN_UP is not set
+CONFIG_FEATURE_WTMP=y
+CONFIG_FEATURE_UTMP=y
 CONFIG_FEATURE_PIDFILE=y
 CONFIG_FEATURE_SUID=y
 CONFIG_FEATURE_SUID_CONFIG=y
@@ -59,12 +73,10 @@ CONFIG_EXTRA_CFLAGS=""
 CONFIG_NO_DEBUG_LIB=y
 # CONFIG_DMALLOC is not set
 # CONFIG_EFENCE is not set
-CONFIG_INCLUDE_SUSv2=y
 
 #
-# Installation Options
+# Installation Options ("make install" behavior)
 #
-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
@@ -81,6 +93,7 @@ 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_USE_TERMIOS=y
 CONFIG_FEATURE_EDITING=y
 CONFIG_FEATURE_EDITING_MAX_LEN=1024
 CONFIG_FEATURE_EDITING_VI=y
@@ -104,12 +117,14 @@ CONFIG_IOCTL_HEX2STR_ERROR=y
 #
 # Archival Utilities
 #
+# CONFIG_FEATURE_SEAMLESS_XZ is not set
 # 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_FEATURE_AR_CREATE is not set
 CONFIG_BUNZIP2=y
 CONFIG_BZIP2=y
 CONFIG_CPIO=y
@@ -120,6 +135,7 @@ CONFIG_FEATURE_CPIO_O=y
 # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
 # CONFIG_GUNZIP is not set
 # CONFIG_GZIP is not set
+# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
 # CONFIG_LZOP is not set
 # CONFIG_LZOP_COMPR_HIGH is not set
 # CONFIG_RPM2CPIO is not set
@@ -132,31 +148,48 @@ CONFIG_FEATURE_CPIO_O=y
 # CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
 # CONFIG_FEATURE_TAR_GNU_EXTENSIONS is not set
 # CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
+# CONFIG_FEATURE_TAR_TO_COMMAND is not set
 # CONFIG_FEATURE_TAR_UNAME_GNAME is not set
+# CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set
+# CONFIG_FEATURE_TAR_SELINUX is not set
 # CONFIG_UNCOMPRESS is not set
 # CONFIG_UNLZMA is not set
 # CONFIG_FEATURE_LZMA_FAST is not set
+# CONFIG_LZMA is not set
+# CONFIG_UNXZ is not set
+# CONFIG_XZ is not set
 # CONFIG_UNZIP is not set
 
 #
 # Coreutils
 #
 CONFIG_BASENAME=y
-CONFIG_CAL=y
 CONFIG_CAT=y
+# CONFIG_DATE is not set
+# CONFIG_FEATURE_DATE_ISOFMT is not set
+# CONFIG_FEATURE_DATE_NANO is not set
+# CONFIG_FEATURE_DATE_COMPAT is not set
+CONFIG_TEST=y
+CONFIG_FEATURE_TEST_64=y
+CONFIG_TR=y
+CONFIG_FEATURE_TR_CLASSES=y
+CONFIG_FEATURE_TR_EQUIV=y
+CONFIG_BASE64=y
+CONFIG_CAL=y
 CONFIG_CATV=y
 CONFIG_CHGRP=y
 CONFIG_CHMOD=y
 CONFIG_CHOWN=y
+CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
 CONFIG_CHROOT=y
 CONFIG_CKSUM=y
 # CONFIG_COMM is not set
 # CONFIG_CP is not set
+# CONFIG_FEATURE_CP_LONG_OPTIONS is not set
 # CONFIG_CUT is not set
-# CONFIG_DATE is not set
-# CONFIG_FEATURE_DATE_ISOFMT is not set
 CONFIG_DD=y
 CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y
 CONFIG_FEATURE_DD_IBS_OBS=y
 CONFIG_DF=y
 CONFIG_FEATURE_DF_FANCY=y
@@ -234,12 +267,7 @@ CONFIG_TAIL=y
 CONFIG_FEATURE_FANCY_TAIL=y
 # CONFIG_TEE is not set
 # CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
-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
@@ -271,7 +299,7 @@ CONFIG_FEATURE_AUTOWIDTH=y
 CONFIG_FEATURE_HUMAN_READABLE=y
 
 #
-# Common options for md5sum, sha1sum
+# Common options for md5sum, sha1sum, sha256sum, sha512sum
 #
 CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
 
@@ -279,6 +307,7 @@ CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
 # Console Utilities
 #
 CONFIG_CHVT=y
+CONFIG_FGCONSOLE=y
 CONFIG_CLEAR=y
 # CONFIG_DEALLOCVT is not set
 CONFIG_DUMPKMAP=y
@@ -299,6 +328,12 @@ CONFIG_SETLOGCONS=y
 CONFIG_SHOWKEY=y
 
 #
+# Common options for loadfont and setfont
+#
+CONFIG_FEATURE_LOADFONT_PSF2=y
+CONFIG_FEATURE_LOADFONT_RAW=y
+
+#
 # Debian Utilities
 #
 CONFIG_MKTEMP=y
@@ -314,15 +349,14 @@ CONFIG_WHICH=y
 #
 # Editors
 #
+# CONFIG_PATCH is not set
 CONFIG_AWK=y
 CONFIG_FEATURE_AWK_LIBM=y
 # CONFIG_CMP is not set
 CONFIG_DIFF=y
-CONFIG_FEATURE_DIFF_BINARY=y
+CONFIG_FEATURE_DIFF_LONG_OPTIONS=y
 CONFIG_FEATURE_DIFF_DIR=y
-CONFIG_FEATURE_DIFF_MINIMAL=y
 # CONFIG_ED is not set
-# CONFIG_PATCH is not set
 # CONFIG_SED is not set
 CONFIG_VI=y
 CONFIG_FEATURE_VI_MAX_LEN=1024
@@ -336,6 +370,7 @@ CONFIG_FEATURE_VI_READONLY=y
 CONFIG_FEATURE_VI_SETOPTS=y
 CONFIG_FEATURE_VI_SET=y
 CONFIG_FEATURE_VI_WIN_RESIZE=y
+CONFIG_FEATURE_VI_ASK_TERMINAL=y
 CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
 # CONFIG_FEATURE_ALLOW_EXEC is not set
 
@@ -364,6 +399,7 @@ CONFIG_FEATURE_FIND_PRUNE=y
 CONFIG_FEATURE_FIND_PATH=y
 CONFIG_FEATURE_FIND_REGEX=y
 # CONFIG_FEATURE_FIND_CONTEXT is not set
+CONFIG_FEATURE_FIND_LINKS=y
 # CONFIG_GREP is not set
 # CONFIG_FEATURE_GREP_EGREP_ALIAS is not set
 # CONFIG_FEATURE_GREP_FGREP_ALIAS is not set
@@ -377,6 +413,12 @@ CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
 #
 # Init Utilities
 #
+# CONFIG_BOOTCHARTD is not set
+# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
+# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
+CONFIG_HALT=y
+# CONFIG_FEATURE_CALL_TELINIT is not set
+CONFIG_TELINIT_PATH=""
 CONFIG_INIT=y
 CONFIG_FEATURE_USE_INITTAB=y
 CONFIG_FEATURE_KILL_REMOVED=y
@@ -386,33 +428,31 @@ 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_FEATURE_CALL_TELINIT is not set
-CONFIG_TELINIT_PATH=""
+CONFIG_INIT_TERMINAL_TYPE="linux"
 CONFIG_MESG=y
 
 #
 # Login/Password Management Utilities
 #
+CONFIG_ADD_SHELL=y
+CONFIG_REMOVE_SHELL=y
 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_USE_BB_CRYPT_SHA is not set
-CONFIG_ADDGROUP=y
-CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=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_FEATURE_CHECK_NAMES=y
 CONFIG_FIRST_SYSTEM_ID=100
 CONFIG_LAST_SYSTEM_ID=9999
+CONFIG_ADDGROUP=y
+CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=y
+CONFIG_FEATURE_ADDUSER_TO_GROUP=y
 CONFIG_DELUSER=y
+CONFIG_DELGROUP=y
+CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
 # CONFIG_GETTY is not set
-CONFIG_FEATURE_UTMP=y
-CONFIG_FEATURE_WTMP=y
 # CONFIG_LOGIN is not set
 # CONFIG_PAM is not set
 # CONFIG_LOGIN_SCRIPTS is not set
@@ -434,10 +474,12 @@ CONFIG_FEATURE_SU_CHECKS_SHELLS=y
 # CONFIG_CHATTR is not set
 # CONFIG_FSCK is not set
 # CONFIG_LSATTR is not set
+# CONFIG_TUNE2FS is not set
 
 #
 # Linux Module Utilities
 #
+CONFIG_MODINFO=y
 # 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
@@ -453,6 +495,7 @@ CONFIG_FEATURE_SU_CHECKS_SHELLS=y
 # Options common to multiple modutils
 #
 # CONFIG_FEATURE_2_4_MODULES is not set
+# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
 # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
 # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
 # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
@@ -467,6 +510,8 @@ CONFIG_DEFAULT_DEPMOD_FILE=""
 #
 # Linux System Utilities
 #
+CONFIG_BLOCKDEV=y
+# CONFIG_REV is not set
 # CONFIG_ACPID is not set
 # CONFIG_FEATURE_ACPID_COMPAT is not set
 # CONFIG_BLKID is not set
@@ -484,12 +529,16 @@ CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
 # CONFIG_FEATURE_SGI_LABEL is not set
 # CONFIG_FEATURE_SUN_LABEL is not set
 # CONFIG_FEATURE_OSF_LABEL is not set
+# CONFIG_FEATURE_GPT_LABEL is not set
 # CONFIG_FEATURE_FDISK_ADVANCED is not set
 # CONFIG_FINDFS is not set
+# CONFIG_FLOCK is not set
 # CONFIG_FREERAMDISK is not set
 # CONFIG_FSCK_MINIX is not set
+# CONFIG_MKFS_EXT2 is not set
 # CONFIG_MKFS_MINIX is not set
 # CONFIG_FEATURE_MINIX2 is not set
+# CONFIG_MKFS_REISER is not set
 # CONFIG_MKFS_VFAT is not set
 # CONFIG_GETOPT is not set
 # CONFIG_FEATURE_GETOPT_LONG is not set
@@ -502,6 +551,8 @@ CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
 # CONFIG_IPCRM is not set
 # CONFIG_IPCS is not set
 CONFIG_LOSETUP=y
+# CONFIG_LSPCI is not set
+# CONFIG_LSUSB is not set
 # CONFIG_MDEV is not set
 # CONFIG_FEATURE_MDEV_CONF is not set
 # CONFIG_FEATURE_MDEV_RENAME is not set
@@ -511,24 +562,6 @@ CONFIG_LOSETUP=y
 # CONFIG_MKSWAP is not set
 # CONFIG_FEATURE_MKSWAP_UUID is not set
 CONFIG_MORE=y
-CONFIG_FEATURE_USE_TERMIOS=y
-# CONFIG_VOLUMEID is not set
-# CONFIG_FEATURE_VOLUMEID_EXT is not set
-# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
-# CONFIG_FEATURE_VOLUMEID_FAT is not set
-# CONFIG_FEATURE_VOLUMEID_HFS is not set
-# CONFIG_FEATURE_VOLUMEID_JFS is not set
-# CONFIG_FEATURE_VOLUMEID_XFS is not set
-# CONFIG_FEATURE_VOLUMEID_NTFS is not set
-# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
-# CONFIG_FEATURE_VOLUMEID_UDF is not set
-# CONFIG_FEATURE_VOLUMEID_LUKS is not set
-# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
-# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
-# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
-# CONFIG_FEATURE_VOLUMEID_SYSV is not set
-# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
-# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
 # CONFIG_MOUNT is not set
 # CONFIG_FEATURE_MOUNT_FAKE is not set
 # CONFIG_FEATURE_MOUNT_VERBOSE is not set
@@ -552,13 +585,38 @@ CONFIG_SWITCH_ROOT=y
 # CONFIG_UMOUNT is not set
 # CONFIG_FEATURE_UMOUNT_ALL is not set
 # CONFIG_FEATURE_MOUNT_LOOP is not set
+# CONFIG_FEATURE_MOUNT_LOOP_CREATE is not set
 # CONFIG_FEATURE_MTAB_SUPPORT is not set
+# CONFIG_VOLUMEID is not set
+# CONFIG_FEATURE_VOLUMEID_EXT is not set
+# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
+# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
+# CONFIG_FEATURE_VOLUMEID_FAT is not set
+# CONFIG_FEATURE_VOLUMEID_HFS is not set
+# CONFIG_FEATURE_VOLUMEID_JFS is not set
+# CONFIG_FEATURE_VOLUMEID_XFS is not set
+# CONFIG_FEATURE_VOLUMEID_NTFS is not set
+# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
+# CONFIG_FEATURE_VOLUMEID_UDF is not set
+# CONFIG_FEATURE_VOLUMEID_LUKS is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
+# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
+# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
+# CONFIG_FEATURE_VOLUMEID_SYSV is not set
+# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
 
 #
 # Miscellaneous Utilities
 #
+# CONFIG_CONSPY is not set
+# CONFIG_NANDWRITE is not set
+# CONFIG_NANDDUMP is not set
+# CONFIG_UBIATTACH is not set
+# CONFIG_UBIDETACH is not set
 # CONFIG_ADJTIMEX is not set
 CONFIG_BBCONFIG=y
+CONFIG_FEATURE_COMPRESS_BBCONFIG=y
 # CONFIG_BEEP is not set
 CONFIG_FEATURE_BEEP_FREQ=0
 CONFIG_FEATURE_BEEP_LENGTH_MS=0
@@ -587,6 +645,7 @@ CONFIG_FEATURE_CROND_DIR=""
 CONFIG_EJECT=y
 CONFIG_FEATURE_EJECT_SCSI=y
 # CONFIG_FBSPLASH is not set
+# CONFIG_FLASHCP is not set
 # CONFIG_FLASH_LOCK is not set
 # CONFIG_FLASH_UNLOCK is not set
 # CONFIG_FLASH_ERASEALL is not set
@@ -620,6 +679,7 @@ CONFIG_FEATURE_LESS_REGEXP=y
 CONFIG_MT=y
 CONFIG_RAIDAUTORUN=y
 # CONFIG_READAHEAD is not set
+# CONFIG_RFKILL is not set
 CONFIG_RUNLEVEL=y
 # CONFIG_RX is not set
 # CONFIG_SETSID is not set
@@ -630,11 +690,17 @@ CONFIG_TIME=y
 CONFIG_TIMEOUT=y
 CONFIG_TTYSIZE=y
 # CONFIG_VOLNAME is not set
+CONFIG_WALL=y
 # CONFIG_WATCHDOG is not set
 
 #
 # Networking Utilities
 #
+CONFIG_NBDCLIENT=y
+CONFIG_NC=y
+CONFIG_NC_SERVER=y
+CONFIG_NC_EXTRA=y
+# CONFIG_NC_110_COMPAT is not set
 CONFIG_FEATURE_IPV6=y
 # CONFIG_FEATURE_UNIX_LOCAL is not set
 CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
@@ -649,22 +715,24 @@ CONFIG_ETHER_WAKE=y
 # CONFIG_FAKEIDENTD is not set
 # CONFIG_FTPD is not set
 # CONFIG_FEATURE_FTP_WRITE is not set
+# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set
 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_SETUID is not set
-# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
-# CONFIG_FEATURE_HTTPD_AUTH_MD5 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_HTTPD=y
+CONFIG_FEATURE_HTTPD_RANGES=y
+CONFIG_FEATURE_HTTPD_USE_SENDFILE=y
+CONFIG_FEATURE_HTTPD_SETUID=y
+CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
+CONFIG_FEATURE_HTTPD_AUTH_MD5=y
+CONFIG_FEATURE_HTTPD_CGI=y
+CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y
+CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y
+CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
+CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
+CONFIG_FEATURE_HTTPD_PROXY=y
+CONFIG_FEATURE_HTTPD_GZIP=y
 CONFIG_IFCONFIG=y
 CONFIG_FEATURE_IFCONFIG_STATUS=y
 CONFIG_FEATURE_IFCONFIG_SLIP=y
@@ -707,40 +775,49 @@ 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_NTPD is not set
+# CONFIG_FEATURE_NTPD_SERVER is not set
 CONFIG_PING=y
 CONFIG_PING6=y
 CONFIG_FEATURE_FANCY_PING=y
 CONFIG_PSCAN=y
 CONFIG_ROUTE=y
 CONFIG_SLATTACH=y
+CONFIG_TCPSVD=y
 CONFIG_TELNET=y
 CONFIG_FEATURE_TELNET_TTYPE=y
 CONFIG_FEATURE_TELNET_AUTOLOGIN=y
 # CONFIG_TELNETD is not set
 # CONFIG_FEATURE_TELNETD_STANDALONE is not set
+# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
 CONFIG_TFTP=y
 # CONFIG_TFTPD is not set
+
+#
+# Common options for tftp/tftpd
+#
 CONFIG_FEATURE_TFTP_GET=y
 CONFIG_FEATURE_TFTP_PUT=y
 CONFIG_FEATURE_TFTP_BLOCKSIZE=y
+CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
 # CONFIG_TFTP_DEBUG is not set
 CONFIG_TRACEROUTE=y
+CONFIG_TRACEROUTE6=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_TUNCTL is not set
+# CONFIG_FEATURE_TUNCTL_UG is not set
+# CONFIG_UDHCPD is not set
+# CONFIG_DHCPRELAY is not set
+# CONFIG_DUMPLEASES is not set
 # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
 CONFIG_DHCPD_LEASES_FILE=""
-# CONFIG_APP_UDHCPC is not set
+# CONFIG_UDHCPC is not set
 # CONFIG_FEATURE_UDHCPC_ARPING is not set
 # CONFIG_FEATURE_UDHCP_PORT is not set
 CONFIG_UDHCP_DEBUG=0
@@ -748,16 +825,14 @@ CONFIG_UDHCP_DEBUG=0
 CONFIG_UDHCPC_DEFAULT_SCRIPT=""
 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
+CONFIG_UDPSVD=y
 CONFIG_VCONFIG=y
 CONFIG_WGET=y
 CONFIG_FEATURE_WGET_STATUSBAR=y
 CONFIG_FEATURE_WGET_AUTHENTICATION=y
 CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+CONFIG_FEATURE_WGET_TIMEOUT=y
 CONFIG_ZCIP=y
-CONFIG_TCPSVD=y
-# CONFIG_TUNCTL is not set
-# CONFIG_FEATURE_TUNCTL_UG is not set
-CONFIG_UDPSVD=y
 
 #
 # Print Utilities
@@ -780,6 +855,11 @@ CONFIG_FEATURE_MIME_CHARSET=""
 #
 # Process Utilities
 #
+CONFIG_IOSTAT=y
+CONFIG_MPSTAT=y
+CONFIG_PMAP=y
+CONFIG_POWERTOP=y
+# CONFIG_SMEMCAP is not set
 CONFIG_FREE=y
 CONFIG_FUSER=y
 CONFIG_KILL=y
@@ -805,6 +885,7 @@ CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
 CONFIG_FEATURE_TOP_DECIMALS=y
 # CONFIG_FEATURE_TOP_SMP_PROCESS is not set
 CONFIG_FEATURE_TOPMEM=y
+CONFIG_FEATURE_SHOW_THREADS=y
 CONFIG_UPTIME=y
 CONFIG_WATCH=y
 
@@ -841,14 +922,9 @@ CONFIG_SV_DEFAULT_SERVICE_DIR=""
 #
 # Shells
 #
-CONFIG_FEATURE_SH_IS_ASH=y
-# CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_NONE is not set
 CONFIG_ASH=y
 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_GETOPTS=y
 CONFIG_ASH_BUILTIN_ECHO=y
@@ -859,10 +935,13 @@ CONFIG_ASH_MAIL=y
 CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
 CONFIG_ASH_RANDOM_SUPPORT=y
 CONFIG_ASH_EXPAND_PRMT=y
+CONFIG_CTTYHACK=y
 # CONFIG_HUSH is not set
 # CONFIG_HUSH_BASH_COMPAT is not set
+# CONFIG_HUSH_BRACE_EXPANSION is not set
 # CONFIG_HUSH_HELP is not set
 # CONFIG_HUSH_INTERACTIVE is not set
+# CONFIG_HUSH_SAVEHISTORY is not set
 # CONFIG_HUSH_JOB is not set
 # CONFIG_HUSH_TICK is not set
 # CONFIG_HUSH_IF is not set
@@ -870,15 +949,21 @@ CONFIG_ASH_EXPAND_PRMT=y
 # CONFIG_HUSH_CASE is not set
 # CONFIG_HUSH_FUNCTIONS is not set
 # CONFIG_HUSH_LOCAL is not set
+# CONFIG_HUSH_RANDOM_SUPPORT is not set
 # CONFIG_HUSH_EXPORT_N is not set
-# CONFIG_LASH is not set
+# CONFIG_HUSH_MODE_X is not set
 # CONFIG_MSH is not set
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+# CONFIG_FEATURE_BASH_IS_ASH is not set
+# CONFIG_FEATURE_BASH_IS_HUSH is not set
+CONFIG_FEATURE_BASH_IS_NONE=y
 CONFIG_SH_MATH_SUPPORT=y
 # CONFIG_SH_MATH_SUPPORT_64 is not set
 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
@@ -887,9 +972,11 @@ CONFIG_SYSLOGD=y
 CONFIG_FEATURE_ROTATE_LOGFILE=y
 CONFIG_FEATURE_REMOTE_LOG=y
 # CONFIG_FEATURE_SYSLOGD_DUP is not set
+CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
 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_FEATURE_KLOGD_KLOGCTL=y
 # CONFIG_LOGGER is not set
diff --git a/source/installer/busybox.SlackBuild b/source/installer/busybox.SlackBuild
index a80631e3..4283c4d4 100755
--- a/source/installer/busybox.SlackBuild
+++ b/source/installer/busybox.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2007, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2007, 2009, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,10 +21,18 @@
 
 
 PKGNAM=busybox
-VERSION=${VERSION:-1.15.3}
-ARCH=${ARCH:-x86_64}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 CWD=$(pwd)
 if [ "$TMP" = "" ]; then
@@ -33,7 +41,7 @@ fi
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xjvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
 cd ${PKGNAM}-$VERSION || exit 1
 
 zcat $CWD/busybox.2.6.32.2.diff.gz | patch -p1 || exit 1
diff --git a/source/k/README.TXT b/source/k/README.TXT
index 1f45bfb2..8432d585 100644
--- a/source/k/README.TXT
+++ b/source/k/README.TXT
@@ -13,7 +13,7 @@ For a 2.6.x kernel (much easier):
    Install a suitable .config, or use make menuconfig, etc.
 
    An example would be to use one of the config files here:
-   # cat config-generic-2.6.33.4 > /usr/src/linux-2.6.33.4/.config
+   # cat config-generic-2.6.37.6 > /usr/src/linux-2.6.37.6/.config
 
    Then run the build programs:
 
diff --git a/source/k/README_SPEAKUP_PATCH.TXT b/source/k/README_SPEAKUP_PATCH.TXT
index 8fd15596..505f5852 100644
--- a/source/k/README_SPEAKUP_PATCH.TXT
+++ b/source/k/README_SPEAKUP_PATCH.TXT
@@ -1,28 +1,34 @@
 
+Now that Speakup is included in the mainline kernel it has been built
+into the huge kernel and added as modules to the generic kernel, so there
+is no longer a need to use a special kernel for Speakup.
+
 This is an archive of the speakup project's GIT HEAD snapped on the given
 day, and was used to build the speakup.s kernel.  Grabbing Speakup's GIT
 repo (if you want the very latest) is done like this, by the way:
 
-git-clone http://www.linux-speakup.org/speakup.git
+git clone http://www.linux-speakup.org/speakup.git
+
+Then use "./makedist" to make the speakup-3.1.6.tar.bz2 tarball.
 
 To build the same kernel as Slackware included as speakup.s, you'll
 need to do this:
 
 Untar the speakup archive, and cd into the speakup directory:
 
-tar xf speakup-2009-12-30.tar.xz
-cd speakup-2009-12-30
+tar xf speakup-3.1.6.tar.bz2
+cd speakup-3.1.6
 
 Patch whatever kernel you happen to want to compile:
-./install /usr/src/linux-2.6.33.4
+./install /usr/src/linux-2.6.35.11
 
 Change to the kernel directory:
-cd /usr/src/linux-2.6.33.4
+cd /usr/src/linux-2.6.35.11
 
 If you want to start with the defaults one of Slackware's kernels, you can do
 that like this:
 
-cat /boot/vmlinuz-huge-2.6.33.4 > .config
+cat /boot/vmlinuz-huge-2.6.35.11 > .config
 
 Or, better yet, if you have access to the Slackware tree use the
 Speakup .config that was used:
@@ -40,7 +46,7 @@ After that, it's build and install:
 make
 make modules_install
 make bzImage
-cat arch/x86/boot/bzImage > /boot/vmlinuz-huge-2.6.33.4-speakup
+cat arch/x86/boot/bzImage > /boot/vmlinuz-huge-2.6.35.11-speakup
 
 I put the -speakup on the end of the kernel name so that I can remember
 which kernel I've patched, but that part is entirely optional.
diff --git a/source/k/config-generic-2.6.33.4 b/source/k/config-generic-2.6.33.4
deleted file mode 100644
index 8877fca6..00000000
--- a/source/k/config-generic-2.6.33.4
+++ /dev/null
@@ -1,4699 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.33.4
-# Wed May 12 22:00:50 2010
-#
-CONFIG_64BIT=y
-# CONFIG_X86_32 is not set
-CONFIG_X86_64=y
-CONFIG_X86=y
-CONFIG_OUTPUT_FORMAT="elf64-x86-64"
-CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
-CONFIG_GENERIC_TIME=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_MMU=y
-CONFIG_ZONE_DMA=y
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_IOMAP=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_ARCH_HAS_CPU_RELAX=y
-CONFIG_ARCH_HAS_DEFAULT_IDLE=y
-CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
-CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ZONE_DMA32=y
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-CONFIG_AUDIT_ARCH=y
-CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_USE_GENERIC_SMP_HELPERS=y
-CONFIG_X86_64_SMP=y
-CONFIG_X86_HT=y
-CONFIG_X86_TRAMPOLINE=y
-# CONFIG_KTIME_SCALAR is not set
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_CONSTRUCTORS=y
-
-#
-# General setup
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_LOCK_KERNEL=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_BZIP2=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_LZO=y
-# CONFIG_KERNEL_GZIP is not set
-# CONFIG_KERNEL_BZIP2 is not set
-CONFIG_KERNEL_LZMA=y
-# CONFIG_KERNEL_LZO is not set
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_AUDIT=y
-CONFIG_AUDITSYSCALL=y
-CONFIG_AUDIT_TREE=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU=y
-# CONFIG_TREE_PREEMPT_RCU is not set
-# CONFIG_TINY_RCU is not set
-# CONFIG_RCU_TRACE is not set
-CONFIG_RCU_FANOUT=32
-# CONFIG_RCU_FANOUT_EXACT is not set
-# CONFIG_TREE_RCU_TRACE is not set
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=15
-CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-# CONFIG_GROUP_SCHED is not set
-# CONFIG_CGROUPS is not set
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
-CONFIG_RELAY=y
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-# CONFIG_USER_NS is not set
-# CONFIG_PID_NS is not set
-CONFIG_NET_NS=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_RD_GZIP=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_LZO=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
-# CONFIG_EMBEDDED is not set
-CONFIG_UID16=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_PCSPKR_PLATFORM=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_HAVE_PERF_EVENTS=y
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_PERF_EVENTS=y
-CONFIG_EVENT_PROFILE=y
-# CONFIG_PERF_COUNTERS is not set
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_PCI_QUIRKS=y
-CONFIG_SLUB_DEBUG=y
-CONFIG_COMPAT_BRK=y
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-# CONFIG_SLOB is not set
-CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y
-CONFIG_OPROFILE=m
-# CONFIG_OPROFILE_IBS is not set
-# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
-CONFIG_HAVE_OPROFILE=y
-# CONFIG_KPROBES is not set
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_USER_RETURN_NOTIFIER=y
-CONFIG_HAVE_IOREMAP_PROT=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_ATTRS=y
-CONFIG_HAVE_DMA_API_DEBUG=y
-CONFIG_HAVE_HW_BREAKPOINT=y
-CONFIG_HAVE_USER_RETURN_NOTIFIER=y
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_SLOW_WORK=y
-# CONFIG_SLOW_WORK_DEBUG is not set
-# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
-CONFIG_SLABINFO=y
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-CONFIG_MODULE_FORCE_LOAD=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_STOP_MACHINE=y
-CONFIG_BLOCK=y
-CONFIG_BLK_DEV_BSG=y
-# CONFIG_BLK_DEV_INTEGRITY is not set
-CONFIG_BLOCK_COMPAT=y
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_PREEMPT_NOTIFIERS=y
-# CONFIG_INLINE_SPIN_TRYLOCK is not set
-# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK is not set
-# CONFIG_INLINE_SPIN_LOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-CONFIG_INLINE_SPIN_UNLOCK=y
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_READ_TRYLOCK is not set
-# CONFIG_INLINE_READ_LOCK is not set
-# CONFIG_INLINE_READ_LOCK_BH is not set
-# CONFIG_INLINE_READ_LOCK_IRQ is not set
-# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-CONFIG_INLINE_READ_UNLOCK=y
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_WRITE_TRYLOCK is not set
-# CONFIG_INLINE_WRITE_LOCK is not set
-# CONFIG_INLINE_WRITE_LOCK_BH is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-CONFIG_INLINE_WRITE_UNLOCK=y
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_FREEZER=y
-
-#
-# Processor type and features
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_SMP=y
-# CONFIG_SPARSE_IRQ is not set
-CONFIG_X86_MPPARSE=y
-# CONFIG_X86_EXTENDED_PLATFORM is not set
-CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-# CONFIG_PARAVIRT_GUEST is not set
-CONFIG_MEMTEST=y
-# CONFIG_M386 is not set
-# CONFIG_M486 is not set
-# CONFIG_M586 is not set
-# CONFIG_M586TSC is not set
-# CONFIG_M586MMX is not set
-# CONFIG_M686 is not set
-# CONFIG_MPENTIUMII is not set
-# CONFIG_MPENTIUMIII is not set
-# CONFIG_MPENTIUMM is not set
-# CONFIG_MPENTIUM4 is not set
-# CONFIG_MK6 is not set
-# CONFIG_MK7 is not set
-# CONFIG_MK8 is not set
-# CONFIG_MCRUSOE is not set
-# CONFIG_MEFFICEON is not set
-# CONFIG_MWINCHIPC6 is not set
-# CONFIG_MWINCHIP3D is not set
-# CONFIG_MGEODEGX1 is not set
-# CONFIG_MGEODE_LX is not set
-# CONFIG_MCYRIXIII is not set
-# CONFIG_MVIAC3_2 is not set
-# CONFIG_MVIAC7 is not set
-# CONFIG_MPSC is not set
-# CONFIG_MCORE2 is not set
-# CONFIG_MATOM is not set
-CONFIG_GENERIC_CPU=y
-CONFIG_X86_CPU=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=6
-CONFIG_X86_CMPXCHG=y
-CONFIG_X86_L1_CACHE_SHIFT=6
-CONFIG_X86_XADD=y
-CONFIG_X86_WP_WORKS_OK=y
-CONFIG_X86_TSC=y
-CONFIG_X86_CMPXCHG64=y
-CONFIG_X86_CMOV=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=64
-CONFIG_X86_DEBUGCTLMSR=y
-CONFIG_CPU_SUP_INTEL=y
-CONFIG_CPU_SUP_AMD=y
-CONFIG_CPU_SUP_CENTAUR=y
-# CONFIG_X86_DS is not set
-CONFIG_HPET_TIMER=y
-CONFIG_HPET_EMULATE_RTC=y
-CONFIG_DMI=y
-CONFIG_GART_IOMMU=y
-# CONFIG_CALGARY_IOMMU is not set
-# CONFIG_AMD_IOMMU is not set
-CONFIG_SWIOTLB=y
-CONFIG_IOMMU_HELPER=y
-# CONFIG_IOMMU_API is not set
-# CONFIG_MAXSMP is not set
-CONFIG_NR_CPUS=32
-CONFIG_SCHED_SMT=y
-CONFIG_SCHED_MC=y
-# CONFIG_PREEMPT_NONE is not set
-CONFIG_PREEMPT_VOLUNTARY=y
-# CONFIG_PREEMPT is not set
-CONFIG_X86_LOCAL_APIC=y
-CONFIG_X86_IO_APIC=y
-CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_X86_MCE=y
-CONFIG_X86_MCE_INTEL=y
-CONFIG_X86_MCE_AMD=y
-CONFIG_X86_MCE_THRESHOLD=y
-CONFIG_X86_MCE_INJECT=m
-CONFIG_X86_THERMAL_VECTOR=y
-CONFIG_I8K=m
-CONFIG_MICROCODE=m
-CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_AMD=y
-CONFIG_MICROCODE_OLD_INTERFACE=y
-CONFIG_X86_MSR=m
-CONFIG_X86_CPUID=m
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-CONFIG_DIRECT_GBPAGES=y
-# CONFIG_NUMA is not set
-CONFIG_ARCH_PROC_KCORE_TEXT=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_MEMORY_PROBE=y
-CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
-CONFIG_SELECT_MEMORY_MODEL=y
-# CONFIG_FLATMEM_MANUAL is not set
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_SPARSEMEM=y
-CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_SPARSEMEM_EXTREME=y
-CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
-CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_MEMORY_HOTPLUG=y
-CONFIG_MEMORY_HOTPLUG_SPARSE=y
-CONFIG_MEMORY_HOTREMOVE=y
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_MIGRATION=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_BOUNCE=y
-CONFIG_VIRT_TO_BUS=y
-CONFIG_MMU_NOTIFIER=y
-# CONFIG_KSM is not set
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
-# CONFIG_MEMORY_FAILURE is not set
-# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
-CONFIG_X86_RESERVE_LOW_64K=y
-CONFIG_MTRR=y
-CONFIG_MTRR_SANITIZER=y
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
-CONFIG_X86_PAT=y
-CONFIG_ARCH_USES_PG_UNCACHED=y
-CONFIG_EFI=y
-CONFIG_SECCOMP=y
-CONFIG_CC_STACKPROTECTOR=y
-# CONFIG_HZ_100 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_300 is not set
-CONFIG_HZ_1000=y
-CONFIG_HZ=1000
-CONFIG_SCHED_HRTICK=y
-# CONFIG_KEXEC is not set
-# CONFIG_CRASH_DUMP is not set
-CONFIG_PHYSICAL_START=0x1000000
-# CONFIG_RELOCATABLE is not set
-CONFIG_PHYSICAL_ALIGN=0x1000000
-CONFIG_HOTPLUG_CPU=y
-CONFIG_COMPAT_VDSO=y
-# CONFIG_CMDLINE_BOOL is not set
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-
-#
-# Power management and ACPI options
-#
-CONFIG_ARCH_HIBERNATION_HEADER=y
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_PM_SLEEP=y
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-CONFIG_HIBERNATION_NVS=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION="\"\""
-CONFIG_PM_RUNTIME=y
-CONFIG_ACPI=y
-CONFIG_ACPI_SLEEP=y
-CONFIG_ACPI_PROCFS=y
-CONFIG_ACPI_PROCFS_POWER=y
-CONFIG_ACPI_POWER_METER=m
-CONFIG_ACPI_SYSFS_POWER=y
-CONFIG_ACPI_PROC_EVENT=y
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_FAN=m
-CONFIG_ACPI_DOCK=y
-CONFIG_ACPI_PROCESSOR=m
-CONFIG_ACPI_HOTPLUG_CPU=y
-CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
-CONFIG_ACPI_THERMAL=m
-# CONFIG_ACPI_CUSTOM_DSDT is not set
-CONFIG_ACPI_BLACKLIST_YEAR=0
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_PCI_SLOT=m
-CONFIG_X86_PM_TIMER=y
-CONFIG_ACPI_CONTAINER=m
-CONFIG_ACPI_HOTPLUG_MEMORY=m
-CONFIG_ACPI_SBS=m
-CONFIG_SFI=y
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=m
-# CONFIG_CPU_FREQ_DEBUG is not set
-CONFIG_CPU_FREQ_STAT=m
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=m
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-
-#
-# CPUFreq processor drivers
-#
-CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_SPEEDSTEP_CENTRINO=m
-CONFIG_X86_P4_CLOCKMOD=m
-
-#
-# shared options
-#
-CONFIG_X86_SPEEDSTEP_LIB=m
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-
-#
-# Memory power savings
-#
-CONFIG_I7300_IDLE_IOAT_CHANNEL=y
-CONFIG_I7300_IDLE=m
-
-#
-# Bus options (PCI etc.)
-#
-CONFIG_PCI=y
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_MMCONFIG=y
-CONFIG_PCI_DOMAINS=y
-# CONFIG_DMAR is not set
-# CONFIG_INTR_REMAP is not set
-CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=m
-CONFIG_PCIEAER=y
-# CONFIG_PCIE_ECRC is not set
-CONFIG_PCIEAER_INJECT=m
-# CONFIG_PCIEASPM is not set
-CONFIG_ARCH_SUPPORTS_MSI=y
-CONFIG_PCI_MSI=y
-CONFIG_PCI_LEGACY=y
-# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_STUB=m
-CONFIG_HT_IRQ=y
-# CONFIG_PCI_IOV is not set
-CONFIG_PCI_IOAPIC=y
-CONFIG_ISA_DMA_API=y
-CONFIG_K8_NB=y
-CONFIG_PCCARD=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_PCMCIA_IOCTL=y
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_PCCARD_NONSTATIC=m
-CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_FAKE=m
-CONFIG_HOTPLUG_PCI_ACPI=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-# CONFIG_HOTPLUG_PCI_CPCI is not set
-CONFIG_HOTPLUG_PCI_SHPC=m
-
-#
-# Executable file formats / Emulations
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_COMPAT_BINFMT_ELF=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-# CONFIG_HAVE_AOUT is not set
-CONFIG_BINFMT_MISC=m
-CONFIG_IA32_EMULATION=y
-# CONFIG_IA32_AOUT is not set
-CONFIG_COMPAT=y
-CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
-CONFIG_SYSVIPC_COMPAT=y
-CONFIG_NET=y
-CONFIG_COMPAT_NETLINK_MESSAGES=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-CONFIG_XFRM_USER=y
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-CONFIG_XFRM_IPCOMP=m
-CONFIG_NET_KEY=m
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_ASK_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
-CONFIG_IP_FIB_HASH=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_LRO=y
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
-CONFIG_IPV6=m
-CONFIG_IPV6_PRIVACY=y
-# CONFIG_IPV6_ROUTER_PREF is not set
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_IPV6_SIT=m
-# CONFIG_IPV6_SIT_6RD is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=m
-# CONFIG_IPV6_MULTIPLE_TABLES is not set
-# CONFIG_IPV6_MROUTE is not set
-# CONFIG_NETLABEL is not set
-# CONFIG_NETWORK_SECMARK is not set
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=y
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_CT_ACCT=y
-CONFIG_NF_CONNTRACK_MARK=y
-# CONFIG_NF_CONNTRACK_EVENTS is not set
-CONFIG_NF_CT_PROTO_DCCP=m
-CONFIG_NF_CT_PROTO_GRE=m
-CONFIG_NF_CT_PROTO_SCTP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NETFILTER_TPROXY=m
-CONFIG_NETFILTER_XTABLES=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT=y
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_IP_VS=m
-# CONFIG_IP_VS_IPV6 is not set
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_AH_ESP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-CONFIG_IP_NF_QUEUE=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_LOG=m
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PROTO_DCCP=m
-CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_SECURITY=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-
-#
-# IPv6: Netfilter Configuration
-#
-CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_IP6_NF_QUEUE=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_TARGET_LOG=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_SECURITY=m
-
-#
-# DECnet: Netfilter Configuration
-#
-# CONFIG_DECNET_NF_GRABULATOR is not set
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_ULOG=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
-
-#
-# DCCP CCIDs Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-# CONFIG_IP_DCCP_CCID3 is not set
-
-#
-# DCCP Kernel Hacking
-#
-# CONFIG_IP_DCCP_DEBUG is not set
-CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_MSG is not set
-# CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_HMAC_NONE is not set
-# CONFIG_SCTP_HMAC_SHA1 is not set
-CONFIG_SCTP_HMAC_MD5=y
-CONFIG_RDS=m
-CONFIG_RDS_RDMA=m
-CONFIG_RDS_TCP=m
-# CONFIG_RDS_DEBUG is not set
-CONFIG_TIPC=m
-# CONFIG_TIPC_ADVANCED is not set
-# CONFIG_TIPC_DEBUG is not set
-CONFIG_ATM=m
-CONFIG_ATM_CLIP=m
-# CONFIG_ATM_CLIP_NO_ICMP is not set
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
-CONFIG_ATM_BR2684=m
-# CONFIG_ATM_BR2684_IPFILTER is not set
-CONFIG_STP=m
-CONFIG_GARP=m
-CONFIG_BRIDGE=m
-# CONFIG_NET_DSA is not set
-CONFIG_VLAN_8021Q=m
-CONFIG_VLAN_8021Q_GVRP=y
-CONFIG_DECNET=m
-# CONFIG_DECNET_ROUTER is not set
-CONFIG_LLC=m
-CONFIG_LLC2=m
-CONFIG_IPX=m
-# CONFIG_IPX_INTERN is not set
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=m
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
-CONFIG_WAN_ROUTER=m
-CONFIG_PHONET=m
-CONFIG_IEEE802154=m
-CONFIG_NET_SCHED=y
-
-#
-# Queueing/Scheduling
-#
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_INGRESS=m
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_ROUTE=y
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_EMATCH=y
-CONFIG_NET_EMATCH_STACK=32
-CONFIG_NET_EMATCH_CMP=m
-CONFIG_NET_EMATCH_NBYTE=m
-CONFIG_NET_EMATCH_U32=m
-CONFIG_NET_EMATCH_META=m
-CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=y
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-# CONFIG_NET_CLS_IND is not set
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_DCB is not set
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_DROP_MONITOR is not set
-CONFIG_HAMRADIO=y
-
-#
-# Packet Radio protocols
-#
-CONFIG_AX25=m
-# CONFIG_AX25_DAMA_SLAVE is not set
-CONFIG_NETROM=m
-CONFIG_ROSE=m
-
-#
-# AX.25 network device drivers
-#
-CONFIG_MKISS=m
-CONFIG_6PACK=m
-CONFIG_BPQETHER=m
-CONFIG_BAYCOM_SER_FDX=m
-CONFIG_BAYCOM_SER_HDX=m
-CONFIG_BAYCOM_PAR=m
-CONFIG_YAM=m
-CONFIG_CAN=m
-CONFIG_CAN_RAW=m
-CONFIG_CAN_BCM=m
-
-#
-# CAN Device Drivers
-#
-CONFIG_CAN_VCAN=m
-CONFIG_CAN_DEV=m
-# CONFIG_CAN_CALC_BITTIMING is not set
-CONFIG_CAN_SJA1000=m
-CONFIG_CAN_SJA1000_PLATFORM=m
-CONFIG_CAN_EMS_PCI=m
-CONFIG_CAN_KVASER_PCI=m
-
-#
-# CAN USB interfaces
-#
-CONFIG_CAN_EMS_USB=m
-# CONFIG_CAN_DEBUG_DEVICES is not set
-CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
-CONFIG_IRCOMM=m
-# CONFIG_IRDA_ULTRA is not set
-
-#
-# IrDA options
-#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=m
-
-#
-# Dongle support
-#
-CONFIG_DONGLE=y
-CONFIG_ESI_DONGLE=m
-CONFIG_ACTISYS_DONGLE=m
-CONFIG_TEKRAM_DONGLE=m
-CONFIG_TOIM3232_DONGLE=m
-CONFIG_LITELINK_DONGLE=m
-CONFIG_MA600_DONGLE=m
-CONFIG_GIRBIL_DONGLE=m
-CONFIG_MCP2120_DONGLE=m
-CONFIG_OLD_BELKIN_DONGLE=m
-CONFIG_ACT200L_DONGLE=m
-CONFIG_KINGSUN_DONGLE=m
-CONFIG_KSDAZZLE_DONGLE=m
-CONFIG_KS959_DONGLE=m
-
-#
-# FIR device drivers
-#
-CONFIG_USB_IRDA=m
-CONFIG_SIGMATEL_FIR=m
-CONFIG_NSC_FIR=m
-CONFIG_WINBOND_FIR=m
-CONFIG_SMC_IRCC_FIR=m
-CONFIG_ALI_FIR=m
-CONFIG_VLSI_FIR=m
-CONFIG_VIA_FIR=m
-CONFIG_MCS_FIR=m
-CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_CMTP=m
-CONFIG_BT_HIDP=m
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_ATH3K=m
-CONFIG_AF_RXRPC=m
-# CONFIG_AF_RXRPC_DEBUG is not set
-CONFIG_RXKAD=m
-CONFIG_FIB_RULES=y
-CONFIG_WIRELESS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WEXT_PRIV=y
-CONFIG_CFG80211=m
-# CONFIG_NL80211_TESTMODE is not set
-# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_REG_DEBUG is not set
-CONFIG_CFG80211_DEFAULT_PS=y
-# CONFIG_CFG80211_DEBUGFS is not set
-CONFIG_WIRELESS_OLD_REGULATORY=y
-CONFIG_CFG80211_WEXT=y
-CONFIG_WIRELESS_EXT_SYSFS=y
-CONFIG_LIB80211=m
-CONFIG_LIB80211_CRYPT_WEP=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_MAC80211=m
-CONFIG_MAC80211_RC_MINSTREL=y
-# CONFIG_MAC80211_RC_DEFAULT_PID is not set
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT="minstrel"
-CONFIG_MAC80211_MESH=y
-CONFIG_MAC80211_LEDS=y
-# CONFIG_MAC80211_DEBUGFS is not set
-# CONFIG_MAC80211_DEBUG_MENU is not set
-CONFIG_WIMAX=m
-CONFIG_WIMAX_DEBUG_LEVEL=8
-CONFIG_RFKILL=m
-CONFIG_RFKILL_LEDS=y
-CONFIG_RFKILL_INPUT=y
-CONFIG_NET_9P=m
-CONFIG_NET_9P_VIRTIO=m
-CONFIG_NET_9P_RDMA=m
-# CONFIG_NET_9P_DEBUG is not set
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
-CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_SYS_HYPERVISOR is not set
-CONFIG_CONNECTOR=m
-CONFIG_MTD=m
-# CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_TESTS=m
-CONFIG_MTD_CONCAT=m
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MTD_REDBOOT_PARTS=m
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
-# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-CONFIG_MTD_AR7_PARTS=m
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_CHAR=m
-CONFIG_HAVE_MTD_OTP=y
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
-CONFIG_FTL=m
-CONFIG_NFTL=m
-CONFIG_NFTL_RW=y
-CONFIG_INFTL=m
-CONFIG_RFD_FTL=m
-CONFIG_SSFDC=m
-CONFIG_MTD_OOPS=m
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=m
-CONFIG_MTD_JEDECPROBE=m
-CONFIG_MTD_GEN_PROBE=m
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-CONFIG_MTD_CFI_NOSWAP=y
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_GEOMETRY=y
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-CONFIG_MTD_MAP_BANK_WIDTH_8=y
-CONFIG_MTD_MAP_BANK_WIDTH_16=y
-CONFIG_MTD_MAP_BANK_WIDTH_32=y
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-CONFIG_MTD_CFI_I4=y
-CONFIG_MTD_CFI_I8=y
-CONFIG_MTD_OTP=y
-CONFIG_MTD_CFI_INTELEXT=m
-CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_CFI_STAA=m
-CONFIG_MTD_CFI_UTIL=m
-CONFIG_MTD_RAM=m
-CONFIG_MTD_ROM=m
-CONFIG_MTD_ABSENT=m
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=m
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-CONFIG_MTD_SC520CDP=m
-CONFIG_MTD_NETSC520=m
-CONFIG_MTD_TS5500=m
-CONFIG_MTD_SBC_GXX=m
-CONFIG_MTD_AMD76XROM=m
-CONFIG_MTD_ICHXROM=m
-CONFIG_MTD_ESB2ROM=m
-CONFIG_MTD_CK804XROM=m
-CONFIG_MTD_SCB2_FLASH=m
-CONFIG_MTD_NETtel=m
-CONFIG_MTD_L440GX=m
-CONFIG_MTD_PCI=m
-CONFIG_MTD_GPIO_ADDR=m
-CONFIG_MTD_INTEL_VR_NOR=m
-CONFIG_MTD_PLATRAM=m
-
-#
-# Self-contained MTD device drivers
-#
-CONFIG_MTD_PMC551=m
-CONFIG_MTD_PMC551_BUGFIX=y
-# CONFIG_MTD_PMC551_DEBUG is not set
-CONFIG_MTD_SLRAM=m
-CONFIG_MTD_PHRAM=m
-CONFIG_MTD_MTDRAM=m
-CONFIG_MTDRAM_TOTAL_SIZE=4096
-CONFIG_MTDRAM_ERASE_SIZE=128
-CONFIG_MTD_BLOCK2MTD=m
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-CONFIG_MTD_DOC2001PLUS=m
-CONFIG_MTD_DOCPROBE=m
-CONFIG_MTD_DOCECC=m
-CONFIG_MTD_DOCPROBE_ADVANCED=y
-CONFIG_MTD_DOCPROBE_ADDRESS=0x0000
-CONFIG_MTD_DOCPROBE_HIGH=y
-CONFIG_MTD_DOCPROBE_55AA=y
-CONFIG_MTD_NAND=m
-CONFIG_MTD_NAND_VERIFY_WRITE=y
-CONFIG_MTD_NAND_ECC_SMC=y
-CONFIG_MTD_NAND_MUSEUM_IDS=y
-CONFIG_MTD_NAND_IDS=m
-CONFIG_MTD_NAND_DISKONCHIP=m
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y
-CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y
-CONFIG_MTD_NAND_CAFE=m
-CONFIG_MTD_NAND_NANDSIM=m
-CONFIG_MTD_NAND_PLATFORM=m
-CONFIG_MTD_ALAUDA=m
-CONFIG_MTD_ONENAND=m
-CONFIG_MTD_ONENAND_VERIFY_WRITE=y
-CONFIG_MTD_ONENAND_GENERIC=m
-CONFIG_MTD_ONENAND_OTP=y
-CONFIG_MTD_ONENAND_2X_PROGRAM=y
-CONFIG_MTD_ONENAND_SIM=m
-
-#
-# LPDDR flash memory drivers
-#
-CONFIG_MTD_LPDDR=m
-CONFIG_MTD_QINFO_PROBE=m
-
-#
-# UBI - Unsorted block images
-#
-CONFIG_MTD_UBI=m
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_RESERVE=1
-CONFIG_MTD_UBI_GLUEBI=m
-
-#
-# UBI debugging options
-#
-# CONFIG_MTD_UBI_DEBUG is not set
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_SERIAL=m
-# CONFIG_PARPORT_PC_FIFO is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_AX88796=m
-CONFIG_PARPORT_1284=y
-CONFIG_PARPORT_NOT_PC=y
-CONFIG_PNP=y
-CONFIG_PNP_DEBUG_MESSAGES=y
-
-#
-# Protocols
-#
-CONFIG_PNPACPI=y
-CONFIG_BLK_DEV=y
-CONFIG_BLK_DEV_FD=y
-CONFIG_PARIDE=m
-
-#
-# Parallel IDE high-level drivers
-#
-CONFIG_PARIDE_PD=m
-CONFIG_PARIDE_PCD=m
-CONFIG_PARIDE_PF=m
-CONFIG_PARIDE_PT=m
-CONFIG_PARIDE_PG=m
-
-#
-# Parallel IDE protocol modules
-#
-CONFIG_PARIDE_ATEN=m
-CONFIG_PARIDE_BPCK=m
-CONFIG_PARIDE_COMM=m
-CONFIG_PARIDE_DSTR=m
-CONFIG_PARIDE_FIT2=m
-CONFIG_PARIDE_FIT3=m
-CONFIG_PARIDE_EPAT=m
-CONFIG_PARIDE_EPATC8=y
-CONFIG_PARIDE_EPIA=m
-CONFIG_PARIDE_FRIQ=m
-CONFIG_PARIDE_FRPW=m
-CONFIG_PARIDE_KBIC=m
-CONFIG_PARIDE_KTTI=m
-CONFIG_PARIDE_ON20=m
-CONFIG_PARIDE_ON26=m
-CONFIG_BLK_CPQ_DA=m
-CONFIG_BLK_CPQ_CISS_DA=m
-CONFIG_CISS_SCSI_TAPE=y
-CONFIG_BLK_DEV_DAC960=m
-CONFIG_BLK_DEV_UMEM=m
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_DRBD=m
-# CONFIG_DRBD_FAULT_INJECTION is not set
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_OSD=m
-CONFIG_BLK_DEV_SX8=m
-# CONFIG_BLK_DEV_UB is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=16384
-# CONFIG_BLK_DEV_XIP is not set
-CONFIG_CDROM_PKTCDVD=m
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_ATA_OVER_ETH=m
-CONFIG_VIRTIO_BLK=m
-# CONFIG_BLK_DEV_HD is not set
-CONFIG_MISC_DEVICES=y
-CONFIG_AD525X_DPOT=m
-CONFIG_IBM_ASM=m
-CONFIG_PHANTOM=m
-CONFIG_SGI_IOC4=m
-CONFIG_TIFM_CORE=m
-CONFIG_TIFM_7XX1=m
-CONFIG_ICS932S401=m
-CONFIG_ENCLOSURE_SERVICES=m
-CONFIG_CS5535_MFGPT=m
-CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
-CONFIG_HP_ILO=m
-CONFIG_ISL29003=m
-CONFIG_DS1682=m
-# CONFIG_C2PORT is not set
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT24=m
-CONFIG_EEPROM_LEGACY=m
-CONFIG_EEPROM_MAX6875=m
-CONFIG_EEPROM_93CX6=m
-CONFIG_CB710_CORE=m
-# CONFIG_CB710_DEBUG is not set
-CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-CONFIG_IWMC3200TOP=m
-# CONFIG_IWMC3200TOP_DEBUG is not set
-# CONFIG_IWMC3200TOP_DEBUGFS is not set
-CONFIG_HAVE_IDE=y
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-CONFIG_RAID_ATTRS=y
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_TGT=y
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_ENCLOSURE=m
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-CONFIG_SCSI_WAIT_SCAN=m
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=y
-CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_FC_TGT_ATTRS=y
-CONFIG_SCSI_ISCSI_ATTRS=y
-CONFIG_SCSI_SAS_ATTRS=y
-CONFIG_SCSI_SAS_LIBSAS=y
-CONFIG_SCSI_SAS_ATA=y
-CONFIG_SCSI_SAS_HOST_SMP=y
-# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
-CONFIG_SCSI_SRP_ATTRS=m
-CONFIG_SCSI_SRP_TGT_ATTRS=y
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ISCSI_TCP=m
-CONFIG_SCSI_CXGB3_ISCSI=m
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_BE2ISCSI=m
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-CONFIG_SCSI_HPSA=m
-CONFIG_SCSI_3W_9XXX=m
-CONFIG_SCSI_3W_SAS=m
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=4
-CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-CONFIG_AIC7XXX_DEBUG_MASK=0
-# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
-CONFIG_SCSI_AIC7XXX_OLD=m
-CONFIG_SCSI_AIC79XX=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=4
-CONFIG_AIC79XX_RESET_DELAY_MS=15000
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
-CONFIG_AIC79XX_DEBUG_MASK=0
-# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
-CONFIG_SCSI_AIC94XX=m
-# CONFIG_AIC94XX_DEBUG is not set
-CONFIG_SCSI_MVSAS=m
-# CONFIG_SCSI_MVSAS_DEBUG is not set
-CONFIG_SCSI_DPT_I2O=m
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_ARCMSR=m
-# CONFIG_SCSI_ARCMSR_AER is not set
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_MM=m
-CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-# CONFIG_SCSI_MPT2SAS_LOGGING is not set
-CONFIG_SCSI_HPTIOP=m
-CONFIG_SCSI_BUSLOGIC=m
-CONFIG_VMWARE_PVSCSI=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-CONFIG_FCOE=m
-CONFIG_FCOE_FNIC=m
-CONFIG_SCSI_DMX3191D=m
-CONFIG_SCSI_EATA=m
-# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
-# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
-CONFIG_SCSI_EATA_MAX_TAGS=16
-CONFIG_SCSI_FUTURE_DOMAIN=m
-CONFIG_SCSI_GDTH=m
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_INITIO=m
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_PPA=m
-CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
-# CONFIG_SCSI_IZIP_SLOW_CTR is not set
-CONFIG_SCSI_STEX=m
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_SCSI_IPR=m
-# CONFIG_SCSI_IPR_TRACE is not set
-# CONFIG_SCSI_IPR_DUMP is not set
-CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_QLA_FC=m
-CONFIG_SCSI_QLA_ISCSI=m
-CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_LPFC_DEBUG_FS is not set
-CONFIG_SCSI_DC395x=m
-CONFIG_SCSI_DC390T=m
-CONFIG_SCSI_DEBUG=m
-CONFIG_SCSI_PMCRAID=m
-CONFIG_SCSI_PM8001=m
-CONFIG_SCSI_SRP=m
-CONFIG_SCSI_BFA_FC=m
-CONFIG_SCSI_LOWLEVEL_PCMCIA=y
-CONFIG_PCMCIA_FDOMAIN=m
-CONFIG_PCMCIA_QLOGIC=m
-CONFIG_PCMCIA_SYM53C500=m
-CONFIG_SCSI_DH=m
-CONFIG_SCSI_DH_RDAC=m
-CONFIG_SCSI_DH_HP_SW=m
-CONFIG_SCSI_DH_EMC=m
-CONFIG_SCSI_DH_ALUA=m
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
-CONFIG_SCSI_OSD_DPRINT_SENSE=1
-# CONFIG_SCSI_OSD_DEBUG is not set
-CONFIG_ATA=y
-# CONFIG_ATA_NONSTANDARD is not set
-CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_ATA_ACPI=y
-CONFIG_SATA_PMP=y
-CONFIG_SATA_AHCI=y
-CONFIG_SATA_SIL24=y
-CONFIG_ATA_SFF=y
-CONFIG_SATA_SVW=y
-CONFIG_ATA_PIIX=y
-CONFIG_SATA_MV=y
-CONFIG_SATA_NV=y
-CONFIG_PDC_ADMA=y
-CONFIG_SATA_QSTOR=y
-CONFIG_SATA_PROMISE=y
-CONFIG_SATA_SX4=y
-CONFIG_SATA_SIL=y
-CONFIG_SATA_SIS=y
-CONFIG_SATA_ULI=y
-CONFIG_SATA_VIA=y
-CONFIG_SATA_VITESSE=y
-CONFIG_SATA_INIC162X=y
-CONFIG_PATA_ACPI=y
-CONFIG_PATA_ALI=y
-CONFIG_PATA_AMD=y
-CONFIG_PATA_ARTOP=y
-CONFIG_PATA_ATP867X=y
-CONFIG_PATA_ATIIXP=y
-CONFIG_PATA_CMD640_PCI=y
-CONFIG_PATA_CMD64X=y
-CONFIG_PATA_CS5520=y
-CONFIG_PATA_CS5530=y
-CONFIG_PATA_CYPRESS=y
-CONFIG_PATA_EFAR=y
-CONFIG_ATA_GENERIC=y
-CONFIG_PATA_HPT366=y
-CONFIG_PATA_HPT37X=y
-CONFIG_PATA_HPT3X2N=y
-CONFIG_PATA_HPT3X3=y
-CONFIG_PATA_HPT3X3_DMA=y
-CONFIG_PATA_IT821X=y
-CONFIG_PATA_IT8213=y
-CONFIG_PATA_JMICRON=y
-CONFIG_PATA_TRIFLEX=y
-CONFIG_PATA_MARVELL=y
-CONFIG_PATA_MPIIX=y
-CONFIG_PATA_OLDPIIX=y
-CONFIG_PATA_NETCELL=y
-CONFIG_PATA_NINJA32=y
-CONFIG_PATA_NS87410=y
-CONFIG_PATA_NS87415=y
-CONFIG_PATA_OPTI=y
-CONFIG_PATA_OPTIDMA=y
-CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_PDC2027X=y
-CONFIG_PATA_PDC_OLD=y
-CONFIG_PATA_RADISYS=y
-CONFIG_PATA_RDC=y
-CONFIG_PATA_RZ1000=y
-CONFIG_PATA_SC1200=y
-CONFIG_PATA_SERVERWORKS=y
-CONFIG_PATA_SIL680=y
-CONFIG_PATA_SIS=y
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_VIA=y
-CONFIG_PATA_WINBOND=y
-CONFIG_PATA_SCH=y
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=y
-CONFIG_MD_AUTODETECT=y
-CONFIG_MD_LINEAR=y
-CONFIG_MD_RAID0=y
-CONFIG_MD_RAID1=y
-CONFIG_MD_RAID10=y
-CONFIG_MD_RAID456=y
-# CONFIG_MULTICORE_RAID456 is not set
-CONFIG_MD_RAID6_PQ=y
-CONFIG_ASYNC_RAID6_TEST=m
-CONFIG_MD_MULTIPATH=y
-CONFIG_MD_FAULTY=m
-CONFIG_BLK_DEV_DM=y
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_CRYPT=y
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_MIRROR=y
-CONFIG_DM_LOG_USERSPACE=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_QL=m
-CONFIG_DM_MULTIPATH_ST=m
-# CONFIG_DM_DELAY is not set
-CONFIG_DM_UEVENT=y
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION_FC=m
-CONFIG_FUSION_SAS=m
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_CTL=m
-CONFIG_FUSION_LAN=m
-# CONFIG_FUSION_LOGGING is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# You can enable one or both FireWire driver stacks.
-#
-
-#
-# The newer stack is recommended.
-#
-# CONFIG_FIREWIRE is not set
-CONFIG_IEEE1394=m
-CONFIG_IEEE1394_OHCI1394=m
-CONFIG_IEEE1394_PCILYNX=m
-CONFIG_IEEE1394_SBP2=m
-# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
-CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y
-CONFIG_IEEE1394_ETH1394=m
-CONFIG_IEEE1394_RAWIO=m
-CONFIG_IEEE1394_VIDEO1394=m
-CONFIG_IEEE1394_DV1394=m
-# CONFIG_IEEE1394_VERBOSEDEBUG is not set
-CONFIG_I2O=m
-CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
-CONFIG_I2O_EXT_ADAPTEC=y
-CONFIG_I2O_EXT_ADAPTEC_DMA64=y
-CONFIG_I2O_CONFIG=m
-# CONFIG_I2O_CONFIG_OLD_IOCTL is not set
-CONFIG_I2O_BUS=m
-CONFIG_I2O_BLOCK=m
-CONFIG_I2O_SCSI=m
-CONFIG_I2O_PROC=m
-CONFIG_MACINTOSH_DRIVERS=y
-CONFIG_MAC_EMUMOUSEBTN=y
-CONFIG_NETDEVICES=y
-CONFIG_IFB=m
-CONFIG_DUMMY=m
-CONFIG_BONDING=m
-CONFIG_MACVLAN=m
-CONFIG_EQUALIZER=m
-CONFIG_TUN=m
-CONFIG_VETH=m
-CONFIG_NET_SB1000=m
-CONFIG_ARCNET=m
-CONFIG_ARCNET_1201=m
-CONFIG_ARCNET_1051=m
-CONFIG_ARCNET_RAW=m
-CONFIG_ARCNET_CAP=m
-CONFIG_ARCNET_COM90xx=m
-CONFIG_ARCNET_COM90xxIO=m
-CONFIG_ARCNET_RIM_I=m
-CONFIG_ARCNET_COM20020=m
-CONFIG_ARCNET_COM20020_PCI=m
-CONFIG_PHYLIB=m
-
-#
-# MII PHY device drivers
-#
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_SMSC_PHY=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_STE10XP=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_MDIO_BITBANG=m
-CONFIG_MDIO_GPIO=m
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=m
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_CASSINI=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-CONFIG_ETHOC=m
-CONFIG_DNET=m
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_DE2104X_DSL=0
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-CONFIG_TULIP_MMIO=y
-# CONFIG_TULIP_NAPI is not set
-CONFIG_DE4X5=m
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_ULI526X=m
-CONFIG_PCMCIA_XIRCOM=m
-CONFIG_HP100=m
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
-# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
-# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=m
-CONFIG_AMD8111_ETH=m
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_FORCEDETH=m
-CONFIG_FORCEDETH_NAPI=y
-CONFIG_E100=m
-CONFIG_FEALNX=m
-CONFIG_NATSEMI=m
-CONFIG_NE2K_PCI=m
-CONFIG_8139CP=m
-CONFIG_8139TOO=m
-CONFIG_8139TOO_PIO=y
-# CONFIG_8139TOO_TUNE_TWISTER is not set
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_R6040=m
-CONFIG_SIS900=m
-CONFIG_EPIC100=m
-CONFIG_SMSC9420=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_TLAN=m
-CONFIG_KS8842=m
-CONFIG_KS8851_MLL=m
-CONFIG_VIA_RHINE=m
-CONFIG_VIA_RHINE_MMIO=y
-CONFIG_SC92031=m
-CONFIG_NET_POCKET=y
-CONFIG_ATP=m
-CONFIG_DE600=m
-CONFIG_DE620=m
-CONFIG_ATL2=m
-CONFIG_NETDEV_1000=y
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-CONFIG_E1000E=m
-CONFIG_IP1000=m
-CONFIG_IGB=m
-CONFIG_IGB_DCA=y
-CONFIG_IGBVF=m
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-CONFIG_R8169_VLAN=y
-CONFIG_SIS190=m
-CONFIG_SKGE=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKY2=m
-# CONFIG_SKY2_DEBUG is not set
-CONFIG_VIA_VELOCITY=m
-CONFIG_TIGON3=m
-CONFIG_BNX2=m
-CONFIG_CNIC=m
-CONFIG_QLA3XXX=m
-CONFIG_ATL1=m
-CONFIG_ATL1E=m
-CONFIG_ATL1C=m
-CONFIG_JME=m
-CONFIG_NETDEV_10000=y
-CONFIG_MDIO=m
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3_DEPENDS=y
-CONFIG_CHELSIO_T3=m
-CONFIG_ENIC=m
-CONFIG_IXGBE=m
-CONFIG_IXGBE_DCA=y
-CONFIG_IXGB=m
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_MYRI10GE=m
-CONFIG_MYRI10GE_DCA=y
-CONFIG_NETXEN_NIC=m
-CONFIG_NIU=m
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-CONFIG_TEHUTI=m
-CONFIG_BNX2X=m
-CONFIG_QLGE=m
-CONFIG_SFC=m
-CONFIG_SFC_MTD=y
-CONFIG_BE2NET=m
-CONFIG_TR=m
-CONFIG_IBMOL=m
-CONFIG_3C359=m
-CONFIG_TMS380TR=m
-CONFIG_TMSPCI=m
-CONFIG_ABYSS=m
-CONFIG_WLAN=y
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_LIBERTAS_THINFIRM=m
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_AIRO=m
-CONFIG_ATMEL=m
-CONFIG_PCI_ATMEL=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_AT76C50X_USB=m
-CONFIG_AIRO_CS=m
-CONFIG_PCMCIA_WL3501=m
-CONFIG_PRISM54=m
-CONFIG_USB_ZD1201=m
-CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_RTL8180=m
-CONFIG_RTL8187=m
-CONFIG_RTL8187_LEDS=y
-CONFIG_ADM8211=m
-# CONFIG_MAC80211_HWSIM is not set
-CONFIG_MWL8K=m
-CONFIG_ATH_COMMON=m
-# CONFIG_ATH_DEBUG is not set
-CONFIG_ATH5K=m
-# CONFIG_ATH5K_DEBUG is not set
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K_COMMON=m
-CONFIG_ATH9K=m
-# CONFIG_ATH9K_DEBUGFS is not set
-CONFIG_AR9170_USB=m
-CONFIG_AR9170_LEDS=y
-CONFIG_B43=m
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PCMCIA=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_PIO=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_LEDS=y
-CONFIG_B43_HWRNG=y
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY_HWRNG=y
-# CONFIG_B43LEGACY_DEBUG is not set
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-CONFIG_HOSTAP_FIRMWARE_NVRAM=y
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_CS=m
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y
-# CONFIG_IWLWIFI_DEBUG is not set
-# CONFIG_IWLWIFI_DEVICE_TRACING is not set
-CONFIG_IWLAGN=m
-CONFIG_IWL4965=y
-CONFIG_IWL5000=y
-CONFIG_IWL3945=m
-CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y
-CONFIG_IWM=m
-# CONFIG_IWM_DEBUG is not set
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
-CONFIG_LIBERTAS_SDIO=m
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_HERMES=m
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_USB=m
-CONFIG_P54_PCI=m
-CONFIG_P54_LEDS=y
-CONFIG_RT2X00=m
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT61PCI=m
-CONFIG_RT2800PCI_PCI=m
-CONFIG_RT2800PCI=m
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-CONFIG_RT2800USB=m
-CONFIG_RT2800_LIB=m
-CONFIG_RT2X00_LIB_PCI=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_HT=y
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_LEDS=y
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_WL12XX=m
-CONFIG_WL1251=m
-CONFIG_WL1251_SDIO=m
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-
-#
-# WiMAX Wireless Broadband devices
-#
-CONFIG_WIMAX_I2400M=m
-CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_SDIO=m
-# CONFIG_WIMAX_IWMC3200_SDIO is not set
-CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-# CONFIG_USB_EPSON2888 is not set
-# CONFIG_USB_KC2190 is not set
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_HSO=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_CDC_PHONET=m
-CONFIG_NET_PCMCIA=y
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_AXNET=m
-CONFIG_ARCNET_COM20020_CS=m
-CONFIG_PCMCIA_IBMTR=m
-CONFIG_WAN=y
-CONFIG_LANMEDIA=m
-CONFIG_HDLC=m
-CONFIG_HDLC_RAW=m
-CONFIG_HDLC_RAW_ETH=m
-CONFIG_HDLC_CISCO=m
-CONFIG_HDLC_FR=m
-CONFIG_HDLC_PPP=m
-
-#
-# X.25/LAPB support is disabled
-#
-CONFIG_PCI200SYN=m
-CONFIG_WANXL=m
-# CONFIG_PC300TOO is not set
-CONFIG_FARSYNC=m
-CONFIG_DSCC4=m
-# CONFIG_DSCC4_PCISYNC is not set
-# CONFIG_DSCC4_PCI_RST is not set
-CONFIG_DLCI=m
-CONFIG_DLCI_MAX=8
-CONFIG_WAN_ROUTER_DRIVERS=m
-CONFIG_CYCLADES_SYNC=m
-CONFIG_CYCLOMX_X25=y
-CONFIG_SBNI=m
-# CONFIG_SBNI_MULTILINE is not set
-CONFIG_ATM_DRIVERS=y
-CONFIG_ATM_DUMMY=m
-CONFIG_ATM_TCP=m
-CONFIG_ATM_LANAI=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-# CONFIG_ATM_ENI_TUNE_BURST is not set
-CONFIG_ATM_FIRESTREAM=m
-CONFIG_ATM_ZATM=m
-# CONFIG_ATM_ZATM_DEBUG is not set
-CONFIG_ATM_IDT77252=m
-# CONFIG_ATM_IDT77252_DEBUG is not set
-# CONFIG_ATM_IDT77252_RCV_ALL is not set
-CONFIG_ATM_IDT77252_USE_SUNI=y
-CONFIG_ATM_AMBASSADOR=m
-# CONFIG_ATM_AMBASSADOR_DEBUG is not set
-CONFIG_ATM_HORIZON=m
-# CONFIG_ATM_HORIZON_DEBUG is not set
-CONFIG_ATM_IA=m
-# CONFIG_ATM_IA_DEBUG is not set
-CONFIG_ATM_FORE200E=m
-# CONFIG_ATM_FORE200E_USE_TASKLET is not set
-CONFIG_ATM_FORE200E_TX_RETRY=16
-CONFIG_ATM_FORE200E_DEBUG=0
-CONFIG_ATM_HE=m
-# CONFIG_ATM_HE_USE_SUNI is not set
-CONFIG_ATM_SOLOS=m
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKEHARD=m
-CONFIG_FDDI=y
-CONFIG_DEFXX=m
-# CONFIG_DEFXX_MMIO is not set
-CONFIG_SKFP=m
-CONFIG_HIPPI=y
-CONFIG_ROADRUNNER=m
-# CONFIG_ROADRUNNER_LARGE_RINGS is not set
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_MPPE=m
-CONFIG_PPPOE=m
-CONFIG_PPPOATM=m
-CONFIG_PPPOL2TP=m
-CONFIG_SLIP=m
-CONFIG_SLIP_COMPRESSED=y
-CONFIG_SLHC=m
-CONFIG_SLIP_SMART=y
-# CONFIG_SLIP_MODE_SLIP6 is not set
-CONFIG_NET_FC=y
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-# CONFIG_NETPOLL_TRAP is not set
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_VIRTIO_NET=m
-CONFIG_VMXNET3=m
-CONFIG_ISDN=y
-CONFIG_ISDN_I4L=m
-CONFIG_MISDN=m
-CONFIG_MISDN_DSP=m
-CONFIG_MISDN_L1OIP=m
-
-#
-# mISDN hardware drivers
-#
-CONFIG_MISDN_HFCPCI=m
-CONFIG_MISDN_HFCMULTI=m
-CONFIG_MISDN_HFCUSB=m
-CONFIG_MISDN_AVMFRITZ=m
-CONFIG_MISDN_SPEEDFAX=m
-CONFIG_MISDN_INFINEON=m
-CONFIG_MISDN_W6692=m
-CONFIG_MISDN_NETJET=m
-CONFIG_MISDN_IPAC=m
-CONFIG_MISDN_ISAR=m
-CONFIG_ISDN_PPP=y
-CONFIG_ISDN_PPP_VJ=y
-CONFIG_ISDN_MPP=y
-CONFIG_IPPP_FILTER=y
-CONFIG_ISDN_PPP_BSDCOMP=m
-CONFIG_ISDN_AUDIO=y
-CONFIG_ISDN_TTY_FAX=y
-
-#
-# ISDN feature submodules
-#
-CONFIG_ISDN_DIVERSION=m
-
-#
-# ISDN4Linux hardware drivers
-#
-
-#
-# Passive cards
-#
-CONFIG_ISDN_DRV_HISAX=m
-
-#
-# D-channel protocol features
-#
-CONFIG_HISAX_EURO=y
-CONFIG_DE_AOC=y
-CONFIG_HISAX_NO_SENDCOMPLETE=y
-CONFIG_HISAX_NO_LLC=y
-CONFIG_HISAX_NO_KEYPAD=y
-CONFIG_HISAX_1TR6=y
-CONFIG_HISAX_NI1=y
-CONFIG_HISAX_MAX_CARDS=8
-
-#
-# HiSax supported cards
-#
-CONFIG_HISAX_16_3=y
-CONFIG_HISAX_TELESPCI=y
-CONFIG_HISAX_S0BOX=y
-CONFIG_HISAX_FRITZPCI=y
-CONFIG_HISAX_AVM_A1_PCMCIA=y
-CONFIG_HISAX_ELSA=y
-CONFIG_HISAX_DIEHLDIVA=y
-CONFIG_HISAX_SEDLBAUER=y
-CONFIG_HISAX_NETJET=y
-CONFIG_HISAX_NETJET_U=y
-CONFIG_HISAX_NICCY=y
-CONFIG_HISAX_BKM_A4T=y
-CONFIG_HISAX_SCT_QUADRO=y
-CONFIG_HISAX_GAZEL=y
-CONFIG_HISAX_HFC_PCI=y
-CONFIG_HISAX_W6692=y
-CONFIG_HISAX_HFC_SX=y
-CONFIG_HISAX_ENTERNOW_PCI=y
-# CONFIG_HISAX_DEBUG is not set
-
-#
-# HiSax PCMCIA card service modules
-#
-CONFIG_HISAX_SEDLBAUER_CS=m
-CONFIG_HISAX_ELSA_CS=m
-CONFIG_HISAX_AVM_A1_CS=m
-CONFIG_HISAX_TELES_CS=m
-
-#
-# HiSax sub driver modules
-#
-CONFIG_HISAX_ST5481=m
-CONFIG_HISAX_HFCUSB=m
-CONFIG_HISAX_HFC4S8S=m
-CONFIG_HISAX_FRITZ_PCIPNP=m
-
-#
-# Active cards
-#
-CONFIG_HYSDN=m
-CONFIG_HYSDN_CAPI=y
-CONFIG_ISDN_HDLC=m
-CONFIG_ISDN_CAPI=m
-CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
-CONFIG_CAPI_TRACE=y
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
-CONFIG_ISDN_CAPI_CAPIFS=m
-CONFIG_ISDN_CAPI_CAPIDRV=m
-
-#
-# CAPI hardware drivers
-#
-CONFIG_CAPI_AVM=y
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-CONFIG_CAPI_EICON=y
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS_USERIDI=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DRV_GIGASET=m
-# CONFIG_GIGASET_CAPI is not set
-CONFIG_GIGASET_I4L=y
-# CONFIG_GIGASET_DUMMYLL is not set
-CONFIG_GIGASET_BASE=m
-CONFIG_GIGASET_M105=m
-# CONFIG_GIGASET_M101 is not set
-# CONFIG_GIGASET_DEBUG is not set
-CONFIG_PHONE=m
-CONFIG_PHONE_IXJ=m
-CONFIG_PHONE_IXJ_PCMCIA=m
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-CONFIG_INPUT_FF_MEMLESS=y
-CONFIG_INPUT_POLLDEV=m
-CONFIG_INPUT_SPARSEKMAP=m
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ADP5588=m
-CONFIG_KEYBOARD_ATKBD=y
-CONFIG_QT2160=m
-# CONFIG_KEYBOARD_LKKBD is not set
-CONFIG_KEYBOARD_GPIO=m
-CONFIG_KEYBOARD_MATRIX=m
-CONFIG_KEYBOARD_LM8323=m
-CONFIG_KEYBOARD_MAX7359=m
-# CONFIG_KEYBOARD_NEWTON is not set
-CONFIG_KEYBOARD_OPENCORES=m
-CONFIG_KEYBOARD_STOWAWAY=m
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=m
-CONFIG_MOUSE_PS2_ALPS=y
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
-CONFIG_MOUSE_PS2_LIFEBOOK=y
-CONFIG_MOUSE_PS2_TRACKPOINT=y
-# CONFIG_MOUSE_PS2_ELANTECH is not set
-CONFIG_MOUSE_PS2_SENTELIC=y
-CONFIG_MOUSE_PS2_TOUCHKIT=y
-CONFIG_MOUSE_SERIAL=m
-CONFIG_MOUSE_APPLETOUCH=m
-CONFIG_MOUSE_BCM5974=m
-CONFIG_MOUSE_VSXXXAA=m
-CONFIG_MOUSE_GPIO=m
-CONFIG_MOUSE_SYNAPTICS_I2C=m
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_JOYSTICK_ANALOG=m
-CONFIG_JOYSTICK_A3D=m
-CONFIG_JOYSTICK_ADI=m
-CONFIG_JOYSTICK_COBRA=m
-CONFIG_JOYSTICK_GF2K=m
-CONFIG_JOYSTICK_GRIP=m
-CONFIG_JOYSTICK_GRIP_MP=m
-CONFIG_JOYSTICK_GUILLEMOT=m
-CONFIG_JOYSTICK_INTERACT=m
-CONFIG_JOYSTICK_SIDEWINDER=m
-CONFIG_JOYSTICK_TMDC=m
-CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
-CONFIG_JOYSTICK_WARRIOR=m
-CONFIG_JOYSTICK_MAGELLAN=m
-CONFIG_JOYSTICK_SPACEORB=m
-CONFIG_JOYSTICK_SPACEBALL=m
-CONFIG_JOYSTICK_STINGER=m
-CONFIG_JOYSTICK_TWIDJOY=m
-CONFIG_JOYSTICK_ZHENHUA=m
-CONFIG_JOYSTICK_DB9=m
-CONFIG_JOYSTICK_GAMECON=m
-CONFIG_JOYSTICK_TURBOGRAFX=m
-CONFIG_JOYSTICK_JOYDUMP=m
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-# CONFIG_JOYSTICK_WALKERA0701 is not set
-CONFIG_INPUT_TABLET=y
-CONFIG_TABLET_USB_ACECAD=m
-CONFIG_TABLET_USB_AIPTEK=m
-CONFIG_TABLET_USB_GTCO=m
-CONFIG_TABLET_USB_KBTAB=m
-CONFIG_TABLET_USB_WACOM=m
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_AD7879_I2C=m
-CONFIG_TOUCHSCREEN_AD7879=m
-CONFIG_TOUCHSCREEN_DYNAPRO=m
-CONFIG_TOUCHSCREEN_EETI=m
-CONFIG_TOUCHSCREEN_FUJITSU=m
-CONFIG_TOUCHSCREEN_GUNZE=m
-CONFIG_TOUCHSCREEN_ELO=m
-CONFIG_TOUCHSCREEN_WACOM_W8001=m
-CONFIG_TOUCHSCREEN_MCS5000=m
-CONFIG_TOUCHSCREEN_MTOUCH=m
-CONFIG_TOUCHSCREEN_INEXIO=m
-CONFIG_TOUCHSCREEN_MK712=m
-CONFIG_TOUCHSCREEN_PENMOUNT=m
-CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
-CONFIG_TOUCHSCREEN_TOUCHWIN=m
-CONFIG_TOUCHSCREEN_UCB1400=m
-CONFIG_TOUCHSCREEN_WM97XX=m
-CONFIG_TOUCHSCREEN_WM9705=y
-CONFIG_TOUCHSCREEN_WM9712=y
-CONFIG_TOUCHSCREEN_WM9713=y
-CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-CONFIG_TOUCHSCREEN_USB_EGALAX=y
-CONFIG_TOUCHSCREEN_USB_PANJIT=y
-CONFIG_TOUCHSCREEN_USB_3M=y
-CONFIG_TOUCHSCREEN_USB_ITM=y
-CONFIG_TOUCHSCREEN_USB_ETURBO=y
-CONFIG_TOUCHSCREEN_USB_GUNZE=y
-CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
-CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
-CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
-CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
-CONFIG_TOUCHSCREEN_USB_GOTOP=y
-CONFIG_TOUCHSCREEN_USB_JASTEC=y
-CONFIG_TOUCHSCREEN_USB_E2I=y
-CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
-CONFIG_TOUCHSCREEN_USB_ETT_TC5UH=y
-CONFIG_TOUCHSCREEN_TOUCHIT213=m
-CONFIG_TOUCHSCREEN_TSC2007=m
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_APANEL=m
-CONFIG_INPUT_ATLAS_BTNS=m
-CONFIG_INPUT_ATI_REMOTE=m
-CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_INPUT_KEYSPAN_REMOTE=m
-CONFIG_INPUT_POWERMATE=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INPUT_CM109=m
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_WINBOND_CIR=m
-CONFIG_INPUT_PCF50633_PMU=m
-CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=m
-CONFIG_SERIO_CT82C710=m
-CONFIG_SERIO_PARKBD=m
-CONFIG_SERIO_PCIPS2=m
-CONFIG_SERIO_LIBPS2=y
-CONFIG_SERIO_RAW=m
-CONFIG_SERIO_ALTERA_PS2=m
-CONFIG_GAMEPORT=m
-CONFIG_GAMEPORT_NS558=m
-CONFIG_GAMEPORT_L4=m
-CONFIG_GAMEPORT_EMU10K1=m
-CONFIG_GAMEPORT_FM801=m
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_DEVKMEM=y
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_COMPUTONE=m
-CONFIG_ROCKETPORT=m
-CONFIG_CYCLADES=m
-# CONFIG_CYZ_INTR is not set
-CONFIG_DIGIEPCA=m
-CONFIG_MOXA_INTELLIO=m
-CONFIG_MOXA_SMARTIO=m
-CONFIG_ISI=m
-CONFIG_SYNCLINK=m
-CONFIG_SYNCLINKMP=m
-CONFIG_SYNCLINK_GT=m
-CONFIG_N_HDLC=m
-CONFIG_RISCOM8=m
-CONFIG_SPECIALIX=m
-CONFIG_STALDRV=y
-CONFIG_STALLION=m
-CONFIG_ISTALLION=m
-CONFIG_NOZOMI=m
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_PNP=y
-CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_MANY_PORTS=y
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-CONFIG_SERIAL_8250_DETECT_IRQ=y
-CONFIG_SERIAL_8250_RSA=y
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_JSM=m
-CONFIG_UNIX98_PTYS=y
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=32
-CONFIG_PRINTER=m
-CONFIG_LP_CONSOLE=y
-CONFIG_PPDEV=m
-CONFIG_HVC_DRIVER=y
-CONFIG_VIRTIO_CONSOLE=m
-CONFIG_IPMI_HANDLER=m
-# CONFIG_IPMI_PANIC_EVENT is not set
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
-CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_INTEL=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_VIA=m
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_NVRAM=m
-CONFIG_R3964=m
-CONFIG_APPLICOM=m
-
-#
-# PCMCIA character devices
-#
-CONFIG_SYNCLINK_CS=m
-CONFIG_CARDMAN_4000=m
-CONFIG_CARDMAN_4040=m
-CONFIG_IPWIRELESS=m
-CONFIG_MWAVE=m
-CONFIG_PC8736x_GPIO=m
-CONFIG_NSC_GPIO=m
-CONFIG_RAW_DRIVER=m
-CONFIG_MAX_RAW_DEVS=256
-CONFIG_HPET=y
-CONFIG_HPET_MMAP=y
-CONFIG_HANGCHECK_TIMER=m
-CONFIG_TCG_TPM=m
-# CONFIG_TCG_TIS is not set
-# CONFIG_TCG_NSC is not set
-CONFIG_TCG_ATMEL=m
-# CONFIG_TCG_INFINEON is not set
-CONFIG_TELCLOCK=m
-CONFIG_DEVPORT=y
-CONFIG_I2C=m
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCA=m
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# PC SMBus host controller drivers
-#
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD756_S4882=m
-CONFIG_I2C_AMD8111=m
-CONFIG_I2C_I801=m
-CONFIG_I2C_ISCH=m
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_NFORCE2_S4985=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-
-#
-# ACPI drivers
-#
-CONFIG_I2C_SCMI=m
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-CONFIG_I2C_GPIO=m
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_SIMTEC=m
-
-#
-# External I2C/SMBus adapter drivers
-#
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-
-#
-# Other I2C/SMBus bus drivers
-#
-CONFIG_I2C_PCA_PLATFORM=m
-CONFIG_I2C_STUB=m
-
-#
-# Miscellaneous I2C Chip support
-#
-CONFIG_SENSORS_TSL2550=m
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
-# CONFIG_SPI is not set
-
-#
-# PPS support
-#
-CONFIG_PPS=m
-# CONFIG_PPS_DEBUG is not set
-CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-CONFIG_GPIOLIB=y
-# CONFIG_DEBUG_GPIO is not set
-CONFIG_GPIO_SYSFS=y
-
-#
-# Memory mapped GPIO expanders:
-#
-
-#
-# I2C GPIO expanders:
-#
-CONFIG_GPIO_MAX732X=m
-CONFIG_GPIO_PCA953X=m
-CONFIG_GPIO_PCF857X=m
-CONFIG_GPIO_ADP5588=m
-
-#
-# PCI GPIO expanders:
-#
-CONFIG_GPIO_CS5535=m
-# CONFIG_GPIO_LANGWELL is not set
-
-#
-# SPI GPIO expanders:
-#
-
-#
-# AC97 GPIO expanders:
-#
-# CONFIG_GPIO_UCB1400 is not set
-CONFIG_W1=m
-CONFIG_W1_CON=y
-
-#
-# 1-wire Bus Masters
-#
-CONFIG_W1_MASTER_MATROX=m
-CONFIG_W1_MASTER_DS2490=m
-CONFIG_W1_MASTER_DS2482=m
-CONFIG_W1_MASTER_GPIO=m
-
-#
-# 1-wire Slaves
-#
-CONFIG_W1_SLAVE_THERM=m
-CONFIG_W1_SLAVE_SMEM=m
-CONFIG_W1_SLAVE_DS2431=m
-CONFIG_W1_SLAVE_DS2433=m
-CONFIG_W1_SLAVE_DS2433_CRC=y
-CONFIG_W1_SLAVE_DS2760=m
-CONFIG_W1_SLAVE_BQ27000=m
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-CONFIG_PDA_POWER=m
-CONFIG_WM8350_POWER=m
-CONFIG_BATTERY_DS2760=m
-CONFIG_BATTERY_DS2782=m
-CONFIG_BATTERY_BQ27x00=m
-CONFIG_BATTERY_MAX17040=m
-CONFIG_CHARGER_PCF50633=m
-CONFIG_HWMON=m
-CONFIG_HWMON_VID=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-CONFIG_SENSORS_ABITUGURU=m
-CONFIG_SENSORS_ABITUGURU3=m
-CONFIG_SENSORS_AD7414=m
-CONFIG_SENSORS_AD7418=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1029=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_ADT7462=m
-CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7473=m
-CONFIG_SENSORS_ADT7475=m
-CONFIG_SENSORS_K8TEMP=m
-CONFIG_SENSORS_K10TEMP=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_I5K_AMB=m
-CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_F71882FG=m
-CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_FSCHMD=m
-CONFIG_SENSORS_G760A=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_CORETEMP=m
-CONFIG_SENSORS_IBMAEM=m
-CONFIG_SENSORS_IBMPEX=m
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM73=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_LM93=m
-CONFIG_SENSORS_LTC4215=m
-CONFIG_SENSORS_LTC4245=m
-CONFIG_SENSORS_LM95241=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX6650=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_PC87427=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_SENSORS_SHT15=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_DME1737=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_SMSC47M192=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_ADS7828=m
-CONFIG_SENSORS_AMC6821=m
-CONFIG_SENSORS_THMC50=m
-CONFIG_SENSORS_TMP401=m
-CONFIG_SENSORS_TMP421=m
-CONFIG_SENSORS_VIA_CPUTEMP=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_VT1211=m
-CONFIG_SENSORS_VT8231=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83791D=m
-CONFIG_SENSORS_W83792D=m
-CONFIG_SENSORS_W83793=m
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83L786NG=m
-CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_W83627EHF=m
-CONFIG_SENSORS_WM8350=m
-CONFIG_SENSORS_HDAPS=m
-CONFIG_SENSORS_LIS3_I2C=m
-CONFIG_SENSORS_APPLESMC=m
-
-#
-# ACPI drivers
-#
-CONFIG_SENSORS_ATK0110=m
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_THERMAL=m
-CONFIG_THERMAL_HWMON=y
-CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_WM8350_WATCHDOG=m
-CONFIG_ACQUIRE_WDT=m
-CONFIG_ADVANTECH_WDT=m
-CONFIG_ALIM1535_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_GEODE_WDT=m
-CONFIG_SC520_WDT=m
-CONFIG_SBC_FITPC2_WATCHDOG=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
-CONFIG_WAFER_WDT=m
-CONFIG_I6300ESB_WDT=m
-CONFIG_ITCO_WDT=m
-CONFIG_ITCO_VENDOR_SUPPORT=y
-CONFIG_IT8712F_WDT=m
-CONFIG_IT87_WDT=m
-CONFIG_HP_WATCHDOG=m
-CONFIG_SC1200_WDT=m
-CONFIG_PC87413_WDT=m
-CONFIG_60XX_WDT=m
-CONFIG_SBC8360_WDT=m
-CONFIG_CPU5_WDT=m
-CONFIG_SMSC_SCH311X_WDT=m
-CONFIG_SMSC37B787_WDT=m
-CONFIG_W83627HF_WDT=m
-CONFIG_W83697HF_WDT=m
-CONFIG_W83697UG_WDT=m
-CONFIG_W83877F_WDT=m
-CONFIG_W83977F_WDT=m
-CONFIG_MACHZ_WDT=m
-CONFIG_SBC_EPX_C3_WATCHDOG=m
-
-#
-# PCI-based Watchdog Cards
-#
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_WDTPCI=m
-
-#
-# USB-based Watchdog Cards
-#
-CONFIG_USBPCWATCHDOG=m
-CONFIG_SSB_POSSIBLE=y
-
-#
-# Sonics Silicon Backplane
-#
-CONFIG_SSB=m
-CONFIG_SSB_SPROM=y
-CONFIG_SSB_BLOCKIO=y
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-CONFIG_SSB_SDIOHOST=y
-# CONFIG_SSB_DEBUG is not set
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
-
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_CORE=m
-# CONFIG_MFD_SM501 is not set
-CONFIG_HTC_PASIC3=m
-CONFIG_UCB1400_CORE=m
-CONFIG_TPS65010=m
-# CONFIG_MFD_TMIO is not set
-CONFIG_MFD_WM8400=m
-CONFIG_MFD_WM8350=m
-CONFIG_MFD_WM8350_I2C=m
-CONFIG_MFD_PCF50633=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-CONFIG_AB3100_CORE=m
-CONFIG_AB3100_OTP=m
-# CONFIG_REGULATOR is not set
-CONFIG_MEDIA_SUPPORT=m
-
-#
-# Multimedia core support
-#
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_COMMON=m
-CONFIG_VIDEO_ALLOW_V4L1=y
-CONFIG_VIDEO_V4L1_COMPAT=y
-CONFIG_DVB_CORE=m
-CONFIG_VIDEO_MEDIA=m
-
-#
-# Multimedia drivers
-#
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_IR_CORE=m
-CONFIG_VIDEO_IR=m
-CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=m
-# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_V4L1=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_VIDEO_CAPTURE_DRIVERS=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# Encoders/decoders and other helper chips
-#
-
-#
-# Audio decoders
-#
-CONFIG_VIDEO_TVAUDIO=m
-CONFIG_VIDEO_TDA7432=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TDA9875=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS5345=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_M52790=m
-CONFIG_VIDEO_TLV320AIC23B=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_VP27SMPX=m
-
-#
-# RDS decoders
-#
-CONFIG_VIDEO_SAA6588=m
-
-#
-# Video decoders
-#
-CONFIG_VIDEO_ADV7180=m
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_TCM825X=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_SAA717X=m
-CONFIG_VIDEO_SAA7191=m
-CONFIG_VIDEO_TVP514X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_VPX3220=m
-
-#
-# Video and audio decoders
-#
-CONFIG_VIDEO_CX25840=m
-
-#
-# MPEG video encoders
-#
-CONFIG_VIDEO_CX2341X=m
-
-#
-# Video encoders
-#
-CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-CONFIG_VIDEO_THS7303=m
-CONFIG_VIDEO_ADV7343=m
-
-#
-# Video improvement chips
-#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-CONFIG_VIDEO_VIVI=m
-CONFIG_VIDEO_BT848=m
-CONFIG_VIDEO_BT848_DVB=y
-CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_W9966=m
-CONFIG_VIDEO_CPIA=m
-CONFIG_VIDEO_CPIA_PP=m
-CONFIG_VIDEO_CPIA_USB=m
-CONFIG_VIDEO_CPIA2=m
-CONFIG_VIDEO_SAA5246A=m
-CONFIG_VIDEO_SAA5249=m
-CONFIG_VIDEO_STRADIS=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_SAA7164=m
-CONFIG_VIDEO_CAFE_CCIC=m
-CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_MT9M001=m
-CONFIG_SOC_CAMERA_MT9M111=m
-CONFIG_SOC_CAMERA_MT9T031=m
-CONFIG_SOC_CAMERA_MT9T112=m
-CONFIG_SOC_CAMERA_MT9V022=m
-CONFIG_SOC_CAMERA_RJ54N1=m
-CONFIG_SOC_CAMERA_TW9910=m
-CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_SOC_CAMERA_OV772X=m
-CONFIG_SOC_CAMERA_OV9640=m
-CONFIG_V4L_USB_DRIVERS=y
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_GSPCA=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GL860=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SN9C20X_EVDEV=y
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_ZC3XX=m
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_PVRUSB2_DVB=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_USBVIDEO=m
-CONFIG_USB_VICAM=m
-CONFIG_USB_IBMCAM=m
-CONFIG_USB_KONICAWC=m
-CONFIG_USB_QUICKCAM_MESSENGER=m
-CONFIG_USB_ET61X251=m
-CONFIG_VIDEO_OVCAMCHIP=m
-CONFIG_USB_W9968CF=m
-CONFIG_USB_OV511=m
-CONFIG_USB_SE401=m
-CONFIG_USB_SN9C102=m
-CONFIG_USB_STV680=m
-CONFIG_USB_ZC0301=m
-CONFIG_USB_PWC=m
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_GEMTEK_PCI=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_MAESTRO=m
-CONFIG_I2C_SI4713=m
-CONFIG_RADIO_SI4713=m
-CONFIG_USB_DSBR=m
-# CONFIG_RADIO_SI470X is not set
-CONFIG_USB_MR800=m
-CONFIG_RADIO_TEA5764=m
-CONFIG_RADIO_TEF6862=m
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-CONFIG_DVB_CAPTURE_DRIVERS=y
-
-#
-# Supported SAA7146 based PCI Adapters
-#
-CONFIG_TTPCI_EEPROM=m
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
-
-#
-# Supported USB Adapters
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_FRIIO=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_SIANO_MDTV=m
-
-#
-# Siano module components
-#
-CONFIG_SMS_USB_DRV=m
-CONFIG_SMS_SDIO_DRV=m
-
-#
-# Supported FlexCopII (B2C2) Adapters
-#
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
-
-#
-# Supported BT878 Adapters
-#
-CONFIG_DVB_BT8XX=m
-
-#
-# Supported Pluto2 Adapters
-#
-CONFIG_DVB_PLUTO2=m
-
-#
-# Supported SDMC DM1105 Adapters
-#
-CONFIG_DVB_DM1105=m
-
-#
-# Supported FireWire (IEEE 1394) Adapters
-#
-CONFIG_DVB_FIREDTV=m
-# CONFIG_DVB_FIREDTV_FIREWIRE is not set
-CONFIG_DVB_FIREDTV_IEEE1394=y
-CONFIG_DVB_FIREDTV_INPUT=y
-
-#
-# Supported Earthsoft PT1 Adapters
-#
-CONFIG_DVB_PT1=m
-
-#
-# Supported Mantis Adapters
-#
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
-
-#
-# Supported DVB Frontends
-#
-CONFIG_DVB_FE_CUSTOMISE=y
-
-#
-# Customise DVB Frontends
-#
-
-#
-# Multistandard (satellite) frontends
-#
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV6110x=m
-
-#
-# DVB-S (satellite) frontends
-#
-CONFIG_DVB_CX24110=m
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_SI21XX=m
-CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=m
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-CONFIG_DVB_DRX397XD=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_EC100=m
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_OR51211=m
-CONFIG_DVB_OR51132=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3304=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_S5H1411=m
-
-#
-# ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_S921=m
-CONFIG_DVB_DIB8000=m
-
-#
-# Digital terrestrial only tuners/PLL
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-
-#
-# SEC control devices for DVB-S
-#
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_LGS8GL5=m
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-
-#
-# Tools to develop new frontends
-#
-# CONFIG_DVB_DUMMY_FE is not set
-CONFIG_DAB=y
-CONFIG_USB_DABUSB=m
-
-#
-# Graphics support
-#
-CONFIG_AGP=m
-CONFIG_AGP_AMD64=m
-CONFIG_AGP_INTEL=m
-CONFIG_AGP_SIS=m
-CONFIG_AGP_VIA=m
-CONFIG_VGA_ARB=y
-CONFIG_DRM=m
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM_TTM=m
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-# CONFIG_DRM_RADEON_KMS is not set
-CONFIG_DRM_I810=m
-CONFIG_DRM_I830=m
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_KMS=y
-CONFIG_DRM_MGA=m
-CONFIG_DRM_SIS=m
-CONFIG_DRM_VIA=m
-CONFIG_DRM_SAVAGE=m
-CONFIG_VGASTATE=m
-CONFIG_VIDEO_OUTPUT_CONTROL=m
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
-CONFIG_FB_DDC=m
-CONFIG_FB_BOOT_VESA_SUPPORT=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_DEFERRED_IO=y
-CONFIG_FB_HECUBA=m
-CONFIG_FB_SVGALIB=m
-# CONFIG_FB_MACMODES is not set
-CONFIG_FB_BACKLIGHT=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-
-#
-# Frame buffer hardware drivers
-#
-CONFIG_FB_CIRRUS=m
-CONFIG_FB_PM2=m
-# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
-CONFIG_FB_CYBER2000=m
-CONFIG_FB_ARC=m
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-# CONFIG_FB_UVESA is not set
-CONFIG_FB_VESA=y
-# CONFIG_FB_EFI is not set
-CONFIG_FB_N411=m
-CONFIG_FB_HGA=m
-# CONFIG_FB_HGA_ACCEL is not set
-CONFIG_FB_S1D13XXX=m
-CONFIG_FB_NVIDIA=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_NVIDIA_DEBUG is not set
-CONFIG_FB_NVIDIA_BACKLIGHT=y
-CONFIG_FB_RIVA=m
-CONFIG_FB_RIVA_I2C=y
-# CONFIG_FB_RIVA_DEBUG is not set
-CONFIG_FB_RIVA_BACKLIGHT=y
-CONFIG_FB_LE80578=m
-CONFIG_FB_CARILLO_RANCH=m
-CONFIG_FB_MATROX=m
-CONFIG_FB_MATROX_MILLENIUM=y
-CONFIG_FB_MATROX_MYSTIQUE=y
-CONFIG_FB_MATROX_G=y
-CONFIG_FB_MATROX_I2C=m
-CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_RADEON=m
-CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_RADEON_BACKLIGHT=y
-# CONFIG_FB_RADEON_DEBUG is not set
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY128_BACKLIGHT=y
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_ATY_GX=y
-CONFIG_FB_ATY_BACKLIGHT=y
-CONFIG_FB_S3=m
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_SIS=m
-CONFIG_FB_SIS_300=y
-CONFIG_FB_SIS_315=y
-CONFIG_FB_VIA=m
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=m
-# CONFIG_FB_3DFX_ACCEL is not set
-CONFIG_FB_3DFX_I2C=y
-CONFIG_FB_VOODOO1=m
-CONFIG_FB_VT8623=m
-CONFIG_FB_TRIDENT=m
-CONFIG_FB_ARK=m
-CONFIG_FB_PM3=m
-CONFIG_FB_CARMINE=m
-CONFIG_FB_CARMINE_DRAM_EVAL=y
-# CONFIG_CARMINE_DRAM_CUSTOM is not set
-CONFIG_FB_GEODE=y
-CONFIG_FB_GEODE_LX=m
-CONFIG_FB_GEODE_GX=m
-CONFIG_FB_GEODE_GX1=m
-CONFIG_FB_TMIO=m
-CONFIG_FB_TMIO_ACCELL=y
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_FB_METRONOME=m
-CONFIG_FB_MB862XX=m
-CONFIG_FB_MB862XX_PCI_GDC=y
-CONFIG_FB_BROADSHEET=m
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=m
-# CONFIG_LCD_ILI9320 is not set
-CONFIG_LCD_PLATFORM=m
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_GENERIC=m
-CONFIG_BACKLIGHT_PROGEAR=m
-CONFIG_BACKLIGHT_CARILLO_RANCH=m
-CONFIG_BACKLIGHT_MBP_NVIDIA=m
-CONFIG_BACKLIGHT_SAHARA=m
-
-#
-# Display device support
-#
-CONFIG_DISPLAY_SUPPORT=m
-
-#
-# Display hardware drivers
-#
-
-#
-# Console display driver support
-#
-CONFIG_VGA_CONSOLE=y
-CONFIG_VGACON_SOFT_SCROLLBACK=y
-CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
-CONFIG_SOUND=m
-CONFIG_SOUND_OSS_CORE=y
-CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_JACK=y
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCM_OSS_PLUGINS=y
-CONFIG_SND_SEQUENCER_OSS=y
-CONFIG_SND_HRTIMER=m
-CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
-CONFIG_SND_DYNAMIC_MINORS=y
-# CONFIG_SND_SUPPORT_OLD_API is not set
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_VMASTER=y
-CONFIG_SND_DMA_SGBUF=y
-CONFIG_SND_RAWMIDI_SEQ=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-# CONFIG_SND_OPL4_LIB_SEQ is not set
-# CONFIG_SND_SBAWE_SEQ is not set
-CONFIG_SND_EMU10K1_SEQ=m
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_DRIVERS=y
-# CONFIG_SND_PCSP is not set
-CONFIG_SND_DUMMY=m
-CONFIG_SND_VIRMIDI=m
-CONFIG_SND_MTPAV=m
-CONFIG_SND_MTS64=m
-CONFIG_SND_SERIAL_U16550=m
-CONFIG_SND_MPU401=m
-CONFIG_SND_PORTMAN2X4=m
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
-CONFIG_SND_SB_COMMON=m
-CONFIG_SND_SB16_DSP=m
-CONFIG_SND_PCI=y
-CONFIG_SND_AD1889=m
-CONFIG_SND_ALS300=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AW2=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BT87X=m
-# CONFIG_SND_BT87X_OVERCLOCK is not set
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_OXYGEN_LIB=m
-CONFIG_SND_OXYGEN=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CS5530=m
-CONFIG_SND_CS5535AUDIO=m
-CONFIG_SND_CTXFI=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MIA=m
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_INDIGOIOX=m
-CONFIG_SND_INDIGODJX=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_EMU10K1X=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968=m
-CONFIG_SND_FM801=m
-CONFIG_SND_FM801_TEA575X_BOOL=y
-CONFIG_SND_FM801_TEA575X=m
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA_HWDEP=y
-CONFIG_SND_HDA_RECONFIG=y
-# CONFIG_SND_HDA_INPUT_BEEP is not set
-CONFIG_SND_HDA_INPUT_JACK=y
-CONFIG_SND_HDA_PATCH_LOADER=y
-CONFIG_SND_HDA_CODEC_REALTEK=y
-CONFIG_SND_HDA_CODEC_ANALOG=y
-CONFIG_SND_HDA_CODEC_SIGMATEL=y
-CONFIG_SND_HDA_CODEC_VIA=y
-CONFIG_SND_HDA_CODEC_ATIHDMI=y
-CONFIG_SND_HDA_CODEC_NVHDMI=y
-CONFIG_SND_HDA_CODEC_INTELHDMI=y
-CONFIG_SND_HDA_ELD=y
-CONFIG_SND_HDA_CODEC_CIRRUS=y
-CONFIG_SND_HDA_CODEC_CONEXANT=y
-CONFIG_SND_HDA_CODEC_CA0110=y
-CONFIG_SND_HDA_CODEC_CMEDIA=y
-CONFIG_SND_HDA_CODEC_SI3054=y
-CONFIG_SND_HDA_GENERIC=y
-# CONFIG_SND_HDA_POWER_SAVE is not set
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
-CONFIG_SND_HIFIER=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_LX6464ES=m
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-CONFIG_SND_PCXHR=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VIRTUOSO=m
-CONFIG_SND_VX222=m
-CONFIG_SND_YMFPCI=m
-CONFIG_SND_USB=y
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_USX2Y=m
-CONFIG_SND_USB_CAIAQ=m
-CONFIG_SND_USB_CAIAQ_INPUT=y
-CONFIG_SND_USB_US122L=m
-CONFIG_SND_PCMCIA=y
-CONFIG_SND_VXPOCKET=m
-CONFIG_SND_PDAUDIOCF=m
-# CONFIG_SND_SOC is not set
-# CONFIG_SOUND_PRIME is not set
-CONFIG_AC97_BUS=m
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=m
-CONFIG_HIDRAW=y
-
-#
-# USB Input Devices
-#
-CONFIG_USB_HID=m
-CONFIG_HID_PID=y
-CONFIG_USB_HIDDEV=y
-
-#
-# Special HID drivers
-#
-CONFIG_HID_A4TECH=m
-CONFIG_HID_APPLE=m
-CONFIG_HID_BELKIN=m
-CONFIG_HID_CHERRY=m
-CONFIG_HID_CHICONY=m
-CONFIG_HID_CYPRESS=m
-CONFIG_HID_DRAGONRISE=m
-CONFIG_DRAGONRISE_FF=y
-CONFIG_HID_EZKEY=m
-CONFIG_HID_KYE=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_KENSINGTON=m
-CONFIG_HID_LOGITECH=m
-CONFIG_LOGITECH_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_HID_MICROSOFT=m
-CONFIG_HID_MONTEREY=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_PANTHERLORD_FF=y
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_SAMSUNG=m
-CONFIG_HID_SONY=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_GREENASIA=m
-CONFIG_GREENASIA_FF=y
-CONFIG_HID_SMARTJOYPLUS=m
-CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_HID_TOPSEED=m
-CONFIG_HID_THRUSTMASTER=m
-CONFIG_THRUSTMASTER_FF=y
-CONFIG_HID_WACOM=m
-CONFIG_HID_ZEROPLUS=m
-CONFIG_ZEROPLUS_FF=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB=y
-# CONFIG_USB_DEBUG is not set
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEVICEFS=y
-CONFIG_USB_DEVICE_CLASS=y
-# CONFIG_USB_DYNAMIC_MINORS is not set
-CONFIG_USB_SUSPEND=y
-# CONFIG_USB_OTG is not set
-CONFIG_USB_MON=y
-CONFIG_USB_WUSB=m
-CONFIG_USB_WUSB_CBAF=m
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_C67X00_HCD=m
-CONFIG_USB_XHCI_HCD=m
-# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
-CONFIG_USB_EHCI_HCD=m
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_OXU210HP_HCD=m
-CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_ISP1760_HCD=m
-CONFIG_USB_ISP1362_HCD=m
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_SSB=y
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_U132_HCD=m
-CONFIG_USB_SL811_HCD=m
-CONFIG_USB_SL811_CS=m
-CONFIG_USB_R8A66597_HCD=m
-CONFIG_USB_WHCI_HCD=m
-CONFIG_USB_HWA_HCD=m
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_WDM=m
-CONFIG_USB_TMC=m
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_DATAFAB=m
-CONFIG_USB_STORAGE_FREECOM=m
-CONFIG_USB_STORAGE_ISD200=m
-CONFIG_USB_STORAGE_USBAT=m
-CONFIG_USB_STORAGE_SDDR09=m
-CONFIG_USB_STORAGE_SDDR55=m
-CONFIG_USB_STORAGE_JUMPSHOT=m
-CONFIG_USB_STORAGE_ALAUDA=m
-CONFIG_USB_STORAGE_ONETOUCH=m
-CONFIG_USB_STORAGE_KARMA=m
-CONFIG_USB_STORAGE_CYPRESS_ATACB=m
-# CONFIG_USB_LIBUSUAL is not set
-
-#
-# USB Imaging devices
-#
-CONFIG_USB_MDC800=m
-CONFIG_USB_MICROTEK=m
-
-#
-# USB port drivers
-#
-CONFIG_USB_USS720=m
-CONFIG_USB_SERIAL=m
-CONFIG_USB_EZUSB=y
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_FUNSOFT=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MOTOROLA=m
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_HP4X=m
-CONFIG_USB_SERIAL_SAFE=m
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-CONFIG_USB_SERIAL_SIEMENS_MPI=m
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_DEBUG=m
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_EMI62=m
-CONFIG_USB_EMI26=m
-CONFIG_USB_ADUTUX=m
-CONFIG_USB_SEVSEG=m
-CONFIG_USB_RIO500=m
-CONFIG_USB_LEGOTOWER=m
-CONFIG_USB_LCD=m
-CONFIG_USB_BERRY_CHARGE=m
-CONFIG_USB_LED=m
-CONFIG_USB_CYPRESS_CY7C63=m
-CONFIG_USB_CYTHERM=m
-CONFIG_USB_IDMOUSE=m
-CONFIG_USB_FTDI_ELAN=m
-CONFIG_USB_APPLEDISPLAY=m
-CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
-CONFIG_USB_LD=m
-CONFIG_USB_TRANCEVIBRATOR=m
-CONFIG_USB_IOWARRIOR=m
-CONFIG_USB_TEST=m
-CONFIG_USB_ISIGHTFW=m
-CONFIG_USB_VST=m
-CONFIG_USB_ATM=m
-CONFIG_USB_SPEEDTOUCH=m
-CONFIG_USB_CXACRU=m
-CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_XUSBATM=m
-# CONFIG_USB_GADGET is not set
-
-#
-# OTG and related infrastructure
-#
-CONFIG_USB_OTG_UTILS=y
-CONFIG_USB_GPIO_VBUS=m
-CONFIG_NOP_USB_XCEIV=m
-CONFIG_UWB=m
-CONFIG_UWB_HWA=m
-CONFIG_UWB_WHCI=m
-CONFIG_UWB_WLP=m
-CONFIG_UWB_I1480U=m
-CONFIG_UWB_I1480U_WLP=m
-CONFIG_MMC=m
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-
-#
-# MMC/SD/SDIO Card Drivers
-#
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_BOUNCE=y
-CONFIG_SDIO_UART=m
-# CONFIG_MMC_TEST is not set
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_PCI=m
-CONFIG_MMC_RICOH_MMC=m
-CONFIG_MMC_SDHCI_PLTFM=m
-CONFIG_MMC_WBSD=m
-# CONFIG_MMC_AT91 is not set
-# CONFIG_MMC_ATMELMCI is not set
-CONFIG_MMC_TIFM_SD=m
-CONFIG_MMC_SDRICOH_CS=m
-CONFIG_MMC_CB710=m
-CONFIG_MMC_VIA_SDMMC=m
-CONFIG_MEMSTICK=m
-# CONFIG_MEMSTICK_DEBUG is not set
-
-#
-# MemoryStick drivers
-#
-# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-CONFIG_MSPRO_BLOCK=m
-
-#
-# MemoryStick Host Controller Drivers
-#
-CONFIG_MEMSTICK_TIFM_MS=m
-CONFIG_MEMSTICK_JMICRON_38X=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=m
-
-#
-# LED drivers
-#
-CONFIG_LEDS_ALIX2=m
-CONFIG_LEDS_PCA9532=m
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_GPIO_PLATFORM=y
-CONFIG_LEDS_LP3944=m
-CONFIG_LEDS_CLEVO_MAIL=m
-CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_WM8350=m
-CONFIG_LEDS_BD2802=m
-CONFIG_LEDS_INTEL_SS4200=m
-CONFIG_LEDS_LT3593=m
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-CONFIG_LEDS_TRIGGER_GPIO=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-
-#
-# iptables trigger is under Netfilter config (LED target)
-#
-CONFIG_ACCESSIBILITY=y
-CONFIG_A11Y_BRAILLE_CONSOLE=y
-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_USER_MEM=y
-CONFIG_INFINIBAND_ADDR_TRANS=y
-CONFIG_INFINIBAND_MTHCA=m
-CONFIG_INFINIBAND_MTHCA_DEBUG=y
-# CONFIG_INFINIBAND_IPATH is not set
-CONFIG_INFINIBAND_AMSO1100=m
-# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
-# CONFIG_INFINIBAND_CXGB3 is not set
-CONFIG_MLX4_INFINIBAND=m
-CONFIG_INFINIBAND_NES=m
-# CONFIG_INFINIBAND_NES_DEBUG is not set
-CONFIG_INFINIBAND_IPOIB=m
-# CONFIG_INFINIBAND_IPOIB_CM is not set
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_ISER=m
-CONFIG_EDAC=y
-
-#
-# Reporting subsystems
-#
-# CONFIG_EDAC_DEBUG is not set
-CONFIG_EDAC_DECODE_MCE=y
-# CONFIG_EDAC_MM_EDAC is not set
-CONFIG_RTC_LIB=m
-CONFIG_RTC_CLASS=m
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-CONFIG_RTC_DRV_TEST=m
-
-#
-# I2C RTC drivers
-#
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1374=m
-CONFIG_RTC_DRV_DS1672=m
-CONFIG_RTC_DRV_MAX6900=m
-CONFIG_RTC_DRV_RS5C372=m
-CONFIG_RTC_DRV_ISL1208=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_PCF8563=m
-CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_M41T80=m
-CONFIG_RTC_DRV_M41T80_WDT=y
-CONFIG_RTC_DRV_BQ32K=m
-CONFIG_RTC_DRV_S35390A=m
-CONFIG_RTC_DRV_FM3130=m
-CONFIG_RTC_DRV_RX8581=m
-CONFIG_RTC_DRV_RX8025=m
-
-#
-# SPI RTC drivers
-#
-
-#
-# Platform RTC drivers
-#
-CONFIG_RTC_DRV_CMOS=m
-CONFIG_RTC_DRV_DS1286=m
-CONFIG_RTC_DRV_DS1511=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_M48T86=m
-CONFIG_RTC_DRV_M48T35=m
-CONFIG_RTC_DRV_M48T59=m
-CONFIG_RTC_DRV_MSM6242=m
-CONFIG_RTC_DRV_BQ4802=m
-CONFIG_RTC_DRV_RP5C01=m
-CONFIG_RTC_DRV_V3020=m
-CONFIG_RTC_DRV_WM8350=m
-CONFIG_RTC_DRV_PCF50633=m
-CONFIG_RTC_DRV_AB3100=m
-
-#
-# on-CPU RTC drivers
-#
-CONFIG_CS5535_CLOCK_EVENT_SRC=m
-CONFIG_DMADEVICES=y
-
-#
-# DMA Devices
-#
-CONFIG_ASYNC_TX_DISABLE_CHANNEL_SWITCH=y
-CONFIG_INTEL_IOATDMA=m
-CONFIG_DMA_ENGINE=y
-
-#
-# DMA Clients
-#
-CONFIG_NET_DMA=y
-# CONFIG_ASYNC_TX_DMA is not set
-CONFIG_DMATEST=m
-CONFIG_DCA=m
-CONFIG_AUXDISPLAY=y
-# CONFIG_KS0108 is not set
-CONFIG_UIO=m
-CONFIG_UIO_CIF=m
-CONFIG_UIO_PDRV=m
-CONFIG_UIO_PDRV_GENIRQ=m
-CONFIG_UIO_SMX=m
-CONFIG_UIO_AEC=m
-CONFIG_UIO_SERCOS3=m
-CONFIG_UIO_PCI_GENERIC=m
-
-#
-# TI VLYNQ
-#
-CONFIG_STAGING=y
-# CONFIG_STAGING_EXCLUDE_BUILD is not set
-# CONFIG_ET131X is not set
-# CONFIG_SLICOSS is not set
-# CONFIG_VIDEO_GO7007 is not set
-CONFIG_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25821_ALSA=m
-# CONFIG_USB_IP_COMMON is not set
-# CONFIG_W35UND is not set
-# CONFIG_PRISM2_USB is not set
-# CONFIG_ECHO is not set
-# CONFIG_POCH is not set
-# CONFIG_OTUS is not set
-CONFIG_RT2860=m
-CONFIG_RT2870=m
-# CONFIG_COMEDI is not set
-# CONFIG_ASUS_OLED is not set
-# CONFIG_PANEL is not set
-# CONFIG_ALTERA_PCIE_CHDMA is not set
-CONFIG_R8187SE=m
-CONFIG_RTL8192SU=m
-CONFIG_RTL8192U=m
-CONFIG_RTL8192E=m
-# CONFIG_TRANZPORT is not set
-
-#
-# Qualcomm MSM Camera And Video
-#
-
-#
-# Camera Sensor Selection
-#
-CONFIG_INPUT_GPIO=m
-CONFIG_POHMELFS=m
-# CONFIG_POHMELFS_DEBUG is not set
-CONFIG_POHMELFS_CRYPTO=y
-CONFIG_B3DFG=m
-CONFIG_IDE_PHISON=m
-CONFIG_PLAN9AUTH=m
-CONFIG_LINE6_USB=m
-CONFIG_DRM_VMWGFX=m
-CONFIG_DRM_NOUVEAU=m
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_NOUVEAU_DEBUG=y
-
-#
-# I2C encoder or helper chips
-#
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_USB_SERIAL_QUATECH2=m
-CONFIG_USB_SERIAL_QUATECH_USB2=m
-CONFIG_VT6655=m
-CONFIG_VT6656=m
-CONFIG_FB_UDL=m
-# CONFIG_HYPERV is not set
-# CONFIG_VME_BUS is not set
-
-#
-# RAR Register Driver
-#
-CONFIG_RAR_REGISTER=m
-# CONFIG_DX_SEP is not set
-# CONFIG_IIO is not set
-CONFIG_RAMZSWAP=m
-CONFIG_RAMZSWAP_STATS=y
-CONFIG_BATMAN_ADV=m
-# CONFIG_BATMAN_DEBUG is not set
-CONFIG_SAMSUNG_LAPTOP=m
-CONFIG_STRIP=m
-CONFIG_PCMCIA_WAVELAN=m
-CONFIG_PCMCIA_NETWAVE=m
-CONFIG_FB_SM7XX=m
-# CONFIG_FB_SM7XX_ACCEL is not set
-CONFIG_X86_PLATFORM_DEVICES=y
-CONFIG_ACER_WMI=m
-CONFIG_ACERHDF=m
-CONFIG_ASUS_LAPTOP=m
-CONFIG_DELL_LAPTOP=m
-CONFIG_DELL_WMI=m
-CONFIG_FUJITSU_LAPTOP=m
-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
-CONFIG_HP_WMI=m
-CONFIG_MSI_LAPTOP=m
-CONFIG_PANASONIC_LAPTOP=m
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_SONY_LAPTOP=m
-CONFIG_SONYPI_COMPAT=y
-CONFIG_THINKPAD_ACPI=m
-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-CONFIG_INTEL_MENLOW=m
-CONFIG_EEEPC_LAPTOP=m
-CONFIG_ACPI_WMI=m
-CONFIG_MSI_WMI=m
-CONFIG_ACPI_ASUS=m
-CONFIG_TOPSTAR_LAPTOP=m
-CONFIG_ACPI_TOSHIBA=m
-CONFIG_TOSHIBA_BT_RFKILL=m
-CONFIG_ACPI_CMPC=m
-
-#
-# Firmware Drivers
-#
-CONFIG_EDD=m
-CONFIG_EDD_OFF=y
-CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_EFI_VARS=m
-CONFIG_DELL_RBU=m
-CONFIG_DCDBAS=m
-CONFIG_DMIID=y
-CONFIG_ISCSI_IBFT_FIND=y
-CONFIG_ISCSI_IBFT=m
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=m
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-# CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
-CONFIG_EXT3_FS_XATTR=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT4_FS=m
-CONFIG_EXT4_FS_XATTR=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD=m
-# CONFIG_JBD_DEBUG is not set
-CONFIG_JBD2=m
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=m
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_STATISTICS is not set
-CONFIG_FS_POSIX_ACL=y
-CONFIG_XFS_FS=m
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_DEBUG is not set
-CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-# CONFIG_OCFS2_FS_STATS is not set
-CONFIG_OCFS2_DEBUG_MASKLOG=y
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-CONFIG_NILFS2_FS=m
-CONFIG_FILE_LOCKING=y
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY=y
-CONFIG_INOTIFY_USER=y
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
-CONFIG_QUOTACTL=y
-CONFIG_AUTOFS_FS=m
-CONFIG_AUTOFS4_FS=m
-CONFIG_FUSE_FS=m
-CONFIG_CUSE=m
-CONFIG_GENERIC_ACL=y
-
-#
-# Caches
-#
-CONFIG_FSCACHE=m
-# CONFIG_FSCACHE_STATS is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=m
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
-CONFIG_UDF_NLS=y
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_RW=y
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-# CONFIG_HUGETLBFS is not set
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_CONFIGFS_FS=y
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_ADFS_FS=m
-# CONFIG_ADFS_FS_RW is not set
-CONFIG_AFFS_FS=m
-# CONFIG_ECRYPT_FS is not set
-CONFIG_HFS_FS=m
-CONFIG_HFSPLUS_FS=m
-CONFIG_BEFS_FS=m
-# CONFIG_BEFS_DEBUG is not set
-CONFIG_BFS_FS=m
-CONFIG_EFS_FS=m
-CONFIG_JFFS2_FS=m
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-# CONFIG_JFFS2_SUMMARY is not set
-# CONFIG_JFFS2_FS_XATTR is not set
-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-CONFIG_JFFS2_ZLIB=y
-# CONFIG_JFFS2_LZO is not set
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
-CONFIG_UBIFS_FS=m
-CONFIG_UBIFS_FS_XATTR=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-# CONFIG_UBIFS_FS_DEBUG is not set
-CONFIG_CRAMFS=m
-CONFIG_SQUASHFS=m
-CONFIG_SQUASHFS_EMBEDDED=y
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_VXFS_FS=m
-CONFIG_MINIX_FS=m
-CONFIG_OMFS_FS=m
-CONFIG_HPFS_FS=m
-CONFIG_QNX4FS_FS=m
-CONFIG_ROMFS_FS=y
-CONFIG_ROMFS_BACKED_BY_BLOCK=y
-# CONFIG_ROMFS_BACKED_BY_MTD is not set
-# CONFIG_ROMFS_BACKED_BY_BOTH is not set
-CONFIG_ROMFS_ON_BLOCK=y
-CONFIG_SYSV_FS=m
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-# CONFIG_UFS_DEBUG is not set
-CONFIG_EXOFS_FS=m
-# CONFIG_EXOFS_DEBUG is not set
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-# CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V4=y
-# CONFIG_NFS_V4_1 is not set
-CONFIG_NFSD=m
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V3_ACL is not set
-CONFIG_NFSD_V4=y
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-CONFIG_EXPORTFS=m
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
-CONFIG_SUNRPC_GSS=y
-CONFIG_SUNRPC_XPRT_RDMA=m
-CONFIG_RPCSEC_GSS_KRB5=y
-CONFIG_RPCSEC_GSS_SPKM3=m
-CONFIG_SMB_FS=m
-# CONFIG_SMB_NLS_DEFAULT is not set
-CONFIG_CIFS=m
-# CONFIG_CIFS_STATS is not set
-CONFIG_CIFS_WEAK_PW_HASH=y
-# CONFIG_CIFS_UPCALL is not set
-# CONFIG_CIFS_XATTR is not set
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_DFS_UPCALL is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
-CONFIG_NCP_FS=m
-CONFIG_NCPFS_PACKET_SIGNING=y
-CONFIG_NCPFS_IOCTL_LOCKING=y
-CONFIG_NCPFS_STRONG=y
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_NLS=y
-CONFIG_NCPFS_EXTRAS=y
-CONFIG_CODA_FS=m
-CONFIG_AFS_FS=m
-# CONFIG_AFS_DEBUG is not set
-# CONFIG_AFS_FSCACHE is not set
-CONFIG_9P_FS=m
-# CONFIG_9P_FSCACHE is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-CONFIG_OSF_PARTITION=y
-CONFIG_AMIGA_PARTITION=y
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_UNIXWARE_DISKLABEL=y
-# CONFIG_LDM_PARTITION is not set
-CONFIG_SGI_PARTITION=y
-# CONFIG_ULTRIX_PARTITION is not set
-CONFIG_SUN_PARTITION=y
-CONFIG_KARMA_PARTITION=y
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_UTF8=m
-CONFIG_DLM=m
-# CONFIG_DLM_DEBUG is not set
-
-#
-# Kernel hacking
-#
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
-CONFIG_ENABLE_WARN_DEPRECATED=y
-CONFIG_ENABLE_MUST_CHECK=y
-CONFIG_FRAME_WARN=0
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_STRIP_ASM_SYMS=y
-CONFIG_UNUSED_SYMBOLS=y
-CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_CHECK is not set
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_DEBUG_SHIRQ is not set
-CONFIG_DETECT_SOFTLOCKUP=y
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-CONFIG_DETECT_HUNG_TASK=y
-# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
-CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
-CONFIG_SCHED_DEBUG=y
-# CONFIG_SCHEDSTATS is not set
-CONFIG_TIMER_STATS=y
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_RT_MUTEX_TESTER is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-CONFIG_STACKTRACE=y
-# CONFIG_DEBUG_KOBJECT is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_VIRTUAL is not set
-# CONFIG_DEBUG_WRITECOUNT is not set
-CONFIG_DEBUG_MEMORY_INIT=y
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-CONFIG_FRAME_POINTER=y
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_LATENCYTOP is not set
-# CONFIG_SYSCTL_SYSCALL_CHECK is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
-CONFIG_USER_STACKTRACE_SUPPORT=y
-CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FTRACE_NMI_ENTER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
-CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_RING_BUFFER=y
-CONFIG_FTRACE_NMI_ENTER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-# CONFIG_IRQSOFF_TRACER is not set
-CONFIG_SYSPROF_TRACER=y
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
-# CONFIG_BOOT_TRACER is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-# CONFIG_POWER_TRACER is not set
-# CONFIG_KSYM_TRACER is not set
-# CONFIG_STACK_TRACER is not set
-# CONFIG_KMEMTRACE is not set
-# CONFIG_WORKQUEUE_TRACER is not set
-CONFIG_BLK_DEV_IO_TRACE=y
-CONFIG_DYNAMIC_FTRACE=y
-# CONFIG_FUNCTION_PROFILER is not set
-CONFIG_FTRACE_MCOUNT_RECORD=y
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_MMIOTRACE is not set
-CONFIG_RING_BUFFER_BENCHMARK=m
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# CONFIG_DMA_API_DEBUG is not set
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-CONFIG_HAVE_ARCH_KMEMCHECK=y
-CONFIG_STRICT_DEVMEM=y
-CONFIG_X86_VERBOSE_BOOTUP=y
-CONFIG_EARLY_PRINTK=y
-# CONFIG_EARLY_PRINTK_DBGP is not set
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-# CONFIG_X86_PTDUMP is not set
-CONFIG_DEBUG_RODATA=y
-CONFIG_DEBUG_RODATA_TEST=y
-# CONFIG_DEBUG_NX_TEST is not set
-# CONFIG_IOMMU_DEBUG is not set
-# CONFIG_IOMMU_STRESS is not set
-CONFIG_HAVE_MMIOTRACE_SUPPORT=y
-CONFIG_IO_DELAY_TYPE_0X80=0
-CONFIG_IO_DELAY_TYPE_0XED=1
-CONFIG_IO_DELAY_TYPE_UDELAY=2
-CONFIG_IO_DELAY_TYPE_NONE=3
-CONFIG_IO_DELAY_0X80=y
-# CONFIG_IO_DELAY_0XED is not set
-# CONFIG_IO_DELAY_UDELAY is not set
-# CONFIG_IO_DELAY_NONE is not set
-CONFIG_DEFAULT_IO_DELAY_TYPE=0
-# CONFIG_DEBUG_BOOT_PARAMS is not set
-# CONFIG_CPA_DEBUG is not set
-CONFIG_OPTIMIZE_INLINING=y
-# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-CONFIG_KEYS_DEBUG_PROC_KEYS=y
-CONFIG_SECURITY=y
-CONFIG_SECURITYFS=y
-CONFIG_SECURITY_NETWORK=y
-CONFIG_SECURITY_NETWORK_XFRM=y
-# CONFIG_SECURITY_PATH is not set
-# CONFIG_SECURITY_SELINUX is not set
-# CONFIG_SECURITY_TOMOYO is not set
-# CONFIG_IMA is not set
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_SMACK is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_XOR_BLOCKS=y
-CONFIG_ASYNC_CORE=y
-CONFIG_ASYNC_MEMCPY=y
-CONFIG_ASYNC_XOR=y
-CONFIG_ASYNC_PQ=y
-CONFIG_ASYNC_RAID6_RECOV=y
-CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
-CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_FIPS=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=y
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=m
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_PCOMP=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_WORKQUEUE=y
-CONFIG_CRYPTO_CRYPTD=y
-CONFIG_CRYPTO_AUTHENC=y
-CONFIG_CRYPTO_TEST=m
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_SEQIV=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CTR=m
-CONFIG_CRYPTO_CTS=m
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_LRW=y
-CONFIG_CRYPTO_PCBC=y
-CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_FPU=y
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_XCBC=y
-CONFIG_CRYPTO_VMAC=m
-
-#
-# Digest
-#
-CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CRC32C_INTEL=m
-CONFIG_CRYPTO_GHASH=m
-CONFIG_CRYPTO_MD4=y
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_MICHAEL_MIC=y
-CONFIG_CRYPTO_RMD128=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RMD256=m
-CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_TGR192=y
-CONFIG_CRYPTO_WP512=y
-CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_AES_X86_64=y
-CONFIG_CRYPTO_AES_NI_INTEL=y
-CONFIG_CRYPTO_ANUBIS=y
-CONFIG_CRYPTO_ARC4=y
-CONFIG_CRYPTO_BLOWFISH=y
-CONFIG_CRYPTO_CAMELLIA=y
-CONFIG_CRYPTO_CAST5=y
-CONFIG_CRYPTO_CAST6=y
-CONFIG_CRYPTO_DES=y
-CONFIG_CRYPTO_FCRYPT=y
-CONFIG_CRYPTO_KHAZAD=y
-CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_SALSA20_X86_64=m
-CONFIG_CRYPTO_SEED=y
-CONFIG_CRYPTO_SERPENT=y
-CONFIG_CRYPTO_TEA=y
-CONFIG_CRYPTO_TWOFISH=y
-CONFIG_CRYPTO_TWOFISH_COMMON=y
-CONFIG_CRYPTO_TWOFISH_X86_64=y
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_ZLIB=m
-CONFIG_CRYPTO_LZO=m
-
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_PADLOCK=m
-CONFIG_CRYPTO_DEV_PADLOCK_AES=m
-CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
-CONFIG_CRYPTO_DEV_HIFN_795X=m
-CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
-CONFIG_HAVE_KVM=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_KVM_APIC_ARCHITECTURE=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=m
-CONFIG_KVM_INTEL=m
-CONFIG_KVM_AMD=m
-CONFIG_VIRTIO=m
-CONFIG_VIRTIO_RING=m
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_BINARY_PRINTF=y
-
-#
-# Library routines
-#
-CONFIG_BITREVERSE=y
-CONFIG_GENERIC_FIND_FIRST_BIT=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=y
-CONFIG_CRC_T10DIF=m
-CONFIG_CRC_ITU_T=y
-CONFIG_CRC32=y
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZO_COMPRESS=m
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_LZO=y
-CONFIG_REED_SOLOMON=m
-CONFIG_REED_SOLOMON_DEC16=y
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAS_DMA=y
-CONFIG_CHECK_SIGNATURE=y
-CONFIG_NLATTR=y
-CONFIG_LRU_CACHE=m
diff --git a/source/k/config-generic-2.6.37.6 b/source/k/config-generic-2.6.37.6
new file mode 100644
index 00000000..a3b550b6
--- /dev/null
+++ b/source/k/config-generic-2.6.37.6
@@ -0,0 +1,5066 @@
+#
+# Automatically generated make config: don't edit
+# Linux/x86_64 2.6.37.6 Kernel Configuration
+# Sat Apr  9 12:54:40 2011
+#
+CONFIG_64BIT=y
+# CONFIG_X86_32 is not set
+CONFIG_X86_64=y
+CONFIG_X86=y
+CONFIG_INSTRUCTION_DECODER=y
+CONFIG_OUTPUT_FORMAT="elf64-x86-64"
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_MMU=y
+CONFIG_ZONE_DMA=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_DEFAULT_IDLE=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ZONE_DMA32=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_AUDIT_ARCH=y
+CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_X86_64_SMP=y
+CONFIG_X86_HT=y
+CONFIG_X86_TRAMPOLINE=y
+CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
+# CONFIG_KTIME_SCALAR is not set
+CONFIG_ARCH_CPU_PROBE_RELEASE=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_CONSTRUCTORS=y
+CONFIG_HAVE_IRQ_WORK=y
+CONFIG_IRQ_WORK=y
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_CROSS_COMPILE=""
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_LZO=y
+# CONFIG_KERNEL_GZIP is not set
+# CONFIG_KERNEL_BZIP2 is not set
+CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_LZO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_AUDIT=y
+CONFIG_AUDITSYSCALL=y
+CONFIG_AUDIT_WATCH=y
+CONFIG_AUDIT_TREE=y
+CONFIG_HAVE_GENERIC_HARDIRQS=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
+# CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED is not set
+CONFIG_HAVE_SPARSE_IRQ=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_PENDING_IRQ=y
+# CONFIG_AUTO_IRQ_AFFINITY is not set
+# CONFIG_IRQ_PER_CPU is not set
+# CONFIG_HARDIRQS_SW_RESEND is not set
+# CONFIG_SPARSE_IRQ is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_PREEMPT_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_RCU_FAST_NO_HZ is not set
+# CONFIG_TREE_RCU_TRACE is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=15
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+CONFIG_CGROUPS=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_CGROUP_NS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_RESOURCE_COUNTERS=y
+CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_RT_GROUP_SCHED=y
+CONFIG_BLK_CGROUP=y
+# CONFIG_DEBUG_BLK_CGROUP is not set
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_MM_OWNER=y
+# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_LZO=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_HAVE_PERF_EVENTS=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_PERF_COUNTERS is not set
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_PCI_QUIRKS=y
+CONFIG_SLUB_DEBUG=y
+CONFIG_COMPAT_BRK=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+CONFIG_OPROFILE=m
+# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+# CONFIG_JUMP_LABEL is not set
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_STOP_MACHINE=y
+CONFIG_BLOCK=y
+CONFIG_BLK_DEV_BSG=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
+CONFIG_BLK_DEV_THROTTLING=y
+CONFIG_BLOCK_COMPAT=y
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_CFQ_GROUP_IOSCHED=y
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_PADATA=y
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_FREEZER=y
+
+#
+# Processor type and features
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_SMP=y
+CONFIG_X86_MPPARSE=y
+# CONFIG_X86_EXTENDED_PLATFORM is not set
+CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+# CONFIG_PARAVIRT_GUEST is not set
+CONFIG_NO_BOOTMEM=y
+CONFIG_MEMTEST=y
+# CONFIG_MK8 is not set
+# CONFIG_MPSC is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
+CONFIG_GENERIC_CPU=y
+CONFIG_X86_CPU=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_CMPXCHG=y
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_XADD=y
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_TSC=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=64
+CONFIG_X86_DEBUGCTLMSR=y
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_DMI=y
+CONFIG_GART_IOMMU=y
+# CONFIG_CALGARY_IOMMU is not set
+# CONFIG_AMD_IOMMU is not set
+CONFIG_SWIOTLB=y
+CONFIG_IOMMU_HELPER=y
+# CONFIG_IOMMU_API is not set
+# CONFIG_MAXSMP is not set
+CONFIG_NR_CPUS=32
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT is not set
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_MCE=y
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_AMD=y
+CONFIG_X86_MCE_THRESHOLD=y
+CONFIG_X86_MCE_INJECT=m
+CONFIG_X86_THERMAL_VECTOR=y
+CONFIG_I8K=m
+CONFIG_MICROCODE=m
+CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_AMD=y
+CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=m
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_DIRECT_GBPAGES=y
+# CONFIG_NUMA is not set
+CONFIG_ARCH_PROC_KCORE_TEXT=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_MEMORY_PROBE=y
+CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_HAVE_MEMORY_PRESENT=y
+CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
+CONFIG_SPARSEMEM_VMEMMAP=y
+CONFIG_HAVE_MEMBLOCK=y
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_SPARSE=y
+CONFIG_MEMORY_HOTREMOVE=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_MIGRATION=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_MMU_NOTIFIER=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=98304
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+# CONFIG_MEMORY_FAILURE is not set
+# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
+CONFIG_X86_RESERVE_LOW=64
+CONFIG_MTRR=y
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
+CONFIG_X86_PAT=y
+CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_EFI=y
+CONFIG_SECCOMP=y
+CONFIG_CC_STACKPROTECTOR=y
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
+CONFIG_HZ_1000=y
+CONFIG_HZ=1000
+CONFIG_SCHED_HRTICK=y
+# CONFIG_KEXEC is not set
+# CONFIG_CRASH_DUMP is not set
+CONFIG_PHYSICAL_START=0x1000000
+# CONFIG_RELOCATABLE is not set
+CONFIG_PHYSICAL_ALIGN=0x1000000
+CONFIG_HOTPLUG_CPU=y
+CONFIG_COMPAT_VDSO=y
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+
+#
+# Power management and ACPI options
+#
+CONFIG_ARCH_HIBERNATION_HEADER=y
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_SLEEP_SMP=y
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND_NVS=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+CONFIG_HIBERNATION=y
+CONFIG_PM_STD_PARTITION="\"\""
+CONFIG_PM_RUNTIME=y
+CONFIG_PM_OPS=y
+CONFIG_ACPI=y
+CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_PROCFS=y
+CONFIG_ACPI_PROCFS_POWER=y
+CONFIG_ACPI_POWER_METER=m
+CONFIG_ACPI_EC_DEBUGFS=m
+CONFIG_ACPI_PROC_EVENT=y
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=m
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_PROCESSOR=m
+CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
+CONFIG_ACPI_THERMAL=m
+# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_BLACKLIST_YEAR=0
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_PCI_SLOT=m
+CONFIG_X86_PM_TIMER=y
+CONFIG_ACPI_CONTAINER=m
+CONFIG_ACPI_HOTPLUG_MEMORY=m
+CONFIG_ACPI_SBS=m
+CONFIG_ACPI_HED=m
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=m
+CONFIG_ACPI_APEI_EINJ=m
+CONFIG_ACPI_APEI_ERST_DEBUG=m
+CONFIG_SFI=y
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=m
+# CONFIG_CPU_FREQ_DEBUG is not set
+CONFIG_CPU_FREQ_STAT=m
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=m
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+
+#
+# CPUFreq processor drivers
+#
+CONFIG_X86_PCC_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_SPEEDSTEP_CENTRINO=m
+CONFIG_X86_P4_CLOCKMOD=m
+
+#
+# shared options
+#
+CONFIG_X86_SPEEDSTEP_LIB=m
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_INTEL_IDLE=y
+
+#
+# Memory power savings
+#
+CONFIG_I7300_IDLE_IOAT_CHANNEL=y
+CONFIG_I7300_IDLE=m
+
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_DOMAINS=y
+# CONFIG_PCI_CNB20LE_QUIRK is not set
+# CONFIG_DMAR is not set
+# CONFIG_INTR_REMAP is not set
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=m
+CONFIG_PCIEAER=y
+# CONFIG_PCIE_ECRC is not set
+CONFIG_PCIEAER_INJECT=m
+CONFIG_PCIEASPM=y
+# CONFIG_PCIEASPM_DEBUG is not set
+CONFIG_PCIE_PME=y
+CONFIG_ARCH_SUPPORTS_MSI=y
+CONFIG_PCI_MSI=y
+# CONFIG_PCI_DEBUG is not set
+CONFIG_PCI_STUB=m
+CONFIG_HT_IRQ=y
+# CONFIG_PCI_IOV is not set
+CONFIG_PCI_IOAPIC=y
+CONFIG_ISA_DMA_API=y
+CONFIG_AMD_NB=y
+CONFIG_PCCARD=m
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_PCCARD_NONSTATIC=y
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_FAKE=m
+CONFIG_HOTPLUG_PCI_ACPI=m
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
+# CONFIG_HOTPLUG_PCI_CPCI is not set
+CONFIG_HOTPLUG_PCI_SHPC=m
+
+#
+# Executable file formats / Emulations
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_COMPAT_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_HAVE_AOUT is not set
+CONFIG_BINFMT_MISC=m
+CONFIG_IA32_EMULATION=y
+# CONFIG_IA32_AOUT is not set
+CONFIG_COMPAT=y
+CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
+CONFIG_SYSVIPC_COMPAT=y
+CONFIG_HAVE_TEXT_POKE_SMP=y
+CONFIG_NET=y
+CONFIG_COMPAT_NETLINK_MESSAGES=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=y
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+# CONFIG_NET_KEY_MIGRATE is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_INET_LRO=y
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=m
+CONFIG_IPV6_PRIVACY=y
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_SIT_6RD is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_NETLABEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+# CONFIG_NF_CONNTRACK_EVENTS is not set
+CONFIG_NF_CT_PROTO_DCCP=m
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_TPROXY=m
+CONFIG_NETFILTER_XTABLES=m
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_VS=m
+# CONFIG_IP_VS_IPV6 is not set
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_NFCT=y
+CONFIG_IP_VS_PE_SIP=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_DCCP=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_QUEUE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+
+#
+# DECnet: Netfilter Configuration
+#
+# CONFIG_DECNET_NF_GRABULATOR is not set
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_ULOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+# CONFIG_IP_DCCP_CCID3 is not set
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_MSG is not set
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_HMAC_NONE is not set
+# CONFIG_SCTP_HMAC_SHA1 is not set
+CONFIG_SCTP_HMAC_MD5=y
+CONFIG_RDS=m
+CONFIG_RDS_RDMA=m
+CONFIG_RDS_TCP=m
+# CONFIG_RDS_DEBUG is not set
+CONFIG_TIPC=m
+# CONFIG_TIPC_ADVANCED is not set
+# CONFIG_TIPC_DEBUG is not set
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_GARP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+# CONFIG_NET_DSA is not set
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_DECNET=m
+# CONFIG_DECNET_ROUTER is not set
+CONFIG_LLC=m
+CONFIG_LLC2=m
+CONFIG_IPX=m
+# CONFIG_IPX_INTERN is not set
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_IPDDP_DECAP=y
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+CONFIG_WAN_ROUTER=m
+# CONFIG_PHONET is not set
+CONFIG_IEEE802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_INGRESS=m
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_ROUTE=y
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=y
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=y
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+# CONFIG_NET_CLS_IND is not set
+CONFIG_NET_SCH_FIFO=y
+# CONFIG_DCB is not set
+CONFIG_DNS_RESOLVER=y
+CONFIG_RPS=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NET_DROP_MONITOR is not set
+CONFIG_HAMRADIO=y
+
+#
+# Packet Radio protocols
+#
+CONFIG_AX25=m
+# CONFIG_AX25_DAMA_SLAVE is not set
+CONFIG_NETROM=m
+CONFIG_ROSE=m
+
+#
+# AX.25 network device drivers
+#
+CONFIG_MKISS=m
+CONFIG_6PACK=m
+CONFIG_BPQETHER=m
+CONFIG_BAYCOM_SER_FDX=m
+CONFIG_BAYCOM_SER_HDX=m
+CONFIG_BAYCOM_PAR=m
+CONFIG_YAM=m
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+
+#
+# CAN Device Drivers
+#
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_DEV=m
+# CONFIG_CAN_CALC_BITTIMING is not set
+CONFIG_CAN_JANZ_ICAN3=m
+CONFIG_PCH_CAN=m
+CONFIG_CAN_SJA1000=m
+CONFIG_CAN_SJA1000_PLATFORM=m
+CONFIG_CAN_EMS_PCI=m
+CONFIG_CAN_KVASER_PCI=m
+CONFIG_CAN_PLX_PCI=m
+
+#
+# CAN USB interfaces
+#
+CONFIG_CAN_EMS_USB=m
+CONFIG_CAN_ESD_USB2=m
+# CONFIG_CAN_DEBUG_DEVICES is not set
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+# CONFIG_IRDA_ULTRA is not set
+
+#
+# IrDA options
+#
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+# CONFIG_IRDA_DEBUG is not set
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+CONFIG_IRTTY_SIR=m
+
+#
+# Dongle support
+#
+CONFIG_DONGLE=y
+CONFIG_ESI_DONGLE=m
+CONFIG_ACTISYS_DONGLE=m
+CONFIG_TEKRAM_DONGLE=m
+CONFIG_TOIM3232_DONGLE=m
+CONFIG_LITELINK_DONGLE=m
+CONFIG_MA600_DONGLE=m
+CONFIG_GIRBIL_DONGLE=m
+CONFIG_MCP2120_DONGLE=m
+CONFIG_OLD_BELKIN_DONGLE=m
+CONFIG_ACT200L_DONGLE=m
+CONFIG_KINGSUN_DONGLE=m
+CONFIG_KSDAZZLE_DONGLE=m
+CONFIG_KS959_DONGLE=m
+
+#
+# FIR device drivers
+#
+CONFIG_USB_IRDA=m
+CONFIG_SIGMATEL_FIR=m
+CONFIG_NSC_FIR=m
+CONFIG_WINBOND_FIR=m
+CONFIG_SMC_IRCC_FIR=m
+CONFIG_ALI_FIR=m
+CONFIG_VLSI_FIR=m
+CONFIG_VIA_FIR=m
+CONFIG_MCS_FIR=m
+CONFIG_BT=m
+CONFIG_BT_L2CAP=m
+CONFIG_BT_SCO=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIBTUART=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_AF_RXRPC=m
+# CONFIG_AF_RXRPC_DEBUG is not set
+CONFIG_RXKAD=m
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_REG_DEBUG is not set
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+# CONFIG_CFG80211_INTERNAL_REGDB is not set
+CONFIG_CFG80211_WEXT=y
+CONFIG_WIRELESS_EXT_SYSFS=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_MINSTREL_HT=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+CONFIG_NET_9P_RDMA=m
+# CONFIG_NET_9P_DEBUG is not set
+# CONFIG_CAIF is not set
+CONFIG_CEPH_LIB=m
+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+CONFIG_CONNECTOR=m
+CONFIG_MTD=m
+# CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_TESTS=m
+CONFIG_MTD_CONCAT=m
+CONFIG_MTD_PARTITIONS=y
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+CONFIG_MTD_AR7_PARTS=m
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=m
+CONFIG_HAVE_MTD_OTP=y
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+CONFIG_FTL=m
+CONFIG_NFTL=m
+CONFIG_NFTL_RW=y
+CONFIG_INFTL=m
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
+CONFIG_SM_FTL=m
+CONFIG_MTD_OOPS=m
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_GEN_PROBE=m
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+CONFIG_MTD_MAP_BANK_WIDTH_8=y
+CONFIG_MTD_MAP_BANK_WIDTH_16=y
+CONFIG_MTD_MAP_BANK_WIDTH_32=y
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+CONFIG_MTD_CFI_I4=y
+CONFIG_MTD_CFI_I8=y
+CONFIG_MTD_OTP=y
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_CFI_UTIL=m
+CONFIG_MTD_RAM=m
+CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_PHYSMAP=m
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+CONFIG_MTD_SC520CDP=m
+CONFIG_MTD_NETSC520=m
+CONFIG_MTD_TS5500=m
+CONFIG_MTD_SBC_GXX=m
+CONFIG_MTD_AMD76XROM=m
+CONFIG_MTD_ICHXROM=m
+CONFIG_MTD_ESB2ROM=m
+CONFIG_MTD_CK804XROM=m
+CONFIG_MTD_SCB2_FLASH=m
+CONFIG_MTD_NETtel=m
+CONFIG_MTD_L440GX=m
+CONFIG_MTD_PCI=m
+CONFIG_MTD_PCMCIA=m
+# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
+CONFIG_MTD_GPIO_ADDR=m
+CONFIG_MTD_INTEL_VR_NOR=m
+CONFIG_MTD_PLATRAM=m
+
+#
+# Self-contained MTD device drivers
+#
+CONFIG_MTD_PMC551=m
+CONFIG_MTD_PMC551_BUGFIX=y
+# CONFIG_MTD_PMC551_DEBUG is not set
+CONFIG_MTD_SLRAM=m
+CONFIG_MTD_PHRAM=m
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=4096
+CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTD_BLOCK2MTD=m
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+CONFIG_MTD_DOC2001PLUS=m
+CONFIG_MTD_DOCPROBE=m
+CONFIG_MTD_DOCECC=m
+CONFIG_MTD_DOCPROBE_ADVANCED=y
+CONFIG_MTD_DOCPROBE_ADDRESS=0x0000
+CONFIG_MTD_DOCPROBE_HIGH=y
+CONFIG_MTD_DOCPROBE_55AA=y
+CONFIG_MTD_NAND_ECC=m
+CONFIG_MTD_NAND_ECC_SMC=y
+CONFIG_MTD_NAND=m
+CONFIG_MTD_NAND_VERIFY_WRITE=y
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_MUSEUM_IDS=y
+CONFIG_MTD_NAND_DENALI=m
+CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xFF108018
+CONFIG_MTD_NAND_IDS=m
+CONFIG_MTD_NAND_RICOH=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y
+CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y
+CONFIG_MTD_NAND_CAFE=m
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_PLATFORM=m
+CONFIG_MTD_ALAUDA=m
+CONFIG_MTD_ONENAND=m
+CONFIG_MTD_ONENAND_VERIFY_WRITE=y
+CONFIG_MTD_ONENAND_GENERIC=m
+CONFIG_MTD_ONENAND_OTP=y
+CONFIG_MTD_ONENAND_2X_PROGRAM=y
+CONFIG_MTD_ONENAND_SIM=m
+
+#
+# LPDDR flash memory drivers
+#
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_RESERVE=1
+CONFIG_MTD_UBI_GLUEBI=m
+
+#
+# UBI debugging options
+#
+# CONFIG_MTD_UBI_DEBUG is not set
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
+CONFIG_PARPORT_PC_PCMCIA=m
+# CONFIG_PARPORT_GSC is not set
+CONFIG_PARPORT_AX88796=m
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_PNP=y
+CONFIG_PNP_DEBUG_MESSAGES=y
+
+#
+# Protocols
+#
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_FD=y
+CONFIG_PARIDE=m
+
+#
+# Parallel IDE high-level drivers
+#
+CONFIG_PARIDE_PD=m
+CONFIG_PARIDE_PCD=m
+CONFIG_PARIDE_PF=m
+CONFIG_PARIDE_PT=m
+CONFIG_PARIDE_PG=m
+
+#
+# Parallel IDE protocol modules
+#
+CONFIG_PARIDE_ATEN=m
+CONFIG_PARIDE_BPCK=m
+CONFIG_PARIDE_COMM=m
+CONFIG_PARIDE_DSTR=m
+CONFIG_PARIDE_FIT2=m
+CONFIG_PARIDE_FIT3=m
+CONFIG_PARIDE_EPAT=m
+CONFIG_PARIDE_EPATC8=y
+CONFIG_PARIDE_EPIA=m
+CONFIG_PARIDE_FRIQ=m
+CONFIG_PARIDE_FRPW=m
+CONFIG_PARIDE_KBIC=m
+CONFIG_PARIDE_KTTI=m
+CONFIG_PARIDE_ON20=m
+CONFIG_PARIDE_ON26=m
+CONFIG_BLK_CPQ_DA=m
+CONFIG_BLK_CPQ_CISS_DA=m
+CONFIG_CISS_SCSI_TAPE=y
+CONFIG_BLK_DEV_DAC960=m
+CONFIG_BLK_DEV_UMEM=m
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_OSD=m
+CONFIG_BLK_DEV_SX8=m
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=16384
+# CONFIG_BLK_DEV_XIP is not set
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_ATA_OVER_ETH=m
+CONFIG_VIRTIO_BLK=m
+# CONFIG_BLK_DEV_HD is not set
+CONFIG_BLK_DEV_RBD=m
+CONFIG_MISC_DEVICES=y
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+CONFIG_IBM_ASM=m
+CONFIG_PHANTOM=m
+CONFIG_SGI_IOC4=m
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+CONFIG_ICS932S401=m
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_CS5535_MFGPT=m
+CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
+CONFIG_CS5535_CLOCK_EVENT_SRC=m
+CONFIG_HP_ILO=m
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1780=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
+CONFIG_VMWARE_BALLOON=m
+CONFIG_BMP085=m
+CONFIG_PCH_PHUB=m
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+CONFIG_IWMC3200TOP=m
+# CONFIG_IWMC3200TOP_DEBUG is not set
+# CONFIG_IWMC3200TOP_DEBUGFS is not set
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=y
+CONFIG_RAID_ATTRS=y
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_TGT=y
+CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=m
+CONFIG_CHR_DEV_OSST=m
+CONFIG_BLK_DEV_SR=y
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=y
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_FC_TGT_ATTRS=y
+CONFIG_SCSI_ISCSI_ATTRS=y
+CONFIG_SCSI_SAS_ATTRS=y
+CONFIG_SCSI_SAS_LIBSAS=y
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
+CONFIG_SCSI_SRP_ATTRS=m
+CONFIG_SCSI_SRP_TGT_ATTRS=y
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_ISCSI_BOOT_SYSFS=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_BE2ISCSI=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_HPSA=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=4
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
+CONFIG_AIC7XXX_DEBUG_MASK=0
+# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
+CONFIG_SCSI_AIC7XXX_OLD=m
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_CMDS_PER_DEVICE=4
+CONFIG_AIC79XX_RESET_DELAY_MS=15000
+# CONFIG_AIC79XX_DEBUG_ENABLE is not set
+CONFIG_AIC79XX_DEBUG_MASK=0
+# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_MVSAS=m
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_ADVANSYS=m
+CONFIG_SCSI_ARCMSR=m
+# CONFIG_SCSI_ARCMSR_AER is not set
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+CONFIG_MEGARAID_LEGACY=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+# CONFIG_SCSI_MPT2SAS_LOGGING is not set
+CONFIG_SCSI_HPTIOP=m
+CONFIG_SCSI_BUSLOGIC=m
+CONFIG_VMWARE_PVSCSI=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_FCOE_FNIC=m
+CONFIG_SCSI_DMX3191D=m
+CONFIG_SCSI_EATA=m
+# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
+# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
+CONFIG_SCSI_EATA_MAX_TAGS=16
+CONFIG_SCSI_FUTURE_DOMAIN=m
+CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
+CONFIG_SCSI_PPA=m
+CONFIG_SCSI_IMM=m
+# CONFIG_SCSI_IZIP_EPP16 is not set
+# CONFIG_SCSI_IZIP_SLOW_CTR is not set
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_SCSI_IPR=m
+# CONFIG_SCSI_IPR_TRACE is not set
+# CONFIG_SCSI_IPR_DUMP is not set
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLA_FC=m
+CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_SCSI_LPFC=m
+# CONFIG_SCSI_LPFC_DEBUG_FS is not set
+CONFIG_SCSI_DC395x=m
+CONFIG_SCSI_DC390T=m
+CONFIG_SCSI_DEBUG=m
+CONFIG_SCSI_PMCRAID=m
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_SRP=m
+CONFIG_SCSI_BFA_FC=m
+CONFIG_SCSI_LOWLEVEL_PCMCIA=y
+CONFIG_PCMCIA_AHA152X=m
+CONFIG_PCMCIA_FDOMAIN=m
+CONFIG_PCMCIA_QLOGIC=m
+CONFIG_PCMCIA_SYM53C500=m
+CONFIG_SCSI_DH=m
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+CONFIG_SCSI_OSD_INITIATOR=m
+CONFIG_SCSI_OSD_ULD=m
+CONFIG_SCSI_OSD_DPRINT_SENSE=1
+# CONFIG_SCSI_OSD_DEBUG is not set
+CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_ACPI=y
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=y
+CONFIG_SATA_AHCI_PLATFORM=y
+CONFIG_SATA_INIC162X=y
+CONFIG_SATA_SIL24=y
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=y
+CONFIG_SATA_QSTOR=y
+CONFIG_SATA_SX4=y
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=y
+CONFIG_SATA_MV=y
+CONFIG_SATA_NV=y
+CONFIG_SATA_PROMISE=y
+CONFIG_SATA_SIL=y
+CONFIG_SATA_SIS=y
+CONFIG_SATA_SVW=y
+CONFIG_SATA_ULI=y
+CONFIG_SATA_VIA=y
+CONFIG_SATA_VITESSE=y
+
+#
+# PATA SFF controllers with BMDMA
+#
+CONFIG_PATA_ALI=y
+CONFIG_PATA_AMD=y
+CONFIG_PATA_ARTOP=y
+CONFIG_PATA_ATIIXP=y
+CONFIG_PATA_ATP867X=y
+CONFIG_PATA_CMD64X=y
+CONFIG_PATA_CS5520=y
+CONFIG_PATA_CS5530=y
+CONFIG_PATA_CS5536=y
+CONFIG_PATA_CYPRESS=y
+CONFIG_PATA_EFAR=y
+CONFIG_PATA_HPT366=y
+CONFIG_PATA_HPT37X=y
+CONFIG_PATA_HPT3X2N=y
+CONFIG_PATA_HPT3X3=y
+CONFIG_PATA_HPT3X3_DMA=y
+CONFIG_PATA_IT8213=y
+CONFIG_PATA_IT821X=y
+CONFIG_PATA_JMICRON=y
+CONFIG_PATA_MARVELL=y
+CONFIG_PATA_NETCELL=y
+CONFIG_PATA_NINJA32=y
+CONFIG_PATA_NS87415=y
+CONFIG_PATA_OLDPIIX=y
+CONFIG_PATA_OPTIDMA=y
+CONFIG_PATA_PDC2027X=y
+CONFIG_PATA_PDC_OLD=y
+CONFIG_PATA_RADISYS=y
+CONFIG_PATA_RDC=y
+CONFIG_PATA_SC1200=y
+CONFIG_PATA_SCH=y
+CONFIG_PATA_SERVERWORKS=y
+CONFIG_PATA_SIL680=y
+CONFIG_PATA_SIS=y
+CONFIG_PATA_TOSHIBA=m
+CONFIG_PATA_TRIFLEX=y
+CONFIG_PATA_VIA=y
+CONFIG_PATA_WINBOND=y
+
+#
+# PIO-only SFF controllers
+#
+CONFIG_PATA_CMD640_PCI=y
+CONFIG_PATA_MPIIX=y
+CONFIG_PATA_NS87410=y
+CONFIG_PATA_OPTI=y
+CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_RZ1000=y
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_PATA_ACPI=y
+CONFIG_ATA_GENERIC=y
+CONFIG_PATA_LEGACY=y
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_AUTODETECT=y
+CONFIG_MD_LINEAR=y
+CONFIG_MD_RAID0=y
+CONFIG_MD_RAID1=y
+CONFIG_MD_RAID10=y
+CONFIG_MD_RAID456=y
+# CONFIG_MULTICORE_RAID456 is not set
+CONFIG_MD_MULTIPATH=y
+CONFIG_MD_FAULTY=m
+CONFIG_BLK_DEV_DM=y
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_CRYPT=y
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_MIRROR=y
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+# CONFIG_DM_DELAY is not set
+CONFIG_DM_UEVENT=y
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+CONFIG_FUSION_LAN=m
+# CONFIG_FUSION_LOGGING is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_OHCI_DEBUG=y
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_FIREWIRE_NOSY=m
+CONFIG_I2O=m
+CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
+CONFIG_I2O_EXT_ADAPTEC=y
+CONFIG_I2O_EXT_ADAPTEC_DMA64=y
+CONFIG_I2O_CONFIG=m
+# CONFIG_I2O_CONFIG_OLD_IOCTL is not set
+CONFIG_I2O_BUS=m
+CONFIG_I2O_BLOCK=m
+CONFIG_I2O_SCSI=m
+CONFIG_I2O_PROC=m
+CONFIG_MACINTOSH_DRIVERS=y
+CONFIG_MAC_EMUMOUSEBTN=y
+CONFIG_NETDEVICES=y
+CONFIG_IFB=m
+CONFIG_DUMMY=m
+CONFIG_BONDING=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_EQUALIZER=m
+CONFIG_TUN=m
+CONFIG_VETH=m
+CONFIG_NET_SB1000=m
+CONFIG_ARCNET=m
+CONFIG_ARCNET_1201=m
+CONFIG_ARCNET_1051=m
+CONFIG_ARCNET_RAW=m
+CONFIG_ARCNET_CAP=m
+CONFIG_ARCNET_COM90xx=m
+CONFIG_ARCNET_COM90xxIO=m
+CONFIG_ARCNET_RIM_I=m
+CONFIG_ARCNET_COM20020=m
+CONFIG_ARCNET_COM20020_PCI=m
+CONFIG_MII=m
+CONFIG_PHYLIB=m
+
+#
+# MII PHY device drivers
+#
+CONFIG_MARVELL_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM63XX_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_STE10XP=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MICREL_PHY=m
+CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_GPIO=m
+CONFIG_NET_ETHERNET=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_ETHOC=m
+CONFIG_DNET=m
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+CONFIG_TULIP_MMIO=y
+# CONFIG_TULIP_NAPI is not set
+CONFIG_DE4X5=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_PCMCIA_XIRCOM=m
+CONFIG_HP100=m
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
+CONFIG_NET_PCI=y
+CONFIG_PCNET32=m
+CONFIG_AMD8111_ETH=m
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_KSZ884X_PCI=m
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_FORCEDETH=m
+CONFIG_E100=m
+CONFIG_FEALNX=m
+CONFIG_NATSEMI=m
+CONFIG_NE2K_PCI=m
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+CONFIG_8139TOO_PIO=y
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R6040=m
+CONFIG_SIS900=m
+CONFIG_EPIC100=m
+CONFIG_SMSC9420=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_TLAN=m
+CONFIG_KS8842=m
+CONFIG_KS8851_MLL=m
+CONFIG_VIA_RHINE=m
+CONFIG_VIA_RHINE_MMIO=y
+CONFIG_SC92031=m
+CONFIG_NET_POCKET=y
+CONFIG_ATP=m
+CONFIG_DE600=m
+CONFIG_DE620=m
+CONFIG_ATL2=m
+CONFIG_NETDEV_1000=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_DL2K=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IP1000=m
+CONFIG_IGB=m
+CONFIG_IGB_DCA=y
+CONFIG_IGBVF=m
+CONFIG_NS83820=m
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_R8169=m
+CONFIG_R8169_VLAN=y
+CONFIG_SIS190=m
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_VIA_VELOCITY=m
+CONFIG_TIGON3=m
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_QLA3XXX=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_JME=m
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_DA is not set
+CONFIG_STMMAC_DUAL_MAC=y
+CONFIG_PCH_GBE=m
+CONFIG_NETDEV_10000=y
+CONFIG_MDIO=m
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3_DEPENDS=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4_DEPENDS=y
+CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4VF_DEPENDS=y
+CONFIG_CHELSIO_T4VF=m
+CONFIG_ENIC=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_DCA=y
+CONFIG_IXGBEVF=m
+CONFIG_IXGB=m
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+CONFIG_MYRI10GE=m
+CONFIG_MYRI10GE_DCA=y
+CONFIG_NETXEN_NIC=m
+CONFIG_NIU=m
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_TEHUTI=m
+CONFIG_BNX2X=m
+CONFIG_QLCNIC=m
+CONFIG_QLGE=m
+CONFIG_BNA=m
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_BE2NET=m
+CONFIG_TR=m
+CONFIG_IBMOL=m
+CONFIG_3C359=m
+CONFIG_TMS380TR=m
+CONFIG_TMSPCI=m
+CONFIG_ABYSS=m
+CONFIG_WLAN=y
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_AIRO=m
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_PCMCIA_ATMEL=m
+CONFIG_AT76C50X_USB=m
+CONFIG_AIRO_CS=m
+CONFIG_PCMCIA_WL3501=m
+CONFIG_PRISM54=m
+CONFIG_USB_ZD1201=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_ADM8211=m
+# CONFIG_MAC80211_HWSIM is not set
+CONFIG_MWL8K=m
+CONFIG_ATH_COMMON=m
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K=m
+# CONFIG_ATH9K_DEBUGFS is not set
+CONFIG_ATH9K_RATE_CONTROL=y
+CONFIG_ATH9K_HTC=m
+# CONFIG_ATH9K_HTC_DEBUGFS is not set
+CONFIG_AR9170_USB=m
+CONFIG_AR9170_LEDS=y
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+CONFIG_CARL9170_WPC=y
+CONFIG_B43=m
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_PCMCIA=y
+CONFIG_B43_SDIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+# CONFIG_B43LEGACY_DEBUG is not set
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_IWLWIFI=m
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_DEBUG is not set
+# CONFIG_IWLWIFI_DEVICE_TRACING is not set
+CONFIG_IWLAGN=m
+CONFIG_IWL4965=y
+CONFIG_IWL5000=y
+CONFIG_IWL3945=m
+CONFIG_IWM=m
+# CONFIG_IWM_DEBUG is not set
+# CONFIG_IWM_TRACING is not set
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
+CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_HERMES=m
+# CONFIG_HERMES_PRISM is not set
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_ORINOCO_USB=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_P54_LEDS=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI_PCI=y
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT30XX=y
+CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT30XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RT2800_LIB=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_HT=y
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_WL1251=m
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX=m
+CONFIG_WL1271=m
+CONFIG_WL1271_SDIO=m
+CONFIG_WL12XX_PLATFORM_DATA=y
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+
+#
+# WiMAX Wireless Broadband devices
+#
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_SDIO=m
+# CONFIG_WIMAX_IWMC3200_SDIO is not set
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+
+#
+# USB Network Adapters
+#
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+# CONFIG_USB_EPSON2888 is not set
+# CONFIG_USB_KC2190 is not set
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_NET_PCMCIA=y
+CONFIG_PCMCIA_3C589=m
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_PCMCIA_XIRC2PS=m
+CONFIG_PCMCIA_AXNET=m
+CONFIG_ARCNET_COM20020_CS=m
+CONFIG_PCMCIA_IBMTR=m
+CONFIG_WAN=y
+CONFIG_LANMEDIA=m
+CONFIG_HDLC=m
+CONFIG_HDLC_RAW=m
+CONFIG_HDLC_RAW_ETH=m
+CONFIG_HDLC_CISCO=m
+CONFIG_HDLC_FR=m
+CONFIG_HDLC_PPP=m
+
+#
+# X.25/LAPB support is disabled
+#
+CONFIG_PCI200SYN=m
+CONFIG_WANXL=m
+# CONFIG_PC300TOO is not set
+CONFIG_FARSYNC=m
+CONFIG_DSCC4=m
+# CONFIG_DSCC4_PCISYNC is not set
+# CONFIG_DSCC4_PCI_RST is not set
+CONFIG_DLCI=m
+CONFIG_DLCI_MAX=8
+CONFIG_WAN_ROUTER_DRIVERS=m
+CONFIG_CYCLADES_SYNC=m
+CONFIG_CYCLOMX_X25=y
+CONFIG_SBNI=m
+# CONFIG_SBNI_MULTILINE is not set
+CONFIG_ATM_DRIVERS=y
+CONFIG_ATM_DUMMY=m
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+# CONFIG_ATM_ENI_TUNE_BURST is not set
+CONFIG_ATM_FIRESTREAM=m
+CONFIG_ATM_ZATM=m
+# CONFIG_ATM_ZATM_DEBUG is not set
+CONFIG_ATM_NICSTAR=m
+# CONFIG_ATM_NICSTAR_USE_SUNI is not set
+# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_AMBASSADOR=m
+# CONFIG_ATM_AMBASSADOR_DEBUG is not set
+CONFIG_ATM_HORIZON=m
+# CONFIG_ATM_HORIZON_DEBUG is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+# CONFIG_ATM_FORE200E_USE_TASKLET is not set
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+# CONFIG_ATM_HE_USE_SUNI is not set
+CONFIG_ATM_SOLOS=m
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKEHARD=m
+
+#
+# CAIF transport drivers
+#
+CONFIG_FDDI=y
+CONFIG_DEFXX=m
+# CONFIG_DEFXX_MMIO is not set
+CONFIG_SKFP=m
+CONFIG_HIPPI=y
+CONFIG_ROADRUNNER=m
+# CONFIG_ROADRUNNER_LARGE_RINGS is not set
+CONFIG_PLIP=m
+CONFIG_PPP=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOATM=m
+CONFIG_PPPOL2TP=m
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLHC=m
+CONFIG_SLIP_SMART=y
+# CONFIG_SLIP_MODE_SLIP6 is not set
+CONFIG_NET_FC=y
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+# CONFIG_NETPOLL_TRAP is not set
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_VIRTIO_NET=m
+CONFIG_VMXNET3=m
+CONFIG_ISDN=y
+CONFIG_ISDN_I4L=m
+CONFIG_ISDN_PPP=y
+CONFIG_ISDN_PPP_VJ=y
+CONFIG_ISDN_MPP=y
+CONFIG_IPPP_FILTER=y
+CONFIG_ISDN_PPP_BSDCOMP=m
+CONFIG_ISDN_AUDIO=y
+CONFIG_ISDN_TTY_FAX=y
+
+#
+# ISDN feature submodules
+#
+CONFIG_ISDN_DIVERSION=m
+
+#
+# ISDN4Linux hardware drivers
+#
+
+#
+# Passive cards
+#
+CONFIG_ISDN_DRV_HISAX=m
+
+#
+# D-channel protocol features
+#
+CONFIG_HISAX_EURO=y
+CONFIG_DE_AOC=y
+CONFIG_HISAX_NO_SENDCOMPLETE=y
+CONFIG_HISAX_NO_LLC=y
+CONFIG_HISAX_NO_KEYPAD=y
+CONFIG_HISAX_1TR6=y
+CONFIG_HISAX_NI1=y
+CONFIG_HISAX_MAX_CARDS=8
+
+#
+# HiSax supported cards
+#
+CONFIG_HISAX_16_3=y
+CONFIG_HISAX_TELESPCI=y
+CONFIG_HISAX_S0BOX=y
+CONFIG_HISAX_FRITZPCI=y
+CONFIG_HISAX_AVM_A1_PCMCIA=y
+CONFIG_HISAX_ELSA=y
+CONFIG_HISAX_DIEHLDIVA=y
+CONFIG_HISAX_SEDLBAUER=y
+CONFIG_HISAX_NETJET=y
+CONFIG_HISAX_NETJET_U=y
+CONFIG_HISAX_NICCY=y
+CONFIG_HISAX_BKM_A4T=y
+CONFIG_HISAX_SCT_QUADRO=y
+CONFIG_HISAX_GAZEL=y
+CONFIG_HISAX_HFC_PCI=y
+CONFIG_HISAX_W6692=y
+CONFIG_HISAX_HFC_SX=y
+CONFIG_HISAX_ENTERNOW_PCI=y
+# CONFIG_HISAX_DEBUG is not set
+
+#
+# HiSax PCMCIA card service modules
+#
+CONFIG_HISAX_SEDLBAUER_CS=m
+CONFIG_HISAX_ELSA_CS=m
+CONFIG_HISAX_AVM_A1_CS=m
+CONFIG_HISAX_TELES_CS=m
+
+#
+# HiSax sub driver modules
+#
+CONFIG_HISAX_ST5481=m
+CONFIG_HISAX_HFCUSB=m
+CONFIG_HISAX_HFC4S8S=m
+CONFIG_HISAX_FRITZ_PCIPNP=m
+
+#
+# Active cards
+#
+CONFIG_ISDN_CAPI=m
+CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
+CONFIG_CAPI_TRACE=y
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
+CONFIG_ISDN_CAPI_CAPIFS=m
+CONFIG_ISDN_CAPI_CAPIDRV=m
+
+#
+# CAPI hardware drivers
+#
+CONFIG_CAPI_AVM=y
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
+CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_CAPI_EICON=y
+CONFIG_ISDN_DIVAS=m
+CONFIG_ISDN_DIVAS_BRIPCI=y
+CONFIG_ISDN_DIVAS_PRIPCI=y
+CONFIG_ISDN_DIVAS_DIVACAPI=m
+CONFIG_ISDN_DIVAS_USERIDI=m
+CONFIG_ISDN_DIVAS_MAINT=m
+CONFIG_ISDN_DRV_GIGASET=m
+# CONFIG_GIGASET_CAPI is not set
+CONFIG_GIGASET_I4L=y
+# CONFIG_GIGASET_DUMMYLL is not set
+CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M105=m
+# CONFIG_GIGASET_M101 is not set
+# CONFIG_GIGASET_DEBUG is not set
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
+CONFIG_MISDN=m
+CONFIG_MISDN_DSP=m
+CONFIG_MISDN_L1OIP=m
+
+#
+# mISDN hardware drivers
+#
+CONFIG_MISDN_HFCPCI=m
+CONFIG_MISDN_HFCMULTI=m
+CONFIG_MISDN_HFCUSB=m
+CONFIG_MISDN_AVMFRITZ=m
+CONFIG_MISDN_SPEEDFAX=m
+CONFIG_MISDN_INFINEON=m
+CONFIG_MISDN_W6692=m
+CONFIG_MISDN_NETJET=m
+CONFIG_MISDN_IPAC=m
+CONFIG_MISDN_ISAR=m
+CONFIG_ISDN_HDLC=m
+CONFIG_PHONE=m
+CONFIG_PHONE_IXJ=m
+CONFIG_PHONE_IXJ_PCMCIA=m
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_FF_MEMLESS=y
+CONFIG_INPUT_POLLDEV=m
+CONFIG_INPUT_SPARSEKMAP=m
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT2160=m
+# CONFIG_KEYBOARD_LKKBD is not set
+CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
+CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_MATRIX=m
+CONFIG_KEYBOARD_LM8323=m
+CONFIG_KEYBOARD_MAX7359=m
+CONFIG_KEYBOARD_MCS=m
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_KEYBOARD_OPENCORES=m
+CONFIG_KEYBOARD_STOWAWAY=m
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_ELANTECH is not set
+CONFIG_MOUSE_PS2_SENTELIC=y
+CONFIG_MOUSE_PS2_TOUCHKIT=y
+CONFIG_MOUSE_SERIAL=m
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_VSXXXAA=m
+CONFIG_MOUSE_GPIO=m
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_JOYSTICK_ANALOG=m
+CONFIG_JOYSTICK_A3D=m
+CONFIG_JOYSTICK_ADI=m
+CONFIG_JOYSTICK_COBRA=m
+CONFIG_JOYSTICK_GF2K=m
+CONFIG_JOYSTICK_GRIP=m
+CONFIG_JOYSTICK_GRIP_MP=m
+CONFIG_JOYSTICK_GUILLEMOT=m
+CONFIG_JOYSTICK_INTERACT=m
+CONFIG_JOYSTICK_SIDEWINDER=m
+CONFIG_JOYSTICK_TMDC=m
+CONFIG_JOYSTICK_IFORCE=m
+CONFIG_JOYSTICK_IFORCE_USB=y
+CONFIG_JOYSTICK_IFORCE_232=y
+CONFIG_JOYSTICK_WARRIOR=m
+CONFIG_JOYSTICK_MAGELLAN=m
+CONFIG_JOYSTICK_SPACEORB=m
+CONFIG_JOYSTICK_SPACEBALL=m
+CONFIG_JOYSTICK_STINGER=m
+CONFIG_JOYSTICK_TWIDJOY=m
+CONFIG_JOYSTICK_ZHENHUA=m
+CONFIG_JOYSTICK_DB9=m
+CONFIG_JOYSTICK_GAMECON=m
+CONFIG_JOYSTICK_TURBOGRAFX=m
+CONFIG_JOYSTICK_JOYDUMP=m
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+# CONFIG_JOYSTICK_WALKERA0701 is not set
+CONFIG_INPUT_TABLET=y
+CONFIG_TABLET_USB_ACECAD=m
+CONFIG_TABLET_USB_AIPTEK=m
+CONFIG_TABLET_USB_GTCO=m
+CONFIG_TABLET_USB_HANWANG=m
+CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_USB_WACOM=m
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+CONFIG_TOUCHSCREEN_BU21013=m
+CONFIG_TOUCHSCREEN_CY8CTMG110=m
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_GUNZE=m
+CONFIG_TOUCHSCREEN_ELO=m
+CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TOUCHSCREEN_MCS5000=m
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_MK712=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_QT602240=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_UCB1400=m
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
+CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
+CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
+CONFIG_TOUCHSCREEN_USB_GOTOP=y
+CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_E2I=y
+CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
+CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
+CONFIG_TOUCHSCREEN_USB_NEXIO=y
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC2007=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_APANEL=m
+CONFIG_INPUT_ATLAS_BTNS=m
+CONFIG_INPUT_ATI_REMOTE=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_WINBOND_CIR=m
+CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_PCF8574=m
+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
+CONFIG_INPUT_ADXL34X=m
+CONFIG_INPUT_ADXL34X_I2C=m
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_CT82C710=m
+CONFIG_SERIO_PARKBD=m
+CONFIG_SERIO_PCIPS2=m
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_RAW=m
+CONFIG_SERIO_ALTERA_PS2=m
+CONFIG_SERIO_PS2MULT=m
+CONFIG_GAMEPORT=m
+CONFIG_GAMEPORT_NS558=m
+CONFIG_GAMEPORT_L4=m
+CONFIG_GAMEPORT_EMU10K1=m
+CONFIG_GAMEPORT_FM801=m
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_DEVKMEM=y
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_COMPUTONE=m
+CONFIG_ROCKETPORT=m
+CONFIG_CYCLADES=m
+# CONFIG_CYZ_INTR is not set
+CONFIG_DIGIEPCA=m
+CONFIG_MOXA_INTELLIO=m
+CONFIG_MOXA_SMARTIO=m
+CONFIG_ISI=m
+CONFIG_SYNCLINK=m
+CONFIG_SYNCLINKMP=m
+CONFIG_SYNCLINK_GT=m
+CONFIG_N_HDLC=m
+CONFIG_N_GSM=m
+CONFIG_RISCOM8=m
+CONFIG_SPECIALIX=m
+CONFIG_STALDRV=y
+CONFIG_STALLION=m
+CONFIG_ISTALLION=m
+CONFIG_NOZOMI=m
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_PNP=y
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_DETECT_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_MFD_HSU=m
+CONFIG_SERIAL_UARTLITE=m
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_TIMBERDALE=m
+CONFIG_SERIAL_ALTERA_JTAGUART=m
+CONFIG_SERIAL_ALTERA_UART=m
+CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
+CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+CONFIG_UNIX98_PTYS=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=32
+CONFIG_PRINTER=m
+CONFIG_LP_CONSOLE=y
+CONFIG_PPDEV=m
+CONFIG_HVC_DRIVER=y
+CONFIG_VIRTIO_CONSOLE=m
+CONFIG_IPMI_HANDLER=m
+# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_INTEL=m
+CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_VIA=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_NVRAM=m
+CONFIG_R3964=m
+CONFIG_APPLICOM=m
+
+#
+# PCMCIA character devices
+#
+CONFIG_SYNCLINK_CS=m
+CONFIG_CARDMAN_4000=m
+CONFIG_CARDMAN_4040=m
+CONFIG_IPWIRELESS=m
+CONFIG_MWAVE=m
+CONFIG_RAW_DRIVER=m
+CONFIG_MAX_RAW_DEVS=256
+CONFIG_HPET=y
+CONFIG_HPET_MMAP=y
+CONFIG_HANGCHECK_TIMER=m
+CONFIG_TCG_TPM=m
+# CONFIG_TCG_TIS is not set
+# CONFIG_TCG_NSC is not set
+CONFIG_TCG_ATMEL=m
+# CONFIG_TCG_INFINEON is not set
+CONFIG_TELCLOCK=m
+CONFIG_DEVPORT=y
+CONFIG_RAMOOPS=m
+CONFIG_I2C=m
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_MUX=m
+
+#
+# Multiplexer I2C Chip support
+#
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD756_S4882=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NFORCE2_S4985=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+
+#
+# ACPI drivers
+#
+CONFIG_I2C_SCMI=m
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+CONFIG_I2C_GPIO=m
+CONFIG_I2C_INTEL_MID=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_XILINX=m
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_I2C_STUB=m
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_SPI is not set
+
+#
+# PPS support
+#
+CONFIG_PPS=m
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_KTIMER is not set
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_GPIOLIB=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_MAX730X=m
+
+#
+# Memory mapped GPIO expanders:
+#
+CONFIG_GPIO_BASIC_MMIO=m
+CONFIG_GPIO_IT8761E=m
+CONFIG_GPIO_SCH=m
+CONFIG_GPIO_VX855=m
+
+#
+# I2C GPIO expanders:
+#
+CONFIG_GPIO_MAX7300=m
+CONFIG_GPIO_MAX732X=m
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_ADP5588=m
+
+#
+# PCI GPIO expanders:
+#
+CONFIG_GPIO_CS5535=m
+# CONFIG_GPIO_LANGWELL is not set
+CONFIG_GPIO_PCH=m
+# CONFIG_GPIO_TIMBERDALE is not set
+CONFIG_GPIO_RDC321X=m
+
+#
+# SPI GPIO expanders:
+#
+
+#
+# AC97 GPIO expanders:
+#
+# CONFIG_GPIO_UCB1400 is not set
+
+#
+# MODULbus GPIO expanders:
+#
+CONFIG_GPIO_JANZ_TTL=m
+CONFIG_W1=m
+CONFIG_W1_CON=y
+
+#
+# 1-wire Bus Masters
+#
+CONFIG_W1_MASTER_MATROX=m
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_GPIO=m
+
+#
+# 1-wire Slaves
+#
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2431=m
+CONFIG_W1_SLAVE_DS2433=m
+CONFIG_W1_SLAVE_DS2433_CRC=y
+CONFIG_W1_SLAVE_DS2760=m
+CONFIG_W1_SLAVE_BQ27000=m
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_PDA_POWER=m
+CONFIG_TEST_POWER=m
+CONFIG_BATTERY_DS2760=m
+CONFIG_BATTERY_DS2782=m
+CONFIG_BATTERY_BQ20Z75=m
+CONFIG_BATTERY_BQ27x00=m
+CONFIG_BATTERY_MAX17040=m
+CONFIG_CHARGER_PCF50633=m
+CONFIG_CHARGER_ISP1704=m
+CONFIG_HWMON=m
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_ABITUGURU=m
+CONFIG_SENSORS_ABITUGURU3=m
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_K10TEMP=m
+CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_I5K_AMB=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_GPIO_FAN=m
+CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_PKGTEMP=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_LM63=m
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_SMM665=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_VIA_CPUTEMP=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+# CONFIG_SENSORS_W83795_FANCTRL is not set
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_LIS3_I2C=m
+CONFIG_SENSORS_APPLESMC=m
+
+#
+# ACPI drivers
+#
+CONFIG_SENSORS_ATK0110=m
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_THERMAL=m
+CONFIG_THERMAL_HWMON=y
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_ALIM1535_WDT=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_F71808E_WDT=m
+CONFIG_GEODE_WDT=m
+CONFIG_SC520_WDT=m
+CONFIG_SBC_FITPC2_WATCHDOG=m
+CONFIG_EUROTECH_WDT=m
+CONFIG_IB700_WDT=m
+CONFIG_IBMASR=m
+CONFIG_WAFER_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_ITCO_WDT=m
+CONFIG_ITCO_VENDOR_SUPPORT=y
+CONFIG_IT8712F_WDT=m
+CONFIG_IT87_WDT=m
+CONFIG_HP_WATCHDOG=m
+CONFIG_HPWDT_NMI_DECODING=y
+CONFIG_SC1200_WDT=m
+CONFIG_PC87413_WDT=m
+CONFIG_60XX_WDT=m
+CONFIG_SBC8360_WDT=m
+CONFIG_CPU5_WDT=m
+CONFIG_SMSC_SCH311X_WDT=m
+CONFIG_SMSC37B787_WDT=m
+CONFIG_W83627HF_WDT=m
+CONFIG_W83697HF_WDT=m
+CONFIG_W83697UG_WDT=m
+CONFIG_W83877F_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_MACHZ_WDT=m
+CONFIG_SBC_EPX_C3_WATCHDOG=m
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+CONFIG_SSB_PCMCIAHOST=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_MFD_SUPPORT=y
+CONFIG_MFD_CORE=m
+# CONFIG_MFD_SM501 is not set
+CONFIG_HTC_PASIC3=m
+CONFIG_UCB1400_CORE=m
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
+# CONFIG_MFD_TMIO is not set
+CONFIG_MFD_WM8400=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+# CONFIG_ABX500_CORE is not set
+CONFIG_MFD_TIMBERDALE=m
+CONFIG_LPC_SCH=m
+CONFIG_MFD_RDC321X=m
+CONFIG_MFD_JANZ_CMODIO=m
+CONFIG_MFD_VX855=m
+# CONFIG_REGULATOR is not set
+CONFIG_MEDIA_SUPPORT=m
+
+#
+# Multimedia core support
+#
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_VIDEO_ALLOW_V4L1=y
+CONFIG_VIDEO_V4L1_COMPAT=y
+CONFIG_DVB_CORE=m
+CONFIG_VIDEO_MEDIA=m
+
+#
+# Multimedia drivers
+#
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_IR_CORE=m
+CONFIG_VIDEO_IR=m
+CONFIG_LIRC=m
+CONFIG_RC_MAP=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_RC5_SZ_DECODER=m
+CONFIG_IR_LIRC_CODEC=m
+CONFIG_IR_ENE=m
+CONFIG_IR_IMON=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_NUVOTON=m
+CONFIG_IR_STREAMZAP=m
+CONFIG_MEDIA_ATTACH=y
+CONFIG_MEDIA_TUNER=m
+# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEO_V4L1=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEOBUF_DMA_CONTIG=m
+CONFIG_VIDEOBUF_DVB=m
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# Encoders/decoders and other helper chips
+#
+
+#
+# Audio decoders
+#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TDA9875=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_M52790=m
+CONFIG_VIDEO_TLV320AIC23B=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+
+#
+# Video decoders
+#
+CONFIG_VIDEO_ADV7180=m
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_BT866=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_MT9V011=m
+CONFIG_VIDEO_TCM825X=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_SAA7191=m
+CONFIG_VIDEO_TVP514X=m
+CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_TVP7002=m
+CONFIG_VIDEO_VPX3220=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_CX25840=m
+
+#
+# MPEG video encoders
+#
+CONFIG_VIDEO_CX2341X=m
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+CONFIG_VIDEO_THS7303=m
+CONFIG_VIDEO_ADV7343=m
+CONFIG_VIDEO_AK881X=m
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+CONFIG_VIDEO_VIVI=m
+CONFIG_VIDEO_BT848=m
+CONFIG_VIDEO_BT848_DVB=y
+CONFIG_VIDEO_BWQCAM=m
+CONFIG_VIDEO_CQCAM=m
+CONFIG_VIDEO_W9966=m
+CONFIG_VIDEO_CPIA2=m
+CONFIG_VIDEO_ZORAN=m
+CONFIG_VIDEO_ZORAN_DC30=m
+CONFIG_VIDEO_ZORAN_ZR36060=m
+CONFIG_VIDEO_ZORAN_BUZ=m
+CONFIG_VIDEO_ZORAN_DC10=m
+CONFIG_VIDEO_ZORAN_LML33=m
+CONFIG_VIDEO_ZORAN_LML33R10=m
+CONFIG_VIDEO_ZORAN_AVS6EYES=m
+CONFIG_VIDEO_MEYE=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_FB_IVTV=m
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_SAA7164=m
+CONFIG_VIDEO_CAFE_CCIC=m
+CONFIG_VIDEO_SR030PC30=m
+CONFIG_VIDEO_VIA_CAMERA=m
+CONFIG_SOC_CAMERA=m
+CONFIG_SOC_CAMERA_IMX074=m
+CONFIG_SOC_CAMERA_MT9M001=m
+CONFIG_SOC_CAMERA_MT9M111=m
+CONFIG_SOC_CAMERA_MT9T031=m
+CONFIG_SOC_CAMERA_MT9T112=m
+CONFIG_SOC_CAMERA_MT9V022=m
+CONFIG_SOC_CAMERA_RJ54N1=m
+CONFIG_SOC_CAMERA_TW9910=m
+CONFIG_SOC_CAMERA_PLATFORM=m
+CONFIG_SOC_CAMERA_OV6650=m
+CONFIG_SOC_CAMERA_OV772X=m
+CONFIG_SOC_CAMERA_OV9640=m
+CONFIG_V4L_USB_DRIVERS=y
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_KONICA=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_TLG2300=m
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_VIDEO_USBVIDEO=m
+CONFIG_USB_VICAM=m
+CONFIG_USB_IBMCAM=m
+CONFIG_USB_KONICAWC=m
+CONFIG_USB_ET61X251=m
+CONFIG_USB_SE401=m
+CONFIG_USB_SN9C102=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_MEM2MEM_TESTDEV=m
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_GEMTEK_PCI=m
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_MAESTRO=m
+CONFIG_I2C_SI4713=m
+CONFIG_RADIO_SI4713=m
+CONFIG_USB_DSBR=m
+# CONFIG_RADIO_SI470X is not set
+CONFIG_USB_MR800=m
+CONFIG_RADIO_TEA5764=m
+CONFIG_RADIO_SAA7706H=m
+CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_TIMBERDALE=m
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
+CONFIG_DVB_CAPTURE_DRIVERS=y
+
+#
+# Supported SAA7146 based PCI Adapters
+#
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_BUDGET_PATCH=m
+
+#
+# Supported USB Adapters
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_FRIIO=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_SMS_SIANO_MDTV=m
+
+#
+# Siano module components
+#
+CONFIG_SMS_USB_DRV=m
+CONFIG_SMS_SDIO_DRV=m
+
+#
+# Supported FlexCopII (B2C2) Adapters
+#
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
+
+#
+# Supported BT878 Adapters
+#
+CONFIG_DVB_BT8XX=m
+
+#
+# Supported Pluto2 Adapters
+#
+CONFIG_DVB_PLUTO2=m
+
+#
+# Supported SDMC DM1105 Adapters
+#
+CONFIG_DVB_DM1105=m
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_FIREWIRE=y
+# CONFIG_DVB_FIREDTV_IEEE1394 is not set
+CONFIG_DVB_FIREDTV_INPUT=y
+
+#
+# Supported Earthsoft PT1 Adapters
+#
+CONFIG_DVB_PT1=m
+
+#
+# Supported Mantis Adapters
+#
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+
+#
+# Supported nGene Adapters
+#
+CONFIG_DVB_NGENE=m
+
+#
+# Supported DVB Frontends
+#
+CONFIG_DVB_FE_CUSTOMISE=y
+
+#
+# Customise DVB Frontends
+#
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV6110x=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_SP8870=m
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_S5H1432=m
+CONFIG_DVB_DRX397XD=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_S5H1411=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_S921=m
+CONFIG_DVB_DIB8000=m
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
+
+#
+# Tools to develop new frontends
+#
+CONFIG_DVB_DUMMY_FE=m
+CONFIG_DAB=y
+CONFIG_USB_DABUSB=m
+
+#
+# Graphics support
+#
+CONFIG_AGP=m
+CONFIG_AGP_AMD64=m
+CONFIG_AGP_INTEL=m
+CONFIG_AGP_SIS=m
+CONFIG_AGP_VIA=m
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_VGA_SWITCHEROO=y
+CONFIG_DRM=m
+CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_TTM=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_RADEON=m
+CONFIG_DRM_RADEON_KMS=y
+CONFIG_DRM_I810=m
+CONFIG_DRM_I830=m
+CONFIG_DRM_I915=m
+CONFIG_DRM_I915_KMS=y
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
+CONFIG_STUB_POULSBO=m
+CONFIG_VGASTATE=m
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_DDC=m
+CONFIG_FB_BOOT_VESA_SUPPORT=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=m
+CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_HECUBA=m
+CONFIG_FB_SVGALIB=m
+# CONFIG_FB_MACMODES is not set
+CONFIG_FB_BACKLIGHT=y
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+CONFIG_FB_CIRRUS=m
+CONFIG_FB_PM2=m
+# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
+CONFIG_FB_CYBER2000=m
+CONFIG_FB_ARC=m
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+CONFIG_FB_VGA16=m
+# CONFIG_FB_UVESA is not set
+CONFIG_FB_VESA=y
+# CONFIG_FB_EFI is not set
+CONFIG_FB_N411=m
+CONFIG_FB_HGA=m
+# CONFIG_FB_HGA_ACCEL is not set
+CONFIG_FB_S1D13XXX=m
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_NVIDIA_DEBUG is not set
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA=m
+CONFIG_FB_RIVA_I2C=y
+# CONFIG_FB_RIVA_DEBUG is not set
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_LE80578=m
+CONFIG_FB_CARILLO_RANCH=m
+CONFIG_FB_MATROX=m
+CONFIG_FB_MATROX_MILLENIUM=y
+CONFIG_FB_MATROX_MYSTIQUE=y
+CONFIG_FB_MATROX_G=y
+CONFIG_FB_MATROX_I2C=m
+CONFIG_FB_MATROX_MAVEN=m
+CONFIG_FB_RADEON=m
+CONFIG_FB_RADEON_I2C=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+# CONFIG_FB_RADEON_DEBUG is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_BACKLIGHT=y
+CONFIG_FB_S3=m
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
+CONFIG_FB_SIS=m
+CONFIG_FB_SIS_300=y
+CONFIG_FB_SIS_315=y
+CONFIG_FB_VIA=m
+# CONFIG_FB_VIA_DIRECT_PROCFS is not set
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_KYRO=m
+CONFIG_FB_3DFX=m
+# CONFIG_FB_3DFX_ACCEL is not set
+CONFIG_FB_3DFX_I2C=y
+CONFIG_FB_VOODOO1=m
+CONFIG_FB_VT8623=m
+CONFIG_FB_TRIDENT=m
+CONFIG_FB_ARK=m
+CONFIG_FB_PM3=m
+CONFIG_FB_CARMINE=m
+CONFIG_FB_CARMINE_DRAM_EVAL=y
+# CONFIG_CARMINE_DRAM_CUSTOM is not set
+CONFIG_FB_GEODE=y
+CONFIG_FB_GEODE_LX=m
+CONFIG_FB_GEODE_GX=m
+CONFIG_FB_GEODE_GX1=m
+CONFIG_FB_TMIO=m
+CONFIG_FB_TMIO_ACCELL=y
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_METRONOME=m
+CONFIG_FB_MB862XX=m
+CONFIG_FB_MB862XX_PCI_GDC=y
+CONFIG_FB_BROADSHEET=m
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_PLATFORM=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_GENERIC=m
+CONFIG_BACKLIGHT_PROGEAR=m
+CONFIG_BACKLIGHT_CARILLO_RANCH=m
+CONFIG_BACKLIGHT_MBP_NVIDIA=m
+CONFIG_BACKLIGHT_SAHARA=m
+CONFIG_BACKLIGHT_ADP8860=m
+CONFIG_BACKLIGHT_PCF50633=m
+
+#
+# Display device support
+#
+CONFIG_DISPLAY_SUPPORT=m
+
+#
+# Display hardware drivers
+#
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+CONFIG_VGACON_SOFT_SCROLLBACK=y
+CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+CONFIG_LOGO_LINUX_CLUT224=y
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_JACK=y
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_SEQUENCER_OSS=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_DYNAMIC_MINORS=y
+# CONFIG_SND_SUPPORT_OLD_API is not set
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_DMA_SGBUF=y
+CONFIG_SND_RAWMIDI_SEQ=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_VX_LIB=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_PCSP is not set
+CONFIG_SND_DUMMY=m
+CONFIG_SND_ALOOP=m
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+CONFIG_SND_SB_COMMON=m
+CONFIG_SND_SB16_DSP=m
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ALI5451=m
+CONFIG_SND_ASIHPI=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
+CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_CS5530=m
+CONFIG_SND_CS5535AUDIO=m
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_ES1968_INPUT=y
+CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
+CONFIG_SND_FM801_TEA575X=m
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+# CONFIG_SND_HDA_INPUT_BEEP is not set
+CONFIG_SND_HDA_INPUT_JACK=y
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_CODEC_REALTEK=y
+CONFIG_SND_HDA_CODEC_ANALOG=y
+CONFIG_SND_HDA_CODEC_SIGMATEL=y
+CONFIG_SND_HDA_CODEC_VIA=y
+CONFIG_SND_HDA_CODEC_HDMI=y
+CONFIG_SND_HDA_CODEC_CIRRUS=y
+CONFIG_SND_HDA_CODEC_CONEXANT=y
+CONFIG_SND_HDA_CODEC_CA0110=y
+CONFIG_SND_HDA_CODEC_CMEDIA=y
+CONFIG_SND_HDA_CODEC_SI3054=y
+CONFIG_SND_HDA_GENERIC=y
+# CONFIG_SND_HDA_POWER_SAVE is not set
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_HIFIER=m
+CONFIG_SND_ICE1712=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_LX6464ES=m
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MAESTRO3_INPUT=y
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
+CONFIG_SND_USB_US122L=m
+CONFIG_SND_PCMCIA=y
+CONFIG_SND_VXPOCKET=m
+CONFIG_SND_PDAUDIOCF=m
+# CONFIG_SND_SOC is not set
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=m
+CONFIG_HIDRAW=y
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# Special HID drivers
+#
+CONFIG_HID_3M_PCT=m
+CONFIG_HID_A4TECH=m
+CONFIG_HID_ACRUX_FF=m
+CONFIG_HID_APPLE=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_CANDO=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EGALAX=m
+CONFIG_HID_ELECOM=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LOGITECH=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_LOGIWII_FF=y
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MOSART=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_QUANTA=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_ROCCAT_KONE=m
+CONFIG_HID_ROCCAT_PYRA=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SONY=m
+CONFIG_HID_STANTUM=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_GREENASIA=m
+CONFIG_GREENASIA_FF=y
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_WACOM=m
+CONFIG_HID_WACOM_POWER_SUPPLY=y
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
+CONFIG_HID_ZYDACRON=m
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+CONFIG_USB_SUSPEND=y
+# CONFIG_USB_OTG is not set
+CONFIG_USB_MON=y
+CONFIG_USB_WUSB=m
+CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_C67X00_HCD=m
+CONFIG_USB_XHCI_HCD=m
+# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_ISP1760_HCD=m
+CONFIG_USB_ISP1362_HCD=m
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_SSB=y
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_U132_HCD=m
+CONFIG_USB_SL811_HCD=m
+CONFIG_USB_SL811_CS=m
+CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_WHCI_HCD=m
+CONFIG_USB_HWA_HCD=m
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_UAS=m
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+
+#
+# USB port drivers
+#
+CONFIG_USB_USS720=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_EZUSB=y
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_FUNSOFT=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MOTOROLA=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_HP4X=m
+CONFIG_USB_SERIAL_SAFE=m
+CONFIG_USB_SERIAL_SAFE_PADDED=y
+CONFIG_USB_SERIAL_SAMBA=m
+CONFIG_USB_SERIAL_SIEMENS_MPI=m
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
+CONFIG_USB_SERIAL_ZIO=m
+CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_DEBUG=m
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_RIO500=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_LED=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_FTDI_ELAN=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_SISUSBVGA_CON=y
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_YUREX=m
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+# CONFIG_USB_GADGET is not set
+
+#
+# OTG and related infrastructure
+#
+CONFIG_USB_OTG_UTILS=y
+CONFIG_USB_GPIO_VBUS=m
+CONFIG_NOP_USB_XCEIV=m
+CONFIG_UWB=m
+CONFIG_UWB_HWA=m
+CONFIG_UWB_WHCI=m
+CONFIG_UWB_I1480U=m
+CONFIG_MMC=m
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+
+#
+# MMC/SD/SDIO Card Drivers
+#
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_MINORS=8
+CONFIG_MMC_BLOCK_BOUNCE=y
+CONFIG_SDIO_UART=m
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_WBSD=m
+CONFIG_MMC_TIFM_SD=m
+CONFIG_MMC_SDRICOH_CS=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_USHC=m
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+CONFIG_LEDS_NET5501=m
+CONFIG_LEDS_ALIX2=m
+CONFIG_LEDS_PCA9532=m
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GPIO_PLATFORM=y
+CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP5521=m
+CONFIG_LEDS_LP5523=m
+CONFIG_LEDS_CLEVO_MAIL=m
+CONFIG_LEDS_PCA955X=m
+CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_INTEL_SS4200=m
+CONFIG_LEDS_LT3593=m
+CONFIG_LEDS_DELL_NETBOOKS=m
+CONFIG_LEDS_TRIGGERS=y
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+CONFIG_ACCESSIBILITY=y
+CONFIG_A11Y_BRAILLE_CONSOLE=y
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_USER_MEM=y
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_MTHCA=m
+CONFIG_INFINIBAND_MTHCA_DEBUG=y
+# CONFIG_INFINIBAND_IPATH is not set
+CONFIG_INFINIBAND_QIB=m
+CONFIG_INFINIBAND_AMSO1100=m
+# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
+# CONFIG_INFINIBAND_CXGB3 is not set
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_INFINIBAND_NES=m
+# CONFIG_INFINIBAND_NES_DEBUG is not set
+CONFIG_INFINIBAND_IPOIB=m
+# CONFIG_INFINIBAND_IPOIB_CM is not set
+CONFIG_INFINIBAND_IPOIB_DEBUG=y
+# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_EDAC=y
+
+#
+# Reporting subsystems
+#
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_DECODE_MCE=y
+CONFIG_EDAC_MCE_INJ=m
+# CONFIG_EDAC_MM_EDAC is not set
+CONFIG_RTC_LIB=m
+CONFIG_RTC_CLASS=m
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+CONFIG_RTC_DRV_TEST=m
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_ISL12022=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_PCF50633=m
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_INTEL_MID_DMAC=m
+CONFIG_INTEL_IOATDMA=m
+CONFIG_TIMB_DMA=m
+CONFIG_PCH_DMA=m
+CONFIG_DMA_ENGINE=y
+
+#
+# DMA Clients
+#
+CONFIG_NET_DMA=y
+# CONFIG_ASYNC_TX_DMA is not set
+CONFIG_DMATEST=m
+CONFIG_DCA=m
+CONFIG_AUXDISPLAY=y
+# CONFIG_KS0108 is not set
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_PDRV=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+CONFIG_STAGING=y
+# CONFIG_STAGING_EXCLUDE_BUILD is not set
+# CONFIG_ET131X is not set
+# CONFIG_SLICOSS is not set
+# CONFIG_VIDEO_GO7007 is not set
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=m
+CONFIG_VIDEO_CPIA=m
+CONFIG_VIDEO_CPIA_PP=m
+CONFIG_VIDEO_CPIA_USB=m
+CONFIG_VIDEO_STRADIS=m
+# CONFIG_USB_IP_COMMON is not set
+# CONFIG_W35UND is not set
+# CONFIG_PRISM2_USB is not set
+# CONFIG_ECHO is not set
+CONFIG_BRCM80211=m
+CONFIG_BRCM80211_PCI=y
+# CONFIG_BRCMFMAC is not set
+CONFIG_RT2860=m
+CONFIG_RT2870=m
+# CONFIG_COMEDI is not set
+# CONFIG_ASUS_OLED is not set
+# CONFIG_PANEL is not set
+CONFIG_R8187SE=m
+CONFIG_RTL8192U=m
+CONFIG_RTL8192E=m
+CONFIG_R8712U=m
+# CONFIG_R8712_AP is not set
+# CONFIG_TRANZPORT is not set
+CONFIG_POHMELFS=m
+# CONFIG_POHMELFS_DEBUG is not set
+CONFIG_POHMELFS_CRYPTO=y
+CONFIG_AUTOFS_FS=m
+CONFIG_IDE_PHISON=m
+CONFIG_LINE6_USB=m
+# CONFIG_LINE6_USB_DEBUG is not set
+# CONFIG_LINE6_USB_DUMP_CTRL is not set
+# CONFIG_LINE6_USB_DUMP_MIDI is not set
+# CONFIG_LINE6_USB_DUMP_PCM is not set
+# CONFIG_LINE6_USB_RAW is not set
+# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
+CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_NOUVEAU=m
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+CONFIG_DRM_NOUVEAU_DEBUG=y
+
+#
+# I2C encoder or helper chips
+#
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+CONFIG_USB_SERIAL_QUATECH2=m
+CONFIG_USB_SERIAL_QUATECH_USB2=m
+CONFIG_VT6655=m
+CONFIG_VT6656=m
+CONFIG_FB_UDL=m
+# CONFIG_HYPERV is not set
+# CONFIG_VME_BUS is not set
+# CONFIG_IIO is not set
+CONFIG_ZRAM=m
+CONFIG_WLAGS49_H2=m
+CONFIG_WLAGS49_H25=m
+CONFIG_BATMAN_ADV=m
+# CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_SAMSUNG_LAPTOP=m
+CONFIG_FB_SM7XX=m
+CONFIG_VIDEO_DT3155=m
+CONFIG_DT3155_CCIR=y
+CONFIG_CRYSTALHD=m
+# CONFIG_CXT1E1 is not set
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_ST_BT=m
+CONFIG_FB_XGI=m
+CONFIG_LIRC_STAGING=y
+CONFIG_LIRC_BT829=m
+CONFIG_LIRC_I2C=m
+CONFIG_LIRC_IGORPLUGUSB=m
+CONFIG_LIRC_IMON=m
+CONFIG_LIRC_IT87=m
+CONFIG_LIRC_ITE8709=m
+CONFIG_LIRC_PARALLEL=m
+CONFIG_LIRC_SASEM=m
+CONFIG_LIRC_SERIAL=m
+CONFIG_LIRC_SERIAL_TRANSMITTER=y
+CONFIG_LIRC_SIR=m
+CONFIG_LIRC_TTUSBIR=m
+CONFIG_LIRC_ZILOG=m
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
+CONFIG_EASYCAP=m
+CONFIG_SOLO6X10=m
+CONFIG_ACPI_QUICKSTART=m
+CONFIG_MACH_NO_WESTBRIDGE=y
+CONFIG_SBE_2T3E3=m
+CONFIG_ATH6K_LEGACY=m
+CONFIG_AR600x_SD31_XXX=y
+# CONFIG_AR600x_WB31_XXX is not set
+# CONFIG_AR600x_SD32_XXX is not set
+# CONFIG_AR600x_CUSTOM_XXX is not set
+# CONFIG_ATH6KL_ENABLE_COEXISTENCE is not set
+# CONFIG_ATH6KL_HCI_BRIDGE is not set
+# CONFIG_ATH6KL_CFG80211 is not set
+# CONFIG_ATH6KL_HTC_RAW_INTERFACE is not set
+# CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER is not set
+# CONFIG_ATH6KL_SKIP_ABI_VERSION_CHECK is not set
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_USB_ENESTORAGE is not set
+# CONFIG_BCM_WIMAX is not set
+# CONFIG_FT1000 is not set
+
+#
+# Speakup console speech
+#
+CONFIG_SPEAKUP=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_ACNTPC=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_DECPC=m
+CONFIG_SPEAKUP_SYNTH_DTLK=m
+CONFIG_SPEAKUP_SYNTH_KEYPC=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
+CONFIG_SPEAKUP_SYNTH_DUMMY=m
+CONFIG_X86_PLATFORM_DEVICES=y
+CONFIG_ACER_WMI=m
+CONFIG_ACERHDF=m
+CONFIG_ASUS_LAPTOP=m
+CONFIG_DELL_LAPTOP=m
+CONFIG_DELL_WMI=m
+CONFIG_FUJITSU_LAPTOP=m
+# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
+CONFIG_HP_WMI=m
+CONFIG_MSI_LAPTOP=m
+CONFIG_PANASONIC_LAPTOP=m
+CONFIG_COMPAL_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
+CONFIG_SONYPI_COMPAT=y
+CONFIG_IDEAPAD_LAPTOP=m
+CONFIG_THINKPAD_ACPI=m
+CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
+# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
+# CONFIG_THINKPAD_ACPI_DEBUG is not set
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
+CONFIG_THINKPAD_ACPI_VIDEO=y
+CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+CONFIG_SENSORS_HDAPS=m
+CONFIG_INTEL_MENLOW=m
+CONFIG_EEEPC_LAPTOP=m
+CONFIG_EEEPC_WMI=m
+CONFIG_ACPI_WMI=m
+CONFIG_MSI_WMI=m
+CONFIG_ACPI_ASUS=m
+CONFIG_TOPSTAR_LAPTOP=m
+CONFIG_ACPI_TOSHIBA=m
+CONFIG_TOSHIBA_BT_RFKILL=m
+CONFIG_ACPI_CMPC=m
+CONFIG_INTEL_IPS=m
+# CONFIG_IBM_RTL is not set
+
+#
+# Firmware Drivers
+#
+CONFIG_EDD=m
+CONFIG_EDD_OFF=y
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_EFI_VARS=m
+CONFIG_DELL_RBU=m
+CONFIG_DCDBAS=m
+CONFIG_DMIID=y
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=m
+CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
+CONFIG_EXT3_FS_XATTR=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_EXT4_FS=m
+CONFIG_EXT4_FS_XATTR=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD=m
+# CONFIG_JBD_DEBUG is not set
+CONFIG_JBD2=m
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=m
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_FS_POSIX_ACL=y
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_OCFS2_FS_O2CB=m
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+# CONFIG_OCFS2_FS_STATS is not set
+CONFIG_OCFS2_DEBUG_MASKLOG=y
+# CONFIG_OCFS2_DEBUG_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+CONFIG_NILFS2_FS=m
+CONFIG_EXPORTFS=m
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=m
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_QUOTACTL_COMPAT=y
+CONFIG_AUTOFS4_FS=m
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_GENERIC_ACL=y
+
+#
+# Caches
+#
+CONFIG_FSCACHE=m
+# CONFIG_FSCACHE_STATS is not set
+# CONFIG_FSCACHE_HISTOGRAM is not set
+# CONFIG_FSCACHE_DEBUG is not set
+# CONFIG_FSCACHE_OBJECT_LIST is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_HISTOGRAM is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+CONFIG_NTFS_RW=y
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_CONFIGFS_FS=y
+CONFIG_MISC_FILESYSTEMS=y
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+CONFIG_AFFS_FS=m
+# CONFIG_ECRYPT_FS is not set
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+CONFIG_BFS_FS=m
+CONFIG_EFS_FS=m
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_UBIFS_FS=m
+CONFIG_UBIFS_FS_XATTR=y
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+# CONFIG_UBIFS_FS_DEBUG is not set
+CONFIG_LOGFS=m
+CONFIG_CRAMFS=m
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_EMBEDDED=y
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+CONFIG_VXFS_FS=m
+CONFIG_MINIX_FS=m
+CONFIG_OMFS_FS=m
+CONFIG_HPFS_FS=m
+CONFIG_QNX4FS_FS=m
+CONFIG_ROMFS_FS=y
+CONFIG_ROMFS_BACKED_BY_BLOCK=y
+CONFIG_ROMFS_ON_BLOCK=y
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+CONFIG_EXOFS_FS=m
+# CONFIG_EXOFS_DEBUG is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V4=y
+# CONFIG_NFS_V4_1 is not set
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+# CONFIG_NFS_USE_NEW_IDMAPPER is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_DEPRECATED=y
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+CONFIG_NFSD_V4=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+CONFIG_SUNRPC_XPRT_RDMA=m
+CONFIG_RPCSEC_GSS_KRB5=y
+CONFIG_CEPH_FS=m
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+CONFIG_CIFS_WEAK_PW_HASH=y
+# CONFIG_CIFS_UPCALL is not set
+# CONFIG_CIFS_XATTR is not set
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_DFS_UPCALL is not set
+CONFIG_CIFS_FSCACHE=y
+# CONFIG_CIFS_EXPERIMENTAL is not set
+CONFIG_NCP_FS=m
+CONFIG_NCPFS_PACKET_SIGNING=y
+CONFIG_NCPFS_IOCTL_LOCKING=y
+CONFIG_NCPFS_STRONG=y
+CONFIG_NCPFS_NFS_NS=y
+CONFIG_NCPFS_OS2_NS=y
+CONFIG_NCPFS_SMALLDOS=y
+CONFIG_NCPFS_NLS=y
+CONFIG_NCPFS_EXTRAS=y
+CONFIG_CODA_FS=m
+CONFIG_AFS_FS=m
+# CONFIG_AFS_DEBUG is not set
+# CONFIG_AFS_FSCACHE is not set
+CONFIG_9P_FS=m
+# CONFIG_9P_FSCACHE is not set
+# CONFIG_9P_FS_POSIX_ACL is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+CONFIG_OSF_PARTITION=y
+CONFIG_AMIGA_PARTITION=y
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_UNIXWARE_DISKLABEL=y
+# CONFIG_LDM_PARTITION is not set
+CONFIG_SGI_PARTITION=y
+# CONFIG_ULTRIX_PARTITION is not set
+CONFIG_SUN_PARTITION=y
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_UTF8=m
+CONFIG_DLM=m
+# CONFIG_DLM_DEBUG is not set
+
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_PRINTK_TIME=y
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=0
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_STRIP_ASM_SYMS=y
+CONFIG_UNUSED_SYMBOLS=y
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+# CONFIG_LOCKUP_DETECTOR is not set
+# CONFIG_HARDLOCKUP_DETECTOR is not set
+CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+CONFIG_TIMER_STATS=y
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+CONFIG_BKL=y
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+CONFIG_STACKTRACE=y
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# CONFIG_LKDTM is not set
+CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_LATENCYTOP is not set
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FTRACE_NMI_ENTER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
+CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_RING_BUFFER=y
+CONFIG_FTRACE_NMI_ENTER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_FTRACE_SYSCALLS is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+# CONFIG_STACK_TRACER is not set
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_DYNAMIC_FTRACE=y
+# CONFIG_FUNCTION_PROFILER is not set
+CONFIG_FTRACE_MCOUNT_RECORD=y
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_MMIOTRACE is not set
+CONFIG_RING_BUFFER_BENCHMARK=m
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_DMA_API_DEBUG is not set
+CONFIG_ATOMIC64_SELFTEST=y
+CONFIG_ASYNC_RAID6_TEST=m
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+CONFIG_HAVE_ARCH_KMEMCHECK=y
+CONFIG_STRICT_DEVMEM=y
+CONFIG_X86_VERBOSE_BOOTUP=y
+CONFIG_EARLY_PRINTK=y
+# CONFIG_EARLY_PRINTK_DBGP is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_X86_PTDUMP is not set
+CONFIG_DEBUG_RODATA=y
+CONFIG_DEBUG_RODATA_TEST=y
+# CONFIG_DEBUG_NX_TEST is not set
+# CONFIG_IOMMU_DEBUG is not set
+# CONFIG_IOMMU_STRESS is not set
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+CONFIG_IO_DELAY_TYPE_0X80=0
+CONFIG_IO_DELAY_TYPE_0XED=1
+CONFIG_IO_DELAY_TYPE_UDELAY=2
+CONFIG_IO_DELAY_TYPE_NONE=3
+CONFIG_IO_DELAY_0X80=y
+# CONFIG_IO_DELAY_0XED is not set
+# CONFIG_IO_DELAY_UDELAY is not set
+# CONFIG_IO_DELAY_NONE is not set
+CONFIG_DEFAULT_IO_DELAY_TYPE=0
+# CONFIG_DEBUG_BOOT_PARAMS is not set
+# CONFIG_CPA_DEBUG is not set
+CONFIG_OPTIMIZE_INLINING=y
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
+CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_NETWORK_XFRM=y
+# CONFIG_SECURITY_PATH is not set
+# CONFIG_SECURITY_SELINUX is not set
+# CONFIG_SECURITY_TOMOYO is not set
+# CONFIG_SECURITY_APPARMOR is not set
+# CONFIG_IMA is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_XOR_BLOCKS=y
+CONFIG_ASYNC_CORE=y
+CONFIG_ASYNC_MEMCPY=y
+CONFIG_ASYNC_XOR=y
+CONFIG_ASYNC_PQ=y
+CONFIG_ASYNC_RAID6_RECOV=y
+CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
+CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=m
+CONFIG_CRYPTO_PCOMP2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_WORKQUEUE=y
+CONFIG_CRYPTO_CRYPTD=y
+CONFIG_CRYPTO_AUTHENC=y
+CONFIG_CRYPTO_TEST=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_SEQIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_LRW=y
+CONFIG_CRYPTO_PCBC=y
+CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_FPU=y
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=y
+CONFIG_CRYPTO_VMAC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_MD4=y
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=y
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_TGR192=y
+CONFIG_CRYPTO_WP512=y
+CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_X86_64=y
+CONFIG_CRYPTO_AES_NI_INTEL=y
+CONFIG_CRYPTO_ANUBIS=y
+CONFIG_CRYPTO_ARC4=y
+CONFIG_CRYPTO_BLOWFISH=y
+CONFIG_CRYPTO_CAMELLIA=y
+CONFIG_CRYPTO_CAST5=y
+CONFIG_CRYPTO_CAST6=y
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_FCRYPT=y
+CONFIG_CRYPTO_KHAZAD=y
+CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_SALSA20_X86_64=m
+CONFIG_CRYPTO_SEED=y
+CONFIG_CRYPTO_SERPENT=y
+CONFIG_CRYPTO_TEA=y
+CONFIG_CRYPTO_TWOFISH=y
+CONFIG_CRYPTO_TWOFISH_COMMON=y
+CONFIG_CRYPTO_TWOFISH_X86_64=y
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_ZLIB=m
+CONFIG_CRYPTO_LZO=m
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_CRYPTO_DEV_HIFN_795X=m
+CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+CONFIG_HAVE_KVM=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_APIC_ARCHITECTURE=y
+CONFIG_KVM_MMIO=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
+CONFIG_KVM_MMU_AUDIT=y
+CONFIG_VHOST_NET=m
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_RING=m
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=y
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=m
+CONFIG_CRC_ITU_T=y
+CONFIG_CRC32=y
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=y
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_BTREE=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_CHECK_SIGNATURE=y
+CONFIG_NLATTR=y
+CONFIG_LRU_CACHE=m
diff --git a/source/k/config-huge-2.6.33.4 b/source/k/config-huge-2.6.33.4
deleted file mode 100644
index 1b2d932e..00000000
--- a/source/k/config-huge-2.6.33.4
+++ /dev/null
@@ -1,4698 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.33.4
-# Wed May 12 23:07:13 2010
-#
-CONFIG_64BIT=y
-# CONFIG_X86_32 is not set
-CONFIG_X86_64=y
-CONFIG_X86=y
-CONFIG_OUTPUT_FORMAT="elf64-x86-64"
-CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
-CONFIG_GENERIC_TIME=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_MMU=y
-CONFIG_ZONE_DMA=y
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_IOMAP=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_ARCH_HAS_CPU_RELAX=y
-CONFIG_ARCH_HAS_DEFAULT_IDLE=y
-CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
-CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ZONE_DMA32=y
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-CONFIG_AUDIT_ARCH=y
-CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_USE_GENERIC_SMP_HELPERS=y
-CONFIG_X86_64_SMP=y
-CONFIG_X86_HT=y
-CONFIG_X86_TRAMPOLINE=y
-# CONFIG_KTIME_SCALAR is not set
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_CONSTRUCTORS=y
-
-#
-# General setup
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_LOCK_KERNEL=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_BZIP2=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_LZO=y
-# CONFIG_KERNEL_GZIP is not set
-# CONFIG_KERNEL_BZIP2 is not set
-CONFIG_KERNEL_LZMA=y
-# CONFIG_KERNEL_LZO is not set
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_AUDIT=y
-CONFIG_AUDITSYSCALL=y
-CONFIG_AUDIT_TREE=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU=y
-# CONFIG_TREE_PREEMPT_RCU is not set
-# CONFIG_TINY_RCU is not set
-# CONFIG_RCU_TRACE is not set
-CONFIG_RCU_FANOUT=32
-# CONFIG_RCU_FANOUT_EXACT is not set
-# CONFIG_TREE_RCU_TRACE is not set
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=15
-CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-# CONFIG_GROUP_SCHED is not set
-# CONFIG_CGROUPS is not set
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
-CONFIG_RELAY=y
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-# CONFIG_USER_NS is not set
-# CONFIG_PID_NS is not set
-CONFIG_NET_NS=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_RD_GZIP=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_LZO=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
-# CONFIG_EMBEDDED is not set
-CONFIG_UID16=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_PCSPKR_PLATFORM=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_HAVE_PERF_EVENTS=y
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_PERF_EVENTS=y
-CONFIG_EVENT_PROFILE=y
-# CONFIG_PERF_COUNTERS is not set
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_PCI_QUIRKS=y
-CONFIG_SLUB_DEBUG=y
-CONFIG_COMPAT_BRK=y
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-# CONFIG_SLOB is not set
-CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y
-CONFIG_OPROFILE=m
-# CONFIG_OPROFILE_IBS is not set
-# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
-CONFIG_HAVE_OPROFILE=y
-# CONFIG_KPROBES is not set
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_USER_RETURN_NOTIFIER=y
-CONFIG_HAVE_IOREMAP_PROT=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_ATTRS=y
-CONFIG_HAVE_DMA_API_DEBUG=y
-CONFIG_HAVE_HW_BREAKPOINT=y
-CONFIG_HAVE_USER_RETURN_NOTIFIER=y
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_SLOW_WORK=y
-# CONFIG_SLOW_WORK_DEBUG is not set
-# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
-CONFIG_SLABINFO=y
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-CONFIG_MODULE_FORCE_LOAD=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_STOP_MACHINE=y
-CONFIG_BLOCK=y
-CONFIG_BLK_DEV_BSG=y
-# CONFIG_BLK_DEV_INTEGRITY is not set
-CONFIG_BLOCK_COMPAT=y
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_PREEMPT_NOTIFIERS=y
-# CONFIG_INLINE_SPIN_TRYLOCK is not set
-# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK is not set
-# CONFIG_INLINE_SPIN_LOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-CONFIG_INLINE_SPIN_UNLOCK=y
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_READ_TRYLOCK is not set
-# CONFIG_INLINE_READ_LOCK is not set
-# CONFIG_INLINE_READ_LOCK_BH is not set
-# CONFIG_INLINE_READ_LOCK_IRQ is not set
-# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-CONFIG_INLINE_READ_UNLOCK=y
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_WRITE_TRYLOCK is not set
-# CONFIG_INLINE_WRITE_LOCK is not set
-# CONFIG_INLINE_WRITE_LOCK_BH is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-CONFIG_INLINE_WRITE_UNLOCK=y
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_FREEZER=y
-
-#
-# Processor type and features
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_SMP=y
-# CONFIG_SPARSE_IRQ is not set
-CONFIG_X86_MPPARSE=y
-# CONFIG_X86_EXTENDED_PLATFORM is not set
-CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-# CONFIG_PARAVIRT_GUEST is not set
-CONFIG_MEMTEST=y
-# CONFIG_M386 is not set
-# CONFIG_M486 is not set
-# CONFIG_M586 is not set
-# CONFIG_M586TSC is not set
-# CONFIG_M586MMX is not set
-# CONFIG_M686 is not set
-# CONFIG_MPENTIUMII is not set
-# CONFIG_MPENTIUMIII is not set
-# CONFIG_MPENTIUMM is not set
-# CONFIG_MPENTIUM4 is not set
-# CONFIG_MK6 is not set
-# CONFIG_MK7 is not set
-# CONFIG_MK8 is not set
-# CONFIG_MCRUSOE is not set
-# CONFIG_MEFFICEON is not set
-# CONFIG_MWINCHIPC6 is not set
-# CONFIG_MWINCHIP3D is not set
-# CONFIG_MGEODEGX1 is not set
-# CONFIG_MGEODE_LX is not set
-# CONFIG_MCYRIXIII is not set
-# CONFIG_MVIAC3_2 is not set
-# CONFIG_MVIAC7 is not set
-# CONFIG_MPSC is not set
-# CONFIG_MCORE2 is not set
-# CONFIG_MATOM is not set
-CONFIG_GENERIC_CPU=y
-CONFIG_X86_CPU=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=6
-CONFIG_X86_CMPXCHG=y
-CONFIG_X86_L1_CACHE_SHIFT=6
-CONFIG_X86_XADD=y
-CONFIG_X86_WP_WORKS_OK=y
-CONFIG_X86_TSC=y
-CONFIG_X86_CMPXCHG64=y
-CONFIG_X86_CMOV=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=64
-CONFIG_X86_DEBUGCTLMSR=y
-CONFIG_CPU_SUP_INTEL=y
-CONFIG_CPU_SUP_AMD=y
-CONFIG_CPU_SUP_CENTAUR=y
-# CONFIG_X86_DS is not set
-CONFIG_HPET_TIMER=y
-CONFIG_HPET_EMULATE_RTC=y
-CONFIG_DMI=y
-CONFIG_GART_IOMMU=y
-# CONFIG_CALGARY_IOMMU is not set
-# CONFIG_AMD_IOMMU is not set
-CONFIG_SWIOTLB=y
-CONFIG_IOMMU_HELPER=y
-# CONFIG_IOMMU_API is not set
-# CONFIG_MAXSMP is not set
-CONFIG_NR_CPUS=32
-CONFIG_SCHED_SMT=y
-CONFIG_SCHED_MC=y
-# CONFIG_PREEMPT_NONE is not set
-CONFIG_PREEMPT_VOLUNTARY=y
-# CONFIG_PREEMPT is not set
-CONFIG_X86_LOCAL_APIC=y
-CONFIG_X86_IO_APIC=y
-CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_X86_MCE=y
-CONFIG_X86_MCE_INTEL=y
-CONFIG_X86_MCE_AMD=y
-CONFIG_X86_MCE_THRESHOLD=y
-CONFIG_X86_MCE_INJECT=m
-CONFIG_X86_THERMAL_VECTOR=y
-CONFIG_I8K=m
-CONFIG_MICROCODE=m
-CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_AMD=y
-CONFIG_MICROCODE_OLD_INTERFACE=y
-CONFIG_X86_MSR=m
-CONFIG_X86_CPUID=m
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-CONFIG_DIRECT_GBPAGES=y
-# CONFIG_NUMA is not set
-CONFIG_ARCH_PROC_KCORE_TEXT=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_MEMORY_PROBE=y
-CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
-CONFIG_SELECT_MEMORY_MODEL=y
-# CONFIG_FLATMEM_MANUAL is not set
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_SPARSEMEM=y
-CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_SPARSEMEM_EXTREME=y
-CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
-CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_MEMORY_HOTPLUG=y
-CONFIG_MEMORY_HOTPLUG_SPARSE=y
-CONFIG_MEMORY_HOTREMOVE=y
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_MIGRATION=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_BOUNCE=y
-CONFIG_VIRT_TO_BUS=y
-CONFIG_MMU_NOTIFIER=y
-# CONFIG_KSM is not set
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
-# CONFIG_MEMORY_FAILURE is not set
-# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
-CONFIG_X86_RESERVE_LOW_64K=y
-CONFIG_MTRR=y
-CONFIG_MTRR_SANITIZER=y
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
-CONFIG_X86_PAT=y
-CONFIG_ARCH_USES_PG_UNCACHED=y
-CONFIG_EFI=y
-CONFIG_SECCOMP=y
-CONFIG_CC_STACKPROTECTOR=y
-# CONFIG_HZ_100 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_300 is not set
-CONFIG_HZ_1000=y
-CONFIG_HZ=1000
-CONFIG_SCHED_HRTICK=y
-# CONFIG_KEXEC is not set
-# CONFIG_CRASH_DUMP is not set
-CONFIG_PHYSICAL_START=0x1000000
-# CONFIG_RELOCATABLE is not set
-CONFIG_PHYSICAL_ALIGN=0x1000000
-CONFIG_HOTPLUG_CPU=y
-CONFIG_COMPAT_VDSO=y
-# CONFIG_CMDLINE_BOOL is not set
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-
-#
-# Power management and ACPI options
-#
-CONFIG_ARCH_HIBERNATION_HEADER=y
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_PM_SLEEP=y
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-CONFIG_HIBERNATION_NVS=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION="\"\""
-CONFIG_PM_RUNTIME=y
-CONFIG_ACPI=y
-CONFIG_ACPI_SLEEP=y
-CONFIG_ACPI_PROCFS=y
-CONFIG_ACPI_PROCFS_POWER=y
-CONFIG_ACPI_POWER_METER=m
-CONFIG_ACPI_SYSFS_POWER=y
-CONFIG_ACPI_PROC_EVENT=y
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_FAN=m
-CONFIG_ACPI_DOCK=y
-CONFIG_ACPI_PROCESSOR=m
-CONFIG_ACPI_HOTPLUG_CPU=y
-CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
-CONFIG_ACPI_THERMAL=m
-# CONFIG_ACPI_CUSTOM_DSDT is not set
-CONFIG_ACPI_BLACKLIST_YEAR=0
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_PCI_SLOT=m
-CONFIG_X86_PM_TIMER=y
-CONFIG_ACPI_CONTAINER=m
-CONFIG_ACPI_HOTPLUG_MEMORY=m
-CONFIG_ACPI_SBS=m
-CONFIG_SFI=y
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=m
-# CONFIG_CPU_FREQ_DEBUG is not set
-CONFIG_CPU_FREQ_STAT=m
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=m
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-
-#
-# CPUFreq processor drivers
-#
-CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_SPEEDSTEP_CENTRINO=m
-CONFIG_X86_P4_CLOCKMOD=m
-
-#
-# shared options
-#
-CONFIG_X86_SPEEDSTEP_LIB=m
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-
-#
-# Memory power savings
-#
-CONFIG_I7300_IDLE_IOAT_CHANNEL=y
-CONFIG_I7300_IDLE=m
-
-#
-# Bus options (PCI etc.)
-#
-CONFIG_PCI=y
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_MMCONFIG=y
-CONFIG_PCI_DOMAINS=y
-# CONFIG_DMAR is not set
-# CONFIG_INTR_REMAP is not set
-CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=m
-CONFIG_PCIEAER=y
-# CONFIG_PCIE_ECRC is not set
-CONFIG_PCIEAER_INJECT=m
-# CONFIG_PCIEASPM is not set
-CONFIG_ARCH_SUPPORTS_MSI=y
-CONFIG_PCI_MSI=y
-CONFIG_PCI_LEGACY=y
-# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_STUB=m
-CONFIG_HT_IRQ=y
-# CONFIG_PCI_IOV is not set
-CONFIG_PCI_IOAPIC=y
-CONFIG_ISA_DMA_API=y
-CONFIG_K8_NB=y
-CONFIG_PCCARD=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_PCMCIA_IOCTL=y
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_PCCARD_NONSTATIC=m
-CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_FAKE=m
-CONFIG_HOTPLUG_PCI_ACPI=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-# CONFIG_HOTPLUG_PCI_CPCI is not set
-CONFIG_HOTPLUG_PCI_SHPC=m
-
-#
-# Executable file formats / Emulations
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_COMPAT_BINFMT_ELF=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-# CONFIG_HAVE_AOUT is not set
-CONFIG_BINFMT_MISC=m
-CONFIG_IA32_EMULATION=y
-# CONFIG_IA32_AOUT is not set
-CONFIG_COMPAT=y
-CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
-CONFIG_SYSVIPC_COMPAT=y
-CONFIG_NET=y
-CONFIG_COMPAT_NETLINK_MESSAGES=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-CONFIG_XFRM_USER=y
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-CONFIG_XFRM_IPCOMP=m
-CONFIG_NET_KEY=m
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_ASK_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
-CONFIG_IP_FIB_HASH=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_LRO=y
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
-CONFIG_IPV6=m
-CONFIG_IPV6_PRIVACY=y
-# CONFIG_IPV6_ROUTER_PREF is not set
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_IPV6_SIT=m
-# CONFIG_IPV6_SIT_6RD is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=m
-# CONFIG_IPV6_MULTIPLE_TABLES is not set
-# CONFIG_IPV6_MROUTE is not set
-# CONFIG_NETLABEL is not set
-# CONFIG_NETWORK_SECMARK is not set
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=y
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_CT_ACCT=y
-CONFIG_NF_CONNTRACK_MARK=y
-# CONFIG_NF_CONNTRACK_EVENTS is not set
-CONFIG_NF_CT_PROTO_DCCP=m
-CONFIG_NF_CT_PROTO_GRE=m
-CONFIG_NF_CT_PROTO_SCTP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NETFILTER_TPROXY=m
-CONFIG_NETFILTER_XTABLES=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT=y
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_IP_VS=m
-# CONFIG_IP_VS_IPV6 is not set
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_AH_ESP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-CONFIG_IP_NF_QUEUE=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_LOG=m
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PROTO_DCCP=m
-CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_SECURITY=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-
-#
-# IPv6: Netfilter Configuration
-#
-CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_IP6_NF_QUEUE=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_TARGET_LOG=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_SECURITY=m
-
-#
-# DECnet: Netfilter Configuration
-#
-# CONFIG_DECNET_NF_GRABULATOR is not set
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_ULOG=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
-
-#
-# DCCP CCIDs Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-# CONFIG_IP_DCCP_CCID3 is not set
-
-#
-# DCCP Kernel Hacking
-#
-# CONFIG_IP_DCCP_DEBUG is not set
-CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_MSG is not set
-# CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_HMAC_NONE is not set
-# CONFIG_SCTP_HMAC_SHA1 is not set
-CONFIG_SCTP_HMAC_MD5=y
-CONFIG_RDS=m
-CONFIG_RDS_RDMA=m
-CONFIG_RDS_TCP=m
-# CONFIG_RDS_DEBUG is not set
-CONFIG_TIPC=m
-# CONFIG_TIPC_ADVANCED is not set
-# CONFIG_TIPC_DEBUG is not set
-CONFIG_ATM=m
-CONFIG_ATM_CLIP=m
-# CONFIG_ATM_CLIP_NO_ICMP is not set
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
-CONFIG_ATM_BR2684=m
-# CONFIG_ATM_BR2684_IPFILTER is not set
-CONFIG_STP=m
-CONFIG_GARP=m
-CONFIG_BRIDGE=m
-# CONFIG_NET_DSA is not set
-CONFIG_VLAN_8021Q=m
-CONFIG_VLAN_8021Q_GVRP=y
-CONFIG_DECNET=m
-# CONFIG_DECNET_ROUTER is not set
-CONFIG_LLC=m
-CONFIG_LLC2=m
-CONFIG_IPX=m
-# CONFIG_IPX_INTERN is not set
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=m
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
-CONFIG_WAN_ROUTER=m
-CONFIG_PHONET=m
-CONFIG_IEEE802154=m
-CONFIG_NET_SCHED=y
-
-#
-# Queueing/Scheduling
-#
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_INGRESS=m
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_ROUTE=y
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_EMATCH=y
-CONFIG_NET_EMATCH_STACK=32
-CONFIG_NET_EMATCH_CMP=m
-CONFIG_NET_EMATCH_NBYTE=m
-CONFIG_NET_EMATCH_U32=m
-CONFIG_NET_EMATCH_META=m
-CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=y
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-# CONFIG_NET_CLS_IND is not set
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_DCB is not set
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_DROP_MONITOR is not set
-CONFIG_HAMRADIO=y
-
-#
-# Packet Radio protocols
-#
-CONFIG_AX25=m
-# CONFIG_AX25_DAMA_SLAVE is not set
-CONFIG_NETROM=m
-CONFIG_ROSE=m
-
-#
-# AX.25 network device drivers
-#
-CONFIG_MKISS=m
-CONFIG_6PACK=m
-CONFIG_BPQETHER=m
-CONFIG_BAYCOM_SER_FDX=m
-CONFIG_BAYCOM_SER_HDX=m
-CONFIG_BAYCOM_PAR=m
-CONFIG_YAM=m
-CONFIG_CAN=m
-CONFIG_CAN_RAW=m
-CONFIG_CAN_BCM=m
-
-#
-# CAN Device Drivers
-#
-CONFIG_CAN_VCAN=m
-CONFIG_CAN_DEV=m
-# CONFIG_CAN_CALC_BITTIMING is not set
-CONFIG_CAN_SJA1000=m
-CONFIG_CAN_SJA1000_PLATFORM=m
-CONFIG_CAN_EMS_PCI=m
-CONFIG_CAN_KVASER_PCI=m
-
-#
-# CAN USB interfaces
-#
-CONFIG_CAN_EMS_USB=m
-# CONFIG_CAN_DEBUG_DEVICES is not set
-CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
-CONFIG_IRCOMM=m
-# CONFIG_IRDA_ULTRA is not set
-
-#
-# IrDA options
-#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=m
-
-#
-# Dongle support
-#
-CONFIG_DONGLE=y
-CONFIG_ESI_DONGLE=m
-CONFIG_ACTISYS_DONGLE=m
-CONFIG_TEKRAM_DONGLE=m
-CONFIG_TOIM3232_DONGLE=m
-CONFIG_LITELINK_DONGLE=m
-CONFIG_MA600_DONGLE=m
-CONFIG_GIRBIL_DONGLE=m
-CONFIG_MCP2120_DONGLE=m
-CONFIG_OLD_BELKIN_DONGLE=m
-CONFIG_ACT200L_DONGLE=m
-CONFIG_KINGSUN_DONGLE=m
-CONFIG_KSDAZZLE_DONGLE=m
-CONFIG_KS959_DONGLE=m
-
-#
-# FIR device drivers
-#
-CONFIG_USB_IRDA=m
-CONFIG_SIGMATEL_FIR=m
-CONFIG_NSC_FIR=m
-CONFIG_WINBOND_FIR=m
-CONFIG_SMC_IRCC_FIR=m
-CONFIG_ALI_FIR=m
-CONFIG_VLSI_FIR=m
-CONFIG_VIA_FIR=m
-CONFIG_MCS_FIR=m
-CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_CMTP=m
-CONFIG_BT_HIDP=m
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_ATH3K=m
-CONFIG_AF_RXRPC=m
-# CONFIG_AF_RXRPC_DEBUG is not set
-CONFIG_RXKAD=m
-CONFIG_FIB_RULES=y
-CONFIG_WIRELESS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WEXT_PRIV=y
-CONFIG_CFG80211=m
-# CONFIG_NL80211_TESTMODE is not set
-# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_REG_DEBUG is not set
-CONFIG_CFG80211_DEFAULT_PS=y
-# CONFIG_CFG80211_DEBUGFS is not set
-CONFIG_WIRELESS_OLD_REGULATORY=y
-CONFIG_CFG80211_WEXT=y
-CONFIG_WIRELESS_EXT_SYSFS=y
-CONFIG_LIB80211=m
-CONFIG_LIB80211_CRYPT_WEP=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_MAC80211=m
-CONFIG_MAC80211_RC_MINSTREL=y
-# CONFIG_MAC80211_RC_DEFAULT_PID is not set
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT="minstrel"
-CONFIG_MAC80211_MESH=y
-CONFIG_MAC80211_LEDS=y
-# CONFIG_MAC80211_DEBUGFS is not set
-# CONFIG_MAC80211_DEBUG_MENU is not set
-CONFIG_WIMAX=m
-CONFIG_WIMAX_DEBUG_LEVEL=8
-CONFIG_RFKILL=m
-CONFIG_RFKILL_LEDS=y
-CONFIG_RFKILL_INPUT=y
-CONFIG_NET_9P=m
-CONFIG_NET_9P_VIRTIO=m
-CONFIG_NET_9P_RDMA=m
-# CONFIG_NET_9P_DEBUG is not set
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
-CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_SYS_HYPERVISOR is not set
-CONFIG_CONNECTOR=m
-CONFIG_MTD=m
-# CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_TESTS=m
-CONFIG_MTD_CONCAT=m
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MTD_REDBOOT_PARTS=m
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
-# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-CONFIG_MTD_AR7_PARTS=m
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_CHAR=m
-CONFIG_HAVE_MTD_OTP=y
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
-CONFIG_FTL=m
-CONFIG_NFTL=m
-CONFIG_NFTL_RW=y
-CONFIG_INFTL=m
-CONFIG_RFD_FTL=m
-CONFIG_SSFDC=m
-CONFIG_MTD_OOPS=m
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=m
-CONFIG_MTD_JEDECPROBE=m
-CONFIG_MTD_GEN_PROBE=m
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-CONFIG_MTD_CFI_NOSWAP=y
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_GEOMETRY=y
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-CONFIG_MTD_MAP_BANK_WIDTH_8=y
-CONFIG_MTD_MAP_BANK_WIDTH_16=y
-CONFIG_MTD_MAP_BANK_WIDTH_32=y
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-CONFIG_MTD_CFI_I4=y
-CONFIG_MTD_CFI_I8=y
-CONFIG_MTD_OTP=y
-CONFIG_MTD_CFI_INTELEXT=m
-CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_CFI_STAA=m
-CONFIG_MTD_CFI_UTIL=m
-CONFIG_MTD_RAM=m
-CONFIG_MTD_ROM=m
-CONFIG_MTD_ABSENT=m
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=m
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-CONFIG_MTD_SC520CDP=m
-CONFIG_MTD_NETSC520=m
-CONFIG_MTD_TS5500=m
-CONFIG_MTD_SBC_GXX=m
-CONFIG_MTD_AMD76XROM=m
-CONFIG_MTD_ICHXROM=m
-CONFIG_MTD_ESB2ROM=m
-CONFIG_MTD_CK804XROM=m
-CONFIG_MTD_SCB2_FLASH=m
-CONFIG_MTD_NETtel=m
-CONFIG_MTD_L440GX=m
-CONFIG_MTD_PCI=m
-CONFIG_MTD_GPIO_ADDR=m
-CONFIG_MTD_INTEL_VR_NOR=m
-CONFIG_MTD_PLATRAM=m
-
-#
-# Self-contained MTD device drivers
-#
-CONFIG_MTD_PMC551=m
-CONFIG_MTD_PMC551_BUGFIX=y
-# CONFIG_MTD_PMC551_DEBUG is not set
-CONFIG_MTD_SLRAM=m
-CONFIG_MTD_PHRAM=m
-CONFIG_MTD_MTDRAM=m
-CONFIG_MTDRAM_TOTAL_SIZE=4096
-CONFIG_MTDRAM_ERASE_SIZE=128
-CONFIG_MTD_BLOCK2MTD=m
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-CONFIG_MTD_DOC2001PLUS=m
-CONFIG_MTD_DOCPROBE=m
-CONFIG_MTD_DOCECC=m
-CONFIG_MTD_DOCPROBE_ADVANCED=y
-CONFIG_MTD_DOCPROBE_ADDRESS=0x0000
-CONFIG_MTD_DOCPROBE_HIGH=y
-CONFIG_MTD_DOCPROBE_55AA=y
-CONFIG_MTD_NAND=m
-CONFIG_MTD_NAND_VERIFY_WRITE=y
-CONFIG_MTD_NAND_ECC_SMC=y
-CONFIG_MTD_NAND_MUSEUM_IDS=y
-CONFIG_MTD_NAND_IDS=m
-CONFIG_MTD_NAND_DISKONCHIP=m
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y
-CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y
-CONFIG_MTD_NAND_CAFE=m
-CONFIG_MTD_NAND_NANDSIM=m
-CONFIG_MTD_NAND_PLATFORM=m
-CONFIG_MTD_ALAUDA=m
-CONFIG_MTD_ONENAND=m
-CONFIG_MTD_ONENAND_VERIFY_WRITE=y
-CONFIG_MTD_ONENAND_GENERIC=m
-CONFIG_MTD_ONENAND_OTP=y
-CONFIG_MTD_ONENAND_2X_PROGRAM=y
-CONFIG_MTD_ONENAND_SIM=m
-
-#
-# LPDDR flash memory drivers
-#
-CONFIG_MTD_LPDDR=m
-CONFIG_MTD_QINFO_PROBE=m
-
-#
-# UBI - Unsorted block images
-#
-CONFIG_MTD_UBI=m
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_RESERVE=1
-CONFIG_MTD_UBI_GLUEBI=m
-
-#
-# UBI debugging options
-#
-# CONFIG_MTD_UBI_DEBUG is not set
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_SERIAL=m
-# CONFIG_PARPORT_PC_FIFO is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_AX88796=m
-CONFIG_PARPORT_1284=y
-CONFIG_PARPORT_NOT_PC=y
-CONFIG_PNP=y
-CONFIG_PNP_DEBUG_MESSAGES=y
-
-#
-# Protocols
-#
-CONFIG_PNPACPI=y
-CONFIG_BLK_DEV=y
-CONFIG_BLK_DEV_FD=y
-CONFIG_PARIDE=m
-
-#
-# Parallel IDE high-level drivers
-#
-CONFIG_PARIDE_PD=m
-CONFIG_PARIDE_PCD=m
-CONFIG_PARIDE_PF=m
-CONFIG_PARIDE_PT=m
-CONFIG_PARIDE_PG=m
-
-#
-# Parallel IDE protocol modules
-#
-CONFIG_PARIDE_ATEN=m
-CONFIG_PARIDE_BPCK=m
-CONFIG_PARIDE_COMM=m
-CONFIG_PARIDE_DSTR=m
-CONFIG_PARIDE_FIT2=m
-CONFIG_PARIDE_FIT3=m
-CONFIG_PARIDE_EPAT=m
-CONFIG_PARIDE_EPATC8=y
-CONFIG_PARIDE_EPIA=m
-CONFIG_PARIDE_FRIQ=m
-CONFIG_PARIDE_FRPW=m
-CONFIG_PARIDE_KBIC=m
-CONFIG_PARIDE_KTTI=m
-CONFIG_PARIDE_ON20=m
-CONFIG_PARIDE_ON26=m
-CONFIG_BLK_CPQ_DA=y
-CONFIG_BLK_CPQ_CISS_DA=y
-CONFIG_CISS_SCSI_TAPE=y
-CONFIG_BLK_DEV_DAC960=y
-CONFIG_BLK_DEV_UMEM=m
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_DRBD=m
-# CONFIG_DRBD_FAULT_INJECTION is not set
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_OSD=m
-CONFIG_BLK_DEV_SX8=y
-# CONFIG_BLK_DEV_UB is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=16384
-# CONFIG_BLK_DEV_XIP is not set
-CONFIG_CDROM_PKTCDVD=m
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_ATA_OVER_ETH=m
-CONFIG_VIRTIO_BLK=m
-# CONFIG_BLK_DEV_HD is not set
-CONFIG_MISC_DEVICES=y
-CONFIG_AD525X_DPOT=m
-CONFIG_IBM_ASM=m
-CONFIG_PHANTOM=m
-CONFIG_SGI_IOC4=m
-CONFIG_TIFM_CORE=m
-CONFIG_TIFM_7XX1=m
-CONFIG_ICS932S401=m
-CONFIG_ENCLOSURE_SERVICES=m
-CONFIG_CS5535_MFGPT=m
-CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
-CONFIG_HP_ILO=m
-CONFIG_ISL29003=m
-CONFIG_DS1682=m
-# CONFIG_C2PORT is not set
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT24=m
-CONFIG_EEPROM_LEGACY=m
-CONFIG_EEPROM_MAX6875=m
-CONFIG_EEPROM_93CX6=m
-CONFIG_CB710_CORE=m
-# CONFIG_CB710_DEBUG is not set
-CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-CONFIG_IWMC3200TOP=m
-# CONFIG_IWMC3200TOP_DEBUG is not set
-# CONFIG_IWMC3200TOP_DEBUGFS is not set
-CONFIG_HAVE_IDE=y
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-CONFIG_RAID_ATTRS=y
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_TGT=y
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_ST=y
-CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_ENCLOSURE=m
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-CONFIG_SCSI_WAIT_SCAN=m
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=y
-CONFIG_SCSI_FC_ATTRS=y
-CONFIG_SCSI_FC_TGT_ATTRS=y
-CONFIG_SCSI_ISCSI_ATTRS=y
-CONFIG_SCSI_SAS_ATTRS=y
-CONFIG_SCSI_SAS_LIBSAS=y
-CONFIG_SCSI_SAS_ATA=y
-CONFIG_SCSI_SAS_HOST_SMP=y
-# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
-CONFIG_SCSI_SRP_ATTRS=m
-CONFIG_SCSI_SRP_TGT_ATTRS=y
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ISCSI_TCP=m
-CONFIG_SCSI_CXGB3_ISCSI=m
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_BE2ISCSI=m
-CONFIG_BLK_DEV_3W_XXXX_RAID=y
-CONFIG_SCSI_HPSA=y
-CONFIG_SCSI_3W_9XXX=y
-CONFIG_SCSI_3W_SAS=y
-CONFIG_SCSI_ACARD=y
-CONFIG_SCSI_AACRAID=y
-CONFIG_SCSI_AIC7XXX=y
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=4
-CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-CONFIG_AIC7XXX_DEBUG_MASK=0
-# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
-CONFIG_SCSI_AIC7XXX_OLD=y
-CONFIG_SCSI_AIC79XX=y
-CONFIG_AIC79XX_CMDS_PER_DEVICE=4
-CONFIG_AIC79XX_RESET_DELAY_MS=15000
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
-CONFIG_AIC79XX_DEBUG_MASK=0
-# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
-CONFIG_SCSI_AIC94XX=y
-# CONFIG_AIC94XX_DEBUG is not set
-CONFIG_SCSI_MVSAS=y
-# CONFIG_SCSI_MVSAS_DEBUG is not set
-CONFIG_SCSI_DPT_I2O=m
-CONFIG_SCSI_ADVANSYS=y
-CONFIG_SCSI_ARCMSR=y
-# CONFIG_SCSI_ARCMSR_AER is not set
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_MM=y
-CONFIG_MEGARAID_MAILBOX=y
-CONFIG_MEGARAID_LEGACY=y
-CONFIG_MEGARAID_SAS=y
-CONFIG_SCSI_MPT2SAS=y
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-# CONFIG_SCSI_MPT2SAS_LOGGING is not set
-CONFIG_SCSI_HPTIOP=y
-CONFIG_SCSI_BUSLOGIC=y
-CONFIG_VMWARE_PVSCSI=m
-CONFIG_LIBFC=y
-CONFIG_LIBFCOE=y
-CONFIG_FCOE=y
-CONFIG_FCOE_FNIC=y
-CONFIG_SCSI_DMX3191D=y
-CONFIG_SCSI_EATA=y
-# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
-# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
-CONFIG_SCSI_EATA_MAX_TAGS=16
-CONFIG_SCSI_FUTURE_DOMAIN=y
-CONFIG_SCSI_GDTH=y
-CONFIG_SCSI_IPS=y
-CONFIG_SCSI_INITIO=y
-CONFIG_SCSI_INIA100=y
-CONFIG_SCSI_PPA=m
-CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
-# CONFIG_SCSI_IZIP_SLOW_CTR is not set
-CONFIG_SCSI_STEX=y
-CONFIG_SCSI_SYM53C8XX_2=y
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_SCSI_IPR=y
-# CONFIG_SCSI_IPR_TRACE is not set
-# CONFIG_SCSI_IPR_DUMP is not set
-CONFIG_SCSI_QLOGIC_1280=y
-CONFIG_SCSI_QLA_FC=y
-CONFIG_SCSI_QLA_ISCSI=y
-CONFIG_SCSI_LPFC=y
-# CONFIG_SCSI_LPFC_DEBUG_FS is not set
-CONFIG_SCSI_DC395x=y
-CONFIG_SCSI_DC390T=y
-CONFIG_SCSI_DEBUG=m
-CONFIG_SCSI_PMCRAID=y
-CONFIG_SCSI_PM8001=y
-CONFIG_SCSI_SRP=y
-CONFIG_SCSI_BFA_FC=y
-CONFIG_SCSI_LOWLEVEL_PCMCIA=y
-CONFIG_PCMCIA_FDOMAIN=m
-CONFIG_PCMCIA_QLOGIC=m
-CONFIG_PCMCIA_SYM53C500=m
-CONFIG_SCSI_DH=m
-CONFIG_SCSI_DH_RDAC=m
-CONFIG_SCSI_DH_HP_SW=m
-CONFIG_SCSI_DH_EMC=m
-CONFIG_SCSI_DH_ALUA=m
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
-CONFIG_SCSI_OSD_DPRINT_SENSE=1
-# CONFIG_SCSI_OSD_DEBUG is not set
-CONFIG_ATA=y
-# CONFIG_ATA_NONSTANDARD is not set
-CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_ATA_ACPI=y
-CONFIG_SATA_PMP=y
-CONFIG_SATA_AHCI=y
-CONFIG_SATA_SIL24=y
-CONFIG_ATA_SFF=y
-CONFIG_SATA_SVW=y
-CONFIG_ATA_PIIX=y
-CONFIG_SATA_MV=y
-CONFIG_SATA_NV=y
-CONFIG_PDC_ADMA=y
-CONFIG_SATA_QSTOR=y
-CONFIG_SATA_PROMISE=y
-CONFIG_SATA_SX4=y
-CONFIG_SATA_SIL=y
-CONFIG_SATA_SIS=y
-CONFIG_SATA_ULI=y
-CONFIG_SATA_VIA=y
-CONFIG_SATA_VITESSE=y
-CONFIG_SATA_INIC162X=y
-CONFIG_PATA_ACPI=y
-CONFIG_PATA_ALI=y
-CONFIG_PATA_AMD=y
-CONFIG_PATA_ARTOP=y
-CONFIG_PATA_ATP867X=y
-CONFIG_PATA_ATIIXP=y
-CONFIG_PATA_CMD640_PCI=y
-CONFIG_PATA_CMD64X=y
-CONFIG_PATA_CS5520=y
-CONFIG_PATA_CS5530=y
-CONFIG_PATA_CYPRESS=y
-CONFIG_PATA_EFAR=y
-CONFIG_ATA_GENERIC=y
-CONFIG_PATA_HPT366=y
-CONFIG_PATA_HPT37X=y
-CONFIG_PATA_HPT3X2N=y
-CONFIG_PATA_HPT3X3=y
-CONFIG_PATA_HPT3X3_DMA=y
-CONFIG_PATA_IT821X=y
-CONFIG_PATA_IT8213=y
-CONFIG_PATA_JMICRON=y
-CONFIG_PATA_TRIFLEX=y
-CONFIG_PATA_MARVELL=y
-CONFIG_PATA_MPIIX=y
-CONFIG_PATA_OLDPIIX=y
-CONFIG_PATA_NETCELL=y
-CONFIG_PATA_NINJA32=y
-CONFIG_PATA_NS87410=y
-CONFIG_PATA_NS87415=y
-CONFIG_PATA_OPTI=y
-CONFIG_PATA_OPTIDMA=y
-CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_PDC2027X=y
-CONFIG_PATA_PDC_OLD=y
-CONFIG_PATA_RADISYS=y
-CONFIG_PATA_RDC=y
-CONFIG_PATA_RZ1000=y
-CONFIG_PATA_SC1200=y
-CONFIG_PATA_SERVERWORKS=y
-CONFIG_PATA_SIL680=y
-CONFIG_PATA_SIS=y
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_VIA=y
-CONFIG_PATA_WINBOND=y
-CONFIG_PATA_SCH=y
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=y
-CONFIG_MD_AUTODETECT=y
-CONFIG_MD_LINEAR=y
-CONFIG_MD_RAID0=y
-CONFIG_MD_RAID1=y
-CONFIG_MD_RAID10=y
-CONFIG_MD_RAID456=y
-# CONFIG_MULTICORE_RAID456 is not set
-CONFIG_MD_RAID6_PQ=y
-CONFIG_ASYNC_RAID6_TEST=m
-CONFIG_MD_MULTIPATH=y
-CONFIG_MD_FAULTY=m
-CONFIG_BLK_DEV_DM=y
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_CRYPT=y
-CONFIG_DM_SNAPSHOT=y
-CONFIG_DM_MIRROR=y
-CONFIG_DM_LOG_USERSPACE=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_QL=m
-CONFIG_DM_MULTIPATH_ST=m
-# CONFIG_DM_DELAY is not set
-CONFIG_DM_UEVENT=y
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=y
-CONFIG_FUSION_FC=y
-CONFIG_FUSION_SAS=y
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_CTL=y
-CONFIG_FUSION_LAN=y
-# CONFIG_FUSION_LOGGING is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# You can enable one or both FireWire driver stacks.
-#
-
-#
-# The newer stack is recommended.
-#
-# CONFIG_FIREWIRE is not set
-CONFIG_IEEE1394=m
-CONFIG_IEEE1394_OHCI1394=m
-CONFIG_IEEE1394_PCILYNX=m
-CONFIG_IEEE1394_SBP2=m
-# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
-CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y
-CONFIG_IEEE1394_ETH1394=m
-CONFIG_IEEE1394_RAWIO=m
-CONFIG_IEEE1394_VIDEO1394=m
-CONFIG_IEEE1394_DV1394=m
-# CONFIG_IEEE1394_VERBOSEDEBUG is not set
-CONFIG_I2O=y
-CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
-CONFIG_I2O_EXT_ADAPTEC=y
-CONFIG_I2O_EXT_ADAPTEC_DMA64=y
-CONFIG_I2O_CONFIG=y
-# CONFIG_I2O_CONFIG_OLD_IOCTL is not set
-CONFIG_I2O_BUS=y
-CONFIG_I2O_BLOCK=y
-CONFIG_I2O_SCSI=y
-CONFIG_I2O_PROC=y
-CONFIG_MACINTOSH_DRIVERS=y
-CONFIG_MAC_EMUMOUSEBTN=y
-CONFIG_NETDEVICES=y
-CONFIG_IFB=m
-CONFIG_DUMMY=m
-CONFIG_BONDING=m
-CONFIG_MACVLAN=m
-CONFIG_EQUALIZER=m
-CONFIG_TUN=m
-CONFIG_VETH=m
-CONFIG_NET_SB1000=m
-CONFIG_ARCNET=m
-CONFIG_ARCNET_1201=m
-CONFIG_ARCNET_1051=m
-CONFIG_ARCNET_RAW=m
-CONFIG_ARCNET_CAP=m
-CONFIG_ARCNET_COM90xx=m
-CONFIG_ARCNET_COM90xxIO=m
-CONFIG_ARCNET_RIM_I=m
-CONFIG_ARCNET_COM20020=m
-CONFIG_ARCNET_COM20020_PCI=m
-CONFIG_PHYLIB=m
-
-#
-# MII PHY device drivers
-#
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_SMSC_PHY=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_STE10XP=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_MDIO_BITBANG=m
-CONFIG_MDIO_GPIO=m
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=m
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_CASSINI=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-CONFIG_ETHOC=m
-CONFIG_DNET=m
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_DE2104X_DSL=0
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-CONFIG_TULIP_MMIO=y
-# CONFIG_TULIP_NAPI is not set
-CONFIG_DE4X5=m
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_ULI526X=m
-CONFIG_PCMCIA_XIRCOM=m
-CONFIG_HP100=m
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
-# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
-# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=m
-CONFIG_AMD8111_ETH=m
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_FORCEDETH=m
-CONFIG_FORCEDETH_NAPI=y
-CONFIG_E100=m
-CONFIG_FEALNX=m
-CONFIG_NATSEMI=m
-CONFIG_NE2K_PCI=m
-CONFIG_8139CP=m
-CONFIG_8139TOO=m
-CONFIG_8139TOO_PIO=y
-# CONFIG_8139TOO_TUNE_TWISTER is not set
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_R6040=m
-CONFIG_SIS900=m
-CONFIG_EPIC100=m
-CONFIG_SMSC9420=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_TLAN=m
-CONFIG_KS8842=m
-CONFIG_KS8851_MLL=m
-CONFIG_VIA_RHINE=m
-CONFIG_VIA_RHINE_MMIO=y
-CONFIG_SC92031=m
-CONFIG_NET_POCKET=y
-CONFIG_ATP=m
-CONFIG_DE600=m
-CONFIG_DE620=m
-CONFIG_ATL2=m
-CONFIG_NETDEV_1000=y
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-CONFIG_E1000E=m
-CONFIG_IP1000=m
-CONFIG_IGB=m
-CONFIG_IGB_DCA=y
-CONFIG_IGBVF=m
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-CONFIG_R8169_VLAN=y
-CONFIG_SIS190=m
-CONFIG_SKGE=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKY2=m
-# CONFIG_SKY2_DEBUG is not set
-CONFIG_VIA_VELOCITY=m
-CONFIG_TIGON3=m
-CONFIG_BNX2=m
-CONFIG_CNIC=m
-CONFIG_QLA3XXX=m
-CONFIG_ATL1=m
-CONFIG_ATL1E=m
-CONFIG_ATL1C=m
-CONFIG_JME=m
-CONFIG_NETDEV_10000=y
-CONFIG_MDIO=m
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3_DEPENDS=y
-CONFIG_CHELSIO_T3=m
-CONFIG_ENIC=m
-CONFIG_IXGBE=m
-CONFIG_IXGBE_DCA=y
-CONFIG_IXGB=m
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_MYRI10GE=m
-CONFIG_MYRI10GE_DCA=y
-CONFIG_NETXEN_NIC=m
-CONFIG_NIU=m
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-CONFIG_TEHUTI=m
-CONFIG_BNX2X=m
-CONFIG_QLGE=m
-CONFIG_SFC=m
-CONFIG_SFC_MTD=y
-CONFIG_BE2NET=m
-CONFIG_TR=m
-CONFIG_IBMOL=m
-CONFIG_3C359=m
-CONFIG_TMS380TR=m
-CONFIG_TMSPCI=m
-CONFIG_ABYSS=m
-CONFIG_WLAN=y
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_LIBERTAS_THINFIRM=m
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_AIRO=m
-CONFIG_ATMEL=m
-CONFIG_PCI_ATMEL=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_AT76C50X_USB=m
-CONFIG_AIRO_CS=m
-CONFIG_PCMCIA_WL3501=m
-CONFIG_PRISM54=m
-CONFIG_USB_ZD1201=m
-CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_RTL8180=m
-CONFIG_RTL8187=m
-CONFIG_RTL8187_LEDS=y
-CONFIG_ADM8211=m
-# CONFIG_MAC80211_HWSIM is not set
-CONFIG_MWL8K=m
-CONFIG_ATH_COMMON=m
-# CONFIG_ATH_DEBUG is not set
-CONFIG_ATH5K=m
-# CONFIG_ATH5K_DEBUG is not set
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K_COMMON=m
-CONFIG_ATH9K=m
-# CONFIG_ATH9K_DEBUGFS is not set
-CONFIG_AR9170_USB=m
-CONFIG_AR9170_LEDS=y
-CONFIG_B43=m
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PCMCIA=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_PIO=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_LEDS=y
-CONFIG_B43_HWRNG=y
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY_HWRNG=y
-# CONFIG_B43LEGACY_DEBUG is not set
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-CONFIG_HOSTAP_FIRMWARE_NVRAM=y
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_CS=m
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y
-# CONFIG_IWLWIFI_DEBUG is not set
-# CONFIG_IWLWIFI_DEVICE_TRACING is not set
-CONFIG_IWLAGN=m
-CONFIG_IWL4965=y
-CONFIG_IWL5000=y
-CONFIG_IWL3945=m
-CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y
-CONFIG_IWM=m
-# CONFIG_IWM_DEBUG is not set
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
-CONFIG_LIBERTAS_SDIO=m
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_HERMES=m
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_USB=m
-CONFIG_P54_PCI=m
-CONFIG_P54_LEDS=y
-CONFIG_RT2X00=m
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT61PCI=m
-CONFIG_RT2800PCI_PCI=m
-CONFIG_RT2800PCI=m
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-CONFIG_RT2800USB=m
-CONFIG_RT2800_LIB=m
-CONFIG_RT2X00_LIB_PCI=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_HT=y
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_LEDS=y
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_WL12XX=m
-CONFIG_WL1251=m
-CONFIG_WL1251_SDIO=m
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-
-#
-# WiMAX Wireless Broadband devices
-#
-CONFIG_WIMAX_I2400M=m
-CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_SDIO=m
-# CONFIG_WIMAX_IWMC3200_SDIO is not set
-CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-# CONFIG_USB_EPSON2888 is not set
-# CONFIG_USB_KC2190 is not set
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_HSO=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_CDC_PHONET=m
-CONFIG_NET_PCMCIA=y
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_AXNET=m
-CONFIG_ARCNET_COM20020_CS=m
-CONFIG_PCMCIA_IBMTR=m
-CONFIG_WAN=y
-CONFIG_LANMEDIA=m
-CONFIG_HDLC=m
-CONFIG_HDLC_RAW=m
-CONFIG_HDLC_RAW_ETH=m
-CONFIG_HDLC_CISCO=m
-CONFIG_HDLC_FR=m
-CONFIG_HDLC_PPP=m
-
-#
-# X.25/LAPB support is disabled
-#
-CONFIG_PCI200SYN=m
-CONFIG_WANXL=m
-# CONFIG_PC300TOO is not set
-CONFIG_FARSYNC=m
-CONFIG_DSCC4=m
-# CONFIG_DSCC4_PCISYNC is not set
-# CONFIG_DSCC4_PCI_RST is not set
-CONFIG_DLCI=m
-CONFIG_DLCI_MAX=8
-CONFIG_WAN_ROUTER_DRIVERS=m
-CONFIG_CYCLADES_SYNC=m
-CONFIG_CYCLOMX_X25=y
-CONFIG_SBNI=m
-# CONFIG_SBNI_MULTILINE is not set
-CONFIG_ATM_DRIVERS=y
-CONFIG_ATM_DUMMY=m
-CONFIG_ATM_TCP=m
-CONFIG_ATM_LANAI=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-# CONFIG_ATM_ENI_TUNE_BURST is not set
-CONFIG_ATM_FIRESTREAM=m
-CONFIG_ATM_ZATM=m
-# CONFIG_ATM_ZATM_DEBUG is not set
-CONFIG_ATM_IDT77252=m
-# CONFIG_ATM_IDT77252_DEBUG is not set
-# CONFIG_ATM_IDT77252_RCV_ALL is not set
-CONFIG_ATM_IDT77252_USE_SUNI=y
-CONFIG_ATM_AMBASSADOR=m
-# CONFIG_ATM_AMBASSADOR_DEBUG is not set
-CONFIG_ATM_HORIZON=m
-# CONFIG_ATM_HORIZON_DEBUG is not set
-CONFIG_ATM_IA=m
-# CONFIG_ATM_IA_DEBUG is not set
-CONFIG_ATM_FORE200E=m
-# CONFIG_ATM_FORE200E_USE_TASKLET is not set
-CONFIG_ATM_FORE200E_TX_RETRY=16
-CONFIG_ATM_FORE200E_DEBUG=0
-CONFIG_ATM_HE=m
-# CONFIG_ATM_HE_USE_SUNI is not set
-CONFIG_ATM_SOLOS=m
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKEHARD=m
-CONFIG_FDDI=y
-CONFIG_DEFXX=m
-# CONFIG_DEFXX_MMIO is not set
-CONFIG_SKFP=m
-CONFIG_HIPPI=y
-CONFIG_ROADRUNNER=m
-# CONFIG_ROADRUNNER_LARGE_RINGS is not set
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_MPPE=m
-CONFIG_PPPOE=m
-CONFIG_PPPOATM=m
-CONFIG_PPPOL2TP=m
-CONFIG_SLIP=m
-CONFIG_SLIP_COMPRESSED=y
-CONFIG_SLHC=m
-CONFIG_SLIP_SMART=y
-# CONFIG_SLIP_MODE_SLIP6 is not set
-CONFIG_NET_FC=y
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-# CONFIG_NETPOLL_TRAP is not set
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_VIRTIO_NET=m
-CONFIG_VMXNET3=m
-CONFIG_ISDN=y
-CONFIG_ISDN_I4L=m
-CONFIG_MISDN=m
-CONFIG_MISDN_DSP=m
-CONFIG_MISDN_L1OIP=m
-
-#
-# mISDN hardware drivers
-#
-CONFIG_MISDN_HFCPCI=m
-CONFIG_MISDN_HFCMULTI=m
-CONFIG_MISDN_HFCUSB=m
-CONFIG_MISDN_AVMFRITZ=m
-CONFIG_MISDN_SPEEDFAX=m
-CONFIG_MISDN_INFINEON=m
-CONFIG_MISDN_W6692=m
-CONFIG_MISDN_NETJET=m
-CONFIG_MISDN_IPAC=m
-CONFIG_MISDN_ISAR=m
-CONFIG_ISDN_PPP=y
-CONFIG_ISDN_PPP_VJ=y
-CONFIG_ISDN_MPP=y
-CONFIG_IPPP_FILTER=y
-CONFIG_ISDN_PPP_BSDCOMP=m
-CONFIG_ISDN_AUDIO=y
-CONFIG_ISDN_TTY_FAX=y
-
-#
-# ISDN feature submodules
-#
-CONFIG_ISDN_DIVERSION=m
-
-#
-# ISDN4Linux hardware drivers
-#
-
-#
-# Passive cards
-#
-CONFIG_ISDN_DRV_HISAX=m
-
-#
-# D-channel protocol features
-#
-CONFIG_HISAX_EURO=y
-CONFIG_DE_AOC=y
-CONFIG_HISAX_NO_SENDCOMPLETE=y
-CONFIG_HISAX_NO_LLC=y
-CONFIG_HISAX_NO_KEYPAD=y
-CONFIG_HISAX_1TR6=y
-CONFIG_HISAX_NI1=y
-CONFIG_HISAX_MAX_CARDS=8
-
-#
-# HiSax supported cards
-#
-CONFIG_HISAX_16_3=y
-CONFIG_HISAX_TELESPCI=y
-CONFIG_HISAX_S0BOX=y
-CONFIG_HISAX_FRITZPCI=y
-CONFIG_HISAX_AVM_A1_PCMCIA=y
-CONFIG_HISAX_ELSA=y
-CONFIG_HISAX_DIEHLDIVA=y
-CONFIG_HISAX_SEDLBAUER=y
-CONFIG_HISAX_NETJET=y
-CONFIG_HISAX_NETJET_U=y
-CONFIG_HISAX_NICCY=y
-CONFIG_HISAX_BKM_A4T=y
-CONFIG_HISAX_SCT_QUADRO=y
-CONFIG_HISAX_GAZEL=y
-CONFIG_HISAX_HFC_PCI=y
-CONFIG_HISAX_W6692=y
-CONFIG_HISAX_HFC_SX=y
-CONFIG_HISAX_ENTERNOW_PCI=y
-# CONFIG_HISAX_DEBUG is not set
-
-#
-# HiSax PCMCIA card service modules
-#
-CONFIG_HISAX_SEDLBAUER_CS=m
-CONFIG_HISAX_ELSA_CS=m
-CONFIG_HISAX_AVM_A1_CS=m
-CONFIG_HISAX_TELES_CS=m
-
-#
-# HiSax sub driver modules
-#
-CONFIG_HISAX_ST5481=m
-CONFIG_HISAX_HFCUSB=m
-CONFIG_HISAX_HFC4S8S=m
-CONFIG_HISAX_FRITZ_PCIPNP=m
-
-#
-# Active cards
-#
-CONFIG_HYSDN=m
-CONFIG_HYSDN_CAPI=y
-CONFIG_ISDN_HDLC=m
-CONFIG_ISDN_CAPI=m
-CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
-CONFIG_CAPI_TRACE=y
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
-CONFIG_ISDN_CAPI_CAPIFS=m
-CONFIG_ISDN_CAPI_CAPIDRV=m
-
-#
-# CAPI hardware drivers
-#
-CONFIG_CAPI_AVM=y
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-CONFIG_CAPI_EICON=y
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS_USERIDI=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DRV_GIGASET=m
-# CONFIG_GIGASET_CAPI is not set
-CONFIG_GIGASET_I4L=y
-# CONFIG_GIGASET_DUMMYLL is not set
-CONFIG_GIGASET_BASE=m
-CONFIG_GIGASET_M105=m
-# CONFIG_GIGASET_M101 is not set
-# CONFIG_GIGASET_DEBUG is not set
-CONFIG_PHONE=m
-CONFIG_PHONE_IXJ=m
-CONFIG_PHONE_IXJ_PCMCIA=m
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-CONFIG_INPUT_FF_MEMLESS=y
-CONFIG_INPUT_POLLDEV=m
-CONFIG_INPUT_SPARSEKMAP=m
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ADP5588=m
-CONFIG_KEYBOARD_ATKBD=y
-CONFIG_QT2160=m
-# CONFIG_KEYBOARD_LKKBD is not set
-CONFIG_KEYBOARD_GPIO=m
-CONFIG_KEYBOARD_MATRIX=m
-CONFIG_KEYBOARD_LM8323=m
-CONFIG_KEYBOARD_MAX7359=m
-# CONFIG_KEYBOARD_NEWTON is not set
-CONFIG_KEYBOARD_OPENCORES=m
-CONFIG_KEYBOARD_STOWAWAY=m
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=m
-CONFIG_MOUSE_PS2_ALPS=y
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
-CONFIG_MOUSE_PS2_LIFEBOOK=y
-CONFIG_MOUSE_PS2_TRACKPOINT=y
-# CONFIG_MOUSE_PS2_ELANTECH is not set
-CONFIG_MOUSE_PS2_SENTELIC=y
-CONFIG_MOUSE_PS2_TOUCHKIT=y
-CONFIG_MOUSE_SERIAL=m
-CONFIG_MOUSE_APPLETOUCH=m
-CONFIG_MOUSE_BCM5974=m
-CONFIG_MOUSE_VSXXXAA=m
-CONFIG_MOUSE_GPIO=m
-CONFIG_MOUSE_SYNAPTICS_I2C=m
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_JOYSTICK_ANALOG=m
-CONFIG_JOYSTICK_A3D=m
-CONFIG_JOYSTICK_ADI=m
-CONFIG_JOYSTICK_COBRA=m
-CONFIG_JOYSTICK_GF2K=m
-CONFIG_JOYSTICK_GRIP=m
-CONFIG_JOYSTICK_GRIP_MP=m
-CONFIG_JOYSTICK_GUILLEMOT=m
-CONFIG_JOYSTICK_INTERACT=m
-CONFIG_JOYSTICK_SIDEWINDER=m
-CONFIG_JOYSTICK_TMDC=m
-CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
-CONFIG_JOYSTICK_WARRIOR=m
-CONFIG_JOYSTICK_MAGELLAN=m
-CONFIG_JOYSTICK_SPACEORB=m
-CONFIG_JOYSTICK_SPACEBALL=m
-CONFIG_JOYSTICK_STINGER=m
-CONFIG_JOYSTICK_TWIDJOY=m
-CONFIG_JOYSTICK_ZHENHUA=m
-CONFIG_JOYSTICK_DB9=m
-CONFIG_JOYSTICK_GAMECON=m
-CONFIG_JOYSTICK_TURBOGRAFX=m
-CONFIG_JOYSTICK_JOYDUMP=m
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-# CONFIG_JOYSTICK_WALKERA0701 is not set
-CONFIG_INPUT_TABLET=y
-CONFIG_TABLET_USB_ACECAD=m
-CONFIG_TABLET_USB_AIPTEK=m
-CONFIG_TABLET_USB_GTCO=m
-CONFIG_TABLET_USB_KBTAB=m
-CONFIG_TABLET_USB_WACOM=m
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_AD7879_I2C=m
-CONFIG_TOUCHSCREEN_AD7879=m
-CONFIG_TOUCHSCREEN_DYNAPRO=m
-CONFIG_TOUCHSCREEN_EETI=m
-CONFIG_TOUCHSCREEN_FUJITSU=m
-CONFIG_TOUCHSCREEN_GUNZE=m
-CONFIG_TOUCHSCREEN_ELO=m
-CONFIG_TOUCHSCREEN_WACOM_W8001=m
-CONFIG_TOUCHSCREEN_MCS5000=m
-CONFIG_TOUCHSCREEN_MTOUCH=m
-CONFIG_TOUCHSCREEN_INEXIO=m
-CONFIG_TOUCHSCREEN_MK712=m
-CONFIG_TOUCHSCREEN_PENMOUNT=m
-CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
-CONFIG_TOUCHSCREEN_TOUCHWIN=m
-CONFIG_TOUCHSCREEN_UCB1400=m
-CONFIG_TOUCHSCREEN_WM97XX=m
-CONFIG_TOUCHSCREEN_WM9705=y
-CONFIG_TOUCHSCREEN_WM9712=y
-CONFIG_TOUCHSCREEN_WM9713=y
-CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-CONFIG_TOUCHSCREEN_USB_EGALAX=y
-CONFIG_TOUCHSCREEN_USB_PANJIT=y
-CONFIG_TOUCHSCREEN_USB_3M=y
-CONFIG_TOUCHSCREEN_USB_ITM=y
-CONFIG_TOUCHSCREEN_USB_ETURBO=y
-CONFIG_TOUCHSCREEN_USB_GUNZE=y
-CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
-CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
-CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
-CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
-CONFIG_TOUCHSCREEN_USB_GOTOP=y
-CONFIG_TOUCHSCREEN_USB_JASTEC=y
-CONFIG_TOUCHSCREEN_USB_E2I=y
-CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
-CONFIG_TOUCHSCREEN_USB_ETT_TC5UH=y
-CONFIG_TOUCHSCREEN_TOUCHIT213=m
-CONFIG_TOUCHSCREEN_TSC2007=m
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_APANEL=m
-CONFIG_INPUT_ATLAS_BTNS=m
-CONFIG_INPUT_ATI_REMOTE=m
-CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_INPUT_KEYSPAN_REMOTE=m
-CONFIG_INPUT_POWERMATE=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INPUT_CM109=m
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_WINBOND_CIR=m
-CONFIG_INPUT_PCF50633_PMU=m
-CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=m
-CONFIG_SERIO_CT82C710=m
-CONFIG_SERIO_PARKBD=m
-CONFIG_SERIO_PCIPS2=m
-CONFIG_SERIO_LIBPS2=y
-CONFIG_SERIO_RAW=m
-CONFIG_SERIO_ALTERA_PS2=m
-CONFIG_GAMEPORT=m
-CONFIG_GAMEPORT_NS558=m
-CONFIG_GAMEPORT_L4=m
-CONFIG_GAMEPORT_EMU10K1=m
-CONFIG_GAMEPORT_FM801=m
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_DEVKMEM=y
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_COMPUTONE=m
-CONFIG_ROCKETPORT=m
-CONFIG_CYCLADES=m
-# CONFIG_CYZ_INTR is not set
-CONFIG_DIGIEPCA=m
-CONFIG_MOXA_INTELLIO=m
-CONFIG_MOXA_SMARTIO=m
-CONFIG_ISI=m
-CONFIG_SYNCLINK=m
-CONFIG_SYNCLINKMP=m
-CONFIG_SYNCLINK_GT=m
-CONFIG_N_HDLC=m
-CONFIG_RISCOM8=m
-CONFIG_SPECIALIX=m
-CONFIG_STALDRV=y
-CONFIG_STALLION=m
-CONFIG_ISTALLION=m
-CONFIG_NOZOMI=m
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_PNP=y
-CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_MANY_PORTS=y
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-CONFIG_SERIAL_8250_DETECT_IRQ=y
-CONFIG_SERIAL_8250_RSA=y
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_JSM=m
-CONFIG_UNIX98_PTYS=y
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=32
-CONFIG_PRINTER=m
-CONFIG_LP_CONSOLE=y
-CONFIG_PPDEV=m
-CONFIG_HVC_DRIVER=y
-CONFIG_VIRTIO_CONSOLE=m
-CONFIG_IPMI_HANDLER=m
-# CONFIG_IPMI_PANIC_EVENT is not set
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
-CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_INTEL=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_VIA=m
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_NVRAM=m
-CONFIG_R3964=m
-CONFIG_APPLICOM=m
-
-#
-# PCMCIA character devices
-#
-CONFIG_SYNCLINK_CS=m
-CONFIG_CARDMAN_4000=m
-CONFIG_CARDMAN_4040=m
-CONFIG_IPWIRELESS=m
-CONFIG_MWAVE=m
-CONFIG_PC8736x_GPIO=m
-CONFIG_NSC_GPIO=m
-CONFIG_RAW_DRIVER=m
-CONFIG_MAX_RAW_DEVS=256
-CONFIG_HPET=y
-CONFIG_HPET_MMAP=y
-CONFIG_HANGCHECK_TIMER=m
-CONFIG_TCG_TPM=m
-# CONFIG_TCG_TIS is not set
-# CONFIG_TCG_NSC is not set
-CONFIG_TCG_ATMEL=m
-# CONFIG_TCG_INFINEON is not set
-CONFIG_TELCLOCK=m
-CONFIG_DEVPORT=y
-CONFIG_I2C=m
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCA=m
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# PC SMBus host controller drivers
-#
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD756_S4882=m
-CONFIG_I2C_AMD8111=m
-CONFIG_I2C_I801=m
-CONFIG_I2C_ISCH=m
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_NFORCE2_S4985=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-
-#
-# ACPI drivers
-#
-CONFIG_I2C_SCMI=m
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-CONFIG_I2C_GPIO=m
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_SIMTEC=m
-
-#
-# External I2C/SMBus adapter drivers
-#
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-
-#
-# Other I2C/SMBus bus drivers
-#
-CONFIG_I2C_PCA_PLATFORM=m
-CONFIG_I2C_STUB=m
-
-#
-# Miscellaneous I2C Chip support
-#
-CONFIG_SENSORS_TSL2550=m
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
-# CONFIG_SPI is not set
-
-#
-# PPS support
-#
-CONFIG_PPS=m
-# CONFIG_PPS_DEBUG is not set
-CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-CONFIG_GPIOLIB=y
-# CONFIG_DEBUG_GPIO is not set
-CONFIG_GPIO_SYSFS=y
-
-#
-# Memory mapped GPIO expanders:
-#
-
-#
-# I2C GPIO expanders:
-#
-CONFIG_GPIO_MAX732X=m
-CONFIG_GPIO_PCA953X=m
-CONFIG_GPIO_PCF857X=m
-CONFIG_GPIO_ADP5588=m
-
-#
-# PCI GPIO expanders:
-#
-CONFIG_GPIO_CS5535=m
-# CONFIG_GPIO_LANGWELL is not set
-
-#
-# SPI GPIO expanders:
-#
-
-#
-# AC97 GPIO expanders:
-#
-# CONFIG_GPIO_UCB1400 is not set
-CONFIG_W1=m
-CONFIG_W1_CON=y
-
-#
-# 1-wire Bus Masters
-#
-CONFIG_W1_MASTER_MATROX=m
-CONFIG_W1_MASTER_DS2490=m
-CONFIG_W1_MASTER_DS2482=m
-CONFIG_W1_MASTER_GPIO=m
-
-#
-# 1-wire Slaves
-#
-CONFIG_W1_SLAVE_THERM=m
-CONFIG_W1_SLAVE_SMEM=m
-CONFIG_W1_SLAVE_DS2431=m
-CONFIG_W1_SLAVE_DS2433=m
-CONFIG_W1_SLAVE_DS2433_CRC=y
-CONFIG_W1_SLAVE_DS2760=m
-CONFIG_W1_SLAVE_BQ27000=m
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-CONFIG_PDA_POWER=m
-CONFIG_WM8350_POWER=m
-CONFIG_BATTERY_DS2760=m
-CONFIG_BATTERY_DS2782=m
-CONFIG_BATTERY_BQ27x00=m
-CONFIG_BATTERY_MAX17040=m
-CONFIG_CHARGER_PCF50633=m
-CONFIG_HWMON=m
-CONFIG_HWMON_VID=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-CONFIG_SENSORS_ABITUGURU=m
-CONFIG_SENSORS_ABITUGURU3=m
-CONFIG_SENSORS_AD7414=m
-CONFIG_SENSORS_AD7418=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1029=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_ADT7462=m
-CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7473=m
-CONFIG_SENSORS_ADT7475=m
-CONFIG_SENSORS_K8TEMP=m
-CONFIG_SENSORS_K10TEMP=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_I5K_AMB=m
-CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_F71882FG=m
-CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_FSCHMD=m
-CONFIG_SENSORS_G760A=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_CORETEMP=m
-CONFIG_SENSORS_IBMAEM=m
-CONFIG_SENSORS_IBMPEX=m
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM73=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_LM93=m
-CONFIG_SENSORS_LTC4215=m
-CONFIG_SENSORS_LTC4245=m
-CONFIG_SENSORS_LM95241=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX6650=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_PC87427=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_SENSORS_SHT15=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_DME1737=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_SMSC47M192=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_ADS7828=m
-CONFIG_SENSORS_AMC6821=m
-CONFIG_SENSORS_THMC50=m
-CONFIG_SENSORS_TMP401=m
-CONFIG_SENSORS_TMP421=m
-CONFIG_SENSORS_VIA_CPUTEMP=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_VT1211=m
-CONFIG_SENSORS_VT8231=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83791D=m
-CONFIG_SENSORS_W83792D=m
-CONFIG_SENSORS_W83793=m
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83L786NG=m
-CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_W83627EHF=m
-CONFIG_SENSORS_WM8350=m
-CONFIG_SENSORS_HDAPS=m
-CONFIG_SENSORS_LIS3_I2C=m
-CONFIG_SENSORS_APPLESMC=m
-
-#
-# ACPI drivers
-#
-CONFIG_SENSORS_ATK0110=m
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_THERMAL=m
-CONFIG_THERMAL_HWMON=y
-CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_WM8350_WATCHDOG=m
-CONFIG_ACQUIRE_WDT=m
-CONFIG_ADVANTECH_WDT=m
-CONFIG_ALIM1535_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_GEODE_WDT=m
-CONFIG_SC520_WDT=m
-CONFIG_SBC_FITPC2_WATCHDOG=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
-CONFIG_WAFER_WDT=m
-CONFIG_I6300ESB_WDT=m
-CONFIG_ITCO_WDT=m
-CONFIG_ITCO_VENDOR_SUPPORT=y
-CONFIG_IT8712F_WDT=m
-CONFIG_IT87_WDT=m
-CONFIG_HP_WATCHDOG=m
-CONFIG_SC1200_WDT=m
-CONFIG_PC87413_WDT=m
-CONFIG_60XX_WDT=m
-CONFIG_SBC8360_WDT=m
-CONFIG_CPU5_WDT=m
-CONFIG_SMSC_SCH311X_WDT=m
-CONFIG_SMSC37B787_WDT=m
-CONFIG_W83627HF_WDT=m
-CONFIG_W83697HF_WDT=m
-CONFIG_W83697UG_WDT=m
-CONFIG_W83877F_WDT=m
-CONFIG_W83977F_WDT=m
-CONFIG_MACHZ_WDT=m
-CONFIG_SBC_EPX_C3_WATCHDOG=m
-
-#
-# PCI-based Watchdog Cards
-#
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_WDTPCI=m
-
-#
-# USB-based Watchdog Cards
-#
-CONFIG_USBPCWATCHDOG=m
-CONFIG_SSB_POSSIBLE=y
-
-#
-# Sonics Silicon Backplane
-#
-CONFIG_SSB=m
-CONFIG_SSB_SPROM=y
-CONFIG_SSB_BLOCKIO=y
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-CONFIG_SSB_SDIOHOST=y
-# CONFIG_SSB_DEBUG is not set
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
-
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_CORE=m
-# CONFIG_MFD_SM501 is not set
-CONFIG_HTC_PASIC3=m
-CONFIG_UCB1400_CORE=m
-CONFIG_TPS65010=m
-# CONFIG_MFD_TMIO is not set
-CONFIG_MFD_WM8400=m
-CONFIG_MFD_WM8350=m
-CONFIG_MFD_WM8350_I2C=m
-CONFIG_MFD_PCF50633=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-CONFIG_AB3100_CORE=m
-CONFIG_AB3100_OTP=m
-# CONFIG_REGULATOR is not set
-CONFIG_MEDIA_SUPPORT=m
-
-#
-# Multimedia core support
-#
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_COMMON=m
-CONFIG_VIDEO_ALLOW_V4L1=y
-CONFIG_VIDEO_V4L1_COMPAT=y
-CONFIG_DVB_CORE=m
-CONFIG_VIDEO_MEDIA=m
-
-#
-# Multimedia drivers
-#
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_IR_CORE=m
-CONFIG_VIDEO_IR=m
-CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=m
-# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_V4L1=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_VIDEO_CAPTURE_DRIVERS=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# Encoders/decoders and other helper chips
-#
-
-#
-# Audio decoders
-#
-CONFIG_VIDEO_TVAUDIO=m
-CONFIG_VIDEO_TDA7432=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TDA9875=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS5345=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_M52790=m
-CONFIG_VIDEO_TLV320AIC23B=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_VP27SMPX=m
-
-#
-# RDS decoders
-#
-CONFIG_VIDEO_SAA6588=m
-
-#
-# Video decoders
-#
-CONFIG_VIDEO_ADV7180=m
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_TCM825X=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_SAA717X=m
-CONFIG_VIDEO_SAA7191=m
-CONFIG_VIDEO_TVP514X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_VPX3220=m
-
-#
-# Video and audio decoders
-#
-CONFIG_VIDEO_CX25840=m
-
-#
-# MPEG video encoders
-#
-CONFIG_VIDEO_CX2341X=m
-
-#
-# Video encoders
-#
-CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-CONFIG_VIDEO_THS7303=m
-CONFIG_VIDEO_ADV7343=m
-
-#
-# Video improvement chips
-#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-CONFIG_VIDEO_VIVI=m
-CONFIG_VIDEO_BT848=m
-CONFIG_VIDEO_BT848_DVB=y
-CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_W9966=m
-CONFIG_VIDEO_CPIA=m
-CONFIG_VIDEO_CPIA_PP=m
-CONFIG_VIDEO_CPIA_USB=m
-CONFIG_VIDEO_CPIA2=m
-CONFIG_VIDEO_SAA5246A=m
-CONFIG_VIDEO_SAA5249=m
-CONFIG_VIDEO_STRADIS=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_SAA7164=m
-CONFIG_VIDEO_CAFE_CCIC=m
-CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_MT9M001=m
-CONFIG_SOC_CAMERA_MT9M111=m
-CONFIG_SOC_CAMERA_MT9T031=m
-CONFIG_SOC_CAMERA_MT9T112=m
-CONFIG_SOC_CAMERA_MT9V022=m
-CONFIG_SOC_CAMERA_RJ54N1=m
-CONFIG_SOC_CAMERA_TW9910=m
-CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_SOC_CAMERA_OV772X=m
-CONFIG_SOC_CAMERA_OV9640=m
-CONFIG_V4L_USB_DRIVERS=y
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_GSPCA=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GL860=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SN9C20X_EVDEV=y
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_ZC3XX=m
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_PVRUSB2_DVB=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_USBVIDEO=m
-CONFIG_USB_VICAM=m
-CONFIG_USB_IBMCAM=m
-CONFIG_USB_KONICAWC=m
-CONFIG_USB_QUICKCAM_MESSENGER=m
-CONFIG_USB_ET61X251=m
-CONFIG_VIDEO_OVCAMCHIP=m
-CONFIG_USB_W9968CF=m
-CONFIG_USB_OV511=m
-CONFIG_USB_SE401=m
-CONFIG_USB_SN9C102=m
-CONFIG_USB_STV680=m
-CONFIG_USB_ZC0301=m
-CONFIG_USB_PWC=m
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_GEMTEK_PCI=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_MAESTRO=m
-CONFIG_I2C_SI4713=m
-CONFIG_RADIO_SI4713=m
-CONFIG_USB_DSBR=m
-# CONFIG_RADIO_SI470X is not set
-CONFIG_USB_MR800=m
-CONFIG_RADIO_TEA5764=m
-CONFIG_RADIO_TEF6862=m
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-CONFIG_DVB_CAPTURE_DRIVERS=y
-
-#
-# Supported SAA7146 based PCI Adapters
-#
-CONFIG_TTPCI_EEPROM=m
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
-
-#
-# Supported USB Adapters
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_FRIIO=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_SIANO_MDTV=m
-
-#
-# Siano module components
-#
-CONFIG_SMS_USB_DRV=m
-CONFIG_SMS_SDIO_DRV=m
-
-#
-# Supported FlexCopII (B2C2) Adapters
-#
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
-
-#
-# Supported BT878 Adapters
-#
-CONFIG_DVB_BT8XX=m
-
-#
-# Supported Pluto2 Adapters
-#
-CONFIG_DVB_PLUTO2=m
-
-#
-# Supported SDMC DM1105 Adapters
-#
-CONFIG_DVB_DM1105=m
-
-#
-# Supported FireWire (IEEE 1394) Adapters
-#
-CONFIG_DVB_FIREDTV=m
-# CONFIG_DVB_FIREDTV_FIREWIRE is not set
-CONFIG_DVB_FIREDTV_IEEE1394=y
-CONFIG_DVB_FIREDTV_INPUT=y
-
-#
-# Supported Earthsoft PT1 Adapters
-#
-CONFIG_DVB_PT1=m
-
-#
-# Supported Mantis Adapters
-#
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
-
-#
-# Supported DVB Frontends
-#
-CONFIG_DVB_FE_CUSTOMISE=y
-
-#
-# Customise DVB Frontends
-#
-
-#
-# Multistandard (satellite) frontends
-#
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV6110x=m
-
-#
-# DVB-S (satellite) frontends
-#
-CONFIG_DVB_CX24110=m
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_SI21XX=m
-CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=m
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-CONFIG_DVB_DRX397XD=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_EC100=m
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_OR51211=m
-CONFIG_DVB_OR51132=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3304=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_S5H1411=m
-
-#
-# ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_S921=m
-CONFIG_DVB_DIB8000=m
-
-#
-# Digital terrestrial only tuners/PLL
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-
-#
-# SEC control devices for DVB-S
-#
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_LGS8GL5=m
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-
-#
-# Tools to develop new frontends
-#
-# CONFIG_DVB_DUMMY_FE is not set
-CONFIG_DAB=y
-CONFIG_USB_DABUSB=m
-
-#
-# Graphics support
-#
-CONFIG_AGP=m
-CONFIG_AGP_AMD64=m
-CONFIG_AGP_INTEL=m
-CONFIG_AGP_SIS=m
-CONFIG_AGP_VIA=m
-CONFIG_VGA_ARB=y
-CONFIG_DRM=m
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM_TTM=m
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-# CONFIG_DRM_RADEON_KMS is not set
-CONFIG_DRM_I810=m
-CONFIG_DRM_I830=m
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_KMS=y
-CONFIG_DRM_MGA=m
-CONFIG_DRM_SIS=m
-CONFIG_DRM_VIA=m
-CONFIG_DRM_SAVAGE=m
-CONFIG_VGASTATE=m
-CONFIG_VIDEO_OUTPUT_CONTROL=m
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
-CONFIG_FB_DDC=m
-CONFIG_FB_BOOT_VESA_SUPPORT=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_DEFERRED_IO=y
-CONFIG_FB_HECUBA=m
-CONFIG_FB_SVGALIB=m
-# CONFIG_FB_MACMODES is not set
-CONFIG_FB_BACKLIGHT=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-
-#
-# Frame buffer hardware drivers
-#
-CONFIG_FB_CIRRUS=m
-CONFIG_FB_PM2=m
-# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
-CONFIG_FB_CYBER2000=m
-CONFIG_FB_ARC=m
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-# CONFIG_FB_UVESA is not set
-CONFIG_FB_VESA=y
-# CONFIG_FB_EFI is not set
-CONFIG_FB_N411=m
-CONFIG_FB_HGA=m
-# CONFIG_FB_HGA_ACCEL is not set
-CONFIG_FB_S1D13XXX=m
-CONFIG_FB_NVIDIA=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_NVIDIA_DEBUG is not set
-CONFIG_FB_NVIDIA_BACKLIGHT=y
-CONFIG_FB_RIVA=m
-CONFIG_FB_RIVA_I2C=y
-# CONFIG_FB_RIVA_DEBUG is not set
-CONFIG_FB_RIVA_BACKLIGHT=y
-CONFIG_FB_LE80578=m
-CONFIG_FB_CARILLO_RANCH=m
-CONFIG_FB_MATROX=m
-CONFIG_FB_MATROX_MILLENIUM=y
-CONFIG_FB_MATROX_MYSTIQUE=y
-CONFIG_FB_MATROX_G=y
-CONFIG_FB_MATROX_I2C=m
-CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_RADEON=m
-CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_RADEON_BACKLIGHT=y
-# CONFIG_FB_RADEON_DEBUG is not set
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY128_BACKLIGHT=y
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_ATY_GX=y
-CONFIG_FB_ATY_BACKLIGHT=y
-CONFIG_FB_S3=m
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_SIS=m
-CONFIG_FB_SIS_300=y
-CONFIG_FB_SIS_315=y
-CONFIG_FB_VIA=m
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=m
-# CONFIG_FB_3DFX_ACCEL is not set
-CONFIG_FB_3DFX_I2C=y
-CONFIG_FB_VOODOO1=m
-CONFIG_FB_VT8623=m
-CONFIG_FB_TRIDENT=m
-CONFIG_FB_ARK=m
-CONFIG_FB_PM3=m
-CONFIG_FB_CARMINE=m
-CONFIG_FB_CARMINE_DRAM_EVAL=y
-# CONFIG_CARMINE_DRAM_CUSTOM is not set
-CONFIG_FB_GEODE=y
-CONFIG_FB_GEODE_LX=m
-CONFIG_FB_GEODE_GX=m
-CONFIG_FB_GEODE_GX1=m
-CONFIG_FB_TMIO=m
-CONFIG_FB_TMIO_ACCELL=y
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_FB_METRONOME=m
-CONFIG_FB_MB862XX=m
-CONFIG_FB_MB862XX_PCI_GDC=y
-CONFIG_FB_BROADSHEET=m
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=m
-# CONFIG_LCD_ILI9320 is not set
-CONFIG_LCD_PLATFORM=m
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_GENERIC=m
-CONFIG_BACKLIGHT_PROGEAR=m
-CONFIG_BACKLIGHT_CARILLO_RANCH=m
-CONFIG_BACKLIGHT_MBP_NVIDIA=m
-CONFIG_BACKLIGHT_SAHARA=m
-
-#
-# Display device support
-#
-CONFIG_DISPLAY_SUPPORT=m
-
-#
-# Display hardware drivers
-#
-
-#
-# Console display driver support
-#
-CONFIG_VGA_CONSOLE=y
-CONFIG_VGACON_SOFT_SCROLLBACK=y
-CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
-CONFIG_SOUND=m
-CONFIG_SOUND_OSS_CORE=y
-CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_JACK=y
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCM_OSS_PLUGINS=y
-CONFIG_SND_SEQUENCER_OSS=y
-CONFIG_SND_HRTIMER=m
-CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
-CONFIG_SND_DYNAMIC_MINORS=y
-# CONFIG_SND_SUPPORT_OLD_API is not set
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_VMASTER=y
-CONFIG_SND_DMA_SGBUF=y
-CONFIG_SND_RAWMIDI_SEQ=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-# CONFIG_SND_OPL4_LIB_SEQ is not set
-# CONFIG_SND_SBAWE_SEQ is not set
-CONFIG_SND_EMU10K1_SEQ=m
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_DRIVERS=y
-# CONFIG_SND_PCSP is not set
-CONFIG_SND_DUMMY=m
-CONFIG_SND_VIRMIDI=m
-CONFIG_SND_MTPAV=m
-CONFIG_SND_MTS64=m
-CONFIG_SND_SERIAL_U16550=m
-CONFIG_SND_MPU401=m
-CONFIG_SND_PORTMAN2X4=m
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
-CONFIG_SND_SB_COMMON=m
-CONFIG_SND_SB16_DSP=m
-CONFIG_SND_PCI=y
-CONFIG_SND_AD1889=m
-CONFIG_SND_ALS300=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AW2=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BT87X=m
-# CONFIG_SND_BT87X_OVERCLOCK is not set
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_OXYGEN_LIB=m
-CONFIG_SND_OXYGEN=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CS5530=m
-CONFIG_SND_CS5535AUDIO=m
-CONFIG_SND_CTXFI=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MIA=m
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_INDIGOIOX=m
-CONFIG_SND_INDIGODJX=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_EMU10K1X=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968=m
-CONFIG_SND_FM801=m
-CONFIG_SND_FM801_TEA575X_BOOL=y
-CONFIG_SND_FM801_TEA575X=m
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA_HWDEP=y
-CONFIG_SND_HDA_RECONFIG=y
-# CONFIG_SND_HDA_INPUT_BEEP is not set
-CONFIG_SND_HDA_INPUT_JACK=y
-CONFIG_SND_HDA_PATCH_LOADER=y
-CONFIG_SND_HDA_CODEC_REALTEK=y
-CONFIG_SND_HDA_CODEC_ANALOG=y
-CONFIG_SND_HDA_CODEC_SIGMATEL=y
-CONFIG_SND_HDA_CODEC_VIA=y
-CONFIG_SND_HDA_CODEC_ATIHDMI=y
-CONFIG_SND_HDA_CODEC_NVHDMI=y
-CONFIG_SND_HDA_CODEC_INTELHDMI=y
-CONFIG_SND_HDA_ELD=y
-CONFIG_SND_HDA_CODEC_CIRRUS=y
-CONFIG_SND_HDA_CODEC_CONEXANT=y
-CONFIG_SND_HDA_CODEC_CA0110=y
-CONFIG_SND_HDA_CODEC_CMEDIA=y
-CONFIG_SND_HDA_CODEC_SI3054=y
-CONFIG_SND_HDA_GENERIC=y
-# CONFIG_SND_HDA_POWER_SAVE is not set
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
-CONFIG_SND_HIFIER=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_LX6464ES=m
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-CONFIG_SND_PCXHR=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VIRTUOSO=m
-CONFIG_SND_VX222=m
-CONFIG_SND_YMFPCI=m
-CONFIG_SND_USB=y
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_USX2Y=m
-CONFIG_SND_USB_CAIAQ=m
-CONFIG_SND_USB_CAIAQ_INPUT=y
-CONFIG_SND_USB_US122L=m
-CONFIG_SND_PCMCIA=y
-CONFIG_SND_VXPOCKET=m
-CONFIG_SND_PDAUDIOCF=m
-# CONFIG_SND_SOC is not set
-# CONFIG_SOUND_PRIME is not set
-CONFIG_AC97_BUS=m
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=m
-CONFIG_HIDRAW=y
-
-#
-# USB Input Devices
-#
-CONFIG_USB_HID=m
-CONFIG_HID_PID=y
-CONFIG_USB_HIDDEV=y
-
-#
-# Special HID drivers
-#
-CONFIG_HID_A4TECH=m
-CONFIG_HID_APPLE=m
-CONFIG_HID_BELKIN=m
-CONFIG_HID_CHERRY=m
-CONFIG_HID_CHICONY=m
-CONFIG_HID_CYPRESS=m
-CONFIG_HID_DRAGONRISE=m
-CONFIG_DRAGONRISE_FF=y
-CONFIG_HID_EZKEY=m
-CONFIG_HID_KYE=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_KENSINGTON=m
-CONFIG_HID_LOGITECH=m
-CONFIG_LOGITECH_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_HID_MICROSOFT=m
-CONFIG_HID_MONTEREY=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_PANTHERLORD_FF=y
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_SAMSUNG=m
-CONFIG_HID_SONY=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_GREENASIA=m
-CONFIG_GREENASIA_FF=y
-CONFIG_HID_SMARTJOYPLUS=m
-CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_HID_TOPSEED=m
-CONFIG_HID_THRUSTMASTER=m
-CONFIG_THRUSTMASTER_FF=y
-CONFIG_HID_WACOM=m
-CONFIG_HID_ZEROPLUS=m
-CONFIG_ZEROPLUS_FF=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB=y
-# CONFIG_USB_DEBUG is not set
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEVICEFS=y
-CONFIG_USB_DEVICE_CLASS=y
-# CONFIG_USB_DYNAMIC_MINORS is not set
-CONFIG_USB_SUSPEND=y
-# CONFIG_USB_OTG is not set
-CONFIG_USB_MON=y
-CONFIG_USB_WUSB=m
-CONFIG_USB_WUSB_CBAF=m
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_C67X00_HCD=y
-CONFIG_USB_XHCI_HCD=y
-# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_OXU210HP_HCD=y
-CONFIG_USB_ISP116X_HCD=y
-CONFIG_USB_ISP1760_HCD=y
-CONFIG_USB_ISP1362_HCD=y
-CONFIG_USB_OHCI_HCD=y
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_UHCI_HCD=y
-CONFIG_USB_U132_HCD=m
-CONFIG_USB_SL811_HCD=y
-CONFIG_USB_SL811_CS=m
-CONFIG_USB_R8A66597_HCD=y
-CONFIG_USB_WHCI_HCD=m
-CONFIG_USB_HWA_HCD=m
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_WDM=m
-CONFIG_USB_TMC=m
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=y
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_DATAFAB=y
-CONFIG_USB_STORAGE_FREECOM=y
-CONFIG_USB_STORAGE_ISD200=y
-CONFIG_USB_STORAGE_USBAT=y
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_JUMPSHOT=y
-CONFIG_USB_STORAGE_ALAUDA=y
-CONFIG_USB_STORAGE_ONETOUCH=y
-CONFIG_USB_STORAGE_KARMA=y
-CONFIG_USB_STORAGE_CYPRESS_ATACB=y
-# CONFIG_USB_LIBUSUAL is not set
-
-#
-# USB Imaging devices
-#
-CONFIG_USB_MDC800=m
-CONFIG_USB_MICROTEK=m
-
-#
-# USB port drivers
-#
-CONFIG_USB_USS720=m
-CONFIG_USB_SERIAL=m
-CONFIG_USB_EZUSB=y
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_FUNSOFT=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MOTOROLA=m
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_HP4X=m
-CONFIG_USB_SERIAL_SAFE=m
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-CONFIG_USB_SERIAL_SIEMENS_MPI=m
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_DEBUG=m
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_EMI62=m
-CONFIG_USB_EMI26=m
-CONFIG_USB_ADUTUX=m
-CONFIG_USB_SEVSEG=m
-CONFIG_USB_RIO500=m
-CONFIG_USB_LEGOTOWER=m
-CONFIG_USB_LCD=m
-CONFIG_USB_BERRY_CHARGE=m
-CONFIG_USB_LED=m
-CONFIG_USB_CYPRESS_CY7C63=m
-CONFIG_USB_CYTHERM=m
-CONFIG_USB_IDMOUSE=m
-CONFIG_USB_FTDI_ELAN=m
-CONFIG_USB_APPLEDISPLAY=m
-CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
-CONFIG_USB_LD=m
-CONFIG_USB_TRANCEVIBRATOR=m
-CONFIG_USB_IOWARRIOR=m
-CONFIG_USB_TEST=m
-CONFIG_USB_ISIGHTFW=m
-CONFIG_USB_VST=m
-CONFIG_USB_ATM=m
-CONFIG_USB_SPEEDTOUCH=m
-CONFIG_USB_CXACRU=m
-CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_XUSBATM=m
-# CONFIG_USB_GADGET is not set
-
-#
-# OTG and related infrastructure
-#
-CONFIG_USB_OTG_UTILS=y
-CONFIG_USB_GPIO_VBUS=m
-CONFIG_NOP_USB_XCEIV=m
-CONFIG_UWB=m
-CONFIG_UWB_HWA=m
-CONFIG_UWB_WHCI=m
-CONFIG_UWB_WLP=m
-CONFIG_UWB_I1480U=m
-CONFIG_UWB_I1480U_WLP=m
-CONFIG_MMC=m
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-
-#
-# MMC/SD/SDIO Card Drivers
-#
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_BOUNCE=y
-CONFIG_SDIO_UART=m
-# CONFIG_MMC_TEST is not set
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_PCI=m
-CONFIG_MMC_RICOH_MMC=m
-CONFIG_MMC_SDHCI_PLTFM=m
-CONFIG_MMC_WBSD=m
-# CONFIG_MMC_AT91 is not set
-# CONFIG_MMC_ATMELMCI is not set
-CONFIG_MMC_TIFM_SD=m
-CONFIG_MMC_SDRICOH_CS=m
-CONFIG_MMC_CB710=m
-CONFIG_MMC_VIA_SDMMC=m
-CONFIG_MEMSTICK=m
-# CONFIG_MEMSTICK_DEBUG is not set
-
-#
-# MemoryStick drivers
-#
-# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-CONFIG_MSPRO_BLOCK=m
-
-#
-# MemoryStick Host Controller Drivers
-#
-CONFIG_MEMSTICK_TIFM_MS=m
-CONFIG_MEMSTICK_JMICRON_38X=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=m
-
-#
-# LED drivers
-#
-CONFIG_LEDS_ALIX2=m
-CONFIG_LEDS_PCA9532=m
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_GPIO_PLATFORM=y
-CONFIG_LEDS_LP3944=m
-CONFIG_LEDS_CLEVO_MAIL=m
-CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_WM8350=m
-CONFIG_LEDS_BD2802=m
-CONFIG_LEDS_INTEL_SS4200=m
-CONFIG_LEDS_LT3593=m
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-CONFIG_LEDS_TRIGGER_GPIO=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-
-#
-# iptables trigger is under Netfilter config (LED target)
-#
-CONFIG_ACCESSIBILITY=y
-CONFIG_A11Y_BRAILLE_CONSOLE=y
-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_USER_MEM=y
-CONFIG_INFINIBAND_ADDR_TRANS=y
-CONFIG_INFINIBAND_MTHCA=m
-CONFIG_INFINIBAND_MTHCA_DEBUG=y
-# CONFIG_INFINIBAND_IPATH is not set
-CONFIG_INFINIBAND_AMSO1100=m
-# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
-# CONFIG_INFINIBAND_CXGB3 is not set
-CONFIG_MLX4_INFINIBAND=m
-CONFIG_INFINIBAND_NES=m
-# CONFIG_INFINIBAND_NES_DEBUG is not set
-CONFIG_INFINIBAND_IPOIB=m
-# CONFIG_INFINIBAND_IPOIB_CM is not set
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_ISER=m
-CONFIG_EDAC=y
-
-#
-# Reporting subsystems
-#
-# CONFIG_EDAC_DEBUG is not set
-CONFIG_EDAC_DECODE_MCE=y
-# CONFIG_EDAC_MM_EDAC is not set
-CONFIG_RTC_LIB=m
-CONFIG_RTC_CLASS=m
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-CONFIG_RTC_DRV_TEST=m
-
-#
-# I2C RTC drivers
-#
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1374=m
-CONFIG_RTC_DRV_DS1672=m
-CONFIG_RTC_DRV_MAX6900=m
-CONFIG_RTC_DRV_RS5C372=m
-CONFIG_RTC_DRV_ISL1208=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_PCF8563=m
-CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_M41T80=m
-CONFIG_RTC_DRV_M41T80_WDT=y
-CONFIG_RTC_DRV_BQ32K=m
-CONFIG_RTC_DRV_S35390A=m
-CONFIG_RTC_DRV_FM3130=m
-CONFIG_RTC_DRV_RX8581=m
-CONFIG_RTC_DRV_RX8025=m
-
-#
-# SPI RTC drivers
-#
-
-#
-# Platform RTC drivers
-#
-CONFIG_RTC_DRV_CMOS=m
-CONFIG_RTC_DRV_DS1286=m
-CONFIG_RTC_DRV_DS1511=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_M48T86=m
-CONFIG_RTC_DRV_M48T35=m
-CONFIG_RTC_DRV_M48T59=m
-CONFIG_RTC_DRV_MSM6242=m
-CONFIG_RTC_DRV_BQ4802=m
-CONFIG_RTC_DRV_RP5C01=m
-CONFIG_RTC_DRV_V3020=m
-CONFIG_RTC_DRV_WM8350=m
-CONFIG_RTC_DRV_PCF50633=m
-CONFIG_RTC_DRV_AB3100=m
-
-#
-# on-CPU RTC drivers
-#
-CONFIG_CS5535_CLOCK_EVENT_SRC=m
-CONFIG_DMADEVICES=y
-
-#
-# DMA Devices
-#
-CONFIG_ASYNC_TX_DISABLE_CHANNEL_SWITCH=y
-CONFIG_INTEL_IOATDMA=m
-CONFIG_DMA_ENGINE=y
-
-#
-# DMA Clients
-#
-CONFIG_NET_DMA=y
-# CONFIG_ASYNC_TX_DMA is not set
-CONFIG_DMATEST=m
-CONFIG_DCA=m
-CONFIG_AUXDISPLAY=y
-# CONFIG_KS0108 is not set
-CONFIG_UIO=m
-CONFIG_UIO_CIF=m
-CONFIG_UIO_PDRV=m
-CONFIG_UIO_PDRV_GENIRQ=m
-CONFIG_UIO_SMX=m
-CONFIG_UIO_AEC=m
-CONFIG_UIO_SERCOS3=m
-CONFIG_UIO_PCI_GENERIC=m
-
-#
-# TI VLYNQ
-#
-CONFIG_STAGING=y
-# CONFIG_STAGING_EXCLUDE_BUILD is not set
-# CONFIG_ET131X is not set
-# CONFIG_SLICOSS is not set
-# CONFIG_VIDEO_GO7007 is not set
-CONFIG_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25821_ALSA=m
-# CONFIG_USB_IP_COMMON is not set
-# CONFIG_W35UND is not set
-# CONFIG_PRISM2_USB is not set
-# CONFIG_ECHO is not set
-# CONFIG_POCH is not set
-# CONFIG_OTUS is not set
-CONFIG_RT2860=m
-CONFIG_RT2870=m
-# CONFIG_COMEDI is not set
-# CONFIG_ASUS_OLED is not set
-# CONFIG_PANEL is not set
-# CONFIG_ALTERA_PCIE_CHDMA is not set
-CONFIG_R8187SE=m
-CONFIG_RTL8192SU=m
-CONFIG_RTL8192U=m
-CONFIG_RTL8192E=m
-# CONFIG_TRANZPORT is not set
-
-#
-# Qualcomm MSM Camera And Video
-#
-
-#
-# Camera Sensor Selection
-#
-CONFIG_INPUT_GPIO=m
-CONFIG_POHMELFS=m
-# CONFIG_POHMELFS_DEBUG is not set
-CONFIG_POHMELFS_CRYPTO=y
-CONFIG_B3DFG=m
-CONFIG_IDE_PHISON=m
-CONFIG_PLAN9AUTH=m
-CONFIG_LINE6_USB=m
-CONFIG_DRM_VMWGFX=m
-CONFIG_DRM_NOUVEAU=m
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_NOUVEAU_DEBUG=y
-
-#
-# I2C encoder or helper chips
-#
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_USB_SERIAL_QUATECH2=m
-CONFIG_USB_SERIAL_QUATECH_USB2=m
-CONFIG_VT6655=m
-CONFIG_VT6656=m
-CONFIG_FB_UDL=m
-# CONFIG_HYPERV is not set
-# CONFIG_VME_BUS is not set
-
-#
-# RAR Register Driver
-#
-CONFIG_RAR_REGISTER=m
-# CONFIG_DX_SEP is not set
-# CONFIG_IIO is not set
-CONFIG_RAMZSWAP=m
-CONFIG_RAMZSWAP_STATS=y
-CONFIG_BATMAN_ADV=m
-# CONFIG_BATMAN_DEBUG is not set
-CONFIG_SAMSUNG_LAPTOP=m
-CONFIG_STRIP=m
-CONFIG_PCMCIA_WAVELAN=m
-CONFIG_PCMCIA_NETWAVE=m
-CONFIG_FB_SM7XX=m
-# CONFIG_FB_SM7XX_ACCEL is not set
-CONFIG_X86_PLATFORM_DEVICES=y
-CONFIG_ACER_WMI=m
-CONFIG_ACERHDF=m
-CONFIG_ASUS_LAPTOP=m
-CONFIG_DELL_LAPTOP=m
-CONFIG_DELL_WMI=m
-CONFIG_FUJITSU_LAPTOP=m
-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
-CONFIG_HP_WMI=m
-CONFIG_MSI_LAPTOP=m
-CONFIG_PANASONIC_LAPTOP=m
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_SONY_LAPTOP=m
-CONFIG_SONYPI_COMPAT=y
-CONFIG_THINKPAD_ACPI=m
-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-CONFIG_INTEL_MENLOW=m
-CONFIG_EEEPC_LAPTOP=m
-CONFIG_ACPI_WMI=m
-CONFIG_MSI_WMI=m
-CONFIG_ACPI_ASUS=m
-CONFIG_TOPSTAR_LAPTOP=m
-CONFIG_ACPI_TOSHIBA=m
-CONFIG_TOSHIBA_BT_RFKILL=m
-CONFIG_ACPI_CMPC=m
-
-#
-# Firmware Drivers
-#
-CONFIG_EDD=m
-CONFIG_EDD_OFF=y
-CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_EFI_VARS=m
-CONFIG_DELL_RBU=m
-CONFIG_DCDBAS=m
-CONFIG_DMIID=y
-CONFIG_ISCSI_IBFT_FIND=y
-CONFIG_ISCSI_IBFT=m
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-# CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
-CONFIG_EXT3_FS_XATTR=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_FS_XATTR=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD=y
-# CONFIG_JBD_DEBUG is not set
-CONFIG_JBD2=y
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=y
-CONFIG_REISERFS_FS=y
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_JFS_FS=y
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_STATISTICS is not set
-CONFIG_FS_POSIX_ACL=y
-CONFIG_XFS_FS=y
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_DEBUG is not set
-CONFIG_GFS2_FS=y
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_OCFS2_FS=y
-CONFIG_OCFS2_FS_O2CB=y
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=y
-# CONFIG_OCFS2_FS_STATS is not set
-CONFIG_OCFS2_DEBUG_MASKLOG=y
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_BTRFS_FS=y
-CONFIG_BTRFS_FS_POSIX_ACL=y
-CONFIG_NILFS2_FS=m
-CONFIG_FILE_LOCKING=y
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY=y
-CONFIG_INOTIFY_USER=y
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-CONFIG_QUOTA_TREE=y
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=y
-CONFIG_QUOTACTL=y
-CONFIG_AUTOFS_FS=m
-CONFIG_AUTOFS4_FS=m
-CONFIG_FUSE_FS=m
-CONFIG_CUSE=m
-CONFIG_GENERIC_ACL=y
-
-#
-# Caches
-#
-CONFIG_FSCACHE=m
-# CONFIG_FSCACHE_STATS is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=m
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=y
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=y
-CONFIG_UDF_NLS=y
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-CONFIG_NTFS_FS=y
-# CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_RW=y
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-# CONFIG_HUGETLBFS is not set
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_CONFIGFS_FS=y
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_ADFS_FS=m
-# CONFIG_ADFS_FS_RW is not set
-CONFIG_AFFS_FS=m
-# CONFIG_ECRYPT_FS is not set
-CONFIG_HFS_FS=m
-CONFIG_HFSPLUS_FS=m
-CONFIG_BEFS_FS=m
-# CONFIG_BEFS_DEBUG is not set
-CONFIG_BFS_FS=m
-CONFIG_EFS_FS=m
-CONFIG_JFFS2_FS=m
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-# CONFIG_JFFS2_SUMMARY is not set
-# CONFIG_JFFS2_FS_XATTR is not set
-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-CONFIG_JFFS2_ZLIB=y
-# CONFIG_JFFS2_LZO is not set
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
-CONFIG_UBIFS_FS=m
-CONFIG_UBIFS_FS_XATTR=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-# CONFIG_UBIFS_FS_DEBUG is not set
-CONFIG_CRAMFS=m
-CONFIG_SQUASHFS=m
-CONFIG_SQUASHFS_EMBEDDED=y
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_VXFS_FS=m
-CONFIG_MINIX_FS=m
-CONFIG_OMFS_FS=m
-CONFIG_HPFS_FS=m
-CONFIG_QNX4FS_FS=m
-CONFIG_ROMFS_FS=y
-CONFIG_ROMFS_BACKED_BY_BLOCK=y
-# CONFIG_ROMFS_BACKED_BY_MTD is not set
-# CONFIG_ROMFS_BACKED_BY_BOTH is not set
-CONFIG_ROMFS_ON_BLOCK=y
-CONFIG_SYSV_FS=m
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-# CONFIG_UFS_DEBUG is not set
-CONFIG_EXOFS_FS=m
-# CONFIG_EXOFS_DEBUG is not set
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-# CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V4=y
-# CONFIG_NFS_V4_1 is not set
-CONFIG_NFSD=y
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V3_ACL is not set
-CONFIG_NFSD_V4=y
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-CONFIG_EXPORTFS=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
-CONFIG_SUNRPC_GSS=y
-CONFIG_SUNRPC_XPRT_RDMA=m
-CONFIG_RPCSEC_GSS_KRB5=y
-CONFIG_RPCSEC_GSS_SPKM3=m
-CONFIG_SMB_FS=m
-# CONFIG_SMB_NLS_DEFAULT is not set
-CONFIG_CIFS=m
-# CONFIG_CIFS_STATS is not set
-CONFIG_CIFS_WEAK_PW_HASH=y
-# CONFIG_CIFS_UPCALL is not set
-# CONFIG_CIFS_XATTR is not set
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_DFS_UPCALL is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
-CONFIG_NCP_FS=m
-CONFIG_NCPFS_PACKET_SIGNING=y
-CONFIG_NCPFS_IOCTL_LOCKING=y
-CONFIG_NCPFS_STRONG=y
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_NLS=y
-CONFIG_NCPFS_EXTRAS=y
-CONFIG_CODA_FS=m
-CONFIG_AFS_FS=m
-# CONFIG_AFS_DEBUG is not set
-# CONFIG_AFS_FSCACHE is not set
-CONFIG_9P_FS=m
-# CONFIG_9P_FSCACHE is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-CONFIG_OSF_PARTITION=y
-CONFIG_AMIGA_PARTITION=y
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_UNIXWARE_DISKLABEL=y
-# CONFIG_LDM_PARTITION is not set
-CONFIG_SGI_PARTITION=y
-# CONFIG_ULTRIX_PARTITION is not set
-CONFIG_SUN_PARTITION=y
-CONFIG_KARMA_PARTITION=y
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_UTF8=y
-CONFIG_DLM=y
-# CONFIG_DLM_DEBUG is not set
-
-#
-# Kernel hacking
-#
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
-CONFIG_ENABLE_WARN_DEPRECATED=y
-CONFIG_ENABLE_MUST_CHECK=y
-CONFIG_FRAME_WARN=0
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_STRIP_ASM_SYMS=y
-CONFIG_UNUSED_SYMBOLS=y
-CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_CHECK is not set
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_DEBUG_SHIRQ is not set
-CONFIG_DETECT_SOFTLOCKUP=y
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-CONFIG_DETECT_HUNG_TASK=y
-# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
-CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
-CONFIG_SCHED_DEBUG=y
-# CONFIG_SCHEDSTATS is not set
-CONFIG_TIMER_STATS=y
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_RT_MUTEX_TESTER is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-CONFIG_STACKTRACE=y
-# CONFIG_DEBUG_KOBJECT is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_VIRTUAL is not set
-# CONFIG_DEBUG_WRITECOUNT is not set
-CONFIG_DEBUG_MEMORY_INIT=y
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-CONFIG_FRAME_POINTER=y
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_LATENCYTOP is not set
-# CONFIG_SYSCTL_SYSCALL_CHECK is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
-CONFIG_USER_STACKTRACE_SUPPORT=y
-CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FTRACE_NMI_ENTER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
-CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_RING_BUFFER=y
-CONFIG_FTRACE_NMI_ENTER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-# CONFIG_IRQSOFF_TRACER is not set
-CONFIG_SYSPROF_TRACER=y
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
-# CONFIG_BOOT_TRACER is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-# CONFIG_POWER_TRACER is not set
-# CONFIG_KSYM_TRACER is not set
-# CONFIG_STACK_TRACER is not set
-# CONFIG_KMEMTRACE is not set
-# CONFIG_WORKQUEUE_TRACER is not set
-CONFIG_BLK_DEV_IO_TRACE=y
-CONFIG_DYNAMIC_FTRACE=y
-# CONFIG_FUNCTION_PROFILER is not set
-CONFIG_FTRACE_MCOUNT_RECORD=y
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_MMIOTRACE is not set
-CONFIG_RING_BUFFER_BENCHMARK=m
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# CONFIG_DMA_API_DEBUG is not set
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-CONFIG_HAVE_ARCH_KMEMCHECK=y
-CONFIG_STRICT_DEVMEM=y
-CONFIG_X86_VERBOSE_BOOTUP=y
-CONFIG_EARLY_PRINTK=y
-# CONFIG_EARLY_PRINTK_DBGP is not set
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-# CONFIG_X86_PTDUMP is not set
-CONFIG_DEBUG_RODATA=y
-CONFIG_DEBUG_RODATA_TEST=y
-# CONFIG_DEBUG_NX_TEST is not set
-# CONFIG_IOMMU_DEBUG is not set
-# CONFIG_IOMMU_STRESS is not set
-CONFIG_HAVE_MMIOTRACE_SUPPORT=y
-CONFIG_IO_DELAY_TYPE_0X80=0
-CONFIG_IO_DELAY_TYPE_0XED=1
-CONFIG_IO_DELAY_TYPE_UDELAY=2
-CONFIG_IO_DELAY_TYPE_NONE=3
-CONFIG_IO_DELAY_0X80=y
-# CONFIG_IO_DELAY_0XED is not set
-# CONFIG_IO_DELAY_UDELAY is not set
-# CONFIG_IO_DELAY_NONE is not set
-CONFIG_DEFAULT_IO_DELAY_TYPE=0
-# CONFIG_DEBUG_BOOT_PARAMS is not set
-# CONFIG_CPA_DEBUG is not set
-CONFIG_OPTIMIZE_INLINING=y
-# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-CONFIG_KEYS_DEBUG_PROC_KEYS=y
-CONFIG_SECURITY=y
-CONFIG_SECURITYFS=y
-CONFIG_SECURITY_NETWORK=y
-CONFIG_SECURITY_NETWORK_XFRM=y
-# CONFIG_SECURITY_PATH is not set
-# CONFIG_SECURITY_SELINUX is not set
-# CONFIG_SECURITY_TOMOYO is not set
-# CONFIG_IMA is not set
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_SMACK is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_XOR_BLOCKS=y
-CONFIG_ASYNC_CORE=y
-CONFIG_ASYNC_MEMCPY=y
-CONFIG_ASYNC_XOR=y
-CONFIG_ASYNC_PQ=y
-CONFIG_ASYNC_RAID6_RECOV=y
-CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
-CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_FIPS=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=y
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=m
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_PCOMP=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_WORKQUEUE=y
-CONFIG_CRYPTO_CRYPTD=y
-CONFIG_CRYPTO_AUTHENC=y
-CONFIG_CRYPTO_TEST=m
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_SEQIV=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CTR=m
-CONFIG_CRYPTO_CTS=m
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_LRW=y
-CONFIG_CRYPTO_PCBC=y
-CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_FPU=y
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_XCBC=y
-CONFIG_CRYPTO_VMAC=m
-
-#
-# Digest
-#
-CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CRC32C_INTEL=m
-CONFIG_CRYPTO_GHASH=m
-CONFIG_CRYPTO_MD4=y
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_MICHAEL_MIC=y
-CONFIG_CRYPTO_RMD128=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RMD256=m
-CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_TGR192=y
-CONFIG_CRYPTO_WP512=y
-CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_AES_X86_64=y
-CONFIG_CRYPTO_AES_NI_INTEL=y
-CONFIG_CRYPTO_ANUBIS=y
-CONFIG_CRYPTO_ARC4=y
-CONFIG_CRYPTO_BLOWFISH=y
-CONFIG_CRYPTO_CAMELLIA=y
-CONFIG_CRYPTO_CAST5=y
-CONFIG_CRYPTO_CAST6=y
-CONFIG_CRYPTO_DES=y
-CONFIG_CRYPTO_FCRYPT=y
-CONFIG_CRYPTO_KHAZAD=y
-CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_SALSA20_X86_64=m
-CONFIG_CRYPTO_SEED=y
-CONFIG_CRYPTO_SERPENT=y
-CONFIG_CRYPTO_TEA=y
-CONFIG_CRYPTO_TWOFISH=y
-CONFIG_CRYPTO_TWOFISH_COMMON=y
-CONFIG_CRYPTO_TWOFISH_X86_64=y
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_ZLIB=m
-CONFIG_CRYPTO_LZO=m
-
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_PADLOCK=m
-CONFIG_CRYPTO_DEV_PADLOCK_AES=m
-CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
-CONFIG_CRYPTO_DEV_HIFN_795X=m
-CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
-CONFIG_HAVE_KVM=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_KVM_APIC_ARCHITECTURE=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=m
-CONFIG_KVM_INTEL=m
-CONFIG_KVM_AMD=m
-CONFIG_VIRTIO=m
-CONFIG_VIRTIO_RING=m
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_BINARY_PRINTF=y
-
-#
-# Library routines
-#
-CONFIG_BITREVERSE=y
-CONFIG_GENERIC_FIND_FIRST_BIT=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=y
-CONFIG_CRC_T10DIF=m
-CONFIG_CRC_ITU_T=y
-CONFIG_CRC32=y
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZO_COMPRESS=m
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_LZO=y
-CONFIG_REED_SOLOMON=m
-CONFIG_REED_SOLOMON_DEC16=y
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAS_DMA=y
-CONFIG_CHECK_SIGNATURE=y
-CONFIG_NLATTR=y
-CONFIG_LRU_CACHE=m
diff --git a/source/k/config-huge-2.6.37.6 b/source/k/config-huge-2.6.37.6
new file mode 100644
index 00000000..08570cc5
--- /dev/null
+++ b/source/k/config-huge-2.6.37.6
@@ -0,0 +1,5065 @@
+#
+# Automatically generated make config: don't edit
+# Linux/x86_64 2.6.37.6 Kernel Configuration
+# Sat Apr  9 22:43:20 2011
+#
+CONFIG_64BIT=y
+# CONFIG_X86_32 is not set
+CONFIG_X86_64=y
+CONFIG_X86=y
+CONFIG_INSTRUCTION_DECODER=y
+CONFIG_OUTPUT_FORMAT="elf64-x86-64"
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_MMU=y
+CONFIG_ZONE_DMA=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_DEFAULT_IDLE=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ZONE_DMA32=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_AUDIT_ARCH=y
+CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_X86_64_SMP=y
+CONFIG_X86_HT=y
+CONFIG_X86_TRAMPOLINE=y
+CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
+# CONFIG_KTIME_SCALAR is not set
+CONFIG_ARCH_CPU_PROBE_RELEASE=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_CONSTRUCTORS=y
+CONFIG_HAVE_IRQ_WORK=y
+CONFIG_IRQ_WORK=y
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_CROSS_COMPILE=""
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_LZO=y
+# CONFIG_KERNEL_GZIP is not set
+# CONFIG_KERNEL_BZIP2 is not set
+CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_LZO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_AUDIT=y
+CONFIG_AUDITSYSCALL=y
+CONFIG_AUDIT_WATCH=y
+CONFIG_AUDIT_TREE=y
+CONFIG_HAVE_GENERIC_HARDIRQS=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
+# CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED is not set
+CONFIG_HAVE_SPARSE_IRQ=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_PENDING_IRQ=y
+# CONFIG_AUTO_IRQ_AFFINITY is not set
+# CONFIG_IRQ_PER_CPU is not set
+# CONFIG_HARDIRQS_SW_RESEND is not set
+# CONFIG_SPARSE_IRQ is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_PREEMPT_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_RCU_FAST_NO_HZ is not set
+# CONFIG_TREE_RCU_TRACE is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=15
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+CONFIG_CGROUPS=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_CGROUP_NS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_RESOURCE_COUNTERS=y
+CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_RT_GROUP_SCHED=y
+CONFIG_BLK_CGROUP=y
+# CONFIG_DEBUG_BLK_CGROUP is not set
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_MM_OWNER=y
+# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_LZO=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_HAVE_PERF_EVENTS=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_PERF_COUNTERS is not set
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_PCI_QUIRKS=y
+CONFIG_SLUB_DEBUG=y
+CONFIG_COMPAT_BRK=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+CONFIG_OPROFILE=m
+# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+# CONFIG_JUMP_LABEL is not set
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_STOP_MACHINE=y
+CONFIG_BLOCK=y
+CONFIG_BLK_DEV_BSG=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
+CONFIG_BLK_DEV_THROTTLING=y
+CONFIG_BLOCK_COMPAT=y
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_CFQ_GROUP_IOSCHED=y
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_PADATA=y
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_FREEZER=y
+
+#
+# Processor type and features
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_SMP=y
+CONFIG_X86_MPPARSE=y
+# CONFIG_X86_EXTENDED_PLATFORM is not set
+CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+# CONFIG_PARAVIRT_GUEST is not set
+CONFIG_NO_BOOTMEM=y
+CONFIG_MEMTEST=y
+# CONFIG_MK8 is not set
+# CONFIG_MPSC is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
+CONFIG_GENERIC_CPU=y
+CONFIG_X86_CPU=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_CMPXCHG=y
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_XADD=y
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_TSC=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=64
+CONFIG_X86_DEBUGCTLMSR=y
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_DMI=y
+CONFIG_GART_IOMMU=y
+# CONFIG_CALGARY_IOMMU is not set
+# CONFIG_AMD_IOMMU is not set
+CONFIG_SWIOTLB=y
+CONFIG_IOMMU_HELPER=y
+# CONFIG_IOMMU_API is not set
+# CONFIG_MAXSMP is not set
+CONFIG_NR_CPUS=32
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT is not set
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_MCE=y
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_AMD=y
+CONFIG_X86_MCE_THRESHOLD=y
+CONFIG_X86_MCE_INJECT=m
+CONFIG_X86_THERMAL_VECTOR=y
+CONFIG_I8K=m
+CONFIG_MICROCODE=m
+CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_AMD=y
+CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=m
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_DIRECT_GBPAGES=y
+# CONFIG_NUMA is not set
+CONFIG_ARCH_PROC_KCORE_TEXT=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_MEMORY_PROBE=y
+CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_HAVE_MEMORY_PRESENT=y
+CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
+CONFIG_SPARSEMEM_VMEMMAP=y
+CONFIG_HAVE_MEMBLOCK=y
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_SPARSE=y
+CONFIG_MEMORY_HOTREMOVE=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_MIGRATION=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_MMU_NOTIFIER=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=98304
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+# CONFIG_MEMORY_FAILURE is not set
+# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
+CONFIG_X86_RESERVE_LOW=64
+CONFIG_MTRR=y
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
+CONFIG_X86_PAT=y
+CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_EFI=y
+CONFIG_SECCOMP=y
+CONFIG_CC_STACKPROTECTOR=y
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
+CONFIG_HZ_1000=y
+CONFIG_HZ=1000
+CONFIG_SCHED_HRTICK=y
+# CONFIG_KEXEC is not set
+# CONFIG_CRASH_DUMP is not set
+CONFIG_PHYSICAL_START=0x1000000
+# CONFIG_RELOCATABLE is not set
+CONFIG_PHYSICAL_ALIGN=0x1000000
+CONFIG_HOTPLUG_CPU=y
+CONFIG_COMPAT_VDSO=y
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+
+#
+# Power management and ACPI options
+#
+CONFIG_ARCH_HIBERNATION_HEADER=y
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_SLEEP_SMP=y
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND_NVS=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+CONFIG_HIBERNATION=y
+CONFIG_PM_STD_PARTITION="\"\""
+CONFIG_PM_RUNTIME=y
+CONFIG_PM_OPS=y
+CONFIG_ACPI=y
+CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_PROCFS=y
+CONFIG_ACPI_PROCFS_POWER=y
+CONFIG_ACPI_POWER_METER=m
+CONFIG_ACPI_EC_DEBUGFS=m
+CONFIG_ACPI_PROC_EVENT=y
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=m
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_PROCESSOR=m
+CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
+CONFIG_ACPI_THERMAL=m
+# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_BLACKLIST_YEAR=0
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_PCI_SLOT=m
+CONFIG_X86_PM_TIMER=y
+CONFIG_ACPI_CONTAINER=m
+CONFIG_ACPI_HOTPLUG_MEMORY=m
+CONFIG_ACPI_SBS=m
+CONFIG_ACPI_HED=m
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=m
+CONFIG_ACPI_APEI_EINJ=m
+CONFIG_ACPI_APEI_ERST_DEBUG=m
+CONFIG_SFI=y
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=m
+# CONFIG_CPU_FREQ_DEBUG is not set
+CONFIG_CPU_FREQ_STAT=m
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=m
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+
+#
+# CPUFreq processor drivers
+#
+CONFIG_X86_PCC_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_SPEEDSTEP_CENTRINO=m
+CONFIG_X86_P4_CLOCKMOD=m
+
+#
+# shared options
+#
+CONFIG_X86_SPEEDSTEP_LIB=m
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_INTEL_IDLE=y
+
+#
+# Memory power savings
+#
+CONFIG_I7300_IDLE_IOAT_CHANNEL=y
+CONFIG_I7300_IDLE=m
+
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_DOMAINS=y
+# CONFIG_PCI_CNB20LE_QUIRK is not set
+# CONFIG_DMAR is not set
+# CONFIG_INTR_REMAP is not set
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=m
+CONFIG_PCIEAER=y
+# CONFIG_PCIE_ECRC is not set
+CONFIG_PCIEAER_INJECT=m
+CONFIG_PCIEASPM=y
+# CONFIG_PCIEASPM_DEBUG is not set
+CONFIG_PCIE_PME=y
+CONFIG_ARCH_SUPPORTS_MSI=y
+CONFIG_PCI_MSI=y
+# CONFIG_PCI_DEBUG is not set
+CONFIG_PCI_STUB=m
+CONFIG_HT_IRQ=y
+# CONFIG_PCI_IOV is not set
+CONFIG_PCI_IOAPIC=y
+CONFIG_ISA_DMA_API=y
+CONFIG_AMD_NB=y
+CONFIG_PCCARD=m
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_PCCARD_NONSTATIC=y
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_FAKE=m
+CONFIG_HOTPLUG_PCI_ACPI=m
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
+# CONFIG_HOTPLUG_PCI_CPCI is not set
+CONFIG_HOTPLUG_PCI_SHPC=m
+
+#
+# Executable file formats / Emulations
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_COMPAT_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_HAVE_AOUT is not set
+CONFIG_BINFMT_MISC=m
+CONFIG_IA32_EMULATION=y
+# CONFIG_IA32_AOUT is not set
+CONFIG_COMPAT=y
+CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
+CONFIG_SYSVIPC_COMPAT=y
+CONFIG_HAVE_TEXT_POKE_SMP=y
+CONFIG_NET=y
+CONFIG_COMPAT_NETLINK_MESSAGES=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=y
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+# CONFIG_NET_KEY_MIGRATE is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_INET_LRO=y
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=m
+CONFIG_IPV6_PRIVACY=y
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_SIT_6RD is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_NETLABEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+# CONFIG_NF_CONNTRACK_EVENTS is not set
+CONFIG_NF_CT_PROTO_DCCP=m
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_TPROXY=m
+CONFIG_NETFILTER_XTABLES=m
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_VS=m
+# CONFIG_IP_VS_IPV6 is not set
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_NFCT=y
+CONFIG_IP_VS_PE_SIP=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_DCCP=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_QUEUE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+
+#
+# DECnet: Netfilter Configuration
+#
+# CONFIG_DECNET_NF_GRABULATOR is not set
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_ULOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+# CONFIG_IP_DCCP_CCID3 is not set
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_MSG is not set
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_HMAC_NONE is not set
+# CONFIG_SCTP_HMAC_SHA1 is not set
+CONFIG_SCTP_HMAC_MD5=y
+CONFIG_RDS=m
+CONFIG_RDS_RDMA=m
+CONFIG_RDS_TCP=m
+# CONFIG_RDS_DEBUG is not set
+CONFIG_TIPC=m
+# CONFIG_TIPC_ADVANCED is not set
+# CONFIG_TIPC_DEBUG is not set
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_GARP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+# CONFIG_NET_DSA is not set
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_DECNET=m
+# CONFIG_DECNET_ROUTER is not set
+CONFIG_LLC=m
+CONFIG_LLC2=m
+CONFIG_IPX=m
+# CONFIG_IPX_INTERN is not set
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_IPDDP_DECAP=y
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+CONFIG_WAN_ROUTER=m
+# CONFIG_PHONET is not set
+CONFIG_IEEE802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_INGRESS=m
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_ROUTE=y
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=y
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=y
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+# CONFIG_NET_CLS_IND is not set
+CONFIG_NET_SCH_FIFO=y
+# CONFIG_DCB is not set
+CONFIG_DNS_RESOLVER=y
+CONFIG_RPS=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NET_DROP_MONITOR is not set
+CONFIG_HAMRADIO=y
+
+#
+# Packet Radio protocols
+#
+CONFIG_AX25=m
+# CONFIG_AX25_DAMA_SLAVE is not set
+CONFIG_NETROM=m
+CONFIG_ROSE=m
+
+#
+# AX.25 network device drivers
+#
+CONFIG_MKISS=m
+CONFIG_6PACK=m
+CONFIG_BPQETHER=m
+CONFIG_BAYCOM_SER_FDX=m
+CONFIG_BAYCOM_SER_HDX=m
+CONFIG_BAYCOM_PAR=m
+CONFIG_YAM=m
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+
+#
+# CAN Device Drivers
+#
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_DEV=m
+# CONFIG_CAN_CALC_BITTIMING is not set
+CONFIG_CAN_JANZ_ICAN3=m
+CONFIG_PCH_CAN=m
+CONFIG_CAN_SJA1000=m
+CONFIG_CAN_SJA1000_PLATFORM=m
+CONFIG_CAN_EMS_PCI=m
+CONFIG_CAN_KVASER_PCI=m
+CONFIG_CAN_PLX_PCI=m
+
+#
+# CAN USB interfaces
+#
+CONFIG_CAN_EMS_USB=m
+CONFIG_CAN_ESD_USB2=m
+# CONFIG_CAN_DEBUG_DEVICES is not set
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+# CONFIG_IRDA_ULTRA is not set
+
+#
+# IrDA options
+#
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+# CONFIG_IRDA_DEBUG is not set
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+CONFIG_IRTTY_SIR=m
+
+#
+# Dongle support
+#
+CONFIG_DONGLE=y
+CONFIG_ESI_DONGLE=m
+CONFIG_ACTISYS_DONGLE=m
+CONFIG_TEKRAM_DONGLE=m
+CONFIG_TOIM3232_DONGLE=m
+CONFIG_LITELINK_DONGLE=m
+CONFIG_MA600_DONGLE=m
+CONFIG_GIRBIL_DONGLE=m
+CONFIG_MCP2120_DONGLE=m
+CONFIG_OLD_BELKIN_DONGLE=m
+CONFIG_ACT200L_DONGLE=m
+CONFIG_KINGSUN_DONGLE=m
+CONFIG_KSDAZZLE_DONGLE=m
+CONFIG_KS959_DONGLE=m
+
+#
+# FIR device drivers
+#
+CONFIG_USB_IRDA=m
+CONFIG_SIGMATEL_FIR=m
+CONFIG_NSC_FIR=m
+CONFIG_WINBOND_FIR=m
+CONFIG_SMC_IRCC_FIR=m
+CONFIG_ALI_FIR=m
+CONFIG_VLSI_FIR=m
+CONFIG_VIA_FIR=m
+CONFIG_MCS_FIR=m
+CONFIG_BT=m
+CONFIG_BT_L2CAP=m
+CONFIG_BT_SCO=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIBTUART=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_AF_RXRPC=m
+# CONFIG_AF_RXRPC_DEBUG is not set
+CONFIG_RXKAD=m
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_REG_DEBUG is not set
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+# CONFIG_CFG80211_INTERNAL_REGDB is not set
+CONFIG_CFG80211_WEXT=y
+CONFIG_WIRELESS_EXT_SYSFS=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_MINSTREL_HT=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+CONFIG_NET_9P_RDMA=m
+# CONFIG_NET_9P_DEBUG is not set
+# CONFIG_CAIF is not set
+CONFIG_CEPH_LIB=m
+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+CONFIG_CONNECTOR=m
+CONFIG_MTD=m
+# CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_TESTS=m
+CONFIG_MTD_CONCAT=m
+CONFIG_MTD_PARTITIONS=y
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+CONFIG_MTD_AR7_PARTS=m
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=m
+CONFIG_HAVE_MTD_OTP=y
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+CONFIG_FTL=m
+CONFIG_NFTL=m
+CONFIG_NFTL_RW=y
+CONFIG_INFTL=m
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
+CONFIG_SM_FTL=m
+CONFIG_MTD_OOPS=m
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_GEN_PROBE=m
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+CONFIG_MTD_MAP_BANK_WIDTH_8=y
+CONFIG_MTD_MAP_BANK_WIDTH_16=y
+CONFIG_MTD_MAP_BANK_WIDTH_32=y
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+CONFIG_MTD_CFI_I4=y
+CONFIG_MTD_CFI_I8=y
+CONFIG_MTD_OTP=y
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_CFI_UTIL=m
+CONFIG_MTD_RAM=m
+CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_PHYSMAP=m
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+CONFIG_MTD_SC520CDP=m
+CONFIG_MTD_NETSC520=m
+CONFIG_MTD_TS5500=m
+CONFIG_MTD_SBC_GXX=m
+CONFIG_MTD_AMD76XROM=m
+CONFIG_MTD_ICHXROM=m
+CONFIG_MTD_ESB2ROM=m
+CONFIG_MTD_CK804XROM=m
+CONFIG_MTD_SCB2_FLASH=m
+CONFIG_MTD_NETtel=m
+CONFIG_MTD_L440GX=m
+CONFIG_MTD_PCI=m
+CONFIG_MTD_PCMCIA=m
+# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
+CONFIG_MTD_GPIO_ADDR=m
+CONFIG_MTD_INTEL_VR_NOR=m
+CONFIG_MTD_PLATRAM=m
+
+#
+# Self-contained MTD device drivers
+#
+CONFIG_MTD_PMC551=m
+CONFIG_MTD_PMC551_BUGFIX=y
+# CONFIG_MTD_PMC551_DEBUG is not set
+CONFIG_MTD_SLRAM=m
+CONFIG_MTD_PHRAM=m
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=4096
+CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTD_BLOCK2MTD=m
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+CONFIG_MTD_DOC2001PLUS=m
+CONFIG_MTD_DOCPROBE=m
+CONFIG_MTD_DOCECC=m
+CONFIG_MTD_DOCPROBE_ADVANCED=y
+CONFIG_MTD_DOCPROBE_ADDRESS=0x0000
+CONFIG_MTD_DOCPROBE_HIGH=y
+CONFIG_MTD_DOCPROBE_55AA=y
+CONFIG_MTD_NAND_ECC=m
+CONFIG_MTD_NAND_ECC_SMC=y
+CONFIG_MTD_NAND=m
+CONFIG_MTD_NAND_VERIFY_WRITE=y
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_MUSEUM_IDS=y
+CONFIG_MTD_NAND_DENALI=m
+CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xFF108018
+CONFIG_MTD_NAND_IDS=m
+CONFIG_MTD_NAND_RICOH=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y
+CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y
+CONFIG_MTD_NAND_CAFE=m
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_PLATFORM=m
+CONFIG_MTD_ALAUDA=m
+CONFIG_MTD_ONENAND=m
+CONFIG_MTD_ONENAND_VERIFY_WRITE=y
+CONFIG_MTD_ONENAND_GENERIC=m
+CONFIG_MTD_ONENAND_OTP=y
+CONFIG_MTD_ONENAND_2X_PROGRAM=y
+CONFIG_MTD_ONENAND_SIM=m
+
+#
+# LPDDR flash memory drivers
+#
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_RESERVE=1
+CONFIG_MTD_UBI_GLUEBI=m
+
+#
+# UBI debugging options
+#
+# CONFIG_MTD_UBI_DEBUG is not set
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
+CONFIG_PARPORT_PC_PCMCIA=m
+# CONFIG_PARPORT_GSC is not set
+CONFIG_PARPORT_AX88796=m
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_PNP=y
+CONFIG_PNP_DEBUG_MESSAGES=y
+
+#
+# Protocols
+#
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_FD=y
+CONFIG_PARIDE=m
+
+#
+# Parallel IDE high-level drivers
+#
+CONFIG_PARIDE_PD=m
+CONFIG_PARIDE_PCD=m
+CONFIG_PARIDE_PF=m
+CONFIG_PARIDE_PT=m
+CONFIG_PARIDE_PG=m
+
+#
+# Parallel IDE protocol modules
+#
+CONFIG_PARIDE_ATEN=m
+CONFIG_PARIDE_BPCK=m
+CONFIG_PARIDE_COMM=m
+CONFIG_PARIDE_DSTR=m
+CONFIG_PARIDE_FIT2=m
+CONFIG_PARIDE_FIT3=m
+CONFIG_PARIDE_EPAT=m
+CONFIG_PARIDE_EPATC8=y
+CONFIG_PARIDE_EPIA=m
+CONFIG_PARIDE_FRIQ=m
+CONFIG_PARIDE_FRPW=m
+CONFIG_PARIDE_KBIC=m
+CONFIG_PARIDE_KTTI=m
+CONFIG_PARIDE_ON20=m
+CONFIG_PARIDE_ON26=m
+CONFIG_BLK_CPQ_DA=y
+CONFIG_BLK_CPQ_CISS_DA=y
+CONFIG_CISS_SCSI_TAPE=y
+CONFIG_BLK_DEV_DAC960=y
+CONFIG_BLK_DEV_UMEM=m
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_OSD=m
+CONFIG_BLK_DEV_SX8=y
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=16384
+# CONFIG_BLK_DEV_XIP is not set
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_ATA_OVER_ETH=m
+CONFIG_VIRTIO_BLK=m
+# CONFIG_BLK_DEV_HD is not set
+CONFIG_BLK_DEV_RBD=m
+CONFIG_MISC_DEVICES=y
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+CONFIG_IBM_ASM=m
+CONFIG_PHANTOM=m
+CONFIG_SGI_IOC4=m
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+CONFIG_ICS932S401=m
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_CS5535_MFGPT=m
+CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
+CONFIG_CS5535_CLOCK_EVENT_SRC=m
+CONFIG_HP_ILO=m
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1780=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
+CONFIG_VMWARE_BALLOON=m
+CONFIG_BMP085=m
+CONFIG_PCH_PHUB=m
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+CONFIG_IWMC3200TOP=m
+# CONFIG_IWMC3200TOP_DEBUG is not set
+# CONFIG_IWMC3200TOP_DEBUGFS is not set
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=y
+CONFIG_RAID_ATTRS=y
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_TGT=y
+CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=y
+CONFIG_CHR_DEV_OSST=m
+CONFIG_BLK_DEV_SR=y
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=y
+CONFIG_SCSI_FC_ATTRS=y
+CONFIG_SCSI_FC_TGT_ATTRS=y
+CONFIG_SCSI_ISCSI_ATTRS=y
+CONFIG_SCSI_SAS_ATTRS=y
+CONFIG_SCSI_SAS_LIBSAS=y
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
+CONFIG_SCSI_SRP_ATTRS=m
+CONFIG_SCSI_SRP_TGT_ATTRS=y
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_ISCSI_BOOT_SYSFS=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_BE2ISCSI=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=y
+CONFIG_SCSI_HPSA=y
+CONFIG_SCSI_3W_9XXX=y
+CONFIG_SCSI_3W_SAS=y
+CONFIG_SCSI_ACARD=y
+CONFIG_SCSI_AACRAID=y
+CONFIG_SCSI_AIC7XXX=y
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=4
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
+CONFIG_AIC7XXX_DEBUG_MASK=0
+# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
+CONFIG_SCSI_AIC7XXX_OLD=y
+CONFIG_SCSI_AIC79XX=y
+CONFIG_AIC79XX_CMDS_PER_DEVICE=4
+CONFIG_AIC79XX_RESET_DELAY_MS=15000
+# CONFIG_AIC79XX_DEBUG_ENABLE is not set
+CONFIG_AIC79XX_DEBUG_MASK=0
+# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
+CONFIG_SCSI_AIC94XX=y
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_MVSAS=y
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_ADVANSYS=y
+CONFIG_SCSI_ARCMSR=y
+# CONFIG_SCSI_ARCMSR_AER is not set
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=y
+CONFIG_MEGARAID_MAILBOX=y
+CONFIG_MEGARAID_LEGACY=y
+CONFIG_MEGARAID_SAS=y
+CONFIG_SCSI_MPT2SAS=y
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+# CONFIG_SCSI_MPT2SAS_LOGGING is not set
+CONFIG_SCSI_HPTIOP=y
+CONFIG_SCSI_BUSLOGIC=y
+CONFIG_VMWARE_PVSCSI=m
+CONFIG_LIBFC=y
+CONFIG_LIBFCOE=y
+CONFIG_FCOE=y
+CONFIG_FCOE_FNIC=y
+CONFIG_SCSI_DMX3191D=y
+CONFIG_SCSI_EATA=y
+# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
+# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
+CONFIG_SCSI_EATA_MAX_TAGS=16
+CONFIG_SCSI_FUTURE_DOMAIN=y
+CONFIG_SCSI_GDTH=y
+CONFIG_SCSI_IPS=y
+CONFIG_SCSI_INITIO=y
+CONFIG_SCSI_INIA100=y
+CONFIG_SCSI_PPA=m
+CONFIG_SCSI_IMM=m
+# CONFIG_SCSI_IZIP_EPP16 is not set
+# CONFIG_SCSI_IZIP_SLOW_CTR is not set
+CONFIG_SCSI_STEX=y
+CONFIG_SCSI_SYM53C8XX_2=y
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_SCSI_IPR=y
+# CONFIG_SCSI_IPR_TRACE is not set
+# CONFIG_SCSI_IPR_DUMP is not set
+CONFIG_SCSI_QLOGIC_1280=y
+CONFIG_SCSI_QLA_FC=y
+CONFIG_SCSI_QLA_ISCSI=y
+CONFIG_SCSI_LPFC=y
+# CONFIG_SCSI_LPFC_DEBUG_FS is not set
+CONFIG_SCSI_DC395x=y
+CONFIG_SCSI_DC390T=y
+CONFIG_SCSI_DEBUG=m
+CONFIG_SCSI_PMCRAID=y
+CONFIG_SCSI_PM8001=y
+CONFIG_SCSI_SRP=y
+CONFIG_SCSI_BFA_FC=y
+CONFIG_SCSI_LOWLEVEL_PCMCIA=y
+CONFIG_PCMCIA_AHA152X=m
+CONFIG_PCMCIA_FDOMAIN=m
+CONFIG_PCMCIA_QLOGIC=m
+CONFIG_PCMCIA_SYM53C500=m
+CONFIG_SCSI_DH=m
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+CONFIG_SCSI_OSD_INITIATOR=m
+CONFIG_SCSI_OSD_ULD=m
+CONFIG_SCSI_OSD_DPRINT_SENSE=1
+# CONFIG_SCSI_OSD_DEBUG is not set
+CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_ACPI=y
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=y
+CONFIG_SATA_AHCI_PLATFORM=y
+CONFIG_SATA_INIC162X=y
+CONFIG_SATA_SIL24=y
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=y
+CONFIG_SATA_QSTOR=y
+CONFIG_SATA_SX4=y
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=y
+CONFIG_SATA_MV=y
+CONFIG_SATA_NV=y
+CONFIG_SATA_PROMISE=y
+CONFIG_SATA_SIL=y
+CONFIG_SATA_SIS=y
+CONFIG_SATA_SVW=y
+CONFIG_SATA_ULI=y
+CONFIG_SATA_VIA=y
+CONFIG_SATA_VITESSE=y
+
+#
+# PATA SFF controllers with BMDMA
+#
+CONFIG_PATA_ALI=y
+CONFIG_PATA_AMD=y
+CONFIG_PATA_ARTOP=y
+CONFIG_PATA_ATIIXP=y
+CONFIG_PATA_ATP867X=y
+CONFIG_PATA_CMD64X=y
+CONFIG_PATA_CS5520=y
+CONFIG_PATA_CS5530=y
+CONFIG_PATA_CS5536=y
+CONFIG_PATA_CYPRESS=y
+CONFIG_PATA_EFAR=y
+CONFIG_PATA_HPT366=y
+CONFIG_PATA_HPT37X=y
+CONFIG_PATA_HPT3X2N=y
+CONFIG_PATA_HPT3X3=y
+CONFIG_PATA_HPT3X3_DMA=y
+CONFIG_PATA_IT8213=y
+CONFIG_PATA_IT821X=y
+CONFIG_PATA_JMICRON=y
+CONFIG_PATA_MARVELL=y
+CONFIG_PATA_NETCELL=y
+CONFIG_PATA_NINJA32=y
+CONFIG_PATA_NS87415=y
+CONFIG_PATA_OLDPIIX=y
+CONFIG_PATA_OPTIDMA=y
+CONFIG_PATA_PDC2027X=y
+CONFIG_PATA_PDC_OLD=y
+CONFIG_PATA_RADISYS=y
+CONFIG_PATA_RDC=y
+CONFIG_PATA_SC1200=y
+CONFIG_PATA_SCH=y
+CONFIG_PATA_SERVERWORKS=y
+CONFIG_PATA_SIL680=y
+CONFIG_PATA_SIS=y
+CONFIG_PATA_TOSHIBA=m
+CONFIG_PATA_TRIFLEX=y
+CONFIG_PATA_VIA=y
+CONFIG_PATA_WINBOND=y
+
+#
+# PIO-only SFF controllers
+#
+CONFIG_PATA_CMD640_PCI=y
+CONFIG_PATA_MPIIX=y
+CONFIG_PATA_NS87410=y
+CONFIG_PATA_OPTI=y
+CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_RZ1000=y
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_PATA_ACPI=y
+CONFIG_ATA_GENERIC=y
+CONFIG_PATA_LEGACY=y
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_AUTODETECT=y
+CONFIG_MD_LINEAR=y
+CONFIG_MD_RAID0=y
+CONFIG_MD_RAID1=y
+CONFIG_MD_RAID10=y
+CONFIG_MD_RAID456=y
+# CONFIG_MULTICORE_RAID456 is not set
+CONFIG_MD_MULTIPATH=y
+CONFIG_MD_FAULTY=m
+CONFIG_BLK_DEV_DM=y
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_CRYPT=y
+CONFIG_DM_SNAPSHOT=y
+CONFIG_DM_MIRROR=y
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+# CONFIG_DM_DELAY is not set
+CONFIG_DM_UEVENT=y
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=y
+CONFIG_FUSION_FC=y
+CONFIG_FUSION_SAS=y
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=y
+CONFIG_FUSION_LAN=y
+# CONFIG_FUSION_LOGGING is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_OHCI_DEBUG=y
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_FIREWIRE_NOSY=m
+CONFIG_I2O=y
+CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
+CONFIG_I2O_EXT_ADAPTEC=y
+CONFIG_I2O_EXT_ADAPTEC_DMA64=y
+CONFIG_I2O_CONFIG=y
+# CONFIG_I2O_CONFIG_OLD_IOCTL is not set
+CONFIG_I2O_BUS=y
+CONFIG_I2O_BLOCK=y
+CONFIG_I2O_SCSI=y
+CONFIG_I2O_PROC=y
+CONFIG_MACINTOSH_DRIVERS=y
+CONFIG_MAC_EMUMOUSEBTN=y
+CONFIG_NETDEVICES=y
+CONFIG_IFB=m
+CONFIG_DUMMY=m
+CONFIG_BONDING=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_EQUALIZER=m
+CONFIG_TUN=m
+CONFIG_VETH=m
+CONFIG_NET_SB1000=m
+CONFIG_ARCNET=m
+CONFIG_ARCNET_1201=m
+CONFIG_ARCNET_1051=m
+CONFIG_ARCNET_RAW=m
+CONFIG_ARCNET_CAP=m
+CONFIG_ARCNET_COM90xx=m
+CONFIG_ARCNET_COM90xxIO=m
+CONFIG_ARCNET_RIM_I=m
+CONFIG_ARCNET_COM20020=m
+CONFIG_ARCNET_COM20020_PCI=m
+CONFIG_MII=m
+CONFIG_PHYLIB=m
+
+#
+# MII PHY device drivers
+#
+CONFIG_MARVELL_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM63XX_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_STE10XP=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MICREL_PHY=m
+CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_GPIO=m
+CONFIG_NET_ETHERNET=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_ETHOC=m
+CONFIG_DNET=m
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+CONFIG_TULIP_MMIO=y
+# CONFIG_TULIP_NAPI is not set
+CONFIG_DE4X5=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_PCMCIA_XIRCOM=m
+CONFIG_HP100=m
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
+CONFIG_NET_PCI=y
+CONFIG_PCNET32=m
+CONFIG_AMD8111_ETH=m
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_KSZ884X_PCI=m
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_FORCEDETH=m
+CONFIG_E100=m
+CONFIG_FEALNX=m
+CONFIG_NATSEMI=m
+CONFIG_NE2K_PCI=m
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+CONFIG_8139TOO_PIO=y
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R6040=m
+CONFIG_SIS900=m
+CONFIG_EPIC100=m
+CONFIG_SMSC9420=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_TLAN=m
+CONFIG_KS8842=m
+CONFIG_KS8851_MLL=m
+CONFIG_VIA_RHINE=m
+CONFIG_VIA_RHINE_MMIO=y
+CONFIG_SC92031=m
+CONFIG_NET_POCKET=y
+CONFIG_ATP=m
+CONFIG_DE600=m
+CONFIG_DE620=m
+CONFIG_ATL2=m
+CONFIG_NETDEV_1000=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_DL2K=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IP1000=m
+CONFIG_IGB=m
+CONFIG_IGB_DCA=y
+CONFIG_IGBVF=m
+CONFIG_NS83820=m
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_R8169=m
+CONFIG_R8169_VLAN=y
+CONFIG_SIS190=m
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_VIA_VELOCITY=m
+CONFIG_TIGON3=m
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_QLA3XXX=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_JME=m
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_DA is not set
+CONFIG_STMMAC_DUAL_MAC=y
+CONFIG_PCH_GBE=m
+CONFIG_NETDEV_10000=y
+CONFIG_MDIO=m
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3_DEPENDS=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4_DEPENDS=y
+CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4VF_DEPENDS=y
+CONFIG_CHELSIO_T4VF=m
+CONFIG_ENIC=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_DCA=y
+CONFIG_IXGBEVF=m
+CONFIG_IXGB=m
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+CONFIG_MYRI10GE=m
+CONFIG_MYRI10GE_DCA=y
+CONFIG_NETXEN_NIC=m
+CONFIG_NIU=m
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_TEHUTI=m
+CONFIG_BNX2X=m
+CONFIG_QLCNIC=m
+CONFIG_QLGE=m
+CONFIG_BNA=m
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_BE2NET=m
+CONFIG_TR=m
+CONFIG_IBMOL=m
+CONFIG_3C359=m
+CONFIG_TMS380TR=m
+CONFIG_TMSPCI=m
+CONFIG_ABYSS=m
+CONFIG_WLAN=y
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_AIRO=m
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_PCMCIA_ATMEL=m
+CONFIG_AT76C50X_USB=m
+CONFIG_AIRO_CS=m
+CONFIG_PCMCIA_WL3501=m
+CONFIG_PRISM54=m
+CONFIG_USB_ZD1201=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_ADM8211=m
+# CONFIG_MAC80211_HWSIM is not set
+CONFIG_MWL8K=m
+CONFIG_ATH_COMMON=m
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K=m
+# CONFIG_ATH9K_DEBUGFS is not set
+CONFIG_ATH9K_RATE_CONTROL=y
+CONFIG_ATH9K_HTC=m
+# CONFIG_ATH9K_HTC_DEBUGFS is not set
+CONFIG_AR9170_USB=m
+CONFIG_AR9170_LEDS=y
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+CONFIG_CARL9170_WPC=y
+CONFIG_B43=m
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_PCMCIA=y
+CONFIG_B43_SDIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+# CONFIG_B43LEGACY_DEBUG is not set
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_IWLWIFI=m
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_DEBUG is not set
+# CONFIG_IWLWIFI_DEVICE_TRACING is not set
+CONFIG_IWLAGN=m
+CONFIG_IWL4965=y
+CONFIG_IWL5000=y
+CONFIG_IWL3945=m
+CONFIG_IWM=m
+# CONFIG_IWM_DEBUG is not set
+# CONFIG_IWM_TRACING is not set
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
+CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_HERMES=m
+# CONFIG_HERMES_PRISM is not set
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_ORINOCO_USB=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_P54_LEDS=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI_PCI=y
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT30XX=y
+CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT30XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RT2800_LIB=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_HT=y
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_WL1251=m
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX=m
+CONFIG_WL1271=m
+CONFIG_WL1271_SDIO=m
+CONFIG_WL12XX_PLATFORM_DATA=y
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+
+#
+# WiMAX Wireless Broadband devices
+#
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_SDIO=m
+# CONFIG_WIMAX_IWMC3200_SDIO is not set
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+
+#
+# USB Network Adapters
+#
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+# CONFIG_USB_EPSON2888 is not set
+# CONFIG_USB_KC2190 is not set
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_NET_PCMCIA=y
+CONFIG_PCMCIA_3C589=m
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_PCMCIA_XIRC2PS=m
+CONFIG_PCMCIA_AXNET=m
+CONFIG_ARCNET_COM20020_CS=m
+CONFIG_PCMCIA_IBMTR=m
+CONFIG_WAN=y
+CONFIG_LANMEDIA=m
+CONFIG_HDLC=m
+CONFIG_HDLC_RAW=m
+CONFIG_HDLC_RAW_ETH=m
+CONFIG_HDLC_CISCO=m
+CONFIG_HDLC_FR=m
+CONFIG_HDLC_PPP=m
+
+#
+# X.25/LAPB support is disabled
+#
+CONFIG_PCI200SYN=m
+CONFIG_WANXL=m
+# CONFIG_PC300TOO is not set
+CONFIG_FARSYNC=m
+CONFIG_DSCC4=m
+# CONFIG_DSCC4_PCISYNC is not set
+# CONFIG_DSCC4_PCI_RST is not set
+CONFIG_DLCI=m
+CONFIG_DLCI_MAX=8
+CONFIG_WAN_ROUTER_DRIVERS=m
+CONFIG_CYCLADES_SYNC=m
+CONFIG_CYCLOMX_X25=y
+CONFIG_SBNI=m
+# CONFIG_SBNI_MULTILINE is not set
+CONFIG_ATM_DRIVERS=y
+CONFIG_ATM_DUMMY=m
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+# CONFIG_ATM_ENI_TUNE_BURST is not set
+CONFIG_ATM_FIRESTREAM=m
+CONFIG_ATM_ZATM=m
+# CONFIG_ATM_ZATM_DEBUG is not set
+CONFIG_ATM_NICSTAR=m
+# CONFIG_ATM_NICSTAR_USE_SUNI is not set
+# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_AMBASSADOR=m
+# CONFIG_ATM_AMBASSADOR_DEBUG is not set
+CONFIG_ATM_HORIZON=m
+# CONFIG_ATM_HORIZON_DEBUG is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+# CONFIG_ATM_FORE200E_USE_TASKLET is not set
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+# CONFIG_ATM_HE_USE_SUNI is not set
+CONFIG_ATM_SOLOS=m
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKEHARD=m
+
+#
+# CAIF transport drivers
+#
+CONFIG_FDDI=y
+CONFIG_DEFXX=m
+# CONFIG_DEFXX_MMIO is not set
+CONFIG_SKFP=m
+CONFIG_HIPPI=y
+CONFIG_ROADRUNNER=m
+# CONFIG_ROADRUNNER_LARGE_RINGS is not set
+CONFIG_PLIP=m
+CONFIG_PPP=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOATM=m
+CONFIG_PPPOL2TP=m
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLHC=m
+CONFIG_SLIP_SMART=y
+# CONFIG_SLIP_MODE_SLIP6 is not set
+CONFIG_NET_FC=y
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+# CONFIG_NETPOLL_TRAP is not set
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_VIRTIO_NET=m
+CONFIG_VMXNET3=m
+CONFIG_ISDN=y
+CONFIG_ISDN_I4L=m
+CONFIG_ISDN_PPP=y
+CONFIG_ISDN_PPP_VJ=y
+CONFIG_ISDN_MPP=y
+CONFIG_IPPP_FILTER=y
+CONFIG_ISDN_PPP_BSDCOMP=m
+CONFIG_ISDN_AUDIO=y
+CONFIG_ISDN_TTY_FAX=y
+
+#
+# ISDN feature submodules
+#
+CONFIG_ISDN_DIVERSION=m
+
+#
+# ISDN4Linux hardware drivers
+#
+
+#
+# Passive cards
+#
+CONFIG_ISDN_DRV_HISAX=m
+
+#
+# D-channel protocol features
+#
+CONFIG_HISAX_EURO=y
+CONFIG_DE_AOC=y
+CONFIG_HISAX_NO_SENDCOMPLETE=y
+CONFIG_HISAX_NO_LLC=y
+CONFIG_HISAX_NO_KEYPAD=y
+CONFIG_HISAX_1TR6=y
+CONFIG_HISAX_NI1=y
+CONFIG_HISAX_MAX_CARDS=8
+
+#
+# HiSax supported cards
+#
+CONFIG_HISAX_16_3=y
+CONFIG_HISAX_TELESPCI=y
+CONFIG_HISAX_S0BOX=y
+CONFIG_HISAX_FRITZPCI=y
+CONFIG_HISAX_AVM_A1_PCMCIA=y
+CONFIG_HISAX_ELSA=y
+CONFIG_HISAX_DIEHLDIVA=y
+CONFIG_HISAX_SEDLBAUER=y
+CONFIG_HISAX_NETJET=y
+CONFIG_HISAX_NETJET_U=y
+CONFIG_HISAX_NICCY=y
+CONFIG_HISAX_BKM_A4T=y
+CONFIG_HISAX_SCT_QUADRO=y
+CONFIG_HISAX_GAZEL=y
+CONFIG_HISAX_HFC_PCI=y
+CONFIG_HISAX_W6692=y
+CONFIG_HISAX_HFC_SX=y
+CONFIG_HISAX_ENTERNOW_PCI=y
+# CONFIG_HISAX_DEBUG is not set
+
+#
+# HiSax PCMCIA card service modules
+#
+CONFIG_HISAX_SEDLBAUER_CS=m
+CONFIG_HISAX_ELSA_CS=m
+CONFIG_HISAX_AVM_A1_CS=m
+CONFIG_HISAX_TELES_CS=m
+
+#
+# HiSax sub driver modules
+#
+CONFIG_HISAX_ST5481=m
+CONFIG_HISAX_HFCUSB=m
+CONFIG_HISAX_HFC4S8S=m
+CONFIG_HISAX_FRITZ_PCIPNP=m
+
+#
+# Active cards
+#
+CONFIG_ISDN_CAPI=m
+CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
+CONFIG_CAPI_TRACE=y
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
+CONFIG_ISDN_CAPI_CAPIFS=m
+CONFIG_ISDN_CAPI_CAPIDRV=m
+
+#
+# CAPI hardware drivers
+#
+CONFIG_CAPI_AVM=y
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
+CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_CAPI_EICON=y
+CONFIG_ISDN_DIVAS=m
+CONFIG_ISDN_DIVAS_BRIPCI=y
+CONFIG_ISDN_DIVAS_PRIPCI=y
+CONFIG_ISDN_DIVAS_DIVACAPI=m
+CONFIG_ISDN_DIVAS_USERIDI=m
+CONFIG_ISDN_DIVAS_MAINT=m
+CONFIG_ISDN_DRV_GIGASET=m
+# CONFIG_GIGASET_CAPI is not set
+CONFIG_GIGASET_I4L=y
+# CONFIG_GIGASET_DUMMYLL is not set
+CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M105=m
+# CONFIG_GIGASET_M101 is not set
+# CONFIG_GIGASET_DEBUG is not set
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
+CONFIG_MISDN=m
+CONFIG_MISDN_DSP=m
+CONFIG_MISDN_L1OIP=m
+
+#
+# mISDN hardware drivers
+#
+CONFIG_MISDN_HFCPCI=m
+CONFIG_MISDN_HFCMULTI=m
+CONFIG_MISDN_HFCUSB=m
+CONFIG_MISDN_AVMFRITZ=m
+CONFIG_MISDN_SPEEDFAX=m
+CONFIG_MISDN_INFINEON=m
+CONFIG_MISDN_W6692=m
+CONFIG_MISDN_NETJET=m
+CONFIG_MISDN_IPAC=m
+CONFIG_MISDN_ISAR=m
+CONFIG_ISDN_HDLC=m
+CONFIG_PHONE=m
+CONFIG_PHONE_IXJ=m
+CONFIG_PHONE_IXJ_PCMCIA=m
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_FF_MEMLESS=y
+CONFIG_INPUT_POLLDEV=m
+CONFIG_INPUT_SPARSEKMAP=m
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT2160=m
+# CONFIG_KEYBOARD_LKKBD is not set
+CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
+CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_MATRIX=m
+CONFIG_KEYBOARD_LM8323=m
+CONFIG_KEYBOARD_MAX7359=m
+CONFIG_KEYBOARD_MCS=m
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_KEYBOARD_OPENCORES=m
+CONFIG_KEYBOARD_STOWAWAY=m
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_ELANTECH is not set
+CONFIG_MOUSE_PS2_SENTELIC=y
+CONFIG_MOUSE_PS2_TOUCHKIT=y
+CONFIG_MOUSE_SERIAL=m
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_VSXXXAA=m
+CONFIG_MOUSE_GPIO=m
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_JOYSTICK_ANALOG=m
+CONFIG_JOYSTICK_A3D=m
+CONFIG_JOYSTICK_ADI=m
+CONFIG_JOYSTICK_COBRA=m
+CONFIG_JOYSTICK_GF2K=m
+CONFIG_JOYSTICK_GRIP=m
+CONFIG_JOYSTICK_GRIP_MP=m
+CONFIG_JOYSTICK_GUILLEMOT=m
+CONFIG_JOYSTICK_INTERACT=m
+CONFIG_JOYSTICK_SIDEWINDER=m
+CONFIG_JOYSTICK_TMDC=m
+CONFIG_JOYSTICK_IFORCE=m
+CONFIG_JOYSTICK_IFORCE_USB=y
+CONFIG_JOYSTICK_IFORCE_232=y
+CONFIG_JOYSTICK_WARRIOR=m
+CONFIG_JOYSTICK_MAGELLAN=m
+CONFIG_JOYSTICK_SPACEORB=m
+CONFIG_JOYSTICK_SPACEBALL=m
+CONFIG_JOYSTICK_STINGER=m
+CONFIG_JOYSTICK_TWIDJOY=m
+CONFIG_JOYSTICK_ZHENHUA=m
+CONFIG_JOYSTICK_DB9=m
+CONFIG_JOYSTICK_GAMECON=m
+CONFIG_JOYSTICK_TURBOGRAFX=m
+CONFIG_JOYSTICK_JOYDUMP=m
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+# CONFIG_JOYSTICK_WALKERA0701 is not set
+CONFIG_INPUT_TABLET=y
+CONFIG_TABLET_USB_ACECAD=m
+CONFIG_TABLET_USB_AIPTEK=m
+CONFIG_TABLET_USB_GTCO=m
+CONFIG_TABLET_USB_HANWANG=m
+CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_USB_WACOM=m
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+CONFIG_TOUCHSCREEN_BU21013=m
+CONFIG_TOUCHSCREEN_CY8CTMG110=m
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_GUNZE=m
+CONFIG_TOUCHSCREEN_ELO=m
+CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TOUCHSCREEN_MCS5000=m
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_MK712=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_QT602240=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_UCB1400=m
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
+CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
+CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
+CONFIG_TOUCHSCREEN_USB_GOTOP=y
+CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_E2I=y
+CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
+CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
+CONFIG_TOUCHSCREEN_USB_NEXIO=y
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC2007=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_APANEL=m
+CONFIG_INPUT_ATLAS_BTNS=m
+CONFIG_INPUT_ATI_REMOTE=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_WINBOND_CIR=m
+CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_PCF8574=m
+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
+CONFIG_INPUT_ADXL34X=m
+CONFIG_INPUT_ADXL34X_I2C=m
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_CT82C710=m
+CONFIG_SERIO_PARKBD=m
+CONFIG_SERIO_PCIPS2=m
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_RAW=m
+CONFIG_SERIO_ALTERA_PS2=m
+CONFIG_SERIO_PS2MULT=m
+CONFIG_GAMEPORT=m
+CONFIG_GAMEPORT_NS558=m
+CONFIG_GAMEPORT_L4=m
+CONFIG_GAMEPORT_EMU10K1=m
+CONFIG_GAMEPORT_FM801=m
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_DEVKMEM=y
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_COMPUTONE=m
+CONFIG_ROCKETPORT=m
+CONFIG_CYCLADES=m
+# CONFIG_CYZ_INTR is not set
+CONFIG_DIGIEPCA=m
+CONFIG_MOXA_INTELLIO=m
+CONFIG_MOXA_SMARTIO=m
+CONFIG_ISI=m
+CONFIG_SYNCLINK=m
+CONFIG_SYNCLINKMP=m
+CONFIG_SYNCLINK_GT=m
+CONFIG_N_HDLC=m
+CONFIG_N_GSM=m
+CONFIG_RISCOM8=m
+CONFIG_SPECIALIX=m
+CONFIG_STALDRV=y
+CONFIG_STALLION=m
+CONFIG_ISTALLION=m
+CONFIG_NOZOMI=m
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_PNP=y
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_DETECT_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_MFD_HSU=m
+CONFIG_SERIAL_UARTLITE=m
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_TIMBERDALE=m
+CONFIG_SERIAL_ALTERA_JTAGUART=m
+CONFIG_SERIAL_ALTERA_UART=m
+CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
+CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+CONFIG_UNIX98_PTYS=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=32
+CONFIG_PRINTER=m
+CONFIG_LP_CONSOLE=y
+CONFIG_PPDEV=m
+CONFIG_HVC_DRIVER=y
+CONFIG_VIRTIO_CONSOLE=m
+CONFIG_IPMI_HANDLER=m
+# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_INTEL=m
+CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_VIA=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_NVRAM=m
+CONFIG_R3964=m
+CONFIG_APPLICOM=m
+
+#
+# PCMCIA character devices
+#
+CONFIG_SYNCLINK_CS=m
+CONFIG_CARDMAN_4000=m
+CONFIG_CARDMAN_4040=m
+CONFIG_IPWIRELESS=m
+CONFIG_MWAVE=m
+CONFIG_RAW_DRIVER=m
+CONFIG_MAX_RAW_DEVS=256
+CONFIG_HPET=y
+CONFIG_HPET_MMAP=y
+CONFIG_HANGCHECK_TIMER=m
+CONFIG_TCG_TPM=m
+# CONFIG_TCG_TIS is not set
+# CONFIG_TCG_NSC is not set
+CONFIG_TCG_ATMEL=m
+# CONFIG_TCG_INFINEON is not set
+CONFIG_TELCLOCK=m
+CONFIG_DEVPORT=y
+CONFIG_RAMOOPS=m
+CONFIG_I2C=m
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_MUX=m
+
+#
+# Multiplexer I2C Chip support
+#
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD756_S4882=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NFORCE2_S4985=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+
+#
+# ACPI drivers
+#
+CONFIG_I2C_SCMI=m
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+CONFIG_I2C_GPIO=m
+CONFIG_I2C_INTEL_MID=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_XILINX=m
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_I2C_STUB=m
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_SPI is not set
+
+#
+# PPS support
+#
+CONFIG_PPS=m
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_KTIMER is not set
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_GPIOLIB=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_MAX730X=m
+
+#
+# Memory mapped GPIO expanders:
+#
+CONFIG_GPIO_BASIC_MMIO=m
+CONFIG_GPIO_IT8761E=m
+CONFIG_GPIO_SCH=m
+CONFIG_GPIO_VX855=m
+
+#
+# I2C GPIO expanders:
+#
+CONFIG_GPIO_MAX7300=m
+CONFIG_GPIO_MAX732X=m
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_ADP5588=m
+
+#
+# PCI GPIO expanders:
+#
+CONFIG_GPIO_CS5535=m
+# CONFIG_GPIO_LANGWELL is not set
+CONFIG_GPIO_PCH=m
+# CONFIG_GPIO_TIMBERDALE is not set
+CONFIG_GPIO_RDC321X=m
+
+#
+# SPI GPIO expanders:
+#
+
+#
+# AC97 GPIO expanders:
+#
+# CONFIG_GPIO_UCB1400 is not set
+
+#
+# MODULbus GPIO expanders:
+#
+CONFIG_GPIO_JANZ_TTL=m
+CONFIG_W1=m
+CONFIG_W1_CON=y
+
+#
+# 1-wire Bus Masters
+#
+CONFIG_W1_MASTER_MATROX=m
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_GPIO=m
+
+#
+# 1-wire Slaves
+#
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2431=m
+CONFIG_W1_SLAVE_DS2433=m
+CONFIG_W1_SLAVE_DS2433_CRC=y
+CONFIG_W1_SLAVE_DS2760=m
+CONFIG_W1_SLAVE_BQ27000=m
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_PDA_POWER=m
+CONFIG_TEST_POWER=m
+CONFIG_BATTERY_DS2760=m
+CONFIG_BATTERY_DS2782=m
+CONFIG_BATTERY_BQ20Z75=m
+CONFIG_BATTERY_BQ27x00=m
+CONFIG_BATTERY_MAX17040=m
+CONFIG_CHARGER_PCF50633=m
+CONFIG_CHARGER_ISP1704=m
+CONFIG_HWMON=m
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_ABITUGURU=m
+CONFIG_SENSORS_ABITUGURU3=m
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_K10TEMP=m
+CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_I5K_AMB=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_GPIO_FAN=m
+CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_PKGTEMP=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_LM63=m
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_SMM665=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_VIA_CPUTEMP=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+# CONFIG_SENSORS_W83795_FANCTRL is not set
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_LIS3_I2C=m
+CONFIG_SENSORS_APPLESMC=m
+
+#
+# ACPI drivers
+#
+CONFIG_SENSORS_ATK0110=m
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_THERMAL=m
+CONFIG_THERMAL_HWMON=y
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_ALIM1535_WDT=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_F71808E_WDT=m
+CONFIG_GEODE_WDT=m
+CONFIG_SC520_WDT=m
+CONFIG_SBC_FITPC2_WATCHDOG=m
+CONFIG_EUROTECH_WDT=m
+CONFIG_IB700_WDT=m
+CONFIG_IBMASR=m
+CONFIG_WAFER_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_ITCO_WDT=m
+CONFIG_ITCO_VENDOR_SUPPORT=y
+CONFIG_IT8712F_WDT=m
+CONFIG_IT87_WDT=m
+CONFIG_HP_WATCHDOG=m
+CONFIG_HPWDT_NMI_DECODING=y
+CONFIG_SC1200_WDT=m
+CONFIG_PC87413_WDT=m
+CONFIG_60XX_WDT=m
+CONFIG_SBC8360_WDT=m
+CONFIG_CPU5_WDT=m
+CONFIG_SMSC_SCH311X_WDT=m
+CONFIG_SMSC37B787_WDT=m
+CONFIG_W83627HF_WDT=m
+CONFIG_W83697HF_WDT=m
+CONFIG_W83697UG_WDT=m
+CONFIG_W83877F_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_MACHZ_WDT=m
+CONFIG_SBC_EPX_C3_WATCHDOG=m
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+CONFIG_SSB_PCMCIAHOST=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_MFD_SUPPORT=y
+CONFIG_MFD_CORE=m
+# CONFIG_MFD_SM501 is not set
+CONFIG_HTC_PASIC3=m
+CONFIG_UCB1400_CORE=m
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
+# CONFIG_MFD_TMIO is not set
+CONFIG_MFD_WM8400=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+# CONFIG_ABX500_CORE is not set
+CONFIG_MFD_TIMBERDALE=m
+CONFIG_LPC_SCH=m
+CONFIG_MFD_RDC321X=m
+CONFIG_MFD_JANZ_CMODIO=m
+CONFIG_MFD_VX855=m
+# CONFIG_REGULATOR is not set
+CONFIG_MEDIA_SUPPORT=m
+
+#
+# Multimedia core support
+#
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_VIDEO_ALLOW_V4L1=y
+CONFIG_VIDEO_V4L1_COMPAT=y
+CONFIG_DVB_CORE=m
+CONFIG_VIDEO_MEDIA=m
+
+#
+# Multimedia drivers
+#
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_IR_CORE=m
+CONFIG_VIDEO_IR=m
+CONFIG_LIRC=m
+CONFIG_RC_MAP=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_RC5_SZ_DECODER=m
+CONFIG_IR_LIRC_CODEC=m
+CONFIG_IR_ENE=m
+CONFIG_IR_IMON=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_NUVOTON=m
+CONFIG_IR_STREAMZAP=m
+CONFIG_MEDIA_ATTACH=y
+CONFIG_MEDIA_TUNER=m
+# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEO_V4L1=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEOBUF_DMA_CONTIG=m
+CONFIG_VIDEOBUF_DVB=m
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# Encoders/decoders and other helper chips
+#
+
+#
+# Audio decoders
+#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TDA9875=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_M52790=m
+CONFIG_VIDEO_TLV320AIC23B=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+
+#
+# Video decoders
+#
+CONFIG_VIDEO_ADV7180=m
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_BT866=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_MT9V011=m
+CONFIG_VIDEO_TCM825X=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_SAA7191=m
+CONFIG_VIDEO_TVP514X=m
+CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_TVP7002=m
+CONFIG_VIDEO_VPX3220=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_CX25840=m
+
+#
+# MPEG video encoders
+#
+CONFIG_VIDEO_CX2341X=m
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+CONFIG_VIDEO_THS7303=m
+CONFIG_VIDEO_ADV7343=m
+CONFIG_VIDEO_AK881X=m
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+CONFIG_VIDEO_VIVI=m
+CONFIG_VIDEO_BT848=m
+CONFIG_VIDEO_BT848_DVB=y
+CONFIG_VIDEO_BWQCAM=m
+CONFIG_VIDEO_CQCAM=m
+CONFIG_VIDEO_W9966=m
+CONFIG_VIDEO_CPIA2=m
+CONFIG_VIDEO_ZORAN=m
+CONFIG_VIDEO_ZORAN_DC30=m
+CONFIG_VIDEO_ZORAN_ZR36060=m
+CONFIG_VIDEO_ZORAN_BUZ=m
+CONFIG_VIDEO_ZORAN_DC10=m
+CONFIG_VIDEO_ZORAN_LML33=m
+CONFIG_VIDEO_ZORAN_LML33R10=m
+CONFIG_VIDEO_ZORAN_AVS6EYES=m
+CONFIG_VIDEO_MEYE=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_FB_IVTV=m
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_SAA7164=m
+CONFIG_VIDEO_CAFE_CCIC=m
+CONFIG_VIDEO_SR030PC30=m
+CONFIG_VIDEO_VIA_CAMERA=m
+CONFIG_SOC_CAMERA=m
+CONFIG_SOC_CAMERA_IMX074=m
+CONFIG_SOC_CAMERA_MT9M001=m
+CONFIG_SOC_CAMERA_MT9M111=m
+CONFIG_SOC_CAMERA_MT9T031=m
+CONFIG_SOC_CAMERA_MT9T112=m
+CONFIG_SOC_CAMERA_MT9V022=m
+CONFIG_SOC_CAMERA_RJ54N1=m
+CONFIG_SOC_CAMERA_TW9910=m
+CONFIG_SOC_CAMERA_PLATFORM=m
+CONFIG_SOC_CAMERA_OV6650=m
+CONFIG_SOC_CAMERA_OV772X=m
+CONFIG_SOC_CAMERA_OV9640=m
+CONFIG_V4L_USB_DRIVERS=y
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_KONICA=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_TLG2300=m
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_VIDEO_USBVIDEO=m
+CONFIG_USB_VICAM=m
+CONFIG_USB_IBMCAM=m
+CONFIG_USB_KONICAWC=m
+CONFIG_USB_ET61X251=m
+CONFIG_USB_SE401=m
+CONFIG_USB_SN9C102=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_MEM2MEM_TESTDEV=m
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_GEMTEK_PCI=m
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_MAESTRO=m
+CONFIG_I2C_SI4713=m
+CONFIG_RADIO_SI4713=m
+CONFIG_USB_DSBR=m
+# CONFIG_RADIO_SI470X is not set
+CONFIG_USB_MR800=m
+CONFIG_RADIO_TEA5764=m
+CONFIG_RADIO_SAA7706H=m
+CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_TIMBERDALE=m
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
+CONFIG_DVB_CAPTURE_DRIVERS=y
+
+#
+# Supported SAA7146 based PCI Adapters
+#
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_BUDGET_PATCH=m
+
+#
+# Supported USB Adapters
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_FRIIO=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_SMS_SIANO_MDTV=m
+
+#
+# Siano module components
+#
+CONFIG_SMS_USB_DRV=m
+CONFIG_SMS_SDIO_DRV=m
+
+#
+# Supported FlexCopII (B2C2) Adapters
+#
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
+
+#
+# Supported BT878 Adapters
+#
+CONFIG_DVB_BT8XX=m
+
+#
+# Supported Pluto2 Adapters
+#
+CONFIG_DVB_PLUTO2=m
+
+#
+# Supported SDMC DM1105 Adapters
+#
+CONFIG_DVB_DM1105=m
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_FIREWIRE=y
+# CONFIG_DVB_FIREDTV_IEEE1394 is not set
+CONFIG_DVB_FIREDTV_INPUT=y
+
+#
+# Supported Earthsoft PT1 Adapters
+#
+CONFIG_DVB_PT1=m
+
+#
+# Supported Mantis Adapters
+#
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+
+#
+# Supported nGene Adapters
+#
+CONFIG_DVB_NGENE=m
+
+#
+# Supported DVB Frontends
+#
+CONFIG_DVB_FE_CUSTOMISE=y
+
+#
+# Customise DVB Frontends
+#
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV6110x=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_SP8870=m
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_S5H1432=m
+CONFIG_DVB_DRX397XD=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_S5H1411=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_S921=m
+CONFIG_DVB_DIB8000=m
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
+
+#
+# Tools to develop new frontends
+#
+CONFIG_DVB_DUMMY_FE=m
+CONFIG_DAB=y
+CONFIG_USB_DABUSB=m
+
+#
+# Graphics support
+#
+CONFIG_AGP=m
+CONFIG_AGP_AMD64=m
+CONFIG_AGP_INTEL=m
+CONFIG_AGP_SIS=m
+CONFIG_AGP_VIA=m
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_VGA_SWITCHEROO=y
+CONFIG_DRM=m
+CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_TTM=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_RADEON=m
+CONFIG_DRM_RADEON_KMS=y
+CONFIG_DRM_I810=m
+CONFIG_DRM_I830=m
+CONFIG_DRM_I915=m
+CONFIG_DRM_I915_KMS=y
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
+CONFIG_STUB_POULSBO=m
+CONFIG_VGASTATE=m
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_DDC=m
+CONFIG_FB_BOOT_VESA_SUPPORT=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=m
+CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_HECUBA=m
+CONFIG_FB_SVGALIB=m
+# CONFIG_FB_MACMODES is not set
+CONFIG_FB_BACKLIGHT=y
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+CONFIG_FB_CIRRUS=m
+CONFIG_FB_PM2=m
+# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
+CONFIG_FB_CYBER2000=m
+CONFIG_FB_ARC=m
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+CONFIG_FB_VGA16=m
+# CONFIG_FB_UVESA is not set
+CONFIG_FB_VESA=y
+# CONFIG_FB_EFI is not set
+CONFIG_FB_N411=m
+CONFIG_FB_HGA=m
+# CONFIG_FB_HGA_ACCEL is not set
+CONFIG_FB_S1D13XXX=m
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_NVIDIA_DEBUG is not set
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA=m
+CONFIG_FB_RIVA_I2C=y
+# CONFIG_FB_RIVA_DEBUG is not set
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_LE80578=m
+CONFIG_FB_CARILLO_RANCH=m
+CONFIG_FB_MATROX=m
+CONFIG_FB_MATROX_MILLENIUM=y
+CONFIG_FB_MATROX_MYSTIQUE=y
+CONFIG_FB_MATROX_G=y
+CONFIG_FB_MATROX_I2C=m
+CONFIG_FB_MATROX_MAVEN=m
+CONFIG_FB_RADEON=m
+CONFIG_FB_RADEON_I2C=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+# CONFIG_FB_RADEON_DEBUG is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_BACKLIGHT=y
+CONFIG_FB_S3=m
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
+CONFIG_FB_SIS=m
+CONFIG_FB_SIS_300=y
+CONFIG_FB_SIS_315=y
+CONFIG_FB_VIA=m
+# CONFIG_FB_VIA_DIRECT_PROCFS is not set
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_KYRO=m
+CONFIG_FB_3DFX=m
+# CONFIG_FB_3DFX_ACCEL is not set
+CONFIG_FB_3DFX_I2C=y
+CONFIG_FB_VOODOO1=m
+CONFIG_FB_VT8623=m
+CONFIG_FB_TRIDENT=m
+CONFIG_FB_ARK=m
+CONFIG_FB_PM3=m
+CONFIG_FB_CARMINE=m
+CONFIG_FB_CARMINE_DRAM_EVAL=y
+# CONFIG_CARMINE_DRAM_CUSTOM is not set
+CONFIG_FB_GEODE=y
+CONFIG_FB_GEODE_LX=m
+CONFIG_FB_GEODE_GX=m
+CONFIG_FB_GEODE_GX1=m
+CONFIG_FB_TMIO=m
+CONFIG_FB_TMIO_ACCELL=y
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_METRONOME=m
+CONFIG_FB_MB862XX=m
+CONFIG_FB_MB862XX_PCI_GDC=y
+CONFIG_FB_BROADSHEET=m
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_PLATFORM=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_GENERIC=m
+CONFIG_BACKLIGHT_PROGEAR=m
+CONFIG_BACKLIGHT_CARILLO_RANCH=m
+CONFIG_BACKLIGHT_MBP_NVIDIA=m
+CONFIG_BACKLIGHT_SAHARA=m
+CONFIG_BACKLIGHT_ADP8860=m
+CONFIG_BACKLIGHT_PCF50633=m
+
+#
+# Display device support
+#
+CONFIG_DISPLAY_SUPPORT=m
+
+#
+# Display hardware drivers
+#
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+CONFIG_VGACON_SOFT_SCROLLBACK=y
+CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+CONFIG_LOGO_LINUX_CLUT224=y
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_JACK=y
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_SEQUENCER_OSS=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_DYNAMIC_MINORS=y
+# CONFIG_SND_SUPPORT_OLD_API is not set
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_DMA_SGBUF=y
+CONFIG_SND_RAWMIDI_SEQ=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_VX_LIB=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_PCSP is not set
+CONFIG_SND_DUMMY=m
+CONFIG_SND_ALOOP=m
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+CONFIG_SND_SB_COMMON=m
+CONFIG_SND_SB16_DSP=m
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ALI5451=m
+CONFIG_SND_ASIHPI=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
+CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_CS5530=m
+CONFIG_SND_CS5535AUDIO=m
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_ES1968_INPUT=y
+CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
+CONFIG_SND_FM801_TEA575X=m
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+# CONFIG_SND_HDA_INPUT_BEEP is not set
+CONFIG_SND_HDA_INPUT_JACK=y
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_CODEC_REALTEK=y
+CONFIG_SND_HDA_CODEC_ANALOG=y
+CONFIG_SND_HDA_CODEC_SIGMATEL=y
+CONFIG_SND_HDA_CODEC_VIA=y
+CONFIG_SND_HDA_CODEC_HDMI=y
+CONFIG_SND_HDA_CODEC_CIRRUS=y
+CONFIG_SND_HDA_CODEC_CONEXANT=y
+CONFIG_SND_HDA_CODEC_CA0110=y
+CONFIG_SND_HDA_CODEC_CMEDIA=y
+CONFIG_SND_HDA_CODEC_SI3054=y
+CONFIG_SND_HDA_GENERIC=y
+# CONFIG_SND_HDA_POWER_SAVE is not set
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_HIFIER=m
+CONFIG_SND_ICE1712=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_LX6464ES=m
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MAESTRO3_INPUT=y
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
+CONFIG_SND_USB_US122L=m
+CONFIG_SND_PCMCIA=y
+CONFIG_SND_VXPOCKET=m
+CONFIG_SND_PDAUDIOCF=m
+# CONFIG_SND_SOC is not set
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=m
+CONFIG_HIDRAW=y
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# Special HID drivers
+#
+CONFIG_HID_3M_PCT=m
+CONFIG_HID_A4TECH=m
+CONFIG_HID_ACRUX_FF=m
+CONFIG_HID_APPLE=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_CANDO=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EGALAX=m
+CONFIG_HID_ELECOM=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LOGITECH=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_LOGIWII_FF=y
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MOSART=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_QUANTA=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_ROCCAT_KONE=m
+CONFIG_HID_ROCCAT_PYRA=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SONY=m
+CONFIG_HID_STANTUM=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_GREENASIA=m
+CONFIG_GREENASIA_FF=y
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_WACOM=m
+CONFIG_HID_WACOM_POWER_SUPPLY=y
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
+CONFIG_HID_ZYDACRON=m
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+CONFIG_USB_SUSPEND=y
+# CONFIG_USB_OTG is not set
+CONFIG_USB_MON=y
+CONFIG_USB_WUSB=m
+CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_C67X00_HCD=y
+CONFIG_USB_XHCI_HCD=y
+# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_OXU210HP_HCD=y
+CONFIG_USB_ISP116X_HCD=y
+CONFIG_USB_ISP1760_HCD=y
+CONFIG_USB_ISP1362_HCD=y
+CONFIG_USB_OHCI_HCD=y
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_UHCI_HCD=y
+CONFIG_USB_U132_HCD=m
+CONFIG_USB_SL811_HCD=y
+CONFIG_USB_SL811_CS=m
+CONFIG_USB_R8A66597_HCD=y
+CONFIG_USB_WHCI_HCD=m
+CONFIG_USB_HWA_HCD=m
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_DATAFAB=y
+CONFIG_USB_STORAGE_FREECOM=y
+CONFIG_USB_STORAGE_ISD200=y
+CONFIG_USB_STORAGE_USBAT=y
+CONFIG_USB_STORAGE_SDDR09=y
+CONFIG_USB_STORAGE_SDDR55=y
+CONFIG_USB_STORAGE_JUMPSHOT=y
+CONFIG_USB_STORAGE_ALAUDA=y
+CONFIG_USB_STORAGE_ONETOUCH=y
+CONFIG_USB_STORAGE_KARMA=y
+CONFIG_USB_STORAGE_CYPRESS_ATACB=y
+CONFIG_USB_UAS=m
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+
+#
+# USB port drivers
+#
+CONFIG_USB_USS720=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_EZUSB=y
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_FUNSOFT=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MOTOROLA=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_HP4X=m
+CONFIG_USB_SERIAL_SAFE=m
+CONFIG_USB_SERIAL_SAFE_PADDED=y
+CONFIG_USB_SERIAL_SAMBA=m
+CONFIG_USB_SERIAL_SIEMENS_MPI=m
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
+CONFIG_USB_SERIAL_ZIO=m
+CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_DEBUG=m
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_RIO500=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_LED=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_FTDI_ELAN=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_SISUSBVGA_CON=y
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_YUREX=m
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+# CONFIG_USB_GADGET is not set
+
+#
+# OTG and related infrastructure
+#
+CONFIG_USB_OTG_UTILS=y
+CONFIG_USB_GPIO_VBUS=m
+CONFIG_NOP_USB_XCEIV=m
+CONFIG_UWB=m
+CONFIG_UWB_HWA=m
+CONFIG_UWB_WHCI=m
+CONFIG_UWB_I1480U=m
+CONFIG_MMC=m
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+
+#
+# MMC/SD/SDIO Card Drivers
+#
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_MINORS=8
+CONFIG_MMC_BLOCK_BOUNCE=y
+CONFIG_SDIO_UART=m
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_WBSD=m
+CONFIG_MMC_TIFM_SD=m
+CONFIG_MMC_SDRICOH_CS=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_USHC=m
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+CONFIG_LEDS_NET5501=m
+CONFIG_LEDS_ALIX2=m
+CONFIG_LEDS_PCA9532=m
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GPIO_PLATFORM=y
+CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP5521=m
+CONFIG_LEDS_LP5523=m
+CONFIG_LEDS_CLEVO_MAIL=m
+CONFIG_LEDS_PCA955X=m
+CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_INTEL_SS4200=m
+CONFIG_LEDS_LT3593=m
+CONFIG_LEDS_DELL_NETBOOKS=m
+CONFIG_LEDS_TRIGGERS=y
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+CONFIG_ACCESSIBILITY=y
+CONFIG_A11Y_BRAILLE_CONSOLE=y
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_USER_MEM=y
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_MTHCA=m
+CONFIG_INFINIBAND_MTHCA_DEBUG=y
+# CONFIG_INFINIBAND_IPATH is not set
+CONFIG_INFINIBAND_QIB=m
+CONFIG_INFINIBAND_AMSO1100=m
+# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
+# CONFIG_INFINIBAND_CXGB3 is not set
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_INFINIBAND_NES=m
+# CONFIG_INFINIBAND_NES_DEBUG is not set
+CONFIG_INFINIBAND_IPOIB=m
+# CONFIG_INFINIBAND_IPOIB_CM is not set
+CONFIG_INFINIBAND_IPOIB_DEBUG=y
+# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_EDAC=y
+
+#
+# Reporting subsystems
+#
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_DECODE_MCE=y
+CONFIG_EDAC_MCE_INJ=m
+# CONFIG_EDAC_MM_EDAC is not set
+CONFIG_RTC_LIB=m
+CONFIG_RTC_CLASS=m
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+CONFIG_RTC_DRV_TEST=m
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_ISL12022=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_PCF50633=m
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_INTEL_MID_DMAC=m
+CONFIG_INTEL_IOATDMA=m
+CONFIG_TIMB_DMA=m
+CONFIG_PCH_DMA=m
+CONFIG_DMA_ENGINE=y
+
+#
+# DMA Clients
+#
+CONFIG_NET_DMA=y
+# CONFIG_ASYNC_TX_DMA is not set
+CONFIG_DMATEST=m
+CONFIG_DCA=m
+CONFIG_AUXDISPLAY=y
+# CONFIG_KS0108 is not set
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_PDRV=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+CONFIG_STAGING=y
+# CONFIG_STAGING_EXCLUDE_BUILD is not set
+# CONFIG_ET131X is not set
+# CONFIG_SLICOSS is not set
+# CONFIG_VIDEO_GO7007 is not set
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=m
+CONFIG_VIDEO_CPIA=m
+CONFIG_VIDEO_CPIA_PP=m
+CONFIG_VIDEO_CPIA_USB=m
+CONFIG_VIDEO_STRADIS=m
+# CONFIG_USB_IP_COMMON is not set
+# CONFIG_W35UND is not set
+# CONFIG_PRISM2_USB is not set
+# CONFIG_ECHO is not set
+CONFIG_BRCM80211=m
+CONFIG_BRCM80211_PCI=y
+# CONFIG_BRCMFMAC is not set
+CONFIG_RT2860=m
+CONFIG_RT2870=m
+# CONFIG_COMEDI is not set
+# CONFIG_ASUS_OLED is not set
+# CONFIG_PANEL is not set
+CONFIG_R8187SE=m
+CONFIG_RTL8192U=m
+CONFIG_RTL8192E=m
+CONFIG_R8712U=m
+# CONFIG_R8712_AP is not set
+# CONFIG_TRANZPORT is not set
+CONFIG_POHMELFS=m
+# CONFIG_POHMELFS_DEBUG is not set
+CONFIG_POHMELFS_CRYPTO=y
+CONFIG_AUTOFS_FS=m
+CONFIG_IDE_PHISON=m
+CONFIG_LINE6_USB=m
+# CONFIG_LINE6_USB_DEBUG is not set
+# CONFIG_LINE6_USB_DUMP_CTRL is not set
+# CONFIG_LINE6_USB_DUMP_MIDI is not set
+# CONFIG_LINE6_USB_DUMP_PCM is not set
+# CONFIG_LINE6_USB_RAW is not set
+# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
+CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_NOUVEAU=m
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+CONFIG_DRM_NOUVEAU_DEBUG=y
+
+#
+# I2C encoder or helper chips
+#
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+CONFIG_USB_SERIAL_QUATECH2=m
+CONFIG_USB_SERIAL_QUATECH_USB2=m
+CONFIG_VT6655=m
+CONFIG_VT6656=m
+CONFIG_FB_UDL=m
+# CONFIG_HYPERV is not set
+# CONFIG_VME_BUS is not set
+# CONFIG_IIO is not set
+CONFIG_ZRAM=m
+CONFIG_WLAGS49_H2=m
+CONFIG_WLAGS49_H25=m
+CONFIG_BATMAN_ADV=m
+# CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_SAMSUNG_LAPTOP=m
+CONFIG_FB_SM7XX=m
+CONFIG_VIDEO_DT3155=m
+CONFIG_DT3155_CCIR=y
+CONFIG_CRYSTALHD=m
+# CONFIG_CXT1E1 is not set
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_ST_BT=m
+CONFIG_FB_XGI=m
+CONFIG_LIRC_STAGING=y
+CONFIG_LIRC_BT829=m
+CONFIG_LIRC_I2C=m
+CONFIG_LIRC_IGORPLUGUSB=m
+CONFIG_LIRC_IMON=m
+CONFIG_LIRC_IT87=m
+CONFIG_LIRC_ITE8709=m
+CONFIG_LIRC_PARALLEL=m
+CONFIG_LIRC_SASEM=m
+CONFIG_LIRC_SERIAL=m
+CONFIG_LIRC_SERIAL_TRANSMITTER=y
+CONFIG_LIRC_SIR=m
+CONFIG_LIRC_TTUSBIR=m
+CONFIG_LIRC_ZILOG=m
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
+CONFIG_EASYCAP=m
+CONFIG_SOLO6X10=m
+CONFIG_ACPI_QUICKSTART=m
+CONFIG_MACH_NO_WESTBRIDGE=y
+CONFIG_SBE_2T3E3=m
+CONFIG_ATH6K_LEGACY=m
+CONFIG_AR600x_SD31_XXX=y
+# CONFIG_AR600x_WB31_XXX is not set
+# CONFIG_AR600x_SD32_XXX is not set
+# CONFIG_AR600x_CUSTOM_XXX is not set
+# CONFIG_ATH6KL_ENABLE_COEXISTENCE is not set
+# CONFIG_ATH6KL_HCI_BRIDGE is not set
+# CONFIG_ATH6KL_CFG80211 is not set
+# CONFIG_ATH6KL_HTC_RAW_INTERFACE is not set
+# CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER is not set
+# CONFIG_ATH6KL_SKIP_ABI_VERSION_CHECK is not set
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_USB_ENESTORAGE is not set
+# CONFIG_BCM_WIMAX is not set
+# CONFIG_FT1000 is not set
+
+#
+# Speakup console speech
+#
+CONFIG_SPEAKUP=y
+CONFIG_SPEAKUP_SYNTH_ACNTSA=y
+CONFIG_SPEAKUP_SYNTH_ACNTPC=y
+CONFIG_SPEAKUP_SYNTH_APOLLO=y
+CONFIG_SPEAKUP_SYNTH_AUDPTR=y
+CONFIG_SPEAKUP_SYNTH_BNS=y
+CONFIG_SPEAKUP_SYNTH_DECTLK=y
+CONFIG_SPEAKUP_SYNTH_DECEXT=y
+CONFIG_SPEAKUP_SYNTH_DECPC=m
+CONFIG_SPEAKUP_SYNTH_DTLK=y
+CONFIG_SPEAKUP_SYNTH_KEYPC=y
+CONFIG_SPEAKUP_SYNTH_LTLK=y
+CONFIG_SPEAKUP_SYNTH_SOFT=y
+CONFIG_SPEAKUP_SYNTH_SPKOUT=y
+CONFIG_SPEAKUP_SYNTH_TXPRT=y
+CONFIG_SPEAKUP_SYNTH_DUMMY=y
+CONFIG_X86_PLATFORM_DEVICES=y
+CONFIG_ACER_WMI=m
+CONFIG_ACERHDF=m
+CONFIG_ASUS_LAPTOP=m
+CONFIG_DELL_LAPTOP=m
+CONFIG_DELL_WMI=m
+CONFIG_FUJITSU_LAPTOP=m
+# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
+CONFIG_HP_WMI=m
+CONFIG_MSI_LAPTOP=m
+CONFIG_PANASONIC_LAPTOP=m
+CONFIG_COMPAL_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
+CONFIG_SONYPI_COMPAT=y
+CONFIG_IDEAPAD_LAPTOP=m
+CONFIG_THINKPAD_ACPI=m
+CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
+# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
+# CONFIG_THINKPAD_ACPI_DEBUG is not set
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
+CONFIG_THINKPAD_ACPI_VIDEO=y
+CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+CONFIG_SENSORS_HDAPS=m
+CONFIG_INTEL_MENLOW=m
+CONFIG_EEEPC_LAPTOP=m
+CONFIG_EEEPC_WMI=m
+CONFIG_ACPI_WMI=m
+CONFIG_MSI_WMI=m
+CONFIG_ACPI_ASUS=m
+CONFIG_TOPSTAR_LAPTOP=m
+CONFIG_ACPI_TOSHIBA=m
+CONFIG_TOSHIBA_BT_RFKILL=m
+CONFIG_ACPI_CMPC=m
+CONFIG_INTEL_IPS=m
+# CONFIG_IBM_RTL is not set
+
+#
+# Firmware Drivers
+#
+CONFIG_EDD=m
+CONFIG_EDD_OFF=y
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_EFI_VARS=m
+CONFIG_DELL_RBU=m
+CONFIG_DCDBAS=m
+CONFIG_DMIID=y
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
+CONFIG_EXT3_FS_XATTR=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_FS_XATTR=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_JBD2=y
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+CONFIG_REISERFS_FS=y
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=y
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_FS_POSIX_ACL=y
+CONFIG_XFS_FS=y
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=y
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=y
+CONFIG_OCFS2_FS_O2CB=y
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=y
+# CONFIG_OCFS2_FS_STATS is not set
+CONFIG_OCFS2_DEBUG_MASKLOG=y
+# CONFIG_OCFS2_DEBUG_FS is not set
+CONFIG_BTRFS_FS=y
+CONFIG_BTRFS_FS_POSIX_ACL=y
+CONFIG_NILFS2_FS=m
+CONFIG_EXPORTFS=y
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=y
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=y
+CONFIG_QUOTACTL=y
+CONFIG_QUOTACTL_COMPAT=y
+CONFIG_AUTOFS4_FS=m
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_GENERIC_ACL=y
+
+#
+# Caches
+#
+CONFIG_FSCACHE=m
+# CONFIG_FSCACHE_STATS is not set
+# CONFIG_FSCACHE_HISTOGRAM is not set
+# CONFIG_FSCACHE_DEBUG is not set
+# CONFIG_FSCACHE_OBJECT_LIST is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_HISTOGRAM is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=y
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=y
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=y
+# CONFIG_NTFS_DEBUG is not set
+CONFIG_NTFS_RW=y
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_CONFIGFS_FS=y
+CONFIG_MISC_FILESYSTEMS=y
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+CONFIG_AFFS_FS=m
+# CONFIG_ECRYPT_FS is not set
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+CONFIG_BFS_FS=m
+CONFIG_EFS_FS=m
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_UBIFS_FS=m
+CONFIG_UBIFS_FS_XATTR=y
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+# CONFIG_UBIFS_FS_DEBUG is not set
+CONFIG_LOGFS=m
+CONFIG_CRAMFS=m
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_EMBEDDED=y
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+CONFIG_VXFS_FS=m
+CONFIG_MINIX_FS=m
+CONFIG_OMFS_FS=m
+CONFIG_HPFS_FS=m
+CONFIG_QNX4FS_FS=m
+CONFIG_ROMFS_FS=y
+CONFIG_ROMFS_BACKED_BY_BLOCK=y
+CONFIG_ROMFS_ON_BLOCK=y
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+CONFIG_EXOFS_FS=m
+# CONFIG_EXOFS_DEBUG is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V4=y
+# CONFIG_NFS_V4_1 is not set
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+# CONFIG_NFS_USE_NEW_IDMAPPER is not set
+CONFIG_NFSD=y
+CONFIG_NFSD_DEPRECATED=y
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+CONFIG_NFSD_V4=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+CONFIG_SUNRPC_XPRT_RDMA=m
+CONFIG_RPCSEC_GSS_KRB5=y
+CONFIG_CEPH_FS=m
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+CONFIG_CIFS_WEAK_PW_HASH=y
+# CONFIG_CIFS_UPCALL is not set
+# CONFIG_CIFS_XATTR is not set
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_DFS_UPCALL is not set
+CONFIG_CIFS_FSCACHE=y
+# CONFIG_CIFS_EXPERIMENTAL is not set
+CONFIG_NCP_FS=m
+CONFIG_NCPFS_PACKET_SIGNING=y
+CONFIG_NCPFS_IOCTL_LOCKING=y
+CONFIG_NCPFS_STRONG=y
+CONFIG_NCPFS_NFS_NS=y
+CONFIG_NCPFS_OS2_NS=y
+CONFIG_NCPFS_SMALLDOS=y
+CONFIG_NCPFS_NLS=y
+CONFIG_NCPFS_EXTRAS=y
+CONFIG_CODA_FS=m
+CONFIG_AFS_FS=m
+# CONFIG_AFS_DEBUG is not set
+# CONFIG_AFS_FSCACHE is not set
+CONFIG_9P_FS=m
+# CONFIG_9P_FSCACHE is not set
+# CONFIG_9P_FS_POSIX_ACL is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+CONFIG_OSF_PARTITION=y
+CONFIG_AMIGA_PARTITION=y
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_UNIXWARE_DISKLABEL=y
+# CONFIG_LDM_PARTITION is not set
+CONFIG_SGI_PARTITION=y
+# CONFIG_ULTRIX_PARTITION is not set
+CONFIG_SUN_PARTITION=y
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_UTF8=y
+CONFIG_DLM=y
+# CONFIG_DLM_DEBUG is not set
+
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_PRINTK_TIME=y
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=0
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_STRIP_ASM_SYMS=y
+CONFIG_UNUSED_SYMBOLS=y
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+# CONFIG_LOCKUP_DETECTOR is not set
+# CONFIG_HARDLOCKUP_DETECTOR is not set
+CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+CONFIG_TIMER_STATS=y
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+CONFIG_BKL=y
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+CONFIG_STACKTRACE=y
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# CONFIG_LKDTM is not set
+CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_LATENCYTOP is not set
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FTRACE_NMI_ENTER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
+CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_RING_BUFFER=y
+CONFIG_FTRACE_NMI_ENTER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_FTRACE_SYSCALLS is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+# CONFIG_STACK_TRACER is not set
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_DYNAMIC_FTRACE=y
+# CONFIG_FUNCTION_PROFILER is not set
+CONFIG_FTRACE_MCOUNT_RECORD=y
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_MMIOTRACE is not set
+CONFIG_RING_BUFFER_BENCHMARK=m
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_DMA_API_DEBUG is not set
+CONFIG_ATOMIC64_SELFTEST=y
+CONFIG_ASYNC_RAID6_TEST=m
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+CONFIG_HAVE_ARCH_KMEMCHECK=y
+CONFIG_STRICT_DEVMEM=y
+CONFIG_X86_VERBOSE_BOOTUP=y
+CONFIG_EARLY_PRINTK=y
+# CONFIG_EARLY_PRINTK_DBGP is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_X86_PTDUMP is not set
+CONFIG_DEBUG_RODATA=y
+CONFIG_DEBUG_RODATA_TEST=y
+# CONFIG_DEBUG_NX_TEST is not set
+# CONFIG_IOMMU_DEBUG is not set
+# CONFIG_IOMMU_STRESS is not set
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+CONFIG_IO_DELAY_TYPE_0X80=0
+CONFIG_IO_DELAY_TYPE_0XED=1
+CONFIG_IO_DELAY_TYPE_UDELAY=2
+CONFIG_IO_DELAY_TYPE_NONE=3
+CONFIG_IO_DELAY_0X80=y
+# CONFIG_IO_DELAY_0XED is not set
+# CONFIG_IO_DELAY_UDELAY is not set
+# CONFIG_IO_DELAY_NONE is not set
+CONFIG_DEFAULT_IO_DELAY_TYPE=0
+# CONFIG_DEBUG_BOOT_PARAMS is not set
+# CONFIG_CPA_DEBUG is not set
+CONFIG_OPTIMIZE_INLINING=y
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
+CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_NETWORK_XFRM=y
+# CONFIG_SECURITY_PATH is not set
+# CONFIG_SECURITY_SELINUX is not set
+# CONFIG_SECURITY_TOMOYO is not set
+# CONFIG_SECURITY_APPARMOR is not set
+# CONFIG_IMA is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_XOR_BLOCKS=y
+CONFIG_ASYNC_CORE=y
+CONFIG_ASYNC_MEMCPY=y
+CONFIG_ASYNC_XOR=y
+CONFIG_ASYNC_PQ=y
+CONFIG_ASYNC_RAID6_RECOV=y
+CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
+CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=m
+CONFIG_CRYPTO_PCOMP2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_WORKQUEUE=y
+CONFIG_CRYPTO_CRYPTD=y
+CONFIG_CRYPTO_AUTHENC=y
+CONFIG_CRYPTO_TEST=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_SEQIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_LRW=y
+CONFIG_CRYPTO_PCBC=y
+CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_FPU=y
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=y
+CONFIG_CRYPTO_VMAC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_MD4=y
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=y
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_TGR192=y
+CONFIG_CRYPTO_WP512=y
+CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_X86_64=y
+CONFIG_CRYPTO_AES_NI_INTEL=y
+CONFIG_CRYPTO_ANUBIS=y
+CONFIG_CRYPTO_ARC4=y
+CONFIG_CRYPTO_BLOWFISH=y
+CONFIG_CRYPTO_CAMELLIA=y
+CONFIG_CRYPTO_CAST5=y
+CONFIG_CRYPTO_CAST6=y
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_FCRYPT=y
+CONFIG_CRYPTO_KHAZAD=y
+CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_SALSA20_X86_64=m
+CONFIG_CRYPTO_SEED=y
+CONFIG_CRYPTO_SERPENT=y
+CONFIG_CRYPTO_TEA=y
+CONFIG_CRYPTO_TWOFISH=y
+CONFIG_CRYPTO_TWOFISH_COMMON=y
+CONFIG_CRYPTO_TWOFISH_X86_64=y
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_ZLIB=m
+CONFIG_CRYPTO_LZO=m
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_CRYPTO_DEV_HIFN_795X=m
+CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+CONFIG_HAVE_KVM=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_APIC_ARCHITECTURE=y
+CONFIG_KVM_MMIO=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
+CONFIG_KVM_MMU_AUDIT=y
+CONFIG_VHOST_NET=m
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_RING=m
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=y
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=m
+CONFIG_CRC_ITU_T=y
+CONFIG_CRC32=y
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=y
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_BTREE=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_CHECK_SIGNATURE=y
+CONFIG_NLATTR=y
+CONFIG_LRU_CACHE=m
diff --git a/source/k/config-speakup-2.6.33.4 b/source/k/config-speakup-2.6.33.4
deleted file mode 100644
index b241c4df..00000000
--- a/source/k/config-speakup-2.6.33.4
+++ /dev/null
@@ -1,4718 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.33.4
-# Wed May 12 23:14:51 2010
-#
-CONFIG_64BIT=y
-# CONFIG_X86_32 is not set
-CONFIG_X86_64=y
-CONFIG_X86=y
-CONFIG_OUTPUT_FORMAT="elf64-x86-64"
-CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
-CONFIG_GENERIC_TIME=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_MMU=y
-CONFIG_ZONE_DMA=y
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_IOMAP=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_ARCH_HAS_CPU_RELAX=y
-CONFIG_ARCH_HAS_DEFAULT_IDLE=y
-CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
-CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ZONE_DMA32=y
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-CONFIG_AUDIT_ARCH=y
-CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_USE_GENERIC_SMP_HELPERS=y
-CONFIG_X86_64_SMP=y
-CONFIG_X86_HT=y
-CONFIG_X86_TRAMPOLINE=y
-# CONFIG_KTIME_SCALAR is not set
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_CONSTRUCTORS=y
-
-#
-# General setup
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_LOCK_KERNEL=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_BZIP2=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_LZO=y
-# CONFIG_KERNEL_GZIP is not set
-# CONFIG_KERNEL_BZIP2 is not set
-CONFIG_KERNEL_LZMA=y
-# CONFIG_KERNEL_LZO is not set
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_AUDIT=y
-CONFIG_AUDITSYSCALL=y
-CONFIG_AUDIT_TREE=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU=y
-# CONFIG_TREE_PREEMPT_RCU is not set
-# CONFIG_TINY_RCU is not set
-# CONFIG_RCU_TRACE is not set
-CONFIG_RCU_FANOUT=32
-# CONFIG_RCU_FANOUT_EXACT is not set
-# CONFIG_TREE_RCU_TRACE is not set
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=15
-CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-# CONFIG_GROUP_SCHED is not set
-# CONFIG_CGROUPS is not set
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
-CONFIG_RELAY=y
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-# CONFIG_USER_NS is not set
-# CONFIG_PID_NS is not set
-CONFIG_NET_NS=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_RD_GZIP=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_LZO=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
-# CONFIG_EMBEDDED is not set
-CONFIG_UID16=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_PCSPKR_PLATFORM=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_HAVE_PERF_EVENTS=y
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_PERF_EVENTS=y
-CONFIG_EVENT_PROFILE=y
-# CONFIG_PERF_COUNTERS is not set
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_PCI_QUIRKS=y
-CONFIG_SLUB_DEBUG=y
-CONFIG_COMPAT_BRK=y
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-# CONFIG_SLOB is not set
-CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y
-CONFIG_OPROFILE=m
-# CONFIG_OPROFILE_IBS is not set
-# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
-CONFIG_HAVE_OPROFILE=y
-# CONFIG_KPROBES is not set
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_USER_RETURN_NOTIFIER=y
-CONFIG_HAVE_IOREMAP_PROT=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_ATTRS=y
-CONFIG_HAVE_DMA_API_DEBUG=y
-CONFIG_HAVE_HW_BREAKPOINT=y
-CONFIG_HAVE_USER_RETURN_NOTIFIER=y
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_SLOW_WORK=y
-# CONFIG_SLOW_WORK_DEBUG is not set
-# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
-CONFIG_SLABINFO=y
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-CONFIG_MODULE_FORCE_LOAD=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_STOP_MACHINE=y
-CONFIG_BLOCK=y
-CONFIG_BLK_DEV_BSG=y
-# CONFIG_BLK_DEV_INTEGRITY is not set
-CONFIG_BLOCK_COMPAT=y
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_PREEMPT_NOTIFIERS=y
-# CONFIG_INLINE_SPIN_TRYLOCK is not set
-# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK is not set
-# CONFIG_INLINE_SPIN_LOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-CONFIG_INLINE_SPIN_UNLOCK=y
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_READ_TRYLOCK is not set
-# CONFIG_INLINE_READ_LOCK is not set
-# CONFIG_INLINE_READ_LOCK_BH is not set
-# CONFIG_INLINE_READ_LOCK_IRQ is not set
-# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-CONFIG_INLINE_READ_UNLOCK=y
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_WRITE_TRYLOCK is not set
-# CONFIG_INLINE_WRITE_LOCK is not set
-# CONFIG_INLINE_WRITE_LOCK_BH is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-CONFIG_INLINE_WRITE_UNLOCK=y
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_FREEZER=y
-
-#
-# Processor type and features
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_SMP=y
-# CONFIG_SPARSE_IRQ is not set
-CONFIG_X86_MPPARSE=y
-# CONFIG_X86_EXTENDED_PLATFORM is not set
-CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-# CONFIG_PARAVIRT_GUEST is not set
-CONFIG_MEMTEST=y
-# CONFIG_M386 is not set
-# CONFIG_M486 is not set
-# CONFIG_M586 is not set
-# CONFIG_M586TSC is not set
-# CONFIG_M586MMX is not set
-# CONFIG_M686 is not set
-# CONFIG_MPENTIUMII is not set
-# CONFIG_MPENTIUMIII is not set
-# CONFIG_MPENTIUMM is not set
-# CONFIG_MPENTIUM4 is not set
-# CONFIG_MK6 is not set
-# CONFIG_MK7 is not set
-# CONFIG_MK8 is not set
-# CONFIG_MCRUSOE is not set
-# CONFIG_MEFFICEON is not set
-# CONFIG_MWINCHIPC6 is not set
-# CONFIG_MWINCHIP3D is not set
-# CONFIG_MGEODEGX1 is not set
-# CONFIG_MGEODE_LX is not set
-# CONFIG_MCYRIXIII is not set
-# CONFIG_MVIAC3_2 is not set
-# CONFIG_MVIAC7 is not set
-# CONFIG_MPSC is not set
-# CONFIG_MCORE2 is not set
-# CONFIG_MATOM is not set
-CONFIG_GENERIC_CPU=y
-CONFIG_X86_CPU=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=6
-CONFIG_X86_CMPXCHG=y
-CONFIG_X86_L1_CACHE_SHIFT=6
-CONFIG_X86_XADD=y
-CONFIG_X86_WP_WORKS_OK=y
-CONFIG_X86_TSC=y
-CONFIG_X86_CMPXCHG64=y
-CONFIG_X86_CMOV=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=64
-CONFIG_X86_DEBUGCTLMSR=y
-CONFIG_CPU_SUP_INTEL=y
-CONFIG_CPU_SUP_AMD=y
-CONFIG_CPU_SUP_CENTAUR=y
-# CONFIG_X86_DS is not set
-CONFIG_HPET_TIMER=y
-CONFIG_HPET_EMULATE_RTC=y
-CONFIG_DMI=y
-CONFIG_GART_IOMMU=y
-# CONFIG_CALGARY_IOMMU is not set
-# CONFIG_AMD_IOMMU is not set
-CONFIG_SWIOTLB=y
-CONFIG_IOMMU_HELPER=y
-# CONFIG_IOMMU_API is not set
-# CONFIG_MAXSMP is not set
-CONFIG_NR_CPUS=32
-CONFIG_SCHED_SMT=y
-CONFIG_SCHED_MC=y
-# CONFIG_PREEMPT_NONE is not set
-CONFIG_PREEMPT_VOLUNTARY=y
-# CONFIG_PREEMPT is not set
-CONFIG_X86_LOCAL_APIC=y
-CONFIG_X86_IO_APIC=y
-CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_X86_MCE=y
-CONFIG_X86_MCE_INTEL=y
-CONFIG_X86_MCE_AMD=y
-CONFIG_X86_MCE_THRESHOLD=y
-CONFIG_X86_MCE_INJECT=m
-CONFIG_X86_THERMAL_VECTOR=y
-CONFIG_I8K=m
-CONFIG_MICROCODE=m
-CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_AMD=y
-CONFIG_MICROCODE_OLD_INTERFACE=y
-CONFIG_X86_MSR=m
-CONFIG_X86_CPUID=m
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-CONFIG_DIRECT_GBPAGES=y
-# CONFIG_NUMA is not set
-CONFIG_ARCH_PROC_KCORE_TEXT=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_MEMORY_PROBE=y
-CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
-CONFIG_SELECT_MEMORY_MODEL=y
-# CONFIG_FLATMEM_MANUAL is not set
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_SPARSEMEM=y
-CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_SPARSEMEM_EXTREME=y
-CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
-CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_MEMORY_HOTPLUG=y
-CONFIG_MEMORY_HOTPLUG_SPARSE=y
-CONFIG_MEMORY_HOTREMOVE=y
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_MIGRATION=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_BOUNCE=y
-CONFIG_VIRT_TO_BUS=y
-CONFIG_MMU_NOTIFIER=y
-# CONFIG_KSM is not set
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
-# CONFIG_MEMORY_FAILURE is not set
-# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
-CONFIG_X86_RESERVE_LOW_64K=y
-CONFIG_MTRR=y
-CONFIG_MTRR_SANITIZER=y
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
-CONFIG_X86_PAT=y
-CONFIG_ARCH_USES_PG_UNCACHED=y
-CONFIG_EFI=y
-CONFIG_SECCOMP=y
-CONFIG_CC_STACKPROTECTOR=y
-# CONFIG_HZ_100 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_300 is not set
-CONFIG_HZ_1000=y
-CONFIG_HZ=1000
-CONFIG_SCHED_HRTICK=y
-# CONFIG_KEXEC is not set
-# CONFIG_CRASH_DUMP is not set
-CONFIG_PHYSICAL_START=0x1000000
-# CONFIG_RELOCATABLE is not set
-CONFIG_PHYSICAL_ALIGN=0x1000000
-CONFIG_HOTPLUG_CPU=y
-CONFIG_COMPAT_VDSO=y
-# CONFIG_CMDLINE_BOOL is not set
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-
-#
-# Power management and ACPI options
-#
-CONFIG_ARCH_HIBERNATION_HEADER=y
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_PM_SLEEP=y
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-CONFIG_HIBERNATION_NVS=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION="\"\""
-CONFIG_PM_RUNTIME=y
-CONFIG_ACPI=y
-CONFIG_ACPI_SLEEP=y
-CONFIG_ACPI_PROCFS=y
-CONFIG_ACPI_PROCFS_POWER=y
-CONFIG_ACPI_POWER_METER=m
-CONFIG_ACPI_SYSFS_POWER=y
-CONFIG_ACPI_PROC_EVENT=y
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_FAN=m
-CONFIG_ACPI_DOCK=y
-CONFIG_ACPI_PROCESSOR=m
-CONFIG_ACPI_HOTPLUG_CPU=y
-CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
-CONFIG_ACPI_THERMAL=m
-# CONFIG_ACPI_CUSTOM_DSDT is not set
-CONFIG_ACPI_BLACKLIST_YEAR=0
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_PCI_SLOT=m
-CONFIG_X86_PM_TIMER=y
-CONFIG_ACPI_CONTAINER=m
-CONFIG_ACPI_HOTPLUG_MEMORY=m
-CONFIG_ACPI_SBS=m
-CONFIG_SFI=y
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=m
-# CONFIG_CPU_FREQ_DEBUG is not set
-CONFIG_CPU_FREQ_STAT=m
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=m
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-
-#
-# CPUFreq processor drivers
-#
-CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_SPEEDSTEP_CENTRINO=m
-CONFIG_X86_P4_CLOCKMOD=m
-
-#
-# shared options
-#
-CONFIG_X86_SPEEDSTEP_LIB=m
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-
-#
-# Memory power savings
-#
-CONFIG_I7300_IDLE_IOAT_CHANNEL=y
-CONFIG_I7300_IDLE=m
-
-#
-# Bus options (PCI etc.)
-#
-CONFIG_PCI=y
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_MMCONFIG=y
-CONFIG_PCI_DOMAINS=y
-# CONFIG_DMAR is not set
-# CONFIG_INTR_REMAP is not set
-CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=m
-CONFIG_PCIEAER=y
-# CONFIG_PCIE_ECRC is not set
-CONFIG_PCIEAER_INJECT=m
-# CONFIG_PCIEASPM is not set
-CONFIG_ARCH_SUPPORTS_MSI=y
-CONFIG_PCI_MSI=y
-CONFIG_PCI_LEGACY=y
-# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_STUB=m
-CONFIG_HT_IRQ=y
-# CONFIG_PCI_IOV is not set
-CONFIG_PCI_IOAPIC=y
-CONFIG_ISA_DMA_API=y
-CONFIG_K8_NB=y
-CONFIG_PCCARD=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_PCMCIA_IOCTL=y
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_PCCARD_NONSTATIC=m
-CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_FAKE=m
-CONFIG_HOTPLUG_PCI_ACPI=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-# CONFIG_HOTPLUG_PCI_CPCI is not set
-CONFIG_HOTPLUG_PCI_SHPC=m
-
-#
-# Executable file formats / Emulations
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_COMPAT_BINFMT_ELF=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-# CONFIG_HAVE_AOUT is not set
-CONFIG_BINFMT_MISC=m
-CONFIG_IA32_EMULATION=y
-# CONFIG_IA32_AOUT is not set
-CONFIG_COMPAT=y
-CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
-CONFIG_SYSVIPC_COMPAT=y
-CONFIG_NET=y
-CONFIG_COMPAT_NETLINK_MESSAGES=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-CONFIG_XFRM_USER=y
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-CONFIG_XFRM_IPCOMP=m
-CONFIG_NET_KEY=m
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_ASK_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
-CONFIG_IP_FIB_HASH=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_LRO=y
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
-CONFIG_IPV6=m
-CONFIG_IPV6_PRIVACY=y
-# CONFIG_IPV6_ROUTER_PREF is not set
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_IPV6_SIT=m
-# CONFIG_IPV6_SIT_6RD is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=m
-# CONFIG_IPV6_MULTIPLE_TABLES is not set
-# CONFIG_IPV6_MROUTE is not set
-# CONFIG_NETLABEL is not set
-# CONFIG_NETWORK_SECMARK is not set
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=y
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_CT_ACCT=y
-CONFIG_NF_CONNTRACK_MARK=y
-# CONFIG_NF_CONNTRACK_EVENTS is not set
-CONFIG_NF_CT_PROTO_DCCP=m
-CONFIG_NF_CT_PROTO_GRE=m
-CONFIG_NF_CT_PROTO_SCTP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NETFILTER_TPROXY=m
-CONFIG_NETFILTER_XTABLES=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT=y
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_IP_VS=m
-# CONFIG_IP_VS_IPV6 is not set
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_AH_ESP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-CONFIG_IP_NF_QUEUE=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_LOG=m
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PROTO_DCCP=m
-CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_SECURITY=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-
-#
-# IPv6: Netfilter Configuration
-#
-CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_IP6_NF_QUEUE=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_TARGET_LOG=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_SECURITY=m
-
-#
-# DECnet: Netfilter Configuration
-#
-# CONFIG_DECNET_NF_GRABULATOR is not set
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_ULOG=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
-
-#
-# DCCP CCIDs Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-# CONFIG_IP_DCCP_CCID3 is not set
-
-#
-# DCCP Kernel Hacking
-#
-# CONFIG_IP_DCCP_DEBUG is not set
-CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_MSG is not set
-# CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_HMAC_NONE is not set
-# CONFIG_SCTP_HMAC_SHA1 is not set
-CONFIG_SCTP_HMAC_MD5=y
-CONFIG_RDS=m
-CONFIG_RDS_RDMA=m
-CONFIG_RDS_TCP=m
-# CONFIG_RDS_DEBUG is not set
-CONFIG_TIPC=m
-# CONFIG_TIPC_ADVANCED is not set
-# CONFIG_TIPC_DEBUG is not set
-CONFIG_ATM=m
-CONFIG_ATM_CLIP=m
-# CONFIG_ATM_CLIP_NO_ICMP is not set
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
-CONFIG_ATM_BR2684=m
-# CONFIG_ATM_BR2684_IPFILTER is not set
-CONFIG_STP=m
-CONFIG_GARP=m
-CONFIG_BRIDGE=m
-# CONFIG_NET_DSA is not set
-CONFIG_VLAN_8021Q=m
-CONFIG_VLAN_8021Q_GVRP=y
-CONFIG_DECNET=m
-# CONFIG_DECNET_ROUTER is not set
-CONFIG_LLC=m
-CONFIG_LLC2=m
-CONFIG_IPX=m
-# CONFIG_IPX_INTERN is not set
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=m
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
-CONFIG_WAN_ROUTER=m
-CONFIG_PHONET=m
-CONFIG_IEEE802154=m
-CONFIG_NET_SCHED=y
-
-#
-# Queueing/Scheduling
-#
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_INGRESS=m
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_ROUTE=y
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_EMATCH=y
-CONFIG_NET_EMATCH_STACK=32
-CONFIG_NET_EMATCH_CMP=m
-CONFIG_NET_EMATCH_NBYTE=m
-CONFIG_NET_EMATCH_U32=m
-CONFIG_NET_EMATCH_META=m
-CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=y
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-# CONFIG_NET_CLS_IND is not set
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_DCB is not set
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_DROP_MONITOR is not set
-CONFIG_HAMRADIO=y
-
-#
-# Packet Radio protocols
-#
-CONFIG_AX25=m
-# CONFIG_AX25_DAMA_SLAVE is not set
-CONFIG_NETROM=m
-CONFIG_ROSE=m
-
-#
-# AX.25 network device drivers
-#
-CONFIG_MKISS=m
-CONFIG_6PACK=m
-CONFIG_BPQETHER=m
-CONFIG_BAYCOM_SER_FDX=m
-CONFIG_BAYCOM_SER_HDX=m
-CONFIG_BAYCOM_PAR=m
-CONFIG_YAM=m
-CONFIG_CAN=m
-CONFIG_CAN_RAW=m
-CONFIG_CAN_BCM=m
-
-#
-# CAN Device Drivers
-#
-CONFIG_CAN_VCAN=m
-CONFIG_CAN_DEV=m
-# CONFIG_CAN_CALC_BITTIMING is not set
-CONFIG_CAN_SJA1000=m
-CONFIG_CAN_SJA1000_PLATFORM=m
-CONFIG_CAN_EMS_PCI=m
-CONFIG_CAN_KVASER_PCI=m
-
-#
-# CAN USB interfaces
-#
-CONFIG_CAN_EMS_USB=m
-# CONFIG_CAN_DEBUG_DEVICES is not set
-CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
-CONFIG_IRCOMM=m
-# CONFIG_IRDA_ULTRA is not set
-
-#
-# IrDA options
-#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=m
-
-#
-# Dongle support
-#
-CONFIG_DONGLE=y
-CONFIG_ESI_DONGLE=m
-CONFIG_ACTISYS_DONGLE=m
-CONFIG_TEKRAM_DONGLE=m
-CONFIG_TOIM3232_DONGLE=m
-CONFIG_LITELINK_DONGLE=m
-CONFIG_MA600_DONGLE=m
-CONFIG_GIRBIL_DONGLE=m
-CONFIG_MCP2120_DONGLE=m
-CONFIG_OLD_BELKIN_DONGLE=m
-CONFIG_ACT200L_DONGLE=m
-CONFIG_KINGSUN_DONGLE=m
-CONFIG_KSDAZZLE_DONGLE=m
-CONFIG_KS959_DONGLE=m
-
-#
-# FIR device drivers
-#
-CONFIG_USB_IRDA=m
-CONFIG_SIGMATEL_FIR=m
-CONFIG_NSC_FIR=m
-CONFIG_WINBOND_FIR=m
-CONFIG_SMC_IRCC_FIR=m
-CONFIG_ALI_FIR=m
-CONFIG_VLSI_FIR=m
-CONFIG_VIA_FIR=m
-CONFIG_MCS_FIR=m
-CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_CMTP=m
-CONFIG_BT_HIDP=m
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_ATH3K=m
-CONFIG_AF_RXRPC=m
-# CONFIG_AF_RXRPC_DEBUG is not set
-CONFIG_RXKAD=m
-CONFIG_FIB_RULES=y
-CONFIG_WIRELESS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WEXT_PRIV=y
-CONFIG_CFG80211=m
-# CONFIG_NL80211_TESTMODE is not set
-# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_REG_DEBUG is not set
-CONFIG_CFG80211_DEFAULT_PS=y
-# CONFIG_CFG80211_DEBUGFS is not set
-CONFIG_WIRELESS_OLD_REGULATORY=y
-CONFIG_CFG80211_WEXT=y
-CONFIG_WIRELESS_EXT_SYSFS=y
-CONFIG_LIB80211=m
-CONFIG_LIB80211_CRYPT_WEP=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_MAC80211=m
-CONFIG_MAC80211_RC_MINSTREL=y
-# CONFIG_MAC80211_RC_DEFAULT_PID is not set
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT="minstrel"
-CONFIG_MAC80211_MESH=y
-CONFIG_MAC80211_LEDS=y
-# CONFIG_MAC80211_DEBUGFS is not set
-# CONFIG_MAC80211_DEBUG_MENU is not set
-CONFIG_WIMAX=m
-CONFIG_WIMAX_DEBUG_LEVEL=8
-CONFIG_RFKILL=m
-CONFIG_RFKILL_LEDS=y
-CONFIG_RFKILL_INPUT=y
-CONFIG_NET_9P=m
-CONFIG_NET_9P_VIRTIO=m
-CONFIG_NET_9P_RDMA=m
-# CONFIG_NET_9P_DEBUG is not set
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
-CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_SYS_HYPERVISOR is not set
-CONFIG_CONNECTOR=m
-CONFIG_MTD=m
-# CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_TESTS=m
-CONFIG_MTD_CONCAT=m
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MTD_REDBOOT_PARTS=m
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
-# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-CONFIG_MTD_AR7_PARTS=m
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_CHAR=m
-CONFIG_HAVE_MTD_OTP=y
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
-CONFIG_FTL=m
-CONFIG_NFTL=m
-CONFIG_NFTL_RW=y
-CONFIG_INFTL=m
-CONFIG_RFD_FTL=m
-CONFIG_SSFDC=m
-CONFIG_MTD_OOPS=m
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=m
-CONFIG_MTD_JEDECPROBE=m
-CONFIG_MTD_GEN_PROBE=m
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-CONFIG_MTD_CFI_NOSWAP=y
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_GEOMETRY=y
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-CONFIG_MTD_MAP_BANK_WIDTH_8=y
-CONFIG_MTD_MAP_BANK_WIDTH_16=y
-CONFIG_MTD_MAP_BANK_WIDTH_32=y
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-CONFIG_MTD_CFI_I4=y
-CONFIG_MTD_CFI_I8=y
-CONFIG_MTD_OTP=y
-CONFIG_MTD_CFI_INTELEXT=m
-CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_CFI_STAA=m
-CONFIG_MTD_CFI_UTIL=m
-CONFIG_MTD_RAM=m
-CONFIG_MTD_ROM=m
-CONFIG_MTD_ABSENT=m
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=m
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-CONFIG_MTD_SC520CDP=m
-CONFIG_MTD_NETSC520=m
-CONFIG_MTD_TS5500=m
-CONFIG_MTD_SBC_GXX=m
-CONFIG_MTD_AMD76XROM=m
-CONFIG_MTD_ICHXROM=m
-CONFIG_MTD_ESB2ROM=m
-CONFIG_MTD_CK804XROM=m
-CONFIG_MTD_SCB2_FLASH=m
-CONFIG_MTD_NETtel=m
-CONFIG_MTD_L440GX=m
-CONFIG_MTD_PCI=m
-CONFIG_MTD_GPIO_ADDR=m
-CONFIG_MTD_INTEL_VR_NOR=m
-CONFIG_MTD_PLATRAM=m
-
-#
-# Self-contained MTD device drivers
-#
-CONFIG_MTD_PMC551=m
-CONFIG_MTD_PMC551_BUGFIX=y
-# CONFIG_MTD_PMC551_DEBUG is not set
-CONFIG_MTD_SLRAM=m
-CONFIG_MTD_PHRAM=m
-CONFIG_MTD_MTDRAM=m
-CONFIG_MTDRAM_TOTAL_SIZE=4096
-CONFIG_MTDRAM_ERASE_SIZE=128
-CONFIG_MTD_BLOCK2MTD=m
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-CONFIG_MTD_DOC2001PLUS=m
-CONFIG_MTD_DOCPROBE=m
-CONFIG_MTD_DOCECC=m
-CONFIG_MTD_DOCPROBE_ADVANCED=y
-CONFIG_MTD_DOCPROBE_ADDRESS=0x0000
-CONFIG_MTD_DOCPROBE_HIGH=y
-CONFIG_MTD_DOCPROBE_55AA=y
-CONFIG_MTD_NAND=m
-CONFIG_MTD_NAND_VERIFY_WRITE=y
-CONFIG_MTD_NAND_ECC_SMC=y
-CONFIG_MTD_NAND_MUSEUM_IDS=y
-CONFIG_MTD_NAND_IDS=m
-CONFIG_MTD_NAND_DISKONCHIP=m
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y
-CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y
-CONFIG_MTD_NAND_CAFE=m
-CONFIG_MTD_NAND_NANDSIM=m
-CONFIG_MTD_NAND_PLATFORM=m
-CONFIG_MTD_ALAUDA=m
-CONFIG_MTD_ONENAND=m
-CONFIG_MTD_ONENAND_VERIFY_WRITE=y
-CONFIG_MTD_ONENAND_GENERIC=m
-CONFIG_MTD_ONENAND_OTP=y
-CONFIG_MTD_ONENAND_2X_PROGRAM=y
-CONFIG_MTD_ONENAND_SIM=m
-
-#
-# LPDDR flash memory drivers
-#
-CONFIG_MTD_LPDDR=m
-CONFIG_MTD_QINFO_PROBE=m
-
-#
-# UBI - Unsorted block images
-#
-CONFIG_MTD_UBI=m
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_RESERVE=1
-CONFIG_MTD_UBI_GLUEBI=m
-
-#
-# UBI debugging options
-#
-# CONFIG_MTD_UBI_DEBUG is not set
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_SERIAL=m
-# CONFIG_PARPORT_PC_FIFO is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_AX88796=m
-CONFIG_PARPORT_1284=y
-CONFIG_PARPORT_NOT_PC=y
-CONFIG_PNP=y
-CONFIG_PNP_DEBUG_MESSAGES=y
-
-#
-# Protocols
-#
-CONFIG_PNPACPI=y
-CONFIG_BLK_DEV=y
-CONFIG_BLK_DEV_FD=y
-CONFIG_PARIDE=m
-
-#
-# Parallel IDE high-level drivers
-#
-CONFIG_PARIDE_PD=m
-CONFIG_PARIDE_PCD=m
-CONFIG_PARIDE_PF=m
-CONFIG_PARIDE_PT=m
-CONFIG_PARIDE_PG=m
-
-#
-# Parallel IDE protocol modules
-#
-CONFIG_PARIDE_ATEN=m
-CONFIG_PARIDE_BPCK=m
-CONFIG_PARIDE_COMM=m
-CONFIG_PARIDE_DSTR=m
-CONFIG_PARIDE_FIT2=m
-CONFIG_PARIDE_FIT3=m
-CONFIG_PARIDE_EPAT=m
-CONFIG_PARIDE_EPATC8=y
-CONFIG_PARIDE_EPIA=m
-CONFIG_PARIDE_FRIQ=m
-CONFIG_PARIDE_FRPW=m
-CONFIG_PARIDE_KBIC=m
-CONFIG_PARIDE_KTTI=m
-CONFIG_PARIDE_ON20=m
-CONFIG_PARIDE_ON26=m
-CONFIG_BLK_CPQ_DA=y
-CONFIG_BLK_CPQ_CISS_DA=y
-CONFIG_CISS_SCSI_TAPE=y
-CONFIG_BLK_DEV_DAC960=y
-CONFIG_BLK_DEV_UMEM=m
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_DRBD=m
-# CONFIG_DRBD_FAULT_INJECTION is not set
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_OSD=m
-CONFIG_BLK_DEV_SX8=y
-# CONFIG_BLK_DEV_UB is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=16384
-# CONFIG_BLK_DEV_XIP is not set
-CONFIG_CDROM_PKTCDVD=m
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_ATA_OVER_ETH=m
-CONFIG_VIRTIO_BLK=m
-# CONFIG_BLK_DEV_HD is not set
-CONFIG_MISC_DEVICES=y
-CONFIG_AD525X_DPOT=m
-CONFIG_IBM_ASM=m
-CONFIG_PHANTOM=m
-CONFIG_SGI_IOC4=m
-CONFIG_TIFM_CORE=m
-CONFIG_TIFM_7XX1=m
-CONFIG_ICS932S401=m
-CONFIG_ENCLOSURE_SERVICES=m
-CONFIG_CS5535_MFGPT=m
-CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
-CONFIG_HP_ILO=m
-CONFIG_ISL29003=m
-CONFIG_DS1682=m
-# CONFIG_C2PORT is not set
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT24=m
-CONFIG_EEPROM_LEGACY=m
-CONFIG_EEPROM_MAX6875=m
-CONFIG_EEPROM_93CX6=m
-CONFIG_CB710_CORE=m
-# CONFIG_CB710_DEBUG is not set
-CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-CONFIG_IWMC3200TOP=m
-# CONFIG_IWMC3200TOP_DEBUG is not set
-# CONFIG_IWMC3200TOP_DEBUGFS is not set
-CONFIG_HAVE_IDE=y
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-CONFIG_RAID_ATTRS=y
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_TGT=y
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_ST=y
-CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_ENCLOSURE=m
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-CONFIG_SCSI_WAIT_SCAN=m
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=y
-CONFIG_SCSI_FC_ATTRS=y
-CONFIG_SCSI_FC_TGT_ATTRS=y
-CONFIG_SCSI_ISCSI_ATTRS=y
-CONFIG_SCSI_SAS_ATTRS=y
-CONFIG_SCSI_SAS_LIBSAS=y
-CONFIG_SCSI_SAS_ATA=y
-CONFIG_SCSI_SAS_HOST_SMP=y
-# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
-CONFIG_SCSI_SRP_ATTRS=m
-CONFIG_SCSI_SRP_TGT_ATTRS=y
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ISCSI_TCP=m
-CONFIG_SCSI_CXGB3_ISCSI=m
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_BE2ISCSI=m
-CONFIG_BLK_DEV_3W_XXXX_RAID=y
-CONFIG_SCSI_HPSA=y
-CONFIG_SCSI_3W_9XXX=y
-CONFIG_SCSI_3W_SAS=y
-CONFIG_SCSI_ACARD=y
-CONFIG_SCSI_AACRAID=y
-CONFIG_SCSI_AIC7XXX=y
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=4
-CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-CONFIG_AIC7XXX_DEBUG_MASK=0
-# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
-CONFIG_SCSI_AIC7XXX_OLD=y
-CONFIG_SCSI_AIC79XX=y
-CONFIG_AIC79XX_CMDS_PER_DEVICE=4
-CONFIG_AIC79XX_RESET_DELAY_MS=15000
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
-CONFIG_AIC79XX_DEBUG_MASK=0
-# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
-CONFIG_SCSI_AIC94XX=y
-# CONFIG_AIC94XX_DEBUG is not set
-CONFIG_SCSI_MVSAS=y
-# CONFIG_SCSI_MVSAS_DEBUG is not set
-CONFIG_SCSI_DPT_I2O=m
-CONFIG_SCSI_ADVANSYS=y
-CONFIG_SCSI_ARCMSR=y
-# CONFIG_SCSI_ARCMSR_AER is not set
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_MM=y
-CONFIG_MEGARAID_MAILBOX=y
-CONFIG_MEGARAID_LEGACY=y
-CONFIG_MEGARAID_SAS=y
-CONFIG_SCSI_MPT2SAS=y
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-# CONFIG_SCSI_MPT2SAS_LOGGING is not set
-CONFIG_SCSI_HPTIOP=y
-CONFIG_SCSI_BUSLOGIC=y
-CONFIG_VMWARE_PVSCSI=m
-CONFIG_LIBFC=y
-CONFIG_LIBFCOE=y
-CONFIG_FCOE=y
-CONFIG_FCOE_FNIC=y
-CONFIG_SCSI_DMX3191D=y
-CONFIG_SCSI_EATA=y
-# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
-# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
-CONFIG_SCSI_EATA_MAX_TAGS=16
-CONFIG_SCSI_FUTURE_DOMAIN=y
-CONFIG_SCSI_GDTH=y
-CONFIG_SCSI_IPS=y
-CONFIG_SCSI_INITIO=y
-CONFIG_SCSI_INIA100=y
-CONFIG_SCSI_PPA=m
-CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
-# CONFIG_SCSI_IZIP_SLOW_CTR is not set
-CONFIG_SCSI_STEX=y
-CONFIG_SCSI_SYM53C8XX_2=y
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_SCSI_IPR=y
-# CONFIG_SCSI_IPR_TRACE is not set
-# CONFIG_SCSI_IPR_DUMP is not set
-CONFIG_SCSI_QLOGIC_1280=y
-CONFIG_SCSI_QLA_FC=y
-CONFIG_SCSI_QLA_ISCSI=y
-CONFIG_SCSI_LPFC=y
-# CONFIG_SCSI_LPFC_DEBUG_FS is not set
-CONFIG_SCSI_DC395x=y
-CONFIG_SCSI_DC390T=y
-CONFIG_SCSI_DEBUG=m
-CONFIG_SCSI_PMCRAID=y
-CONFIG_SCSI_PM8001=y
-CONFIG_SCSI_SRP=y
-CONFIG_SCSI_BFA_FC=y
-CONFIG_SCSI_LOWLEVEL_PCMCIA=y
-CONFIG_PCMCIA_FDOMAIN=m
-CONFIG_PCMCIA_QLOGIC=m
-CONFIG_PCMCIA_SYM53C500=m
-CONFIG_SCSI_DH=m
-CONFIG_SCSI_DH_RDAC=m
-CONFIG_SCSI_DH_HP_SW=m
-CONFIG_SCSI_DH_EMC=m
-CONFIG_SCSI_DH_ALUA=m
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
-CONFIG_SCSI_OSD_DPRINT_SENSE=1
-# CONFIG_SCSI_OSD_DEBUG is not set
-CONFIG_ATA=y
-# CONFIG_ATA_NONSTANDARD is not set
-CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_ATA_ACPI=y
-CONFIG_SATA_PMP=y
-CONFIG_SATA_AHCI=y
-CONFIG_SATA_SIL24=y
-CONFIG_ATA_SFF=y
-CONFIG_SATA_SVW=y
-CONFIG_ATA_PIIX=y
-CONFIG_SATA_MV=y
-CONFIG_SATA_NV=y
-CONFIG_PDC_ADMA=y
-CONFIG_SATA_QSTOR=y
-CONFIG_SATA_PROMISE=y
-CONFIG_SATA_SX4=y
-CONFIG_SATA_SIL=y
-CONFIG_SATA_SIS=y
-CONFIG_SATA_ULI=y
-CONFIG_SATA_VIA=y
-CONFIG_SATA_VITESSE=y
-CONFIG_SATA_INIC162X=y
-CONFIG_PATA_ACPI=y
-CONFIG_PATA_ALI=y
-CONFIG_PATA_AMD=y
-CONFIG_PATA_ARTOP=y
-CONFIG_PATA_ATP867X=y
-CONFIG_PATA_ATIIXP=y
-CONFIG_PATA_CMD640_PCI=y
-CONFIG_PATA_CMD64X=y
-CONFIG_PATA_CS5520=y
-CONFIG_PATA_CS5530=y
-CONFIG_PATA_CYPRESS=y
-CONFIG_PATA_EFAR=y
-CONFIG_ATA_GENERIC=y
-CONFIG_PATA_HPT366=y
-CONFIG_PATA_HPT37X=y
-CONFIG_PATA_HPT3X2N=y
-CONFIG_PATA_HPT3X3=y
-CONFIG_PATA_HPT3X3_DMA=y
-CONFIG_PATA_IT821X=y
-CONFIG_PATA_IT8213=y
-CONFIG_PATA_JMICRON=y
-CONFIG_PATA_TRIFLEX=y
-CONFIG_PATA_MARVELL=y
-CONFIG_PATA_MPIIX=y
-CONFIG_PATA_OLDPIIX=y
-CONFIG_PATA_NETCELL=y
-CONFIG_PATA_NINJA32=y
-CONFIG_PATA_NS87410=y
-CONFIG_PATA_NS87415=y
-CONFIG_PATA_OPTI=y
-CONFIG_PATA_OPTIDMA=y
-CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_PDC2027X=y
-CONFIG_PATA_PDC_OLD=y
-CONFIG_PATA_RADISYS=y
-CONFIG_PATA_RDC=y
-CONFIG_PATA_RZ1000=y
-CONFIG_PATA_SC1200=y
-CONFIG_PATA_SERVERWORKS=y
-CONFIG_PATA_SIL680=y
-CONFIG_PATA_SIS=y
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_VIA=y
-CONFIG_PATA_WINBOND=y
-CONFIG_PATA_SCH=y
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=y
-CONFIG_MD_AUTODETECT=y
-CONFIG_MD_LINEAR=y
-CONFIG_MD_RAID0=y
-CONFIG_MD_RAID1=y
-CONFIG_MD_RAID10=y
-CONFIG_MD_RAID456=y
-# CONFIG_MULTICORE_RAID456 is not set
-CONFIG_MD_RAID6_PQ=y
-CONFIG_ASYNC_RAID6_TEST=m
-CONFIG_MD_MULTIPATH=y
-CONFIG_MD_FAULTY=m
-CONFIG_BLK_DEV_DM=y
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_CRYPT=y
-CONFIG_DM_SNAPSHOT=y
-CONFIG_DM_MIRROR=y
-CONFIG_DM_LOG_USERSPACE=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_QL=m
-CONFIG_DM_MULTIPATH_ST=m
-# CONFIG_DM_DELAY is not set
-CONFIG_DM_UEVENT=y
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=y
-CONFIG_FUSION_FC=y
-CONFIG_FUSION_SAS=y
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_CTL=y
-CONFIG_FUSION_LAN=y
-# CONFIG_FUSION_LOGGING is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# You can enable one or both FireWire driver stacks.
-#
-
-#
-# The newer stack is recommended.
-#
-# CONFIG_FIREWIRE is not set
-CONFIG_IEEE1394=m
-CONFIG_IEEE1394_OHCI1394=m
-CONFIG_IEEE1394_PCILYNX=m
-CONFIG_IEEE1394_SBP2=m
-# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
-CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y
-CONFIG_IEEE1394_ETH1394=m
-CONFIG_IEEE1394_RAWIO=m
-CONFIG_IEEE1394_VIDEO1394=m
-CONFIG_IEEE1394_DV1394=m
-# CONFIG_IEEE1394_VERBOSEDEBUG is not set
-CONFIG_I2O=y
-CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
-CONFIG_I2O_EXT_ADAPTEC=y
-CONFIG_I2O_EXT_ADAPTEC_DMA64=y
-CONFIG_I2O_CONFIG=y
-# CONFIG_I2O_CONFIG_OLD_IOCTL is not set
-CONFIG_I2O_BUS=y
-CONFIG_I2O_BLOCK=y
-CONFIG_I2O_SCSI=y
-CONFIG_I2O_PROC=y
-CONFIG_MACINTOSH_DRIVERS=y
-CONFIG_MAC_EMUMOUSEBTN=y
-CONFIG_NETDEVICES=y
-CONFIG_IFB=m
-CONFIG_DUMMY=m
-CONFIG_BONDING=m
-CONFIG_MACVLAN=m
-CONFIG_EQUALIZER=m
-CONFIG_TUN=m
-CONFIG_VETH=m
-CONFIG_NET_SB1000=m
-CONFIG_ARCNET=m
-CONFIG_ARCNET_1201=m
-CONFIG_ARCNET_1051=m
-CONFIG_ARCNET_RAW=m
-CONFIG_ARCNET_CAP=m
-CONFIG_ARCNET_COM90xx=m
-CONFIG_ARCNET_COM90xxIO=m
-CONFIG_ARCNET_RIM_I=m
-CONFIG_ARCNET_COM20020=m
-CONFIG_ARCNET_COM20020_PCI=m
-CONFIG_PHYLIB=m
-
-#
-# MII PHY device drivers
-#
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_SMSC_PHY=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_STE10XP=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_MDIO_BITBANG=m
-CONFIG_MDIO_GPIO=m
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=m
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_CASSINI=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-CONFIG_ETHOC=m
-CONFIG_DNET=m
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_DE2104X_DSL=0
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-CONFIG_TULIP_MMIO=y
-# CONFIG_TULIP_NAPI is not set
-CONFIG_DE4X5=m
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_ULI526X=m
-CONFIG_PCMCIA_XIRCOM=m
-CONFIG_HP100=m
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
-# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
-# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=m
-CONFIG_AMD8111_ETH=m
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_FORCEDETH=m
-CONFIG_FORCEDETH_NAPI=y
-CONFIG_E100=m
-CONFIG_FEALNX=m
-CONFIG_NATSEMI=m
-CONFIG_NE2K_PCI=m
-CONFIG_8139CP=m
-CONFIG_8139TOO=m
-CONFIG_8139TOO_PIO=y
-# CONFIG_8139TOO_TUNE_TWISTER is not set
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_R6040=m
-CONFIG_SIS900=m
-CONFIG_EPIC100=m
-CONFIG_SMSC9420=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_TLAN=m
-CONFIG_KS8842=m
-CONFIG_KS8851_MLL=m
-CONFIG_VIA_RHINE=m
-CONFIG_VIA_RHINE_MMIO=y
-CONFIG_SC92031=m
-CONFIG_NET_POCKET=y
-CONFIG_ATP=m
-CONFIG_DE600=m
-CONFIG_DE620=m
-CONFIG_ATL2=m
-CONFIG_NETDEV_1000=y
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-CONFIG_E1000E=m
-CONFIG_IP1000=m
-CONFIG_IGB=m
-CONFIG_IGB_DCA=y
-CONFIG_IGBVF=m
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-CONFIG_R8169_VLAN=y
-CONFIG_SIS190=m
-CONFIG_SKGE=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKY2=m
-# CONFIG_SKY2_DEBUG is not set
-CONFIG_VIA_VELOCITY=m
-CONFIG_TIGON3=m
-CONFIG_BNX2=m
-CONFIG_CNIC=m
-CONFIG_QLA3XXX=m
-CONFIG_ATL1=m
-CONFIG_ATL1E=m
-CONFIG_ATL1C=m
-CONFIG_JME=m
-CONFIG_NETDEV_10000=y
-CONFIG_MDIO=m
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3_DEPENDS=y
-CONFIG_CHELSIO_T3=m
-CONFIG_ENIC=m
-CONFIG_IXGBE=m
-CONFIG_IXGBE_DCA=y
-CONFIG_IXGB=m
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_MYRI10GE=m
-CONFIG_MYRI10GE_DCA=y
-CONFIG_NETXEN_NIC=m
-CONFIG_NIU=m
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-CONFIG_TEHUTI=m
-CONFIG_BNX2X=m
-CONFIG_QLGE=m
-CONFIG_SFC=m
-CONFIG_SFC_MTD=y
-CONFIG_BE2NET=m
-CONFIG_TR=m
-CONFIG_IBMOL=m
-CONFIG_3C359=m
-CONFIG_TMS380TR=m
-CONFIG_TMSPCI=m
-CONFIG_ABYSS=m
-CONFIG_WLAN=y
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_LIBERTAS_THINFIRM=m
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_AIRO=m
-CONFIG_ATMEL=m
-CONFIG_PCI_ATMEL=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_AT76C50X_USB=m
-CONFIG_AIRO_CS=m
-CONFIG_PCMCIA_WL3501=m
-CONFIG_PRISM54=m
-CONFIG_USB_ZD1201=m
-CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_RTL8180=m
-CONFIG_RTL8187=m
-CONFIG_RTL8187_LEDS=y
-CONFIG_ADM8211=m
-# CONFIG_MAC80211_HWSIM is not set
-CONFIG_MWL8K=m
-CONFIG_ATH_COMMON=m
-# CONFIG_ATH_DEBUG is not set
-CONFIG_ATH5K=m
-# CONFIG_ATH5K_DEBUG is not set
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K_COMMON=m
-CONFIG_ATH9K=m
-# CONFIG_ATH9K_DEBUGFS is not set
-CONFIG_AR9170_USB=m
-CONFIG_AR9170_LEDS=y
-CONFIG_B43=m
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PCMCIA=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_PIO=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_LEDS=y
-CONFIG_B43_HWRNG=y
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY_HWRNG=y
-# CONFIG_B43LEGACY_DEBUG is not set
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-CONFIG_HOSTAP_FIRMWARE_NVRAM=y
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_CS=m
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y
-# CONFIG_IWLWIFI_DEBUG is not set
-# CONFIG_IWLWIFI_DEVICE_TRACING is not set
-CONFIG_IWLAGN=m
-CONFIG_IWL4965=y
-CONFIG_IWL5000=y
-CONFIG_IWL3945=m
-CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y
-CONFIG_IWM=m
-# CONFIG_IWM_DEBUG is not set
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
-CONFIG_LIBERTAS_SDIO=m
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_HERMES=m
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_USB=m
-CONFIG_P54_PCI=m
-CONFIG_P54_LEDS=y
-CONFIG_RT2X00=m
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT61PCI=m
-CONFIG_RT2800PCI_PCI=m
-CONFIG_RT2800PCI=m
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-CONFIG_RT2800USB=m
-CONFIG_RT2800_LIB=m
-CONFIG_RT2X00_LIB_PCI=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_HT=y
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_LEDS=y
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_WL12XX=m
-CONFIG_WL1251=m
-CONFIG_WL1251_SDIO=m
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-
-#
-# WiMAX Wireless Broadband devices
-#
-CONFIG_WIMAX_I2400M=m
-CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_SDIO=m
-# CONFIG_WIMAX_IWMC3200_SDIO is not set
-CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-# CONFIG_USB_EPSON2888 is not set
-# CONFIG_USB_KC2190 is not set
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_HSO=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_CDC_PHONET=m
-CONFIG_NET_PCMCIA=y
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_AXNET=m
-CONFIG_ARCNET_COM20020_CS=m
-CONFIG_PCMCIA_IBMTR=m
-CONFIG_WAN=y
-CONFIG_LANMEDIA=m
-CONFIG_HDLC=m
-CONFIG_HDLC_RAW=m
-CONFIG_HDLC_RAW_ETH=m
-CONFIG_HDLC_CISCO=m
-CONFIG_HDLC_FR=m
-CONFIG_HDLC_PPP=m
-
-#
-# X.25/LAPB support is disabled
-#
-CONFIG_PCI200SYN=m
-CONFIG_WANXL=m
-# CONFIG_PC300TOO is not set
-CONFIG_FARSYNC=m
-CONFIG_DSCC4=m
-# CONFIG_DSCC4_PCISYNC is not set
-# CONFIG_DSCC4_PCI_RST is not set
-CONFIG_DLCI=m
-CONFIG_DLCI_MAX=8
-CONFIG_WAN_ROUTER_DRIVERS=m
-CONFIG_CYCLADES_SYNC=m
-CONFIG_CYCLOMX_X25=y
-CONFIG_SBNI=m
-# CONFIG_SBNI_MULTILINE is not set
-CONFIG_ATM_DRIVERS=y
-CONFIG_ATM_DUMMY=m
-CONFIG_ATM_TCP=m
-CONFIG_ATM_LANAI=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-# CONFIG_ATM_ENI_TUNE_BURST is not set
-CONFIG_ATM_FIRESTREAM=m
-CONFIG_ATM_ZATM=m
-# CONFIG_ATM_ZATM_DEBUG is not set
-CONFIG_ATM_IDT77252=m
-# CONFIG_ATM_IDT77252_DEBUG is not set
-# CONFIG_ATM_IDT77252_RCV_ALL is not set
-CONFIG_ATM_IDT77252_USE_SUNI=y
-CONFIG_ATM_AMBASSADOR=m
-# CONFIG_ATM_AMBASSADOR_DEBUG is not set
-CONFIG_ATM_HORIZON=m
-# CONFIG_ATM_HORIZON_DEBUG is not set
-CONFIG_ATM_IA=m
-# CONFIG_ATM_IA_DEBUG is not set
-CONFIG_ATM_FORE200E=m
-# CONFIG_ATM_FORE200E_USE_TASKLET is not set
-CONFIG_ATM_FORE200E_TX_RETRY=16
-CONFIG_ATM_FORE200E_DEBUG=0
-CONFIG_ATM_HE=m
-# CONFIG_ATM_HE_USE_SUNI is not set
-CONFIG_ATM_SOLOS=m
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKEHARD=m
-CONFIG_FDDI=y
-CONFIG_DEFXX=m
-# CONFIG_DEFXX_MMIO is not set
-CONFIG_SKFP=m
-CONFIG_HIPPI=y
-CONFIG_ROADRUNNER=m
-# CONFIG_ROADRUNNER_LARGE_RINGS is not set
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_MPPE=m
-CONFIG_PPPOE=m
-CONFIG_PPPOATM=m
-CONFIG_PPPOL2TP=m
-CONFIG_SLIP=m
-CONFIG_SLIP_COMPRESSED=y
-CONFIG_SLHC=m
-CONFIG_SLIP_SMART=y
-# CONFIG_SLIP_MODE_SLIP6 is not set
-CONFIG_NET_FC=y
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-# CONFIG_NETPOLL_TRAP is not set
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_VIRTIO_NET=m
-CONFIG_VMXNET3=m
-CONFIG_ISDN=y
-CONFIG_ISDN_I4L=m
-CONFIG_MISDN=m
-CONFIG_MISDN_DSP=m
-CONFIG_MISDN_L1OIP=m
-
-#
-# mISDN hardware drivers
-#
-CONFIG_MISDN_HFCPCI=m
-CONFIG_MISDN_HFCMULTI=m
-CONFIG_MISDN_HFCUSB=m
-CONFIG_MISDN_AVMFRITZ=m
-CONFIG_MISDN_SPEEDFAX=m
-CONFIG_MISDN_INFINEON=m
-CONFIG_MISDN_W6692=m
-CONFIG_MISDN_NETJET=m
-CONFIG_MISDN_IPAC=m
-CONFIG_MISDN_ISAR=m
-CONFIG_ISDN_PPP=y
-CONFIG_ISDN_PPP_VJ=y
-CONFIG_ISDN_MPP=y
-CONFIG_IPPP_FILTER=y
-CONFIG_ISDN_PPP_BSDCOMP=m
-CONFIG_ISDN_AUDIO=y
-CONFIG_ISDN_TTY_FAX=y
-
-#
-# ISDN feature submodules
-#
-CONFIG_ISDN_DIVERSION=m
-
-#
-# ISDN4Linux hardware drivers
-#
-
-#
-# Passive cards
-#
-CONFIG_ISDN_DRV_HISAX=m
-
-#
-# D-channel protocol features
-#
-CONFIG_HISAX_EURO=y
-CONFIG_DE_AOC=y
-CONFIG_HISAX_NO_SENDCOMPLETE=y
-CONFIG_HISAX_NO_LLC=y
-CONFIG_HISAX_NO_KEYPAD=y
-CONFIG_HISAX_1TR6=y
-CONFIG_HISAX_NI1=y
-CONFIG_HISAX_MAX_CARDS=8
-
-#
-# HiSax supported cards
-#
-CONFIG_HISAX_16_3=y
-CONFIG_HISAX_TELESPCI=y
-CONFIG_HISAX_S0BOX=y
-CONFIG_HISAX_FRITZPCI=y
-CONFIG_HISAX_AVM_A1_PCMCIA=y
-CONFIG_HISAX_ELSA=y
-CONFIG_HISAX_DIEHLDIVA=y
-CONFIG_HISAX_SEDLBAUER=y
-CONFIG_HISAX_NETJET=y
-CONFIG_HISAX_NETJET_U=y
-CONFIG_HISAX_NICCY=y
-CONFIG_HISAX_BKM_A4T=y
-CONFIG_HISAX_SCT_QUADRO=y
-CONFIG_HISAX_GAZEL=y
-CONFIG_HISAX_HFC_PCI=y
-CONFIG_HISAX_W6692=y
-CONFIG_HISAX_HFC_SX=y
-CONFIG_HISAX_ENTERNOW_PCI=y
-# CONFIG_HISAX_DEBUG is not set
-
-#
-# HiSax PCMCIA card service modules
-#
-CONFIG_HISAX_SEDLBAUER_CS=m
-CONFIG_HISAX_ELSA_CS=m
-CONFIG_HISAX_AVM_A1_CS=m
-CONFIG_HISAX_TELES_CS=m
-
-#
-# HiSax sub driver modules
-#
-CONFIG_HISAX_ST5481=m
-CONFIG_HISAX_HFCUSB=m
-CONFIG_HISAX_HFC4S8S=m
-CONFIG_HISAX_FRITZ_PCIPNP=m
-
-#
-# Active cards
-#
-CONFIG_HYSDN=m
-CONFIG_HYSDN_CAPI=y
-CONFIG_ISDN_HDLC=m
-CONFIG_ISDN_CAPI=m
-CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
-CONFIG_CAPI_TRACE=y
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
-CONFIG_ISDN_CAPI_CAPIFS=m
-CONFIG_ISDN_CAPI_CAPIDRV=m
-
-#
-# CAPI hardware drivers
-#
-CONFIG_CAPI_AVM=y
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-CONFIG_CAPI_EICON=y
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS_USERIDI=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DRV_GIGASET=m
-# CONFIG_GIGASET_CAPI is not set
-CONFIG_GIGASET_I4L=y
-# CONFIG_GIGASET_DUMMYLL is not set
-CONFIG_GIGASET_BASE=m
-CONFIG_GIGASET_M105=m
-# CONFIG_GIGASET_M101 is not set
-# CONFIG_GIGASET_DEBUG is not set
-CONFIG_PHONE=m
-CONFIG_PHONE_IXJ=m
-CONFIG_PHONE_IXJ_PCMCIA=m
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-CONFIG_INPUT_FF_MEMLESS=y
-CONFIG_INPUT_POLLDEV=m
-CONFIG_INPUT_SPARSEKMAP=m
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ADP5588=m
-CONFIG_KEYBOARD_ATKBD=y
-CONFIG_QT2160=m
-# CONFIG_KEYBOARD_LKKBD is not set
-CONFIG_KEYBOARD_GPIO=m
-CONFIG_KEYBOARD_MATRIX=m
-CONFIG_KEYBOARD_LM8323=m
-CONFIG_KEYBOARD_MAX7359=m
-# CONFIG_KEYBOARD_NEWTON is not set
-CONFIG_KEYBOARD_OPENCORES=m
-CONFIG_KEYBOARD_STOWAWAY=m
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=m
-CONFIG_MOUSE_PS2_ALPS=y
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
-CONFIG_MOUSE_PS2_LIFEBOOK=y
-CONFIG_MOUSE_PS2_TRACKPOINT=y
-# CONFIG_MOUSE_PS2_ELANTECH is not set
-CONFIG_MOUSE_PS2_SENTELIC=y
-CONFIG_MOUSE_PS2_TOUCHKIT=y
-CONFIG_MOUSE_SERIAL=m
-CONFIG_MOUSE_APPLETOUCH=m
-CONFIG_MOUSE_BCM5974=m
-CONFIG_MOUSE_VSXXXAA=m
-CONFIG_MOUSE_GPIO=m
-CONFIG_MOUSE_SYNAPTICS_I2C=m
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_JOYSTICK_ANALOG=m
-CONFIG_JOYSTICK_A3D=m
-CONFIG_JOYSTICK_ADI=m
-CONFIG_JOYSTICK_COBRA=m
-CONFIG_JOYSTICK_GF2K=m
-CONFIG_JOYSTICK_GRIP=m
-CONFIG_JOYSTICK_GRIP_MP=m
-CONFIG_JOYSTICK_GUILLEMOT=m
-CONFIG_JOYSTICK_INTERACT=m
-CONFIG_JOYSTICK_SIDEWINDER=m
-CONFIG_JOYSTICK_TMDC=m
-CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
-CONFIG_JOYSTICK_WARRIOR=m
-CONFIG_JOYSTICK_MAGELLAN=m
-CONFIG_JOYSTICK_SPACEORB=m
-CONFIG_JOYSTICK_SPACEBALL=m
-CONFIG_JOYSTICK_STINGER=m
-CONFIG_JOYSTICK_TWIDJOY=m
-CONFIG_JOYSTICK_ZHENHUA=m
-CONFIG_JOYSTICK_DB9=m
-CONFIG_JOYSTICK_GAMECON=m
-CONFIG_JOYSTICK_TURBOGRAFX=m
-CONFIG_JOYSTICK_JOYDUMP=m
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-# CONFIG_JOYSTICK_WALKERA0701 is not set
-CONFIG_INPUT_TABLET=y
-CONFIG_TABLET_USB_ACECAD=m
-CONFIG_TABLET_USB_AIPTEK=m
-CONFIG_TABLET_USB_GTCO=m
-CONFIG_TABLET_USB_KBTAB=m
-CONFIG_TABLET_USB_WACOM=m
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_AD7879_I2C=m
-CONFIG_TOUCHSCREEN_AD7879=m
-CONFIG_TOUCHSCREEN_DYNAPRO=m
-CONFIG_TOUCHSCREEN_EETI=m
-CONFIG_TOUCHSCREEN_FUJITSU=m
-CONFIG_TOUCHSCREEN_GUNZE=m
-CONFIG_TOUCHSCREEN_ELO=m
-CONFIG_TOUCHSCREEN_WACOM_W8001=m
-CONFIG_TOUCHSCREEN_MCS5000=m
-CONFIG_TOUCHSCREEN_MTOUCH=m
-CONFIG_TOUCHSCREEN_INEXIO=m
-CONFIG_TOUCHSCREEN_MK712=m
-CONFIG_TOUCHSCREEN_PENMOUNT=m
-CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
-CONFIG_TOUCHSCREEN_TOUCHWIN=m
-CONFIG_TOUCHSCREEN_UCB1400=m
-CONFIG_TOUCHSCREEN_WM97XX=m
-CONFIG_TOUCHSCREEN_WM9705=y
-CONFIG_TOUCHSCREEN_WM9712=y
-CONFIG_TOUCHSCREEN_WM9713=y
-CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-CONFIG_TOUCHSCREEN_USB_EGALAX=y
-CONFIG_TOUCHSCREEN_USB_PANJIT=y
-CONFIG_TOUCHSCREEN_USB_3M=y
-CONFIG_TOUCHSCREEN_USB_ITM=y
-CONFIG_TOUCHSCREEN_USB_ETURBO=y
-CONFIG_TOUCHSCREEN_USB_GUNZE=y
-CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
-CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
-CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
-CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
-CONFIG_TOUCHSCREEN_USB_GOTOP=y
-CONFIG_TOUCHSCREEN_USB_JASTEC=y
-CONFIG_TOUCHSCREEN_USB_E2I=y
-CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
-CONFIG_TOUCHSCREEN_USB_ETT_TC5UH=y
-CONFIG_TOUCHSCREEN_TOUCHIT213=m
-CONFIG_TOUCHSCREEN_TSC2007=m
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_APANEL=m
-CONFIG_INPUT_ATLAS_BTNS=m
-CONFIG_INPUT_ATI_REMOTE=m
-CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_INPUT_KEYSPAN_REMOTE=m
-CONFIG_INPUT_POWERMATE=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INPUT_CM109=m
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_WINBOND_CIR=m
-CONFIG_INPUT_PCF50633_PMU=m
-CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=m
-CONFIG_SERIO_CT82C710=m
-CONFIG_SERIO_PARKBD=m
-CONFIG_SERIO_PCIPS2=m
-CONFIG_SERIO_LIBPS2=y
-CONFIG_SERIO_RAW=m
-CONFIG_SERIO_ALTERA_PS2=m
-CONFIG_GAMEPORT=m
-CONFIG_GAMEPORT_NS558=m
-CONFIG_GAMEPORT_L4=m
-CONFIG_GAMEPORT_EMU10K1=m
-CONFIG_GAMEPORT_FM801=m
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_DEVKMEM=y
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_COMPUTONE=m
-CONFIG_ROCKETPORT=m
-CONFIG_CYCLADES=m
-# CONFIG_CYZ_INTR is not set
-CONFIG_DIGIEPCA=m
-CONFIG_MOXA_INTELLIO=m
-CONFIG_MOXA_SMARTIO=m
-CONFIG_ISI=m
-CONFIG_SYNCLINK=m
-CONFIG_SYNCLINKMP=m
-CONFIG_SYNCLINK_GT=m
-CONFIG_N_HDLC=m
-CONFIG_RISCOM8=m
-CONFIG_SPECIALIX=m
-CONFIG_STALDRV=y
-CONFIG_STALLION=m
-CONFIG_ISTALLION=m
-CONFIG_NOZOMI=m
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_PNP=y
-CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_MANY_PORTS=y
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-CONFIG_SERIAL_8250_DETECT_IRQ=y
-CONFIG_SERIAL_8250_RSA=y
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_JSM=m
-CONFIG_UNIX98_PTYS=y
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=32
-CONFIG_PRINTER=m
-CONFIG_LP_CONSOLE=y
-CONFIG_PPDEV=m
-CONFIG_HVC_DRIVER=y
-CONFIG_VIRTIO_CONSOLE=m
-CONFIG_IPMI_HANDLER=m
-# CONFIG_IPMI_PANIC_EVENT is not set
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
-CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_INTEL=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_VIA=m
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_NVRAM=m
-CONFIG_R3964=m
-CONFIG_APPLICOM=m
-
-#
-# PCMCIA character devices
-#
-CONFIG_SYNCLINK_CS=m
-CONFIG_CARDMAN_4000=m
-CONFIG_CARDMAN_4040=m
-CONFIG_IPWIRELESS=m
-CONFIG_MWAVE=m
-CONFIG_PC8736x_GPIO=m
-CONFIG_NSC_GPIO=m
-CONFIG_RAW_DRIVER=m
-CONFIG_MAX_RAW_DEVS=256
-CONFIG_HPET=y
-CONFIG_HPET_MMAP=y
-CONFIG_HANGCHECK_TIMER=m
-CONFIG_TCG_TPM=m
-# CONFIG_TCG_TIS is not set
-# CONFIG_TCG_NSC is not set
-CONFIG_TCG_ATMEL=m
-# CONFIG_TCG_INFINEON is not set
-CONFIG_TELCLOCK=m
-CONFIG_DEVPORT=y
-CONFIG_I2C=m
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCA=m
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# PC SMBus host controller drivers
-#
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD756_S4882=m
-CONFIG_I2C_AMD8111=m
-CONFIG_I2C_I801=m
-CONFIG_I2C_ISCH=m
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_NFORCE2_S4985=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-
-#
-# ACPI drivers
-#
-CONFIG_I2C_SCMI=m
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-CONFIG_I2C_GPIO=m
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_SIMTEC=m
-
-#
-# External I2C/SMBus adapter drivers
-#
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-
-#
-# Other I2C/SMBus bus drivers
-#
-CONFIG_I2C_PCA_PLATFORM=m
-CONFIG_I2C_STUB=m
-
-#
-# Miscellaneous I2C Chip support
-#
-CONFIG_SENSORS_TSL2550=m
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
-# CONFIG_SPI is not set
-
-#
-# PPS support
-#
-CONFIG_PPS=m
-# CONFIG_PPS_DEBUG is not set
-CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-CONFIG_GPIOLIB=y
-# CONFIG_DEBUG_GPIO is not set
-CONFIG_GPIO_SYSFS=y
-
-#
-# Memory mapped GPIO expanders:
-#
-
-#
-# I2C GPIO expanders:
-#
-CONFIG_GPIO_MAX732X=m
-CONFIG_GPIO_PCA953X=m
-CONFIG_GPIO_PCF857X=m
-CONFIG_GPIO_ADP5588=m
-
-#
-# PCI GPIO expanders:
-#
-CONFIG_GPIO_CS5535=m
-# CONFIG_GPIO_LANGWELL is not set
-
-#
-# SPI GPIO expanders:
-#
-
-#
-# AC97 GPIO expanders:
-#
-# CONFIG_GPIO_UCB1400 is not set
-CONFIG_W1=m
-CONFIG_W1_CON=y
-
-#
-# 1-wire Bus Masters
-#
-CONFIG_W1_MASTER_MATROX=m
-CONFIG_W1_MASTER_DS2490=m
-CONFIG_W1_MASTER_DS2482=m
-CONFIG_W1_MASTER_GPIO=m
-
-#
-# 1-wire Slaves
-#
-CONFIG_W1_SLAVE_THERM=m
-CONFIG_W1_SLAVE_SMEM=m
-CONFIG_W1_SLAVE_DS2431=m
-CONFIG_W1_SLAVE_DS2433=m
-CONFIG_W1_SLAVE_DS2433_CRC=y
-CONFIG_W1_SLAVE_DS2760=m
-CONFIG_W1_SLAVE_BQ27000=m
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-CONFIG_PDA_POWER=m
-CONFIG_WM8350_POWER=m
-CONFIG_BATTERY_DS2760=m
-CONFIG_BATTERY_DS2782=m
-CONFIG_BATTERY_BQ27x00=m
-CONFIG_BATTERY_MAX17040=m
-CONFIG_CHARGER_PCF50633=m
-CONFIG_HWMON=m
-CONFIG_HWMON_VID=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-CONFIG_SENSORS_ABITUGURU=m
-CONFIG_SENSORS_ABITUGURU3=m
-CONFIG_SENSORS_AD7414=m
-CONFIG_SENSORS_AD7418=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1029=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_ADT7462=m
-CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7473=m
-CONFIG_SENSORS_ADT7475=m
-CONFIG_SENSORS_K8TEMP=m
-CONFIG_SENSORS_K10TEMP=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_I5K_AMB=m
-CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_F71882FG=m
-CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_FSCHMD=m
-CONFIG_SENSORS_G760A=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_CORETEMP=m
-CONFIG_SENSORS_IBMAEM=m
-CONFIG_SENSORS_IBMPEX=m
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM73=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_LM93=m
-CONFIG_SENSORS_LTC4215=m
-CONFIG_SENSORS_LTC4245=m
-CONFIG_SENSORS_LM95241=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX6650=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_PC87427=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_SENSORS_SHT15=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_DME1737=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_SMSC47M192=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_ADS7828=m
-CONFIG_SENSORS_AMC6821=m
-CONFIG_SENSORS_THMC50=m
-CONFIG_SENSORS_TMP401=m
-CONFIG_SENSORS_TMP421=m
-CONFIG_SENSORS_VIA_CPUTEMP=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_VT1211=m
-CONFIG_SENSORS_VT8231=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83791D=m
-CONFIG_SENSORS_W83792D=m
-CONFIG_SENSORS_W83793=m
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83L786NG=m
-CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_W83627EHF=m
-CONFIG_SENSORS_WM8350=m
-CONFIG_SENSORS_HDAPS=m
-CONFIG_SENSORS_LIS3_I2C=m
-CONFIG_SENSORS_APPLESMC=m
-
-#
-# ACPI drivers
-#
-CONFIG_SENSORS_ATK0110=m
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_THERMAL=m
-CONFIG_THERMAL_HWMON=y
-CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_WM8350_WATCHDOG=m
-CONFIG_ACQUIRE_WDT=m
-CONFIG_ADVANTECH_WDT=m
-CONFIG_ALIM1535_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_GEODE_WDT=m
-CONFIG_SC520_WDT=m
-CONFIG_SBC_FITPC2_WATCHDOG=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
-CONFIG_WAFER_WDT=m
-CONFIG_I6300ESB_WDT=m
-CONFIG_ITCO_WDT=m
-CONFIG_ITCO_VENDOR_SUPPORT=y
-CONFIG_IT8712F_WDT=m
-CONFIG_IT87_WDT=m
-CONFIG_HP_WATCHDOG=m
-CONFIG_SC1200_WDT=m
-CONFIG_PC87413_WDT=m
-CONFIG_60XX_WDT=m
-CONFIG_SBC8360_WDT=m
-CONFIG_CPU5_WDT=m
-CONFIG_SMSC_SCH311X_WDT=m
-CONFIG_SMSC37B787_WDT=m
-CONFIG_W83627HF_WDT=m
-CONFIG_W83697HF_WDT=m
-CONFIG_W83697UG_WDT=m
-CONFIG_W83877F_WDT=m
-CONFIG_W83977F_WDT=m
-CONFIG_MACHZ_WDT=m
-CONFIG_SBC_EPX_C3_WATCHDOG=m
-
-#
-# PCI-based Watchdog Cards
-#
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_WDTPCI=m
-
-#
-# USB-based Watchdog Cards
-#
-CONFIG_USBPCWATCHDOG=m
-CONFIG_SSB_POSSIBLE=y
-
-#
-# Sonics Silicon Backplane
-#
-CONFIG_SSB=m
-CONFIG_SSB_SPROM=y
-CONFIG_SSB_BLOCKIO=y
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-CONFIG_SSB_SDIOHOST=y
-# CONFIG_SSB_DEBUG is not set
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
-
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_CORE=m
-# CONFIG_MFD_SM501 is not set
-CONFIG_HTC_PASIC3=m
-CONFIG_UCB1400_CORE=m
-CONFIG_TPS65010=m
-# CONFIG_MFD_TMIO is not set
-CONFIG_MFD_WM8400=m
-CONFIG_MFD_WM8350=m
-CONFIG_MFD_WM8350_I2C=m
-CONFIG_MFD_PCF50633=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-CONFIG_AB3100_CORE=m
-CONFIG_AB3100_OTP=m
-# CONFIG_REGULATOR is not set
-CONFIG_MEDIA_SUPPORT=m
-
-#
-# Multimedia core support
-#
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_COMMON=m
-CONFIG_VIDEO_ALLOW_V4L1=y
-CONFIG_VIDEO_V4L1_COMPAT=y
-CONFIG_DVB_CORE=m
-CONFIG_VIDEO_MEDIA=m
-
-#
-# Multimedia drivers
-#
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_IR_CORE=m
-CONFIG_VIDEO_IR=m
-CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=m
-# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_V4L1=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_VIDEO_CAPTURE_DRIVERS=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# Encoders/decoders and other helper chips
-#
-
-#
-# Audio decoders
-#
-CONFIG_VIDEO_TVAUDIO=m
-CONFIG_VIDEO_TDA7432=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TDA9875=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS5345=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_M52790=m
-CONFIG_VIDEO_TLV320AIC23B=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_VP27SMPX=m
-
-#
-# RDS decoders
-#
-CONFIG_VIDEO_SAA6588=m
-
-#
-# Video decoders
-#
-CONFIG_VIDEO_ADV7180=m
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_TCM825X=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_SAA717X=m
-CONFIG_VIDEO_SAA7191=m
-CONFIG_VIDEO_TVP514X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_VPX3220=m
-
-#
-# Video and audio decoders
-#
-CONFIG_VIDEO_CX25840=m
-
-#
-# MPEG video encoders
-#
-CONFIG_VIDEO_CX2341X=m
-
-#
-# Video encoders
-#
-CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-CONFIG_VIDEO_THS7303=m
-CONFIG_VIDEO_ADV7343=m
-
-#
-# Video improvement chips
-#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-CONFIG_VIDEO_VIVI=m
-CONFIG_VIDEO_BT848=m
-CONFIG_VIDEO_BT848_DVB=y
-CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_W9966=m
-CONFIG_VIDEO_CPIA=m
-CONFIG_VIDEO_CPIA_PP=m
-CONFIG_VIDEO_CPIA_USB=m
-CONFIG_VIDEO_CPIA2=m
-CONFIG_VIDEO_SAA5246A=m
-CONFIG_VIDEO_SAA5249=m
-CONFIG_VIDEO_STRADIS=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_SAA7164=m
-CONFIG_VIDEO_CAFE_CCIC=m
-CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_MT9M001=m
-CONFIG_SOC_CAMERA_MT9M111=m
-CONFIG_SOC_CAMERA_MT9T031=m
-CONFIG_SOC_CAMERA_MT9T112=m
-CONFIG_SOC_CAMERA_MT9V022=m
-CONFIG_SOC_CAMERA_RJ54N1=m
-CONFIG_SOC_CAMERA_TW9910=m
-CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_SOC_CAMERA_OV772X=m
-CONFIG_SOC_CAMERA_OV9640=m
-CONFIG_V4L_USB_DRIVERS=y
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_GSPCA=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GL860=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SN9C20X_EVDEV=y
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_ZC3XX=m
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_PVRUSB2_DVB=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_USBVIDEO=m
-CONFIG_USB_VICAM=m
-CONFIG_USB_IBMCAM=m
-CONFIG_USB_KONICAWC=m
-CONFIG_USB_QUICKCAM_MESSENGER=m
-CONFIG_USB_ET61X251=m
-CONFIG_VIDEO_OVCAMCHIP=m
-CONFIG_USB_W9968CF=m
-CONFIG_USB_OV511=m
-CONFIG_USB_SE401=m
-CONFIG_USB_SN9C102=m
-CONFIG_USB_STV680=m
-CONFIG_USB_ZC0301=m
-CONFIG_USB_PWC=m
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_GEMTEK_PCI=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_MAESTRO=m
-CONFIG_I2C_SI4713=m
-CONFIG_RADIO_SI4713=m
-CONFIG_USB_DSBR=m
-# CONFIG_RADIO_SI470X is not set
-CONFIG_USB_MR800=m
-CONFIG_RADIO_TEA5764=m
-CONFIG_RADIO_TEF6862=m
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-CONFIG_DVB_CAPTURE_DRIVERS=y
-
-#
-# Supported SAA7146 based PCI Adapters
-#
-CONFIG_TTPCI_EEPROM=m
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
-
-#
-# Supported USB Adapters
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_FRIIO=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_SIANO_MDTV=m
-
-#
-# Siano module components
-#
-CONFIG_SMS_USB_DRV=m
-CONFIG_SMS_SDIO_DRV=m
-
-#
-# Supported FlexCopII (B2C2) Adapters
-#
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
-
-#
-# Supported BT878 Adapters
-#
-CONFIG_DVB_BT8XX=m
-
-#
-# Supported Pluto2 Adapters
-#
-CONFIG_DVB_PLUTO2=m
-
-#
-# Supported SDMC DM1105 Adapters
-#
-CONFIG_DVB_DM1105=m
-
-#
-# Supported FireWire (IEEE 1394) Adapters
-#
-CONFIG_DVB_FIREDTV=m
-# CONFIG_DVB_FIREDTV_FIREWIRE is not set
-CONFIG_DVB_FIREDTV_IEEE1394=y
-CONFIG_DVB_FIREDTV_INPUT=y
-
-#
-# Supported Earthsoft PT1 Adapters
-#
-CONFIG_DVB_PT1=m
-
-#
-# Supported Mantis Adapters
-#
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
-
-#
-# Supported DVB Frontends
-#
-CONFIG_DVB_FE_CUSTOMISE=y
-
-#
-# Customise DVB Frontends
-#
-
-#
-# Multistandard (satellite) frontends
-#
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV6110x=m
-
-#
-# DVB-S (satellite) frontends
-#
-CONFIG_DVB_CX24110=m
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_SI21XX=m
-CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=m
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-CONFIG_DVB_DRX397XD=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_EC100=m
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_OR51211=m
-CONFIG_DVB_OR51132=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3304=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_S5H1411=m
-
-#
-# ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_S921=m
-CONFIG_DVB_DIB8000=m
-
-#
-# Digital terrestrial only tuners/PLL
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-
-#
-# SEC control devices for DVB-S
-#
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_LGS8GL5=m
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-
-#
-# Tools to develop new frontends
-#
-# CONFIG_DVB_DUMMY_FE is not set
-CONFIG_DAB=y
-CONFIG_USB_DABUSB=m
-
-#
-# Graphics support
-#
-CONFIG_AGP=m
-CONFIG_AGP_AMD64=m
-CONFIG_AGP_INTEL=m
-CONFIG_AGP_SIS=m
-CONFIG_AGP_VIA=m
-CONFIG_VGA_ARB=y
-CONFIG_DRM=m
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM_TTM=m
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-# CONFIG_DRM_RADEON_KMS is not set
-CONFIG_DRM_I810=m
-CONFIG_DRM_I830=m
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_KMS=y
-CONFIG_DRM_MGA=m
-CONFIG_DRM_SIS=m
-CONFIG_DRM_VIA=m
-CONFIG_DRM_SAVAGE=m
-CONFIG_VGASTATE=m
-CONFIG_VIDEO_OUTPUT_CONTROL=m
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
-CONFIG_FB_DDC=m
-CONFIG_FB_BOOT_VESA_SUPPORT=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_DEFERRED_IO=y
-CONFIG_FB_HECUBA=m
-CONFIG_FB_SVGALIB=m
-# CONFIG_FB_MACMODES is not set
-CONFIG_FB_BACKLIGHT=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-
-#
-# Frame buffer hardware drivers
-#
-CONFIG_FB_CIRRUS=m
-CONFIG_FB_PM2=m
-# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
-CONFIG_FB_CYBER2000=m
-CONFIG_FB_ARC=m
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-# CONFIG_FB_UVESA is not set
-CONFIG_FB_VESA=y
-# CONFIG_FB_EFI is not set
-CONFIG_FB_N411=m
-CONFIG_FB_HGA=m
-# CONFIG_FB_HGA_ACCEL is not set
-CONFIG_FB_S1D13XXX=m
-CONFIG_FB_NVIDIA=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_NVIDIA_DEBUG is not set
-CONFIG_FB_NVIDIA_BACKLIGHT=y
-CONFIG_FB_RIVA=m
-CONFIG_FB_RIVA_I2C=y
-# CONFIG_FB_RIVA_DEBUG is not set
-CONFIG_FB_RIVA_BACKLIGHT=y
-CONFIG_FB_LE80578=m
-CONFIG_FB_CARILLO_RANCH=m
-CONFIG_FB_MATROX=m
-CONFIG_FB_MATROX_MILLENIUM=y
-CONFIG_FB_MATROX_MYSTIQUE=y
-CONFIG_FB_MATROX_G=y
-CONFIG_FB_MATROX_I2C=m
-CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_RADEON=m
-CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_RADEON_BACKLIGHT=y
-# CONFIG_FB_RADEON_DEBUG is not set
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY128_BACKLIGHT=y
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_ATY_GX=y
-CONFIG_FB_ATY_BACKLIGHT=y
-CONFIG_FB_S3=m
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_SIS=m
-CONFIG_FB_SIS_300=y
-CONFIG_FB_SIS_315=y
-CONFIG_FB_VIA=m
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=m
-# CONFIG_FB_3DFX_ACCEL is not set
-CONFIG_FB_3DFX_I2C=y
-CONFIG_FB_VOODOO1=m
-CONFIG_FB_VT8623=m
-CONFIG_FB_TRIDENT=m
-CONFIG_FB_ARK=m
-CONFIG_FB_PM3=m
-CONFIG_FB_CARMINE=m
-CONFIG_FB_CARMINE_DRAM_EVAL=y
-# CONFIG_CARMINE_DRAM_CUSTOM is not set
-CONFIG_FB_GEODE=y
-CONFIG_FB_GEODE_LX=m
-CONFIG_FB_GEODE_GX=m
-CONFIG_FB_GEODE_GX1=m
-CONFIG_FB_TMIO=m
-CONFIG_FB_TMIO_ACCELL=y
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_FB_METRONOME=m
-CONFIG_FB_MB862XX=m
-CONFIG_FB_MB862XX_PCI_GDC=y
-CONFIG_FB_BROADSHEET=m
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=m
-# CONFIG_LCD_ILI9320 is not set
-CONFIG_LCD_PLATFORM=m
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_GENERIC=m
-CONFIG_BACKLIGHT_PROGEAR=m
-CONFIG_BACKLIGHT_CARILLO_RANCH=m
-CONFIG_BACKLIGHT_MBP_NVIDIA=m
-CONFIG_BACKLIGHT_SAHARA=m
-
-#
-# Display device support
-#
-CONFIG_DISPLAY_SUPPORT=m
-
-#
-# Display hardware drivers
-#
-
-#
-# Console display driver support
-#
-CONFIG_VGA_CONSOLE=y
-CONFIG_VGACON_SOFT_SCROLLBACK=y
-CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
-CONFIG_SOUND=m
-CONFIG_SOUND_OSS_CORE=y
-CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_JACK=y
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCM_OSS_PLUGINS=y
-CONFIG_SND_SEQUENCER_OSS=y
-CONFIG_SND_HRTIMER=m
-CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
-CONFIG_SND_DYNAMIC_MINORS=y
-# CONFIG_SND_SUPPORT_OLD_API is not set
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_VMASTER=y
-CONFIG_SND_DMA_SGBUF=y
-CONFIG_SND_RAWMIDI_SEQ=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-# CONFIG_SND_OPL4_LIB_SEQ is not set
-# CONFIG_SND_SBAWE_SEQ is not set
-CONFIG_SND_EMU10K1_SEQ=m
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_DRIVERS=y
-# CONFIG_SND_PCSP is not set
-CONFIG_SND_DUMMY=m
-CONFIG_SND_VIRMIDI=m
-CONFIG_SND_MTPAV=m
-CONFIG_SND_MTS64=m
-CONFIG_SND_SERIAL_U16550=m
-CONFIG_SND_MPU401=m
-CONFIG_SND_PORTMAN2X4=m
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
-CONFIG_SND_SB_COMMON=m
-CONFIG_SND_SB16_DSP=m
-CONFIG_SND_PCI=y
-CONFIG_SND_AD1889=m
-CONFIG_SND_ALS300=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AW2=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BT87X=m
-# CONFIG_SND_BT87X_OVERCLOCK is not set
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_OXYGEN_LIB=m
-CONFIG_SND_OXYGEN=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CS5530=m
-CONFIG_SND_CS5535AUDIO=m
-CONFIG_SND_CTXFI=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MIA=m
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_INDIGOIOX=m
-CONFIG_SND_INDIGODJX=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_EMU10K1X=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968=m
-CONFIG_SND_FM801=m
-CONFIG_SND_FM801_TEA575X_BOOL=y
-CONFIG_SND_FM801_TEA575X=m
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA_HWDEP=y
-CONFIG_SND_HDA_RECONFIG=y
-# CONFIG_SND_HDA_INPUT_BEEP is not set
-CONFIG_SND_HDA_INPUT_JACK=y
-CONFIG_SND_HDA_PATCH_LOADER=y
-CONFIG_SND_HDA_CODEC_REALTEK=y
-CONFIG_SND_HDA_CODEC_ANALOG=y
-CONFIG_SND_HDA_CODEC_SIGMATEL=y
-CONFIG_SND_HDA_CODEC_VIA=y
-CONFIG_SND_HDA_CODEC_ATIHDMI=y
-CONFIG_SND_HDA_CODEC_NVHDMI=y
-CONFIG_SND_HDA_CODEC_INTELHDMI=y
-CONFIG_SND_HDA_ELD=y
-CONFIG_SND_HDA_CODEC_CIRRUS=y
-CONFIG_SND_HDA_CODEC_CONEXANT=y
-CONFIG_SND_HDA_CODEC_CA0110=y
-CONFIG_SND_HDA_CODEC_CMEDIA=y
-CONFIG_SND_HDA_CODEC_SI3054=y
-CONFIG_SND_HDA_GENERIC=y
-# CONFIG_SND_HDA_POWER_SAVE is not set
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
-CONFIG_SND_HIFIER=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_LX6464ES=m
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-CONFIG_SND_PCXHR=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VIRTUOSO=m
-CONFIG_SND_VX222=m
-CONFIG_SND_YMFPCI=m
-CONFIG_SND_USB=y
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_USX2Y=m
-CONFIG_SND_USB_CAIAQ=m
-CONFIG_SND_USB_CAIAQ_INPUT=y
-CONFIG_SND_USB_US122L=m
-CONFIG_SND_PCMCIA=y
-CONFIG_SND_VXPOCKET=m
-CONFIG_SND_PDAUDIOCF=m
-# CONFIG_SND_SOC is not set
-# CONFIG_SOUND_PRIME is not set
-CONFIG_AC97_BUS=m
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=m
-CONFIG_HIDRAW=y
-
-#
-# USB Input Devices
-#
-CONFIG_USB_HID=m
-CONFIG_HID_PID=y
-CONFIG_USB_HIDDEV=y
-
-#
-# Special HID drivers
-#
-CONFIG_HID_A4TECH=m
-CONFIG_HID_APPLE=m
-CONFIG_HID_BELKIN=m
-CONFIG_HID_CHERRY=m
-CONFIG_HID_CHICONY=m
-CONFIG_HID_CYPRESS=m
-CONFIG_HID_DRAGONRISE=m
-CONFIG_DRAGONRISE_FF=y
-CONFIG_HID_EZKEY=m
-CONFIG_HID_KYE=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_KENSINGTON=m
-CONFIG_HID_LOGITECH=m
-CONFIG_LOGITECH_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_HID_MICROSOFT=m
-CONFIG_HID_MONTEREY=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_PANTHERLORD_FF=y
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_SAMSUNG=m
-CONFIG_HID_SONY=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_GREENASIA=m
-CONFIG_GREENASIA_FF=y
-CONFIG_HID_SMARTJOYPLUS=m
-CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_HID_TOPSEED=m
-CONFIG_HID_THRUSTMASTER=m
-CONFIG_THRUSTMASTER_FF=y
-CONFIG_HID_WACOM=m
-CONFIG_HID_ZEROPLUS=m
-CONFIG_ZEROPLUS_FF=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB=y
-# CONFIG_USB_DEBUG is not set
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEVICEFS=y
-CONFIG_USB_DEVICE_CLASS=y
-# CONFIG_USB_DYNAMIC_MINORS is not set
-CONFIG_USB_SUSPEND=y
-# CONFIG_USB_OTG is not set
-CONFIG_USB_MON=y
-CONFIG_USB_WUSB=m
-CONFIG_USB_WUSB_CBAF=m
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_C67X00_HCD=y
-CONFIG_USB_XHCI_HCD=y
-# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_OXU210HP_HCD=y
-CONFIG_USB_ISP116X_HCD=y
-CONFIG_USB_ISP1760_HCD=y
-CONFIG_USB_ISP1362_HCD=y
-CONFIG_USB_OHCI_HCD=y
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_UHCI_HCD=y
-CONFIG_USB_U132_HCD=m
-CONFIG_USB_SL811_HCD=y
-CONFIG_USB_SL811_CS=m
-CONFIG_USB_R8A66597_HCD=y
-CONFIG_USB_WHCI_HCD=m
-CONFIG_USB_HWA_HCD=m
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_WDM=m
-CONFIG_USB_TMC=m
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=y
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_DATAFAB=y
-CONFIG_USB_STORAGE_FREECOM=y
-CONFIG_USB_STORAGE_ISD200=y
-CONFIG_USB_STORAGE_USBAT=y
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_JUMPSHOT=y
-CONFIG_USB_STORAGE_ALAUDA=y
-CONFIG_USB_STORAGE_ONETOUCH=y
-CONFIG_USB_STORAGE_KARMA=y
-CONFIG_USB_STORAGE_CYPRESS_ATACB=y
-# CONFIG_USB_LIBUSUAL is not set
-
-#
-# USB Imaging devices
-#
-CONFIG_USB_MDC800=m
-CONFIG_USB_MICROTEK=m
-
-#
-# USB port drivers
-#
-CONFIG_USB_USS720=m
-CONFIG_USB_SERIAL=m
-CONFIG_USB_EZUSB=y
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_FUNSOFT=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MOTOROLA=m
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_HP4X=m
-CONFIG_USB_SERIAL_SAFE=m
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-CONFIG_USB_SERIAL_SIEMENS_MPI=m
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_DEBUG=m
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_EMI62=m
-CONFIG_USB_EMI26=m
-CONFIG_USB_ADUTUX=m
-CONFIG_USB_SEVSEG=m
-CONFIG_USB_RIO500=m
-CONFIG_USB_LEGOTOWER=m
-CONFIG_USB_LCD=m
-CONFIG_USB_BERRY_CHARGE=m
-CONFIG_USB_LED=m
-CONFIG_USB_CYPRESS_CY7C63=m
-CONFIG_USB_CYTHERM=m
-CONFIG_USB_IDMOUSE=m
-CONFIG_USB_FTDI_ELAN=m
-CONFIG_USB_APPLEDISPLAY=m
-CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
-CONFIG_USB_LD=m
-CONFIG_USB_TRANCEVIBRATOR=m
-CONFIG_USB_IOWARRIOR=m
-CONFIG_USB_TEST=m
-CONFIG_USB_ISIGHTFW=m
-CONFIG_USB_VST=m
-CONFIG_USB_ATM=m
-CONFIG_USB_SPEEDTOUCH=m
-CONFIG_USB_CXACRU=m
-CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_XUSBATM=m
-# CONFIG_USB_GADGET is not set
-
-#
-# OTG and related infrastructure
-#
-CONFIG_USB_OTG_UTILS=y
-CONFIG_USB_GPIO_VBUS=m
-CONFIG_NOP_USB_XCEIV=m
-CONFIG_UWB=m
-CONFIG_UWB_HWA=m
-CONFIG_UWB_WHCI=m
-CONFIG_UWB_WLP=m
-CONFIG_UWB_I1480U=m
-CONFIG_UWB_I1480U_WLP=m
-CONFIG_MMC=m
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-
-#
-# MMC/SD/SDIO Card Drivers
-#
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_BOUNCE=y
-CONFIG_SDIO_UART=m
-# CONFIG_MMC_TEST is not set
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_PCI=m
-CONFIG_MMC_RICOH_MMC=m
-CONFIG_MMC_SDHCI_PLTFM=m
-CONFIG_MMC_WBSD=m
-# CONFIG_MMC_AT91 is not set
-# CONFIG_MMC_ATMELMCI is not set
-CONFIG_MMC_TIFM_SD=m
-CONFIG_MMC_SDRICOH_CS=m
-CONFIG_MMC_CB710=m
-CONFIG_MMC_VIA_SDMMC=m
-CONFIG_MEMSTICK=m
-# CONFIG_MEMSTICK_DEBUG is not set
-
-#
-# MemoryStick drivers
-#
-# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-CONFIG_MSPRO_BLOCK=m
-
-#
-# MemoryStick Host Controller Drivers
-#
-CONFIG_MEMSTICK_TIFM_MS=m
-CONFIG_MEMSTICK_JMICRON_38X=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=m
-
-#
-# LED drivers
-#
-CONFIG_LEDS_ALIX2=m
-CONFIG_LEDS_PCA9532=m
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_GPIO_PLATFORM=y
-CONFIG_LEDS_LP3944=m
-CONFIG_LEDS_CLEVO_MAIL=m
-CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_WM8350=m
-CONFIG_LEDS_BD2802=m
-CONFIG_LEDS_INTEL_SS4200=m
-CONFIG_LEDS_LT3593=m
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-CONFIG_LEDS_TRIGGER_GPIO=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-
-#
-# iptables trigger is under Netfilter config (LED target)
-#
-CONFIG_ACCESSIBILITY=y
-CONFIG_A11Y_BRAILLE_CONSOLE=y
-
-#
-# Speakup console speech
-#
-CONFIG_SPEAKUP=y
-CONFIG_SPEAKUP_SYNTH_ACNTSA=y
-CONFIG_SPEAKUP_SYNTH_ACNTPC=y
-CONFIG_SPEAKUP_SYNTH_APOLLO=y
-CONFIG_SPEAKUP_SYNTH_AUDPTR=y
-CONFIG_SPEAKUP_SYNTH_BNS=y
-CONFIG_SPEAKUP_SYNTH_DECTLK=y
-CONFIG_SPEAKUP_SYNTH_DECEXT=y
-CONFIG_SPEAKUP_SYNTH_DECPC=m
-CONFIG_SPEAKUP_SYNTH_DTLK=y
-CONFIG_SPEAKUP_SYNTH_KEYPC=y
-CONFIG_SPEAKUP_SYNTH_LTLK=y
-CONFIG_SPEAKUP_SYNTH_SOFT=y
-CONFIG_SPEAKUP_SYNTH_SPKOUT=y
-CONFIG_SPEAKUP_SYNTH_TXPRT=y
-CONFIG_SPEAKUP_SYNTH_DUMMY=y
-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_USER_MEM=y
-CONFIG_INFINIBAND_ADDR_TRANS=y
-CONFIG_INFINIBAND_MTHCA=m
-CONFIG_INFINIBAND_MTHCA_DEBUG=y
-# CONFIG_INFINIBAND_IPATH is not set
-CONFIG_INFINIBAND_AMSO1100=m
-# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
-# CONFIG_INFINIBAND_CXGB3 is not set
-CONFIG_MLX4_INFINIBAND=m
-CONFIG_INFINIBAND_NES=m
-# CONFIG_INFINIBAND_NES_DEBUG is not set
-CONFIG_INFINIBAND_IPOIB=m
-# CONFIG_INFINIBAND_IPOIB_CM is not set
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_ISER=m
-CONFIG_EDAC=y
-
-#
-# Reporting subsystems
-#
-# CONFIG_EDAC_DEBUG is not set
-CONFIG_EDAC_DECODE_MCE=y
-# CONFIG_EDAC_MM_EDAC is not set
-CONFIG_RTC_LIB=m
-CONFIG_RTC_CLASS=m
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-CONFIG_RTC_DRV_TEST=m
-
-#
-# I2C RTC drivers
-#
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1374=m
-CONFIG_RTC_DRV_DS1672=m
-CONFIG_RTC_DRV_MAX6900=m
-CONFIG_RTC_DRV_RS5C372=m
-CONFIG_RTC_DRV_ISL1208=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_PCF8563=m
-CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_M41T80=m
-CONFIG_RTC_DRV_M41T80_WDT=y
-CONFIG_RTC_DRV_BQ32K=m
-CONFIG_RTC_DRV_S35390A=m
-CONFIG_RTC_DRV_FM3130=m
-CONFIG_RTC_DRV_RX8581=m
-CONFIG_RTC_DRV_RX8025=m
-
-#
-# SPI RTC drivers
-#
-
-#
-# Platform RTC drivers
-#
-CONFIG_RTC_DRV_CMOS=m
-CONFIG_RTC_DRV_DS1286=m
-CONFIG_RTC_DRV_DS1511=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_M48T86=m
-CONFIG_RTC_DRV_M48T35=m
-CONFIG_RTC_DRV_M48T59=m
-CONFIG_RTC_DRV_MSM6242=m
-CONFIG_RTC_DRV_BQ4802=m
-CONFIG_RTC_DRV_RP5C01=m
-CONFIG_RTC_DRV_V3020=m
-CONFIG_RTC_DRV_WM8350=m
-CONFIG_RTC_DRV_PCF50633=m
-CONFIG_RTC_DRV_AB3100=m
-
-#
-# on-CPU RTC drivers
-#
-CONFIG_CS5535_CLOCK_EVENT_SRC=m
-CONFIG_DMADEVICES=y
-
-#
-# DMA Devices
-#
-CONFIG_ASYNC_TX_DISABLE_CHANNEL_SWITCH=y
-CONFIG_INTEL_IOATDMA=m
-CONFIG_DMA_ENGINE=y
-
-#
-# DMA Clients
-#
-CONFIG_NET_DMA=y
-# CONFIG_ASYNC_TX_DMA is not set
-CONFIG_DMATEST=m
-CONFIG_DCA=m
-CONFIG_AUXDISPLAY=y
-# CONFIG_KS0108 is not set
-CONFIG_UIO=m
-CONFIG_UIO_CIF=m
-CONFIG_UIO_PDRV=m
-CONFIG_UIO_PDRV_GENIRQ=m
-CONFIG_UIO_SMX=m
-CONFIG_UIO_AEC=m
-CONFIG_UIO_SERCOS3=m
-CONFIG_UIO_PCI_GENERIC=m
-
-#
-# TI VLYNQ
-#
-CONFIG_STAGING=y
-# CONFIG_STAGING_EXCLUDE_BUILD is not set
-# CONFIG_ET131X is not set
-# CONFIG_SLICOSS is not set
-# CONFIG_VIDEO_GO7007 is not set
-CONFIG_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25821_ALSA=m
-# CONFIG_USB_IP_COMMON is not set
-# CONFIG_W35UND is not set
-# CONFIG_PRISM2_USB is not set
-# CONFIG_ECHO is not set
-# CONFIG_POCH is not set
-# CONFIG_OTUS is not set
-CONFIG_RT2860=m
-CONFIG_RT2870=m
-# CONFIG_COMEDI is not set
-# CONFIG_ASUS_OLED is not set
-# CONFIG_PANEL is not set
-# CONFIG_ALTERA_PCIE_CHDMA is not set
-CONFIG_R8187SE=m
-CONFIG_RTL8192SU=m
-CONFIG_RTL8192U=m
-CONFIG_RTL8192E=m
-# CONFIG_TRANZPORT is not set
-
-#
-# Qualcomm MSM Camera And Video
-#
-
-#
-# Camera Sensor Selection
-#
-CONFIG_INPUT_GPIO=m
-CONFIG_POHMELFS=m
-# CONFIG_POHMELFS_DEBUG is not set
-CONFIG_POHMELFS_CRYPTO=y
-CONFIG_B3DFG=m
-CONFIG_IDE_PHISON=m
-CONFIG_PLAN9AUTH=m
-CONFIG_LINE6_USB=m
-CONFIG_DRM_VMWGFX=m
-CONFIG_DRM_NOUVEAU=m
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_NOUVEAU_DEBUG=y
-
-#
-# I2C encoder or helper chips
-#
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_USB_SERIAL_QUATECH2=m
-CONFIG_USB_SERIAL_QUATECH_USB2=m
-CONFIG_VT6655=m
-CONFIG_VT6656=m
-CONFIG_FB_UDL=m
-# CONFIG_HYPERV is not set
-# CONFIG_VME_BUS is not set
-
-#
-# RAR Register Driver
-#
-CONFIG_RAR_REGISTER=m
-# CONFIG_DX_SEP is not set
-# CONFIG_IIO is not set
-CONFIG_RAMZSWAP=m
-CONFIG_RAMZSWAP_STATS=y
-CONFIG_BATMAN_ADV=m
-# CONFIG_BATMAN_DEBUG is not set
-CONFIG_SAMSUNG_LAPTOP=m
-CONFIG_STRIP=m
-CONFIG_PCMCIA_WAVELAN=m
-CONFIG_PCMCIA_NETWAVE=m
-CONFIG_FB_SM7XX=m
-# CONFIG_FB_SM7XX_ACCEL is not set
-CONFIG_X86_PLATFORM_DEVICES=y
-CONFIG_ACER_WMI=m
-CONFIG_ACERHDF=m
-CONFIG_ASUS_LAPTOP=m
-CONFIG_DELL_LAPTOP=m
-CONFIG_DELL_WMI=m
-CONFIG_FUJITSU_LAPTOP=m
-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
-CONFIG_HP_WMI=m
-CONFIG_MSI_LAPTOP=m
-CONFIG_PANASONIC_LAPTOP=m
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_SONY_LAPTOP=m
-CONFIG_SONYPI_COMPAT=y
-CONFIG_THINKPAD_ACPI=m
-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-CONFIG_INTEL_MENLOW=m
-CONFIG_EEEPC_LAPTOP=m
-CONFIG_ACPI_WMI=m
-CONFIG_MSI_WMI=m
-CONFIG_ACPI_ASUS=m
-CONFIG_TOPSTAR_LAPTOP=m
-CONFIG_ACPI_TOSHIBA=m
-CONFIG_TOSHIBA_BT_RFKILL=m
-CONFIG_ACPI_CMPC=m
-
-#
-# Firmware Drivers
-#
-CONFIG_EDD=m
-CONFIG_EDD_OFF=y
-CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_EFI_VARS=m
-CONFIG_DELL_RBU=m
-CONFIG_DCDBAS=m
-CONFIG_DMIID=y
-CONFIG_ISCSI_IBFT_FIND=y
-CONFIG_ISCSI_IBFT=m
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-# CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
-CONFIG_EXT3_FS_XATTR=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_FS_XATTR=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD=y
-# CONFIG_JBD_DEBUG is not set
-CONFIG_JBD2=y
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=y
-CONFIG_REISERFS_FS=y
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_JFS_FS=y
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_STATISTICS is not set
-CONFIG_FS_POSIX_ACL=y
-CONFIG_XFS_FS=y
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_DEBUG is not set
-CONFIG_GFS2_FS=y
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_OCFS2_FS=y
-CONFIG_OCFS2_FS_O2CB=y
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=y
-# CONFIG_OCFS2_FS_STATS is not set
-CONFIG_OCFS2_DEBUG_MASKLOG=y
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_BTRFS_FS=y
-CONFIG_BTRFS_FS_POSIX_ACL=y
-CONFIG_NILFS2_FS=m
-CONFIG_FILE_LOCKING=y
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY=y
-CONFIG_INOTIFY_USER=y
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-CONFIG_QUOTA_TREE=y
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=y
-CONFIG_QUOTACTL=y
-CONFIG_AUTOFS_FS=m
-CONFIG_AUTOFS4_FS=m
-CONFIG_FUSE_FS=m
-CONFIG_CUSE=m
-CONFIG_GENERIC_ACL=y
-
-#
-# Caches
-#
-CONFIG_FSCACHE=m
-# CONFIG_FSCACHE_STATS is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=m
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=y
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=y
-CONFIG_UDF_NLS=y
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-CONFIG_NTFS_FS=y
-# CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_RW=y
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-# CONFIG_HUGETLBFS is not set
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_CONFIGFS_FS=y
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_ADFS_FS=m
-# CONFIG_ADFS_FS_RW is not set
-CONFIG_AFFS_FS=m
-# CONFIG_ECRYPT_FS is not set
-CONFIG_HFS_FS=m
-CONFIG_HFSPLUS_FS=m
-CONFIG_BEFS_FS=m
-# CONFIG_BEFS_DEBUG is not set
-CONFIG_BFS_FS=m
-CONFIG_EFS_FS=m
-CONFIG_JFFS2_FS=m
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-# CONFIG_JFFS2_SUMMARY is not set
-# CONFIG_JFFS2_FS_XATTR is not set
-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-CONFIG_JFFS2_ZLIB=y
-# CONFIG_JFFS2_LZO is not set
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
-CONFIG_UBIFS_FS=m
-CONFIG_UBIFS_FS_XATTR=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-# CONFIG_UBIFS_FS_DEBUG is not set
-CONFIG_CRAMFS=m
-CONFIG_SQUASHFS=m
-CONFIG_SQUASHFS_EMBEDDED=y
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_VXFS_FS=m
-CONFIG_MINIX_FS=m
-CONFIG_OMFS_FS=m
-CONFIG_HPFS_FS=m
-CONFIG_QNX4FS_FS=m
-CONFIG_ROMFS_FS=y
-CONFIG_ROMFS_BACKED_BY_BLOCK=y
-# CONFIG_ROMFS_BACKED_BY_MTD is not set
-# CONFIG_ROMFS_BACKED_BY_BOTH is not set
-CONFIG_ROMFS_ON_BLOCK=y
-CONFIG_SYSV_FS=m
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-# CONFIG_UFS_DEBUG is not set
-CONFIG_EXOFS_FS=m
-# CONFIG_EXOFS_DEBUG is not set
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-# CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V4=y
-# CONFIG_NFS_V4_1 is not set
-CONFIG_NFSD=y
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V3_ACL is not set
-CONFIG_NFSD_V4=y
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-CONFIG_EXPORTFS=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
-CONFIG_SUNRPC_GSS=y
-CONFIG_SUNRPC_XPRT_RDMA=m
-CONFIG_RPCSEC_GSS_KRB5=y
-CONFIG_RPCSEC_GSS_SPKM3=m
-CONFIG_SMB_FS=m
-# CONFIG_SMB_NLS_DEFAULT is not set
-CONFIG_CIFS=m
-# CONFIG_CIFS_STATS is not set
-CONFIG_CIFS_WEAK_PW_HASH=y
-# CONFIG_CIFS_UPCALL is not set
-# CONFIG_CIFS_XATTR is not set
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_DFS_UPCALL is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
-CONFIG_NCP_FS=m
-CONFIG_NCPFS_PACKET_SIGNING=y
-CONFIG_NCPFS_IOCTL_LOCKING=y
-CONFIG_NCPFS_STRONG=y
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_NLS=y
-CONFIG_NCPFS_EXTRAS=y
-CONFIG_CODA_FS=m
-CONFIG_AFS_FS=m
-# CONFIG_AFS_DEBUG is not set
-# CONFIG_AFS_FSCACHE is not set
-CONFIG_9P_FS=m
-# CONFIG_9P_FSCACHE is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-CONFIG_OSF_PARTITION=y
-CONFIG_AMIGA_PARTITION=y
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_UNIXWARE_DISKLABEL=y
-# CONFIG_LDM_PARTITION is not set
-CONFIG_SGI_PARTITION=y
-# CONFIG_ULTRIX_PARTITION is not set
-CONFIG_SUN_PARTITION=y
-CONFIG_KARMA_PARTITION=y
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_UTF8=y
-CONFIG_DLM=y
-# CONFIG_DLM_DEBUG is not set
-
-#
-# Kernel hacking
-#
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
-CONFIG_ENABLE_WARN_DEPRECATED=y
-CONFIG_ENABLE_MUST_CHECK=y
-CONFIG_FRAME_WARN=0
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_STRIP_ASM_SYMS=y
-CONFIG_UNUSED_SYMBOLS=y
-CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_CHECK is not set
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_DEBUG_SHIRQ is not set
-CONFIG_DETECT_SOFTLOCKUP=y
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-CONFIG_DETECT_HUNG_TASK=y
-# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
-CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
-CONFIG_SCHED_DEBUG=y
-# CONFIG_SCHEDSTATS is not set
-CONFIG_TIMER_STATS=y
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_RT_MUTEX_TESTER is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-CONFIG_STACKTRACE=y
-# CONFIG_DEBUG_KOBJECT is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_VIRTUAL is not set
-# CONFIG_DEBUG_WRITECOUNT is not set
-CONFIG_DEBUG_MEMORY_INIT=y
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-CONFIG_FRAME_POINTER=y
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_LATENCYTOP is not set
-# CONFIG_SYSCTL_SYSCALL_CHECK is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
-CONFIG_USER_STACKTRACE_SUPPORT=y
-CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FTRACE_NMI_ENTER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
-CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_RING_BUFFER=y
-CONFIG_FTRACE_NMI_ENTER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-# CONFIG_IRQSOFF_TRACER is not set
-CONFIG_SYSPROF_TRACER=y
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
-# CONFIG_BOOT_TRACER is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-# CONFIG_POWER_TRACER is not set
-# CONFIG_KSYM_TRACER is not set
-# CONFIG_STACK_TRACER is not set
-# CONFIG_KMEMTRACE is not set
-# CONFIG_WORKQUEUE_TRACER is not set
-CONFIG_BLK_DEV_IO_TRACE=y
-CONFIG_DYNAMIC_FTRACE=y
-# CONFIG_FUNCTION_PROFILER is not set
-CONFIG_FTRACE_MCOUNT_RECORD=y
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_MMIOTRACE is not set
-CONFIG_RING_BUFFER_BENCHMARK=m
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# CONFIG_DMA_API_DEBUG is not set
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-CONFIG_HAVE_ARCH_KMEMCHECK=y
-CONFIG_STRICT_DEVMEM=y
-CONFIG_X86_VERBOSE_BOOTUP=y
-CONFIG_EARLY_PRINTK=y
-# CONFIG_EARLY_PRINTK_DBGP is not set
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-# CONFIG_X86_PTDUMP is not set
-CONFIG_DEBUG_RODATA=y
-CONFIG_DEBUG_RODATA_TEST=y
-# CONFIG_DEBUG_NX_TEST is not set
-# CONFIG_IOMMU_DEBUG is not set
-# CONFIG_IOMMU_STRESS is not set
-CONFIG_HAVE_MMIOTRACE_SUPPORT=y
-CONFIG_IO_DELAY_TYPE_0X80=0
-CONFIG_IO_DELAY_TYPE_0XED=1
-CONFIG_IO_DELAY_TYPE_UDELAY=2
-CONFIG_IO_DELAY_TYPE_NONE=3
-CONFIG_IO_DELAY_0X80=y
-# CONFIG_IO_DELAY_0XED is not set
-# CONFIG_IO_DELAY_UDELAY is not set
-# CONFIG_IO_DELAY_NONE is not set
-CONFIG_DEFAULT_IO_DELAY_TYPE=0
-# CONFIG_DEBUG_BOOT_PARAMS is not set
-# CONFIG_CPA_DEBUG is not set
-CONFIG_OPTIMIZE_INLINING=y
-# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-CONFIG_KEYS_DEBUG_PROC_KEYS=y
-CONFIG_SECURITY=y
-CONFIG_SECURITYFS=y
-CONFIG_SECURITY_NETWORK=y
-CONFIG_SECURITY_NETWORK_XFRM=y
-# CONFIG_SECURITY_PATH is not set
-# CONFIG_SECURITY_SELINUX is not set
-# CONFIG_SECURITY_TOMOYO is not set
-# CONFIG_IMA is not set
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_SMACK is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_XOR_BLOCKS=y
-CONFIG_ASYNC_CORE=y
-CONFIG_ASYNC_MEMCPY=y
-CONFIG_ASYNC_XOR=y
-CONFIG_ASYNC_PQ=y
-CONFIG_ASYNC_RAID6_RECOV=y
-CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
-CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_FIPS=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=y
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=m
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_PCOMP=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_WORKQUEUE=y
-CONFIG_CRYPTO_CRYPTD=y
-CONFIG_CRYPTO_AUTHENC=y
-CONFIG_CRYPTO_TEST=m
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_SEQIV=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CTR=m
-CONFIG_CRYPTO_CTS=m
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_LRW=y
-CONFIG_CRYPTO_PCBC=y
-CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_FPU=y
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_XCBC=y
-CONFIG_CRYPTO_VMAC=m
-
-#
-# Digest
-#
-CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CRC32C_INTEL=m
-CONFIG_CRYPTO_GHASH=m
-CONFIG_CRYPTO_MD4=y
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_MICHAEL_MIC=y
-CONFIG_CRYPTO_RMD128=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RMD256=m
-CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_TGR192=y
-CONFIG_CRYPTO_WP512=y
-CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_AES_X86_64=y
-CONFIG_CRYPTO_AES_NI_INTEL=y
-CONFIG_CRYPTO_ANUBIS=y
-CONFIG_CRYPTO_ARC4=y
-CONFIG_CRYPTO_BLOWFISH=y
-CONFIG_CRYPTO_CAMELLIA=y
-CONFIG_CRYPTO_CAST5=y
-CONFIG_CRYPTO_CAST6=y
-CONFIG_CRYPTO_DES=y
-CONFIG_CRYPTO_FCRYPT=y
-CONFIG_CRYPTO_KHAZAD=y
-CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_SALSA20_X86_64=m
-CONFIG_CRYPTO_SEED=y
-CONFIG_CRYPTO_SERPENT=y
-CONFIG_CRYPTO_TEA=y
-CONFIG_CRYPTO_TWOFISH=y
-CONFIG_CRYPTO_TWOFISH_COMMON=y
-CONFIG_CRYPTO_TWOFISH_X86_64=y
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_ZLIB=m
-CONFIG_CRYPTO_LZO=m
-
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_PADLOCK=m
-CONFIG_CRYPTO_DEV_PADLOCK_AES=m
-CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
-CONFIG_CRYPTO_DEV_HIFN_795X=m
-CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
-CONFIG_HAVE_KVM=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_KVM_APIC_ARCHITECTURE=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=m
-CONFIG_KVM_INTEL=m
-CONFIG_KVM_AMD=m
-CONFIG_VIRTIO=m
-CONFIG_VIRTIO_RING=m
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_BINARY_PRINTF=y
-
-#
-# Library routines
-#
-CONFIG_BITREVERSE=y
-CONFIG_GENERIC_FIND_FIRST_BIT=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=y
-CONFIG_CRC_T10DIF=m
-CONFIG_CRC_ITU_T=y
-CONFIG_CRC32=y
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZO_COMPRESS=m
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_LZO=y
-CONFIG_REED_SOLOMON=m
-CONFIG_REED_SOLOMON_DEC16=y
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAS_DMA=y
-CONFIG_CHECK_SIGNATURE=y
-CONFIG_NLATTR=y
-CONFIG_LRU_CACHE=m
diff --git a/source/k/kernel-firmware/kernel-firmware.SlackBuild b/source/k/kernel-firmware/kernel-firmware.SlackBuild
index 40020004..f923dbbc 100755
--- a/source/k/kernel-firmware/kernel-firmware.SlackBuild
+++ b/source/k/kernel-firmware/kernel-firmware.SlackBuild
@@ -25,17 +25,17 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-kernel-firmware
 
-VERSION=${VERSION:-2.6.33.4}
+VERSION=${VERSION:-2.6.37.6}
 ARCH=${ARCH:-noarch}
 BUILD=${BUILD:-1}
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
-echo "Using /usr/src/linux-2.6.33.4/"
+echo "Using /usr/src/linux-2.6.37.6/"
 echo "Make sure this is *ready*..."
 mkdir -p $PKG/lib/firmware
-( cd /usr/src/linux-2.6.33.4 && make firmware_install INSTALL_FW_PATH=$PKG/lib/firmware )
-cp -a /usr/src/linux-2.6.33.4/firmware/WHENCE $PKG/lib/firmware
+( cd /usr/src/linux-2.6.37.6 && make firmware_install INSTALL_FW_PATH=$PKG/lib/firmware )
+cp -a /usr/src/linux-2.6.37.6/firmware/WHENCE $PKG/lib/firmware
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/k/kernel-generic/kernel-generic.SlackBuild b/source/k/kernel-generic/kernel-generic.SlackBuild
index 02978595..46a81270 100755
--- a/source/k/kernel-generic/kernel-generic.SlackBuild
+++ b/source/k/kernel-generic/kernel-generic.SlackBuild
@@ -22,7 +22,7 @@
 
 
 KERNNAME=generic
-VERSION=${VERSION:-2.6.33.4}
+VERSION=${VERSION:-2.6.37.6}
 ARCH=${ARCH:-x86_64}
 KARCH=${KARCH:-x86}
 BUILD=${BUILD:-1}
diff --git a/source/k/kernel-huge/kernel-huge.SlackBuild b/source/k/kernel-huge/kernel-huge.SlackBuild
index 9961e876..36b23e5a 100755
--- a/source/k/kernel-huge/kernel-huge.SlackBuild
+++ b/source/k/kernel-huge/kernel-huge.SlackBuild
@@ -22,7 +22,7 @@
 
 
 KERNNAME=huge
-VERSION=${VERSION:-2.6.33.4}
+VERSION=${VERSION:-2.6.37.6}
 ARCH=${ARCH:-x86_64}
 KARCH=${KARCH:-x86}
 BUILD=${BUILD:-1}
diff --git a/source/k/kernel-modules/kernel-modules.SlackBuild b/source/k/kernel-modules/kernel-modules.SlackBuild
index 369c39c2..abdb1732 100755
--- a/source/k/kernel-modules/kernel-modules.SlackBuild
+++ b/source/k/kernel-modules/kernel-modules.SlackBuild
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=${VERSION:-2.6.33.4}
+VERSION=${VERSION:-2.6.37.6}
 ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
diff --git a/source/k/linux-2.6.33.4.tar.sign b/source/k/linux-2.6.33.4.tar.sign
deleted file mode 100644
index df6df476..00000000
--- a/source/k/linux-2.6.33.4.tar.sign
+++ /dev/null
@@ -1,8 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-Comment: See http://www.kernel.org/signature.html for info
-
-iD8DBQBL6yrhyGugalF9Dw4RAl8SAKCGZjbaryAxyoi9JGPRpL3JRTTyEQCeMJIf
-A492a4GfHfenmWC5lfRpckw=
-=2DYq
------END PGP SIGNATURE-----
diff --git a/source/k/linux-2.6.37.6.tar.sign b/source/k/linux-2.6.37.6.tar.sign
new file mode 100644
index 00000000..03b750e3
--- /dev/null
+++ b/source/k/linux-2.6.37.6.tar.sign
@@ -0,0 +1,8 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+Comment: See http://www.kernel.org/signature.html for info
+
+iD8DBQBNj8SJyGugalF9Dw4RAmHSAJ9VFWXNTwlwSBe7i5yCYNvQ42hX0wCfWROG
+xPtNjewwYEduA0gbWuXg8lE=
+=5skN
+-----END PGP SIGNATURE-----
diff --git a/source/kde/KDE.SlackBuild b/source/kde/KDE.SlackBuild
index 19f6ba5b..048c09e9 100755
--- a/source/kde/KDE.SlackBuild
+++ b/source/kde/KDE.SlackBuild
@@ -17,6 +17,10 @@ QTDIR=/usr/lib${LIBDIRSUFFIX}/qt ; export QTDIR
 # Get the kde environment variables
 [ -d kdebase ] && eval $(sed -e "s#/lib#/lib${LIBDIRSUFFIX}#" ./kdebase/profile.d/kde.sh)
 
+#  These, and polkit-qt-1 from git, will be needed soon, but are too new to use here.
+#  polkit-kde-agent-1 \
+#  polkit-kde-kcmodules-1 "
+
 KDEMODS=" \
   polkit-qt-1 \
   kdelibs \
diff --git a/source/kde/KDE.options b/source/kde/KDE.options
index 730f3f46..16ae672c 100644
--- a/source/kde/KDE.options
+++ b/source/kde/KDE.options
@@ -3,7 +3,7 @@
 # usually has a different version number), or by setting your own
 # environment variables.
 
-[ -z $VERSION ] && export VERSION=4.4.3
+[ -z $VERSION ] && export VERSION=4.5.5
 [ -z $BUILD ] && export BUILD=1
 
 # Automatically determine the architecture we're building on:
diff --git a/source/kde/KDE_extra.SlackBuild b/source/kde/KDE_extra.SlackBuild
index 9b702457..d76c18e6 100755
--- a/source/kde/KDE_extra.SlackBuild
+++ b/source/kde/KDE_extra.SlackBuild
@@ -18,8 +18,8 @@ KDEMODS=" \
   kdevplatform \
   kdevelop \
   konq-plugins \
-  guidance-power-manager \
   kopete-cryptography \
+  libktorrent \
   ktorrent \
   skanlite \
   koffice \
diff --git a/source/kde/amarok/local.options b/source/kde/amarok/local.options
index b086e127..c9623084 100644
--- a/source/kde/amarok/local.options
+++ b/source/kde/amarok/local.options
@@ -1 +1 @@
-VERSION=2.3.0
+VERSION=2.4.0
diff --git a/source/kde/guidance-power-manager/guidance-power-manager.SlackBuild b/source/kde/guidance-power-manager/guidance-power-manager.SlackBuild
deleted file mode 100755
index 5147c978..00000000
--- a/source/kde/guidance-power-manager/guidance-power-manager.SlackBuild
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
-# Copyright 2008  Robby Workman, Northport, AL, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PKGNAM=guidance-power-manager
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-# Set the config option variables if they are not already set:
-if [ -r ../KDE.options ]; then
-  . ../KDE.options
-fi
-
-# The global options may be overridden here (if needed):
-if [ -r ./local.options ]; then
-  . ./local.options
-fi
-
-# Avoid a version number in .la files:
-if [ -d /usr/lib${LIBDIRSUFFIX}/qt ]; then
-  QTDIR=/usr/lib${LIBDIRSUFFIX}/qt
-fi
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-cd $TMP
-echo "Building $PKGNAM-$VERSION..."
-rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/../src/extragear/$PKGNAM-$VERSION.tar.?z* || exit 1
-cd $PKGNAM-$VERSION || exit 1
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-mkdir -p build
-cd build
-  cmake \
-    $KDE_OPT_ARGS \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    ..
-  make $NUMJOBS || exit 1
-  make install DESTDIR=$PKG || exit 1
-cd -
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a README $PKG/usr/doc/$PKGNAM-$VERSION
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/kde/guidance-power-manager/local.options b/source/kde/guidance-power-manager/local.options
deleted file mode 100644
index dc6e9bd4..00000000
--- a/source/kde/guidance-power-manager/local.options
+++ /dev/null
@@ -1 +0,0 @@
-VERSION=4.4.0
diff --git a/source/kde/guidance-power-manager/slack-desc b/source/kde/guidance-power-manager/slack-desc
deleted file mode 100644
index e0c200cc..00000000
--- a/source/kde/guidance-power-manager/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-                      |-----handy-ruler------------------------------------------------------|
-guidance-power-manager: guidance-power-manager (KDE4 power manager daemon)
-guidance-power-manager:
-guidance-power-manager: This is a frontend to HAL's power features for KDE.
-guidance-power-manager:
-guidance-power-manager: It supports screen brightness, battery level, plugged/unplugged
-guidance-power-manager: notices, and laptop lid closing actions.
-guidance-power-manager:
-guidance-power-manager:
-guidance-power-manager:
-guidance-power-manager:
-guidance-power-manager:
diff --git a/source/kde/k3b/local.options b/source/kde/k3b/local.options
index c085ca95..30cc24d0 100644
--- a/source/kde/k3b/local.options
+++ b/source/kde/k3b/local.options
@@ -1,2 +1,2 @@
-VERSION=1.91.0
-BUILD=3
+VERSION=2.0.2
+BUILD=2
diff --git a/source/kde/kaudiocreator/local.options b/source/kde/kaudiocreator/local.options
index 9ec4f05c..758a383e 100644
--- a/source/kde/kaudiocreator/local.options
+++ b/source/kde/kaudiocreator/local.options
@@ -1,2 +1,2 @@
-VERSION=r1118889
+VERSION=r1212483
 BUILD=1
diff --git a/source/kde/kdeadmin/knetworkconf.diff b/source/kde/kdeadmin/knetworkconf.diff
index ed5dbeeb..425499d1 100644
--- a/source/kde/kdeadmin/knetworkconf.diff
+++ b/source/kde/kdeadmin/knetworkconf.diff
@@ -1,40 +1,43 @@
---- ./knetworkconf/backends/platform.pl.cmake.orig	2009-07-28 14:43:49.000000000 -0500
-+++ ./knetworkconf/backends/platform.pl.cmake	2010-05-03 20:53:00.000000000 -0500
-@@ -93,6 +93,9 @@
+--- ./knetworkconf/backends/platform.pl.cmake.orig	2010-07-06 01:54:42.000000000 -0500
++++ ./knetworkconf/backends/platform.pl.cmake	2011-03-13 16:43:44.000000000 -0500
+@@ -93,6 +93,10 @@
    "slackware-9.1.0" => "Slackware 9.1.0",
    "slackware-10.0.0" => "Slackware 10.0.0",
    "slackware-10.1.0" => "Slackware 10.1.0",
 +  "slackware-12.2.0" => "Slackware 12.2.0",
 +  "slackware-13.0.0.0.0" => "Slackware 13.0.0.0.0",
 +  "slackware-13.1.0" => "Slackware 13.1.0",
++  "slackware-13.37.0" => "Slackware 13.37.0",
    "freebsd-4"       => "FreeBSD 4",
    "freebsd-5"       => "FreeBSD 5",
    "freebsd-6"       => "FreeBSD 6",
---- ./knetworkconf/backends/network-conf.cmake.orig	2009-07-28 14:43:49.000000000 -0500
-+++ ./knetworkconf/backends/network-conf.cmake	2010-05-03 20:53:48.000000000 -0500
-@@ -77,7 +77,8 @@
+--- ./knetworkconf/backends/network-conf.cmake.orig	2010-07-06 01:54:42.000000000 -0500
++++ ./knetworkconf/backends/network-conf.cmake	2011-03-13 16:43:13.000000000 -0500
+@@ -77,7 +77,9 @@
                "mandriva-2006.1", "mandriva-2007.0", "mandriva-2007.1", "mandriva-2008.0", "mandriva-2008.1",
  	      "mandriva-2009.0", "mandriva-2009.1", "mandriva-2010.0",
                "vine-3.0", "vine-3.1",
 -              "slackware-9.1.0", "slackware-10.0.0", "slackware-10.1.0",
 +              "slackware-9.1.0", "slackware-10.0.0", "slackware-10.1.0", "slackware-12.2.0", "slackware-13.0.0.0.0",
 +              "slackware-13.1.0",
-               "gentoo", "vlos-1.2", "freebsd-5", "freebsd-6", "ark");
++              "slackware-13.37.0",
+ 	      "freebsd-5", "freebsd-6", "freebsd-7", "freebsd-8", "freebsd-9",
+               "gentoo", "vlos-1.2", "ark");
  
- $description =<<"end_of_description;";
---- ./knetworkconf/backends/service.pl.cmake.orig	2009-07-28 14:43:49.000000000 -0500
-+++ ./knetworkconf/backends/service.pl.cmake	2010-05-03 20:54:07.000000000 -0500
-@@ -281,6 +281,9 @@
+--- ./knetworkconf/backends/service.pl.cmake.orig	2010-07-06 01:54:42.000000000 -0500
++++ ./knetworkconf/backends/service.pl.cmake	2011-03-13 16:42:51.000000000 -0500
+@@ -281,6 +281,10 @@
       "slackware-9.1.0" => "slackware-9.1.0",
       "slackware-10.0.0" => "slackware-9.1.0",
       "slackware-10.1.0" => "slackware-9.1.0",
 +     "slackware-12.2.0" => "slackware-9.1.0",
 +     "slackware-13.0.0.0.0" => "slackware-9.1.0",
 +     "slackware-13.1.0" => "slackware-9.1.0",
++     "slackware-13.37.0" => "slackware-9.1.0",
  
       "gentoo"         => "gentoo",
       "vlos-1.2"       => "gentoo",
-@@ -314,7 +317,11 @@
+@@ -317,7 +321,11 @@
                        "nonetwork" => "RECOVER"
                       },
       "freebsd-5"  => {"rc" => "GRAPHICAL" },
@@ -47,49 +50,53 @@
      );
  
    $distro = $dist_map{$gst_dist};
---- ./knetworkconf/backends/network.pl.cmake.orig	2009-07-28 14:43:49.000000000 -0500
-+++ ./knetworkconf/backends/network.pl.cmake	2010-05-03 20:55:09.000000000 -0500
-@@ -537,6 +537,9 @@
+--- ./knetworkconf/backends/network.pl.cmake.orig	2010-07-06 01:54:42.000000000 -0500
++++ ./knetworkconf/backends/network.pl.cmake	2011-03-13 16:42:24.000000000 -0500
+@@ -528,6 +528,10 @@
         "slackware-9.1.0" => "redhat-6.2",
         "slackware-10.0.0" => "redhat-6.2",
         "slackware-10.1.0" => "redhat-6.2",
 +       "slackware-12.2.0" => "redhat-6.2",
 +       "slackware-13.0.0.0.0" => "redhat-6.2",
 +       "slackware-13.1.0" => "redhat-6.2",
++       "slackware-13.37.0" => "redhat-6.2",
         "gentoo"       => "debian-2.2",
         "vlos-1.2"     => "debian-2.2",
         "freebsd-5"    => "debian-2.2",
-@@ -1839,6 +1842,9 @@
+@@ -1833,6 +1837,10 @@
  	  "slackware-9.1.0" => \&gst_network_deb22_get_file,
  	  "slackware-10.0.0" => \&gst_network_deb22_get_file,
  	  "slackware-10.1.0" => \&gst_network_deb22_get_file,
 +	  "slackware-12.2.0" => \&gst_network_deb22_get_file,
 +	  "slackware-13.0.0.0.0" => \&gst_network_deb22_get_file,
 +	  "slackware-13.1.0" => \&gst_network_deb22_get_file,
++	  "slackware-13.37.0" => \&gst_network_deb22_get_file,
  	  "gentoo"       => \&gst_network_deb22_get_file,
  	  "freebsd-5"    => \&gst_network_deb22_get_file,
  	  "freebsd-6"    => \&gst_network_deb22_get_file,
-@@ -3961,6 +3967,9 @@
+@@ -3958,6 +3966,10 @@
  	  "slackware-9.1.0" => "",
  	  "slackware-10.0.0" => "",
  	  "slackware-10.1.0" => "",
 +	  "slackware-12.2.0" => "",
 +	  "slackware-13.0.0.0.0" => "",
 +	  "slackware-13.1.0" => "",
++	  "slackware-13.37.0" => "",
  	  "gentoo"       => "",
  	  "vlos-1.2"     => "",
  	  "freebsd-5"    => "",
-@@ -4109,6 +4118,9 @@
+@@ -4109,6 +4121,10 @@
  	  "slackware-9.1.0" => "slackware-9.1.0",
  	  "slackware-10.0.0" => "slackware-9.1.0",
  	  "slackware-10.1.0" => "slackware-9.1.0",
 +	  "slackware-12.2.0" => "slackware-9.1.0",
 +	  "slackware-13.0.0.0.0" => "slackware-9.1.0",
 +	  "slackware-13.1.0" => "slackware-9.1.0",
++	  "slackware-13.37.0" => "slackware-9.1.0",
  	  "gentoo"       => "gentoo",
  	  "vlos-1.2"     => "vlos-1.2",
  	  "freebsd-5"    => "freebsd-5",
-@@ -4392,6 +4404,7 @@
+@@ -4395,6 +4411,7 @@
         [ "hostname",      \&gst_parse_fq_hostname, HOSTNAME ],
         [ "nameserver",    \&gst_parse_split_all_unique_hash_comment, RESOLV_CONF,  "nameserver", "[ \t]+" ],
         [ "searchdomain",  \&gst_parse_split_first_array_unique, RESOLV_CONF,  "search", "[ \t]+", "[ \t]+" ],
@@ -97,27 +104,29 @@
         [ "domain",        \&gst_parse_split_first_str,   RESOLV_CONF,  "domain", "[ \t]+" ],
         [ "order",         \&gst_parse_split_first_array, HOST_CONF,    "order", "[ \t]+", ",[ \t]*" ],
         [ "hostmatch",     \&gst_parse_split_first_bool,  HOST_CONF,    "multi", "[ \t]+" ],
-@@ -4608,6 +4621,9 @@
+@@ -4611,6 +4628,10 @@
  	  "slackware-9.1.0" => "slackware-9.1.0",
  	  "slackware-10.0.0" => "slackware-9.1.0",
  	  "slackware-10.1.0" => "slackware-9.1.0",
 +	  "slackware-12.2.0" => "slackware-9.1.0",
 +	  "slackware-13.0.0.0.0" => "slackware-9.1.0",
 +	  "slackware-13.1.0" => "slackware-9.1.0",
++	  "slackware-13.37.0" => "slackware-9.1.0",
  	  "gentoo"       => "gentoo",
  	  "vlos-1.2"     => "vlos-1.2",
  	  "freebsd-5"    => "freebsd-5",
-@@ -5502,6 +5518,9 @@
+@@ -5508,6 +5529,10 @@
  	  "slackware-9.1.0" => "slackware-9.1.0",
  	  "slackware-10.0.0" => "slackware-9.1.0",
  	  "slackware-10.1.0" => "slackware-9.1.0",
 +	  "slackware-12.2.0" => "slackware-9.1.0",
 +	  "slackware-13.0.0.0.0" => "slackware-9.1.0",
 +	  "slackware-13.1.0" => "slackware-9.1.0",
++	  "slackware-13.37.0" => "slackware-9.1.0",
  	  "gentoo"       => "gentoo",
  	  "vlos-1.2"     => "vlos-1.2",
  	  "freebsd-5"    => "freebsd-5",
-@@ -5772,6 +5791,7 @@
+@@ -5781,6 +5806,7 @@
         [ "hostname",      \&gst_replace_fq_hostname, HOSTNAME, "%hostname%", "%domain%" ],
         [ "hostname",      \&gst_network_run_hostname ],
         [ "gateway",       \&gst_replace_rcinet1conf_global, RC_INET_CONF, GATEWAY ],
@@ -125,13 +134,14 @@
         [ "domain",        \&gst_replace_join_first_str,   RESOLV_CONF, "domain", "[ \t]+" ],
         [ "nameserver",    \&gst_replace_join_all,         RESOLV_CONF, "nameserver", "[ \t]+" ],
         [ "searchdomain",  \&gst_replace_join_first_array, RESOLV_CONF, "search", "[ \t]+", "[ \t]+" ],
-@@ -5951,6 +5971,9 @@
+@@ -5960,6 +5986,10 @@
  	  "slackware-9.1.0" => "slackware-9.1.0",
  	  "slackware-10.0.0" => "slackware-9.1.0",
  	  "slackware-10.1.0" => "slackware-9.1.0",
 +	  "slackware-12.2.0" => "slackware-9.1.0",
 +	  "slackware-13.0.0.0.0" => "slackware-9.1.0",
 +	  "slackware-13.1.0" => "slackware-9.1.0",
++	  "slackware-13.37.0" => "slackware-9.1.0",
  	  "gentoo"       => "gentoo",
  	  "vlos-1.2"     => "vlos-1.2",
  	  "freebsd-5"    => "freebsd-5",
diff --git a/source/kde/kdenetwork/local.options b/source/kde/kdeadmin/local.options
index aae3c765..aae3c765 100644
--- a/source/kde/kdenetwork/local.options
+++ b/source/kde/kdeadmin/local.options
diff --git a/source/kde/kdeartwork/local.options b/source/kde/kdeartwork/local.options
new file mode 100644
index 00000000..aae3c765
--- /dev/null
+++ b/source/kde/kdeartwork/local.options
@@ -0,0 +1 @@
+BUILD=2
diff --git a/source/kde/kdebase-runtime/local.options b/source/kde/kdebase-runtime/local.options
new file mode 100644
index 00000000..aae3c765
--- /dev/null
+++ b/source/kde/kdebase-runtime/local.options
@@ -0,0 +1 @@
+BUILD=2
diff --git a/source/kde/kdebase-workspace/kcmshell_root_privilege.patch b/source/kde/kdebase-workspace/kcmshell_root_privilege.patch
deleted file mode 100644
index f81a98ed..00000000
--- a/source/kde/kdebase-workspace/kcmshell_root_privilege.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- kdebase-workspace-4.3.85/systemsettings/core/ModuleView.cpp~	2009-12-11 00:14:03.000000000 +0100
-+++ kdebase-workspace-4.3.85/systemsettings/core/ModuleView.cpp	2009-12-22 15:47:35.000000000 +0100
-@@ -40,6 +40,7 @@
- #include <KCModuleProxy>
- #include <KStandardGuiItem>
- #include <KDialogButtonBox>
-+#include <KStandardDirs>
- #include <kauthaction.h>
- 
- #include "MenuItem.h"
-@@ -129,6 +130,32 @@
-         return;
-     }
- 
-+    if ( menuItem->service()->property( "X-KDE-RootOnly", QVariant::Bool ).toBool() ) {
-+        QString kdesu = KStandardDirs::findExe( "kdesu" );
-+        QString cmd = menuItem->service()->exec().trimmed();
-+
-+        /* Prepare the process to run the kcmshell */
-+        if ( cmd.left(5) == "kdesu" )
-+        {
-+            cmd = cmd.remove(0,5).trimmed();
-+
-+            /* Remove all kdesu switches */
-+            while ( cmd.length() > 1 && cmd[ 0 ] == '-' )
-+                cmd = cmd.remove( 0, cmd.indexOf( ' ' ) ).trimmed();
-+        }
-+
-+        if ( cmd.left(9) == "kcmshell4" )
-+            cmd = cmd.remove(0,9).trimmed();
-+
-+        QStringList args;
-+        args << "-i" << QString( menuItem->service()->icon() ) << "-c" << QString( "%1 %2 --lang %3" ).arg( KStandardDirs::locate("exe", "kcmshell4") ).arg( cmd ).arg( KGlobal::locale()->language() );
-+
-+        kDebug() << "Starting root module: " << args;
-+        QProcess::startDetached( kdesu, args );
-+
-+        return;
-+    }
-+
-     QList<KCModuleInfo*> modules;
-     if ( menuItem->children().empty() ) {
-         modules << &menuItem->item();
diff --git a/source/kde/kdebase-workspace/kdebase-workspace.SlackBuild b/source/kde/kdebase-workspace/kdebase-workspace.SlackBuild
index 1dd46d61..91b27dd3 100755
--- a/source/kde/kdebase-workspace/kdebase-workspace.SlackBuild
+++ b/source/kde/kdebase-workspace/kdebase-workspace.SlackBuild
@@ -53,8 +53,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-cat $CWD/kcmshell_root_privilege.patch | patch -p1 --verbose || exit 1
-
 # Increase the timeout to accomodate slow-to-initialize video chipset drivers:
 zcat $CWD/kdebase-workspace.kdm.server.timeout.diff.gz | patch -p1 --verbose || exit 1
 
@@ -92,6 +90,9 @@ $PKG/usr/bin/genkdmconf --no-old --no-old-scripts --no-backup --in $PKG/usr/shar
 # this?  Even the kdmrc file says this is supposed to be the default.
 sed -i 's/AllowRootLogin=false/AllowRootLogin=true/' \
   $PKG/usr/share/config/kdm/kdmrc 
+# We are also not ready to create a separate 'kdm' non-root user:
+sed -i 's/GreeterUID=kdm/#&/' \
+  $PKG/usr/share/config/kdm/kdmrc 
 mv $PKG/usr/share/config/kdm/kdmrc $PKG/usr/share/config/kdm/kdmrc.new
 
 cp -a $PKG/usr/share/config/kdm/Xsession $PKG/usr/share/config/kdm/Xsession.orig
diff --git a/source/kde/kdebase-workspace/kdebase-workspace.kdm.server.timeout.diff b/source/kde/kdebase-workspace/kdebase-workspace.kdm.server.timeout.diff
index 56deff54..4dd98484 100644
--- a/source/kde/kdebase-workspace/kdebase-workspace.kdm.server.timeout.diff
+++ b/source/kde/kdebase-workspace/kdebase-workspace.kdm.server.timeout.diff
@@ -1,10 +1,10 @@
---- ./kdm/config.def.orig	2010-02-26 12:32:20.000000000 -0600
-+++ ./kdm/config.def	2010-05-03 22:11:48.000000000 -0500
-@@ -1332,9 +1332,9 @@
+--- ./kdm/config.def.orig	2010-09-30 16:20:21.000000000 -0500
++++ ./kdm/config.def	2010-12-01 19:13:02.356002453 -0600
+@@ -1343,9 +1343,9 @@
  
  Key: ServerTimeout
  Type: int
--Default: 15
+-Default: 30
 +Default: 45
  User: core
 -Instance: #:*/
diff --git a/source/kde/kdebase-workspace/xinit/xinitrc.kde b/source/kde/kdebase-workspace/xinit/xinitrc.kde
index 5e11a9ac..a33eb06c 100755
--- a/source/kde/kdebase-workspace/xinit/xinitrc.kde
+++ b/source/kde/kdebase-workspace/xinit/xinitrc.kde
@@ -25,4 +25,8 @@ if [ -f $usermodmap ]; then
 fi
 
 # Start the window manager:
-ck-launch-session startkde
+if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
+    ck-launch-session startkde
+else
+    startkde
+fi
diff --git a/source/kde/kdebase/kdebase.SlackBuild b/source/kde/kdebase/kdebase.SlackBuild
index 89ff3a50..53732fb5 100755
--- a/source/kde/kdebase/kdebase.SlackBuild
+++ b/source/kde/kdebase/kdebase.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -54,6 +54,10 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# patch a problem where closing a konsole tab breaks the right-click context menu:
+zcat $CWD/konsole_right_click-185466.patch.gz | patch --verbose -p2 || exit 1
+zcat $CWD/konsole_right_click-185466.patch.patch.gz | patch --verbose -p1 || exit 1
+
 mkdir -p build
 cd build
   cmake \
diff --git a/source/kde/kdebase/konsole_right_click-185466.patch b/source/kde/kdebase/konsole_right_click-185466.patch
new file mode 100644
index 00000000..a3e19ab5
--- /dev/null
+++ b/source/kde/kdebase/konsole_right_click-185466.patch
@@ -0,0 +1,99 @@
+Index: tmp/kdebase-4.5.5/apps/konsole/src/MainWindow.cpp
+===================================================================
+--- tmp.orig/kdebase-4.5.5/apps/konsole/src/MainWindow.cpp
++++ tmp/kdebase-4.5.5/apps/konsole/src/MainWindow.cpp
+@@ -86,6 +86,8 @@ MainWindow::MainWindow()
+     connect( _viewManager , SIGNAL(empty()) , this , SLOT(close()) );
+     connect( _viewManager , SIGNAL(activeViewChanged(SessionController*)) , this ,
+             SLOT(activeViewChanged(SessionController*)) );
++    connect( _viewManager , SIGNAL(unplugController(SessionController*)) , this ,
++            SLOT(disconnectController(SessionController*)) );
+     connect( _viewManager , SIGNAL(viewPropertiesChanged(const QList<ViewProperties*>&)) ,
+            bookmarkHandler() , SLOT(setViews(const QList<ViewProperties*>&)) );
+ 
+Index: tmp/kdebase-4.5.5/apps/konsole/src/MainWindow.h
+===================================================================
+--- tmp.orig/kdebase-4.5.5/apps/konsole/src/MainWindow.h
++++ tmp/kdebase-4.5.5/apps/konsole/src/MainWindow.h
+@@ -161,6 +161,7 @@ class MainWindow : public KXmlGuiWindow
+         void showShortcutsDialog();
+         void newFromProfile(Profile::Ptr profile);
+         void activeViewChanged(SessionController* controller);
++        void disconnectController(SessionController* controller);
+         void activeViewTitleChanged(ViewProperties*);
+ 
+         void sessionListChanged(const QList<QAction*>& actions);
+@@ -179,7 +180,6 @@ class MainWindow : public KXmlGuiWindow
+         void setupActions();
+         void setupWidgets();
+         QString activeSessionDir() const;
+-        void disconnectController(SessionController* controller);
+ 
+         // sets the active shortcuts of actions in 'dest' to the shortcuts of actions
+         // with the same name in 'source' (see KAction::ActiveShortcut)
+Index: tmp/kdebase-4.5.5/apps/konsole/src/ViewManager.cpp
+===================================================================
+--- tmp.orig/kdebase-4.5.5/apps/konsole/src/ViewManager.cpp
++++ tmp/kdebase-4.5.5/apps/konsole/src/ViewManager.cpp
+@@ -376,6 +376,10 @@ void ViewManager::sessionFinished()
+         }
+     }
+ 
++    // This is needed to remove this controller from factory() in
++    // order to prevent BUG: 185466 - disappearing menu popup
++    if (_pluggedController)
++        emit unplugController(_pluggedController);
+ }
+ 
+ void ViewManager::focusActiveView()
+@@ -744,6 +748,9 @@ void ViewManager::viewCloseRequest(QWidg
+         focusActiveView();
+         updateDetachViewState();
+     }
++    if (_pluggedController)
++        emit unplugController(_pluggedController);
++
+ }
+ 
+ TerminalDisplay* ViewManager::createTerminalDisplay(Session* session)
+Index: tmp/kdebase-4.5.5/apps/konsole/src/ViewManager.h
+===================================================================
+--- tmp.orig/kdebase-4.5.5/apps/konsole/src/ViewManager.h
++++ tmp/kdebase-4.5.5/apps/konsole/src/ViewManager.h
+@@ -175,6 +175,12 @@ signals:
+     void activeViewChanged(SessionController* controller);
+ 
+     /**
++     * Emitted when the current session needs to be unplugged from factory().
++     * @param controller The controller associated with the view
++     */
++    void unplugController(SessionController* controller);
++
++    /**
+      * Emitted when the list of view properties ( as returned by viewProperties() ) changes.
+      * This occurs when views are added to or removed from the active container, or 
+      * if the active container is changed.
+Index: tmp/kdebase-4.5.5/apps/konsole/src/ViewContainer.cpp
+===================================================================
+--- tmp.orig/kdebase-4.5.5/apps/konsole/src/ViewContainer.cpp
++++ tmp/kdebase-4.5.5/apps/konsole/src/ViewContainer.cpp
+@@ -448,6 +448,7 @@ TabbedViewContainer::TabbedViewContainer
+     _closeTabButton->setIcon(KIcon("tab-close"));
+     _closeTabButton->adjustSize();
+     _closeTabButton->setHidden(true);
++    _closeTabButton->setEnabled(false);
+ 
+     connect( _tabBar , SIGNAL(currentChanged(int)) , this , SLOT(currentTabChanged(int)) );
+     connect( _tabBar , SIGNAL(tabDoubleClicked(int)) , this , SLOT(tabDoubleClicked(int)) );
+@@ -500,9 +501,11 @@ TabbedViewContainer::TabbedViewContainer
+         i18nc("@action:inmenu", "&Rename Tab..."), this,
+         SLOT(tabContextMenuRenameTab()));
+ 
++/* bug 185466
+     _contextPopupMenu->addAction(KIcon("tab-close"),
+         i18nc("@action:inmenu", "&Close Tab"), this,
+         SLOT(tabContextMenuCloseTab()));
++*/
+ 
+ }
+ void TabbedViewContainer::setNewViewMenu(QMenu* menu)
diff --git a/source/kde/kdebase/konsole_right_click-185466.patch.patch b/source/kde/kdebase/konsole_right_click-185466.patch.patch
new file mode 100644
index 00000000..8e6f6c68
--- /dev/null
+++ b/source/kde/kdebase/konsole_right_click-185466.patch.patch
@@ -0,0 +1,11 @@
+--- ./apps/konsole/src/ViewContainer.cpp.orig	2011-04-04 15:05:38.000000000 -0500
++++ ./apps/konsole/src/ViewContainer.cpp	2011-04-04 15:08:58.000000000 -0500
+@@ -448,7 +448,7 @@
+     _closeTabButton->setIcon(KIcon("tab-close"));
+     _closeTabButton->adjustSize();
+     _closeTabButton->setHidden(true);
+-    _closeTabButton->setEnabled(false);
++    _closeTabButton->setEnabled(true);
+ 
+     connect( _tabBar , SIGNAL(currentChanged(int)) , this , SLOT(currentTabChanged(int)) );
+     connect( _tabBar , SIGNAL(tabDoubleClicked(int)) , this , SLOT(tabDoubleClicked(int)) );
diff --git a/source/kde/kdebase/local.options b/source/kde/kdebase/local.options
new file mode 100644
index 00000000..a837340d
--- /dev/null
+++ b/source/kde/kdebase/local.options
@@ -0,0 +1 @@
+BUILD=3
diff --git a/source/kde/kdebase/module_manager_include.diff b/source/kde/kdebase/module_manager_include.diff
deleted file mode 100644
index 498b2afb..00000000
--- a/source/kde/kdebase/module_manager_include.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- trunk/KDE/kdebase/apps/konqueror/sidebar/module_manager.h	2009/11/13 18:46:51	1048689
-+++ trunk/KDE/kdebase/apps/konqueror/sidebar/module_manager.h	2010/01/07 20:09:11	1071281
-@@ -18,6 +18,9 @@
-     Boston, MA 02110-1301, USA.
- */
- 
-+#ifndef MODULE_MANAGER_H
-+#define MODULE_MANAGER_H
-+
- #include <QStringList>
- #include <kservice.h>
- class KConfigGroup;
-@@ -74,3 +77,5 @@
-     KConfigGroup *m_config; // owned by SidebarWidget
-     QString m_localPath; // local path
- };
-+
-+#endif
-
diff --git a/source/kde/kdebindings/kdebindings.1170602.sip_4_11_x.diff b/source/kde/kdebindings/kdebindings.1170602.sip_4_11_x.diff
new file mode 100644
index 00000000..b925f97c
--- /dev/null
+++ b/source/kde/kdebindings/kdebindings.1170602.sip_4_11_x.diff
@@ -0,0 +1,66 @@
+Index: python/pykde4/sip/kdecore/typedefs.sip
+===================================================================
+--- python/pykde4/sip/kdecore/typedefs.sip	(revision 1170601)
++++ python/pykde4/sip/kdecore/typedefs.sip	(revision 1170602)
+@@ -733,61 +733,6 @@
+ };
+ 
+ 
+-%MappedType QList<uint>
+-{
+-%TypeHeaderCode
+-#include <qlist.h>
+-%End
+-
+-%ConvertFromTypeCode
+-    // Create the list.
+-    PyObject *l;
+-
+-    if ((l = PyList_New(sipCpp->size())) == NULL)
+-        return NULL;
+-
+-    // Set the list elements.
+-    for (int i = 0; i < sipCpp->size(); ++i) {
+-        PyObject *pobj;
+-
+-#if PY_MAJOR_VERSION >= 3
+-        if ((pobj = PyLong_FromLong(sipCpp->value(i))) == NULL) {
+-#else
+-        if ((pobj = PyInt_FromLong(sipCpp->value(i))) == NULL) {
+-#endif
+-            Py_DECREF(l);
+-
+-            return NULL;
+-        }
+-
+-        PyList_SET_ITEM(l, i, pobj);
+-    }
+-
+-    return l;
+-%End
+-
+-%ConvertToTypeCode
+-    // Check the type if that is all that is required.
+-    if (sipIsErr == NULL)
+-        return PyList_Check(sipPy);
+-
+-    QList<uint> *ql = new QList<uint>;
+- 
+-    for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) {
+-#if PY_MAJOR_VERSION >= 3
+-        ql->append(PyLong_AsLong(PyList_GET_ITEM(sipPy, i)));
+-#else
+-        ql->append(PyInt_AsLong(PyList_GET_ITEM(sipPy, i)));
+-#endif        
+-    }
+-    
+-    *sipCppPtr = ql;
+- 
+-    return sipGetState(sipTransferObj);
+-%End
+-};
+-
+-
+ template <TYPE*>
+ %MappedType QStack<TYPE*>
+ {
diff --git a/source/kde/kdebindings/kdebindings.SlackBuild b/source/kde/kdebindings/kdebindings.SlackBuild
index 21df45de..c07ab1ab 100755
--- a/source/kde/kdebindings/kdebindings.SlackBuild
+++ b/source/kde/kdebindings/kdebindings.SlackBuild
@@ -50,6 +50,8 @@ cd kdebindings-$VERSION
 zcat $CWD/kdebindings-len-ptr-rfloat.diff.gz | patch -p1 --verbose || exit 1
 zcat $CWD/kdebindings-ruby-env.h.diff.gz | patch -p1 --verbose || exit 1
 zcat $CWD/kdebindings-rubyconfig.h.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/kdebindings.1170602.sip_4_11_x.diff.gz | patch -p0 --verbose || exit 1
+( cd python/pykde4/tools/pykdeuic4 ; zcat $CWD/pykdeuic4.patch.gz | patch -p0 --verbose || exit 1 ) || exit 1
 
 chown -R root:root .
 find . \
@@ -58,6 +60,10 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Set 'vendorarch' (install location for vendor shipped
+# architecture dependent perl modules):
+eval $(perl '-V:vendorarch')
+
 #    -DENABLE_PYKDE4:BOOL=OFF \
 mkdir -p build
 cd build
@@ -69,6 +75,7 @@ cd build
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DMAN_INSTALL_DIR=/usr/man \
+    -DCUSTOM_PERL_SITE_ARCH_DIR=$vendorarch \
     -DSYSCONF_INSTALL_DIR=/etc/kde \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     -DENABLE_QYOTO:BOOL=OFF \
diff --git a/source/kde/kdebindings/pykdeuic4.patch b/source/kde/kdebindings/pykdeuic4.patch
new file mode 100644
index 00000000..7cd77946
--- /dev/null
+++ b/source/kde/kdebindings/pykdeuic4.patch
@@ -0,0 +1,22 @@
+Index: pykdeuic4.py
+===================================================================
+--- pykdeuic4.py	(revisione 1209658)
++++ pykdeuic4.py	(copia locale)
+@@ -39,7 +39,7 @@
+     def __init__(self,string):
+         original_i18n_string.__init__(self,string)
+     def __str__(self):
+-        return "kdecore.i18n(\"%s\")" % (qtproxies.escape(self.string),)
++        return "kdecore.i18n(\"%s\")" % (qtproxies.as_string(self.string),)
+ qtproxies.i18n_string = kde_i18n_string
+ 
+ def kdeFilter():
+@@ -71,7 +71,7 @@
+     indenter.indentwidth = indent
+     comp = compiler.UICompiler()
+     comp.factory._cwFilters.append(kdeFilter())
+-    winfo = comp.compileUi(uifile, output)
++    winfo = comp.compileUi(uifile, output, "")
+ 
+     if exe:
+         output.write("""
diff --git a/source/kde/kdegraphics/kdegraphics.SlackBuild b/source/kde/kdegraphics/kdegraphics.SlackBuild
index a33ffbcc..dd957444 100755
--- a/source/kde/kdegraphics/kdegraphics.SlackBuild
+++ b/source/kde/kdegraphics/kdegraphics.SlackBuild
@@ -47,8 +47,6 @@ echo "Building kdegraphics-$VERSION..."
 tar xvf $CWD/../src/kdegraphics-$VERSION.tar.?z* || exit 1
 cd kdegraphics-$VERSION
 
-zcat $CWD/kdegraphics.gwenview.jpeg8.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 \) \
@@ -68,7 +66,7 @@ cd build
     -DSYSCONF_INSTALL_DIR=/etc/kde \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     ..
-   make $NUMJOBS || exit 1
+   make $NUMJOBS || make || exit 1
    make install DESTDIR=$PKG || exit 1
 cd -
 
diff --git a/source/kde/kdegraphics/kdegraphics.gwenview.jpeg8.diff b/source/kde/kdegraphics/kdegraphics.gwenview.jpeg8.diff
deleted file mode 100644
index 8d509f4d..00000000
--- a/source/kde/kdegraphics/kdegraphics.gwenview.jpeg8.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./gwenview/lib/jpegcontent.cpp.orig	2009-05-14 12:26:10.000000000 -0500
-+++ ./gwenview/lib/jpegcontent.cpp	2010-05-17 21:08:10.000000000 -0500
-@@ -455,9 +455,8 @@
- 
- 	// Init transformation
- 	jpeg_transform_info transformoption;
-+	memset(&transformoption, 0, sizeof(jpeg_transform_info));
- 	transformoption.transform = findJxform(d->mTransformMatrix);
--	transformoption.force_grayscale = false;
--	transformoption.trim = false;
- 	jtransform_request_workspace(&srcinfo, &transformoption);
- 
- 	/* Read source file as DCT coefficients */
diff --git a/source/kde/kdegraphics/local.options b/source/kde/kdegraphics/local.options
index aae3c765..a837340d 100644
--- a/source/kde/kdegraphics/local.options
+++ b/source/kde/kdegraphics/local.options
@@ -1 +1 @@
-BUILD=2
+BUILD=3
diff --git a/source/kde/kdelibs/kdelibs.SlackBuild b/source/kde/kdelibs/kdelibs.SlackBuild
index aa6ddde0..94e67287 100755
--- a/source/kde/kdelibs/kdelibs.SlackBuild
+++ b/source/kde/kdelibs/kdelibs.SlackBuild
@@ -47,6 +47,12 @@ echo "Building kdelibs-$VERSION..."
 tar xvf $CWD/../src/kdelibs-$VERSION.tar.?z* || exit 1
 cd kdelibs-$VERSION
 
+# Slackware ships a different version of XML DTDs:
+zcat $CWD/kdelibs.docbook.patch.gz | patch -p1 --verbose || exit 1
+
+# Security fix:
+zcat $CWD/kdelibs.khtml.CVE-2011-1168.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 \) \
@@ -67,7 +73,7 @@ cd build
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     -DKDE_DISTRIBUTION_TEXT="volkerdi@slackware.com" \
     ..
-   make $NUMJOBS || exit 1
+   make $NUMJOBS || make || exit 1
    make install DESTDIR=$PKG || exit 1
 cd -
 
diff --git a/source/kde/kdelibs/kdelibs.docbook.patch b/source/kde/kdelibs/kdelibs.docbook.patch
new file mode 100644
index 00000000..6a20cd27
--- /dev/null
+++ b/source/kde/kdelibs/kdelibs.docbook.patch
@@ -0,0 +1,11 @@
+--- kdelibs-4.4.85/cmake/modules/FindDocBookXML.cmake.orig	2010-05-27 19:25:00.000000000 +0200
++++ kdelibs-4.4.85/cmake/modules/FindDocBookXML.cmake	2010-06-07 16:18:35.000000000 +0200
+@@ -12,7 +12,7 @@
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+ 
+-set (DOCBOOKXML_CURRENTDTD_VERSION "4.2"
++set (DOCBOOKXML_CURRENTDTD_VERSION "4.5"
+      CACHE INTERNAL "Required version of XML DTDs")
+ 
+ set (DTD_PATH_LIST
diff --git a/source/kde/kdelibs/kdelibs.khtml.CVE-2011-1168.diff b/source/kde/kdelibs/kdelibs.khtml.CVE-2011-1168.diff
new file mode 100644
index 00000000..356f30a6
--- /dev/null
+++ b/source/kde/kdelibs/kdelibs.khtml.CVE-2011-1168.diff
@@ -0,0 +1,14 @@
+--- a/khtml/khtml_part.cpp
++++ b/khtml/khtml_part.cpp
+@@ -1803,7 +1803,10 @@ void KHTMLPart::htmlError( int errorCode
+   stream >> errorName >> techName >> description >> causes >> solutions;
+ 
+   QString url, protocol, datetime;
+-  url = Qt::escape( reqUrl.prettyUrl() );
++
++  // This is somewhat confusing, but we have to escape the externally-
++  // controlled URL twice: once for i18n, and once for HTML.
++  url = Qt::escape( Qt::escape( reqUrl.prettyUrl() ) );
+   protocol = reqUrl.protocol();
+   datetime = KGlobal::locale()->formatDateTime( QDateTime::currentDateTime(),
+                                                 KLocale::LongDate );
diff --git a/source/kde/kdelibs/local.options b/source/kde/kdelibs/local.options
new file mode 100644
index 00000000..aae3c765
--- /dev/null
+++ b/source/kde/kdelibs/local.options
@@ -0,0 +1 @@
+BUILD=2
diff --git a/source/kde/kdenetwork/kdenetwork.SlackBuild b/source/kde/kdenetwork/kdenetwork.SlackBuild
index 9ff64fb9..8f93627d 100755
--- a/source/kde/kdenetwork/kdenetwork.SlackBuild
+++ b/source/kde/kdenetwork/kdenetwork.SlackBuild
@@ -47,9 +47,6 @@ echo "Building kdenetwork-$VERSION..."
 tar xvf $CWD/../src/kdenetwork-$VERSION.tar.?z* || exit 1
 cd kdenetwork-$VERSION
 
-# CVE-2010-1000 and CVE-2010-1511:
-zcat $CWD/kget.kde44.CVE-2010-1000-1511.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 \) \
diff --git a/source/kde/kdenetwork/kget.kde44.CVE-2010-1000-1511.diff b/source/kde/kdenetwork/kget.kde44.CVE-2010-1000-1511.diff
deleted file mode 100644
index fdabbff0..00000000
--- a/source/kde/kdenetwork/kget.kde44.CVE-2010-1000-1511.diff
+++ /dev/null
@@ -1,212 +0,0 @@
-Index: kget/transfer-plugins/metalink/metalink.cpp
-===================================================================
---- kget/transfer-plugins/metalink/metalink.cpp	(revision 1124973)
-+++ kget/transfer-plugins/metalink/metalink.cpp	(revision 1124974)
-@@ -99,6 +99,7 @@
- void Metalink::metalinkInit(const KUrl &src, const QByteArray &data)
- {
-     kDebug(5001);
-+
-     bool justDownloaded = !m_localMetalinkLocation.isValid();
-     if (!src.isEmpty())
-     {
-@@ -121,7 +122,9 @@
-     //error
-     if (!m_metalink.isValid())
-     {
--        kDebug(5001) << "Unknown error when trying to load the .metalink-file";
-+        kError(5001) << "Unknown error when trying to load the .metalink-file. Metalink is not valid.";
-+        setStatus(Job::Aborted);
-+        setTransferChange(Tc_Status, true);
-         return;
-     }
- 
-@@ -202,7 +205,7 @@
-     if (!m_dataSourceFactory.size())
-     {
-         KMessageBox::error(0, i18n("Download failed, no working URLs were found."), i18n("Error"));
--        setStatus(Job::Aborted, i18n("An error occurred...."), SmallIcon("document-preview"));
-+        setStatus(Job::Aborted);
-         setTransferChange(Tc_Status, true);
-         return;
-     }
-@@ -227,16 +230,29 @@
-         ui.treeView->hideColumn(FileItem::SignatureVerified);
-         dialog->setMainWidget(widget);
-         dialog->setCaption(i18n("File Selection"));
--        dialog->setButtons(KDialog::Ok);
--        connect(dialog, SIGNAL(finished()), this, SLOT(filesSelected()));
-+        dialog->setButtons(KDialog::Ok | KDialog::Cancel);
-+        connect(dialog, SIGNAL(finished(int)), this, SLOT(fileDlgFinished(int)));
- 
-         dialog->show();
-     }
- }
- 
--void Metalink::filesSelected()
-+void Metalink::fileDlgFinished(int result)
- {
-+    //BEGIN HACK if the dialog was not accepted untick every file, so that the download does not start
-+    //generally setStatus should do the job as well, but does not as it appears
-+    if (result != QDialog::Accepted) {
-+        for (int row = 0; row < fileModel()->rowCount(); ++row) {
-+            QModelIndex index = fileModel()->index(row, FileItem::File);
-+            if (index.isValid()) {
-+                fileModel()->setData(index, Qt::Unchecked, Qt::CheckStateRole);
-+            }
-+        }
-+    }
-+    //END
-+
-     QModelIndexList files = fileModel()->fileIndexes(FileItem::File);
-+    int numFilesSelected = 0;
-     foreach (const QModelIndex &index, files)
-     {
-         const KUrl dest = fileModel()->getUrl(index);
-@@ -244,6 +260,9 @@
-         if (m_dataSourceFactory.contains(dest))
-         {
-             m_dataSourceFactory[dest]->setDoDownload(doDownload);
-+            if (doDownload) {
-+                ++numFilesSelected;
-+            }
-         }
-     }
- 
-@@ -252,9 +271,15 @@
-     processedSizeChanged();
-     speedChanged();
- 
-+    //no files selected to download or dialog rejected, stop the download
-+    if (!numFilesSelected  || (result != QDialog::Accepted)) {
-+         setStatus(Job::Stopped);//FIXME
-+         setTransferChange(Tc_Status, true);
-+        return;
-+    }
-+
-     //some files may be set to download, so start them as long as the transfer is not stopped
--    if (status() != Job::Stopped)
--    {
-+    if (status() != Job::Stopped) {
-         startMetalink();
-     }
- }
-Index: kget/transfer-plugins/metalink/metalink.h
-===================================================================
---- kget/transfer-plugins/metalink/metalink.h	(revision 1124973)
-+++ kget/transfer-plugins/metalink/metalink.h	(revision 1124974)
-@@ -81,7 +81,7 @@
- 
-     private Q_SLOTS:
-         void metalinkInit(const KUrl &url = KUrl(), const QByteArray &data = QByteArray());
--        void filesSelected();
-+        void fileDlgFinished(int result);
-         void totalSizeChanged(KIO::filesize_t size);
-         void processedSizeChanged();
-         void speedChanged();
-Index: kget/ui/metalinkcreator/metalinker.h
-===================================================================
---- kget/ui/metalinkcreator/metalinker.h	(revision 1124973)
-+++ kget/ui/metalinkcreator/metalinker.h	(revision 1124974)
-@@ -259,6 +259,14 @@
-         KIO::filesize_t size;
-         CommonData data;
-         Resources resources;
-+
-+    private:
-+        /**
-+         * Controlls if the name attribute is valid, i.e. it is not empty and
-+         * does not contain any directory traversal directives or information,
-+         * as described in the Metalink 4.0 specification 4.1.2.1.
-+         */
-+        bool isValidNameAttribute() const;
- };
- 
- class Files
-Index: kget/ui/metalinkcreator/metalinker.cpp
-===================================================================
---- kget/ui/metalinkcreator/metalinker.cpp	(revision 1124973)
-+++ kget/ui/metalinkcreator/metalinker.cpp	(revision 1124974)
-@@ -528,14 +528,14 @@
- 
- bool KGetMetalink::File::isValid() const
- {
--    return !name.isEmpty() && resources.isValid();
-+    return isValidNameAttribute() && resources.isValid();
- }
- 
- void KGetMetalink::File::load(const QDomElement &e)
- {
-     data.load(e);
- 
--    name = e.attribute("name");
-+    name = QUrl::fromPercentEncoding(e.attribute("name").toAscii());
-     size = e.firstChildElement("size").text().toULongLong();
- 
-     verification.load(e);
-@@ -575,6 +575,22 @@
-     resources.clear();
- }
- 
-+
-+bool KGetMetalink::File::isValidNameAttribute() const
-+{
-+    if (name.isEmpty()) {
-+        kError(5001) << "Name attribute of Metalink::File is empty.";
-+        return false;
-+    }
-+
-+    if (name.contains(QRegExp("$(\\.\\.?)?/")) || name.contains("/../") || name.endsWith("/..")) {
-+        kError(5001) << "Name attribute of Metalink::File contains directory traversal directives:" << name;
-+        return false;
-+    }
-+
-+    return true;
-+}
-+
- #ifdef HAVE_NEPOMUK
- QHash<QUrl, Nepomuk::Variant> KGetMetalink::File::properties() const
- {
-@@ -584,13 +600,28 @@
- 
- bool KGetMetalink::Files::isValid() const
- {
--    bool isValid = !files.empty();
--    foreach (const File &file, files)
--    {
--        isValid &= file.isValid();
-+    if (files.isEmpty()) {
-+        return false;
-     }
- 
--    return isValid;
-+    QStringList fileNames;
-+    foreach (const File &file, files) {
-+        fileNames << file.name;
-+        if (!file.isValid()) {
-+            return false;
-+        }
-+    }
-+
-+    //The value of name must be unique for each file
-+    while (!fileNames.isEmpty()) {
-+        const QString fileName = fileNames.takeFirst();
-+        if (fileNames.contains(fileName)) {
-+            kError(5001) << "Metalink::File name" << fileName << "exists multiple times.";
-+            return false;
-+        }
-+    }
-+
-+    return true;
- }
- 
- void KGetMetalink::Files::load(const QDomElement &e)
-@@ -751,7 +782,7 @@
- 
-     for (QDomElement elem = filesElem.firstChildElement("file"); !elem.isNull(); elem = elem.nextSiblingElement("file")) {
-         File file;
--        file.name = elem.attribute("name");
-+        file.name = QUrl::fromPercentEncoding(elem.attribute("name").toAscii());
-         file.size = elem.firstChildElement("size").text().toULongLong();
- 
-         file.data = parseCommonData(elem);
diff --git a/source/kde/kdepim-runtime/local.options b/source/kde/kdepim-runtime/local.options
new file mode 100644
index 00000000..bab1fcbd
--- /dev/null
+++ b/source/kde/kdepim-runtime/local.options
@@ -0,0 +1 @@
+VERSION=4.4.10
diff --git a/source/kde/kdepim/local.options b/source/kde/kdepim/local.options
new file mode 100644
index 00000000..bab1fcbd
--- /dev/null
+++ b/source/kde/kdepim/local.options
@@ -0,0 +1 @@
+VERSION=4.4.10
diff --git a/source/kde/kdepimlibs/kdepimlibs-4.5.imap4.cpp.r1216162.diff b/source/kde/kdepimlibs/kdepimlibs-4.5.imap4.cpp.r1216162.diff
new file mode 100644
index 00000000..85a216dd
--- /dev/null
+++ b/source/kde/kdepimlibs/kdepimlibs-4.5.imap4.cpp.r1216162.diff
@@ -0,0 +1,13 @@
+Index: branches/KDE/4.5/kdepimlibs/kioslave/imap4/imap4.cpp
+===================================================================
+--- branches/KDE/4.5/kdepimlibs/kioslave/imap4/imap4.cpp	(revision 1216161)
++++ branches/KDE/4.5/kdepimlibs/kioslave/imap4/imap4.cpp	(revision 1216162)
+@@ -2577,7 +2577,7 @@
+     ssize_t copyLen = (len < readBufferLen) ? len : readBufferLen;
+     memcpy(data, readBuffer, copyLen);
+     readBufferLen -= copyLen;
+-    if (readBufferLen) memcpy(readBuffer, &readBuffer[copyLen], readBufferLen);
++    if (readBufferLen) memmove(readBuffer, &readBuffer[copyLen], readBufferLen);
+     return copyLen;
+   }
+   if (!isConnected()) return 0;
diff --git a/source/kde/kdepimlibs/kdepimlibs.SlackBuild b/source/kde/kdepimlibs/kdepimlibs.SlackBuild
index 9fe4b1b8..1cd30a67 100755
--- a/source/kde/kdepimlibs/kdepimlibs.SlackBuild
+++ b/source/kde/kdepimlibs/kdepimlibs.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -46,6 +46,9 @@ cd $TMP
 echo "Building kdepimlibs-$VERSION..."
 tar xvf $CWD/../src/kdepimlibs-$VERSION.tar.?z* || exit 1
 cd kdepimlibs-$VERSION
+
+zcat $CWD/kdepimlibs-4.5.imap4.cpp.r1216162.diff.gz | patch -p4 --verbose || exit 1
+
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source/kde/kdepimlibs/local.options b/source/kde/kdepimlibs/local.options
new file mode 100644
index 00000000..aae3c765
--- /dev/null
+++ b/source/kde/kdepimlibs/local.options
@@ -0,0 +1 @@
+BUILD=2
diff --git a/source/kde/kdevelop/local.options b/source/kde/kdevelop/local.options
index 59095fb9..1e0de715 100644
--- a/source/kde/kdevelop/local.options
+++ b/source/kde/kdevelop/local.options
@@ -1 +1 @@
-VERSION=4.0.0
+VERSION=4.2.2
diff --git a/source/kde/kdevplatform/local.options b/source/kde/kdevplatform/local.options
index 624badec..a9a3ac1c 100644
--- a/source/kde/kdevplatform/local.options
+++ b/source/kde/kdevplatform/local.options
@@ -1 +1 @@
-VERSION=1.0.0
+VERSION=1.2.2
diff --git a/source/kde/koffice/koffice.SlackBuild b/source/kde/koffice/koffice.SlackBuild
index d7332bf5..a87d36e7 100755
--- a/source/kde/koffice/koffice.SlackBuild
+++ b/source/kde/koffice/koffice.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -47,8 +47,6 @@ echo "Building koffice-$VERSION..."
 tar xvf $CWD/../src/koffice-$VERSION.tar.?z* || exit 1
 cd koffice-$VERSION
 
-zcat $CWD/koffice.krita.png14.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 \) \
@@ -62,13 +60,12 @@ cd build
     $KDE_OPT_ARGS \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DMAN_INSTALL_DIR=/usr/man \
     -DSYSCONF_INSTALL_DIR=/etc/kde \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     ..
-   make $NUMJOBS || exit 1
+   make $NUMJOBS || make || exit 1
    make install DESTDIR=$PKG || exit 1
 cd -
 
@@ -76,6 +73,19 @@ if [ -d $PKG/usr/man ]; then
   gzip -9 $PKG/usr/man/man?/*
 fi
 
+if [ ! -r $PKG/usr/bin/kformula ]; then # wtf??
+  echo "Kludging KFormula installation..."
+  cp -a build/kformula/kformula $PKG/usr/bin/kformula || exit 1
+  cp -a build/lib/kformulapart.so $PKG/usr/lib${LIBDIRSUFFIX}/kde4/kformulapart.so || exit 1
+  cp -a build/lib/libkdeinit_kformula.so $PKG/usr/lib${LIBDIRSUFFIX}/libkdeinit_kformula.so || exit 1
+  cp -a kformula/kformula.desktop $PKG/usr/share/applications/kde4/kformula.desktop || exit 1
+  mkdir -p $PKG/usr/share/apps/kformula || exit 1
+  cp -a kformula/kformula.rc $PKG/usr/share/apps/kformula/kformula.rc || exit 1
+  cp -a kformula/kformula_readonly.rc $PKG/usr/share/apps/kformula/kformula_readonly.rc || exit 1
+  cp -a kformula/tips $PKG/usr/share/apps/kformula/tips || exit 1
+  cp -a kformula/kformulapart.desktop $PKG/usr/share/kde4/services/kformulapart.desktop || exit 1
+fi
+
 mkdir -p $PKG/usr/doc/koffice-$VERSION
 cp -a AUTHORS COPYING* README* $PKG/usr/doc/koffice-$VERSION
 
diff --git a/source/kde/koffice/koffice.krita.png14.diff b/source/kde/koffice/koffice.krita.png14.diff
deleted file mode 100644
index 252107de..00000000
--- a/source/kde/koffice/koffice.krita.png14.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./krita/ui/kis_png_converter.cpp.orig	2010-01-08 04:42:41.000000000 -0600
-+++ ./krita/ui/kis_png_converter.cpp	2010-02-25 12:01:11.000000000 -0600
-@@ -404,7 +404,7 @@
- 
-     png_byte signature[8];
-     iod->peek((char*)signature, 8);
--    if (!png_check_sig(signature, 8)) {
-+    if (!(png_sig_cmp(signature, 0, 8) == 0)) {
-         iod->close();
-         return (KisImageBuilder_RESULT_BAD_FETCH);
-     }
diff --git a/source/kde/koffice/local.options b/source/kde/koffice/local.options
index d98d655d..504bb683 100644
--- a/source/kde/koffice/local.options
+++ b/source/kde/koffice/local.options
@@ -1,2 +1,2 @@
-VERSION=2.1.2
+VERSION=2.3.3
 BUILD=2
diff --git a/source/kde/konq-plugins/konq-plugins-4.4.0-qt47.patch b/source/kde/konq-plugins/konq-plugins-4.4.0-qt47.patch
new file mode 100644
index 00000000..02614605
--- /dev/null
+++ b/source/kde/konq-plugins/konq-plugins-4.4.0-qt47.patch
@@ -0,0 +1,12 @@
+diff -up konq-plugins-4.4.0/adblock/adblock.cpp.qt47 konq-plugins-4.4.0/adblock/adblock.cpp
+--- konq-plugins-4.4.0/adblock/adblock.cpp.qt47	2010-09-07 15:51:03.776797042 -0500
++++ konq-plugins-4.4.0/adblock/adblock.cpp	2010-09-07 15:51:47.901818132 -0500
+@@ -300,7 +300,7 @@ void AdBlock::updateFilters()
+ // ----------------------------------------------------------------------------
+ 
+ AdElement::AdElement() :
+-  m_url(0), m_category(0), m_type(0), m_blocked(false) {}
++  m_blocked(false) {}
+ 
+ AdElement::AdElement(const QString &url, const QString &category,
+ 		     const QString &type, bool blocked, const DOM::Node&node) :
diff --git a/source/kde/konq-plugins/konq-plugins.SlackBuild b/source/kde/konq-plugins/konq-plugins.SlackBuild
index 870e6081..472f8b50 100755
--- a/source/kde/konq-plugins/konq-plugins.SlackBuild
+++ b/source/kde/konq-plugins/konq-plugins.SlackBuild
@@ -46,6 +46,9 @@ cd $TMP
 echo "Building konq-plugins-$VERSION..."
 tar xvf $CWD/../src/extragear/konq-plugins-$VERSION.tar.?z* || exit 1
 cd konq-plugins-$VERSION
+
+zcat $CWD/konq-plugins-4.4.0-qt47.patch.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 \) \
diff --git a/source/kde/konq-plugins/local.options b/source/kde/konq-plugins/local.options
index dc6e9bd4..d0a81e8b 100644
--- a/source/kde/konq-plugins/local.options
+++ b/source/kde/konq-plugins/local.options
@@ -1 +1,2 @@
 VERSION=4.4.0
+BUILD=2
diff --git a/source/kde/ktorrent/local.options b/source/kde/ktorrent/local.options
index b95a478a..8b19ba5f 100644
--- a/source/kde/ktorrent/local.options
+++ b/source/kde/ktorrent/local.options
@@ -1 +1 @@
-VERSION=3.3.4
+VERSION=4.0.5
diff --git a/source/kde/libktorrent/libktorrent.SlackBuild b/source/kde/libktorrent/libktorrent.SlackBuild
new file mode 100755
index 00000000..468039ae
--- /dev/null
+++ b/source/kde/libktorrent/libktorrent.SlackBuild
@@ -0,0 +1,90 @@
+#!/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.
+
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-libktorrent
+
+# Set the config option variables if they are not already set:
+if [ -r ../KDE.options ]; then
+  . ../KDE.options
+fi
+
+# The global options may be overridden here (if needed):
+if [ -r ./local.options ]; then
+  . ./local.options
+fi
+
+# Avoid a version number in .la files:
+if [ -d /usr/lib${LIBDIRSUFFIX}/qt ]; then
+  QTDIR=/usr/lib${LIBDIRSUFFIX}/qt
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+echo "Building libktorrent-$VERSION..."
+tar xvf $CWD/../src/extragear/libktorrent-${VERSION}.tar.?z* || exit 1
+cd libktorrent-$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 build
+cd build
+  cmake \
+    $KDE_OPT_ARGS \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DSYSCONF_INSTALL_DIR=/etc/kde \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    ..
+   make $NUMJOBS || exit 1
+   make install DESTDIR=$PKG || exit 1
+cd -
+
+if [ -d $PKG/usr/man ]; then
+  gzip -9 $PKG/usr/man/man?/*
+fi
+
+mkdir -p $PKG/usr/doc/libktorrent-$VERSION
+cp -a COPYING* ChangeLog \
+  $PKG/usr/doc/libktorrent-$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/libktorrent-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz
+
diff --git a/source/kde/libktorrent/local.options b/source/kde/libktorrent/local.options
new file mode 100644
index 00000000..dd52e8e3
--- /dev/null
+++ b/source/kde/libktorrent/local.options
@@ -0,0 +1 @@
+VERSION=1.0.5-3
diff --git a/source/kde/libktorrent/slack-desc b/source/kde/libktorrent/slack-desc
new file mode 100644
index 00000000..e8334401
--- /dev/null
+++ b/source/kde/libktorrent/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------------------------------------------------------|
+libktorrent: libktorrent (Protocol library for the KDE BitTorrent program)
+libktorrent:
+libktorrent: Libktorrent is the BitTorrent protocol library for ktorrent, which
+libktorrent: contains all the torrent downloading code.  Although it is closely
+libktorrent: to ktorrent, the goal is to make libktorrent an independent library
+libktorrent: which can be used by other applications.
+libktorrent:
+libktorrent: Homepage:  http://ktorrent.org
+libktorrent:
+libktorrent:
+libktorrent:
diff --git a/source/kde/polkit-kde-1/local.options b/source/kde/polkit-kde-1/local.options
index 711ed9e8..4e14dd77 100644
--- a/source/kde/polkit-kde-1/local.options
+++ b/source/kde/polkit-kde-1/local.options
@@ -1,2 +1,2 @@
-#VERSION=0.95.1
-VERSION=r1120537
+VERSION=r1145544
+BUILD=2
diff --git a/source/kde/polkit-kde-1/polkit-kde-1.SlackBuild b/source/kde/polkit-kde-1/polkit-kde-1.SlackBuild
index eab0d56b..eb896170 100755
--- a/source/kde/polkit-kde-1/polkit-kde-1.SlackBuild
+++ b/source/kde/polkit-kde-1/polkit-kde-1.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -48,6 +48,8 @@ echo "Building polkit-kde-1-$VERSION..."
 tar xvf $CWD/../src/polkit-kde-1-$VERSION.tar.?z* || exit 1
 cd polkit-kde-1-$VERSION
 
+zcat $CWD/polkit-kde-1.nodrkonqi.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 \) \
diff --git a/source/kde/polkit-kde-1/polkit-kde-1.nodrkonqi.diff b/source/kde/polkit-kde-1/polkit-kde-1.nodrkonqi.diff
new file mode 100644
index 00000000..60fd8b7b
--- /dev/null
+++ b/source/kde/polkit-kde-1/polkit-kde-1.nodrkonqi.diff
@@ -0,0 +1,17 @@
+--- ./agent/main.cpp.orig	2010-07-05 10:08:40.000000000 -0500
++++ ./agent/main.cpp	2011-03-30 18:52:38.636002143 -0500
+@@ -21,11 +21,14 @@
+ #include <KCmdLineArgs>
+ #include <KAboutData>
+ #include <KLocale>
++#include <cstdlib>
+ 
+ #include "policykitkde.h"
+ 
+ int main(int argc, char *argv[])
+ {
++    setenv("KDE_DEBUG", "true", 1);
++
+     KAboutData aboutData("policykit1-kde", "polkit-kde-authentication-agent-1", ki18n("PolicyKit1-KDE"), "0.96.1",
+                          ki18n("PolicyKit1-KDE"), KAboutData::License_GPL,
+                          ki18n("(c) 2009 Red Hat, Inc."));
diff --git a/source/kde/polkit-kde-agent-1/local.options b/source/kde/polkit-kde-agent-1/local.options
new file mode 100644
index 00000000..416b9670
--- /dev/null
+++ b/source/kde/polkit-kde-agent-1/local.options
@@ -0,0 +1 @@
+VERSION=20101202git
diff --git a/source/kde/polkit-kde-agent-1/polkit-kde-agent-1.SlackBuild b/source/kde/polkit-kde-agent-1/polkit-kde-agent-1.SlackBuild
new file mode 100755
index 00000000..d49026a1
--- /dev/null
+++ b/source/kde/polkit-kde-agent-1/polkit-kde-agent-1.SlackBuild
@@ -0,0 +1,93 @@
+#!/bin/sh
+
+# Copyright 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-polkit-kde-agent-1
+
+
+# Set the config option variables if they are not already set:
+if [ -r ../KDE.options ]; then
+  . ../KDE.options
+fi
+
+# The global options may be overridden here (if needed):
+if [ -r ./local.options ]; then
+  . ./local.options
+fi
+
+# Avoid a version number in .la files:
+if [ -d /usr/lib${LIBDIRSUFFIX}/kde ]; then
+  QTDIR=/usr/lib${LIBDIRSUFFIX}/kde
+fi
+
+rm -rf $PKG
+mkdir -p $PKG/usr
+cd $TMP
+echo "Building polkit-kde-agent-1-$VERSION..."
+tar xvf $CWD/../src/polkit-kde-agent-1-$VERSION.tar.?z* || exit 1
+cd polkit-kde-agent-1-$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 build
+cd build
+  cmake \
+    $KDE_OPT_ARGS \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DSYSCONF_INSTALL_DIR=/etc \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    ..
+   make $NUMJOBS || make || exit 1
+   make install DESTDIR=$PKG || exit 1
+cd -
+
+if [ -d $PKG/usr/man ]; then
+  gzip -9 $PKG/usr/man/man?/*
+fi
+
+mkdir -p $PKG/usr/doc/polkit-kde-agent-1-$VERSION
+cp -a \
+  COPYING* README* \
+  $PKG/usr/doc/polkit-kde-agent-1-$VERSION
+
+( 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
+)
+
+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/polkit-kde-agent-1-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/kde/polkit-kde-agent-1/pull-polkit-kde-agent-1 b/source/kde/polkit-kde-agent-1/pull-polkit-kde-agent-1
new file mode 100644
index 00000000..34da1087
--- /dev/null
+++ b/source/kde/polkit-kde-agent-1/pull-polkit-kde-agent-1
@@ -0,0 +1,6 @@
+rm -rf polkit-kde-agent-1
+git clone git://anongit.kde.org/polkit-kde-agent-1
+( cd polkit-kde-agent-1 && rm -rf .git* )
+mv polkit-kde-agent-1 polkit-kde-agent-1-$(date +%Y%m%d)git
+tar cf polkit-kde-agent-1-$(date +%Y%m%d)git.tar polkit-kde-agent-1-$(date +%Y%m%d)git
+xz -9 polkit-kde-agent-1-$(date +%Y%m%d)git.tar
diff --git a/source/kde/polkit-kde-agent-1/slack-desc b/source/kde/polkit-kde-agent-1/slack-desc
new file mode 100644
index 00000000..8b6f29ba
--- /dev/null
+++ b/source/kde/polkit-kde-agent-1/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-----------------------------------------------------|
+polkit-kde-agent-1: polkit-kde-agent-1 (KDE polkit authenticator)
+polkit-kde-agent-1:
+polkit-kde-agent-1: This is a polkit authenticator for KDE.
+polkit-kde-agent-1: 
+polkit-kde-agent-1: 
+polkit-kde-agent-1: 
+polkit-kde-agent-1: 
+polkit-kde-agent-1:
+polkit-kde-agent-1: 
+polkit-kde-agent-1:
diff --git a/source/kde/polkit-kde-kcmodules-1/local.options b/source/kde/polkit-kde-kcmodules-1/local.options
new file mode 100644
index 00000000..416b9670
--- /dev/null
+++ b/source/kde/polkit-kde-kcmodules-1/local.options
@@ -0,0 +1 @@
+VERSION=20101202git
diff --git a/source/kde/polkit-kde-kcmodules-1/polkit-kde-kcmodules-1.SlackBuild b/source/kde/polkit-kde-kcmodules-1/polkit-kde-kcmodules-1.SlackBuild
new file mode 100755
index 00000000..1a3bde05
--- /dev/null
+++ b/source/kde/polkit-kde-kcmodules-1/polkit-kde-kcmodules-1.SlackBuild
@@ -0,0 +1,93 @@
+#!/bin/sh
+
+# Copyright 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-polkit-kde-kcmodules-1
+
+
+# Set the config option variables if they are not already set:
+if [ -r ../KDE.options ]; then
+  . ../KDE.options
+fi
+
+# The global options may be overridden here (if needed):
+if [ -r ./local.options ]; then
+  . ./local.options
+fi
+
+# Avoid a version number in .la files:
+if [ -d /usr/lib${LIBDIRSUFFIX}/kde ]; then
+  QTDIR=/usr/lib${LIBDIRSUFFIX}/kde
+fi
+
+rm -rf $PKG
+mkdir -p $PKG/usr
+cd $TMP
+echo "Building polkit-kde-kcmodules-1-$VERSION..."
+tar xvf $CWD/../src/polkit-kde-kcmodules-1-$VERSION.tar.?z* || exit 1
+cd polkit-kde-kcmodules-1-$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 build
+cd build
+  cmake \
+    $KDE_OPT_ARGS \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DSYSCONF_INSTALL_DIR=/etc \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    ..
+   make $NUMJOBS || make || exit 1
+   make install DESTDIR=$PKG || exit 1
+cd -
+
+if [ -d $PKG/usr/man ]; then
+  gzip -9 $PKG/usr/man/man?/*
+fi
+
+mkdir -p $PKG/usr/doc/polkit-kde-kcmodules-1-$VERSION
+cp -a \
+  COPYING* README* \
+  $PKG/usr/doc/polkit-kde-kcmodules-1-$VERSION
+
+( 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
+)
+
+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/polkit-kde-kcmodules-1-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/kde/polkit-kde-kcmodules-1/pull-polkit-kde-kcmodules-1 b/source/kde/polkit-kde-kcmodules-1/pull-polkit-kde-kcmodules-1
new file mode 100644
index 00000000..de50ef5a
--- /dev/null
+++ b/source/kde/polkit-kde-kcmodules-1/pull-polkit-kde-kcmodules-1
@@ -0,0 +1,6 @@
+rm -rf polkit-kde-kcmodules-1
+git clone git://anongit.kde.org/polkit-kde-kcmodules-1
+( cd polkit-kde-kcmodules-1 && rm -rf .git* )
+mv polkit-kde-kcmodules-1 polkit-kde-kcmodules-1-$(date +%Y%m%d)git
+tar cf polkit-kde-kcmodules-1-$(date +%Y%m%d)git.tar polkit-kde-kcmodules-1-$(date +%Y%m%d)git
+xz -9 polkit-kde-kcmodules-1-$(date +%Y%m%d)git.tar
diff --git a/source/kde/polkit-kde-kcmodules-1/slack-desc b/source/kde/polkit-kde-kcmodules-1/slack-desc
new file mode 100644
index 00000000..57c6169a
--- /dev/null
+++ b/source/kde/polkit-kde-kcmodules-1/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-----------------------------------------------------|
+polkit-kde-kcmodules-1: polkit-kde-kcmodules (KDE polkit kcmodules)
+polkit-kde-kcmodules-1:
+polkit-kde-kcmodules-1: This package contains the kcm_polkit modules for KDE.
+polkit-kde-kcmodules-1:
+polkit-kde-kcmodules-1:
+polkit-kde-kcmodules-1:
+polkit-kde-kcmodules-1:
+polkit-kde-kcmodules-1:
+polkit-kde-kcmodules-1:
+polkit-kde-kcmodules-1:
diff --git a/source/kde/polkit-qt-1/local.options b/source/kde/polkit-qt-1/local.options
index c40c7ac4..80b46a0a 100644
--- a/source/kde/polkit-qt-1/local.options
+++ b/source/kde/polkit-qt-1/local.options
@@ -1,2 +1,3 @@
 #VERSION=0.95.1
-VERSION=r1118744
+VERSION=r1145513
+BUILD=2
diff --git a/source/kde/polkit-qt-1/polkit-qt-1.SlackBuild b/source/kde/polkit-qt-1/polkit-qt-1.SlackBuild
index 646b6ebb..c2126b95 100755
--- a/source/kde/polkit-qt-1/polkit-qt-1.SlackBuild
+++ b/source/kde/polkit-qt-1/polkit-qt-1.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -48,6 +48,8 @@ echo "Building polkit-qt-1-$VERSION..."
 tar xvf $CWD/../src/polkit-qt-1-$VERSION.tar.?z* || exit 1
 cd polkit-qt-1-$VERSION
 
+zcat $CWD/polkit-qt-1.null-checking.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 \) \
diff --git a/source/kde/polkit-qt-1/polkit-qt-1.null-checking.diff b/source/kde/polkit-qt-1/polkit-qt-1.null-checking.diff
new file mode 100644
index 00000000..0ec2a8e3
--- /dev/null
+++ b/source/kde/polkit-qt-1/polkit-qt-1.null-checking.diff
@@ -0,0 +1,14 @@
+Index: agent/polkitqt1-agent-listener.cpp
+===================================================================
+--- agent/polkitqt1-agent-listener.cpp	(revision 1183495)
++++ agent/polkitqt1-agent-listener.cpp	(working copy)
+@@ -66,7 +66,8 @@
+     qDebug("Destroying listener");
+ 
+     ListenerAdapter::instance()->removeListener(this);
+-    g_object_unref(d->listener);
++    if (d->listener != NULL)
++        g_object_unref(d->listener);
+ }
+ 
+ bool Listener::registerListener(PolkitQt1::Subject *subject, const QString &objectPath)
diff --git a/source/kde/polkit-qt-1/pull-polkit-qt-1 b/source/kde/polkit-qt-1/pull-polkit-qt-1
new file mode 100644
index 00000000..42d64877
--- /dev/null
+++ b/source/kde/polkit-qt-1/pull-polkit-qt-1
@@ -0,0 +1,6 @@
+rm -rf polkit-qt-1
+git clone git://anongit.kde.org/polkit-qt-1
+( cd polkit-qt-1 && rm -rf .git* )
+mv polkit-qt-1 polkit-qt-1-$(date +%Y%m%d)git
+tar cf polkit-qt-1-$(date +%Y%m%d)git.tar polkit-qt-1-$(date +%Y%m%d)git
+xz -9 polkit-qt-1-$(date +%Y%m%d)git.tar
diff --git a/source/kde/skanlite/local.options b/source/kde/skanlite/local.options
index e7ebfea9..a62bafe0 100644
--- a/source/kde/skanlite/local.options
+++ b/source/kde/skanlite/local.options
@@ -1 +1 @@
-VERSION=0.4-kde4.4.0
+VERSION=0.7
diff --git a/source/kdei/kde-l10n/kde-l10n.SlackBuild b/source/kdei/kde-l10n/kde-l10n.SlackBuild
index 1b522bf8..04670e75 100755
--- a/source/kdei/kde-l10n/kde-l10n.SlackBuild
+++ b/source/kdei/kde-l10n/kde-l10n.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2008  Robby Workman  Northport, AL, USA
-# Copyright 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -35,9 +35,9 @@ if [ ! -r ./languages ]; then
   done
 fi
 
-[ -z $VERSION ] && export VERSION=4.4.3
+[ -z $VERSION ] && export VERSION=4.5.5
 [ -z $ARCH ] && export ARCH=noarch
-[ -z $BUILD ] && export BUILD=1
+[ -z $BUILD ] && export BUILD=3
 
 # Use this as CFLAGS and CXXFLAGS:
 if [ -z "$SLKCFLAGS" ]; then
@@ -61,6 +61,35 @@ fi
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 
+# This function will insert missing kdepim translations from kde-l10n-4.4.5:
+insert_kdepim() {
+  if [ -r $CWD/kdepim-l10n/kdepim-l10n-$(echo $PKGNAM | cut -f 3 -d -)-4.4.5.tar.bz2 ]; then
+    tar xvf $CWD/kdepim-l10n/kdepim-l10n-$(echo $PKGNAM | cut -f 3 -d -)-4.4.5.tar.bz2
+  fi
+  for dir in $(find . -type d -name messages) $(find . -type d -name docs) ; do
+    ( cd $dir
+      if [ -d kdepim ]; then
+        echo "add_subdirectory( kdepim )" >> CMakeLists.txt.new
+      fi
+      if [ -r CMakeLists.txt ]; then
+        cat CMakeLists.txt >> CMakeLists.txt.new
+        mv CMakeLists.txt.new CMakeLists.txt
+      else
+        rm -f CMakeLists.txt.new
+      fi
+    )
+  done
+  # Update DTD specification.  This will fix some of the issues...
+  sed -i -e "s/V4.1.2-Based/V4.2-Based/g" $(grep -lr "V4.1.2-Based" *)
+  sed -i -e "s/V4.1-Based/V4.2-Based/g" $(grep -lr "V4.1-Based" *)
+  sed -i -e "s/V4.2-Based Variant V1.0/V4.2-Based Variant V1.1/g" $(grep -lr "V4.2-Based Variant V1.0" *)
+  if ls $CWD/kdepim-l10n/kdepim-l10n-$(echo $PKGNAM | cut -f 3 -d -)-4.4.5.*.diff.gz 1> /dev/null 2> /dev/null ; then
+    for patch in $CWD/kdepim-l10n/kdepim-l10n-$(echo $PKGNAM | cut -f 3 -d -)-4.4.5.*.diff.gz ; do
+      zcat $patch | patch -p1 --verbose || exit 1
+    done
+  fi
+}
+
 make_language_pack() {
 rm -rf $PKG
 mkdir -p $TMP $PKG
@@ -68,6 +97,7 @@ cd $TMP
 rm -rf $PKGNAM-$VERSION 
 tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1
 cd $PKGNAM-$VERSION || exit 1
+insert_kdepim;
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -75,7 +105,7 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 mkdir -p build
-cd build
+( cd build
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
@@ -86,7 +116,7 @@ cd build
     ..
   make || exit 1
   make install DESTDIR=$PKG || exit 1
-cd -
+) || touch $TMP/$PKGNAM.failed
 ( 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
diff --git a/source/kdei/kde-l10n/kdepim-l10n/extract-kdepim-goodness.sh b/source/kdei/kde-l10n/kdepim-l10n/extract-kdepim-goodness.sh
new file mode 100755
index 00000000..6d39e755
--- /dev/null
+++ b/source/kdei/kde-l10n/kdepim-l10n/extract-kdepim-goodness.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+# This script was used to extract the kdepim part from the last kde-l10n
+# release that contained them.  The resulting kdepim-l10n sources will be
+# merged into our language packages.
+
+# This should be run in the directory containing the kde-l10n-*-4.4.5
+# source tarballs that you wish to create kdepim-l10n archives from.
+
+for file in kde-l10n*.tar.bz2 ; do
+  rm -rf $(basename $file .tar.bz2) kdepim-l10n-$(echo $file | cut -f 3 -d -)-4.4.5
+  echo "Extracting $file"
+  tar xf $file
+  mkdir kdepim-l10n-$(echo $file | cut -f 3 -d -)-4.4.5
+  ( cd $(basename $file .tar.bz2)
+    find . -name "kdepim" -type d -exec cp -a --parents "{}" ../kdepim-l10n-$(echo $file | cut -f 3 -d -)-4.4.5 \;
+  )
+  ( cd kdepim-l10n-$(echo $file | cut -f 3 -d -)-4.4.5
+    tar cf ../kdepim-l10n-$(echo $file | cut -f 3 -d -)-4.4.5.tar .
+  )
+  rm -f kdepim-l10n-$(echo $file | cut -f 3 -d -)-4.4.5.tar.bz2
+  bzip2 -9 kdepim-l10n-$(echo $file | cut -f 3 -d -)-4.4.5.tar
+  rm -r $(basename $file .tar.bz2) kdepim-l10n-$(echo $file | cut -f 3 -d -)-4.4.5
+done
diff --git a/source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-fr-4.4.5.korganizer.docbook.reorganize.diff b/source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-fr-4.4.5.korganizer.docbook.reorganize.diff
new file mode 100644
index 00000000..df6184ab
--- /dev/null
+++ b/source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-fr-4.4.5.korganizer.docbook.reorganize.diff
@@ -0,0 +1,34 @@
+--- ./docs/kdepim/korganizer/index.docbook.orig	2011-01-19 10:56:02.410999994 -0600
++++ ./docs/kdepim/korganizer/index.docbook	2011-01-19 12:40:25.712999555 -0600
+@@ -108,6 +108,15 @@
+ <releaseinfo
+ >2.20.00</releaseinfo>
+ 
++<abstract
++><para
++>&korganizer; est un agenda personnel facile à utiliser (un <acronym
++>PIM</acronym
++>, acronyme anglais de <foreignphrase
++>personal information manager</foreignphrase
++>). Vous pouvez planifier des rendez-vous, des événements et des tâches à effectuer. &korganizer; vous remémorera les tâches en instances et vous aidera à respecter votre emploi du temps. </para
++></abstract>
++
+ <keywordset>
+ <keyword
+ >KDE</keyword>
+@@ -127,15 +136,6 @@
+ >rendez-vous</keyword>
+ </keywordset>
+ 
+-<abstract
+-><para
+->&korganizer; est un agenda personnel facile à utiliser (un <acronym
+->PIM</acronym
+->, acronyme anglais de <foreignphrase
+->personal information manager</foreignphrase
+->). Vous pouvez planifier des rendez-vous, des événements et des tâches à effectuer. &korganizer; vous remémorera les tâches en instances et vous aidera à respecter votre emploi du temps. </para
+-></abstract>
+-
+ </bookinfo>
+ 
+ <chapter id="introduction">
diff --git a/source/kdei/kde-l10n/languages b/source/kdei/kde-l10n/languages
index 47b709a0..a46f4ced 100644
--- a/source/kdei/kde-l10n/languages
+++ b/source/kdei/kde-l10n/languages
@@ -3,7 +3,6 @@ bg
 ca
 ca@valencia
 cs
-csb
 da
 de
 el
@@ -22,6 +21,7 @@ he
 hi
 hr
 hu
+ia
 id
 is
 it
@@ -32,8 +32,6 @@ kn
 ko
 lt
 lv
-mai
-mk
 ml
 nb
 nds
@@ -45,12 +43,11 @@ pt
 pt_BR
 ro
 ru
-si
 sk
 sl
 sr
 sv
-tg
+th
 tr
 uk
 wa
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ia b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ia
new file mode 100644
index 00000000..e0732347
--- /dev/null
+++ b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ia
@@ -0,0 +1,11 @@
+kde-l10n-ia: kde-l10n-ia
+kde-l10n-ia:
+kde-l10n-ia: Interlingua language support for KDE.
+kde-l10n-ia:
+kde-l10n-ia:
+kde-l10n-ia:
+kde-l10n-ia:
+kde-l10n-ia:
+kde-l10n-ia:
+kde-l10n-ia:
+kde-l10n-ia:
diff --git a/source/kdei/koffice-l10n/koffice-l10n.SlackBuild b/source/kdei/koffice-l10n/koffice-l10n.SlackBuild
new file mode 100755
index 00000000..f89645dd
--- /dev/null
+++ b/source/kdei/koffice-l10n/koffice-l10n.SlackBuild
@@ -0,0 +1,114 @@
+#!/bin/sh
+
+# Copyright 2008  Robby Workman  Northport, AL, USA
+# Copyright 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#  This script should build any of the language packs if run with (for example):
+#    PKGLANG=de ./koffice-l10n.SlackBuild
+#  You should be able to build all of them with something like this:
+#    for i in $(cat languages) ; do PKGLANG=$i ./koffice-l10n.SlackBuild ; done
+# If ./languages is missing and this script is called without options, the
+# default is to create an up-to-date ./languages list and build all the
+# language packs.
+
+if [ ! -r ./languages ]; then
+  for file in koffice-l10n*bz2 ; do
+    echo $file | cut -f 3 -d - >> ./languages
+  done
+fi
+
+[ -z $VERSION ] && export VERSION=2.3.2
+[ -z $ARCH ] && export ARCH=noarch
+[ -z $BUILD ] && export BUILD=1
+
+# Use this as CFLAGS and CXXFLAGS:
+if [ -z "$SLKCFLAGS" ]; then
+  if [ "$ARCH" = "i486" ]; then
+    export SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  elif [ "$ARCH" = "s390" ]; then
+    export SLKCFLAGS="-O2"
+  elif [ "$ARCH" = "x86_64" ]; then
+    export SLKCFLAGS="-O2 -fPIC"
+  fi
+fi
+
+# Get the kde environment variables
+[ -d kdebase ] && . ./kdebase/profile.d/kde.sh
+
+# Set the config option variables if they are not already set:
+[ -r ../KDE.options ] && . ../KDE.options
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+
+make_language_pack() {
+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
+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 build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DSYSCONF_INSTALL_DIR=/etc/kde \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    ..
+  make || exit 1
+  make install DESTDIR=$PKG || exit 1
+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/slack-desc.koffice-l10n-$PKGLANG > $PKG/install/slack-desc
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+}
+
+if [ -z $PKGLANG ]; then
+  for PKGLANG in $(cat languages) ; do
+    PKGNAM=koffice-l10n-$PKGLANG
+    PKG=$TMP/package-koffice-l10n-$PKGLANG
+    # The global options may be overridden here (if needed):
+    [ -r ./local.options/$PKGLANG ] && . ./local.options/$PKGLANG
+    make_language_pack;
+  done
+else
+  PKGNAM=koffice-l10n-$PKGLANG
+  PKG=$TMP/package-koffice-l10n-$PKGLANG
+  # The global options may be overridden here (if needed):
+  [ -r ./local.options/$PKGLANG ] && . ./local.options/$PKGLANG
+  make_language_pack;
+fi
+
diff --git a/source/kdei/koffice-l10n/languages b/source/kdei/koffice-l10n/languages
new file mode 100644
index 00000000..072b9395
--- /dev/null
+++ b/source/kdei/koffice-l10n/languages
@@ -0,0 +1,27 @@
+ca
+ca@valencia
+da
+de
+el
+en_GB
+es
+et
+fr
+gl
+hu
+it
+ja
+kk
+nb
+nds
+nl
+pl
+pt
+pt_BR
+ru
+sv
+tr
+uk
+wa
+zh_CN
+zh_TW
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-af b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-af
index 2159ffe9..2159ffe9 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-af
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-af
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-ar b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ar
index f1135341..f1135341 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-ar
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ar
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-az b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-az
index e7b49933..e7b49933 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-az
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-az
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-bg b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-bg
index a45db37d..a45db37d 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-bg
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-bg
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-br b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-br
index 51dde265..51dde265 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-br
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-br
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-bs b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-bs
index 66888376..66888376 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-bs
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-bs
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-ca b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ca
index 29cf70d6..29cf70d6 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-ca
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ca
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-ca@valencia b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ca@valencia
index 982d6f1b..982d6f1b 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-ca@valencia
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ca@valencia
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-cs b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-cs
index 3a26b06e..3a26b06e 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-cs
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-cs
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-cy b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-cy
index 7e62677f..7e62677f 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-cy
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-cy
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-da b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-da
index 4727b048..4727b048 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-da
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-da
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-de b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-de
index f24cbd9f..f24cbd9f 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-de
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-de
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-el b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-el
index f7e3f21c..f7e3f21c 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-el
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-el
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-en_GB b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-en_GB
index 529c204f..529c204f 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-en_GB
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-en_GB
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-eo b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-eo
index 4cb444f9..4cb444f9 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-eo
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-eo
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-es b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-es
index da24c7cc..da24c7cc 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-es
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-es
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-et b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-et
index e5f433b9..e5f433b9 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-et
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-et
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-eu b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-eu
index 993f3ace..993f3ace 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-eu
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-eu
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-fa b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-fa
index 82521df0..82521df0 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-fa
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-fa
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-fi b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-fi
index f28aaa04..f28aaa04 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-fi
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-fi
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-fr b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-fr
index f05abb62..f05abb62 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-fr
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-fr
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-fy b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-fy
index 6ca3bd25..6ca3bd25 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-fy
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-fy
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-ga b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ga
index 4f0e492b..4f0e492b 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-ga
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ga
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-gl b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-gl
index 10005a9a..10005a9a 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-gl
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-gl
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-he b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-he
index 40f3eeea..40f3eeea 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-he
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-he
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-hi b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-hi
index 712c9a63..712c9a63 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-hi
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-hi
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-hne b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-hne
index 2a1be13f..2a1be13f 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-hne
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-hne
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-hsb b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-hsb
index ea1bcb7f..ea1bcb7f 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-hsb
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-hsb
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-hu b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-hu
index 251091b9..251091b9 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-hu
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-hu
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-is b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-is
index 4a11c148..4a11c148 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-is
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-is
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-it b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-it
index 85fa5c7b..85fa5c7b 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-it
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-it
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-ja b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ja
index 4da23a0d..4da23a0d 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-ja
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ja
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-kk b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-kk
index 4014fdfb..4014fdfb 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-kk
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-kk
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-km b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-km
index 4caa9431..4caa9431 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-km
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-km
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-lo b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-lo
index ff2f1ea9..ff2f1ea9 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-lo
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-lo
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-lt b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-lt
index 14d3fdb0..14d3fdb0 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-lt
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-lt
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-lv b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-lv
index a6bdadd3..a6bdadd3 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-lv
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-lv
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-mk b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-mk
index af7d02c4..af7d02c4 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-mk
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-mk
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-ms b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ms
index 74868e07..74868e07 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-ms
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ms
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-mt b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-mt
index 1b35b168..1b35b168 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-mt
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-mt
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-nb b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-nb
index bb8c5889..bb8c5889 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-nb
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-nb
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-nds b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-nds
index 5f26d82f..5f26d82f 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-nds
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-nds
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-ne b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ne
index 811d8eeb..811d8eeb 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-ne
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ne
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-nl b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-nl
index 71698789..71698789 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-nl
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-nl
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-nn b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-nn
index d2c0b300..d2c0b300 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-nn
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-nn
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-no b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-no
index df9e73ce..df9e73ce 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-no
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-no
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-no_NY b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-no_NY
index e86be3ba..e86be3ba 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-no_NY
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-no_NY
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-pl b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-pl
index 1ba2d560..1ba2d560 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-pl
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-pl
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-pt b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-pt
index 871f589e..871f589e 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-pt
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-pt
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-pt_BR b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-pt_BR
index 68adcd39..68adcd39 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-pt_BR
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-pt_BR
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-ro b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ro
index 3e67a3a8..3e67a3a8 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-ro
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ro
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-ru b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ru
index 8d72bd4b..8d72bd4b 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-ru
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ru
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-se b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-se
index 1798892e..1798892e 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-se
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-se
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-sk b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-sk
index d259bbc5..d259bbc5 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-sk
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-sk
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-sl b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-sl
index 79d9786c..79d9786c 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-sl
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-sl
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-sr b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-sr
index 97b2d1ad..97b2d1ad 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-sr
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-sr
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-sr@Latn b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-sr@Latn
index 7c90acc3..7c90acc3 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-sr@Latn
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-sr@Latn
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-sv b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-sv
index 01be9831..01be9831 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-sv
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-sv
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-ta b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ta
index bb8a36d2..bb8a36d2 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-ta
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ta
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-tg b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-tg
index f5b5913b..f5b5913b 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-tg
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-tg
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-th b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-th
index 58e1e3b0..58e1e3b0 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-th
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-th
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-tr b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-tr
index e7543d62..e7543d62 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-tr
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-tr
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-uk b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-uk
index 87103ead..87103ead 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-uk
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-uk
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-uz b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-uz
index d2d7cedb..d2d7cedb 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-uz
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-uz
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-ven b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ven
index bd67d437..bd67d437 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-ven
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ven
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-wa b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-wa
index e88ee5e3..e88ee5e3 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-wa
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-wa
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-xh b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-xh
index 5bd52a1d..5bd52a1d 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-xh
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-xh
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-zh_CN b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-zh_CN
index 52bf8770..52bf8770 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-zh_CN
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-zh_CN
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-zh_TW b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-zh_TW
index 233fb2f9..233fb2f9 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-zh_TW
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-zh_TW
diff --git a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-zu b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-zu
index 72828f01..72828f01 100644
--- a/source/kdei/koffice/slack-desc/slack-desc.koffice-l10n-zu
+++ b/source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-zu
diff --git a/source/kdei/koffice/koffice-l10n.SlackBuild b/source/kdei/koffice/koffice-l10n.SlackBuild
deleted file mode 100755
index 8a570dd8..00000000
--- a/source/kdei/koffice/koffice-l10n.SlackBuild
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/sh
-
-# Copyright 2008  Robby Workman  Northport, AL, USA
-# Copyright 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#  This script should build any of the language packs if run with (for example):
-#    PKGLANG=de ./koffice-l10n.SlackBuild
-#  You should be able to build all of them with something like this:
-#    for i in $(cat languages) ; do PKGLANG=$i ./koffice-l10n.SlackBuild ; done
-# If ./languages is missing and this script is called without options, the
-# default is to create an up-to-date ./languages list and build all the
-# language packs.
-
-if [ ! -r ./languages ]; then
-  for file in koffice-l10n*bz2 ; do
-    echo $file | cut -f 3 -d - >> ./languages
-  done
-fi
-
-[ -z $VERSION ] && export VERSION=2.1.2
-[ -z $ARCH ] && export ARCH=noarch
-[ -z $BUILD ] && export BUILD=1
-
-# Use this as CFLAGS and CXXFLAGS:
-if [ -z "$SLKCFLAGS" ]; then
-  if [ "$ARCH" = "i486" ]; then
-    export SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  elif [ "$ARCH" = "s390" ]; then
-    export SLKCFLAGS="-O2"
-  elif [ "$ARCH" = "x86_64" ]; then
-    export SLKCFLAGS="-O2 -fPIC"
-  fi
-fi
-
-# Get the kde environment variables
-[ -d kdebase ] && . ./kdebase/profile.d/kde.sh
-
-# Set the config option variables if they are not already set:
-[ -r ../KDE.options ] && . ../KDE.options
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-
-make_language_pack() {
-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
-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 build
-cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    ..
-  make || exit 1
-  make install DESTDIR=$PKG || exit 1
-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/slack-desc.koffice-l10n-$PKGLANG > $PKG/install/slack-desc
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-}
-
-if [ -z $PKGLANG ]; then
-  for PKGLANG in $(cat languages) ; do
-    PKGNAM=koffice-l10n-$PKGLANG
-    PKG=$TMP/package-koffice-l10n-$PKGLANG
-    # The global options may be overridden here (if needed):
-    [ -r ./local.options/$PKGLANG ] && . ./local.options/$PKGLANG
-    make_language_pack;
-  done
-else
-  PKGNAM=koffice-l10n-$PKGLANG
-  PKG=$TMP/package-koffice-l10n-$PKGLANG
-  # The global options may be overridden here (if needed):
-  [ -r ./local.options/$PKGLANG ] && . ./local.options/$PKGLANG
-  make_language_pack;
-fi
-
diff --git a/source/l/ConsoleKit/ConsoleKit.SlackBuild b/source/l/ConsoleKit/ConsoleKit.SlackBuild
index db40f139..a1f7ae50 100755
--- a/source/l/ConsoleKit/ConsoleKit.SlackBuild
+++ b/source/l/ConsoleKit/ConsoleKit.SlackBuild
@@ -25,16 +25,15 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ConsoleKit
-VERSION=${VERSION:-20100129}
+VERSION=${VERSION:-0.4.3}
 BUILD=${BUILD:-1}
+
 NUMJOBS=${NUMJOBS:--j6}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) export ARCH=i486 ;;
     arm*) export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
   esac
 fi
@@ -61,10 +60,9 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* || exit 1
 cd $PRGNAM-$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 \) \
@@ -72,20 +70,23 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-## Not sure what of these we need now - no time to look yet
-# Thanks to the GSB project for the patch hints :-)
-# http://bugs.freedesktop.org/show_bug.cgi?id=19020
-# http://bugs.freedesktop.org/show_bug.cgi?id=20471
-#zcat $CWD/patches/consolekit-dbus-permissions.patch.gz | patch -p1 || exit 1
-# Prevent make install from erroring out on docbook validation
-#zcat $CWD/patches/consolekit-skipvalidation.patch.gz | patch -p1 || exit 1
 # Clean up at_console compat files, bug #257761
-zcat $CWD/patches/consolekit-0.2.10-cleanup_console_tags.patch.gz | patch -p1 || exit 1
+zcat $CWD/consolekit-0.2.10-cleanup_console_tags.patch.gz | patch -p1 || exit 1
+
+# Revert "Only set sessions to be is-local=true if set by a trusted party"
+#   http://cgit.freedesktop.org/ConsoleKit/commit/?id=4f88228f31a63c026c424a92827f26ad7535275c
+# Here are the bug reports:
+#   http://bugs.gentoo.org/show_bug.cgi?id=336634
+#   http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=597937
+#   http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=598150
+#   https://bugs.freedesktop.org/show_bug.cgi?id=28377
+# This is neither ideal nor maintainable long-term, but I don't know what else
+# we can reasonably do right now...  --rworkman 
+zcat $CWD/consolekit-0.4.2-revert.patch.gz | patch -p1 || exit 1
 
-# Configure:
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./autogen.sh \
+./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
@@ -98,7 +99,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --disable-static \
   --build=$ARCH-slackware-linux
 
-# Build and install:
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG
 
@@ -110,27 +110,22 @@ chmod 0755 $PKG/usr/lib/ConsoleKit/run-session.d/pam-foreground-compat.ck
 # Let's not clobber config files
 mv $PKG/etc/ConsoleKit/seats.d/00-primary.seat \
   $PKG/etc/ConsoleKit/seats.d/00-primary.seat.new
-mv $PKG/etc/dbus-1/system.d/ConsoleKit.conf \
-  $PKG/etc/dbus-1/system.d/ConsoleKit.conf.new
 
-# Strip binaries:
+# Add an init script
+mkdir -p $PKG/etc/rc.d
+cat $CWD/rc.consolekit > $PKG/etc/rc.d/rc.consolekit.new
+chmod 0755 $PKG/etc/rc.d/rc.consolekit.new
+
 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:
-( 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
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 
-# Add a documentation directory:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
-(
-  cd $PKG/usr/doc/$PRGNAM-$VERSION ; ln -s /usr/share/gtk-doc/html/polkit-1 html
-)
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/l/ConsoleKit/patches/consolekit-0.2.10-cleanup_console_tags.patch b/source/l/ConsoleKit/consolekit-0.2.10-cleanup_console_tags.patch
index d1699d90..d1699d90 100644
--- a/source/l/ConsoleKit/patches/consolekit-0.2.10-cleanup_console_tags.patch
+++ b/source/l/ConsoleKit/consolekit-0.2.10-cleanup_console_tags.patch
diff --git a/source/l/ConsoleKit/consolekit-0.4.2-revert.patch b/source/l/ConsoleKit/consolekit-0.4.2-revert.patch
new file mode 100644
index 00000000..cb1f461d
--- /dev/null
+++ b/source/l/ConsoleKit/consolekit-0.4.2-revert.patch
@@ -0,0 +1,210 @@
+Revert upstream http://cgit.freedesktop.org/ConsoleKit/commit/?id=4f88228f31a63c026c424a92827f26ad7535275c
+which renders ConsoleKit unusable.
+
+diff -ur ConsoleKit-0.4.2.orig/src/ck-manager.c ConsoleKit-0.4.2/src/ck-manager.c
+--- ConsoleKit-0.4.2.orig/src/ck-manager.c	2010-09-03 16:54:31.000000000 +0300
++++ ConsoleKit-0.4.2/src/ck-manager.c	2010-09-10 00:02:32.000000000 +0300
+@@ -1660,175 +1660,12 @@
+         dbus_g_method_return (context, cookie);
+ }
+ 
+-enum {
+-        PROP_STRING,
+-        PROP_BOOLEAN,
+-};
+-
+-#define CK_TYPE_PARAMETER_STRUCT (dbus_g_type_get_struct ("GValueArray", \
+-                                                          G_TYPE_STRING,  \
+-                                                          G_TYPE_VALUE, \
+-                                                          G_TYPE_INVALID))
+-
+-static gboolean
+-_get_parameter (GPtrArray  *parameters,
+-                const char *name,
+-                int         prop_type,
+-                gpointer   *value)
+-{
+-        gboolean ret;
+-        int      i;
+-
+-        if (parameters == NULL) {
+-                return FALSE;
+-        }
+-
+-        ret = FALSE;
+-
+-        for (i = 0; i < parameters->len && ret == FALSE; i++) {
+-                gboolean    res;
+-                GValue      val_struct = { 0, };
+-                char       *prop_name;
+-                GValue     *prop_val;
+-
+-                g_value_init (&val_struct, CK_TYPE_PARAMETER_STRUCT);
+-                g_value_set_static_boxed (&val_struct, g_ptr_array_index (parameters, i));
+-
+-                res = dbus_g_type_struct_get (&val_struct,
+-                                              0, &prop_name,
+-                                              1, &prop_val,
+-                                              G_MAXUINT);
+-                if (! res) {
+-                        g_debug ("Unable to extract parameter input");
+-                        goto cont;
+-                }
+-
+-                if (prop_name == NULL) {
+-                        g_debug ("Skipping NULL parameter");
+-                        goto cont;
+-                }
+-
+-                if (strcmp (prop_name, name) != 0) {
+-                        goto cont;
+-                }
+-
+-                switch (prop_type) {
+-                case PROP_STRING:
+-                        if (value != NULL) {
+-                                *value = g_value_dup_string (prop_val);
+-                        }
+-                        break;
+-                case PROP_BOOLEAN:
+-                        if (value != NULL) {
+-                                *(gboolean *)value = g_value_get_boolean (prop_val);
+-                        }
+-                        break;
+-                default:
+-                        g_assert_not_reached ();
+-                        break;
+-                }
+-
+-                ret = TRUE;
+-
+-        cont:
+-                g_free (prop_name);
+-                if (prop_val != NULL) {
+-                        g_value_unset (prop_val);
+-                        g_free (prop_val);
+-                }
+-        }
+-
+-        return ret;
+-}
+-
+-static gboolean
+-_verify_login_session_id_is_local (CkManager  *manager,
+-                                   const char *login_session_id)
+-{
+-        GHashTableIter iter;
+-        const char    *id;
+-        CkSession     *session;
+-
+-        g_return_val_if_fail (CK_IS_MANAGER (manager), FALSE);
+-
+-        /* If any local session exists for the given login session id
+-           then that means a trusted party has vouched for the
+-           original login */
+-
+-        g_debug ("Looking for local sessions for login-session-id=%s", login_session_id);
+-
+-        session = NULL;
+-        g_hash_table_iter_init (&iter, manager->priv->sessions);
+-        while (g_hash_table_iter_next (&iter, (gpointer *)&id, (gpointer *)&session)) {
+-                if (session != NULL) {
+-                        gboolean is_local;
+-                        char    *sessid;
+-
+-                        sessid = NULL;
+-                        g_object_get (session,
+-                                      "login-session-id", &sessid,
+-                                      "is-local", &is_local,
+-                                      NULL);
+-                        if (g_strcmp0 (sessid, login_session_id) == 0 && is_local) {
+-                                g_debug ("CkManager: found is-local=true on %s", id);
+-                                return TRUE;
+-                        }
+-                }
+-        }
+-
+-        return FALSE;
+-}
+-
+-static void
+-add_param_boolean (GPtrArray  *parameters,
+-                   const char *key,
+-                   gboolean    value)
+-{
+-        GValue   val = { 0, };
+-        GValue   param_val = { 0, };
+-
+-        g_value_init (&val, G_TYPE_BOOLEAN);
+-        g_value_set_boolean (&val, value);
+-        g_value_init (&param_val, CK_TYPE_PARAMETER_STRUCT);
+-        g_value_take_boxed (&param_val,
+-                            dbus_g_type_specialized_construct (CK_TYPE_PARAMETER_STRUCT));
+-        dbus_g_type_struct_set (&param_val,
+-                                0, key,
+-                                1, &val,
+-                                G_MAXUINT);
+-        g_value_unset (&val);
+-
+-        g_ptr_array_add (parameters, g_value_get_boxed (&param_val));
+-}
+-
+ static void
+ verify_and_open_session_for_leader (CkManager             *manager,
+                                     CkSessionLeader       *leader,
+-                                    GPtrArray             *parameters,
++                                    const GPtrArray       *parameters,
+                                     DBusGMethodInvocation *context)
+ {
+-        /* Only allow a local session if originating from an existing
+-           local session.  Effectively this means that only trusted
+-           parties can create local sessions. */
+-
+-        g_debug ("CkManager: verifying session for leader");
+-
+-        if (parameters != NULL && ! _get_parameter (parameters, "is-local", PROP_BOOLEAN, NULL)) {
+-                gboolean is_local;
+-                char    *login_session_id;
+-
+-                g_debug ("CkManager: is-local has not been set, will inherit from existing login-session-id if available");
+-
+-                is_local = FALSE;
+-
+-                if (_get_parameter (parameters, "login-session-id", PROP_STRING, (gpointer *) &login_session_id)) {
+-                        is_local = _verify_login_session_id_is_local (manager, login_session_id);
+-                        g_debug ("CkManager: found is-local=%s", is_local ? "true" : "false");
+-                }
+-
+-                add_param_boolean (parameters, "is-local", is_local);
+-        }
+-
+         open_session_for_leader (manager,
+                                  leader,
+                                  parameters,
+diff -ur ConsoleKit-0.4.2.orig/tools/ck-collect-session-info.c ConsoleKit-0.4.2/tools/ck-collect-session-info.c
+--- ConsoleKit-0.4.2.orig/tools/ck-collect-session-info.c	2010-09-03 16:54:31.000000000 +0300
++++ ConsoleKit-0.4.2/tools/ck-collect-session-info.c	2010-09-10 00:06:30.000000000 +0300
+@@ -274,7 +274,8 @@
+         si->x11_display_device = ck_process_stat_get_tty (xorg_stat);
+         ck_process_stat_free (xorg_stat);
+ 
+-        /* don't set is-local here - let the daemon do that */
++        si->is_local = TRUE;
++        si->is_local_is_set = TRUE;
+ 
+         g_free (si->remote_host_name);
+         si->remote_host_name = NULL;
+@@ -303,6 +304,13 @@
+ 
+         fill_x11_info (si);
+ 
++        if (! si->is_local_is_set) {
++                /* FIXME: how should we set this? */
++                /* non x11 sessions must be local I guess */
++                si->is_local = TRUE;
++                si->is_local_is_set = TRUE;
++        }
++
+         res = ck_unix_pid_get_login_session_id (si->pid, &si->login_session_id);
+         if (! res) {
+                 si->login_session_id = NULL;
diff --git a/source/l/ConsoleKit/doinst.sh b/source/l/ConsoleKit/doinst.sh
index 217d7605..c13a36e3 100644
--- a/source/l/ConsoleKit/doinst.sh
+++ b/source/l/ConsoleKit/doinst.sh
@@ -11,6 +11,17 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
+
 config etc/ConsoleKit/seats.d/00-primary.seat.new
-config etc/dbus-1/system.d/ConsoleKit.conf.new
+preserve_perms etc/rc.d/rc.consolekit.new
 
diff --git a/source/l/ConsoleKit/patches/consolekit-dbus-permissions.patch b/source/l/ConsoleKit/patches/consolekit-dbus-permissions.patch
deleted file mode 100644
index 0cab2858..00000000
--- a/source/l/ConsoleKit/patches/consolekit-dbus-permissions.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-diff -up ConsoleKit-0.3.0/data/ConsoleKit.conf.consolekit ConsoleKit-0.3.0/data/ConsoleKit.conf
---- ConsoleKit-0.3.0/data/ConsoleKit.conf.consolekit	2008-04-19 01:39:49.000000000 -0400
-+++ ConsoleKit-0.3.0/data/ConsoleKit.conf	2009-04-08 11:40:33.347814036 -0400
-@@ -8,88 +8,131 @@
-     <allow own="org.freedesktop.ConsoleKit"/>
- 
-     <!-- Allow all methods on interfaces -->
--    <allow send_interface="org.freedesktop.ConsoleKit.Manager"/>
--    <allow send_interface="org.freedesktop.ConsoleKit.Seat"/>
--    <allow send_interface="org.freedesktop.ConsoleKit.Session"/>
-+    <allow send_destination="org.freedesktop.ConsoleKit"/>
-   </policy>
- 
-   <!-- Deny all and then allow some methods on interfaces -->
-   <policy context="default">
--    <deny send_interface="org.freedesktop.ConsoleKit.Manager"/>
--    <deny send_interface="org.freedesktop.ConsoleKit.Seat"/>
--    <deny send_interface="org.freedesktop.ConsoleKit.Session"/>
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.DBus.Introspectable"/>
-+    <deny send_destination="org.freedesktop.ConsoleKit" 
-+          send_interface="org.freedesktop.ConsoleKit.Manager"/>
-+    <deny send_destination="org.freedesktop.ConsoleKit" 
-+          send_interface="org.freedesktop.ConsoleKit.Seat"/>
-+    <deny send_destination="org.freedesktop.ConsoleKit" 
-+          send_interface="org.freedesktop.ConsoleKit.Session"/>
-     <deny send_destination="org.freedesktop.ConsoleKit"
-           send_interface="org.freedesktop.DBus.Properties" />
- 
--    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Manager"
-            send_member="Restart"/>
--    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Manager"
-            send_member="Stop"/>
--    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Manager"
-            send_member="OpenSession"/>
--    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Manager"
-            send_member="CloseSession"/>
--    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Manager"
-            send_member="GetSeats"/>
--    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Manager"
-+           send_member="GetSessions"/>
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Manager"
-            send_member="GetSessionForCookie"/>
--    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Manager"
-            send_member="GetSessionForUnixProcess"/>
--    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Manager"
-            send_member="GetCurrentSession"/>
--    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Manager"
-            send_member="GetSessionsForUnixUser"/>
--    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Manager"
-            send_member="GetSessionsForUser"/>
--    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Manager"
-            send_member="GetSystemIdleHint"/>
--    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Manager"
-            send_member="GetSystemIdleSinceHint"/>
- 
--    <allow send_interface="org.freedesktop.ConsoleKit.Seat"
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Seat"
-            send_member="GetId"/>
--    <allow send_interface="org.freedesktop.ConsoleKit.Seat"
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Seat"
-            send_member="GetSessions"/>
--    <allow send_interface="org.freedesktop.ConsoleKit.Seat"
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Seat"
-            send_member="GetDevices"/>
--    <allow send_interface="org.freedesktop.ConsoleKit.Seat"
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Seat"
-            send_member="GetActiveSession"/>
--    <allow send_interface="org.freedesktop.ConsoleKit.Seat"
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Seat"
-            send_member="CanActivateSessions"/>
--    <allow send_interface="org.freedesktop.ConsoleKit.Seat"
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Seat"
-            send_member="ActivateSession"/>
- 
--    <allow send_interface="org.freedesktop.ConsoleKit.Session"
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Session"
-            send_member="GetId"/>
--    <allow send_interface="org.freedesktop.ConsoleKit.Session"
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Session"
-            send_member="GetSeatId"/>
--    <allow send_interface="org.freedesktop.ConsoleKit.Session"
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Session"
-            send_member="GetLoginSessionId"/>
--    <allow send_interface="org.freedesktop.ConsoleKit.Session"
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Session"
-            send_member="GetSessionType"/>
--    <allow send_interface="org.freedesktop.ConsoleKit.Session"
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Session"
-            send_member="GetUser"/>
--    <allow send_interface="org.freedesktop.ConsoleKit.Session"
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Session"
-            send_member="GetUnixUser"/>
--    <allow send_interface="org.freedesktop.ConsoleKit.Session"
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Session"
-            send_member="GetX11Display"/>
--    <allow send_interface="org.freedesktop.ConsoleKit.Session"
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Session"
-            send_member="GetX11DisplayDevice"/>
--    <allow send_interface="org.freedesktop.ConsoleKit.Session"
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Session"
-            send_member="GetDisplayDevice"/>
--    <allow send_interface="org.freedesktop.ConsoleKit.Session"
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Session"
-            send_member="GetRemoteHostName"/>
--    <allow send_interface="org.freedesktop.ConsoleKit.Session"
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Session"
-            send_member="IsActive"/>
--    <allow send_interface="org.freedesktop.ConsoleKit.Session"
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Session"
-            send_member="IsLocal"/>
--    <allow send_interface="org.freedesktop.ConsoleKit.Session"
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Session"
-            send_member="GetCreationTime"/>
--    <allow send_interface="org.freedesktop.ConsoleKit.Session"
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Session"
-            send_member="Activate"/>
--    <allow send_interface="org.freedesktop.ConsoleKit.Session"
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Session"
-            send_member="GetIdleHint"/>
--    <allow send_interface="org.freedesktop.ConsoleKit.Session"
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Session"
-+           send_member="SetIdleHint"/>
-+    <allow send_destination="org.freedesktop.ConsoleKit"
-+           send_interface="org.freedesktop.ConsoleKit.Session"
-            send_member="GetIdleSinceHint"/>
-   </policy>
- 
diff --git a/source/l/ConsoleKit/patches/consolekit-skipvalidation.patch b/source/l/ConsoleKit/patches/consolekit-skipvalidation.patch
deleted file mode 100644
index c4bf89d7..00000000
--- a/source/l/ConsoleKit/patches/consolekit-skipvalidation.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ConsoleKit-0.3.0/doc/dbus/Makefile.in.skipvalidation ConsoleKit-0.3.0/doc/dbus/Makefile.in
---- ConsoleKit-0.3.0/doc/dbus/Makefile.in.skipvalidation	2009-02-27 20:17:36.784329106 -0500
-+++ ConsoleKit-0.3.0/doc/dbus/Makefile.in	2009-02-27 20:18:15.701316733 -0500
-@@ -427,7 +427,7 @@ uninstall-am: uninstall-htmldocDATA
- 
- 
- @DOCBOOK_DOCS_ENABLED_TRUE@ConsoleKit.html : $(SPEC_XML_FILES)
--@DOCBOOK_DOCS_ENABLED_TRUE@	$(XMLTO) xhtml-nochunks -m $(top_srcdir)/doc/dbus/config.xsl ConsoleKit.xml
-+@DOCBOOK_DOCS_ENABLED_TRUE@	$(XMLTO) --skip-validation xhtml-nochunks -m $(top_srcdir)/doc/dbus/config.xsl ConsoleKit.xml
- 
- org.freedesktop.ConsoleKit.Manager.ref.xml : $(top_srcdir)/src/org.freedesktop.ConsoleKit.Manager.xml spec-to-docbook.xsl
- 	$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
diff --git a/source/l/ConsoleKit/rc.consolekit b/source/l/ConsoleKit/rc.consolekit
new file mode 100644
index 00000000..a1937569
--- /dev/null
+++ b/source/l/ConsoleKit/rc.consolekit
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# /etc/rc.d/rc.consolekit
+#
+# Start/stop consolekit-kit daemon.
+#
+# This daemon is used by polkit's console auth agent.
+
+# Start consolekit:
+ck_start() {
+  echo "Starting ConsoleKit daemon:  /usr/sbin/console-kit-daemon"
+  /usr/sbin/console-kit-daemon
+}
+
+# Stop consolekit:
+ck_stop() {
+  if [ -r /var/run/ConsoleKit/pid ]; then
+    kill -HUP $(cat /var/run/ConsoleKit/pid)
+    rm -f /var/run/ConsoleKit/pid
+  else
+    killall -HUP -q console-kit-daemon
+  fi
+}
+
+case "$1" in
+'start')
+  ck_start
+  ;;
+'stop')
+  ck_stop
+  ;;
+*)
+  echo "Usage: $0 start|stop"
+esac
diff --git a/source/l/M2Crypto/M2Crypto.SlackBuild b/source/l/M2Crypto/M2Crypto.SlackBuild
index 5affbbcc..583b12f1 100755
--- a/source/l/M2Crypto/M2Crypto.SlackBuild
+++ b/source/l/M2Crypto/M2Crypto.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2009  Robby Workman, Northport, Alabama, USA
-# Copyright 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,19 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=0.19.1
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-2}
+PKGNAM=M2Crypto
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -36,16 +46,16 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
-set -e
-
 rm -rf $PKG 
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf M2Crypto-$VERSION
-tar xvf $CWD/M2Crypto-$VERSION.tar.bz2
-cd M2Crypto-$VERSION
+tar xvf $CWD/M2Crypto-$VERSION.tar.?z* || exit 1
+cd M2Crypto-$VERSION || exit 1
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -53,7 +63,7 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-python setup.py install --root=$PKG
+python setup.py install --root=$PKG || exit 1
 
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
@@ -64,7 +74,7 @@ python setup.py install --root=$PKG
 
 mkdir -p $PKG/usr/doc/M2Crypto-$VERSION
 cp -a \
-  CHANGES INSTALL LICENCE PKG-INFO README doc/* \
+  CHANGES INSTALL LICENCE PKG-INFO README* doc/* \
   $PKG/usr/doc/M2Crypto-$VERSION
 
 mkdir -p $PKG/install
@@ -72,3 +82,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/M2Crypto-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/l/PyQt/PyQt.SlackBuild b/source/l/PyQt/PyQt.SlackBuild
index 7d89221a..9fa6d065 100755
--- a/source/l/PyQt/PyQt.SlackBuild
+++ b/source/l/PyQt/PyQt.SlackBuild
@@ -26,7 +26,7 @@
 # Modified by Robby Workman <rworkman@slackware.com>
 # Modified by Eric Hameleers <alien@slackware.com>
 
-VERSION=${VERSION:-4.7.3}
+VERSION=${VERSION:-4.8.1}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:--j6}
 
diff --git a/source/l/QScintilla/QScintilla.SlackBuild b/source/l/QScintilla/QScintilla.SlackBuild
index e72b5ae7..b3623587 100755
--- a/source/l/QScintilla/QScintilla.SlackBuild
+++ b/source/l/QScintilla/QScintilla.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for QScintilla
 
 # Copyright 2008  Robby Workman <rworkman@slackware.com> Northport, AL, USA
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,9 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=${VERSION:-2.4.3}
-BUILD=${BUILD:-1}
+PKGNAM=QScintilla
+VERSION=${VERSION:-$(echo ${PKGNAM}-gpl-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -64,7 +65,7 @@ find . \
  -exec chmod 644 {} \;
 
 cd Qt4
-  qmake -unix -o Makefile qscintilla.pro
+  qmake -o Makefile qscintilla.pro
   make
   make install INSTALL_ROOT=$PKG
   # Yes, we'll spam the dev environment so we can build the other parts.
@@ -72,7 +73,7 @@ cd Qt4
 cd -
 
 cd designer-Qt4
-  qmake -unix -o Makefile designer.pro
+  qmake -o Makefile designer.pro
   make
   make install INSTALL_ROOT=$PKG
 cd -
diff --git a/source/l/aalib/aalib.SlackBuild b/source/l/aalib/aalib.SlackBuild
index 120d8433..20465dd0 100755
--- a/source/l/aalib/aalib.SlackBuild
+++ b/source/l/aalib/aalib.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,10 +24,19 @@
 PKGNAM=aalib
 VERSION=1.4rc5
 SRCVER=1.4.0
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
+NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -44,14 +53,17 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
 tar xvf $CWD/${PKGNAM}-$VERSION.tar.gz || exit 1
 cd ${PKGNAM}-${SRCVER} || exit 1
-# Compensate for modern times:
-cp /usr/share/libtool/config.{guess,sub} .
+#cp /usr/share/libtool/config.{guess,sub} .             # libtool-1.x
+cp /usr/share/libtool/config/config.{guess,sub} .       # libtool-2.x
 sed -i -e "s# -lslang# -lslang1#" configure
 
 # Make sure ownerships and permissions are sane:
diff --git a/source/l/akonadi/README.html b/source/l/akonadi/README.html
deleted file mode 100644
index 9bee704e..00000000
--- a/source/l/akonadi/README.html
+++ /dev/null
@@ -1,3 +0,0 @@
-downloaded from <a href="http://download.akonadi-project.org/">http://download.akonadi-project.org/</a>
-<br>
-<a href="http://pim.kde.org/akonadi/">akonadi Homepage</a>
diff --git a/source/l/akonadi/akonadi.SlackBuild b/source/l/akonadi/akonadi.SlackBuild
index 4b06c575..ebaa32ac 100755
--- a/source/l/akonadi/akonadi.SlackBuild
+++ b/source/l/akonadi/akonadi.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for akonadi
 
 # Copyright 2008  Robby Workman, Northport, Alabama, USA
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,9 +23,10 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=1.3.1
-BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:--j6}
+
+PKGNAM=akonadi
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -37,9 +38,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+NUMJOBS=${NUMJOBS:--j6}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-akonadi
+PKG=$TMP/package-$PKGNAM
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -58,8 +61,9 @@ fi
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
-tar xvf $CWD/akonadi-$VERSION.tar.bz2 || exit 1
-cd akonadi-$VERSION || exit 1
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1
+cd $PKGNAM-$VERSION || exit 1
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -76,6 +80,7 @@ cd build
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DMAN_INSTALL_DIR=/usr/man \
+    -DINSTALL_QSQLITE_IN_QT_PREFIX=ON \
     ..
    make $NUMJOBS || make || exit 1
    make install DESTDIR=$PKG || exit 1
@@ -85,10 +90,10 @@ if [ -d $PKG/usr/man ]; then
   gzip -9 $PKG/usr/man/man?/*
 fi
 
-mkdir -p $PKG/usr/doc/akonadi-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   AUTHORS INSTALL README lgpl-license \
-  $PKG/usr/doc/akonadi-$VERSION
+  $PKG/usr/doc/$PKGNAM-$VERSION
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -98,5 +103,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/akonadi-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source/l/alsa-lib/alsa-lib.SlackBuild b/source/l/alsa-lib/alsa-lib.SlackBuild
index dc88e4ad..f15c9631 100755
--- a/source/l/alsa-lib/alsa-lib.SlackBuild
+++ b/source/l/alsa-lib/alsa-lib.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/source/l/alsa-oss/alsa-oss.SlackBuild b/source/l/alsa-oss/alsa-oss.SlackBuild
index 058a87a1..ccfe3868 100755
--- a/source/l/alsa-oss/alsa-oss.SlackBuild
+++ b/source/l/alsa-oss/alsa-oss.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,10 +21,21 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=1.0.17
-ARCH=${ARCH:-x86_64}
+PKGNAM=alsa-oss
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=1
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -41,6 +52,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 cd $TMP
@@ -73,7 +87,7 @@ gzip -9 $PKG/usr/man/man?/*.?
 )
 mkdir -p $PKG/usr/doc/alsa-oss-$VERSION
 cp -a \
-  COPYING \
+  COPYING* \
   $PKG/usr/doc/alsa-oss-$VERSION
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/l/apr-util/apr-util.SlackBuild b/source/l/apr-util/apr-util.SlackBuild
index d160cbb9..b25d55c4 100755
--- a/source/l/apr-util/apr-util.SlackBuild
+++ b/source/l/apr-util/apr-util.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
 
 
 VERSION=${VERSION:-$(echo apr-util-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/l/apr/apr.SlackBuild b/source/l/apr/apr.SlackBuild
index 65098b06..2463b5a2 100755
--- a/source/l/apr/apr.SlackBuild
+++ b/source/l/apr/apr.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
 
 
 VERSION=${VERSION:-$(echo apr-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -62,6 +62,9 @@ rm -rf apr-$VERSION
 tar xvf $CWD/apr-$VERSION.tar.bz2 || exit 1
 cd apr-$VERSION
 
+# Patch to fix aliasing issue exposed by gcc-4.5.1:
+zcat $CWD/apr.apr_ring.h.gcc45.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 \) \
@@ -76,7 +79,7 @@ CFLAGS="$SLKCFLAGS" \
   --with-installbuilddir=/usr/lib${LIBDIRSUFFIX}/apr-${VERSION}/build-1 \
   --disable-static \
   --with-devrandom=/dev/urandom \
-  $ARCH-slackware-linux
+  --build=$ARCH-slackware-linux
 
 make $NUMJOBS || make || exit 1
 make dox || exit 1
@@ -87,7 +90,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \
 
 mkdir -p $PKG/usr/doc/apr-$VERSION
 cp -a \
-  LICENSE NOTICE README.dev \
+  LICENSE NOTICE README* \
   $PKG/usr/doc/apr-$VERSION
 
 # If there's a CHANGES file, installing at least part of the recent history
diff --git a/source/l/apr/apr.apr_ring.h.gcc45.diff b/source/l/apr/apr.apr_ring.h.gcc45.diff
new file mode 100644
index 00000000..c298cf4e
--- /dev/null
+++ b/source/l/apr/apr.apr_ring.h.gcc45.diff
@@ -0,0 +1,13 @@
+--- ./include/apr_ring.h.orig	2008-06-01 19:12:00.000000000 -0500
++++ ./include/apr_ring.h	2011-02-12 13:17:41.000000000 -0600
+@@ -90,8 +90,8 @@
+  */
+ #define APR_RING_HEAD(head, elem)					\
+     struct head {							\
+-	struct elem *next;						\
+-	struct elem *prev;						\
++	struct elem * volatile next;					\
++	struct elem * volatile prev;					\
+     }
+ 
+ /**
diff --git a/source/l/aspell/aspell.SlackBuild b/source/l/aspell/aspell.SlackBuild
index 9aa5d6fa..7e5ac904 100755
--- a/source/l/aspell/aspell.SlackBuild
+++ b/source/l/aspell/aspell.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,10 +21,21 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=0.60.5
-ARCH=${ARCH:-x86_64}
+PKGNAM=aspell
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-3}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -35,6 +46,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
@@ -46,7 +60,7 @@ mkdir -p $TMP $PKG/usr
 
 cd $TMP
 rm -rf aspell-$VERSION
-tar xjvf $CWD/aspell-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/aspell-$VERSION.tar.?z* || exit 1
 cd aspell-$VERSION
 chown -R root:root .
 find . \
@@ -82,7 +96,7 @@ gzip -9 $PKG/usr/info/*
 gzip -9 $PKG/usr/man/man?/*.?
 mkdir -p $PKG/usr/doc/aspell-$VERSION
 cp -a \
-  COPYING README TODO \
+  COPYING* README* TODO \
   $PKG/usr/doc/aspell-$VERSION
 mv $PKG/usr/share/doc/aspell/*html $PKG/usr/doc/aspell-$VERSION
 rm -rf $PKG/usr/share/doc
@@ -91,3 +105,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 makepkg -l y -c n $TMP/aspell-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/l/attica/attica.SlackBuild b/source/l/attica/attica.SlackBuild
index 8e3ab9aa..3c12a7d5 100755
--- a/source/l/attica/attica.SlackBuild
+++ b/source/l/attica/attica.SlackBuild
@@ -22,7 +22,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=${VERSION:-0.1.3}
+VERSION=${VERSION:-0.1.4}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:--j6}
 
diff --git a/source/l/audiofile/audiofile.SlackBuild b/source/l/audiofile/audiofile.SlackBuild
index 492292f5..2a473cb0 100755
--- a/source/l/audiofile/audiofile.SlackBuild
+++ b/source/l/audiofile/audiofile.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +22,20 @@
 
 
 PKGNAM=audiofile
-VERSION=${VERSION:-0.2.6}
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
+NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -43,11 +52,14 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xjvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
 cd ${PKGNAM}-$VERSION
 
 # Make sure ownerships and permissions are sane:
@@ -105,10 +117,18 @@ fi
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  COPYING TODO README ChangeLog \
+  COPYING* TODO README* \
   docs/* \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source/l/automoc4/automoc4.SlackBuild b/source/l/automoc4/automoc4.SlackBuild
index 2d898de9..455d2e48 100755
--- a/source/l/automoc4/automoc4.SlackBuild
+++ b/source/l/automoc4/automoc4.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh 
 
-# Copyright 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,20 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=0.9.88
-ARCH=${ARCH:-x86_64}
+PKGNAM=automoc4
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:--j6}
 
 CWD=$(pwd)
@@ -39,12 +50,15 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
-tar xvf $CWD/automoc4-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/automoc4-$VERSION.tar.?z* || exit 1
 cd automoc4-$VERSION || exit 1
 chown -R root:root .
 find . \
diff --git a/source/l/babl/babl-0.1.0-build-fixes.patch b/source/l/babl/babl-0.1.0-build-fixes.patch
deleted file mode 100644
index 3cd05594..00000000
--- a/source/l/babl/babl-0.1.0-build-fixes.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- babl-0.1.0.orig/extensions/Makefile.am	2009-04-17 12:05:15.000000000 -0500
-+++ babl-0.1.0/extensions/Makefile.am	2009-08-19 00:53:21.435970261 -0500
-@@ -1,7 +1,7 @@
- if OS_WIN32
- AM_LDFLAGS = -module -no-undefined
- else
--AM_LDFLAGS = -module
-+AM_LDFLAGS = -module -avoid-version
- endif
- 
- noinst_HEADERS = util.h
-@@ -12,7 +12,7 @@
- 	-I$(top_srcdir)/babl		\
- 	-I$(top_srcdir)/extensions
- 
--extdir = $(DESTDIR)$(libdir)/babl-@BABL_API_VERSION@
-+extdir = $(libdir)/babl-@BABL_API_VERSION@
- ext_LTLIBRARIES = \
- 	CIE-Lab.la      \
- 	gegl-fixups.la  \
diff --git a/source/l/babl/babl.SlackBuild b/source/l/babl/babl.SlackBuild
index 5e8f54af..3f5e6c5d 100755
--- a/source/l/babl/babl.SlackBuild
+++ b/source/l/babl/babl.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # Copyright 2008, 2009  Robby Workman, Northport, Alabama, USA
 # All rights reserved.
 #
@@ -22,10 +22,20 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=0.1.0
-ARCH=${ARCH:-x86_64}
+PKGNAM=babl
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
@@ -41,18 +51,18 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf babl-$VERSION
-tar xvf $CWD/babl-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/babl-$VERSION.tar.?z* || exit 1
 cd babl-$VERSION || exit 1
 
-zcat $CWD/babl-0.1.0-build-fixes.patch.gz | patch -p1 || exit 1
-sh autogen.sh
-
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -78,7 +88,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 
 mkdir -p $PKG/usr/doc/babl-$VERSION
 cp -a \
-  AUTHORS COPYING* INSTALL NEWS README TODO \
+  AUTHORS COPYING* INSTALL NEWS README* TODO \
   $PKG/usr/doc/babl-$VERSION
 
 mkdir -p $PKG/install
diff --git a/source/l/boost/boost.SlackBuild b/source/l/boost/boost.SlackBuild
index 508c8ff9..3f38c985 100755
--- a/source/l/boost/boost.SlackBuild
+++ b/source/l/boost/boost.SlackBuild
@@ -84,11 +84,11 @@ PYTHON_VERSION=$(python -c 'import sys; print sys.version[:3]')
 PYTHON_FLAGS="-sPYTHON_ROOT=/usr -sPYTHON_VERSION=$PYTHON_VERSION"
 
 # First build bjam, the boost build system:
-cd tools/jam/src
+cd tools/build/v2/engine/src
   CFLAGS="$SLKCFLAGS -fno-strict-aliasing" CC=gcc ./build.sh cc
 cd -
 
-BJAM=$(find tools/jam/src/ -name bjam -a -type f)
+BJAM=$(find tools/build/v2/engine/src/ -name bjam -a -type f)
 
 # Create build subdirectory
 mkdir obj
diff --git a/source/l/cairo/cairo-1.10.0-buggy_gradients.patch b/source/l/cairo/cairo-1.10.0-buggy_gradients.patch
new file mode 100644
index 00000000..13ef50b2
--- /dev/null
+++ b/source/l/cairo/cairo-1.10.0-buggy_gradients.patch
@@ -0,0 +1,13 @@
+--- a/src/cairo-xlib-display.c	2010-08-04 11:57:49.000000000 +0200
++++ b/src/cairo-xlib-display.c	2010-08-04 11:58:28.000000000 +0200
+@@ -353,11 +353,7 @@
+     /* Prior to Render 0.10, there is no protocol support for gradients and
+      * we call function stubs instead, which would silently consume the drawing.
+      */
+-#if RENDER_MAJOR == 0 && RENDER_MINOR < 10
+     display->buggy_gradients = TRUE;
+-#else
+-    display->buggy_gradients = FALSE;
+-#endif
+     display->buggy_pad_reflect = FALSE;
+     display->buggy_repeat = FALSE;
diff --git a/source/l/cairo/cairo.SlackBuild b/source/l/cairo/cairo.SlackBuild
index 655cf2f4..cd31e8ec 100755
--- a/source/l/cairo/cairo.SlackBuild
+++ b/source/l/cairo/cairo.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008-2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,8 +21,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=1.8.8
-BUILD=${BUILD:-3}
+VERSION=1.10.2
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -67,11 +67,9 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-# Use libpng-1.4.x:
-zcat $CWD/cairo.libpng14.diff.gz | patch -p0 --verbose || exit 1
-
-# Time to try leaving this out again?
-#  --disable-xcb
+# Thanks to Ubuntu for this, but I found it at Gentoo's bugtracker
+# http://bugs.gentoo.org/show_bug.cgi?id=336696
+zcat $CWD/cairo-1.10.0-buggy_gradients.patch.gz | patch -p1 || exit 1
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -80,10 +78,30 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --sysconfdir=/etc \
   --disable-gtk-doc \
-  --disable-glitz \
   --disable-quartz \
   --disable-static \
-  --disable-win32
+  --disable-win32 \
+  --disable-trace \
+  --enable-xlib \
+  --enable-freetype \
+  --enable-ps \
+  --enable-pdf \
+  --enable-svg \
+  --enable-tee \
+  --enable-gobject \
+  --build=$ARCH-slackware-linux
+# None of these are 'stable' yet...
+#  --enable-qt \
+#  --enable-gl \
+#  --enable-drm \
+#  --enable-xcb \
+#  --enable-xlib-xcb \
+#  --enable-xcb-drm \
+#  --enable-drm-xr \
+# Skipping this, because it causes a dependency on the specific
+# version of binutils installed at compile time:
+#  --enable-trace
+
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG
 
@@ -92,7 +110,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \
 
 mkdir -p $PKG/usr/doc/cairo-$VERSION
 cp -a \
-  AUTHORS COPYING* NEWS README TODO \
+  AUTHORS BIBLIOGRAPHY BUGS CODING_STYLE COPYING* HACKING NEWS PORTING_GUIDE README RELEASING \
   $PKG/usr/doc/cairo-$VERSION
 ( cd $PKG/usr/doc/cairo-$VERSION ; ln -sf /usr/share/gtk-doc/html/cairo html )
 
diff --git a/source/l/cairo/cairo.libpng14.diff b/source/l/cairo/cairo.libpng14.diff
deleted file mode 100644
index 12bed2c0..00000000
--- a/source/l/cairo/cairo.libpng14.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.orig	2009-06-16 07:25:50.000000000 -0500
-+++ ./configure	2010-05-03 00:12:23.000000000 -0500
-@@ -27890,7 +27890,7 @@
- 
-   if test "x$png_REQUIRES" = x; then
-     # libpng13 is GnuWin32's libpng-1.2.8 :-(
--    for l in libpng12 libpng13 libpng10 ; do
-+    for l in libpng14 libpng12 libpng13 libpng10 ; do
-       if $PKG_CONFIG --exists $l ; then
-         png_REQUIRES=$l
-         use_png=yes
diff --git a/source/l/chmlib/chmlib.SlackBuild b/source/l/chmlib/chmlib.SlackBuild
index 252dc53b..17b7ee73 100755
--- a/source/l/chmlib/chmlib.SlackBuild
+++ b/source/l/chmlib/chmlib.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2007-2008 Robby Workman, Northport, Alabama, 35475
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,20 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=0.39
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-1}
+PKGNAM=chmlib
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:--j6}
 
 CWD=$(pwd)
@@ -40,13 +51,16 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf chmlib-$VERSION
-tar xvf $CWD/chmlib-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/chmlib-$VERSION.tar.?z* || exit 1
 cd chmlib-$VERSION || exit 1 || exit 1
 chown -R root:root .
 find . \
@@ -61,6 +75,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --docdir=/usr/doc/chmlib-$VERSION \
+  --enable-examples \
   --disable-static \
   --build=$ARCH-slackware-linux
 
@@ -74,7 +89,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \
 
 mkdir -p $PKG/usr/doc/chmlib-$VERSION
 cp -a \
-  AUTHORS COPYING* NEWS README \
+  AUTHORS COPYING* NEWS README* \
   $PKG/usr/doc/chmlib-$VERSION
 
 mkdir -p $PKG/install
diff --git a/source/l/clucene/clucene.SlackBuild b/source/l/clucene/clucene.SlackBuild
index fc4d4d4a..e72989fa 100755
--- a/source/l/clucene/clucene.SlackBuild
+++ b/source/l/clucene/clucene.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2007  Heinz Wiesinger <hmwiesinger@gmx.at>
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,9 +25,20 @@
 # No added terms or copyright claims
 
 
-VERSION=0.9.21b
-ARCH=${ARCH:-x86_64}
+PKGNAM=clucene
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:--j6}
 
 CWD=$(pwd)
@@ -43,13 +54,16 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf clucene-core-$VERSION
-tar xvf $CWD/clucene-core-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/clucene-core-$VERSION.tar.?z* || exit 1
 cd clucene-core-$VERSION || exit 1
 chown -R root:root .
 find . \
@@ -77,7 +91,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \
 mkdir -p $PKG/usr/doc/clucene-$VERSION
 cp -a \
   APACHE.license AUTHORS COPYING* HACKING INSTALL \
-  LGPL.license NEWS README REQUESTS \
+  LGPL.license NEWS README* REQUESTS \
   $PKG/usr/doc/clucene-$VERSION
 
 mkdir -p $PKG/install
diff --git a/source/l/db42/db42.SlackBuild b/source/l/db42/db42.SlackBuild
index 21f5a50a..18bf989c 100755
--- a/source/l/db42/db42.SlackBuild
+++ b/source/l/db42/db42.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=4.2.52
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-3}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-db42
@@ -45,6 +54,10 @@ elif [ "$ARCH" = "x86_64" ]; then
   # Needed as a workaround for:
   # "architecture lacks fast mutexes: applications cannot be threaded"
   CONFIGURE_ARGS="--with-mutex=x86/gcc-assembly"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+  CONFIGURE_ARGS=""
 fi
 
 cd $TMP
diff --git a/source/l/db44/db44.SlackBuild b/source/l/db44/db44.SlackBuild
index 321af9c8..7d5c49c2 100755
--- a/source/l/db44/db44.SlackBuild
+++ b/source/l/db44/db44.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=4.4.20
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-db44
@@ -40,6 +49,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 cd $TMP
diff --git a/source/l/dbus-glib/dbus-glib.SlackBuild b/source/l/dbus-glib/dbus-glib.SlackBuild
index dc8afdda..e0c7d35b 100755
--- a/source/l/dbus-glib/dbus-glib.SlackBuild
+++ b/source/l/dbus-glib/dbus-glib.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2006, 2007, 2008  Robby Workman http://rlworkman.net
-# Copyright 2007, 2008, 2009  Patrick Volkerding, Sebeka, MN, USA
+# Copyright 2007, 2008, 2009, 2010  Patrick Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,12 +22,10 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-PRGNAM=dbus-glib
-VERSION=0.86
+PKGNAM=dbus-glib
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
-NUMJOBS=${NUMJOBS:--j7}
-
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -38,9 +36,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+NUMJOBS=${NUMJOBS:--j7}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -51,14 +51,17 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* || exit 1
-cd $PRGNAM-$VERSION || exit 1
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION || exit 1
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -86,11 +89,11 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 
 gzip -9 $PKG/usr/man/man?/*.?
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   AUTHORS COPYING* HACKING INSTALL NEWS README* \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-( cd $PKG/usr/doc/$PRGNAM-$VERSION
+  $PKG/usr/doc/$PKGNAM-$VERSION
+( cd $PKG/usr/doc/$PKGNAM-$VERSION
   ln -s ../../share/gtk-doc/html/dbus-glib/ html
 )
 
@@ -98,5 +101,5 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source/l/djvulibre/djvulibre.SlackBuild b/source/l/djvulibre/djvulibre.SlackBuild
index 28e00a67..373bcc04 100755
--- a/source/l/djvulibre/djvulibre.SlackBuild
+++ b/source/l/djvulibre/djvulibre.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2008  Robby Workman, Northport, Alabama, USA
-# Copyright 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PKGNAM=djvulibre
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/l/eggdbus/eggdbus.SlackBuild b/source/l/eggdbus/eggdbus.SlackBuild
deleted file mode 100755
index 44a0c938..00000000
--- a/source/l/eggdbus/eggdbus.SlackBuild
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for eggdbus
-
-# Copyright 2009  Robby Workman  Northport, Alabama, USA  
-# Copyright 2010  Eric Hameleers, Eindhoven, NL
-# Copyright 2010  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=eggdbus
-VERSION=${VERSION:-0.6}
-BUILD=${BUILD:-1}
-
-NUMJOBS=${NUMJOBS:--j6}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
-    arm*) export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-       *) export ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
-cd $PRGNAM-$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" \
-CXXFLAGS="$SLKCFLAGS" \
-./autogen.sh \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --disable-static \
-  --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
-
-# Add a documentation directory:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog HACKING 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/l/eggdbus/slack-desc b/source/l/eggdbus/slack-desc
deleted file mode 100644
index d2da2980..00000000
--- a/source/l/eggdbus/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-       |-----handy-ruler------------------------------------------------------|
-eggdbus: eggdbus (D-Bus bindings for GObject)
-eggdbus: 
-eggdbus: Experimental D-Bus bindings for GObject.
-eggdbus:
-eggdbus:
-eggdbus:
-eggdbus:
-eggdbus: 
-eggdbus: 
-eggdbus: Home: http://cgit.freedesktop.org/~david/eggdbus
-eggdbus: 
diff --git a/source/l/esound/esound.SlackBuild b/source/l/esound/esound.SlackBuild
index d26ddaea..bbb8a2fe 100755
--- a/source/l/esound/esound.SlackBuild
+++ b/source/l/esound/esound.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +22,20 @@
 
 
 PKGNAM=esound
-VERSION=${VERSION:-0.2.41}
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -43,6 +52,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 cd $TMP
diff --git a/source/l/exiv2/exiv2.SlackBuild b/source/l/exiv2/exiv2.SlackBuild
index 2092df16..6d910a09 100755
--- a/source/l/exiv2/exiv2.SlackBuild
+++ b/source/l/exiv2/exiv2.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2007  Frank Caraballo <fecaraballo{at}gmail{dot}com>
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,9 @@
 
 # Modified by Robby Workman <rworkman at slackware.com>
 
-
-VERSION=0.18.2
+PKGNAM=exiv2
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:--j6}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -41,6 +40,7 @@ fi
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-exiv2
+NUMJOBS=${NUMJOBS:--j6}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -94,7 +94,18 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \
 )
 
 mkdir -p $PKG/usr/doc/exiv2-$VERSION
-cp -a COPYING* README doc/{templates,COPYING-XMPSDK,README-XMP,cmd.txt,cmdxmp.txt} $PKG/usr/doc/exiv2-$VERSION
+cp -a \
+  COPYING* README \
+  doc/{templates,COPYING-XMPSDK,README-XMP,cmd.txt,cmdxmp.txt} \
+  $PKG/usr/doc/exiv2-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/l/expat/expat-2.0.1-fixes-3.patch b/source/l/expat/expat-2.0.1-fixes-3.patch
new file mode 100644
index 00000000..5059f297
--- /dev/null
+++ b/source/l/expat/expat-2.0.1-fixes-3.patch
@@ -0,0 +1,38 @@
+Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
+Date: 2010-12-09
+Initial Package Version: 2.0.1
+Upstream Status: From Upstream
+Origin: Unknown
+Description: Fixes for CVE-2009-2625 (infinite loop and application hang via
+malformed XML) CVE-2009-3560 (DOS via buffer overrun caused by malformed UTF-8)
+and CVE-2009-3720 (DOS via buffer overrun caused by crafted UTF-8).  This
+replaces version -2 which had both the original and the revised fixes for
+CVE-2009-3560 - the revised version is supposed to replace the original, not
+add to it, because of problems with certain perl users of libexpat.
+
+
+diff -Naur expat-2.0.1.orig//lib/xmlparse.c expat-2.0.1/lib/xmlparse.c
+--- expat-2.0.1.orig//lib/xmlparse.c	2007-05-08 03:25:35.000000000 +0100
++++ expat-2.0.1/lib/xmlparse.c	2010-12-06 18:01:03.082339393 +0000
+@@ -3703,6 +3703,9 @@
+         return XML_ERROR_UNCLOSED_TOKEN;
+       case XML_TOK_PARTIAL_CHAR:
+         return XML_ERROR_PARTIAL_CHAR;
++      case -XML_TOK_PROLOG_S:
++        tok = -tok;
++        break;
+       case XML_TOK_NONE:
+ #ifdef XML_DTD
+         /* for internal PE NOT referenced between declarations */
+diff -Naur expat-2.0.1.orig//lib/xmltok_impl.c expat-2.0.1/lib/xmltok_impl.c
+--- expat-2.0.1.orig//lib/xmltok_impl.c	2006-11-26 17:34:46.000000000 +0000
++++ expat-2.0.1/lib/xmltok_impl.c	2010-12-06 18:01:03.082339393 +0000
+@@ -1744,7 +1744,7 @@
+                        const char *end,
+                        POSITION *pos)
+ {
+-  while (ptr != end) {
++  while (ptr < end) {
+     switch (BYTE_TYPE(enc, ptr)) {
+ #define LEAD_CASE(n) \
+     case BT_LEAD ## n: \
diff --git a/source/l/expat/expat.SlackBuild b/source/l/expat/expat.SlackBuild
index 8c972bb6..94e7e3a5 100755
--- a/source/l/expat/expat.SlackBuild
+++ b/source/l/expat/expat.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,9 +20,19 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=2.0.1
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-1}
+PKGNAM=expat
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -33,6 +43,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
@@ -43,8 +56,11 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf expat-$VERSION
-tar xzvf $CWD/expat-$VERSION.tar.gz || exit 1
+tar xzvf $CWD/expat-$VERSION.tar.?z* || exit 1
 cd expat-$VERSION
+
+zcat $CWD/expat-2.0.1-fixes-3.patch.gz | patch -p1 --verbose || exit 1
+
 chown -R root:root .
 find . -perm 777 -exec chmod 755 {} \;
 find . -perm 664 -exec chmod 644 {} \;
@@ -61,7 +77,7 @@ make install DESTDIR=$PKG
 )
 mkdir -p $PKG/usr/doc/expat-$VERSION
 cp -a  \
-  COPYING Changes README doc/reference.html \
+  COPYING* Changes README* doc/reference.html \
   $PKG/usr/doc/expat-$VERSION
 gzip -9 $PKG/usr/man/man?/*.?
 mkdir -p $PKG/install
diff --git a/source/l/freetype/freetype.SlackBuild b/source/l/freetype/freetype.SlackBuild
index 1c1b25d3..33b75a97 100755
--- a/source/l/freetype/freetype.SlackBuild
+++ b/source/l/freetype/freetype.SlackBuild
@@ -21,7 +21,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=${VERSION:-$(echo freetype-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
+PKGNAM=freetype
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -72,13 +73,6 @@ find . \
 # punishment on someone else's distribution.
 zcat $CWD/freetype.illadvisederror.diff.gz | patch -p1 --verbose || exit 1
 
-# The line below enables code patented by Apple, so don't uncomment it
-# unless you have a license to use the code and take all legal responsibility
-# for doing so.
-# Please see this web site for more details:
-#   http://www.freetype.org/patents.html
-#zcat $CWD/freetype.bytecode.interpreter.diff.gz | patch -p1 --verbose || exit 1
-
 # The line below enables code patented by Microsoft, so don't uncomment it
 # unless you have a license to use the code and take all legal responsibility
 # for doing so.
diff --git a/source/l/freetype/freetype.bytecode.interpreter.diff b/source/l/freetype/freetype.bytecode.interpreter.diff
deleted file mode 100644
index 3861d6e2..00000000
--- a/source/l/freetype/freetype.bytecode.interpreter.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/freetype/config/ftoption.h.orig	2007-04-21 17:42:39.000000000 +0200
-+++ ./include/freetype/config/ftoption.h	2007-04-21 17:43:39.000000000 +0200
-@@ -456,7 +456,7 @@
-   /*   Do not #undef this macro here, since the build system might         */
-   /*   define it for certain configurations only.                          */
-   /*                                                                       */
--/* #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
-+#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
- 
- 
-   /*************************************************************************/
diff --git a/source/l/fribidi/fribidi.SlackBuild b/source/l/fribidi/fribidi.SlackBuild
index 8917b8f2..5c8cd086 100755
--- a/source/l/fribidi/fribidi.SlackBuild
+++ b/source/l/fribidi/fribidi.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,11 +21,22 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=0.10.9
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+PKGNAM=fribidi
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -35,6 +46,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
@@ -45,7 +59,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf fribidi-$VERSION
-tar xjvf $CWD/fribidi-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/fribidi-$VERSION.tar.?z* || exit 1
 cd fribidi-$VERSION
 chown -R root:root .
 find . -perm 777 -exec chmod 755 {} \;
@@ -65,7 +79,7 @@ make install DESTDIR=$PKG
 strip -g $PKG/usr/lib/libfribidi.a
 mkdir -p $PKG/usr/doc/fribidi-$VERSION
 cp -a \
-  AUTHORS COPYING NEWS README THANKS TODO \
+  AUTHORS COPYING* NEWS README* THANKS TODO \
   $PKG/usr/doc/fribidi-$VERSION
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/l/fuse/fuse.SlackBuild b/source/l/fuse/fuse.SlackBuild
index 0c5ddaa2..5b42ff38 100755
--- a/source/l/fuse/fuse.SlackBuild
+++ b/source/l/fuse/fuse.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright (c) 2008, Antonio Hernandez Blas <hba.nihilismus@gmail.com>
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -107,8 +107,8 @@ mv $PKG/etc/udev $PKG/lib
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING COPYING.LIB FAQ Filesystems INSTALL NEWS README \
-  README.NFS doc/how-fuse-works doc/kernel.txt \
+  AUTHORS COPYING* FAQ Filesystems INSTALL NEWS README* \
+  doc/how-fuse-works doc/kernel.txt \
   $PKG/usr/doc/$PKGNAM-$VERSION
 
 # If there's a ChangeLog, installing at least part of the recent history
diff --git a/source/l/gamin/doinst.sh b/source/l/gamin/doinst.sh
new file mode 100644
index 00000000..75e3fcba
--- /dev/null
+++ b/source/l/gamin/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/gamin/gaminrc.new
+
diff --git a/source/l/gamin/gamin.SlackBuild b/source/l/gamin/gamin.SlackBuild
index 8fbeae5f..9eb37919 100755
--- a/source/l/gamin/gamin.SlackBuild
+++ b/source/l/gamin/gamin.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-# Copyright 2006,2007,2009  Robby Workman, Northport, AL, USA
-# Copyright 2007, 2008, 2009  Patrick Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2009  Robby Workman, Northport, AL, USA
+# Copyright 2007, 2008, 2009, 2010, 2011  Patrick Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,19 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-PRGNAM=gamin
-VERSION=0.1.10
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-2}
+PKGNAM=gamin
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-3}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -38,19 +47,22 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
 cd $TMP 
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
-cd $PRGNAM-$VERSION
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -65,7 +77,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
   --enable-shared=yes \
   --enable-static=no \
   --enable-inotify \
@@ -77,20 +89,32 @@ CXXFLAGS="$SLKCFLAGS" \
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
+mkdir -p $PKG/etc/gamin
+zcat $CWD/gaminrc.gz > $PKG/etc/gamin/gaminrc.new
+
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/html
 cp -a \
-  AUTHORS COPYING Copyright NEWS README TODO doc/*.txt \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+  AUTHORS COPYING* Copyright NEWS README* TODO doc/*.txt \
+  $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   doc/*.html doc/*.gif \
-  $PKG/usr/doc/$PRGNAM-$VERSION/html
+  $PKG/usr/doc/$PKGNAM-$VERSION/html
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source/l/gamin/gaminrc b/source/l/gamin/gaminrc
new file mode 100644
index 00000000..1686dd57
--- /dev/null
+++ b/source/l/gamin/gaminrc
@@ -0,0 +1,37 @@
+# configuration for gamin
+# Can be used to override the default behaviour.
+# notify filepath(s) : indicate to use kernel notification
+# poll filepath(s)   : indicate to use polling instead
+# fsset fsname method poll_limit : indicate what method of notification for the filesystem
+#                                  kernel - use the kernel for notification
+#                                  poll - use polling for notification
+#                                  none - don't use any notification
+#
+#                                  the poll_limit is the number of seconds
+#                                  that must pass before a resource is polled again.
+#                                  It is optional, and if it is not present the previous
+#                                  value will be used or the default.
+
+#notify /mnt/local* /mnt/pictures* # use kernel notification on these paths
+#poll /tmp/* /var/*                # use poll notification on these paths
+
+# A safe default is to poll filesystems once every 15 seconds:
+fsset btrfs poll 15
+fsset cifs poll 15
+fsset ext2 poll 15
+fsset ext3 poll 15
+fsset ext4 poll 15
+fsset hfs poll 15
+fsset hfsplus poll 15
+fsset iso9660 poll 15
+fsset jfs poll 15
+fsset nfs poll 15
+fsset nfs4 poll 15
+fsset ntfs poll 15
+fsset ntfs-3g poll 15
+fsset ocfs2 poll 15
+fsset reiserfs poll 15
+fsset udf poll 15
+fsset vfat poll 15
+fsset xfs poll 15
+
diff --git a/source/l/gdbm/gdbm.SlackBuild b/source/l/gdbm/gdbm.SlackBuild
index aeb91618..691f7001 100755
--- a/source/l/gdbm/gdbm.SlackBuild
+++ b/source/l/gdbm/gdbm.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,10 +24,20 @@
 # by volkerdi@slackware.com, 2/2001
 
 
-VERSION=1.8.3
-ARCH=${ARCH:-x86_64}
+PKGNAM=gdbm
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-4}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-gdbm
@@ -43,12 +53,15 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 cd $TMP
 rm -rf gdbm-$VERSION
-tar xzvf $CWD/gdbm-$VERSION.tar.gz
-cd gdbm-$VERSION
+tar xvf $CWD/gdbm-$VERSION.tar.?z* || exit 1
+cd gdbm-$VERSION || exit 1
 chown -R root:root .
 find . -perm 700 -exec chmod 755 {} \;
 find . -perm 600 -exec chmod 644 {} \;
@@ -73,8 +86,17 @@ make install INSTALL_ROOT=$PKG
 )
 mkdir -p $PKG/usr/doc/gdbm-$VERSION
 cp -a \
-  COPYING ChangeLog NEWS README \
+  COPYING* NEWS README* \
   $PKG/usr/doc/gdbm-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/gdbm.info
 gzip -9 $PKG/usr/man/man3/gdbm.3
diff --git a/source/l/gdk-pixbuf2/doinst.sh b/source/l/gdk-pixbuf2/doinst.sh
new file mode 100644
index 00000000..57c9b7f0
--- /dev/null
+++ b/source/l/gdk-pixbuf2/doinst.sh
@@ -0,0 +1 @@
+chroot . /usr/bin/update-gdk-pixbuf-loaders 1> /dev/null 2> /dev/null
diff --git a/source/l/gdk-pixbuf2/gdk-pixbuf.pnglz.diff b/source/l/gdk-pixbuf2/gdk-pixbuf.pnglz.diff
new file mode 100644
index 00000000..b8ca9928
--- /dev/null
+++ b/source/l/gdk-pixbuf2/gdk-pixbuf.pnglz.diff
@@ -0,0 +1,12 @@
+diff -Nur gdk-pixbuf-2.22.0.orig/gdk-pixbuf/Makefile.in gdk-pixbuf-2.22.0/gdk-pixbuf/Makefile.in
+--- gdk-pixbuf-2.22.0.orig/gdk-pixbuf/Makefile.in	2010-09-21 13:28:57.000000000 -0500
++++ gdk-pixbuf-2.22.0/gdk-pixbuf/Makefile.in	2010-10-09 10:24:16.917235308 -0500
+@@ -795,7 +795,7 @@
+ LIBJASPER = @LIBJASPER@
+ LIBJPEG = @LIBJPEG@
+ LIBOBJS = @LIBOBJS@
+-LIBPNG = @LIBPNG@
++LIBPNG = @LIBPNG@ -lz
+ LIBS = @LIBS@
+ LIBTIFF = @LIBTIFF@
+ LIBTOOL = @LIBTOOL@
diff --git a/source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild b/source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild
new file mode 100755
index 00000000..3978a04b
--- /dev/null
+++ b/source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild
@@ -0,0 +1,132 @@
+#!/bin/sh
+
+# Slackware build script for gdk-pixbuf
+
+# Copyright 2010  Robby Workman, Northport, Alabama, USA
+# Copyright 2010, 2011  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.
+
+PKGNAM=gdk-pixbuf
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
+cd $PKGNAM-$VERSION || exit 1
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+# There's been this long standing debate about PNG and -lz
+# and this patch is the workaround.  ;-)
+zcat $CWD/gdk-pixbuf.pnglz.diff.gz | patch -p1 || exit 1
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --disable-introspection \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# We need to have separate 32-bit and 64-bit binaries
+# for places where we have two copies of the GTK+ package installed.
+# (we might have x86_64 and i486 packages on the same system, for example.)
+host="$ARCH-slackware-linux"
+case "$host" in
+  s390x*|x86_64*)
+   mv $PKG/usr/bin/gdk-pixbuf-query-loaders{,-64}
+   ( cd $PKG/usr/bin
+     ln -sf gdk-pixbuf-query-loaders-64 gdk-pixbuf-query-loaders
+   )
+   ;;
+  *)
+   mv $PKG/usr/bin/gdk-pixbuf-query-loaders{,-32}
+   ( cd $PKG/usr/bin
+     ln -sf gdk-pixbuf-query-loaders-32 gdk-pixbuf-query-loaders
+   )
+   ;;
+esac
+
+# Install wrappers for the binaries:
+cp $CWD/update-gdk-pixbuf-loaders $PKG/usr/bin/update-gdk-pixbuf-loaders
+chmod 0755 $PKG/usr/bin/update-gdk-pixbuf-loaders
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* INSTALL NEWS README* \
+  $PKG/usr/doc/$PKGNAM-$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/${PKGNAM}2-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/l/gdk-pixbuf2/slack-desc b/source/l/gdk-pixbuf2/slack-desc
new file mode 100644
index 00000000..2fed0a6a
--- /dev/null
+++ b/source/l/gdk-pixbuf2/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------------------------------------------------------|
+gdk-pixbuf2: gdk-pixbuf2 (image library used by GTK+ v2)
+gdk-pixbuf2:
+gdk-pixbuf2: The gdk-pixbuf library provides a number of features:
+gdk-pixbuf2: - GdkPixbuf structure for representing images.
+gdk-pixbuf2: - Image loading facilities, both synchronous and progressive.
+gdk-pixbuf2: - Rendering of a GdkPixbuf into various formats:
+gdk-pixbuf2:   drawables (windows, pixmaps), GdkRGB buffers.
+gdk-pixbuf2: - Fast scaling and compositing of pixbufs.
+gdk-pixbuf2: - Simple animation loading (ie. animated gifs).
+gdk-pixbuf2:
+gdk-pixbuf2:
diff --git a/source/l/gdk-pixbuf2/update-gdk-pixbuf-loaders b/source/l/gdk-pixbuf2/update-gdk-pixbuf-loaders
new file mode 100644
index 00000000..b19d3680
--- /dev/null
+++ b/source/l/gdk-pixbuf2/update-gdk-pixbuf-loaders
@@ -0,0 +1,56 @@
+#! /bin/sh
+# Updates $(libdir)/gdk-pixbuf-2.0/2.10.0/loaders
+
+umask 022
+
+# Get the machine type from uname:
+host=$(uname -m)-slackware-linux
+
+# Fix $host for arm arch:
+case "$host" in
+  arm*) host=arm-slackware-linux-gnueabi ;;
+esac
+
+case "$host" in
+  s390x*|x86_64*)
+   if [ -x /usr/bin/gdk-pixbuf-query-loaders-64 ]; then
+     if [ "$1" = "--verbose" ]; then
+       echo "Updating gdk-pixbuf.loaders for ${host}:"
+       echo "  /usr/bin/gdk-pixbuf-query-loaders-64 --update-cache"
+     fi
+     /usr/bin/gdk-pixbuf-query-loaders-64 --update-cache
+     # Check for x86_64 multilib:
+     if ls -d /etc/gtk-2.0/i?86* 1> /dev/null 2> /dev/null ; then
+       if [ -x /usr/bin/gdk-pixbuf-query-loaders-32 ]; then
+         if [ "$1" = "--verbose" ]; then
+           echo "Updating gdk-pixbuf.loaders for ${mlhost}:"
+           echo "  /usr/bin/gdk-pixbuf-query-loaders-32 --update-cache"
+         fi
+         /usr/bin/gdk-pixbuf-query-loaders-32 --update-cache
+       fi
+     fi
+   else
+     if [ "$1" = "--verbose" ]; then
+       echo "Updating gdk-pixbuf.loaders for ${host}:"
+       echo "  /usr/bin/gdk-pixbuf-query-loaders --update-cache"
+     fi
+     /usr/bin/gdk-pixbuf-query-loaders --update-cache
+   fi
+   ;;
+  *)
+   if [ -x /usr/bin/gdk-pixbuf-query-loaders-32 ]; then
+     if [ "$1" = "--verbose" ]; then
+       echo "Updating gdk-pixbuf.loaders for ${host}:"
+       echo "  /usr/bin/gdk-pixbuf-query-loaders-32 --update-cache"
+     fi
+     /usr/bin/gdk-pixbuf-query-loaders-32 --update-cache
+   else
+     if [ "$1" = "--verbose" ]; then
+       echo "Updating gdk-pixbuf.loaders for ${host}:"
+       echo "  /usr/bin/gdk-pixbuf-query-loaders --update-cache"
+     fi
+     /usr/bin/gdk-pixbuf-query-loaders --update-cache
+   fi
+   ;;
+esac
+
diff --git a/source/l/gegl/gegl.SlackBuild b/source/l/gegl/gegl.SlackBuild
index 86e07aa8..d0d29911 100755
--- a/source/l/gegl/gegl.SlackBuild
+++ b/source/l/gegl/gegl.SlackBuild
@@ -23,7 +23,7 @@
 
 
 VERSION=${VERSION:-$(echo gegl-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -59,7 +59,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf gegl-$VERSION
-tar xvf $CWD/gegl-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/gegl-$VERSION.tar.?z* || exit 1
 cd gegl-$VERSION || exit 1
 chown -R root:root .
 find . \
@@ -78,17 +78,17 @@ CFLAGS="$SLKCFLAGS" \
   --disable-docs \
   --enable-mmx \
   --disable-sse \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG
+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/gegl-$VERSION
 cp -a \
-  AUTHORS COPYING* INSTALL NEWS README TODO \
+  AUTHORS COPYING* INSTALL NEWS README* TODO \
   $PKG/usr/doc/gegl-$VERSION
 #( cd $PKG/usr/doc/gegl-$VERSION ; ln -s /usr/share/gtk-doc/html/gegl/ html )
 
diff --git a/source/l/glib/glib.SlackBuild b/source/l/glib/glib.SlackBuild
index 14a254b9..62afbdfd 100755
--- a/source/l/glib/glib.SlackBuild
+++ b/source/l/glib/glib.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,18 @@
 
 
 PKGNAM=glib
-VERSION=${VERSION:-1.2.10}
-ARCH=${ARCH:-x86_64}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-3}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -42,11 +50,14 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xjvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
 cd ${PKGNAM}-$VERSION
 
 bzcat $CWD/glib1.2_1.2.10-17.diff.bz2 | patch -p1 --verbose || exit 1
@@ -106,7 +117,7 @@ fi
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  AUTHORS COPYING INSTALL NEWS README \
+  AUTHORS COPYING* INSTALL NEWS README* \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 
 mkdir -p $PKG/install
diff --git a/source/l/glib2/doinst.sh b/source/l/glib2/doinst.sh
index 60a19898..95b61fff 100644
--- a/source/l/glib2/doinst.sh
+++ b/source/l/glib2/doinst.sh
@@ -25,3 +25,7 @@ for file in etc/profile.d/libglib2.csh.new etc/profile.d/libglib2.sh.new ; do
   fi
   config $file
 done
+
+# Try to run this.  If it fails, no biggie.
+chroot . /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/ 1> /dev/null 2> /dev/null
+
diff --git a/source/l/glib2/glib2.SlackBuild b/source/l/glib2/glib2.SlackBuild
index b662e37f..2cf57f5e 100755
--- a/source/l/glib2/glib2.SlackBuild
+++ b/source/l/glib2/glib2.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -114,5 +114,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/glib2-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n --prepend $TMP/glib2-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source/l/glib2/libglib2.csh b/source/l/glib2/libglib2.csh
index 584f06bf..a1b67561 100644
--- a/source/l/glib2/libglib2.csh
+++ b/source/l/glib2/libglib2.csh
@@ -18,7 +18,7 @@
 # using a UTF-8 locale.  Hopefully we're correct.
 echo $LANG | grep -iq UTF
 if ($status == 0) then
-  export G_FILENAME_ENCODING="@locale"
+  setenv G_FILENAME_ENCODING "@locale"
 endif
 
 # It doesn't hurt to export this since G_FILENAME_ENCODING takes priority
diff --git a/source/l/glibc/doinst.sh-glibc b/source/l/glibc/doinst.sh-glibc
index ffc066e8..427723c2 100644
--- a/source/l/glibc/doinst.sh-glibc
+++ b/source/l/glibc/doinst.sh-glibc
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Copyright (C) 2002, 2005  Slackware Linux, Inc.
-# Copyright 2005, 2006, 2007  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005, 2006, 2007, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -111,43 +111,43 @@ rm -f etc/profile.d/glibc.sh.new
 # In case there's no ldconfig, make the links manually:
 if [ ! -x /sbin/ldconfig ]; then
 ( cd lib ; rm -rf libnss_nis.so.2 )
-( cd lib ; ln -sf libnss_nis-2.11.1.so libnss_nis.so.2 )
+( cd lib ; ln -sf libnss_nis-2.13.so libnss_nis.so.2 )
 ( cd lib ; rm -rf libm.so.6 )
-( cd lib ; ln -sf libm-2.11.1.so libm.so.6 )
+( cd lib ; ln -sf libm-2.13.so libm.so.6 )
 ( cd lib ; rm -rf libnss_files.so.2 )
-( cd lib ; ln -sf libnss_files-2.11.1.so libnss_files.so.2 )
+( cd lib ; ln -sf libnss_files-2.13.so libnss_files.so.2 )
 ( cd lib ; rm -rf libresolv.so.2 )
-( cd lib ; ln -sf libresolv-2.11.1.so libresolv.so.2 )
+( cd lib ; ln -sf libresolv-2.13.so libresolv.so.2 )
 ( cd lib ; rm -rf libnsl.so.1 )
-( cd lib ; ln -sf libnsl-2.11.1.so libnsl.so.1 )
+( cd lib ; ln -sf libnsl-2.13.so libnsl.so.1 )
 ( cd lib ; rm -rf libutil.so.1 )
-( cd lib ; ln -sf libutil-2.11.1.so libutil.so.1 )
+( cd lib ; ln -sf libutil-2.13.so libutil.so.1 )
 ( cd lib ; rm -rf libnss_compat.so.2 )
-( cd lib ; ln -sf libnss_compat-2.11.1.so libnss_compat.so.2 )
+( cd lib ; ln -sf libnss_compat-2.13.so libnss_compat.so.2 )
 ( cd lib ; rm -rf libthread_db.so.1 )
 ( cd lib ; ln -sf libthread_db-1.0.so libthread_db.so.1 )
 ( cd lib ; rm -rf libnss_hesiod.so.2 )
-( cd lib ; ln -sf libnss_hesiod-2.11.1.so libnss_hesiod.so.2 )
+( cd lib ; ln -sf libnss_hesiod-2.13.so libnss_hesiod.so.2 )
 ( cd lib ; rm -rf libanl.so.1 )
-( cd lib ; ln -sf libanl-2.11.1.so libanl.so.1 )
+( cd lib ; ln -sf libanl-2.13.so libanl.so.1 )
 ( cd lib ; rm -rf libcrypt.so.1 )
-( cd lib ; ln -sf libcrypt-2.11.1.so libcrypt.so.1 )
+( cd lib ; ln -sf libcrypt-2.13.so libcrypt.so.1 )
 ( cd lib ; rm -rf libBrokenLocale.so.1 )
-( cd lib ; ln -sf libBrokenLocale-2.11.1.so libBrokenLocale.so.1 )
+( cd lib ; ln -sf libBrokenLocale-2.13.so libBrokenLocale.so.1 )
 ( cd lib ; rm -rf ld-linux.so.2 )
-( cd lib ; ln -sf ld-2.11.1.so ld-linux.so.2 )
+( cd lib ; ln -sf ld-2.13.so ld-linux.so.2 )
 ( cd lib ; rm -rf libdl.so.2 )
-( cd lib ; ln -sf libdl-2.11.1.so libdl.so.2 )
+( cd lib ; ln -sf libdl-2.13.so libdl.so.2 )
 ( cd lib ; rm -rf libnss_dns.so.2 )
-( cd lib ; ln -sf libnss_dns-2.11.1.so libnss_dns.so.2 )
+( cd lib ; ln -sf libnss_dns-2.13.so libnss_dns.so.2 )
 ( cd lib ; rm -rf libpthread.so.0 )
-( cd lib ; ln -sf libpthread-2.11.1.so libpthread.so.0 )
+( cd lib ; ln -sf libpthread-2.13.so libpthread.so.0 )
 ( cd lib ; rm -rf libnss_nisplus.so.2 )
-( cd lib ; ln -sf libnss_nisplus-2.11.1.so libnss_nisplus.so.2 )
+( cd lib ; ln -sf libnss_nisplus-2.13.so libnss_nisplus.so.2 )
 ( cd lib ; rm -rf libc.so.6 )
-( cd lib ; ln -sf libc-2.11.1.so libc.so.6 )
+( cd lib ; ln -sf libc-2.13.so libc.so.6 )
 ( cd lib ; rm -rf librt.so.1 )
-( cd lib ; ln -sf librt-2.11.1.so librt.so.1 )
+( cd lib ; ln -sf librt-2.13.so librt.so.1 )
 fi
 
 # More links:
diff --git a/source/l/glibc/doinst.sh-glibc-solibs b/source/l/glibc/doinst.sh-glibc-solibs
index a186da99..adcb4131 100644
--- a/source/l/glibc/doinst.sh-glibc-solibs
+++ b/source/l/glibc/doinst.sh-glibc-solibs
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Copyright (C) 2002, 2005  Slackware Linux, Inc.
-# Copyright 2005, 2006  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005, 2006, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -91,41 +91,41 @@ rm -f etc/profile.d/glibc.sh.new
 # In case there's no ldconfig, make the links manually:
 if [ ! -x /sbin/ldconfig ]; then
 ( cd lib ; rm -rf libnss_nis.so.2 )
-( cd lib ; ln -sf libnss_nis-2.11.1.so libnss_nis.so.2 )
+( cd lib ; ln -sf libnss_nis-2.13.so libnss_nis.so.2 )
 ( cd lib ; rm -rf libm.so.6 )
-( cd lib ; ln -sf libm-2.11.1.so libm.so.6 )
+( cd lib ; ln -sf libm-2.13.so libm.so.6 )
 ( cd lib ; rm -rf libnss_files.so.2 )
-( cd lib ; ln -sf libnss_files-2.11.1.so libnss_files.so.2 )
+( cd lib ; ln -sf libnss_files-2.13.so libnss_files.so.2 )
 ( cd lib ; rm -rf libresolv.so.2 )
-( cd lib ; ln -sf libresolv-2.11.1.so libresolv.so.2 )
+( cd lib ; ln -sf libresolv-2.13.so libresolv.so.2 )
 ( cd lib ; rm -rf libnsl.so.1 )
-( cd lib ; ln -sf libnsl-2.11.1.so libnsl.so.1 )
+( cd lib ; ln -sf libnsl-2.13.so libnsl.so.1 )
 ( cd lib ; rm -rf libutil.so.1 )
-( cd lib ; ln -sf libutil-2.11.1.so libutil.so.1 )
+( cd lib ; ln -sf libutil-2.13.so libutil.so.1 )
 ( cd lib ; rm -rf libnss_compat.so.2 )
-( cd lib ; ln -sf libnss_compat-2.11.1.so libnss_compat.so.2 )
+( cd lib ; ln -sf libnss_compat-2.13.so libnss_compat.so.2 )
 ( cd lib ; rm -rf libthread_db.so.1 )
 ( cd lib ; ln -sf libthread_db-1.0.so libthread_db.so.1 )
 ( cd lib ; rm -rf libnss_hesiod.so.2 )
-( cd lib ; ln -sf libnss_hesiod-2.11.1.so libnss_hesiod.so.2 )
+( cd lib ; ln -sf libnss_hesiod-2.13.so libnss_hesiod.so.2 )
 ( cd lib ; rm -rf libanl.so.1 )
-( cd lib ; ln -sf libanl-2.11.1.so libanl.so.1 )
+( cd lib ; ln -sf libanl-2.13.so libanl.so.1 )
 ( cd lib ; rm -rf libcrypt.so.1 )
-( cd lib ; ln -sf libcrypt-2.11.1.so libcrypt.so.1 )
+( cd lib ; ln -sf libcrypt-2.13.so libcrypt.so.1 )
 ( cd lib ; rm -rf libBrokenLocale.so.1 )
-( cd lib ; ln -sf libBrokenLocale-2.11.1.so libBrokenLocale.so.1 )
+( cd lib ; ln -sf libBrokenLocale-2.13.so libBrokenLocale.so.1 )
 ( cd lib ; rm -rf ld-linux.so.2 )
-( cd lib ; ln -sf ld-2.11.1.so ld-linux.so.2 )
+( cd lib ; ln -sf ld-2.13.so ld-linux.so.2 )
 ( cd lib ; rm -rf libdl.so.2 )
-( cd lib ; ln -sf libdl-2.11.1.so libdl.so.2 )
+( cd lib ; ln -sf libdl-2.13.so libdl.so.2 )
 ( cd lib ; rm -rf libnss_dns.so.2 )
-( cd lib ; ln -sf libnss_dns-2.11.1.so libnss_dns.so.2 )
+( cd lib ; ln -sf libnss_dns-2.13.so libnss_dns.so.2 )
 ( cd lib ; rm -rf libpthread.so.0 )
-( cd lib ; ln -sf libpthread-2.11.1.so libpthread.so.0 )
+( cd lib ; ln -sf libpthread-2.13.so libpthread.so.0 )
 ( cd lib ; rm -rf libnss_nisplus.so.2 )
-( cd lib ; ln -sf libnss_nisplus-2.11.1.so libnss_nisplus.so.2 )
+( cd lib ; ln -sf libnss_nisplus-2.13.so libnss_nisplus.so.2 )
 ( cd lib ; rm -rf libc.so.6 )
-( cd lib ; ln -sf libc-2.11.1.so libc.so.6 )
+( cd lib ; ln -sf libc-2.13.so libc.so.6 )
 ( cd lib ; rm -rf librt.so.1 )
-( cd lib ; ln -sf librt-2.11.1.so librt.so.1 )
+( cd lib ; ln -sf librt-2.13.so librt.so.1 )
 fi
diff --git a/source/l/glibc/doinst.sh-glibc-zoneinfo b/source/l/glibc/doinst.sh-glibc-zoneinfo
index 7afabf89..04bfe8ef 100644
--- a/source/l/glibc/doinst.sh-glibc-zoneinfo
+++ b/source/l/glibc/doinst.sh-glibc-zoneinfo
@@ -3,21 +3,15 @@ ldconfig -r .
 # Fix existing old style /etc/localtime symlink:
 if [ -L etc/localtime -a ! -r etc/localtime-copied-from ]; then
   mv etc/localtime etc/localtime-copied-from
-  chroot . /bin/cp etc/localtime-copied-from etc/localtime
 fi
 # Add the default timezone in /etc, if none exists:
 if [ ! -r etc/localtime ]; then
   ( cd etc ; rm -rf localtime localtime-copied-from )
   ( cd etc ; ln -sf /usr/share/zoneinfo/Factory localtime-copied-from )
-  chroot . /bin/cp etc/localtime-copied-from etc/localtime
-fi
-# Add the default link in /usr/share/zoneinfo, if none exists:
-if [ ! -L usr/share/zoneinfo/localtime ]; then
-  ( cd usr/share/zoneinfo ; rm -rf localtime )
-  ( cd usr/share/zoneinfo ; ln -sf /etc/localtime localtime )
 fi
 # Make sure /etc/localtime is updated:
 chroot . /bin/cp etc/localtime-copied-from etc/localtime
+# Add the default link in /usr/share/zoneinfo:
 ( cd usr/share/zoneinfo ; rm -rf timeconfig )
 ( cd usr/share/zoneinfo ; ln -sf /usr/sbin/timeconfig timeconfig )
 ### Make the rest of the symbolic links in the zoneinfo database:
diff --git a/source/l/glibc/glibc.SlackBuild b/source/l/glibc/glibc.SlackBuild
index c00d790e..d3f21ae5 100755
--- a/source/l/glibc/glibc.SlackBuild
+++ b/source/l/glibc/glibc.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,9 @@
 
 ## build glibc-$VERSION for Slackware
 
-VERSION=${VERSION:-2.11.1}
+VERSION=${VERSION:-2.13}
 CHECKOUT=${CHECKOUT:-""}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 
 ## Included in glibc now:
 ## glibc-libidn version
@@ -42,6 +42,56 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+# I'll break this out as an option for fun  :-)
+case $ARCH  in
+  i386)
+    OPTIMIZ="-O3 -march=i386 -mcpu=i686"
+    LIBDIRSUFFIX=""
+    ;;
+  i486)
+    OPTIMIZ="-O3 -march=i486 -mtune=i686"
+    LIBDIRSUFFIX=""
+    ;;
+  i586)
+    OPTIMIZ="-O3 -march=i586"
+    LIBDIRSUFFIX=""
+    ;;
+  i686)
+    OPTIMIZ="-O3 -march=i686"
+    LIBDIRSUFFIX=""
+    ;;
+  athlon)
+    OPTIMIZ="-O3 -march=athlon"
+    LIBDIRSUFFIX=""
+    ;;
+  s390)
+    OPTIMIZ="-O3"
+    LIBDIRSUFFIX=""
+    ;;
+  x86_64)
+    OPTIMIZ="-O3 -fPIC"
+    LIBDIRSUFFIX="64"
+    ;;
+  *)
+    OPTIMIZ="-O3"
+    LIBDIRSUFFIX=""
+    ;;
+esac
+
+case $ARCH in
+  x86_64)
+    TARGET=${TARGET:-x86_64}
+    ;;
+  i486)
+    # This should be i486 for all 32-bit x86 arch:
+    TARGET=${TARGET:-i486}
+    ;;
+esac
+
+# Hand off the $ARCH variable to $SLACKWARE_ARCH to avoid confusing glibc:
+SLACKWARE_ARCH=$ARCH
+unset ARCH
+
 CVSVER=${VERSION}${CHECKOUT}
 
 # NOTE!!!  glibc needs to be built against the sanitized kernel headers,
@@ -58,21 +108,11 @@ mkdir -p $TMP
 NUMJOBS=${NUMJOBS:--j4}
 
 # Sanity check on the version number in the install scripts:
-if ! grep -vq libutil-$VERSION}.so $CWD/doinst.sh-glibc ; then
+if ! grep -vq libutil-${VERSION}.so $CWD/doinst.sh-glibc ; then
   echo "FATAL:  doinst.sh scripts have wrong version numbers."
   exit 1
 fi
 
-case $ARCH in
-  x86_64)
-    TARGET=${TARGET:-x86_64}
-    ;;
-  i486)
-    # This should be i486 for all 32-bit x86 arch:
-    TARGET=${TARGET:-i486}
-    ;;
-esac
-
 # This function fixes a doinst.sh file for x86_64.
 # With thanks to Fred Emmott.
 fix_doinst() {
@@ -86,7 +126,7 @@ fix_doinst() {
   # Fix "( cd lib" occurrences
   sed -i "s#( cd lib\$#( cd lib${LIBDIRSUFFIX}#" install/doinst.sh
 
-  if [ "$ARCH" = "x86_64" ]; then
+  if [ "$SLACKWARE_ARCH" = "x86_64" ]; then
     sed -i 's#ld-linux.so.2#ld-linux-x86-64.so.2#' install/doinst.sh
   fi
 }
@@ -112,6 +152,19 @@ apply_patches() {
   # This reverts a patch that was made to glibc to fix "namespace leakage",
   # which seems to cause some build failures (e.g. with conntrack):
   zcat $CWD/glibc.revert.to.fix.build.breakages.diff.gz | patch -p1 --verbose || exit 1
+  # This partial security patch still applies and might be needed:
+  zcat $CWD/glibc.git-96611391ad8823ba58405325d78cefeae5cdf699-CVE-2010-3847b.patch.gz | patch -p1 --verbose || exit 1
+  # Make it harder for people to trick ldd into running code:
+  zcat $CWD/glibc.ldd.trace.through.dynamic.linker.diff.gz | patch -p1 --verbose || exit 1
+  # Make glibc compile with binutils using --enable-initfini-array.
+  # At this time, we do not recommend this due to probable ABI breakage.
+  # The also patch needs work before it would apply.
+  # ***NOT READY***
+  #zcat $CWD/glibc.git-4a531bb0b3b582cb693de9f76d2d97d970f9a5d5.patch.gz | patch -p1 --verbose || exit 1
+  #
+  # Avoid the Intel optimized asm routines for now because they break
+  # the flash player.  We'll phase this in when it's safer to do so.
+  zcat $CWD/glibc.disable.broken.optimized.memcpy.diff.gz | patch -p1 --verbose || exit 1
   # Update the timezone information.
   ( cd timezone
     tar xzf $CWD/tzdata?????.tar.gz
@@ -128,42 +181,6 @@ apply_patches() {
   )
 }
 
-# I'll break this out as an option for fun  :-)
-case $ARCH  in
-  i386)
-    OPTIMIZ="-O3 -march=i386 -mcpu=i686"
-    LIBDIRSUFFIX=""
-    ;;
-  i486)
-    OPTIMIZ="-O3 -march=i486 -mtune=i686"
-    LIBDIRSUFFIX=""
-    ;;
-  i586)
-    OPTIMIZ="-O3 -march=i586"
-    LIBDIRSUFFIX=""
-    ;;
-  i686)
-    OPTIMIZ="-O3 -march=i686"
-    LIBDIRSUFFIX=""
-    ;;
-  athlon)
-    OPTIMIZ="-O3 -march=athlon"
-    LIBDIRSUFFIX=""
-    ;;
-  s390)
-    OPTIMIZ="-O3"
-    LIBDIRSUFFIX=""
-    ;;
-  x86_64)
-    OPTIMIZ="-O3 -fPIC"
-    LIBDIRSUFFIX="64"
-    ;;
-  *)
-    OPTIMIZ="-O3"
-    LIBDIRSUFFIX=""
-    ;;
-esac
-
 # This is going to be the initial $DESTDIR:
 export PKG=$TMP/package-glibc-incoming-tree
 PGLIBC=$TMP/package-glibc
@@ -232,7 +249,7 @@ fi
 
 # Make build directory:
 mkdir build-glibc-$VERSION
-cd build-glibc-$VERSION
+cd build-glibc-$VERSION || exit 1
 
 echo "BUILDING DAS NPTL GLIBC"
 CFLAGS="-g $OPTIMIZ" \
@@ -373,7 +390,7 @@ mv $PKG/usr/lib${LIBDIRSUFFIX}/lib*_p.a usr/lib${LIBDIRSUFFIX}
 ( cd usr/lib${LIBDIRSUFFIX} ; strip -g *.a )
 mkdir install
 cp -a $CWD/slack-desc.glibc-profile install/slack-desc
-makepkg -l y -c n $TMP/glibc-profile-$VERSION-$ARCH-$BUILD.txz
+makepkg -l y -c n $TMP/glibc-profile-$VERSION-$SLACKWARE_ARCH-$BUILD.txz
 
 # THIS IS NO LONGER PACKAGED (or is it?  might be better to let it be made, and then ship it or not...)
 # glibc-debug:
@@ -383,7 +400,7 @@ mkdir -p usr/lib${LIBDIRSUFFIX}
 mv $PKG/usr/lib${LIBDIRSUFFIX}/debug usr/lib${LIBDIRSUFFIX}
 mkdir install
 cp -a $CWD/slack-desc.glibc-debug install/slack-desc
-makepkg -l y -c n $TMP/glibc-debug-$VERSION-$ARCH-$BUILD.txz
+makepkg -l y -c n $TMP/glibc-debug-$VERSION-$SLACKWARE_ARCH-$BUILD.txz
 ## INSTEAD, NUKE THESE LIBS
 #rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/debug
 
@@ -397,7 +414,7 @@ cp -a $PKG/usr/share/i18n usr/share
 cp -a $PKG/usr/share/locale usr/share
 mkdir install
 cp -a $CWD/slack-desc.glibc-i18n install/slack-desc
-makepkg -l y -c n $TMP/glibc-i18n-$VERSION-$ARCH-$BUILD.txz
+makepkg -l y -c n $TMP/glibc-i18n-$VERSION-$SLACKWARE_ARCH-$BUILD.txz
 
 # glibc-solibs:
 cd $PSOLIBS
@@ -438,7 +455,7 @@ fix_doinst
 # Ditch links:
 find . -type l -exec rm {} \;
 # Build the package:
-makepkg -l y -c n $TMP/glibc-solibs-$VERSION-$ARCH-$BUILD.txz
+makepkg -l y -c n $TMP/glibc-solibs-$VERSION-$SLACKWARE_ARCH-$BUILD.txz
 
 # And finally, the complete "all-in-one" glibc package is created
 # from whatever was leftover:
@@ -460,7 +477,7 @@ fix_doinst
   mv incoming/libSegFault.so .
 )
 # Build the package:
-/sbin/makepkg -l y -c n $TMP/glibc-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/glibc-$VERSION-$SLACKWARE_ARCH-$BUILD.txz
 
 # Done!
 echo
diff --git a/source/l/glibc/glibc.disable.broken.optimized.memcpy.diff b/source/l/glibc/glibc.disable.broken.optimized.memcpy.diff
new file mode 100644
index 00000000..8034f120
--- /dev/null
+++ b/source/l/glibc/glibc.disable.broken.optimized.memcpy.diff
@@ -0,0 +1,30 @@
+--- ./sysdeps/x86_64/multiarch/memcpy.S.orig	2011-01-17 22:34:07.000000000 -0600
++++ ./sysdeps/x86_64/multiarch/memcpy.S	2011-02-08 19:36:26.000000000 -0600
+@@ -32,12 +32,6 @@
+ 	jne	1f
+ 	call	__init_cpu_features
+ 1:	leaq	__memcpy_sse2(%rip), %rax
+-	testl	$bit_SSSE3, __cpu_features+CPUID_OFFSET+index_SSSE3(%rip)
+-	jz	2f
+-	leaq	__memcpy_ssse3(%rip), %rax
+-	testl	$bit_Fast_Copy_Backward, __cpu_features+FEATURE_OFFSET+index_Fast_Copy_Backward(%rip)
+-	jz	2f
+-	leaq	__memcpy_ssse3_back(%rip), %rax
+ 2:	ret
+ END(memcpy)
+ 
+--- ./sysdeps/x86_64/multiarch/mempcpy.S.orig	2011-01-17 22:34:07.000000000 -0600
++++ ./sysdeps/x86_64/multiarch/mempcpy.S	2011-02-08 19:36:37.000000000 -0600
+@@ -31,12 +31,6 @@
+ 	jne	1f
+ 	call	__init_cpu_features
+ 1:	leaq	__mempcpy_sse2(%rip), %rax
+-	testl	$bit_SSSE3, __cpu_features+CPUID_OFFSET+index_SSSE3(%rip)
+-	jz	2f
+-	leaq	__mempcpy_ssse3(%rip), %rax
+-	testl	$bit_Fast_Copy_Backward, __cpu_features+FEATURE_OFFSET+index_Fast_Copy_Backward(%rip)
+-	jz	2f
+-	leaq	__mempcpy_ssse3_back(%rip), %rax
+ 2:	ret
+ END(__mempcpy)
+ 
diff --git a/source/l/glibc/glibc.git-4a531bb0b3b582cb693de9f76d2d97d970f9a5d5.patch b/source/l/glibc/glibc.git-4a531bb0b3b582cb693de9f76d2d97d970f9a5d5.patch
new file mode 100644
index 00000000..9b58674c
--- /dev/null
+++ b/source/l/glibc/glibc.git-4a531bb0b3b582cb693de9f76d2d97d970f9a5d5.patch
@@ -0,0 +1,1212 @@
+From 4a531bb0b3b582cb693de9f76d2d97d970f9a5d5 Mon Sep 17 00:00:00 2001
+From: H.J. Lu <hongjiu.lu@intel.com>
+Date: Fri, 24 Dec 2010 20:14:37 -0500
+Subject: [PATCH] Remove `.ctors' and `.dtors' output sections
+
+---
+ ChangeLog                              |   15 ++
+ config.h.in                            |    3 +
+ configure                              |  334 +++++++++++++++++---------------
+ configure.in                           |    2 +
+ elf/sofini.c                           |    2 +
+ elf/soinit.c                           |    2 +
+ sysdeps/i386/init-first.c              |    2 +
+ sysdeps/mach/hurd/i386/init-first.c    |    2 +-
+ sysdeps/mach/hurd/powerpc/init-first.c |    2 +-
+ sysdeps/sh/init-first.c                |    2 +
+ sysdeps/unix/sysv/linux/init-first.c   |    2 +-
+ 11 files changed, 209 insertions(+), 159 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 958c76a..497de67 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,18 @@
++2010-12-15  H.J. Lu  <hongjiu.lu@intel.com>
++
++	* config.h.in (NO_CTORS_DTORS_SECTIONS): Define.
++	* configure.in: Define NO_CTORS_DTORS_SECTIONS if linker
++	script has SORT_BY_INIT_PRIORITY.
++	* elf/sofini.c: Remove `.ctors' and `.dtors' sections if
++	NO_CTORS_DTORS_SECTIONS is defined.
++	* elf/soinit.c: Likewise.
++	* sysdeps/i386/init-first.c: Don't call __libc_global_ctors if
++	NO_CTORS_DTORS_SECTIONS is defined.
++	* sysdeps/mach/hurd/i386/init-first.c: Likewise.
++	* sysdeps/mach/hurd/powerpc/init-first.c: Likewise.
++	* sysdeps/sh/init-first.c: Likewise.
++	* sysdeps/unix/sysv/linux/init-first.c: Likewise.
++
+ 2010-12-24  Ulrich Drepper  <drepper@gmail.com>
+ 
+ 	* stdio-common/vfprintf.c (vfprintf): If printf handlers are installed
+diff --git a/config.h.in b/config.h.in
+index 18bf01a..9e797eb 100644
+--- a/config.h.in
++++ b/config.h.in
+@@ -201,6 +201,9 @@
+ /* Define if multi-arch DSOs should be generated.  */
+ #undef USE_MULTIARCH
+ 
++/* Define if `.ctors' and `.dtors' sections shouldn't be used.  */
++#undef	NO_CTORS_DTORS_SECTIONS
++
+ /*
+  */
+ 
+diff --git a/configure b/configure
+index eae35ba..823f15e 100755
+--- a/configure
++++ b/configure
+@@ -1,14 +1,14 @@
+ #! /bin/sh
+ # From configure.in CVSid.
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.65 for GNU C Library (see version.h).
++# Generated by GNU Autoconf 2.66 for GNU C Library (see version.h).
+ #
+ # Report bugs to <glibc>.
+ #
+ #
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
++# Foundation, Inc.
+ #
+ #
+ # This configure script is free software; the Free Software Foundation
+@@ -319,7 +319,7 @@ $as_echo X"$as_dir" |
+       test -d "$as_dir" && break
+     done
+     test -z "$as_dirs" || eval "mkdir $as_dirs"
+-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
++  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+ 
+ 
+ } # as_fn_mkdir_p
+@@ -359,19 +359,19 @@ else
+ fi # as_fn_arith
+ 
+ 
+-# as_fn_error ERROR [LINENO LOG_FD]
+-# ---------------------------------
++# as_fn_error STATUS ERROR [LINENO LOG_FD]
++# ----------------------------------------
+ # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+ # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+-# script with status $?, using 1 if that was 0.
++# script with STATUS, using 1 if that was 0.
+ as_fn_error ()
+ {
+-  as_status=$?; test $as_status -eq 0 && as_status=1
+-  if test "$3"; then
+-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
++  as_status=$1; test $as_status -eq 0 && as_status=1
++  if test "$4"; then
++    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+   fi
+-  $as_echo "$as_me: error: $1" >&2
++  $as_echo "$as_me: error: $2" >&2
+   as_fn_exit $as_status
+ } # as_fn_error
+ 
+@@ -533,7 +533,7 @@ test -n "$DJDIR" || exec 7<&0 </dev/null
+ exec 6>&1
+ 
+ # Name of the host.
+-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
++# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+ # so uname gets run too.
+ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+ 
+@@ -907,7 +907,7 @@ do
+     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+-      as_fn_error "invalid feature name: $ac_useropt"
++      as_fn_error $? "invalid feature name: $ac_useropt"
+     ac_useropt_orig=$ac_useropt
+     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     case $ac_user_opts in
+@@ -933,7 +933,7 @@ do
+     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+-      as_fn_error "invalid feature name: $ac_useropt"
++      as_fn_error $? "invalid feature name: $ac_useropt"
+     ac_useropt_orig=$ac_useropt
+     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     case $ac_user_opts in
+@@ -1137,7 +1137,7 @@ do
+     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+-      as_fn_error "invalid package name: $ac_useropt"
++      as_fn_error $? "invalid package name: $ac_useropt"
+     ac_useropt_orig=$ac_useropt
+     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     case $ac_user_opts in
+@@ -1153,7 +1153,7 @@ do
+     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+-      as_fn_error "invalid package name: $ac_useropt"
++      as_fn_error $? "invalid package name: $ac_useropt"
+     ac_useropt_orig=$ac_useropt
+     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     case $ac_user_opts in
+@@ -1183,8 +1183,8 @@ do
+   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+     x_libraries=$ac_optarg ;;
+ 
+-  -*) as_fn_error "unrecognized option: \`$ac_option'
+-Try \`$0 --help' for more information."
++  -*) as_fn_error $? "unrecognized option: \`$ac_option'
++Try \`$0 --help' for more information"
+     ;;
+ 
+   *=*)
+@@ -1192,7 +1192,7 @@ Try \`$0 --help' for more information."
+     # Reject names that are not valid shell variable names.
+     case $ac_envvar in #(
+       '' | [0-9]* | *[!_$as_cr_alnum]* )
+-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
++      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+     esac
+     eval $ac_envvar=\$ac_optarg
+     export $ac_envvar ;;
+@@ -1210,13 +1210,13 @@ done
+ 
+ if test -n "$ac_prev"; then
+   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+-  as_fn_error "missing argument to $ac_option"
++  as_fn_error $? "missing argument to $ac_option"
+ fi
+ 
+ if test -n "$ac_unrecognized_opts"; then
+   case $enable_option_checking in
+     no) ;;
+-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
++    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+   esac
+ fi
+@@ -1239,7 +1239,7 @@ do
+     [\\/$]* | ?:[\\/]* )  continue;;
+     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+   esac
+-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
++  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+ done
+ 
+ # There might be people who depend on the old broken behavior: `$host'
+@@ -1253,8 +1253,8 @@ target=$target_alias
+ if test "x$host_alias" != x; then
+   if test "x$build_alias" = x; then
+     cross_compiling=maybe
+-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+-    If a cross compiler is detected then cross compile mode will be used." >&2
++    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
++    If a cross compiler is detected then cross compile mode will be used" >&2
+   elif test "x$build_alias" != "x$host_alias"; then
+     cross_compiling=yes
+   fi
+@@ -1269,9 +1269,9 @@ test "$silent" = yes && exec 6>/dev/null
+ ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ ac_ls_di=`ls -di .` &&
+ ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+-  as_fn_error "working directory cannot be determined"
++  as_fn_error $? "working directory cannot be determined"
+ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+-  as_fn_error "pwd does not report name of working directory"
++  as_fn_error $? "pwd does not report name of working directory"
+ 
+ 
+ # Find the source files, if location was not specified.
+@@ -1310,11 +1310,11 @@ else
+ fi
+ if test ! -r "$srcdir/$ac_unique_file"; then
+   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
++  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+ fi
+ ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ ac_abs_confdir=`(
+-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
++	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+ 	pwd)`
+ # When building in place, set srcdir=.
+ if test "$ac_abs_confdir" = "$ac_pwd"; then
+@@ -1354,7 +1354,7 @@ Configuration:
+       --help=short        display options specific to this package
+       --help=recursive    display the short help of all the included packages
+   -V, --version           display version information and exit
+-  -q, --quiet, --silent   do not print \`checking...' messages
++  -q, --quiet, --silent   do not print \`checking ...' messages
+       --cache-file=FILE   cache test results in FILE [disabled]
+   -C, --config-cache      alias for \`--cache-file=config.cache'
+   -n, --no-create         do not create output files
+@@ -1544,9 +1544,9 @@ test -n "$ac_init_help" && exit $ac_status
+ if $ac_init_version; then
+   cat <<\_ACEOF
+ GNU C Library configure (see version.h)
+-generated by GNU Autoconf 2.65
++generated by GNU Autoconf 2.66
+ 
+-Copyright (C) 2009 Free Software Foundation, Inc.
++Copyright (C) 2010 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+@@ -1945,7 +1945,7 @@ ac_fn_c_check_header_compile ()
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${$3+set}\"" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -1971,7 +1971,7 @@ This file contains any messages produced by compilers while
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by GNU C Library $as_me (see version.h), which was
+-generated by GNU Autoconf 2.65.  Invocation command line was
++generated by GNU Autoconf 2.66.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -2081,11 +2081,9 @@ trap 'exit_status=$?
+   {
+     echo
+ 
+-    cat <<\_ASBOX
+-## ---------------- ##
++    $as_echo "## ---------------- ##
+ ## Cache variables. ##
+-## ---------------- ##
+-_ASBOX
++## ---------------- ##"
+     echo
+     # The following way of writing the cache mishandles newlines in values,
+ (
+@@ -2119,11 +2117,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ )
+     echo
+ 
+-    cat <<\_ASBOX
+-## ----------------- ##
++    $as_echo "## ----------------- ##
+ ## Output variables. ##
+-## ----------------- ##
+-_ASBOX
++## ----------------- ##"
+     echo
+     for ac_var in $ac_subst_vars
+     do
+@@ -2136,11 +2132,9 @@ _ASBOX
+     echo
+ 
+     if test -n "$ac_subst_files"; then
+-      cat <<\_ASBOX
+-## ------------------- ##
++      $as_echo "## ------------------- ##
+ ## File substitutions. ##
+-## ------------------- ##
+-_ASBOX
++## ------------------- ##"
+       echo
+       for ac_var in $ac_subst_files
+       do
+@@ -2154,11 +2148,9 @@ _ASBOX
+     fi
+ 
+     if test -s confdefs.h; then
+-      cat <<\_ASBOX
+-## ----------- ##
++      $as_echo "## ----------- ##
+ ## confdefs.h. ##
+-## ----------- ##
+-_ASBOX
++## ----------- ##"
+       echo
+       cat confdefs.h
+       echo
+@@ -2213,7 +2205,12 @@ _ACEOF
+ ac_site_file1=NONE
+ ac_site_file2=NONE
+ if test -n "$CONFIG_SITE"; then
+-  ac_site_file1=$CONFIG_SITE
++  # We do not want a PATH search for config.site.
++  case $CONFIG_SITE in #((
++    -*)  ac_site_file1=./$CONFIG_SITE;;
++    */*) ac_site_file1=$CONFIG_SITE;;
++    *)   ac_site_file1=./$CONFIG_SITE;;
++  esac
+ elif test "x$prefix" != xNONE; then
+   ac_site_file1=$prefix/share/config.site
+   ac_site_file2=$prefix/etc/config.site
+@@ -2228,7 +2225,11 @@ do
+     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
+     sed 's/^/| /' "$ac_site_file" >&5
+-    . "$ac_site_file"
++    . "$ac_site_file" \
++      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "failed to load site script $ac_site_file
++See \`config.log' for more details" "$LINENO" 5; }
+   fi
+ done
+ 
+@@ -2304,7 +2305,7 @@ if $ac_cache_corrupted; then
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+   { $as_echo "$as_me:${as_lineno-$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_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
++  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+ fi
+ ## -------------------- ##
+ ## Main body of script. ##
+@@ -2322,16 +2323,22 @@ ac_config_headers="$ac_config_headers config.h"
+ 
+ ac_aux_dir=
+ for ac_dir in scripts "$srcdir"/scripts; do
+-  for ac_t in install-sh install.sh shtool; do
+-    if test -f "$ac_dir/$ac_t"; then
+-      ac_aux_dir=$ac_dir
+-      ac_install_sh="$ac_aux_dir/$ac_t -c"
+-      break 2
+-    fi
+-  done
++  if test -f "$ac_dir/install-sh"; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/install-sh -c"
++    break
++  elif test -f "$ac_dir/install.sh"; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/install.sh -c"
++    break
++  elif test -f "$ac_dir/shtool"; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/shtool install -c"
++    break
++  fi
+ done
+ if test -z "$ac_aux_dir"; then
+-  as_fn_error "cannot find install-sh, install.sh, or shtool in scripts \"$srcdir\"/scripts" "$LINENO" 5
++  as_fn_error $? "cannot find install-sh, install.sh, or shtool in scripts \"$srcdir\"/scripts" "$LINENO" 5
+ fi
+ 
+ # These three variables are undocumented and unsupported,
+@@ -2351,7 +2358,7 @@ subdirs="$subdirs "
+ 
+ # Make sure we can run config.sub.
+ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+-  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
++  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+ $as_echo_n "checking build system type... " >&6; }
+@@ -2362,16 +2369,16 @@ else
+ test "x$ac_build_alias" = x &&
+   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+ test "x$ac_build_alias" = x &&
+-  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
++  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+-  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
++  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+ 
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+ $as_echo "$ac_cv_build" >&6; }
+ case $ac_cv_build in
+ *-*-*) ;;
+-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
++*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+ esac
+ build=$ac_cv_build
+ ac_save_IFS=$IFS; IFS='-'
+@@ -2396,7 +2403,7 @@ else
+   ac_cv_host=$ac_cv_build
+ else
+   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+-    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
++    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+ fi
+ 
+ fi
+@@ -2404,7 +2411,7 @@ fi
+ $as_echo "$ac_cv_host" >&6; }
+ case $ac_cv_host in
+ *-*-*) ;;
+-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
++*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+ esac
+ host=$ac_cv_host
+ ac_save_IFS=$IFS; IFS='-'
+@@ -2721,8 +2728,8 @@ fi
+ 
+ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "no acceptable C compiler found in \$PATH
++See \`config.log' for more details" "$LINENO" 5; }
+ 
+ # Provide some information about the compiler.
+ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+@@ -2792,8 +2799,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot compute suffix of object files: cannot compile
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "cannot compute suffix of object files: cannot compile
++See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+@@ -3185,8 +3192,8 @@ if $ac_preproc_ok; then :
+ else
+   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ 
+ ac_ext=c
+@@ -3455,7 +3462,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+ if test "`cd $srcdir; /bin/pwd`" = "`/bin/pwd`"; then
+-  as_fn_error "you must configure in a separate build directory" "$LINENO" 5
++  as_fn_error $? "you must configure in a separate build directory" "$LINENO" 5
+ fi
+ 
+ # This will get text that should go into config.make.
+@@ -3767,7 +3774,7 @@ fi
+ if test x$nss_crypt = xyes; then
+   nss_includes=-I$(nss-config --includedir 2>/dev/null)
+   if test $? -ne 0; then
+-    as_fn_error "cannot find include directory with nss-config" "$LINENO" 5
++    as_fn_error $? "cannot find include directory with nss-config" "$LINENO" 5
+   fi
+   old_CFLAGS="$CFLAGS"
+   CFLAGS="$CFLAGS $nss_includes"
+@@ -3782,7 +3789,7 @@ _ACEOF
+ if ac_fn_c_try_compile "$LINENO"; then :
+   libc_cv_nss_crypt=yes
+ else
+-  as_fn_error "
++  as_fn_error $? "
+ cannot find NSS headers with lowlevel hash function interfaces" "$LINENO" 5
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+@@ -3804,7 +3811,7 @@ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+   libc_cv_nss_crypt=yes
+ else
+-  as_fn_error "
++  as_fn_error $? "
+ cannot link program using lowlevel NSS hash functions" "$LINENO" 5
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+@@ -3880,7 +3887,7 @@ submachine=
+ # Check whether --with-cpu was given.
+ if test "${with_cpu+set}" = set; then :
+   withval=$with_cpu;   case "$withval" in
+-  yes|'') as_fn_error "--with-cpu requires an argument" "$LINENO" 5 ;;
++  yes|'') as_fn_error $? "--with-cpu requires an argument" "$LINENO" 5 ;;
+   no) ;;
+   *) submachine="$withval" ;;
+   esac
+@@ -3913,14 +3920,14 @@ if test x"$add_ons" != x; then
+     # Some sanity checks
+     case "$f" in
+     crypt)
+-      as_fn_error "
++      as_fn_error $? "
+ *** It seems that you're using an old \`crypt' add-on.  crypt is now
+ *** part of glibc and using the old add-on will not work with this
+ *** release.  Start again with fresh sources and without the old
+ *** \`crypt' add-on." "$LINENO" 5
+     ;;
+     localedata)
+-      as_fn_error "
++      as_fn_error $? "
+ *** It seems that you're using an old \`localedata' add-on.  localedata
+ *** is now part of glibc and using the old add-on will not work with
+ *** this release.  Start again with fresh sources and without the old
+@@ -3947,7 +3954,7 @@ if test x"$add_ons" != x; then
+         if test -d "$libc_add_on"; then
+ 	  libc_add_on="`pwd`/$libc_add_on"
+ 	else
+-	  as_fn_error "add-on directory \"$libc_add_on\" does not exist" "$LINENO" 5
++	  as_fn_error $? "add-on directory \"$libc_add_on\" does not exist" "$LINENO" 5
+ 	fi
+       }
+       libc_add_on_srcdir=$srcdir/$libc_add_on
+@@ -3966,7 +3973,7 @@ $as_echo "$as_me: running configure fragment for add-on $libc_add_on" >&6;}
+       test -z "$libc_add_on" || {
+         configured_add_ons="$configured_add_ons $libc_add_on"
+ 	if test "x$libc_add_on_canonical" = xunknown; then
+-	  as_fn_error "fragment must set \$libc_add_on_canonical" "$LINENO" 5
++	  as_fn_error $? "fragment must set \$libc_add_on_canonical" "$LINENO" 5
+ 	fi
+ 	for d in $libc_add_on_subdirs; do
+ 	  case "$libc_add_on" in
+@@ -3991,13 +3998,13 @@ $d-srcdir = $subdir_srcdir"
+ 	done
+ 	for d in $libc_add_on_config_subdirs; do
+ 	  case "$d" in
+-	  /*) as_fn_error "fragment uses absolute path in \$libc_add_on_config_subdirs" "$LINENO" 5 ;;
++	  /*) as_fn_error $? "fragment uses absolute path in \$libc_add_on_config_subdirs" "$LINENO" 5 ;;
+ 	  esac
+ 	  if test ! -d "$libc_add_on_srcdir/$d"; then
+-	    as_fn_error "fragment wants to configure missing directory $d" "$LINENO" 5
++	    as_fn_error $? "fragment wants to configure missing directory $d" "$LINENO" 5
+ 	  fi
+ 	  case "$libc_add_on" in
+-	  /*) as_fn_error "relative path required for add-on using \$libc_add_on_config_subdirs" "$LINENO" 5 ;;
++	  /*) as_fn_error $? "relative path required for add-on using \$libc_add_on_config_subdirs" "$LINENO" 5 ;;
+ 	  esac
+ 	  subdirs="$subdirs $libc_add_on/$d"
+ 	done
+@@ -4174,7 +4181,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_asm_global_directive" >&5
+ $as_echo "$libc_cv_asm_global_directive" >&6; }
+ if test $libc_cv_asm_global_directive = UNKNOWN; then
+-  as_fn_error "cannot determine asm global directive" "$LINENO" 5
++  as_fn_error $? "cannot determine asm global directive" "$LINENO" 5
+ else
+   cat >>confdefs.h <<_ACEOF
+ #define ASM_GLOBAL_DIRECTIVE ${libc_cv_asm_global_directive}
+@@ -4220,7 +4227,7 @@ fi
+ 
+ if test x"$libc_cv_asm_gnu_indirect_function" != xyes -a x"$libc_cv_asm_type_prefix" = xno; then
+   if test x"$multi_arch" = xyes; then
+-    as_fn_error "--enable-multi-arch support requires assembler and linker support" "$LINENO" 5
++    as_fn_error $? "--enable-multi-arch support requires assembler and linker support" "$LINENO" 5
+   else
+     multi_arch=no
+   fi
+@@ -4359,13 +4366,13 @@ fi
+ 
+ 
+ if test -z "$os_used" && test "$os" != none; then
+-  as_fn_error "Operating system $os is not supported." "$LINENO" 5
++  as_fn_error $? "Operating system $os is not supported." "$LINENO" 5
+ fi
+ if test -z "$machine_used" && test "$machine" != none; then
+-  as_fn_error "The $machine is not supported." "$LINENO" 5
++  as_fn_error $? "The $machine is not supported." "$LINENO" 5
+ fi
+ if test -z "$submachine_used" && test -n "$submachine"; then
+-  as_fn_error "The $submachine subspecies of $host_cpu is not supported." "$LINENO" 5
++  as_fn_error $? "The $submachine subspecies of $host_cpu is not supported." "$LINENO" 5
+ fi
+ 
+ 
+@@ -4492,7 +4499,7 @@ for add_on in $add_ons; do
+     case "$configured_add_ons " in
+     *" $add_on "*) ;;
+     *|'')
+-      as_fn_error "add-on $add_on has no configure fragment or sysdeps tree" "$LINENO" 5
++      as_fn_error $? "add-on $add_on has no configure fragment or sysdeps tree" "$LINENO" 5
+       ;;
+     esac
+     continue
+@@ -4978,7 +4985,7 @@ fi
+ 
+ 
+ if test "$PWD_P" = no; then
+-  as_fn_error "*** A pwd binary could not be found." "$LINENO" 5
++  as_fn_error $? "*** A pwd binary could not be found." "$LINENO" 5
+ fi
+ 
+ # These programs are version sensitive.
+@@ -5367,7 +5374,7 @@ if test "x$with_cvs" = xyes && test "x$AUTOCONF" = xno; then
+   aux_missing="$aux_missing autoconf"
+ fi
+ 
+-test -n "$critic_missing" && as_fn_error "
++test -n "$critic_missing" && as_fn_error $? "
+ *** These critical programs are missing or too old:$critic_missing
+ *** Check the INSTALL file for required versions." "$LINENO" 5
+ 
+@@ -5450,7 +5457,7 @@ esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_library_path_setting" >&5
+ $as_echo "$ld_library_path_setting" >&6; }
+ if test "$ld_library_path_setting" != "ok"; then
+-as_fn_error "
++as_fn_error $? "
+ *** LD_LIBRARY_PATH shouldn't contain the current directory when
+ *** building glibc. Please change the environment variable
+ *** and run configure again." "$LINENO" 5
+@@ -6053,7 +6060,7 @@ EOF
+   test $ac_status = 0; }; }; then
+     libc_cv_asm_protected_directive=yes
+   else
+-    as_fn_error "assembler support for symbol visibility is required" "$LINENO" 5
++    as_fn_error $? "assembler support for symbol visibility is required" "$LINENO" 5
+   fi
+   rm -f conftest*
+ fi
+@@ -6089,7 +6096,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_visibility_attribute" >&5
+ $as_echo "$libc_cv_visibility_attribute" >&6; }
+     if test $libc_cv_visibility_attribute != yes; then
+-      as_fn_error "compiler support for visibility attribute is required" "$LINENO" 5
++      as_fn_error $? "compiler support for visibility attribute is required" "$LINENO" 5
+     fi
+   fi
+ 
+@@ -6121,7 +6128,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_broken_visibility_attribute" >&5
+ $as_echo "$libc_cv_broken_visibility_attribute" >&6; }
+     if test $libc_cv_broken_visibility_attribute = yes; then
+-      as_fn_error "working compiler support for visibility attribute is required" "$LINENO" 5
++      as_fn_error $? "working compiler support for visibility attribute is required" "$LINENO" 5
+     fi
+   fi
+ 
+@@ -6156,7 +6163,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_broken_alias_attribute" >&5
+ $as_echo "$libc_cv_broken_alias_attribute" >&6; }
+   if test $libc_cv_broken_alias_attribute = yes; then
+-    as_fn_error "working alias attribute support required" "$LINENO" 5
++    as_fn_error $? "working alias attribute support required" "$LINENO" 5
+   fi
+ 
+   if test $libc_cv_visibility_attribute = yes; then
+@@ -6214,7 +6221,15 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_initfini_array" >&5
+ $as_echo "$libc_cv_initfini_array" >&6; }
+   if test $libc_cv_initfini_array != yes; then
+-    as_fn_error "Need linker with .init_array/.fini_array support." "$LINENO" 5
++    as_fn_error $? "Need linker with .init_array/.fini_array support." "$LINENO" 5
++  elif { ac_try='${CC-cc} -Wl,--verbose 2>&1|grep SORT_BY_INIT_PRIORITY 1>&5'
++  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; }; then
++    $as_echo "#define NO_CTORS_DTORS_SECTIONS 1" >>confdefs.h
++
+   fi
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libunwind-support in compiler" >&5
+@@ -6262,7 +6277,7 @@ EOF
+   then
+     libc_cv_z_nodelete=yes
+   else
+-    as_fn_error "linker with -z nodelete support required" "$LINENO" 5
++    as_fn_error $? "linker with -z nodelete support required" "$LINENO" 5
+   fi
+   rm -f conftest*
+ fi
+@@ -6289,7 +6304,7 @@ EOF
+   then
+     libc_cv_z_nodlopen=yes
+   else
+-    as_fn_error "linker with -z nodlopen support required" "$LINENO" 5
++    as_fn_error $? "linker with -z nodlopen support required" "$LINENO" 5
+   fi
+   rm -f conftest*
+ fi
+@@ -6316,7 +6331,7 @@ EOF
+   then
+     libc_cv_z_initfirst=yes
+   else
+-    as_fn_error "linker with -z initfirst support required" "$LINENO" 5
++    as_fn_error $? "linker with -z initfirst support required" "$LINENO" 5
+   fi
+   rm -f conftest*
+ fi
+@@ -6352,7 +6367,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_z_relro" >&5
+ $as_echo "$libc_cv_z_relro" >&6; }
+       if test "$libc_cv_z_relro" = no; then
+-        as_fn_error "linker with -z relro support required" "$LINENO" 5
++        as_fn_error $? "linker with -z relro support required" "$LINENO" 5
+       fi
+       ;;
+     *) ;;
+@@ -7202,7 +7217,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_cc_submachine" >&5
+ $as_echo "$libc_cv_cc_submachine" >&6; }
+   if test "x$libc_cv_cc_submachine" = xno; then
+-    as_fn_error "${CC-cc} does not support $submachine" "$LINENO" 5
++    as_fn_error $? "${CC-cc} does not support $submachine" "$LINENO" 5
+   fi
+ fi
+ 
+@@ -7322,7 +7337,7 @@ $as_echo "$have_selinux" >&6; }
+ 
+   if test x$with_selinux = xyes ; then
+     if test x$have_selinux = xno ; then
+-      as_fn_error "SELinux explicitly required, but sufficiently recent SELinux library not found" "$LINENO" 5
++      as_fn_error $? "SELinux explicitly required, but sufficiently recent SELinux library not found" "$LINENO" 5
+     fi
+   fi
+ fi
+@@ -7486,7 +7501,7 @@ esac
+   done
+ IFS=$as_save_IFS
+   if test -z "$ac_cv_path_GREP"; then
+-    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+   fi
+ else
+   ac_cv_path_GREP=$GREP
+@@ -7552,7 +7567,7 @@ esac
+   done
+ IFS=$as_save_IFS
+   if test -z "$ac_cv_path_EGREP"; then
+-    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+   fi
+ else
+   ac_cv_path_EGREP=$EGREP
+@@ -7684,8 +7699,7 @@ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+ "
+-eval as_val=\$$as_ac_Header
+-   if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -7710,9 +7724,8 @@ else
+   if test "$ac_cv_type_long_double" = yes; then
+      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ as_fn_set_status 77
+-as_fn_error "cannot compute sizeof (long double)
+-See \`config.log' for more details." "$LINENO" 5; }; }
++as_fn_error 77 "cannot compute sizeof (long double)
++See \`config.log' for more details" "$LINENO" 5; }
+    else
+      ac_cv_sizeof_long_double=0
+    fi
+@@ -7943,6 +7956,7 @@ DEFS=-DHAVE_CONFIG_H
+ 
+ ac_libobjs=
+ ac_ltlibobjs=
++U=
+ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+   # 1. Remove the extension, and $U if already installed.
+   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+@@ -8104,19 +8118,19 @@ export LANGUAGE
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+ 
+-# as_fn_error ERROR [LINENO LOG_FD]
+-# ---------------------------------
++# as_fn_error STATUS ERROR [LINENO LOG_FD]
++# ----------------------------------------
+ # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+ # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+-# script with status $?, using 1 if that was 0.
++# script with STATUS, using 1 if that was 0.
+ as_fn_error ()
+ {
+-  as_status=$?; test $as_status -eq 0 && as_status=1
+-  if test "$3"; then
+-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
++  as_status=$1; test $as_status -eq 0 && as_status=1
++  if test "$4"; then
++    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+   fi
+-  $as_echo "$as_me: error: $1" >&2
++  $as_echo "$as_me: error: $2" >&2
+   as_fn_exit $as_status
+ } # as_fn_error
+ 
+@@ -8312,7 +8326,7 @@ $as_echo X"$as_dir" |
+       test -d "$as_dir" && break
+     done
+     test -z "$as_dirs" || eval "mkdir $as_dirs"
+-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
++  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+ 
+ 
+ } # as_fn_mkdir_p
+@@ -8366,7 +8380,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ # values after options handling.
+ ac_log="
+ This file was extended by GNU C Library $as_me (see version.h), which was
+-generated by GNU Autoconf 2.65.  Invocation command line was
++generated by GNU Autoconf 2.66.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+@@ -8434,10 +8448,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ ac_cs_version="\\
+ GNU C Library config.status (see version.h)
+-configured by $0, generated by GNU Autoconf 2.65,
++configured by $0, generated by GNU Autoconf 2.66,
+   with options \\"\$ac_cs_config\\"
+ 
+-Copyright (C) 2009 Free Software Foundation, Inc.
++Copyright (C) 2010 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it."
+ 
+@@ -8492,7 +8506,7 @@ do
+     ac_need_defaults=false;;
+   --he | --h)
+     # Conflict between --help and --header
+-    as_fn_error "ambiguous option: \`$1'
++    as_fn_error $? "ambiguous option: \`$1'
+ Try \`$0 --help' for more information.";;
+   --help | --hel | -h )
+     $as_echo "$ac_cs_usage"; exit ;;
+@@ -8501,7 +8515,7 @@ Try \`$0 --help' for more information.";;
+     ac_cs_silent=: ;;
+ 
+   # This is an error.
+-  -*) as_fn_error "unrecognized option: \`$1'
++  -*) as_fn_error $? "unrecognized option: \`$1'
+ Try \`$0 --help' for more information." ;;
+ 
+   *) as_fn_append ac_config_targets " $1"
+@@ -8560,7 +8574,7 @@ do
+     "${config_makefile}") CONFIG_FILES="$CONFIG_FILES ${config_makefile}" ;;
+     "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
+ 
+-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
++  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+   esac
+ done
+ 
+@@ -8598,7 +8612,7 @@ $debug ||
+ {
+   tmp=./conf$$-$RANDOM
+   (umask 077 && mkdir "$tmp")
+-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
++} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ 
+ # Set up the scripts for CONFIG_FILES section.
+ # No need to generate them if there are no CONFIG_FILES.
+@@ -8615,7 +8629,7 @@ if test "x$ac_cr" = x; then
+ fi
+ ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+ if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+-  ac_cs_awk_cr='\r'
++  ac_cs_awk_cr='\\r'
+ else
+   ac_cs_awk_cr=$ac_cr
+ fi
+@@ -8629,18 +8643,18 @@ _ACEOF
+   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+   echo "_ACEOF"
+ } >conf$$subs.sh ||
+-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
++  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
++ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+   . ./conf$$subs.sh ||
+-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
++    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ 
+   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_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
++    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+   else
+     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+   fi
+@@ -8729,20 +8743,28 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+ else
+   cat
+ fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
++  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+ _ACEOF
+ 
+-# VPATH may cause trouble with some makes, so we remove $(srcdir),
+-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
++# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
++# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+ # trailing colons and then remove the whole line if VPATH becomes empty
+ # (actually we leave an empty line to preserve line numbers).
+ if test "x$srcdir" = x.; then
+-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+-s/:*\$(srcdir):*/:/
+-s/:*\${srcdir}:*/:/
+-s/:*@srcdir@:*/:/
+-s/^\([^=]*=[	 ]*\):*/\1/
++  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
++h
++s///
++s/^/:/
++s/[	 ]*$/:/
++s/:\$(srcdir):/:/g
++s/:\${srcdir}:/:/g
++s/:@srcdir@:/:/g
++s/^:*//
+ s/:*$//
++x
++s/\(=[	 ]*\).*/\1/
++G
++s/\n//
+ s/^[^=]*=[	 ]*$//
+ }'
+ fi
+@@ -8770,7 +8792,7 @@ for ac_last_try in false false :; do
+   if test -z "$ac_t"; then
+     break
+   elif $ac_last_try; then
+-    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
++    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+   else
+     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+   fi
+@@ -8855,7 +8877,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ _ACAWK
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+-  as_fn_error "could not setup config headers machinery" "$LINENO" 5
++  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+ fi # test -n "$CONFIG_HEADERS"
+ 
+ 
+@@ -8868,7 +8890,7 @@ do
+   esac
+   case $ac_mode$ac_tag in
+   :[FHL]*:*);;
+-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
++  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+   :[FH]-) ac_tag=-:-;;
+   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+   esac
+@@ -8896,7 +8918,7 @@ do
+ 	   [\\/$]*) false;;
+ 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+ 	   esac ||
+-	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
++	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+       esac
+       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+       as_fn_append ac_file_inputs " '$ac_f'"
+@@ -8923,7 +8945,7 @@ $as_echo "$as_me: creating $ac_file" >&6;}
+ 
+     case $ac_tag in
+     *:-:* | *:-) cat >"$tmp/stdin" \
+-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
++      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+     esac
+     ;;
+   esac
+@@ -9054,22 +9076,22 @@ s&@INSTALL@&$ac_INSTALL&;t t
+ $ac_datarootdir_hack
+ "
+ eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+-  || as_fn_error "could not create $ac_file" "$LINENO" 5
++  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ 
+ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+-which seems to be undefined.  Please make sure it is defined." >&5
++which seems to be undefined.  Please make sure it is defined" >&5
+ $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+-which seems to be undefined.  Please make sure it is defined." >&2;}
++which seems to be undefined.  Please make sure it is defined" >&2;}
+ 
+   rm -f "$tmp/stdin"
+   case $ac_file in
+   -) cat "$tmp/out" && rm -f "$tmp/out";;
+   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+   esac \
+-  || as_fn_error "could not create $ac_file" "$LINENO" 5
++  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+  ;;
+   :H)
+   #
+@@ -9080,19 +9102,19 @@ which seems to be undefined.  Please make sure it is defined." >&2;}
+       $as_echo "/* $configure_input  */" \
+       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+     } >"$tmp/config.h" \
+-      || as_fn_error "could not create $ac_file" "$LINENO" 5
++      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+     if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+ $as_echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       rm -f "$ac_file"
+       mv "$tmp/config.h" "$ac_file" \
+-	|| as_fn_error "could not create $ac_file" "$LINENO" 5
++	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
+     fi
+   else
+     $as_echo "/* $configure_input  */" \
+       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+-      || as_fn_error "could not create -" "$LINENO" 5
++      || as_fn_error $? "could not create -" "$LINENO" 5
+   fi
+  ;;
+ 
+@@ -9118,7 +9140,7 @@ _ACEOF
+ ac_clean_files=$ac_clean_files_save
+ 
+ test $ac_write_fail = 0 ||
+-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
++  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+ 
+ 
+ # configure is writing to config.log, and then calls config.status.
+@@ -9139,7 +9161,7 @@ if test "$no_create" != yes; then
+   exec 5>>config.log
+   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+   # would make configure fail if this is the last instruction.
+-  $ac_cs_success || as_fn_exit $?
++  $ac_cs_success || as_fn_exit 1
+ fi
+ 
+ #
+@@ -9280,7 +9302,7 @@ $as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cach
+       # The eval makes quoting arguments work.
+       eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
+ 	   --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
+-	as_fn_error "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
++	as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
+     fi
+ 
+     cd "$ac_popdir"
+diff --git a/configure.in b/configure.in
+index d8cd5f1..ad25b9b 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1497,6 +1497,8 @@ EOF
+   rm -f conftest*])
+   if test $libc_cv_initfini_array != yes; then
+     AC_MSG_ERROR([Need linker with .init_array/.fini_array support.])
++  elif AC_TRY_COMMAND([${CC-cc} -Wl,--verbose 2>&1|grep SORT_BY_INIT_PRIORITY 1>&AS_MESSAGE_LOG_FD]); then
++    AC_DEFINE(NO_CTORS_DTORS_SECTIONS)
+   fi
+ 
+   AC_CACHE_CHECK(for libunwind-support in compiler,
+diff --git a/elf/sofini.c b/elf/sofini.c
+index 5e06f0c..13e74b7 100644
+--- a/elf/sofini.c
++++ b/elf/sofini.c
+@@ -1,12 +1,14 @@
+ /* Finalizer module for ELF shared C library.  This provides terminating
+    null pointer words in the `.ctors' and `.dtors' sections.  */
+ 
++#ifndef NO_CTORS_DTORS_SECTIONS
+ static void (*const __CTOR_END__[1]) (void)
+      __attribute__ ((used, section (".ctors")))
+      = { 0 };
+ static void (*const __DTOR_END__[1]) (void)
+      __attribute__ ((used, section (".dtors")))
+      = { 0 };
++#endif
+ 
+ /* Terminate the frame unwind info section with a 4byte 0 as a sentinel;
+    this would be the 'length' field in a real FDE.  */
+diff --git a/elf/soinit.c b/elf/soinit.c
+index 6fecbb5..1db676a 100644
+--- a/elf/soinit.c
++++ b/elf/soinit.c
+@@ -3,6 +3,7 @@
+    the `.ctors' and `.dtors' sections so the lists are terminated, and
+    calling those lists of functions.  */
+ 
++#ifndef NO_CTORS_DTORS_SECTIONS
+ #include <libc-internal.h>
+ #include <stdlib.h>
+ 
+@@ -40,3 +41,4 @@ __libc_fini (void)
+ 
+ void (*_fini_ptr) (void) __attribute__ ((section (".fini_array")))
+      = &__libc_fini;
++#endif
+diff --git a/sysdeps/i386/init-first.c b/sysdeps/i386/init-first.c
+index c6355a8..2af042f 100644
+--- a/sysdeps/i386/init-first.c
++++ b/sysdeps/i386/init-first.c
+@@ -59,7 +59,9 @@ _init (int argc, ...)
+ {
+   init (&argc);
+ 
++#ifndef NO_CTORS_DTORS_SECTIONS
+   __libc_global_ctors ();
++#endif
+ }
+ #endif
+ 
+diff --git a/sysdeps/mach/hurd/i386/init-first.c b/sysdeps/mach/hurd/i386/init-first.c
+index f9a7a58..60823bd 100644
+--- a/sysdeps/mach/hurd/i386/init-first.c
++++ b/sysdeps/mach/hurd/i386/init-first.c
+@@ -92,7 +92,7 @@ posixland_init (int argc, char **argv, char **envp)
+   __getopt_clean_environment (envp);
+ #endif
+ 
+-#ifdef SHARED
++#if defined SHARED && !defined NO_CTORS_DTORS_SECTIONS
+   __libc_global_ctors ();
+ #endif
+ }
+diff --git a/sysdeps/mach/hurd/powerpc/init-first.c b/sysdeps/mach/hurd/powerpc/init-first.c
+index 20fa1d4..21b5054 100644
+--- a/sysdeps/mach/hurd/powerpc/init-first.c
++++ b/sysdeps/mach/hurd/powerpc/init-first.c
+@@ -82,7 +82,7 @@ posixland_init (int argc, char **argv, char **envp)
+   __getopt_clean_environment (__environ);
+ #endif
+ 
+-#ifdef SHARED
++#if defined SHARED && !defined NO_CTORS_DTORS_SECTIONS
+   __libc_global_ctors ();
+ #endif
+ }
+diff --git a/sysdeps/sh/init-first.c b/sysdeps/sh/init-first.c
+index d816625..1f3a821 100644
+--- a/sysdeps/sh/init-first.c
++++ b/sysdeps/sh/init-first.c
+@@ -59,7 +59,9 @@ _init (int argc, ...)
+ {
+   init (&argc);
+ 
++#ifndef NO_CTORS_DTORS_SECTIONS
+   __libc_global_ctors ();
++#endif
+ }
+ #endif
+ 
+diff --git a/sysdeps/unix/sysv/linux/init-first.c b/sysdeps/unix/sysv/linux/init-first.c
+index 7b2333d..a60212f 100644
+--- a/sysdeps/unix/sysv/linux/init-first.c
++++ b/sysdeps/unix/sysv/linux/init-first.c
+@@ -93,7 +93,7 @@ _init (int argc, char **argv, char **envp)
+   __getopt_clean_environment (envp);
+ #endif
+ 
+-#ifdef SHARED
++#if defined SHARED && !defined NO_CTORS_DTORS_SECTIONS
+   __libc_global_ctors ();
+ #endif
+ }
+-- 
+1.7.3.4
+
diff --git a/source/l/glibc/glibc.git-96611391ad8823ba58405325d78cefeae5cdf699-CVE-2010-3847b.patch b/source/l/glibc/glibc.git-96611391ad8823ba58405325d78cefeae5cdf699-CVE-2010-3847b.patch
new file mode 100644
index 00000000..b33b5a0d
--- /dev/null
+++ b/source/l/glibc/glibc.git-96611391ad8823ba58405325d78cefeae5cdf699-CVE-2010-3847b.patch
@@ -0,0 +1,27 @@
+From 96611391ad8823ba58405325d78cefeae5cdf699 Mon Sep 17 00:00:00 2001
+From: Andreas Schwab <schwab@redhat.com>
+Date: Thu, 9 Dec 2010 15:00:59 +0100
+Subject: [PATCH] Ignore origin of privileged program
+
+---
+ ChangeLog       |    5 +++++
+ elf/dl-object.c |    3 +++
+ 2 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/elf/dl-object.c b/elf/dl-object.c
+index 5d15ce1..a34e902 100644
+--- a/elf/dl-object.c
++++ b/elf/dl-object.c
+@@ -220,6 +220,9 @@ _dl_new_object (char *realname, const char *libname, int type,
+     out:
+       new->l_origin = origin;
+     }
++  else if (INTUSE(__libc_enable_secure) && type == lt_executable)
++    /* The origin of a privileged program cannot be trusted.  */
++    new->l_origin = (char *) -1;
+ 
+   return new;
+ }
+-- 
+1.7.3.4
+
diff --git a/source/l/glibc/glibc.ldd.trace.through.dynamic.linker.diff b/source/l/glibc/glibc.ldd.trace.through.dynamic.linker.diff
new file mode 100644
index 00000000..6b1f5c84
--- /dev/null
+++ b/source/l/glibc/glibc.ldd.trace.through.dynamic.linker.diff
@@ -0,0 +1,49 @@
+2009-11-08  Aurelien Jarno  <aurelien@aurel32.net>
+
+	* elf/ldd.bash.in: also handle error code 126 (ld.so non
+	executable). Always trace dynamic library dependencies through
+	the dynamic linker.
+
+--- a/elf/ldd.bash.in
++++ b/elf/ldd.bash.in
+@@ -153,8 +153,6 @@ for file do
+     echo "ldd: ${file}:" $"not regular file" >&2
+     result=1
+   elif test -r "$file"; then
+-    test -x "$file" || echo 'ldd:' $"\
+-warning: you do not have execution permission for" "\`$file'" >&2
+     RTLD=
+     ret=1
+     for rtld in ${RTLDLIST}; do
+@@ -167,28 +165,16 @@ warning: you do not have execution permission for" "\`$file'" >&2
+       fi
+     done
+     case $ret in
+-    0)
+-      # If the program exits with exit code 5, it means the process has been
+-      # invoked with __libc_enable_secure.  Fall back to running it through
+-      # the dynamic linker.
+-      try_trace "$file"
+-      rc=$?
+-      if [ $rc = 5 ]; then
+-	try_trace "$RTLD" "$file"
+-	rc=$?
+-      fi
+-      [ $rc = 0 ] || result=1
++    0|2)
++      try_trace "$RTLD" "$file" || result=1
+       ;;
+-    1)
++    1|126)
+       # This can be a non-ELF binary or no binary at all.
+       nonelf "$file" || {
+ 	echo $"	not a dynamic executable"
+ 	result=1
+       }
+       ;;
+-    2)
+-      try_trace "$RTLD" "$file" || result=1
+-      ;;
+     *)
+       echo 'ldd:' ${RTLD} $"exited with unknown exit code" "($ret)" >&2
+       exit 1
diff --git a/source/l/glibc/glibc.make-3.82.diff b/source/l/glibc/glibc.make-3.82.diff
new file mode 100644
index 00000000..56b0675b
--- /dev/null
+++ b/source/l/glibc/glibc.make-3.82.diff
@@ -0,0 +1,28 @@
+Submitted By:            Matt Burgess <matthew_at_linuxfromscratch_dot_org>
+Date:                    2010-07-26
+Initial Package Version: 2.11.2
+Upstream Status:         Not submitted
+Origin:                  Denis Onischenko
+                         (http://www.mail-archive.com/help-make@gnu.org/msg08847.html)
+Description:             Fixes an incompatibility with Make-3.82.
+
+diff -Naur glibc-2.11.2.orig/manual/Makefile glibc-2.11.2/manual/Makefile
+--- glibc-2.11.2.orig/manual/Makefile	2010-05-19 20:38:20.000000000 +0000
++++ glibc-2.11.2/manual/Makefile	2010-07-26 06:51:27.049899308 +0000
+@@ -232,9 +232,13 @@
+ .PHONY: stubs
+ stubs: $(objpfx)stubs
+ endif
+-$(objpfx)stubs ../po/manual.pot $(objpfx)stamp%:
+-	$(make-target-directory)
+-	touch $@
++$(objpfx)stubs ../po/manual.pot:
++	$(make-target-directory)
++	touch $@
++
++$(objpfx)stamp%:
++	$(make-target-directory)
++	touch $@
+ 
+ # Make the target directory if it doesn't exist, using the `mkinstalldirs'
+ # script that does `mkdir -p' even if `mkdir' doesn't support that flag.
diff --git a/source/l/glibc/profile.d/glibc.csh.new b/source/l/glibc/profile.d/glibc.csh.new
index adcc4060..1f33e966 100755
--- a/source/l/glibc/profile.d/glibc.csh.new
+++ b/source/l/glibc/profile.d/glibc.csh.new
@@ -6,4 +6,4 @@
 # get away with running broken programs with this setting,
 # but at a possible performance and security cost.
 #
-#setenv MALLOC_CHECK_=1
+#setenv MALLOC_CHECK_ 1
diff --git a/source/l/gnome-icon-theme/gnome-icon-theme.SlackBuild b/source/l/gnome-icon-theme/gnome-icon-theme.SlackBuild
index c9a76aa4..a200d1cf 100755
--- a/source/l/gnome-icon-theme/gnome-icon-theme.SlackBuild
+++ b/source/l/gnome-icon-theme/gnome-icon-theme.SlackBuild
@@ -67,14 +67,14 @@ zcat $CWD/gnome-icon-theme.pkgconfig.path.diff.gz | patch -p1 --verbose || exit
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --enable-icon-mapping \
-  --localstatedir=/var/lib 
+  --localstatedir=/var/lib || exit 1
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
 mkdir -p $PKG/usr/doc/gnome-icon-theme-$VERSION
 cp -a \
-  AUTHORS COPYING NEWS README TODO \
+  AUTHORS COPYING* NEWS README* TODO \
   $PKG/usr/doc/gnome-icon-theme-$VERSION
 
 # If there's a ChangeLog, installing at least part of the recent history
diff --git a/source/l/gnome-icon-theme/gnome-icon-theme.pkgconfig.path.diff b/source/l/gnome-icon-theme/gnome-icon-theme.pkgconfig.path.diff
index f8f0b269..af072cd8 100644
--- a/source/l/gnome-icon-theme/gnome-icon-theme.pkgconfig.path.diff
+++ b/source/l/gnome-icon-theme/gnome-icon-theme.pkgconfig.path.diff
@@ -1,10 +1,9 @@
-diff -Nur gnome-icon-theme-2.30.2.orig//Makefile.in gnome-icon-theme-2.30.2/Makefile.in
---- gnome-icon-theme-2.30.2.orig//Makefile.in	2010-04-27 09:09:59.000000000 -0500
-+++ gnome-icon-theme-2.30.2/Makefile.in	2010-04-28 10:21:56.050022564 -0500
-@@ -231,7 +231,7 @@
+--- ./Makefile.in.orig	2010-08-04 17:51:09.000000000 -0500
++++ ./Makefile.in	2010-11-06 14:00:00.000000000 -0500
+@@ -229,7 +229,7 @@
  theme_in_files = index.theme.in.in
  theme_DATA = $(theme_in_files:.theme.in.in=.theme)
- THEME_DIRS = $(shell SIZES="$(render_sizes)"; for size in $$SIZES; do for dir in `find $(srcdir)/$(SVGOUTDIR)/$$size/* -type d`; do printf "$$dir,"; done; done | sed -e "s/,$$//g")
+ THEME_DIRS = $(shell SIZES="$(render_sizes)"; for size in $$SIZES; do for dir in `find $(srcdir)/$(SVGOUTDIR)/$$size/* -type d`; do printf "$$dir,"; done; done; echo "scalable/actions,scalable/apps,scalable/devices,scalable/emblems,scalable/mimetypes,scalable/places,scalable/status")
 -pkgconfigdir = $(datadir)/pkgconfig
 +pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = gnome-icon-theme.pc
diff --git a/source/l/gst-plugins-good/gst-plugins-good.6b86b56abd8a28b9e94cee679e3d86367a9a0ab3.diff b/source/l/gst-plugins-good/gst-plugins-good.6b86b56abd8a28b9e94cee679e3d86367a9a0ab3.diff
new file mode 100644
index 00000000..7c896090
--- /dev/null
+++ b/source/l/gst-plugins-good/gst-plugins-good.6b86b56abd8a28b9e94cee679e3d86367a9a0ab3.diff
@@ -0,0 +1,11 @@
+--- ./sys/v4l2/gstv4l2object.c.orig	2011-03-08 07:56:07.000000000 -0600
++++ ./sys/v4l2/gstv4l2object.c	2011-04-15 22:19:11.802999999 -0500
+@@ -2019,7 +2019,7 @@
+     /* ideally we would differentiate between types of interlaced video
+      * but there is not sufficient information in the caps..
+      */
+-    field = V4L2_FIELD_SEQ_TB;
++    field = V4L2_FIELD_INTERLACED;
+   } else {
+     GST_DEBUG_OBJECT (v4l2object->element, "progressive video");
+     field = V4L2_FIELD_NONE;
diff --git a/source/l/gst-plugins-good/gst-plugins-good.SlackBuild b/source/l/gst-plugins-good/gst-plugins-good.SlackBuild
index a5db6d87..112ebe0b 100755
--- a/source/l/gst-plugins-good/gst-plugins-good.SlackBuild
+++ b/source/l/gst-plugins-good/gst-plugins-good.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2008 Michiel van Wessem <michiel@slackbuilds.org>
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -26,7 +26,7 @@
 
 PKGNAM=gst-plugins-good
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -68,6 +68,8 @@ rm -rf $PKGNAM-$VERSION
 tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
 cd $PKGNAM-$VERSION
 
+zcat $CWD/gst-plugins-good.6b86b56abd8a28b9e94cee679e3d86367a9a0ab3.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 \) \
@@ -85,7 +87,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --disable-debug \
   --disable-static \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
diff --git a/source/l/gtk+/gtk+.SlackBuild b/source/l/gtk+/gtk+.SlackBuild
index 8133e2da..8ac39412 100755
--- a/source/l/gtk+/gtk+.SlackBuild
+++ b/source/l/gtk+/gtk+.SlackBuild
@@ -22,11 +22,20 @@
 
 
 PKGNAM=gtk+
-VERSION=${VERSION:-1.2.10}
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-5}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -43,11 +52,14 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
 cd ${PKGNAM}-$VERSION
 
 bzcat $CWD/gtk+1.2_1.2.10-18.diff.bz2 | patch -p1 --verbose || exit 1
@@ -61,7 +73,8 @@ find . \
   -exec chmod 644 {} \;
 
 # The original config.{guess,sub} do not work on x86_64
-cp -p /usr/share/libtool/config.{guess,sub} .
+#cp /usr/share/libtool/config.{guess,sub} .             # libtool-1.x
+cp /usr/share/libtool/config/config.{guess,sub} .       # libtool-2.x
 
 # Configure:
 CFLAGS="$SLKCFLAGS" \
@@ -110,8 +123,8 @@ fi
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS \
-  README README.cvs-commits TODO \
+  ABOUT-NLS AUTHORS COPYING* HACKING INSTALL NEWS \
+  README* TODO \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 
 mkdir -p $PKG/install
diff --git a/source/l/gtk+2/doinst.sh b/source/l/gtk+2/doinst.sh
index 1122e0cd..18d5fb27 100644
--- a/source/l/gtk+2/doinst.sh
+++ b/source/l/gtk+2/doinst.sh
@@ -1,35 +1,18 @@
-#!/bin/sh
 config() {
   NEW="$1"
-  OLD="`dirname $NEW`/`basename $NEW .new`"
+  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
+  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...
 }
-if [ -d etc/gtk-2.0/$(uname -m)-slackware-linux ]; then
-  config etc/gtk-2.0/$(uname -m)-slackware-linux/im-multipress.conf.new
-elif [ -d etc/gtk-2.0/i486-slackware-linux ]; then
-  config etc/gtk-2.0/i486-slackware-linux/im-multipress.conf.new
-elif [ -d etc/gtk-2.0/*-slackware-linux ]; then
-  config etc/gtk-2.0/*-slackware-linux/im-multipress.conf.new
-fi
 
-# Since the use of icon caching is optional, and has to be kept in sync
-# somehow (like a "registry" through a cron job, or whatever, I tend to
-# think the user should be the one to choose if they really want to set
-# this up or not:
-#
-# Example:
-#for dir in /usr/share/icons/* ; do
-#  if [ -d $dir ]; then
-#    /usr/bin/gtk-update-icon-cache -f -t $dir 1> /dev/null 2> /dev/null
-#  fi
-#done
-mkdir -p etc/gtk-2.0
+config etc/gtk-2.0/gtkrc.new
+config etc/gtk-2.0/im-multipress.conf.new
+rm -f etc/gtk-2.0/gtkrc.new
 
 chroot . rm -f /usr/share/icons/*/icon-theme.cache 1> /dev/null 2> /dev/null
 
@@ -39,3 +22,7 @@ if [ -x /usr/bin/update-gtk-immodules-2.0 ]; then
   /usr/bin/update-gtk-immodules
 fi
 
+# In case this is the first run installing the standalone gdk-pixbuf,
+# we will run this a second time to fix machines that will not reboot.
+chroot . /usr/bin/update-gdk-pixbuf-loaders 1> /dev/null 2> /dev/null
+
diff --git a/source/l/gtk+2/fix_build_issues_on_tutorial_and_faq.diff b/source/l/gtk+2/fix_build_issues_on_tutorial_and_faq.diff
new file mode 100644
index 00000000..6d6ad4d2
--- /dev/null
+++ b/source/l/gtk+2/fix_build_issues_on_tutorial_and_faq.diff
@@ -0,0 +1,26 @@
+diff -Nur gtk+-2.24.0.orig/docs/faq/Makefile.am gtk+-2.24.0/docs/faq/Makefile.am
+--- gtk+-2.24.0.orig/docs/faq/Makefile.am	2011-01-05 09:51:19.000000000 -0600
++++ gtk+-2.24.0/docs/faq/Makefile.am	2011-02-11 10:41:13.383824443 -0600
+@@ -9,7 +9,8 @@
+ 	  (cd $(srcdir); \
+ 	   db2html gtk-faq.sgml; \
+ 	   test -d html && rm -r html; \
+-	   mv gtk-faq html); \
++	   mkdir html; \
++	   mv *.html html); \
+ 	fi
+ 
+ pdf:
+diff -Nur gtk+-2.24.0.orig/docs/tutorial/Makefile.am gtk+-2.24.0/docs/tutorial/Makefile.am
+--- gtk+-2.24.0.orig/docs/tutorial/Makefile.am	2011-01-05 09:51:20.000000000 -0600
++++ gtk+-2.24.0/docs/tutorial/Makefile.am	2011-02-11 10:42:04.541622883 -0600
+@@ -42,7 +42,8 @@
+ 	  (cd $(srcdir); \
+ 	   db2html gtk-tut.sgml; \
+ 	   test -d html && rm -r html; \
+-	   mv gtk-tut html; \
++	   mkdir html; \
++	   mv *.html html; \
+ 	   mkdir html/images; \
+ 	   cp images/*.png html/images); \
+ 	fi
diff --git a/source/l/gtk+2/gtk+-2.24.x.icon-compat.am.diff b/source/l/gtk+2/gtk+-2.24.x.icon-compat.am.diff
new file mode 100644
index 00000000..0464648a
--- /dev/null
+++ b/source/l/gtk+2/gtk+-2.24.x.icon-compat.am.diff
@@ -0,0 +1,264 @@
+--- ./gtk/Makefile.am.orig	2011-04-01 15:44:12.000000000 -0500
++++ ./gtk/Makefile.am	2011-04-02 12:20:03.000000000 -0500
+@@ -1324,7 +1324,171 @@
+ 	stock-icons/24/folder-remote.png 		\
+ 	stock-icons/24/user-home.png 			\
+ 	stock-icons/24/user-desktop.png 		\
+-	stock-icons/24/text-x-generic.png
++        stock-icons/24/text-x-generic.png               \
++        stock-icons/16/gtk-quit.png                     \
++        stock-icons/16/gtk-info.png                     \
++        stock-icons/16/gtk-file.png                     \
++        stock-icons/16/gtk-open.png                     \
++        stock-icons/16/gtk-print-preview.png            \
++        stock-icons/16/gtk-print.png                    \
++        stock-icons/16/gtk-properties.png               \
++        stock-icons/16/gtk-revert-to-saved-ltr.png      \
++        stock-icons/16/gtk-revert-to-saved-rtl.png      \
++        stock-icons/16/gtk-save-as.png                  \
++        stock-icons/16/gtk-new.png                      \
++        stock-icons/16/gtk-harddisk.png                 \
++        stock-icons/16/gtk-clear.png                    \
++        stock-icons/16/gtk-copy.png                     \
++        stock-icons/16/gtk-cut.png                      \
++        stock-icons/16/gtk-delete.png                   \
++        stock-icons/16/gtk-find-and-replace.png         \
++        stock-icons/16/gtk-find.png                     \
++        stock-icons/16/gtk-paste.png                    \
++        stock-icons/16/gtk-redo-ltr.png                 \
++        stock-icons/16/gtk-redo-rtl.png                 \
++        stock-icons/16/gtk-select-all.png               \
++        stock-icons/16/gtk-undo-ltr.png                 \
++        stock-icons/16/gtk-undo-rtl.png                 \
++        stock-icons/16/gtk-directory.png                \
++        stock-icons/16/gtk-unindent-ltr.png             \
++        stock-icons/16/gtk-unindent-rtl.png             \
++        stock-icons/16/gtk-indent-ltr.png               \
++        stock-icons/16/gtk-indent-rtl.png               \
++        stock-icons/16/gtk-justify-center.png           \
++        stock-icons/16/gtk-justify-fill.png             \
++        stock-icons/16/gtk-justify-left.png             \
++        stock-icons/16/gtk-justify-right.png            \
++        stock-icons/16/gtk-bold.png                     \
++        stock-icons/16/gtk-italic.png                   \
++        stock-icons/16/gtk-strikethrough.png            \
++        stock-icons/16/gtk-underline.png                \
++        stock-icons/16/gtk-goto-bottom.png              \
++        stock-icons/16/gtk-go-down.png                  \
++        stock-icons/16/gtk-goto-first-ltr.png           \
++        stock-icons/16/gtk-home.png                     \
++        stock-icons/16/gtk-jump-to-ltr.png              \
++        stock-icons/16/gtk-jump-to-rtl.png              \
++        stock-icons/16/gtk-goto-last-ltr.png            \
++        stock-icons/16/gtk-go-forward-ltr.png           \
++        stock-icons/16/gtk-go-back-ltr.png              \
++        stock-icons/16/gtk-goto-top.png                 \
++        stock-icons/16/gtk-go-up.png                    \
++        stock-icons/16/gtk-about.png                    \
++        stock-icons/16/gtk-help.png                     \
++        stock-icons/16/gtk-missing-image.png            \
++        stock-icons/16/gtk-add.png                      \
++        stock-icons/16/gtk-remove.png                   \
++        stock-icons/16/gtk-floppy.png                   \
++        stock-icons/16/gtk-cdrom.png                    \
++        stock-icons/16/gtk-media-pause.png              \
++        stock-icons/16/gtk-media-play-ltr.png           \
++        stock-icons/16/gtk-media-play-rtl.png           \
++        stock-icons/16/gtk-media-stop.png               \
++        stock-icons/16/gtk-media-record.png             \
++        stock-icons/16/gtk-media-rewind-ltr.png         \
++        stock-icons/16/gtk-media-forward-ltr.png        \
++        stock-icons/16/gtk-media-previous-ltr.png       \
++        stock-icons/16/gtk-media-next-ltr.png           \
++        stock-icons/16/gtk-network.png                  \
++        stock-icons/16/gtk-print-error.png              \
++        stock-icons/16/gtk-print-report.png             \
++        stock-icons/16/gtk-print-paused.png             \
++        stock-icons/16/gtk-print-warning.png            \
++        stock-icons/16/gtk-stop.png                     \
++        stock-icons/16/gtk-execute.png                  \
++        stock-icons/16/gtk-spell-check.png              \
++        stock-icons/16/gtk-fullscreen.png               \
++        stock-icons/16/gtk-refresh.png                  \
++        stock-icons/16/gtk-leave-fullscreen.png         \
++        stock-icons/16/gtk-sort-ascending.png           \
++        stock-icons/16/gtk-sort-descending.png          \
++        stock-icons/16/gtk-close.png                    \
++        stock-icons/16/gtk-zoom-fit.png                 \
++        stock-icons/16/gtk-zoom-in.png                  \
++        stock-icons/16/gtk-zoom-100.png                 \
++        stock-icons/16/gtk-zoom-out.png                 \
++        stock-icons/24/gtk-quit.png                     \
++        stock-icons/24/gtk-info.png                     \
++        stock-icons/24/gtk-file.png                     \
++        stock-icons/24/gtk-open.png                     \
++        stock-icons/24/gtk-print-preview.png            \
++        stock-icons/24/gtk-print.png                    \
++        stock-icons/24/gtk-properties.png               \
++        stock-icons/24/gtk-revert-to-saved-ltr.png      \
++        stock-icons/24/gtk-revert-to-saved-rtl.png      \
++        stock-icons/24/gtk-save-as.png                  \
++        stock-icons/24/gtk-new.png                      \
++        stock-icons/24/gtk-harddisk.png                 \
++        stock-icons/24/gtk-clear.png                    \
++        stock-icons/24/gtk-copy.png                     \
++        stock-icons/24/gtk-cut.png                      \
++        stock-icons/24/gtk-delete.png                   \
++        stock-icons/24/gtk-find-and-replace.png         \
++        stock-icons/24/gtk-find.png                     \
++        stock-icons/24/gtk-paste.png                    \
++        stock-icons/24/gtk-redo-ltr.png                 \
++        stock-icons/24/gtk-redo-rtl.png                 \
++        stock-icons/24/gtk-select-all.png               \
++        stock-icons/24/gtk-undo-ltr.png                 \
++        stock-icons/24/gtk-undo-rtl.png                 \
++        stock-icons/24/gtk-directory.png                \
++        stock-icons/24/gtk-unindent-ltr.png             \
++        stock-icons/24/gtk-unindent-rtl.png             \
++        stock-icons/24/gtk-indent-ltr.png               \
++        stock-icons/24/gtk-indent-rtl.png               \
++        stock-icons/24/gtk-justify-center.png           \
++        stock-icons/24/gtk-justify-fill.png             \
++        stock-icons/24/gtk-justify-left.png             \
++        stock-icons/24/gtk-justify-right.png            \
++        stock-icons/24/gtk-bold.png                     \
++        stock-icons/24/gtk-italic.png                   \
++        stock-icons/24/gtk-strikethrough.png            \
++        stock-icons/24/gtk-underline.png                \
++        stock-icons/24/gtk-goto-bottom.png              \
++        stock-icons/24/gtk-go-down.png                  \
++        stock-icons/24/gtk-goto-first-ltr.png           \
++        stock-icons/24/gtk-home.png                     \
++        stock-icons/24/gtk-jump-to-ltr.png              \
++        stock-icons/24/gtk-jump-to-rtl.png              \
++        stock-icons/24/gtk-goto-last-ltr.png            \
++        stock-icons/24/gtk-go-forward-ltr.png           \
++        stock-icons/24/gtk-go-back-ltr.png              \
++        stock-icons/24/gtk-goto-top.png                 \
++        stock-icons/24/gtk-go-up.png                    \
++        stock-icons/24/gtk-about.png                    \
++        stock-icons/24/gtk-help.png                     \
++        stock-icons/24/gtk-missing-image.png            \
++        stock-icons/24/gtk-add.png                      \
++        stock-icons/24/gtk-remove.png                   \
++        stock-icons/24/gtk-floppy.png                   \
++        stock-icons/24/gtk-cdrom.png                    \
++        stock-icons/24/gtk-media-pause.png              \
++        stock-icons/24/gtk-media-play-ltr.png           \
++        stock-icons/24/gtk-media-play-rtl.png           \
++        stock-icons/24/gtk-media-stop.png               \
++        stock-icons/24/gtk-media-record.png             \
++        stock-icons/24/gtk-media-rewind-ltr.png         \
++        stock-icons/24/gtk-media-forward-ltr.png        \
++        stock-icons/24/gtk-media-previous-ltr.png       \
++        stock-icons/24/gtk-media-next-ltr.png           \
++        stock-icons/24/gtk-network.png                  \
++        stock-icons/24/gtk-print-error.png              \
++        stock-icons/24/gtk-print-report.png             \
++        stock-icons/24/gtk-print-paused.png             \
++        stock-icons/24/gtk-print-warning.png            \
++        stock-icons/24/gtk-stop.png                     \
++        stock-icons/24/gtk-execute.png                  \
++        stock-icons/24/gtk-spell-check.png              \
++        stock-icons/24/gtk-fullscreen.png               \
++        stock-icons/24/gtk-refresh.png                  \
++        stock-icons/24/gtk-leave-fullscreen.png         \
++        stock-icons/24/gtk-sort-ascending.png           \
++        stock-icons/24/gtk-sort-descending.png          \
++        stock-icons/24/gtk-close.png                    \
++        stock-icons/24/gtk-zoom-fit.png                 \
++        stock-icons/24/gtk-zoom-in.png                  \
++        stock-icons/24/gtk-zoom-100.png                 \
++        stock-icons/24/gtk-zoom-out.png
+ 
+ # need to copy the icons so that we can replace the generated ones with
+ # symlinks, even in the readonly srcdir case
+@@ -1364,6 +1528,88 @@
+ 	   && $(LN_S) folder.png user-desktop.png 			\
+ 	   && $(RM) user-home.png 					\
+ 	   && $(LN_S) folder.png user-home.png 				\
++           && $(LN_S) application-exit.png gtk-quit.png                 \
++           && $(LN_S) dialog-info.png gtk-info.png                      \
++           && $(LN_S) document-new.png gtk-file.png                     \
++           && $(LN_S) document-open.png gtk-open.png                    \
++           && $(LN_S) document-print-preview.png gtk-print-preview.png                  \
++           && $(LN_S) document-print.png gtk-print.png                  \
++           && $(LN_S) document-properties.png gtk-properties.png                        \
++           && $(LN_S) document-revert-ltr.png gtk-revert-to-saved-ltr.png                       \
++           && $(LN_S) document-revert-rtl.png gtk-revert-to-saved-rtl.png                       \
++           && $(LN_S) document-save-as.png gtk-save-as.png                      \
++           && $(LN_S) document-x-generic.png gtk-new.png                        \
++           && $(LN_S) drive-harddisk.png gtk-harddisk.png                       \
++           && $(LN_S) edit-clear.png gtk-clear.png                      \
++           && $(LN_S) edit-copy.png gtk-copy.png                        \
++           && $(LN_S) edit-cut.png gtk-cut.png                  \
++           && $(LN_S) edit-delete.png gtk-delete.png                    \
++           && $(LN_S) edit-find-replace.png gtk-find-and-replace.png                    \
++           && $(LN_S) edit-find.png gtk-find.png                        \
++           && $(LN_S) edit-paste.png gtk-paste.png                      \
++           && $(LN_S) edit-redo-ltr.png gtk-redo-ltr.png                        \
++           && $(LN_S) edit-redo-rtl.png gtk-redo-rtl.png                        \
++           && $(LN_S) edit-select-all.png gtk-select-all.png                    \
++           && $(LN_S) edit-undo-ltr.png gtk-undo-ltr.png                        \
++           && $(LN_S) edit-undo-rtl.png gtk-undo-rtl.png                        \
++           && $(LN_S) folder.png gtk-directory.png                      \
++           && $(LN_S) format-indent-less-ltr.png gtk-unindent-ltr.png                   \
++           && $(LN_S) format-indent-less-rtl.png gtk-unindent-rtl.png                   \
++           && $(LN_S) format-indent-more-ltr.png gtk-indent-ltr.png                     \
++           && $(LN_S) format-indent-more-rtl.png gtk-indent-rtl.png                     \
++           && $(LN_S) format-justify-center.png gtk-justify-center.png                  \
++           && $(LN_S) format-justify-fill.png gtk-justify-fill.png                      \
++           && $(LN_S) format-justify-left.png gtk-justify-left.png                      \
++           && $(LN_S) format-justify-right.png gtk-justify-right.png                    \
++           && $(LN_S) format-text-bold.png gtk-bold.png                 \
++           && $(LN_S) format-text-italic.png gtk-italic.png                     \
++           && $(LN_S) format-text-strikethrough.png gtk-strikethrough.png                       \
++           && $(LN_S) format-text-underline.png gtk-underline.png                       \
++           && $(LN_S) go-bottom.png gtk-goto-bottom.png                 \
++           && $(LN_S) go-down.png gtk-go-down.png                       \
++           && $(LN_S) go-first-ltr.png gtk-goto-first-ltr.png                   \
++           && $(LN_S) go-home.png gtk-home.png                  \
++           && $(LN_S) go-jump-ltr.png gtk-jump-to-ltr.png                       \
++           && $(LN_S) go-jump-rtl.png gtk-jump-to-rtl.png                       \
++           && $(LN_S) go-last-ltr.png gtk-goto-last-ltr.png                     \
++           && $(LN_S) go-next-ltr.png gtk-go-forward-ltr.png                    \
++           && $(LN_S) go-previous-ltr.png gtk-go-back-ltr.png                   \
++           && $(LN_S) go-top.png gtk-goto-top.png                       \
++           && $(LN_S) go-up.png gtk-go-up.png                   \
++           && $(LN_S) help-about.png gtk-about.png                      \
++           && $(LN_S) help-contents.png gtk-help.png                    \
++           && $(LN_S) image-missing.png gtk-missing-image.png                   \
++           && $(LN_S) list-add.png gtk-add.png                  \
++           && $(LN_S) list-remove.png gtk-remove.png                    \
++           && $(LN_S) media-floppy.png gtk-floppy.png                   \
++           && $(LN_S) media-optical.png gtk-cdrom.png                   \
++           && $(LN_S) media-playback-pause.png gtk-media-pause.png                      \
++           && $(LN_S) media-playback-start-ltr.png gtk-media-play-ltr.png                       \
++           && $(LN_S) media-playback-start-rtl.png gtk-media-play-rtl.png                       \
++           && $(LN_S) media-playback-stop.png gtk-media-stop.png                        \
++           && $(LN_S) media-record.png gtk-media-record.png                     \
++           && $(LN_S) media-seek-backward-ltr.png gtk-media-rewind-ltr.png                      \
++           && $(LN_S) media-seek-forward-ltr.png gtk-media-forward-ltr.png                      \
++           && $(LN_S) media-skip-backward-ltr.png gtk-media-previous-ltr.png                    \
++           && $(LN_S) media-skip-forward-ltr.png gtk-media-next-ltr.png                 \
++           && $(LN_S) network-idle.png gtk-network.png                  \
++           && $(LN_S) printer-error.png gtk-print-error.png                     \
++           && $(LN_S) printer-info.png gtk-print-report.png                     \
++           && $(LN_S) printer-paused.png gtk-print-paused.png                   \
++           && $(LN_S) printer-warning.png gtk-print-warning.png                 \
++           && $(LN_S) process-stop.png gtk-stop.png                     \
++           && $(LN_S) system-run.png gtk-execute.png                    \
++           && $(LN_S) tools-check-spelling.png gtk-spell-check.png                      \
++           && $(LN_S) view-fullscreen.png gtk-fullscreen.png                    \
++           && $(LN_S) view-refresh.png gtk-refresh.png                  \
++           && $(LN_S) view-restore.png gtk-leave-fullscreen.png                 \
++           && $(LN_S) view-sort-ascending.png gtk-sort-ascending.png                    \
++           && $(LN_S) view-sort-descending.png gtk-sort-descending.png                  \
++           && $(LN_S) window-close.png gtk-close.png                    \
++           && $(LN_S) zoom-fit-best.png gtk-zoom-fit.png                        \
++           && $(LN_S) zoom-in.png gtk-zoom-in.png                       \
++           && $(LN_S) zoom-original.png gtk-zoom-100.png                        \
++           && $(LN_S) zoom-out.png gtk-zoom-out.png                     \
+ 	) done 								\
+ 	&& touch stamp-icons
+ 
diff --git a/source/l/gtk+2/gtk+-2.24.x.icon-compat.diff b/source/l/gtk+2/gtk+-2.24.x.icon-compat.diff
new file mode 100644
index 00000000..d4df76a7
--- /dev/null
+++ b/source/l/gtk+2/gtk+-2.24.x.icon-compat.diff
@@ -0,0 +1,265 @@
+--- ./gtk/Makefile.in.orig	2011-04-01 16:41:08.000000000 -0500
++++ ./gtk/Makefile.in	2011-04-02 12:21:32.000000000 -0500
+@@ -1614,7 +1614,172 @@
+ 	stock-icons/24/folder-remote.png 		\
+ 	stock-icons/24/user-home.png 			\
+ 	stock-icons/24/user-desktop.png 		\
+-	stock-icons/24/text-x-generic.png
++	stock-icons/24/text-x-generic.png		\
++	stock-icons/24/text-x-generic.png		\
++	stock-icons/16/gtk-quit.png			\
++	stock-icons/16/gtk-info.png			\
++	stock-icons/16/gtk-file.png			\
++	stock-icons/16/gtk-open.png			\
++	stock-icons/16/gtk-print-preview.png		\
++	stock-icons/16/gtk-print.png			\
++	stock-icons/16/gtk-properties.png		\
++	stock-icons/16/gtk-revert-to-saved-ltr.png	\
++	stock-icons/16/gtk-revert-to-saved-rtl.png	\
++	stock-icons/16/gtk-save-as.png			\
++	stock-icons/16/gtk-new.png			\
++	stock-icons/16/gtk-harddisk.png			\
++	stock-icons/16/gtk-clear.png			\
++	stock-icons/16/gtk-copy.png			\
++	stock-icons/16/gtk-cut.png			\
++	stock-icons/16/gtk-delete.png			\
++	stock-icons/16/gtk-find-and-replace.png		\
++	stock-icons/16/gtk-find.png			\
++	stock-icons/16/gtk-paste.png			\
++	stock-icons/16/gtk-redo-ltr.png			\
++	stock-icons/16/gtk-redo-rtl.png			\
++	stock-icons/16/gtk-select-all.png		\
++	stock-icons/16/gtk-undo-ltr.png			\
++	stock-icons/16/gtk-undo-rtl.png			\
++	stock-icons/16/gtk-directory.png		\
++	stock-icons/16/gtk-unindent-ltr.png		\
++	stock-icons/16/gtk-unindent-rtl.png		\
++	stock-icons/16/gtk-indent-ltr.png		\
++	stock-icons/16/gtk-indent-rtl.png		\
++	stock-icons/16/gtk-justify-center.png		\
++	stock-icons/16/gtk-justify-fill.png		\
++	stock-icons/16/gtk-justify-left.png		\
++	stock-icons/16/gtk-justify-right.png		\
++	stock-icons/16/gtk-bold.png			\
++	stock-icons/16/gtk-italic.png			\
++	stock-icons/16/gtk-strikethrough.png		\
++	stock-icons/16/gtk-underline.png		\
++	stock-icons/16/gtk-goto-bottom.png		\
++	stock-icons/16/gtk-go-down.png			\
++	stock-icons/16/gtk-goto-first-ltr.png		\
++	stock-icons/16/gtk-home.png			\
++	stock-icons/16/gtk-jump-to-ltr.png		\
++	stock-icons/16/gtk-jump-to-rtl.png		\
++	stock-icons/16/gtk-goto-last-ltr.png		\
++	stock-icons/16/gtk-go-forward-ltr.png		\
++	stock-icons/16/gtk-go-back-ltr.png		\
++	stock-icons/16/gtk-goto-top.png			\
++	stock-icons/16/gtk-go-up.png			\
++	stock-icons/16/gtk-about.png			\
++	stock-icons/16/gtk-help.png			\
++	stock-icons/16/gtk-missing-image.png		\
++	stock-icons/16/gtk-add.png			\
++	stock-icons/16/gtk-remove.png			\
++	stock-icons/16/gtk-floppy.png			\
++	stock-icons/16/gtk-cdrom.png			\
++	stock-icons/16/gtk-media-pause.png		\
++	stock-icons/16/gtk-media-play-ltr.png		\
++	stock-icons/16/gtk-media-play-rtl.png		\
++	stock-icons/16/gtk-media-stop.png		\
++	stock-icons/16/gtk-media-record.png		\
++	stock-icons/16/gtk-media-rewind-ltr.png		\
++	stock-icons/16/gtk-media-forward-ltr.png	\
++	stock-icons/16/gtk-media-previous-ltr.png	\
++	stock-icons/16/gtk-media-next-ltr.png		\
++	stock-icons/16/gtk-network.png			\
++	stock-icons/16/gtk-print-error.png		\
++	stock-icons/16/gtk-print-report.png		\
++	stock-icons/16/gtk-print-paused.png		\
++	stock-icons/16/gtk-print-warning.png		\
++	stock-icons/16/gtk-stop.png			\
++	stock-icons/16/gtk-execute.png			\
++	stock-icons/16/gtk-spell-check.png		\
++	stock-icons/16/gtk-fullscreen.png		\
++	stock-icons/16/gtk-refresh.png			\
++	stock-icons/16/gtk-leave-fullscreen.png		\
++	stock-icons/16/gtk-sort-ascending.png		\
++	stock-icons/16/gtk-sort-descending.png		\
++	stock-icons/16/gtk-close.png			\
++	stock-icons/16/gtk-zoom-fit.png			\
++	stock-icons/16/gtk-zoom-in.png			\
++	stock-icons/16/gtk-zoom-100.png			\
++	stock-icons/16/gtk-zoom-out.png			\
++	stock-icons/24/gtk-quit.png			\
++	stock-icons/24/gtk-info.png			\
++	stock-icons/24/gtk-file.png			\
++	stock-icons/24/gtk-open.png			\
++	stock-icons/24/gtk-print-preview.png		\
++	stock-icons/24/gtk-print.png			\
++	stock-icons/24/gtk-properties.png		\
++	stock-icons/24/gtk-revert-to-saved-ltr.png	\
++	stock-icons/24/gtk-revert-to-saved-rtl.png	\
++	stock-icons/24/gtk-save-as.png			\
++	stock-icons/24/gtk-new.png			\
++	stock-icons/24/gtk-harddisk.png			\
++	stock-icons/24/gtk-clear.png			\
++	stock-icons/24/gtk-copy.png			\
++	stock-icons/24/gtk-cut.png			\
++	stock-icons/24/gtk-delete.png			\
++	stock-icons/24/gtk-find-and-replace.png		\
++	stock-icons/24/gtk-find.png			\
++	stock-icons/24/gtk-paste.png			\
++	stock-icons/24/gtk-redo-ltr.png			\
++	stock-icons/24/gtk-redo-rtl.png			\
++	stock-icons/24/gtk-select-all.png		\
++	stock-icons/24/gtk-undo-ltr.png			\
++	stock-icons/24/gtk-undo-rtl.png			\
++	stock-icons/24/gtk-directory.png		\
++	stock-icons/24/gtk-unindent-ltr.png		\
++	stock-icons/24/gtk-unindent-rtl.png		\
++	stock-icons/24/gtk-indent-ltr.png		\
++	stock-icons/24/gtk-indent-rtl.png		\
++	stock-icons/24/gtk-justify-center.png		\
++	stock-icons/24/gtk-justify-fill.png		\
++	stock-icons/24/gtk-justify-left.png		\
++	stock-icons/24/gtk-justify-right.png		\
++	stock-icons/24/gtk-bold.png			\
++	stock-icons/24/gtk-italic.png			\
++	stock-icons/24/gtk-strikethrough.png		\
++	stock-icons/24/gtk-underline.png		\
++	stock-icons/24/gtk-goto-bottom.png		\
++	stock-icons/24/gtk-go-down.png			\
++	stock-icons/24/gtk-goto-first-ltr.png		\
++	stock-icons/24/gtk-home.png			\
++	stock-icons/24/gtk-jump-to-ltr.png		\
++	stock-icons/24/gtk-jump-to-rtl.png		\
++	stock-icons/24/gtk-goto-last-ltr.png		\
++	stock-icons/24/gtk-go-forward-ltr.png		\
++	stock-icons/24/gtk-go-back-ltr.png		\
++	stock-icons/24/gtk-goto-top.png			\
++	stock-icons/24/gtk-go-up.png			\
++	stock-icons/24/gtk-about.png			\
++	stock-icons/24/gtk-help.png			\
++	stock-icons/24/gtk-missing-image.png		\
++	stock-icons/24/gtk-add.png			\
++	stock-icons/24/gtk-remove.png			\
++	stock-icons/24/gtk-floppy.png			\
++	stock-icons/24/gtk-cdrom.png			\
++	stock-icons/24/gtk-media-pause.png		\
++	stock-icons/24/gtk-media-play-ltr.png		\
++	stock-icons/24/gtk-media-play-rtl.png		\
++	stock-icons/24/gtk-media-stop.png		\
++	stock-icons/24/gtk-media-record.png		\
++	stock-icons/24/gtk-media-rewind-ltr.png		\
++	stock-icons/24/gtk-media-forward-ltr.png	\
++	stock-icons/24/gtk-media-previous-ltr.png	\
++	stock-icons/24/gtk-media-next-ltr.png		\
++	stock-icons/24/gtk-network.png			\
++	stock-icons/24/gtk-print-error.png		\
++	stock-icons/24/gtk-print-report.png		\
++	stock-icons/24/gtk-print-paused.png		\
++	stock-icons/24/gtk-print-warning.png		\
++	stock-icons/24/gtk-stop.png			\
++	stock-icons/24/gtk-execute.png			\
++	stock-icons/24/gtk-spell-check.png		\
++	stock-icons/24/gtk-fullscreen.png		\
++	stock-icons/24/gtk-refresh.png			\
++	stock-icons/24/gtk-leave-fullscreen.png		\
++	stock-icons/24/gtk-sort-ascending.png		\
++	stock-icons/24/gtk-sort-descending.png		\
++	stock-icons/24/gtk-close.png			\
++	stock-icons/24/gtk-zoom-fit.png			\
++	stock-icons/24/gtk-zoom-in.png			\
++	stock-icons/24/gtk-zoom-100.png			\
++	stock-icons/24/gtk-zoom-out.png
+ 
+ @CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \
+ @CROSS_COMPILING_FALSE@	   ./gtk-update-icon-cache
+@@ -2885,6 +3050,88 @@
+ 	   && $(LN_S) folder.png user-desktop.png 			\
+ 	   && $(RM) user-home.png 					\
+ 	   && $(LN_S) folder.png user-home.png 				\
++	   && $(LN_S) application-exit.png gtk-quit.png			\
++	   && $(LN_S) dialog-info.png gtk-info.png			\
++	   && $(LN_S) document-new.png gtk-file.png			\
++	   && $(LN_S) document-open.png gtk-open.png			\
++	   && $(LN_S) document-print-preview.png gtk-print-preview.png	\
++	   && $(LN_S) document-print.png gtk-print.png			\
++	   && $(LN_S) document-properties.png gtk-properties.png	\
++	   && $(LN_S) document-revert-ltr.png gtk-revert-to-saved-ltr.png	\
++	   && $(LN_S) document-revert-rtl.png gtk-revert-to-saved-rtl.png	\
++	   && $(LN_S) document-save-as.png gtk-save-as.png		\
++	   && $(LN_S) document-x-generic.png gtk-new.png		\
++	   && $(LN_S) drive-harddisk.png gtk-harddisk.png		\
++	   && $(LN_S) edit-clear.png gtk-clear.png			\
++	   && $(LN_S) edit-copy.png gtk-copy.png			\
++	   && $(LN_S) edit-cut.png gtk-cut.png				\
++	   && $(LN_S) edit-delete.png gtk-delete.png			\
++	   && $(LN_S) edit-find-replace.png gtk-find-and-replace.png	\
++	   && $(LN_S) edit-find.png gtk-find.png			\
++	   && $(LN_S) edit-paste.png gtk-paste.png			\
++	   && $(LN_S) edit-redo-ltr.png gtk-redo-ltr.png		\
++	   && $(LN_S) edit-redo-rtl.png gtk-redo-rtl.png		\
++	   && $(LN_S) edit-select-all.png gtk-select-all.png		\
++	   && $(LN_S) edit-undo-ltr.png gtk-undo-ltr.png		\
++	   && $(LN_S) edit-undo-rtl.png gtk-undo-rtl.png		\
++	   && $(LN_S) folder.png gtk-directory.png			\
++	   && $(LN_S) format-indent-less-ltr.png gtk-unindent-ltr.png	\
++	   && $(LN_S) format-indent-less-rtl.png gtk-unindent-rtl.png	\
++	   && $(LN_S) format-indent-more-ltr.png gtk-indent-ltr.png	\
++	   && $(LN_S) format-indent-more-rtl.png gtk-indent-rtl.png	\
++	   && $(LN_S) format-justify-center.png gtk-justify-center.png	\
++	   && $(LN_S) format-justify-fill.png gtk-justify-fill.png	\
++	   && $(LN_S) format-justify-left.png gtk-justify-left.png	\
++	   && $(LN_S) format-justify-right.png gtk-justify-right.png	\
++	   && $(LN_S) format-text-bold.png gtk-bold.png			\
++	   && $(LN_S) format-text-italic.png gtk-italic.png		\
++	   && $(LN_S) format-text-strikethrough.png gtk-strikethrough.png	\
++	   && $(LN_S) format-text-underline.png gtk-underline.png	\
++	   && $(LN_S) go-bottom.png gtk-goto-bottom.png			\
++	   && $(LN_S) go-down.png gtk-go-down.png			\
++	   && $(LN_S) go-first-ltr.png gtk-goto-first-ltr.png		\
++	   && $(LN_S) go-home.png gtk-home.png				\
++	   && $(LN_S) go-jump-ltr.png gtk-jump-to-ltr.png		\
++	   && $(LN_S) go-jump-rtl.png gtk-jump-to-rtl.png		\
++	   && $(LN_S) go-last-ltr.png gtk-goto-last-ltr.png		\
++	   && $(LN_S) go-next-ltr.png gtk-go-forward-ltr.png		\
++	   && $(LN_S) go-previous-ltr.png gtk-go-back-ltr.png		\
++	   && $(LN_S) go-top.png gtk-goto-top.png			\
++	   && $(LN_S) go-up.png gtk-go-up.png				\
++	   && $(LN_S) help-about.png gtk-about.png			\
++	   && $(LN_S) help-contents.png gtk-help.png			\
++	   && $(LN_S) image-missing.png gtk-missing-image.png		\
++	   && $(LN_S) list-add.png gtk-add.png				\
++	   && $(LN_S) list-remove.png gtk-remove.png			\
++	   && $(LN_S) media-floppy.png gtk-floppy.png			\
++	   && $(LN_S) media-optical.png gtk-cdrom.png			\
++	   && $(LN_S) media-playback-pause.png gtk-media-pause.png	\
++	   && $(LN_S) media-playback-start-ltr.png gtk-media-play-ltr.png	\
++	   && $(LN_S) media-playback-start-rtl.png gtk-media-play-rtl.png	\
++	   && $(LN_S) media-playback-stop.png gtk-media-stop.png	\
++	   && $(LN_S) media-record.png gtk-media-record.png		\
++	   && $(LN_S) media-seek-backward-ltr.png gtk-media-rewind-ltr.png	\
++	   && $(LN_S) media-seek-forward-ltr.png gtk-media-forward-ltr.png	\
++	   && $(LN_S) media-skip-backward-ltr.png gtk-media-previous-ltr.png	\
++	   && $(LN_S) media-skip-forward-ltr.png gtk-media-next-ltr.png		\
++	   && $(LN_S) network-idle.png gtk-network.png			\
++	   && $(LN_S) printer-error.png gtk-print-error.png		\
++	   && $(LN_S) printer-info.png gtk-print-report.png		\
++	   && $(LN_S) printer-paused.png gtk-print-paused.png		\
++	   && $(LN_S) printer-warning.png gtk-print-warning.png		\
++	   && $(LN_S) process-stop.png gtk-stop.png			\
++	   && $(LN_S) system-run.png gtk-execute.png			\
++	   && $(LN_S) tools-check-spelling.png gtk-spell-check.png	\
++	   && $(LN_S) view-fullscreen.png gtk-fullscreen.png		\
++	   && $(LN_S) view-refresh.png gtk-refresh.png			\
++	   && $(LN_S) view-restore.png gtk-leave-fullscreen.png		\
++	   && $(LN_S) view-sort-ascending.png gtk-sort-ascending.png	\
++	   && $(LN_S) view-sort-descending.png gtk-sort-descending.png	\
++	   && $(LN_S) window-close.png gtk-close.png			\
++	   && $(LN_S) zoom-fit-best.png gtk-zoom-fit.png		\
++	   && $(LN_S) zoom-in.png gtk-zoom-in.png			\
++	   && $(LN_S) zoom-original.png gtk-zoom-100.png		\
++	   && $(LN_S) zoom-out.png gtk-zoom-out.png			\
+ 	) done 								\
+ 	&& touch stamp-icons
+ 
diff --git a/source/l/gtk+2/gtk+2.SlackBuild b/source/l/gtk+2/gtk+2.SlackBuild
index f60d0a55..efda2839 100755
--- a/source/l/gtk+2/gtk+2.SlackBuild
+++ b/source/l/gtk+2/gtk+2.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -68,23 +68,20 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-# There's been this long standing debate about PNG and -lz
-# and this patch is the workaround.  ;-)
-zcat $CWD/gtk.pnglz.diff.gz | patch -p1 --verbose || exit 1
+# Fix build errors
+zcat $CWD/fix_build_issues_on_tutorial_and_faq.diff.gz | patch -p1 --verbose || exit 1
 
 # Do not flood the console or .xsession-errors with "trouble ahead"
 # warnings (most noticable when using Firefox and Flash):
 zcat $CWD/gtk.xid.nowarningflood.diff.gz | patch -p1 --verbose || exit 1
 
-# Use /etc/gtk-2.0/$ARCH-slackware-linux instead of /etc/gtk-2.0/
-sed -i "s/GTK_SYSCONFDIR, \\\"gtk-2\\.0\\\"/GTK_SYSCONFDIR, \\\"gtk-2\\.0\\\", HOST/g" ./gtk/gtkrc.c ./gdk-pixbuf/gdk-pixbuf-io.c
-sed -i 's/sysconfdir)\\"/&      \\\n\t-DHOST=\\\"$(host_triplet)\\\"/g' \
-gdk-pixbuf/Makefile.am \
-gtk/Makefile.am \
-modules/input/Makefile.am
+# Use /etc/gtk-2.0/$ARCH-slackware-linux instead of /etc/gtk-2.0/ for gtk.immodules
+zcat $CWD/use_host_triplet_for_gtk_immodules.diff.gz | patch -p1 --verbose || exit 1
 
-# Use libpng-1.4.x:
-zcat $CWD/gtk.png14.diff.gz | patch -p1 --verbose || exit 1
+# Patch to restore commonly used icon names, otherwise everything breaks.
+# I fail to see the point of this "cleanup"
+zcat $CWD/gtk+-2.24.x.icon-compat.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gtk+-2.24.x.icon-compat.am.diff.gz | patch -p1 --verbose || exit 1
 
 # Regenerate ./configure:
 libtoolize --force
@@ -101,6 +98,8 @@ CFLAGS="$SLKCFLAGS -DHOST='"'"${ARCH}-slackware-linux"'"'" \
   --sysconfdir=/etc \
   --mandir=/usr/man \
   --with-xinput=yes \
+  --enable-xkb \
+  --disable-introspection \
   --build=$ARCH-slackware-linux
 
 make $NUMJOBS || make || exit 1
@@ -112,18 +111,26 @@ if [ "x$compile_host" != "x$host" ]; then
   echo "Host mismatch: compile='$compile_host', SlackBuild='$host'" && exit 1
 fi
 
-make install DESTDIR=$PKG \
+make install \
   RUN_QUERY_IMMODULES_TEST=false RUN_QUERY_LOADER_TEST=false \
+  DESTDIR=$PKG \
   || exit 1
 
-# I'm spamming your root partition because /etc/gtk-2.0 won't install to $DESTDIR
-make install || exit 1
+# You'll probably need to install the newly made package right away to
+# fix the result of this next line, but we had to clear this.  Sorry.
+rm -rf /etc/gtk-2.0
+# I'm spamming your root partition because /etc/gtk-2.0 won't install to $DESTDIR...
+make install 
 cp -a /etc/gtk-2.0/* $PKG/etc/gtk-2.0/ || exit 1
 rm -rf $PKG/etc/gtk-2.0/$host
 mkdir -p $PKG/etc/gtk-2.0/$host
-mv $PKG/etc/gtk-2.0/* $PKG/etc/gtk-2.0/$host/
+mv $PKG/etc/gtk-2.0/gtk.immodules $PKG/etc/gtk-2.0/$host/
 
-mv $PKG/etc/gtk-2.0/$host/im-multipress.conf $PKG/etc/gtk-2.0/$host/im-multipress.conf.new || exit 1
+# Don't clobber im-multipress.conf
+mv $PKG/etc/gtk-2.0/im-multipress.conf $PKG/etc/gtk-2.0/im-multipress.conf.new || exit 1
+
+# Install a "starter" gtkrc
+echo 'gtk-theme-name="GTK+"' > $PKG/etc/gtk-2.0/gtkrc.new
 
 # We need to have separate 32-bit and 64-bit binaries
 # for places where we have two copies of the GTK+ package installed.
@@ -131,29 +138,33 @@ mv $PKG/etc/gtk-2.0/$host/im-multipress.conf $PKG/etc/gtk-2.0/$host/im-multipres
 case "$host" in
   s390x*|x86_64*)
    mv $PKG/usr/bin/gtk-query-immodules-2.0{,-64}
-   mv $PKG/usr/bin/gdk-pixbuf-query-loaders{,-64}
    ( cd $PKG/usr/bin
      ln -sf gtk-query-immodules-2.0-64 gtk-query-immodules-2.0
-     ln -sf gdk-pixbuf-query-loaders-64 gdk-pixbuf-query-loaders
    )
    ;;
   *)
    mv $PKG/usr/bin/gtk-query-immodules-2.0{,-32}
-   mv $PKG/usr/bin/gdk-pixbuf-query-loaders{,-32}
    ( cd $PKG/usr/bin
      ln -sf gtk-query-immodules-2.0-32 gtk-query-immodules-2.0
-     ln -sf gdk-pixbuf-query-loaders-32 gdk-pixbuf-query-loaders
    )
    ;;
 esac
 
 # Install wrappers for the binaries:
-cp $CWD/update-gdk-pixbuf-loaders $PKG/usr/bin/update-gdk-pixbuf-loaders
-cp $CWD/update-gtk-immodules $PKG/usr/bin/update-gtk-immodules
+cp -a $CWD/update-gtk-immodules* $PKG/usr/bin
+chown root:root $PKG/usr/bin/update-*
 chmod 0755 $PKG/usr/bin/update-*
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+# Add profile scripts to set up GTK+ environment:
+mkdir -p $PKG/etc/profile.d
+cp -a $CWD/profile.d/* $PKG/etc/profile.d
+chmod 0755 $PKG/etc/profile.d/*
+
+# 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 if needed symlink the man pages:
 if [ -d $PKG/usr/man ]; then
@@ -172,13 +183,12 @@ fi
 
 mkdir -p $PKG/usr/doc/gtk+-$VERSION
 cp -a \
-  AUTHORS COPYING NEWS README TODO \
+  AUTHORS COPYING* NEWS README* TODO \
   $PKG/usr/doc/gtk+-$VERSION
 ( cd $PKG/usr/doc/gtk+-$VERSION
-  ln -s /usr/share/gtk-doc/html/gail-libgail-util .
-  ln -s /usr/share/gtk-doc/html/gdk .
-  ln -s /usr/share/gtk-doc/html/gdk-pixbuf .
-  ln -s /usr/share/gtk-doc/html/gtk .
+  ln -s ../../share/gtk-doc/html/gail-libgail-util .
+  ln -s ../../share/gtk-doc/html/gdk .
+  ln -s ../../share/gtk-doc/html/gtk .
 )
 
 # If there's a ChangeLog, installing at least part of the recent history
@@ -189,13 +199,6 @@ if [ -r ChangeLog ]; then
   touch -r ChangeLog $DOCSDIR/ChangeLog
 fi
 
-# I'm almost inclined to think this stuff is obsolete but I don't know for sure.
-# I do know that leaving it in doesn't hurt (aside from a few wasted bytes, but
-# probably less than the comments here waste ;-)
-mkdir -p $PKG/etc/profile.d
-cp -a $CWD/profile.d/* $PKG/etc/profile.d
-chmod 755 $PKG/etc/profile.d/*
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
diff --git a/source/l/gtk+2/gtk.png14.diff b/source/l/gtk+2/gtk.png14.diff
deleted file mode 100644
index 20d709e4..00000000
--- a/source/l/gtk+2/gtk.png14.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./configure.in.orig	2010-01-11 14:57:36.000000000 -0600
-+++ ./configure.in	2010-02-12 00:48:04.000000000 -0600
-@@ -908,12 +908,12 @@
- 
- dnl Test for libpng
-   if test x$with_libpng != xno && test -z "$LIBPNG"; then
--    AC_MSG_CHECKING(for libpng12)
--    if $PKG_CONFIG --exists libpng12 ; then
-+    AC_MSG_CHECKING(for libpng14)
-+    if $PKG_CONFIG --exists libpng14 ; then
-         AC_MSG_RESULT(yes)
-         PNG='png'
--	PNG_DEP_CFLAGS_PACKAGES=libpng12
--	LIBPNG=`$PKG_CONFIG --libs libpng12`
-+	PNG_DEP_CFLAGS_PACKAGES=libpng14
-+	LIBPNG=`$PKG_CONFIG --libs libpng14`
-     else
-       AC_MSG_RESULT(no)
-       AC_CHECK_LIB(png, png_read_info,
diff --git a/source/l/gtk+2/gtk.pnglz.diff b/source/l/gtk+2/gtk.pnglz.diff
deleted file mode 100644
index 1f71bd84..00000000
--- a/source/l/gtk+2/gtk.pnglz.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur gtk+-2.18.4.orig/gdk-pixbuf/Makefile.in gtk+-2.18.4/gdk-pixbuf/Makefile.in
---- gtk+-2.18.4.orig/gdk-pixbuf/Makefile.in	2009-11-30 22:08:44.000000000 -0600
-+++ gtk+-2.18.4/gdk-pixbuf/Makefile.in	2009-12-03 21:57:10.541765261 -0600
-@@ -801,7 +801,7 @@
- LIBJASPER = @LIBJASPER@
- LIBJPEG = @LIBJPEG@
- LIBOBJS = @LIBOBJS@
--LIBPNG = @LIBPNG@
-+LIBPNG = @LIBPNG@ -lz
- LIBS = @LIBS@
- LIBTIFF = @LIBTIFF@
- LIBTOOL = @LIBTOOL@
diff --git a/source/l/gtk+2/profile.d/gtk+.sh b/source/l/gtk+2/profile.d/gtk+.sh
index 40b910ad..ff3d4927 100755
--- a/source/l/gtk+2/profile.d/gtk+.sh
+++ b/source/l/gtk+2/profile.d/gtk+.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
+
 GDK_USE_XFT=1
 export GDK_USE_XFT
diff --git a/source/l/gtk+2/update-gdk-pixbuf-loaders b/source/l/gtk+2/update-gdk-pixbuf-loaders
deleted file mode 100644
index 942ca186..00000000
--- a/source/l/gtk+2/update-gdk-pixbuf-loaders
+++ /dev/null
@@ -1,86 +0,0 @@
-#! /bin/sh
-# Updates the gdk-pixbuf.loaders in /etc/gtk-2.0/$host
-
-umask 022
-
-# Get the machine type from uname:
-host=$(uname -m)-slackware-linux
-
-# Fix $host for arm arch:
-case "$host" in
-  arm*) host=arm-slackware-linux-gnueabi ;;
-esac
-
-# Deriving /etc/gtk-2.0/$host location
-#
-# We have had problems in the past with build systems
-# changing host from i386 to i686 and appending/dropping
-# the -gnu suffix, so try to match up the $host we got
-# with whats actually there.
-if [ ! -d /etc/gtk-2.0/$host ]; then 
-   case "$host" in
-     i?86*) 
-         for d in $(ls -d /etc/gtk-2.0/i?86*); do
-           host=$(basename $d)
-           break
-         done
-     ;;
-   esac
-fi 
-
-FILE=/etc/gtk-2.0/$host/gdk-pixbuf.loaders
-
-case "$host" in
-  s390x*|x86_64*)
-   if [ -x /usr/bin/gdk-pixbuf-query-loaders-64 ]; then
-     if [ "$1" = "--verbose" ]; then
-       echo "Updating gdk-pixbuf.loaders for ${host}:"
-       echo "  /usr/bin/gdk-pixbuf-query-loaders-64 \\"
-       echo "  > $FILE"
-     fi
-     /usr/bin/gdk-pixbuf-query-loaders-64 > $FILE
-     # Check for x86_64 multilib:
-     if ls -d /etc/gtk-2.0/i?86* 1> /dev/null 2> /dev/null ; then
-       for d in $(ls -d /etc/gtk-2.0/i?86*); do
-         mlhost=$(basename $d)
-         break
-       done
-       if [ -r /etc/gtk-2.0/$mlhost/gdk-pixbuf.loaders -a \
-       -x /usr/bin/gdk-pixbuf-query-loaders-32 ]; then
-         FILE=/etc/gtk-2.0/$mlhost/gdk-pixbuf.loaders
-         if [ "$1" = "--verbose" ]; then
-           echo "Updating gdk-pixbuf.loaders for ${mlhost}:"
-           echo "  /usr/bin/gdk-pixbuf-query-loaders-32 \\"
-           echo "  > $FILE"
-         fi
-         /usr/bin/gdk-pixbuf-query-loaders-32 > $FILE
-       fi
-     fi
-   else
-     if [ "$1" = "--verbose" ]; then
-       echo "Updating gdk-pixbuf.loaders for ${host}:"
-       echo "  /usr/bin/gdk-pixbuf-query-loaders \\"
-       echo "  > $FILE"
-     fi
-     /usr/bin/gdk-pixbuf-query-loaders > $FILE
-   fi
-   ;;
-  *)
-   if [ -x /usr/bin/gdk-pixbuf-query-loaders-32 ]; then
-     if [ "$1" = "--verbose" ]; then
-       echo "Updating gdk-pixbuf.loaders for ${host}:"
-       echo "  /usr/bin/gdk-pixbuf-query-loaders-32 \\"
-       echo "  > $FILE"
-     fi
-     /usr/bin/gdk-pixbuf-query-loaders-32 > $FILE
-   else
-     if [ "$1" = "--verbose" ]; then
-       echo "Updating gdk-pixbuf.loaders for ${host}:"
-       echo "  /usr/bin/gdk-pixbuf-query-loaders \\"
-       echo "  > $FILE"
-     fi
-     /usr/bin/gdk-pixbuf-query-loaders > $FILE
-   fi
-   ;;
-esac
-
diff --git a/source/l/gtk+2/update-gtk-immodules b/source/l/gtk+2/update-gtk-immodules
index d913f69f..a56b3fdc 100644
--- a/source/l/gtk+2/update-gtk-immodules
+++ b/source/l/gtk+2/update-gtk-immodules
@@ -1,86 +1,12 @@
 #! /bin/sh
-# Updates the immodules in /etc/gtk-2.0/$host
-
-umask 022
-
-# Get the machine type from uname:
-host=$(uname -m)-slackware-linux
- 
-# Fix $host for arm arch:
-case "$host" in
-  arm*) host=arm-slackware-linux-gnueabi ;;
-esac
-
-# Deriving /etc/gtk-2.0/$host location
 #
-# We have had problems in the past with build systems
-# changing host from i386 to i686 and appending/dropping
-# the -gnu suffix, so try to match up the $host we got
-# with whats actually there.
-if [ ! -d /etc/gtk-2.0/$host ]; then
-   case "$host" in
-     i?86*)
-         for d in $(ls -d /etc/gtk-2.0/i?86*); do
-           host=$(basename $d)
-           break
-         done
-     ;;
-   esac
-fi
+# This is a wrapper script that calls update-gtk-immodules-2.0 (GTK+2)
+# and/or update-gtk-immodules-3.0 (GTK+3) to do the actual updating.
 
-FILE=/etc/gtk-2.0/$host/gtk.immodules
-
-case "$host" in
-  s390x*|x86_64*)
-   if [ -x /usr/bin/gtk-query-immodules-2.0-64 ]; then
-     if [ "$1" = "--verbose" ]; then
-       echo "Updating gtk.immodules for ${host}:"
-       echo "  /usr/bin/gtk-query-immodules-2.0-64 \\"
-       echo "  > $FILE"
-     fi
-     /usr/bin/gtk-query-immodules-2.0-64 > $FILE
-     # Check for x86_64 multilib:
-     if ls -d /etc/gtk-2.0/i?86* 1> /dev/null 2> /dev/null ; then
-       for d in $(ls -d /etc/gtk-2.0/i?86*); do
-         mlhost=$(basename $d)
-         break
-       done
-       if [ -r /etc/gtk-2.0/$mlhost/gtk.immodules -a \
-       -x /usr/bin/gtk-query-immodules-2.0-32 ]; then
-         FILE=/etc/gtk-2.0/$mlhost/gtk.immodules
-         if [ "$1" = "--verbose" ]; then
-           echo "Updating gtk.immodules for ${mlhost}:"
-           echo "  /usr/bin/gtk-query-immodules-2.0-32 \\"
-           echo "  > $FILE"
-         fi
-         /usr/bin/gtk-query-immodules-2.0-32 > $FILE
-       fi
-     fi
-   else
-     if [ "$1" = "--verbose" ]; then
-       echo "Updating gtk.immodules for ${host}:"
-       echo "  /usr/bin/gtk-query-immodules-2.0 \\"
-       echo "  > $FILE"
-     fi
-     /usr/bin/gtk-query-immodules-2.0 > $FILE
-   fi
-   ;;
-  *)
-   if [ -x /usr/bin/gtk-query-immodules-2.0-32 ]; then
-     if [ "$1" = "--verbose" ]; then
-       echo "Updating gtk.immodules for ${host}:"
-       echo "  /usr/bin/gtk-query-immodules-2.0-32 \\"
-       echo "  > $FILE"
-     fi
-     /usr/bin/gtk-query-immodules-2.0-32 > $FILE
-   else
-     if [ "$1" = "--verbose" ]; then
-       echo "Updating gtk.immodules for ${host}:"
-       echo "  /usr/bin/gtk-query-immodules-2.0 \\"
-       echo "  > $FILE"
-     fi
-     /usr/bin/gtk-query-immodules-2.0 > $FILE
-   fi
-   ;;
-esac
+if [ -x /usr/bin/update-gtk-immodules-2.0 ]; then
+  /usr/bin/update-gtk-immodules-2.0 $*
+fi
+if [ -x /usr/bin/update-gtk-immodules-3.0 ]; then
+  /usr/bin/update-gtk-immodules-3.0 $*
+fi
 
diff --git a/source/l/gtk+2/update-gtk-immodules-2.0 b/source/l/gtk+2/update-gtk-immodules-2.0
new file mode 100644
index 00000000..d913f69f
--- /dev/null
+++ b/source/l/gtk+2/update-gtk-immodules-2.0
@@ -0,0 +1,86 @@
+#! /bin/sh
+# Updates the immodules in /etc/gtk-2.0/$host
+
+umask 022
+
+# Get the machine type from uname:
+host=$(uname -m)-slackware-linux
+ 
+# Fix $host for arm arch:
+case "$host" in
+  arm*) host=arm-slackware-linux-gnueabi ;;
+esac
+
+# Deriving /etc/gtk-2.0/$host location
+#
+# We have had problems in the past with build systems
+# changing host from i386 to i686 and appending/dropping
+# the -gnu suffix, so try to match up the $host we got
+# with whats actually there.
+if [ ! -d /etc/gtk-2.0/$host ]; then
+   case "$host" in
+     i?86*)
+         for d in $(ls -d /etc/gtk-2.0/i?86*); do
+           host=$(basename $d)
+           break
+         done
+     ;;
+   esac
+fi
+
+FILE=/etc/gtk-2.0/$host/gtk.immodules
+
+case "$host" in
+  s390x*|x86_64*)
+   if [ -x /usr/bin/gtk-query-immodules-2.0-64 ]; then
+     if [ "$1" = "--verbose" ]; then
+       echo "Updating gtk.immodules for ${host}:"
+       echo "  /usr/bin/gtk-query-immodules-2.0-64 \\"
+       echo "  > $FILE"
+     fi
+     /usr/bin/gtk-query-immodules-2.0-64 > $FILE
+     # Check for x86_64 multilib:
+     if ls -d /etc/gtk-2.0/i?86* 1> /dev/null 2> /dev/null ; then
+       for d in $(ls -d /etc/gtk-2.0/i?86*); do
+         mlhost=$(basename $d)
+         break
+       done
+       if [ -r /etc/gtk-2.0/$mlhost/gtk.immodules -a \
+       -x /usr/bin/gtk-query-immodules-2.0-32 ]; then
+         FILE=/etc/gtk-2.0/$mlhost/gtk.immodules
+         if [ "$1" = "--verbose" ]; then
+           echo "Updating gtk.immodules for ${mlhost}:"
+           echo "  /usr/bin/gtk-query-immodules-2.0-32 \\"
+           echo "  > $FILE"
+         fi
+         /usr/bin/gtk-query-immodules-2.0-32 > $FILE
+       fi
+     fi
+   else
+     if [ "$1" = "--verbose" ]; then
+       echo "Updating gtk.immodules for ${host}:"
+       echo "  /usr/bin/gtk-query-immodules-2.0 \\"
+       echo "  > $FILE"
+     fi
+     /usr/bin/gtk-query-immodules-2.0 > $FILE
+   fi
+   ;;
+  *)
+   if [ -x /usr/bin/gtk-query-immodules-2.0-32 ]; then
+     if [ "$1" = "--verbose" ]; then
+       echo "Updating gtk.immodules for ${host}:"
+       echo "  /usr/bin/gtk-query-immodules-2.0-32 \\"
+       echo "  > $FILE"
+     fi
+     /usr/bin/gtk-query-immodules-2.0-32 > $FILE
+   else
+     if [ "$1" = "--verbose" ]; then
+       echo "Updating gtk.immodules for ${host}:"
+       echo "  /usr/bin/gtk-query-immodules-2.0 \\"
+       echo "  > $FILE"
+     fi
+     /usr/bin/gtk-query-immodules-2.0 > $FILE
+   fi
+   ;;
+esac
+
diff --git a/source/l/gtk+2/use_host_triplet_for_gtk_immodules.diff b/source/l/gtk+2/use_host_triplet_for_gtk_immodules.diff
new file mode 100644
index 00000000..7f86d38d
--- /dev/null
+++ b/source/l/gtk+2/use_host_triplet_for_gtk_immodules.diff
@@ -0,0 +1,23 @@
+diff -Nur gtk+-2.24.0.orig/gtk/Makefile.am gtk+-2.24.0/gtk/Makefile.am
+--- gtk+-2.24.0.orig/gtk/Makefile.am	2011-01-06 22:41:26.000000000 -0600
++++ gtk+-2.24.0/gtk/Makefile.am	2011-02-11 08:52:32.734533831 -0600
+@@ -38,6 +38,7 @@
+ 	-DGTK_DATADIR=\"$(datadir)\"			\
+ 	-DGTK_DATA_PREFIX=\"$(prefix)\"			\
+ 	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"		\
++	-DHOST=\"$(host_triplet)\"			\
+ 	-DGTK_VERSION=\"$(GTK_VERSION)\"		\
+ 	-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"	\
+ 	-DGTK_HOST=\"$(host)\"				\
+diff -Nur gtk+-2.24.0.orig/gtk/gtkrc.c gtk+-2.24.0/gtk/gtkrc.c
+--- gtk+-2.24.0.orig/gtk/gtkrc.c	2011-01-26 13:46:37.000000000 -0600
++++ gtk+-2.24.0/gtk/gtkrc.c	2011-02-11 08:54:35.145348489 -0600
+@@ -450,7 +450,7 @@
+       if (im_module_file)
+ 	result = g_strdup (im_module_file);
+       else
+-	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
++	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", HOST, "gtk.immodules", NULL);
+     }
+ 
+   return result;
diff --git a/source/l/gtkspell/gtkspell.SlackBuild b/source/l/gtkspell/gtkspell.SlackBuild
index 88e66548..daa56100 100755
--- a/source/l/gtkspell/gtkspell.SlackBuild
+++ b/source/l/gtkspell/gtkspell.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +22,21 @@
 
 
 PKGNAM=gtkspell
-VERSION=${VERSION:-$(echo $(basename $(echo $PRGNAM-*.tar.bz2 | cut -f 2 -d -) .tar.bz2) | cut -f 2 -d -)}
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-${PKGNAM}
@@ -42,11 +52,14 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
 cd ${PKGNAM}-$VERSION
 
 # Make sure ownerships and permissions are sane:
diff --git a/source/l/hal/hal.SlackBuild b/source/l/hal/hal.SlackBuild
index 96713686..57d9e3bc 100755
--- a/source/l/hal/hal.SlackBuild
+++ b/source/l/hal/hal.SlackBuild
@@ -23,7 +23,7 @@
 
 PKGNAM=hal
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 NUMJOBS=${NUMJOBS:--j7}
 
@@ -90,6 +90,17 @@ zcat $CWD/patches/fix_ioperm_arguments.patch.gz | patch -p1 --verbose || exit 1
 # Fix segfaults from not calling dbus_error_init() early enough
 zcat $CWD/patches/fix_segfault-dbus_error_init.patch.gz | patch -p1 --verbose || exit 1
 
+# Ignore internal DM devices with new DM udev rules
+# https://bugzilla.redhat.com/show_bug.cgi?id=613909
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=586286 
+zcat $CWD/patches/ignore_internal_dm_devices.diff.gz | patch -p1 --verbose || exit 1
+
+# Fix build with automake 1.11.1
+zcat $CWD/patches/fix-build-with-automake-1.11.1.patch | patch -p1 --verbose || exit 1
+
+# Fix segfault in hald/linux/device.c
+zcat $CWD/patches/fix-hal-segfault.patch | patch -p1 --verbose || exit 1
+
 autoconf
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -107,7 +118,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-pid-file=/var/run/hald/pid \
   --enable-parted \
   --disable-policy-kit \
-  --disable-console-kit \
+  --enable-console-kit \
   --disable-acl-management \
   --enable-umount-helper \
   --enable-sonypic \
diff --git a/source/l/hal/patches/fix-build-with-automake-1.11.1.patch b/source/l/hal/patches/fix-build-with-automake-1.11.1.patch
new file mode 100644
index 00000000..13d1817c
--- /dev/null
+++ b/source/l/hal/patches/fix-build-with-automake-1.11.1.patch
@@ -0,0 +1,27 @@
+From ce8422fc8ec4881c5e54b651af3ef4ce2ca96847 Mon Sep 17 00:00:00 2001
+From: Bernhard Rosenkraenzer <bero@arklinux.org>
+Date: Mon, 23 Aug 2010 14:50:40 +0200
+Subject: [PATCH] fix build with automake 1.11.1
+
+Fixed build with automake 1.11.1: whitespace following trailing backslash.
+fd.o#29085
+---
+ policy/Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/policy/Makefile.am b/policy/Makefile.am
+index b506a08..503e9f3 100644
+--- a/policy/Makefile.am
++++ b/policy/Makefile.am
+@@ -24,7 +24,7 @@ check:
+ 	      then \
+                 echo ok; \
+             else \
+-                echo failed; \ 
++                echo failed; \
+ 		exit 1; \
+             fi; \
+         done;
+-- 
+1.7.3.2
+
diff --git a/source/l/hal/patches/fix-hal-segfault.patch b/source/l/hal/patches/fix-hal-segfault.patch
new file mode 100644
index 00000000..4e409e31
--- /dev/null
+++ b/source/l/hal/patches/fix-hal-segfault.patch
@@ -0,0 +1,33 @@
+From fc9571c07a81aba8a8fdaa8014d4034b6456d203 Mon Sep 17 00:00:00 2001
+From: Michael Schroeder <mls@novell.com>
+Date: Mon, 23 Aug 2010 16:13:13 +0200
+Subject: [PATCH] fix hal segfault
+
+Fixed hal segfault. It crashes because strlen() gets called with a
+NULL pointer (ppdev_compute_udi calls hal_util_get_last_element
+with a NULL pointer).
+
+bnc#556485
+---
+ hald/linux/device.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/hald/linux/device.c b/hald/linux/device.c
+index 8570d46..401dc44 100644
+--- a/hald/linux/device.c
++++ b/hald/linux/device.c
+@@ -2287,9 +2287,10 @@ ppdev_compute_udi (HalDevice *d)
+ 	gchar udi[256];
+ 	const char *name;
+ 
+-	name = hal_util_get_last_element( hal_device_property_get_string(d, "linux.device_file"));
++	name = hal_device_property_get_string (d, "linux.device_file");
+ 
+ 	if (name) {
++		name = hal_util_get_last_element (name);
+ 		hald_compute_udi (udi, sizeof (udi), "/org/freedesktop/Hal/devices/ppdev_%s", name);
+ 	} else {
+ 		hald_compute_udi (udi, sizeof (udi), "/org/freedesktop/Hal/devices/ppdev");
+-- 
+1.7.3.2
+
diff --git a/source/l/hal/patches/ignore_internal_dm_devices.diff b/source/l/hal/patches/ignore_internal_dm_devices.diff
new file mode 100644
index 00000000..735a45f3
--- /dev/null
+++ b/source/l/hal/patches/ignore_internal_dm_devices.diff
@@ -0,0 +1,47 @@
+From 6f16321da13f6a7cbd9c424ddba2e727e434fa25 Mon Sep 17 00:00:00 2001
+From: Milan Broz <mbroz@redhat.com>
+Date: Tue, 13 Jul 2010 16:07:32 +0200
+Subject: [PATCH] HAL: Ignore internal DM devices with new DM udev rules
+
+With new device-mapper udev rules are /dev/mapper/* symlinks
+to basic device name /dev/dm-X.
+(Change requested by udev upstream.)
+
+This change breaks temporary-cryptsetup workaround inside hal.
+
+With new dm-udev rules (uncluded since device-mapper 1.02.39)
+there is DM_UDEV_DISABLE_OTHER_RULES_FLAG variable
+which controls that scan should be ignored for this device
+(it is set for all internal devices, including temporary cryptsetup,
+internal parts of lvm devices etc.)
+
+Ignore device if this flag is set.
+
+See bugs
+https://bugzilla.redhat.com/show_bug.cgi?id=613909
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=586286
+
+Signed-off-by: Milan Broz <mbroz@redhat.com>
+---
+ hald/linux/osspec.c |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/hald/linux/osspec.c b/hald/linux/osspec.c
+index a8233fd..6d616bc 100644
+--- a/hald/linux/osspec.c
++++ b/hald/linux/osspec.c
+@@ -215,6 +215,11 @@ hald_udev_data (GIOChannel *source, GIOCondition condition, gpointer user_data)
+ 				g_free (str);
+ 			}
+ 			g_free (dstr);
++		} else if (strncmp(key, "DM_UDEV_DISABLE_OTHER_RULES_FLAG=", 33) == 0) {
++			if (strtoul(&key[33], NULL, 10) == 1) {
++				HAL_INFO (("ignoring device requested by DM udev rules"));
++				goto invalid;
++			}
+ 		}
+ 	}
+ 
+-- 
+1.7.3.2
+
diff --git a/source/l/icon-naming-utils/icon-naming-utils.SlackBuild b/source/l/icon-naming-utils/icon-naming-utils.SlackBuild
index 7db3da90..30c20804 100755
--- a/source/l/icon-naming-utils/icon-naming-utils.SlackBuild
+++ b/source/l/icon-naming-utils/icon-naming-utils.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
  
-# Copyright 2008, 2009 Patrick Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,10 +21,20 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
 
-VERSION=0.8.90
-ARCH=${ARCH:-x86_64}
+PKGNAM=icon-naming-utils
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 if [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 else
@@ -39,7 +49,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf icon-naming-utils-$VERSION
-tar xvf $CWD/icon-naming-utils-$VERSION.tar.gz || exit 1
+tar xvf $CWD/icon-naming-utils-$VERSION.tar.?z* || exit 1
 cd icon-naming-utils-$VERSION || exit 1
 
 zcat $CWD/icon-naming-utils.pkgconfigdir.diff.gz | patch -p1 || exit 1
diff --git a/source/l/ilmbase/ilmbase.SlackBuild b/source/l/ilmbase/ilmbase.SlackBuild
index 2426d84b..9f2705d9 100755
--- a/source/l/ilmbase/ilmbase.SlackBuild
+++ b/source/l/ilmbase/ilmbase.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2007  Heinz Wiesinger <hmwiesinger@gmx.at>
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,15 +24,25 @@
 # Modified by Robby Workman <rworkman@slackbuilds.org>
 
 
-PRGNAM=ilmbase
-VERSION=1.0.1
-ARCH=${ARCH:-x86_64}
+PKGNAM=ilmbase
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:--j6}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -43,14 +53,20 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
-cd $PRGNAM-$VERSION || exit 1
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION || exit 1
+
+zcat $CWD/ilmbase.gcc4.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 \) \
@@ -74,14 +90,14 @@ 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/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   AUTHORS COPYING* INSTALL LICENSE NEWS README* \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+  $PKG/usr/doc/$PKGNAM-$VERSION
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source/l/ilmbase/ilmbase.gcc4.diff b/source/l/ilmbase/ilmbase.gcc4.diff
new file mode 100644
index 00000000..31137a12
--- /dev/null
+++ b/source/l/ilmbase/ilmbase.gcc4.diff
@@ -0,0 +1,10 @@
+--- ./Imath/ImathMatrix.h.orig	2010-07-16 17:48:40.000000000 -0500
++++ ./Imath/ImathMatrix.h	2010-08-09 14:12:07.000000000 -0500
+@@ -49,6 +49,7 @@
+ #include "ImathVec.h"
+ #include "ImathShear.h"
+ 
++#include <cstring>
+ #include <iostream>
+ #include <iomanip>
+ 
diff --git a/source/l/imlib/imlib.SlackBuild b/source/l/imlib/imlib.SlackBuild
index e0b2627d..d9f2cca3 100755
--- a/source/l/imlib/imlib.SlackBuild
+++ b/source/l/imlib/imlib.SlackBuild
@@ -23,7 +23,7 @@
 
 VERSION=1.9.15
 NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-6}
+BUILD=${BUILD:-7}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/l/iso-codes/iso-codes.SlackBuild b/source/l/iso-codes/iso-codes.SlackBuild
index ccf423dc..d2a6e714 100755
--- a/source/l/iso-codes/iso-codes.SlackBuild
+++ b/source/l/iso-codes/iso-codes.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2008 Heinz Wiesinger <pprkut@liwjatan.at>
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,22 +22,22 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-PRGNAM=iso-codes
-VERSION=3.8
+PKGNAM=iso-codes
+VERSION=3.24.2
 ARCH=${ARCH:-noarch}
 BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:--j6}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
+NUMJOBS=${NUMJOBS:--j6}
 
 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
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1
+cd $PKGNAM-$VERSION || exit 1
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -55,14 +55,22 @@ CXXFLAGS="$SLKCFLAGS" \
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  ChangeLog INSTALL LICENSE README TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+  COPYING* INSTALL LICENSE README* TODO \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source/l/jre b/source/l/jre
new file mode 120000
index 00000000..275d98ff
--- /dev/null
+++ b/source/l/jre
@@ -0,0 +1 @@
+../local/jre
\ No newline at end of file
diff --git a/source/l/jre/COPYRIGHT b/source/l/jre/COPYRIGHT
deleted file mode 100644
index ee5019b5..00000000
--- a/source/l/jre/COPYRIGHT
+++ /dev/null
@@ -1,74 +0,0 @@
-Copyright © 2010 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-California 95054, U.S.A.  All rights reserved.
-
-Sun Microsystems, Inc.  has intellectual property rights relating to
-technology embodied in the product that is described in this document.
-In particular, and without limitation, these intellectual property
-rights may include one or more of the U.S.  patents listed at
-http://www.sun.com/patents and one or more additional patents or pending
-patent applications in the U.S.  and in other countries.
-
-THIS PRODUCT CONTAINS CONFIDENTIAL INFORMATION AND TRADE SECRETS OF SUN
-MICROSYSTEMS, INC.  USE, DISCLOSURE OR REPRODUCTION IS PROHIBITED
-WITHOUT THE PRIOR EXPRESS WRITTEN PERMISSION OF SUN MICROSYSTEMS, INC.
-
-U.S.  Government Rights - Commercial software.  Government users are
-subject to the Sun Microsystems, Inc.  standard license agreement and
-applicable provisions of the FAR and its supplements.
-
-Use is subject to license terms.
-
-This distribution may include materials developed by third parties.
-
-Sun, Sun Microsystems, the Sun logo, Java and Java SE are trademarks or
-registered trademarks of Sun Microsystems, Inc.  in the U.S.  and other
-countries.
-
-This product is covered and controlled by U.S.  Export Control laws and
-may be subject to the export or import laws in other countries.
-Nuclear, missile, chemical biological weapons or nuclear maritime end
-uses or end users, whether direct or indirect, are strictly prohibited.
-Export or reexport to countries subject to U.S.  embargo or to entities
-identified on U.S.  export exclusion lists, including, but not limited
-to, the denied persons and specially designated nationals lists is
-strictly prohibited.
-
-Copyright © 2010 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-California 95054, Etats-Unis.  Tous droits rservs.
-
-Sun Microsystems, Inc.  dtient les droits de proprit intellectuele
-relatifs la technologie incorpore dans le produit qui est dcrit dans ce
-document.  En particulier, et ce sans limitation, ces droits de proprit
-intellectuelle peuvent inclure un ou plusieurs des brevets amricains
-lists l'adresse suivante:  http://www.sun.com/patents et un ou
-plusieures de brevet en attente aux Etats - Unis et dans les autres
-pays.
-
-CE PRODUIT CONTIENT DES INFORMATIONS CONFIDENTIELLES ET DES SECRETS
-COMMERCIAUX DE SUN MICROSYSTEMS, INC.  SON UTILISATION, SA DIVULGATION
-ET SA REPRODUCTION SONT INTERDITES SANS L AUTORISATION EXPRESSE, ECRITE
-ET PREALABLE DE SUN MICROSYSTEMS, INC.
-
-L'utilisation est soumise aux termes du contract de licence.
-
-Cette distributions peut inclure des elements dvelopps par des tiers.
-
-Sun, Sun Microsystems, le logo Sun, Java et Java SE sont des marques de
-fabrique ou des marques dposes de Sun Microsystems, Inc.  aux Etats-Unis
-et dans d'autres pays.
-
-Ce produit est soumis la lgislation amricaine en matire de contrle des
-exportations et peut tre soumis la rglementation en vigueur dans
-d'autres pays dans le domaine des exportations et importations.  Les
-utilisations finales, ou utilisateurs finaux, pour des armes
-nuclaires,des missiles, des armes biologiques et chimiques ou du
-nuclaire maritime, directement ou indirectement, sont strictement
-interdites.  Les exportations ou rexportations vers les pays sous
-embargo amricain, ou vers des entits figurant sur les listes d'exclusion
-d'exportation des produits ou des services qui sont regis parla
-legislation amricaines, y compris, mais de manire non exhaustive, la
-liste de personnes qui font objet d'un ordre de ne pas participer, d'une
-faon directe ou indirecte, aux exportations des produits ou des services
-qui sont rgis par la lgislation amricaine sur le contrle des
-exportations et la liste de ressortissants spcifiquement dsigns, sont
-rigoureusement interdites.
diff --git a/source/l/jre/LICENSE b/source/l/jre/LICENSE
deleted file mode 100644
index 46280da2..00000000
--- a/source/l/jre/LICENSE
+++ /dev/null
@@ -1,261 +0,0 @@
-Sun Microsystems, Inc.  Binary Code License Agreement
-
-for the JAVA SE RUNTIME ENVIRONMENT (JRE) VERSION 6 and
-JAVAFX RUNTIME VERSION 1
-
-SUN MICROSYSTEMS, INC.  ("SUN") IS WILLING TO LICENSE THE
-SOFTWARE IDENTIFIED BELOW TO YOU ONLY UPON THE CONDITION
-THAT YOU ACCEPT ALL OF THE TERMS CONTAINED IN THIS BINARY
-CODE LICENSE AGREEMENT AND SUPPLEMENTAL LICENSE TERMS
-(COLLECTIVELY "AGREEMENT"). PLEASE READ THE AGREEMENT
-CAREFULLY.  BY USING THE SOFTWARE YOU ACKNOWLEDGE THAT 
-YOU HAVE READ THE TERMS AND AGREE TO THEM. IF YOU ARE 
-AGREEING TO THESE TERMS ON BEHALF OF A COMPANY OR OTHER 
-LEGAL ENTITY, YOU REPRESENT THAT YOU HAVE THE LEGAL 
-AUTHORITY TO BIND THE LEGAL ENTITY TO THESE TERMS. IF 
-YOU DO NOT HAVE SUCH AUTHORITY, OR IF YOU DO NOT WISH 
-TO BE BOUND BY THE TERMS, THEN YOU MUST NOT USE THE
-SOFTWARE ON THIS SITE OR ANY OTHER MEDIA ON WHICH THE 
-SOFTWARE IS CONTAINED.
-
-1.  DEFINITIONS.  "Software" means the identified above in
-binary form, any other machine readable materials
-(including, but not limited to, libraries, source files,
-header files, and data files), any updates or error
-corrections provided by Sun, and any user manuals,
-programming guides and other documentation provided to you
-by Sun under this Agreement.  "General Purpose Desktop
-Computers and Servers" means computers, including desktop
-and laptop computers, or servers, used for general
-computing functions under end user control (such as but not
-specifically limited to email, general purpose Internet
-browsing, and office suite productivity tools).  The use of
-Software in systems and solutions that provide dedicated
-functionality (other than as mentioned above) or designed
-for use in embedded or function-specific software
-applications, for example but not limited to: Software
-embedded in or bundled with industrial control systems,
-wireless mobile telephones, wireless handheld devices, 
-netbooks, kiosks, TV/STB, Blu-ray Disc devices, telematics 
-and network control switching equipment, printers and 
-storage management systems, and other related systems are 
-excluded from this definition and not licensed under this 
-Agreement. "Programs" means (a) Java technology applets and
-applications intended to run on the Java Platform Standard
-Edition (Java SE) platform on Java-enabled General Purpose
-Desktop Computers and Servers, and (b) JavaFX technology
-applications intended to run on the JavaFX Runtime on
-JavaFX-enabled General Purpose Desktop Computers and
-Servers.
-
-2.  LICENSE TO USE.  Subject to the terms and conditions of
-this Agreement, including, but not limited to the Java
-Technology Restrictions of the Supplemental License Terms,
-Sun grants you a non-exclusive, non-transferable, limited
-license without license fees to reproduce and use internally
-Software complete and unmodified for the sole purpose of
-running Programs.  Additional licenses for developers and/or
-publishers are granted in the Supplemental License Terms.
-
-3.  RESTRICTIONS.  Software is confidential and copyrighted.
-Title to Software and all associated intellectual property
-rights is retained by Sun and/or its licensors.  Unless
-enforcement is prohibited by applicable law, you may not
-modify, decompile, or reverse engineer Software.  You
-acknowledge that Licensed Software is not designed or
-intended for use in the design, construction, operation or
-maintenance of any nuclear facility.  Sun Microsystems, Inc.
-disclaims any express or implied warranty of fitness for
-such uses.  No right, title or interest in or to any
-trademark, service mark, logo or trade name of Sun or its
-licensors is granted under this Agreement.  Additional
-restrictions for developers and/or publishers licenses are
-set forth in the Supplemental License Terms.
-
-4.  LIMITED WARRANTY.  Sun warrants to you that for a period
-of ninety (90) days from the date of purchase, as evidenced
-by a copy of the receipt, the media on which Software is
-furnished (if any) will be free of defects in materials and
-workmanship under normal use.  Except for the foregoing,
-Software is provided "AS IS".  Your exclusive remedy and
-Sun's entire liability under this limited warranty will be
-at Sun's option to replace Software media or refund the fee
-paid for Software.  Any implied warranties on the Software
-are limited to 90 days.  Some states do not allow
-limitations on duration of an implied warranty, so the above
-may not apply to you.  This limited warranty gives you
-specific legal rights.  You may have others, which vary from
-state to state.
-
-5.  DISCLAIMER OF WARRANTY.  UNLESS SPECIFIED IN THIS
-AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS,
-REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED
-WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE OR NON-INFRINGEMENT ARE DISCLAIMED, EXCEPT TO THE
-EXTENT THAT THESE DISCLAIMERS ARE HELD TO BE LEGALLY
-INVALID.
-
-6.  LIMITATION OF LIABILITY.  TO THE EXTENT NOT PROHIBITED
-BY LAW, IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR
-ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, INDIRECT,
-CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER
-CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF
-OR RELATED TO THE USE OF OR INABILITY TO USE SOFTWARE, EVEN
-IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-In no event will Sun's liability to you, whether in
-contract, tort (including negligence), or otherwise, exceed
-the amount paid by you for Software under this Agreement.
-The foregoing limitations will apply even if the above
-stated warranty fails of its essential purpose.  Some states
-do not allow the exclusion of incidental or consequential
-damages, so some of the terms above may not be applicable to
-you.
-
-7.  TERMINATION.  This Agreement is effective until
-terminated.  You may terminate this Agreement at any time by
-destroying all copies of Software.  This Agreement will
-terminate immediately without notice from Sun if you fail to
-comply with any provision of this Agreement.  Either party
-may terminate this Agreement immediately should any Software
-become, or in either party's opinion be likely to become,
-the subject of a claim of infringement of any intellectual
-property right.  Upon Termination, you must destroy all
-copies of Software.
-
-8.  EXPORT REGULATIONS.  All Software and technical data
-delivered under this Agreement are subject to US export
-control laws and may be subject to export or import
-regulations in other countries.  You agree to comply
-strictly with all such laws and regulations and acknowledge
-that you have the responsibility to obtain such licenses to
-export, re-export, or import as may be required after
-delivery to you.
-
-9.  TRADEMARKS AND LOGOS.  You acknowledge and agree as
-between you and Sun that Sun owns the SUN, SOLARIS, JAVA,
-JINI, FORTE, and iPLANET trademarks and all SUN, SOLARIS,
-JAVA, JINI, FORTE, and iPLANET-related trademarks, service
-marks, logos and other brand designations ("Sun Marks"), and
-you agree to comply with the Sun Trademark and Logo Usage
-Requirements currently located at
-http://www.sun.com/policies/trademarks.  Any use you make of
-the Sun Marks inures to Sun's benefit.
-
-10.  U.S.  GOVERNMENT RESTRICTED RIGHTS.  If Software is
-being acquired by or on behalf of the U.S.  Government or by
-a U.S.  Government prime contractor or subcontractor (at any
-tier), then the Government's rights in Software and
-accompanying documentation will be only as set forth in this
-Agreement; this is in accordance with 48 CFR 227.7201
-through 227.7202-4 (for Department of Defense (DOD)
-acquisitions) and with 48 CFR 2.101 and 12.212 (for non-DOD
-acquisitions).
-
-11.  GOVERNING LAW.  Any action related to this Agreement
-will be governed by California law and controlling U.S.
-federal law.  No choice of law rules of any jurisdiction
-will apply.
-
-12.  SEVERABILITY.  If any provision of this Agreement is
-held to be unenforceable, this Agreement will remain in
-effect with the provision omitted, unless omission would
-frustrate the intent of the parties, in which case this
-Agreement will immediately terminate.
-
-13.  INTEGRATION.  This Agreement is the entire agreement
-between you and Sun relating to its subject matter.  It
-supersedes all prior or contemporaneous oral or written
-communications, proposals, representations and warranties
-and prevails over any conflicting or additional terms of any
-quote, order, acknowledgment, or other communication between
-the parties relating to its subject matter during the term
-of this Agreement.  No modification of this Agreement will
-be binding, unless in writing and signed by an authorized
-representative of each party.
-
-SUPPLEMENTAL LICENSE TERMS
-
-These Supplemental License Terms add to or modify the terms
-of the Binary Code License Agreement.  Capitalized terms not
-defined in these Supplemental Terms shall have the same
-meanings ascribed to them in the Binary Code License
-Agreement .  These Supplemental Terms shall supersede any
-inconsistent or conflicting terms in the Binary Code License
-Agreement, or in any license contained within the Software.
-
-A.  Software Internal Use and Development License Grant.
-Subject to the terms and conditions of this Agreement and
-restrictions and exceptions set forth in the Software
-"README" file incorporated herein by reference, including,
-but not limited to the Java Technology Restrictions of these
-Supplemental Terms, Sun grants you a non-exclusive,
-non-transferable, limited license without fees to reproduce
-internally and use internally the Software complete and
-unmodified for the purpose of designing, developing, and
-testing your Programs.
-
-B.  License to Distribute Software.  Subject to the terms
-and conditions of this Agreement and restrictions and
-exceptions set forth in the Software README file, including,
-but not limited to the Java Technology Restrictions of these
-Supplemental Terms, Sun grants you a non-exclusive,
-non-transferable, limited license without fees to reproduce
-and distribute the Software (except for the JavaFX Runtime),
-provided that (i) you distribute the Software complete and
-unmodified and only bundled as part of, and for the sole
-purpose of running, your Programs, (ii) the Programs add
-significant and primary functionality to the Software, (iii)
-you do not distribute additional software intended to
-replace any component(s) of the Software, (iv) you do not
-remove or alter any proprietary legends or notices contained
-in the Software, (v) you only distribute the Software
-subject to a license agreement that protects Sun's interests
-consistent with the terms contained in this Agreement, and
-(vi) you agree to defend and indemnify Sun and its licensors
-from and against any damages, costs, liabilities, settlement
-amounts and/or expenses (including attorneys' fees) incurred
-in connection with any claim, lawsuit or action by any third
-party that arises or results from the use or distribution of
-any and all Programs and/or Software.
-
-C.  Java Technology Restrictions.  You may not create,
-modify, or change the behavior of, or authorize your
-licensees to create, modify, or change the behavior of,
-classes, interfaces, or subpackages that are in any way
-identified as "java", "javax", "sun" or similar convention
-as specified by Sun in any naming convention designation.
-
-D.  Source Code.  Software may contain source code that,
-unless expressly licensed for other purposes, is provided
-solely for reference purposes pursuant to the terms of this
-Agreement.  Source code may not be redistributed unless
-expressly provided for in this Agreement.
-
-E.  Third Party Code.  Additional copyright notices and
-license terms applicable to portions of the Software are set
-forth in the THIRDPARTYLICENSEREADME.txt file.  In addition
-to any terms and conditions of any third party
-opensource/freeware license identified in the
-THIRDPARTYLICENSEREADME.txt file, the disclaimer of warranty
-and limitation of liability provisions in paragraphs 5 and 6
-of the Binary Code License Agreement shall apply to all
-Software in this distribution.
-
-F.  Termination for Infringement.  Either party may
-terminate this Agreement immediately should any Software
-become, or in either party's opinion be likely to become,
-the subject of a claim of infringement of any intellectual
-property right.
-
-G.  Installation and Auto-Update.  The Software's
-installation and auto-update processes transmit a limited
-amount of data to Sun (or its service provider) about those
-specific processes to help Sun understand and optimize them.
-Sun does not associate the data with personally identifiable
-information.  You can find more information about the data
-Sun collects at http://java.com/data/.
-
-For inquiries please contact: Sun Microsystems, Inc., 4150
-Network Circle, Santa Clara, California 95054, U.S.A.
-
-
diff --git a/source/l/jre/README b/source/l/jre/README
deleted file mode 100644
index 002eae2f..00000000
--- a/source/l/jre/README
+++ /dev/null
@@ -1,376 +0,0 @@
-                              README
-
-                Java(TM) Platform, Standard Edition
-                        Runtime Environment
-                             Version 6
-
-
-The Java(TM) Platform, Standard Edition Runtime Environment (JRE(TM)),
-excluding the JavaFX(TM) runtime, is intended for software developers 
-and vendors to redistribute with their applications.
-
-The Java SE Runtime Environment contains the Java virtual machine,
-runtime class libraries, and Java application launcher that are
-necessary to run programs written in the Java programming language.
-It is not a development environment and does not contain development
-tools such as compilers or debuggers.  For development tools, see the
-Java SE Development Kit (JDK(TM)). The JRE installation triggers the 
-download of the JavaFX runtime. The JavaFX runtime is also available 
-separately, and is not part of the JRE. For information on JavaFX, and 
-how to make changes, go to: http://java.com/javafx
-
-
-=======================================================================
-     Deploying Applications with the Java SE Runtime Environment
-=======================================================================
-
-When you deploy an application written in the Java programming
-language, your software bundle will probably consist of the following
-parts:
-
-    Your own class, resource, and data files.
-    The Java SE Runtime Environment.
-    An installation procedure or program.
-
-You already have the first part, of course. The remainder of this
-document covers the other two parts. See also the Notes for Developers
-page on the Java Software website:
-
-    http://java.sun.com/javase/6/webnotes/runtime.html
-
------------------------------------------------------------------------
-Java Platform, Standard Edition Runtime Environment (JRE)
------------------------------------------------------------------------
-
-To run your application, a user needs the Java SE Runtime Environment,
-which is freely available from Sun. Or, you can redistribute the
-Java SE Runtime Environment for free with your application, according
-to the terms of the Java SE Platform Runtime Environment's license. The 
-JavaFX runtime is only required to run applications written in the 
-JavaFX scripting language; it is freely available from Sun, and must
-not be redistributed with your application.
-
-The final step in the deployment process occurs when the software is
-installed on an individual user's system. Installation consists of copying
-software onto the user's system, then configuring the user's system
-to support that software.  You should ensure that your installation
-procedure does not overwrite existing JRE installations, as they may
-be required by other applications.
-
-
-=======================================================================
-      Redistribution of the Java SE Runtime Environment (JRE)
-=======================================================================
-
-    --------------------------------------------------------
-    NOTE - The license for this software does not allow the
-    redistribution of beta and other pre-release versions.
-    --------------------------------------------------------
-
-Subject to the terms and conditions of the Software License
-Agreement and the obligations, restrictions, and exceptions set
-forth below, You may reproduce and distribute the Software (and
-also portions of Software identified below as Redistributable),
-provided that:
-
-(a) you distribute the Software complete and unmodified and only
-    bundled as part of your applets and applications ("Programs"),
-
-(b) your Programs add significant and primary functionality to the
-    Software,
-
-(c) your Programs are only intended to run on Java-enabled general
-    purpose desktop computers and servers,
-
-(d) you distribute Software for the sole purpose of running your
-    Programs,
-
-(e) you do not distribute additional software intended to replace
-    any component(s) of the Software,
-
-(f) you do not remove or alter any proprietary legends or notices
-    contained in or on the Software,
-
-(g) you only distribute the Software subject to a license agreement
-    that protects Sun's interests consistent with the terms
-    contained in this Agreement, and
-
-(h) you agree to defend and indemnify Sun and its licensors from
-    and against any damages, costs, liabilities, settlement amounts
-    and/or expenses (including attorneys' fees) incurred in
-    connection with any claim, lawsuit or action by any third party
-    that arises or results from the use or distribution of any and
-    all Programs and/or Software.
-
-The term "vendors" used here refers to licensees, developers, and
-independent software vendors (ISVs) who license and distribute the
-Java SE Runtime Environment with their programs.
-
-Vendors must follow the terms of the Java SE Runtime Environment Binary
-Code License agreement.
-
------------------------------------------------------------------------
-Required vs. Optional Files
------------------------------------------------------------------------
-
-The files that make up the Java SE Runtime Environment are divided into
-two categories: required and optional.  Optional files may be excluded
-from redistributions of the Java SE Runtime Environment at the
-vendor's discretion.
-
-The following section contains a list of the files and directories that
-may optionally be omitted from redistributions with the Java SE Runtime
-Environment.  All files not in these lists of optional files must be
-included in redistributions of the runtime environment.
-
------------------------------------------------------------------------
-Optional Files and Directories
------------------------------------------------------------------------
-
-The following files may be optionally excluded from redistributions.
-These files are located in the jre1.6.0_<version> directory, where
-<version> is the update version number.  Solaris and Linux filenames
-and separators are shown. Windows executables have the ".exe" suffix.
-Corresponding files with _g in the name can also be excluded.
-The corresponding man pages should be excluded for any excluded
-executables (with paths listed below beginning with bin/ , 
-for the Solaris(TM) Operating System and Linux). 
-
-    lib/charsets.jar
-	Character conversion classes
-    lib/ext/
-	sunjce_provider.jar - the SunJCE provider for Java
-	  Cryptography APIs
-	localedata.jar - contains many of the resources
-	  needed for non US English locales
-	ldapsec.jar - contains security features supported
-	  by the LDAP service provider
-	dnsns.jar - for the InetAddress wrapper of JNDI DNS provider
-    bin/rmid
-	Java RMI Activation System Daemon
-    bin/rmiregistry
-	Java Remote Object Registry
-    bin/tnameserv
-	Java IDL Name Server
-    bin/keytool
-	Key and Certificate Management Tool
-    bin/kinit
-	Used to obtain and cache Kerberos ticket-granting tickets
-    bin/klist
-	Kerberos display entries in credentials cache and keytab
-    bin/ktab
-	Kerberos key table manager
-    bin/policytool
-	Policy File Creation and Management Tool
-    bin/orbd
-	Object Request Broker Daemon
-    bin/servertool
-	Java IDL Server Tool
-    bin/javaws, lib/javaws/ and lib/javaws.jar
-	Java Web Start
-
-When redistributing the JRE on Microsoft Windows as a private
-application runtime (not accessible by other applications)
-with a custom launcher, the following files are also
-optional.  These are libraries and executables that are used
-for Java support in Internet Explorer and Mozilla family browsers;
-these files are not needed in a private JRE redistribution.
-
-    bin\java.exe
-    bin\javaw.exe
-    bin\javaws.exe
-    bin\javacpl.exe
-    bin\jucheck.exe
-    bin\jusched.exe
-
-    bin\wsdetect.dll
-    bin\NPJPI*.dll   (The filename changes in every release)
-    bin\NPJava11.dll
-    bin\NPJava12.dll
-    bin\NPJava13.dll
-    bin\NPJava14.dll
-    bin\NPJava32.dll
-    bin\NPOJI610.dll
-    bin\RegUtils.dll
-    bin\axbridge.dll
-    bin\deploy.dll
-    bin\jpicom.dll
-    bin\javacpl.cpl
-    bin\jpiexp.dll
-    bin\jpinscp.dll
-    bin\jpioji.dll
-    bin\jpishare.dll
-    lib\deploy.jar
-    lib\plugin.jar
-    lib\javaws.jar
-    lib\javaws\messages.properties
-    lib\javaws\messages_de.properties
-    lib\javaws\messages_es.properties
-    lib\javaws\messages_fr.properties
-    lib\javaws\messages_it.properties
-    lib\javaws\messages_ja.properties
-    lib\javaws\messages_ko.properties
-    lib\javaws\messages_sv.properties
-    lib\javaws\messages_zh_CN.properties
-    lib\javaws\messages_zh_HK.properties
-    lib\javaws\messages_zh_TW.properties
-    lib\javaws\miniSplash.jpg
-
-
------------------------------------------------------------------------
-Redistributable JDK(TM) Files
------------------------------------------------------------------------
-
-The limited set of files from the Java SE Development Kit (JDK)
-listed below may be included in vendor redistributions of the Java SE 
-Runtime Environment.  All paths are relative to the top-level
-directory of the JDK. The corresponding man pages should be included for
-any included executables (with paths listed below beginning with bin/ ,
-for the Solaris(TM) Operating System and Linux). 
-
-    jre/lib/cmm/PYCC.pf
-        Color profile.  This file is required only if one wishes to
-        convert between the PYCC color space and another color space.
-
-    All .ttf font files in the jre/lib/fonts directory. 
-        Note that the LucidaSansRegular.ttf font is already contained 
-        in the Java SE Runtime Environment, so there is no need to 
-        bring that file over from the JDK.
-
-    jre/lib/audio/soundbank.gm
-        This MIDI soundbank is present in the JDK, but it has
-        been removed from the Java SE Runtime Environment in order to
-        reduce the size of the Runtime Environment's download bundle.
-        However, a soundbank file is necessary for MIDI playback, and
-        therefore the JDK's soundbank.gm file may be included in
-        redistributions of the Runtime Environment at the vendor's
-        discretion. Several versions of enhanced MIDI soundbanks are
-        available from the Java Sound web site:
-        http://java.sun.com/products/java-media/sound/
-        These alternative soundbanks may be included in redistributions
-        of the Java SE Runtime Environment.
-
-    The javac bytecode compiler, consisting of the following files:
-        bin/javac           [Solaris(TM) Operating System
-                             and Linux]
-        bin/sparcv9/javac   [Solaris Operating System
-                             (SPARC(R) Platform Edition)]
-	bin/amd64/javac     [Solaris Operating System (AMD)]
-        bin/javac.exe       [Microsoft Windows]
-        lib/tools.jar       [All platforms]
-
-    The Annotation Processing Tool, consisting of the following files:
-        lib/tools.jar       [All platforms]  
-        bin/apt             [Solaris(TM) Operating System
-                             and Linux]
-        bin/sparcv9/apt     [Solaris Operating System
-                             (SPARC(R) Platform Edition)]
-	bin/amd64/apt       [Solaris Operating System (AMD)]
-        bin/apt.exe         [Microsoft Windows]
-
-    lib/jconsole.jar
-        The Jconsole application.  NOTE: The Jconsole application requires
-        the dynamic attach mechanism.
-
-    The dynamic attach mechanism consisting of the following files:
-        lib/tools.jar       [All platforms]
-        jre/lib/sparc/libattach.so 
-          [Solaris(TM) Operating System (SPARC(R) Platform Edition) and Linux]
-        jre/lib/sparcv9/libattach.so 
-          [Solaris(TM) Operating System (SPARC(R) Platform Edition) and Linux]
-        jre/lib/i386/libattach.so 
-          [Solaris(TM) Operating System (x86) and Linux]
-        jre/lib/amd64/libattach.so 
-          [Solaris(TM) Operating System (AMD) and Linux]
-        jre\bin\attach.dll  [Microsoft Windows]
-
-    The Java Platform Debugger Architecture implementation consisting of the
-    files shown in the dynamic attach section above, and the following files:
-        lib/tools.jar       [All platforms]
-        lib/sa-jdi.jar      [All platforms]
-        jre/lib/sparc/libsaproc.so 
-          [Solaris(TM) Operating System (SPARC(R) Platform Edition) and Linux]
-        jre/lib/sparcv9/libsaproc.so 
-          [Solaris(TM) Operating System (SPARC(R) Platform Edition) and Linux]
-        jre/lib/i386/libsaproc.so 
-          [Solaris(TM) Operating System (x86) and Linux]
-        jre/lib/amd64/libsaproc.so 
-          [Solaris(TM) Operating System (AMD) and Linux]
-
-    jre\bin\server\
-        On Microsoft Windows platforms, the JDK includes both
-        the Java HotSpot(TM) Server VM and Java HotSpot Client VM.
-        However, the Java SE Runtime Environment for Microsoft Windows
-        platforms includes only the Java HotSpot Client VM. Those wishing
-        to use the Java HotSpot Server VM with the Java SE Runtime
-        Environment may copy the JDK's jre\bin\server folder to a 
-        bin\server directory in the Java SE Runtime Environment. Software
-        vendors may redistribute the Java HotSpot Server VM with their
-        redistributions of the Java SE Runtime Environment.
-
-
------------------------------------------------------------------------
-Unlimited Strength Java Cryptography Extension
------------------------------------------------------------------------
-
-Due to import control restrictions for some countries, the Java
-Cryptography Extension (JCE) policy files shipped with the Java SE
-Development Kit and the Java SE Runtime Environment allow strong but
-limited cryptography to be used.  These files are located at
-
-     <java-home>/lib/security/local_policy.jar
-     <java-home>/lib/security/US_export_policy.jar
-
-where <java-home> is the jre directory of the JDK or the
-top-level directory of the Java SE Runtime Environment.
-
-An unlimited strength version of these files indicating no restrictions
-on cryptographic strengths is available on the JDK web site for
-those living in eligible countries.  Those living in eligible countries
-may download the unlimited strength version and replace the strong
-cryptography jar files with the unlimited strength files.
-
------------------------------------------------------------------------
-The cacerts Certificates File
------------------------------------------------------------------------
-
-Root CA certificates may be added to or removed from the Java SE
-certificate file located at 
-
-    <java-home>/lib/security/cacerts
-
-For more information, see The cacerts Certificates File section
-in the keytool documentation at:
-
-http://java.sun.com/javase/6/docs/tooldocs/solaris/keytool.html#cacerts
-
-=======================================================================
-Endorsed Standards Override Mechanism
-=======================================================================
-
-From time to time it is necessary to update the Java platform in order
-to incorporate newer versions of standards that are created outside of
-the Java Community Process(SM) (JCP(SM) http://www.jcp.org/) (Endorsed
-Standards), or in order to update the version of a technology included
-in the platform to correspond to a later standalone version of that
-technology (Standalone Technologies).
-
-The Endorsed Standards Override Mechanism provides a means whereby
-later versions of classes and interfaces that implement Endorsed
-Standards or Standalone Technologies may be incorporated into the Java
-Platform.
-
-For more information on the Endorsed Standards Override Mechanism,
-including the list of platform packages that it may be used to
-override, see
-
-    http://java.sun.com/javase/6/docs/technotes/guides/standards/ 
-
------------------------------------------------------------------------
-The Java(TM) Runtime Environment (JRE) and the JavaFX(TM) runtime are 
-products of Sun Microsystems(TM), Inc.
-
-Copyright © 2010 Sun Microsystems, Inc.
-4150 Network Circle, Santa Clara, California 95054, U.S.A.
-All rights reserved.
-
diff --git a/source/l/jre/THIRDPARTYLICENSEREADME.txt b/source/l/jre/THIRDPARTYLICENSEREADME.txt
deleted file mode 100644
index a84b0734..00000000
--- a/source/l/jre/THIRDPARTYLICENSEREADME.txt
+++ /dev/null
@@ -1,3482 +0,0 @@
-DO NOT TRANSLATE OR LOCALIZE.
-
-%% The following software may be included in this product:  CS CodeViewer v1.0;
-Use of any of this software is governed by the terms of the license below:
-Copyright 1999 by CoolServlets.com.
-
-Any errors or suggested improvements to this class can be reported as instructed
-on CoolServlets.com.  We hope you enjoy this program...  your comments will
-encourage further development!  This software is distributed under the terms of
-the BSD License.  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.  Neither name of
-CoolServlets.com 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 COOLSERVLETS.COM 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 AUTHOR 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 INANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-
-%% The following software may be included in this product:  Crimson v1.1.1 ; Use
-of any of this software is governed by the terms of the license below:
-
-/*
-* The Apache Software License, Version 1.1
-*
-*
-* Copyright (c) 1999-2000 The Apache Software Foundation. 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. The end-user documentation included with the redistribution,
-* if any, must include the following acknowledgment: 
-* "This product includes software developed by the
-* Apache Software Foundation (http://www.apache.org/)."
-* Alternately, this acknowledgment may appear in the software itself,
-* if and wherever such third-party acknowledgments normally appear.
-*
-* 4. The names "Crimson" and "Apache Software Foundation" must
-* not be used to endorse or promote products derived from this
-* software without prior written permission. For written 
-* permission, please contact apache@apache.org.
-*
-* 5. Products derived from this software may not be called "Apache",
-* nor may "Apache" appear in their name, without prior written
-* permission of the Apache Software Foundation.
-*
-* 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 APACHE SOFTWARE FOUNDATION OR
-* ITS 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 software consists of voluntary contributions made by many
-* individuals on behalf of the Apache Software Foundation and was
-* originally based on software copyright (c) 1999, International
-* Business Machines, Inc., http://www.ibm.com. For more
-* information on the Apache Software Foundation, please see
-* <http://www.apache.org/>.
-*/
-
-
-%% The following software may be included in this product:  Xalan J2; Use of any of this
-software is governed by the terms of the license below:
-
-                                Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and
-distribution as defined by Sections 1 through 9 of this document.  "Licensor"
-shall mean the copyright owner or entity authorized by the copyright owner that
-is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities
-that control, are controlled by, or are under common control with that entity.
-For the purposes of this definition, "control" means (i) the power, direct or
-indirect, to cause the direction or management of such entity, whether by
-contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
-outstanding shares, or (iii) beneficial ownership of such entity.  "You" (or
-"Your") shall mean an individual or Legal Entity exercising permissions granted
-by this License.
-
-"Source" form shall mean the preferred form for making modifications, including
-but not limited to software source code, documentation source, and configuration
-files.
-
-"Object" form shall mean any form resulting from mechanical transformation or
-translation of a Source form, including but not limited to compiled object code,
-generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form, made
-available under the License, as indicated by a copyright notice that is included
-in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that
-is based on (or derived from) the Work and for which the editorial revisions,
-annotations, elaborations, or other modifications represent, as a whole, an
-original work of authorship.  For the purposes of this License, Derivative Works
-shall not include works that remain separable from, or merely link (or bind by
-name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original version
-of the Work and any modifications or additions to that Work or Derivative Works
-thereof, that is intentionally submitted to Licensor for inclusion in the Work
-by the copyright owner or by an individual or Legal Entity authorized to submit
-on behalf of the copyright owner.  For the purposes of this definition,
-"submitted" means any form of electronic, verbal, or written communication sent
-to the Licensor or its representatives, including but not limited to
-communication on electronic mailing lists, source code control systems, and
-issue tracking systems that are managed by, or on behalf of, the Licensor for
-the purpose of discussing and improving the Work, but excluding communication
-that is conspicuously marked or otherwise designated in writing by the copyright
-owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
-of whom a Contribution has been received by Licensor and subsequently
-incorporated within the Work.
-
-2.  Grant of Copyright License.  Subject to the terms and conditions of this
-License, each Contributor hereby grants to You a perpetual, worldwide,
-non-exclusive, no-charge, royalty-free, irrevocable copyright license to
-reproduce, prepare Derivative Works of, publicly display, publicly perform,
-sublicense, and distribute the Work and such Derivative Works in Source or
-Object form.
-
-3.  Grant of Patent License.  Subject to the terms and conditions of this
-License, each Contributor hereby grants to You a perpetual, worldwide,
-non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this
-section) patent license to make, have made, use, offer to sell, sell, import,
-and otherwise transfer the Work, where such license applies only to those patent
-claims licensable by such Contributor that are necessarily infringed by their
-Contribution(s) alone or by combination of their Contribution(s) with the Work
-to which such Contribution(s) was submitted.  If You institute patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Work or a Contribution incorporated within the Work
-constitutes direct or contributory patent infringement, then any patent licenses
-granted to You under this License for that Work shall terminate as of the date
-such litigation is filed.
-
-4.  Redistribution.  You may reproduce and distribute copies of the Work or
-Derivative Works thereof in any medium, with or without modifications, and in
-Source or Object form, provided that You meet the following conditions:
-
-(a) You must give any other recipients of the Work or Derivative Works a copy of
-this License; and
-
-(b) You must cause any modified files to carry prominent notices stating that
-You changed the files; and
-
-(c) You must retain, in the Source form of any Derivative Works that You
-distribute, all copyright, patent, trademark, and attribution notices from the
-Source form of the Work, excluding those notices that do not pertain to any part
-of the Derivative Works; and
-
-(d) If the Work includes a "NOTICE" text file as part of its distribution, then
-any Derivative Works that You distribute must include a readable copy of the
-attribution notices contained within such NOTICE file, excluding those notices
-that do not pertain to any part of the Derivative Works, in at least one of the
-following places:  within a NOTICE text file distributed as part of the
-Derivative Works; within the Source form or documentation, if provided along
-with the Derivative Works; or, within a display generated by the Derivative
-Works, if and wherever such third-party notices normally appear.  The contents
-of the NOTICE file are for informational purposes only and do not modify the
-License.  You may add Your own attribution notices within Derivative Works that
-You distribute, alongside or as an addendum to the NOTICE text from the Work,
-provided that such additional attribution notices cannot be construed as
-modifying the License.
-
-You may add Your own copyright statement to Your modifications and may provide
-additional or different license terms and conditions for use, reproduction, or
-distribution of Your modifications, or for any such Derivative Works as a whole,
-provided Your use,reproduction, and distribution of the Work otherwise complies
-with the conditions stated in this License.
-
-5.  Submission of Contributions.  Unless You explicitly state otherwise, any
-Contribution intentionally submitted for inclusion in the Work by You to the
-Licensor shall be under the terms and conditions of this License, without any
-additional terms or conditions.  Notwithstanding the above, nothing herein shall
-supersede or modify the terms of any separate license agreement you may have
-executed with Licensor regarding such Contributions.
-
-6.  Trademarks.  This License does not grant permission to use the trade names,
-trademarks, service marks, or product names of the Licensor, except as required
-for reasonable and customary use in describing the origin of the Work and
-reproducing the content of the NOTICE file.
-
-7.  Disclaimer of Warranty.  Unless required by applicable law or agreed to in
-writing, Licensor provides the Work (and each Contributor provides its
-Contributions) 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.  You are solely responsible for determining the
-appropriateness of using or redistributing the Work and assume any risks
-associated with Your exercise of permissions under this License.
-
-8.  Limitation of Liability.  In no event and under no legal theory, whether in
-tort (including negligence), contract, or otherwise, unless required by
-applicable law (such as deliberate and grossly negligent acts) or agreed to in
-writing, shall any Contributor be liable to You for damages, including any
-direct, indirect, special, incidental, or consequential damages of any character
-arising as a result of this License or out of the use or inability to use the
-Work (including but not limited to damages for loss of goodwill, work stoppage,
-computer failure or malfunction, or any and all other commercial damages or
-losses), even if such Contributor has been advised of the possibility of such
-damages.
-
-9.  Accepting Warranty or Additional Liability.  While redistributing the Work
-or Derivative Works thereof, You may choose to offer,and charge a fee for,
-acceptance of support, warranty, indemnity, or other liability obligations
-and/or rights consistent with this License.  However, in accepting such
-obligations, You may act only on Your own behalf and on Your sole
-responsibility, not on behalf of any other Contributor, and only if You agree to
-indemnify, defend, and hold each Contributor harmless for any liability incurred
-by, or claims asserted against, such Contributor by reason of your accepting any
-such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-To apply the Apache License to your work, attach the following boilerplate
-notice, with the fields enclosed by brackets "[]" replaced with your own
-identifying information.  (Don't include the brackets!)  The text should be
-enclosed in the appropriate comment syntax for the file format.  We also
-recommend that a file or class name and description of purpose be included on
-the same "printed page" as the copyright notice for easier identification within
-third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License.  You may obtain a copy of the
-License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed
-under the License is distributed on an "AS IS" BASIS,WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations under the License.
-
-%% The following software may be included in this product:  NSIS 1.0j; Use of
-any of this software is governed by the terms of the license below:  
-Copyright (C) 1999-2000 Nullsoft, Inc.
-
-This software is provided 'as-is', without any express or implied warranty.  In
-no event will the authors be held liable for any damages arising from the use of
-this software.  Permission is granted to anyone to use this software for any
-purpose, including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1.  The origin of this software must not be misrepresented; you must not claim
-that you wrote the original software.  If you use this software in a product, an
-acknowledgment in the product documentation would be appreciated but is not
-required.
-
-2.  Altered source versions must be plainly marked as such, and must not be
-misrepresented as being the original software.
-
-3.  This notice may not be removed or altered from any source distribution.
-Justin Frankel justin@nullsoft.com"
-
-%% Some Portions licensed from IBM are available at: 
-http://www.ibm.com/software/globalization/icu/
-
-%% Portions Copyright Eastman Kodak Company 1992
-
-%% Lucida is a registered trademark or trademark of Bigelow & Holmes in the U.S.
-and other countries.
-
-%% Portions licensed from Taligent, Inc.
-
-%% The following software may be included in this product:IAIK PKCS Wrapper; Use
-of any of this software is governed by the terms of the license below:
-
-Copyright (c) 2002 Graz University of Technology.  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.  The end-user documentation included with the redistribution, if any, must
-include the following acknowledgment:
-
-   "This product includes software developed by IAIK of Graz University of Technology."
-
-Alternately, this acknowledgment may appear in the software itself, if and
-wherever such third-party acknowledgments normally appear.
-
-4.  The names "Graz University of Technology" and "IAIK of Graz University of
-Technology" must not be used to endorse or promote products derived from this
-software without prior written permission.
-
-5.  Products derived from this software may not be called "IAIK PKCS Wrapper",
-nor may "IAIK" appear in their name, without prior written permission of Graz
-University of Technology.
-
-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 LICENSOR
-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.
-
-%% The following software may be included in this product:  Document Object
-Model (DOM) v.  Level 3; Use of any of this software is governed by the terms of
-the license below:
-
-W3C SOFTWARE NOTICE AND LICENSE
-
-http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-This work (and included software, documentation such as READMEs, or other
-related items) is being provided by the copyright holders under the following
-license.  By obtaining, using and/or copying this work, you (the licensee) agree
-that you have read, understood, and will comply with the following terms and
-conditions.
-
-Permission to copy, modify, and distribute this software and its documentation,
-with or without modification, for any purpose and without fee or royalty is
-hereby granted, provided that you include the following on ALL copies of the
-software and documentation or portions thereof, including modifications:
-
-1.The full text of this NOTICE in a location viewable to users of the
-redistributed or derivative work.
-
-2.Any pre-existing intellectual property disclaimers, notices, or terms and
-  conditions.  If none exist, the W3C Software Short Notice should be included
-  (hypertext is preferred, text is permitted) within the body of any
-  redistributed or derivative code.
-
-3.Notice of any changes or modifications to the files, including the date
-  changes were made.  (We recommend you provide URIs to the location from which
-  the code is derived.)
-
-THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS
-MAKENO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE
-OR THAT THEUSE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD
-PARTY PATENTS,COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL
-ORCONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
-The name and trademarks of copyright holders may NOT be used in advertising or
-publicity pertaining to the software without specific, written prior permission.
-Title to copyright in this software and any associated documentation will at all
-times remain with copyright holders.
-
-____________________________________
-
-This formulation of W3C's notice and license became active on December 31 2002.
-This version removes the copyright ownership notice such that this license can
-be used with materials other than those owned by the W3C, reflects that ERCIM is
-now a host of the W3C, includes references to this specific dated version of the
-license, and removes the ambiguous grant of "use".  Otherwise, this version is
-the same as the previous version and is written so as to preserve the Free
-Software Foundation's assessment of GPL compatibility and OSI's certification
-under the Open Source Definition.  Please see our Copyright FAQ for common
-questions about using materials from our site, including specific terms and
-conditions for packages like libwww, Amaya, and Jigsaw.  Other questions about
-this notice can be directed to site-policy@w3.org.
-
-%% The following software may be included in this product:  Xalan, Xerces; Use
-of any of this software is governed by the terms of the license below:  /*
-
- * The Apache Software License, Version 1.1
- *
- *
- * Copyright (c) 1999-2003 The Apache Software Foundation.  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. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:  
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Xerces" and "Apache Software Foundation" must
- *    not be used to endorse or promote products derived from this
- *    software without prior written permission. For written 
- *    permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    nor may "Apache" appear in their name, without prior written
- *    permission of the Apache Software Foundation.
- *
- * 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 APACHE SOFTWARE FOUNDATION OR
- * ITS 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 software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation and was
- * originally based on software copyright (c) 1999, International
- * Business Machines, Inc., http://www.ibm.com.  For more
- * information on the Apache Software Foundation, please see http://www.apache.org
- * 
-
-%% The following software may be included in this product:  W3C XML Conformance
-Test Suites v.  20020606; Use of any of this software is governed by the terms
-of the license below:
-
-W3C SOFTWARE NOTICE AND LICENSE
-
-Copyright 1994-2002 World Wide Web Consortium, (Massachusetts Institute of
-Technology, Institut National de Recherche en Informatique et en
-Automatique,Keio University).  All Rights Reserved.
-http://www.w3.org/Consortium/Legal/
-
-This W3C work (including software, documents, or other related items) is being
-provided by the copyright holders under the following license.  By
-obtaining,using and/or copying this work, you (the licensee) agree that you have
-read,understood, and will comply with the following terms and conditions:
-
-Permission to use, copy, modify, and distribute this software and its
-documentation, with or without modification, for any purpose and without fee
-orroyalty is hereby granted, provided that you include the following on ALL
-copiesof the software and documentation or portions thereof, including
-modifications,that you make:
-
-1.  The full text of this NOTICE in a location viewable to users of the
-redistributed or derivative work.
-
-2.  Any pre-existing intellectual property disclaimers, notices, or terms and
-conditions.  If none exist, a short notice of the following form (hypertext is
-preferred, text is permitted) should be used within the body of any
-redistributed or derivative code:  "Copyright [$date-of-software] World Wide Web
-Consortium, (Massachusetts Institute of Technology, Institut National
-deRecherche en Informatique et en Automatique, Keio University).  All Rights
-Reserved.  http://www.w3.org/Consortium/Legal/"
-
-3.  Notice of any changes or modifications to the W3C files, including the date
-changes were made.  (We recommend you provide URIs to the location from which
-the code is derived.)
-
-THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS
-MAKENO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITEDTO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE
-OR THATTHE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD
-PARTYPATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL
-ORCONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
-
-The name and trademarks of copyright holders may NOT be used in advertising or
-publicity pertaining to the software without specific, written prior permission.
-Title to copyright in this software and any associated documentation will at all
-times remain with copyright holders.
-
-____________________________________
-
-This formulation of W3C's notice and license became active on August 14 1998
-soas to improve compatibility with GPL.  This version ensures that W3C software
-licensing terms are no more restrictive than GPL and consequently W3C software
-may be distributed in GPL packages.  See the older formulation for the policy
-prior to this date.  Please see our Copyright FAQ for common questions about
-using materials from our site, including specific terms and conditions for
-packages like libwww, Amaya, and Jigsaw.  Other questions about this notice can
-be directed to site-policy@w3.org.
-
-%% The following software may be included in this product:  W3C XML Schema Test
-Collection v.  1.16.2; Use of any of this software is governed by the terms of
-the license below:  W3C DOCUMENT NOTICE AND LICENSE
-
-Copyright 1994-2002 World Wide Web Consortium, (Massachusetts Institute of
-Technology, Institut National de Recherche en Informatique et en
-Automatique,Keio University).  All Rights Reserved.
-http://www.w3.org/Consortium/Legal/
-
-Public documents on the W3C site are provided by the copyright holders under the
-following license.  The software or Document Type Definitions (DTDs) associated
-with W3C specifications are governed by the Software Notice.  By using and/or
-copying this document, or the W3C document from which this statement is
-linked,you (the licensee) agree that you have read, understood, and will comply
-with the following terms and conditions:
-
-Permission to use, copy, and distribute the contents of this document, or theW3C
-document from which this statement is linked, in any medium for any purpose and
-without fee or royalty is hereby granted, provided that you include the
-following on ALL copies of the document, or portions thereof, that you use:
-
-1. A link or URL to the original W3C document.
- 
-2.  The pre-existing copyright notice of the original author, or if it doesn't
-exist, a notice of the form:  "Copyright [$date-of-document] World Wide
-WebConsortium, (Massachusetts Institute of Technology, Institut National
-deRecherche en Informatique et en Automatique, Keio University).  All Rights
-Reserved.  http://www.w3.org/Consortium/Legal/" (Hypertext is preferred, but
-atextual representation is permitted.)
-
-3. If it exists, the STATUS of the W3C document.
-
-When space permits, inclusion of the full text of this NOTICE should be
-provided.  We request that authorship attribution be provided in any
-software,documents, or other items or products that you create pursuant to the
-implementation of the contents of this document, or any portion thereof.
-
-No right to create modifications or derivatives of W3C documents is granted
-pursuant to this license.  However, if additional requirements (documented in
-the Copyright FAQ) are satisfied, the right to create modifications or
-derivatives is sometimes granted by the W3C to individuals complying with those
-requirements.  THIS DOCUMENT IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO
-REPRESENTATIONSOR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-WARRANTIES OFMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
-NON-INFRINGEMENT, OR TITLE;THAT THE CONTENTS OF THE DOCUMENT ARE SUITABLE FOR
-ANY PURPOSE; NOR THAT THEIMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY
-THIRD PARTY PATENTS,COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL
-ORCONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE DOCUMENT OR THE
-PERFORMANCEOR IMPLEMENTATION OF THE CONTENTS THEREOF.
-
-The name and trademarks of copyright holders may NOT be used in advertising or
-publicity pertaining to this document or its contents without specific, written
-prior permission.  Title to copyright in this document will at all times remain
-with copyright holders.
-
-----------------------------------------------------------------------------
-
-This formulation of W3C's notice and license became active on April 05 1999 soas
-to account for the treatment of DTDs, schema's and bindings.  See the older
-formulation for the policy prior to this date.  Please see our Copyright FAQ for
-common questions about using materials from our site, including specific terms
-and conditions for packages like libwww, Amaya, and Jigsaw.  Other questions
-about this notice can be directed to site-policy@w3.org.  webmaster (last
-updated by reagle on 1999/04/99.)
-
-
-%% The following software may be included in this product:  Mesa 3-D graphics
-library v.  5; Use of any of this software is governed by the terms of the
-license below:
-
-core Mesa code  include/GL/gl.h       Brian Paul          
-Mesa GLX driver      include/GL/glx.h      Brian Paul
-Mesa Ext registry    include/GL/glext.h    SGI
-SGI Free B           include/GL/glxext.h
-
-Mesa license:
-
-The Mesa distribution consists of several components.  Different copyrights and
-licenses apply to different components.  For example, GLUT is copyrighted by
-Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa device
-drivers are copyrighted by their authors.  See below for a list of Mesa's
-components and the copyright/license for each.
-
-The core Mesa library is licensed according to the terms of the XFree86copyright
-(an MIT-style license).  This allows integration with the XFree86/DRIproject.
-Unless otherwise stated, the Mesa source code and documentation is licensed as
-follows:
-
-Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"),to deal in the
-Software without restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense,and/or sell copies of the
-Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESSOR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALLBRIAN PAUL BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER INAN ACTION OF
-CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-SGI FREE SOFTWARE LICENSE B (Version 1.1 [02/22/2000]) 
-1. Definitions.
-
-1.1 "Additional Notice Provisions" means such additional provisions as appear in
-the Notice in Original Code under the heading "Additional Notice Provisions."
-
-1.2 "Covered Code" means the Original Code or Modifications, or any combination
-thereof.
-
-1.3 "Hardware" means any physical device that accepts input, processes input,
-stores the results of processing, and/or provides output.
-
-1.4 "Larger Work" means a work that combines Covered Code or portions thereof
-with code not governed by the terms of this License.
-
-1.5 "Licensable" means having the right to grant, to the maximum extent
-possible, whether at the time of the initial grant or subsequently acquired, any
-and all of the rights conveyed herein.
-
-1.6 "License" means this document.
-
-1.7 "Licensed Patents" means patent claims Licensable by SGI that are infringed
-by the use or sale of Original Code or any Modifications provided by SGI, or any
-combination thereof.
-
-1.8 "Modifications" means any addition to or deletion from the substance or
-structure of the Original Code or any previous Modifications.  When Covered Code
-is released as a series of files, a Modification is:  A.  Any addition to the
-contents of a file containing Original Code and/or addition to or deletion from
-the contents of a file containing previous Modifications.B.  Any new file that
-contains any part of the Original Code or previous Modifications.
-
-1.9 "Notice" means any notice in Original Code or Covered Code, as required by
-and in compliance with this License.
-
-1.10 "Original Code" means source code of computer software code that is
-described in the source code Notice required by Exhibit A as Original Code, and
-updates and error corrections specifically thereto.
-
-1.11 "Recipient" means an individual or a legal entity exercising rights under,
-and complying with all of the terms of, this License or a future version of this
-License issued under Section 8.  For legal entities, "Recipient" includes any
-entity that controls, is controlled by, or is under common control with
-Recipient.  For purposes of this definition, "control" of an entity means (a)
-the power, direct or indirect, to direct or manage such entity, or (b) ownership
-of fifty percent (50%) or more of the outstanding shares or beneficial ownership
-of such entity.
-
-1.12 "Recipient Patents" means patent claims Licensable by a Recipient that are
-infringed by the use or sale of Original Code or any Modifications provided by
-SGI, or any combination thereof.
-
-1.13 "SGI" means Silicon Graphics, Inc.
-
-1.14 "SGI Patents" means patent claims Licensable by SGI other than the Licensed
-Patents.
-
-2.  License Grant and Restrictions.
-
-2.1 SGI License Grant.  Subject to the terms of this License and any third party
-intellectual property claims, for the duration of intellectual property
-protections inherent in the Original Code, SGI hereby grants Recipient a
-worldwide, royalty-free, non-exclusive license, to do the following:  (i) under
-copyrights Licensable by SGI, to reproduce, distribute, create derivative works
-from, and, to the extent applicable, display and perform the Original Code
-and/or any Modifications provided by SGI alone and/or as part of a Larger Work;
-and (ii) under any Licensable Patents, to make, have made, use, sell, offer for
-sale, import and/or otherwise transfer the Original Code and/or any
-Modifications provided by SGI.  Recipient accepts the terms and conditions of
-this License by undertaking any of the aforementioned actions.  The patent
-license shall apply to the Covered Code if, at the time any related Modification
-is added, such addition of the Modification causes such combination to be
-covered by the Licensed Patents .  The patent license in Section 2.1(ii) shall
-not apply to any other combinations that include the Modification.  No patent
-license is provided under SGI Patents for infringements of SGI Patents by
-Modifications not provided by SGI or combinations of Original Code and
-Modifications not provided by SGI.
-
-2.2 Recipient License Grant.  Subject to the terms of this License and any third
-party intellectual property claims, Recipient hereby grants SGI and any other
-Recipients a worldwide, royalty-free, non-exclusive license, under any Recipient
-Patents, to make, have made, use, sell, offer for sale, import and/or otherwise
-transfer the Original Code and/or any Modifications provided by SGI.
-
-2.3 No License For Hardware Implementations.  The licenses granted in Section
-2.1 and 2.2 are not applicable to implementation in Hardware of the algorithms
-embodied in the Original Code or any Modifications provided by SGI .
-
-3. Redistributions. 
-
-3.1 Retention of Notice/Copy of License.  The Notice set forth in Exhibit A,
-below, must be conspicuously retained or included in any and all redistributions
-of Covered Code.  For distributions of the Covered Code in source code form, the
-Notice must appear in every file that can include a text comments field; in
-executable form, the Notice and a copy of this License must appear in related
-documentation or collateral where the Recipient's rights relating to Covered
-Code are described.  Any Additional Notice Provisions which actually appears in
-the Original Code must also be retained or included in any and all
-redistributions of Covered Code.
-
-3.2 Alternative License.  Provided that Recipient is in compliance with the
-terms of this License, Recipient may, so long as without derogation of any of
-SGI's rights in and to the Original Code, distribute the source code and/or
-executable version(s) of Covered Code under (1) this License; (2) a license
-identical to this License but for only such changes as are necessary in order to
-clarify Recipient's role as licensor of Modifications; and/or (3) a license of
-Recipient's choosing, containing terms different from this License, provided
-that the license terms include this Section 3 and Sections 4, 6, 7, 10, 12, and
-13, which terms may not be modified or superseded by any other terms of such
-license.  If Recipient elects to use any license other than this License,
-Recipient must make it absolutely clear that any of its terms which differ from
-this License are offered by Recipient alone, and not by SGI.  It is emphasized
-that this License is a limited license, and, regardless of the license form
-employed by Recipi ent in accordance with this Section 3.2, Recipient may
-relicense only such rights, in Original Code and Modifications by SGI, as it has
-actually been granted by SGI in this License.
-
-3.3 Indemnity.  Recipient hereby agrees to indemnify SGI for any liability
-incurred by SGI as a result of any such alternative license terms Recipient
-offers.
-
-4.  Termination.  This License and the rights granted hereunder will terminate
-automatically if Recipient breaches any term herein and fails to cure such
-breach within 30 days thereof.  Any sublicense to the Covered Code that is
-properly granted shall survive any termination of this License, absent
-termination by the terms of such sublicense.  Provisions that, by their nature,
-must remain in effect beyond the termination of this License, shall survive.
-
-5.  No Trademark Or Other Rights.  This License does not grant any rights to:
-(i) any software apart from the Covered Code, nor shall any other rights or
-licenses not expressly granted hereunder arise by implication, estoppel or
-otherwise with respect to the Covered Code; (ii) any trade name, trademark or
-service mark whatsoever, including without limitation any related right for
-purposes of endorsement or promotion of products derived from the Covered Code,
-without prior written permission of SGI; or (iii) any title to or ownership of
-the Original Code, which shall at all times remains with SGI.  All rights in the
-Original Code not expressly granted under this License are reserved.
-
-6.  Compliance with Laws; Non-Infringement.  There are various worldwide laws,
-regulations, and executive orders applicable to dispositions of Covered Code,
-including without limitation export, re-export, and import control laws,
-regulations, and executive orders, of the U.S.  government and other countries,
-and Recipient is reminded it is obliged to obey such laws, regulations, and
-executive orders.  Recipient may not distribute Covered Code that (i) in any way
-infringes (directly or contributorily) any intellectual property rights of any
-kind of any other person or entity or (ii) breaches any representation or
-warranty, express, implied or statutory, to which, under any applicable law, it
-might be deemed to have been subject.
-
-7.  Claims of Infringement.  If Recipient learns of any third party claim that
-any disposition of Covered Code and/or functionality wholly or partially
-infringes the third party's intellectual property rights, Recipient will
-promptly notify SGI of such claim.
-
-8.  Versions of the License.  SGI may publish revised and/or new versions of the
-License from time to time, each with a distinguishing version number.  Once
-Covered Code has been published under a particular version of the License,
-Recipient may, for the duration of the license, continue to use it under the
-terms of that version, or choose to use such Covered Code under the terms of any
-subsequent version published by SGI.  Subject to the provisions of Sections 3
-and 4 of this License, only SGI may modify the terms applicable to Covered Code
-created under this License.
-
-9.  DISCLAIMER OF WARRANTY.  COVERED CODE IS PROVIDED "AS IS."  ALL EXPRESS AND
-IMPLIED WARRANTIES AND CONDITIONS ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION,
-ANY IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
-FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  SGI ASSUMES NO RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE.  SHOULD THE SOFTWARE PROVE
-DEFECTIVE IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR SERVICING, REPAIR
-OR CORRECTION.  THIS DISCLAIMER OF WARRANTY IS AN ESSENTIAL PART OF THIS
-LICENSE.  NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT SUBJECT TO
-THIS DISCLAIMER.
-
-10.  LIMITATION OF LIABILITY.  UNDER NO CIRCUMSTANCES NOR LEGAL THEORY, WHETHER
-TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT LIABILITY), CONTRACT,
-OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING,
-WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, LOSS OF DATA,
-COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR
-LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH
-DAMAGES.  THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR
-PERSONAL INJURY RESULTING FROM SGI's NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-PROHIBITS SUCH LIMITATION.  SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR
-LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT EXCLUSION AND
-LIMITATION MAY NOT APPLY TO RECIPIENT.
-
-11.  Indemnity.  Recipient shall be solely responsible for damages arising,
-directly or indirectly, out of its utilization of rights under this License.
-Recipient will defend, indemnify and hold harmless Silicon Graphics, Inc.  from
-and against any loss, liability, damages, costs or expenses (including the
-payment of reasonable attorneys fees) arising out of Recipient's use,
-modification, reproduction and distribution of the Covered Code or out of any
-representation or warranty made by Recipient.
-
-12.  U.S.  Government End Users.  The Covered Code is a "commercial item"
-consisting of "commercial computer software" as such terms are defined in title
-48 of the Code of Federal Regulations and all U.S.  Government End Users acquire
-only the rights set forth in this License and are subject to the terms of this
-License.
-
-13.  Miscellaneous.  This License represents the complete agreement concerning
-the its subject matter.  If any provision of this License is held to be
-unenforceable, such provision shall be reformed so as to achieve as nearly as
-possible the same legal and economic effect as the original provision and the
-remainder of this License will remain in effect.  This License shall be governed
-by and construed in accordance with the laws of the United States and the State
-of California as applied to agreements entered into and to be performed entirely
-within California between California residents.  Any litigation relating to this
-License shall be subject to the exclusive jurisdiction of the Federal Courts of
-the Northern District of California (or, absent subject matter jurisdiction in
-such courts, the courts of the State of California), with venue lying
-exclusively in Santa Clara County, California, with the losing party responsible
-for costs, including without limitation, court costs and reasonable attorneys
-fees and ex penses.  The application of the United Nations Convention on
-Contracts for the International Sale of Goods is expressly excluded.  Any law or
-regulation that provides that the language of a contract shall be construed
-against the drafter shall not apply to this License.
-
-Exhibit A License Applicability.  Except to the extent portions of this file are
-made subject to an alternative license as permitted in the SGI Free Software
-License B, Version 1.1 (the "License"), the contents of this file are subject
-only to the provisions of the License.  You may not use this file except in
-compliance with the License.  You may obtain a copy of the License at Silicon
-Graphics, Inc., attn:  Legal Services, 1600 Amphitheatre Parkway, Mountain View,
-CA 94043-1351, or at:  http://oss.sgi.com/projects/FreeB Note that, as provided
-in the License, the Software is distributed on an "AS IS" basis, with ALL
-EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS DISCLAIMED, INCLUDING, WITHOUT
-LIMITATION, ANY IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY,
-SATISFACTORY QUALITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-Original Code.  The Original Code is:  [name of software, version number, and
-release date], developed by Silicon Graphics, Inc.  The Original Code is
-Copyright (c) [dates of first publication, as appearing in the Notice in the
-Original Code] Silicon Graphics, Inc.  Copyright in any portions created by
-third parties is as indicated elsewhere herein.  All Rights Reserved.
-Additional Notice Provisions:  [such additional provisions, if any, as appear in
-the Notice in the Original Code under the heading "Additional Notice
-Provisions"]
-
-%% The following software may be included in this product:  Byte Code
-Engineering Library (BCEL) v.  5; Use of any of this software is governed by the
-terms of the license below:
-
-Apache Software License 
-
-/
-====================================================================
-The Apache Software License, Version 1.1
-
-Copyright (c) 2001 The Apache Software Foundation.  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 providedwith the distribution.
-
-3.  The end-user documentation included with the redistribution, if any, must
-include the following acknowledgment:  "This product includes software developed
-by the Apache Software Foundation (http://www.apache.org/)."  Alternately, this
-acknowledgment may appear in the software itself, if and wherever such
-third-party acknowledgments normally appear.
-
-4.  The names "Apache" and "Apache Software Foundation"and "Apache BCEL" must
-not be used to endorse or promote products derived from this software without
-prior written permission.  For written permission, please contact
-apache@apache.org.
-
-5.  Products derived from this software may not be called"Apache", "Apache
-BCEL", nor may "Apache" appear in their name,without prior written permission of
-the Apache Software Foundation.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED ORIMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIEDWARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSEARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE
-SOFTWAREFOUNDATION OR ITS 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) HOWEVERCAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICTLIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING INANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THEPOSSIBILITY OF SUCH DAMAGE.
-====================================================================
-
-This software consists of voluntary contributions made by many individuals on
-behalf of the Apache Software Foundation.  For more information on the Apache
-Software Foundation, please see http://www.apache.org.  /
-
-
-
-%% The following software may be included in this product:  Regexp, Regular
-Expression Package v.  1.2; Use of any of this software is governed by the terms
-of the license below:  The Apache Software License, Version 1.1
-
-Copyright (c) 2001 The Apache Software Foundation.  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.  The end-user documentation included with the redistribution, if any, must
-include the following acknowledgment:  "This product includes software developed
-by the Apache Software Foundation (http://www.apache.org/)."  Alternately, this
-acknowledgment may appear in the software itself, if and wherever such
-third-party acknowledgments normally appear.
-
-4.  The names "Apache" and "Apache Software Foundation" and "Apache Turbine"
-must not be used to endorse or promote products derived from this software
-without prior written permission.  For written permission, please contact
-apache@apache.org.
-
-5.  Products derived from this software may not be called "Apache", "Apache
-Turbine", nor may "Apache" appear in their name, without prior written
-permission of the Apache Software Foundation.
-
-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 APACHE
-SOFTWARE FOUNDATION OR ITS 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 software consists of voluntary contributions made by many individuals on
-behalf of the Apache Software Foundation.  For more information on the Apache
-Software Foundation, please see http://www.apache.org.
-
-%% The following software may be included in this product:  CUP Parser Generator
-for Java v.  0.10k; Use of any of this software is governed by the terms of the
-license below:  CUP Parser Generator Copyright Notice, License, and Disclaimer
-
-Copyright 1996-1999 by Scott Hudson, Frank Flannery, C.  Scott Ananian
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted, provided that
-the above copyright notice appear in all copies and that both the copyright
-notice and this permission notice and warranty disclaimer appear in supporting
-documentation, and that the names of the authors or their employers not be used
-in advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.
-
-The authors and their employers disclaim all warranties with regard to this
-software, including all implied warranties of merchantability and fitness.  In
-no event shall the authors or their employers be liable for any special,
-indirect or consequential damages or any damages whatsoever resulting from loss
-of use, data or profits, whether in an action of contract,negligence or other
-tortious action, arising out of or in connection with the use or performance of
-this software.
-
-%% The following software may be included in this product:  JLex:  A Lexical
-Analyzer Generator for Java v.  1.2.5; Use of any of this software is governed
-by the terms of the license below:  JLEX COPYRIGHT NOTICE, LICENSE AND
-DISCLAIMER.
-
-Copyright 1996-2003 by Elliot Joel Berk and C.  Scott Ananian
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted, provided that
-the above copyright notice appear in all copies and that both the copyright
-notice and this permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of the authors or their employers not be used
-in advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.
-
-The authors and their employers disclaim all warranties with regard to this
-software, including all implied warranties of merchantability and fitness.  In
-no event shall the authors or their employers be liable for any special,
-indirect or consequential damages or any damages whatsoever resulting from loss
-of use, data or profits, whether in an action of contract, negligence or other
-tortious action, arising out of or in connection with the use or performance of
-this software.
-
-Java is a trademark of Sun Microsystems, Inc.  References to the Java
-programming language in relation to JLex are not meant to imply that Sun
-endorses this product.
-
-%% The following software may be included in this product:  SAX v.  2.0.1; Use
-of any of this software is governed by the terms of the license below:
-Copyright Status
-
-SAX is free!
-
-In fact, it's not possible to own a license to SAX, since it's been placed in
-the public domain.
-
-No Warranty
-
-Because SAX is released to the public domain, there is no warranty for the
-design or for the software implementation, to the extent permitted by applicable
-law.  Except when otherwise stated in writing the copyright holders and/or other
-parties provide SAX "as is" without warranty of any kind, either expressed or
-implied, including, but not limited to, the implied warranties of
-merchantability and fitness for a particular purpose.  The entire risk as to the
-quality and performance of SAX is with you.  Should SAX prove defective, you
-assume the cost of all necessary servicing, repair or correction.
-
-In no event unless required by applicable law or agreed to in writing will any
-copyright holder, or any other party who may modify and/or redistribute SAX, be
-liable to you for damages, including any general, special, incidental or
-consequential damages arising out of the use or inability to use SAX (including
-but not limited to loss of data or data being rendered inaccurate or losses
-sustained by you or third parties or a failure of the SAX to operate with any
-other programs), even if such holder or other party has been advised of the
-possibility of such damages.
-
-Copyright Disclaimers 
-
-This page includes statements to that effect by David Megginson, who would have
-been able to claim copyright for the original work.
-
-SAX 1.0
-
-Version 1.0 of the Simple API for XML (SAX), created collectively by the
-membership of the XML-DEV mailing list, is hereby released into the public
-domain.
-
-No one owns SAX:  you may use it freely in both commercial and non-commercial
-applications, bundle it with your software distribution, include it on a CD-ROM,
-list the source code in a book, mirror the documentation at your own web site,
-or use it in any other way you see fit.
-
-David Megginson, sax@megginson.com
-1998-05-11
-
-SAX 2.0 
-
-I hereby abandon any property rights to SAX 2.0 (the Simple API for XML), and
-release all of the SAX 2.0 source code, compiled code, and documentation
-contained in this distribution into the Public Domain.  SAX comes with NO
-WARRANTY or guarantee of fitness for any purpose.
-
-David Megginson, david@megginson.com
-2000-05-05
-
-%% The following software may be included in this product:  Cryptix; Use of any
-of this software is governed by the terms of the license below:
-
-Cryptix General License
-
-Copyright © 1995-2003 The Cryptix Foundation Limited. 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 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.  THIS SOFTWARE IS PROVIDED BY
-THE CRYPTIX FOUNDATION LIMITED AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS
-ORIMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FORA PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT
-SHALL THE CRYPTIX FOUNDATION LIMITED OR CONTRIBUTORS BELIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOTLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESSINTERRUPTION) 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 OFTHE POSSIBILITY OF SUCH DAMAGE.
-
-%% The following software may be included in this product:  W3C XML Schema Test
-Collection; Use of any of this software is governed by the terms of the license
-below:
-
-W3C DOCUMENT NOTICE AND LICENSE 
-
-Copyright 1994-2002 World Wide Web Consortium, (Massachusetts Institute of
-Technology, Institut National de Recherche en Informatique et en
-Automatique,Keio University).  All Rights Reserved.
-
-http://www.w3.org/Consortium/Legal/
-
-Public documents on the W3C site are provided by the copyright holders under the
-following license.  The software or Document Type Definitions (DTDs) associated
-with W3C specifications are governed by the Software Notice.  By using and/or
-copying this document, or the W3C document from which this statement is
-linked,you (the licensee) agree that you have read, understood, and will comply
-with the following terms and conditions:
-
-Permission to use, copy, and distribute the contents of this document, or theW3C
-document from which this statement is linked, in any medium for any purpose and
-without fee or royalty is hereby granted, provided that you include the
-following on ALL copies of the document, or portions thereof, that you use:
-
-1. A link or URL to the original W3C document.
-2.  The pre-existing copyright notice of the original author, or if it doesn't
-exist, a notice of the form:  "Copyright [$date-of-document] World Wide Web
-Consortium, (Massachusetts Institute of Technology, Institut National
-deRecherche en Informatique et en Automatique, Keio University).  All Rights
-Reserved.  http://www.w3.org/Consortium/Legal/" (Hypertext is preferred, but a
-textual representation is permitted.)
-3. If it exists, the STATUS of the W3C document.
-
-When space permits, inclusion of the full text of this NOTICE should be
-provided.  We request that authorship attribution be provided in any
-software,documents, or other items or products that you create pursuant to the
-implementation of the contents of this document, or any portion thereof.
-
-No right to create modifications or derivatives of W3C documents is granted
-pursuant to this license.  However, if additional requirements (documented in
-the Copyright FAQ) are satisfied, the right to create modifications or
-derivatives is sometimes granted by the W3C to individuals complying with those
-requirements.  
-
-THIS DOCUMENT IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO
-REPRESENTATIONSOR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-WARRANTIES OFMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
-NON-INFRINGEMENT, OR TITLE;THAT THE CONTENTS OF THE DOCUMENT ARE SUITABLE FOR
-ANY PURPOSE; NOR THAT THEIMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY
-THIRD PARTY PATENTS,COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL
-ORCONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE DOCUMENT OR THE
-PERFORMANCEOR IMPLEMENTATION OF THE CONTENTS THEREOF.
-
-The name and trademarks of copyright holders may NOT be used in advertising or
-publicity pertaining to this document or its contents without specific, written
-prior permission.  Title to copyright in this document will at all times remain
-with copyright holders.
-
-----------------------------------------------------------------------------
-
-This formulation of W3C's notice and license became active on April 05 1999 so
-as to account for the treatment of DTDs, schema's and bindings.  See the older
-formulation for the policy prior to this date.  Please see our Copyright FAQ for
-common questions about using materials from our site, including specific terms
-and conditions for packages like libwww, Amaya, and Jigsaw.  Other questions
-about this notice can be directed to site-policy@w3.org.  webmaster (last
-updated by reagle on 1999/04/99.)
-
-%% The following software may be included in this product:  Stax API; Use of any
-of this software is governed by the terms of the license below:
-
-Streaming API for XML (JSR-173) Specification
-Reference Implementation
-License Agreement
-
-READ THE TERMS OF THIS (THE "AGREEMENT") CAREFULLY BEFORE VIEWING OR USING
-THESOFTWARE LICENSED HEREUNDER.  BY VIEWING OR USING THE SOFTWARE, YOU AGREE TO
-THE TERMS OF THISAGREEMENT.  IF YOU ARE ACCESSING THE SOFTWARE ELECTRONICALLY,
-INDICATE YOUR ACCEPTANCE OF THESETERMS BY SELECTING THE "ACCEPT" BUTTON AT THE
-END OF THIS AGREEMENT.  IF YOU DO NOT AGREE TOALL THESE TERMS, PROMPTLY RETURN
-THE UNUSED SOFTWARE TO ORIGINAL CONTRIBUTOR, DEFINED HEREIN.
-
-1.0  DEFINITIONS.
-
-1.1.  "BEA" means BEA Systems, Inc., the licensor of the Original Code.
-
-1.2.  "Contributor" means BEA and each entity that creates or contributes to the
-creation of Modifications.
-
-1.3.  "Covered Code" means the Original Code or Modifications or the combination
-of the Original Code and Modifications, in each case including portions thereof
-and corresponding documentation released with the source code.
-
-1.4.  "Executable" means Covered Code in any form other than Source Code.
-
-1.5.  "FCS" means first commercial shipment of a product.
-
-1.6.  "Modifications" means any addition to or deletion from the substance or
-structure of either the Original Code or any previous Modifications.  When
-Covered Code is released as a series of files, a Modification is:
-
-(a) Any addition to or deletion from the contents of a file containing Original
-Code or previous Modifications.
-
-(b) Any new file that contains any part of the Original Code or previous
-Modifications.
-
-1.7.  "Original Code" means Source Code of computer software code Reference
-Implementation.
-
-1.8.  "Patent Claims" means any patent claim(s), now owned or hereafter
-acquired,including without limitation, method, process, and apparatus claims, in
-any patent for which the grantor has the right to grant a license.
-
-1.9.  "Reference Implementation" means the prototype or "proof of
-concept"implementation of the Specification developed and made available for
-license by or on behalf of BEA.
-
-1.10.  "Source Code" means the preferred form of the Covered Code for making
-modifications to it, including all modules it contains, plus any associated
-documentation,interface definition files, scripts used to control compilation
-and installation of an Executable, or source code differential comparisons
-against either the Original Code or another well known,available Covered Code of
-the Contributor's choice.
-
-1.11.  "Specification" means the written specification for the Streaming API for
-XML , Java technology developed pursuant to the Java Community Process.
-
-1.12.  "Technology Compatibility Kit" or "TCK" means the documentation, testing
-tools and test suites associated with the Specification as may be revised by BEA
-from time to time, that is provided so that an implementer of the Specification
-may determine if its implementation is compliant with the Specification.
-
-1.13.  "You" (or "Your") means an individual or a legal entity exercising rights
-under, and complying with all of the terms of, this Agreement or a future
-version of this Agreement issued under Section 6.1.  For legal entities, "You"
-includes any entity which controls,is controlled by, or is under common control
-with You.  For purposes of this definition,"control" means (a) the power, direct
-or indirect, to cause the direction or management of such entity, whether by
-contract or otherwise, or (b) ownership of more than fifty percent (50%) of the
-outstanding shares or beneficial ownership of such entity.
-
-2.0  SOURCE CODE LICENSE.
-
-2.1.  Copyright Grant.  Subject to the terms of this Agreement, each Contributor
-hereby grants You a non-exclusive, worldwide, royalty-free copyright license to
-reproduce,prepare derivative works of, publicly display, publicly perform,
-distribute and sublicense the Covered Code of such Contributor, if any, and such
-derivative works, in Source Code and Executable form.
-
-2.2.  Patent Grant.  Subject to the terms of this Agreement, each Contributor
-hereby grants You a non-exclusive, worldwide, royalty-free patent license under
-the Patent Claims to make, use, sell, offer to sell, import and otherwise
-transfer the Covered Code prepared and provided by such Contributor, if any, in
-Source Code and Executable form.  This patent license shall apply to the Covered
-Code if, at the time a Modification is added by the Contributor,such addition of
-the Modification causes such combination to be covered by the Patent Claims.
-The patent license shall not apply to any other combinations which include the
-Modification.
-
-2.3.  Conditions to Grants.  You understand that although each Contributor
-grants the licenses to the Covered Code prepared by it, no assurances are
-provided by any Contributor that the Covered Code does not infringe the patent
-or other intellectual property rights of any other entity.  Each Contributor
-disclaims any liability to You 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, You hereby assume sole
-responsibility to secure any other intellectual property rights needed, if any.
-For example, if a thirdparty patent license is required to allow You to
-distribute Covered Code, it is Your responsibility to acquire that license
-before distributing such code.
-
-2.4.  Contributors' Representation.  Each Contributor represents that to its
-knowledge it has sufficient copyright rights in the Covered Code it provides ,
-if any, to grant the copyright license set forth in this Agreement.
-
-3.0  DISTRIBUION RESTRICTIONS.
-
-3.1. Application of Agreement.
-
-The Modifications which You create or to which You contribute are governed by
-the terms of this Agreement, including without limitation Section 2.0.  The
-Source Code version of Covered Code may be distributed only under the terms of
-this Agreement or a future version of this Agreement released under Section 6.1,
-and You must include a copy of this Agreement with every copy of the Source Code
-You distribute.  You may not offer or impose any terms on any Source Code
-version that alters or restricts the applicable version of this Agreement or the
-recipients' rights hereunder.  However, You may include an additional document
-offering the additional rights described in Section 3.3.
-
-3.2.  Description of Modifications.
-
-You must cause all Covered Code to which You contribute to contain a file
-documenting the changes You made to create that Covered Code and the date of any
-change.  You must include a prominent statement that the Modification is
-derived, directly or indirectly, from Original Code provided by BEA and
-including the name of BEA in (a) the Source Code, and (b) in any notice in an
-Executable version or related documentation in which You describe the origin or
-ownership of the Covered Code.
-
-%% The following software may be included in this product:  X Window System; Use
-of any of this software is governed by the terms of the license below:
-Copyright The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that the
-above copyright notice appear in all copies and that both that copyright notice
-and this permission notice appear in supporting documentation.
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-ORIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESSFOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE OPEN
-GROUPBE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OFCONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
-THESOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be used
-in advertising or otherwise to promote the sale, use or other dealings in this
-Software without prior written authorization from The Open Group.
-
-Portions also covered by other licenses as noted in the above URL.
-
-%% The following software may be included in this product:  dom4j v.  1.6; Use
-of any of this software is governed by the terms of the license below:
-
-Redistribution and use of this software and associated documentation
-("Software"), with or without modification, are permitted provided that the
-following conditions are met:
-
-1.  Redistributions of source code must retain copyright statements and notices
-Redistributions must also contain a copy of this document.
-
-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.  The name "DOM4J" must not be used to endorse or promote products derived
-from this Software without prior written permission of MetaStuff, Ltd.  For
-written permission, please contact dom4j-info@metastuff.com.
-
-4.  Products derived from this Software may not be called "DOM4J" nor may"DOM4J"
-appear in their names without prior written permission of MetaStuff,Ltd.  DOM4J
-is a registered trademark of MetaStuff, Ltd.
-
-5.  Due credit should be given to the DOM4J Project - http://www.dom4j.org
-
-THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD.  AND CONTRIBUTORS ``AS IS'' AND
-ANYEXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIEDWARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-AREDISCLAIMED.  IN NO EVENT SHALL METASTUFF, LTD.  OR ITS CONTRIBUTORS BE LIABLE
-FORANY 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 ONANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-TORT(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THISSOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Copyright 2001-2005 (C) MetaStuff, Ltd.  All Rights Reserved.
-
-%% The following software may be included in this product:  Retroweaver; Use of
-any of this software is governed by the terms of the license below:
-
-Copyright (c) February 2004, Toby Reyelts All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list
-of conditions and the following disclaimer.  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.  Neither the name of Toby Reyelts nor the names of his
-contributors may be used to endorse or promote products derived from this
-software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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, STRICTLIABILITY, 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.
-
-%% The following software may be included in this product:  stripper; Use of any
-of this software is governed by the terms of the license below:
-
-Stripper :  debug information stripper Copyright (c) 2003 Kohsuke Kawaguchi 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.  Neither the name of the copyright holders 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
-
-%% The following software may be included in this product:  libpng official PNG
-reference library; Use of any of this software is governed by the terms of the
-license below:
-
-This copy of the libpng notices is provided for your convenience.  In case of
-any discrepancy between this copy and the notices in the file png.h that is
-included in the libpng distribution, the latter shall prevail.
-
-COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
-
-If you modify libpng you may insert additional notices immediately following
-this sentence.
-
-libpng version 1.2.6, December 3, 2004, is Copyright (c) 2004 Glenn
-   Randers-Pehrson, and is distributed according to the same disclaimer and
-   license as libpng-1.2.5with the following individual added to the list of
-   Contributing Authors Cosmin Truta
-
-libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are
-   Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are distributed according
-   to the same disclaimer and license as libpng-1.0.6 with the following
-   individuals added to the list of Contributing Authors Simon-Pierre Cadieux
-   Eric S.  Raymond Gilles Vollant
-
-and with the following additions to the disclaimer:
-
-There is no warranty against interference with your enjoyment of the library or
-against infringement.  There is no warranty that our efforts or the library will
-fulfill any of your particular purposes or needs.  This library is provided with
-all faults, and the entire risk of satisfactory quality, performance, accuracy,
-and effort is with the user.
-
-libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are Copyright
-   (c) 1998, 1999 Glenn Randers-Pehrson, and are distributed according to the
-   same disclaimer and license as libpng-0.96,with the following individuals
-   added to the list of Contributing Authors:  Tom Lane Glenn Randers-Pehrson
-   Willem van Schaik
-
-libpng versions 0.89, June 1996, through 0.96, May 1997, are Copyright (c) 1996,
-1997 Andreas Dilger Distributed according to the same disclaimer and license as
-libpng-0.88, with the following individuals added to the list of Contributing
-Authors:  John Bowler Kevin Bracey Sam Bushell Magnus Holmgren Greg Roelofs Tom
-Tanner
-
-libpng versions 0.5, May 1995, through 0.88, January 1996, are Copyright (c)
-1995, 1996 Guy Eric Schalnat, Group 42, Inc.
-
-For the purposes of this copyright and license, "Contributing Authors"is defined
-as the following set of individuals:
-
-   Andreas Dilger
-   Dave Martindale
-   Guy Eric Schalnat
-   Paul Schmidt
-   Tim Wegner
-
-The PNG Reference Library is supplied "AS IS".  The Contributing Authors and
-Group 42, Inc.  disclaim all warranties, expressed or implied, including,
-without limitation, the warranties of merchantability and of fitness for any
-purpose.  The Contributing Authors and Group 42, Inc.  assume no liability for
-direct, indirect, incidental, special, exemplary,or consequential damages, which
-may result from the use of the PNG Reference Library, even if advised of the
-possibility of such damage.
-
-Permission is hereby granted to use, copy, modify, and distribute this source
-code, or portions hereof, for any purpose, without fee, subject to the following
-restrictions:
-
-1.  The origin of this source code must not be misrepresented.
-
-2.  Altered versions must be plainly marked as such and must not be
-misrepresented as being the original source.
-
-3.  This Copyright notice may not be removed or altered from any source or
-altered source distribution.
-
-The Contributing Authors and Group 42, Inc.  specifically permit, without fee,
-and encourage the use of this source code as a component to supporting the PNG
-file format in commercial products.  If you use this source code in a product,
-acknowledgment is not required but would be appreciated.
-
-
-A "png_get_copyright" function is available, for convenient use in "about"boxes
-and the like:
-
-   printf("%s",png_get_copyright(NULL));
-
-Also, the PNG logo (in PNG format, of course) is supplied in the files
-"pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
-
-Libpng is OSI Certified Open Source Software.  OSI Certified Open Source is a
-certification mark of the Open Source Initiative.
-
-Glenn Randers-Pehrson
-glennrp at users.sourceforge.net
-December 3, 2004
-
-%% The following software may be included in this product:  Libungif - An
-uncompressed GIF library; Use of any of this software is governed by the terms
-of the license below:  
-The GIFLIB distribution is Copyright (c) 1997 Eric S.Raymond
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-ORIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY,FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO
-EVENT SHALL THEAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHERLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM,OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-INTHE SOFTWARE.
-
-
-%% The following software may be included in this product:  Ant; Use of any of
-this software is governed by the terms of the license below:  License The Apache
-Software License Version 2.0
-
-The Apache Software License Version 2.0 applies to all releases of Ant starting
-with ant 1.6.1
-
-/*
- *                                 Apache License
- *                           Version 2.0, January 2004
- *                        http://www.apache.org/licenses/
- *
- *   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- *
- *   1. Definitions.
- *
- *      "License" shall mean the terms and conditions for use, reproduction,
- *      and distribution as defined by Sections 1 through 9 of this document. 
- *
- *      "Licensor" shall mean the copyright owner or entity authorized by
- *      the copyright owner that is granting the License.
- *
- *      "Legal Entity" shall mean the union of the acting entity and all
- *      other entities that control, are controlled by, or are under common
- *      control with that entity. For the purposes of this definition,
- *      "control" means (i) the power, direct or indirect, to cause the
- *      direction or management of such entity, whether by contract or
- *      otherwise, or (ii) ownership of fifty percent (50%) or more of the
- *      outstanding shares, or (iii) beneficial ownership of such entity.
- *
- *      "You" (or "Your") shall mean an individual or Legal Entity
- *      exercising permissions granted by this License.
- *
- *      "Source" form shall mean the preferred form for making modifications,
- *      including but not limited to software source code, documentation
- *      source, and configuration files.
- *
- *      "Object" form shall mean any form resulting from mechanical
- *      transformation or translation of a Source form, including but
- *      not limited to compiled object code, generated documentation,
- *      and conversions to other media types.
- *
- *      "Work" shall mean the work of authorship, whether in Source or
- *      Object form, made available under the License, as indicated by a
- *      copyright notice that is included in or attached to the work
- *      (an example is provided in the Appendix below).
- *
- *      "Derivative Works" shall mean any work, whether in Source or Object
- *      form, that is based on (or derived from) the Work and for which the
- *      editorial revisions, annotations, elaborations, or other modifications
- *      represent, as a whole, an original work of authorship. For the purposes
- *      of this License, Derivative Works shall not include works that remain
- *      separable from, or merely link (or bind by name) to the interfaces of,
- *      the Work and Derivative Works thereof.
- *
- *      "Contribution" shall mean any work of authorship, including
- *      the original version of the Work and any modifications or additions
- *      to that Work or Derivative Works thereof, that is intentionally
- *      submitted to Licensor for inclusion in the Work by the copyright owner
- *      or by an individual or Legal Entity authorized to submit on behalf of
- *      the copyright owner. For the purposes of this definition, "submitted"
- *      means any form of electronic, verbal, or written communication sent
- *      to the Licensor or its representatives, including but not limited to
- *      communication on electronic mailing lists, source code control systems,
- *      and issue tracking systems that are managed by, or on behalf of, the
- *      Licensor for the purpose of discussing and improving the Work, but
- *      excluding communication that is conspicuously marked or otherwise
- *      designated in writing by the copyright owner as "Not a Contribution."
- *
- *      "Contributor" shall mean Licensor and any individual or Legal Entity
- *      on behalf of whom a Contribution has been received by Licensor and
- *      subsequently incorporated within the Work.
- *
- *   2. Grant of Copyright License. Subject to the terms and conditions of
- *      this License, each Contributor hereby grants to You a perpetual,
- *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- *      copyright license to reproduce, prepare Derivative Works of,
- *      publicly display, publicly perform, sublicense, and distribute the
- *      Work and such Derivative Works in Source or Object form.
- *
- *   3. Grant of Patent License. Subject to the terms and conditions of
- *      this License, each Contributor hereby grants to You a perpetual,
- *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- *      (except as stated in this section) patent license to make, have made,
- *      use, offer to sell, sell, import, and otherwise transfer the Work,
- *      where such license applies only to those patent claims licensable
- *      by such Contributor that are necessarily infringed by their
- *      Contribution(s) alone or by combination of their Contribution(s)
- *      with the Work to which such Contribution(s) was submitted. If You
- *      institute patent litigation against any entity (including a
- *      cross-claim or counterclaim in a lawsuit) alleging that the Work
- *      or a Contribution incorporated within the Work constitutes direct
- *      or contributory patent infringement, then any patent licenses
- *      granted to You under this License for that Work shall terminate
- *      as of the date such litigation is filed.
- *
- *   4. Redistribution. You may reproduce and distribute copies of the
- *      Work or Derivative Works thereof in any medium, with or without
- *      modifications, and in Source or Object form, provided that You
- *      meet the following conditions:
- *
- *      (a) You must give any other recipients of the Work or
- *          Derivative Works a copy of this License; and
- *
- *      (b) You must cause any modified files to carry prominent notices
- *          stating that You changed the files; and
- *
- *      (c) You must retain, in the Source form of any Derivative Works
- *          that You distribute, all copyright, patent, trademark, and
- *          attribution notices from the Source form of the Work,
- *          excluding those notices that do not pertain to any part of
- *          the Derivative Works; and
- *
- *      (d) If the Work includes a "NOTICE" text file as part of its
- *          distribution, then any Derivative Works that You distribute must
- *          include a readable copy of the attribution notices contained
- *          within such NOTICE file, excluding those notices that do not
- *          pertain to any part of the Derivative Works, in at least one
- *          of the following places: within a NOTICE text file distributed
- *          as part of the Derivative Works; within the Source form or
- *          documentation, if provided along with the Derivative Works; or,
- *          within a display generated by the Derivative Works, if and
- *          wherever such third-party notices normally appear. The contents
- *          of the NOTICE file are for informational purposes only and
- *          do not modify the License. You may add Your own attribution
- *          notices within Derivative Works that You distribute, alongside
- *          or as an addendum to the NOTICE text from the Work, provided
- *          that such additional attribution notices cannot be construed
- *          as modifying the License.
- *
- *      You may add Your own copyright statement to Your modifications and
- *      may provide additional or different license terms and conditions
- *      for use, reproduction, or distribution of Your modifications, or
- *      for any such Derivative Works as a whole, provided Your use,
- *      reproduction, and distribution of the Work otherwise complies with
- *      the conditions stated in this License.
- *
- *   5. Submission of Contributions. Unless You explicitly state otherwise,
- *      any Contribution intentionally submitted for inclusion in the Work
- *      by You to the Licensor shall be under the terms and conditions of
- *      this License, without any additional terms or conditions.
- *      Notwithstanding the above, nothing herein shall supersede or modify
- *      the terms of any separate license agreement you may have executed
- *      with Licensor regarding such Contributions.
- *
- *   6. Trademarks. This License does not grant permission to use the trade
- *      names, trademarks, service marks, or product names of the Licensor,
- *      except as required for reasonable and customary use in describing the
- *      origin of the Work and reproducing the content of the NOTICE file.
- *
- *   7. Disclaimer of Warranty. Unless required by applicable law or
- *      agreed to in writing, Licensor provides the Work (and each
- *      Contributor provides its Contributions) 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. You are solely responsible for determining the
- *      appropriateness of using or redistributing the Work and assume any
- *      risks associated with Your exercise of permissions under this License.
- *
- *   8. Limitation of Liability. In no event and under no legal theory,
- *      whether in tort (including negligence), contract, or otherwise,
- *      unless required by applicable law (such as deliberate and grossly
- *      negligent acts) or agreed to in writing, shall any Contributor be
- *      liable to You for damages, including any direct, indirect, special,
- *      incidental, or consequential damages of any character arising as a
- *      result of this License or out of the use or inability to use the
- *      Work (including but not limited to damages for loss of goodwill,
- *      work stoppage, computer failure or malfunction, or any and all
- *      other commercial damages or losses), even if such Contributor
- *      has been advised of the possibility of such damages.
- *
- *   9. Accepting Warranty or Additional Liability. While redistributing
- *      the Work or Derivative Works thereof, You may choose to offer,
- *      and charge a fee for, acceptance of support, warranty, indemnity,
- *      or other liability obligations and/or rights consistent with this
- *      License. However, in accepting such obligations, You may act only
- *      on Your own behalf and on Your sole responsibility, not on behalf
- *      of any other Contributor, and only if You agree to indemnify,
- *      defend, and hold each Contributor harmless for any liability
- *      incurred by, or claims asserted against, such Contributor by reason
- *      of your accepting any such warranty or additional liability.
- *
- *   END OF TERMS AND CONDITIONS
- *
- *   APPENDIX: How to apply the Apache License to your work.
- *
- *      To apply the Apache License to your work, attach the following
- *      boilerplate notice, with the fields enclosed by brackets "[]"
- *      replaced with your own identifying information. (Don't include
- *      the brackets!)  The text should be enclosed in the appropriate
- *      comment syntax for the file format. We also recommend that a
- *      file or class name and description of purpose be included on the
- *      same "printed page" as the copyright notice for easier
- *      identification within third-party archives.
- *
- *   Copyright [yyyy] Apache Software Foundation
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- */
-    
-
-You can download the original license file here.
-
-The License is accompanied by a NOTICE
-
-   =========================================================================
-   ==  NOTICE file corresponding to the section 4 d of                    ==
-   ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache Ant distribution.                      ==
-   =========================================================================
-   This product includes software developed by
-   The Apache Software Foundation (http://www.apache.org/).
-
-This product includes also software developed by :  - the W3C consortium
-  (http://www.w3c.org) , - the SAX project (http://www.saxproject.org)
-
-Please read the different LICENSE files present in the root directory of this
-distribution.
-
-The names "Ant" and "Apache Software Foundation" must not be used to endorse or
-promote products derived from this software without prior written permission.
-For written permission, please contact apache@apache.org.
-
-The Apache Software License, Version 1.1
-
-The Apache Software License, Version 1.1, applies to all versions of up to
-ant1.6.0 included.
-
-/*
- * ============================================================================
- *                   The Apache Software License, Version 1.1
- * ============================================================================
- * 
- *    Copyright (C) 2000-2003 The Apache Software Foundation. All
- *    rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modifica-
- * tion, 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. The end-user documentation included with the redistribution, if any, must
- *    include  the following  acknowledgment:  "This product includes  software
- *    developed  by the  Apache Software Foundation  (http://www.apache.org/)."
- *    Alternately, this  acknowledgment may  appear in the software itself,  if
- *    and wherever such third-party acknowledgments normally appear.
- * 
- * 4. The names "Ant" and  "Apache Software Foundation"  must not be used to
- *    endorse  or promote  products derived  from this  software without  prior
- *    written permission. For written permission, please contact
- *    apache@apache.org.
- * 
- * 5. Products  derived from this software may not  be called "Apache", nor may
- *    "Apache" appear  in their name,  without prior written permission  of the
- *    Apache Software Foundation.
- * 
- * 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
- * APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
- * DING, 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 software  consists of voluntary contributions made  by many individuals
- * on behalf of the  Apache Software Foundation.  For more  information  on the
- * Apache Software Foundation, please see http://www.apache.org.
- *
- */
-
-
-%% The following software may be included in this product:  XML Resolver
-library; Use of any of this software is governed by the terms of the license
-below:
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-    1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction, 
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by the 
-      copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all other 
-      entities that control, are controlled by, or are under common control 
-      with that entity. For the purposes of this definition, "control" means 
-      (i) the power, direct or indirect, to cause the direction or management 
-      of such entity, whether by contract or otherwise, or (ii) ownership of 
-      fifty percent (50%) or more of the outstanding shares, or 
-      (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity exercising 
-      permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications, 
-      including but not limited to software source code, documentation source, 
-      and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical transformation
-       or translation of a Source form, including but not limited to compiled 
-       object code, generated documentation, and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or Object 
-      form, made available under the License, as indicated by a copyright 
-      notice that is included in or attached to the work (an example is 
-      provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object 
-      form, that is based on (or derived from) the Work and for which the 
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces 
-      of, the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including the original 
-      version of the Work and any modifications or additions to that Work or 
-      Derivative Works thereof, that is intentionally submitted to Licensor 
-      for inclusion in the Work by the copyright owner or by an individual 
-      or Legal Entity authorized to submit on behalf of the copyright owner. 
-      For the purposes of this definition, "submitted" means any form of 
-      electronic, verbal, or written communication sent to the Licensor or 
-      its representatives, including but not limited to communication on 
-      electronic mailing lists, source code control systems, and issue 
-      tracking systems that are managed by, or on behalf of, the Licensor 
-      for the purpose of discussing and improving the Work, but excluding 
-      communication that is conspicuously marked or otherwise designated 
-      in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity 
-      on behalf of whom a Contribution has been received by Licensor and 
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of 
-      this License, each Contributor hereby grants to You a perpetual, 
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright 
-      license to reproduce, prepare Derivative Works of, publicly display, 
-      publicly perform, sublicense, and distribute the Work and such 
-      Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of this 
-      License, each Contributor hereby grants to You a perpetual, worldwide, 
-      non-exclusive, no-charge, royalty-free, irrevocable (except as stated 
-      in this section) patent license to make, have made, use, offer to sell,
-      sell, import, and otherwise transfer the Work,  where such license 
-      applies only to those patent claims licensable by such Contributor 
-      that are necessarily infringed by their  Contribution(s) alone or by 
-      combination of their Contribution(s) with the Work to which such 
-      Contribution(s) was submitted. If You institute patent litigation 
-      against any entity (including a cross-claim or counterclaim in a 
-      lawsuit) alleging that the Work or a Contribution incorporated within 
-      the Work constitutes direct or contributory patent infringement, then 
-      any patent licenses granted to You under this License for that Work 
-      shall terminate as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the Work 
-      or Derivative Works thereof in any medium, with or without modifications,
-      and in Source or Object form, provided that You meet the following
-      conditions:
-
-      (a) You must give any other recipients of the Work or Derivative Works 
-      a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices 
-      stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works that 
-      You distribute, all copyright, patent, trademark, and attribution notices 
-      from the Source form of the Work, excluding those notices that do not 
-      pertain to any part of the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its distribution,
-      then any Derivative Works that You distribute must include a readable copy
-      of the attribution notices contained within such NOTICE file, excluding 
-      those notices that do not pertain to any part of the Derivative Works, in 
-      at least one of the following places: within a NOTICE text file distributed 
-      as part of the Derivative Works; within the Source form or documentation, 
-      if provided along with the Derivative Works; or, within a display generated 
-      by the Derivative Works, if and wherever such third-party notices normally 
-      appear. The contents of the NOTICE file are for informational purposes only 
-      and do not modify the License. You may add Your own attribution notices 
-      within Derivative Works that You distribute, alongside or as an addendum to 
-      the NOTICE text from the Work, provided that such additional attribution 
-      notices cannot be construed as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and may provide
-      additional or different license terms and conditions for use, reproduction, 
-      or distribution of Your modifications, or for any such Derivative Works as a
-      whole, provided Your use, reproduction, and distribution of the Work otherwise 
-      complies with the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise, any 
-      Contribution intentionally submitted for inclusion in the Work by You to 
-      the Licensor shall be under the terms and conditions of this License, without 
-      any additional terms or conditions. Notwithstanding the above, nothing herein 
-      shall supersede or modify the terms of any separate license agreement you may 
-      have executed with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade names, 
-      trademarks, service marks, or product names of the Licensor, except as required 
-      for reasonable and customary use in describing the origin of the Work and 
-      reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or agreed to in 
-      writing, Licensor provides the Work (and each Contributor provides its 
-      Contributions) 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. You are solely responsible for determining 
-      the appropriateness of using or redistributing the Work and assume any 
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory, whether 
-      in tort (including negligence), contract, or otherwise, unless required by 
-      applicable law (such as deliberate and grossly negligent acts) or agreed to 
-      in writing, shall any Contributor be liable to You for damages, including 
-      any direct, indirect, special, incidental, or consequential damages of any 
-      character arising as a result of this License or out of the use or inability 
-      to use the Work (including but not limited to damages for loss of goodwill, 
-      work stoppage, computer failure or malfunction, or any and all other 
-      commercial damages or losses), even if such Contributor has been advised 
-      of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing the Work 
-      or Derivative Works thereof, You may choose to offer, and charge a fee for, 
-      acceptance of support, warranty, indemnity, or other liability obligations 
-      and/or rights consistent with this License. However, in accepting such 
-      obligations, You may act only on Your own behalf and on Your sole 
-      responsibility, not on behalf of any other Contributor, and only if You 
-      agree to indemnify, defend, and hold each Contributor harmless for any 
-      liability incurred by, or claims asserted against, such Contributor by 
-      reason of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following boilerplate notice, 
-   with the fields enclosed by brackets "[]" replaced with your own identifying 
-   information. (Don't include the brackets!)  The text should be enclosed in the 
-   appropriate comment syntax for the file format. We also recommend that a file 
-   or class name and description of purpose be included on the same "printed page" 
-   as the copyright notice for easier identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License"); you may not use 
-   this file except in compliance with the License. You may obtain a copy of the 
-   License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software distributed 
-   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-   CONDITIONS OF ANY KIND, either express or implied.   See the License for the 
-   specific language governing permissions and limitations under the License.
-
-
-%% The following software may be included in this product:  ICU4J; Use of any of
-this software is governed by the terms of the license below:
-
-ICU License - ICU 1.8.1 and later COPYRIGHT AND PERMISSION NOTICE Copyright (c)
-
-1995-2003 International Business Machines Corporation and others All rights
- reserved Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the "Software"), to
- deal in the Software without restriction, including without limitation the
- rights to use, copy, modify, merge, publish, distribute, and/or sell copies of
- the Software, and to permit persons to whom the Software is furnished to do
- so,provided that the above copyright notice(s) and this permission notice
- appear in all copies of the Software and that both the above copyright
- notice(s) and this permission notice appear in supporting documentation.  THE
- SOFTWARE IS PROVIDED"AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- INCLUDING BUT NOTLIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- PARTICULAR PURPOSEAND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO EVENT SHALL
- THE COPYRIGHTHOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM,
- OR ANYSPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER
- RESULTINGFROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- NEGLIGENCEOR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
- USE ORPERFORMANCE OF THIS SOFTWARE.  Except as contained in this notice, the
- name of a copyright holder shall not be used in advertising or otherwise to
- promote the sale, use or other dealings in this Software without prior written
- authorization of the copyright holder.
-
-
-%% The following software may be included in this product:  NekoHTML; Use of any
-of this software is governed by the terms of the license below:  The CyberNeko
-Software License, Version 1.0
-
-
-(C) Copyright 2002,2003, Andy Clark.  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. The end-user documentation included with the redistribution,
-   if any, must include the following acknowledgment:  
-     "This product includes software developed by Andy Clark."
-   Alternately, this acknowledgment may appear in the software itself,
-   if and wherever such third-party acknowledgments normally appear.
-
-4. The names "CyberNeko" and "NekoHTML" must not be used to endorse
-   or promote products derived from this software without prior 
-   written permission. For written permission, please contact 
-   andy@cyberneko.net.
-
-5. Products derived from this software may not be called "CyberNeko",
-   nor may "CyberNeko" appear in their name, without prior written
-   permission of the author.
-
-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 AUTHOR
-OR OTHER 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 license is based on the Apache Software License, version 1.1
-
-
-%% The following software may be included in this product:  Jing; Use of any of
-this software is governed by the terms of the license below:  Jing Copying
-Conditions
-
-Copyright (c) 2001-2003 Thai Open Source Software Center Ltd All rights
-reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification,are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * 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.
-    * Neither the name of the Thai Open Source Software Center Ltd 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 COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-ANDANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIEDWARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-AREDISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
-ANYDIRECT, 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 ONANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-TORT(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THISSOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-%% The following software may be included in this product:  RelaxNGCC; Use of
-any of this software is governed by the terms of the license below:
-
-Copyright (c) 2000-2003 Daisuke Okajima and Kohsuke Kawaguchi.
-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. The end-user documentation included with the redistribution, if
-any, must include the following acknowledgment:
-
-    "This product includes software developed by Daisuke Okajima
-    and Kohsuke Kawaguchi (http://relaxngcc.sf.net/)."
-
-Alternately, this acknowledgment may appear in the software itself,
-if and wherever such third-party acknowledgments normally appear.
-
-4. The names of the copyright holders must not be used to endorse or
-promote products derived from this software without prior written
-permission. For written permission, please contact the copyright
-holders.
-
-5. Products derived from this software may not be called "RELAXNGCC",
-nor may "RELAXNGCC" appear in their name, without prior written
-permission of the copyright holders.
-
-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 APACHE
-SOFTWARE FOUNDATION OR ITS 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.
-
-%% The following software may be included in this product:  RELAX NG Object
-Model/Parser; Use of any of this software is governed by the terms of the
-license below:  The MIT License
-
-Copyright (c)  
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do
-so,subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-ORIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESSFOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS ORCOPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHERIN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-INCONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-%% The following software may be included in this product:  XFree86-VidMode
-Extension; Use of any of this software is governed by the terms of the license
-below:  Version 1.1 of Project Licence.
-
-    Copyright (C) 1994-2004 The Project, Inc.    All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicence, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do
-so,subject to the following conditions:
-
-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, and in the same place and form
-as other copyright, license and disclaimer information.  
-
-3.  The end-user documentation included with the redistribution, if any,must
-include the following acknowledgment:  "This product includes software developed
-by The XFree86 Project, Inc (http://www.xfree86.org/) and its contributors", in
-the same place and form as other third-party acknowledgments.  Alternately, this
-acknowledgment may appear in the software itself, in the same form and location
-as other such third-party acknowledgments.
-
-4.  Except as contained in this notice, the name of The XFree86 Project,Inc
-shall not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from TheXFree86
-Project, Inc.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-WARRANTIES,INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY ANDFITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT
-SHALL THE XFREE86PROJECT, INC OR ITS 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; ORBUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER INCONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISINGIN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITYOF SUCH DAMAGE.
-
-
-%% The following software may be included in this product:  RelaxNGCC; Use of
-any of this software is governed by the terms of the license below:  This is
-version 2003-May-08 of the Info-ZIP copyright and license.  The definitive
-version of this document should be available at
-ftp://ftp.info-zip.org/pub/infozip/license.html indefinitely.
-
-
-Copyright (c) 1990-2003 Info-ZIP.  All rights reserved.
-
-For the purposes of this copyright and license, "Info-ZIP" is defined asthe
-following set of individuals:
-
-   Mark Adler, John Bush, Karl Davis, Harald Denker, Jean-Michel Dubois, Jean-loup
-   Gailly, Hunter Goatley, Ian Gorman, Chris Herborth, Dirk Haase, Greg Hartwig,
-   Robert Heath, Jonathan Hudson, Paul Kienitz, David Kirschbaum, Johnny Lee,
-   Onno van der Linden, Igor Mandrichenko, Steve P.  Miller, Sergio Monesi,
-   Keith Owens, George Petrov, Greg Roelofs, Kai Uwe Rommel, Steve Salisbury,
-   Dave Smith, Christian Spieler, Antoine Verheijen, Paul von Behren, Rich
-   Wales, Mike White
-
-This software is provided "as is," without warranty of any kind, express or
-implied.  In no event shall Info-ZIP or its contributors be held liable for any
-direct, indirect, incidental, special or consequential damages arising out of
-the use of or inability to use this software.
-
-Permission is granted to anyone to use this software for any purpose, including
-commercial applications, and to alter it and redistribute it freely, subject to
-the following restrictions:
-
-1.  Redistributions of source code must retain the above copyright notice,
-definition, disclaimer, and this list of conditions.
-
-2.  Redistributions in binary form (compiled executables) must reproduce the
-above copyright notice, definition, disclaimer, and this list of conditions in
-documentation and/or other materials provided with the distribution.  The sole
-exception to this condition is redistribution of a standard UnZipSFX binary
-(including SFXWiz) as part of a self-extracting archive; that is permitted
-without inclusion of this license, as long as the normal SFX banner has not been
-removed from the binary or disabled.
-
-3.  Altered versions--including, but not limited to, ports to new operating
-systems, existing ports with new graphical interfaces, and dynamic, shared, or
-static library versions--must be plainly marked as such and must not be
-misrepresented as being the original source.  Such altered versions also must
-not be misrepresented as being Info-ZIP releases--including, but not limited to,
-labeling of the altered versions with the names "Info-ZIP" (or any variation
-thereof, including, but not limited to, different capitalizations), "Pocket
-UnZip," "WiZ" or "MacZip" without the explicit permission of Info-ZIP.  Such
-altered versions are further prohibited from misrepresentative use of the
-Zip-Bugs or Info-ZIP e-mail addresses or of the Info-ZIP URL(s).
-
-4.  Info-ZIP retains the right to use the names "Info-ZIP," "Zip," "UnZip,"
-"UnZipSFX," "WiZ," "Pocket UnZip," "Pocket Zip," and "MacZip" for its own source
-and binary releases.
-
-
-%% The following software may be included in this product:  XML Security; Use of
-  any of this software is governed by the terms of the license below:  The
-  Apache Software License, Version 1.1 PDF
-
-Copyright (C) 2002 The Apache Software Foundation.
-
-All rights reserved.  Redistribution and use in source and binary forms, with or
-without modifica- tion, 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.  The end-user documentation included with the redistribution, if any,must
-include the following acknowledgment:"This product includes software developed
-by the Apache Software Foundation (http://www.apache.org/)."  Alternately, this
-acknowledgment may appear in the software itself, if and wherever such
-third-party acknowledgments normally appear.
-
-4.  The names"Apache Forrest" and "Apache Software Foundation" must not be used
-to endorse or promote products derived from this software without prior written
-permission.  For written permission,please contact apache@apache.org.  5.
-Products derived from this software may not be called "Apache", normay "Apache"
-appear in their name, without prior written permission of the Apache Software
-Foundation.  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 APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT,INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ORSERVICES; LOSS
-OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANYTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICTLIABILITY, 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 software consists of
-voluntary contributions made by many individuals on behalf of the Apache
-Software Foundation.  For more information on the Apache Software Foundation,
-please see http://www.apache.org.
-
-
-%% The following software may be included in this product:  Regexp, Regular
-Expression Package v.  1.2; Use of any of this software is governed by the terms
-of the license below:  The Apache Software License, Version 1.1 Copyright (c)
-2001 The Apache Software Foundation.  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.  The end-user documentation included with the redistribution, if any, must
-include the following acknowledgment:  "This product includes software developed
-by the Apache Software Foundation (http://www.apache.org/)."  Alternately, this
-acknowledgment may appear in the software itself, if and wherever such
-third-party acknowledgments normally appear.
-
-4.  The names "Apache" and "Apache Software Foundation" and "Apache Turbine"
-must not be used to endorse or promote products derived from this software
-without prior written permission.  For written permission, please contact
-apache@apache.org.
-
-5.  Products derived from this software may not be called "Apache", "Apache
-Turbine", nor may "Apache" appear in their name, without prior written
-permission of the Apache Software Foundation.
-
-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 APACHE
-SOFTWARE FOUNDATION OR ITS 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 software consists of voluntary contributions made by many individuals on
-behalf of the Apache Software Foundation.  For more information on the Apache
-Software Foundation, please see http://www.apache.org.
-
-========================================================================
-
-
-%% The following software may be included in this product:  zlib; Use of any of
-this software is governed by the terms of the license below:
-
-zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.1.3, July 9th, 1998
-
-  Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
-
-  The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files ftp://ds.internic.net/rfc/rfc1950.txt
-  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format
-
-
-%% The following software may be included in this product:  Mozilla Rhino.  Use
-of any of this software is governed by the terms of the license below:
-
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is Rhino code, released
- * May 6, 1999.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1997-2000 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *
- * Kemal Bayram
- * Patrick Beard
- * Norris Boyd
- * Igor Bukanov, igor@mir2.org
- * Brendan Eich
- * Ethan Hugg
- * Roger Lawrence
- * Terry Lucas
- * Mike McCabe
- * Milen Nankov
- * Attila Szegedi, szegedia@freemail.hu
- * Ian D. Stewart
- * Andi Vajda
- * Andrew Wason
- */
-
-%% The following software may be included in this product:  Apache Derby.  Use
-of any of this software is governed by the terms of the license below:
-
-
-                           Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) 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. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-
-%% The following software may be included in this product:  7-Zip.  Use of any
-of this software is governed by the terms of the license below:
-
-      ~~~~~
-      License for use and distribution
-      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-      7-Zip Copyright (C) 1999-2007 Igor Pavlov.
-
-      Licenses for files are:
-
-        1) 7z.dll:  GNU LGPL + AES code license + unRAR restriction
-        2) 7za.exe, 7z.sfx and 7zCon.sfx:  GNU LGPL + AES code license
-        3) All other files:  GNU LGPL
-      
-      The GNU LGPL + AES code license + unRAR restriction means that you must follow 
-      GNU LGPL rules, AES code license rules and unRAR restriction rules.
-
-      The GNU LGPL + AES code license means that you must follow both GNU LGPL rules 
-      and AES code license rules.
-
-
-      Note: 
-        You can use 7-Zip on any computer, including a computer in a commercial 
-        organization. You don't need to register or pay for 7-Zip.
-
-
-      GNU LGPL information
-      --------------------
-
-GNU Lesser General Public License
-
-Version 2.1, February 1999
-
-    Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-    59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-    Everyone is permitted to copy and distribute verbatim copies
-    of this license document, but changing it is not allowed.
-
-    [This is the first released version of the Lesser GPL. It also counts
-    as the successor of the GNU Library Public License, version 2, hence
-    the version number 2.1.]
-
-Preamble
-
-The licenses for most software are designed to take away your freedom to share
-and change it.  By contrast, the GNU General Public Licenses are intended to
-guarantee your freedom to share and change free software--to make sure the
-software is free for all its users.
-
-This license, the Lesser General Public License, applies to some specially
-designated software packages--typically libraries--of the Free Software
-Foundation and other authors who decide to use it.  You can use it too, but we
-suggest you first think carefully about whether this license or the ordinary
-General Public License is the better strategy to use in any particular case,
-based on the explanations below.
-
-When we speak of free software, we are referring to freedom of use, not price.
-Our General Public Licenses are designed to make sure that you have the freedom
-to distribute copies of free software (and charge for this service if you wish);
-that you receive source code or can get it if you want it; that you can change
-the software and use pieces of it in new free programs; and that you are
-informed that you can do these things.
-
-To protect your rights, we need to make restrictions that forbid distributors to
-deny you these rights or to ask you to surrender these rights.  These
-restrictions translate to certain responsibilities for you if you distribute
-copies of the library or if you modify it.
-
-For example, if you distribute copies of the library, whether gratis or for a
-fee, you must give the recipients all the rights that we gave you.  You must
-make sure that they, too, receive or can get the source code.  If you link other
-code with the library, you must provide complete object files to the recipients,
-so that they can relink them with the library after making changes to the
-library and recompiling it.  And you must show them these terms so they know
-their rights.
-
-We protect your rights with a two-step method:  (1) we copyright the library,
-and (2) we offer you this license, which gives you legal permission to copy,
-distribute and/or modify the library.
-
-To protect each distributor, we want to make it very clear that there is no
-warranty for the free library.  Also, if the library is modified by someone else
-and passed on, the recipients should know that what they have is not the
-original version, so that the original author's reputation will not be affected
-by problems that might be introduced by others.
-
-Finally, software patents pose a constant threat to the existence of any free
-program.  We wish to make sure that a company cannot effectively restrict the
-users of a free program by obtaining a restrictive license from a patent holder.
-Therefore, we insist that any patent license obtained for a version of the
-library must be consistent with the full freedom of use specified in this
-license.
-
-Most GNU software, including some libraries, is covered by the ordinary GNU
-General Public License.  This license, the GNU Lesser General Public License,
-applies to certain designated libraries, and is quite different from the
-ordinary General Public License.  We use this license for certain libraries in
-order to permit linking those libraries into non-free programs.
-
-When a program is linked with a library, whether statically or using a shared
-library, the combination of the two is legally speaking a combined work, a
-derivative of the original library.  The ordinary General Public License
-therefore permits such linking only if the entire combination fits its criteria
-of freedom.  The Lesser General Public License permits more lax criteria for
-linking other code with the library.
-
-We call this license the "Lesser" General Public License because it does Less to
-protect the user's freedom than the ordinary General Public License.  It also
-provides other free software developers Less of an advantage over competing
-non-free programs.  These disadvantages are the reason we use the ordinary
-General Public License for many libraries.  However, the Lesser license provides
-advantages in certain special circumstances.
-
-For example, on rare occasions, there may be a special need to encourage the
-widest possible use of a certain library, so that it becomes a de-facto
-standard.  To achieve this, non-free programs must be allowed to use the
-library.  A more frequent case is that a free library does the same job as
-widely used non-free libraries.  In this case, there is little to gain by
-limiting the free library to free software only, so we use the Lesser General
-Public License.
-
-In other cases, permission to use a particular library in non-free programs
-enables a greater number of people to use a large body of free software.  For
-example, permission to use the GNU C Library in non-free programs enables many
-more people to use the whole GNU operating system, as well as its variant, the
-GNU/Linux operating system.
-
-Although the Lesser General Public License is Less protective of the users'
-freedom, it does ensure that the user of a program that is linked with the
-Library has the freedom and the wherewithal to run that program using a modified
-version of the Library.
-
-The precise terms and conditions for copying, distribution and modification
-follow.  Pay close attention to the difference between a "work based on the
-library" and a "work that uses the library".  The former contains code derived
-from the library, whereas the latter must be combined with the library in order
-to run.  TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-0.  This License Agreement applies to any software library or other program
-which contains a notice placed by the copyright holder or other authorized party
-saying it may be distributed under the terms of this Lesser General Public
-License (also called "this License").  Each licensee is addressed as "you".
-
-A "library" means a collection of software functions and/or data prepared so as
-to be conveniently linked with application programs (which use some of those
-functions and data) to form executables.
-
-The "Library", below, refers to any such software library or work which has been
-distributed under these terms.  A "work based on the Library" means either the
-Library or any derivative work under copyright law:  that is to say, a work
-containing the Library or a portion of it, either verbatim or with modifications
-and/or translated straightforwardly into another language.  (Hereinafter,
-translation is included without limitation in the term "modification".)
-
-"Source code" for a work means the preferred form of the work for making
-modifications to it.  For a library, complete source code means all the source
-code for all modules it contains, plus any associated interface definition
-files, plus the scripts used to control compilation and installation of the
-library.
-
-Activities other than copying, distribution and modification are not covered by
-this License; they are outside its scope.  The act of running a program using
-the Library is not restricted, and output from such a program is covered only if
-its contents constitute a work based on the Library (independent of the use of
-the Library in a tool for writing it).  Whether that is true depends on what the
-Library does and what the program that uses the Library does.
-
-1.  You may copy and distribute verbatim copies of the Library's complete source
-code as you receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice and
-disclaimer of warranty; keep intact all the notices that refer to this License
-and to the absence of any warranty; and distribute a copy of this License along
-with the Library.
-
-You may charge a fee for the physical act of transferring a copy, and you may at
-your option offer warranty protection in exchange for a fee.
-
-2.  You may modify your copy or copies of the Library or any portion of it, thus
-forming a work based on the Library, and copy and distribute such modifications
-or work under the terms of Section 1 above, provided that you also meet all of
-these conditions:
-
-a) The modified work must itself be a software library.
-
-b) You must cause the files modified to carry prominent notices stating that you
-changed the files and the date of any change.
-
-c) You must cause the whole of the work to be licensed at no charge to all third
-parties under the terms of this License.
-
-d) If a facility in the modified Library refers to a function or a table of data
-to be supplied by an application program that uses the facility, other than as
-an argument passed when the facility is invoked, then you must make a good faith
-effort to ensure that, in the event an application does not supply such function
-or table, the facility still operates, and performs whatever part of its purpose
-remains meaningful.
-
-(For example, a function in a library to compute square roots has a purpose that
-is entirely well-defined independent of the application.  Therefore, Subsection
-2d requires that any application-supplied function or table used by this
-function must be optional:  if the application does not supply it, the square
-root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If identifiable
-sections of that work are not derived from the Library, and can be reasonably
-considered independent and separate works in themselves, then this License, and
-its terms, do not apply to those sections when you distribute them as separate
-works.  But when you distribute the same sections as part of a whole which is a
-work based on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the entire whole,
-and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest your
-rights to work written entirely by you; rather, the intent is to exercise the
-right to control the distribution of derivative or collective works based on the
-Library.
-
-In addition, mere aggregation of another work not based on the Library with the
-Library (or with a work based on the Library) on a volume of a storage or
-distribution medium does not bring the other work under the scope of this
-License.
-
-3.  You may opt to apply the terms of the ordinary GNU General Public License
-instead of this License to a given copy of the Library.  To do this, you must
-alter all the notices that refer to this License, so that they refer to the
-ordinary GNU General Public License, version 2, instead of to this License.  (If
-a newer version than version 2 of the ordinary GNU General Public License has
-appeared, then you can specify that version instead if you wish.)  Do not make
-any other change in these notices.
-
-Once this change is made in a given copy, it is irreversible for that copy, so
-the ordinary GNU General Public License applies to all subsequent copies and
-derivative works made from that copy.
-
-This option is useful when you wish to copy part of the code of the Library into
-a program that is not a library.
-
-4.  You may copy and distribute the Library (or a portion or derivative of it,
-under Section 2) in object code or executable form under the terms of Sections 1
-and 2 above provided that you accompany it with the complete corresponding
-machine-readable source code, which must be distributed under the terms of
-Sections 1 and 2 above on a medium customarily used for software interchange.
-
-If distribution of object code is made by offering access to copy from a
-designated place, then offering equivalent access to copy the source code from
-the same place satisfies the requirement to distribute the source code, even
-though third parties are not compelled to copy the source along with the object
-code.
-
-5.  A program that contains no derivative of any portion of the Library, but is
-designed to work with the Library by being compiled or linked with it, is called
-a "work that uses the Library".  Such a work, in isolation, is not a derivative
-work of the Library, and therefore falls outside the scope of this License.
-
-However, linking a "work that uses the Library" with the Library creates an
-executable that is a derivative of the Library (because it contains portions of
-the Library), rather than a "work that uses the library".  The executable is
-therefore covered by this License.  Section 6 states terms for distribution of
-such executables.
-
-When a "work that uses the Library" uses material from a header file that is
-part of the Library, the object code for the work may be a derivative work of
-the Library even though the source code is not.  Whether this is true is
-especially significant if the work can be linked without the Library, or if the
-work is itself a library.  The threshold for this to be true is not precisely
-defined by law.
-
-If such an object file uses only numerical parameters, data structure layouts
-and accessors, and small macros and small inline functions (ten lines or less in
-length), then the use of the object file is unrestricted, regardless of whether
-it is legally a derivative work.  (Executables containing this object code plus
-portions of the Library will still fall under Section 6.)
-
-Otherwise, if the work is a derivative of the Library, you may distribute the
-object code for the work under the terms of Section 6.  Any executables
-containing that work also fall under Section 6, whether or not they are linked
-directly with the Library itself.
-
-6.  As an exception to the Sections above, you may also combine or link a "work
-that uses the Library" with the Library to produce a work containing portions of
-the Library, and distribute that work under terms of your choice, provided that
-the terms permit modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-You must give prominent notice with each copy of the work that the Library is
-used in it and that the Library and its use are covered by this License.  You
-must supply a copy of this License.  If the work during execution displays
-copyright notices, you must include the copyright notice for the Library among
-them, as well as a reference directing the user to the copy of this License.
-Also, you must do one of these things:
-
-a) Accompany the work with the complete corresponding machine-readable source
-code for the Library including whatever changes were used in the work (which
-must be distributed under Sections 1 and 2 above); and, if the work is an
-executable linked with the Library, with the complete machine-readable "work
-that uses the Library", as object code and/or source code, so that the user can
-modify the Library and then relink to produce a modified executable containing
-the modified Library.  (It is understood that the user who changes the contents
-of definitions files in the Library will not necessarily be able to recompile
-the application to use the modified definitions.)
-
-b) Use a suitable shared library mechanism for linking with the Library.  A
-suitable mechanism is one that (1) uses at run time a copy of the library
-already present on the user's computer system, rather than copying library
-functions into the executable, and (2) will operate properly with a modified
-version of the library, if the user installs one, as long as the modified
-version is interface-compatible with the version that the work was made with.
-
-c) Accompany the work with a written offer, valid for at least three years, to
-give the same user the materials specified in Subsection 6a, above, for a charge
-no more than the cost of performing this distribution.
-
-d) If distribution of the work is made by offering access to copy from a
-designated place, offer equivalent access to copy the above specified materials
-from the same place.
-
-e) Verify that the user has already received a copy of these materials or that
-you have already sent this user a copy.
-
-For an executable, the required form of the "work that uses the Library" must
-include any data and utility programs needed for reproducing the executable from
-it.  However, as a special exception, the materials to be distributed need not
-include anything that is normally distributed (in either source or binary form)
-with the major components (compiler, kernel, and so on) of the operating system
-on which the executable runs, unless that component itself accompanies the
-executable.
-
-It may happen that this requirement contradicts the license restrictions of
-other proprietary libraries that do not normally accompany the operating system.
-Such a contradiction means you cannot use both them and the Library together in
-an executable that you distribute.
-
-7.  You may place library facilities that are a work based on the Library
-side-by-side in a single library together with other library facilities not
-covered by this License, and distribute such a combined library, provided that
-the separate distribution of the work based on the Library and of the other
-library facilities is otherwise permitted, and provided that you do these two
-things:
-
-a) Accompany the combined library with a copy of the same work based on the
-Library, uncombined with any other library facilities.  This must be distributed
-under the terms of the Sections above.
-
-b) Give prominent notice with the combined library of the fact that part of it
-is a work based on the Library, and explaining where to find the accompanying
-uncombined form of the same work.
-
-8.  You may not copy, modify, sublicense, link with, or distribute the Library
-except as expressly provided under this License.  Any attempt otherwise to copy,
-modify, sublicense, link with, or distribute the Library is void, and will
-automatically terminate your rights under this License.  However, parties who
-have received copies, or rights, from you under this License will not have their
-licenses terminated so long as such parties remain in full compliance.
-
-9.  You are not required to accept this License, since you have not signed it.
-However, nothing else grants you permission to modify or distribute the Library
-or its derivative works.  These actions are prohibited by law if you do not
-accept this License.  Therefore, by modifying or distributing the Library (or
-any work based on the Library), you indicate your acceptance of this License to
-do so, and all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-10.  Each time you redistribute the Library (or any work based on the Library),
-the recipient automatically receives a license from the original licensor to
-copy, distribute, link with or modify the Library subject to these terms and
-conditions.  You may not impose any further restrictions on the recipients'
-exercise of the rights granted herein.  You are not responsible for enforcing
-compliance by third parties with this License.
-
-11.  If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues), conditions
-are imposed on you (whether by court order, agreement or otherwise) that
-contradict the conditions of this License, they do not excuse you from the
-conditions of this License.  If you cannot distribute so as to satisfy
-simultaneously your obligations under this License and any other pertinent
-obligations, then as a consequence you may not distribute the Library at all.
-For example, if a patent license would not permit royalty-free redistribution of
-the Library by all those who receive copies directly or indirectly through you,
-then the only way you could satisfy both it and this License would be to refrain
-entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply, and
-the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any patents or
-other property right claims or to contest validity of any such claims; this
-section has the sole purpose of protecting the integrity of the free software
-distribution system which is implemented by public license practices.  Many
-people have made generous contributions to the wide range of software
-distributed through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing to
-distribute software through any other system and a licensee cannot impose that
-choice.
-
-This section is intended to make thoroughly clear what is believed to be a
-consequence of the rest of this License.
-
-12.  If the distribution and/or use of the Library is restricted in certain
-countries either by patents or by copyrighted interfaces, the original copyright
-holder who places the Library under this License may add an explicit
-geographical distribution limitation excluding those countries, so that
-distribution is permitted only in or among countries not thus excluded.  In such
-case, this License incorporates the limitation as if written in the body of this
-License.
-
-13.  The Free Software Foundation may publish revised and/or new versions of the
-Lesser General Public License from time to time.  Such new versions will be
-similar in spirit to the present version, but may differ in detail to address
-new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library specifies
-a version number of this License which applies to it and "any later version",
-you have the option of following the terms and conditions either of that version
-or of any later version published by the Free Software Foundation.  If the
-Library does not specify a license version number, you may choose any version
-ever published by the Free Software Foundation.
-
-14.  If you wish to incorporate parts of the Library into other free programs
-whose distribution conditions are incompatible with these, write to the author
-to ask for permission.  For software which is copyrighted by the Free Software
-Foundation, write to the Free Software Foundation; we sometimes make exceptions
-for this.  Our decision will be guided by the two goals of preserving the free
-status of all derivatives of our free software and of promoting the sharing and
-reuse of software generally.
-
-NO WARRANTY
-
-15.  BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
-THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE
-STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY
-"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-16.  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
-ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE
-LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL,
-SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY
-TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF
-THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER
-PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.  END OF TERMS AND
-CONDITIONS
-
-How to Apply These Terms to Your New Libraries
-
-If you develop a new library, and you want it to be of the greatest possible use
-to the public, we recommend making it free software that everyone can
-redistribute and change.  You can do so by permitting redistribution under these
-terms (or, alternatively, under the terms of the ordinary General Public
-License).
-
-To apply these terms, attach the following notices to the library.  It is safest
-to attach them to the start of each source file to most effectively convey the
-exclusion of warranty; and each file should have at least the "copyright" line
-and a pointer to where the full notice is found.
-
-    <one line to give the library's name and an idea of what it does.>
-    Copyright (C) <year> <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your school,
-if any, to sign a "copyright disclaimer" for the library, if necessary.  Here is
-a sample; alter the names:
-
-    Yoyodyne, Inc., hereby disclaims all copyright interest in
-    the library `Frob' (a library for tweaking knobs) written
-    by James Random Hacker.
-
-    signature of Ty Coon, 1 April 1990
-
-    Ty Coon, President of Vice
-
-That's all there is to it!
-
-
-      unRAR restriction
-      -----------------
-
-        The unRAR sources cannot be used to re-create the RAR compression
-algorithm, 
-        which is proprietary. Distribution of modified unRAR sources in separate
-form 
-        or as a part of other software is permitted, provided that it is clearly
-        stated in the documentation and source comments that the code may
-        not be used to develop a RAR (WinRAR) compatible archiver.
-
-
-      AES code license
-      ----------------
-    
-        Copyright (c) 2001, Dr Brian Gladman
-
-        LICENSE TERMS
-
-        The free distribution and use of this software in both source and binary 
-        form is allowed (with or without changes) provided that:
-
-          1. distributions of this source code include the above copyright 
-             notice, this list of conditions and the following disclaimer;
-
-          2. distributions in binary form include the above copyright
-             notice, this list of conditions and the following disclaimer
-             in the documentation and/or other associated materials;
-
-          3. the copyright holder's name is not used to endorse products 
-             built using this software without specific written permission. 
-
-        DISCLAIMER
-
-        This software is provided 'as is' with no explicit or implied warranties
-        in respect of its properties, including, but not limited to, correctness 
-        and fitness for purpose.
-
-
-***************************************************************************
-
-%%The following software may be included in this product:
-UPX
-
-Use of any of this software is governed by the terms of the license below:
-
------BEGIN PGP SIGNED MESSAGE-----
-
-
-                 ooooo     ooo ooooooooo.   ooooooo  ooooo
-                 `888'     `8' `888   `Y88.  `8888    d8'
-                  888       8   888   .d88'    Y888..8P
-                  888       8   888ooo88P'      `8888'
-                  888       8   888            .8PY888.
-                  `88.    .8'   888           d8'  `888b
-                    `YbodP'    o888o        o888o  o88888o
-
-
-                    The Ultimate Packer for eXecutables
-          Copyright (c) 1996-2000 Markus Oberhumer & Laszlo Molnar
-               http://wildsau.idv.uni-linz.ac.at/mfx/upx.html
-                          http://www.nexus.hu/upx
-                            http://upx.tsx.org
-
-
-PLEASE CAREFULLY READ THIS LICENSE AGREEMENT, ESPECIALLY IF YOU PLAN
-TO MODIFY THE UPX SOURCE CODE OR USE A MODIFIED UPX VERSION.
-
-
-ABSTRACT
-========
-
-   UPX and UCL are copyrighted software distributed under the terms
-   of the GNU General Public License (hereinafter the "GPL").
-
-   The stub which is imbedded in each UPX compressed program is part
-   of UPX and UCL, and contains code that is under our copyright. The
-   terms of the GNU General Public License still apply as compressing
-   a program is a special form of linking with our stub.
-
-   As a special exception we grant the free usage of UPX for all
-   executables, including commercial programs.
-   See below for details and restrictions.
-
-
-COPYRIGHT
-=========
-
-   UPX and UCL are copyrighted software. All rights remain with the authors.
-
-   UPX is Copyright (C) 1996-2000 Markus Franz Xaver Johannes Oberhumer
-   UPX is Copyright (C) 1996-2000 Laszlo Molnar
-
-   UCL is Copyright (C) 1996-2000 Markus Franz Xaver Johannes Oberhumer
-
-
-GNU GENERAL PUBLIC LICENSE
-==========================
-
-   UPX and the UCL library are free software; you can redistribute them
-   and/or modify them 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.
-
-   UPX and UCL are distributed in the hope that they 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; see the file COPYING.
-
-
-SPECIAL EXCEPTION FOR COMPRESSED EXECUTABLES
-============================================
-
-   The stub which is imbedded in each UPX compressed program is part
-   of UPX and UCL, and contains code that is under our copyright. The
-   terms of the GNU General Public License still apply as compressing
-   a program is a special form of linking with our stub.
-
-   Hereby Markus F.X.J. Oberhumer and Laszlo Molnar grant you special
-   permission to freely use and distribute all UPX compressed programs
-   (including commercial ones), subject to the following restrictions:
-
-   1. You must compress your program with a completely unmodified UPX
-      version; either with our precompiled version, or (at your option)
-      with a self compiled version of the unmodified UPX sources as
-      distributed by us.
-   2. This also implies that the UPX stub must be completely unmodfied, i.e.
-      the stub imbedded in your compressed program must be byte-identical
-      to the stub that is produced by the official unmodified UPX version.
-   3. The decompressor and any other code from the stub must exclusively get
-      used by the unmodified UPX stub for decompressing your program at
-      program startup. No portion of the stub may get read, copied,
-      called or otherwise get used or accessed by your program.
-
-
-ANNOTATIONS
-===========
-
-  - You can use a modified UPX version or modified UPX stub only for
-    programs that are compatible with the GNU General Public License.
-
-  - We grant you special permission to freely use and distribute all UPX
-    compressed programs. But any modification of the UPX stub (such as,
-    but not limited to, removing our copyright string or making your
-    program non-decompressible) will immediately revoke your right to
-    use and distribute a UPX compressed program.
-
-  - UPX is not a software protection tool; by requiring that you use
-    the unmodified UPX version for your proprietary programs we
-    make sure that any user can decompress your program. This protects
-    both you and your users as nobody can hide malicious code -
-    any program that cannot be decompressed is highly suspicious
-    by definition.
-
-  - You can integrate all or part of UPX and UCL into projects that
-    are compatible with the GNU GPL, but obviously you cannot grant
-    any special exceptions beyond the GPL for our code in your project.
-
-  - We want to actively support manufacturers of virus scanners and
-    similar security software. Please contact us if you would like to
-    incorporate parts of UPX or UCL into such a product.
-
-
-
-Markus F.X.J. Oberhumer                   Laszlo Molnar
-markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
-
-Linz, Austria, 25 Feb 2000
-
-Additional License(s)
-
-The UPX license file is at http://upx.sourceforge.net/upx-license.html.
-
-***************************************************************************
-
-%%The following software may be included in this product:
-LZMA Software Development Kit
-
-Use of any of this software is governed by the terms of the license below:
-
-License
-
-LZMA SDK is available under any of the following licenses:
-
-   1. GNU Lesser General Public License (GNU LGPL)
-   2. Common Public License (CPL)
-   3. Simplified license for unmodified code (read SPECIAL EXCEPTION)
-   4. Proprietary license
-
-This means that you can select one of these four options and follow rules of
-that license.
-
-SPECIAL EXCEPTION:  Igor Pavlov, as the author of this code, expressly permit
-you statically or dynamically to link your code (or bind by name) to the files
-from LZMA SDK without subjecting your linked code to the terms of the CPL or GNU
-LGPL.  Any modification or addition to any file in the LZMA SDK, however, is
-subject to the GNU LGPL or CPL terms.
-
-This SPECIAL EXCEPTION allows you to use LZMA SDK in applications with
-proprietary code, provided you keep the LZMA SDK code unmodified.
-
-SPECIAL EXCEPTION #2:  Igor Pavlov, as the author of this code, expressly
-permits you to use LZMA SDK 4.43 under the same terms and conditions contained
-in the License Agreement you have for any previous version of LZMA SDK developed
-by Igor Pavlov.
-
-SPECIAL EXCEPTION #2 allows holders of proprietary licenses to use latest
-version of LZMA SDK as update for previous versions.
-
-GNU LGPL and CPL are pretty similar and both these licenses are classified as
-free software licenses at http://www.gnu.org/ and OSI-approved at
-http://www.opensource.org/.
-
-LZMA SDK also is available under a proprietary license which can include:
-
-1.  The right to modify code from the LZMA SDK without subjecting the modified
-code to the terms of the CPL or GNU LGPL
-
-2.  Technical support for LZMA SDK via email
-
-To request such a proprietary license, or for any additional consultations, send
-an email message, using the 7-Zip support page:  Send message to LZMA developer
-
-The source code of 7-Zip is released under the terms of the GNU LGPL.  You can
-download the source code of 7-Zip at 7-Zip's Source Forge Page
-
-Additional License(s)
-
-The license included with the software differs slightly from the version posted
-on the website.  Specifically it includes SPECIAL EXCEPTION #3, which is not
-present in the license on the website.  The license from the software archive
-follows:
-
-LICENSE
--------
-
-LZMA SDK is available under any of the following licenses:
-
-1) GNU Lesser General Public License (GNU LGPL)
-2) Common Public License (CPL)
-3) Simplified license for unmodified code (read SPECIAL EXCEPTION) 
-4) Proprietary license 
-
-It means that you can select one of these four options and follow rules of that license.
-
-
-1,2) GNU LGPL and CPL licenses are pretty similar and both these licenses are
-classified as
- - "Free software licenses" at http://www.gnu.org/ 
- - "OSI-approved" at http://www.opensource.org/
-
-
-3) SPECIAL EXCEPTION
-
-Igor Pavlov, as the author of this code, expressly permits you to statically or
-dynamically link your code (or bind by name) to the files from LZMA SDK without
-subjecting your linked code to the terms of the CPL or GNU LGPL.  Any
-modifications or additions to files from LZMA SDK, however, are subject to the
-GNU LGPL or CPL terms.
-
-SPECIAL EXCEPTION allows you to use LZMA SDK in applications with closed code,
-while you keep LZMA SDK code unmodified.
-
-
-SPECIAL EXCEPTION #2:  Igor Pavlov, as the author of this code, expressly
-permits you to use this code under the same terms and conditions contained in
-the License Agreement you have for any previous version of LZMA SDK developed by
-Igor Pavlov.
-
-SPECIAL EXCEPTION #2 allows owners of proprietary licenses to use latest version
-of LZMA SDK as update for previous versions.
-
-
-SPECIAL EXCEPTION #3:  Igor Pavlov, as the author of this code, expressly
-permits you to use code of the following files:  BranchTypes.h, LzmaTypes.h,
-LzmaTest.c, LzmaStateTest.c, LzmaAlone.cpp, LzmaAlone.cs, LzmaAlone.java as
-public domain code.
-
-
-4) Proprietary license
-
-LZMA SDK also can be available under a proprietary license which 
-can include:
-
-1) Right to modify code without subjecting modified code to the terms of the CPL or GNU LGPL
-2) Technical support for code
-
-To request such proprietary license or any additional consultations, send email
-message from that page:http://www.7-zip.org/support.html
-
-
-You should have received a copy of the GNU Lesser General Public License along
-with this library; if not, write to the Free Software Foundation, Inc., 59
-Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-You should have received a copy of the Common Public License along with this
-library.
diff --git a/source/l/jre/Welcome.html b/source/l/jre/Welcome.html
deleted file mode 100644
index c4bdc518..00000000
--- a/source/l/jre/Welcome.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<html>
-<head>
-<title>
-Welcome to the Java(TM) Platform
-</title>
-</head>
-<body>
-
-<h2>Welcome to the Java<SUP><FONT SIZE=-2>TM</FONT></SUP> Platform</h2>
-<p> Welcome to the Java<SUP><FONT SIZE=-2>TM</FONT></SUP> Standard Edition Runtime 
-  Environment. This provides complete runtime support for Java applications. 
-<p> The runtime environment includes the Java<SUP><FONT SIZE=-2>TM</FONT></SUP> 
-  Plug-in product which supports the Java environment inside web browsers. 
-<h3>References</h3>
-<p>
-See the <a href=http://java.sun.com/javase/6/docs/technotes/guides/plugin/index.html>Java Plug-in</a> product
-documentation for more information on using the Java Plug-in product.
-<p> See the <a href=http://java.sun.com/javase>Java Platform</a> web site for 
-  more information on the Java Platform. 
-<hr>
-<font size="-2">Copyright 2010 Sun Microsystems, Inc., 4150 Network Circle, Santa 
-Clara, California 95054, U.S.A.<BR>
-All rights reserved.</font>
-<p>
-</body>
-</html>
diff --git a/source/l/jre/jre.SlackBuild b/source/l/jre/jre.SlackBuild
deleted file mode 100755
index 70e775c6..00000000
--- a/source/l/jre/jre.SlackBuild
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/bin/sh
-
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-# Note that the slack-desc file mentions the JRE version (edit when upgrading)!
-
-VERSION=6u20
-DVER=1.6.0_20
-ARCH=x86_64
-BUILD=${BUILD:-1}
-
-# As of jre-6u12 a 64bit plugin is available.
-# SUN says:
-# Please note that the 64-bit JRE only works with the 64-bit browser plug-in,
-# while the 32-bit JRE only works with 32-bit browser plug-in.
-# If you use both 32-bit and 64-bit browsers interchangeably, you will need to
-# have both 32-bit and 64-bit JRE's installed on your machine. 
-JAVA_ARCH=${JAVA_ARCH:-x64}      # or i586 if you want the 32bit version
-
-if [ "$JAVA_ARCH" = "x64" ]; then
-  LIB_ARCH=amd64
-else
-  LIB_ARCH=i386
-fi
-
-if [ "$ARCH" = "x86_64" ]; then
-  LIBDIRSUFFIX="64"
-else
-  LIBDIRSUFFIX=""
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-jre
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-cd $PKG
-mkdir -p usr/lib${LIBDIRSUFFIX}
-cd usr/lib${LIBDIRSUFFIX}
-yes yes | sh $( ls --indicator-style none $CWD/jre-${VERSION}-linux-${JAVA_ARCH}*.bin | tail -1) || exit 1
-mkdir -p $PKG/etc/profile.d
-for file in $(ls $CWD/profile.d/*) ; do
-  cat $file | sed -e "s#lib/java#lib${LIBDIRSUFFIX}/java#" \
-    > $PKG/etc/profile.d/$(basename $file)
-done
-chown -R root:root $PKG
-( cd $PKG
-  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 {} \;
-)
-chmod 755 $PKG/etc/profile.d/*
-( cd $PKG/usr/lib${LIBDIRSUFFIX}
-  mv jre${DVER} java || exit 1
-  ln -sf java jre${DVER}
-) || exit 1
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
-( cd $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
-  ln -sf /usr/lib${LIBDIRSUFFIX}/java/lib/${LIB_ARCH}/libnpjp2.so libnpjp2.so
-)
-( cd $PKG/usr/lib${LIBDIRSUFFIX}
-  ln -sf ./java/lib/${LIB_ARCH}/server/libjvm.so .
-)
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cat << EOF > $PKG/install/doinst.sh
-# Clean up a potential upgrade mess caused by changing the
-# installation directory to /usr/lib${LIBDIRSUFFIX}/java/:
-if [ -L usr/lib${LIBDIRSUFFIX}/java ]; then
-  rm -rf usr/lib${LIBDIRSUFFIX}/java
-  mkdir -p usr/lib${LIBDIRSUFFIX}/java/man
-  mkdir -p usr/lib${LIBDIRSUFFIX}/java/lib/${LIB_ARCH}/server
-  mkdir -p usr/lib/java/lib${LIBDIRSUFFIX}/${LIB_ARCH}/client
-  mkdir -p usr/lib${LIBDIRSUFFIX}/java/javaws
-  mkdir -p usr/lib${LIBDIRSUFFIX}/java/bin
-  mkdir -p usr/lib${LIBDIRSUFFIX}/mozilla/plugins
-fi
-if [ -L ControlPanel ]; then
-  rm -f ControlPanel
-fi
-if [ -L ja ]; then
-  rm -f ja
-fi
-if [ -L javaws ]; then
-  rm -f javaws
-fi
-if [ -L libjsig.so ]; then
-  rm -f libjsig.so
-fi
-# End cleanup.
-EOF
-
-# Install the desktop/mime files:
-mkdir -p $PKG/usr/share/{applications,icons,mime}
-cp -a $PKG/usr/lib${LIBDIRSUFFIX}/java/lib/desktop/applications/* \
-  $PKG/usr/share/applications/
-cp -a $PKG/usr/lib${LIBDIRSUFFIX}/java/lib/desktop/icons/hicolor \
-  $PKG/usr/share/icons/
-cp -a $PKG/usr/lib${LIBDIRSUFFIX}/java/lib/desktop/mime/packages \
-  $PKG/usr/share/mime/
-
-# We ship the package unmodified, so we do not compress manpages.
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/jre-$(echo $VERSION | tr - _)-${ARCH}-$BUILD.txz
-
diff --git a/source/l/jre/slack-desc b/source/l/jre/slack-desc
deleted file mode 100644
index aa015153..00000000
--- a/source/l/jre/slack-desc
+++ /dev/null
@@ -1,18 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-   |-----handy-ruler------------------------------------------------------|
-jre: Java(TM) 2 Platform Standard Edition Runtime Environment,
-jre: Version 6.0 update 20.
-jre:
-jre: The J2SE(TM) Runtime Environment (JRE) is intended for software
-jre: developers and vendors to redistribute with their applications.
-jre: It contains the Java virtual machine, runtime class libraries, and
-jre: Java application launcher that are necessary to run programs written
-jre: in the Java programming language.
-jre:
-jre: If you need development tools, obtain the jdk from /extra, or see the
-jre: Sun Microsystems web page:   http://java.sun.com/
diff --git a/source/l/libao/libao.SlackBuild b/source/l/libao/libao.SlackBuild
index 0ad669cb..1c7239aa 100755
--- a/source/l/libao/libao.SlackBuild
+++ b/source/l/libao/libao.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,11 +21,21 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=0.8.8
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+PKGNAM=libao
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
 
 if [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
@@ -54,7 +64,7 @@ find . \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-  $ARCH-slackware-linux
+  --build=$ARCH-slackware-linux
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
@@ -67,7 +77,7 @@ gzip -9 $PKG/usr/man/man?/*.?
 
 mv $PKG/usr/share/doc $PKG/usr
 cp -a \
-  AUTHORS COPYING README TODO \
+  AUTHORS COPYING* README* TODO \
   $PKG/usr/doc/libao-$VERSION
 
 mkdir -p $PKG/install
diff --git a/source/l/libart_lgpl/libart_lgpl.SlackBuild b/source/l/libart_lgpl/libart_lgpl.SlackBuild
index e0f71067..f7305f90 100755
--- a/source/l/libart_lgpl/libart_lgpl.SlackBuild
+++ b/source/l/libart_lgpl/libart_lgpl.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,11 +21,22 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=2.3.20
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+PKGNAM=libart_lgpl
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-libart_lgpl
@@ -41,11 +52,14 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 cd $TMP
 rm -rf libart_lgpl-$VERSION
-tar xvf $CWD/libart_lgpl-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/libart_lgpl-$VERSION.tar.?z* || exit 1
 cd libart_lgpl-$VERSION
 chown -R root:root .
 find . \
@@ -58,7 +72,7 @@ CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-  $ARCH-slackware-linux
+  --build=$ARCH-slackware-linux
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
@@ -68,7 +82,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 
 mkdir -p $PKG/usr/doc/libart_lgpl-$VERSION
 cp -a \
-  AUTHORS COPYING NEWS README \
+  AUTHORS COPYING* NEWS README* \
   $PKG/usr/doc/libart_lgpl-$VERSION
 
 mkdir -p $PKG/install
diff --git a/source/l/libcaca/libcaca.SlackBuild b/source/l/libcaca/libcaca.SlackBuild
index 2803f484..5c386be4 100755
--- a/source/l/libcaca/libcaca.SlackBuild
+++ b/source/l/libcaca/libcaca.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,19 @@
 
 
 PKGNAM=libcaca
-VERSION=${VERSION:-0.99.beta16}
-ARCH=${ARCH:-x86_64}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-3}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
@@ -43,11 +52,14 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
 cd ${PKGNAM}-$VERSION
 
 # Make sure ownerships and permissions are sane:
@@ -107,7 +119,7 @@ fi
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  AUTHORS COPYING* NEWS NOTES README THANKS \
+  AUTHORS COPYING* NEWS NOTES README* THANKS \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 rm -rf $PKG/usr/share/doc
 
diff --git a/source/l/libcap/libcap-2.19.tar.bz2.sign b/source/l/libcap/libcap-2.19.tar.bz2.sign
deleted file mode 100644
index 23e2c398..00000000
--- a/source/l/libcap/libcap-2.19.tar.bz2.sign
+++ /dev/null
@@ -1,8 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-Comment: See http://www.kernel.org/signature.html for info
-
-iD8DBQBLTn0myGugalF9Dw4RAkEcAJ9zpWMkph0bSL/WfNPHtIayydTUOQCeMoiN
-DC9y+17zdyaaieDE7aH2rfs=
-=YEBM
------END PGP SIGNATURE-----
diff --git a/source/l/libcap/libcap-2.20.tar.sign b/source/l/libcap/libcap-2.20.tar.sign
new file mode 100644
index 00000000..21c50722
--- /dev/null
+++ b/source/l/libcap/libcap-2.20.tar.sign
@@ -0,0 +1,8 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+Comment: See http://www.kernel.org/signature.html for info
+
+iD8DBQBNNtZOyGugalF9Dw4RAhNYAJ4hyECyyIeN/d8WBPq8xeosRuO5egCfQFdk
+SykdiTKqeb+JHeiCSI9GYTk=
+=Rz1c
+-----END PGP SIGNATURE-----
diff --git a/source/l/libcap/libcap.SlackBuild b/source/l/libcap/libcap.SlackBuild
index f77ad6e5..57cfc584 100755
--- a/source/l/libcap/libcap.SlackBuild
+++ b/source/l/libcap/libcap.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -64,7 +64,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP 
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
 cd $PKGNAM-$VERSION || exit 1
 
 zcat $CWD/libcap.capability.h.fix.broken.includes.diff.gz | patch -p1 || exit 1
@@ -86,12 +86,6 @@ chmod 755 $PKG/lib${LIBDIRSUFFIX}/libcap.so*
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
-# Static libs are better placed under /usr:
-if [ -r $PKG/lib${LIBDIRSUFFIX}/libcap.a ]; then
-  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
-  mv $PKG/lib${LIBDIRSUFFIX}/libcap.a $PKG/usr/lib${LIBDIRSUFFIX}
-fi
-
 # Add included scripts
 ( cd contrib || exit 1
   for file in pcaps4convenience pcaps4server pcaps4suid0 ; do
diff --git a/source/l/libcap/libcap.capability.h.fix.broken.includes.diff b/source/l/libcap/libcap.capability.h.fix.broken.includes.diff
index 5a4fcbcf..dcf01e7a 100644
--- a/source/l/libcap/libcap.capability.h.fix.broken.includes.diff
+++ b/source/l/libcap/libcap.capability.h.fix.broken.includes.diff
@@ -1,11 +1,14 @@
---- ./libcap/include/sys/capability.h.orig	2008-07-10 01:18:40.000000000 -0500
-+++ ./libcap/include/sys/capability.h	2009-04-11 13:19:33.000000000 -0500
-@@ -19,7 +19,7 @@
+--- ./libcap/include/sys/capability.h.orig	2009-08-27 00:01:01.000000000 -0500
++++ ./libcap/include/sys/capability.h	2011-02-08 14:24:36.000000000 -0600
+@@ -19,9 +19,9 @@
   * information for the user library.
   */
  
 -#include <sys/types.h>
-+#include <linux/types.h>
- #include <stdint.h>
+-#include <stdint.h>
+ #include <linux/types.h>
++#include <stdint.h>
++#include <sys/types.h>
  
  /*
+  * Required to limit what gets defined in the kernel header file.
diff --git a/source/l/libcddb/libcddb.SlackBuild b/source/l/libcddb/libcddb.SlackBuild
index 3785576e..6891d13f 100755
--- a/source/l/libcddb/libcddb.SlackBuild
+++ b/source/l/libcddb/libcddb.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +22,21 @@
 
 
 PKGNAM=libcddb
-VERSION=${VERSION:-$(echo $(basename $(echo $PRGNAM-*.tar.bz2 | cut -f 2 -d -) .tar.bz2) | cut -f 2 -d -)}
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-${PKGNAM}
@@ -42,11 +52,14 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
 cd ${PKGNAM}-$VERSION
 
 # Make sure ownerships and permissions are sane:
@@ -100,9 +113,17 @@ fi
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  ABOUT-NLS AUTHORS COPYING INSTALL NEWS README THANKS TODO \
+  ABOUT-NLS AUTHORS COPYING* INSTALL NEWS README* THANKS TODO \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source/l/libdbusmenu-qt/libdbusmenu-qt.SlackBuild b/source/l/libdbusmenu-qt/libdbusmenu-qt.SlackBuild
new file mode 100755
index 00000000..7e14ad03
--- /dev/null
+++ b/source/l/libdbusmenu-qt/libdbusmenu-qt.SlackBuild
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+# Copyright 2010  Eric Hameleers, Eindhoven, The Netherlands
+# Copyright 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+# Pull this package from git due to some copyright related
+# problems going on at Canonical...
+# git clone git://gitorious.org/dbusmenu/dbusmenu-qt.git dbusmenu-qt
+#
+# Get version number from
+# grep dbusmenu_qt_VERSION dbusmenu-qt/CMakeLists.txt
+
+PKGNAM=libdbusmenu-qt
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:--j6}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION || exit 1
+
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+  QTDIR=/usr/lib${LIBDIRSUFFIX}/qt \
+  PATH=$QTDIR/bin:$PATH \
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    ..
+   make $NUMJOBS || make || exit 1
+   make install DESTDIR=$PKG || exit 1
+cd ..
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  COPYING NEWS README \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/l/libdbusmenu-qt/slack-desc b/source/l/libdbusmenu-qt/slack-desc
new file mode 100644
index 00000000..0a8aba0e
--- /dev/null
+++ b/source/l/libdbusmenu-qt/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-----------------------------------------------------|
+libdbusmenu-qt: libdbusmenu-qt (Qt implementation of the DBusMenu spec)
+libdbusmenu-qt:
+libdbusmenu-qt: This library provides a Qt implementation of the DBusMenu protocol.
+libdbusmenu-qt: The DBusMenu protocol makes it possible for applications to export
+libdbusmenu-qt: and import their menus over DBus.
+libdbusmenu-qt:
+libdbusmenu-qt:
+libdbusmenu-qt:
+libdbusmenu-qt:
+libdbusmenu-qt: Homepage:  http://people.canonical.com/~agateau/dbusmenu/
+libdbusmenu-qt:
diff --git a/source/l/libdvdread/libdvdread.SlackBuild b/source/l/libdvdread/libdvdread.SlackBuild
index 13e33849..5dbf618e 100755
--- a/source/l/libdvdread/libdvdread.SlackBuild
+++ b/source/l/libdvdread/libdvdread.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,10 +21,20 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-PRGNAM=libdvdread
+PKGNAM=libdvdread
 VERSION=4.1.3
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:--j6}
 
 if [ "$ARCH" = "i486" ]; then
@@ -36,18 +46,21 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
 
 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
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION || exit 1
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -70,14 +83,22 @@ CXXFLAGS="$SLKCFLAGS" \
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  AUTHORS ChangeLog COPYING DEVELOPMENT-POLICY.txt INSTALL NEWS README TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+  AUTHORS COPYING* DEVELOPMENT-POLICY.txt INSTALL NEWS README* TODO \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source/l/libelf/libelf.SlackBuild b/source/l/libelf/libelf.SlackBuild
new file mode 100755
index 00000000..66cb915c
--- /dev/null
+++ b/source/l/libelf/libelf.SlackBuild
@@ -0,0 +1,139 @@
+#!/bin/sh
+
+# Copyright 2010, 2011  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=libelf
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION
+
+chown -R root:root .
+find . \
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --sysconfdir=/etc \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --disable-compat \
+  --build=$ARCH-slackware-linux
+
+# Build:
+make $NUMJOBS || make || exit 1
+
+# Install:
+make instroot=$PKG install || 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
+)
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  AUTHORS COPYING* INSTALL NEWS README* THANKS TODO \
+  $PKG/usr/doc/${PKGNAM}-$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 files, if any:
+if [ -d $PKG/usr/info ]; then
+  ( cd $PKG/usr/info
+    rm -f dir
+    gzip -9 *
+  )
+fi
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/l/libelf/slack-desc b/source/l/libelf/slack-desc
new file mode 100644
index 00000000..b74bc405
--- /dev/null
+++ b/source/l/libelf/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------------------------------------------------------|
+libelf: libelf (ELF object file access library)
+libelf:
+libelf: Libelf lets you read, modify or create ELF files in an architecture
+libelf: independent way.  The library takes care of size and endian issues,
+libelf: so for example you can process a file for SPARC processors on an
+libelf: Intel based system.  GCC uses libelf for LTO (Link Time Optimization).
+libelf:
+libelf: Project home:  http://www.mr511.de/software/
+libelf:
+libelf:
+libelf:
diff --git a/source/l/libexif/libexif.SlackBuild b/source/l/libexif/libexif.SlackBuild
index 3fce2bef..61b675cb 100755
--- a/source/l/libexif/libexif.SlackBuild
+++ b/source/l/libexif/libexif.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -88,7 +88,7 @@ strip -g $PKG/usr/lib/*.a
 rm -rf $PKG/usr/share/doc
 mkdir -p $PKG/usr/doc/libexif-$VERSION
 cp -a \
-  ABOUT-NLS AUTHORS COPYING NEWS README \
+  ABOUT-NLS AUTHORS COPYING* NEWS README* \
   $PKG/usr/doc/libexif-$VERSION
 
 # If there's a ChangeLog, installing at least part of the recent history
diff --git a/source/l/libexif/libexif.pc.diff b/source/l/libexif/libexif.pc.diff
index 283a412e..6940b66c 100644
--- a/source/l/libexif/libexif.pc.diff
+++ b/source/l/libexif/libexif.pc.diff
@@ -1,8 +1,8 @@
---- ./libexif.pc.in.orig	2005-03-17 09:58:18.000000000 -0600
-+++ ./libexif.pc.in	2007-05-28 12:50:35.000000000 -0500
-@@ -8,4 +8,4 @@
- Requires:
+--- ./libexif.pc.in.orig	2009-12-15 17:26:33.000000000 -0600
++++ ./libexif.pc.in	2011-02-09 01:01:59.652998635 -0600
+@@ -9,4 +9,4 @@
  Version: @VERSION@
- Libs: -L${libdir} -lexif -lm
+ Libs: -L${libdir} -lexif
+ Libs.private: -lm
 -Cflags: -I${includedir}
 +Cflags: -I${includedir}/libexif
diff --git a/source/l/libgphoto2/libgphoto2.SlackBuild b/source/l/libgphoto2/libgphoto2.SlackBuild
index fb3efe16..ad1a0e7e 100755
--- a/source/l/libgphoto2/libgphoto2.SlackBuild
+++ b/source/l/libgphoto2/libgphoto2.SlackBuild
@@ -122,10 +122,7 @@ $PKG/usr/bin/print-camera-list hal-fdi-device \
 unset LD_LIBRARY_PATH CAMLIBS LIBDIR   # Unset these just in case
 
 # 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
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
diff --git a/source/l/libgpod/doinst.sh b/source/l/libgpod/doinst.sh
new file mode 100644
index 00000000..72709ca2
--- /dev/null
+++ b/source/l/libgpod/doinst.sh
@@ -0,0 +1,9 @@
+# Ensure sane /tmp permissions which may have been set incorrectly due
+# to a packaging problem caused by a DESTDIR bug in libgpod-0.8.0.
+# Eventually, it will be safe to remove this, but the package contained
+# a wrong permissions /tmp for less than a day, only in -current.
+
+if grep -wq tmp/ var/log/packages/libgpod-* ; then
+  chmod 1777 tmp
+fi
+
diff --git a/source/l/libgpod/libgpod.SlackBuild b/source/l/libgpod/libgpod.SlackBuild
index 013b1816..4adbe650 100755
--- a/source/l/libgpod/libgpod.SlackBuild
+++ b/source/l/libgpod/libgpod.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +22,20 @@
 
 
 PKGNAM=libgpod
-VERSION=${VERSION:-0.7.2}
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
+NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -43,6 +52,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 cd $TMP
@@ -64,8 +76,9 @@ CFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --disable-static \
-  --enable-eject-command \
-  --enable-unmount-command \
+  --without-hal \
+  --enable-udev \
+  --with-temp-mount-dir=/var/run/libgpod/ \
   --build=$ARCH-slackware-linux
 
 # Build and install:
@@ -108,11 +121,22 @@ mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 # or empty doc stubs, but if they are small, they don't hurt.  And someday
 # the above mentioned files may contain something useful!  :-)
 cp -a \
-  AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO  \
+  AUTHORS COPYING* ChangeLog INSTALL NEWS README* TODO  \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 
+# Note to self...
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 
 cd $TMP/package-${PKGNAM}
 /sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/l/libgsf/libgsf.SlackBuild b/source/l/libgsf/libgsf.SlackBuild
index 16d6a2dc..4fd64311 100755
--- a/source/l/libgsf/libgsf.SlackBuild
+++ b/source/l/libgsf/libgsf.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,6 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+PKGNAM=libgsf
 VERSION=${VERSION:-$(echo libgsf-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
@@ -102,7 +103,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 
 mkdir -p $PKG/usr/doc/libgsf-$VERSION
 cp -a \
-  AUTHORS BUGS COPYING* HACKING NEWS README TODO \
+  AUTHORS BUGS COPYING* HACKING NEWS README* TODO \
   $PKG/usr/doc/libgsf-$VERSION
 
 # If there's a ChangeLog, installing at least part of the recent history
diff --git a/source/l/libical/libical.SlackBuild b/source/l/libical/libical.SlackBuild
index 9a54405e..d94b6dc6 100755
--- a/source/l/libical/libical.SlackBuild
+++ b/source/l/libical/libical.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2008 Heinz Wiesinger <pprkut@liwjatan.at>
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,16 +22,25 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-PRGNAM=libical
-VERSION=0.43
-ARCH=${ARCH:-x86_64}
+PKGNAM=libical
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:--j7}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
 
 JAVA=${JAVA:-no}
 
@@ -50,14 +59,17 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* || exit 1
-cd $PRGNAM-$VERSION || exit 1
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION || exit 1
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -82,17 +94,18 @@ CXXFLAGS="$SLKCFLAGS" \
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 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
-)
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-for FILE in \
-  AUTHORS ChangeLog COPYING INSTALL LICENSE NEWS README TEST THANKS TODO
-do
-  zcat $FILE.gz > $PKG/usr/doc/$PRGNAM-$VERSION/$FILE
-done
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* INSTALL LICENSE NEWS README* TEST THANKS TODO \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -101,5 +114,5 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source/l/libid3tag/libid3tag.SlackBuild b/source/l/libid3tag/libid3tag.SlackBuild
index c05badae..30292f99 100755
--- a/source/l/libid3tag/libid3tag.SlackBuild
+++ b/source/l/libid3tag/libid3tag.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,17 @@
 
 PKGNAM=libid3tag
 VERSION=${VERSION:-0.15.1b}
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -37,6 +46,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
@@ -79,7 +91,7 @@ make install DESTDIR=$PKG || exit 1
 # now software is starting to think it's a standard feature.
 # Bah!
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
-cat $CWD/id3tag.pc > $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/id3tag.pc
+cat $CWD/id3tag.pc | sed -e "s#/lib#/lib${LIBDIRSUFFIX}#" > $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/id3tag.pc
 
 # Strip binaries:
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/source/l/libidl/libidl.SlackBuild b/source/l/libidl/libidl.SlackBuild
index f2ea3398..e910a66e 100755
--- a/source/l/libidl/libidl.SlackBuild
+++ b/source/l/libidl/libidl.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,11 +21,21 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=0.8.10
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+VERSION=${VERSION:-$(echo libIDL-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-libIDL
@@ -39,13 +49,16 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf libIDL-$VERSION
-tar xvf $CWD/libIDL-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/libIDL-$VERSION.tar.?z* || exit 1
 cd libIDL-$VERSION
 chown -R root:root .
 find . \
@@ -75,9 +88,17 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 
 mkdir -p $PKG/usr/doc/libIDL-$VERSION
 cp -a \
-  AUTHORS BUGS COPYING HACKING MAINTAINERS NEWS README \
+  AUTHORS BUGS COPYING* HACKING MAINTAINERS NEWS README* \
   $PKG/usr/doc/libIDL-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source/l/libidn/libidn.SlackBuild b/source/l/libidn/libidn.SlackBuild
index 570a3e09..e272f260 100755
--- a/source/l/libidn/libidn.SlackBuild
+++ b/source/l/libidn/libidn.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,11 +21,22 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=1.5
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+PKGNAM=libidn
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -35,6 +46,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
@@ -45,7 +59,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf libidn-$VERSION
-tar xvf $CWD/libidn-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/libidn-$VERSION.tar.?z* || exit 1
 cd libidn-$VERSION
 chown -R root:root .
 find . \
@@ -98,6 +112,14 @@ cp -a \
   libidn/libidn.html \
   $PKG/usr/doc/libidn-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source/l/libieee1284/libieee1284.SlackBuild b/source/l/libieee1284/libieee1284.SlackBuild
index 342fbfd8..ec2cdf50 100755
--- a/source/l/libieee1284/libieee1284.SlackBuild
+++ b/source/l/libieee1284/libieee1284.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +22,20 @@
 
 
 PKGNAM=libieee1284
-VERSION=${VERSION:-0.2.11}
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -37,6 +46,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
@@ -47,7 +59,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
 cd ${PKGNAM}-$VERSION
 
 # Make sure ownerships and permissions are sane:
@@ -103,9 +115,17 @@ fi
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  AUTHORS COPYING ChangeLog NEWS README* \
+  AUTHORS COPYING* NEWS README* \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source/l/libkarma/libkarma.SlackBuild b/source/l/libkarma/libkarma.SlackBuild
index fb17404f..4bc85b01 100755
--- a/source/l/libkarma/libkarma.SlackBuild
+++ b/source/l/libkarma/libkarma.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,19 @@
 
 PKGNAM=libkarma
 VERSION=${VERSION:-0.1.1}
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
+NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -98,13 +107,24 @@ if [ -d $PKG/usr/info ]; then
   )
 fi
 
+Remove executable bit on manpage:
+chmod 0644 $PKG/usr/man/man1/chprop.1.gz
+
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  COPYING ChangeLog INSTALL THANKS TODO \
+  COPYING* INSTALL THANKS README* TODO \
   $PKG/usr/doc/${PKGNAM}-$VERSION
   cp -a tools/TODO $PKG/usr/doc/${PKGNAM}-$VERSION/TODO.tools
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source/l/liblastfm/liblastfm.SlackBuild b/source/l/liblastfm/liblastfm.SlackBuild
index b5d1a401..d87cf0da 100755
--- a/source/l/liblastfm/liblastfm.SlackBuild
+++ b/source/l/liblastfm/liblastfm.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for liblastfm
 
 # Copyright 2009 Vincent Batts
+# Copyright 2011  Patrick J. Volkerding, Sebeka, MN, USA
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
@@ -21,9 +22,9 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM="liblastfm"
-VERSION=0.3.0
-BUILD=${BUILD:-2}
+PKGNAM="liblastfm"
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:--j6}
 
 # Automatically determine the architecture we're building on:
@@ -38,7 +39,7 @@ fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
 
 if [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
@@ -49,8 +50,8 @@ fi
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION || exit 1
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -77,10 +78,10 @@ if [ -d $PKG/usr/man ]; then
   gzip -9 $PKG/usr/man/man?/*
 fi
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  COPYING README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+  COPYING* README* \
+  $PKG/usr/doc/$PKGNAM-$VERSION
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -89,5 +90,5 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source/l/libmad/libmad.SlackBuild b/source/l/libmad/libmad.SlackBuild
index 648b0717..0a78183d 100755
--- a/source/l/libmad/libmad.SlackBuild
+++ b/source/l/libmad/libmad.SlackBuild
@@ -23,10 +23,19 @@
 
 PKGNAM=libmad
 VERSION=${VERSION:-0.15.1b}
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
 BUILD=${BUILD:-3}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -37,6 +46,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
@@ -110,7 +122,7 @@ fi
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  CHANGES COPYING COPYRIGHT CREDITS README TODO VERSION \
+  CHANGES COPYING* COPYRIGHT CREDITS README* TODO VERSION \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 
 mkdir -p $PKG/install
diff --git a/source/l/libmcrypt/libmcrypt.SlackBuild b/source/l/libmcrypt/libmcrypt.SlackBuild
index 91d0b659..510c29ff 100755
--- a/source/l/libmcrypt/libmcrypt.SlackBuild
+++ b/source/l/libmcrypt/libmcrypt.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,19 @@
 
 
 PKGNAM=libmcrypt
-VERSION=${VERSION:-2.5.8}
-ARCH=${ARCH:-x86_64}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
@@ -43,6 +52,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 cd $TMP
@@ -109,6 +121,14 @@ cp -a \
   AUTHORS COPYING* NEWS README* THANKS TODO \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source/l/libmcs/libmcs.SlackBuild b/source/l/libmcs/libmcs.SlackBuild
index 7bea5ec9..cb5d015f 100755
--- a/source/l/libmcs/libmcs.SlackBuild
+++ b/source/l/libmcs/libmcs.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,19 @@
 
 
 PKGNAM=libmcs
-VERSION=${VERSION:-0.7.1}
-ARCH=${ARCH:-x86_64}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 if [ "$ARCH" = "i486" ]; then
@@ -37,6 +46,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
@@ -47,7 +59,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
 cd ${PKGNAM}-$VERSION
 
 # Make sure ownerships and permissions are sane:
@@ -105,7 +117,7 @@ fi
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  AUTHORS COPYING* Mercurial-Access README TODO \
+  AUTHORS COPYING* Mercurial-Access README* TODO \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 
 mkdir -p $PKG/install
diff --git a/source/l/libmowgli/libmowgli.SlackBuild b/source/l/libmowgli/libmowgli.SlackBuild
index 213d43bb..a4375558 100755
--- a/source/l/libmowgli/libmowgli.SlackBuild
+++ b/source/l/libmowgli/libmowgli.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +22,20 @@
 
 
 PKGNAM=libmowgli
-VERSION=${VERSION:-0.6.0}
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -37,6 +46,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
@@ -47,7 +59,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
 cd ${PKGNAM}-$VERSION
 
 # Make sure ownerships and permissions are sane:
@@ -64,8 +76,6 @@ CFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --disable-static \
-  --enable-eject-command \
-  --enable-unmount-command \
   --build=$ARCH-slackware-linux
 
 # Build and install:
diff --git a/source/l/libmpc/libmpc.SlackBuild b/source/l/libmpc/libmpc.SlackBuild
new file mode 100755
index 00000000..c6674125
--- /dev/null
+++ b/source/l/libmpc/libmpc.SlackBuild
@@ -0,0 +1,111 @@
+#!/bin/sh
+
+# Copyright 2010, 2011  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.
+
+
+# I really do not like to package source under a different name than upstream,
+# but in this case there is a media player frontend that is well-known as
+# mpc already, and it appears that other projects are packaging this mpc as
+# libmpc instead.  It is probably best to follow suit.
+SRCNAM=mpc
+PKGNAM=libmpc
+VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$SRCNAM
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1
+cd $SRCNAM-$VERSION
+chown -R root:root .
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --infodir=/usr/info \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --enable-static=yes \
+  --enable-shared=yes \
+  --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
+
+# Hardly a savings doing this...
+#strip -g $PKG/usr/lib${LIBDIRSUFFIX}/*.a
+
+rm -f $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* INSTALL NEWS README* TODO \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-${VERSION}-${ARCH}-${BUILD}.txz
+
diff --git a/source/l/libmpc/slack-desc b/source/l/libmpc/slack-desc
new file mode 100644
index 00000000..31520833
--- /dev/null
+++ b/source/l/libmpc/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------------------------------------------------------|
+libmpc: libmpc (Multiple Precision Complex Library)
+libmpc:
+libmpc: mpc is a complex floating-point library with exact rounding.  It is
+libmpc: based on the GNU MPFR floating-point library (http://www.mpfr.org/),
+libmpc: which is itself based on the GNU MP library (http://gmplib.org/).
+libmpc:
+libmpc: Homepage:  http://www.multiprecision.org
+libmpc:
+libmpc:
+libmpc:
+libmpc:
diff --git a/source/l/libnjb/libnjb.SlackBuild b/source/l/libnjb/libnjb.SlackBuild
index 28552607..a91aa660 100755
--- a/source/l/libnjb/libnjb.SlackBuild
+++ b/source/l/libnjb/libnjb.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +22,20 @@
 
 
 PKGNAM=libnjb
-VERSION=${VERSION:-2.2.6}
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-4}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-5}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
+NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -43,11 +52,14 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
 cd ${PKGNAM}-$VERSION
 
 # Make sure ownerships and permissions are sane:
@@ -115,14 +127,19 @@ rmdir $PKG/usr/share/doc
 rmdir $PKG/usr/share
 # Yes I know about '-p'  :-)
 
-# Usually I no longer install bloated ChangeLogs (unless I wrote them ;-),
-# or empty doc stubs, but if they are small, they don't hurt.  And someday
-# the above mentioned files may contain something useful!  :-)
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  AUTHORS ChangeLog FAQ HACKING INSTALL LICENSE Makefile.in README \
+  AUTHORS COPYING* FAQ HACKING INSTALL LICENSE Makefile.in README* \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source/l/libnl/libnl.SlackBuild b/source/l/libnl/libnl.SlackBuild
index 2c8ad403..a71ef471 100755
--- a/source/l/libnl/libnl.SlackBuild
+++ b/source/l/libnl/libnl.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2007  Andrew Psaltis, Vienna, VA, USA
-# Copyright 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
@@ -23,14 +23,23 @@
 # Modified by Roberto Neri <rneri@libero.it>
 # Modified by Robby Workman <rworkman@slackware.com> for inclusion
 
-PRGNAM=libnl
-VERSION=1.1
-ARCH=${ARCH:-x86_64}
+PKGNAM=libnl
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
 
 NUMJOBS=${NUMJOBS:--j6}
 
@@ -43,14 +52,17 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
-rm -rf $PRGNAM-$SRC_VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
+rm -rf $PKGNAM-$SRC_VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION || exit 1
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -77,14 +89,14 @@ chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/libnl*
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  COPYING \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+  COPYING* README* \
+  $PKG/usr/doc/$PKGNAM-$VERSION
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source/l/libnotify/libnotify.SlackBuild b/source/l/libnotify/libnotify.SlackBuild
index 671a6d85..84f4c5b3 100755
--- a/source/l/libnotify/libnotify.SlackBuild
+++ b/source/l/libnotify/libnotify.SlackBuild
@@ -23,24 +23,21 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=libnotify
-VERSION=0.4.5
-BUILD=${BUILD:-2}
+PKGNAM=libnotify
+VERSION=0.5.2
+BUILD=${BUILD:-1}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) export ARCH=i486 ;;
     arm*) export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
   esac
 fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
+PKG=$TMP/package-$PKGNAM
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -59,11 +56,11 @@ fi
 set -eu
 
 rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
+mkdir -p $TMP $PKG
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
-cd $PRGNAM-$VERSION
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z*
+cd $PKGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
@@ -78,15 +75,18 @@ CFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install-strip DESTDIR=$PKG
+make install DESTDIR=$PKG
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
-( cd $PKG/usr/doc/$PRGNAM-$VERSION ; ln -s ../../share/gtk-doc/html/libnotify html )
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+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/$PKGNAM-$VERSION
+cp -a AUTHORS ChangeLog COPYING README $PKG/usr/doc/$PKGNAM-$VERSION
+( cd $PKG/usr/doc/$PKGNAM-$VERSION ; ln -s ../../share/gtk-doc/html/libnotify html )
+cat $CWD/$PKGNAM.SlackBuild > $PKG/usr/doc/$PKGNAM-$VERSION/$PKGNAM.SlackBuild
 
 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
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/l/liboggz/liboggz.SlackBuild b/source/l/liboggz/liboggz.SlackBuild
new file mode 100755
index 00000000..2132b7a1
--- /dev/null
+++ b/source/l/liboggz/liboggz.SlackBuild
@@ -0,0 +1,113 @@
+#!/bin/sh
+
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+PKGNAM=liboggz
+VERSION=${VERSION:-$(echo liboggz-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-liboggz
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf liboggz-$VERSION
+tar xvf $CWD/liboggz-$VERSION.tar.?z* || exit 1
+cd liboggz-$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} \
+  --mandir=/usr/man \
+  --disable-static \
+  --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
+
+# 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
+mv $PKG/usr/share/doc/liboggz $PKG/usr/doc/liboggz-$VERSION
+cp -a \
+  AUTHORS CHANGES COPYING* NEWS PATCHES README* TODO \
+  $PKG/usr/doc/liboggz-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/liboggz-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/l/liboggz/slack-desc b/source/l/liboggz/slack-desc
new file mode 100644
index 00000000..db3511e5
--- /dev/null
+++ b/source/l/liboggz/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------------------------------------------------------|
+liboggz: liboggz (Ogg inspect/edit/validate tools and library)
+liboggz:
+liboggz: Oggz comprises liboggz and the tool oggz, which provides commands to
+liboggz: inspect, edit and validate Ogg files.  The oggz-chop tool can also be
+liboggz: used to serve time ranges of Ogg media over HTTP by any web server
+liboggz: that supports CGI.  liboggz is a C library for reading and writing Ogg
+liboggz: files and streams.  It offers various improvements over the reference
+liboggz: libogg, including support for seeking, validation and timestamp
+liboggz: interpretation.
+liboggz:
+liboggz:
diff --git a/source/l/liboil/liboil.SlackBuild b/source/l/liboil/liboil.SlackBuild
index 2005a547..ec2bcf11 100755
--- a/source/l/liboil/liboil.SlackBuild
+++ b/source/l/liboil/liboil.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2008 Michiel van Wessem <michiel@slackbuilds.org>
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -28,15 +28,25 @@
 # Modified by Robby Workman <rworkman@slackware.com>
 
 
-PRGNAM=liboil
-VERSION=0.3.16
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:--j7}
+PKGNAM=liboil
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:--j7}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -47,14 +57,17 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* || exit 1
-cd $PRGNAM-$VERSION
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -80,13 +93,14 @@ 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/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  AUTHORS BUG-REPORTING COPYING* HACKING NEWS README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+  AUTHORS BUG-REPORTING COPYING* HACKING NEWS README* \
+  $PKG/usr/doc/$PKGNAM-$VERSION
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/l/libpcap/libpcap.SlackBuild b/source/l/libpcap/libpcap.SlackBuild
new file mode 100755
index 00000000..0460087a
--- /dev/null
+++ b/source/l/libpcap/libpcap.SlackBuild
@@ -0,0 +1,132 @@
+#!/bin/sh
+
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PKGNAM=libpcap
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.gz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-libpcap
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf libpcap-$VERSION
+tar xvf $CWD/libpcap-$VERSION.tar.gz || exit 1
+cd libpcap-$VERSION || exit 1
+
+find . -type d -name CVS -depth -exec rm -rf {} \;
+chown -R root:root .
+find . \
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+CFLAGS="$(getconf LFS_CFLAGS)" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/libpcap-$VERSION \
+  --enable-ipv6 \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
+make shared $NUMJOBS || make || exit 1
+
+mkdir -p $PKG/usr/bin  # otherwise it errors out on install
+make install DESTDIR=$PKG || exit 1
+
+strip --strip-debug libpcap.so.1.?.?
+
+cp libpcap.so.?.?.? $PKG/usr/lib${LIBDIRSUFFIX}
+( cd $PKG/usr/lib${LIBDIRSUFFIX}
+  ln -sf libpcap.so.1.?.? libpcap.so.1
+  ln -sf libpcap.so.1 libpcap.so.0
+  ln -sf libpcap.so.1 libpcap.so
+)
+
+mkdir -p $PKG/usr/doc/libpcap-$VERSION
+cp -a \
+  CHANGES CREDITS INSTALL.txt LICENSE README* TODO VERSION \
+  $PKG/usr/doc/libpcap-$VERSION
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+# Use symbolic links in the man pages:
+( cd $PKG/usr/man/man3
+  ln -sf pcap_datalink_val_to_name.3pcap pcap_datalink_val_to_description.3pcap
+  ln -sf pcap_dump_open.3pcap pcap_dump_fopen.3pcap
+  ln -sf pcap_geterr.3pcap pcap_perror.3pcap
+  ln -sf pcap_inject.3pcap pcap_sendpacket.3pcap
+  ln -sf pcap_loop.3pcap pcap_dispatch.3pcap
+  ln -sf pcap_major_version.3pcap pcap_minor_version.3pcap
+  ln -sf pcap_next_ex.3pcap pcap_next.3pcap
+  ln -sf pcap_open_offline.3pcap pcap_fopen_offline.3pcap
+  ln -sf pcap_setnonblock.3pcap pcap_getnonblock.3pcap
+)
+
+# 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 *.?
+        gzip -9 *.?pcap
+      )
+    done
+  )
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/l/libpcap/slack-desc b/source/l/libpcap/slack-desc
new file mode 100644
index 00000000..3b304097
--- /dev/null
+++ b/source/l/libpcap/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------------------------------------------------------|
+libpcap: libpcap (packet capture library)
+libpcap:
+libpcap: libpcap is a library for user-level packet capture.  libpcap provides
+libpcap: a portable framework for low-level network monitoring.  Applications
+libpcap: include network statistics collection, security monitoring, network
+libpcap: debugging, etc.  The tcpdump utility uses libpcap.
+libpcap:
+libpcap: Project homepage:  http://sourceforge.net/projects/libpcap/
+libpcap:
+libpcap:
+libpcap:
diff --git a/source/l/libplist/libplist.SlackBuild b/source/l/libplist/libplist.SlackBuild
new file mode 100755
index 00000000..547bdab9
--- /dev/null
+++ b/source/l/libplist/libplist.SlackBuild
@@ -0,0 +1,125 @@
+#!/bin/sh
+
+# Copyright 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+PKGNAM=libplist
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/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"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+cd $TMP
+rm -rf ${PKGNAM}-${VERSION}
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || 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 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    ..
+   make $NUMJOBS || make || exit 1
+   make install DESTDIR=$PKG || exit 1
+cd -
+
+# 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 some docs:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  AUTHORS COPYING* README* \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/l/libplist/slack-desc b/source/l/libplist/slack-desc
new file mode 100644
index 00000000..cbe02442
--- /dev/null
+++ b/source/l/libplist/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------------------------------------------------------|
+libplist: libplist (A library for Apple Binary and XML Property Lists) 
+libplist:
+libplist: libplist is a library that attempts to support Apple Binary and XML
+libplist: Property Lists.  It is used by libgpod.
+libplist:
+libplist: The libplist homepage:  http://www.libimobiledevice.org/
+libplist:
+libplist:
+libplist:
+libplist:
+libplist:
diff --git a/source/l/libpng/libpng.SlackBuild b/source/l/libpng/libpng.SlackBuild
index 83083c0b..1b82edd5 100755
--- a/source/l/libpng/libpng.SlackBuild
+++ b/source/l/libpng/libpng.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2005-2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,8 +21,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION_OLD=1.2.43
-VERSION_NEW=1.4.2
+VERSION_OLD=1.2.44
+VERSION_NEW=1.4.5
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
diff --git a/source/l/libraw1394/libraw1394-2.0.5.tar.sign b/source/l/libraw1394/libraw1394-2.0.5.tar.sign
deleted file mode 100644
index a0d52cf1..00000000
--- a/source/l/libraw1394/libraw1394-2.0.5.tar.sign
+++ /dev/null
@@ -1,8 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-Comment: See http://www.kernel.org/signature.html for info
-
-iD8DBQBLSEqvyGugalF9Dw4RAueNAJ9LX2wQyXxyDS0Jqet7Om5arr0+wwCeMJUV
-7mZJlZrVGYg2b+bcycVTf2U=
-=louL
------END PGP SIGNATURE-----
diff --git a/source/l/libraw1394/libraw1394-2.0.7.tar.sign b/source/l/libraw1394/libraw1394-2.0.7.tar.sign
new file mode 100644
index 00000000..2a6626e0
--- /dev/null
+++ b/source/l/libraw1394/libraw1394-2.0.7.tar.sign
@@ -0,0 +1,8 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+Comment: See http://www.kernel.org/signature.html for info
+
+iD8DBQBNdoQ3yGugalF9Dw4RApqmAJ9f0hAzpDhGT3/1c3w14Dz1y50OKgCgjIxl
+n60zSQuslerWn+OzenEHYvQ=
+=r/g1
+-----END PGP SIGNATURE-----
diff --git a/source/l/librsvg/librsvg.SlackBuild b/source/l/librsvg/librsvg.SlackBuild
index bd22ff82..ff765afe 100755
--- a/source/l/librsvg/librsvg.SlackBuild
+++ b/source/l/librsvg/librsvg.SlackBuild
@@ -20,11 +20,10 @@
 # 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 librsvg
-
 
+PKGNAM=librsvg
 VERSION=${VERSION:-$(echo librsvg-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -70,9 +69,6 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-# Patch configure to detect seamonkey-config or mozilla-config
-zcat $CWD/librsvg_seamonkey-config.diff.gz | patch -p1 --verbose || exit 1
-
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -83,6 +79,7 @@ CFLAGS="$SLKCFLAGS" \
   --enable-static=no \
   --with-svgz \
   --build=$ARCH-slackware-linux
+#  --with-croco \
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
@@ -90,10 +87,8 @@ 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
 
-( 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/usr/man -type f -exec gzip -9 {} \;
+for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/librsvg-$VERSION
 cp -a \
diff --git a/source/l/librsvg/librsvg_seamonkey-config.diff b/source/l/librsvg/librsvg_seamonkey-config.diff
deleted file mode 100644
index 48f830e7..00000000
--- a/source/l/librsvg/librsvg_seamonkey-config.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur librsvg-2.22.3.orig/configure librsvg-2.22.3/configure
---- librsvg-2.22.3.orig/configure	2008-09-22 19:54:49.000000000 -0500
-+++ librsvg-2.22.3/configure	2008-10-05 17:10:04.772100035 -0500
-@@ -24636,7 +24636,7 @@
- 
- if test "x$test_mozilla_plugin" != "xno"; then
-    if test -z "$MOZILLA_CONFIG"; then
--      for ac_prog in mozilla-config firefox-config xulrunner-config
-+      for ac_prog in mozilla-config firefox-config xulrunner-config seamonkey-config
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
diff --git a/source/l/libsamplerate/libsamplerate.SlackBuild b/source/l/libsamplerate/libsamplerate.SlackBuild
index cc4c5d50..5096157a 100755
--- a/source/l/libsamplerate/libsamplerate.SlackBuild
+++ b/source/l/libsamplerate/libsamplerate.SlackBuild
@@ -4,9 +4,9 @@
 # Written by paul wisehart paul@1ud2.com
 # Modified by Robby Workman <rworkman@slackbuilds.org>
 
-PRGNAM=libsamplerate
+PKGNAM=libsamplerate
 VERSION=0.1.7
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -20,7 +20,7 @@ fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
@@ -40,9 +40,9 @@ 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
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
@@ -62,12 +62,12 @@ 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
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING README doc/* $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a AUTHORS COPYING* NEWS README* doc/* $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 $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/l/libsndfile/libsndfile.SlackBuild b/source/l/libsndfile/libsndfile.SlackBuild
new file mode 100755
index 00000000..f06ff3b6
--- /dev/null
+++ b/source/l/libsndfile/libsndfile.SlackBuild
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+# Slackware build script for libsndfile
+
+# Copyright 2010  paul wisehart, Hyattsville, MD, USA
+# Copyright 2010  Robby Workman, Northport, Alabama, USA
+# Copyright 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PKGNAM=libsndfile
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP || exit 1
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION || exit 1
+
+chown -R root:root .
+chmod -R a-s,u+w,go+r-w .
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+  ./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --htmldir=/usr/doc/$PKGNAM-$VERSION/html \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+make htmldocdir=/usr/doc/$PKGNAM-$VERSION/html || exit 1
+make htmldocdir=/usr/doc/$PKGNAM-$VERSION/html DESTDIR=$PKG install
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* INSTALL NEWS README* \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
+mkdir -p $PKG/install
+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/l/libsndfile/slack-desc b/source/l/libsndfile/slack-desc
new file mode 100644
index 00000000..2b84cb2d
--- /dev/null
+++ b/source/l/libsndfile/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---------------------------------------------------|
+libsndfile: libsndfile (C library for reading and writing wav files)
+libsndfile:
+libsndfile: Libsndfile is a C library for reading and writing files containing
+libsndfile: sampled sound (such as MS Windows WAV and Apple/SGI AIFF format).
+libsndfile:
+libsndfile: Homepage:  http://www.mega-nerd.com/libsndfile/
+libsndfile:
+libsndfile:
+libsndfile:
+libsndfile:
+libsndfile:
diff --git a/source/l/libspectre/libspectre.SlackBuild b/source/l/libspectre/libspectre.SlackBuild
index 5b6b0650..39668be3 100755
--- a/source/l/libspectre/libspectre.SlackBuild
+++ b/source/l/libspectre/libspectre.SlackBuild
@@ -23,12 +23,7 @@
 
 PRGNAM=libspectre
 VERSION=${VERSION:-0.2.5}
-BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:--j6}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -40,6 +35,12 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+NUMJOBS=${NUMJOBS:--j6}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PRGNAM
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
diff --git a/source/l/libtermcap/libtermcap.SlackBuild b/source/l/libtermcap/libtermcap.SlackBuild
index d306fe66..12e02763 100755
--- a/source/l/libtermcap/libtermcap.SlackBuild
+++ b/source/l/libtermcap/libtermcap.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=1.2.3
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-7}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-libtermcap
@@ -75,3 +84,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 makepkg -l y -c n $TMP/libtermcap-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/l/libtiff/libtiff-CVE-2011-0192.patch b/source/l/libtiff/libtiff-CVE-2011-0192.patch
new file mode 100644
index 00000000..892f70e0
--- /dev/null
+++ b/source/l/libtiff/libtiff-CVE-2011-0192.patch
@@ -0,0 +1,27 @@
+Protect against a fax VL(n) codeword commanding a move left.  Without
+this, a malicious input file can generate an indefinitely large series
+of runs without a0 ever reaching the right margin, thus overrunning
+our buffer of run lengths.  Per CVE-2011-0192.  This is a modified
+version of a patch proposed by Drew Yao of Apple Product Security.
+It adds an unexpected() report, and disallows the equality case except
+for the first run of a line, since emitting a run without increasing a0
+still allows buffer overrun.  (We have to allow it for the first run to
+cover the case of encoding a zero-length run at start of line using VL.)
+
+
+diff -Naur tiff-3.9.4.orig/libtiff/tif_fax3.h tiff-3.9.4/libtiff/tif_fax3.h
+--- tiff-3.9.4.orig/libtiff/tif_fax3.h	2010-06-08 14:50:42.000000000 -0400
++++ tiff-3.9.4/libtiff/tif_fax3.h	2011-03-10 12:11:20.850839162 -0500
+@@ -478,6 +478,12 @@
+ 	    break;							\
+ 	case S_VL:							\
+ 	    CHECK_b1;							\
++	    if (b1 <= (int) (a0 + TabEnt->Param)) {			\
++		if (b1 < (int) (a0 + TabEnt->Param) || pa != thisrun) {	\
++		    unexpected("VL", a0);				\
++		    goto eol2d;						\
++		}							\
++	    }								\
+ 	    SETVALUE(b1 - a0 - TabEnt->Param);				\
+ 	    b1 -= *--pb;						\
+ 	    break;							\
diff --git a/source/l/libtiff/libtiff-CVE-2011-1167.patch b/source/l/libtiff/libtiff-CVE-2011-1167.patch
new file mode 100644
index 00000000..d3fcf6f6
--- /dev/null
+++ b/source/l/libtiff/libtiff-CVE-2011-1167.patch
@@ -0,0 +1,53 @@
+Upstream patch for CVE-2011-1167, heap-based buffer overflow in thunder
+decoder (ZDI-CAN-1004).
+
+
+diff -Naur tiff-3.9.4.orig/libtiff/tif_thunder.c tiff-3.9.4/libtiff/tif_thunder.c
+--- tiff-3.9.4.orig/libtiff/tif_thunder.c	2010-06-08 14:50:43.000000000 -0400
++++ tiff-3.9.4/libtiff/tif_thunder.c	2011-03-18 12:17:13.635796403 -0400
+@@ -55,12 +55,32 @@
+ static const int twobitdeltas[4] = { 0, 1, 0, -1 };
+ static const int threebitdeltas[8] = { 0, 1, 2, 3, 0, -3, -2, -1 };
+ 
+-#define	SETPIXEL(op, v) { \
+-	lastpixel = (v) & 0xf; \
+-	if (npixels++ & 1) \
+-	    *op++ |= lastpixel; \
+-	else \
++#define	SETPIXEL(op, v) {                     \
++	lastpixel = (v) & 0xf;                \
++        if ( npixels < maxpixels )         \
++        {                                     \
++	  if (npixels++ & 1)                  \
++	    *op++ |= lastpixel;               \
++	  else                                \
+ 	    op[0] = (tidataval_t) (lastpixel << 4); \
++        }                                     \
++}
++
++static int
++ThunderSetupDecode(TIFF* tif)
++{
++	static const char module[] = "ThunderSetupDecode";
++
++        if( tif->tif_dir.td_bitspersample != 4 )
++        {
++                TIFFErrorExt(tif->tif_clientdata, module,
++                             "Wrong bitspersample value (%d), Thunder decoder only supports 4bits per sample.",
++                             (int) tif->tif_dir.td_bitspersample );
++                return 0;
++        }
++        
++
++	return (1);
+ }
+ 
+ static int
+@@ -151,6 +171,7 @@
+ 	(void) scheme;
+ 	tif->tif_decoderow = ThunderDecodeRow;
+ 	tif->tif_decodestrip = ThunderDecodeRow;
++	tif->tif_setupdecode = ThunderSetupDecode;
+ 	return (1);
+ }
+ #endif /* THUNDER_SUPPORT */
diff --git a/source/l/libtiff/libtiff.SlackBuild b/source/l/libtiff/libtiff.SlackBuild
index d2e2556e..33e871f3 100755
--- a/source/l/libtiff/libtiff.SlackBuild
+++ b/source/l/libtiff/libtiff.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=${VERSION:-$(echo tiff-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=1
+BUILD=2
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -63,6 +63,9 @@ rm -rf tiff-$VERSION
 tar xvf $CWD/tiff-$VERSION.tar.?z* || exit 1
 cd tiff-$VERSION
 
+zcat $CWD/libtiff-CVE-2011-0192.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/libtiff-CVE-2011-1167.patch.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 \) \
diff --git a/source/l/libusb/libusb.SlackBuild b/source/l/libusb/libusb.SlackBuild
index 67d0756a..26bc4b5d 100755
--- a/source/l/libusb/libusb.SlackBuild
+++ b/source/l/libusb/libusb.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,19 +21,17 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=${VERSION:-1.0.6}	# libusb version
+VERSION=${VERSION:-1.0.8}	# libusb version
 USBCOMPAT=${USBCOMPAT:-0.1.3}	# libusb-compat version
 
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:--j6}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) export ARCH=i486 ;;
     arm*) export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
   esac
 fi
@@ -64,6 +62,9 @@ cd $TMP
 rm -rf libusb-$VERSION
 tar xvf $CWD/libusb-$VERSION.tar.bz2
 cd libusb-$VERSION
+
+zcat $CWD/libusb.fix.debug.log.level.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 \) \
@@ -138,12 +139,8 @@ if [ -r ChangeLog ]; then
 fi
 
 # Now handle the package-wide stuff
-( 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
-)
+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
diff --git a/source/l/libusb/libusb.fix.debug.log.level.diff b/source/l/libusb/libusb.fix.debug.log.level.diff
new file mode 100644
index 00000000..59af816e
--- /dev/null
+++ b/source/l/libusb/libusb.fix.debug.log.level.diff
@@ -0,0 +1,12 @@
+--- ./libusb/os/linux_usbfs.c.orig	2010-04-22 16:14:46.000000000 -0500
++++ ./libusb/os/linux_usbfs.c	2011-03-24 18:40:38.000000000 -0500
+@@ -1055,7 +1055,8 @@
+ 	hpriv->fd = open(filename, O_RDWR);
+ 	if (hpriv->fd < 0) {
+ 		if (errno == EACCES) {
+-			fprintf(stderr, "libusb couldn't open USB device %s: "
++                        usbi_err(HANDLE_CTX(handle),
++			        "libusb couldn't open USB device %s: "
+ 				"Permission denied.\n"
+ 				"libusb requires write access to USB device nodes.\n",
+ 				filename);
diff --git a/source/l/libvisual-plugins/libvisual-plugins.SlackBuild b/source/l/libvisual-plugins/libvisual-plugins.SlackBuild
index e22ddc0c..f5dec5bd 100755
--- a/source/l/libvisual-plugins/libvisual-plugins.SlackBuild
+++ b/source/l/libvisual-plugins/libvisual-plugins.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +22,20 @@
 
 
 PKGNAM=libvisual-plugins
-VERSION=${VERSION:-0.4.0}
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -37,6 +46,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
@@ -47,7 +59,7 @@ mkdir -p $PKG
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
 cd ${PKGNAM}-$VERSION
 
 # Make sure ownerships and permissions are sane:
@@ -93,7 +105,7 @@ fi
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  AUTHORS COPYING* NEWS README TODO \
+  AUTHORS COPYING* NEWS README* TODO \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 
 mkdir -p $PKG/install
diff --git a/source/l/libvisual/libvisual.SlackBuild b/source/l/libvisual/libvisual.SlackBuild
index 9b248ffa..c99d5461 100755
--- a/source/l/libvisual/libvisual.SlackBuild
+++ b/source/l/libvisual/libvisual.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +22,20 @@
 
 
 PKGNAM=libvisual
-VERSION=${VERSION:-0.4.0}
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -43,11 +52,14 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
 cd ${PKGNAM}-$VERSION
 
 # Make sure ownerships and permissions are sane:
@@ -99,7 +111,7 @@ fi
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  AUTHORS COPYING NEWS README TODO \
+  AUTHORS COPYING* NEWS README* TODO \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 
 mkdir -p $PKG/install
diff --git a/source/l/libvorbis/libvorbis.SlackBuild b/source/l/libvorbis/libvorbis.SlackBuild
index 0aacb1a6..9fae85d6 100755
--- a/source/l/libvorbis/libvorbis.SlackBuild
+++ b/source/l/libvorbis/libvorbis.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/source/l/libwnck/libwnck.SlackBuild b/source/l/libwnck/libwnck.SlackBuild
index 982b4052..fba40293 100755
--- a/source/l/libwnck/libwnck.SlackBuild
+++ b/source/l/libwnck/libwnck.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,6 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+PKGNAM=libwnck
 VERSION=${VERSION:-$(echo libwnck-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
@@ -58,7 +59,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf libwnck-$VERSION
-tar xvf $CWD/libwnck-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/libwnck-$VERSION.tar.?z* || exit 1
 cd libwnck-$VERSION
 chown -R root:root .
 find . \
@@ -84,7 +85,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 
 mkdir -p $PKG/usr/doc/libwnck-$VERSION
 cp -a \
-  AUTHORS COPYING* NEWS README \
+  AUTHORS COPYING* NEWS README* \
   $PKG/usr/doc/libwnck-$VERSION
 
 # If there's a ChangeLog, installing at least part of the recent history
diff --git a/source/l/libwpd/libwpd.SlackBuild b/source/l/libwpd/libwpd.SlackBuild
index 78b4a1ef..b160bd81 100755
--- a/source/l/libwpd/libwpd.SlackBuild
+++ b/source/l/libwpd/libwpd.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=0.8.14
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 if [ "$ARCH" = "i486" ]; then
@@ -36,6 +45,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
diff --git a/source/l/libxklavier/libxklavier.SlackBuild b/source/l/libxklavier/libxklavier.SlackBuild
index cc38a5d5..5d917d52 100755
--- a/source/l/libxklavier/libxklavier.SlackBuild
+++ b/source/l/libxklavier/libxklavier.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2007-2008  Heinz Wiesinger <pprkut@liwjatan.at>
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -87,7 +87,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \
 
 mkdir -p $PKG/usr/doc/libxklavier-$VERSION
 cp -a \
-  AUTHORS COPYING* CREDITS INSTALL NEWS README \
+  AUTHORS COPYING* CREDITS INSTALL NEWS README* \
   $PKG/usr/doc/libxklavier-$VERSION
 ( cd $PKG/usr/doc/libxklavier-$VERSION
   ln -s /usr/share/gtk-doc/html/libxklavier html
diff --git a/source/l/libxml2/libxml2-2.7.8.broken.versioning.diff b/source/l/libxml2/libxml2-2.7.8.broken.versioning.diff
new file mode 100644
index 00000000..c629d21a
--- /dev/null
+++ b/source/l/libxml2/libxml2-2.7.8.broken.versioning.diff
@@ -0,0 +1,23 @@
+From 00819877651b87842ed878898ba17dba489820f0 Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <veillard@redhat.com>
+Date: Thu, 04 Nov 2010 20:53:14 +0000
+Subject: Reactivate the shared library versionning script
+
+---
+diff --git a/configure.in b/configure.in
+index 59d0629..a1d2c89 100644
+--- a/configure.in
++++ b/configure.in
+@@ -84,7 +84,7 @@ else
+   esac
+ fi
+ AC_SUBST(VERSION_SCRIPT_FLAGS)
+-AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -z "$VERSION_SCRIPT_FLAGS"])
++AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -n "$VERSION_SCRIPT_FLAGS"])
+
+ dnl
+ dnl We process the AC_ARG_WITH first so that later we can modify
+--
+cgit v0.8.3.1
+
+
diff --git a/source/l/libxml2/libxml2.SlackBuild b/source/l/libxml2/libxml2.SlackBuild
index 0bfe3f1f..23cce062 100755
--- a/source/l/libxml2/libxml2.SlackBuild
+++ b/source/l/libxml2/libxml2.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,8 +21,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=2.7.6
-BUILD=${BUILD:-1}
+PKGNAM=libxml2
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -45,6 +46,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
@@ -64,6 +68,10 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
+zcat $CWD/libxml2-2.7.8.broken.versioning.diff.gz | patch -p1 --verbose || exit 1
+# This is needed after the patch above:
+autoreconf || exit 1
+
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
diff --git a/source/l/libzip/libzip.SlackBuild b/source/l/libzip/libzip.SlackBuild
index a8eb72a6..d7103a30 100755
--- a/source/l/libzip/libzip.SlackBuild
+++ b/source/l/libzip/libzip.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2007  Heinz Wiesinger <hmwiesinger@gmx.at>
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,9 +24,19 @@
 # Modified by Robby Workman <rworkman at slackware.com>
 
 
-VERSION=0.9
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-2}
+PKGNAM=libzip
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 NUMJOBS=${NUMJOBS:--j6}
 
@@ -43,13 +53,16 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf libzip-$VERSION
-tar xvf $CWD/libzip-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/libzip-$VERSION.tar.?z* || exit 1
 cd libzip-$VERSION || exit 1
 chown -R root:root .
 find . \
@@ -107,7 +120,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \
 
 mkdir -p $PKG/usr/doc/libzip-$VERSION
 cp -a \
-  AUTHORS COPYING* INSTALL NEWS README THANKS TODO \
+  AUTHORS COPYING* INSTALL NEWS README* THANKS TODO \
   $PKG/usr/doc/libzip-$VERSION
 
 mkdir -p $PKG/install
diff --git a/source/l/lzo/lzo.SlackBuild b/source/l/lzo/lzo.SlackBuild
index e4be9d21..4e1170c8 100755
--- a/source/l/lzo/lzo.SlackBuild
+++ b/source/l/lzo/lzo.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2006 Ricardson Williams <ricardsonwilliams at yahoo.com.br>
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,12 +23,22 @@
 
 # Modified by the SlackBuilds.org project
 
-PRGNAM=lzo
-VERSION=2.02
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+PKGNAM=lzo
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -38,19 +48,22 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP || exit 1
-rm -rf $PRGNAM-$VERSION
-tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
-cd $PRGNAM-$VERSION || exit 1
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION || exit 1
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -70,17 +83,25 @@ make $NUMJOBS || make || exit 1
 make check || exit 1
 make install DESTDIR=$PKG || exit 1
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 # while the examples are somewhat interesting, due to autoconf they are
 # rather hard to use outside of the actual source tree...
 cp -a \
-  AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README THANKS \
+  AUTHORS BUGS COPYING* INSTALL NEWS README* THANKS \
   doc \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source/l/mhash/mhash.SlackBuild b/source/l/mhash/mhash.SlackBuild
index 0b9d9070..18dd4197 100755
--- a/source/l/mhash/mhash.SlackBuild
+++ b/source/l/mhash/mhash.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,19 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=0.9.9
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-1}
+PKGNAM=mhash
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-3}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -36,6 +46,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
@@ -46,7 +59,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf mhash-$VERSION
-tar xvf $CWD/mhash-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/mhash-$VERSION.tar.?z* || exit 1
 cd mhash-$VERSION
 chown -R root:root .
 find . \
@@ -62,19 +75,34 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --program-prefix="" \
   --program-suffix="" \
-  $ARCH-slackware-linux
+  --build=$ARCH-slackware-linux
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
+# This caused problems.  Leaving it here to serve as a warning.  ;-)
+#
+## Fix mhash.h so that it does not include its own config.h from
+## autoconf, because this will duplicate macros and mess up anything
+## that tries to use autoconf to include mhash.h...
+#sed -i "s,^#define MUTILS_USE_MHASH_CONFIG,/* #define MUTILS_USE_MHASH_CONFIG */,g" $PKG/usr/include/mhash.h
+
 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/mhash-$VERSION
 cp -a \
-  AUTHORS COPYING INSTALL NEWS README THANKS TODO \
+  AUTHORS COPYING* INSTALL NEWS README* THANKS TODO \
   $PKG/usr/doc/mhash-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 gzip -9 $PKG/usr/man/man?/*.?
 
 mkdir -p $PKG/install
diff --git a/source/l/mm/mm.SlackBuild b/source/l/mm/mm.SlackBuild
index a0a107c3..a0a93755 100755
--- a/source/l/mm/mm.SlackBuild
+++ b/source/l/mm/mm.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,19 @@
 
 
 PKGNAM=mm
-VERSION=${VERSION:-1.4.2}
-ARCH=${ARCH:-x86_64}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
@@ -43,12 +52,15 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
-cd ${PKGNAM}-$VERSION
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
+cd ${PKGNAM}-$VERSION || exit 1
 
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
@@ -66,7 +78,7 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --enable-static \
   --enable-shared \
-  $ARCH-slackware-linux
+  --build=$ARCH-slackware-linux
 
 # Build and install:
 make $NUMJOBS || make || exit 1
@@ -109,9 +121,17 @@ fi
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  ChangeLog INSTALL LICENSE PORTING README THANKS \
+  INSTALL LICENSE PORTING README* THANKS \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source/l/mpfr/mpfr.SlackBuild b/source/l/mpfr/mpfr.SlackBuild
index 808cbdac..a96001cd 100755
--- a/source/l/mpfr/mpfr.SlackBuild
+++ b/source/l/mpfr/mpfr.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,6 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+PKGNAM=mpfr
 VERSION=${VERSION:-$(echo mpfr-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
@@ -67,12 +68,16 @@ rm -rf mpfr-$VERSION
 tar xvf $CWD/mpfr-$VERSION.tar.?z* || exit 1
 cd mpfr-$VERSION
 chown -R root:root .
-for file in $CWD/patches/* ; do
-  ( zcat $file 2> /dev/null | patch -p1 --verbose --batch 2> /dev/null || exit 1 )
-  if [ ! $? = 0 ]; then
-    exit 1
-  fi
-done
+
+if [ ! -z "$(ls $CWD/patches/* 2> /dev/null)" ]; then
+  for file in $CWD/patches/* ; do
+    ( zcat $file 2> /dev/null | patch -p1 --verbose --batch 2> /dev/null || exit 1 )
+    if [ ! $? = 0 ]; then
+      exit 1
+    fi
+  done
+fi
+
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -81,7 +86,7 @@ CFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/mpfr-$VERSION \
   --enable-static=yes \
   --enable-shared=yes \
-  $ARCH-slackware-linux
+  --build=$ARCH-slackware-linux
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
@@ -97,10 +102,18 @@ gzip -9 $PKG/usr/info/*
 
 mkdir -p $PKG/usr/doc/mpfr-$VERSION
 cp -a \
-  AUTHORS BUGS COPYING COPYING.LIB FAQ.html INSTALL NEWS README TODO VERSION \
+  AUTHORS BUGS COPYING* FAQ.html INSTALL NEWS README* TODO VERSION \
   examples \
   $PKG/usr/doc/mpfr-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source/l/mpfr/patches/patch01 b/source/l/mpfr/patches/patch01
deleted file mode 100644
index 2721517c..00000000
--- a/source/l/mpfr/patches/patch01
+++ /dev/null
@@ -1,184 +0,0 @@
-diff -Naurd mpfr-2.4.2-a/PATCHES mpfr-2.4.2-b/PATCHES
---- mpfr-2.4.2-a/PATCHES	2009-12-07 13:37:12.000000000 +0000
-+++ mpfr-2.4.2-b/PATCHES	2009-12-07 13:37:12.000000000 +0000
-@@ -0,0 +1 @@
-+sin_cos_underflow
-diff -Naurd mpfr-2.4.2-a/VERSION mpfr-2.4.2-b/VERSION
---- mpfr-2.4.2-a/VERSION	2009-11-30 02:43:08.000000000 +0000
-+++ mpfr-2.4.2-b/VERSION	2009-12-07 13:37:12.000000000 +0000
-@@ -1 +1 @@
--2.4.2
-+2.4.2-p1
-diff -Naurd mpfr-2.4.2-a/mpfr.h mpfr-2.4.2-b/mpfr.h
---- mpfr-2.4.2-a/mpfr.h	2009-11-30 02:43:08.000000000 +0000
-+++ mpfr-2.4.2-b/mpfr.h	2009-12-07 13:37:12.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 2
- #define MPFR_VERSION_MINOR 4
- #define MPFR_VERSION_PATCHLEVEL 2
--#define MPFR_VERSION_STRING "2.4.2"
-+#define MPFR_VERSION_STRING "2.4.2-p1"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-2.4.2-a/sin_cos.c mpfr-2.4.2-b/sin_cos.c
---- mpfr-2.4.2-a/sin_cos.c	2009-11-30 02:43:09.000000000 +0000
-+++ mpfr-2.4.2-b/sin_cos.c	2009-12-07 13:37:12.000000000 +0000
-@@ -82,17 +82,19 @@
-       if (y != x)
-         /* y and x differ, thus we can safely try to compute y first */
-         {
--          MPFR_FAST_COMPUTE_IF_SMALL_INPUT (y, x, -2 * expx, 2, 0, rnd_mode,
--                                            { inexy = _inexact;
--                                              goto small_input; });
-+          MPFR_FAST_COMPUTE_IF_SMALL_INPUT (
-+            y, x, -2 * expx, 2, 0, rnd_mode,
-+            { inexy = _inexact;
-+              goto small_input; });
-           if (0)
-             {
-             small_input:
-               /* we can go here only if we can round sin(x) */
--              MPFR_FAST_COMPUTE_IF_SMALL_INPUT (z, __gmpfr_one, -2 * expx,
--                                                1, 0, rnd_mode,
--                                                { inexz = _inexact;
--                                                  goto end; });
-+              MPFR_FAST_COMPUTE_IF_SMALL_INPUT (
-+                z, __gmpfr_one, -2 * expx, 1, 0, rnd_mode,
-+                { inexz = _inexact;
-+                  MPFR_SAVE_EXPO_UPDATE_FLAGS (expo, __gmpfr_flags);
-+                  goto end; });
-             }
- 
-           /* if we go here, one of the two MPFR_FAST_COMPUTE_IF_SMALL_INPUT
-@@ -101,18 +103,19 @@
-       else /* y and x are the same variable: try to compute z first, which
-               necessarily differs */
-         {
--          MPFR_FAST_COMPUTE_IF_SMALL_INPUT (z, __gmpfr_one, -2 * expx,
--                                            1, 0, rnd_mode,
--                                            { inexz = _inexact;
--                                              goto small_input2; });
-+          MPFR_FAST_COMPUTE_IF_SMALL_INPUT (
-+            z, __gmpfr_one, -2 * expx, 1, 0, rnd_mode,
-+            { inexz = _inexact;
-+              goto small_input2; });
-           if (0)
-             {
-             small_input2:
-               /* we can go here only if we can round cos(x) */
--              MPFR_FAST_COMPUTE_IF_SMALL_INPUT (y, x, -2 * expx, 2, 0,
--                                                rnd_mode,
--                                                { inexy = _inexact;
--                                                  goto end; });
-+              MPFR_FAST_COMPUTE_IF_SMALL_INPUT (
-+                y, x, -2 * expx, 2, 0, rnd_mode,
-+                { inexy = _inexact;
-+                  MPFR_SAVE_EXPO_UPDATE_FLAGS (expo, __gmpfr_flags);
-+                  goto end; });
-             }
-         }
-       m += 2 * (-expx);
-@@ -207,7 +210,6 @@
-   mpfr_clear (xr);
- 
-  end:
--  /* FIXME: update the underflow flag if need be. */
-   MPFR_SAVE_EXPO_FREE (expo);
-   mpfr_check_range (y, inexy, rnd_mode);
-   mpfr_check_range (z, inexz, rnd_mode);
-diff -Naurd mpfr-2.4.2-a/tests/tsin_cos.c mpfr-2.4.2-b/tests/tsin_cos.c
---- mpfr-2.4.2-a/tests/tsin_cos.c	2009-11-30 02:43:08.000000000 +0000
-+++ mpfr-2.4.2-b/tests/tsin_cos.c	2009-12-07 13:37:12.000000000 +0000
-@@ -382,23 +382,56 @@
- consistency (void)
- {
-   mpfr_t x, s1, s2, c1, c2;
-+  mp_exp_t emin, emax;
-   mp_rnd_t rnd;
-+  unsigned int flags_sin, flags_cos, flags, flags_before, flags_ref;
-+  int inex_sin, inex_cos, inex, inex_ref;
-   int i;
- 
-+  emin = mpfr_get_emin ();
-+  emax = mpfr_get_emax ();
-+
-   for (i = 0; i <= 10000; i++)
-     {
-       mpfr_init2 (x, MPFR_PREC_MIN + (randlimb () % 8));
-       mpfr_inits2 (MPFR_PREC_MIN + (randlimb () % 8), s1, s2, c1, c2,
-                    (mpfr_ptr) 0);
--      tests_default_random (x, 256, -5, 50);
--      rnd = RND_RAND ();
--      mpfr_sin (s1, x, rnd);
--      mpfr_cos (c1, x, rnd);
--      mpfr_sin_cos (s2, c2, x, rnd);
--      if (!(mpfr_equal_p (s1, s2) && mpfr_equal_p (c1, c2)))
-+      if (i < 8 * GMP_RND_MAX)
-         {
--          printf ("mpfr_sin_cos and mpfr_sin/mpfr_cos disagree on %s,\nx = ",
--                  mpfr_print_rnd_mode (rnd));
-+          int j = i / GMP_RND_MAX;
-+          if (j & 1)
-+            mpfr_set_emin (MPFR_EMIN_MIN);
-+          mpfr_set_si (x, (j & 2) ? 1 : -1, GMP_RNDN);
-+          mpfr_set_exp (x, mpfr_get_emin ());
-+          rnd = (mpfr_rnd_t) (i % GMP_RND_MAX);
-+          flags_before = 0;
-+          if (j & 4)
-+            mpfr_set_emax (-17);
-+        }
-+      else
-+        {
-+          tests_default_random (x, 256, -5, 50);
-+          rnd = RND_RAND ();
-+          flags_before = (randlimb () & 1) ?
-+            (unsigned int) (MPFR_FLAGS_ALL ^ MPFR_FLAGS_ERANGE) :
-+            (unsigned int) 0;
-+        }
-+      __gmpfr_flags = flags_before;
-+      inex_sin = mpfr_sin (s1, x, rnd);
-+      flags_sin = __gmpfr_flags;
-+      __gmpfr_flags = flags_before;
-+      inex_cos = mpfr_cos (c1, x, rnd);
-+      flags_cos = __gmpfr_flags;
-+      __gmpfr_flags = flags_before;
-+      inex = !!mpfr_sin_cos (s2, c2, x, rnd);
-+      flags = __gmpfr_flags;
-+      inex_ref = inex_sin || inex_cos;
-+      flags_ref = flags_sin | flags_cos;
-+      if (!(mpfr_equal_p (s1, s2) && mpfr_equal_p (c1, c2)) ||
-+          inex != inex_ref || flags != flags_ref)
-+        {
-+          printf ("mpfr_sin_cos and mpfr_sin/mpfr_cos disagree on %s,"
-+                  " i = %d\nx = ", mpfr_print_rnd_mode (rnd), i);
-           mpfr_dump (x);
-           printf ("s1 = ");
-           mpfr_dump (s1);
-@@ -408,9 +441,16 @@
-           mpfr_dump (c1);
-           printf ("c2 = ");
-           mpfr_dump (c2);
-+          printf ("inex_sin = %d, inex_cos = %d, inex = %d (expected %d)\n",
-+                  inex_sin, inex_cos, inex, inex_ref);
-+          printf ("flags_sin = 0x%x, flags_cos = 0x%x, "
-+                  "flags = 0x%x (expected 0x%x)\n",
-+                  flags_sin, flags_cos, flags, flags_ref);
-           exit (1);
-         }
-       mpfr_clears (x, s1, s2, c1, c2, (mpfr_ptr) 0);
-+      mpfr_set_emin (emin);
-+      mpfr_set_emax (emax);
-     }
- }
- 
-diff -Naurd mpfr-2.4.2-a/version.c mpfr-2.4.2-b/version.c
---- mpfr-2.4.2-a/version.c	2009-11-30 02:43:08.000000000 +0000
-+++ mpfr-2.4.2-b/version.c	2009-12-07 13:37:12.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "2.4.2";
-+  return "2.4.2-p1";
- }
diff --git a/source/l/mpfr/patches/patch02 b/source/l/mpfr/patches/patch02
deleted file mode 100644
index fa85d8ef..00000000
--- a/source/l/mpfr/patches/patch02
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -Naurd mpfr-2.4.2-a/PATCHES mpfr-2.4.2-b/PATCHES
---- mpfr-2.4.2-a/PATCHES	2009-12-18 12:03:30.000000000 +0000
-+++ mpfr-2.4.2-b/PATCHES	2009-12-18 12:05:19.000000000 +0000
-@@ -0,0 +1 @@
-+longlong.h
-diff -Naurd mpfr-2.4.2-a/VERSION mpfr-2.4.2-b/VERSION
---- mpfr-2.4.2-a/VERSION	2009-12-07 13:37:12.000000000 +0000
-+++ mpfr-2.4.2-b/VERSION	2009-12-18 12:05:09.000000000 +0000
-@@ -1 +1 @@
--2.4.2-p1
-+2.4.2-p2
-diff -Naurd mpfr-2.4.2-a/mpfr-longlong.h mpfr-2.4.2-b/mpfr-longlong.h
---- mpfr-2.4.2-a/mpfr-longlong.h	2009-11-30 02:43:08.000000000 +0000
-+++ mpfr-2.4.2-b/mpfr-longlong.h	2009-12-18 12:04:29.000000000 +0000
-@@ -1011,7 +1011,15 @@
- #endif /* __m88000__ */
- 
- #if defined (__mips) && W_TYPE_SIZE == 32
--#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
-+#if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4)
-+#define umul_ppmm(w1, w0, u, v) \
-+  do {									\
-+    UDItype _r;							\
-+    _r = (UDItype) u * v;						\
-+    (w1) = _r >> 32;							\
-+    (w0) = (USItype) _r;						\
-+  } while (0)
-+#elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7
- #define umul_ppmm(w1, w0, u, v) \
-   __asm__ ("multu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v))
- #else
-@@ -1024,7 +1032,16 @@
- #endif /* __mips */
- 
- #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64
--#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
-+#if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4)
-+typedef unsigned int UTItype __attribute__ ((mode (TI)));
-+#define umul_ppmm(w1, w0, u, v) \
-+  do {									\
-+    UTItype _r;							\
-+    _r = (UTItype) u * v;						\
-+    (w1) = _r >> 64;							\
-+    (w0) = (UDItype) _r;						\
-+  } while (0)
-+#elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7
- #define umul_ppmm(w1, w0, u, v) \
-   __asm__ ("dmultu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v))
- #else
-diff -Naurd mpfr-2.4.2-a/mpfr.h mpfr-2.4.2-b/mpfr.h
---- mpfr-2.4.2-a/mpfr.h	2009-12-07 13:37:12.000000000 +0000
-+++ mpfr-2.4.2-b/mpfr.h	2009-12-18 12:05:09.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 2
- #define MPFR_VERSION_MINOR 4
- #define MPFR_VERSION_PATCHLEVEL 2
--#define MPFR_VERSION_STRING "2.4.2-p1"
-+#define MPFR_VERSION_STRING "2.4.2-p2"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-2.4.2-a/version.c mpfr-2.4.2-b/version.c
---- mpfr-2.4.2-a/version.c	2009-12-07 13:37:12.000000000 +0000
-+++ mpfr-2.4.2-b/version.c	2009-12-18 12:05:09.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "2.4.2-p1";
-+  return "2.4.2-p2";
- }
diff --git a/source/l/mpfr/patches/patch03 b/source/l/mpfr/patches/patch03
deleted file mode 100644
index 3ce4952f..00000000
--- a/source/l/mpfr/patches/patch03
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -Naurd mpfr-2.4.2-a/PATCHES mpfr-2.4.2-b/PATCHES
---- mpfr-2.4.2-a/PATCHES	2010-01-11 15:27:18.000000000 +0000
-+++ mpfr-2.4.2-b/PATCHES	2010-01-11 15:30:31.000000000 +0000
-@@ -0,0 +1 @@
-+gmp5
-diff -Naurd mpfr-2.4.2-a/VERSION mpfr-2.4.2-b/VERSION
---- mpfr-2.4.2-a/VERSION	2009-12-18 12:05:09.000000000 +0000
-+++ mpfr-2.4.2-b/VERSION	2010-01-11 15:29:40.000000000 +0000
-@@ -1 +1 @@
--2.4.2-p2
-+2.4.2-p3
-diff -Naurd mpfr-2.4.2-a/configure mpfr-2.4.2-b/configure
---- mpfr-2.4.2-a/configure	2009-11-30 02:44:35.000000000 +0000
-+++ mpfr-2.4.2-b/configure	2010-01-11 15:28:56.000000000 +0000
-@@ -20449,6 +20449,9 @@
- main ()
- {
- 
-+#ifndef BITS_PER_MP_LIMB
-+#define BITS_PER_MP_LIMB GMP_LIMB_BITS
-+#endif
-   return BITS_PER_MP_LIMB == BYTES_PER_MP_LIMB * CHAR_BIT
-          && sizeof(mp_limb_t) == BYTES_PER_MP_LIMB ? 0 : 1;
- 
-diff -Naurd mpfr-2.4.2-a/configure.in mpfr-2.4.2-b/configure.in
---- mpfr-2.4.2-a/configure.in	2009-11-30 02:43:08.000000000 +0000
-+++ mpfr-2.4.2-b/configure.in	2009-11-30 02:43:08.000000000 +0000
-@@ -424,6 +424,9 @@
- #include "gmp.h"
- #include "gmp-impl.h"
- ]], [[
-+#ifndef BITS_PER_MP_LIMB
-+#define BITS_PER_MP_LIMB GMP_LIMB_BITS
-+#endif
-   return BITS_PER_MP_LIMB == BYTES_PER_MP_LIMB * CHAR_BIT
-          && sizeof(mp_limb_t) == BYTES_PER_MP_LIMB ? 0 : 1;
- ]])], [AC_MSG_RESULT(yes)], [
-diff -Naurd mpfr-2.4.2-a/mpfr-impl.h mpfr-2.4.2-b/mpfr-impl.h
---- mpfr-2.4.2-a/mpfr-impl.h	2009-11-30 02:43:08.000000000 +0000
-+++ mpfr-2.4.2-b/mpfr-impl.h	2010-01-11 15:28:01.000000000 +0000
-@@ -65,6 +65,12 @@
- # ifndef __GMP_IMPL_H__
- #  include "gmp-impl.h"
- # endif
-+# ifndef BITS_PER_MP_LIMB
-+#  define BITS_PER_MP_LIMB GMP_LIMB_BITS
-+# endif
-+#ifndef mpn_sqr_n
-+# define mpn_sqr_n mpn_sqr
-+#endif
- # ifdef MPFR_NEED_LONGLONG_H
- #  include "longlong.h"
- # endif
-diff -Naurd mpfr-2.4.2-a/mpfr.h mpfr-2.4.2-b/mpfr.h
---- mpfr-2.4.2-a/mpfr.h	2009-12-18 12:05:09.000000000 +0000
-+++ mpfr-2.4.2-b/mpfr.h	2010-01-11 15:29:40.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 2
- #define MPFR_VERSION_MINOR 4
- #define MPFR_VERSION_PATCHLEVEL 2
--#define MPFR_VERSION_STRING "2.4.2-p2"
-+#define MPFR_VERSION_STRING "2.4.2-p3"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-2.4.2-a/version.c mpfr-2.4.2-b/version.c
---- mpfr-2.4.2-a/version.c	2009-12-18 12:05:09.000000000 +0000
-+++ mpfr-2.4.2-b/version.c	2010-01-11 15:29:40.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "2.4.2-p2";
-+  return "2.4.2-p3";
- }
diff --git a/source/l/ncurses/ncurses.SlackBuild b/source/l/ncurses/ncurses.SlackBuild
index 9da59f1e..2d2fe144 100755
--- a/source/l/ncurses/ncurses.SlackBuild
+++ b/source/l/ncurses/ncurses.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2000-2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2000-2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,10 +20,19 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
-VERSION=5.7
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-2}
+PKGNAM=ncurses
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -39,6 +48,9 @@ elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   X86_64OPTS=" --with-chtype=long --with-mmask-t=long "
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 ncurses_configure() {
@@ -58,7 +70,7 @@ CFLAGS="$SLKCFLAGS" \
   --program-suffix="" \
   --program-prefix="" \
   $WIDEC \
-  $ARCH-slackware-linux
+  --build=$ARCH-slackware-linux
 }
 
 rm -rf $PKG
@@ -66,17 +78,24 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf ncurses-$VERSION
-tar xvf $CWD/ncurses-$VERSION.tar.gz || exit 1
+tar xvf $CWD/ncurses-$VERSION.tar.?z || exit 1
 cd ncurses-$VERSION || exit 1
 chown -R root:root .
-if [ ! -z "$(ls $CWD/patches/ncurses*bz2)" ]; then
+
+# This allows some other patches to come first by making them bz2...  gz next
+if [ ! -z "$(ls $CWD/patches/ncurses*bz2 2> /dev/null)" ]; then
   bzcat $CWD/patches/ncurses*bz2 > tmp-patch.sh
   bash tmp-patch.sh || exit 1
 fi
-for file in $CWD/patches/ncurses-$VERSION-2*.patch.gz ; do
-  zcat $file | patch -p1 --verbose || exit 1
-done
+# Apply official upstream patches.
+if [ ! -z "$(ls $CWD/patches/ncurses-$VERSION-2*.patch.gz 2> /dev/null)" ]; then
+  for file in $CWD/patches/ncurses-$VERSION-2*.patch.gz ; do
+    zcat $file | patch -p1 --verbose || exit 1
+  done
+fi
+
 zcat $CWD/ncurses.mkhashsize.diff.gz | patch -p1 --verbose || exit 1
+
 ncurses_configure
 make -j4 || exit 1
 # Spamming the partition.
@@ -156,6 +175,20 @@ if [ -r $PKG/usr/man/man1/tack.1 ]; then
   gzip -9 --force $PKG/usr/man/man1/tack.1
 fi
 
+# We don't need the log of every change here, but we'll take some.
+# If you need the whole thing probably you already extracted the
+# sources...
+if [ -r NEWS ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat NEWS | head -n 1000 > $DOCSDIR/NEWS
+  echo >> $DOCSDIR/NEWS
+  echo "        +++  SNIP  +++  " >> $DOCSDIR/NEWS
+  echo >> $DOCSDIR/NEWS
+  echo "  see source code for full file  " >> $DOCSDIR/NEWS
+  echo >> $DOCSDIR/NEWS
+  touch -r NEWS $DOCSDIR/NEWS
+fi
+
 # desc file:
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/l/neon/neon.SlackBuild b/source/l/neon/neon.SlackBuild
index 896d885d..7725cce8 100755
--- a/source/l/neon/neon.SlackBuild
+++ b/source/l/neon/neon.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2008, 2009, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
 
 
 PKGNAM=neon
-VERSION=${VERSION:-0.29.0}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -119,9 +119,17 @@ fi
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  AUTHORS BUGS NEWS README THANKS TODO \
+  AUTHORS BUGS COPYING* NEWS README* THANKS TODO \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source/l/openexr/openexr.SlackBuild b/source/l/openexr/openexr.SlackBuild
index 77227481..1bc42cb9 100755
--- a/source/l/openexr/openexr.SlackBuild
+++ b/source/l/openexr/openexr.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2007  Heinz Wiesinger <hmwiesinger@gmx.at>
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,16 +24,25 @@
 # Modified by Robby Workman <rworkman@slackware.com>
 
 
-PRGNAM=openexr
-VERSION=${VERSION:-1.6.1}
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-2}
+PKGNAM=openexr
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 NUMJOBS=${NUMJOBS:--j6}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -44,16 +53,19 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
-cd $PRGNAM-$VERSION || exit 1
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION || exit 1
 
-zcat $CWD/openexr.gcc43.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/openexr.gcc4.diff.gz | patch -p1 --verbose || exit 1
 
 chown -R root:root .
 find . \
@@ -78,16 +90,24 @@ 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/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  AUTHORS ChangeLog COPYING* INSTALL LICENSE NEWS README* \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/share/doc/OpenEXR-$VERSION/*.pdf $PKG/usr/doc/$PRGNAM-$VERSION/
+  AUTHORS COPYING* INSTALL LICENSE NEWS README* \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+mv $PKG/usr/share/doc/OpenEXR-$VERSION/*.pdf $PKG/usr/doc/$PKGNAM-$VERSION/
 rm -rf $PKG/usr/share/doc
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source/l/openexr/openexr.gcc4.diff b/source/l/openexr/openexr.gcc4.diff
new file mode 100644
index 00000000..b227a56e
--- /dev/null
+++ b/source/l/openexr/openexr.gcc4.diff
@@ -0,0 +1,43 @@
+--- ./IlmImf/ImfMatrixAttribute.h.orig	2010-06-23 21:45:22.000000000 -0500
++++ ./IlmImf/ImfMatrixAttribute.h	2010-08-09 14:08:01.000000000 -0500
+@@ -49,6 +49,8 @@
+ #include <ImfAttribute.h>
+ #include "ImathMatrix.h"
+ 
++#include <cstring>
++
+ 
+ namespace Imf {
+ 
+--- ./exrenvmap/main.cpp.orig	2008-10-28 19:00:18.000000000 -0500
++++ ./exrenvmap/main.cpp	2010-08-09 14:07:14.000000000 -0500
+@@ -51,6 +51,8 @@
+ #include <string.h>
+ #include <stdlib.h>
+ 
++#include <cstring>
++
+ using namespace Imf;
+ using namespace std;
+ 
+--- ./exrenvmap/blurImage.cpp.orig	2009-02-25 17:39:27.000000000 -0600
++++ ./exrenvmap/blurImage.cpp	2010-08-09 14:14:31.000000000 -0500
+@@ -43,6 +43,7 @@
+ 
+ #include <resizeImage.h>
+ #include "Iex.h"
++#include <cstring>
+ #include <iostream>
+ #include <algorithm>
+ 
+--- ./exrmaketiled/main.cpp.orig	2008-02-29 20:30:14.000000000 -0600
++++ ./exrmaketiled/main.cpp	2010-08-09 14:07:14.000000000 -0500
+@@ -48,6 +48,8 @@
+ #include <string.h>
+ #include <stdlib.h>
+ 
++#include <cstring>
++
+ using namespace Imf;
+ using namespace std;
+ 
diff --git a/source/l/openexr/openexr.gcc43.diff b/source/l/openexr/openexr.gcc43.diff
deleted file mode 100644
index 3c617dd5..00000000
--- a/source/l/openexr/openexr.gcc43.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/exrenvmap/main.cpp
-+++ b/exrenvmap/main.cpp
-@@ -46,6 +46,8 @@
- #include <exception>
- #include <stdlib.h>
- 
-+#include <cstring>
-+
- using namespace Imf;
- using namespace std;
- 
---- a/exrmaketiled/main.cpp
-+++ b/exrmaketiled/main.cpp
-@@ -47,6 +47,8 @@
- #include <string>
- #include <stdlib.h>
- 
-+#include <cstring>
-+
- using namespace Imf;
- using namespace std;
- 
diff --git a/source/l/pango/pango.SlackBuild b/source/l/pango/pango.SlackBuild
index 1ebe7438..fd5d8966 100755
--- a/source/l/pango/pango.SlackBuild
+++ b/source/l/pango/pango.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,11 +20,10 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+PKGNAM=pango
 VERSION=${VERSION:-$(echo pango-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
-NUMJOBS=${NUMJOBS:-" -j7 "}
-
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -49,6 +48,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-pango
@@ -61,10 +62,6 @@ tar xvf $CWD/pango-$VERSION.tar.?z* || exit 1
 
 cd pango-$VERSION
 
-# Fix for x86_64 (does not hurt the other archs but note that we will start
-# using /etc/pango/$host instead of /etc/pango/ now):
-zcat $CWD/pango.etc.host.location.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 \) \
@@ -72,6 +69,10 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
+# Fix for x86_64 (does not hurt the other archs but note that we will start
+# using /etc/pango/$host instead of /etc/pango/ now):
+zcat $CWD/pango.etc.host.location.diff.gz | patch -p1 --verbose || exit 1
+
 # Autoconf changes linux to linux-gnu.
 # Our host is $ARCH-slackware-linux not $ARCH-slackware-linux-gnu:
 sed -i -e 's#linux|linux-gnu|#linux|linux|#' config.sub
@@ -133,14 +134,12 @@ EOF
 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
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/pango-$VERSION
 cp -a \
-  AUTHORS COPYING* NEWS README TODO \
+  AUTHORS COPYING* NEWS README* TODO \
   $PKG/usr/doc/pango-$VERSION
 ln -s /usr/share/gtk-doc/html/pango $PKG/usr/doc/pango-$VERSION/html
 
diff --git a/source/l/pango/pango.etc.host.location.diff b/source/l/pango/pango.etc.host.location.diff
index bb5a26db..29aa1706 100644
--- a/source/l/pango/pango.etc.host.location.diff
+++ b/source/l/pango/pango.etc.host.location.diff
@@ -1,18 +1,18 @@
-diff -uarN pango-1.22.4.orig/pango/Makefile.am pango-1.22.4/pango/Makefile.am
---- pango-1.22.4.orig/pango/Makefile.am	2008-12-16 07:14:00.000000000 +0100
-+++ pango-1.22.4/pango/Makefile.am	2009-03-04 23:58:26.000000000 +0100
-@@ -19,6 +19,7 @@
+diff -Nur pango-1.28.3.orig//pango/Makefile.am pango-1.28.3/pango/Makefile.am
+--- pango-1.28.3.orig//pango/Makefile.am	2010-09-29 05:42:31.000000000 -0500
++++ pango-1.28.3/pango/Makefile.am	2010-10-13 15:52:27.163733791 -0500
+@@ -27,6 +27,7 @@
  	-DPANGO_ENABLE_BACKEND				\
  	-DPANGO_ENABLE_ENGINE				\
  	-DSYSCONFDIR=\"$(sysconfdir)\"			\
-+	-DHOST=\"$(host_triplet)\"                      \
++	-HOST=\"$(host_triplet)\"                       \
  	-DLIBDIR=\"$(libdir)\"				\
  	-I$(top_srcdir)					\
  	$(PANGO_DEBUG_FLAGS)				\
-diff -uarN pango-1.22.4.orig/pango/Makefile.in pango-1.22.4/pango/Makefile.in
---- pango-1.22.4.orig/pango/Makefile.in	2008-12-16 07:14:36.000000000 +0100
-+++ pango-1.22.4/pango/Makefile.in	2009-03-04 23:58:26.000000000 +0100
-@@ -427,6 +427,7 @@
+diff -Nur pango-1.28.3.orig//pango/Makefile.in pango-1.28.3/pango/Makefile.in
+--- pango-1.28.3.orig//pango/Makefile.in	2010-09-29 06:02:35.000000000 -0500
++++ pango-1.28.3/pango/Makefile.in	2010-10-13 15:52:53.182319091 -0500
+@@ -535,6 +535,7 @@
  	-DPANGO_ENABLE_BACKEND				\
  	-DPANGO_ENABLE_ENGINE				\
  	-DSYSCONFDIR=\"$(sysconfdir)\"			\
@@ -20,10 +20,10 @@ diff -uarN pango-1.22.4.orig/pango/Makefile.in pango-1.22.4/pango/Makefile.in
  	-DLIBDIR=\"$(libdir)\"				\
  	-I$(top_srcdir)					\
  	$(PANGO_DEBUG_FLAGS)				\
-diff -uarN pango-1.22.4.orig/pango/modules.c pango-1.22.4/pango/modules.c
---- pango-1.22.4.orig/pango/modules.c	2008-12-16 07:14:00.000000000 +0100
-+++ pango-1.22.4/pango/modules.c	2009-03-04 23:58:26.000000000 +0100
-@@ -508,6 +508,7 @@
+diff -Nur pango-1.28.3.orig//pango/modules.c pango-1.28.3/pango/modules.c
+--- pango-1.28.3.orig//pango/modules.c	2010-02-09 06:06:28.000000000 -0600
++++ pango-1.28.3/pango/modules.c	2010-10-13 15:53:31.016716077 -0500
+@@ -529,6 +529,7 @@
  
    if (!file_str)
      file_str = g_build_filename (pango_get_sysconf_subdirectory (),
diff --git a/source/l/parted/parted.configure.diff b/source/l/parted/parted.configure.diff
index 649a4b3a..4368f82d 100644
--- a/source/l/parted/parted.configure.diff
+++ b/source/l/parted/parted.configure.diff
@@ -1,12 +1,12 @@
-diff -Nur parted-2.1.orig/configure parted-2.1/configure
---- parted-2.1.orig/configure	2009-12-20 05:51:57.000000000 -0600
-+++ parted-2.1/configure	2009-12-22 21:51:44.828799616 -0600
-@@ -13217,7 +13217,7 @@
+diff -Nur parted-2.3.orig//configure parted-2.3/configure
+--- parted-2.3.orig//configure	2010-05-28 13:29:12.000000000 -0500
++++ parted-2.3/configure	2010-07-12 03:23:18.314505370 -0500
+@@ -14199,7 +14199,7 @@
+      # Don't try bare '--as-needed'; nothing likes it and the HP-UX 11.11
       # native cc issues annoying warnings and then ignores it,
       # which would cause us to incorrectly conclude that it worked.
-      for gl_flags in \
--        '-Wl,--as-needed' \
-+        '-Wl,--no-as-needed' \
-         '-Wl,-z,ignore' \
-         '-z ignore'
-      do
+-     for gl_flags in  '-Wl,--as-needed' \
++     for gl_flags in  '-Wl,--no-as-needed' \
+   '-Wl,-z,ignore' \
+   '-z ignore'
+ 
diff --git a/source/l/pcre/pcre.SlackBuild b/source/l/pcre/pcre.SlackBuild
index 0b589350..06bd7c77 100755
--- a/source/l/pcre/pcre.SlackBuild
+++ b/source/l/pcre/pcre.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
 
 
 PKGNAM=pcre
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -60,7 +60,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf pcre-$VERSION
-tar xvf $CWD/pcre-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/pcre-$VERSION.tar.?z* || exit 1
 cd pcre-$VERSION
 
 chown -R root:root .
@@ -73,10 +73,12 @@ find . \
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
-  --enable-utf8 \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --mandir=/usr/man
+  --mandir=/usr/man \
+  --enable-utf8 \
+  --enable-unicode-properties \
+  --build=$ARCH-slackware-linux
 
 CFLAGS="$SLKCFLAGS" make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
diff --git a/source/l/phonon-mplayer/phonon-mplayer.SlackBuild b/source/l/phonon-mplayer/phonon-mplayer.SlackBuild
new file mode 100755
index 00000000..cb84b3cb
--- /dev/null
+++ b/source/l/phonon-mplayer/phonon-mplayer.SlackBuild
@@ -0,0 +1,110 @@
+#!/bin/sh
+# Copyright 2010  Eric Hameleers, Eindhoven, NL
+# Copyright 2010  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.
+# -----------------------------------------------------------------------------
+
+
+PKGNAM=phonon-mplayer
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
+BUILD=${BUILD:-1}
+NUMJOBS=${NUMJOBS:" -j4 "}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION || exit 1
+
+# Dump cmake fixes in the source directory, care of phonon-vlc:
+# Without these, phonon-mplayer can only be built inside the phonon sources.
+tar xvf $CWD/cmake_fixes.tar.gz
+
+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 ...
+# It's there already but let's do it for fun:
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DSYSCONF_INSTALL_DIR=/etc \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    ..
+  make $NUMJOBS
+  make DESTDIR=$PKG install
+cd -
+
+# Add documentation:
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  mplayer/AUTHORS mplayer/COPYING* mplayer/README mplayer/THANKS \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+# Strip binaries (if any):
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# Add a package description:
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/l/phonon-mplayer/slack-desc b/source/l/phonon-mplayer/slack-desc
new file mode 100644
index 00000000..f98dc68e
--- /dev/null
+++ b/source/l/phonon-mplayer/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------------------------------------------------------|
+phonon-mplayer: phonon-mplayer (mplayer backend for phonon)
+phonon-mplayer:
+phonon-mplayer: This package provides an additional mplayer backend for the phonon
+phonon-mplayer: multimedia framework used in KDE.
+phonon-mplayer:
+phonon-mplayer: Home: http://code.google.com/p/phonon-vlc-mplayer/
+phonon-mplayer:
+phonon-mplayer:
+phonon-mplayer:
+phonon-mplayer:
+phonon-mplayer:
diff --git a/source/l/phonon/phonon.SlackBuild b/source/l/phonon/phonon.SlackBuild
index 74e4518c..79c9629f 100755
--- a/source/l/phonon/phonon.SlackBuild
+++ b/source/l/phonon/phonon.SlackBuild
@@ -22,10 +22,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=4.4.1
-SRCVER=4.4.1
+PKGNAM=phonon
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:--j6}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -37,6 +36,8 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+NUMJOBS=${NUMJOBS:--j6}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-phonon
@@ -58,11 +59,9 @@ fi
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
-rm -r phonon-$SRCVER
+rm -r phonon-$VERSION
 tar xvf $CWD/phonon-$VERSION.tar.bz2 || exit 1
-cd phonon-$SRCVER || exit 1
-
-#zcat $CWD/phonon.gstreamer.qt-4.5.1.diff.gz | patch -p1 || exit 1
+cd phonon-$VERSION || exit 1
 
 chown -R root:root .
 find . \
diff --git a/source/l/phonon/phonon.gstreamer.qt-4.5.1.diff b/source/l/phonon/phonon.gstreamer.qt-4.5.1.diff
deleted file mode 100644
index d55d2f88..00000000
--- a/source/l/phonon/phonon.gstreamer.qt-4.5.1.diff
+++ /dev/null
@@ -1,431 +0,0 @@
-diff -u -r --new-file phonon-4.3.1.orig/gstreamer/CMakeLists.txt phonon-4.3.1/gstreamer/CMakeLists.txt
---- phonon-4.3.1.orig/gstreamer/CMakeLists.txt	2009-02-27 04:15:42.000000000 -0600
-+++ phonon-4.3.1/gstreamer/CMakeLists.txt	2009-10-19 13:07:39.000000000 -0500
-@@ -1,4 +1,4 @@
--# Copyright (C) 2009 Nokia Corporation. All rights reserved.
-+# Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
- # Copyright (C) 2008 Matthias Kretz <kretz@kde.org>
- #
- # This library is free software: you can redistribute it and/or modify
-@@ -19,7 +19,6 @@
- if (BUILD_PHONON_GSTREAMER)
-    include_directories(${GSTREAMER_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR}
-       ${LIBXML2_INCLUDE_DIR})
--   add_definitions(-DPHONON_BACKEND_VERSION_4_2)
- 
-    set(phonon_gstreamer_SRCS
-       audiooutput.cpp
-@@ -46,17 +45,17 @@
-       )
- 
-    find_package(Alsa)
--   macro_ensure_version("0.10.22" ${GSTREAMER_VERSION} GSTREAMER_HAS_NONBLOCKING_ALSASINK)
--   if(ALSA_FOUND AND NOT GSTREAMER_HAS_NONBLOCKING_ALSASINK)
-+   if(ALSA_FOUND)
-       add_definitions(-DUSE_ALSASINK2)
-       include_directories(${ALSA_INCLUDES})
-       set(phonon_gstreamer_SRCS
-          ${phonon_gstreamer_SRCS}
-          alsasink2.c
-          )
--   endif(ALSA_FOUND AND NOT GSTREAMER_HAS_NONBLOCKING_ALSASINK)
-+   endif(ALSA_FOUND)
- 
--   automoc4_add_library(phonon_gstreamer SHARED ${phonon_gstreamer_SRCS})
-+   automoc4(phonon_gstreamer phonon_gstreamer_SRCS)
-+   add_library(phonon_gstreamer SHARED ${phonon_gstreamer_SRCS})
-    set_target_properties(phonon_gstreamer PROPERTIES PREFIX "")
-    target_link_libraries(phonon_gstreamer
-       ${QT_QTOPENGL_LIBRARY}
-diff -u -r --new-file phonon-4.3.1.orig/gstreamer/ConfigureChecks.cmake phonon-4.3.1/gstreamer/ConfigureChecks.cmake
---- phonon-4.3.1.orig/gstreamer/ConfigureChecks.cmake	2009-02-27 04:15:42.000000000 -0600
-+++ phonon-4.3.1/gstreamer/ConfigureChecks.cmake	2009-10-19 13:07:39.000000000 -0500
-@@ -1,4 +1,4 @@
--# Copyright (C) 2009 Nokia Corporation. All rights reserved.
-+# Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
- #
- # This library is free software: you can redistribute it and/or modify
- # it under the terms of the GNU Lesser General Public License as published by
-@@ -17,7 +17,6 @@
- 
- macro_optional_find_package(GStreamerPlugins)
- macro_log_feature(GSTREAMER_PLUGIN_VIDEO_LIBRARIES "GStreamer video plugin" "The gstreamer video plugin (part of gstreamer-plugins-base 0.10) is required for the multimedia gstreamer backend" "http://gstreamer.freedesktop.org/modules/" FALSE "0.10")
--macro_log_feature(GSTREAMER_PLUGIN_AUDIO_LIBRARIES "GStreamer audio plugin" "The gstreamer audio plugin (part of gstreamer-plugins-base 0.10) is required for the multimedia gstreamer backend" "http://gstreamer.freedesktop.org/modules/" FALSE "0.10")
- 
- macro_optional_find_package(GLIB2)
- macro_log_feature(GLIB2_FOUND "GLib2" "GLib 2 is required to compile the gstreamer backend for Phonon" "http://www.gtk.org/download/" FALSE)
-@@ -31,8 +30,8 @@
- macro_optional_find_package(OpenGL)
- macro_log_feature(OPENGL_FOUND "OpenGL" "OpenGL support is required to compile the gstreamer backend for Phonon" "" FALSE)
- 
--if (GSTREAMER_FOUND AND GSTREAMER_PLUGIN_VIDEO_LIBRARIES AND GSTREAMER_PLUGIN_AUDIO_LIBRARIES AND GLIB2_FOUND AND GOBJECT_FOUND AND LIBXML2_FOUND AND OPENGL_FOUND)
-+if (GSTREAMER_FOUND AND GSTREAMER_PLUGIN_VIDEO_LIBRARIES AND GLIB2_FOUND AND GOBJECT_FOUND AND LIBXML2_FOUND AND OPENGL_FOUND)
-    set(BUILD_PHONON_GSTREAMER TRUE)
--else (GSTREAMER_FOUND AND GSTREAMER_PLUGIN_VIDEO_LIBRARIES AND GSTREAMER_PLUGIN_AUDIO_LIBRARIES AND GLIB2_FOUND AND GOBJECT_FOUND AND LIBXML2_FOUND AND OPENGL_FOUND)
-+else (GSTREAMER_FOUND AND GSTREAMER_PLUGIN_VIDEO_LIBRARIES AND GLIB2_FOUND AND GOBJECT_FOUND AND LIBXML2_FOUND AND OPENGL_FOUND)
-    set(BUILD_PHONON_GSTREAMER FALSE)
--endif (GSTREAMER_FOUND AND GSTREAMER_PLUGIN_VIDEO_LIBRARIES AND GSTREAMER_PLUGIN_AUDIO_LIBRARIES AND GLIB2_FOUND AND GOBJECT_FOUND AND LIBXML2_FOUND AND OPENGL_FOUND)
-+endif (GSTREAMER_FOUND AND GSTREAMER_PLUGIN_VIDEO_LIBRARIES AND GLIB2_FOUND AND GOBJECT_FOUND AND LIBXML2_FOUND AND OPENGL_FOUND)
-diff -u -r --new-file phonon-4.3.1.orig/gstreamer/audiooutput.cpp phonon-4.3.1/gstreamer/audiooutput.cpp
---- phonon-4.3.1.orig/gstreamer/audiooutput.cpp	2009-02-27 04:15:42.000000000 -0600
-+++ phonon-4.3.1/gstreamer/audiooutput.cpp	2009-10-19 13:07:39.000000000 -0500
-@@ -42,6 +42,7 @@
-     static int count = 0;
-     m_name = "AudioOutput" + QString::number(count++);
-     if (m_backend->isValid()) {
-+        g_set_application_name(qApp->applicationName().toUtf8());
-         m_audioBin = gst_bin_new (NULL);
-         gst_object_ref (GST_OBJECT (m_audioBin));
-         gst_object_sink (GST_OBJECT (m_audioBin));     
-diff -u -r --new-file phonon-4.3.1.orig/gstreamer/mediaobject.cpp phonon-4.3.1/gstreamer/mediaobject.cpp
---- phonon-4.3.1.orig/gstreamer/mediaobject.cpp	2009-02-27 04:15:42.000000000 -0600
-+++ phonon-4.3.1/gstreamer/mediaobject.cpp	2009-10-19 13:19:20.000000000 -0500
-@@ -14,7 +14,6 @@
-     You should have received a copy of the GNU Lesser General Public License
-     along with this library.  If not, see <http://www.gnu.org/licenses/>.
- */
--
- #include <cmath>
- #include <gst/interfaces/propertyprobe.h>
- #include "common.h"
-@@ -24,7 +23,6 @@
- #include "backend.h"
- #include "streamreader.h"
- #include "phononsrc.h"
--
- #include <QtCore>
- #include <QtCore/QTimer>
- #include <QtCore/QVector>
-@@ -78,6 +76,9 @@
-         , m_videoGraph(0)
-         , m_previousTickTime(-1)
-         , m_resetNeeded(false)
-+        , m_autoplayTitles(true)
-+        , m_availableTitles(0)
-+        , m_currentTitle(1)
- {
-     qRegisterMetaType<GstCaps*>("GstCaps*");
-     qRegisterMetaType<State>("State");
-@@ -141,9 +142,9 @@
-     if (m_resumeState)
-         return;
- 
--    if (m_state == Phonon::PlayingState || m_state == Phonon::PausedState) {
-+    if (m_pendingState == Phonon::PlayingState || m_pendingState == Phonon::PausedState) {
-         m_resumeState = true;
--        m_oldState = m_state;
-+        m_oldState = m_pendingState;
-         m_oldPos = getPipelinePos();
-     }
- }
-@@ -347,11 +348,8 @@
-  *
-  * returns true if successful
-  */
--bool MediaObject::createPipefromURL(const QString &encodedUrl)
-+bool MediaObject::createPipefromURL(const QUrl &url)
- {
--    // Convert back to URL
--    QUrl url(encodedUrl, QUrl::StrictMode);
--
-     // Remove any existing data source
-     if (m_datasource) {
-         gst_bin_remove(GST_BIN(m_pipeline), m_datasource);
-@@ -361,7 +359,7 @@
- 
-     // Verify that the uri can be parsed
-     if (!url.isValid()) {
--        m_backend->logMessage(QString("%1 is not a valid URI").arg(encodedUrl));
-+        m_backend->logMessage(QString("%1 is not a valid URI").arg(url.toString()));
-         return false;
-     }
- 
-@@ -875,8 +873,7 @@
- 
-     switch (source.type()) {
-     case MediaSource::Url: {            
--            QString urlString = source.url().toEncoded();
--            if (createPipefromURL(urlString))
-+            if (createPipefromURL(source.url()))
-                 m_loading = true;
-             else
-                 setError(tr("Could not open media source."));
-@@ -884,8 +881,7 @@
-         break;
- 
-     case MediaSource::LocalFile: {
--            QString urlString = QUrl::fromLocalFile(source.fileName()).toString();
--            if (createPipefromURL(urlString))
-+            if (createPipefromURL(QUrl::fromLocalFile(source.fileName())))
-                 m_loading = true;
-             else
-                 setError(tr("Could not open media source."));
-@@ -907,8 +903,13 @@
-         break;
- 
-     case MediaSource::Disc: // CD tracks can be specified by setting the url in the following way uri=cdda:4
--        m_backend->logMessage("Source type Disc not currently supported", Backend::Warning, this);
--        setError(tr("Could not open media source."), Phonon::NormalError);
-+        {
-+            QUrl cdurl(QLatin1String("cdda://"));
-+            if (createPipefromURL(cdurl))
-+                m_loading = true;
-+            else
-+                setError(tr("Could not open media source."));
-+        }
-         break;
- 
-     default:
-@@ -959,6 +960,19 @@
-         m_hasVideo = m_videoStreamFound;
-         emit hasVideoChanged(m_hasVideo);
-     }
-+
-+    m_availableTitles = 1;
-+    gint64 titleCount;
-+    GstFormat format = gst_format_get_by_nick("track");
-+    if (gst_element_query_duration (m_pipeline, &format, &titleCount)) {
-+        int oldAvailableTitles = m_availableTitles;
-+        m_availableTitles = (int)titleCount;
-+        if (m_availableTitles != oldAvailableTitles) {
-+            emit availableTitlesChanged(m_availableTitles);
-+            m_backend->logMessage(QString("Available titles changed: %0").arg(m_availableTitles), Backend::Info, this);
-+        }
-+    }
-+
- }
- 
- void MediaObject::setPrefinishMark(qint32 newPrefinishMark)
-@@ -1356,6 +1370,13 @@
-     if (!m_seekable)
-         m_atEndOfStream = true;
- 
-+    if (m_autoplayTitles &&
-+        m_availableTitles > 1 &&
-+        m_currentTitle < m_availableTitles) {
-+        _iface_setCurrentTitle(m_currentTitle + 1);
-+        return;
-+    }
-+
-     if (m_nextSource.type() != MediaSource::Invalid
-         && m_nextSource.type() != MediaSource::Empty) {  // We only emit finish when the queue is actually empty
-         QTimer::singleShot (qMax(0, transitionTime()), this, SLOT(beginPlay()));
-@@ -1384,6 +1405,72 @@
-     notify(&event);
- }
- 
-+#ifndef QT_NO_PHONON_MEDIACONTROLLER
-+//interface management
-+bool MediaObject::hasInterface(Interface iface) const
-+{
-+    return iface == AddonInterface::TitleInterface;
-+}
-+
-+QVariant MediaObject::interfaceCall(Interface iface, int command, const QList<QVariant> &params)
-+{
-+    if (hasInterface(iface)) {
-+
-+        switch (iface)
-+        {
-+        case TitleInterface:
-+            switch (command)
-+            {
-+            case availableTitles:
-+                return _iface_availableTitles();
-+            case title:
-+                return _iface_currentTitle();
-+            case setTitle:
-+                _iface_setCurrentTitle(params.first().toInt());
-+                break;
-+            case autoplayTitles:
-+                return m_autoplayTitles;
-+            case setAutoplayTitles:
-+                m_autoplayTitles = params.first().toBool();
-+                break;
-+            }
-+            break;
-+                default:
-+            break;
-+        }
-+    }
-+    return QVariant();
-+}
-+#endif
-+
-+int MediaObject::_iface_availableTitles() const
-+{
-+    return m_availableTitles;
-+}
-+
-+int MediaObject::_iface_currentTitle() const
-+{
-+    return m_currentTitle;
-+}
-+
-+void MediaObject::_iface_setCurrentTitle(int title)
-+{
-+    GstFormat trackFormat = gst_format_get_by_nick("track");
-+    m_backend->logMessage(QString("setCurrentTitle %0").arg(title), Backend::Info, this);
-+    if ((title == m_currentTitle) || (title < 1) || (title > m_availableTitles))
-+        return;
-+
-+    m_currentTitle = title;
-+
-+    //let's seek to the beginning of the song
-+    if (gst_element_seek_simple(m_pipeline, trackFormat, GST_SEEK_FLAG_FLUSH, m_currentTitle - 1)) {
-+        updateTotalTime();
-+        m_atEndOfStream = false;
-+        emit titleChanged(title);
-+        emit totalTimeChanged(totalTime());
-+    }
-+}
-+
- } // ns Gstreamer
- } // ns Phonon
- 
-diff -u -r --new-file phonon-4.3.1.orig/gstreamer/mediaobject.h phonon-4.3.1/gstreamer/mediaobject.h
---- phonon-4.3.1.orig/gstreamer/mediaobject.h	2009-02-27 04:15:42.000000000 -0600
-+++ phonon-4.3.1/gstreamer/mediaobject.h	2009-10-19 13:07:39.000000000 -0500
-@@ -21,7 +21,6 @@
- #include "backend.h"
- #include "common.h"
- #include "medianode.h"
--
- #include <phonon/mediaobjectinterface.h>
- #include <phonon/addoninterface.h>
- 
-@@ -32,7 +31,6 @@
- #include <QtCore/QDate>
- #include <QtCore/QEvent>
- #include <QtCore/QUrl>
--
- #include <gst/gst.h>
- 
- QT_BEGIN_NAMESPACE
-@@ -50,11 +48,20 @@
- class VideoPath;
- class AudioOutput;
- 
--class MediaObject : public QObject, public MediaObjectInterface, public AddonInterface, public MediaNode
-+class MediaObject : public QObject, public MediaObjectInterface
-+#ifndef QT_NO_PHONON_MEDIACONTROLLER
-+        , public AddonInterface
-+#endif
-+        , public MediaNode
- {
-     friend class Stream;
-     Q_OBJECT
--    Q_INTERFACES(Phonon::MediaObjectInterface Phonon::AddonInterface Phonon::Gstreamer::MediaNode)
-+    Q_INTERFACES(Phonon::MediaObjectInterface
-+#ifndef QT_NO_PHONON_MEDIACONTROLLER
-+                 Phonon::AddonInterface
-+#endif
-+                 Phonon::Gstreamer::MediaNode
-+    )
- 
- public:
- 
-@@ -93,16 +100,10 @@
-     MediaSource source() const;
- 
-     // No additional interfaces currently supported
--    bool hasInterface(Interface) const
--    {
--        return false;
--    }
--
--    QVariant interfaceCall(Interface, int, const QList<QVariant> &)
--    {
--        return QVariant();
--    }
--
-+#ifndef QT_NO_PHONON_MEDIACONTROLLER
-+    bool hasInterface(Interface) const;
-+    QVariant interfaceCall(Interface, int, const QList<QVariant> &);
-+#endif
-     bool isLoading()
-     {
-         return m_loading;
-@@ -176,6 +177,19 @@
-     QMultiMap<QString, QString> metaData();
-     void setMetaData(QMultiMap<QString, QString> newData);
- 
-+    // AddonInterface:
-+    void titleChanged(int);
-+    void availableTitlesChanged(int);
-+
-+    // Not implemented
-+    void chapterChanged(int);
-+    void availableChaptersChanged(int);
-+    void angleChanged(int);
-+    void availableAnglesChanged(int);
-+
-+    void availableSubtitlesChanged();
-+    void availableAudioChannelsChanged();
-+
- protected:
-     void beginLoad();
-     void loadingComplete();
-@@ -185,7 +199,7 @@
-     /*
-      * @param encodedUrl percent-encoded QString for source compat reasons.  Should change to QUrl
-      */
--    bool createPipefromURL(const QString &encodedUrl);
-+    bool createPipefromURL(const QUrl &url);
-     bool createPipefromStream(const MediaSource &);
- 
- private Q_SLOTS:
-@@ -219,6 +233,10 @@
-     void updateSeekable();
-     qint64 getPipelinePos() const;
- 
-+    int _iface_availableTitles() const;
-+    int _iface_currentTitle() const;
-+    void _iface_setCurrentTitle(int title);
-+
-     bool m_resumeState;
-     State m_oldState;
-     quint64 m_oldPos;
-@@ -264,6 +282,9 @@
-     bool m_resetNeeded;
-     QStringList m_missingCodecs;
-     QMultiMap<QString, QString> m_metaData;
-+    bool m_autoplayTitles;
-+    int m_availableTitles;
-+    int m_currentTitle;
- };
- }
- } //namespace Phonon::Gstreamer
-diff -u -r --new-file phonon-4.3.1.orig/gstreamer/qwidgetvideosink.h phonon-4.3.1/gstreamer/qwidgetvideosink.h
---- phonon-4.3.1.orig/gstreamer/qwidgetvideosink.h	2009-02-27 04:15:42.000000000 -0600
-+++ phonon-4.3.1/gstreamer/qwidgetvideosink.h	2009-10-19 13:07:39.000000000 -0500
-@@ -19,7 +19,6 @@
- #define Phonon_GSTREAMER_VIDEOSINK_H
- 
- #include "common.h"
--#include "qwidgetvideosink.h"
- 
- #include <QtCore/QByteArray>
- #include <QtCore/QEvent>
-diff -u -r --new-file phonon-4.3.1.orig/gstreamer/videowidget.h phonon-4.3.1/gstreamer/videowidget.h
---- phonon-4.3.1.orig/gstreamer/videowidget.h	2009-02-27 04:15:42.000000000 -0600
-+++ phonon-4.3.1/gstreamer/videowidget.h	2009-10-19 13:07:39.000000000 -0500
-@@ -25,7 +25,6 @@
- #include "common.h"
- #include "medianode.h"
- #include "abstractrenderer.h"
--#include "videowidget.h"
- 
- #include <gst/gst.h>
- 
-diff -u -r --new-file phonon-4.3.1.orig/gstreamer/x11renderer.cpp phonon-4.3.1/gstreamer/x11renderer.cpp
---- phonon-4.3.1.orig/gstreamer/x11renderer.cpp	2009-02-27 04:15:42.000000000 -0600
-+++ phonon-4.3.1/gstreamer/x11renderer.cpp	2009-10-19 13:07:39.000000000 -0500
-@@ -138,7 +138,6 @@
- void X11Renderer::movieSizeChanged(const QSize &movieSize)
- {
-     Q_UNUSED(movieSize);
--
-     if (m_renderWidget) {
-         m_renderWidget->setGeometry(m_videoWidget->calculateDrawFrameRect());
-     }
diff --git a/source/l/phonon/slack-desc b/source/l/phonon/slack-desc
index 86e93b3e..a4fbd02e 100644
--- a/source/l/phonon/slack-desc
+++ b/source/l/phonon/slack-desc
@@ -9,8 +9,8 @@
 phonon: phonon (multimedia framework for KDE4)
 phonon:
 phonon: Phonon is the multimedia framework for KDE4.  This package contains
-phonon: the Phonon library, the KDE Phonon xine and gstreamer backends, and
-phonon: support files for using Phonon with KDE.
+phonon: the xine and gstreamer backends and support files for KDE.  The
+phonon: Phonon library itself is included with Qt.
 phonon:
 phonon:
 phonon:
diff --git a/source/l/pilot-link/pilot-link.SlackBuild b/source/l/pilot-link/pilot-link.SlackBuild
index c6dac9fa..0d555da2 100755
--- a/source/l/pilot-link/pilot-link.SlackBuild
+++ b/source/l/pilot-link/pilot-link.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=${VERSION:-0.12.5}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/l/polkit-gnome/pkga.desktop-NotShowInKDE.diff b/source/l/polkit-gnome/pkga.desktop-NotShowInKDE.diff
deleted file mode 100644
index 997d1512..00000000
--- a/source/l/polkit-gnome/pkga.desktop-NotShowInKDE.diff
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -Nur polkit-gnome-0.95.orig//src/polkit-gnome-authentication-agent-1.desktop.in.in polkit-gnome-0.95/src/polkit-gnome-authentication-agent-1.desktop.in.in
---- polkit-gnome-0.95.orig//src/polkit-gnome-authentication-agent-1.desktop.in.in	2009-07-20 18:28:31.000000000 -0500
-+++ polkit-gnome-0.95/src/polkit-gnome-authentication-agent-1.desktop.in.in	2010-05-03 01:03:47.021291164 -0500
-@@ -5,4 +5,4 @@
- Terminal=false
- Type=Application
- Categories=
--OnlyShowIn=GNOME;
-+NotShowIn=KDE;
diff --git a/source/l/polkit-gnome/polkit-gnome-authentication-agent-1.desktop b/source/l/polkit-gnome/polkit-gnome-authentication-agent-1.desktop
new file mode 100644
index 00000000..7eaf48b0
--- /dev/null
+++ b/source/l/polkit-gnome/polkit-gnome-authentication-agent-1.desktop
@@ -0,0 +1,87 @@
+[Desktop Entry]
+Name=PolicyKit Authentication Agent
+Name[ar]=مدير الاستيثاق PolicyKit
+Name[be]=PolicyKit - аґент аўт�нтыфікацыі
+Name[bn_IN]=PolicyKit অন�মোদনের �জেন�ট
+Name[ca]=Agent d'autenticació del PolicyKit
+Name[cs]=Ověřovací agent PolicyKit
+Name[da]=Godkendelsesprogrammet PolicyKit
+Name[de]=Legitimationsdienst von PolicyKit
+Name[el]=Π�άκτο�ας πιστοποίησης PolicyKit
+Name[en_GB]=PolicyKit Authentication Agent
+Name[es]=Agente de autenticación de PolicyKit
+Name[eu]=PolicyKit autentifikatzeko agentea
+Name[fi]=PolicytKit-tunnistautumisohjelma
+Name[fr]=Agent d'authentification de PolicyKit
+Name[gl]=Axente de autenticación PolicyKit
+Name[gu]=PolicyKit સત�તાધિકરણ �જન�ટ
+Name[hi]=PolicyKit प�रमाणीकरण प�रतिनिधि
+Name[hu]=PolicyKit hitelesítési ügynök
+Name[it]=Agente di autenticazione per PolicyKit
+Name[ja]=PolicyKit �証エージェント
+Name[kn]=PolicyKit ದೃಢೀಕರಣ ಮಧ�ಯವರ�ತಿ
+Name[lt]=PolicyKit tapatybÄ—s nustatymo agentas
+Name[ml]=പോളിസിക�കിറ�റ� ഓഥന�റിക�കേഷന�� �ജന�റ�
+Name[mr]=PolicyKit ऑथेंटीकेशन �जेंट
+Name[or]=PolicyKit ବୈଧିକରଣ ସଦସ�ୟ
+Name[pa]=ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ �ਜੰਟ
+Name[pl]=Agent uwierzytelniania PolicyKit
+Name[pt]=Agente de Autenticação PolicyKit
+Name[pt_BR]=Agente de autenticação PolicyKit
+Name[ro]=Agent de autentificare PolicyKit
+Name[sk]=Agent PolicyKit na overovanie totožnosti
+Name[sl]=PolicyKit program overjanja
+Name[sv]=Autentiseringsagent för PolicyKit
+Name[ta]=PolicyKit அங�கீகார ம�கவர�
+Name[te]=పాలసీకిట� ధృవీకరణ ప�రతినిధి
+Name[th]=ตัว�ลางสำหรับยืนยันตัวบุคคล PolicyKit
+Name[uk]=�гент автентифікації PolicyKit
+Name[zh_CN]=PolicyKit 认�代�
+Name[zh_HK]=PolicyKit 驗證代�程�
+Name[zh_TW]=PolicyKit 驗證代�程�
+Comment=PolicyKit Authentication Agent
+Comment[ar]=مدير الاستيثاق PolicyKit
+Comment[be]=PolicyKit - аґент аўт�нтыфікацыі
+Comment[bn_IN]=PolicyKit অন�মোদনের �জেন�ট
+Comment[ca]=Agent d'autenticació del PolicyKit
+Comment[cs]=Ověřovací agent PolicyKit
+Comment[da]=Godkendelsesprogrammet PolicyKit
+Comment[de]=Legitimationsdienst von PolicyKit
+Comment[el]=Π�άκτο�ας πιστοποίησης PolicyKit
+Comment[en_GB]=PolicyKit Authentication Agent
+Comment[es]=Agente de autenticación de PolicyKit
+Comment[eu]=PolicyKit autentifikatzeko agentea
+Comment[fi]=PolicytKit-tunnistautumisohjelma
+Comment[fr]=Agent d'authentification de PolicyKit
+Comment[gl]=Axente de autenticación PolicyKit
+Comment[gu]=PolicyKit સત�તાધિકરણ �જન�ટ
+Comment[hi]=PolicyKit प�रमाणीकरण प�रतिनिधि
+Comment[hu]=PolicyKit hitelesítési ügynök
+Comment[it]=Agente di autenticazione per PolicyKit
+Comment[ja]=PolicyKit �証エージェント
+Comment[kn]=PolicyKit ದೃಢೀಕರಣ ಮಧ�ಯವರ�ತಿ
+Comment[lt]=PolicyKit tapatybÄ—s nustatymo agentas
+Comment[ml]=പോളിസിക�കിറ�റ� ഓഥന�റിക�കേഷന�� �ജന�റ�
+Comment[mr]=PolicyKit ऑथेंटीकेशन �जेंट
+Comment[or]=PolicyKit ବୈଧିକରଣ ସଦସ�ୟ
+Comment[pa]=ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ �ਜੰਟ
+Comment[pl]=Agent uwierzytelniania PolicyKit
+Comment[pt]=Agente de Autenticação PolicyKit
+Comment[pt_BR]=Agente de autenticação PolicyKit
+Comment[ro]=Agent de autentificare PolicyKit
+Comment[sk]=Agent PolicyKit na overovanie totožnosti
+Comment[sl]=PolicyKit program overjanja
+Comment[sv]=Autentiseringsagent för PolicyKit
+Comment[ta]=PolicyKit அங�கீகார ம�கவர�
+Comment[te]=పాలసీకిట� ధృవీకరణ ప�రతినిధి
+Comment[th]=ตัว�ลางสำหรับยืนยันตัวบุคคล PolicyKit
+Comment[uk]=�гент автентифікації PolicyKit
+Comment[zh_CN]=PolicyKit 认�代�
+Comment[zh_HK]=PolicyKit 驗證代�程�
+Comment[zh_TW]=PolicyKit 驗證代�程�
+Exec=/usr/libexec/polkit-gnome-authentication-agent-1
+Terminal=false
+Type=Application
+Categories=
+NoDisplay=true
+NotShowIn=KDE;LXDE;
diff --git a/source/l/polkit-gnome/polkit-gnome.SlackBuild b/source/l/polkit-gnome/polkit-gnome.SlackBuild
index 1790e66b..82937550 100755
--- a/source/l/polkit-gnome/polkit-gnome.SlackBuild
+++ b/source/l/polkit-gnome/polkit-gnome.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for polkit-gnome
 
-# Copyright 2009, 2010  Robby Workman, Northport, Alabama, USA
+# Copyright 2009, 2010, 2011  Robby Workman, Northport, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,17 +26,18 @@ PKGNAM=polkit-gnome
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
-NUMJOBS=${NUMJOBS:--j6}
-
-# Automatically determine architecture for build & packaging:
+# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
-    *)    export ARCH=$( uname -m ) ;;
+       *) export ARCH=$( uname -m ) ;;
   esac
 fi
 
+NUMJOBS=${NUMJOBS:--j6}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
@@ -68,10 +69,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Let's reverse the logic from OnlyShowIn=GNOME to NotShowIn=KDE so that this
-# authentication agent can be used in Xfce (and third-party gnome as needed)
-zcat $CWD/pkga.desktop-NotShowInKDE.diff.gz | patch -p1 || exit 1
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -89,6 +86,11 @@ CXXFLAGS="$SLKCFLAGS" \
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG
 
+# Install the "old" autostart desktop file
+mkdir -p $PKG/etc/xdg/autostart
+cat $CWD/polkit-gnome-authentication-agent-1.desktop > \
+    $PKG/etc/xdg/autostart/polkit-gnome-authentication-agent-1.desktop
+
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
diff --git a/source/l/polkit/CVE-2011-1485/0001-PolkitUnixProcess-Clarify-that-the-real-uid-is-retur.patch b/source/l/polkit/CVE-2011-1485/0001-PolkitUnixProcess-Clarify-that-the-real-uid-is-retur.patch
new file mode 100644
index 00000000..9431056b
--- /dev/null
+++ b/source/l/polkit/CVE-2011-1485/0001-PolkitUnixProcess-Clarify-that-the-real-uid-is-retur.patch
@@ -0,0 +1,139 @@
+From dd848a42a64a3b22a0cc60f6657b56ce9b6010ae Mon Sep 17 00:00:00 2001
+From: David Zeuthen <davidz@redhat.com>
+Date: Thu, 31 Mar 2011 12:59:09 -0400
+Subject: [PATCH 1/4] PolkitUnixProcess: Clarify that the real uid is
+ returned, not the effective one
+
+On Linux, also switch to parsing /proc/<pid>/status instead of relying
+on the st_uid returned by stat(2) to be the uid we want.
+
+This was pointed out by Neel Mehta <nmehta@google.com>. Thanks!
+
+Signed-off-by: David Zeuthen <davidz@redhat.com>
+---
+ src/polkit/polkitunixprocess.c |   66 ++++++++++++++++++++++++++++++----------
+ 1 files changed, 50 insertions(+), 16 deletions(-)
+
+diff --git a/src/polkit/polkitunixprocess.c b/src/polkit/polkitunixprocess.c
+index d95a1d4..876da69 100644
+--- a/src/polkit/polkitunixprocess.c
++++ b/src/polkit/polkitunixprocess.c
+@@ -24,9 +24,7 @@
+ #endif
+ 
+ #include <sys/types.h>
+-#ifndef HAVE_FREEBSD
+-#include <sys/stat.h>
+-#else
++#ifdef HAVE_FREEBSD
+ #include <sys/param.h>
+ #include <sys/sysctl.h>
+ #include <sys/user.h>
+@@ -34,6 +32,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>
++#include <stdio.h>
+ 
+ #include "polkitunixprocess.h"
+ #include "polkitsubject.h"
+@@ -208,6 +207,8 @@ polkit_unix_process_get_pid (PolkitUnixProcess *process)
+  *
+  * Gets the uid of the owner of @process.
+  *
++ * Note that this returns the real user-id (not the effective user-id) of @process.
++ *
+  * Returns: The UNIX user id of the owner for @process or 0 if @error is set.
+  **/
+ gint
+@@ -215,17 +216,21 @@ polkit_unix_process_get_owner (PolkitUnixProcess  *process,
+                                GError            **error)
+ {
+   gint result;
++  gchar *contents;
++  gchar **lines;
+ #ifdef HAVE_FREEBSD
+   struct kinfo_proc p;
+ #else
+-  struct stat statbuf;
+-  char procbuf[32];
++  gchar filename[64];
++  guint n;
+ #endif
+ 
+   g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0);
+   g_return_val_if_fail (error == NULL || *error == NULL, 0);
+ 
+   result = 0;
++  lines = NULL;
++  contents = NULL;
+ 
+ #ifdef HAVE_FREEBSD
+   if (get_kinfo_proc (process->pid, &p) == 0)
+@@ -241,23 +246,52 @@ polkit_unix_process_get_owner (PolkitUnixProcess  *process,
+ 
+   result = p.ki_uid;
+ #else
+-  g_snprintf (procbuf, sizeof procbuf, "/proc/%d", process->pid);
+-  if (stat (procbuf, &statbuf) != 0)
++
++  /* see 'man proc' for layout of the status file
++   *
++   * Uid, Gid: Real, effective, saved set,  and  file  system  UIDs (GIDs).
++   */
++  g_snprintf (filename, sizeof filename, "/proc/%d/status", process->pid);
++  if (!g_file_get_contents (filename,
++                            &contents,
++                            NULL,
++                            error))
+     {
+-      g_set_error (error,
+-                   POLKIT_ERROR,
+-                   POLKIT_ERROR_FAILED,
+-                   "stat() failed for /proc/%d: %s",
+-                   process->pid,
+-                   g_strerror (errno));
+       goto out;
+     }
++  lines = g_strsplit (contents, "\n", -1);
++  for (n = 0; lines != NULL && lines[n] != NULL; n++)
++    {
++      gint real_uid, effective_uid;
++      if (!g_str_has_prefix (lines[n], "Uid:"))
++        continue;
++      if (sscanf (lines[n] + 4, "%d %d", &real_uid, &effective_uid) != 2)
++        {
++          g_set_error (error,
++                       POLKIT_ERROR,
++                       POLKIT_ERROR_FAILED,
++                       "Unexpected line `%s' in file %s",
++                       lines[n],
++                       filename);
++          goto out;
++        }
++      else
++        {
++          result = real_uid;
++          goto out;
++        }
++    }
+ 
+-  result = statbuf.st_uid;
++  g_set_error (error,
++               POLKIT_ERROR,
++               POLKIT_ERROR_FAILED,
++               "Didn't find any line starting with `Uid:' in file %s",
++               filename);
+ #endif
+ 
+- out:
+-
++out:
++  g_strfreev (lines);
++  g_free (contents);
+   return result;
+ }
+ 
+-- 
+1.7.4.4
+
diff --git a/source/l/polkit/CVE-2011-1485/0002-Make-PolkitUnixProcess-also-record-the-uid-of-the-pr.patch b/source/l/polkit/CVE-2011-1485/0002-Make-PolkitUnixProcess-also-record-the-uid-of-the-pr.patch
new file mode 100644
index 00000000..81a163c6
--- /dev/null
+++ b/source/l/polkit/CVE-2011-1485/0002-Make-PolkitUnixProcess-also-record-the-uid-of-the-pr.patch
@@ -0,0 +1,623 @@
+From 129b6223a19e7fb2753f8cad7957ac5402394076 Mon Sep 17 00:00:00 2001
+From: David Zeuthen <davidz@redhat.com>
+Date: Fri, 1 Apr 2011 12:09:45 -0400
+Subject: [PATCH 2/4] Make PolkitUnixProcess also record the uid of the
+ process
+
+This is needed to avoid possible TOCTTOU issues since a process can
+change both its real uid and effective uid.
+
+Signed-off-by: David Zeuthen <davidz@redhat.com>
+---
+ docs/polkit/polkit-1-sections.txt |    7 +-
+ src/polkit/polkitsubject.c        |   25 +++-
+ src/polkit/polkitunixprocess.c    |  346 +++++++++++++++++++++++++------------
+ src/polkit/polkitunixprocess.h    |   18 ++-
+ 4 files changed, 278 insertions(+), 118 deletions(-)
+
+diff --git a/docs/polkit/polkit-1-sections.txt b/docs/polkit/polkit-1-sections.txt
+index 12141e3..9f4fcf8 100644
+--- a/docs/polkit/polkit-1-sections.txt
++++ b/docs/polkit/polkit-1-sections.txt
+@@ -145,10 +145,13 @@ POLKIT_UNIX_SESSION_GET_CLASS
+ PolkitUnixProcess
+ polkit_unix_process_new
+ polkit_unix_process_new_full
++polkit_unix_process_new_for_owner
++polkit_unix_process_set_pid
+ polkit_unix_process_get_pid
++polkit_unix_process_set_start_time
+ polkit_unix_process_get_start_time
+-polkit_unix_process_set_pid
+-polkit_unix_process_get_owner
++polkit_unix_process_set_uid
++polkit_unix_process_get_uid
+ <SUBSECTION Standard>
+ PolkitUnixProcessClass
+ POLKIT_UNIX_PROCESS
+diff --git a/src/polkit/polkitsubject.c b/src/polkit/polkitsubject.c
+index 577afec..d2c4c20 100644
+--- a/src/polkit/polkitsubject.c
++++ b/src/polkit/polkitsubject.c
+@@ -238,13 +238,18 @@ polkit_subject_from_string  (const gchar   *str,
+     {
+       gint scanned_pid;
+       guint64 scanned_starttime;
+-      if (sscanf (str, "unix-process:%d:%" G_GUINT64_FORMAT, &scanned_pid, &scanned_starttime) == 2)
++      gint scanned_uid;
++      if (sscanf (str, "unix-process:%d:%" G_GUINT64_FORMAT ":%d", &scanned_pid, &scanned_starttime, &scanned_uid) == 3)
++        {
++          subject = polkit_unix_process_new_for_owner (scanned_pid, scanned_starttime, scanned_uid);
++        }
++      else if (sscanf (str, "unix-process:%d:%" G_GUINT64_FORMAT, &scanned_pid, &scanned_starttime) == 2)
+         {
+           subject = polkit_unix_process_new_full (scanned_pid, scanned_starttime);
+         }
+       else if (sscanf (str, "unix-process:%d", &scanned_pid) == 1)
+         {
+-          subject = polkit_unix_process_new_full (scanned_pid, 0);
++          subject = polkit_unix_process_new (scanned_pid);
+           if (polkit_unix_process_get_start_time (POLKIT_UNIX_PROCESS (subject)) == 0)
+             {
+               g_object_unref (subject);
+@@ -297,6 +302,8 @@ polkit_subject_to_gvariant (PolkitSubject *subject)
+                              g_variant_new_uint32 (polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject))));
+       g_variant_builder_add (&builder, "{sv}", "start-time",
+                              g_variant_new_uint64 (polkit_unix_process_get_start_time (POLKIT_UNIX_PROCESS (subject))));
++      g_variant_builder_add (&builder, "{sv}", "uid",
++                             g_variant_new_int32 (polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject))));
+     }
+   else if (POLKIT_IS_UNIX_SESSION (subject))
+     {
+@@ -395,6 +402,7 @@ polkit_subject_new_for_gvariant (GVariant  *variant,
+       GVariant *v;
+       guint32 pid;
+       guint64 start_time;
++      gint32 uid;
+ 
+       v = lookup_asv (details_gvariant, "pid", G_VARIANT_TYPE_UINT32, error);
+       if (v == NULL)
+@@ -414,7 +422,18 @@ polkit_subject_new_for_gvariant (GVariant  *variant,
+       start_time = g_variant_get_uint64 (v);
+       g_variant_unref (v);
+ 
+-      ret = polkit_unix_process_new_full (pid, start_time);
++      v = lookup_asv (details_gvariant, "uid", G_VARIANT_TYPE_INT32, error);
++      if (v != NULL)
++        {
++          uid = g_variant_get_int32 (v);
++          g_variant_unref (v);
++        }
++      else
++        {
++          uid = -1;
++        }
++
++      ret = polkit_unix_process_new_for_owner (pid, start_time, uid);
+     }
+   else if (g_strcmp0 (kind, "unix-session") == 0)
+     {
+diff --git a/src/polkit/polkitunixprocess.c b/src/polkit/polkitunixprocess.c
+index 876da69..913be3a 100644
+--- a/src/polkit/polkitunixprocess.c
++++ b/src/polkit/polkitunixprocess.c
+@@ -62,6 +62,7 @@ struct _PolkitUnixProcess
+ 
+   gint pid;
+   guint64 start_time;
++  gint uid;
+ };
+ 
+ struct _PolkitUnixProcessClass
+@@ -74,6 +75,7 @@ enum
+   PROP_0,
+   PROP_PID,
+   PROP_START_TIME,
++  PROP_UID
+ };
+ 
+ static void subject_iface_init (PolkitSubjectIface *subject_iface);
+@@ -81,6 +83,9 @@ static void subject_iface_init (PolkitSubjectIface *subject_iface);
+ static guint64 get_start_time_for_pid (gint    pid,
+                                        GError **error);
+ 
++static gint _polkit_unix_process_get_owner (PolkitUnixProcess  *process,
++                                            GError            **error);
++
+ #ifdef HAVE_FREEBSD
+ static gboolean get_kinfo_proc (gint pid, struct kinfo_proc *p);
+ #endif
+@@ -92,6 +97,7 @@ G_DEFINE_TYPE_WITH_CODE (PolkitUnixProcess, polkit_unix_process, G_TYPE_OBJECT,
+ static void
+ polkit_unix_process_init (PolkitUnixProcess *unix_process)
+ {
++  unix_process->uid = -1;
+ }
+ 
+ static void
+@@ -108,6 +114,10 @@ polkit_unix_process_get_property (GObject    *object,
+       g_value_set_int (value, unix_process->pid);
+       break;
+ 
++    case PROP_UID:
++      g_value_set_int (value, unix_process->uid);
++      break;
++
+     case PROP_START_TIME:
+       g_value_set_uint64 (value, unix_process->start_time);
+       break;
+@@ -132,6 +142,14 @@ polkit_unix_process_set_property (GObject      *object,
+       polkit_unix_process_set_pid (unix_process, g_value_get_int (value));
+       break;
+ 
++    case PROP_UID:
++      polkit_unix_process_set_uid (unix_process, g_value_get_int (value));
++      break;
++
++    case PROP_START_TIME:
++      polkit_unix_process_set_start_time (unix_process, g_value_get_uint64 (value));
++      break;
++
+     default:
+       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+       break;
+@@ -139,12 +157,39 @@ polkit_unix_process_set_property (GObject      *object,
+ }
+ 
+ static void
++polkit_unix_process_constructed (GObject *object)
++{
++  PolkitUnixProcess *process = POLKIT_UNIX_PROCESS (object);
++
++  /* sets start_time and uid in case they are unset */
++
++  if (process->start_time == 0)
++    process->start_time = get_start_time_for_pid (process->pid, NULL);
++
++  if (process->uid == -1)
++    {
++      GError *error;
++      error = NULL;
++      process->uid = _polkit_unix_process_get_owner (process, &error);
++      if (error != NULL)
++        {
++          process->uid = -1;
++          g_error_free (error);
++        }
++    }
++
++  if (G_OBJECT_CLASS (polkit_unix_process_parent_class)->constructed != NULL)
++    G_OBJECT_CLASS (polkit_unix_process_parent_class)->constructed (object);
++}
++
++static void
+ polkit_unix_process_class_init (PolkitUnixProcessClass *klass)
+ {
+   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ 
+   gobject_class->get_property = polkit_unix_process_get_property;
+   gobject_class->set_property = polkit_unix_process_set_property;
++  gobject_class->constructed =  polkit_unix_process_constructed;
+ 
+   /**
+    * PolkitUnixProcess:pid:
+@@ -156,7 +201,7 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass)
+                                    g_param_spec_int ("pid",
+                                                      "Process ID",
+                                                      "The UNIX process ID",
+-                                                     -1,
++                                                     0,
+                                                      G_MAXINT,
+                                                      0,
+                                                      G_PARAM_CONSTRUCT |
+@@ -166,6 +211,27 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass)
+                                                      G_PARAM_STATIC_NICK));
+ 
+   /**
++   * PolkitUnixProcess:uid:
++   *
++   * The UNIX user id of the process or -1 if unknown.
++   *
++   * Note that this is the real user-id, not the effective user-id.
++   */
++  g_object_class_install_property (gobject_class,
++                                   PROP_UID,
++                                   g_param_spec_int ("uid",
++                                                     "User ID",
++                                                     "The UNIX user ID",
++                                                     -1,
++                                                     G_MAXINT,
++                                                     -1,
++                                                     G_PARAM_CONSTRUCT |
++                                                     G_PARAM_READWRITE |
++                                                     G_PARAM_STATIC_NAME |
++                                                     G_PARAM_STATIC_BLURB |
++                                                     G_PARAM_STATIC_NICK));
++
++  /**
+    * PolkitUnixProcess:start-time:
+    *
+    * The start time of the process.
+@@ -178,7 +244,8 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass)
+                                                         0,
+                                                         G_MAXUINT64,
+                                                         0,
+-                                                        G_PARAM_READABLE |
++                                                        G_PARAM_CONSTRUCT |
++                                                        G_PARAM_READWRITE |
+                                                         G_PARAM_STATIC_NAME |
+                                                         G_PARAM_STATIC_BLURB |
+                                                         G_PARAM_STATIC_NICK));
+@@ -186,113 +253,50 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass)
+ }
+ 
+ /**
+- * polkit_unix_process_get_pid:
++ * polkit_unix_process_get_uid:
+  * @process: A #PolkitUnixProcess.
+  *
+- * Gets the process id for @process.
++ * Gets the user id for @process. Note that this is the real user-id,
++ * not the effective user-id.
+  *
+- * Returns: The process id for @process.
++ * Returns: The user id for @process or -1 if unknown.
+  */
+ gint
+-polkit_unix_process_get_pid (PolkitUnixProcess *process)
++polkit_unix_process_get_uid (PolkitUnixProcess *process)
+ {
+-  g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0);
+-  return process->pid;
++  g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), -1);
++  return process->uid;
+ }
+ 
+ /**
+- * polkit_unix_process_get_owner:
++ * polkit_unix_process_set_uid:
+  * @process: A #PolkitUnixProcess.
+- * @error: (allow-none): Return location for error or %NULL.
++ * @uid: The user id to set for @process or -1 to unset it.
+  *
+- * Gets the uid of the owner of @process.
++ * Sets the (real, not effective) user id for @process.
++ */
++void
++polkit_unix_process_set_uid (PolkitUnixProcess *process,
++                             gint               uid)
++{
++  g_return_if_fail (POLKIT_IS_UNIX_PROCESS (process));
++  g_return_if_fail (uid >= -1);
++  process->uid = uid;
++}
++
++/**
++ * polkit_unix_process_get_pid:
++ * @process: A #PolkitUnixProcess.
+  *
+- * Note that this returns the real user-id (not the effective user-id) of @process.
++ * Gets the process id for @process.
+  *
+- * Returns: The UNIX user id of the owner for @process or 0 if @error is set.
+- **/
++ * Returns: The process id for @process.
++ */
+ gint
+-polkit_unix_process_get_owner (PolkitUnixProcess  *process,
+-                               GError            **error)
++polkit_unix_process_get_pid (PolkitUnixProcess *process)
+ {
+-  gint result;
+-  gchar *contents;
+-  gchar **lines;
+-#ifdef HAVE_FREEBSD
+-  struct kinfo_proc p;
+-#else
+-  gchar filename[64];
+-  guint n;
+-#endif
+-
+   g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0);
+-  g_return_val_if_fail (error == NULL || *error == NULL, 0);
+-
+-  result = 0;
+-  lines = NULL;
+-  contents = NULL;
+-
+-#ifdef HAVE_FREEBSD
+-  if (get_kinfo_proc (process->pid, &p) == 0)
+-    {
+-      g_set_error (error,
+-                   POLKIT_ERROR,
+-                   POLKIT_ERROR_FAILED,
+-                   "get_kinfo_proc() failed for pid %d: %s",
+-                   process->pid,
+-                   g_strerror (errno));
+-      goto out;
+-    }
+-
+-  result = p.ki_uid;
+-#else
+-
+-  /* see 'man proc' for layout of the status file
+-   *
+-   * Uid, Gid: Real, effective, saved set,  and  file  system  UIDs (GIDs).
+-   */
+-  g_snprintf (filename, sizeof filename, "/proc/%d/status", process->pid);
+-  if (!g_file_get_contents (filename,
+-                            &contents,
+-                            NULL,
+-                            error))
+-    {
+-      goto out;
+-    }
+-  lines = g_strsplit (contents, "\n", -1);
+-  for (n = 0; lines != NULL && lines[n] != NULL; n++)
+-    {
+-      gint real_uid, effective_uid;
+-      if (!g_str_has_prefix (lines[n], "Uid:"))
+-        continue;
+-      if (sscanf (lines[n] + 4, "%d %d", &real_uid, &effective_uid) != 2)
+-        {
+-          g_set_error (error,
+-                       POLKIT_ERROR,
+-                       POLKIT_ERROR_FAILED,
+-                       "Unexpected line `%s' in file %s",
+-                       lines[n],
+-                       filename);
+-          goto out;
+-        }
+-      else
+-        {
+-          result = real_uid;
+-          goto out;
+-        }
+-    }
+-
+-  g_set_error (error,
+-               POLKIT_ERROR,
+-               POLKIT_ERROR_FAILED,
+-               "Didn't find any line starting with `Uid:' in file %s",
+-               filename);
+-#endif
+-
+-out:
+-  g_strfreev (lines);
+-  g_free (contents);
+-  return result;
++  return process->pid;
+ }
+ 
+ /**
+@@ -311,6 +315,21 @@ polkit_unix_process_get_start_time (PolkitUnixProcess *process)
+ }
+ 
+ /**
++ * polkit_unix_process_set_start_time:
++ * @process: A #PolkitUnixProcess.
++ * @start_time: The start time for @pid.
++ *
++ * Set the start time of @process.
++ */
++void
++polkit_unix_process_set_start_time (PolkitUnixProcess *process,
++                                    guint64            start_time)
++{
++  g_return_if_fail (POLKIT_IS_UNIX_PROCESS (process));
++  process->start_time = start_time;
++}
++
++/**
+  * polkit_unix_process_set_pid:
+  * @process: A #PolkitUnixProcess.
+  * @pid: A process id.
+@@ -323,18 +342,17 @@ polkit_unix_process_set_pid (PolkitUnixProcess *process,
+ {
+   g_return_if_fail (POLKIT_IS_UNIX_PROCESS (process));
+   process->pid = pid;
+-  if (pid != (gint) -1)
+-    process->start_time = get_start_time_for_pid (pid, NULL);
+ }
+ 
+ /**
+  * polkit_unix_process_new:
+  * @pid: The process id.
+  *
+- * Creates a new #PolkitUnixProcess for @pid. The start time of the
+- * process will be looked up in using e.g. the
+- * <filename>/proc</filename> filesystem depending on the platform in
+- * use.
++ * Creates a new #PolkitUnixProcess for @pid.
++ *
++ * The uid and start time of the process will be looked up in using
++ * e.g. the <filename>/proc</filename> filesystem depending on the
++ * platform in use.
+  *
+  * Returns: (transfer full): A #PolkitSubject. Free with g_object_unref().
+  */
+@@ -353,22 +371,42 @@ polkit_unix_process_new (gint pid)
+  *
+  * Creates a new #PolkitUnixProcess object for @pid and @start_time.
+  *
++ * The uid of the process will be looked up in using e.g. the
++ * <filename>/proc</filename> filesystem depending on the platform in
++ * use.
++ *
+  * Returns: (transfer full): A #PolkitSubject. Free with g_object_unref().
+  */
+ PolkitSubject *
+ polkit_unix_process_new_full (gint pid,
+                               guint64 start_time)
+ {
+-  PolkitUnixProcess *process;
+-
+-  process = POLKIT_UNIX_PROCESS (polkit_unix_process_new ((gint) -1));
+-  process->pid = pid;
+-  if (start_time != 0)
+-    process->start_time = start_time;
+-  else
+-    process->start_time = get_start_time_for_pid (pid, NULL);
++  return POLKIT_SUBJECT (g_object_new (POLKIT_TYPE_UNIX_PROCESS,
++                                       "pid", pid,
++                                       "start_time", start_time,
++                                       NULL));
++}
+ 
+-  return POLKIT_SUBJECT (process);
++/**
++ * polkit_unix_process_new_for_owner:
++ * @pid: The process id.
++ * @start_time: The start time for @pid or 0 to look it up in e.g. <filename>/proc</filename>.
++ * @uid: The (real, not effective) uid of the owner of @pid or -1 to look it up in e.g. <filename>/proc</filename>.
++ *
++ * Creates a new #PolkitUnixProcess object for @pid, @start_time and @uid.
++ *
++ * Returns: (transfer full): A #PolkitSubject. Free with g_object_unref().
++ */
++PolkitSubject *
++polkit_unix_process_new_for_owner (gint    pid,
++                                   guint64 start_time,
++                                   gint    uid)
++{
++  return POLKIT_SUBJECT (g_object_new (POLKIT_TYPE_UNIX_PROCESS,
++                                       "pid", pid,
++                                       "start_time", start_time,
++                                       "uid", uid,
++                                       NULL));
+ }
+ 
+ static guint
+@@ -616,3 +654,95 @@ out:
+ 
+   return start_time;
+ }
++
++static gint
++_polkit_unix_process_get_owner (PolkitUnixProcess  *process,
++                                GError            **error)
++{
++  gint result;
++  gchar *contents;
++  gchar **lines;
++#ifdef HAVE_FREEBSD
++  struct kinfo_proc p;
++#else
++  gchar filename[64];
++  guint n;
++#endif
++
++  g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0);
++  g_return_val_if_fail (error == NULL || *error == NULL, 0);
++
++  result = 0;
++  lines = NULL;
++  contents = NULL;
++
++#ifdef HAVE_FREEBSD
++  if (get_kinfo_proc (process->pid, &p) == 0)
++    {
++      g_set_error (error,
++                   POLKIT_ERROR,
++                   POLKIT_ERROR_FAILED,
++                   "get_kinfo_proc() failed for pid %d: %s",
++                   process->pid,
++                   g_strerror (errno));
++      goto out;
++    }
++
++  result = p.ki_uid;
++#else
++
++  /* see 'man proc' for layout of the status file
++   *
++   * Uid, Gid: Real, effective, saved set,  and  file  system  UIDs (GIDs).
++   */
++  g_snprintf (filename, sizeof filename, "/proc/%d/status", process->pid);
++  if (!g_file_get_contents (filename,
++                            &contents,
++                            NULL,
++                            error))
++    {
++      goto out;
++    }
++  lines = g_strsplit (contents, "\n", -1);
++  for (n = 0; lines != NULL && lines[n] != NULL; n++)
++    {
++      gint real_uid, effective_uid;
++      if (!g_str_has_prefix (lines[n], "Uid:"))
++        continue;
++      if (sscanf (lines[n] + 4, "%d %d", &real_uid, &effective_uid) != 2)
++        {
++          g_set_error (error,
++                       POLKIT_ERROR,
++                       POLKIT_ERROR_FAILED,
++                       "Unexpected line `%s' in file %s",
++                       lines[n],
++                       filename);
++          goto out;
++        }
++      else
++        {
++          result = real_uid;
++          goto out;
++        }
++    }
++
++  g_set_error (error,
++               POLKIT_ERROR,
++               POLKIT_ERROR_FAILED,
++               "Didn't find any line starting with `Uid:' in file %s",
++               filename);
++#endif
++
++out:
++  g_strfreev (lines);
++  g_free (contents);
++  return result;
++}
++
++/* deprecated public method */
++gint
++polkit_unix_process_get_owner (PolkitUnixProcess  *process,
++                               GError            **error)
++{
++  return _polkit_unix_process_get_owner (process, error);
++}
+diff --git a/src/polkit/polkitunixprocess.h b/src/polkit/polkitunixprocess.h
+index b88cd03..531a57d 100644
+--- a/src/polkit/polkitunixprocess.h
++++ b/src/polkit/polkitunixprocess.h
+@@ -47,16 +47,24 @@ typedef struct _PolkitUnixProcess PolkitUnixProcess;
+ typedef struct _PolkitUnixProcessClass PolkitUnixProcessClass;
+ 
+ GType           polkit_unix_process_get_type       (void) G_GNUC_CONST;
+-PolkitSubject  *polkit_unix_process_new            (gint pid);
+-PolkitSubject  *polkit_unix_process_new_full       (gint pid,
+-                                                    guint64 start_time);
+-
++PolkitSubject  *polkit_unix_process_new            (gint               pid);
++PolkitSubject  *polkit_unix_process_new_full       (gint               pid,
++                                                    guint64            start_time);
++PolkitSubject  *polkit_unix_process_new_for_owner  (gint               pid,
++                                                    guint64            start_time,
++                                                    gint               uid);
+ gint            polkit_unix_process_get_pid        (PolkitUnixProcess *process);
+ guint64         polkit_unix_process_get_start_time (PolkitUnixProcess *process);
++gint            polkit_unix_process_get_uid        (PolkitUnixProcess *process);
+ void            polkit_unix_process_set_pid        (PolkitUnixProcess *process,
+                                                     gint               pid);
++void            polkit_unix_process_set_uid        (PolkitUnixProcess *process,
++                                                    gint               uid);
++void            polkit_unix_process_set_start_time (PolkitUnixProcess *process,
++                                                    guint64            start_time);
++
+ gint            polkit_unix_process_get_owner      (PolkitUnixProcess  *process,
+-                                                    GError            **error);
++                                                    GError            **error) G_GNUC_DEPRECATED_FOR (polkit_unix_process_get_uid);
+ 
+ G_END_DECLS
+ 
+-- 
+1.7.4.4
+
diff --git a/source/l/polkit/CVE-2011-1485/0003-Use-polkit_unix_process_get_uid-to-get-the-owner-of-.patch b/source/l/polkit/CVE-2011-1485/0003-Use-polkit_unix_process_get_uid-to-get-the-owner-of-.patch
new file mode 100644
index 00000000..90d9352e
--- /dev/null
+++ b/source/l/polkit/CVE-2011-1485/0003-Use-polkit_unix_process_get_uid-to-get-the-owner-of-.patch
@@ -0,0 +1,41 @@
+From c23d74447c7615dc74dae259f0fc3688ec988867 Mon Sep 17 00:00:00 2001
+From: David Zeuthen <davidz@redhat.com>
+Date: Fri, 1 Apr 2011 12:12:27 -0400
+Subject: [PATCH 3/4] Use polkit_unix_process_get_uid() to get the owner of a
+ process
+
+This avoids a TOCTTOU problem.
+
+Signed-off-by: David Zeuthen <davidz@redhat.com>
+---
+ src/polkitbackend/polkitbackendsessionmonitor.c |   11 ++++++-----
+ 1 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/src/polkitbackend/polkitbackendsessionmonitor.c b/src/polkitbackend/polkitbackendsessionmonitor.c
+index 495f752..9c331b6 100644
+--- a/src/polkitbackend/polkitbackendsessionmonitor.c
++++ b/src/polkitbackend/polkitbackendsessionmonitor.c
+@@ -293,14 +293,15 @@ polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor
+ 
+   if (POLKIT_IS_UNIX_PROCESS (subject))
+     {
+-      local_error = NULL;
+-      uid = polkit_unix_process_get_owner (POLKIT_UNIX_PROCESS (subject), &local_error);
+-      if (local_error != NULL)
++      uid = polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject));
++      if ((gint) uid == -1)
+         {
+-          g_propagate_prefixed_error (error, local_error, "Error getting user for process: ");
++          g_set_error (error,
++                       POLKIT_ERROR,
++                       POLKIT_ERROR_FAILED,
++                       "Unix process subject does not have uid set");
+           goto out;
+         }
+-
+       ret = polkit_unix_user_new (uid);
+     }
+   else if (POLKIT_IS_SYSTEM_BUS_NAME (subject))
+-- 
+1.7.4.4
+
diff --git a/source/l/polkit/CVE-2011-1485/0004-pkexec-Avoid-TOCTTOU-problems-with-parent-process.patch b/source/l/polkit/CVE-2011-1485/0004-pkexec-Avoid-TOCTTOU-problems-with-parent-process.patch
new file mode 100644
index 00000000..8572f732
--- /dev/null
+++ b/source/l/polkit/CVE-2011-1485/0004-pkexec-Avoid-TOCTTOU-problems-with-parent-process.patch
@@ -0,0 +1,127 @@
+From 3b12cfac29dddd27f1f166a7574d8374cc1dccf2 Mon Sep 17 00:00:00 2001
+From: David Zeuthen <davidz@redhat.com>
+Date: Fri, 1 Apr 2011 12:13:15 -0400
+Subject: [PATCH 4/4] pkexec: Avoid TOCTTOU problems with parent process
+
+In a nutshell, the parent process may change its uid (either real- or
+effective uid) after launching pkexec. It can do this by exec()'ing
+e.g. a setuid root program.
+
+To avoid this problem, just use the uid the parent process had when it
+executed pkexec. This happens to be the same uid of the pkexec process
+itself.
+
+Additionally, remove some dubious code that allowed pkexec to continue
+when the parent process died as there is no reason to support
+something like that. Also ensure that the pkexec process is killed if
+the parent process dies.
+
+This problem was pointed out by Neel Mehta <nmehta@google.com>.
+
+Signed-off-by: David Zeuthen <davidz@redhat.com>
+---
+ src/programs/pkexec.c |   66 +++++++++++++++++++++++++++++--------------------
+ 1 files changed, 39 insertions(+), 27 deletions(-)
+
+diff --git a/src/programs/pkexec.c b/src/programs/pkexec.c
+index 9217954..3e656be 100644
+--- a/src/programs/pkexec.c
++++ b/src/programs/pkexec.c
+@@ -35,6 +35,10 @@
+ #include <pwd.h>
+ #include <errno.h>
+ 
++#ifdef __linux__
++#include <sys/prctl.h>
++#endif
++
+ #include <glib/gi18n.h>
+ 
+ #ifdef POLKIT_AUTHFW_PAM
+@@ -423,7 +427,6 @@ main (int argc, char *argv[])
+   GPtrArray *saved_env;
+   gchar *opt_user;
+   pid_t pid_of_caller;
+-  uid_t uid_of_caller;
+   gpointer local_agent_handle;
+ 
+   ret = 127;
+@@ -598,40 +601,49 @@ main (int argc, char *argv[])
+    */
+   g_type_init ();
+ 
+-  /* now check if the program that invoked us is authorized */
++  /* make sure we are nuked if the parent process dies */
++#ifdef __linux__
++  if (prctl (PR_SET_PDEATHSIG, SIGTERM) != 0)
++    {
++      g_printerr ("prctl(PR_SET_PDEATHSIG, SIGTERM) failed: %s\n", g_strerror (errno));
++      goto out;
++    }
++#else
++#warning "Please add OS specific code to catch when the parent dies"
++#endif
++
++  /* Figure out the parent process */
+   pid_of_caller = getppid ();
+   if (pid_of_caller == 1)
+     {
+       /* getppid() can return 1 if the parent died (meaning that we are reaped
+-       * by /sbin/init); get process group leader instead - for example, this
+-       * happens when launching via gnome-panel (alt+f2, then 'pkexec gedit').
++       * by /sbin/init); In that case we simpy bail.
+        */
+-      pid_of_caller = getpgrp ();
+-    }
+-
+-  subject = polkit_unix_process_new (pid_of_caller);
+-  if (subject == NULL)
+-    {
+-      g_printerr ("No such process for pid %d: %s\n", (gint) pid_of_caller, error->message);
+-      g_error_free (error);
++      g_printerr ("Refusing to render service to dead parents.\n");
+       goto out;
+     }
+ 
+-  /* paranoia: check that the uid of pid_of_caller matches getuid() */
+-  error = NULL;
+-  uid_of_caller = polkit_unix_process_get_owner (POLKIT_UNIX_PROCESS (subject),
+-                                                 &error);
+-  if (error != NULL)
+-    {
+-      g_printerr ("Error determing pid of caller (pid %d): %s\n", (gint) pid_of_caller, error->message);
+-      g_error_free (error);
+-      goto out;
+-    }
+-  if (uid_of_caller != getuid ())
+-    {
+-      g_printerr ("User of caller (%d) does not match our uid (%d)\n", uid_of_caller, getuid ());
+-      goto out;
+-    }
++  /* This process we want to check an authorization for is the process
++   * that launched us - our parent process.
++   *
++   * At the time the parent process fork()'ed and exec()'ed us, the
++   * process had the same real-uid that we have now. So we use this
++   * real-uid instead of of looking it up to avoid TOCTTOU issues
++   * (consider the parent process exec()'ing a setuid helper).
++   *
++   * On the other hand, the monotonic process start-time is guaranteed
++   * to never change so it's safe to look that up given only the PID
++   * since we are guaranteed to be nuked if the parent goes away
++   * (cf. the prctl(2) call above).
++   */
++  subject = polkit_unix_process_new_for_owner (pid_of_caller,
++                                               0, /* 0 means "look up start-time in /proc" */
++                                               getuid ());
++  /* really double-check the invariants guaranteed by the PolkitUnixProcess class */
++  g_assert (subject != NULL);
++  g_assert (polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject)) == pid_of_caller);
++  g_assert (polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject)) >= 0);
++  g_assert (polkit_unix_process_get_start_time (POLKIT_UNIX_PROCESS (subject)) > 0);
+ 
+   error = NULL;
+   authority = polkit_authority_get_sync (NULL /* GCancellable* */, &error);
+-- 
+1.7.4.4
+
diff --git a/source/l/polkit/polkit-1-shadow.diff b/source/l/polkit/polkit-1-shadow.diff
deleted file mode 100644
index 56e24277..00000000
--- a/source/l/polkit/polkit-1-shadow.diff
+++ /dev/null
@@ -1,1030 +0,0 @@
-diff --git a/src/polkitagent/Makefile.am b/src/polkitagent/Makefile.am
-index 3f38329..e114d01 100644
---- a/src/polkitagent/Makefile.am
-+++ b/src/polkitagent/Makefile.am
-@@ -68,8 +68,15 @@ libpolkit_agent_1_la_LDFLAGS = -export-symbols-regex '(^polkit_.*)'
- libexec_PROGRAMS = polkit-agent-helper-1
- 
- polkit_agent_helper_1_SOURCES = 					\
--	polkitagenthelper.c						\
--	$(NULL)
-+	polkitagenthelperprivate.c polkitagenthelperprivate.h		
-+
-+if POLKIT_AUTHFW_PAM
-+polkit_agent_helper_1_SOURCES += polkitagenthelper-pam.c
-+endif
-+if POLKIT_AUTHFW_SHADOW
-+polkit_agent_helper_1_SOURCES += polkitagenthelper-shadow.c
-+endif
-+polkit_agent_helper_1_SOURCES += $(NULL)
- 
- polkit_agent_helper_1_CFLAGS  = 					\
-         -D_POLKIT_COMPILATION                                  		\
-diff --git a/src/polkitagent/polkitagenthelper-pam.c b/src/polkitagent/polkitagenthelper-pam.c
-new file mode 100644
-index 0000000..4c6c6fb
---- /dev/null
-+++ b/src/polkitagent/polkitagenthelper-pam.c
-@@ -0,0 +1,264 @@
-+/*
-+ * Copyright (C) 2008, 2010 Red Hat, Inc.
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This 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
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General
-+ * Public License along with this library; if not, write to the
-+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-+ * Boston, MA 02111-1307, USA.
-+ *
-+ * Author: David Zeuthen <davidz@redhat.com>
-+ */
-+
-+#include "config.h"
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <syslog.h>
-+#include <security/pam_appl.h>
-+
-+#include <polkit/polkit.h>
-+#include "polkitagenthelperprivate.h"
-+
-+static int conversation_function (int n, const struct pam_message **msg, struct pam_response **resp, void *data);
-+
-+int
-+main (int argc, char *argv[])
-+{
-+  int rc;
-+  const char *user_to_auth;
-+  const char *cookie;
-+  struct pam_conv pam_conversation;
-+  pam_handle_t *pam_h;
-+  const void *authed_user;
-+
-+  rc = 0;
-+  pam_h = NULL;
-+
-+  /* clear the entire environment to avoid attacks using with libraries honoring environment variables */
-+  if (clearenv () != 0)
-+    goto error;
-+
-+  /* set a minimal environment */
-+  setenv ("PATH", "/usr/sbin:/usr/bin:/sbin:/bin", 1);
-+
-+  /* check that we are setuid root */
-+  if (geteuid () != 0)
-+    {
-+      fprintf (stderr, "polkit-agent-helper-1: needs to be setuid root\n");
-+      goto error;
-+    }
-+
-+  openlog ("polkit-agent-helper-1", LOG_CONS | LOG_PID, LOG_AUTHPRIV);
-+
-+  /* check for correct invocation */
-+  if (argc != 3)
-+    {
-+      syslog (LOG_NOTICE, "inappropriate use of helper, wrong number of arguments [uid=%d]", getuid ());
-+      fprintf (stderr, "polkit-agent-helper-1: wrong number of arguments. This incident has been logged.\n");
-+      goto error;
-+    }
-+
-+  user_to_auth = argv[1];
-+  cookie = argv[2];
-+
-+  if (getuid () != 0)
-+    {
-+      /* check we're running with a non-tty stdin */
-+      if (isatty (STDIN_FILENO) != 0)
-+        {
-+          syslog (LOG_NOTICE, "inappropriate use of helper, stdin is a tty [uid=%d]", getuid ());
-+          fprintf (stderr, "polkit-agent-helper-1: inappropriate use of helper, stdin is a tty. This incident has been logged.\n");
-+          goto error;
-+        }
-+    }
-+
-+#ifdef PAH_DEBUG
-+  fprintf (stderr, "polkit-agent-helper-1: user to auth is '%s'.\n", user_to_auth);
-+#endif /* PAH_DEBUG */
-+
-+  pam_conversation.conv        = conversation_function;
-+  pam_conversation.appdata_ptr = NULL;
-+
-+  /* start the pam stack */
-+  rc = pam_start ("polkit-1",
-+                  user_to_auth,
-+                  &pam_conversation,
-+                  &pam_h);
-+  if (rc != PAM_SUCCESS)
-+    {
-+      fprintf (stderr, "polkit-agent-helper-1: pam_start failed: %s\n", pam_strerror (pam_h, rc));
-+      goto error;
-+    }
-+
-+  /* set the requesting user */
-+  rc = pam_set_item (pam_h, PAM_RUSER, user_to_auth);
-+  if (rc != PAM_SUCCESS)
-+    {
-+      fprintf (stderr, "polkit-agent-helper-1: pam_set_item failed: %s\n", pam_strerror (pam_h, rc));
-+      goto error;
-+    }
-+
-+  /* is user really user? */
-+  rc = pam_authenticate (pam_h, 0);
-+  if (rc != PAM_SUCCESS)
-+    {
-+      fprintf (stderr, "polkit-agent-helper-1: pam_authenticated failed: %s\n", pam_strerror (pam_h, rc));
-+      goto error;
-+    }
-+
-+  /* permitted access? */
-+  rc = pam_acct_mgmt (pam_h, 0);
-+  if (rc != PAM_SUCCESS)
-+    {
-+      fprintf (stderr, "polkit-agent-helper-1: pam_acct_mgmt failed: %s\n", pam_strerror (pam_h, rc));
-+      goto error;
-+    }
-+
-+  /* did we auth the right user? */
-+  rc = pam_get_item (pam_h, PAM_USER, &authed_user);
-+  if (rc != PAM_SUCCESS)
-+    {
-+      fprintf (stderr, "polkit-agent-helper-1: pam_get_item failed: %s\n", pam_strerror (pam_h, rc));
-+      goto error;
-+    }
-+
-+  if (strcmp (authed_user, user_to_auth) != 0)
-+    {
-+      fprintf (stderr, "polkit-agent-helper-1: Tried to auth user '%s' but we got auth for user '%s' instead",
-+               user_to_auth, (const char *) authed_user);
-+      goto error;
-+    }
-+
-+#ifdef PAH_DEBUG
-+  fprintf (stderr, "polkit-agent-helper-1: successfully authenticated user '%s'.\n", user_to_auth);
-+#endif /* PAH_DEBUG */
-+
-+  pam_end (pam_h, rc);
-+  pam_h = NULL;
-+
-+#ifdef PAH_DEBUG
-+  fprintf (stderr, "polkit-agent-helper-1: sending D-Bus message to PolicyKit daemon\n");
-+#endif /* PAH_DEBUG */
-+
-+  /* now send a D-Bus message to the PolicyKit daemon that
-+   * includes a) the cookie; and b) the user we authenticated
-+   */
-+  if (!send_dbus_message (cookie, user_to_auth))
-+    {
-+#ifdef PAH_DEBUG
-+      fprintf (stderr, "polkit-agent-helper-1: error sending D-Bus message to PolicyKit daemon\n");
-+#endif /* PAH_DEBUG */
-+      goto error;
-+    }
-+
-+#ifdef PAH_DEBUG
-+  fprintf (stderr, "polkit-agent-helper-1: successfully sent D-Bus message to PolicyKit daemon\n");
-+#endif /* PAH_DEBUG */
-+
-+  fprintf (stdout, "SUCCESS\n");
-+  flush_and_wait();
-+  return 0;
-+
-+error:
-+  if (pam_h != NULL)
-+    pam_end (pam_h, rc);
-+
-+  fprintf (stdout, "FAILURE\n");
-+  flush_and_wait();
-+  return 1;
-+}
-+
-+static int
-+conversation_function (int n, const struct pam_message **msg, struct pam_response **resp, void *data)
-+{
-+  struct pam_response *aresp;
-+  char buf[PAM_MAX_RESP_SIZE];
-+  int i;
-+
-+  data = data;
-+  if (n <= 0 || n > PAM_MAX_NUM_MSG)
-+    return PAM_CONV_ERR;
-+
-+  if ((aresp = calloc(n, sizeof *aresp)) == NULL)
-+    return PAM_BUF_ERR;
-+
-+  for (i = 0; i < n; ++i)
-+    {
-+      aresp[i].resp_retcode = 0;
-+      aresp[i].resp = NULL;
-+      switch (msg[i]->msg_style)
-+        {
-+
-+        case PAM_PROMPT_ECHO_OFF:
-+          fprintf (stdout, "PAM_PROMPT_ECHO_OFF ");
-+          goto conv1;
-+
-+        case PAM_PROMPT_ECHO_ON:
-+          fprintf (stdout, "PAM_PROMPT_ECHO_ON ");
-+        conv1:
-+          fputs (msg[i]->msg, stdout);
-+          if (strlen (msg[i]->msg) > 0 && msg[i]->msg[strlen (msg[i]->msg) - 1] != '\n')
-+            fputc ('\n', stdout);
-+          fflush (stdout);
-+
-+          if (fgets (buf, sizeof buf, stdin) == NULL)
-+            goto error;
-+
-+          if (strlen (buf) > 0 &&
-+              buf[strlen (buf) - 1] == '\n')
-+            buf[strlen (buf) - 1] = '\0';
-+
-+          aresp[i].resp = strdup (buf);
-+          if (aresp[i].resp == NULL)
-+            goto error;
-+          break;
-+
-+        case PAM_ERROR_MSG:
-+          fprintf (stdout, "PAM_ERROR_MSG ");
-+          goto conv2;
-+
-+        case PAM_TEXT_INFO:
-+          fprintf (stdout, "PAM_TEXT_INFO ");
-+        conv2:
-+          fputs (msg[i]->msg, stdout);
-+          if (strlen (msg[i]->msg) > 0 &&
-+              msg[i]->msg[strlen (msg[i]->msg) - 1] != '\n')
-+            fputc ('\n', stdout);
-+          fflush (stdout);
-+          break;
-+
-+        default:
-+          goto error;
-+        }
-+    }
-+
-+  *resp = aresp;
-+  return PAM_SUCCESS;
-+
-+error:
-+
-+  for (i = 0; i < n; ++i)
-+    {
-+      if (aresp[i].resp != NULL) {
-+        memset (aresp[i].resp, 0, strlen(aresp[i].resp));
-+        free (aresp[i].resp);
-+      }
-+    }
-+  memset (aresp, 0, n * sizeof *aresp);
-+  *resp = NULL;
-+  return PAM_CONV_ERR;
-+}
-+
-diff --git a/src/polkitagent/polkitagenthelper-shadow.c b/src/polkitagent/polkitagenthelper-shadow.c
-new file mode 100644
-index 0000000..7435533
---- /dev/null
-+++ b/src/polkitagent/polkitagenthelper-shadow.c
-@@ -0,0 +1,189 @@
-+/*
-+ * Copyright (C) 2008 Red Hat, Inc.
-+ * Copyright (C) 2009-2010 Andrew Psaltis <ampsaltis@gmail.com>
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This 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
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General
-+ * Public License along with this library; if not, write to the
-+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-+ * Boston, MA 02111-1307, USA.
-+ *
-+ * Authors: Andrew Psaltis <ampsaltis@gmail.com>, based on
-+ *            polkitagenthelper.c which was written by
-+ *          David Zeuthen <davidz@redhat.com>
-+ */
-+
-+#include "config.h"
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <syslog.h>
-+#include <shadow.h>
-+#include <grp.h>
-+#include <pwd.h>
-+#include <time.h>
-+
-+#include <polkit/polkit.h>
-+#include "polkitagenthelperprivate.h"
-+
-+
-+extern char *crypt ();
-+static int shadow_authenticate (struct spwd *shadow);
-+
-+int
-+main (int argc, char *argv[])
-+{
-+  struct spwd *shadow;
-+  const char *user_to_auth;
-+  const char *cookie;
-+  time_t tm;
-+
-+  /* clear the entire environment to avoid attacks with
-+     libraries honoring environment variables */
-+  if (clearenv () != 0)
-+    goto error;
-+
-+  /* set a minimal environment */
-+  setenv ("PATH", "/usr/sbin:/usr/bin:/sbin:/bin", 1);
-+
-+  /* check that we are setuid root */
-+  if (geteuid () != 0)
-+    {
-+      fprintf (stderr, "polkit-agent-helper-1: needs to be setuid root\n");
-+      goto error;
-+    }
-+
-+  openlog ("polkit-agent-helper-1", LOG_CONS | LOG_PID, LOG_AUTHPRIV);
-+
-+  /* check for correct invocation */
-+  if (argc != 3)
-+    {
-+      syslog (LOG_NOTICE, "inappropriate use of helper, wrong number of arguments [uid=%d]", getuid ());
-+      fprintf (stderr, "polkit-agent-helper-1: wrong number of arguments. This incident has been logged.\n");
-+      goto error;
-+    }
-+
-+  if (getuid () != 0)
-+    {
-+    /* check we're running with a non-tty stdin */
-+    if (isatty (STDIN_FILENO) != 0)
-+      {
-+        syslog (LOG_NOTICE, "inappropriate use of helper, stdin is a tty [uid=%d]", getuid ());
-+        fprintf (stderr, "polkit-agent-helper-1: inappropriate use of helper, stdin is a tty. This incident has been logged.\n");
-+        goto error;
-+      }
-+    }
-+
-+  user_to_auth = argv[1];
-+  cookie = argv[2];
-+
-+#ifdef PAH_DEBUG
-+  fprintf (stderr, "polkit-agent-helper-1: user to auth is '%s'.\n", user_to_auth);
-+#endif /* PAH_DEBUG */
-+
-+  /* Ask shadow about the user requesting authentication */
-+  if ((shadow = getspnam (user_to_auth)) == NULL)
-+    {
-+      syslog (LOG_NOTICE, "shadow file data information request for user %s [uid=%d] failed", user_to_auth, getuid());
-+      fprintf(stderr, "polkit-agent-helper-1: could not get shadow information for%.100s", user_to_auth);
-+      goto error;
-+    }
-+  
-+  /* Check the user's identity */
-+  if(!shadow_authenticate (shadow))
-+    {
-+      syslog (LOG_NOTICE, "authentication failure [uid=%d] trying to authenticate '%s'", getuid (), user_to_auth);
-+      fprintf (stderr, "polkit-agent-helper-1: authentication failure. This incident has been logged.\n");
-+      goto error;
-+    }
-+
-+  /* Check whether the user's password has expired */
-+  time(&tm);
-+  if( shadow->sp_max >= 0 && (shadow->sp_lstchg + shadow->sp_max) * 60 * 60 * 24 <= tm)
-+    {
-+      syslog (LOG_NOTICE, "password expired for user '%s' [uid=%d] trying to authenticate", user_to_auth, getuid () );
-+      fprintf (stderr, "polkit-agent-helper-1: authorization failure. This incident has been logged.\n");
-+      goto error;
-+    }
-+
-+  /* Check whether the user's password has aged (and account expired along
-+   * with it)
-+   */
-+  if( shadow->sp_inact >= 0 && (shadow->sp_lstchg + shadow->sp_max + shadow->sp_inact) * 60 * 60 * 24           <= tm) 
-+    {
-+      syslog (LOG_NOTICE, "password aged for user '%s' [uid=%d] trying to authenticate", user_to_auth, getuid () );
-+      fprintf (stderr, "polkit-agent-helper-1: authorization failure. This incident has been logged.\n");
-+      goto error;
-+    }
-+
-+  /* Check whether the user's account has expired */
-+  if(shadow->sp_expire >= 0 && shadow->sp_expire * 60 * 60 * 24 <= tm) 
-+    {
-+      syslog (LOG_NOTICE, "account expired for user '%s' [uid=%d] trying to authenticate", user_to_auth, getuid () );
-+      fprintf (stderr, "polkit-agent-helper-1: authorization failure. This incident has been logged.\n");
-+      goto error;
-+    }
-+
-+#ifdef PAH_DEBUG
-+  fprintf (stderr, "polkit-agent-helper-1: sending D-Bus message to PolicyKit daemon\n");
-+#endif /* PAH_DEBUG */
-+
-+  /* now send a D-Bus message to the PolicyKit daemon that
-+   * includes a) the cookie; and b) the user we authenticated
-+   */
-+  if (!send_dbus_message (cookie, user_to_auth))
-+    {
-+#ifdef PAH_DEBUG
-+      fprintf (stderr, "polkit-agent-helper-1: error sending D-Bus message to PolicyKit daemon\n");
-+#endif /* PAH_DEBUG */
-+      goto error;
-+    }
-+
-+#ifdef PAH_DEBUG
-+  fprintf (stderr, "polkit-agent-helper-1: successfully sent D-Bus message to PolicyKit daemon\n");
-+#endif /* PAH_DEBUG */
-+
-+  fprintf (stdout, "SUCCESS\n");
-+  flush_and_wait();
-+  return 0;
-+
-+error:
-+  fprintf (stdout, "FAILURE\n");
-+  flush_and_wait();
-+  return 1;
-+}
-+
-+static int
-+shadow_authenticate(struct spwd *shadow)
-+{
-+  /* Speak PAM to the daemon, thanks to David Zeuthen for the idea. */
-+  char passwd[512];
-+  fprintf(stdout, "PAM_PROMPT_ECHO_OFF password:\n");
-+  fflush(stdout);
-+  usleep (10 * 1000); /* since fflush(3) seems buggy */
-+
-+  if (fgets (passwd, sizeof (passwd), stdin) == NULL)
-+    goto error;
-+
-+  if (strlen (passwd) > 0 && passwd[strlen (passwd) - 1] == '\n')
-+    passwd[strlen (passwd) - 1] = '\0';
-+  
-+  if (strcmp (shadow->sp_pwdp, crypt (passwd, shadow->sp_pwdp)) != 0)
-+    goto error;
-+  return 1;
-+error:
-+  return 0;
-+}
-+
-diff --git a/src/polkitagent/polkitagenthelper.c b/src/polkitagent/polkitagenthelper.c
-deleted file mode 100644
-index cca86db..0000000
---- a/src/polkitagent/polkitagenthelper.c
-+++ /dev/null
-@@ -1,339 +0,0 @@
--/*
-- * Copyright (C) 2008 Red Hat, Inc.
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This 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
-- * Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General
-- * Public License along with this library; if not, write to the
-- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-- * Boston, MA 02111-1307, USA.
-- *
-- * Author: David Zeuthen <davidz@redhat.com>
-- */
--
--#include "config.h"
--#include <stdio.h>
--#include <stdlib.h>
--#include <string.h>
--#include <unistd.h>
--#include <sys/types.h>
--#include <sys/stat.h>
--#include <syslog.h>
--#include <security/pam_appl.h>
--
--#include <polkit/polkit.h>
--
--#ifdef HAVE_SOLARIS
--#  define LOG_AUTHPRIV    (10<<3)
--#endif
--
--#ifndef HAVE_CLEARENV
--extern char **environ;
--
--static int
--clearenv (void)
--{
--	if (environ != NULL)
--		environ[0] = NULL;
--	return 0;
--}
--#endif
--
--/* Development aid: define PAH_DEBUG to get debugging output. Do _NOT_
-- * enable this in production builds; it may leak passwords and other
-- * sensitive information.
-- */
--#undef PAH_DEBUG
--// #define PAH_DEBUG
--
--static gboolean send_dbus_message (const char *cookie, const char *user);
--
--static int conversation_function (int n, const struct pam_message **msg, struct pam_response **resp, void *data);
--
--int
--main (int argc, char *argv[])
--{
--  int rc;
--  const char *user_to_auth;
--  const char *cookie;
--  struct pam_conv pam_conversation;
--  pam_handle_t *pam_h;
--  const void *authed_user;
--
--  rc = 0;
--  pam_h = NULL;
--
--  /* clear the entire environment to avoid attacks using with libraries honoring environment variables */
--  if (clearenv () != 0)
--    goto error;
--
--  /* set a minimal environment */
--  setenv ("PATH", "/usr/sbin:/usr/bin:/sbin:/bin", 1);
--
--  /* check that we are setuid root */
--  if (geteuid () != 0)
--    {
--      fprintf (stderr, "polkit-agent-helper-1: needs to be setuid root\n");
--      goto error;
--    }
--
--  openlog ("polkit-agent-helper-1", LOG_CONS | LOG_PID, LOG_AUTHPRIV);
--
--  /* check for correct invocation */
--  if (argc != 3)
--    {
--      syslog (LOG_NOTICE, "inappropriate use of helper, wrong number of arguments [uid=%d]", getuid ());
--      fprintf (stderr, "polkit-agent-helper-1: wrong number of arguments. This incident has been logged.\n");
--      goto error;
--    }
--
--  user_to_auth = argv[1];
--  cookie = argv[2];
--
--  if (getuid () != 0)
--    {
--      /* check we're running with a non-tty stdin */
--      if (isatty (STDIN_FILENO) != 0)
--        {
--          syslog (LOG_NOTICE, "inappropriate use of helper, stdin is a tty [uid=%d]", getuid ());
--          fprintf (stderr, "polkit-agent-helper-1: inappropriate use of helper, stdin is a tty. This incident has been logged.\n");
--          goto error;
--        }
--    }
--
--#ifdef PAH_DEBUG
--  fprintf (stderr, "polkit-agent-helper-1: user to auth is '%s'.\n", user_to_auth);
--#endif /* PAH_DEBUG */
--
--  pam_conversation.conv        = conversation_function;
--  pam_conversation.appdata_ptr = NULL;
--
--  /* start the pam stack */
--  rc = pam_start ("polkit-1",
--                  user_to_auth,
--                  &pam_conversation,
--                  &pam_h);
--  if (rc != PAM_SUCCESS)
--    {
--      fprintf (stderr, "polkit-agent-helper-1: pam_start failed: %s\n", pam_strerror (pam_h, rc));
--      goto error;
--    }
--
--  /* set the requesting user */
--  rc = pam_set_item (pam_h, PAM_RUSER, user_to_auth);
--  if (rc != PAM_SUCCESS)
--    {
--      fprintf (stderr, "polkit-agent-helper-1: pam_set_item failed: %s\n", pam_strerror (pam_h, rc));
--      goto error;
--    }
--
--  /* is user really user? */
--  rc = pam_authenticate (pam_h, 0);
--  if (rc != PAM_SUCCESS)
--    {
--      fprintf (stderr, "polkit-agent-helper-1: pam_authenticated failed: %s\n", pam_strerror (pam_h, rc));
--      goto error;
--    }
--
--  /* permitted access? */
--  rc = pam_acct_mgmt (pam_h, 0);
--  if (rc != PAM_SUCCESS)
--    {
--      fprintf (stderr, "polkit-agent-helper-1: pam_acct_mgmt failed: %s\n", pam_strerror (pam_h, rc));
--      goto error;
--    }
--
--  /* did we auth the right user? */
--  rc = pam_get_item (pam_h, PAM_USER, &authed_user);
--  if (rc != PAM_SUCCESS)
--    {
--      fprintf (stderr, "polkit-agent-helper-1: pam_get_item failed: %s\n", pam_strerror (pam_h, rc));
--      goto error;
--    }
--
--  if (strcmp (authed_user, user_to_auth) != 0)
--    {
--      fprintf (stderr, "polkit-agent-helper-1: Tried to auth user '%s' but we got auth for user '%s' instead",
--               user_to_auth, (const char *) authed_user);
--      goto error;
--    }
--
--#ifdef PAH_DEBUG
--  fprintf (stderr, "polkit-agent-helper-1: successfully authenticated user '%s'.\n", user_to_auth);
--#endif /* PAH_DEBUG */
--
--  pam_end (pam_h, rc);
--  pam_h = NULL;
--
--#ifdef PAH_DEBUG
--  fprintf (stderr, "polkit-agent-helper-1: sending D-Bus message to PolicyKit daemon\n");
--#endif /* PAH_DEBUG */
--
--  /* now send a D-Bus message to the PolicyKit daemon that
--   * includes a) the cookie; and b) the user we authenticated
--   */
--  if (!send_dbus_message (cookie, user_to_auth))
--    {
--#ifdef PAH_DEBUG
--      fprintf (stderr, "polkit-agent-helper-1: error sending D-Bus message to PolicyKit daemon\n");
--#endif /* PAH_DEBUG */
--      goto error;
--    }
--
--#ifdef PAH_DEBUG
--  fprintf (stderr, "polkit-agent-helper-1: successfully sent D-Bus message to PolicyKit daemon\n");
--#endif /* PAH_DEBUG */
--
--  fprintf (stdout, "SUCCESS\n");
--  fflush (stdout);
--  fflush (stderr);
--  usleep (10 * 1000); /* since fflush(3) seems buggy */
--  return 0;
--
--error:
--  if (pam_h != NULL)
--    pam_end (pam_h, rc);
--
--  fprintf (stdout, "FAILURE\n");
--  fflush (stdout);
--  fflush (stderr);
--  usleep (10 * 1000); /* since fflush(3) seems buggy */
--  return 1;
--}
--
--static int
--conversation_function (int n, const struct pam_message **msg, struct pam_response **resp, void *data)
--{
--  struct pam_response *aresp;
--  char buf[PAM_MAX_RESP_SIZE];
--  int i;
--
--  data = data;
--  if (n <= 0 || n > PAM_MAX_NUM_MSG)
--    return PAM_CONV_ERR;
--
--  if ((aresp = calloc(n, sizeof *aresp)) == NULL)
--    return PAM_BUF_ERR;
--
--  for (i = 0; i < n; ++i)
--    {
--      aresp[i].resp_retcode = 0;
--      aresp[i].resp = NULL;
--      switch (msg[i]->msg_style)
--        {
--
--        case PAM_PROMPT_ECHO_OFF:
--          fprintf (stdout, "PAM_PROMPT_ECHO_OFF ");
--          goto conv1;
--
--        case PAM_PROMPT_ECHO_ON:
--          fprintf (stdout, "PAM_PROMPT_ECHO_ON ");
--        conv1:
--          fputs (msg[i]->msg, stdout);
--          if (strlen (msg[i]->msg) > 0 && msg[i]->msg[strlen (msg[i]->msg) - 1] != '\n')
--            fputc ('\n', stdout);
--          fflush (stdout);
--
--          if (fgets (buf, sizeof buf, stdin) == NULL)
--            goto error;
--
--          if (strlen (buf) > 0 &&
--              buf[strlen (buf) - 1] == '\n')
--            buf[strlen (buf) - 1] = '\0';
--
--          aresp[i].resp = strdup (buf);
--          if (aresp[i].resp == NULL)
--            goto error;
--          break;
--
--        case PAM_ERROR_MSG:
--          fprintf (stdout, "PAM_ERROR_MSG ");
--          goto conv2;
--
--        case PAM_TEXT_INFO:
--          fprintf (stdout, "PAM_TEXT_INFO ");
--        conv2:
--          fputs (msg[i]->msg, stdout);
--          if (strlen (msg[i]->msg) > 0 &&
--              msg[i]->msg[strlen (msg[i]->msg) - 1] != '\n')
--            fputc ('\n', stdout);
--          fflush (stdout);
--          break;
--
--        default:
--          goto error;
--        }
--    }
--
--  *resp = aresp;
--  return PAM_SUCCESS;
--
--error:
--
--  for (i = 0; i < n; ++i)
--    {
--      if (aresp[i].resp != NULL) {
--        memset (aresp[i].resp, 0, strlen(aresp[i].resp));
--        free (aresp[i].resp);
--      }
--    }
--  memset (aresp, 0, n * sizeof *aresp);
--  *resp = NULL;
--  return PAM_CONV_ERR;
--}
--
--static gboolean
--send_dbus_message (const char *cookie, const char *user)
--{
--  PolkitAuthority *authority;
--  PolkitIdentity *identity;
--  GError *error;
--  gboolean ret;
--
--  ret = FALSE;
--
--  error = NULL;
--
--  g_type_init ();
--
--  authority = polkit_authority_get ();
--
--  identity = polkit_unix_user_new_for_name (user, &error);
--  if (identity == NULL)
--    {
--      g_printerr ("Error constructing identity: %s\n", error->message);
--      g_error_free (error);
--      goto out;
--    }
--
--  if (!polkit_authority_authentication_agent_response_sync (authority,
--                                                            cookie,
--                                                            identity,
--                                                            NULL,
--                                                            &error))
--    {
--      g_printerr ("polkit-agent-helper-1: error response to PolicyKit daemon: %s\n", error->message);
--      g_error_free (error);
--      goto out;
--    }
--
--  ret = TRUE;
--
-- out:
--
--  if (identity != NULL)
--    g_object_unref (identity);
--
--  if (authority != NULL)
--    g_object_unref (authority);
--
--  return ret;
--}
-diff --git a/src/polkitagent/polkitagenthelperprivate.c b/src/polkitagent/polkitagenthelperprivate.c
-new file mode 100644
-index 0000000..abf5524
---- /dev/null
-+++ b/src/polkitagent/polkitagenthelperprivate.c
-@@ -0,0 +1,97 @@
-+/*
-+ * Copyright (C) 2009-2010 Red Hat, Inc.
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This 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
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General
-+ * Public License along with this library; if not, write to the
-+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+ * Boston, MA 02110-1301, USA.
-+ *
-+ * Authors: David Zeuthen <davidz@redhat.com>,
-+ *          Andrew Psaltis <ampsaltis@gmail.com>
-+ */
-+
-+#include "polkitagenthelperprivate.h"
-+#include <stdio.h>
-+
-+#ifndef HAVE_CLEARENV
-+extern char **environ;
-+
-+static int
-+clearenv (void)
-+{
-+	if (environ != NULL)
-+		environ[0] = NULL;
-+	return 0;
-+}
-+#endif
-+
-+
-+gboolean
-+send_dbus_message (const char *cookie, const char *user)
-+{
-+  PolkitAuthority *authority;
-+  PolkitIdentity *identity;
-+  GError *error;
-+  gboolean ret;
-+
-+  ret = FALSE;
-+
-+  error = NULL;
-+
-+  g_type_init ();
-+
-+  authority = polkit_authority_get ();
-+
-+  identity = polkit_unix_user_new_for_name (user, &error);
-+  if (identity == NULL)
-+    {
-+      g_printerr ("Error constructing identity: %s\n", error->message);
-+      g_error_free (error);
-+      goto out;
-+    }
-+
-+  if (!polkit_authority_authentication_agent_response_sync (authority,
-+                                                            cookie,
-+                                                            identity,
-+                                                            NULL,
-+                                                            &error))
-+    {
-+      g_printerr ("polkit-agent-helper-1: error response to PolicyKit daemon: %s\n", error->message);
-+      g_error_free (error);
-+      goto out;
-+    }
-+
-+  ret = TRUE;
-+
-+ out:
-+
-+  if (identity != NULL)
-+    g_object_unref (identity);
-+
-+  if (authority != NULL)
-+    g_object_unref (authority);
-+
-+  return ret;
-+}
-+
-+/* fflush(3) stdin and stdout and wait a little bit.
-+ * This replaces the three-line commands at the bottom of
-+ * polkit-agent-helper-1's main() function.
-+ */
-+void
-+flush_and_wait ()
-+{
-+  fflush (stdout);
-+  fflush (stderr);
-+  usleep (10 * 1000); /* since fflush(3) seems buggy */
-+}
-diff --git a/src/polkitagent/polkitagenthelperprivate.h b/src/polkitagent/polkitagenthelperprivate.h
-new file mode 100644
-index 0000000..16f7ba4
---- /dev/null
-+++ b/src/polkitagent/polkitagenthelperprivate.h
-@@ -0,0 +1,42 @@
-+/*
-+ * Copyright (C) 2009-2010 Red Hat, Inc.
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This 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
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General
-+ * Public License along with this library; if not, write to the
-+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+ * Boston, MA 02110-1301, USA.
-+ *
-+ * Authors: David Zeuthen <davidz@redhat.com>,
-+ *          Andrew Psaltis <ampsalits@gmail.com>
-+ */
-+#ifndef __POLKIT_AGENT_HELPER_PRIVATE_H
-+#define __POLKIT_AGENT_HELPER_PRIVATE_H
-+
-+#include <polkit/polkit.h>
-+ 
-+/* Development aid: define PAH_DEBUG to get debugging output. Do _NOT_
-+ * enable this in production builds; it may leak passwords and other
-+ * sensitive information.
-+ */
-+#undef PAH_DEBUG
-+// #define PAH_DEBUG
-+
-+#ifdef HAVE_SOLARIS
-+#  define LOG_AUTHPRIV    (10<<3)
-+#endif
-+
-+gboolean send_dbus_message (const char *cookie, const char *user);
-+
-+void flush_and_wait ();
-+
-+#endif /* __POLKIT_AGENT_HELPER_PRIVATE_H */
-diff --git a/src/programs/pkexec.c b/src/programs/pkexec.c
-index 17c191e..3e096bf 100644
---- a/src/programs/pkexec.c
-+++ b/src/programs/pkexec.c
-@@ -34,7 +34,11 @@
- #include <grp.h>
- #include <pwd.h>
- #include <errno.h>
-+
-+#ifdef POLKIT_AUTHFW_PAM
- #include <security/pam_appl.h>
-+#endif /* POLKIT_AUTHFW_PAM */
-+
- #include <syslog.h>
- #include <stdarg.h>
- 
-@@ -115,6 +119,7 @@ log_message (gint     level,
- 
- /* ---------------------------------------------------------------------------------------------------- */
- 
-+#ifdef POLKIT_AUTHFW_PAM
- static int
- pam_conversation_function (int n,
-                            const struct pam_message **msg,
-@@ -167,6 +172,7 @@ out:
-     pam_end (pam_h, rc);
-   return ret;
- }
-+#endif /* POLKIT_AUTHFW_PAM */
- 
- /* ---------------------------------------------------------------------------------------------------- */
- 
-@@ -741,11 +747,13 @@ main (int argc, char *argv[])
-    * TODO: The question here is whether we should clear the limits before applying them?
-    * As evident above, neither su(1) (and, for that matter, nor sudo(8)) does this.
-    */
-+#ifdef POLKIT_AUTHW_PAM
-   if (!open_session (pw->pw_name))
-     {
-       goto out;
-     }
--
-+#endif /* POLKIT_AUTHFW_PAM */
-+  
-   /* become the user */
-   if (setgroups (0, NULL) != 0)
-     {
diff --git a/source/l/polkit/polkit.SlackBuild b/source/l/polkit/polkit.SlackBuild
index 74193f13..7aa40f5d 100755
--- a/source/l/polkit/polkit.SlackBuild
+++ b/source/l/polkit/polkit.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# Copyright 2009  Robby Workman, Northport, Alabama, USA
+# Copyright 2009, 2011  Robby Workman, Northport, Alabama, USA
 # Copyright 2010  Eric Hameleers, Eindhoven, NL
-# Copyright 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 
 # Redistribution and use of this script, with or without modification, is
@@ -24,9 +24,8 @@
 
 
 PKGNAM=polkit
-VERSION=${VERSION:-1_14bdfd8}
-BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:--j6}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -38,6 +37,8 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+NUMJOBS=${NUMJOBS:--j6}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
@@ -60,12 +61,9 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
 cd $PKGNAM-$VERSION || exit 1
 
-# Apply the patch that makes --with-authfw=shadow work
-cat $CWD/polkit-1-shadow.diff | patch -p1 --verbose || exit 1
-
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
 find . \
@@ -74,27 +72,29 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Configure:
-# Using polkit-user=hald for now for easier transition; I don't think the
-# separate user account is actually required any more, but I could be wrong
+# https://bugzilla.redhat.com/show_bug.cgi?id=692922
+patch -p1 < $CWD/CVE-2011-1485/0001-PolkitUnixProcess-Clarify-that-the-real-uid-is-retur.patch || exit 1
+patch -p1 < $CWD/CVE-2011-1485/0002-Make-PolkitUnixProcess-also-record-the-uid-of-the-pr.patch || exit 1
+patch -p1 < $CWD/CVE-2011-1485/0003-Use-polkit_unix_process_get_uid-to-get-the-owner-of-.patch || exit 1
+patch -p1 < $CWD/CVE-2011-1485/0004-pkexec-Avoid-TOCTTOU-problems-with-parent-process.patch || exit 1
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./autogen.sh \
+./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --enable-gtk-doc \
   --docdir=/usr/doc/$PKGNAM-$VERSION \
   --enable-man-pages \
+  --enable-gtk-doc \
   --mandir=/usr/man \
   --disable-static \
   --disable-introspection \
   --with-authfw=shadow \
   --enable-verbose-mode \
+  --with-os-type=Slackware \
   --build=$ARCH-slackware-linux
-  # Deprecated:
-  #--with-polkit-user=hald \
 
 #NOTE: The directory /etc/polkit-1/localauthority must be owned
 #      by root and have mode 700
diff --git a/source/l/poppler-data/poppler-data.SlackBuild b/source/l/poppler-data/poppler-data.SlackBuild
index aa07f24d..1c77ed9b 100755
--- a/source/l/poppler-data/poppler-data.SlackBuild
+++ b/source/l/poppler-data/poppler-data.SlackBuild
@@ -23,22 +23,20 @@
 
 PKGNAM=poppler-data
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-ARCH=${ARCH:-noarch}
+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 ${PKGNAM}-${VERSION}
 tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || 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 \) \
diff --git a/source/l/pycairo/pycairo.SlackBuild b/source/l/pycairo/pycairo.SlackBuild
index 2ca6a2f2..1d072b74 100755
--- a/source/l/pycairo/pycairo.SlackBuild
+++ b/source/l/pycairo/pycairo.SlackBuild
@@ -25,7 +25,8 @@
 
 
 PKGNAM=pycairo
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+SRCNAM=py2cairo
+VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -66,7 +67,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1
 cd $PKGNAM-$VERSION
 chown -R root:root .
 find . \
diff --git a/source/l/pycairo/slack-desc b/source/l/pycairo/slack-desc
index 96622684..e6b4d76c 100644
--- a/source/l/pycairo/slack-desc
+++ b/source/l/pycairo/slack-desc
@@ -5,7 +5,7 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-       |-----handy-ruler------------------------------------------------------|
+        |-----handy-ruler------------------------------------------------------|
 pycairo: pycairo (a set of Python bindings for the cairo graphics library)
 pycairo:
 pycairo: Pycairo is set of Python bindings for the cairo graphics library.
diff --git a/source/l/pygobject/pygobject.SlackBuild b/source/l/pygobject/pygobject.SlackBuild
index a54d2bd3..064ca3c1 100755
--- a/source/l/pygobject/pygobject.SlackBuild
+++ b/source/l/pygobject/pygobject.SlackBuild
@@ -72,12 +72,15 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
+zcat $CWD/pygobject.fix.no.introspection.crash.diff.gz | patch -p1 --verbose || exit 1
+
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
+  --disable-introspection \
   --build=$ARCH-slackware-linux \
   || exit 1
 
@@ -89,7 +92,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  INSTALL AUTHORS COPYING NEWS README \
+  INSTALL AUTHORS COPYING* NEWS README* \
     $PKG/usr/doc/$PKGNAM-$VERSION
 ( cd $PKG/usr/doc/$PKGNAM-$VERSION 
   ln -s ../../share/gtk-doc/html/pygobject html 
diff --git a/source/l/pygobject/pygobject.fix.no.introspection.crash.diff b/source/l/pygobject/pygobject.fix.no.introspection.crash.diff
new file mode 100644
index 00000000..df59b482
--- /dev/null
+++ b/source/l/pygobject/pygobject.fix.no.introspection.crash.diff
@@ -0,0 +1,22 @@
+From 97774cb149c5b03d5ef82a5af3f19e2ce4d79d0b Mon Sep 17 00:00:00 2001
+From: John (J5) Palmieri <johnp@redhat.com>
+Date: Mon, 04 Oct 2010 16:43:31 +0000
+Subject: return NULL instead of -1 which fixes crash when introspection is turned off
+
+* see https://bugzilla.gnome.org/show_bug.cgi?id=631158
+---
+diff --git a/gi/pygi.h b/gi/pygi.h
+index 551bb6f..da71d28 100644
+--- a/gi/pygi.h
++++ b/gi/pygi.h
+@@ -155,7 +155,7 @@ static inline PyObject *
+ pygi_get_property_value (PyGObject *instance,
+                          const gchar *attr_name)
+ {
+-    return -1;
++    return NULL;
+ }
+ 
+ static inline gint
+--
+cgit v0.8.3.1
diff --git a/source/l/pyrex/pyrex.SlackBuild b/source/l/pyrex/pyrex.SlackBuild
index fbd979fe..42b9f7cc 100755
--- a/source/l/pyrex/pyrex.SlackBuild
+++ b/source/l/pyrex/pyrex.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2007 David Somero <dsomero@hotmail.com>
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,19 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=0.9.8.5
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-2}
+PKGNAM=Pyrex
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 if [ "${ARCH}" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -38,6 +48,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
@@ -49,7 +62,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf Pyrex-$VERSION
-tar xvf $CWD/Pyrex-$VERSION.tar.*z* || exit 1
+tar xvf $CWD/Pyrex-$VERSION.tar.?z* || exit 1
 cd Pyrex-$VERSION
 chown -R root:root .
 find . \
@@ -68,6 +81,14 @@ cp -a \
   README* INSTALL* USAGE* ToDo* \
   $PKG/usr/doc/Pyrex-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r CHANGES.txt ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat CHANGES.txt | head -n 1000 > $DOCSDIR/CHANGES.txt
+  touch -r CHANGES.txt $DOCSDIR/CHANGES.txt
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source/l/qca-cyrus-sasl/qca-cyrus-sasl.SlackBuild b/source/l/qca-cyrus-sasl/qca-cyrus-sasl.SlackBuild
index 5e9d04b9..55753c2c 100755
--- a/source/l/qca-cyrus-sasl/qca-cyrus-sasl.SlackBuild
+++ b/source/l/qca-cyrus-sasl/qca-cyrus-sasl.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,9 +26,18 @@
 
 PKGNAM=qca-cyrus-sasl
 VERSION=2.0.0_beta3
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-${PKGNAM}
@@ -42,6 +51,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG
@@ -70,7 +82,7 @@ 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/$PKGNAM-$(echo $VERSION | tr - _)
-cp -a COPYING README $PKG/usr/doc/$PKGNAM-$(echo $VERSION | tr - _)
+cp -a COPYING* README* $PKG/usr/doc/$PKGNAM-$(echo $VERSION | tr - _)
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/l/qca-gnupg/qca-gnupg.SlackBuild b/source/l/qca-gnupg/qca-gnupg.SlackBuild
index 7e07cefa..a8bb09ee 100755
--- a/source/l/qca-gnupg/qca-gnupg.SlackBuild
+++ b/source/l/qca-gnupg/qca-gnupg.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,9 +26,18 @@
 
 PKGNAM=qca-gnupg
 VERSION=2.0.0_beta3
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-${PKGNAM}
@@ -42,6 +51,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG
diff --git a/source/l/qca-ossl/qca-ossl.SlackBuild b/source/l/qca-ossl/qca-ossl.SlackBuild
index 717b397b..33bba969 100755
--- a/source/l/qca-ossl/qca-ossl.SlackBuild
+++ b/source/l/qca-ossl/qca-ossl.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,9 +26,18 @@
 
 PKGNAM=qca-ossl
 VERSION=2.0.0_beta3
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-${PKGNAM}
@@ -42,6 +51,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX=""
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG
diff --git a/source/l/qimageblitz/qimageblitz.SlackBuild b/source/l/qimageblitz/qimageblitz.SlackBuild
index 9576c3d7..29abf6d6 100755
--- a/source/l/qimageblitz/qimageblitz.SlackBuild
+++ b/source/l/qimageblitz/qimageblitz.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2007-2008 Robby Workman, Northport, Alabama, USA
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 
 # Redistribution and use of this script, with or without modification, is
@@ -22,8 +22,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=r948358
-ARCH=${ARCH:-x86_64}
+VERSION=0.0.6
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:--j6}
 
@@ -31,15 +30,25 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-qimageblitz
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG
@@ -60,7 +69,6 @@ cd build
   QTDIR=/usr/lib${LIBDIRSUFFIX}/qt \
   PATH=$QTDIR/bin:$PATH \
   cmake \
-    -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/source/l/qt/README b/source/l/qt/README
index bdf9be99..9bbcb346 100644
--- a/source/l/qt/README
+++ b/source/l/qt/README
@@ -6,3 +6,4 @@ repository with this command:
 
 git clone git://gitorious.org/+kde-developers/qt/kde-qt.git
 
+(see the SlackBuild for more details)
diff --git a/source/l/qt/profile.d/qt4.csh b/source/l/qt/profile.d/qt4.csh
index 6e2c726c..6e2c726c 100755..100644
--- a/source/l/qt/profile.d/qt4.csh
+++ b/source/l/qt/profile.d/qt4.csh
diff --git a/source/l/qt/profile.d/qt4.sh b/source/l/qt/profile.d/qt4.sh
index 5b4b830a..5b4b830a 100755..100644
--- a/source/l/qt/profile.d/qt4.sh
+++ b/source/l/qt/profile.d/qt4.sh
diff --git a/source/l/qt/qt.QSortFilterProxyModel.reformatted.diff b/source/l/qt/qt.QSortFilterProxyModel.reformatted.diff
new file mode 100644
index 00000000..0ab94b31
--- /dev/null
+++ b/source/l/qt/qt.QSortFilterProxyModel.reformatted.diff
@@ -0,0 +1,92 @@
+--- ./src/gui/itemviews/qsortfilterproxymodel.cpp.orig	2010-11-20 17:54:23.000000000 -0600
++++ ./src/gui/itemviews/qsortfilterproxymodel.cpp	2011-01-07 00:40:04.000000000 -0600
+@@ -782,14 +782,14 @@
+         if (orthogonal_source_to_proxy.isEmpty()) {
+             const int ortho_end = (orient == Qt::Horizontal) ? model->rowCount(source_parent) : model->columnCount(source_parent);
+ 
++            orthogonal_source_to_proxy.resize(ortho_end);
++
+             for (int ortho_item = 0; ortho_item < ortho_end; ++ortho_item) {
+                 if ((orient == Qt::Horizontal) ? q->filterAcceptsRow(ortho_item, source_parent)
+                         : q->filterAcceptsColumn(ortho_item, source_parent)) {
+                     orthogonal_proxy_to_source.append(ortho_item);
+                 }
+             }
+-            orthogonal_source_to_proxy.resize(orthogonal_proxy_to_source.size());
+-
+             if (orient == Qt::Horizontal) {
+                 // We're reacting to columnsInserted, but we've just inserted new rows. Sort them.
+                 sort_source_rows(orthogonal_proxy_to_source, source_parent);
+--- ./tests/auto/qsortfilterproxymodel/qsortfilterproxymodel.pro.orig	2010-11-20 17:54:28.000000000 -0600
++++ ./tests/auto/qsortfilterproxymodel/qsortfilterproxymodel.pro	2011-01-07 00:40:04.000000000 -0600
+@@ -1,6 +1,7 @@
+ load(qttest_p4)
+ 
+-SOURCES += tst_qsortfilterproxymodel.cpp
+-
++INCLUDEPATH += $$PWD/../modeltest
+ 
++SOURCES         += tst_qsortfilterproxymodel.cpp ../modeltest/dynamictreemodel.cpp ../modeltest/modeltest.cpp
++HEADERS         += ../modeltest/dynamictreemodel.h ../modeltest/modeltest.h
+ 
+--- ./tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp.orig	2010-11-20 17:54:28.000000000 -0600
++++ ./tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp	2011-01-07 00:41:02.000000000 -0600
+@@ -43,6 +43,9 @@
+ #include <QtTest/QtTest>
+ #include "../../shared/util.h"
+ 
++#include "dynamictreemodel.h"
++#include "modeltest.h"
++
+ #include <QtCore>
+ #include <QtGui>
+ 
+@@ -143,6 +146,7 @@
+     void taskQTBUG_10287_unnecessaryMapCreation();
+ 
+     void testMultipleProxiesWithSelection();
++    void filteredColumns();
+ 
+ protected:
+     void buildHierarchy(const QStringList &data, QAbstractItemModel *model);
+@@ -3135,5 +3139,40 @@
+     // No assert failure, it passes.
+ }
+ 
++class FilteredColumnProxyModel : public QSortFilterProxyModel
++{
++  Q_OBJECT
++public:
++  FilteredColumnProxyModel(QObject *parent = 0)
++    : QSortFilterProxyModel(parent)
++  {
++
++  }
++
++protected:
++  bool filterAcceptsColumn(int column, const QModelIndex &source_parent) const
++  {
++    return column % 2 != 0;
++  }
++};
++
++void tst_QSortFilterProxyModel::filteredColumns()
++{
++    DynamicTreeModel *model = new DynamicTreeModel(this);
++
++    FilteredColumnProxyModel *proxy = new FilteredColumnProxyModel(this);
++    proxy->setSourceModel(model);
++
++    new ModelTest(proxy, this);
++
++    ModelInsertCommand *insertCommand = new ModelInsertCommand(model, this);
++    insertCommand->setNumCols(2);
++    insertCommand->setStartRow(0);
++    insertCommand->setEndRow(0);
++    // Parent is QModelIndex()
++    insertCommand->doCommand();
++
++}
++
+ QTEST_MAIN(tst_QSortFilterProxyModel)
+ #include "tst_qsortfilterproxymodel.moc"
diff --git a/source/l/qt/qt.SlackBuild b/source/l/qt/qt.SlackBuild
index c04221c3..f79d2c2a 100755
--- a/source/l/qt/qt.SlackBuild
+++ b/source/l/qt/qt.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -31,11 +31,14 @@
 # git checkout origin/4.5.3-patched
 # git checkout origin/4.6.0-stable-patched
 # git checkout origin/4.6.1-patched
+# git checkout origin/4.7.0-patched
+#
+# Alternate method (we don't use this):
 # wget http://qt.gitorious.org/qt/kde-qt/archive-tarball/4.6.2-patched
 
 PKGNAM=qt
 VERSION=$(ls qt-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -109,7 +112,14 @@ if [ $ARCH = "i486" ]; then
 fi
 
 # Fix path to mysql header
-zcat $CWD/qt.mysql.h.diff.gz | patch -p1 || exit 1
+zcat $CWD/qt.mysql.h.diff.gz | patch -p1 --verbose || exit 1
+
+# Upstream patch required for upcoming kdepim-4.6.x:
+zcat $CWD/qt.QSortFilterProxyModel.reformatted.diff.gz | patch -p1 --verbose || exit 1
+
+# Blacklist compromised certificates:
+zcat $CWD/qt.blacklist.bad.certs.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/qt.blacklist.bad.certs.patch02.diff.gz | patch -p1 --verbose || exit 1
 
 export CFLAGS="$SLKCFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
@@ -142,6 +152,10 @@ make install INSTALL_ROOT=$PKG || exit 1
 # The infamous qt -> qt-${VERSION} link that keeps the full path out of .la files:
 ( cd $PKG/usr/lib${LIBDIRSUFFIX} ; ln -sf qt qt-${VERSION} )
 
+# libjscore is used internally.  Prevent a false dependency on this in the .la files:
+sed -i "s,-ljscore,,g" $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/*.la $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/pkgconfig/*.pc
+sed -i "s,-L../JavaScriptCore/release,,g" $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/*.la $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/pkgconfig/*.pc
+
 # Link the shared libraries into /usr/lib:
 ( cd $PKG/usr/lib${LIBDIRSUFFIX}
   for file in qt/lib/*.so* ; do
diff --git a/source/l/qt/qt.blacklist.bad.certs.diff b/source/l/qt/qt.blacklist.bad.certs.diff
new file mode 100644
index 00000000..38b6d369
--- /dev/null
+++ b/source/l/qt/qt.blacklist.bad.certs.diff
@@ -0,0 +1,67 @@
+--- ./src/network/ssl/qsslcertificate_p.h.orig	2010-11-20 17:54:24.000000000 -0600
++++ ./src/network/ssl/qsslcertificate_p.h	2011-03-24 18:08:59.000000000 -0500
+@@ -96,6 +96,7 @@
+     static QSslCertificate QSslCertificate_from_X509(X509 *x509);
+     static QList<QSslCertificate> certificatesFromPem(const QByteArray &pem, int count = -1);
+     static QList<QSslCertificate> certificatesFromDer(const QByteArray &der, int count = -1);
++    static bool isBlacklisted(const QSslCertificate &certificate);
+ 
+     friend class QSslSocketBackendPrivate;
+ 
+--- ./src/network/ssl/qsslcertificate.cpp.orig	2010-11-20 17:54:24.000000000 -0600
++++ ./src/network/ssl/qsslcertificate.cpp	2011-03-24 18:08:59.000000000 -0500
+@@ -219,17 +219,19 @@
+     Returns true if this certificate is valid; otherwise returns
+     false.
+ 
+-    Note: Currently, this function only checks that the current
++    Note: Currently, this function checks that the current
+     data-time is within the date-time range during which the
+-    certificate is considered valid. No other checks are
+-    currently performed.
++    certificate is considered valid, and checks that the
++    certificate is not in a blacklist of fraudulent certificates.
+ 
+     \sa isNull()
+ */
+ bool QSslCertificate::isValid() const
+ {
+     const QDateTime currentTime = QDateTime::currentDateTime();
+-    return currentTime >= d->notValidBefore && currentTime <= d->notValidAfter;
++    return currentTime >= d->notValidBefore &&
++            currentTime <= d->notValidAfter &&
++            ! QSslCertificatePrivate::isBlacklisted(*this);
+ }
+ 
+ /*!
+@@ -798,6 +800,30 @@
+     return certificates;
+ }
+ 
++// These certificates are known to be fraudulent and were created during the comodo
++// compromise. See http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html
++static const char *certificate_blacklist[] = {
++    "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e",
++    "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06",
++    "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3",
++    "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29",
++    "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71",
++    "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47",
++    "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43",
++    "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0",
++    "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0",
++    0
++};
++
++bool QSslCertificatePrivate::isBlacklisted(const QSslCertificate &certificate)
++{
++    for (int a = 0; certificate_blacklist[a] != 0; a++) {
++        if (certificate.serialNumber() == certificate_blacklist[a])
++            return true;
++    }
++    return false;
++}
++
+ #ifndef QT_NO_DEBUG_STREAM
+ QDebug operator<<(QDebug debug, const QSslCertificate &certificate)
+ {
diff --git a/source/l/qt/qt.blacklist.bad.certs.patch02.diff b/source/l/qt/qt.blacklist.bad.certs.patch02.diff
new file mode 100644
index 00000000..b8bb1e4e
--- /dev/null
+++ b/source/l/qt/qt.blacklist.bad.certs.patch02.diff
@@ -0,0 +1,35 @@
+From b87528a71b66e786c11804d7b79e408aae612748 Mon Sep 17 00:00:00 2001
+From: Peter Hartmann <peter.hartmann@nokia.com>
+Date: Fri, 25 Mar 2011 13:45:24 +0100
+Subject: [PATCH] QSslSocket internals: abort on encountering blacklisted certificates
+
+tested manually with "openssl s_server -cert blacklisted.pem -key
+key.pem" and connecting a QSslSocket.
+
+Reviewed-by: Markus Goetz
+Task-number: QTBUG-18338
+---
+ src/network/ssl/qsslsocket_openssl.cpp |    7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
+index 0866534..2427193 100644
+--- a/src/network/ssl/qsslsocket_openssl.cpp
++++ b/src/network/ssl/qsslsocket_openssl.cpp
+@@ -1193,6 +1193,13 @@ bool QSslSocketBackendPrivate::startHandshake()
+     X509 *x509 = q_SSL_get_peer_certificate(ssl);
+     configuration.peerCertificate = QSslCertificatePrivate::QSslCertificate_from_X509(x509);
+     q_X509_free(x509);
++    if (QSslCertificatePrivate::isBlacklisted(configuration.peerCertificate)) {
++        q->setErrorString(QSslSocket::tr("The peer certificate is blacklisted"));
++        q->setSocketError(QAbstractSocket::SslHandshakeFailedError);
++        emit q->error(QAbstractSocket::SslHandshakeFailedError);
++        plainSocket->disconnectFromHost();
++        return false;
++    }
+ 
+     // Start translating errors.
+     QList<QSslError> errors;
+-- 
+1.6.1
+
diff --git a/source/l/raptor2/raptor2.SlackBuild b/source/l/raptor2/raptor2.SlackBuild
new file mode 100755
index 00000000..4b024ce4
--- /dev/null
+++ b/source/l/raptor2/raptor2.SlackBuild
@@ -0,0 +1,119 @@
+#!/bin/sh
+
+# Copyright 2007  Heinz Wiesinger <hmwiesinger@gmx.at>
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Modified by Robby Workman <rworkman@slackware.com>
+# No added terms or copyright claims
+
+
+PKGNAM=raptor2
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:--j6}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
+cd $PKGNAM-$VERSION || exit 1
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --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
+
+( 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/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* INSTALL* LICENSE* NEWS* \
+  NOTICE README* RELEASE.html UPGRADING* \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+( cd $PKG/usr/doc/$PKGNAM-$VERSION
+  ln -s /usr/share/gtk-doc/html/$PKGNAM html
+)
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/l/raptor2/slack-desc b/source/l/raptor2/slack-desc
new file mode 100644
index 00000000..d5f1d463
--- /dev/null
+++ b/source/l/raptor2/slack-desc
@@ -0,0 +1,12 @@
+       |-----handy-ruler------------------------------------------------------|
+raptor2: raptor2 (RDF Parser & Serializer)
+raptor2:
+raptor2: Raptor is a free software/Open Source C library that provides a set of
+raptor2: parsers and serializers that generate Resource Description Framework
+raptor2: (RDF) triples by parsing syntaxes or serialize the triples into a
+raptor2: syntax.  The supported parsing syntaxes are RDF/XML, N-Triples, TRiG,
+raptor2: Turtle, RSS tag soup including all versions of RSS, Atom 1.0 and 0.3,
+raptor2: GRDDL and microformats for HTML, XHTML and XML.
+raptor2:
+raptor2: Homepage:  http://librdf.org/
+raptor2:
diff --git a/source/l/rasqal/rasqal.SlackBuild b/source/l/rasqal/rasqal.SlackBuild
index 9ef4cbf3..435991a0 100755
--- a/source/l/rasqal/rasqal.SlackBuild
+++ b/source/l/rasqal/rasqal.SlackBuild
@@ -26,9 +26,8 @@
 # No added terms or copyright claims
 
 PKGNAM=rasqal
-VERSION=${VERSION:-0.9.19}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:--j6}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -40,6 +39,8 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+NUMJOBS=${NUMJOBS:--j6}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
@@ -101,6 +102,14 @@ cp -a \
   ln -s /usr/share/gtk-doc/html/$PKGNAM html
 )
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source/l/readline/readline.SlackBuild b/source/l/readline/readline.SlackBuild
index 93eb360a..3fbae0b1 100755
--- a/source/l/readline/readline.SlackBuild
+++ b/source/l/readline/readline.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2005-2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=5.2
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-4}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-readline
@@ -38,6 +47,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG
@@ -45,7 +57,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf readline-$VERSION
-tar xvf $CWD/readline-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/readline-$VERSION.tar.?z* || exit 1
 cd readline-$VERSION || exit 1
 chown -R root:root .
 find . \
@@ -80,7 +92,7 @@ chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/lib*.so.*
 
 mkdir -p $PKG/usr/doc/readline-$VERSION
 cp -a \
-  CHANGELOG CHANGES COPYING INSTALL MANIFEST README USAGE \
+  CHANGELOG CHANGES COPYING* INSTALL MANIFEST README* USAGE \
   $PKG/usr/doc/readline-$VERSION
 
 mkdir -p $PKG/install
diff --git a/source/l/redland/redland.SlackBuild b/source/l/redland/redland.SlackBuild
index 85ee6924..1849481e 100755
--- a/source/l/redland/redland.SlackBuild
+++ b/source/l/redland/redland.SlackBuild
@@ -27,9 +27,8 @@
 
 
 PKGNAM=redland
-VERSION=${VERSION:-1.0.10}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:--j6}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -41,6 +40,8 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+NUMJOBS=${NUMJOBS:--j6}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
@@ -120,6 +121,14 @@ cp -a \
   ln -s /usr/share/gtk-doc/html/$PKGNAM html
 )
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source/l/sdl/sdl.SlackBuild b/source/l/sdl/sdl.SlackBuild
index 044c1f85..3a0b61ae 100755
--- a/source/l/sdl/sdl.SlackBuild
+++ b/source/l/sdl/sdl.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@ MIXER=${MIXER:-$(echo SDL_mixer-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d -
 NET=${NET:-$(echo SDL_net-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 TTF=${TTF:-$(echo SDL_ttf-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-5}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -71,6 +71,8 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
+zcat $CWD/sdl.linux-2.6.31.input_absinfo.diff.gz | patch -p1 --verbose || exit 1
+
 # We must use --disable-x11-shared or programs linked with SDL will
 # crash on machines that use the closed source nVidia drivers.
 
@@ -178,6 +180,9 @@ cp -a \
   CHANGES COPYING README \
   $PKG/usr/doc/SDL_mixer-$MIXER
 
+# We do not want to try to pull in -lmikmod, since that was linked static:
+sed -i -e "s/ -lmikmod//g" $PKG/usr/lib${LIBDIRSUFFIX}/libSDL_mixer.la
+
 # Add SDL_net:
 cd $TMP
 rm -rf SDL_net-$NET
diff --git a/source/l/sdl/sdl.linux-2.6.31.input_absinfo.diff b/source/l/sdl/sdl.linux-2.6.31.input_absinfo.diff
new file mode 100644
index 00000000..685007ab
--- /dev/null
+++ b/source/l/sdl/sdl.linux-2.6.31.input_absinfo.diff
@@ -0,0 +1,38 @@
+--- SDL-1.2.14/src/joystick/linux/SDL_sysjoystick.c	2011-01-23 23:23:31.865198998 +0100
++++ SDL-1.2.14/src/joystick/linux/SDL_sysjoystick.c.org	2011-01-23 23:28:12.427198998 +0100
+@@ -700,26 +700,26 @@ 
+ 				continue;
+ 			}
+ 			if ( test_bit(i, absbit) ) {
+-				int values[5];
++               struct input_absinfo absinfo;
+ 
+-				if ( ioctl(fd, EVIOCGABS(i), values) < 0 )
++				if ( ioctl(fd, EVIOCGABS(i), &absinfo) < 0 )
+ 					continue;
+ #ifdef DEBUG_INPUT_EVENTS
+ 				printf("Joystick has absolute axis: %x\n", i);
+ 				printf("Values = { %d, %d, %d, %d, %d }\n",
+-					values[0], values[1],
+-					values[2], values[3], values[4]);
++					absinfo.value, absinfo.minimum,
++					absinfo.maximum, absinfo.fuzz, absinfo.flat);
+ #endif /* DEBUG_INPUT_EVENTS */
+ 				joystick->hwdata->abs_map[i] = joystick->naxes;
+-				if ( values[1] == values[2] ) {
++				if ( absinfo.minimum == absinfo.maximum ) {
+ 				    joystick->hwdata->abs_correct[i].used = 0;
+ 				} else {
+ 				    joystick->hwdata->abs_correct[i].used = 1;
+ 				    joystick->hwdata->abs_correct[i].coef[0] =
+-					(values[2] + values[1]) / 2 - values[4];
++					(absinfo.maximum + absinfo.minimum) / 2 - absinfo.flat;
+ 				    joystick->hwdata->abs_correct[i].coef[1] =
+-					(values[2] + values[1]) / 2 + values[4];
+-				    t = ((values[2] - values[1]) / 2 - 2 * values[4]);
++					(absinfo.maximum + absinfo.minimum) / 2 + absinfo.flat;
++				    t = ((absinfo.maximum - absinfo.minimum) / 2 - 2 * absinfo.flat);
+ 				    if ( t != 0 ) {
+ 					joystick->hwdata->abs_correct[i].coef[2] = (1 << 29) / t;
+ 				    } else {
+
diff --git a/source/l/shared-desktop-ontologies/shared-desktop-ontologies.SlackBuild b/source/l/shared-desktop-ontologies/shared-desktop-ontologies.SlackBuild
index 602012b0..eb0f00ad 100755
--- a/source/l/shared-desktop-ontologies/shared-desktop-ontologies.SlackBuild
+++ b/source/l/shared-desktop-ontologies/shared-desktop-ontologies.SlackBuild
@@ -21,7 +21,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=${VERSION:-0.3}
+VERSION=${VERSION:-0.5}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:--j6}
 
diff --git a/source/l/sip/sip.SlackBuild b/source/l/sip/sip.SlackBuild
index e46740e4..687d76f9 100755
--- a/source/l/sip/sip.SlackBuild
+++ b/source/l/sip/sip.SlackBuild
@@ -24,7 +24,7 @@
 # Modified by Robby Workman <rworkman@slackware.com>
 
 
-VERSION=${VERSION:-4.10.2}
+VERSION=${VERSION:-4.11.2}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:--j6}
 
diff --git a/source/l/slang/slang.SlackBuild b/source/l/slang/slang.SlackBuild
index 115e24af..c39d4297 100755
--- a/source/l/slang/slang.SlackBuild
+++ b/source/l/slang/slang.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,8 +21,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=${VERSION:-2.2.2}
-#DOCV=${DOCV:-2.2.2}
+VERSION=${VERSION:-2.2.3}
+#DOCV=${DOCV:-2.2.3}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
diff --git a/source/l/slang1/slang1.SlackBuild b/source/l/slang1/slang1.SlackBuild
index d3b6cdda..9eb8472f 100755
--- a/source/l/slang1/slang1.SlackBuild
+++ b/source/l/slang1/slang1.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,9 +23,18 @@
 
 VERSION=${VERSION:-1.4.9}
 #DOCV=${DOCV:-2.0.4}
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 if [ "$ARCH" = "i486" ]; then
@@ -37,6 +46,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
diff --git a/source/l/soprano/soprano.SlackBuild b/source/l/soprano/soprano.SlackBuild
index 3fbdc8fc..054fb20b 100755
--- a/source/l/soprano/soprano.SlackBuild
+++ b/source/l/soprano/soprano.SlackBuild
@@ -22,9 +22,9 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=${VERSION:-2.4.3}
-BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:--j6}
+PKGNAM=soprano
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -36,6 +36,8 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+NUMJOBS=${NUMJOBS:--j6}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-soprano
@@ -57,6 +59,16 @@ fi
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
+
+# Detect JDK, needed for libsoprano_sesame2backend.so:
+if ! ls /var/log/packages/jdk-* 1> /dev/null 2> /dev/null ; then
+  echo
+  echo "JDK package not found in /var/log/packages."
+  echo "This is needed to compile libsoprano_sesame2backend.so."
+  echo
+  exit 1
+fi
+
 rm -rf soprano-$VERSION
 tar xvf $CWD/soprano-$VERSION.tar.bz2 || exit 1
 cd soprano-$VERSION || exit 1
diff --git a/source/l/strigi/strigi.SlackBuild b/source/l/strigi/strigi.SlackBuild
index 3a0ce722..c7cdaa79 100755
--- a/source/l/strigi/strigi.SlackBuild
+++ b/source/l/strigi/strigi.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2007-2008 Robby Workman, Northport, Alabama, USA
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 
 # Redistribution and use of this script, with or without modification, is
@@ -23,9 +23,7 @@
 
 
 VERSION=${VERSION:-$(echo strigi-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
-
-NUMJOBS=${NUMJOBS:--j6}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -40,6 +38,7 @@ fi
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-strigi
+NUMJOBS=${NUMJOBS:--j6}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
diff --git a/source/l/svgalib/svgalib.SlackBuild b/source/l/svgalib/svgalib.SlackBuild
index f01dc8d7..c4c405b1 100755
--- a/source/l/svgalib/svgalib.SlackBuild
+++ b/source/l/svgalib/svgalib.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,19 @@
 
 
 PKGNAM=svgalib
-VERSION=${VERSION:-1.9.25}
-ARCH=${ARCH:-x86_64}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -35,6 +44,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
diff --git a/source/l/system-config-printer/system-config-printer.SlackBuild b/source/l/system-config-printer/system-config-printer.SlackBuild
index 17bc7327..8ba12a89 100755
--- a/source/l/system-config-printer/system-config-printer.SlackBuild
+++ b/source/l/system-config-printer/system-config-printer.SlackBuild
@@ -26,7 +26,7 @@
 # Set initial variables:
 
 PKGNAM=system-config-printer
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:" -j4 "}
 
@@ -90,8 +90,8 @@ CFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 # Build and install:
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG
+make $NUMJOBS udevrulesdir=/lib/udev/rules.d udevhelperdir=/lib/udev || make || exit 1
+make install DESTDIR=$PKG udevrulesdir=/lib/udev/rules.d udevhelperdir=/lib/udev || exit 1
 
 # Slackware does not use PAM.  Instead, your user must be in group 'lp'.
 sed -i -e 's/at_console="true"/group="lp"/g' \
diff --git a/source/l/t1lib/t1lib.SlackBuild b/source/l/t1lib/t1lib.SlackBuild
index d192e1cd..86002a21 100755
--- a/source/l/t1lib/t1lib.SlackBuild
+++ b/source/l/t1lib/t1lib.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,11 +21,19 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=5.1.2
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-1}
+PKGNAM=t1lib
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
 
-NUMJOBS=${NUMJOBS:-" -j7 "}
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -38,6 +46,8 @@ elif [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 fi
 
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-t1lib
@@ -49,6 +59,16 @@ rm -rf t1lib-$VERSION
 tar xvf $CWD/t1lib-$VERSION.tar.?z* || exit 1
 cd t1lib-$VERSION
 
+# Apply Debian's patch since upstream seems inactive:
+zcat $CWD/t1lib_5.1.2-3.diff.gz | patch -p1 --verbose || exit 1
+
+# I don't think anyone is applying this first one:
+#cat debian/patches/segfault.diff -b -z .segf | patch -p1 --verbose || exit 1
+# UUOCFTW:
+cat debian/patches/no-config.diff | patch -p1 --verbose || exit 1
+cat debian/patches/no-docs.diff | patch -p1 --verbose || exit 1
+cat debian/patches/lib-cleanup.diff | patch -p1 --verbose || exit 1
+
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -72,13 +92,11 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/*.so
 
 mkdir -p $PKG/usr/doc/t1lib-$VERSION
-mv $PKG/usr/share/t1lib/doc/t1lib_doc.ps $PKG/usr/doc/t1lib-$VERSION
-gzip -9 $PKG/usr/doc/t1lib-$VERSION/t1lib_doc.ps
-rm -r $PKG/usr/share/t1lib/doc
 cp -a \
-  Changes LGPL LICENSE README* \
+  Change* COPYING* *GPL* LICENSE* README* \
   $PKG/usr/doc/t1lib-$VERSION
 
+mkdir -p $PKG/usr/share/t1lib
 cp -a Fonts $PKG/usr/share/t1lib
 /bin/ls $PKG/usr/share/t1lib/Fonts/afm/*.afm /usr/share/fonts/Type1/*.afm | sort | uniq | wc -l | sed -e 's/ //g' > $PKG/usr/share/t1lib/FontDataBase
 ( cd $PKG/usr/share/t1lib/Fonts/afm ; /bin/ls *.afm ; cd /usr/share/fonts/Type1 ; /bin/ls *.afm ) | sort | uniq >> $PKG/usr/share/t1lib/FontDataBase
@@ -106,3 +124,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/t1lib-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/l/t1lib/t1lib_5.1.2-3.diff b/source/l/t1lib/t1lib_5.1.2-3.diff
new file mode 100644
index 00000000..8ae0b3ad
--- /dev/null
+++ b/source/l/t1lib/t1lib_5.1.2-3.diff
@@ -0,0 +1,1830 @@
+--- t1lib-5.1.2.orig/debian/t1libconfig
++++ t1lib-5.1.2/debian/t1libconfig
+@@ -0,0 +1,163 @@
++#!/bin/sh -e
++
++# to test POSIX-correctness, change hash-bang to /bin/bash and uncomment
++# the following line:
++
++# set -o posix
++
++# Very simple configuration script for t1lib.  Checks a couple of
++# directories that might contain fonts, and if they exist, adds
++# anything ending in .pfa or pfb to the font database.  A few things
++# borrowed from paperconfig, (C) 1996, Yves Arrouye
++# <arrouye@debian.org>
++
++# note that this creates the "minimal" font database accepted by t1lib,
++# and doesn't look in every possible place for fonts.  It is mostly
++# provided so that xglyph will work out of the box...
++
++# Written by David Huggins-Daines <dhd@debian.org>
++
++usage() {
++    if [ "$1" = -h ]
++    then
++	exec 1>&2
++	echo -n U
++    else
++	echo -n u
++    fi
++
++    echo "sage: `basename $0` [ -v, --version ] [ -h, --help ] [ --force ]"
++    echo "                   [ fontdirs... ]"
++
++    if [ "$1" = -h ]
++    then
++	cat <<EOF
++
++Options: -v, --verbose          print version information and exit
++         -h, --help             print this help and exit
++         --force                force configuration
++EOF
++	exit 0
++    else
++	exit 1
++    fi
++}
++
++version=0.2
++topfontdirs="/usr/share/fonts/type1 /usr/share/fonts/X11"
++for dir in $topfontdirs; do
++   if [ -d $dir ]; then
++       subdirs=$(find $dir -type d -printf "%p ")
++       fontdirs="$subdirs $fontdirs"
++   fi
++done
++conffile=/etc/t1lib/t1lib.config
++confdir=/etc/t1lib/
++dbase=/etc/t1lib/FontDatabase
++temp=/etc/t1lib/FontDatabase.tmp
++
++force=0
++
++while [ $# -ne 0 ]
++do
++    case "$1" in
++	-v|--version)
++	    echo "`basename $0` version $version" \
++		"by David Huggins-Daines <dhd@debian.org>"
++	    exit 0
++	    ;;
++	-h|--help)
++	    usage -h
++	    ;;
++	--force)
++	    force=1
++	    ;;
++	*)
++	    # hairy way to remove a trailing backslash (should use perl)
++	    pat=`expr $1 : "\(.*\)\/\$" || echo $1`
++	    # hairier way to find a string anywhere in another string
++	    # should really use perl.
++	    if ! grep $pat <<EOF >/dev/null 2>&1
++$fontdirs
++EOF
++	    then
++		fontdirs="$fontdirs $1"
++	    fi
++	    ;;
++    esac
++    shift
++done
++
++# We presume that if the database exists, then so does the
++# configuration file.  Hopefully this won't break anything.
++
++if [ $force -eq 1 ] || [ ! -e $dbase ]; then
++    fontpath=""
++    afmpath=""
++
++    mkdir -p $confdir || true
++
++    echo -n "Searching for Type 1 fonts and AFM files..."
++
++    for i in $fontdirs
++    do
++	if [ -d $i ] && ls $i/*.pf[ab] > /dev/null 2>&1; then
++	    if [ -n "$fontpath" ]; then
++		fontpath="$fontpath:$i"
++	    else
++		fontpath="$i"
++	    fi
++	    
++	    if ls $i/*.afm > /dev/null 2>&1; then
++		if [ -n "$afmpath" ]; then
++		    afmpath="$afmpath:$i"
++		else
++		    afmpath="$i"
++		fi
++	    fi
++	    # get a listing of all the fonts in each dir
++	    find $i -maxdepth 1 -name *.pf[ab] -printf '%f\n' >> $temp
++	fi
++    done
++    if [ -z "$fontpath" ]; then
++	cat <<EOF
++
++No Type 1 fonts were found in the expected locations.
++If you want t1lib to be aware of your fonts, you should run
++/usr/sbin/t1libconfig with the names of your local font directories as
++arguments, or you should edit the /etc/t1lib/FontDatabase file manually.
++See the FontDatabase(5) manual page for more information.
++
++Press [return] to continue.
++EOF
++        read foo || true
++	rm -f $temp
++    else
++        echo "done."
++        echo -n "Building font database..."
++        fontcount=`wc -l $temp || true`
++        echo $fontcount > $dbase
++        cat $temp >> $dbase
++        rm -f $temp
++        echo "done."
++    fi
++
++    # now set the paths in the config file
++    cat <<EOF >$conffile
++t1lib.config - global configuration file for t1lib.
++It was created automatically on `date`
++by the t1libconfig script.
++
++Run /usr/sbin/t1libconfig --force to rebuild it.
++    
++ENCODING=.
++AFM=$afmpath
++TYPE1=$fontpath
++FONTDATABASE=$dbase
++EOF
++else
++    echo "Configuration and font database files already exist."
++    echo "Run /usr/sbin/t1libconfig --force to rebuild them."
++fi
++
++exit 0
+--- t1lib-5.1.2.orig/debian/t1lib-bin.postrm
++++ t1lib-5.1.2/debian/t1lib-bin.postrm
+@@ -0,0 +1,8 @@
++#!/bin/sh
++set -e
++
++if [ "$1" = "purge" ]; then
++	rm -rf /etc/t1lib
++fi
++
++#DEBHELPER#
+--- t1lib-5.1.2.orig/debian/libt1-5.install
++++ t1lib-5.1.2/debian/libt1-5.install
+@@ -0,0 +1 @@
++debian/tmp/usr/lib/libt1*.so.*
+--- t1lib-5.1.2.orig/debian/libt1-doc.docs
++++ t1lib-5.1.2/debian/libt1-doc.docs
+@@ -0,0 +1 @@
++doc/*.pdf
+--- t1lib-5.1.2.orig/debian/libt1-dev.docs
++++ t1lib-5.1.2/debian/libt1-dev.docs
+@@ -0,0 +1,2 @@
++README.t1lib-*
++README.t1python
+--- t1lib-5.1.2.orig/debian/t1lib-bin.dirs
++++ t1lib-5.1.2/debian/t1lib-bin.dirs
+@@ -0,0 +1 @@
++etc/t1lib
+--- t1lib-5.1.2.orig/debian/t1lib-bin.manpages
++++ t1lib-5.1.2/debian/t1lib-bin.manpages
+@@ -0,0 +1,4 @@
++debian/man/FontDatabase.5
++debian/man/t1libconfig.8
++debian/man/type1afm.1
++debian/man/xglyph.1
+--- t1lib-5.1.2.orig/debian/control
++++ t1lib-5.1.2/debian/control
+@@ -0,0 +1,84 @@
++Source: t1lib
++Section: libs
++Priority: optional
++Maintainer: Ruben Molina <rmolina@udea.edu.co>
++Build-Depends: cdbs, debhelper (>= 7), autotools-dev, libice-dev, libsm-dev, libx11-dev, libxext-dev, libxaw7-dev, quilt
++Standards-Version: 3.8.0
++Homepage: ftp://sunsite.unc.edu/pub/Linux/libs/graphics/
++
++Package: libt1-5
++Section: libs
++Architecture: any
++Depends: ${shlibs:Depends}, ${misc:Depends}
++Description: Type 1 font rasterizer library - runtime
++ T1lib is an enhanced rasterizer for Type 1 fonts.
++ .
++ T1lib is based on the X11R5 font rasterizer code, but operates independently
++ of X11.  It includes many enhancements, including underlining, antialiasing,
++ user-defined slant and extension factors, and rotation.
++ .
++ This package contains the shared libraries needed to run programs using T1lib.
++
++Package: libt1-dev
++Section: libdevel
++Architecture: any
++Depends: libt1-5 (= ${binary:Version}), libice-dev, libsm-dev, libx11-dev,
++ libxext-dev, libxaw7-dev
++Recommends: libt1-doc
++Conflicts: t1lib-dev, t1lib1-dev
++Description: Type 1 font rasterizer library - development
++ T1lib is an enhanced rasterizer for Type 1 fonts.
++ .
++ T1lib is based on the X11R5 font rasterizer code, but operates independently
++ of X11.  It includes many enhancements, including underlining, antialiasing,
++ user-defined slant and extension factors, and rotation.
++ .
++ This package contains the header files and static libraries needed to
++ develop programs using T1lib.
++ .
++ Please note, that PDF documentation is placed in libt1-doc
++
++Package: t1lib-bin
++Architecture: any
++Section: misc
++Depends: ${shlibs:Depends}
++Provides: t1lib1-bin
++Replaces: t1lib1-bin
++Conflicts: t1lib1-bin
++Description: Type 1 font rasterizer library - user binaries
++ T1lib is an enhanced rasterizer for Type 1 fonts.
++ .
++ T1lib is based on the X11R5 font rasterizer code, but operates independently
++ of X11.  It includes many enhancements, including underlining, antialiasing,
++ user-defined slant and extension factors, and rotation.
++ .
++ This package contains the programs "xglyph" and "type1afm", included in the
++ upstream T1lib distribution.  It also contains the "t1libconfig"
++ script used to configure t1lib.
++
++Package: libt1-doc
++Architecture: all
++Section: doc
++Description: Type 1 font rasterizer library - developers documentation
++ T1lib is an enhanced rasterizer for Type 1 fonts.
++ .
++ T1lib is based on the X11R5 font rasterizer code, but operates independently
++ of X11.  It includes many enhancements, including underlining, antialiasing,
++ user-defined slant and extension factors, and rotation.
++ .
++ This package contains developers documentation.
++
++Package: libt1-5-dbg
++Section: libdevel
++Priority: extra
++Architecture: any
++Depends: libt1-5 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
++Description: Type 1 font rasterizer library - debugging runtime
++ T1lib is an enhanced rasterizer for Type 1 fonts.
++ .
++ T1lib is based on the X11R5 font rasterizer code, but operates independently
++ of X11.  It includes many enhancements, including underlining, antialiasing,
++ user-defined slant and extension factors, and rotation.
++ .
++ This package contains debugging information.
++
+--- t1lib-5.1.2.orig/debian/NEWS
++++ t1lib-5.1.2/debian/NEWS
+@@ -0,0 +1,9 @@
++t1lib (5.0.0-3) unstable; urgency=low
++
++  This version of t1lib package is binary incompatible with the previous
++  one in Debian. Details about changes are documented in following files
++  in /usr/share/doc/libt1-dev directory:
++   - changelog.gz
++   - README.t1lib-5.0.0.gz
++
++ -- Artur R. Czechowski <arturcz@hell.pl>  Sun, 18 Jan 2004 00:02:29 +0100
+--- t1lib-5.1.2.orig/debian/libt1-5.symbols
++++ t1lib-5.1.2/debian/libt1-5.symbols
+@@ -0,0 +1,381 @@
++libt1.so.5 libt1-5 #MINVER#
++ BezierTerminationTest@Base 5.1.0
++ CRASTERCompressionType@Base 5.1.0
++ CacheBLimit@Base 5.1.0
++ CachedChars@Base 5.1.0
++ CachedFonts@Base 5.1.0
++ ConicDebug@Base 5.1.0
++ Continuity@Base 5.1.0
++ CurFontEnv@Base 5.1.0
++ CurFontName@Base 5.1.0
++ DLadd@Base 5.1.0
++ DLdiv@Base 5.1.0
++ DLmult@Base 5.1.0
++ DLsub@Base 5.1.0
++ DeviceSpecifics@Base 5.1.0
++ FPXYboth@Base 5.1.0
++ FPXonly@Base 5.1.0
++ FPYonly@Base 5.1.0
++ FPdiv@Base 5.1.0
++ FPmult@Base 5.1.0
++ FPstarslash@Base 5.1.0
++ FXYConvert@Base 5.1.0
++ FXYboth@Base 5.1.0
++ FXonly@Base 5.1.0
++ FYonly@Base 5.1.0
++ FontBase@Base 5.1.0
++ FontDebug@Base 5.1.0
++ ForceAFMBBox@Base 5.1.0
++ ForceFloat@Base 5.1.0
++ FreeAFMData@Base 5.1.0
++ GetType1CharString@Base 5.1.0
++ HighHex@Base 5.1.0
++ HintDebug@Base 5.1.0
++ IXYConvert@Base 5.1.0
++ IXYboth@Base 5.1.0
++ IXonly@Base 5.1.0
++ IYonly@Base 5.1.0
++ ImageDebug@Base 5.1.0
++ InDotSection@Base 5.1.0
++ Init_BuiltInEncoding@Base 5.1.0
++ InternalTrace@Base 5.1.0
++ LineDebug@Base 5.1.0
++ LineIOTrace@Base 5.1.0
++ LowHex@Base 5.1.0
++ MemoryDebug@Base 5.1.0
++ MustCheckArgs@Base 5.1.0
++ MustCrash@Base 5.1.0
++ MustTraceCalls@Base 5.1.0
++ OffPageDebug@Base 5.1.0
++ PathDebug@Base 5.1.0
++ ProcessHints@Base 5.1.0
++ QueryFontLib@Base 5.1.0
++ RegionDebug@Base 5.1.0
++ SaveFontPaths@Base 5.1.0
++ SearchDictName@Base 5.1.0
++ SetFuncRequestID@Base 5.1.0
++ SpaceDebug@Base 5.1.0
++ StdEncArrayP@Base 5.1.0
++ StrokeDebug@Base 5.1.0
++ T1Close@Base 5.1.0
++ T1GetDecrypt@Base 5.1.0
++ T1GetFileSize@Base 5.1.0
++ T1GetTrailer@Base 5.1.0
++ T1Getc@Base 5.1.0
++ T1Gets@Base 5.1.0
++ T1Open@Base 5.1.0
++ T1Read@Base 5.1.0
++ T1Ungetc@Base 5.1.0
++ T1_AAFillOutline@Base 5.1.0
++ T1_AAGetBitsPerPixel@Base 5.1.0
++ T1_AAGetGrayValues@Base 5.1.0
++ T1_AAGetLevel@Base 5.1.0
++ T1_AAHGetGrayValues@Base 5.1.0
++ T1_AAHSetGrayValues@Base 5.1.0
++ T1_AANGetGrayValues@Base 5.1.0
++ T1_AANSetGrayValues@Base 5.1.0
++ T1_AASetBitsPerPixel@Base 5.1.0
++ T1_AASetChar@Base 5.1.0
++ T1_AASetGrayValues@Base 5.1.0
++ T1_AASetLevel@Base 5.1.0
++ T1_AASetRect@Base 5.1.0
++ T1_AASetSmartLimits@Base 5.1.0
++ T1_AASetSmartMode@Base 5.1.0
++ T1_AASetString@Base 5.1.0
++ T1_AFM_ptr@Base 5.1.0
++ T1_AbsolutePath@Base 5.1.0
++ T1_AddFont@Base 5.1.0
++ T1_AddFontDataBase@Base 5.1.0
++ T1_AddFontDataBaseXLFD@Base 5.1.0
++ T1_AddToFileSearchPath@Base 5.1.0
++ T1_CheckEndian@Base 5.1.0
++ T1_CheckForFontID@Base 5.1.0
++ T1_CheckForInit@Base 5.1.0
++ T1_ClearStrokeFlag@Base 5.1.0
++ T1_CloseLib@Base 5.1.0
++ T1_ConcatGlyphs@Base 5.1.0
++ T1_ConcatOutlines@Base 5.1.0
++ T1_CopyFont@Base 5.1.0
++ T1_CopyGlyph@Base 5.1.0
++ T1_CopyOutline@Base 5.1.0
++ T1_DeleteAllSizes@Base 5.1.0
++ T1_DeleteEncoding@Base 5.1.0
++ T1_DeleteFont@Base 5.1.0
++ T1_DeleteSize@Base 5.1.0
++ T1_DumpGlyph@Base 5.1.0
++ T1_DumpPath@Base 5.1.0
++ T1_ENC_ptr@Base 5.1.0
++ T1_ExtendFont@Base 5.1.0
++ T1_ExtendHMatrix@Base 5.1.0
++ T1_ExtendVMatrix@Base 5.1.0
++ T1_FDBXLFD_ptr@Base 5.1.0
++ T1_FDB_ptr@Base 5.1.0
++ T1_FillOutline@Base 5.1.0
++ T1_FreeCompCharData@Base 5.1.0
++ T1_FreeGlyph@Base 5.1.0
++ T1_FreeOutline@Base 5.1.0
++ T1_GenerateAFMFallbackInfo@Base 5.1.0
++ T1_GetAfmFileName@Base 5.1.0
++ T1_GetAfmFilePath@Base 5.1.0
++ T1_GetAllCharNames@Base 5.1.0
++ T1_GetBitmapPad@Base 5.1.0
++ T1_GetCharBBox@Base 5.1.0
++ T1_GetCharName@Base 5.1.0
++ T1_GetCharOutline@Base 5.1.0
++ T1_GetCharString@Base 5.1.0
++ T1_GetCharWidth@Base 5.1.0
++ T1_GetCompCharData@Base 5.1.0
++ T1_GetCompCharDataByIndex@Base 5.1.0
++ T1_GetEncodingIndex@Base 5.1.0
++ T1_GetEncodingIndices@Base 5.1.0
++ T1_GetEncodingScheme@Base 5.1.0
++ T1_GetExtend@Base 5.1.0
++ T1_GetFamilyName@Base 5.1.0
++ T1_GetFileSearchPath@Base 5.1.0
++ T1_GetFontBBox@Base 5.1.0
++ T1_GetFontFileName@Base 5.1.0
++ T1_GetFontFilePath@Base 5.1.0
++ T1_GetFontName@Base 5.1.0
++ T1_GetFullName@Base 5.1.0
++ T1_GetIsFixedPitch@Base 5.1.0
++ T1_GetItalicAngle@Base 5.1.0
++ T1_GetKerning@Base 5.1.0
++ T1_GetLibIdent@Base 5.1.0
++ T1_GetLinePosition@Base 5.1.0
++ T1_GetLineThickness@Base 5.1.0
++ T1_GetMetricsInfo@Base 5.1.0
++ T1_GetMoveOutline@Base 5.1.0
++ T1_GetNoCompositeChars@Base 5.1.0
++ T1_GetNoFonts@Base 5.1.0
++ T1_GetNoKernPairs@Base 5.1.0
++ T1_GetNotice@Base 5.1.0
++ T1_GetSlant@Base 5.1.0
++ T1_GetStringBBox@Base 5.1.0
++ T1_GetStringOutline@Base 5.1.0
++ T1_GetStringWidth@Base 5.1.0
++ T1_GetStrokeMode@Base 5.1.0
++ T1_GetStrokeWidth@Base 5.1.0
++ T1_GetTransform@Base 5.1.0
++ T1_GetUnderlinePosition@Base 5.1.0
++ T1_GetUnderlineThickness@Base 5.1.0
++ T1_GetVersion@Base 5.1.0
++ T1_GetWeight@Base 5.1.0
++ T1_GetlenIV@Base 5.1.0
++ T1_INFINITY@Base 5.1.0
++ T1_InitLib@Base 5.1.0
++ T1_IsInternalChar@Base 5.1.0
++ T1_LoadEncoding@Base 5.1.0
++ T1_LoadFont@Base 5.1.0
++ T1_ManipulatePath@Base 5.1.0
++ T1_MirrorHMatrix@Base 5.1.0
++ T1_MirrorVMatrix@Base 5.1.0
++ T1_PFAB_ptr@Base 5.1.0
++ T1_PrintLog@Base 5.1.0
++ T1_QueryCompositeChar@Base 5.1.0
++ T1_QueryLigs@Base 5.1.0
++ T1_QueryX11Support@Base 5.1.0
++ T1_ReencodeFont@Base 5.1.0
++ T1_RelativePath@Base 5.1.0
++ T1_RotateMatrix@Base 5.1.0
++ T1_ScaleOutline@Base 5.1.0
++ T1_SetAfmFileName@Base 5.1.0
++ T1_SetBitmapPad@Base 5.1.0
++ T1_SetChar@Base 5.1.0
++ T1_SetDefaultEncoding@Base 5.1.0
++ T1_SetDeviceResolutions@Base 5.1.0
++ T1_SetFileSearchPath@Base 5.1.0
++ T1_SetFontDataBase@Base 5.1.0
++ T1_SetFontDataBaseXLFD@Base 5.1.0
++ T1_SetLinePosition@Base 5.1.0
++ T1_SetLineThickness@Base 5.1.0
++ T1_SetLogLevel@Base 5.1.0
++ T1_SetRasterFlags@Base 5.1.0
++ T1_SetRect@Base 5.1.0
++ T1_SetString@Base 5.1.0
++ T1_SetStrokeFlag@Base 5.1.0
++ T1_SetStrokeWidth@Base 5.1.0
++ T1_ShearHMatrix@Base 5.1.0
++ T1_ShearVMatrix@Base 5.1.0
++ T1_SlantFont@Base 5.1.0
++ T1_StrError@Base 5.1.0
++ T1_StrokeFont@Base 5.1.0
++ T1_SubsetFont@Base 5.1.0
++ T1_TransformFont@Base 5.1.0
++ T1_TransformMatrix@Base 5.1.0
++ T1_Type1OperatorFlags@Base 5.1.0
++ T1_Up@Base 5.1.0
++ T1_WriteAFMFallbackFile@Base 5.1.0
++ T1_errno@Base 5.1.0
++ T1_fdb@Base 5.1.0
++ T1_fdbxlfd@Base 5.1.0
++ T1aa_SmartOn@Base 5.1.0
++ T1aa_bg@Base 5.1.0
++ T1aa_bpp@Base 5.1.0
++ T1aa_smartlimit1@Base 5.1.0
++ T1aa_smartlimit2@Base 5.1.0
++ T1eexec@Base 5.1.0
++ T1int_CreateNewFontSize@Base 5.1.0
++ T1int_GetLastFontSize@Base 5.1.0
++ T1int_QueryFontSize@Base 5.1.0
++ T1int_QuerySEAC@Base 5.1.0
++ T1int_Type1QuerySEAC@Base 5.1.0
++ T1io_reset@Base 5.1.0
++ T1lib_parseFile@Base 5.1.0
++ TheCurrentFont@Base 5.1.0
++ Type1Char@Base 5.1.0
++ Type1Line@Base 5.1.0
++ currstartstem@Base 5.1.0
++ digit_value@Base 5.1.0
++ err_warn_msg_buf@Base 5.1.0
++ errornumber@Base 5.1.0
++ filestats@Base 5.1.0
++ fill@Base 5.1.0
++ fillrun@Base 5.1.0
++ fontfcnA@Base 5.1.0
++ fontfcnB@Base 5.1.0
++ fontfcnB_ByName@Base 5.1.0
++ fontfcnB_string@Base 5.1.0
++ fontfcnRect@Base 5.1.0
++ initFont@Base 5.1.0
++ intT1_Env_GetCompletePath@Base 5.1.0
++ intT1_FreeSearchPaths@Base 5.1.0
++ intT1_ScanConfigFile@Base 5.1.0
++ intT1_SetupDefaultSearchPaths@Base 5.1.0
++ intT1_scanFontDBase@Base 5.1.0
++ intT1_scanFontDBaseXLFD@Base 5.1.0
++ linebuf@Base 5.1.0
++ not_def@Base 5.1.0
++ numalignmentzones@Base 5.1.0
++ numstems@Base 5.1.0
++ objFormatArray@Base 5.1.0
++ objFormatBoolean@Base 5.1.0
++ objFormatEncoding@Base 5.1.0
++ objFormatFile@Base 5.1.0
++ objFormatInteger@Base 5.1.0
++ objFormatName@Base 5.1.0
++ objFormatReal@Base 5.1.0
++ objFormatString@Base 5.1.0
++ oldhor@Base 5.1.0
++ oldhorhalf@Base 5.1.0
++ oldvert@Base 5.1.0
++ oldverthalf@Base 5.1.0
++ pFontBase@Base 5.1.0
++ readFont@Base 5.1.0
++ reportusage@Base 5.1.0
++ resetFont@Base 5.1.0
++ scan_font@Base 5.1.0
++ scan_token@Base 5.1.0
++ stck_state@Base 5.1.0
++ stems@Base 5.1.0
++ swathrightmost@Base 5.1.0
++ swathxsort@Base 5.1.0
++ t1_Allocate@Base 5.1.0
++ t1_ApplyContinuity@Base 5.1.0
++ t1_ArgErr@Base 5.1.0
++ t1_Bezier@Base 5.1.0
++ t1_BoundingBox@Base 5.1.0
++ t1_BoxClip@Base 5.1.0
++ t1_BoxPath@Base 5.1.0
++ t1_Bresenham@Base 5.1.0
++ t1_ChangeDirection@Base 5.1.0
++ t1_CloseHints@Base 5.1.0
++ t1_ClosePath@Base 5.1.0
++ t1_Consume@Base 5.1.0
++ t1_Copy@Base 5.1.0
++ t1_CopyPath@Base 5.1.0
++ t1_CopyRegion@Base 5.1.0
++ t1_CopySpace@Base 5.1.0
++ t1_Destroy@Base 5.1.0
++ t1_DropSegment@Base 5.1.0
++ t1_DumpArea@Base 5.1.0
++ t1_DumpEdges@Base 5.1.0
++ t1_DumpSpace@Base 5.1.0
++ t1_DumpText@Base 5.1.0
++ t1_Dup@Base 5.1.0
++ t1_EmptyRegion@Base 5.1.0
++ t1_ErrorMsg@Base 5.1.0
++ t1_FormatFP@Base 5.1.0
++ t1_Free@Base 5.1.0
++ t1_HeadSegment@Base 5.1.0
++ t1_Hint@Base 5.1.0
++ t1_ILoc@Base 5.1.0
++ t1_Identity@Base 5.1.0
++ t1_InitHints@Base 5.1.0
++ t1_InitImager@Base 5.1.0
++ t1_InitSpaces@Base 5.1.0
++ t1_Interior@Base 5.1.0
++ t1_Join@Base 5.1.0
++ t1_JoinSegment@Base 5.1.0
++ t1_KillPath@Base 5.1.0
++ t1_KillRegion@Base 5.1.0
++ t1_Line@Base 5.1.0
++ t1_Loc@Base 5.1.0
++ t1_MInvert@Base 5.1.0
++ t1_MMultiply@Base 5.1.0
++ t1_MoreWorkArea@Base 5.1.0
++ t1_MoveEdges@Base 5.1.0
++ t1_PathDelta@Base 5.1.0
++ t1_PathSegment@Base 5.1.0
++ t1_PathXform@Base 5.1.0
++ t1_Permanent@Base 5.1.0
++ t1_Phantom@Base 5.1.0
++ t1_Pragmatics@Base 5.1.0
++ t1_ProcessHint@Base 5.1.0
++ t1_PseudoSpace@Base 5.1.0
++ t1_QueryBounds@Base 5.1.0
++ t1_QueryLoc@Base 5.1.0
++ t1_QueryPath@Base 5.1.0
++ t1_QuerySpace@Base 5.1.0
++ t1_RegionBounds@Base 5.1.0
++ t1_Reverse@Base 5.1.0
++ t1_ReverseSubPaths@Base 5.1.0
++ t1_Scale@Base 5.1.0
++ t1_Snap@Base 5.1.0
++ t1_SortSwath@Base 5.1.0
++ t1_StepBezier@Base 5.1.0
++ t1_StepLine@Base 5.1.0
++ t1_SubLoc@Base 5.1.0
++ t1_SwathUnion@Base 5.1.0
++ t1_TermImager@Base 5.1.0
++ t1_Transform@Base 5.1.0
++ t1_TypeErr@Base 5.1.0
++ t1_UnConvert@Base 5.1.0
++ t1_UnJumble@Base 5.1.0
++ t1_Unique@Base 5.1.0
++ t1_User@Base 5.1.0
++ t1_Xform@Base 5.1.0
++ t1_abort@Base 5.1.0
++ t1_get_abort_message@Base 5.1.0
++ t1lib_log_file@Base 5.1.0
++ t1lib_log_level@Base 5.1.0
++ tokenLength@Base 5.1.0
++ tokenMaxP@Base 5.1.0
++ tokenStartP@Base 5.1.0
++ tokenTooLong@Base 5.1.0
++ tokenType@Base 5.1.0
++ tokenValue@Base 5.1.0
++ vm_alloc@Base 5.1.0
++ vm_base@Base 5.1.0
++ vm_free@Base 5.1.0
++ vm_init@Base 5.1.0
++ vm_init_amount@Base 5.1.0
++ vm_init_count@Base 5.1.0
++ vm_next@Base 5.1.0
++ vm_size@Base 5.1.0
++ vm_used@Base 5.1.0
++ wsoffsetX@Base 5.1.0
++ wsoffsetY@Base 5.1.0
++ wsset@Base 5.1.0
++ xiStub@Base 5.1.0
++ xiTemporary@Base 5.1.0
++libt1x.so.5 libt1-5 #MINVER#
++ T1_AASetCharX@Base 5.1.1
++ T1_AASetRectX@Base 5.1.1
++ T1_AASetStringX@Base 5.1.1
++ T1_ComputeAAColorsX@Base 5.1.1
++ T1_LogicalPositionX@Base 5.1.1
++ T1_SetCharX@Base 5.1.1
++ T1_SetRectX@Base 5.1.1
++ T1_SetStringX@Base 5.1.1
++ T1_SetX11Params@Base 5.1.1
++ T1_XImageFromGlyph@Base 5.1.1
+--- t1lib-5.1.2.orig/debian/rules
++++ t1lib-5.1.2/debian/rules
+@@ -0,0 +1,22 @@
++#!/usr/bin/make -f
++
++include /usr/share/cdbs/1/rules/debhelper.mk
++include /usr/share/cdbs/1/class/autotools.mk
++include /usr/share/cdbs/1/rules/patchsys-quilt.mk
++
++export LDFLAGS := -Wl,--as-needed
++
++DEB_MAKE_BUILD_TARGET   := without_doc
++DEB_MAKE_INSTALL_TARGET := install prefix=$(CURDIR)/debian/tmp/usr
++DEB_INSTALL_DOCS_ALL    += debian/README.Debian
++
++binary-post-install/libt1-5 ::
++	rm -rf debian/libt1-5-dbg/usr/lib/debug/usr/bin/
++binary-post-install/libt1-5-dbg ::
++	rm -rf debian/libt1-5-dbg/usr/lib/debug/usr/bin/
++binary-post-install/libt1-dev ::
++	rm -rf debian/libt1-5-dbg/usr/lib/debug/usr/bin/
++binary-post-install/libt1-doc ::
++	rm -rf debian/libt1-5-dbg/usr/lib/debug/usr/bin/
++binary-post-install/t1lib-bin ::
++	rm -rf debian/libt1-5-dbg/usr/lib/debug/usr/bin/
+--- t1lib-5.1.2.orig/debian/compat
++++ t1lib-5.1.2/debian/compat
+@@ -0,0 +1 @@
++7
+--- t1lib-5.1.2.orig/debian/t1lib-bin.postinst
++++ t1lib-5.1.2/debian/t1lib-bin.postinst
+@@ -0,0 +1,8 @@
++#!/bin/sh
++set -e
++
++if [ ! -f /etc/t1lib/t1lib.config ]; then
++    /usr/sbin/t1libconfig
++fi
++
++#DEBHELPER#
+--- t1lib-5.1.2.orig/debian/libt1-dev.install
++++ t1lib-5.1.2/debian/libt1-dev.install
+@@ -0,0 +1,4 @@
++debian/tmp/usr/include/*
++debian/tmp/usr/lib/*.so
++debian/tmp/usr/lib/*.la
++debian/tmp/usr/lib/*.a
+--- t1lib-5.1.2.orig/debian/changelog
++++ t1lib-5.1.2/debian/changelog
+@@ -0,0 +1,414 @@
++t1lib (5.1.2-3) unstable; urgency=low
++
++  * New Maintainer (Closes: #430611) 
++  * Solved some hyphen-used-as-minus-sign in FontDatabase.5
++  * Reformated debian/copyrigth
++  * Added symbols control file 
++
++ -- Ruben Molina <rmolina@udea.edu.co>  Wed, 23 Jul 2008 20:24:22 -0500
++
++t1lib (5.1.2-2) unstable; urgency=low
++
++  * Add a package with debugging information.
++
++ -- Torsten Werner <twerner@debian.org>  Sat, 08 Mar 2008 10:21:43 +0100
++
++t1lib (5.1.2-1) unstable; urgency=low
++
++  * new upstream release
++  * Correct debian/watch.
++  * Remove patch cve-2007-4033.diff because it has been integrated upstream.
++  * Remove parts of patch segfault.diff that have been integrated upstream.
++  * Do not apply the remaining segfault.diff because it does not look safe but
++    keep the patch as a reminder that something was broken in the past.
++
++ -- Torsten Werner <twerner@debian.org>  Sat, 08 Mar 2008 10:07:54 +0100
++
++t1lib (5.1.1-5) unstable; urgency=low
++
++  * Replace Build-Depends-Indep by Build-Depends again.
++
++ -- Torsten Werner <twerner@debian.org>  Tue, 08 Jan 2008 21:34:25 +0100
++
++t1lib (5.1.1-4) unstable; urgency=low
++
++  * Add Build-Depends-Indep: libxt-dev. (Closes: #459754)
++
++ -- Torsten Werner <twerner@debian.org>  Tue, 08 Jan 2008 20:29:01 +0100
++
++t1lib (5.1.1-3) unstable; urgency=low
++
++  * Replace static changes of upstream files by quilt patches as requested by
++    Fedora developers.
++  * Remove postinst that removed the old /usr/doc symlink.
++  * Remove preinst that removed the old /usr/share/doc/t1lib-bin symlink.
++  * Rename menu.t1lib-bin to t1lib-bin.menu to make sure the menu file gets
++    installed.
++  * Update menu file to conform to current menu policy.
++  * Install documentation with dh_installdocs instead of dh_install and some
++    other minor cleanups.
++  * Switch to cdbs.
++  * Fix versioned Build-Depends: debhelper (>= 5).
++  * Move some Build-Depends to Build-Depends-Indep.
++  * Apply two patches provided by Patrice Dumas:
++    - Update t1libconfig's font search.
++    - Fixes a segfault.
++  * Integrate another patch that fixes a segfault. (Closes: #313236)
++
++ -- Torsten Werner <twerner@debian.org>  Sun, 06 Jan 2008 20:50:19 +0100
++
++t1lib (5.1.1-2) unstable; urgency=low
++
++  * Add Depends: libxaw7-dev to -dev package.
++  * Switch to DH_COMPAT = 5.
++  * Update Vcs headers in debian/control.
++  * Change Standards-Version: 3.7.3.
++  * Do not link with unneeded libraries.
++  * Add LDFLAGS=-Wl,--as-needed.
++
++ -- Torsten Werner <twerner@debian.org>  Fri, 21 Dec 2007 22:54:43 +0100
++
++t1lib (5.1.1-1) unstable; urgency=low
++
++  * new upstream version (Closes: #418664)
++  * Add XS-Vcs-* header to debian/control.
++  * Update Standards-Version to 3.7.2 (no changes).
++  * Remove Depends: libc6-dev. (Closes: #446375).
++  * Change Maintainer to myself.
++  * Replace ${Source-Version} by ${binary:Version}.
++  * Do not ignore errors of 'make distclean'.
++
++ -- Torsten Werner <twerner@debian.org>  Sat, 13 Oct 2007 14:46:23 +0200
++
++t1lib (5.1.0-3) unstable; urgency=low
++
++  * Apply patch from Artur R. Czechowski to fix CVE-2007-4033.
++    (Closes: #439927)
++
++ -- Torsten Werner <twerner@debian.org>  Mon, 17 Sep 2007 23:25:45 +0200
++
++t1lib (5.1.0-2) unstable; urgency=low
++
++  * Upload to unstable
++  * Bump-up Standards-Version to 3.6.2 (no changes required)
++  * Torsten Werner <twerner@debian.org> is sponsoring the package
++
++ -- Artur R. Czechowski <arturcz@hell.pl>  Sat,  6 Aug 2005 20:11:51 +0200
++
++t1lib (5.1.0-1) experimental; urgency=low
++
++  * New upstream release
++  * README.t1lib-5.0.2 replaced with README.t1lib-5.1.0
++  * README.win32 is no longer installed
++  * Removed misleading information from README.Debian
++  * Replace -V with -V 'libt1-5 (>= 5.0.2)' for dh_makeshlibs in debian/rules
++  * Remove some commented stuff from debian/rules
++  * Torsten Werner <twerner@debian.org> is sponsoring the package
++
++ -- Artur R. Czechowski <arturcz@hell.pl>  Sat,  4 Jun 2005 22:12:43 +0200
++
++t1lib (5.0.2-3) unstable; urgency=low
++
++  * Update libtool (Closes: #246753)
++  * Build-Depends on individual library instead dummy xlibs-dev
++  * Added dependencies to -dev package (Closes: #249973)
++  * Thanks to Christopher L Cheney for above patches
++  * Add -V to dh_makeshlibs to make a versioned dependencies on this library
++  * Torsten Werner <twerner@debian.org> is sponsoring the package
++
++ -- Artur R. Czechowski <arturcz@hell.pl>  Sun, 23 May 2004 01:02:02 +0200
++
++t1lib (5.0.2-2) unstable; urgency=low
++
++  * change distribution to unstable
++  * Torsten Werner <twerner@debian.org> is sponsoring the package
++
++ -- Artur R. Czechowski <arturcz@hell.pl>  Sun, 18 Apr 2004 13:07:23 +0200
++
++t1lib (5.0.2-1) experimental; urgency=low
++
++  * New upstream release (Closes: #243916)
++    - fixed some crashes (Closes: #242570, #243378)
++  * Reference to README.t1lib-5.0.2 instead -5.0.0 in some debian/ files
++  * Torsten Werner <twerner@debian.org> is sponsoring the package
++
++ -- Artur R. Czechowski <arturcz@hell.pl>  Sat, 17 Apr 2004 19:22:09 +0200
++
++t1lib (5.0.0-5) unstable; urgency=low
++
++  * debian/rules: documentation is build from binary-indep (Closes: #230386)
++  * debian/watch has been added
++  * Torsten Werner <twerner@debian.org> is sponsoring the package
++
++ -- Artur R. Czechowski <arturcz@hell.pl>  Sat, 21 Feb 2004 20:19:38 +0100
++
++t1lib (5.0.0-4) unstable; urgency=low
++
++  * Added missing files in NEWS.Debian
++
++ -- Artur R. Czechowski <arturcz@hell.pl>  Wed, 21 Jan 2004 00:27:24 +0100
++
++t1lib (5.0.0-3) unstable; urgency=low
++
++  * New release uploaded to unstable (finaly closes: #185097, #216501)
++  * Unleash it to allow to migrate to testing (Closes: #221198)
++  * libt1-dev and t1lib-dev conflict with each other,
++  * libt1-dev conflicts with t1lib1-dev to smooth upgrade from t1lib 1.3.1-6
++  * t1lib-bin provides/conflicts/replaces t1lib1-bin to smooth upgrade from
++    t1lib 1.3.1-6
++  * Some README.* files in libt1-dev
++  * Applied patch which fixes memory access bug (see #224314 for details)
++  * Torsten Werner <twerner@debian.org> is sponsoring the package
++
++ -- Artur R. Czechowski <arturcz@hell.pl>  Sun, 18 Jan 2004 03:00:05 +0100
++
++t1lib (5.0.0-2) experimental; urgency=low
++
++  * rename source package to t1lib
++  * rename binary packages:
++    + libt1-5 -> libt1-dev
++    + t1lib5-bin -> t1lib-bin
++    + libt1-5-doc -> libt1-doc
++  * rationale for all above:
++    http://lists.debian.org/debian-devel/2003/debian-devel-200311/msg01083.html
++    and rest of this thread
++  * linking libt1x with X libraries to avoid undefined symbols (see #220111)
++  * clearing independency of X11 in README.Debian
++  * removed all tracks of t1lib0 (Conflict, Replaces, etc)
++  * Torsten Werner <twerner@debian.org> is sponsoring the package
++
++ -- Artur R. Czechowski <arturcz@hell.pl>  Wed, 24 Dec 2003 01:50:37 +0100
++
++t1lib5 (5.0.0-1) experimental; urgency=low
++
++  * New upstream release (Closes: #185097, #216501)
++  * This release is binary incompatible with the previous one.
++  * t1lib-bin and t1lib-dev are virtual packages now
++  * removed weird ``dbl'' from configure - typo in upstream configure.in
++  * there is no necessity to conflict current -doc with the other ones
++  * library, devel and documentation package is libt1-5{,-dev,-doc} to be
++    consistent with Debian Policy 8.1
++  * do not anymore copy config.{sub,guess} automagically
++  * update ac-tools/config.{sub,guess} to 20031007
++  * Torsten Werner <twerner@debian.org> is sponsoring the package
++
++ -- Artur R. Czechowski <arturcz@hell.pl>  Sun,  9 Nov 2003 15:16:51 +0100
++
++t1lib (1.3.1-4) unstable; urgency=low
++
++  * New Maintainer, Adopted Package (Closes: #189694)
++  * Prepare for migration to t1lib 5.x:
++    - all packages renamed to t1lib1{,-foo}
++    - empty packages t1lib-bin and t1lib-dev depending on t1lib1-bin
++      and t1lib1-dev
++  * Packaging from scratch using debhelper, Standards-Version is 3.6.1.0 now
++  * Remove non-existent xlib6g-dev from Build-Depends
++  * Updated README.Debian
++  * Remove symlinks from /usr/doc/t1lib*
++  * Only t1lib1-bin contains /etc/t1lib directory
++  * t1lib-dev has been split into two packages: t1lib1-dev and t1lib1-doc
++  * t1lib1-bin: change manual section for type1afm from 8 to 1
++  * t1lib1-bin: create files in /etc/t1lib if don't exist (Closes: #58275)
++  * t1lib1-bin: remove symlink /usr/share/doc/t1lib-bin -> t1lib1 if exists
++  * Torsten Werner <twerner@debian.org> is sponsoring the package
++
++ -- Artur R. Czechowski <arturcz@hell.pl>  Sun,  2 Nov 2003 03:47:51 +0100
++
++t1lib (1.3.1-3) unstable; urgency=low
++
++  * Change t1lib-dev's section from "devel" to "libdevel" (thanks, Katie!)
++
++ -- Adam Conrad <adconrad@0c3.net>  Mon, 18 Aug 2003 22:42:17 -0600
++
++t1lib (1.3.1-2) unstable; urgency=low
++
++  * Set maintainer to QA, as this package was orphaned months ago (see #189694)
++  * Change "make" to "make without_doc" and remove build-dep on
++    tetex-bin (closes: #192291, #192290)
++  * Change libxaw-dev build-dep to libxaw7-dev, so we are asking for a real
++    package, rather than a virtual (closes: #170012)
++  * lib/Makefile.in changes (closes: #193757)
++    - add "-lm" to libt1.la target
++    - add "-L@top_srcdir@/lib/.libs/ -lt1" to libt1x.la target
++
++ -- Adam Conrad <adconrad@0c3.net>  Mon, 18 Aug 2003 21:50:22 -0600
++
++t1lib (1.3.1-1) unstable; urgency=low
++
++  * New upstream version.  (Closes: #127619,#127618)
++
++ -- David Huggins-Daines <dhd@debian.org>  Thu,  3 Jan 2002 21:53:29 -0500
++
++t1lib (1.2-1) unstable; urgency=low
++
++  * New upstream version.
++
++ -- David Huggins-Daines <dhd@debian.org>  Wed, 22 Aug 2001 21:16:36 -0400
++
++t1lib (1.1.1-2.2) unstable; urgency=low
++
++  * NMU
++  * debian/rules: if LD_LIBRARY_PATH is already set, append to it, so
++    builds under fakeroot will work (Closes: #104046)
++
++ -- Branden Robinson <branden@debian.org>  Fri, 10 Aug 2001 04:57:50 -0500
++
++t1lib (1.1.1-2.1) unstable; urgency=low
++
++  * NMU, with updated config.{guess,sub} for newer architectures
++
++ -- Randolph Chung <tausq@debian.org>  Sat,  7 Jul 2001 01:01:51 -0600
++
++t1lib (1.1.1-2) unstable; urgency=high
++
++  * Yow!  Major upstream weirdness.  Do *not* try to print the documentation
++    when building...  Closes: #94660
++
++ -- David Huggins-Daines <dhd@debian.org>  Fri, 20 Apr 2001 20:35:49 -0400
++
++t1lib (1.1.1-1) unstable; urgency=low
++
++  * New upstream version.  Closes: #94627 (why did I never get this bug
++    report in the first place?)
++
++ -- David Huggins-Daines <dhd@debian.org>  Fri, 20 Apr 2001 11:16:15 -0400
++
++t1lib (1.0.1-2) unstable; urgency=low
++
++  * Recompile with new XFree86 libraries and glibc.
++
++ -- David Huggins-Daines <dhd@debian.org>  Wed, 24 Jan 2001 22:33:43 -0500
++
++t1lib (1.0.1-1) unstable; urgency=low
++
++  * New upstream version.  Closes: #69689
++
++ -- David Huggins-Daines <dhd@debian.org>  Thu,  9 Nov 2000 00:29:06 -0500
++
++t1lib (1.0-2) frozen unstable; urgency=low
++
++  * Use dpkg-architecture to supply a target architecture name to
++    configure, should fix the compile problems on Alpha and ARM for good.
++    (closes:#57839)
++
++ -- David Huggins-Daines <dhd@eradicator.org>  Wed,  1 Mar 2000 21:22:49 -0500
++
++t1lib (1.0-1) unstable; urgency=low
++
++  * New upstream version.
++  * Twiddled package names to make more sense.
++  * Move back to priority optional to satisfy dependencies of xpdf and
++    php3.
++  * Moved .la files to t1lib-dev.  Added versioned Replaces: field in the
++    control file to cope with potato-to-potato upgrades (the t1lib0
++    packages in slink were not buggy in this way)
++  * t1libconfig and associated manual pages (FontDataBase.5,
++    t1libconfig.8) are now in the t1lib-bin package, for much the same
++    reason.  Unfortunately this Replaces: field cannot be versioned.
++  * The t1lib packages no longer manage the contents of /etc/t1lib/.  In
++    the near future, t1lib1 may have a debconf interface for doing so.
++    The t1lib.config and FontDataBase were never used by any programs that
++    linked with t1lib anyway, thankfully.
++
++ -- David Huggins-Daines <dhd@eradicator.org>  Sun,  2 Jan 2000 03:02:30 -0500
++
++t1lib0 (0.9.2-1) unstable; urgency=low
++
++  * New upstream version.
++  * Being more intelligent in t1libconfig to avoid postinst-lossage.
++    Fixes: #44095
++  * Updated for FHS compliance.
++
++ -- David Huggins-Daines <dhd@debian.org>  Fri,  8 Oct 1999 15:27:46 -0400
++
++t1lib0 (0.9.1-4) unstable; urgency=medium
++
++  * Updated the shlibs file since it appears that programs compiled
++    against 0.9.1 won't work with 0.9 (though the other way around does
++    work).  Fixes: #43215, #43231
++  * Removed ARCH bogosity and updated config.sub and config.guess
++    (upstream maintainer will be notified)
++
++ -- David Huggins-Daines <dhd@debian.org>  Sat, 21 Aug 1999 01:23:39 -0400
++
++t1lib0 (0.9.1-3) unstable; urgency=low
++
++  * Conditionalize that ARCH thing, or the Hurd people will kill me.
++
++ -- David Huggins-Daines <dhd@debian.org>  Sat,  3 Jul 1999 13:56:12 -0400
++
++t1lib0 (0.9.1-2) unstable; urgency=low
++
++  * Oops.  T1lib installs a dummy config file.  We remove this before
++    building the package (because we generate our own).  Also, the preinst
++    has to compensate for the past brokenness by saving it before an
++    upgrade.
++
++ -- David Huggins-Daines <dhd@debian.org>  Fri,  2 Jul 1999 16:13:46 -0400
++
++t1lib0 (0.9.1-1) unstable; urgency=low
++
++  * New upstream version.
++  * Moved back to extra, because that's the way the winds are blowing.
++  * Added ARCH variable to debian/rules to work around strange
++    architecture detection on Alpha.
++
++ -- David Huggins-Daines <dhd@debian.org>  Fri,  2 Jul 1999 14:58:32 -0400
++
++t1lib0 (0.9-1) unstable; urgency=low
++
++  * New upstream version
++
++ -- David Huggins-Daines <dhd@debian.org>  Thu, 10 Jun 1999 23:00:12 -0400
++
++t1lib0 (0.8.1-1) unstable; urgency=low
++
++  * New upstream version.  (fixes bug #31549)
++  * Upstream move to libtool has made debian/rules a lot less contorted,
++    and slimmed up the diff considerably.  Thanks!
++  * I'm now uploading m68k versions as well.
++  * Fixed "confdif" typo in t1libconfig (oops!)
++  * This release breaks binary and source compatibility.  Bumping the
++    soname seems a bit extreme, since there is only one Debian package
++    (gglyph) which depends on this, and I'm simultaneously uploading a
++    fixed version.
++
++ -- David Huggins-Daines <dhd@debian.org>  Wed, 24 Feb 1999 17:16:41 -0500
++
++t1lib0 (0.7.1-5) unstable; urgency=low
++
++  * Changed debian/rules to remove debian/files on clean. (fixes bug #26907)
++  * Changed t1libconfig to allow installation </dev/null (fixes bug #27609)
++
++ -- David Huggins-Daines <dhd@debian.org>  Fri, 16 Oct 1998 20:12:02 -0400
++
++t1lib0 (0.7.1-4) unstable; urgency=low
++
++  * Changed debian/rules not to use debhelper, to fix PowerPC and Alpha compile
++    problems and (hopefully) make the purists happy :)
++  * Upgraded priority to Optional, since it doesn't conflict with or break
++    anything, and is relatively stable.
++
++ -- David Huggins-Daines <dhd@debian.org>  Fri, 18 Sep 1998 18:36:07 -0400
++
++t1lib0 (0.7.1-3) unstable; urgency=low
++
++  * Changed "read" to "read foo" in t1libconfig to make it more sh-friendly.
++  * Minor change to debian/rules (fixes bug #25501)
++
++ -- David Huggins-Daines <dhd@debian.org>  Fri,  7 Aug 1998 13:31:28 -0400
++
++t1lib0 (0.7.1-2) unstable; urgency=low
++
++  * Patched lib/t1lib/t1finfo.c to fix segfault problems with some fonts.
++  * Fixed the URLs and info in copyright and README.Debian.
++
++ -- David Huggins-Daines <dhd@debian.org>  Tue, 21 Jul 1998 16:01:03 -0400
++
++t1lib0 (0.7.1-1) unstable; urgency=low
++
++  * Initial release.
++
++ -- David Huggins-Daines <dhd@debian.org>  Thu, 16 Jul 1998 22:07:08 -0400 
++
++
+--- t1lib-5.1.2.orig/debian/copyright
++++ t1lib-5.1.2/debian/copyright
+@@ -0,0 +1,94 @@
++This package was debianized by David Huggins-Daines <dhd@debian.org> on
++Fri, 19 Jun 1998 20:01:01 -0400.  It has been also maintained by Artur 
++R. Czechowski <arturcz@hell.pl> and Torsten Werner <twerner@debian.org>.
++
++It was downloaded from ftp://sunsite.unc.edu/pub/Linux/libs/graphics/
++
++Upstream Author:
++
++    Rainer Menzner <Rainer.Menzner@web.de>
++
++Copyright:
++
++    Copyright (C) 1996-2003 Rainer Menzner
++
++License:
++
++    This package is free software; you can redistribute it and/or
++    modify it under the terms of the GNU Lesser General Public
++    License as published by the Free Software Foundation; either
++    version 2 of the License, or (at your option) any later version.
++
++    This package 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
++    Lesser General Public License for more details.
++
++    You should have received a copy of the GNU Lesser General Public
++    License along with this package; 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 Lesser General
++Public License can be found in `/usr/share/common-licenses/LGPL'.
++
++The Debian packaging is (C) 2008, Ruben Molina <rmolina@udea.edu.co> and
++is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
++
++Please note that there are parts of t1lib that are subject to other licenses:
++- The parseAFM-package is copyrighted by Adobe Systems Inc.
++- The type1 rasterizer is copyrighted by IBM and the X11-consortium.
++
++(from lib/t1lib/parseAFM.c)
++/*
++ * (C) 1988, 1989, 1990 by Adobe Systems Incorporated. All rights reserved.
++ *
++ * This file may be freely copied and redistributed as long as:
++ *   1) This entire notice continues to be included in the file, 
++ *   2) If the file has been modified in any way, a notice of such
++ *      modification is conspicuously indicated.
++ *
++ * PostScript, Display PostScript, and Adobe are registered trademarks of
++ * Adobe Systems Incorporated.
++ * 
++ * ************************************************************************
++ * THE INFORMATION BELOW IS FURNISHED AS IS, IS SUBJECT TO CHANGE WITHOUT
++ * NOTICE, AND SHOULD NOT BE CONSTRUED AS A COMMITMENT BY ADOBE SYSTEMS
++ * INCORPORATED. ADOBE SYSTEMS INCORPORATED ASSUMES NO RESPONSIBILITY OR 
++ * LIABILITY FOR ANY ERRORS OR INACCURACIES, MAKES NO WARRANTY OF ANY 
++ * KIND (EXPRESS, IMPLIED OR STATUTORY) WITH RESPECT TO THIS INFORMATION, 
++ * AND EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES OF MERCHANTABILITY, 
++ * FITNESS FOR PARTICULAR PURPOSES AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
++ * ************************************************************************
++ */
++
++(from lib/type1/type1.c)
++/* $XConsortium: type1.c,v 1.5 91/10/10 11:20:06 rws Exp $ */
++/* Copyright International Business Machines, Corp. 1991
++ * All Rights Reserved
++ * Copyright Lexmark International, Inc. 1991
++ * All Rights Reserved
++ * Portions Copyright (c) 1990 Adobe Systems Incorporated.
++ * All Rights Reserved
++ *
++ * License to use, copy, modify, and distribute this software and its
++ * documentation for any purpose and without fee is hereby granted,
++ * provided that the above copyright notice appear in all copies and that
++ * both that copyright notice and this permission notice appear in
++ * supporting documentation, and that the name of IBM or Lexmark or Adobe
++ * not be used in advertising or publicity pertaining to distribution of
++ * the software without specific, written prior permission.
++ *
++ * IBM, LEXMARK, AND ADOBE PROVIDE THIS SOFTWARE "AS IS", WITHOUT ANY
++ * WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT
++ * LIMITED TO ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
++ * PARTICULAR PURPOSE, AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  THE
++ * ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE, INCLUDING
++ * ANY DUTY TO SUPPORT OR MAINTAIN, BELONGS TO THE LICENSEE.  SHOULD ANY
++ * PORTION OF THE SOFTWARE PROVE DEFECTIVE, THE LICENSEE (NOT IBM,
++ * LEXMARK, OR ADOBE) ASSUMES THE ENTIRE COST OF ALL SERVICING, REPAIR AND
++ * CORRECTION.  IN NO EVENT SHALL IBM, LEXMARK, OR ADOBE BE LIABLE FOR ANY
++ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
++ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
++ * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
++ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ */
+--- t1lib-5.1.2.orig/debian/t1lib-bin.menu
++++ t1lib-5.1.2/debian/t1lib-bin.menu
+@@ -0,0 +1,2 @@
++?package(t1lib-bin): needs="X11" section="Applications/Viewers" \
++  title="XGlyph" command="/usr/bin/xglyph"
+--- t1lib-5.1.2.orig/debian/watch
++++ t1lib-5.1.2/debian/watch
+@@ -0,0 +1,3 @@
++version=3
++ftp://sunsite.unc.edu/pub/Linux/libs/graphics/t1lib-(.*)\.tar\.gz \
++  debian debian/orig-tar.sh
+--- t1lib-5.1.2.orig/debian/libt1-5.docs
++++ t1lib-5.1.2/debian/libt1-5.docs
+@@ -0,0 +1,2 @@
++README.t1lib-*
++README.t1python
+--- t1lib-5.1.2.orig/debian/t1lib-bin.install
++++ t1lib-5.1.2/debian/t1lib-bin.install
+@@ -0,0 +1,2 @@
++debian/t1libconfig usr/sbin
++debian/tmp/usr/bin/*
+--- t1lib-5.1.2.orig/debian/README.Debian
++++ t1lib-5.1.2/debian/README.Debian
+@@ -0,0 +1,25 @@
++t1lib for Debian
++----------------
++
++This package has been created from scratch using debhelper. It contains
++four binary packages:
++ * shared library - libt1-5
++ * development files - libt1-5-dev
++ * font-related binary utils - t1lib5-bin
++ * documentation - libt1-5-doc
++
++However you can read in upstream's README that t1lib is completely independent
++of X11, you should know that package provides also libt1x library which
++contains X11 pixmap support. That's why it requires a bunch of X-libraries
++installed. If you consider this as a bad behavior, please discuss it on
++debian-devel list.
++
++NOTE: The old 't1lib0' package will *remove* /etc/t1lib/ and its
++contents if you purge it. Since this package is now obsolete, there
++is no good solution for this; you must back up your font database and
++config file if you wish to preserve them. Sorry...
++
++This package has been previously maintained by David Huggins-Daines, great
++thanks to him for his good job.
++
++ -- Artur R. Czechowski <arturcz@hell.pl>, Tue, 11 Nov 2003 13:31:48 +0100
+--- t1lib-5.1.2.orig/debian/orig-tar.sh
++++ t1lib-5.1.2/debian/orig-tar.sh
+@@ -0,0 +1,11 @@
++#!/bin/sh -e
++
++# called by uscan with '--upstream-version' <version> <file>
++
++# move to directory 'tarballs'
++if [ -r .svn/deb-layout ]; then
++  . .svn/deb-layout
++  mv $3 $origDir
++  echo "moved $3 to $origDir"
++fi
++
+--- t1lib-5.1.2.orig/debian/patches/series
++++ t1lib-5.1.2/debian/patches/series
+@@ -0,0 +1,4 @@
++no-docs.diff
++no-config.diff
++lib-cleanup.diff
++#segfault.diff
+--- t1lib-5.1.2.orig/debian/patches/no-config.diff
++++ t1lib-5.1.2/debian/patches/no-config.diff
+@@ -0,0 +1,57 @@
++do not install a static configuration file
++
++Index: t1lib-5.1.1/lib/Makefile.in
++===================================================================
++--- t1lib-5.1.1.orig/lib/Makefile.in	2008-01-05 19:13:57.000000000 +0100
+++++ t1lib-5.1.1/lib/Makefile.in	2008-01-05 19:14:18.000000000 +0100
++@@ -161,17 +161,17 @@
++ install: dummy
++ 	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
++ 	$(MKINSTALLDIRS) $(DESTDIR)$(includedir)
++-	$(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@
+++#	$(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@
++ 	$(LIBTOOL) --mode=install \
++ 		$(INSTALL_DATA) $(MAIN_TARGET) $(DESTDIR)$(libdir)
++ 	$(LIBTOOL) --mode=install \
++ 		$(INSTALL_DATA) $(MAIN_HEADER) $(DESTDIR)$(includedir)
++-	if (test -f $(DESTDIR)@T1LIB_DATA_DIR@/t1lib.config) \
++-	then \
++-	  echo "Alert: Global configuration file exists, installation skipped!"; \
++-	else \
++-	  $(LIBTOOL) --mode=install $(INSTALL_DATA) t1lib.config $(DESTDIR)@T1LIB_DATA_DIR@; \
++-	fi;
+++#	if (test -f $(DESTDIR)@T1LIB_DATA_DIR@/t1lib.config) \
+++#	then \
+++#	  echo "Alert: Global configuration file exists, installation skipped!"; \
+++#	else \
+++#	  $(LIBTOOL) --mode=install $(INSTALL_DATA) t1lib.config $(DESTDIR)@T1LIB_DATA_DIR@; \
+++#	fi;
++ 
++ 
++ uninstall: dummy
++@@ -179,7 +179,7 @@
++ 	-$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libt1x.la
++ 	-$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(includedir)/t1lib.h
++ 	-$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(includedir)/t1libx.h
++-	-$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)@T1LIB_DATA_DIR@/t1lib.config
+++#	-$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)@T1LIB_DATA_DIR@/t1lib.config
++ 
++ 
++ dummy:
++Index: t1lib-5.1.1/xglyph/xglyph.c
++===================================================================
++--- t1lib-5.1.1.orig/xglyph/xglyph.c	2008-01-05 19:16:30.000000000 +0100
+++++ t1lib-5.1.1/xglyph/xglyph.c	2008-01-05 19:16:40.000000000 +0100
++@@ -526,9 +526,12 @@
++   
++   /* Check for environment entry. If not set, set it to current
++      directory so that configuration file is found there */
+++  /* It violates the Debian Policy */
+++#if 0
++   if (getenv("T1LIB_CONFIG")==NULL){
++     putenv( "T1LIB_CONFIG=./t1lib.config");
++   }
+++#endif
++ 
++   
++   /* Set log-level: */
+--- t1lib-5.1.2.orig/debian/patches/lib-cleanup.diff
++++ t1lib-5.1.2/debian/patches/lib-cleanup.diff
+@@ -0,0 +1,59 @@
++do not link against libraries that are not needed
++
++Index: t1lib-5.1.1/lib/Makefile.in
++===================================================================
++--- t1lib-5.1.1.orig/lib/Makefile.in	2008-01-05 19:17:21.000000000 +0100
+++++ t1lib-5.1.1/lib/Makefile.in	2008-01-05 19:17:38.000000000 +0100
++@@ -24,7 +24,7 @@
++ X_LIBS    = @X_LIBS@
++ TOPSRC    = @top_srcdir@
++ XPM_LIB   = -lXpm
++-XLIB      = @X_PRE_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@
+++XLIB      = -lX11
++ LDFLAGS   = @LDFLAGS@
++ LDLIBS    = @LDLIBS@
++ AR        = ar rc
++@@ -137,7 +137,7 @@
++ 	$(LIBTOOL) --mode=link \
++ 		$(CC) $(LDFLAGS) -o $@ $(T1LIBX_OBJS) \
++ 	         -version-info @T1LIB_LT_CURRENT@:@T1LIB_LT_REVISION@:@T1LIB_LT_AGE@ \
++-	         libt1.la $(X_LIBS) $(XPM_LIB) $(XLIB)  -no-undefined -rpath $(libdir) 
+++	         libt1.la $(X_LIBS) $(XLIB)  -no-undefined -rpath $(libdir) 
++ 	cp t1lib/t1libx.h .
++ 
++ 
++Index: t1lib-5.1.1/type1afm/Makefile.in
++===================================================================
++--- t1lib-5.1.1.orig/type1afm/Makefile.in	2008-01-05 19:17:52.000000000 +0100
+++++ t1lib-5.1.1/type1afm/Makefile.in	2008-01-05 19:18:02.000000000 +0100
++@@ -70,7 +70,7 @@
++ 
++ type1afm: $(OBJS) ../lib/t1lib.h
++ 	$(LIBTOOL) --mode=link \
++-		$(CC) -o type1afm $(LDFLAGS) $(OBJS) $(T1LIB) $(LDLIBS)
+++		$(CC) -o type1afm $(LDFLAGS) $(OBJS) $(T1LIB)
++ 
++ .SUFFIXES: .lo
++ .c.lo:
++Index: t1lib-5.1.1/xglyph/Makefile.in
++===================================================================
++--- t1lib-5.1.1.orig/xglyph/Makefile.in	2008-01-05 19:18:15.000000000 +0100
+++++ t1lib-5.1.1/xglyph/Makefile.in	2008-01-05 19:18:31.000000000 +0100
++@@ -24,7 +24,7 @@
++ X_LIBS    = @X_LIBS@
++ TOPSRC    = @top_srcdir@
++ XPM_LIB   = -lXpm
++-XLIB      = @X_PRE_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@
+++XLIB      = -lX11 @X_EXTRA_LIBS@
++ LDFLAGS   = @LDFLAGS@
++ LDLIBS    = @LDLIBS@ 
++ AR        = ar rc
++@@ -65,7 +65,7 @@
++ 
++ T1LIB  = ../lib/libt1.la
++ T1LIBX = ../lib/libt1x.la
++-XAWLIB = -lXaw -lXt -lXmu
+++XAWLIB = -lXaw -lXt
++ 
++ 
++ all: xglyph
+--- t1lib-5.1.2.orig/debian/patches/no-docs.diff
++++ t1lib-5.1.2/debian/patches/no-docs.diff
+@@ -0,0 +1,34 @@
++We are using debhelper to install the documentation in the correct
++directory.
++
++Index: t1lib-5.1.1/doc/Makefile.in
++===================================================================
++--- t1lib-5.1.1.orig/doc/Makefile.in	2008-01-05 19:05:03.000000000 +0100
+++++ t1lib-5.1.1/doc/Makefile.in	2008-01-05 19:05:25.000000000 +0100
++@@ -89,16 +89,16 @@
++ 
++ 
++ install: dummy
++-	if (test -f t1lib_doc.ps) \
++-	then \
++-	  $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \
++-	  $(INSTALL_DATA) t1lib_doc.ps $(DESTDIR)@T1LIB_DATA_DIR@/doc; \
++-	fi;
++-	if (test -f t1lib_doc.pdf) \
++-	then \
++-	  $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \
++-	  $(INSTALL_DATA) t1lib_doc.pdf $(DESTDIR)@T1LIB_DATA_DIR@/doc; \
++-	fi;
+++#	if (test -f t1lib_doc.ps) \
+++#	then \
+++#	  $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \
+++#	  $(INSTALL_DATA) t1lib_doc.ps $(DESTDIR)@T1LIB_DATA_DIR@/doc; \
+++#	fi;
+++#	if (test -f t1lib_doc.pdf) \
+++#	then \
+++#	  $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \
+++#	  $(INSTALL_DATA) t1lib_doc.pdf $(DESTDIR)@T1LIB_DATA_DIR@/doc; \
+++#	fi;
++ 
++ 
++ uninstall: dummy
+--- t1lib-5.1.2.orig/debian/patches/segfault.diff
++++ t1lib-5.1.2/debian/patches/segfault.diff
+@@ -0,0 +1,62 @@
++This patch does not look safe and it has not been accepted upstream.
++Index: t1lib-5.1.1/lib/t1lib/t1base.c
++===================================================================
++--- t1lib-5.1.1.orig/lib/t1lib/t1base.c	2005-05-18 05:08:01.000000000 +0200
+++++ t1lib-5.1.1/lib/t1lib/t1base.c	2008-01-06 20:48:32.000000000 +0100
++@@ -455,7 +455,7 @@
++ 	   to test_for_t1_file() filename is substituted by an emty
++ 	   string if the file was not found: */
++ 	sprintf( err_warn_msg_buf, "Type 1 Font file %s.[pfa/pfb] not found (FontID=%d, SearchPath=%s)",
++-		 linebuf, m-1, T1_GetFileSearchPath(T1_PFAB_PATH));
+++		 linebuf, m-1, intT1_GetFileSearchPath(T1_PFAB_PATH));
++ 	if ((test_for_t1_file( &linebuf[0]))){
++ 	  T1_PrintLog( "intT1_scanFontDBase()", err_warn_msg_buf, T1LOG_WARNING);
++ 	  located=0;
++@@ -579,7 +579,7 @@
++ 	   to test_for_t1_file() filename is substituted by an emty
++ 	   string if the file was not found: */
++ 	sprintf( err_warn_msg_buf, "Type 1 Font file %s.[pfa/pfb] not found (FontID=%d, SearchPath=%s)",
++-		 linebuf, m-1, T1_GetFileSearchPath(T1_PFAB_PATH));
+++		 linebuf, m-1, intT1_GetFileSearchPath(T1_PFAB_PATH));
++ 	if ((test_for_t1_file( &linebuf[0]))){
++ 	  T1_PrintLog( "intT1_scanFontDBase()", err_warn_msg_buf, T1LOG_WARNING);
++ 	  located=0;
++Index: t1lib-5.1.1/lib/t1lib/t1env.c
++===================================================================
++--- t1lib-5.1.1.orig/lib/t1lib/t1env.c	2008-01-06 20:48:32.000000000 +0100
+++++ t1lib-5.1.1/lib/t1lib/t1env.c	2008-01-06 20:48:32.000000000 +0100
++@@ -807,6 +807,14 @@
++ 
++ }
++ 
+++/* intT1_GetFileSearchPath(): 
+++ call T1_GetFileSearchPath and truncate the line to avoid overflowing
+++ error buffers*/ 
+++char *intT1_GetFileSearchPath( int type)
+++{
+++   char  *res = T1_GetFileSearchPath(type);
+++   res[900] = 0;
+++}
++ 
++ /* T1_AddToFileSearchPath(): Add the specified path element to
++    the specified search path. If the existing path is the default path,
++Index: t1lib-5.1.1/lib/t1lib/t1env.h
++===================================================================
++--- t1lib-5.1.1.orig/lib/t1lib/t1env.h	2005-05-16 20:37:43.000000000 +0200
+++++ t1lib-5.1.1/lib/t1lib/t1env.h	2008-01-06 20:48:32.000000000 +0100
++@@ -35,6 +35,7 @@
++ int T1_SetFileSearchPath( int type, char *pathname);
++ int T1_AddToFileSearchPath( int pathtype, int mode, char *pathname);
++ char *T1_GetFileSearchPath( int type);
+++char *intT1_GetFileSearchPath( int type);
++ int T1_SetFontDataBase( char *filename);
++ int T1_AddFontDataBase( int mode, char *filename);
++ int T1_SetFontDataBaseXLFD( char *filename);
++@@ -49,6 +50,7 @@
++ extern int T1_SetFileSearchPath( int type, char *pathname);
++ extern int T1_AddToFileSearchPath( int pathtype, int mode, char *pathname);
++ extern char *T1_GetFileSearchPath( int type);
+++extern char *intT1_GetFileSearchPath( int type);
++ extern int T1_SetFontDataBase( char *filename);
++ extern int T1_AddFontDataBase( int mode, char *filename);
++ extern int T1_SetFontDataBaseXLFD( char *filename);
+--- t1lib-5.1.2.orig/debian/man/type1afm.1
++++ t1lib-5.1.2/debian/man/type1afm.1
+@@ -0,0 +1,34 @@
++.TH TYPE1AFM 1
++.SH NAME
++.B type1afm
++\- create a font metrics file from a Type 1 font file
++.SH SYNOPSIS
++.B type1afm
++[
++.BR \-l
++]
++.B fontfile
++[
++.B fontfile...
++]
++.SH DESCRIPTION
++This manual page was written for the Debian GNU/Linux distribution
++because the original program does not have a manual page.
++.PP
++.B type1afm
++reads in Type 1 font files specified on the command line, rasterizes
++them to 1000bp, and writes AFM (font metrics) files based on the
++observed metrics information.
++.PP
++The AFM file is created in the same directory as the font file, so be
++sure that you have write access there before running this program.
++.SH OPTIONS
++.TP
++.BR \-l
++Write a log file
++.SH SEE ALSO
++.BR getafm (1)
++.SH AUTHOR
++This manual page was David Huggins-Daines <dhd@debian.org>
++for the Debian GNU/Linux distribution (but may be used by others)
++
+--- t1lib-5.1.2.orig/debian/man/t1libconfig.8
++++ t1lib-5.1.2/debian/man/t1libconfig.8
+@@ -0,0 +1,57 @@
++.TH T1LIBCONFIG 8
++.SH NAME
++.B t1libconfig
++\- create the t1lib.config and FontDataBase files for t1lib
++.SH SYNOPSIS
++.B t1libconfig
++[
++.BR \-v\fP, \fB\-\-version
++]
++[
++.BR \-h\fP, \fB\-\-help
++]
++.B \-\-force
++]
++[
++.B fontdirectory...
++]
++.SH DESCRIPTION
++.B t1libconfig
++scans a list of directories for Type 1 fonts and font metric files,
++and generates a configuration file and font database file for the
++.B t1lib
++rasterizer library accordingly.  By default, it looks in all
++subdirectories of /usr/X11R6/lib/X11/fonts, and in
++/usr/lib/ghostscript.  Extra directories to search may be specified on 
++the command line.  The
++.B t1libconfig
++script tries not to scan the same directory twice (this is, however,
++not foolproof, since /usr/X11R6/lib/X11/fonts and /usr/lib/X11/fonts
++typically point to the same directory on GNU/Linux systems).
++.SH OPTIONS
++.TP
++.BR \-v\fP, \fB\-\-version
++Print the version of
++.B t1libconfig
++and exit.
++.TP
++.BR \-h\fP, \fB\-\-help
++Print help about usage and exit.
++.TP
++.B \-\-force
++Force the generation of new configuration files even if these files
++already exist on the system.
++.SH FILES
++.TP 25
++.B /etc/t1lib/t1lib.config
++Contains configuration information for t1lib, including
++colon-separated lists of paths to Type 1 font files and font metrics
++files, and the location of the default font database file
++.TP 25
++.B /etc/t1lib/FontDataBase
++Contains a list of the names of Type 1 font files to be used by t1lib.
++.SH AUTHOR
++David Huggins-Daines <dhd@debian.org>
++.SH SEE ALSO
++.BR FontDataBase (5)
++
+--- t1lib-5.1.2.orig/debian/man/xglyph.1
++++ t1lib-5.1.2/debian/man/xglyph.1
+@@ -0,0 +1,111 @@
++.TH XGLYPH 1
++.SH NAME
++xglyph \- demonstration program for the t1lib font rasterizer library.
++.SH SYNOPSIS
++.B xglyph
++[
++.B fontfile...
++]
++.SH "DESCRIPTION"
++This manual page documents briefly the
++.BR xglyph
++program.
++This manual page was written for the Debian GNU/Linux distribution
++because the original program does not have a manual page.
++.PP
++.B xglyph
++is a program which demonstrates the capabilities of the
++.B t1lib
++library.  It allows the user to view an arbitrary character or string
++rendered in the various ways pgossible with the library.  By default,
++it writes a log file named \fIt1lib.log\fR in the current directory.
++.PP
++If invoked with no arguments, it will attempt to read the global
++configuration file and font database.  It will also accept any number
++of filenames on the command line, in which case these are treated as
++font files to be loaded instead of the default font database.
++.SH "OPTIONS"
++.TP
++.BR \-\-help
++Shows a brief help text
++.TP
++.BR \-\-Help
++Shows a description of all options
++.TP
++.BR \-\-noGrid 
++Don't draw grid lines when displaying glyphs
++.TP
++.BR \-\-setPad 
++Set bitmap padding
++.TP
++.BR \-\-logError
++Log errors only
++.TP
++.BR \-\-logWarning
++Log errors and warnings
++.TP
++.BR \-\-logStatistic
++Log errors, warnings, and statistics
++.TP
++.BR \-\-logDebug
++Log just about everything
++.TP
++.BR \-\-ignoreForceBold
++Don't make pseudo-boldface glyphs
++.TP
++.BR \-\-ignoreFamilyAlignment
++.TP
++.BR \-\-ignoreHinting
++Ignore hints when scaling glyphs
++.TP
++.BR \-\-debugLine
++Show debugging info for line-drawing
++operations in the rasterizer
++.TP
++.BR \-\-debugRegion
++Show debugging info for region operations in
++the rasterizer
++.TP
++.BR \-\-debugPath
++Show debugging info for path operations in the
++rasterizer
++.TP
++.BR \-\-debugFont
++.TP
++.BR \-\-debugHint
++Show debugging info for hinting in the rasterizer.
++.TP
++.BR \-\-checkPerformance
++Do some simple performance tests while rasterizing.
++.TP
++.BR \-\-checkCopyFont
++Check that copying fonts works.
++.TP
++.BR \-\-checkConcatGlyphs
++Check that concatenating glyphs works.
++.TP
++.BR \-\-checkBadCharHandling
++.TP
++.BR \-\-checkDefaultEncoding
++Set a default encoding vector.
++.SH "ENVIRONMENT"
++In the Debian GNU/Linux version of this program, the environment
++variable
++.B T1LIB_CONFIG,
++if set, points to an alternate configuration
++file with which to initialize the library.
++.SH "SEE ALSO"
++.BR FontDataBase (5),
++.BR t1libconfig (8).
++.PP
++.B xglyph
++is much more fully documented in the LaTeX documentation that
++accompanies the upstream
++.B t1lib
++distribution.  This documentation is installed in PostScript and source
++formats with the t1lib-dev package in /usr/share/doc/t1lib-dev, and is
++also accessible through the dwww system.
++.SH AUTHOR
++This manual page was written by David Huggins-Daines
++<dhd@debian.org>, for the Debian GNU/Linux system (but may
++be used by others).
+--- t1lib-5.1.2.orig/debian/man/FontDatabase.5
++++ t1lib-5.1.2/debian/man/FontDatabase.5
+@@ -0,0 +1,77 @@
++.TH FONTDATABASE 5
++.SH NAME
++FontDataBase \- database of fonts accessible to t1lib.
++.SH DESCRIPTION
++This manual page has been written for the Debian GNU/Linux
++distribution.  It has been adapted from the documentation included in
++the upstream
++.B t1lib
++distribution.
++.PP
++.B /etc/t1lib/FontDataBase
++is a text file which contains, minimally, the basenames of Type 1 font 
++files to be made accessible to the
++.B t1lib
++font rasterizer library.  The format is intentionally similar to that
++of the
++.B fonts.dir
++and
++.B fonts.scale
++files used by X11.
++.PP
++Line 1 of this file contains a positive integer specifying the number
++of fonts declared in that file. This is as in the
++.B fonts.dir
++files of the X11 system.
++.PP
++All remaining lines contain declarations of one font each. The only
++thing taken from such a line is the last string (delimited by white
++space) in it. It is assumed to be a filename of the format
++\fIbasename\fR.\fIsomeextension\fR.
++.PP
++The \fIbasename\fR part is assumed to be the
++.BR basename (1)
++of a fontfile.  After the a string has been parsed, the
++.I extension
++is cut off and replaced in turn with
++.I .pfa
++and
++.I .pfb.
++The initialization routine tries to open a font file in
++its search path with one of the resulting filenames.
++.PP
++The remainder of the line, i.e., from beginning to the start of the
++filename string, is completely ignored and thus may contain
++information for other programs.
++.SH EXAMPLES
++Here is a minimal font database file for 4 fonts:
++.sp
++.nf
++4
++isvl.afm
++isvli.afm
++isvd.afm
++isvdi.afm
++.fi
++.PP
++This file is \fIminimal\fR, because it contains just the information
++needed, and nothing not needed by the library. 
++.PP
++Here is a more realistic example, which allows an application to match
++a fully qualified X11 fontname to a FontID in
++.B t1lib.
++This is also a valid font database file:
++.sp
++.nf
++4
++Souvenir Souvenir-Light       --- \-itc-souvenir-light-r-normal--#-0-0-0-p-0-iso8859-1 isvl.afm
++Souvenir Souvenir-LightItalic -*- \-itc-souvenir-light-i-normal--#-0-0-0-p-0-iso8859-1 isvli.afm
++          Souvenir-Demi       *-- \-itc-souvenir-demi-r-normal--#-0-0-0-p-0-iso8859-1 isvd.afm
++          Souvenir-DemiItalic **- \-itc-souvenir-demi-i-normal--#-0-0-0-p-0-iso8859-1 isvdi.afm
++.fi
++.PP
++.SH FILES
++.I /etc/t1lib/FontDataBase
++.SH "SEE ALSO"
++.BR mkfontdir (1x)
++
diff --git a/source/l/taglib-extras/taglib-extras.SlackBuild b/source/l/taglib-extras/taglib-extras.SlackBuild
index 8004a3aa..127a70cb 100755
--- a/source/l/taglib-extras/taglib-extras.SlackBuild
+++ b/source/l/taglib-extras/taglib-extras.SlackBuild
@@ -22,9 +22,18 @@
 
 
 VERSION=${VERSION:-1.0.1}
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 if [ "$ARCH" = "i486" ]; then
@@ -36,11 +45,8 @@ elif [ "$ARCH" = "s390" ]; then
 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"
+else
+  SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi
 
diff --git a/source/l/taglib/taglib.SlackBuild b/source/l/taglib/taglib.SlackBuild
index b330f32b..1f3673fc 100755
--- a/source/l/taglib/taglib.SlackBuild
+++ b/source/l/taglib/taglib.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/source/l/v4l-utils/v4l-utils.SlackBuild b/source/l/v4l-utils/v4l-utils.SlackBuild
index 5b96939c..c0ffa36b 100755
--- a/source/l/v4l-utils/v4l-utils.SlackBuild
+++ b/source/l/v4l-utils/v4l-utils.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2009  Eric Hameleers, Eindhoven, NL
-# Copyright 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 
 
 PKGNAM=v4l-utils
-VERSION=0.8.0
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -70,6 +70,9 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Fix manpage path:
+sed -i "s,share/man/,man/,g" utils/keytable/Makefile
+
 # Build and install:
 export CFLAGS="$SLKCFLAGS"
 export CPPFLAGS="$SLKCFLAGS"
@@ -79,16 +82,49 @@ make ${NUMJOBS} PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} || \
   exit 1
 make install PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG || exit 1
 
+# System udev files should go under /lib:
+if [ -r $PKG/etc/udev/rules.d/70-infrared.rules ]; then
+  mkdir -p $PKG/lib/udev/rules.d
+  mv $PKG/etc/udev/rules.d/70-infrared.rules $PKG/lib/udev/rules.d
+  rmdir $PKG/etc/udev/rules.d 2> /dev/null
+  rmdir $PKG/etc/udev 2> /dev/null
+  rmdir $PKG/etc 2> /dev/null
+  sed -i "s,/etc/udev/rules.d,/lib/udev/rules.d,g" $PKG/lib/udev/rules.d/70-infrared.rules
+fi
+
 # 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 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
+
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  COPYING* ChangeLog README* TODO  \
+  COPYING* README* TODO  \
   $PKG/usr/doc/$PKGNAM-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source/l/virtuoso-ose/virtuoso-ose.SlackBuild b/source/l/virtuoso-ose/virtuoso-ose.SlackBuild
index 1507719b..5dd4fe5c 100755
--- a/source/l/virtuoso-ose/virtuoso-ose.SlackBuild
+++ b/source/l/virtuoso-ose/virtuoso-ose.SlackBuild
@@ -21,10 +21,9 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
-VERSION=${VERSION:-6.1.1}
+PKGNAM=virtuoso-opensource
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:--j6}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -36,6 +35,8 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+NUMJOBS=${NUMJOBS:--j7}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-virtuoso-ose
diff --git a/source/l/vte/vte.SlackBuild b/source/l/vte/vte.SlackBuild
index d9aa44c4..858b119a 100755
--- a/source/l/vte/vte.SlackBuild
+++ b/source/l/vte/vte.SlackBuild
@@ -54,9 +54,9 @@ 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.?z* || exit 1
@@ -79,7 +79,12 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PKGNAM-$VERSION \
   --disable-static \
-  --build=$ARCH-slackware-linux
+  --disable-introspection \
+  --enable-python \
+  --enable-gnome-pty-helper \
+  --with-gtk=2.0 \
+  --with-default-emulation=xterm \
+  --build=$ARCH-slackware-linux || exit 1
 
 # Build and install:
 make $NUMJOBS || make || exit 1
@@ -115,9 +120,9 @@ fi
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  AUTHORS COPYING HACKING INSTALL MAINTAINERS NEWS README \
+  AUTHORS COPYING* HACKING INSTALL MAINTAINERS NEWS README* \
   $PKG/usr/doc/${PKGNAM}-$VERSION
-ln -s /usr/share/gtk-doc/html/vte $PKG/usr/doc/vte-$VERSION/html
+ln -s /usr/share/gtk-doc/html/vte-0.0 $PKG/usr/doc/vte-$VERSION/html
 
 # If there's a ChangeLog, installing at least part of the recent history
 # is useful, but don't let it get totally out of control:
diff --git a/source/l/wavpack/wavpack.SlackBuild b/source/l/wavpack/wavpack.SlackBuild
index e5f25eb2..682b4e5e 100755
--- a/source/l/wavpack/wavpack.SlackBuild
+++ b/source/l/wavpack/wavpack.SlackBuild
@@ -5,7 +5,7 @@
 # Updated by Andrew Brouwers, abrouwers@gmail.com
 # Modified by the SlackBuilds.org project
 # Modified to build wavpack.
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,20 +26,27 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-PRGNAM=wavpack
-VERSION=4.41.0
-ARCH=${ARCH:-x86_64}
+PKGNAM=wavpack
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="AUTHORS ChangeLog NEWS README"
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -57,9 +64,9 @@ fi
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP || exit 1
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
-cd $PRGNAM-$VERSION || exit 1
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1
+cd $PKGNAM-$VERSION || exit 1
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -73,6 +80,7 @@ CFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
+  --mandir=/usr/man \
   --enable-static=no \
   --build=$ARCH-slackware-linux \
   || exit 1
@@ -80,12 +88,37 @@ CFLAGS="$SLKCFLAGS" \
 make $NUMJOBS || make || exit 1
 make install-strip DESTDIR=$PKG || exit 1
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS NEWS README* \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
+# 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 $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source/l/zlib/zlib.SlackBuild b/source/l/zlib/zlib.SlackBuild
index 65a9134e..9d5f928d 100755
--- a/source/l/zlib/zlib.SlackBuild
+++ b/source/l/zlib/zlib.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2005-2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,19 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=1.2.3
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-2}
+PKGNAM=zlib
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-4}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -51,8 +61,16 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf zlib-$VERSION
-tar xjvf $CWD/zlib-$VERSION.tar.bz2
-cd zlib-$VERSION
+tar xvf $CWD/zlib-$VERSION.tar.?z* || exit 1
+cd zlib-$VERSION || exit 1
+
+# Attempt to work around a problem that affects libxml2 on 64-bits
+# and probably breaks other things as well.  The issue stems from
+# misuse of zlib by other libraries, but there's no other good place
+# to put this fix.  Note to self - keep an eye on upstream for a
+# proper fix.
+zcat $CWD/zlib.largefile64_source.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 \) \
@@ -71,6 +89,7 @@ CFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --shared
 make || exit 1
+
 mkdir -p $PKG/usr/include
 cp -a zlib.h zconf.h $PKG/usr/include
 chmod 644 $PKG/usr/include/*
@@ -80,14 +99,29 @@ chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/*
 chmod 644 $PKG/usr/lib${LIBDIRSUFFIX}/libz.a
 mkdir -p $PKG/usr/man/man3
 cat zlib.3 | gzip -9c > $PKG/usr/man/man3/zlib.3.gz
+
+# Add pkgconfig file:
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
+cat zlib.pc > $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/zlib.pc
+
 ( 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/zlib-$VERSION
 cp -a \
-  ChangeLog FAQ INDEX README \
+  FAQ INDEX README* \
   $PKG/usr/doc/zlib-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source/l/zlib/zlib.largefile64_source.diff b/source/l/zlib/zlib.largefile64_source.diff
new file mode 100644
index 00000000..61d7b84d
--- /dev/null
+++ b/source/l/zlib/zlib.largefile64_source.diff
@@ -0,0 +1,11 @@
+--- ./zlib.h.orig	2010-04-19 23:12:48.000000000 -0500
++++ ./zlib.h	2011-02-09 12:12:15.000000000 -0600
+@@ -1578,7 +1578,7 @@
+ #  define gzoffset gzoffset64
+ #  define adler32_combine adler32_combine64
+ #  define crc32_combine crc32_combine64
+-#  ifdef _LARGEFILE64_SOURCE
++#  ifndef _LARGEFILE64_SOURCE
+      ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+      ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
+      ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
diff --git a/source/local/README b/source/local/README
new file mode 100644
index 00000000..4e535154
--- /dev/null
+++ b/source/local/README
@@ -0,0 +1 @@
+Build scripts that are unique to this $ARCH.
diff --git a/source/local/jre/COPYRIGHT b/source/local/jre/COPYRIGHT
new file mode 100644
index 00000000..fcb67309
--- /dev/null
+++ b/source/local/jre/COPYRIGHT
@@ -0,0 +1,70 @@
+Copyright © 2006, 2011, Oracle and/or its affiliates. 
+All rights reserved.
+
+This software and related documentation are provided under a
+license agreement containing restrictions on use and
+disclosure and are protected by intellectual property laws.
+Except as expressly permitted in your license agreement or
+allowed by law, you may not use, copy, reproduce, translate,
+broadcast, modify, license, transmit, distribute, exhibit,
+perform, publish, or display any part, in any form, or by
+any means.  Reverse engineering, disassembly, or
+decompilation of this software, unless required by law for
+interoperability, is prohibited.
+
+The information contained herein is subject to change
+without notice and is not warranted to be error-free.  If
+you find any errors, please report them to us in writing.
+
+If this is software or related software documentation that
+is delivered to the U.S.  Government or anyone licensing it
+on behalf of the U.S.  Government, the following notice is
+applicable:
+
+U.S.  GOVERNMENT RIGHTS Programs, software, databases, and
+related documentation and technical data delivered to U.S.
+Government customers are "commercial computer software" or
+"commercial technical data" pursuant to the applicable
+Federal Acquisition Regulation and agency-specific
+supplemental regulations.  As such, the use, duplication,
+disclosure, modification, and adaptation shall be subject to
+the restrictions and license terms set forth in the
+applicable Government contract, and, to the extent
+applicable by the terms of the Government contract, the
+additional rights set forth in FAR 52.227-19, Commercial
+Computer Software License (December 2007).  Oracle America,
+Inc., 500 Oracle Parkway, Redwood City, CA 94065.
+
+This software or hardware is developed for general use in a
+variety of information management applications.  It is not
+developed or intended for use in any inherently dangerous
+applications, including applications which may create a risk
+of personal injury.  If you use this software or hardware in
+dangerous applications, then you shall be responsible to
+take all appropriate fail-safe, backup, redundancy, and
+other measures to ensure its safe use.  Oracle Corporation
+and its affiliates disclaim any liability for any damages
+caused by use of this software or hardware in dangerous
+applications.
+
+Oracle and Java are registered trademarks of Oracle and/or
+its affiliates.  Other names may be trademarks of their
+respective owners.
+
+AMD, Opteron, the AMD logo, and the AMD Opteron logo are
+trademarks or registered trademarks of Advanced Micro
+Devices.  Intel and Intel Xeon are trademarks or registered
+trademarks of Intel Corporation.  All SPARC trademarks are
+used under license and are trademarks or registered
+trademarks of SPARC International, Inc.  UNIX is a
+registered trademark licensed through X/Open Company, Ltd.
+
+This software or hardware and documentation may provide
+access to or information on content, products, and services
+from third parties.  Oracle Corporation and its affiliates
+are not responsible for and expressly disclaim all
+warranties of any kind with respect to third-party content,
+products, and services.  Oracle Corporation and its
+affiliates will not be responsible for any loss, costs, or
+damages incurred due to your access to or use of third-party
+content, products, or services.
diff --git a/source/local/jre/README b/source/local/jre/README
new file mode 100644
index 00000000..cdb30f2c
--- /dev/null
+++ b/source/local/jre/README
@@ -0,0 +1 @@
+Please refer to http://java.com/licensereadme
diff --git a/source/local/jre/THIRDPARTYLICENSEREADME.txt b/source/local/jre/THIRDPARTYLICENSEREADME.txt
new file mode 100644
index 00000000..4381e7df
--- /dev/null
+++ b/source/local/jre/THIRDPARTYLICENSEREADME.txt
@@ -0,0 +1 @@
+Please refer to http://java.com/thirdpartylicense
diff --git a/source/local/jre/Welcome.html b/source/local/jre/Welcome.html
new file mode 100644
index 00000000..33a0ba54
--- /dev/null
+++ b/source/local/jre/Welcome.html
@@ -0,0 +1,26 @@
+<html>
+<head>
+<title>
+Welcome to the Java(TM) Platform
+</title>
+</head>
+<body>
+
+<h2>Welcome to the Java<SUP><FONT SIZE=-2>TM</FONT></SUP> Platform</h2>
+<p> Welcome to the Java<SUP><FONT SIZE=-2>TM</FONT></SUP> Standard Edition Runtime 
+  Environment. This provides complete runtime support for Java applications. 
+<p> The runtime environment includes the Java<SUP><FONT SIZE=-2>TM</FONT></SUP> 
+  Plug-in product which supports the Java environment inside web browsers. 
+<h3>References</h3>
+<p>
+See the <a href=http://java.sun.com/javase/6/docs/technotes/guides/plugin/index.html>Java Plug-in</a> product
+documentation for more information on using the Java Plug-in product.
+<p> See the <a href=http://java.sun.com/javase>Java Platform</a> web site for 
+  more information on the Java Platform. 
+<hr>
+<font size="-2">
+Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+</font>
+<p>
+</body>
+</html>
diff --git a/source/local/jre/jre.SlackBuild b/source/local/jre/jre.SlackBuild
new file mode 100755
index 00000000..297bfeb3
--- /dev/null
+++ b/source/local/jre/jre.SlackBuild
@@ -0,0 +1,130 @@
+#!/bin/sh
+
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+# Note that the slack-desc file mentions the JRE version (edit when upgrading)!
+
+VERSION=6u25
+DVER=1.6.0_25
+ARCH=x86_64
+BUILD=${BUILD:-1}
+
+# As of jre-6u12 a 64bit plugin is available.
+# SUN says:
+# Please note that the 64-bit JRE only works with the 64-bit browser plug-in,
+# while the 32-bit JRE only works with 32-bit browser plug-in.
+# If you use both 32-bit and 64-bit browsers interchangeably, you will need to
+# have both 32-bit and 64-bit JRE's installed on your machine. 
+JAVA_ARCH=${JAVA_ARCH:-x64}      # or i586 if you want the 32bit version
+
+if [ "$JAVA_ARCH" = "x64" ]; then
+  LIB_ARCH=amd64
+else
+  LIB_ARCH=i386
+fi
+
+if [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-jre
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $PKG
+mkdir -p usr/lib${LIBDIRSUFFIX}
+cd usr/lib${LIBDIRSUFFIX}
+yes yes | sh $( ls --indicator-style none $CWD/jre-${VERSION}-linux-${JAVA_ARCH}*.bin | tail -1) || exit 1
+mkdir -p $PKG/etc/profile.d
+for file in $(ls $CWD/profile.d/*) ; do
+  cat $file | sed -e "s#lib/java#lib${LIBDIRSUFFIX}/java#" \
+    > $PKG/etc/profile.d/$(basename $file)
+done
+chown -R root:root $PKG
+( cd $PKG
+  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 {} \;
+)
+chmod 755 $PKG/etc/profile.d/*
+( cd $PKG/usr/lib${LIBDIRSUFFIX}
+  mv jre${DVER} java || exit 1
+  ln -sf java jre${DVER}
+) || exit 1
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
+( cd $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
+  ln -sf /usr/lib${LIBDIRSUFFIX}/java/lib/${LIB_ARCH}/libnpjp2.so libnpjp2.so
+)
+( cd $PKG/usr/lib${LIBDIRSUFFIX}
+  ln -sf ./java/lib/${LIB_ARCH}/server/libjvm.so .
+)
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cat << EOF > $PKG/install/doinst.sh
+# Clean up a potential upgrade mess caused by changing the
+# installation directory to /usr/lib${LIBDIRSUFFIX}/java/:
+if [ -L usr/lib${LIBDIRSUFFIX}/java ]; then
+  rm -rf usr/lib${LIBDIRSUFFIX}/java
+  mkdir -p usr/lib${LIBDIRSUFFIX}/java/man
+  mkdir -p usr/lib${LIBDIRSUFFIX}/java/lib/${LIB_ARCH}/server
+  mkdir -p usr/lib/java/lib${LIBDIRSUFFIX}/${LIB_ARCH}/client
+  mkdir -p usr/lib${LIBDIRSUFFIX}/java/javaws
+  mkdir -p usr/lib${LIBDIRSUFFIX}/java/bin
+  mkdir -p usr/lib${LIBDIRSUFFIX}/mozilla/plugins
+fi
+if [ -L ControlPanel ]; then
+  rm -f ControlPanel
+fi
+if [ -L ja ]; then
+  rm -f ja
+fi
+if [ -L javaws ]; then
+  rm -f javaws
+fi
+if [ -L libjsig.so ]; then
+  rm -f libjsig.so
+fi
+# End cleanup.
+EOF
+
+# Install the desktop/mime files:
+mkdir -p $PKG/usr/share/{applications,icons,mime}
+cp -a $PKG/usr/lib${LIBDIRSUFFIX}/java/lib/desktop/applications/* \
+  $PKG/usr/share/applications/
+cp -a $PKG/usr/lib${LIBDIRSUFFIX}/java/lib/desktop/icons/hicolor \
+  $PKG/usr/share/icons/
+cp -a $PKG/usr/lib${LIBDIRSUFFIX}/java/lib/desktop/mime/packages \
+  $PKG/usr/share/mime/
+
+# We ship the package unmodified, so we do not compress manpages.
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/jre-$(echo $VERSION | tr - _)-${ARCH}-$BUILD.txz
+
diff --git a/source/l/jre/profile.d/jre.csh b/source/local/jre/profile.d/jre.csh
index 2beb66ec..2beb66ec 100755
--- a/source/l/jre/profile.d/jre.csh
+++ b/source/local/jre/profile.d/jre.csh
diff --git a/source/l/jre/profile.d/jre.sh b/source/local/jre/profile.d/jre.sh
index 227c15cb..227c15cb 100755
--- a/source/l/jre/profile.d/jre.sh
+++ b/source/local/jre/profile.d/jre.sh
diff --git a/source/local/jre/slack-desc b/source/local/jre/slack-desc
new file mode 100644
index 00000000..925218e2
--- /dev/null
+++ b/source/local/jre/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------------------------------------------------------|
+jre: Java(TM) 2 Platform Standard Edition Runtime Environment.
+jre:
+jre: The J2SE(TM) Runtime Environment (JRE) is intended for software
+jre: developers and vendors to redistribute with their applications.
+jre: It contains the Java virtual machine, runtime class libraries, and
+jre: Java application launcher that are necessary to run programs written
+jre: in the Java programming language.
+jre:
+jre: If you need development tools, obtain the jdk from /extra, or see the
+jre: web page:   http://java.com/
+jre:
diff --git a/source/n/biff+comsat/biff+comsat.SlackBuild b/source/n/biff+comsat/biff+comsat.SlackBuild
index b50da5aa..f177bfc1 100755
--- a/source/n/biff+comsat/biff+comsat.SlackBuild
+++ b/source/n/biff+comsat/biff+comsat.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=0.17
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-biff+comsat
diff --git a/source/n/bind/bind.SlackBuild b/source/n/bind/bind.SlackBuild
index 73b7d2ff..dc7014a3 100755
--- a/source/n/bind/bind.SlackBuild
+++ b/source/n/bind/bind.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,8 @@
 
 
 PKGNAM=bind
-VERSION=${VERSION:-9.4.3-P4}
-NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-9.7.3}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -36,11 +35,13 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 CWD=$(pwd)
 TMP=/bind-$(mcookie)
 PKG=$TMP/package-${PKGNAM}
 rm -rf $PKG
-mkdir -p $TMP $PKG
+mkdir -p $TMP $PKG/etc/default
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -58,19 +59,11 @@ rm -rf ${PKGNAM}-${VERSION}
 tar xvf $CWD/${PKGNAM}-$VERSION.tar.gz || exit 1
 cd ${PKGNAM}-$VERSION || exit 1
 
-# Remove use of SO_BSDCOMPAT which has been obsolete since the 2.2.x kernel series,
-# and generates warnings under 2.6.x kernels:
+# Remove use of SO_BSDCOMPAT which has been obsolete since the 2.2.x kernel
+# series, and generates warnings under 2.6.x kernels.  This _might_ be fixed
+# upstream already, but an explicit #undef SO_BSDCOMPAT does not hurt:
 zcat $CWD/bind.so_bsdcompat.diff.gz | patch -p1 --verbose || exit
 
-# We want to use /var/run/named/, not just /var/run/.
-# This allows changing the ownership of that directory if we want to run
-# named as a non-root user.
-zcat $CWD/bind.var.run.named.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
-# Threads break '-u' on Linux (for now)
-
-# The man pages should reflect /var/run/named:
-zcat $CWD/bind.man.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
-
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
 find . \
@@ -87,6 +80,7 @@ CFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --with-libtool \
+  --with-idn=/usr \
   --mandir=/usr/man \
   --enable-shared \
   --disable-static \
diff --git a/source/n/bind/bind.man.diff b/source/n/bind/bind.man.diff
deleted file mode 100644
index 6bcf1921..00000000
--- a/source/n/bind/bind.man.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./bin/named/named.8.orig	2007-01-29 18:23:44.000000000 -0600
-+++ ./bin/named/named.8	2007-06-07 23:17:33.000000000 -0500
-@@ -202,7 +202,7 @@
- The default configuration file.
- .RE
- .PP
--\fI/var/run/named.pid\fR
-+\fI/var/run/named/named.pid\fR
- .RS 4
- The default process\-id file.
- .RE
---- ./bin/named/lwresd.8.orig	2007-01-29 18:23:44.000000000 -0600
-+++ ./bin/named/lwresd.8	2007-06-07 23:17:18.000000000 -0500
-@@ -155,7 +155,7 @@
- The default configuration file.
- .RE
- .PP
--\fI/var/run/lwresd.pid\fR
-+\fI/var/run/named/lwresd.pid\fR
- .RS 4
- The default process\-id file.
- .RE
diff --git a/source/n/bind/bind.var.run.named.diff b/source/n/bind/bind.var.run.named.diff
deleted file mode 100644
index 53cc8bd6..00000000
--- a/source/n/bind/bind.var.run.named.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./bin/named/include/named/globals.h.orig	Sat Nov 24 17:47:59 2001
-+++ ./bin/named/include/named/globals.h	Tue Feb 26 18:51:18 2002
-@@ -102,9 +102,9 @@
- EXTERN isc_boolean_t		ns_g_logstderr		INIT(ISC_FALSE);
- 
- EXTERN const char *		ns_g_defaultpidfile 	INIT(NS_LOCALSTATEDIR
--							     "/run/named.pid");
-+							     "/run/named/named.pid");
- EXTERN const char *		lwresd_g_defaultpidfile INIT(NS_LOCALSTATEDIR
--							    "/run/lwresd.pid");
-+							    "/run/named/lwresd.pid");
- EXTERN const char *		ns_g_username		INIT(NULL);
- 
- #undef EXTERN
diff --git a/source/n/bind/caching-example/named.local b/source/n/bind/caching-example/named.local
index 8bfc435f..8f40bcf3 100644
--- a/source/n/bind/caching-example/named.local
+++ b/source/n/bind/caching-example/named.local
@@ -1,6 +1,6 @@
 $TTL	86400
 @       IN      SOA     localhost. root.localhost.  (
-                                      1997022700 ; Serial
+                                      2011032500 ; Serial
                                       28800      ; Refresh
                                       14400      ; Retry
                                       3600000    ; Expire
diff --git a/source/n/bind/caching-example/named.root b/source/n/bind/caching-example/named.root
index 902a7047..d081faaf 100644
--- a/source/n/bind/caching-example/named.root
+++ b/source/n/bind/caching-example/named.root
@@ -5,12 +5,12 @@
 ;
 ;       This file is made available by InterNIC 
 ;       under anonymous FTP as
-;           file                /domain/named.root
+;           file                /domain/named.cache
 ;           on server           FTP.INTERNIC.NET
 ;       -OR-                    RS.INTERNIC.NET
 ;
-;       last update:    Feb 04, 2008
-;       related version of root zone:   2008020400
+;       last update:    Jun 17, 2010
+;       related version of root zone:   2010061700
 ;
 ; formerly NS.INTERNIC.NET
 ;
@@ -18,68 +18,70 @@
 A.ROOT-SERVERS.NET.      3600000      A     198.41.0.4
 A.ROOT-SERVERS.NET.      3600000      AAAA  2001:503:BA3E::2:30
 ;
-; formerly NS1.ISI.EDU
+; FORMERLY NS1.ISI.EDU
 ;
 .                        3600000      NS    B.ROOT-SERVERS.NET.
 B.ROOT-SERVERS.NET.      3600000      A     192.228.79.201
 ;
-; formerly C.PSI.NET
+; FORMERLY C.PSI.NET
 ;
 .                        3600000      NS    C.ROOT-SERVERS.NET.
 C.ROOT-SERVERS.NET.      3600000      A     192.33.4.12
 ;
-; formerly TERP.UMD.EDU
+; FORMERLY TERP.UMD.EDU
 ;
 .                        3600000      NS    D.ROOT-SERVERS.NET.
 D.ROOT-SERVERS.NET.      3600000      A     128.8.10.90
 ;
-; formerly NS.NASA.GOV
+; FORMERLY NS.NASA.GOV
 ;
 .                        3600000      NS    E.ROOT-SERVERS.NET.
 E.ROOT-SERVERS.NET.      3600000      A     192.203.230.10
 ;
-; formerly NS.ISC.ORG
+; FORMERLY NS.ISC.ORG
 ;
 .                        3600000      NS    F.ROOT-SERVERS.NET.
 F.ROOT-SERVERS.NET.      3600000      A     192.5.5.241
-F.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2f::f
+F.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2F::F
 ;
-; formerly NS.NIC.DDN.MIL
+; FORMERLY NS.NIC.DDN.MIL
 ;
 .                        3600000      NS    G.ROOT-SERVERS.NET.
 G.ROOT-SERVERS.NET.      3600000      A     192.112.36.4
 ;
-; formerly AOS.ARL.ARMY.MIL
+; FORMERLY AOS.ARL.ARMY.MIL
 ;
 .                        3600000      NS    H.ROOT-SERVERS.NET.
 H.ROOT-SERVERS.NET.      3600000      A     128.63.2.53
-H.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:1::803f:235
+H.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:1::803F:235
 ;
-; formerly NIC.NORDU.NET
+; FORMERLY NIC.NORDU.NET
 ;
 .                        3600000      NS    I.ROOT-SERVERS.NET.
 I.ROOT-SERVERS.NET.      3600000      A     192.36.148.17
+I.ROOT-SERVERS.NET.      3600000      AAAA  2001:7FE::53
 ;
-; operated by VeriSign, Inc.
+; OPERATED BY VERISIGN, INC.
 ;
 .                        3600000      NS    J.ROOT-SERVERS.NET.
 J.ROOT-SERVERS.NET.      3600000      A     192.58.128.30
 J.ROOT-SERVERS.NET.      3600000      AAAA  2001:503:C27::2:30
 ;
-; operated by RIPE NCC
+; OPERATED BY RIPE NCC
 ;
 .                        3600000      NS    K.ROOT-SERVERS.NET.
-K.ROOT-SERVERS.NET.      3600000      A     193.0.14.129 
-K.ROOT-SERVERS.NET.      3600000      AAAA  2001:7fd::1
+K.ROOT-SERVERS.NET.      3600000      A     193.0.14.129
+K.ROOT-SERVERS.NET.      3600000      AAAA  2001:7FD::1
 ;
-; operated by ICANN
+; OPERATED BY ICANN
 ;
 .                        3600000      NS    L.ROOT-SERVERS.NET.
 L.ROOT-SERVERS.NET.      3600000      A     199.7.83.42
+L.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:3::42
 ;
-; operated by WIDE
+; OPERATED BY WIDE
 ;
 .                        3600000      NS    M.ROOT-SERVERS.NET.
 M.ROOT-SERVERS.NET.      3600000      A     202.12.27.33
-M.ROOT-SERVERS.NET.      3600000      AAAA  2001:dc3::35
+M.ROOT-SERVERS.NET.      3600000      AAAA  2001:DC3::35
 ; End of File
diff --git a/source/n/bind/rc.bind b/source/n/bind/rc.bind
index 966670e3..6d77d73d 100644
--- a/source/n/bind/rc.bind
+++ b/source/n/bind/rc.bind
@@ -1,35 +1,35 @@
 #!/bin/sh
 # Start/stop/restart the BIND name server daemon (named).
 
-# Start bind.  In the past it was more secure to run BIND
-# as a non-root user (for example, with '-u daemon'), but
-# the modern version of BIND knows how to use the kernel's
-# capability mechanism to drop all root privileges except
-# the ability to bind() to a privileged port and set process
-# resource limits, so -u should not be needed.  If you wish
-# to use it anyway, chown the /var/run/named directory to
-# the non-root user.
-#
+
+# Start bind. In the past it was more secure to run BIND as a non-root
+# user (for example, with '-u daemon'), but the modern version of BIND
+# knows how to use the kernel's capability mechanism to drop all root
+# privileges except the ability to bind() to a privileged port and set
+# process resource limits, so -u should not be needed.  If you wish to
+# use it anyway, chown the /var/run/named and /var/named directories to
+# the non-root user. The command options can be set like this in
+# /etc/default/named :
+#       NAMED_OPTIONS="-u daemon"
+# So you will not have to edit this script.
 
 # You might also consider running BIND in a "chroot jail",
 # a discussion of which may be found in
 # /usr/doc/Linux-HOWTOs/Chroot-BIND-HOWTO.
  
-# One last note:  rndc has a lot of other nice features that
-# it is not within the scope of this start/stop/restart script
-# to support.  For more details, see "man rndc" or just type
-# "rndc" to see the options.
+# One last note:  rndc has a lot of other nice features that it is not
+# within the scope of this start/stop/restart script to support.
+# For more details, see "man rndc" or just type "rndc" to see the options.
 
+# Load command defaults:
+if [ -f /etc/default/named ] ; then . /etc/default/named ; fi
+if [ -f /etc/default/rndc ] ; then . /etc/default/rndc ; fi
 
-# Sanity check.  If either /usr/sbin/named or /etc/named.conf
-# aren't ready, it doesn't make much sense to try to run this
-# script:
+# Sanity check.  If /usr/sbin/named is missing then it
+# doesn't make much sense to try to run this script:
 if [ ! -x /usr/sbin/named ]; then
   echo "/etc/rc.d/rc.bind:  no /usr/sbin/named found (or not executable); cannot start."
   exit 1
-elif [ ! -f /etc/named.conf ]; then
-  echo "/etc/rc.d/rc.bind:  no /etc/named.conf found; cannot start /usr/sbin/named."
-  exit 1
 fi
 
 # Start BIND.  As many times as you like.  ;-)
@@ -37,14 +37,14 @@ fi
 # running or you'll get more than one copy running.
 bind_start() {
   if [ -x /usr/sbin/named ]; then
-    echo "Starting BIND:  /usr/sbin/named"
-    /usr/sbin/named
+    echo "Starting BIND:  /usr/sbin/named $NAMED_OPTIONS"
+    /usr/sbin/named $NAMED_OPTIONS
     sleep 1
   fi
   if ! ps axc | grep -q named ; then
     echo "WARNING:  named did not start."
-    echo "Attempting to start named again:  /usr/sbin/named"
-    /usr/sbin/named
+    echo "Attempting to start named again:  /usr/sbin/named $NAMED_OPTIONS"
+    /usr/sbin/named $NAMED_OPTIONS
     sleep 1
     if ps axc | grep -q named ; then
       echo "SUCCESS:  named started."
@@ -57,8 +57,8 @@ bind_start() {
 
 # Stop all running copies of BIND (/usr/sbin/named):
 bind_stop() {
-  echo "Stopping BIND:  /usr/sbin/rndc stop"
-  /usr/sbin/rndc stop
+  echo "Stopping BIND:  /usr/sbin/rndc $RDNC_OPTIONS stop"
+  /usr/sbin/rndc $RDNC_OPTIONS stop
   # A problem with using "/usr/sbin/rndc stop" is that if you
   # managed to get multiple copies of named running it will
   # only stop one of them and then can't stop the others even
@@ -76,7 +76,7 @@ bind_stop() {
 
 # Reload BIND:
 bind_reload() {
-  /usr/sbin/rndc reload
+  /usr/sbin/rndc $RDNC_OPTIONS reload
 }
 
 # Restart BIND:
@@ -87,7 +87,7 @@ bind_restart() {
 
 # Get BIND status:
 bind_status() {
-  /usr/sbin/rndc status
+  /usr/sbin/rndc $RDNC_OPTIONS status
 }
 
 case "$1" in
diff --git a/source/n/bluez-firmware/bluez-firmware.SlackBuild b/source/n/bluez-firmware/bluez-firmware.SlackBuild
index 2fba9d2c..26a9051b 100755
--- a/source/n/bluez-firmware/bluez-firmware.SlackBuild
+++ b/source/n/bluez-firmware/bluez-firmware.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,9 +23,18 @@
 
 PKGNAM=bluez-firmware
 VERSION=${VERSION:-1.2}
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 if [ "$ARCH" = "i486" ]; then
@@ -34,6 +43,8 @@ elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 CWD=$(pwd)
@@ -91,9 +102,17 @@ fi
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  AUTHORS COPYING ChangeLog INSTALL NEWS README \
+  AUTHORS COPYING* INSTALL NEWS README* \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 #zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/n/bluez-hcidump/bluez-hcidump.SlackBuild b/source/n/bluez-hcidump/bluez-hcidump.SlackBuild
index ac2a8442..e03037ab 100755
--- a/source/n/bluez-hcidump/bluez-hcidump.SlackBuild
+++ b/source/n/bluez-hcidump/bluez-hcidump.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006-2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006-2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,8 +22,8 @@
 
 
 PKGNAM=bluez-hcidump
-VERSION=${VERSION:-1.42}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-2.0}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -59,7 +59,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1
 cd ${PKGNAM}-$VERSION || exit 1
 
 # Make sure ownerships and permissions are sane:
@@ -70,9 +70,6 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-# Patch to build with bluez+>4.61
-zcat $CWD/hci.c_for_bluez-4.61.patch.gz | patch -p1 || exit 1
-
 # Configure:
 CFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/source/n/bluez-hcidump/hci.c_for_bluez-4.61.patch b/source/n/bluez-hcidump/hci.c_for_bluez-4.61.patch
deleted file mode 100644
index bcd6b4a0..00000000
--- a/source/n/bluez-hcidump/hci.c_for_bluez-4.61.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nur bluez-hcidump-1.42.orig//parser/hci.c bluez-hcidump-1.42/parser/hci.c
---- bluez-hcidump-1.42.orig//parser/hci.c	2008-06-15 07:46:13.000000000 -0500
-+++ bluez-hcidump-1.42/parser/hci.c	2010-03-02 23:15:35.171713301 -0600
-@@ -1973,7 +1973,7 @@
- 
- static inline void read_inquiry_transmit_power_level_dump(int level, struct frame *frm)
- {
--	read_inquiry_transmit_power_level_rp *rp = frm->ptr;
-+	read_inq_response_tx_power_level_rp *rp = frm->ptr;
- 
- 	p_indent(level, frm);
- 	printf("status 0x%2.2x level %d\n", rp->status, rp->level);
-@@ -2325,7 +2325,7 @@
- 		case OCF_READ_EXT_INQUIRY_RESPONSE:
- 			read_ext_inquiry_response_dump(level, frm);
- 			return;
--		case OCF_READ_INQUIRY_TRANSMIT_POWER_LEVEL:
-+		case OCF_READ_INQ_RESPONSE_TX_POWER_LEVEL:
- 			read_inquiry_transmit_power_level_dump(level, frm);
- 			return;
- 		case OCF_READ_DEFAULT_ERROR_DATA_REPORTING:
diff --git a/source/n/bluez/bluez-4.91.tar.sign b/source/n/bluez/bluez-4.91.tar.sign
new file mode 100644
index 00000000..bb9b05b6
--- /dev/null
+++ b/source/n/bluez/bluez-4.91.tar.sign
@@ -0,0 +1,8 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+Comment: See http://www.kernel.org/signature.html for info
+
+iD8DBQBNkiAFyGugalF9Dw4RAqa6AJ9bxkhDm2sW6JqVMT8JwSa/5eFZaQCbBuKA
+27f95iFeuRTVrhRkoFiTOto=
+=u4px
+-----END PGP SIGNATURE-----
diff --git a/source/n/bluez/bluez.SlackBuild b/source/n/bluez/bluez.SlackBuild
index ec5cba26..0403c932 100755
--- a/source/n/bluez/bluez.SlackBuild
+++ b/source/n/bluez/bluez.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# Slackware build script for bluez-utils - http://www.bluez.org
+# Slackware build script for bluez - http://www.bluez.org
 
-# Copyright 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PKGNAM=bluez
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/${PKGNAM}-${VERSION}.tar.?z* || exit 1
+tar xvf $CWD/${PKGNAM}-${VERSION}.tar.xz || exit 1
 cd $PKGNAM-$VERSION
 
 chown -R root:root .
@@ -92,7 +92,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-gstreamer \
   --enable-alsa \
   --enable-usb \
-  --enable-netlink \
   --enable-tools\
   --enable-bccmd \
   --enable-hid2hci \
@@ -108,7 +107,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG
+make install DESTDIR=$PKG || exit 1
 
 # I'm don't think we need this, but I'll leave it commented just in case:
 # http://bugs.archlinux.org/task/4930
@@ -136,6 +135,10 @@ cp -a serial/serial.conf $PKG/etc/bluetooth
 cp -a tools/rfcomm.conf $PKG/etc/bluetooth
 chmod 644 $PKG/etc/bluetooth/*.conf
 
+mkdir -p $PKG/etc/alsa
+mv $PKG/usr/share/alsa/bluetooth.conf $PKG/etc/alsa
+( cd $PKG/usr/share/alsa ; ln -s ../../../etc/alsa/bluetooth.conf . )
+
 # Do not overwrite configuration
 # Well, let the dbus file be overwritten, as it is not usually user-edited.
 ( cd $PKG
diff --git a/source/n/bluez/doinst.sh b/source/n/bluez/doinst.sh
index 1711435e..0d4dde1d 100644
--- a/source/n/bluez/doinst.sh
+++ b/source/n/bluez/doinst.sh
@@ -17,8 +17,8 @@ if [ -e etc/rc.d/rc.bluetooth ]; then
   mv etc/rc.d/rc.bluetooth.new.incoming etc/rc.d/rc.bluetooth.new
 fi
 
-config etc/alsa/bluetooth.conf.new
 config etc/rc.d/rc.bluetooth.new
+config etc/alsa/bluetooth.conf.new
 config etc/bluetooth/audio.conf.new
 config etc/bluetooth/input.conf.new
 config etc/bluetooth/main.conf.new
diff --git a/source/n/bluez/patches/bluez-dbus-config.patch b/source/n/bluez/patches/bluez-dbus-config.patch
index 4160600a..0d0fb462 100644
--- a/source/n/bluez/patches/bluez-dbus-config.patch
+++ b/source/n/bluez/patches/bluez-dbus-config.patch
@@ -1,25 +1,22 @@
-Use the plugdev group for bluetooth on Slackware, and allow this to
-  work as expected with our current setup.
-
-diff -Nur bluez-4.61.orig//src/bluetooth.conf bluez-4.61/src/bluetooth.conf
---- bluez-4.61.orig//src/bluetooth.conf	2010-02-18 17:48:50.434527785 -0600
-+++ bluez-4.61/src/bluetooth.conf	2010-02-18 17:47:30.727431004 -0600
-@@ -11,11 +11,16 @@
+--- ./src/bluetooth.conf.orig	2010-10-04 06:41:01.000000000 -0500
++++ ./src/bluetooth.conf	2010-11-07 19:50:47.229999322 -0600
+@@ -11,13 +11,18 @@
      <allow own="org.bluez"/>
      <allow send_destination="org.bluez"/>
      <allow send_interface="org.bluez.Agent"/>
 +    <allow send_interface="org.bluez.Adapter"/>
      <allow send_interface="org.bluez.HandsfreeAgent"/>
+     <allow send_interface="org.bluez.MediaEndpoint"/>
+     <allow send_interface="org.bluez.Watcher"/>
    </policy>
  
 -  <policy at_console="true">
--    <allow send_destination="org.bluez"/>
 +  <policy group="plugdev">
-+     <allow send_destination="org.bluez"/>
-+     <allow send_interface="org.bluez.Agent"/>
-+     <allow send_interface="org.bluez.Adapter"/>
-+     <allow send_destination="org.bluez"
-+            send_interface="org.freedesktop.DBus.Introspectable"/>
+     <allow send_destination="org.bluez"/>
++    <allow send_interface="org.bluez.Agent"/>
++    <allow send_interface="org.bluez.Adapter"/>
++    <allow send_destination="org.bluez"
++           send_interface="org.freedesktop.DBus.Introspectable"/>
    </policy>
  
    <!-- allow users of lp group (printing subsystem) to 
diff --git a/source/n/bootp/bootp.SlackBuild b/source/n/bootp/bootp.SlackBuild
index 2d12ab06..b3d74cf8 100755
--- a/source/n/bootp/bootp.SlackBuild
+++ b/source/n/bootp/bootp.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,11 +20,19 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 VERSION=${VERSION:-2.4.3}
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
diff --git a/source/n/bridge-utils/bridge-utils.SlackBuild b/source/n/bridge-utils/bridge-utils.SlackBuild
index 0772a887..eb31d6ef 100755
--- a/source/n/bridge-utils/bridge-utils.SlackBuild
+++ b/source/n/bridge-utils/bridge-utils.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,10 +20,19 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
-VERSION=1.2
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-2}
+PKGNAM=bridge-utils
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -36,6 +45,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
@@ -83,13 +95,21 @@ gzip -9 $PKG/usr/man/man8/*.8
 
 mkdir -p $PKG/usr/doc/bridge-utils-$VERSION
 cp -a \
-  AUTHORS COPYING ChangeLog README THANKS TODO  \
+  AUTHORS COPYING* README* THANKS TODO  \
   doc \
   $PKG/usr/doc/bridge-utils-$VERSION
 ( cd $PKG/usr/doc/bridge-utils-$VERSION/doc
   rm -f Makefile Makefile.in RPM-GPG-KEY brctl.8
 )
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 # Finish up the package:
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/n/ca-certificates/ca-certificates.SlackBuild b/source/n/ca-certificates/ca-certificates.SlackBuild
new file mode 100755
index 00000000..fc455b14
--- /dev/null
+++ b/source/n/ca-certificates/ca-certificates.SlackBuild
@@ -0,0 +1,75 @@
+#!/bin/sh
+
+# Slackware build script for ca-certificates
+
+# Copyright 2009  Robby Workman  Northport, AL, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=ca-certificates
+VERSION=${VERSION:-20090814}
+ARCH=noarch
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PRGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/${PRGNAM}_$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+zcat $CWD/cacerts-$VERSION-remove_debconf.diff.gz | patch -p1 || exit 1
+zcat $CWD/cacerts-$VERSION-fixup_DESTDIR.diff.gz | patch -p1 || exit 1
+zcat $CWD/cacerts-$VERSION-fixup_update-ca-certificates.diff.gz | patch -p1 || exit 1
+
+make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+mkdir -p $PKG/etc/ca-certificates/update.d
+printf "# Automatically generated by $PRGNAM-$VERSION \n#\n" \
+  > $PKG/etc/ca-certificates.conf.new
+( cd $PKG/usr/share/ca-certificates
+  find . -name '*.crt' | sort | cut -b3-
+) >> $PKG/etc/ca-certificates.conf.new
+
+mkdir -p $PKG/usr/man/man8
+gzip -9c sbin/update-ca-certificates.8 > \
+  $PKG/usr/man/man8/update-ca-certificates.8.gz
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv debian/NEWS debian/NEWS.Debian
+cp -a debian/NEWS.Debian debian/README.Debian $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/n/ca-certificates/cacerts-20090814-fixup_DESTDIR.diff b/source/n/ca-certificates/cacerts-20090814-fixup_DESTDIR.diff
new file mode 100644
index 00000000..b70ca654
--- /dev/null
+++ b/source/n/ca-certificates/cacerts-20090814-fixup_DESTDIR.diff
@@ -0,0 +1,94 @@
+diff -Nur ca-certificates-20090814.orig/Makefile ca-certificates-20090814/Makefile
+--- ca-certificates-20090814.orig/Makefile	2009-07-08 16:18:57.000000000 -0500
++++ ca-certificates-20090814/Makefile	2009-12-17 00:48:14.499550845 -0600
+@@ -17,7 +17,7 @@
+ 
+ install:
+ 	for dir in $(SUBDIRS); do \
+-	  mkdir $(DESTDIR)/$(CERTSDIR)/$$dir; \
++	  mkdir -p $(DESTDIR)/$(CERTSDIR)/$$dir; \
+ 	  $(MAKE) -C $$dir install CERTSDIR=$(DESTDIR)/$(CERTSDIR)/$$dir; \
+ 	done
+ 	for dir in sbin; do \
+diff -Nur ca-certificates-20090814.orig/brasil.gov.br/Makefile ca-certificates-20090814/brasil.gov.br/Makefile
+--- ca-certificates-20090814.orig/brasil.gov.br/Makefile	2007-02-02 00:23:19.000000000 -0600
++++ ca-certificates-20090814/brasil.gov.br/Makefile	2009-12-17 00:48:14.499550845 -0600
+@@ -8,5 +8,6 @@
+ 
+ install:
+ 	for p in *.crt; do \
++	 mkdir -p $(CERTSDIR) ; \
+ 	 install -m 644 $$p $(CERTSDIR)/$$p ; \
+ 	done
+diff -Nur ca-certificates-20090814.orig/cacert.org/Makefile ca-certificates-20090814/cacert.org/Makefile
+--- ca-certificates-20090814.orig/cacert.org/Makefile	2009-07-08 16:19:37.000000000 -0500
++++ ca-certificates-20090814/cacert.org/Makefile	2009-12-17 00:48:14.499550845 -0600
+@@ -9,5 +9,6 @@
+ 
+ install:
+ 	cat root.crt class3.crt > cacert.org.crt
++	mkdir -p $(CERTSDIR)
+ 	install -m 644 cacert.org.crt $(CERTSDIR)/cacert.org.crt
+ 
+diff -Nur ca-certificates-20090814.orig/gouv.fr/Makefile ca-certificates-20090814/gouv.fr/Makefile
+--- ca-certificates-20090814.orig/gouv.fr/Makefile	2008-06-23 13:57:45.000000000 -0500
++++ ca-certificates-20090814/gouv.fr/Makefile	2009-12-17 00:48:14.500550426 -0600
+@@ -8,6 +8,7 @@
+ 
+ install:
+ 	for p in *.crt; do \
++	 mkdir -p $(CERTSDIR) ; \
+ 	 install -m 644 $$p $(CERTSDIR)/$$p ; \
+ 	done
+ 
+diff -Nur ca-certificates-20090814.orig/mozilla/Makefile ca-certificates-20090814/mozilla/Makefile
+--- ca-certificates-20090814.orig/mozilla/Makefile	2009-06-24 05:56:54.000000000 -0500
++++ ca-certificates-20090814/mozilla/Makefile	2009-12-17 00:48:14.500550426 -0600
+@@ -10,5 +10,6 @@
+ 
+ install:
+ 	for p in *.crt; do \
++	 mkdir -p $(CERTSDIR) ; \
+ 	 install -m 644 $$p $(CERTSDIR)/$$p ; \
+ 	done
+diff -Nur ca-certificates-20090814.orig/sbin/Makefile ca-certificates-20090814/sbin/Makefile
+--- ca-certificates-20090814.orig/sbin/Makefile	2007-02-02 00:23:19.000000000 -0600
++++ ca-certificates-20090814/sbin/Makefile	2009-12-17 00:49:05.976571309 -0600
+@@ -8,4 +8,5 @@
+ clean:
+ 
+ install:
++	mkdir -p $(DESTDIR)/usr/sbin
+ 	install -m755 update-ca-certificates $(DESTDIR)/usr/sbin/
+diff -Nur ca-certificates-20090814.orig/signet.pl/Makefile ca-certificates-20090814/signet.pl/Makefile
+--- ca-certificates-20090814.orig/signet.pl/Makefile	2007-02-02 00:23:19.000000000 -0600
++++ ca-certificates-20090814/signet.pl/Makefile	2009-12-17 00:48:14.501550915 -0600
+@@ -8,5 +8,6 @@
+ 
+ install:
+ 	for p in *.crt; do \
++	 mkdir -p $(CERTSDIR) ; \
+ 	 install -m 644 $$p $(CERTSDIR)/$$p ; \
+ 	done
+diff -Nur ca-certificates-20090814.orig/spi-inc.org/Makefile ca-certificates-20090814/spi-inc.org/Makefile
+--- ca-certificates-20090814.orig/spi-inc.org/Makefile	2007-02-02 00:23:19.000000000 -0600
++++ ca-certificates-20090814/spi-inc.org/Makefile	2009-12-17 00:48:14.501550915 -0600
+@@ -8,6 +8,7 @@
+ 
+ install:
+ 	for p in *.crt; do \
++	 mkdir -p $(CERTSDIR) ; \
+ 	 install -m 644 $$p $(CERTSDIR)/$$p ; \
+ 	done
+ 
+diff -Nur ca-certificates-20090814.orig/telesec.de/Makefile ca-certificates-20090814/telesec.de/Makefile
+--- ca-certificates-20090814.orig/telesec.de/Makefile	2008-03-19 09:03:09.000000000 -0500
++++ ca-certificates-20090814/telesec.de/Makefile	2009-12-17 00:48:14.566586954 -0600
+@@ -8,6 +8,7 @@
+ 
+ install:
+ 	for p in *.crt; do \
++	 mkdir -p $(CERTSDIR) ; \
+ 	 install -m 644 $$p $(CERTSDIR)/$$p ; \
+ 	done
+ 
diff --git a/source/n/ca-certificates/cacerts-20090814-fixup_update-ca-certificates.diff b/source/n/ca-certificates/cacerts-20090814-fixup_update-ca-certificates.diff
new file mode 100644
index 00000000..3c9e08b4
--- /dev/null
+++ b/source/n/ca-certificates/cacerts-20090814-fixup_update-ca-certificates.diff
@@ -0,0 +1,14 @@
+diff -Nur ca-certificates-20090814.orig/sbin/update-ca-certificates ca-certificates-20090814/sbin/update-ca-certificates
+--- ca-certificates-20090814.orig/sbin/update-ca-certificates	2009-07-08 16:23:12.000000000 -0500
++++ ca-certificates-20090814/sbin/update-ca-certificates	2009-12-17 00:42:41.760550636 -0600
+@@ -148,9 +148,7 @@
+ 
+ HOOKSDIR=/etc/ca-certificates/update.d
+ echo -n "Running hooks in $HOOKSDIR...."
+-VERBOSE_ARG=
+-[ "$verbose" = 0 ] || VERBOSE_ARG=--verbose
+-eval run-parts $VERBOSE_ARG --test -- $HOOKSDIR | while read hook
++eval run-parts $HOOKSDIR | while read hook
+ do
+   ( cat $ADDED
+     cat $REMOVED ) | $hook || echo E: $hook exited with code $?.
diff --git a/source/n/ca-certificates/cacerts-20090814-remove_debconf.diff b/source/n/ca-certificates/cacerts-20090814-remove_debconf.diff
new file mode 100644
index 00000000..c99aa2fa
--- /dev/null
+++ b/source/n/ca-certificates/cacerts-20090814-remove_debconf.diff
@@ -0,0 +1,12 @@
+diff -Nur ca-certificates-20090814.orig/Makefile ca-certificates-20090814/Makefile
+--- ca-certificates-20090814.orig/Makefile	2009-07-08 16:18:57.000000000 -0500
++++ ca-certificates-20090814/Makefile	2009-12-17 00:44:30.540551055 -0600
+@@ -3,7 +3,7 @@
+ #
+ 
+ CERTSDIR = /usr/share/ca-certificates
+-SUBDIRS = spi-inc.org debconf.org mozilla cacert.org brasil.gov.br signet.pl telesec.de gouv.fr
++SUBDIRS = spi-inc.org mozilla cacert.org brasil.gov.br signet.pl telesec.de gouv.fr
+ 
+ all:
+ 	for dir in $(SUBDIRS); do \
diff --git a/source/n/ca-certificates/doinst.sh b/source/n/ca-certificates/doinst.sh
new file mode 100644
index 00000000..e8cd8cce
--- /dev/null
+++ b/source/n/ca-certificates/doinst.sh
@@ -0,0 +1,17 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/ca-certificates.conf.new
+
+chroot . usr/sbin/update-ca-certificates --fresh 1>/dev/null 2>/dev/null
+
diff --git a/source/n/ca-certificates/slack-desc b/source/n/ca-certificates/slack-desc
new file mode 100644
index 00000000..c302e828
--- /dev/null
+++ b/source/n/ca-certificates/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+               |-----handy-ruler-----------------------------------------------------|
+ca-certificates: ca-certificates (PEM Files of CA Certificates)
+ca-certificates:
+ca-certificates: This package includes PEM files of CA certificates to allow SSL-based
+ca-certificates: applications to check for the authenticity of SSL connections.
+ca-certificates:
+ca-certificates: Homepage: http://packages.qa.debian.org/c/ca-certificates.html
+ca-certificates:
+ca-certificates:
+ca-certificates:
+ca-certificates:
+ca-certificates:
diff --git a/source/n/curl/cacert.pem b/source/n/curl/cacert.pem
index d7d20b62..af135450 100644
--- a/source/n/curl/cacert.pem
+++ b/source/n/curl/cacert.pem
@@ -1,7 +1,7 @@
 ##
-## ca-bundle.crt -- Bundle of CA Root Certificates
+## lib/ca-bundle.crt -- Bundle of CA Root Certificates
 ##
-## Converted at: Tue Sep 22 09:25:27 2009 UTC
+## Converted at: Tue Mar 29 19:30:29 2011 UTC
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates
@@ -49,36 +49,7 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
-# @(#) $RCSfile: certdata.txt,v $ $Revision: 1.53 $ $Date: 2009/05/21 19:50:28 $
-
-Verisign/RSA Secure Server CA
-=============================
------BEGIN CERTIFICATE-----
-MIICNDCCAaECEAKtZn5ORf5eV288mBle3cAwDQYJKoZIhvcNAQECBQAwXzELMAkGA1UEBhMCVVMx
-IDAeBgNVBAoTF1JTQSBEYXRhIFNlY3VyaXR5LCBJbmMuMS4wLAYDVQQLEyVTZWN1cmUgU2VydmVy
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk0MTEwOTAwMDAwMFoXDTEwMDEwNzIzNTk1OVow
-XzELMAkGA1UEBhMCVVMxIDAeBgNVBAoTF1JTQSBEYXRhIFNlY3VyaXR5LCBJbmMuMS4wLAYDVQQL
-EyVTZWN1cmUgU2VydmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGbMA0GCSqGSIb3DQEBAQUA
-A4GJADCBhQJ+AJLOesGugz5aqomDV6wlAXYMra6OLDfO6zV4ZFQD5YRAUcm/jwjiioII0haGN1Xp
-sSECrXZogZoFokvJSyVmIlZsiAeP94FZbYQHZXATcXY+m3dM41CJVphIuR2nKRoTLkoRWZweFdVJ
-VCxzOmmCsZc5nG1wZ0jl3S3WyB57AgMBAAEwDQYJKoZIhvcNAQECBQADfgBl3X7hsuyw4jrg7HFG
-mhkRuNPHoLQDQCYCPgmc4RKz0Vr2N6W3YQO2WxZpO8ZECAyIUwxrl0nHPjXcbLm7qt9cuzovk2C2
-qUtN8iD3zV9/ZHuO3ABc1/p3yjkWWW8O6tO1g39NTUJWdrTJXwT4OPjr0l91X817/OWOgHz8UA==
------END CERTIFICATE-----
-
-GTE CyberTrust Root CA
-======================
------BEGIN CERTIFICATE-----
-MIIB+jCCAWMCAgGjMA0GCSqGSIb3DQEBBAUAMEUxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9HVEUg
-Q29ycG9yYXRpb24xHDAaBgNVBAMTE0dURSBDeWJlclRydXN0IFJvb3QwHhcNOTYwMjIzMjMwMTAw
-WhcNMDYwMjIzMjM1OTAwWjBFMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9u
-MRwwGgYDVQQDExNHVEUgQ3liZXJUcnVzdCBSb290MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
-gQC45k+625h8cXyvRLfTD0bZZOWTwUKOx7pJjTUteueLveUFMVnGsS8KDPufpz+iCWaEVh43KRuH
-6X4MypqfpX/1FZSj1aJGgthoTNE3FQZor734sLPwKfWVWgkWYXcKIiXUT0Wqx73llt/51KiOQswk
-wB6RJ0q1bQaAYznEol44AwIDAQABMA0GCSqGSIb3DQEBBAUAA4GBABKzdcZfHeFhVYAA1IFLezEP
-I2PnPfMD+fQ2qLvZ46WXTeorKeDWanOB5sCJo9Px4KWlIjeaY8JIILTbcuPI9tl8vrGvU9oUtCG4
-1tWW4/5ODFlitppK+ULdjG+BqXH/9ApybW1EDp3zdHSo1TRJ6V6e6bR64eVaH4QwnNOfpSXY
------END CERTIFICATE-----
+# @(#) $RCSfile: certdata.txt,v $ $Revision: 1.70 $ $Date: 2010/12/02 23:26:19 $
 
 GTE CyberTrust Global Root
 ==========================
@@ -96,46 +67,6 @@ M4ETCJ57NE7fQMh017l93PR2VX2bY1QY6fDq81yx2YtCHrnAlU66+tXifPVoYb+O7AWXX1uw16OF
 NMQkpw0PlZPvy5TYnh+dXIVtx6quTx8itc2VrbqnzPmrC3p/
 -----END CERTIFICATE-----
 
-Thawte Personal Basic CA
-========================
------BEGIN CERTIFICATE-----
-MIIDITCCAoqgAwIBAgIBADANBgkqhkiG9w0BAQQFADCByzELMAkGA1UEBhMCWkExFTATBgNVBAgT
-DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMRowGAYDVQQKExFUaGF3dGUgQ29uc3Vs
-dGluZzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMY
-VGhhd3RlIFBlcnNvbmFsIEJhc2ljIENBMSgwJgYJKoZIhvcNAQkBFhlwZXJzb25hbC1iYXNpY0B0
-aGF3dGUuY29tMB4XDTk2MDEwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgcsxCzAJBgNVBAYTAlpB
-MRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEaMBgGA1UEChMRVGhh
-d3RlIENvbnN1bHRpbmcxKDAmBgNVBAsTH0NlcnRpZmljYXRpb24gU2VydmljZXMgRGl2aXNpb24x
-ITAfBgNVBAMTGFRoYXd0ZSBQZXJzb25hbCBCYXNpYyBDQTEoMCYGCSqGSIb3DQEJARYZcGVyc29u
-YWwtYmFzaWNAdGhhd3RlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAvLyTU23AUE+C
-FeZIlDWmWr5vQvoPR+53dXLdjUmbllegeNTKP1GzaQuRdhciB5dqxFGTS+CN7zeVoQxN2jSQHReJ
-l+A1OFdKwPQIcOk8RHtQfmGakOMj04gRRif1CwcOu93RfyAKiLlWCy4cgNrx454p7xS9CkT7G1sY
-0b8jkyECAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQAt4plrsD16
-iddZopQBHyvdEktTwq1/qqcAXJFAVyVKOKqEcLnZgA+le1z7c8a914phXAPjLSeoF+CEhULcXpvG
-t7Jtu3Sv5D/Lp7ew4F2+eIMllNLbgQ95B21P9DkVWlIBe94y1k049hJcBlDfBVu9FEuh3ym6O0GN
-92NWod8isQ==
------END CERTIFICATE-----
-
-Thawte Personal Premium CA
-==========================
------BEGIN CERTIFICATE-----
-MIIDKTCCApKgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBzzELMAkGA1UEBhMCWkExFTATBgNVBAgT
-DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMRowGAYDVQQKExFUaGF3dGUgQ29uc3Vs
-dGluZzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEjMCEGA1UEAxMa
-VGhhd3RlIFBlcnNvbmFsIFByZW1pdW0gQ0ExKjAoBgkqhkiG9w0BCQEWG3BlcnNvbmFsLXByZW1p
-dW1AdGhhd3RlLmNvbTAeFw05NjAxMDEwMDAwMDBaFw0yMDEyMzEyMzU5NTlaMIHPMQswCQYDVQQG
-EwJaQTEVMBMGA1UECBMMV2VzdGVybiBDYXBlMRIwEAYDVQQHEwlDYXBlIFRvd24xGjAYBgNVBAoT
-EVRoYXd0ZSBDb25zdWx0aW5nMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlz
-aW9uMSMwIQYDVQQDExpUaGF3dGUgUGVyc29uYWwgUHJlbWl1bSBDQTEqMCgGCSqGSIb3DQEJARYb
-cGVyc29uYWwtcHJlbWl1bUB0aGF3dGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJ
-Ztn4B0TPuYwu8KHvE0VsBd/eJxZRNkERbGw77f4QfRKe5ZtCmv5gMcNmt3M6SK5O0DI3lIi1DbbZ
-8/JE2dWIEt12TfIa/G8jHnrx2JhFTgcQ7xZC0EN1bUre4qrJMf8fAHB8Zs8QJQi6+u4A6UYDZicR
-FTuqW/KY3TZCstqIdQIDAQABoxMwETAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBBAUAA4GB
-AGk2ifc0KjNyL2071CKyuG+axTZmDhs8obF1Wub9NdP4qPIHb4Vnjt4rueIXsDqg8A6iAJrf8xQV
-brvIhVqYgPn/vnQdPfP+MCXRNzRn+qVxeTBhKXLA4CxM+1bkOqhv5TJZUtt1KFBZDPgLGeSs2a+W
-jS9Q2wfD6h+rM+D1KzGJ
------END CERTIFICATE-----
-
 Thawte Personal Freemail CA
 ===========================
 -----BEGIN CERTIFICATE-----
@@ -215,28 +146,6 @@ BIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee95
 70+sB3c4
 -----END CERTIFICATE-----
 
-ABAecom (sub., Am. Bankers Assn.) Root CA
-=========================================
------BEGIN CERTIFICATE-----
-MIIDtTCCAp2gAwIBAgIRANAeQJAAAEZSAAAAAQAAAAQwDQYJKoZIhvcNAQEFBQAwgYkxCzAJBgNV
-BAYTAlVTMQswCQYDVQQIEwJEQzETMBEGA1UEBxMKV2FzaGluZ3RvbjEXMBUGA1UEChMOQUJBLkVD
-T00sIElOQy4xGTAXBgNVBAMTEEFCQS5FQ09NIFJvb3QgQ0ExJDAiBgkqhkiG9w0BCQEWFWFkbWlu
-QGRpZ3NpZ3RydXN0LmNvbTAeFw05OTA3MTIxNzMzNTNaFw0wOTA3MDkxNzMzNTNaMIGJMQswCQYD
-VQQGEwJVUzELMAkGA1UECBMCREMxEzARBgNVBAcTCldhc2hpbmd0b24xFzAVBgNVBAoTDkFCQS5F
-Q09NLCBJTkMuMRkwFwYDVQQDExBBQkEuRUNPTSBSb290IENBMSQwIgYJKoZIhvcNAQkBFhVhZG1p
-bkBkaWdzaWd0cnVzdC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx0xHgeVVD
-BwhMywVCAOINg0Y95JO6tgbTDVm9PsHOQ2cBiiGo77zM0KLMsFWWU4RmBQDaREmA2FQKpSWGlO1j
-Vv9wbKOhGdJ4vmgqRF4vz8wYXke8OrFGPR7wuSw0X4x8TAgpnUBV6zx9g9618PeKgw6hTLQ6pbNf
-WiKX7BmbwQVo/ea3qZGULOR4SCQaJRk665WcOQqKz0Ky8BzVX/tr7WhWezkscjiw7pOp03t3POtx
-A6k4ShZsiSrK2jMTecJVjO2cu/LLWxD4LmE1xilMKtAqY9FlWbT4zfn0AIS2V0KFnTKo+SpU+/94
-Qby9cSj0u5C8/5Y0BONFnqFGKECBAgMBAAGjFjAUMBIGA1UdEwEB/wQIMAYBAf8CAQgwDQYJKoZI
-hvcNAQEFBQADggEBAARvJYbk5pYntNlCwNDJALF/VD6Hsm0kqS8Kfv2kRLD4VAe9G52dyntQJHsR
-W0mjpr8SdNWJt7cvmGQlFLdh6X9ggGvTZOirvRrWUfrAtF13Gn9kCF55xgVM8XrdTX3O5kh7VNJh
-koHWG9YA8A6eKHegTYjHInYZw8eeG6Z3ePhfm1bR8PIXrI6dWeYf/le22V7hXZ9F7GFoGUHhsiAm
-/lowdiT/QHI8eZ98IkirRs3bs4Ysj78FQdPB4xTjQRcm0HyncUwZ6EoPclgxfexgeqMiKL0ZJGA/
-O4dzwGvky663qyVDslUte6sGDnVdNOVdc22esnVApVnJTzFxiNmIf1Q=
------END CERTIFICATE-----
-
 Digital Signature Trust Co. Global CA 1
 =======================================
 -----BEGIN CERTIFICATE-----
@@ -277,52 +186,6 @@ up/1902lMXucKS1M/mQ+7LZT/uqb7YLbdHVLB3luHtgZg3Pe9T7Qtd7nS2h9Qy4qIOF+oHhEngj1
 mPnHfxsb1gYgAlihw6ID
 -----END CERTIFICATE-----
 
-Digital Signature Trust Co. Global CA 2
-=======================================
------BEGIN CERTIFICATE-----
-MIID2DCCAsACEQDQHkCLAAACfAAAAAIAAAABMA0GCSqGSIb3DQEBBQUAMIGpMQswCQYDVQQGEwJ1
-czENMAsGA1UECBMEVXRhaDEXMBUGA1UEBxMOU2FsdCBMYWtlIENpdHkxJDAiBgNVBAoTG0RpZ2l0
-YWwgU2lnbmF0dXJlIFRydXN0IENvLjERMA8GA1UECxMIRFNUQ0EgWDExFjAUBgNVBAMTDURTVCBS
-b290Q0EgWDExITAfBgkqhkiG9w0BCQEWEmNhQGRpZ3NpZ3RydXN0LmNvbTAeFw05ODEyMDExODE4
-NTVaFw0wODExMjgxODE4NTVaMIGpMQswCQYDVQQGEwJ1czENMAsGA1UECBMEVXRhaDEXMBUGA1UE
-BxMOU2FsdCBMYWtlIENpdHkxJDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0dXJlIFRydXN0IENvLjER
-MA8GA1UECxMIRFNUQ0EgWDExFjAUBgNVBAMTDURTVCBSb290Q0EgWDExITAfBgkqhkiG9w0BCQEW
-EmNhQGRpZ3NpZ3RydXN0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANLGJrbn
-pT3BxGjVUG9TxW9JEwm4ryxIjRRqoxdfWvnTLnUv2Chi0ZMv/E3Uq4flCMeZ55I/db3rJbQVwZsZ
-PdJEjdd0IG03Ao9pk1uKxBmd9LIO/BZsubEFkoPRhSxglD5FVaDZqwgh5mDoO3TymVBRaNADLbGA
-vqPYUrBEzUNKcI5YhZXhTizWLUFv1oTnyJhEykfbLCSlaSbPa7gnYsP0yXqSI+0TZ4KuRS5F5X5y
-P4WdlGIQ5jyRoa13AOAV7POEgHJ6jm5gl8ckWRA0g1vhpaRptlc1HHhZxtMvOnNn7pTKBBMFYgZw
-I7P0fO5F2WQLW0mqpEPOJsREEmy43XkCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAojeyP2n714Z5
-VEkxlTMr89EJFEliYIalsBHiUMIdBlc+LegzZL6bqq1fG03UmZWii5rJYnK1aerZWKs17RWiQ9a2
-vAd5ZWRzfdd5ynvVWlHG4VMElo04z6MXrDlxawHDi1M8Y+nuecDkvpIyZHqzH5eUYr3qsiAVlfuX
-8ngvYzZAOONGDx3drJXK50uQe7FLqdTF65raqtWjlBRGjS0f8zrWkzr2Pnn86Oawde3uPclwx12q
-gUtGJRzHbBXjlU4PqjI3lAoXJJIThFjSY28r9+ZbYgsTF7ANUkz+/m9c4pFuHf2kYtdo+o56T9II
-2pPc8JIRetDccpMMc5NihWjQ9A==
------END CERTIFICATE-----
-
-Digital Signature Trust Co. Global CA 4
-=======================================
------BEGIN CERTIFICATE-----
-MIID2DCCAsACEQDQHkCLAAB3bQAAAAEAAAAEMA0GCSqGSIb3DQEBBQUAMIGpMQswCQYDVQQGEwJ1
-czENMAsGA1UECBMEVXRhaDEXMBUGA1UEBxMOU2FsdCBMYWtlIENpdHkxJDAiBgNVBAoTG0RpZ2l0
-YWwgU2lnbmF0dXJlIFRydXN0IENvLjERMA8GA1UECxMIRFNUQ0EgWDIxFjAUBgNVBAMTDURTVCBS
-b290Q0EgWDIxITAfBgkqhkiG9w0BCQEWEmNhQGRpZ3NpZ3RydXN0LmNvbTAeFw05ODExMzAyMjQ2
-MTZaFw0wODExMjcyMjQ2MTZaMIGpMQswCQYDVQQGEwJ1czENMAsGA1UECBMEVXRhaDEXMBUGA1UE
-BxMOU2FsdCBMYWtlIENpdHkxJDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0dXJlIFRydXN0IENvLjER
-MA8GA1UECxMIRFNUQ0EgWDIxFjAUBgNVBAMTDURTVCBSb290Q0EgWDIxITAfBgkqhkiG9w0BCQEW
-EmNhQGRpZ3NpZ3RydXN0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANx18IzA
-dZaawGIfJvfE4Zrq4FZzW5nNAUSoCLbVp9oaBBg5kkp4o4HC9Xd6ULRw/5qrxsfKboNPQpj7Jgva
-3G3WqZlVUmfpKAOS3OWwBZoPFflrWXJW8vo5/Kpo7g8fEIMv/J36F5bdguPmRX3AS4BEH+0s4IT9
-kVySVGkl5WJp3OXuAFK9MwutdQKFp2RQLcUZGTDAJtvJ0/0uma1ZtQtN1EGuhUhDWdy3qOKi3sOP
-17ihYqZoUFLkzzGnlIXan0YyF1bl8utmPRL/Q9uY73fPy4GNNLHGUEom0eQ+QVCvbK4iNC7Va26D
-unm4dmVI2gkpZGMiuftHdoWMhkTLCdsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAtTYOXeFhKFoR
-ZcA/gwN5Tb4opgsHAlKFzfiR0BBstWogWxyQ2TA8xkieil5k+aFxd+8EJx8H6+Qm93N0yUQYGmbT
-4EOvkTvRyyzYdFQ6HE3K1GjNI3wdEJ5F6fYAbqbNGf9PLCmPV03Ed5K+4EwJ+11EhmYhqLkyolbV
-6YyDfFk/xPEL553snr2cGA4+wjl5KLcDDQjLxufZATdQEOzMYRZA1K8xdHv8PzGn0EdzMzkbzE5q
-10mDEQb+64JYMzJM8FasHpwvVpp7wUocpf1VNs78lk30sPDst2yC7S8xmUJMqbINuBVd8d+6ybVK
-1GSYsyapMMj9puyrliGtf8J4tg==
------END CERTIFICATE-----
-
 Verisign Class 1 Public Primary Certification Authority
 =======================================================
 -----BEGIN CERTIFICATE-----
@@ -798,56 +661,6 @@ jokn4jVYPSm0B482UJW/bsGe68SQsoWou7dC4A8HOd/7npCy0cE+U58DRLB+S/Rv5Hwf5+Kx5Lia
 V+GRMOrN
 -----END CERTIFICATE-----
 
-Visa International Global Root 2
-================================
------BEGIN CERTIFICATE-----
-MIIDgDCCAmigAwIBAgICAx4wDQYJKoZIhvcNAQEFBQAwYTELMAkGA1UEBhMCVVMxDTALBgNVBAoT
-BFZJU0ExLzAtBgNVBAsTJlZpc2EgSW50ZXJuYXRpb25hbCBTZXJ2aWNlIEFzc29jaWF0aW9uMRIw
-EAYDVQQDEwlHUCBSb290IDIwHhcNMDAwODE2MjI1MTAwWhcNMjAwODE1MjM1OTAwWjBhMQswCQYD
-VQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZp
-Y2UgQXNzb2NpYXRpb24xEjAQBgNVBAMTCUdQIFJvb3QgMjCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAKkBcLWqxEDwq2omYXkZAPy/mzdZDK9vZBv42pWUJGkzEXDK41Z0ohdXZFwgBuHW
-73G3O/erwWnQSaSxBNf0V2KJXLB1LRckaeNCYOTudNargFbYiCjh+20i/SN8RnNPflRzHqgsVVh1
-t0zzWkWlAhr62p3DRcMiXvOL8WAp0sdftAw6UYPvMPjU58fy+pmjIlC++QU3o63tmsPm7Igbthkn
-GziLgE3sucfFicv8GjLtI/C1AVj59o/ghalMCXI5Etuz9c9OYmTaxhkVOmMd6RdVoUwiPDQyRvhl
-V7or7zaMavrZ2UT0qt2E1w0cslSsMoW0ZA3eQbuxNMYBhjJk1Z8CAwEAAaNCMEAwHQYDVR0OBBYE
-FJ59SzS/ca3CBfYDdYDOqU8axCRMMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0G
-CSqGSIb3DQEBBQUAA4IBAQAhpXYUVfmtJ3CPPPTVbMjMCqujmAuKBiPFyWHbmQdpNSYx/scuhMKZ
-YdQN6X0uEyt8joW2hcdLzzW2LEc9zikv2G+fiRxkk78IvXbQkIqUs38oW26sTTMs7WXcFsziza6k
-PWKSBpUmv9+55CCmc2rBvveURNZNbyoLaxhNdBA2aGpawWqn3TYpjLgwi08hPwAuVDAHOrqK5MOe
-yti12HvOdUVmB/RtLdh6yumJivIj2C/LbgA2T/vwLwHMD8AiZfSr4k5hLQOCfZEWtTDVFN5ex5D8
-ofyrEK9ca3CnB+8phuiyJccg/ybdd+95RBTEvd07xQObdyPsoOy7Wjm1zK0G
------END CERTIFICATE-----
-
-beTRUSTed Root CA
-=================
------BEGIN CERTIFICATE-----
-MIIFLDCCBBSgAwIBAgIEOU99hzANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJXVzESMBAGA1UE
-ChMJYmVUUlVTVGVkMRswGQYDVQQDExJiZVRSVVNUZWQgUm9vdCBDQXMxGjAYBgNVBAMTEWJlVFJV
-U1RlZCBSb290IENBMB4XDTAwMDYyMDE0MjEwNFoXDTEwMDYyMDEzMjEwNFowWjELMAkGA1UEBhMC
-V1cxEjAQBgNVBAoTCWJlVFJVU1RlZDEbMBkGA1UEAxMSYmVUUlVTVGVkIFJvb3QgQ0FzMRowGAYD
-VQQDExFiZVRSVVNUZWQgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANS0
-c3oTCjhVAb6JVuGUntS+WutKNHUbYSnE4a0IYCF4SP+00PpeQY1hRIfo7clY+vyTmt9P6j41ffgz
-eubx181vSUs9Ty1uDoM6GHh3o8/n9E1z2Jo7Gh2+lVPPIJfCzz4kUmwMjmVZxXH/YgmPqsWPzGCg
-c0rXOD8Vcr+il7dw6K/ifhYGTPWqZCZyByWtNfwYsSbX2P8ZDoMbjNx4RWc0PfSvHI3kbWvtILNn
-mrRhyxdviTX/507AMhLn7uzf/5cwdO2NR47rtMNE5qdMf1ZD6Li8tr76g5fmu/vEtpO+GRg+jIG5
-c4gW9JZDnGdzF5DYCW5jrEq2I8QBoa2k5MUCAwEAAaOCAfgwggH0MA8GA1UdEwEB/wQFMAMBAf8w
-ggFZBgNVHSAEggFQMIIBTDCCAUgGCisGAQQBsT4BAAAwggE4MIIBAQYIKwYBBQUHAgIwgfQagfFS
-ZWxpYW5jZSBvbiB0aGlzIGNlcnRpZmljYXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFu
-Y2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBv
-ZiB1c2UsIGFuZCBjZXJ0aWZpY2F0aW9uIHByYWN0aWNlIHN0YXRlbWVudCwgd2hpY2ggY2FuIGJl
-IGZvdW5kIGF0IGJlVFJVU1RlZCdzIHdlYiBzaXRlLCBodHRwczovL3d3dy5iZVRSVVNUZWQuY29t
-L3ZhdWx0L3Rlcm1zMDEGCCsGAQUFBwIBFiVodHRwczovL3d3dy5iZVRSVVNUZWQuY29tL3ZhdWx0
-L3Rlcm1zMDQGA1UdHwQtMCswKaAnoCWkIzAhMRIwEAYDVQQKEwliZVRSVVNUZWQxCzAJBgNVBAYT
-AldXMB0GA1UdDgQWBBQquZtpLjub2M3eKjEENGvKBxirZzAfBgNVHSMEGDAWgBQquZtpLjub2M3e
-KjEENGvKBxirZzAOBgNVHQ8BAf8EBAMCAf4wDQYJKoZIhvcNAQEFBQADggEBAHlh26Nebhax6nZR
-+csVm8tpvuaBa58oH2U+3RGFktToQb9+M70j5/Egv6S0phkBxoyNNXxlpE8JpNbYIxUFE6dDea/b
-ow6be3ga8wSGWsb2jCBHOElQBp1yZzrwmAOtlmdE/D8QDYZN5AA7KXvOOzuZhmElQITcE2K3+spZ
-1gMe1lMBzW1MaFVA4e5rxyoAAEiCswoBw2AqDPeCNe5IhpbkdNQ96gFxugR1QKepfzk5mlWXKWWu
-GVUlBXJH0+gY3Ljpr0NzARJ0o+FcXxVdJPP55PS2Z2cS52QiivalQaYctmBjRYoQtLpGEK5BV2Vs
-PyMQPyEQWbfkQN0mDCP2qq4=
------END CERTIFICATE-----
-
 AddTrust Low-Value Services Root
 ================================
 -----BEGIN CERTIFICATE-----
@@ -944,29 +757,6 @@ RXEwMn8bLgn5v1Kh7sKAPgZcLlVAwRv1cEWw3F369nJad9Jjzc9YiQBCYz95OdBEsIJuQRno3eDB
 iFrRHnGTHyQwdOUeqN48Jzd/g66ed8/wMLH/S5noxqE=
 -----END CERTIFICATE-----
 
-Verisign Time Stamping Authority CA
-===================================
------BEGIN CERTIFICATE-----
-MIIDzTCCAzagAwIBAgIQU2GyYK7bcY6nlLMTM/QHCTANBgkqhkiG9w0BAQUFADCBwTELMAkGA1UE
-BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTwwOgYDVQQLEzNDbGFzcyAzIFB1YmxpYyBQ
-cmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIxOjA4BgNVBAsTMShjKSAxOTk4IFZl
-cmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNVBAsTFlZlcmlTaWdu
-IFRydXN0IE5ldHdvcmswHhcNMDAwOTI2MDAwMDAwWhcNMTAwOTI1MjM1OTU5WjCBpTEXMBUGA1UE
-ChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdvcmsxOzA5BgNV
-BAsTMlRlcm1zIG9mIHVzZSBhdCBodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhIChjKTAwMSww
-KgYDVQQDEyNWZXJpU2lnbiBUaW1lIFN0YW1waW5nIEF1dGhvcml0eSBDQTCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEA0hmdZ8IAIVlizrQJIkRpivglWtvtDbc2fk7gu5Q+kCWHwmFHKdm9VLhj
-zCx9abQzNvQ3B5rB3UBU/OB4naCTuQk9I1F/RMIUdNsKvsvJMDRAmD7Q1yUQgZS9B0+c1lQn3y6o
-v8uQjI11S7zi6ESHzeZBCiVu6PQkAsVSD27smHUCAwEAAaOB3zCB3DAPBgNVHRMECDAGAQH/AgEA
-MEUGA1UdIAQ+MDwwOgYMYIZIAYb4RQEHFwEDMCowKAYIKwYBBQUHAgEWHGh0dHBzOi8vd3d3LnZl
-cmlzaWduLmNvbS9ycGEwMQYDVR0fBCowKDAmoCSgIoYgaHR0cDovL2NybC52ZXJpc2lnbi5jb20v
-cGNhMy5jcmwwCwYDVR0PBAQDAgEGMEIGCCsGAQUFBwEBBDYwNDAyBggrBgEFBQcwAaYmFiRodHRw
-Oi8vb2NzcC52ZXJpc2lnbi5jb20vb2NzcC9zdGF0dXMwDQYJKoZIhvcNAQEFBQADgYEAgnBold+2
-DcIBcBlK0lRWHqzyRUyHuPU163hLBanInTsZIS5wNEqi9YngFXVF5yg3ADQnKeg3S/LvRJdrF1Ea
-w1adPBqK9kpGRjeM+sv1ZFo4aC4cw+9wzrhGBha/937ntag+RaypJXUie28/sJyU58dzq6wf7iWb
-wBbtt8pb8BQ=
------END CERTIFICATE-----
-
 Thawte Time Stamping CA
 =======================
 -----BEGIN CERTIFICATE-----
@@ -1117,100 +907,6 @@ GKQWDzH9OmwjkyB24f0HhdFbP9IcczLd+rn4jM8Ch3qaluTtT4mNU0OrDhPAARW0eTjb/G49nlG2
 uBOLZ8/5fNkiHfZdxRwBL5joeiQYvITX+txyW/fBOmg=
 -----END CERTIFICATE-----
 
-beTRUSTed Root CA-Baltimore Implementation
-==========================================
------BEGIN CERTIFICATE-----
-MIIFajCCBFKgAwIBAgIEPLU9RjANBgkqhkiG9w0BAQUFADBmMRIwEAYDVQQKEwliZVRSVVNUZWQx
-GzAZBgNVBAsTEmJlVFJVU1RlZCBSb290IENBczEzMDEGA1UEAxMqYmVUUlVTVGVkIFJvb3QgQ0Et
-QmFsdGltb3JlIEltcGxlbWVudGF0aW9uMB4XDTAyMDQxMTA3Mzg1MVoXDTIyMDQxMTA3Mzg1MVow
-ZjESMBAGA1UEChMJYmVUUlVTVGVkMRswGQYDVQQLExJiZVRSVVNUZWQgUm9vdCBDQXMxMzAxBgNV
-BAMTKmJlVFJVU1RlZCBSb290IENBLUJhbHRpbW9yZSBJbXBsZW1lbnRhdGlvbjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALx+xDmcjOPWHIb/ymKt4H8wRXqOGrO4x/nRNv8i805qX4QQ
-+2aBw5R5MdKR4XeOGCrDFN5R9U+jK7wYFuK13XneIviCfsuBH/0nLI/6l2Qijvj/YaOcGx6Sj8Co
-Cd8JEey3fTGaGuqDIQY8n7pc/5TqarjDa1U0Tz0yH92BFODEPM2dMPgwqZfT7syj0B9fHBOB1Bir
-lNFjw55/NZKeX0Tq7PQiXLfoPX2k+YmpkbIq2eszh+6l/ePazIjmiSZuxyuC0F6dWdsU7JGDBcNe
-DsYq0ATdcT0gTlgn/FP7eHgZFLL8kFKJOGJgB7Sg7KxrUNb9uShr71ItOrL/8QFArDcCAwEAAaOC
-Ah4wggIaMA8GA1UdEwEB/wQFMAMBAf8wggG1BgNVHSAEggGsMIIBqDCCAaQGDysGAQQBsT4AAAEJ
-KIORMTCCAY8wggFIBggrBgEFBQcCAjCCAToaggE2UmVsaWFuY2Ugb24gb3IgdXNlIG9mIHRoaXMg
-Q2VydGlmaWNhdGUgY3JlYXRlcyBhbiBhY2tub3dsZWRnbWVudCBhbmQgYWNjZXB0YW5jZSBvZiB0
-aGUgdGhlbiBhcHBsaWNhYmxlIHN0YW5kYXJkIHRlcm1zIGFuZCBjb25kaXRpb25zIG9mIHVzZSwg
-dGhlIENlcnRpZmljYXRpb24gUHJhY3RpY2UgU3RhdGVtZW50IGFuZCB0aGUgUmVseWluZyBQYXJ0
-eSBBZ3JlZW1lbnQsIHdoaWNoIGNhbiBiZSBmb3VuZCBhdCB0aGUgYmVUUlVTVGVkIHdlYiBzaXRl
-LCBodHRwOi8vd3d3LmJldHJ1c3RlZC5jb20vcHJvZHVjdHNfc2VydmljZXMvaW5kZXguaHRtbDBB
-BggrBgEFBQcCARY1aHR0cDovL3d3dy5iZXRydXN0ZWQuY29tL3Byb2R1Y3RzX3NlcnZpY2VzL2lu
-ZGV4Lmh0bWwwHQYDVR0OBBYEFEU9w6nR3D8kVpgccxiIav+DR+22MB8GA1UdIwQYMBaAFEU9w6nR
-3D8kVpgccxiIav+DR+22MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEASZK8o+6s
-vfoNyYt5hhwjdrCAWXf82n+0S9/DZEtqTg6t8n1ZdwWtColzsPq8y9yNAIiPpqCy6qxSJ7+hSHyX
-EHu67RMdmgduyzFiEuhjA6p9beP4G3YheBufS0OM00mG9htc9i5gFdPp43t1P9ACg9AYgkHNZTfq
-jjJ+vWuZXTARyNtIVBw74acT02pIk/c9jH8F6M7ziCpjBLjqflh8AXtb4cV97yHgjQ5dUX2xZ/2j
-vTg2xvI4hocalmhgRvsoFEdV4aeADGvi6t9NfJBIoDa9CReJf8Py05yc493EG931t3GzUwWJBtDL
-SoDByFOQtTwxiBdQn8nEDovYqAJjDQ==
------END CERTIFICATE-----
-
-beTRUSTed Root CA - Entrust Implementation
-==========================================
------BEGIN CERTIFICATE-----
-MIIGUTCCBTmgAwIBAgIEPLVPQDANBgkqhkiG9w0BAQUFADBmMRIwEAYDVQQKEwliZVRSVVNUZWQx
-GzAZBgNVBAsTEmJlVFJVU1RlZCBSb290IENBczEzMDEGA1UEAxMqYmVUUlVTVGVkIFJvb3QgQ0Eg
-LSBFbnRydXN0IEltcGxlbWVudGF0aW9uMB4XDTAyMDQxMTA4MjQyN1oXDTIyMDQxMTA4NTQyN1ow
-ZjESMBAGA1UEChMJYmVUUlVTVGVkMRswGQYDVQQLExJiZVRSVVNUZWQgUm9vdCBDQXMxMzAxBgNV
-BAMTKmJlVFJVU1RlZCBSb290IENBIC0gRW50cnVzdCBJbXBsZW1lbnRhdGlvbjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALr0RAOqEmq1Q+xVkrYwfTVXDNvzDSduTPdQqJtOK2/b9a0c
-S12zqcH+e0TrW6MFDR/FNCswACnxeECypP869AGIF37m1CbTukzqMvtDd5eHI8XbQ6P1KqNRXuE7
-0mVpflUVm3rnafdE4Fe1FehmYA8NA/uCjqPoEXtsvsdjDheT389Lrm5zdeDzqrmkwAkbhepxKYhB
-MvnwKg5sCfJ0a2ZsUhMfGLzUPvfYbiCeyv78IZTuEyhL11xeDGbu6bsPwTSxfwh28z0mcMmLJR1i
-JAzqHHVOwBLkuhMdMCktVjMFu5dZfsZJT4nXLySotohAtWSSU1Yk5KKghbNekLQSM80CAwEAAaOC
-AwUwggMBMIIBtwYDVR0gBIIBrjCCAaowggGmBg8rBgEEAbE+AAACCSiDkTEwggGRMIIBSQYIKwYB
-BQUHAgIwggE7GoIBN1JlbGlhbmNlIG9uIG9yIHVzZSBvZiB0aGlzIENlcnRpZmljYXRlIGNyZWF0
-ZXMgYW4gYWNrbm93bGVkZ21lbnQgYW5kIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJs
-ZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIHRoZSBDZXJ0aWZpY2F0aW9u
-IFByYWN0aWNlIFN0YXRlbWVudCBhbmQgdGhlIFJlbHlpbmcgUGFydHkgQWdyZWVtZW50LCB3aGlj
-aCBjYW4gYmUgZm91bmQgYXQgdGhlIGJlVFJVU1RlZCB3ZWIgc2l0ZSwgaHR0cHM6Ly93d3cuYmV0
-cnVzdGVkLmNvbS9wcm9kdWN0c19zZXJ2aWNlcy9pbmRleC5odG1sMEIGCCsGAQUFBwIBFjZodHRw
-czovL3d3dy5iZXRydXN0ZWQuY29tL3Byb2R1Y3RzX3NlcnZpY2VzL2luZGV4Lmh0bWwwEQYJYIZI
-AYb4QgEBBAQDAgAHMIGJBgNVHR8EgYEwfzB9oHugeaR3MHUxEjAQBgNVBAoTCWJlVFJVU1RlZDEb
-MBkGA1UECxMSYmVUUlVTVGVkIFJvb3QgQ0FzMTMwMQYDVQQDEypiZVRSVVNUZWQgUm9vdCBDQSAt
-IEVudHJ1c3QgSW1wbGVtZW50YXRpb24xDTALBgNVBAMTBENSTDEwKwYDVR0QBCQwIoAPMjAwMjA0
-MTEwODI0MjdagQ8yMDIyMDQxMTA4NTQyN1owCwYDVR0PBAQDAgEGMB8GA1UdIwQYMBaAFH1w5a44
-iwY/qhwaj/nPJDCqhIQWMB0GA1UdDgQWBBR9cOWuOIsGP6ocGo/5zyQwqoSEFjAMBgNVHRMEBTAD
-AQH/MB0GCSqGSIb2fQdBAAQQMA4bCFY2LjA6NC4wAwIEkDANBgkqhkiG9w0BAQUFAAOCAQEAKrgX
-zh8QlOu4mre5X+za95IkrNySO8cgjfKZ5V04ocI07cUTWVwFtStPYZuR+0H8/NU8TZh2BvWBfevd
-kObRVlTa4y0MnxEylCIBevZsLHRnBMylj44ss0O1lKLQfelifwa+JwGDnjr9iu6YQ0pr17WXOzq/
-T220Y/ozADQuLW2WyXvKmWO6vvT2MKAtmJbpVkQFqUSjYRDrgqFnXbxdJ3Wqiig2KjiS2d2kXgCl
-zMx8KSreKJCrt+G2/30lC0DYqjSjLd4H61/OCt3Kfjp9JsFiaDrmLzfzgYYhxKlkqu9FNtEaZnz4
-6TfW1mG+oq1I59/mdP7TbX3SJdysYlep9w==
------END CERTIFICATE-----
-
-beTRUSTed Root CA - RSA Implementation
-======================================
------BEGIN CERTIFICATE-----
-MIIFaDCCBFCgAwIBAgIQO1nHe81bV569N1KsdrSqGjANBgkqhkiG9w0BAQUFADBiMRIwEAYDVQQK
-EwliZVRSVVNUZWQxGzAZBgNVBAsTEmJlVFJVU1RlZCBSb290IENBczEvMC0GA1UEAxMmYmVUUlVT
-VGVkIFJvb3QgQ0EgLSBSU0EgSW1wbGVtZW50YXRpb24wHhcNMDIwNDExMTExODEzWhcNMjIwNDEy
-MTEwNzI1WjBiMRIwEAYDVQQKEwliZVRSVVNUZWQxGzAZBgNVBAsTEmJlVFJVU1RlZCBSb290IENB
-czEvMC0GA1UEAxMmYmVUUlVTVGVkIFJvb3QgQ0EgLSBSU0EgSW1wbGVtZW50YXRpb24wggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkujQwCY5X0LkGLG9uJIAiv11DpvpPrILnHGhwhRuj
-brWqeNluB0s/6d/16uhUoWGKDi9pdRi3DOUUjXFumLhV/AyV0Jtu4S2I1DpAa5LxmZZk3tv/ePTu
-lh1HiXzUvrmIdyM6CeYEnm2qXtLIvZpOGd+J6lsOfsPktPDgaTuID0GQ+NRxQyTBjyZLO1bp/4xs
-N+lFrYWMU8NghpBKlsmzVLC7F/AcRdnUGxlkVgoZ98zh/4avflherHqQH8koOUV7orbHnB/ahdQh
-hlkwk75TMzf270HPM8ercmsl9fNTGwxMLvF1S++gh/f+ihXQbNXL+WhTuXAVE8L1LvtDNXUtAgMB
-AAGjggIYMIICFDAMBgNVHRMEBTADAQH/MIIBtQYDVR0gBIIBrDCCAagwggGkBg8rBgEEAbE+AAAD
-CSiDkTEwggGPMEEGCCsGAQUFBwIBFjVodHRwOi8vd3d3LmJldHJ1c3RlZC5jb20vcHJvZHVjdHNf
-c2VydmljZXMvaW5kZXguaHRtbDCCAUgGCCsGAQUFBwICMIIBOhqCATZSZWxpYW5jZSBvbiBvciB1
-c2Ugb2YgdGhpcyBDZXJ0aWZpY2F0ZSBjcmVhdGVzIGFuIGFja25vd2xlZGdtZW50IGFuZCBhY2Nl
-cHRhbmNlIG9mIHRoZSB0aGVuIGFwcGxpY2FibGUgc3RhbmRhcmQgdGVybXMgYW5kIGNvbmRpdGlv
-bnMgb2YgdXNlLCB0aGUgQ2VydGlmaWNhdGlvbiBQcmFjdGljZSBTdGF0ZW1lbnQgYW5kIHRoZSBS
-ZWx5aW5nIFBhcnR5IEFncmVlbWVudCwgd2hpY2ggY2FuIGJlIGZvdW5kIGF0IHRoZSBiZVRSVVNU
-ZWQgd2ViIHNpdGUsIGh0dHA6Ly93d3cuYmV0cnVzdGVkLmNvbS9wcm9kdWN0c19zZXJ2aWNlcy9p
-bmRleC5odG1sMAsGA1UdDwQEAwIBBjAfBgNVHSMEGDAWgBSp7BR++dlDzFMrFK3P9/BZiUHNGTAd
-BgNVHQ4EFgQUqewUfvnZQ8xTKxStz/fwWYlBzRkwDQYJKoZIhvcNAQEFBQADggEBANuXsHXqDMTB
-mMpWBcCorSZIry0g6IHHtt9DwSwddUvUQo3neqh03GZCWYez9Wlt2ames30cMcH1VOJZJEnl7r05
-pmuKmET7m9cqg5c0Lcd9NUwtNLg+DcTsiCevnpL9UGGCqGAHFFPMZRPB9kdEadIxyKbdLrML3kqN
-Wz2rDcI1UqJWN8wyiyiFQpyRQHpwKzg21eFzGh/l+n5f3NacOzDq28BbJ1zTcwfBwvNMm2+fG8oe
-qqg4MwlYsq78B+g23FW6L09A/nq9BqaBwZMifIYRCgZ3SK41ty8ymmFei74pnykkiFY5LKjSq5YD
-WtRIn7lAhAuYaPsBQ9Yb4gmxlxw=
------END CERTIFICATE-----
-
 RSA Security 2048 v3
 ====================
 -----BEGIN CERTIFICATE-----
@@ -1232,22 +928,6 @@ nzIlQnQFgCi/vcEkllgVsRch6YlL2weIZ/QVrXA+L02FO8K32/6YaCOJ4XQP3vTFhGMpG8zLB8kA
 pKnXwiJPZ9d37CAFYd4=
 -----END CERTIFICATE-----
 
-RSA Security 1024 v3
-====================
------BEGIN CERTIFICATE-----
-MIICXDCCAcWgAwIBAgIQCgEBAQAAAnwAAAALAAAAAjANBgkqhkiG9w0BAQUFADA6MRkwFwYDVQQK
-ExBSU0EgU2VjdXJpdHkgSW5jMR0wGwYDVQQLExRSU0EgU2VjdXJpdHkgMTAyNCBWMzAeFw0wMTAy
-MjIyMTAxNDlaFw0yNjAyMjIyMDAxNDlaMDoxGTAXBgNVBAoTEFJTQSBTZWN1cml0eSBJbmMxHTAb
-BgNVBAsTFFJTQSBTZWN1cml0eSAxMDI0IFYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDV
-3f5mCc8kPD6ugU5OisRpgFtZO9+5TUzKtS3DJy08rwBCbbwoppbPf9dYrIMKo1W1exeQFYRMiu4m
-mdxY78c4pqqv0I5CyGLXq6yp+0p9v+r+Ek3d/yYtbzZUaMjShFbuklNhCbM/OZuoyZu9zp9+1Blq
-FikYvtc6adwlWzMaUQIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAf
-BgNVHSMEGDAWgBTEwBykB5T9zU0B1FTapQxf3q4FWjAdBgNVHQ4EFgQUxMAcpAeU/c1NAdRU2qUM
-X96uBVowDQYJKoZIhvcNAQEFBQADgYEAPy1q4yZDlX2Jl2X7deRyHUZXxGFraZ8SmyzVWujAovBD
-leMf6XbN3Ou8k6BlCsdNT1+nr6JGFLkM88y9am63nd4lQtBU/55oc2PcJOsiv6hy8l4A4Q1OOkNu
-mU4/iXgDmMrzVcydro7BqkWY+o8aoI2II/EVQQ2lRj6RP4vr93E=
------END CERTIFICATE-----
-
 GeoTrust Global CA
 ==================
 -----BEGIN CERTIFICATE-----
@@ -1790,24 +1470,6 @@ Oi8vb2NzcC5pcHMuZXMvMA0GCSqGSIb3DQEBBQUAA4GBAEo9IEca2on0eisxeewBwMwB9dbB/MjD
 KcJQrSRE7SOzSMtEQMEDlQwKeAYSAfWRMS1Jjbs/RU4s4OjNtckUFQzjB4ObJnXv
 -----END CERTIFICATE-----
 
-IPS Servidores root
-===================
------BEGIN CERTIFICATE-----
-MIICtzCCAiACAQAwDQYJKoZIhvcNAQEEBQAwgaMxCzAJBgNVBAYTAkVTMRIwEAYDVQQIEwlCQVJD
-RUxPTkExEjAQBgNVBAcTCUJBUkNFTE9OQTEZMBcGA1UEChMQSVBTIFNlZ3VyaWRhZCBDQTEYMBYG
-A1UECxMPQ2VydGlmaWNhY2lvbmVzMRcwFQYDVQQDEw5JUFMgU0VSVklET1JFUzEeMBwGCSqGSIb3
-DQEJARYPaXBzQG1haWwuaXBzLmVzMB4XDTk4MDEwMTIzMjEwN1oXDTA5MTIyOTIzMjEwN1owgaMx
-CzAJBgNVBAYTAkVTMRIwEAYDVQQIEwlCQVJDRUxPTkExEjAQBgNVBAcTCUJBUkNFTE9OQTEZMBcG
-A1UEChMQSVBTIFNlZ3VyaWRhZCBDQTEYMBYGA1UECxMPQ2VydGlmaWNhY2lvbmVzMRcwFQYDVQQD
-Ew5JUFMgU0VSVklET1JFUzEeMBwGCSqGSIb3DQEJARYPaXBzQG1haWwuaXBzLmVzMIGfMA0GCSqG
-SIb3DQEBAQUAA4GNADCBiQKBgQCsT1J0nznqjtwlxLyYXZhkJAk8IbPMGbWOlI6H0fg3PqHILVik
-gDVboXVsHUUMH2Fjal5vmwpMwci4YSM1gf/+rHhwLWjhOgeYlQJU3c0jt4BT18g3RXIGJBK6E2Eh
-im51KODFDzT9NthFf+G4Nu+z4cYgjui0OLzhPvYR3oydAQIDAQABMA0GCSqGSIb3DQEBBAUAA4GB
-ACzzw3lYJN7GO9HgQmm47mSzPWIBubOE3yN93ZjPEKn+ANgilgUTB1RXxafey9m4iEL2mdsUdx+2
-/iU94aI+A6mB0i1sR/WWRowiq8jMDQ6XXotBtDvECgZAHd1G9AHduoIuPD14cJ58GNCr+Lh3B0Zx
-8coLY1xq+XKU1QFPoNtC
------END CERTIFICATE-----
-
 IPS Timestamping root
 =====================
 -----BEGIN CERTIFICATE-----
@@ -2440,34 +2102,6 @@ KVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEYWQPJIrSPnNVeKtelttQKbfi3
 QBFGmh95DmK/D5fs4C8fF5Q=
 -----END CERTIFICATE-----
 
-StartCom Ltd.
-=============
------BEGIN CERTIFICATE-----
-MIIFFjCCBH+gAwIBAgIBADANBgkqhkiG9w0BAQQFADCBsDELMAkGA1UEBhMCSUwxDzANBgNVBAgT
-BklzcmFlbDEOMAwGA1UEBxMFRWlsYXQxFjAUBgNVBAoTDVN0YXJ0Q29tIEx0ZC4xGjAYBgNVBAsT
-EUNBIEF1dGhvcml0eSBEZXAuMSkwJwYDVQQDEyBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhv
-cml0eTEhMB8GCSqGSIb3DQEJARYSYWRtaW5Ac3RhcnRjb20ub3JnMB4XDTA1MDMxNzE3Mzc0OFoX
-DTM1MDMxMDE3Mzc0OFowgbAxCzAJBgNVBAYTAklMMQ8wDQYDVQQIEwZJc3JhZWwxDjAMBgNVBAcT
-BUVpbGF0MRYwFAYDVQQKEw1TdGFydENvbSBMdGQuMRowGAYDVQQLExFDQSBBdXRob3JpdHkgRGVw
-LjEpMCcGA1UEAxMgRnJlZSBTU0wgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxITAfBgkqhkiG9w0B
-CQEWEmFkbWluQHN0YXJ0Y29tLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA7YRgACOe
-yEpRKSfeOqE5tWmrCbIvNP1h3D3TsM+x18LEwrHkllbEvqoUDufMOlDIOmKdw6OsWXuO7lUaHEe+
-o5c5s7XvIywI6Nivcy+5yYPo7QAPyHWlLzRMGOh2iCNJitu27Wjaw7ViKUylS7eYtAkUEKD4/mJ2
-IhULpNYILzUCAwEAAaOCAjwwggI4MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgHmMB0GA1Ud
-DgQWBBQcicOWzL3+MtUNjIExtpidjShkjTCB3QYDVR0jBIHVMIHSgBQcicOWzL3+MtUNjIExtpid
-jShkjaGBtqSBszCBsDELMAkGA1UEBhMCSUwxDzANBgNVBAgTBklzcmFlbDEOMAwGA1UEBxMFRWls
-YXQxFjAUBgNVBAoTDVN0YXJ0Q29tIEx0ZC4xGjAYBgNVBAsTEUNBIEF1dGhvcml0eSBEZXAuMSkw
-JwYDVQQDEyBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYS
-YWRtaW5Ac3RhcnRjb20ub3JnggEAMB0GA1UdEQQWMBSBEmFkbWluQHN0YXJ0Y29tLm9yZzAdBgNV
-HRIEFjAUgRJhZG1pbkBzdGFydGNvbS5vcmcwEQYJYIZIAYb4QgEBBAQDAgAHMC8GCWCGSAGG+EIB
-DQQiFiBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAyBglghkgBhvhCAQQEJRYjaHR0
-cDovL2NlcnQuc3RhcnRjb20ub3JnL2NhLWNybC5jcmwwKAYJYIZIAYb4QgECBBsWGWh0dHA6Ly9j
-ZXJ0LnN0YXJ0Y29tLm9yZy8wOQYJYIZIAYb4QgEIBCwWKmh0dHA6Ly9jZXJ0LnN0YXJ0Y29tLm9y
-Zy9pbmRleC5waHA/YXBwPTExMTANBgkqhkiG9w0BAQQFAAOBgQBscSXhnjSRIe/bbL0BCFaPiNhB
-OlP1ct8nV0t2hPdopP7rPwl+KLhX6h/BquL/lp9JmeaylXOWxkjHXo0Hclb4g4+fd68p00UOpO6w
-NnQt8M2YI3s3S9r+UZjEHjQ8iP2ZO1CnwYszx8JSFhKVU2Ui77qLzmLbcCOxgN8aIDjnfg==
------END CERTIFICATE-----
-
 StartCom Certification Authority
 ================================
 -----BEGIN CERTIFICATE-----
@@ -3309,8 +2943,8 @@ PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY
 WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
 -----END CERTIFICATE-----
 
-AC Ra+¡z Certic+ímara S.A.
-==========================
+AC Ra\xC3\xADz Certic\xC3\xA1mara S.A.
+======================================
 -----BEGIN CERTIFICATE-----
 MIIGZjCCBE6gAwIBAgIPB35Sk3vgFeNX8GmMy+wMMA0GCSqGSIb3DQEBBQUAMHsxCzAJBgNVBAYT
 AkNPMUcwRQYDVQQKDD5Tb2NpZWRhZCBDYW1lcmFsIGRlIENlcnRpZmljYWNpw7NuIERpZ2l0YWwg
@@ -3507,3 +3141,770 @@ hO0j9n0Hq0V+09+zv+mKts2oomcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+T
 X3EJIrduPuocA06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW
 WL1WMRJOEcgh4LMRkWXbtKaIOM5V
 -----END CERTIFICATE-----
+
+ePKI Root Certification Authority
+=================================
+-----BEGIN CERTIFICATE-----
+MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
+EwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0ZC4xKjAoBgNVBAsMIWVQS0kg
+Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMx
+MjdaMF4xCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEq
+MCgGA1UECwwhZVBLSSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAHSyZbCUNs
+IZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAhijHyl3SJCRImHJ7K2RKi
+lTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3XDZoTM1PRYfl61dd4s5oz9wCGzh1NlDiv
+qOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX
+12ruOzjjK9SXDrkb5wdJfzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0O
+WQqraffAsgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uUWH1+
+ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLSnT0IFaUQAS2zMnao
+lQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pHdmX2Os+PYhcZewoozRrSgx4hxyy/
+vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJipNiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXi
+Zo1jDiVN1Rmy5nk3pyKdVDECAwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/Qkqi
+MAwGA1UdEwQFMAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
+ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGBuvl2ICO1J2B0
+1GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6YlPwZpVnPDimZI+ymBV3QGypzq
+KOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkPJXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdV
+xrsStZf0X4OFunHB2WyBEXYKCrC/gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEP
+NXubrjlpC2JgQCA2j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+r
+GNm65ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUBo2M3IUxE
+xJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS/jQ6fbjpKdx2qcgw+BRx
+gMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2zGp1iro2C6pSe3VkQw63d4k3jMdXH7Ojy
+sP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTEW9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmOD
+BCEIZ43ygknQW/2xzQ+DhNQ+IIX3Sj0rnP0qCglN6oH4EZw=
+-----END CERTIFICATE-----
+
+T\xc3\x9c\x42\xC4\xB0TAK UEKAE K\xC3\xB6k Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1 - S\xC3\xBCr\xC3\xBCm 3
+=============================================================================================================================
+-----BEGIN CERTIFICATE-----
+MIIFFzCCA/+gAwIBAgIBETANBgkqhkiG9w0BAQUFADCCASsxCzAJBgNVBAYTAlRSMRgwFgYDVQQH
+DA9HZWJ6ZSAtIEtvY2FlbGkxRzBFBgNVBAoMPlTDvHJraXllIEJpbGltc2VsIHZlIFRla25vbG9q
+aWsgQXJhxZ90xLFybWEgS3VydW11IC0gVMOcQsSwVEFLMUgwRgYDVQQLDD9VbHVzYWwgRWxla3Ry
+b25payB2ZSBLcmlwdG9sb2ppIEFyYcWfdMSxcm1hIEVuc3RpdMO8c8O8IC0gVUVLQUUxIzAhBgNV
+BAsMGkthbXUgU2VydGlmaWthc3lvbiBNZXJrZXppMUowSAYDVQQDDEFUw5xCxLBUQUsgVUVLQUUg
+S8O2ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSAtIFPDvHLDvG0gMzAeFw0wNzA4
+MjQxMTM3MDdaFw0xNzA4MjExMTM3MDdaMIIBKzELMAkGA1UEBhMCVFIxGDAWBgNVBAcMD0dlYnpl
+IC0gS29jYWVsaTFHMEUGA1UECgw+VMO8cmtpeWUgQmlsaW1zZWwgdmUgVGVrbm9sb2ppayBBcmHF
+n3TEsXJtYSBLdXJ1bXUgLSBUw5xCxLBUQUsxSDBGBgNVBAsMP1VsdXNhbCBFbGVrdHJvbmlrIHZl
+IEtyaXB0b2xvamkgQXJhxZ90xLFybWEgRW5zdGl0w7xzw7wgLSBVRUtBRTEjMCEGA1UECwwaS2Ft
+dSBTZXJ0aWZpa2FzeW9uIE1lcmtlemkxSjBIBgNVBAMMQVTDnELEsFRBSyBVRUtBRSBLw7ZrIFNl
+cnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIC0gU8O8csO8bSAzMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAim1L/xCIOsP2fpTo6iBkcK4hgb46ezzb8R1Sf1n68yJMlaCQvEhO
+Eav7t7WNeoMojCZG2E6VQIdhn8WebYGHV2yKO7Rm6sxA/OOqbLLLAdsyv9Lrhc+hDVXDWzhXcLh1
+xnnRFDDtG1hba+818qEhTsXOfJlfbLm4IpNQp81McGq+agV/E5wrHur+R84EpW+sky58K5+eeROR
+6Oqeyjh1jmKwlZMq5d/pXpduIF9fhHpEORlAHLpVK/swsoHvhOPc7Jg4OQOFCKlUAwUp8MmPi+oL
+hmUZEdPpCSPeaJMDyTYcIW7OjGbxmTDY17PDHfiBLqi9ggtm/oLL4eAagsNAgQIDAQABo0IwQDAd
+BgNVHQ4EFgQUvYiHyY/2pAoLquvF/pEjnatKijIwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
+MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAB18+kmPNOm3JpIWmgV050vQbTlswyb2zrgxvMTfvCr4
+N5EY3ATIZJkrGG2AA1nJrvhY0D7twyOfaTyGOBye79oneNGEN3GKPEs5z35FBtYt2IpNeBLWrcLT
+y9LQQfMmNkqblWwM7uXRQydmwYj3erMgbOqwaSvHIOgMA8RBBZniP+Rr+KCGgceExh/VS4ESshYh
+LBOhgLJeDEoTniDYYkCrkOpkSi+sDQESeUWoL4cZaMjihccwsnX5OD+ywJO0a+IDRM5noN+J1q2M
+dqMTw5RhK2vZbMEHCiIHhWyFJEapvj+LeISCfiQMnf2BN+MlqO02TpUsyZyQ2uypQjyttgI=
+-----END CERTIFICATE-----
+
+Buypass Class 2 CA 1
+====================
+-----BEGIN CERTIFICATE-----
+MIIDUzCCAjugAwIBAgIBATANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
+QnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3MgQ2xhc3MgMiBDQSAxMB4XDTA2
+MTAxMzEwMjUwOVoXDTE2MTAxMzEwMjUwOVowSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBh
+c3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDIgQ0EgMTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAIs8B0XY9t/mx8q6jUPFR42wWsE425KEHK8T1A9vNkYgxC7M
+cXA0ojTTNy7Y3Tp3L8DrKehc0rWpkTSHIln+zNvnma+WwajHQN2lFYxuyHyXA8vmIPLXl18xoS83
+0r7uvqmtqEyeIWZDO6i88wmjONVZJMHCR3axiFyCO7srpgTXjAePzdVBHfCuuCkslFJgNJQ72uA4
+0Z0zPhX0kzLFANq1KWYOOngPIVJfAuWSeyXTkh4vFZ2B5J2O6O+JzhRMVB0cgRJNcKi+EAUXfh/R
+uFdV7c27UsKwHnjCTTZoy1YmwVLBvXb3WNVyfh9EdrsAiR0WnVE1703CVu9r4Iw7DekCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUP42aWYv8e3uco684sDntkHGA1sgwDgYDVR0P
+AQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAVGn4TirnoB6NLJzKyQJHyIdFkhb5jatLPgcIV
+1Xp+DCmsNx4cfHZSldq1fyOhKXdlyTKdqC5Wq2B2zha0jX94wNWZUYN/Xtm+DKhQ7SLHrQVMdvvt
+7h5HZPb3J31cKA9FxVxiXqaakZG3Uxcu3K1gnZZkOb1naLKuBctN518fV4bVIJwo+28TOPX2EZL2
+fZleHwzoq0QkKXJAPTZSr4xYkHPB7GEseaHsh7U/2k3ZIQAw3pDaDtMaSKk+hQsUi4y8QZ5q9w5w
+wDX3OaJdZtB7WZ+oRxKaJyOkLY4ng5IgodcVf/EuGO70SH8vf/GhGLWhC5SgYiAynB321O+/TIho
+-----END CERTIFICATE-----
+
+Buypass Class 3 CA 1
+====================
+-----BEGIN CERTIFICATE-----
+MIIDUzCCAjugAwIBAgIBAjANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
+QnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3MgQ2xhc3MgMyBDQSAxMB4XDTA1
+MDUwOTE0MTMwM1oXDTE1MDUwOTE0MTMwM1owSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBh
+c3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAKSO13TZKWTeXx+HgJHqTjnmGcZEC4DVC69TB4sSveZn8AKx
+ifZgisRbsELRwCGoy+Gb72RRtqfPFfV0gGgEkKBYouZ0plNTVUhjP5JW3SROjvi6K//zNIqeKNc0
+n6wv1g/xpC+9UrJJhW05NfBEMJNGJPO251P7vGGvqaMU+8IXF4Rs4HyI+MkcVyzwPX6UvCWThOia
+AJpFBUJXgPROztmuOfbIUxAMZTpHe2DC1vqRycZxbL2RhzyRhkmr8w+gbCZ2Xhysm3HljbybIR6c
+1jh+JIAVMYKWsUnTYjdbiAwKYjT+p0h+mbEwi5A3lRyoH6UsjfRVyNvdWQrCrXig9IsCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUOBTmyPCppAP0Tj4io1vy1uCtQHQwDgYDVR0P
+AQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQABZ6OMySU9E2NdFm/soT4JXJEVKirZgCFPBdy7
+pYmrEzMqnji3jG8CcmPHc3ceCQa6Oyh7pEfJYWsICCD8igWKH7y6xsL+z27sEzNxZy5p+qksP2bA
+EllNC1QCkoS72xLvg3BweMhT+t/Gxv/ciC8HwEmdMldg0/L2mSlf56oBzKwzqBwKu5HEA6BvtjT5
+htOzdlSY9EqBs1OdTUDs5XcTRa9bqh/YL0yCe/4qxFi7T/ye/QNlGioOw6UgFpRreaaiErS7GqQj
+el/wroQk5PMr+4okoyeYZdowdXb8GZHo2+ubPzK/QJcHJrrM85SFSnonk8+QQtS4Wxam58tAA915
+-----END CERTIFICATE-----
+
+EBG Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1
+==========================================================================
+-----BEGIN CERTIFICATE-----
+MIIF5zCCA8+gAwIBAgIITK9zQhyOdAIwDQYJKoZIhvcNAQEFBQAwgYAxODA2BgNVBAMML0VCRyBF
+bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMTcwNQYDVQQKDC5FQkcg
+QmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXptZXRsZXJpIEEuxZ4uMQswCQYDVQQGEwJUUjAe
+Fw0wNjA4MTcwMDIxMDlaFw0xNjA4MTQwMDMxMDlaMIGAMTgwNgYDVQQDDC9FQkcgRWxla3Ryb25p
+ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTE3MDUGA1UECgwuRUJHIEJpbGnFn2lt
+IFRla25vbG9qaWxlcmkgdmUgSGl6bWV0bGVyaSBBLsWeLjELMAkGA1UEBhMCVFIwggIiMA0GCSqG
+SIb3DQEBAQUAA4ICDwAwggIKAoICAQDuoIRh0DpqZhAy2DE4f6en5f2h4fuXd7hxlugTlkaDT7by
+X3JWbhNgpQGR4lvFzVcfd2NR/y8927k/qqk153nQ9dAktiHq6yOU/im/+4mRDGSaBUorzAzu8T2b
+gmmkTPiab+ci2hC6X5L8GCcKqKpE+i4stPtGmggDg3KriORqcsnlZR9uKg+ds+g75AxuetpX/dfr
+eYteIAbTdgtsApWjluTLdlHRKJ2hGvxEok3MenaoDT2/F08iiFD9rrbskFBKW5+VQarKD7JK/oCZ
+TqNGFav4c0JqwmZ2sQomFd2TkuzbqV9UIlKRcF0T6kjsbgNs2d1s/OsNA/+mgxKb8amTD8UmTDGy
+Y5lhcucqZJnSuOl14nypqZoaqsNW2xCaPINStnuWt6yHd6i58mcLlEOzrz5z+kI2sSXFCjEmN1Zn
+uqMLfdb3ic1nobc6HmZP9qBVFCVMLDMNpkGMvQQxahByCp0OLna9XvNRiYuoP1Vzv9s6xiQFlpJI
+qkuNKgPlV5EQ9GooFW5Hd4RcUXSfGenmHmMWOeMRFeNYGkS9y8RsZteEBt8w9DeiQyJ50hBs37vm
+ExH8nYQKE3vwO9D8owrXieqWfo1IhR5kX9tUoqzVegJ5a9KK8GfaZXINFHDk6Y54jzJ0fFfy1tb0
+Nokb+Clsi7n2l9GkLqq+CxnCRelwXQIDAJ3Zo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
+/wQEAwIBBjAdBgNVHQ4EFgQU587GT/wWZ5b6SqMHwQSny2re2kcwHwYDVR0jBBgwFoAU587GT/wW
+Z5b6SqMHwQSny2re2kcwDQYJKoZIhvcNAQEFBQADggIBAJuYml2+8ygjdsZs93/mQJ7ANtyVDR2t
+FcU22NU57/IeIl6zgrRdu0waypIN30ckHrMk2pGI6YNw3ZPX6bqz3xZaPt7gyPvT/Wwp+BVGoGgm
+zJNSroIBk5DKd8pNSe/iWtkqvTDOTLKBtjDOWU/aWR1qeqRFsIImgYZ29fUQALjuswnoT4cCB64k
+XPBfrAowzIpAoHMEwfuJJPaaHFy3PApnNgUIMbOv2AFoKuB4j3TeuFGkjGwgPaL7s9QJ/XvCgKqT
+bCmYIai7FvOpEl90tYeY8pUm3zTvilORiF0alKM/fCL414i6poyWqD1SNGKfAB5UVUJnxk1Gj7sU
+RT0KlhaOEKGXmdXTMIXM3rRyt7yKPBgpaP3ccQfuJDlq+u2lrDgv+R4QDgZxGhBM/nV+/x5XOULK
+1+EVoVZVWRvRo68R2E7DpSvvkL/A7IITW43WciyTTo9qKd+FPNMN4KIYEsxVL0e3p5sC/kH2iExt
+2qkBR4NkJ2IQgtYSe14DHzSpyZH+r11thie3I6p1GMog57AP14kOpmciY/SDQSsGS7tY1dHXt7kQ
+Y9iJSrSq3RZj9W6+YKH47ejWkE8axsWgKdOnIaj1Wjz3x0miIZpKlVIglnKaZsv30oZDfCK+lvm9
+AahH3eU7QPl1K5srRmSGjR70j/sHd9DqSaIcjVIUpgqT
+-----END CERTIFICATE-----
+
+certSIGN ROOT CA
+================
+-----BEGIN CERTIFICATE-----
+MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYTAlJPMREwDwYD
+VQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTAeFw0wNjA3MDQxNzIwMDRa
+Fw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UE
+CxMQY2VydFNJR04gUk9PVCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7I
+JUqOtdu0KBuqV5Do0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHH
+rfAQUySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5dRdY4zTW2
+ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQOA7+j0xbm0bqQfWwCHTD
+0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwvJoIQ4uNllAoEwF73XVv4EOLQunpL+943
+AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8B
+Af8EBAMCAcYwHQYDVR0OBBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IB
+AQA+0hyJLjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecYMnQ8
+SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ44gx+FkagQnIl6Z0
+x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6IJd1hJyMctTEHBDa0GpC9oHRxUIlt
+vBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNwi/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7Nz
+TogVZ96edhBiIL5VaZVDADlN9u6wWk5JRFRYX0KD
+-----END CERTIFICATE-----
+
+CNNIC ROOT
+==========
+-----BEGIN CERTIFICATE-----
+MIIDVTCCAj2gAwIBAgIESTMAATANBgkqhkiG9w0BAQUFADAyMQswCQYDVQQGEwJDTjEOMAwGA1UE
+ChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwHhcNMDcwNDE2MDcwOTE0WhcNMjcwNDE2MDcw
+OTE0WjAyMQswCQYDVQQGEwJDTjEOMAwGA1UEChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1Qw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTNfc/c3et6FtzF8LRb+1VvG7q6KR5smzD
+o+/hn7E7SIX1mlwhIhAsxYLO2uOabjfhhyzcuQxauohV3/2q2x8x6gHx3zkBwRP9SFIhxFXf2tiz
+VHa6dLG3fdfA6PZZxU3Iva0fFNrfWEQlMhkqx35+jq44sDB7R3IJMfAw28Mbdim7aXZOV/kbZKKT
+VrdvmW7bCgScEeOAH8tjlBAKqeFkgjH5jCftppkA9nCTGPihNIaj3XrCGHn2emU1z5DrvTOTn1Or
+czvmmzQgLx3vqR1jGqCA2wMv+SYahtKNu6m+UjqHZ0gNv7Sg2Ca+I19zN38m5pIEo3/PIKe38zrK
+y5nLAgMBAAGjczBxMBEGCWCGSAGG+EIBAQQEAwIABzAfBgNVHSMEGDAWgBRl8jGtKvf33VKWCscC
+wQ7vptU7ETAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIB/jAdBgNVHQ4EFgQUZfIxrSr3991S
+lgrHAsEO76bVOxEwDQYJKoZIhvcNAQEFBQADggEBAEs17szkrr/Dbq2flTtLP1se31cpolnKOOK5
+Gv+e5m4y3R6u6jW39ZORTtpC4cMXYFDy0VwmuYK36m3knITnA3kXr5g9lNvHugDnuL8BV8F3RTIM
+O/G0HAiw/VGgod2aHRM2mm23xzy54cXZF/qD1T0VoDy7HgviyJA/qIYM/PmLXoXLT1tLYhFHxUV8
+BS9BsZ4QaRuZluBVeftOhpm4lNqGOGqTo+fLbuXf6iFViZx9fX+Y9QCJ7uOEwFyWtcVG6kbghVW2
+G8kS1sHNzYDzAgE8yGnLRUhj2JTQ7IUOO04RZfSCjKY9ri4ilAnIXOo8gV0WKgOXFlUJ24pBgp5m
+mxE=
+-----END CERTIFICATE-----
+
+ApplicationCA - Japanese Government
+===================================
+-----BEGIN CERTIFICATE-----
+MIIDoDCCAoigAwIBAgIBMTANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJKUDEcMBoGA1UEChMT
+SmFwYW5lc2UgR292ZXJubWVudDEWMBQGA1UECxMNQXBwbGljYXRpb25DQTAeFw0wNzEyMTIxNTAw
+MDBaFw0xNzEyMTIxNTAwMDBaMEMxCzAJBgNVBAYTAkpQMRwwGgYDVQQKExNKYXBhbmVzZSBHb3Zl
+cm5tZW50MRYwFAYDVQQLEw1BcHBsaWNhdGlvbkNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAp23gdE6Hj6UG3mii24aZS2QNcfAKBZuOquHMLtJqO8F6tJdhjYq+xpqcBrSGUeQ3DnR4
+fl+Kf5Sk10cI/VBaVuRorChzoHvpfxiSQE8tnfWuREhzNgaeZCw7NCPbXCbkcXmP1G55IrmTwcrN
+wVbtiGrXoDkhBFcsovW8R0FPXjQilbUfKW1eSvNNcr5BViCH/OlQR9cwFO5cjFW6WY2H/CPek9AE
+jP3vbb3QesmlOmpyM8ZKDQUXKi17safY1vC+9D/qDihtQWEjdnjDuGWk81quzMKq2edY3rZ+nYVu
+nyoKb58DKTCXKB28t89UKU5RMfkntigm/qJj5kEW8DOYRwIDAQABo4GeMIGbMB0GA1UdDgQWBBRU
+WssmP3HMlEYNllPqa0jQk/5CdTAOBgNVHQ8BAf8EBAMCAQYwWQYDVR0RBFIwUKROMEwxCzAJBgNV
+BAYTAkpQMRgwFgYDVQQKDA/ml6XmnKzlm73mlL/lupwxIzAhBgNVBAsMGuOCouODl+ODquOCseOD
+vOOCt+ODp+ODs0NBMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADlqRHZ3ODrs
+o2dGD/mLBqj7apAxzn7s2tGJfHrrLgy9mTLnsCTWw//1sogJhyzjVOGjprIIC8CFqMjSnHH2HZ9g
+/DgzE+Ge3Atf2hZQKXsvcJEPmbo0NI2VdMV+eKlmXb3KIXdCEKxmJj3ekav9FfBv7WxfEPjzFvYD
+io+nEhEMy/0/ecGc/WLuo89UDNErXxc+4z6/wCs+CZv+iKZ+tJIX/COUgb1up8WMwusRRdv4QcmW
+dupwX3kSa+SjB1oF7ydJzyGfikwJcGapJsErEU4z0g781mzSDjJkaP+tBXhfAx2o45CsJOAPQKdL
+rosot4LKGAfmt1t06SAZf7IbiVQ=
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority - G3
+=============================================
+-----BEGIN CERTIFICATE-----
+MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UE
+BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA4IEdlb1RydXN0
+IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFy
+eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIz
+NTk1OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAo
+YykgMjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMT
+LUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz+uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5j
+K/BGvESyiaHAKAxJcCGVn2TAppMSAmUmhsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdE
+c5IiaacDiGydY8hS2pgn5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3C
+IShwiP/WJmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exALDmKu
+dlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZChuOl1UcCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMR5yo6hTgMdHNxr
+2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IBAQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9
+cr5HqQ6XErhK8WTTOd8lNNTBzU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbE
+Ap7aDHdlDkQNkv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD
+AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUHSJsMC8tJP33s
+t/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2Gspki4cErx5z481+oghLrGREt
+-----END CERTIFICATE-----
+
+thawte Primary Root CA - G2
+===========================
+-----BEGIN CERTIFICATE-----
+MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDELMAkGA1UEBhMC
+VVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMpIDIwMDcgdGhhd3RlLCBJbmMu
+IC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3Qg
+Q0EgLSBHMjAeFw0wNzExMDUwMDAwMDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEV
+MBMGA1UEChMMdGhhd3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBG
+b3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAt
+IEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/BebfowJPDQfGAFG6DAJS
+LSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6papu+7qzcMBniKI11KOasf2twu8x+qi5
+8/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU
+mtgAMADna3+FGO6Lts6KDPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUN
+G4k8VIZ3KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41oxXZ3K
+rr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg==
+-----END CERTIFICATE-----
+
+thawte Primary Root CA - G3
+===========================
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
+BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
+aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0w
+ODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh
+d3RlLCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9uMTgwNgYD
+VQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIG
+A1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAsr8nLPvb2FvdeHsbnndmgcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2At
+P0LMqmsywCPLLEHd5N/8YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC
++BsUa0Lfb1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS99irY
+7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2SzhkGcuYMXDhpxwTW
+vGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUkOQIDAQABo0IwQDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJ
+KoZIhvcNAQELBQADggEBABpA2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweK
+A3rD6z8KLFIWoCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
+t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7cKUGRIjxpp7sC
+8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fMm7v/OeZWYdMKp8RcTGB7BXcm
+er/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZuMdRAGmI0Nj81Aa6sY6A=
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority - G2
+=============================================
+-----BEGIN CERTIFICATE-----
+MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDELMAkGA1UEBhMC
+VVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA3IEdlb1RydXN0IElu
+Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBD
+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1
+OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
+MjAwNyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMTLUdl
+b1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjB2MBAGByqGSM49AgEG
+BSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcLSo17VDs6bl8VAsBQps8lL33KSLjHUGMc
+KiEIfJo22Av+0SbFWDEwKCXzXV2juLaltJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+
+EVXVMAoGCCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGTqQ7m
+ndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBuczrD6ogRLQy7rQkgu2
+npaqBA+K
+-----END CERTIFICATE-----
+
+VeriSign Universal Root Certification Authority
+===============================================
+-----BEGIN CERTIFICATE-----
+MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCBvTELMAkGA1UE
+BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
+ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
+IHVzZSBvbmx5MTgwNgYDVQQDEy9WZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9u
+IEF1dGhvcml0eTAeFw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
+cmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNhbCBSb290IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj
+1mCOkdeQmIN65lgZOIzF9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGP
+MiJhgsWHH26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+HLL72
+9fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN/BMReYTtXlT2NJ8I
+AfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPTrJ9VAMf2CGqUuV/c4DPxhGD5WycR
+tPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0G
+CCsGAQUFBwEMBGEwX6FdoFswWTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2O
+a8PPgGrUSBgsexkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
+DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4sAPmLGd75JR3
+Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+seQxIcaBlVZaDrHC1LGmWazx
+Y8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTx
+P/jgdFcrGJ2BtMQo2pSXpXDrrB2+BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+P
+wGZsY6rp2aQW9IHRlRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4
+mJO37M2CYfE45k+XmCpajQ==
+-----END CERTIFICATE-----
+
+VeriSign Class 3 Public Primary Certification Authority - G4
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjELMAkGA1UEBhMC
+VVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3
+b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVz
+ZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjEL
+MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBU
+cnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRo
+b3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5
+IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8
+Utpkmw4tXNherJI9/gHmGUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGz
+rl0Bp3vefLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUwAwEB
+/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEw
+HzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVyaXNpZ24u
+Y29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMWkf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMD
+A2gAMGUCMGYhDBgmYFo4e1ZC4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIx
+AJw9SDkjOVgaFRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA==
+-----END CERTIFICATE-----
+
+NetLock Arany (Class Gold) Főtanúsítvány
+============================================
+-----BEGIN CERTIFICATE-----
+MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQGEwJIVTERMA8G
+A1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610
+dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBB
+cmFueSAoQ2xhc3MgR29sZCkgRsWRdGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgx
+MjA2MTUwODIxWjCBpzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxO
+ZXRMb2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNzIEdvbGQpIEbFkXRhbsO6
+c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxCRec75LbRTDofTjl5Bu
+0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrTlF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw
+/HpYzY6b7cNGbIRwXdrzAZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAk
+H3B5r9s5VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRGILdw
+fzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2BJtr+UBdADTHLpl1
+neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAGAQH/AgEEMA4GA1UdDwEB/wQEAwIB
+BjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2MU9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwW
+qZw8UQCgwBEIBaeZ5m8BiFRhbvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTta
+YtOUZcTh5m2C+C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC
+bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2FuLjbvrW5Kfna
+NwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2XjG4Kvte9nHfRCaexOYNkbQu
+dZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
+-----END CERTIFICATE-----
+
+Staat der Nederlanden Root CA - G2
+==================================
+-----BEGIN CERTIFICATE-----
+MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE
+CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+Um9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oXDTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMC
+TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l
+ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ
+5291qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8SpuOUfiUtn
+vWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPUZ5uW6M7XxgpT0GtJlvOj
+CwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvEpMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiil
+e7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCR
+OME4HYYEhLoaJXhena/MUGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpI
+CT0ugpTNGmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy5V65
+48r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv6q012iDTiIJh8BIi
+trzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEKeN5KzlW/HdXZt1bv8Hb/C3m1r737
+qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMB
+AAGjgZcwgZQwDwYDVR0TAQH/BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcC
+ARYxaHR0cDovL3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqGSIb3DQEBCwUA
+A4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLySCZa59sCrI2AGeYwRTlHSeYAz
++51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwj
+f/ST7ZwaUb7dRUG/kSS0H4zpX897IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaN
+kqbG9AclVMwWVxJKgnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfk
+CpYL+63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxLvJxxcypF
+URmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkmbEgeqmiSBeGCc1qb3Adb
+CG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvkN1trSt8sV4pAWja63XVECDdCcAz+3F4h
+oKOKwJCcaNpQ5kUQR3i2TtJlycM33+FCY7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoV
+IPVVYpbtbZNQvOSqeK3Zywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm
+66+KAQ==
+-----END CERTIFICATE-----
+
+CA Disig
+========
+-----BEGIN CERTIFICATE-----
+MIIEDzCCAvegAwIBAgIBATANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJTSzETMBEGA1UEBxMK
+QnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwHhcNMDYw
+MzIyMDEzOTM0WhcNMTYwMzIyMDEzOTM0WjBKMQswCQYDVQQGEwJTSzETMBEGA1UEBxMKQnJhdGlz
+bGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCS9jHBfYj9mQGp2HvycXXxMcbzdWb6UShGhJd4NLxs/LxFWYgm
+GErENx+hSkS943EE9UQX4j/8SFhvXJ56CbpRNyIjZkMhsDxkovhqFQ4/61HhVKndBpnXmjxUizkD
+Pw/Fzsbrg3ICqB9x8y34dQjbYkzo+s7552oftms1grrijxaSfQUMbEYDXcDtab86wYqg6I7ZuUUo
+hwjstMoVvoLdtUSLLa2GDGhibYVW8qwUYzrG0ZmsNHhWS8+2rT+MitcE5eN4TPWGqvWP+j1scaMt
+ymfraHtuM6kMgiioTGohQBUgDCZbg8KpFhXAJIJdKxatymP2dACw30PEEGBWZ2NFAgMBAAGjgf8w
+gfwwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUjbJJaJ1yCCW5wCf1UJNWSEZx+Y8wDgYDVR0P
+AQH/BAQDAgEGMDYGA1UdEQQvMC2BE2Nhb3BlcmF0b3JAZGlzaWcuc2uGFmh0dHA6Ly93d3cuZGlz
+aWcuc2svY2EwZgYDVR0fBF8wXTAtoCugKYYnaHR0cDovL3d3dy5kaXNpZy5zay9jYS9jcmwvY2Ff
+ZGlzaWcuY3JsMCygKqAohiZodHRwOi8vY2EuZGlzaWcuc2svY2EvY3JsL2NhX2Rpc2lnLmNybDAa
+BgNVHSAEEzARMA8GDSuBHpGT5goAAAABAQEwDQYJKoZIhvcNAQEFBQADggEBAF00dGFMrzvY/59t
+WDYcPQuBDRIrRhCA/ec8J9B6yKm2fnQwM6M6int0wHl5QpNt/7EpFIKrIYwvF/k/Ji/1WcbvgAa3
+mkkp7M5+cTxqEEHA9tOasnxakZzArFvITV734VP/Q3f8nktnbNfzg9Gg4H8l37iYC5oyOGwwoPP/
+CBUz91BKez6jPiCp3C9WgArtQVCwyfTssuMmRAAOb54GvCKWU3BlxFAKRmukLyeBEicTXxChds6K
+ezfqwzlhA5WYOudsiCUI/HloDYd9Yvi0X/vF2Ey9WLw/Q1vUHgFNPGO+I++MzVpQuGhU+QqZMxEA
+4Z7CRneC9VkGjCFMhwnN5ag=
+-----END CERTIFICATE-----
+
+Juur-SK
+=======
+-----BEGIN CERTIFICATE-----
+MIIE5jCCA86gAwIBAgIEO45L/DANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcNAQkBFglwa2lA
+c2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAw
+DgYDVQQDEwdKdXVyLVNLMB4XDTAxMDgzMDE0MjMwMVoXDTE2MDgyNjE0MjMwMVowXTEYMBYGCSqG
+SIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVy
+aW1pc2tlc2t1czEQMA4GA1UEAxMHSnV1ci1TSzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAIFxNj4zB9bjMI0TfncyRsvPGbJgMUaXhvSYRqTCZUXP00B841oiqBB4M8yIsdOBSvZiF3tf
+TQou0M+LI+5PAk676w7KvRhj6IAcjeEcjT3g/1tf6mTll+g/mX8MCgkzABpTpyHhOEvWgxutr2TC
++Rx6jGZITWYfGAriPrsfB2WThbkasLnE+w0R9vXW+RvHLCu3GFH+4Hv2qEivbDtPL+/40UceJlfw
+UR0zlv/vWT3aTdEVNMfqPxZIe5EcgEMPPbgFPtGzlc3Yyg/CQ2fbt5PgIoIuvvVoKIO5wTtpeyDa
+Tpxt4brNj3pssAki14sL2xzVWiZbDcDq5WDQn/413z8CAwEAAaOCAawwggGoMA8GA1UdEwEB/wQF
+MAMBAf8wggEWBgNVHSAEggENMIIBCTCCAQUGCisGAQQBzh8BAQEwgfYwgdAGCCsGAQUFBwICMIHD
+HoHAAFMAZQBlACAAcwBlAHIAdABpAGYAaQBrAGEAYQB0ACAAbwBuACAAdgDkAGwAagBhAHMAdABh
+AHQAdQBkACAAQQBTAC0AaQBzACAAUwBlAHIAdABpAGYAaQB0AHMAZQBlAHIAaQBtAGkAcwBrAGUA
+cwBrAHUAcwAgAGEAbABhAG0ALQBTAEsAIABzAGUAcgB0AGkAZgBpAGsAYQBhAHQAaQBkAGUAIABr
+AGkAbgBuAGkAdABhAG0AaQBzAGUAawBzMCEGCCsGAQUFBwIBFhVodHRwOi8vd3d3LnNrLmVlL2Nw
+cy8wKwYDVR0fBCQwIjAgoB6gHIYaaHR0cDovL3d3dy5zay5lZS9qdXVyL2NybC8wHQYDVR0OBBYE
+FASqekej5ImvGs8KQKcYP2/v6X2+MB8GA1UdIwQYMBaAFASqekej5ImvGs8KQKcYP2/v6X2+MA4G
+A1UdDwEB/wQEAwIB5jANBgkqhkiG9w0BAQUFAAOCAQEAe8EYlFOiCfP+JmeaUOTDBS8rNXiRTHyo
+ERF5TElZrMj3hWVcRrs7EKACr81Ptcw2Kuxd/u+gkcm2k298gFTsxwhwDY77guwqYHhpNjbRxZyL
+abVAyJRld/JXIWY7zoVAtjNjGr95HvxcHdMdkxuLDF2FvZkwMhgJkVLpfKG6/2SSmuz+Ne6ML678
+IIbsSt4beDI3poHSna9aEhbKmVv8b20OxaAehsmR0FyYgl9jDIpaq9iVpszLita/ZEuOyoqysOkh
+Mp6qqIWYNIE5ITuoOlIyPfZrN4YGWhWY3PARZv40ILcD9EEQfTmEeZZyY7aWAuVrua0ZTbvGRNs2
+yyqcjg==
+-----END CERTIFICATE-----
+
+Hongkong Post Root CA 1
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoT
+DUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMB4XDTAzMDUx
+NTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25n
+IFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1
+ApzQjVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEnPzlTCeqr
+auh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjhZY4bXSNmO7ilMlHIhqqh
+qZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9nnV0ttgCXjqQesBCNnLsak3c78QA3xMY
+V18meMjWCnl3v/evt3a5pQuEF10Q6m/hq5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNV
+HRMBAf8ECDAGAQH/AgEDMA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7i
+h9legYsCmEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI37pio
+l7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clBoiMBdDhViw+5Lmei
+IAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJsEhTkYY2sEJCehFC78JZvRZ+K88ps
+T/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpOfMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilT
+c4afU9hDDl3WY4JxHYB0yvbiAmvZWg==
+-----END CERTIFICATE-----
+
+SecureSign RootCA11
+===================
+-----BEGIN CERTIFICATE-----
+MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDErMCkGA1UEChMi
+SmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoGA1UEAxMTU2VjdXJlU2lnbiBS
+b290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSsw
+KQYDVQQKEyJKYXBhbiBDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1
+cmVTaWduIFJvb3RDQTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvL
+TJszi1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8h9uuywGO
+wvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOVMdrAG/LuYpmGYz+/3ZMq
+g6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rP
+O7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitA
+bpSACW22s293bzUIUPsCh8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZX
+t94wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKCh
+OBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xmKbabfSVSSUOrTC4r
+bnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQX5Ucv+2rIrVls4W6ng+4reV6G4pQ
+Oh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWrQbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01
+y8hSyn+B/tlr0/cR7SXf+Of5pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061
+lgeLKBObjBmNQSdJQO7e5iNEOdyhIta6A/I=
+-----END CERTIFICATE-----
+
+ACEDICOM Root
+=============
+-----BEGIN CERTIFICATE-----
+MIIFtTCCA52gAwIBAgIIYY3HhjsBggUwDQYJKoZIhvcNAQEFBQAwRDEWMBQGA1UEAwwNQUNFRElD
+T00gUm9vdDEMMAoGA1UECwwDUEtJMQ8wDQYDVQQKDAZFRElDT00xCzAJBgNVBAYTAkVTMB4XDTA4
+MDQxODE2MjQyMloXDTI4MDQxMzE2MjQyMlowRDEWMBQGA1UEAwwNQUNFRElDT00gUm9vdDEMMAoG
+A1UECwwDUEtJMQ8wDQYDVQQKDAZFRElDT00xCzAJBgNVBAYTAkVTMIICIjANBgkqhkiG9w0BAQEF
+AAOCAg8AMIICCgKCAgEA/5KV4WgGdrQsyFhIyv2AVClVYyT/kGWbEHV7w2rbYgIB8hiGtXxaOLHk
+WLn709gtn70yN78sFW2+tfQh0hOR2QetAQXW8713zl9CgQr5auODAKgrLlUTY4HKRxx7XBZXehuD
+YAQ6PmXDzQHe3qTWDLqO3tkE7hdWIpuPY/1NFgu3e3eM+SW10W2ZEi5PGrjm6gSSrj0RuVFCPYew
+MYWveVqc/udOXpJPQ/yrOq2lEiZmueIM15jO1FillUAKt0SdE3QrwqXrIhWYENiLxQSfHY9g5QYb
+m8+5eaA9oiM/Qj9r+hwDezCNzmzAv+YbX79nuIQZ1RXve8uQNjFiybwCq0Zfm/4aaJQ0PZCOrfbk
+HQl/Sog4P75n/TSW9R28MHTLOO7VbKvU/PQAtwBbhTIWdjPp2KOZnQUAqhbm84F9b32qhm2tFXTT
+xKJxqvQUfecyuB+81fFOvW8XAjnXDpVCOscAPukmYxHqC9FK/xidstd7LzrZlvvoHpKuE1XI2Sf2
+3EgbsCTBheN3nZqk8wwRHQ3ItBTutYJXCb8gWH8vIiPYcMt5bMlL8qkqyPyHK9caUPgn6C9D4zq9
+2Fdx/c6mUlv53U3t5fZvie27k5x2IXXwkkwp9y+cAS7+UEaeZAwUswdbxcJzbPEHXEUkFDWug/Fq
+TYl6+rPYLWbwNof1K1MCAwEAAaOBqjCBpzAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKaz
+4SsrSbbXc6GqlPUB53NlTKxQMA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUprPhKytJttdzoaqU
+9QHnc2VMrFAwRAYDVR0gBD0wOzA5BgRVHSAAMDEwLwYIKwYBBQUHAgEWI2h0dHA6Ly9hY2VkaWNv
+bS5lZGljb21ncm91cC5jb20vZG9jMA0GCSqGSIb3DQEBBQUAA4ICAQDOLAtSUWImfQwng4/F9tqg
+aHtPkl7qpHMyEVNEskTLnewPeUKzEKbHDZ3Ltvo/Onzqv4hTGzz3gvoFNTPhNahXwOf9jU8/kzJP
+eGYDdwdY6ZXIfj7QeQCM8htRM5u8lOk6e25SLTKeI6RF+7YuE7CLGLHdztUdp0J/Vb77W7tH1Pwk
+zQSulgUV1qzOMPPKC8W64iLgpq0i5ALudBF/TP94HTXa5gI06xgSYXcGCRZj6hitoocf8seACQl1
+ThCojz2GuHURwCRiipZ7SkXp7FnFvmuD5uHorLUwHv4FB4D54SMNUI8FmP8sX+g7tq3PgbUhh8oI
+KiMnMCArz+2UW6yyetLHKKGKC5tNSixthT8Jcjxn4tncB7rrZXtaAWPWkFtPF2Y9fwsZo5NjEFIq
+nxQWWOLcpfShFosOkYuByptZ+thrkQdlVV9SH686+5DdaaVbnG0OLLb6zqylfDJKZ0DcMDQj3dcE
+I2bw/FWAp/tmGYI1Z2JwOV5vx+qQQEQIHriy1tvuWacNGHk0vFQYXlPKNFHtRQrmjseCNj6nOGOp
+MCwXEGCSn1WHElkQwg9naRHMTh5+Spqtr0CodaxWkHS4oJyleW/c6RrIaQXpuvoDs3zk4E7Czp3o
+tkYNbn5XOmeUwssfnHdKZ05phkOTOPu220+DkdRgfks+KzgHVZhepA==
+-----END CERTIFICATE-----
+
+Verisign Class 1 Public Primary Certification Authority
+=======================================================
+-----BEGIN CERTIFICATE-----
+MIICPDCCAaUCED9pHoGc8JpK83P/uUii5N0wDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCVVMx
+FzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAxIFB1YmxpYyBQcmltYXJ5
+IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVow
+XzELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAx
+IFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUA
+A4GNADCBiQKBgQDlGb9to1ZhLZlIcfZn3rmN67eehoAKkQ76OCWvRoiC5XOooJskXQ0fzGVuDLDQ
+VoQYh5oGmxChc9+0WDlrbsH2FdWoqD+qEgaNMax/sDTXjzRniAnNFBHiTkVWaR94AoDa3EeRKbs2
+yWNcxeDXLYd7obcysHswuiovMaruo2fa2wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFgVKTk8d6Pa
+XCUDfGD67gmZPCcQcMgMCeazh88K4hiWNWLMv5sneYlfycQJ9M61Hd8qveXbhpxoJeUwfLaJFf5n
+0a3hUKw8fGJLj7qE1xIVGx/KXQ/BUpQqEZnae88MNhPVNdwQGVnqlMEAv3WP2fr9dgTbYruQagPZ
+RjXZ+Hxb
+-----END CERTIFICATE-----
+
+Verisign Class 3 Public Primary Certification Authority
+=======================================================
+-----BEGIN CERTIFICATE-----
+MIICPDCCAaUCEDyRMcsf9tAbDpq40ES/Er4wDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCVVMx
+FzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmltYXJ5
+IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVow
+XzELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAz
+IFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUA
+A4GNADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhEBarsAx94
+f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/isI19wKTakyYbnsZogy1Ol
+hec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBABByUqkFFBky
+CEHwxWsKzH4PIRnN5GfcX6kb5sroc50i2JhucwNhkcV8sEVAbkSdjbCxlnRhLQ2pRdKkkirWmnWX
+bj9T/UWZYB2oK0z5XqcJ2HUw19JlYD1n1khVdWk/kfVIC0dpImmClr7JyDiGSnoscxlIaU5rfGW/
+D/xwzoiQ
+-----END CERTIFICATE-----
+
+Microsec e-Szigno Root CA 2009
+==============================
+-----BEGIN CERTIFICATE-----
+MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYDVQQGEwJIVTER
+MA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jv
+c2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o
+dTAeFw0wOTA2MTYxMTMwMThaFw0yOTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UE
+BwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUt
+U3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvPkd6mJviZpWNwrZuuyjNA
+fW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tccbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG
+0IMZfcChEhyVbUr02MelTTMuhTlAdX4UfIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKA
+pxn1ntxVUwOXewdI/5n7N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm
+1HxdrtbCxkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1+rUC
+AwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTLD8bf
+QkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAbBgNVHREE
+FDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqGSIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0o
+lZMEyL/azXm4Q5DwpL7v8u8hmLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfX
+I/OMn74dseGkddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775
+tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c2Pm2G2JwCz02
+yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5tHMN1Rq41Bab2XD0h7lbwyYIi
+LXpUq3DDfSJlgnCW
+-----END CERTIFICATE-----
+
+E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi
+===================================================
+-----BEGIN CERTIFICATE-----
+MIIDtjCCAp6gAwIBAgIQRJmNPMADJ72cdpW56tustTANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQG
+EwJUUjEoMCYGA1UEChMfRWxla3Ryb25payBCaWxnaSBHdXZlbmxpZ2kgQS5TLjE8MDoGA1UEAxMz
+ZS1HdXZlbiBLb2sgRWxla3Ryb25payBTZXJ0aWZpa2EgSGl6bWV0IFNhZ2xheWljaXNpMB4XDTA3
+MDEwNDExMzI0OFoXDTE3MDEwNDExMzI0OFowdTELMAkGA1UEBhMCVFIxKDAmBgNVBAoTH0VsZWt0
+cm9uaWsgQmlsZ2kgR3V2ZW5saWdpIEEuUy4xPDA6BgNVBAMTM2UtR3V2ZW4gS29rIEVsZWt0cm9u
+aWsgU2VydGlmaWthIEhpem1ldCBTYWdsYXlpY2lzaTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAMMSIJ6wXgBljU5Gu4Bc6SwGl9XzcslwuedLZYDBS75+PNdUMZTe1RK6UxYC6lhj71vY
+8+0qGqpxSKPcEC1fX+tcS5yWCEIlKBHMilpiAVDV6wlTL/jDj/6z/P2douNffb7tC+Bg62nsM+3Y
+jfsSSYMAyYuXjDtzKjKzEve5TfL0TW3H5tYmNwjy2f1rXKPlSFxYvEK+A1qBuhw1DADT9SN+cTAI
+JjjcJRFHLfO6IxClv7wC90Nex/6wN1CZew+TzuZDLMN+DfIcQ2Zgy2ExR4ejT669VmxMvLz4Bcpk
+9Ok0oSy1c+HCPujIyTQlCFzz7abHlJ+tiEMl1+E5YP6sOVkCAwEAAaNCMEAwDgYDVR0PAQH/BAQD
+AgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ/uRLOU1fqRTy7ZVZoEVtstxNulMA0GCSqG
+SIb3DQEBBQUAA4IBAQB/X7lTW2M9dTLn+sR0GstG30ZpHFLPqk/CaOv/gKlR6D1id4k9CnU58W5d
+F4dvaAXBlGzZXd/aslnLpRCKysw5zZ/rTt5S/wzw9JKp8mxTq5vSR6AfdPebmvEvFZ96ZDAYBzwq
+D2fK/A+JYZ1lpTzlvBNbCNvj/+27BrtqBrF6T2XGgv0enIu1De5Iu7i9qgi0+6N8y5/NkHZchpZ4
+Vwpm+Vganf2XKWDeEaaQHBkc7gGWIjQ0LpH5t8Qn0Xvmv/uARFoW5evg1Ao4vOSR49XrXMGs3xtq
+fJ7lddK2l4fbzIcrQzqECK+rPNv3PGYxhrCdU3nt+CPeQuMtgvEP5fqX
+-----END CERTIFICATE-----
+
+GlobalSign Root CA - R3
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4GA1UECxMXR2xv
+YmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
+bFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
+aWduIFJvb3QgQ0EgLSBSMzETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
+bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWt
+iHL8RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsTgHeMCOFJ
+0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmmKPZpO/bLyCiR5Z2KYVc3
+rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zdQQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjl
+OCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZXriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2
+xmmFghcCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
+FI/wS3+oLkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZURUm7
+lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMpjjM5RcOO5LlXbKr8
+EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK6fBdRoyV3XpYKBovHd7NADdBj+1E
+bddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQXmcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18
+YIvDQVETI53O9zJrlAGomecsMx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7r
+kpeDMdmztcpHWD9f
+-----END CERTIFICATE-----
+
+TC TrustCenter Universal CA III
+===============================
+-----BEGIN CERTIFICATE-----
+MIID4TCCAsmgAwIBAgIOYyUAAQACFI0zFQLkbPQwDQYJKoZIhvcNAQEFBQAwezELMAkGA1UEBhMC
+REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNVBAsTG1RDIFRydXN0Q2VudGVy
+IFVuaXZlcnNhbCBDQTEoMCYGA1UEAxMfVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBIElJSTAe
+Fw0wOTA5MDkwODE1MjdaFw0yOTEyMzEyMzU5NTlaMHsxCzAJBgNVBAYTAkRFMRwwGgYDVQQKExNU
+QyBUcnVzdENlbnRlciBHbWJIMSQwIgYDVQQLExtUQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0Ex
+KDAmBgNVBAMTH1RDIFRydXN0Q2VudGVyIFVuaXZlcnNhbCBDQSBJSUkwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDC2pxisLlxErALyBpXsq6DFJmzNEubkKLF5+cvAqBNLaT6hdqbJYUt
+QCggbergvbFIgyIpRJ9Og+41URNzdNW88jBmlFPAQDYvDIRlzg9uwliT6CwLOunBjvvya8o84pxO
+juT5fdMnnxvVZ3iHLX8LR7PH6MlIfK8vzArZQe+f/prhsq75U7Xl6UafYOPfjdN/+5Z+s7Vy+Eut
+CHnNaYlAJ/Uqwa1D7KRTyGG299J5KmcYdkhtWyUB0SbFt1dpIxVbYYqt8Bst2a9c8SaQaanVDED1
+M4BDj5yjdipFtK+/fz6HP3bFzSreIMUWWMv5G/UPyw0RUmS40nZid4PxWJ//AgMBAAGjYzBhMB8G
+A1UdIwQYMBaAFFbn4VslQ4Dg9ozhcbyO5YAvxEjiMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/
+BAQDAgEGMB0GA1UdDgQWBBRW5+FbJUOA4PaM4XG8juWAL8RI4jANBgkqhkiG9w0BAQUFAAOCAQEA
+g8ev6n9NCjw5sWi+e22JLumzCecYV42FmhfzdkJQEw/HkG8zrcVJYCtsSVgZ1OK+t7+rSbyUyKu+
+KGwWaODIl0YgoGhnYIg5IFHYaAERzqf2EQf27OysGh+yZm5WZ2B6dF7AbZc2rrUNXWZzwCUyRdhK
+BgePxLcHsU0GDeGl6/R1yrqc0L2z0zIkTO5+4nYES0lT2PLpVDP85XEfPRRclkvxOvIAu2y0+pZV
+CIgJwcyRGSmwIC3/yzikQOEXvnlhgP8HA4ZMTnsGnxGGjYnuJ8Tb4rwZjgvDwxPHLQNjO9Po5KIq
+woIIlBZU8O8fJ5AluA0OKBtHd0e9HKgl8ZS0Zg==
+-----END CERTIFICATE-----
+
+Autoridad de Certificacion Firmaprofesional CIF A62634068
+=========================================================
+-----BEGIN CERTIFICATE-----
+MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UEBhMCRVMxQjBA
+BgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
+MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEyMzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIw
+QAYDVQQDDDlBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBB
+NjI2MzQwNjgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDD
+Utd9thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQMcas9UX4P
+B99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefGL9ItWY16Ck6WaVICqjaY
+7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15iNA9wBj4gGFrO93IbJWyTdBSTo3OxDqqH
+ECNZXyAFGUftaI6SEspd/NYrspI8IM/hX68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyI
+plD9amML9ZMWGxmPsu2bm8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctX
+MbScyJCyZ/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirjaEbsX
+LZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/TKI8xWVvTyQKmtFLK
+bpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF6NkBiDkal4ZkQdU7hwxu+g/GvUgU
+vzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVhOSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1Ud
+EwEB/wQIMAYBAf8CAQEwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNH
+DhpkLzCBpgYDVR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp
+cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBvACAAZABlACAA
+bABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBlAGwAbwBuAGEAIAAwADgAMAAx
+ADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx
+51tkljYyGOylMnfX40S2wBEqgLk9am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qk
+R71kMrv2JYSiJ0L1ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaP
+T481PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS3a/DTg4f
+Jl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5kSeTy36LssUzAKh3ntLFl
+osS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF3dvd6qJ2gHN99ZwExEWN57kci57q13XR
+crHedUTnQn3iV2t93Jm8PYMo6oCTjcVMZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoR
+saS8I8nkvof/uZS2+F0gStRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTD
+KCOM/iczQ0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQBjLMi
+6Et8Vcad+qMUu2WFbm5PEn4KPJ2V
+-----END CERTIFICATE-----
+
+Izenpe.com
+==========
+-----BEGIN CERTIFICATE-----
+MIIF8TCCA9mgAwIBAgIQALC3WhZIX7/hy/WL1xnmfTANBgkqhkiG9w0BAQsFADA4MQswCQYDVQQG
+EwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wHhcNMDcxMjEz
+MTMwODI4WhcNMzcxMjEzMDgyNzI1WjA4MQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMu
+QS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ
+03rKDx6sp4boFmVqscIbRTJxldn+EFvMr+eleQGPicPK8lVx93e+d5TzcqQsRNiekpsUOqHnJJAK
+ClaOxdgmlOHZSOEtPtoKct2jmRXagaKH9HtuJneJWK3W6wyyQXpzbm3benhB6QiIEn6HLmYRY2xU
++zydcsC8Lv/Ct90NduM61/e0aL6i9eOBbsFGb12N4E3GVFWJGjMxCrFXuaOKmMPsOzTFlUFpfnXC
+PCDFYbpRR6AgkJOhkEvzTnyFRVSa0QUmQbC1TR0zvsQDyCV8wXDbO/QJLVQnSKwv4cSsPsjLkkxT
+OTcj7NMB+eAJRE1NZMDhDVqHIrytG6P+JrUV86f8hBnp7KGItERphIPzidF0BqnMC9bC3ieFUCbK
+F7jJeodWLBoBHmy+E60QrLUk9TiRodZL2vG70t5HtfG8gfZZa88ZU+mNFctKy6lvROUbQc/hhqfK
+0GqfvEyNBjNaooXlkDWgYlwWTvDjovoDGrQscbNYLN57C9saD+veIR8GdwYDsMnvmfzAuU8Lhij+
+0rnq49qlw0dpEuDb8PYZi+17cNcC1u2HGCgsBCRMd+RIihrGO5rUD8r6ddIBQFqNeb+Lz0vPqhbB
+leStTIo+F5HUsWLlguWABKQDfo2/2n+iD5dPDNMN+9fR5XJ+HMh3/1uaD7euBUbl8agW7EekFwID
+AQABo4H2MIHzMIGwBgNVHREEgagwgaWBD2luZm9AaXplbnBlLmNvbaSBkTCBjjFHMEUGA1UECgw+
+SVpFTlBFIFMuQS4gLSBDSUYgQTAxMzM3MjYwLVJNZXJjLlZpdG9yaWEtR2FzdGVpeiBUMTA1NSBG
+NjIgUzgxQzBBBgNVBAkMOkF2ZGEgZGVsIE1lZGl0ZXJyYW5lbyBFdG9yYmlkZWEgMTQgLSAwMTAx
+MCBWaXRvcmlhLUdhc3RlaXowDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O
+BBYEFB0cZQ6o8iV7tJHP5LGx5r1VdGwFMA0GCSqGSIb3DQEBCwUAA4ICAQB4pgwWSp9MiDrAyw6l
+Fn2fuUhfGI8NYjb2zRlrrKvV9pF9rnHzP7MOeIWblaQnIUdCSnxIOvVFfLMMjlF4rJUT3sb9fbga
+kEyrkgPH7UIBzg/YsfqikuFgba56awmqxinuaElnMIAkejEWOVt+8Rwu3WwJrfIxwYJOubv5vr8q
+hT/AQKM6WfxZSzwoJNu0FXWuDYi6LnPAvViH5ULy617uHjAimcs30cQhbIHsvm0m5hzkQiCeR7Cs
+g1lwLDXWrzY0tM07+DKo7+N4ifuNRSzanLh+QBxh5z6ikixL8s36mLYp//Pye6kfLqCTVyvehQP5
+aTfLnnhqBbTFMXiJ7HqnheG5ezzevh55hM6fcA5ZwjUukCox2eRFekGkLhObNA5me0mrZJfQRsN5
+nXJQY6aYWwa9SG3YOYNw6DXwBdGqvOPbyALqfP2C2sJbUjWumDqtujWTI6cfSN01RpiyEGjkpTHC
+ClguGYEQyVB1/OpaFs4R1+7vUIgtYf8/QnMFlEPVjjxOAToZpR9GTnfQXeWBIiGH/pR9hNiTrdZo
+Q0iy2+tzJOeRf1SktoA+naM8THLCV8Sg1Mw4J87VBp6iSNnpn86CcDaTmjvfliHjWbcM2pE38P1Z
+WrOZyGlsQyYBNWNgVYkDOnXYukrZVP/u3oDYLdE41V4tC5h9Pmzb/CaIxw==
+-----END CERTIFICATE-----
+
+Chambers of Commerce Root - 2008
+================================
+-----BEGIN CERTIFICATE-----
+MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYDVQQGEwJFVTFD
+MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
+bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
+QS4xKTAnBgNVBAMTIENoYW1iZXJzIG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEy
+Mjk1MFoXDTM4MDczMTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNl
+ZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQF
+EwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJl
+cnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
+AQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW928sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKA
+XuFixrYp4YFs8r/lfTJqVKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorj
+h40G072QDuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR5gN/
+ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfLZEFHcpOrUMPrCXZk
+NNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05aSd+pZgvMPMZ4fKecHePOjlO+Bd5g
+D2vlGts/4+EhySnB8esHnFIbAURRPHsl18TlUlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331
+lubKgdaX8ZSD6e2wsWsSaR6s+12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ
+0wlf2eOKNcx5Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
+ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAxhduub+84Mxh2
+EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNVHQ4EFgQU+SSsD7K1+HnA+mCI
+G8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1+HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJ
+BgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNh
+bWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENh
+bWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDiC
+CQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUH
+AgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAJASryI1
+wqM58C7e6bXpeHxIvj99RZJe6dqxGfwWPJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH
+3qLPaYRgM+gQDROpI9CF5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbU
+RWpGqOt1glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaHFoI6
+M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2pSB7+R5KBWIBpih1
+YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MDxvbxrN8y8NmBGuScvfaAFPDRLLmF
+9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QGtjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcK
+zBIKinmwPQN/aUv0NCB9szTqjktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvG
+nrDQWzilm1DefhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
+OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZd0jQ
+-----END CERTIFICATE-----
+
+Global Chambersign Root - 2008
+==============================
+-----BEGIN CERTIFICATE-----
+MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYDVQQGEwJFVTFD
+MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
+bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
+QS4xJzAlBgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMx
+NDBaFw0zODA3MzExMjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUg
+Y3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJ
+QTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
+aGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMDf
+VtPkOpt2RbQT2//BthmLN0EYlVJH6xedKYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXf
+XjaOcNFccUMd2drvXNL7G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0
+ZJJ0YPP2zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4ddPB
+/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyGHoiMvvKRhI9lNNgA
+TH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2Id3UwD2ln58fQ1DJu7xsepeY7s2M
+H/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3VyJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfe
+Ox2YItaswTXbo6Al/3K1dh3ebeksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSF
+HTynyQbehP9r6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
+wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsogzCtLkykPAgMB
+AAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQWBBS5CcqcHtvTbDprru1U8VuT
+BjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDprru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UE
+BhMCRVUxQzBBBgNVBAcTOk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJm
+aXJtYS5jb20vYWRkcmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJm
+aXJtYSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiCCQDJzdPp
+1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUHAgEWHGh0
+dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAICIf3DekijZBZRG
+/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZUohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6
+ReAJ3spED8IXDneRRXozX1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/s
+dZ7LoR/xfxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVza2Mg
+9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yydYhz2rXzdpjEetrHH
+foUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMdSqlapskD7+3056huirRXhOukP9Du
+qqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9OAP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETr
+P3iZ8ntxPjzxmKfFGBI/5rsoM0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVq
+c5iJWzouE4gev8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
+09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
+-----END CERTIFICATE-----
diff --git a/source/n/curl/curl.SlackBuild b/source/n/curl/curl.SlackBuild
index 1249dcb8..39f632c5 100755
--- a/source/n/curl/curl.SlackBuild
+++ b/source/n/curl/curl.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,6 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+PKGNAM=curl
 VERSION=${VERSION:-$(echo curl-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
@@ -98,14 +99,22 @@ strip -g $PKG/usr/lib${LIBDIRSUFFIX}/libcurl.a
 
 mkdir -p $PKG/usr/doc/curl-$VERSION
 cp -a \
-  CHANGES COPYING README UPGRADE \
+  COPYING* README* UPGRADE \
   $PKG/usr/doc/curl-$VERSION
 ( cd docs
   rm -rf Makefile* curl-config.1 curl-config.html curl.1 curl.html libcurl
   cp -a \
-    BUGS CONTRIBUTE FAQ FEATURES INSTALL INTERNALS MANUAL README.win32 RESOURCES THANKS TODO examples \
+    BUGS CONTRIBUTE FAQ FEATURES INSTALL INTERNALS MANUAL README* RESOURCES THANKS TODO examples \
     $PKG/usr/doc/curl-$VERSION )
 
+# If there's a CHANGES file, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r CHANGES ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat CHANGES | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r CHANGES $DOCSDIR/ChangeLog
+fi
+
 # Compress and if needed symlink the man pages:
 if [ -d $PKG/usr/man ]; then
   ( cd $PKG/usr/man
diff --git a/source/n/cyrus-sasl/cyrus-sasl.SlackBuild b/source/n/cyrus-sasl/cyrus-sasl.SlackBuild
index c4aebb48..27512039 100755
--- a/source/n/cyrus-sasl/cyrus-sasl.SlackBuild
+++ b/source/n/cyrus-sasl/cyrus-sasl.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,10 +20,20 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=2.1.23
-ARCH=${ARCH:-x86_64}
+PKGNAM=cyrus-sasl
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-cyrus-sasl
@@ -37,14 +47,17 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf cyrus-sasl-$VERSION
-tar xvf $CWD/cyrus-sasl-$VERSION.tar.?z*
-cd cyrus-sasl-$VERSION
+tar xvf $CWD/cyrus-sasl-$VERSION.tar.?z* || exit 1
+cd cyrus-sasl-$VERSION || exit 1
 chown -R root:root .
 find . -perm 777 -exec chmod 755 {} \;
 find . -perm 664 -exec chmod 644 {} \;
@@ -66,8 +79,8 @@ CFLAGS="$SLKCFLAGS" \
 # How stupid that I need to specify 'sasldir' again for 'make' or else you get
 # the warning "Plugins are being installed into /usr/lib/sasl2, but the library
 # will look for them in /usr/lib64/sasl2" and advised to create a symlink...
-make sasldir=/usr/lib${LIBDIRSUFFIX}/sasl2
-make sasldir=/usr/lib${LIBDIRSUFFIX}/sasl2 install DESTDIR=$PKG
+make sasldir=/usr/lib${LIBDIRSUFFIX}/sasl2 || exit 1
+make sasldir=/usr/lib${LIBDIRSUFFIX}/sasl2 install DESTDIR=$PKG || exit 1
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -81,7 +94,7 @@ cat saslauthd/saslauthd.mdoc > $PKG/usr/man/man8/saslauthd.8
 gzip -9 $PKG/usr/man/man?/*.?
 mkdir -p $PKG/usr/doc/cyrus-sasl-$VERSION
 cp -a \
-  AUTHORS COPYING INSTALL NEWS README README.andrew \
+  AUTHORS COPYING* INSTALL NEWS README* \
   doc \
   $PKG/usr/doc/cyrus-sasl-$VERSION
 find $PKG/usr/doc/cyrus-sasl-$VERSION -type f -exec chmod 644 {} \;
diff --git a/source/n/dhcp/dhcp-remove-bind-tarball.sh b/source/n/dhcp/dhcp-remove-bind-tarball.sh
new file mode 100755
index 00000000..5249f967
--- /dev/null
+++ b/source/n/dhcp/dhcp-remove-bind-tarball.sh
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+# Copyright 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+PKGNAM=dhcp
+VERSION=${VERSION:-4.2.1-P1}
+BUILD=${BUILD:-1}
+
+# This is not yet used, but eventually we would like to be able to purge
+# the bundled BIND and use the system's instead.  Maybe wishful thinking.
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+
+cd $TMP
+rm -rf dhcp-$VERSION
+tar xvf $CWD/dhcp-$VERSION.tar.?z* || exit 1
+cd dhcp-$VERSION || exit 1
+
+# good "bob" why? ...
+rm -rf bind/*
+
+# Generate a new .xz compressed tarball in /tmp:
+cd $TMP
+rm -f dhcp-$VERSION.tar*
+tar cf dhcp-$VERSION.tar dhcp-$VERSION
+xz -9 dhcp-$VERSION.tar
+
+echo "$TMP/dhcp-$VERSION.tar.xz created"
+
diff --git a/source/n/dhcp/dhcp.SlackBuild b/source/n/dhcp/dhcp.SlackBuild
index 6baf041a..c328b3cb 100755
--- a/source/n/dhcp/dhcp.SlackBuild
+++ b/source/n/dhcp/dhcp.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,8 +21,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=${VERSION:-$(echo dhcp-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+PKGNAM=dhcp
+# Leave this one .gz as other compressors do not help much and we can keep
+# the original upstream .asc
+VERSION=${VERSION:-$(basename $(echo $PKGNAM-*.tar.gz | cut -f 2- -d -) .tar.gz)}
+BUILD=${BUILD:-1}
+
+PKG_VERSION=$(echo $VERSION | tr - _)
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -59,7 +64,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf dhcp-$VERSION
-tar xvf $CWD/dhcp-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/dhcp-$VERSION.tar.gz || exit 1
 cd dhcp-$VERSION || exit 1
 
 chown -R root:root .
@@ -102,12 +107,12 @@ mv $PKG/usr/sbin/dhclient $PKG/sbin
 cat client/scripts/linux > $PKG/sbin/dhclient-script
 chmod 700 $PKG/sbin/dhclient-script
 
+# Create the initial *.leases files:
 mkdir -p $PKG/var/state/dhcp
-# The daemon should create these automatically as needed
-#touch $PKG/var/state/dhcp/dhcpd.leases.new
-#touch $PKG/var/state/dhcp/dhcpd6.leases.new
-#touch $PKG/var/state/dhcp/dhclient.leases.new
-#touch $PKG/var/state/dhcp/dhclient6.leases.new
+touch $PKG/var/state/dhcp/dhcpd.leases.new
+touch $PKG/var/state/dhcp/dhcpd6.leases.new
+touch $PKG/var/state/dhcp/dhclient.leases.new
+touch $PKG/var/state/dhcp/dhclient6.leases.new
 
 cat << EOF > $PKG/etc/dhcpd.conf.new
 # dhcpd.conf
@@ -153,10 +158,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/dhcp-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/dhcp-$PKG_VERSION-$ARCH-$BUILD.txz
 
-# Clean up the extra stuff:
-if [ "$1" = "--cleanup" ]; then
- rm -rf $TMP/dhcp-$VERSION
- rm -rf $PKG
-fi
diff --git a/source/n/dhcp/doinst.sh b/source/n/dhcp/doinst.sh
index 88d284f6..a376034a 100644
--- a/source/n/dhcp/doinst.sh
+++ b/source/n/dhcp/doinst.sh
@@ -13,9 +13,9 @@ config() {
 
 config etc/dhcpd.conf.new
 config etc/dhclient.conf.new
-#config var/state/dhcp/dhcpd.leases.new
-#config var/state/dhcp/dhcpd6.leases.new
-#config var/state/dhcp/dhclient.leases.new
-#config var/state/dhcp/dhclient6.leases.new
-#rm -f var/state/dhcp/*.leases.new
+config var/state/dhcp/dhcpd.leases.new
+config var/state/dhcp/dhcpd6.leases.new
+config var/state/dhcp/dhclient.leases.new
+config var/state/dhcp/dhclient6.leases.new
+rm -f var/state/dhcp/*.leases.new
 
diff --git a/source/n/dhcpcd/50-ntp.conf.diff b/source/n/dhcpcd/50-ntp.conf.diff
index d86c299e..63fd914b 100644
--- a/source/n/dhcpcd/50-ntp.conf.diff
+++ b/source/n/dhcpcd/50-ntp.conf.diff
@@ -1,19 +1,29 @@
-diff -Nur dhcpcd-5.1.0.orig/dhcpcd-hooks/50-ntp.conf dhcpcd-5.1.0/dhcpcd-hooks/50-ntp.conf
---- dhcpcd-5.1.0.orig/dhcpcd-hooks/50-ntp.conf	2009-09-02 15:21:11.000000000 -0500
-+++ dhcpcd-5.1.0/dhcpcd-hooks/50-ntp.conf	2009-09-12 00:36:04.447859980 -0500
-@@ -8,14 +8,8 @@
+--- ./dhcpcd-hooks/50-ntp.conf.orig	2010-11-19 04:17:14.000000000 -0600
++++ ./dhcpcd-hooks/50-ntp.conf	2010-12-29 16:07:48.000000000 -0600
+@@ -8,6 +8,26 @@
  #   NTP_CONF=/usr/pkg/etc/ntpd.conf
  # to use openntpd from pkgsrc instead of the system provided ntp.
  
--# Detect OpenRC or BSD rc
--# Distributions may want to just have their command here instead of this
--if type rc-service >/dev/null 2>&1 && rc-service --exists ntpd; then
--	ntpd_restart_cmd="rc-service ntpd -- -Ds restart"
--elif [ -x /etc/rc.d/ntpd ]; then
-+if [ -x /etc/rc.d/ntpd ]; then
- 	ntpd_restart_cmd="/etc/rc.d/ntpd status >/dev/null 2>&1 && /etc/rc.d/ntpd restart"
--elif [ -x /usr/local/etc/rc.d/ntpd ]; then
--	ntpd_restart_cmd="/usr/local/etc/rc.d/ntpd status >/dev/null 2>&1 && /usr/local/etc/rc.d/ntpd restart"
- fi
- 
- ntp_conf_dir="$state_dir/ntp.conf"
++# Detect OpenRC, Debian or BSD rc
++# Distributions may want to just have their command here instead of this
++if type rc-service >/dev/null 2>&1 && rc-service --exists ntpd; then
++        ntpd_restart_cmd="rc-service ntpd -- -Ds restart"
++elif type invoke-rc.d >/dev/null 2>&1; then
++        if [ -x /etc/init.d/ntp ]; then
++                ntpd_restart_cmd="invoke-rc.d ntp try-restart"
++        fi
++        # Debian as a seperate file for DHCP config to avoid stamping on
++        # the master.
++        [ -e /var/lib/ntp ] || mkdir /var/lib/ntp
++        : ${NTP_DHCP_CONF:=/var/lib/ntp/ntp.conf.dhcp}
++elif [ -x /etc/rc.d/ntpd ]; then
++        ntpd_restart_cmd="/etc/rc.d/ntpd status >/dev/null 2>&1 && /etc/rc.d/ntpd restart"
++elif [ -x /usr/local/etc/rc.d/ntpd ]; then
++        ntpd_restart_cmd="/usr/local/etc/rc.d/ntpd status >/dev/null 2>&1 && /usr/local/etc/rc.d/ntpd restart"
++elif [ -x /etc/rc.d/rc.ntpd ]; then
++        ntpd_restart_cmd="/etc/rc.d/rc.ntpd status >/dev/null 2>&1 && /etc/rc.d/rc.ntpd restart"
++fi
++
+ : ${ntpd_restart_cmd:=service_condcommand ntpd restart}
+ if type invoke-rc.d >/dev/null 2>&1; then
+ 	# Debian has a seperate file for DHCP config to avoid stamping on
diff --git a/source/n/dhcpcd/dhcpcd.SlackBuild b/source/n/dhcpcd/dhcpcd.SlackBuild
index 3ee95a90..c50048ae 100755
--- a/source/n/dhcpcd/dhcpcd.SlackBuild
+++ b/source/n/dhcpcd/dhcpcd.SlackBuild
@@ -104,7 +104,7 @@ mv $PKG/etc/dhcpcd.conf $PKG/etc/dhcpcd.conf.new
 )
 
 mkdir -p $PKG/usr/doc/dhcpcd-$VERSION
-cp -a README $PKG/usr/doc/dhcpcd-$VERSION
+cp -a README* $PKG/usr/doc/dhcpcd-$VERSION
 zcat $CWD/COPYRIGHT.gz > $PKG/usr/doc/dhcpcd-$VERSION/COPYRIGHT
 
 mkdir -p $PKG/install
@@ -113,3 +113,4 @@ zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/dhcpcd-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/n/dirmngr/dirmngr.SlackBuild b/source/n/dirmngr/dirmngr.SlackBuild
index 1fb2e89c..4c1b4a72 100755
--- a/source/n/dirmngr/dirmngr.SlackBuild
+++ b/source/n/dirmngr/dirmngr.SlackBuild
@@ -24,7 +24,7 @@
 
 PKGNAM=dirmngr
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -79,8 +79,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --infodir=/usr/info \
   --docdir=/usr/doc/$PKGNAM-$VERSION \
-  --enable-static=no \
-  --enable-shared=yes \
   --build=$ARCH-slackware-linux \
   --host=$ARCH-slackware-linux
 
diff --git a/source/n/elm/elm.SlackBuild b/source/n/elm/elm.SlackBuild
index 8aabca00..6ce92b46 100755
--- a/source/n/elm/elm.SlackBuild
+++ b/source/n/elm/elm.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=2.5.8
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-3}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 if [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 else
diff --git a/source/n/ethtool/ethtool.SlackBuild b/source/n/ethtool/ethtool.SlackBuild
index ebe0919f..388f46e8 100755
--- a/source/n/ethtool/ethtool.SlackBuild
+++ b/source/n/ethtool/ethtool.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,7 +21,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=2.6.33
+PKGNAM=ethtool
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -43,7 +44,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf ethtool-$VERSION
-tar xzf $CWD/ethtool-$VERSION.tar.gz || exit 1
+tar xvf $CWD/ethtool-$VERSION.tar.?z* || exit 1
 cd ethtool-$VERSION || exit 1
 chown -R root:root .
 ./configure \
@@ -55,10 +56,18 @@ strip $PKG/usr/sbin/ethtool
 gzip -9 $PKG/usr/man/man8/ethtool.8
 mkdir -p $PKG/usr/doc/ethtool-$VERSION
 cp -a \
-  AUTHORS COPYING* ChangeLog LICENSE NEWS README* \
+  AUTHORS COPYING* LICENSE NEWS README* \
   $PKG/usr/doc/ethtool-$VERSION
 chmod 644 $PKG/usr/doc/ethtool-$VERSION/*
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 # Finish up the package:
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/n/fetchmail/fetchmail.SlackBuild b/source/n/fetchmail/fetchmail.SlackBuild
index a69cef4d..16cc3123 100755
--- a/source/n/fetchmail/fetchmail.SlackBuild
+++ b/source/n/fetchmail/fetchmail.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PKGNAM=fetchmail
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -55,7 +55,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf fetchmail-$VERSION
-tar xvf $CWD/fetchmail-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/fetchmail-$VERSION.tar.xz || exit 1
 cd fetchmail-$VERSION || exit 1
 
 # this is the sloppiest source tarball ever
diff --git a/source/n/gnupg/gnupg.SlackBuild b/source/n/gnupg/gnupg.SlackBuild
index 3a0a5b8a..2a0bce57 100755
--- a/source/n/gnupg/gnupg.SlackBuild
+++ b/source/n/gnupg/gnupg.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,7 +20,7 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=1.4.10
+VERSION=1.4.11
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -83,11 +83,12 @@ gzip -9 $PKG/usr/man/*/*
 
 mkdir -p $PKG/usr/doc/gnupg-$VERSION
 cp -a \
-  ABOUT-NLS AUTHORS BUGS COPYING INSTALL NEWS PROJECTS README THANKS TODO VERSION \
+  ABOUT-NLS AUTHORS BUGS COPYING* INSTALL NEWS PROJECTS README* THANKS TODO VERSION \
   $PKG/usr/doc/gnupg-$VERSION
-( cd $PKG/usr/doc/gnupg-$VERSION
-  ln -sf /usr/share/gnupg/FAQ .
-  ln -sf /usr/share/gnupg/faq.html . )
+if [ -r $PKG/usr/share/gnupg/FAQ ]; then
+  ( cd $PKG/usr/doc/gnupg-$VERSION
+    ln -sf /usr/share/gnupg/FAQ . )
+fi
 
 # If there's a ChangeLog, installing at least part of the recent history
 # is useful, but don't let it get totally out of control:
diff --git a/source/n/gnupg2/gnupg-2.0.14-encode-s2k.patch b/source/n/gnupg2/gnupg-2.0.14-encode-s2k.patch
deleted file mode 100644
index 26c798ee..00000000
--- a/source/n/gnupg2/gnupg-2.0.14-encode-s2k.patch
+++ /dev/null
@@ -1,65 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-NotDashEscaped: You need GnuPG to verify this message
-
-#! /bin/sh
-patch -p0 -f $* < $0
-exit $?
-
-agent/
-2010-01-26  Werner Koch  <wk@g10code.com>
-
-	* protect.c (do_encryption): Encode the s2kcount and do not use a
-	static value of 96.
-
---- agent/protect.c	(revision 5231)
-+++ agent/protect.c	(working copy)
-@@ -360,19 +360,25 @@
-        
-      in canoncical format of course.  We use asprintf and %n modifier
-      and dummy values as placeholders.  */
--  p = xtryasprintf
--    ("(9:protected%d:%s((4:sha18:%n_8bytes_2:96)%d:%n%*s)%d:%n%*s)",
--     (int)strlen (modestr), modestr,
--     &saltpos, 
--     blklen, &ivpos, blklen, "",
--     enclen, &encpos, enclen, "");
--  if (!p)
--    {
--      gpg_error_t tmperr = out_of_core ();
--      xfree (iv);
--      xfree (outbuf);
--      return tmperr;
--    }
-+  {
-+    char countbuf[35];
-+
-+    snprintf (countbuf, sizeof countbuf, "%lu", get_standard_s2k_count ());
-+    p = xtryasprintf
-+      ("(9:protected%d:%s((4:sha18:%n_8bytes_%u:%s)%d:%n%*s)%d:%n%*s)",
-+       (int)strlen (modestr), modestr,
-+       &saltpos, 
-+       (unsigned int)strlen (countbuf), countbuf,
-+       blklen, &ivpos, blklen, "",
-+       enclen, &encpos, enclen, "");
-+    if (!p)
-+      {
-+        gpg_error_t tmperr = out_of_core ();
-+        xfree (iv);
-+        xfree (outbuf);
-+        return tmperr;
-+      }
-+  }
-   *resultlen = strlen (p);
-   *result = (unsigned char*)p;
-   memcpy (p+saltpos, iv+2*blklen, 8);
-
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1.0-svn5201 (GNU/Linux)
-
-iJwEAQECAAYFAktmpLoACgkQU7Yg0BzgxjCj5wQAyZjQbZM77wdcXIgPgeLsG99W
-esWR89/5VM34dY5tOG+McCAiA4/0hl6CYUkkK/394wcfUXbvbZYARPjJg5wMoZsG
-VufEL+Uz+eLgkejYPVakOWzK00i7MHqDSjttOqHg0d8wSiy3LKk6CN6N19uPqxbI
-/1Io5f3gcroLGfEZlN0=
-=oP/V
------END PGP SIGNATURE-----
diff --git a/source/n/gnupg2/gnupg2.SlackBuild b/source/n/gnupg2/gnupg2.SlackBuild
index 1faf1666..54cdbb3b 100755
--- a/source/n/gnupg2/gnupg2.SlackBuild
+++ b/source/n/gnupg2/gnupg2.SlackBuild
@@ -24,7 +24,7 @@
 
 PKGNAM=gnupg2
 VERSION=${VERSION:-$(echo gnupg-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -64,8 +64,6 @@ rm -rf gnupg-$VERSION
 tar xvf $CWD/gnupg-$VERSION.tar.?z* || exit 1
 cd gnupg-$VERSION
 
-zcat $CWD/gnupg-2.0.14-encode-s2k.patch.gz | patch -p0 --verbose || exit 1
-
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source/n/gpa/gpa.SlackBuild b/source/n/gpa/gpa.SlackBuild
index e0e67e40..9c6c0e5f 100755
--- a/source/n/gpa/gpa.SlackBuild
+++ b/source/n/gpa/gpa.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2006-2007  Robby Workman  (http://rlworkman.net) 
-# Copyright 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,16 +22,25 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-PRGNAM=gpa
-VERSION=0.7.5
-ARCH=${ARCH:-x86_64}
+PKGNAM=gpa
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/pkg-$PRGNAM
+PKG=$TMP/pkg-$PKGNAM
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -42,15 +51,18 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG 
 mkdir -p $TMP $PKG
 
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
-cd $PRGNAM-$VERSION
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -74,16 +86,24 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  ABOUT-NLS AUTHORS COPYING INSTALL NEWS README* THANKS TODO VERSION \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+  ABOUT-NLS AUTHORS COPYING* INSTALL NEWS README* THANKS TODO VERSION \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+cat $CWD/$PKGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source/n/gpgme/gpgme.SlackBuild b/source/n/gpgme/gpgme.SlackBuild
index a83c158d..59b9a047 100755
--- a/source/n/gpgme/gpgme.SlackBuild
+++ b/source/n/gpgme/gpgme.SlackBuild
@@ -22,7 +22,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PKGNAM=gpgme
-VERSION=1.2.0
+VERSION=1.3.0
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
diff --git a/source/n/htdig/htdig.SlackBuild b/source/n/htdig/htdig.SlackBuild
index 1451b4c2..b915314b 100755
--- a/source/n/htdig/htdig.SlackBuild
+++ b/source/n/htdig/htdig.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,19 @@
 
 PKGNAM=htdig
 VERSION=${VERSION:-3.2.0b6}
-ARCH=${ARCH:-x86_64}
 NUMJOBS=${NUMJOBS:-" -j7 "}
 BUILD=${BUILD:-3}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-${PKGNAM}
@@ -42,6 +51,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 cd $TMP
diff --git a/source/n/httpd/httpd.SlackBuild b/source/n/httpd/httpd.SlackBuild
index 00953776..a97ccf36 100755
--- a/source/n/httpd/httpd.SlackBuild
+++ b/source/n/httpd/httpd.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,8 +25,8 @@
 
 
 PKGNAM=httpd
-VERSION=${VERSION:-2.2.15}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -83,6 +83,9 @@ find . \
 
 zcat $CWD/config.layout.diff.gz | sed -e "s#lib/httpd#lib${LIBDIRSUFFIX}/httpd#" | patch --verbose -p1 || exit 1
 
+# Patch to fix aliasing issue exposed by gcc-4.5.1:
+zcat $CWD/httpd.brigade_move.__noinline__.gcc451.diff.gz | patch --verbose -p1 || exit 1
+
 # Configure:
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -125,7 +128,7 @@ rmdir $PKG/usr/bin
 ( cd $PKG
   zcat $CWD/httpd.nossldefault.diff.gz | sed -e "s#lib/httpd#lib${LIBDIRSUFFIX}/httpd#" | patch -p1 --verbose || exit 1
   zcat $CWD/httpd.runasapache.diff.gz | patch -p1 --verbose || exit 1
-  rm -f $PKG/etc/httpd/httpd.conf~
+  rm -f $PKG/etc/httpd/httpd.conf~ $PKG/etc/httpd/httpd.conf.orig
 ) || exit 1
 # Change config files to .new:
 ( cd $PKG/etc/httpd
diff --git a/source/n/httpd/httpd.brigade_move.__noinline__.gcc451.diff b/source/n/httpd/httpd.brigade_move.__noinline__.gcc451.diff
new file mode 100644
index 00000000..e8915ae4
--- /dev/null
+++ b/source/n/httpd/httpd.brigade_move.__noinline__.gcc451.diff
@@ -0,0 +1,10 @@
+--- ./server/core_filters.c.orig	2010-02-26 03:32:15.000000000 -0600
++++ ./server/core_filters.c	2011-02-12 13:23:22.000000000 -0600
+@@ -83,6 +83,7 @@
+  *
+  * XXXX: Should this function be added to APR-Util?
+  */
++__attribute__((__noinline__))
+ static void brigade_move(apr_bucket_brigade *b, apr_bucket_brigade *a,
+                          apr_bucket *e)
+ {
diff --git a/source/n/httpd/httpd.url b/source/n/httpd/httpd.url
new file mode 100644
index 00000000..8b8a1768
--- /dev/null
+++ b/source/n/httpd/httpd.url
@@ -0,0 +1,2 @@
+http://www.apache.org/dist/httpd/httpd-2.2.17.tar.bz2
+http://www.apache.org/dist/httpd/httpd-2.2.17.tar.bz2.asc
diff --git a/source/n/httpd/logrotate.httpd b/source/n/httpd/logrotate.httpd
index 30cee8a2..cc638367 100644
--- a/source/n/httpd/logrotate.httpd
+++ b/source/n/httpd/logrotate.httpd
@@ -1,6 +1,7 @@
 /var/log/httpd/*_log {
   rotate 10
   notifempty
+  missingok
   size=5M
   compress
   delaycompress
diff --git a/source/n/icmpinfo/icmpinfo.SlackBuild b/source/n/icmpinfo/icmpinfo.SlackBuild
index 685bc7ad..c783e78f 100755
--- a/source/n/icmpinfo/icmpinfo.SlackBuild
+++ b/source/n/icmpinfo/icmpinfo.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=1.11
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
diff --git a/source/n/idnkit/idnkit.SlackBuild b/source/n/idnkit/idnkit.SlackBuild
new file mode 100755
index 00000000..c4603bc0
--- /dev/null
+++ b/source/n/idnkit/idnkit.SlackBuild
@@ -0,0 +1,131 @@
+#!/bin/sh
+
+# Copyright 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+PKGNAM=idnkit
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 2 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-${PKGNAM}
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+fi
+
+cd $TMP
+rm -rf ${PKGNAM}-${VERSION}
+tar xvf $CWD/${PKGNAM}-$VERSION-src.tar.?z* || exit 1
+cd ${PKGNAM}-$VERSION-src || exit 1
+
+# Make sure ownerships and permissions are sane:
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --enable-shared \
+  --disable-static \
+  --build=$ARCH-slackware-linux || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Fix library perms:
+chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/*
+
+# Strip binaries:
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+# Since idnkit appears to work here without configuration files installed,
+# we will only install these as *.sample:
+rm -f $PKG/etc/*.conf
+
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.* 2> /dev/null
+      )
+    done
+  )
+fi
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  COPYING* INSTALL* LICENSE* NEWS README* \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz
+
diff --git a/source/n/idnkit/slack-desc b/source/n/idnkit/slack-desc
new file mode 100644
index 00000000..7c4cdf0c
--- /dev/null
+++ b/source/n/idnkit/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+      |-----handy-ruler------------------------------------------------------|
+idnkit: idnkit (Internationalized domain names toolkit)
+idnkit:
+idnkit: idnkit is a toolkit for handling internationalized domain names.
+idnkit: It includes a library for handling internationalized domain names
+idnkit: (libidnkit, libidnkitlite), a codeset conversion utility (idnconv),
+idnkit: and a command which adds IDN dynamically to applications (runidn).
+idnkit:
+idnkit:
+idnkit:
+idnkit: Homepage: http://www.nic.ad.jp/en/idn/
+idnkit:
diff --git a/source/n/imapd b/source/n/imapd
new file mode 120000
index 00000000..0120374c
--- /dev/null
+++ b/source/n/imapd
@@ -0,0 +1 @@
+alpine
\ No newline at end of file
diff --git a/source/n/inetd/inetd.SlackBuild b/source/n/inetd/inetd.SlackBuild
index 8a86a350..479b5ebb 100755
--- a/source/n/inetd/inetd.SlackBuild
+++ b/source/n/inetd/inetd.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=1.79s
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-8}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-inetd
diff --git a/source/n/iproute2/iproute2.SlackBuild b/source/n/iproute2/iproute2.SlackBuild
index d9e8622c..929aa7b9 100755
--- a/source/n/iproute2/iproute2.SlackBuild
+++ b/source/n/iproute2/iproute2.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2005-2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
 
 # Build this against 2.6.x kernel source and headers...
 
-VERSION=2.6.33
+VERSION=2.6.37
 BUILD=${BUILD:-1}
 
 #NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -70,7 +70,7 @@ find . \
   -exec chmod 644 {} \;
 
 # Fix up path to bdb and iptables libs
-zcat $CWD/iproute2-2.6.33-fixup_dbpath_and_iptablespath.diff.gz | sed \
+zcat $CWD/iproute2.fixup_dbpath_and_iptablespath.diff.gz | sed \
   -e "s,@LIBDIR@,/usr/lib${LIBDIRSUFFIX},g" \
   -e "s,@VERSION@,$VERSION,g" | patch -p1 || exit 1
 
@@ -134,6 +134,14 @@ mkdir -p $PKG/usr/doc/iproute2-$VERSION
 cp -a COPYING RE* \
   $PKG/usr/doc/iproute2-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
diff --git a/source/n/iproute2/iproute2-2.6.33-fixup_dbpath_and_iptablespath.diff b/source/n/iproute2/iproute2.fixup_dbpath_and_iptablespath.diff
index fe5b1abc..fe5b1abc 100644
--- a/source/n/iproute2/iproute2-2.6.33-fixup_dbpath_and_iptablespath.diff
+++ b/source/n/iproute2/iproute2.fixup_dbpath_and_iptablespath.diff
diff --git a/source/n/iptables/iptables.SlackBuild b/source/n/iptables/iptables.SlackBuild
index a9dc37bd..0d191b3c 100755
--- a/source/n/iptables/iptables.SlackBuild
+++ b/source/n/iptables/iptables.SlackBuild
@@ -80,26 +80,11 @@ CFLAGS="$SLKCFLAGS" \
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
-# Strip binaries:
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-debug 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-debug 2> /dev/null
-)
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-debug 2> /dev/null
 
-# Compress and link manpages, if any:
-if [ -d $PKG/usr/man ]; then
-  ( cd $PKG/usr/man
-    for manpagedir in $(find . -type d -name "man*") ; do
-      ( cd $manpagedir
-        for eachpage in $( find . -type l -maxdepth 1) ; do
-          ln -s $( readlink $eachpage ).gz $eachpage.gz
-          rm $eachpage
-        done
-        gzip -9 *.?
-      )
-    done
-  )
-fi
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/iptables-$VERSION
 cp -a \
diff --git a/source/n/iptraf-ng/iptraf-ng.SlackBuild b/source/n/iptraf-ng/iptraf-ng.SlackBuild
new file mode 100755
index 00000000..c2841c06
--- /dev/null
+++ b/source/n/iptraf-ng/iptraf-ng.SlackBuild
@@ -0,0 +1,131 @@
+#!/bin/sh
+
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+PKGNAM=iptraf-ng
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+cd $TMP
+rm -rf $PKG
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION
+
+chown -R root:root .
+find . \
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --sysconfdir=/etc \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+mkdir -p $PKG/var/lib/iptraf
+mkdir -p $PKG//var/run/iptraf
+mkdir -p $PKG/var/log/iptraf
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  Documentation \
+  FAQ INSTALL LICENSE README* RELEASE-NOTES \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+# If there's a CHANGES file, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r CHANGES ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat CHANGES | head -n 1000 > $DOCSDIR/CHANGES
+  touch -r CHANGES $DOCSDIR/CHANGES
+fi
+
+# crud removal
+( cd $PKG/usr/doc/$PKGNAM-$VERSION/Documentation
+  rm -rf manual.aux manual.dvi *.log manual.rtf manual.sgml manual.template* .xvpics .log
+)
+
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/n/iptraf-ng/slack-desc b/source/n/iptraf-ng/slack-desc
new file mode 100644
index 00000000..3d7e4470
--- /dev/null
+++ b/source/n/iptraf-ng/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+         |-----handy-ruler------------------------------------------------------|
+iptraf-ng: iptraf-ng (console-based network monitoring program)
+iptraf-ng:
+iptraf-ng: IPTraf is a console-based network monitoring program for Linux that
+iptraf-ng: displays information about IP traffic such as:
+iptraf-ng:
+iptraf-ng:   Current TCP connections, types of IP packets, packet and byte
+iptraf-ng:   counts, TCP/UDP counts by ports, packet counts by packet sizes,
+iptraf-ng:   packet and byte counts by IP address, interface activity, flag
+iptraf-ng:   statuses on TCP packets, and other LAN station statistics.
+iptraf-ng:
+iptraf-ng: iptraf-ng was written by Gerard Paul Java.
diff --git a/source/n/iptraf/iptraf.SlackBuild b/source/n/iptraf/iptraf.SlackBuild
deleted file mode 100755
index a4bb452b..00000000
--- a/source/n/iptraf/iptraf.SlackBuild
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh
-
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-VERSION=${VERSION:-3.0.0}
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-3}
-
-NUMJOBS=${NUMJOBS:-" -j7 "}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-iptraf
-
-cd $TMP
-rm -rf $PKG
-rm -rf iptraf-$VERSION
-tar xvf $CWD/iptraf-$VERSION.tar.gz || exit 1
-cd iptraf-$VERSION
-
-chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \; -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \;
-
-zcat $CWD/iptraf_3.0.0-6.diff.gz | patch -p1 || exit 1
-zcat $CWD/iptraf.paths.diff.gz | patch -p1 || exit 1
-cd src
-
-make -j2 || exit 1
-
-mkdir -p $PKG/usr/sbin
-cp iptraf rawtime rvnamed $PKG/usr/sbin
-chmod 755 $PKG/usr/sbin/*
-
-cd ..
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-mkdir -p $PKG/var/cache/iptraf
-mkdir -p $PKG//var/run/iptraf
-mkdir -p $PKG/var/log/iptraf
-
-mkdir -p $PKG/usr/doc/iptraf-$VERSION
-cp -a \
-  CHANGES Documentation FAQ INSTALL LICENSE README* RELEASE-NOTES \
-  $PKG/usr/doc/iptraf-$VERSION
-
-mkdir -p $PKG/usr/man/man8
-mv $PKG/usr/doc/iptraf-$VERSION/Documentation/iptraf.8 $PKG/usr/man/man8
-if [ -r $PKG/usr/doc/iptraf-$VERSION/Documentation/rawtime.8 ]; then
-  mv $PKG/usr/doc/iptraf-$VERSION/Documentation/rawtime.8 $PKG/usr/man/man8
-fi
-mv $PKG/usr/doc/iptraf-$VERSION/Documentation/rvnamed.8 $PKG/usr/man/man8
-gzip -9 $PKG/usr/man/man8/*
-
-# crud removal
-( cd $PKG/usr/doc/iptraf-$VERSION/Documentation
-  rm -rf manual.aux manual.dvi *.log manual.rtf manual.sgml manual.template .xvpics .log
-)
-
-rm -f $PKG/usr/doc/iptraf-$VERSION/Documentation/manual.template.gz
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/iptraf-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/n/iptraf/iptraf.paths.diff b/source/n/iptraf/iptraf.paths.diff
deleted file mode 100644
index 4251b46d..00000000
--- a/source/n/iptraf/iptraf.paths.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./src/Makefile.orig	2003-03-14 13:39:46.000000000 -0800
-+++ ./src/Makefile	2003-03-14 13:41:15.000000000 -0800
-@@ -68,12 +68,12 @@
- # installation target directory.  The iptraf and rvnamed programs get
- # stored here.  iptraf also exec's rvnamed from this directory.
- 
--TARGET		= /usr/local/bin
-+TARGET		= /usr/sbin
- 
- # The IPTraf working directory; if you change this.  Starting with this
- # version, this definition overrides dirs.h.
- 
--WORKDIR		= /var/local/iptraf
-+WORKDIR		= /var/cache/iptraf
- 
- # The IPTraf log file directory.  IPTraf log files are placed here.
- # This definition overrides dirs.h
diff --git a/source/n/iptraf/iptraf_3.0.0-6.diff b/source/n/iptraf/iptraf_3.0.0-6.diff
deleted file mode 100644
index c524e0de..00000000
--- a/source/n/iptraf/iptraf_3.0.0-6.diff
+++ /dev/null
@@ -1,1499 +0,0 @@
---- iptraf-3.0.0.orig/Documentation/iptraf.8
-+++ iptraf-3.0.0/Documentation/iptraf.8
-@@ -2,22 +2,22 @@
- .SH NAME
- iptraf \- Interactive Colorful IP LAN Monitor
- .SH SYNOPSIS
--.BR iptraf " { [ " -f " ] [ " -q " ] [ { " -i 
-+.BR iptraf " { [ " \-f " ] [ " \-q " ] [ " \-u " ] [ { " \-i 
- .IR iface " | " 
--.BR -g " | " -d
-+.BR \-g " | " \-d
- .IR iface " | "
--.BR -s
-+.BR \-s
- .IR iface " | "
--.BR -z
-+.BR \-z
- .IR iface " | "
--.BR -l 
-+.BR \-l 
- .IR iface " } [ " 
--.BR -t
-+.BR \-t
- .IR timeout " ] [ "
--.BR -B " [ "
--.BR -L
-+.BR \-B " [ "
-+.BR \-L
- .IR logfile " ] ] ] | [ "
--.BR -h " ] }"
-+.BR \-h " ] }"
- .br
- .SH DESCRIPTION
- .B iptraf
-@@ -30,38 +30,38 @@
- .SH OPTIONS
- These options can also be supplied to the command:
- .TP
--.BI "-i " iface
-+.BI "\-i " iface
- immediately start the IP traffic monitor on the specified interface, or
--all interfaces if "-i all" is specified
-+all interfaces if "\-i all" is specified
- .TP
--.B "-g"
-+.B "\-g"
- immediately start the general interface statistics
- .TP
--.BI "-d " iface
-+.BI "\-d " iface
- allows you to immediately start the detailed on the indicated interface (iface)
- .TP
--.BI "-s " iface
-+.BI "\-s " iface
- allows you to immediately monitor TCP and UDP traffic on the specified interface (iface)
- .TP
--.BI "-z " iface
-+.BI "\-z " iface
- shows packet counts by size on the specified interface
- .TP
--.BI "-l " iface
-+.BI "\-l " iface
- start the LAN station monitor on the specified interface, or all LAN
--interfaces if "-l all" is specified
-+interfaces if "\-l all" is specified
- .TP
--.BI "-t " timeout
-+.BI "\-t " timeout
- tells IPTraf to run the specified facility for only
- .I timeout
- minutes.  This option is used only with one of the above parameters.
- .TP
--.B "-B"
-+.B "\-B"
- redirect standard output to /dev/null, closes standard input, and forks
- the program into the background.  Can be used only with one of the
- facility invocation parameters above.  Send the backgrounded process a
- USR2 signal to terminate.
- .TP
--.B "-L logfile"
-+.B "\-L logfile"
- allows you to specify an alternate log file name.  The default log file
- name is based on either the interface selected (detailed interface
- statistics, TCP/UDP service statistics, packet size breakdown), or the
-@@ -69,15 +69,19 @@
- path is not specified, the log file is placed in
- .B /var/log/iptraf
- .TP
--.B "-f"
-+.B "\-f"
- clears all locks and counters, causing this instance of IPTraf to think
- it's the first one running.  This should only be used to recover from
- an abnormal termination or system crash.
- .TP
--.BI "-q"
-+.B "\-u"
-+allow use of unsupported interfaces as ethernet devices.  This is needed if
-+you changed the name of an interface (ex: ip link set eth0 name foo0)
-+.TP
-+.BI "\-q"
- no longer needed, maintained only for compatibility.
- .TP
--.B "-h"
-+.B "\-h"
- shows a command summary
- .SH SIGNALS
- 
-@@ -86,7 +90,7 @@
- 
- .SH FILES
-  /var/log/iptraf/*.log - log file
-- /var/local/iptraf/* - important IPTraf data files
-+ /var/lib/iptraf/* - important IPTraf data files
- 
- .SH SEE ALSO
-  Documentation/* - complete documentation written by the author
-@@ -96,6 +100,6 @@
- Gerard Paul Java (riker@mozcom.com)
- 
- .SH MANUAL AUTHOR
--Frederic Peters (fpeters@debian.org), using iptraf --help
-+Frederic Peters (fpeters@debian.org), using iptraf \-h
- General manual page modifications by Gerard Paul Java (riker@mozcom.com)
- 
---- iptraf-3.0.0.orig/Documentation/rvnamed.8
-+++ iptraf-3.0.0/Documentation/rvnamed.8
-@@ -11,7 +11,7 @@
- This program is only used by iptraf and, therefore, is useless alone.
- 
- .SH FILES
-- /var/local/iptraf/rvnamed.log - log file
-+ /var/log/iptraf/rvnamed.log - log file
- 
- .SH SEE ALSO
- README.rvnamed - documentation from the author
---- iptraf-3.0.0.orig/src/ifstats.c
-+++ iptraf-3.0.0/src/ifstats.c
-@@ -32,7 +32,7 @@
- #include <arpa/inet.h>
- #include <net/if_arp.h>
- #include <linux/if_packet.h>
--#include <net/if.h>
-+#include <linux/if.h>
- #include <netinet/ip.h>
- #include <netinet/tcp.h>
- #include <netinet/udp.h>
-@@ -129,7 +129,7 @@
- {
-     FILE *fd;
-     char buf[161];
--    char ifname[10];
-+    char ifname[18];
-     struct iflist *itmp = NULL;
-     struct iflist *tail = NULL;
-     unsigned int index = 0;
-@@ -433,7 +433,7 @@
-     FILE *logfile = NULL;
- 
-     int br;
--    char ifname[10];
-+    char ifname[18];
- 
-     int ch;
- 
-@@ -760,7 +760,7 @@
-     char *tpacket;
-     unsigned int iphlen;
- 
--    char ifname[10];
-+    char ifname[18];
-     struct sockaddr_ll fromaddr;
-     unsigned short linktype;
- 
---- iptraf-3.0.0.orig/src/iptraf.c
-+++ iptraf-3.0.0/src/iptraf.c
-@@ -30,6 +30,7 @@
- #include <panel.h>
- #include <signal.h>
- #include <string.h>
-+#include <locale.h>
- #include <time.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -410,7 +411,7 @@
- {
-     printf("\nSyntax:\n");
-     printf
--        ("    iptraf [ -f ] [ { -i iface | -g | -d iface | -s iface | -z iface |\n");
-+        ("    iptraf [ -f ] [ -u ] [ { -i iface | -g | -d iface | -s iface | -z iface |\n");
-     printf
-         ("           -l iface } [ -t timeout ] [ -B ] [ -L logfile ] [-I interval] ] \n\n");
-     printf
-@@ -445,6 +446,8 @@
-         ("-f          - clear all locks and counters.  Use with great caution.\n");
-     printf
-         ("              Normally used to recover from an abnormal termination.\n\n");
-+    printf
-+        ("-u          - allow use of unsupported interfaces as ethernet devices.\n");
-     printf("IPTraf %s Copyright (c) Gerard Paul Java 1997-2004\n",
-            VERSION);
- }
-@@ -499,6 +502,8 @@
-     }
- #endif
- 
-+    setlocale(LC_ALL, "");
-+
-     strcpy(current_logfile, "");
-     strcpy(graphing_logfile, "");
-     strcpy(graphing_filter, "");
-@@ -616,6 +621,18 @@
-     freopen("/dev/null", "r", stdin);
-     freopen("/dev/null", "w", stderr);
- #endif
-+    
-+    /* Check whether LOCKDIR exists (/var/run is on a tmpfs in Ubuntu) */
-+    if(access(LOCKDIR,F_OK) != 0) {
-+	if(mkdir(LOCKDIR, 0700) == -1) {
-+	    fprintf(stderr, "Cannot create %s: %s", LOCKDIR, strerror(errno));
-+	    exit(1);
-+        }
-+	if(chown(LOCKDIR, 0, 0) == -1) {
-+	    fprintf(stderr, "Cannot change owner of %s: %s", LOCKDIR, strerror(errno));
-+	    exit(1);
-+	}
-+    }
- 
-     initscr();
- 
---- iptraf-3.0.0.orig/src/itrafmon.c
-+++ iptraf-3.0.0/src/itrafmon.c
-@@ -604,7 +604,7 @@
-     int curwin = 0;
- 
-     int readlen;
--    char ifname[10];
-+    char ifname[18];
- 
-     unsigned long long total_pkts = 0;
- 
---- iptraf-3.0.0.orig/src/othptab.c
-+++ iptraf-3.0.0/src/othptab.c
-@@ -16,14 +16,28 @@
- 
- ***/
- 
-+/* ARP protocol opcodes. */
-+#define ARPOP_REQUEST   1               /* ARP request.  */
-+#define ARPOP_REPLY     2               /* ARP reply.  */
-+#define ARPOP_RREQUEST  3               /* RARP request.  */
-+#define ARPOP_RREPLY    4               /* RARP reply.  */
-+#define ARPOP_InREQUEST 8               /* InARP request.  */
-+#define ARPOP_InREPLY   9               /* InARP reply.  */
-+#define ARPOP_NAK       10              /* (ATM)ARP NAK.  */
-+
-+
- #include <asm/types.h>
-+#include "options.h"
-+#include "tcptable.h"
-+/*#include <linux/socket.h>*/
-+#include <linux/if.h>
- #include <linux/if_ether.h>
- #include <linux/if_tr.h>
- #include <linux/if_fddi.h>
-+#include <linux/if_arp.h>
-+#include <netdb.h>
- #include <winops.h>
- #include "arphdr.h"
--#include "options.h"
--#include "tcptable.h"
- #include "othptab.h"
- #include "deskman.h"
- #include "attrs.h"
---- iptraf-3.0.0.orig/src/ifstats.h
-+++ iptraf-3.0.0/src/ifstats.h
-@@ -6,7 +6,7 @@
- ***/
- 
- struct iflist {
--    char ifname[8];
-+    char ifname[18];
-     unsigned int encap;
-     unsigned long long iptotal;
-     unsigned long badtotal;
---- iptraf-3.0.0.orig/src/othptab.h
-+++ iptraf-3.0.0/src/othptab.h
-@@ -9,14 +9,12 @@
- #include <malloc.h>
- #include <string.h>
- #include <sys/types.h>
--#include <sys/socket.h>
--#include <netinet/in.h>
-+#include <linux/socket.h>
- #include <arpa/inet.h>
- #include <netinet/ip_icmp.h>
- #include <netinet/udp.h>
- #include <curses.h>
- #include <panel.h>
--#include <netdb.h>
- #include <linux/if_ether.h>
- #include "servname.h"
- #include "addproto.h"
-@@ -42,7 +40,7 @@
-     int s_fstat;
-     int d_fstat;
-     unsigned int protocol;
--    char iface[8];
-+    char iface[18];
-     unsigned int pkt_length;
- 
-     union {
---- iptraf-3.0.0.orig/src/tcptable.h
-+++ iptraf-3.0.0/src/tcptable.h
-@@ -12,19 +12,17 @@
- #include <fcntl.h>
- #include <curses.h>
- #include <panel.h>
--#include <netdb.h>
- #include <time.h>
- #include <sys/types.h>
--#include <sys/socket.h>
--#include <netinet/in.h>
--#include <arpa/inet.h>
--#include <net/if_arp.h>
- #include <asm/types.h>
-+#include <linux/socket.h>
-+#include <sys/socket.h>
-+#include <linux/net.h>
-+#include <linux/if.h>
- #include <linux/if_packet.h>
- #include <linux/if_ether.h>
- #include <linux/if_fddi.h>
- #include <linux/if_tr.h>
--#include <net/if.h>
- #include <netinet/ip.h>
- #include <netinet/udp.h>
- #include "servname.h"
-@@ -64,7 +62,7 @@
-     unsigned long finack;
-     int partial;
-     int finsent;
--    char ifname[8];
-+    char ifname[18];
-     unsigned int index;
-     int reused;
-     int timedout;
---- iptraf-3.0.0.orig/src/Makefile
-+++ iptraf-3.0.0/src/Makefile
-@@ -31,11 +31,12 @@
- # options to be passed to the compiler.  I don't believe they need to be
- # modified (except for -m486 on non-Intel x86 platforms).
- 
--CFLAGS		= -Wall #-O2 #-m486
-+CFLAGS		= -Wall -g #-O2 #-m486
- DIRS		= -DWORKDIR=\"$(WORKDIR)\" \
- 		  -DLOGDIR=\"$(LOGDIR)\" -DEXECDIR=\"$(TARGET)\"
- LDOPTS		= #-static
- 
-+
- # you may want to change this to point to your ncurses include directory
- # if the ncurses include files are not in the default location.
- 
-@@ -139,13 +140,11 @@
- 
- cleano:
- 	rm -f *.o *~
--	strip iptraf
--	strip rvnamed
- 
- # installation rule
- 
- install:
--	@./install.sh $(TARGET) $(WORKDIR) $(LOGDIR) $(LOCKDIR)
-+	@./install.sh $(TARGET) $(WORKDIR) $(LOGDIR) $(LOCKDIR) $(DESTDIR)
- 
- # Upgrade rule
- #
-@@ -170,7 +169,6 @@
- 	/bin/cp -pR ../Documentation $(BINDIR)
- 	mkdir $(BINDIR)/src
- 	/bin/cp -p $(BINS) Makefile install.sh version $(BINDIR)/src
--	strip $(BINDIR)/src/iptraf $(BINDIR)/src/rvnamed $(BINDIR)/src/rawtime
- 
- #$(BINDIR)/src/updatefilters
- 
---- iptraf-3.0.0.orig/src/promisc.c
-+++ iptraf-3.0.0/src/promisc.c
-@@ -32,7 +32,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <netinet/in.h>
--#include <net/if.h>
-+#include <linux/if.h>
- #include <linux/if_ether.h>
- #include "ifstats.h"
- #include "ifaces.h"
-@@ -49,7 +49,7 @@
- {
-     FILE *fd;
-     int ifd;
--    char buf[8];
-+    char buf[18];
-     struct promisc_states *ptmp;
-     struct promisc_states *tail = NULL;
-     struct ifreq ifr;
-@@ -81,6 +81,7 @@
-              */
- 
-             if ((strncmp(buf, "eth", 3) == 0) ||
-+	        (strncmp(buf, "ath", 3) == 0) ||
-                 (strncmp(buf, "fddi", 4) == 0) ||
-                 (strncmp(buf, "tr", 2) == 0) ||
-                 (strncmp(ptmp->params.ifname, "wvlan", 4) == 0) ||
---- iptraf-3.0.0.orig/src/hostmon.c
-+++ iptraf-3.0.0/src/hostmon.c
-@@ -711,7 +711,7 @@
-     int is_ip;
-     int ch;
- 
--    char ifname[10];
-+    char ifname[18];
- 
-     struct timeval tv;
-     unsigned long starttime;
---- iptraf-3.0.0.orig/src/serv.c
-+++ iptraf-3.0.0/src/serv.c
-@@ -739,7 +739,7 @@
-     unsigned short linktype;
-     int br;
- 
--    char iface[8];
-+    char iface[18];
-     unsigned int idx = 1;
- 
-     unsigned int sport = 0;
---- iptraf-3.0.0.orig/src/packet.c
-+++ iptraf-3.0.0/src/packet.c
-@@ -31,13 +31,12 @@
- #include <netinet/tcp.h>
- #include <sys/time.h>
- #include <net/if_arp.h>
--#include <net/if.h>
-+#include <linux/if.h>
- #include <sys/ioctl.h>
- #include <linux/if_packet.h>
- #include <linux/if_ether.h>
- #include <linux/if_fddi.h>
- #include <linux/if_tr.h>
--#include <linux/isdn.h>
- #include <linux/sockios.h>
- #include <msgboxes.h>
- #include "deskman.h"
-@@ -79,6 +78,8 @@
-     case ARPHRD_ETHER:
-         if (strncmp(ifname, "eth", 3) == 0)
-             result = LINK_ETHERNET;
-+	else if (strncmp(ifname, "ath", 3) == 0)
-+	    result = LINK_ETHERNET;
-         else if (strncmp(ifname, "plip", 4) == 0)
-             result = LINK_PLIP;
-         else if (strncmp(ifname, "fddi", 4) == 0)       /* For some Ethernet- */
-@@ -101,6 +102,8 @@
-             result = LINK_ETHERNET;
-         else if (strncmp(ifname, "tun", 3) == 0)
-             result = LINK_ETHERNET;
-+        else if (strncmp(ifname, "ra", 2) == 0)
-+            result = LINK_ETHERNET;
-         else if (strncmp(ifname, "vlan", 3) == 0)
-             result = LINK_VLAN;
-         else if (strncmp(ifname, "brg", 3) == 0)
---- iptraf-3.0.0.orig/src/rvnamed.c
-+++ iptraf-3.0.0/src/rvnamed.c
-@@ -219,6 +219,9 @@
-     signal(SIGCHLD, childreap);
- 
-     logfile = fopen(RVNDLOGFILE, "a");
-+    if ( logfile == NULL ) { /* unable to open file -> /dev/null */
-+	logfile = fopen("/dev/null", "a");
-+    }
- 
-     if (logfile == NULL)
-         logfile = fopen("/dev/null", "a");
---- iptraf-3.0.0.orig/src/rvnamed.h
-+++ iptraf-3.0.0/src/rvnamed.h
-@@ -1,9 +1,9 @@
- #include <netinet/in.h>
- #include <arpa/inet.h>
- 
--#define CHILDSOCKNAME "/dev/rvndcldcomsk"
--#define PARENTSOCKNAME "/dev/rvndpntcomsk"
--#define IPTSOCKNAME "/dev/rvndiptcomsk"
-+#define CHILDSOCKNAME "/var/run/rvndcldcomsk"
-+#define PARENTSOCKNAME "/var/run/rvndpntcomsk"
-+#define IPTSOCKNAME "/var/run/rvndiptcomsk"
- 
- #define SOCKET_PREFIX	"isock"
- 
---- iptraf-3.0.0.orig/src/ifaces.c
-+++ iptraf-3.0.0/src/ifaces.c
-@@ -24,7 +24,7 @@
- #include <sys/ioctl.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
--#include <net/if.h>
-+#include <linux/if.h>
- #include <fcntl.h>
- #include <string.h>
- #include <linux/if_packet.h>
-@@ -32,14 +32,15 @@
- #include "error.h"
- 
- extern int accept_unsupported_interfaces;
--#define NUM_SUPPORTED_IFACES 26
-+#define NUM_SUPPORTED_IFACES 28
- 
- extern int daemonized;
- 
- char ifaces[][6] =
-     { "lo", "eth", "sl", "ppp", "ippp", "plip", "fddi", "isdn", "dvb",
-     "pvc", "hdlc", "ipsec", "sbni", "tr", "wvlan", "wlan", "sm2", "sm3",
--    "pent", "lec", "brg", "tun", "tap", "cipcb", "tunl", "vlan"
-+    "pent", "lec", "brg", "tun", "tap", "cipcb", "tunl", "vlan", "ath",
-+    "ra"
- };
- 
- char *ltrim(char *buf)
-@@ -102,7 +103,7 @@
- int iface_supported(char *iface)
- {
-     int i;
--
-+    
-     if (accept_unsupported_interfaces)
-         return 1;
- 
---- iptraf-3.0.0.orig/src/isdntab.h
-+++ iptraf-3.0.0/src/isdntab.h
-@@ -1,3 +1,87 @@
-+/* copied from Linux ISDN subsystem for inclusion in iptraf */
-+
-+/* Linux ISDN subsystem, main header
-+ *
-+ * Copyright 1994,95,96 by Fritz Elfert (fritz@isdn4linux.de)
-+ * Copyright 1995,96    by Thinking Objects Software GmbH Wuerzburg
-+ * Copyright 1995,96    by Michael Hipp (Michael.Hipp@student.uni-tuebingen.de)
-+ * Copyright 2000-2002  by Kai Germaschewski (kai@germaschewski.name)
-+ * 
-+ * This software may be used and distributed according to the terms
-+ * of the GNU General Public License, incorporated herein by reference.
-+ *
-+ */
-+
-+/* Packet encapsulations for net-interfaces */
-+#define ISDN_NET_ENCAP_ETHER      0
-+#define ISDN_NET_ENCAP_RAWIP      1
-+#define ISDN_NET_ENCAP_IPTYP      2
-+#define ISDN_NET_ENCAP_CISCOHDLC  3 /* Without SLARP and keepalive */
-+#define ISDN_NET_ENCAP_SYNCPPP    4
-+#define ISDN_NET_ENCAP_UIHDLC     5
-+#define ISDN_NET_ENCAP_CISCOHDLCK 6 /* With SLARP and keepalive    */
-+#define ISDN_NET_ENCAP_X25IFACE   7 /* Documentation/networking/x25-iface.txt*/
-+#define ISDN_NET_ENCAP_NR         8
-+
-+/* New ioctl-codes */
-+#define IIOCNETAIF  _IO('I',1)
-+#define IIOCNETDIF  _IO('I',2)
-+#define IIOCNETSCF  _IO('I',3)
-+#define IIOCNETGCF  _IO('I',4)
-+#define IIOCNETANM  _IO('I',5)
-+#define IIOCNETDNM  _IO('I',6)
-+#define IIOCNETGNM  _IO('I',7)
-+#define IIOCGETSET  _IO('I',8) /* no longer supported */
-+#define IIOCSETSET  _IO('I',9) /* no longer supported */
-+#define IIOCSETVER  _IO('I',10)
-+#define IIOCNETHUP  _IO('I',11)
-+#define IIOCSETGST  _IO('I',12)
-+#define IIOCSETBRJ  _IO('I',13)
-+#define IIOCSIGPRF  _IO('I',14)
-+#define IIOCGETPRF  _IO('I',15)
-+#define IIOCSETPRF  _IO('I',16)
-+#define IIOCGETMAP  _IO('I',17)
-+#define IIOCSETMAP  _IO('I',18)
-+#define IIOCNETASL  _IO('I',19)
-+#define IIOCNETDIL  _IO('I',20)
-+#define IIOCGETCPS  _IO('I',21)
-+#define IIOCGETDVR  _IO('I',22)
-+
-+
-+typedef struct {
-+	char	name[10];	/* Name of interface                     */
-+	char	master[10];	/* Name of Master for Bundling           */
-+	char	slave[10];	/* Name of Slave for Bundling            */
-+	char	eaz[256];	/* EAZ/MSN                               */
-+	char	drvid[25];	/* DriverId for Bindings                 */
-+	int	onhtime;	/* Hangup-Timeout                        */
-+	int	charge;		/* Charge-Units                          */
-+	int	l2_proto;	/* Layer-2 protocol                      */
-+	int	l3_proto;	/* Layer-3 protocol                      */
-+	int	p_encap;	/* Encapsulation                         */
-+	int	exclusive;	/* Channel, if bound exclusive           */
-+	int	dialmax;	/* Dial Retry-Counter                    */
-+	int	slavedelay;	/* Delay until slave starts up           */
-+	int	cbdelay;	/* Delay before Callback                 */
-+	int	chargehup;	/* Flag: Charge-Hangup                   */
-+	int	ihup;		/* Flag: Hangup-Timeout on incoming line */
-+	int	secure;		/* Flag: Secure                          */
-+	int	callback;	/* Flag: Callback                        */
-+	int	cbhup;		/* Flag: Reject Call before Callback     */
-+	int	pppbind;	/* ippp device for bindings              */
-+	int	chargeint;	/* Use fixed charge interval length      */
-+	int	triggercps;	/* BogoCPS needed for triggering slave   */
-+	int	dialtimeout;	/* Dial-Timeout                          */
-+	int	dialwait;	/* Time to wait after failed dial        */
-+	int	dialmode;	/* Flag: off / on / auto                 */
-+} isdn_net_ioctl_cfg;
-+
-+
-+
-+
-+/* end of copied part */
-+
-+
- struct isdntabent {
-     char ifname[10];
-     unsigned int encap;
---- iptraf-3.0.0.orig/src/isdntab.c
-+++ iptraf-3.0.0/src/isdntab.c
-@@ -20,7 +20,6 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/ioctl.h>
--#include <linux/isdn.h>
- #include "isdntab.h"
- 
- 
---- iptraf-3.0.0.orig/src/pktsize.c
-+++ iptraf-3.0.0/src/pktsize.c
-@@ -25,7 +25,7 @@
- #include <sys/time.h>
- #include <sys/ioctl.h>
- #include <sys/socket.h>
--#include <net/if.h>
-+#include <linux/if.h>
- #include <netinet/in.h>
- #include <linux/if_ether.h>
- #include <linux/if_packet.h>
---- iptraf-3.0.0.orig/src/promisc.h
-+++ iptraf-3.0.0/src/promisc.h
-@@ -9,7 +9,7 @@
-  */
- 
- struct promisc_params {
--    char ifname[8];
-+    char ifname[18];
-     int saved_state;
-     int state_valid;
- };
---- iptraf-3.0.0.orig/src/install.sh
-+++ iptraf-3.0.0/src/install.sh
-@@ -18,37 +18,38 @@
- WORKDIR=$2
- LOGDIR=$3
- LOCKDIR=$4
-+DESTDIR=$5
- 
- echo
- echo "*** Installing executable programs and preparing work directories"
- echo
- echo ">>> Installing iptraf in $TARGET"
--$INSTALL -m 0700 -o root -g root -s iptraf $TARGET
-+$INSTALL -m 0700 -o root -g root iptraf $DESTDIR/$TARGET
- echo ">>> Installing rvnamed in $TARGET"
--$INSTALL -m 0700 -o root -g root -s rvnamed $TARGET
-+$INSTALL -m 0700 -o root -g root rvnamed $DESTDIR/$TARGET
- 
--if [ ! -d $WORKDIR ]; then
-+if [ ! -d $DESTDIR/$WORKDIR ]; then
-     echo ">>> Creating IPTraf work directory $WORKDIR"
- else
-     echo ">>> IPTraf work directory $WORKDIR already exists"
--    rm -f $WORKDIR/othfilter.dat
-+    rm -f $DESTDIR/$WORKDIR/othfilter.dat
- fi
- 
--$INSTALL -m 0700 -o root -g root -d $WORKDIR
-+$INSTALL -m 0700 -o root -g root -d $DESTDIR/$WORKDIR
- 
--if [ ! -d $LOGDIR ]; then
-+if [ ! -d $DESTDIR/$LOGDIR ]; then
-     echo ">>> Creating IPTraf log directory $LOGDIR"
- else
-     echo ">>> IPTraf log directory $LOGDIR already exists"
- fi
--$INSTALL -m 0700 -o root -g root -d $LOGDIR
-+$INSTALL -m 0700 -o root -g root -d $DESTDIR/$LOGDIR
- 
--if [ ! -d $LOCKDIR ]; then
-+if [ ! -d $DESTDIR/$LOCKDIR ]; then
-     echo ">>> Creating IPTraf lockfile directory $LOCKDIR"
- else
-     echo ">>> IPTraf lockfile directory $LOCKDIR already exists"
- fi
--$INSTALL -m 0700 -o root -g root -d $LOCKDIR
-+$INSTALL -m 0700 -o root -g root -d $DESTDIR/$LOCKDIR
- echo
- echo
- echo "*** iptraf, and rvnamed executables are in $TARGET"
-@@ -56,25 +57,27 @@
- 
- ################# Filter clearing for 3.0 ##########################
- 
--if [ ! -f $WORKDIR/version ]; then
-+if [ ! -f $DESTDIR/$WORKDIR/version ]; then
-     echo ">>> Clearing old filter list"
--    if [ -f $WORKDIR/tcpfilters.dat ]; then
--        mv -f $WORKDIR/tcpfilters.dat $WORKDIR/tcpfilters.dat~
-+    if [ -f $DESTDIR/$WORKDIR/tcpfilters.dat ]; then
-+        mv -f $DESTDIR/$WORKDIR/tcpfilters.dat $DESTDIR/$WORKDIR/tcpfilters.dat~
-     fi
-     
--    if [ -f $WORKDIR/udpfilters.dat ]; then
--        mv -f $WORKDIR/udpfilters.dat $WORKDIR/udpfilters.dat~
-+    if [ -f $DESTDIR/$WORKDIR/udpfilters.dat ]; then
-+        mv -f $DESTDIR/$WORKDIR/udpfilters.dat $DESTDIR/$WORKDIR/udpfilters.dat~
-     fi
- 
--    if [ -f $WORKDIR/othipfilters.dat ]; then
--        mv -f $WORKDIR/othipfilters.dat $WORKDIR/othipfilters.dat~
-+    if [ -f $DESTDIR/$WORKDIR/othipfilters.dat ]; then
-+        mv -f $DESTDIR/$WORKDIR/othipfilters.dat $DESTDIR/$WORKDIR/othipfilters.dat~
-     fi
- 
--    rm -f $WORKDIR/savedfilters.dat
-+    rm -f $DESTDIR/$WORKDIR/savedfilters.dat
- fi
- ####################################################################
- 
--cat version > $WORKDIR/version
-+cat version > $DESTDIR/$WORKDIR/version
-+
-+exit 0
- 
- echo 
- echo
---- iptraf-3.0.0.orig/src/tr.c
-+++ iptraf-3.0.0/src/tr.c
-@@ -7,7 +7,7 @@
-  */
- 
- #include <asm/types.h>
--#include <linux/if_tr.h>
-+#include <netinet/if_tr.h>
- #include <netinet/in.h>
- 
- unsigned int get_tr_ip_offset(unsigned char *pkt)
---- iptraf-3.0.0.orig/debian/manpages
-+++ iptraf-3.0.0/debian/manpages
-@@ -0,0 +1,2 @@
-+Documentation/iptraf.8
-+Documentation/rvnamed.8
---- iptraf-3.0.0.orig/debian/dirs
-+++ iptraf-3.0.0/debian/dirs
-@@ -0,0 +1,7 @@
-+etc/logrotate.d 
-+usr/sbin 
-+usr/lib/iptraf 
-+usr/share/doc-base/ 
-+var/lib/iptraf/ 
-+var/run/iptraf/
-+
---- iptraf-3.0.0.orig/debian/README.debian
-+++ iptraf-3.0.0/debian/README.debian
-@@ -0,0 +1,16 @@
-+iptraf for Debian
-+-----------------
-+
-+Since 2.1.1, old config files (versions below 1.4.0) won't be updated to the
-+new format. Binary config files are a pain; let's suffer :( (old tools don't
-+compile anymore)
-+
-+IPTraf does _not_ work with IPv6. you've been warned.
-+
-+IPTraf for Debian supports wvlan and lec interfaces that upstream doesn't
-+support by lack of thorough testing. This support is here since users
-+requested it but no tests have been done !
-+
-+-- 
-+Frederic Peters <fpeters@debian.org>, Wed, 19 Dec 2001 10:27:54 +0100
-+
---- iptraf-3.0.0.orig/debian/changelog
-+++ iptraf-3.0.0/debian/changelog
-@@ -0,0 +1,424 @@
-+iptraf (3.0.0-6) unstable; urgency=low
-+
-+  * src/ifaces.c: added support for raX interfaces (closes: #281315)
-+  * debian/menu: updated to new menu policy (froms Apps/Net to Applications /
-+    Network / Monitoring)
-+  * src/iptraf.c: added call to setlocale() (closes: #328186, #327147)  (that
-+    I couldn't reproduce anyway)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Sat, 29 Sep 2007 12:42:56 +0200
-+
-+iptraf (3.0.0-5) unstable; urgency=low
-+
-+  * src/Makefile, src/install.sh: always use -g, and don't strip binaries
-+    (closes: #437229)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Wed, 15 Aug 2007 15:36:49 +0200
-+
-+iptraf (3.0.0-4) unstable; urgency=low
-+
-+  * src/ifaces.c: incremented NUM_SUPPORTED_IFACES so that ath devices are
-+    recognised correctly. (closes: #413212)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Sat,  3 Mar 2007 13:35:58 +0100
-+
-+iptraf (3.0.0-3) unstable; urgency=low
-+
-+  * Sync with Ubuntu fixes (by Oliver Grawert and Michael Vogt)
-+    * added fix for /var/run detection (since it is a tmpfs by default on
-+      Ubuntu) [and fixed ubuntu fix]
-+    * added support for ath devices
-+    * fixed FTBFS by changing linux/if_tr.h to netinet/if_tr.h
-+
-+ -- Frederic Peters <fpeters@debian.org>  Sun, 15 Oct 2006 13:34:14 +0200
-+
-+iptraf (3.0.0-2) unstable; urgency=low
-+
-+  * src/ifaces.c: remove duplicated patch, it had been applied upstream and I
-+    missed it. (closes: #379539)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Mon, 24 Jul 2006 11:02:29 +0200
-+
-+iptraf (3.0.0-1) unstable; urgency=low
-+
-+  * New upstream release. (closes: #370577)
-+    * Oops, I missed it, thansk for the bug report.
-+    * Updated patches to work against this version.
-+    * Supports vlan interfaces (closes: #168202, #226577)
-+    * Supports bridged interfaces (closes: #215535)
-+  * debian/copyright: updated copyright & license information.
-+  * debian/rules: partly updated to newer debhelper helpers.
-+
-+ -- Frederic Peters <fpeters@debian.org>  Tue,  6 Jun 2006 07:36:49 +0200
-+
-+iptraf (2.7.0-8) unstable; urgency=low
-+
-+  * src/*.[ch]: shaked up headers so it compiles with current libc and linux
-+    headers (closes: #323319)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Tue, 16 Aug 2005 10:24:50 +0200
-+
-+iptraf (2.7.0-7) unstable; urgency=low
-+
-+  * Documentation/iptraf.8: use \- to denote the dash signs before options.
-+
-+ -- Frederic Peters <fpeters@debian.org>  Sat, 26 Feb 2005 10:37:01 +0100
-+
-+iptraf (2.7.0-6) unstable; urgency=low
-+
-+  * Creates rvnamed sockets in /var/run/ (closes: #272958)
-+  * debian/menu: quote needs and section.
-+
-+ -- Frederic Peters <fpeters@debian.org>  Thu, 23 Sep 2004 10:05:55 +0200
-+
-+iptraf (2.7.0-5) unstable; urgency=low
-+
-+  * Include bits from <linux/isdn.h> to get iptraf working without inclusion
-+    of this kernel header (closes: #219757)
-+  * Do not test for TERM if running daemonized (closes: #222525)
-+  * Document -u in the manpage (closes: #147447, #199888)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Thu, 11 Dec 2003 13:45:00 +0100
-+
-+iptraf (2.7.0-4) unstable; urgency=low
-+
-+  * debian/menu: fixed su-to-root in menu item (closes: #188078)
-+  * debian/control: removed note about Linux kernel >= 2.2
-+  * debian/control: updated policy to 3.6.1.0, no changes needed.
-+
-+ -- Frederic Peters <fpeters@debian.org>  Sat, 30 Aug 2003 23:16:41 +0200
-+
-+iptraf (2.7.0-3) unstable; urgency=low
-+
-+  * Added support for vlan interfaces. (patch by Ard van Breemen)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Mon, 11 Nov 2002 17:52:22 +0100
-+
-+iptraf (2.7.0-2) unstable; urgency=low
-+
-+  * debian/iptraf-manual: there is no longer a plain text manual.
-+    (closes: #149648)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Tue, 11 Jun 2002 11:40:45 +0200
-+
-+iptraf (2.7.0-1) unstable; urgency=low
-+
-+  * New upstream release.
-+  * Upstream fixes detailed interface statitistics screen. (closes: #146851)
-+  * Upstream has support for renamed interfaces. (closes: #128175)
-+    but no documentation for it (doesn't close: 147447...)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Wed, 22 May 2002 09:31:32 +0200
-+
-+iptraf (2.6.0-1) unstable; urgency=low
-+
-+  * New upstream release.
-+  * Upstream added percentage broadcast packet. (closes: #119915)
-+  * Upstream applied my patch for renamed interfaces. (closes: #128175)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Wed,  1 May 2002 11:46:31 +0200
-+
-+iptraf (2.5.0-4) unstable; urgency=low
-+
-+  * debian/logrotate: s/USR/USR1/ (closes: #131106)
-+  * No longer hangs with resolver daemon (closes: #83522)
-+  * debian/postrm: remove /var/run/iptraf on purge (closes: #129907)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Sun, 27 Jan 2002 13:51:48 +0100
-+
-+iptraf (2.5.0-3) unstable; urgency=low
-+
-+  * debian/postinst: fixed spelling mistake itpraf -> iptraf. Caused old
-+    script to rotate logs not to be renamed. (closes: #129744)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Fri, 18 Jan 2002 12:33:38 +0100
-+
-+iptraf (2.5.0-2) unstable; urgency=low
-+
-+  * debian/menu: use su-to-root to launch iptraf from menu. (closes: #128144)
-+  * debian/doc: removed README.Documentation since it talks about installing
-+    documentation and this is already done by the package. (closes: #126932)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Mon,  7 Jan 2002 21:31:09 +0100
-+
-+iptraf (2.5.0-1) unstable; urgency=low
-+
-+  * New upstream release. (closes: #125726)
-+  * Upstream source tarball no longer contains compiled binaries.
-+    (closes: #122677)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Wed, 19 Dec 2001 10:10:07 +0100
-+
-+iptraf (2.4.0-4) unstable; urgency=low
-+
-+  * debian/logrotate: don't fail if iptraf is not running. (closes: #122692)
-+  * debian/copyright: corrected licences -> licenses
-+
-+ -- Frederic Peters <fpeters@debian.org>  Thu,  6 Dec 2001 19:17:39 +0100
-+
-+iptraf (2.4.0-3) unstable; urgency=low
-+
-+  * debian/logrotate: added USR1 signal sending after logrotate rotated the
-+    logfiles. (notification by Sebastian Henschel <shensche@defcom.de>)
-+  * debian/changelog: removed emacs cruft from the end of the file.
-+  * src/Makefile: removed -g from gcc flags.
-+  * debian/rules, src/Makefile: added support for DEB_BUILD_OPTIONS
-+  * debian/control: updated Standard-Versions to 3.5.6.0
-+
-+ -- Frederic Peters <fpeters@debian.org>  Tue, 27 Nov 2001 13:36:37 +0100
-+
-+iptraf (2.4.0-2) unstable; urgency=low
-+
-+  * Fixed logfile directory location in rvnamed manpage (Closes: #99455)
-+  * Added support for lec interfaces.
-+
-+ -- Frederic Peters <fpeters@debian.org>  Mon,  2 Jul 2001 11:34:39 +0200
-+
-+iptraf (2.4.0-1) unstable; urgency=low
-+
-+  * New upstream release.
-+  * Upstream includes /etc/ethers patch.
-+
-+ -- Frederic Peters <fpeters@debian.org>  Wed, 11 Apr 2001 11:19:26 +0200
-+
-+iptraf (2.3.1-2) unstable; urgency=low
-+
-+  * Patched so it can use /etc/ethers like tcpdump (Closes: #32134)
-+  * debian/postinst: as a consequence it no longer creates ethernet.desc
-+    from an existing /etc/ethers
-+
-+ -- Frederic Peters <fpeters@debian.org>  Tue, 19 Dec 2000 20:35:25 +0100
-+
-+iptraf (2.3.1-1) unstable; urgency=low
-+
-+  * New upstream release
-+
-+ -- Frederic Peters <fpeters@debian.org>  Sat,  9 Dec 2000 16:42:35 +0100
-+
-+iptraf (2.2.2-3) unstable; urgency=high
-+
-+  * applied patch to support wvlan interfaces (patch by eichin@thok.org)
-+    (closes: #70875)
-+  * fixed rvnamed so it doesn't segfault (and makes iptraf locking up)
-+    when /var/log/iptraf doesn't exist. (closes: #71487)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Mon, 27 Nov 2000 18:21:21 +0100
-+
-+iptraf (2.2.2-2) unstable; urgency=high
-+
-+  * debian/rules: rename old /etc/cron.daily/iptraf to /e/c.d/iptraf.obsolete
-+    since we now use logrotate (and dpkg won't remove it automatically)
-+    (closes: #72998)
-+  * debian/logrotate: added notifempty statemente
-+
-+ -- Frederic Peters <fpeters@debian.org>  Mon, 16 Oct 2000 22:37:54 +0200
-+
-+iptraf (2.2.2-1) unstable; urgency=low
-+
-+  * New upstream release
-+
-+ -- Frederic Peters <fpeters@debian.org>  Thu, 24 Aug 2000 19:22:07 +0200
-+
-+iptraf (2.1.1-5) unstable; urgency=low
-+
-+  * create log directory in postinst since it will only be removed by purge
-+    (ie not remove) (closes: #58961)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Wed,  1 Mar 2000 15:08:34 +0100
-+
-+iptraf (2.1.1-4) frozen unstable; urgency=high
-+
-+  * recompiled against libncurses5
-+  * debian/control: fixed Build-Depends line (libncurses4-dev has been
-+    replaced by libncurses-dev)/ (closes: #56376)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Sat, 29 Jan 2000 01:50:53 +0100
-+
-+iptraf (2.1.1-3) frozen unstable; urgency=low
-+
-+  * debian/postinst: iptraf wouldn't install because of /var/state/iptraf
-+    no longer existing. (closes: #56147)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Tue, 25 Jan 2000 23:14:25 +0100
-+
-+iptraf (2.1.1-2) unstable; urgency=low
-+
-+  * /var/lib/iptraf was not created
-+
-+ -- Frederic Peters <fpeters@debian.org>  Tue, 21 Dec 1999 17:10:40 +0100
-+ 
-+iptraf (2.1.1-1) unstable; urgency=high
-+
-+  * Maintainer upload :)
-+  * Closes: #52341 and #52837 (rvnamed not working)
-+  * Closes: #52548 (/usr/doc/iptraf not existing)
-+  * Closes: #51801 (make building in live fs)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Fri, 17 Dec 1999 17:45:57 +0100
-+ 
-+iptraf (2.1.1-0.2) unstable; urgency=low
-+
-+  * Another NMU requested by Frederic.
-+  * debian/postinst: Fixed move from /var/lib/iptraf to /var/state/iptraf 
-+    to work in all cases (closes: #51712).
-+  * debian/postinst: Commented out the config file conversion tools.
-+    I can't get them to compile anymore :(
-+
-+ -- Torsten Landschoff <torsten@debian.org>  Sat,  4 Dec 1999 12:04:51 +0100
-+
-+iptraf (2.1.1-0.1) unstable; urgency=low
-+
-+  * Debian QA Upload as requested by Frederic.
-+  * New upstream release (closes: #50804).
-+  * New features:
-+    - New filter for non-IP packages (closes: #44420).
-+    - Ctrl-L does redraw the screen now (closes: #43848).
-+  * debian/control: Added Build-Depends, updated Standards-Version.
-+  * debian/rules: Updated to adjust for changes in upstream source:
-+  * Removed the old configfile conversion tools. I don't think they 
-+    are worth the effort.
-+
-+ -- Torsten Landschoff <torsten@debian.org>  Tue, 23 Nov 1999 17:49:23 +0100
-+
-+iptraf (2.0.2-5) unstable; urgency=low
-+
-+  * Added 'missingok' to logrotate.d/iptraf . (bug#44794)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Fri, 10 Sep 1999 20:14:56 +0200
-+
-+iptraf (2.0.2-4) unstable; urgency=low
-+
-+  * Updated debian/rules to build with newer debhelper
-+
-+ -- Frederic Peters <fpeters@debian.org>  Thu,  9 Sep 1999 18:32:00 +0200
-+
-+iptraf (2.0.2-3) unstable; urgency=low
-+
-+  * Moved to logrotate (it should now be compliant with policy 3.0.1)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Sun,  5 Sep 1999 19:56:59 +0200
-+
-+iptraf (2.0.2-2) unstable; urgency=low
-+
-+  * Fixed postinst removal of /etc/iptraf.cfg (Bug#43625)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Sun, 29 Aug 1999 02:32:41 +0200
-+
-+iptraf (2.0.2-1) unstable; urgency=low
-+
-+  * New upstream release
-+
-+ -- Frederic Peters <fpeters@debian.org>  Thu, 29 Jul 1999 22:48:35 +0200
-+
-+iptraf (1.4.2-2) unstable; urgency=low
-+
-+  * debian/rules : fixed a few errors (Fixes Bug#32265)
-+  * debian/postinst : improved handling of converting format from
-+    older releases
-+  * Converting /etc/ethers (from tcpdump) to iptraf's ethernet.desc
-+    (Fixes Bug#32134)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Sat, 30 Jan 1999 17:52:27 +0100
-+ 
-+iptraf (1.4.2-1) unstable; urgency=low
-+
-+  * New upstream release (Fixes Bug#31805)
-+  * Switched to debhelper
-+
-+ -- Frederic Peters <fpeters@debian.org>  Mon, 18 Jan 1999 16:47:38 +0100
-+ 
-+iptraf (1.4.1-1) unstable; urgency=low
-+
-+  * New upstream release
-+
-+ -- Frederic Peters <fpeters@debian.org>  Mon,  4 Jan 1999 19:59:53 +0100
-+
-+iptraf (1.3.0-5) frozen unstable; urgency=low
-+
-+  * Fixed a typo in postrm (Bug#30559)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Sun, 13 Dec 1998 18:45:31 +0100
-+
-+iptraf (1.3.0-4.1) unstable; urgency=low
-+
-+  * non-maintainer (binary-only) upload for Alpha
-+  * make 3.77-2 apparently doesn't like `*.h' as target
-+
-+ -- Paul Slootman <paul@debian.org>  Mon, 12 Oct 1998 20:41:28 +0200
-+
-+iptraf (1.3.0-4) unstable; urgency=low
-+
-+  * (Re) Added daily maintenance of log file.
-+
-+ -- Frederic Peters <fpeters@debian.org>  Mon,  5 Oct 1998 21:40:04 +0200
-+
-+iptraf (1.3.0-3) unstable; urgency=low
-+
-+  * New versions aren't just for Alpha people :)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Thu, 24 Sep 1998 23:04:33 +0200
-+
-+iptraf (1.3.0-2.1) unstable; urgency=low
-+
-+  * non-maintainer (binary-only) upload for Alpha
-+  * fixed creation of /var/log/iptraf (should be $DESTDIR/var/log/iptraf)
-+
-+ -- Paul Slootman <paul@debian.org>  Thu, 24 Sep 1998 00:31:19 +0200
-+
-+iptraf (1.3.0-2) unstable; urgency=low
-+
-+  * Made it upgrade right from both 1.1 and 1.2 releases.
-+  * Version 1.3.0 brings a warning message at startup when IP Masquerading is enabled in the kernel. This can be boring so I add a new switch (-q).
-+
-+ -- Frederic Peters <fpeters@debian.org>  Mon, 21 Sep 1998 08:11:33 +0200
-+
-+iptraf (1.3.0-1) unstable; urgency=low
-+
-+  * New upstream release
-+
-+ -- Frederic Peters <fpeters@debian.org>  Sun, 20 Sep 1998 22:57:54 +0200
-+
-+iptraf (1.2.0-2) unstable; urgency=low
-+
-+  * Added PLIP to included interfaces (fixes #26376)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Sat, 19 Sep 1998 11:08:24 +0200
-+
-+iptraf (1.2.0-1) unstable; urgency=low
-+
-+  * New maintainer.
-+  * New upstream release.
-+  * Moved configuration files from /var/lib/iptraf/ to /etc/iptraf/.
-+  * Moved log files from /var/lib/iptraf/ to /var/log/.
-+  * Removed '-m486' flag in Makefile (fixes #20989).
-+  * Created man pages.
-+  * Added doc-base support.
-+
-+ -- Frederic Peters <fpeters@debian.org>  Sat, 27 Jun 1998 15:30:28 +0200
-+
-+iptraf (1.1.0-3) unstable; urgency=low
-+
-+  * New maintainer.
-+  * Many new improvements to package design.
-+
-+ -- Robert S. Edmonds <edmonds@freewwweb.com>  Mon,  6 Apr 1998 18:16:04 -0400
-+
-+iptraf (1.1.0-2) unstable; urgency=low
-+
-+  * path to rvnamed was wrong and thus rvnamed was not loaded when needed.
-+  * Clean up *.rej files. Sigh.
-+
-+ -- Christoph Lameter <chris@waterf.org>  Sat, 28 Feb 1998 09:13:59 -0800
-+
-+iptraf (1.1.0-1) unstable; urgency=low
-+
-+  * New upstream release
-+
-+ -- Christoph Lameter <chris@waterf.org>  Sat, 28 Feb 1998 07:53:14 -0800
-+
-+iptraf (1.0-1) unstable; urgency=low
-+
-+  * Initial Release.
-+
-+ -- Christoph Lameter <chris@waterf.org>  Sat,  3 Jan 1998 21:59:02 -0800
-+
---- iptraf-3.0.0.orig/debian/control
-+++ iptraf-3.0.0/debian/control
-@@ -0,0 +1,15 @@
-+Source: iptraf
-+Section: net
-+Priority: optional
-+Maintainer: Frederic Peters <fpeters@debian.org>
-+Build-Depends: debhelper (>= 5.0.0-1), libncurses-dev
-+Standards-Version: 3.7.2.0
-+
-+Package: iptraf
-+Architecture: any
-+Depends: ${shlibs:Depends}
-+Description: Interactive Colorful IP LAN Monitor
-+ IPTraf is an ncurses-based IP LAN monitor that generates
-+ various network statistics including TCP info, UDP counts,
-+ ICMP and OSPF information, Ethernet load info, node stats,
-+ IP checksum errors, and others.
---- iptraf-3.0.0.orig/debian/copyright
-+++ iptraf-3.0.0/debian/copyright
-@@ -0,0 +1,29 @@
-+This package is maintained by Frederic Peters <fpeters@debian.org>.
-+
-+It was downloaded from:
-+  ftp://iptraf.seul.org/pub/iptraf/iptraf-3.0.0.tar.gz
-+
-+
-+Copyright (c) Gerard Paul Java 1997-2005
-+
-+IPTraf is open-source software, distributed under the terms of the GNU
-+General Public License, Version 2, or (at your option) any later version.
-+
-+This program is free software; you can redistribute it and/or modify it
-+under the terms of the GNU General Public License as published by the Free
-+Software Foundation; either version 2 of the License, or (at your option)
-+any later version.
-+
-+This program is distributed in the hope that it will be useful, but
-+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-+or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+for more details.
-+
-+You should have received a copy of the GNU General Public License along with
-+this program; if not, write to the Free Software Foundation, Inc., 51
-+Franklin St, Fifth Floor, Boston, MA  02110-1301,  USA.
-+
-+
-+On Debian GNU/Linux systems, the complete text of the GNU General Public
-+License can be found in `/usr/share/common-licenses/GPL'.
-+
---- iptraf-3.0.0.orig/debian/docs
-+++ iptraf-3.0.0/debian/docs
-@@ -0,0 +1,8 @@
-+README
-+README.interfaces
-+README.platforms
-+README.rvnamed
-+README.contact
-+FAQ
-+RELEASE-NOTES
-+
---- iptraf-3.0.0.orig/debian/postinst
-+++ iptraf-3.0.0/debian/postinst
-@@ -0,0 +1,66 @@
-+#!/bin/sh
-+
-+set -e
-+
-+case "$1" in
-+    configure)
-+	if [ -e /etc/iptraf.cfg ]
-+	then
-+		# old, incompatible, binary config file - I won't miss you :)
-+		rm -f /etc/iptraf.cfg
-+	fi
-+
-+	if command -v install-docs >/dev/null 2>&1; then
-+		install-docs -i /usr/share/doc-base/iptraf
-+	fi
-+
-+	if [ ! -d /var/lib/iptraf ]; then
-+		mkdir /var/lib/iptraf
-+	fi
-+
-+	if [ -e /var/state/iptraf ]; then
-+		find /var/state/iptraf -mindepth 1 -maxdepth 1 	\
-+					-exec mv \{\} /var/lib/iptraf/ \;
-+		rmdir /var/state/iptraf || true
-+	fi
-+
-+	# log files may have sensitive data
-+	test -d /var/log/iptraf || mkdir /var/log/iptraf
-+	chmod 0700 /var/log/iptraf
-+
-+	# renaming old logfile rotator since it is marked as conffile and dpkg won't
-+	# remove it (reported as Bug#72998 by Josip Rodin <joy@cibalia.gkvk.hr>
-+	test -e /etc/cron.daily/iptraf && \
-+		mv /etc/cron.daily/iptraf /etc/cron.daily/iptraf.obsolete
-+
-+	# filters changed in 3.0, move them away (copied from in src/install.sh)
-+	WORKDIR=/var/lib/iptraf/
-+	if [ -z "$2" ] || dpkg --compare-versions "$2" lt 3.0.0-1 ; then
-+		if [ -f $WORKDIR/tcpfilters.dat ]; then
-+			mv -f $WORKDIR/tcpfilters.dat $WORKDIR/tcpfilters.dat~
-+		fi
-+
-+		if [ -f $WORKDIR/udpfilters.dat ]; then
-+			mv -f $WORKDIR/udpfilters.dat $WORKDIR/udpfilters.dat~
-+		fi
-+
-+		if [ -f $WORKDIR/othipfilters.dat ]; then
-+			mv -f $WORKDIR/othipfilters.dat $WORKDIR/othipfilters.dat~
-+		fi
-+
-+		rm -f $WORKDIR/savedfilters.dat
-+	fi
-+	;;
-+
-+    abort-upgrade|abort-remove|abort-deconfigure)
-+        ;;
-+
-+    *)
-+        echo "postinst called with unknown argument \`$1'" >&2
-+        exit 1
-+        ;;
-+esac
-+
-+
-+#DEBHELPER#
-+
---- iptraf-3.0.0.orig/debian/menu
-+++ iptraf-3.0.0/debian/menu
-@@ -0,0 +1,4 @@
-+?package(iptraf):needs="text" \
-+	section="Applications/Network/Monitoring" \
-+	title="IPTraf" hints="Monitoring" \
-+	command="/usr/bin/su-to-root -c /usr/sbin/iptraf"
---- iptraf-3.0.0.orig/debian/iptraf-manual
-+++ iptraf-3.0.0/debian/iptraf-manual
-@@ -0,0 +1,11 @@
-+Document: iptraf
-+Title: IPTraf User's Manual
-+Author: Gerard Paul Java
-+Abstract: This document is the User's Manual for IPTraf 2.7.0.
-+ Documented here are the features of the program and instructions on its use.
-+Section: Apps/Net
-+
-+Format: HTML
-+Index: /usr/share/doc/iptraf/html/manual.html
-+Files: /usr/share/doc/iptraf/html/manual.html
-+
---- iptraf-3.0.0.orig/debian/rules
-+++ iptraf-3.0.0/debian/rules
-@@ -0,0 +1,78 @@
-+#!/usr/bin/make -f
-+# Made with the aid of dh_make, by Craig Small
-+# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
-+# Some lines taken from debmake, by Cristoph Lameter.
-+
-+# Uncomment this to turn on verbose mode.
-+#export DH_VERBOSE=1
-+
-+makeopts      := \
-+		 WORKDIR=/var/lib/iptraf			\
-+		 LOGDIR=/var/log/iptraf				\
-+		 TARGET=/usr/sbin				\
-+		 DESTDIR=$(shell pwd)/debian/iptraf
-+
-+build: build-stamp
-+build-stamp:
-+	dh_testdir
-+
-+	# Add here commands to compile the package.
-+	cd src; make $(makeopts)
-+	
-+	cp Documentation/README README.Documentation
-+
-+	touch build-stamp
-+
-+clean:
-+	dh_testdir
-+	dh_testroot
-+	rm -f build-stamp
-+	rm -f README.Documentation
-+
-+	# Add here commands to clean up after the build process.
-+	-cd src; make clean
-+	dh_clean
-+
-+# Build architecture-independent files here.
-+binary-indep: build
-+
-+# Build architecture-dependent files here.
-+binary-arch: build
-+#	dh_testversion
-+	dh_testdir
-+	dh_testroot
-+	dh_clean -k
-+	dh_installdirs
-+
-+	# commands to install the files into debian/iptraf
-+	cp debian/iptraf-manual debian/iptraf/usr/share/doc-base/iptraf
-+
-+	cd src; $(MAKE) install $(makeopts)
-+
-+	dh_installdocs
-+	dh_installmenu
-+	dh_installlogrotate
-+	dh_installman -A
-+	dh_installchangelogs	CHANGES
-+
-+	mkdir debian/iptraf/usr/share/doc/iptraf/html
-+	mkdir debian/iptraf/usr/share/doc/iptraf/html/stylesheet-images/
-+	cp Documentation/*.html debian/iptraf/usr/share/doc/iptraf/html/
-+	cp Documentation/stylesheet-images/*.gif debian/iptraf/usr/share/doc/iptraf/html/stylesheet-images/
-+	dh_strip
-+	dh_compress
-+	dh_fixperms
-+	chmod 0750 debian/iptraf/var/log/iptraf
-+
-+	dh_installdeb
-+	dh_shlibdeps
-+	dh_gencontrol
-+	dh_md5sums
-+	dh_builddeb
-+
-+source diff:                                                                  
-+	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-+
-+binary: binary-indep binary-arch
-+.PHONY: build clean binary-indep binary-arch binary
-+
---- iptraf-3.0.0.orig/debian/postrm
-+++ iptraf-3.0.0/debian/postrm
-@@ -0,0 +1,18 @@
-+#! /bin/sh
-+
-+set -e
-+
-+if [ $1 = purge ]; then
-+	if [ -e /etc/iptraf.cfg ]; then
-+		rm --force /etc/iptraf.cfg
-+	fi
-+	if [ -d /var/log/iptraf ]; then
-+		rm -rf /var/log/iptraf
-+	fi
-+	if [ -d /var/lib/iptraf ]; then
-+		rm -rf /var/lib/iptraf
-+	fi
-+fi
-+
-+#DEBHELPER#
-+
---- iptraf-3.0.0.orig/debian/prerm
-+++ iptraf-3.0.0/debian/prerm
-@@ -0,0 +1,8 @@
-+#! /bin/sh
-+
-+if command -v install-docs >/dev/null 2>&1; then
-+	install-docs -r iptraf
-+fi
-+
-+#DEBHELPER#
-+
---- iptraf-3.0.0.orig/debian/compat
-+++ iptraf-3.0.0/debian/compat
-@@ -0,0 +1 @@
-+5
---- iptraf-3.0.0.orig/debian/iptraf.logrotate
-+++ iptraf-3.0.0/debian/iptraf.logrotate
-@@ -0,0 +1,12 @@
-+
-+/var/log/iptraf/*.log {
-+	rotate 7
-+	daily
-+	compress
-+	missingok
-+	notifempty
-+	postrotate
-+		/usr/bin/killall -USR1 iptraf 2> /dev/null || :
-+	endscript
-+}
-+
diff --git a/source/n/iptraf/slack-desc b/source/n/iptraf/slack-desc
deleted file mode 100644
index ef2319f9..00000000
--- a/source/n/iptraf/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-      |-----handy-ruler------------------------------------------------------|
-iptraf: iptraf (console-based network monitoring program)
-iptraf:
-iptraf: IPTraf is a console-based network monitoring program for Linux that
-iptraf: displays information about IP traffic such as:
-iptraf:
-iptraf:   Current TCP connections, types of IP packets, packet and byte
-iptraf:   counts, TCP/UDP counts by ports, packet counts by packet sizes,
-iptraf:   packet and byte counts by IP address, interface activity, flag
-iptraf:   statuses on TCP packets, and other LAN station statistics.
-iptraf:
-iptraf: iptraf was written by Gerard Paul Java.
diff --git a/source/n/iputils/iputils.SlackBuild b/source/n/iputils/iputils.SlackBuild
index c7a77a4a..bc711fb0 100755
--- a/source/n/iputils/iputils.SlackBuild
+++ b/source/n/iputils/iputils.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,7 +20,7 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=s20100418
+VERSION=s20101006
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
diff --git a/source/n/irssi/irssi.SlackBuild b/source/n/irssi/irssi.SlackBuild
index 36758797..eca06ab3 100755
--- a/source/n/irssi/irssi.SlackBuild
+++ b/source/n/irssi/irssi.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@ PKG=$TMP/package-irssi
 
 VERSION=0.8.15
 DIRCD=0.8.15
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/n/iw/iw.SlackBuild b/source/n/iw/iw.SlackBuild
index 66a4aa7b..bd78d0e0 100755
--- a/source/n/iw/iw.SlackBuild
+++ b/source/n/iw/iw.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2008  Robert Simpson, Ventura, California, USA
-# Copyright 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +22,23 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-PRGNAM=iw
-VERSION=${VERSION:-0.9.14}
-ARCH=${ARCH:-x86_64}
+PKGNAM=iw
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -37,14 +46,16 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* || exit 1
-cd $PRGNAM-$VERSION || exit 1
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION || exit 1
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -65,14 +76,14 @@ make install \
     xargs strip --strip-unneeded 2> /dev/null
 )
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  COPYING README \
-    $PKG/usr/doc/$PRGNAM-$VERSION
+  COPYING* README* \
+    $PKG/usr/doc/$PKGNAM-$VERSION
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source/n/iwlwifi-100-ucode/iwlwifi-100-ucode.SlackBuild b/source/n/iwlwifi-100-ucode/iwlwifi-100-ucode.SlackBuild
new file mode 100755
index 00000000..6ef720e5
--- /dev/null
+++ b/source/n/iwlwifi-100-ucode/iwlwifi-100-ucode.SlackBuild
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+# Copyright 2006, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PKGNAM=iwlwifi-100-ucode
+#VERSION will be determined automatically, and the package will use the last version found.
+ARCH=${ARCH:-fw}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-${PKGNAM}
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+for file in $CWD/${PKGNAM}-*.tar.?z* ; do
+  VERSION=$(echo $file | rev | cut -f 3- -d . | cut -f 1 -d / | rev | cut -f 4- -d - )
+  rm -rf ${PKGNAM}-${VERSION}
+  tar xvf $file || exit 1
+  cd ${PKGNAM}-$VERSION || exit 1
+  # Make sure ownerships and permissions are sane:
+  chown -R root:root .
+  chmod 644 *
+  # install:
+  mkdir -p $PKG/lib/firmware
+  cp -a iwlwifi-*.ucode $PKG/lib/firmware
+  # Add a documentation directory:
+  mkdir -p $PKG/usr/doc/${PKGNAM}-${VERSION}
+  cp -a LICENSE* README* $PKG/usr/doc/${PKGNAM}-${VERSION}
+done
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/n/iwlwifi-100-ucode/slack-desc b/source/n/iwlwifi-100-ucode/slack-desc
new file mode 100644
index 00000000..3c7b36c0
--- /dev/null
+++ b/source/n/iwlwifi-100-ucode/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+                 |-----handy-ruler------------------------------------------------------|
+iwlwifi-100-ucode: iwlwifi-1000-ucode (Intel Centrino N 100 wireless microcode)
+iwlwifi-100-ucode:
+iwlwifi-100-ucode: The microcode provided in this package is required for the Intel
+iwlwifi-100-ucode: Wireless WiFi Link AGN driver for Linux (iwlagn) to operate.
+iwlwifi-100-ucode:
+iwlwifi-100-ucode: Visit Intel's Linux wireless website at this address:
+iwlwifi-100-ucode:   http://intellinuxwireless.org/
+iwlwifi-100-ucode:
+iwlwifi-100-ucode:
+iwlwifi-100-ucode:
+iwlwifi-100-ucode:
diff --git a/source/n/iwlwifi-6xxx-ucode/iwlwifi-6xxx-ucode.SlackBuild b/source/n/iwlwifi-6xxx-ucode/iwlwifi-6xxx-ucode.SlackBuild
new file mode 100755
index 00000000..0002f09d
--- /dev/null
+++ b/source/n/iwlwifi-6xxx-ucode/iwlwifi-6xxx-ucode.SlackBuild
@@ -0,0 +1,58 @@
+#!/bin/sh
+
+# Copyright 2006, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PKGNAM=iwlwifi-6xxx-ucode
+#VERSION will be determined automatically, and the package will use the last version found.
+ARCH=${ARCH:-fw}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-${PKGNAM}
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+for file in $CWD/iwlwifi-6*-*.tar.?z* ; do
+  VERSION=$(echo $file | rev | cut -f 3- -d . | cut -f 1 -d / | rev | cut -f 4- -d - )
+  SRCNAM=$(echo $file | rev | cut -f 3- -d . | cut -f 1 -d / | rev | cut -f 1-3 -d -)
+  rm -rf ${SRCNAM}-${VERSION}
+  tar xvf $file || exit 1
+  cd $SRCNAM-$VERSION || exit 1
+  # Make sure ownerships and permissions are sane:
+  chown -R root:root .
+  chmod 644 *
+  # install:
+  mkdir -p $PKG/lib/firmware
+  cp -a iwlwifi-*.ucode $PKG/lib/firmware
+  # Add a documentation directory:
+  mkdir -p $PKG/usr/doc/${SRCNAM}-${VERSION}
+  cp -a LICENSE* README* $PKG/usr/doc/${SRCNAM}-${VERSION}
+done
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/n/iwlwifi-6xxx-ucode/slack-desc b/source/n/iwlwifi-6xxx-ucode/slack-desc
new file mode 100644
index 00000000..0043d6cd
--- /dev/null
+++ b/source/n/iwlwifi-6xxx-ucode/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+                  |-----handy-ruler------------------------------------------------------|
+iwlwifi-6xxx-ucode: iwlwifi-6xxx-ucode (Intel 6xxx wireless microcode)
+iwlwifi-6xxx-ucode:
+iwlwifi-6xxx-ucode: The microcode provided in this package is required for the Intel
+iwlwifi-6xxx-ucode: Wireless WiFi Link AGN driver for Linux (iwlagn) to operate.
+iwlwifi-6xxx-ucode:
+iwlwifi-6xxx-ucode: Visit Intel's Linux wireless website at this address:
+iwlwifi-6xxx-ucode:   http://intellinuxwireless.org/
+iwlwifi-6xxx-ucode:
+iwlwifi-6xxx-ucode:
+iwlwifi-6xxx-ucode:
+iwlwifi-6xxx-ucode:
diff --git a/source/n/libassuan/libassuan.SlackBuild b/source/n/libassuan/libassuan.SlackBuild
index 6d49096f..426464e5 100755
--- a/source/n/libassuan/libassuan.SlackBuild
+++ b/source/n/libassuan/libassuan.SlackBuild
@@ -22,7 +22,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PKGNAM=libassuan
-VERSION=1.0.5
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
diff --git a/source/n/libgcrypt/libgcrypt.SlackBuild b/source/n/libgcrypt/libgcrypt.SlackBuild
index 720314ca..d0629eee 100755
--- a/source/n/libgcrypt/libgcrypt.SlackBuild
+++ b/source/n/libgcrypt/libgcrypt.SlackBuild
@@ -24,7 +24,7 @@
 
 PKGNAM=libgcrypt
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/n/libgpg-error/libgpg-error.SlackBuild b/source/n/libgpg-error/libgpg-error.SlackBuild
index 4d0384af..58f6ceca 100755
--- a/source/n/libgpg-error/libgpg-error.SlackBuild
+++ b/source/n/libgpg-error/libgpg-error.SlackBuild
@@ -23,8 +23,8 @@
 
 
 PKGNAM=libgpg-error
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1
 cd $PKGNAM-$VERSION || exit 1
 chown -R root:root .
 find . \
diff --git a/source/n/mailx/mailx.SlackBuild b/source/n/mailx/mailx.SlackBuild
index 256d5ebc..9d552366 100755
--- a/source/n/mailx/mailx.SlackBuild
+++ b/source/n/mailx/mailx.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=12.4
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 if [ "$ARCH" = "i486" ]; then
@@ -33,6 +42,8 @@ elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 CWD=$(pwd)
diff --git a/source/n/metamail/metamail.SlackBuild b/source/n/metamail/metamail.SlackBuild
index e158283b..cbf9241f 100755
--- a/source/n/metamail/metamail.SlackBuild
+++ b/source/n/metamail/metamail.SlackBuild
@@ -22,9 +22,19 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=2.7
-ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-5}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-4}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -41,6 +51,9 @@ elif [ "$ARCH" = "arm" ]; then
 elif [ "$ARCH" = "armel" ]; then
   SLKCFLAGS="-O2 -march=armv4t"
   LIBDIRSUFFIX=""
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
@@ -54,8 +67,9 @@ rm -rf metamail-$VERSION
 xz -dc $CWD/metamail-$VERSION.tar.xz | tar xvf - || exit 1
 cd metamail-$VERSION
 
-xz -dc $CWD/metamail_2.7-52.diff.xz | patch -p1 || exit 1
+xz -dc $CWD/metamail_2.7-54.diff.xz | patch -p1 || exit 1
 xz -dc $CWD/metamail.automake.diff.xz | patch -p1 || exit 1
+zcat $CWD/metamail.uue.getline.diff.gz | patch -p1 || exit 1
 
 chmod 755 configure
 
@@ -73,7 +87,7 @@ CFLAGS="$SLKCFLAGS" \
   --disable-static \
   --program-prefix="" \
   --program-suffix="" \
-  $ARCH-slackware-linux
+  --build=$ARCH-slackware-linux
 
 ( cd bin
   cat showexternal | perl -pi -e 's|sensible-pager|more|' > se
diff --git a/source/n/metamail/metamail.uue.getline.diff b/source/n/metamail/metamail.uue.getline.diff
new file mode 100644
index 00000000..24bdcd7b
--- /dev/null
+++ b/source/n/metamail/metamail.uue.getline.diff
@@ -0,0 +1,29 @@
+--- ./src/metamail/uue.c.orig	2010-08-11 20:04:47.000000000 -0500
++++ ./src/metamail/uue.c	2010-08-11 20:05:12.000000000 -0500
+@@ -30,7 +30,7 @@
+ }
+ 
+ 
+-getline (buf, size, fp)
++uue_getline (buf, size, fp)
+ char *buf;
+ int size;
+ FILE *fp;
+@@ -70,7 +70,7 @@
+     char buf[63];
+ 
+     while (1) {
+-	if (getline (buf, sizeof buf, infp) < 0) {
++	if (uue_getline (buf, sizeof buf, infp) < 0) {
+ 	    fprintf (stderr, "Premature EOF!\n");
+ 	    return;
+ 	}
+@@ -82,7 +82,7 @@
+ 	}
+     }	
+     while (1) {
+-	if (getline (buf, sizeof buf, infp) < 0) {
++	if (uue_getline (buf, sizeof buf, infp) < 0) {
+ 	    fprintf (stderr, "Premature EOF!\n");
+ 	    return;
+ 	}
diff --git a/source/n/metamail/metamail_2.7-52.diff b/source/n/metamail/metamail_2.7-52.diff
deleted file mode 100644
index 1217f428..00000000
--- a/source/n/metamail/metamail_2.7-52.diff
+++ /dev/null
@@ -1,43013 +0,0 @@
---- metamail-2.7.orig/bin/showaudio
-+++ metamail-2.7/bin/showaudio
-@@ -1,6 +1,4 @@
--#!/bin/csh -fb
--# (The "-fb" might need to be changed to "-f" on some systems)
--#
-+#!/bin/sh -e
- # Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
- # 
- # Permission to use, copy, modify, and distribute this material 
-@@ -13,200 +11,309 @@
- # MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
- # OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
- # WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
--#
- 
-+# Conversion from C shell to Bourne shell by Z-Code Software Corp.
-+# Conversion Copyright (c) 1992 Z-Code Software Corp.
-+# Permission to use, copy, modify, and distribute this material
-+# for any purpose and without fee is hereby granted, provided
-+# that the above copyright notice and this permission notice
-+# appear in all copies, and that the name of Z-Code Software not
-+# be used in advertising or publicity pertaining to this
-+# material without the specific, prior written permission
-+# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
- 
--if (! $?METAMAIL_TMPDIR) then
--    set METAMAIL_TMPDIR=/tmp
--endif
--
--# First, figure out which machine to play it on!
--set thishost=`hostname`
--
--# Note that there are some special lines in here that only work at Bellcore,
--# Specifically involving phone playback from the machine "greenbush".
--# Everything should work fine at other sites, though
--set AUDIOBINDIR=/u/andrew/phone-sau/bin
--set AUDIOPHONEHOST=greenbush
--set AUDIOPHONEHOSTLONG=greenbush.bellcore.com
--set AUDIOLOGMAIL=andrew@thumper.bellcore.com
--set ORG="Bellcore"
--set STDINPUT=0
--if ("$1" == "-p") then
--    set AUDIOPHONE=$2
--    shift
--    shift
--endif
--if ("$1" == "-s") then
--    set AUDIOSPEAKERFORCE = 1
--    shift
--endif
--if ($?AUDIOPHONE || $?AUDIOPHONEFORCE) then
--    goto playphone
--endif
--if (! -d $AUDIOBINDIR) then
--    set AUDIOSPEAKERFORCE=1
--endif
--
--if ("$1" == "-") then
--    set STDINPUT=1
--    shift
--endif
--if ($#argv < 1) then
--    set STDINPUT=1
--endif
--	
--if (! $STDINPUT && ! $?AUDIOSPEAKERFORCE && ! $?AUDIOPHONEFORCE) then
--    if ($?MM_NOTTTY) then
--	if ($MM_NOTTTY == 1) then
--	    setenv MM_NOTTTY 0
--	    xterm -e showaudio $*
--	    exit 0
--	endif
--    endif
--choosehardware:
--    echo This program can display audio on the speakers of some workstations, 
--    echo "or (at some sites) it can call you on the telephone.  Please choose one:"
--    echo ""
--    echo "1 -- Use the computer's speaker"
--    echo "2 -- Call me on the telephone"
--    echo ""
--    echo -n "Which do you prefer (1 or 2)? "
--    set ans=$<
--    if ($ans == 2)  then
--	echo "OK, we'll use the telephone..."
--	set AUDIOPHONEFORCE=1
--	echo "In the future, you can avoid this question by setting the environment variable"
--	echo "AUDIOPHONEFORCE to 1"
--	goto playphone
--    else if ($ans == 1) then
--    	echo "OK, Attempting to play the audio using your computer's speaker.."
--    	set AUDIOSPEAKERFORCE=1
--	echo "In the future, you can avoid this question by setting the environment variable"
--	echo "AUDIOSPEAKERFORCE to 1"
--    else
--	echo "That is NOT one of your choices."
--	goto choosehardware
--    endif
--endif
--
--set audiohost=$thishost
--if ($?DISPLAY) then
--    set audiohost=`echo $DISPLAY | sed -e 's/:.*//'`
--    if ($audiohost == "unix") set audiohost=$thishost
--    if ($audiohost == "") set audiohost=$thishost
--endif
--if ($?AUDIOHOST) then
--	set audiohost=$AUDIOHOST
--endif
--
--if ($audiohost != $thishost) then
--    echo Sending audio to $audiohost...
--    if ($?MMS_AUDIO) then
--        if ($STDINPUT) then
--            cat | mms -host $audiohost "show audio/basic" -
--        else
--            cat $* | mms -host $audiohost "show audio/basic" -
--        endif
--        exit 0
--    endif
--
--# The next two lines are very inefficient, but not everyone has their path right for an rsh
--    pushd ~ >& /dev/null
--    set thisprog=`which showaudio`
--    popd >& /dev/null
--    if ($STDINPUT) then
--        cat | rsh $audiohost $thisprog -s -
--    else
--        cat $* | rsh $audiohost $thisprog  -s -
--    endif
--    exit 0
--endif
--
--if (-f /usr/sbin/sfplay) then
--    if ($#argv >= 1) then
--	exec /usr/sbin/sfplay -i mu-law chan 1 rate 8000 end $*
--    else
--	cat > ${METAMAIL_TMPDIR}/audio.$$
--	/usr/sbin/sfplay -i mu-law chan 1 rate 8000 end ${METAMAIL_TMPDIR}/audio.$$
--	rm ${METAMAIL_TMPDIR}/audio.$$
--	exit 0
--    endif
--else if (-d /usr/sony) then
--    set dev=/dev/sb0
--else if (-e /usr/bin/audioplay) then
--#  Solaris 2.0
--    /usr/bin/audioconvert -i raw,voice -f sun $* | /usr/bin/audioplay
--    exit $status
--else if (-e /bin/audioplay) then
--#  Solaris 2.0
--    /bin/audioconvert -i raw,voice -f sun $* | /bin/audioplay
--    exit $status
--else
--    set dev=/dev/audio
--endif
--
--if (-w $dev) then
--echo Playing audio on $thishost using $dev, one moment please...
--if ($#argv >= 1) then
--        cat $* > $dev
-+# Brought into line with metamail 2.7 beta release Csh version
-+# Added sox support
-+#    Dave Shield	February 1994
-+
-+thishost=`hostname`
-+
-+AUDIOBINDIR=/u/andrew/phone-sau/bin
-+AUDIOPHONEHOST=greenbush
-+AUDIOPHONEHOSTLONG=greenbush.bellcore.com
-+AUDIOLOGMAIL=greenbush.bellcore.com
-+ORG=Bellcore
-+STDINPUT=0
-+
-+if test -x /usr/bin/remsh
-+then
-+			# Probably a System V based system
-+			#  "rsh" is likely to be "restricted shell"
-+	RSH=remsh
- else
--        cat > $dev
--endif
--exit 0
--endif
-+	RSH=rsh
-+fi
-+# SOX=/usr/remote/bin9/sox
-+
-+if test "$1" = "-p"
-+then
-+	AUDIOPHONE=$2
-+	shift
-+	shift
-+fi
-+
-+if test "$1" = "-s"
-+then
-+	AUDIOSPEAKERFORCE=1
-+	shift
-+fi
-+
-+playphone=0
-+if test ! -z "${AUDIOPHONE:-}" -o ! -z "${AUDIOPHONEFORCE:-}"
-+then
-+	playphone=1
-+fi
-+
-+if test $playphone -eq 0
-+then
-+	if test ! -d "$AUDIOBINDIR"
-+	then
-+		AUDIOSPEAKERFORCE=1
-+	fi
-+
-+	if test "$1" = "-"
-+	then
-+		STDINPUT=1
-+		shift
-+	fi
-+	if test $# -eq 0
-+	then
-+		STDINPUT=1
-+	fi
-+
-+	if test $STDINPUT -eq 0 -a -z "${AUDIOSPEAKERFORCE:-}" -a -z "${AUDIOPHONEFORCE:-}"
-+	then
-+		if test ! -z "${MM_NOTTTY:-}"
-+		then
-+			if test $MM_NOTTTY -eq 1
-+			then
-+				MM_NOTTTY=0; export MM_NOTTTY
-+				xterm -e showaudio $*
-+				exit 0
-+			fi
-+		fi
-+		looping=1
-+		while test $looping -eq 1
-+		do
-+		    echo This program can display audio on the speakers of some workstations, 
-+		    echo "or (at some sites) it can call you on the telephone.  Please choose one:"
-+		    echo ""
-+		    echo "1 -- Use the computer's speaker"
-+		    echo "2 -- Call me on the telephone"
-+		    echo ""
-+		    echo -n "Which do you prefer (1 or 2)? [1] "
-+		    read ans
-+		    if test "$ans" -eq 2
-+		    then
-+			echo "OK, we'll use the telephone..."
-+			AUDIOPHONEFORCE=1
-+			echo "In the future, you can avoid this question by setting the environment variable"
-+			echo "AUDIOPHONEFORCE to 1"
-+			playphone=1
-+			looping=0
-+		    elif test "$ans" -eq 1
-+		    then
-+			echo "OK, Attempting to play the audio using your computer's speaker.."
-+			AUDIOSPEAKERFORCE=1
-+			echo "In the future, you can avoid this question by setting the environment variable"
-+			echo "AUDIOSPEAKERFORCE to 1"
-+			looping=0
-+		    else
-+			echo "That is NOT one of your choices."
-+		    fi
-+		done
-+	fi
-+fi
-+
-+if test $playphone -eq 0
-+then
-+	audiohost=$thishost
-+	if test ! -z "${DISPLAY:-}"
-+	then
-+		audiohost=`echo $DISPLAY | sed -e 's/:.*//'`
-+		if test "$audiohost" = unix -o "$audiohost" = localhost
-+		then
-+			audiohost=$thishost
-+		fi
-+		if test -z "$audiohost"
-+		then
-+			audiohost=$thishost
-+		fi
-+	fi
-+	if test ! -z "${AUDIOHOST:-}"
-+	then
-+		audiohost=$AUDIOHOST
-+	fi
-+
-+	if test ! "$audiohost" = "$thishost"
-+	then
-+		echo Sending audio to $audiohost...
-+		if test ! -z "${MMS_AUDIO}"
-+		then
-+			if test $STDINPUT -eq 1
-+			then
-+				cat | mms -host $audiohost "show audio/basic"
-+			else
-+				cat $* | mms -host $audiohost "show audio/basic"
-+			fi
-+			exit 0
-+		fi
-+		thisprog=`(cd; which showaudio)`
-+		if test $STDINPUT -eq 1
-+		then
-+			cat | $RSH $audiohost $thisprog -s
-+		else
-+			cat $* | $RSH $audiohost $thisprog -s
-+		fi
-+		exit 0
-+	fi
-+
-+
-+	if test -f /usr/sbin/sfplay
-+	then
-+		if test $# -ne 0
-+		then
-+			exec /usr/sbin/sfplay -i mu-law chan 1 rate 8000 end $*
-+		else
-+			fname=$(mktemp /tmp/audio.XXXXXX)
-+			cat > $fname
-+			/usr/sbin/sfplay -i mu-law chan 1 rate 8000 end $fname
-+			rm $fname
-+			exit 0
-+		fi
-+	elif test -f /usr/bin/audioplay
-+	then
-+	# Solaris 2.0
-+		/usr/bin/audioconvert -i raw,voice -f sun $* | /usr/bin/audioplay
-+		exit $?
-+	elif test -f /bin/audioplay
-+	then
-+	# Solaris 2.0
-+		/bin/audioconvert -i raw,voice -f sun $* | /bin/audioplay
-+		exit $?
-+	elif test -d /usr/sony
-+	then
-+		dev=/dev/sb0
-+	else
-+		dev=/dev/audio
-+	fi
- 
--playphone:
--if (-d $AUDIOBINDIR) then
--              set thisprog=`which showaudio`
--	if (! $?AUDIOPHONE) then
--	    if ($?MM_NOTTTY) then
--		if ($MM_NOTTTY == 1) then
--		    setenv MM_NOTTTY 0
--		    xterm -e $thisprog $*
--		    exit 0
--		endif
--	    endif
--	    echo This message contains audio, which can be sent to your telephone.
--	    echo Please enter the telephone number at which you would like to hear this
--	    echo -n "audio message as you would dial it from INSIDE ${ORG}:  "
--	    set AUDIOPHONE=$<
--	endif
--	if ($thishost == $AUDIOPHONEHOST || $thishost == $AUDIOPHONEHOSTLONG) then
--	    echo Calling Phone number $AUDIOPHONE
--	    echo "You MUST SAY HELLO when you answer the phone, or you will not hear the message."
--	    mail -s "showaudio: `whoami` called $AUDIOPHONE" $AUDIOLOGMAIL < /dev/null
--	    if ($STDINPUT) then
--	        cat $AUDIOBINDIR/../GREET.au $* - | $AUDIOBINDIR/play -\# $AUDIOPHONE -
--	    else
--	        cat $AUDIOBINDIR/../GREET.au $* | $AUDIOBINDIR/play -\# $AUDIOPHONE -
--	    endif
--	    echo All done
--	    exit 0
-+	if test -w $dev
-+	then
-+		echo Playing audio on $thishost using $dev, one moment please...
-+		if test $# -ne 0
-+		then
-+			if test ! -z "${SOX:-}"
-+			then
-+			    for ii in $*
-+			    do
-+#
-+#  The "approved magic" to translate arbitary sounds
-+#	to AU format is as follows:
-+#
-+#				$SOX -t auto $ii -c 1 -t aiff - | \
-+#				$SOX -t aiff - -U -b -t au -c 1 -r 8000 $dev
-+#
-+#  But the following "direct" translation also seems to work
-+				$SOX -t auto $ii -c 1 -t au -c 1 -r 8000 $dev
-+			    done
-+			else
-+				cat $* > $dev
-+			fi
-+		else
-+			if test ! -z "${SOX:-}"
-+			then
-+				fname=$(mktemp /tmp/audio.XXXXXX)
-+				cat > $fname
-+#
-+#  See also above
-+#
-+				$SOX -t auto $fname -c 1 -t au -c 1 -r 8000 $dev
-+				rm $fname
-+			else
-+				cat > $dev
-+			fi
-+		fi
-+		exit 0
-+	fi
-+fi
-+
-+if test -d "$AUDIOBINDIR"
-+then
-+	thisprog=`which showaudio`
-+	if test -z "${AUDIOPHONE:-}"
-+	then
-+		if test ! -z "${MM_NOTTTY:-}"
-+		then
-+			if test $MM_NOTTTY -eq 1
-+			then
-+				MM_NOTTTY=0; export MM_NOTTTY
-+				xterm -e $thisprog $*
-+				exit 0
-+			fi
-+		fi
-+		echo This message contains audio, which can be sent to your telephone.
-+		echo Please enter the telephone number at which you would like to hear this
-+		echo -n "audio message as you would dial it from inside ${ORG}: "
-+		read AUDIOPHONE
-+	fi
-+
-+	if test "$thishost" == "$AUDIOPHONEHOST" \
-+		-o "$thishost" == "$AUDIOPHONEHOSTLONG"
-+	then
-+		echo Calling Phone number $AUDIOPHONE
-+		echo "You MUST SAY HELLO when you answer the phone, or you will not hear the message."
-+		mail -s "showaudio: `whoami` called $AUDIOPHONE" $AUDIOLOGMAIL < /dev/null
-+		if test $STDINPUT -eq 1
-+		then
-+			cat $AUDIOBINDIR/../GREET.au $* - | $AUDIOBINDIR/play -\# $AUDIOPHONE -
-+		else
-+			cat $AUDIOBINDIR/../GREET.au $* | $AUDIOBINDIR/play -\# $AUDIOPHONE -
-+		fi
-+		echo All done
-+		exit 0
- 	else
--	    echo Trying to rsh to $AUDIOPHONEHOST to send audio via telephone
--	    cat $* | rsh $AUDIOPHONEHOST $thisprog -p $AUDIOPHONE -
--	    exit 0
--	endif
--endif
-+		echo Trying to rsh to $AUDIOPHONEHOST to send audio via telephone
-+		if test $STDINPUT -eq 1
-+		then
-+			cat $* - | $RSH $AUDIOPHONEHOST $thisprog -p $AUDIOPHONE -
-+		else
-+			cat $* | $RSH $AUDIOPHONEHOST $thisprog -p $AUDIOPHONE -
-+		fi
-+		exit 0
-+	fi
-+fi
- echo ""
--echo This message contains an audio mesage, which can not currently be
--echo played on this type of workstation.   If you log into an appropriate 
--echo "machine (currently a SPARCstations or Sony News workstation)"
--echo and read this message there, you should be able to hear the audio
--echo message.  
-+echo "This message contains an audio mesage, which can not currently be"
-+echo "played on this type of workstation.   If you log into an appropriate"
-+echo "machine (currently a SPARCstation or Sony News workstation)"
-+echo "and read this message there, you should be able to hear the audio"
-+echo "message."
- echo ""
--if (! $?MM_NOTTTY) set MM_NOTTTY=0
--if ($MM_NOTTTY == 1) then
--    set fname=/tmp/mm.aud.$$
-+
-+if test -z "${MM_NOTTY:-}"
-+then
-+	MM_NOTTY=0
-+fi
-+if test $MM_NOTTY -eq 1
-+then
-+	fname=$(mktemp /tmp/metamail.XXXXXX)
- else
--    echo -n "Do you want to write the audio out to a file [y] ? "
--    set ANS=$<
--    if ("$ANS" =~ n* ||  "$ANS" =~ N* ) exit 0
--    echo -n "File name:"
--    set fname=$<
--endif
--cp $1 $fname
--if ($status == 0) echo Wrote raw audio file: $fname
-+	echo -n "Do you want to write the audio out to a file [y] ? "
-+	read ANS
-+	case "$ANS" in
-+		[Nn]*)	exit 0 ;;
-+	esac
-+
-+	echo -n "File name:"
-+	read fname
-+fi
-+cp "$1" "$fname"
-+if test $? -eq 0
-+then
-+	echo Wrote raw audio file: "$fname"
-+fi
- exit 0
--
---- metamail-2.7.orig/bin/showpicture
-+++ metamail-2.7/bin/showpicture
-@@ -1,6 +1,4 @@
--#!/bin/csh -fb
--# (The "-fb" might need to be changed to "-f" on some systems)
--#
-+#!/bin/sh -e
- # Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
- # 
- # Permission to use, copy, modify, and distribute this material 
-@@ -13,84 +11,111 @@
- # MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
- # OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
- # WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
--#
- 
--if (! $?METAMAIL_TMPDIR) then
--    set METAMAIL_TMPDIR=/tmp
--endif
--
--if (! $?X_VIEWER) then
--set X_VIEWER="xloadimage -view -quiet -geometry +1+1"
--# set X_VIEWER="xv -geometry +1+1"
--endif
--if ($1 == "-viewer" && $#argv > 1) then
--    set X_VIEWER = "$2"
--    shift
--    shift
--endif
--
--if (! $?MM_NOTTTY) then
--    set MM_NOTTTY=0
--endif
--if (! $?DISPLAY) then
--    echo ""
--    echo This message contains a picture, which can currently only be
--    echo viewed when running X11.  If you read this message while running
--    echo X11, and have your DISPLAY variable set, you will then
--    echo be able to see the picture properly.
--    echo ""
--    if ($MM_NOTTTY) then
--        set fname=${METAMAIL_TMPDIR}/sp.$$
--        echo "The picture is being automatically stored in the file $fname"
--        echo "If you do not want this file, please delete it."
--    else
--        echo -n "Do you want to write the picture out to a file [y] ? "
--        set ANS=$<
--        if ("$ANS" =~ n* ||  "$ANS" =~ N* ) exit 0
--        while ( 1 == 1)
--            echo -n "File name:"
--            set fname=$<
--            if (! -f $fname) then
--                break
--            else
--                echo "$fname already exists. Try again"
--            endif
--        end
--    endif
--    cp $1 $fname
--    if ($status == 0) echo Wrote file $fname
--    exit 0
--endif
--
--if ($#argv == 0) then
--    set SQUIRREL=${METAMAIL_TMPDIR}/sp.$$
--    cat > $SQUIRREL
--else
--    set SQUIRREL="$*"
--endif
-+# Conversion from C shell to Bourne shell by Z-Code Software Corp.
-+# Conversion Copyright (c) 1992 Z-Code Software Corp.
-+# Permission to use, copy, modify, and distribute this material
-+# for any purpose and without fee is hereby granted, provided
-+# that the above copyright notice and this permission notice
-+# appear in all copies, and that the name of Z-Code Software not
-+# be used in advertising or publicity pertaining to this
-+# material without the specific, prior written permission
-+# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+# Brought into line with metamail 2.7 beta release Csh version
-+#    Dave Shield	February 1994
- 
--echo NOTE:  TO MAKE THE PICTURE WINDOW GO AWAY, JUST TYPE 'q' IN IT.
--if ($#argv == 0) then
--    echo "==> TO SAVE THIS IMAGE, COPY THE FILE $SQUIRREL BEFORE EXITING"
--    echo ""
--    $X_VIEWER $SQUIRREL
--    rm $SQUIRREL
-+if test -z "${X_VIEWER:-}"
-+then
-+	X_VIEWER="xloadimage -view -quiet"
-+# X_VIEWER="xv"
-+fi
-+
-+if test "$1" = "-viewer" -a ! -z "$2"
-+then
-+	X_VIEWER=$2
-+	shift
-+	shift
-+fi
-+
-+if test -z "${MM_NOTTY:-}"
-+then
-+	MM_NOTTY=0
-+fi
-+if test -z "${DISPLAY:-}"
-+then
-+	echo ""
-+	echo This message contains a picture, which can currently only be
-+	echo viewed when running X11.  If you read this message while running
-+	echo X11, you will be able to see the picture properly.
-+	if test $MM_NOTTY -eq 1
-+	then
-+		fname=$(mktemp /tmp/metamail.XXXXXX)
-+		echo "The picture is being automatically stored in the file $fname"
-+		echo "If you do not want this file, please delete it."
-+	else
-+		echo -n "Do you want to write the picture out to a file [y] ? "
-+		read ANS
-+		case "$ANS" in
-+		    [Nn]*)	exit 0;;
-+		    *)	looping=1
-+			while test $looping -eq 1
-+			do
-+				echo -n "File name: "
-+				read fname
-+				if test -f "$fname"
-+				then
-+					echo "$fname already exists. Try again"
-+				else
-+					looping=0
-+				fi
-+			done ;;
-+		esac
-+	fi
-+	cp "$1" "$fname"
-+	if test $? -eq 0
-+	then
-+		echo Wrote file "$fname"
-+	fi
-+	exit 0
-+fi
-+
-+if test -z "$1"
-+then
-+	SQUIRREL=$(mktemp /tmp/metamail.XXXXXX)
-+	cat > $SQUIRREL
- else
-+	SQUIRREL="$*"
-+fi
- 
--foreach i ($*)
--    echo "==> TO SAVE THIS IMAGE, COPY THE FILE $i BEFORE EXITING"
--    echo ""
--    set dir=$i:h
--    if ($dir != $i) then
--	# Make the ln sure to work	
--	cd $dir
--    endif
--    ln $i $$.PRESS-q-TO-EXIT 
--    if (! $status) then 
--        sh -c "$X_VIEWER $$.PRESS-q-TO-EXIT"
--        rm $$.PRESS-q-TO-EXIT 
--    else
--        sh -c "$X_VIEWER $i"
--    endif
--end
--endif
-+
-+echo NOTE: TO MAKE THE PICTURE WINDOW GO AWAY, JUST TYPE 'q' IN IT.
-+if test -z "$1"
-+then
-+	echo "==> TO SAVE THIS IMAGE, COPY THE FILE $SQUIRREL BEFORE EXITING"
-+	echo
-+	$X_VIEWER $SQUIRREL
-+	rm $SQUIRREL
-+else
-+	for i in $SQUIRREL
-+	do
-+		echo "==> TO SAVE THIS IMAGE, COPY THE FILE $i BEFORE EXITING"
-+		echo
-+		dir=$(dirname $i)
-+		base=$(basename $i)
-+		if test ! "$base" = "$i"
-+		then
-+			cd $dir
-+		fi
-+		if ln $i $$.PRESS-q-TO-EXIT  > /dev/null 2>&1
-+		then
-+		    $X_VIEWER $$.PRESS-q-TO-EXIT
-+		    rm $$.PRESS-q-TO-EXIT 
-+		else
-+		    $X_VIEWER $i
-+		fi
-+	done
-+fi
---- metamail-2.7.orig/bin/metasend
-+++ metamail-2.7/bin/metasend
-@@ -1,6 +1,4 @@
--#!/bin/csh -fb
--# (The "-fb" might need to be changed to "-f" on some systems)
--#
-+#!/bin/sh -e
- # Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
- # 
- # Permission to use, copy, modify, and distribute this material 
-@@ -13,487 +11,591 @@
- # MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
- # OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
- # WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
--#
- 
--if (! $?METAMAIL_TMPDIR) then
--    set METAMAIL_TMPDIR=/tmp
--endif
--
--set hname = `hostname`
--set idctr=0
--set MustDelete=0
--set batchmode=0
--set multipart = 1
--if ($?SPLITSIZE) then
--    set splitsize=$SPLITSIZE
-+# Conversion from C shell to Bourne shell by Z-Code Software Corp.
-+# Conversion Copyright (c) 1992 Z-Code Software Corp.
-+# Permission to use, copy, modify, and distribute this material
-+# for any purpose and without fee is hereby granted, provided
-+# that the above copyright notice and this permission notice
-+# appear in all copies, and that the name of Z-Code Software not
-+# be used in advertising or publicity pertaining to this
-+# material without the specific, prior written permission
-+# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+# Brought into line with metamail 2.7 beta release Csh version
-+#    Dave Shield	February 1994
-+
-+hname=`hostname`
-+idctr=0
-+MustDelete=0
-+batchmode=0
-+multipart=1
-+if test ! -z "${SPLITSIZE:-}"
-+then
-+	splitsize=$SPLITSIZE
- else
--    set splitsize = 100000
--endif
--set outputfile = ""
--set multipartsubtype = "mixed"
--set cdescrip = "An object packed by metasend"
--set isentity=0
--set newid=`date | tr " :" "__"`
--set cid="<${newid}_$idctr@${hname}>"
--@ idctr++
--
--while ($#argv > 0)
--    switch ("$1")
--        case "-S":
--            shift
--            if ($#argv == 0) then
--                echo "-S requires a following argument, the SPLIT threshhold"
--                exit -1
--            endif
--            set splitsize=$1
--            shift
--            breaksw
--        case "-b":
--            # Batch mode -- ALL args must be on command line
--            set batchmode = 1
--            shift
--            breaksw
--        case "-c":
--            shift
--            if ($#argv == 0) then
--                echo "-c requires a following argument, the CC address"
--                exit -1
--            endif
--            set cc="$1"
--            shift
--            breaksw
--        case "-i":
--            shift
--            if ($#argv == 0) then
--                echo "-i requires a following argument, the Content-ID value"
--                exit -1
--            endif
--            set cid=$1
--            shift
--            breaksw
--        case "-I":
--            shift
--            if ($#argv == 0) then
--                echo "-I requires a following argument, the multipart Content-ID value"
--                exit -1
--            endif
--            set multicid=$1
--            shift
--            breaksw
--        case "-s":
--            shift
--            if ($#argv == 0) then
--                echo "-s requires a following argument, the SUBJECT"
--                exit -1
--            endif
--            set subject="$1"
--            shift
--            breaksw
--        case "-t":
--            shift
--            if ($#argv == 0) then
--                echo "-t requires a following argument, the TO address"
--                exit -1
--            endif
--            set to="$1"
--            shift
--            breaksw
--        case "-F":
--            shift
--            if ($#argv == 0) then
--                echo "-F requires a following argument, the FROM address"
--                exit -1
--            endif
--            set from="$1"
--            shift
--            breaksw
--        case "-P":
--            shift
--            if ($#argv == 0) then
--                echo "-P requires a following argument, the preamble file name"
--                exit -1
--            endif
--            set preamblefile="$1"
--            shift
--            breaksw
--        case "-e":
--            shift
--            if ($#argv == 0) then
--                echo "-e requires a following argument, the ENCODING value"
--                exit -1
--            endif
--            set encode=$1
--            if ($encode == "base64") then
--	    set encodingprog = "mimencode -b"
--            else if ($encode == "x-uue") then
--	        set encodingprog = "uuencode mail-body"
--            else if ($encode == "7bit") then
--	        set encodingprog = cat
--           else
--	        set encodingprog = "mimencode -q"
--	        set encode = "quoted-printable"
--           endif 
--           shift
--            breaksw
--        case "-f":
--            shift
--            if ($#argv == 0) then
--                echo "-f requires a following argument, the DATA FILE"
--                exit -1
--            endif
--            set datafile=$1
--            if (! -e  $datafile) then
--                echo The file $datafile does not exist.
--                exit -1
--            endif
--            shift
--            breaksw
--        case "-m":
--            shift
--            if ($#argv == 0) then
--                echo "-m requires a following argument, the MIME CONTENT-TYPE"
--                exit -1
--            endif
--#            set ctyperaw = $1
--#            set  ctype=`echo $ctyperaw | tr \" \'`
--	set ctype = "$1"
--	if (`echo $ctype | grep /` == "") then
--	    echo "Invalid content-type specified"
--	    exit -1
--	endif
--            shift
--            breaksw
--        case "-o":
--            shift
--            if ($#argv == 0) then
--                echo "-o requires a following argument, the output file name"
--                exit -1
--            endif
--            set outputfile="$1"
--            shift
--            breaksw
--        case "-/":
--            shift
--            if ($#argv == 0) then
--                echo "-/ requires a following argument, the multipart subtype"
--                exit -1
--            endif
--            set multipartsubtype="$1"
--            shift
--            breaksw
--        case "-D":
--            shift
--            if ($#argv == 0) then
--                echo "-D requires a following argument, the Content-Description value"
--                exit -1
--            endif
--            set cdescrip="$1"
--            shift
--            breaksw
--        case "-E":
--            set isentity=1
--            shift
--            breaksw
--        case "-z":
--            set MustDelete=1
--            shift
--            breaksw
--        case "-n":
--            if ($isentity) then
--              if (! $?encode) then 
--                set encode=7bit
--                set encodingprog=cat
--              endif
--              if (! $?ctype) then
--                  set ctype=bogus
--                  # Never used
--               endif
--	if ( ! $?datafile) then
--	    echo One part is incomplete -- each part needs at least -f and -E
--	    exit -1
--	endif
--            else 
--	if ( ! $?ctype || ! $?datafile) then
--	    echo One part is incomplete -- each part needs at least -f and -m
--	    exit -1
--	endif
--            endif
--	if (! $?encode) then
--	        if ("$ctype" =~ text*) then
--	              set encodingprog = "mimencode -q"
--		set encode = "quoted-printable"
--	        else
--	            set encode = base64
--	            set encodingprog = "mimencode -b"
--	        endif
--	endif
--	set ctype${multipart} = "$ctype"
--	set datafile${multipart} = $datafile
--	set encode${multipart} = $encode
--	set cdescrip${multipart} = "$cdescrip"
--	set cid${multipart} = "$cid"
--	set isentity${multipart} = $isentity
--	set encodingprog${multipart} = "$encodingprog"
--	unset ctype
--	unset datafile
--	unset encode
--	unset encodingprog
--	set newid=`date | tr " :" "__"`
--	set cid="<${newid}_$idctr@${hname}>"
--	@ idctr++
--	set cdescrip = "An object packed by metasend"
--	set isentity=0
--            @  multipart++
--	shift
--	breaksw
--        default:
--            echo UNRECOGNIZED METASEND OPTION: $1
--            exit -1
--    endsw
--end
--if ($batchmode == 0) then
--    if (! $?to) then
--        echo -n "To: "
--        set to = $<
--    endif
--    if (! $?subject) then
--        echo -n "Subject: "
--        set subject = $<
--    endif
--    if (! $?cc) then
--        echo -n "CC: "
--        set cc = $<
--    endif
--anotherpart:
--    if (! $?ctype) then
--        echo -n "Content-type: "
--#        set ctyperaw = $<
--#        set  ctype=`echo $ctyperaw | tr \" \'`
--        set ctype = "$<"
--    endif
--    if (`echo $ctype | grep /` == "") then
--        echo "Invalid content-type specified"
--        unset ctype
--        goto anotherpart
--    endif
--#    if ($ctype != $ctyperaw)  echo Double  quotes not allowed, using $ctype
--    if (! $?datafile) then
--        getfile:
--        echo -n "Name of file containing $ctype data: "
--        set datafile = $<
--        if (! -e  $datafile) then
--            echo The file $datafile does not exist.
--            goto getfile
--        endif
--    endif
--    if (! $?encode) then
--        retry:
--        echo "Do you want to encode this data for sending through the mail?"
--        echo "  1 -- No, it is already in 7 bit ASCII"
--        echo "  2 -- Yes, encode in base64 (most efficient)"
--        echo "  3 -- Yes, encode in quoted-printable (less efficient, more readable)"
--        echo "  4 -- Yes, encode it using uuencode (not standard, being phased out)"
--        set encode=$<
--        switch ("$encode")
--            case 1:
--                set encodingprog = cat
--	  set encode = 7bit
--                breaksw
--            case 2:
--                set encodingprog = "mimencode -b"
--	  set encode = base64
--                breaksw
--            case 3:
--                set encodingprog = "mimencode -q"
--	  set encode = quoted-printable
--                breaksw
--            case 4:
--                set encodingprog = "uuencode $datafile"
--	  set encode = x-uue
--                breaksw
--            default:
--                echo Unrecognized answer, please try again.
--                goto retry
--        endsw
--    endif
--    echo -n "Do you want to include another file too (y/n) [n] ? "
--    set ans=$<
--    if  ("$ans" =~ y*) then
--	set ctype${multipart} = "$ctype"
--	set datafile${multipart} = $datafile
--	set encode${multipart} = $encode
--	set encodingprog${multipart} = "$encodingprog"
--	set cdescrip${multipart} = "$cdescrip"
--	set cid${multipart} = "$cid"
--	set isentity${multipart} = $isentity
--	set cdescrip = "An object packed by metasend"
--	set isentity=0
--	unset ctype
--	unset datafile
--	unset encode
--	unset encodingprog
--	set newid=`date | tr " :" "__"`
--	set cid="<${newid}_$idctr@${hname}>"
--	@ idctr++
--            @  multipart++
--            goto anotherpart
--     endif
-+	splitsize=100000
-+fi
-+
-+ouputfile=
-+multipartsubtype=mixed
-+cdescrip=    # -Immi
-+attachfilename=    # -Immi
-+isentity=0
-+newid=`date | tr " :" "__"`
-+cid="<${newid}_$idctr@${hname}>"
-+idctr=`expr $idctr + 1`
-+
-+while test ! -z "$*"
-+do
-+	case $1 in
-+		-S) shift
-+		    if test -z "$*"
-+		    then
-+			echo "-S requires a following argument, the SPLIT threshhold"
-+			exit 1
-+		    fi
-+		    splitsize=$1
-+		    shift ;;
-+
-+		-b) batchmode=1
-+		    shift ;;
-+
-+		-c) shift
-+		    if test -z "$*"
-+		    then
-+		    	echo "-c requires a following argument, the CC address"
-+			exit 1
-+		    fi
-+		    cc=$1
-+		    shift ;;
-+
-+		-i) shift
-+		    if test -z "$*"
-+		    then
-+			echo "-i requires a following argument, the Content-ID value"
-+			exit 1
-+		    fi
-+		    cid=$1
-+		    shift ;;
-+
-+		-I) shift
-+		    if test -z "$*"
-+		    then
-+			echo "-I requires a following argument, the multipart Content-ID value"
-+			exit 1
-+		    fi
-+		    multicid=$1
-+		    shift ;;
-+
-+		-s) shift
-+		    if test -z "$*"
-+		    then
-+			echo "-s requires a following argument, the SUBJECT"
-+			exit 1
-+		    fi
-+		    subject=$1
-+		    shift ;;
-+
-+		-t) shift
-+		    if test -z "$*"
-+		    then
-+			echo "-t requires a following argument, the TO address"
-+			exit 1
-+		    fi
-+		    to=$1
-+		    shift ;;
-+
-+		-F) shift
-+		    if test -z "$*"
-+		    then
-+			echo "-F requires a following argument, the FROM address"
-+			exit 1
-+		    fi
-+		    from=$1
-+		    shift ;;
-+
-+		-P) shift
-+		    if test -z "$*"
-+		    then
-+			echo "-P requires a following argument, the preamble file name"
-+			exit 1
-+		    fi
-+		    preamblefile=$1
-+		    shift ;;
-+
-+		-e) shift
-+		    if test -z "$*"
-+		    then
-+			echo "-e requires a following argument, the ENCODING value"
-+			exit 1
-+		    fi
-+		    encode=$1
-+		    case "$encode" in
-+			"base64")	encodingprog="mimencode -b";;
-+			"x-uue")	encodingprog="uuencode \$datafile";;
-+			"7bit")		encodingprog=cat;;
-+			"8bit")		encodingprog=cat;;
-+			*)		encodingprog="mimencode -q"
-+					encode=quoted-printable ;;
-+		    esac
-+		    shift ;;
-+
-+		-f) shift
-+		    if test -z "$*"
-+		    then
-+			echo "-f requires a following argument, the DATA FILE"
-+			exit 1
-+		    fi
-+		    datafile=$1
-+		    if test ! -r "$datafile"
-+		    then
-+			echo The file "$datafile" does not exist
-+			exit 1
-+		    fi
-+		    shift ;;
-+
-+		-m) shift
-+		    if test -z "$*"
-+		    then
-+			echo "-m requires a following argument, the MIME CONTENT-TYPE"
-+			exit 1
-+		    fi
-+		    ctype=$1
-+		    if test "`echo $ctype | grep /`" = ""
-+		    then
-+			echo Invalid content-type specified
-+			exit 1
-+		    fi
-+		    shift ;;
-+
-+		-o) shift
-+		    if test -z "$*"
-+		    then
-+			echo "-o requires a following argument, the output file name"
-+			exit 1
-+		    fi
-+		    outputfile=$1
-+		    shift ;;
-+
-+		-/) shift
-+		    if test -z "$*"
-+		    then
-+			echo "-/ requires a following argument, the multipart subtype"
-+			exit 1
-+		    fi
-+		    multipartsubtype=$1
-+		    shift ;;
-+
-+		-D) shift
-+		    if test -z "$*"
-+		    then
-+			echo "-D requires a following argument, the Content-Description value"
-+			exit 1
-+		    fi
-+		    cdescrip=$1
-+		    shift ;;
-+
-+# begin immi
-+		-A) shift
-+		    if test -z "$*"
-+		    then
-+			echo "-A requires a following argument, the attachment file name"
-+			exit 1
-+		    fi
-+		    attachfilename=$1
-+		    shift ;;
-+#end immi
-+
-+		-E) isentity=1
-+		    shift ;;
-+
-+		-z) MustDelete=1
-+		    shift ;;
-+
-+		-n) if test $isentity -ne 0
-+		    then
-+			if test -z "${encode:-}"
-+			then
-+				encode=7bit
-+				encodingprog=cat
-+			fi
-+			if test -z "${ctype:-}"
-+			then
-+				ctype=bogus
-+				# Never used
-+			fi
-+			if test -z "${datafile:-}"
-+			then
-+				echo One part is incomplete -- each part needs at least -f and -E
-+				exit 1
-+			fi
-+		    else
-+			if test -z "${ctype:-}" || test -z "${datafile:-}"
-+			then
-+				echo One part is incomplete -- each part needs at least -f and -m
-+				exit 1
-+			fi
-+		    fi
-+		    if test -z "${encode:-}"
-+		    then
-+		    	case "$ctype" in
-+				text*)	encodingprog="mimencode -q"
-+					encode=quoted-printable ;;
-+				*)	encodingprog="mimencode -b"
-+					encode=base64 ;;
-+			esac
-+		    fi
-+		    eval ctype${multipart}=\"$ctype\"
-+		    eval datafile${multipart}=$datafile
-+		    eval encode${multipart}=$encode
-+		    eval cdescrip${multipart}=\"$cdescrip\"
-+		    eval attachfilename${multipart}=\"$attachfilename\"   # -Immi
-+		    eval cid${multipart}=\"$cid\"
-+		    eval isentity${multipart}=$isentity
-+		    eval encodingprog${multipart}=\"\$encodingprog\"
-+
-+		    ctype=
-+		    datafile=
-+		    encode=
-+		    encodingprog=
-+		    newid=`date | tr " :" "__"`
-+		    cid="<${newid}_$idctr@${hname}>"
-+		    idctr=`expr $idctr + 1`
-+		    cdescrip=             # -Immi
-+		    attachfilename=       # -Immi
-+		    isentity=0
-+		    multipart=`expr $multipart + 1`
-+		    shift ;;
-+
-+		*) echo UNRECOGNIZED METASEND OPTION: "$1"
-+		   exit 1 ;;
-+	esac
-+done
-+
-+if test $batchmode -eq 0
-+then
-+	if test -z "${to:-}"
-+	then
-+		echo -n "To: "
-+		read to
-+	fi
-+	if test -z "${subject:-}"
-+	then
-+        	echo -n "Subject: "
-+		read subject
-+	fi
-+	if test -z "${cc:-}"
-+	then
-+		echo -n "CC: "
-+		read cc
-+	fi
-+
-+	anotherpart=1
-+	while test $anotherpart -eq 1
-+	do
-+	    looping=1
-+	    while test $looping -ne 0
-+	    do
-+	        if test -z "${ctype:-}"
-+	        then
-+        		echo -n "Content-type: "
-+			read ctype
-+		fi
-+		if test "`echo $ctype | grep /`" = ""
-+		then
-+			echo Invalid content-type specified
-+			ctype=
-+		else
-+			looping=0
-+		fi
-+	    done
-+	    if test -z "${datafile:-}"
-+	    then
-+		looping=1
-+		while test $looping -eq 1
-+		do
-+			echo -n "Name of file containing $ctype data: "
-+			read datafile
-+			if test -r "$datafile"
-+			then
-+				looping=0
-+			else
-+				echo "The file $datafile does not exist."
-+			fi
-+		done
-+	    fi
-+
-+	    if test -z "${encode:-}"
-+	    then
-+		looping=1
-+		while test $looping -eq 1
-+		do
-+			echo "Do you want to encode this data for sending through the mail?"
-+			echo "  1 -- No, it is already in 7 bit ASCII"
-+			echo "  2 -- Yes, encode in base64 (most efficient)"
-+			echo "  3 -- Yes, encode in quoted-printable (less efficient, more readable)"
-+			echo "  4 -- Yes, encode it using uuencode (not standard, being phased out)"
-+			echo "  5 -- No, it is 8 bit extended ASCII"
-+			read encode
-+			looping=0
-+			case "$encode" in
-+				1) encodingprog=cat
-+				   encode=7bit ;;
-+				2) encodingprog="mimencode -b"
-+				   encode=base64 ;;
-+				3) encodingprog="mimencode -q"
-+				   encode=quoted-printable ;;
-+				4) encodingprog="uuencode $datafile"
-+				   encode=x-uue ;;
-+ 				5) encodingprog=cat
-+ 				   encode=8bit ;;
-+				*) echo Unrecognized answer, please try again.
-+				   looping=1 ;;
-+			esac
-+		done
-+	    fi
-+
-+	    echo -n "Do you want to include another file too (y/n) [n] ? "
-+	    read ans
-+	    case $ans in
-+		[Yy]*)	
-+		    eval ctype${multipart}=\"$ctype\"
-+		    eval datafile${multipart}=$datafile
-+		    eval encode${multipart}=$encode
-+		    eval encodingprog${multipart}=\"\$encodingprog\"
-+		    eval cdescrip${multipart}=\"$cdescrip\"
-+		    eval attachfilename${multipart}=\"$attachfilename\"   # -Immi
-+		    eval cid${multipart}=\"$cid\"
-+		    eval isentity${multipart}=$isentity
-+		    cdescrip=         # -Immi
-+		    attachfilename=   # -Immi
-+		    isentity=0
-+		    ctype=
-+		    datafile=
-+		    encode=
-+		    encodingprog=
-+		    newid=`date | tr " :" "__"`
-+		    cid="<${newid}_$idctr@${hname}>"
-+		    idctr=`expr $idctr + 1`
-+		    multipart=`expr $multipart + 1`
-+		    ;;
-+		*)
-+		    anotherpart=0;;
-+	    esac
-+	done
-+
- else
--    if ($outputfile == "") then
--      if (! $?to || ! $?subject || ! $?ctype || ! $?datafile) then
--        echo metasend: in batch mode, if output is not directed to a file,-t, -s, -f, and -m are all required
--        exit -1
--      endif
--    else
--      if (! $?datafile) then
--        echo metasend:  in batch mode, -f is required.
--      endif
--      if ($isentity) then
--        if (! $?ctype) then
--          set ctype=bogus
--          # will not be used anyway really
--        endif
--      endif
--      if (! $?ctype  ) then
--        echo metasend: in batch mode, with output directed to a file, -E or -m is required
--        exit -1
--      endif
--    endif    
--    if (! -e  $datafile) then
--        echo metasend:  The file $datafile does not exist
--        exit -1
--    endif
--#    if (! $?cc) set cc=""
--#     if ($ctype != $ctyperaw)  echo Double  quotes not allowed, using $ctype
--    if (! $?encode) then
--        if ("$ctype" =~ text*) then
--	set encodingprog = "mimencode -q"
--	set encode = "quoted-printable"
--        else
--            set encodingprog = "mimencode -b"
--            set encode = base64
--        endif
--    else if ($encode == "base64") then
--        set encodingprog = "mimencode -b"
--    else if ($encode == "x-uue") then
--        set encodingprog = "uuencode mail-body"
--    else if ($encode == "7bit") then
--        set encodingprog = cat
--    else
--        set encodingprog = "mimencode -q"
--        set encode = "quoted-printable"
--    endif
--endif
--
--if (! $?encode) then
--        if ("$ctype" =~ text*) then
--	set encode = "quoted-printable"
--	set encodingprog = "mimencode -q"
--        else
--            set encode = base64
--            set encodingprog = "mimencode -b"
--        endif
--endif
--set ctype${multipart} = "$ctype"
--set datafile${multipart} = $datafile
--set encode${multipart} = $encode
--set cdescrip${multipart} = "$cdescrip"
--set cid${multipart} = "$cid"
--set isentity${multipart} = $isentity
--set encodingprog${multipart} = "$encodingprog"
-+	if test -z "${outputfile:-}"
-+	then
-+	    if test -z "${to:-}" \
-+		-o -z "${subject:-}" \
-+		-o -z "${ctype:-}" \
-+		-o -z "${datafile:-}"
-+	    then
-+		echo "metasend: in batch mode, if output is not directed to a file,  -t, -s, -f, and -m are all required"
-+		exit 1
-+	    fi
-+	else
-+	    if test -z "${datafile:-}"
-+	    then
-+		echo "metasend: in batch mode, -f is required."
-+		exit 1
-+	    fi
-+	    if test $isentity -ne 0
-+	    then
-+	        if test -z "${ctype:-}"
-+	        then
-+			ctype=bogus
-+			#  will not be used anyway
-+		fi
-+	    fi
-+	    if test -z "${ctype:-}"
-+	    then
-+		echo "metasend: in batch mode, with output directed to a file, -E or -m is required."
-+		exit 1
-+	    fi
-+	fi
-+
-+
-+	if test ! -r "$datafile"
-+	then
-+		echo "metasend: The file $datafile does not exist"
-+		exit 1
-+	fi
-+
-+#	if test -z "${cc:-}"
-+#	then
-+#		cc=''
-+#	fi
-+
-+	if test -z "${encode:-}"
-+	then
-+		case "$ctype" in
-+			text*) encodingprog="mimencode -q"
-+			       encode=quoted-printable ;;
-+			*) encodingprog="mimencode -b"
-+			   encode=base64 ;;
-+		esac
-+	else
-+		case "$encode" in
-+			base64) encodingprog="mimencode -b" ;;
-+			x-uue)  encodingprog="uuencode $datafile" ;;
-+			7bit)   encodingprog=cat ;;
-+			8bit)   encodingprog=cat ;;
-+			*) encodingprog="mimencode -q"
-+			   encode=quoted-printable ;;
-+		esac
-+	fi
-+fi
-+
-+if test -z "${encode:-}"
-+then
-+	case "$ctype" in
-+		text*) encodingprog="mimencode -q"
-+		       encode=quoted-printable ;;
-+		*) encodingprog="mimencode -b"
-+		   encode=base64 ;;
-+	esac
-+fi
-+
-+eval ctype${multipart}=\"$ctype\"
-+eval datafile${multipart}=$datafile
-+eval encode${multipart}=$encode
-+eval cdescrip${multipart}=\"$cdescrip\"
-+eval attachfilename${multipart}=\"$attachfilename\"   # -Immi
-+eval cid${multipart}=\"$cid\"
-+eval isentity${multipart}=$isentity
-+eval encodingprog${multipart}=\"\$encodingprog\"
- 
--set fname = ${METAMAIL_TMPDIR}/metasend.$$
-+fname=`tempfile -p metamail -m 600`
- echo "MIME-Version: 1.0" > $fname
--if ($?to) then
--    echo "To: " "$to" >> $fname
--endif
--if ($?subject) then
--    echo "Subject: " "$subject" >> $fname
--endif
--if ($?cc) then
--    echo "CC: " "$cc" >> $fname
--endif
--if ($?from) then
--    echo "From: " "$from" >> $fname
--endif
--if ($multipart > 1) then
--    set  boundary = ${hname}.$$.`date | tr "  " .`
--    set newid=`date | tr " :" "__"`
--    if ($?multicid) then
--        echo "Content-ID: $multicid"   >> $fname
--    else
--        echo "Content-ID: <${newid}_$idctr@${hname}>"   >> $fname
--        @ idctr++
--    endif
--    echo "Content-type: multipart/$multipartsubtype;" >> $fname
--    echo "	boundary="\"$boundary\" >> $fname
--    echo "" >> $fname
--    if ($?preamblefile) then
--        cat $preamblefile >> $fname
--    else
--        echo "This is  a multimedia message in MIME  format.  If you are reading this" >> $fname
--        echo "prefix, your mail reader does  not understand MIME.  You may wish" >> $fname
--        echo "to look into upgrading to a newer version of  your mail reader." >> $fname
--    endif
--    set i=1
--    set junkfile=${METAMAIL_TMPDIR}/mmjunk.$$
--    while  ($multipart >= $i)
-+
-+if test ! -z "${to:-}"
-+then echo "To: $to" >> $fname
-+fi
-+if test ! -z "${subject:-}"
-+then echo "Subject: $subject" >> $fname
-+fi
-+if test ! -z "${cc:-}"
-+then echo "CC: $cc" >> $fname
-+fi
-+if test ! -z "${from:-}"
-+then echo "From: $from" >> $fname
-+fi
-+
-+if test $multipart -gt 1
-+then
-+	boundary=${hname}.$$.`date | tr "  " .`
-+	newid=`date | tr " :" "__"`
-+	if test ! -z "${multicid:-}"
-+	then
-+		echo "Content-ID: $multicid" >> $fname
-+	else
-+		echo "Content-ID: ${newid}_$idctr@${hname}" >> $fname
-+		idctr=`expr $idctr + 1`
-+	fi
-+	echo "Content-type: multipart/$multipartsubtype;" >> $fname
-+	echo "	boundary="\"$boundary\" >> $fname
-+	echo "" >> $fname
-+	if test ! -z "${preamblefile:-}"
-+	then
-+		cat $preamblefile >> $fname
-+	else
-+		echo "This is  a multimedia message in MIME  format.  If you are reading this" >> $fname
-+		echo "prefix, your mail reader does  not understand MIME.  You may wish" >> $fname
-+		echo "to look into upgrading to a newer version of  your mail reader." >> $fname
-+	fi
-+
-+	i=1
-+	while test $multipart -ge $i
-+	do
-+		echo "" >> $fname
-+		echo --$boundary >> $fname
-+		eval isentity=\$isentity$i
-+
-+		if test $isentity -eq 0
-+		then
-+			eval echo "Content-ID: \$cid$i" >> $fname
-+			eval echo "Content-type: \$ctype$i" >> $fname
-+#begin immi
-+			eval cdescrip=\$cdescrip$i
-+			if test ! -z "$cdescrip"
-+			then
-+				echo "Content-Description: $cdescrip" >> $fname
-+			fi
-+			eval attachfilename=\$attachfilename$i
-+			if test ! -z "$attachfilename"
-+			then
-+				echo "Content-Disposition: attachment; filename=\"$attachfilename\"" >> $fname
-+			fi
-+#end immi
-+			eval echo "Content-Transfer-Encoding: \$encode$i" >> $fname
-+			echo "" >> $fname
-+		fi
-+		eval \$encodingprog$i \< \"\$datafile$i\" \>\> $fname
-+		i=`expr $i + 1`
-+	done
-+	echo "" >> $fname
-+	echo --${boundary}-- >> $fname
- 	echo "" >> $fname
--	echo --$boundary >> $fname
--	echo set isentity=\$isentity$i > $junkfile
--	source $junkfile
--	if (! $isentity) then
--	    echo -n "Content-ID: "   >> $fname
--	    echo echo \$cid$i \>\>  $fname > $junkfile
--	    source $junkfile 
--	    echo -n "Content-type: ">>$fname
--	    echo echo \$ctype$i \>\>  $fname > $junkfile
--	    source $junkfile 
--	    echo -n "Content-Description: ">>$fname
--	    echo echo \"\$cdescrip$i \" \>\>  $fname > $junkfile
--	    source $junkfile 
--	    echo -n "Content-Transfer-Encoding: " >>$fname
--	    echo echo \$encode$i \>\> $fname > $junkfile
--	    source $junkfile 
--	    echo ""  >> $fname
--	endif
--	echo \$encodingprog$i \< \$datafile$i \>\> $fname > $junkfile
--	source $junkfile 
--	@ i++
--    end
--    rm $junkfile
--    echo "" >> $fname
--    echo --${boundary}-- >> $fname
--    echo "" >> $fname
--else 
--    if (! $isentity) then
--        echo "Content-ID: $cid"   >> $fname
--        echo "Content-type: " $ctype >> $fname
--        echo "Content-Description: " $cdescrip >> $fname
--        echo "Content-Transfer-Encoding: " $encode >> $fname
--    endif
--    echo  "" >> $fname
--    $encodingprog < $datafile >> $fname
--    # Ensure last line has trailing carriage return
--    echo "" >> $fname
--endif
--if ($outputfile == "") then
--    if ($batchmode == 0) echo -n "Delivering mail, please wait...  "
--    splitmail -s $splitsize -d $fname
--    if (! $status) then
--        if ($batchmode == 0) echo "Mail delivery apparently succeeded."
--        rm $fname
--    else if ($MustDelete == 1) then
--        echo Mail delivery failed
--        rm $fname
--        exit -1
--    else
--        echo Mail delivery failed, draft mail is in $fname
--        exit -1
--    endif
- else
--    mv $fname $outputfile
--    if ($status) exit -1
--endif
-+	if test $isentity -eq 0
-+	then
-+		echo "Content-ID: $cid" >> $fname
-+		echo "Content-type: $ctype" >> $fname
-+#begin immi
-+		if test ! -z "$cdescrip"
-+		then
-+			echo "Content-Description: $cdescrip" >> $fname
-+		fi
-+		if test ! -z "$attachfilename"
-+		then
-+			echo "Content-Disposition: attachment; filename=\"$attachfilename\"" >> $fname
-+		fi
-+#end immi
-+		echo "Content-Transfer-Encoding: $encode" >> $fname
-+	fi
-+	echo "" >> $fname
-+	$encodingprog < "$datafile" >> $fname
-+	# Ensure last line has trailing carriage return
-+	echo "" >> $fname
-+fi
-+
-+if test -z "${outputfile:-}"
-+then
-+	if test $batchmode = 0
-+	then
-+		echo -n "Delivering mail, please wait...  "
-+	fi
-+	splitmail -s "$splitsize" -d $fname
-+
-+	if test $? -eq 0
-+	then
-+		if test $batchmode = 0
-+		then
-+			echo "Mail delivery apparently succeeded."
-+		fi
-+		rm $fname
-+	elif test "$MustDelete" -eq 1
-+	then
-+		echo Mail delivery failed
-+		rm $fname
-+		exit -1
-+	else
-+		echo "Mail delivery failed, draft mail is in $fname"
-+		exit -1
-+	fi
-+else
-+	mv $fname "$outputfile"
-+	if test $? -ne 0
-+	then
-+		exit -1
-+	fi
-+fi
- exit 0
- 
-+
---- metamail-2.7.orig/bin/showpartial
-+++ metamail-2.7/bin/showpartial
-@@ -1,92 +1,156 @@
--#!/bin/csh -fb
--# (The "-fb" might need to be changed to "-f" on some systems)
--#
--
--if (! $?METAMAIL_TMPDIR) then
--    set METAMAIL_TMPDIR=/tmp
--endif
--
--set TREEROOT=${METAMAIL_TMPDIR}/m-prts-`whoami`
--if ($#argv < 3 || $#argv > 4) then
--    echo "Usage:  showpartial file id partnum totalnum"
--    exit -1
--endif
--set file=$1
-+#!/bin/sh -e
-+# Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+# 
-+# Permission to use, copy, modify, and distribute this material 
-+# for any purpose and without fee is hereby granted, provided 
-+# that the above copyright notice and this permission notice 
-+# appear in all copies, and that the name of Bellcore not be 
-+# used in advertising or publicity pertaining to this 
-+# material without the specific, prior written permission 
-+# of an authorized representative of Bellcore.  BELLCORE 
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+# Conversion from C shell to Bourne shell by Z-Code Software Corp.
-+# Conversion Copyright (c) 1992 Z-Code Software Corp.
-+# Permission to use, copy, modify, and distribute this material
-+# for any purpose and without fee is hereby granted, provided
-+# that the above copyright notice and this permission notice
-+# appear in all copies, and that the name of Z-Code Software not
-+# be used in advertising or publicity pertaining to this
-+# material without the specific, prior written permission
-+# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+if [ -z "$METAMAIL_TMPDIR" ]
-+then
-+	METAMAIL_TMPDIR=/tmp
-+fi
-+
-+
-+
-+if test -z "$3" -o ! -z "$5"
-+then
-+	echo "Usage: showpartial file id partnum totalnum"
-+	exit 1
-+fi
-+
-+file=$1
-+
- # This next line is because message-id can contain weird chars
--set id=`echo $2 | tr -d  \!\$\&\*\(\)\|\'\"\;\/\<\>\\` 
--@ partnum = $3
--if ($#argv == 3 || $4 == "") then
--    set totalnum=-1
-+id=$(echo "$2" | tr -d \!\$\&\*\(\)\|\'\"\;\/\<\>\\\\ )
-+
-+partnum=$3
-+
-+if test -z "$4"
-+then
-+	totalnum=-1
-+else
-+	totalnum=$4
-+fi
-+
-+if [ -n "$HOME" ] ; then
-+# If we have a home directory, create a temporary dir and
-+# store the name there unless the file already exists
-+# and the directory it points to is valid directory
-+	[ -e "$HOME/.metamail_treeroot" ] && TREEROOT=`cat $HOME/.metamail_treeroot`
-+	[ -e "$TREEROOT" ] && [ ! -d "$TREEROOT" ] && rm -f "$TREEROOT" 
-+	if [ ! -e "$HOME/.metamail_treeroot" ] || [ ! -e "$TREEROOT" ]; then
-+		TREEROOT=`mktemp -d -t msg-parts.XXXXXX` || { echo "$0: Cannot create temporary dir!" >&2 ; exit 1; }
-+		echo $TREEROOT >$HOME/.metamail_treeroot
-+	fi
- else
--    @ totalnum = $4
--endif
-+	TREEROOT=$METAMAIL_TMPDIR/msg-parts-`whoami`
-+	# Sanity check: is this a directory?
-+	[ -e "$TREEROOT" ] && [ ! -d "$TREEROOT" ] && rm -f "$TREEROOT" 
-+	# Sanity check, does it belong to us?
-+	if [ -d "$TREEROOT" ] ; then
-+		treeuid=`stat -c %u "$TREEROOT"`
-+		if [ "$treeuid" -ne "`id -u`" ]; then
-+			echo "$0: Tried to use $TREEROOT but it does not belong to us! Aborting." >&2
-+			exit 1
-+		fi
-+	else
-+		mkdir -p "$TREEROOT" || { echo "$0: Cannot create dir $TREEROOT!" >&2 ; exit 1; }
-+	fi
-+
-+fi
-+if test ! -d "${TREEROOT}/$id"
-+then
-+	mkdir "${TREEROOT}/$id"
-+	if test $? -ne 0
-+	then
-+	        echo mkdir "${TREEROOT}/$id" failed
-+		exit 1
-+	fi
-+fi
- 
--if (! -d  $TREEROOT)  then
--    mkdir $TREEROOT
--    if ($status) then 
--        echo mkdir $TREEROOT failed
--        exit -1
--    endif
--endif
--if (! -d ${TREEROOT}/$id) then 
--    mkdir ${TREEROOT}/$id
--    if ($status) then 
--        echo mkdir ${TREEROOT}/$id failed
--        exit -1
--    endif
--endif
--cp $file ${TREEROOT}/$id/$partnum
--if ($status) then 
--    echo cp $file ${TREEROOT}/$id/$partnum failed
--    exit -1
--endif
--if ($totalnum == -1) then
--    if (-e ${TREEROOT}/$id/CT) then
--	set totalnum=`cat ${TREEROOT}/$id/CT`
--    else
--    	set totalnum=-1  #GROSS HACK
--    endif
-+cp $file "${TREEROOT}/$id/$partnum"
-+if test $? -ne 0
-+then
-+	echo cp $file "${TREEROOT}/$id/$partnum" failed
-+	exit 1
-+fi
-+
-+if test $totalnum -eq -1
-+then
-+	if test -r "${TREEROOT}/$id/CT"
-+	then
-+		totalnum=`cat "${TREEROOT}/$id/CT"`
-+	else
-+    		totalnum=-1
-+	fi
- else
--    echo $totalnum >! ${TREEROOT}/$id/CT
--endif
-+	echo $totalnum > "${TREEROOT}/$id/CT"
-+fi
-+
- # Slightly bogus here -- the shell messes up the newlines in the headers
--# If you put $MM_HEADERS in quotes, it doesn't help.
- # if ($partnum == 1) then
--#     echo $MM_HEADERS > ${TREEROOT}/$id/HDRS
-+#     echo $MM_HEADERS > "${TREEROOT}/$id/HDRS"
- # endif
--set found=0
--set ix=1
--set list=""
--set limit=$totalnum
--if ($limit == -1) set limit=25
--while ($ix <= $limit)
--    if (-e ${TREEROOT}/$id/$ix) then
--	set list="$list $ix"
--	@ found ++
--    endif
--    @ ix ++
--end
--if ($found == $totalnum) then
--    cd ${TREEROOT}/$id
--    cat $list > ${TREEROOT}/$id/FULL
--#    cat ${TREEROOT}/$id/HDRS $list > ${TREEROOT}/$id/FULL
--    rm $list
--    echo All parts of this ${totalnum}-part message have now been read.
--    metamail -d  ${TREEROOT}/$id/FULL
--    echo WARNING:  To save space, the full file is now being deleted.  
--    echo You will have to read all $totalnum parts again to see the full message again.
--    rm ${TREEROOT}/$id/FULL
--    rm ${TREEROOT}/$id/CT
--#    rm ${TREEROOT}/$id/HDRS
--    cd
--    rmdir ${TREEROOT}/$id
--    rmdir ${TREEROOT} >& /dev/null
-+found=0
-+ix=1
-+list=
-+limit=$totalnum
-+if test "$limit" -eq -1
-+then
-+	limit=25
-+fi
-+
-+while test "$ix" -le "$limit"
-+do
-+	if test -f "${TREEROOT}/$id/$ix"
-+	then
-+		list="$list $ix"
-+		found=$(($found + 1))
-+	fi
-+	ix=`expr $ix + 1`
-+done
-+
-+if test $found = "$totalnum"
-+then
-+	cd "${TREEROOT}/$id"
-+	cat $list > "${TREEROOT}/$id/FULL"
-+	rm $list
-+	echo All parts of this "${totalnum}"-part message have now been read.
-+	metamail -d < "${TREEROOT}/$id/FULL"
-+	echo WARNING:  To save space, the full file is now being deleted.  
-+	echo You will have to read all "$totalnum" parts again to see the full message again.
-+	rm "${TREEROOT}/$id/FULL"
-+	rm "${TREEROOT}/$id/CT"
-+	cd ${METAMAIL_TMPDIR}
-+	rmdir "${TREEROOT}/$id"
-+	rmdir ${TREEROOT} > /dev/null 2>&1
-+	[ -e "$HOME/.metamail_treeroot" ] && > "$HOME/.metamail_treeroot" 
- else
--    if (${totalnum} == -1) then
--        echo So far you have only read $found of the several parts of this message.
--    else
--        echo So far you have only read $found of the $totalnum parts of this message.
--    endif
--    echo When you have read them all, then you will see the message in full.
--endif
--    
-+	if test "$totalnum" -eq -1
-+	then
-+		echo So far you have only read $found of the several parts of this message.
-+	else
-+		echo So far you have only read $found of the "$totalnum" parts of this message.
-+	fi
-+	echo When you have read them all, then you will see the message in full.
-+fi
---- metamail-2.7.orig/bin/audiosend
-+++ metamail-2.7/bin/audiosend
-@@ -1,6 +1,4 @@
--#!/bin/csh -fb
--# (The "-fb" might need to be changed to "-f" on some systems)
--#
-+#!/bin/sh -e
- # Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
- # 
- # Permission to use, copy, modify, and distribute this material 
-@@ -13,97 +11,114 @@
- # MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
- # OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
- # WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
--#
- 
--if (! $?METAMAIL_TMPDIR) then
--    set METAMAIL_TMPDIR=/tmp
--endif
-+# Conversion from C shell to Bourne shell by Z-Code Software Corp.
-+# Conversion Copyright (c) 1992 Z-Code Software Corp.
-+# Permission to use, copy, modify, and distribute this material
-+# for any purpose and without fee is hereby granted, provided
-+# that the above copyright notice and this permission notice
-+# appear in all copies, and that the name of Z-Code Software not
-+# be used in advertising or publicity pertaining to this
-+# material without the specific, prior written permission
-+# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+# Brought into line with metamail 2.7 beta release Csh version
-+#    Dave Shield	February 1994
- 
- # This is to make metamail/showaudio do playback on the speaker, not the phone.
--setenv AUDIOSPEAKERFORCE 1 
-+AUDIOSPEAKERFORCE=1 ; export AUDIOSPEAKERFORCE
-+
-+if test -d /usr/sony
-+then
-+	dev=/dev/sb0
-+else
-+	dev=/dev/audio
-+fi
- 
--if (-d /usr/sony) then
--    set dev=/dev/sb0
-+if test -f /usr/sbin/sendmail
-+then
-+    MAILCOMMAND=/usr/sbin/sendmail
- else
--    set dev=/dev/audio
--endif
-+    MAILCOMMAND=mail
-+fi
- 
--if ( $#argv == 1 ) then
--    set to = $1
-+if test ! -z "${1:-}"
-+then
-+    to=$1
- else
-     echo -n "To: "
--    set to = $<
--endif
-+    read to
-+fi
- echo -n "Subject: "
--set subject = $<
-+read subject
- echo -n "CC: "
--set cc = $<
-+read cc
- 
--record:
--echo -n "Press RETURN when you are ready to start recording: "
--set foo = $<
--
--set fname = ${METAMAIL_TMPDIR}/audio-out.$$
--set fnameraw = ${METAMAIL_TMPDIR}/audio-raw.$$
--
--echo "To: " "$to" > $fname
--echo "Subject: " "$subject" >> $fname
--echo "CC: " "$cc" >> $fname
--echo "MIME-Version: 1.0" >> $fname
--echo "Content-Type: audio/basic" >> $fname
--echo "Content-Transfer-Encoding: base64" >> $fname
--echo  "" >> $fname
--# THIS IS UNBELIEVABLY GRUBBY
--onintr cleanup
--if (! $?RECORD_AUDIO) then
--    (/bin/cat < $dev > $fnameraw) &
--else
--    ($RECORD_AUDIO > $fnameraw) &
--endif
--jobs -l > ${METAMAIL_TMPDIR}/AUDCAT.$$
--set foo=`/bin/cat ${METAMAIL_TMPDIR}/AUDCAT.$$`
--/bin/rm ${METAMAIL_TMPDIR}/AUDCAT.$$
--set PID=$foo[2]
--echo -n "press RETURN when you are done recording: "
--set foo=$<
--echo One moment please...
--/bin/sleep 1
--echo -n Killing recording job...
--/bin/kill -9 $PID >& /dev/null
--mimencode -b < $fnameraw >> $fname
--/bin/rm $fnameraw
--echo "" >> $fname
--
--whatnext:
--echo ""
--echo "What do you want to do?"
--echo ""
--echo "1 -- Send mail"
--echo "2 -- Listen to recorded message"
--echo "3 -- Replace with a new recording"
--echo "4 -- Quit"
--set which = $<
--    switch ("$which")
--        case 1:
--          echo -n "Sending mail, please wait...  "
--          /usr/lib/sendmail $to  $cc < $fname
--          if (! $status) then
--            echo "Done."
--            rm $fname
--            exit
--          else
--            echo Mail delivery failed, draft mail is in $fname
--          endif
--          breaksw
--        case 2:
--          metamail -d $fname
--          breaksw
--        case 3:
--          goto record
--        case 4:
--          exit
--    endsw
--goto whatnext
--exit 0
--cleanup:
--kill -9 $PID >& /dev/null
-+record=1
-+
-+while true
-+do
-+	if test $record -eq 1
-+	then
-+		echo -n "Press RETURN when you are ready to start recording: "
-+		read foo
-+
-+		fname=`tempfile -p metamail -m 600`
-+		fnameraw=`tempfile -p metamail -m 600`
-+
-+		echo "To: $to" > $fname
-+		echo "Subject: $subject" >> $fname
-+		echo "CC: $cc" >> $fname
-+		echo "MIME-Version: 1.0" >> $fname
-+		echo "Content-Type: audio/basic" >> $fname
-+		echo "Content-Transfer-Encoding: base64" >> $fname
-+		echo "" >> $fname
-+
-+		trap "kill -9 $! > /dev/null 2>&1" HUP INT TERM
-+
-+		if test -z "RECORD_AUDIO"
-+		then
-+			(cat < $dev > $fnameraw) &
-+		else
-+			($RECORD_AUDIO > $fnameraw) &
-+		fi
-+		echo -n "press RETURN when you are done recording: "
-+		read foo
-+		echo One moment please...
-+		sleep 1
-+		echo -n Killing recording job...
-+		kill -9 $! > /dev/null 2>&1
-+		mimencode -b < $fnameraw >> $fname
-+		rm $fnameraw
-+		echo "" >> $fname
-+	fi
-+	record=0
-+
-+	echo ""
-+	echo "What do you want to do?"
-+	echo ""
-+	echo "1 -- Send mail"
-+	echo "2 -- Listen to recorded message"
-+	echo "3 -- Replace with a new recording"
-+	echo "4 -- Quit"
-+	read which
-+	case $which in
-+		1) echo -n "Sending mail, please wait...  "
-+		  $MAILCOMMAND $to $cc < $fname
-+
-+		  if test $? -eq 0
-+		  then
-+			echo Done.
-+			rm $fname
-+			exit 0
-+		  else
-+			echo Mail delivery failed, draft is in $fname
-+		  fi ;;
-+		2) metamail -d $fname ;;
-+		3) record=1 ;;
-+		4) exit 0 ;;
-+	esac
-+done
---- metamail-2.7.orig/bin/patch-metamail
-+++ metamail-2.7/bin/patch-metamail
-@@ -1,20 +1,58 @@
--#!/bin/csh -fb
--# (The "-fb" might need to be changed to "-f" on some systems)
--#
--set HOSTNAME=thumper.bellcore.com
--set DIRNAME=pub/nsb
--set PREFIX="mm.patch."
--
--if ($#argv < 2 || $#argv > 5) then
--	echo Usage:  patch-metamail source-tree-root patch-number [hostname [dirname [prefix]]]
--	exit -1
--endif
--
--set TREEROOT=$1
--set PATCHNUMBER=$2
--if ($#argv > 2) set HOSTNAME=$3
--if ($#argv > 3) set DIRNAME=$4
--if ($#argv > 4) set PREFIX=$5
-+#!/bin/sh -e
-+# Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+# 
-+# Permission to use, copy, modify, and distribute this material 
-+# for any purpose and without fee is hereby granted, provided 
-+# that the above copyright notice and this permission notice 
-+# appear in all copies, and that the name of Bellcore not be 
-+# used in advertising or publicity pertaining to this 
-+# material without the specific, prior written permission 
-+# of an authorized representative of Bellcore.  BELLCORE 
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+# Conversion from C shell to Bourne shell
-+# by Bob Glickstein, Z-Code Software Corp.
-+# Conversion Copyright (c) 1992 Z-Code Software Corp. (Z-Code)
-+# 
-+# Permission to use, copy, modify, and distribute this material for
-+# any purpose and without fee is hereby granted, provided that the
-+# above copyright notice and this permission notice appear in all
-+# copies, and that the name of Z-Code not be used in advertising or
-+# publicity pertaining to this material without the specific, prior
-+# written permission of an authorized representative of Z-Code.
-+# Z-CODE MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY OF
-+# THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", WITHOUT ANY
-+# EXPRESS OR IMPLIED WARRANTIES.
-+
-+HOSTNAME=thumper.bellcore.com
-+DIRNAME=pub/nsb
-+PREFIX=mm.patch.
-+
-+if test -z "$2" -o ! -z "$6"
-+then
-+	echo "Usage: patch-metamail source-tree-root patch-number [hostname [dirname [prefix]]]"
-+	exit 1
-+fi
-+
-+TREEROOT=$1
-+PATCHNUMBER=$2
-+
-+if test ! -z "$3"
-+then
-+	HOSTNAME=$3
-+fi
-+
-+if test ! -z "$4"
-+then
-+	DIRNAME=$4
-+fi
-+
-+if test ! -z "$5"
-+then
-+	PREFIX=$5
-+fi
- 	
- echo WARNING:  This program, if allowed to do so, will attempt to 
- echo install a PATCH file for your metamail sources which are rooted 
-@@ -22,15 +60,16 @@
- echo ""
- echo It will use a patch file that it retrieves via anonymous ftp
- echo from the host $HOSTNAME, in the directory $DIRNAME, 
--echo with filenames starting with ${PREFIX}.
-+echo with filenames starting with $PREFIX.
- echo ""
--echo -n "Do you want to install the patch in directory $TREEROOT [y/n] ? "
--set ans=$<
--if ($ans == "y" || $ans == "Y") then
--    cd $TREEROOT
--    set ident=`whoami`@`hostname`
--    echo Using anonymous ftp with password $ident
--    ftp -n <<!
-+echo -n "Do you want to install the patch in directory $TREEROOT (y/n)? [n] "
-+read ans
-+
-+case "$ans" in
-+	[Yy]*) cd $TREEROOT
-+	       ident=`whoami`@`hostname`
-+	       echo Using anonymous ftp with password $ident
-+	       ftp -n <<!
- open $HOSTNAME
- user anonymous $ident
- cd $DIRNAME
-@@ -38,8 +77,6 @@
- get ${PREFIX}${PATCHNUMBER}
- quit
- !
--    patch -p < ${PREFIX}${PATCHNUMBER}
--else
--	echo Patch not installed
--endif
--
-+	       patch -p < ${PREFIX}${PATCHNUMBER} ;;
-+	*) echo Patch not installed
-+esac
---- metamail-2.7.orig/bin/showexternal
-+++ metamail-2.7/bin/showexternal
-@@ -1,6 +1,4 @@
--#!/bin/csh -fb
--# (The "-fb" might need to be changed to "-f" on some systems)
--#
-+#!/bin/sh -e
- # Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
- # 
- # Permission to use, copy, modify, and distribute this material 
-@@ -13,142 +11,174 @@
- # MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
- # OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
- # WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
--# 
- 
--onintr cleanup
--if (! $?METAMAIL_TMPDIR) then
--    set METAMAIL_TMPDIR=/tmp
--endif
--if (! $?FTP) then
--    set FTP=ftp
--endif
--
--if ($#argv <3) then
--    echo "Usage: showexternal body-file access-type name [site [directory [mode [server]]]]"
--    exit -1
--endif
--set bodyfile=$1
--set atype=`echo $2 | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
--set name=$3
--if ($#argv > 3) then
--    set site=$4
--else 
--    set site=""
--endif
--if ($#argv > 4) then
--    set dir=$5
--else
--    set dir=""
--endif
--if ($#argv > 5) then
--    set mode=$6
--else
--    set mode=""
--endif
--if ($#argv > 6) then
--    set server=$7
-+# Conversion from C shell to Bourne shell by Z-Code Software Corp.
-+# Conversion Copyright (c) 1992 Z-Code Software Corp.
-+# Permission to use, copy, modify, and distribute this material
-+# for any purpose and without fee is hereby granted, provided
-+# that the above copyright notice and this permission notice
-+# appear in all copies, and that the name of Z-Code Software not
-+# be used in advertising or publicity pertaining to this
-+# material without the specific, prior written permission
-+# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+# Brought into line with metamail 2.7 beta release Csh version
-+#    Dave Shield	February 1994
-+
-+if test -f /usr/sbin/sendmail
-+then
-+    MAILCOMMAND=/usr/sbin/sendmail
- else
--    set server=""
--endif
-+    MAILCOMMAND=/bin/mail
-+fi
- 
--if ("$server" == "" && $atype == "mail-server") then
--# Backward compatibility with some broken stuff
--    set server=${name}@${site}
--    echo WARNING -- old style mailserver syntax, using server $server
--endif
--
--set ctype="`grep -i content-type: $bodyfile | sed -e 's/............: //'`"
--if ("$ctype" == "") set ctype="text/plain"
--set cenc=`grep -i content-transfer-encoding: $bodyfile | sed -e 's/.........................: //'`
--set username=""
--set pass=""
--set TMPDIR=${METAMAIL_TMPDIR}/XXXternal.$$
-+if test "$#" -lt 3
-+then
-+	echo "Usage: showexternal body-file access-type name [site [directory [mode]]]"
-+	exit 1
-+fi
-+
-+if [ -z "$METAMAIL_TMPDIR" ]
-+then
-+	METAMAIL_TMPDIR=/tmp
-+fi
-+
-+# Check argument integrity. Don't trust mail headers
-+if echo "$1$2$3$4$5$6$7" | grep -q '[[:space:]]'
-+then
-+	echo "Illegal white space in arguments -- possibly a mail bomb?!"
-+	echo "Command was:"
-+	echo \'$0\' \'$1\' \'$2\' \'$3\' \'$4\' \'$5\' \'$6\' \'$7\'
-+	exit 2
-+fi
-+
-+bodyfile=$1
-+atype=$(echo "$2" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz)
-+name=$3
-+
-+site=$4
-+
-+dir=$5
-+
-+mode=$6
-+
-+server=$7
-+
-+if test -z "$server" -a $atype = "mail-server"
-+then
-+	server=${name}@${site}
-+	echo WARNING -- old style mailserver syntax, using server "$server"
-+fi
-+
-+ctype=$(grep -i content-type: "$bodyfile" | sed -e 's/............: //')
-+if test -z "$ctype"
-+then ctype="text/plain"
-+fi
-+cenc=$(grep -i content-transfer-encoding: "$bodyfile" | sed -e 's/.........................: //')
-+username=
-+pass=
-+TMPDIR=$METAMAIL_TMPDIR/XXXternal.$$
-+trap 'cd $METAMAIL_TMPDIR ; rmdir "$TMPDIR" >/dev/null 2>&1' 1 2 3 15
- mkdir $TMPDIR
--pushd $TMPDIR
--set NEWNAME="mm.ext.$$"
--set NEEDSCONFIRMATION=1
--switch ("$atype")
--    case anon-ftp:
--	echo "This mail message contains a POINTER (reference) to data that is "
--	echo not included in the message itself.  Rather, the data can be retrieved 
--	echo automatically using  anonymous FTP to a site on the network.
--	breaksw
--    case ftp:
--	echo "This mail message contains a POINTER (reference) to data that is "
--	echo not included in the message itself.  Rather, the data can be retrieved 
--	echo automatically using  the FTP protocol to a site on the network.
--	breaksw
--    case mail-server:  
--	cat > ${METAMAIL_TMPDIR}/ext.junk.$$ <<!
--This mail message contains a POINTER (reference) to data that is 
--not included in the message itself.  Rather, the data can be retrieved 
--by sending a special mail message to a mail server on the network.
--However, doing this automatically is slightly dangerous, because  someone
--might be using this mechanism to cause YOU to send obnoxious mail.
--For that reason, the mail message that WOULD be sent is being shown to you
--first for your approval.
-+PUSHED_DIR=`pwd`
-+cd $TMPDIR
-+NEWNAME="mm.ext.$$"
-+NEEDSCONFIRMATION=1
-+
-+case $atype in
-+	anon-ftp)
-+		echo "This mail message contains a POINTER (reference) to data that is "
-+		echo not included in the message itself.  Rather, the data can be retrieved 
-+		echo automatically using anonymous FTP to a site on the network. ;;
-+		
-+	ftp)
-+		echo "This mail message contains a POINTER (reference) to data that is "
-+		echo not included in the message itself.  Rather, the data can be retrieved 
-+		echo automatically using the FTP protocol to a site on the network. ;;
-+
-+	mail-server)
-+		TMPF=$(mktemp /tmp/ext.junk.XXXXXX)
-+		cat > $TMPF <<!
-+This mail message contains a POINTER (reference) to data that is not
-+included in the message itself.  Rather, the data can be retrieved by
-+sending a special mail message to a mail server on the network.
-+However, doing this automatically is slightly dangerous, because
-+someone might be using this mechanism to cause YOU to send obnoxious
-+mail.  For that reason, the mail message that WOULD be sent is being
-+shown to you first for your approval.
- 
- This is the message that will be sent if you choose to go ahead and
--retreive the external data:
-+retrieve the external data:
- 
- Subject: Automated Mail Server Request
--To: ${server}
-+To: $server
- 
- !
--	sed -e 1,/^\$/d < $bodyfile >> ${METAMAIL_TMPDIR}/ext.junk.$$
--	more ${METAMAIL_TMPDIR}/ext.junk.$$
--	rm ${METAMAIL_TMPDIR}/ext.junk.$$
--	breaksw
--    default:
--	# IGNORE ALL THE OTHERS -- AUTOMATIC FOR LOCAL-FILE, AFS.
--	set NEEDSCONFIRMATION=0
--endsw
-+		sed -e 1,/^\$/d < "$bodyfile" >> $TMPF
-+		sensible-pager $TMPF
-+		rm $TMPF ;;
-+
-+	*)
-+		NEEDSCONFIRMATION=0 ;;
-+esac
- 
--if ($NEEDSCONFIRMATION) then
-+if test $NEEDSCONFIRMATION -ne 0
-+then
- 	echo ""
--	echo -n "Do you want to proceed with retrieving the external data [y] ? "
--	set ANS=$<
--	if ("$ANS" =~ n* ||  "$ANS" =~ N* ) then
--		cd ${METAMAIL_TMPDIR}
--		rm -rf $TMPDIR
--		exit 0
--	endif
--endif
--
--switch ("$atype")
--    case anon-ftp:
--	set username=anonymous
--	set pass=`whoami`@`hostname`
--	# DROP THROUGH
--    case ftp:
--	if ("$site" == "") then
--	    echo -n "Site for ftp access: "
--	    set site=$<
--	endif
--	if ("$username" == "") then
--	    echo -n "User name at site ${site}: "
--	    set username=$<
--	endif
--	if ("$pass" == "") then
--	    echo -n "Password for user $username at site ${site}: "
--	    stty -echo
--	    set pass=$<
--	    stty echo
--	    echo ""
--	endif
--	if ("$dir" == "") then
--	    set DIRCMD=""
--	else
--	    set DIRCMD="cd $dir"
--	endif
--	if ("$mode" == "") then
--	    set MODECMD=""
--	else
--	    set MODECMD="type $mode"
--	endif
--	echo OBTAINING MESSAGE BODY USING FTP
--	echo SITE: $site USER $username
--	$FTP -n <<!
-+	echo -n "Do you want to proceed with retrieving the external data? [y] "
-+	read ANS
-+	case "$ANS" in
-+		[Nn]*)	cd $METAMAIL_TMPDIR
-+			rm -rf $TMPDIR;
-+			exit 0 ;;
-+	esac
-+fi
-+
-+case "$atype" in
-+	anon-ftp | ftp)
-+		case "$atype" in
-+		anon-ftp )
-+			username=anonymous
-+			pass=`whoami`@`hostname`
-+			;;
-+		esac
-+
-+		if test -z "$site"
-+		then
-+			echo -n "Site for ftp access: "
-+			read site
-+		fi
-+		if test -z "$username"
-+		then
-+			echo -n "User name at site ${site}: "
-+			read username
-+		fi
-+		if test -z "$pass"
-+		then
-+			echo -n "Password for user $username at site ${site}: "
-+			stty -echo
-+			read pass
-+			stty echo
-+			echo ""
-+		fi
-+		if test -z "$dir"
-+		then
-+			DIRCMD=""
-+		else
-+			DIRCMD="cd $dir"
-+		fi
-+		if test -z "$mode"
-+		then
-+			MODECMD=""
-+		else
-+			MODECMD="type $mode"
-+		fi
-+		echo OBTAINING MESSAGE BODY USING FTP
-+		echo SITE: "$site" USER: "$username"
-+		${FTP:-ftp} -n <<!
- open $site
- user $username $pass
- $DIRCMD
-@@ -156,91 +186,92 @@
- get $name $NEWNAME
- quit
- !
--	if (! -e $NEWNAME) then
--	    echo FTP failed.
--	    cd ${METAMAIL_TMPDIR}
--	    rm -rf $TMPDIR
--	    exit -1
--	endif
--	breaksw
--    case afs:
--    case local-file:
--	if (! -e $name) then
--	    echo local file not found
--	    cd ${METAMAIL_TMPDIR}
--	    rm -rf $TMPDIR
--	    exit -1
--	endif
--    	set NEWNAME=$name
--	echo GETTING BODY FROM FILE NAMED: $NEWNAME
--	breaksw
--    case mail-server:  # A very special case
--	if ("$bodyfile" == "") then
--	    echo mail-server access-type requires a body file
--	    cd ${METAMAIL_TMPDIR}
--	    rm -rf $TMPDIR
--	    exit -1
--	endif
--	echo Subject: Automated Mail Server Request > $NEWNAME
--	echo To: ${server} >> $NEWNAME
--	echo "" >> $NEWNAME
--	sed -e 1,/^\$/d < $bodyfile >> $NEWNAME
--	echo "" >> $NEWNAME
--	/usr/lib/sendmail -t  < $NEWNAME
--	if ($status) then
--	    echo sendmail failed
--	    cd ${METAMAIL_TMPDIR}
--	    rm -rf $TMPDIR
--	    exit -1
--	endif
--	cd ${METAMAIL_TMPDIR}
--	rm -rf $TMPDIR
--	echo Your $ctype data has been requested from a mail server.
--	exit 0
--    default:
--	echo UNRECOGNIZED ACCESS-TYPE
--	cd ${METAMAIL_TMPDIR}
--	rm -rf $TMPDIR
--	exit -1
--endsw
--if ($cenc == base64) then
--	mimencode -u -b < $NEWNAME > OUT
--	mv OUT $NEWNAME
--else if ($cenc == quoted-printable) then
--	mimencode -u -q < $NEWNAME > OUT
--	mv OUT $NEWNAME
--endif
--
--popd
--if ($atype == "local-file") then
--    metamail -p  -b -c "$ctype" $NEWNAME
--else
--    metamail -p -b -c "$ctype" $TMPDIR/$NEWNAME
--endif
-+		if test ! -r "$NEWNAME"
-+		then
-+			echo FTP failed.
-+			cd $METAMAIL_TMPDIR
-+			rm -rf $TMPDIR
-+			exit 1
-+		fi
-+		;;
-+
-+	afs|local-file)
-+		if test ! -r "$name"
-+		then
-+			echo local file not found
-+			cd $METAMAIL_TMPDIR
-+			rm -rf $TMPDIR
-+			exit 1
-+		fi
-+		NEWNAME=$name
-+		echo GETTING BODY FROM FILE NAMED: "$NEWNAME" ;;
-+
-+	mail-server)
-+		if test -z "$bodyfile"
-+		then
-+			echo mail-server access-type requires a body file
-+			cd $METAMAIL_TMPDIR
-+			rm -rf $TMPDIR
-+			exit 1
-+		fi
-+		echo Subject: Automated Mail Server Request > "$NEWNAME"
-+		echo To: "$server" >> "$NEWNAME"
-+		echo >> "$NEWNAME"
-+		sed -e 1,/^\$/d < "$bodyfile" >> "$NEWNAME"
-+		$MAILCOMMAND -t < "$NEWNAME"
-+		if test $? -ne 0
-+		then
-+			echo sendmail failed
-+			cd $METAMAIL_TMPDIR
-+			rm -rf $TMPDIR
-+			exit 1
-+		fi
-+		cd $METAMAIL_TMPDIR
-+		rm -rf $TMPDIR
-+		echo Your "$ctype" data has been requested from a mail server.
-+		exit 0 ;;
-+	*)
-+		echo UNRECOGNIZED ACCESS-TYPE
-+		cd $METAMAIL_TMPDIR
-+		rm -rf $TMPDIR
-+		exit 1 ;;
-+esac
-+
-+if test "$cenc" = base64
-+then
-+	mimencode -u -b < "$NEWNAME" > OUT
-+	mv OUT "$NEWNAME"
-+elif test "$cenc" = quoted-printable
-+then
-+	mimencode -u -q < "$NEWNAME" > OUT
-+	mv OUT "$NEWNAME"
-+fi
-+
-+cd $PUSHED_DIR
-+case "$atype" in
-+    local-file ) metamail -b -p -c "$ctype" "$NEWNAME" ;;
-+    * ) metamail -b -p -c "$ctype" "$TMPDIR/$NEWNAME" ;;
-+esac
- 
--if ($status) then
-+if test $? -ne 0
-+then
- 	echo metamail failed
--	cd ${METAMAIL_TMPDIR}
-+	cd $METAMAIL_TMPDIR
- 	rm -rf $TMPDIR
--	exit -1
--endif
-+	exit 1
-+fi
- 
--if ($NEWNAME != $name) then
-+if test ! "$NEWNAME" = "$name"
-+then
- 	echo ""
--	echo The data just displayed is stored in the file $TMPDIR/$NEWNAME
-+	echo The data just displayed is stored in the file "$TMPDIR/$NEWNAME"
- 	echo "Do you want to delete it?"
--	rm -i $TMPDIR/$NEWNAME
--endif
-+	rm -i "$TMPDIR/$NEWNAME"
-+fi
- 
--if (! -e ${TMPDIR}/${NEWNAME}) then
--    cd ${METAMAIL_TMPDIR}
--    rmdir $TMPDIR
--endif
--exit 0
--
--cleanup:
--cd ${METAMAIL_TMPDIR}
--if (-e $TMPDIR) then    
--    rmdir $TMPDIR
--endif
--exit -1
-+if test ! -r "${TMPDIR}/${NEWNAME}"
-+then
-+	cd /
-+	cd $METAMAIL_TMPDIR
-+	rmdir $TMPDIR
-+fi
---- metamail-2.7.orig/bin/audiocompose
-+++ metamail-2.7/bin/audiocompose
-@@ -1,6 +1,4 @@
--#!/bin/csh -fb
--# (The "-fb" might need to be changed to "-f" on some systems)
--#
-+#!/bin/sh -e
- # Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
- # 
- # Permission to use, copy, modify, and distribute this material 
-@@ -13,64 +11,71 @@
- # MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
- # OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
- # WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
--#
- 
--if (! $?METAMAIL_TMPDIR) then
--    set METAMAIL_TMPDIR=/tmp
--endif
-+# Conversion from C shell to Bourne shell by Z-Code Software Corp.
-+# Conversion Copyright (c) 1992 Z-Code Software Corp.
-+# Permission to use, copy, modify, and distribute this material
-+# for any purpose and without fee is hereby granted, provided
-+# that the above copyright notice and this permission notice
-+# appear in all copies, and that the name of Z-Code Software not
-+# be used in advertising or publicity pertaining to this
-+# material without the specific, prior written permission
-+# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
- 
- # This is to make metamail/showaudio do playback on the speaker, not the phone.
--setenv AUDIOSPEAKERFORCE 1 
-+AUDIOSPEAKERFORCE=1; export AUDIOSPEAKERFORCE
- 
--if (-d /usr/sony) then
--    set dev=/dev/sb0
-+if test -d /usr/sony
-+then
-+	dev=/dev/sb0
- else
--    set dev=/dev/audio
--endif
-+	dev=/dev/audio
-+fi
- 
--set audiofile=$1
--if (-e $audiofile && ! -z $audiofile) goto whatnext
-+audiofile=$1
- 
--record:
--echo -n "Press RETURN when you are ready to start recording: "
--set foo = $<
--
--# THIS IS UNBELIEVABLY GRUBBY
--onintr cleanup
--if (! $?RECORD_AUDIO) then
--    (/bin/cat < $dev > $audiofile) &
-+if test -f "$audiofile" -a -s "$audiofile"
-+then
-+	whatnext=1
- else
--    ($RECORD_AUDIO > $audiofile) &
--endif
--jobs -l > ${METAMAIL_TMPDIR}/AUDCAT.$$
--set foo=`/bin/cat ${METAMAIL_TMPDIR}/AUDCAT.$$`
--/bin/rm ${METAMAIL_TMPDIR}/AUDCAT.$$
--set PID=$foo[2]
--echo -n "press RETURN when you are done recording: "
--set foo=$<
--echo One moment please...
--/bin/sleep 1
--echo -n Killing recording job...
--/bin/kill -9 $PID >& /dev/null
--
--whatnext:
--echo ""
--echo "What do you want to do?"
--echo ""
--echo "1 -- Listen to recorded message"
--echo "2 -- Replace with a new recording"
--echo "3 -- All Done, Quit"
--set which = $<
--    switch ("$which")
--        case 1:
--          cat $audiofile > $dev
--          breaksw
--        case 2:
--          goto record
--        case 3:
--          exit
--    endsw
--goto whatnext
--exit 0
--cleanup:
--kill -9 $PID >& /dev/null
-+	whatnext=0
-+fi
-+
-+while true
-+do
-+	if test $whatnext -eq 1
-+	then
-+		echo ""
-+		echo "What do you want to do?"
-+		echo ""
-+		echo "1 -- Listen to recorded message"
-+		echo "2 -- Replace with a new recording"
-+		echo "3 -- All Done, Quit"
-+		read which
-+		case $which in
-+			1) cat "$audiofile" > $dev ;;
-+			2) whatnext=0 ;;
-+			3) exit 0 ;;
-+		esac
-+	fi
-+	echo -n "Press RETURN when you are ready to start recording: "
-+	read foo
-+
-+	trap "kill -9 $! > /dev/null 2>&1" 1 2 15
-+	if test -z "$RECORD_AUDIO"
-+	then
-+		(cat < $dev > "$audiofile") &
-+	else
-+		($RECORD_AUDIO > "$audiofile") &
-+	fi
-+	echo -n "press RETURN when you are done recording: "
-+	read foo
-+	echo One moment please...
-+	/bin/sleep 1
-+	echo -n Killing recording job...
-+	/bin/kill -9 $! > /dev/null 2>&1
-+	whatnext=1
-+done
---- metamail-2.7.orig/bin/rcvAppleSingle
-+++ metamail-2.7/bin/rcvAppleSingle
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/sh -e
- #
- # Very simple shellscript to support recieving Macintosh files
- # and store them in a UNIX filesystem used by the CAP AUFS program.
---- metamail-2.7.orig/bin/sun-to-mime
-+++ metamail-2.7/bin/sun-to-mime
-@@ -1,14 +1,20 @@
--#!/bin/csh -fb
--# (The "-fb" might need to be changed to "-f" on some systems)
--#
--# Provide VERY minimal support for mail generated by Sun's Openwindows mailtool.
--# Basically, this lets you see the text part, but not much else...
-+#!/bin/sh -e
-+# This file Copyright (c) 1992 Z-Code Software Corp.
-+# Permission to use, copy, modify, and distribute this material
-+# for any purpose and without fee is hereby granted, provided
-+# that the above copyright notice and this permission notice
-+# appear in all copies, and that the name of Z-Code Software not
-+# be used in advertising or publicity pertaining to this
-+# material without the specific, prior written permission
-+# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
- 
--if (! $?METAMAIL_TMPDIR) then
--    set METAMAIL_TMPDIR=/tmp
--endif
-+# Brought into line with metamail 2.7 beta release Csh version
-+#    Dave Shield	February 1994
- 
--set TMPFILE=${METAMAIL_TMPDIR}/suntomime.$$
-+TMPFILE=`tempfile -p metamail -m 600`
- echo "Content-type: multipart/mixed; boundary=--------" > $TMPFILE
- echo "" >> $TMPFILE
- sed -e 's/X-Sun-Data-Type:/Content-type:/' >> $TMPFILE < $1
---- metamail-2.7.orig/bin/getfilename
-+++ metamail-2.7/bin/getfilename
-@@ -1,16 +1,36 @@
--#!/bin/csh -fb
--# (The "-fb" might need to be changed to "-f" on some systems)
--#
-+#!/bin/sh -e
-+# Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+# 
-+# Permission to use, copy, modify, and distribute this material 
-+# for any purpose and without fee is hereby granted, provided 
-+# that the above copyright notice and this permission notice 
-+# appear in all copies, and that the name of Bellcore not be 
-+# used in advertising or publicity pertaining to this 
-+# material without the specific, prior written permission 
-+# of an authorized representative of Bellcore.  BELLCORE 
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+# Conversion from C shell to Bourne shell by Z-Code Software Corp.
-+# Conversion Copyright (c) 1992 Z-Code Software Corp.
-+# Permission to use, copy, modify, and distribute this material
-+# for any purpose and without fee is hereby granted, provided
-+# that the above copyright notice and this permission notice
-+# appear in all copies, and that the name of Z-Code Software not
-+# be used in advertising or publicity pertaining to this
-+# material without the specific, prior written permission
-+# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
- 
- echo -n "Enter the name of a file in '$1' format: "
--set fnam=$<
--if ("" == "$fnam") then
--    echo Aborted
--    exit -1
--endif
--if (! -r  $fnam) then
--    echo No such file
--    exit -1
--endif
--cp $fnam $2
--exit 0
-+read fnam
-+if test ! -r "$fnam"
-+then
-+	echo No such file
-+	exit 1
-+fi
-+
-+cp "$fnam" "$2"
---- metamail-2.7.orig/bin/extcompose
-+++ metamail-2.7/bin/extcompose
-@@ -1,103 +1,126 @@
--#!/bin/csh -fb
--# (The "-fb" might need to be changed to "-f" on some systems)
--#
--
--if ($#argv < 1) then
--    echo "Usage:  extcompose output-file-name"
-+#!/bin/sh -e
-+# This file Copyright (c) 1992 Z-Code Software Corp.
-+# Permission to use, copy, modify, and distribute this material
-+# for any purpose and without fee is hereby granted, provided
-+# that the above copyright notice and this permission notice
-+# appear in all copies, and that the name of Z-Code Software not
-+# be used in advertising or publicity pertaining to this
-+# material without the specific, prior written permission
-+# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+if [ $# -lt 1 ]
-+then
-+    echo "Usage:  $0 output-file-name" 1>&2
-     exit 1
--endif
--set OUTFNAME=$1
-+fi
-+OUTFNAME=$1
-+
-+choosing=yes
-+while [ $choosing = yes ]
-+do
-+    echo ""
-+    echo "Where is the external data that you want this mail message to reference?"
-+    echo "    1 -- In a local file"
-+    echo "    2 -- In an AFS file"
-+    echo "    3 -- In an anonymous FTP directory on the Internet"
-+    echo "    4 -- In an Internet FTP directory that requires a valid login"
-+    echo "    5 -- Under the control of a mail server that will send the data on request"
-+    echo ""
-+    echo -n "Please enter a number from 1 to 5: \c"
-+    read ans
-+    case "$ans" in
-+        1) accesstype=local-file ;;
-+	2) accesstype=afs ;;
-+	3) accesstype=anon-ftp ;;
-+	4) accesstype=ftp ;;
-+	5) accesstype=mail-server ;;
-+	* ) echo "That is NOT one of your choices." 1>&2; continue ;;
-+    esac
-+
-+    case "$accesstype" in
-+        ftp | anon-ftp )
-+	    echo -n "Enter the full Internet domain name of the FTP site: "
-+	    read site
-+	    echo -n "Enter the name of the directory containing the file (RETURN for top-level): "
-+	    read directory
-+	    echo -n "Enter the name of the file itself: "
-+	    read name
-+	    echo -n "Enter the transfer mode (type 'image' for binary data, RETURN otherwise): "
-+	    read mode
-+	    if [ -n "$mode" ]
-+	    then mode=ascii
-+	    fi
-+	    echo "Content-type: message/external-body; access-type=$accesstype; name="\"$name\"\; > "$OUTFNAME"
-+	    echo -n "    site="\"$site\" >> "$OUTFNAME"
-+	    if [ -n "$directory" ]
-+	    then echo -n "; directory="\"$directory\">> "$OUTFNAME"
-+	    fi
-+	    echo -n "; mode="\"$mode\">> "$OUTFNAME"
-+	    echo "">> "$OUTFNAME"
-+	    choosing=no
-+	    ;;
- 
--chooseaccesstype:
--echo ""
--echo "Where is the external data that you want this mail message to reference?"
--echo "    1 -- In a local file"
--echo "    2 -- In an AFS file"
--echo "    3 -- In an anonymous FTP directory on the Internet"
--echo "    4 -- In an Internet FTP directory that requires a valid login"
--echo "    5 -- Under the control of a mail server that will send the data on request"
--echo ""
--echo -n "Please enter a number from 1 to 5: "
--set ans=$<
--if ($ans == 1)  then
--    set accesstype=local-file
--else if ($ans == 2) then
--    set accesstype=afs
--else if ($ans == 3) then
--    set accesstype=anon-ftp
--else if ($ans == 4) then
--    set accesstype=ftp
--else if ($ans == 5) then
--    set accesstype=mail-server
--else
--    echo "That is NOT one of your choices."
--    goto chooseaccesstype
--endif
--if ($accesstype == "ftp" || $accesstype == "anon-ftp") then
--    echo -n "Enter the full Internet domain name of the FTP site: "
--    set site=$<
--    echo -n "Enter the name of the directory containing the file (RETURN for top-level): "
--    set directory=$<
--    echo -n "Enter the name of the file itself: "
--    set name = $<
--    echo -n "Enter the transfer mode (type 'image' for binary data, RETURN otherwise): "
--    set mode = $<
--    if ($mode == "") set mode=ascii
--    echo "Content-type: message/external-body; access-type=$accesstype; name="\"$name\"\; > $OUTFNAME
--    echo -n "    site="\"$site\" >> $OUTFNAME
--    if ($directory != "") echo -n "; directory="\"$directory\">> $OUTFNAME
--    if ($mode != "") echo -n "; mode="\"$mode\">> $OUTFNAME
--    echo "">> $OUTFNAME
--else if ($accesstype == "local-file" || $accesstype == "afs") then
--fname:
--    echo -n "Enter the full path name for the file: "
--    set name = $<
--    if (! -e $name) then
--	echo "The file $name does not seem to exist."
--	goto fname
--    endif
--    echo "Content-type: message/external-body; access-type=$accesstype; name="\"$name\"> $OUTFNAME
--else if ($accesstype == "mail-server") then
--    echo -n "Enter the full email address for the mailserver: "
--    set server=$<
--    echo "Content-type: message/external-body; access-type=$accesstype; server="\"$server\"> $OUTFNAME
--else
--    echo accesstype $accesstype not yet implemented
--    goto chooseaccesstype
--endif
-+	local-file | afs )
-+	    name=
-+	    while [ -z "$name" ]
-+	    do
-+	        echo -n "Enter the full path name for the file: "
-+		read name
-+		if [ ! -f "$name" ]
-+		then
-+		    echo "The file $name does not seem to exist."
-+		    name=
-+		fi
-+	    done
-+	    echo "Content-type: message/external-body; access-type=$accesstype; name="\"$name\"> "$OUTFNAME"
-+	    choosing=no
-+	    ;;
-+	
-+	mail-server )
-+	    echo -n "Enter the full email address for the mailserver: "
-+	    read server
-+	    echo "Content-type: message/external-body; access-type=$accesstype; server="\"$server\"> "$OUTFNAME"
-+	    choosing=no
-+	    ;;
-+	
-+	* )
-+	    echo accesstype "$accesstype" not yet implemented
-+	    ;;
-+    esac
-+done
- 
- echo -n "Please enter the MIME content-type for the externally referenced data: "
--set ctype = $<
--getcenc:
--echo "Is this data already encoded for email transport?"
--echo "  1 -- No, it is not encoded"
--echo "  2 -- Yes, it is encoded in base64"
--echo "  3 -- Yes, it is encoded in quoted-printable"
--echo "  4 -- Yes, it is encoded using uuencode"
--set encode=$<
--switch ("$encode")
--    case 1:
--        set cenc=""
--        breaksw
--    case 2:
--        set cenc="base64"
--        breaksw
--    case 3:
--        set cenc="quoted-printable"
--        breaksw
--    case 4:
--        set cenc="x-uue"
--        breaksw
--    default:
--        echo "That is not one of your choices."
--        goto getcenc
--endsw
--echo "" >> $OUTFNAME
--echo "Content-type: " $ctype >> $OUTFNAME
--if ($cenc != "") echo "Content-transfer-encoding: " $cenc >> $OUTFNAME
--echo "" >> $OUTFNAME
--if ($accesstype == "mail-server") then
-+read ctype
-+
-+choosing=yes
-+while [ $choosing = yes ]
-+do
-+    echo "Is this data already encoded for email transport?"
-+    echo "  1 -- No, it is not encoded"
-+    echo "  2 -- Yes, it is encoded in base64"
-+    echo "  3 -- Yes, it is encoded in quoted-printable"
-+    echo "  4 -- Yes, it is encoded using uuencode"
-+    read encode
-+    case "$encode" in
-+	1 ) cenc="" choosing=no ;;
-+	2 ) cenc="base64" choosing=no ;;
-+	3 ) cenc="quoted-printable" choosing=no ;;
-+	4 ) cenc="x-uue" choosing=no ;;
-+	* ) echo "That is not one of your choices." ;;
-+    esac
-+done
-+
-+echo >> "$OUTFNAME"
-+echo "Content-type: " "$ctype" >> "$OUTFNAME"
-+if [ -n "$cenc" ]
-+then echo "Content-transfer-encoding: " "$cenc" >> "$OUTFNAME"
-+fi
-+echo >> "$OUTFNAME"
-+if [ "$accesstype" = "mail-server" ]
-+then
-     echo "Please enter all the data to be sent to the mailserver in the message body, "
-     echo "ending with ^D or your usual end-of-data character:"
--    cat >> $OUTFNAME
--endif
-+    cat >> "$OUTFNAME"
-+fi
---- metamail-2.7.orig/bin/mailserver
-+++ metamail-2.7/bin/mailserver
-@@ -1,4 +1,4 @@
--#!/bin/csh -fb
-+#!/bin/csh -efb
- # (The "-fb" might need to be changed to "-f" on some systems)
- #
- # Mailserver -- a simple MIME mailserver script.
-@@ -18,17 +18,15 @@
- set LOCALADDR=mail-server
- set ROOTDIR=/usr/spool/ftp
- set MAINTAINER=postmaster
--set METAMAILDIR=/usr/local/bin
- set LOGADDR=andrew@thumper.bellcore.com
- # If LOGADDR is the empty string, no logging is done.
- #
- # The real program begins here.
- 
--setenv PATH ${METAMAILDIR}:${PATH}
- rehash
- set FromName=""
- set Subject=""
--set TmpFile=/tmp/ms.$$
-+set TmpFile=`tempfile -p metamail -m 600`
- set FOORAW=$<
- while ("$FOORAW" != "") 
- set FOO=(` echo "$FOORAW" | tr "[" "x"`)
-@@ -68,7 +66,7 @@
- probably run in some circumstance other than mail delivery.
- --------------------
- !
--	cat $TmpFile - | /usr/lib/sendmail $MAINTAINER
-+	cat $TmpFile - | /usr/sbin/sendmail $MAINTAINER
- 	# Takes the rest of the message from standard input
- 	rm $TmpFile
- 	exit 0
-@@ -86,7 +84,7 @@
- 
- The file you requested, if it exists, will not be sent to you.
- !
--	/usr/lib/sendmail -t < $TmpFile
-+	/usr/sbin/sendmail -t < $TmpFile
- 	rm $TmpFile
- 	exit 0
- endif
-@@ -107,7 +105,7 @@
- --------------------------------
- !
- 	ls -R >> $TmpFile
--	/usr/lib/sendmail -t < $TmpFile
-+	/usr/sbin/sendmail -t < $TmpFile
- 	rm $TmpFile
- 	exit 0
- endif
-@@ -135,13 +133,13 @@
-   metasend -b -t "$FromName" -f "$Subject" -m "$ct" -s "Re: $Subject"
- 
- !
--	/usr/lib/sendmail -t < $TmpFile
-+	/usr/sbin/sendmail -t < $TmpFile
- 	rm $TmpFile
- 	exit 0
- endif
- 
- if ("$LOGADDR" != "") then
--	/usr/lib/sendmail -t <<!
-+	/usr/sbin/sendmail -t <<!
- From: ${LOCALADDR}@`hostname`
- To: $LOGADDR
- Subject: Autosend delivery report
---- metamail-2.7.orig/bin/sndAppleSingle
-+++ metamail-2.7/bin/sndAppleSingle
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/sh -e
- #
- # Very simple shellscript to support sending Macintosh files
- # which are stored in a UNIX filesystem by the CAP AUFS program.
---- metamail-2.7.orig/bin/sun2mime
-+++ metamail-2.7/bin/sun2mime
-@@ -1,4 +1,4 @@
--#!/bin/sh -f
-+#!/bin/sh -e
- #
- # This is sun2mime.  It makes a bold attempt to transform a Sun mailtool message into
- # MIME format.
-@@ -6,12 +6,9 @@
- # This program is for use with sun-message which takes an arg to figure out how
- # (or if) the message is encoded.
- #
--if [ x$METAMAIL_TMPDIR = x ]; then
--    METAMAIL_TMPDIR=/tmp
--fi
--TMPFILE=${METAMAIL_TMPDIR}/suntomime.$$
-+TMPFILE=`tempfile -p metamail -m 600`
- 
--/bin/nawk '
-+nawk '
-   BEGIN { printf("Content-type: multipart/mixed; boundary=--------\n\n")
-           RS=""; FS="\n"; mode="HEADER" }
-   mode == "HEADER" {
-@@ -36,8 +33,8 @@
-       print
-   }
-   END { printf("----------\n") }
--' $1 > $TMPFILE
-+' "$1" > $TMPFILE
- 
- metamail -z $TMPFILE
--rm -f $TMPFILE
--
-+rm $TMPFILE
-+exit 0
---- metamail-2.7.orig/bin/sun-audio-file
-+++ metamail-2.7/bin/sun-audio-file
-@@ -1,12 +1,20 @@
--#!/bin/csh -fb
--# (The "-fb" might need to be changed to "-f" on some systems)
--#
-+#!/bin/sh -e
-+# This file Copyright (c) 1992 Z-Code Software Corp.
-+# Permission to use, copy, modify, and distribute this material
-+# for any purpose and without fee is hereby granted, provided
-+# that the above copyright notice and this permission notice
-+# appear in all copies, and that the name of Z-Code Software not
-+# be used in advertising or publicity pertaining to this
-+# material without the specific, prior written permission
-+# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
- 
--if (! $?METAMAIL_TMPDIR) then
--    set METAMAIL_TMPDIR=/tmp
--endif
-+# Brought into line with metamail 2.7 beta release Csh version
-+#    Dave Shield	February 1994
- 
--cd ${METAMAIL_TMPDIR}
--uudecode < $1
--audiotool audio-file
--rm -f audio-file $1
-+audio-file=`tempfile -p metamail -m 600`
-+uudecode -o $audio-file "$1"
-+audiotool $audio-file
-+rm $audio-file "$1"
---- metamail-2.7.orig/bin/uudepipe
-+++ metamail-2.7/bin/uudepipe
-@@ -0,0 +1,13 @@
-+#!/bin/sh -e
-+# This file Copyright (c) 1992 Z-Code Software Corp.
-+# Permission to use, copy, modify, and distribute this material
-+# for any purpose and without fee is hereby granted, provided
-+# that the above copyright notice and this permission notice
-+# appear in all copies, and that the name of Z-Code Software not
-+# be used in advertising or publicity pertaining to this
-+# material without the specific, prior written permission
-+# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+uudecode -o /dev/stdout -- ${1+"$1"}
---- metamail-2.7.orig/bin/uuenpipe
-+++ metamail-2.7/bin/uuenpipe
-@@ -0,0 +1,13 @@
-+#!/bin/sh -e
-+# This file Copyright (c) 1992 Z-Code Software Corp.
-+# Permission to use, copy, modify, and distribute this material
-+# for any purpose and without fee is hereby granted, provided
-+# that the above copyright notice and this permission notice
-+# appear in all copies, and that the name of Z-Code Software not
-+# be used in advertising or publicity pertaining to this
-+# material without the specific, prior written permission
-+# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+uuencode -- ${1+"$1"} "$(basename "${1-UUPIPEOUT}")"
---- metamail-2.7.orig/bin/sun-message
-+++ metamail-2.7/bin/sun-message
-@@ -0,0 +1,56 @@
-+#!/bin/sh -e
-+#
-+#  This is sun-message.
-+#  It looks at $2 to figure out how to decode $1,
-+#  then gives the user a short menu of choices:
-+#    display, save or quit.
-+
-+if [ "$2" = "uuencode" ]
-+then 
-+	fn=`tempfile -p metamail -m 600`
-+	uudecode -o $fn "$1"
-+
-+	echo "The following file was uudecoded:"
-+	echo
-+
-+	defans=1
-+	while :
-+	do
-+		ls -l $fn
-+
-+		echo
-+		echo "Please choose one:"
-+		echo
-+		echo "1 -- Display it as ASCII text"
-+		echo "2 -- Save it as a file"
-+		echo "3 -- Quit this menu"
-+		echo
-+		echo -n "Which do you prefer (1 - 3)? [$defans] "
-+
-+		read ans
-+		if test -z "${ans:-}"
-+		then
-+			ans=$defans
-+		fi
-+
-+		case $ans in
-+			1)	sensible-pager $fn ;;
-+			2)	echo -n "Save as: $HOME/"
-+				read nfn
-+				if test ! -z "${nfn:-}"
-+				then
-+					cp $fn "$HOME/$nfn"
-+				else
-+					echo Not Saved.
-+				fi
-+				;;
-+			3)	rm "$1" $fn
-+				exit 0
-+				;;
-+			*)	echo Invalid choice. ;;
-+		esac
-+		defans=3
-+	done
-+else
-+	sensible-pager "$1"
-+fi
---- metamail-2.7.orig/bin/shownonascii
-+++ metamail-2.7/bin/shownonascii
-@@ -0,0 +1,104 @@
-+#!/bin/sh -e
-+# Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+# 
-+# Permission to use, copy, modify, and distribute this material 
-+# for any purpose and without fee is hereby granted, provided 
-+# that the above copyright notice and this permission notice 
-+# appear in all copies, and that the name of Bellcore not be 
-+# used in advertising or publicity pertaining to this 
-+# material without the specific, prior written permission 
-+# of an authorized representative of Bellcore.  BELLCORE 
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+# Conversion from C shell to Bourne shell by Z-Code Software Corp.
-+# Conversion Copyright (c) 1992 Z-Code Software Corp.
-+# Permission to use, copy, modify, and distribute this material
-+# for any purpose and without fee is hereby granted, provided
-+# that the above copyright notice and this permission notice
-+# appear in all copies, and that the name of Z-Code Software not
-+# be used in advertising or publicity pertaining to this
-+# material without the specific, prior written permission
-+# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+# Brought into line with metamail 2.7 beta release Csh version
-+#    Dave Shield	February 1994
-+
-+MYFONTDIR=/usr/lib/X11/fonts/misc
-+
-+CHARSET=$1
-+shift
-+
-+if test "$1" = "-e"
-+then
-+	shift
-+	CMD="$*"
-+	RIGHTTERMCMD="$*"
-+else
-+	CMD="more $* /dev/null"
-+	RIGHTTERMCMD="more $*"
-+fi
-+
-+if test ! -z "${MM_CHARSET:-}"
-+then
-+	if test "$MM_CHARSET" = "$CHARSET"
-+	then
-+		$RIGHTTERMCMD
-+		exit 0
-+	fi
-+fi
-+for f in "${MM_AUXCHARSETS:-}"
-+do
-+	if test "$f" = "$CHARSET"
-+	then
-+		$RIGHTTERMCMD
-+		exit 0
-+	fi
-+done
-+
-+if test ! -d "$MYFONTDIR"
-+then
-+	echo This message contains non-ASCII text, but the $CHARSET font
-+	echo has not yet been installed on this machine.  What follows
-+	echo "may be partially unreadable, but the English (ASCII) parts"
-+	echo "should still be readable."
-+	cat $*
-+	exit 0
-+fi
-+
-+if test -z "${DISPLAY:-}"
-+then
-+	echo This message contains non-ASCII text, which can only be displayed
-+	echo properly if you are running X11.  What follows
-+	echo "may be partially unreadable, but the English (ASCII) parts"
-+	echo "should still be readable."
-+	cat $*
-+	exit 0
-+fi
-+
-+#
-+# Do we have a font server?
-+#
-+if xset q | grep -q tcp/localhost:7100
-+then
-+    echo Your font path appears to be correctly set.
-+else
-+	if xset q | grep -q $MYFONTDIR
-+	then
-+	    echo Your font path appears to be correctly set.
-+	else
-+	    echo Adding $MYFONTDIR to your font path.
-+	    xset +fp "$MYFONTDIR"
-+	fi
-+fi
-+
-+echo Running xterm to display text in $CHARSET, please wait...
-+
-+# Bogus -- need to unsetenv MM_NOTTTY, but can't in Bourne shell.  --bobg.
-+MM_NOTTTY=''
-+XCHARSET=\*`echo $CHARSET | sed -e s/iso-/iso/`
-+xterm -fn $XCHARSET -e $CMD
---- metamail-2.7.orig/bin/Makefile.am
-+++ metamail-2.7/bin/Makefile.am
-@@ -0,0 +1,9 @@
-+MAINTAINERCLEANFILES    = Makefile.in
-+
-+bin_SCRIPTS		= audiocompose audiosend extcompose getfilename \
-+			mailserver mailto-hebrew metasend mimeit \
-+			patch-metamail rcvAppleSingle showaudio showexternal \
-+			shownonascii showpartial showpicture sndAppleSingle \
-+			sun-audio-file sun-message sun-message.csh \
-+			sun-to-mime sun2mime uudepipe uuenpipe
-+
---- metamail-2.7.orig/bin/Makefile.in
-+++ metamail-2.7/bin/Makefile.in
-@@ -0,0 +1,217 @@
-+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+
-+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
-+bindir = @bindir@
-+sbindir = @sbindir@
-+libexecdir = @libexecdir@
-+datadir = @datadir@
-+sysconfdir = @sysconfdir@
-+sharedstatedir = @sharedstatedir@
-+localstatedir = @localstatedir@
-+libdir = @libdir@
-+infodir = @infodir@
-+mandir = @mandir@
-+includedir = @includedir@
-+oldincludedir = /usr/include
-+
-+DESTDIR =
-+
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+
-+top_builddir = ..
-+
-+ACLOCAL = @ACLOCAL@
-+AUTOCONF = @AUTOCONF@
-+AUTOMAKE = @AUTOMAKE@
-+AUTOHEADER = @AUTOHEADER@
-+
-+INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+transform = @program_transform_name@
-+
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+host_alias = @host_alias@
-+host_triplet = @host@
-+AS = @AS@
-+CATCOMMAND = @CATCOMMAND@
-+CC = @CC@
-+DLLTOOL = @DLLTOOL@
-+ECHO = @ECHO@
-+EXEEXT = @EXEEXT@
-+LIBTOOL = @LIBTOOL@
-+LIBTOOL_DEPS = @LIBTOOL_DEPS@
-+LN_S = @LN_S@
-+LPRCOMMAND = @LPRCOMMAND@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAKEINFO = @MAKEINFO@
-+OBJDUMP = @OBJDUMP@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+RANLIB = @RANLIB@
-+STRIP = @STRIP@
-+VERSION = @VERSION@
-+ac_aux_dir = @ac_aux_dir@
-+
-+MAINTAINERCLEANFILES = Makefile.in
-+
-+bin_SCRIPTS = audiocompose audiosend extcompose getfilename 			mailserver mailto-hebrew metasend mimeit 			patch-metamail rcvAppleSingle showaudio showexternal 			shownonascii showpartial showpicture sndAppleSingle 			sun-audio-file sun-message sun-message.csh 			sun-to-mime sun2mime uudepipe uuenpipe
-+
-+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-+CONFIG_HEADER = ../metamail/config.h
-+CONFIG_CLEAN_FILES = 
-+SCRIPTS =  $(bin_SCRIPTS)
-+
-+DIST_COMMON =  Makefile.am Makefile.in
-+
-+
-+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-+
-+TAR = tar
-+GZIP_ENV = --best
-+all: all-redirect
-+.SUFFIXES:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-+	cd $(top_srcdir) && $(AUTOMAKE) --foreign bin/Makefile
-+
-+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-+	cd $(top_builddir) \
-+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
-+
-+install-binSCRIPTS: $(bin_SCRIPTS)
-+	@$(NORMAL_INSTALL)
-+	$(mkinstalldirs) $(DESTDIR)$(bindir)
-+	@list='$(bin_SCRIPTS)'; for p in $$list; do \
-+	  if test -f $$p; then \
-+	    echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
-+	    $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
-+	  else if test -f $(srcdir)/$$p; then \
-+	    echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
-+	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
-+	  else :; fi; fi; \
-+	done
-+
-+uninstall-binSCRIPTS:
-+	@$(NORMAL_UNINSTALL)
-+	list='$(bin_SCRIPTS)'; for p in $$list; do \
-+	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
-+	done
-+tags: TAGS
-+TAGS:
-+
-+
-+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-+
-+subdir = bin
-+
-+distdir: $(DISTFILES)
-+	here=`cd $(top_builddir) && pwd`; \
-+	top_distdir=`cd $(top_distdir) && pwd`; \
-+	distdir=`cd $(distdir) && pwd`; \
-+	cd $(top_srcdir) \
-+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign bin/Makefile
-+	@for file in $(DISTFILES); do \
-+	  d=$(srcdir); \
-+	  if test -d $$d/$$file; then \
-+	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	  fi; \
-+	done
-+info-am:
-+info: info-am
-+dvi-am:
-+dvi: dvi-am
-+check-am: all-am
-+check: check-am
-+installcheck-am:
-+installcheck: installcheck-am
-+install-exec-am: install-binSCRIPTS
-+install-exec: install-exec-am
-+
-+install-data-am:
-+install-data: install-data-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+install: install-am
-+uninstall-am: uninstall-binSCRIPTS
-+uninstall: uninstall-am
-+all-am: Makefile $(SCRIPTS)
-+all-redirect: all-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-+installdirs:
-+	$(mkinstalldirs)  $(DESTDIR)$(bindir)
-+
-+
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+
-+maintainer-clean-generic:
-+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-+mostlyclean-am:  mostlyclean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+clean-am:  clean-generic mostlyclean-am
-+
-+clean: clean-am
-+
-+distclean-am:  distclean-generic clean-am
-+	-rm -f libtool
-+
-+distclean: distclean-am
-+
-+maintainer-clean-am:  maintainer-clean-generic distclean-am
-+	@echo "This command is intended for maintainers to use;"
-+	@echo "it deletes files that may require special tools to rebuild."
-+
-+maintainer-clean: maintainer-clean-am
-+
-+.PHONY: uninstall-binSCRIPTS install-binSCRIPTS tags distdir info-am \
-+info dvi-am dvi check check-am installcheck-am installcheck \
-+install-exec-am install-exec install-data-am install-data install-am \
-+install uninstall-am uninstall all-redirect all-am all installdirs \
-+mostlyclean-generic distclean-generic clean-generic \
-+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-+
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
---- metamail-2.7.orig/bin/mimeit
-+++ metamail-2.7/bin/mimeit
-@@ -0,0 +1,27 @@
-+#!/bin/sh -e
-+# mimeit - mail base64-encoded stdin
-+#    with content-type $1
-+#    to recipient $2
-+#    with subject $3
-+# All other arguments are passed on to splitmail 
-+
-+if [ $# -lt 3 ]; then
-+	echo "Usage: $0 <content-type> <recipient> <subject> [splitmail-options]" >&2
-+	exit 1
-+fi
-+
-+ct="$1"
-+to="$2"
-+sub="$3"
-+
-+shift
-+shift
-+shift
-+
-+( echo Mime-Version: 1.0 ; \
-+  echo Content-type: "$ct" ; \
-+  echo To: "$to" ; \
-+  echo Subject: "$sub" ; \
-+  echo Content-Transfer-Encoding: base64 ;
-+  echo "" ; \
-+  mimencode -b ) | splitmail -d $*
---- metamail-2.7.orig/bin/mailto-hebrew
-+++ metamail-2.7/bin/mailto-hebrew
-@@ -0,0 +1,76 @@
-+#!/bin/sh -e
-+# Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+# 
-+# Permission to use, copy, modify, and distribute this material 
-+# for any purpose and without fee is hereby granted, provided 
-+# that the above copyright notice and this permission notice 
-+# appear in all copies, and that the name of Bellcore not be 
-+# used in advertising or publicity pertaining to this 
-+# material without the specific, prior written permission 
-+# of an authorized representative of Bellcore.  BELLCORE 
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+# Conversion from C shell to Bourne shell
-+# by Bob Glickstein, Z-Code Software Corp.
-+# Conversion Copyright (c) 1992 Z-Code Software Corp. (Z-Code)
-+# Permission to use, copy, modify, and distribute this material
-+# for any purpose and without fee is hereby granted, provided
-+# that the above copyright notice and this permission notice
-+# appear in all copies, and that the name of Z-Code Software not
-+# be used in advertising or publicity pertaining to this
-+# material without the specific, prior written permission
-+# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+# Brought into line with metamail 2.7 beta release Csh version
-+#    Dave Shield	February 1994
-+
-+MYFONTDIR=/usr/lib/X11/fonts/misc
-+
-+if test ! -z "${MM_CHARSET:-}"
-+then
-+	if test "$MM_CHARSET" = iso-8859-8
-+	then
-+		mailto $*
-+		exit 0
-+	fi
-+fi
-+
-+if test ! -d "$MYFONTDIR"
-+then
-+	echo The Hebrew font has not been installed properly on this machine.
-+	exit 1
-+fi
-+
-+if test -z "${DISPLAY:-}"
-+then
-+	echo Hebrew mail may only be composed under X11 or on a Hebrew terminal.
-+	exit 1
-+fi
-+
-+#
-+# Do we have a font server?
-+#
-+FSGREP=`xset q | grep "tcp/localhost:7100"`
-+if test ! -z "${FSGREP:-}"
-+then
-+        FPGREP=`xset q | grep $MYFONTDIR`
-+        if test -z "${FPGREP:-}"
-+        then
-+            echo Adding $MYFONTDIR to your font path.
-+            xset +fp "$MYFONTDIR"
-+        else
-+            echo Your font path appears to be correctly set.
-+        fi
-+else
-+    echo Your font path appears to be correctly set.
-+fi
-+
-+echo Running xterm to compose mail in iso-8859-8, please wait...
-+
-+MM_CHARSET=iso-8859-8; export MM_CHARSET
-+xterm -fn \*iso-8859-8 -e mailto $*
---- metamail-2.7.orig/fonts/Makefile
-+++ metamail-2.7/fonts/Makefile
-@@ -10,7 +10,9 @@
- #FONTSUFFIX=fb
- #DIRBUILDER=bldfamily
- 
--all: shownonascii heb6x13.${FONTSUFFIX} heb8x13.${FONTSUFFIX} heb8x13B.${FONTSUFFIX} mailto-hebrew
-+RM=rm
-+
-+all: heb6x13.${FONTSUFFIX} heb8x13.${FONTSUFFIX} heb8x13B.${FONTSUFFIX}
- 
- heb6x13.${FONTSUFFIX}: heb6x13.bdf
- #	convertfont -o heb6x13 heb6x13.bdf
-@@ -36,4 +38,4 @@
- 	chmod +x mailto-hebrew
- 
- clean:
--	rm -f heb6x13.${FONTSUFFIX} heb8x13.${FONTSUFFIX} heb8x13B.${FONTSUFFIX}  shownonascii mailto-hebrew fonts.dir
-+	$(RM) -f heb6x13.${FONTSUFFIX} heb8x13.${FONTSUFFIX} heb8x13B.${FONTSUFFIX}  shownonascii mailto-hebrew fonts.dir
---- metamail-2.7.orig/fonts/Xshownonascii
-+++ metamail-2.7/fonts/Xshownonascii
-@@ -1,7 +1,7 @@
- #!/bin/csh -fb
- # (The "-fb" might need to be changed to "-f" on some systems)
- #
--set MYFONTDIR=/u/nsb/lib/fonts
-+set MYFONTDIR=/usr/lib/X11/fonts/misc
- 
- set CHARSET="$1"
- shift
---- metamail-2.7.orig/fonts/Xmailto-hebrew
-+++ metamail-2.7/fonts/Xmailto-hebrew
-@@ -1,7 +1,7 @@
- #!/bin/csh -fb
- # (The "-fb" might need to be changed to "-f" on some systems)
- #
--set MYFONTDIR=/u/nsb/lib/fonts
-+set MYFONTDIR=/usr/lib/X11/fonts/misc
- 
- if ($?MM_CHARSET) then
-     if ($MM_CHARSET == iso-8859-8) then
---- metamail-2.7.orig/man/metasend.1
-+++ metamail-2.7/man/metasend.1
-@@ -12,7 +12,7 @@
- 
- With no arguments, the program will ask the user for the To, Subject, and CC fields.  It will then ask for the name of a MIME content-type.  Next, it will ask the user for the name of an existing file containing that type of data.  After this, it will ask what encoding type, if any, should be applied to this data.  Finally, it  will ask if the user wants to  include information  from an additional file, in which case the last three questions will be repeated for  the next file.
- 
--Alternately, all of this information can be provided on the comand line, using the following options:
-+Alternately, all of this information can be provided on the command line, using the following options:
- 
-     -b -- specifies Batch (non-interactive) Mode.  Will exit with an error message if all additional needed information is not provided on the command line.
-     -c cc -- specifies the CC address
---- metamail-2.7.orig/man/mailto.1
-+++ metamail-2.7/man/mailto.1
-@@ -1,6 +1,6 @@
- .TH MAILTO 1 "Release 1" "Bellcore Prototype"
- .SH NAME
--mailto - Simple mutlimedia mail sending program
-+mailto - Simple multimedia mail sending program
- .SH SYNOPSIS
- .ta 8n
- \fBmailto\fP	[-a] [-c] [-s] [recipient name(s)]
-@@ -74,9 +74,9 @@
- 
- Basically, mailto can include the following things in mail:
- 
--1.  Simple formatted text, using the MIME type "text/richtext".  This allows you to add emphasis to your message using underlining, bold text, italic (diaplsyed as reverse video), centering, and the like.
-+1.  Simple formatted text, using the MIME type "text/richtext".  This allows you to add emphasis to your message using underlining, bold text, italic (displayed as reverse video), centering, and the like.
- 
--2.  Non-text data.  Metamail can include pictures, sounds, and other non-textual data in the middle of any mail message.  The mailcap configuration mechanism can even make this process reasonably user-friendly, but a knowledgable user can include non-textual data even in the absence of a proper mailcap entry.
-+2.  Non-text data.  Metamail can include pictures, sounds, and other non-textual data in the middle of any mail message.  The mailcap configuration mechanism can even make this process reasonably user-friendly, but a knowledgeable user can include non-textual data even in the absence of a proper mailcap entry.
- 
- 3.  Text including non-ASCII characters, such as Hebrew or Russian.  Currently, mailto directly supports only the ISO-8859-* family of character sets, which means that it does not meet the needs of Asian users, in particular.  However, languages that can not be expressed in the ISO-8859 family can still be included in the same way non-text data can be included.
- 
-@@ -230,7 +230,7 @@
-    dot -- controls whether or not a period alone on a line 
-         should be interpreted as terminating your mail
-    ignore -- controls whether or not interrupts are ignored
--   verbose -- controls the verbosity of output from /usr/lib/sendmail
-+   verbose -- controls the verbosity of output from /usr/sbin/sendmail
-    quiet -- controls the verbosity of output from the mailto program.
-    keepblind -- controls whether or not a 'blind' copy of the mail is kept.
-   commasonly -- controls whether or not a space character
-@@ -275,7 +275,7 @@
- 
- .I 
- Altered editing behavior:
--The ~e and ~v commands, which are used to edit the message being composed, will behave differently in mailto if the mail includes non-text portions.  In such cases, each part will be edited separately, in sequence, which makes it impossble for the user to accidentally mess up the inter-part boundaries.  Moreover, if the mailcap entry for a given data type includes an "edit" field, the user will be given the choice of editing with the program named there or editing with his usual (text) editor.  In most cases, this will be a choice between using a structured editor or editing the raw data stream.
-+The ~e and ~v commands, which are used to edit the message being composed, will behave differently in mailto if the mail includes non-text portions.  In such cases, each part will be edited separately, in sequence, which makes it impossible for the user to accidentally mess up the inter-part boundaries.  Moreover, if the mailcap entry for a given data type includes an "edit" field, the user will be given the choice of editing with the program named there or editing with his usual (text) editor.  In most cases, this will be a choice between using a structured editor or editing the raw data stream.
- 
- .I 
- Altered behavior for large messages:
-@@ -283,7 +283,7 @@
- 
- .I
- New -r command-line option 
--The -r comand-line option is not found in standard Berkeley mail.
-+The -r command line option is not found in standard Berkeley mail.
- 
- .SH SUMMARY OF OPTIONS
- -a <charset> -- specifies an alternate character set in use.  This had better be the one your terminal is actually using.  Currently it must be in the iso-8859 character set family.
---- metamail-2.7.orig/man/metamail.1
-+++ metamail-2.7/man/metamail.1
-@@ -38,6 +38,9 @@
- .B \-e 
- This option tells metamail to "eat" leading newlines in message bodies.  This is particularly useful for MH-format mail.
- .TP 8
-+.B \-E <contentencoding>
-+This option tells metamail to use the specified content transfer encoding rather than the one in the headers, if any.  
-+.TP 8
- .B \-f <address>
- This option specifies the name of the sender of the message.  Otherwise, this is determined from the header, if possible.  This information will be placed in the environment to make it available to any interpreters called by metamail.
- .TP 8
-@@ -63,7 +66,7 @@
- This option specifies that it is OK to run as root.  By default, metamail refuses to run if the real or effective user id is root.  You can get the same effect using the MM_RUNASROOT environment variable.
- .TP 8
- .B \-R
--This option specifies that the /usr/ucb/reset should be executed to reset the terminal state, before any other I/O activity.
-+This option specifies that the /usr/bin/reset should be executed to reset the terminal state, before any other I/O activity.
- .TP 8
- .B \-s <subject>  
- This option specifies the subject of the mail message.  By default, this information is obtained from the headers.  This information will be placed in the environment to make it available to any interpreters called by metamail.
-@@ -105,11 +108,13 @@
- 
- The default search path is equivalent to
- 
--$HOME/.mailcap:/usr/local/etc/mailcap:/usr/etc/mailcap:/etc/mailcap:/etc/mail/mailcap:/usr/public/lib/mailcap"
-+.na
-+$HOME/.mailcap:\:/usr/local/etc/mailcap:\:/usr/etc/mailcap:\:/etc/mailcap:\:/etc/mail/mailcap:\:/usr/public/lib/mailcap
-+.ad
- 
- It can be overridden by setting the MAILCAPS environment variable.  Note: Metamail does not actually interpret environment variables such as $HOME or the "~" syntax in this path search.
- 
--The format of mailcap files is explained in the manual entry for mailcap(4).
-+The format of mailcap files is explained in the manual entry for mailcap(5).
- 
- .SH NON-ASCII HEADER FIELDS
- Metamail has rudimentary built-in support for the emerging Internet standards for non-ASCII data in mail headers.  What this means is that such data will be recognized, decoded, and sent to the terminal.  This behavior may be more or less reasonable, depending on the character set in the header data and the capability of the user's terminal, but it will rarely be any worse than showing such data in its encoded form.
-@@ -199,7 +204,7 @@
- .SH FILES
- $HOME/.mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap -- default path for mailcap files.
- .SH SEE ALSO
--audiocompose(1), audiosend(1), ezview(1), getfilename(1), mailto-hebrew(1), mailto(1), metasend(1), mmencode(1), richtext(1), showaudio(1), showexternal(1), shownonascii(1), showpartial(1), showpicture(1), mailcap(4)
-+audiocompose(1), audiosend(1), ezview(1), getfilename(1), mailto-hebrew(1), mailto(1), metasend(1), mimencode(1), richtext(1), showaudio(1), showexternal(1), shownonascii(1), showpartial(1), showpicture(1), mailcap(5)
- .SH BUGS
- In a multipart/alternative body or body parts, some headers in the embedded part that should be displayed may not be displayed.  This will rarely be a problem.  Also, in a multipart/alternative, anything of type "multipart" or "message" is considered to be a recognized part, regardless of the recognizability of its contents.  This might be a problem, only further experience will tell.
- 
---- metamail-2.7.orig/man/mmencode.1
-+++ metamail-2.7/man/mmencode.1
-@@ -1,8 +1,6 @@
- .TH MIMENCODE 1 "Release 1" "Bellcore Prototype"
- .SH NAME
- mimencode - Translate to and from mail-oriented encoding formats
--
--(Same program also installed as "mmencode".)
- .SH SYNOPSIS
- .ta 8n
- \fBmimencode\fP	[-u] [-b] [-q] [-p] [file name] [-o outputfile]
-@@ -37,8 +35,6 @@
- for mail and news use.  The reason is simple:  uuencode doesn't work very well in a number of circumstances and ways.  In particular, uuencode uses characters that don't translate well across all mail gateways (particularly ASCII <-> EBCDIC gateways).  Also, uuencode is not standard -- there are several variants floating around, encoding and decoding things in different and incompatible ways, with no "standard" on which to base an implementation.  Finally, uuencode does not generally work well in a pipe, although some variants have been modified to do so.  Mimencode implements the encodings which were defined for MIME as uuencode replacements, and should be considerably more robust for email use.
- .SH SEE ALSO
- metamail(1), mailto(1)
--.SH BUGS
--This program was originally distributed as "mmencode".  That name turns out to conflict with a program of the same name that is part of the Slate software from BBN, but totally changing the name to mimencode would create other problems (notably with portability to systems where the left half of file names is limited to 8 characters).  Currently, it is being distributed with links under BOTH names.  The programs in the distribution that call the program all call it as "mimencode", so the "mmencode" version may be deleted at sites where it causes a problem.  (The source files are still named "mmencode" rather than "mimencode".)
- .SH COPYRIGHT
- Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
- 
---- metamail-2.7.orig/man/richtext.1
-+++ metamail-2.7/man/richtext.1
-@@ -6,6 +6,8 @@
- \fBrichtext\fP [
- .B \-c
- ] [
-+.B \-e
-+] [
- .B \-f
- ] [
- .B \-m
-@@ -53,6 +55,12 @@
- to just correct the raw richtext and write the corrected version to its
- standard output, without performing any formatting.
- .TP 8
-+.B \-e
-+This option directs
-+.I richtext
-+to interpret the input as MIME type text/enriched rather than text/richtext.
-+The text/enriched format is defined in RFC 1896.
-+.TP 8
- .B \-f
- This option directs
- .I richtext
---- metamail-2.7.orig/man/splitmail.1
-+++ metamail-2.7/man/splitmail.1
-@@ -8,23 +8,24 @@
- .SH DESCRIPTION
- The
- .I splitmail
--program will take an email message and break it up into smaller pieces using the "message/partial" type defined by MIME, the proposed Internet standard for multimedia mail formats.  
-+program will take an email message and break it up into smaller pieces using the "message/partial" type defined by MIME(1), the proposed Internet standard for multimedia mail formats.  
- 
- By default it will take the message either from standard input or the named file, and will produce a set of partial message files with names like "/tmp/split.1" for the first part, and so on.  The prefix "/tmp/split." can be overridden using the "-p" option.  
- 
--If the -d option is specified, the mail will actually be delivered.  If -v is specified, the verbose flag will be passed to sendmail.
-+If the -d option is specified, the mail will actually be delivered.  If -v is specified, the verbose flag will be passed to \fBsendmail\fR(8).
- 
--The -i option can be used to make splitmail generate the pieces with similar (but not identical) message-id fields, in a format which allows them to be easily correlated with one another and which end with the suffix provided on the command line after -i.
-+The -i option can be used to make \fBsplitmail\fR generate the pieces with similar (but not identical) message-id fields, in a format which allows them to be easily correlated with one another and which end with the suffix provided on the command line after -i.
- 
--The default chunk size for spliting messages is 250000 at most sites, though this is also a compile-time option.  This can be overriden with the -s switch, or with the environment variable SPLITSIZE.
-+The default chunk size for splitting messages is 250000 at most sites, though this is also a compile-time option.  This can be overridden with the -s switch, or with the environment variable SPLITSIZE.
- 
- Messages smaller than the chunk size will not be turned into partial messages, but will be written to a single file or delivered as a single message.
- .SH ENVIRONMENT
- SPLITSIZE overrides the default chunk size.  Setting SPLITSIZE to, say, 4000000 will effectively ensure that your messages are unlikely ever to be split, but it may cause them to be rejected by some mail transport software.
- .SH SEE ALSO
--mailto(1), metamail(1)
-+.PP
-+\fBmailto\fR(1), \fBmetamail\fR(1), \fBMIME\fR(1), \fBmunpack\fR(1)
- .SH BUGS
--If the size of the input is just on the fencepost, and if it is coming from a file rather than standard input, splitmail will sometimes estimate the number of parts wrong and will have to write out an extra part.  This is harmless but annoying.  It is especially annoying if the estimate was 2 but the real number was 1.
-+If the size of the input is just on the fencepost, and if it is coming from a file rather than standard input, \fBsplitmail\fR will sometimes estimate the number of parts wrong and will have to write out an extra part.  This is harmless but annoying.  It is especially annoying if the estimate was 2 but the real number was 1.
- .SH COPYRIGHT
- Copyright (c) 1992 Bell Communications Research, Inc. (Bellcore)
- 
---- metamail-2.7.orig/man/patch-metamail.1
-+++ metamail-2.7/man/patch-metamail.1
-@@ -8,7 +8,7 @@
- .SH DESCRIPTION
- The
- .I patch-metamail
--program will attempt to retreive a patch file for the metamail distribution, using anonymous ftp to a trusted server, and then install that patch in your local copy of the distribution.
-+program will attempt to retrieve a patch file for the metamail distribution, using anonymous ftp to a trusted server, and then install that patch in your local copy of the distribution.
- 
- The first two arguments, which are required, are the root directory of your local copy of the metamail source directory, and the patch number.  The former is site-dependent, the latter is patch-dependent.
- 
---- metamail-2.7.orig/man/mailcap.4
-+++ metamail-2.7/man/mailcap.4
-@@ -20,13 +20,9 @@
- 
- can be used to indicate that the output of the 'cat' command may be voluminous, requiring either a scrolling window, a pager, or some other appropriate coping mechanism.
- 
--The "type" field (text/plain, in the above example) is simply any legal content type name, as defined by RFC 822.  In practice, this is almost any string.  It is the string that will be matched against the "Content-type" header (or the value passed in with -c) to decide if this is the mailcap entry that matches the current message.  Additionally, the type field may specify a subtype (e.g. "text/ISO-8859-1") or a wildcard to match all subtypes (e.g. "image/*").
-+The "type" field (text/plain, in the above example) is simply any legal content type name, as defined by informational RFC 1524.  In practice, this is almost any string.  It is the string that will be matched against the "Content-type" header (or the value passed in with -c) to decide if this is the mailcap entry that matches the current message.  Additionally, the type field may specify a subtype (e.g. "text/ISO-8859-1") or a wildcard to match all subtypes (e.g. "image/*").
- 
--The "command" field is any UNIX command ("cat %s" in the above example), and is used to specify the interpreter for the given type of message.  It will be passed to the shell via the system(3) facility.  Semicolons and backslashes within the command must be quoted with backslashes.  If the command contains "%s", those two characters will be replaced by the name of a file that contains the body of the message. If it contains "%t', those two characters will be replaced by the content-type field, including the subtype, if any.  (That is, if the content-type was "image/pbm; opt1=something-else", then "%t" would be replaced by "image/pbm".)   If the command field contains  "%{" followed by a parameter name and a closing "}", then all those characters will be replaced by the value of the named parameter, if any, from the Content-type header.   Thus, in the previous example, "%{opt1}" will be replaced by "something-else".  Finally, if the command contains "\%", those two characters will be replaced by a single % ch
--
--
--
--aracter.  (In fact, the backslash can be used to quote any character, including itself.)
-+The "command" field is any UNIX command ("cat %s" in the above example), and is used to specify the interpreter for the given type of message.  It will be passed to the shell via the system(3) facility.  Semicolons and backslashes within the command must be quoted with backslashes.  If the command contains "%s", those two characters will be replaced by the name of a file that contains the body of the message. If it contains "%t', those two characters will be replaced by the content-type field, including the subtype, if any.  (That is, if the content-type was "image/pbm; opt1=something-else", then "%t" would be replaced by "image/pbm".)   If the command field contains  "%{" followed by a parameter name and a closing "}", then all those characters will be replaced by the value of the named parameter, if any, from the Content-type header.   Thus, in the previous example, "%{opt1}" will be replaced by "something-else".  Finally, if the command contains "\%", those two characters will be replaced by a single % character.  (In fact, the backslash can be used to quote any character, including itself.)
- 
- If no "%s" appears in the command field, then instead of placing the message body in a temporary file, metamail will pass the body to the command on the standard input.  This is helpful in saving /tmp file space, but can be problematic for window-oriented applications under some window systems such as MGR.
- 
---- metamail-2.7.orig/man/uuenpipe.1
-+++ metamail-2.7/man/uuenpipe.1
-@@ -0,0 +1,44 @@
-+.TH UUENPIPE 1 "1998 March 2nd" "METAMAIL" "Debian Linux Manual"
-+.SH NAME
-+uuenpipe \- uuencode a file
-+.SH SYNOPSIS
-+.B uuenpipe
-+.RI [ filename ]
-+.SH "DESCRIPTION"
-+This manual page documents briefly the
-+.B uuenpipe
-+command.
-+This manual page was written for the
-+.B Debian GNU/Linux
-+distribution (but may be used by others), because the original
-+program does not have a manual page.
-+.PP
-+.B uuenpipe
-+uuencodes
-+.I filename
-+(or the standard input if
-+.I filename
-+were not supplied) and prints the result to the standard output.
-+When
-+.I filename
-+is supplied,
-+.B uuenpipe
-+acts as if the following command were invoked.
-+.IP
-+.NF
-+uuencode
-+.I filename
-+.I filename
-+.FI
-+.LP
-+Otherwise, it would act according to the behaviour of the next
-+command.
-+.IP
-+.NF
-+uuencode
-+.I UUPIPEOUT
-+.FI
-+.LP
-+.SH AUTHOR
-+.B uuenpipe
-+is part of mm package.  Manual page added by Herbert Xu.
---- metamail-2.7.orig/man/uudepipe.1
-+++ metamail-2.7/man/uudepipe.1
-@@ -0,0 +1,24 @@
-+.TH UUDEPIPE 1 "1998 March 2nd" "METAMAIL" "Debian Linux Manual"
-+.SH NAME
-+uudepipe \- uudecode a file
-+.SH SYNOPSIS
-+.B uudepipe
-+.RI [ filename ]
-+.SH "DESCRIPTION"
-+This manual page documents briefly the
-+.B uudepipe
-+command.
-+This manual page was written for the
-+.B Debian GNU/Linux
-+distribution (but may be used by others), because the original
-+program does not have a manual page.
-+.PP
-+.B uudepipe
-+uudecodes
-+.I filename
-+(or the standard input if
-+.I filename
-+were not supplied) and prints the result to the standard output.
-+.SH AUTHOR
-+.B uudepipe
-+is part of mm package.  Manual page added by Herbert Xu.
---- metamail-2.7.orig/man/mailcap.5
-+++ metamail-2.7/man/mailcap.5
-@@ -0,0 +1,69 @@
-+.TH MAILCAP 5 "Release 2" "Bellcore Prototype"
-+.SH NAME
-+mailcap - metamail capabilities file
-+.SH DESCRIPTION
-+The
-+.I mailcap
-+file is read by the 
-+.I metamail
-+program to determine how to display non-text at the local site.
-+
-+The syntax of a mailcap file is quite simple, at least compared to termcap files.  Any line that starts with "#" is a comment.  Blank lines are ignored.  Otherwise, each line defines a single mailcap entry for a single content type.  Long lines may be continued by ending them with a backslash character, \\.
-+
-+Each individual mailcap entry consists of a content-type specification, a command to execute, and (possibly) a set of optional "flag" values.  For example, a very simple mailcap entry (which is actually a built-in default behavior for metamail) would look like this:
-+
-+text/plain; cat %s
-+
-+The optional flags can be used to specify additional information about the mail-handling command.  For example:
-+
-+text/plain; cat %s; copiousoutput
-+
-+can be used to indicate that the output of the 'cat' command may be voluminous, requiring either a scrolling window, a pager, or some other appropriate coping mechanism.
-+
-+The "type" field (text/plain, in the above example) is simply any legal content type name, as defined by informational RFC 1524.  In practice, this is almost any string.  It is the string that will be matched against the "Content-type" header (or the value passed in with -c) to decide if this is the mailcap entry that matches the current message.  Additionally, the type field may specify a subtype (e.g. "text/ISO-8859-1") or a wildcard to match all subtypes (e.g. "image/*").
-+
-+The "command" field is any UNIX command ("cat %s" in the above example), and is used to specify the interpreter for the given type of message.  It will be passed to the shell via the system(3) facility.  Semicolons and backslashes within the command must be quoted with backslashes.  If the command contains "%s", those two characters will be replaced by the name of a file that contains the body of the message. If it contains "%t', those two characters will be replaced by the content-type field, including the subtype, if any.  (That is, if the content-type was "image/pbm; opt1=something-else", then "%t" would be replaced by "image/pbm".)   If the command field contains  "%{" followed by a parameter name and a closing "}", then all those characters will be replaced by the value of the named parameter, if any, from the Content-type header.   Thus, in the previous example, "%{opt1}" will be replaced by "something-else".  Finally, if the command contains "\%", those two characters will be replaced by a single % character.  (In fact, the backslash can be used to quote any character, including itself.)
-+
-+If no "%s" appears in the command field, then instead of placing the message body in a temporary file, metamail will pass the body to the command on the standard input.  This is helpful in saving /tmp file space, but can be problematic for window-oriented applications under some window systems such as MGR.
-+
-+Two special codes can appear in the viewing command for objects of type multipart (any subtype).  These are "%n" and "%F".  %n will be replaced by the number of parts within the multipart object.  %F will be replaced by a series of arguments, two for each part, giving first the content-type and then the name of the temporary file where the decoded part has been stored.  In addition, for each file created by %F, a second file is created, with the same name followed by "H", which contains the header information for that body part.  This will not be needed by most multipart handlers, but it is there if you ever need it.  
-+
-+The "notes=xxx" field is an uninterpreted string that is used to specify the name of the person who installed this entry in the mailcap file.  (The "xxx" may be replaced by any text string.)
-+
-+The "test=xxx" field is a command that is executed to determine whether or not the mailcap line actually applies.  That is, if the content-type field matches the content-type on the message, but a "test=" field is present, then the test must succeed before the mailcap line is considered to "match" the message being viewed.  The command may be any UNIX command, using the same syntax and the same %-escapes as for the viewing command, as described above.  A command is considered to succeed if it exits with a zero exit status, and to fail otherwise.
-+
-+The "print=xxx" field is a command that is executed to print the data instead of display it interactively.  This behavior is usually a consequence of invoking metamail with the "-h" switch.
-+
-+The "textualnewlines" field can be used in the rather obscure case where metamail's default rules for treating newlines in base64-encoded data are unsatisfactory.  By default, metamail will translate CRLF to the local newline character in decoded base64 output if the content-type is "text" (any subtype), but will not do so otherwise.  A mailcap entry with a field of "textualnewlines=1" will force such translation for the specified content-type, while "textualnewlines=0" will guarantee that the translation does not take place even for textual content-types.
-+
-+The "compose" field may be used to specify a program that can be used to compose a new body or body part in the given format.  Its intended use is to support mail composing agents that support the composition of multiple types of mail using external composing agents. As with the view-command, the compose command will be executed after replacing certain escape sequences starting with "%".  In particular, %s should be replaced by the name of a file to which the composed data is to be written by the specified composing program, thus allowing th3e calling program (e.g. metamail) to tell the called program where to store the composed data.  If %s does not appear, then the composed data will be assumed to be written by the composing programs to standard output.   The result of the composing program may be data that is NOT yet suitable for mail transport -- that is, a Content-Transfer-Encoding may still need to be applied to the data.
-+
-+The "composetyped" field is similar to the "compose" field, but is to be used when the composing program needs to specify the Content-type header field to be applied to the composed data.  The "compose" field is simpler, and is preferred for use with existing (non-mail-oriented) programs for composing data in a given format.  The "composetyped" field is necessary when the Content-type information must include auxilliary parameters, and the composition program must then know enough about mail formats to produce output that includes the mail type information, and to apply any necessary Content-Transfer-Encoding.   Conceptually, "compose" specifies a program that simply outputs the specified type of data in its raw form, while "composetyped" specifies a program that outputs the data as a MIME object, with all necessary Content-* headers already in place.
-+
-+.TP 8
-+.B needsterminal
-+If this flag is given, the named interpreter needs to interact with the user on a terminal.  In some environments (e.g. a window-oriented mail reader under X11) this will require the creation of a new terminal emulation window, while in most environments it will not.  If the mailcap entry specifies "needsterminal" and metamail is not running on a terminal (as determined by isatty(3), the -x option, and the MM_NOTTTY environment variable) then metamail will try to run the command in a new terminal emulation window.  Currently, metamail knows how to create new windows under the X11, SunTools, and WM window systems.
-+.TP 8
-+.B copiousoutput
-+This flag should be given whenever the interpreter is capable of producing more than a few lines of output on stdout, and does no interaction with the user.  If the mailcap entry specifies copiousoutput, and pagination has been requested via the "-p" command, then the output of the command being executed will be piped through a pagination program ("more" by default, but this can be overridden with the METAMAIL_PAGER environment variable).
-+.SH BUILT-IN CONTENT-TYPE SUPPORT
-+The metamail program has built-in support for a few key content-types.  In particular, it supports the text type, the multipart and multipart/alternative type, and the message/rfc822 types.  This support is incomplete for many subtypes -- for example, it only supports US-ASCII text in general.  This kind of built-in support can be OVERRIDDEN by an entry in any mailcap file on the user's search path.  Metamail also has rudimentary built-in support for types that are totally unrecognized -- i.e. for which no mailcap entry or built-in handler exists.  For such unrecognized types, metamail will write a file with a "clean" copy of the data -- i.e. a copy in which all mail headers have been removed, and in which any 7-bit transport encoding has been decoded.
-+.SH FILES
-+$HOME/.mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap -- default path for mailcap files.
-+.SH SEE ALSO
-+metamail(1)
-+.SH COPYRIGHT
-+Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+
-+Permission to use, copy, modify, and distribute this material 
-+for any purpose and without fee is hereby granted, provided 
-+that the above copyright notice and this permission notice 
-+appear in all copies, and that the name of Bellcore not be 
-+used in advertising or publicity pertaining to this 
-+material without the specific, prior written permission 
-+of an authorized representative of Bellcore.  BELLCORE 
-+MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+.SH AUTHOR
-+Nathaniel S. Borenstein
---- metamail-2.7.orig/metamail/splitmail.c
-+++ metamail-2.7/metamail/splitmail.c
-@@ -41,8 +41,8 @@
- #define VERBOSEDELIVERYCMD VerboseDeliveryCmd
- #else
- extern char *getenv();
--#define NORMALDELIVERYCMD "/usr/lib/sendmail -t -oi"
--#define VERBOSEDELIVERYCMD "/usr/lib/sendmail -t -v -oi"
-+#define NORMALDELIVERYCMD "/usr/sbin/sendmail -t -oi"
-+#define VERBOSEDELIVERYCMD "/usr/sbin/sendmail -t -v -oi"
- #endif
- 
- usageexit() {
-@@ -194,7 +194,7 @@
- 	s = endofheader(from);  /* would be index(from, '\n'),
- 				 but need to check for continuation lines */
-         *s = '\0';
--	if (ShareThisHeader(from, SubjectBuf, &OrigID)) {
-+	if (ShareThisHeader(from, SubjectBuf, sizeof (SubjectBuf), &OrigID)) {
- 	    strcat(SharedHeaders, from);
- 	    strcat(SharedHeaders, "\n");
- 	}
-@@ -339,9 +339,10 @@
-     NULL
- };
- 
--ShareThisHeader(s, SubjectBuf, OrigID)
-+ShareThisHeader(s, SubjectBuf, size, OrigID)
- char *s;
- char *SubjectBuf;
-+size_t size;
- char **OrigID;
- {
-     int i;
-@@ -361,7 +362,8 @@
-     }
-     if (!ULstrcmp(s, "subject")) {
-         *colon = ':';
--        strcpy(SubjectBuf, ++colon);
-+	strncpy(SubjectBuf, ++colon, size);
-+	SubjectBuf[size - 1] = '\0';
-         return(0);
-     }
-     if (!ULstrcmp(s, "content-type")) {
---- metamail-2.7.orig/metamail/dlist.c
-+++ metamail-2.7/metamail/dlist.c
-@@ -0,0 +1,176 @@
-+#include "common.h"
-+#include "dlist.h"
-+
-+/* null structure to easy initializing to NULL */
-+const DList DListNULL = { NULL, NULL };
-+
-+/* create a new dlist node containing data */
-+DListEntry* 
-+dlist_new(void* data) {
-+  DListEntry* new = XMALLOC( DListEntry, 1 );
-+  
-+  new->next = NULL;
-+  new->prev = NULL;
-+  new->data = data;
-+
-+  return new;
-+}
-+
-+/* concatenate two lists */
-+void
-+dlist_cat(DList* list1, DList* list2){
-+  list1->tail->next = list2->head;
-+  list2->head->prev = list1->tail;
-+  list1->tail = list2->tail;
-+}
-+
-+/* to shorten things a bit in some cases */
-+DListEntry*
-+dlist_insertnew(DList* list, void* data, DListEntry* pos) {
-+  DListEntry* new = dlist_new( data );
-+  return dlist_insert( list, new, pos );
-+}
-+
-+/* can be used to insert an entry at a specific position in a dlist.
-+   use with caution on empty list, cause it might fail then. */
-+DListEntry*
-+dlist_insert(DList* list, DListEntry* new, DListEntry* pos) {
-+
-+  if ( pos ) { // if pos not null, insert
-+    new->next = pos->next;
-+    pos->next = new;
-+    new->prev = pos;
-+  } else if( ! list->head && ! list->tail ) { // otherwise treat as empty
-+    new->next = NULL;                         // list
-+    new->prev = NULL;
-+    list->head = new;
-+  } else
-+    return NULL;    // not an empty list -> error
-+  
-+  if ( new->next )  // set tail when tail
-+    new->next->prev = new;
-+  else
-+    list->tail = new;
-+  
-+  return new;
-+}
-+
-+/* can only be used to append to the end of a list */
-+DListEntry*
-+dlist_append(DList* list, DListEntry* new) {
-+  if ( list->tail ) { // if list tail exists, then link with it
-+    new->next = list->tail->next;
-+    list->tail->next = new;
-+  } else {
-+    new->next = NULL;
-+    list->head = new;
-+  }
-+
-+  new->prev = list->tail;
-+
-+  if ( new->next )  // if next is defined, then set its prev value correctly
-+    new->next->prev = new;
-+  else
-+    list->tail = new;
-+  
-+  return new;
-+}
-+
-+
-+
-+DListEntry* 
-+dlist_insert_sort (DList* list, DListEntry* new, dlist_comp cmp) {
-+  
-+}
-+
-+/* retrieves the head of a list */
-+DListEntry* 
-+dlist_head(DList* list) {
-+  DListEntry *help = list->tail;
-+  DListEntry *old  = NULL;
-+  
-+  while( help ) {
-+    old = help;
-+    help = help->prev;
-+  }
-+  
-+  return old;
-+}
-+
-+/* retrieves the tail of a list */
-+DListEntry* 
-+dlist_tail(DList* list) {
-+  DListEntry *help = list->head;
-+  DListEntry *old  = NULL;
-+
-+  while( help ) {
-+    old = help;
-+    help = help->next;
-+  }
-+  
-+  return old;
-+}
-+
-+/* returns the length of the list */
-+size_t 
-+dlist_length(DList* list){
-+  DListEntry *help = list->head;
-+  size_t n;
-+
-+  for (n = 0; help; ++n)
-+    help = help->next;
-+
-+  return n;
-+}
-+
-+/* removes an entry from the list, and returns it so that it might
-+   be destroyed properly */
-+DListEntry*
-+dlist_remove(DList* list, DListEntry* entry) {
-+  if (entry) {
-+    if (entry != list->head) {  // when not head
-+      if (entry->prev)       // and a previous entry exists
-+	entry->prev->next = entry->next; // tell the previous our next entry
-+    } else
-+      list->head = entry->next; // otherwise next entry is head
-+    
-+    if (entry != list->tail) {  // when not tail
-+      if (entry->next)       // and next entry exists
-+	entry->next->prev = entry->prev; // tell the next entry our previous 
-+    } else
-+    list->tail = entry->prev; // otherwise previous is tail
-+  }
-+
-+  return entry;
-+}
-+
-+/* checks a list to be ok (debugging) verifies head, tail and prints list */
-+dlist_check( DList* list ) {
-+  // should be implemented
-+}
-+
-+
-+DListEntry*
-+dlist_search(DList* list, void* data, dlist_comp cmp) 
-+{
-+  DListEntry *help = list->head;
-+
-+  if (list) {
-+    while ( help ) {
-+      if ( cmp( data, help->data ) == 0 ) 
-+	return help;
-+      else
-+	help = help->next;
-+    }
-+  }
-+  
-+  return NULL;
-+}
-+
-+
-+int
-+dlist_strcmp(void* data1, void* data2)
-+{
-+  return strcmp( (char*) data1, (char*) data2 );
-+}
-+
---- metamail-2.7.orig/metamail/dlist.h
-+++ metamail-2.7/metamail/dlist.h
-@@ -0,0 +1,43 @@
-+#ifndef COMMON_LIST_H
-+#define COMMON_LIST_H 1
-+
-+#include <metamail/common.h>
-+
-+BEGIN_C_DECLS
-+
-+typedef int (*dlist_comp) (void*, void*);
-+
-+typedef struct dlistentry {
-+  struct dlistentry *next;
-+  struct dlistentry *prev;
-+  void *data;
-+} DListEntry;
-+
-+typedef struct dlist {
-+  DListEntry *head;
-+  DListEntry *tail;
-+} DList;
-+
-+extern const DList DListNULL;
-+
-+extern DListEntry *dlist_new         (void* data);
-+extern void        dlist_cat         (DList* list1, DList* list2);
-+extern DListEntry *dlist_insert_new  (DList* list, void* data,
-+				      DListEntry* pos);
-+extern DListEntry *dlist_insert      (DList* list, DListEntry* new,
-+				      DListEntry* pos);
-+extern DListEntry *dlist_insert_sort (DList* list, DListEntry* new, 
-+				      dlist_comp cmp);
-+extern DListEntry *dlist_append      (DList* list, DListEntry* new);
-+extern DListEntry *dlist_head        (DList* list);
-+extern DListEntry *dlist_tail        (DList* list);
-+extern size_t      dlist_length      (DList* list);
-+extern DListEntry *dlist_remove      (DList* list, DListEntry* entry);
-+
-+extern DListEntry *dlist_search      (DList* list, void* data, dlist_comp cmp);
-+
-+extern int dlist_strcmp              (void* data1, void* data2);
-+
-+END_C_DECLS
-+
-+#endif /* !COMMON_LIST_H */
---- metamail-2.7.orig/metamail/common-h.in
-+++ metamail-2.7/metamail/common-h.in
-@@ -0,0 +1,162 @@
-+## common-h.in -- Process this file with configure to produce common.h
-+## Copyright (C) 2000 Gary V. Vaughan
-+##
-+## addition and changes that were made are Copyright (C) 2000 Michael Moerz
-+##
-+## This program is free software; you can redistribute it and/or modify
-+## it under the terms of the GNU General Public License as published by
-+## the Free Software Foundation; either version 2, or (at your option)
-+## any later version.
-+##  
-+## This program is distributed in the hope that it will be useful,
-+## but WITHOUT ANY WARRANTY; without even the implied warranty of
-+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+## GNU General Public License for more details.
-+##  
-+## You should have received a copy of the GNU General Public License
-+## along with this program; if not, write to the Free Software
-+## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+
-+#if TIME_WITH_SYS_TIME
-+# include <sys/time.h>
-+# include <time.h>
-+#else
-+# if HAVE_SYS_TIME_H
-+#  include <sys/time.h>
-+# else
-+#  include <time.h>
-+# endif
-+#endif
-+
-+#ifndef PARAMS
-+#  if __STDC__
-+#    ifndef NOPROTOS
-+#      define PARAMS(args)        args
-+#    endif
-+#  endif
-+#  ifndef PARAMS
-+#    define PARAMS(args)          ()
-+#  endif
-+#endif
-+
-+#ifndef EXIT_SUCCESS
-+#  define EXIT_SUCCESS  0
-+#  define EXIT_FAILURE  1
-+#endif
-+      
-+#ifdef __cplusplus
-+#  define BEGIN_C_DECLS         extern "C" {
-+#  define END_C_DECLS           }
-+#else
-+#  define BEGIN_C_DECLS
-+#  define END_C_DECLS
-+#endif
-+
-+#ifdef __GNUC__
-+#  ifndef const
-+#    define const       __const
-+#  endif
-+#  ifndef signed
-+#    define signed      __signed
-+#  endif
-+#  ifndef volatile
-+#    define volatile    __volatile
-+#  endif
-+#else
-+#  ifdef __STDC__
-+#    undef  signed
-+#    define signed
-+#    undef  volatile
-+#    define volatile
-+#  endif
-+#endif
-+
-+#ifdef __STDC__
-+#  define STR(x)          #x
-+#  define CONC(x, y)      x##y
-+   typedef void* sic_ptr;
-+#else
-+#  define STR(x)          "x"
-+#  define CONC(x, y)      x/**/y
-+   typedef char* sic_ptr;
-+#endif
-+
-+
-+#define XCALLOC(type, num)      ((type *) xcalloc ((num), sizeof(type)))
-+#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-+#define XREALLOC(type, p, num)  ((type *) xrealloc ((p), (num) * sizeof(type)))
-+#define XFREE(stale)                            do {        \
-+              if (stale) { free ((sic_ptr) stale);  stale = 0; }    \
-+                                                      } while (0)
-+
-+
-+BEGIN_C_DECLS
-+
-+extern void *xcalloc    (size_t num, size_t size);
-+extern void *xmalloc    (size_t num);
-+extern void *xrealloc   (void *p, size_t num);
-+extern char *xstrdup    (const char *string);
-+extern char *xstrerror  (int errnum);
-+
-+END_C_DECLS
-+
-+#if WITH_DMALLOC
-+#  include <dmalloc.h>
-+#endif
-+
-+//metamail specific stuff below (this are the additions from Michael Moerz)
-+
-+#define RESET_PROGRAM "/usr/bin/reset"
-+
-+//#define NO_RLIMITS 1
-+#define sigtype void
-+
-+/* This constant should define the ASCII code for newlines on systems where 
-+   the newline convention is other than CRLF.  On UNIX, it is ^J, ASCII 10. 
-+    Here we define it as '\n' which should be right on MOST systems... */
-+#define NEWLINE_CHAR '\n'
-+
-+/* The following defines the default size at which long
-+    messages will be split into multiple messages of type
-+    "message/partial" by the mailto and splitmail commands,
-+    at least. */
-+#ifndef DEFAULT_SPLIT_SIZE
-+#define DEFAULT_SPLIT_SIZE 250000
-+#endif
-+
-+#define PATH_SEPARATOR ':'
-+#ifndef STDPATH
-+#define STDPATH "/.mailcap:/usr/local/etc/mailcap:/usr/etc/mailcap:/etc/mailcap:/etc/mail/mailcap:/usr/public/lib/mailcap"
-+#endif
-+
-+/* The following can be set to a directory or colon-separated list of 
-+  directories that will be prepended to the user's search path before 
-+  executing any mailcap-derived commands. 
-+
-+  It should be set to NULL if there are no directories to prepend.  
-+*/
-+
-+#define AUXPATH NULL
-+
-+
-+#define TMPFILE_NAME_SIZE   1000
-+#define MAX_FILE_NAME_SIZE 1000
-+
-+BEGIN_C_DECLS
-+
-+extern char **environ, *gets();
-+
-+extern char *getenv();
-+extern char *index();
-+extern char *rindex();
-+
-+extern FILE *popen();
-+
-+END_C_DECLS
-+
-+//#ifndef NO_RLIMITS
-+//#include <sys/resource.h>
-+//#endif
-+
-+
-+
---- metamail-2.7.orig/metamail/xmalloc.c
-+++ metamail-2.7/metamail/xmalloc.c
-@@ -0,0 +1,38 @@
-+#if HAVE_CONFIG_H
-+#  include <config.h>
-+#endif
-+
-+#include "common.h"
-+#include "error.h"
-+
-+void *
-+xmalloc (size_t num)
-+{
-+  void *new = malloc (num);
-+  if (!new)
-+    metamail_fatal ("Memory exhausted");
-+  return new;
-+}
-+
-+void *
-+xrealloc (void *p, size_t num)
-+{
-+  void *new;
-+  
-+  if (!p)
-+    return xmalloc (num);
-+  
-+  new = realloc (p, num);
-+  if (!new)
-+    metamail_fatal ("Memory exhausted");
-+  
-+  return new;
-+}
-+
-+void *
-+xcalloc (size_t num, size_t size)
-+{
-+  void *new = xmalloc (num * size); // is implemented by malloc, cause calloc
-+  bzero (new, num * size);          // is not available in some older C libs
-+  return new;
-+}
---- metamail-2.7.orig/metamail/error.c
-+++ metamail-2.7/metamail/error.c
-@@ -0,0 +1,82 @@
-+#if HAVE_CONFIG_H
-+#  include "config.h"
-+#endif
-+
-+#include "common.h"
-+#include "error.h"
-+
-+#include <libgen.h>  /* basename(3) */
-+const char *program_name = NULL;
-+      
-+static void error PARAMS((int exit_status, const char *mode,
-+			  const char *message, va_list ap));
-+      
-+void
-+set_program_name (path)
-+     const char *path;
-+{
-+  METAMAIL_ASSERT (!program_name);
-+  program_name = (char*) xstrdup ( (char*) basename (path));
-+}
-+
-+static void
-+error (exit_status, mode, message, ap)
-+     int exit_status;
-+     const char *mode;
-+     const char *message;
-+     va_list ap;
-+{
-+  fprintf (stderr, "%s: %s: ", program_name, mode);
-+  vfprintf (stderr, message, ap);
-+  fprintf (stderr, ".\n");
-+
-+  if (exit_status >= 0)
-+    exit (exit_status);
-+}
-+
-+void
-+#if HAVE_STDARG_H
-+metamail_warning (const char *message, ...)
-+#else
-+metamail_warning (message, va_alist)
-+     const char *message;
-+     va_dcl
-+#endif
-+{
-+  va_list ap;
-+  VA_START (ap, message);
-+  error (-1, "warning", message, ap);
-+  va_end (ap);
-+}
-+
-+void
-+#if HAVE_STDARG_H
-+metamail_error (const char *message, ...)
-+#else
-+metamail_error (message, va_alist)
-+     const char *message;
-+     va_dcl
-+#endif
-+{
-+  va_list ap;
-+  VA_START (ap, message);
-+  error (-1, "ERROR", message, ap);
-+  va_end (ap);
-+}
-+      
-+void
-+#if HAVE_STDARG_H
-+metamail_fatal (const char *message, ...)
-+#else
-+metamail_fatal (message, va_alist)
-+     const char *message;
-+     va_dcl
-+#endif
-+{
-+  va_list ap;
-+  VA_START (ap, message);
-+  error (EXIT_FAILURE, "FATAL", message, ap);
-+  va_end (ap);
-+}
-+
-+
---- metamail-2.7.orig/metamail/error.h
-+++ metamail-2.7/metamail/error.h
-@@ -0,0 +1,17 @@
-+#ifndef COMMON_ERROR_H
-+#define COMMON_ERROR_H 1
-+      
-+#include <metamail/common.h>
-+
-+BEGIN_C_DECLS
-+      
-+extern const char *program_name;
-+extern void set_program_name PARAMS((const char *argv0));
-+      
-+extern void metamail_warning      PARAMS((const char *message, ...));
-+extern void metamail_error        PARAMS((const char *message, ...));
-+extern void metamail_fatal        PARAMS((const char *message, ...));
-+      
-+END_C_DECLS
-+      
-+#endif /* !COMMON_ERROR_H */
---- metamail-2.7.orig/metamail/xstrerror.c
-+++ metamail-2.7/metamail/xstrerror.c
-@@ -0,0 +1,32 @@
-+/* xstrerror.c -- strerror wrapper with bound checking
-+   Fri Jun 16 18:30:00 1995  Pat Rankin  <rankin@eql.caltech.edu>
-+   This code is in the public domain.
-+*/
-+
-+#if HAVE_CONFIG_H
-+#  include <config.h>
-+#endif
-+
-+#include "common.h"
-+
-+extern char *strerror ();
-+
-+/* If strerror returns NULL, we'll format the number into a static buffer.  */
-+#define ERRSTR_FMT "undocumented error #%d"
-+static char xstrerror_buf[sizeof ERRSTR_FMT + 20];
-+
-+/* Like strerror, but result is never a null pointer.  */
-+char *
-+xstrerror (int errnum)
-+{
-+  char *errstr = strerror (errnum);
-+
-+  /* If `errnum' is out of range, result might be NULL.  We'll fix that.  */
-+  if (!errstr)
-+    {
-+      sprintf (xstrerror_buf, ERRSTR_FMT, errnum);
-+      errstr = xstrerror_buf;
-+    }
-+
-+  return errstr;
-+}
---- metamail-2.7.orig/metamail/stamp-common
-+++ metamail-2.7/metamail/stamp-common
-@@ -0,0 +1 @@
-+timestamp
---- metamail-2.7.orig/metamail/common.h
-+++ metamail-2.7/metamail/common.h
-@@ -0,0 +1,203 @@
-+/*  -*- Mode: C -*-
-+ * --------------------------------------------------------------------
-+ * DO NOT EDIT THIS FILE!  It has been automatically generated
-+ * from:    configure.in and common.h.in
-+ * on host: diziet
-+ * --------------------------------------------------------------------
-+ */
-+
-+#ifndef METAMAIL_COMMON_H
-+#define METAMAIL_COMMON_H 1
-+
-+#include <stdio.h>
-+#include <ctype.h>        // ??? ok here
-+#include <sys/types.h>
-+#include <sys/stat.h>     // ??? ok here
-+
-+// ??? following ok here without check?
-+#include <pwd.h>
-+#include <sys/time.h>
-+#include <sys/types.h>
-+#include <sys/file.h>
-+#include <signal.h>
-+
-+#include <termio.h>
-+#include <fcntl.h>
-+#include <sys/utsname.h>
-+
-+#include <linux/limits.h>
-+
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <errno.h>
-+
-+#ifndef errno
-+/* Some sytems #define this! */
-+extern int errno;
-+#endif
-+
-+#include <string.h>
-+
-+#include <stdarg.h>
-+#ifndef VA_START
-+#  define VA_START(a, f) va_start(a, f)
-+#endif /* VA_START */
-+
-+
-+#include <assert.h>
-+#define METAMAIL_ASSERT assert
-+
-+
-+#if TIME_WITH_SYS_TIME
-+# include <sys/time.h>
-+# include <time.h>
-+#else
-+# if HAVE_SYS_TIME_H
-+#  include <sys/time.h>
-+# else
-+#  include <time.h>
-+# endif
-+#endif
-+
-+#ifndef PARAMS
-+#  if __STDC__
-+#    ifndef NOPROTOS
-+#      define PARAMS(args)        args
-+#    endif
-+#  endif
-+#  ifndef PARAMS
-+#    define PARAMS(args)          ()
-+#  endif
-+#endif
-+
-+#ifndef EXIT_SUCCESS
-+#  define EXIT_SUCCESS  0
-+#  define EXIT_FAILURE  1
-+#endif
-+      
-+#ifdef __cplusplus
-+#  define BEGIN_C_DECLS         extern "C" {
-+#  define END_C_DECLS           }
-+#else
-+#  define BEGIN_C_DECLS
-+#  define END_C_DECLS
-+#endif
-+
-+#ifdef __GNUC__
-+#  ifndef const
-+#    define const       __const
-+#  endif
-+#  ifndef signed
-+#    define signed      __signed
-+#  endif
-+#  ifndef volatile
-+#    define volatile    __volatile
-+#  endif
-+#else
-+#  ifdef __STDC__
-+#    undef  signed
-+#    define signed
-+#    undef  volatile
-+#    define volatile
-+#  endif
-+#endif
-+
-+#ifdef __STDC__
-+#  define STR(x)          #x
-+#  define CONC(x, y)      x##y
-+   typedef void* sic_ptr;
-+#else
-+#  define STR(x)          "x"
-+#  define CONC(x, y)      x/**/y
-+   typedef char* sic_ptr;
-+#endif
-+
-+
-+#define XCALLOC(type, num)      ((type *) xcalloc ((num), sizeof(type)))
-+#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-+#define XREALLOC(type, p, num)  ((type *) xrealloc ((p), (num) * sizeof(type)))
-+#define XFREE(stale)                            do {        \
-+              if (stale) { free ((sic_ptr) stale);  stale = 0; }    \
-+                                                      } while (0)
-+
-+
-+BEGIN_C_DECLS
-+
-+extern void *xcalloc    (size_t num, size_t size);
-+extern void *xmalloc    (size_t num);
-+extern void *xrealloc   (void *p, size_t num);
-+extern char *xstrdup    (const char *string);
-+extern char *xstrerror  (int errnum);
-+
-+END_C_DECLS
-+
-+#if WITH_DMALLOC
-+#  include <dmalloc.h>
-+#endif
-+
-+//metamail specific stuff below (this are the additions from Michael Moerz)
-+
-+#define RESET_PROGRAM "/usr/bin/reset"
-+
-+//#define NO_RLIMITS 1
-+#define sigtype void
-+
-+/* This constant should define the ASCII code for newlines on systems where 
-+   the newline convention is other than CRLF.  On UNIX, it is ^J, ASCII 10. 
-+    Here we define it as '\n' which should be right on MOST systems... */
-+#define NEWLINE_CHAR '\n'
-+
-+/* The following defines the default size at which long
-+    messages will be split into multiple messages of type
-+    "message/partial" by the mailto and splitmail commands,
-+    at least. */
-+#ifndef DEFAULT_SPLIT_SIZE
-+#define DEFAULT_SPLIT_SIZE 250000
-+#endif
-+
-+#define PATH_SEPARATOR ':'
-+#ifndef STDPATH
-+#define STDPATH "/.mailcap:/usr/local/etc/mailcap:/usr/etc/mailcap:/etc/mailcap:/etc/mail/mailcap:/usr/public/lib/mailcap"
-+#endif
-+
-+/* The following can be set to a directory or colon-separated list of 
-+  directories that will be prepended to the user's search path before 
-+  executing any mailcap-derived commands. 
-+
-+  It should be set to NULL if there are no directories to prepend.  
-+*/
-+
-+#define AUXPATH NULL
-+
-+
-+#define TMPFILE_NAME_SIZE   1000
-+#define MAX_FILE_NAME_SIZE 1000
-+
-+BEGIN_C_DECLS
-+
-+extern char **environ, *gets();
-+
-+extern char *getenv();
-+extern char *index();
-+extern char *rindex();
-+
-+extern FILE *popen();
-+
-+END_C_DECLS
-+
-+//#ifndef NO_RLIMITS
-+//#include <sys/resource.h>
-+//#endif
-+
-+
-+
-+#define LPRCOMMAND "lp"
-+#define LPRTEMPLATE "lp %s"
-+#define CATCOMMAND "cat"
-+#define CATTEMPLATE "cat %s"
-+#define TMPNAME_MAX NAME_MAX
-+static struct termio MyTtyStateIn, MyTtyStateOut;
-+
-+
-+
-+#endif /* !METAMAIL_COMMON_H */
---- metamail-2.7.orig/metamail/Makefile.am
-+++ metamail-2.7/metamail/Makefile.am
-@@ -0,0 +1,27 @@
-+MAINTAINERCLEANFILES	= Makefile.in
-+
-+INCLUDES 		= -I$(top_builddir) -I$(top_srcdir)
-+
-+pkginclude_HEADERS	= common.h error.h
-+
-+lib_LTLIBRARIES		= libmetamail.la
-+
-+libmetamail_la_SOURCES	= error.c dlist.c xmalloc.c xstrerror.c \
-+			xstrdup.c 
-+
-+common.h: stamp-common
-+	@:
-+stamp-common: $(srcdir)/common-h.in $(top_builddir)/config.status
-+	cd $(top_builddir) \
-+	  && CONFIG_FILES= CONFIGHEADERS= CONFIG_OTHER=metamail/common.h \
-+	  $(SHELL) ./config.status
-+	echo timestamp > $@
-+
-+dist-hook:
-+	rm -f $(distdir)/common.h
-+
-+
-+
-+
-+
-+
---- metamail-2.7.orig/metamail/Makefile.in
-+++ metamail-2.7/metamail/Makefile.in
-@@ -0,0 +1,426 @@
-+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+
-+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
-+bindir = @bindir@
-+sbindir = @sbindir@
-+libexecdir = @libexecdir@
-+datadir = @datadir@
-+sysconfdir = @sysconfdir@
-+sharedstatedir = @sharedstatedir@
-+localstatedir = @localstatedir@
-+libdir = @libdir@
-+infodir = @infodir@
-+mandir = @mandir@
-+includedir = @includedir@
-+oldincludedir = /usr/include
-+
-+DESTDIR =
-+
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+
-+top_builddir = ..
-+
-+ACLOCAL = @ACLOCAL@
-+AUTOCONF = @AUTOCONF@
-+AUTOMAKE = @AUTOMAKE@
-+AUTOHEADER = @AUTOHEADER@
-+
-+INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+transform = @program_transform_name@
-+
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+host_alias = @host_alias@
-+host_triplet = @host@
-+AS = @AS@
-+CATCOMMAND = @CATCOMMAND@
-+CC = @CC@
-+DLLTOOL = @DLLTOOL@
-+ECHO = @ECHO@
-+EXEEXT = @EXEEXT@
-+LIBTOOL = @LIBTOOL@
-+LIBTOOL_DEPS = @LIBTOOL_DEPS@
-+LN_S = @LN_S@
-+LPRCOMMAND = @LPRCOMMAND@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAKEINFO = @MAKEINFO@
-+OBJDUMP = @OBJDUMP@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+RANLIB = @RANLIB@
-+STRIP = @STRIP@
-+VERSION = @VERSION@
-+ac_aux_dir = @ac_aux_dir@
-+
-+MAINTAINERCLEANFILES = Makefile.in
-+
-+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-+
-+pkginclude_HEADERS = common.h error.h
-+
-+lib_LTLIBRARIES = libmetamail.la
-+
-+libmetamail_la_SOURCES = error.c dlist.c xmalloc.c xstrerror.c 			xstrdup.c 
-+
-+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-+CONFIG_HEADER = config.h
-+CONFIG_CLEAN_FILES = 
-+LTLIBRARIES =  $(lib_LTLIBRARIES)
-+
-+
-+DEFS = @DEFS@ -I. -I$(srcdir) -I.
-+CPPFLAGS = @CPPFLAGS@
-+LDFLAGS = @LDFLAGS@
-+LIBS = @LIBS@
-+libmetamail_la_LDFLAGS = 
-+libmetamail_la_LIBADD = 
-+libmetamail_la_OBJECTS =  error.lo dlist.lo xmalloc.lo xstrerror.lo \
-+xstrdup.lo
-+CFLAGS = @CFLAGS@
-+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-+HEADERS =  $(pkginclude_HEADERS)
-+
-+DIST_COMMON =  ./stamp-h.in Makefile.am Makefile.in config.h.in
-+
-+
-+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-+
-+TAR = tar
-+GZIP_ENV = --best
-+DEP_FILES =  .deps/dlist.P .deps/error.P .deps/xmalloc.P .deps/xstrdup.P \
-+.deps/xstrerror.P
-+SOURCES = $(libmetamail_la_SOURCES)
-+OBJECTS = $(libmetamail_la_OBJECTS)
-+
-+all: all-redirect
-+.SUFFIXES:
-+.SUFFIXES: .S .c .lo .o .obj .s
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-+	cd $(top_srcdir) && $(AUTOMAKE) --foreign metamail/Makefile
-+
-+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-+	cd $(top_builddir) \
-+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
-+
-+config.h: stamp-h
-+	@if test ! -f $@; then \
-+		rm -f stamp-h; \
-+		$(MAKE) stamp-h; \
-+	else :; fi
-+stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
-+	cd $(top_builddir) \
-+	  && CONFIG_FILES= CONFIG_HEADERS=metamail/config.h \
-+	     $(SHELL) ./config.status
-+	@echo timestamp > stamp-h 2> /dev/null
-+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in
-+	@if test ! -f $@; then \
-+		rm -f $(srcdir)/stamp-h.in; \
-+		$(MAKE) $(srcdir)/stamp-h.in; \
-+	else :; fi
-+$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-+	cd $(top_srcdir) && $(AUTOHEADER)
-+	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
-+
-+mostlyclean-hdr:
-+
-+clean-hdr:
-+
-+distclean-hdr:
-+	-rm -f config.h
-+
-+maintainer-clean-hdr:
-+
-+mostlyclean-libLTLIBRARIES:
-+
-+clean-libLTLIBRARIES:
-+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-+
-+distclean-libLTLIBRARIES:
-+
-+maintainer-clean-libLTLIBRARIES:
-+
-+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-+	@$(NORMAL_INSTALL)
-+	$(mkinstalldirs) $(DESTDIR)$(libdir)
-+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+	  if test -f $$p; then \
-+	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
-+	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
-+	  else :; fi; \
-+	done
-+
-+uninstall-libLTLIBRARIES:
-+	@$(NORMAL_UNINSTALL)
-+	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
-+	done
-+
-+# FIXME: We should only use cygpath when building on Windows,
-+# and only if it is available.
-+.c.obj:
-+	$(COMPILE) -c `cygpath -w $<`
-+
-+.s.o:
-+	$(COMPILE) -c $<
-+
-+.S.o:
-+	$(COMPILE) -c $<
-+
-+mostlyclean-compile:
-+	-rm -f *.o core *.core
-+	-rm -f *.$(OBJEXT)
-+
-+clean-compile:
-+
-+distclean-compile:
-+	-rm -f *.tab.c
-+
-+maintainer-clean-compile:
-+
-+.s.lo:
-+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+
-+.S.lo:
-+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+
-+maintainer-clean-libtool:
-+
-+libmetamail.la: $(libmetamail_la_OBJECTS) $(libmetamail_la_DEPENDENCIES)
-+	$(LINK) -rpath $(libdir) $(libmetamail_la_LDFLAGS) $(libmetamail_la_OBJECTS) $(libmetamail_la_LIBADD) $(LIBS)
-+
-+install-pkgincludeHEADERS: $(pkginclude_HEADERS)
-+	@$(NORMAL_INSTALL)
-+	$(mkinstalldirs) $(DESTDIR)$(pkgincludedir)
-+	@list='$(pkginclude_HEADERS)'; for p in $$list; do \
-+	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
-+	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p"; \
-+	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p; \
-+	done
-+
-+uninstall-pkgincludeHEADERS:
-+	@$(NORMAL_UNINSTALL)
-+	list='$(pkginclude_HEADERS)'; for p in $$list; do \
-+	  rm -f $(DESTDIR)$(pkgincludedir)/$$p; \
-+	done
-+
-+tags: TAGS
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP)
-+	list='$(SOURCES) $(HEADERS)'; \
-+	unique=`for i in $$list; do echo $$i; done | \
-+	  awk '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	here=`pwd` && cd $(srcdir) \
-+	  && mkid -f$$here/ID $$unique $(LISP)
-+
-+TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)'; \
-+	unique=`for i in $$list; do echo $$i; done | \
-+	  awk '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
-+	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP))
-+
-+mostlyclean-tags:
-+
-+clean-tags:
-+
-+distclean-tags:
-+	-rm -f TAGS ID
-+
-+maintainer-clean-tags:
-+
-+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-+
-+subdir = metamail
-+
-+distdir: $(DISTFILES)
-+	here=`cd $(top_builddir) && pwd`; \
-+	top_distdir=`cd $(top_distdir) && pwd`; \
-+	distdir=`cd $(distdir) && pwd`; \
-+	cd $(top_srcdir) \
-+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign metamail/Makefile
-+	@for file in $(DISTFILES); do \
-+	  d=$(srcdir); \
-+	  if test -d $$d/$$file; then \
-+	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	  fi; \
-+	done
-+	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
-+
-+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-+
-+-include $(DEP_FILES)
-+
-+mostlyclean-depend:
-+
-+clean-depend:
-+
-+distclean-depend:
-+	-rm -rf .deps
-+
-+maintainer-clean-depend:
-+
-+%.o: %.c
-+	@echo '$(COMPILE) -c $<'; \
-+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm .deps/$(*F).pp
-+
-+%.lo: %.c
-+	@echo '$(LTCOMPILE) -c $<'; \
-+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-+	  < .deps/$(*F).pp > .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm -f .deps/$(*F).pp
-+info-am:
-+info: info-am
-+dvi-am:
-+dvi: dvi-am
-+check-am: all-am
-+check: check-am
-+installcheck-am:
-+installcheck: installcheck-am
-+all-recursive-am: config.h
-+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-+
-+install-exec-am: install-libLTLIBRARIES
-+install-exec: install-exec-am
-+
-+install-data-am: install-pkgincludeHEADERS
-+install-data: install-data-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+install: install-am
-+uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgincludeHEADERS
-+uninstall: uninstall-am
-+all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h
-+all-redirect: all-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-+installdirs:
-+	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(pkgincludedir)
-+
-+
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+
-+maintainer-clean-generic:
-+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-+mostlyclean-am:  mostlyclean-hdr mostlyclean-libLTLIBRARIES \
-+		mostlyclean-compile mostlyclean-libtool \
-+		mostlyclean-tags mostlyclean-depend mostlyclean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+clean-am:  clean-hdr clean-libLTLIBRARIES clean-compile clean-libtool \
-+		clean-tags clean-depend clean-generic mostlyclean-am
-+
-+clean: clean-am
-+
-+distclean-am:  distclean-hdr distclean-libLTLIBRARIES distclean-compile \
-+		distclean-libtool distclean-tags distclean-depend \
-+		distclean-generic clean-am
-+	-rm -f libtool
-+
-+distclean: distclean-am
-+
-+maintainer-clean-am:  maintainer-clean-hdr \
-+		maintainer-clean-libLTLIBRARIES \
-+		maintainer-clean-compile maintainer-clean-libtool \
-+		maintainer-clean-tags maintainer-clean-depend \
-+		maintainer-clean-generic distclean-am
-+	@echo "This command is intended for maintainers to use;"
-+	@echo "it deletes files that may require special tools to rebuild."
-+
-+maintainer-clean: maintainer-clean-am
-+
-+.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
-+mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
-+clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
-+uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
-+distclean-compile clean-compile maintainer-clean-compile \
-+mostlyclean-libtool distclean-libtool clean-libtool \
-+maintainer-clean-libtool uninstall-pkgincludeHEADERS \
-+install-pkgincludeHEADERS tags mostlyclean-tags distclean-tags \
-+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
-+distclean-depend clean-depend maintainer-clean-depend info-am info \
-+dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
-+install-exec-am install-exec install-data-am install-data install-am \
-+install uninstall-am uninstall all-redirect all-am all installdirs \
-+mostlyclean-generic distclean-generic clean-generic \
-+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-+
-+
-+common.h: stamp-common
-+	@:
-+stamp-common: $(srcdir)/common-h.in $(top_builddir)/config.status
-+	cd $(top_builddir) \
-+	  && CONFIG_FILES= CONFIGHEADERS= CONFIG_OTHER=metamail/common.h \
-+	  $(SHELL) ./config.status
-+	echo timestamp > $@
-+
-+dist-hook:
-+	rm -f $(distdir)/common.h
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
---- metamail-2.7.orig/metamail/libcommon.la
-+++ metamail-2.7/metamail/libcommon.la
-@@ -0,0 +1,28 @@
-+# libcommon.la - a libtool library file
-+# Generated by ltmain.sh - GNU libtool 1.3.5 (1.385.2.206 2000/05/27 11:12:27)
-+#
-+# Please DO NOT delete this file!
-+# It is necessary for linking the library.
-+
-+# The name that we can dlopen(3).
-+dlname=''
-+
-+# Names of this library.
-+library_names='libcommon.so.0.0.0 libcommon.so.0 libcommon.so'
-+
-+# The name of the static archive.
-+old_library='libcommon.a'
-+
-+# Libraries that this one depends upon.
-+dependency_libs=''
-+
-+# Version information for libcommon.
-+current=0
-+age=0
-+revision=0
-+
-+# Is this an already installed library?
-+installed=no
-+
-+# Directory that this library needs to be installed in:
-+libdir='/usr/lib'
---- metamail-2.7.orig/metamail/config.h.in
-+++ metamail-2.7/metamail/config.h.in
-@@ -0,0 +1,119 @@
-+/* metamail/config.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
-+
-+/* Define to empty if the keyword does not work.  */
-+#undef const
-+
-+/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-+#undef size_t
-+
-+/* Define if you have the ANSI C header files.  */
-+#undef STDC_HEADERS
-+
-+/* Define if you can safely include both <sys/time.h> and <time.h>.  */
-+#undef TIME_WITH_SYS_TIME
-+
-+/* Define if you have the basename function.  */
-+#undef HAVE_BASENAME
-+
-+/* Define if you have the bcmp function.  */
-+#undef HAVE_BCMP
-+
-+/* Define if you have the bcopy function.  */
-+#undef HAVE_BCOPY
-+
-+/* Define if you have the bzero function.  */
-+#undef HAVE_BZERO
-+
-+/* Define if you have the calloc function.  */
-+#undef HAVE_CALLOC
-+
-+/* Define if you have the index function.  */
-+#undef HAVE_INDEX
-+
-+/* Define if you have the initstate function.  */
-+#undef HAVE_INITSTATE
-+
-+/* Define if you have the kill function.  */
-+#undef HAVE_KILL
-+
-+/* Define if you have the killpg function.  */
-+#undef HAVE_KILLPG
-+
-+/* Define if you have the memcmp function.  */
-+#undef HAVE_MEMCMP
-+
-+/* Define if you have the memcpy function.  */
-+#undef HAVE_MEMCPY
-+
-+/* Define if you have the memset function.  */
-+#undef HAVE_MEMSET
-+
-+/* Define if you have the putenv function.  */
-+#undef HAVE_PUTENV
-+
-+/* Define if you have the rand function.  */
-+#undef HAVE_RAND
-+
-+/* Define if you have the random function.  */
-+#undef HAVE_RANDOM
-+
-+/* Define if you have the rindex function.  */
-+#undef HAVE_RINDEX
-+
-+/* Define if you have the srand function.  */
-+#undef HAVE_SRAND
-+
-+/* Define if you have the strchr function.  */
-+#undef HAVE_STRCHR
-+
-+/* Define if you have the strerror function.  */
-+#undef HAVE_STRERROR
-+
-+/* Define if you have the strrchr function.  */
-+#undef HAVE_STRRCHR
-+
-+/* Define if you have the vfprintf function.  */
-+#undef HAVE_VFPRINTF
-+
-+/* Define if you have the <assert.h> header file.  */
-+#undef HAVE_ASSERT_H
-+
-+/* Define if you have the <dlfcn.h> header file.  */
-+#undef HAVE_DLFCN_H
-+
-+/* Define if you have the <errno.h> header file.  */
-+#undef HAVE_ERRNO_H
-+
-+/* Define if you have the <signal.h> header file.  */
-+#undef HAVE_SIGNAL_H
-+
-+/* Define if you have the <stdarg.h> header file.  */
-+#undef HAVE_STDARG_H
-+
-+/* Define if you have the <stdlib.h> header file.  */
-+#undef HAVE_STDLIB_H
-+
-+/* Define if you have the <string.h> header file.  */
-+#undef HAVE_STRING_H
-+
-+/* Define if you have the <strings.h> header file.  */
-+#undef HAVE_STRINGS_H
-+
-+/* Define if you have the <sys/time.h> header file.  */
-+#undef HAVE_SYS_TIME_H
-+
-+/* Define if you have the <time.h> header file.  */
-+#undef HAVE_TIME_H
-+
-+/* Define if you have the <unistd.h> header file.  */
-+#undef HAVE_UNISTD_H
-+
-+/* Define if you have the <varargs.h> header file.  */
-+#undef HAVE_VARARGS_H
-+
-+/* Name of package */
-+#undef PACKAGE
-+
-+/* Version number of package */
-+#undef VERSION
-+
---- metamail-2.7.orig/metamail/stamp-h.in
-+++ metamail-2.7/metamail/stamp-h.in
-@@ -0,0 +1 @@
-+timestamp
---- metamail-2.7.orig/metamail/patchlevel.h
-+++ metamail-2.7/metamail/patchlevel.h
-@@ -0,0 +1,19 @@
-+/* This is the metamail distribution, version number as given below.
-+
-+Version history:
-+
-+  Version 1.X was Bellcore-internal and pre-MIME.
-+  Version 2.0 was the first MIME-compliant release, also Bellcore-internal.
-+  Version 2.1 was the first public release, January 1992.
-+  Version 2.2 was the second public release, April 1992.  Major changes included:
-+      -- Ports to UNIX variants & MS-DOS.
-+      -- The new "mailto" program
-+      -- Innumerable smaller fixes & enhancements
-+  Version 2.3 was the June, 1992 release, with many more patches and 
-+      enhancements, including a Commodore Amiga port.
-+  Version 2.4 was the December, 1992 release, including many bug fixes and a vastly expanded (and now separately packaged) contrib directory.
-+  Version 2.5 was the June, 1993 release, with mostly just bug fixes from 2.4.
-+  Version 2.6 was the July, 1993 release, with important bug fixes from 2.5.
-+  Version 2.7 was the February, 1994 release, mostly bug fixes.
-+*/
-+#define MM_VERSTRING "2.7"
---- metamail-2.7.orig/metamail/xstrdup.c
-+++ metamail-2.7/metamail/xstrdup.c
-@@ -0,0 +1,35 @@
-+/* xstrdup.c -- strdup implementation with out of memory reporting
-+   Copyright (C) 2000 Gary V. Vaughan
-+  
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 2, or (at your option)
-+   any later version.
-+  
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+  
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+*/
-+
-+#ifndef WITH_DMALLOC
-+
-+#if HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "common.h"
-+
-+char *
-+xstrdup (string)
-+     const char *string;
-+{
-+  return string ? strcpy (xmalloc (strlen (string) + 1), string) : NULL;
-+}
-+
-+#endif /* !WITH_DMALLOC */
-+
---- metamail-2.7.orig/src/metamail/codes.c
-+++ metamail-2.7/src/metamail/codes.c
-@@ -0,0 +1,432 @@
-+/*
-+Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+
-+Permission to use, copy, modify, and distribute this material 
-+for any purpose and without fee is hereby granted, provided 
-+that the above copyright notice and this permission notice 
-+appear in all copies, and that the name of Bellcore not be 
-+used in advertising or publicity pertaining to this 
-+material without the specific, prior written permission 
-+of an authorized representative of Bellcore.  BELLCORE 
-+MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+*/
-+#include <metamail/common.h>
-+
-+extern char *index();
-+static char basis_64[] =
-+   "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-+
-+static char index_64[128] = {
-+    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-+    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-+    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,62, -1,-1,-1,63,
-+    52,53,54,55, 56,57,58,59, 60,61,-1,-1, -1,-1,-1,-1,
-+    -1, 0, 1, 2,  3, 4, 5, 6,  7, 8, 9,10, 11,12,13,14,
-+    15,16,17,18, 19,20,21,22, 23,24,25,-1, -1,-1,-1,-1,
-+    -1,26,27,28, 29,30,31,32, 33,34,35,36, 37,38,39,40,
-+    41,42,43,44, 45,46,47,48, 49,50,51,-1, -1,-1,-1,-1
-+};
-+
-+#define char64(c)  (((c) < 0 || (c) > 127) ? -1 : index_64[(c)])
-+
-+/*
-+char64(c)
-+char c;
-+{
-+    char *s = (char *) index(basis_64, c);
-+    if (s) return(s-basis_64);
-+    return(-1);
-+}
-+*/
-+
-+/* the following gets a character, but fakes it properly into two chars if there's a newline character */
-+static int InNewline=0;
-+
-+int nextcharin(infile, PortableNewlines)
-+FILE *infile;
-+int PortableNewlines;
-+{
-+    int c;
-+
-+#ifndef NEWLINE_CHAR
-+    return(getc(infile));
-+#else
-+    if (!PortableNewlines) return(getc(infile));
-+    if (InNewline) {
-+        InNewline = 0;
-+        return(10); /* LF */
-+    }
-+    c = getc(infile);
-+    if (c == NEWLINE_CHAR) {
-+        InNewline = 1;
-+        return(13); /* CR */
-+    }
-+    return(c);
-+#endif
-+}
-+
-+to64(infile, outfile, PortableNewlines) 
-+FILE *infile, *outfile;
-+int PortableNewlines;
-+{
-+    int c1, c2, c3, ct=0;
-+    InNewline = 0; /* always reset it */
-+    while ((c1 = nextcharin(infile, PortableNewlines)) != EOF) {
-+        c2 = nextcharin(infile, PortableNewlines);
-+        if (c2 == EOF) {
-+            output64chunk(c1, 0, 0, 2, outfile);
-+        } else {
-+            c3 = nextcharin(infile, PortableNewlines);
-+            if (c3 == EOF) {
-+                output64chunk(c1, c2, 0, 1, outfile);
-+            } else {
-+                output64chunk(c1, c2, c3, 0, outfile);
-+            }
-+        }
-+        ct += 4;
-+        if (ct > 71) {
-+            putc('\n', outfile);
-+            ct = 0;
-+        }
-+    }
-+    if (ct) putc('\n', outfile);
-+    fflush(outfile);
-+}
-+
-+output64chunk(c1, c2, c3, pads, outfile)
-+FILE *outfile;
-+{
-+    putc(basis_64[c1>>2], outfile);
-+    putc(basis_64[((c1 & 0x3)<< 4) | ((c2 & 0xF0) >> 4)], outfile);
-+    if (pads == 2) {
-+        putc('=', outfile);
-+        putc('=', outfile);
-+    } else if (pads) {
-+        putc(basis_64[((c2 & 0xF) << 2) | ((c3 & 0xC0) >>6)], outfile);
-+        putc('=', outfile);
-+    } else {
-+        putc(basis_64[((c2 & 0xF) << 2) | ((c3 & 0xC0) >>6)], outfile);
-+        putc(basis_64[c3 & 0x3F], outfile);
-+    }
-+}
-+
-+PendingBoundary(s, Boundaries, BoundaryCt)
-+char *s;
-+char **Boundaries;
-+int *BoundaryCt;
-+{
-+    int i, len;
-+
-+    if (s[0] != '-' || s[1] != '-') return(0);
-+
-+
-+    for (i=0; i < *BoundaryCt; ++i) {
-+	len = strlen(Boundaries[i]);
-+        if (!strncmp(s, Boundaries[i], len)) {
-+            if (s[len] == '-' && s[len+1] == '-') *BoundaryCt = i;
-+            return(1);
-+        }
-+    }
-+    return(0);
-+}
-+
-+/* If we're in portable newline mode, we have to convert CRLF to the 
-+    local newline convention on output */
-+
-+static int CRpending = 0;
-+
-+#ifdef NEWLINE_CHAR
-+almostputc(c, outfile, PortableNewlines)
-+int c;
-+FILE *outfile;
-+int PortableNewlines;
-+{
-+    if (CRpending) {
-+        if (c == 10) {
-+            putc(NEWLINE_CHAR, outfile);
-+            CRpending = 0;
-+        } else {
-+            putc(13, outfile);
-+	    if (c != 13) {
-+            	putc(c, outfile);
-+		CRpending = 0;
-+	    }
-+        }
-+    } else {
-+        if (PortableNewlines && c == 13) {
-+            CRpending = 1;
-+        } else {
-+            putc(c, outfile);
-+        }
-+    }
-+}
-+#else
-+almostputc(c, outfile, PortableNewlines)
-+int c;
-+FILE *outfile;
-+int PortableNewlines;
-+{
-+    putc(c, outfile);
-+}
-+#endif
-+
-+from64(infile, outfile, boundaries, boundaryct, PortableNewlines) 
-+FILE *infile, *outfile;
-+char **boundaries;
-+int *boundaryct;
-+int PortableNewlines;
-+{
-+    int c1, c2, c3, c4;
-+    int newline = 1, DataDone = 0;
-+
-+    /* always reinitialize */
-+    CRpending = 0;
-+    while ((c1 = getc(infile)) != EOF) {
-+        if (isspace(c1)) {
-+            if (c1 == '\n') {
-+                newline = 1;
-+            } else {
-+                newline = 0;
-+            }
-+            continue;
-+        }
-+        if (newline && boundaries && c1 == '-') {
-+            char Buf[200];
-+            /* a dash is NOT base 64, so all bets are off if NOT a boundary */
-+            ungetc(c1, infile);
-+            fgets(Buf, sizeof(Buf), infile);
-+            if (boundaries
-+                 && (Buf[0] == '-')
-+                 && (Buf[1] == '-')
-+                 && PendingBoundary(Buf, boundaries, boundaryct)) {
-+                return;
-+            }
-+            fprintf(stderr, "Ignoring unrecognized boundary line: %s\n", Buf);
-+            continue;
-+        }
-+        if (DataDone) continue;
-+        newline = 0;
-+        do {
-+            c2 = getc(infile);
-+        } while (c2 != EOF && isspace(c2));
-+        do {
-+            c3 = getc(infile);
-+        } while (c3 != EOF && isspace(c3));
-+        do {
-+            c4 = getc(infile);
-+        } while (c4 != EOF && isspace(c4));
-+        if (c2 == EOF || c3 == EOF || c4 == EOF) {
-+            fprintf(stderr, "Warning: base64 decoder saw premature EOF!\n");
-+            return;
-+        }
-+        if (c1 == '=' || c2 == '=') {
-+            DataDone=1;
-+            continue;
-+        }
-+        c1 = char64(c1);
-+        c2 = char64(c2);
-+        almostputc(((c1<<2) | ((c2&0x30)>>4)), outfile, PortableNewlines);
-+        if (c3 == '=') {
-+            DataDone = 1;
-+        } else {
-+            c3 = char64(c3);
-+            almostputc((((c2&0XF) << 4) | ((c3&0x3C) >> 2)), outfile, PortableNewlines);
-+            if (c4 == '=') {
-+                DataDone = 1;
-+            } else {
-+                c4 = char64(c4);
-+                almostputc((((c3&0x03) <<6) | c4), outfile, PortableNewlines);
-+            }
-+        }
-+    }
-+    if (CRpending) putc(13, outfile); /* Don't drop a lone trailing char 13 */
-+}
-+
-+static char basis_hex[] = "0123456789ABCDEF";
-+static char index_hex[128] = {
-+    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-+    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-+    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-+     0, 1, 2, 3,  4, 5, 6, 7,  8, 9,-1,-1, -1,-1,-1,-1,
-+    -1,10,11,12, 13,14,15,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-+    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-+    -1,10,11,12, 13,14,15,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-+    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1
-+};
-+
-+/* The following version generated complaints on Solaris. */
-+/* #define hexchar(c)  (((c) < 0 || (c) > 127) ? -1 : index_hex[(c)])  */
-+/*  Since we're no longer ever calling it with anything signed, this should work: */
-+#define hexchar(c)  (((c) > 127) ? -1 : index_hex[(c)])
-+
-+/*
-+hexchar(c)
-+char c;
-+{
-+    char *s;
-+    if (islower(c)) c = toupper(c);
-+    s = (char *) index(basis_hex, c);
-+    if (s) return(s-basis_hex);
-+    return(-1);
-+}
-+*/
-+
-+toqp(infile, outfile) 
-+FILE *infile, *outfile;
-+{
-+    int c, ct=0, prevc=255;
-+    while ((c = getc(infile)) != EOF) {
-+        if ((c < 32 && (c != '\n' && c != '\t'))
-+             || (c == '=')
-+             || (c >= 127)
-+             /* Following line is to avoid single periods alone on lines,
-+               which messes up some dumb smtp implementations, sigh... */
-+             || (ct == 0 && c == '.')) {
-+            putc('=', outfile);
-+            putc(basis_hex[c>>4], outfile);
-+            putc(basis_hex[c&0xF], outfile);
-+            ct += 3;
-+            prevc = 'A'; /* close enough */
-+        } else if (c == '\n') {
-+            if (prevc == ' ' || prevc == '\t') {
-+                putc('=', outfile); /* soft & hard lines */
-+                putc(c, outfile);
-+            }
-+            putc(c, outfile);
-+            ct = 0;
-+            prevc = c;
-+        } else {
-+            if (c == 'F' && prevc == '\n') {
-+                /* HORRIBLE but clever hack suggested by MTR for sendmail-avoidance */
-+                c = getc(infile);
-+                if (c == 'r') {
-+                    c = getc(infile);
-+                    if (c == 'o') {
-+                        c = getc(infile);
-+                        if (c == 'm') {
-+                            c = getc(infile);
-+                            if (c == ' ') {
-+                                /* This is the case we are looking for */
-+                                fputs("=46rom", outfile);
-+                                ct += 6;
-+                            } else {
-+                                fputs("From", outfile);
-+                                ct += 4;
-+                            }
-+                        } else {
-+                            fputs("Fro", outfile);
-+                            ct += 3;
-+                        }
-+                    } else {
-+                        fputs("Fr", outfile);
-+                        ct += 2;
-+                    }
-+                } else {
-+                    putc('F', outfile);
-+                    ++ct;
-+                }
-+                ungetc(c, infile);
-+                prevc = 'x'; /* close enough -- printable */
-+            } else { /* END horrible hack */
-+                putc(c, outfile);
-+                ++ct;
-+                prevc = c;
-+            }
-+        }
-+        if (ct > 72) {
-+            putc('=', outfile);
-+            putc('\n', outfile);
-+            ct = 0;
-+            prevc = '\n';
-+        }
-+    }
-+    if (ct) {
-+        putc('=', outfile);
-+        putc('\n', outfile);
-+    }
-+}
-+
-+fromqp(infile, outfile, boundaries, boundaryct) 
-+FILE *infile, *outfile;
-+char **boundaries;
-+int *boundaryct;
-+{
-+    unsigned int c1, c2;
-+    int sawnewline = 1, neednewline = 0;
-+    /* The neednewline hack is necessary because the newline leading into 
-+      a multipart boundary is part of the boundary, not the data */
-+
-+    while ((c1 = getc(infile)) != EOF) {
-+        if (sawnewline && boundaries && (c1 == '-')) {
-+            char Buf[200];
-+            unsigned char *s;
-+
-+            ungetc(c1, infile);
-+            fgets(Buf, sizeof(Buf), infile);
-+            if (boundaries
-+                 && (Buf[0] == '-')
-+                 && (Buf[1] == '-')
-+                 && PendingBoundary(Buf, boundaries, boundaryct)) {
-+                return;
-+            }
-+            /* Not a boundary, now we must treat THIS line as q-p, sigh */
-+            if (neednewline) {
-+                putc('\n', outfile);
-+                neednewline = 0;
-+            }
-+            for (s=(unsigned char *) Buf; *s; ++s) {
-+                if (*s == '=') {
-+                    if (!*++s) break;
-+                    if (*s == '\n') {
-+                        /* ignore it */
-+                        sawnewline = 1;
-+                    } else {
-+                        c1 = hexchar(*s);
-+                        if (!*++s) break;
-+                        c2 = hexchar(*s);
-+                        putc(c1<<4 | c2, outfile);
-+                    }
-+                } else {
-+#ifdef MSDOS
-+                    if (*s == '\n')
-+                        putc('\r', outfile);	/* insert CR for binary-mode write */
-+#endif
-+                    putc(*s, outfile);
-+                }
-+            }
-+        } else {
-+            if (neednewline) {
-+                putc('\n', outfile);
-+                neednewline = 0;
-+            }
-+            if (c1 == '=') {
-+                sawnewline = 0;
-+                c1 = getc(infile);
-+                if (c1 == '\n') {
-+                    /* ignore it */
-+                    sawnewline = 1;
-+                } else {
-+                    c2 = getc(infile);
-+                    c1 = hexchar(c1);
-+                    c2 = hexchar(c2);
-+                    putc(c1<<4 | c2, outfile);
-+                    if (c2 == '\n') sawnewline = 1;
-+                }
-+            } else {
-+                if (c1 == '\n') {
-+                    sawnewline = 1;
-+                    neednewline = 1;
-+                } else {
-+                    sawnewline = 0;
-+                    putc(c1, outfile);
-+                }
-+            }
-+        }
-+    }
-+    if (neednewline) {
-+        putc('\n', outfile);
-+        neednewline = 0;
-+    }    
-+}
---- metamail-2.7.orig/src/metamail/dlistold.c
-+++ metamail-2.7/src/metamail/dlistold.c
-@@ -0,0 +1,120 @@
-+// Copyright: Michael Moerz 2000
-+//
-+// This program is free software; you can redistribute it and/or modify
-+// it under the terms of the GNU General Public License as published by
-+// the Free Software Foundation; either version 2 of the License, or
-+// (at your option) any later version.
-+//
-+// This program is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+//
-+// You should have received a copy of the GNU General Public License with
-+// the Debian GNU/Linux distribution in file /usr/share/doc/common-licenses/GPL
-+// if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-+// Suite 330, Boston, MA  02111-1307  USA
-+
-+
-+#include <stdlib.h>
-+#include "dlist.h"
-+
-+/* create a new dlist node containing data */
-+DList* 
-+dlist_new(void* data) {
-+  DList* new = malloc( sizeof(DList) * 1 );
-+  
-+  new->next = NULL;
-+  new->prev = NULL;
-+  new->data = data;
-+
-+  return new;
-+}
-+
-+/* concatenate two lists */
-+void
-+dlist_cat(DList* tail_l1, DList* head_l2){
-+  tail_l1->next = head_l2;
-+  head_l2->prev = tail_l1; 
-+}
-+
-+/* to shorten things a bit in some cases */
-+DList*
-+dlist_insertnew(DList** tail, void* data) {
-+  DList* new = dlist_new( data );
-+  return dlist_insert( tail, new );
-+}
-+
-+/* can also be used to append to a list */
-+DList*
-+dlist_insert(DList** tail, DList* new) {
-+  if ( (*tail) ) {
-+    new->next = (*tail)->next;
-+    (*tail)->next = new;
-+    new->prev = (*tail);
-+  }     
-+
-+  if ( new->next )  // if next is defined, then set its prev value correctly
-+    new->next->prev = new;
-+  else
-+    (*tail) = new;
-+  
-+  return new;
-+}
-+
-+/* retrieves the head of a list */
-+DList* 
-+dlist_head(DList* head){
-+  DList* old;
-+
-+  while( head ) {
-+    old = head;
-+    head = head->prev;
-+  }
-+  
-+  return old;
-+}
-+
-+/* retrieves the tail of a list */
-+DList* 
-+dlist_tail(DList* head){
-+  DList* old;
-+
-+  while( head ) {
-+    old = head;
-+    head = head->next;
-+  }
-+  
-+  return old;
-+}
-+
-+/* returns the length of the list */
-+size_t 
-+dlist_length(DList* head){
-+  size_t n;
-+
-+  for (n = 0; head; ++n)
-+    head = head->next;
-+
-+  return n;
-+}
-+
-+/* removes an entry from the list, and returns it so that it might
-+   be destroyed properly */
-+DList*
-+dlist_remove(DList** head, DList** tail, DList* entry) {
-+  if (entry != (*head)) {  // when not head
-+    if (entry->prev)       // and a previous entry exists
-+      entry->prev->next = entry->next; // tell the previous our next entry
-+  } else
-+    (*head) = entry->next; // otherwise next entry is head
-+        
-+  if (entry != (*tail)) {  // when not tail
-+    if (entry->next)       // and next entry exists
-+      entry->next->prev = entry->prev; // tell the next entry our previous one
-+  } else
-+    (*tail) = entry->prev; // otherwise previous is tail
-+
-+  return entry;
-+}
-+
---- metamail-2.7.orig/src/metamail/metamail.c
-+++ metamail-2.7/src/metamail/metamail.c
-@@ -0,0 +1,2223 @@
-+/*
-+Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+
-+Permission to use, copy, modify, and distribute this material 
-+for any purpose and without fee is hereby granted, provided 
-+that the above copyright notice and this permission notice 
-+appear in all copies, and that the name of Bellcore not be 
-+used in advertising or publicity pertaining to this 
-+material without the specific, prior written permission 
-+of an authorized representative of Bellcore.  BELLCORE 
-+MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+*/
-+/****************************************************** 
-+    Metamail -- A tool to help diverse mail readers 
-+                cope with diverse multimedia mail formats.
-+
-+    Author:  Nathaniel S. Borenstein, Bellcore
-+
-+ ******************************************************* */
-+
-+#include <metamail/common.h>
-+#include <metamail/patchlevel.h>
-+#include <metamail/dlist.h>
-+
-+#include "metamail.h"
-+#include "metamail_default.h"
-+#include "environment.h" /* for initializing global variables to default or
-+			    environment variables and for manipulating 
-+			    environment variables */
-+#include "mailcap.h" /* mailcap file(s) parsing functions */
-+
-+
-+char fileToDelete[NAME_MAX];
-+
-+char *FindParam();
-+
-+FILE *InputFP = NULL;
-+
-+/* mike extensions */
-+int nDebug = 0;
-+/* exts end */
-+
-+int MightAskBeforeExecuting = 1,
-+    DefinitelyNotTty = 0,
-+    MustNotBeTty = 0,
-+    MaybePageOutput = 0,
-+    MustPageOutput = 0,
-+    EatLeadingNewlines = 0,
-+    PrintSomeHeaders = 1,
-+    DoInBackground = 0,
-+    Quiet = 0,
-+    TransparentMode = 0,
-+    DeleteSourceFileWhenDone = 0,
-+    Is822Format = 1,
-+    DoDebug = 0,
-+    CParamsAlloced = 0,
-+    CParamsUsed = 0,
-+    YankMode = 0,
-+    UsingStandardInput = 0,
-+    PrintingMode = 0,
-+    JustWriteFiles = 0,
-+    ProcessingErrors = 0;
-+
-+int RunAsRootOK = 0;
-+
-+char *ContentType = NULL,
-+    *ContentEncoding = NULL,
-+    *MailerName = "unknown",
-+    *MailSubject = "Mail message",
-+    *MailFrom = "unknown sender",
-+    *MailSummary = "non-text mail message",
-+    *mailheaders = NULL,
-+    **CParams = NULL,
-+    **CParamValues = NULL,
-+    *JunkParameter = NULL;
-+
-+int EncodingCode = ENCODING_NONE;
-+
-+struct part {
-+    char *ctype;
-+    char *fname;
-+    struct part *next;
-+};
-+
-+struct NoAskItem *FirstNoAskItem = NULL, 
-+  *FirstQuietItem = NULL;
-+
-+void PrintHeader();
-+void ConsumeRestOfPart();
-+void ParseContentParameters();
-+
-+sigtype cleanup();
-+
-+char *Cleanse(s) /* no leading or trailing space, all lower case */
-+char *s;
-+{
-+    char *tmp, *news;
-+    
-+    /* strip leading white space */
-+    while (*s && isspace((unsigned char) *s)) ++s;
-+    news = s;
-+    /* put in lower case */
-+    for (tmp=s; *tmp; ++tmp) {
-+        if (isupper((unsigned char) *tmp)) *tmp = 
-+					     tolower((unsigned char) *tmp);
-+    }
-+    /* strip trailing white space */
-+    while (tmp > news && *--tmp && isspace((unsigned char) *tmp)) *tmp = 0;
-+    return(news);
-+}
-+
-+char *UnquoteString(s)
-+char *s;
-+{
-+    char *ans, *t;
-+
-+    if (*s != '"') return(s);
-+    ans = XMALLOC(char, 1+strlen(s)); //malloc(1+strlen(s));
-+    ++s;
-+    t = ans;
-+    while (*s) {
-+        if (*s == '\\') {
-+            *t++ = *++s;
-+        } else if (*s == '"') {
-+            break;
-+        } else {
-+            *t++ = *s;
-+        }
-+        ++s;
-+    }
-+    *t = 0;
-+    return(ans);
-+}
-+
-+sigtype
-+cleanup(signum) 
-+int signum;
-+{
-+    RestoreTtyState();
-+    signal(signum, SIG_DFL);
-+    kill(getpid(), signum);
-+}
-+
-+char **Boundaries = NULL;
-+int BoundaryCt = 0, BoundaryAlloc = 0;
-+struct nextfile {
-+    char *filename;
-+    struct nextfile *next;
-+} *FileQueue=NULL, *LastInQueue = NULL;
-+
-+void
-+ResetGlobals() {
-+    CParamsAlloced = 0;
-+    CParamsUsed = 0;
-+
-+    ContentType = NULL;
-+    ContentEncoding = NULL;
-+    MailSubject = "Mail message";
-+    MailFrom = "unknown sender";
-+    MailSummary = "non-text mail message";
-+    initMailHeadersFromEnvironment();
-+    CParams = NULL;
-+    CParamValues = NULL;
-+    JunkParameter = NULL;
-+}
-+
-+
-+/** initializes signalhandlers to cleanup function */
-+void
-+initSignalHandlers() {
-+    signal(SIGINT,  cleanup);
-+    signal(SIGILL,  cleanup);
-+    signal(SIGTRAP, cleanup);
-+    signal(SIGIOT,  cleanup);
-+    signal(SIGFPE,  cleanup);
-+    signal(SIGSEGV, cleanup);
-+    signal(SIGTERM, cleanup);
-+#ifdef SIGXCPU
-+    signal(SIGXCPU, cleanup);
-+#endif
-+}
-+
-+/** the main function for metamail */
-+main(argc, argv)
-+int argc;
-+char **argv;
-+{
-+    int retcode = 0;
-+
-+    initSignalHandlers;
-+    addToPath(AUXPATH);           /* add additional dirs to PATH */
-+    fileToDelete[0] = 0;
-+
-+    ProcessArguments(argc, argv); /* calls ExitWithError on error */
-+
-+    if (MaybePageOutput) {
-+        /* Want to send stderr to pager too, sigh... */
-+        fflush(stderr);
-+        close(2);
-+        dup2(1, 2);
-+    }
-+
-+    retcode = HandleMessage(NULL, 0);
-+    if (! UsingStandardInput) {
-+        fclose(InputFP);
-+    }
-+    if (fileToDelete[0]) {
-+        RmTmpFileName(fileToDelete);
-+        fileToDelete[0] = 0;
-+    }
-+
-+    while (FileQueue) {
-+        InputFP = fopen(FileQueue->filename, "r");
-+        if (DoDebug) printf("Trying to open input file: %s\n",
-+			    FileQueue->filename);
-+        if (!InputFP) ExitWithError("Can't read input file");
-+        if (DeleteSourceFileWhenDone) {
-+            strcpy(fileToDelete, FileQueue->filename);
-+        }
-+        ResetGlobals();
-+        retcode |= HandleMessage(NULL, 0);
-+        if (! UsingStandardInput) {
-+            fclose(InputFP);
-+        }
-+        if (fileToDelete[0]) {
-+            RmTmpFileName(fileToDelete);
-+            fileToDelete[0] = 0;
-+        }
-+        FileQueue = FileQueue->next;
-+    }
-+    if (MustPageOutput) PauseForUser();
-+    if (DoDebug) fprintf(stderr, "end of metamail\n");
-+    CleanupTmpFiles();
-+    exit(ProcessingErrors? -1 : retcode);
-+}
-+
-+void
-+QueueNextFile(fname)
-+char *fname;
-+{
-+    struct nextfile *tmp = XMALLOC( struct nextfile, 1);
-+    tmp->filename = fname;
-+    tmp->next = NULL;
-+    if (FileQueue) {
-+        LastInQueue->next = tmp;
-+        LastInQueue = tmp;
-+    } else {
-+        FileQueue = tmp;
-+        LastInQueue = tmp;
-+    }
-+}
-+
-+HandleMessage(SquirrelFile, nestingdepth)
-+char *SquirrelFile;
-+/* SquirrelFile, if non-NULL, is a place to save a recognized body instead of executing it. */
-+int nestingdepth;
-+{
-+    char *boundary;
-+    int FileWriteOnly = JustWriteFiles;
-+
-+    if (FileWriteOnly) {
-+        if (!lc2strncmp(ContentType, "message/", 8)
-+             || !lc2strncmp(ContentType, "multipart/", 10)) {
-+            FileWriteOnly = 0; /* only leaf data */
-+        }
-+    }
-+    if (Is822Format) {
-+	if (Read822Prefix(SquirrelFile?0:1, nestingdepth)) {
-+	    return -1;
-+	}
-+    } else /* this property is not recursive for multipart or message */
-+      Is822Format = 1;
-+
-+    PrepareMessage();
-+    if (!FileWriteOnly && !ProcessMailcapFiles(SquirrelFile)) return(0);
-+	
-+    if (!lc2strcmp(ContentType, "message")
-+         || !lc2strcmp(ContentType, "message/rfc822")) { 
-+        if (SquirrelFile) return(SaveSquirrelFile(SquirrelFile));
-+        ContentType = NULL; /* reset default */
-+        ContentEncoding = NULL; /* reset default */
-+        return(HandleMessage(NULL, nestingdepth+1)); /* simple recursion */
-+    }
-+
-+    boundary = FindParam("boundary");
-+    if (!boundary) boundary =JunkParameter; /* backward compatibility hack */
-+    if (!lc2strncmp(ContentType, "multipart", 9)) { 
-+      if (!boundary) {
-+	  fprintf(stderr, "Warning: No boundary for multipart data, treating as unrecognized format.\n");
-+      } else {
-+        char *LineBuf, NewSquirrelFile[TMPNAME_MAX];
-+        char *subtype = NULL;
-+        int currct, result, IsAlternative, WroteSquirrelFile, boundarylen;
-+
-+        if (SquirrelFile) return(SaveSquirrelFile(SquirrelFile));
-+        if (boundary[0] == '"') {
-+            boundary=UnquoteString(boundary);
-+        }
-+        subtype = index(ContentType, '/');
-+        if (subtype) {
-+            ++subtype;
-+            subtype = Cleanse(subtype);
-+        } else subtype = "mixed";
-+
-+        if (!MaybePageOutput && !DoInBackground) 
-+	  DoInBackground = strcmp(subtype, "parallel") ? 0 : 1;
-+
-+        IsAlternative = strcmp(subtype, "alternative") ? 0 : 1;
-+        if (IsAlternative) {
-+            MkTmpFileName(NewSquirrelFile);
-+            WroteSquirrelFile = 0;
-+        }
-+        LineBuf = XMALLOC(char, LINE_BUF_SIZE);
-+        sprintf(LineBuf, "--%s", boundary);
-+        strcpy(boundary, LineBuf);
-+        boundarylen = strlen(boundary);
-+        if (BoundaryCt >= BoundaryAlloc) {
-+            BoundaryAlloc += 5;
-+            if (Boundaries) 
-+	        Boundaries = XREALLOC(char *, Boundaries, BoundaryAlloc);
-+            else 
-+	        Boundaries = XMALLOC(char *, BoundaryAlloc);
-+        }
-+        Boundaries[BoundaryCt++] = boundary;
-+        if (DoDebug) printf("Handling multipart as built-in here.  Boundary: %s\n", boundary);
-+        while (fgets(LineBuf, LINE_BUF_SIZE, InputFP)) { /* find start */
-+            if (!strncmp(LineBuf, boundary, boundarylen)
-+                 && ((LineBuf[boundarylen] == '\n')
-+                      || (LineBuf[boundarylen] == '-'
-+                           && LineBuf[boundarylen+1] == '-'
-+                           && LineBuf[boundarylen+2] == '\n'))) {
-+                break;
-+            }
-+        }
-+        XFREE(LineBuf);
-+        currct = BoundaryCt;
-+        while(currct == BoundaryCt) {
-+            if (!strcmp(subtype, "digest")) {
-+                ContentType = "message/rfc822";
-+            } else {
-+                ContentType = NULL; /* reset default */
-+            }
-+            ContentEncoding = NULL; /* reset default */
-+            if (IsAlternative) {
-+                result = HandleMessage(NewSquirrelFile, nestingdepth+1);
-+            } else{
-+                result = HandleMessage(NULL, nestingdepth+1);
-+            }
-+            if (result) {
-+                /* Need to consume the rest of the part */
-+                ConsumeRestOfPart(NULL);
-+            } else {
-+                ++WroteSquirrelFile;
-+            }
-+        }
-+        /* Now we've seen the last encapsulation boundary, but if there is a "postfix"
-+            we must throw it away.*/
-+        if (BoundaryCt > 0) {
-+            ConsumeRestOfPart(NULL);
-+        }
-+        if (IsAlternative) {
-+            if (WroteSquirrelFile) {
-+                int retcode; 
-+                char Cmd[TMPNAME_MAX + 15];
-+                sprintf(Cmd, "%s %s", METAMAIL, NewSquirrelFile);
-+                fflush(stdout); fflush(stderr);
-+                retcode = system(Cmd);
-+                RmTmpFileName(NewSquirrelFile);
-+                return(retcode);
-+            } else {
-+                printf("Cannot handle any part of multipart/alternative message\n");
-+            }
-+        }
-+	return(0);
-+      }
-+    } /* End of multipart handling */
-+    if (!FileWriteOnly && !TryBuiltIns(SquirrelFile)) return(0);
-+    if (!SquirrelFile) { /* Very last resort -- unrecognized types */
-+        char Fname[NAME_MAX], *suggestedname, SugBuf[NAME_MAX];
-+        FILE *fp;
-+        int ans = 0, octetstream, ecode=0;
-+        int JustMadeTheFile=0;
-+
-+        Fname[0] = 0;
-+
-+        suggestedname = FindParam("name");
-+        if (!suggestedname) {
-+            MkTmpFileName(SugBuf);
-+            suggestedname = SugBuf;
-+            JustMadeTheFile=1;
-+        }
-+        if (strlen(suggestedname) > NAME_MAX - 50)
-+             suggestedname[NAME_MAX - 50] = '\0';
-+        if (suggestedname[0] == '"')
-+                suggestedname=UnquoteString(suggestedname);
-+ 
-+        octetstream = ! lc2strcmp(ContentType, "application/octet-stream");
-+        if (MightAskBeforeExecuting && !DefinitelyNotTty && !MustNotBeTty) {
-+            if (FileWriteOnly) {
-+                printf("\nThis message contains '%s`-format data.\n", ContentType);
-+            } else if (octetstream) {
-+                printf("This message contains raw digital data, which can either be viewed as text\nor written to a file.\n");
-+            } else {
-+                printf("\nThis message contains data in an unrecognized format, %s,\nwhich can either be viewed as text or written to a file.\n", ContentType);
-+            }
-+            while (!ans) {
-+                if (FileWriteOnly) {
-+                    ans = 2;
-+                } else {
-+                    printf("\nWhat do you want to do with the %s data?\n1 -- See it as text\n2 -- Write it to a file\n3 -- Just skip it\n4 -- Give another content type\n\n", octetstream ? "raw" : ContentType);
-+                    fgets(Fname, sizeof(Fname), stdin);
-+                    ans = atoi(Fname);
-+                }
-+                switch(ans) {
-+                    case 1:
-+                        TranslateInputToOutput(InputFP, stdout, EncodingCode, "text");
-+                        return(0);
-+                    case 2:
-+                        {
-+                        int needname = 1;
-+                        while (needname) {
-+                            needname = 0;
-+                            printf("Please enter the name of a file to which the data should be written\n(Default: %s) > ", suggestedname);
-+                            fflush(stdout);
-+                            fgets(Fname, sizeof(Fname), stdin);
-+                            Fname[strlen(Fname) - 1] = '\0'; /* bogus newline */
-+                            if (!Fname[0])
-+			      strcpy(Fname, suggestedname);
-+
-+                            if (Fname[0] == '~' && Fname[1] == '/') {
-+                                char Fname2[NAME_MAX];
-+                                int uid = getuid();
-+                                struct passwd *p;
-+                                p = getpwuid(uid);
-+                                if (!p) {
-+				  strcpy( Fname, suggestedname );
-+				  printf("Cannot figure out what ~ means, using temporary file %s instead\n", Fname);
-+                                } else {
-+                                    strcpy(Fname2, p->pw_dir);
-+                                    strcat(Fname2, "/");
-+                                    strcat(Fname2, Fname + 2);
-+                                    strcpy(Fname, Fname2);
-+                                }
-+                            }
-+
-+			    if ( strcmp( Fname, suggestedname ) ) 
-+			      RmTmpFileName( suggestedname );
-+			    else  /* remove from tmp list (should persist) */
-+			      DelTmpFileName( suggestedname ); 
-+			    
-+			    
-+			    if (DoDebug) fprintf(stderr, "pre access");
-+
-+                            if (!JustMadeTheFile && access(Fname, F_OK) == 0) {
-+                                char *s, AnsBuf[50];
-+                                int overwriteans = -1;
-+                                do {
-+                                    printf("File %s exists.  Do you want to overwrite it (y/n) ?\n", Fname);
-+                                    s = fgets(AnsBuf, sizeof(AnsBuf), stdin);
-+                                    if (!s) {
-+                                        overwriteans = 0;
-+                                    } else {
-+                                        while (s && *s && isspace((unsigned char) *s)) ++s;
-+                                        if (*s == 'y' || *s == 'Y' || !*s || *s == '\n') {
-+                                            overwriteans = 1;
-+                                        } else if (*s == 'n' || *s == 'N' || *s == 'q' || *s == 'Q') {
-+                                            overwriteans=0;
-+                                        }
-+                                    }
-+                                    if (overwriteans == -1) printf("Please answer yes or no.\n");
-+                                } while (overwriteans == -1);
-+                                if (overwriteans == 0) needname = 1;
-+                            }
-+                        }
-+                        }
-+                        break;
-+                    case 3:
-+                        ConsumeRestOfPart(NULL);
-+                        return(0);
-+                        break;
-+		    case 4:
-+		      {
-+			char *savedContentType = ContentType;
-+			ContentType = malloc(64);
-+			printf("Please enter new content type> ");
-+			fflush(stdout);
-+			fgets(ContentType, 64, stdin);
-+			ContentType[strlen(ContentType) - 1] = '\0'; /* bogus newline */
-+			if (!ProcessMailcapFiles(SquirrelFile)) { 
-+			  free(savedContentType); 
-+			  return(0); 
-+			}
-+			printf("\nNo matching mailcap entry found.\n");
-+			free(ContentType);
-+			ContentType = savedContentType;
-+			ans = 0;
-+			break;
-+		      }
-+                    default:
-+                        ans = 0;
-+                        break;
-+                }
-+            }
-+        } else {
-+            int ct = 0;
-+            char *slash = rindex(suggestedname, '/');
-+            if (slash)  {
-+                ++slash;
-+            } else {
-+                slash = suggestedname;
-+            }
-+            do {
-+                if (ct) {
-+                    sprintf(Fname, "%s/%d-%s", tmproot, ct, slash);
-+                } else {
-+                    sprintf(Fname, "%s/%s", tmproot, slash);
-+                }
-+                ++ct;
-+            } while (access(Fname, F_OK) == 0);
-+            if (FileWriteOnly) {
-+                printf("\nThis message contains '%s`-format data.\n", ContentType);
-+            } else if (octetstream) {
-+                printf("\nThis message contains raw digital data,");
-+            } else {
-+                printf("\nThis message contains data in an unrecognized format, %s,", ContentType);
-+            }
-+            printf("\nwhich is being decoded and written to the file named \"%s\".\nIf you do not want this data, you probably should delete that file.\n", Fname);
-+        }
-+        if (Fname[0] == 0 || Fname[0] == '\n') {
-+            ConsumeRestOfPart(NULL);
-+        } else {
-+            fp = fopen(Fname, WRITE_BINARY);
-+            if (!fp) ExitWithError("Cannot open temporary file");
-+            TranslateInputToOutput(InputFP, fp, EncodingCode, ContentType);
-+            ecode = fclose(fp);
-+            if (ecode) {
-+                printf("Could not write file %s\n", Fname);
-+            } else {
-+                printf("Wrote file %s\n", Fname);
-+            }
-+        }
-+        if (!DefinitelyNotTty && MaybePageOutput && BoundaryCt > 0) PauseForUser();
-+        return(ecode);
-+    }
-+    return(-1); /* Unrecognized, really */
-+}
-+
-+ProcessArguments(argc, argv)
-+int argc;
-+char **argv;
-+{
-+  int i;
-+  char *SourceFileName = NULL;
-+
-+  initVarsFromEnvironment(); /* init global vars from environment */
-+
-+    for (i=1; i<argc; ++i) {
-+	if (argv[i][0] == '-') {
-+	    switch (argv[i][1]) {
-+		case '\0':
-+		    /* Not really necessary, but.... */
-+		    SourceFileName = NULL;
-+		    UsingStandardInput = 1;
-+		    break;
-+		case 'b':
-+		    Is822Format = 0;
-+		    break;
-+		case 'B':
-+		    DoInBackground = 1;
-+		    break;
-+                case 'c':
-+		    if (++i >= argc) usage();
-+		    ContentType = XMALLOC(char, 1+strlen(argv[i]));
-+                    strcpy(ContentType,argv[i]);
-+                    /* strip leading white space */
-+                    while (*ContentType && isspace((unsigned char) *ContentType)) ++ContentType;
-+                    StripTrailingSpace(ContentType);
-+                    ParseContentParameters(ContentType);
-+                    break;
-+                case 'd':
-+		    MightAskBeforeExecuting = 0;
-+		    break;
-+		case 'e':
-+		    EatLeadingNewlines = 1;
-+		    break;
-+		case 'E':
-+		    if (++i >= argc) usage();
-+		    ContentEncoding = argv[i];
-+		    break;
-+		case 'f':
-+		    if (++i >= argc) usage();
-+		    MailFrom = argv[i];
-+                    break;
-+                case 'h':
-+                    {
-+                    FILE *tmpfp;
-+                    PrintingMode = 1;
-+                    MightAskBeforeExecuting = 0;
-+		    //#ifdef AMIGA
-+		    //		    freopen("prt:", "w", stdout);
-+		    //#else
-+                    /* Want to make all of stdout go to printer, and this 
-+                      is easier than changing every output statement,
-+                      at least on UNIX... */
-+                    tmpfp = popen(LPRCOMMAND, "w");
-+                    if (!tmpfp) {
-+                        ExitWithError("Cannot execute lpr command");
-+                    }
-+                    fflush(stdout);
-+                    close(1);
-+                    dup2(fileno(tmpfp), 1);
-+		    //#endif
-+                    break;
-+                    }
-+		case 'm':
-+		    if (++i >= argc) usage();
-+		    MailerName = argv[i];
-+		    break;
-+		case 'p':
-+		    MaybePageOutput = 1;
-+		    break;
-+		case 'P':
-+                    MaybePageOutput = 1;
-+                    MustPageOutput = 1;
-+		    break;
-+		case 'r':
-+		    RunAsRootOK = 1;
-+                    break;
-+                case 'R':
-+#ifdef RESET_PROGRAM
-+                    system(RESET_PROGRAM);
-+                    if (DoDebug) printf("Executed reset\n");
-+#else
-+                    fprintf(stderr, "metamail warning: -R flag not supported on this system\n");
-+#endif
-+                    break;
-+		case 's':
-+		    if (++i >= argc) usage();
-+		    MailSubject = argv[i];
-+		    break;
-+                case 'T':
-+                    TransparentMode = 0;
-+                    break;
-+                case 'w':
-+                    JustWriteFiles = 1;
-+                    break;
-+                case 'q':
-+                    Quiet = 1;
-+		    PrintSomeHeaders = 0;
-+		    break;
-+		case 'x':
-+                    DefinitelyNotTty = 1;
-+                    MustNotBeTty = 1;
-+		    break;
-+                case 'y':
-+                    YankMode = 1;
-+                    break;
-+		case 'z':
-+		    DeleteSourceFileWhenDone = 1;
-+		    break;
-+		default:
-+		    usage();
-+	    }
-+	} else {
-+	    if (SourceFileName) {
-+                QueueNextFile(argv[i]);
-+	    } else {
-+		SourceFileName = argv[i];
-+	    }
-+	}
-+    }
-+    if (TransparentMode) {
-+        RunInNewWindow(argv, argc, &SourceFileName);
-+    }
-+    if (MaybePageOutput && DoInBackground) {
-+	MustNotBeTty = 1;
-+        /*fprintf(stderr, "metamail: -B is incompatible with -p, -P, and MM_USEPAGER\n");
-+        usage(); */
-+    }
-+    if (!Is822Format && !ContentType) {
-+	fprintf(stderr, "metamail:  -b requires -c.\n");
-+	usage();
-+    }
-+    if (DeleteSourceFileWhenDone && !SourceFileName) {
-+	fprintf(stderr, "metamail:  -z requires -f.\n");
-+	usage();
-+    }
-+    if (!RunAsRootOK && (getuid() == 0 || geteuid() == 0)) {
-+	fprintf(stderr, "You can not run MetaMail as root unless you use -r or set MM_RUNASROOT.\n");
-+	usage();
-+    }
-+    if (SourceFileName) {
-+        InputFP = fopen(SourceFileName, "r");
-+        if (DoDebug) printf("Trying to open input file: %s\n", SourceFileName);
-+        if (!InputFP) ExitWithError("Can't read input file");
-+        if (DeleteSourceFileWhenDone) {
-+            strcpy(fileToDelete, SourceFileName);
-+        }
-+    } else {  /* input on stdin */
-+        UsingStandardInput = 1;
-+        if (MustNotBeTty) {
-+            InputFP = stdin;
-+/*            MaybePageOutput = 1; */ /* This messed up safe-tcl -- nsb 9/21/93 */
-+            MightAskBeforeExecuting = 0;
-+        } else {
-+            int newfd = dup(0);
-+            FILE *newfp;
-+            if (newfd > 0) {
-+                InputFP = fdopen(newfd, "r");
-+                if (InputFP 
-+                     && ((newfp = fopen("/dev/tty", "r")) != NULL)
-+                     && !dup2(fileno(newfp), 0)) {
-+                    DefinitelyNotTty = 0;
-+                } else {
-+                    InputFP = stdin;
-+                    DefinitelyNotTty = 1;
-+                    MaybePageOutput = 0;
-+                }
-+            }
-+        }
-+    }
-+    if (DefinitelyNotTty && MaybePageOutput) {
-+        RunInNewWindow(argv, argc, &SourceFileName);
-+    }
-+    if (DefinitelyNotTty) {
-+        MaybePageOutput = 0;	/* Disable pager if I/O has been redirected */
-+    }
-+    return(0);
-+}
-+
-+usage() {
-+    fprintf(stderr, "Usage:  metamail [-b] [-B] [-d] [-e] [-h] [-r] [-R] [-p]  [-P] [-x] [-y] [-z] [-c content-type] [-E content-transfer-encoding] [-f from-name] [-m mailername] [-s subject] [message-file-name]\n");
-+    ExitWithError(NULL);
-+}
-+
-+RunInNewWindow(argv, argc, SourceFileNamePtr)
-+char **argv, **SourceFileNamePtr;
-+int argc;
-+{
-+    char *FullCmd, TmpName[TMPNAME_MAX];
-+    int i, createdfile=0;
-+    if (!*SourceFileNamePtr) {
-+        char *LineBuf;
-+        FILE *fptmp;
-+
-+        LineBuf = XMALLOC(char, LINE_BUF_SIZE);
-+        /* Create it, ugh.  Also needs to affect later command. */
-+        MkTmpFileName(TmpName);
-+	DelTmpFileName(TmpName);
-+        DeleteSourceFileWhenDone = 1;
-+        fptmp = fopen(TmpName, WRITE_BINARY);
-+        if (!fptmp) ExitWithError("Can't open temporary file\n");
-+        while (fgets(LineBuf, LINE_BUF_SIZE, stdin)) {
-+            fputs(LineBuf, fptmp);
-+        }
-+        XFREE(LineBuf);
-+        fclose(fptmp);
-+        *SourceFileNamePtr = TmpName;
-+        createdfile = 1;
-+    }
-+    FullCmd = XMALLOC(char, CMDSIZE);
-+    if (TransparentMode) {
-+        /* In transparent mode, we want to produce stdout that is what we get in, and do EVERYTHING externally in a terminal window.  This is to make the truly brain-dead mailers like mailtool happy. I am NOT happy about having to do this.  */
-+        /* So, first we copy everything to stdout */
-+        sprintf(FullCmd, CATTEMPLATE, *SourceFileNamePtr);
-+        system(FullCmd); /* Cheesy way to do it */
-+        fflush(stdout); fflush(stderr);
-+    }
-+    /* Then we run ourselves in a terminal window */
-+    MailSummary = "Metamail"; /* for window label */
-+    CreateNewWindowPrefix(FullCmd);
-+    strcat(FullCmd, METAMAIL);
-+    strcat(FullCmd, " -P ");
-+    if (TransparentMode) strcat(FullCmd, "-T ");
-+    for (i=1; i<argc; ++i) {
-+        if (strncmp(argv[i], "-x", 2)
-+             && strncmp(argv[i], "-B", 2)
-+             && strncmp(argv[i], "-d", 2)) {
-+            strcat(FullCmd, "\"");
-+            strcat(FullCmd, argv[i]);
-+            strcat(FullCmd, "\" ");
-+        }
-+    }
-+    if (createdfile) {
-+        strcat(FullCmd, "-z ");
-+        strcat(FullCmd, *SourceFileNamePtr);
-+    }
-+    if (!MightAskBeforeExecuting) {
-+        strcat(FullCmd, " -d ");
-+        /* The special hack for -d is HORRIBLE, but xterm screws up with the -d option in the middle of the command line! */
-+    }
-+    if (DoInBackground) strcat(FullCmd, " &");
-+    DefinitelyNotTty = 0;
-+    SetUpEnvironment();
-+    if (DoDebug) fprintf(stderr, "Executing %s\n", FullCmd);
-+    fflush(stdout); fflush(stderr);
-+    exit(system(FullCmd));
-+}
-+
-+
-+static char *ThingsToSkip[] = {
-+    "csh ",
-+    "sh ",
-+    "ksh ",
-+    NULL
-+};
-+
-+char *ShortCommand(progname)
-+char *progname;
-+{
-+    int i;
-+    char *s, *oldprogname;
-+    static char FullProgName[500];
-+
-+eatmore:
-+    while (*progname && (*progname == '(' || isspace((unsigned char) *progname))) {
-+        ++progname;
-+    }
-+    oldprogname = progname;
-+    for (i = 0; oldprogname == progname && ThingsToSkip[i]; ++i) {
-+        if (!strncmp(progname, ThingsToSkip[i], strlen(ThingsToSkip[i]))) {
-+            progname += strlen(ThingsToSkip[i]);
-+        }
-+    }
-+    if (*progname == '-') {
-+        ++progname;
-+        while (*progname && !isspace((unsigned char) *progname)) ++progname;
-+    }
-+    if (progname != oldprogname) goto eatmore;
-+    strcpy(FullProgName, progname);
-+    s = index(FullProgName, ' ');
-+    if (s) *s = 0;
-+    s = rindex(FullProgName, '/');
-+    if (s) {
-+	return(s+1);
-+    } else {
-+	return(FullProgName);
-+    }
-+}    
-+
-+TryMailcapEntry(mc, SquirrelFile)
-+struct MailcapEntry mc;
-+char *SquirrelFile;
-+{
-+    StripTrailingSpace(mc.contenttype);
-+    if (DoDebug) fprintf(stderr, "Trying mailcap entry for '%s'.\n", mc.contenttype);
-+    if (PrintingMode && !mc.printcommand) return(-1);
-+    if (CtypeMatch(ContentType, mc.contenttype) && PassesTest(&mc)) {
-+        if (SquirrelFile) {
-+            return(SaveSquirrelFile(SquirrelFile));
-+        } else {
-+            char TmpFileName[TMPNAME_MAX];
-+            MkTmpFileName(TmpFileName);
-+            return(ExecuteMailcapEntry(mc, TmpFileName, ContentType));
-+        }
-+    }
-+    if (mc.needtofree) {
-+        XFREE(mc.contenttype);
-+        XFREE(mc.command);
-+    }
-+    return(-1);
-+}
-+
-+SaveSquirrelFile(SquirrelFile)
-+char *SquirrelFile;
-+{
-+    int j;
-+    FILE *outfp;
-+
-+    if (DoDebug) printf("saving to file %s\n", SquirrelFile);
-+
-+    outfp = fopen(SquirrelFile, WRITE_BINARY);
-+    if (!outfp) {
-+        fprintf(stderr, "Cannot open %s to squirrel away a portion of a multipart/alternative\n", SquirrelFile);
-+        return(-1);
-+    }
-+    fprintf(outfp, "Content-type: %s", ContentType);
-+    for (j=0; j<CParamsUsed; ++j) {
-+        fprintf(outfp, " ; ");
-+        fprintf(outfp, "%s", CParams[j]);
-+        fprintf(outfp, " = ");
-+        fprintf(outfp, "%s", CParamValues[j]);
-+    }
-+    fprintf(outfp, "\n\n"); 
-+    TranslateInputToOutput(InputFP, outfp, EncodingCode, ContentType);
-+    if (fclose(outfp)) {
-+        ExitWithError("fclose failed");
-+    }
-+    return(0);
-+}
-+
-+ExecuteMailcapEntry(mc, TmpFileName, ThisContentType)
-+char *TmpFileName, *ThisContentType;
-+struct MailcapEntry mc;
-+{
-+    int resultcode=0, DidExecute, UsedTmpFileName;
-+    struct part *PartsWritten=NULL;
-+    char *s, *cmd;
-+
-+    cmd = XMALLOC(char, CMDSIZE);
-+    if (PrintingMode && !mc.printcommand) return(-1);
-+    BuildCommand(cmd, PrintingMode ? mc.printcommand : mc.command, TmpFileName, &UsedTmpFileName, &PartsWritten);
-+    if (DoDebug) fprintf(stderr, "Match!  Built command %s.\n", cmd);
-+    if (mc.copiousoutput && MaybePageOutput) {
-+        strcat(cmd, " | ");
-+        s = getenv("METAMAIL_PAGER");
-+        if (s && strncmp(s, "metamail", 8)) {
-+            /* If METAMAIL_PAGER is set to "metamail" we override it */
-+            strcat(cmd, s);
-+            if (!strncmp(s, "less", 4) && strncmp(s+5, "-r", 2)) {
-+                fprintf(stderr, "Warning:  'less' without '-r' behaves badly for some mail types,\n\tnotably richtext.\n");
-+            }
-+        } else {
-+            strcat(cmd, "more");
-+        }
-+    }
-+    if (!DefinitelyNotTty) {
-+        SaveTtyState();
-+    }
-+    if (!NeedToAskBeforeExecuting(ThisContentType)
-+         || OKToRun(ThisContentType, cmd, mc.label)) {
-+        char *FullCmd;
-+        int ReallyNotTty;
-+	//#ifndef NO_RLIMITS
-+        /* Limit size of core dumps */
-+        //struct rlimit rlp;
-+
-+        //rlp.rlim_cur = 0;
-+        //rlp.rlim_max = 0;
-+        //setrlimit(RLIMIT_CORE, &rlp); 
-+	//#endif
-+        FullCmd = XMALLOC(char, CMDSIZE);
-+        ReallyNotTty = DefinitelyNotTty;
-+        if (mc.needsterminal
-+             && DefinitelyNotTty) {
-+            int j;
-+            sprintf(cmd, " %s -P -b -c '%s", METAMAIL, ThisContentType);
-+            for (j=0; j<CParamsUsed; ++j) {
-+                strcat(cmd, " ; ");
-+                strcatquoting(cmd, CParams[j]);
-+                strcat(cmd, " = ");
-+                strcatquoting(cmd, CParamValues[j]);
-+            }
-+            strcat(cmd, "' ");
-+            strcat(cmd, TmpFileName);
-+            CreateNewWindowPrefix(FullCmd);
-+            strcat(FullCmd, cmd);
-+            DefinitelyNotTty = 0; /* For recursive call */
-+        } else {
-+            strcpy(FullCmd, cmd);
-+        }
-+        DidExecute = 0;
-+        if (UsedTmpFileName || PartsWritten) {
-+            int isempty;
-+            if (PartsWritten) {
-+                isempty = 0;
-+            } else {
-+                isempty = WriteTmpFile(TmpFileName, ThisContentType);
-+            }
-+            if (!isempty || strncmp(ThisContentType, "text", 4)) {
-+                if (DoInBackground && !PartsWritten && !mc.needsterminal) {
-+                    char TmpCmd[CMDSIZE];
-+                    sprintf(TmpCmd, "(%s; rm %s) &", FullCmd, TmpFileName);
-+                    DefinitelyNotTty = 1; /* in background */
-+                    SetUpEnvironment();
-+                    resultcode = ExecuteCommand(TmpCmd, 1);
-+		    DelTmpFileName(TmpFileName); /* an rm ... was already added
-+						    to the executing cmd */
-+                    ++DidExecute;
-+                } else {
-+                    SetUpEnvironment();
-+                    resultcode = ExecuteCommand(FullCmd, 1);
-+                    RmTmpFileName(TmpFileName);
-+                    ++DidExecute;
-+                }
-+            } else { /* empty text part, hack to not say "more" */
-+                RmTmpFileName(TmpFileName);
-+            }
-+        } else {
-+            FILE *tmpfp;
-+            SetUpEnvironment();
-+            (void) ExecuteCommand(FullCmd, 0);
-+            tmpfp = popen(FullCmd, WRITE_BINARY);
-+            TranslateInputToOutput(InputFP, tmpfp, EncodingCode, ThisContentType);
-+            resultcode = tmpfp ? pclose(tmpfp) : -1;
-+            ++DidExecute;
-+        }
-+        DefinitelyNotTty = ReallyNotTty;
-+        if (!DefinitelyNotTty && DidExecute) {
-+            RestoreTtyState();
-+            if (mc.copiousoutput && MaybePageOutput && BoundaryCt > 0) PauseForUser();
-+        }
-+        if (!resultcode) {
-+            XFREE(FullCmd);
-+        } else {
-+            fprintf(stderr, "Command failed: %s\n", FullCmd);
-+            if (MaybePageOutput && BoundaryCt > 0) PauseForUser();
-+            ++ProcessingErrors;
-+        }
-+    } else {
-+        /* user does not want to execute command */
-+        if (!DefinitelyNotTty) {
-+            RestoreTtyState();
-+        }
-+        if (DoDebug) fprintf(stderr, "Not executing command.\n");
-+        if (!PartsWritten) ConsumeRestOfPart(NULL);
-+    }
-+    if (PartsWritten) {
-+        struct part *tp;
-+        char HeadFile[NAME_MAX];
-+
-+        while (PartsWritten) {
-+            tp=PartsWritten->next;
-+            XFREE(PartsWritten->ctype);
-+            strcpy(HeadFile, PartsWritten->fname);
-+            strcat(HeadFile, "H");
-+            RmTmpFileName(HeadFile);
-+            RmTmpFileName(PartsWritten->fname);
-+            XFREE(PartsWritten->fname);
-+            XFREE(PartsWritten);
-+            PartsWritten=tp;
-+        }
-+    }
-+    if (!DefinitelyNotTty) {
-+        RestoreTtyState();
-+    }
-+    XFREE(cmd);
-+    return(0);
-+}
-+
-+PassesTest(mc)
-+struct MailcapEntry *mc;
-+{
-+    int result;
-+    char *cmd, TmpFileName[TMPNAME_MAX];
-+
-+    if (!mc->testcommand) return(1);
-+    MkTmpFileName(TmpFileName);
-+    cmd = XMALLOC(char, CMDSIZE);
-+    BuildCommand(cmd, mc->testcommand, TmpFileName, NULL, NULL);
-+    if (DoDebug) printf("Executing test command: %s\n", cmd);
-+    result = system(cmd);
-+    XFREE(cmd);
-+    return(!result);
-+}
-+
-+char *
-+GetCommand(s, t)
-+char *s, **t;
-+{
-+    char *s2;
-+    int quoted = 0;
-+    s2 = XMALLOC(char, strlen(s)*2+1); /* absolute max, if all % signs */
-+    *t = s2;
-+    while (s && *s) {
-+	if (quoted) {
-+            if (*s == '%') *s2++ = '%'; /* Quote through next level, ugh! */
-+
-+            *s2++ = *s++;
-+	    quoted = 0;
-+	} else {
-+	    if (*s == ';') {
-+                *s2 = 0;
-+		return(++s);
-+	    }
-+	    if (*s == '\\') {
-+		quoted = 1;
-+		++s;
-+	    } else {
-+		*s2++ = *s++;
-+	    }
-+	}
-+    }
-+    *s2 = 0;
-+    return(NULL);
-+}	
-+
-+GetMailcapEntry(fp, mc)
-+FILE *fp;
-+struct MailcapEntry *mc;
-+{
-+    int rawentryalloc = 2000, len;
-+    char *rawentry, *s, *t, *LineBuf;
-+
-+    LineBuf = XMALLOC(char, LINE_BUF_SIZE);
-+    rawentry = XMALLOC(char, 1 + rawentryalloc);
-+    *rawentry = 0;
-+    while (fgets(LineBuf, LINE_BUF_SIZE, fp)) {
-+	if (LineBuf[0] == '#') continue;
-+        len = strlen(LineBuf);
-+        if (len == 0) continue;
-+        if (LineBuf[len-1] == '\n') LineBuf[--len] = 0;
-+	if ((len + strlen(rawentry)) > rawentryalloc) {
-+	    rawentryalloc += 2000;
-+	    rawentry = realloc(rawentry, rawentryalloc+1);
-+	}
-+	if (LineBuf[len-1] == '\\') {
-+            LineBuf[len-1] = 0;
-+	    strcat(rawentry, LineBuf);
-+	} else {
-+	    strcat(rawentry, LineBuf);
-+	    break;
-+	}
-+    }
-+    XFREE(LineBuf);
-+    for (s=rawentry; *s && isspace((unsigned char) *s); ++s) ;
-+    if (!*s) {
-+	/* totally blank entry -- quietly ignore */
-+	XFREE(rawentry);
-+	return(0);
-+    }
-+    s = index(rawentry, ';');
-+    if (!s) {
-+	fprintf(stderr, "metamail: Ignoring invalid mailcap entry: %s\n", rawentry);
-+	XFREE(rawentry);
-+	return(0);
-+    }
-+    *s++ = 0;
-+    mc->needsterminal = 0;
-+    mc->copiousoutput = 0;
-+    mc->needtofree = 1;
-+    mc->testcommand = NULL;
-+    mc->label = NULL;
-+    mc->printcommand = NULL;
-+    mc->contenttype = XMALLOC(char, 1+strlen(rawentry));
-+    strcpy(mc->contenttype, rawentry);
-+    t = GetCommand(s, &mc->command);
-+    if (!t) {
-+        XFREE(rawentry);
-+        return(1);
-+    }
-+    while (s && *s && isspace((unsigned char) *s)) ++s;
-+    s = t;
-+    while (s) {
-+	char *arg, *eq;
-+
-+        t = GetCommand(s, &arg);
-+/*        if (t) *t++ = 0; */
-+        eq = index(arg, '=');
-+        if (eq) *eq++ = 0;
-+	if (*arg) {
-+	    arg = Cleanse(arg);
-+	    if (!strcmp(arg, "needsterminal")) {
-+		mc->needsterminal = 1;
-+	    } else if (!strcmp(arg, "copiousoutput")) {
-+		mc->copiousoutput = 1;
-+	    } else if (eq && !strcmp(arg, "test")) {
-+		mc->testcommand = eq;
-+	    } else if (eq && !strcmp(arg, "description")) {
-+		mc->label = eq;
-+	    } else if (eq && !strcmp(arg, "label")) { 
-+		mc->label = eq; /* bogus old name for description */
-+	    } else if (eq && !strcmp(arg, "print")) {
-+		mc->printcommand = eq;
-+	    } else if (eq && !strcmp(arg, "textualnewlines")) {
-+		ExceptionalNewline(mc->contenttype, atoi(eq));
-+	    } else if (strcmp(arg, "notes")) { /* IGNORE notes field */
-+		if (*arg && DoDebug) fprintf(stderr, "metamail: Ignoring mailcap flag: %s\n", arg);
-+	    }
-+	}
-+	s = t;
-+    }
-+    XFREE(rawentry);
-+    return(1);
-+}
-+
-+ExitWithError(txt)
-+char *txt;
-+{
-+    if (txt) fprintf(stderr, "metamail: %s\n", txt);
-+    exit(-1);
-+}
-+
-+char *
-+FreshHeaderCopy(s)
-+char *s;
-+{
-+    char *t, *newcopy;
-+    int len;
-+
-+    while (s && *s && isspace((unsigned char) *s) && *s != '\n') ++s;
-+    t = index(s, '\n');
-+    while (t && (*(t+1) == ' ' || *(t+1) == '\t')) {
-+        t = index(t+1, '\n');
-+    }
-+    len = t ? (t-s+1) : (strlen(s)+1);
-+    newcopy = XMALLOC(char, len+3); /* two extra bytes for a bizarre bug caused
-+                                       by the fact that FindParam calls
-+				       FreshHeaderCopy and sometimes tacks on
-+				       "--".
-+				    */
-+    strncpy(newcopy, s, len);
-+    newcopy[len] = 0;
-+    return(newcopy);
-+}
-+
-+Read822Prefix(PrintHeads, nestingdepth)
-+int PrintHeads, nestingdepth;
-+{
-+    int SawNewline = 1, bytes = 0, alloced = 1000, HasEncodedChars=0;
-+    int c, oldbytes;
-+    char *s, *t, *tmp;
-+
-+    if (!PrintSomeHeaders) PrintHeads = 0;
-+    mailheaders = XMALLOC(char, alloced+1);
-+    strcpy(mailheaders, "MM_HEADERS=\n");
-+    bytes = 12;
-+yankagain:
-+    t = mailheaders + bytes;
-+    oldbytes = bytes-1; /* a hack for YankMode */
-+    while ((c = getc(InputFP)) != EOF) {
-+        if (++bytes >= alloced) {
-+            alloced += 1000;
-+            mailheaders = realloc(mailheaders, alloced);
-+            t = mailheaders + bytes - 1;
-+        }
-+        if (c == '\n') {
-+            if (SawNewline) break;
-+            SawNewline = 1;
-+        } else SawNewline = 0;
-+        *t++ = c;
-+    }
-+    *t = 0;
-+    --bytes;
-+    if (c == EOF) {
-+	if (nestingdepth) {
-+	    fprintf(stderr, "metamail: Incomplete multipart message -- unexpected EOF\n");
-+/*            exit(ProcessingErrors); */
-+        } else {
-+            if (YankMode) {
-+/*                ExitWithError("Could not extract a MIME message from the  body\n"); */
-+		fprintf(stderr, "metamail: Could not extract a MIME message from the body\n");
-+            } else {
-+		fprintf(stderr, "metamail: Could not find end of mail headers.\n");
-+/*                ExitWithError("Could not find end of mail headers"); */
-+            }
-+	}
-+	BoundaryCt=0;
-+	return -1;
-+    }
-+    for (s=mailheaders+oldbytes; *s; ++s) {
-+        if (*s == '\n' && (*(s+1) != ' ') && (*(s+1) != '\t')) {
-+	    if (!ContentType && !lc2strncmp(s, "\ncontent-type:", 14)) {
-+		char *dum;
-+                ContentType = FreshHeaderCopy(s+14);
-+		/* Eliminate white space embedded in content-type */
-+		while (1) {
-+		    dum = index(ContentType, '/');
-+		    if (!dum) break;
-+		    if (isspace(*(dum-1))) {
-+			for (--dum; *dum; ++dum) {
-+			    *dum = *(dum+1);
-+			}
-+		    } else if (isspace(*++dum)) {
-+			for ( ; *dum; ++dum) {
-+			    *dum = *(dum+1);
-+			}
-+		    } else {
-+			break;
-+		    }
-+		}
-+                StripTrailingSpace(ContentType);
-+                ParseContentParameters(ContentType);
-+                if (PrintHeads) maybephead(s+1);
-+            } else if (!ContentEncoding && !lc2strncmp(s, "\ncontent-transfer-encoding:", 27)) {
-+                ContentEncoding = FreshHeaderCopy(s+27);
-+                if (PrintHeads) maybephead(s+1);
-+            } else if (!lc2strncmp(s, "\nsubject:", 9)) {
-+                if (PrintHeads) maybephead(s+1);
-+                MailSubject = FreshHeaderCopy(s+9);
-+            } else if (!lc2strncmp(s, "\nfrom:", 6)) {
-+                if (PrintHeads) maybephead(s+1);
-+                MailFrom = FreshHeaderCopy(s+6);
-+            } else if (!lc2strncmp(s, "\ncontent-description:", 4)) {
-+                if(PrintHeads) maybephead(s+1);
-+                MailSubject = FreshHeaderCopy(s+21);
-+            } else {
-+                /* Print any with encoded variables */
-+                char *dum = s;
-+                while (dum) {
-+                    dum = index(dum, '?');
-+                    if (dum && *++dum == '=') break;
-+                }
-+                if (dum) {
-+                    char *nl = s+1;
-+                    while (nl) {
-+                        nl = index(nl, '\n');
-+                        if (nl && !isspace((unsigned char) *++nl)) break;
-+                    }
-+                    if (nl && nl > dum) ++HasEncodedChars;
-+                }
-+                if (HasEncodedChars) {
-+                    phead(s+1);
-+                } else if (PrintHeads) {
-+                    maybephead(s+1);
-+                }
-+            }
-+        }
-+    }
-+    /* Ugly, but effective */
-+    if (YankMode && !ContentType) {
-+        goto yankagain;
-+    }
-+    if (PrintHeads) printf("\n");
-+    if (!ContentType) {
-+        ContentType = "text/plain";
-+        CParamsUsed=0;
-+    }
-+    for (tmp=ContentType; *tmp; ++tmp) {
-+        if (isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
-+    }
-+    return 0;
-+}
-+
-+PrepareMessage() {
-+    int c;
-+
-+    EncodingCode = ENCODING_NONE;
-+    if (ContentEncoding) {
-+        /* strip leading white space */
-+        while (*ContentEncoding && isspace((unsigned char) *ContentEncoding)) ++ContentEncoding;
-+        StripTrailingSpace(ContentEncoding);
-+        if (!lc2strcmp(ContentEncoding, "base64")) {
-+            EncodingCode = ENCODING_BASE64;
-+        } else if (!lc2strcmp(ContentEncoding, "quoted-printable")) {
-+            EncodingCode = ENCODING_QUOTEDPRINTABLE;
-+        } else if (!lc2strncmp (ContentEncoding, "x-uue", 5)) {
-+            fprintf (stderr, "WARNING:  Using nonstandard %s encoding, trying uuencode algorithm.\n", ContentEncoding);
-+ 	    EncodingCode = ENCODING_UUENCODE;
-+        } else {
-+            if (lc2strcmp(ContentEncoding, "none")
-+                 && !lc2strcmp(ContentEncoding, "8bit")
-+                 && !lc2strcmp(ContentEncoding, "7bit")) {
-+                fprintf(stderr, "Ignoring unrecognized Content-Transfer-Encoding value: %s\n", ContentEncoding);
-+            }
-+        }
-+    }
-+    if (EatLeadingNewlines) {
-+        while ((c = getc(InputFP)) != EOF) {
-+            if (c != '\n') {
-+                ungetc(c, InputFP);
-+                break;
-+            }
-+        }
-+    }
-+    SetUpEnvironment();  
-+}
-+
-+SetUpEnvironment() { 
-+    int i, j, environsize;
-+    char **newenviron, *mailervar, *summaryvar, *ctypevar, *s;
-+    static char ttyenv[15], debugenv[15], *noaskenv, pagerenv[15], *quietenv, rootenv[25];
-+
-+    /* Hack to make the code look similar for unix & dos */
-+#define putenv(var)        newenviron[i++] = var;
-+    for (environsize=0; environ[environsize]; ++environsize) {
-+	;
-+    }
-+    newenviron = XMALLOC(char *, 17+environsize);
-+    mailervar = XMALLOC(char, 13+strlen(MailerName));
-+    sprintf(mailervar, "MM_MAILER=%s", MailerName);
-+    summaryvar = XMALLOC(char, 26 + strlen(MailFrom) + strlen(MailSubject));
-+    sprintf(summaryvar, "MM_SUMMARY=%s (from %s)", MailSubject, MailFrom);
-+    MailSummary = summaryvar+11;
-+    EliminateNastyChars(MailSummary);
-+    i = 0;
-+    if (ContentType) {
-+        int ctypelen = 22+strlen(ContentType);
-+        for (j=0; j<CParamsUsed; ++j) {
-+            ctypelen += 6 + strlen(CParams[j]) + strlen(CParamValues[j]);
-+        }
-+        ctypevar = XMALLOC(char, ctypelen);
-+        for (s=ContentType; *s; ++s) {
-+            if (isupper((unsigned char) *s)) *s = tolower((unsigned char) *s);
-+        }
-+        while (isspace((unsigned char) *--s)) *s = 0;
-+        sprintf(ctypevar, "MM_CONTENTTYPE=%s", ContentType);
-+        for (j=0; j<CParamsUsed; ++j) {
-+            strcat(ctypevar, " ; ");
-+            strcat(ctypevar, CParams[j]);
-+            strcat(ctypevar, " = ");
-+            strcat(ctypevar, CParamValues[j]);
-+        }
-+        putenv(ctypevar);
-+    }
-+    putenv(mailheaders ? mailheaders : "MM_HEADERS=unknown");
-+    putenv(mailervar);
-+    putenv(summaryvar);
-+    sprintf(ttyenv, "MM_NOTTTY=%d", DefinitelyNotTty);
-+    putenv(ttyenv);
-+    sprintf(debugenv, "MM_DEBUG=%d", DoDebug);
-+    putenv(debugenv);
-+    s = getenv("MM_QUIET");
-+    if (!s) s = QuietDefault;
-+    quietenv = XMALLOC(char, 15 + strlen(s));
-+    if (Quiet) {
-+        strcpy(quietenv, "MM_QUIET=1");
-+    } else {
-+        sprintf(quietenv, "MM_QUIET=%s", s);
-+    }
-+    putenv(quietenv);
-+    s = getenv("MM_NOASK");
-+    if (!s) s = NoAskDefault;
-+    noaskenv = XMALLOC(char, 15 + strlen(s));
-+    if (MightAskBeforeExecuting) {
-+        sprintf(noaskenv, "MM_NOASK=%s", s);
-+    } else {
-+        strcpy(noaskenv, "MM_NOASK=1");
-+    }
-+    putenv(noaskenv);
-+    s = getenv("MM_RUNASROOT");
-+    if (!s) s = "0";
-+    sprintf(rootenv, "MM_RUNASROOT=%s", s);
-+    putenv(rootenv);
-+    sprintf(pagerenv, "MM_USEPAGER=%d", MaybePageOutput);
-+    putenv(pagerenv);
-+    for (j=0; j<environsize; ++j) {
-+        if (strncmp(environ[j], "MM_", 3) || !strncmp(environ[j], "MM_CHARSET", 10)) {
-+            putenv(environ[j]);
-+        }
-+    }
-+    newenviron[i] = NULL;
-+    environ = newenviron;
-+    if (DoDebug) {
-+        printf("Here is the environment:\n\n");
-+        system("printenv");
-+    }
-+}
-+
-+
-+OKToRun(ctype, progname, label)
-+char *ctype, *progname, *label;
-+{
-+    char AnsBuf[100], *s;
-+
-+    if (DoInBackground) return(1);
-+    if (DefinitelyNotTty || MustNotBeTty) return(1);
-+    while (1) {
-+        printf("\n");
-+        if (label) {
-+            printf("This message contains %s.\nDo you want to view it using the '%s' command (y/n) [y] ? ", label, ShortCommand(progname));
-+        } else {
-+            printf("This message contains '%s'-format data.\nDo you want to view it using the '%s' command (y/n) [y] ? ", ctype, ShortCommand(progname));
-+        }
-+        s = fgets(AnsBuf, sizeof(AnsBuf), stdin);
-+        if (!s) return(0); /* EOF */
-+	while (s && *s && isspace((unsigned char) *s)) ++s;
-+	if (*s == 'y' || *s == 'Y' || !*s || *s == '\n') return(1);
-+	if (*s == 'n' || *s == 'N' || *s == 'q' || *s == 'Q') {
-+	    return(0);
-+	}
-+	printf("Please answer yes or no.\n");
-+    }
-+}
-+
-+EliminateNastyChars(s)
-+char *s;
-+{
-+    if (s) for( ; *s ;++s) {
-+        if (isalnum((unsigned char) *s)) continue;
-+	if (index(" ,.;:/?\\|[]{}()*&^%#@-_=+~<>\"", *s)) continue;
-+	if (*s == '\'' || *s == '`') {
-+	    *s = '"';
-+	} else {
-+	    *s = ' ';
-+	}
-+    }
-+}
-+
-+StripTrailingSpace(s)
-+char *s;
-+{
-+    char *t = s+strlen(s) -1;
-+    while (isspace((unsigned char) *t) && (t >= s)) *t-- = 0;
-+}
-+
-+static char *KeyHeads=NULL;
-+static char **KeyHeadList;
-+static int KeyKeep = 0;
-+
-+void setKeyHeads()
-+{
-+    char *s;
-+    int numkeys = 0;
-+
-+    if ((KeyHeads = getenv("KEYHEADS")) != 0) {
-+        for (s=KeyHeads;*s;++s) if (isupper((unsigned char) *s)) *s=tolower((unsigned char) *s);
-+    } else if ((KeyHeads = getenv("KEYIGNHEADS")) != 0) {
-+	for (s=KeyHeads;*s;++s) if (isupper((unsigned char) *s)) *s=tolower((unsigned char) *s);
-+	KeyKeep = 1;
-+    } else {
-+	static char khtmp[] = "to:cc:subject:from:content-description:date";
-+	KeyHeads = khtmp;
-+    }
-+    for (s=KeyHeads; *s; ++s) if (*s == ':') ++numkeys;
-+    numkeys += 2;
-+    KeyHeadList = XMALLOC(char *, numkeys);
-+    numkeys = 0;
-+    KeyHeadList[0] = KeyHeads;
-+    for(s=KeyHeads; *s; ++s) {
-+	if (*s == ':') {
-+	    *s = '\0';
-+	    KeyHeadList[++numkeys] = s+1;
-+	}
-+    }
-+    KeyHeadList[++numkeys] = NULL;
-+}
-+
-+/* find the first colon in a header line which appears before any spaces or control characters */
-+char *
-+findcolon(hdr)
-+char *hdr;
-+{
-+    while (*hdr && !isspace(*hdr) && !iscntrl(*hdr))
-+	if (*hdr == ':') return hdr;
-+	else hdr++;
-+    return 0;
-+}
-+
-+/* check the header given to see if it matches any in the KeyHeadList */
-+maybephead(hdr)
-+char *hdr;
-+{
-+    char *s;
-+    int numkeys=0;
-+
-+    if (!KeyHeads) setKeyHeads();
-+
-+    s = findcolon(hdr);
-+    if (s) {
-+	int len = s - hdr;
-+        for (numkeys=0; KeyHeadList[numkeys]; ++numkeys) {
-+            if (!strcmp(KeyHeadList[numkeys], "*")
-+                 || !lc2strncmp(hdr, KeyHeadList[numkeys], len)) {
-+		if (!KeyKeep) phead(hdr);
-+		return;
-+            }
-+        }
-+	if (KeyKeep) phead(hdr);
-+	return;
-+    }
-+    if (!strncmp(hdr, "From ", 5) || !strncmp(hdr, ">From ", 6)) {
-+	for (numkeys = 0; KeyHeadList[numkeys]; ++numkeys) {
-+	    if (!strcmp(KeyHeadList[numkeys], "*")
-+		 || !lc2strncmp(">from", KeyHeadList[numkeys], 5)) {
-+		if (!KeyKeep) phead(hdr);
-+		return;
-+	    }
-+	}
-+	if (KeyKeep) phead(hdr);
-+    }
-+}
-+
-+/* This next routine prints out a mail header, and needs to deal with the new extended charset headers. */
-+phead(s)
-+char *s;
-+{
-+    char *t = s;
-+
-+    while (1) {
-+	t = index(t, '\n');
-+	if (!t) break;
-+        if (!isspace((unsigned char) *(t+1))) {
-+            *t = 0;
-+	    break;
-+	} else ++t;
-+    }
-+    PrintHeader(s, 1);
-+    printf("\n");
-+    if (t) *t = '\n';
-+}
-+
-+static char PrevCharset[100] = "us-ascii";
-+
-+/* This is the part that actually handles the charset issues */
-+void PrintHeader(s, ShowLeadingWhitespace)
-+char *s;
-+int ShowLeadingWhitespace;
-+{
-+    char *charset, *encoding, *txt, *txtend, TmpFile[TMPNAME_MAX];
-+    int ecode = ENCODING_NONE, CorrectedCharset = 0;
-+    FILE *fp;
-+
-+    while (*s && (*s != '=')) {
-+        if (isspace((unsigned char) *s)) {
-+            if (ShowLeadingWhitespace) {
-+                putchar(' ');
-+            }
-+        } else {
-+            putchar(*s);
-+            if (!CorrectedCharset) {
-+                CorrectedCharset = 1;
-+                strcpy(PrevCharset, "us-ascii");
-+            }
-+        }
-+        if (!ShowLeadingWhitespace) {
-+            /* Only at most one leading space is ignored */
-+            ShowLeadingWhitespace = 1;
-+        }
-+        ++s;
-+    }
-+    if (!*s) return;
-+    if (*(s+1) != '?') {
-+        putchar('=');
-+        PrintHeader(++s, 1);
-+        return;
-+    }
-+    charset = s+2;
-+    encoding = index(charset, '?');
-+    if (!encoding) {
-+        putchar('=');
-+        PrintHeader(++s,1);
-+        return;
-+    }
-+    txt = index(encoding+1, '?');
-+    if (!txt) {
-+        putchar('=');
-+        PrintHeader(++s, 1);
-+        return;
-+    }
-+    txtend = txt;
-+    do {
-+        txtend = index(txtend+1, '?');
-+    } while(txtend && (*(txtend+1) != '='));
-+    if (!txtend) {
-+        putchar('=');
-+        PrintHeader(++s, 1);
-+    }
-+    /* Proper parse! Ready to dissect... */
-+    *encoding = 0;
-+    *txt = 0;
-+    *txtend = 0;
-+    if ((*(encoding+1) == 'q') || (*(encoding+1) == 'Q')) {
-+        ecode = ENCODING_QUOTEDPRINTABLE;
-+    } else if ((*(encoding+1) == 'b') || (*(encoding+1) == 'B')) {
-+        ecode = ENCODING_BASE64;
-+    } else {
-+        fprintf(stderr, "Bad encoding value in non-ASCII header string: %s\n", encoding+1);
-+    }
-+    if (lc2strcmp(charset, PrevCharset)) {
-+        char *s2, *charsetinuse;
-+
-+        strncpy(PrevCharset, charset, sizeof(PrevCharset));
-+        PrevCharset[sizeof(PrevCharset) - 1] = '\0';
-+        for (s2=PrevCharset; *s2; ++s2) {
-+            if (isupper((unsigned char) *s2)) *s2 = tolower((unsigned char) *s2);
-+        }
-+        charsetinuse = getenv("MM_CHARSET");
-+        if (!charsetinuse || lc2strcmp(charsetinuse, PrevCharset)) {
-+            printf("[** %s charset **] ", charset);
-+        }
-+    }
-+    if (ecode == ENCODING_NONE) {
-+        printf("%s", txt+1);
-+    } else {
-+        /* What follows is REALLY bogus, but all my encoding stuff is pipe-oriented right now... */
-+        MkTmpFileName(TmpFile);
-+        fp = fopen(TmpFile, WRITE_BINARY);
-+        if (!fp) {
-+            fprintf(stderr, "Could not open temporary file\n");
-+        } else {
-+            char *t;
-+            for (t=txt+1; *t; ++t) {
-+                if (*t == '_') {
-+                    putc(' ', fp);
-+                } else if (*t == '\n') {
-+                    putc(' ', fp);
-+                } else {
-+                    putc(*t, fp);
-+                }
-+            }
-+            fclose(fp);
-+            fp = fopen(TmpFile, "r");
-+            if (!fp) {
-+                fprintf(stderr, "Could not open temporary file\n");
-+            } else {
-+                TranslateInputToOutput(fp, stdout, ecode, "text");
-+                fclose(fp);
-+            }
-+            RmTmpFileName(TmpFile);
-+        }
-+    }
-+    *encoding = '?';
-+    *txt = '?';
-+    *txtend = '?';
-+    PrintHeader(txtend + 2, 0);
-+}
-+
-+BuildCommand(Buf, controlstring, TmpFileName, UsedTmpFileName, PartsWritten)
-+char *Buf, *controlstring, *TmpFileName;
-+int *UsedTmpFileName;
-+struct part **PartsWritten;
-+{
-+    char *from, *to, *s, *p, *tmp;
-+    int prefixed = 0, UsedBigFile=0, UsedLittleFiles=0, numparts=0;
-+    struct part *firstpart=NULL, *thispart=NULL, *tmppart=NULL;
-+
-+    if (UsedTmpFileName) *UsedTmpFileName = 0;
-+    if (PartsWritten) *PartsWritten = NULL;
-+    for (from=controlstring, to=Buf; *from; ++from) {
-+        if (prefixed) {
-+            prefixed = 0;
-+            switch(*from) {
-+                case '%':
-+                    *to++ = '%';
-+                    break;
-+                case 'n':
-+                case 'F':
-+		    if (!PartsWritten) {
-+			fprintf(stderr, "metamail: Bad mailcap \"test\" clause: %s\n", controlstring);
-+			ExitWithError("%%n and %%F may not be used in \"test\" clauses.  Execution terminated.");
-+		    }
-+                    if (UsedBigFile) {
-+                        fprintf(stderr, "metamail: Bad mailcap entry: %s\n", controlstring);
-+                        ExitWithError("%%n and %%F are incompatible with %%s.  Execution terminated.");
-+                    }
-+                    if (!UsedLittleFiles) {
-+                        /* Set up parts */
-+                        char *LineBuf, *boundary, TmpFileNameBuf[TMPNAME_MAX];
-+                        char *oldct, *oldce, *newct;
-+                        int currct, boundarylen, newctlen, j;
-+                        int oldcparmsused, oldcparamsalloced;
-+                        char **oldcparams, **oldcparamvalues;
-+                        FILE *headfp;
-+
-+                        LineBuf = XMALLOC(char, LINE_BUF_SIZE);
-+                        boundary = FindParam("boundary");
-+			if (!boundary) {
-+			    fprintf(stderr, "Bad message format: This multipart message has no boundary parameter,\n");
-+			    fprintf(stderr, "but the mailcap entry for %s uses %%F or %%n.\n\n", ContentType);
-+			    ExitWithError("A change to the mailcap file might make this message viewable.");
-+                        }
-+                        if (boundary[0] == '"') {
-+                            boundary=UnquoteString(boundary);
-+                        }
-+                        sprintf(LineBuf, "--%s", boundary);
-+                        strcpy(boundary, LineBuf);
-+                        boundarylen = strlen(boundary);
-+                        if (BoundaryCt >= BoundaryAlloc) {
-+                            BoundaryAlloc += 5;
-+                            if (Boundaries) {
-+                                Boundaries = XREALLOC(char *, Boundaries,
-+						      BoundaryAlloc);
-+                            } else {
-+                                Boundaries = XMALLOC(char *, BoundaryAlloc);
-+                            }
-+                        }
-+                        Boundaries[BoundaryCt++] = boundary;
-+                        while (fgets(LineBuf, LINE_BUF_SIZE, InputFP)) { /* find start */
-+                            if (!strncmp(LineBuf, boundary, boundarylen)
-+                                 && ((LineBuf[boundarylen] == '\n')
-+                                      || (LineBuf[boundarylen] == '-'
-+                                           && LineBuf[boundarylen+1] == '-'
-+                                           && LineBuf[boundarylen+2] == '\n'))) {
-+                                break;
-+                            }
-+                        }
-+                        XFREE(LineBuf);
-+                        currct = BoundaryCt;
-+                        oldct=ContentType;
-+                        oldce=ContentEncoding;
-+                        oldcparmsused = CParamsUsed;
-+                        oldcparamsalloced = CParamsAlloced;
-+                        oldcparams = CParams;
-+                        oldcparamvalues = CParamValues;
-+                        CParams = NULL;
-+                        CParamValues = NULL;
-+                        CParamsUsed = 0;
-+                        CParamsAlloced = 0;
-+                        while(currct == BoundaryCt) {
-+                            tmppart = XMALLOC(struct part, 1);
-+                            if (firstpart) {
-+                                thispart->next = tmppart;
-+                                thispart = tmppart;
-+                            } else {
-+                                firstpart = thispart = tmppart;
-+                            }
-+                            tmppart->next = NULL;
-+                            ContentType=NULL;
-+                            ContentEncoding=NULL;
-+                            Read822Prefix(0,0);
-+                            PrepareMessage();
-+                            newctlen=5+strlen(ContentType);
-+                            for (j=0; j<CParamsUsed; ++j) {
-+                                newctlen += 11+strlen(CParams[j]) + strlen(CParamValues[j]);
-+                            }
-+                            newct= XMALLOC(char, newctlen);
-+                            strcpy(newct, "'");
-+                            strcat(newct, ContentType);
-+                            for (j=0; j<CParamsUsed; ++j) {
-+                                strcat(newct, "; ");
-+                                strcat(newct, CParams[j]);
-+                                if (CParamValues[j][0] == '\"') {
-+                                    strcat(newct, " = ");
-+                                    strcat(newct, CParamValues[j]);
-+                                } else {
-+                                    strcat(newct, " = \"");
-+                                    strcat(newct, CParamValues[j]);
-+                                    strcat(newct, "\"");
-+                                }
-+                            }
-+                            strcat(newct, "'");
-+                            thispart->ctype = newct;
-+                            MkTmpFileName(TmpFileNameBuf);
-+                            thispart->fname = XMALLOC(char,
-+						     1+strlen(TmpFileNameBuf));
-+                            strcpy(thispart->fname, TmpFileNameBuf);
-+                            WriteTmpFile(thispart->fname, thispart->ctype);
-+                            strcat(TmpFileNameBuf, "H");
-+                            headfp = fopen(TmpFileNameBuf, "w");
-+                            if (headfp) {
-+                                fputs(mailheaders+12, headfp);
-+                                /* The +12 gets rid of MM_HEADERS=\n */
-+                                fclose(headfp);
-+                            }
-+                            ++numparts;
-+                        }
-+                        ContentType=oldct;
-+                        ContentEncoding=oldce;
-+                        CParamsUsed = oldcparmsused;
-+                        CParamsAlloced = oldcparamsalloced;
-+                        CParams = oldcparams;
-+                        CParamValues = oldcparamvalues;
-+                        /* Now we've seen the last encapsulation boundary, but if there is a "postfix"
-+                            we must throw it away.*/
-+                        if (BoundaryCt > 0) {
-+                            ConsumeRestOfPart(NULL);
-+                        }
-+                        *PartsWritten = firstpart;
-+                        UsedLittleFiles=1;
-+                    }
-+                    if (*from == 'n') {
-+                        char numbuf[10];
-+                        sprintf(numbuf, "%d", numparts);
-+                        strcpy(to, numbuf);
-+                        to += strlen(numbuf);
-+                    } else { /* %F */
-+                        for (tmppart = firstpart; tmppart != NULL; tmppart = tmppart->next) {
-+                            sprintf(to, "%s %s ", tmppart->ctype, tmppart->fname);
-+                            to += (strlen(tmppart->ctype) + strlen(tmppart->fname) + 2);
-+                        }
-+                    }
-+                    break;
-+                case 's':
-+                    if (UsedLittleFiles) {
-+                        fprintf(stderr, "metamail: Bad mailcap entry: %s\n", controlstring);
-+                        ExitWithError("%%n and %%F are incompatible with %%s.  Execution terminated.");
-+                    }
-+                    if (TmpFileName) {
-+                        strcpy(to, TmpFileName);
-+                        to += strlen(TmpFileName);
-+                        if (UsedTmpFileName) ++(*UsedTmpFileName);
-+                    }
-+                    UsedBigFile = 1;
-+                    break;
-+                case '{':
-+                    s = index(from, '}');
-+                    if (!s) {
-+                        fprintf(stderr, "Ignoring ill-formed parameter reference in mailcap file: %s\n", from);
-+                        break;
-+                    }
-+                    ++from;
-+                    *s = 0;
-+                    /* put in lower case */
-+                    for (tmp=from; *tmp; ++tmp) {
-+                        if (isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
-+                    }
-+                    p = FindParam(from);
-+                    if (p && p[0] == '"') {
-+                        p=UnquoteString(p);
-+                    }
-+                    if (!p) p = "";
-+                    *to++ = '\'';
-+                    strcpynoquotes(to, p);
-+                    to += strlen(p);
-+                    *to++ = '\'';
-+                    *s = '}'; /* restore */
-+                    from = s;
-+                    break;
-+                case 't':
-+                    /* type/subtype */
-+                    strcpynoquotes(to, ContentType);
-+                    to += strlen(ContentType);
-+                    break;
-+                default:
-+                    fprintf(stderr, "Ignoring unrecognized format code in mailcap file: %%%c\n", *from);
-+                    break;
-+            }
-+        } else if (*from == '%') {
-+            prefixed = 1;
-+        } else {
-+            *to++ = *from;
-+        }
-+    }
-+    *to = 0;
-+}
-+
-+strcpynoquotes(t,f)
-+char *t, *f;
-+{
-+    static char *badchars="|<>%*?\"`'";
-+
-+    while (*f) {
-+        if (index(badchars, *f)) *t++ = ' '; else *t++ = *f;
-+        ++f;
-+    }
-+}
-+
-+WriteTmpFile(fname, ctype)
-+char *fname;
-+char *ctype;
-+{
-+    FILE *fpout;
-+    int retval = 0;
-+
-+    fpout = fopen(fname, WRITE_BINARY);
-+    if (!fpout) {
-+        perror("WriteTmpFile");
-+        metamail_fatal("Can't create temporary file: ", fname);
-+    }
-+    TranslateInputToOutput(InputFP, fpout, EncodingCode, ctype);
-+    if (ftell(fpout) == 0) retval = 1;
-+    if (fclose(fpout)) ExitWithError("Can't write temporary file");
-+    return(retval);
-+}
-+
-+
-+TranslateInputToOutput(InputFP, OutputFP, Ecode, ctype)
-+FILE *InputFP, *OutputFP;
-+int Ecode;
-+char *ctype;
-+{
-+    int InMultipart = BoundaryCt > 0 ? 1 : 0;
-+
-+    switch(Ecode) {
-+        case ENCODING_BASE64:
-+            from64(InputFP, OutputFP, InMultipart ? Boundaries : NULL, &BoundaryCt, DoesNeedPortableNewlines(ctype));
-+            break;
-+        case ENCODING_QUOTEDPRINTABLE:
-+            fromqp(InputFP, OutputFP, InMultipart ? Boundaries : NULL, &BoundaryCt);
-+            break;
-+ 	case ENCODING_UUENCODE:
-+ 	    fromuue(InputFP, OutputFP, InMultipart ? Boundaries: NULL, &BoundaryCt);
-+ 	    break;
-+        default:
-+            ConsumeRestOfPart(OutputFP);
-+    }
-+    if (UsingStandardInput && feof(InputFP) && !freopen("/dev/tty", "r", stdin)) {
-+        fprintf(stderr, "Warning: Cannot freopen /dev/tty to stdin");
-+    } else InputFP = stdin;
-+}
-+
-+CreateNewWindowPrefix(Prefix)
-+char *Prefix;
-+{
-+    char *override = getenv("TERMINAL_CMD");
-+    if (override) {
-+        strcpy(Prefix, override);
-+    } else if (getenv("DISPLAY")) {
-+        /* X11 */
-+        strcpy(Prefix, "xterm -title '");
-+        strcat(Prefix, MailSummary);
-+        strcat(Prefix, "' -e ");
-+    } else if (getenv("WINDOW_PARENT")) {
-+        /* SunView */
-+        strcpy(Prefix, "shelltool ");
-+    } else if (getenv("WMHOST")) {
-+        /* old Andrew WM */
-+        strcpy(Prefix, "h19 ");
-+    } else {
-+        /* last resort is to look for /dev/tty */
-+        if (!freopen("/dev/tty", "r", stdin)){
-+            ExitWithError("Don't know how to create a terminal window");
-+        }
-+        InputFP = stdin;
-+        fprintf(stderr, "Warning, reopened /dev/tty, could be strange.\n");
-+        Prefix[0] = 0;
-+    }
-+}
-+
-+int HasSavedTtyState=0;
-+
-+SaveTtyState() {
-+    /* Bogus -- would like a good portable way to reset the terminal state here */
-+  ioctl(fileno(stdin), TCGETA, &MyTtyStateIn);
-+  ioctl(fileno(stdout), TCGETA, &MyTtyStateOut);
-+
-+  HasSavedTtyState = 1;
-+  }
-+
-+RestoreTtyState() {
-+    if (HasSavedTtyState) {
-+        ioctl(fileno(stdout), TCSETA, &MyTtyStateOut);
-+        ioctl(fileno(stdin), TCSETA, &MyTtyStateIn);
-+    }
-+}
-+
-+NeedToAskBeforeExecuting(type)
-+char *type;
-+{
-+    struct NoAskItem *nai;
-+    if (!MightAskBeforeExecuting || DoInBackground) return(0);
-+    for (nai = FirstNoAskItem; nai; nai = nai->next) {
-+        if (CtypeMatch(type, nai->type)) return(0);
-+    }
-+    return(1);
-+}
-+
-+NeedToBeQuiet(cmd)
-+char *cmd;
-+{
-+    struct NoAskItem *nai;
-+    for (nai = FirstQuietItem; nai; nai = nai->next) {
-+        if (!lc2strcmp(nai->type, cmd)) return(1);
-+    }
-+    return(0);
-+}
-+
-+CtypeMatch(ctype, pat)
-+char *ctype, *pat;
-+{
-+    int len;
-+    char pat2[200];
-+
-+    if (!lc2strcmp(ctype, pat)) {
-+        return(1); /* exact match, case-insensitive */
-+    }
-+    if (index(pat, '/') == NULL) {
-+        /* implicit wildcard */
-+        strcpy(pat2, pat);
-+        strcat(pat2, "/*");
-+        pat = pat2;
-+    }
-+    len = strlen(pat);
-+    if ((pat[--len] == '*')
-+         && (pat[--len] == '/')
-+         && (!lc2strncmp(ctype, pat, len))
-+         && ((ctype[len] == '/') || (ctype[len] == '\0'))){
-+        /* wildcard match */
-+        return(1);
-+    }
-+    return(0);
-+}
-+
-+ExecuteCommand(cmd, really)
-+char *cmd;
-+int really;
-+{
-+    int code;
-+    if (!Quiet || DoDebug) {
-+        if (!NeedToBeQuiet(ShortCommand(cmd))) {
-+            printf("---Executing: %s\n", DoDebug ? cmd : ShortCommand(cmd));
-+        } else if (EatLeadingNewlines) {
-+            printf("\n");
-+        } 
-+        fflush(stdout);
-+    }
-+    if (really) {
-+        fflush(stdout); fflush(stderr);
-+        code = system(cmd);
-+        if (DoDebug) printf("Command exit status: %d\n", code);
-+        return(code);
-+    }
-+    return(0);
-+}
-+
-+void
-+ConsumeRestOfPart(outfp)
-+FILE *outfp;
-+{
-+    char *Buf;
-+    int c;
-+
-+    if (BoundaryCt <= 0) {
-+        while ((c=getc(InputFP)) != EOF) {
-+            if (outfp) putc(c, outfp);
-+        }
-+        return;
-+    }
-+    Buf = XMALLOC(char, LINE_BUF_SIZE);
-+    while (fgets(Buf, LINE_BUF_SIZE, InputFP)) {
-+        if ((BoundaryCt > 0)
-+             && (Buf[0] == '-')
-+             && (Buf[1] == '-')
-+             && PendingBoundary(Buf, Boundaries, &BoundaryCt)) {
-+            break;
-+        }
-+        if (outfp) fputs(Buf, outfp);
-+    }
-+    XFREE(Buf);
-+}
-+
-+char *paramend(s)
-+char *s;
-+{
-+    int inquotes=0;
-+    while (*s) {
-+        if (inquotes) {
-+            if (*s == '"') {
-+                inquotes = 0;
-+            } else if (*s == '\\') {
-+                ++s; /* skip a char */
-+            }
-+        } else if (*s == ';') {
-+            return(s);
-+        } else if (*s == '"') {
-+            inquotes = 1;
-+        }
-+        ++s;
-+    }
-+    return(NULL);
-+}        
-+
-+void
-+ParseContentParameters(ct)
-+char *ct;
-+{
-+    char *s, *t, *eq;
-+
-+    CParamsUsed = 0;
-+    s = index(ct, ';');
-+    if (!s) return;
-+    *s++ = 0;
-+    do {
-+        t = paramend(s);
-+        if (t) *t++ = 0;
-+        eq = index(s, '=');
-+        if (!eq) {
-+            fprintf(stderr, "Ignoring unparsable content-type parameter: '%s'\n", s);
-+            JunkParameter=Cleanse(s);
-+        } else {
-+            if (CParamsUsed >= CParamsAlloced) {
-+                CParamsAlloced += 10;
-+                if (CParams) {
-+                    CParams = XREALLOC(char *, CParams, 1+CParamsAlloced);
-+                    CParamValues = XREALLOC(char *, CParamValues, 
-+					    1+CParamsAlloced);
-+                } else {
-+                    CParams = XMALLOC(char*, 1+CParamsAlloced);
-+                    CParamValues = XMALLOC(char *, 1+CParamsAlloced);
-+                }
-+            }
-+            *eq++ = 0;
-+            s = Cleanse(s);
-+            CParams[CParamsUsed] = s;
-+            /* strip leading white space */
-+            while (*eq && isspace((unsigned char) *eq)) ++eq;
-+            /* strip trailing white space */
-+            StripTrailingSpace(eq);
-+            CParamValues[CParamsUsed++] = eq; 
-+            if (DoDebug) printf("NEW PARAMETER: %s VALUE: %s\n", s, eq);
-+        }
-+        s = t;
-+    } while (t);
-+}
-+
-+char *FindParam(s)
-+char *s;
-+{
-+    int i;
-+    for (i=0; i<CParamsUsed; ++i) {
-+        if (!strcmp(s, CParams[i])) {
-+            return(CParamValues[i]);
-+        }
-+    }
-+    return(NULL);
-+}
-+
-+strcatquoting(s1, s2)
-+char *s1;
-+char *s2;
-+{
-+    strcat(s1, s2);
-+#ifdef NOTDEF
-+    while (*s1) ++s1;
-+    while (*s2) {
-+        if (*s2 == '\"' || *s2 == '\\') *s1++ = '\\';
-+        *s1++ = *s2++;
-+    }
-+    *s1 = '\0';
-+#endif
-+}
-+
-+PauseForUser() {
-+    if (DefinitelyNotTty || MustNotBeTty) return;	
-+
-+    fflush(stdout);
-+    SaveTtyState();
-+    if (StartRawStdin() != -1) {
-+        printf("--Press any key to go on.--");
-+    } else {
-+        printf("Press RETURN to go on.\n");
-+    }
-+    fflush(stdout);
-+    getchar();
-+    RestoreTtyState();
-+    printf("\n");
-+}
-+
-+StartRawStdin() {
-+    struct termio   orterm, fterm;
-+    ioctl(0, TCGETA, &orterm);	/* get current (i.e. cooked) termio */
-+    fterm = orterm;		/* get termio to modify */
-+
-+    fterm.c_lflag &= ~ICANON;	/* clear ICANON giving raw mode */
-+    fterm.c_cc[VMIN] = 1;	/* set MIN char count to 1 */
-+    fterm.c_cc[VTIME] = 0;	/* set NO time limit */
-+    return ioctl(0, TCSETAW, &fterm);	/* modify termio for raw mode */
-+}
-+
-+
-+int IsDirectory(fname)
-+char *fname;
-+{
-+    struct stat stbuf;
-+    if (stat(fname, &stbuf)) {
-+	return(-1);
-+    }
-+    return (((stbuf.st_mode & S_IFMT) == S_IFDIR) ? 1 : 0);
-+}
-+
---- metamail-2.7.orig/src/metamail/dlistold.h
-+++ metamail-2.7/src/metamail/dlistold.h
-@@ -0,0 +1,36 @@
-+// Copyright: Michael Moerz 2000
-+//
-+// This program is free software; you can redistribute it and/or modify
-+// it under the terms of the GNU General Public License as published by
-+// the Free Software Foundation; either version 2 of the License, or
-+// (at your option) any later version.
-+//
-+// This program is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+//
-+// You should have received a copy of the GNU General Public License with
-+// the Debian GNU/Linux distribution in file /usr/share/doc/common-licenses/GPL
-+// if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-+// Suite 330, Boston, MA  02111-1307  USA
-+
-+#ifndef DRF_LIST_H
-+#define DRF_LIST_H 1
-+
-+typedef struct dlist {
-+  struct dlist* next;
-+  struct dlist* prev;
-+  void* data;
-+} DList;
-+
-+extern DList* dlist_new        (void* data);
-+extern void   dlist_cat        (DList* tail_l1, DList* head_l2);
-+extern DList* dlist_insertnew  (DList** tail, void* data);
-+extern DList* dlist_insert     (DList** tail, DList* new);
-+extern DList* dlist_head       (DList* head);
-+extern DList* dlist_tail       (DList* head);
-+extern size_t dlist_length     (DList* head);
-+extern DList* dlist_remove     (DList** head, DList** tail, DList* entry);
-+
-+#endif /* !DRF_LIST_H */
---- metamail-2.7.orig/src/metamail/mimencode.c
-+++ metamail-2.7/src/metamail/mimencode.c
-@@ -0,0 +1,95 @@
-+/*
-+Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+
-+Permission to use, copy, modify, and distribute this material 
-+for any purpose and without fee is hereby granted, provided 
-+that the above copyright notice and this permission notice 
-+appear in all copies, and that the name of Bellcore not be 
-+used in advertising or publicity pertaining to this 
-+material without the specific, prior written permission 
-+of an authorized representative of Bellcore.  BELLCORE 
-+MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+*/
-+#include <metamail/common.h>
-+
-+//#ifdef MSDOS
-+//#include <fcntl.h>
-+//#endif
-+
-+#define BASE64 1
-+#define QP 2 /* quoted-printable */
-+
-+main(argc, argv)
-+int argc;
-+char **argv;
-+{
-+    int encode = 1, which = BASE64, i, portablenewlines = 0;
-+    FILE *fp = stdin;
-+    FILE *fpo = stdout;
-+
-+    for (i=1; i<argc; ++i) {
-+        if (argv[i][0] == '-') {
-+	    switch (argv[i][1]) {
-+		case 'o':
-+		    if (++i >= argc) {
-+			fprintf(stderr, "mimencode: -o requires a file name.\n");
-+			exit(-1);
-+		    }
-+		    fpo = fopen(argv[i], "w");
-+		    if (!fpo) {
-+			perror(argv[i]);
-+			exit(-1);
-+		    }
-+		    break;
-+                case 'u':
-+                    encode = 0;
-+                    break;
-+                case 'q':
-+                    which = QP;
-+                    break;
-+                case 'p':
-+                    portablenewlines = 1;
-+                    break;
-+                case 'b':
-+                    which = BASE64;
-+                    break;
-+		default:
-+                    fprintf(stderr,
-+                       "Usage: %s [-u] [-q] [-b] [-p] [-o outputfile] [file name]\n", *argv);
-+                    exit(-1);
-+            }
-+        } else {
-+	  //#ifdef MSDOS
-+	  //            if (encode)
-+          //      fp = fopen(argv[i], "rb");
-+          //  else
-+          //  {
-+          //      fp = fopen(argv[i], "rt");
-+          //      setmode(fileno(fpo), O_BINARY);
-+          //  } /* else */
-+	  //#else
-+            fp = fopen(argv[i], "r");
-+	    //#endif /* MSDOS */
-+            if (!fp) {
-+                perror(argv[i]);
-+                exit(-1);
-+            }
-+        }
-+    }
-+    //#ifdef MSDOS
-+    //if (fp == stdin) setmode(fileno(fp), O_BINARY);
-+    //#endif /* MSDOS */
-+    if (which == BASE64) {
-+        if (encode) {
-+            to64(fp, fpo, portablenewlines);
-+        } else {
-+            from64(fp,fpo, (char **) NULL, (int *) 0, portablenewlines);
-+        }
-+    } else {
-+        if (encode) toqp(fp, fpo); else fromqp(fp, fpo, NULL, 0);
-+    }
-+    return(0);
-+}
-+
---- metamail-2.7.orig/src/metamail/tmpfile.c
-+++ metamail-2.7/src/metamail/tmpfile.c
-@@ -0,0 +1,120 @@
-+#include <metamail/common.h>
-+#include <metamail/dlist.h> /* double linked list management */
-+
-+#include "tmpfile.h"
-+#include "metamail.h"
-+
-+DList TmpNameList = { NULL, NULL };
-+
-+void
-+MkTmpFileName(name)
-+     char *name;
-+{
-+  int   tmpfd   = 0;
-+
-+  if (DoDebug) 
-+    fprintf(stderr, "MkTmpFileName:\n");
-+
-+  if (!name) {
-+    if (DoDebug)
-+      fprintf(stderr, "name is null\nMkTmpFileName END\n");
-+    return;
-+  }
-+  
-+  strcpy(name, tmproot);
-+  strcat(name, "/MXXXXXX");
-+ 
-+  if ((tmpfd = mkstemp(name)) > 0) {
-+    if (close(tmpfd) == -1) {
-+      metamail_warning( "couldn't close tmpfile: ", xstrerror( errno ) );
-+      name[0] = 0;
-+      return;
-+    }
-+    if (DoDebug)
-+      fprintf(stderr, "name = \"%s\"\n", name);
-+    AddTmpFileName( name );
-+    if (DoDebug)
-+      fprintf( stderr, "MkTmpFileName END\n", name);
-+  } else {
-+    metamail_warning( "couldn't optain tmpfile: ", xstrerror( errno ) );
-+    return;
-+  }
-+}
-+
-+void
-+AddTmpFileName(name)
-+     char *name;
-+{
-+  char *tmpname = NULL;
-+  if ( name ) {
-+    tmpname = XMALLOC( char, strlen(name) + 1 );
-+  
-+    strcpy( tmpname, name );
-+    dlist_insertnew( &TmpNameList, (void*) tmpname, TmpNameList.tail );
-+    if (DoDebug)
-+      fprintf( stderr, "AddTmpFileName: %s\n", name );
-+  }
-+}
-+
-+void
-+DelTmpFileName(name)
-+     char *name;
-+{
-+  DListEntry *help = NULL;
-+  
-+  if ( (help = dlist_remove( &TmpNameList, dlist_search( &TmpNameList, name, 
-+							 dlist_strcmp ) ) ) ) {
-+    XFREE( help->data );
-+    XFREE( help );
-+  } else
-+    fprintf(stderr, "tried to remove non tmplist file %s\n", name);
-+}
-+
-+void
-+RmTmpFileName(name)
-+     char *name;
-+{
-+  DListEntry* help = NULL;
-+  
-+  if (DoDebug) 
-+    fprintf( stderr, "RmTmpFileName:\n" );
-+
-+  if( (help = dlist_remove( &TmpNameList, 
-+			    dlist_search( &TmpNameList, name, 
-+					  dlist_strcmp ) ) ) ) {
-+    if (DoDebug) fprintf( stderr, "filename: %s\n", name );
-+    if (!access( name, R_OK ) ) { 
-+      if(unlink( name ) == -1)
-+	metamail_error( stderr, "error unlinking: ", xstrerror( errno ) );
-+    }
-+    XFREE( help->data );
-+    XFREE( help );
-+  }
-+}
-+
-+void
-+CleanupTmpFiles( void )
-+{
-+  DListEntry* help = NULL;
-+  
-+  if (DoDebug) 
-+    fprintf( stderr, "CleanupTmpFiles:\n" );
-+
-+  while ( TmpNameList.head ) {
-+    if (DoDebug) fprintf(stderr, "tmpfile: %s  %X\n", TmpNameList.head->data,
-+			 TmpNameList.head->next);
-+    if (!access( (char*) TmpNameList.head->data, R_OK )) {
-+      if (DoDebug) fprintf( stderr, "access file yes\n" );
-+      if (unlink( (char*) TmpNameList.head->data ) < 0) {
-+	if (DoDebug) 
-+	  metamail_error( stderr, "error unlinking: ", 
-+			  (char*) TmpNameList.head->data );
-+      }
-+    }
-+    
-+    help = dlist_remove( &TmpNameList, TmpNameList.head );
-+    if (DoDebug) fprintf( stderr, "%X\n", help );
-+    XFREE( help->data );
-+    XFREE( help );
-+  }
-+}
---- metamail-2.7.orig/src/metamail/tmpfile.h
-+++ metamail-2.7/src/metamail/tmpfile.h
-@@ -0,0 +1,15 @@
-+#ifndef METAMAIL_TMPFILE_H
-+#define METAMAIL_TMPFILE_H 1
-+
-+/* create and remove tmpfiles */
-+void MkTmpFileName( char* );
-+void RmTmpFileName( char* );
-+/* and cleanup after doing all kind of things */
-+void CleanupTmpFiles( void );
-+
-+/* register and unregister tmpfiles */
-+/* these functions should not be invoked directly (there are exceptions) */
-+void AddTmpFileName( char* );
-+void DelTmpFileName( char* );
-+
-+#endif /* METAMAIL_TMP_FILE_H */
---- metamail-2.7.orig/src/metamail/metamail.old
-+++ metamail-2.7/src/metamail/metamail.old
-@@ -0,0 +1,2756 @@
-+/*
-+Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+
-+Permission to use, copy, modify, and distribute this material 
-+for any purpose and without fee is hereby granted, provided 
-+that the above copyright notice and this permission notice 
-+appear in all copies, and that the name of Bellcore not be 
-+used in advertising or publicity pertaining to this 
-+material without the specific, prior written permission 
-+of an authorized representative of Bellcore.  BELLCORE 
-+MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+*/
-+/****************************************************** 
-+    Metamail -- A tool to help diverse mail readers 
-+                cope with diverse multimedia mail formats.
-+
-+    Author:  Nathaniel S. Borenstein, Bellcore
-+
-+ ******************************************************* */
-+
-+#include <stdio.h>
-+#include <ctype.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include "../config.h"
-+#include <patchlevel.h>
-+#include "dlist.h"
-+
-+#ifdef BORLAND
-+#define F_OK 0
-+extern unsigned _stklen = 16384;
-+extern char *mktemp(char *);
-+#define WRITE_BINARY	"w"
-+#else /* BORLAND */
-+#ifdef MICROSOFT
-+#include <malloc.h>
-+#include <stdlib.h>
-+#include <time.h>
-+#include <signal.h>
-+#define F_OK 0
-+#else
-+#include <pwd.h>
-+#include <sys/time.h>
-+#include <sys/types.h>
-+#include <sys/file.h>
-+#include <signal.h>
-+#ifndef AMIGA
-+#ifdef SYSV
-+#include <termio.h>
-+#include <unistd.h>
-+#else /* SYSV */
-+#include <sgtty.h>
-+#endif /* SYSV */
-+#endif /* AMIGA */
-+#endif /* MICROSOFT */
-+#endif /* BORLAND */
-+
-+#if defined(SYSV) && !defined(linux)
-+#define LPRTEMPLATE "lp %s"
-+#define LPRCOMMAND "lp"
-+#else
-+#define LPRTEMPLATE "lpr %s"
-+#define LPRCOMMAND "lpr"
-+#endif
-+#ifdef MSDOS
-+#define CATCOMMAND  "cat"
-+#define CATTEMPLATE "cat %s"
-+#define METAMAIL    "metamail"
-+#define TMPFILE_NAME_SIZE   128
-+#define MAX_FILE_NAME_SIZE 128
-+#define WRITE_BINARY	"wb"
-+#else /* MSDOS */
-+#ifdef AMIGA
-+extern char *MkRmScript();
-+#ifndef F_OK
-+#define F_OK (0)
-+#endif
-+#define CATCOMMAND  "Type"
-+#define CATTEMPLATE "Type %s"
-+#define METAMAIL    "metamail <*"
-+#define TMPFILE_NAME_SIZE     50
-+#define MAX_FILE_NAME_SIZE 256
-+#define WRITE_BINARY	"w"
-+#else /* AMIGA */
-+extern char **environ, *gets();
-+#define CATCOMMAND  "cat"
-+#define CATTEMPLATE "cat %s"
-+#define METAMAIL    "metamail"
-+#define TMPFILE_NAME_SIZE   1000
-+#define MAX_FILE_NAME_SIZE 1000
-+#define WRITE_BINARY	"w"
-+#endif /* AMIGA */
-+#endif /* MSDOS */
-+
-+#ifndef NO_RLIMITS
-+#include <sys/resource.h>
-+#endif
-+
-+#define CMDSIZE 1200 /* Maximum size of command to execute */
-+
-+#define LINE_BUF_SIZE       2000
-+#ifndef MICROSOFT
-+extern char *malloc();
-+extern char *realloc();
-+#endif
-+extern char *getenv();
-+extern char *index();
-+extern char *rindex();
-+char fileToDelete[MAX_FILE_NAME_SIZE];
-+
-+char *FindParam();
-+extern FILE *popen();
-+static char *nomem = "Out of memory!";
-+static char *mmversion = MM_VERSTRING;
-+static char *NoAskDefault = "text,text/plain,text/richtext";
-+static char *QuietDefault = CATCOMMAND;
-+static char *tmproot="";
-+
-+struct MailcapEntry {
-+    char *contenttype;
-+    char *command;
-+    char *testcommand;
-+    int needsterminal;
-+    int copiousoutput;
-+    int needtofree;
-+    char *label;
-+    char *printcommand;
-+};
-+
-+FILE *InputFP = NULL;
-+
-+int MightAskBeforeExecuting = 1,
-+    DefinitelyNotTty = 0,
-+    MustNotBeTty = 0,
-+    MaybePageOutput = 0,
-+    MustPageOutput = 0,
-+    EatLeadingNewlines = 0,
-+    PrintSomeHeaders = 1,
-+    DoInBackground = 0,
-+    Quiet = 0,
-+    TransparentMode = 0,
-+    DeleteSourceFileWhenDone = 0,
-+    Is822Format = 1,
-+    DoDebug = 0,
-+    CParamsAlloced = 0,
-+    CParamsUsed = 0,
-+    YankMode = 0,
-+    UsingStandardInput = 0,
-+    PrintingMode = 0,
-+    JustWriteFiles = 0,
-+    ProcessingErrors = 0;
-+
-+char *ContentType = NULL,
-+    *ContentEncoding = NULL,
-+    *MailerName = "unknown",
-+    *MailSubject = "Mail message",
-+    *MailFrom = "unknown sender",
-+    *MailSummary = "non-text mail message",
-+    *mailheaders = NULL,
-+    **CParams = NULL,
-+    **CParamValues = NULL,
-+    *JunkParameter = NULL;
-+
-+DList* TmpNameListTail;
-+
-+#define ENCODING_NONE 0
-+#define ENCODING_BASE64 1
-+#define ENCODING_QUOTEDPRINTABLE 2
-+#define ENCODING_8BIT 3
-+#define ENCODING_UUENCODE -1	/* non-standard */
-+int EncodingCode = ENCODING_NONE;
-+
-+struct part {
-+    char *ctype;
-+    char *fname;
-+    struct part *next;
-+};
-+
-+struct NoAskItem {
-+    char *type;
-+    struct NoAskItem *next;
-+} *FirstNoAskItem = NULL,
-+  *FirstQuietItem = NULL;
-+
-+#ifdef MICROSOFT
-+/* Need a function prototype for TryMailcapEntry because without it MSC
-+ * passes a pointer to the structure rather than the structure itself.
-+ */
-+TryMailcapEntry(struct MailcapEntry mc, char *SquirrelFile);
-+#endif
-+
-+void PrintHeader();
-+void ConsumeRestOfPart();
-+void ParseContentParameters();
-+
-+void CleanupTmpFiles();
-+
-+sigtype cleanup();
-+
-+char *Cleanse(s) /* no leading or trailing space, all lower case */
-+char *s;
-+{
-+    char *tmp, *news;
-+    
-+    /* strip leading white space */
-+    while (*s && isspace((unsigned char) *s)) ++s;
-+    news = s;
-+    /* put in lower case */
-+    for (tmp=s; *tmp; ++tmp) {
-+        if (isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
-+    }
-+    /* strip trailing white space */
-+    while (tmp > news && *--tmp && isspace((unsigned char) *tmp)) *tmp = 0;
-+    return(news);
-+}
-+
-+char *UnquoteString(s)
-+char *s;
-+{
-+    char *ans, *t;
-+
-+    if (*s != '"') return(s);
-+    ans = malloc(1+strlen(s));
-+    if (!ans) ExitWithError(nomem);
-+    ++s;
-+    t = ans;
-+    while (*s) {
-+        if (*s == '\\') {
-+            *t++ = *++s;
-+        } else if (*s == '"') {
-+            break;
-+        } else {
-+            *t++ = *s;
-+        }
-+        ++s;
-+    }
-+    *t = 0;
-+    return(ans);
-+}
-+
-+sigtype
-+cleanup(signum) 
-+int signum;
-+{
-+    RestoreTtyState();
-+#if defined(MSDOS) || defined(AMIGA)
-+    exit(signum);
-+#else
-+    signal(signum, SIG_DFL);
-+    kill(getpid(), signum);
-+#endif
-+}
-+
-+char **Boundaries = NULL;
-+int BoundaryCt = 0, BoundaryAlloc = 0;
-+struct nextfile {
-+    char *filename;
-+    struct nextfile *next;
-+} *FileQueue=NULL, *LastInQueue = NULL;
-+
-+void
-+ResetGlobals() {
-+    CParamsAlloced = 0;
-+    CParamsUsed = 0;
-+
-+    ContentType = NULL;
-+    ContentEncoding = NULL;
-+    MailSubject = "Mail message";
-+    MailFrom = "unknown sender";
-+    MailSummary = "non-text mail message";
-+    mailheaders = getenv("MM_HEADERS");
-+    if (mailheaders) {
-+        char *s;
-+        s = malloc(15+strlen(mailheaders));
-+        if (!s) ExitWithError(nomem);
-+        sprintf(s, "MM_HEADERS=%s", mailheaders);
-+        mailheaders = s;
-+    }
-+    CParams = NULL;
-+    CParamValues = NULL;
-+    JunkParameter = NULL;
-+}
-+
-+void modpath(auxpath)
-+char *auxpath;
-+{
-+    if (auxpath && *auxpath) {
-+        static char *newpath = 0;
-+	char *oldpath = newpath;
-+        char *path = getenv("PATH");
-+
-+	if (!path) path = "";	/* give a default if no current path */
-+	newpath = malloc(7 + strlen(path) + strlen(auxpath));
-+        if (!newpath) ExitWithError(nomem);
-+        sprintf(newpath, "PATH=%s:%s", auxpath, path);
-+        putenv(newpath);
-+	if (oldpath) free(oldpath); 	/* free up any old allocated PATH */
-+    }
-+}
-+
-+main(argc, argv)
-+int argc;
-+char **argv;
-+{
-+    int retcode;
-+
-+    modpath(AUXPATH);
-+#ifndef MSDOS
-+    signal(SIGINT, cleanup);
-+#ifndef AMIGA
-+    signal(SIGILL, cleanup);
-+    signal(SIGTRAP, cleanup);
-+    signal(SIGIOT, cleanup);
-+    signal(SIGFPE, cleanup);
-+#ifndef linux
-+    signal(SIGEMT, cleanup);
-+    signal(SIGBUS, cleanup);
-+#endif
-+    signal(SIGSEGV, cleanup);
-+    signal(SIGTERM, cleanup);
-+#endif
-+#endif
-+#ifdef SIGXCPU
-+    signal(SIGXCPU, cleanup);
-+#endif
-+    tmproot = getenv("METAMAIL_TMPDIR");
-+    if (!tmproot) tmproot="/tmp";
-+    mailheaders = getenv("MM_HEADERS");
-+    if (mailheaders) {
-+        char *s;
-+        s = malloc(15+strlen(mailheaders));
-+        if (!s) ExitWithError(nomem);
-+        sprintf(s, "MM_HEADERS=%s", mailheaders);
-+        mailheaders = s;
-+    }
-+    fileToDelete[0] = 0;
-+    ProcessArguments(argc, argv); /* calls ExitWithError on error */
-+#if !defined(AMIGA) && !defined(MSDOS)
-+    if (MaybePageOutput) {
-+        /* Want to send stderr to pager too, sigh... */
-+        fflush(stderr);
-+        close(2);
-+        dup2(1, 2);
-+    }
-+#endif
-+    retcode = HandleMessage(NULL, 0);
-+    if (! UsingStandardInput) {
-+        fclose(InputFP);
-+    }
-+    if (fileToDelete[0]) {
-+        unlink(fileToDelete);
-+        fileToDelete[0] = 0;
-+    }
-+    while (FileQueue) {
-+        InputFP = fopen(FileQueue->filename, "r");
-+        if (DoDebug) printf("Trying to open input file: %s\n", FileQueue->filename);
-+        if (!InputFP) ExitWithError("Can't read input file");
-+        if (DeleteSourceFileWhenDone) {
-+            strcpy(fileToDelete, FileQueue->filename);
-+        }
-+        ResetGlobals();
-+        retcode |= HandleMessage(NULL, 0);
-+        if (! UsingStandardInput) {
-+            fclose(InputFP);
-+        }
-+        if (fileToDelete[0]) {
-+            unlink(fileToDelete);
-+            fileToDelete[0] = 0;
-+        }
-+        FileQueue = FileQueue->next;
-+    }
-+    if (MustPageOutput) PauseForUser();
-+    CleanupTmpFiles();
-+    exit(ProcessingErrors? -1 : retcode);
-+}
-+
-+void
-+QueueNextFile(fname)
-+char *fname;
-+{
-+    struct nextfile *tmp = (struct nextfile *) malloc(sizeof (struct nextfile));
-+    if (!tmp) ExitWithError(nomem);
-+    tmp->filename = fname;
-+    tmp->next = NULL;
-+    if (FileQueue) {
-+        LastInQueue->next = tmp;
-+        LastInQueue = tmp;
-+    } else {
-+        FileQueue = tmp;
-+        LastInQueue = tmp;
-+    }
-+}
-+
-+HandleMessage(SquirrelFile, nestingdepth)
-+char *SquirrelFile;
-+/* SquirrelFile, if non-NULL, is a place to save a recognized body instead of executing it. */
-+int nestingdepth;
-+{
-+    char *boundary;
-+    int FileWriteOnly = JustWriteFiles;
-+
-+    if (FileWriteOnly) {
-+        if (!lc2strncmp(ContentType, "message/", 8)
-+             || !lc2strncmp(ContentType, "multipart/", 10)) {
-+            FileWriteOnly = 0; /* only leaf data */
-+        }
-+    }
-+    if (Is822Format) {
-+	if (Read822Prefix(SquirrelFile?0:1, nestingdepth)) {
-+	    return -1;
-+	}
-+    } else Is822Format = 1; /* this property is not recursive for multipart or message */
-+    PrepareMessage();
-+    if (!FileWriteOnly && !ProcessMailcapFiles(SquirrelFile)) return(0);
-+    if (!lc2strcmp(ContentType, "message")
-+         || !lc2strcmp(ContentType, "message/rfc822")) { 
-+        if (SquirrelFile) return(SaveSquirrelFile(SquirrelFile));
-+        ContentType = NULL; /* reset default */
-+        ContentEncoding = NULL; /* reset default */
-+        return(HandleMessage(NULL, nestingdepth+1)); /* simple recursion */
-+    }
-+    boundary = FindParam("boundary");
-+    if (!boundary) boundary =JunkParameter; /* backward compatibility hack */
-+    if (!lc2strncmp(ContentType, "multipart", 9)) { 
-+      if (!boundary) {
-+	  fprintf(stderr, "Warning: No boundary for multipart data, treating as unrecognized format.\n");
-+      } else {
-+        char *LineBuf, NewSquirrelFile[TMPFILE_NAME_SIZE];
-+        char *subtype = NULL;
-+        int currct, result, IsAlternative, WroteSquirrelFile, boundarylen;
-+
-+        if (SquirrelFile) return(SaveSquirrelFile(SquirrelFile));
-+        if (boundary[0] == '"') {
-+            boundary=UnquoteString(boundary);
-+        }
-+        subtype = index(ContentType, '/');
-+        if (subtype) {
-+            ++subtype;
-+            subtype = Cleanse(subtype);
-+        } else subtype = "mixed";
-+#ifndef MSDOS
-+        if (!MaybePageOutput && !DoInBackground) DoInBackground = strcmp(subtype, "parallel") ? 0 : 1;
-+#endif
-+
-+        IsAlternative = strcmp(subtype, "alternative") ? 0 : 1;
-+        if (IsAlternative) {
-+            MkTmpFileName(NewSquirrelFile);
-+            WroteSquirrelFile = 0;
-+        }
-+        LineBuf = malloc(LINE_BUF_SIZE);
-+        if (!LineBuf) ExitWithError(nomem);
-+        sprintf(LineBuf, "--%s", boundary);
-+        strcpy(boundary, LineBuf);
-+        boundarylen = strlen(boundary);
-+        if (BoundaryCt >= BoundaryAlloc) {
-+            BoundaryAlloc += 5;
-+            if (Boundaries) {
-+                Boundaries = (char **) realloc(Boundaries, BoundaryAlloc*sizeof(char *));
-+            } else {
-+                Boundaries = (char **) malloc(BoundaryAlloc*sizeof(char *));
-+            }
-+            if (!Boundaries) ExitWithError(nomem);
-+        }
-+        Boundaries[BoundaryCt++] = boundary;
-+        if (DoDebug) printf("Handling multipart as built-in here.  Boundary: %s\n", boundary);
-+        while (fgets(LineBuf, LINE_BUF_SIZE, InputFP)) { /* find start */
-+            if (!strncmp(LineBuf, boundary, boundarylen)
-+                 && ((LineBuf[boundarylen] == '\n')
-+                      || (LineBuf[boundarylen] == '-'
-+                           && LineBuf[boundarylen+1] == '-'
-+                           && LineBuf[boundarylen+2] == '\n'))) {
-+                break;
-+            }
-+        }
-+        free(LineBuf);
-+        currct = BoundaryCt;
-+        while(currct == BoundaryCt) {
-+            if (!strcmp(subtype, "digest")) {
-+                ContentType = "message/rfc822";
-+            } else {
-+                ContentType = NULL; /* reset default */
-+            }
-+            ContentEncoding = NULL; /* reset default */
-+            if (IsAlternative) {
-+                result = HandleMessage(NewSquirrelFile, nestingdepth+1);
-+            } else{
-+                result = HandleMessage(NULL, nestingdepth+1);
-+            }
-+            if (result) {
-+                /* Need to consume the rest of the part */
-+                ConsumeRestOfPart(NULL);
-+            } else {
-+                ++WroteSquirrelFile;
-+            }
-+        }
-+        /* Now we've seen the last encapsulation boundary, but if there is a "postfix"
-+            we must throw it away.*/
-+        if (BoundaryCt > 0) {
-+            ConsumeRestOfPart(NULL);
-+        }
-+        if (IsAlternative) {
-+            if (WroteSquirrelFile) {
-+                int retcode; 
-+                char Cmd[TMPFILE_NAME_SIZE + 15];
-+                sprintf(Cmd, "%s %s", METAMAIL, NewSquirrelFile);
-+                fflush(stdout); fflush(stderr);
-+                retcode = system(Cmd);
-+#ifdef MSDOS
-+                retcode = 0;
-+#endif
-+                unlink(NewSquirrelFile);
-+                return(retcode);
-+            } else {
-+                printf("Cannot handle any part of multipart/alternative message\n");
-+            }
-+        }
-+	return(0);
-+      }
-+    } /* End of multipart handling */
-+    if (!FileWriteOnly && !TryBuiltIns(SquirrelFile)) return(0);
-+    if (!SquirrelFile) { /* Very last resort -- unrecognized types */
-+        char Fname[MAX_FILE_NAME_SIZE], *suggestedname, SugBuf[MAX_FILE_NAME_SIZE];
-+        FILE *fp;
-+        int ans = 0, octetstream, ecode=0;
-+        suggestedname = FindParam("name");
-+        if (!suggestedname) {
-+            MkTmpFileName(SugBuf);
-+            suggestedname = SugBuf;
-+        } else if (suggestedname[0] == '"') {
-+            suggestedname=UnquoteString(suggestedname);
-+        }
-+        octetstream = ! lc2strcmp(ContentType, "application/octet-stream");
-+        if (MightAskBeforeExecuting
-+             && !DefinitelyNotTty && !MustNotBeTty) {
-+            if (FileWriteOnly) {
-+                printf("\nThis message contains '%s`-format data.\n", ContentType);
-+            } else if (octetstream) {
-+                printf("This message contains raw digital data, which can either be viewed as text\nor written to a file.\n");
-+            } else {
-+                printf("\nThis message contains data in an unrecognized format, %s,\nwhich can either be viewed as text or written to a file.\n", ContentType);
-+            }
-+            while (!ans) {
-+                if (FileWriteOnly) {
-+                    ans = 2;
-+                } else {
-+                    printf("\nWhat do you want to do with the %s data?\n1 -- See it as text\n2 -- Write it to a file\n3 -- Just skip it\n\n", octetstream ? "raw" : ContentType);
-+                    fgets(Fname, sizeof(Fname), stdin);
-+                    ans = atoi(Fname);
-+                }
-+                switch(ans) {
-+                    case 1:
-+                        TranslateInputToOutput(InputFP, stdout, EncodingCode, "text");
-+                        return(0);
-+                    case 2:
-+                        {
-+                        int needname = 1;
-+                        while (needname) {
-+                            needname = 0;
-+                            printf("Please enter the name of a file to which the data should be written\n(Default: %s) > ", suggestedname);
-+                            fflush(stdout);
-+                            fgets(Fname, sizeof(Fname), stdin);
-+                            Fname[strlen(Fname) - 1] = '\0'; /* bogus newline */
-+#if !defined(AMIGA) && !defined(MSDOS)
-+                            if (!Fname[0]) strcpy(Fname, suggestedname);
-+                            if (Fname[0] == '~' && Fname[1] == '/') {
-+                                char Fname2[1000];
-+                                int uid = getuid();
-+                                struct passwd *p;
-+                                p = getpwuid(uid);
-+                                if (!p) {
-+                                    MkTmpFileName(Fname);
-+                                    printf("Cannot figure out what ~ means, using temporary file %s instead\n", Fname);
-+                                } else {
-+                                    strcpy(Fname2, p->pw_dir);
-+                                    strcat(Fname2, "/");
-+                                    strcat(Fname2, Fname + 2);
-+                                    strcpy(Fname, Fname2);
-+                                }
-+                            }
-+#endif
-+                            if (access(Fname, F_OK) == 0) {
-+                                char *s, AnsBuf[50];
-+                                int overwriteans = -1;
-+                                do {
-+                                    printf("File %s exists.  Do you want to overwrite it (y/n) ?\n", Fname);
-+                                    s = fgets(AnsBuf, sizeof(AnsBuf), stdin);
-+                                    if (!s) {
-+                                        overwriteans = 0;
-+                                    } else {
-+                                        while (s && *s && isspace((unsigned char) *s)) ++s;
-+                                        if (*s == 'y' || *s == 'Y' || !*s || *s == '\n') {
-+                                            overwriteans = 1;
-+                                        } else if (*s == 'n' || *s == 'N' || *s == 'q' || *s == 'Q') {
-+                                            overwriteans=0;
-+                                        }
-+                                    }
-+                                    if (overwriteans == -1) printf("Please answer yes or no.\n");
-+                                } while (overwriteans == -1);
-+                                if (overwriteans == 0) needname = 1;
-+                            }
-+                        }
-+                        }
-+                        break;
-+                    case 3:
-+                        ConsumeRestOfPart(NULL);
-+                        return(0);
-+                        break;
-+                    default:
-+                        ans = 0;
-+                        break;
-+                }
-+            }
-+        } else {
-+            int ct = 0;
-+            char *slash = rindex(suggestedname, '/');
-+#ifdef AMIGA
-+	    if (slash == NULL) {
-+                slash = rindex(suggestedname, ':');
-+            }
-+#endif
-+            if (slash)  {
-+                ++slash;
-+            } else {
-+                slash = suggestedname;
-+            }
-+            do {
-+                if (ct) {
-+#ifdef AMIGA
-+                    sprintf(Fname, "T:%d-%s", ct, slash);
-+                } else {
-+                    sprintf(Fname, "T:%s", slash);
-+#else
-+                    sprintf(Fname, "%s/%d-%s", tmproot, ct, slash);
-+                } else {
-+                    sprintf(Fname, "%s/%s", tmproot, slash);
-+#endif
-+                }
-+                ++ct;
-+            } while (access(Fname, F_OK) == 0);
-+            if (FileWriteOnly) {
-+                printf("\nThis message contains '%s`-format data.\n", ContentType);
-+            } else if (octetstream) {
-+                printf("\nThis message contains raw digital data,");
-+            } else {
-+                printf("\nThis message contains data in an unrecognized format, %s,", ContentType);
-+            }
-+            printf("\nwhich is being decoded and written to the file named \"%s\".\nIf you do not want this data, you probably should delete that file.\n", Fname);
-+        }
-+        if (Fname[0] == 0 || Fname[0] == '\n') {
-+            ConsumeRestOfPart(NULL);
-+        } else {
-+            fp = fopen(Fname, WRITE_BINARY);
-+            if (!fp) ExitWithError("Cannot open temporary file");
-+            TranslateInputToOutput(InputFP, fp, EncodingCode, ContentType);
-+            ecode = fclose(fp);
-+            if (ecode) {
-+                printf("Could not write file %s\n", Fname);
-+            } else {
-+                printf("Wrote file %s\n", Fname);
-+            }
-+        }
-+        if (!DefinitelyNotTty && MaybePageOutput && BoundaryCt > 0) PauseForUser();
-+        return(ecode);
-+    }
-+    return(-1); /* Unrecognized, really */
-+}
-+
-+ProcessArguments(argc, argv)
-+int argc;
-+char **argv;
-+{
-+    int i, RunAsRootOK = 0;
-+    char *SourceFileName = NULL, *NoAskStr, *QuietStr;
-+
-+    QuietStr = getenv("MM_QUIET");
-+    if (!QuietStr) {
-+        QuietStr=QuietDefault;
-+    }
-+    if (!strcmp(QuietStr, "1")) {
-+        Quiet = 1;
-+    } else {
-+        struct NoAskItem *qitem;
-+        char *s, *tmp;
-+        char *QuietCopy;
-+
-+        Quiet = 0;
-+        QuietCopy = malloc(1+strlen(QuietStr));
-+        if (!QuietCopy) ExitWithError(nomem);
-+        strcpy(QuietCopy, QuietStr);
-+        for (tmp=QuietCopy; *tmp; ++tmp) {
-+            if (isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
-+        }
-+        do {
-+            s = index(QuietCopy, ',');
-+            if (s) *s++ = 0;
-+            qitem = (struct NoAskItem *) malloc(sizeof (struct NoAskItem));
-+            if (!qitem) ExitWithError(nomem);
-+            qitem->next = FirstQuietItem;
-+            qitem->type = QuietCopy;
-+            FirstQuietItem = qitem;
-+            QuietCopy = s;
-+        } while (QuietCopy);
-+    }
-+    if (getenv("MM_TRANSPARENT")) {
-+        TransparentMode = atoi(getenv("MM_TRANSPARENT")); /* Will not propogate recursively */
-+    }
-+    if (getenv("MM_RUNASROOT")) {
-+        RunAsRootOK = atoi(getenv("MM_RUNASROOT"));
-+    }
-+    if (getenv("MM_YANKMODE")) {
-+        YankMode = atoi(getenv("MM_YANKMODE")); /* Will not propogate recursively */
-+    }
-+    if (getenv("MM_DEBUG")) {
-+        DoDebug = atoi(getenv("MM_DEBUG"));
-+    }
-+    if (DoDebug) printf("Metamail Version %s, debugging turned on.\n", mmversion);
-+    NoAskStr = getenv("MM_NOASK");
-+    if (!NoAskStr) NoAskStr = NoAskDefault;
-+    if (!strcmp(NoAskStr, "1")) {
-+        MightAskBeforeExecuting = 0;
-+    } else {
-+        struct NoAskItem *nai;
-+        char *s, *tmp;
-+        char *NoAskCopy;
-+
-+        NoAskCopy = malloc(1+strlen(NoAskStr));
-+        if (!NoAskCopy) ExitWithError(nomem);
-+        strcpy(NoAskCopy, NoAskStr);
-+        for (tmp=NoAskCopy; *tmp; ++tmp) {
-+            if (isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
-+        }
-+        do {
-+            s = index(NoAskCopy, ',');
-+            if (s) *s++ = 0;
-+            nai = (struct NoAskItem *) malloc(sizeof (struct NoAskItem));
-+            if (!nai) ExitWithError(nomem);
-+            nai->next = FirstNoAskItem;
-+            nai->type = NoAskCopy;
-+            FirstNoAskItem = nai;
-+            NoAskCopy = s;
-+        } while (NoAskCopy);
-+    }
-+    MailerName = getenv("MM_MAILER");
-+    if (!MailerName) MailerName = "unknown";
-+    if (getenv("MM_USEPAGER")) {
-+        MaybePageOutput = atoi(getenv("MM_USEPAGER"));
-+    }
-+    if ((getenv("MM_NOTTTY") && ((atoi(getenv("MM_NOTTTY"))) != 0))) {
-+        MustNotBeTty = 1;
-+    }
-+    if (MustNotBeTty
-+         || !isatty(0)
-+         || !isatty(1)) {
-+        DefinitelyNotTty = 1;
-+    }
-+    for (i=1; i<argc; ++i) {
-+	if (argv[i][0] == '-') {
-+	    switch (argv[i][1]) {
-+		case '\0':
-+		    /* Not really necessary, but.... */
-+		    SourceFileName = NULL;
-+		    UsingStandardInput = 1;
-+		    break;
-+		case 'b':
-+		    Is822Format = 0;
-+		    break;
-+		case 'B':
-+#ifdef MSDOS
-+                    fprintf(stderr, "metamail warning: -B flag not supported on this system\n");
-+#else
-+		    DoInBackground = 1;
-+#endif
-+		    break;
-+                case 'c':
-+		    if (++i >= argc) usage();
-+		    ContentType = malloc(1+strlen(argv[i]));
-+		    if (!ContentType) ExitWithError(nomem);
-+                    strcpy(ContentType,argv[i]);
-+                    /* strip leading white space */
-+                    while (*ContentType && isspace((unsigned char) *ContentType)) ++ContentType;
-+                    StripTrailingSpace(ContentType);
-+                    ParseContentParameters(ContentType);
-+                    break;
-+                case 'd':
-+		    MightAskBeforeExecuting = 0;
-+		    break;
-+		case 'e':
-+		    EatLeadingNewlines = 1;
-+		    break;
-+		case 'E':
-+		    if (++i >= argc) usage();
-+		    ContentEncoding = argv[i];
-+		    break;
-+		case 'f':
-+		    if (++i >= argc) usage();
-+		    MailFrom = argv[i];
-+                    break;
-+                case 'h':
-+                    {
-+                    FILE *tmpfp;
-+                    PrintingMode = 1;
-+                    MightAskBeforeExecuting = 0;
-+#ifdef AMIGA
-+		    freopen("prt:", "w", stdout);
-+#else
-+                    /* Want to make all of stdout go to printer, and this 
-+                      is easier than changing every output statement,
-+                      at least on UNIX... */
-+                    tmpfp = popen(LPRCOMMAND, "w");
-+                    if (!tmpfp) {
-+                        ExitWithError("Cannot execute lpr command");
-+                    }
-+                    fflush(stdout);
-+                    close(1);
-+                    dup2(fileno(tmpfp), 1);
-+#endif
-+                    break;
-+                    }
-+		case 'm':
-+		    if (++i >= argc) usage();
-+		    MailerName = argv[i];
-+		    break;
-+		case 'p':
-+		    MaybePageOutput = 1;
-+		    break;
-+		case 'P':
-+                    MaybePageOutput = 1;
-+                    MustPageOutput = 1;
-+		    break;
-+		case 'r':
-+#ifdef MSDOS
-+                    fprintf(stderr, "metamail warning: -r flag not supported on this system\n");
-+#else
-+		    RunAsRootOK = 1;
-+#endif
-+                    break;
-+                case 'R':
-+#ifdef RESET_PROGRAM
-+                    system(RESET_PROGRAM);
-+                    if (DoDebug) printf("Executed reset\n");
-+#else
-+                    fprintf(stderr, "metamail warning: -R flag not supported on this system\n");
-+#endif
-+                    break;
-+		case 's':
-+		    if (++i >= argc) usage();
-+		    MailSubject = argv[i];
-+		    break;
-+                case 'T':
-+                    TransparentMode = 0;
-+                    break;
-+                case 'w':
-+                    JustWriteFiles = 1;
-+                    break;
-+                case 'q':
-+                    Quiet = 1;
-+		    PrintSomeHeaders = 0;
-+		    break;
-+		case 'x':
-+                    DefinitelyNotTty = 1;
-+                    MustNotBeTty = 1;
-+		    break;
-+                case 'y':
-+                    YankMode = 1;
-+                    break;
-+		case 'z':
-+		    DeleteSourceFileWhenDone = 1;
-+		    break;
-+		default:
-+		    usage();
-+	    }
-+	} else {
-+	    if (SourceFileName) {
-+                QueueNextFile(argv[i]);
-+	    } else {
-+		SourceFileName = argv[i];
-+	    }
-+	}
-+    }
-+    if (TransparentMode) {
-+        RunInNewWindow(argv, argc, &SourceFileName);
-+    }
-+    if (MaybePageOutput && DoInBackground) {
-+	MustNotBeTty = 1;
-+        /*fprintf(stderr, "metamail: -B is incompatible with -p, -P, and MM_USEPAGER\n");
-+        usage(); */
-+    }
-+    if (!Is822Format && !ContentType) {
-+	fprintf(stderr, "metamail:  -b requires -c.\n");
-+	usage();
-+    }
-+    if (DeleteSourceFileWhenDone && !SourceFileName) {
-+	fprintf(stderr, "metamail:  -z requires -f.\n");
-+	usage();
-+    }
-+#if !defined(AMIGA) && !defined(MSDOS)
-+    if (!RunAsRootOK && (getuid() == 0 || geteuid() == 0)) {
-+	fprintf(stderr, "You can not run MetaMail as root unless you use -r or set MM_RUNASROOT.\n");
-+	usage();
-+    }
-+#endif
-+    if (SourceFileName) {
-+        InputFP = fopen(SourceFileName, "r");
-+        if (DoDebug) printf("Trying to open input file: %s\n", SourceFileName);
-+        if (!InputFP) ExitWithError("Can't read input file");
-+        if (DeleteSourceFileWhenDone) {
-+            strcpy(fileToDelete, SourceFileName);
-+        }
-+    } else {  /* input on stdin */
-+        UsingStandardInput = 1;
-+        if (MustNotBeTty) {
-+            InputFP = stdin;
-+/*            MaybePageOutput = 1; */ /* This messed up safe-tcl -- nsb 9/21/93 */
-+            MightAskBeforeExecuting = 0;
-+        } else {
-+#if defined(MSDOS) || defined(AMIGA)
-+            InputFP = stdin;
-+            DefinitelyNotTty = 1;
-+            MaybePageOutput = 0;
-+#else
-+            int newfd = dup(0);
-+            FILE *newfp;
-+            if (newfd > 0) {
-+                InputFP = fdopen(newfd, "r");
-+                if (InputFP 
-+                     && ((newfp = fopen("/dev/tty", "r")) != NULL)
-+                     && !dup2(fileno(newfp), 0)) {
-+                    DefinitelyNotTty = 0;
-+                } else {
-+                    InputFP = stdin;
-+                    DefinitelyNotTty = 1;
-+                    MaybePageOutput = 0;
-+                }
-+            }
-+#endif
-+        }
-+    }
-+    if (DefinitelyNotTty && MaybePageOutput) {
-+        RunInNewWindow(argv, argc, &SourceFileName);
-+    }
-+    if (DefinitelyNotTty) {
-+        MaybePageOutput = 0;	/* Disable pager if I/O has been redirected */
-+    }
-+    return(0);
-+}
-+
-+usage() {
-+    fprintf(stderr, "Usage:  metamail [-b] [-B] [-d] [-e] [-h] [-r] [-R] [-p]  [-P] [-x] [-y] [-z] [-c content-type] [-E content-transfer-encoding] [-f from-name] [-m mailername] [-s subject] [message-file-name]\n");
-+    ExitWithError(NULL);
-+}
-+
-+RunInNewWindow(argv, argc, SourceFileNamePtr)
-+char **argv, **SourceFileNamePtr;
-+int argc;
-+{
-+    char *FullCmd, TmpName[TMPFILE_NAME_SIZE];
-+    int i, createdfile=0;
-+    if (!*SourceFileNamePtr) {
-+        char *LineBuf;
-+        FILE *fptmp;
-+
-+        LineBuf = malloc(LINE_BUF_SIZE);
-+        if (!LineBuf) ExitWithError(nomem);
-+        /* Create it, ugh.  Also needs to affect later command. */
-+        MkTmpFileName(TmpName);
-+        DeleteSourceFileWhenDone = 1;
-+        fptmp = fopen(TmpName, WRITE_BINARY);
-+        if (!fptmp) ExitWithError("Can't open temporary file\n");
-+        while (fgets(LineBuf, LINE_BUF_SIZE, stdin)) {
-+            fputs(LineBuf, fptmp);
-+        }
-+        free(LineBuf);
-+        fclose(fptmp);
-+        *SourceFileNamePtr = TmpName;
-+        createdfile = 1;
-+    }
-+    FullCmd = malloc(CMDSIZE);
-+    if (!FullCmd) ExitWithError(nomem);
-+    if (TransparentMode) {
-+        /* In transparent mode, we want to produce stdout that is what we get in, and do EVERYTHING externally in a terminal window.  This is to make the truly brain-dead mailers like mailtool happy. I am NOT happy about having to do this.  */
-+        /* So, first we copy everything to stdout */
-+        sprintf(FullCmd, CATTEMPLATE, *SourceFileNamePtr);
-+        system(FullCmd); /* Cheesy way to do it */
-+        fflush(stdout); fflush(stderr);
-+    }
-+    /* Then we run ourselves in a terminal window */
-+    MailSummary = "Metamail"; /* for window label */
-+    CreateNewWindowPrefix(FullCmd);
-+    strcat(FullCmd, METAMAIL);
-+    strcat(FullCmd, " -P ");
-+    if (TransparentMode) strcat(FullCmd, "-T ");
-+    for (i=1; i<argc; ++i) {
-+        if (strncmp(argv[i], "-x", 2)
-+             && strncmp(argv[i], "-B", 2)
-+             && strncmp(argv[i], "-d", 2)) {
-+            strcat(FullCmd, "\"");
-+            strcat(FullCmd, argv[i]);
-+            strcat(FullCmd, "\" ");
-+        }
-+    }
-+    if (createdfile) {
-+        strcat(FullCmd, "-z ");
-+        strcat(FullCmd, *SourceFileNamePtr);
-+    }
-+    if (!MightAskBeforeExecuting) {
-+        strcat(FullCmd, " -d ");
-+        /* The special hack for -d is HORRIBLE, but xterm screws up with the -d option in the middle of the command line! */
-+    }
-+    if (DoInBackground) strcat(FullCmd, " &");
-+    DefinitelyNotTty = 0;
-+    SetUpEnvironment();
-+    if (DoDebug) fprintf(stderr, "Executing %s\n", FullCmd);
-+    fflush(stdout); fflush(stderr);
-+#ifdef MSDOS
-+    system(FullCmd);
-+    exit(0);	/* system() returns random number under MS-DOS */
-+#else
-+    exit(system(FullCmd));
-+#endif
-+}
-+
-+/* Only one or the other set up builtins gets used,
-+  depending on whether or not we're in the middle of 
-+          a multipart/alternative body part */
-+struct MailcapEntry BuiltIns[] = {
-+    {"text/*", CATTEMPLATE, NULL, 0, 1, 0, "plain text", LPRTEMPLATE},
-+    {NULL, NULL, NULL, 0, 0, 0}};
-+
-+struct MailcapEntry BuiltInsAlternative[] = {
-+    {"text/plain", CATTEMPLATE, NULL, 0, 1, 0, "plain text", LPRTEMPLATE},
-+    {NULL, NULL, NULL, 0, 0, 0}};
-+
-+ProcessMailcapFiles(SquirrelFile) 
-+char *SquirrelFile;
-+{
-+    char *s, *pathcopy = NULL;
-+#ifdef MICROSOFT
-+    /* For the Microsoft compiler, we use the library function _searchenv
-+     * to find the mailcap file.  It will search all the directories
-+     * listed in the given environment variable (PATH in this case), then
-+     * construct a path to the file if it finds it.
-+     */
-+    /* BOGUS -- this only finds the FIRST mailcap file, we want ALL mailcap files */
-+    char path[128];
-+
-+    _searchenv("mailcap", "PATH", path);
-+    if (path[0])
-+        if (!ProcessMailcapFile(path, SquirrelFile)) return(0);
-+    return(-1);
-+#else /* MICROSOFT */
-+#ifdef BORLAND
-+    char *path = getenv("MAILCAPS");
-+    if (!path)
-+       path = STDPATH;
-+#else /* BORLAND */
-+#ifdef AMIGA
-+    char *path = STDPATH;
-+#else /* AMIGA */
-+    char *path = getenv("MAILCAPS");
-+    if (!path) {
-+        int uid = getuid();
-+        struct passwd *p;
-+        p = getpwuid(uid);
-+        if (p) path = malloc(5+strlen(p->pw_dir) + sizeof(STDPATH));
-+        if (!p || !path) ExitWithError(nomem);
-+        strcpy(path, p->pw_dir);
-+        strcat(path, STDPATH);
-+        pathcopy = path;
-+    } else 
-+#endif /* AMIGA */
-+#endif /* BORLAND */
-+    {
-+        pathcopy = malloc(1+strlen(path));
-+        if (!pathcopy) ExitWithError(nomem);
-+        strcpy(pathcopy, path);
-+        path = pathcopy;
-+    }
-+    while(path) {
-+        s = index(path, PATH_SEPARATOR);
-+        if (s) *s++ = 0;
-+        if (!ProcessMailcapFile(path, SquirrelFile)) return(0);
-+        path = s;
-+    }
-+    if (pathcopy) free(pathcopy);
-+    return(-1);
-+#endif /* MICROSOFT */
-+}
-+
-+TryBuiltIns(SquirrelFile) 
-+char *SquirrelFile;
-+{
-+    int i;
-+    /* Last resort -- for sites that didn't bother putting a "text" line in their mailcap files... */
-+    if (DoDebug) fprintf(stderr, "Looking for '%s' in built-in content-type handling settings.\n", ContentType);
-+    for (i=0; BuiltIns[i].contenttype; ++i) {
-+        if (!TryMailcapEntry(SquirrelFile ? BuiltInsAlternative[i] : BuiltIns[i], SquirrelFile))    return(0);
-+    }
-+    return(-1);
-+}
-+
-+ProcessMailcapFile(file, SquirrelFile)
-+char *file, *SquirrelFile;
-+{
-+    struct MailcapEntry mc;
-+    FILE *fp;
-+    int res;
-+
-+    res = IsDirectory(file);
-+    if (res) {
-+	if (res == 1) {
-+	    fprintf(stderr, "Mailcap path entry '%s' is a directory, should be a readable file.\n", file);
-+	} else if (DoDebug) {
-+	/* Quietly ignore non-existent mailcap files unless debugging */
-+	    fprintf(stderr, "Mailcap path entry '%s' does not exist.\n", file);
-+	}
-+	return(-1);
-+    }
-+    fp = fopen(file, "r");
-+    if (DoDebug) fprintf(stderr, "Looking for '%s' in mailcap file '%s'.\n", ContentType, file);
-+    while (fp && !feof(fp)) {
-+        mc.needtofree = 0;
-+	if (GetMailcapEntry(fp, &mc)) {
-+            if (!TryMailcapEntry(mc, SquirrelFile)) {
-+                fclose(fp);
-+                return(0);
-+            }
-+	}
-+    }
-+    if (fp) fclose(fp);
-+    return(-1);
-+}
-+
-+static char *ThingsToSkip[] = {
-+    "csh ",
-+    "sh ",
-+    "ksh ",
-+    NULL
-+};
-+
-+char *ShortCommand(progname)
-+char *progname;
-+{
-+    int i;
-+    char *s, *oldprogname;
-+    static char FullProgName[500];
-+
-+eatmore:
-+    while (*progname && (*progname == '(' || isspace((unsigned char) *progname))) {
-+        ++progname;
-+    }
-+    oldprogname = progname;
-+    for (i = 0; oldprogname == progname && ThingsToSkip[i]; ++i) {
-+        if (!strncmp(progname, ThingsToSkip[i], strlen(ThingsToSkip[i]))) {
-+            progname += strlen(ThingsToSkip[i]);
-+        }
-+    }
-+    if (*progname == '-') {
-+        ++progname;
-+        while (*progname && !isspace((unsigned char) *progname)) ++progname;
-+    }
-+    if (progname != oldprogname) goto eatmore;
-+    strcpy(FullProgName, progname);
-+    s = index(FullProgName, ' ');
-+    if (s) *s = 0;
-+    s = rindex(FullProgName, '/');
-+    if (s) {
-+	return(s+1);
-+    } else {
-+	return(FullProgName);
-+    }
-+}    
-+
-+TryMailcapEntry(mc, SquirrelFile)
-+struct MailcapEntry mc;
-+char *SquirrelFile;
-+{
-+    StripTrailingSpace(mc.contenttype);
-+    if (DoDebug) fprintf(stderr, "Trying mailcap entry for '%s'.\n", mc.contenttype);
-+    if (PrintingMode && !mc.printcommand) return(-1);
-+    if (CtypeMatch(ContentType, mc.contenttype) && PassesTest(&mc)) {
-+        if (SquirrelFile) {
-+            return(SaveSquirrelFile(SquirrelFile));
-+        } else {
-+            char TmpFileName[TMPFILE_NAME_SIZE];
-+            MkTmpFileName(TmpFileName);
-+            return(ExecuteMailcapEntry(mc, TmpFileName, ContentType));
-+        }
-+    }
-+    if (mc.needtofree) {
-+        free(mc.contenttype);
-+        free(mc.command);
-+    }
-+    return(-1);
-+}
-+
-+SaveSquirrelFile(SquirrelFile)
-+char *SquirrelFile;
-+{
-+    int j;
-+    FILE *outfp;
-+
-+    if (DoDebug) printf("saving to file %s\n", SquirrelFile);
-+
-+    outfp = fopen(SquirrelFile, WRITE_BINARY);
-+    if (!outfp) {
-+        fprintf(stderr, "Cannot open %s to squirrel away a portion of a multipart/alternative\n", SquirrelFile);
-+        return(-1);
-+    }
-+    fprintf(outfp, "Content-type: %s", ContentType);
-+    for (j=0; j<CParamsUsed; ++j) {
-+        fprintf(outfp, " ; ");
-+        fprintf(outfp, CParams[j]);
-+        fprintf(outfp, " = ");
-+        fprintf(outfp, CParamValues[j]);
-+    }
-+    fprintf(outfp, "\n\n"); 
-+    TranslateInputToOutput(InputFP, outfp, EncodingCode, ContentType);
-+    if (fclose(outfp)) {
-+        ExitWithError("fclose failed");
-+    }
-+    return(0);
-+}
-+
-+ExecuteMailcapEntry(mc, TmpFileName, ThisContentType)
-+char *TmpFileName, *ThisContentType;
-+struct MailcapEntry mc;
-+{
-+    int resultcode=0, DidExecute, UsedTmpFileName;
-+    struct part *PartsWritten=NULL;
-+    char *s, *cmd;
-+
-+    cmd = malloc(CMDSIZE);
-+    if (!cmd) ExitWithError(nomem);
-+    if (PrintingMode && !mc.printcommand) return(-1);
-+    BuildCommand(cmd, PrintingMode ? mc.printcommand : mc.command, TmpFileName, &UsedTmpFileName, &PartsWritten);
-+    if (DoDebug) fprintf(stderr, "Match!  Built command %s.\n", cmd);
-+    if (mc.copiousoutput && MaybePageOutput) {
-+        strcat(cmd, " | ");
-+        s = getenv("METAMAIL_PAGER");
-+        if (s && strncmp(s, "metamail", 8)) {
-+            /* If METAMAIL_PAGER is set to "metamail" we override it */
-+            strcat(cmd, s);
-+#ifndef AMIGA
-+            if (!strncmp(s, "less", 4) && strncmp(s+5, "-r", 2)) {
-+                fprintf(stderr, "Warning:  'less' without '-r' behaves badly for some mail types,\n\tnotably richtext.\n");
-+            }
-+#endif
-+        } else {
-+            strcat(cmd, "more");
-+        }
-+    }
-+    if (!DefinitelyNotTty) {
-+        SaveTtyState();
-+    }
-+    if (!NeedToAskBeforeExecuting(ThisContentType)
-+         || OKToRun(ThisContentType, cmd, mc.label)) {
-+        char *FullCmd;
-+        int ReallyNotTty;
-+#ifndef NO_RLIMITS
-+        /* Limit size of core dumps */
-+        struct rlimit rlp;
-+
-+        rlp.rlim_cur = 0;
-+        rlp.rlim_max = 0;
-+        setrlimit(RLIMIT_CORE, &rlp); 
-+#endif
-+        FullCmd = malloc(CMDSIZE);
-+        if (!FullCmd) ExitWithError(nomem);
-+        ReallyNotTty = DefinitelyNotTty;
-+        if (mc.needsterminal
-+             && DefinitelyNotTty) {
-+            int j;
-+            sprintf(cmd, " %s -P -b -c '%s", METAMAIL, ThisContentType);
-+            for (j=0; j<CParamsUsed; ++j) {
-+                strcat(cmd, " ; ");
-+                strcatquoting(cmd, CParams[j]);
-+                strcat(cmd, " = ");
-+                strcatquoting(cmd, CParamValues[j]);
-+            }
-+            strcat(cmd, "' ");
-+            strcat(cmd, TmpFileName);
-+            CreateNewWindowPrefix(FullCmd);
-+            strcat(FullCmd, cmd);
-+            DefinitelyNotTty = 0; /* For recursive call */
-+        } else {
-+            strcpy(FullCmd, cmd);
-+        }
-+        DidExecute = 0;
-+        if (UsedTmpFileName || PartsWritten) {
-+            int isempty;
-+            if (PartsWritten) {
-+                isempty = 0;
-+            } else {
-+                isempty = WriteTmpFile(TmpFileName, ThisContentType);
-+            }
-+            if (!isempty || strncmp(ThisContentType, "text", 4)) {
-+                if (DoInBackground && !PartsWritten && !mc.needsterminal) {
-+#ifdef AMIGA
-+                    char TmpCmd[80], TmpScriptName[40];
-+                    sprintf(TmpCmd, "run execRmScript %s",
-+                            MkRmScript(FullCmd, TmpFileName, TmpScriptName));
-+#else
-+                    char TmpCmd[CMDSIZE];
-+                    sprintf(TmpCmd, "(%s; rm %s) &", FullCmd, TmpFileName);
-+#endif
-+                    DefinitelyNotTty = 1; /* in background */
-+                    SetUpEnvironment();
-+                    resultcode = ExecuteCommand(TmpCmd, 1);
-+                    ++DidExecute;
-+                } else {
-+                    SetUpEnvironment();
-+                    resultcode = ExecuteCommand(FullCmd, 1);
-+                    unlink(TmpFileName);
-+                    ++DidExecute;
-+                }
-+            } else { /* empty text part, hack to not say "more" */
-+                unlink(TmpFileName);
-+            }
-+        } else {
-+            FILE *tmpfp;
-+            SetUpEnvironment();
-+            (void) ExecuteCommand(FullCmd, 0);
-+            tmpfp = popen(FullCmd, WRITE_BINARY);
-+            TranslateInputToOutput(InputFP, tmpfp, EncodingCode, ThisContentType);
-+            resultcode = tmpfp ? pclose(tmpfp) : -1;
-+            ++DidExecute;
-+        }
-+        DefinitelyNotTty = ReallyNotTty;
-+        if (!DefinitelyNotTty && DidExecute) {
-+            RestoreTtyState();
-+            if (mc.copiousoutput && MaybePageOutput && BoundaryCt > 0) PauseForUser();
-+        }
-+        if (!resultcode) {
-+            free(FullCmd);
-+        } else {
-+            fprintf(stderr, "Command failed: %s\n", FullCmd);
-+            if (MaybePageOutput && BoundaryCt > 0) PauseForUser();
-+            ++ProcessingErrors;
-+        }
-+    } else {
-+        /* user does not want to execute command */
-+        if (!DefinitelyNotTty) {
-+            RestoreTtyState();
-+        }
-+        if (DoDebug) fprintf(stderr, "Not executing command.\n");
-+        if (!PartsWritten) ConsumeRestOfPart(NULL);
-+    }
-+    if (PartsWritten) {
-+        struct part *tp;
-+        char HeadFile[MAX_FILE_NAME_SIZE];
-+
-+        while (PartsWritten) {
-+            tp=PartsWritten->next;
-+            free(PartsWritten->ctype);
-+            strcpy(HeadFile, PartsWritten->fname);
-+            strcat(HeadFile, "H");
-+            unlink(HeadFile);
-+            unlink(PartsWritten->fname);
-+            free(PartsWritten->fname);
-+            free(PartsWritten);
-+            PartsWritten=tp;
-+        }
-+    }
-+    if (!DefinitelyNotTty) {
-+        RestoreTtyState();
-+    }
-+    free(cmd);
-+    return(0);
-+}
-+
-+PassesTest(mc)
-+struct MailcapEntry *mc;
-+{
-+    int result;
-+    char *cmd, TmpFileName[TMPFILE_NAME_SIZE];
-+
-+    if (!mc->testcommand) return(1);
-+    MkTmpFileName(TmpFileName);
-+    cmd = malloc(CMDSIZE);
-+    if (!cmd) ExitWithError(nomem);
-+    BuildCommand(cmd, mc->testcommand, TmpFileName, NULL, NULL);
-+    if (DoDebug) printf("Executing test command: %s\n", cmd);
-+    result = system(cmd);
-+#ifdef MSDOS
-+    result = 0;	    /* system doesn't return a valid exit code on MS-DOS */
-+                    /* note that this makes the test feature useless... */
-+#endif
-+    free(cmd);
-+    return(!result);
-+}
-+
-+char *
-+GetCommand(s, t)
-+char *s, **t;
-+{
-+    char *s2;
-+    int quoted = 0;
-+    s2 = malloc(strlen(s)*2+1); /* absolute max, if all % signs */
-+    if (!s2) ExitWithError(nomem);
-+    *t = s2;
-+    while (s && *s) {
-+	if (quoted) {
-+            if (*s == '%') *s2++ = '%'; /* Quote through next level, ugh! */
-+
-+            *s2++ = *s++;
-+	    quoted = 0;
-+	} else {
-+	    if (*s == ';') {
-+                *s2 = 0;
-+		return(++s);
-+	    }
-+	    if (*s == '\\') {
-+		quoted = 1;
-+		++s;
-+	    } else {
-+		*s2++ = *s++;
-+	    }
-+	}
-+    }
-+    *s2 = 0;
-+    return(NULL);
-+}	
-+
-+GetMailcapEntry(fp, mc)
-+FILE *fp;
-+struct MailcapEntry *mc;
-+{
-+    int rawentryalloc = 2000, len;
-+    char *rawentry, *s, *t, *LineBuf;
-+
-+    LineBuf = malloc(LINE_BUF_SIZE);
-+    if (!LineBuf) ExitWithError(nomem);
-+    rawentry = malloc(1 + rawentryalloc);
-+    if (!rawentry) ExitWithError(nomem);
-+    *rawentry = 0;
-+    while (fgets(LineBuf, LINE_BUF_SIZE, fp)) {
-+	if (LineBuf[0] == '#') continue;
-+        len = strlen(LineBuf);
-+        if (len == 0) continue;
-+        if (LineBuf[len-1] == '\n') LineBuf[--len] = 0;
-+	if ((len + strlen(rawentry)) > rawentryalloc) {
-+	    rawentryalloc += 2000;
-+	    rawentry = realloc(rawentry, rawentryalloc+1);
-+	    if (!rawentry) ExitWithError(nomem);
-+	}
-+	if (LineBuf[len-1] == '\\') {
-+            LineBuf[len-1] = 0;
-+	    strcat(rawentry, LineBuf);
-+	} else {
-+	    strcat(rawentry, LineBuf);
-+	    break;
-+	}
-+    }
-+    free(LineBuf);
-+    for (s=rawentry; *s && isspace((unsigned char) *s); ++s) ;
-+    if (!*s) {
-+	/* totally blank entry -- quietly ignore */
-+	free(rawentry);
-+	return(0);
-+    }
-+    s = index(rawentry, ';');
-+    if (!s) {
-+	fprintf(stderr, "metamail: Ignoring invalid mailcap entry: %s\n", rawentry);
-+	free(rawentry);
-+	return(0);
-+    }
-+    *s++ = 0;
-+    mc->needsterminal = 0;
-+    mc->copiousoutput = 0;
-+    mc->needtofree = 1;
-+    mc->testcommand = NULL;
-+    mc->label = NULL;
-+    mc->printcommand = NULL;
-+    mc->contenttype = malloc(1+strlen(rawentry));
-+    if (!mc->contenttype) ExitWithError(nomem);
-+    strcpy(mc->contenttype, rawentry);
-+    t = GetCommand(s, &mc->command);
-+    if (!t) {
-+        free(rawentry);
-+        return(1);
-+    }
-+    while (s && *s && isspace((unsigned char) *s)) ++s;
-+    s = t;
-+    while (s) {
-+	char *arg, *eq;
-+
-+        t = GetCommand(s, &arg);
-+/*        if (t) *t++ = 0; */
-+        eq = index(arg, '=');
-+        if (eq) *eq++ = 0;
-+	if (*arg) {
-+	    arg = Cleanse(arg);
-+	    if (!strcmp(arg, "needsterminal")) {
-+		mc->needsterminal = 1;
-+	    } else if (!strcmp(arg, "copiousoutput")) {
-+		mc->copiousoutput = 1;
-+	    } else if (eq && !strcmp(arg, "test")) {
-+		mc->testcommand = eq;
-+	    } else if (eq && !strcmp(arg, "description")) {
-+		mc->label = eq;
-+	    } else if (eq && !strcmp(arg, "label")) { 
-+		mc->label = eq; /* bogus old name for description */
-+	    } else if (eq && !strcmp(arg, "print")) {
-+		mc->printcommand = eq;
-+	    } else if (eq && !strcmp(arg, "textualnewlines")) {
-+		ExceptionalNewline(mc->contenttype, atoi(eq));
-+	    } else if (strcmp(arg, "notes")) { /* IGNORE notes field */
-+		if (*arg && DoDebug) fprintf(stderr, "metamail: Ignoring mailcap flag: %s\n", arg);
-+	    }
-+	}
-+	s = t;
-+    }
-+    free(rawentry);
-+    return(1);
-+}
-+
-+ExitWithError(txt)
-+char *txt;
-+{
-+    if (txt) fprintf(stderr, "metamail: %s\n", txt);
-+    exit(-1);
-+}
-+
-+char *
-+FreshHeaderCopy(s)
-+char *s;
-+{
-+    char *t, *newcopy;
-+    int len;
-+
-+    while (s && *s && isspace((unsigned char) *s) && *s != '\n') ++s;
-+    t = index(s, '\n');
-+    while (t && (*(t+1) == ' ' || *(t+1) == '\t')) {
-+        t = index(t+1, '\n');
-+    }
-+    len = t ? (t-s+1) : (strlen(s)+1);
-+    newcopy = malloc(len+3);/* two extra bytes for a bizarre bug caused by the fact that FindParam calls FreshHeaderCopy and sometimes tacks on "--". */
-+    if (!newcopy) ExitWithError(nomem);
-+    strncpy(newcopy, s, len);
-+    newcopy[len] = 0;
-+    return(newcopy);
-+}
-+
-+Read822Prefix(PrintHeads, nestingdepth)
-+int PrintHeads, nestingdepth;
-+{
-+    int SawNewline = 1, bytes = 0, alloced = 1000, HasEncodedChars=0;
-+    int c, oldbytes;
-+    char *s, *t, *tmp;
-+
-+    if (!PrintSomeHeaders) PrintHeads = 0;
-+    mailheaders = malloc(alloced+1);
-+    if (!mailheaders) ExitWithError(nomem);
-+    strcpy(mailheaders, "MM_HEADERS=\n");
-+    bytes = 12;
-+yankagain:
-+    t = mailheaders + bytes;
-+    oldbytes = bytes-1; /* a hack for YankMode */
-+    while ((c = getc(InputFP)) != EOF) {
-+        if (++bytes >= alloced) {
-+            alloced += 1000;
-+            mailheaders = realloc(mailheaders, alloced);
-+            if (!mailheaders) ExitWithError(nomem);
-+            t = mailheaders + bytes - 1;
-+        }
-+        if (c == '\n') {
-+            if (SawNewline) break;
-+            SawNewline = 1;
-+        } else SawNewline = 0;
-+        *t++ = c;
-+    }
-+    *t = 0;
-+    --bytes;
-+    if (c == EOF) {
-+	if (nestingdepth) {
-+	    fprintf(stderr, "metamail: Incomplete multipart message -- unexpected EOF\n");
-+/*            exit(ProcessingErrors); */
-+        } else {
-+            if (YankMode) {
-+/*                ExitWithError("Could not extract a MIME message from the  body\n"); */
-+		fprintf(stderr, "metamail: Could not extract a MIME message from the body\n");
-+            } else {
-+		fprintf(stderr, "metamail: Could not find end of mail headers.\n");
-+/*                ExitWithError("Could not find end of mail headers"); */
-+            }
-+	}
-+	BoundaryCt=0;
-+	return -1;
-+    }
-+    for (s=mailheaders+oldbytes; *s; ++s) {
-+        if (*s == '\n' && (*(s+1) != ' ') && (*(s+1) != '\t')) {
-+	    if (!ContentType && !lc2strncmp(s, "\ncontent-type:", 14)) {
-+		char *dum;
-+                ContentType = FreshHeaderCopy(s+14);
-+		/* Eliminate white space embedded in content-type */
-+		while (1) {
-+		    dum = index(ContentType, '/');
-+		    if (!dum) break;
-+		    if (isspace(*(dum-1))) {
-+			for (--dum; *dum; ++dum) {
-+			    *dum = *(dum+1);
-+			}
-+		    } else if (isspace(*++dum)) {
-+			for ( ; *dum; ++dum) {
-+			    *dum = *(dum+1);
-+			}
-+		    } else {
-+			break;
-+		    }
-+		}
-+                StripTrailingSpace(ContentType);
-+                ParseContentParameters(ContentType);
-+                if (PrintHeads) maybephead(s+1);
-+            } else if (!ContentEncoding && !lc2strncmp(s, "\ncontent-transfer-encoding:", 27)) {
-+                ContentEncoding = FreshHeaderCopy(s+27);
-+                if (PrintHeads) maybephead(s+1);
-+            } else if (!lc2strncmp(s, "\nsubject:", 9)) {
-+                if (PrintHeads) maybephead(s+1);
-+                MailSubject = FreshHeaderCopy(s+9);
-+            } else if (!lc2strncmp(s, "\nfrom:", 6)) {
-+                if (PrintHeads) maybephead(s+1);
-+                MailFrom = FreshHeaderCopy(s+6);
-+            } else if (!lc2strncmp(s, "\ncontent-description:", 4)) {
-+                if(PrintHeads) maybephead(s+1);
-+                MailSubject = FreshHeaderCopy(s+21);
-+            } else {
-+                /* Print any with encoded variables */
-+                char *dum = s;
-+                while (dum) {
-+                    dum = index(dum, '?');
-+                    if (dum && *++dum == '=') break;
-+                }
-+                if (dum) {
-+                    char *nl = s+1;
-+                    while (nl) {
-+                        nl = index(nl, '\n');
-+                        if (nl && !isspace((unsigned char) *++nl)) break;
-+                    }
-+                    if (nl && nl > dum) ++HasEncodedChars;
-+                }
-+                if (HasEncodedChars) {
-+                    phead(s+1);
-+                } else if (PrintHeads) {
-+                    maybephead(s+1);
-+                }
-+            }
-+        }
-+    }
-+    /* Ugly, but effective */
-+    if (YankMode && !ContentType) {
-+        goto yankagain;
-+    }
-+    if (PrintHeads) printf("\n");
-+    if (!ContentType) {
-+        ContentType = "text/plain";
-+        CParamsUsed=0;
-+    }
-+    for (tmp=ContentType; *tmp; ++tmp) {
-+        if (isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
-+    }
-+    return 0;
-+}
-+
-+PrepareMessage() {
-+    int c;
-+
-+    EncodingCode = ENCODING_NONE;
-+    if (ContentEncoding) {
-+        /* strip leading white space */
-+        while (*ContentEncoding && isspace((unsigned char) *ContentEncoding)) ++ContentEncoding;
-+        StripTrailingSpace(ContentEncoding);
-+        if (!lc2strcmp(ContentEncoding, "base64")) {
-+            EncodingCode = ENCODING_BASE64;
-+        } else if (!lc2strcmp(ContentEncoding, "quoted-printable")) {
-+            EncodingCode = ENCODING_QUOTEDPRINTABLE;
-+        } else if (!lc2strncmp (ContentEncoding, "x-uue", 5)) {
-+            fprintf (stderr, "WARNING:  Using nonstandard %s encoding, trying uuencode algorithm.\n", ContentEncoding);
-+ 	    EncodingCode = ENCODING_UUENCODE;
-+        } else {
-+            if (lc2strcmp(ContentEncoding, "none")
-+                 && !lc2strcmp(ContentEncoding, "8bit")
-+                 && !lc2strcmp(ContentEncoding, "7bit")) {
-+                fprintf(stderr, "Ignoring unrecognized Content-Transfer-Encoding value: %s\n", ContentEncoding);
-+            }
-+        }
-+    }
-+    if (EatLeadingNewlines) {
-+        while ((c = getc(InputFP)) != EOF) {
-+            if (c != '\n') {
-+                ungetc(c, InputFP);
-+                break;
-+            }
-+        }
-+    }
-+    SetUpEnvironment();  
-+}
-+
-+SetUpEnvironment() { 
-+    int i, j, environsize;
-+    char **newenviron, *mailervar, *summaryvar, *ctypevar, *s;
-+    static char ttyenv[15], debugenv[15], *noaskenv, pagerenv[15], *quietenv, rootenv[25];
-+
-+#if !defined(AMIGA) && !defined(MSDOS)
-+    /* Hack to make the code look similar for unix & dos */
-+#define putenv(var)        newenviron[i++] = var;
-+    for (environsize=0; environ[environsize]; ++environsize) {
-+	;
-+    }
-+    newenviron = (char **) malloc(sizeof(char *) * (17+environsize));
-+    if (!newenviron) ExitWithError(nomem);
-+#endif
-+    mailervar = malloc(13+strlen(MailerName));
-+    if (!mailervar) ExitWithError(nomem);
-+    sprintf(mailervar, "MM_MAILER=%s", MailerName);
-+    summaryvar = malloc(26 + strlen(MailFrom) + strlen(MailSubject));
-+    if (!summaryvar) ExitWithError(nomem);
-+    sprintf(summaryvar, "MM_SUMMARY=%s (from %s)", MailSubject, MailFrom);
-+    MailSummary = summaryvar+11;
-+    EliminateNastyChars(MailSummary);
-+    i = 0;
-+    if (ContentType) {
-+        int ctypelen = 22+strlen(ContentType);
-+        for (j=0; j<CParamsUsed; ++j) {
-+            ctypelen += 6 + strlen(CParams[j]) + strlen(CParamValues[j]);
-+        }
-+        ctypevar = malloc(ctypelen);
-+        if (!ctypevar) ExitWithError(nomem);
-+        for (s=ContentType; *s; ++s) {
-+            if (isupper((unsigned char) *s)) *s = tolower((unsigned char) *s);
-+        }
-+        while (isspace((unsigned char) *--s)) *s = 0;
-+        sprintf(ctypevar, "MM_CONTENTTYPE=%s", ContentType);
-+        for (j=0; j<CParamsUsed; ++j) {
-+            strcat(ctypevar, " ; ");
-+            strcat(ctypevar, CParams[j]);
-+            strcat(ctypevar, " = ");
-+            strcat(ctypevar, CParamValues[j]);
-+        }
-+        putenv(ctypevar);
-+    }
-+    putenv(mailheaders ? mailheaders : "MM_HEADERS=unknown");
-+    putenv(mailervar);
-+    putenv(summaryvar);
-+    sprintf(ttyenv, "MM_NOTTTY=%d", DefinitelyNotTty);
-+    putenv(ttyenv);
-+    sprintf(debugenv, "MM_DEBUG=%d", DoDebug);
-+    putenv(debugenv);
-+    s = getenv("MM_QUIET");
-+    if (!s) s = QuietDefault;
-+    quietenv = malloc(15 + strlen(s));
-+    if (!quietenv) ExitWithError(nomem);
-+    if (Quiet) {
-+        strcpy(quietenv, "MM_QUIET=1");
-+    } else {
-+        sprintf(quietenv, "MM_QUIET=%s", s);
-+    }
-+    putenv(quietenv);
-+    s = getenv("MM_NOASK");
-+    if (!s) s = NoAskDefault;
-+    noaskenv = malloc(15 + strlen(s));
-+    if (!noaskenv) ExitWithError(nomem);
-+    if (MightAskBeforeExecuting) {
-+        sprintf(noaskenv, "MM_NOASK=%s", s);
-+    } else {
-+        strcpy(noaskenv, "MM_NOASK=1");
-+    }
-+    putenv(noaskenv);
-+    s = getenv("MM_RUNASROOT");
-+    if (!s) s = "0";
-+    sprintf(rootenv, "MM_RUNASROOT=%s", s);
-+    putenv(rootenv);
-+    sprintf(pagerenv, "MM_USEPAGER=%d", MaybePageOutput);
-+    putenv(pagerenv);
-+#if !defined(AMIGA) && !defined(MSDOS)
-+    for (j=0; j<environsize; ++j) {
-+        if (strncmp(environ[j], "MM_", 3) || !strncmp(environ[j], "MM_CHARSET", 10)) {
-+            putenv(environ[j]);
-+        }
-+    }
-+    newenviron[i] = NULL;
-+    environ = newenviron;
-+    if (DoDebug) {
-+        printf("Here is the environment:\n\n");
-+        system("printenv");
-+    }
-+#endif
-+}
-+
-+
-+#ifdef AMIGA
-+int
-+putenv(def)
-+char *def;
-+{
-+    char *cp;
-+    char nameBuf[100];
-+    FILE *envFile;
-+
-+    if ((cp = index(def, '=')) == NULL || def == cp) {
-+        return(1);
-+    }
-+
-+    strcpy(nameBuf, "ENV:");
-+    strncat(nameBuf, def, cp - def);
-+    nameBuf[(cp - def) + 4] = 0;
-+    cp++;               /* Now points to value part of environment string. */
-+
-+    if ((envFile = fopen(nameBuf, "w")) == NULL) {
-+        return(2);
-+    }
-+
-+    fputs(cp, envFile);
-+    fclose(envFile);
-+
-+    return(0);
-+}
-+#endif
-+
-+OKToRun(ctype, progname, label)
-+char *ctype, *progname, *label;
-+{
-+    char AnsBuf[100], *s;
-+
-+    if (DoInBackground) return(1);
-+    if (DefinitelyNotTty || MustNotBeTty) return(1);
-+    while (1) {
-+        printf("\n");
-+        if (label) {
-+            printf("This message contains %s.\nDo you want to view it using the '%s' command (y/n) [y] ? ", label, ShortCommand(progname));
-+        } else {
-+            printf("This message contains '%s'-format data.\nDo you want to view it using the '%s' command (y/n) [y] ? ", ctype, ShortCommand(progname));
-+        }
-+        s = fgets(AnsBuf, sizeof(AnsBuf), stdin);
-+        if (!s) return(0); /* EOF */
-+	while (s && *s && isspace((unsigned char) *s)) ++s;
-+	if (*s == 'y' || *s == 'Y' || !*s || *s == '\n') return(1);
-+	if (*s == 'n' || *s == 'N' || *s == 'q' || *s == 'Q') {
-+	    return(0);
-+	}
-+	printf("Please answer yes or no.\n");
-+    }
-+}
-+
-+EliminateNastyChars(s)
-+char *s;
-+{
-+    if (s) for( ; *s ;++s) {
-+        if (isalnum((unsigned char) *s)) continue;
-+	if (index(" ,.;:/?\\|[]{}()*&^%#@-_=+~<>\"", *s)) continue;
-+	if (*s == '\'' || *s == '`') {
-+	    *s = '"';
-+	} else {
-+	    *s = ' ';
-+	}
-+    }
-+}
-+
-+StripTrailingSpace(s)
-+char *s;
-+{
-+    char *t = s+strlen(s) -1;
-+    while (isspace((unsigned char) *t) && (t >= s)) *t-- = 0;
-+}
-+
-+static char *KeyHeads=NULL;
-+static char **KeyHeadList;
-+static int KeyKeep = 0;
-+
-+void setKeyHeads()
-+{
-+    char *s;
-+    int numkeys = 0;
-+
-+    if ((KeyHeads = getenv("KEYHEADS")) != 0) {
-+        for (s=KeyHeads;*s;++s) if (isupper((unsigned char) *s)) *s=tolower((unsigned char) *s);
-+    } else if ((KeyHeads = getenv("KEYIGNHEADS")) != 0) {
-+	for (s=KeyHeads;*s;++s) if (isupper((unsigned char) *s)) *s=tolower((unsigned char) *s);
-+	KeyKeep = 1;
-+    } else {
-+	static char khtmp[] = "to:cc:subject:from:content-description:date";
-+	KeyHeads = khtmp;
-+    }
-+    for (s=KeyHeads; *s; ++s) if (*s == ':') ++numkeys;
-+    numkeys += 2;
-+    KeyHeadList = (char **) malloc((numkeys) * sizeof(char *));
-+    if (!KeyHeadList) ExitWithError(nomem);
-+    numkeys = 0;
-+    KeyHeadList[0] = KeyHeads;
-+    for(s=KeyHeads; *s; ++s) {
-+	if (*s == ':') {
-+	    *s = '\0';
-+	    KeyHeadList[++numkeys] = s+1;
-+	}
-+    }
-+    KeyHeadList[++numkeys] = NULL;
-+}
-+
-+/* find the first colon in a header line which appears before any spaces or control characters */
-+char *
-+findcolon(hdr)
-+char *hdr;
-+{
-+    while (*hdr && !isspace(*hdr) && !iscntrl(*hdr))
-+	if (*hdr == ':') return hdr;
-+	else hdr++;
-+    return 0;
-+}
-+
-+/* check the header given to see if it matches any in the KeyHeadList */
-+maybephead(hdr)
-+char *hdr;
-+{
-+    char *s;
-+    int numkeys=0;
-+
-+    if (!KeyHeads) setKeyHeads();
-+
-+    s = findcolon(hdr);
-+    if (s) {
-+	int len = s - hdr;
-+        for (numkeys=0; KeyHeadList[numkeys]; ++numkeys) {
-+            if (!strcmp(KeyHeadList[numkeys], "*")
-+                 || !lc2strncmp(hdr, KeyHeadList[numkeys], len)) {
-+		if (!KeyKeep) phead(hdr);
-+		return;
-+            }
-+        }
-+	if (KeyKeep) phead(hdr);
-+	return;
-+    }
-+    if (!strncmp(hdr, "From ", 5) || !strncmp(hdr, ">From ", 6)) {
-+	for (numkeys = 0; KeyHeadList[numkeys]; ++numkeys) {
-+	    if (!strcmp(KeyHeadList[numkeys], "*")
-+		 || !lc2strncmp(">from", KeyHeadList[numkeys], 5)) {
-+		if (!KeyKeep) phead(hdr);
-+		return;
-+	    }
-+	}
-+	if (KeyKeep) phead(hdr);
-+    }
-+}
-+
-+/* This next routine prints out a mail header, and needs to deal with the new extended charset headers. */
-+phead(s)
-+char *s;
-+{
-+    char *t = s;
-+
-+    while (1) {
-+	t = index(t, '\n');
-+	if (!t) break;
-+        if (!isspace((unsigned char) *(t+1))) {
-+            *t = 0;
-+	    break;
-+	} else ++t;
-+    }
-+    PrintHeader(s, 1);
-+    printf("\n");
-+    if (t) *t = '\n';
-+}
-+
-+static char PrevCharset[100] = "us-ascii";
-+
-+/* This is the part that actually handles the charset issues */
-+void PrintHeader(s, ShowLeadingWhitespace)
-+char *s;
-+int ShowLeadingWhitespace;
-+{
-+    char *charset, *encoding, *txt, *txtend, TmpFile[TMPFILE_NAME_SIZE];
-+    int ecode = ENCODING_NONE, CorrectedCharset = 0;
-+    FILE *fp;
-+
-+    while (*s && (*s != '=')) {
-+        if (isspace((unsigned char) *s)) {
-+            if (ShowLeadingWhitespace) {
-+                putchar(' ');
-+            }
-+        } else {
-+            putchar(*s);
-+            if (!CorrectedCharset) {
-+                CorrectedCharset = 1;
-+                strcpy(PrevCharset, "us-ascii");
-+            }
-+        }
-+        if (!ShowLeadingWhitespace) {
-+            /* Only at most one leading space is ignored */
-+            ShowLeadingWhitespace = 1;
-+        }
-+        ++s;
-+    }
-+    if (!*s) return;
-+    if (*(s+1) != '?') {
-+        putchar('=');
-+        PrintHeader(++s, 1);
-+        return;
-+    }
-+    charset = s+2;
-+    encoding = index(charset, '?');
-+    if (!encoding) {
-+        putchar('=');
-+        PrintHeader(++s,1);
-+        return;
-+    }
-+    txt = index(encoding+1, '?');
-+    if (!txt) {
-+        putchar('=');
-+        PrintHeader(++s, 1);
-+        return;
-+    }
-+    txtend = txt;
-+    do {
-+        txtend = index(txtend+1, '?');
-+    } while(txtend && (*(txtend+1) != '='));
-+    if (!txtend) {
-+        putchar('=');
-+        PrintHeader(++s, 1);
-+    }
-+    /* Proper parse! Ready to dissect... */
-+    *encoding = 0;
-+    *txt = 0;
-+    *txtend = 0;
-+    if ((*(encoding+1) == 'q') || (*(encoding+1) == 'Q')) {
-+        ecode = ENCODING_QUOTEDPRINTABLE;
-+    } else if ((*(encoding+1) == 'b') || (*(encoding+1) == 'B')) {
-+        ecode = ENCODING_BASE64;
-+    } else {
-+        fprintf(stderr, "Bad encoding value in non-ASCII header string: %s\n", encoding+1);
-+    }
-+    if (lc2strcmp(charset, PrevCharset)) {
-+        char *s2, *charsetinuse;
-+
-+        strcpy(PrevCharset, charset);
-+        for (s2=PrevCharset; *s2; ++s2) {
-+            if (isupper((unsigned char) *s2)) *s2 = tolower((unsigned char) *s2);
-+        }
-+        charsetinuse = getenv("MM_CHARSET");
-+        if (!charsetinuse || lc2strcmp(charsetinuse, PrevCharset)) {
-+            printf("[** %s charset **] ", charset);
-+        }
-+    }
-+    if (ecode == ENCODING_NONE) {
-+        printf(txt+1);
-+    } else {
-+        /* What follows is REALLY bogus, but all my encoding stuff is pipe-oriented right now... */
-+        MkTmpFileName(TmpFile);
-+        fp = fopen(TmpFile, WRITE_BINARY);
-+        if (!fp) {
-+            fprintf(stderr, "Could not open temporary file\n");
-+        } else {
-+            char *t;
-+            for (t=txt+1; *t; ++t) {
-+                if (*t == '_') {
-+                    putc(' ', fp);
-+                } else if (*t == '\n') {
-+                    putc(' ', fp);
-+                } else {
-+                    putc(*t, fp);
-+                }
-+            }
-+            fclose(fp);
-+            fp = fopen(TmpFile, "r");
-+            if (!fp) {
-+                fprintf(stderr, "Could not open temporary file\n");
-+            } else {
-+                TranslateInputToOutput(fp, stdout, ecode, "text");
-+                fclose(fp);
-+            }
-+            unlink(TmpFile);
-+        }
-+    }
-+    *encoding = '?';
-+    *txt = '?';
-+    *txtend = '?';
-+    PrintHeader(txtend + 2, 0);
-+}
-+
-+BuildCommand(Buf, controlstring, TmpFileName, UsedTmpFileName, PartsWritten)
-+char *Buf, *controlstring, *TmpFileName;
-+int *UsedTmpFileName;
-+struct part **PartsWritten;
-+{
-+    char *from, *to, *s, *p, *tmp;
-+    int prefixed = 0, UsedBigFile=0, UsedLittleFiles=0, numparts=0;
-+    struct part *firstpart=NULL, *thispart=NULL, *tmppart=NULL;
-+
-+    if (UsedTmpFileName) *UsedTmpFileName = 0;
-+    if (PartsWritten) *PartsWritten = NULL;
-+    for (from=controlstring, to=Buf; *from; ++from) {
-+        if (prefixed) {
-+            prefixed = 0;
-+            switch(*from) {
-+                case '%':
-+                    *to++ = '%';
-+                    break;
-+                case 'n':
-+                case 'F':
-+		    if (!PartsWritten) {
-+			fprintf(stderr, "metamail: Bad mailcap \"test\" clause: %s\n", controlstring);
-+			ExitWithError("%%n and %%F may not be used in \"test\" clauses.  Execution terminated.");
-+		    }
-+                    if (UsedBigFile) {
-+                        fprintf(stderr, "metamail: Bad mailcap entry: %s\n", controlstring);
-+                        ExitWithError("%%n and %%F are incompatible with %%s.  Execution terminated.");
-+                    }
-+                    if (!UsedLittleFiles) {
-+                        /* Set up parts */
-+                        char *LineBuf, *boundary, TmpFileNameBuf[TMPFILE_NAME_SIZE];
-+                        char *oldct, *oldce, *newct;
-+                        int currct, boundarylen, newctlen, j;
-+                        int oldcparmsused, oldcparamsalloced;
-+                        char **oldcparams, **oldcparamvalues;
-+                        FILE *headfp;
-+
-+                        LineBuf = malloc(LINE_BUF_SIZE);
-+                        if (!LineBuf) ExitWithError(nomem);
-+                        boundary = FindParam("boundary");
-+			if (!boundary) {
-+			    fprintf(stderr, "Bad message format: This multipart message has no boundary parameter,\n");
-+			    fprintf(stderr, "but the mailcap entry for %s uses %%F or %%n.\n\n", ContentType);
-+			    ExitWithError("A change to the mailcap file might make this message viewable.");
-+                        }
-+                        if (boundary[0] == '"') {
-+                            boundary=UnquoteString(boundary);
-+                        }
-+                        sprintf(LineBuf, "--%s", boundary);
-+                        strcpy(boundary, LineBuf);
-+                        boundarylen = strlen(boundary);
-+                        if (BoundaryCt >= BoundaryAlloc) {
-+                            BoundaryAlloc += 5;
-+                            if (Boundaries) {
-+                                Boundaries = (char **) realloc(Boundaries, BoundaryAlloc*sizeof(char *));
-+                            } else {
-+                                Boundaries = (char **) malloc(BoundaryAlloc*sizeof(char *));
-+                            }
-+                            if (!Boundaries) ExitWithError(nomem);
-+                        }
-+                        Boundaries[BoundaryCt++] = boundary;
-+                        while (fgets(LineBuf, LINE_BUF_SIZE, InputFP)) { /* find start */
-+                            if (!strncmp(LineBuf, boundary, boundarylen)
-+                                 && ((LineBuf[boundarylen] == '\n')
-+                                      || (LineBuf[boundarylen] == '-'
-+                                           && LineBuf[boundarylen+1] == '-'
-+                                           && LineBuf[boundarylen+2] == '\n'))) {
-+                                break;
-+                            }
-+                        }
-+                        free(LineBuf);
-+                        currct = BoundaryCt;
-+                        oldct=ContentType;
-+                        oldce=ContentEncoding;
-+                        oldcparmsused = CParamsUsed;
-+                        oldcparamsalloced = CParamsAlloced;
-+                        oldcparams = CParams;
-+                        oldcparamvalues = CParamValues;
-+                        CParams = NULL;
-+                        CParamValues = NULL;
-+                        CParamsUsed = 0;
-+                        CParamsAlloced = 0;
-+                        while(currct == BoundaryCt) {
-+                            tmppart = (struct part *) malloc(sizeof(struct part));
-+                            if (!tmppart) ExitWithError(nomem);
-+                            if (firstpart) {
-+                                thispart->next = tmppart;
-+                                thispart = tmppart;
-+                            } else {
-+                                firstpart = thispart = tmppart;
-+                            }
-+                            tmppart->next = NULL;
-+                            ContentType=NULL;
-+                            ContentEncoding=NULL;
-+                            Read822Prefix(0,0);
-+                            PrepareMessage();
-+                            newctlen=5+strlen(ContentType);
-+                            for (j=0; j<CParamsUsed; ++j) {
-+                                newctlen += 11+strlen(CParams[j]) + strlen(CParamValues[j]);
-+                            }
-+                            newct= malloc(newctlen);
-+                            if (!newct) ExitWithError(nomem);
-+                            strcpy(newct, "'");
-+                            strcat(newct, ContentType);
-+                            for (j=0; j<CParamsUsed; ++j) {
-+                                strcat(newct, "; ");
-+                                strcat(newct, CParams[j]);
-+                                if (CParamValues[j][0] == '\"') {
-+                                    strcat(newct, " = ");
-+                                    strcat(newct, CParamValues[j]);
-+                                } else {
-+                                    strcat(newct, " = \"");
-+                                    strcat(newct, CParamValues[j]);
-+                                    strcat(newct, "\"");
-+                                }
-+                            }
-+                            strcat(newct, "'");
-+                            thispart->ctype = newct;
-+                            MkTmpFileName(TmpFileNameBuf);
-+                            thispart->fname = malloc(1+strlen(TmpFileNameBuf));
-+                            if (!thispart->fname) ExitWithError(nomem);
-+                            strcpy(thispart->fname, TmpFileNameBuf);
-+                            WriteTmpFile(thispart->fname, thispart->ctype);
-+                            strcat(TmpFileNameBuf, "H");
-+                            headfp = fopen(TmpFileNameBuf, "w");
-+                            if (headfp) {
-+                                fputs(mailheaders+12, headfp);
-+                                /* The +12 gets rid of MM_HEADERS=\n */
-+                                fclose(headfp);
-+                            }
-+                            ++numparts;
-+                        }
-+                        ContentType=oldct;
-+                        ContentEncoding=oldce;
-+                        CParamsUsed = oldcparmsused;
-+                        CParamsAlloced = oldcparamsalloced;
-+                        CParams = oldcparams;
-+                        CParamValues = oldcparamvalues;
-+                        /* Now we've seen the last encapsulation boundary, but if there is a "postfix"
-+                            we must throw it away.*/
-+                        if (BoundaryCt > 0) {
-+                            ConsumeRestOfPart(NULL);
-+                        }
-+                        *PartsWritten = firstpart;
-+                        UsedLittleFiles=1;
-+                    }
-+                    if (*from == 'n') {
-+                        char numbuf[10];
-+                        sprintf(numbuf, "%d", numparts);
-+                        strcpy(to, numbuf);
-+                        to += strlen(numbuf);
-+                    } else { /* %F */
-+                        for (tmppart = firstpart; tmppart != NULL; tmppart = tmppart->next) {
-+                            sprintf(to, "%s %s ", tmppart->ctype, tmppart->fname);
-+                            to += (strlen(tmppart->ctype) + strlen(tmppart->fname) + 2);
-+                        }
-+                    }
-+                    break;
-+                case 's':
-+                    if (UsedLittleFiles) {
-+                        fprintf(stderr, "metamail: Bad mailcap entry: %s\n", controlstring);
-+                        ExitWithError("%%n and %%F are incompatible with %%s.  Execution terminated.");
-+                    }
-+                    if (TmpFileName) {
-+                        strcpy(to, TmpFileName);
-+                        to += strlen(TmpFileName);
-+                        if (UsedTmpFileName) ++(*UsedTmpFileName);
-+                    }
-+                    UsedBigFile = 1;
-+                    break;
-+                case '{':
-+                    s = index(from, '}');
-+                    if (!s) {
-+                        fprintf(stderr, "Ignoring ill-formed parameter reference in mailcap file: %s\n", from);
-+                        break;
-+                    }
-+                    ++from;
-+                    *s = 0;
-+                    /* put in lower case */
-+                    for (tmp=from; *tmp; ++tmp) {
-+                        if (isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
-+                    }
-+                    p = FindParam(from);
-+                    if (p && p[0] == '"') {
-+                        p=UnquoteString(p);
-+                    }
-+                    if (!p) p = "";
-+                    *to++ = '\'';
-+                    strcpynoquotes(to, p);
-+                    to += strlen(p);
-+                    *to++ = '\'';
-+                    *s = '}'; /* restore */
-+                    from = s;
-+                    break;
-+                case 't':
-+                    /* type/subtype */
-+                    strcpynoquotes(to, ContentType);
-+                    to += strlen(ContentType);
-+                    break;
-+                default:
-+                    fprintf(stderr, "Ignoring unrecognized format code in mailcap file: %%%c\n", *from);
-+                    break;
-+            }
-+        } else if (*from == '%') {
-+            prefixed = 1;
-+        } else {
-+            *to++ = *from;
-+        }
-+    }
-+    *to = 0;
-+}
-+
-+strcpynoquotes(t,f)
-+char *t, *f;
-+{
-+    static char *badchars="|<>%*?\"`'";
-+
-+    while (*f) {
-+        if (index(badchars, *f)) *t++ = ' '; else *t++ = *f;
-+        ++f;
-+    }
-+}
-+
-+WriteTmpFile(fname, ctype)
-+char *fname;
-+char *ctype;
-+{
-+    FILE *fpout;
-+    int retval = 0;
-+
-+    fpout = fopen(fname, WRITE_BINARY);
-+    if (!fpout) {
-+        perror("WriteTmpFile");
-+        ExitWithError("Can't create temporary file");
-+    }
-+    TranslateInputToOutput(InputFP, fpout, EncodingCode, ctype);
-+    if (ftell(fpout) == 0) retval = 1;
-+    if (fclose(fpout)) ExitWithError("Can't write temporary file");
-+    return(retval);
-+}
-+
-+
-+TranslateInputToOutput(InputFP, OutputFP, Ecode, ctype)
-+FILE *InputFP, *OutputFP;
-+int Ecode;
-+char *ctype;
-+{
-+    int InMultipart = BoundaryCt > 0 ? 1 : 0;
-+
-+    switch(Ecode) {
-+        case ENCODING_BASE64:
-+            from64(InputFP, OutputFP, InMultipart ? Boundaries : NULL, &BoundaryCt, DoesNeedPortableNewlines(ctype));
-+            break;
-+        case ENCODING_QUOTEDPRINTABLE:
-+            fromqp(InputFP, OutputFP, InMultipart ? Boundaries : NULL, &BoundaryCt);
-+            break;
-+ 	case ENCODING_UUENCODE:
-+ 	    fromuue(InputFP, OutputFP, InMultipart ? Boundaries: NULL, &BoundaryCt);
-+ 	    break;
-+        default:
-+            ConsumeRestOfPart(OutputFP);
-+    }
-+#if !defined(AMIGA) && !defined(MSDOS)
-+    if (UsingStandardInput && feof(InputFP) && !freopen("/dev/tty", "r", stdin)) {
-+        fprintf(stderr, "Warning: Cannot freopen /dev/tty to stdin");
-+    } else InputFP = stdin;
-+#endif
-+}
-+
-+CreateNewWindowPrefix(Prefix)
-+char *Prefix;
-+{
-+    char *override = getenv("TERMINAL_CMD");
-+    if (override) {
-+        strcpy(Prefix, override);
-+#ifdef AMIGA
-+    } else {
-+        /* The window should *not* run in background. We are thus unable
-+         * to use NewWsh or NewCLI.
-+         */
-+        /* strcpy(Prefix, "newwsh CMD "); */
-+        Prefix[0] = 0;
-+#else
-+    } else if (getenv("DISPLAY")) {
-+        /* X11 */
-+        strcpy(Prefix, "xterm -title '");
-+        strcat(Prefix, MailSummary);
-+        strcat(Prefix, "' -e ");
-+    } else if (getenv("WINDOW_PARENT")) {
-+        /* SunView */
-+        strcpy(Prefix, "shelltool ");
-+    } else if (getenv("WMHOST")) {
-+        /* old Andrew WM */
-+        strcpy(Prefix, "h19 ");
-+    } else {
-+        /* last resort is to look for /dev/tty */
-+        if (!freopen("/dev/tty", "r", stdin)){
-+            ExitWithError("Don't know how to create a terminal window");
-+        }
-+        InputFP = stdin;
-+        fprintf(stderr, "Warning, reopened /dev/tty, could be strange.\n");
-+        Prefix[0] = 0;
-+#endif
-+    }
-+}
-+
-+int HasSavedTtyState=0;
-+#if !defined(AMIGA) && !defined(MSDOS)
-+#ifdef SYSV
-+static struct termio MyTtyStateIn, MyTtyStateOut;
-+#else
-+static struct sgttyb MyTtyStateIn, MyTtyStateOut;
-+#endif
-+#endif
-+
-+SaveTtyState() {
-+    /* Bogus -- would like a good portable way to reset the terminal state here */
-+#if !defined(AMIGA) && !defined(MSDOS)
-+#ifdef SYSV
-+    ioctl(fileno(stdin), TCGETA, &MyTtyStateIn);
-+    ioctl(fileno(stdout), TCGETA, &MyTtyStateOut);
-+#else
-+    gtty(fileno(stdin), &MyTtyStateIn);
-+    gtty(fileno(stdout), &MyTtyStateOut);
-+#endif
-+    HasSavedTtyState = 1;
-+#endif
-+}
-+
-+RestoreTtyState() {
-+#if !defined(AMIGA) && !defined(MSDOS)
-+#ifdef SYSV
-+    if (HasSavedTtyState) {
-+        ioctl(fileno(stdout), TCSETA, &MyTtyStateOut);
-+        ioctl(fileno(stdin), TCSETA, &MyTtyStateIn);
-+    }
-+#else
-+    if (HasSavedTtyState) {
-+        stty(fileno(stdout), &MyTtyStateOut);
-+        stty(fileno(stdin), &MyTtyStateIn);
-+    }
-+#endif
-+#endif
-+}
-+
-+NeedToAskBeforeExecuting(type)
-+char *type;
-+{
-+    struct NoAskItem *nai;
-+    if (!MightAskBeforeExecuting || DoInBackground) return(0);
-+    for (nai = FirstNoAskItem; nai; nai = nai->next) {
-+        if (CtypeMatch(type, nai->type)) return(0);
-+    }
-+    return(1);
-+}
-+
-+NeedToBeQuiet(cmd)
-+char *cmd;
-+{
-+    struct NoAskItem *nai;
-+    for (nai = FirstQuietItem; nai; nai = nai->next) {
-+        if (!lc2strcmp(nai->type, cmd)) return(1);
-+    }
-+    return(0);
-+}
-+
-+CtypeMatch(ctype, pat)
-+char *ctype, *pat;
-+{
-+    int len;
-+    char pat2[200];
-+
-+    if (!lc2strcmp(ctype, pat)) {
-+        return(1); /* exact match, case-insensitive */
-+    }
-+    if (index(pat, '/') == NULL) {
-+        /* implicit wildcard */
-+        strcpy(pat2, pat);
-+        strcat(pat2, "/*");
-+        pat = pat2;
-+    }
-+    len = strlen(pat);
-+    if ((pat[--len] == '*')
-+         && (pat[--len] == '/')
-+         && (!lc2strncmp(ctype, pat, len))
-+         && ((ctype[len] == '/') || (ctype[len] == '\0'))){
-+        /* wildcard match */
-+        return(1);
-+    }
-+    return(0);
-+}
-+
-+ExecuteCommand(cmd, really)
-+char *cmd;
-+int really;
-+{
-+    int code;
-+    if (!Quiet || DoDebug) {
-+        if (!NeedToBeQuiet(ShortCommand(cmd))) {
-+            printf("---Executing: %s\n", DoDebug ? cmd : ShortCommand(cmd));
-+        } else if (EatLeadingNewlines) {
-+            printf("\n");
-+        } 
-+        fflush(stdout);
-+    }
-+    if (really) {
-+        fflush(stdout); fflush(stderr);
-+        code = system(cmd);
-+        if (DoDebug) printf("Command exit status: %d\n", code);
-+#ifdef MSDOS
-+	code = 0;	/* system doesn't return a valid exit code on MS-DOS */
-+#endif
-+        return(code);
-+    }
-+    return(0);
-+}
-+
-+MkTmpFileName(name)
-+char *name;
-+{
-+  int   length  = MAX_FILE_NAME_SIZE;
-+  char* tmpname = NULL;
-+
-+#ifdef AMIGA
-+    strcpy(name, "T:mmXXXXXX");
-+    close(mkstemp(name));
-+#else
-+  #ifndef MSDOS
-+    sprintf(name, "%s/mm.XXXXXX", tmproot);
-+    close(mkstemp(name));
-+  #else
-+     strcpy(name, "TXXXXXX");
-+     if (!close(mkstemp(name)))
-+         name[0] = 0;
-+     else
-+         if (DoDebug) printf("temp name = \"%s\"\n", name);
-+  #endif
-+#endif
-+     fprintf( stderr, "strlen\n");
-+     if (name) 
-+       length = strlen(name);
-+
-+     fprintf( stderr, "after strlen\n");
-+     tmpname = malloc( sizeof(char) * length );
-+     fprintf( stderr, "after malloc\n");
-+     strcpy( tmpname, name );
-+     fprintf( stderr, "after strcpy\n");
-+     dlist_insertnew( &TmpNameListTail, (void*) tmpname );
-+     fprintf( stderr, "after dlistinsert\n");
-+     tmpname = NULL;
-+}
-+
-+void
-+CleanupTmpFiles( void )
-+{
-+  DList* help = TmpNameListTail;
-+  DList* old = NULL;
-+  
-+  while (help) {
-+    if (unlink( (char*) help->data ) < 0) 
-+      if (DoDebug) 
-+	fprintf( stderr, "error unlinking %s\n", (char*) help->data );
-+    old = help;
-+    help = help->prev;
-+    free( old );
-+  }
-+  
-+  TmpNameListTail = NULL;
-+}
-+
-+#ifdef AMIGA
-+/* We need to execute a command and then remove a file "fileToRemove".
-+ * MkRmScript() creates a shell script that accomplishes this. The script
-+ * is written to a temporary file. The name of the script is returned.
-+ */
-+char *
-+MkRmScript(command, fileToRemove, nameBuf)
-+char *command;
-+char *fileToRemove;
-+char *nameBuf;
-+{
-+    FILE *script;
-+
-+    MkTmpFileName(nameBuf);
-+    if ((script = fopen(nameBuf, "w")) == NULL) {
-+        fprintf(stderr, "Unable to open %s for writing\n", nameBuf);
-+        exit(1);
-+    }
-+    fprintf(script, ".BRA {\n.KET }\n%s\nDelete %s QUIET\n", command, fileToRemove);
-+    fclose(script);
-+    return(nameBuf);
-+}
-+#endif
-+
-+void
-+ConsumeRestOfPart(outfp)
-+FILE *outfp;
-+{
-+    char *Buf;
-+    int c;
-+
-+    if (BoundaryCt <= 0) {
-+        while ((c=getc(InputFP)) != EOF) {
-+            if (outfp) putc(c, outfp);
-+        }
-+        return;
-+    }
-+    Buf = malloc(LINE_BUF_SIZE);
-+    if (!Buf) ExitWithError(nomem);
-+    while (fgets(Buf, LINE_BUF_SIZE, InputFP)) {
-+        if ((BoundaryCt > 0)
-+             && (Buf[0] == '-')
-+             && (Buf[1] == '-')
-+             && PendingBoundary(Buf, Boundaries, &BoundaryCt)) {
-+            break;
-+        }
-+        if (outfp) fputs(Buf, outfp);
-+    }
-+    free(Buf);
-+}
-+
-+char *paramend(s)
-+char *s;
-+{
-+    int inquotes=0;
-+    while (*s) {
-+        if (inquotes) {
-+            if (*s == '"') {
-+                inquotes = 0;
-+            } else if (*s == '\\') {
-+                ++s; /* skip a char */
-+            }
-+        } else if (*s == ';') {
-+            return(s);
-+        } else if (*s == '"') {
-+            inquotes = 1;
-+        }
-+        ++s;
-+    }
-+    return(NULL);
-+}        
-+
-+void
-+ParseContentParameters(ct)
-+char *ct;
-+{
-+    char *s, *t, *eq;
-+
-+    CParamsUsed = 0;
-+    s = index(ct, ';');
-+    if (!s) return;
-+    *s++ = 0;
-+    do {
-+        t = paramend(s);
-+        if (t) *t++ = 0;
-+        eq = index(s, '=');
-+        if (!eq) {
-+            fprintf(stderr, "Ignoring unparsable content-type parameter: '%s'\n", s);
-+            JunkParameter=Cleanse(s);
-+        } else {
-+            if (CParamsUsed >= CParamsAlloced) {
-+                CParamsAlloced += 10;
-+                if (CParams) {
-+                    CParams = (char **) realloc(CParams, (1+CParamsAlloced) * sizeof (char *));
-+                    CParamValues = (char **) realloc(CParamValues, (1+CParamsAlloced) * sizeof (char *));
-+                } else {
-+                    CParams = (char **) malloc((1+CParamsAlloced) * sizeof (char *));
-+                    CParamValues = (char **) malloc((1+CParamsAlloced) * sizeof (char *));
-+                }
-+                if (!CParams || !CParamValues) ExitWithError(nomem);
-+            }
-+            *eq++ = 0;
-+            s = Cleanse(s);
-+            CParams[CParamsUsed] = s;
-+            /* strip leading white space */
-+            while (*eq && isspace((unsigned char) *eq)) ++eq;
-+            /* strip trailing white space */
-+            StripTrailingSpace(eq);
-+            CParamValues[CParamsUsed++] = eq; 
-+            if (DoDebug) printf("NEW PARAMETER: %s VALUE: %s\n", s, eq);
-+        }
-+        s = t;
-+    } while (t);
-+}
-+
-+char *FindParam(s)
-+char *s;
-+{
-+    int i;
-+    for (i=0; i<CParamsUsed; ++i) {
-+        if (!strcmp(s, CParams[i])) {
-+            return(CParamValues[i]);
-+        }
-+    }
-+    return(NULL);
-+}
-+
-+#ifdef MSDOS
-+system2(s)
-+char *s;
-+{
-+    printf("system2: \"%s\"\n", s);
-+    return(0);
-+}
-+#endif
-+
-+strcatquoting(s1, s2)
-+char *s1;
-+char *s2;
-+{
-+    strcat(s1, s2);
-+#ifdef NOTDEF
-+    while (*s1) ++s1;
-+    while (*s2) {
-+        if (*s2 == '\"' || *s2 == '\\') *s1++ = '\\';
-+        *s1++ = *s2++;
-+    }
-+    *s1 = '\0';
-+#endif
-+}
-+
-+PauseForUser() {
-+#if defined(MSDOS) || defined(AMIGA)
-+    char Buf[100];
-+#endif
-+
-+    if (DefinitelyNotTty || MustNotBeTty) return;	
-+#if defined(MSDOS) || defined(AMIGA)
-+    printf("Press RETURN to go on\n");
-+    gets(Buf);
-+#else
-+    fflush(stdout);
-+    SaveTtyState();
-+    if (StartRawStdin() != -1) {
-+        printf("--Press any key to go on.--");
-+    } else {
-+        printf("Press RETURN to go on.\n");
-+    }
-+    fflush(stdout);
-+    getchar();
-+    RestoreTtyState();
-+    printf("\n");
-+#endif
-+}
-+
-+StartRawStdin() {
-+#if !defined(AMIGA) && !defined(MSDOS)
-+#ifdef SYSV
-+    struct termio   orterm, fterm;
-+    ioctl(0, TCGETA, &orterm);	/* get current (i.e. cooked) termio */
-+    fterm = orterm;		/* get termio to modify */
-+
-+    fterm.c_lflag &= ~ICANON;	/* clear ICANON giving raw mode */
-+    fterm.c_cc[VMIN] = 1;	/* set MIN char count to 1 */
-+    fterm.c_cc[VTIME] = 0;	/* set NO time limit */
-+    return ioctl(0, TCSETAW, &fterm);	/* modify termio for raw mode */
-+#else
-+    struct sgttyb ts;
-+    gtty(fileno(stdin), &ts);
-+    ts.sg_flags |= RAW;
-+    return stty(fileno(stdin), &ts);
-+#endif
-+#else
-+    return(-1);
-+#endif
-+}
-+
-+
-+int IsDirectory(fname)
-+char *fname;
-+{
-+    struct stat stbuf;
-+    if (stat(fname, &stbuf)) {
-+	return(-1);
-+    }
-+    return (((stbuf.st_mode & S_IFMT) == S_IFDIR) ? 1 : 0);
-+}
-+
---- metamail-2.7.orig/src/metamail/uue.c
-+++ metamail-2.7/src/metamail/uue.c
-@@ -0,0 +1,124 @@
-+#include <stdio.h>
-+
-+/*
-+ * hack to metamail to decode uuencoded bodyparts
-+ * Written by Keith Moore, February 1992
-+ */
-+
-+uueget (ptr, outfp, n)
-+char *ptr;
-+FILE *outfp;
-+{
-+    unsigned char c1, c2, c3;
-+    unsigned char p0, p1, p2, p3;
-+
-+    p0 = (ptr[0] - ' ') & 0x3F;
-+    p1 = (ptr[1] - ' ') & 0x3F;
-+    p2 = (ptr[2] - ' ') & 0x3F;
-+    p3 = (ptr[3] - ' ') & 0x3F;
-+    
-+    c1 = p0 << 2 | p1 >> 4;
-+    c2 = p1 << 4 | p2 >> 2;
-+    c3 = p2 << 6 | p3;
-+
-+    if (n >= 1)
-+	putc (c1, outfp);
-+    if (n >= 2)
-+	putc (c2, outfp);
-+    if (n >= 3)
-+	putc (c3, outfp);
-+}
-+
-+
-+getline (buf, size, fp)
-+char *buf;
-+int size;
-+FILE *fp;
-+{
-+    int c;
-+    char *ptr = buf;
-+
-+    for (c = 0; c < size; ++c)
-+	buf[c] = ' ';
-+    do {
-+	c = getc (fp);
-+	if (c == EOF) {
-+	    *ptr = '\0';
-+	    return (ptr == buf) ? -1 : 0;
-+	}
-+	else if (c == '\n' || c == '\r') {
-+	    *ptr = '\0';
-+	    return 0;
-+	}
-+	else if (ptr == buf && c == '>') /* ">From" line hack */
-+	    continue;
-+	else if (size > 0) {
-+	    *ptr++ = c;
-+	    size--;
-+	}
-+    } while (1);
-+    return
-+(0); /* shut lint up */
-+}
-+
-+
-+fromuue (infp, outfp, boundaries, ctptr)
-+FILE *infp, *outfp;
-+char **boundaries;
-+int *ctptr;
-+{
-+    char buf[63];
-+
-+    while (1) {
-+	if (getline (buf, sizeof buf, infp) < 0) {
-+	    fprintf (stderr, "Premature EOF!\n");
-+	    return;
-+	}
-+	if (strncmp (buf, "begin", 5) == 0)
-+	    break;
-+	else if (buf[0] == '-' && buf[1] == '-') {
-+	    if (boundaries && PendingBoundary (buf, boundaries, ctptr))
-+		return;
-+	}
-+    }	
-+    while (1) {
-+	if (getline (buf, sizeof buf, infp) < 0) {
-+	    fprintf (stderr, "Premature EOF!\n");
-+	    return;
-+	}
-+	else if (strncmp (buf, "end", 5) == 0)
-+	    break;
-+	else if (buf[0] == '-' && buf[1] == '-') {
-+	    if (boundaries && PendingBoundary (buf, boundaries, ctptr)) {
-+		fprintf (stderr, "premature end of x-uue body part\n");
-+		return;
-+	    }
-+	    else {
-+		fprintf (stderr, "ignoring invalid boundary marker\n");
-+		continue;
-+	    }
-+        }
-+        else if (*buf == '\0') continue;
-+	else {
-+	    int length = (*buf - ' ');
-+	    if (*buf == '`')
-+		length = 0;
-+	    if (length < 0 || length > 63) {
-+		fprintf (stderr, "fromuue: illegal length (%d)\n",
-+			 length);
-+	    }
-+/* Nathan Maman recommends commenting out the next two lines */
-+	    else if (length == 0)
-+		break;
-+	    else {
-+		char *ptr = buf + 1;
-+		while (length > 0) {
-+		    uueget (ptr, outfp, length);
-+		    length -= 3;
-+		    ptr += 4;
-+		}
-+	    }
-+	}
-+    }
-+}
-+
---- metamail-2.7.orig/src/metamail/metamail.h
-+++ metamail-2.7/src/metamail/metamail.h
-@@ -0,0 +1,62 @@
-+#ifndef METAMAIL_H
-+#define METAMAIL_H
-+
-+#include <metamail/common.h>
-+#include <metamail/patchlevel.h>
-+
-+BEGIN_C_DECLS
-+
-+#define CATCOMMAND  "cat"
-+#define CATTEMPLATE "cat %s"
-+#define METAMAIL    "metamail"
-+
-+#define WRITE_BINARY	"w"
-+
-+#define CMDSIZE 1200            /* Maximum size of command to execute */
-+
-+#define LINE_BUF_SIZE       2000
-+
-+//static char *nomem = "Out of memory!";
-+extern char *mmversion;
-+extern char *NoAskDefault;
-+extern char *QuietDefault;
-+extern char *tmproot;
-+
-+#define ENCODING_NONE 0
-+#define ENCODING_BASE64 1
-+#define ENCODING_QUOTEDPRINTABLE 2
-+#define ENCODING_8BIT 3
-+#define ENCODING_UUENCODE -1	/* non-standard */
-+
-+// for mailto.c (cutted and pasted ere)
-+#define MINCHUNKSIZE 20000      /* Better be enough to hold the headers, or we
-+				   die! */
-+#define MAX_LINELENGTH  2000
-+
-+struct NoAskItem {
-+    char *type;
-+    struct NoAskItem *next;
-+};
-+
-+extern char             *mailheaders;
-+extern char             *MailerName;
-+extern char             *ContentType;
-+extern int               Quiet;
-+extern struct NoAskItem *FirstNoAskItem;
-+extern struct NoAskItem *FirstQuietItem;
-+extern int               TransparentMode;
-+extern int               RunAsRootOK;
-+extern int               DoDebug;
-+extern int               YankMode;
-+extern int               MightAskBeforeExecuting;
-+extern int               DefinitelyNotTty;
-+extern int               MustNotBeTty;
-+extern int               MaybePageOutput;
-+
-+END_C_DECLS
-+
-+#endif /* METAMAIL_H */
-+
-+
-+
-+
---- metamail-2.7.orig/src/metamail/environment.c
-+++ metamail-2.7/src/metamail/environment.c
-@@ -0,0 +1,181 @@
-+/* Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+
-+Permission to use, copy, modify, and distribute this material 
-+for any purpose and without fee is hereby granted, provided 
-+that the above copyright notice and this permission notice 
-+appear in all copies, and that the name of Bellcore not be 
-+used in advertising or publicity pertaining to this 
-+material without the specific, prior written permission 
-+of an authorized representative of Bellcore.  BELLCORE 
-+MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+*/
-+
-+/* environment.c - contains (nearly) everything for the environmenthandling
-+   
-+   Author: Michael Moerz <mikem@debian.org>
-+*/
-+
-+#include "metamail.h"
-+#include "environment.h"
-+
-+/** adds a string to the current environmet variable PATH
-+    @param auxpath path to add to $PATH (=auxiliary path)
-+*/
-+void
-+addToPath(auxpath)
-+char *auxpath;
-+{
-+  if (auxpath && *auxpath) {    /* when pointer and auxpath[0] are != NULL */
-+    static char *newpath = 0;    /* is needed! since it becomes part ov ENV */
-+    char *oldpath = newpath;
-+    char *path = getenv("PATH");
-+    
-+    if (!path) path = "";	 /* give a default if no current path */
-+    newpath = XMALLOC(char, (7 + strlen(path) + strlen(auxpath)));
-+    sprintf(newpath, "PATH=%s:%s", auxpath, path);
-+    putenv(newpath);
-+    if (oldpath) XFREE(oldpath); /* free up any old allocated PATH */
-+  }
-+}
-+
-+/** initialize global variable mailheaders from environment
-+    this code is needed at several places -> own function
-+*/
-+void
-+initMailHeadersFromEnvironment() {
-+  mailheaders = getenv("MM_HEADERS");
-+  if (mailheaders) {
-+    char *s;
-+    s = XMALLOC(char, 15+strlen(mailheaders));
-+    sprintf(s, "MM_HEADERS=%s", mailheaders);
-+    /* error? free mailheaders? */
-+    mailheaders = s;
-+  }
-+}  
-+
-+/** initializes variables from environment variables or sets them to default
-+    values if they are not found in the environment
-+*/
-+void
-+initVarsFromEnvironment() {
-+  char *QuietStr = NULL, *NoAskStr = NULL;
-+
-+  /* temporary directory - where all temporary files are created */
-+  tmproot = getenv("METAMAIL_TMPDIR");
-+  if (!tmproot) {
-+    tmproot = XMALLOC(char, 5);
-+    strcpy(tmproot, "/tmp");
-+  }
-+
-+  /* */
-+  initMailHeadersFromEnvironment();
-+
-+  /* the quietstring that can turn off output for various things */
-+  QuietStr = getenv("MM_QUIET");
-+  if (!QuietStr) /* when not set in the environment set default */
-+    QuietStr = QuietDefault;
-+  /* now either we are always quiet (="1") or we have to create a structure
-+     containing information about when we have to be quiet
-+  */
-+  if (!strcmp(QuietStr, "1")) { /* when Quietstr == "1" */
-+    Quiet = 1;
-+  } else {
-+    struct NoAskItem *qitem;
-+    char *s, *tmp;
-+    char *QuietCopy;
-+
-+    Quiet = 0;
-+    QuietCopy = XMALLOC(char, 1+strlen(QuietStr));
-+    strcpy(QuietCopy, QuietStr);
-+    for (tmp=QuietCopy; *tmp; ++tmp) {
-+      if (isupper((unsigned char) *tmp)) 
-+	*tmp = tolower((unsigned char) *tmp);
-+    }
-+    do {
-+      s = index(QuietCopy, ',');
-+      if (s) *s++ = 0;
-+      qitem = XMALLOC(struct NoAskItem, 1);
-+      qitem->next = FirstQuietItem;
-+      qitem->type = QuietCopy;
-+      FirstQuietItem = qitem;
-+      QuietCopy = s;
-+    } while (QuietCopy);
-+  }
-+
-+  /* */
-+  if (getenv("MM_TRANSPARENT")) {
-+    /* Will not propogate recursively */
-+    TransparentMode = atoi(getenv("MM_TRANSPARENT"));
-+  }
-+
-+  /* override for allowing to run as root -- DANGER WILL ROBINSON */
-+  if (getenv("MM_RUNASROOT")) {
-+    RunAsRootOK = atoi(getenv("MM_RUNASROOT"));
-+  }
-+
-+  /* */
-+  if (getenv("MM_YANKMODE")) {
-+    /* Will not propogate recursively */
-+    YankMode = atoi(getenv("MM_YANKMODE"));
-+  }
-+
-+  /* debug flag */
-+  if (getenv("MM_DEBUG")) {
-+    DoDebug = atoi(getenv("MM_DEBUG"));
-+  }
-+
-+  /* put that somewhere else */
-+  if (DoDebug) 
-+    printf("Metamail Version %s, debugging turned on.\n", mmversion);
-+
-+  /* similar to quiet */
-+  NoAskStr = getenv("MM_NOASK");
-+  if (!NoAskStr) /* when noask not set in the ENV then init to default */
-+    NoAskStr = NoAskDefault;
-+  if (!strcmp(NoAskStr, "1")) {
-+    MightAskBeforeExecuting = 0;
-+  } else {
-+    struct NoAskItem *nai;
-+    char *s, *tmp;
-+    char *NoAskCopy;
-+    
-+    NoAskCopy = XMALLOC(char, 1+strlen(NoAskStr));
-+    strcpy(NoAskCopy, NoAskStr);
-+    for (tmp=NoAskCopy; *tmp; ++tmp) {
-+      if (isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
-+    }
-+    do {
-+      s = index(NoAskCopy, ',');
-+      if (s) *s++ = 0;
-+      nai = XMALLOC(struct NoAskItem, 1);
-+      nai->next = FirstNoAskItem;
-+      nai->type = NoAskCopy;
-+      FirstNoAskItem = nai;
-+      NoAskCopy = s;
-+    } while (NoAskCopy);
-+  }
-+
-+  /* hmm, perhaps mailprogram name ? */
-+  MailerName = getenv("MM_MAILER");
-+  if (!MailerName)
-+    MailerName = "unknown";
-+
-+  /* */
-+  if (getenv("MM_USEPAGER")) {
-+    MaybePageOutput = atoi(getenv("MM_USEPAGER"));
-+  }
-+
-+  /* setting if we have a tty or not */
-+  if ((getenv("MM_NOTTTY") && ((atoi(getenv("MM_NOTTTY"))) != 0))) {
-+    MustNotBeTty = 1;
-+  }
-+  if (MustNotBeTty
-+      || !isatty(0)
-+      || !isatty(1)) {
-+    DefinitelyNotTty = 1;
-+  }
-+  
-+  
-+}
---- metamail-2.7.orig/src/metamail/environment.h
-+++ metamail-2.7/src/metamail/environment.h
-@@ -0,0 +1,11 @@
-+#ifndef METAMAIL_ENVIRONMENT_H
-+#define METAMAIL_ENVIRONMENT_H 1
-+
-+#define ENVIRONMENT_TMPROOT_DEFAULT_LEN 5
-+#define ENVIRONMENT_TMPROOT_DEFAULT "/tmp"
-+
-+void addToPath                      (char *);
-+void initMailHeadersFromEnvironment ();
-+void initVarsFromEnvironment        ();
-+
-+#endif /* METAMAIL_ENVIRONMENT_H */
---- metamail-2.7.orig/src/metamail/mailto.c
-+++ metamail-2.7/src/metamail/mailto.c
-@@ -0,0 +1,2433 @@
-+/*
-+Copyright (c) 1992 Bell Communications Research, Inc. (Bellcore)
-+
-+Permission to use, copy, modify, and distribute this material 
-+for any purpose and without fee is hereby granted, provided 
-+that the above copyright notice and this permission notice 
-+appear in all copies, and that the name of Bellcore not be 
-+used in advertising or publicity pertaining to this 
-+material without the specific, prior written permission 
-+of an authorized representative of Bellcore.  BELLCORE 
-+MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+*/
-+
-+/* 
-+Program: mailto
-+Author: Nathaniel S. Borenstein
-+
-+   This is a program that allows users to send MIME-format mail with much 
-+   the same user interface as the Berkeley mail program.  
-+
-+   However, it should be stressed that this program includes
-+   ABSOLUTELY NO CODE taken from Berkeley mail -- it is a 
-+   "clean" reimplementation.
-+
-+   The user interface is directly modelled on Berkeley mail,
-+   and the desiderata for its design are taken from the man
-+   page for that program.
-+
-+   For information on using this program, consult the man page.
-+
-+STILL NEED TO DO/SUPPORT:
-+
-+-- Replace the main fgets call with something that allows in-line escape codes to do the equivalent of the tilde escapes.  Handle margins, centering, excerpts, EightBitMode, and RightToLeft mode properly.
-+-- Replace EditString with something that does the right thing in-line.
-+*/
-+
-+#include <metamail/common.h>
-+
-+#include <curses.h>  /* This and next for tgetstr(3X) and kin */
-+#include <term.h>
-+
-+#include "metamail.h"
-+#include "metamail_default.h"
-+
-+struct mailpart *CreateNewPart();
-+char *getmyname(); /* Defined in shared.c */
-+
-+
-+/* The main data structure for the multiple parts of the mail */
-+
-+struct mailpart {
-+    int istext;
-+    int isrich;
-+    char *content_type;
-+    int encoding_type_needed;
-+    char *filename;
-+    struct MailcapEntry *mc;
-+    struct mailpart *next, *prev;
-+};
-+
-+/* Some globals */
-+struct mailpart *FirstPart = NULL;
-+static char *Subject = NULL, *ToList = NULL, *CCList= NULL, *InReplyTo = NULL;
-+FILE *fpout = NULL;
-+static char *CharacterSet = NULL;
-+static int PartEndsWithNewline=1;
-+static int SplitSize=DEFAULT_SPLIT_SIZE;
-+
-+char *deadLetter = "dead.letter";
-+char *signature = ".signature";
-+char *mimeSignature = ".SIGNATURE";
-+#define TMPFILE_NAME_SIZE   1000
-+#define FILE_NAME_SIZE      1000
-+
-+#define DEFAULT_EDITOR      "vi"
-+
-+#define SYSTEM(command)     system(command);
-+
-+
-+/* The following are the globals that can be set via .mailrc */
-+int  V_askcc=0, /* To ask about the Cc field */
-+     V_dot=0, /* To take a period as the end of input */
-+     V_ignore=0, /* To ignore interrupts */
-+     V_verbose=0, /* To run sendmail with -v */
-+     V_quiet=0, /* To suppress various informational output */
-+     V_keepblind=0, /* To receive a blind copy of outgoing mail. */
-+     V_commasonly=0; /* To suppress using spaces as address separators */
-+
-+/* Codes for encoding_type_needed */
-+#define ENC_NONE 0
-+#define ENC_QP 1 /* quoted-printable */
-+#define ENC_B64 2 /* base64 */
-+
-+/* Codes for JustificationState */
-+#define JUST_LEFT 0
-+#define JUST_RIGHT 1
-+#define JUST_CENTER 2
-+int JustificationState = JUST_LEFT;
-+
-+
-+EightBitCharHelp() {
-+    if (!CharacterSet || !strcmp(CharacterSet, "us-ascii")) {
-+        printf("There are no extended characters available for your US-ASCII terminal.\n\n");
-+        printf("If you are actually using a terminal or terminal emulator with a richer\ncharacter set, you must use the '-a' option or the 'MM_CHARSET' environment\nvariable to inform this program of that fact.\n");
-+    } else {
-+        static char *kbd1[] =
-+          {
-+            "1234567890-=",
-+            "qwertyuiop[]",
-+            "asdfghjkl;'`",
-+            "zxcvbnm,./\\",
-+            NULL
-+        };
-+        static char *kbd2[] = /* MUST have same # of entries as kbd1 */
-+          {
-+            "!@#$%^&*()_+",
-+            "QWERTYUIOP{}",
-+            "ASDFGHJKL:\"~",
-+            "ZXCVBNM<>?|",
-+            NULL
-+        };
-+        char *s;
-+        int i, ct;
-+
-+        printf("Here is the keyboard map for the character set %s\n.If your terminal does not really use this character set, this may look strange.\n\n", CharacterSet);
-+        for (i=0; kbd1[i]; ++i) {
-+            for (ct=0, s=kbd1[i]; *s; ++s) {
-+                printf("%c%c ", *s, (*s) + 128);
-+                ct+=3;
-+            }
-+            while (ct++<40) printf(" ");
-+            for (s=kbd2[i]; *s; ++s) {
-+                printf("%c%c ", *s, (*s) + 128);
-+            }
-+            printf("\n");
-+        }
-+    }
-+}            
-+
-+char *
-+tmpname() {
-+    char *s = malloc(30);
-+    if (!s) nomemabort();
-+    {
-+        char *tmproot = getenv("METAMAIL_TMPDIR");
-+        if (!tmproot) tmproot="/tmp";
-+        if (strlen(tmproot) > 19) {
-+            free(s);
-+            s=malloc(12+strlen(tmproot));
-+            if (!s) nomemabort();
-+        }
-+        sprintf(s, "%s/mm.XXXXXX", tmproot);
-+    }
-+    return(s);
-+}
-+
-+TildeHelp() {
-+    char *pager = getenv("PAGER");
-+    char TmpName[100], CmdBuf[150];
-+    FILE *fp;
-+
-+    strcpy(TmpName, tmpname());
-+    fp = fdopen(mkstemp(TmpName), "w");
-+    if (!fp) fp = stdout;
-+    fprintf(fp, "The following tilde escapes are BSD-mail-compatible:\n");
-+    fprintf(fp, "~? Show help on tilde escapes\n");
-+    fprintf(fp, "~| RESERVED FOR BSD MAIL COMPATIBILITY\n");
-+    fprintf(fp, "~f RESERVED FOR BSD MAIL COMPATIBILITY\n");
-+    fprintf(fp, "~m RESERVED FOR BSD MAIL COMPATIBILITY\n");
-+    fprintf(fp, "~! Shell escape\n");
-+    fprintf(fp, "~~ Enter text line starting with a tilde\n");
-+    fprintf(fp, "~. Send the mail and exit\n");
-+    fprintf(fp, "~c Add to Cc list\n");
-+    fprintf(fp, "~d Read from %s (or named file, ~d filename)\n", deadLetter);
-+    fprintf(fp, "~e Edit message being composed\n");
-+    fprintf(fp, "~h Edit the headers\n");
-+    fprintf(fp, "~p Print out the message so far\n");
-+    fprintf(fp, "~q Quit, copying to %s\n", deadLetter);
-+    fprintf(fp, "~r Read the named text file into the message\n");
-+    fprintf(fp, "~s Reset the subject\n");
-+    fprintf(fp, "~t Add to To list\n");
-+    fprintf(fp, "~v Edit using VISUAL editor\n");
-+    fprintf(fp, "~w Write message to named file\n");
-+    fprintf(fp, "\n");
-+    fprintf(fp, "The following tilde escapes are unique to this program:\n");
-+    fprintf(fp, "~/<number> Set maximum size before message is split into multiple parts\n");
-+    fprintf(fp, "~?+ Show help on extended (eight-bit) characters\n");
-+    fprintf(fp, "~> Indent Left Margin\n");
-+    fprintf(fp, "~< Unindent Left Margin\n");
-+    fprintf(fp, "~<R Indent Right Margin\n");
-+    fprintf(fp, "~>R Unindent Right Margin\n");
-+    fprintf(fp, "~+ Enter 8-bit mode for non-ASCII characters\n");
-+    fprintf(fp, "~- Leave 8-bit mode (return to ASCII)\n");
-+    fprintf(fp, "~^ Toggle \"Upside-down\" (right-to-left) mode.\n");
-+    fprintf(fp, "~* Add non-text data (pictures, sounds, etc.) as a new MIME part (try it!)\n");
-+    fprintf(fp, "~b Toggle bold mode\n");
-+    fprintf(fp, "~i Toggle italic mode\n");
-+    fprintf(fp, "~j Alter Justification (~jc = center, ~jl = flushleft, ~jr = flushright.)\n");
-+    fprintf(fp, "~k Toggles whether or not to keep a 'blind' copy of your mail\n");
-+    fprintf(fp, "~n Force newline (hard line break)\n");
-+    fprintf(fp, "~Q Toggle quotation (excerpt) mode\n");
-+    fprintf(fp, "~S Toggle Semitic text mode (combines 8-bit and left-to-right)\n");
-+    fprintf(fp, "~u Toggle underline mode\n");
-+    fprintf(fp, "~z Add the contents of %s as a TEXT signature.\n", signature);
-+    fprintf(fp, "~Z Add the contents of %s as a NON-TEXT (MIME-format) signature.\n", mimeSignature);
-+    fprintf(fp, "For further information, read the man page.\n");
-+    fprintf(fp, "\n");
-+    if (fp != stdout) {
-+        fclose(fp);
-+        snprintf(CmdBuf, sizeof(CmdBuf), "%s %s", pager ? pager : "sensible-pager", TmpName);
-+        SYSTEM(CmdBuf);
-+        unlink(TmpName);
-+    }
-+}
-+
-+char *gethome() {
-+    struct passwd *p = getpwuid(getuid());
-+    if (!p || !p->pw_dir) {
-+        perror("Cannot find your home directory, using /tmp");
-+        return("/tmp");
-+    }
-+    return (p->pw_dir);
-+}
-+
-+
-+static char standoutbuf[50], standendbuf[50], StartUnderline[50], StopUnderline[50], BoldOn[50], BoldOff[50], KS[50], KE[50];
-+static int termcolumns, termrows;
-+
-+InitTerminal() {
-+    char tbuf[1024], *term, *dum;
-+
-+    term = getenv("TERM");
-+    if (term && tgetent(tbuf, term) != 1) {
-+        term = NULL;
-+    }
-+    if (term) {
-+        dum = KS;
-+        if (tgetstr("ks", &dum)) *dum = '\0'; else KS[0] = '\0';
-+        dum = KE;
-+        if (tgetstr("ke", &dum)) *dum = '\0'; else KE[0] = '\0';
-+        dum = standoutbuf;
-+        if (tgetstr("so", &dum)) *dum = '\0'; else standoutbuf[0] = '\0';
-+        dum = standendbuf;
-+        if (tgetstr("se", &dum)) *dum = '\0'; else standendbuf[0] = '\0';
-+        dum = BoldOn;
-+        if (tgetstr("md", &dum)) *dum = '\0'; else strcpy(BoldOn, standoutbuf);
-+        dum = BoldOff;
-+        if (tgetstr("me", &dum)) *dum = '\0'; else strcpy(BoldOff, standendbuf);
-+        dum = StartUnderline;
-+        if (tgetstr("us", &dum)) *dum = '\0'; else StartUnderline[0] = '\0';
-+        dum = StopUnderline;
-+        if (tgetstr("ue", &dum)) *dum = '\0'; else StopUnderline[0] = '\0';
-+        termcolumns = tgetnum("co");
-+        if (termcolumns <= 0) termcolumns = 80;
-+        termrows = tgetnum("li");
-+        if (termrows <= 0) termrows = 23;
-+    } else {
-+        KS[0] = '\0';
-+        KE[0] = '\0';
-+        standoutbuf[0] = '\0';
-+        standendbuf[0] = '\0';
-+        BoldOn[0] = '\0';
-+        BoldOff[0] = '\0';
-+        StartUnderline[0] = '\0';
-+        StopUnderline[0] = '\0';
-+        termcolumns = 80;
-+        termrows = 23;
-+    }
-+    fputs(KS, stdout);
-+}
-+
-+FinalizeTerminal() {
-+    tfputs(standendbuf);
-+    tfputs(BoldOff);
-+    tfputs(StopUnderline);
-+}
-+
-+struct mailpart *
-+NewPart() {
-+    struct mailpart *p;
-+    p = (struct mailpart *) malloc(sizeof(struct mailpart));
-+    if (!p) nomemabort();
-+    p->istext = 1;
-+    p->isrich = 0;
-+    p->content_type = "text/plain";
-+    p->encoding_type_needed = ENC_NONE;
-+    p->filename = tmpname();
-+    p->mc = NULL;
-+    p->next = NULL;
-+    p->prev = NULL;
-+    return(p);
-+}
-+
-+nomemabort() {
-+    fprintf(stderr, "mailto: Out of memory\n");
-+    cleanexit(-1);
-+}
-+
-+char *
-+freshcopy(s)
-+char *s;
-+{
-+    char *t = malloc(1+strlen(s));
-+    if (!t) nomemabort();
-+    strcpy(t, s);
-+    return(t);
-+}
-+
-+char *
-+GetLineMalloced(prompt, def)
-+char *prompt, *def;
-+{
-+    char Sbuf[1000], *ans;
-+    printf("%s: ", prompt);
-+    fflush(stdout);
-+    ans = fgets(Sbuf, sizeof(Sbuf), stdin);
-+    if (ans) {
-+        /* Need a fresh copy */
-+        ans = malloc(1+strlen(Sbuf));
-+        if (!ans) nomemabort();
-+        strcpy(ans, Sbuf);
-+        ans[strlen(ans) - 1] = '\0'; /* trash newline */
-+    } else {
-+        /* Callers will free() this, so make a fresh copy as well */
-+        ans = malloc(1+strlen(def));
-+        if (!ans) nomemabort();
-+        strcpy(ans, def);
-+    }
-+    return(ans);
-+}
-+
-+char *
-+EditString(prompt, s)
-+char *prompt, *s;
-+{
-+    char *ans;
-+    char NewPrompt[500];
-+    if (!s) s = "";
-+    snprintf(NewPrompt, sizeof(NewPrompt), "%s [%s]", prompt, s);
-+    ans = GetLineMalloced(NewPrompt, s);
-+    while (*ans && isspace((unsigned char) *ans)) ++ans;
-+    if (!*ans) return(s);
-+    return(ans);
-+}
-+
-+char *
-+AddCommasToAddressList(s)
-+char *s;
-+{
-+    int spaces = 0;
-+    char *t, *ans, *ansptr;
-+
-+    if (V_commasonly) {
-+        ans = malloc(1+strlen(s));
-+        if (!ans) nomemabort;
-+        strcpy(ans, s);
-+        return(ans);
-+    }
-+    for (t=s; *t; ++t) {
-+        if (*t == ' ') ++spaces;
-+    }
-+    /* That provides a max size for the mallocs */
-+    ans = malloc(1+strlen(s) +spaces);
-+    if (!ans) nomemabort();
-+    ansptr = ans;
-+    for (t=s; *t; ++t) {
-+        if (*t == ' ' && *(t-1) != ',') {
-+            *ansptr++ = ',';
-+        }
-+        *ansptr++ = *t;
-+    }
-+    *ansptr = '\0';
-+    while (--ansptr > ans && (isspace((unsigned char) *ansptr) || *ansptr == ',')) {
-+        *ansptr = '\0';
-+    }
-+    return(ans);
-+}
-+
-+char *
-+AddToList(List, entry, definitelynew)
-+char *List, *entry;
-+int definitelynew;
-+{
-+    int len;
-+    char *end = entry+strlen(entry);
-+
-+    while (--end >= entry && isspace((unsigned char) *end)) *end = '\0';
-+    if (! *entry) return(List);
-+    if (List && *List) {
-+        List = realloc(List, strlen(List) + strlen(entry) + 5);
-+        if (!List) nomemabort();
-+        if (V_commasonly && !definitelynew) {
-+            strcat(List, " ");
-+        } else {
-+            strcat(List, ", ");
-+        }
-+        strcat(List, entry);
-+    } else {
-+        List = malloc(strlen(entry) + 2);
-+        if (!List) nomemabort();
-+        strcpy(List, entry);
-+    }
-+    len = strlen(List);
-+    while (List[--len] == ',') List[len] = '\0';
-+    return(List);
-+}
-+
-+main(argc, argv)
-+char **argv;
-+{
-+    char *sdum, *LineBuf, CmdBuf[100];
-+    int i, EightBitMode = 0, RightToLeftMode = 0, AllDone=0, EightBitSeen=0, prevaddrdone=1;
-+    FILE *fpin;
-+    struct mailpart *CurrentPart=NULL;
-+
-+    if ((LineBuf = malloc(MAX_LINELENGTH)) == NULL) {
-+        fprintf(stderr, "mailto: Unable to allocate memory\n");
-+        exit(10);
-+    }
-+    ProcessInitFiles();
-+    InitSignals();
-+    InitTerminal();
-+    sdum = getenv("SPLITSIZE");
-+    if (sdum) {
-+        i = atoi(sdum);
-+        if (i < MINCHUNKSIZE) {
-+            fprintf(stderr, "Ignoring SPLITSIZE environment variable of %d -- the minimum value is %d\n", i, MINCHUNKSIZE);
-+        } else {
-+            SplitSize = i;
-+        }
-+    }
-+
-+    CharacterSet = getenv("MM_CHARSET");
-+    for (i=1; i<argc; ++i) {
-+        if (argv[i][0] == '-') {
-+            switch (argv[i][1]) {
-+                case 'a':
-+                    if (argv[i][2]) {
-+                        CharacterSet = &argv[i][2];
-+                    } else if (++i < argc) {
-+                        CharacterSet = argv[i];
-+                    } else {
-+                        fprintf(stderr, "mailto: -a requires a character set specification to follow\n");
-+                        cleanexit(-1);
-+                    }
-+                    break;
-+                case 'c':
-+                    if (argv[i][2]) {
-+                        CCList = &argv[i][2];
-+                    } else if (++i < argc) {
-+                        CCList = argv[i];
-+                    } else {
-+                        CCList = "";
-+                    }
-+                    break;
-+                case 'r':
-+                    if (argv[i][2]) {
-+                        InReplyTo = &argv[i][2];
-+                    } else if (++i < argc) {
-+                        InReplyTo = argv[i];
-+                    } else {
-+                        fprintf(stderr, "mailto: -r requires a Message-ID to follow\n");
-+                        cleanexit(-1);
-+                    }
-+                    break;
-+                case 's':
-+                    if (argv[i][2]) {
-+                        Subject = &argv[i][2];
-+                    } else if (++i < argc) {
-+                        Subject = argv[i];
-+                    } else {
-+                        fprintf(stderr, "mailto: -s requires a subject specification to follow\n");
-+                        cleanexit(-1);
-+                    }
-+                    break;
-+                default:
-+                    fprintf(stderr, "mailto:  Unrecognized option %s\n", argv[i]);
-+                    cleanexit(-1);
-+            }
-+        } else {
-+            /* It's an address, I guess */
-+            ToList = AddToList(ToList, argv[i], prevaddrdone);
-+            prevaddrdone = (argv[i][strlen(argv[i]) -1] == ',') ? 1 : 0;
-+        }
-+    }
-+    if (!CharacterSet) CharacterSet = "us-ascii";
-+    for (sdum = CharacterSet; *sdum; ++sdum) {
-+        if (isupper(*sdum)) *sdum = tolower(*sdum);
-+    }
-+    if (strcmp(CharacterSet, "us-ascii")
-+	 && strcmp(CharacterSet, "kio8-r")
-+	 && strncmp(CharacterSet, "iso-8859-", 9)) {
-+        fprintf(stderr, "mailto:  Unsupported character set: %s\n", CharacterSet);
-+        exit(-1);
-+    }
-+    if (strcmp(CharacterSet, "us-ascii")) {
-+        printf("Composing mail in character set %s\n", CharacterSet);
-+    }
-+    ProcessMailcapFiles();
-+    if (!ToList) {
-+        sdum=GetLineMalloced("To", "");
-+        ToList=AddCommasToAddressList(sdum);
-+        free(sdum);
-+    }
-+    if (!Subject) Subject=GetLineMalloced("Subject", "<NO SUBJECT>");
-+    if (!CCList && V_askcc) {
-+        sdum = GetLineMalloced("Cc", "");
-+        CCList = AddCommasToAddressList(sdum);
-+        free(sdum);
-+    }
-+    FirstPart = NewPart();
-+    CurrentPart = FirstPart;
-+    fpout = fdopen(mkstemp(CurrentPart->filename), "w");
-+    if (!fpout) {
-+        fprintf(stderr, "mailto:  Can't open temporary file %s\n", CurrentPart->filename);
-+        cleanexit(-1);
-+    }
-+    while (!AllDone && fgets(LineBuf, MAX_LINELENGTH, stdin) != NULL) {
-+        if (V_dot && LineBuf[0] == '.' && LineBuf[1] == '\n') {
-+            AllDone = 1;
-+        } else if (LineBuf[0] == '~') {
-+            /* Clean up argument */
-+            char *start = LineBuf+2;
-+            char *end = start + strlen(start);
-+            while (--end > start && isspace((unsigned char) *end)) *end = '\0';
-+            while (isspace((unsigned char) *start)) ++start;
-+            switch (LineBuf[1]) {
-+                case '.':
-+                    AllDone = 1;
-+                    break;
-+                case '?':
-+                    if (*start == '+') {
-+                        EightBitCharHelp();
-+                    } else {
-+                        TildeHelp();
-+                    }
-+                    break;
-+                case '~':
-+                    FputsQuotingLT(LineBuf+1, fpout, CurrentPart, EightBitMode, RightToLeftMode);
-+                    break;
-+                case '!':
-+                    if (!V_quiet) printf("Executing: %s\n", start);
-+                    SYSTEM(start);
-+                    break;
-+                case '>':
-+                    CurrentPart->isrich = 1;
-+                    fputs("<nl>", fpout);
-+                    if (*start=='r' || *start == 'R') {
-+                        TryClosingStyle("indentright", fpout, CurrentPart);
-+                    } else {
-+                        TryOpeningStyle("indent", fpout, CurrentPart, NULL);
-+                    }
-+                    break;
-+                case '<':
-+                    CurrentPart->isrich = 1;
-+                    fputs("<nl>", fpout);
-+                    if (*start == 'R' || *start == 'r') {
-+                        TryOpeningStyle("indentright", fpout, CurrentPart, NULL);
-+                    } else {
-+                        TryClosingStyle("indent", fpout, CurrentPart);
-+                    }
-+                    break;
-+                case '/':
-+                    i = atoi(start);
-+                    if (i < MINCHUNKSIZE) {
-+                        fprintf(stderr, "Ignoring splitsize setting of %d -- the minimum value is %d\n", i, MINCHUNKSIZE);
-+                    } else {
-+                        SplitSize = i;
-+                        if (!V_quiet) printf("Set splitsize to %d\n", i);
-+                    }
-+                    break;
-+                case '+':
-+                    if (!strcmp(CharacterSet, "us-ascii")) {
-+                        fprintf(stderr, "mailto:  No 8-bit characters allowed in ASCII mail\n");
-+                    } else {
-+                        EightBitMode = 1;
-+                        if (!V_quiet) printf("Entering text in eight-bit mode\n");
-+                    }
-+                    break;
-+                case '-':
-+                    EightBitMode = 0;
-+                    if (!V_quiet) printf("Entering text in seven-bit (normal) mode\n");
-+                    break;
-+                case '^':
-+                    RightToLeftMode = ! RightToLeftMode;
-+                    if (!V_quiet) printf("%s right-to-left mode\n", RightToLeftMode ? "Entering" : "Exiting");
-+                    break;
-+                case '*':
-+                    {
-+                    struct mailpart *p = CreateNewPart();
-+                    if (!p) break;
-+                    TempCloseStyles(fpout);
-+                    fclose(fpout);
-+                    CurrentPart->next = p;
-+                    CurrentPart->next->prev = CurrentPart;
-+                    CurrentPart = CurrentPart->next;
-+                    CurrentPart->next = NewPart();
-+                    CurrentPart->next->prev = CurrentPart;
-+                    CurrentPart = CurrentPart->next;
-+                    fpout = fdopen(mkstemp(CurrentPart->filename), "w");
-+                    if (!fpout) {
-+                        fprintf(stderr, "mailto:  Can't open temporary file %s\n", CurrentPart->filename);
-+                        cleanexit(-1);
-+                    }
-+                    ReopenStyles(fpout, CurrentPart);
-+                    break;
-+                    }
-+                case 'b':
-+                    ToggleStyle("bold", fpout, CurrentPart, BoldOn, BoldOff);
-+                    break;
-+                case 'c':
-+                    CCList = AddToList(CCList, start, 1);
-+                    if (!V_quiet) printf("Cc field is now: %s\n", CCList);
-+                    break;
-+                case 'd':
-+                    {
-+                    char fnam[FILE_NAME_SIZE];
-+                    if (! *start) {
-+                        snprintf(fnam, sizeof(fnam), "%s/dead.letter", gethome());
-+                    } else {
-+                        strcpy(fnam, start);
-+                    }
-+                    fpin = fopen(fnam, "r");
-+                    if (!fpin) {
-+                        fprintf(stderr, "mailto: Cannot open file %s\n", fnam);
-+                        break;
-+                    }
-+                    TempCloseStyles(fpout);
-+                    fclose(fpout);
-+                    CurrentPart->next = NewPart();
-+                    CurrentPart->next->prev = CurrentPart;
-+                    CurrentPart = CurrentPart->next;
-+                    CurrentPart->istext = 0;
-+                    CurrentPart->content_type = "message/rfc822";
-+                    fpout = fdopen(mkstemp(CurrentPart->filename), "w");
-+                    if (!fpout) {
-+                        fprintf(stderr, "mailto: Cannot open temporary file %s\n", CurrentPart->filename);
-+                        break;
-+                    }
-+                    (void) TranslateInputToEncodedOutput(fpin, fpout, ENC_NONE, "");
-+                    fclose(fpin);
-+                    fclose(fpout);
-+                    printf("Included contents of %s\n(continue)\n", fnam);
-+                    CurrentPart->next = NewPart();
-+                    CurrentPart->next->prev = CurrentPart;
-+                    CurrentPart = CurrentPart->next;
-+                    fpout = fdopen(mkstemp(CurrentPart->filename), "w");
-+                    if (!fpout) {
-+                        fprintf(stderr, "mailto:  Can't open temporary file %s\n", CurrentPart->filename);
-+                        cleanexit(-1);
-+                    }
-+                    ReopenStyles(fpout, CurrentPart);
-+                    break;
-+                    }
-+                case 'e':
-+                    EditCurrentMessage(0);
-+                    break;
-+                case 'h':
-+                    ToList = AddCommasToAddressList(EditString("To", ToList));
-+                    Subject = EditString("Subject", Subject);
-+                    CCList = AddCommasToAddressList(EditString("Cc", CCList));
-+                    break;
-+                case 'i':
-+                    ToggleStyle("italic", fpout, CurrentPart, standoutbuf, standendbuf);
-+                    break;
-+                case 'j':
-+                    {
-+                    int NewJustificationState;
-+                    switch (*start) {
-+                        case 'c':
-+                        case 'C':
-+                            NewJustificationState = JUST_CENTER;
-+                            break;
-+                        case 'r':
-+                        case 'R':
-+                            NewJustificationState = JUST_RIGHT;
-+                            break;
-+                        case 'l':
-+                        case 'L':
-+                            NewJustificationState = JUST_LEFT;
-+                            break;
-+                        default:
-+                            printf("mailto: Unrecognized justification state: %c\n", *start);
-+                            NewJustificationState = JustificationState;
-+                    }
-+                    if (JustificationState == NewJustificationState) {
-+                        if (!V_quiet) printf("mailto:  No change in justificiation\n");
-+                    } else {
-+                        if (CurrentPart->isrich) {
-+                            if (JustificationState == JUST_CENTER) {
-+                                EndStyle(fpout, "center");
-+                            } else if (JustificationState == JUST_RIGHT) {
-+                                EndStyle(fpout, "flushright");
-+                            } else {
-+                                EndStyle(fpout, "flushleft");
-+                            }
-+                        }
-+                        CurrentPart->isrich = 1;
-+                        fputs("<nl>", fpout);
-+                        JustificationState = NewJustificationState;
-+                        if (JustificationState == JUST_CENTER) {
-+                            StartStyle(fpout, "center", NULL);
-+                        } else if (JustificationState == JUST_RIGHT) {
-+                            StartStyle(fpout, "flushright", NULL);
-+                        } else {
-+                            StartStyle(fpout, "flushleft", NULL);
-+                        }
-+                    }
-+                    break;
-+                    }
-+                case 'k':
-+                    V_keepblind = ! V_keepblind;
-+                    if (!V_quiet) printf("%s keep a blind copy of this message\n", V_keepblind ? "Will" : "Won't");
-+                    break;
-+                case 'n':
-+                    CurrentPart->isrich = 1;
-+                    fputs("<nl>", fpout);
-+                    if (!V_quiet) printf("Inserted line break\n");
-+                    break;
-+                case 'p':
-+                    {
-+                    FILE *fptmp;
-+                    char Cmd[TMPFILE_NAME_SIZE + 15];
-+                    char *s=tmpname();
-+                    fclose(fpout);
-+                    fptmp = fdopen(mkstemp(s), "w");
-+                    WriteOutMessage(fptmp, ToList, Subject, CCList, FirstPart);
-+                    TempCloseStyles(fptmp);
-+                    fclose(fptmp);
-+                    fpout = fopen(CurrentPart->filename, "a");
-+                    if (!fpout) {
-+                        fprintf(stderr, "mailto:  Can't open temporary file %s\n", CurrentPart->filename);
-+                        cleanexit(-1);
-+                    }
-+                    snprintf(Cmd, sizeof(Cmd), "metamail -z %s", s);
-+                    SYSTEM(Cmd);
-+                    free(s);
-+                    RestoreCurrentStyles();
-+                    break;
-+                    }
-+                case 'q':
-+                    TempCloseStyles(fpout);
-+                    fclose(fpout);
-+                    if (!WriteDeadLetter()) cleanexit(0);
-+                    break;
-+                case 'Q':
-+                    ToggleStyle("excerpt", fpout, CurrentPart, NULL, NULL);
-+                    break;
-+                case 'r':
-+                    if (! *start) {
-+                        printf("mailto: No file name given.\n");
-+                        break;
-+                    }
-+                    fpin = fopen(start, "r");
-+                    if (!fpin) {
-+                        fprintf(stderr, "mailto: Cannot open file %s\n", start);
-+                        break;
-+                    }
-+                    EightBitSeen = TranslateInputToEncodedOutput(fpin, fpout, ENC_NONE, "");
-+                    if (EightBitSeen 
-+                         && (CurrentPart->istext || CurrentPart->isrich)) {
-+                        if (CurrentPart->encoding_type_needed == ENC_NONE) {
-+                            CurrentPart->encoding_type_needed = ENC_QP;
-+                        }
-+                        if (!strcmp(CharacterSet, "us-ascii")) {
-+                            SwitchToEuropean();
-+                        }
-+                    }
-+                    fclose(fpin);
-+		    if (!V_quiet) printf("Included contents of %s\n", start);
-+		    printf("(continue)\n");
-+                    break;
-+                case 'S':
-+                    /* Semitic language mode toggle */
-+                    if (EightBitMode) {
-+                        EightBitMode = 0;
-+                        RightToLeftMode = 0;
-+                    } else {
-+                        if (!strcmp(CharacterSet, "us-ascii")) {
-+                            fprintf(stderr, "mailto:  No 8-bit characters allowed in ASCII mail\n");
-+                            break;
-+                        }
-+                        EightBitMode = 1;
-+                        RightToLeftMode = 1;
-+                    }
-+                    if (!V_quiet) printf("%s Eight-bit and right-to-left modes\n", RightToLeftMode ? "Entering" : "Exiting");
-+                    break;
-+                case 's':
-+                    {
-+                    char *subj=start;
-+                    if (*subj) {
-+                        Subject = freshcopy(subj);
-+                    } else {
-+                        Subject=GetLineMalloced("Subject", "<NO SUBJECT>");
-+                    }
-+                    break;
-+                    }
-+                case 't':
-+                    ToList = AddToList(ToList, start, 1);
-+                    if (!V_quiet) printf("To field is now: %s\n", ToList);
-+                    break;
-+                case 'u':
-+                    ToggleStyle("underline", fpout, CurrentPart, StartUnderline, StopUnderline);
-+                    break;
-+                case 'v':
-+                    EditCurrentMessage(1);
-+                    break;
-+                case 'w':
-+                    {
-+                    FILE *fptmp;
-+                    char *fname;
-+                    fclose(fpout);
-+                    fname = start;
-+                    fptmp = fopen(fname, "w");
-+                    WriteOutMessage(fptmp, ToList, Subject, CCList, FirstPart);
-+                    TempCloseStyles(fptmp);
-+                    if(fclose(fptmp)) {
-+                        fprintf(stderr, "Could not write file %s\n", fname);
-+                    } else {
-+                        printf("Wrote draft to %s\n", fname);
-+                    }
-+                    fpout = fopen(CurrentPart->filename, "a");
-+                    if (!fpout) {
-+                        fprintf(stderr, "mailto:  Can't open temporary file %s\n", CurrentPart->filename);
-+                        cleanexit(-1);
-+                    }
-+                    break;
-+                    }
-+                case 'z':
-+                    {
-+                    char FBuf[FILE_NAME_SIZE];
-+                    if (! *start) {
-+                        snprintf(FBuf, sizeof(FBuf), "%s/.signature", gethome());
-+                    } else {
-+                        strcpy(FBuf, start);
-+                    }
-+                    fpin = fopen(FBuf, "r");
-+                    if (!fpin) {
-+                        fprintf(stderr, "mailto: Cannot open file %s\n", FBuf);
-+                        break;
-+                    }
-+                    CurrentPart->isrich = 1;
-+                    StartStyle(fpout, "signature", NULL);
-+                    EightBitSeen = TranslateInputToEncodedOutput(fpin, fpout, ENC_NONE, "");
-+                    if (EightBitSeen) {
-+                        if (CurrentPart->encoding_type_needed == ENC_NONE) {
-+                            CurrentPart->encoding_type_needed = ENC_QP;
-+                        }
-+                        if ((CurrentPart->istext || CurrentPart->isrich) && !strcmp(CharacterSet, "us-ascii")) {
-+                            SwitchToEuropean();
-+                        }
-+                    }
-+                    fclose(fpin);
-+                    EndStyle(fpout, "signature");
-+                    if (!V_quiet) printf("Included contents of %s\n", FBuf);
-+		    printf("(continue)\n");
-+                    break;
-+                    }
-+                case 'Z':
-+                    {
-+                    char fnam[FILE_NAME_SIZE];
-+                    if (! *start) {
-+                        snprintf(fnam, sizeof(fnam), "%s/.SIGNATURE", gethome());
-+                    } else {
-+                        strcpy(fnam, start);
-+                    }
-+                    fpin = fopen(fnam, "r");
-+                    if (!fpin) {
-+                        fprintf(stderr, "mailto: Cannot open file %s\n", fnam);
-+                        break;
-+                    }
-+                    TempCloseStyles(fpout);
-+                    fclose(fpout);
-+                    CurrentPart->next = NewPart();
-+                    CurrentPart->next->prev = CurrentPart;
-+                    CurrentPart = CurrentPart->next;
-+                    CurrentPart->istext = 0;
-+                    CurrentPart->content_type = "message/rfc822";
-+                    fpout = fdopen(mkstemp(CurrentPart->filename), "w");
-+                    if (!fpout) {
-+                        fprintf(stderr, "mailto: Cannot open temporary file %s\n", CurrentPart->filename);
-+                        break;
-+                    }
-+                    EightBitSeen = TranslateInputToEncodedOutput(fpin, fpout, ENC_NONE, "");
-+                    if (EightBitSeen &&
-+                        (CurrentPart->istext || CurrentPart->isrich)) {
-+                        if (CurrentPart->encoding_type_needed == ENC_NONE) {
-+                            CurrentPart->encoding_type_needed = ENC_QP;
-+                        }
-+                        if (!strcmp(CharacterSet, "us-ascii")) {
-+                            SwitchToEuropean();
-+                        }
-+                    }
-+                    fclose(fpin);
-+                    fclose(fpout);
-+                    printf("Included contents of %s\n", fnam);
-+		    printf("(continue)\n");
-+                    CurrentPart->next = NewPart();
-+                    CurrentPart->next->prev = CurrentPart;
-+                    CurrentPart = CurrentPart->next;
-+                    fpout = fdopen(mkstemp(CurrentPart->filename), "w");
-+                    if (!fpout) {
-+                        fprintf(stderr, "mailto:  Can't open temporary file %s\n", CurrentPart->filename);
-+                        cleanexit(-1);
-+                    }
-+                    ReopenStyles(fpout, CurrentPart);
-+                    break;
-+                    }
-+                default:
-+                    printf("Unrecognized tilde escape: %c\n", LineBuf[1]);
-+                    break;
-+            }
-+        } else {
-+            FputsQuotingLT(LineBuf, fpout, CurrentPart, EightBitMode, RightToLeftMode);
-+        }
-+    }
-+    TempCloseStyles(fpout);
-+    fclose(fpout);
-+    printf("EOT\n");
-+    if (V_verbose) {
-+        snprintf(CmdBuf, sizeof(CmdBuf), "splitmail -d -v -s %d", SplitSize);
-+    } else {
-+        snprintf(CmdBuf, sizeof(CmdBuf), "splitmail -d -s %d", SplitSize);
-+    }
-+    fpout = popen(CmdBuf, "w");
-+    if (!fpout) {
-+        fprintf(stderr, "mailto: Can't write to splitmail\n");
-+        (void) WriteDeadLetter();
-+        cleanexit(-1);
-+    }
-+    WriteOutMessage(fpout, ToList, Subject, CCList, FirstPart);
-+    if (ferror(fpout) || pclose(fpout)) {
-+        perror("mailto: Error writing to splitmail");
-+        (void) WriteDeadLetter();
-+        cleanexit(-1);
-+    }
-+    cleanexit(0); /* Never returns */
-+}
-+
-+char *newid() {
-+    static char idbuf[100];
-+    static int ctr=0;
-+
-+    snprintf(idbuf, sizeof(idbuf), "<%d_%d_%d_%d@%s>", (int) getuid(), (int) getpid(), (int) time(0), ++ctr, getmyname());
-+
-+    return(idbuf);
-+}
-+
-+WriteOutMessage(fp, ToList, Subject, CCList, FirstPart)
-+FILE *fp;
-+char *ToList, *Subject, *CCList;
-+struct mailpart *FirstPart;
-+{
-+    FILE *fpin;
-+    static int ctr = 0;
-+    fprintf(fp, "MIME-Version: 1.0\n");
-+    if (InReplyTo != NULL) {
-+        EmitHeader(fp, "In-Reply-To", InReplyTo);
-+    }
-+    EmitHeaderWithAliases(fp, "To", ToList);
-+
-+    EmitHeader(fp, "Subject", Subject);
-+    if (CCList && *CCList) EmitHeaderWithAliases(fp, "Cc", CCList);
-+    if (V_keepblind) {
-+        struct passwd *p = getpwuid(getuid());
-+        if (!p) {
-+            fprintf(stderr, "Can't find your user id to keep a blind copy\n");
-+        } else {
-+            EmitHeader(fp, "Bcc", p->pw_name);
-+        }
-+    }
-+    fprintf(fp, "Message-ID: %s\n", newid());
-+    if (!FirstPart) return; /* empty body */
-+    if (FirstPart->next) {
-+        char boundary[120];
-+        snprintf(boundary, sizeof(boundary), "PART.BOUNDARY.%d.%d.%s.%d.%d",
-+                 (int) getuid(), (int) getpid(), getmyname(), (int) time(0), ++ctr);
-+        fprintf(fp, "Content-type: multipart/mixed;\n\tboundary=\"%s\"\n\n", boundary);
-+        fprintf(fp, "> THIS IS A MESSAGE IN 'MIME' FORMAT.  Your mail reader does not support MIME.\n> Some parts of this will be readable as plain text.\n> To see the rest, you will need to upgrade your mail reader.\n");
-+        while(FirstPart) {
-+            /* First check to see if it is empty & text, in which case skip it */
-+            if (FirstPart->istext) {
-+                struct stat stbuf;
-+                if (!stat(FirstPart->filename, &stbuf)) {
-+                    if (stbuf.st_size == 0) {
-+                        FirstPart = FirstPart->next;
-+                        continue;
-+                    }
-+                }
-+            }
-+            fprintf(fp, "\n--%s\n", boundary);
-+            WriteContentTypeAndEncoding(fp, FirstPart);
-+            fprintf(fp, "\n");
-+            fpin = fopen(FirstPart->filename, "r");
-+            if (!fpin) {
-+                fprintf(stderr, "Can't read temporary file %s\n", FirstPart->filename);
-+                cleanexit(-1);
-+            }
-+            (void) TranslateInputToEncodedOutput(fpin, fp, FirstPart->encoding_type_needed, FirstPart->content_type);
-+            fclose(fpin);
-+            FirstPart = FirstPart->next;
-+        }
-+        fprintf(fp, "\n--%s--\n\n", boundary);
-+    } else {
-+        WriteContentTypeAndEncoding(fp, FirstPart);
-+        fprintf(fp, "\n");
-+        fpin = fopen(FirstPart->filename, "r");
-+        if (!fpin) {
-+            fprintf(stderr, "Can't read temporary file %s\n", FirstPart->filename);
-+            cleanexit(-1);
-+        }
-+        (void) TranslateInputToEncodedOutput(fpin, fp, FirstPart->encoding_type_needed, FirstPart->content_type);
-+        fclose(fpin);
-+    }
-+}
-+
-+WriteContentTypeAndEncoding(fp, part)
-+FILE *fp;
-+struct mailpart *part;
-+{
-+    fprintf(fp, "Content-ID: %s\n", newid());
-+    if (part->istext) {
-+        if (part->isrich) {
-+            if (strcmp(CharacterSet, "us-ascii")
-+		 && strcmp(CharacterSet, "koi8-r")
-+		 && (strncmp(CharacterSet, "iso-8859-", 9) 
-+                      || part->encoding_type_needed != ENC_NONE)) {
-+                fprintf(fp, "Content-type: text/richtext; charset=\"%s\"\n", CharacterSet);
-+            } else {
-+                fprintf(fp, "Content-type: text/richtext\n");
-+            }
-+        } else {
-+            fprintf(fp, "Content-type: ");
-+            WriteCtypeNicely(fp, part->content_type);
-+            if (strcmp(CharacterSet, "us-ascii")
-+                 && (strncmp(CharacterSet, "iso-8859-", 9) 
-+                      || part->encoding_type_needed != ENC_NONE)) {
-+                fprintf(fp, "; charset=\"%s\"\n", CharacterSet);
-+            } else fputs("\n", fp);
-+        }
-+    } else {
-+        fprintf(fp, "Content-type: ");
-+        WriteCtypeNicely(fp, part->content_type); /* fixes some syntactic junk */
-+        fputs("\n", fp);
-+    }
-+    if (part->istext && part->isrich && part->encoding_type_needed == ENC_NONE) {
-+        /* Don't you believe it... */
-+        part->encoding_type_needed = ENC_QP;
-+    }
-+    if (part->encoding_type_needed == ENC_B64) {
-+        fprintf(fp, "Content-Transfer-Encoding: base64\n");
-+    } else if (part->encoding_type_needed == ENC_QP) {
-+        fprintf(fp, "Content-Transfer-Encoding: quoted-printable\n");
-+    }
-+}
-+
-+TranslateInputToEncodedOutput(InputFP, OutputFP, Ecode, ctype)
-+FILE *InputFP, *OutputFP;
-+int Ecode;
-+char *ctype;
-+{
-+    int c, EightBitSeen = 0;
-+
-+    switch(Ecode) {
-+        case ENC_B64:
-+            to64(InputFP, OutputFP, DoesNeedPortableNewlines(ctype));
-+            break;
-+        case ENC_QP:
-+            toqp(InputFP, OutputFP);
-+            break;
-+        default:
-+            while ((c = getc(InputFP)) != EOF){
-+                if (c > 127) EightBitSeen = 1;
-+                putc(c, OutputFP);
-+            }
-+    }
-+    return(EightBitSeen);
-+}
-+
-+#define	MAX_STACK_SIZE	500
-+static int StackSize=0;
-+static char *Stack[MAX_STACK_SIZE];
-+static char *EnvStartStack[MAX_STACK_SIZE];
-+
-+/* The following two routines are used when richtext styles need to be 
-+   kept open across an inserted object -- i.e. the richtext is split into 
-+   two parts of a multipart message */
-+
-+TempCloseStyles(fp)
-+FILE *fp;
-+{
-+    int i = StackSize;
-+    while(--i>=0) {
-+        fprintf(fp, "</%s>", Stack[i]);
-+    }
-+    tfputs(StopUnderline);
-+    tfputs(standendbuf);
-+    tfputs(BoldOff);
-+    fflush(stdout);
-+}
-+
-+RestoreCurrentStyles() {
-+    int i=0;
-+    while (i<StackSize) {
-+        if (EnvStartStack[i]) {
-+            tfputs(EnvStartStack[i]);
-+        }
-+        ++i;
-+    }
-+}
-+
-+ReopenStyles(fp, part)
-+FILE *fp;
-+struct mailpart *part;
-+{
-+    int i=0;
-+    RestoreCurrentStyles();
-+    if (StackSize > 0) part->isrich = 1;
-+    while (i < StackSize) {
-+        fprintf(fp, "<%s>", Stack[i++]);
-+    }
-+}
-+
-+richtextreset()
-+{
-+    StackSize = 0;
-+}
-+
-+AlreadyInStyle(s)
-+char *s;
-+{
-+    int i;
-+    for (i=0; i<StackSize; ++i) {
-+        if (!strcmp(Stack[i], s)) return(1);
-+    }
-+    return(0);
-+}
-+
-+StartStyle(fp, s, envstartstr)
-+FILE *fp;
-+char *s;
-+char *envstartstr;
-+{
-+    char *t;
-+    fprintf(fp, "<%s>", s);
-+    PartEndsWithNewline=0;
-+    t = malloc(1+strlen(s));
-+    if (!t) nomemabort();
-+    strcpy(t, s);
-+    EnvStartStack[StackSize] = envstartstr;
-+    Stack[StackSize++] = t;
-+    if (!V_quiet) printf("Beginning: %s\n", t);
-+}
-+
-+EndStyle(fp, s)
-+FILE *fp;
-+char *s;
-+{
-+    int i = StackSize, j;
-+    while(--i>=0) {
-+        fprintf(fp, "</%s>", Stack[i]);
-+        if (!strcmp(s, Stack[i])) break;
-+    }
-+    if (i>=0) {
-+        free(Stack[i]);
-+        --StackSize;
-+        for (j=i; j<StackSize; ++j) {
-+            Stack[j] = Stack[j+1];
-+            EnvStartStack[j] = EnvStartStack[j+1];
-+        }
-+    } else i=0;
-+    while (i<StackSize) {
-+        fprintf(fp, "<%s>", Stack[i++]);
-+    }
-+    PartEndsWithNewline=0;
-+    if (!V_quiet) printf("Ending: %s\n", s);
-+}
-+
-+ToggleStyle(name, fp, part, turnonstr, turnoffstr)
-+char *name;
-+FILE *fp;
-+struct mailpart *part;
-+char *turnonstr, *turnoffstr;
-+{
-+    part->isrich = 1;
-+    if (AlreadyInStyle(name)) {
-+        EndStyle(fp, name);
-+        if (turnoffstr) tfputs(turnoffstr);
-+        RestoreCurrentStyles(); /* because on some terminals,
-+                                  the same thing turns
-+                                  off underlining AND bold */
-+    } else {
-+        StartStyle(fp, name, turnonstr);
-+        if (turnonstr) tfputs(turnonstr);
-+    }
-+}
-+
-+TryOpeningStyle(name, fp, part, envstartstr)
-+char *name;
-+FILE *fp;
-+struct mailpart *part;
-+char *envstartstr;
-+{
-+    if (AlreadyInStyle(name)) {
-+        printf("mailto: Already in %s style\n", name);
-+    } else {
-+        part->isrich = 1;
-+        StartStyle(fp, name, envstartstr);
-+    }
-+}
-+
-+TryClosingStyle(name, fp, part)
-+char *name;
-+FILE *fp;
-+struct mailpart *part;
-+{
-+    if (AlreadyInStyle(name)) {
-+        part->isrich = 1;
-+        EndStyle(fp, name);
-+    } else {
-+        printf("mailto: You aren't in a %s style\n", name);
-+    }
-+}
-+
-+FputsQuotingLT(s, fp, part, EightBitMode, RightToLeftMode)
-+char *s;
-+FILE *fp;
-+struct mailpart *part;
-+int EightBitMode, RightToLeftMode;
-+{
-+    static int InNewLineSequence=1;
-+    int c=0;
-+    char LBuf[1000], *sdum;
-+    if (*s == '\n') {
-+        if (InNewLineSequence) {
-+            fputs("<nl>\n", fp);
-+        } else {
-+            fputs("<nl><nl>\n\n", fp);
-+            InNewLineSequence = 1;
-+        }
-+        part->isrich = 1;
-+        PartEndsWithNewline=1;
-+        return;
-+    }
-+    InNewLineSequence = 0;
-+    if (RightToLeftMode) {
-+        sdum = s+strlen(s)-1;
-+        if (*sdum == '\n') --sdum;
-+        while (sdum >= s) {
-+            LBuf[c++] = *sdum--;
-+        }
-+        LBuf[c++] = '\n';
-+        LBuf[c] = '\0';
-+        s = LBuf;
-+    }
-+    if (isspace((unsigned char) *s)) {
-+        /* Lines that start with spaces should not be folded! */
-+        fputs("<nl>", fp);
-+        part->isrich = 1;
-+    }
-+    if (s) {
-+        if (EightBitMode) part->encoding_type_needed = ENC_QP;
-+        while (*s) {
-+            c = (unsigned char) *s;
-+            if (EightBitMode) {
-+                if (isprint(c) && ! isspace(c)) {
-+                    c = c+128;
-+                }
-+                putc(c, fp);
-+                putc(c, stdout);
-+            } else if (c == '<') {
-+                part->isrich = 1;
-+                fputs("<lt>", fp);
-+            } else {
-+                if (c > 127 || c < 0) {
-+                    part->encoding_type_needed = ENC_QP;
-+                    if (!strcmp(CharacterSet, "us-ascii")) {
-+                        SwitchToEuropean();
-+                    }
-+                }
-+                putc(c, fp);
-+                if (RightToLeftMode) putc(c, stdout);
-+            }
-+            ++s;
-+        }
-+        PartEndsWithNewline = (c == '\n') ? 1 : 0;
-+    }
-+}
-+
-+cleanexit(code)
-+int code;
-+{
-+    finalize();
-+    exit(code);
-+}
-+
-+finalize() {
-+    while (FirstPart) {
-+        unlink(FirstPart->filename);
-+        FirstPart = FirstPart->next;
-+    }
-+    FinalizeTerminal();
-+}
-+
-+void
-+cleanup(signum)
-+int signum;
-+{
-+    if (fpout) {
-+        TempCloseStyles(fpout);
-+        fclose(fpout);
-+    }
-+    if (signum == SIGPIPE) {
-+        (void) WriteDeadLetter();
-+    }
-+    if (signum == SIGINT) {
-+        if (V_ignore) {
-+            printf("Interrupt ignored because 'ignore' is set.  Use ~q if you want to quit.\n");
-+            return;
-+        } else {
-+            (void) WriteDeadLetter();
-+        }
-+    }
-+    finalize();
-+    signal(signum, SIG_DFL);
-+    kill(getpid(), signum);
-+}
-+
-+InitSignals() {
-+    signal(SIGINT, cleanup);
-+    signal(SIGPIPE, cleanup);
-+    signal(SIGILL, cleanup);
-+    signal(SIGTRAP, cleanup);
-+    signal(SIGIOT, cleanup);
-+    signal(SIGFPE, cleanup);
-+    signal(SIGSEGV, cleanup);
-+    signal(SIGTERM, cleanup);
-+#ifdef SIGXCPU
-+    signal(SIGXCPU, cleanup);
-+#endif
-+}
-+
-+WriteDeadLetter()
-+{
-+    FILE *fp;
-+    char DeadFile[1000];
-+
-+    snprintf(DeadFile, sizeof(DeadFile), "%s/dead.letter", gethome());
-+    fp = fopen(DeadFile, "w");
-+    WriteOutMessage(fp, ToList, Subject, CCList, FirstPart);
-+    if(fclose(fp)) {
-+        perror("Could not write ~/dead.letter\n");
-+        return(-1);
-+    } else {
-+        printf("Wrote draft to ~/dead.letter\n");
-+        return(0);
-+    }
-+}
-+
-+struct MailcapEntry {
-+    char *contenttype;
-+    char *command;
-+    char *testcommand;
-+    char *editcommand;
-+    char *composecommand;
-+    char *composetypedcommand;
-+    char *label;
-+    int needsterminal;
-+    int copiousoutput;
-+    struct MailcapEntry *next;
-+} *FirstMailcapEntry = NULL;
-+
-+/* There are a fair number of core leaks in what follows.  That should matter little -- the mailcap files are only parsed once, and are usually pretty small anyway. */
-+
-+char *
-+GetCommand(s, t)
-+char *s, **t;
-+{
-+    char *s2;
-+    int quoted = 0;
-+    s2 = malloc(strlen(s)*2); /* absolute max, if all % signs */
-+    if (!s2) nomemabort();
-+    *t = s2;
-+    while (s && *s) {
-+	if (quoted) {
-+            if (*s == '%') *s2++ = '%'; /* Quote through next level, ugh! */
-+
-+            *s2++ = *s++;
-+	    quoted = 0;
-+	} else {
-+	    if (*s == ';') {
-+                *s2 = '\0';
-+		return(++s);
-+	    }
-+	    if (*s == '\\') {
-+		quoted = 1;
-+		++s;
-+	    } else {
-+		*s2++ = *s++;
-+	    }
-+	}
-+    }
-+    *s2 = '\0';
-+    return(NULL);
-+}	
-+
-+char *Cleanse(s, dolc) /* no leading or trailing space, all lower case */
-+char *s;
-+int dolc;
-+{
-+    char *tmp, *news;
-+    
-+    /* strip leading white space */
-+    while (*s && isspace((unsigned char) *s)) ++s;
-+    news = s;
-+    /* put in lower case, find end */
-+    for (tmp=s; *tmp; ++tmp) {
-+        if (dolc && isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
-+    }
-+    /* strip trailing white space */
-+    while (--tmp && *tmp && isspace((unsigned char) *tmp)) *tmp = '\0';
-+    return(news);
-+}
-+
-+char *DeQuote(s)
-+char *s;
-+{
-+    char *retval;
-+    s = Cleanse(s, 0);
-+    if (*s != '"') return(s);
-+    retval = ++s;
-+    while (s && *s) {
-+        s = index(s, '\"');
-+        if (!s) return(retval); /* but it's a bad parse */
-+        if (*(s-1) != '\\') {
-+            *s = '\0';
-+            return(retval);
-+        }
-+        ++s;
-+    }
-+    return(retval); /* also a bad parse */
-+}    
-+
-+struct MailcapEntry *
-+GetMailcapEntry(fp)
-+FILE *fp;
-+{
-+    int rawentryalloc = MAX_LINELENGTH, len;
-+    char *rawentry, *s, *t, *LineBuf;
-+    struct MailcapEntry *mc;
-+
-+    LineBuf = malloc(MAX_LINELENGTH);
-+    if (!LineBuf) nomemabort();
-+    rawentry = malloc(1 + rawentryalloc);
-+    mc = (struct MailcapEntry *) malloc(sizeof (struct MailcapEntry));
-+    if (!rawentry || !mc) nomemabort();
-+    *rawentry = '\0';
-+    while (fgets(LineBuf, MAX_LINELENGTH, fp)) {
-+	if (LineBuf[0] == '#') continue;
-+	len = strlen(LineBuf);
-+        if (LineBuf[len-1] == '\n') LineBuf[--len] = '\0';
-+	if ((len + strlen(rawentry)) > rawentryalloc) {
-+            rawentryalloc += MAX_LINELENGTH;
-+	    rawentry = realloc(rawentry, rawentryalloc+1);
-+	    if (!rawentry) nomemabort();
-+	}
-+	if (LineBuf[len-1] == '\\') {
-+            LineBuf[len-1] = '\0';
-+	    strcat(rawentry, LineBuf);
-+	} else {
-+	    strcat(rawentry, LineBuf);
-+	    break;
-+	}
-+    }
-+    free(LineBuf);
-+    for (s=rawentry; *s && isspace((unsigned char) *s); ++s) ;
-+    if (!*s) {
-+	/* totally blank entry -- quietly ignore */
-+	free(rawentry);
-+	return(NULL);
-+    }
-+    s = index(rawentry, ';');
-+    if (!s) {
-+	fprintf(stderr, "mailto: Ignoring invalid mailcap entry: %s\n", rawentry);
-+	free(rawentry);
-+	return(NULL);
-+    }
-+    *s++ = '\0';
-+    mc->needsterminal = 0;
-+    mc->copiousoutput = 0;
-+    mc->testcommand = NULL;
-+    mc->composecommand = NULL;
-+    mc->composetypedcommand = NULL;
-+    mc->editcommand = NULL;
-+    mc->label = NULL;
-+    mc->contenttype = malloc(1+strlen(rawentry));
-+    mc->next = NULL;
-+    if (!mc->contenttype) nomemabort();
-+    strcpy(mc->contenttype, rawentry);
-+    t = GetCommand(s, &mc->command);
-+    s = t;
-+    while (s) {
-+	char *arg, *eq;
-+
-+        t = GetCommand(s, &arg);
-+/*        if (t) *t++ = '\0'; */
-+        eq = index(arg, '=');
-+        if (eq) *eq++ = '\0';
-+        arg = Cleanse(arg, 1);
-+	if (!strcmp(arg, "needsterminal")) {
-+	    mc->needsterminal = 1;
-+	} else if (!strcmp(arg, "copiousoutput")) {
-+	    mc->copiousoutput = 1;
-+        } else if (eq && !strcmp(arg, "test")) {
-+            mc->testcommand = DeQuote(eq);
-+        } else if (eq && !strcmp(arg, "edit")) {
-+            mc->editcommand = DeQuote(eq);
-+        } else if (eq && !strcmp(arg, "compose")) {
-+            mc->composecommand = DeQuote(eq);
-+        } else if (eq && !strcmp(arg, "composetyped")) {
-+            mc->composetypedcommand = DeQuote(eq);
-+        } else if (eq && !strcmp(arg, "description")) {
-+            mc->label = DeQuote(eq);
-+        } else if (eq && !strcmp(arg, "label")) { 
-+            mc->label = DeQuote(eq); /* bogus old name for description */
-+        } else if (eq && !strcmp(arg, "textualnewlines")) {
-+            ExceptionalNewline(mc->contenttype, atoi(eq));
-+	} else if (strcmp(arg, "notes")) { /* IGNORE notes field */
-+/*	    if (*arg) fprintf(stderr, "mailto: Ignoring invalid mailcap flag: %s\n", arg);  */
-+	}
-+	s = t;
-+    }
-+    free(rawentry);
-+    return(mc);
-+}
-+
-+ProcessMailcapFiles() 
-+{
-+    char *s, *path = getenv("MAILCAPS"), *origpath;
-+    static char *stdpath = STDPATH;
-+    struct MailcapEntry *mc, *CurrentMailcapEntry = NULL;
-+    FILE *fp;
-+
-+    if (!path) {
-+        int uid = getuid();
-+        struct passwd *p;
-+        p = getpwuid(uid);
-+        if (p) path = malloc(5+strlen(p->pw_dir) + strlen(stdpath));
-+        if (!p || !path) nomemabort();
-+        strcpy(path, p->pw_dir);
-+        strcat(path, stdpath);
-+    } else {
-+        char *pathcopy;
-+        pathcopy = malloc(1+strlen(path));
-+        if (!pathcopy) nomemabort();
-+        strcpy(pathcopy, path);
-+        path = pathcopy;
-+    }
-+    origpath = path;
-+    while(path) {
-+        s = index(path, PATH_SEPARATOR);
-+        if (s) *s++ = '\0';
-+        fp = fopen(path, "r");
-+        while (fp && !feof(fp)) {
-+            mc = GetMailcapEntry(fp);
-+            if (!mc) continue;
-+            if (!FirstMailcapEntry) {
-+                FirstMailcapEntry = mc;
-+                CurrentMailcapEntry = mc;
-+            } else {
-+                CurrentMailcapEntry->next = mc;
-+                CurrentMailcapEntry = mc;
-+            }
-+	}
-+        if (fp) fclose(fp);
-+        path = s;
-+    }
-+    free(origpath);
-+    return(-1);
-+}
-+
-+struct mailpart *
-+CreateNewPart() {
-+    struct mailpart *mp;
-+    struct MailcapEntry *mc = FirstMailcapEntry;
-+    int i, ans, resultcode;
-+    char LineBuf[100], *CmdBuf;
-+
-+    mp = NewPart();
-+    if (!mp) return(NULL);
-+    printf("Please choose which kind of data you wish to insert:\n\n");
-+    printf("0: A raw file, possibly binary, of no particular data type.\n");
-+    printf("1: Raw data from a file, with you specifying the content-type by hand.\n");
-+    i = 1;
-+    while (mc) {
-+        if (mc->composecommand || mc->composetypedcommand) {
-+            ++i;
-+            if (mc->label) {
-+                printf("%d: %s\n", i, mc->label);
-+            } else {
-+                printf("%d: data in '%s' format\n", i, mc->contenttype);
-+            }
-+        }
-+        mc = mc->next;
-+    }
-+    printf("\n\nEnter your choice as a number from 0 to %d: ", i);
-+    fflush(stdout);
-+    fgets(LineBuf, sizeof(LineBuf), stdin);
-+    ans = atoi(LineBuf);
-+    if (ans == 0 || ans == 1) {
-+        char *sdum, CTLineBuf[100];
-+        FILE *fpi, *fpo;
-+	printf("\nIf you want to include non-textual data from a file, enter the file name.\nTo include the output of a command, enter \"|\" followed by the command.\nIf you do not want to include anything, just press ENTER (RETURN).\n> ");
-+        fflush(stdout);
-+        fgets(CTLineBuf, sizeof(CTLineBuf), stdin);
-+        sdum = CTLineBuf+strlen(CTLineBuf) -1;
-+        while (sdum >= CTLineBuf && isspace((unsigned char) *sdum)) {
-+            *sdum = '\0';
-+            --sdum;
-+        }
-+        sdum=CTLineBuf;
-+        while (*sdum && isspace((unsigned char) *sdum)) ++sdum;
-+        if (! *sdum) {
-+            printf("Data insertion cancelled\n");
-+            return(NULL);
-+        }
-+	if (*sdum == '|') {
-+	    fpi = popen(sdum+1, "r");
-+	} else {
-+	    fpi = fopen(sdum, "r");
-+	}
-+        if (!fpi) {
-+            printf("Cannot read %s, data insertion cancelled\n", sdum);
-+            return(NULL);
-+        }
-+        fpo = fdopen(mkstemp(mp->filename), "w");
-+        if (!fpo) {
-+            printf("Cannot open temporary file, data insertion cancelled\n");
-+            return(NULL);
-+        }
-+        (void) TranslateInputToEncodedOutput(fpi, fpo, ENC_NONE, "");
-+	if (*sdum == '|') {
-+	    fclose(fpi);
-+	} else {
-+	    pclose(fpi);
-+	}
-+        fclose(fpo);
-+        mp->istext = 0;
-+        if (ans == 1) {
-+            while (1) {
-+                int ct;
-+                printf("\nEnter the MIME Content-type value for the data from file %s\n    (type '?' for a list of locally-valid content-types): ", sdum);
-+                fflush(stdout);
-+                fgets(LineBuf, sizeof(LineBuf), stdin);
-+		LineBuf[strlen(LineBuf)-1]='\0';
-+                if (index(LineBuf, '/')) {
-+                    char lc[100], *s, AnsBuf[100];
-+                    strcpy(lc, LineBuf);
-+                    for (s=lc; *s; ++s) {
-+                        if (isupper(*s)) *s = tolower(*s);
-+                    }
-+                    if (!strcmp(lc, "text/plain")) break;
-+                    if (!strcmp(lc, "application/octet-stream")) break;
-+                    mc=FirstMailcapEntry;
-+                    while (mc) {
-+                        if (mc->contenttype && index(mc->contenttype, '/') && !index(mc->contenttype, '*') && !lc2strcmp(mc->contenttype, lc)) {
-+                            break;
-+                        }
-+                        mc = mc->next;
-+                    }
-+                    if (mc) break;
-+                    printf("The MIME content-type '%s' is not listed in your local mailcap files,\nand may not be a valid MIME type.  Do you want to use it anyway [no] ? ", LineBuf);
-+                    s = fgets(AnsBuf, sizeof(AnsBuf), stdin);
-+                    while (s && *s && isspace((unsigned char) *s)) ++s;
-+                    if (s && (*s == 'y' || *s == 'Y')) break;
-+                    continue;
-+                }
-+                printf("\nMIME content-type values are type/format pairs, and always include a '/'.\nThe types supported at your site include, but are not limited to:\n\n");
-+                mc=FirstMailcapEntry;
-+                ct = 0;
-+                while (mc) {
-+                    if (mc->contenttype && index(mc->contenttype, '/') && !index(mc->contenttype, '*')) {
-+                        if (ct++) fputs(", ", stdout);
-+                        fputs(mc->contenttype, stdout);
-+                    }
-+                    mc = mc->next;
-+                }
-+                fputs("\n\nThe MIME content-type for file inclusion is 'application/octet-stream'.\n", stdout);
-+            }
-+            mp->content_type = freshcopy(LineBuf);
-+        } else mp->content_type=freshcopy("application/octet-stream");
-+        mp->encoding_type_needed = WhichEncodingForFile(mp->filename, mp->content_type);
-+        printf("Included data in '%s' format\n", mp->content_type);
-+	printf("(continue)\n");
-+        SetTextFlags(mp);
-+        return(mp);
-+    } else if (ans<0 || ans > i) {
-+        printf("Data insertion cancelled\n");
-+        return(NULL);
-+    }
-+    i=2;
-+    mc=FirstMailcapEntry;
-+    while (mc) {
-+        if (mc->composecommand || mc->composetypedcommand) {
-+            if (i == ans) break;
-+            ++i;
-+        }
-+        mc = mc->next;
-+    }
-+    CmdBuf = malloc(CMDSIZE);
-+    if (!CmdBuf) nomemabort();
-+    BuildCommand(CmdBuf, mc->composecommand ? mc->composecommand : mc->composetypedcommand, mp->filename);
-+    printf("Executing: %s\n", CmdBuf);
-+    resultcode = SYSTEM(CmdBuf);
-+    if (resultcode) {
-+        printf("Command execution failed, nothing included\n");
-+        free(CmdBuf);
-+        return(NULL);
-+    }
-+    if (access(mp->filename, R_OK)) {
-+        printf("No file was created, nothing included!\n");
-+        free(CmdBuf);
-+        return(NULL);
-+    }
-+    mp->istext = 0;
-+    if (mc->composecommand) {
-+        mp->content_type = mc->contenttype;
-+        mp->encoding_type_needed = WhichEncodingForFile(mp->filename, mp->content_type);
-+    } else {
-+        char c, LineBuf[1000], *colon, *ctypebuf = NULL, *cencbuf = NULL, *s, *newfilename;
-+        FILE *fp, *fpout;
-+        int inheaders=1, bct=0;
-+
-+        s = LineBuf;
-+        fp = fopen(mp->filename, "r");
-+        if (!fp) {
-+            fprintf(stderr, "Cannot read file %s, no data included.\n", mp->filename);
-+            free(CmdBuf);
-+            return(NULL);
-+        }
-+        while ((c = getc(fp)) != EOF && inheaders) {
-+            if (c == '\n') {
-+                c = getc(fp);
-+                if (c == ' ' || c == '\t') {
-+                    *s++ = ' ';
-+                } else {
-+                    /* actually process the header */
-+                    *s = 0;
-+                    colon = index(LineBuf, ':');
-+                    if (colon) {
-+                        *colon++ = 0;
-+                        for (s=LineBuf; *s; ++s) {
-+                            if (isupper(*s)) *s = tolower(*s);
-+                        }
-+                        if (!strcmp(LineBuf, "content-transfer-encoding")) {
-+                            cencbuf = malloc(1+strlen(colon));
-+                            if (!cencbuf) nomemabort();
-+                            strcpy(cencbuf, colon);
-+                        } else if (!strcmp(LineBuf, "content-type")) {
-+                            ctypebuf = malloc(1+strlen(colon));
-+                            if (!ctypebuf) nomemabort();
-+                            strcpy(ctypebuf, colon);
-+                        }
-+                    }
-+                    if (c == '\n') {
-+                        inheaders = 0;
-+                        break;
-+                    }
-+                    ungetc(c, fp);
-+                    s = LineBuf; /* start over */
-+                }
-+            } else {
-+                *s++ = c;
-+            }
-+        }
-+        if (!ctypebuf) {
-+            fprintf(stderr, "The command (%s) did not return a content-type value, so no data could be included.\n", CmdBuf);
-+            free(CmdBuf);
-+            return(NULL);
-+        }
-+        mp->content_type = ctypebuf;
-+        if (cencbuf) {
-+            while (*cencbuf && isspace(*cencbuf)) ++cencbuf;
-+            for (s=cencbuf; *s; ++s) {
-+                if (isupper(*s)) *s = tolower(*s);
-+            }
-+            if (!strncmp(cencbuf, "base64", 6)) {
-+                mp->encoding_type_needed = ENC_B64;
-+            } else if (!strncmp(cencbuf, "quoted-printable", 16)) {
-+                mp->encoding_type_needed = ENC_QP;
-+            } else {
-+                fprintf(stderr, "The command (%s) returned an unrecognized content-transfer-encoding value, so no data could be included.\n", CmdBuf);
-+                free(CmdBuf);
-+                return(NULL);
-+            }
-+        } else {
-+            mp->encoding_type_needed = ENC_NONE;
-+        }
-+        newfilename = tmpname();
-+        fpout = fdopen(mkstemp(newfilename), "w");
-+        if (!fpout) {
-+            fprintf(stderr, "Cannot open file %s for writing, no data included.\n", newfilename);
-+            free(CmdBuf);
-+            return(NULL);
-+        }
-+        switch(mp->encoding_type_needed) {
-+            case ENC_B64:
-+                from64(fp, fpout, NULL, &bct, 0);
-+                break;
-+            case ENC_QP:
-+                fromqp(fp, fpout, NULL, &bct);
-+                break;
-+            default:
-+                while ((c = getc(fp)) != EOF) {
-+                    putc(c, fpout);
-+                }
-+                break;
-+        }
-+        fclose(fp);
-+        fclose(fpout);
-+        unlink(mp->filename);
-+        mp->filename = newfilename;
-+    }
-+    SetTextFlags(mp);
-+    printf("Included data in '%s' format\n", mc->contenttype);
-+    printf("(continue)\n");
-+    free(CmdBuf);
-+    return(mp);
-+}
-+
-+SetTextFlags(mp)
-+struct mailpart *mp;
-+{
-+    if (!lc2strncmp(mp->content_type, "text/", 5)) {
-+        mp->istext = 1;
-+        if (!lc2strncmp(mp->content_type, "text/richtext", 13)) {
-+            mp->isrich = 1;
-+        }
-+    }
-+}
-+
-+WhichEncodingForFile(fname, ctype)
-+char *fname, *ctype;
-+{
-+    int c, linesize=0, total=0, unsafechars=0, longlines=0;
-+    char *s;
-+    FILE *fp = fopen(fname, "r");
-+    if (!fp) {
-+        /* If the stupid editing program forks, this actually will do a 
-+              reasonable thing as long as it saves the file before the mail is sent */
-+        return(ENC_B64); /* safest */
-+    }
-+    while ((c = getc(fp)) != EOF) {
-+        if (c>127) ++unsafechars;
-+        ++total;
-+        if (c == '\n') {
-+            if (linesize > 79) ++longlines;
-+            linesize = 0;
-+        } else ++linesize;
-+        if (total>1000 && (longlines || unsafechars)) break;
-+    }
-+    fclose(fp);
-+    if (longlines || unsafechars) {
-+        for (s=ctype; *s; ++s) if (isupper((unsigned char) *s)) *s = tolower((unsigned char) *s);
-+        if (!strncmp(ctype, "image/", 6)
-+             || !strncmp(ctype, "audio/", 6)
-+             || !strncmp(ctype, "application/octet-stream", 24)
-+             || !strncmp(ctype, "video/", 6)) {
-+            return(ENC_B64);
-+        }
-+        if (!unsafechars) return(ENC_QP);
-+
-+        return((total/unsafechars < 16) ? ENC_B64 : ENC_QP);
-+    }
-+    return(ENC_NONE);
-+}
-+
-+BuildCommand(Buf, controlstring, TmpFileName)
-+char *Buf, *controlstring, *TmpFileName;
-+{
-+    char *from, *to;
-+    int prefixed = 0;
-+    int NamedFile=0;
-+
-+    for (from=controlstring, to=Buf; *from; ++from) {
-+        if (prefixed) {
-+            prefixed = 0;
-+            switch(*from) {
-+                case '%':
-+                    *to++ = '%';
-+                    break;
-+                case 's':
-+                    if (TmpFileName) {
-+                        strcpy(to, TmpFileName);
-+                        to += strlen(TmpFileName);
-+                        ++NamedFile;
-+                    }
-+                    break;
-+                default:
-+                    fprintf(stderr, "Ignoring unrecognized format code in mailcap file: %%<%c\n", *from);
-+                    break;
-+            }
-+        } else if (*from == '%') {
-+            prefixed = 1;
-+        } else {
-+            *to++ = *from;
-+        }
-+    }
-+    *to = '\0';
-+    if (!NamedFile) {
-+        strcat(Buf, " > ");
-+        strcat(Buf, TmpFileName);
-+    }
-+}
-+
-+CtypeMatch(ctype, pat)
-+char *ctype, *pat;
-+{
-+    int len;
-+    char *s;
-+    for (s=ctype; *s; ++s) if (isupper((unsigned char) *s)) *s = tolower((unsigned char) *s);
-+    for (s=pat; *s; ++s) if (isupper((unsigned char) *s)) *s = tolower((unsigned char) *s);
-+    if (!strcmp(ctype, pat)) {
-+        return(1); /* exact match, case-insensitive */
-+    }
-+    len = strlen(pat);
-+    if ((pat[--len] == '*')
-+         && (pat[--len] == '/')
-+         && (!strncmp(ctype, pat, len))
-+         && (ctype[len] == '/')){
-+        /* wildcard match */
-+        return(1);
-+    }
-+    return(0);
-+}
-+
-+EditCurrentMessage(UseVisual)
-+int UseVisual;
-+{
-+    char *editor = NULL;
-+    char *CmdBuf, *CmdBuf2, LineBuf[100];
-+    struct mailpart *mp, *lastmp=NULL;
-+    struct MailcapEntry *mc;
-+    int partct=1, ans;
-+
-+    CmdBuf = malloc(CMDSIZE);
-+    CmdBuf2 = malloc(CMDSIZE);
-+    if (!CmdBuf || !CmdBuf2) nomemabort();
-+    if (!PartEndsWithNewline) {
-+        putc('\n', fpout);
-+        PartEndsWithNewline=1;
-+    }
-+    fclose(fpout);
-+    if (UseVisual) editor = getenv("VISUAL");
-+    if (!editor) editor = getenv("EDITOR");
-+    if (!editor) editor = DEFAULT_EDITOR;
-+    if (!FirstPart->next) {
-+        /* Only one part */
-+        snprintf(CmdBuf, sizeof(CmdBuf), "%s %s", editor, FirstPart->filename);
-+        printf("Executing: %s\n", CmdBuf);
-+        SYSTEM(CmdBuf);
-+        if ((FirstPart->istext || FirstPart->isrich) &&
-+             FirstPart->encoding_type_needed == ENC_NONE &&
-+             ContainsEightBitChar(FirstPart->filename)) {
-+            FirstPart->encoding_type_needed = ENC_QP;
-+        }
-+        fpout = fopen(FirstPart->filename, "a");
-+        free(CmdBuf);
-+        free(CmdBuf2);
-+        return;
-+    }
-+    lastmp = mp = FirstPart;
-+    while (mp) {
-+        printf("Part #%d is of type '%s'.\n", partct, mp->content_type);
-+        snprintf(CmdBuf, sizeof(CmdBuf), "%s %s", editor, mp->filename);
-+        if (mp->mc && mp->mc->editcommand) {
-+            BuildCommand(CmdBuf2, mp->mc->editcommand, mp->filename);
-+        } else {
-+            mc = FirstMailcapEntry;
-+            while (mc) {
-+                if (mc->editcommand && CtypeMatch(mp->content_type, mc->contenttype)) {
-+                    break;
-+                }
-+                mc = mc->next;
-+            }
-+            if (mc) {
-+                BuildCommand(CmdBuf2, mc->editcommand, mp->filename);
-+            } else {
-+                CmdBuf2[0] = '\0';
-+            }
-+        }
-+        if (CmdBuf2[0]) {
-+            printf("Which command do you want to use to edit it?\n\n");
-+            printf("1: %s\n", CmdBuf2);
-+            printf("2: %s\n", CmdBuf);
-+            printf("\n\nEnter 1 or 2, or 0 to not edit it: ");
-+            fflush(stdout);
-+            fgets(LineBuf, sizeof(LineBuf), stdin);
-+            ans = atoi(LineBuf);
-+        } else ans = 2;
-+        if (ans == 1) {
-+            printf("Executing: %s\n", CmdBuf2);
-+            SYSTEM(CmdBuf2);
-+        } else if (ans == 2) {
-+            printf("Executing: %s\n", CmdBuf);
-+            SYSTEM(CmdBuf);
-+        }
-+        if ((mp->istext || mp->isrich) &&
-+             mp->encoding_type_needed == ENC_NONE &&
-+             ContainsEightBitChar(mp->filename)) {
-+            mp->encoding_type_needed = ENC_QP;
-+        }
-+        ++partct;
-+        lastmp = mp;
-+        mp = mp->next;
-+    }
-+    fpout = fopen(lastmp->filename, "a");
-+    free(CmdBuf);
-+    free(CmdBuf2);
-+}
-+
-+
-+ProcessInitFiles() {
-+    char fname[FILE_NAME_SIZE];
-+
-+    ProcessOneMailRC("/usr/lib/Mail.rc", 0);
-+    snprintf(fname, sizeof(fname), "%s/.mailrc", gethome());
-+    ProcessOneMailRC(fname, 0);
-+    snprintf(fname, sizeof(fname), "%s/.AMS_aliases", gethome());
-+    ProcessOneMailRC(fname, 1);
-+}
-+
-+char *
-+NextAliasLine(LineBuf, LineAlloced, LineCount, fp, IsAndrew)
-+char *LineBuf;
-+int *LineAlloced, *LineCount;
-+FILE *fp;
-+int IsAndrew;
-+{
-+    char *sbuf;
-+    sbuf = malloc(MAX_LINELENGTH);
-+    if (!sbuf) nomemabort();
-+    if (!LineBuf) {
-+        *LineAlloced = MAX_LINELENGTH + MAX_LINELENGTH;
-+        LineBuf = malloc(*LineAlloced);
-+        if (!LineBuf) nomemabort();
-+    }
-+    *LineBuf = 0;
-+    *LineCount = 0;
-+    while (1) {
-+        if (fgets(sbuf, MAX_LINELENGTH, fp) == NULL) {
-+            return(LineBuf);
-+        }
-+        *LineCount += strlen(sbuf);
-+        if (*LineCount >= *LineAlloced) {
-+            *LineAlloced += MAX_LINELENGTH;
-+            LineBuf = realloc(LineBuf, *LineAlloced);
-+            if (!LineBuf) nomemabort();
-+        }
-+        strcat(LineBuf, sbuf);
-+        if (IsAndrew || LineBuf[*LineCount - 2] != '\\') return(LineBuf);
-+        /* The -2 got us past the newline. */
-+        LineBuf[*LineCount - 2] = ' ';
-+        *LineCount -= 1;
-+        LineBuf[*LineCount] = '\0';
-+    }
-+}
-+
-+ProcessOneMailRC(fname, IsAndrew)
-+char *fname;
-+int IsAndrew;
-+{
-+    FILE *fp;
-+    char *LineBuf = NULL, *sdum;
-+    int LineAlloced = 0, LineCount = 0;
-+
-+    fp = fopen(fname, "r");
-+    if (!fp) return;
-+    do {
-+        LineBuf=NextAliasLine(LineBuf, &LineAlloced, &LineCount, fp, IsAndrew);
-+        if (LineCount == 0) continue;
-+        if (IsAndrew && LineBuf[0] == '#') continue;
-+        for (sdum = LineBuf; *sdum; ++sdum) {
-+            if (*sdum == ' ') break; /* only map first word to lower case */
-+            if (isupper((unsigned char) *sdum)) *sdum = tolower((unsigned char) *sdum);
-+        }
-+        if (IsAndrew) {
-+            HandleAliasCommand(LineBuf);
-+        } else if (!strncmp(LineBuf, "set ", 4)) {
-+            HandleSetCommand(LineBuf+4, 1);
-+        } else if (!strncmp(LineBuf, "unset ", 6)) {
-+            HandleSetCommand(LineBuf+6, 0);
-+        } else if (!strncmp(LineBuf, "alias ", 6)) {
-+            HandleAliasCommand(LineBuf+6);
-+        } else {
-+            /* ignore */
-+        }
-+    } while (LineCount != 0);
-+    free(LineBuf);
-+    fclose(fp);
-+}
-+
-+HandleSetCommand(cmd, DoSet)
-+char *cmd;
-+int DoSet;
-+{
-+    char *s;
-+    int i;
-+
-+    while (*cmd) {
-+        while (*cmd && isspace((unsigned char) *cmd)) ++cmd;
-+        for (s=cmd; *s && !isspace((unsigned char) *s); ++s) {;}
-+        *s++ = '\0';
-+        if (!strcmp(cmd, "askcc")) {
-+            V_askcc = DoSet;
-+        } else if (!strcmp(cmd, "dot")) {
-+            V_dot = DoSet;
-+        } else if (!strcmp(cmd, "ignore")) {
-+            V_ignore = DoSet;
-+        } else if (!strcmp(cmd, "verbose")) {
-+            V_verbose = DoSet;
-+        } else if (!strcmp(cmd, "quiet")) {
-+            V_quiet = DoSet;
-+        } else if (!strcmp(cmd, "keepblind")) {
-+            V_keepblind = DoSet;
-+        } else if (!strcmp(cmd, "commasonly")) {
-+            V_commasonly = DoSet;
-+        } else if (!strncmp(cmd, "splitsize ", 9)) {
-+            i = atoi(cmd+10);
-+            if (i < MINCHUNKSIZE) {
-+                fprintf(stderr, "Ignoring splitsize mailrc setting of %d -- the minimum value is %d\n", i, MINCHUNKSIZE);
-+            } else {
-+                SplitSize = i;
-+            }
-+        } else {
-+            /* ignore */
-+        }
-+        cmd = s;;
-+    }
-+}
-+
-+struct alias {
-+    char *shortname, *longname;
-+    struct alias *next;
-+} *FirstAlias = NULL;
-+
-+HandleAliasCommand(aliasline)
-+char *aliasline;
-+{
-+    struct alias *tmpalias;
-+    char *s, *s2;
-+    int len = strlen(aliasline);
-+
-+    if (aliasline[len - 1] == '\n') {
-+        aliasline[len - 1] = '\0';
-+    }
-+    tmpalias = (struct alias *) malloc(sizeof (struct alias));
-+    s = malloc(len + 1);
-+    if (!s || !tmpalias) nomemabort();
-+    strcpy(s, aliasline);
-+    while (*s && isspace((unsigned char) *s)) { ++s;}
-+    for (s2=s; *s2 && !isspace((unsigned char) *s2); ++s2) {;}
-+    if (!*s2) {
-+        if (s != s2) printf("mailto: ignoring bad alias line in init file: %s\n", aliasline);
-+        free(s);
-+        free(tmpalias);
-+        return;
-+    }
-+    *s2++ = '\0';
-+    tmpalias->shortname = s;
-+    tmpalias->longname = s2;
-+    tmpalias->next = FirstAlias;
-+    FirstAlias = tmpalias;
-+}
-+
-+EmitHeader(fp, hdr, body)
-+FILE *fp;
-+char *hdr;
-+char *body;
-+{
-+    fputs(hdr, fp);
-+    fputs(": ", fp);
-+    HeaderFputs(body, fp, hdr);
-+    fputs("\n", fp);
-+/*    fprintf(fp, "%s: %s\n", hdr, body ? body : ""); */
-+}
-+
-+char *
-+firstbad(s)
-+char *s;
-+{
-+    char *dum;
-+    for (dum=s; *dum; ++dum) {
-+        if (!isascii(*dum) || iscntrl(*dum)) {
-+            return(dum);
-+        }
-+    }
-+    return(NULL);
-+}
-+
-+char *
-+firstgood(s)
-+char *s;
-+{
-+    char *dum;
-+    for (dum=s; *dum; ++dum) {
-+        if (isascii(*dum) && !iscntrl(*dum)) {
-+            return(dum);
-+        }
-+    }
-+    return(NULL);
-+}
-+
-+HeaderFputs(s, fp, hdr)
-+char *s;
-+FILE *fp;
-+char *hdr;
-+{
-+    char *firstnonascii, *firstascii;
-+
-+    if (!s) return;
-+    firstnonascii=firstbad(s);
-+    if (firstnonascii) {
-+        if (!strcmp(CharacterSet, "us-ascii")) {
-+            fprintf(stderr, "Warning:  The prevailing character set is ASCII.  Your %s header has\nnon-ASCII or non-printing ASCII characters which may be unreadable.\n", hdr);
-+        }
-+        while (firstnonascii) {
-+            while (s < firstnonascii) {
-+                putc(*s, fp);
-+                ++s;
-+            }
-+            firstascii=firstgood(s);
-+            if (!firstascii) firstascii = s+strlen(s);
-+            if ((firstascii - s) > 25) firstascii = s+25; /* Short encoded words */
-+            /* general format is =?charset?B or Q?encoded data?= */
-+            fprintf(fp, "=?%s?Q?", CharacterSet);
-+            while (s < firstascii) {
-+                PutQP(*s, fp);
-+                ++s;
-+            }
-+            fputs("?= ", fp); /* close encoded word */
-+            firstnonascii=firstbad(s);
-+        }
-+        while (*s) {
-+            putc(*s, fp);
-+            ++s;
-+        }
-+    } else {
-+        fputs(s, fp);
-+    }
-+}
-+
-+static char basis_hex[] = "0123456789ABCDEF";
-+
-+PutQP(c, fp)
-+unsigned char c;
-+FILE *fp;
-+{
-+    putc('=', fp);
-+    putc(basis_hex[c>>4], fp);
-+    putc(basis_hex[c&0xF], fp);
-+}
-+
-+EmitHeaderWithAliases(fp, hdr, names)
-+FILE *fp;
-+char *hdr;
-+char *names;
-+{
-+    fputs(hdr, fp);
-+    fputs(": ", fp);
-+    EmitAddresses(fp, names, hdr);
-+    fputs("\n", fp);
-+}
-+
-+EmitAddresses(fp, names, hdr)
-+FILE *fp;
-+char *names;
-+char *hdr;
-+{
-+    char *s;
-+    while (names) {
-+        s= index(names, ',');
-+        if (s) *s = '\0';
-+        DeAlias(names, fp, hdr);
-+        if (s) {
-+            *s++ = ',';
-+            fputs(",\n\t", fp);
-+        }
-+        names = s;
-+    }
-+}
-+
-+DeAlias(name, fp, hdr)
-+char *name;
-+FILE *fp;
-+char *hdr;
-+{
-+    struct alias *tmpalias;
-+    char *end, savechar;
-+
-+    while (isspace((unsigned char) *name)) ++name;
-+    end = name+strlen(name)-1;
-+    while (isspace((unsigned char) *end)) --end;
-+    ++end;
-+    savechar = *end;
-+    for (tmpalias=FirstAlias; tmpalias; tmpalias = tmpalias->next) {
-+        if (!strcmp(tmpalias->shortname, name)) { 
-+/*        if (!lc2strcmp(name, tmpalias->shortname)) { */
-+            *end = savechar;
-+            EmitAddresses(fp, tmpalias->longname, hdr);
-+            return;
-+        }
-+    }
-+    *end = savechar;
-+    HeaderFputs(name, fp, hdr);
-+}
-+
-+
-+WriteCtypeNicely(fp, ct)
-+FILE *fp;
-+char *ct;
-+{
-+    char *semi, *slash, *eq, *s;
-+
-+    for (s = ct; *s; ++s) {
-+        if (*s == '\n') *s = ' ';
-+    }
-+    semi = (char *) index(ct, ';');
-+    if (semi) *semi = '\0';
-+    slash = (char *) index(ct, '/');
-+    fputs(ct, fp);
-+    if (!slash) fputs("/unknown", fp);
-+    while (semi) {
-+        ct = semi + 1;
-+        *semi = ';';
-+        semi = (char *) index(ct, ';');
-+        if (semi) *semi = '\0';
-+        eq = (char *) index(ct, '=');
-+        if (eq) *eq = '\0';
-+        fputs(";\n\t", fp);
-+        while (isspace((unsigned char) *ct)) ++ct;
-+        fputs(ct, fp);
-+        if (eq) {
-+            s = eq;
-+            fputs("=", fp);
-+            ++s;
-+            while (isspace((unsigned char) *s)) ++s;
-+            fputsquoting(s, fp);
-+            *eq = '=';
-+        }
-+    }
-+}
-+
-+fputsquoting(s, fp)
-+char *s;
-+FILE *fp;
-+{
-+    char *end = s + strlen(s) - 1;
-+    while (isspace((unsigned char) *end) && end > s) --end;
-+    if (*s == '\"') {
-+        putc(*s, fp);
-+        while (*++s) {
-+            if (*s == '\"') break; /* MAY TERMINATE EARLY! */
-+            if (*s == '\\') {
-+                putc(*s, fp);
-+                ++s; /* Don't check this next char */
-+                if (!*s) break;
-+            }
-+            putc(*s, fp);
-+        }
-+        putc('\"', fp);
-+    } else {
-+        putc('\"', fp);
-+        putc(*s, fp);
-+        while (*++s) {
-+            if (*s == '\"' || *s == '\\') {
-+                putc('\\', fp);
-+            }
-+            putc(*s, fp);
-+        }
-+        putc('\"', fp);
-+    }
-+}
-+        
-+        
-+controlputc(c)
-+char c;
-+{
-+    fputc(c, stdout);
-+}
-+
-+/* Do the equivalent of an fputs for the terminal escape stuff */
-+
-+tfputs(s)
-+char *s;
-+{
-+    tputs(s, 1, controlputc);
-+}
-+
-+ContainsEightBitChar(fname)
-+char *fname;
-+{
-+    int c, eightBitSeen = 0;
-+    FILE *fp = fopen(fname, "r");
-+    if (!fp) {
-+        /* If the stupid editing program forks, this actually will do a
-+              reasonable thing as long as it saves the file before the mail is sent */
-+        return(1); /* safest */
-+    }
-+    while ((c = getc(fp)) != EOF) {
-+        if (c>127) {
-+            eightBitSeen = 1;
-+            break;
-+        }
-+    }
-+    fclose(fp);
-+    return(eightBitSeen);
-+}
-+
-+SwitchToEuropean() {
-+    printf("WARNING:  You have entered 8-bit characters in what is supposed to be\n");
-+    printf("plain ASCII text.  If you are using a non-ASCII character set, you should\n");
-+    printf("declare this to be the case with the MM_CHARSET environment variable.\n");
-+    printf("For now, I am assuming you are using the iso-8859-1 character set,\n");
-+    printf("but this may be false.\n");
-+    CharacterSet = malloc(12);
-+    if (!CharacterSet) nomemabort();
-+    strcpy(CharacterSet, "iso-8859-1");
-+}
-+
-+    
---- metamail-2.7.orig/src/metamail/Makefile.am
-+++ metamail-2.7/src/metamail/Makefile.am
-@@ -0,0 +1,21 @@
-+MAINTAINERCLEANFILES    = Makefile.in
-+
-+CFLAGS			= -lncurses
-+
-+INCLUDES                = -I$(top_builddir) -I$(top_builddir)/metamail \
-+                        -I$(top_srcdir) -I$(top_srcdir)/metamail
-+
-+bin_PROGRAMS            = metamail mimencode mailto splitmail
-+
-+metamail_SOURCES	= metamail.c codes.c uue.c shared.c environment.c \
-+mailcap.c tmpfile.c
-+metamail_LDADD		= $(top_builddir)/metamail/libmetamail.la
-+
-+mimencode_SOURCES	= mimencode.c codes.c
-+mimencode_LDADD		= $(top_builddir)/metamail/libmetamail.la
-+
-+mailto_SOURCES		= mailto.c codes.c shared.c
-+mailto_LDADD		= $(top_builddir)/metamail/libmetamail.la
-+
-+splitmail_SOURCES	= splitmail.c shared.c
-+splitmail_LDADD		= $(top_builddir)/metamail/libmetamail.la
---- metamail-2.7.orig/src/metamail/Makefile.in
-+++ metamail-2.7/src/metamail/Makefile.in
-@@ -0,0 +1,399 @@
-+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+
-+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
-+bindir = @bindir@
-+sbindir = @sbindir@
-+libexecdir = @libexecdir@
-+datadir = @datadir@
-+sysconfdir = @sysconfdir@
-+sharedstatedir = @sharedstatedir@
-+localstatedir = @localstatedir@
-+libdir = @libdir@
-+infodir = @infodir@
-+mandir = @mandir@
-+includedir = @includedir@
-+oldincludedir = /usr/include
-+
-+DESTDIR =
-+
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+
-+top_builddir = ../..
-+
-+ACLOCAL = @ACLOCAL@
-+AUTOCONF = @AUTOCONF@
-+AUTOMAKE = @AUTOMAKE@
-+AUTOHEADER = @AUTOHEADER@
-+
-+INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+transform = @program_transform_name@
-+
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+host_alias = @host_alias@
-+host_triplet = @host@
-+AS = @AS@
-+CATCOMMAND = @CATCOMMAND@
-+CC = @CC@
-+DLLTOOL = @DLLTOOL@
-+ECHO = @ECHO@
-+EXEEXT = @EXEEXT@
-+LIBTOOL = @LIBTOOL@
-+LIBTOOL_DEPS = @LIBTOOL_DEPS@
-+LN_S = @LN_S@
-+LPRCOMMAND = @LPRCOMMAND@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAKEINFO = @MAKEINFO@
-+OBJDUMP = @OBJDUMP@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+RANLIB = @RANLIB@
-+STRIP = @STRIP@
-+VERSION = @VERSION@
-+ac_aux_dir = @ac_aux_dir@
-+
-+MAINTAINERCLEANFILES = Makefile.in
-+
-+CFLAGS = -lncurses
-+
-+INCLUDES = -I$(top_builddir) -I$(top_builddir)/metamail                         -I$(top_srcdir) -I$(top_srcdir)/metamail
-+
-+
-+bin_PROGRAMS = metamail mimencode mailto splitmail
-+
-+metamail_SOURCES = metamail.c codes.c uue.c shared.c environment.c mailcap.c tmpfile.c
-+
-+metamail_LDADD = $(top_builddir)/metamail/libmetamail.la
-+
-+mimencode_SOURCES = mimencode.c codes.c
-+mimencode_LDADD = $(top_builddir)/metamail/libmetamail.la
-+
-+mailto_SOURCES = mailto.c codes.c shared.c
-+mailto_LDADD = $(top_builddir)/metamail/libmetamail.la
-+
-+splitmail_SOURCES = splitmail.c shared.c
-+splitmail_LDADD = $(top_builddir)/metamail/libmetamail.la
-+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-+CONFIG_HEADER = ../../metamail/config.h
-+CONFIG_CLEAN_FILES = 
-+bin_PROGRAMS =  metamail$(EXEEXT) mimencode$(EXEEXT) mailto$(EXEEXT) \
-+splitmail$(EXEEXT)
-+PROGRAMS =  $(bin_PROGRAMS)
-+
-+
-+DEFS = @DEFS@ -I. -I$(srcdir) -I../../metamail
-+CPPFLAGS = @CPPFLAGS@
-+LDFLAGS = @LDFLAGS@
-+LIBS = @LIBS@
-+metamail_OBJECTS =  metamail.$(OBJEXT) codes.$(OBJEXT) uue.$(OBJEXT) \
-+shared.$(OBJEXT) environment.$(OBJEXT) mailcap.$(OBJEXT) \
-+tmpfile.$(OBJEXT)
-+metamail_DEPENDENCIES =  $(top_builddir)/metamail/libmetamail.la
-+metamail_LDFLAGS = 
-+mimencode_OBJECTS =  mimencode.$(OBJEXT) codes.$(OBJEXT)
-+mimencode_DEPENDENCIES =  $(top_builddir)/metamail/libmetamail.la
-+mimencode_LDFLAGS = 
-+mailto_OBJECTS =  mailto.$(OBJEXT) codes.$(OBJEXT) shared.$(OBJEXT)
-+mailto_DEPENDENCIES =  $(top_builddir)/metamail/libmetamail.la
-+mailto_LDFLAGS = 
-+splitmail_OBJECTS =  splitmail.$(OBJEXT) shared.$(OBJEXT)
-+splitmail_DEPENDENCIES =  $(top_builddir)/metamail/libmetamail.la
-+splitmail_LDFLAGS = 
-+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-+DIST_COMMON =  Makefile.am Makefile.in
-+
-+
-+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-+
-+TAR = tar
-+GZIP_ENV = --best
-+DEP_FILES =  .deps/codes.P .deps/environment.P .deps/mailcap.P \
-+.deps/mailto.P .deps/metamail.P .deps/mimencode.P .deps/shared.P \
-+.deps/splitmail.P .deps/tmpfile.P .deps/uue.P
-+SOURCES = $(metamail_SOURCES) $(mimencode_SOURCES) $(mailto_SOURCES) $(splitmail_SOURCES)
-+OBJECTS = $(metamail_OBJECTS) $(mimencode_OBJECTS) $(mailto_OBJECTS) $(splitmail_OBJECTS)
-+
-+all: all-redirect
-+.SUFFIXES:
-+.SUFFIXES: .S .c .lo .o .obj .s
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-+	cd $(top_srcdir) && $(AUTOMAKE) --foreign src/metamail/Makefile
-+
-+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-+	cd $(top_builddir) \
-+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
-+
-+mostlyclean-binPROGRAMS:
-+
-+clean-binPROGRAMS:
-+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-+
-+distclean-binPROGRAMS:
-+
-+maintainer-clean-binPROGRAMS:
-+
-+install-binPROGRAMS: $(bin_PROGRAMS)
-+	@$(NORMAL_INSTALL)
-+	$(mkinstalldirs) $(DESTDIR)$(bindir)
-+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-+	  if test -f $$p; then \
-+	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-+	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+	  else :; fi; \
-+	done
-+
-+uninstall-binPROGRAMS:
-+	@$(NORMAL_UNINSTALL)
-+	list='$(bin_PROGRAMS)'; for p in $$list; do \
-+	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+	done
-+
-+# FIXME: We should only use cygpath when building on Windows,
-+# and only if it is available.
-+.c.obj:
-+	$(COMPILE) -c `cygpath -w $<`
-+
-+.s.o:
-+	$(COMPILE) -c $<
-+
-+.S.o:
-+	$(COMPILE) -c $<
-+
-+mostlyclean-compile:
-+	-rm -f *.o core *.core
-+	-rm -f *.$(OBJEXT)
-+
-+clean-compile:
-+
-+distclean-compile:
-+	-rm -f *.tab.c
-+
-+maintainer-clean-compile:
-+
-+.s.lo:
-+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+
-+.S.lo:
-+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+
-+maintainer-clean-libtool:
-+
-+metamail$(EXEEXT): $(metamail_OBJECTS) $(metamail_DEPENDENCIES)
-+	@rm -f metamail$(EXEEXT)
-+	$(LINK) $(metamail_LDFLAGS) $(metamail_OBJECTS) $(metamail_LDADD) $(LIBS)
-+
-+mimencode$(EXEEXT): $(mimencode_OBJECTS) $(mimencode_DEPENDENCIES)
-+	@rm -f mimencode$(EXEEXT)
-+	$(LINK) $(mimencode_LDFLAGS) $(mimencode_OBJECTS) $(mimencode_LDADD) $(LIBS)
-+
-+mailto$(EXEEXT): $(mailto_OBJECTS) $(mailto_DEPENDENCIES)
-+	@rm -f mailto$(EXEEXT)
-+	$(LINK) $(mailto_LDFLAGS) $(mailto_OBJECTS) $(mailto_LDADD) $(LIBS)
-+
-+splitmail$(EXEEXT): $(splitmail_OBJECTS) $(splitmail_DEPENDENCIES)
-+	@rm -f splitmail$(EXEEXT)
-+	$(LINK) $(splitmail_LDFLAGS) $(splitmail_OBJECTS) $(splitmail_LDADD) $(LIBS)
-+
-+tags: TAGS
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP)
-+	list='$(SOURCES) $(HEADERS)'; \
-+	unique=`for i in $$list; do echo $$i; done | \
-+	  awk '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	here=`pwd` && cd $(srcdir) \
-+	  && mkid -f$$here/ID $$unique $(LISP)
-+
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)'; \
-+	unique=`for i in $$list; do echo $$i; done | \
-+	  awk '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-+	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
-+
-+mostlyclean-tags:
-+
-+clean-tags:
-+
-+distclean-tags:
-+	-rm -f TAGS ID
-+
-+maintainer-clean-tags:
-+
-+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-+
-+subdir = src/metamail
-+
-+distdir: $(DISTFILES)
-+	here=`cd $(top_builddir) && pwd`; \
-+	top_distdir=`cd $(top_distdir) && pwd`; \
-+	distdir=`cd $(distdir) && pwd`; \
-+	cd $(top_srcdir) \
-+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign src/metamail/Makefile
-+	@for file in $(DISTFILES); do \
-+	  d=$(srcdir); \
-+	  if test -d $$d/$$file; then \
-+	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	  fi; \
-+	done
-+
-+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-+
-+-include $(DEP_FILES)
-+
-+mostlyclean-depend:
-+
-+clean-depend:
-+
-+distclean-depend:
-+	-rm -rf .deps
-+
-+maintainer-clean-depend:
-+
-+%.o: %.c
-+	@echo '$(COMPILE) -c $<'; \
-+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm .deps/$(*F).pp
-+
-+%.lo: %.c
-+	@echo '$(LTCOMPILE) -c $<'; \
-+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-+	  < .deps/$(*F).pp > .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm -f .deps/$(*F).pp
-+info-am:
-+info: info-am
-+dvi-am:
-+dvi: dvi-am
-+check-am: all-am
-+check: check-am
-+installcheck-am:
-+installcheck: installcheck-am
-+install-exec-am: install-binPROGRAMS
-+install-exec: install-exec-am
-+
-+install-data-am:
-+install-data: install-data-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+install: install-am
-+uninstall-am: uninstall-binPROGRAMS
-+uninstall: uninstall-am
-+all-am: Makefile $(PROGRAMS)
-+all-redirect: all-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-+installdirs:
-+	$(mkinstalldirs)  $(DESTDIR)$(bindir)
-+
-+
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+
-+maintainer-clean-generic:
-+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-+mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-compile \
-+		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
-+		mostlyclean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+clean-am:  clean-binPROGRAMS clean-compile clean-libtool clean-tags \
-+		clean-depend clean-generic mostlyclean-am
-+
-+clean: clean-am
-+
-+distclean-am:  distclean-binPROGRAMS distclean-compile distclean-libtool \
-+		distclean-tags distclean-depend distclean-generic \
-+		clean-am
-+	-rm -f libtool
-+
-+distclean: distclean-am
-+
-+maintainer-clean-am:  maintainer-clean-binPROGRAMS \
-+		maintainer-clean-compile maintainer-clean-libtool \
-+		maintainer-clean-tags maintainer-clean-depend \
-+		maintainer-clean-generic distclean-am
-+	@echo "This command is intended for maintainers to use;"
-+	@echo "it deletes files that may require special tools to rebuild."
-+
-+maintainer-clean: maintainer-clean-am
-+
-+.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
-+maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
-+mostlyclean-compile distclean-compile clean-compile \
-+maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-+clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
-+distclean-tags clean-tags maintainer-clean-tags distdir \
-+mostlyclean-depend distclean-depend clean-depend \
-+maintainer-clean-depend info-am info dvi-am dvi check check-am \
-+installcheck-am installcheck install-exec-am install-exec \
-+install-data-am install-data install-am install uninstall-am uninstall \
-+all-redirect all-am all installdirs mostlyclean-generic \
-+distclean-generic clean-generic maintainer-clean-generic clean \
-+mostlyclean distclean maintainer-clean
-+
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
---- metamail-2.7.orig/src/metamail/output
-+++ metamail-2.7/src/metamail/output
-@@ -0,0 +1,428 @@
-+PWD=/home/mike/debian/metamail-2.7/src/metamail
-+XAUTHORITY=/home/mike/.Xauthority
-+WINDOWID=20971534
-+MM_SUMMARY=7  (from Stephan Wright <stephan.wright@chello.at> )
-+MM_HEADERS=
-+From stephan.wright@chello.at Wed Jan 17 00:54:06 2001
-+Return-path: <stephan.wright@chello.at>
-+Envelope-to: mike@localhost
-+Delivery-date: Wed, 17 Jan 2001 00:54:06 +0100
-+Received: from localhost ([127.0.0.1] ident=mail)
-+	by skair.in.natoka.at with esmtp (Exim 3.20 #1 (Debian))
-+	id 14IfvR-0000eJ-00
-+	for <mike@localhost>; Wed, 17 Jan 2001 00:54:05 +0100
-+Received: from stud3.tuwien.ac.at [193.170.75.13]
-+	by localhost with POP3 (fetchmail-5.5.3)
-+	for mike@localhost (single-drop); Wed, 17 Jan 2001 00:54:05 +0100 (CET)
-+Received: from mr.tuwien.ac.at (mr.tuwien.ac.at [128.130.2.10])
-+	by stud3.tuwien.ac.at (8.9.3 (PHNE_18979)/8.9.3) with ESMTP id AAA08182;
-+	Wed, 17 Jan 2001 00:39:08 +0100 (MET)
-+Received: from viemta06.chello.at (viemta06.chello.at [195.34.133.56])
-+	by mr.tuwien.ac.at (8.11.1/8.11.1) with ESMTP id f0GNd4C26837;
-+	Wed, 17 Jan 2001 00:39:04 +0100 (MET)
-+Received: from michelangelo.telekabel.at ([62.178.9.127])
-+          by viemta06.chello.at
-+          (InterMail vK.4.03.01.00 201-232-122 license 9caa03a7df1d31c048ffcc0d31ac5855)
-+          with ESMTP
-+          id <20010116233900.BMRG7188.viemta06@michelangelo.telekabel.at>;
-+          Wed, 17 Jan 2001 00:39:00 +0100
-+Message-ID: <3A64DBB9.74527B61@chello.at>
-+Date: Wed, 17 Jan 2001 00:39:37 +0100
-+From: Stephan Wright <stephan.wright@chello.at>
-+Reply-To: stephan.wright@chello.at
-+X-Mailer: Mozilla 4.01 [de] (Win95; I)
-+MIME-Version: 1.0
-+To: Wolfgang Hiermann <wolfgang.hiermann@teleweb.at>,
-+        Susanne Schuster <e9107982@student.tuwien.ac.at>,
-+        Roland Summerauer <h9751337@obelix.wu-wien.ac.at>,
-+        Raimund Kirner <e9625030@student.tuwien.ac.at>,
-+        "Michael Mörz" <e9625136@student.tuwien.ac.at>,
-+        Doris Ulrich <e8101579@student.tuwien.ac.at>,
-+        Daniel Wronski <e9625027@student.tuwien.ac.at>,
-+        Balazs Lichtl <e9625772@stud3.tuwien.ac.at>
-+Subject: [Fwd: Fw: Das ist aber lieb geschrieben!]
-+X-Priority: 3 (Normal)
-+Content-Type: multipart/mixed; boundary="------------A0D4511CCFC2DF8B814B1B9E"
-+X-UIDL: *2+!!Ec8e9F>?!!70^!!
-+Status: RO
-+Content-Length: 32777
-+Lines: 485
-+
-+MM_NOTTTY=1
-+MM_QUIET=cat
-+HOSTNAME=skair
-+DEBFULLNAME=Michael Moerz
-+MM_MAILER=unknown
-+GDMSESSION=Gnome
-+USER=mike
-+MACHTYPE=i386-pc-linux-gnu
-+DEBEMAIL=e9625136@stud3.tuwien.ac.at
-+MAIL=/var/spool/mail/mike
-+LANG=C
-+DISPLAY=:0.0
-+MM_USEPAGER=0
-+LOGNAME=mike
-+SHLVL=3
-+SSH_AGENT_PID=1306
-+SESSION_MANAGER=local/skair:/tmp/.ICE-unix/1263
-+MM_CONTENTTYPE=multipart/mixed ; boundary = "------------A0D4511CCFC2DF8B814B1B9E"
-+USERNAME=mike
-+SHELL=/bin/bash
-+HOSTTYPE=i386
-+CVSROOT=:pserver:mike@localhost:/home/repositories
-+MM_DEBUG=1
-+MM_NOASK=text,text/plain,text/richtext
-+MM_RUNASROOT=0
-+OSTYPE=linux-gnu
-+HOME=/home/mike
-+TERM=xterm
-+SSH_AUTH_SOCK=/tmp/ssh-ApDG1263/agent.1263
-+PATH=/home/mike/debian/metamail-2.7/src/metamail/.libs:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
-+_=/usr/bin/printenv
-+PWD=/home/mike/debian/metamail-2.7/src/metamail
-+XAUTHORITY=/home/mike/.Xauthority
-+WINDOWID=20971534
-+MM_SUMMARY=oding: 8bit  (from Stephan Wright <stephan.wright@chello.at> )
-+MM_HEADERS=
-+Content-Type: text/plain; charset=iso-8859-1
-+Content-Type: text/plain; charset=iso-8859-1
-+Content-Transfer-Encoding: 8bit
-+Content-Transfer-Encoding: 8bit
-+
-+MM_NOTTTY=1
-+MM_QUIET=cat
-+HOSTNAME=skair
-+DEBFULLNAME=Michael Moerz
-+MM_MAILER=unknown
-+GDMSESSION=Gnome
-+USER=mike
-+MACHTYPE=i386-pc-linux-gnu
-+DEBEMAIL=e9625136@stud3.tuwien.ac.at
-+MAIL=/var/spool/mail/mike
-+LANG=C
-+DISPLAY=:0.0
-+MM_USEPAGER=0
-+LOGNAME=mike
-+SHLVL=3
-+SSH_AGENT_PID=1306
-+SESSION_MANAGER=local/skair:/tmp/.ICE-unix/1263
-+MM_CONTENTTYPE=text/plain ; charset = iso-8859-1
-+USERNAME=mike
-+SHELL=/bin/bash
-+HOSTTYPE=i386
-+CVSROOT=:pserver:mike@localhost:/home/repositories
-+MM_DEBUG=1
-+MM_NOASK=text,text/plain,text/richtext
-+MM_RUNASROOT=0
-+OSTYPE=linux-gnu
-+HOME=/home/mike
-+TERM=xterm
-+SSH_AUTH_SOCK=/tmp/ssh-ApDG1263/agent.1263
-+PATH=/home/mike/debian/metamail-2.7/src/metamail/.libs:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
-+_=/usr/bin/printenv
-+PWD=/home/mike/debian/metamail-2.7/src/metamail
-+XAUTHORITY=/home/mike/.Xauthority
-+WINDOWID=20971534
-+MM_SUMMARY=oding: 8bit  (from Stephan Wright <stephan.wright@chello.at> )
-+MM_HEADERS=
-+Content-Type: text/plain; charset=iso-8859-1
-+Content-Type: text/plain; charset=iso-8859-1
-+Content-Transfer-Encoding: 8bit
-+Content-Transfer-Encoding: 8bit
-+
-+MM_NOTTTY=0
-+MM_QUIET=cat
-+HOSTNAME=skair
-+DEBFULLNAME=Michael Moerz
-+MM_MAILER=unknown
-+GDMSESSION=Gnome
-+USER=mike
-+MACHTYPE=i386-pc-linux-gnu
-+DEBEMAIL=e9625136@stud3.tuwien.ac.at
-+MAIL=/var/spool/mail/mike
-+LANG=C
-+DISPLAY=:0.0
-+MM_USEPAGER=0
-+LOGNAME=mike
-+SHLVL=3
-+SSH_AGENT_PID=1306
-+SESSION_MANAGER=local/skair:/tmp/.ICE-unix/1263
-+MM_CONTENTTYPE=text/plain ; charset = iso-8859-1
-+USERNAME=mike
-+SHELL=/bin/bash
-+HOSTTYPE=i386
-+CVSROOT=:pserver:mike@localhost:/home/repositories
-+MM_DEBUG=1
-+MM_NOASK=text,text/plain,text/richtext
-+MM_RUNASROOT=0
-+OSTYPE=linux-gnu
-+HOME=/home/mike
-+TERM=xterm
-+SSH_AUTH_SOCK=/tmp/ssh-ApDG1263/agent.1263
-+PATH=/home/mike/debian/metamail-2.7/src/metamail/.libs:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
-+_=/usr/bin/printenv
-+Metamail Version 2.7, debugging turned on.
-+Trying to open input file: ../../../../metamailtest
-+Date: Wed, 17 Jan 2001 00:39:37 +0100
-+From: Stephan Wright <stephan.wright@chello.at>
-+To: Wolfgang Hiermann <wolfgang.hiermann@teleweb.at>,         Susanne Schuster <e9107982@student.tuwien.ac.at>,         Roland Summerauer <h9751337@obelix.wu-wien.ac.at>,         Raimund Kirner <e9625030@student.tuwien.ac.at>,         "Michael Mörz" <e9625136@student.tuwien.ac.at>,         Doris Ulrich <e8101579@student.tuwien.ac.at>,         Daniel Wronski <e9625027@student.tuwien.ac.at>,         Balazs Lichtl <e9625772@stud3.tuwien.ac.at>
-+Subject: [Fwd: Fw: Das ist aber lieb geschrieben!]
-+NEW PARAMETER: boundary VALUE: "------------A0D4511CCFC2DF8B814B1B9E"
-+
-+Here is the environment:
-+
-+Handling multipart as built-in here.  Boundary: --------------A0D4511CCFC2DF8B814B1B9E
-+NEW PARAMETER: charset VALUE: iso-8859-1
-+
-+Here is the environment:
-+
-+Here is the environment:
-+
-+---Executing: xterm -title 'oding: 8bit  (from Stephan Wright <stephan.wright@chello.at> )' -e  metamail -P -b -c 'text/plain ; charset = iso-8859-1' /tmp/MQxhZtQ
-+PWD=/home/mike/debian/metamail-2.7/src/metamail
-+XAUTHORITY=/home/mike/.Xauthority
-+WINDOWID=20971534
-+MM_SUMMARY=inline  (from Stephan Wright <stephan.wright@chello.at> )
-+MM_HEADERS=
-+Content-Type: message/rfc822
-+Content-Transfer-Encoding: 8bit
-+Content-Disposition: inline
-+
-+MM_NOTTTY=1
-+MM_QUIET=cat
-+HOSTNAME=skair
-+DEBFULLNAME=Michael Moerz
-+MM_MAILER=unknown
-+GDMSESSION=Gnome
-+USER=mike
-+MACHTYPE=i386-pc-linux-gnu
-+DEBEMAIL=e9625136@stud3.tuwien.ac.at
-+MAIL=/var/spool/mail/mike
-+LANG=C
-+DISPLAY=:0.0
-+MM_USEPAGER=0
-+LOGNAME=mike
-+SHLVL=3
-+SSH_AGENT_PID=1306
-+SESSION_MANAGER=local/skair:/tmp/.ICE-unix/1263
-+MM_CONTENTTYPE=message/rfc822
-+USERNAME=mike
-+SHELL=/bin/bash
-+HOSTTYPE=i386
-+CVSROOT=:pserver:mike@localhost:/home/repositories
-+MM_DEBUG=1
-+MM_NOASK=text,text/plain,text/richtext
-+MM_RUNASROOT=0
-+OSTYPE=linux-gnu
-+HOME=/home/mike
-+TERM=xterm
-+SSH_AUTH_SOCK=/tmp/ssh-ApDG1263/agent.1263
-+PATH=/home/mike/debian/metamail-2.7/src/metamail/.libs:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
-+_=/usr/bin/printenv
-+PWD=/home/mike/debian/metamail-2.7/src/metamail
-+XAUTHORITY=/home/mike/.Xauthority
-+WINDOWID=20971534
-+MM_SUMMARY=Fw: Das ist aber lieb geschrieben   (from "Marion Spahlholz" <Marion.spahlholz@chello.at> )
-+MM_HEADERS=
-+Return-Path: <Marion.spahlholz@chello.at>
-+Received: from marionharald ([213.47.119.62]) by viemta06.chello.at
-+          (InterMail vK.4.03.01.00 201-232-122 license 9caa03a7df1d31c048ffcc0d31ac5855)
-+          with SMTP id <20010112191934.DEQK23142.viemta06@marionharald>;
-+          Fri, 12 Jan 2001 20:19:34 +0100
-+Message-ID: <00b301c07ccd$7e71c8e0$3e772fd5@telekabel.at>
-+From: "Marion Spahlholz" <Marion.spahlholz@chello.at>
-+To: "Peter Ipser" <peter.ipser@chello.at>
-+Cc: "Rudolf Meyer" <rudolf.meyer@chello.at>,
-+	"Martina Fitzka" <tini@yline.com>,
-+	=?iso-8859-1?Q?Evelyn_L=F6wenrosen?= <evelyn.loewenrosen@chello.at>,
-+	"Stephan Wright" <stephan.wright@chello.at>
-+Subject: Fw: Das ist aber lieb geschrieben!
-+Date: Fri, 12 Jan 2001 20:25:59 +0100
-+MIME-Version: 1.0
-+Content-Type: multipart/mixed;
-+	boundary="----=_NextPart_000_00B0_01C07CD5.E0149F20"
-+X-Priority: 3
-+X-MSMail-Priority: Normal
-+X-Mailer: Microsoft Outlook Express 5.50.4133.2400
-+X-MimeOLE: Produced By Microsoft MimeOLE V5.50.4133.2400
-+
-+MM_NOTTTY=1
-+MM_QUIET=cat
-+HOSTNAME=skair
-+DEBFULLNAME=Michael Moerz
-+MM_MAILER=unknown
-+GDMSESSION=Gnome
-+USER=mike
-+MACHTYPE=i386-pc-linux-gnu
-+DEBEMAIL=e9625136@stud3.tuwien.ac.at
-+MAIL=/var/spool/mail/mike
-+LANG=C
-+DISPLAY=:0.0
-+MM_USEPAGER=0
-+LOGNAME=mike
-+SHLVL=3
-+SSH_AGENT_PID=1306
-+SESSION_MANAGER=local/skair:/tmp/.ICE-unix/1263
-+MM_CONTENTTYPE=multipart/mixed ; boundary = "----=_NextPart_000_00B0_01C07CD5.E0149F20"
-+USERNAME=mike
-+SHELL=/bin/bash
-+HOSTTYPE=i386
-+CVSROOT=:pserver:mike@localhost:/home/repositories
-+MM_DEBUG=1
-+MM_NOASK=text,text/plain,text/richtext
-+MM_RUNASROOT=0
-+OSTYPE=linux-gnu
-+HOME=/home/mike
-+TERM=xterm
-+SSH_AUTH_SOCK=/tmp/ssh-ApDG1263/agent.1263
-+PATH=/home/mike/debian/metamail-2.7/src/metamail/.libs:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
-+_=/usr/bin/printenv
-+PWD=/home/mike/debian/metamail-2.7/src/metamail
-+XAUTHORITY=/home/mike/.Xauthority
-+WINDOWID=20971534
-+MM_SUMMARY=Fw: Das ist aber lieb geschrieben   (from "Marion Spahlholz" <Marion.spahlholz@chello.at> )
-+MM_HEADERS=
-+Content-Type: text/plain;
-+	charset="iso-8859-1"
-+Content-Transfer-Encoding: 8bit
-+
-+MM_NOTTTY=1
-+MM_QUIET=cat
-+HOSTNAME=skair
-+DEBFULLNAME=Michael Moerz
-+MM_MAILER=unknown
-+GDMSESSION=Gnome
-+USER=mike
-+MACHTYPE=i386-pc-linux-gnu
-+DEBEMAIL=e9625136@stud3.tuwien.ac.at
-+MAIL=/var/spool/mail/mike
-+LANG=C
-+DISPLAY=:0.0
-+MM_USEPAGER=0
-+LOGNAME=mike
-+SHLVL=3
-+SSH_AGENT_PID=1306
-+SESSION_MANAGER=local/skair:/tmp/.ICE-unix/1263
-+MM_CONTENTTYPE=text/plain ; charset = "iso-8859-1"
-+USERNAME=mike
-+SHELL=/bin/bash
-+HOSTTYPE=i386
-+CVSROOT=:pserver:mike@localhost:/home/repositories
-+MM_DEBUG=1
-+MM_NOASK=text,text/plain,text/richtext
-+MM_RUNASROOT=0
-+OSTYPE=linux-gnu
-+HOME=/home/mike
-+TERM=xterm
-+SSH_AUTH_SOCK=/tmp/ssh-ApDG1263/agent.1263
-+PATH=/home/mike/debian/metamail-2.7/src/metamail/.libs:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
-+_=/usr/bin/printenv
-+PWD=/home/mike/debian/metamail-2.7/src/metamail
-+XAUTHORITY=/home/mike/.Xauthority
-+WINDOWID=20971534
-+MM_SUMMARY=Fw: Das ist aber lieb geschrieben   (from "Marion Spahlholz" <Marion.spahlholz@chello.at> )
-+MM_HEADERS=
-+Content-Type: text/plain;
-+	charset="iso-8859-1"
-+Content-Transfer-Encoding: 8bit
-+
-+MM_NOTTTY=0
-+MM_QUIET=cat
-+HOSTNAME=skair
-+DEBFULLNAME=Michael Moerz
-+MM_MAILER=unknown
-+GDMSESSION=Gnome
-+USER=mike
-+MACHTYPE=i386-pc-linux-gnu
-+DEBEMAIL=e9625136@stud3.tuwien.ac.at
-+MAIL=/var/spool/mail/mike
-+LANG=C
-+DISPLAY=:0.0
-+MM_USEPAGER=0
-+LOGNAME=mike
-+SHLVL=3
-+SSH_AGENT_PID=1306
-+SESSION_MANAGER=local/skair:/tmp/.ICE-unix/1263
-+MM_CONTENTTYPE=text/plain ; charset = "iso-8859-1"
-+USERNAME=mike
-+SHELL=/bin/bash
-+HOSTTYPE=i386
-+CVSROOT=:pserver:mike@localhost:/home/repositories
-+MM_DEBUG=1
-+MM_NOASK=text,text/plain,text/richtext
-+MM_RUNASROOT=0
-+OSTYPE=linux-gnu
-+HOME=/home/mike
-+TERM=xterm
-+SSH_AUTH_SOCK=/tmp/ssh-ApDG1263/agent.1263
-+PATH=/home/mike/debian/metamail-2.7/src/metamail/.libs:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
-+_=/usr/bin/printenv
-+Command exit status: 0
-+‡(­û‡ƒ@‡ƒ@‡ƒ@‡ƒ@‡ƒ@‡ƒ@‡ƒ@ˆƒ@
-+Here is the environment:
-+
-+From: "Marion Spahlholz" <Marion.spahlholz@chello.at>
-+To: "Peter Ipser" <peter.ipser@chello.at>
-+Cc: "Rudolf Meyer" <rudolf.meyer@chello.at>,  "Martina Fitzka" <tini@yline.com>,  [** iso-8859-1 charset **] Evelyn Löwenrosen‡(­û‡ƒ@‡ƒ@‡ƒ@‡ƒ@‡ƒ@‡ƒ@‡ƒ@ˆƒ@<evelyn.loewenrosen@chello.at>,  "Stephan Wright" <stephan.wright@chello.at>
-+Subject: Fw: Das ist aber lieb geschrieben!
-+Date: Fri, 12 Jan 2001 20:25:59 +0100
-+MIME-Version: 1.0
-+NEW PARAMETER: boundary VALUE: "----=_NextPart_000_00B0_01C07CD5.E0149F20"
-+X-Priority: 3
-+X-MSMail-Priority: Normal
-+X-Mailer: Microsoft Outlook Express 5.50.4133.2400
-+X-MimeOLE: Produced By Microsoft MimeOLE V5.50.4133.2400
-+
-+
-+Here is the environment:
-+
-+Handling multipart as built-in here.  Boundary: ------=_NextPart_000_00B0_01C07CD5.E0149F20
-+NEW PARAMETER: charset VALUE: "iso-8859-1"
-+
-+Here is the environment:
-+
-+Here is the environment:
-+
-+---Executing: xterm -title 'Fw: Das ist aber lieb geschrieben   (from "Marion Spahlholz" <Marion.spahlholz@chello.at> )' -e  metamail -P -b -c 'text/plain ; charset = "iso-8859-1"' /tmp/MGsYu2s
-+PWD=/home/mike/debian/metamail-2.7/src/metamail
-+XAUTHORITY=/home/mike/.Xauthority
-+WINDOWID=20971534
-+MM_SUMMARY=attachment;  filename="Fortflanzung.gif"  (from "Marion Spahlholz" <Marion.spahlholz@chello.at> )
-+MM_HEADERS=
-+Content-Type: image/gif;
-+	name="Fortflanzung.gif"
-+Content-Transfer-Encoding: base64
-+Content-Disposition: attachment;
-+	filename="Fortflanzung.gif"
-+
-+MM_NOTTTY=1
-+MM_QUIET=cat
-+HOSTNAME=skair
-+DEBFULLNAME=Michael Moerz
-+MM_MAILER=unknown
-+GDMSESSION=Gnome
-+USER=mike
-+MACHTYPE=i386-pc-linux-gnu
-+DEBEMAIL=e9625136@stud3.tuwien.ac.at
-+MAIL=/var/spool/mail/mike
-+LANG=C
-+DISPLAY=:0.0
-+MM_USEPAGER=0
-+LOGNAME=mike
-+SHLVL=3
-+SSH_AGENT_PID=1306
-+SESSION_MANAGER=local/skair:/tmp/.ICE-unix/1263
-+MM_CONTENTTYPE=image/gif ; name = "Fortflanzung.gif"
-+USERNAME=mike
-+SHELL=/bin/bash
-+HOSTTYPE=i386
-+CVSROOT=:pserver:mike@localhost:/home/repositories
-+MM_DEBUG=1
-+MM_NOASK=text,text/plain,text/richtext
-+MM_RUNASROOT=0
-+OSTYPE=linux-gnu
-+HOME=/home/mike
-+TERM=xterm
-+SSH_AUTH_SOCK=/tmp/ssh-ApDG1263/agent.1263
-+PATH=/home/mike/debian/metamail-2.7/src/metamail/.libs:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
-+_=/usr/bin/printenv
---- metamail-2.7.orig/src/metamail/metamail_default.h
-+++ metamail-2.7/src/metamail/metamail_default.h
-@@ -0,0 +1,9 @@
-+#ifndef METAMAIL_DEFAULT_H
-+#define METAMAIL_DEFAULT_H 1
-+
-+char *mmversion = MM_VERSTRING;
-+char *NoAskDefault = "text,text/plain,text/richtext";
-+char *QuietDefault = CATCOMMAND;
-+char *tmproot="";
-+
-+#endif /* METAMAIL_DEFAULT_H */
---- metamail-2.7.orig/src/metamail/includeaway
-+++ metamail-2.7/src/metamail/includeaway
-@@ -0,0 +1,97 @@
-+#ifdef BORLAND
-+#define F_OK 0
-+extern unsigned _stklen = 16384;
-+extern char *mktemp(char *);
-+#define WRITE_BINARY	"w"
-+#else /* BORLAND */
-+#ifdef MICROSOFT
-+#include <malloc.h>
-+#include <stdlib.h>
-+#include <time.h>
-+#include <signal.h>
-+#define F_OK 0
-+#else
-+
-+#ifndef AMIGA
-+#ifdef SYSV
-+//#include <termio.h>
-+//#include <unistd.h>
-+#else /* SYSV */
-+#include <sgtty.h>
-+#endif /* SYSV */
-+#endif /* AMIGA */
-+#endif /* MICROSOFT */
-+#endif /* BORLAND */
-+
-+//#if defined(SYSV) && !defined(linux)
-+//#define LPRTEMPLATE "lp %s"
-+//#define LPRCOMMAND "lp"
-+//#else
-+//#define LPRTEMPLATE "lpr %s"
-+//#define LPRCOMMAND "lpr"
-+
-+#endif
-+#ifdef MSDOS
-+#define CATCOMMAND  "cat"
-+#define CATTEMPLATE "cat %s"
-+#define METAMAIL    "metamail"
-+#define TMPFILE_NAME_SIZE   128
-+#define MAX_FILE_NAME_SIZE 128
-+#define WRITE_BINARY	"wb"
-+#else /* MSDOS */
-+#ifdef AMIGA
-+extern char *MkRmScript();
-+#ifndef F_OK
-+#define F_OK (0)
-+#endif
-+#define CATCOMMAND  "Type"
-+#define CATTEMPLATE "Type %s"
-+#define METAMAIL    "metamail <*"
-+#define TMPFILE_NAME_SIZE     50
-+#define MAX_FILE_NAME_SIZE 256
-+#define WRITE_BINARY	"w"
-+#else /* AMIGA */
-+//extern char **environ, *gets();
-+//#define CATCOMMAND  "cat"
-+//#define CATTEMPLATE "cat %s"
-+//#define METAMAIL    "metamail"
-+//#define TMPFILE_NAME_SIZE   1000
-+//#define MAX_FILE_NAME_SIZE 1000
-+//#define WRITE_BINARY	"w"
-+#endif /* AMIGA */
-+#endif /* MSDOS */
-+
-+//#ifndef NO_RLIMITS
-+//#include <sys/resource.h>
-+//#endif
-+
-+//#define CMDSIZE 1200 /* Maximum size of command to execute */
-+
-+//#define LINE_BUF_SIZE       2000
-+
-+#ifndef MICROSOFT
-+extern char *malloc();
-+extern char *realloc();
-+#endif
-+
-+//extern FILE *popen();
-+//static char *nomem = "Out of memory!";
-+//static char *mmversion = MM_VERSTRING;
-+//static char *NoAskDefault = "text,text/plain,text/richtext";
-+//static char *QuietDefault = CATCOMMAND;
-+//static char *tmproot="";
-+
-+//#define ENCODING_NONE 0
-+//#define ENCODING_BASE64 1
-+//#define ENCODING_QUOTEDPRINTABLE 2
-+//#define ENCODING_8BIT 3
-+//#define ENCODING_UUENCODE -1	/* non-standard */
-+
-+#ifdef MICROSOFT
-+/* Need a function prototype for TryMailcapEntry because without it MSC
-+ * passes a pointer to the structure rather than the structure itself.
-+ */
-+TryMailcapEntry(struct MailcapEntry mc, char *SquirrelFile);
-+#endif
-+
-+
---- metamail-2.7.orig/src/metamail/mailcap.c
-+++ metamail-2.7/src/metamail/mailcap.c
-@@ -0,0 +1,118 @@
-+/*
-+Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+
-+Permission to use, copy, modify, and distribute this material 
-+for any purpose and without fee is hereby granted, provided 
-+that the above copyright notice and this permission notice 
-+appear in all copies, and that the name of Bellcore not be 
-+used in advertising or publicity pertaining to this 
-+material without the specific, prior written permission 
-+of an authorized representative of Bellcore.  BELLCORE 
-+MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+*/
-+/* mailcap.c - contains functions to access and parse mailcap files
-+    Authors:  Nathaniel S. Borenstein, Bellcore
-+              Michael Moerz <mikem@debian.org>
-+*/
-+
-+#include <metamail/common.h>
-+
-+#include "mailcap.h"
-+#include "metamail.h"
-+
-+/* Only one or the other set up builtins gets used,
-+  depending on whether or not we're in the middle of 
-+          a multipart/alternative body part */
-+struct MailcapEntry BuiltIns[] = {
-+    {"text/*", CATTEMPLATE, NULL, 0, 1, 0, "plain text", LPRTEMPLATE},
-+    {NULL, NULL, NULL, 0, 0, 0}};
-+
-+struct MailcapEntry BuiltInsAlternative[] = {
-+    {"text/plain", CATTEMPLATE, NULL, 0, 1, 0, "plain text", LPRTEMPLATE},
-+    {NULL, NULL, NULL, 0, 0, 0}};
-+
-+/** hmm, ... 
-+*/
-+int
-+ProcessMailcapFiles(SquirrelFile) 
-+char *SquirrelFile;
-+{
-+    char *s, *pathcopy = NULL;
-+    char *path = getenv("MAILCAPS");
-+    if (!path) {
-+        uid_t uid = getuid();
-+        struct passwd *p;
-+        p = getpwuid(uid);
-+	if (p) {
-+	  path = XMALLOC(char, 5 + strlen(p->pw_dir) + strlen(STDPATH));
-+	}
-+        strcpy(path, p->pw_dir);
-+        strcat(path, STDPATH);
-+        pathcopy = path;
-+    } else 
-+    {
-+        pathcopy = XMALLOC(char, 1+strlen(path));
-+        strcpy(pathcopy, path);
-+        path = pathcopy;
-+    }
-+    while(path) {
-+        s = index(path, PATH_SEPARATOR);
-+        if (s) *s++ = 0;
-+        if (!ProcessMailcapFile(path, SquirrelFile)) return(0);
-+        path = s;
-+    }
-+    if (pathcopy) XFREE(pathcopy);
-+    return(-1);
-+}
-+
-+int
-+TryBuiltIns(SquirrelFile) 
-+char *SquirrelFile;
-+{
-+  int i;
-+  /* Last resort -- for sites that didn't bother putting a "text" line in 
-+     their mailcap files... */
-+  if (DoDebug) 
-+    fprintf(stderr, "Looking for '%s' in built-in content-type handling "
-+	    "settings.\n", ContentType);
-+  for (i=0; BuiltIns[i].contenttype; ++i) {
-+    if (!TryMailcapEntry(SquirrelFile ? BuiltInsAlternative[i] : BuiltIns[i], SquirrelFile))
-+      return(0);
-+  }
-+  return(-1);
-+}
-+
-+int
-+ProcessMailcapFile(file, SquirrelFile)
-+char *file, *SquirrelFile;
-+{
-+    struct MailcapEntry mc;
-+    FILE *fp;
-+    int res;
-+
-+    res = IsDirectory(file);
-+    if (res) {
-+	if (res == 1) {
-+	    fprintf(stderr, "Mailcap path entry '%s' is a directory, should be a readable file.\n", file);
-+	} else if (DoDebug) {
-+	/* Quietly ignore non-existent mailcap files unless debugging */
-+	    fprintf(stderr, "Mailcap path entry '%s' does not exist.\n", file);
-+	}
-+	return(-1);
-+    }
-+    fp = fopen(file, "r");
-+    if (DoDebug) fprintf(stderr, "Looking for '%s' in mailcap file '%s'.\n", ContentType, file);
-+    while (fp && !feof(fp)) {
-+        mc.needtofree = 0;
-+	if (GetMailcapEntry(fp, &mc)) {
-+            if (!TryMailcapEntry(mc, SquirrelFile)) {
-+                fclose(fp);
-+                return(0);
-+            }
-+	}
-+    }
-+    if (fp) fclose(fp);
-+    return(-1);
-+}
---- metamail-2.7.orig/src/metamail/mailcap.h
-+++ metamail-2.7/src/metamail/mailcap.h
-@@ -0,0 +1,34 @@
-+/*
-+Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+
-+Permission to use, copy, modify, and distribute this material 
-+for any purpose and without fee is hereby granted, provided 
-+that the above copyright notice and this permission notice 
-+appear in all copies, and that the name of Bellcore not be 
-+used in advertising or publicity pertaining to this 
-+material without the specific, prior written permission 
-+of an authorized representative of Bellcore.  BELLCORE 
-+MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+*/
-+
-+#ifndef METAMAIL_MAILCAP_H
-+#define METAMAIL_MAILCAP_H 1
-+
-+struct MailcapEntry {
-+  char *contenttype;
-+  char *command;
-+  char *testcommand;
-+  int needsterminal;
-+  int copiousoutput;
-+  int needtofree;
-+  char *label;
-+  char *printcommand;
-+};
-+
-+int  ProcessMailcapFiles (char *);
-+int  TryBuiltIns         (char *);
-+int  ProcessMailcapFile  (char *, char*);
-+
-+#endif /* METAMAIL_MAILCAP_H */
---- metamail-2.7.orig/src/metamail/shared.c
-+++ metamail-2.7/src/metamail/shared.c
-@@ -0,0 +1,120 @@
-+#include <stdio.h>
-+#include <ctype.h>
-+#include <config.h>
-+#include <stdlib.h>  /* malloc(3) and realloc(3) */
-+#ifdef SYSV
-+#include <unistd.h>
-+#include <sys/utsname.h>
-+#endif
-+
-+char **Exceptions;
-+int *NeedsPortableNewlines;
-+int ExceptionsAlloced = 0, ExceptionsUsed = 0;
-+
-+ExceptionalNewline(contenttype, needsportable)
-+char *contenttype;
-+int needsportable;
-+{
-+    char *s;
-+    if (ExceptionsAlloced == 0) {
-+        ExceptionsAlloced = 25;
-+        Exceptions = (char **) malloc(ExceptionsAlloced * sizeof(char *));
-+        NeedsPortableNewlines = (int *) malloc(ExceptionsAlloced * sizeof(int));
-+        if (!Exceptions || !NeedsPortableNewlines) return(-1);
-+    }
-+    if (ExceptionsUsed >= ExceptionsAlloced) {
-+        ExceptionsAlloced += 25;
-+        Exceptions = (char **) realloc(Exceptions, ExceptionsAlloced * sizeof(char *));
-+        NeedsPortableNewlines = (int *) realloc(NeedsPortableNewlines, ExceptionsAlloced * sizeof(int));
-+        if (!Exceptions || !NeedsPortableNewlines) return(-1);
-+    }
-+    s = malloc(1+strlen(contenttype));
-+    if (!s) return(-1);
-+    strcpy(s, contenttype);
-+    Exceptions[ExceptionsUsed] = s;
-+    for (; *s; ++s) {
-+        if (isupper((unsigned char) *s)) *s = tolower((unsigned char) *s);
-+    }
-+    NeedsPortableNewlines[ExceptionsUsed] = needsportable;
-+    ++ExceptionsUsed;
-+    return(0);
-+}
-+
-+DoesNeedPortableNewlines(ctype)
-+char *ctype;
-+{
-+    int i;
-+
-+    /* First, handle the customization/override case */
-+    for (i=0; i<ExceptionsUsed; ++i) {
-+        if (!lc2strcmp(ctype, Exceptions[i])) {
-+             return(NeedsPortableNewlines[i]);
-+        }
-+    }
-+    /* But for most folks, the simple defaults will always suffice */
-+    if (!lc2strncmp(ctype, "text", 4)) {
-+        return(1);
-+    }
-+    /* The following two are weird; message & multipart should never be encoded, but they really are line-oriented, so if they ARE encoded (and for PEM, it is even legitimate) they should use portable newlines */
-+    if (!lc2strncmp(ctype, "message", 7)) {
-+        return(1);
-+    }
-+    if (!lc2strncmp(ctype, "multipart", 9)) {
-+        return(1);
-+    }
-+    return(0);
-+}
-+
-+lc2strncmp(s1, s2, len)
-+char *s1, *s2;
-+int len;
-+{
-+    if (!s1 || !s2) return (-1);
-+    while (*s1 && *s2 && len > 0) {
-+	if (*s1 != *s2 && (tolower(*s1) != *s2)) return(-1);
-+	++s1; ++s2; --len;
-+    }
-+    if (len <= 0) return(0);
-+    return((*s1 == *s2) ? 0 : -1);
-+}
-+
-+lc2strcmp(s1, s2)
-+char *s1, *s2;
-+{
-+    if (!s1 || !s2) return (-1);
-+    while (*s1 && *s2) {
-+	if (*s1 != *s2 && (tolower(*s1) != *s2)) return(-1);
-+	++s1; ++s2;
-+    }
-+    return((*s1 == *s2) ? 0 : -1);
-+}
-+
-+char *getmyname() {
-+    static int initialized = 0;
-+#ifdef SYSV
-+    static struct utsname u;
-+    static char *hostname = u.nodename;
-+#else
-+    static char hostname[60];
-+#endif
-+    if (!initialized) {
-+#ifdef AMIGA
-+        strcpy(hostname, myAddress);
-+#else
-+#ifdef SYSV
-+    if (uname(&u) == -1) {
-+        hostname = "UNKNOWN.SITE.NAME";
-+    }
-+#else
-+#ifdef MSDOS
-+    strcpy(hostname, "UNKNOWN.SITE.NAME");
-+#else
-+        gethostname(hostname, sizeof(hostname));
-+#endif /* MSDOS */
-+#endif /* SYSV */
-+#endif /* AMIGA */
-+        initialized = 1;
-+    }
-+    return(hostname);
-+}
-+
---- metamail-2.7.orig/src/metamail/splitmail.c
-+++ metamail-2.7/src/metamail/splitmail.c
-@@ -0,0 +1,433 @@
-+/*
-+Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+
-+Permission to use, copy, modify, and distribute this material 
-+for any purpose and without fee is hereby granted, provided 
-+that the above copyright notice and this permission notice 
-+appear in all copies, and that the name of Bellcore not be 
-+used in advertising or publicity pertaining to this 
-+material without the specific, prior written permission 
-+of an authorized representative of Bellcore.  BELLCORE 
-+MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+*/
-+/****************************************************** 
-+    Metamail -- A tool to help diverse mail readers 
-+                cope with diverse multimedia mail formats.
-+
-+    Author:  Nathaniel S. Borenstein, Bellcore
-+
-+ ******************************************************* */
-+
-+#include <metamail/common.h>
-+
-+#define MINCHUNKSIZE 20000 /* Better be enough to hold the headers, or we die! */
-+
-+extern char *getenv();
-+#define NORMALDELIVERYCMD "/usr/sbin/sendmail -t -oi"
-+#define VERBOSEDELIVERYCMD "/usr/sbin/sendmail -t -v -oi"
-+
-+usageexit() {
-+    fprintf(stderr, "Usage:  splitmail [-d] [-v] [-s splitsize] [-i id-suffix] [-p prefix] [file-name]\n");
-+    exit(-1);
-+}
-+
-+char *MonthNames[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
-+char *DayNames[] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
-+
-+char *
-+endofheader(s)
-+char *s;
-+{
-+    char *orgs = s, c;
-+    while (1) {
-+	s = index(s, '\n');
-+	if (!s) return(orgs+strlen(orgs));
-+	c = *(s+1);
-+        if (c != ' ' && c != '\t') return(s);
-+        ++s;
-+    }
-+}
-+
-+main(argc, argv)
-+char **argv;
-+{
-+    int i, DoDeliver=0, SplitSize=DEFAULT_SPLIT_SIZE, dum, InNewline=1, bytesread, whichpart=1, Verbose=0, numparts = -1, c;
-+    char *fname = NULL, *bigbuf, *s, *SharedHeaders, *headend, *from, id[100], *deliverycmd, *prefix, SubjectBuf[250];
-+    char *MessageID = 0, *OrigID=NULL;
-+    FILE *fp;
-+
-+    s = getenv("METAMAIL_TMPDIR");
-+    if (s) {
-+        prefix = malloc(10+strlen(s));
-+        if (!prefix) {
-+            fprintf(stderr, "splitmail: Not enough memory\n");
-+            exit(-1);
-+        }
-+        sprintf(prefix, "%s/split.", s);
-+    } else {
-+        prefix = "/tmp/split.";
-+    }
-+    s = getenv("SPLITSIZE");
-+    if (s) {
-+        dum = atoi(s);
-+        if (dum < MINCHUNKSIZE) {
-+            fprintf(stderr, "Ignoring SPLITSIZE environment variable of %d -- the minimum value is %d\n", dum, MINCHUNKSIZE);
-+        } else {
-+            SplitSize = dum;
-+        }
-+    }
-+    for (i=1; i<argc; ++i) {
-+	if (argv[i][0] == '-') {
-+	    switch (argv[i][1]) {
-+		case 's':
-+		    if (++i >= argc) usageexit();
-+		    dum = atoi(argv[i]);
-+		    if (dum < MINCHUNKSIZE && dum >= 0) {
-+			fprintf(stderr, "splitmail: Using minimum splitsize of %d\n", MINCHUNKSIZE);
-+			dum = MINCHUNKSIZE;
-+			
-+		    }
-+		    SplitSize = dum;
-+		    break;
-+		case 'd':
-+		    DoDeliver = 1;
-+                    break;
-+                case 'p':
-+		    if (++i >= argc) usageexit();
-+                    prefix = argv[i];
-+                    break;
-+ 		case 'i':
-+ 		    if( ++i >= argc) usageexit();
-+ 		    MessageID = argv[i];
-+ 		    break;
-+		case 'v':
-+		    Verbose = 1;
-+		    break;
-+		default:
-+		    usageexit();
-+	    }
-+	} else {
-+	    if (fname) usageexit();
-+	    fname = argv[i];
-+	}
-+    }
-+    bigbuf = malloc(100+SplitSize);
-+    if (!bigbuf) {
-+	fprintf(stderr, "splitmail:  Not enough memory for %d-byte chunks\n", SplitSize);
-+	exit(-1);
-+    }
-+    SplitSize -= 1000; /* gives fudge factor for headers, line endings */
-+    if (fname) {
-+        struct stat stbuf;
-+        if (!stat(fname, &stbuf)) {
-+            /* Note:  this will sometimes be 1 too high when it is a very close call,
-+              because of the desire to have complete lines.  In such cases, we send
-+              a null final part */
-+            numparts = 1 + (stbuf.st_size / SplitSize);
-+        }
-+	fp = fopen(fname, "r");
-+	if (!fp) {
-+	    fprintf(stderr, "splitmail: Cannot read file %s\n", fname);
-+	    exit(-1);
-+	}
-+    } else fp = stdin;
-+    headend = bigbuf;
-+    while((c=getc(fp)) != EOF) {
-+        if (headend >= bigbuf + SplitSize) {
-+            fprintf(stderr, "splitmail: Could not find the end of the headers!\n");
-+            exit(-1);
-+        }
-+	*headend++ = c;
-+	if (c == '\n') {
-+	    if (InNewline) break; /* end of headers */
-+	    InNewline = 1;
-+	} else {
-+	    InNewline = 0;
-+	}
-+    }
-+    if (c == EOF) {
-+	fprintf(stderr, "splitmail: Could not find the end of the headers!\n");
-+	exit(-1);
-+    }
-+    *headend = '\0';
-+    SharedHeaders = malloc(1+strlen(bigbuf)); /* maximum size needed */
-+    if (!SharedHeaders) {
-+	fprintf(stderr, "splitmail: Not enough memory\n");
-+	exit(-1);
-+    }
-+    from = bigbuf;
-+    *SharedHeaders = '\0';
-+    strcpy(SubjectBuf, "Partial Message");
-+    while (from < headend) {
-+	s = endofheader(from);  /* would be index(from, '\n'),
-+				 but need to check for continuation lines */
-+        *s = '\0';
-+	if (ShareThisHeader(from, SubjectBuf, sizeof (SubjectBuf), &OrigID)) {
-+	    strcat(SharedHeaders, from);
-+	    strcat(SharedHeaders, "\n");
-+	}
-+	*s = '\n';
-+	from = ++s;
-+    }
-+    //#ifdef AMIGA
-+    //snprintf(id, sizeof(id), "%d.%s@%s%s", time(0), SeqToName(GetSequence(4)), FindConfig("NodeName"),
-+    //       FindConfig("DomainName"));
-+    //#else
-+    //#ifdef MSDOS
-+    //snprintf(id, sizeof(id), "%ld.UNKNOWN.SITE.NAME", time(NULL)); // BCR
-+    //#else
-+    snprintf(id, sizeof(id), "%d.%d.%d.%s", (int) getuid(), (int) getpid(), (int) time(0), getmyname());
-+    //#endif /* MSDOS */
-+    //#endif /* AMIGA */
-+    bytesread = headend - bigbuf;
-+    deliverycmd = Verbose ? VERBOSEDELIVERYCMD : NORMALDELIVERYCMD;
-+    while (!feof(fp)) {
-+	while (SplitSize > bytesread && !feof(fp)) {
-+	    /* Need to loop because fread is weird */
-+	    bytesread += fread(bigbuf + bytesread, sizeof(char), SplitSize - bytesread, fp);
-+	}
-+	/* Now complete the line */
-+	while((c=getc(fp)) != EOF) {
-+	    bigbuf[bytesread++] = c;
-+	    if (c=='\n') break;
-+	}
-+        bigbuf[bytesread] = '\0';
-+        if (feof(fp) && numparts <= 0) numparts = whichpart;
-+        HandleOnePart(DoDeliver, deliverycmd, prefix, numparts, whichpart, SharedHeaders, SubjectBuf, id, MessageID, bigbuf, OrigID);
-+	bytesread = 0;
-+	++whichpart;
-+    }
-+    while (whichpart <= numparts) {
-+        /* Our guess as to how many parts was OFF, hopefully only by one */
-+        *bigbuf = '\0'; /* have to deliver an empty part, ugh! */
-+        HandleOnePart(DoDeliver, deliverycmd, prefix, numparts, whichpart, SharedHeaders, SubjectBuf, id, MessageID, bigbuf, OrigID);
-+        ++whichpart;
-+    }
-+    return(0);
-+}
-+
-+HandleOnePart(DoDeliver, deliverycmd, prefix, numparts, whichpart, SharedHeaders, SubjectBuf, id, MessageID, bigbuf, OrigID)
-+int DoDeliver, numparts, whichpart;
-+char *deliverycmd, *prefix, *SharedHeaders, *SubjectBuf, *id, *MessageID, *bigbuf, *OrigID;
-+{
-+    FILE *fpout;
-+    char OutputFile[1000];
-+    int code;
-+    //    struct  timeval	tp;
-+    // struct  timezone	tzp;
-+    char    *tm_zone;
-+
-+    if (DoDeliver) {
-+        fpout = popen(deliverycmd, "w");
-+    } else {
-+    	int fd;
-+        snprintf(OutputFile, sizeof(OutputFile), "%s%d", prefix, whichpart);
-+        remove(OutputFile);
-+        fpout = NULL;
-+        fd = open(OutputFile, O_WRONLY|O_CREAT|O_EXCL, 0600);
-+        if (fd != -1) fpout = fdopen(fd, "w");
-+    }
-+    if (!fpout) {
-+	fprintf(stderr, "splitmail: Can't open %s for writing\n", DoDeliver ? deliverycmd : OutputFile);
-+        exit(-1);
-+    }
-+    if (numparts != 1) { /* one-parters end up not changed at all! */
-+        struct tm *gt;
-+        time_t clock;
-+        int secsoff, hrsoff, minsoff;
-+        char signoff='+';
-+
-+	fputs(SharedHeaders, fpout);
-+	if (OrigID) fprintf(fpout, "References: %s\n", OrigID);
-+
-+        clock=time(0);
-+        gt = (struct tm*) gmtime(&clock);
-+        hrsoff=minsoff=0;
-+        fprintf(fpout, "Date: %s, %02d %s %d %02d:%02d:%02d %c%02d%02d (GMT)\n", DayNames[gt->tm_wday],
-+                 gt->tm_mday, MonthNames[gt->tm_mon], 1900+gt->tm_year, gt->tm_hour,
-+                 gt->tm_min, gt->tm_sec, signoff, hrsoff, minsoff);
-+	//#else
-+        //clock=time(0);
-+        //gt = localtime(&clock);
-+	//gettimeofday(&tp, &tzp);
-+	//tm_zone = (char *)timezone(tzp.tz_minuteswest, gt->tm_isdst);
-+	//secsoff = tzp.tz_minuteswest * 60;
-+	//#else
-+        secsoff= gt->tm_gmtoff;
-+	//#endif
-+        if (secsoff < 0) {
-+            signoff = '-';
-+            secsoff *= -1;
-+        }
-+        hrsoff = secsoff / 3600;
-+        minsoff = (secsoff - (3600*hrsoff)) / 60;
-+        fprintf(fpout, "Date: %s, %02d %s %d %02d:%02d:%02d %c%02d%02d (%s)\n",
-+		DayNames[gt->tm_wday], gt->tm_mday, MonthNames[gt->tm_mon],
-+		1900+gt->tm_year, gt->tm_hour, 
-+		gt->tm_min, gt->tm_sec, signoff, hrsoff, minsoff, gt->tm_zone);
-+
-+        if( MessageID) {
-+            fprintf(fpout, "Message-Id: <%d.%s.%s>\n",whichpart,id,MessageID);
-+        }
-+        fprintf(fpout, "Subject: %s (part %d of ", SubjectBuf, whichpart);
-+        if (numparts > 0) {
-+            fprintf(fpout, "%d)\n", numparts);
-+        } else {
-+            fprintf(fpout, "several)\n");
-+        }
-+        fprintf(fpout, "Content-type: message/partial; id=\"%s\"; number=%d", id, whichpart);
-+        if (numparts > 0) fprintf(fpout, "; total=%d", numparts);
-+        fprintf(fpout, "\nMIME-Version: 1.0\n\n");
-+    }
-+    fputs(bigbuf, fpout);
-+    code = DoDeliver ? pclose(fpout) : fclose(fpout);
-+    if (code) {
-+        fprintf(stderr, "splitmail: %s of part %d failed\n", DoDeliver ? "Delivery" : "Writing", whichpart);
-+        if (whichpart > 1) fprintf(stderr, "  (previous %d parts may have succeeded)\n", whichpart -1);
-+        exit(-1);
-+    }
-+}
-+
-+static char *SharedHeads[] = {
-+    "from",
-+    "to",
-+    "cc",
-+    "bcc",
-+    "newsgroup",
-+    "newsgroups",
-+    NULL
-+};
-+
-+ShareThisHeader(s, SubjectBuf, size, OrigID)
-+char *s;
-+char *SubjectBuf;
-+size_t size;
-+char **OrigID;
-+{
-+    int i;
-+    char *colon = index(s, ':');
-+    if (!colon) return(0); /* don't share it in all parts */
-+    *colon = '\0';
-+    if (!ULstrcmp(s, "message-id")) {
-+        *colon = ':';
-+	*OrigID = malloc(1+strlen(++colon));
-+	if (! *OrigID) {
-+	    fprintf(stderr, "splitmail: Not enough memory\n");
-+	    exit(-1);
-+	}
-+	while (*colon && isspace(*colon)) {++colon;}
-+        strcpy(*OrigID, colon);
-+        return(0);
-+    }
-+    if (!ULstrcmp(s, "subject")) {
-+        *colon = ':';
-+        strncpy(SubjectBuf, ++colon, size);
-+        SubjectBuf[size - 1] = '\0';
-+        return(0);
-+    }
-+    if (!ULstrcmp(s, "content-type")) {
-+        if (IllegalContentType(colon+1)) {
-+            fprintf(stderr, "splitmail: message has illegal content-type header, delivery cancelled.\n");
-+            exit(-1);
-+        }
-+    }
-+    for (i=0; SharedHeads[i]; ++i) {
-+	if (!ULstrcmp(s, SharedHeads[i])) break;
-+    }
-+    *colon = ':';
-+    return(SharedHeads[i] ? 1 : 0);
-+}
-+
-+static char *tspecials = "()<>@,;:\\\"/[]?.=";
-+
-+IllegalContentType(ctype)
-+char *ctype;
-+{
-+    char *ct, *semicolon, *st, *s, *param, *eq, *matcheq;
-+    ct = malloc(1+strlen(ctype));
-+    if (!ct) {
-+        fprintf(stderr, "splitmail: out of memory!\n");
-+        exit(-1);
-+    }
-+    strcpy(ct, ctype);
-+    semicolon = index(ct, ';');
-+    if (semicolon) *semicolon = 0;
-+    st = index(ct, '/');
-+    if (!st) {
-+        fprintf(stderr, "Illegal content-type specification: %s\nAll MIME content-type headers must contain a type/subtype specification.\n", ctype);
-+        return(-1);
-+    }
-+    if (st) *st++ = 0;
-+    for (s = ct; *s; ++s) {
-+        if (!isprint(*s) || index(tspecials, *s)) {
-+            fprintf(stderr, "Illegal content-type specification: %s\nThe character '%c' (ASCII %d) is illegal in a MIME content-type.\n", ctype, *s, *s);
-+            return(-1);
-+        }
-+    }
-+    for (s = st; s && *s; ++s) {
-+        if (!isprint(*s) || index(tspecials, *s)) {
-+            fprintf(stderr, "Illegal content-type specification: %s\nThe character '%c' (ASCII %d) is illegal in a MIME content-subtype.\n", ctype, *s, *s);
-+            return(-1);
-+        }
-+    }
-+    while (semicolon) {
-+        param = ++semicolon;
-+        while (*param && isspace(*param)) ++param;
-+        semicolon = index(param, ';');
-+        if (semicolon) *semicolon = 0;
-+        eq = index(param, '=');
-+        if (eq) *eq++ = 0;
-+        for (s = param; *s; ++s) {
-+            if (!isprint(*s) || index(tspecials, *s)) {
-+                fprintf(stderr, "Illegal content-type specification: %s\nThe character '%c' (ASCII %d) is illegal in a MIME content-type parameter name.\n", ctype, *s, *s);
-+                return(-1);
-+            }
-+        }
-+        while (*eq && isspace(*eq)) ++eq;
-+        if (*eq == '\"') {
-+            matcheq = eq;
-+            do {
-+                matcheq = index(matcheq+1, '\"');
-+                if (!matcheq) {
-+                    fprintf(stderr, "Illegal content-type specification: %s\nA quoted MIME parameter value must have matching quotation marks.\n", ctype);
-+                    return(-1);
-+                }
-+            } while (*(matcheq-1) == '\\');
-+            while (*++matcheq) {
-+                if (!isspace(*matcheq)) {
-+                    fprintf(stderr, "Illegal content-type specification: %s\nA quoted MIME parameter value must stop after the closing quotation mark.\n", ctype);
-+                    return(-1);
-+                }
-+            }
-+        } else {
-+            for (s = eq; s && *s; ++s) {
-+                if (!isprint(*s) || index(tspecials, *s)) {
-+                    fprintf(stderr, "Illegal content-type specification: %s\nThe character '%c' (ASCII %d) is illegal in an unquoted MIME parameter value.\n", ctype, *s, *s);
-+                    return(-1);
-+                }
-+            }
-+        }
-+    }
-+    free(ct);
-+    return(0);
-+}
-+
-+int ULstrcmp(s1, s2)
-+register char *s1, *s2;
-+{
-+    char c1,c2;
-+
-+    for(;;) {
-+	c1 = *s1++; if (c1 <= 'Z') if (c1 >= 'A') c1 += 040;
-+	c2 = *s2++; if (c2 <= 'Z') if (c2 >= 'A') c2 += 040;
-+	if (c1 != c2) break;
-+	if (c1 == '\0') return(0);
-+    }
-+    return(c1 - c2);
-+}
-+
-+/* STILL TO DO:  
-+  Get number of parts right when possible 
-+*/
---- metamail-2.7.orig/src/Makefile.am
-+++ metamail-2.7/src/Makefile.am
-@@ -0,0 +1,3 @@
-+MAINTAINERCLEANFILES	= Makefile.in
-+
-+SUBDIRS			= metamail richmail
---- metamail-2.7.orig/src/Makefile.in
-+++ metamail-2.7/src/Makefile.in
-@@ -0,0 +1,298 @@
-+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+
-+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
-+bindir = @bindir@
-+sbindir = @sbindir@
-+libexecdir = @libexecdir@
-+datadir = @datadir@
-+sysconfdir = @sysconfdir@
-+sharedstatedir = @sharedstatedir@
-+localstatedir = @localstatedir@
-+libdir = @libdir@
-+infodir = @infodir@
-+mandir = @mandir@
-+includedir = @includedir@
-+oldincludedir = /usr/include
-+
-+DESTDIR =
-+
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+
-+top_builddir = ..
-+
-+ACLOCAL = @ACLOCAL@
-+AUTOCONF = @AUTOCONF@
-+AUTOMAKE = @AUTOMAKE@
-+AUTOHEADER = @AUTOHEADER@
-+
-+INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+transform = @program_transform_name@
-+
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+host_alias = @host_alias@
-+host_triplet = @host@
-+AS = @AS@
-+CATCOMMAND = @CATCOMMAND@
-+CC = @CC@
-+DLLTOOL = @DLLTOOL@
-+ECHO = @ECHO@
-+EXEEXT = @EXEEXT@
-+LIBTOOL = @LIBTOOL@
-+LIBTOOL_DEPS = @LIBTOOL_DEPS@
-+LN_S = @LN_S@
-+LPRCOMMAND = @LPRCOMMAND@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAKEINFO = @MAKEINFO@
-+OBJDUMP = @OBJDUMP@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+RANLIB = @RANLIB@
-+STRIP = @STRIP@
-+VERSION = @VERSION@
-+ac_aux_dir = @ac_aux_dir@
-+
-+MAINTAINERCLEANFILES = Makefile.in
-+
-+SUBDIRS = metamail richmail
-+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-+CONFIG_HEADER = ../metamail/config.h
-+CONFIG_CLEAN_FILES = 
-+DIST_COMMON =  Makefile.am Makefile.in
-+
-+
-+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-+
-+TAR = tar
-+GZIP_ENV = --best
-+all: all-redirect
-+.SUFFIXES:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-+	cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile
-+
-+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-+	cd $(top_builddir) \
-+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
-+
-+# This directory's subdirectories are mostly independent; you can cd
-+# into them and run `make' without going through this Makefile.
-+# To change the values of `make' variables: instead of editing Makefiles,
-+# (1) if the variable is set in `config.status', edit `config.status'
-+#     (which will cause the Makefiles to be regenerated when you run `make');
-+# (2) otherwise, pass the desired values on the `make' command line.
-+
-+@SET_MAKE@
-+
-+all-recursive install-data-recursive install-exec-recursive \
-+installdirs-recursive install-recursive uninstall-recursive  \
-+check-recursive installcheck-recursive info-recursive dvi-recursive:
-+	@set fnord $(MAKEFLAGS); amf=$$2; \
-+	dot_seen=no; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    dot_seen=yes; \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	done; \
-+	if test "$$dot_seen" = "no"; then \
-+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-+	fi; test -z "$$fail"
-+
-+mostlyclean-recursive clean-recursive distclean-recursive \
-+maintainer-clean-recursive:
-+	@set fnord $(MAKEFLAGS); amf=$$2; \
-+	dot_seen=no; \
-+	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  rev="$$subdir $$rev"; \
-+	  test "$$subdir" != "." || dot_seen=yes; \
-+	done; \
-+	test "$$dot_seen" = "no" && rev=". $$rev"; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	for subdir in $$rev; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	done && test -z "$$fail"
-+tags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-+	done
-+
-+tags: TAGS
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP)
-+	list='$(SOURCES) $(HEADERS)'; \
-+	unique=`for i in $$list; do echo $$i; done | \
-+	  awk '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	here=`pwd` && cd $(srcdir) \
-+	  && mkid -f$$here/ID $$unique $(LISP)
-+
-+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+   if test "$$subdir" = .; then :; else \
-+	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-+   fi; \
-+	done; \
-+	list='$(SOURCES) $(HEADERS)'; \
-+	unique=`for i in $$list; do echo $$i; done | \
-+	  awk '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-+	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
-+
-+mostlyclean-tags:
-+
-+clean-tags:
-+
-+distclean-tags:
-+	-rm -f TAGS ID
-+
-+maintainer-clean-tags:
-+
-+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-+
-+subdir = src
-+
-+distdir: $(DISTFILES)
-+	here=`cd $(top_builddir) && pwd`; \
-+	top_distdir=`cd $(top_distdir) && pwd`; \
-+	distdir=`cd $(distdir) && pwd`; \
-+	cd $(top_srcdir) \
-+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign src/Makefile
-+	@for file in $(DISTFILES); do \
-+	  d=$(srcdir); \
-+	  if test -d $$d/$$file; then \
-+	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	  fi; \
-+	done
-+	for subdir in $(SUBDIRS); do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test -d $(distdir)/$$subdir \
-+	    || mkdir $(distdir)/$$subdir \
-+	    || exit 1; \
-+	    chmod 777 $(distdir)/$$subdir; \
-+	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
-+	      || exit 1; \
-+	  fi; \
-+	done
-+info-am:
-+info: info-recursive
-+dvi-am:
-+dvi: dvi-recursive
-+check-am: all-am
-+check: check-recursive
-+installcheck-am:
-+installcheck: installcheck-recursive
-+install-exec-am:
-+install-exec: install-exec-recursive
-+
-+install-data-am:
-+install-data: install-data-recursive
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+install: install-recursive
-+uninstall-am:
-+uninstall: uninstall-recursive
-+all-am: Makefile
-+all-redirect: all-recursive
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-+installdirs: installdirs-recursive
-+installdirs-am:
-+
-+
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+
-+maintainer-clean-generic:
-+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-+mostlyclean-am:  mostlyclean-tags mostlyclean-generic
-+
-+mostlyclean: mostlyclean-recursive
-+
-+clean-am:  clean-tags clean-generic mostlyclean-am
-+
-+clean: clean-recursive
-+
-+distclean-am:  distclean-tags distclean-generic clean-am
-+	-rm -f libtool
-+
-+distclean: distclean-recursive
-+
-+maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-+		distclean-am
-+	@echo "This command is intended for maintainers to use;"
-+	@echo "it deletes files that may require special tools to rebuild."
-+
-+maintainer-clean: maintainer-clean-recursive
-+
-+.PHONY: install-data-recursive uninstall-data-recursive \
-+install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-+uninstalldirs-recursive all-recursive check-recursive \
-+installcheck-recursive info-recursive dvi-recursive \
-+mostlyclean-recursive distclean-recursive clean-recursive \
-+maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-+distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-+install-exec install-data-am install-data install-am install \
-+uninstall-am uninstall all-redirect all-am all installdirs-am \
-+installdirs mostlyclean-generic distclean-generic clean-generic \
-+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-+
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
---- metamail-2.7.orig/src/richmail/COMMANDS
-+++ metamail-2.7/src/richmail/COMMANDS
-@@ -0,0 +1,29 @@
-+Commands for changing character sets in richtext:
-+
-+Japanese:
-+
-+<iso-2022-jp>		ISO-2022 encoding for mixed US-ASCII and JIS.
-+<x-jis-x0201-1976>	Variant of US-ASCII for Japan.
-+<x-jis-x0201>		Variant of US-ASCII for Japan.
-+<x-jis-x0208-1978>	JIS X 0208-1978
-+<x-jis-x0208-1983>	JIS X 0208-1983
-+<x-jis-x0208>		JIS X 0208-1983
-+
-+Korean:
-+
-+<iso-2022-kr>		ISO-2022 encoding for mixed US-ASCII and Korean.
-+<x-ksc-5601>		2-byte encoding of Hangul without shift/escape seqs.
-+
-+Internal commands:
-+
-+<x-iso-2022-gen-HH>	Used for ISO-2022 escape seqences.
-+<x-iso-shift-in>	SI character
-+<x-iso-shift-out>	SO character
-+<x-iso-charset-HH>	Used for ISO-2022 ESC$)? character set designators.
-+
-+Notes:
-+
-+<iso-2022-*> text sequences may contain ISO-2022 escape sequences for changing
-+character sets.  <x-jis-*-*> and <x-ksc-*> text sequences can also contain
-+such escape sequences, but they start out in 2-byte mode, and are intended
-+mainly for 2-byte character sequences, rather than a mixture.
---- metamail-2.7.orig/src/richmail/NOTES
-+++ metamail-2.7/src/richmail/NOTES
-@@ -0,0 +1,7 @@
-+
-+"richtext.c" may be used as a library in another program, by defining the
-+macro RICHTEXT_LIBRARY when it is compiled and calling the function
-+"richtext_main(argc, argv)" with the arguments set to the normal richtext
-+command-line arguments.  It is also necessary to link with "richlex.c",
-+"richset.c", "usascii.c" and "iso2022.c" which provide services to
-+"richtext.c".
---- metamail-2.7.orig/src/richmail/usascii.c
-+++ metamail-2.7/src/richmail/usascii.c
-@@ -0,0 +1,129 @@
-+/*-------------------------------------------------------------------------
-+
-+  usascii.c - Code for the US-ASCII specific parts of the richtext processor.
-+ 
-+  Copyright (c) 1992 Rhys Weatherley
-+
-+  Permission to use, copy, modify, and distribute this material
-+  for any purpose and without fee is hereby granted, provided
-+  that the above copyright notice and this permission notice
-+  appear in all copies, and that the name of Rhys Weatherley not be
-+  used in advertising or publicity pertaining to this
-+  material without specific, prior written permission.
-+  RHYS WEATHERLEY MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR
-+  SUITABILITY OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED
-+  "AS IS", WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+  Revision History:
-+  ================
-+
-+   Version  DD/MM/YY  By  Description
-+   -------  --------  --  --------------------------------------
-+     1.0    21/06/92  RW  Original Version of usascii.c
-+
-+  You may contact the author by:
-+  =============================
-+
-+   e-mail: rhys@cs.uq.oz.au
-+     mail: Rhys Weatherley
-+	   5 Horizon Drive
-+	   Jamboree Heights
-+	   Queensland 4074
-+	   Australia
-+
-+-------------------------------------------------------------------------*/
-+
-+#include <stdio.h>
-+#include <metamail/common.h>
-+
-+#include "richlex.h"
-+#include "richset.h"
-+
-+/*
-+ * Initialise the US-ASCII character set processor.
-+ */
-+usascii_init (name)
-+char	*name;
-+{
-+    if (name)
-+	richtextencoding (RICH_ENC_US_ASCII);
-+}
-+
-+/*
-+ * Process a command for the US-ASCII processor.
-+ */
-+int	usascii_command (token,negated)
-+char	*token;
-+int	negated;
-+{
-+    if (!strcmp(token,"us-ascii")) {
-+    	if (negated) {
-+	    charsetpop (&usascii_charset);
-+	} else {
-+	    charsetpush (&usascii_charset);
-+	    richtextencoding (RICH_ENC_US_ASCII);
-+	}
-+	return (1);
-+    } else {
-+    	return (0);
-+    }
-+}
-+
-+/*
-+ * Check for singleton US-ASCII tokens.
-+ */
-+int	usascii_single (token)
-+char	*token;
-+{
-+    return (0);
-+}
-+
-+/*
-+ * Determine the width of a US-ASCII character.
-+ */
-+int	usascii_width (ch)
-+RCHAR	ch;
-+{
-+    return (1);
-+}
-+
-+/*
-+ * Determine if the current character can be used as a folding point.
-+ */
-+int	usascii_fold (ch)
-+RCHAR	ch;
-+{
-+    return (ch < 0x7F && isspace (ch));
-+}
-+
-+/*
-+ * Render the given US-ASCII character.
-+ */
-+usascii_render (ch,param)
-+RCHAR	ch;
-+void	*param;
-+{
-+    (*RichtextPutc) ((int)ch,param);
-+}
-+
-+/*
-+ * Enter or leave the US-ASCII encoding.
-+ */
-+usascii_encoding (newenc)
-+int	newenc;
-+{
-+    /* Nothing to be done in this version */
-+}
-+
-+/*
-+ * Define the US-ASCII character set processor.
-+ */
-+struct 	charsetproc	usascii_charset =
-+	  {"us-ascii",
-+	   usascii_init,
-+	   usascii_command,
-+	   usascii_single,
-+	   usascii_width,
-+	   usascii_fold,
-+	   usascii_render,
-+	   usascii_encoding};
---- metamail-2.7.orig/src/richmail/iso2022.c
-+++ metamail-2.7/src/richmail/iso2022.c
-@@ -0,0 +1,375 @@
-+/*-------------------------------------------------------------------------
-+
-+  iso2022.c - Code for the ISO-2022 specific parts of the richtext processor.
-+ 
-+  Copyright (c) 1992 Rhys Weatherley
-+
-+  Permission to use, copy, modify, and distribute this material
-+  for any purpose and without fee is hereby granted, provided
-+  that the above copyright notice and this permission notice
-+  appear in all copies, and that the name of Rhys Weatherley not be
-+  used in advertising or publicity pertaining to this
-+  material without specific, prior written permission.
-+  RHYS WEATHERLEY MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR
-+  SUITABILITY OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED
-+  "AS IS", WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+  Revision History:
-+  ================
-+
-+   Version  DD/MM/YY  By  Description
-+   -------  --------  --  --------------------------------------
-+     1.0    21/06/92  RW  Original Version of iso2022.c
-+
-+  You may contact the author by:
-+  =============================
-+
-+   e-mail: rhys@cs.uq.oz.au
-+     mail: Rhys Weatherley
-+	   5 Horizon Drive
-+	   Jamboree Heights
-+	   Queensland 4074
-+	   Australia
-+
-+  Acknowledgements:
-+  ================
-+
-+  Many thanks to Yutaka Sato (ysato@etl.go.jp) for protyping ISO-2022
-+  support in a previous version of richtext, on whose code this is based.
-+
-+-------------------------------------------------------------------------*/
-+
-+#include <metamail/common.h>
-+
-+#include "richlex.h"
-+#include "richset.h"
-+
-+/*
-+ * Global data for this module.
-+ */
-+static	int	SwToAscii;
-+static	int	SwToOther;
-+static	int	OutPrevChar;
-+static	int	OutPrevPrevChar;
-+static	int	OutCharLen;
-+static	int	OutCharSet;
-+static	int	OutAsciiMode;
-+
-+#define	OUT_ASCII	0
-+#define	OUT_JIS		1
-+#define	OUT_KSC		2
-+
-+#define	ESC		033
-+#define	SO		016
-+#define	SI		017
-+
-+#define	ISO_GENERIC_PREFIX	"x-iso-2022-gen-"
-+#define	ISO_GENERIC_LEN		15
-+#define	ISO_SHIFT_PREFIX	"x-iso-shift-"
-+#define	ISO_SHIFT_LEN		12
-+#define	ISO_CHARSET_PREFIX	"x-iso-charset-"
-+#define	ISO_CHARSET_LEN		14
-+
-+/*
-+ * Initialise the ISO-2022 character set processor.
-+ */
-+iso2022_init (name)
-+char	*name;
-+{
-+    SwToAscii = 'B';
-+    SwToOther = 'B';
-+    OutPrevChar = 0;
-+    OutPrevPrevChar = 0;
-+    OutCharLen = 1;
-+    OutCharSet = OUT_ASCII;
-+    OutAsciiMode = RICH_ENC_US_ASCII;
-+    if (!name)
-+	return;
-+    if (!strncmp (name,"iso-2022-jp",11))
-+	richtextencoding (RICH_ENC_JP_ASCII);
-+    else if (!strncmp (name,"iso-2022-kr",11)) {
-+	richtextencoding (RICH_ENC_KR_ASCII);
-+	controloutput("\033$)C",0);
-+    } else
-+	richtextencoding (RICH_ENC_US_ASCII);
-+}
-+
-+/*
-+ * Process a command for the ISO-2022 processor.
-+ */
-+int	iso2022_command (token,negated)
-+char	*token;
-+int	negated;
-+{
-+    int swchar;
-+    if (!strcmp(token,"iso-2022-jp")) {
-+    	if (negated) {
-+	    /* Return to previous output mode */
-+	    controloutput("\033(B",0);
-+	    SwToAscii = 'B';
-+	    charsetpop(&iso2022_charset);
-+	} else {
-+	    /* Enter JIS-X0208-1983 output mode */
-+	    charsetpush(&iso2022_charset);
-+	    richtextencoding(RICH_ENC_US_ASCII);
-+	    controloutput("\033(B",0);
-+	    SwToOther = 'B';
-+	}
-+	return (1);
-+    } else if (!strcmp(token,"iso-2022-kr")) {
-+	if (negated) {
-+	    /* Return to previous output mode */
-+	    controloutput("\017",0);
-+	    charsetpop(&iso2022_charset);
-+	} else {
-+	    /* Enter KSC-5601 output mode */
-+	    charsetpush(&iso2022_charset);
-+	    richtextencoding(RICH_ENC_KR_ASCII);
-+	    controloutput("\033$)C\017",0);
-+	}
-+	return (1);
-+    } else if (!strncmp(token,"x-jis-x0201",11)) {
-+    	if (negated) {
-+	    /* Return to previous output mode */
-+	    controloutput("\033(B",0);
-+	    SwToAscii = 'B';
-+	    charsetpop(&iso2022_charset);
-+	} else {
-+	    /* Enter JIS-X-0201-1976 output mode */
-+	    charsetpush(&iso2022_charset);
-+	    richtextencoding(RICH_ENC_JP_ASCII);
-+	    controloutput("\033(J",0);
-+	    SwToAscii = 'J';
-+	}
-+	return (1);
-+    } else if (!strncmp(token,"x-jis-x0208",11)) {
-+    	if (negated) {
-+	    /* Return to previous output mode */
-+	    controloutput("\033(B",0);
-+	    SwToAscii = 'B';
-+	    charsetpop(&iso2022_charset);
-+	} else {
-+	    /* Enter JIS-X0208-* output mode */
-+	    charsetpush(&iso2022_charset);
-+	    if (!strcmp (token + 11,"-1978"))
-+		SwToOther = '@';
-+	    else
-+		SwToOther = 'B';
-+	    richtextencoding((SwToOther == '@' ? RICH_ENC_JIS_1978 :
-+					      RICH_ENC_JIS_1983));
-+	    controloutput("\033$",0);
-+	    controlputc(SwToOther);
-+	}
-+	return (1);
-+    } else if (!strcmp(token,"x-ksc-5601")) {
-+    	if (negated) {
-+	    /* Return to previous output mode */
-+	    controloutput("\017",0);
-+	    charsetpop(&iso2022_charset);
-+	} else {
-+	    /* Enter KSC-5601 output mode */
-+	    charsetpush(&iso2022_charset);
-+	    richtextencoding(RICH_ENC_KSC_5601);
-+	    controloutput("\033$)C\016",0);
-+	}
-+	return (1);
-+    } else if (!strncmp (token,ISO_GENERIC_PREFIX,ISO_GENERIC_LEN)) {
-+    	/* Process an escape sequence for changing character sets */
-+	sscanf(token + ISO_GENERIC_LEN,"%x",&swchar);
-+	if (swchar <= ' ' || swchar >= 0x7F)
-+	    return (1);
-+	if (negated) {
-+	    /* Return to previous output mode from multi-byte mode */
-+	    if (!charsettop(&iso2022_charset))
-+	      charsetpush(&iso2022_charset);
-+	    richtextencoding((swchar == 'J' ? RICH_ENC_JP_ASCII :
-+					      RICH_ENC_US_ASCII));
-+	    controloutput("\033(",0);
-+	    controlputc(swchar);
-+	    SwToAscii = swchar;
-+	} else {
-+	    /* Enter multi-byte (Japanese) mode */
-+	    if (!charsettop(&iso2022_charset))
-+	      charsetpush(&iso2022_charset);
-+	    richtextencoding((swchar == '@' ? RICH_ENC_JIS_1978 :
-+					      RICH_ENC_JIS_1983));
-+	    controloutput("\033$",0);
-+	    controlputc(swchar);
-+	    SwToOther = swchar;
-+	}
-+	return (1);
-+    } else if (!strncmp (token,ISO_SHIFT_PREFIX,ISO_SHIFT_LEN)) {
-+    	/* Process a character set shift sequence */
-+	if (!strcmp(token + ISO_SHIFT_LEN,"out") &&
-+	    	RichtextCharEncoding == RICH_ENC_KR_ASCII) {
-+	    /* Enter KSC-5601 2-byte mode */
-+	    if (!charsettop(&iso2022_charset))
-+	      charsetpush(&iso2022_charset);
-+	    richtextencoding(RICH_ENC_KSC_5601);
-+	    controloutput("\016",0);
-+	} else if (!strcmp (token + ISO_SHIFT_LEN,"in") &&
-+		RichtextCharEncoding == RICH_ENC_KSC_5601) {
-+	    /* Return to US-ASCII from KSC-5601 */
-+	    if (!charsettop(&iso2022_charset))
-+	      charsetpush(&iso2022_charset);
-+	    richtextencoding(RICH_ENC_KR_ASCII);
-+	    controloutput("\017",0);
-+	}
-+	return (1);
-+    } else {
-+    	return (0);
-+    }
-+}
-+
-+/*
-+ * Check for singleton ISO-2022 tokens.
-+ */
-+int	iso2022_single (token)
-+char	*token;
-+{
-+    return (!strncmp (token,ISO_GENERIC_PREFIX,ISO_GENERIC_LEN) ||
-+	    !strncmp (token,ISO_SHIFT_PREFIX,ISO_SHIFT_LEN) ||
-+	    !strncmp (token,ISO_CHARSET_PREFIX,ISO_CHARSET_LEN));
-+}
-+
-+/*
-+ * Determine the width of a ISO-2022 character.
-+ */
-+int	iso2022_width (ch)
-+RCHAR	ch;
-+{
-+    return (ch & 0xFF00 ? 2 : 1);
-+}
-+
-+/*
-+ * Determine if the current character can be used as a folding point.
-+ */
-+int	iso2022_fold (ch)
-+RCHAR	ch;
-+{
-+    if (ch < 0x7F && isspace (ch)) {
-+    	return (1);
-+    } else {
-+        return ((ch & 0xFF00) != 0);
-+    }
-+}
-+
-+/*
-+ * Render the given ISO-2022 character.
-+ */
-+iso2022_render (ch,param)
-+RCHAR	ch;
-+void	*param;
-+{
-+    if (ch & 0xFF00) {
-+	if (OutCharLen < 2) {
-+	    /* Add extra escape sequences after stray ASCII characters */
-+	    /* This normally happens in excerpts and signatures, etc.  */
-+	    if (OutAsciiMode == RICH_ENC_JP_ASCII) {
-+		(*RichtextPutc) (033,param);
-+		(*RichtextPutc) ('$',param);
-+		(*RichtextPutc) (SwToOther,param);
-+	    } else if (OutAsciiMode == RICH_ENC_KR_ASCII) {
-+		(*RichtextPutc) (SO,param);
-+	    }
-+	}
-+        (*RichtextPutc) ((int)((ch & 0xFF00) >> 8),param);
-+        (*RichtextPutc) ((int)(ch & 0xFF),param);
-+    } else {
-+	if (OutCharLen > 1 && ch >= 0x20) {
-+	    /* Add extra escape sequences before stray ASCII characters */
-+	    /* This normally happens in excerpts and signatures, etc.   */
-+	    if (OutAsciiMode == RICH_ENC_JP_ASCII) {
-+		(*RichtextPutc) (033,param);
-+		(*RichtextPutc) ('(',param);
-+		(*RichtextPutc) (SwToAscii,param);
-+	    } else if (OutAsciiMode == RICH_ENC_KR_ASCII) {
-+		(*RichtextPutc) (SI,param);
-+	    }
-+	}
-+	(*RichtextPutc) ((int)(ch & 0xFF),param);
-+    }
-+}
-+
-+/*
-+ * Enter or leave the ISO-2022 encoding.
-+ */
-+iso2022_encoding (newenc)
-+int	newenc;
-+{
-+    switch (newenc) {
-+	case RICH_ENC_US_ASCII: controloutput("\033(B",0); break;
-+	case RICH_ENC_JP_ASCII: controloutput("\033(J",0); break;
-+	case RICH_ENC_KR_ASCII: controloutput("\017",0);   break;
-+	case RICH_ENC_JIS_1978: controloutput("\033$@",0); break;
-+	case RICH_ENC_JIS_1983: controloutput("\033$B",0); break;
-+	case RICH_ENC_KSC_5601: controloutput("\016",0);   break;
-+	default:		controloutput("\033(B",0); break;
-+    }
-+}
-+
-+/*
-+ * Define the ISO-2022-JP and ISO-2022-KR character set processor.
-+ */
-+struct 	charsetproc	iso2022_charset =
-+	  {"iso-2022-jp:iso-2022-kr",
-+	   iso2022_init,
-+	   iso2022_command,
-+	   iso2022_single,
-+	   iso2022_width,
-+	   iso2022_fold,
-+	   iso2022_render,
-+	   iso2022_encoding};
-+
-+/*
-+ * Define an output routine for slotting into RichtextPutc so
-+ * that ISO-2022 escape sequences are treated correctly.
-+ */
-+int	iso2022_fputc (ch,file)
-+int	ch;
-+FILE	*file;
-+{
-+    if (OutPrevChar == ESC && ch == '(') {
-+	/* Process escape sequences that end JIS 2-byte modes */
-+	OutCharLen = 1;
-+	OutCharSet = OUT_ASCII;
-+	OutAsciiMode = RICH_ENC_JP_ASCII;
-+    }
-+    if (OutPrevPrevChar == ESC && OutPrevChar == '$') {
-+	/* Process escape sequences that start JIS 2-byte modes */
-+        if (ch != ')') {	/* ')' is for Korean, so ignore it */
-+	    OutCharLen = 2;
-+	    OutCharSet = OUT_JIS;
-+	    OutAsciiMode = RICH_ENC_JP_ASCII;
-+	}
-+    }
-+    if (ch == SO) {
-+	OutCharLen = 2;
-+	OutCharSet = OUT_KSC;
-+	OutAsciiMode = RICH_ENC_KR_ASCII;
-+    } else if (ch == SI) {
-+	OutCharLen = 1;
-+	OutCharSet = OUT_ASCII;
-+	OutAsciiMode = RICH_ENC_KR_ASCII;
-+    }
-+    if (ch == '\n' && OutCharLen == 2) {
-+        /* Two-byte characters cannot cross line boundaries */
-+	if (OutCharSet == OUT_JIS) {
-+            fputc (ESC,file);
-+            fputc ('(',file);
-+            fputc (SwToAscii,file);
-+            fputc ('\n',file);
-+            fputc (ESC,file);
-+            fputc ('$',file);
-+            fputc (SwToOther,file);
-+	} else if (OutCharSet == OUT_KSC) {
-+	    fputc (SI,file);
-+	    fputc ('\n',file);
-+	    fputc (SO,file);
-+	}
-+    } else {
-+        fputc (ch,file);
-+    }
-+    OutPrevPrevChar = OutPrevChar;
-+    OutPrevChar = ch;
-+}
---- metamail-2.7.orig/src/richmail/Makefile.am
-+++ metamail-2.7/src/richmail/Makefile.am
-@@ -0,0 +1,15 @@
-+MAINTAINERCLEANFILES    = Makefile.in
-+
-+CFLAGS			= -lncurses
-+
-+INCLUDES                = -I$(top_builddir) -I$(top_builddir)/metamail \
-+                        -I$(top_srcdir) -I$(top_srcdir)/metamail
-+
-+bin_PROGRAMS            = richtext richtoatk
-+
-+richtext_SOURCES	= richtext.c richlex.c richset.c usascii.c iso2022.c
-+richtext_LDADD		= $(top_builddir)/metamail/libmetamail.la
-+
-+richtoatk_SOURCES	= richtoatk.c richlex.c richset.c usascii.c iso2022.c
-+richtoatk_LDADD		= $(top_builddir)/metamail/libmetamail.la
-+
---- metamail-2.7.orig/src/richmail/Makefile.in
-+++ metamail-2.7/src/richmail/Makefile.in
-@@ -0,0 +1,376 @@
-+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+
-+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
-+bindir = @bindir@
-+sbindir = @sbindir@
-+libexecdir = @libexecdir@
-+datadir = @datadir@
-+sysconfdir = @sysconfdir@
-+sharedstatedir = @sharedstatedir@
-+localstatedir = @localstatedir@
-+libdir = @libdir@
-+infodir = @infodir@
-+mandir = @mandir@
-+includedir = @includedir@
-+oldincludedir = /usr/include
-+
-+DESTDIR =
-+
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+
-+top_builddir = ../..
-+
-+ACLOCAL = @ACLOCAL@
-+AUTOCONF = @AUTOCONF@
-+AUTOMAKE = @AUTOMAKE@
-+AUTOHEADER = @AUTOHEADER@
-+
-+INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+transform = @program_transform_name@
-+
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+host_alias = @host_alias@
-+host_triplet = @host@
-+AS = @AS@
-+CATCOMMAND = @CATCOMMAND@
-+CC = @CC@
-+DLLTOOL = @DLLTOOL@
-+ECHO = @ECHO@
-+EXEEXT = @EXEEXT@
-+LIBTOOL = @LIBTOOL@
-+LIBTOOL_DEPS = @LIBTOOL_DEPS@
-+LN_S = @LN_S@
-+LPRCOMMAND = @LPRCOMMAND@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAKEINFO = @MAKEINFO@
-+OBJDUMP = @OBJDUMP@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+RANLIB = @RANLIB@
-+STRIP = @STRIP@
-+VERSION = @VERSION@
-+ac_aux_dir = @ac_aux_dir@
-+
-+MAINTAINERCLEANFILES = Makefile.in
-+
-+CFLAGS = -lncurses
-+
-+INCLUDES = -I$(top_builddir) -I$(top_builddir)/metamail                         -I$(top_srcdir) -I$(top_srcdir)/metamail
-+
-+
-+bin_PROGRAMS = richtext richtoatk
-+
-+richtext_SOURCES = richtext.c richlex.c richset.c usascii.c iso2022.c
-+richtext_LDADD = $(top_builddir)/metamail/libmetamail.la
-+
-+richtoatk_SOURCES = richtoatk.c richlex.c richset.c usascii.c iso2022.c
-+richtoatk_LDADD = $(top_builddir)/metamail/libmetamail.la
-+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-+CONFIG_HEADER = ../../metamail/config.h
-+CONFIG_CLEAN_FILES = 
-+bin_PROGRAMS =  richtext$(EXEEXT) richtoatk$(EXEEXT)
-+PROGRAMS =  $(bin_PROGRAMS)
-+
-+
-+DEFS = @DEFS@ -I. -I$(srcdir) -I../../metamail
-+CPPFLAGS = @CPPFLAGS@
-+LDFLAGS = @LDFLAGS@
-+LIBS = @LIBS@
-+richtext_OBJECTS =  richtext.$(OBJEXT) richlex.$(OBJEXT) \
-+richset.$(OBJEXT) usascii.$(OBJEXT) iso2022.$(OBJEXT)
-+richtext_DEPENDENCIES =  $(top_builddir)/metamail/libmetamail.la
-+richtext_LDFLAGS = 
-+richtoatk_OBJECTS =  richtoatk.$(OBJEXT) richlex.$(OBJEXT) \
-+richset.$(OBJEXT) usascii.$(OBJEXT) iso2022.$(OBJEXT)
-+richtoatk_DEPENDENCIES =  $(top_builddir)/metamail/libmetamail.la
-+richtoatk_LDFLAGS = 
-+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-+DIST_COMMON =  Makefile.am Makefile.in
-+
-+
-+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-+
-+TAR = tar
-+GZIP_ENV = --best
-+DEP_FILES =  .deps/iso2022.P .deps/richlex.P .deps/richset.P \
-+.deps/richtext.P .deps/richtoatk.P .deps/usascii.P
-+SOURCES = $(richtext_SOURCES) $(richtoatk_SOURCES)
-+OBJECTS = $(richtext_OBJECTS) $(richtoatk_OBJECTS)
-+
-+all: all-redirect
-+.SUFFIXES:
-+.SUFFIXES: .S .c .lo .o .obj .s
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-+	cd $(top_srcdir) && $(AUTOMAKE) --foreign src/richmail/Makefile
-+
-+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-+	cd $(top_builddir) \
-+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
-+
-+mostlyclean-binPROGRAMS:
-+
-+clean-binPROGRAMS:
-+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-+
-+distclean-binPROGRAMS:
-+
-+maintainer-clean-binPROGRAMS:
-+
-+install-binPROGRAMS: $(bin_PROGRAMS)
-+	@$(NORMAL_INSTALL)
-+	$(mkinstalldirs) $(DESTDIR)$(bindir)
-+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-+	  if test -f $$p; then \
-+	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-+	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+	  else :; fi; \
-+	done
-+
-+uninstall-binPROGRAMS:
-+	@$(NORMAL_UNINSTALL)
-+	list='$(bin_PROGRAMS)'; for p in $$list; do \
-+	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+	done
-+
-+# FIXME: We should only use cygpath when building on Windows,
-+# and only if it is available.
-+.c.obj:
-+	$(COMPILE) -c `cygpath -w $<`
-+
-+.s.o:
-+	$(COMPILE) -c $<
-+
-+.S.o:
-+	$(COMPILE) -c $<
-+
-+mostlyclean-compile:
-+	-rm -f *.o core *.core
-+	-rm -f *.$(OBJEXT)
-+
-+clean-compile:
-+
-+distclean-compile:
-+	-rm -f *.tab.c
-+
-+maintainer-clean-compile:
-+
-+.s.lo:
-+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+
-+.S.lo:
-+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+
-+maintainer-clean-libtool:
-+
-+richtext$(EXEEXT): $(richtext_OBJECTS) $(richtext_DEPENDENCIES)
-+	@rm -f richtext$(EXEEXT)
-+	$(LINK) $(richtext_LDFLAGS) $(richtext_OBJECTS) $(richtext_LDADD) $(LIBS)
-+
-+richtoatk$(EXEEXT): $(richtoatk_OBJECTS) $(richtoatk_DEPENDENCIES)
-+	@rm -f richtoatk$(EXEEXT)
-+	$(LINK) $(richtoatk_LDFLAGS) $(richtoatk_OBJECTS) $(richtoatk_LDADD) $(LIBS)
-+
-+tags: TAGS
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP)
-+	list='$(SOURCES) $(HEADERS)'; \
-+	unique=`for i in $$list; do echo $$i; done | \
-+	  awk '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	here=`pwd` && cd $(srcdir) \
-+	  && mkid -f$$here/ID $$unique $(LISP)
-+
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)'; \
-+	unique=`for i in $$list; do echo $$i; done | \
-+	  awk '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-+	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
-+
-+mostlyclean-tags:
-+
-+clean-tags:
-+
-+distclean-tags:
-+	-rm -f TAGS ID
-+
-+maintainer-clean-tags:
-+
-+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-+
-+subdir = src/richmail
-+
-+distdir: $(DISTFILES)
-+	here=`cd $(top_builddir) && pwd`; \
-+	top_distdir=`cd $(top_distdir) && pwd`; \
-+	distdir=`cd $(distdir) && pwd`; \
-+	cd $(top_srcdir) \
-+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign src/richmail/Makefile
-+	@for file in $(DISTFILES); do \
-+	  d=$(srcdir); \
-+	  if test -d $$d/$$file; then \
-+	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	  fi; \
-+	done
-+
-+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-+
-+-include $(DEP_FILES)
-+
-+mostlyclean-depend:
-+
-+clean-depend:
-+
-+distclean-depend:
-+	-rm -rf .deps
-+
-+maintainer-clean-depend:
-+
-+%.o: %.c
-+	@echo '$(COMPILE) -c $<'; \
-+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm .deps/$(*F).pp
-+
-+%.lo: %.c
-+	@echo '$(LTCOMPILE) -c $<'; \
-+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-+	  < .deps/$(*F).pp > .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm -f .deps/$(*F).pp
-+info-am:
-+info: info-am
-+dvi-am:
-+dvi: dvi-am
-+check-am: all-am
-+check: check-am
-+installcheck-am:
-+installcheck: installcheck-am
-+install-exec-am: install-binPROGRAMS
-+install-exec: install-exec-am
-+
-+install-data-am:
-+install-data: install-data-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+install: install-am
-+uninstall-am: uninstall-binPROGRAMS
-+uninstall: uninstall-am
-+all-am: Makefile $(PROGRAMS)
-+all-redirect: all-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-+installdirs:
-+	$(mkinstalldirs)  $(DESTDIR)$(bindir)
-+
-+
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+
-+maintainer-clean-generic:
-+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-+mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-compile \
-+		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
-+		mostlyclean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+clean-am:  clean-binPROGRAMS clean-compile clean-libtool clean-tags \
-+		clean-depend clean-generic mostlyclean-am
-+
-+clean: clean-am
-+
-+distclean-am:  distclean-binPROGRAMS distclean-compile distclean-libtool \
-+		distclean-tags distclean-depend distclean-generic \
-+		clean-am
-+	-rm -f libtool
-+
-+distclean: distclean-am
-+
-+maintainer-clean-am:  maintainer-clean-binPROGRAMS \
-+		maintainer-clean-compile maintainer-clean-libtool \
-+		maintainer-clean-tags maintainer-clean-depend \
-+		maintainer-clean-generic distclean-am
-+	@echo "This command is intended for maintainers to use;"
-+	@echo "it deletes files that may require special tools to rebuild."
-+
-+maintainer-clean: maintainer-clean-am
-+
-+.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
-+maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
-+mostlyclean-compile distclean-compile clean-compile \
-+maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-+clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
-+distclean-tags clean-tags maintainer-clean-tags distdir \
-+mostlyclean-depend distclean-depend clean-depend \
-+maintainer-clean-depend info-am info dvi-am dvi check check-am \
-+installcheck-am installcheck install-exec-am install-exec \
-+install-data-am install-data install-am install uninstall-am uninstall \
-+all-redirect all-am all installdirs mostlyclean-generic \
-+distclean-generic clean-generic maintainer-clean-generic clean \
-+mostlyclean distclean maintainer-clean
-+
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
---- metamail-2.7.orig/src/richmail/richlex.c
-+++ metamail-2.7/src/richmail/richlex.c
-@@ -0,0 +1,480 @@
-+/*-------------------------------------------------------------------------
-+
-+  richlex.c - Lexical analysis routines for parsing richtext messages.
-+ 
-+  Copyright (c) 1992 Rhys Weatherley
-+
-+  Permission to use, copy, modify, and distribute this material
-+  for any purpose and without fee is hereby granted, provided
-+  that the above copyright notice and this permission notice
-+  appear in all copies, and that the name of Rhys Weatherley not be
-+  used in advertising or publicity pertaining to this
-+  material without specific, prior written permission.
-+  RHYS WEATHERLEY MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR
-+  SUITABILITY OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED
-+  "AS IS", WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+  Revision History:
-+  ================
-+
-+   Version  DD/MM/YY  By  Description
-+   -------  --------  --  --------------------------------------
-+     1.0    31/01/92  RW  Original Version of richlex.c
-+     1.1    19/06/92  RW  Add support for multi-byte ISO-2022 codes.
-+
-+  You may contact the author by:
-+  =============================
-+
-+   e-mail: rhys@cs.uq.oz.au
-+     mail: Rhys Weatherley
-+	   5 Horizon Drive
-+	   Jamboree Heights
-+	   Queensland 4074
-+	   Australia
-+
-+  Caveats:
-+  =======
-+
-+  If a multi-byte character contains "<lt>", and a richtext command or
-+  escape sequence is started before all bytes of the multi-byte character
-+  have been read in, then some characters may be discarded.
-+
-+-------------------------------------------------------------------------*/
-+
-+#include <metamail/common.h>
-+
-+#include "richlex.h"
-+#include "richset.h"
-+
-+int CorrectionEnabled = 1;	/* Zero if correction has been disabled */
-+int RichtextLessThanFlag = 0;	/* Non-zero to turn on multi-byte '<' hack */
-+
-+//extern	int fgetc ();
-+//extern	int fputc ();
-+
-+int (*RichtextGetc) () = fgetc;	/* Function to call to get characters */
-+int (*RichtextPutc) () = fputc; /* Function to call to put characters */
-+int RichtextCharEncoding = RICH_ENC_US_ASCII; /* Current encoding mode */
-+
-+#define	MAX_STACK_SIZE	500
-+#define	MAX_FLUSH_SIZE	3
-+#define	MAX_PUSH_BACK	20
-+static	int	StackSize=0;
-+static	char	Stack[MAX_STACK_SIZE][MAX_TOKEN_SIZE];
-+static	char	NextToken[MAX_TOKEN_SIZE];
-+static	int	FlushStack=0;
-+static	int	FlushSize=0;
-+static	int	EndInpFile=0;
-+static	int	CharSize=1;
-+static	int	PushbackBuffer[MAX_PUSH_BACK];
-+static	int	PushbackSize=0;
-+static	int	PushbackExtract=0;
-+
-+#define	ESC	033
-+#define	SI	017
-+#define	SO	016
-+
-+#define	RGETRAW(f)	((*RichtextGetc)(f))
-+#define	RGET(f)		(PushbackSize ? richtextgetback() : RGETRAW(f))
-+#define	RPUT(c,f)	((*RichtextPutc)(((int)(c)),(f)))
-+#define	RUNGET(c)	(richtextunget(c))
-+#define	RPUSHBACK(c)	(richtextpushback(c))
-+
-+/*
-+ * Define a "printf" format for a generic ISO-2022 character
-+ * set name that includes the hexadecimal representation of
-+ * the escape sequence character that turns ISO-2022 on or off
-+ * on the terminal.
-+ */
-+#define	ISO2022_GENERIC	"x-iso-2022-gen-%2x"
-+#define	ISO2022_CHARSET "x-iso-charset-"
-+
-+/*
-+ * Define the character set shift characters for ISO-2022-KR.
-+ */
-+#define	ISO2022_SHIFTIN  "x-iso-shift-in"
-+#define	ISO2022_SHIFTOUT "x-iso-shift-out"
-+
-+/*
-+ * Construct multi-byte character codes.
-+ */
-+#define	RICHCH_2(first,second)	((RCHAR)(((first) << 8) | (second)))
-+
-+/*
-+ * Reset the richtext parsing mechanism.
-+ */
-+richtextreset()
-+{
-+    StackSize = 0;
-+    FlushStack = 0;
-+    FlushSize = 0;
-+    EndInpFile = 0;
-+    CharSize = 1;
-+    PushbackSize = 0;
-+    PushbackExtract = 0;
-+    RichtextCharEncoding = RICH_ENC_US_ASCII;
-+    CorrectionEnabled = 1;
-+    RichtextLessThanFlag = 0;
-+}
-+
-+/*
-+ * Push a character into the push-back buffer for later
-+ * retrieval by RGET.
-+ */
-+static	void	richtextpushback(c)
-+int	c;
-+{
-+    PushbackBuffer[PushbackSize++] = c;
-+}
-+
-+/*
-+ * Unget a character that has been read from the input stream.
-+ */
-+static	void	richtextunget(c)
-+int	c;
-+{
-+    if (PushbackSize)
-+	--PushbackExtract;	/* Character was retrieved from push-back */
-+    else
-+	richtextpushback(c);	/* Put character into empty push-back */
-+}
-+
-+/*
-+ * Unget two characters that have been read from the input stream.
-+ */
-+static	void	richtextunget2(c1,c2)
-+int	c1,c2;
-+{
-+    if (PushbackExtract > 1) {
-+	PushbackExtract -= 2;	/* Go back two characters in the push-back */
-+	PushbackBuffer[PushbackExtract++] = c1;
-+	PushbackBuffer[PushbackExtract++] = c2;
-+    } else {
-+	richtextpushback(c1);	/* Put the characters into the push-back */
-+	richtextpushback(c2);
-+    }
-+}
-+
-+/*
-+ * Retrieve a character from the push-back buffer.
-+ */
-+static	int	richtextgetback()
-+{
-+    int c;
-+    c = PushbackBuffer[PushbackExtract++];
-+    if (PushbackExtract >= PushbackSize) {
-+	PushbackSize = 0;
-+	PushbackExtract = 0;
-+    }
-+    return(c);
-+}
-+
-+/*
-+ * Find a match between NextToken and an element on the stack.
-+ * Returns the number of elements down from the top it is.
-+ * i.e. 0 if not on the stack, 1 if at the top, etc.
-+ */
-+static int richtextmatchup()
-+{
-+    int i = StackSize;
-+    while (i > 0 && i > (StackSize - MAX_FLUSH_SIZE)) {
-+	--i;
-+	if (!strcmp(NextToken,Stack[i]))
-+	    return(StackSize - i);
-+    }
-+    return(0);
-+}
-+
-+/*
-+ * Determine if the current token is one of the singleton
-+ * richtext commands: <nl>, <lt>, <np>.
-+ */
-+static richtextsingle(TextEnriched)
-+int TextEnriched;
-+{
-+    return (charsetsingle (NextToken) ||
-+	    (!TextEnriched &&
-+	        (!strcmp(NextToken,"nl") ||
-+		!strcmp(NextToken,"lt") ||
-+		!strcmp(NextToken,"np"))));
-+}
-+
-+/*
-+ * Recognise a character that can start a richtext command.
-+ */
-+#define	iscmdch(c)	(isalpha(c) || isdigit(c) || (c) == '/' || (c) == '-')
-+#define iscmdch2(c)	(isalpha(c) || isdigit(c) || (c) == '-')
-+#define TOLOWER(c)	(isupper(c)?tolower(c):c)
-+#define valid_command(c1,c2) \
-+	(( c1 == '/' && iscmdch2(c2) ) || \
-+	 (!TextEnriched && TOLOWER(c1) == 'l' && TOLOWER(c2) == 't' ))
-+
-+/*
-+ * Get the next token from the input stream.  RICHTEXT_COMMAND
-+ * or RICHTEXT_NEG_COMMAND are returned if it is a richtext command.
-+ * e.g. "<cmd>" or "</cmd>".  The "token" buffer will receive the
-+ * name of the command (without <,> or /) if it is a command.  This
-+ * function will also truncate commands longer than MAX_TOKEN_SIZE - 1
-+ * characters and abort command parsing if white space is encountered,
-+ * so, for example, errors like "<bold hi kids</bold>" don't cause
-+ * problems: it will be corrected to "<bold>hi kids</bold>".
-+ */
-+RCHAR richtextlex(file,token,TextEnriched, nofill)
-+void *file;
-+char *token;
-+int TextEnriched;
-+int nofill; /* Inside a nofill env we parse newlines differently */
-+{
-+    int c,i,lastch;
-+    RCHAR cmd;
-+
-+    lastch = 0;		/* No previous character for multi-byte chars as yet */
-+
-+    /* Perform any flushing of balancing commands that is necessary */
-+    if (FlushStack) {
-+	/* Flush out some extra closing commands */
-+	strcpy(token,Stack[StackSize - FlushSize + (--FlushStack)]);
-+	return(RICHTEXT_NEG_COMMAND);
-+    } else if (FlushSize) {
-+	/* Finished flushing: output the pending close command */
-+	StackSize -= FlushSize;
-+	if (StackSize > 0)
-+	    --StackSize; /* Remove the command that was being matched up */
-+	FlushSize = 0;
-+	strcpy(token,NextToken);
-+	if (EndInpFile)
-+	    return((RCHAR)EOF); /* The last flush was the end-of-file cleanup */
-+	else
-+	    return(RICHTEXT_NEG_COMMAND);
-+    }
-+
-+    /* Fetch a new character or richtext command */
-+    for (;;) {		/* Loop so we can come back on ignored commands */
-+        c = RGET(file);
-+        if (c == '<') { 
-+	    /* Check for multi-byte mode, where "<" is special */
-+	    int c2;
-+	    if (CharSize > 1) {
-+		if (RichtextLessThanFlag) {
-+		    /* The multi-byte '<' hack is in effect: not a command */
-+		    if (lastch)
-+		        return(RICHCH_2(lastch,'<'));
-+		    lastch = '<';
-+		    continue;	/* Back around for another character */
-+		}
-+		if ((c = RGET(file)) == EOF) {
-+		    RUNGET(c);
-+		    return((RCHAR)'<');
-+		}
-+		c2 = RGET(file);
-+		richtextunget2(c,c2);
-+		if( !valid_command(c,c2) ){
-+		    /* We have a stray less-than symbol */
-+	            if (lastch)
-+		        return(RICHCH_2(lastch,'<'));
-+	            lastch = '<';
-+	            continue;	/* Back around for another character */
-+		}
-+	    } else if (TextEnriched) {
-+	    	c2 = RGET(file);
-+		if (c2 == '<') {
-+		    return((RCHAR)c);
-+		} else {
-+		    RUNGET(c2);
-+		}
-+	    }
-+
-+	    /* Read a command token from the input file */
-+	    cmd = RICHTEXT_COMMAND;
-+	    if ((c = RGET(file)) == '/') {
-+	        cmd = RICHTEXT_NEG_COMMAND;
-+	        c = RGET(file);
-+	    }
-+            for (i = 0; i < (MAX_TOKEN_SIZE - 1) && c != '>'
-+	    		&& c != EOF && !isspace(c); ++i) {
-+                NextToken[i] = isupper(c) ? tolower(c) : c;
-+	        c = RGET(file);
-+            }
-+	    if (c != '>' && c != EOF && !isspace(c)) {
-+		/* We have a long command: skip the rest of it */
-+		while (c != '>' && c != EOF && !isspace(c))
-+		    c = RGET(file);
-+	    }
-+            if (c == EOF) {
-+		if (!StackSize)
-+	    	    return((RCHAR)EOF);
-+	        /* Flush the remaining commands at the end of the input file */
-+	        FlushSize = StackSize;
-+	        FlushStack = FlushSize;
-+	        EndInpFile = 1;
-+	        return(richtextlex(file,token,TextEnriched, nofill)); /* Flush something out */
-+	    }
-+            NextToken[i] = '\0';
-+
-+	    /* Process <lt> specially for multi-byte characters */
-+	    if (CharSize > 1 && !TextEnriched && !strcmp(NextToken,"lt")) {
-+	        if (lastch)
-+		    return(RICHCH_2(lastch,'<'));
-+	        lastch = '<';
-+	        continue;	/* Back around for another character */
-+	    }
-+
-+	    /* Check to see if we need to correct anything */
-+	    if (!CorrectionEnabled) {
-+		/* No correction to do: just skip the correction phase */
-+		strcpy(token,NextToken);
-+		return(cmd);
-+	    }
-+	    if (cmd == RICHTEXT_COMMAND) {
-+		/* Save the command on the stack if not a singleton command */
-+		if (!richtextsingle(TextEnriched)) {
-+		    strcpy (Stack[StackSize++],NextToken);
-+		}
-+	    }
-+	    else if (!(i = richtextmatchup()))
-+		continue;	/* No matchup - just drop it */
-+	    else if (i == 1)
-+		--StackSize;	/* Correct match at the stack top */
-+	    else {
-+		/* Flush some correction elements from the stack */
-+		FlushSize = i - 1;
-+		FlushStack = FlushSize;
-+		return(richtextlex(file,token,TextEnriched, nofill));
-+	    }
-+	    strcpy(token,NextToken);
-+	    return(cmd);
-+        } else if (c == SI) {
-+	    /* Shift-in character: translate to a singleton */
-+	    strcpy(token,ISO2022_SHIFTIN);
-+	    return(RICHTEXT_COMMAND);
-+	} else if (c == SO) {
-+	    /* Shift-out character: translate to a singleton */
-+	    strcpy(token,ISO2022_SHIFTOUT);
-+	    return(RICHTEXT_COMMAND);
-+	} else if (c == ESC) {
-+	    /* Check for escape sequences that change character sizes */
-+	    int newc;
-+	    c = RGET(file);
-+	    if (c == '$') {
-+		newc = RGET(file);
-+		if (newc == ')') {
-+		    newc = RGET(file);	/* 4-byte ESC-$-)-? sequence */
-+		    sprintf(token,ISO2022_CHARSET,newc);
-+		} else {
-+		    sprintf(token,ISO2022_GENERIC,newc);
-+		}
-+		return(RICHTEXT_COMMAND);
-+	    } else if (c == '(') {
-+		newc = RGET(file);
-+		sprintf(token,ISO2022_GENERIC,newc);
-+		return(RICHTEXT_NEG_COMMAND);
-+	    } else {
-+		RUNGET(c);
-+		return((RCHAR)ESC);
-+	    }
-+        } else if (c == EOF && StackSize) {
-+	    /* Flush the remaining commands at the end of the input file */
-+	    FlushSize = StackSize;
-+	    FlushStack = FlushSize;
-+	    EndInpFile = 1;
-+	    return(richtextlex(file,token,TextEnriched, nofill)); /* Flush something out */
-+	} else if (CharSize > 1) {
-+	    /* Recognise a multi-byte character */
-+	    int newc;
-+	    if (!lastch && isspace (c))
-+	      return ((RCHAR)c); /* Hack for spaces in 2-byte modes */
-+	    if (lastch)
-+		return (RICHCH_2(lastch,c)); /* This is second of 2 chars */
-+	    if ((newc = RGET(file)) == EOF) {
-+		RUNGET(newc);	/* Push the EOF back into the input stream */
-+		return((RCHAR)c); /* Just return the partial single-byte char */
-+	    } else if (newc == '<') {
-+		/* The second character could be "<lt>", so loop around */
-+		lastch = c;
-+		RUNGET(newc);
-+		continue;
-+	    } else {
-+	    	return(RICHCH_2(c,newc));
-+	    }
-+	} else if (TextEnriched && !nofill && (c == '\n')) {
-+	    int c2 = RGET(file);
-+	    RUNGET(c2);
-+	    if (c2 == '\n') {
-+		strcpy(token, "iNtErNaL-nL");
-+		return(RICHTEXT_COMMAND);
-+	    } else {
-+		return((RCHAR)c);
-+	    }
-+	} else {
-+	    return((RCHAR)c);
-+	}
-+    }
-+}
-+
-+/*
-+ * Output a string via "RichtextPutc".
-+ */
-+static richtextoutstr(str,outparam)
-+char *str;
-+void *outparam;
-+{
-+    while (*str) {
-+	RPUT(*str,outparam);
-+	++str;
-+    }
-+}
-+
-+/*
-+ * Read the input stream, correct the richtext, and write the
-+ * results to the output stream.
-+ */
-+richtextcorrect(inparam,outparam,TextEnriched)
-+void *inparam,*outparam;
-+int TextEnriched;
-+{
-+    RCHAR c;
-+    char token[MAX_TOKEN_SIZE];
-+    while ((c = richtextlex(inparam,token,TextEnriched, 0)) != (RCHAR)EOF) {
-+	if (c == RICHTEXT_COMMAND) {
-+	    RPUT('<',outparam);
-+	    richtextoutstr(token,outparam);
-+	    RPUT('>',outparam);
-+	} else if (c == RICHTEXT_NEG_COMMAND) {
-+	    RPUT('<',outparam);
-+	    RPUT('/',outparam);
-+	    richtextoutstr(token,outparam);
-+	    RPUT('>',outparam);
-+	} else if (c >= 256) {
-+	    RPUT(RICHCH2_FIRST(c),outparam);
-+	    RPUT(RICHCH2_SECOND(c),outparam);
-+	} else {
-+	    RPUT(c,outparam);
-+	}
-+    }
-+}
-+
-+/*
-+ * Change the encoding used for characters not present in
-+ * richtext command sequences.
-+ */
-+richtextencoding(encoding)
-+int	encoding;
-+{
-+    RichtextCharEncoding = encoding;
-+    switch (RichtextCharEncoding) {
-+	case RICH_ENC_US_ASCII:
-+	case RICH_ENC_JP_ASCII:
-+	case RICH_ENC_KR_ASCII:
-+		CharSize = 1;
-+		break;
-+
-+	case RICH_ENC_JIS_1978:
-+	case RICH_ENC_JIS_1983:
-+	case RICH_ENC_KSC_5601:
-+		CharSize = 2;
-+		break;
-+
-+	default:CharSize = 1;
-+		break;
-+    }
-+}
---- metamail-2.7.orig/src/richmail/richlex.h
-+++ metamail-2.7/src/richmail/richlex.h
-@@ -0,0 +1,166 @@
-+/*-------------------------------------------------------------------------
-+
-+  richlex.h - Lexical analysis routines for parsing richtext messages.
-+ 
-+  Copyright (c) 1992 Rhys Weatherley
-+
-+  Permission to use, copy, modify, and distribute this material
-+  for any purpose and without fee is hereby granted, provided
-+  that the above copyright notice and this permission notice
-+  appear in all copies, and that the name of Rhys Weatherley not be
-+  used in advertising or publicity pertaining to this
-+  material without specific, prior written permission.
-+  RHYS WEATHERLEY MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR
-+  SUITABILITY OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED
-+  "AS IS", WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+  Revision History:
-+  ================
-+
-+   Version  DD/MM/YY  By  Description
-+   -------  --------  --  --------------------------------------
-+     1.0    31/01/92  RW  Original Version of richlex.h
-+     1.1    19/06/92  RW  Add support for multi-byte ISO-2022 codes.
-+
-+  You may contact the author by:
-+  =============================
-+
-+   e-mail: rhys@cs.uq.oz.au
-+     mail: Rhys Weatherley
-+	   5 Horizon Drive
-+	   Jamboree Heights
-+	   Queensland 4074
-+	   Australia
-+
-+-------------------------------------------------------------------------*/
-+
-+#ifndef	__RICHTEXT_H__
-+#define	__RICHTEXT_H__
-+
-+#include <metamail/common.h>
-+
-+BEGIN_C_DECLS
-+
-+//#ifdef	__cplusplus
-+//extern "C" {
-+//#endif
-+
-+/*
-+ * Define the data type to be used by characters in the richtext
-+ * system.  Note: this is a long because some machines, MS-DOS
-+ * machines for example, only have 16-bit integers and hence won't
-+ * be able to cope with large multi-byte character codes.  If
-+ * something is strange with your character processing, it is
-+ * probably because you aren't using the right types.
-+ */
-+typedef	long	RCHAR;
-+
-+/*
-+ * Set the following variable to zero to disable the
-+ * correction of richtext commands.  The default
-+ * value is non-zero.
-+ */
-+extern	int CorrectionEnabled;
-+
-+/*
-+ * Set the following value to non-zero to enable the
-+ * multi-byte '<' hack which ignores richtext commands
-+ * in multi-byte modes.  The default value is zero.
-+ */
-+extern	int RichtextLessThanFlag;
-+
-+/*
-+ * Define the function to call to get characters from
-+ * the message.  The calling convention of this
-+ * function is: "int func (void *param)".  The default
-+ * value is "fgetc".  The function must return EOF
-+ * at the end of the messsage;
-+ */
-+extern	int (*RichtextGetc) ();
-+
-+/*
-+ * Define the function to call to output characters from
-+ * richtextcorrect.  The calling convention of this
-+ * function is: "int func (int c,void *param)".  The default
-+ * value is "fputc".
-+ */
-+extern	int (*RichtextPutc) ();
-+
-+/*
-+ * Define the maximum size of richtext command tokens.
-+ */
-+#define	MAX_TOKEN_SIZE		50
-+
-+/*
-+ * Define the special token values that are returned by
-+ * the "richtextlex" function.  These values were chosen
-+ * to keep away from legal ASCII.
-+ *
-+ * Version 1.1: modified to negative values to keep away
-+ * from legal ISO-2022 and other multi-byte characters.
-+ */
-+#define	RICHTEXT_COMMAND	((RCHAR)(-2))
-+#define	RICHTEXT_NEG_COMMAND	((RCHAR)(-3))
-+
-+/*
-+ * Reset the richtext parsing mechanism.
-+ */
-+extern	richtextreset();
-+
-+/*
-+ * Get the next token from the input stream.  RICHTEXT_COMMAND
-+ * or RICHTEXT_NEG_COMMAND are returned if it is a richtext command.
-+ * e.g. "<cmd>" or "</cmd>".  The "token" buffer will receive the
-+ * name of the command (without <,> or /) if it is a command.  This
-+ * function will also truncate commands longer than MAX_TOKEN_SIZE - 1
-+ * characters and abort command parsing if white space is encountered,
-+ * so, for example, errors like "<bold hi kids</bold>" don't cause
-+ * problems: it will be corrected to "<bold>hi kids</bold>".
-+ * The "file" parameter is passed to the function pointed to by
-+ * "RichtextGetc" on each call.
-+ */
-+extern	RCHAR	richtextlex( /* void *file,char *token,int TextEnriched */ );
-+
-+/*
-+ * Read the input stream, correct the richtext, and write the
-+ * results to the output stream.  "outparam" is passed to the
-+ * "RichtextPutc" function as the second argument, and "inparam"
-+ * is passed to "richtextlex" during parsing.
-+ */
-+extern	richtextcorrect( /* void *inparam,void *outparam,int TextEnriched */ );
-+
-+#define	RICH_ENC_US_ASCII	0	/* US-ASCII encoding: one-byte */
-+#define	RICH_ENC_JP_ASCII	1	/* JP-ASCII encoding: one-byte */
-+#define	RICH_ENC_KR_ASCII	2	/* KR-ASCII encoding: one-byte */
-+#define	RICH_ENC_JIS_1978	100	/* JIS-X-0208-1978: two-byte */
-+#define	RICH_ENC_JIS_1983	101	/* JIS-X-0208-1983: two-byte */
-+#define	RICH_ENC_KSC_5601	200	/* KSC-5601 (Korean): two-byte */
-+
-+/*
-+ * The following variable contains the current character
-+ * encoding in use.  This should only be read.  Setting it
-+ * is done via "richtextencoding".
-+ */
-+extern	int	RichtextCharEncoding;
-+
-+/*
-+ * Change the encoding used for characters not present in
-+ * richtext command sequences.
-+ */
-+extern	richtextencoding( /* int encoding */ );
-+
-+/*
-+ * Define a number of macros for decoding multi-byte character
-+ * codes.  The names of the macros have the form "RICHCHn_xxx"
-+ * where "n" is the number of bytes in the character.
-+ */
-+#define	RICHCH2_FIRST(c)	(((c) >> 8) & 0xFF)
-+#define	RICHCH2_SECOND(c)	((c) & 0xFF)
-+
-+//#ifdef	__cplusplus
-+//};
-+//#endif
-+
-+END_C_DECLS
-+
-+#endif	/* __RICHTEXT_H__ */
---- metamail-2.7.orig/src/richmail/richtext.c
-+++ metamail-2.7/src/richmail/richtext.c
-@@ -0,0 +1,905 @@
-+/*
-+Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+
-+Permission to use, copy, modify, and distribute this material 
-+for any purpose and without fee is hereby granted, provided 
-+that the above copyright notice and this permission notice 
-+appear in all copies, and that the name of Bellcore not be 
-+used in advertising or publicity pertaining to this 
-+material without the specific, prior written permission 
-+of an authorized representative of Bellcore.  BELLCORE 
-+MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+*/
-+
-+#include <metamail/common.h>
-+
-+#include <curses.h>  /* This and next for tgetstr(3X) and kin */
-+#include <term.h>
-+
-+#include "richlex.h"
-+#include "richset.h"
-+
-+int iso2022_fputc ();
-+
-+/*
-+ * ########################################################################
-+ * The function "InitGlobals" must be updated whenever a new variable is
-+ * added here or a default value is changed.  The same must be done for
-+ * the next section of variables also.  This is needed because this module
-+ * could be linked into another program as a library and called more than
-+ * once in a single program execution.
-+ * ########################################################################
-+ */
-+static int linepos = 0, inspace = 0, leftmargin = 0, rightmargin, biggertext=0;
-+static int workingleft = 0, workingright, inexcerpt = 0, insignature = 0;
-+static int highlight=0, underline=0, bold=0, nofill=0;
-+static int termcolumns=80, termrows=23;
-+int controlputc();
-+
-+/* A common problem, in justifying text, is figuring out how to format a 
-+   line when part of it wants to be left-justified, part right-justified, 
-+   and part centered, or some combination thereof.  There is no perfect 
-+   solution to this problem, so this program takes an incredibly cheesy 
-+   but simple way out:  voting.  For each character on the line, a point
-+   is added to the "center" score if it is supposed to be centered, and 
-+   so on.  If it is inside TWO "center" environments, two points are added.
-+   This may be the world's first implementation of justification by voting...
-+*/
-+
-+static int centerenv=0, leftjustenv=0, rightjustenv=0;
-+static int centerct=0, leftjustct=0, rightjustct=0;
-+static int UsePager = 0;
-+static int linesused = 0;
-+static int JustSawCmd=0;
-+static int JustCorrect = 0;	/* Non-zero to just correct and not format */
-+static int OverStrike = 0;
-+static int TextEnriched = 0;
-+static char MoveRight[10];
-+static char highlightbuf[50], highlightendbuf[50], StartUnderline[50], StopUnderline[50];
-+static char KS[50], KE[50], BoldOn[50], BoldOff[50];
-+static char charsetname[50];
-+static int FakeTerminal;
-+
-+extern tputs();
-+
-+static outputc(), realoutputc(), MakeWorkingMargins(), Pause(), fputsmovingright(), ResetTerminalCodes(), FinalizeTerminal(), outputstr(), FPUTS(), lc2strcmp();
-+
-+#define	OUTC(c)		(outputc((RCHAR)(c)))
-+
-+static void
-+InitGlobals()
-+{
-+    linepos = 0;
-+    inspace = 0;
-+    leftmargin = 0;
-+    biggertext = 0;
-+    workingleft = 0;
-+    inexcerpt = 0;
-+    insignature = 0;
-+    termcolumns = 80;
-+    termrows = 23;
-+    centerenv = 0;
-+    leftjustenv = 0;
-+    rightjustenv = 0;
-+    centerct = 0;
-+    leftjustct = 0;
-+    rightjustct = 0;
-+    UsePager = 0;
-+    linesused = 0;
-+    JustSawCmd = 0;
-+    JustCorrect = 0;
-+    highlight = 0;
-+    underline = 0;
-+    bold = 0;
-+    TextEnriched = 0;
-+    nofill = 0;
-+}
-+
-+static void
-+cleanup(signum)
-+int signum;
-+{
-+    FinalizeTerminal();
-+    signal(signum, SIG_DFL);
-+    kill(getpid(), signum);
-+}
-+
-+static InitSignals() {
-+    signal(SIGINT, cleanup);
-+    signal(SIGILL, cleanup);
-+    signal(SIGTRAP, cleanup);
-+    signal(SIGIOT, cleanup);
-+    signal(SIGFPE, cleanup);
-+#ifndef linux
-+    signal(SIGEMT, cleanup);
-+    signal(SIGBUS, cleanup);
-+#endif
-+    signal(SIGSEGV, cleanup);
-+    signal(SIGTERM, cleanup);
-+#ifdef SIGXCPU
-+    signal(SIGXCPU, cleanup);
-+#endif
-+}
-+
-+static nomemabort() {
-+    fprintf(stderr, "richtext: Out of memory\n");
-+    FinalizeTerminal();
-+    exit(-1);
-+}
-+
-+#ifndef	RICHTEXT_LIBRARY
-+
-+/*
-+ * Only include the main function if this module is not being used as a
-+ * library call.
-+ */
-+
-+main(argc, argv)
-+int argc;
-+char **argv;
-+{
-+  exit(richtext_main(argc, argv));
-+}
-+
-+#endif
-+
-+richtext_main(argc, argv)
-+int argc;
-+char **argv;
-+{
-+    RCHAR c;
-+    int i, atstart, negated,
-+    ForceTermcap=0, ForcePlain=0, NotTtyEnv = 0;
-+    char token[MAX_TOKEN_SIZE], *tok, *nottty;
-+    char tbuf[1024], *term, *dum;
-+    FILE *InputFP = stdin, *tmpfp;
-+
-+    InitSignals();
-+    InitGlobals();
-+    richtextreset();
-+    strcpy(charsetname,"us-ascii");
-+    dum = (char *) getenv("MM_USEPAGER");
-+    if (dum && atoi(dum)) ++UsePager;
-+    for (i=1; i< argc; ++i) {
-+        if (!strcmp(argv[i], "-p")) {
-+            ++UsePager;
-+        } else if (!strcmp(argv[i],"-c")) {
-+            /* Only perform correction: don't format */
-+            JustCorrect = 1;
-+        } else if (!strcmp(argv[i], "-f")) {
-+            /* Force termcap usage */
-+            ForceTermcap = 1;
-+        } else if (!strcmp(argv[i], "-t")) {
-+            /* Force plain text */
-+            ForcePlain = 1;
-+        } else if (!strcmp(argv[i],"-n")) {
-+            /* Disable the richtext correction routines */
-+            CorrectionEnabled = 0;
-+        } else if (!strcmp(argv[i],"-m")) {
-+            /* Enable the multi-byte '<' hack */
-+            RichtextLessThanFlag = 1;
-+	} else if (!strncmp(argv[i], "-s", 2)) {
-+	    /* Specify the character set to use (and convert to lower case) */
-+	    char *name;
-+	    if (argv[i][2])
-+		strcpy(charsetname, argv[i] + 2);
-+	    else if (i < (argc - 1))
-+		strcpy(charsetname, argv[++i]);
-+	    name = charsetname;
-+	    while (*name) {
-+		if (isupper(*name))
-+		    *name = tolower(*name);
-+		++name;
-+	    }
-+	} else if (!strcmp(argv[i], "-o")) {
-+	    /* Use Overstriking */
-+	    OverStrike = 1;
-+	    ForcePlain = 1;
-+	} else if (!strcmp(argv[i], "-e")) {
-+		/* Work with text/enriched instead of text/richtext */
-+		TextEnriched = 1;
-+        } else {
-+            /* open for input */
-+            tmpfp = fopen(argv[i], "r");
-+            if (tmpfp)
-+	    	InputFP = tmpfp;
-+	    else {
-+	    	perror (argv[i]);
-+		exit (1);
-+	    }
-+        }
-+    }
-+    /* THIS IS THE UNIX TERMINAL INITIALIZATION CODE */
-+    nottty = (char *) getenv("MM_NOTTTY");
-+    if (nottty) NotTtyEnv = atoi(nottty);
-+    if (UsePager && (!isatty(0) || !isatty(1) || NotTtyEnv)) {
-+        UsePager = 0;   /* Disable pager if I/O has been redirected or we're under a window-oriented mail reader */
-+    }
-+    if ((!ForcePlain && (isatty(1) || isatty(0))) || ForceTermcap) {
-+        term = (char *) getenv("TERM");
-+    } else {
-+        term = NULL;
-+    }
-+    if (term && tgetent(tbuf, term) != 1) {
-+        term = NULL;
-+    }
-+    if (term) {
-+        static char cb[1024];
-+        char *cp;
-+                   
-+        cp = cb;
-+	
-+        if (dum = (char*) tgetstr("ks", &cp)) 
-+	  strcpy (KS, dum); 
-+	else
-+	  KS[0] = '\0';
-+        if (dum = (char*) tgetstr("ke", &cp)) 
-+	  strcpy (KE, dum); 
-+	else
-+	  KE[0] = '\0';
-+        if (dum = (char*) tgetstr("so", &cp))
-+	  strcpy (highlightbuf, dum); highlightbuf[0] = '\0';
-+        if (dum = (char*) tgetstr("se", &cp))
-+	  strcpy (highlightendbuf, dum); highlightendbuf[0] = '\0';
-+        if (dum = (char*) tgetstr("md", &cp)) 
-+	  strcpy (BoldOn, dum); 
-+	else 
-+	  strcpy(BoldOn, highlightbuf);
-+        if (dum = (char*) tgetstr("me", &cp)) 
-+	  strcpy (BoldOff, dum); 
-+	else 
-+	  strcpy(BoldOff, highlightendbuf);
-+        if (dum = (char*) tgetstr("us", &cp))
-+	  strcpy (StartUnderline, dum);
-+	else
-+	  StartUnderline[0] = '\0';
-+        if (dum = (char*) tgetstr("ue", &cp))
-+	  strcpy (StopUnderline, dum);
-+	else StopUnderline[0] = '\0';
-+        if (dum = (char*) tgetstr("nd", &cp))
-+	  strcpy (MoveRight, dum);
-+	else {
-+            MoveRight[0] = ' ';
-+            MoveRight[1] = '\0';
-+        }
-+        /* Some TERMCAP entries have REALLY screwed up "nd" fields, sigh... */
-+        if (!strcmp(MoveRight, "\014")) strcpy(MoveRight, " ");
-+        termcolumns = tgetnum("co");
-+        if (termcolumns <= 0) termcolumns = 80;
-+        termrows = tgetnum("li");
-+        if (termrows <= 0) termrows = 23;
-+	else termrows--;
-+        FakeTerminal=0;
-+    } else if (OverStrike) {
-+        KS[0] = '\0';
-+        KE[0] = '\0';
-+	FakeTerminal = 1;
-+	BoldOn[0] = '\0';
-+	BoldOff[0] = '\0';
-+	highlightbuf[0] = '\0';
-+	highlightendbuf[0] = '\0';
-+	StartUnderline[0] = '\0';
-+	StopUnderline[0] = '\0';
-+	strcpy(MoveRight, " ");
-+        termcolumns = 80;
-+        termrows = 23;
-+    } else {
-+        KS[0] = '\0';
-+        KE[0] = '\0';
-+        FakeTerminal = 1;
-+        strcpy(BoldOn, "*");
-+        strcpy(BoldOff, "*");
-+        strcpy(highlightbuf, "_");
-+        strcpy(highlightendbuf, "_");
-+        strcpy(StartUnderline, "_");
-+        strcpy(StopUnderline, "_");
-+        strcpy(MoveRight, " ");
-+        termcolumns = 80;
-+        termrows = 23;
-+    }
-+    /* Check for the LINES & COLUMNS hack */
-+    dum = getenv("LINES");
-+    if (dum && ((i=atoi(dum)) > 0)) termrows = i - 1;
-+    dum = getenv("COLUMNS");
-+    if (dum && ((i=atoi(dum)) > 0)) termcolumns = i;
-+    charsetnameinit(charsetname);
-+    RichtextPutc = iso2022_fputc;
-+    if (JustCorrect) {
-+        richtextcorrect(InputFP,stdout,TextEnriched);
-+        return(0);
-+    }
-+    FPUTS(KS, stdout);
-+    rightmargin = workingright = termcolumns - 1;
-+    while((c = richtextlex(InputFP,token,TextEnriched, nofill)) != (RCHAR)EOF) {
-+        if (c == RICHTEXT_COMMAND || c == RICHTEXT_NEG_COMMAND) { 
-+            negated = (c == RICHTEXT_NEG_COMMAND);
-+            tok = token;
-+
-+	    /* Try to process the command with the character set processors */
-+	    if (charsetcommand (tok,negated))
-+	        continue;
-+
-+	    /* Do the default action for the command */
-+            switch(tok[0]) {
-+                case 'b':
-+                    if (!strcmp(tok, "bold")) {
-+                        if (negated) {
-+                            --bold;
-+                            if (bold <= 0) {
-+				if (FakeTerminal) outputstr(BoldOff);
-+				else controloutput(BoldOff, 0);
-+			    }
-+                        } else {
-+                            ++bold;
-+                        }
-+                        ResetTerminalCodes(FakeTerminal, highlight, underline,
-+                                            bold, highlightbuf, highlightendbuf, 0,
-+                                            StartUnderline, StopUnderline, 0, BoldOn,
-+                                            BoldOff, 1);
-+                    } else if (!strcmp(tok, "bigger")) {
-+                        if (negated) --biggertext; else ++biggertext;
-+                    }
-+                    break;
-+                case 'c':
-+                    if (!strcmp(tok, "center")) {
-+                        if (negated) --centerenv; else ++centerenv;
-+                    } else if (!TextEnriched && !strcmp(tok, "comment")) {
-+                        int commct=1;
-+			int tempc;
-+                        while (commct > 0) {
-+                            while ((tempc = getc(InputFP)) != '<' 
-+                                    && tempc != EOF) ;
-+                            if (tempc == EOF) break;
-+                            for (i=0; (tempc = getc(InputFP)) != '>' 
-+                              && tempc != EOF; ++i) {
-+                                token[i] = isupper(tempc) ? 
-+                                  tolower(tempc) : tempc;
-+				if (i == MAX_TOKEN_SIZE-2) break;
-+                            }
-+                            if (tempc== EOF) break;
-+                            token[i] = 0;
-+                            if (!strcmp(token, "/comment")) --commct;
-+                            if (!strcmp(token, "comment")) ++commct;
-+                        }
-+                    }
-+                    break;
-+                case 'e':
-+                    if (!strcmp(tok, "excerpt")) {
-+                        atstart = !(linepos > workingleft);
-+                        if (negated) {
-+                            leftmargin -= 4;
-+                            rightmargin += 4;
-+                            --inexcerpt;
-+                        } else {
-+                            leftmargin += 4;
-+                            rightmargin -= 4;
-+                            ++inexcerpt;
-+                        }
-+                        MakeWorkingMargins();
-+                        if (!atstart) OUTC('\n');
-+                    }
-+                    break;
-+                case 'f':
-+                    if (!strcmp(tok, "flushleft")) {
-+                        if (negated) --leftjustenv; else ++leftjustenv;
-+                    } else if (!strcmp(tok, "flushright")) {
-+                        if (negated) --rightjustenv; else ++rightjustenv;
-+                    }
-+                    break;
-+                case 'i':
-+                    if (!strcmp(tok, "italic")) {
-+                        if (negated) {
-+                            --highlight;
-+                            if (highlight <= 0) {
-+				if (FakeTerminal) outputstr(highlightendbuf);
-+				else controloutput(highlightendbuf, 0);
-+			    }
-+                        } else {
-+                            ++highlight;
-+                        }
-+                        ResetTerminalCodes(FakeTerminal, highlight, underline, bold,
-+                                            highlightbuf, highlightendbuf, 1, StartUnderline,
-+                                            StopUnderline, 0, BoldOn, BoldOff, 0);
-+                    } else if (!strcmp(tok, "indent")) {
-+                        if (negated) {
-+                            leftmargin -= 4;
-+                        } else {
-+                            leftmargin += 4;
-+                        }
-+                    } else if (!strcmp(tok, "indentright")) {
-+                        if (negated) {
-+                            rightmargin += 4;
-+                        } else {
-+                            rightmargin -= 4;
-+                        }
-+		    } else if (TextEnriched && !strcmp(tok, "iNtErNaL-nL")) {
-+			OUTC('\n');
-+                    }
-+                    MakeWorkingMargins();
-+                    break;
-+                case 'l':
-+                    if (!TextEnriched && !strcmp(tok, "lt")) {
-+                        OUTC('<');
-+                    }
-+                    break;
-+                case 'n':
-+ 		    if (!TextEnriched && !strcmp(tok, "nl")) {
-+                        OUTC('\n');
-+		    } else if (TextEnriched && !strcmp(tok, "nofill")) {
-+			if (negated) {
-+			    --nofill;
-+			} else {
-+			    ++nofill;
-+			}
-+                    } else if (!TextEnriched && !strcmp(tok, "np")) {
-+                        OUTC('\n');
-+                        OUTC('\014');
-+                    }
-+                    break;
-+                case 'o':
-+                    if (!TextEnriched && !strcmp(tok, "outdent")) {
-+                        if (negated) {
-+                            leftmargin += 4;
-+                        } else {
-+                            leftmargin -= 4;
-+                        }
-+                    } else if (!TextEnriched && !strcmp(tok, "outdentright")) {
-+                        if (negated) {
-+                            rightmargin -= 4;
-+                        } else {
-+                            rightmargin += 4;
-+                        }
-+                    }
-+                    MakeWorkingMargins();
-+                    break;                    
-+                case 'p':
-+                    if (!TextEnriched && !strcmp(tok, "paragraph")) {
-+                        if (negated) OUTC('\n');
-+                        OUTC('\n');
-+                    } else if (TextEnriched && !strcmp(tok, "param")) {
-+                        int commct=1;
-+                        while (commct > 0) {
-+			    for (;;) {
-+				c = richtextlex(InputFP,token,TextEnriched, nofill);
-+				if (c == EOF || c == RICHTEXT_COMMAND || c == RICHTEXT_NEG_COMMAND)
-+				    break;
-+                            }
-+			    if (c == EOF) break;
-+			    if (!strcmp(token,"param")) {
-+				if (c == RICHTEXT_NEG_COMMAND) --commct;
-+				else if (c == RICHTEXT_COMMAND) ++commct;
-+                        }
-+                    }
-+		    }
-+                    break;
-+                case 's':
-+                    if (!TextEnriched && !strcmp(tok, "signature")) {
-+                        atstart = !(linepos > workingleft);
-+                        if (negated) {
-+                            leftmargin -= 4;
-+                            rightmargin += 4;
-+                            --insignature;
-+                        } else {
-+                            leftmargin += 4;
-+                            rightmargin -= 4;
-+                            ++insignature;
-+                        }
-+                        MakeWorkingMargins();
-+                        if (!atstart) OUTC('\n');
-+                    }
-+                    break;
-+                case 'u':
-+                    if (!strcmp(tok, "underline")) {
-+                        if (negated) {
-+                            --underline;
-+                            if (underline <= 0) {
-+				if (FakeTerminal) outputstr(StopUnderline);
-+				else controloutput(StopUnderline,0);
-+			    }
-+                        } else {
-+                            ++underline;
-+                        }
-+                        ResetTerminalCodes(FakeTerminal, highlight, underline, bold,
-+                                            highlightbuf, highlightendbuf, 0, StartUnderline,
-+                                            StopUnderline, 1, BoldOn, BoldOff, 0);
-+                    }
-+                    break;
-+                case 'v':
-+                    if (TextEnriched && !strcmp(tok, "verbatim")) {
-+                        for (;;) {
-+			    int tempc;
-+                            while ((tempc = getc(InputFP)) != '<' 
-+                                    && tempc != EOF)
-+				OUTC(tempc);
-+                            if (tempc == EOF) break;
-+			    ungetc(tempc = getc(InputFP), InputFP);
-+			    if (tempc == '<') {
-+				OUTC('<');
-+				getc(InputFP);
-+				continue;
-+			    }
-+                            for (i=0; (tempc = getc(InputFP)) != '>' 
-+                              && tempc != EOF; ++i) {
-+                                token[i] = tempc;
-+				if (i == MAX_TOKEN_SIZE-2) break;
-+                            }
-+                            if (tempc== EOF) break;
-+                            token[i] = 0;
-+                            if (!lc2strcmp(token, "/verbatim")) break;
-+			    else for (i=0; token[i]; i++)
-+			        OUTC(token[i]);
-+                        }
-+                    }
-+                    break;
-+                default:
-+                    /* Ignore all other tokens */
-+                    break;
-+            }
-+            JustSawCmd = 1;
-+        } else if (c == '\n') {
-+	    if (nofill) {
-+		OUTC(c);
-+	    } else if (linepos > 0 && !inspace) {
-+                OUTC(' ');
-+            }
-+            JustSawCmd = 0;
-+        } else {
-+            OUTC(c);
-+            JustSawCmd = 0;
-+        }
-+    }
-+    if (term) { /* cleanup a bit for insurance */
-+        controloutput(highlightendbuf, 0);
-+        controloutput(StopUnderline, 0);
-+    }
-+    OUTC('\n'); /* for good measure */
-+    FPUTS(KE, stdout);
-+    fflush(stdout);
-+    if (UsePager) {
-+        Pause();
-+    }
-+    return(0);
-+}
-+
-+static struct charsetmember OutputBuf[1000] = {0,0};
-+static int PendingOutput = 0, PendingControls = 0;
-+
-+controlputc(c)
-+int c;
-+{
-+    charmemberctrl (&OutputBuf[PendingOutput],(RCHAR)c);
-+    ++PendingOutput;
-+    ++PendingControls;
-+}
-+
-+static immediate_controlputc(c)
-+int c;
-+{
-+    (*RichtextPutc) (c, stdout);
-+}
-+
-+controloutput(s, immediate)
-+char *s;
-+int immediate;
-+{
-+    tputs(s, 1, immediate ? immediate_controlputc : controlputc);
-+}
-+
-+static folding_point (buf, pos)
-+struct	charsetmember *buf;
-+int	pos;
-+{
-+    int i;
-+    for (i = pos; i > 0; --i) {
-+    	if (!charisctrl (buf[i]) && charmemberfold (buf[i]))
-+	    return (i);
-+    }
-+    return (0);
-+}
-+
-+static calc_column (buf, pos)
-+struct	charsetmember *buf;
-+int	pos;
-+{
-+    struct charsetmember *s;
-+    int col = 0;
-+    for (s = buf; (s -> ch); ++s) {
-+    	if (!charisctrl (*s))
-+    	    col += charmemberwidth (*s);
-+	else
-+	    ++col;
-+    }
-+    return (col);
-+}
-+
-+static FlushOut() {
-+    int i, j, x;
-+    static struct charsetmember NewOutputBuf[1000];
-+    struct charsetmember *s;
-+    int NewPendingControls=0, NewPendingOutput = 0;
-+
-+    OutputBuf[PendingOutput].ch = 0;
-+    OutputBuf[PendingOutput].charset = NULL;
-+    if (linepos >= workingright) {
-+        for (i=0, j=0; j<workingright && i < PendingOutput; ++i) {
-+            if (!charisctrl (OutputBuf[i])) ++j;
-+        }
-+	x = folding_point (OutputBuf,i);
-+	if ((workingleft + 4) < x)
-+	    i = x;
-+	else
-+            while (i > workingleft + 4) {
-+                if (!charisctrl (OutputBuf[i])
-+                     && isspace((unsigned char) OutputBuf[i].ch)) {
-+                    break;
-+                }
-+                --i;
-+            }
-+        for (j=0; i<PendingOutput; ++j, ++i) {
-+            NewOutputBuf[j] = OutputBuf[i];
-+            ++NewPendingOutput;
-+            if (charisctrl (NewOutputBuf[j])) ++NewPendingControls;
-+        }
-+        PendingOutput -= NewPendingOutput;
-+        PendingControls -= NewPendingControls;
-+        charmember (&OutputBuf[PendingOutput],(RCHAR)'\n');
-+	PendingOutput++;
-+        OutputBuf[PendingOutput].ch = 0;
-+        OutputBuf[PendingOutput].charset = 0;
-+#ifdef MISTAKE
-+        ResetTerminalCodes(FakeTerminal, highlight, underline, bold,
-+                            highlightbuf, highlightendbuf, 0, StartUnderline,
-+                            StopUnderline, 0, BoldOn, BoldOff, 0);
-+#endif
-+    }
-+    if ((rightjustct > leftjustct)
-+         && (rightjustct > centerct)
-+         && (rightjustct > 0)) {
-+        /* right justified */
-+        i = rightmargin - calc_column (OutputBuf,PendingOutput) 
-+		+ PendingControls;
-+        for (j=0; j<i; ++j)  {
-+            controloutput(MoveRight, 1);
-+        }
-+        fputsmovingright(OutputBuf, stdout);
-+        ++linesused;
-+    } else if ((leftjustct > centerct)
-+                && (leftjustct > 0)) {
-+        /* left justified */
-+        for (s=OutputBuf; s -> ch && isspace((unsigned char) (s -> ch)); ++s)
-+	    {;}
-+        fputsmovingright(s, stdout);
-+        ++linesused;
-+    } else if (centerct > 0) {
-+        /* centered */
-+        i = (termcolumns - calc_column (OutputBuf,PendingOutput) - 1
-+		+ PendingControls) / 2;
-+        for (j=0; j<i; ++j) {
-+            controloutput(MoveRight, 1);
-+        }
-+        fputsmovingright(OutputBuf, stdout);
-+        ++linesused;
-+    } else {
-+        /* Leave indentation (margins) as-is */
-+        fputsmovingright(OutputBuf, stdout);
-+        ++linesused;
-+    }
-+    if (linesused >= termrows && UsePager) Pause();
-+    rightjustct = leftjustct = centerct = 0; /* not quite right for wrapping, sigh... */
-+    PendingOutput = PendingControls = linepos = 0;
-+    inspace = 1;
-+    j = (isspace((unsigned char) NewOutputBuf[0].ch)) ? 1 : 0;
-+    for ( ; j<NewPendingOutput; ++j) {
-+        if (charisctrl (NewOutputBuf[j])) {
-+	    OutputBuf[PendingOutput++] = NewOutputBuf[j];
-+            ++PendingControls;
-+        } else {
-+            realoutputc(NewOutputBuf[j], 1);
-+        }
-+    }
-+    ResetTerminalCodes(FakeTerminal, highlight, underline, bold,
-+                        highlightbuf, highlightendbuf, 0, StartUnderline,
-+                        StopUnderline, 0, BoldOn, BoldOff, 0);
-+}
-+
-+static outputc(c)
-+RCHAR c;
-+{
-+    struct charsetmember member;
-+    charmember (&member,c);
-+    realoutputc(member, 0);
-+}
-+
-+static realoutputc(c, alreadyformatted)
-+struct charsetmember c;
-+int alreadyformatted;
-+{
-+    int i, newinspace;
-+
-+    if (c.ch == '\n') {
-+    	charmember (&OutputBuf[PendingOutput],(RCHAR)'\n');
-+	PendingOutput++;
-+        FlushOut();
-+    } else if (c.ch == '\t') {
-+        int tabpos = (linepos + 8) / 8;
-+        if (tabpos >= workingright) {
-+    	    charmember (&OutputBuf[PendingOutput],(RCHAR)'\n');
-+	    PendingOutput++;
-+            FlushOut();
-+        } else {
-+            int spaces = (8*tabpos) - linepos;
-+            while (spaces-->0) {
-+    	        charmember (&OutputBuf[PendingOutput],(RCHAR)' ');
-+	        PendingOutput++;
-+                ++linepos;
-+            }
-+        }
-+    } else {
-+        newinspace = isspace((unsigned char) c.ch);
-+        if (!inspace || !newinspace || !JustSawCmd) {
-+            if (linepos == 0) {
-+                int i = workingleft;
-+                if (inexcerpt) {
-+    	            charmember (&OutputBuf[PendingOutput],(RCHAR)'>');
-+	            PendingOutput++;
-+                    --i;
-+                }
-+                if (insignature) {
-+    	            charmember (&OutputBuf[PendingOutput],(RCHAR)'+');
-+	            PendingOutput++;
-+                    --i;
-+                }
-+                while (i-->0) {
-+    	            charmember (&OutputBuf[PendingOutput],(RCHAR)' ');
-+	            PendingOutput++;
-+                }
-+                linepos = workingleft;
-+            }
-+            if (!alreadyformatted && biggertext && !(inspace && newinspace)) {
-+    	        charmember (&OutputBuf[PendingOutput],(RCHAR)'_');
-+	        PendingOutput++;
-+                ++linepos;
-+            }
-+            inspace = newinspace;
-+            linepos += charmemberwidth (c);
-+	    OutputBuf[PendingOutput++] = c;
-+	    if (OverStrike && !inspace) {
-+		if (bold) {
-+		    controlputc('\b');
-+		    controlputc((int) c.ch);
-+		}
-+		if (highlight||underline) {
-+		    controlputc('\b');
-+		    controlputc('_');
-+		}
-+	    }
-+            leftjustct += leftjustenv;
-+            rightjustct += rightjustenv;
-+            centerct += centerenv;
-+            if (c.ch == '\014') inspace = 1;
-+            if (linepos >= workingright) FlushOut();
-+        }
-+    }
-+}
-+
-+static MakeWorkingMargins() {
-+    int oldworkingleft=workingleft, i;
-+
-+    workingleft = leftmargin;
-+    workingright = rightmargin;
-+    if (workingleft < 0) workingleft = 0;
-+    if (workingright < 0) workingright = 0;
-+    if (workingright > (termcolumns - 1)) workingright = (termcolumns - 1);
-+    if (workingleft > (workingright - 8)) workingleft = workingright -8;
-+    if (linepos == oldworkingleft && linepos != 0) {
-+        for (i=workingleft-oldworkingleft; i > 0; --i) OUTC(' ');
-+    }
-+}
-+
-+static Pause()
-+{
-+    int	c;
-+
-+    (void) fputs("Press RETURN to continue (or 'q' to quit):\n", stdout);
-+    fflush(stdout);
-+    c = getc(stdin);
-+    if (c == 'q' || c == 'Q') exit(0);
-+    linesused = 0;
-+}
-+
-+/* Leading spaces should be output as MoveRight, to avoid 
-+   having margins that are underlined or reverse video */
-+
-+static fputsmovingright(s, fp)
-+struct charsetmember *s;
-+FILE *fp;
-+{
-+    int inmargin=1;
-+    if (!s) return;
-+    while (s -> ch) {
-+        if (inmargin && (s -> ch) == ' ') {
-+            controloutput(MoveRight, 1);
-+        } else {
-+            if (inmargin) inmargin = 0;
-+	    if (charisctrl (*s))
-+	        (*RichtextPutc) ((int)(s -> ch), fp);
-+	    else
-+	    	charmemberrender (*s, fp);
-+        }
-+        ++s;
-+    }
-+}
-+
-+static ResetTerminalCodes(FakeTerminal, highlight, underline, bold, highlightbuf, highlightendbuf,
-+                    modifiedhighlight, StartUnderline, StopUnderline, modifiedunderline,
-+                    BoldOn, BoldOff, modifiedbold)
-+char *highlightbuf, *highlightendbuf, *StartUnderline, *StopUnderline,
-+    *BoldOn, *BoldOff;
-+{
-+    if (OverStrike)
-+	return;
-+
-+    /* We always turn back on the appropriate terminal modes, because
-+      on some terminals one thing turns off all of them */
-+    if (highlight >= 1) {
-+        if (FakeTerminal) {
-+            if (modifiedhighlight && highlight == 1) outputstr(highlightbuf);
-+        } else controloutput(highlightbuf, 0);
-+    }
-+    if (bold >= 1) {
-+        if (FakeTerminal) {
-+            if (modifiedbold && bold == 1) outputstr(BoldOn);
-+        } else controloutput(BoldOn, 0);
-+    }
-+    if (underline >= 1) {
-+        if (FakeTerminal) {
-+            if (modifiedunderline && underline == 1) outputstr(StartUnderline);
-+        } else controloutput(StartUnderline, 0);
-+    }
-+}
-+
-+static FinalizeTerminal() {
-+    tputs(highlightendbuf, 1, immediate_controlputc);
-+    tputs(BoldOff, 1, immediate_controlputc);
-+    tputs(StopUnderline, 1, immediate_controlputc);
-+    FPUTS(KE, stdout);
-+}
-+
-+static outputstr(s)
-+char *s;
-+{
-+    while (*s) OUTC(*s++);
-+}
-+
-+static FPUTS(s,fp)
-+unsigned char *s;
-+FILE *fp;
-+{
-+    while(*s) (*RichtextPutc)((int)(*s++),fp);
-+}
-+
-+static lc2strcmp(s1, s2)
-+char *s1, *s2;
-+{
-+    if (!s1 || !s2) return (-1);
-+    while (*s1 && *s2) {
-+	if (*s1 != *s2 && (tolower(*s1) != *s2)) return(-1);
-+	++s1; ++s2;
-+    }
-+    return((*s1 == *s2) ? 0 : -1);
-+}
-+
-+static lc2strncmp(s1, s2, len)
-+char *s1, *s2;
-+int len;
-+{
-+    if (!s1 || !s2) return (-1);
-+    while (*s1 && *s2 && len > 0) {
-+	if (*s1 != *s2 && (tolower(*s1) != *s2)) return(-1);
-+	++s1; ++s2; --len;
-+    }
-+    if (len <= 0) return(0);
-+    return((*s1 == *s2) ? 0 : -1);
-+}
---- metamail-2.7.orig/src/richmail/richset.c
-+++ metamail-2.7/src/richmail/richset.c
-@@ -0,0 +1,222 @@
-+/*-------------------------------------------------------------------------
-+
-+  richset.c - Handling for different character sets in richtext.
-+ 
-+  Copyright (c) 1992 Rhys Weatherley
-+
-+  Permission to use, copy, modify, and distribute this material
-+  for any purpose and without fee is hereby granted, provided
-+  that the above copyright notice and this permission notice
-+  appear in all copies, and that the name of Rhys Weatherley not be
-+  used in advertising or publicity pertaining to this
-+  material without specific, prior written permission.
-+  RHYS WEATHERLEY MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR
-+  SUITABILITY OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED
-+  "AS IS", WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+  Revision History:
-+  ================
-+
-+   Version  DD/MM/YY  By  Description
-+   -------  --------  --  --------------------------------------
-+     1.0    21/06/92  RW  Original Version of richset.c
-+
-+  You may contact the author by:
-+  =============================
-+
-+   e-mail: rhys@cs.uq.oz.au
-+     mail: Rhys Weatherley
-+	   5 Horizon Drive
-+	   Jamboree Heights
-+	   Queensland 4074
-+	   Australia
-+
-+-------------------------------------------------------------------------*/
-+
-+#include <metamail/common.h>
-+
-+#include "richlex.h"
-+#include "richset.h"
-+
-+/*
-+ * Define a list of all character set processors in memory.
-+ */
-+static	struct	charsetproc	*CharacterSets[] =
-+	  {&usascii_charset,
-+	   &iso2022_charset,
-+	   NULL};
-+
-+/*
-+ * Global data for this module.
-+ */
-+#define	MAX_CHAR_SETS	100
-+static	int	NumCharSets=0;
-+static	struct	charsetproc	*CharSets[MAX_CHAR_SETS];
-+static	int	CharEncStack[MAX_CHAR_SETS];
-+
-+/*
-+ * Initialise the stack of character set processors, starting with
-+ * a particular base processor.  The initialisation function of all
-+ * character set processors is called.
-+ */
-+charsetinit (charset,name)
-+struct	charsetproc *charset;
-+char	*name;
-+{
-+    int temp = 0;
-+    CharSets[0] = charset;
-+    NumCharSets = 1;
-+    while (CharacterSets[temp]) {
-+        (*(CharacterSets[temp] -> init))
-+		((CharacterSets[temp] == charset ? name : NULL));
-+	++temp;
-+    }
-+}
-+
-+/*
-+ * Initialise the stack, starting with a character set processor with
-+ * a particular name.
-+ */
-+charsetnameinit	(name)
-+char	*name;
-+{
-+    int temp = 0;
-+    int succeed = 0;
-+    char *temp1,*temp2;
-+    struct charsetproc *charset = &usascii_charset;
-+    while (!succeed && CharacterSets[temp]) {
-+	temp2 = CharacterSets[temp] -> names;
-+	while (!succeed && *temp2) {
-+	    temp1 = name;
-+	    while (*temp1 && *temp2 && *temp2 != ':' && *temp2 == *temp1) {
-+		++temp1;
-+		++temp2;
-+	    }
-+	    if (*temp1 == '\0' && (*temp2 == '\0' || *temp2 == ':')) {
-+		succeed = 1;
-+		charset = CharacterSets[temp];
-+	    }
-+	    while (*temp2 && *temp2 != ':') {
-+		++temp2;
-+	    }
-+	    if (*temp2 == ':') {
-+		++temp2;
-+	    }
-+	}
-+	++temp;
-+    }
-+    charsetinit (charset,name);
-+}
-+
-+/*
-+ * Push a new character set processor onto the stack.
-+ */
-+charsetpush (charset)
-+struct	charsetproc *charset;
-+{
-+    if (NumCharSets >= MAX_CHAR_SETS) {
-+    	fprintf (stderr,"Too many nested character sets: aborting\n");
-+	exit (1);
-+    } else {
-+	CharEncStack[NumCharSets - 1] = RichtextCharEncoding;
-+	(*(CharSets[NumCharSets - 1] -> encoding)) (-1); /* Leave current */
-+    	CharSets[NumCharSets++] = charset;
-+    }
-+}
-+
-+/*
-+ * Pop the top-most character set processor off the stack
-+ * if it matches the given processor.  Note: the base
-+ * processor is never popped off.
-+ */
-+charsetpop (charset)
-+struct	charsetproc *charset;
-+{
-+    if (NumCharSets > 1 && CharSets[NumCharSets - 1] == charset) {
-+        --NumCharSets;
-+	richtextencoding (CharEncStack[NumCharSets - 1]);
-+	(*(CharSets[NumCharSets - 1] -> encoding)) (RichtextCharEncoding);
-+    }
-+}
-+
-+/*
-+ * See if the character set processor on the top of the stack
-+ * matches the given processor.
-+ */
-+int	charsettop (charset)
-+struct	charsetproc *charset;
-+{
-+    if (NumCharSets > 1) {
-+	return (CharSets[NumCharSets - 1] == charset);
-+    } else {
-+	return (0);
-+    }
-+}
-+
-+/*
-+ * Set the details for a character set member in the top-most
-+ * character set.
-+ */
-+charmember (member,ch)
-+struct	charsetmember *member;
-+RCHAR	ch;
-+{
-+    member -> ch = ch;
-+    member -> charset = CharSets[NumCharSets - 1];
-+}
-+
-+/*
-+ * Set the details for a member of a specific character set.
-+ */
-+charmemberspec (member,ch,charset)
-+struct	charsetmember *member;
-+RCHAR	ch;
-+struct	charsetproc *charset;
-+{
-+    member -> ch = ch;
-+    member -> charset = charset;
-+}
-+
-+/*
-+ * Set the details for a output control code character.
-+ */
-+charmemberctrl (member,ch)
-+struct	charsetmember *member;
-+RCHAR	ch;
-+{
-+    member -> ch = ch;
-+    member -> charset = NULL;
-+}
-+
-+/*
-+ * Attempt to process a richtext command by passing it to the
-+ * "command" function of all character set processors.  Returns
-+ * zero if the command was not processed.
-+ */
-+int	charsetcommand (token,negated)
-+char	*token;
-+int	negated;
-+{
-+    int temp = 0;
-+    while (CharacterSets[temp]) {
-+    	if ((*(CharacterSets[temp] -> command)) (token,negated))
-+	    return (1);
-+	++temp;
-+    }
-+    return (0);
-+}
-+
-+/*
-+ * Test for an extension singleton command.
-+ */
-+int	charsetsingle (token)
-+char	*token;
-+{
-+    int temp = 0;
-+    while (CharacterSets[temp]) {
-+    	if ((*(CharacterSets[temp] -> single)) (token))
-+	    return (1);
-+	++temp;
-+    }
-+    return (0);
-+}
---- metamail-2.7.orig/src/richmail/richset.h
-+++ metamail-2.7/src/richmail/richset.h
-@@ -0,0 +1,172 @@
-+/*-------------------------------------------------------------------------
-+
-+  richset.h - Handling for different character sets in richtext.
-+ 
-+  Copyright (c) 1992 Rhys Weatherley
-+
-+  Permission to use, copy, modify, and distribute this material
-+  for any purpose and without fee is hereby granted, provided
-+  that the above copyright notice and this permission notice
-+  appear in all copies, and that the name of Rhys Weatherley not be
-+  used in advertising or publicity pertaining to this
-+  material without specific, prior written permission.
-+  RHYS WEATHERLEY MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR
-+  SUITABILITY OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED
-+  "AS IS", WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+  Revision History:
-+  ================
-+
-+   Version  DD/MM/YY  By  Description
-+   -------  --------  --  --------------------------------------
-+     1.0    19/06/92  RW  Original Version of richset.h
-+
-+  You may contact the author by:
-+  =============================
-+
-+   e-mail: rhys@cs.uq.oz.au
-+     mail: Rhys Weatherley
-+	   5 Horizon Drive
-+	   Jamboree Heights
-+	   Queensland 4074
-+	   Australia
-+
-+-------------------------------------------------------------------------*/
-+
-+#ifndef	__RICHSET_H__
-+#define	__RICHSET_H__
-+
-+#include <metamail/common.h>
-+
-+BEGIN_C_DECLS
-+
-+/*
-+ * Define the interface structure for a character set processor.
-+ * The fields are as follows:
-+ *
-+ *	names	- Colon-separated list of character set names.
-+ *	init	- Initialize the character set processor.
-+ *	command	- Process a command before the default processing.
-+ *		  Returns non-zero if processed, zero if not.
-+ *	single	- Should return non-zero for a singleton command.
-+ *	width	- Get the width in terminal characters of the character.
-+ *	fold	- Returns non-zero if the character can be folded at.
-+ *	render	- Render the character through RichtextPutc.
-+ *	encoding- Enter or leave an encoding. newenc is -1 to leave.
-+ *
-+ */
-+struct	charsetproc
-+		{
-+		    char *names;
-+		    int (*init) ( /* char *name */ );
-+		    int (*command) ( /* char *token, int negated */ );
-+		    int (*single) ( /* char *token */ );
-+		    int (*width) ( /* RCHAR c */ );
-+		    int (*fold) ( /* RCHAR c */ );
-+		    int (*render) ( /* RCHAR c, void *param */ );
-+		    int (*encoding) ( /* int newenc */ );
-+		};
-+
-+/*
-+ * Define some standard character set processors.
-+ */
-+extern	struct 	charsetproc	usascii_charset;
-+extern	struct	charsetproc	iso2022_charset;
-+
-+/*
-+ * Define the information to be kept in the internal buffers
-+ * about a character.  If "charset" is NULL, it is a control
-+ * character.
-+ */
-+struct	charsetmember
-+		{
-+		    RCHAR ch;			 /* The character itself */
-+		    struct charsetproc *charset; /* Character set of ch */
-+		};
-+
-+/*
-+ * Initialise the stack of character set processors, starting with
-+ * a particular base processor.  The initialisation function of all
-+ * character set processors is called.
-+ */
-+extern	charsetinit	( /* struct charsetproc *charset, char *name */ );
-+
-+/*
-+ * Initialise the stack, starting with a character set processor with
-+ * a particular name.
-+ */
-+extern	charsetnameinit	( /* char *name */ );
-+
-+/*
-+ * Push a new character set processor onto the stack.
-+ */
-+extern	charsetpush	( /* struct charsetproc *charset */ );
-+
-+/*
-+ * Pop the top-most character set processor off the stack
-+ * if it matches the given processor.  Note: the base
-+ * processor is never popped off.
-+ */
-+extern	charsetpop	( /* struct charsetproc *charset */ );
-+
-+/*
-+ * See if the character set processor on the top of the stack
-+ * matches the given processor.
-+ */
-+extern	int	charsettop ( /* struct charsetproc *charset */ );
-+
-+/*
-+ * Set the details for a character set member in the top-most
-+ * character set.
-+ */
-+extern	charmember	( /* struct charsetmember *member, RCHAR ch */ );
-+
-+/*
-+ * Set the details for a member of a specific character set.
-+ */
-+extern	charmemberspec	( /* struct charsetmember *member, RCHAR ch,
-+			     struct charset *charset */ );
-+
-+/*
-+ * Set the details for a output control code character.
-+ */
-+extern	charmemberctrl	( /* struct charsetmember *member, RCHAR ch */ );
-+
-+/*
-+ * Determine if the given character is a control code character.
-+ */
-+#define	charisctrl(member)	((member).charset == (struct charsetproc *)0)
-+
-+/*
-+ * Attempt to process a richtext command by passing it to the
-+ * "command" function of all character set processors.  Returns
-+ * zero if the command was not processed.
-+ */
-+extern	int	charsetcommand	( /* char *token, int negated */ );
-+
-+/*
-+ * Test for an extension singleton command.
-+ */
-+extern	int	charsetsingle	( /* char *token */ );
-+
-+/*
-+ * Get the width of a particular character.
-+ */
-+#define	charmemberwidth(member) \
-+		((*((member).charset -> width)) ((member).ch))
-+
-+/*
-+ * Determine if a character can be folded at.
-+ */
-+#define	charmemberfold(member) \
-+		((*((member).charset -> fold)) ((member).ch))
-+
-+/*
-+ * Render a character on an output stream.
-+ */
-+#define	charmemberrender(member,param) \
-+		((*((member).charset -> render)) ((member).ch,param))
-+
-+END_C_DECLS
-+
-+#endif	/* __RICHSET_H__ */
---- metamail-2.7.orig/src/richmail/richtoatk.c
-+++ metamail-2.7/src/richmail/richtoatk.c
-@@ -0,0 +1,98 @@
-+/*
-+Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+
-+Permission to use, copy, modify, and distribute this material 
-+for any purpose and without fee is hereby granted, provided 
-+that the above copyright notice and this permission notice 
-+appear in all copies, and that the name of Bellcore not be 
-+used in advertising or publicity pertaining to this 
-+material without the specific, prior written permission 
-+of an authorized representative of Bellcore.  BELLCORE 
-+MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+*/
-+#include <metamail/common.h>
-+
-+#include "richlex.h"
-+
-+char *translate(t)
-+char *t;
-+{
-+    if (!strcmp(t, "fixed")) return("typewriter");
-+    if (!strcmp(t, "excerpt")) return("quotation");
-+    /* Really ought to handle ISO-10646 and ISO-8859-X somehow */
-+    return(t);
-+}
-+
-+main() {
-+    RCHAR c;
-+    int i, JustDidNewline = 0;
-+    char tok[MAX_TOKEN_SIZE + 1],*token;
-+
-+    fputs("\\begindata{text, 42}\n\\template{messages}\n", stdout);
-+    /* The 0, 0 means that we're not implementing text/enriched */
-+    while((c = richtextlex(stdin,tok + 1, 0, 0)) != (RCHAR)EOF) {
-+	if (c == RICHTEXT_COMMAND || c == RICHTEXT_NEG_COMMAND) {
-+	    if (c == RICHTEXT_NEG_COMMAND) {
-+		tok[0] = '/';
-+		token = tok;
-+	    } else
-+		token = tok + 1;
-+            if (!strcmp(token, "lt")) {
-+                putc('<', stdout);
-+                JustDidNewline = 0;
-+            } else if (!strcmp(token, "nl")) {
-+                fputs(JustDidNewline ? "\n" : "\n\n", stdout);
-+                JustDidNewline = 1;
-+            } else if (!strcmp(token, "/paragraph")) {
-+                fputs(JustDidNewline ? "\n\n" : "\n\n\n", stdout);
-+                JustDidNewline = 1;
-+            } else if (!strcmp(token, "comment")) {
-+	        int tempc;
-+                while (strcmp(token, "/comment")) {
-+                    while ((tempc = getc(stdin)) != '<') ;
-+                    for (i=0; (tempc = getc(stdin)) != '>'; ++i) {
-+                        token[i] = isupper(tempc) ? tolower(tempc) : tempc;
-+                    }
-+                    token[i] = '\0';
-+                }
-+            } else if (!ignoretoken(token)) {
-+                if (token[0] == '/') {
-+                    putc('}', stdout);
-+                } else {
-+                    fprintf(stdout, "\\%s{", translate(token));
-+                    JustDidNewline = 0;
-+                }
-+            }
-+        } else if (c == '\n') {
-+            putc(' ', stdout);
-+            JustDidNewline = 0;
-+        } else {
-+            putc((int)c, stdout);
-+            JustDidNewline = 0;
-+        }
-+    }
-+    fputs("\n \n\\enddata{text, 42}\n", stdout);
-+}
-+
-+ignoretoken(t)
-+char *t;
-+{
-+    if (*t == '/') ++t;
-+    if (!strcmp(t, "us-ascii")) return(1);
-+    if (!strcmp(t, "paragraph")) return(1); /* handled otherwise */
-+    if (!strcmp(t, "no-op")) return(1);
-+    return(0);
-+}
-+
-+controlputc(c)
-+int c;
-+{
-+}
-+
-+controloutput(s, immediate)
-+char *s;
-+int immediate;
-+{
-+}
---- metamail-2.7.orig/replace/vfprintf.c
-+++ metamail-2.7/replace/vfprintf.c
-@@ -0,0 +1,43 @@
-+/* vfprintf.c -- implement vfprintf() for architectures without it
-+   Copyright (C) 2000 Gary V. Vaughan
-+  
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 2, or (at your option)
-+   any later version.
-+  
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+  
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+*/
-+
-+#if HAVE_CONFIG_H
-+#  include <config.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#if HAVE_STDARG_H && !HAVE_VARARGS_H
-+#  include <stdarg.h>
-+#else /*!HAVE_STDARG_H || HAVE_VARARGS_H*/
-+#  include <varargs.h>
-+#endif /*HAVE_STDARG_H && !HAVE_VARARGS_H*/
-+
-+/* Some systems define this! */
-+#undef vfprintf
-+
-+extern int _doprnt ();
-+
-+int
-+vfprintf (file, format, ap)
-+     FILE *file;
-+     const char *format;
-+     va_list ap;
-+{
-+   return _doprnt (format, ap, file);
-+}
---- metamail-2.7.orig/replace/basename.c
-+++ metamail-2.7/replace/basename.c
-@@ -0,0 +1,45 @@
-+/* basename.c -- implement basename() for architectures without it
-+   Copyright (C) 2000 Gary V. Vaughan
-+  
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 2, or (at your option)
-+   any later version.
-+  
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+  
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+*/
-+#if HAVE_CONFIG_H
-+#  include <config.h>
-+#endif
-+
-+#if HAVE_STRING_H
-+#  include <string.h>
-+#elif HAVE_STRINGS_H
-+#  include <strings.h>
-+#endif
-+
-+#if !HAVE_STRRCHR
-+#  ifndef strrchr
-+#    define strrchr rindex
-+#  endif
-+#endif
-+
-+char*
-+basename (path)
-+     char *path;
-+{
-+  /* Search for the last directory separator in PATH.  */
-+  char *basename = strrchr (path, '/');
-+  
-+  /* If found, return the address of the following character,
-+     or the start of the parameter passed in.  */
-+  return basename ? ++basename : (char*)path;
-+}
-+
---- metamail-2.7.orig/replace/putenv.c
-+++ metamail-2.7/replace/putenv.c
-@@ -0,0 +1,100 @@
-+/* Copyright (C) 1991 Free Software Foundation, Inc.
-+This file is part of the GNU C Library.
-+
-+The GNU C Library is free software; you can redistribute it and/or
-+modify it under the terms of the GNU Library General Public License as
-+published by the Free Software Foundation; either version 2 of the
-+License, or (at your option) any later version.
-+
-+The GNU C Library is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+Library General Public License for more details.
-+
-+You should have received a copy of the GNU Library General Public
-+License along with the GNU C Library; see the file COPYING.LIB.  If
-+not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-+Cambridge, MA 02139, USA.  */
-+
-+#include <config.h>
-+#include <sys/types.h>
-+#include <errno.h>
-+#ifdef STDC_HEADERS
-+#include <stdlib.h>
-+#else
-+extern int errno;
-+#endif
-+
-+#if defined(STDC_HEADERS) || defined(USG) || defined(SYSV)
-+#include <string.h>
-+#else /* not (STDC_HEADERS or USG) */
-+#include <strings.h>
-+#endif /* STDC_HEADERS or USG */
-+
-+#ifdef HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+
-+#ifndef NULL
-+#define NULL 0
-+#endif
-+
-+#if !__STDC__
-+#define const
-+#endif
-+
-+extern char **environ;
-+
-+/* Put STRING, which is of the form "NAME=VALUE", in the environment.  */
-+int
-+putenv (string)
-+     const char *string;
-+{
-+  char *name_end = index (string, '=');
-+  register size_t size;
-+  register char **ep;
-+
-+  if (name_end == NULL)
-+    {
-+      /* Remove the variable from the environment.  */
-+      size = strlen (string);
-+      for (ep = environ; *ep != NULL; ++ep)
-+	if (!strncmp (*ep, string, size) && (*ep)[size] == '=')
-+	  {
-+	    while (ep[1] != NULL)
-+	      {
-+		ep[0] = ep[1];
-+		++ep;
-+	      }
-+	    *ep = NULL;
-+	    return 0;
-+	  }
-+    }
-+
-+  size = 0;
-+  for (ep = environ; *ep != NULL; ++ep)
-+    if (!strncmp (*ep, string, name_end - string) &&
-+	(*ep)[name_end - string] == '=')
-+      break;
-+    else
-+      ++size;
-+
-+  if (*ep == NULL)
-+    {
-+      static char **last_environ = NULL;
-+      char **new_environ = (char **) malloc ((size + 2) * sizeof (char *));
-+      if (new_environ == NULL)
-+	return -1;
-+      (void) bcopy ((char *) environ, (char *) new_environ, size * sizeof (char *));
-+      new_environ[size] = (char *) string;
-+      new_environ[size + 1] = NULL;
-+      if (last_environ != NULL)
-+	free ((char *) last_environ);
-+      last_environ = new_environ;
-+      environ = new_environ;
-+    }
-+  else
-+    *ep = (char *) string;
-+
-+  return 0;
-+}
---- metamail-2.7.orig/replace/Makefile.am
-+++ metamail-2.7/replace/Makefile.am
-@@ -0,0 +1,9 @@
-+## Makefile.am -- Process this file with automake to produce Makefile.in
-+
-+MAINTAINERCLEANFILES	= Makefile.in
-+
-+INCLUDES		=  -I$(top_builddir) -I$(top_srcdir)
-+
-+noinst_LTLIBRARIES	= libreplace.la
-+libreplace_la_SOURCES	= 
-+libreplace_la_LIBADD	= @LTLIBOBJS@
---- metamail-2.7.orig/replace/Makefile.in
-+++ metamail-2.7/replace/Makefile.in
-@@ -0,0 +1,343 @@
-+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+
-+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
-+bindir = @bindir@
-+sbindir = @sbindir@
-+libexecdir = @libexecdir@
-+datadir = @datadir@
-+sysconfdir = @sysconfdir@
-+sharedstatedir = @sharedstatedir@
-+localstatedir = @localstatedir@
-+libdir = @libdir@
-+infodir = @infodir@
-+mandir = @mandir@
-+includedir = @includedir@
-+oldincludedir = /usr/include
-+
-+DESTDIR =
-+
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+
-+top_builddir = ..
-+
-+ACLOCAL = @ACLOCAL@
-+AUTOCONF = @AUTOCONF@
-+AUTOMAKE = @AUTOMAKE@
-+AUTOHEADER = @AUTOHEADER@
-+
-+INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+transform = @program_transform_name@
-+
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+host_alias = @host_alias@
-+host_triplet = @host@
-+AS = @AS@
-+CATCOMMAND = @CATCOMMAND@
-+CC = @CC@
-+DLLTOOL = @DLLTOOL@
-+ECHO = @ECHO@
-+EXEEXT = @EXEEXT@
-+LIBTOOL = @LIBTOOL@
-+LIBTOOL_DEPS = @LIBTOOL_DEPS@
-+LN_S = @LN_S@
-+LPRCOMMAND = @LPRCOMMAND@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAKEINFO = @MAKEINFO@
-+OBJDUMP = @OBJDUMP@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+RANLIB = @RANLIB@
-+STRIP = @STRIP@
-+VERSION = @VERSION@
-+ac_aux_dir = @ac_aux_dir@
-+
-+MAINTAINERCLEANFILES = Makefile.in
-+
-+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-+
-+noinst_LTLIBRARIES = libreplace.la
-+libreplace_la_SOURCES = 
-+libreplace_la_LIBADD = @LTLIBOBJS@
-+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-+CONFIG_HEADER = ../metamail/config.h
-+CONFIG_CLEAN_FILES = 
-+LTLIBRARIES =  $(noinst_LTLIBRARIES)
-+
-+
-+DEFS = @DEFS@ -I. -I$(srcdir) -I../metamail
-+CPPFLAGS = @CPPFLAGS@
-+LDFLAGS = @LDFLAGS@
-+LIBS = @LIBS@
-+libreplace_la_LDFLAGS = 
-+libreplace_la_DEPENDENCIES =  @LTLIBOBJS@
-+libreplace_la_OBJECTS = 
-+CFLAGS = @CFLAGS@
-+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-+DIST_COMMON =  Makefile.am Makefile.in basename.c putenv.c strerror.c \
-+vfprintf.c
-+
-+
-+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-+
-+TAR = tar
-+GZIP_ENV = --best
-+DEP_FILES =  .deps/basename.P .deps/putenv.P .deps/strerror.P \
-+.deps/vfprintf.P
-+SOURCES = $(libreplace_la_SOURCES)
-+OBJECTS = $(libreplace_la_OBJECTS)
-+
-+all: all-redirect
-+.SUFFIXES:
-+.SUFFIXES: .S .c .lo .o .obj .s
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-+	cd $(top_srcdir) && $(AUTOMAKE) --foreign replace/Makefile
-+
-+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-+	cd $(top_builddir) \
-+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
-+
-+mostlyclean-noinstLTLIBRARIES:
-+
-+clean-noinstLTLIBRARIES:
-+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-+
-+distclean-noinstLTLIBRARIES:
-+
-+maintainer-clean-noinstLTLIBRARIES:
-+
-+# FIXME: We should only use cygpath when building on Windows,
-+# and only if it is available.
-+.c.obj:
-+	$(COMPILE) -c `cygpath -w $<`
-+
-+.s.o:
-+	$(COMPILE) -c $<
-+
-+.S.o:
-+	$(COMPILE) -c $<
-+
-+mostlyclean-compile:
-+	-rm -f *.o core *.core
-+	-rm -f *.$(OBJEXT)
-+
-+clean-compile:
-+
-+distclean-compile:
-+	-rm -f *.tab.c
-+
-+maintainer-clean-compile:
-+
-+.s.lo:
-+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+
-+.S.lo:
-+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+
-+maintainer-clean-libtool:
-+
-+libreplace.la: $(libreplace_la_OBJECTS) $(libreplace_la_DEPENDENCIES)
-+	$(LINK)  $(libreplace_la_LDFLAGS) $(libreplace_la_OBJECTS) $(libreplace_la_LIBADD) $(LIBS)
-+
-+tags: TAGS
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP)
-+	list='$(SOURCES) $(HEADERS)'; \
-+	unique=`for i in $$list; do echo $$i; done | \
-+	  awk '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	here=`pwd` && cd $(srcdir) \
-+	  && mkid -f$$here/ID $$unique $(LISP)
-+
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)'; \
-+	unique=`for i in $$list; do echo $$i; done | \
-+	  awk '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-+	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
-+
-+mostlyclean-tags:
-+
-+clean-tags:
-+
-+distclean-tags:
-+	-rm -f TAGS ID
-+
-+maintainer-clean-tags:
-+
-+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-+
-+subdir = replace
-+
-+distdir: $(DISTFILES)
-+	here=`cd $(top_builddir) && pwd`; \
-+	top_distdir=`cd $(top_distdir) && pwd`; \
-+	distdir=`cd $(distdir) && pwd`; \
-+	cd $(top_srcdir) \
-+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign replace/Makefile
-+	@for file in $(DISTFILES); do \
-+	  d=$(srcdir); \
-+	  if test -d $$d/$$file; then \
-+	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	  fi; \
-+	done
-+
-+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-+
-+-include $(DEP_FILES)
-+
-+mostlyclean-depend:
-+
-+clean-depend:
-+
-+distclean-depend:
-+	-rm -rf .deps
-+
-+maintainer-clean-depend:
-+
-+%.o: %.c
-+	@echo '$(COMPILE) -c $<'; \
-+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm .deps/$(*F).pp
-+
-+%.lo: %.c
-+	@echo '$(LTCOMPILE) -c $<'; \
-+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-+	  < .deps/$(*F).pp > .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm -f .deps/$(*F).pp
-+info-am:
-+info: info-am
-+dvi-am:
-+dvi: dvi-am
-+check-am: all-am
-+check: check-am
-+installcheck-am:
-+installcheck: installcheck-am
-+install-exec-am:
-+install-exec: install-exec-am
-+
-+install-data-am:
-+install-data: install-data-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+install: install-am
-+uninstall-am:
-+uninstall: uninstall-am
-+all-am: Makefile $(LTLIBRARIES)
-+all-redirect: all-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-+installdirs:
-+
-+
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+
-+maintainer-clean-generic:
-+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-+mostlyclean-am:  mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
-+		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
-+		mostlyclean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+clean-am:  clean-noinstLTLIBRARIES clean-compile clean-libtool \
-+		clean-tags clean-depend clean-generic mostlyclean-am
-+
-+clean: clean-am
-+
-+distclean-am:  distclean-noinstLTLIBRARIES distclean-compile \
-+		distclean-libtool distclean-tags distclean-depend \
-+		distclean-generic clean-am
-+	-rm -f libtool
-+
-+distclean: distclean-am
-+
-+maintainer-clean-am:  maintainer-clean-noinstLTLIBRARIES \
-+		maintainer-clean-compile maintainer-clean-libtool \
-+		maintainer-clean-tags maintainer-clean-depend \
-+		maintainer-clean-generic distclean-am
-+	@echo "This command is intended for maintainers to use;"
-+	@echo "it deletes files that may require special tools to rebuild."
-+
-+maintainer-clean: maintainer-clean-am
-+
-+.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
-+clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
-+mostlyclean-compile distclean-compile clean-compile \
-+maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-+clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
-+distclean-tags clean-tags maintainer-clean-tags distdir \
-+mostlyclean-depend distclean-depend clean-depend \
-+maintainer-clean-depend info-am info dvi-am dvi check check-am \
-+installcheck-am installcheck install-exec-am install-exec \
-+install-data-am install-data install-am install uninstall-am uninstall \
-+all-redirect all-am all installdirs mostlyclean-generic \
-+distclean-generic clean-generic maintainer-clean-generic clean \
-+mostlyclean distclean maintainer-clean
-+
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
---- metamail-2.7.orig/replace/strerror.c
-+++ metamail-2.7/replace/strerror.c
-@@ -0,0 +1,610 @@
-+/* strerror.c -- implement strerror() for architectures without it
-+   Written by Fred Fish.  fnf@cygnus.com
-+   This file is in the public domain.  --Per Bothner.
-+*/
-+
-+#if HAVE_CONFIG_H
-+#  include <config.h>
-+#endif
-+
-+#ifdef HAVE_SYS_ERRLIST
-+/* Note that errno.h (not sure what OS) or stdio.h (BSD 4.4, at least)
-+   might declare sys_errlist in a way that the compiler might consider
-+   incompatible with our later declaration, perhaps by using const
-+   attributes.  So we hide the declaration in errno.h (if any) using a
-+   macro. */
-+#define sys_errlist no_such_symbol
-+#endif
-+
-+#include <stdio.h>
-+
-+#if HAVE_ERRNO_H
-+#  include <errno.h>
-+#endif
-+
-+#ifdef HAVE_SYS_ERRLIST
-+#  undef sys_errlist
-+#endif
-+
-+/*  Routines imported from standard C runtime libraries. */
-+
-+#ifdef __STDC__
-+#include <stddef.h>
-+extern void *malloc (size_t size);				/* 4.10.3.3 */
-+extern void *memset (void *s, int c, size_t n);			/* 4.11.6.1 */
-+#else	/* !__STDC__ */
-+extern char *malloc ();		/* Standard memory allocater */
-+extern char *memset ();
-+#endif	/* __STDC__ */
-+
-+#ifndef MAX
-+#  define MAX(a,b) ((a) > (b) ? (a) : (b))
-+#endif
-+
-+/* Translation table for errno values.  See intro(2) in most UNIX systems
-+   Programmers Reference Manuals.
-+
-+   Note that this table is generally only accessed when it is used at runtime
-+   to initialize errno name and message tables that are indexed by errno
-+   value.
-+
-+   Not all of these errnos will exist on all systems.  This table is the only
-+   thing that should have to be updated as new error numbers are introduced.
-+   It's sort of ugly, but at least its portable. */
-+
-+struct error_info
-+{
-+  int value;		/* The numeric value from <errno.h> */
-+  const char *name;	/* The equivalent symbolic value */
-+#ifndef HAVE_SYS_ERRLIST
-+  const char *msg;	/* Short message about this value */
-+#endif
-+};
-+
-+#ifndef HAVE_SYS_ERRLIST
-+#   define ENTRY(value, name, msg)	{value, name, msg}
-+#else
-+#   define ENTRY(value, name, msg)	{value, name}
-+#endif
-+
-+static const struct error_info error_table[] =
-+{
-+#if defined (EPERM)
-+  ENTRY(EPERM, "EPERM", "Not owner"),
-+#endif
-+#if defined (ENOENT)
-+  ENTRY(ENOENT, "ENOENT", "No such file or directory"),
-+#endif
-+#if defined (ESRCH)
-+  ENTRY(ESRCH, "ESRCH", "No such process"),
-+#endif
-+#if defined (EINTR)
-+  ENTRY(EINTR, "EINTR", "Interrupted system call"),
-+#endif
-+#if defined (EIO)
-+  ENTRY(EIO, "EIO", "I/O error"),
-+#endif
-+#if defined (ENXIO)
-+  ENTRY(ENXIO, "ENXIO", "No such device or address"),
-+#endif
-+#if defined (E2BIG)
-+  ENTRY(E2BIG, "E2BIG", "Arg list too long"),
-+#endif
-+#if defined (ENOEXEC)
-+  ENTRY(ENOEXEC, "ENOEXEC", "Exec format error"),
-+#endif
-+#if defined (EBADF)
-+  ENTRY(EBADF, "EBADF", "Bad file number"),
-+#endif
-+#if defined (ECHILD)
-+  ENTRY(ECHILD, "ECHILD", "No child processes"),
-+#endif
-+#if defined (EWOULDBLOCK)	/* Put before EAGAIN, sometimes aliased */
-+  ENTRY(EWOULDBLOCK, "EWOULDBLOCK", "Operation would block"),
-+#endif
-+#if defined (EAGAIN)
-+  ENTRY(EAGAIN, "EAGAIN", "No more processes"),
-+#endif
-+#if defined (ENOMEM)
-+  ENTRY(ENOMEM, "ENOMEM", "Not enough space"),
-+#endif
-+#if defined (EACCES)
-+  ENTRY(EACCES, "EACCES", "Permission denied"),
-+#endif
-+#if defined (EFAULT)
-+  ENTRY(EFAULT, "EFAULT", "Bad address"),
-+#endif
-+#if defined (ENOTBLK)
-+  ENTRY(ENOTBLK, "ENOTBLK", "Block device required"),
-+#endif
-+#if defined (EBUSY)
-+  ENTRY(EBUSY, "EBUSY", "Device busy"),
-+#endif
-+#if defined (EEXIST)
-+  ENTRY(EEXIST, "EEXIST", "File exists"),
-+#endif
-+#if defined (EXDEV)
-+  ENTRY(EXDEV, "EXDEV", "Cross-device link"),
-+#endif
-+#if defined (ENODEV)
-+  ENTRY(ENODEV, "ENODEV", "No such device"),
-+#endif
-+#if defined (ENOTDIR)
-+  ENTRY(ENOTDIR, "ENOTDIR", "Not a directory"),
-+#endif
-+#if defined (EISDIR)
-+  ENTRY(EISDIR, "EISDIR", "Is a directory"),
-+#endif
-+#if defined (EINVAL)
-+  ENTRY(EINVAL, "EINVAL", "Invalid argument"),
-+#endif
-+#if defined (ENFILE)
-+  ENTRY(ENFILE, "ENFILE", "File table overflow"),
-+#endif
-+#if defined (EMFILE)
-+  ENTRY(EMFILE, "EMFILE", "Too many open files"),
-+#endif
-+#if defined (ENOTTY)
-+  ENTRY(ENOTTY, "ENOTTY", "Not a typewriter"),
-+#endif
-+#if defined (ETXTBSY)
-+  ENTRY(ETXTBSY, "ETXTBSY", "Text file busy"),
-+#endif
-+#if defined (EFBIG)
-+  ENTRY(EFBIG, "EFBIG", "File too large"),
-+#endif
-+#if defined (ENOSPC)
-+  ENTRY(ENOSPC, "ENOSPC", "No space left on device"),
-+#endif
-+#if defined (ESPIPE)
-+  ENTRY(ESPIPE, "ESPIPE", "Illegal seek"),
-+#endif
-+#if defined (EROFS)
-+  ENTRY(EROFS, "EROFS", "Read-only file system"),
-+#endif
-+#if defined (EMLINK)
-+  ENTRY(EMLINK, "EMLINK", "Too many links"),
-+#endif
-+#if defined (EPIPE)
-+  ENTRY(EPIPE, "EPIPE", "Broken pipe"),
-+#endif
-+#if defined (EDOM)
-+  ENTRY(EDOM, "EDOM", "Math argument out of domain of func"),
-+#endif
-+#if defined (ERANGE)
-+  ENTRY(ERANGE, "ERANGE", "Math result not representable"),
-+#endif
-+#if defined (ENOMSG)
-+  ENTRY(ENOMSG, "ENOMSG", "No message of desired type"),
-+#endif
-+#if defined (EIDRM)
-+  ENTRY(EIDRM, "EIDRM", "Identifier removed"),
-+#endif
-+#if defined (ECHRNG)
-+  ENTRY(ECHRNG, "ECHRNG", "Channel number out of range"),
-+#endif
-+#if defined (EL2NSYNC)
-+  ENTRY(EL2NSYNC, "EL2NSYNC", "Level 2 not synchronized"),
-+#endif
-+#if defined (EL3HLT)
-+  ENTRY(EL3HLT, "EL3HLT", "Level 3 halted"),
-+#endif
-+#if defined (EL3RST)
-+  ENTRY(EL3RST, "EL3RST", "Level 3 reset"),
-+#endif
-+#if defined (ELNRNG)
-+  ENTRY(ELNRNG, "ELNRNG", "Link number out of range"),
-+#endif
-+#if defined (EUNATCH)
-+  ENTRY(EUNATCH, "EUNATCH", "Protocol driver not attached"),
-+#endif
-+#if defined (ENOCSI)
-+  ENTRY(ENOCSI, "ENOCSI", "No CSI structure available"),
-+#endif
-+#if defined (EL2HLT)
-+  ENTRY(EL2HLT, "EL2HLT", "Level 2 halted"),
-+#endif
-+#if defined (EDEADLK)
-+  ENTRY(EDEADLK, "EDEADLK", "Deadlock condition"),
-+#endif
-+#if defined (ENOLCK)
-+  ENTRY(ENOLCK, "ENOLCK", "No record locks available"),
-+#endif
-+#if defined (EBADE)
-+  ENTRY(EBADE, "EBADE", "Invalid exchange"),
-+#endif
-+#if defined (EBADR)
-+  ENTRY(EBADR, "EBADR", "Invalid request descriptor"),
-+#endif
-+#if defined (EXFULL)
-+  ENTRY(EXFULL, "EXFULL", "Exchange full"),
-+#endif
-+#if defined (ENOANO)
-+  ENTRY(ENOANO, "ENOANO", "No anode"),
-+#endif
-+#if defined (EBADRQC)
-+  ENTRY(EBADRQC, "EBADRQC", "Invalid request code"),
-+#endif
-+#if defined (EBADSLT)
-+  ENTRY(EBADSLT, "EBADSLT", "Invalid slot"),
-+#endif
-+#if defined (EDEADLOCK)
-+  ENTRY(EDEADLOCK, "EDEADLOCK", "File locking deadlock error"),
-+#endif
-+#if defined (EBFONT)
-+  ENTRY(EBFONT, "EBFONT", "Bad font file format"),
-+#endif
-+#if defined (ENOSTR)
-+  ENTRY(ENOSTR, "ENOSTR", "Device not a stream"),
-+#endif
-+#if defined (ENODATA)
-+  ENTRY(ENODATA, "ENODATA", "No data available"),
-+#endif
-+#if defined (ETIME)
-+  ENTRY(ETIME, "ETIME", "Timer expired"),
-+#endif
-+#if defined (ENOSR)
-+  ENTRY(ENOSR, "ENOSR", "Out of streams resources"),
-+#endif
-+#if defined (ENONET)
-+  ENTRY(ENONET, "ENONET", "Machine is not on the network"),
-+#endif
-+#if defined (ENOPKG)
-+  ENTRY(ENOPKG, "ENOPKG", "Package not installed"),
-+#endif
-+#if defined (EREMOTE)
-+  ENTRY(EREMOTE, "EREMOTE", "Object is remote"),
-+#endif
-+#if defined (ENOLINK)
-+  ENTRY(ENOLINK, "ENOLINK", "Link has been severed"),
-+#endif
-+#if defined (EADV)
-+  ENTRY(EADV, "EADV", "Advertise error"),
-+#endif
-+#if defined (ESRMNT)
-+  ENTRY(ESRMNT, "ESRMNT", "Srmount error"),
-+#endif
-+#if defined (ECOMM)
-+  ENTRY(ECOMM, "ECOMM", "Communication error on send"),
-+#endif
-+#if defined (EPROTO)
-+  ENTRY(EPROTO, "EPROTO", "Protocol error"),
-+#endif
-+#if defined (EMULTIHOP)
-+  ENTRY(EMULTIHOP, "EMULTIHOP", "Multihop attempted"),
-+#endif
-+#if defined (EDOTDOT)
-+  ENTRY(EDOTDOT, "EDOTDOT", "RFS specific error"),
-+#endif
-+#if defined (EBADMSG)
-+  ENTRY(EBADMSG, "EBADMSG", "Not a data message"),
-+#endif
-+#if defined (ENAMETOOLONG)
-+  ENTRY(ENAMETOOLONG, "ENAMETOOLONG", "File name too long"),
-+#endif
-+#if defined (EOVERFLOW)
-+  ENTRY(EOVERFLOW, "EOVERFLOW", "Value too large for defined data type"),
-+#endif
-+#if defined (ENOTUNIQ)
-+  ENTRY(ENOTUNIQ, "ENOTUNIQ", "Name not unique on network"),
-+#endif
-+#if defined (EBADFD)
-+  ENTRY(EBADFD, "EBADFD", "File descriptor in bad state"),
-+#endif
-+#if defined (EREMCHG)
-+  ENTRY(EREMCHG, "EREMCHG", "Remote address changed"),
-+#endif
-+#if defined (ELIBACC)
-+  ENTRY(ELIBACC, "ELIBACC", "Can not access a needed shared library"),
-+#endif
-+#if defined (ELIBBAD)
-+  ENTRY(ELIBBAD, "ELIBBAD", "Accessing a corrupted shared library"),
-+#endif
-+#if defined (ELIBSCN)
-+  ENTRY(ELIBSCN, "ELIBSCN", ".lib section in a.out corrupted"),
-+#endif
-+#if defined (ELIBMAX)
-+  ENTRY(ELIBMAX, "ELIBMAX", "Attempting to link in too many shared libraries"),
-+#endif
-+#if defined (ELIBEXEC)
-+  ENTRY(ELIBEXEC, "ELIBEXEC", "Cannot exec a shared library directly"),
-+#endif
-+#if defined (EILSEQ)
-+  ENTRY(EILSEQ, "EILSEQ", "Illegal byte sequence"),
-+#endif
-+#if defined (ENOSYS)
-+  ENTRY(ENOSYS, "ENOSYS", "Operation not applicable"),
-+#endif
-+#if defined (ELOOP)
-+  ENTRY(ELOOP, "ELOOP", "Too many symbolic links encountered"),
-+#endif
-+#if defined (ERESTART)
-+  ENTRY(ERESTART, "ERESTART", "Interrupted system call should be restarted"),
-+#endif
-+#if defined (ESTRPIPE)
-+  ENTRY(ESTRPIPE, "ESTRPIPE", "Streams pipe error"),
-+#endif
-+#if defined (ENOTEMPTY)
-+  ENTRY(ENOTEMPTY, "ENOTEMPTY", "Directory not empty"),
-+#endif
-+#if defined (EUSERS)
-+  ENTRY(EUSERS, "EUSERS", "Too many users"),
-+#endif
-+#if defined (ENOTSOCK)
-+  ENTRY(ENOTSOCK, "ENOTSOCK", "Socket operation on non-socket"),
-+#endif
-+#if defined (EDESTADDRREQ)
-+  ENTRY(EDESTADDRREQ, "EDESTADDRREQ", "Destination address required"),
-+#endif
-+#if defined (EMSGSIZE)
-+  ENTRY(EMSGSIZE, "EMSGSIZE", "Message too long"),
-+#endif
-+#if defined (EPROTOTYPE)
-+  ENTRY(EPROTOTYPE, "EPROTOTYPE", "Protocol wrong type for socket"),
-+#endif
-+#if defined (ENOPROTOOPT)
-+  ENTRY(ENOPROTOOPT, "ENOPROTOOPT", "Protocol not available"),
-+#endif
-+#if defined (EPROTONOSUPPORT)
-+  ENTRY(EPROTONOSUPPORT, "EPROTONOSUPPORT", "Protocol not supported"),
-+#endif
-+#if defined (ESOCKTNOSUPPORT)
-+  ENTRY(ESOCKTNOSUPPORT, "ESOCKTNOSUPPORT", "Socket type not supported"),
-+#endif
-+#if defined (EOPNOTSUPP)
-+  ENTRY(EOPNOTSUPP, "EOPNOTSUPP", "Operation not supported on transport endpoint"),
-+#endif
-+#if defined (EPFNOSUPPORT)
-+  ENTRY(EPFNOSUPPORT, "EPFNOSUPPORT", "Protocol family not supported"),
-+#endif
-+#if defined (EAFNOSUPPORT)
-+  ENTRY(EAFNOSUPPORT, "EAFNOSUPPORT", "Address family not supported by protocol"),
-+#endif
-+#if defined (EADDRINUSE)
-+  ENTRY(EADDRINUSE, "EADDRINUSE", "Address already in use"),
-+#endif
-+#if defined (EADDRNOTAVAIL)
-+  ENTRY(EADDRNOTAVAIL, "EADDRNOTAVAIL","Cannot assign requested address"),
-+#endif
-+#if defined (ENETDOWN)
-+  ENTRY(ENETDOWN, "ENETDOWN", "Network is down"),
-+#endif
-+#if defined (ENETUNREACH)
-+  ENTRY(ENETUNREACH, "ENETUNREACH", "Network is unreachable"),
-+#endif
-+#if defined (ENETRESET)
-+  ENTRY(ENETRESET, "ENETRESET", "Network dropped connection because of reset"),
-+#endif
-+#if defined (ECONNABORTED)
-+  ENTRY(ECONNABORTED, "ECONNABORTED", "Software caused connection abort"),
-+#endif
-+#if defined (ECONNRESET)
-+  ENTRY(ECONNRESET, "ECONNRESET", "Connection reset by peer"),
-+#endif
-+#if defined (ENOBUFS)
-+  ENTRY(ENOBUFS, "ENOBUFS", "No buffer space available"),
-+#endif
-+#if defined (EISCONN)
-+  ENTRY(EISCONN, "EISCONN", "Transport endpoint is already connected"),
-+#endif
-+#if defined (ENOTCONN)
-+  ENTRY(ENOTCONN, "ENOTCONN", "Transport endpoint is not connected"),
-+#endif
-+#if defined (ESHUTDOWN)
-+  ENTRY(ESHUTDOWN, "ESHUTDOWN", "Cannot send after transport endpoint shutdown"),
-+#endif
-+#if defined (ETOOMANYREFS)
-+  ENTRY(ETOOMANYREFS, "ETOOMANYREFS", "Too many references: cannot splice"),
-+#endif
-+#if defined (ETIMEDOUT)
-+  ENTRY(ETIMEDOUT, "ETIMEDOUT", "Connection timed out"),
-+#endif
-+#if defined (ECONNREFUSED)
-+  ENTRY(ECONNREFUSED, "ECONNREFUSED", "Connection refused"),
-+#endif
-+#if defined (EHOSTDOWN)
-+  ENTRY(EHOSTDOWN, "EHOSTDOWN", "Host is down"),
-+#endif
-+#if defined (EHOSTUNREACH)
-+  ENTRY(EHOSTUNREACH, "EHOSTUNREACH", "No route to host"),
-+#endif
-+#if defined (EALREADY)
-+  ENTRY(EALREADY, "EALREADY", "Operation already in progress"),
-+#endif
-+#if defined (EINPROGRESS)
-+  ENTRY(EINPROGRESS, "EINPROGRESS", "Operation now in progress"),
-+#endif
-+#if defined (ESTALE)
-+  ENTRY(ESTALE, "ESTALE", "Stale NFS file handle"),
-+#endif
-+#if defined (EUCLEAN)
-+  ENTRY(EUCLEAN, "EUCLEAN", "Structure needs cleaning"),
-+#endif
-+#if defined (ENOTNAM)
-+  ENTRY(ENOTNAM, "ENOTNAM", "Not a XENIX named type file"),
-+#endif
-+#if defined (ENAVAIL)
-+  ENTRY(ENAVAIL, "ENAVAIL", "No XENIX semaphores available"),
-+#endif
-+#if defined (EISNAM)
-+  ENTRY(EISNAM, "EISNAM", "Is a named type file"),
-+#endif
-+#if defined (EREMOTEIO)
-+  ENTRY(EREMOTEIO, "EREMOTEIO", "Remote I/O error"),
-+#endif
-+  ENTRY(0, NULL, NULL)
-+};
-+
-+#ifdef EVMSERR
-+/* This is not in the table, because the numeric value of EVMSERR (32767)
-+   lies outside the range of sys_errlist[].  */
-+static struct { int value; const char *name, *msg; }
-+  evmserr = { EVMSERR, "EVMSERR", "VMS-specific error" };
-+#endif
-+
-+/* Translation table allocated and initialized at runtime.  Indexed by the
-+   errno value to find the equivalent symbolic value. */
-+
-+static const char **error_names;
-+static int num_error_names = 0;
-+
-+/* Translation table allocated and initialized at runtime, if it does not
-+   already exist in the host environment.  Indexed by the errno value to find
-+   the descriptive string.
-+
-+   We don't export it for use in other modules because even though it has the
-+   same name, it differs from other implementations in that it is dynamically
-+   initialized rather than statically initialized. */
-+
-+#ifndef HAVE_SYS_ERRLIST
-+
-+static int sys_nerr;
-+static const char **sys_errlist;
-+
-+#else
-+
-+extern int sys_nerr;
-+extern char *sys_errlist[];
-+
-+#endif
-+
-+
-+#ifndef HAVE_SYS_ERRLIST
-+/*
-+
-+NAME
-+
-+	init_error_tables -- initialize the name and message tables
-+
-+SYNOPSIS
-+
-+	static void init_error_tables ();
-+
-+DESCRIPTION
-+
-+	Using the error_table, which is initialized at compile time, generate
-+	the error_names and the sys_errlist (if needed) tables, which are
-+	indexed at runtime by a specific errno value.
-+
-+BUGS
-+
-+	The initialization of the tables may fail under low memory conditions,
-+	in which case we don't do anything particularly useful, but we don't
-+	bomb either.  Who knows, it might succeed at a later point if we free
-+	some memory in the meantime.  In any case, the other routines know
-+	how to deal with lack of a table after trying to initialize it.  This
-+	may or may not be considered to be a bug, that we don't specifically
-+	warn about this particular failure mode.
-+
-+*/
-+
-+static void
-+init_error_tables ()
-+{
-+  const struct error_info *eip;
-+  int nbytes;
-+
-+  /* If we haven't already scanned the error_table once to find the maximum
-+     errno value, then go find it now. */
-+
-+  if (num_error_names == 0)
-+    {
-+      for (eip = error_table; eip -> name != NULL; eip++)
-+	{
-+	  if (eip -> value >= num_error_names)
-+	    {
-+	      num_error_names = eip -> value + 1;
-+	    }
-+	}
-+    }
-+
-+  /* Now attempt to allocate the sys_errlist table, zero it out, and then
-+     initialize it from the statically initialized error_table. */
-+
-+  if (sys_errlist == NULL)
-+    {
-+      nbytes = num_error_names * sizeof (char *);
-+      if ((sys_errlist = (const char **) malloc (nbytes)) != NULL)
-+	{
-+	  memset (sys_errlist, 0, nbytes);
-+	  sys_nerr = num_error_names;
-+	  for (eip = error_table; eip -> name != NULL; eip++)
-+	    {
-+	      sys_errlist[eip -> value] = eip -> msg;
-+	    }
-+	}
-+    }
-+}
-+#endif
-+
-+
-+/*
-+
-+NAME
-+
-+	strerror -- map an error number to an error message string
-+
-+SYNOPSIS
-+
-+	char *strerror (int errnoval)
-+
-+DESCRIPTION
-+
-+	Maps an errno number to an error message string, the contents of
-+	which are implementation defined.  On systems which have the external
-+	variables sys_nerr and sys_errlist, these strings will be the same
-+	as the ones used by perror().
-+
-+	If the supplied error number is within the valid range of indices
-+	for the sys_errlist, but no message is available for the particular
-+	error number, then returns the string "Error NUM", where NUM is the
-+	error number.
-+
-+	If the supplied error number is not a valid index into sys_errlist,
-+	returns NULL.
-+
-+	The returned string is only guaranteed to be valid only until the
-+	next call to strerror.
-+
-+*/
-+
-+char *
-+strerror (errnoval)
-+  int errnoval;
-+{
-+  char *msg;
-+  static char buf[32];
-+
-+#ifndef HAVE_SYS_ERRLIST
-+
-+  if (error_names == NULL)
-+    {
-+      init_error_tables ();
-+    }
-+
-+#endif
-+
-+  if ((errnoval < 0) || (errnoval >= sys_nerr))
-+    {
-+#ifdef EVMSERR
-+      if (errnoval == evmserr.value)
-+	msg = evmserr.msg;
-+      else
-+#endif
-+      /* Out of range, just return NULL */
-+      msg = NULL;
-+    }
-+  else if ((sys_errlist == NULL) || (sys_errlist[errnoval] == NULL))
-+    {
-+      /* In range, but no sys_errlist or no entry at this index. */
-+      sprintf (buf, "Error %d", errnoval);
-+      msg = buf;
-+    }
-+  else
-+    {
-+      /* In range, and a valid message.  Just return the message. */
-+      msg = (char *) sys_errlist[errnoval];
-+    }
-+  
-+  return (msg);
-+}
---- metamail-2.7.orig/aclocal.m4
-+++ metamail-2.7/aclocal.m4
-@@ -0,0 +1,3824 @@
-+dnl aclocal.m4 generated automatically by aclocal 1.4-p6
-+
-+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+dnl This program is distributed in the hope that it will be useful,
-+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+dnl PARTICULAR PURPOSE.
-+
-+# Like AC_CONFIG_HEADER, but automatically create stamp file.
-+
-+AC_DEFUN([AM_CONFIG_HEADER],
-+[AC_PREREQ([2.12])
-+AC_CONFIG_HEADER([$1])
-+dnl When config.status generates a header, we must update the stamp-h file.
-+dnl This file resides in the same directory as the config header
-+dnl that is generated.  We must strip everything past the first ":",
-+dnl and everything past the last "/".
-+AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
-+ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
-+<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
-+<<am_indx=1
-+for am_file in <<$1>>; do
-+  case " <<$>>CONFIG_HEADERS " in
-+  *" <<$>>am_file "*<<)>>
-+    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
-+    ;;
-+  esac
-+  am_indx=`expr "<<$>>am_indx" + 1`
-+done<<>>dnl>>)
-+changequote([,]))])
-+
-+# Do all the work for Automake.  This macro actually does too much --
-+# some checks are only needed if your package does certain things.
-+# But this isn't really a big deal.
-+
-+# serial 1
-+
-+dnl Usage:
-+dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-+
-+AC_DEFUN([AM_INIT_AUTOMAKE],
-+[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-+AC_REQUIRE([AC_PROG_INSTALL])
-+PACKAGE=[$1]
-+AC_SUBST(PACKAGE)
-+VERSION=[$2]
-+AC_SUBST(VERSION)
-+dnl test to see if srcdir already configured
-+if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-+  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-+fi
-+ifelse([$3],,
-+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-+AC_REQUIRE([AM_SANITY_CHECK])
-+AC_REQUIRE([AC_ARG_PROGRAM])
-+dnl FIXME This is truly gross.
-+missing_dir=`cd $ac_aux_dir && pwd`
-+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
-+AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
-+AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-+AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-+AC_REQUIRE([AC_PROG_MAKE_SET])])
-+
-+# Copyright 2002  Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+
-+# AM_AUTOMAKE_VERSION(VERSION)
-+# ----------------------------
-+# Automake X.Y traces this macro to ensure aclocal.m4 has been
-+# generated from the m4 files accompanying Automake X.Y.
-+AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-+
-+# AM_SET_CURRENT_AUTOMAKE_VERSION
-+# -------------------------------
-+# Call AM_AUTOMAKE_VERSION so it can be traced.
-+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-+	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-+
-+#
-+# Check to make sure that the build environment is sane.
-+#
-+
-+AC_DEFUN([AM_SANITY_CHECK],
-+[AC_MSG_CHECKING([whether build environment is sane])
-+# Just in case
-+sleep 1
-+echo timestamp > conftestfile
-+# Do `set' in a subshell so we don't clobber the current shell's
-+# arguments.  Must try -L first in case configure is actually a
-+# symlink; some systems play weird games with the mod time of symlinks
-+# (eg FreeBSD returns the mod time of the symlink's containing
-+# directory).
-+if (
-+   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-+   if test "[$]*" = "X"; then
-+      # -L didn't work.
-+      set X `ls -t $srcdir/configure conftestfile`
-+   fi
-+   if test "[$]*" != "X $srcdir/configure conftestfile" \
-+      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-+
-+      # If neither matched, then we have a broken ls.  This can happen
-+      # if, for instance, CONFIG_SHELL is bash and it inherits a
-+      # broken ls alias from the environment.  This has actually
-+      # happened.  Such a system could not be considered "sane".
-+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-+alias in your environment])
-+   fi
-+
-+   test "[$]2" = conftestfile
-+   )
-+then
-+   # Ok.
-+   :
-+else
-+   AC_MSG_ERROR([newly created file is older than distributed files!
-+Check your system clock])
-+fi
-+rm -f conftest*
-+AC_MSG_RESULT(yes)])
-+
-+dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-+dnl The program must properly implement --version.
-+AC_DEFUN([AM_MISSING_PROG],
-+[AC_MSG_CHECKING(for working $2)
-+# Run test in a subshell; some versions of sh will print an error if
-+# an executable is not found, even if stderr is redirected.
-+# Redirect stdin to placate older versions of autoconf.  Sigh.
-+if ($2 --version) < /dev/null > /dev/null 2>&1; then
-+   $1=$2
-+   AC_MSG_RESULT(found)
-+else
-+   $1="$3/missing $2"
-+   AC_MSG_RESULT(missing)
-+fi
-+AC_SUBST($1)])
-+
-+# Add --enable-maintainer-mode option to configure.
-+# From Jim Meyering
-+
-+# serial 1
-+
-+AC_DEFUN([AM_MAINTAINER_MODE],
-+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-+  dnl maintainer-mode is disabled by default
-+  AC_ARG_ENABLE(maintainer-mode,
-+[  --enable-maintainer-mode enable make rules and dependencies not useful
-+                          (and sometimes confusing) to the casual installer],
-+      USE_MAINTAINER_MODE=$enableval,
-+      USE_MAINTAINER_MODE=no)
-+  AC_MSG_RESULT($USE_MAINTAINER_MODE)
-+  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
-+  MAINT=$MAINTAINER_MODE_TRUE
-+  AC_SUBST(MAINT)dnl
-+]
-+)
-+
-+# Define a conditional.
-+
-+AC_DEFUN([AM_CONDITIONAL],
-+[AC_SUBST($1_TRUE)
-+AC_SUBST($1_FALSE)
-+if $2; then
-+  $1_TRUE=
-+  $1_FALSE='#'
-+else
-+  $1_TRUE='#'
-+  $1_FALSE=
-+fi])
-+
-+# libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
-+
-+# serial 46 AC_PROG_LIBTOOL
-+
-+AC_DEFUN([AC_PROG_LIBTOOL],
-+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-+
-+# This can be used to rebuild libtool when needed
-+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+
-+# Always use our own libtool.
-+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+AC_SUBST(LIBTOOL)dnl
-+
-+# Prevent multiple expansion
-+define([AC_PROG_LIBTOOL], [])
-+])
-+
-+AC_DEFUN([AC_LIBTOOL_SETUP],
-+[AC_PREREQ(2.13)dnl
-+AC_REQUIRE([AC_ENABLE_SHARED])dnl
-+AC_REQUIRE([AC_ENABLE_STATIC])dnl
-+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-+AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([AC_PROG_LD])dnl
-+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-+AC_REQUIRE([AC_PROG_NM])dnl
-+AC_REQUIRE([LT_AC_PROG_SED])dnl
-+
-+AC_REQUIRE([AC_PROG_LN_S])dnl
-+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-+AC_REQUIRE([AC_OBJEXT])dnl
-+AC_REQUIRE([AC_EXEEXT])dnl
-+dnl
-+
-+_LT_AC_PROG_ECHO_BACKSLASH
-+# Only perform the check for file, if the check method requires it
-+case $deplibs_check_method in
-+file_magic*)
-+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-+    AC_PATH_MAGIC
-+  fi
-+  ;;
-+esac
-+
-+AC_CHECK_TOOL(RANLIB, ranlib, :)
-+AC_CHECK_TOOL(STRIP, strip, :)
-+
-+ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
-+ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-+enable_win32_dll=yes, enable_win32_dll=no)
-+
-+AC_ARG_ENABLE(libtool-lock,
-+  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-+
-+# Some flags need to be propagated to the compiler or linker for good
-+# libtool support.
-+case $host in
-+*-*-irix6*)
-+  # Find out which ABI we are using.
-+  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-+  if AC_TRY_EVAL(ac_compile); then
-+    case `/usr/bin/file conftest.$ac_objext` in
-+    *32-bit*)
-+      LD="${LD-ld} -32"
-+      ;;
-+    *N32*)
-+      LD="${LD-ld} -n32"
-+      ;;
-+    *64-bit*)
-+      LD="${LD-ld} -64"
-+      ;;
-+    esac
-+  fi
-+  rm -rf conftest*
-+  ;;
-+
-+*-*-sco3.2v5*)
-+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-+  SAVE_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -belf"
-+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-+    [AC_LANG_SAVE
-+     AC_LANG_C
-+     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-+     AC_LANG_RESTORE])
-+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-+    CFLAGS="$SAVE_CFLAGS"
-+  fi
-+  ;;
-+
-+ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-+[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-+  AC_CHECK_TOOL(AS, as, false)
-+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-+
-+  # recent cygwin and mingw systems supply a stub DllMain which the user
-+  # can override, but on older systems we have to supply one
-+  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
-+    [AC_TRY_LINK([],
-+      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-+      DllMain (0, 0, 0);],
-+      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
-+
-+  case $host/$CC in
-+  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-+    # old mingw systems require "-dll" to link a DLL, while more recent ones
-+    # require "-mdll"
-+    SAVE_CFLAGS="$CFLAGS"
-+    CFLAGS="$CFLAGS -mdll"
-+    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
-+      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
-+    CFLAGS="$SAVE_CFLAGS" ;;
-+  *-*-cygwin* | *-*-pw32*)
-+    # cygwin systems need to pass --dll to the linker, and not link
-+    # crt.o which will require a WinMain@16 definition.
-+    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-+  esac
-+  ;;
-+  ])
-+esac
-+
-+_LT_AC_LTCONFIG_HACK
-+
-+])
-+
-+# AC_LIBTOOL_HEADER_ASSERT
-+# ------------------------
-+AC_DEFUN([AC_LIBTOOL_HEADER_ASSERT],
-+[AC_CACHE_CHECK([whether $CC supports assert without backlinking],
-+    [lt_cv_func_assert_works],
-+    [case $host in
-+    *-*-solaris*)
-+      if test "$GCC" = yes && test "$with_gnu_ld" != yes; then
-+        case `$CC --version 2>/dev/null` in
-+        [[12]].*) lt_cv_func_assert_works=no ;;
-+        *)        lt_cv_func_assert_works=yes ;;
-+        esac
-+      fi
-+      ;;
-+    esac])
-+
-+if test "x$lt_cv_func_assert_works" = xyes; then
-+  AC_CHECK_HEADERS(assert.h)
-+fi
-+])# AC_LIBTOOL_HEADER_ASSERT
-+
-+# _LT_AC_CHECK_DLFCN
-+# --------------------
-+AC_DEFUN([_LT_AC_CHECK_DLFCN],
-+[AC_CHECK_HEADERS(dlfcn.h)
-+])# _LT_AC_CHECK_DLFCN
-+
-+# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-+# ---------------------------------
-+AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
-+[AC_REQUIRE([AC_CANONICAL_HOST])
-+AC_REQUIRE([AC_PROG_NM])
-+AC_REQUIRE([AC_OBJEXT])
-+# Check for command to grab the raw symbol name followed by C symbol from nm.
-+AC_MSG_CHECKING([command to parse $NM output])
-+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], [dnl
-+
-+# These are sane defaults that work on at least a few old systems.
-+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-+
-+# Character class describing NM global symbol codes.
-+symcode='[[BCDEGRST]]'
-+
-+# Regexp to match symbols that can be accessed directly from C.
-+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-+
-+# Transform the above into a raw symbol and a C symbol.
-+symxfrm='\1 \2\3 \3'
-+
-+# Transform an extracted symbol line into a proper C declaration
-+lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
-+
-+# Transform an extracted symbol line into symbol name and symbol address
-+lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-+
-+# Define system-specific variables.
-+case $host_os in
-+aix*)
-+  symcode='[[BCDT]]'
-+  ;;
-+cygwin* | mingw* | pw32*)
-+  symcode='[[ABCDGISTW]]'
-+  ;;
-+hpux*) # Its linker distinguishes data from code symbols
-+  lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-+  lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-+  ;;
-+irix* | nonstopux*)
-+  symcode='[[BCDEGRST]]'
-+  ;;
-+osf*)
-+  symcode='[[BCDEGQRST]]'
-+  ;;
-+solaris* | sysv5*)
-+  symcode='[[BDT]]'
-+  ;;
-+sysv4)
-+  symcode='[[DFNSTU]]'
-+  ;;
-+esac
-+
-+# Handle CRLF in mingw tool chain
-+opt_cr=
-+case $host_os in
-+mingw*)
-+  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-+  ;;
-+esac
-+
-+# If we're using GNU nm, then use its standard symbol codes.
-+if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
-+  symcode='[[ABCDGISTW]]'
-+fi
-+
-+# Try without a prefix undercore, then with it.
-+for ac_symprfx in "" "_"; do
-+
-+  # Write the raw and C identifiers.
-+lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
-+
-+  # Check to see that the pipe works correctly.
-+  pipe_works=no
-+  rm -f conftest*
-+  cat > conftest.$ac_ext <<EOF
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+char nm_test_var;
-+void nm_test_func(){}
-+#ifdef __cplusplus
-+}
-+#endif
-+int main(){nm_test_var='a';nm_test_func();return(0);}
-+EOF
-+
-+  if AC_TRY_EVAL(ac_compile); then
-+    # Now try to grab the symbols.
-+    nlist=conftest.nm
-+    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
-+      # Try sorting and uniquifying the output.
-+      if sort "$nlist" | uniq > "$nlist"T; then
-+	mv -f "$nlist"T "$nlist"
-+      else
-+	rm -f "$nlist"T
-+      fi
-+
-+      # Make sure that we snagged all the symbols we need.
-+      if egrep ' nm_test_var$' "$nlist" >/dev/null; then
-+	if egrep ' nm_test_func$' "$nlist" >/dev/null; then
-+	  cat <<EOF > conftest.$ac_ext
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+EOF
-+	  # Now generate the symbol file.
-+	  eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext'
-+
-+	  cat <<EOF >> conftest.$ac_ext
-+#if defined (__STDC__) && __STDC__
-+# define lt_ptr void *
-+#else
-+# define lt_ptr char *
-+# define const
-+#endif
-+
-+/* The mapping between symbol names and symbols. */
-+const struct {
-+  const char *name;
-+  lt_ptr address;
-+}
-+lt_preloaded_symbols[[]] =
-+{
-+EOF
-+	  sed "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext
-+	  cat <<\EOF >> conftest.$ac_ext
-+  {0, (lt_ptr) 0}
-+};
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+EOF
-+	  # Now try linking the two files.
-+	  mv conftest.$ac_objext conftstm.$ac_objext
-+	  save_LIBS="$LIBS"
-+	  save_CFLAGS="$CFLAGS"
-+	  LIBS="conftstm.$ac_objext"
-+	  CFLAGS="$CFLAGS$no_builtin_flag"
-+	  if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
-+	    pipe_works=yes
-+	  fi
-+	  LIBS="$save_LIBS"
-+	  CFLAGS="$save_CFLAGS"
-+	else
-+	  echo "cannot find nm_test_func in $nlist" >&AC_FD_CC
-+	fi
-+      else
-+	echo "cannot find nm_test_var in $nlist" >&AC_FD_CC
-+      fi
-+    else
-+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AC_FD_CC
-+    fi
-+  else
-+    echo "$progname: failed program was:" >&AC_FD_CC
-+    cat conftest.$ac_ext >&5
-+  fi
-+  rm -f conftest* conftst*
-+
-+  # Do not use the global_symbol_pipe unless it works.
-+  if test "$pipe_works" = yes; then
-+    break
-+  else
-+    lt_cv_sys_global_symbol_pipe=
-+  fi
-+done
-+])
-+global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
-+if test -z "$lt_cv_sys_global_symbol_pipe"; then
-+  global_symbol_to_cdecl=
-+  global_symbol_to_c_name_address=
-+else
-+  global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
-+  global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address"
-+fi
-+if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
-+then
-+  AC_MSG_RESULT(failed)
-+else
-+  AC_MSG_RESULT(ok)
-+fi
-+]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-+
-+# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
-+# ---------------------------------
-+AC_DEFUN([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR],
-+[# Find the correct PATH separator.  Usually this is `:', but
-+# DJGPP uses `;' like DOS.
-+if test "X${PATH_SEPARATOR+set}" != Xset; then
-+  UNAME=${UNAME-`uname 2>/dev/null`}
-+  case X$UNAME in
-+    *-DOS) lt_cv_sys_path_separator=';' ;;
-+    *)     lt_cv_sys_path_separator=':' ;;
-+  esac
-+  PATH_SEPARATOR=$lt_cv_sys_path_separator
-+fi
-+])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
-+
-+# _LT_AC_PROG_ECHO_BACKSLASH
-+# --------------------------
-+# Add some code to the start of the generated configure script which
-+# will find an echo command which doesn't interpret backslashes.
-+AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
-+[ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-+			      [AC_DIVERT_PUSH(NOTICE)])
-+_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
-+
-+# Check that we are running under the correct shell.
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+
-+case X$ECHO in
-+X*--fallback-echo)
-+  # Remove one level of quotation (which was required for Make).
-+  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-+  ;;
-+esac
-+
-+echo=${ECHO-echo}
-+if test "X[$]1" = X--no-reexec; then
-+  # Discard the --no-reexec flag, and continue.
-+  shift
-+elif test "X[$]1" = X--fallback-echo; then
-+  # Avoid inline document here, it may be left over
-+  :
-+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-+  # Yippee, $echo works!
-+  :
-+else
-+  # Restart under the correct shell.
-+  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-+fi
-+
-+if test "X[$]1" = X--fallback-echo; then
-+  # used as fallback echo
-+  shift
-+  cat <<EOF
-+$*
-+EOF
-+  exit 0
-+fi
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+
-+if test -z "$ECHO"; then
-+if test "X${echo_test_string+set}" != Xset; then
-+# find a string as large as possible, as long as the shell can cope with it
-+  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-+    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-+    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-+       echo_test_string="`eval $cmd`" &&
-+       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-+    then
-+      break
-+    fi
-+  done
-+fi
-+
-+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-+   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-+   test "X$echo_testing_string" = "X$echo_test_string"; then
-+  :
-+else
-+  # The Solaris, AIX, and Digital Unix default echo programs unquote
-+  # backslashes.  This makes it impossible to quote backslashes using
-+  #   echo "$something" | sed 's/\\/\\\\/g'
-+  #
-+  # So, first we look for a working echo in the user's PATH.
-+
-+  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  for dir in $PATH /usr/ucb; do
-+    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-+       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-+       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-+       test "X$echo_testing_string" = "X$echo_test_string"; then
-+      echo="$dir/echo"
-+      break
-+    fi
-+  done
-+  IFS="$save_ifs"
-+
-+  if test "X$echo" = Xecho; then
-+    # We didn't find a better echo, so look for alternatives.
-+    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-+       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-+       test "X$echo_testing_string" = "X$echo_test_string"; then
-+      # This shell has a builtin print -r that does the trick.
-+      echo='print -r'
-+    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-+	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-+      # If we have ksh, try running configure again with it.
-+      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-+      export ORIGINAL_CONFIG_SHELL
-+      CONFIG_SHELL=/bin/ksh
-+      export CONFIG_SHELL
-+      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
-+    else
-+      # Try using printf.
-+      echo='printf %s\n'
-+      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-+	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-+	 test "X$echo_testing_string" = "X$echo_test_string"; then
-+	# Cool, printf works
-+	:
-+      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-+	   test "X$echo_testing_string" = 'X\t' &&
-+	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-+	   test "X$echo_testing_string" = "X$echo_test_string"; then
-+	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-+	export CONFIG_SHELL
-+	SHELL="$CONFIG_SHELL"
-+	export SHELL
-+	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-+      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-+	   test "X$echo_testing_string" = 'X\t' &&
-+	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-+	   test "X$echo_testing_string" = "X$echo_test_string"; then
-+	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-+      else
-+	# maybe with a smaller string...
-+	prev=:
-+
-+	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
-+	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-+	  then
-+	    break
-+	  fi
-+	  prev="$cmd"
-+	done
-+
-+	if test "$prev" != 'sed 50q "[$]0"'; then
-+	  echo_test_string=`eval $prev`
-+	  export echo_test_string
-+	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
-+	else
-+	  # Oops.  We lost completely, so just stick with echo.
-+	  echo=echo
-+	fi
-+      fi
-+    fi
-+  fi
-+fi
-+fi
-+
-+# Copy echo and quote the copy suitably for passing to libtool from
-+# the Makefile, instead of quoting the original, which is used later.
-+ECHO=$echo
-+if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-+   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-+fi
-+
-+AC_SUBST(ECHO)
-+AC_DIVERT_POP
-+])# _LT_AC_PROG_ECHO_BACKSLASH
-+
-+# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-+#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-+# ------------------------------------------------------------------
-+AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
-+[if test "$cross_compiling" = yes; then :
-+  [$4]
-+else
-+  AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+  lt_status=$lt_dlunknown
-+  cat > conftest.$ac_ext <<EOF
-+[#line __oline__ "configure"
-+#include "confdefs.h"
-+
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#ifdef RTLD_GLOBAL
-+#  define LT_DLGLOBAL		RTLD_GLOBAL
-+#else
-+#  ifdef DL_GLOBAL
-+#    define LT_DLGLOBAL		DL_GLOBAL
-+#  else
-+#    define LT_DLGLOBAL		0
-+#  endif
-+#endif
-+
-+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-+   find out it does not work in some platform. */
-+#ifndef LT_DLLAZY_OR_NOW
-+#  ifdef RTLD_LAZY
-+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-+#  else
-+#    ifdef DL_LAZY
-+#      define LT_DLLAZY_OR_NOW		DL_LAZY
-+#    else
-+#      ifdef RTLD_NOW
-+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-+#      else
-+#        ifdef DL_NOW
-+#          define LT_DLLAZY_OR_NOW	DL_NOW
-+#        else
-+#          define LT_DLLAZY_OR_NOW	0
-+#        endif
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" void exit (int);
-+#endif
-+
-+void fnord() { int i=42;}
-+int main ()
-+{
-+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+  int status = $lt_dlunknown;
-+
-+  if (self)
-+    {
-+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+      /* dlclose (self); */
-+    }
-+
-+    exit (status);
-+}]
-+EOF
-+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-+    (./conftest; exit; ) 2>/dev/null
-+    lt_status=$?
-+    case x$lt_status in
-+      x$lt_dlno_uscore) $1 ;;
-+      x$lt_dlneed_uscore) $2 ;;
-+      x$lt_unknown|x*) $3 ;;
-+    esac
-+  else :
-+    # compilation failed
-+    $3
-+  fi
-+fi
-+rm -fr conftest*
-+])# _LT_AC_TRY_DLOPEN_SELF
-+
-+# AC_LIBTOOL_DLOPEN_SELF
-+# -------------------
-+AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
-+[if test "x$enable_dlopen" != xyes; then
-+  enable_dlopen=unknown
-+  enable_dlopen_self=unknown
-+  enable_dlopen_self_static=unknown
-+else
-+  lt_cv_dlopen=no
-+  lt_cv_dlopen_libs=
-+
-+  case $host_os in
-+  beos*)
-+    lt_cv_dlopen="load_add_on"
-+    lt_cv_dlopen_libs=
-+    lt_cv_dlopen_self=yes
-+    ;;
-+
-+  cygwin* | mingw* | pw32*)
-+    lt_cv_dlopen="LoadLibrary"
-+    lt_cv_dlopen_libs=
-+   ;;
-+
-+  *)
-+    AC_CHECK_FUNC([shl_load],
-+          [lt_cv_dlopen="shl_load"],
-+      [AC_CHECK_LIB([dld], [shl_load],
-+            [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
-+	[AC_CHECK_FUNC([dlopen],
-+	      [lt_cv_dlopen="dlopen"],
-+	  [AC_CHECK_LIB([dl], [dlopen],
-+	        [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-+	    [AC_CHECK_LIB([svld], [dlopen],
-+	          [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-+	      [AC_CHECK_LIB([dld], [dld_link],
-+	            [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
-+	      ])
-+	    ])
-+	  ])
-+	])
-+      ])
-+    ;;
-+  esac
-+
-+  if test "x$lt_cv_dlopen" != xno; then
-+    enable_dlopen=yes
-+  else
-+    enable_dlopen=no
-+  fi
-+
-+  case $lt_cv_dlopen in
-+  dlopen)
-+    save_CPPFLAGS="$CPPFLAGS"
-+    AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+
-+    save_LDFLAGS="$LDFLAGS"
-+    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+
-+    save_LIBS="$LIBS"
-+    LIBS="$lt_cv_dlopen_libs $LIBS"
-+
-+    AC_CACHE_CHECK([whether a program can dlopen itself],
-+	  lt_cv_dlopen_self, [dnl
-+	  _LT_AC_TRY_DLOPEN_SELF(
-+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-+    ])
-+
-+    if test "x$lt_cv_dlopen_self" = xyes; then
-+      LDFLAGS="$LDFLAGS $link_static_flag"
-+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-+    	  lt_cv_dlopen_self_static, [dnl
-+	  _LT_AC_TRY_DLOPEN_SELF(
-+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-+      ])
-+    fi
-+
-+    CPPFLAGS="$save_CPPFLAGS"
-+    LDFLAGS="$save_LDFLAGS"
-+    LIBS="$save_LIBS"
-+    ;;
-+  esac
-+
-+  case $lt_cv_dlopen_self in
-+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-+  *) enable_dlopen_self=unknown ;;
-+  esac
-+
-+  case $lt_cv_dlopen_self_static in
-+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-+  *) enable_dlopen_self_static=unknown ;;
-+  esac
-+fi
-+])# AC_LIBTOOL_DLOPEN_SELF
-+
-+AC_DEFUN([_LT_AC_LTCONFIG_HACK],
-+[AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])dnl
-+# Sed substitution that helps us do robust quoting.  It backslashifies
-+# metacharacters that are still active within double-quoted strings.
-+Xsed='sed -e s/^X//'
-+sed_quote_subst='s/\([[\\"\\`$\\\\]]\)/\\\1/g'
-+
-+# Same as above, but do not quote variable references.
-+double_quote_subst='s/\([[\\"\\`\\\\]]\)/\\\1/g'
-+
-+# Sed substitution to delay expansion of an escaped shell variable in a
-+# double_quote_subst'ed string.
-+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-+
-+# Constants:
-+rm="rm -f"
-+
-+# Global variables:
-+default_ofile=libtool
-+can_build_shared=yes
-+
-+# All known linkers require a `.a' archive for static linking (except M$VC,
-+# which needs '.lib').
-+libext=a
-+ltmain="$ac_aux_dir/ltmain.sh"
-+ofile="$default_ofile"
-+with_gnu_ld="$lt_cv_prog_gnu_ld"
-+need_locks="$enable_libtool_lock"
-+
-+old_CC="$CC"
-+old_CFLAGS="$CFLAGS"
-+
-+# Set sane defaults for various variables
-+test -z "$AR" && AR=ar
-+test -z "$AR_FLAGS" && AR_FLAGS=cru
-+test -z "$AS" && AS=as
-+test -z "$CC" && CC=cc
-+test -z "$DLLTOOL" && DLLTOOL=dlltool
-+test -z "$LD" && LD=ld
-+test -z "$LN_S" && LN_S="ln -s"
-+test -z "$MAGIC_CMD" && MAGIC_CMD=file
-+test -z "$NM" && NM=nm
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+test -z "$RANLIB" && RANLIB=:
-+test -z "$STRIP" && STRIP=:
-+test -z "$ac_objext" && ac_objext=o
-+
-+if test x"$host" != x"$build"; then
-+  ac_tool_prefix=${host_alias}-
-+else
-+  ac_tool_prefix=
-+fi
-+
-+# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
-+case $host_os in
-+linux-gnu*) ;;
-+linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
-+esac
-+
-+case $host_os in
-+aix3*)
-+  # AIX sometimes has problems with the GCC collect2 program.  For some
-+  # reason, if we set the COLLECT_NAMES environment variable, the problems
-+  # vanish in a puff of smoke.
-+  if test "X${COLLECT_NAMES+set}" != Xset; then
-+    COLLECT_NAMES=
-+    export COLLECT_NAMES
-+  fi
-+  ;;
-+esac
-+
-+# Determine commands to create old-style static archives.
-+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-+old_postinstall_cmds='chmod 644 $oldlib'
-+old_postuninstall_cmds=
-+
-+if test -n "$RANLIB"; then
-+  case $host_os in
-+  openbsd*)
-+    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
-+    ;;
-+  *)
-+    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-+    ;;
-+  esac
-+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-+fi
-+
-+# Allow CC to be a program name with arguments.
-+set dummy $CC
-+compiler="[$]2"
-+
-+AC_MSG_CHECKING([for objdir])
-+rm -f .libs 2>/dev/null
-+mkdir .libs 2>/dev/null
-+if test -d .libs; then
-+  objdir=.libs
-+else
-+  # MS-DOS does not allow filenames that begin with a dot.
-+  objdir=_libs
-+fi
-+rmdir .libs 2>/dev/null
-+AC_MSG_RESULT($objdir)
-+
-+
-+AC_ARG_WITH(pic,
-+[  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
-+pic_mode="$withval", pic_mode=default)
-+test -z "$pic_mode" && pic_mode=default
-+
-+# We assume here that the value for lt_cv_prog_cc_pic will not be cached
-+# in isolation, and that seeing it set (from the cache) indicates that
-+# the associated values are set (in the cache) correctly too.
-+AC_MSG_CHECKING([for $compiler option to produce PIC])
-+AC_CACHE_VAL(lt_cv_prog_cc_pic,
-+[ lt_cv_prog_cc_pic=
-+  lt_cv_prog_cc_shlib=
-+  lt_cv_prog_cc_wl=
-+  lt_cv_prog_cc_static=
-+  lt_cv_prog_cc_no_builtin=
-+  lt_cv_prog_cc_can_build_shared=$can_build_shared
-+
-+  if test "$GCC" = yes; then
-+    lt_cv_prog_cc_wl='-Wl,'
-+    lt_cv_prog_cc_static='-static'
-+
-+    case $host_os in
-+    aix*)
-+      # Below there is a dirty hack to force normal static linking with -ldl
-+      # The problem is because libdl dynamically linked with both libc and
-+      # libC (AIX C++ library), which obviously doesn't included in libraries
-+      # list by gcc. This cause undefined symbols with -static flags.
-+      # This hack allows C programs to be linked with "-static -ldl", but
-+      # not sure about C++ programs.
-+      lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC"
-+      ;;
-+    amigaos*)
-+      # FIXME: we need at least 68020 code to build shared libraries, but
-+      # adding the `-m68020' flag to GCC prevents building anything better,
-+      # like `-m68040'.
-+      lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
-+      ;;
-+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+      # PIC is the default for these OSes.
-+      ;;
-+    darwin* | rhapsody*)
-+      # PIC is the default on this platform
-+      # Common symbols not allowed in MH_DYLIB files
-+      lt_cv_prog_cc_pic='-fno-common'
-+      ;;
-+    cygwin* | mingw* | pw32* | os2*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      lt_cv_prog_cc_pic='-DDLL_EXPORT'
-+      ;;
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	 lt_cv_prog_cc_pic=-Kconform_pic
-+      fi
-+      ;;
-+    *)
-+      lt_cv_prog_cc_pic='-fPIC'
-+      ;;
-+    esac
-+  else
-+    # PORTME Check for PIC flags for the system compiler.
-+    case $host_os in
-+    aix3* | aix4* | aix5*)
-+      lt_cv_prog_cc_wl='-Wl,'
-+      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	lt_cv_prog_cc_static='-Bstatic'
-+      else
-+	lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
-+      fi
-+      ;;
-+
-+    hpux9* | hpux10* | hpux11*)
-+      # Is there a better lt_cv_prog_cc_static that works with the bundled CC?
-+      lt_cv_prog_cc_wl='-Wl,'
-+      lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive"
-+      lt_cv_prog_cc_pic='+Z'
-+      ;;
-+
-+    irix5* | irix6* | nonstopux*)
-+      lt_cv_prog_cc_wl='-Wl,'
-+      lt_cv_prog_cc_static='-non_shared'
-+      # PIC (with -KPIC) is the default.
-+      ;;
-+
-+    cygwin* | mingw* | pw32* | os2*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      lt_cv_prog_cc_pic='-DDLL_EXPORT'
-+      ;;
-+
-+    newsos6)
-+      lt_cv_prog_cc_pic='-KPIC'
-+      lt_cv_prog_cc_static='-Bstatic'
-+      ;;
-+
-+    osf3* | osf4* | osf5*)
-+      # All OSF/1 code is PIC.
-+      lt_cv_prog_cc_wl='-Wl,'
-+      lt_cv_prog_cc_static='-non_shared'
-+      ;;
-+
-+    sco3.2v5*)
-+      lt_cv_prog_cc_pic='-Kpic'
-+      lt_cv_prog_cc_static='-dn'
-+      lt_cv_prog_cc_shlib='-belf'
-+      ;;
-+
-+    solaris*)
-+      lt_cv_prog_cc_pic='-KPIC'
-+      lt_cv_prog_cc_static='-Bstatic'
-+      lt_cv_prog_cc_wl='-Wl,'
-+      ;;
-+
-+    sunos4*)
-+      lt_cv_prog_cc_pic='-PIC'
-+      lt_cv_prog_cc_static='-Bstatic'
-+      lt_cv_prog_cc_wl='-Qoption ld '
-+      ;;
-+
-+    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+      lt_cv_prog_cc_pic='-KPIC'
-+      lt_cv_prog_cc_static='-Bstatic'
-+      lt_cv_prog_cc_wl='-Wl,'
-+      ;;
-+
-+    uts4*)
-+      lt_cv_prog_cc_pic='-pic'
-+      lt_cv_prog_cc_static='-Bstatic'
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec ;then
-+	lt_cv_prog_cc_pic='-Kconform_pic'
-+	lt_cv_prog_cc_static='-Bstatic'
-+      fi
-+      ;;
-+
-+    *)
-+      lt_cv_prog_cc_can_build_shared=no
-+      ;;
-+    esac
-+  fi
-+])
-+if test -z "$lt_cv_prog_cc_pic"; then
-+  AC_MSG_RESULT([none])
-+else
-+  AC_MSG_RESULT([$lt_cv_prog_cc_pic])
-+
-+  # Check to make sure the pic_flag actually works.
-+  AC_MSG_CHECKING([if $compiler PIC flag $lt_cv_prog_cc_pic works])
-+  AC_CACHE_VAL(lt_cv_prog_cc_pic_works, [dnl
-+    save_CFLAGS="$CFLAGS"
-+    CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
-+    AC_TRY_COMPILE([], [], [dnl
-+      case $host_os in
-+      hpux9* | hpux10* | hpux11*)
-+	# On HP-UX, both CC and GCC only warn that PIC is supported... then
-+	# they create non-PIC objects.  So, if there were any warnings, we
-+	# assume that PIC is not supported.
-+	if test -s conftest.err; then
-+	  lt_cv_prog_cc_pic_works=no
-+	else
-+	  lt_cv_prog_cc_pic_works=yes
-+	fi
-+	;;
-+      *)
-+	lt_cv_prog_cc_pic_works=yes
-+	;;
-+      esac
-+    ], [dnl
-+      lt_cv_prog_cc_pic_works=no
-+    ])
-+    CFLAGS="$save_CFLAGS"
-+  ])
-+
-+  if test "X$lt_cv_prog_cc_pic_works" = Xno; then
-+    lt_cv_prog_cc_pic=
-+    lt_cv_prog_cc_can_build_shared=no
-+  else
-+    lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic"
-+  fi
-+
-+  AC_MSG_RESULT([$lt_cv_prog_cc_pic_works])
-+fi
-+
-+# Check for any special shared library compilation flags.
-+if test -n "$lt_cv_prog_cc_shlib"; then
-+  AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries])
-+  if echo "$old_CC $old_CFLAGS " | egrep -e "[[ 	]]$lt_cv_prog_cc_shlib[[ 	]]" >/dev/null; then :
-+  else
-+   AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure])
-+    lt_cv_prog_cc_can_build_shared=no
-+  fi
-+fi
-+
-+AC_MSG_CHECKING([if $compiler static flag $lt_cv_prog_cc_static works])
-+AC_CACHE_VAL([lt_cv_prog_cc_static_works], [dnl
-+  lt_cv_prog_cc_static_works=no
-+  save_LDFLAGS="$LDFLAGS"
-+  LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
-+  AC_TRY_LINK([], [], [lt_cv_prog_cc_static_works=yes])
-+  LDFLAGS="$save_LDFLAGS"
-+])
-+
-+# Belt *and* braces to stop my trousers falling down:
-+test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static=
-+AC_MSG_RESULT([$lt_cv_prog_cc_static_works])
-+
-+pic_flag="$lt_cv_prog_cc_pic"
-+special_shlib_compile_flags="$lt_cv_prog_cc_shlib"
-+wl="$lt_cv_prog_cc_wl"
-+link_static_flag="$lt_cv_prog_cc_static"
-+no_builtin_flag="$lt_cv_prog_cc_no_builtin"
-+can_build_shared="$lt_cv_prog_cc_can_build_shared"
-+
-+
-+# Check to see if options -o and -c are simultaneously supported by compiler
-+AC_MSG_CHECKING([if $compiler supports -c -o file.$ac_objext])
-+AC_CACHE_VAL([lt_cv_compiler_c_o], [
-+$rm -r conftest 2>/dev/null
-+mkdir conftest
-+cd conftest
-+echo "int some_variable = 0;" > conftest.$ac_ext
-+mkdir out
-+# According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-+# that will create temporary files in the current directory regardless of
-+# the output directory.  Thus, making CWD read-only will cause this test
-+# to fail, enabling locking or at least warning the user not to do parallel
-+# builds.
-+chmod -w .
-+save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
-+compiler_c_o=no
-+if { (eval echo configure:__oline__: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
-+  # The compiler can only warn and ignore the option if not recognized
-+  # So say no if there are warnings
-+  if test -s out/conftest.err; then
-+    lt_cv_compiler_c_o=no
-+  else
-+    lt_cv_compiler_c_o=yes
-+  fi
-+else
-+  # Append any errors to the config.log.
-+  cat out/conftest.err 1>&AC_FD_CC
-+  lt_cv_compiler_c_o=no
-+fi
-+CFLAGS="$save_CFLAGS"
-+chmod u+w .
-+$rm conftest* out/*
-+rmdir out
-+cd ..
-+rmdir conftest
-+$rm -r conftest 2>/dev/null
-+])
-+compiler_c_o=$lt_cv_compiler_c_o
-+AC_MSG_RESULT([$compiler_c_o])
-+
-+if test x"$compiler_c_o" = x"yes"; then
-+  # Check to see if we can write to a .lo
-+  AC_MSG_CHECKING([if $compiler supports -c -o file.lo])
-+  AC_CACHE_VAL([lt_cv_compiler_o_lo], [
-+  lt_cv_compiler_o_lo=no
-+  save_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -c -o conftest.lo"
-+  save_objext="$ac_objext"
-+  ac_objext=lo
-+  AC_TRY_COMPILE([], [int some_variable = 0;], [dnl
-+    # The compiler can only warn and ignore the option if not recognized
-+    # So say no if there are warnings
-+    if test -s conftest.err; then
-+      lt_cv_compiler_o_lo=no
-+    else
-+      lt_cv_compiler_o_lo=yes
-+    fi
-+  ])
-+  ac_objext="$save_objext"
-+  CFLAGS="$save_CFLAGS"
-+  ])
-+  compiler_o_lo=$lt_cv_compiler_o_lo
-+  AC_MSG_RESULT([$compiler_o_lo])
-+else
-+  compiler_o_lo=no
-+fi
-+
-+# Check to see if we can do hard links to lock some files if needed
-+hard_links="nottested"
-+if test "$compiler_c_o" = no && test "$need_locks" != no; then
-+  # do not overwrite the value of need_locks provided by the user
-+  AC_MSG_CHECKING([if we can lock with hard links])
-+  hard_links=yes
-+  $rm conftest*
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  touch conftest.a
-+  ln conftest.a conftest.b 2>&5 || hard_links=no
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  AC_MSG_RESULT([$hard_links])
-+  if test "$hard_links" = no; then
-+    AC_MSG_WARN([\`$CC' does not support \`-c -o', so \`make -j' may be unsafe])
-+    need_locks=warn
-+  fi
-+else
-+  need_locks=no
-+fi
-+
-+if test "$GCC" = yes; then
-+  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
-+  AC_MSG_CHECKING([if $compiler supports -fno-rtti -fno-exceptions])
-+  echo "int some_variable = 0;" > conftest.$ac_ext
-+  save_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
-+  compiler_rtti_exceptions=no
-+  AC_TRY_COMPILE([], [int some_variable = 0;], [dnl
-+    # The compiler can only warn and ignore the option if not recognized
-+    # So say no if there are warnings
-+    if test -s conftest.err; then
-+      compiler_rtti_exceptions=no
-+    else
-+      compiler_rtti_exceptions=yes
-+    fi
-+  ])
-+  CFLAGS="$save_CFLAGS"
-+  AC_MSG_RESULT([$compiler_rtti_exceptions])
-+
-+  if test "$compiler_rtti_exceptions" = "yes"; then
-+    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
-+  else
-+    no_builtin_flag=' -fno-builtin'
-+  fi
-+fi
-+
-+# See if the linker supports building shared libraries.
-+AC_MSG_CHECKING([whether the linker ($LD) supports shared libraries])
-+
-+allow_undefined_flag=
-+no_undefined_flag=
-+need_lib_prefix=unknown
-+need_version=unknown
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+archive_cmds=
-+archive_expsym_cmds=
-+old_archive_from_new_cmds=
-+old_archive_from_expsyms_cmds=
-+export_dynamic_flag_spec=
-+whole_archive_flag_spec=
-+thread_safe_flag_spec=
-+hardcode_into_libs=no
-+hardcode_libdir_flag_spec=
-+hardcode_libdir_separator=
-+hardcode_direct=no
-+hardcode_minus_L=no
-+hardcode_shlibpath_var=unsupported
-+runpath_var=
-+link_all_deplibs=unknown
-+always_export_symbols=no
-+export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+# include_expsyms should be a list of space-separated symbols to be *always*
-+# included in the symbol list
-+include_expsyms=
-+# exclude_expsyms can be an egrep regular expression of symbols to exclude
-+# it will be wrapped by ` (' and `)$', so one must not match beginning or
-+# end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-+# as well as any symbol that contains `d'.
-+exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
-+# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-+# platforms (ab)use it in PIC code, but their linkers get confused if
-+# the symbol is explicitly referenced.  Since portable code cannot
-+# rely on this symbol name, it's probably fine to never include it in
-+# preloaded symbol tables.
-+extract_expsyms_cmds=
-+
-+case $host_os in
-+cygwin* | mingw* | pw32*)
-+  # FIXME: the MSVC++ port hasn't been tested in a loooong time
-+  # When not using gcc, we currently assume that we are using
-+  # Microsoft Visual C++.
-+  if test "$GCC" != yes; then
-+    with_gnu_ld=no
-+  fi
-+  ;;
-+openbsd*)
-+  with_gnu_ld=no
-+  ;;
-+esac
-+
-+ld_shlibs=yes
-+if test "$with_gnu_ld" = yes; then
-+  # If archive_cmds runs LD, not CC, wlarc should be empty
-+  wlarc='${wl}'
-+
-+  # See if GNU ld supports shared libraries.
-+  case $host_os in
-+  aix3* | aix4* | aix5*)
-+    # On AIX, the GNU linker is very broken
-+    # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available.
-+    ld_shlibs=no
-+    cat <<EOF 1>&2
-+
-+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-+*** to be unable to reliably create shared libraries on AIX.
-+*** Therefore, libtool is disabling shared libraries support.  If you
-+*** really care for shared libraries, you may want to modify your PATH
-+*** so that a non-GNU linker is found, and then restart.
-+
-+EOF
-+    ;;
-+
-+  amigaos*)
-+    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_minus_L=yes
-+
-+    # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-+    # that the semantics of dynamic libraries on AmigaOS, at least up
-+    # to version 4, is to share data among multiple programs linked
-+    # with the same dynamic library.  Since this doesn't match the
-+    # behavior of shared libraries on other platforms, we can use
-+    # them.
-+    ld_shlibs=no
-+    ;;
-+
-+  beos*)
-+    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-+      allow_undefined_flag=unsupported
-+      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-+      # support --undefined.  This deserves some investigation.  FIXME
-+      archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+    else
-+      ld_shlibs=no
-+    fi
-+    ;;
-+
-+  cygwin* | mingw* | pw32*)
-+    # hardcode_libdir_flag_spec is actually meaningless, as there is
-+    # no search path for DLLs.
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    allow_undefined_flag=unsupported
-+    always_export_symbols=yes
-+
-+    extract_expsyms_cmds='test -f $output_objdir/impgen.c || \
-+      sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~
-+      test -f $output_objdir/impgen.exe || (cd $output_objdir && \
-+      if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
-+      else $CC -o impgen impgen.c ; fi)~
-+      $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
-+
-+    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
-+
-+    # cygwin and mingw dlls have different entry points and sets of symbols
-+    # to exclude.
-+    # FIXME: what about values for MSVC?
-+    dll_entry=__cygwin_dll_entry@12
-+    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~
-+    case $host_os in
-+    mingw*)
-+      # mingw values
-+      dll_entry=_DllMainCRTStartup@12
-+      dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~
-+      ;;
-+    esac
-+
-+    # mingw and cygwin differ, and it's simplest to just exclude the union
-+    # of the two symbol sets.
-+    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12
-+
-+    # recent cygwin and mingw systems supply a stub DllMain which the user
-+    # can override, but on older systems we have to supply one (in ltdll.c)
-+    if test "x$lt_cv_need_dllmain" = "xyes"; then
-+      ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
-+      ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~
-+	test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
-+    else
-+      ltdll_obj=
-+      ltdll_cmds=
-+    fi
-+
-+    # Extract the symbol export list from an `--export-all' def file,
-+    # then regenerate the def file from the symbol export list, so that
-+    # the compiled dll only exports the symbol export list.
-+    # Be careful not to strip the DATA tag left be newer dlltools.
-+    export_symbols_cmds="$ltdll_cmds"'
-+      $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
-+      sed -e "1,/EXPORTS/d" -e "s/ @ [[0-9]]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols'
-+
-+    # If the export-symbols file already is a .def file (1st line
-+    # is EXPORTS), use it as is.
-+    # If DATA tags from a recent dlltool are present, honour them!
-+    archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then
-+	cp $export_symbols $output_objdir/$soname-def;
-+      else
-+	echo EXPORTS > $output_objdir/$soname-def;
-+	_lt_hint=1;
-+	cat $export_symbols | while read symbol; do
-+	 set dummy \$symbol;
-+	 case \[$]# in
-+	   2) echo "   \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
-+	   4) echo "   \[$]2 \[$]3 \[$]4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;;
-+	   *) echo "     \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;
-+	 esac;
-+	 _lt_hint=`expr 1 + \$_lt_hint`;
-+	done;
-+      fi~
-+      '"$ltdll_cmds"'
-+      $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
-+      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~
-+      $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
-+      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~
-+      $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
-+    ;;
-+
-+  netbsd*)
-+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+      archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-+      wlarc=
-+    else
-+      archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+    fi
-+    ;;
-+
-+  solaris* | sysv5*)
-+    if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
-+      ld_shlibs=no
-+      cat <<EOF 1>&2
-+
-+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-+*** create shared libraries on Solaris systems.  Therefore, libtool
-+*** is disabling shared libraries support.  We urge you to upgrade GNU
-+*** binutils to release 2.9.1 or newer.  Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
-+
-+EOF
-+    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+    else
-+      ld_shlibs=no
-+    fi
-+    ;;
-+
-+  sunos4*)
-+    archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+    wlarc=
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  *)
-+    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+    else
-+      ld_shlibs=no
-+    fi
-+    ;;
-+  esac
-+
-+  if test "$ld_shlibs" = yes; then
-+    runpath_var=LD_RUN_PATH
-+    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-+    export_dynamic_flag_spec='${wl}--export-dynamic'
-+    case $host_os in
-+    cygwin* | mingw* | pw32*)
-+      # dlltool doesn't understand --whole-archive et. al.
-+      whole_archive_flag_spec=
-+      ;;
-+    *)
-+      # ancient GNU ld didn't support --whole-archive et. al.
-+      if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
-+	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      else
-+	whole_archive_flag_spec=
-+      fi
-+      ;;
-+    esac
-+  fi
-+else
-+  # PORTME fill in a description of your system's linker (not GNU ld)
-+  case $host_os in
-+  aix3*)
-+    allow_undefined_flag=unsupported
-+    always_export_symbols=yes
-+    archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-+    # Note: this linker hardcodes the directories in LIBPATH if there
-+    # are no directories specified by -L.
-+    hardcode_minus_L=yes
-+    if test "$GCC" = yes && test -z "$link_static_flag"; then
-+      # Neither direct hardcoding nor static linking is supported with a
-+      # broken collect2.
-+      hardcode_direct=unsupported
-+    fi
-+    ;;
-+
-+  aix4* | aix5*)
-+    if test "$host_cpu" = ia64; then
-+      # On IA64, the linker does run time linking by default, so we don't
-+      # have to do anything special.
-+      aix_use_runtimelinking=no
-+      exp_sym_flag='-Bexport'
-+      no_entry_flag=""
-+    else
-+      aix_use_runtimelinking=no
-+
-+      # Test if we are trying to use run time linking or normal
-+      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+      # need to do runtime linking.
-+      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
-+	for ld_flag in $LDFLAGS; do
-+	  case $ld_flag in
-+	  *-brtl*)
-+	    aix_use_runtimelinking=yes
-+	    break
-+	  ;;
-+	  esac
-+	done
-+      esac
-+
-+      exp_sym_flag='-bexport'
-+      no_entry_flag='-bnoentry'
-+    fi
-+
-+    # When large executables or shared objects are built, AIX ld can
-+    # have problems creating the table of contents.  If linking a library
-+    # or program results in "error TOC overflow" add -mminimal-toc to
-+    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-+    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+
-+    hardcode_direct=yes
-+    archive_cmds=''
-+    hardcode_libdir_separator=':'
-+    if test "$GCC" = yes; then
-+      case $host_os in aix4.[[012]]|aix4.[[012]].*)
-+	collect2name=`${CC} -print-prog-name=collect2`
-+	if test -f "$collect2name" && \
-+	  strings "$collect2name" | grep resolve_lib_name >/dev/null
-+	then
-+	  # We have reworked collect2
-+	  hardcode_direct=yes
-+	else
-+	  # We have old collect2
-+	  hardcode_direct=unsupported
-+	  # It fails to find uninstalled libraries when the uninstalled
-+	  # path is not listed in the libpath.  Setting hardcode_minus_L
-+	  # to unsupported forces relinking
-+	  hardcode_minus_L=yes
-+	  hardcode_libdir_flag_spec='-L$libdir'
-+	  hardcode_libdir_separator=
-+	fi
-+      esac
-+
-+      shared_flag='-shared'
-+    else
-+      # not using gcc
-+      if test "$host_cpu" = ia64; then
-+	shared_flag='${wl}-G'
-+      else
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag='${wl}-G'
-+	else
-+	  shared_flag='${wl}-bM:SRE'
-+	fi
-+      fi
-+    fi
-+
-+    # It seems that -bexpall can do strange things, so it is better to
-+    # generate a list of symbols to export.
-+    always_export_symbols=yes
-+    if test "$aix_use_runtimelinking" = yes; then
-+      # Warning - without using the other runtime loading flags (-brtl),
-+      # -berok will link without error, but may produce a broken library.
-+      allow_undefined_flag='-berok'
-+      hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
-+      archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+    else
-+      if test "$host_cpu" = ia64; then
-+	hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-+	allow_undefined_flag="-z nodefs"
-+	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+      else
-+	hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
-+	# Warning - without using the other run time loading flags,
-+	# -berok will link without error, but may produce a broken library.
-+	allow_undefined_flag='${wl}-berok'
-+	# This is a bit strange, but is similar to how AIX traditionally builds
-+	# it's shared libraries.
-+	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname'
-+      fi
-+    fi
-+    ;;
-+
-+  amigaos*)
-+    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_minus_L=yes
-+    # see comment about different semantics on the GNU ld section
-+    ld_shlibs=no
-+    ;;
-+
-+  cygwin* | mingw* | pw32*)
-+    # When not using gcc, we currently assume that we are using
-+    # Microsoft Visual C++.
-+    # hardcode_libdir_flag_spec is actually meaningless, as there is
-+    # no search path for DLLs.
-+    hardcode_libdir_flag_spec=' '
-+    allow_undefined_flag=unsupported
-+    # Tell ltmain to make .lib files, not .a files.
-+    libext=lib
-+    # FIXME: Setting linknames here is a bad hack.
-+    archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-+    # The linker will automatically build a .lib file if we build a DLL.
-+    old_archive_from_new_cmds='true'
-+    # FIXME: Should let the user specify the lib program.
-+    old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+    fix_srcfile_path='`cygpath -w "$srcfile"`'
-+    ;;
-+
-+  darwin* | rhapsody*)
-+    case "$host_os" in
-+    rhapsody* | darwin1.[[012]])
-+      allow_undefined_flag='-undefined suppress'
-+      ;;
-+    *) # Darwin 1.3 on
-+      allow_undefined_flag='-flat_namespace -undefined suppress'
-+      ;;
-+    esac
-+    # FIXME: Relying on posixy $() will cause problems for
-+    #        cross-compilation, but unfortunately the echo tests do not
-+    #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
-+    #	     `"' quotes if we put them in here... so don't!
-+    archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
-+    # We need to add '_' to the symbols in $export_symbols first
-+    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    whole_archive_flag_spec='-all_load $convenience'
-+    ;;
-+
-+  freebsd1*)
-+    ld_shlibs=no
-+    ;;
-+
-+  # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-+  # support.  Future versions do this automatically, but an explicit c++rt0.o
-+  # does not break anything, and helps significantly (at the cost of a little
-+  # extra space).
-+  freebsd2.2*)
-+    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-+    hardcode_libdir_flag_spec='-R$libdir'
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+  freebsd2*)
-+    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_direct=yes
-+    hardcode_minus_L=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+  freebsd*)
-+    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+    hardcode_libdir_flag_spec='-R$libdir'
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  hpux9* | hpux10* | hpux11*)
-+    case $host_os in
-+    hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
-+    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;;
-+    esac
-+    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+    hardcode_libdir_separator=:
-+    hardcode_direct=yes
-+    hardcode_minus_L=yes # Not in the search PATH, but as the default
-+			 # location of the library.
-+    export_dynamic_flag_spec='${wl}-E'
-+    ;;
-+
-+  irix5* | irix6* | nonstopux*)
-+    if test "$GCC" = yes; then
-+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    else
-+      archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+      hardcode_libdir_flag_spec='-rpath $libdir'
-+    fi
-+    hardcode_libdir_separator=:
-+    link_all_deplibs=yes
-+    ;;
-+
-+  netbsd*)
-+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-+    else
-+      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-+    fi
-+    hardcode_libdir_flag_spec='-R$libdir'
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  newsos6)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_direct=yes
-+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    hardcode_libdir_separator=:
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  openbsd*)
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+      export_dynamic_flag_spec='${wl}-E'
-+    else
-+      case "$host_os" in
-+      openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+	hardcode_libdir_flag_spec='-R$libdir'
-+        ;;
-+      *)
-+        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+        ;;
-+      esac
-+    fi
-+    ;;
-+
-+  os2*)
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_minus_L=yes
-+    allow_undefined_flag=unsupported
-+    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+    old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-+    ;;
-+
-+  osf3*)
-+    if test "$GCC" = yes; then
-+      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-+      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+    else
-+      allow_undefined_flag=' -expect_unresolved \*'
-+      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+    fi
-+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    hardcode_libdir_separator=:
-+    ;;
-+
-+  osf4* | osf5*)	# as osf3* with the addition of -msym flag
-+    if test "$GCC" = yes; then
-+      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-+      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    else
-+      allow_undefined_flag=' -expect_unresolved \*'
-+      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+      archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-+      $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-+
-+      #Both c and cxx compiler support -rpath directly
-+      hardcode_libdir_flag_spec='-rpath $libdir'
-+    fi
-+    hardcode_libdir_separator=:
-+    ;;
-+
-+  sco3.2v5*)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_shlibpath_var=no
-+    runpath_var=LD_RUN_PATH
-+    hardcode_runpath_var=yes
-+    export_dynamic_flag_spec='${wl}-Bexport'
-+    ;;
-+
-+  solaris*)
-+    # gcc --version < 3.0 without binutils cannot create self contained
-+    # shared libraries reliably, requiring libgcc.a to resolve some of
-+    # the object symbols generated in some cases.  Libraries that use
-+    # assert need libgcc.a to resolve __eprintf, for example.  Linking
-+    # a copy of libgcc.a into every shared library to guarantee resolving
-+    # such symbols causes other problems:  According to Tim Van Holder
-+    # <tim.van.holder@pandora.be>, C++ libraries end up with a separate
-+    # (to the application) exception stack for one thing.
-+    no_undefined_flag=' -z defs'
-+    if test "$GCC" = yes; then
-+      case `$CC --version 2>/dev/null` in
-+      [[12]].*)
-+	cat <<EOF 1>&2
-+
-+*** Warning: Releases of GCC earlier than version 3.0 cannot reliably
-+*** create self contained shared libraries on Solaris systems, without
-+*** introducing a dependency on libgcc.a.  Therefore, libtool is disabling
-+*** -no-undefined support, which will at least allow you to build shared
-+*** libraries.  However, you may find that when you link such libraries
-+*** into an application without using GCC, you have to manually add
-+*** \`gcc --print-libgcc-file-name\` to the link command.  We urge you to
-+*** upgrade to a newer version of GCC.  Another option is to rebuild your
-+*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer.
-+
-+EOF
-+        no_undefined_flag=
-+	;;
-+      esac
-+    fi
-+    # $CC -shared without GNU ld will not create a library from C++
-+    # object files and a static libstdc++, better avoid it by now
-+    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-+    hardcode_libdir_flag_spec='-R$libdir'
-+    hardcode_shlibpath_var=no
-+    case $host_os in
-+    solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-+    *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-+      whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
-+    esac
-+    link_all_deplibs=yes
-+    ;;
-+
-+  sunos4*)
-+    if test "x$host_vendor" = xsequent; then
-+      # Use $CC to link under sequent, because it throws in some extra .o
-+      # files that make .init and .fini sections work.
-+      archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+    else
-+      archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-+    fi
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_direct=yes
-+    hardcode_minus_L=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  sysv4)
-+    case $host_vendor in
-+      sni)
-+        archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+        hardcode_direct=yes # is this really true???
-+        ;;
-+      siemens)
-+        ## LD is ld it makes a PLAMLIB
-+        ## CC just makes a GrossModule.
-+        archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+        reload_cmds='$CC -r -o $output$reload_objs'
-+        hardcode_direct=no
-+        ;;
-+      motorola)
-+        archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+        hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-+        ;;
-+    esac
-+    runpath_var='LD_RUN_PATH'
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  sysv4.3*)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_shlibpath_var=no
-+    export_dynamic_flag_spec='-Bexport'
-+    ;;
-+
-+  sysv5*)
-+    no_undefined_flag=' -z text'
-+    # $CC -shared without GNU ld will not create a library from C++
-+    # object files and a static libstdc++, better avoid it by now
-+    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-+    hardcode_libdir_flag_spec=
-+    hardcode_shlibpath_var=no
-+    runpath_var='LD_RUN_PATH'
-+    ;;
-+
-+  uts4*)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  dgux*)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  sysv4*MP*)
-+    if test -d /usr/nec; then
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_shlibpath_var=no
-+      runpath_var=LD_RUN_PATH
-+      hardcode_runpath_var=yes
-+      ld_shlibs=yes
-+    fi
-+    ;;
-+
-+  sysv4.2uw2*)
-+    archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_direct=yes
-+    hardcode_minus_L=no
-+    hardcode_shlibpath_var=no
-+    hardcode_runpath_var=yes
-+    runpath_var=LD_RUN_PATH
-+    ;;
-+
-+  sysv5uw7* | unixware7*)
-+    no_undefined_flag='${wl}-z ${wl}text'
-+    if test "$GCC" = yes; then
-+      archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+    else
-+      archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+    fi
-+    runpath_var='LD_RUN_PATH'
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  *)
-+    ld_shlibs=no
-+    ;;
-+  esac
-+fi
-+AC_MSG_RESULT([$ld_shlibs])
-+test "$ld_shlibs" = no && can_build_shared=no
-+
-+# Check hardcoding attributes.
-+AC_MSG_CHECKING([how to hardcode library paths into programs])
-+hardcode_action=
-+if test -n "$hardcode_libdir_flag_spec" || \
-+   test -n "$runpath_var"; then
-+
-+  # We can hardcode non-existant directories.
-+  if test "$hardcode_direct" != no &&
-+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-+     # have to relink, otherwise we might link with an installed library
-+     # when we should be linking with a yet-to-be-installed one
-+     ## test "$hardcode_shlibpath_var" != no &&
-+     test "$hardcode_minus_L" != no; then
-+    # Linking always hardcodes the temporary library directory.
-+    hardcode_action=relink
-+  else
-+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+    hardcode_action=immediate
-+  fi
-+else
-+  # We cannot hardcode anything, or else we can only hardcode existing
-+  # directories.
-+  hardcode_action=unsupported
-+fi
-+AC_MSG_RESULT([$hardcode_action])
-+
-+striplib=
-+old_striplib=
-+AC_MSG_CHECKING([whether stripping libraries is possible])
-+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-+  AC_MSG_RESULT([yes])
-+else
-+  AC_MSG_RESULT([no])
-+fi
-+
-+reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+test -z "$deplibs_check_method" && deplibs_check_method=unknown
-+
-+# PORTME Fill in your ld.so characteristics
-+AC_MSG_CHECKING([dynamic linker characteristics])
-+library_names_spec=
-+libname_spec='lib$name'
-+soname_spec=
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+
-+case $host_os in
-+aix3*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}.so$versuffix $libname.a'
-+  shlibpath_var=LIBPATH
-+
-+  # AIX has no versioning support, so we append a major version to the name.
-+  soname_spec='${libname}${release}.so$major'
-+  ;;
-+
-+aix4* | aix5*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  hardcode_into_libs=yes
-+  if test "$host_cpu" = ia64; then
-+    # AIX 5 supports IA64
-+    library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  else
-+    # With GCC up to 2.95.x, collect2 would create an import file
-+    # for dependence libraries.  The import file would start with
-+    # the line `#! .'.  This would cause the generated library to
-+    # depend on `.', always an invalid library.  This was fixed in
-+    # development snapshots of GCC prior to 3.0.
-+    case $host_os in
-+      aix4 | aix4.[[01]] | aix4.[[01]].*)
-+	if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-+	     echo ' yes '
-+	     echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-+	  :
-+	else
-+	  can_build_shared=no
-+	fi
-+	;;
-+    esac
-+    # AIX (on Power*) has no versioning support, so currently we can
-+    # not hardcode correct soname into executable. Probably we can
-+    # add versioning support to collect2, so additional links can
-+    # be useful in future.
-+    if test "$aix_use_runtimelinking" = yes; then
-+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-+      # instead of lib<name>.a to let people know that these are not
-+      # typical AIX shared libraries.
-+      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+    else
-+      # We preserve .a as extension for shared libraries through AIX4.2
-+      # and later when we are not doing run time linking.
-+      library_names_spec='${libname}${release}.a $libname.a'
-+      soname_spec='${libname}${release}.so$major'
-+    fi
-+    shlibpath_var=LIBPATH
-+  fi
-+  hardcode_into_libs=yes
-+  ;;
-+
-+amigaos*)
-+  library_names_spec='$libname.ixlibrary $libname.a'
-+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
-+  ;;
-+
-+beos*)
-+  library_names_spec='${libname}.so'
-+  dynamic_linker="$host_os ld.so"
-+  shlibpath_var=LIBRARY_PATH
-+  ;;
-+
-+bsdi4*)
-+  version_type=linux
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-+  export_dynamic_flag_spec=-rdynamic
-+  # the default ld.so.conf also contains /usr/contrib/lib and
-+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-+  # libtool to hard-code these into programs
-+  ;;
-+
-+cygwin* | mingw* | pw32*)
-+  version_type=windows
-+  need_version=no
-+  need_lib_prefix=no
-+  case $GCC,$host_os in
-+  yes,cygwin*)
-+    library_names_spec='$libname.dll.a'
-+    soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'
-+    postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~
-+      dldir=$destdir/`dirname \$dlpath`~
-+      test -d \$dldir || mkdir -p \$dldir~
-+      $install_prog .libs/$dlname \$dldir/$dlname'
-+    postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+      dlpath=$dir/\$dldll~
-+       $rm \$dlpath'
-+    ;;
-+  yes,mingw*)
-+    library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'
-+    sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"`
-+    ;;
-+  yes,pw32*)
-+    library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
-+    ;;
-+  *)
-+    library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll $libname.lib'
-+    ;;
-+  esac
-+  dynamic_linker='Win32 ld.exe'
-+  # FIXME: first we should search . and the directory the executable is in
-+  shlibpath_var=PATH
-+  ;;
-+
-+darwin* | rhapsody*)
-+  dynamic_linker="$host_os dyld"
-+  version_type=darwin
-+  need_lib_prefix=no
-+  need_version=no
-+  # FIXME: Relying on posixy $() will cause problems for
-+  #        cross-compilation, but unfortunately the echo tests do not
-+  #        yet detect zsh echo's removal of \ escapes.
-+  library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)'
-+  soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)'
-+  shlibpath_overrides_runpath=yes
-+  shlibpath_var=DYLD_LIBRARY_PATH
-+  ;;
-+
-+freebsd1*)
-+  dynamic_linker=no
-+  ;;
-+
-+freebsd*-gnu*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='GNU/FreeBSD ld.so'
-+  ;;
-+
-+freebsd*)
-+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+  version_type=freebsd-$objformat
-+  case $version_type in
-+    freebsd-elf*)
-+      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
-+      need_version=no
-+      need_lib_prefix=no
-+      ;;
-+    freebsd-*)
-+      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
-+      need_version=yes
-+      ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_os in
-+  freebsd2*)
-+    shlibpath_overrides_runpath=yes
-+    ;;
-+  *)
-+    shlibpath_overrides_runpath=no
-+    hardcode_into_libs=yes
-+    ;;
-+  esac
-+  ;;
-+
-+gnu*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  hardcode_into_libs=yes
-+  ;;
-+
-+hpux9* | hpux10* | hpux11*)
-+  # Give a soname corresponding to the major version so that dld.sl refuses to
-+  # link against other versions.
-+  dynamic_linker="$host_os dld.sl"
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  shlibpath_var=SHLIB_PATH
-+  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
-+  soname_spec='${libname}${release}.sl$major'
-+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-+  postinstall_cmds='chmod 555 $lib'
-+  ;;
-+
-+irix5* | irix6* | nonstopux*)
-+  case $host_os in
-+    nonstopux*) version_type=nonstopux ;;
-+    *)          version_type=irix ;;
-+  esac
-+  need_lib_prefix=no
-+  need_version=no
-+  soname_spec='${libname}${release}.so$major'
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
-+  case $host_os in
-+  irix5* | nonstopux*)
-+    libsuff= shlibsuff=
-+    ;;
-+  *)
-+    case $LD in # libtool.m4 will add one of these switches to LD
-+    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
-+    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
-+    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
-+    *) libsuff= shlibsuff= libmagic=never-match;;
-+    esac
-+    ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-+  shlibpath_overrides_runpath=no
-+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+  ;;
-+
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
-+  dynamic_linker=no
-+  ;;
-+
-+# This must be Linux ELF.
-+linux-gnu*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  # This implies no fast_install, which is unacceptable.
-+  # Some rework will be needed to allow for fast_install
-+  # before this can be enabled.
-+  hardcode_into_libs=yes
-+
-+  # We used to test for /lib/ld.so.1 and disable shared libraries on
-+  # powerpc, because MkLinux only supported shared libraries with the
-+  # GNU dynamic linker.  Since this was broken with cross compilers,
-+  # most powerpc-linux boxes support dynamic linking these days and
-+  # people can always --disable-shared, the test was removed, and we
-+  # assume the GNU/Linux dynamic linker is in use.
-+  dynamic_linker='GNU/Linux ld.so'
-+  ;;
-+
-+netbsd*)
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+    dynamic_linker='NetBSD (a.out) ld.so'
-+  else
-+    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-+    soname_spec='${libname}${release}.so$major'
-+    dynamic_linker='NetBSD ld.elf_so'
-+  fi
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  ;;
-+
-+newsos6)
-+  version_type=linux
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  ;;
-+
-+openbsd*)
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    case "$host_os" in
-+    openbsd2.[[89]] | openbsd2.[[89]].*)
-+      shlibpath_overrides_runpath=no
-+      ;;
-+    *)
-+      shlibpath_overrides_runpath=yes
-+      ;;
-+    esac
-+  else
-+    shlibpath_overrides_runpath=yes
-+  fi
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+os2*)
-+  libname_spec='$name'
-+  need_lib_prefix=no
-+  library_names_spec='$libname.dll $libname.a'
-+  dynamic_linker='OS/2 ld.exe'
-+  shlibpath_var=LIBPATH
-+  ;;
-+
-+osf3* | osf4* | osf5*)
-+  version_type=osf
-+  need_version=no
-+  need_lib_prefix=no
-+  soname_spec='${libname}${release}.so$major'
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-+  hardcode_into_libs=yes
-+  ;;
-+
-+sco3.2v5*)
-+  version_type=osf
-+  soname_spec='${libname}${release}.so$major'
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+solaris*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  # ldd complains unless libraries are executable
-+  postinstall_cmds='chmod +x $lib'
-+  ;;
-+
-+sunos4*)
-+  version_type=sunos
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  if test "$with_gnu_ld" = yes; then
-+    need_lib_prefix=no
-+  fi
-+  need_version=yes
-+  ;;
-+
-+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_vendor in
-+    sni)
-+      shlibpath_overrides_runpath=no
-+      need_lib_prefix=no
-+      export_dynamic_flag_spec='${wl}-Blargedynsym'
-+      runpath_var=LD_RUN_PATH
-+      ;;
-+    siemens)
-+      need_lib_prefix=no
-+      ;;
-+    motorola)
-+      need_lib_prefix=no
-+      need_version=no
-+      shlibpath_overrides_runpath=no
-+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-+      ;;
-+  esac
-+  ;;
-+
-+uts4*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+dgux*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+sysv4*MP*)
-+  if test -d /usr/nec ;then
-+    version_type=linux
-+    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
-+    soname_spec='$libname.so.$major'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  fi
-+  ;;
-+
-+*)
-+  dynamic_linker=no
-+  ;;
-+esac
-+AC_MSG_RESULT([$dynamic_linker])
-+test "$dynamic_linker" = no && can_build_shared=no
-+
-+# Report the final consequences.
-+AC_MSG_CHECKING([if libtool supports shared libraries])
-+AC_MSG_RESULT([$can_build_shared])
-+
-+AC_MSG_CHECKING([whether to build shared libraries])
-+test "$can_build_shared" = "no" && enable_shared=no
-+
-+# On AIX, shared libraries and static libraries use the same namespace, and
-+# are all built from PIC.
-+case "$host_os" in
-+aix3*)
-+  test "$enable_shared" = yes && enable_static=no
-+  if test -n "$RANLIB"; then
-+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+    postinstall_cmds='$RANLIB $lib'
-+  fi
-+  ;;
-+
-+aix4*)
-+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+    test "$enable_shared" = yes && enable_static=no
-+  fi
-+  ;;
-+esac
-+AC_MSG_RESULT([$enable_shared])
-+
-+AC_MSG_CHECKING([whether to build static libraries])
-+# Make sure either enable_shared or enable_static is yes.
-+test "$enable_shared" = yes || enable_static=yes
-+AC_MSG_RESULT([$enable_static])
-+
-+if test "$hardcode_action" = relink; then
-+  # Fast installation is not supported
-+  enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+     test "$enable_shared" = no; then
-+  # Fast installation is not necessary
-+  enable_fast_install=needless
-+fi
-+
-+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
-+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-+fi
-+
-+AC_LIBTOOL_DLOPEN_SELF
-+
-+if test "$enable_shared" = yes && test "$GCC" = yes; then
-+  case $archive_cmds in
-+  *'~'*)
-+    # FIXME: we may have to deal with multi-command sequences.
-+    ;;
-+  '$CC '*)
-+    # Test whether the compiler implicitly links with -lc since on some
-+    # systems, -lgcc has to come before -lc. If gcc already passes -lc
-+    # to ld, don't add -lc before -lgcc.
-+    AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-+    AC_CACHE_VAL([lt_cv_archive_cmds_need_lc],
-+    [$rm conftest*
-+    echo 'static int dummy;' > conftest.$ac_ext
-+
-+    if AC_TRY_EVAL(ac_compile); then
-+      soname=conftest
-+      lib=conftest
-+      libobjs=conftest.$ac_objext
-+      deplibs=
-+      wl=$lt_cv_prog_cc_wl
-+      compiler_flags=-v
-+      linker_flags=-v
-+      verstring=
-+      output_objdir=.
-+      libname=conftest
-+      save_allow_undefined_flag=$allow_undefined_flag
-+      allow_undefined_flag=
-+      if AC_TRY_EVAL(archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
-+      then
-+	lt_cv_archive_cmds_need_lc=no
-+      else
-+	lt_cv_archive_cmds_need_lc=yes
-+      fi
-+      allow_undefined_flag=$save_allow_undefined_flag
-+    else
-+      cat conftest.err 1>&5
-+    fi])
-+    AC_MSG_RESULT([$lt_cv_archive_cmds_need_lc])
-+    ;;
-+  esac
-+fi
-+need_lc=${lt_cv_archive_cmds_need_lc-yes}
-+
-+# The second clause should only fire when bootstrapping the
-+# libtool distribution, otherwise you forgot to ship ltmain.sh
-+# with your package, and you will get complaints that there are
-+# no rules to generate ltmain.sh.
-+if test -f "$ltmain"; then
-+  :
-+else
-+  # If there is no Makefile yet, we rely on a make rule to execute
-+  # `config.status --recheck' to rerun these tests and create the
-+  # libtool script then.
-+  test -f Makefile && make "$ltmain"
-+fi
-+
-+if test -f "$ltmain"; then
-+  trap "$rm \"${ofile}T\"; exit 1" 1 2 15
-+  $rm -f "${ofile}T"
-+
-+  echo creating $ofile
-+
-+  # Now quote all the things that may contain metacharacters while being
-+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-+  # variables and quote the copies for generation of the libtool script.
-+  for var in echo old_CC old_CFLAGS SED \
-+    AR AR_FLAGS CC LD LN_S NM SHELL \
-+    reload_flag reload_cmds wl \
-+    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
-+    thread_safe_flag_spec whole_archive_flag_spec libname_spec \
-+    library_names_spec soname_spec \
-+    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
-+    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \
-+    postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \
-+    old_striplib striplib file_magic_cmd export_symbols_cmds \
-+    deplibs_check_method allow_undefined_flag no_undefined_flag \
-+    finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
-+    global_symbol_to_c_name_address \
-+    hardcode_libdir_flag_spec hardcode_libdir_separator  \
-+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-+    compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
-+
-+    case $var in
-+    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
-+    old_postinstall_cmds | old_postuninstall_cmds | \
-+    export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
-+    extract_expsyms_cmds | old_archive_from_expsyms_cmds | \
-+    postinstall_cmds | postuninstall_cmds | \
-+    finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-+      # Double-quote double-evaled strings.
-+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-+      ;;
-+    *)
-+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-+      ;;
-+    esac
-+  done
-+
-+  cat <<__EOF__ > "${ofile}T"
-+#! $SHELL
-+
-+# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-+#
-+# Copyright (C) 1996-2000 Free Software Foundation, Inc.
-+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# A sed that does not truncate output.
-+SED=$lt_SED
-+
-+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-+Xsed="${SED} -e s/^X//"
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+
-+# ### BEGIN LIBTOOL CONFIG
-+
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
-+
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
-+
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
-+
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$need_lc
-+
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
-+
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
-+
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
-+
-+# The default C compiler.
-+CC=$lt_CC
-+
-+# Is the compiler the GNU C compiler?
-+with_gcc=$GCC
-+
-+# The linker used to build libraries.
-+LD=$lt_LD
-+
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
-+
-+# A BSD-compatible nm program.
-+NM=$lt_NM
-+
-+# A symbol stripping program
-+STRIP=$STRIP
-+
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=$MAGIC_CMD
-+
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
-+
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
-+
-+# Used on cygwin: assembler.
-+AS="$AS"
-+
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
-+
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
-+
-+# How to pass a linker flag through the compiler.
-+wl=$lt_wl
-+
-+# Object file suffix (normally "o").
-+objext="$ac_objext"
-+
-+# Old archive suffix (normally "a").
-+libext="$libext"
-+
-+# Executable file suffix (normally "").
-+exeext="$exeext"
-+
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_pic_flag
-+pic_mode=$pic_mode
-+
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_compiler_c_o
-+
-+# Can we write directly to a .lo ?
-+compiler_o_lo=$lt_compiler_o_lo
-+
-+# Must we lock files when doing compilation ?
-+need_locks=$lt_need_locks
-+
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
-+
-+# Do we need a version for libraries?
-+need_version=$need_version
-+
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
-+
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
-+
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
-+
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_link_static_flag
-+
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_no_builtin_flag
-+
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-+
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec
-+
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec
-+
-+# Library versioning type.
-+version_type=$version_type
-+
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
-+
-+# List of archive names.  First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$lt_library_names_spec
-+
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
-+
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_old_archive_cmds
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
-+
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-+
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-+
-+# Commands used to build and install a shared archive.
-+archive_cmds=$lt_archive_cmds
-+archive_expsym_cmds=$lt_archive_expsym_cmds
-+postinstall_cmds=$lt_postinstall_cmds
-+postuninstall_cmds=$lt_postuninstall_cmds
-+
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
-+
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
-+
-+# Command to use when deplibs_check_method == file_magic.
-+file_magic_cmd=$lt_file_magic_cmd
-+
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag
-+
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag
-+
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
-+
-+# Same as above, but a single script fragment to be evaled but not shown.
-+finish_eval=$lt_finish_eval
-+
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe=$lt_global_symbol_pipe
-+
-+# Transform the output of nm in a proper C declaration
-+global_symbol_to_cdecl=$lt_global_symbol_to_cdecl
-+
-+# Transform the output of nm in a C name address pair
-+global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address
-+
-+# This is the shared library runtime path variable.
-+runpath_var=$runpath_var
-+
-+# This is the shared library path variable.
-+shlibpath_var=$shlibpath_var
-+
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$hardcode_action
-+
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=$hardcode_into_libs
-+
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-+
-+# Whether we need a single -rpath flag with a separated argument.
-+hardcode_libdir_separator=$lt_hardcode_libdir_separator
-+
-+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct=$hardcode_direct
-+
-+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L=$hardcode_minus_L
-+
-+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-+# the resulting binary.
-+hardcode_shlibpath_var=$hardcode_shlibpath_var
-+
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at relink time.
-+variables_saved_for_relink="$variables_saved_for_relink"
-+
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$link_all_deplibs
-+
-+# Compile-time system search path for libraries
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+
-+# Run-time system search path for libraries
-+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path="$fix_srcfile_path"
-+
-+# Set to yes if exported symbols are required.
-+always_export_symbols=$always_export_symbols
-+
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_export_symbols_cmds
-+
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms
-+
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms
-+
-+# ### END LIBTOOL CONFIG
-+
-+__EOF__
-+
-+  case $host_os in
-+  aix3*)
-+    cat <<\EOF >> "${ofile}T"
-+
-+# AIX sometimes has problems with the GCC collect2 program.  For some
-+# reason, if we set the COLLECT_NAMES environment variable, the problems
-+# vanish in a puff of smoke.
-+if test "X${COLLECT_NAMES+set}" != Xset; then
-+  COLLECT_NAMES=
-+  export COLLECT_NAMES
-+fi
-+EOF
-+    ;;
-+  esac
-+
-+  case $host_os in
-+  cygwin* | mingw* | pw32* | os2*)
-+    cat <<'EOF' >> "${ofile}T"
-+      # This is a source program that is used to create dlls on Windows
-+      # Don't remove nor modify the starting and closing comments
-+# /* ltdll.c starts here */
-+# #define WIN32_LEAN_AND_MEAN
-+# #include <windows.h>
-+# #undef WIN32_LEAN_AND_MEAN
-+# #include <stdio.h>
-+#
-+# #ifndef __CYGWIN__
-+# #  ifdef __CYGWIN32__
-+# #    define __CYGWIN__ __CYGWIN32__
-+# #  endif
-+# #endif
-+#
-+# #ifdef __cplusplus
-+# extern "C" {
-+# #endif
-+# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
-+# #ifdef __cplusplus
-+# }
-+# #endif
-+#
-+# #ifdef __CYGWIN__
-+# #include <cygwin/cygwin_dll.h>
-+# DECLARE_CYGWIN_DLL( DllMain );
-+# #endif
-+# HINSTANCE __hDllInstance_base;
-+#
-+# BOOL APIENTRY
-+# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-+# {
-+#   __hDllInstance_base = hInst;
-+#   return TRUE;
-+# }
-+# /* ltdll.c ends here */
-+	# This is a source program that is used to create import libraries
-+	# on Windows for dlls which lack them. Don't remove nor modify the
-+	# starting and closing comments
-+# /* impgen.c starts here */
-+# /*   Copyright (C) 1999-2000 Free Software Foundation, Inc.
-+#
-+#  This file is part of GNU libtool.
-+#
-+#  This program is free software; you can redistribute it and/or modify
-+#  it under the terms of the GNU General Public License as published by
-+#  the Free Software Foundation; either version 2 of the License, or
-+#  (at your option) any later version.
-+#
-+#  This program is distributed in the hope that it will be useful,
-+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+#  GNU General Public License for more details.
-+#
-+#  You should have received a copy of the GNU General Public License
-+#  along with this program; if not, write to the Free Software
-+#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#  */
-+#
-+# #include <stdio.h>		/* for printf() */
-+# #include <unistd.h>		/* for open(), lseek(), read() */
-+# #include <fcntl.h>		/* for O_RDONLY, O_BINARY */
-+# #include <string.h>		/* for strdup() */
-+#
-+# /* O_BINARY isn't required (or even defined sometimes) under Unix */
-+# #ifndef O_BINARY
-+# #define O_BINARY 0
-+# #endif
-+#
-+# static unsigned int
-+# pe_get16 (fd, offset)
-+#      int fd;
-+#      int offset;
-+# {
-+#   unsigned char b[2];
-+#   lseek (fd, offset, SEEK_SET);
-+#   read (fd, b, 2);
-+#   return b[0] + (b[1]<<8);
-+# }
-+#
-+# static unsigned int
-+# pe_get32 (fd, offset)
-+#     int fd;
-+#     int offset;
-+# {
-+#   unsigned char b[4];
-+#   lseek (fd, offset, SEEK_SET);
-+#   read (fd, b, 4);
-+#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
-+# }
-+#
-+# static unsigned int
-+# pe_as32 (ptr)
-+#      void *ptr;
-+# {
-+#   unsigned char *b = ptr;
-+#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
-+# }
-+#
-+# int
-+# main (argc, argv)
-+#     int argc;
-+#     char *argv[];
-+# {
-+#     int dll;
-+#     unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
-+#     unsigned long export_rva, export_size, nsections, secptr, expptr;
-+#     unsigned long name_rvas, nexp;
-+#     unsigned char *expdata, *erva;
-+#     char *filename, *dll_name;
-+#
-+#     filename = argv[1];
-+#
-+#     dll = open(filename, O_RDONLY|O_BINARY);
-+#     if (dll < 1)
-+# 	return 1;
-+#
-+#     dll_name = filename;
-+#
-+#     for (i=0; filename[i]; i++)
-+# 	if (filename[i] == '/' || filename[i] == '\\'  || filename[i] == ':')
-+# 	    dll_name = filename + i +1;
-+#
-+#     pe_header_offset = pe_get32 (dll, 0x3c);
-+#     opthdr_ofs = pe_header_offset + 4 + 20;
-+#     num_entries = pe_get32 (dll, opthdr_ofs + 92);
-+#
-+#     if (num_entries < 1) /* no exports */
-+# 	return 1;
-+#
-+#     export_rva = pe_get32 (dll, opthdr_ofs + 96);
-+#     export_size = pe_get32 (dll, opthdr_ofs + 100);
-+#     nsections = pe_get16 (dll, pe_header_offset + 4 +2);
-+#     secptr = (pe_header_offset + 4 + 20 +
-+# 	      pe_get16 (dll, pe_header_offset + 4 + 16));
-+#
-+#     expptr = 0;
-+#     for (i = 0; i < nsections; i++)
-+#     {
-+# 	char sname[8];
-+# 	unsigned long secptr1 = secptr + 40 * i;
-+# 	unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
-+# 	unsigned long vsize = pe_get32 (dll, secptr1 + 16);
-+# 	unsigned long fptr = pe_get32 (dll, secptr1 + 20);
-+# 	lseek(dll, secptr1, SEEK_SET);
-+# 	read(dll, sname, 8);
-+# 	if (vaddr <= export_rva && vaddr+vsize > export_rva)
-+# 	{
-+# 	    expptr = fptr + (export_rva - vaddr);
-+# 	    if (export_rva + export_size > vaddr + vsize)
-+# 		export_size = vsize - (export_rva - vaddr);
-+# 	    break;
-+# 	}
-+#     }
-+#
-+#     expdata = (unsigned char*)malloc(export_size);
-+#     lseek (dll, expptr, SEEK_SET);
-+#     read (dll, expdata, export_size);
-+#     erva = expdata - export_rva;
-+#
-+#     nexp = pe_as32 (expdata+24);
-+#     name_rvas = pe_as32 (expdata+32);
-+#
-+#     printf ("EXPORTS\n");
-+#     for (i = 0; i<nexp; i++)
-+#     {
-+# 	unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
-+# 	printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
-+#     }
-+#
-+#     return 0;
-+# }
-+# /* impgen.c ends here */
-+
-+EOF
-+    ;;
-+  esac
-+
-+  # We use sed instead of cat because bash on DJGPP gets confused if
-+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-+  # text mode, it properly converts lines to CR/LF.  This bash problem
-+  # is reportedly fixed, but why not run on old versions too?
-+  sed '$q' "$ltmain" >> "${ofile}T" || (rm -f "${ofile}T"; exit 1)
-+
-+  mv -f "${ofile}T" "$ofile" || \
-+    (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T")
-+  chmod +x "$ofile"
-+fi
-+
-+])# _LT_AC_LTCONFIG_HACK
-+
-+# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
-+AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
-+
-+# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
-+AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
-+
-+# AC_ENABLE_SHARED - implement the --enable-shared flag
-+# Usage: AC_ENABLE_SHARED[(DEFAULT)]
-+#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-+#   `yes'.
-+AC_DEFUN([AC_ENABLE_SHARED],
-+[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-+AC_ARG_ENABLE(shared,
-+changequote(<<, >>)dnl
-+<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
-+changequote([, ])dnl
-+[p=${PACKAGE-default}
-+case $enableval in
-+yes) enable_shared=yes ;;
-+no) enable_shared=no ;;
-+*)
-+  enable_shared=no
-+  # Look at the argument we got.  We use all the common list separators.
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-+  for pkg in $enableval; do
-+    if test "X$pkg" = "X$p"; then
-+      enable_shared=yes
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  ;;
-+esac],
-+enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
-+])
-+
-+# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
-+AC_DEFUN([AC_DISABLE_SHARED],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_ENABLE_SHARED(no)])
-+
-+# AC_ENABLE_STATIC - implement the --enable-static flag
-+# Usage: AC_ENABLE_STATIC[(DEFAULT)]
-+#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-+#   `yes'.
-+AC_DEFUN([AC_ENABLE_STATIC],
-+[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-+AC_ARG_ENABLE(static,
-+changequote(<<, >>)dnl
-+<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
-+changequote([, ])dnl
-+[p=${PACKAGE-default}
-+case $enableval in
-+yes) enable_static=yes ;;
-+no) enable_static=no ;;
-+*)
-+  enable_static=no
-+  # Look at the argument we got.  We use all the common list separators.
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-+  for pkg in $enableval; do
-+    if test "X$pkg" = "X$p"; then
-+      enable_static=yes
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  ;;
-+esac],
-+enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
-+])
-+
-+# AC_DISABLE_STATIC - set the default static flag to --disable-static
-+AC_DEFUN([AC_DISABLE_STATIC],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_ENABLE_STATIC(no)])
-+
-+
-+# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
-+# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
-+#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-+#   `yes'.
-+AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-+[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-+AC_ARG_ENABLE(fast-install,
-+changequote(<<, >>)dnl
-+<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
-+changequote([, ])dnl
-+[p=${PACKAGE-default}
-+case $enableval in
-+yes) enable_fast_install=yes ;;
-+no) enable_fast_install=no ;;
-+*)
-+  enable_fast_install=no
-+  # Look at the argument we got.  We use all the common list separators.
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-+  for pkg in $enableval; do
-+    if test "X$pkg" = "X$p"; then
-+      enable_fast_install=yes
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  ;;
-+esac],
-+enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
-+])
-+
-+# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install
-+AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_ENABLE_FAST_INSTALL(no)])
-+
-+# AC_LIBTOOL_PICMODE - implement the --with-pic flag
-+# Usage: AC_LIBTOOL_PICMODE[(MODE)]
-+#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
-+#   `both'.
-+AC_DEFUN([AC_LIBTOOL_PICMODE],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+pic_mode=ifelse($#,1,$1,default)])
-+
-+
-+# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
-+AC_DEFUN([AC_PATH_TOOL_PREFIX],
-+[AC_MSG_CHECKING([for $1])
-+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-+[case $MAGIC_CMD in
-+  /*)
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-+  ;;
-+  ?:/*)
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-+  ;;
-+  *)
-+  ac_save_MAGIC_CMD="$MAGIC_CMD"
-+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-+dnl $ac_dummy forces splitting on constant user-supplied paths.
-+dnl POSIX.2 word splitting is done only on the output of word expansions,
-+dnl not every word.  This closes a longstanding sh security hole.
-+  ac_dummy="ifelse([$2], , $PATH, [$2])"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$1; then
-+      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-+      if test -n "$file_magic_test_file"; then
-+	case $deplibs_check_method in
-+	"file_magic "*)
-+	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-+	    egrep "$file_magic_regex" > /dev/null; then
-+	    :
-+	  else
-+	    cat <<EOF 1>&2
-+
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such.  This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem.  Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool@gnu.org
-+
-+EOF
-+	  fi ;;
-+	esac
-+      fi
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  MAGIC_CMD="$ac_save_MAGIC_CMD"
-+  ;;
-+esac])
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
-+  AC_MSG_RESULT($MAGIC_CMD)
-+else
-+  AC_MSG_RESULT(no)
-+fi
-+])
-+
-+
-+# AC_PATH_MAGIC - find a file program which can recognise a shared library
-+AC_DEFUN([AC_PATH_MAGIC],
-+[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
-+AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
-+if test -z "$lt_cv_path_MAGIC_CMD"; then
-+  if test -n "$ac_tool_prefix"; then
-+    AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
-+  else
-+    MAGIC_CMD=:
-+  fi
-+fi
-+])
-+
-+
-+# AC_PROG_LD - find the path to the GNU or non-GNU linker
-+AC_DEFUN([AC_PROG_LD],
-+[AC_ARG_WITH(gnu-ld,
-+[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-+AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl
-+ac_prog=ld
-+if test "$GCC" = yes; then
-+  # Check if gcc -print-prog-name=ld gives a path.
-+  AC_MSG_CHECKING([for ld used by GCC])
-+  case $host in
-+  *-*-mingw*)
-+    # gcc leaves a trailing carriage return which upsets mingw
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-+  *)
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-+  esac
-+  case $ac_prog in
-+    # Accept absolute paths.
-+    [[\\/]]* | [[A-Za-z]]:[[\\/]]*)
-+      re_direlt='/[[^/]][[^/]]*/\.\./'
-+      # Canonicalize the path of ld
-+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-+	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-+      done
-+      test -z "$LD" && LD="$ac_prog"
-+      ;;
-+  "")
-+    # If it fails, then pretend we aren't using GCC.
-+    ac_prog=ld
-+    ;;
-+  *)
-+    # If it is relative, then search for the first ld in PATH.
-+    with_gnu_ld=unknown
-+    ;;
-+  esac
-+elif test "$with_gnu_ld" = yes; then
-+  AC_MSG_CHECKING([for GNU ld])
-+else
-+  AC_MSG_CHECKING([for non-GNU ld])
-+fi
-+AC_CACHE_VAL(lt_cv_path_LD,
-+[if test -z "$LD"; then
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  for ac_dir in $PATH; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-+      lt_cv_path_LD="$ac_dir/$ac_prog"
-+      # Check to see if the program is GNU ld.  I'd rather use --version,
-+      # but apparently some GNU ld's only accept -v.
-+      # Break only if it was the GNU/non-GNU ld that we prefer.
-+      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-+	test "$with_gnu_ld" != no && break
-+      else
-+	test "$with_gnu_ld" != yes && break
-+      fi
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+else
-+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-+fi])
-+LD="$lt_cv_path_LD"
-+if test -n "$LD"; then
-+  AC_MSG_RESULT($LD)
-+else
-+  AC_MSG_RESULT(no)
-+fi
-+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-+AC_PROG_LD_GNU
-+])
-+
-+# AC_PROG_LD_GNU -
-+AC_DEFUN([AC_PROG_LD_GNU],
-+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-+  lt_cv_prog_gnu_ld=yes
-+else
-+  lt_cv_prog_gnu_ld=no
-+fi])
-+with_gnu_ld=$lt_cv_prog_gnu_ld
-+])
-+
-+# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
-+#   -- PORTME Some linkers may need a different reload flag.
-+AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-+[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
-+[lt_cv_ld_reload_flag='-r'])
-+reload_flag=$lt_cv_ld_reload_flag
-+test -n "$reload_flag" && reload_flag=" $reload_flag"
-+])
-+
-+# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
-+#  -- PORTME fill in with the dynamic library characteristics
-+AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-+[AC_CACHE_CHECK([how to recognise dependent libraries],
-+lt_cv_deplibs_check_method,
-+[lt_cv_file_magic_cmd='$MAGIC_CMD'
-+lt_cv_file_magic_test_file=
-+lt_cv_deplibs_check_method='unknown'
-+# Need to set the preceding variable on all platforms that support
-+# interlibrary dependencies.
-+# 'none' -- dependencies not supported.
-+# `unknown' -- same as none, but documents that we really don't know.
-+# 'pass_all' -- all dependencies passed with no checks.
-+# 'test_compile' -- check by making test program.
-+# 'file_magic [[regex]]' -- check by looking for files in library path
-+# which responds to the $file_magic_cmd with a given egrep regex.
-+# If you have `file' or equivalent on your system and you're not sure
-+# whether `pass_all' will *always* work, you probably want this one.
-+
-+case $host_os in
-+aix4* | aix5*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+beos*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+bsdi4*)
-+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-+  lt_cv_file_magic_cmd='/usr/bin/file -L'
-+  lt_cv_file_magic_test_file=/shlib/libc.so
-+  ;;
-+
-+cygwin* | mingw* | pw32*)
-+  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-+  lt_cv_file_magic_cmd='$OBJDUMP -f'
-+  ;;
-+
-+darwin* | rhapsody*)
-+  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-+  lt_cv_file_magic_cmd='/usr/bin/file -L'
-+  case "$host_os" in
-+  rhapsody* | darwin1.[[012]])
-+    lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
-+    ;;
-+  *) # Darwin 1.3 on
-+    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-+    ;;
-+  esac
-+  ;;
-+
-+freebsd*)
-+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+    case $host_cpu in
-+    i*86 )
-+      # Not sure whether the presence of OpenBSD here was a mistake.
-+      # Let's accept both of them until this is cleared up.
-+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
-+      lt_cv_file_magic_cmd=/usr/bin/file
-+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-+      ;;
-+    esac
-+  else
-+    lt_cv_deplibs_check_method=pass_all
-+  fi
-+  ;;
-+
-+gnu*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+hpux10.20*|hpux11*)
-+  lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  lt_cv_file_magic_test_file=/usr/lib/libc.sl
-+  ;;
-+
-+irix5* | irix6* | nonstopux*)
-+  case $host_os in
-+  irix5* | nonstopux*)
-+    # this will be overridden with pass_all, but let us keep it just in case
-+    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-+    ;;
-+  *)
-+    case $LD in
-+    *-32|*"-32 ") libmagic=32-bit;;
-+    *-n32|*"-n32 ") libmagic=N32;;
-+    *-64|*"-64 ") libmagic=64-bit;;
-+    *) libmagic=never-match;;
-+    esac
-+    # this will be overridden with pass_all, but let us keep it just in case
-+    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
-+    ;;
-+  esac
-+  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+# This must be Linux ELF.
-+linux-gnu*)
-+  case $host_cpu in
-+  alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64*)
-+    lt_cv_deplibs_check_method=pass_all ;;
-+  *)
-+    # glibc up to 2.1.1 does not perform some relocations on ARM
-+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
-+  esac
-+  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-+  ;;
-+
-+netbsd*)
-+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+    lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$'
-+  else
-+    lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so$'
-+  fi
-+  ;;
-+
-+newos6*)
-+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-+  ;;
-+
-+openbsd*)
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
-+  else
-+    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
-+  fi
-+  ;;
-+
-+osf3* | osf4* | osf5*)
-+  # this will be overridden with pass_all, but let us keep it just in case
-+  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-+  lt_cv_file_magic_test_file=/shlib/libc.so
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+sco3.2v5*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+solaris*)
-+  lt_cv_deplibs_check_method=pass_all
-+  lt_cv_file_magic_test_file=/lib/libc.so
-+  ;;
-+
-+sysv5uw[[78]]* | sysv4*uw2*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+  case $host_vendor in
-+  motorola)
-+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-+    ;;
-+  ncr)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
-+  sequent)
-+    lt_cv_file_magic_cmd='/bin/file'
-+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-+    ;;
-+  sni)
-+    lt_cv_file_magic_cmd='/bin/file'
-+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-+    lt_cv_file_magic_test_file=/lib/libc.so
-+    ;;
-+  siemens)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
-+  esac
-+  ;;
-+esac
-+])
-+file_magic_cmd=$lt_cv_file_magic_cmd
-+deplibs_check_method=$lt_cv_deplibs_check_method
-+])
-+
-+
-+# AC_PROG_NM - find the path to a BSD-compatible name lister
-+AC_DEFUN([AC_PROG_NM],
-+[AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl
-+AC_MSG_CHECKING([for BSD-compatible nm])
-+AC_CACHE_VAL(lt_cv_path_NM,
-+[if test -n "$NM"; then
-+  # Let the user override the test.
-+  lt_cv_path_NM="$NM"
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-+    test -z "$ac_dir" && ac_dir=.
-+    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-+    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
-+      # Check to see if the nm accepts a BSD-compat flag.
-+      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-+      #   nm: unknown option "B" ignored
-+      # Tru64's nm complains that /dev/null is an invalid object file
-+      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-+	lt_cv_path_NM="$tmp_nm -B"
-+	break
-+      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-+	lt_cv_path_NM="$tmp_nm -p"
-+	break
-+      else
-+	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-+	continue # so that we can try to find one that supports BSD flags
-+      fi
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-+fi])
-+NM="$lt_cv_path_NM"
-+AC_MSG_RESULT([$NM])
-+])
-+
-+# AC_CHECK_LIBM - check for math library
-+AC_DEFUN([AC_CHECK_LIBM],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+LIBM=
-+case $host in
-+*-*-beos* | *-*-cygwin* | *-*-pw32*)
-+  # These system don't have libm
-+  ;;
-+*-ncr-sysv4.3*)
-+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-+  AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
-+  ;;
-+*)
-+  AC_CHECK_LIB(m, main, LIBM="-lm")
-+  ;;
-+esac
-+])
-+
-+# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
-+# the libltdl convenience library and LTDLINCL to the include flags for
-+# the libltdl header and adds --enable-ltdl-convenience to the
-+# configure arguments.  Note that LIBLTDL and LTDLINCL are not
-+# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
-+# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
-+# with '${top_builddir}/' and LTDLINCL will be prefixed with
-+# '${top_srcdir}/' (note the single quotes!).  If your package is not
-+# flat and you're not using automake, define top_builddir and
-+# top_srcdir appropriately in the Makefiles.
-+AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+  case $enable_ltdl_convenience in
-+  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-+  "") enable_ltdl_convenience=yes
-+      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-+  esac
-+  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-+  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-+  # For backwards non-gettext consistent compatibility...
-+  INCLTDL="$LTDLINCL"
-+])
-+
-+# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
-+# the libltdl installable library and LTDLINCL to the include flags for
-+# the libltdl header and adds --enable-ltdl-install to the configure
-+# arguments.  Note that LIBLTDL and LTDLINCL are not AC_SUBSTed, nor is
-+# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
-+# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
-+# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed
-+# with '${top_srcdir}/' (note the single quotes!).  If your package is
-+# not flat and you're not using automake, define top_builddir and
-+# top_srcdir appropriately in the Makefiles.
-+# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-+AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+  AC_CHECK_LIB(ltdl, main,
-+  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-+  [if test x"$enable_ltdl_install" = xno; then
-+     AC_MSG_WARN([libltdl not installed, but installation disabled])
-+   else
-+     enable_ltdl_install=yes
-+   fi
-+  ])
-+  if test x"$enable_ltdl_install" = x"yes"; then
-+    ac_configure_args="$ac_configure_args --enable-ltdl-install"
-+    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-+    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-+  else
-+    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-+    LIBLTDL="-lltdl"
-+    LTDLINCL=
-+  fi
-+  # For backwards non-gettext consistent compatibility...
-+  INCLTDL="$LTDLINCL"
-+])
-+
-+# old names
-+AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-+AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-+AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-+AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-+AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-+AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-+AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
-+
-+# This is just to silence aclocal about the macro not being used
-+ifelse([AC_DISABLE_FAST_INSTALL])
-+
-+# NOTE: This macro has been submitted for inclusion into   #
-+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-+#  a released version of Autoconf we should remove this    #
-+#  macro and use it instead.                               #
-+# LT_AC_PROG_SED
-+# --------------
-+# Check for a fully-functional sed program, that truncates
-+# as few characters as possible.  Prefer GNU sed if found.
-+AC_DEFUN([LT_AC_PROG_SED],
-+[AC_MSG_CHECKING([for a sed that does not truncate output])
-+AC_CACHE_VAL(lt_cv_path_SED,
-+[# Loop through the user's path and test for sed and gsed.
-+# Then use that list of sed's as ones to test for truncation.
-+as_executable_p="test -f"
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_prog in sed gsed; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+      if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-+        _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"
-+      fi
-+    done
-+  done
-+done
-+
-+  # Create a temporary directory, and hook for its removal unless debugging.
-+$debug ||
-+{
-+  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-+  trap '{ (exit 1); exit 1; }' 1 2 13 15
-+}
-+
-+# Create a (secure) tmp directory for tmp files.
-+: ${TMPDIR=/tmp}
-+{
-+  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` &&
-+  test -n "$tmp" && test -d "$tmp"
-+}  ||
-+{
-+  tmp=$TMPDIR/sed$$-$RANDOM
-+  (umask 077 && mkdir $tmp)
-+} ||
-+{
-+   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
-+   { (exit 1); exit 1; }
-+}
-+  _max=0
-+  _count=0
-+  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
-+  # along with /bin/sed that truncates output.
-+  for _sed in $_sed_list /usr/xpg4/bin/sed; do
-+    test ! -f ${_sed} && break
-+    cat /dev/null > "$tmp/sed.in"
-+    _count=0
-+    echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in"
-+    # Check for GNU sed and select it if it is found.
-+    if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
-+      lt_cv_path_SED=${_sed}
-+      break
-+    fi
-+    while true; do
-+      cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
-+      mv "$tmp/sed.tmp" "$tmp/sed.in"
-+      cp "$tmp/sed.in" "$tmp/sed.nl"
-+      echo >>"$tmp/sed.nl"
-+      ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
-+      cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
-+      # 40000 chars as input seems more than enough
-+      test $_count -gt 10 && break
-+      _count=`expr $_count + 1`
-+      if test $_count -gt $_max; then
-+        _max=$_count
-+        lt_cv_path_SED=$_sed
-+      fi
-+    done
-+  done
-+  rm -rf "$tmp"
-+])
-+if test "X$SED" != "X"; then
-+  lt_cv_path_SED=$SED
-+else
-+  SED=$lt_cv_path_SED
-+fi
-+AC_MSG_RESULT([$SED])
-+])
-+
---- metamail-2.7.orig/configure
-+++ metamail-2.7/configure
-@@ -0,0 +1,7333 @@
-+#! /bin/sh
-+
-+# Guess values for system-dependent variables and create Makefiles.
-+# Generated automatically using autoconf version 2.13 
-+# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-+#
-+# This configure script is free software; the Free Software Foundation
-+# gives unlimited permission to copy, distribute and modify it.
-+
-+# Defaults:
-+ac_help=
-+ac_default_prefix=/usr/local
-+# Any additions from configure.in:
-+ac_help="$ac_help
-+  --enable-maintainer-mode enable make rules and dependencies not useful
-+                          (and sometimes confusing) to the casual installer"
-+ac_help="$ac_help
-+  --enable-shared[=PKGS]  build shared libraries [default=yes]"
-+ac_help="$ac_help
-+  --enable-static[=PKGS]  build static libraries [default=yes]"
-+ac_help="$ac_help
-+  --enable-fast-install[=PKGS]  optimize for fast installation [default=yes]"
-+ac_help="$ac_help
-+  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
-+
-+# Find the correct PATH separator.  Usually this is `:', but
-+# DJGPP uses `;' like DOS.
-+if test "X${PATH_SEPARATOR+set}" != Xset; then
-+  UNAME=${UNAME-`uname 2>/dev/null`}
-+  case X$UNAME in
-+    *-DOS) lt_cv_sys_path_separator=';' ;;
-+    *)     lt_cv_sys_path_separator=':' ;;
-+  esac
-+  PATH_SEPARATOR=$lt_cv_sys_path_separator
-+fi
-+
-+
-+# Check that we are running under the correct shell.
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+
-+case X$ECHO in
-+X*--fallback-echo)
-+  # Remove one level of quotation (which was required for Make).
-+  ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
-+  ;;
-+esac
-+
-+echo=${ECHO-echo}
-+if test "X$1" = X--no-reexec; then
-+  # Discard the --no-reexec flag, and continue.
-+  shift
-+elif test "X$1" = X--fallback-echo; then
-+  # Avoid inline document here, it may be left over
-+  :
-+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-+  # Yippee, $echo works!
-+  :
-+else
-+  # Restart under the correct shell.
-+  exec $SHELL "$0" --no-reexec ${1+"$@"}
-+fi
-+
-+if test "X$1" = X--fallback-echo; then
-+  # used as fallback echo
-+  shift
-+  cat <<EOF
-+
-+EOF
-+  exit 0
-+fi
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+
-+if test -z "$ECHO"; then
-+if test "X${echo_test_string+set}" != Xset; then
-+# find a string as large as possible, as long as the shell can cope with it
-+  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-+    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-+    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-+       echo_test_string="`eval $cmd`" &&
-+       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-+    then
-+      break
-+    fi
-+  done
-+fi
-+
-+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-+   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-+   test "X$echo_testing_string" = "X$echo_test_string"; then
-+  :
-+else
-+  # The Solaris, AIX, and Digital Unix default echo programs unquote
-+  # backslashes.  This makes it impossible to quote backslashes using
-+  #   echo "$something" | sed 's/\\/\\\\/g'
-+  #
-+  # So, first we look for a working echo in the user's PATH.
-+
-+  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  for dir in $PATH /usr/ucb; do
-+    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-+       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-+       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-+       test "X$echo_testing_string" = "X$echo_test_string"; then
-+      echo="$dir/echo"
-+      break
-+    fi
-+  done
-+  IFS="$save_ifs"
-+
-+  if test "X$echo" = Xecho; then
-+    # We didn't find a better echo, so look for alternatives.
-+    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-+       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-+       test "X$echo_testing_string" = "X$echo_test_string"; then
-+      # This shell has a builtin print -r that does the trick.
-+      echo='print -r'
-+    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-+	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-+      # If we have ksh, try running configure again with it.
-+      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-+      export ORIGINAL_CONFIG_SHELL
-+      CONFIG_SHELL=/bin/ksh
-+      export CONFIG_SHELL
-+      exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
-+    else
-+      # Try using printf.
-+      echo='printf %s\n'
-+      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-+	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-+	 test "X$echo_testing_string" = "X$echo_test_string"; then
-+	# Cool, printf works
-+	:
-+      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-+	   test "X$echo_testing_string" = 'X\t' &&
-+	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-+	   test "X$echo_testing_string" = "X$echo_test_string"; then
-+	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-+	export CONFIG_SHELL
-+	SHELL="$CONFIG_SHELL"
-+	export SHELL
-+	echo="$CONFIG_SHELL $0 --fallback-echo"
-+      elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-+	   test "X$echo_testing_string" = 'X\t' &&
-+	   echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-+	   test "X$echo_testing_string" = "X$echo_test_string"; then
-+	echo="$CONFIG_SHELL $0 --fallback-echo"
-+      else
-+	# maybe with a smaller string...
-+	prev=:
-+
-+	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-+	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-+	  then
-+	    break
-+	  fi
-+	  prev="$cmd"
-+	done
-+
-+	if test "$prev" != 'sed 50q "$0"'; then
-+	  echo_test_string=`eval $prev`
-+	  export echo_test_string
-+	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-+	else
-+	  # Oops.  We lost completely, so just stick with echo.
-+	  echo=echo
-+	fi
-+      fi
-+    fi
-+  fi
-+fi
-+fi
-+
-+# Copy echo and quote the copy suitably for passing to libtool from
-+# the Makefile, instead of quoting the original, which is used later.
-+ECHO=$echo
-+if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-+   ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
-+fi
-+
-+
-+ac_help="$ac_help
-+  --disable-libtool-lock  avoid locking (might break parallel builds)"
-+ac_help="$ac_help
-+  --with-pic              try to use only PIC/non-PIC objects [default=use both]"
-+
-+# Initialize some variables set by options.
-+# The variables have the same names as the options, with
-+# dashes changed to underlines.
-+build=NONE
-+cache_file=./config.cache
-+exec_prefix=NONE
-+host=NONE
-+no_create=
-+nonopt=NONE
-+no_recursion=
-+prefix=NONE
-+program_prefix=NONE
-+program_suffix=NONE
-+program_transform_name=s,x,x,
-+silent=
-+site=
-+srcdir=
-+target=NONE
-+verbose=
-+x_includes=NONE
-+x_libraries=NONE
-+bindir='${exec_prefix}/bin'
-+sbindir='${exec_prefix}/sbin'
-+libexecdir='${exec_prefix}/libexec'
-+datadir='${prefix}/share'
-+sysconfdir='${prefix}/etc'
-+sharedstatedir='${prefix}/com'
-+localstatedir='${prefix}/var'
-+libdir='${exec_prefix}/lib'
-+includedir='${prefix}/include'
-+oldincludedir='/usr/include'
-+infodir='${prefix}/info'
-+mandir='${prefix}/man'
-+
-+# Initialize some other variables.
-+subdirs=
-+MFLAGS= MAKEFLAGS=
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+# Maximum number of lines to put in a shell here document.
-+ac_max_here_lines=12
-+
-+ac_prev=
-+for ac_option
-+do
-+
-+  # If the previous option needs an argument, assign it.
-+  if test -n "$ac_prev"; then
-+    eval "$ac_prev=\$ac_option"
-+    ac_prev=
-+    continue
-+  fi
-+
-+  case "$ac_option" in
-+  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-+  *) ac_optarg= ;;
-+  esac
-+
-+  # Accept the important Cygnus configure options, so we can diagnose typos.
-+
-+  case "$ac_option" in
-+
-+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-+    ac_prev=bindir ;;
-+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-+    bindir="$ac_optarg" ;;
-+
-+  -build | --build | --buil | --bui | --bu)
-+    ac_prev=build ;;
-+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-+    build="$ac_optarg" ;;
-+
-+  -cache-file | --cache-file | --cache-fil | --cache-fi \
-+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-+    ac_prev=cache_file ;;
-+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-+    cache_file="$ac_optarg" ;;
-+
-+  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-+    ac_prev=datadir ;;
-+  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-+  | --da=*)
-+    datadir="$ac_optarg" ;;
-+
-+  -disable-* | --disable-*)
-+    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-+    # Reject names that are not valid shell variable names.
-+    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-+      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-+    fi
-+    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-+    eval "enable_${ac_feature}=no" ;;
-+
-+  -enable-* | --enable-*)
-+    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-+    # Reject names that are not valid shell variable names.
-+    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-+      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-+    fi
-+    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-+    case "$ac_option" in
-+      *=*) ;;
-+      *) ac_optarg=yes ;;
-+    esac
-+    eval "enable_${ac_feature}='$ac_optarg'" ;;
-+
-+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-+  | --exec | --exe | --ex)
-+    ac_prev=exec_prefix ;;
-+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-+  | --exec=* | --exe=* | --ex=*)
-+    exec_prefix="$ac_optarg" ;;
-+
-+  -gas | --gas | --ga | --g)
-+    # Obsolete; use --with-gas.
-+    with_gas=yes ;;
-+
-+  -help | --help | --hel | --he)
-+    # Omit some internal or obsolete options to make the list less imposing.
-+    # This message is too long to be a string in the A/UX 3.1 sh.
-+    cat << EOF
-+Usage: configure [options] [host]
-+Options: [defaults in brackets after descriptions]
-+Configuration:
-+  --cache-file=FILE       cache test results in FILE
-+  --help                  print this message
-+  --no-create             do not create output files
-+  --quiet, --silent       do not print \`checking...' messages
-+  --version               print the version of autoconf that created configure
-+Directory and file names:
-+  --prefix=PREFIX         install architecture-independent files in PREFIX
-+                          [$ac_default_prefix]
-+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-+                          [same as prefix]
-+  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-+  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-+  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-+  --datadir=DIR           read-only architecture-independent data in DIR
-+                          [PREFIX/share]
-+  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-+  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-+                          [PREFIX/com]
-+  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-+  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-+  --includedir=DIR        C header files in DIR [PREFIX/include]
-+  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-+  --infodir=DIR           info documentation in DIR [PREFIX/info]
-+  --mandir=DIR            man documentation in DIR [PREFIX/man]
-+  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-+  --program-prefix=PREFIX prepend PREFIX to installed program names
-+  --program-suffix=SUFFIX append SUFFIX to installed program names
-+  --program-transform-name=PROGRAM
-+                          run sed PROGRAM on installed program names
-+EOF
-+    cat << EOF
-+Host type:
-+  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-+  --host=HOST             configure for HOST [guessed]
-+  --target=TARGET         configure for TARGET [TARGET=HOST]
-+Features and packages:
-+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-+  --x-includes=DIR        X include files are in DIR
-+  --x-libraries=DIR       X library files are in DIR
-+EOF
-+    if test -n "$ac_help"; then
-+      echo "--enable and --with options recognized:$ac_help"
-+    fi
-+    exit 0 ;;
-+
-+  -host | --host | --hos | --ho)
-+    ac_prev=host ;;
-+  -host=* | --host=* | --hos=* | --ho=*)
-+    host="$ac_optarg" ;;
-+
-+  -includedir | --includedir | --includedi | --included | --include \
-+  | --includ | --inclu | --incl | --inc)
-+    ac_prev=includedir ;;
-+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-+  | --includ=* | --inclu=* | --incl=* | --inc=*)
-+    includedir="$ac_optarg" ;;
-+
-+  -infodir | --infodir | --infodi | --infod | --info | --inf)
-+    ac_prev=infodir ;;
-+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-+    infodir="$ac_optarg" ;;
-+
-+  -libdir | --libdir | --libdi | --libd)
-+    ac_prev=libdir ;;
-+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-+    libdir="$ac_optarg" ;;
-+
-+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-+  | --libexe | --libex | --libe)
-+    ac_prev=libexecdir ;;
-+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-+  | --libexe=* | --libex=* | --libe=*)
-+    libexecdir="$ac_optarg" ;;
-+
-+  -localstatedir | --localstatedir | --localstatedi | --localstated \
-+  | --localstate | --localstat | --localsta | --localst \
-+  | --locals | --local | --loca | --loc | --lo)
-+    ac_prev=localstatedir ;;
-+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-+  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-+  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-+    localstatedir="$ac_optarg" ;;
-+
-+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-+    ac_prev=mandir ;;
-+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-+    mandir="$ac_optarg" ;;
-+
-+  -nfp | --nfp | --nf)
-+    # Obsolete; use --without-fp.
-+    with_fp=no ;;
-+
-+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-+  | --no-cr | --no-c)
-+    no_create=yes ;;
-+
-+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-+    no_recursion=yes ;;
-+
-+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-+  | --oldin | --oldi | --old | --ol | --o)
-+    ac_prev=oldincludedir ;;
-+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-+    oldincludedir="$ac_optarg" ;;
-+
-+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-+    ac_prev=prefix ;;
-+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-+    prefix="$ac_optarg" ;;
-+
-+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-+  | --program-pre | --program-pr | --program-p)
-+    ac_prev=program_prefix ;;
-+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-+    program_prefix="$ac_optarg" ;;
-+
-+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-+  | --program-suf | --program-su | --program-s)
-+    ac_prev=program_suffix ;;
-+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-+    program_suffix="$ac_optarg" ;;
-+
-+  -program-transform-name | --program-transform-name \
-+  | --program-transform-nam | --program-transform-na \
-+  | --program-transform-n | --program-transform- \
-+  | --program-transform | --program-transfor \
-+  | --program-transfo | --program-transf \
-+  | --program-trans | --program-tran \
-+  | --progr-tra | --program-tr | --program-t)
-+    ac_prev=program_transform_name ;;
-+  -program-transform-name=* | --program-transform-name=* \
-+  | --program-transform-nam=* | --program-transform-na=* \
-+  | --program-transform-n=* | --program-transform-=* \
-+  | --program-transform=* | --program-transfor=* \
-+  | --program-transfo=* | --program-transf=* \
-+  | --program-trans=* | --program-tran=* \
-+  | --progr-tra=* | --program-tr=* | --program-t=*)
-+    program_transform_name="$ac_optarg" ;;
-+
-+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+  | -silent | --silent | --silen | --sile | --sil)
-+    silent=yes ;;
-+
-+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-+    ac_prev=sbindir ;;
-+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-+  | --sbi=* | --sb=*)
-+    sbindir="$ac_optarg" ;;
-+
-+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-+  | --sharedst | --shareds | --shared | --share | --shar \
-+  | --sha | --sh)
-+    ac_prev=sharedstatedir ;;
-+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-+  | --sha=* | --sh=*)
-+    sharedstatedir="$ac_optarg" ;;
-+
-+  -site | --site | --sit)
-+    ac_prev=site ;;
-+  -site=* | --site=* | --sit=*)
-+    site="$ac_optarg" ;;
-+
-+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-+    ac_prev=srcdir ;;
-+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-+    srcdir="$ac_optarg" ;;
-+
-+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-+  | --syscon | --sysco | --sysc | --sys | --sy)
-+    ac_prev=sysconfdir ;;
-+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-+    sysconfdir="$ac_optarg" ;;
-+
-+  -target | --target | --targe | --targ | --tar | --ta | --t)
-+    ac_prev=target ;;
-+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-+    target="$ac_optarg" ;;
-+
-+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-+    verbose=yes ;;
-+
-+  -version | --version | --versio | --versi | --vers)
-+    echo "configure generated by autoconf version 2.13"
-+    exit 0 ;;
-+
-+  -with-* | --with-*)
-+    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-+    # Reject names that are not valid shell variable names.
-+    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-+      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-+    fi
-+    ac_package=`echo $ac_package| sed 's/-/_/g'`
-+    case "$ac_option" in
-+      *=*) ;;
-+      *) ac_optarg=yes ;;
-+    esac
-+    eval "with_${ac_package}='$ac_optarg'" ;;
-+
-+  -without-* | --without-*)
-+    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-+    # Reject names that are not valid shell variable names.
-+    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-+      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-+    fi
-+    ac_package=`echo $ac_package| sed 's/-/_/g'`
-+    eval "with_${ac_package}=no" ;;
-+
-+  --x)
-+    # Obsolete; use --with-x.
-+    with_x=yes ;;
-+
-+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-+  | --x-incl | --x-inc | --x-in | --x-i)
-+    ac_prev=x_includes ;;
-+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-+    x_includes="$ac_optarg" ;;
-+
-+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-+    ac_prev=x_libraries ;;
-+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-+    x_libraries="$ac_optarg" ;;
-+
-+  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-+    ;;
-+
-+  *)
-+    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-+      echo "configure: warning: $ac_option: invalid host type" 1>&2
-+    fi
-+    if test "x$nonopt" != xNONE; then
-+      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-+    fi
-+    nonopt="$ac_option"
-+    ;;
-+
-+  esac
-+done
-+
-+if test -n "$ac_prev"; then
-+  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-+fi
-+
-+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-+
-+# File descriptor usage:
-+# 0 standard input
-+# 1 file creation
-+# 2 errors and warnings
-+# 3 some systems may open it to /dev/tty
-+# 4 used on the Kubota Titan
-+# 6 checking for... messages and results
-+# 5 compiler messages saved in config.log
-+if test "$silent" = yes; then
-+  exec 6>/dev/null
-+else
-+  exec 6>&1
-+fi
-+exec 5>./config.log
-+
-+echo "\
-+This file contains any messages produced by compilers while
-+running configure, to aid debugging if configure makes a mistake.
-+" 1>&5
-+
-+# Strip out --no-create and --no-recursion so they do not pile up.
-+# Also quote any args containing shell metacharacters.
-+ac_configure_args=
-+for ac_arg
-+do
-+  case "$ac_arg" in
-+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-+  | --no-cr | --no-c) ;;
-+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-+  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-+  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-+  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-+  esac
-+done
-+
-+# NLS nuisances.
-+# Only set these to C if already set.  These must not be set unconditionally
-+# because not all systems understand e.g. LANG=C (notably SCO).
-+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-+# Non-C LC_CTYPE values break the ctype check.
-+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-+
-+# confdefs.h avoids OS command line length limits that DEFS can exceed.
-+rm -rf conftest* confdefs.h
-+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-+echo > confdefs.h
-+
-+# A filename unique to this package, relative to the directory that
-+# configure is in, which we can look for to find out if srcdir is correct.
-+ac_unique_file=src/metamail/metamail.c
-+
-+# Find the source files, if location was not specified.
-+if test -z "$srcdir"; then
-+  ac_srcdir_defaulted=yes
-+  # Try the directory containing this script, then its parent.
-+  ac_prog=$0
-+  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-+  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-+  srcdir=$ac_confdir
-+  if test ! -r $srcdir/$ac_unique_file; then
-+    srcdir=..
-+  fi
-+else
-+  ac_srcdir_defaulted=no
-+fi
-+if test ! -r $srcdir/$ac_unique_file; then
-+  if test "$ac_srcdir_defaulted" = yes; then
-+    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-+  else
-+    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-+  fi
-+fi
-+srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-+
-+# Prefer explicitly selected file to automatically selected ones.
-+if test -z "$CONFIG_SITE"; then
-+  if test "x$prefix" != xNONE; then
-+    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-+  else
-+    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-+  fi
-+fi
-+for ac_site_file in $CONFIG_SITE; do
-+  if test -r "$ac_site_file"; then
-+    echo "loading site script $ac_site_file"
-+    . "$ac_site_file"
-+  fi
-+done
-+
-+if test -r "$cache_file"; then
-+  echo "loading cache $cache_file"
-+  . $cache_file
-+else
-+  echo "creating cache $cache_file"
-+  > $cache_file
-+fi
-+
-+ac_ext=c
-+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cc_cross
-+
-+ac_exeext=
-+ac_objext=o
-+if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-+  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-+  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-+    ac_n= ac_c='
-+' ac_t='	'
-+  else
-+    ac_n=-n ac_c= ac_t=
-+  fi
-+else
-+  ac_n= ac_c='\c' ac_t=
-+fi
-+
-+
-+ac_aux_dir=
-+for ac_dir in config $srcdir/config; do
-+  if test -f $ac_dir/install-sh; then
-+    ac_aux_dir=$ac_dir
-+    ac_install_sh="$ac_aux_dir/install-sh -c"
-+    break
-+  elif test -f $ac_dir/install.sh; then
-+    ac_aux_dir=$ac_dir
-+    ac_install_sh="$ac_aux_dir/install.sh -c"
-+    break
-+  fi
-+done
-+if test -z "$ac_aux_dir"; then
-+  { echo "configure: error: can not find install-sh or install.sh in config $srcdir/config" 1>&2; exit 1; }
-+fi
-+ac_config_guess=$ac_aux_dir/config.guess
-+ac_config_sub=$ac_aux_dir/config.sub
-+ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-+
-+
-+
-+
-+am__api_version="1.4"
-+# Find a good install program.  We prefer a C program (faster),
-+# so one script is as good as another.  But avoid the broken or
-+# incompatible versions:
-+# SysV /etc/install, /usr/sbin/install
-+# SunOS /usr/etc/install
-+# IRIX /sbin/install
-+# AIX /bin/install
-+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-+# ./install, which can be erroneously created by make from ./install.sh.
-+echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-+echo "configure:734: checking for a BSD compatible install" >&5
-+if test -z "$INSTALL"; then
-+if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-+  for ac_dir in $PATH; do
-+    # Account for people who put trailing slashes in PATH elements.
-+    case "$ac_dir/" in
-+    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-+    *)
-+      # OSF1 and SCO ODT 3.0 have their own names for install.
-+      # Don't use installbsd from OSF since it installs stuff as root
-+      # by default.
-+      for ac_prog in ginstall scoinst install; do
-+        if test -f $ac_dir/$ac_prog; then
-+	  if test $ac_prog = install &&
-+            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-+	    # AIX install.  It has an incompatible calling convention.
-+	    :
-+	  else
-+	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-+	    break 2
-+	  fi
-+	fi
-+      done
-+      ;;
-+    esac
-+  done
-+  IFS="$ac_save_IFS"
-+
-+fi
-+  if test "${ac_cv_path_install+set}" = set; then
-+    INSTALL="$ac_cv_path_install"
-+  else
-+    # As a last resort, use the slow shell script.  We don't cache a
-+    # path for INSTALL within a source directory, because that will
-+    # break other packages using the cache if that directory is
-+    # removed, or if the path is relative.
-+    INSTALL="$ac_install_sh"
-+  fi
-+fi
-+echo "$ac_t""$INSTALL" 1>&6
-+
-+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-+# It thinks the first close brace ends the variable substitution.
-+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-+
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-+
-+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-+
-+echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-+echo "configure:787: checking whether build environment is sane" >&5
-+# Just in case
-+sleep 1
-+echo timestamp > conftestfile
-+# Do `set' in a subshell so we don't clobber the current shell's
-+# arguments.  Must try -L first in case configure is actually a
-+# symlink; some systems play weird games with the mod time of symlinks
-+# (eg FreeBSD returns the mod time of the symlink's containing
-+# directory).
-+if (
-+   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-+   if test "$*" = "X"; then
-+      # -L didn't work.
-+      set X `ls -t $srcdir/configure conftestfile`
-+   fi
-+   if test "$*" != "X $srcdir/configure conftestfile" \
-+      && test "$*" != "X conftestfile $srcdir/configure"; then
-+
-+      # If neither matched, then we have a broken ls.  This can happen
-+      # if, for instance, CONFIG_SHELL is bash and it inherits a
-+      # broken ls alias from the environment.  This has actually
-+      # happened.  Such a system could not be considered "sane".
-+      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-+alias in your environment" 1>&2; exit 1; }
-+   fi
-+
-+   test "$2" = conftestfile
-+   )
-+then
-+   # Ok.
-+   :
-+else
-+   { echo "configure: error: newly created file is older than distributed files!
-+Check your system clock" 1>&2; exit 1; }
-+fi
-+rm -f conftest*
-+echo "$ac_t""yes" 1>&6
-+if test "$program_transform_name" = s,x,x,; then
-+  program_transform_name=
-+else
-+  # Double any \ or $.  echo might interpret backslashes.
-+  cat <<\EOF_SED > conftestsed
-+s,\\,\\\\,g; s,\$,$$,g
-+EOF_SED
-+  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-+  rm -f conftestsed
-+fi
-+test "$program_prefix" != NONE &&
-+  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-+# Use a double $ so make ignores it.
-+test "$program_suffix" != NONE &&
-+  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-+
-+# sed with no file args requires a program.
-+test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-+
-+echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-+echo "configure:844: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftestmake <<\EOF
-+all:
-+	@echo 'ac_maketemp="${MAKE}"'
-+EOF
-+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-+eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-+if test -n "$ac_maketemp"; then
-+  eval ac_cv_prog_make_${ac_make}_set=yes
-+else
-+  eval ac_cv_prog_make_${ac_make}_set=no
-+fi
-+rm -f conftestmake
-+fi
-+if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  SET_MAKE=
-+else
-+  echo "$ac_t""no" 1>&6
-+  SET_MAKE="MAKE=${MAKE-make}"
-+fi
-+
-+
-+PACKAGE=metamail
-+
-+VERSION=0.0.1
-+
-+if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-+  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-+fi
-+cat >> confdefs.h <<EOF
-+#define PACKAGE "$PACKAGE"
-+EOF
-+
-+cat >> confdefs.h <<EOF
-+#define VERSION "$VERSION"
-+EOF
-+
-+
-+
-+missing_dir=`cd $ac_aux_dir && pwd`
-+echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-+echo "configure:890: checking for working aclocal-${am__api_version}" >&5
-+# Run test in a subshell; some versions of sh will print an error if
-+# an executable is not found, even if stderr is redirected.
-+# Redirect stdin to placate older versions of autoconf.  Sigh.
-+if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-+   ACLOCAL=aclocal-${am__api_version}
-+   echo "$ac_t""found" 1>&6
-+else
-+   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
-+   echo "$ac_t""missing" 1>&6
-+fi
-+
-+echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-+echo "configure:903: checking for working autoconf" >&5
-+# Run test in a subshell; some versions of sh will print an error if
-+# an executable is not found, even if stderr is redirected.
-+# Redirect stdin to placate older versions of autoconf.  Sigh.
-+if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-+   AUTOCONF=autoconf
-+   echo "$ac_t""found" 1>&6
-+else
-+   AUTOCONF="$missing_dir/missing autoconf"
-+   echo "$ac_t""missing" 1>&6
-+fi
-+
-+echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-+echo "configure:916: checking for working automake-${am__api_version}" >&5
-+# Run test in a subshell; some versions of sh will print an error if
-+# an executable is not found, even if stderr is redirected.
-+# Redirect stdin to placate older versions of autoconf.  Sigh.
-+if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-+   AUTOMAKE=automake-${am__api_version}
-+   echo "$ac_t""found" 1>&6
-+else
-+   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
-+   echo "$ac_t""missing" 1>&6
-+fi
-+
-+echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-+echo "configure:929: checking for working autoheader" >&5
-+# Run test in a subshell; some versions of sh will print an error if
-+# an executable is not found, even if stderr is redirected.
-+# Redirect stdin to placate older versions of autoconf.  Sigh.
-+if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-+   AUTOHEADER=autoheader
-+   echo "$ac_t""found" 1>&6
-+else
-+   AUTOHEADER="$missing_dir/missing autoheader"
-+   echo "$ac_t""missing" 1>&6
-+fi
-+
-+echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-+echo "configure:942: checking for working makeinfo" >&5
-+# Run test in a subshell; some versions of sh will print an error if
-+# an executable is not found, even if stderr is redirected.
-+# Redirect stdin to placate older versions of autoconf.  Sigh.
-+if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-+   MAKEINFO=makeinfo
-+   echo "$ac_t""found" 1>&6
-+else
-+   MAKEINFO="$missing_dir/missing makeinfo"
-+   echo "$ac_t""missing" 1>&6
-+fi
-+
-+
-+echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-+echo "configure:956: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-+if test "${enable_maintainer_mode+set}" = set; then
-+  enableval="$enable_maintainer_mode"
-+  USE_MAINTAINER_MODE=$enableval
-+else
-+  USE_MAINTAINER_MODE=no
-+fi
-+
-+  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
-+  
-+
-+if test $USE_MAINTAINER_MODE = yes; then
-+  MAINTAINER_MODE_TRUE=
-+  MAINTAINER_MODE_FALSE='#'
-+else
-+  MAINTAINER_MODE_TRUE='#'
-+  MAINTAINER_MODE_FALSE=
-+fi
-+  MAINT=$MAINTAINER_MODE_TRUE
-+  
-+
-+
-+
-+# Make sure we can run config.sub.
-+if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-+else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-+fi
-+
-+echo $ac_n "checking host system type""... $ac_c" 1>&6
-+echo "configure:986: checking host system type" >&5
-+
-+host_alias=$host
-+case "$host_alias" in
-+NONE)
-+  case $nonopt in
-+  NONE)
-+    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-+    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-+    fi ;;
-+  *) host_alias=$nonopt ;;
-+  esac ;;
-+esac
-+
-+host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-+host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-+host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-+host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+echo "$ac_t""$host" 1>&6
-+
-+
-+# Extract the first word of "gcc", so it can be a program name with args.
-+set dummy gcc; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:1010: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_prog_CC="gcc"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+fi
-+fi
-+CC="$ac_cv_prog_CC"
-+if test -n "$CC"; then
-+  echo "$ac_t""$CC" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+if test -z "$CC"; then
-+  # Extract the first word of "cc", so it can be a program name with args.
-+set dummy cc; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:1040: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_prog_rejected=no
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-+        ac_prog_rejected=yes
-+	continue
-+      fi
-+      ac_cv_prog_CC="cc"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+if test $ac_prog_rejected = yes; then
-+  # We found a bogon in the path, so make sure we never use it.
-+  set dummy $ac_cv_prog_CC
-+  shift
-+  if test $# -gt 0; then
-+    # We chose a different compiler from the bogus one.
-+    # However, it has the same basename, so the bogon will be chosen
-+    # first if we set CC to just the basename; use the full file name.
-+    shift
-+    set dummy "$ac_dir/$ac_word" "$@"
-+    shift
-+    ac_cv_prog_CC="$@"
-+  fi
-+fi
-+fi
-+fi
-+CC="$ac_cv_prog_CC"
-+if test -n "$CC"; then
-+  echo "$ac_t""$CC" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+  if test -z "$CC"; then
-+    case "`uname -s`" in
-+    *win32* | *WIN32*)
-+      # Extract the first word of "cl", so it can be a program name with args.
-+set dummy cl; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:1091: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_prog_CC="cl"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+fi
-+fi
-+CC="$ac_cv_prog_CC"
-+if test -n "$CC"; then
-+  echo "$ac_t""$CC" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+ ;;
-+    esac
-+  fi
-+  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-+fi
-+
-+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-+echo "configure:1123: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+
-+ac_ext=c
-+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cc_cross
-+
-+cat > conftest.$ac_ext << EOF
-+
-+#line 1134 "configure"
-+#include "confdefs.h"
-+
-+main(){return(0);}
-+EOF
-+if { (eval echo configure:1139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  ac_cv_prog_cc_works=yes
-+  # If we can't run a trivial program, we are probably using a cross compiler.
-+  if (./conftest; exit) 2>/dev/null; then
-+    ac_cv_prog_cc_cross=no
-+  else
-+    ac_cv_prog_cc_cross=yes
-+  fi
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  ac_cv_prog_cc_works=no
-+fi
-+rm -fr conftest*
-+ac_ext=c
-+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cc_cross
-+
-+echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-+if test $ac_cv_prog_cc_works = no; then
-+  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-+fi
-+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-+echo "configure:1165: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-+cross_compiling=$ac_cv_prog_cc_cross
-+
-+echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-+echo "configure:1170: checking whether we are using GNU C" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.c <<EOF
-+#ifdef __GNUC__
-+  yes;
-+#endif
-+EOF
-+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-+  ac_cv_prog_gcc=yes
-+else
-+  ac_cv_prog_gcc=no
-+fi
-+fi
-+
-+echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-+
-+if test $ac_cv_prog_gcc = yes; then
-+  GCC=yes
-+else
-+  GCC=
-+fi
-+
-+ac_test_CFLAGS="${CFLAGS+set}"
-+ac_save_CFLAGS="$CFLAGS"
-+CFLAGS=
-+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-+echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  echo 'void f(){}' > conftest.c
-+if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-+  ac_cv_prog_cc_g=yes
-+else
-+  ac_cv_prog_cc_g=no
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-+if test "$ac_test_CFLAGS" = set; then
-+  CFLAGS="$ac_save_CFLAGS"
-+elif test $ac_cv_prog_cc_g = yes; then
-+  if test "$GCC" = yes; then
-+    CFLAGS="-g -O2"
-+  else
-+    CFLAGS="-g"
-+  fi
-+else
-+  if test "$GCC" = yes; then
-+    CFLAGS="-O2"
-+  else
-+    CFLAGS=
-+  fi
-+fi
-+
-+# Find the correct PATH separator.  Usually this is `:', but
-+# DJGPP uses `;' like DOS.
-+if test "X${PATH_SEPARATOR+set}" != Xset; then
-+  UNAME=${UNAME-`uname 2>/dev/null`}
-+  case X$UNAME in
-+    *-DOS) lt_cv_sys_path_separator=';' ;;
-+    *)     lt_cv_sys_path_separator=':' ;;
-+  esac
-+  PATH_SEPARATOR=$lt_cv_sys_path_separator
-+fi
-+
-+echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-+echo "configure:1241: checking for Cygwin environment" >&5
-+if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 1246 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+
-+#ifndef __CYGWIN__
-+#define __CYGWIN__ __CYGWIN32__
-+#endif
-+return __CYGWIN__;
-+; return 0; }
-+EOF
-+if { (eval echo configure:1257: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  rm -rf conftest*
-+  ac_cv_cygwin=yes
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  ac_cv_cygwin=no
-+fi
-+rm -f conftest*
-+rm -f conftest*
-+fi
-+
-+echo "$ac_t""$ac_cv_cygwin" 1>&6
-+CYGWIN=
-+test "$ac_cv_cygwin" = yes && CYGWIN=yes
-+echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-+echo "configure:1274: checking for mingw32 environment" >&5
-+if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 1279 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+return __MINGW32__;
-+; return 0; }
-+EOF
-+if { (eval echo configure:1286: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  rm -rf conftest*
-+  ac_cv_mingw32=yes
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  ac_cv_mingw32=no
-+fi
-+rm -f conftest*
-+rm -f conftest*
-+fi
-+
-+echo "$ac_t""$ac_cv_mingw32" 1>&6
-+MINGW32=
-+test "$ac_cv_mingw32" = yes && MINGW32=yes
-+echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-+echo "configure:1303: checking how to run the C preprocessor" >&5
-+# On Suns, sometimes $CPP names a directory.
-+if test -n "$CPP" && test -d "$CPP"; then
-+  CPP=
-+fi
-+if test -z "$CPP"; then
-+if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+    # This must be in double quotes, not single quotes, because CPP may get
-+  # substituted into the Makefile and "${CC-cc}" will confuse make.
-+  CPP="${CC-cc} -E"
-+  # On the NeXT, cc -E runs the code through the compiler's parser,
-+  # not just through cpp.
-+  cat > conftest.$ac_ext <<EOF
-+#line 1318 "configure"
-+#include "confdefs.h"
-+#include <assert.h>
-+Syntax Error
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:1324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  :
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  CPP="${CC-cc} -E -traditional-cpp"
-+  cat > conftest.$ac_ext <<EOF
-+#line 1335 "configure"
-+#include "confdefs.h"
-+#include <assert.h>
-+Syntax Error
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:1341: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  :
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  CPP="${CC-cc} -nologo -E"
-+  cat > conftest.$ac_ext <<EOF
-+#line 1352 "configure"
-+#include "confdefs.h"
-+#include <assert.h>
-+Syntax Error
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:1358: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  :
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  CPP=/lib/cpp
-+fi
-+rm -f conftest*
-+fi
-+rm -f conftest*
-+fi
-+rm -f conftest*
-+  ac_cv_prog_CPP="$CPP"
-+fi
-+  CPP="$ac_cv_prog_CPP"
-+else
-+  ac_cv_prog_CPP="$CPP"
-+fi
-+echo "$ac_t""$CPP" 1>&6
-+
-+# Check whether --enable-shared or --disable-shared was given.
-+if test "${enable_shared+set}" = set; then
-+  enableval="$enable_shared"
-+  p=${PACKAGE-default}
-+case $enableval in
-+yes) enable_shared=yes ;;
-+no) enable_shared=no ;;
-+*)
-+  enable_shared=no
-+  # Look at the argument we got.  We use all the common list separators.
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-+  for pkg in $enableval; do
-+    if test "X$pkg" = "X$p"; then
-+      enable_shared=yes
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  ;;
-+esac
-+else
-+  enable_shared=yes
-+fi
-+
-+# Check whether --enable-static or --disable-static was given.
-+if test "${enable_static+set}" = set; then
-+  enableval="$enable_static"
-+  p=${PACKAGE-default}
-+case $enableval in
-+yes) enable_static=yes ;;
-+no) enable_static=no ;;
-+*)
-+  enable_static=no
-+  # Look at the argument we got.  We use all the common list separators.
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-+  for pkg in $enableval; do
-+    if test "X$pkg" = "X$p"; then
-+      enable_static=yes
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  ;;
-+esac
-+else
-+  enable_static=yes
-+fi
-+
-+# Check whether --enable-fast-install or --disable-fast-install was given.
-+if test "${enable_fast_install+set}" = set; then
-+  enableval="$enable_fast_install"
-+  p=${PACKAGE-default}
-+case $enableval in
-+yes) enable_fast_install=yes ;;
-+no) enable_fast_install=no ;;
-+*)
-+  enable_fast_install=no
-+  # Look at the argument we got.  We use all the common list separators.
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-+  for pkg in $enableval; do
-+    if test "X$pkg" = "X$p"; then
-+      enable_fast_install=yes
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  ;;
-+esac
-+else
-+  enable_fast_install=yes
-+fi
-+
-+echo $ac_n "checking build system type""... $ac_c" 1>&6
-+echo "configure:1452: checking build system type" >&5
-+
-+build_alias=$build
-+case "$build_alias" in
-+NONE)
-+  case $nonopt in
-+  NONE) build_alias=$host_alias ;;
-+  *) build_alias=$nonopt ;;
-+  esac ;;
-+esac
-+
-+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+echo "$ac_t""$build" 1>&6
-+
-+# Check whether --with-gnu-ld or --without-gnu-ld was given.
-+if test "${with_gnu_ld+set}" = set; then
-+  withval="$with_gnu_ld"
-+  test "$withval" = no || with_gnu_ld=yes
-+else
-+  with_gnu_ld=no
-+fi
-+
-+ac_prog=ld
-+if test "$GCC" = yes; then
-+  # Check if gcc -print-prog-name=ld gives a path.
-+  echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-+echo "configure:1481: checking for ld used by GCC" >&5
-+  case $host in
-+  *-*-mingw*)
-+    # gcc leaves a trailing carriage return which upsets mingw
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-+  *)
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-+  esac
-+  case $ac_prog in
-+    # Accept absolute paths.
-+    [\\/]* | [A-Za-z]:[\\/]*)
-+      re_direlt='/[^/][^/]*/\.\./'
-+      # Canonicalize the path of ld
-+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-+	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-+      done
-+      test -z "$LD" && LD="$ac_prog"
-+      ;;
-+  "")
-+    # If it fails, then pretend we aren't using GCC.
-+    ac_prog=ld
-+    ;;
-+  *)
-+    # If it is relative, then search for the first ld in PATH.
-+    with_gnu_ld=unknown
-+    ;;
-+  esac
-+elif test "$with_gnu_ld" = yes; then
-+  echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-+echo "configure:1511: checking for GNU ld" >&5
-+else
-+  echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-+echo "configure:1514: checking for non-GNU ld" >&5
-+fi
-+if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -z "$LD"; then
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  for ac_dir in $PATH; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-+      lt_cv_path_LD="$ac_dir/$ac_prog"
-+      # Check to see if the program is GNU ld.  I'd rather use --version,
-+      # but apparently some GNU ld's only accept -v.
-+      # Break only if it was the GNU/non-GNU ld that we prefer.
-+      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-+	test "$with_gnu_ld" != no && break
-+      else
-+	test "$with_gnu_ld" != yes && break
-+      fi
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+else
-+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-+fi
-+fi
-+
-+LD="$lt_cv_path_LD"
-+if test -n "$LD"; then
-+  echo "$ac_t""$LD" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
-+echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-+echo "configure:1549: checking if the linker ($LD) is GNU ld" >&5
-+if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-+  lt_cv_prog_gnu_ld=yes
-+else
-+  lt_cv_prog_gnu_ld=no
-+fi
-+fi
-+
-+echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6
-+with_gnu_ld=$lt_cv_prog_gnu_ld
-+
-+
-+echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-+echo "configure:1566: checking for $LD option to reload object files" >&5
-+if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  lt_cv_ld_reload_flag='-r'
-+fi
-+
-+echo "$ac_t""$lt_cv_ld_reload_flag" 1>&6
-+reload_flag=$lt_cv_ld_reload_flag
-+test -n "$reload_flag" && reload_flag=" $reload_flag"
-+
-+echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-+echo "configure:1578: checking for BSD-compatible nm" >&5
-+if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$NM"; then
-+  # Let the user override the test.
-+  lt_cv_path_NM="$NM"
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-+    test -z "$ac_dir" && ac_dir=.
-+    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-+    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
-+      # Check to see if the nm accepts a BSD-compat flag.
-+      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-+      #   nm: unknown option "B" ignored
-+      # Tru64's nm complains that /dev/null is an invalid object file
-+      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-+	lt_cv_path_NM="$tmp_nm -B"
-+	break
-+      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-+	lt_cv_path_NM="$tmp_nm -p"
-+	break
-+      else
-+	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-+	continue # so that we can try to find one that supports BSD flags
-+      fi
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-+fi
-+fi
-+
-+NM="$lt_cv_path_NM"
-+echo "$ac_t""$NM" 1>&6
-+
-+echo $ac_n "checking for a sed that does not truncate output""... $ac_c" 1>&6
-+echo "configure:1616: checking for a sed that does not truncate output" >&5
-+if eval "test \"`echo '$''{'lt_cv_path_SED'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  # Loop through the user's path and test for sed and gsed.
-+# Then use that list of sed's as ones to test for truncation.
-+as_executable_p="test -f"
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_prog in sed gsed; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+      if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-+        _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"
-+      fi
-+    done
-+  done
-+done
-+
-+  # Create a temporary directory, and hook for its removal unless debugging.
-+$debug ||
-+{
-+  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-+  trap '{ (exit 1); exit 1; }' 1 2 13 15
-+}
-+
-+# Create a (secure) tmp directory for tmp files.
-+: ${TMPDIR=/tmp}
-+{
-+  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` &&
-+  test -n "$tmp" && test -d "$tmp"
-+}  ||
-+{
-+  tmp=$TMPDIR/sed$$-$RANDOM
-+  (umask 077 && mkdir $tmp)
-+} ||
-+{
-+   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
-+   { (exit 1); exit 1; }
-+}
-+  _max=0
-+  _count=0
-+  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
-+  # along with /bin/sed that truncates output.
-+  for _sed in $_sed_list /usr/xpg4/bin/sed; do
-+    test ! -f ${_sed} && break
-+    cat /dev/null > "$tmp/sed.in"
-+    _count=0
-+    echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in"
-+    # Check for GNU sed and select it if it is found.
-+    if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
-+      lt_cv_path_SED=${_sed}
-+      break
-+    fi
-+    while true; do
-+      cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
-+      mv "$tmp/sed.tmp" "$tmp/sed.in"
-+      cp "$tmp/sed.in" "$tmp/sed.nl"
-+      echo >>"$tmp/sed.nl"
-+      ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
-+      cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
-+      # 40000 chars as input seems more than enough
-+      test $_count -gt 10 && break
-+      _count=`expr $_count + 1`
-+      if test $_count -gt $_max; then
-+        _max=$_count
-+        lt_cv_path_SED=$_sed
-+      fi
-+    done
-+  done
-+  rm -rf "$tmp"
-+
-+fi
-+
-+if test "X$SED" != "X"; then
-+  lt_cv_path_SED=$SED
-+else
-+  SED=$lt_cv_path_SED
-+fi
-+echo "$ac_t""$SED" 1>&6
-+
-+echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-+echo "configure:1700: checking whether ln -s works" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  rm -f conftestdata
-+if ln -s X conftestdata 2>/dev/null
-+then
-+  rm -f conftestdata
-+  ac_cv_prog_LN_S="ln -s"
-+else
-+  ac_cv_prog_LN_S=ln
-+fi
-+fi
-+LN_S="$ac_cv_prog_LN_S"
-+if test "$ac_cv_prog_LN_S" = "ln -s"; then
-+  echo "$ac_t""yes" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+echo $ac_n "checking how to recognise dependent libraries""... $ac_c" 1>&6
-+echo "configure:1721: checking how to recognise dependent libraries" >&5
-+if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  lt_cv_file_magic_cmd='$MAGIC_CMD'
-+lt_cv_file_magic_test_file=
-+lt_cv_deplibs_check_method='unknown'
-+# Need to set the preceding variable on all platforms that support
-+# interlibrary dependencies.
-+# 'none' -- dependencies not supported.
-+# `unknown' -- same as none, but documents that we really don't know.
-+# 'pass_all' -- all dependencies passed with no checks.
-+# 'test_compile' -- check by making test program.
-+# 'file_magic [[regex]]' -- check by looking for files in library path
-+# which responds to the $file_magic_cmd with a given egrep regex.
-+# If you have `file' or equivalent on your system and you're not sure
-+# whether `pass_all' will *always* work, you probably want this one.
-+
-+case $host_os in
-+aix4* | aix5*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+beos*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+bsdi4*)
-+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-+  lt_cv_file_magic_cmd='/usr/bin/file -L'
-+  lt_cv_file_magic_test_file=/shlib/libc.so
-+  ;;
-+
-+cygwin* | mingw* | pw32*)
-+  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-+  lt_cv_file_magic_cmd='$OBJDUMP -f'
-+  ;;
-+
-+darwin* | rhapsody*)
-+  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-+  lt_cv_file_magic_cmd='/usr/bin/file -L'
-+  case "$host_os" in
-+  rhapsody* | darwin1.[012])
-+    lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
-+    ;;
-+  *) # Darwin 1.3 on
-+    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-+    ;;
-+  esac
-+  ;;
-+
-+freebsd*)
-+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+    case $host_cpu in
-+    i*86 )
-+      # Not sure whether the presence of OpenBSD here was a mistake.
-+      # Let's accept both of them until this is cleared up.
-+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-+      lt_cv_file_magic_cmd=/usr/bin/file
-+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-+      ;;
-+    esac
-+  else
-+    lt_cv_deplibs_check_method=pass_all
-+  fi
-+  ;;
-+
-+gnu*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+hpux10.20*|hpux11*)
-+  lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  lt_cv_file_magic_test_file=/usr/lib/libc.sl
-+  ;;
-+
-+irix5* | irix6* | nonstopux*)
-+  case $host_os in
-+  irix5* | nonstopux*)
-+    # this will be overridden with pass_all, but let us keep it just in case
-+    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-+    ;;
-+  *)
-+    case $LD in
-+    *-32|*"-32 ") libmagic=32-bit;;
-+    *-n32|*"-n32 ") libmagic=N32;;
-+    *-64|*"-64 ") libmagic=64-bit;;
-+    *) libmagic=never-match;;
-+    esac
-+    # this will be overridden with pass_all, but let us keep it just in case
-+    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
-+    ;;
-+  esac
-+  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+# This must be Linux ELF.
-+linux-gnu*)
-+  case $host_cpu in
-+  alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64*)
-+    lt_cv_deplibs_check_method=pass_all ;;
-+  *)
-+    # glibc up to 2.1.1 does not perform some relocations on ARM
-+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
-+  esac
-+  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-+  ;;
-+
-+netbsd*)
-+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-+  else
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
-+  fi
-+  ;;
-+
-+newos6*)
-+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-+  ;;
-+
-+openbsd*)
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-+  else
-+    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
-+  fi
-+  ;;
-+
-+osf3* | osf4* | osf5*)
-+  # this will be overridden with pass_all, but let us keep it just in case
-+  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-+  lt_cv_file_magic_test_file=/shlib/libc.so
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+sco3.2v5*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+solaris*)
-+  lt_cv_deplibs_check_method=pass_all
-+  lt_cv_file_magic_test_file=/lib/libc.so
-+  ;;
-+
-+sysv5uw[78]* | sysv4*uw2*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+  case $host_vendor in
-+  motorola)
-+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-+    ;;
-+  ncr)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
-+  sequent)
-+    lt_cv_file_magic_cmd='/bin/file'
-+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-+    ;;
-+  sni)
-+    lt_cv_file_magic_cmd='/bin/file'
-+    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
-+    lt_cv_file_magic_test_file=/lib/libc.so
-+    ;;
-+  siemens)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
-+  esac
-+  ;;
-+esac
-+
-+fi
-+
-+echo "$ac_t""$lt_cv_deplibs_check_method" 1>&6
-+file_magic_cmd=$lt_cv_file_magic_cmd
-+deplibs_check_method=$lt_cv_deplibs_check_method
-+
-+echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-+echo "configure:1907: checking for object suffix" >&5
-+if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  rm -f conftest*
-+echo 'int i = 1;' > conftest.$ac_ext
-+if { (eval echo configure:1913: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  for ac_file in conftest.*; do
-+    case $ac_file in
-+    *.c) ;;
-+    *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
-+    esac
-+  done
-+else
-+  { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
-+fi
-+rm -f conftest*
-+fi
-+
-+echo "$ac_t""$ac_cv_objext" 1>&6
-+OBJEXT=$ac_cv_objext
-+ac_objext=$ac_cv_objext
-+
-+
-+
-+echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-+echo "configure:1933: checking for executable suffix" >&5
-+if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-+  ac_cv_exeext=.exe
-+else
-+  rm -f conftest*
-+  echo 'int main () { return 0; }' > conftest.$ac_ext
-+  ac_cv_exeext=
-+  if { (eval echo configure:1943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+    for file in conftest.*; do
-+      case $file in
-+      *.$ac_ext | *.c | *.o | *.obj) ;;
-+      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-+      esac
-+    done
-+  else
-+    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
-+  fi
-+  rm -f conftest*
-+  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
-+fi
-+fi
-+
-+EXEEXT=""
-+test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
-+echo "$ac_t""${ac_cv_exeext}" 1>&6
-+ac_exeext=$EXEEXT
-+
-+if test $host != $build; then
-+  ac_tool_prefix=${host_alias}-
-+else
-+  ac_tool_prefix=
-+fi
-+
-+
-+
-+
-+# Check for command to grab the raw symbol name followed by C symbol from nm.
-+echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6
-+echo "configure:1974: checking command to parse $NM output" >&5
-+if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  
-+# These are sane defaults that work on at least a few old systems.
-+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-+
-+# Character class describing NM global symbol codes.
-+symcode='[BCDEGRST]'
-+
-+# Regexp to match symbols that can be accessed directly from C.
-+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-+
-+# Transform the above into a raw symbol and a C symbol.
-+symxfrm='\1 \2\3 \3'
-+
-+# Transform an extracted symbol line into a proper C declaration
-+lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
-+
-+# Transform an extracted symbol line into symbol name and symbol address
-+lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-+
-+# Define system-specific variables.
-+case $host_os in
-+aix*)
-+  symcode='[BCDT]'
-+  ;;
-+cygwin* | mingw* | pw32*)
-+  symcode='[ABCDGISTW]'
-+  ;;
-+hpux*) # Its linker distinguishes data from code symbols
-+  lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-+  lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-+  ;;
-+irix* | nonstopux*)
-+  symcode='[BCDEGRST]'
-+  ;;
-+osf*)
-+  symcode='[BCDEGQRST]'
-+  ;;
-+solaris* | sysv5*)
-+  symcode='[BDT]'
-+  ;;
-+sysv4)
-+  symcode='[DFNSTU]'
-+  ;;
-+esac
-+
-+# Handle CRLF in mingw tool chain
-+opt_cr=
-+case $host_os in
-+mingw*)
-+  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-+  ;;
-+esac
-+
-+# If we're using GNU nm, then use its standard symbol codes.
-+if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
-+  symcode='[ABCDGISTW]'
-+fi
-+
-+# Try without a prefix undercore, then with it.
-+for ac_symprfx in "" "_"; do
-+
-+  # Write the raw and C identifiers.
-+lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
-+
-+  # Check to see that the pipe works correctly.
-+  pipe_works=no
-+  rm -f conftest*
-+  cat > conftest.$ac_ext <<EOF
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+char nm_test_var;
-+void nm_test_func(){}
-+#ifdef __cplusplus
-+}
-+#endif
-+int main(){nm_test_var='a';nm_test_func();return(0);}
-+EOF
-+
-+  if { (eval echo configure:2057: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+    # Now try to grab the symbols.
-+    nlist=conftest.nm
-+    if { (eval echo configure:2060: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then
-+      # Try sorting and uniquifying the output.
-+      if sort "$nlist" | uniq > "$nlist"T; then
-+	mv -f "$nlist"T "$nlist"
-+      else
-+	rm -f "$nlist"T
-+      fi
-+
-+      # Make sure that we snagged all the symbols we need.
-+      if egrep ' nm_test_var$' "$nlist" >/dev/null; then
-+	if egrep ' nm_test_func$' "$nlist" >/dev/null; then
-+	  cat <<EOF > conftest.$ac_ext
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+EOF
-+	  # Now generate the symbol file.
-+	  eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext'
-+
-+	  cat <<EOF >> conftest.$ac_ext
-+#if defined (__STDC__) && __STDC__
-+# define lt_ptr void *
-+#else
-+# define lt_ptr char *
-+# define const
-+#endif
-+
-+/* The mapping between symbol names and symbols. */
-+const struct {
-+  const char *name;
-+  lt_ptr address;
-+}
-+lt_preloaded_symbols[] =
-+{
-+EOF
-+	  sed "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext
-+	  cat <<\EOF >> conftest.$ac_ext
-+  {0, (lt_ptr) 0}
-+};
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+EOF
-+	  # Now try linking the two files.
-+	  mv conftest.$ac_objext conftstm.$ac_objext
-+	  save_LIBS="$LIBS"
-+	  save_CFLAGS="$CFLAGS"
-+	  LIBS="conftstm.$ac_objext"
-+	  CFLAGS="$CFLAGS$no_builtin_flag"
-+	  if { (eval echo configure:2111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
-+	    pipe_works=yes
-+	  fi
-+	  LIBS="$save_LIBS"
-+	  CFLAGS="$save_CFLAGS"
-+	else
-+	  echo "cannot find nm_test_func in $nlist" >&5
-+	fi
-+      else
-+	echo "cannot find nm_test_var in $nlist" >&5
-+      fi
-+    else
-+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-+    fi
-+  else
-+    echo "$progname: failed program was:" >&5
-+    cat conftest.$ac_ext >&5
-+  fi
-+  rm -f conftest* conftst*
-+
-+  # Do not use the global_symbol_pipe unless it works.
-+  if test "$pipe_works" = yes; then
-+    break
-+  else
-+    lt_cv_sys_global_symbol_pipe=
-+  fi
-+done
-+
-+fi
-+
-+global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
-+if test -z "$lt_cv_sys_global_symbol_pipe"; then
-+  global_symbol_to_cdecl=
-+  global_symbol_to_c_name_address=
-+else
-+  global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
-+  global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address"
-+fi
-+if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
-+then
-+  echo "$ac_t""failed" 1>&6
-+else
-+  echo "$ac_t""ok" 1>&6
-+fi
-+
-+for ac_hdr in dlfcn.h
-+do
-+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+echo "configure:2160: checking for $ac_hdr" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 2165 "configure"
-+#include "confdefs.h"
-+#include <$ac_hdr>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:2170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=yes"
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=no"
-+fi
-+rm -f conftest*
-+fi
-+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_hdr 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+
-+
-+
-+
-+
-+# Only perform the check for file, if the check method requires it
-+case $deplibs_check_method in
-+file_magic*)
-+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-+    echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-+echo "configure:2206: checking for ${ac_tool_prefix}file" >&5
-+if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  case $MAGIC_CMD in
-+  /*)
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-+  ;;
-+  ?:/*)
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-+  ;;
-+  *)
-+  ac_save_MAGIC_CMD="$MAGIC_CMD"
-+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="/usr/bin:$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/${ac_tool_prefix}file; then
-+      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-+      if test -n "$file_magic_test_file"; then
-+	case $deplibs_check_method in
-+	"file_magic "*)
-+	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-+	    egrep "$file_magic_regex" > /dev/null; then
-+	    :
-+	  else
-+	    cat <<EOF 1>&2
-+
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such.  This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem.  Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool@gnu.org
-+
-+EOF
-+	  fi ;;
-+	esac
-+      fi
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  MAGIC_CMD="$ac_save_MAGIC_CMD"
-+  ;;
-+esac
-+fi
-+
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
-+  echo "$ac_t""$MAGIC_CMD" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+if test -z "$lt_cv_path_MAGIC_CMD"; then
-+  if test -n "$ac_tool_prefix"; then
-+    echo $ac_n "checking for file""... $ac_c" 1>&6
-+echo "configure:2268: checking for file" >&5
-+if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  case $MAGIC_CMD in
-+  /*)
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-+  ;;
-+  ?:/*)
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-+  ;;
-+  *)
-+  ac_save_MAGIC_CMD="$MAGIC_CMD"
-+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="/usr/bin:$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/file; then
-+      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-+      if test -n "$file_magic_test_file"; then
-+	case $deplibs_check_method in
-+	"file_magic "*)
-+	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-+	    egrep "$file_magic_regex" > /dev/null; then
-+	    :
-+	  else
-+	    cat <<EOF 1>&2
-+
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such.  This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem.  Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool@gnu.org
-+
-+EOF
-+	  fi ;;
-+	esac
-+      fi
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  MAGIC_CMD="$ac_save_MAGIC_CMD"
-+  ;;
-+esac
-+fi
-+
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
-+  echo "$ac_t""$MAGIC_CMD" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+  else
-+    MAGIC_CMD=:
-+  fi
-+fi
-+
-+  fi
-+  ;;
-+esac
-+
-+# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:2339: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$RANLIB"; then
-+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+fi
-+fi
-+RANLIB="$ac_cv_prog_RANLIB"
-+if test -n "$RANLIB"; then
-+  echo "$ac_t""$RANLIB" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+
-+if test -z "$ac_cv_prog_RANLIB"; then
-+if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "ranlib", so it can be a program name with args.
-+set dummy ranlib; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:2371: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$RANLIB"; then
-+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_prog_RANLIB="ranlib"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-+fi
-+fi
-+RANLIB="$ac_cv_prog_RANLIB"
-+if test -n "$RANLIB"; then
-+  echo "$ac_t""$RANLIB" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+else
-+  RANLIB=":"
-+fi
-+fi
-+
-+# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}strip; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:2406: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$STRIP"; then
-+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+fi
-+fi
-+STRIP="$ac_cv_prog_STRIP"
-+if test -n "$STRIP"; then
-+  echo "$ac_t""$STRIP" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+
-+if test -z "$ac_cv_prog_STRIP"; then
-+if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "strip", so it can be a program name with args.
-+set dummy strip; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:2438: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$STRIP"; then
-+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_prog_STRIP="strip"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":"
-+fi
-+fi
-+STRIP="$ac_cv_prog_STRIP"
-+if test -n "$STRIP"; then
-+  echo "$ac_t""$STRIP" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+else
-+  STRIP=":"
-+fi
-+fi
-+
-+
-+enable_dlopen=no
-+enable_win32_dll=no
-+
-+# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
-+if test "${enable_libtool_lock+set}" = set; then
-+  enableval="$enable_libtool_lock"
-+  :
-+fi
-+
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-+
-+# Some flags need to be propagated to the compiler or linker for good
-+# libtool support.
-+case $host in
-+*-*-irix6*)
-+  # Find out which ABI we are using.
-+  echo '#line 2487 "configure"' > conftest.$ac_ext
-+  if { (eval echo configure:2488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+    case `/usr/bin/file conftest.$ac_objext` in
-+    *32-bit*)
-+      LD="${LD-ld} -32"
-+      ;;
-+    *N32*)
-+      LD="${LD-ld} -n32"
-+      ;;
-+    *64-bit*)
-+      LD="${LD-ld} -64"
-+      ;;
-+    esac
-+  fi
-+  rm -rf conftest*
-+  ;;
-+
-+*-*-sco3.2v5*)
-+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-+  SAVE_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -belf"
-+  echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-+echo "configure:2509: checking whether the C compiler needs -belf" >&5
-+if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  
-+     ac_ext=c
-+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cc_cross
-+
-+     cat > conftest.$ac_ext <<EOF
-+#line 2522 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:2529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  lt_cv_cc_needs_belf=yes
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  lt_cv_cc_needs_belf=no
-+fi
-+rm -f conftest*
-+     ac_ext=c
-+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cc_cross
-+
-+fi
-+
-+echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
-+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-+    CFLAGS="$SAVE_CFLAGS"
-+  fi
-+  ;;
-+
-+
-+esac
-+
-+# Sed substitution that helps us do robust quoting.  It backslashifies
-+# metacharacters that are still active within double-quoted strings.
-+Xsed='sed -e s/^X//'
-+sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
-+
-+# Same as above, but do not quote variable references.
-+double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
-+
-+# Sed substitution to delay expansion of an escaped shell variable in a
-+# double_quote_subst'ed string.
-+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-+
-+# Constants:
-+rm="rm -f"
-+
-+# Global variables:
-+default_ofile=libtool
-+can_build_shared=yes
-+
-+# All known linkers require a `.a' archive for static linking (except M$VC,
-+# which needs '.lib').
-+libext=a
-+ltmain="$ac_aux_dir/ltmain.sh"
-+ofile="$default_ofile"
-+with_gnu_ld="$lt_cv_prog_gnu_ld"
-+need_locks="$enable_libtool_lock"
-+
-+old_CC="$CC"
-+old_CFLAGS="$CFLAGS"
-+
-+# Set sane defaults for various variables
-+test -z "$AR" && AR=ar
-+test -z "$AR_FLAGS" && AR_FLAGS=cru
-+test -z "$AS" && AS=as
-+test -z "$CC" && CC=cc
-+test -z "$DLLTOOL" && DLLTOOL=dlltool
-+test -z "$LD" && LD=ld
-+test -z "$LN_S" && LN_S="ln -s"
-+test -z "$MAGIC_CMD" && MAGIC_CMD=file
-+test -z "$NM" && NM=nm
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+test -z "$RANLIB" && RANLIB=:
-+test -z "$STRIP" && STRIP=:
-+test -z "$ac_objext" && ac_objext=o
-+
-+if test x"$host" != x"$build"; then
-+  ac_tool_prefix=${host_alias}-
-+else
-+  ac_tool_prefix=
-+fi
-+
-+# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
-+case $host_os in
-+linux-gnu*) ;;
-+linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
-+esac
-+
-+case $host_os in
-+aix3*)
-+  # AIX sometimes has problems with the GCC collect2 program.  For some
-+  # reason, if we set the COLLECT_NAMES environment variable, the problems
-+  # vanish in a puff of smoke.
-+  if test "X${COLLECT_NAMES+set}" != Xset; then
-+    COLLECT_NAMES=
-+    export COLLECT_NAMES
-+  fi
-+  ;;
-+esac
-+
-+# Determine commands to create old-style static archives.
-+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-+old_postinstall_cmds='chmod 644 $oldlib'
-+old_postuninstall_cmds=
-+
-+if test -n "$RANLIB"; then
-+  case $host_os in
-+  openbsd*)
-+    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
-+    ;;
-+  *)
-+    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-+    ;;
-+  esac
-+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-+fi
-+
-+# Allow CC to be a program name with arguments.
-+set dummy $CC
-+compiler="$2"
-+
-+echo $ac_n "checking for objdir""... $ac_c" 1>&6
-+echo "configure:2649: checking for objdir" >&5
-+rm -f .libs 2>/dev/null
-+mkdir .libs 2>/dev/null
-+if test -d .libs; then
-+  objdir=.libs
-+else
-+  # MS-DOS does not allow filenames that begin with a dot.
-+  objdir=_libs
-+fi
-+rmdir .libs 2>/dev/null
-+echo "$ac_t""$objdir" 1>&6
-+
-+
-+# Check whether --with-pic or --without-pic was given.
-+if test "${with_pic+set}" = set; then
-+  withval="$with_pic"
-+  pic_mode="$withval"
-+else
-+  pic_mode=default
-+fi
-+
-+test -z "$pic_mode" && pic_mode=default
-+
-+# We assume here that the value for lt_cv_prog_cc_pic will not be cached
-+# in isolation, and that seeing it set (from the cache) indicates that
-+# the associated values are set (in the cache) correctly too.
-+echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
-+echo "configure:2676: checking for $compiler option to produce PIC" >&5
-+if eval "test \"`echo '$''{'lt_cv_prog_cc_pic'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+   lt_cv_prog_cc_pic=
-+  lt_cv_prog_cc_shlib=
-+  lt_cv_prog_cc_wl=
-+  lt_cv_prog_cc_static=
-+  lt_cv_prog_cc_no_builtin=
-+  lt_cv_prog_cc_can_build_shared=$can_build_shared
-+
-+  if test "$GCC" = yes; then
-+    lt_cv_prog_cc_wl='-Wl,'
-+    lt_cv_prog_cc_static='-static'
-+
-+    case $host_os in
-+    aix*)
-+      # Below there is a dirty hack to force normal static linking with -ldl
-+      # The problem is because libdl dynamically linked with both libc and
-+      # libC (AIX C++ library), which obviously doesn't included in libraries
-+      # list by gcc. This cause undefined symbols with -static flags.
-+      # This hack allows C programs to be linked with "-static -ldl", but
-+      # not sure about C++ programs.
-+      lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC"
-+      ;;
-+    amigaos*)
-+      # FIXME: we need at least 68020 code to build shared libraries, but
-+      # adding the `-m68020' flag to GCC prevents building anything better,
-+      # like `-m68040'.
-+      lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
-+      ;;
-+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+      # PIC is the default for these OSes.
-+      ;;
-+    darwin* | rhapsody*)
-+      # PIC is the default on this platform
-+      # Common symbols not allowed in MH_DYLIB files
-+      lt_cv_prog_cc_pic='-fno-common'
-+      ;;
-+    cygwin* | mingw* | pw32* | os2*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      lt_cv_prog_cc_pic='-DDLL_EXPORT'
-+      ;;
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	 lt_cv_prog_cc_pic=-Kconform_pic
-+      fi
-+      ;;
-+    *)
-+      lt_cv_prog_cc_pic='-fPIC'
-+      ;;
-+    esac
-+  else
-+    # PORTME Check for PIC flags for the system compiler.
-+    case $host_os in
-+    aix3* | aix4* | aix5*)
-+      lt_cv_prog_cc_wl='-Wl,'
-+      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	lt_cv_prog_cc_static='-Bstatic'
-+      else
-+	lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
-+      fi
-+      ;;
-+
-+    hpux9* | hpux10* | hpux11*)
-+      # Is there a better lt_cv_prog_cc_static that works with the bundled CC?
-+      lt_cv_prog_cc_wl='-Wl,'
-+      lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive"
-+      lt_cv_prog_cc_pic='+Z'
-+      ;;
-+
-+    irix5* | irix6* | nonstopux*)
-+      lt_cv_prog_cc_wl='-Wl,'
-+      lt_cv_prog_cc_static='-non_shared'
-+      # PIC (with -KPIC) is the default.
-+      ;;
-+
-+    cygwin* | mingw* | pw32* | os2*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      lt_cv_prog_cc_pic='-DDLL_EXPORT'
-+      ;;
-+
-+    newsos6)
-+      lt_cv_prog_cc_pic='-KPIC'
-+      lt_cv_prog_cc_static='-Bstatic'
-+      ;;
-+
-+    osf3* | osf4* | osf5*)
-+      # All OSF/1 code is PIC.
-+      lt_cv_prog_cc_wl='-Wl,'
-+      lt_cv_prog_cc_static='-non_shared'
-+      ;;
-+
-+    sco3.2v5*)
-+      lt_cv_prog_cc_pic='-Kpic'
-+      lt_cv_prog_cc_static='-dn'
-+      lt_cv_prog_cc_shlib='-belf'
-+      ;;
-+
-+    solaris*)
-+      lt_cv_prog_cc_pic='-KPIC'
-+      lt_cv_prog_cc_static='-Bstatic'
-+      lt_cv_prog_cc_wl='-Wl,'
-+      ;;
-+
-+    sunos4*)
-+      lt_cv_prog_cc_pic='-PIC'
-+      lt_cv_prog_cc_static='-Bstatic'
-+      lt_cv_prog_cc_wl='-Qoption ld '
-+      ;;
-+
-+    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+      lt_cv_prog_cc_pic='-KPIC'
-+      lt_cv_prog_cc_static='-Bstatic'
-+      lt_cv_prog_cc_wl='-Wl,'
-+      ;;
-+
-+    uts4*)
-+      lt_cv_prog_cc_pic='-pic'
-+      lt_cv_prog_cc_static='-Bstatic'
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec ;then
-+	lt_cv_prog_cc_pic='-Kconform_pic'
-+	lt_cv_prog_cc_static='-Bstatic'
-+      fi
-+      ;;
-+
-+    *)
-+      lt_cv_prog_cc_can_build_shared=no
-+      ;;
-+    esac
-+  fi
-+
-+fi
-+
-+if test -z "$lt_cv_prog_cc_pic"; then
-+  echo "$ac_t""none" 1>&6
-+else
-+  echo "$ac_t""$lt_cv_prog_cc_pic" 1>&6
-+
-+  # Check to make sure the pic_flag actually works.
-+  echo $ac_n "checking if $compiler PIC flag $lt_cv_prog_cc_pic works""... $ac_c" 1>&6
-+echo "configure:2824: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
-+  if eval "test \"`echo '$''{'lt_cv_prog_cc_pic_works'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+      save_CFLAGS="$CFLAGS"
-+    CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
-+    cat > conftest.$ac_ext <<EOF
-+#line 2831 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:2838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  rm -rf conftest*
-+        case $host_os in
-+      hpux9* | hpux10* | hpux11*)
-+	# On HP-UX, both CC and GCC only warn that PIC is supported... then
-+	# they create non-PIC objects.  So, if there were any warnings, we
-+	# assume that PIC is not supported.
-+	if test -s conftest.err; then
-+	  lt_cv_prog_cc_pic_works=no
-+	else
-+	  lt_cv_prog_cc_pic_works=yes
-+	fi
-+	;;
-+      *)
-+	lt_cv_prog_cc_pic_works=yes
-+	;;
-+      esac
-+    
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+        lt_cv_prog_cc_pic_works=no
-+    
-+fi
-+rm -f conftest*
-+    CFLAGS="$save_CFLAGS"
-+  
-+fi
-+
-+
-+  if test "X$lt_cv_prog_cc_pic_works" = Xno; then
-+    lt_cv_prog_cc_pic=
-+    lt_cv_prog_cc_can_build_shared=no
-+  else
-+    lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic"
-+  fi
-+
-+  echo "$ac_t""$lt_cv_prog_cc_pic_works" 1>&6
-+fi
-+
-+# Check for any special shared library compilation flags.
-+if test -n "$lt_cv_prog_cc_shlib"; then
-+  echo "configure: warning: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" 1>&2
-+  if echo "$old_CC $old_CFLAGS " | egrep -e "[ 	]$lt_cv_prog_cc_shlib[ 	]" >/dev/null; then :
-+  else
-+   echo "configure: warning: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" 1>&2
-+    lt_cv_prog_cc_can_build_shared=no
-+  fi
-+fi
-+
-+echo $ac_n "checking if $compiler static flag $lt_cv_prog_cc_static works""... $ac_c" 1>&6
-+echo "configure:2890: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
-+if eval "test \"`echo '$''{'lt_cv_prog_cc_static_works'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+    lt_cv_prog_cc_static_works=no
-+  save_LDFLAGS="$LDFLAGS"
-+  LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
-+  cat > conftest.$ac_ext <<EOF
-+#line 2898 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:2905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  lt_cv_prog_cc_static_works=yes
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+fi
-+rm -f conftest*
-+  LDFLAGS="$save_LDFLAGS"
-+
-+fi
-+
-+
-+# Belt *and* braces to stop my trousers falling down:
-+test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static=
-+echo "$ac_t""$lt_cv_prog_cc_static_works" 1>&6
-+
-+pic_flag="$lt_cv_prog_cc_pic"
-+special_shlib_compile_flags="$lt_cv_prog_cc_shlib"
-+wl="$lt_cv_prog_cc_wl"
-+link_static_flag="$lt_cv_prog_cc_static"
-+no_builtin_flag="$lt_cv_prog_cc_no_builtin"
-+can_build_shared="$lt_cv_prog_cc_can_build_shared"
-+
-+
-+# Check to see if options -o and -c are simultaneously supported by compiler
-+echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
-+echo "configure:2932: checking if $compiler supports -c -o file.$ac_objext" >&5
-+if eval "test \"`echo '$''{'lt_cv_compiler_c_o'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  
-+$rm -r conftest 2>/dev/null
-+mkdir conftest
-+cd conftest
-+echo "int some_variable = 0;" > conftest.$ac_ext
-+mkdir out
-+# According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-+# that will create temporary files in the current directory regardless of
-+# the output directory.  Thus, making CWD read-only will cause this test
-+# to fail, enabling locking or at least warning the user not to do parallel
-+# builds.
-+chmod -w .
-+save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
-+compiler_c_o=no
-+if { (eval echo configure:2951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
-+  # The compiler can only warn and ignore the option if not recognized
-+  # So say no if there are warnings
-+  if test -s out/conftest.err; then
-+    lt_cv_compiler_c_o=no
-+  else
-+    lt_cv_compiler_c_o=yes
-+  fi
-+else
-+  # Append any errors to the config.log.
-+  cat out/conftest.err 1>&5
-+  lt_cv_compiler_c_o=no
-+fi
-+CFLAGS="$save_CFLAGS"
-+chmod u+w .
-+$rm conftest* out/*
-+rmdir out
-+cd ..
-+rmdir conftest
-+$rm -r conftest 2>/dev/null
-+
-+fi
-+
-+compiler_c_o=$lt_cv_compiler_c_o
-+echo "$ac_t""$compiler_c_o" 1>&6
-+
-+if test x"$compiler_c_o" = x"yes"; then
-+  # Check to see if we can write to a .lo
-+  echo $ac_n "checking if $compiler supports -c -o file.lo""... $ac_c" 1>&6
-+echo "configure:2980: checking if $compiler supports -c -o file.lo" >&5
-+  if eval "test \"`echo '$''{'lt_cv_compiler_o_lo'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  
-+  lt_cv_compiler_o_lo=no
-+  save_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -c -o conftest.lo"
-+  save_objext="$ac_objext"
-+  ac_objext=lo
-+  cat > conftest.$ac_ext <<EOF
-+#line 2991 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+int some_variable = 0;
-+; return 0; }
-+EOF
-+if { (eval echo configure:2998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  rm -rf conftest*
-+      # The compiler can only warn and ignore the option if not recognized
-+    # So say no if there are warnings
-+    if test -s conftest.err; then
-+      lt_cv_compiler_o_lo=no
-+    else
-+      lt_cv_compiler_o_lo=yes
-+    fi
-+  
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+fi
-+rm -f conftest*
-+  ac_objext="$save_objext"
-+  CFLAGS="$save_CFLAGS"
-+  
-+fi
-+
-+  compiler_o_lo=$lt_cv_compiler_o_lo
-+  echo "$ac_t""$compiler_o_lo" 1>&6
-+else
-+  compiler_o_lo=no
-+fi
-+
-+# Check to see if we can do hard links to lock some files if needed
-+hard_links="nottested"
-+if test "$compiler_c_o" = no && test "$need_locks" != no; then
-+  # do not overwrite the value of need_locks provided by the user
-+  echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6
-+echo "configure:3029: checking if we can lock with hard links" >&5
-+  hard_links=yes
-+  $rm conftest*
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  touch conftest.a
-+  ln conftest.a conftest.b 2>&5 || hard_links=no
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  echo "$ac_t""$hard_links" 1>&6
-+  if test "$hard_links" = no; then
-+    echo "configure: warning: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" 1>&2
-+    need_locks=warn
-+  fi
-+else
-+  need_locks=no
-+fi
-+
-+if test "$GCC" = yes; then
-+  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
-+  echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6
-+echo "configure:3048: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-+  echo "int some_variable = 0;" > conftest.$ac_ext
-+  save_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
-+  compiler_rtti_exceptions=no
-+  cat > conftest.$ac_ext <<EOF
-+#line 3054 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+int some_variable = 0;
-+; return 0; }
-+EOF
-+if { (eval echo configure:3061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  rm -rf conftest*
-+      # The compiler can only warn and ignore the option if not recognized
-+    # So say no if there are warnings
-+    if test -s conftest.err; then
-+      compiler_rtti_exceptions=no
-+    else
-+      compiler_rtti_exceptions=yes
-+    fi
-+  
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+fi
-+rm -f conftest*
-+  CFLAGS="$save_CFLAGS"
-+  echo "$ac_t""$compiler_rtti_exceptions" 1>&6
-+
-+  if test "$compiler_rtti_exceptions" = "yes"; then
-+    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
-+  else
-+    no_builtin_flag=' -fno-builtin'
-+  fi
-+fi
-+
-+# See if the linker supports building shared libraries.
-+echo $ac_n "checking whether the linker ($LD) supports shared libraries""... $ac_c" 1>&6
-+echo "configure:3088: checking whether the linker ($LD) supports shared libraries" >&5
-+
-+allow_undefined_flag=
-+no_undefined_flag=
-+need_lib_prefix=unknown
-+need_version=unknown
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+archive_cmds=
-+archive_expsym_cmds=
-+old_archive_from_new_cmds=
-+old_archive_from_expsyms_cmds=
-+export_dynamic_flag_spec=
-+whole_archive_flag_spec=
-+thread_safe_flag_spec=
-+hardcode_into_libs=no
-+hardcode_libdir_flag_spec=
-+hardcode_libdir_separator=
-+hardcode_direct=no
-+hardcode_minus_L=no
-+hardcode_shlibpath_var=unsupported
-+runpath_var=
-+link_all_deplibs=unknown
-+always_export_symbols=no
-+export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+# include_expsyms should be a list of space-separated symbols to be *always*
-+# included in the symbol list
-+include_expsyms=
-+# exclude_expsyms can be an egrep regular expression of symbols to exclude
-+# it will be wrapped by ` (' and `)$', so one must not match beginning or
-+# end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-+# as well as any symbol that contains `d'.
-+exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
-+# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-+# platforms (ab)use it in PIC code, but their linkers get confused if
-+# the symbol is explicitly referenced.  Since portable code cannot
-+# rely on this symbol name, it's probably fine to never include it in
-+# preloaded symbol tables.
-+extract_expsyms_cmds=
-+
-+case $host_os in
-+cygwin* | mingw* | pw32*)
-+  # FIXME: the MSVC++ port hasn't been tested in a loooong time
-+  # When not using gcc, we currently assume that we are using
-+  # Microsoft Visual C++.
-+  if test "$GCC" != yes; then
-+    with_gnu_ld=no
-+  fi
-+  ;;
-+openbsd*)
-+  with_gnu_ld=no
-+  ;;
-+esac
-+
-+ld_shlibs=yes
-+if test "$with_gnu_ld" = yes; then
-+  # If archive_cmds runs LD, not CC, wlarc should be empty
-+  wlarc='${wl}'
-+
-+  # See if GNU ld supports shared libraries.
-+  case $host_os in
-+  aix3* | aix4* | aix5*)
-+    # On AIX, the GNU linker is very broken
-+    # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available.
-+    ld_shlibs=no
-+    cat <<EOF 1>&2
-+
-+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-+*** to be unable to reliably create shared libraries on AIX.
-+*** Therefore, libtool is disabling shared libraries support.  If you
-+*** really care for shared libraries, you may want to modify your PATH
-+*** so that a non-GNU linker is found, and then restart.
-+
-+EOF
-+    ;;
-+
-+  amigaos*)
-+    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_minus_L=yes
-+
-+    # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-+    # that the semantics of dynamic libraries on AmigaOS, at least up
-+    # to version 4, is to share data among multiple programs linked
-+    # with the same dynamic library.  Since this doesn't match the
-+    # behavior of shared libraries on other platforms, we can use
-+    # them.
-+    ld_shlibs=no
-+    ;;
-+
-+  beos*)
-+    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-+      allow_undefined_flag=unsupported
-+      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-+      # support --undefined.  This deserves some investigation.  FIXME
-+      archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+    else
-+      ld_shlibs=no
-+    fi
-+    ;;
-+
-+  cygwin* | mingw* | pw32*)
-+    # hardcode_libdir_flag_spec is actually meaningless, as there is
-+    # no search path for DLLs.
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    allow_undefined_flag=unsupported
-+    always_export_symbols=yes
-+
-+    extract_expsyms_cmds='test -f $output_objdir/impgen.c || \
-+      sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~
-+      test -f $output_objdir/impgen.exe || (cd $output_objdir && \
-+      if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
-+      else $CC -o impgen impgen.c ; fi)~
-+      $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
-+
-+    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
-+
-+    # cygwin and mingw dlls have different entry points and sets of symbols
-+    # to exclude.
-+    # FIXME: what about values for MSVC?
-+    dll_entry=__cygwin_dll_entry@12
-+    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~
-+    case $host_os in
-+    mingw*)
-+      # mingw values
-+      dll_entry=_DllMainCRTStartup@12
-+      dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~
-+      ;;
-+    esac
-+
-+    # mingw and cygwin differ, and it's simplest to just exclude the union
-+    # of the two symbol sets.
-+    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12
-+
-+    # recent cygwin and mingw systems supply a stub DllMain which the user
-+    # can override, but on older systems we have to supply one (in ltdll.c)
-+    if test "x$lt_cv_need_dllmain" = "xyes"; then
-+      ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
-+      ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~
-+	test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
-+    else
-+      ltdll_obj=
-+      ltdll_cmds=
-+    fi
-+
-+    # Extract the symbol export list from an `--export-all' def file,
-+    # then regenerate the def file from the symbol export list, so that
-+    # the compiled dll only exports the symbol export list.
-+    # Be careful not to strip the DATA tag left be newer dlltools.
-+    export_symbols_cmds="$ltdll_cmds"'
-+      $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
-+      sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols'
-+
-+    # If the export-symbols file already is a .def file (1st line
-+    # is EXPORTS), use it as is.
-+    # If DATA tags from a recent dlltool are present, honour them!
-+    archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then
-+	cp $export_symbols $output_objdir/$soname-def;
-+      else
-+	echo EXPORTS > $output_objdir/$soname-def;
-+	_lt_hint=1;
-+	cat $export_symbols | while read symbol; do
-+	 set dummy \$symbol;
-+	 case \$# in
-+	   2) echo "   \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
-+	   4) echo "   \$2 \$3 \$4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;;
-+	   *) echo "     \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;;
-+	 esac;
-+	 _lt_hint=`expr 1 + \$_lt_hint`;
-+	done;
-+      fi~
-+      '"$ltdll_cmds"'
-+      $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
-+      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~
-+      $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
-+      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~
-+      $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
-+    ;;
-+
-+  netbsd*)
-+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+      archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-+      wlarc=
-+    else
-+      archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+    fi
-+    ;;
-+
-+  solaris* | sysv5*)
-+    if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
-+      ld_shlibs=no
-+      cat <<EOF 1>&2
-+
-+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-+*** create shared libraries on Solaris systems.  Therefore, libtool
-+*** is disabling shared libraries support.  We urge you to upgrade GNU
-+*** binutils to release 2.9.1 or newer.  Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
-+
-+EOF
-+    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+    else
-+      ld_shlibs=no
-+    fi
-+    ;;
-+
-+  sunos4*)
-+    archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+    wlarc=
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  *)
-+    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+    else
-+      ld_shlibs=no
-+    fi
-+    ;;
-+  esac
-+
-+  if test "$ld_shlibs" = yes; then
-+    runpath_var=LD_RUN_PATH
-+    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-+    export_dynamic_flag_spec='${wl}--export-dynamic'
-+    case $host_os in
-+    cygwin* | mingw* | pw32*)
-+      # dlltool doesn't understand --whole-archive et. al.
-+      whole_archive_flag_spec=
-+      ;;
-+    *)
-+      # ancient GNU ld didn't support --whole-archive et. al.
-+      if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
-+	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      else
-+	whole_archive_flag_spec=
-+      fi
-+      ;;
-+    esac
-+  fi
-+else
-+  # PORTME fill in a description of your system's linker (not GNU ld)
-+  case $host_os in
-+  aix3*)
-+    allow_undefined_flag=unsupported
-+    always_export_symbols=yes
-+    archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-+    # Note: this linker hardcodes the directories in LIBPATH if there
-+    # are no directories specified by -L.
-+    hardcode_minus_L=yes
-+    if test "$GCC" = yes && test -z "$link_static_flag"; then
-+      # Neither direct hardcoding nor static linking is supported with a
-+      # broken collect2.
-+      hardcode_direct=unsupported
-+    fi
-+    ;;
-+
-+  aix4* | aix5*)
-+    if test "$host_cpu" = ia64; then
-+      # On IA64, the linker does run time linking by default, so we don't
-+      # have to do anything special.
-+      aix_use_runtimelinking=no
-+      exp_sym_flag='-Bexport'
-+      no_entry_flag=""
-+    else
-+      aix_use_runtimelinking=no
-+
-+      # Test if we are trying to use run time linking or normal
-+      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+      # need to do runtime linking.
-+      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-+	for ld_flag in $LDFLAGS; do
-+	  case $ld_flag in
-+	  *-brtl*)
-+	    aix_use_runtimelinking=yes
-+	    break
-+	  ;;
-+	  esac
-+	done
-+      esac
-+
-+      exp_sym_flag='-bexport'
-+      no_entry_flag='-bnoentry'
-+    fi
-+
-+    # When large executables or shared objects are built, AIX ld can
-+    # have problems creating the table of contents.  If linking a library
-+    # or program results in "error TOC overflow" add -mminimal-toc to
-+    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-+    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+
-+    hardcode_direct=yes
-+    archive_cmds=''
-+    hardcode_libdir_separator=':'
-+    if test "$GCC" = yes; then
-+      case $host_os in aix4.[012]|aix4.[012].*)
-+	collect2name=`${CC} -print-prog-name=collect2`
-+	if test -f "$collect2name" && \
-+	  strings "$collect2name" | grep resolve_lib_name >/dev/null
-+	then
-+	  # We have reworked collect2
-+	  hardcode_direct=yes
-+	else
-+	  # We have old collect2
-+	  hardcode_direct=unsupported
-+	  # It fails to find uninstalled libraries when the uninstalled
-+	  # path is not listed in the libpath.  Setting hardcode_minus_L
-+	  # to unsupported forces relinking
-+	  hardcode_minus_L=yes
-+	  hardcode_libdir_flag_spec='-L$libdir'
-+	  hardcode_libdir_separator=
-+	fi
-+      esac
-+
-+      shared_flag='-shared'
-+    else
-+      # not using gcc
-+      if test "$host_cpu" = ia64; then
-+	shared_flag='${wl}-G'
-+      else
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag='${wl}-G'
-+	else
-+	  shared_flag='${wl}-bM:SRE'
-+	fi
-+      fi
-+    fi
-+
-+    # It seems that -bexpall can do strange things, so it is better to
-+    # generate a list of symbols to export.
-+    always_export_symbols=yes
-+    if test "$aix_use_runtimelinking" = yes; then
-+      # Warning - without using the other runtime loading flags (-brtl),
-+      # -berok will link without error, but may produce a broken library.
-+      allow_undefined_flag='-berok'
-+      hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
-+      archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+    else
-+      if test "$host_cpu" = ia64; then
-+	hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-+	allow_undefined_flag="-z nodefs"
-+	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+      else
-+	hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
-+	# Warning - without using the other run time loading flags,
-+	# -berok will link without error, but may produce a broken library.
-+	allow_undefined_flag='${wl}-berok'
-+	# This is a bit strange, but is similar to how AIX traditionally builds
-+	# it's shared libraries.
-+	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname'
-+      fi
-+    fi
-+    ;;
-+
-+  amigaos*)
-+    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_minus_L=yes
-+    # see comment about different semantics on the GNU ld section
-+    ld_shlibs=no
-+    ;;
-+
-+  cygwin* | mingw* | pw32*)
-+    # When not using gcc, we currently assume that we are using
-+    # Microsoft Visual C++.
-+    # hardcode_libdir_flag_spec is actually meaningless, as there is
-+    # no search path for DLLs.
-+    hardcode_libdir_flag_spec=' '
-+    allow_undefined_flag=unsupported
-+    # Tell ltmain to make .lib files, not .a files.
-+    libext=lib
-+    # FIXME: Setting linknames here is a bad hack.
-+    archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-+    # The linker will automatically build a .lib file if we build a DLL.
-+    old_archive_from_new_cmds='true'
-+    # FIXME: Should let the user specify the lib program.
-+    old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+    fix_srcfile_path='`cygpath -w "$srcfile"`'
-+    ;;
-+
-+  darwin* | rhapsody*)
-+    case "$host_os" in
-+    rhapsody* | darwin1.[012])
-+      allow_undefined_flag='-undefined suppress'
-+      ;;
-+    *) # Darwin 1.3 on
-+      allow_undefined_flag='-flat_namespace -undefined suppress'
-+      ;;
-+    esac
-+    # FIXME: Relying on posixy $() will cause problems for
-+    #        cross-compilation, but unfortunately the echo tests do not
-+    #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
-+    #	     `"' quotes if we put them in here... so don't!
-+    archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
-+    # We need to add '_' to the symbols in $export_symbols first
-+    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    whole_archive_flag_spec='-all_load $convenience'
-+    ;;
-+
-+  freebsd1*)
-+    ld_shlibs=no
-+    ;;
-+
-+  # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-+  # support.  Future versions do this automatically, but an explicit c++rt0.o
-+  # does not break anything, and helps significantly (at the cost of a little
-+  # extra space).
-+  freebsd2.2*)
-+    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-+    hardcode_libdir_flag_spec='-R$libdir'
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+  freebsd2*)
-+    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_direct=yes
-+    hardcode_minus_L=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+  freebsd*)
-+    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+    hardcode_libdir_flag_spec='-R$libdir'
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  hpux9* | hpux10* | hpux11*)
-+    case $host_os in
-+    hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
-+    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;;
-+    esac
-+    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+    hardcode_libdir_separator=:
-+    hardcode_direct=yes
-+    hardcode_minus_L=yes # Not in the search PATH, but as the default
-+			 # location of the library.
-+    export_dynamic_flag_spec='${wl}-E'
-+    ;;
-+
-+  irix5* | irix6* | nonstopux*)
-+    if test "$GCC" = yes; then
-+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    else
-+      archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+      hardcode_libdir_flag_spec='-rpath $libdir'
-+    fi
-+    hardcode_libdir_separator=:
-+    link_all_deplibs=yes
-+    ;;
-+
-+  netbsd*)
-+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-+    else
-+      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-+    fi
-+    hardcode_libdir_flag_spec='-R$libdir'
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  newsos6)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_direct=yes
-+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    hardcode_libdir_separator=:
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  openbsd*)
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+      export_dynamic_flag_spec='${wl}-E'
-+    else
-+      case "$host_os" in
-+      openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+	hardcode_libdir_flag_spec='-R$libdir'
-+        ;;
-+      *)
-+        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+        ;;
-+      esac
-+    fi
-+    ;;
-+
-+  os2*)
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_minus_L=yes
-+    allow_undefined_flag=unsupported
-+    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+    old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-+    ;;
-+
-+  osf3*)
-+    if test "$GCC" = yes; then
-+      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-+      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+    else
-+      allow_undefined_flag=' -expect_unresolved \*'
-+      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+    fi
-+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    hardcode_libdir_separator=:
-+    ;;
-+
-+  osf4* | osf5*)	# as osf3* with the addition of -msym flag
-+    if test "$GCC" = yes; then
-+      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-+      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    else
-+      allow_undefined_flag=' -expect_unresolved \*'
-+      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+      archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-+      $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-+
-+      #Both c and cxx compiler support -rpath directly
-+      hardcode_libdir_flag_spec='-rpath $libdir'
-+    fi
-+    hardcode_libdir_separator=:
-+    ;;
-+
-+  sco3.2v5*)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_shlibpath_var=no
-+    runpath_var=LD_RUN_PATH
-+    hardcode_runpath_var=yes
-+    export_dynamic_flag_spec='${wl}-Bexport'
-+    ;;
-+
-+  solaris*)
-+    # gcc --version < 3.0 without binutils cannot create self contained
-+    # shared libraries reliably, requiring libgcc.a to resolve some of
-+    # the object symbols generated in some cases.  Libraries that use
-+    # assert need libgcc.a to resolve __eprintf, for example.  Linking
-+    # a copy of libgcc.a into every shared library to guarantee resolving
-+    # such symbols causes other problems:  According to Tim Van Holder
-+    # <tim.van.holder@pandora.be>, C++ libraries end up with a separate
-+    # (to the application) exception stack for one thing.
-+    no_undefined_flag=' -z defs'
-+    if test "$GCC" = yes; then
-+      case `$CC --version 2>/dev/null` in
-+      [12].*)
-+	cat <<EOF 1>&2
-+
-+*** Warning: Releases of GCC earlier than version 3.0 cannot reliably
-+*** create self contained shared libraries on Solaris systems, without
-+*** introducing a dependency on libgcc.a.  Therefore, libtool is disabling
-+*** -no-undefined support, which will at least allow you to build shared
-+*** libraries.  However, you may find that when you link such libraries
-+*** into an application without using GCC, you have to manually add
-+*** \`gcc --print-libgcc-file-name\` to the link command.  We urge you to
-+*** upgrade to a newer version of GCC.  Another option is to rebuild your
-+*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer.
-+
-+EOF
-+        no_undefined_flag=
-+	;;
-+      esac
-+    fi
-+    # $CC -shared without GNU ld will not create a library from C++
-+    # object files and a static libstdc++, better avoid it by now
-+    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-+    hardcode_libdir_flag_spec='-R$libdir'
-+    hardcode_shlibpath_var=no
-+    case $host_os in
-+    solaris2.[0-5] | solaris2.[0-5].*) ;;
-+    *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-+      whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
-+    esac
-+    link_all_deplibs=yes
-+    ;;
-+
-+  sunos4*)
-+    if test "x$host_vendor" = xsequent; then
-+      # Use $CC to link under sequent, because it throws in some extra .o
-+      # files that make .init and .fini sections work.
-+      archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+    else
-+      archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-+    fi
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_direct=yes
-+    hardcode_minus_L=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  sysv4)
-+    case $host_vendor in
-+      sni)
-+        archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+        hardcode_direct=yes # is this really true???
-+        ;;
-+      siemens)
-+        ## LD is ld it makes a PLAMLIB
-+        ## CC just makes a GrossModule.
-+        archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+        reload_cmds='$CC -r -o $output$reload_objs'
-+        hardcode_direct=no
-+        ;;
-+      motorola)
-+        archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+        hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-+        ;;
-+    esac
-+    runpath_var='LD_RUN_PATH'
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  sysv4.3*)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_shlibpath_var=no
-+    export_dynamic_flag_spec='-Bexport'
-+    ;;
-+
-+  sysv5*)
-+    no_undefined_flag=' -z text'
-+    # $CC -shared without GNU ld will not create a library from C++
-+    # object files and a static libstdc++, better avoid it by now
-+    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-+    hardcode_libdir_flag_spec=
-+    hardcode_shlibpath_var=no
-+    runpath_var='LD_RUN_PATH'
-+    ;;
-+
-+  uts4*)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  dgux*)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  sysv4*MP*)
-+    if test -d /usr/nec; then
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_shlibpath_var=no
-+      runpath_var=LD_RUN_PATH
-+      hardcode_runpath_var=yes
-+      ld_shlibs=yes
-+    fi
-+    ;;
-+
-+  sysv4.2uw2*)
-+    archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_direct=yes
-+    hardcode_minus_L=no
-+    hardcode_shlibpath_var=no
-+    hardcode_runpath_var=yes
-+    runpath_var=LD_RUN_PATH
-+    ;;
-+
-+  sysv5uw7* | unixware7*)
-+    no_undefined_flag='${wl}-z ${wl}text'
-+    if test "$GCC" = yes; then
-+      archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+    else
-+      archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+    fi
-+    runpath_var='LD_RUN_PATH'
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  *)
-+    ld_shlibs=no
-+    ;;
-+  esac
-+fi
-+echo "$ac_t""$ld_shlibs" 1>&6
-+test "$ld_shlibs" = no && can_build_shared=no
-+
-+# Check hardcoding attributes.
-+echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
-+echo "configure:3787: checking how to hardcode library paths into programs" >&5
-+hardcode_action=
-+if test -n "$hardcode_libdir_flag_spec" || \
-+   test -n "$runpath_var"; then
-+
-+  # We can hardcode non-existant directories.
-+  if test "$hardcode_direct" != no &&
-+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-+     # have to relink, otherwise we might link with an installed library
-+     # when we should be linking with a yet-to-be-installed one
-+     ## test "$hardcode_shlibpath_var" != no &&
-+     test "$hardcode_minus_L" != no; then
-+    # Linking always hardcodes the temporary library directory.
-+    hardcode_action=relink
-+  else
-+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+    hardcode_action=immediate
-+  fi
-+else
-+  # We cannot hardcode anything, or else we can only hardcode existing
-+  # directories.
-+  hardcode_action=unsupported
-+fi
-+echo "$ac_t""$hardcode_action" 1>&6
-+
-+striplib=
-+old_striplib=
-+echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6
-+echo "configure:3815: checking whether stripping libraries is possible" >&5
-+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-+  echo "$ac_t""yes" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+test -z "$deplibs_check_method" && deplibs_check_method=unknown
-+
-+# PORTME Fill in your ld.so characteristics
-+echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
-+echo "configure:3829: checking dynamic linker characteristics" >&5
-+library_names_spec=
-+libname_spec='lib$name'
-+soname_spec=
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+
-+case $host_os in
-+aix3*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}.so$versuffix $libname.a'
-+  shlibpath_var=LIBPATH
-+
-+  # AIX has no versioning support, so we append a major version to the name.
-+  soname_spec='${libname}${release}.so$major'
-+  ;;
-+
-+aix4* | aix5*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  hardcode_into_libs=yes
-+  if test "$host_cpu" = ia64; then
-+    # AIX 5 supports IA64
-+    library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  else
-+    # With GCC up to 2.95.x, collect2 would create an import file
-+    # for dependence libraries.  The import file would start with
-+    # the line `#! .'.  This would cause the generated library to
-+    # depend on `.', always an invalid library.  This was fixed in
-+    # development snapshots of GCC prior to 3.0.
-+    case $host_os in
-+      aix4 | aix4.[01] | aix4.[01].*)
-+	if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-+	     echo ' yes '
-+	     echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-+	  :
-+	else
-+	  can_build_shared=no
-+	fi
-+	;;
-+    esac
-+    # AIX (on Power*) has no versioning support, so currently we can
-+    # not hardcode correct soname into executable. Probably we can
-+    # add versioning support to collect2, so additional links can
-+    # be useful in future.
-+    if test "$aix_use_runtimelinking" = yes; then
-+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-+      # instead of lib<name>.a to let people know that these are not
-+      # typical AIX shared libraries.
-+      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+    else
-+      # We preserve .a as extension for shared libraries through AIX4.2
-+      # and later when we are not doing run time linking.
-+      library_names_spec='${libname}${release}.a $libname.a'
-+      soname_spec='${libname}${release}.so$major'
-+    fi
-+    shlibpath_var=LIBPATH
-+  fi
-+  hardcode_into_libs=yes
-+  ;;
-+
-+amigaos*)
-+  library_names_spec='$libname.ixlibrary $libname.a'
-+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
-+  ;;
-+
-+beos*)
-+  library_names_spec='${libname}.so'
-+  dynamic_linker="$host_os ld.so"
-+  shlibpath_var=LIBRARY_PATH
-+  ;;
-+
-+bsdi4*)
-+  version_type=linux
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-+  export_dynamic_flag_spec=-rdynamic
-+  # the default ld.so.conf also contains /usr/contrib/lib and
-+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-+  # libtool to hard-code these into programs
-+  ;;
-+
-+cygwin* | mingw* | pw32*)
-+  version_type=windows
-+  need_version=no
-+  need_lib_prefix=no
-+  case $GCC,$host_os in
-+  yes,cygwin*)
-+    library_names_spec='$libname.dll.a'
-+    soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
-+    postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~
-+      dldir=$destdir/`dirname \$dlpath`~
-+      test -d \$dldir || mkdir -p \$dldir~
-+      $install_prog .libs/$dlname \$dldir/$dlname'
-+    postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+      dlpath=$dir/\$dldll~
-+       $rm \$dlpath'
-+    ;;
-+  yes,mingw*)
-+    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
-+    sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"`
-+    ;;
-+  yes,pw32*)
-+    library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll'
-+    ;;
-+  *)
-+    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib'
-+    ;;
-+  esac
-+  dynamic_linker='Win32 ld.exe'
-+  # FIXME: first we should search . and the directory the executable is in
-+  shlibpath_var=PATH
-+  ;;
-+
-+darwin* | rhapsody*)
-+  dynamic_linker="$host_os dyld"
-+  version_type=darwin
-+  need_lib_prefix=no
-+  need_version=no
-+  # FIXME: Relying on posixy $() will cause problems for
-+  #        cross-compilation, but unfortunately the echo tests do not
-+  #        yet detect zsh echo's removal of \ escapes.
-+  library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)'
-+  soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)'
-+  shlibpath_overrides_runpath=yes
-+  shlibpath_var=DYLD_LIBRARY_PATH
-+  ;;
-+
-+freebsd1*)
-+  dynamic_linker=no
-+  ;;
-+
-+freebsd*-gnu*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='GNU/FreeBSD ld.so'
-+  ;;
-+
-+freebsd*)
-+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+  version_type=freebsd-$objformat
-+  case $version_type in
-+    freebsd-elf*)
-+      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
-+      need_version=no
-+      need_lib_prefix=no
-+      ;;
-+    freebsd-*)
-+      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
-+      need_version=yes
-+      ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_os in
-+  freebsd2*)
-+    shlibpath_overrides_runpath=yes
-+    ;;
-+  *)
-+    shlibpath_overrides_runpath=no
-+    hardcode_into_libs=yes
-+    ;;
-+  esac
-+  ;;
-+
-+gnu*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  hardcode_into_libs=yes
-+  ;;
-+
-+hpux9* | hpux10* | hpux11*)
-+  # Give a soname corresponding to the major version so that dld.sl refuses to
-+  # link against other versions.
-+  dynamic_linker="$host_os dld.sl"
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  shlibpath_var=SHLIB_PATH
-+  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
-+  soname_spec='${libname}${release}.sl$major'
-+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-+  postinstall_cmds='chmod 555 $lib'
-+  ;;
-+
-+irix5* | irix6* | nonstopux*)
-+  case $host_os in
-+    nonstopux*) version_type=nonstopux ;;
-+    *)          version_type=irix ;;
-+  esac
-+  need_lib_prefix=no
-+  need_version=no
-+  soname_spec='${libname}${release}.so$major'
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
-+  case $host_os in
-+  irix5* | nonstopux*)
-+    libsuff= shlibsuff=
-+    ;;
-+  *)
-+    case $LD in # libtool.m4 will add one of these switches to LD
-+    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
-+    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
-+    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
-+    *) libsuff= shlibsuff= libmagic=never-match;;
-+    esac
-+    ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-+  shlibpath_overrides_runpath=no
-+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+  ;;
-+
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
-+  dynamic_linker=no
-+  ;;
-+
-+# This must be Linux ELF.
-+linux-gnu*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  # This implies no fast_install, which is unacceptable.
-+  # Some rework will be needed to allow for fast_install
-+  # before this can be enabled.
-+  hardcode_into_libs=yes
-+
-+  # We used to test for /lib/ld.so.1 and disable shared libraries on
-+  # powerpc, because MkLinux only supported shared libraries with the
-+  # GNU dynamic linker.  Since this was broken with cross compilers,
-+  # most powerpc-linux boxes support dynamic linking these days and
-+  # people can always --disable-shared, the test was removed, and we
-+  # assume the GNU/Linux dynamic linker is in use.
-+  dynamic_linker='GNU/Linux ld.so'
-+  ;;
-+
-+netbsd*)
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+    dynamic_linker='NetBSD (a.out) ld.so'
-+  else
-+    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-+    soname_spec='${libname}${release}.so$major'
-+    dynamic_linker='NetBSD ld.elf_so'
-+  fi
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  ;;
-+
-+newsos6)
-+  version_type=linux
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  ;;
-+
-+openbsd*)
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    case "$host_os" in
-+    openbsd2.[89] | openbsd2.[89].*)
-+      shlibpath_overrides_runpath=no
-+      ;;
-+    *)
-+      shlibpath_overrides_runpath=yes
-+      ;;
-+    esac
-+  else
-+    shlibpath_overrides_runpath=yes
-+  fi
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+os2*)
-+  libname_spec='$name'
-+  need_lib_prefix=no
-+  library_names_spec='$libname.dll $libname.a'
-+  dynamic_linker='OS/2 ld.exe'
-+  shlibpath_var=LIBPATH
-+  ;;
-+
-+osf3* | osf4* | osf5*)
-+  version_type=osf
-+  need_version=no
-+  need_lib_prefix=no
-+  soname_spec='${libname}${release}.so$major'
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-+  hardcode_into_libs=yes
-+  ;;
-+
-+sco3.2v5*)
-+  version_type=osf
-+  soname_spec='${libname}${release}.so$major'
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+solaris*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  # ldd complains unless libraries are executable
-+  postinstall_cmds='chmod +x $lib'
-+  ;;
-+
-+sunos4*)
-+  version_type=sunos
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  if test "$with_gnu_ld" = yes; then
-+    need_lib_prefix=no
-+  fi
-+  need_version=yes
-+  ;;
-+
-+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_vendor in
-+    sni)
-+      shlibpath_overrides_runpath=no
-+      need_lib_prefix=no
-+      export_dynamic_flag_spec='${wl}-Blargedynsym'
-+      runpath_var=LD_RUN_PATH
-+      ;;
-+    siemens)
-+      need_lib_prefix=no
-+      ;;
-+    motorola)
-+      need_lib_prefix=no
-+      need_version=no
-+      shlibpath_overrides_runpath=no
-+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-+      ;;
-+  esac
-+  ;;
-+
-+uts4*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+dgux*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+sysv4*MP*)
-+  if test -d /usr/nec ;then
-+    version_type=linux
-+    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
-+    soname_spec='$libname.so.$major'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  fi
-+  ;;
-+
-+*)
-+  dynamic_linker=no
-+  ;;
-+esac
-+echo "$ac_t""$dynamic_linker" 1>&6
-+test "$dynamic_linker" = no && can_build_shared=no
-+
-+# Report the final consequences.
-+echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6
-+echo "configure:4253: checking if libtool supports shared libraries" >&5
-+echo "$ac_t""$can_build_shared" 1>&6
-+
-+echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6
-+echo "configure:4257: checking whether to build shared libraries" >&5
-+test "$can_build_shared" = "no" && enable_shared=no
-+
-+# On AIX, shared libraries and static libraries use the same namespace, and
-+# are all built from PIC.
-+case "$host_os" in
-+aix3*)
-+  test "$enable_shared" = yes && enable_static=no
-+  if test -n "$RANLIB"; then
-+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+    postinstall_cmds='$RANLIB $lib'
-+  fi
-+  ;;
-+
-+aix4*)
-+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+    test "$enable_shared" = yes && enable_static=no
-+  fi
-+  ;;
-+esac
-+echo "$ac_t""$enable_shared" 1>&6
-+
-+echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6
-+echo "configure:4280: checking whether to build static libraries" >&5
-+# Make sure either enable_shared or enable_static is yes.
-+test "$enable_shared" = yes || enable_static=yes
-+echo "$ac_t""$enable_static" 1>&6
-+
-+if test "$hardcode_action" = relink; then
-+  # Fast installation is not supported
-+  enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+     test "$enable_shared" = no; then
-+  # Fast installation is not necessary
-+  enable_fast_install=needless
-+fi
-+
-+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
-+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-+fi
-+
-+if test "x$enable_dlopen" != xyes; then
-+  enable_dlopen=unknown
-+  enable_dlopen_self=unknown
-+  enable_dlopen_self_static=unknown
-+else
-+  lt_cv_dlopen=no
-+  lt_cv_dlopen_libs=
-+
-+  case $host_os in
-+  beos*)
-+    lt_cv_dlopen="load_add_on"
-+    lt_cv_dlopen_libs=
-+    lt_cv_dlopen_self=yes
-+    ;;
-+
-+  cygwin* | mingw* | pw32*)
-+    lt_cv_dlopen="LoadLibrary"
-+    lt_cv_dlopen_libs=
-+   ;;
-+
-+  *)
-+    echo $ac_n "checking for shl_load""... $ac_c" 1>&6
-+echo "configure:4321: checking for shl_load" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 4326 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char shl_load(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char shl_load();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_shl_load) || defined (__stub___shl_load)
-+choke me
-+#else
-+shl_load();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:4349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_shl_load=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_shl_load=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  lt_cv_dlopen="shl_load"
-+else
-+  echo "$ac_t""no" 1>&6
-+echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-+echo "configure:4367: checking for shl_load in -ldld" >&5
-+ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-ldld  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 4375 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char shl_load();
-+
-+int main() {
-+shl_load()
-+; return 0; }
-+EOF
-+if { (eval echo configure:4386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-+else
-+  echo "$ac_t""no" 1>&6
-+echo $ac_n "checking for dlopen""... $ac_c" 1>&6
-+echo "configure:4405: checking for dlopen" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 4410 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char dlopen(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char dlopen();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_dlopen) || defined (__stub___dlopen)
-+choke me
-+#else
-+dlopen();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:4433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_dlopen=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_dlopen=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  lt_cv_dlopen="dlopen"
-+else
-+  echo "$ac_t""no" 1>&6
-+echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-+echo "configure:4451: checking for dlopen in -ldl" >&5
-+ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-ldl  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 4459 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char dlopen();
-+
-+int main() {
-+dlopen()
-+; return 0; }
-+EOF
-+if { (eval echo configure:4470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-+else
-+  echo "$ac_t""no" 1>&6
-+echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
-+echo "configure:4489: checking for dlopen in -lsvld" >&5
-+ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-lsvld  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 4497 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char dlopen();
-+
-+int main() {
-+dlopen()
-+; return 0; }
-+EOF
-+if { (eval echo configure:4508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-+else
-+  echo "$ac_t""no" 1>&6
-+echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
-+echo "configure:4527: checking for dld_link in -ldld" >&5
-+ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-ldld  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 4535 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char dld_link();
-+
-+int main() {
-+dld_link()
-+; return 0; }
-+EOF
-+if { (eval echo configure:4546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+	      
-+fi
-+
-+	    
-+fi
-+
-+	  
-+fi
-+
-+	
-+fi
-+
-+      
-+fi
-+
-+    ;;
-+  esac
-+
-+  if test "x$lt_cv_dlopen" != xno; then
-+    enable_dlopen=yes
-+  else
-+    enable_dlopen=no
-+  fi
-+
-+  case $lt_cv_dlopen in
-+  dlopen)
-+    save_CPPFLAGS="$CPPFLAGS"
-+        test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+
-+    save_LDFLAGS="$LDFLAGS"
-+    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+
-+    save_LIBS="$LIBS"
-+    LIBS="$lt_cv_dlopen_libs $LIBS"
-+
-+    echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
-+echo "configure:4602: checking whether a program can dlopen itself" >&5
-+if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  	  if test "$cross_compiling" = yes; then :
-+  lt_cv_dlopen_self=cross
-+else
-+    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+  lt_status=$lt_dlunknown
-+  cat > conftest.$ac_ext <<EOF
-+#line 4612 "configure"
-+#include "confdefs.h"
-+
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#ifdef RTLD_GLOBAL
-+#  define LT_DLGLOBAL		RTLD_GLOBAL
-+#else
-+#  ifdef DL_GLOBAL
-+#    define LT_DLGLOBAL		DL_GLOBAL
-+#  else
-+#    define LT_DLGLOBAL		0
-+#  endif
-+#endif
-+
-+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-+   find out it does not work in some platform. */
-+#ifndef LT_DLLAZY_OR_NOW
-+#  ifdef RTLD_LAZY
-+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-+#  else
-+#    ifdef DL_LAZY
-+#      define LT_DLLAZY_OR_NOW		DL_LAZY
-+#    else
-+#      ifdef RTLD_NOW
-+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-+#      else
-+#        ifdef DL_NOW
-+#          define LT_DLLAZY_OR_NOW	DL_NOW
-+#        else
-+#          define LT_DLLAZY_OR_NOW	0
-+#        endif
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" void exit (int);
-+#endif
-+
-+void fnord() { int i=42;}
-+int main ()
-+{
-+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+  int status = $lt_dlunknown;
-+
-+  if (self)
-+    {
-+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+      /* dlclose (self); */
-+    }
-+
-+    exit (status);
-+}
-+EOF
-+  if { (eval echo configure:4673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
-+    (./conftest; exit; ) 2>/dev/null
-+    lt_status=$?
-+    case x$lt_status in
-+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-+      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
-+    esac
-+  else :
-+    # compilation failed
-+    lt_cv_dlopen_self=no
-+  fi
-+fi
-+rm -fr conftest*
-+
-+    
-+fi
-+
-+echo "$ac_t""$lt_cv_dlopen_self" 1>&6
-+
-+    if test "x$lt_cv_dlopen_self" = xyes; then
-+      LDFLAGS="$LDFLAGS $link_static_flag"
-+      echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
-+echo "configure:4696: checking whether a statically linked program can dlopen itself" >&5
-+if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  	  if test "$cross_compiling" = yes; then :
-+  lt_cv_dlopen_self_static=cross
-+else
-+    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+  lt_status=$lt_dlunknown
-+  cat > conftest.$ac_ext <<EOF
-+#line 4706 "configure"
-+#include "confdefs.h"
-+
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#ifdef RTLD_GLOBAL
-+#  define LT_DLGLOBAL		RTLD_GLOBAL
-+#else
-+#  ifdef DL_GLOBAL
-+#    define LT_DLGLOBAL		DL_GLOBAL
-+#  else
-+#    define LT_DLGLOBAL		0
-+#  endif
-+#endif
-+
-+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-+   find out it does not work in some platform. */
-+#ifndef LT_DLLAZY_OR_NOW
-+#  ifdef RTLD_LAZY
-+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-+#  else
-+#    ifdef DL_LAZY
-+#      define LT_DLLAZY_OR_NOW		DL_LAZY
-+#    else
-+#      ifdef RTLD_NOW
-+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-+#      else
-+#        ifdef DL_NOW
-+#          define LT_DLLAZY_OR_NOW	DL_NOW
-+#        else
-+#          define LT_DLLAZY_OR_NOW	0
-+#        endif
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" void exit (int);
-+#endif
-+
-+void fnord() { int i=42;}
-+int main ()
-+{
-+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+  int status = $lt_dlunknown;
-+
-+  if (self)
-+    {
-+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+      /* dlclose (self); */
-+    }
-+
-+    exit (status);
-+}
-+EOF
-+  if { (eval echo configure:4767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
-+    (./conftest; exit; ) 2>/dev/null
-+    lt_status=$?
-+    case x$lt_status in
-+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-+      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
-+    esac
-+  else :
-+    # compilation failed
-+    lt_cv_dlopen_self_static=no
-+  fi
-+fi
-+rm -fr conftest*
-+
-+      
-+fi
-+
-+echo "$ac_t""$lt_cv_dlopen_self_static" 1>&6
-+    fi
-+
-+    CPPFLAGS="$save_CPPFLAGS"
-+    LDFLAGS="$save_LDFLAGS"
-+    LIBS="$save_LIBS"
-+    ;;
-+  esac
-+
-+  case $lt_cv_dlopen_self in
-+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-+  *) enable_dlopen_self=unknown ;;
-+  esac
-+
-+  case $lt_cv_dlopen_self_static in
-+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-+  *) enable_dlopen_self_static=unknown ;;
-+  esac
-+fi
-+
-+
-+if test "$enable_shared" = yes && test "$GCC" = yes; then
-+  case $archive_cmds in
-+  *'~'*)
-+    # FIXME: we may have to deal with multi-command sequences.
-+    ;;
-+  '$CC '*)
-+    # Test whether the compiler implicitly links with -lc since on some
-+    # systems, -lgcc has to come before -lc. If gcc already passes -lc
-+    # to ld, don't add -lc before -lgcc.
-+    echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6
-+echo "configure:4816: checking whether -lc should be explicitly linked in" >&5
-+    if eval "test \"`echo '$''{'lt_cv_archive_cmds_need_lc'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  $rm conftest*
-+    echo 'static int dummy;' > conftest.$ac_ext
-+
-+    if { (eval echo configure:4823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+      soname=conftest
-+      lib=conftest
-+      libobjs=conftest.$ac_objext
-+      deplibs=
-+      wl=$lt_cv_prog_cc_wl
-+      compiler_flags=-v
-+      linker_flags=-v
-+      verstring=
-+      output_objdir=.
-+      libname=conftest
-+      save_allow_undefined_flag=$allow_undefined_flag
-+      allow_undefined_flag=
-+      if { (eval echo configure:4836: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
-+      then
-+	lt_cv_archive_cmds_need_lc=no
-+      else
-+	lt_cv_archive_cmds_need_lc=yes
-+      fi
-+      allow_undefined_flag=$save_allow_undefined_flag
-+    else
-+      cat conftest.err 1>&5
-+    fi
-+fi
-+
-+    echo "$ac_t""$lt_cv_archive_cmds_need_lc" 1>&6
-+    ;;
-+  esac
-+fi
-+need_lc=${lt_cv_archive_cmds_need_lc-yes}
-+
-+# The second clause should only fire when bootstrapping the
-+# libtool distribution, otherwise you forgot to ship ltmain.sh
-+# with your package, and you will get complaints that there are
-+# no rules to generate ltmain.sh.
-+if test -f "$ltmain"; then
-+  :
-+else
-+  # If there is no Makefile yet, we rely on a make rule to execute
-+  # `config.status --recheck' to rerun these tests and create the
-+  # libtool script then.
-+  test -f Makefile && make "$ltmain"
-+fi
-+
-+if test -f "$ltmain"; then
-+  trap "$rm \"${ofile}T\"; exit 1" 1 2 15
-+  $rm -f "${ofile}T"
-+
-+  echo creating $ofile
-+
-+  # Now quote all the things that may contain metacharacters while being
-+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-+  # variables and quote the copies for generation of the libtool script.
-+  for var in echo old_CC old_CFLAGS SED \
-+    AR AR_FLAGS CC LD LN_S NM SHELL \
-+    reload_flag reload_cmds wl \
-+    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
-+    thread_safe_flag_spec whole_archive_flag_spec libname_spec \
-+    library_names_spec soname_spec \
-+    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
-+    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \
-+    postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \
-+    old_striplib striplib file_magic_cmd export_symbols_cmds \
-+    deplibs_check_method allow_undefined_flag no_undefined_flag \
-+    finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
-+    global_symbol_to_c_name_address \
-+    hardcode_libdir_flag_spec hardcode_libdir_separator  \
-+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-+    compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
-+
-+    case $var in
-+    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
-+    old_postinstall_cmds | old_postuninstall_cmds | \
-+    export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
-+    extract_expsyms_cmds | old_archive_from_expsyms_cmds | \
-+    postinstall_cmds | postuninstall_cmds | \
-+    finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-+      # Double-quote double-evaled strings.
-+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-+      ;;
-+    *)
-+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-+      ;;
-+    esac
-+  done
-+
-+  cat <<__EOF__ > "${ofile}T"
-+#! $SHELL
-+
-+# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-+#
-+# Copyright (C) 1996-2000 Free Software Foundation, Inc.
-+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# A sed that does not truncate output.
-+SED=$lt_SED
-+
-+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-+Xsed="${SED} -e s/^X//"
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+
-+# ### BEGIN LIBTOOL CONFIG
-+
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
-+
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
-+
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
-+
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$need_lc
-+
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
-+
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
-+
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
-+
-+# The default C compiler.
-+CC=$lt_CC
-+
-+# Is the compiler the GNU C compiler?
-+with_gcc=$GCC
-+
-+# The linker used to build libraries.
-+LD=$lt_LD
-+
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
-+
-+# A BSD-compatible nm program.
-+NM=$lt_NM
-+
-+# A symbol stripping program
-+STRIP=$STRIP
-+
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=$MAGIC_CMD
-+
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
-+
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
-+
-+# Used on cygwin: assembler.
-+AS="$AS"
-+
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
-+
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
-+
-+# How to pass a linker flag through the compiler.
-+wl=$lt_wl
-+
-+# Object file suffix (normally "o").
-+objext="$ac_objext"
-+
-+# Old archive suffix (normally "a").
-+libext="$libext"
-+
-+# Executable file suffix (normally "").
-+exeext="$exeext"
-+
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_pic_flag
-+pic_mode=$pic_mode
-+
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_compiler_c_o
-+
-+# Can we write directly to a .lo ?
-+compiler_o_lo=$lt_compiler_o_lo
-+
-+# Must we lock files when doing compilation ?
-+need_locks=$lt_need_locks
-+
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
-+
-+# Do we need a version for libraries?
-+need_version=$need_version
-+
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
-+
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
-+
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
-+
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_link_static_flag
-+
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_no_builtin_flag
-+
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-+
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec
-+
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec
-+
-+# Library versioning type.
-+version_type=$version_type
-+
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
-+
-+# List of archive names.  First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$lt_library_names_spec
-+
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
-+
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_old_archive_cmds
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
-+
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-+
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-+
-+# Commands used to build and install a shared archive.
-+archive_cmds=$lt_archive_cmds
-+archive_expsym_cmds=$lt_archive_expsym_cmds
-+postinstall_cmds=$lt_postinstall_cmds
-+postuninstall_cmds=$lt_postuninstall_cmds
-+
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
-+
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
-+
-+# Command to use when deplibs_check_method == file_magic.
-+file_magic_cmd=$lt_file_magic_cmd
-+
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag
-+
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag
-+
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
-+
-+# Same as above, but a single script fragment to be evaled but not shown.
-+finish_eval=$lt_finish_eval
-+
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe=$lt_global_symbol_pipe
-+
-+# Transform the output of nm in a proper C declaration
-+global_symbol_to_cdecl=$lt_global_symbol_to_cdecl
-+
-+# Transform the output of nm in a C name address pair
-+global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address
-+
-+# This is the shared library runtime path variable.
-+runpath_var=$runpath_var
-+
-+# This is the shared library path variable.
-+shlibpath_var=$shlibpath_var
-+
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$hardcode_action
-+
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=$hardcode_into_libs
-+
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-+
-+# Whether we need a single -rpath flag with a separated argument.
-+hardcode_libdir_separator=$lt_hardcode_libdir_separator
-+
-+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct=$hardcode_direct
-+
-+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L=$hardcode_minus_L
-+
-+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-+# the resulting binary.
-+hardcode_shlibpath_var=$hardcode_shlibpath_var
-+
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at relink time.
-+variables_saved_for_relink="$variables_saved_for_relink"
-+
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$link_all_deplibs
-+
-+# Compile-time system search path for libraries
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+
-+# Run-time system search path for libraries
-+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path="$fix_srcfile_path"
-+
-+# Set to yes if exported symbols are required.
-+always_export_symbols=$always_export_symbols
-+
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_export_symbols_cmds
-+
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms
-+
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms
-+
-+# ### END LIBTOOL CONFIG
-+
-+__EOF__
-+
-+  case $host_os in
-+  aix3*)
-+    cat <<\EOF >> "${ofile}T"
-+
-+# AIX sometimes has problems with the GCC collect2 program.  For some
-+# reason, if we set the COLLECT_NAMES environment variable, the problems
-+# vanish in a puff of smoke.
-+if test "X${COLLECT_NAMES+set}" != Xset; then
-+  COLLECT_NAMES=
-+  export COLLECT_NAMES
-+fi
-+EOF
-+    ;;
-+  esac
-+
-+  case $host_os in
-+  cygwin* | mingw* | pw32* | os2*)
-+    cat <<'EOF' >> "${ofile}T"
-+      # This is a source program that is used to create dlls on Windows
-+      # Don't remove nor modify the starting and closing comments
-+# /* ltdll.c starts here */
-+# #define WIN32_LEAN_AND_MEAN
-+# #include <windows.h>
-+# #undef WIN32_LEAN_AND_MEAN
-+# #include <stdio.h>
-+#
-+# #ifndef __CYGWIN__
-+# #  ifdef __CYGWIN32__
-+# #    define __CYGWIN__ __CYGWIN32__
-+# #  endif
-+# #endif
-+#
-+# #ifdef __cplusplus
-+# extern "C" {
-+# #endif
-+# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
-+# #ifdef __cplusplus
-+# }
-+# #endif
-+#
-+# #ifdef __CYGWIN__
-+# #include <cygwin/cygwin_dll.h>
-+# DECLARE_CYGWIN_DLL( DllMain );
-+# #endif
-+# HINSTANCE __hDllInstance_base;
-+#
-+# BOOL APIENTRY
-+# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-+# {
-+#   __hDllInstance_base = hInst;
-+#   return TRUE;
-+# }
-+# /* ltdll.c ends here */
-+	# This is a source program that is used to create import libraries
-+	# on Windows for dlls which lack them. Don't remove nor modify the
-+	# starting and closing comments
-+# /* impgen.c starts here */
-+# /*   Copyright (C) 1999-2000 Free Software Foundation, Inc.
-+#
-+#  This file is part of GNU libtool.
-+#
-+#  This program is free software; you can redistribute it and/or modify
-+#  it under the terms of the GNU General Public License as published by
-+#  the Free Software Foundation; either version 2 of the License, or
-+#  (at your option) any later version.
-+#
-+#  This program is distributed in the hope that it will be useful,
-+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+#  GNU General Public License for more details.
-+#
-+#  You should have received a copy of the GNU General Public License
-+#  along with this program; if not, write to the Free Software
-+#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#  */
-+#
-+# #include <stdio.h>		/* for printf() */
-+# #include <unistd.h>		/* for open(), lseek(), read() */
-+# #include <fcntl.h>		/* for O_RDONLY, O_BINARY */
-+# #include <string.h>		/* for strdup() */
-+#
-+# /* O_BINARY isn't required (or even defined sometimes) under Unix */
-+# #ifndef O_BINARY
-+# #define O_BINARY 0
-+# #endif
-+#
-+# static unsigned int
-+# pe_get16 (fd, offset)
-+#      int fd;
-+#      int offset;
-+# {
-+#   unsigned char b[2];
-+#   lseek (fd, offset, SEEK_SET);
-+#   read (fd, b, 2);
-+#   return b[0] + (b[1]<<8);
-+# }
-+#
-+# static unsigned int
-+# pe_get32 (fd, offset)
-+#     int fd;
-+#     int offset;
-+# {
-+#   unsigned char b[4];
-+#   lseek (fd, offset, SEEK_SET);
-+#   read (fd, b, 4);
-+#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
-+# }
-+#
-+# static unsigned int
-+# pe_as32 (ptr)
-+#      void *ptr;
-+# {
-+#   unsigned char *b = ptr;
-+#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
-+# }
-+#
-+# int
-+# main (argc, argv)
-+#     int argc;
-+#     char *argv[];
-+# {
-+#     int dll;
-+#     unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
-+#     unsigned long export_rva, export_size, nsections, secptr, expptr;
-+#     unsigned long name_rvas, nexp;
-+#     unsigned char *expdata, *erva;
-+#     char *filename, *dll_name;
-+#
-+#     filename = argv[1];
-+#
-+#     dll = open(filename, O_RDONLY|O_BINARY);
-+#     if (dll < 1)
-+# 	return 1;
-+#
-+#     dll_name = filename;
-+#
-+#     for (i=0; filename[i]; i++)
-+# 	if (filename[i] == '/' || filename[i] == '\\'  || filename[i] == ':')
-+# 	    dll_name = filename + i +1;
-+#
-+#     pe_header_offset = pe_get32 (dll, 0x3c);
-+#     opthdr_ofs = pe_header_offset + 4 + 20;
-+#     num_entries = pe_get32 (dll, opthdr_ofs + 92);
-+#
-+#     if (num_entries < 1) /* no exports */
-+# 	return 1;
-+#
-+#     export_rva = pe_get32 (dll, opthdr_ofs + 96);
-+#     export_size = pe_get32 (dll, opthdr_ofs + 100);
-+#     nsections = pe_get16 (dll, pe_header_offset + 4 +2);
-+#     secptr = (pe_header_offset + 4 + 20 +
-+# 	      pe_get16 (dll, pe_header_offset + 4 + 16));
-+#
-+#     expptr = 0;
-+#     for (i = 0; i < nsections; i++)
-+#     {
-+# 	char sname[8];
-+# 	unsigned long secptr1 = secptr + 40 * i;
-+# 	unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
-+# 	unsigned long vsize = pe_get32 (dll, secptr1 + 16);
-+# 	unsigned long fptr = pe_get32 (dll, secptr1 + 20);
-+# 	lseek(dll, secptr1, SEEK_SET);
-+# 	read(dll, sname, 8);
-+# 	if (vaddr <= export_rva && vaddr+vsize > export_rva)
-+# 	{
-+# 	    expptr = fptr + (export_rva - vaddr);
-+# 	    if (export_rva + export_size > vaddr + vsize)
-+# 		export_size = vsize - (export_rva - vaddr);
-+# 	    break;
-+# 	}
-+#     }
-+#
-+#     expdata = (unsigned char*)malloc(export_size);
-+#     lseek (dll, expptr, SEEK_SET);
-+#     read (dll, expdata, export_size);
-+#     erva = expdata - export_rva;
-+#
-+#     nexp = pe_as32 (expdata+24);
-+#     name_rvas = pe_as32 (expdata+32);
-+#
-+#     printf ("EXPORTS\n");
-+#     for (i = 0; i<nexp; i++)
-+#     {
-+# 	unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
-+# 	printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
-+#     }
-+#
-+#     return 0;
-+# }
-+# /* impgen.c ends here */
-+
-+EOF
-+    ;;
-+  esac
-+
-+  # We use sed instead of cat because bash on DJGPP gets confused if
-+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-+  # text mode, it properly converts lines to CR/LF.  This bash problem
-+  # is reportedly fixed, but why not run on old versions too?
-+  sed '$q' "$ltmain" >> "${ofile}T" || (rm -f "${ofile}T"; exit 1)
-+
-+  mv -f "${ofile}T" "$ofile" || \
-+    (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T")
-+  chmod +x "$ofile"
-+fi
-+
-+
-+
-+
-+
-+# This can be used to rebuild libtool when needed
-+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+
-+# Always use our own libtool.
-+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+
-+# Prevent multiple expansion
-+
-+
-+
-+
-+# Extract the first word of "lp", so it can be a program name with args.
-+set dummy lp; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:5425: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_LPRCOMMAND'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$LPRCOMMAND"; then
-+  ac_cv_prog_LPRCOMMAND="$LPRCOMMAND" # Let the user override the test.
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_prog_LPRCOMMAND="lp"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+fi
-+fi
-+LPRCOMMAND="$ac_cv_prog_LPRCOMMAND"
-+if test -n "$LPRCOMMAND"; then
-+  echo "$ac_t""$LPRCOMMAND" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+# Extract the first word of "lpr", so it can be a program name with args.
-+set dummy lpr; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:5454: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_LPRCOMMAND'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$LPRCOMMAND"; then
-+  ac_cv_prog_LPRCOMMAND="$LPRCOMMAND" # Let the user override the test.
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_prog_LPRCOMMAND="lpr"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+fi
-+fi
-+LPRCOMMAND="$ac_cv_prog_LPRCOMMAND"
-+if test -n "$LPRCOMMAND"; then
-+  echo "$ac_t""$LPRCOMMAND" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+
-+# Extract the first word of "cat", so it can be a program name with args.
-+set dummy cat; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:5484: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_CATCOMMAND'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$CATCOMMAND"; then
-+  ac_cv_prog_CATCOMMAND="$CATCOMMAND" # Let the user override the test.
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_prog_CATCOMMAND="cat"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+fi
-+fi
-+CATCOMMAND="$ac_cv_prog_CATCOMMAND"
-+if test -n "$CATCOMMAND"; then
-+  echo "$ac_t""$CATCOMMAND" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+# Extract the first word of "type", so it can be a program name with args.
-+set dummy type; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:5513: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_CATCOMMAND'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$CATCOMMAND"; then
-+  ac_cv_prog_CATCOMMAND="$CATCOMMAND" # Let the user override the test.
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_prog_CATCOMMAND="type"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+fi
-+fi
-+CATCOMMAND="$ac_cv_prog_CATCOMMAND"
-+if test -n "$CATCOMMAND"; then
-+  echo "$ac_t""$CATCOMMAND" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+
-+
-+
-+for ac_hdr in stdlib.h unistd.h errno.h assert.h
-+do
-+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+echo "configure:5546: checking for $ac_hdr" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 5551 "configure"
-+#include "confdefs.h"
-+#include <$ac_hdr>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:5556: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=yes"
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=no"
-+fi
-+rm -f conftest*
-+fi
-+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_hdr 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+for ac_hdr in sys/time.h time.h signal.h
-+do
-+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+echo "configure:5586: checking for $ac_hdr" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 5591 "configure"
-+#include "confdefs.h"
-+#include <$ac_hdr>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:5596: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=yes"
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=no"
-+fi
-+rm -f conftest*
-+fi
-+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_hdr 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+for ac_hdr in string.h strings.h
-+do
-+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+echo "configure:5626: checking for $ac_hdr" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 5631 "configure"
-+#include "confdefs.h"
-+#include <$ac_hdr>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:5636: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=yes"
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=no"
-+fi
-+rm -f conftest*
-+fi
-+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_hdr 1
-+EOF
-+ break
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+
-+# @start variadic
-+case $am_cv_prog_cc_stdc,$ac_cv_header_varargs_h in
-+no,)
-+	# Non-ANSI compiler, so we must use varargs.h.
-+	for ac_hdr in varargs.h
-+do
-+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+echo "configure:5671: checking for $ac_hdr" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 5676 "configure"
-+#include "confdefs.h"
-+#include <$ac_hdr>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:5681: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=yes"
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=no"
-+fi
-+rm -f conftest*
-+fi
-+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_hdr 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+	;;
-+*,yes)
-+	# Parent package is using varargs.h which is incompatible with 
-+	# stdarg.h, so we do the same (recheck to generate checking...
-+	# message).
-+	for ac_hdr in varargs.h
-+do
-+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+echo "configure:5716: checking for $ac_hdr" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 5721 "configure"
-+#include "confdefs.h"
-+#include <$ac_hdr>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:5726: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=yes"
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=no"
-+fi
-+rm -f conftest*
-+fi
-+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_hdr 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+	;;
-+*)
-+	# If stdarg.h is present define HAVE_STDARG_H.
-+	for ac_hdr in stdarg.h
-+do
-+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+echo "configure:5759: checking for $ac_hdr" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 5764 "configure"
-+#include "confdefs.h"
-+#include <$ac_hdr>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:5769: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=yes"
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=no"
-+fi
-+rm -f conftest*
-+fi
-+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_hdr 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+	;;
-+esac
-+
-+case x$ac_cv_header_stdarg_h$ac_cv_header_varargs_h in
-+x*yes*) ;;
-+*) { echo "configure: error: Could not find stdarg.h or varargs.h" 1>&2; exit 1; } ;;
-+esac
-+# @end variadic
-+
-+echo $ac_n "checking for working const""... $ac_c" 1>&6
-+echo "configure:5805: checking for working const" >&5
-+if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 5810 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+
-+/* Ultrix mips cc rejects this.  */
-+typedef int charset[2]; const charset x;
-+/* SunOS 4.1.1 cc rejects this.  */
-+char const *const *ccp;
-+char **p;
-+/* NEC SVR4.0.2 mips cc rejects this.  */
-+struct point {int x, y;};
-+static struct point const zero = {0,0};
-+/* AIX XL C 1.02.0.0 rejects this.
-+   It does not let you subtract one const X* pointer from another in an arm
-+   of an if-expression whose if-part is not a constant expression */
-+const char *g = "string";
-+ccp = &g + (g ? g-g : 0);
-+/* HPUX 7.0 cc rejects these. */
-+++ccp;
-+p = (char**) ccp;
-+ccp = (char const *const *) p;
-+{ /* SCO 3.2v4 cc rejects this.  */
-+  char *t;
-+  char const *s = 0 ? (char *) 0 : (char const *) 0;
-+
-+  *t++ = 0;
-+}
-+{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-+  int x[] = {25, 17};
-+  const int *foo = &x[0];
-+  ++foo;
-+}
-+{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-+  typedef const int *iptr;
-+  iptr p = 0;
-+  ++p;
-+}
-+{ /* AIX XL C 1.02.0.0 rejects this saying
-+     "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-+  struct s { int j; const int *ap[3]; };
-+  struct s *b; b->j = 5;
-+}
-+{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-+  const int foo = 10;
-+}
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:5859: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  rm -rf conftest*
-+  ac_cv_c_const=yes
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  ac_cv_c_const=no
-+fi
-+rm -f conftest*
-+fi
-+
-+echo "$ac_t""$ac_cv_c_const" 1>&6
-+if test $ac_cv_c_const = no; then
-+  cat >> confdefs.h <<\EOF
-+#define const 
-+EOF
-+
-+fi
-+
-+echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-+echo "configure:5880: checking for ANSI C header files" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 5885 "configure"
-+#include "confdefs.h"
-+#include <stdlib.h>
-+#include <stdarg.h>
-+#include <string.h>
-+#include <float.h>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:5893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  rm -rf conftest*
-+  ac_cv_header_stdc=yes
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
-+
-+if test $ac_cv_header_stdc = yes; then
-+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-+cat > conftest.$ac_ext <<EOF
-+#line 5910 "configure"
-+#include "confdefs.h"
-+#include <string.h>
-+EOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  egrep "memchr" >/dev/null 2>&1; then
-+  :
-+else
-+  rm -rf conftest*
-+  ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+if test $ac_cv_header_stdc = yes; then
-+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-+cat > conftest.$ac_ext <<EOF
-+#line 5928 "configure"
-+#include "confdefs.h"
-+#include <stdlib.h>
-+EOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  egrep "free" >/dev/null 2>&1; then
-+  :
-+else
-+  rm -rf conftest*
-+  ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+if test $ac_cv_header_stdc = yes; then
-+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-+if test "$cross_compiling" = yes; then
-+  :
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 5949 "configure"
-+#include "confdefs.h"
-+#include <ctype.h>
-+#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-+#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-+int main () { int i; for (i = 0; i < 256; i++)
-+if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
-+exit (0); }
-+
-+EOF
-+if { (eval echo configure:5960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+then
-+  :
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -fr conftest*
-+  ac_cv_header_stdc=no
-+fi
-+rm -fr conftest*
-+fi
-+
-+fi
-+fi
-+
-+echo "$ac_t""$ac_cv_header_stdc" 1>&6
-+if test $ac_cv_header_stdc = yes; then
-+  cat >> confdefs.h <<\EOF
-+#define STDC_HEADERS 1
-+EOF
-+
-+fi
-+
-+echo $ac_n "checking for size_t""... $ac_c" 1>&6
-+echo "configure:5984: checking for size_t" >&5
-+if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 5989 "configure"
-+#include "confdefs.h"
-+#include <sys/types.h>
-+#if STDC_HEADERS
-+#include <stdlib.h>
-+#include <stddef.h>
-+#endif
-+EOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-+  rm -rf conftest*
-+  ac_cv_type_size_t=yes
-+else
-+  rm -rf conftest*
-+  ac_cv_type_size_t=no
-+fi
-+rm -f conftest*
-+
-+fi
-+echo "$ac_t""$ac_cv_type_size_t" 1>&6
-+if test $ac_cv_type_size_t = no; then
-+  cat >> confdefs.h <<\EOF
-+#define size_t unsigned
-+EOF
-+
-+fi
-+
-+echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-+echo "configure:6017: checking whether time.h and sys/time.h may both be included" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 6022 "configure"
-+#include "confdefs.h"
-+#include <sys/types.h>
-+#include <sys/time.h>
-+#include <time.h>
-+int main() {
-+struct tm *tp;
-+; return 0; }
-+EOF
-+if { (eval echo configure:6031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  rm -rf conftest*
-+  ac_cv_header_time=yes
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  ac_cv_header_time=no
-+fi
-+rm -f conftest*
-+fi
-+
-+echo "$ac_t""$ac_cv_header_time" 1>&6
-+if test $ac_cv_header_time = yes; then
-+  cat >> confdefs.h <<\EOF
-+#define TIME_WITH_SYS_TIME 1
-+EOF
-+
-+fi
-+
-+
-+for ac_func in killpg kill
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:6055: checking for $ac_func" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 6060 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char $ac_func();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+$ac_func();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:6083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_func 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+for ac_func in bcopy memcpy
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:6110: checking for $ac_func" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 6115 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char $ac_func();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+$ac_func();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:6138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_func 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+for ac_func in bzero memset
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:6165: checking for $ac_func" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 6170 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char $ac_func();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+$ac_func();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:6193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_func 1
-+EOF
-+ break
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+for ac_func in bcmp memcmp
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:6220: checking for $ac_func" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 6225 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char $ac_func();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+$ac_func();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:6248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_func 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+for ac_func in index strchr
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:6275: checking for $ac_func" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 6280 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char $ac_func();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+$ac_func();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:6303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_func 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+for ac_func in rindex strrchr
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:6330: checking for $ac_func" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 6335 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char $ac_func();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+$ac_func();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:6358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_func 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+for ac_func in initstate srand
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:6385: checking for $ac_func" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 6390 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char $ac_func();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+$ac_func();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:6413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_func 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+for ac_func in random rand
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:6440: checking for $ac_func" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 6445 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char $ac_func();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+$ac_func();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:6468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_func 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+
-+for ac_func in calloc
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:6496: checking for $ac_func" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 6501 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char $ac_func();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+$ac_func();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:6524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_func 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+for ac_func in basename strerror vfprintf
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:6551: checking for $ac_func" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 6556 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char $ac_func();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+$ac_func();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:6579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_func 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}"
-+fi
-+done
-+
-+
-+for ac_func in putenv
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:6608: checking for $ac_func" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 6613 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char $ac_func();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+$ac_func();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:6636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_func 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}"
-+fi
-+done
-+
-+
-+
-+
-+# @end 5
-+# @start 1
-+
-+
-+Xsed="sed -e s/^X//"
-+LTLIBOBJS=`echo X"$LIBOBJS"|$Xsed -e "s,\.[^.]* ,.lo ,g;s,\.[^.]*$,.lo,"`
-+
-+
-+
-+
-+
-+
-+trap '' 1 2 15
-+cat > confcache <<\EOF
-+# This file is a shell script that caches the results of configure
-+# tests run on this system so they can be shared between configure
-+# scripts and configure runs.  It is not useful on other systems.
-+# If it contains results you don't want to keep, you may remove or edit it.
-+#
-+# By default, configure uses ./config.cache as the cache file,
-+# creating it if it does not exist already.  You can give configure
-+# the --cache-file=FILE option to use a different cache file; that is
-+# what configure does when it calls configure scripts in
-+# subdirectories, so they share the cache.
-+# Giving --cache-file=/dev/null disables caching, for debugging configure.
-+# config.status only pays attention to the cache file if you give it the
-+# --recheck option to rerun configure.
-+#
-+EOF
-+# The following way of writing the cache mishandles newlines in values,
-+# but we know of no workaround that is simple, portable, and efficient.
-+# So, don't put newlines in cache variables' values.
-+# Ultrix sh set writes to stderr and can't be redirected directly,
-+# and sets the high bit in the cache file unless we assign to the vars.
-+(set) 2>&1 |
-+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-+  *ac_space=\ *)
-+    # `set' does not quote correctly, so add quotes (double-quote substitution
-+    # turns \\\\ into \\, and sed turns \\ into \).
-+    sed -n \
-+      -e "s/'/'\\\\''/g" \
-+      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-+    ;;
-+  *)
-+    # `set' quotes correctly as required by POSIX, so do not add quotes.
-+    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-+    ;;
-+  esac >> confcache
-+if cmp -s $cache_file confcache; then
-+  :
-+else
-+  if test -w $cache_file; then
-+    echo "updating cache $cache_file"
-+    cat confcache > $cache_file
-+  else
-+    echo "not updating unwritable cache $cache_file"
-+  fi
-+fi
-+rm -f confcache
-+
-+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-+
-+test "x$prefix" = xNONE && prefix=$ac_default_prefix
-+# Let make expand exec_prefix.
-+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-+
-+# Any assignment to VPATH causes Sun make to only execute
-+# the first set of double-colon rules, so remove it if not needed.
-+# If there is a colon in the path, we need to keep it.
-+if test "x$srcdir" = x.; then
-+  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-+fi
-+
-+trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-+
-+DEFS=-DHAVE_CONFIG_H
-+
-+# Without the "./", some shells look in PATH for config.status.
-+: ${CONFIG_STATUS=./config.status}
-+
-+echo creating $CONFIG_STATUS
-+rm -f $CONFIG_STATUS
-+cat > $CONFIG_STATUS <<EOF
-+#! /bin/sh
-+# Generated automatically by configure.
-+# Run this file to recreate the current configuration.
-+# This directory was configured as follows,
-+# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+#
-+# $0 $ac_configure_args
-+#
-+# Compiler output produced by configure, useful for debugging
-+# configure, is in ./config.log if it exists.
-+
-+ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-+for ac_option
-+do
-+  case "\$ac_option" in
-+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-+    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-+  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-+    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-+    exit 0 ;;
-+  -help | --help | --hel | --he | --h)
-+    echo "\$ac_cs_usage"; exit 0 ;;
-+  *) echo "\$ac_cs_usage"; exit 1 ;;
-+  esac
-+done
-+
-+ac_given_srcdir=$srcdir
-+ac_given_INSTALL="$INSTALL"
-+
-+trap 'rm -fr `echo "Makefile replace/Makefile metamail/Makefile src/Makefile \
-+	   src/metamail/Makefile src/richmail/Makefile bin/Makefile metamail/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-+EOF
-+cat >> $CONFIG_STATUS <<EOF
-+
-+# Protect against being on the right side of a sed subst in config.status.
-+sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
-+ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-+$ac_vpsub
-+$extrasub
-+s%@SHELL@%$SHELL%g
-+s%@CFLAGS@%$CFLAGS%g
-+s%@CPPFLAGS@%$CPPFLAGS%g
-+s%@CXXFLAGS@%$CXXFLAGS%g
-+s%@FFLAGS@%$FFLAGS%g
-+s%@DEFS@%$DEFS%g
-+s%@LDFLAGS@%$LDFLAGS%g
-+s%@LIBS@%$LIBS%g
-+s%@exec_prefix@%$exec_prefix%g
-+s%@prefix@%$prefix%g
-+s%@program_transform_name@%$program_transform_name%g
-+s%@bindir@%$bindir%g
-+s%@sbindir@%$sbindir%g
-+s%@libexecdir@%$libexecdir%g
-+s%@datadir@%$datadir%g
-+s%@sysconfdir@%$sysconfdir%g
-+s%@sharedstatedir@%$sharedstatedir%g
-+s%@localstatedir@%$localstatedir%g
-+s%@libdir@%$libdir%g
-+s%@includedir@%$includedir%g
-+s%@oldincludedir@%$oldincludedir%g
-+s%@infodir@%$infodir%g
-+s%@mandir@%$mandir%g
-+s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-+s%@INSTALL_DATA@%$INSTALL_DATA%g
-+s%@PACKAGE@%$PACKAGE%g
-+s%@VERSION@%$VERSION%g
-+s%@ACLOCAL@%$ACLOCAL%g
-+s%@AUTOCONF@%$AUTOCONF%g
-+s%@AUTOMAKE@%$AUTOMAKE%g
-+s%@AUTOHEADER@%$AUTOHEADER%g
-+s%@MAKEINFO@%$MAKEINFO%g
-+s%@SET_MAKE@%$SET_MAKE%g
-+s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
-+s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
-+s%@MAINT@%$MAINT%g
-+s%@host@%$host%g
-+s%@host_alias@%$host_alias%g
-+s%@host_cpu@%$host_cpu%g
-+s%@host_vendor@%$host_vendor%g
-+s%@host_os@%$host_os%g
-+s%@CC@%$CC%g
-+s%@build@%$build%g
-+s%@build_alias@%$build_alias%g
-+s%@build_cpu@%$build_cpu%g
-+s%@build_vendor@%$build_vendor%g
-+s%@build_os@%$build_os%g
-+s%@LN_S@%$LN_S%g
-+s%@OBJEXT@%$OBJEXT%g
-+s%@EXEEXT@%$EXEEXT%g
-+s%@ECHO@%$ECHO%g
-+s%@RANLIB@%$RANLIB%g
-+s%@STRIP@%$STRIP%g
-+s%@CPP@%$CPP%g
-+s%@LIBTOOL@%$LIBTOOL%g
-+s%@LIBTOOL_DEPS@%$LIBTOOL_DEPS%g
-+s%@LPRCOMMAND@%$LPRCOMMAND%g
-+s%@CATCOMMAND@%$CATCOMMAND%g
-+s%@LIBOBJS@%$LIBOBJS%g
-+s%@LTLIBOBJS@%$LTLIBOBJS%g
-+s%@ac_aux_dir@%$ac_aux_dir%g
-+
-+CEOF
-+EOF
-+
-+cat >> $CONFIG_STATUS <<\EOF
-+
-+# Split the substitutions into bite-sized pieces for seds with
-+# small command number limits, like on Digital OSF/1 and HP-UX.
-+ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-+ac_file=1 # Number of current file.
-+ac_beg=1 # First line for current file.
-+ac_end=$ac_max_sed_cmds # Line after last line for current file.
-+ac_more_lines=:
-+ac_sed_cmds=""
-+while $ac_more_lines; do
-+  if test $ac_beg -gt 1; then
-+    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-+  else
-+    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-+  fi
-+  if test ! -s conftest.s$ac_file; then
-+    ac_more_lines=false
-+    rm -f conftest.s$ac_file
-+  else
-+    if test -z "$ac_sed_cmds"; then
-+      ac_sed_cmds="sed -f conftest.s$ac_file"
-+    else
-+      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-+    fi
-+    ac_file=`expr $ac_file + 1`
-+    ac_beg=$ac_end
-+    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-+  fi
-+done
-+if test -z "$ac_sed_cmds"; then
-+  ac_sed_cmds=cat
-+fi
-+EOF
-+
-+cat >> $CONFIG_STATUS <<EOF
-+
-+CONFIG_FILES=\${CONFIG_FILES-"Makefile replace/Makefile metamail/Makefile src/Makefile \
-+	   src/metamail/Makefile src/richmail/Makefile bin/Makefile"}
-+EOF
-+cat >> $CONFIG_STATUS <<\EOF
-+for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-+  case "$ac_file" in
-+  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-+       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-+  *) ac_file_in="${ac_file}.in" ;;
-+  esac
-+
-+  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-+
-+  # Remove last slash and all that follows it.  Not all systems have dirname.
-+  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-+  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-+    # The file is in a subdirectory.
-+    test ! -d "$ac_dir" && mkdir "$ac_dir"
-+    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-+    # A "../" for each directory in $ac_dir_suffix.
-+    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-+  else
-+    ac_dir_suffix= ac_dots=
-+  fi
-+
-+  case "$ac_given_srcdir" in
-+  .)  srcdir=.
-+      if test -z "$ac_dots"; then top_srcdir=.
-+      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-+  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-+  *) # Relative path.
-+    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-+    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-+  esac
-+
-+  case "$ac_given_INSTALL" in
-+  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-+  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-+  esac
-+
-+  echo creating "$ac_file"
-+  rm -f "$ac_file"
-+  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-+  case "$ac_file" in
-+  *Makefile*) ac_comsub="1i\\
-+# $configure_input" ;;
-+  *) ac_comsub= ;;
-+  esac
-+
-+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-+  sed -e "$ac_comsub
-+s%@configure_input@%$configure_input%g
-+s%@srcdir@%$srcdir%g
-+s%@top_srcdir@%$top_srcdir%g
-+s%@INSTALL@%$INSTALL%g
-+" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-+fi; done
-+rm -f conftest.s*
-+
-+# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-+# NAME is the cpp macro being defined and VALUE is the value it is being given.
-+#
-+# ac_d sets the value in "#define NAME VALUE" lines.
-+ac_dA='s%^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
-+ac_dB='\([ 	][ 	]*\)[^ 	]*%\1#\2'
-+ac_dC='\3'
-+ac_dD='%g'
-+# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
-+ac_uA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
-+ac_uB='\([ 	]\)%\1#\2define\3'
-+ac_uC=' '
-+ac_uD='\4%g'
-+# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-+ac_eA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
-+ac_eB='$%\1#\2define\3'
-+ac_eC=' '
-+ac_eD='%g'
-+
-+if test "${CONFIG_HEADERS+set}" != set; then
-+EOF
-+cat >> $CONFIG_STATUS <<EOF
-+  CONFIG_HEADERS="metamail/config.h"
-+EOF
-+cat >> $CONFIG_STATUS <<\EOF
-+fi
-+for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
-+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-+  case "$ac_file" in
-+  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-+       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-+  *) ac_file_in="${ac_file}.in" ;;
-+  esac
-+
-+  echo creating $ac_file
-+
-+  rm -f conftest.frag conftest.in conftest.out
-+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-+  cat $ac_file_inputs > conftest.in
-+
-+EOF
-+
-+# Transform confdefs.h into a sed script conftest.vals that substitutes
-+# the proper values into config.h.in to produce config.h.  And first:
-+# Protect against being on the right side of a sed subst in config.status.
-+# Protect against being in an unquoted here document in config.status.
-+rm -f conftest.vals
-+cat > conftest.hdr <<\EOF
-+s/[\\&%]/\\&/g
-+s%[\\$`]%\\&%g
-+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
-+s%ac_d%ac_u%gp
-+s%ac_u%ac_e%gp
-+EOF
-+sed -n -f conftest.hdr confdefs.h > conftest.vals
-+rm -f conftest.hdr
-+
-+# This sed command replaces #undef with comments.  This is necessary, for
-+# example, in the case of _POSIX_SOURCE, which is predefined and required
-+# on some systems where configure will not decide to define it.
-+cat >> conftest.vals <<\EOF
-+s%^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
-+EOF
-+
-+# Break up conftest.vals because some shells have a limit on
-+# the size of here documents, and old seds have small limits too.
-+
-+rm -f conftest.tail
-+while :
-+do
-+  ac_lines=`grep -c . conftest.vals`
-+  # grep -c gives empty output for an empty file on some AIX systems.
-+  if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
-+  # Write a limited-size here document to conftest.frag.
-+  echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
-+  sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
-+  echo 'CEOF
-+  sed -f conftest.frag conftest.in > conftest.out
-+  rm -f conftest.in
-+  mv conftest.out conftest.in
-+' >> $CONFIG_STATUS
-+  sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
-+  rm -f conftest.vals
-+  mv conftest.tail conftest.vals
-+done
-+rm -f conftest.vals
-+
-+cat >> $CONFIG_STATUS <<\EOF
-+  rm -f conftest.frag conftest.h
-+  echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
-+  cat conftest.in >> conftest.h
-+  rm -f conftest.in
-+  if cmp -s $ac_file conftest.h 2>/dev/null; then
-+    echo "$ac_file is unchanged"
-+    rm -f conftest.h
-+  else
-+    # Remove last slash and all that follows it.  Not all systems have dirname.
-+      ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-+      if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-+      # The file is in a subdirectory.
-+      test ! -d "$ac_dir" && mkdir "$ac_dir"
-+    fi
-+    rm -f $ac_file
-+    mv conftest.h $ac_file
-+  fi
-+fi; done
-+
-+EOF
-+cat >> $CONFIG_STATUS <<EOF
-+
-+
-+  srcdir=$srcdir
-+  ac_cv_func_bzero=$ac_cv_func_bzero
-+  ac_cv_func_memset=$ac_cv_func_memset
-+  ac_cv_func_strchr=$ac_cv_func_strchr
-+  ac_cv_func_strrchr=$ac_cv_func_strrchr
-+# @end 5
-+  ac_cv_func_basename=$ac_cv_func_basename
-+  ac_cv_func_strcspn=$ac_cv_func_strcspn
-+  ac_cv_func_strerror=$ac_cv_func_strerror
-+  ac_cv_func_strsignal=$ac_cv_func_strsignal
-+  ac_cv_func_strspn=$ac_cv_func_strspn
-+  ac_cv_func_vfprintf=$ac_cv_func_vfprintf
-+  ac_cv_func_waitpid=$ac_cv_func_waitpid
-+  ac_cv_header_assert_h=$ac_cv_header_assert_h
-+  ac_cv_header_errno_h=$ac_cv_header_errno_h
-+  ac_cv_header_stdlib_h=$ac_cv_header_stdlib_h
-+  ac_cv_header_stdarg_h=$ac_cv_header_stdarg_h
-+  ac_cv_header_string_h=$ac_cv_header_string_h
-+  ac_cv_header_strings_h=$ac_cv_header_strings_h
-+  ac_cv_header_sys_wait_h=$ac_cv_header_sys_wait_h
-+  ac_cv_header_unistd_h=$ac_cv_header_unistd_h
-+  ac_cv_header_varargs_h=$ac_cv_header_varargs_h
-+  LPRCOMMAND=$LPRCOMMAND
-+  CATCOMMAND=$CATCOMMAND
-+  host=$host
-+# @start 5
-+
-+
-+EOF
-+cat >> $CONFIG_STATUS <<\EOF
-+test -z "$CONFIG_HEADERS" || echo timestamp > metamail/stamp-h
-+
-+  if test -n "$CONFIG_FILES" && test -n "$CONFIG_HEADERS"; then
-+    # If both these vars are non-empty, then config.status wasn't run by
-+    # automake rules (which always set one or the other to empty).
-+    CONFIG_OTHER=${CONFIG_OTHER-METAMAIL/common.h}
-+  fi
-+  case "$CONFIG_OTHER" in
-+  *metamail/common.h*)
-+    outfile=metamail/common.h
-+    stampfile=metamail/stamp-common
-+    tmpfile=${outfile}T
-+    dirname="sed s,^.*/,,g"
-+
-+    echo creating $outfile
-+    cat > $tmpfile << _EOF_
-+/*  -*- Mode: C -*-
-+ * --------------------------------------------------------------------
-+ * DO NOT EDIT THIS FILE!  It has been automatically generated
-+ * from:    configure.in and `echo $outfile|$dirname`.in
-+ * on host: `(hostname || uname -n) 2>/dev/null | sed 1q`
-+ * --------------------------------------------------------------------
-+ */
-+
-+#ifndef METAMAIL_COMMON_H
-+#define METAMAIL_COMMON_H 1
-+
-+#include <stdio.h>
-+#include <ctype.h>        // ??? ok here
-+#include <sys/types.h>
-+#include <sys/stat.h>     // ??? ok here
-+
-+// ??? following ok here without check?
-+#include <pwd.h>
-+#include <sys/time.h>
-+#include <sys/types.h>
-+#include <sys/file.h>
-+#include <signal.h>
-+
-+#include <termio.h>
-+#include <fcntl.h>
-+#include <sys/utsname.h>
-+_EOF_
-+
-+    case "${host}" in
-+      *-*-linux-gnu*) cat >> $tmpfile << '_EOF_'
-+
-+#include <linux/limits.h>
-+
-+_EOF_
-+;;
-+    esac
-+
-+# @end 5
-+# @start 4
-+    # Add the code to include these headers only if autoconf has
-+    # shown them to be present.
-+    if test x$ac_cv_header_stdlib_h = xyes; then
-+      echo '#include <stdlib.h>' >> $tmpfile
-+    fi
-+    if test x$ac_cv_header_unistd_h = xyes; then
-+      echo '#include <unistd.h>' >> $tmpfile
-+    fi
-+    if test x$ac_cv_header_sys_wait_h = xyes; then
-+      echo '#include <sys/wait.h>' >> $tmpfile
-+    fi
-+    if test x$ac_cv_header_errno_h = xyes; then
-+      echo '#include <errno.h>' >> $tmpfile
-+    fi
-+    cat >> $tmpfile << '_EOF_'
-+
-+#ifndef errno
-+/* Some sytems #define this! */
-+extern int errno;
-+#endif
-+
-+_EOF_
-+    if test x$ac_cv_header_string_h = xyes; then
-+      echo '#include <string.h>' >> $tmpfile
-+    elif test x$ac_cv_header_strings_h = xyes; then
-+      echo '#include <strings.h>' >> $tmpfile
-+    fi
-+
-+# *******************
-+# start variadic parameters 
-+#
-+    if test x$ac_cv_header_stdarg_h = xyes \
-+	&& test x$ac_cv_header_varargs_h != xyes
-+    then
-+      cat >> $tmpfile << '_EOF_'
-+
-+#include <stdarg.h>
-+#ifndef VA_START
-+#  define VA_START(a, f) va_start(a, f)
-+#endif /* VA_START */
-+
-+_EOF_
-+    else
-+      cat >> $tmpfile << '_EOF_'
-+	
-+#include <varargs.h>
-+#ifndef VA_START
-+#  define VA_START(a, f) va_start(a)
-+#endif /* VA_START */
-+       
-+_EOF_
-+    fi
-+#
-+# end variadic parameters
-+# ***********************
-+
-+    if test x$ac_cv_header_assert_h = xyes; then
-+      cat >> $tmpfile << '_EOF_'
-+
-+#include <assert.h>
-+#define METAMAIL_ASSERT assert
-+
-+_EOF_
-+else
-+        echo '#define METAMAIL_ASSERT(expr)  ((void) 0)' >> $tmpfile
-+    fi
-+# @end 4
-+# @start 5
-+    if test x$ac_cv_func_killpg = xno && \
-+       test x$ac_cv_func_kill = xyes; then
-+      cat >> $tmpfile << '_EOF_'
-+#define killbg(pid, sig) ((int) kill (-(pid), sig))
-+_EOF_
-+    fi 
-+    if test x$ac_cv_func_bcopy = xno && \
-+       test x$ac_cv_func_memcpy = xyes; then
-+      cat >> $tmpfile << '_EOF_'
-+#define bcopy(src, dest, n) ((void) memcpy (dest, src, n))
-+_EOF_
-+    fi
-+    if test x$ac_cv_func_bzero = xno && \
-+       test x$ac_cv_func_memset = xyes; then
-+      cat >> $tmpfile << '_EOF_'
-+#define bzero(buf, bytes) ((void) memset (buf, 0, bytes))
-+_EOF_
-+    fi
-+    if test x$ac_cv_func_bcmp = xno && \
-+       test x$ac_cv_func_memcmp = xyes; then
-+      echo '#define bcmp memcmp' >> $tmpfile
-+    fi
-+    if test x$ac_cv_func_index = xno && \
-+       test x$ac_cv_func_strchr = xyes; then
-+      echo '#define index strchr' >> $tmpfile
-+    fi
-+    if test x$ac_cv_func_rindex = xno && \
-+       test x$ac_cv_func_strrchr = xyes; then
-+      echo '#define rindex strrchr' >> $tmpfile
-+    fi
-+    if test x$ac_cv_func_initstate = xno && \
-+       test x$ac_cv_func_srand = xyes; then
-+      echo '#define initstate srand' >> $tmpfile
-+    fi
-+    if test x$ac_cv_func_random = xno && \
-+       test x$ac_cv_func_rand = xyes; then
-+      echo '#define random rand' >> $tmpfile
-+    fi
-+
-+    # The ugly but portable cpp stuff comes from here
-+    infile=$srcdir/metamail/`echo $outfile | sed 's,.*/,,g;s,\..*$,,g'`-h.in
-+    sed '/^##.*$/d' $infile >> $tmpfile 
-+
-+# @end 5
-+    ${RM-/bin/rm -f} ${tmpfile}2 2>/dev/null
-+    if test x$ac_cv_func_basename = xno; then
-+      echo 'extern char *basename PARAMS((const char *path));' >> ${tmpfile}2
-+    fi
-+    if test x$ac_cv_func_strerror = xno; then
-+      echo 'extern char *strerror PARAMS((int err));' >> ${tmpfile}2
-+    fi
-+    if test x$ac_cv_func_strsignal = xno; then
-+      echo 'extern char *strsignal PARAMS((int signo));' >> ${tmpfile}2
-+    fi
-+    if test x$ac_cv_func_vfprintf = xno; then
-+      echo 'extern int vfprintf PARAMS((FILE *file, const char* format, va_list ap));' >> ${tmpfile}2
-+    fi
-+    if test x$ac_cv_func_waitpid = xno; then 
-+	echo 'extern pid_t waitpid PARAMS((pid_t pid, int *pstatus, int options));' >> ${tmpfile}2
-+    fi
-+
-+    if test -f ${tmpfile}2; then
-+      cat >> $tmpfile << '_EOF_'
-+
-+BEGIN_C_DECLS
-+_EOF_
-+      cat ${tmpfile}2 >> $tmpfile
-+      echo 'END_C_DECLS' >> $tmpfile
-+      ${RM-/bin/rm -f} ${tmpfile}2 2>/dev/null
-+    fi
-+
-+    if test -n ${LPRCOMMAND}; then
-+      echo '#define LPRCOMMAND "'${LPRCOMMAND}'"' >> $tmpfile
-+      echo '#define LPRTEMPLATE "'${LPRCOMMAND}' %s"' >> $tmpfile
-+    fi
-+    if test -n ${CATCOMMAND}; then
-+      echo '#define CATCOMMAND "'${CATCOMMAND}'"' >> $tmpfile
-+      echo '#define CATTEMPLATE "'${CATCOMMAND}' %s"' >> $tmpfile
-+    fi
-+
-+    case "${host}" in
-+      *-*-linux-gnu*) cat >> $tmpfile << '_EOF_'
-+#define TMPNAME_MAX NAME_MAX
-+static struct termio MyTtyStateIn, MyTtyStateOut;
-+
-+_EOF_
-+;;
-+      *) cat >> $tmpfile << '_EOF_'
-+
-+#define TMPNAME_MAX	1000
-+#define NAME_MAX	1000
-+static struct sgttyb MyTtyStateIn, MyTtyStateOut;
-+
-+_EOF_
-+;;
-+    esac
-+
-+    cat >> $tmpfile << '_EOF_'
-+
-+
-+#endif /* !METAMAIL_COMMON_H */
-+_EOF_
-+
-+    if cmp -s $tmpfile $outfile; then
-+      echo $outfile is unchanged
-+      rm -f $tmpfile
-+    else
-+      mv $tmpfile $outfile
-+      touch $stampfile
-+    fi
-+    ;;
-+  esac
-+# @start 5
-+
-+test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h.in
-+exit 0
-+EOF
-+chmod +x $CONFIG_STATUS
-+rm -fr confdefs* $ac_clean_files
-+test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-+
---- metamail-2.7.orig/configure.in
-+++ metamail-2.7/configure.in
-@@ -0,0 +1,361 @@
-+dnl Process this file with autoconf to produce a configure script.
-+dnl AC_REVISION($Revision: 1.4 $)dnl
-+AC_INIT(src/metamail/metamail.c)
-+AC_CONFIG_AUX_DIR(config)
-+AM_CONFIG_HEADER(metamail/config.h)
-+AM_INIT_AUTOMAKE(metamail, 0.0.1)
-+AM_MAINTAINER_MODE
-+
-+AC_CANONICAL_HOST
-+
-+dnl Checks for programs.
-+AC_PROG_CC
-+AM_PROG_LIBTOOL
-+AC_SUBST(LIBTOOL_DEPS)
-+
-+AC_CHECK_PROG(LPRCOMMAND, lp, lp)
-+AC_CHECK_PROG(LPRCOMMAND, lpr, lpr)
-+
-+AC_CHECK_PROG(CATCOMMAND, cat, cat)
-+AC_CHECK_PROG(CATCOMMAND, type, type)
-+
-+
-+dnl Checks for libraries.
-+
-+dnl Checks for header files.
-+dnl varargscheck ?
-+dnl AC_HEADER_STDC
-+AC_CHECK_HEADERS(stdlib.h unistd.h errno.h assert.h)
-+AC_CHECK_HEADERS(sys/time.h time.h signal.h)
-+AC_CHECK_HEADERS(string.h strings.h, break)
-+
-+# @start variadic
-+case $am_cv_prog_cc_stdc,$ac_cv_header_varargs_h in
-+no,)
-+	# Non-ANSI compiler, so we must use varargs.h.
-+	AC_CHECK_HEADERS(varargs.h)
-+	;;
-+*,yes)
-+	# Parent package is using varargs.h which is incompatible with 
-+	# stdarg.h, so we do the same (recheck to generate checking...
-+	# message).
-+	AC_CHECK_HEADERS(varargs.h)
-+	;;
-+*)
-+	# If stdarg.h is present define HAVE_STDARG_H.
-+	AC_CHECK_HEADERS(stdarg.h)
-+	;;
-+esac
-+
-+case x$ac_cv_header_stdarg_h$ac_cv_header_varargs_h in
-+x*yes*) ;;
-+*) AC_MSG_ERROR(Could not find stdarg.h or varargs.h, one of which is \
-+required for the build process.) ;;
-+esac
-+# @end variadic
-+
-+dnl Checks for typedefs, structures, and compiler characteristics.
-+AC_C_CONST
-+AC_TYPE_SIZE_T
-+AC_HEADER_TIME
-+
-+dnl Checks for library functions.
-+dnl bzero is ok, 
-+AC_CHECK_FUNCS(killpg kill)
-+AC_CHECK_FUNCS(bcopy memcpy)
-+AC_CHECK_FUNCS(bzero memset, break)
-+AC_CHECK_FUNCS(bcmp memcmp)
-+AC_CHECK_FUNCS(index strchr)
-+AC_CHECK_FUNCS(rindex strrchr)
-+AC_CHECK_FUNCS(initstate srand)
-+AC_CHECK_FUNCS(random rand)
-+
-+AC_CHECK_FUNCS(calloc)
-+AC_REPLACE_FUNCS(basename strerror vfprintf)
-+AC_REPLACE_FUNCS(putenv)
-+
-+dnl *****************************************
-+dnl create a metamail common header file, holding all needed definitions
-+dnl for copatiblity
-+AC_OUTPUT_COMMANDS([
-+  if test -n "$CONFIG_FILES" && test -n "$CONFIG_HEADERS"; then
-+    # If both these vars are non-empty, then config.status wasn't run by
-+    # automake rules (which always set one or the other to empty).
-+    CONFIG_OTHER=${CONFIG_OTHER-METAMAIL/common.h}
-+  fi
-+  case "$CONFIG_OTHER" in
-+  *metamail/common.h*)
-+    outfile=metamail/common.h
-+    stampfile=metamail/stamp-common
-+    tmpfile=${outfile}T
-+    dirname="sed s,^.*/,,g"
-+
-+    echo creating $outfile
-+    cat > $tmpfile << _EOF_
-+/*  -*- Mode: C -*-
-+ * --------------------------------------------------------------------
-+ * DO NOT EDIT THIS FILE!  It has been automatically generated
-+ * from:    configure.in and `echo $outfile|$dirname`.in
-+ * on host: `(hostname || uname -n) 2>/dev/null | sed 1q`
-+ * --------------------------------------------------------------------
-+ */
-+
-+#ifndef METAMAIL_COMMON_H
-+#define METAMAIL_COMMON_H 1
-+
-+#include <stdio.h>
-+#include <ctype.h>        // ??? ok here
-+#include <sys/types.h>
-+#include <sys/stat.h>     // ??? ok here
-+
-+// ??? following ok here without check?
-+#include <pwd.h>
-+#include <sys/time.h>
-+#include <sys/types.h>
-+#include <sys/file.h>
-+#include <signal.h>
-+
-+#include <termio.h>
-+#include <fcntl.h>
-+#include <sys/utsname.h>
-+_EOF_
-+
-+    case "${host}" in
-+      *-*-linux-gnu*) cat >> $tmpfile << '_EOF_'
-+
-+#include <linux/limits.h>
-+
-+_EOF_
-+;;
-+    esac
-+
-+# @end 5
-+# @start 4
-+    # Add the code to include these headers only if autoconf has
-+    # shown them to be present.
-+    if test x$ac_cv_header_stdlib_h = xyes; then
-+      echo '#include <stdlib.h>' >> $tmpfile
-+    fi
-+    if test x$ac_cv_header_unistd_h = xyes; then
-+      echo '#include <unistd.h>' >> $tmpfile
-+    fi
-+    if test x$ac_cv_header_sys_wait_h = xyes; then
-+      echo '#include <sys/wait.h>' >> $tmpfile
-+    fi
-+    if test x$ac_cv_header_errno_h = xyes; then
-+      echo '#include <errno.h>' >> $tmpfile
-+    fi
-+    cat >> $tmpfile << '_EOF_'
-+
-+#ifndef errno
-+/* Some sytems #define this! */
-+extern int errno;
-+#endif
-+
-+_EOF_
-+    if test x$ac_cv_header_string_h = xyes; then
-+      echo '#include <string.h>' >> $tmpfile
-+    elif test x$ac_cv_header_strings_h = xyes; then
-+      echo '#include <strings.h>' >> $tmpfile
-+    fi
-+
-+# *******************
-+# start variadic parameters 
-+#
-+    if test x$ac_cv_header_stdarg_h = xyes \
-+	&& test x$ac_cv_header_varargs_h != xyes
-+    then
-+      cat >> $tmpfile << '_EOF_'
-+
-+#include <stdarg.h>
-+#ifndef VA_START
-+#  define VA_START(a, f) va_start(a, f)
-+#endif /* VA_START */
-+
-+_EOF_
-+    else
-+      cat >> $tmpfile << '_EOF_'
-+	
-+#include <varargs.h>
-+#ifndef VA_START
-+#  define VA_START(a, f) va_start(a)
-+#endif /* VA_START */
-+       
-+_EOF_
-+    fi
-+#
-+# end variadic parameters
-+# ***********************
-+
-+    if test x$ac_cv_header_assert_h = xyes; then
-+      cat >> $tmpfile << '_EOF_'
-+
-+#include <assert.h>
-+#define METAMAIL_ASSERT assert
-+
-+_EOF_
-+else
-+        echo '#define METAMAIL_ASSERT(expr)  ((void) 0)' >> $tmpfile
-+    fi
-+# @end 4
-+# @start 5
-+    if test x$ac_cv_func_killpg = xno && \
-+       test x$ac_cv_func_kill = xyes; then
-+      cat >> $tmpfile << '_EOF_'
-+#define killbg(pid, sig) ((int) kill (-(pid), sig))
-+_EOF_
-+    fi 
-+    if test x$ac_cv_func_bcopy = xno && \
-+       test x$ac_cv_func_memcpy = xyes; then
-+      cat >> $tmpfile << '_EOF_'
-+#define bcopy(src, dest, n) ((void) memcpy (dest, src, n))
-+_EOF_
-+    fi
-+    if test x$ac_cv_func_bzero = xno && \
-+       test x$ac_cv_func_memset = xyes; then
-+      cat >> $tmpfile << '_EOF_'
-+#define bzero(buf, bytes) ((void) memset (buf, 0, bytes))
-+_EOF_
-+    fi
-+    if test x$ac_cv_func_bcmp = xno && \
-+       test x$ac_cv_func_memcmp = xyes; then
-+      echo '#define bcmp memcmp' >> $tmpfile
-+    fi
-+    if test x$ac_cv_func_index = xno && \
-+       test x$ac_cv_func_strchr = xyes; then
-+      echo '#define index strchr' >> $tmpfile
-+    fi
-+    if test x$ac_cv_func_rindex = xno && \
-+       test x$ac_cv_func_strrchr = xyes; then
-+      echo '#define rindex strrchr' >> $tmpfile
-+    fi
-+    if test x$ac_cv_func_initstate = xno && \
-+       test x$ac_cv_func_srand = xyes; then
-+      echo '#define initstate srand' >> $tmpfile
-+    fi
-+    if test x$ac_cv_func_random = xno && \
-+       test x$ac_cv_func_rand = xyes; then
-+      echo '#define random rand' >> $tmpfile
-+    fi
-+
-+    # The ugly but portable cpp stuff comes from here
-+    infile=$srcdir/metamail/`echo $outfile | sed 's,.*/,,g;s,\..*$,,g'`-h.in
-+    sed '/^##.*$/d' $infile >> $tmpfile 
-+
-+# @end 5
-+    ${RM-/bin/rm -f} ${tmpfile}2 2>/dev/null
-+    if test x$ac_cv_func_basename = xno; then
-+      echo 'extern char *basename PARAMS((const char *path));' >> ${tmpfile}2
-+    fi
-+    if test x$ac_cv_func_strerror = xno; then
-+      echo 'extern char *strerror PARAMS((int err));' >> ${tmpfile}2
-+    fi
-+    if test x$ac_cv_func_strsignal = xno; then
-+      echo 'extern char *strsignal PARAMS((int signo));' >> ${tmpfile}2
-+    fi
-+    if test x$ac_cv_func_vfprintf = xno; then
-+      echo 'extern int vfprintf PARAMS((FILE *file, const char* format, va_list ap));' >> ${tmpfile}2
-+    fi
-+    if test x$ac_cv_func_waitpid = xno; then 
-+	echo 'extern pid_t waitpid PARAMS((pid_t pid, int *pstatus, int options));' >> ${tmpfile}2
-+    fi
-+
-+    if test -f ${tmpfile}2; then
-+      cat >> $tmpfile << '_EOF_'
-+
-+BEGIN_C_DECLS
-+_EOF_
-+      cat ${tmpfile}2 >> $tmpfile
-+      echo 'END_C_DECLS' >> $tmpfile
-+      ${RM-/bin/rm -f} ${tmpfile}2 2>/dev/null
-+    fi
-+
-+    if test -n ${LPRCOMMAND}; then
-+      echo '#define LPRCOMMAND "'${LPRCOMMAND}'"' >> $tmpfile
-+      echo '#define LPRTEMPLATE "'${LPRCOMMAND}' %s"' >> $tmpfile
-+    fi
-+    if test -n ${CATCOMMAND}; then
-+      echo '#define CATCOMMAND "'${CATCOMMAND}'"' >> $tmpfile
-+      echo '#define CATTEMPLATE "'${CATCOMMAND}' %s"' >> $tmpfile
-+    fi
-+
-+    case "${host}" in
-+      *-*-linux-gnu*) cat >> $tmpfile << '_EOF_'
-+#define TMPNAME_MAX NAME_MAX
-+static struct termio MyTtyStateIn, MyTtyStateOut;
-+
-+_EOF_
-+;;
-+      *) cat >> $tmpfile << '_EOF_'
-+
-+#define TMPNAME_MAX	1000
-+#define NAME_MAX	1000
-+static struct sgttyb MyTtyStateIn, MyTtyStateOut;
-+
-+_EOF_
-+;;
-+    esac
-+
-+    cat >> $tmpfile << '_EOF_'
-+
-+
-+#endif /* !METAMAIL_COMMON_H */
-+_EOF_
-+
-+    if cmp -s $tmpfile $outfile; then
-+      echo $outfile is unchanged
-+      rm -f $tmpfile
-+    else
-+      mv $tmpfile $outfile
-+      touch $stampfile
-+    fi
-+    ;;
-+  esac
-+# @start 5
-+],[
-+  srcdir=$srcdir
-+  ac_cv_func_bzero=$ac_cv_func_bzero
-+  ac_cv_func_memset=$ac_cv_func_memset
-+  ac_cv_func_strchr=$ac_cv_func_strchr
-+  ac_cv_func_strrchr=$ac_cv_func_strrchr
-+# @end 5
-+  ac_cv_func_basename=$ac_cv_func_basename
-+  ac_cv_func_strcspn=$ac_cv_func_strcspn
-+  ac_cv_func_strerror=$ac_cv_func_strerror
-+  ac_cv_func_strsignal=$ac_cv_func_strsignal
-+  ac_cv_func_strspn=$ac_cv_func_strspn
-+  ac_cv_func_vfprintf=$ac_cv_func_vfprintf
-+  ac_cv_func_waitpid=$ac_cv_func_waitpid
-+  ac_cv_header_assert_h=$ac_cv_header_assert_h
-+  ac_cv_header_errno_h=$ac_cv_header_errno_h
-+  ac_cv_header_stdlib_h=$ac_cv_header_stdlib_h
-+  ac_cv_header_stdarg_h=$ac_cv_header_stdarg_h
-+  ac_cv_header_string_h=$ac_cv_header_string_h
-+  ac_cv_header_strings_h=$ac_cv_header_strings_h
-+  ac_cv_header_sys_wait_h=$ac_cv_header_sys_wait_h
-+  ac_cv_header_unistd_h=$ac_cv_header_unistd_h
-+  ac_cv_header_varargs_h=$ac_cv_header_varargs_h
-+  LPRCOMMAND=$LPRCOMMAND
-+  CATCOMMAND=$CATCOMMAND
-+  host=$host
-+# @start 5
-+])
-+# @end 5
-+# @start 1
-+
-+dnl *****************************************
-+dnl export of variable settings for Makefiles
-+
-+dnl for libtool to work LTLIBOJS is needed (currently bug of autoconf)
-+Xsed="sed -e s/^X//"
-+LTLIBOBJS=`echo X"$LIBOBJS"|[$Xsed -e "s,\.[^.]* ,.lo ,g;s,\.[^.]*$,.lo,"]`
-+AC_SUBST(LTLIBOBJS)
-+
-+dnl the aux dir (for holding config & autodenerated stuff)
-+AC_SUBST(ac_aux_dir)
-+AC_SUBST(LPRCOMMAND)
-+AC_SUBST(CATCOMMAND)
-+
-+AC_OUTPUT([Makefile replace/Makefile metamail/Makefile src/Makefile \
-+	   src/metamail/Makefile src/richmail/Makefile bin/Makefile],
-+[test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h.in])
---- metamail-2.7.orig/debian/mimeit.1
-+++ metamail-2.7/debian/mimeit.1
-@@ -0,0 +1,28 @@
-+.TH MIMEIT 1 "1998 March 1st" "METAMAIL" "Debian Linux Manual"
-+.SH NAME
-+mimeit \- base64-encode stdin and mail it
-+.SH SYNOPSIS
-+.B mimeit
-+.I content-type recipient subject
-+.RI [ splitmail-options ]
-+.SH "DESCRIPTION"
-+This manual page documents briefly the
-+.B mimeit
-+command.
-+This manual page was written for the
-+.B Debian GNU/Linux
-+distribution (but may be used by others), because the original
-+program does not have a manual page.
-+.PP
-+.B mimeit
-+base64-encodes the message read from stdin and sends it off
-+using
-+.BR splitmail (1).
-+It will pass all but the first three parameters to \fBsplitmail\fR(1).
-+.SH AUTHOR
-+.B mimeit
-+is part of metamail package.  Manual page added by Herbert Xu
-+and fixed by Michael Moerz <e9625136@stud3.tuwien.ac.at>.
-+.SH SEE ALSO
-+.PP
-+\fBMIME\fR(1), \fBsplitmail\fR(1), \fBmunpack\fR(1), \fBmetamail\fR(1)
---- metamail-2.7.orig/debian/mime
-+++ metamail-2.7/debian/mime
-@@ -0,0 +1,7 @@
-+text/plain; shownonascii iso-8859-1 %s; description="Plain ASCII Text"; test=test "$(echo %{charset} | tr "[A-Z]" "[a-z]")" = iso-8859-1 -a "$DISPLAY" != ""
-+text/richtext; richtext %s; description="Richtext"; copiousoutput; priority=4
-+text/richtext; shownonascii iso-8859-1 -e richtext -p %s; description="Richtext"; copiousoutput; test=test "$(echo %{charset} | tr "[A-Z]" "[a-z]")" = iso-8859-1 -a "$DISPLAY" != ""
-+text/enriched; richtext -e %s; description="Enriched Text"; copiousoutput; priority=4
-+text/enriched; shownonascii iso-8859-1 -e richtext -e -p %s; description="Enriched Text"; copiousoutput; test=test "$(echo %{charset} | tr "[A-Z]" "[a-z]")" = iso-8859-1 -a "$DISPLAY" != ""
-+message/partial; showpartial %s %{id} %{number} %{total}; description="An incomplete message"
-+message/external-body; showexternal %s %{access-type} %{name} %{site} %{directory} %{mode} %{server}; needsterminal; description="A reference to data stored in an external location"; composetyped="extcompose %s"
---- metamail-2.7.orig/debian/changelog
-+++ metamail-2.7/debian/changelog
-@@ -0,0 +1,435 @@
-+metamail (2.7-52) unstable; urgency=low
-+
-+  * QA Group upload.
-+  * Set Standards-Version to 3.7.2.
-+  * Set DH_COMPAT to 5.
-+  * Fixed "Does not provide filenames for attachments", closes:
-+    #321968. Patch by Immanuel Halupczok <debian-bugs@karimmi.de>.
-+  * Fixed "dumps core with -w option", closes: #357163.
-+    Patch by Justin Pryzby <justinpryzby@users.sourceforge.net>.
-+
-+ -- Anibal Monsalve Salazar <anibal@debian.org>  Wed, 19 Jul 2006 12:53:40 +1000
-+
-+metamail (2.7-51) unstable; urgency=high
-+
-+  * QA upload.
-+  * Fixed "[CVE-2006-0709] crashes with very long boundaries in
-+    messages", closes: #352482, #353539. Patch thanks to
-+    Ulf Harnhammar <metaur@telia.com>.
-+
-+ -- Anibal Monsalve Salazar <anibal@debian.org>  Thu, 23 Feb 2006 09:17:36 +1100
-+
-+metamail (2.7-50) unstable; urgency=low
-+
-+  * QA upload.
-+  * Automatically update config.sub and config.guess from autotools-dev.
-+    Closes: #338566.
-+  * man/metamail.1: Fix search path formatting.
-+
-+ -- Matej Vela <vela@debian.org>  Fri, 11 Nov 2005 07:42:03 +0100
-+
-+metamail (2.7-49) unstable; urgency=low
-+
-+  * QA upload.
-+  * bin/uuenpipe, bin/uudepipe: Properly handle unreadable files,
-+    filenames beginning with "-", and filenames containing whitespace.
-+    (These scripts were not meant to take options.)  Closes: #273195.
-+  * src/metamail/mailto.c (GetLineMalloced): Fix segfault caused by
-+    freeing static storage.  Closes: #300756.
-+  * man/metamail.1: Document the -E option.  Closes: #177823.
-+  * man/richtext.1: Document the -e option.  Closes: #296120.
-+  * Conforms to Standards version 3.6.2.
-+
-+ -- Matej Vela <vela@debian.org>  Fri, 19 Aug 2005 11:25:02 +0200
-+
-+metamail (2.7-48) unstable; urgency=low
-+
-+  * QA Group upload by Javier Fernandez-Sanguino
-+  * Fix typos in manpages with patches provided by A Costa (Closes: #311450,
-+    #311451, #311452, #311453)
-+  * Fix use of temporary files in showpartial so that uses cannot introduce
-+    a DOS through the use of hard links. Temporary files are created with
-+    mktemp and their filename is stored in ~/.metamail_treeroot (Closes:
-+    #321473)
-+
-+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Wed, 17 Aug 2005 00:17:20 +0200
-+
-+metamail (2.7-47) unstable; urgency=low
-+
-+  * QA Group upload by Anibal Monsalve Salazar.
-+  * Fixed "Add/Improve SEE ALSO section for splitmail/mimeit" (Closes:
-+    #245647). Patch by Helge Kreutzmann <kreutzm@itp.uni-hannover.de>.
-+  * Fixed "8-bit encoding is supported by metamail but not by metasend script"
-+    (Closes: #285914). Patch by Sergey Kogan <kogan@sklad.bacon.ru>.
-+  * Fixed "additional option when handling unrecognized content types"
-+    (Closes: #249823). Patch by Daniel Kraft <da_kraft@web.de>.
-+  * Fixed "debug message 'pre access' left in released version
-+    (Closes: #184410). Patch by <pmaydell@chiark.greenend.org.uk>.
-+
-+ -- Anibal Monsalve Salazar <anibal@debian.org>  Sun, 13 Feb 2005 10:43:55 +1100
-+
-+metamail (2.7-46) unstable; urgency=low
-+
-+  * QA Group upload orphaning this package
-+  * Incorporates previous NMUs (closes: #164074, #185005, #233935)
-+  * debian/control: make build-dependency on debhelper versioned
-+
-+ -- Andrew Pollock <apollock@debian.org>  Tue,  9 Nov 2004 22:14:08 +1100
-+
-+metamail (2.7-45.3) unstable; urgency=medium
-+
-+  * Non-maintainer upload by the Security Team
-+  * Adjust the patch since Christian 'Naddy' Weisgerber discovered an
-+    overzealous use of sizeof().
-+
-+ -- Martin Schulze <joey@infodrom.org>  Tue,  2 Mar 2004 20:08:51 +0100
-+
-+metamail (2.7-45.2) unstable; urgency=high
-+
-+  * NMU
-+  * [src/metamail/metamail.c, src/metamail/splitmail.c] Address CAN-2004-0104
-+    and CAN-2004-0105 (format string vulnerabilities and buffer overflows).
-+    (Addresses #233640 for sid)
-+  * [bin/audiocompose] Quote file reference.
-+  * [metamail/splitmail.c] Use /usr/sbin/sendmail rather than
-+    /usr/lib/sendmail.
-+
-+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Fri, 20 Feb 2004 21:22:16 +0100
-+
-+metamail (2.7-45.1) unstable; urgency=low
-+
-+  * NMU
-+  * Fixed FTBFS: (Closes: #164074)
-+    * [configure.in] Added AM_MAINTAINER_MODE.
-+    * [debian/rules] Introduced "source-updates" target.
-+    * [debian/control] Dropped "libtool" and "automake" build dependencies.
-+    * Regenerated auto* files.
-+  * [bin/audiosend] Fixed shell syntax by adding a 'then'.
-+  * [debian/control] Removed full stop from the one line description.
-+
-+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Sun, 16 Mar 2003 13:38:42 +0100
-+
-+metamail (2.7-45) unstable; urgency=low
-+
-+  * eliminated nasty tmpfile bug that caused removal of temporary files
-+    though they were in use by processes that have been backgrounded by
-+    metamail. (Closes: #141966)
-+
-+ -- Michael Moerz <mikem@debian.org>  Mon, 15 Apr 2002 11:07:17 +0200
-+
-+metamail (2.7-44) unstable; urgency=low
-+
-+  * renamed mmencode reference from metamail manpage to mimencode
-+    (Closes: #137347)
-+  * removed mailcap manpage from metamail package so that can go into
-+    the mime-support package (Closes:  #139989)
-+
-+ -- Michael Moerz <mikem@debian.org>  Wed,  3 Apr 2002 02:24:53 +0200
-+
-+metamail (2.7-43) unstable; urgency=low
-+
-+  * fixed 64bit architecture problems caused by missing prototypes of
-+    functions. The actual pactch was developed by 
-+    John R.Daily" <jdaily@progeny.com> (Closes: #126109)
-+  * fixed usage message of mimencode by using a patch supplied by
-+    David Fries <dfries@mail.win.org> (Closes: #119075)
-+
-+ -- Michael Moerz <mikem@debian.org>  Sat, 22 Dec 2001 00:35:19 +0100
-+
-+metamail (2.7-42) unstable; urgency=low
-+
-+  * fixed bug that caused mailto to honour newlines incorrectly when
-+    mimetypes are asked for and checked.
-+
-+ -- Michael Moerz <mikem@debian.org>  Mon, 15 Oct 2001 22:11:35 +0200
-+
-+metamail (2.7-41) unstable; urgency=low
-+
-+  * fixed a minor bug regarding the man page of metamail saying /usr/ucb/reset
-+    and not /usr/bin/reset (Closes: #110889)
-+  * fixed broken showpartial (Closes: #107538)
-+
-+ -- Michael Moerz <mikem@debian.org>  Sat,  1 Sep 2001 20:32:01 +0200
-+
-+metamail (2.7-40) unstable; urgency=low
-+
-+  * Removed non functional downwards compatiblity code for older
-+    mime-support which called install-mime when the previous metamail
-+    version was less than 2-7.34. (Closes: #100993)
-+  * hardened dependency to mime-support (version 3.11-1 or higher has
-+    to be installed now)
-+
-+ -- Michael Moerz <mikem@debian.org>  Sat, 16 Jun 2001 13:48:12 +0200
-+
-+metamail (2.7-39) unstable; urgency=low
-+
-+  * fixed a bug that created a segfault when saving an attachment.
-+    (Closes: #88766)
-+
-+ -- Michael Moerz <e9625136@stud3.tuwien.ac.at>  Tue, 20 Mar 2001 20:52:20 +0100
-+
-+metamail (2.7-38) unstable; urgency=low
-+
-+  * stupid me has again missed a build depends for libncurses-dev.
-+    This is fixed now. (Closes: #86559)
-+
-+ -- Michael Moerz <e9625136@stud3.tuwien.ac.at>  Sun, 25 Feb 2001 17:05:45 +0100
-+
-+metamail (2.7-37) unstable; urgency=low
-+
-+  * Fixed broken build caused by not using a shell for interpreting
-+    the bootstrap script (Closes: #85764).
-+  * changed rules file so that not only the existence of Makefile
-+    is checked, but of Makefile.in too and the decision is made
-+    to use make clean or make destclean (Makefile.in present).
-+  * fixed build depends to enlist libtool & automake too.
-+    (Closes: #86128)
-+  * fixed disappearing of mimencode (Closes: #86083)
-+
-+ -- Michael Moerz <e9625136@stud3.tuwien.ac.at>  Tue, 13 Feb 2001 14:08:20 +0100
-+
-+metamail (2.7-36) unstable; urgency=low
-+
-+  * Fixed broken showpartial where a variable was not set correctly
-+    (nullified) and that caused that showpartial didn't work.
-+    (Closes: #58614)
-+  * Fixed mimeit manpage refering to mm package instead of metamail
-+    (Closes: #63033)
-+  * added a README.Debian pointing out the debian specific
-+    modifications to the package
-+  * Fixed the leaving tmp-files behind bug. So now metamail removes
-+    all files it generates in /tmp before it terminates.
-+    (Closes: #39011)
-+  * DH_COMPAT=2 is now in place and functional
-+  * converted build-process and .c and .h files to use autoconf and
-+    automake. (Now the package will build under woody again.) 
-+
-+ -- Michael Moerz <e9625136@stud3.tuwien.ac.at>  Thu, 18 Jan 2001 04:26:05 +0100
-+
-+metamail (2.7-35) unstable; urgency=low
-+
-+  * Fixed a typo in metasend that resulted in Content-Description
-+    being blank when -n wasn't set. (Closes: #70761)
-+
-+ -- Teemu Hukkanen <tjhukkan@iki.fi>  Sun, 10 Sep 2000 21:58:00 +0300
-+
-+metamail (2.7-34) frozen unstable; urgency=low
-+
-+  * The install-all target tried to strip shell scripts, plus several
-+    additional flaws, which prevented building, closes: #55260.
-+  * Updated for newer mime-support, closes: #47097. Downgraded
-+    mime-support dependency to a recommendation, and removed useless
-+    version (as the new scheme is used, and 2.02-1 is too old for it).
-+  * Updated for Policy 3.1.1.
-+
-+ -- Josip Rodin <jrodin@jagor.srce.hr>  Tue,  8 Feb 2000 21:15:19 +0100
-+
-+metamail (2.7-33) unstable; urgency=low
-+
-+  * Orphaning metamail.
-+
-+ -- Herbert Xu <herbert@debian.org>  Sat, 20 Nov 1999 20:33:36 -0600
-+
-+metamail (2.7-32) unstable; urgency=low
-+
-+  * Fixed postinst script where it didn't add mailcap entries for an initial
-+    install.
-+  * Don't warn about wild cards in mailcap (fixes #30910).
-+  * Use $() instead of `` for command substitution (fixes #33487).
-+    Note that metamail does %{} substitutions with the correct quoting.
-+    Indeed, it filters out characters like ` so there is no problem even if
-+    this fix were not there.  But other applications that currently do not do
-+    the required quoting should do so.
-+    Also, all packages that add entries to mailcap should check their entries
-+    and replace all `` with % substitutions inside with $() so as to avoid
-+    the obscure shell rule that `` is terminated by a un-backslashed back-
-+    quote.  Indeed, if this back-quote occurs within single or double quotes,
-+    the result is undefined.
-+
-+ -- Herbert Xu <herbert@debian.org>  Sun, 14 Mar 1999 12:58:05 +1100
-+
-+metamail (2.7-31) frozen unstable; urgency=low
-+
-+  * Uploaded to slink.
-+
-+ -- Herbert Xu <herbert@debian.org>  Sun, 15 Nov 1998 15:11:52 +1100
-+
-+metamail (2.7-30) unstable; urgency=low
-+
-+  * Use lpr instead of lp for linux (fixes #27259).
-+  * Removed all traces of mmencode (fixes #28746).
-+  * Rebuilt with libncruses4.
-+
-+ -- Herbert Xu <herbert@debian.org>  Sat, 31 Oct 1998 15:16:13 +1100
-+
-+metamail (2.7-29) unstable; urgency=medium
-+
-+  * Applied security patch from Topi Miettinen (fixes #26877).
-+
-+ -- Herbert Xu <herbert@debian.org>  Tue, 22 Sep 1998 14:29:27 +1000
-+
-+metamail (2.7-28) frozen unstable; urgency=high
-+
-+  * Fixed showpartial (fixes #23595).
-+
-+ -- Herbert Xu <herbert@debian.org>  Thu, 18 Jun 1998 09:41:50 +1000
-+
-+metamail (2.7-27) unstable; urgency=low
-+
-+  * Fixed shownonascii (fixes #19862).
-+  * Manually add mimencode.1.
-+
-+ -- Herbert Xu <herbert@debian.org>  Wed, 18 Mar 1998 21:06:39 +1100
-+
-+metamail (2.7-26) unstable; urgency=low
-+
-+  * Added -e to all shell scripts (fixes #19802).
-+  * Removed #!/bin/sh header from mime.noinstall.
-+
-+ -- Herbert Xu <herbert@debian.org>  Tue, 17 Mar 1998 21:22:25 +1100
-+
-+metamail (2.7-25) unstable; urgency=low
-+
-+  * Use sensible-pager instead of pager.
-+  * Upgraded to Standard Version 2.4.0.0.
-+  * Removed
-+    . mailserver
-+    . mailto-hebrew
-+    . rcvAppSingle
-+    . richtoatk
-+    . sndAppSingle
-+    . sun-audio-file
-+    . sun-message
-+    . sun-to-mime
-+    . sun2mime
-+    as they were either not functional or useless and without a manpage.
-+  * Added manpages to mimeit, uuencode and uudecode (fixes #6332).
-+  * Converted to debhelper.
-+  * Moved mailcap from section 4 to section 5.
-+
-+ -- Herbert Xu <herbert@debian.org>  Mon,  2 Mar 1998 15:46:44 +1100
-+
-+metamail (2.7-24) unstable; urgency=high
-+
-+  * Use tempfile for temporary files.
-+  * Removed sun-message.csh.
-+
-+ -- Herbert Xu <herbert@debian.org>  Wed, 15 Oct 1997 10:29:16 +1000
-+
-+metamail (2.7-23) unstable; urgency=low
-+
-+  * Fixed uudepipe (#12371).
-+
-+ -- Herbert Xu <herbert@debian.org>  Tue,  2 Sep 1997 21:37:01 +1000
-+
-+metamail (2.7-22) unstable; urgency=low
-+
-+  * Recompiled with libc6.
-+  * Removed recommendation of xv | xloadimage (#9706).
-+
-+ -- Herbert Xu <herbert@debian.org>  Sat, 21 Jun 1997 16:17:29 +1000
-+
-+metamail (2.7-21) stable frozen unstable; urgency=high
-+
-+  * Recompiled with gcc-2.7.2.1-8.
-+
-+ -- Herbert Xu <herbert@debian.org>  Sun, 4 May 1997 23:16:22 +1000
-+
-+metamail (2.7-20) stable frozen unstable; urgency=high
-+
-+  * Applyed Olaf Kirch's patch for a possible security hole.
-+  * Changed all /usr/lib/sendmail to /usr/sbin/sendmail.
-+
-+ -- Herbert Xu <herbert@debian.org>  Wed, 30 Apr 1997 16:30:51 +1000
-+
-+metamail (2.7-19) unstable; urgency=low
-+
-+  * Be smarter about running install-mime when upgrading (#7859).
-+  * Changed links to undocumented.7 to undocumented.7.gz.
-+
-+ -- Herbert Xu <herbert@debian.org>  Mon, 10 Mar 1997 19:44:54 +1100
-+
-+metamail (2.7-18) unstable; urgency=low
-+
-+  * Substitued which for whence (#7233).
-+
-+ -- Herbert Xu <herbert@debian.org>  Tue, 11 Feb 1997 17:34:39 +1100
-+
-+metamail (2.7-17) unstable; urgency=low
-+
-+  * New maintainer.
-+  * Changed all "RM=/bin/rm" to "RM=rm" in Makefiles.
-+  * Modified debian/rules and Makefiles to use debstd.
-+  * Adding undocumented links.
-+  * Adding #!/bin/sh to shell scripts to help identification.
-+  * Fixed bug #6104 and removed extraneous blanks in mailcap.4.
-+
-+ -- Herbert Xu <herbert@debian.org>  Wed, 15 Jan 1997 20:45:07 +1100
-+
-+metamail (2.7-16) unstable; urgency=LOW
-+
-+  * Fixed postinst (Bug#5606)
-+
-+ -- Michael Meskes <meskes@debian.org>  Thu, 5 Dec 1996 14:55:23 +0100
-+
-+metamail (2.7-15) frozen unstable; urgency=MEDIUM
-+
-+  * sun2mime now calls /usr/bin/nawk (Bug#5488)
-+
-+ -- Michael Meskes <meskes@debian.org>  Tue, 19 Nov 1996 09:37:17 +0100
-+
-+metamail (2.7-14) frozen unstable; urgency=MEDIUM
-+
-+  * Corrected metasend (and other scripts) to not call echo-n (Bug#5397).
-+  * remove echo-n from distribution
-+
-+ -- Michael Meskes <meskes@debian.org>  Wed, 13 Nov 1996 17:25:19 +0100
-+
-+metamail (2.7-13) unstable; urgency=LOW
-+
-+  * Cleaned up postinst (Bug#4720). Other install-mime calls are now
-+  * installed just as a doc file.
-+
-+ -- Michael Meskes <meskes@debian.org>  Sat, 12 Oct 1996 15:15:50 +0200
-+
-+metamail (2.7-12) unstable; urgency=LOW
-+
-+  * Added 'Recommends: sharutils' (Bug#4616)
-+
-+ -- Michael Meskes <meskes@debian.org>  Mon, 30 Sep 1996 14:01:30 +0200
-+
-+metamail (2.7-11) unstable; urgency=LOW
-+
-+  * Moved Bourne shell scripts into bin directory, so dpkg-source works.
-+  * Fixed showpicture to not use a geometry
-+
-+ -- Michael Meskes <meskes@debian.org>  Sun, 29 Sep 1996 13:52:41 +0200
-+
-+metamail (2.7-10) unstable; urgency=LOW
-+
-+  * Fixed that silly naming bug that caused postinst to be installed as
-+  * binary in /usr/bin (bug#4425)
-+
-+ -- Michael Meskes <meskes@debian.org>  Sat, 7 Sep 1996 12:59:13 +0200
-+
-+metamail (2.7-9) unstable; urgency=LOW
-+
-+  * Corrected some minor bugs in debian/ directory and adjusted debian/rules
-+  * accordingly. Conversion to new packaging scheme is now completed.
-+
-+ -- Michael Meskes <meskes@debian.org>  Sun, 1 Sep 1996 11:39:03 +0200
-+
-+metamail (2.7-8) unstable; urgency=LOW
-+
-+  * Corrected font name in postinst
-+  * Corrected rules file to not install /usr/doc/copyright/README
-+
-+ -- Michael Meskes <meskes@debian.org>  Thu, 29 Aug 1996 17:11:43 +0200
-+
-+metamail (2.7-7) unstable; urgency=LOW
-+
-+  * Corrected dependency (Bug#4305)
-+  * New packaging scheme
-+
-+ -- Michael Meskes <meskes@debian.org>  Wed, 28 Aug 1996 14:05:10 +0200
-+
---- metamail-2.7.orig/debian/control
-+++ metamail-2.7/debian/control
-@@ -0,0 +1,23 @@
-+Source: metamail
-+Section: mail
-+Priority: optional
-+Maintainer: Debian QA Group <packages@qa.debian.org>
-+Build-Depends: debhelper (>= 5), autotools-dev, libncurses-dev
-+Standards-Version: 3.7.2
-+
-+Package: metamail
-+Section: mail
-+Architecture: any
-+Depends: ${shlibs:Depends}, ${misc:Depends}
-+Recommends: sharutils, mime-support (>=3.11-1)
-+Description: implementation of MIME
-+ Metamail is an implementation of Multi-purpose Internet Mail
-+ Extensions (MIME), a proposed standard for multimedia electronic
-+ mail on the Internet.
-+ .
-+ Metamail is configurable and extensible via the "mailcap" mechanism
-+ described in an informational RFC that is a companion to the MIME
-+ document.  Metamail can be used to turn virtually any mail reader
-+ program into a multimedia mail reader.  For information about how
-+ to change mail readers so that they can use Metamail, please read
-+ the file `/usr/share/doc/metamail/mailers.txt.gz'.
---- metamail-2.7.orig/debian/mimencode.1
-+++ metamail-2.7/debian/mimencode.1
-@@ -0,0 +1,52 @@
-+.TH MIMENCODE 1 "Release 1" "Bellcore Prototype"
-+.SH NAME
-+mimencode - Translate to and from mail-oriented encoding formats
-+.SH SYNOPSIS
-+.ta 8n
-+\fBmimencode\fP	[-u] [-b] [-q] [-p] [file name] [-o outputfile]
-+.br
-+.SH DESCRIPTION
-+The
-+.I mimencode
-+program simply converts a byte stream into (or out of) one of the standard mail encoding formats defined by MIME, the proposed standard for internet multimedia mail formats.  Such an encoding is necessary because binary data cannot be sent through the mail.  The encodings understood by mimencode are preferable to the use of the uuencode/uudecode programs, for use in mail, in several respects that were important to the authors of MIME.
-+
-+By default, mimencode reads standard input, and sends a "base64" encoded version of the input to standard output.
-+
-+The (really not necessary) "-b" option tells mimencode to use the "base64" encoding.
-+
-+The "-q" option tells mimencode to use the "quoted-printable" encoding instead of base64.
-+
-+The "-u" option tells mimencode to 
-+.I
-+decode
-+the standard input rather than encode it.  
-+
-+The "-p" option tells mimencode to translate decoded CRLF sequences into the local newline convention during decoding and to do the reverse during encoding.  This option is only meaningful when  -b (base64 encoding) is in effect.
-+
-+If a file name argument is given, input is read from that file rather than from standard input.
-+
-+The "-o" option, which must be followed by a file name, sends output to the named file rather than to standard output.
-+.SH RATIONALE
-+.I
-+Mimencode
-+is intended to be a replacement for 
-+.I
-+uuencode
-+for mail and news use.  The reason is simple:  uuencode doesn't work very well in a number of circumstances and ways.  In particular, uuencode uses characters that don't translate well across all mail gateways (particularly ASCII <-> EBCDIC gateways).  Also, uuencode is not standard -- there are several variants floating around, encoding and decoding things in different and incompatible ways, with no "standard" on which to base an implementation.  Finally, uuencode does not generally work well in a pipe, although some variants have been modified to do so.  Mimencode implements the encodings which were defined for MIME as uuencode replacements, and should be considerably more robust for email use.
-+.SH SEE ALSO
-+metamail(1), mailto(1)
-+.SH COPYRIGHT
-+Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+
-+Permission to use, copy, modify, and distribute this material 
-+for any purpose and without fee is hereby granted, provided 
-+that the above copyright notice and this permission notice 
-+appear in all copies, and that the name of Bellcore not be 
-+used in advertising or publicity pertaining to this 
-+material without the specific, prior written permission 
-+of an authorized representative of Bellcore.  BELLCORE 
-+MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+.SH AUTHOR
-+Nathaniel S. Borenstein
---- metamail-2.7.orig/debian/rules
-+++ metamail-2.7/debian/rules
-@@ -0,0 +1,115 @@
-+#!/usr/bin/make -f
-+# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
-+
-+# Uncomment this to turn on verbose mode.
-+export DH_VERBOSE=1
-+
-+# the debhelper compatiblity version
-+export DH_COMPAT=5
-+
-+export INTERNAL_DESTDIR=debian/tmp
-+
-+MAJOR=0
-+MINOR=0.0
-+
-+source-updates:
-+	dh_testdir
-+	sh bootstrap
-+
-+build: build-stamp
-+build-stamp:
-+	dh_testdir
-+	ln -sf /usr/share/misc/config.sub /usr/share/misc/config.guess config
-+	chmod +x ./configure
-+	./configure --prefix=/usr
-+	$(MAKE)
-+	touch $@
-+
-+clean:
-+	dh_testdir
-+	dh_testroot
-+	-if test -e Makefile; then \
-+	  if test -e Makefile.in; then \
-+		$(MAKE) distclean; \
-+	  else \
-+		$(MAKE) clean; \
-+	  fi \
-+	 fi
-+	rm -f config/config.sub config/config.guess
-+	dh_clean build-stamp install-stamp mimencode.1
-+
-+install: install-stamp
-+install-stamp: build
-+	dh_testdir
-+	dh_testroot
-+	dh_clean -k
-+	dh_installdirs
-+
-+	-$(MAKE) install DESTDIR=`pwd`/$(INTERNAL_DESTDIR)
-+
-+	cd $(INTERNAL_DESTDIR)/usr/bin && rm sun-message.csh mailserver \
-+	  rcvAppleSingle richtoatk sndAppleSingle sun-audio-file \
-+          sun-message sun-to-mime sun2mime mailto-hebrew
-+
-+	touch $@
-+
-+binary-indep:
-+# No arch-indep packages to be built here.
-+
-+binary-arch: build install metamail
-+
-+
-+metamail: build install
-+	dh_testdir -pmetamail
-+	dh_testroot -pmetamail
-+
-+	dh_installdirs -pmetamail
-+	dh_movefiles -pmetamail
-+	cp man/mmencode.1 debian/mimencode.1
-+
-+	dh_link -pmetamail usr/lib/libmetamail.so.$(MAJOR).$(MINOR) \
-+	  usr/lib/libmetamail.so.$(MAJOR)
-+
-+	dh_installdocs -pmetamail CREDITS README mailers.txt \
-+	  debian/mime.noinstall
-+	dh_installchangelogs -pmetamail
-+	dh_installmime -pmetamail
-+	dh_installmanpages -pmetamail mmencode.1 mailto-hebrew.1 mailcap.4 \
-+	    mailcap.5
-+	dh_strip -pmetamail
-+	dh_compress -pmetamail
-+	dh_fixperms -pmetamail
-+	dh_makeshlibs -pmetamail
-+	dh_installdeb -pmetamail
-+	dh_shlibdeps -pmetamail -l$(shell pwd)/debian/metamail/usr/lib
-+	dh_gencontrol -pmetamail -- -isp
-+	dh_md5sums -pmetamail
-+	dh_builddeb -pmetamail
-+
-+#libmetamail0: build install
-+#	dh_testdir -plibmetamail0
-+#	dh_testroot -plibmetamail0
-+
-+#	dh_installdirs -plibmetamail0
-+#	dh_movefiles -plibmetamail0
-+
-+#	dh_link -plibmetamail0 usr/lib/libmetamail.so.$(MAJOR).$(MINOR) \
-+#	  usr/lib/libmetamail.so.$(MAJOR)
-+
-+#	dh_installdocs -plibmetamail0
-+#	dh_installchangelogs -plibmetamail0
-+#	dh_strip -plibmetamail0
-+#	dh_compress -plibmetamail0
-+#	dh_fixperms -plibmetamail0
-+#	dh_installdeb -plibmetamail0
-+#	dh_shlibdeps -plibmetamail0
-+#	dh_gencontrol -plibmetamail0
-+#	dh_makeshlibs -plibmetamail0 -V
-+#	dh_md5sums -plibmetamail0
-+#	dh_builddeb -plibmetamail0
-+
-+
-+binary: binary-indep binary-arch
-+.PHONY: build clean binary-indep binary-arch binary
-+
-+
---- metamail-2.7.orig/debian/metamail.files
-+++ metamail-2.7/debian/metamail.files
-@@ -0,0 +1,3 @@
-+usr/bin
-+usr/lib/libmetamail.so.*
-+
---- metamail-2.7.orig/debian/shlibs.local
-+++ metamail-2.7/debian/shlibs.local
-@@ -0,0 +1 @@
-+libmetamail 0 
---- metamail-2.7.orig/debian/mime.noinstall
-+++ metamail-2.7/debian/mime.noinstall
-@@ -0,0 +1,5 @@
-+image/*; showpicture -viewer xv %s; description="All Graphic Images"
-+image/*; showpicture -viewer "xloadimage -view -quiet" %s; description="All Graphic Images"
-+audio/*; showaudio %s; description="All Audio Subtypes"
-+audio/basic; showaudio %s; compose="audiocompose %s"; edit="audiocompose %s"; description="An Audio Fragment"
-+audio-file; sun-audio-file %s; description="Sun Audio Message"
---- metamail-2.7.orig/debian/README.Debian
-+++ metamail-2.7/debian/README.Debian
-@@ -0,0 +1,12 @@
-+This is the Debian GNU/Linux prepackaged version of the metamail package.
-+
-+It installs only a basis of the scripts included in the original metamail
-+package. Excluded are Apple specifics (rcvAppleSingle, sndAppleSingle),
-+sun specifics (sun-message.csh, sun-audio-file, sun-message, sun-to-mime,
-+sun2mime), hebrew specifics (mailto-hebrew), mailserver extensions 
-+(mailserver), binary wrapper extensions for mimeencode (mmencode) and richtoak.
-+
-+I had to fix the source by adding a doublinked list that stores all opened
-+tmp files. This list is used at before the program terminates so that all
-+tmp files get properly removed.
-+
---- metamail-2.7.orig/debian/copyright
-+++ metamail-2.7/debian/copyright
-@@ -0,0 +1,37 @@
-+This is the Debian GNU/Linux prepackaged version of Metamail.
-+
-+This package was put together by Michael Meskes <meskes@debian.org>,
-+from sources obtained from:
-+ ftp.bellcore.com:/pub/nsb/mm2.7.tar.Z and /pub/nsb/contrib2.7.tar.Z
-+
-+This package was then worked on by Herbert Xu <herbert@debian.org>.
-+
-+****************************************************************
-+Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+
-+Permission to use, copy, modify, and distribute this material 
-+for any purpose and without fee is hereby granted, provided 
-+that the above copyright notice and this permission notice 
-+appear in all copies, and that the name of Bellcore not be 
-+used in advertising or publicity pertaining to this 
-+material without the specific, prior written permission 
-+of an authorized representative of Bellcore.  BELLCORE 
-+MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+****************************************************************
-+
-+Most scripts are:
-+
-+# Conversion from C shell to Bourne shell by Z-Code Software Corp.
-+# Conversion Copyright (c) 1992 Z-Code Software Corp.
-+# Permission to use, copy, modify, and distribute this material
-+# for any purpose and without fee is hereby granted, provided
-+# that the above copyright notice and this permission notice
-+# appear in all copies, and that the name of Z-Code Software not
-+# be used in advertising or publicity pertaining to this
-+# material without the specific, prior written permission
-+# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
---- metamail-2.7.orig/config/depcomp
-+++ metamail-2.7/config/depcomp
-@@ -0,0 +1,411 @@
-+#! /bin/sh
-+
-+# depcomp - compile a program generating dependencies as side-effects
-+# Copyright 1999, 2000 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-+
-+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-+  exit 1
-+fi
-+# `libtool' can also be set to `yes' or `no'.
-+
-+depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
-+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-+
-+rm -f "$tmpdepfile"
-+
-+# Some modes work just like other modes, but use different flags.  We
-+# parameterize here, but still list the modes in the big case below,
-+# to make depend.m4 easier to write.  Note that we *cannot* use a case
-+# here, because this file can only contain one case statement.
-+if test "$depmode" = hp; then
-+  # HP compiler uses -M and no extra arg.
-+  gccflag=-M
-+  depmode=gcc
-+fi
-+
-+if test "$depmode" = dashXmstdout; then
-+   # This is just like dashmstdout with a different argument.
-+   dashmflag=-xM
-+   depmode=dashmstdout
-+fi
-+
-+case "$depmode" in
-+gcc3)
-+## gcc 3 implements dependency tracking that does exactly what
-+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-+## it if -MD -MP comes after the -MF stuff.  Hmm.
-+  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+  mv "$tmpdepfile" "$depfile"
-+  ;;
-+
-+gcc)
-+## There are various ways to get dependency output from gcc.  Here's
-+## why we pick this rather obscure method:
-+## - Don't want to use -MD because we'd like the dependencies to end
-+##   up in a subdir.  Having to rename by hand is ugly.
-+##   (We might end up doing this anyway to support other compilers.)
-+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-+##   -MM, not -M (despite what the docs say).
-+## - Using -M directly means running the compiler twice (even worse
-+##   than renaming).
-+  if test -z "$gccflag"; then
-+    gccflag=-MD,
-+  fi
-+  "$@" -Wp,"$gccflag$tmpdepfile"
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+  rm -f "$depfile"
-+  echo "$object : \\" > "$depfile"
-+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-+## The second -e expression handles DOS-style file names with drive letters.
-+  sed -e 's/^[^:]*: / /' \
-+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-+## This next piece of magic avoids the `deleted header file' problem.
-+## The problem is that when a header file which appears in a .P file
-+## is deleted, the dependency causes make to die (because there is
-+## typically no way to rebuild the header).  We avoid this by adding
-+## dummy dependencies for each header file.  Too bad gcc doesn't do
-+## this for us directly.
-+  tr ' ' '
-+' < "$tmpdepfile" |
-+## Some versions of gcc put a space before the `:'.  On the theory
-+## that the space means something, we add a space to the output as
-+## well.
-+## Some versions of the HPUX 10.20 sed can't process this invocation
-+## correctly.  Breaking it into two sed invocations is a workaround.
-+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+hp)
-+  # This case exists only to let depend.m4 do its work.  It works by
-+  # looking at the text of this script.  This case will never be run,
-+  # since it is checked for above.
-+  exit 1
-+  ;;
-+
-+sgi)
-+  if test "$libtool" = yes; then
-+    "$@" "-Wp,-MDupdate,$tmpdepfile"
-+  else
-+    "$@" -MDupdate "$tmpdepfile"
-+  fi
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+  rm -f "$depfile"
-+
-+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-+    echo "$object : \\" > "$depfile"
-+
-+    # Clip off the initial element (the dependent).  Don't try to be
-+    # clever and replace this with sed code, as IRIX sed won't handle
-+    # lines with more than a fixed number of characters (4096 in
-+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-+    # the IRIX cc adds comments like `#:fec' to the end of the
-+    # dependency line.
-+    tr ' ' '
-+' < "$tmpdepfile" \
-+    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-+    tr '
-+' ' ' >> $depfile
-+    echo >> $depfile
-+
-+    # The second pass generates a dummy entry for each header file.
-+    tr ' ' '
-+' < "$tmpdepfile" \
-+   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-+   >> $depfile
-+  else
-+    # The sourcefile does not contain any dependencies, so just
-+    # store a dummy comment line, to avoid errors with the Makefile
-+    # "include basename.Plo" scheme.
-+    echo "#dummy" > "$depfile"
-+  fi
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+aix)
-+  # The C for AIX Compiler uses -M and outputs the dependencies
-+  # in a .u file.  This file always lives in the current directory.
-+  # Also, the AIX compiler puts `$object:' at the start of each line;
-+  # $object doesn't have directory information.
-+  stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
-+  tmpdepfile="$stripped.u"
-+  outname="$stripped.o"
-+  if test "$libtool" = yes; then
-+    "$@" -Wc,-M
-+  else
-+    "$@" -M
-+  fi
-+
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+
-+  if test -f "$tmpdepfile"; then
-+    # Each line is of the form `foo.o: dependent.h'.
-+    # Do two passes, one to just change these to
-+    # `$object: dependent.h' and one to simply `dependent.h:'.
-+    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-+    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-+  else
-+    # The sourcefile does not contain any dependencies, so just
-+    # store a dummy comment line, to avoid errors with the Makefile
-+    # "include basename.Plo" scheme.
-+    echo "#dummy" > "$depfile"
-+  fi
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+tru64)
-+   # The Tru64 AIX compiler uses -MD to generate dependencies as a side
-+   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put 
-+   # dependencies in `foo.d' instead, so we check for that too.
-+   # Subdirectories are respected.
-+
-+   tmpdepfile1="$object.d"
-+   tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` 
-+   if test "$libtool" = yes; then
-+      "$@" -Wc,-MD
-+   else
-+      "$@" -MD
-+   fi
-+
-+   stat=$?
-+   if test $stat -eq 0; then :
-+   else
-+      rm -f "$tmpdepfile1" "$tmpdepfile2"
-+      exit $stat
-+   fi
-+
-+   if test -f "$tmpdepfile1"; then
-+      tmpdepfile="$tmpdepfile1"
-+   else
-+      tmpdepfile="$tmpdepfile2"
-+   fi
-+   if test -f "$tmpdepfile"; then
-+      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-+      # That's a space and a tab in the [].
-+      sed -e 's,^.*\.[a-z]*:[ 	]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-+   else
-+      echo "#dummy" > "$depfile"
-+   fi
-+   rm -f "$tmpdepfile"
-+   ;;
-+
-+#nosideeffect)
-+  # This comment above is used by automake to tell side-effect
-+  # dependency tracking mechanisms from slower ones.
-+
-+dashmstdout)
-+  # Important note: in order to support this mode, a compiler *must*
-+  # always write the proprocessed file to stdout, regardless of -o,
-+  # because we must use -o when running libtool.
-+  test -z "$dashmflag" && dashmflag=-M
-+  ( IFS=" "
-+    case " $* " in
-+    *" --mode=compile "*) # this is libtool, let us make it quiet
-+      for arg
-+      do # cycle over the arguments
-+        case "$arg" in
-+	"--mode=compile")
-+	  # insert --quiet before "--mode=compile"
-+	  set fnord "$@" --quiet
-+	  shift # fnord
-+	  ;;
-+	esac
-+	set fnord "$@" "$arg"
-+	shift # fnord
-+	shift # "$arg"
-+      done
-+      ;;
-+    esac
-+    "$@" $dashmflag | sed 's:^[^:]*\:[ 	]*:'"$object"'\: :' > "$tmpdepfile"
-+  ) &
-+  proc=$!
-+  "$@"
-+  stat=$?
-+  wait "$proc"
-+  if test "$stat" != 0; then exit $stat; fi
-+  rm -f "$depfile"
-+  cat < "$tmpdepfile" > "$depfile"
-+  tr ' ' '
-+' < "$tmpdepfile" | \
-+## Some versions of the HPUX 10.20 sed can't process this invocation
-+## correctly.  Breaking it into two sed invocations is a workaround.
-+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+dashXmstdout)
-+  # This case only exists to satisfy depend.m4.  It is never actually
-+  # run, as this mode is specially recognized in the preamble.
-+  exit 1
-+  ;;
-+
-+makedepend)
-+  # X makedepend
-+  (
-+    shift
-+    cleared=no
-+    for arg in "$@"; do
-+      case $cleared in no)
-+        set ""; shift
-+	cleared=yes
-+      esac
-+      case "$arg" in
-+        -D*|-I*)
-+	  set fnord "$@" "$arg"; shift;;
-+	-*)
-+	  ;;
-+	*)
-+	  set fnord "$@" "$arg"; shift;;
-+      esac
-+    done
-+    obj_suffix="`echo $object | sed 's/^.*\././'`"
-+    touch "$tmpdepfile"
-+    ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
-+  ) &
-+  proc=$!
-+  "$@"
-+  stat=$?
-+  wait "$proc"
-+  if test "$stat" != 0; then exit $stat; fi
-+  rm -f "$depfile"
-+  cat < "$tmpdepfile" > "$depfile"
-+  tail +3 "$tmpdepfile" | tr ' ' '
-+' | \
-+## Some versions of the HPUX 10.20 sed can't process this invocation
-+## correctly.  Breaking it into two sed invocations is a workaround.
-+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile" "$tmpdepfile".bak
-+  ;;
-+
-+cpp)
-+  # Important note: in order to support this mode, a compiler *must*
-+  # always write the proprocessed file to stdout, regardless of -o,
-+  # because we must use -o when running libtool.
-+  ( IFS=" "
-+    case " $* " in
-+    *" --mode=compile "*)
-+      for arg
-+      do # cycle over the arguments
-+        case $arg in
-+	"--mode=compile")
-+	  # insert --quiet before "--mode=compile"
-+	  set fnord "$@" --quiet
-+	  shift # fnord
-+	  ;;
-+	esac
-+	set fnord "$@" "$arg"
-+	shift # fnord
-+	shift # "$arg"
-+      done
-+      ;;
-+    esac
-+    "$@" -E |
-+    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-+    sed '$ s: \\$::' > "$tmpdepfile"
-+  ) &
-+  proc=$!
-+  "$@"
-+  stat=$?
-+  wait "$proc"
-+  if test "$stat" != 0; then exit $stat; fi
-+  rm -f "$depfile"
-+  echo "$object : \\" > "$depfile"
-+  cat < "$tmpdepfile" >> "$depfile"
-+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+msvisualcpp)
-+  # Important note: in order to support this mode, a compiler *must*
-+  # always write the proprocessed file to stdout, regardless of -o,
-+  # because we must use -o when running libtool.
-+  ( IFS=" "
-+    case " $* " in
-+    *" --mode=compile "*)
-+      for arg
-+      do # cycle over the arguments
-+        case $arg in
-+	"--mode=compile")
-+	  # insert --quiet before "--mode=compile"
-+	  set fnord "$@" --quiet
-+	  shift # fnord
-+	  ;;
-+	esac
-+	set fnord "$@" "$arg"
-+	shift # fnord
-+	shift # "$arg"
-+      done
-+      ;;
-+    esac
-+    "$@" -E |
-+    sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-+  ) &
-+  proc=$!
-+  "$@"
-+  stat=$?
-+  wait "$proc"
-+  if test "$stat" != 0; then exit $stat; fi
-+  rm -f "$depfile"
-+  echo "$object : \\" > "$depfile"
-+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-+  echo "	" >> "$depfile"
-+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+none)
-+  exec "$@"
-+  ;;
-+
-+*)
-+  echo "Unknown depmode $depmode" 1>&2
-+  exit 1
-+  ;;
-+esac
-+
-+exit 0
---- metamail-2.7.orig/config/ltmain.sh
-+++ metamail-2.7/config/ltmain.sh
-@@ -0,0 +1,5107 @@
-+# ltmain.sh - Provide generalized library-building support services.
-+# NOTE: Changing this file will not affect anything until you rerun configure.
-+#
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-+# Free Software Foundation, Inc.
-+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# Check that we have a working $echo.
-+if test "X$1" = X--no-reexec; then
-+  # Discard the --no-reexec flag, and continue.
-+  shift
-+elif test "X$1" = X--fallback-echo; then
-+  # Avoid inline document here, it may be left over
-+  :
-+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-+  # Yippee, $echo works!
-+  :
-+else
-+  # Restart under the correct shell, and then maybe $echo will work.
-+  exec $SHELL "$0" --no-reexec ${1+"$@"}
-+fi
-+
-+if test "X$1" = X--fallback-echo; then
-+  # used as fallback echo
-+  shift
-+  cat <<EOF
-+$*
-+EOF
-+  exit 0
-+fi
-+
-+# The name of this program.
-+progname=`$echo "$0" | ${SED} 's%^.*/%%'`
-+modename="$progname"
-+
-+# Constants.
-+PROGRAM=ltmain.sh
-+PACKAGE=libtool
-+VERSION=1.4.3
-+TIMESTAMP=" (1.922.2.111 2002/10/23 02:54:36)"
-+
-+default_mode=
-+help="Try \`$progname --help' for more information."
-+magic="%%%MAGIC variable%%%"
-+mkdir="mkdir"
-+mv="mv -f"
-+rm="rm -f"
-+
-+# Sed substitution that helps us do robust quoting.  It backslashifies
-+# metacharacters that are still active within double-quoted strings.
-+Xsed="${SED}"' -e 1s/^X//'
-+sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-+# test EBCDIC or ASCII                                                         
-+case `echo A|od -x` in                                                         
-+ *[Cc]1*) # EBCDIC based system                                                
-+  SP2NL="tr '\100' '\n'"                                                       
-+  NL2SP="tr '\r\n' '\100\100'"                                                 
-+  ;;                                                                           
-+ *) # Assume ASCII based system                                                
-+  SP2NL="tr '\040' '\012'"                                                     
-+  NL2SP="tr '\015\012' '\040\040'"                                             
-+  ;;                                                                           
-+esac                                                                           
-+
-+# NLS nuisances.
-+# Only set LANG and LC_ALL to C if already set.
-+# These must not be set unconditionally because not all systems understand
-+# e.g. LANG=C (notably SCO).
-+# We save the old values to restore during execute mode.
-+if test "${LC_ALL+set}" = set; then
-+  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-+fi
-+if test "${LANG+set}" = set; then
-+  save_LANG="$LANG"; LANG=C; export LANG
-+fi
-+
-+# Make sure IFS has a sensible default
-+: ${IFS=" 	"}
-+
-+if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-+  echo "$modename: not configured to build any kind of library" 1>&2
-+  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-+  exit 1
-+fi
-+
-+# Global variables.
-+mode=$default_mode
-+nonopt=
-+prev=
-+prevopt=
-+run=
-+show="$echo"
-+show_help=
-+execute_dlfiles=
-+lo2o="s/\\.lo\$/.${objext}/"
-+o2lo="s/\\.${objext}\$/.lo/"
-+
-+# Parse our command line options once, thoroughly.
-+while test $# -gt 0
-+do
-+  arg="$1"
-+  shift
-+
-+  case $arg in
-+  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
-+  *) optarg= ;;
-+  esac
-+
-+  # If the previous option needs an argument, assign it.
-+  if test -n "$prev"; then
-+    case $prev in
-+    execute_dlfiles)
-+      execute_dlfiles="$execute_dlfiles $arg"
-+      ;;
-+    *)
-+      eval "$prev=\$arg"
-+      ;;
-+    esac
-+
-+    prev=
-+    prevopt=
-+    continue
-+  fi
-+
-+  # Have we seen a non-optional argument yet?
-+  case $arg in
-+  --help)
-+    show_help=yes
-+    ;;
-+
-+  --version)
-+    echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-+    exit 0
-+    ;;
-+
-+  --config)
-+    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
-+    exit 0
-+    ;;
-+
-+  --debug)
-+    echo "$progname: enabling shell trace mode"
-+    set -x
-+    ;;
-+
-+  --dry-run | -n)
-+    run=:
-+    ;;
-+
-+  --features)
-+    echo "host: $host"
-+    if test "$build_libtool_libs" = yes; then
-+      echo "enable shared libraries"
-+    else
-+      echo "disable shared libraries"
-+    fi
-+    if test "$build_old_libs" = yes; then
-+      echo "enable static libraries"
-+    else
-+      echo "disable static libraries"
-+    fi
-+    exit 0
-+    ;;
-+
-+  --finish) mode="finish" ;;
-+
-+  --mode) prevopt="--mode" prev=mode ;;
-+  --mode=*) mode="$optarg" ;;
-+
-+  --preserve-dup-deps) duplicate_deps="yes" ;;
-+
-+  --quiet | --silent)
-+    show=:
-+    ;;
-+
-+  -dlopen)
-+    prevopt="-dlopen"
-+    prev=execute_dlfiles
-+    ;;
-+
-+  -*)
-+    $echo "$modename: unrecognized option \`$arg'" 1>&2
-+    $echo "$help" 1>&2
-+    exit 1
-+    ;;
-+
-+  *)
-+    nonopt="$arg"
-+    break
-+    ;;
-+  esac
-+done
-+
-+if test -n "$prevopt"; then
-+  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
-+  $echo "$help" 1>&2
-+  exit 1
-+fi
-+
-+# If this variable is set in any of the actions, the command in it
-+# will be execed at the end.  This prevents here-documents from being
-+# left over by shells.
-+exec_cmd=
-+
-+if test -z "$show_help"; then
-+
-+  # Infer the operation mode.
-+  if test -z "$mode"; then
-+    case $nonopt in
-+    *cc | *++ | gcc* | *-gcc* | g++* | xlc*)
-+      mode=link
-+      for arg
-+      do
-+	case $arg in
-+	-c)
-+	   mode=compile
-+	   break
-+	   ;;
-+	esac
-+      done
-+      ;;
-+    *db | *dbx | *strace | *truss)
-+      mode=execute
-+      ;;
-+    *install*|cp|mv)
-+      mode=install
-+      ;;
-+    *rm)
-+      mode=uninstall
-+      ;;
-+    *)
-+      # If we have no mode, but dlfiles were specified, then do execute mode.
-+      test -n "$execute_dlfiles" && mode=execute
-+
-+      # Just use the default operation mode.
-+      if test -z "$mode"; then
-+	if test -n "$nonopt"; then
-+	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
-+	else
-+	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
-+	fi
-+      fi
-+      ;;
-+    esac
-+  fi
-+
-+  # Only execute mode is allowed to have -dlopen flags.
-+  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-+    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
-+    $echo "$help" 1>&2
-+    exit 1
-+  fi
-+
-+  # Change the help message to a mode-specific one.
-+  generic_help="$help"
-+  help="Try \`$modename --help --mode=$mode' for more information."
-+
-+  # These modes are in order of execution frequency so that they run quickly.
-+  case $mode in
-+  # libtool compile mode
-+  compile)
-+    modename="$modename: compile"
-+    # Get the compilation command and the source file.
-+    base_compile=
-+    prev=
-+    lastarg=
-+    srcfile="$nonopt"
-+    suppress_output=
-+
-+    user_target=no
-+    for arg
-+    do
-+      case $prev in
-+      "") ;;
-+      xcompiler)
-+	# Aesthetically quote the previous argument.
-+	prev=
-+	lastarg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-+
-+	case $arg in
-+	# Double-quote args containing other shell metacharacters.
-+	# Many Bourne shells cannot handle close brackets correctly
-+	# in scan sets, so we specify it separately.
-+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	  arg="\"$arg\""
-+	  ;;
-+	esac
-+
-+	# Add the previous argument to base_compile.
-+	if test -z "$base_compile"; then
-+	  base_compile="$lastarg"
-+	else
-+	  base_compile="$base_compile $lastarg"
-+	fi
-+	continue
-+	;;
-+      esac
-+
-+      # Accept any command-line options.
-+      case $arg in
-+      -o)
-+	if test "$user_target" != "no"; then
-+	  $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-+	  exit 1
-+	fi
-+	user_target=next
-+	;;
-+
-+      -static)
-+	build_old_libs=yes
-+	continue
-+	;;
-+
-+      -prefer-pic)
-+	pic_mode=yes
-+	continue
-+	;;
-+
-+      -prefer-non-pic)
-+	pic_mode=no
-+	continue
-+	;;
-+
-+      -Xcompiler)
-+	prev=xcompiler
-+	continue
-+	;;
-+
-+      -Wc,*)
-+	args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
-+	lastarg=
-+	save_ifs="$IFS"; IFS=','
-+	for arg in $args; do
-+	  IFS="$save_ifs"
-+
-+	  # Double-quote args containing other shell metacharacters.
-+	  # Many Bourne shells cannot handle close brackets correctly
-+	  # in scan sets, so we specify it separately.
-+	  case $arg in
-+	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	    arg="\"$arg\""
-+	    ;;
-+	  esac
-+	  lastarg="$lastarg $arg"
-+	done
-+	IFS="$save_ifs"
-+	lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
-+
-+	# Add the arguments to base_compile.
-+	if test -z "$base_compile"; then
-+	  base_compile="$lastarg"
-+	else
-+	  base_compile="$base_compile $lastarg"
-+	fi
-+	continue
-+	;;
-+      esac
-+
-+      case $user_target in
-+      next)
-+	# The next one is the -o target name
-+	user_target=yes
-+	continue
-+	;;
-+      yes)
-+	# We got the output file
-+	user_target=set
-+	libobj="$arg"
-+	continue
-+	;;
-+      esac
-+
-+      # Accept the current argument as the source file.
-+      lastarg="$srcfile"
-+      srcfile="$arg"
-+
-+      # Aesthetically quote the previous argument.
-+
-+      # Backslashify any backslashes, double quotes, and dollar signs.
-+      # These are the only characters that are still specially
-+      # interpreted inside of double-quoted scrings.
-+      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
-+
-+      # Double-quote args containing other shell metacharacters.
-+      # Many Bourne shells cannot handle close brackets correctly
-+      # in scan sets, so we specify it separately.
-+      case $lastarg in
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	lastarg="\"$lastarg\""
-+	;;
-+      esac
-+
-+      # Add the previous argument to base_compile.
-+      if test -z "$base_compile"; then
-+	base_compile="$lastarg"
-+      else
-+	base_compile="$base_compile $lastarg"
-+      fi
-+    done
-+
-+    case $user_target in
-+    set)
-+      ;;
-+    no)
-+      # Get the name of the library object.
-+      libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
-+      ;;
-+    *)
-+      $echo "$modename: you must specify a target with \`-o'" 1>&2
-+      exit 1
-+      ;;
-+    esac
-+
-+    # Recognize several different file suffixes.
-+    # If the user specifies -o file.o, it is replaced with file.lo
-+    xform='[cCFSfmso]'
-+    case $libobj in
-+    *.ada) xform=ada ;;
-+    *.adb) xform=adb ;;
-+    *.ads) xform=ads ;;
-+    *.asm) xform=asm ;;
-+    *.c++) xform=c++ ;;
-+    *.cc) xform=cc ;;
-+    *.cpp) xform=cpp ;;
-+    *.cxx) xform=cxx ;;
-+    *.f90) xform=f90 ;;
-+    *.for) xform=for ;;
-+    esac
-+
-+    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-+
-+    case $libobj in
-+    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
-+    *)
-+      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
-+      exit 1
-+      ;;
-+    esac
-+
-+    if test -z "$base_compile"; then
-+      $echo "$modename: you must specify a compilation command" 1>&2
-+      $echo "$help" 1>&2
-+      exit 1
-+    fi
-+
-+    # Delete any leftover library objects.
-+    if test "$build_old_libs" = yes; then
-+      removelist="$obj $libobj"
-+    else
-+      removelist="$libobj"
-+    fi
-+
-+    $run $rm $removelist
-+    trap "$run $rm $removelist; exit 1" 1 2 15
-+
-+    # On Cygwin there's no "real" PIC flag so we must build both object types
-+    case $host_os in
-+    cygwin* | mingw* | pw32* | os2*)
-+      pic_mode=default
-+      ;;
-+    esac
-+    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-+      # non-PIC code in shared libraries is not supported
-+      pic_mode=default
-+    fi
-+
-+    # Calculate the filename of the output object if compiler does
-+    # not support -o with -c
-+    if test "$compiler_c_o" = no; then
-+      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-+      lockfile="$output_obj.lock"
-+      removelist="$removelist $output_obj $lockfile"
-+      trap "$run $rm $removelist; exit 1" 1 2 15
-+    else
-+      need_locks=no
-+      lockfile=
-+    fi
-+
-+    # Lock this critical section if it is needed
-+    # We use this script file to make the link, it avoids creating a new file
-+    if test "$need_locks" = yes; then
-+      until $run ln "$0" "$lockfile" 2>/dev/null; do
-+	$show "Waiting for $lockfile to be removed"
-+	sleep 2
-+      done
-+    elif test "$need_locks" = warn; then
-+      if test -f "$lockfile"; then
-+	echo "\
-+*** ERROR, $lockfile exists and contains:
-+`cat $lockfile 2>/dev/null`
-+
-+This indicates that another process is trying to use the same
-+temporary object file, and libtool could not work around it because
-+your compiler does not support \`-c' and \`-o' together.  If you
-+repeat this compilation, it may succeed, by chance, but you had better
-+avoid parallel builds (make -j) in this platform, or get a better
-+compiler."
-+
-+	$run $rm $removelist
-+	exit 1
-+      fi
-+      echo $srcfile > "$lockfile"
-+    fi
-+
-+    if test -n "$fix_srcfile_path"; then
-+      eval srcfile=\"$fix_srcfile_path\"
-+    fi
-+
-+    # Only build a PIC object if we are building libtool libraries.
-+    if test "$build_libtool_libs" = yes; then
-+      # Without this assignment, base_compile gets emptied.
-+      fbsd_hideous_sh_bug=$base_compile
-+
-+      if test "$pic_mode" != no; then
-+	# All platforms use -DPIC, to notify preprocessed assembler code.
-+	command="$base_compile $srcfile $pic_flag -DPIC"
-+      else
-+	# Don't build PIC code
-+	command="$base_compile $srcfile"
-+      fi
-+      if test "$build_old_libs" = yes; then
-+	lo_libobj="$libobj"
-+	dir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
-+	if test "X$dir" = "X$libobj"; then
-+	  dir="$objdir"
-+	else
-+	  dir="$dir/$objdir"
-+	fi
-+	libobj="$dir/"`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
-+
-+	if test -d "$dir"; then
-+	  $show "$rm $libobj"
-+	  $run $rm $libobj
-+	else
-+	  $show "$mkdir $dir"
-+	  $run $mkdir $dir
-+	  status=$?
-+	  if test $status -ne 0 && test ! -d $dir; then
-+	    exit $status
-+	  fi
-+	fi
-+      fi
-+      if test "$compiler_o_lo" = yes; then
-+	output_obj="$libobj"
-+	command="$command -o $output_obj"
-+      elif test "$compiler_c_o" = yes; then
-+	output_obj="$obj"
-+	command="$command -o $output_obj"
-+      fi
-+
-+      $run $rm "$output_obj"
-+      $show "$command"
-+      if $run eval "$command"; then :
-+      else
-+	test -n "$output_obj" && $run $rm $removelist
-+	exit 1
-+      fi
-+
-+      if test "$need_locks" = warn &&
-+	 test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
-+	echo "\
-+*** ERROR, $lockfile contains:
-+`cat $lockfile 2>/dev/null`
-+
-+but it should contain:
-+$srcfile
-+
-+This indicates that another process is trying to use the same
-+temporary object file, and libtool could not work around it because
-+your compiler does not support \`-c' and \`-o' together.  If you
-+repeat this compilation, it may succeed, by chance, but you had better
-+avoid parallel builds (make -j) in this platform, or get a better
-+compiler."
-+
-+	$run $rm $removelist
-+	exit 1
-+      fi
-+
-+      # Just move the object if needed, then go on to compile the next one
-+      if test x"$output_obj" != x"$libobj"; then
-+	$show "$mv $output_obj $libobj"
-+	if $run $mv $output_obj $libobj; then :
-+	else
-+	  error=$?
-+	  $run $rm $removelist
-+	  exit $error
-+	fi
-+      fi
-+
-+      # If we have no pic_flag, then copy the object into place and finish.
-+      if (test -z "$pic_flag" || test "$pic_mode" != default) &&
-+	 test "$build_old_libs" = yes; then
-+	# Rename the .lo from within objdir to obj
-+	if test -f $obj; then
-+	  $show $rm $obj
-+	  $run $rm $obj
-+	fi
-+
-+	$show "$mv $libobj $obj"
-+	if $run $mv $libobj $obj; then :
-+	else
-+	  error=$?
-+	  $run $rm $removelist
-+	  exit $error
-+	fi
-+
-+	xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-+	if test "X$xdir" = "X$obj"; then
-+	  xdir="."
-+	else
-+	  xdir="$xdir"
-+	fi
-+	baseobj=`$echo "X$obj" | $Xsed -e "s%.*/%%"`
-+	libobj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
-+	# Now arrange that obj and lo_libobj become the same file
-+	$show "(cd $xdir && $LN_S $baseobj $libobj)"
-+	if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then
-+	  # Unlock the critical section if it was locked
-+	  if test "$need_locks" != no; then
-+	    $run $rm "$lockfile"
-+	  fi
-+	  exit 0
-+	else
-+	  error=$?
-+	  $run $rm $removelist
-+	  exit $error
-+	fi
-+      fi
-+
-+      # Allow error messages only from the first compilation.
-+      suppress_output=' >/dev/null 2>&1'
-+    fi
-+
-+    # Only build a position-dependent object if we build old libraries.
-+    if test "$build_old_libs" = yes; then
-+      if test "$pic_mode" != yes; then
-+	# Don't build PIC code
-+	command="$base_compile $srcfile"
-+      else
-+	# All platforms use -DPIC, to notify preprocessed assembler code.
-+	command="$base_compile $srcfile $pic_flag -DPIC"
-+      fi
-+      if test "$compiler_c_o" = yes; then
-+	command="$command -o $obj"
-+	output_obj="$obj"
-+      fi
-+
-+      # Suppress compiler output if we already did a PIC compilation.
-+      command="$command$suppress_output"
-+      $run $rm "$output_obj"
-+      $show "$command"
-+      if $run eval "$command"; then :
-+      else
-+	$run $rm $removelist
-+	exit 1
-+      fi
-+
-+      if test "$need_locks" = warn &&
-+	 test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
-+	echo "\
-+*** ERROR, $lockfile contains:
-+`cat $lockfile 2>/dev/null`
-+
-+but it should contain:
-+$srcfile
-+
-+This indicates that another process is trying to use the same
-+temporary object file, and libtool could not work around it because
-+your compiler does not support \`-c' and \`-o' together.  If you
-+repeat this compilation, it may succeed, by chance, but you had better
-+avoid parallel builds (make -j) in this platform, or get a better
-+compiler."
-+
-+	$run $rm $removelist
-+	exit 1
-+      fi
-+
-+      # Just move the object if needed
-+      if test x"$output_obj" != x"$obj"; then
-+	$show "$mv $output_obj $obj"
-+	if $run $mv $output_obj $obj; then :
-+	else
-+	  error=$?
-+	  $run $rm $removelist
-+	  exit $error
-+	fi
-+      fi
-+
-+      # Create an invalid libtool object if no PIC, so that we do not
-+      # accidentally link it into a program.
-+      if test "$build_libtool_libs" != yes; then
-+	$show "echo timestamp > $libobj"
-+	$run eval "echo timestamp > \$libobj" || exit $?
-+      else
-+	# Move the .lo from within objdir
-+	$show "$mv $libobj $lo_libobj"
-+	if $run $mv $libobj $lo_libobj; then :
-+	else
-+	  error=$?
-+	  $run $rm $removelist
-+	  exit $error
-+	fi
-+      fi
-+    fi
-+
-+    # Unlock the critical section if it was locked
-+    if test "$need_locks" != no; then
-+      $run $rm "$lockfile"
-+    fi
-+
-+    exit 0
-+    ;;
-+
-+  # libtool link mode
-+  link | relink)
-+    modename="$modename: link"
-+    case $host in
-+    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+      # It is impossible to link a dll without this setting, and
-+      # we shouldn't force the makefile maintainer to figure out
-+      # which system we are compiling for in order to pass an extra
-+      # flag for every libtool invokation.
-+      # allow_undefined=no
-+
-+      # FIXME: Unfortunately, there are problems with the above when trying
-+      # to make a dll which has undefined symbols, in which case not
-+      # even a static library is built.  For now, we need to specify
-+      # -no-undefined on the libtool link line when we can be certain
-+      # that all symbols are satisfied, otherwise we get a static library.
-+      allow_undefined=yes
-+      ;;
-+    *)
-+      allow_undefined=yes
-+      ;;
-+    esac
-+    libtool_args="$nonopt"
-+    compile_command="$nonopt"
-+    finalize_command="$nonopt"
-+
-+    compile_rpath=
-+    finalize_rpath=
-+    compile_shlibpath=
-+    finalize_shlibpath=
-+    convenience=
-+    old_convenience=
-+    deplibs=
-+    old_deplibs=
-+    compiler_flags=
-+    linker_flags=
-+    dllsearchpath=
-+    lib_search_path=`pwd`
-+    inst_prefix_dir=
-+
-+    avoid_version=no
-+    dlfiles=
-+    dlprefiles=
-+    dlself=no
-+    export_dynamic=no
-+    export_symbols=
-+    export_symbols_regex=
-+    generated=
-+    libobjs=
-+    ltlibs=
-+    module=no
-+    no_install=no
-+    objs=
-+    prefer_static_libs=no
-+    preload=no
-+    prev=
-+    prevarg=
-+    release=
-+    rpath=
-+    xrpath=
-+    perm_rpath=
-+    temp_rpath=
-+    thread_safe=no
-+    vinfo=
-+
-+    # We need to know -static, to get the right output filenames.
-+    for arg
-+    do
-+      case $arg in
-+      -all-static | -static)
-+	if test "X$arg" = "X-all-static"; then
-+	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-+	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
-+	  fi
-+	  if test -n "$link_static_flag"; then
-+	    dlopen_self=$dlopen_self_static
-+	  fi
-+	else
-+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-+	    dlopen_self=$dlopen_self_static
-+	  fi
-+	fi
-+	build_libtool_libs=no
-+	build_old_libs=yes
-+	prefer_static_libs=yes
-+	break
-+	;;
-+      esac
-+    done
-+
-+    # See if our shared archives depend on static archives.
-+    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-+
-+    # Go through the arguments, transforming them on the way.
-+    while test $# -gt 0; do
-+      arg="$1"
-+      shift
-+      case $arg in
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
-+	;;
-+      *) qarg=$arg ;;
-+      esac
-+      libtool_args="$libtool_args $qarg"
-+
-+      # If the previous option needs an argument, assign it.
-+      if test -n "$prev"; then
-+	case $prev in
-+	output)
-+	  compile_command="$compile_command @OUTPUT@"
-+	  finalize_command="$finalize_command @OUTPUT@"
-+	  ;;
-+	esac
-+
-+	case $prev in
-+	dlfiles|dlprefiles)
-+	  if test "$preload" = no; then
-+	    # Add the symbol object into the linking commands.
-+	    compile_command="$compile_command @SYMFILE@"
-+	    finalize_command="$finalize_command @SYMFILE@"
-+	    preload=yes
-+	  fi
-+	  case $arg in
-+	  *.la | *.lo) ;;  # We handle these cases below.
-+	  force)
-+	    if test "$dlself" = no; then
-+	      dlself=needless
-+	      export_dynamic=yes
-+	    fi
-+	    prev=
-+	    continue
-+	    ;;
-+	  self)
-+	    if test "$prev" = dlprefiles; then
-+	      dlself=yes
-+	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-+	      dlself=yes
-+	    else
-+	      dlself=needless
-+	      export_dynamic=yes
-+	    fi
-+	    prev=
-+	    continue
-+	    ;;
-+	  *)
-+	    if test "$prev" = dlfiles; then
-+	      dlfiles="$dlfiles $arg"
-+	    else
-+	      dlprefiles="$dlprefiles $arg"
-+	    fi
-+	    prev=
-+	    continue
-+	    ;;
-+	  esac
-+	  ;;
-+	expsyms)
-+	  export_symbols="$arg"
-+	  if test ! -f "$arg"; then
-+	    $echo "$modename: symbol file \`$arg' does not exist"
-+	    exit 1
-+	  fi
-+	  prev=
-+	  continue
-+	  ;;
-+	expsyms_regex)
-+	  export_symbols_regex="$arg"
-+	  prev=
-+	  continue
-+	  ;;
-+	inst_prefix)
-+	  inst_prefix_dir="$arg"
-+	  prev=
-+	  continue
-+	  ;;
-+	release)
-+	  release="-$arg"
-+	  prev=
-+	  continue
-+	  ;;
-+	rpath | xrpath)
-+	  # We need an absolute path.
-+	  case $arg in
-+	  [\\/]* | [A-Za-z]:[\\/]*) ;;
-+	  *)
-+	    $echo "$modename: only absolute run-paths are allowed" 1>&2
-+	    exit 1
-+	    ;;
-+	  esac
-+	  if test "$prev" = rpath; then
-+	    case "$rpath " in
-+	    *" $arg "*) ;;
-+	    *) rpath="$rpath $arg" ;;
-+	    esac
-+	  else
-+	    case "$xrpath " in
-+	    *" $arg "*) ;;
-+	    *) xrpath="$xrpath $arg" ;;
-+	    esac
-+	  fi
-+	  prev=
-+	  continue
-+	  ;;
-+	xcompiler)
-+	  compiler_flags="$compiler_flags $qarg"
-+	  prev=
-+	  compile_command="$compile_command $qarg"
-+	  finalize_command="$finalize_command $qarg"
-+	  continue
-+	  ;;
-+	xlinker)
-+	  linker_flags="$linker_flags $qarg"
-+	  compiler_flags="$compiler_flags $wl$qarg"
-+	  prev=
-+	  compile_command="$compile_command $wl$qarg"
-+	  finalize_command="$finalize_command $wl$qarg"
-+	  continue
-+	  ;;
-+	*)
-+	  eval "$prev=\"\$arg\""
-+	  prev=
-+	  continue
-+	  ;;
-+	esac
-+      fi # test -n $prev
-+
-+      prevarg="$arg"
-+
-+      case $arg in
-+      -all-static)
-+	if test -n "$link_static_flag"; then
-+	  compile_command="$compile_command $link_static_flag"
-+	  finalize_command="$finalize_command $link_static_flag"
-+	fi
-+	continue
-+	;;
-+
-+      -allow-undefined)
-+	# FIXME: remove this flag sometime in the future.
-+	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
-+	continue
-+	;;
-+
-+      -avoid-version)
-+	avoid_version=yes
-+	continue
-+	;;
-+
-+      -dlopen)
-+	prev=dlfiles
-+	continue
-+	;;
-+
-+      -dlpreopen)
-+	prev=dlprefiles
-+	continue
-+	;;
-+
-+      -export-dynamic)
-+	export_dynamic=yes
-+	continue
-+	;;
-+
-+      -export-symbols | -export-symbols-regex)
-+	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-+	  $echo "$modename: more than one -exported-symbols argument is not allowed"
-+	  exit 1
-+	fi
-+	if test "X$arg" = "X-export-symbols"; then
-+	  prev=expsyms
-+	else
-+	  prev=expsyms_regex
-+	fi
-+	continue
-+	;;
-+
-+      -inst-prefix-dir)
-+       prev=inst_prefix
-+       continue
-+       ;;
-+
-+      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-+      # so, if we see these flags be careful not to treat them like -L
-+      -L[A-Z][A-Z]*:*)
-+	case $with_gcc/$host in
-+	no/*-*-irix* | no/*-*-nonstopux*)
-+	  compile_command="$compile_command $arg"
-+	  finalize_command="$finalize_command $arg"
-+	  ;;
-+	esac
-+	continue
-+	;;
-+
-+      -L*)
-+	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
-+	# We need an absolute path.
-+	case $dir in
-+	[\\/]* | [A-Za-z]:[\\/]*) ;;
-+	*)
-+	  absdir=`cd "$dir" && pwd`
-+	  if test -z "$absdir"; then
-+	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-+	    exit 1
-+	  fi
-+	  dir="$absdir"
-+	  ;;
-+	esac
-+	case "$deplibs " in
-+	*" -L$dir "*) ;;
-+	*)
-+	  deplibs="$deplibs -L$dir"
-+	  lib_search_path="$lib_search_path $dir"
-+	  ;;
-+	esac
-+	case $host in
-+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+	  case :$dllsearchpath: in
-+	  *":$dir:"*) ;;
-+	  *) dllsearchpath="$dllsearchpath:$dir";;
-+	  esac
-+	  ;;
-+	esac
-+	continue
-+	;;
-+
-+      -l*)
-+	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-+	  case $host in
-+	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
-+	    # These systems don't actually have a C or math library (as such)
-+	    continue
-+	    ;;
-+	  *-*-mingw* | *-*-os2*)
-+	    # These systems don't actually have a C library (as such)
-+	    test "X$arg" = "X-lc" && continue
-+	    ;;
-+	  *-*-openbsd* | *-*-freebsd*)
-+	    # Do not include libc due to us having libc/libc_r.
-+	    test "X$arg" = "X-lc" && continue
-+	    ;;
-+	  esac
-+	 elif test "X$arg" = "X-lc_r"; then
-+	  case $host in
-+	 *-*-openbsd* | *-*-freebsd*)
-+	    # Do not include libc_r directly, use -pthread flag.
-+	    continue
-+	    ;;
-+	  esac
-+	fi
-+	deplibs="$deplibs $arg"
-+	continue
-+	;;
-+
-+      -module)
-+	module=yes
-+	continue
-+	;;
-+
-+      -no-fast-install)
-+	fast_install=no
-+	continue
-+	;;
-+
-+      -no-install)
-+	case $host in
-+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+	  # The PATH hackery in wrapper scripts is required on Windows
-+	  # in order for the loader to find any dlls it needs.
-+	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
-+	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
-+	  fast_install=no
-+	  ;;
-+	*) no_install=yes ;;
-+	esac
-+	continue
-+	;;
-+
-+      -no-undefined)
-+	allow_undefined=no
-+	continue
-+	;;
-+
-+      -o) prev=output ;;
-+
-+      -release)
-+	prev=release
-+	continue
-+	;;
-+
-+      -rpath)
-+	prev=rpath
-+	continue
-+	;;
-+
-+      -R)
-+	prev=xrpath
-+	continue
-+	;;
-+
-+      -R*)
-+	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
-+	# We need an absolute path.
-+	case $dir in
-+	[\\/]* | [A-Za-z]:[\\/]*) ;;
-+	*)
-+	  $echo "$modename: only absolute run-paths are allowed" 1>&2
-+	  exit 1
-+	  ;;
-+	esac
-+	case "$xrpath " in
-+	*" $dir "*) ;;
-+	*) xrpath="$xrpath $dir" ;;
-+	esac
-+	continue
-+	;;
-+
-+      -static)
-+	# The effects of -static are defined in a previous loop.
-+	# We used to do the same as -all-static on platforms that
-+	# didn't have a PIC flag, but the assumption that the effects
-+	# would be equivalent was wrong.  It would break on at least
-+	# Digital Unix and AIX.
-+	continue
-+	;;
-+
-+      -thread-safe)
-+	thread_safe=yes
-+	continue
-+	;;
-+
-+      -version-info)
-+	prev=vinfo
-+	continue
-+	;;
-+
-+      -Wc,*)
-+	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
-+	arg=
-+	save_ifs="$IFS"; IFS=','
-+	for flag in $args; do
-+	  IFS="$save_ifs"
-+	  case $flag in
-+	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	    flag="\"$flag\""
-+	    ;;
-+	  esac
-+	  arg="$arg $wl$flag"
-+	  compiler_flags="$compiler_flags $flag"
-+	done
-+	IFS="$save_ifs"
-+	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-+	;;
-+
-+      -Wl,*)
-+	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
-+	arg=
-+	save_ifs="$IFS"; IFS=','
-+	for flag in $args; do
-+	  IFS="$save_ifs"
-+	  case $flag in
-+	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	    flag="\"$flag\""
-+	    ;;
-+	  esac
-+	  arg="$arg $wl$flag"
-+	  compiler_flags="$compiler_flags $wl$flag"
-+	  linker_flags="$linker_flags $flag"
-+	done
-+	IFS="$save_ifs"
-+	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-+	;;
-+
-+      -Xcompiler)
-+	prev=xcompiler
-+	continue
-+	;;
-+
-+      -Xlinker)
-+	prev=xlinker
-+	continue
-+	;;
-+
-+      # Some other compiler flag.
-+      -* | +*)
-+	# Unknown arguments in both finalize_command and compile_command need
-+	# to be aesthetically quoted because they are evaled later.
-+	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-+	case $arg in
-+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	  arg="\"$arg\""
-+	  ;;
-+	esac
-+	;;
-+
-+      *.lo | *.$objext)
-+	# A library or standard object.
-+	if test "$prev" = dlfiles; then
-+	  # This file was specified with -dlopen.
-+	  if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-+	    dlfiles="$dlfiles $arg"
-+	    prev=
-+	    continue
-+	  else
-+	    # If libtool objects are unsupported, then we need to preload.
-+	    prev=dlprefiles
-+	  fi
-+	fi
-+
-+	if test "$prev" = dlprefiles; then
-+	  # Preload the old-style object.
-+	  dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e "$lo2o"`
-+	  prev=
-+	else
-+	  case $arg in
-+	  *.lo) libobjs="$libobjs $arg" ;;
-+	  *) objs="$objs $arg" ;;
-+	  esac
-+	fi
-+	;;
-+
-+      *.$libext)
-+	# An archive.
-+	deplibs="$deplibs $arg"
-+	old_deplibs="$old_deplibs $arg"
-+	continue
-+	;;
-+
-+      *.la)
-+	# A libtool-controlled library.
-+
-+	if test "$prev" = dlfiles; then
-+	  # This library was specified with -dlopen.
-+	  dlfiles="$dlfiles $arg"
-+	  prev=
-+	elif test "$prev" = dlprefiles; then
-+	  # The library was specified with -dlpreopen.
-+	  dlprefiles="$dlprefiles $arg"
-+	  prev=
-+	else
-+	  deplibs="$deplibs $arg"
-+	fi
-+	continue
-+	;;
-+
-+      # Some other compiler argument.
-+      *)
-+	# Unknown arguments in both finalize_command and compile_command need
-+	# to be aesthetically quoted because they are evaled later.
-+	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-+	case $arg in
-+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	  arg="\"$arg\""
-+	  ;;
-+	esac
-+	;;
-+      esac # arg
-+
-+      # Now actually substitute the argument into the commands.
-+      if test -n "$arg"; then
-+	compile_command="$compile_command $arg"
-+	finalize_command="$finalize_command $arg"
-+      fi
-+    done # argument parsing loop
-+
-+    if test -n "$prev"; then
-+      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
-+      $echo "$help" 1>&2
-+      exit 1
-+    fi
-+
-+    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-+      eval arg=\"$export_dynamic_flag_spec\"
-+      compile_command="$compile_command $arg"
-+      finalize_command="$finalize_command $arg"
-+    fi
-+
-+    # calculate the name of the file, without its directory
-+    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
-+    libobjs_save="$libobjs"
-+
-+    if test -n "$shlibpath_var"; then
-+      # get the directories listed in $shlibpath_var
-+      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-+    else
-+      shlib_search_path=
-+    fi
-+    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-+    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-+
-+    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
-+    if test "X$output_objdir" = "X$output"; then
-+      output_objdir="$objdir"
-+    else
-+      output_objdir="$output_objdir/$objdir"
-+    fi
-+    # Create the object directory.
-+    if test ! -d $output_objdir; then
-+      $show "$mkdir $output_objdir"
-+      $run $mkdir $output_objdir
-+      status=$?
-+      if test $status -ne 0 && test ! -d $output_objdir; then
-+	exit $status
-+      fi
-+    fi
-+
-+    # Determine the type of output
-+    case $output in
-+    "")
-+      $echo "$modename: you must specify an output file" 1>&2
-+      $echo "$help" 1>&2
-+      exit 1
-+      ;;
-+    *.$libext) linkmode=oldlib ;;
-+    *.lo | *.$objext) linkmode=obj ;;
-+    *.la) linkmode=lib ;;
-+    *) linkmode=prog ;; # Anything else should be a program.
-+    esac
-+
-+    specialdeplibs=
-+    libs=
-+    # Find all interdependent deplibs by searching for libraries
-+    # that are linked more than once (e.g. -la -lb -la)
-+    for deplib in $deplibs; do
-+      if test "X$duplicate_deps" = "Xyes" ; then
-+	case "$libs " in
-+	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	esac
-+      fi
-+      libs="$libs $deplib"
-+    done
-+    deplibs=
-+    newdependency_libs=
-+    newlib_search_path=
-+    need_relink=no # whether we're linking any uninstalled libtool libraries
-+    notinst_deplibs= # not-installed libtool libraries
-+    notinst_path= # paths that contain not-installed libtool libraries
-+    case $linkmode in
-+    lib)
-+	passes="conv link"
-+	for file in $dlfiles $dlprefiles; do
-+	  case $file in
-+	  *.la) ;;
-+	  *)
-+	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
-+	    exit 1
-+	    ;;
-+	  esac
-+	done
-+	;;
-+    prog)
-+	compile_deplibs=
-+	finalize_deplibs=
-+	alldeplibs=no
-+	newdlfiles=
-+	newdlprefiles=
-+	passes="conv scan dlopen dlpreopen link"
-+	;;
-+    *)  passes="conv"
-+	;;
-+    esac
-+    for pass in $passes; do
-+      if test $linkmode = prog; then
-+	# Determine which files to process
-+	case $pass in
-+	dlopen)
-+	  libs="$dlfiles"
-+	  save_deplibs="$deplibs" # Collect dlpreopened libraries
-+	  deplibs=
-+	  ;;
-+	dlpreopen) libs="$dlprefiles" ;;
-+	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-+	esac
-+      fi
-+      for deplib in $libs; do
-+	lib=
-+	found=no
-+	case $deplib in
-+	-l*)
-+	  if test $linkmode = oldlib && test $linkmode = obj; then
-+	    $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
-+	    continue
-+	  fi
-+	  if test $pass = conv; then
-+	    deplibs="$deplib $deplibs"
-+	    continue
-+	  fi
-+	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-+	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-+	    # Search the libtool library
-+	    lib="$searchdir/lib${name}.la"
-+	    if test -f "$lib"; then
-+	      found=yes
-+	      break
-+	    fi
-+	  done
-+	  if test "$found" != yes; then
-+	    # deplib doesn't seem to be a libtool library
-+	    if test "$linkmode,$pass" = "prog,link"; then
-+	      compile_deplibs="$deplib $compile_deplibs"
-+	      finalize_deplibs="$deplib $finalize_deplibs"
-+	    else
-+	      deplibs="$deplib $deplibs"
-+	      test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs"
-+	    fi
-+	    continue
-+	  fi
-+	  ;; # -l
-+	-L*)
-+	  case $linkmode in
-+	  lib)
-+	    deplibs="$deplib $deplibs"
-+	    test $pass = conv && continue
-+	    newdependency_libs="$deplib $newdependency_libs"
-+	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-+	    ;;
-+	  prog)
-+	    if test $pass = conv; then
-+	      deplibs="$deplib $deplibs"
-+	      continue
-+	    fi
-+	    if test $pass = scan; then
-+	      deplibs="$deplib $deplibs"
-+	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-+	    else
-+	      compile_deplibs="$deplib $compile_deplibs"
-+	      finalize_deplibs="$deplib $finalize_deplibs"
-+	    fi
-+	    ;;
-+	  *)
-+	    $echo "$modename: warning: \`-L' is ignored for archives/objects: $deplib" 1>&2
-+	    ;;
-+	  esac # linkmode
-+	  continue
-+	  ;; # -L
-+	-R*)
-+	  if test $pass = link; then
-+	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
-+	    # Make sure the xrpath contains only unique directories.
-+	    case "$xrpath " in
-+	    *" $dir "*) ;;
-+	    *) xrpath="$xrpath $dir" ;;
-+	    esac
-+	  fi
-+	  deplibs="$deplib $deplibs"
-+	  continue
-+	  ;;
-+	*.la) lib="$deplib" ;;
-+	*.$libext)
-+	  if test $pass = conv; then
-+	    deplibs="$deplib $deplibs"
-+	    continue
-+	  fi
-+	  case $linkmode in
-+	  lib)
-+	    if test "$deplibs_check_method" != pass_all; then
-+	      echo
-+	      echo "*** Warning: Trying to link with static lib archive $deplib."
-+	      echo "*** I have the capability to make that library automatically link in when"
-+	      echo "*** you link to this library.  But I can only do this if you have a"
-+	      echo "*** shared version of the library, which you do not appear to have"
-+	      echo "*** because the file extensions .$libext of this argument makes me believe"
-+	      echo "*** that it is just a static archive that I should not used here."
-+	    else
-+	      echo
-+	      echo "*** Warning: Linking the shared library $output against the"
-+	      echo "*** static library $deplib is not portable!"
-+	      deplibs="$deplib $deplibs"
-+	    fi
-+	    continue
-+	    ;;
-+	  prog)
-+	    if test $pass != link; then
-+	      deplibs="$deplib $deplibs"
-+	    else
-+	      compile_deplibs="$deplib $compile_deplibs"
-+	      finalize_deplibs="$deplib $finalize_deplibs"
-+	    fi
-+	    continue
-+	    ;;
-+	  esac # linkmode
-+	  ;; # *.$libext
-+	*.lo | *.$objext)
-+	  if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-+	    # If there is no dlopen support or we're linking statically,
-+	    # we need to preload.
-+	    newdlprefiles="$newdlprefiles $deplib"
-+	    compile_deplibs="$deplib $compile_deplibs"
-+	    finalize_deplibs="$deplib $finalize_deplibs"
-+	  else
-+	    newdlfiles="$newdlfiles $deplib"
-+	  fi
-+	  continue
-+	  ;;
-+	%DEPLIBS%)
-+	  alldeplibs=yes
-+	  continue
-+	  ;;
-+	esac # case $deplib
-+	if test $found = yes || test -f "$lib"; then :
-+	else
-+	  $echo "$modename: cannot find the library \`$lib'" 1>&2
-+	  exit 1
-+	fi
-+
-+	# Check to see that this really is a libtool archive.
-+	if (${SED} -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-+	else
-+	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-+	  exit 1
-+	fi
-+
-+	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-+	test "X$ladir" = "X$lib" && ladir="."
-+
-+	dlname=
-+	dlopen=
-+	dlpreopen=
-+	libdir=
-+	library_names=
-+	old_library=
-+	# If the library was installed with an old release of libtool,
-+	# it will not redefine variable installed.
-+	installed=yes
-+
-+	# Read the .la file
-+	case $lib in
-+	*/* | *\\*) . $lib ;;
-+	*) . ./$lib ;;
-+	esac
-+
-+	if test "$linkmode,$pass" = "lib,link" ||
-+	   test "$linkmode,$pass" = "prog,scan" ||
-+	   { test $linkmode = oldlib && test $linkmode = obj; }; then
-+	   # Add dl[pre]opened files of deplib
-+	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-+	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
-+	fi
-+
-+	if test $pass = conv; then
-+	  # Only check for convenience libraries
-+	  deplibs="$lib $deplibs"
-+	  if test -z "$libdir"; then
-+	    if test -z "$old_library"; then
-+	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-+	      exit 1
-+	    fi
-+	    # It is a libtool convenience library, so add in its objects.
-+	    convenience="$convenience $ladir/$objdir/$old_library"
-+	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-+	    tmp_libs=
-+	    for deplib in $dependency_libs; do
-+	      deplibs="$deplib $deplibs"
-+              if test "X$duplicate_deps" = "Xyes" ; then
-+	        case "$tmp_libs " in
-+	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	        esac
-+              fi
-+	      tmp_libs="$tmp_libs $deplib"
-+	    done
-+	  elif test $linkmode != prog && test $linkmode != lib; then
-+	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
-+	    exit 1
-+	  fi
-+	  continue
-+	fi # $pass = conv
-+
-+	# Get the name of the library we link against.
-+	linklib=
-+	for l in $old_library $library_names; do
-+	  linklib="$l"
-+	done
-+	if test -z "$linklib"; then
-+	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-+	  exit 1
-+	fi
-+
-+	# This library was specified with -dlopen.
-+	if test $pass = dlopen; then
-+	  if test -z "$libdir"; then
-+	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
-+	    exit 1
-+	  fi
-+	  if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-+	    # If there is no dlname, no dlopen support or we're linking
-+	    # statically, we need to preload.
-+	    dlprefiles="$dlprefiles $lib"
-+	  else
-+	    newdlfiles="$newdlfiles $lib"
-+	  fi
-+	  continue
-+	fi # $pass = dlopen
-+
-+	# We need an absolute path.
-+	case $ladir in
-+	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-+	*)
-+	  abs_ladir=`cd "$ladir" && pwd`
-+	  if test -z "$abs_ladir"; then
-+	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
-+	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
-+	    abs_ladir="$ladir"
-+	  fi
-+	  ;;
-+	esac
-+	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-+
-+	# Find the relevant object directory and library name.
-+	if test "X$installed" = Xyes; then
-+	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-+	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
-+	    dir="$ladir"
-+	    absdir="$abs_ladir"
-+	    libdir="$abs_ladir"
-+	  else
-+	    dir="$libdir"
-+	    absdir="$libdir"
-+	  fi
-+	else
-+	  dir="$ladir/$objdir"
-+	  absdir="$abs_ladir/$objdir"
-+	  # Remove this search path later
-+	  notinst_path="$notinst_path $abs_ladir"
-+	fi # $installed = yes
-+	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-+
-+	# This library was specified with -dlpreopen.
-+	if test $pass = dlpreopen; then
-+	  if test -z "$libdir"; then
-+	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
-+	    exit 1
-+	  fi
-+	  # Prefer using a static library (so that no silly _DYNAMIC symbols
-+	  # are required to link).
-+	  if test -n "$old_library"; then
-+	    newdlprefiles="$newdlprefiles $dir/$old_library"
-+	  # Otherwise, use the dlname, so that lt_dlopen finds it.
-+	  elif test -n "$dlname"; then
-+	    newdlprefiles="$newdlprefiles $dir/$dlname"
-+	  else
-+	    newdlprefiles="$newdlprefiles $dir/$linklib"
-+	  fi
-+	fi # $pass = dlpreopen
-+
-+	if test -z "$libdir"; then
-+	  # Link the convenience library
-+	  if test $linkmode = lib; then
-+	    deplibs="$dir/$old_library $deplibs"
-+	  elif test "$linkmode,$pass" = "prog,link"; then
-+	    compile_deplibs="$dir/$old_library $compile_deplibs"
-+	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
-+	  else
-+	    deplibs="$lib $deplibs"
-+	  fi
-+	  continue
-+	fi
-+
-+	if test $linkmode = prog && test $pass != link; then
-+	  newlib_search_path="$newlib_search_path $ladir"
-+	  deplibs="$lib $deplibs"
-+
-+	  linkalldeplibs=no
-+	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-+	     test "$build_libtool_libs" = no; then
-+	    linkalldeplibs=yes
-+	  fi
-+
-+	  tmp_libs=
-+	  for deplib in $dependency_libs; do
-+	    case $deplib in
-+	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
-+	    esac
-+	    # Need to link against all dependency_libs?
-+	    if test $linkalldeplibs = yes; then
-+	      deplibs="$deplib $deplibs"
-+	    else
-+	      # Need to hardcode shared library paths
-+	      # or/and link against static libraries
-+	      newdependency_libs="$deplib $newdependency_libs"
-+	    fi
-+	    if test "X$duplicate_deps" = "Xyes" ; then
-+	      case "$tmp_libs " in
-+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	      esac
-+	    fi
-+	    tmp_libs="$tmp_libs $deplib"
-+	  done # for deplib
-+	  continue
-+	fi # $linkmode = prog...
-+
-+	link_static=no # Whether the deplib will be linked statically
-+	if test -n "$library_names" &&
-+	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-+	  # Link against this shared library
-+
-+	  if test "$linkmode,$pass" = "prog,link" ||
-+	   { test $linkmode = lib && test $hardcode_into_libs = yes; }; then
-+	    # Hardcode the library path.
-+	    # Skip directories that are in the system default run-time
-+	    # search path.
-+	    case " $sys_lib_dlsearch_path " in
-+	    *" $absdir "*) ;;
-+	    *)
-+	      case "$compile_rpath " in
-+	      *" $absdir "*) ;;
-+	      *) compile_rpath="$compile_rpath $absdir"
-+	      esac
-+	      ;;
-+	    esac
-+	    case " $sys_lib_dlsearch_path " in
-+	    *" $libdir "*) ;;
-+	    *)
-+	      case "$finalize_rpath " in
-+	      *" $libdir "*) ;;
-+	      *) finalize_rpath="$finalize_rpath $libdir"
-+	      esac
-+	      ;;
-+	    esac
-+	    if test $linkmode = prog; then
-+	      # We need to hardcode the library path
-+	      if test -n "$shlibpath_var"; then
-+		# Make sure the rpath contains only unique directories.
-+		case "$temp_rpath " in
-+		*" $dir "*) ;;
-+		*" $absdir "*) ;;
-+		*) temp_rpath="$temp_rpath $dir" ;;
-+		esac
-+	      fi
-+	    fi
-+	  fi # $linkmode,$pass = prog,link...
-+
-+	  if test "$alldeplibs" = yes &&
-+	     { test "$deplibs_check_method" = pass_all ||
-+	       { test "$build_libtool_libs" = yes &&
-+		 test -n "$library_names"; }; }; then
-+	    # We only need to search for static libraries
-+	    continue
-+	  fi
-+
-+	  if test "$installed" = no; then
-+	    notinst_deplibs="$notinst_deplibs $lib"
-+	    need_relink=yes
-+	  fi
-+
-+	  if test -n "$old_archive_from_expsyms_cmds"; then
-+	    # figure out the soname
-+	    set dummy $library_names
-+	    realname="$2"
-+	    shift; shift
-+	    libname=`eval \\$echo \"$libname_spec\"`
-+	    # use dlname if we got it. it's perfectly good, no?
-+	    if test -n "$dlname"; then
-+	      soname="$dlname"
-+	    elif test -n "$soname_spec"; then
-+	      # bleh windows
-+	      case $host in
-+	      *cygwin*)
-+		major=`expr $current - $age`
-+		versuffix="-$major"
-+		;;
-+	      esac
-+	      eval soname=\"$soname_spec\"
-+	    else
-+	      soname="$realname"
-+	    fi
-+
-+	    # Make a new name for the extract_expsyms_cmds to use
-+	    soroot="$soname"
-+	    soname=`echo $soroot | ${SED} -e 's/^.*\///'`
-+	    newlib="libimp-`echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
-+
-+	    # If the library has no export list, then create one now
-+	    if test -f "$output_objdir/$soname-def"; then :
-+	    else
-+	      $show "extracting exported symbol list from \`$soname'"
-+	      save_ifs="$IFS"; IFS='~'
-+	      eval cmds=\"$extract_expsyms_cmds\"
-+	      for cmd in $cmds; do
-+		IFS="$save_ifs"
-+		$show "$cmd"
-+		$run eval "$cmd" || exit $?
-+	      done
-+	      IFS="$save_ifs"
-+	    fi
-+
-+	    # Create $newlib
-+	    if test -f "$output_objdir/$newlib"; then :; else
-+	      $show "generating import library for \`$soname'"
-+	      save_ifs="$IFS"; IFS='~'
-+	      eval cmds=\"$old_archive_from_expsyms_cmds\"
-+	      for cmd in $cmds; do
-+		IFS="$save_ifs"
-+		$show "$cmd"
-+		$run eval "$cmd" || exit $?
-+	      done
-+	      IFS="$save_ifs"
-+	    fi
-+	    # make sure the library variables are pointing to the new library
-+	    dir=$output_objdir
-+	    linklib=$newlib
-+	  fi # test -n $old_archive_from_expsyms_cmds
-+
-+	  if test $linkmode = prog || test "$mode" != relink; then
-+	    add_shlibpath=
-+	    add_dir=
-+	    add=
-+	    lib_linked=yes
-+	    case $hardcode_action in
-+	    immediate | unsupported)
-+	      if test "$hardcode_direct" = no; then
-+		add="$dir/$linklib"
-+	      elif test "$hardcode_minus_L" = no; then
-+		case $host in
-+		*-*-sunos*) add_shlibpath="$dir" ;;
-+		esac
-+		add_dir="-L$dir"
-+		add="-l$name"
-+	      elif test "$hardcode_shlibpath_var" = no; then
-+		add_shlibpath="$dir"
-+		add="-l$name"
-+	      else
-+		lib_linked=no
-+	      fi
-+	      ;;
-+	    relink)
-+	      if test "$hardcode_direct" = yes; then
-+		add="$dir/$linklib"
-+	      elif test "$hardcode_minus_L" = yes; then
-+		add_dir="-L$dir"
-+		# Try looking first in the location we're being installed to.
-+		if test -n "$inst_prefix_dir"; then
-+		  case "$libdir" in
-+		  [\/]*)
-+		    add_dir="-L$inst_prefix_dir$libdir $add_dir"
-+		    ;;
-+		  esac
-+		fi
-+		add="-l$name"
-+	      elif test "$hardcode_shlibpath_var" = yes; then
-+		add_shlibpath="$dir"
-+		add="-l$name"
-+	      else
-+		lib_linked=no
-+	      fi
-+	      ;;
-+	    *) lib_linked=no ;;
-+	    esac
-+
-+	    if test "$lib_linked" != yes; then
-+	      $echo "$modename: configuration error: unsupported hardcode properties"
-+	      exit 1
-+	    fi
-+
-+	    if test -n "$add_shlibpath"; then
-+	      case :$compile_shlibpath: in
-+	      *":$add_shlibpath:"*) ;;
-+	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
-+	      esac
-+	    fi
-+	    if test $linkmode = prog; then
-+	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-+	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-+	    else
-+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-+	      test -n "$add" && deplibs="$add $deplibs"
-+	      if test "$hardcode_direct" != yes && \
-+		 test "$hardcode_minus_L" != yes && \
-+		 test "$hardcode_shlibpath_var" = yes; then
-+		case :$finalize_shlibpath: in
-+		*":$libdir:"*) ;;
-+		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-+		esac
-+	      fi
-+	    fi
-+	  fi
-+
-+	  if test $linkmode = prog || test "$mode" = relink; then
-+	    add_shlibpath=
-+	    add_dir=
-+	    add=
-+	    # Finalize command for both is simple: just hardcode it.
-+	    if test "$hardcode_direct" = yes; then
-+	      add="$libdir/$linklib"
-+	    elif test "$hardcode_minus_L" = yes; then
-+	      add_dir="-L$libdir"
-+	      add="-l$name"
-+	    elif test "$hardcode_shlibpath_var" = yes; then
-+	      case :$finalize_shlibpath: in
-+	      *":$libdir:"*) ;;
-+	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-+	      esac
-+	      add="-l$name"
-+	    else
-+	      # We cannot seem to hardcode it, guess we'll fake it.
-+	      add_dir="-L$libdir"
-+	      # Try looking first in the location we're being installed to.
-+	      if test -n "$inst_prefix_dir"; then
-+		case "$libdir" in
-+		[\/]*)
-+		  add_dir="-L$inst_prefix_dir$libdir $add_dir"
-+		  ;;
-+		esac
-+	      fi
-+	      add="-l$name"
-+	    fi
-+
-+	    if test $linkmode = prog; then
-+	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-+	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-+	    else
-+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-+	      test -n "$add" && deplibs="$add $deplibs"
-+	    fi
-+	  fi
-+	elif test $linkmode = prog; then
-+	  if test "$alldeplibs" = yes &&
-+	     { test "$deplibs_check_method" = pass_all ||
-+	       { test "$build_libtool_libs" = yes &&
-+		 test -n "$library_names"; }; }; then
-+	    # We only need to search for static libraries
-+	    continue
-+	  fi
-+
-+	  # Try to link the static library
-+	  # Here we assume that one of hardcode_direct or hardcode_minus_L
-+	  # is not unsupported.  This is valid on all known static and
-+	  # shared platforms.
-+	  if test "$hardcode_direct" != unsupported; then
-+	    test -n "$old_library" && linklib="$old_library"
-+	    compile_deplibs="$dir/$linklib $compile_deplibs"
-+	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
-+	  else
-+	    compile_deplibs="-l$name -L$dir $compile_deplibs"
-+	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-+	  fi
-+	elif test "$build_libtool_libs" = yes; then
-+	  # Not a shared library
-+	  if test "$deplibs_check_method" != pass_all; then
-+	    # We're trying link a shared library against a static one
-+	    # but the system doesn't support it.
-+
-+	    # Just print a warning and add the library to dependency_libs so
-+	    # that the program can be linked against the static library.
-+	    echo
-+	    echo "*** Warning: This system can not link to static lib archive $lib."
-+	    echo "*** I have the capability to make that library automatically link in when"
-+	    echo "*** you link to this library.  But I can only do this if you have a"
-+	    echo "*** shared version of the library, which you do not appear to have."
-+	    if test "$module" = yes; then
-+	      echo "*** But as you try to build a module library, libtool will still create "
-+	      echo "*** a static module, that should work as long as the dlopening application"
-+	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
-+	      if test -z "$global_symbol_pipe"; then
-+		echo
-+		echo "*** However, this would only work if libtool was able to extract symbol"
-+		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-+		echo "*** not find such a program.  So, this module is probably useless."
-+		echo "*** \`nm' from GNU binutils and a full rebuild may help."
-+	      fi
-+	      if test "$build_old_libs" = no; then
-+		build_libtool_libs=module
-+		build_old_libs=yes
-+	      else
-+		build_libtool_libs=no
-+	      fi
-+	    fi
-+	  else
-+	    convenience="$convenience $dir/$old_library"
-+	    old_convenience="$old_convenience $dir/$old_library"
-+	    deplibs="$dir/$old_library $deplibs"
-+	    link_static=yes
-+	  fi
-+	fi # link shared/static library?
-+
-+	if test $linkmode = lib; then
-+	  if test -n "$dependency_libs" &&
-+	     { test $hardcode_into_libs != yes || test $build_old_libs = yes ||
-+	       test $link_static = yes; }; then
-+	    # Extract -R from dependency_libs
-+	    temp_deplibs=
-+	    for libdir in $dependency_libs; do
-+	      case $libdir in
-+	      -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
-+		   case " $xrpath " in
-+		   *" $temp_xrpath "*) ;;
-+		   *) xrpath="$xrpath $temp_xrpath";;
-+		   esac;;
-+	      *) temp_deplibs="$temp_deplibs $libdir";;
-+	      esac
-+	    done
-+	    dependency_libs="$temp_deplibs"
-+	  fi
-+
-+	  newlib_search_path="$newlib_search_path $absdir"
-+	  # Link against this library
-+	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-+	  # ... and its dependency_libs
-+	  tmp_libs=
-+	  for deplib in $dependency_libs; do
-+	    newdependency_libs="$deplib $newdependency_libs"
-+	    if test "X$duplicate_deps" = "Xyes" ; then
-+	      case "$tmp_libs " in
-+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	      esac
-+	    fi
-+	    tmp_libs="$tmp_libs $deplib"
-+	  done
-+
-+	  if test $link_all_deplibs != no; then
-+	    # Add the search paths of all dependency libraries
-+	    for deplib in $dependency_libs; do
-+	      case $deplib in
-+	      -L*) path="$deplib" ;;
-+	      *.la)
-+		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
-+		test "X$dir" = "X$deplib" && dir="."
-+		# We need an absolute path.
-+		case $dir in
-+		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-+		*)
-+		  absdir=`cd "$dir" && pwd`
-+		  if test -z "$absdir"; then
-+		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
-+		    absdir="$dir"
-+		  fi
-+		  ;;
-+		esac
-+		if grep "^installed=no" $deplib > /dev/null; then
-+		  path="-L$absdir/$objdir"
-+		else
-+		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+		  if test -z "$libdir"; then
-+		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-+		    exit 1
-+		  fi
-+		  if test "$absdir" != "$libdir"; then
-+		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-+		  fi
-+		  path="-L$absdir"
-+		fi
-+		;;
-+	      *) continue ;;
-+	      esac
-+	      case " $deplibs " in
-+	      *" $path "*) ;;
-+	      *) deplibs="$deplibs $path" ;;
-+	      esac
-+	    done
-+	  fi # link_all_deplibs != no
-+	fi # linkmode = lib
-+      done # for deplib in $libs
-+      if test $pass = dlpreopen; then
-+	# Link the dlpreopened libraries before other libraries
-+	for deplib in $save_deplibs; do
-+	  deplibs="$deplib $deplibs"
-+	done
-+      fi
-+      if test $pass != dlopen; then
-+	test $pass != scan && dependency_libs="$newdependency_libs"
-+	if test $pass != conv; then
-+	  # Make sure lib_search_path contains only unique directories.
-+	  lib_search_path=
-+	  for dir in $newlib_search_path; do
-+	    case "$lib_search_path " in
-+	    *" $dir "*) ;;
-+	    *) lib_search_path="$lib_search_path $dir" ;;
-+	    esac
-+	  done
-+	  newlib_search_path=
-+	fi
-+
-+	if test "$linkmode,$pass" != "prog,link"; then
-+	  vars="deplibs"
-+	else
-+	  vars="compile_deplibs finalize_deplibs"
-+	fi
-+	for var in $vars dependency_libs; do
-+	  # Add libraries to $var in reverse order
-+	  eval tmp_libs=\"\$$var\"
-+	  new_libs=
-+	  for deplib in $tmp_libs; do
-+	    case $deplib in
-+	    -L*) new_libs="$deplib $new_libs" ;;
-+	    *)
-+	      case " $specialdeplibs " in
-+	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
-+	      *)
-+		case " $new_libs " in
-+		*" $deplib "*) ;;
-+		*) new_libs="$deplib $new_libs" ;;
-+		esac
-+		;;
-+	      esac
-+	      ;;
-+	    esac
-+	  done
-+	  tmp_libs=
-+	  for deplib in $new_libs; do
-+	    case $deplib in
-+	    -L*)
-+	      case " $tmp_libs " in
-+	      *" $deplib "*) ;;
-+	      *) tmp_libs="$tmp_libs $deplib" ;;
-+	      esac
-+	      ;;
-+	    *) tmp_libs="$tmp_libs $deplib" ;;
-+	    esac
-+	  done
-+	  eval $var=\"$tmp_libs\"
-+	done # for var
-+      fi
-+      if test "$pass" = "conv" &&
-+       { test "$linkmode" = "lib" || test "$linkmode" = "prog"; }; then
-+	libs="$deplibs" # reset libs
-+	deplibs=
-+      fi
-+    done # for pass
-+    if test $linkmode = prog; then
-+      dlfiles="$newdlfiles"
-+      dlprefiles="$newdlprefiles"
-+    fi
-+
-+    case $linkmode in
-+    oldlib)
-+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-+	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
-+      fi
-+
-+      if test -n "$rpath"; then
-+	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
-+      fi
-+
-+      if test -n "$xrpath"; then
-+	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
-+      fi
-+
-+      if test -n "$vinfo"; then
-+	$echo "$modename: warning: \`-version-info' is ignored for archives" 1>&2
-+      fi
-+
-+      if test -n "$release"; then
-+	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
-+      fi
-+
-+      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-+	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
-+      fi
-+
-+      # Now set the variables for building old libraries.
-+      build_libtool_libs=no
-+      oldlibs="$output"
-+      objs="$objs$old_deplibs"
-+      ;;
-+
-+    lib)
-+      # Make sure we only generate libraries of the form `libNAME.la'.
-+      case $outputname in
-+      lib*)
-+	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-+	eval libname=\"$libname_spec\"
-+	;;
-+      *)
-+	if test "$module" = no; then
-+	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
-+	  $echo "$help" 1>&2
-+	  exit 1
-+	fi
-+	if test "$need_lib_prefix" != no; then
-+	  # Add the "lib" prefix for modules if required
-+	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-+	  eval libname=\"$libname_spec\"
-+	else
-+	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-+	fi
-+	;;
-+      esac
-+
-+      if test -n "$objs"; then
-+	if test "$deplibs_check_method" != pass_all; then
-+	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
-+	  exit 1
-+	else
-+	  echo
-+	  echo "*** Warning: Linking the shared library $output against the non-libtool"
-+	  echo "*** objects $objs is not portable!"
-+	  libobjs="$libobjs $objs"
-+	fi
-+      fi
-+
-+      if test "$dlself" != no; then
-+	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
-+      fi
-+
-+      set dummy $rpath
-+      if test $# -gt 2; then
-+	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
-+      fi
-+      install_libdir="$2"
-+
-+      oldlibs=
-+      if test -z "$rpath"; then
-+	if test "$build_libtool_libs" = yes; then
-+	  # Building a libtool convenience library.
-+	  libext=al
-+	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
-+	  build_libtool_libs=convenience
-+	  build_old_libs=yes
-+	fi
-+
-+	if test -n "$vinfo"; then
-+	  $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2
-+	fi
-+
-+	if test -n "$release"; then
-+	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
-+	fi
-+      else
-+
-+	# Parse the version information argument.
-+	save_ifs="$IFS"; IFS=':'
-+	set dummy $vinfo 0 0 0
-+	IFS="$save_ifs"
-+
-+	if test -n "$8"; then
-+	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
-+	  $echo "$help" 1>&2
-+	  exit 1
-+	fi
-+
-+	current="$2"
-+	revision="$3"
-+	age="$4"
-+
-+	# Check that each of the things are valid numbers.
-+	case $current in
-+	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-+	*)
-+	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
-+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-+	  exit 1
-+	  ;;
-+	esac
-+
-+	case $revision in
-+	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-+	*)
-+	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
-+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-+	  exit 1
-+	  ;;
-+	esac
-+
-+	case $age in
-+	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-+	*)
-+	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
-+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-+	  exit 1
-+	  ;;
-+	esac
-+
-+	if test $age -gt $current; then
-+	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
-+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-+	  exit 1
-+	fi
-+
-+	# Calculate the version variables.
-+	major=
-+	versuffix=
-+	verstring=
-+	case $version_type in
-+	none) ;;
-+
-+	darwin)
-+	  # Like Linux, but with the current version available in
-+	  # verstring for coding it into the library header
-+	  major=.`expr $current - $age`
-+	  versuffix="$major.$age.$revision"
-+	  # Darwin ld doesn't like 0 for these options...
-+	  minor_current=`expr $current + 1`
-+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-+	  ;;
-+
-+	freebsd-aout)
-+	  major=".$current"
-+	  versuffix=".$current.$revision";
-+	  ;;
-+
-+	freebsd-elf)
-+	  major=".$current"
-+	  versuffix=".$current";
-+	  ;;
-+
-+	irix | nonstopux)
-+	  major=`expr $current - $age + 1`
-+
-+	  case $version_type in
-+	    nonstopux) verstring_prefix=nonstopux ;;
-+	    *)         verstring_prefix=sgi ;;
-+	  esac
-+	  verstring="$verstring_prefix$major.$revision"
-+
-+	  # Add in all the interfaces that we are compatible with.
-+	  loop=$revision
-+	  while test $loop != 0; do
-+	    iface=`expr $revision - $loop`
-+	    loop=`expr $loop - 1`
-+	    verstring="$verstring_prefix$major.$iface:$verstring"
-+	  done
-+
-+	  # Before this point, $major must not contain `.'.
-+	  major=.$major
-+	  versuffix="$major.$revision"
-+	  ;;
-+
-+	linux)
-+	  major=.`expr $current - $age`
-+	  versuffix="$major.$age.$revision"
-+	  ;;
-+
-+	osf)
-+	  major=.`expr $current - $age`
-+	  versuffix=".$current.$age.$revision"
-+	  verstring="$current.$age.$revision"
-+
-+	  # Add in all the interfaces that we are compatible with.
-+	  loop=$age
-+	  while test $loop != 0; do
-+	    iface=`expr $current - $loop`
-+	    loop=`expr $loop - 1`
-+	    verstring="$verstring:${iface}.0"
-+	  done
-+
-+	  # Make executables depend on our current version.
-+	  verstring="$verstring:${current}.0"
-+	  ;;
-+
-+	sunos)
-+	  major=".$current"
-+	  versuffix=".$current.$revision"
-+	  ;;
-+
-+	windows)
-+	  # Use '-' rather than '.', since we only want one
-+	  # extension on DOS 8.3 filesystems.
-+	  major=`expr $current - $age`
-+	  versuffix="-$major"
-+	  ;;
-+
-+	*)
-+	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
-+	  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-+	  exit 1
-+	  ;;
-+	esac
-+
-+	# Clear the version info if we defaulted, and they specified a release.
-+	if test -z "$vinfo" && test -n "$release"; then
-+	  major=
-+	  verstring="0.0"
-+	  case $version_type in
-+	  darwin)
-+	    # we can't check for "0.0" in archive_cmds due to quoting
-+	    # problems, so we reset it completely
-+	    verstring=""
-+	    ;;
-+	  *)
-+	    verstring="0.0"
-+	    ;;
-+	  esac
-+	  if test "$need_version" = no; then
-+	    versuffix=
-+	  else
-+	    versuffix=".0.0"
-+	  fi
-+	fi
-+
-+	# Remove version info from name if versioning should be avoided
-+	if test "$avoid_version" = yes && test "$need_version" = no; then
-+	  major=
-+	  versuffix=
-+	  verstring=""
-+	fi
-+
-+	# Check to see if the archive will have undefined symbols.
-+	if test "$allow_undefined" = yes; then
-+	  if test "$allow_undefined_flag" = unsupported; then
-+	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
-+	    build_libtool_libs=no
-+	    build_old_libs=yes
-+	  fi
-+	else
-+	  # Don't allow undefined symbols.
-+	  allow_undefined_flag="$no_undefined_flag"
-+	fi
-+      fi
-+
-+      if test "$mode" != relink; then
-+	# Remove our outputs.
-+	$show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
-+	$run ${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*
-+      fi
-+
-+      # Now set the variables for building old libraries.
-+      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-+	oldlibs="$oldlibs $output_objdir/$libname.$libext"
-+
-+	# Transform .lo files to .o files.
-+	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-+      fi
-+
-+      # Eliminate all temporary directories.
-+      for path in $notinst_path; do
-+	lib_search_path=`echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
-+	deplibs=`echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
-+	dependency_libs=`echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
-+      done
-+
-+      if test -n "$xrpath"; then
-+	# If the user specified any rpath flags, then add them.
-+	temp_xrpath=
-+	for libdir in $xrpath; do
-+	  temp_xrpath="$temp_xrpath -R$libdir"
-+	  case "$finalize_rpath " in
-+	  *" $libdir "*) ;;
-+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-+	  esac
-+	done
-+	if test $hardcode_into_libs != yes || test $build_old_libs = yes; then
-+	  dependency_libs="$temp_xrpath $dependency_libs"
-+	fi
-+      fi
-+
-+      # Make sure dlfiles contains only unique files that won't be dlpreopened
-+      old_dlfiles="$dlfiles"
-+      dlfiles=
-+      for lib in $old_dlfiles; do
-+	case " $dlprefiles $dlfiles " in
-+	*" $lib "*) ;;
-+	*) dlfiles="$dlfiles $lib" ;;
-+	esac
-+      done
-+
-+      # Make sure dlprefiles contains only unique files
-+      old_dlprefiles="$dlprefiles"
-+      dlprefiles=
-+      for lib in $old_dlprefiles; do
-+	case "$dlprefiles " in
-+	*" $lib "*) ;;
-+	*) dlprefiles="$dlprefiles $lib" ;;
-+	esac
-+      done
-+
-+      if test "$build_libtool_libs" = yes; then
-+	if test -n "$rpath"; then
-+	  case $host in
-+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
-+	    # these systems don't actually have a c library (as such)!
-+	    ;;
-+	  *-*-rhapsody* | *-*-darwin1.[012])
-+	    # Rhapsody C library is in the System framework
-+	    deplibs="$deplibs -framework System"
-+	    ;;
-+	  *-*-netbsd*)
-+	    # Don't link with libc until the a.out ld.so is fixed.
-+	    ;;
-+	  *-*-openbsd* | *-*-freebsd*)
-+	    # Do not include libc due to us having libc/libc_r.
-+	    ;;
-+	  *)
-+	    # Add libc to deplibs on all other systems if necessary.
-+	    if test $build_libtool_need_lc = "yes"; then
-+	      deplibs="$deplibs -lc"
-+	    fi
-+	    ;;
-+	  esac
-+	fi
-+
-+	# Transform deplibs into only deplibs that can be linked in shared.
-+	name_save=$name
-+	libname_save=$libname
-+	release_save=$release
-+	versuffix_save=$versuffix
-+	major_save=$major
-+	# I'm not sure if I'm treating the release correctly.  I think
-+	# release should show up in the -l (ie -lgmp5) so we don't want to
-+	# add it in twice.  Is that correct?
-+	release=""
-+	versuffix=""
-+	major=""
-+	newdeplibs=
-+	droppeddeps=no
-+	case $deplibs_check_method in
-+	pass_all)
-+	  # Don't check for shared/static.  Everything works.
-+	  # This might be a little naive.  We might want to check
-+	  # whether the library exists or not.  But this is on
-+	  # osf3 & osf4 and I'm not really sure... Just
-+	  # implementing what was already the behaviour.
-+	  newdeplibs=$deplibs
-+	  ;;
-+	test_compile)
-+	  # This code stresses the "libraries are programs" paradigm to its
-+	  # limits. Maybe even breaks it.  We compile a program, linking it
-+	  # against the deplibs as a proxy for the library.  Then we can check
-+	  # whether they linked in statically or dynamically with ldd.
-+	  $rm conftest.c
-+	  cat > conftest.c <<EOF
-+	  int main() { return 0; }
-+EOF
-+	  $rm conftest
-+	  $CC -o conftest conftest.c $deplibs
-+	  if test $? -eq 0 ; then
-+	    ldd_output=`ldd conftest`
-+	    for i in $deplibs; do
-+	      name="`expr $i : '-l\(.*\)'`"
-+	      # If $name is empty we are operating on a -L argument.
-+	      if test -n "$name" && test "$name" != "0"; then
-+		libname=`eval \\$echo \"$libname_spec\"`
-+		deplib_matches=`eval \\$echo \"$library_names_spec\"`
-+		set dummy $deplib_matches
-+		deplib_match=$2
-+		if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-+		  newdeplibs="$newdeplibs $i"
-+		else
-+		  droppeddeps=yes
-+		  echo
-+		  echo "*** Warning: dynamic linker does not accept needed library $i."
-+		  echo "*** I have the capability to make that library automatically link in when"
-+		  echo "*** you link to this library.  But I can only do this if you have a"
-+		  echo "*** shared version of the library, which I believe you do not have"
-+		  echo "*** because a test_compile did reveal that the linker did not use it for"
-+		  echo "*** its dynamic dependency list that programs get resolved with at runtime."
-+		fi
-+	      else
-+		newdeplibs="$newdeplibs $i"
-+	      fi
-+	    done
-+	  else
-+	    # Error occured in the first compile.  Let's try to salvage
-+	    # the situation: Compile a separate program for each library.
-+	    for i in $deplibs; do
-+	      name="`expr $i : '-l\(.*\)'`"
-+	     # If $name is empty we are operating on a -L argument.
-+	      if test -n "$name" && test "$name" != "0"; then
-+		$rm conftest
-+		$CC -o conftest conftest.c $i
-+		# Did it work?
-+		if test $? -eq 0 ; then
-+		  ldd_output=`ldd conftest`
-+		  libname=`eval \\$echo \"$libname_spec\"`
-+		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
-+		  set dummy $deplib_matches
-+		  deplib_match=$2
-+		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-+		    newdeplibs="$newdeplibs $i"
-+		  else
-+		    droppeddeps=yes
-+		    echo
-+		    echo "*** Warning: dynamic linker does not accept needed library $i."
-+		    echo "*** I have the capability to make that library automatically link in when"
-+		    echo "*** you link to this library.  But I can only do this if you have a"
-+		    echo "*** shared version of the library, which you do not appear to have"
-+		    echo "*** because a test_compile did reveal that the linker did not use this one"
-+		    echo "*** as a dynamic dependency that programs can get resolved with at runtime."
-+		  fi
-+		else
-+		  droppeddeps=yes
-+		  echo
-+		  echo "*** Warning!  Library $i is needed by this library but I was not able to"
-+		  echo "***  make it link in!  You will probably need to install it or some"
-+		  echo "*** library that it depends on before this library will be fully"
-+		  echo "*** functional.  Installing it before continuing would be even better."
-+		fi
-+	      else
-+		newdeplibs="$newdeplibs $i"
-+	      fi
-+	    done
-+	  fi
-+	  ;;
-+	file_magic*)
-+	  set dummy $deplibs_check_method
-+	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-+	  for a_deplib in $deplibs; do
-+	    name="`expr $a_deplib : '-l\(.*\)'`"
-+	    # If $name is empty we are operating on a -L argument.
-+	    if test -n "$name" && test "$name" != "0"; then
-+	      libname=`eval \\$echo \"$libname_spec\"`
-+	      for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-+		    potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-+		    for potent_lib in $potential_libs; do
-+		      # Follow soft links.
-+		      if ls -lLd "$potent_lib" 2>/dev/null \
-+			 | grep " -> " >/dev/null; then
-+			continue
-+		      fi
-+		      # The statement above tries to avoid entering an
-+		      # endless loop below, in case of cyclic links.
-+		      # We might still enter an endless loop, since a link
-+		      # loop can be closed while we follow links,
-+		      # but so what?
-+		      potlib="$potent_lib"
-+		      while test -h "$potlib" 2>/dev/null; do
-+			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
-+			case $potliblink in
-+			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-+			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
-+			esac
-+		      done
-+		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
-+			 | ${SED} 10q \
-+			 | egrep "$file_magic_regex" > /dev/null; then
-+			newdeplibs="$newdeplibs $a_deplib"
-+			a_deplib=""
-+			break 2
-+		      fi
-+		    done
-+	      done
-+	      if test -n "$a_deplib" ; then
-+		droppeddeps=yes
-+		echo
-+		echo "*** Warning: linker path does not have real file for library $a_deplib."
-+		echo "*** I have the capability to make that library automatically link in when"
-+		echo "*** you link to this library.  But I can only do this if you have a"
-+		echo "*** shared version of the library, which you do not appear to have"
-+		echo "*** because I did check the linker path looking for a file starting"
-+		if test -z "$potlib" ; then
-+		  echo "*** with $libname but no candidates were found. (...for file magic test)"
-+		else
-+		  echo "*** with $libname and none of the candidates passed a file format test"
-+		  echo "*** using a file magic. Last file checked: $potlib"
-+		fi
-+	      fi
-+	    else
-+	      # Add a -L argument.
-+	      newdeplibs="$newdeplibs $a_deplib"
-+	    fi
-+	  done # Gone through all deplibs.
-+	  ;;
-+	match_pattern*)
-+	  set dummy $deplibs_check_method
-+	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-+	  for a_deplib in $deplibs; do
-+	    name="`expr $a_deplib : '-l\(.*\)'`"
-+	    # If $name is empty we are operating on a -L argument.
-+	    if test -n "$name" && test "$name" != "0"; then
-+	      libname=`eval \\$echo \"$libname_spec\"`
-+	      for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-+		potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-+		for potent_lib in $potential_libs; do
-+		  potlib="$potent_lib" # see symlink-check below in file_magic test
-+		  if eval echo \"$potent_lib\" 2>/dev/null \
-+		      | ${SED} 10q \
-+		      | egrep "$match_pattern_regex" > /dev/null; then
-+		    newdeplibs="$newdeplibs $a_deplib"
-+		    a_deplib=""
-+		    break 2
-+		  fi
-+		done
-+	      done
-+	      if test -n "$a_deplib" ; then
-+		droppeddeps=yes
-+		echo
-+		echo "*** Warning: linker path does not have real file for library $a_deplib."
-+		echo "*** I have the capability to make that library automatically link in when"
-+		echo "*** you link to this library.  But I can only do this if you have a"
-+		echo "*** shared version of the library, which you do not appear to have"
-+		echo "*** because I did check the linker path looking for a file starting"
-+		if test -z "$potlib" ; then
-+		  echo "*** with $libname but no candidates were found. (...for regex pattern test)"
-+		else
-+		  echo "*** with $libname and none of the candidates passed a file format test"
-+		  echo "*** using a regex pattern. Last file checked: $potlib"
-+		fi
-+	      fi
-+	    else
-+	      # Add a -L argument.
-+	      newdeplibs="$newdeplibs $a_deplib"
-+	    fi
-+	  done # Gone through all deplibs.
-+	  ;;
-+	none | unknown | *)
-+	  newdeplibs=""
-+	  if $echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
-+	       -e 's/ -[LR][^ ]*//g' -e 's/[ 	]//g' |
-+	     grep . >/dev/null; then
-+	    echo
-+	    if test "X$deplibs_check_method" = "Xnone"; then
-+	      echo "*** Warning: inter-library dependencies are not supported in this platform."
-+	    else
-+	      echo "*** Warning: inter-library dependencies are not known to be supported."
-+	    fi
-+	    echo "*** All declared inter-library dependencies are being dropped."
-+	    droppeddeps=yes
-+	  fi
-+	  ;;
-+	esac
-+	versuffix=$versuffix_save
-+	major=$major_save
-+	release=$release_save
-+	libname=$libname_save
-+	name=$name_save
-+
-+	case $host in
-+	*-*-rhapsody* | *-*-darwin1.[012])
-+	  # On Rhapsody replace the C library is the System framework
-+	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
-+	  ;;
-+	esac
-+
-+	if test "$droppeddeps" = yes; then
-+	  if test "$module" = yes; then
-+	    echo
-+	    echo "*** Warning: libtool could not satisfy all declared inter-library"
-+	    echo "*** dependencies of module $libname.  Therefore, libtool will create"
-+	    echo "*** a static module, that should work as long as the dlopening"
-+	    echo "*** application is linked with the -dlopen flag."
-+	    if test -z "$global_symbol_pipe"; then
-+	      echo
-+	      echo "*** However, this would only work if libtool was able to extract symbol"
-+	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-+	      echo "*** not find such a program.  So, this module is probably useless."
-+	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
-+	    fi
-+	    if test "$build_old_libs" = no; then
-+	      oldlibs="$output_objdir/$libname.$libext"
-+	      build_libtool_libs=module
-+	      build_old_libs=yes
-+	    else
-+	      build_libtool_libs=no
-+	    fi
-+	  else
-+	    echo "*** The inter-library dependencies that have been dropped here will be"
-+	    echo "*** automatically added whenever a program is linked with this library"
-+	    echo "*** or is declared to -dlopen it."
-+
-+	    if test $allow_undefined = no; then
-+	      echo
-+	      echo "*** Since this library must not contain undefined symbols,"
-+	      echo "*** because either the platform does not support them or"
-+	      echo "*** it was explicitly requested with -no-undefined,"
-+	      echo "*** libtool will only create a static version of it."
-+	      if test "$build_old_libs" = no; then
-+		oldlibs="$output_objdir/$libname.$libext"
-+		build_libtool_libs=module
-+		build_old_libs=yes
-+	      else
-+		build_libtool_libs=no
-+	      fi
-+	    fi
-+	  fi
-+	fi
-+	# Done checking deplibs!
-+	deplibs=$newdeplibs
-+      fi
-+
-+      # All the library-specific variables (install_libdir is set above).
-+      library_names=
-+      old_library=
-+      dlname=
-+
-+      # Test again, we may have decided not to build it any more
-+      if test "$build_libtool_libs" = yes; then
-+	if test $hardcode_into_libs = yes; then
-+	  # Hardcode the library paths
-+	  hardcode_libdirs=
-+	  dep_rpath=
-+	  rpath="$finalize_rpath"
-+	  test "$mode" != relink && rpath="$compile_rpath$rpath"
-+	  for libdir in $rpath; do
-+	    if test -n "$hardcode_libdir_flag_spec"; then
-+	      if test -n "$hardcode_libdir_separator"; then
-+		if test -z "$hardcode_libdirs"; then
-+		  hardcode_libdirs="$libdir"
-+		else
-+		  # Just accumulate the unique libdirs.
-+		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-+		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-+		    ;;
-+		  *)
-+		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+		    ;;
-+		  esac
-+		fi
-+	      else
-+		eval flag=\"$hardcode_libdir_flag_spec\"
-+		dep_rpath="$dep_rpath $flag"
-+	      fi
-+	    elif test -n "$runpath_var"; then
-+	      case "$perm_rpath " in
-+	      *" $libdir "*) ;;
-+	      *) perm_rpath="$perm_rpath $libdir" ;;
-+	      esac
-+	    fi
-+	  done
-+	  # Substitute the hardcoded libdirs into the rpath.
-+	  if test -n "$hardcode_libdir_separator" &&
-+	     test -n "$hardcode_libdirs"; then
-+	    libdir="$hardcode_libdirs"
-+	    eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-+	  fi
-+	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
-+	    # We should set the runpath_var.
-+	    rpath=
-+	    for dir in $perm_rpath; do
-+	      rpath="$rpath$dir:"
-+	    done
-+	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-+	  fi
-+	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-+	fi
-+
-+	shlibpath="$finalize_shlibpath"
-+	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-+	if test -n "$shlibpath"; then
-+	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-+	fi
-+
-+	# Get the real and link names of the library.
-+	eval library_names=\"$library_names_spec\"
-+	set dummy $library_names
-+	realname="$2"
-+	shift; shift
-+
-+	if test -n "$soname_spec"; then
-+	  eval soname=\"$soname_spec\"
-+	else
-+	  soname="$realname"
-+	fi
-+	test -z "$dlname" && dlname=$soname
-+
-+	lib="$output_objdir/$realname"
-+	for link
-+	do
-+	  linknames="$linknames $link"
-+	done
-+
-+	# Ensure that we have .o objects for linkers which dislike .lo
-+	# (e.g. aix) in case we are running --disable-static
-+	for obj in $libobjs; do
-+	  xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-+	  if test "X$xdir" = "X$obj"; then
-+	    xdir="."
-+	  else
-+	    xdir="$xdir"
-+	  fi
-+	  baseobj=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-+	  oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
-+	  if test ! -f $xdir/$oldobj; then
-+	    $show "(cd $xdir && ${LN_S} $baseobj $oldobj)"
-+	    $run eval '(cd $xdir && ${LN_S} $baseobj $oldobj)' || exit $?
-+	  fi
-+	done
-+
-+	# Use standard objects if they are pic
-+	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+
-+	# Prepare the list of exported symbols
-+	if test -z "$export_symbols"; then
-+	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-+	    $show "generating symbol list for \`$libname.la'"
-+	    export_symbols="$output_objdir/$libname.exp"
-+	    $run $rm $export_symbols
-+	    eval cmds=\"$export_symbols_cmds\"
-+	    save_ifs="$IFS"; IFS='~'
-+	    for cmd in $cmds; do
-+	      IFS="$save_ifs"
-+	      $show "$cmd"
-+	      $run eval "$cmd" || exit $?
-+	    done
-+	    IFS="$save_ifs"
-+	    if test -n "$export_symbols_regex"; then
-+	      $show "egrep -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
-+	      $run eval 'egrep -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-+	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
-+	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
-+	    fi
-+	  fi
-+	fi
-+
-+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-+	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
-+	fi
-+
-+	if test -n "$convenience"; then
-+	  if test -n "$whole_archive_flag_spec"; then
-+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-+	  else
-+	    gentop="$output_objdir/${outputname}x"
-+	    $show "${rm}r $gentop"
-+	    $run ${rm}r "$gentop"
-+	    $show "mkdir $gentop"
-+	    $run mkdir "$gentop"
-+	    status=$?
-+	    if test $status -ne 0 && test ! -d "$gentop"; then
-+	      exit $status
-+	    fi
-+	    generated="$generated $gentop"
-+
-+	    for xlib in $convenience; do
-+	      # Extract the objects.
-+	      case $xlib in
-+	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-+	      *) xabs=`pwd`"/$xlib" ;;
-+	      esac
-+	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-+	      xdir="$gentop/$xlib"
-+
-+	      $show "${rm}r $xdir"
-+	      $run ${rm}r "$xdir"
-+	      $show "mkdir $xdir"
-+	      $run mkdir "$xdir"
-+	      status=$?
-+	      if test $status -ne 0 && test ! -d "$xdir"; then
-+		exit $status
-+	      fi
-+	      $show "(cd $xdir && $AR x $xabs)"
-+	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-+
-+	      libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
-+	    done
-+	  fi
-+	fi
-+
-+	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
-+	  eval flag=\"$thread_safe_flag_spec\"
-+	  linker_flags="$linker_flags $flag"
-+	fi
-+
-+	# Make a backup of the uninstalled library when relinking
-+	if test "$mode" = relink; then
-+	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
-+	fi
-+
-+	# Do each of the archive commands.
-+	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-+	  eval cmds=\"$archive_expsym_cmds\"
-+	else
-+	  save_deplibs="$deplibs"
-+	  for conv in $convenience; do
-+	    tmp_deplibs=
-+	    for test_deplib in $deplibs; do
-+	      if test "$test_deplib" != "$conv"; then
-+		tmp_deplibs="$tmp_deplibs $test_deplib"
-+	      fi
-+	    done
-+	    deplibs="$tmp_deplibs"
-+	  done
-+	  eval cmds=\"$archive_cmds\"
-+	  deplibs="$save_deplibs"
-+	fi
-+	save_ifs="$IFS"; IFS='~'
-+	for cmd in $cmds; do
-+	  IFS="$save_ifs"
-+	  $show "$cmd"
-+	  $run eval "$cmd" || exit $?
-+	done
-+	IFS="$save_ifs"
-+
-+	# Restore the uninstalled library and exit
-+	if test "$mode" = relink; then
-+	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
-+	  exit 0
-+	fi
-+
-+	# Create links to the real library.
-+	for linkname in $linknames; do
-+	  if test "$realname" != "$linkname"; then
-+	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
-+	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
-+	  fi
-+	done
-+
-+	# If -module or -export-dynamic was specified, set the dlname.
-+	if test "$module" = yes || test "$export_dynamic" = yes; then
-+	  # On all known operating systems, these are identical.
-+	  dlname="$soname"
-+	fi
-+      fi
-+      ;;
-+
-+    obj)
-+      if test -n "$deplibs"; then
-+	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-+      fi
-+
-+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-+	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
-+      fi
-+
-+      if test -n "$rpath"; then
-+	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
-+      fi
-+
-+      if test -n "$xrpath"; then
-+	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
-+      fi
-+
-+      if test -n "$vinfo"; then
-+	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
-+      fi
-+
-+      if test -n "$release"; then
-+	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
-+      fi
-+
-+      case $output in
-+      *.lo)
-+	if test -n "$objs$old_deplibs"; then
-+	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
-+	  exit 1
-+	fi
-+	libobj="$output"
-+	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-+	;;
-+      *)
-+	libobj=
-+	obj="$output"
-+	;;
-+      esac
-+
-+      # Delete the old objects.
-+      $run $rm $obj $libobj
-+
-+      # Objects from convenience libraries.  This assumes
-+      # single-version convenience libraries.  Whenever we create
-+      # different ones for PIC/non-PIC, this we'll have to duplicate
-+      # the extraction.
-+      reload_conv_objs=
-+      gentop=
-+      # reload_cmds runs $LD directly, so let us get rid of
-+      # -Wl from whole_archive_flag_spec
-+      wl=
-+
-+      if test -n "$convenience"; then
-+	if test -n "$whole_archive_flag_spec"; then
-+	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
-+	else
-+	  gentop="$output_objdir/${obj}x"
-+	  $show "${rm}r $gentop"
-+	  $run ${rm}r "$gentop"
-+	  $show "mkdir $gentop"
-+	  $run mkdir "$gentop"
-+	  status=$?
-+	  if test $status -ne 0 && test ! -d "$gentop"; then
-+	    exit $status
-+	  fi
-+	  generated="$generated $gentop"
-+
-+	  for xlib in $convenience; do
-+	    # Extract the objects.
-+	    case $xlib in
-+	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-+	    *) xabs=`pwd`"/$xlib" ;;
-+	    esac
-+	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-+	    xdir="$gentop/$xlib"
-+
-+	    $show "${rm}r $xdir"
-+	    $run ${rm}r "$xdir"
-+	    $show "mkdir $xdir"
-+	    $run mkdir "$xdir"
-+	    status=$?
-+	    if test $status -ne 0 && test ! -d "$xdir"; then
-+	      exit $status
-+	    fi
-+	    $show "(cd $xdir && $AR x $xabs)"
-+	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-+
-+	    reload_conv_objs="$reload_objs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
-+	  done
-+	fi
-+      fi
-+
-+      # Create the old-style object.
-+      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-+
-+      output="$obj"
-+      eval cmds=\"$reload_cmds\"
-+      save_ifs="$IFS"; IFS='~'
-+      for cmd in $cmds; do
-+	IFS="$save_ifs"
-+	$show "$cmd"
-+	$run eval "$cmd" || exit $?
-+      done
-+      IFS="$save_ifs"
-+
-+      # Exit if we aren't doing a library object file.
-+      if test -z "$libobj"; then
-+	if test -n "$gentop"; then
-+	  $show "${rm}r $gentop"
-+	  $run ${rm}r $gentop
-+	fi
-+
-+	exit 0
-+      fi
-+
-+      if test "$build_libtool_libs" != yes; then
-+	if test -n "$gentop"; then
-+	  $show "${rm}r $gentop"
-+	  $run ${rm}r $gentop
-+	fi
-+
-+	# Create an invalid libtool object if no PIC, so that we don't
-+	# accidentally link it into a program.
-+	$show "echo timestamp > $libobj"
-+	$run eval "echo timestamp > $libobj" || exit $?
-+	exit 0
-+      fi
-+
-+      if test -n "$pic_flag" || test "$pic_mode" != default; then
-+	# Only do commands if we really have different PIC objects.
-+	reload_objs="$libobjs $reload_conv_objs"
-+	output="$libobj"
-+	eval cmds=\"$reload_cmds\"
-+	save_ifs="$IFS"; IFS='~'
-+	for cmd in $cmds; do
-+	  IFS="$save_ifs"
-+	  $show "$cmd"
-+	  $run eval "$cmd" || exit $?
-+	done
-+	IFS="$save_ifs"
-+      else
-+	# Just create a symlink.
-+	$show $rm $libobj
-+	$run $rm $libobj
-+	xdir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
-+	if test "X$xdir" = "X$libobj"; then
-+	  xdir="."
-+	else
-+	  xdir="$xdir"
-+	fi
-+	baseobj=`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
-+	oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
-+	$show "(cd $xdir && $LN_S $oldobj $baseobj)"
-+	$run eval '(cd $xdir && $LN_S $oldobj $baseobj)' || exit $?
-+      fi
-+
-+      if test -n "$gentop"; then
-+	$show "${rm}r $gentop"
-+	$run ${rm}r $gentop
-+      fi
-+
-+      exit 0
-+      ;;
-+
-+    prog)
-+      case $host in
-+	*cygwin*) output=`echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
-+      esac
-+      if test -n "$vinfo"; then
-+	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
-+      fi
-+
-+      if test -n "$release"; then
-+	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
-+      fi
-+
-+      if test "$preload" = yes; then
-+	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
-+	   test "$dlopen_self_static" = unknown; then
-+	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
-+	fi
-+      fi
-+
-+      case $host in
-+      *-*-rhapsody* | *-*-darwin1.[012])
-+	# On Rhapsody replace the C library is the System framework
-+	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-+	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-+	case $host in
-+	*darwin*)
-+	  # Don't allow lazy linking, it breaks C++ global constructors
-+	  compile_command="$compile_command ${wl}-bind_at_load"
-+	  finalize_command="$finalize_command ${wl}-bind_at_load"
-+	  ;;
-+	esac
-+	;;
-+      esac
-+
-+      compile_command="$compile_command $compile_deplibs"
-+      finalize_command="$finalize_command $finalize_deplibs"
-+
-+      if test -n "$rpath$xrpath"; then
-+	# If the user specified any rpath flags, then add them.
-+	for libdir in $rpath $xrpath; do
-+	  # This is the magic to use -rpath.
-+	  case "$finalize_rpath " in
-+	  *" $libdir "*) ;;
-+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-+	  esac
-+	done
-+      fi
-+
-+      # Now hardcode the library paths
-+      rpath=
-+      hardcode_libdirs=
-+      for libdir in $compile_rpath $finalize_rpath; do
-+	if test -n "$hardcode_libdir_flag_spec"; then
-+	  if test -n "$hardcode_libdir_separator"; then
-+	    if test -z "$hardcode_libdirs"; then
-+	      hardcode_libdirs="$libdir"
-+	    else
-+	      # Just accumulate the unique libdirs.
-+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-+		;;
-+	      *)
-+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+		;;
-+	      esac
-+	    fi
-+	  else
-+	    eval flag=\"$hardcode_libdir_flag_spec\"
-+	    rpath="$rpath $flag"
-+	  fi
-+	elif test -n "$runpath_var"; then
-+	  case "$perm_rpath " in
-+	  *" $libdir "*) ;;
-+	  *) perm_rpath="$perm_rpath $libdir" ;;
-+	  esac
-+	fi
-+	case $host in
-+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+	  case :$dllsearchpath: in
-+	  *":$libdir:"*) ;;
-+	  *) dllsearchpath="$dllsearchpath:$libdir";;
-+	  esac
-+	  ;;
-+	esac
-+      done
-+      # Substitute the hardcoded libdirs into the rpath.
-+      if test -n "$hardcode_libdir_separator" &&
-+	 test -n "$hardcode_libdirs"; then
-+	libdir="$hardcode_libdirs"
-+	eval rpath=\" $hardcode_libdir_flag_spec\"
-+      fi
-+      compile_rpath="$rpath"
-+
-+      rpath=
-+      hardcode_libdirs=
-+      for libdir in $finalize_rpath; do
-+	if test -n "$hardcode_libdir_flag_spec"; then
-+	  if test -n "$hardcode_libdir_separator"; then
-+	    if test -z "$hardcode_libdirs"; then
-+	      hardcode_libdirs="$libdir"
-+	    else
-+	      # Just accumulate the unique libdirs.
-+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-+		;;
-+	      *)
-+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+		;;
-+	      esac
-+	    fi
-+	  else
-+	    eval flag=\"$hardcode_libdir_flag_spec\"
-+	    rpath="$rpath $flag"
-+	  fi
-+	elif test -n "$runpath_var"; then
-+	  case "$finalize_perm_rpath " in
-+	  *" $libdir "*) ;;
-+	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-+	  esac
-+	fi
-+      done
-+      # Substitute the hardcoded libdirs into the rpath.
-+      if test -n "$hardcode_libdir_separator" &&
-+	 test -n "$hardcode_libdirs"; then
-+	libdir="$hardcode_libdirs"
-+	eval rpath=\" $hardcode_libdir_flag_spec\"
-+      fi
-+      finalize_rpath="$rpath"
-+
-+      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-+	# Transform all the library objects into standard objects.
-+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+      fi
-+
-+      dlsyms=
-+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-+	if test -n "$NM" && test -n "$global_symbol_pipe"; then
-+	  dlsyms="${outputname}S.c"
-+	else
-+	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
-+	fi
-+      fi
-+
-+      if test -n "$dlsyms"; then
-+	case $dlsyms in
-+	"") ;;
-+	*.c)
-+	  # Discover the nlist of each of the dlfiles.
-+	  nlist="$output_objdir/${outputname}.nm"
-+
-+	  $show "$rm $nlist ${nlist}S ${nlist}T"
-+	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
-+
-+	  # Parse the name list into a source file.
-+	  $show "creating $output_objdir/$dlsyms"
-+
-+	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
-+/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
-+/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
-+
-+#ifdef __cplusplus
-+extern \"C\" {
-+#endif
-+
-+/* Prevent the only kind of declaration conflicts we can make. */
-+#define lt_preloaded_symbols some_other_symbol
-+
-+/* External symbol declarations for the compiler. */\
-+"
-+
-+	  if test "$dlself" = yes; then
-+	    $show "generating symbol list for \`$output'"
-+
-+	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
-+
-+	    # Add our own program objects to the symbol list.
-+	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+	    for arg in $progfiles; do
-+	      $show "extracting global C symbols from \`$arg'"
-+	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-+	    done
-+
-+	    if test -n "$exclude_expsyms"; then
-+	      $run eval 'egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-+	      $run eval '$mv "$nlist"T "$nlist"'
-+	    fi
-+
-+	    if test -n "$export_symbols_regex"; then
-+	      $run eval 'egrep -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-+	      $run eval '$mv "$nlist"T "$nlist"'
-+	    fi
-+
-+	    # Prepare the list of exported symbols
-+	    if test -z "$export_symbols"; then
-+	      export_symbols="$output_objdir/$output.exp"
-+	      $run $rm $export_symbols
-+	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-+	    else
-+	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
-+	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
-+	      $run eval 'mv "$nlist"T "$nlist"'
-+	    fi
-+	  fi
-+
-+	  for arg in $dlprefiles; do
-+	    $show "extracting global C symbols from \`$arg'"
-+	    name=`echo "$arg" | ${SED} -e 's%^.*/%%'`
-+	    $run eval 'echo ": $name " >> "$nlist"'
-+	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-+	  done
-+
-+	  if test -z "$run"; then
-+	    # Make sure we have at least an empty file.
-+	    test -f "$nlist" || : > "$nlist"
-+
-+	    if test -n "$exclude_expsyms"; then
-+	      egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-+	      $mv "$nlist"T "$nlist"
-+	    fi
-+
-+	    # Try sorting and uniquifying the output.
-+	    if grep -v "^: " < "$nlist" |
-+		if sort -k 3 </dev/null >/dev/null 2>&1; then
-+		  sort -k 3
-+		else
-+		  sort +2
-+		fi |
-+		uniq > "$nlist"S; then
-+	      :
-+	    else
-+	      grep -v "^: " < "$nlist" > "$nlist"S
-+	    fi
-+
-+	    if test -f "$nlist"S; then
-+	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
-+	    else
-+	      echo '/* NONE */' >> "$output_objdir/$dlsyms"
-+	    fi
-+
-+	    $echo >> "$output_objdir/$dlsyms" "\
-+
-+#undef lt_preloaded_symbols
-+
-+#if defined (__STDC__) && __STDC__
-+# define lt_ptr void *
-+#else
-+# define lt_ptr char *
-+# define const
-+#endif
-+
-+/* The mapping between symbol names and symbols. */
-+const struct {
-+  const char *name;
-+  lt_ptr address;
-+}
-+lt_preloaded_symbols[] =
-+{\
-+"
-+
-+	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
-+
-+	    $echo >> "$output_objdir/$dlsyms" "\
-+  {0, (lt_ptr) 0}
-+};
-+
-+/* This works around a problem in FreeBSD linker */
-+#ifdef FREEBSD_WORKAROUND
-+static const void *lt_preloaded_setup() {
-+  return lt_preloaded_symbols;
-+}
-+#endif
-+
-+#ifdef __cplusplus
-+}
-+#endif\
-+"
-+	  fi
-+
-+	  pic_flag_for_symtable=
-+	  case $host in
-+	  # compiling the symbol table file with pic_flag works around
-+	  # a FreeBSD bug that causes programs to crash when -lm is
-+	  # linked before any other PIC object.  But we must not use
-+	  # pic_flag when linking with -static.  The problem exists in
-+	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-+	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-+	    case "$compile_command " in
-+	    *" -static "*) ;;
-+	    *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";;
-+	    esac;;
-+	  *-*-hpux*)
-+	    case "$compile_command " in
-+	    *" -static "*) ;;
-+	    *) pic_flag_for_symtable=" $pic_flag -DPIC";;
-+	    esac
-+	  esac
-+
-+	  # Now compile the dynamic symbol file.
-+	  $show "(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
-+	  $run eval '(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
-+
-+	  # Clean up the generated files.
-+	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
-+	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
-+
-+	  # Transform the symbol file into the correct name.
-+	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-+	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-+	  ;;
-+	*)
-+	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
-+	  exit 1
-+	  ;;
-+	esac
-+      else
-+	# We keep going just in case the user didn't refer to
-+	# lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-+	# really was required.
-+
-+	# Nullify the symbol file.
-+	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-+	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-+      fi
-+
-+      if test $need_relink = no || test "$build_libtool_libs" != yes; then
-+	# Replace the output file specification.
-+	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-+	link_command="$compile_command$compile_rpath"
-+
-+	# We have no uninstalled library dependencies, so finalize right now.
-+	$show "$link_command"
-+	$run eval "$link_command"
-+	status=$?
-+
-+	# Delete the generated files.
-+	if test -n "$dlsyms"; then
-+	  $show "$rm $output_objdir/${outputname}S.${objext}"
-+	  $run $rm "$output_objdir/${outputname}S.${objext}"
-+	fi
-+
-+	exit $status
-+      fi
-+
-+      if test -n "$shlibpath_var"; then
-+	# We should set the shlibpath_var
-+	rpath=
-+	for dir in $temp_rpath; do
-+	  case $dir in
-+	  [\\/]* | [A-Za-z]:[\\/]*)
-+	    # Absolute path.
-+	    rpath="$rpath$dir:"
-+	    ;;
-+	  *)
-+	    # Relative path: add a thisdir entry.
-+	    rpath="$rpath\$thisdir/$dir:"
-+	    ;;
-+	  esac
-+	done
-+	temp_rpath="$rpath"
-+      fi
-+
-+      if test -n "$compile_shlibpath$finalize_shlibpath"; then
-+	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-+      fi
-+      if test -n "$finalize_shlibpath"; then
-+	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-+      fi
-+
-+      compile_var=
-+      finalize_var=
-+      if test -n "$runpath_var"; then
-+	if test -n "$perm_rpath"; then
-+	  # We should set the runpath_var.
-+	  rpath=
-+	  for dir in $perm_rpath; do
-+	    rpath="$rpath$dir:"
-+	  done
-+	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-+	fi
-+	if test -n "$finalize_perm_rpath"; then
-+	  # We should set the runpath_var.
-+	  rpath=
-+	  for dir in $finalize_perm_rpath; do
-+	    rpath="$rpath$dir:"
-+	  done
-+	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-+	fi
-+      fi
-+
-+      if test "$no_install" = yes; then
-+	# We don't need to create a wrapper script.
-+	link_command="$compile_var$compile_command$compile_rpath"
-+	# Replace the output file specification.
-+	link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-+	# Delete the old output file.
-+	$run $rm $output
-+	# Link the executable and exit
-+	$show "$link_command"
-+	$run eval "$link_command" || exit $?
-+	exit 0
-+      fi
-+
-+      if test "$hardcode_action" = relink; then
-+	# Fast installation is not supported
-+	link_command="$compile_var$compile_command$compile_rpath"
-+	relink_command="$finalize_var$finalize_command$finalize_rpath"
-+
-+	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
-+	$echo "$modename: \`$output' will be relinked during installation" 1>&2
-+      else
-+	if test "$fast_install" != no; then
-+	  link_command="$finalize_var$compile_command$finalize_rpath"
-+	  if test "$fast_install" = yes; then
-+	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
-+	  else
-+	    # fast_install is set to needless
-+	    relink_command=
-+	  fi
-+	else
-+	  link_command="$compile_var$compile_command$compile_rpath"
-+	  relink_command="$finalize_var$finalize_command$finalize_rpath"
-+	fi
-+      fi
-+
-+      # Replace the output file specification.
-+      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-+
-+      # Delete the old output files.
-+      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
-+
-+      $show "$link_command"
-+      $run eval "$link_command" || exit $?
-+
-+      # Now create the wrapper script.
-+      $show "creating $output"
-+
-+      # Quote the relink command for shipping.
-+      if test -n "$relink_command"; then
-+	# Preserve any variables that may affect compiler behavior
-+	for var in $variables_saved_for_relink; do
-+	  if eval test -z \"\${$var+set}\"; then
-+	    relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-+	  elif eval var_value=\$$var; test -z "$var_value"; then
-+	    relink_command="$var=; export $var; $relink_command"
-+	  else
-+	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-+	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
-+	  fi
-+	done
-+	relink_command="(cd `pwd`; $relink_command)"
-+	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-+      fi
-+
-+      # Quote $echo for shipping.
-+      if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
-+	case $0 in
-+	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
-+	*) qecho="$SHELL `pwd`/$0 --fallback-echo";;
-+	esac
-+	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
-+      else
-+	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
-+      fi
-+
-+      # Only actually do things if our run command is non-null.
-+      if test -z "$run"; then
-+	# win32 will think the script is a binary if it has
-+	# a .exe suffix, so we strip it off here.
-+	case $output in
-+	  *.exe) output=`echo $output|${SED} 's,.exe$,,'` ;;
-+	esac
-+	# test for cygwin because mv fails w/o .exe extensions
-+	case $host in
-+	  *cygwin*) exeext=.exe ;;
-+	  *) exeext= ;;
-+	esac
-+	$rm $output
-+	trap "$rm $output; exit 1" 1 2 15
-+
-+	$echo > $output "\
-+#! $SHELL
-+
-+# $output - temporary wrapper script for $objdir/$outputname
-+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-+#
-+# The $output program cannot be directly executed until all the libtool
-+# libraries that it depends on are installed.
-+#
-+# This wrapper script should never be moved out of the build directory.
-+# If it is, it will not operate correctly.
-+
-+# Sed substitution that helps us do robust quoting.  It backslashifies
-+# metacharacters that are still active within double-quoted strings.
-+Xsed="${SED}"' -e 1s/^X//'
-+sed_quote_subst='$sed_quote_subst'
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
-+
-+relink_command=\"$relink_command\"
-+
-+# This environment variable determines our operation mode.
-+if test \"\$libtool_install_magic\" = \"$magic\"; then
-+  # install mode needs the following variable:
-+  notinst_deplibs='$notinst_deplibs'
-+else
-+  # When we are sourced in execute mode, \$file and \$echo are already set.
-+  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-+    echo=\"$qecho\"
-+    file=\"\$0\"
-+    # Make sure echo works.
-+    if test \"X\$1\" = X--no-reexec; then
-+      # Discard the --no-reexec flag, and continue.
-+      shift
-+    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
-+      # Yippee, \$echo works!
-+      :
-+    else
-+      # Restart under the correct shell, and then maybe \$echo will work.
-+      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-+    fi
-+  fi\
-+"
-+	$echo >> $output "\
-+
-+  # Find the directory that this script lives in.
-+  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-+  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-+
-+  # Follow symbolic links until we get to the real thisdir.
-+  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-+  while test -n \"\$file\"; do
-+    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-+
-+    # If there was a directory component, then change thisdir.
-+    if test \"x\$destdir\" != \"x\$file\"; then
-+      case \"\$destdir\" in
-+      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-+      *) thisdir=\"\$thisdir/\$destdir\" ;;
-+      esac
-+    fi
-+
-+    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-+    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-+  done
-+
-+  # Try to get the absolute directory name.
-+  absdir=\`cd \"\$thisdir\" && pwd\`
-+  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-+"
-+
-+	if test "$fast_install" = yes; then
-+	  echo >> $output "\
-+  program=lt-'$outputname'$exeext
-+  progdir=\"\$thisdir/$objdir\"
-+
-+  if test ! -f \"\$progdir/\$program\" || \\
-+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-+       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-+
-+    file=\"\$\$-\$program\"
-+
-+    if test ! -d \"\$progdir\"; then
-+      $mkdir \"\$progdir\"
-+    else
-+      $rm \"\$progdir/\$file\"
-+    fi"
-+
-+	  echo >> $output "\
-+
-+    # relink executable if necessary
-+    if test -n \"\$relink_command\"; then
-+      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-+      else
-+	$echo \"\$relink_command_output\" >&2
-+	$rm \"\$progdir/\$file\"
-+	exit 1
-+      fi
-+    fi
-+
-+    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-+    { $rm \"\$progdir/\$program\";
-+      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-+    $rm \"\$progdir/\$file\"
-+  fi"
-+	else
-+	  echo >> $output "\
-+  program='$outputname'
-+  progdir=\"\$thisdir/$objdir\"
-+"
-+	fi
-+
-+	echo >> $output "\
-+
-+  if test -f \"\$progdir/\$program\"; then"
-+
-+	# Export our shlibpath_var if we have one.
-+	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-+	  $echo >> $output "\
-+    # Add our own library path to $shlibpath_var
-+    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-+
-+    # Some systems cannot cope with colon-terminated $shlibpath_var
-+    # The second colon is a workaround for a bug in BeOS R4 ${SED}
-+    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
-+
-+    export $shlibpath_var
-+"
-+	fi
-+
-+	# fixup the dll searchpath if we need to.
-+	if test -n "$dllsearchpath"; then
-+	  $echo >> $output "\
-+    # Add the dll search path components to the executable PATH
-+    PATH=$dllsearchpath:\$PATH
-+"
-+	fi
-+
-+	$echo >> $output "\
-+    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-+      # Run the actual program with our arguments.
-+"
-+	case $host in
-+	# win32 systems need to use the prog path for dll
-+	# lookup to work
-+	*-*-cygwin* | *-*-pw32*)
-+	  $echo >> $output "\
-+      exec \$progdir/\$program \${1+\"\$@\"}
-+"
-+	  ;;
-+
-+	# Backslashes separate directories on plain windows
-+	*-*-mingw | *-*-os2*)
-+	  $echo >> $output "\
-+      exec \$progdir\\\\\$program \${1+\"\$@\"}
-+"
-+	  ;;
-+
-+	*)
-+	  $echo >> $output "\
-+      # Export the path to the program.
-+      PATH=\"\$progdir:\$PATH\"
-+      export PATH
-+
-+      exec \$program \${1+\"\$@\"}
-+"
-+	  ;;
-+	esac
-+	$echo >> $output "\
-+      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
-+      exit 1
-+    fi
-+  else
-+    # The program doesn't exist.
-+    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
-+    \$echo \"This script is just a wrapper for \$program.\" 1>&2
-+    echo \"See the $PACKAGE documentation for more information.\" 1>&2
-+    exit 1
-+  fi
-+fi\
-+"
-+	chmod +x $output
-+      fi
-+      exit 0
-+      ;;
-+    esac
-+
-+    # See if we need to build an old-fashioned archive.
-+    for oldlib in $oldlibs; do
-+
-+      if test "$build_libtool_libs" = convenience; then
-+	oldobjs="$libobjs_save"
-+	addlibs="$convenience"
-+	build_libtool_libs=no
-+      else
-+	if test "$build_libtool_libs" = module; then
-+	  oldobjs="$libobjs_save"
-+	  build_libtool_libs=no
-+	else
-+	  oldobjs="$objs$old_deplibs "`$echo "X$libobjs_save" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`
-+	fi
-+	addlibs="$old_convenience"
-+      fi
-+
-+      if test -n "$addlibs"; then
-+	gentop="$output_objdir/${outputname}x"
-+	$show "${rm}r $gentop"
-+	$run ${rm}r "$gentop"
-+	$show "mkdir $gentop"
-+	$run mkdir "$gentop"
-+	status=$?
-+	if test $status -ne 0 && test ! -d "$gentop"; then
-+	  exit $status
-+	fi
-+	generated="$generated $gentop"
-+
-+	# Add in members from convenience archives.
-+	for xlib in $addlibs; do
-+	  # Extract the objects.
-+	  case $xlib in
-+	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-+	  *) xabs=`pwd`"/$xlib" ;;
-+	  esac
-+	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-+	  xdir="$gentop/$xlib"
-+
-+	  $show "${rm}r $xdir"
-+	  $run ${rm}r "$xdir"
-+	  $show "mkdir $xdir"
-+	  $run mkdir "$xdir"
-+	  status=$?
-+	  if test $status -ne 0 && test ! -d "$xdir"; then
-+	    exit $status
-+	  fi
-+	  $show "(cd $xdir && $AR x $xabs)"
-+	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-+
-+	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
-+	done
-+      fi
-+
-+      # Do each command in the archive commands.
-+      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-+	eval cmds=\"$old_archive_from_new_cmds\"
-+      else
-+	# Ensure that we have .o objects in place in case we decided
-+	# not to build a shared library, and have fallen back to building
-+	# static libs even though --disable-static was passed!
-+	for oldobj in $oldobjs; do
-+	  if test ! -f $oldobj; then
-+	    xdir=`$echo "X$oldobj" | $Xsed -e 's%/[^/]*$%%'`
-+	    if test "X$xdir" = "X$oldobj"; then
-+	      xdir="."
-+	    else
-+	      xdir="$xdir"
-+	    fi
-+	    baseobj=`$echo "X$oldobj" | $Xsed -e 's%^.*/%%'`
-+	    obj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
-+	    $show "(cd $xdir && ${LN_S} $obj $baseobj)"
-+	    $run eval '(cd $xdir && ${LN_S} $obj $baseobj)' || exit $?
-+	  fi
-+	done
-+
-+	eval cmds=\"$old_archive_cmds\"
-+      fi
-+      save_ifs="$IFS"; IFS='~'
-+      for cmd in $cmds; do
-+	IFS="$save_ifs"
-+	$show "$cmd"
-+	$run eval "$cmd" || exit $?
-+      done
-+      IFS="$save_ifs"
-+    done
-+
-+    if test -n "$generated"; then
-+      $show "${rm}r$generated"
-+      $run ${rm}r$generated
-+    fi
-+
-+    # Now create the libtool archive.
-+    case $output in
-+    *.la)
-+      old_library=
-+      test "$build_old_libs" = yes && old_library="$libname.$libext"
-+      $show "creating $output"
-+
-+      # Preserve any variables that may affect compiler behavior
-+      for var in $variables_saved_for_relink; do
-+	if eval test -z \"\${$var+set}\"; then
-+	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-+	elif eval var_value=\$$var; test -z "$var_value"; then
-+	  relink_command="$var=; export $var; $relink_command"
-+	else
-+	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-+	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
-+	fi
-+      done
-+      # Quote the link command for shipping.
-+      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
-+      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-+
-+      # Only create the output if not a dry run.
-+      if test -z "$run"; then
-+	for installed in no yes; do
-+	  if test "$installed" = yes; then
-+	    if test -z "$install_libdir"; then
-+	      break
-+	    fi
-+	    output="$output_objdir/$outputname"i
-+	    # Replace all uninstalled libtool libraries with the installed ones
-+	    newdependency_libs=
-+	    for deplib in $dependency_libs; do
-+	      case $deplib in
-+	      *.la)
-+		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+		if test -z "$libdir"; then
-+		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-+		  exit 1
-+		fi
-+		newdependency_libs="$newdependency_libs $libdir/$name"
-+		;;
-+	      *) newdependency_libs="$newdependency_libs $deplib" ;;
-+	      esac
-+	    done
-+	    dependency_libs="$newdependency_libs"
-+	    newdlfiles=
-+	    for lib in $dlfiles; do
-+	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-+	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-+	      if test -z "$libdir"; then
-+		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-+		exit 1
-+	      fi
-+	      newdlfiles="$newdlfiles $libdir/$name"
-+	    done
-+	    dlfiles="$newdlfiles"
-+	    newdlprefiles=
-+	    for lib in $dlprefiles; do
-+	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-+	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-+	      if test -z "$libdir"; then
-+		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-+		exit 1
-+	      fi
-+	      newdlprefiles="$newdlprefiles $libdir/$name"
-+	    done
-+	    dlprefiles="$newdlprefiles"
-+	  fi
-+	  $rm $output
-+	  # place dlname in correct position for cygwin
-+	  tdlname=$dlname
-+	  case $host,$output,$installed,$module,$dlname in
-+	    *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
-+	  esac
-+	  $echo > $output "\
-+# $outputname - a libtool library file
-+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-+#
-+# Please DO NOT delete this file!
-+# It is necessary for linking the library.
-+
-+# The name that we can dlopen(3).
-+dlname='$tdlname'
-+
-+# Names of this library.
-+library_names='$library_names'
-+
-+# The name of the static archive.
-+old_library='$old_library'
-+
-+# Libraries that this one depends upon.
-+dependency_libs='$dependency_libs'
-+
-+# Version information for $libname.
-+current=$current
-+age=$age
-+revision=$revision
-+
-+# Is this an already installed library?
-+installed=$installed
-+
-+# Files to dlopen/dlpreopen
-+dlopen='$dlfiles'
-+dlpreopen='$dlprefiles'
-+
-+# Directory that this library needs to be installed in:
-+libdir='$install_libdir'"
-+	  if test "$installed" = no && test $need_relink = yes; then
-+	    $echo >> $output "\
-+relink_command=\"$relink_command\""
-+	  fi
-+	done
-+      fi
-+
-+      # Do a symbolic link so that the libtool archive can be found in
-+      # LD_LIBRARY_PATH before the program is installed.
-+      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
-+      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
-+      ;;
-+    esac
-+    exit 0
-+    ;;
-+
-+  # libtool install mode
-+  install)
-+    modename="$modename: install"
-+
-+    # There may be an optional sh(1) argument at the beginning of
-+    # install_prog (especially on Windows NT).
-+    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-+       # Allow the use of GNU shtool's install command.
-+       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
-+      # Aesthetically quote it.
-+      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
-+      case $arg in
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-+	arg="\"$arg\""
-+	;;
-+      esac
-+      install_prog="$arg "
-+      arg="$1"
-+      shift
-+    else
-+      install_prog=
-+      arg="$nonopt"
-+    fi
-+
-+    # The real first argument should be the name of the installation program.
-+    # Aesthetically quote it.
-+    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-+    case $arg in
-+    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-+      arg="\"$arg\""
-+      ;;
-+    esac
-+    install_prog="$install_prog$arg"
-+
-+    # We need to accept at least all the BSD install flags.
-+    dest=
-+    files=
-+    opts=
-+    prev=
-+    install_type=
-+    isdir=no
-+    stripme=
-+    for arg
-+    do
-+      if test -n "$dest"; then
-+	files="$files $dest"
-+	dest="$arg"
-+	continue
-+      fi
-+
-+      case $arg in
-+      -d) isdir=yes ;;
-+      -f) prev="-f" ;;
-+      -g) prev="-g" ;;
-+      -m) prev="-m" ;;
-+      -o) prev="-o" ;;
-+      -s)
-+	stripme=" -s"
-+	continue
-+	;;
-+      -*) ;;
-+
-+      *)
-+	# If the previous option needed an argument, then skip it.
-+	if test -n "$prev"; then
-+	  prev=
-+	else
-+	  dest="$arg"
-+	  continue
-+	fi
-+	;;
-+      esac
-+
-+      # Aesthetically quote the argument.
-+      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-+      case $arg in
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-+	arg="\"$arg\""
-+	;;
-+      esac
-+      install_prog="$install_prog $arg"
-+    done
-+
-+    if test -z "$install_prog"; then
-+      $echo "$modename: you must specify an install program" 1>&2
-+      $echo "$help" 1>&2
-+      exit 1
-+    fi
-+
-+    if test -n "$prev"; then
-+      $echo "$modename: the \`$prev' option requires an argument" 1>&2
-+      $echo "$help" 1>&2
-+      exit 1
-+    fi
-+
-+    if test -z "$files"; then
-+      if test -z "$dest"; then
-+	$echo "$modename: no file or destination specified" 1>&2
-+      else
-+	$echo "$modename: you must specify a destination" 1>&2
-+      fi
-+      $echo "$help" 1>&2
-+      exit 1
-+    fi
-+
-+    # Strip any trailing slash from the destination.
-+    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
-+
-+    # Check to see that the destination is a directory.
-+    test -d "$dest" && isdir=yes
-+    if test "$isdir" = yes; then
-+      destdir="$dest"
-+      destname=
-+    else
-+      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
-+      test "X$destdir" = "X$dest" && destdir=.
-+      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
-+
-+      # Not a directory, so check to see that there is only one file specified.
-+      set dummy $files
-+      if test $# -gt 2; then
-+	$echo "$modename: \`$dest' is not a directory" 1>&2
-+	$echo "$help" 1>&2
-+	exit 1
-+      fi
-+    fi
-+    case $destdir in
-+    [\\/]* | [A-Za-z]:[\\/]*) ;;
-+    *)
-+      for file in $files; do
-+	case $file in
-+	*.lo) ;;
-+	*)
-+	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
-+	  $echo "$help" 1>&2
-+	  exit 1
-+	  ;;
-+	esac
-+      done
-+      ;;
-+    esac
-+
-+    # This variable tells wrapper scripts just to set variables rather
-+    # than running their programs.
-+    libtool_install_magic="$magic"
-+
-+    staticlibs=
-+    future_libdirs=
-+    current_libdirs=
-+    for file in $files; do
-+
-+      # Do each installation.
-+      case $file in
-+      *.$libext)
-+	# Do the static libraries later.
-+	staticlibs="$staticlibs $file"
-+	;;
-+
-+      *.la)
-+	# Check to see that this really is a libtool archive.
-+	if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-+	else
-+	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
-+	  $echo "$help" 1>&2
-+	  exit 1
-+	fi
-+
-+	library_names=
-+	old_library=
-+	relink_command=
-+	# If there is no directory component, then add one.
-+	case $file in
-+	*/* | *\\*) . $file ;;
-+	*) . ./$file ;;
-+	esac
-+
-+	# Add the libdir to current_libdirs if it is the destination.
-+	if test "X$destdir" = "X$libdir"; then
-+	  case "$current_libdirs " in
-+	  *" $libdir "*) ;;
-+	  *) current_libdirs="$current_libdirs $libdir" ;;
-+	  esac
-+	else
-+	  # Note the libdir as a future libdir.
-+	  case "$future_libdirs " in
-+	  *" $libdir "*) ;;
-+	  *) future_libdirs="$future_libdirs $libdir" ;;
-+	  esac
-+	fi
-+
-+	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
-+	test "X$dir" = "X$file/" && dir=
-+	dir="$dir$objdir"
-+
-+	if test -n "$relink_command"; then
-+          # Determine the prefix the user has applied to our future dir.
-+          inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
-+ 
-+          # Don't allow the user to place us outside of our expected
-+          # location b/c this prevents finding dependent libraries that
-+          # are installed to the same prefix.
-+          if test "$inst_prefix_dir" = "$destdir"; then
-+            $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-+            exit 1
-+          fi
-+ 
-+          if test -n "$inst_prefix_dir"; then
-+            # Stick the inst_prefix_dir data into the link command.
-+            relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-+          else
-+            relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
-+          fi
-+
-+	  $echo "$modename: warning: relinking \`$file'" 1>&2
-+	  $show "$relink_command"
-+	  if $run eval "$relink_command"; then :
-+	  else
-+	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-+	    exit 1
-+	  fi
-+	fi
-+
-+	# See the names of the shared library.
-+	set dummy $library_names
-+	if test -n "$2"; then
-+	  realname="$2"
-+	  shift
-+	  shift
-+
-+	  srcname="$realname"
-+	  test -n "$relink_command" && srcname="$realname"T
-+
-+	  # Install the shared library and build the symlinks.
-+	  $show "$install_prog $dir/$srcname $destdir/$realname"
-+	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
-+	  if test -n "$stripme" && test -n "$striplib"; then
-+	    $show "$striplib $destdir/$realname"
-+	    $run eval "$striplib $destdir/$realname" || exit $?
-+	  fi
-+
-+	  if test $# -gt 0; then
-+	    # Delete the old symlinks, and create new ones.
-+	    for linkname
-+	    do
-+	      if test "$linkname" != "$realname"; then
-+		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
-+		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
-+	      fi
-+	    done
-+	  fi
-+
-+	  # Do each command in the postinstall commands.
-+	  lib="$destdir/$realname"
-+	  eval cmds=\"$postinstall_cmds\"
-+	  save_ifs="$IFS"; IFS='~'
-+	  for cmd in $cmds; do
-+	    IFS="$save_ifs"
-+	    $show "$cmd"
-+	    $run eval "$cmd" || exit $?
-+	  done
-+	  IFS="$save_ifs"
-+	fi
-+
-+	# Install the pseudo-library for information purposes.
-+	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+	instname="$dir/$name"i
-+	$show "$install_prog $instname $destdir/$name"
-+	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+
-+	# Maybe install the static library, too.
-+	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-+	;;
-+
-+      *.lo)
-+	# Install (i.e. copy) a libtool object.
-+
-+	# Figure out destination file name, if it wasn't already specified.
-+	if test -n "$destname"; then
-+	  destfile="$destdir/$destname"
-+	else
-+	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+	  destfile="$destdir/$destfile"
-+	fi
-+
-+	# Deduce the name of the destination old-style object file.
-+	case $destfile in
-+	*.lo)
-+	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
-+	  ;;
-+	*.$objext)
-+	  staticdest="$destfile"
-+	  destfile=
-+	  ;;
-+	*)
-+	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
-+	  $echo "$help" 1>&2
-+	  exit 1
-+	  ;;
-+	esac
-+
-+	# Install the libtool object if requested.
-+	if test -n "$destfile"; then
-+	  $show "$install_prog $file $destfile"
-+	  $run eval "$install_prog $file $destfile" || exit $?
-+	fi
-+
-+	# Install the old object if enabled.
-+	if test "$build_old_libs" = yes; then
-+	  # Deduce the name of the old-style object file.
-+	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
-+
-+	  $show "$install_prog $staticobj $staticdest"
-+	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
-+	fi
-+	exit 0
-+	;;
-+
-+      *)
-+	# Figure out destination file name, if it wasn't already specified.
-+	if test -n "$destname"; then
-+	  destfile="$destdir/$destname"
-+	else
-+	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+	  destfile="$destdir/$destfile"
-+	fi
-+
-+	# Do a test to see if this is really a libtool program.
-+	case $host in
-+	*cygwin*|*mingw*)
-+	    wrapper=`echo $file | ${SED} -e 's,.exe$,,'`
-+	    ;;
-+	*)
-+	    wrapper=$file
-+	    ;;
-+	esac
-+	if (${SED} -e '4q' $wrapper | egrep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
-+	  notinst_deplibs=
-+	  relink_command=
-+
-+	  # If there is no directory component, then add one.
-+	  case $file in
-+	  */* | *\\*) . $wrapper ;;
-+	  *) . ./$wrapper ;;
-+	  esac
-+
-+	  # Check the variables that should have been set.
-+	  if test -z "$notinst_deplibs"; then
-+	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
-+	    exit 1
-+	  fi
-+
-+	  finalize=yes
-+	  for lib in $notinst_deplibs; do
-+	    # Check to see that each library is installed.
-+	    libdir=
-+	    if test -f "$lib"; then
-+	      # If there is no directory component, then add one.
-+	      case $lib in
-+	      */* | *\\*) . $lib ;;
-+	      *) . ./$lib ;;
-+	      esac
-+	    fi
-+	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
-+	    if test -n "$libdir" && test ! -f "$libfile"; then
-+	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
-+	      finalize=no
-+	    fi
-+	  done
-+
-+	  relink_command=
-+	  # If there is no directory component, then add one.
-+	  case $file in
-+	  */* | *\\*) . $wrapper ;;
-+	  *) . ./$wrapper ;;
-+	  esac
-+
-+	  outputname=
-+	  if test "$fast_install" = no && test -n "$relink_command"; then
-+	    if test "$finalize" = yes && test -z "$run"; then
-+	      tmpdir="/tmp"
-+	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
-+	      tmpdir="$tmpdir/libtool-$$"
-+	      if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
-+	      else
-+		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
-+		continue
-+	      fi
-+	      file=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+	      outputname="$tmpdir/$file"
-+	      # Replace the output file specification.
-+	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-+
-+	      $show "$relink_command"
-+	      if $run eval "$relink_command"; then :
-+	      else
-+		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-+		${rm}r "$tmpdir"
-+		continue
-+	      fi
-+	      file="$outputname"
-+	    else
-+	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
-+	    fi
-+	  else
-+	    # Install the binary that we compiled earlier.
-+	    file=`$echo "X$file" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
-+	  fi
-+	fi
-+
-+	# remove .exe since cygwin /usr/bin/install will append another
-+	# one anyways
-+	case $install_prog,$host in
-+	/usr/bin/install*,*cygwin*)
-+	  case $file:$destfile in
-+	  *.exe:*.exe)
-+	    # this is ok
-+	    ;;
-+	  *.exe:*)
-+	    destfile=$destfile.exe
-+	    ;;
-+	  *:*.exe)
-+	    destfile=`echo $destfile | ${SED} -e 's,.exe$,,'`
-+	    ;;
-+	  esac
-+	  ;;
-+	esac
-+	$show "$install_prog$stripme $file $destfile"
-+	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
-+	test -n "$outputname" && ${rm}r "$tmpdir"
-+	;;
-+      esac
-+    done
-+
-+    for file in $staticlibs; do
-+      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+
-+      # Set up the ranlib parameters.
-+      oldlib="$destdir/$name"
-+
-+      $show "$install_prog $file $oldlib"
-+      $run eval "$install_prog \$file \$oldlib" || exit $?
-+
-+      if test -n "$stripme" && test -n "$striplib"; then
-+	$show "$old_striplib $oldlib"
-+	$run eval "$old_striplib $oldlib" || exit $?
-+      fi
-+
-+      # Do each command in the postinstall commands.
-+      eval cmds=\"$old_postinstall_cmds\"
-+      save_ifs="$IFS"; IFS='~'
-+      for cmd in $cmds; do
-+	IFS="$save_ifs"
-+	$show "$cmd"
-+	$run eval "$cmd" || exit $?
-+      done
-+      IFS="$save_ifs"
-+    done
-+
-+    if test -n "$future_libdirs"; then
-+      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
-+    fi
-+
-+    if test -n "$current_libdirs"; then
-+      # Maybe just do a dry run.
-+      test -n "$run" && current_libdirs=" -n$current_libdirs"
-+      exec_cmd='$SHELL $0 --finish$current_libdirs'
-+    else
-+      exit 0
-+    fi
-+    ;;
-+
-+  # libtool finish mode
-+  finish)
-+    modename="$modename: finish"
-+    libdirs="$nonopt"
-+    admincmds=
-+
-+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-+      for dir
-+      do
-+	libdirs="$libdirs $dir"
-+      done
-+
-+      for libdir in $libdirs; do
-+	if test -n "$finish_cmds"; then
-+	  # Do each command in the finish commands.
-+	  eval cmds=\"$finish_cmds\"
-+	  save_ifs="$IFS"; IFS='~'
-+	  for cmd in $cmds; do
-+	    IFS="$save_ifs"
-+	    $show "$cmd"
-+	    $run eval "$cmd" || admincmds="$admincmds
-+       $cmd"
-+	  done
-+	  IFS="$save_ifs"
-+	fi
-+	if test -n "$finish_eval"; then
-+	  # Do the single finish_eval.
-+	  eval cmds=\"$finish_eval\"
-+	  $run eval "$cmds" || admincmds="$admincmds
-+       $cmds"
-+	fi
-+      done
-+    fi
-+
-+    # Exit here if they wanted silent mode.
-+    test "$show" = ":" && exit 0
-+
-+    echo "----------------------------------------------------------------------"
-+    echo "Libraries have been installed in:"
-+    for libdir in $libdirs; do
-+      echo "   $libdir"
-+    done
-+    echo
-+    echo "If you ever happen to want to link against installed libraries"
-+    echo "in a given directory, LIBDIR, you must either use libtool, and"
-+    echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-+    echo "flag during linking and do at least one of the following:"
-+    if test -n "$shlibpath_var"; then
-+      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-+      echo "     during execution"
-+    fi
-+    if test -n "$runpath_var"; then
-+      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-+      echo "     during linking"
-+    fi
-+    if test -n "$hardcode_libdir_flag_spec"; then
-+      libdir=LIBDIR
-+      eval flag=\"$hardcode_libdir_flag_spec\"
-+
-+      echo "   - use the \`$flag' linker flag"
-+    fi
-+    if test -n "$admincmds"; then
-+      echo "   - have your system administrator run these commands:$admincmds"
-+    fi
-+    if test -f /etc/ld.so.conf; then
-+      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-+    fi
-+    echo
-+    echo "See any operating system documentation about shared libraries for"
-+    echo "more information, such as the ld(1) and ld.so(8) manual pages."
-+    echo "----------------------------------------------------------------------"
-+    exit 0
-+    ;;
-+
-+  # libtool execute mode
-+  execute)
-+    modename="$modename: execute"
-+
-+    # The first argument is the command name.
-+    cmd="$nonopt"
-+    if test -z "$cmd"; then
-+      $echo "$modename: you must specify a COMMAND" 1>&2
-+      $echo "$help"
-+      exit 1
-+    fi
-+
-+    # Handle -dlopen flags immediately.
-+    for file in $execute_dlfiles; do
-+      if test ! -f "$file"; then
-+	$echo "$modename: \`$file' is not a file" 1>&2
-+	$echo "$help" 1>&2
-+	exit 1
-+      fi
-+
-+      dir=
-+      case $file in
-+      *.la)
-+	# Check to see that this really is a libtool archive.
-+	if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-+	else
-+	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-+	  $echo "$help" 1>&2
-+	  exit 1
-+	fi
-+
-+	# Read the libtool library.
-+	dlname=
-+	library_names=
-+
-+	# If there is no directory component, then add one.
-+	case $file in
-+	*/* | *\\*) . $file ;;
-+	*) . ./$file ;;
-+	esac
-+
-+	# Skip this library if it cannot be dlopened.
-+	if test -z "$dlname"; then
-+	  # Warn if it was a shared library.
-+	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
-+	  continue
-+	fi
-+
-+	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-+	test "X$dir" = "X$file" && dir=.
-+
-+	if test -f "$dir/$objdir/$dlname"; then
-+	  dir="$dir/$objdir"
-+	else
-+	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-+	  exit 1
-+	fi
-+	;;
-+
-+      *.lo)
-+	# Just add the directory containing the .lo file.
-+	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-+	test "X$dir" = "X$file" && dir=.
-+	;;
-+
-+      *)
-+	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
-+	continue
-+	;;
-+      esac
-+
-+      # Get the absolute pathname.
-+      absdir=`cd "$dir" && pwd`
-+      test -n "$absdir" && dir="$absdir"
-+
-+      # Now add the directory to shlibpath_var.
-+      if eval "test -z \"\$$shlibpath_var\""; then
-+	eval "$shlibpath_var=\"\$dir\""
-+      else
-+	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-+      fi
-+    done
-+
-+    # This variable tells wrapper scripts just to set shlibpath_var
-+    # rather than running their programs.
-+    libtool_execute_magic="$magic"
-+
-+    # Check if any of the arguments is a wrapper script.
-+    args=
-+    for file
-+    do
-+      case $file in
-+      -*) ;;
-+      *)
-+	# Do a test to see if this is really a libtool program.
-+	if (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-+	  # If there is no directory component, then add one.
-+	  case $file in
-+	  */* | *\\*) . $file ;;
-+	  *) . ./$file ;;
-+	  esac
-+
-+	  # Transform arg to wrapped name.
-+	  file="$progdir/$program"
-+	fi
-+	;;
-+      esac
-+      # Quote arguments (to preserve shell metacharacters).
-+      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
-+      args="$args \"$file\""
-+    done
-+
-+    if test -z "$run"; then
-+      if test -n "$shlibpath_var"; then
-+	# Export the shlibpath_var.
-+	eval "export $shlibpath_var"
-+      fi
-+
-+      # Restore saved enviroment variables
-+      if test "${save_LC_ALL+set}" = set; then
-+	LC_ALL="$save_LC_ALL"; export LC_ALL
-+      fi
-+      if test "${save_LANG+set}" = set; then
-+	LANG="$save_LANG"; export LANG
-+      fi
-+
-+      # Now prepare to actually exec the command.
-+      exec_cmd="\$cmd$args"
-+    else
-+      # Display what would be done.
-+      if test -n "$shlibpath_var"; then
-+	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
-+	$echo "export $shlibpath_var"
-+      fi
-+      $echo "$cmd$args"
-+      exit 0
-+    fi
-+    ;;
-+
-+  # libtool clean and uninstall mode
-+  clean | uninstall)
-+    modename="$modename: $mode"
-+    rm="$nonopt"
-+    files=
-+    rmforce=
-+    exit_status=0
-+
-+    # This variable tells wrapper scripts just to set variables rather
-+    # than running their programs.
-+    libtool_install_magic="$magic"
-+
-+    for arg
-+    do
-+      case $arg in
-+      -f) rm="$rm $arg"; rmforce=yes ;;
-+      -*) rm="$rm $arg" ;;
-+      *) files="$files $arg" ;;
-+      esac
-+    done
-+
-+    if test -z "$rm"; then
-+      $echo "$modename: you must specify an RM program" 1>&2
-+      $echo "$help" 1>&2
-+      exit 1
-+    fi
-+
-+    rmdirs=
-+
-+    for file in $files; do
-+      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-+      if test "X$dir" = "X$file"; then
-+	dir=.
-+	objdir="$objdir"
-+      else
-+	objdir="$dir/$objdir"
-+      fi
-+      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+      test $mode = uninstall && objdir="$dir"
-+
-+      # Remember objdir for removal later, being careful to avoid duplicates
-+      if test $mode = clean; then
-+	case " $rmdirs " in
-+	  *" $objdir "*) ;;
-+	  *) rmdirs="$rmdirs $objdir" ;;
-+	esac
-+      fi
-+
-+      # Don't error if the file doesn't exist and rm -f was used.
-+      if (test -L "$file") >/dev/null 2>&1 \
-+	|| (test -h "$file") >/dev/null 2>&1 \
-+	|| test -f "$file"; then
-+	:
-+      elif test -d "$file"; then
-+	exit_status=1
-+	continue
-+      elif test "$rmforce" = yes; then
-+	continue
-+      fi
-+
-+      rmfiles="$file"
-+
-+      case $name in
-+      *.la)
-+	# Possibly a libtool archive, so verify it.
-+	if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-+	  . $dir/$name
-+
-+	  # Delete the libtool libraries and symlinks.
-+	  for n in $library_names; do
-+	    rmfiles="$rmfiles $objdir/$n"
-+	  done
-+	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-+	  test $mode = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-+
-+	  if test $mode = uninstall; then
-+	    if test -n "$library_names"; then
-+	      # Do each command in the postuninstall commands.
-+	      eval cmds=\"$postuninstall_cmds\"
-+	      save_ifs="$IFS"; IFS='~'
-+	      for cmd in $cmds; do
-+		IFS="$save_ifs"
-+		$show "$cmd"
-+		$run eval "$cmd"
-+		if test $? != 0 && test "$rmforce" != yes; then
-+		  exit_status=1
-+		fi
-+	      done
-+	      IFS="$save_ifs"
-+	    fi
-+
-+	    if test -n "$old_library"; then
-+	      # Do each command in the old_postuninstall commands.
-+	      eval cmds=\"$old_postuninstall_cmds\"
-+	      save_ifs="$IFS"; IFS='~'
-+	      for cmd in $cmds; do
-+		IFS="$save_ifs"
-+		$show "$cmd"
-+		$run eval "$cmd"
-+		if test $? != 0 && test "$rmforce" != yes; then
-+		  exit_status=1
-+		fi
-+	      done
-+	      IFS="$save_ifs"
-+	    fi
-+	    # FIXME: should reinstall the best remaining shared library.
-+	  fi
-+	fi
-+	;;
-+
-+      *.lo)
-+	if test "$build_old_libs" = yes; then
-+	  oldobj=`$echo "X$name" | $Xsed -e "$lo2o"`
-+	  rmfiles="$rmfiles $dir/$oldobj"
-+	fi
-+	;;
-+
-+      *)
-+	# Do a test to see if this is a libtool program.
-+	if test $mode = clean &&
-+	   (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-+	  relink_command=
-+	  . $dir/$file
-+
-+	  rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-+	  if test "$fast_install" = yes && test -n "$relink_command"; then
-+	    rmfiles="$rmfiles $objdir/lt-$name"
-+	  fi
-+	fi
-+	;;
-+      esac
-+      $show "$rm $rmfiles"
-+      $run $rm $rmfiles || exit_status=1
-+    done
-+
-+    # Try to remove the ${objdir}s in the directories where we deleted files
-+    for dir in $rmdirs; do
-+      if test -d "$dir"; then
-+	$show "rmdir $dir"
-+	$run rmdir $dir >/dev/null 2>&1
-+      fi
-+    done
-+
-+    exit $exit_status
-+    ;;
-+
-+  "")
-+    $echo "$modename: you must specify a MODE" 1>&2
-+    $echo "$generic_help" 1>&2
-+    exit 1
-+    ;;
-+  esac
-+
-+  if test -z "$exec_cmd"; then
-+    $echo "$modename: invalid operation mode \`$mode'" 1>&2
-+    $echo "$generic_help" 1>&2
-+    exit 1
-+  fi
-+fi # test -z "$show_help"
-+
-+if test -n "$exec_cmd"; then
-+  eval exec $exec_cmd
-+  exit 1
-+fi
-+
-+# We need to display help for each of the modes.
-+case $mode in
-+"") $echo \
-+"Usage: $modename [OPTION]... [MODE-ARG]...
-+
-+Provide generalized library-building support services.
-+
-+    --config          show all configuration variables
-+    --debug           enable verbose shell tracing
-+-n, --dry-run         display commands without modifying any files
-+    --features        display basic configuration information and exit
-+    --finish          same as \`--mode=finish'
-+    --help            display this help message and exit
-+    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
-+    --quiet           same as \`--silent'
-+    --silent          don't print informational messages
-+    --version         print version information
-+
-+MODE must be one of the following:
-+
-+      clean           remove files from the build directory
-+      compile         compile a source file into a libtool object
-+      execute         automatically set library path, then run a program
-+      finish          complete the installation of libtool libraries
-+      install         install libraries or executables
-+      link            create a library or an executable
-+      uninstall       remove libraries from an installed directory
-+
-+MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
-+a more detailed description of MODE."
-+  exit 0
-+  ;;
-+
-+clean)
-+  $echo \
-+"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-+
-+Remove files from the build directory.
-+
-+RM is the name of the program to use to delete files associated with each FILE
-+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-+to RM.
-+
-+If FILE is a libtool library, object or program, all the files associated
-+with it are deleted. Otherwise, only FILE itself is deleted using RM."
-+  ;;
-+
-+compile)
-+  $echo \
-+"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-+
-+Compile a source file into a libtool library object.
-+
-+This mode accepts the following additional options:
-+
-+  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-+  -prefer-pic       try to building PIC objects only
-+  -prefer-non-pic   try to building non-PIC objects only
-+  -static           always build a \`.o' file suitable for static linking
-+
-+COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-+from the given SOURCEFILE.
-+
-+The output file name is determined by removing the directory component from
-+SOURCEFILE, then substituting the C source code suffix \`.c' with the
-+library object suffix, \`.lo'."
-+  ;;
-+
-+execute)
-+  $echo \
-+"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
-+
-+Automatically set library path, then run a program.
-+
-+This mode accepts the following additional options:
-+
-+  -dlopen FILE      add the directory containing FILE to the library path
-+
-+This mode sets the library path environment variable according to \`-dlopen'
-+flags.
-+
-+If any of the ARGS are libtool executable wrappers, then they are translated
-+into their corresponding uninstalled binary, and any of their required library
-+directories are added to the library path.
-+
-+Then, COMMAND is executed, with ARGS as arguments."
-+  ;;
-+
-+finish)
-+  $echo \
-+"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
-+
-+Complete the installation of libtool libraries.
-+
-+Each LIBDIR is a directory that contains libtool libraries.
-+
-+The commands that this mode executes may require superuser privileges.  Use
-+the \`--dry-run' option if you just want to see what would be executed."
-+  ;;
-+
-+install)
-+  $echo \
-+"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
-+
-+Install executables or libraries.
-+
-+INSTALL-COMMAND is the installation command.  The first component should be
-+either the \`install' or \`cp' program.
-+
-+The rest of the components are interpreted as arguments to that command (only
-+BSD-compatible install options are recognized)."
-+  ;;
-+
-+link)
-+  $echo \
-+"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
-+
-+Link object files or libraries together to form another library, or to
-+create an executable program.
-+
-+LINK-COMMAND is a command using the C compiler that you would use to create
-+a program from several object files.
-+
-+The following components of LINK-COMMAND are treated specially:
-+
-+  -all-static       do not do any dynamic linking at all
-+  -avoid-version    do not add a version suffix if possible
-+  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-+  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-+  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-+  -export-symbols SYMFILE
-+		    try to export only the symbols listed in SYMFILE
-+  -export-symbols-regex REGEX
-+		    try to export only the symbols matching REGEX
-+  -LLIBDIR          search LIBDIR for required installed libraries
-+  -lNAME            OUTPUT-FILE requires the installed library libNAME
-+  -module           build a library that can dlopened
-+  -no-fast-install  disable the fast-install mode
-+  -no-install       link a not-installable executable
-+  -no-undefined     declare that a library does not refer to external symbols
-+  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-+  -release RELEASE  specify package release information
-+  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-+  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-+  -static           do not do any dynamic linking of libtool libraries
-+  -version-info CURRENT[:REVISION[:AGE]]
-+		    specify library version info [each variable defaults to 0]
-+
-+All other options (arguments beginning with \`-') are ignored.
-+
-+Every other argument is treated as a filename.  Files ending in \`.la' are
-+treated as uninstalled libtool libraries, other files are standard or library
-+object files.
-+
-+If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-+only library objects (\`.lo' files) may be specified, and \`-rpath' is
-+required, except when creating a convenience library.
-+
-+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-+using \`ar' and \`ranlib', or on Windows using \`lib'.
-+
-+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-+is created, otherwise an executable program is created."
-+  ;;
-+
-+uninstall)
-+  $echo \
-+"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-+
-+Remove libraries from an installation directory.
-+
-+RM is the name of the program to use to delete files associated with each FILE
-+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-+to RM.
-+
-+If FILE is a libtool library, all the files associated with it are deleted.
-+Otherwise, only FILE itself is deleted using RM."
-+  ;;
-+
-+*)
-+  $echo "$modename: invalid operation mode \`$mode'" 1>&2
-+  $echo "$help" 1>&2
-+  exit 1
-+  ;;
-+esac
-+
-+echo
-+$echo "Try \`$modename --help' for more information about other modes."
-+
-+exit 0
-+
-+# Local Variables:
-+# mode:shell-script
-+# sh-indentation:2
-+# End:
---- metamail-2.7.orig/config/install-sh
-+++ metamail-2.7/config/install-sh
-@@ -0,0 +1,251 @@
-+#!/bin/sh
-+#
-+# install - install a program, script, or datafile
-+# This comes from X11R5 (mit/util/scripts/install.sh).
-+#
-+# Copyright 1991 by the Massachusetts Institute of Technology
-+#
-+# Permission to use, copy, modify, distribute, and sell this software and its
-+# documentation for any purpose is hereby granted without fee, provided that
-+# the above copyright notice appear in all copies and that both that
-+# copyright notice and this permission notice appear in supporting
-+# documentation, and that the name of M.I.T. not be used in advertising or
-+# publicity pertaining to distribution of the software without specific,
-+# written prior permission.  M.I.T. makes no representations about the
-+# suitability of this software for any purpose.  It is provided "as is"
-+# without express or implied warranty.
-+#
-+# Calling this script install-sh is preferred over install.sh, to prevent
-+# `make' implicit rules from creating a file called install from it
-+# when there is no Makefile.
-+#
-+# This script is compatible with the BSD install script, but was written
-+# from scratch.  It can only install one file at a time, a restriction
-+# shared with many OS's install programs.
-+
-+
-+# set DOITPROG to echo to test this script
-+
-+# Don't use :- since 4.3BSD and earlier shells don't like it.
-+doit="${DOITPROG-}"
-+
-+
-+# put in absolute paths if you don't have them in your path; or use env. vars.
-+
-+mvprog="${MVPROG-mv}"
-+cpprog="${CPPROG-cp}"
-+chmodprog="${CHMODPROG-chmod}"
-+chownprog="${CHOWNPROG-chown}"
-+chgrpprog="${CHGRPPROG-chgrp}"
-+stripprog="${STRIPPROG-strip}"
-+rmprog="${RMPROG-rm}"
-+mkdirprog="${MKDIRPROG-mkdir}"
-+
-+transformbasename=""
-+transform_arg=""
-+instcmd="$mvprog"
-+chmodcmd="$chmodprog 0755"
-+chowncmd=""
-+chgrpcmd=""
-+stripcmd=""
-+rmcmd="$rmprog -f"
-+mvcmd="$mvprog"
-+src=""
-+dst=""
-+dir_arg=""
-+
-+while [ x"$1" != x ]; do
-+    case $1 in
-+	-c) instcmd="$cpprog"
-+	    shift
-+	    continue;;
-+
-+	-d) dir_arg=true
-+	    shift
-+	    continue;;
-+
-+	-m) chmodcmd="$chmodprog $2"
-+	    shift
-+	    shift
-+	    continue;;
-+
-+	-o) chowncmd="$chownprog $2"
-+	    shift
-+	    shift
-+	    continue;;
-+
-+	-g) chgrpcmd="$chgrpprog $2"
-+	    shift
-+	    shift
-+	    continue;;
-+
-+	-s) stripcmd="$stripprog"
-+	    shift
-+	    continue;;
-+
-+	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-+	    shift
-+	    continue;;
-+
-+	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-+	    shift
-+	    continue;;
-+
-+	*)  if [ x"$src" = x ]
-+	    then
-+		src=$1
-+	    else
-+		# this colon is to work around a 386BSD /bin/sh bug
-+		:
-+		dst=$1
-+	    fi
-+	    shift
-+	    continue;;
-+    esac
-+done
-+
-+if [ x"$src" = x ]
-+then
-+	echo "install:	no input file specified"
-+	exit 1
-+else
-+	true
-+fi
-+
-+if [ x"$dir_arg" != x ]; then
-+	dst=$src
-+	src=""
-+	
-+	if [ -d $dst ]; then
-+		instcmd=:
-+		chmodcmd=""
-+	else
-+		instcmd=mkdir
-+	fi
-+else
-+
-+# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-+# might cause directories to be created, which would be especially bad 
-+# if $src (and thus $dsttmp) contains '*'.
-+
-+	if [ -f $src -o -d $src ]
-+	then
-+		true
-+	else
-+		echo "install:  $src does not exist"
-+		exit 1
-+	fi
-+	
-+	if [ x"$dst" = x ]
-+	then
-+		echo "install:	no destination specified"
-+		exit 1
-+	else
-+		true
-+	fi
-+
-+# If destination is a directory, append the input filename; if your system
-+# does not like double slashes in filenames, you may need to add some logic
-+
-+	if [ -d $dst ]
-+	then
-+		dst="$dst"/`basename $src`
-+	else
-+		true
-+	fi
-+fi
-+
-+## this sed command emulates the dirname command
-+dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-+
-+# Make sure that the destination directory exists.
-+#  this part is taken from Noah Friedman's mkinstalldirs script
-+
-+# Skip lots of stat calls in the usual case.
-+if [ ! -d "$dstdir" ]; then
-+defaultIFS='	
-+'
-+IFS="${IFS-${defaultIFS}}"
-+
-+oIFS="${IFS}"
-+# Some sh's can't handle IFS=/ for some reason.
-+IFS='%'
-+set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-+IFS="${oIFS}"
-+
-+pathcomp=''
-+
-+while [ $# -ne 0 ] ; do
-+	pathcomp="${pathcomp}${1}"
-+	shift
-+
-+	if [ ! -d "${pathcomp}" ] ;
-+        then
-+		$mkdirprog "${pathcomp}"
-+	else
-+		true
-+	fi
-+
-+	pathcomp="${pathcomp}/"
-+done
-+fi
-+
-+if [ x"$dir_arg" != x ]
-+then
-+	$doit $instcmd $dst &&
-+
-+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-+else
-+
-+# If we're going to rename the final executable, determine the name now.
-+
-+	if [ x"$transformarg" = x ] 
-+	then
-+		dstfile=`basename $dst`
-+	else
-+		dstfile=`basename $dst $transformbasename | 
-+			sed $transformarg`$transformbasename
-+	fi
-+
-+# don't allow the sed command to completely eliminate the filename
-+
-+	if [ x"$dstfile" = x ] 
-+	then
-+		dstfile=`basename $dst`
-+	else
-+		true
-+	fi
-+
-+# Make a temp file name in the proper directory.
-+
-+	dsttmp=$dstdir/#inst.$$#
-+
-+# Move or copy the file name to the temp name
-+
-+	$doit $instcmd $src $dsttmp &&
-+
-+	trap "rm -f ${dsttmp}" 0 &&
-+
-+# and set any options; do chmod last to preserve setuid bits
-+
-+# If any of these fail, we abort the whole thing.  If we want to
-+# ignore errors from any of these, just make sure not to ignore
-+# errors from the above "$doit $instcmd $src $dsttmp" command.
-+
-+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-+
-+# Now rename the file to the real destination.
-+
-+	$doit $rmcmd -f $dstdir/$dstfile &&
-+	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-+
-+fi &&
-+
-+
-+exit 0
---- metamail-2.7.orig/config/missing
-+++ metamail-2.7/config/missing
-@@ -0,0 +1,190 @@
-+#! /bin/sh
-+# Common stub for a few missing GNU programs while installing.
-+# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
-+# Franc,ois Pinard <pinard@iro.umontreal.ca>, 1996.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+if test $# -eq 0; then
-+  echo 1>&2 "Try \`$0 --help' for more information"
-+  exit 1
-+fi
-+
-+case "$1" in
-+
-+  -h|--h|--he|--hel|--help)
-+    echo "\
-+$0 [OPTION]... PROGRAM [ARGUMENT]...
-+
-+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-+error status if there is no known handling for PROGRAM.
-+
-+Options:
-+  -h, --help      display this help and exit
-+  -v, --version   output version information and exit
-+
-+Supported PROGRAM values:
-+  aclocal      touch file \`aclocal.m4'
-+  autoconf     touch file \`configure'
-+  autoheader   touch file \`config.h.in'
-+  automake     touch all \`Makefile.in' files
-+  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-+  flex         create \`lex.yy.c', if possible, from existing .c
-+  lex          create \`lex.yy.c', if possible, from existing .c
-+  makeinfo     touch the output file
-+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
-+    ;;
-+
-+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-+    echo "missing - GNU libit 0.0"
-+    ;;
-+
-+  -*)
-+    echo 1>&2 "$0: Unknown \`$1' option"
-+    echo 1>&2 "Try \`$0 --help' for more information"
-+    exit 1
-+    ;;
-+
-+  aclocal)
-+    echo 1>&2 "\
-+WARNING: \`$1' is missing on your system.  You should only need it if
-+         you modified \`acinclude.m4' or \`configure.in'.  You might want
-+         to install the \`Automake' and \`Perl' packages.  Grab them from
-+         any GNU archive site."
-+    touch aclocal.m4
-+    ;;
-+
-+  autoconf)
-+    echo 1>&2 "\
-+WARNING: \`$1' is missing on your system.  You should only need it if
-+         you modified \`configure.in'.  You might want to install the
-+         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-+         archive site."
-+    touch configure
-+    ;;
-+
-+  autoheader)
-+    echo 1>&2 "\
-+WARNING: \`$1' is missing on your system.  You should only need it if
-+         you modified \`acconfig.h' or \`configure.in'.  You might want
-+         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-+         from any GNU archive site."
-+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in`
-+    test -z "$files" && files="config.h"
-+    touch_files=
-+    for f in $files; do
-+      case "$f" in
-+      *:*) touch_files="$touch_files "`echo "$f" |
-+				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-+      *) touch_files="$touch_files $f.in";;
-+      esac
-+    done
-+    touch $touch_files
-+    ;;
-+
-+  automake)
-+    echo 1>&2 "\
-+WARNING: \`$1' is missing on your system.  You should only need it if
-+         you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
-+         You might want to install the \`Automake' and \`Perl' packages.
-+         Grab them from any GNU archive site."
-+    find . -type f -name Makefile.am -print |
-+	   sed 's/\.am$/.in/' |
-+	   while read f; do touch "$f"; done
-+    ;;
-+
-+  bison|yacc)
-+    echo 1>&2 "\
-+WARNING: \`$1' is missing on your system.  You should only need it if
-+         you modified a \`.y' file.  You may need the \`Bison' package
-+         in order for those modifications to take effect.  You can get
-+         \`Bison' from any GNU archive site."
-+    rm -f y.tab.c y.tab.h
-+    if [ $# -ne 1 ]; then
-+        eval LASTARG="\${$#}"
-+	case "$LASTARG" in
-+	*.y)
-+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-+	    if [ -f "$SRCFILE" ]; then
-+	         cp "$SRCFILE" y.tab.c
-+	    fi
-+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-+	    if [ -f "$SRCFILE" ]; then
-+	         cp "$SRCFILE" y.tab.h
-+	    fi
-+	  ;;
-+	esac
-+    fi
-+    if [ ! -f y.tab.h ]; then
-+	echo >y.tab.h
-+    fi
-+    if [ ! -f y.tab.c ]; then
-+	echo 'main() { return 0; }' >y.tab.c
-+    fi
-+    ;;
-+
-+  lex|flex)
-+    echo 1>&2 "\
-+WARNING: \`$1' is missing on your system.  You should only need it if
-+         you modified a \`.l' file.  You may need the \`Flex' package
-+         in order for those modifications to take effect.  You can get
-+         \`Flex' from any GNU archive site."
-+    rm -f lex.yy.c
-+    if [ $# -ne 1 ]; then
-+        eval LASTARG="\${$#}"
-+	case "$LASTARG" in
-+	*.l)
-+	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-+	    if [ -f "$SRCFILE" ]; then
-+	         cp "$SRCFILE" lex.yy.c
-+	    fi
-+	  ;;
-+	esac
-+    fi
-+    if [ ! -f lex.yy.c ]; then
-+	echo 'main() { return 0; }' >lex.yy.c
-+    fi
-+    ;;
-+
-+  makeinfo)
-+    echo 1>&2 "\
-+WARNING: \`$1' is missing on your system.  You should only need it if
-+         you modified a \`.texi' or \`.texinfo' file, or any other file
-+         indirectly affecting the aspect of the manual.  The spurious
-+         call might also be the consequence of using a buggy \`make' (AIX,
-+         DU, IRIX).  You might want to install the \`Texinfo' package or
-+         the \`GNU make' package.  Grab either from any GNU archive site."
-+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-+    if test -z "$file"; then
-+      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-+      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-+    fi
-+    touch $file
-+    ;;
-+
-+  *)
-+    echo 1>&2 "\
-+WARNING: \`$1' is needed, and you do not seem to have it handy on your
-+         system.  You might have modified some files without having the
-+         proper tools for further handling them.  Check the \`README' file,
-+         it often tells you about the needed prerequirements for installing
-+         this package.  You may also peek at any GNU archive site, in case
-+         some other package would contain this missing \`$1' program."
-+    exit 1
-+    ;;
-+esac
-+
-+exit 0
---- metamail-2.7.orig/config/ltconfig
-+++ metamail-2.7/config/ltconfig
-@@ -0,0 +1,3115 @@
-+#! /bin/sh
-+
-+# ltconfig - Create a system-specific libtool.
-+# Copyright (C) 1996-1999 Free Software Foundation, Inc.
-+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-+#
-+# This file is free software; you can redistribute it and/or modify it
-+# under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# A lot of this script is taken from autoconf-2.10.
-+
-+# Check that we are running under the correct shell.
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+echo=echo
-+if test "X$1" = X--no-reexec; then
-+  # Discard the --no-reexec flag, and continue.
-+  shift
-+elif test "X$1" = X--fallback-echo; then
-+  # Avoid inline document here, it may be left over
-+  :
-+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-+  # Yippee, $echo works!
-+  :
-+else
-+  # Restart under the correct shell.
-+  exec "$SHELL" "$0" --no-reexec ${1+"$@"}
-+fi
-+
-+if test "X$1" = X--fallback-echo; then
-+  # used as fallback echo
-+  shift
-+  cat <<EOF
-+$*
-+EOF
-+  exit 0
-+fi
-+
-+# Find the correct PATH separator.  Usually this is `:', but
-+# DJGPP uses `;' like DOS.
-+if test "X${PATH_SEPARATOR+set}" != Xset; then
-+  UNAME=${UNAME-`uname 2>/dev/null`}
-+  case X$UNAME in
-+    *-DOS) PATH_SEPARATOR=';' ;;
-+    *)     PATH_SEPARATOR=':' ;;
-+  esac
-+fi
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+
-+if test "X${echo_test_string+set}" != Xset; then
-+  # find a string as large as possible, as long as the shell can cope with it
-+  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-+    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-+    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-+       echo_test_string="`eval $cmd`" &&
-+       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null; then
-+      break
-+    fi
-+  done
-+fi
-+
-+if test "X`($echo '\t') 2>/dev/null`" != 'X\t' ||
-+   test "X`($echo "$echo_test_string") 2>/dev/null`" != X"$echo_test_string"; then
-+  # The Solaris, AIX, and Digital Unix default echo programs unquote
-+  # backslashes.  This makes it impossible to quote backslashes using
-+  #   echo "$something" | sed 's/\\/\\\\/g'
-+  #
-+  # So, first we look for a working echo in the user's PATH.
-+
-+  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
-+  for dir in $PATH /usr/ucb; do
-+    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-+       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-+       test "X`($dir/echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
-+      echo="$dir/echo"
-+      break
-+    fi
-+  done
-+  IFS="$save_ifs"
-+
-+  if test "X$echo" = Xecho; then
-+    # We didn't find a better echo, so look for alternatives.
-+    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-+       test "X`(print -r "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
-+      # This shell has a builtin print -r that does the trick.
-+      echo='print -r'
-+    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-+	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-+      # If we have ksh, try running ltconfig again with it.
-+      ORIGINAL_CONFIG_SHELL="${CONFIG_SHELL-/bin/sh}"
-+      export ORIGINAL_CONFIG_SHELL
-+      CONFIG_SHELL=/bin/ksh
-+      export CONFIG_SHELL
-+      exec "$CONFIG_SHELL" "$0" --no-reexec ${1+"$@"}
-+    else
-+      # Try using printf.
-+      echo='printf "%s\n"'
-+      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-+	 test "X`($echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
-+	# Cool, printf works
-+	:
-+      elif test "X`("$ORIGINAL_CONFIG_SHELL" "$0" --fallback-echo '\t') 2>/dev/null`" = 'X\t' &&
-+	   test "X`("$ORIGINAL_CONFIG_SHELL" "$0" --fallback-echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
-+	CONFIG_SHELL="$ORIGINAL_CONFIG_SHELL"
-+	export CONFIG_SHELL
-+	SHELL="$CONFIG_SHELL"
-+	export SHELL
-+	echo="$CONFIG_SHELL $0 --fallback-echo"
-+      elif test "X`("$CONFIG_SHELL" "$0" --fallback-echo '\t') 2>/dev/null`" = 'X\t' &&
-+	   test "X`("$CONFIG_SHELL" "$0" --fallback-echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
-+	echo="$CONFIG_SHELL $0 --fallback-echo"
-+      else
-+	# maybe with a smaller string...
-+	prev=:
-+
-+	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-+	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null; then
-+	    break
-+	  fi
-+	  prev="$cmd"
-+	done
-+
-+	if test "$prev" != 'sed 50q "$0"'; then
-+	  echo_test_string=`eval $prev`
-+	  export echo_test_string
-+	  exec "${ORIGINAL_CONFIG_SHELL}" "$0" ${1+"$@"}
-+	else
-+	  # Oops.  We lost completely, so just stick with echo.
-+	  echo=echo
-+	fi
-+      fi
-+    fi
-+  fi
-+fi
-+
-+# Sed substitution that helps us do robust quoting.  It backslashifies
-+# metacharacters that are still active within double-quoted strings.
-+Xsed='sed -e s/^X//'
-+sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
-+
-+# Same as above, but do not quote variable references.
-+double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
-+
-+# Sed substitution to delay expansion of an escaped shell variable in a
-+# double_quote_subst'ed string.
-+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-+
-+# The name of this program.
-+progname=`$echo "X$0" | $Xsed -e 's%^.*/%%'`
-+
-+# Constants:
-+PROGRAM=ltconfig
-+PACKAGE=libtool
-+VERSION=1.3.5
-+TIMESTAMP=" (1.385.2.206 2000/05/27 11:12:27)"
-+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+rm="rm -f"
-+
-+help="Try \`$progname --help' for more information."
-+
-+# Global variables:
-+default_ofile=libtool
-+can_build_shared=yes
-+enable_shared=yes
-+# All known linkers require a `.a' archive for static linking (except M$VC,
-+# which needs '.lib').
-+enable_static=yes
-+enable_fast_install=yes
-+enable_dlopen=unknown
-+enable_win32_dll=no
-+ltmain=
-+silent=
-+srcdir=
-+ac_config_guess=
-+ac_config_sub=
-+host=
-+nonopt=
-+ofile="$default_ofile"
-+verify_host=yes
-+with_gcc=no
-+with_gnu_ld=no
-+need_locks=yes
-+ac_ext=c
-+objext=o
-+libext=a
-+exeext=
-+cache_file=
-+
-+old_AR="$AR"
-+old_CC="$CC"
-+old_CFLAGS="$CFLAGS"
-+old_CPPFLAGS="$CPPFLAGS"
-+old_LDFLAGS="$LDFLAGS"
-+old_LD="$LD"
-+old_LN_S="$LN_S"
-+old_LIBS="$LIBS"
-+old_NM="$NM"
-+old_RANLIB="$RANLIB"
-+old_DLLTOOL="$DLLTOOL"
-+old_OBJDUMP="$OBJDUMP"
-+old_AS="$AS"
-+
-+# Parse the command line options.
-+args=
-+prev=
-+for option
-+do
-+  case "$option" in
-+  -*=*) optarg=`echo "$option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-+  *) optarg= ;;
-+  esac
-+
-+  # If the previous option needs an argument, assign it.
-+  if test -n "$prev"; then
-+    eval "$prev=\$option"
-+    prev=
-+    continue
-+  fi
-+
-+  case "$option" in
-+  --help) cat <<EOM
-+Usage: $progname [OPTION]... [HOST [LTMAIN]]
-+
-+Generate a system-specific libtool script.
-+
-+    --debug                enable verbose shell tracing
-+    --disable-shared       do not build shared libraries
-+    --disable-static       do not build static libraries
-+    --disable-fast-install do not optimize for fast installation
-+    --enable-dlopen        enable dlopen support
-+    --enable-win32-dll     enable building dlls on win32 hosts
-+    --help                 display this help and exit
-+    --no-verify            do not verify that HOST is a valid host type
-+-o, --output=FILE          specify the output file [default=$default_ofile]
-+    --quiet                same as \`--silent'
-+    --silent               do not print informational messages
-+    --srcdir=DIR           find \`config.guess' in DIR
-+    --version              output version information and exit
-+    --with-gcc             assume that the GNU C compiler will be used
-+    --with-gnu-ld          assume that the C compiler uses the GNU linker
-+    --disable-lock         disable file locking
-+    --cache-file=FILE      configure cache file
-+
-+LTMAIN is the \`ltmain.sh' shell script fragment or \`ltmain.c' program
-+that provides basic libtool functionality.
-+
-+HOST is the canonical host system name [default=guessed].
-+EOM
-+  exit 0
-+  ;;
-+
-+  --debug)
-+    echo "$progname: enabling shell trace mode"
-+    set -x
-+    ;;
-+
-+  --disable-shared) enable_shared=no ;;
-+
-+  --disable-static) enable_static=no ;;
-+
-+  --disable-fast-install) enable_fast_install=no ;;
-+
-+  --enable-dlopen) enable_dlopen=yes ;;
-+
-+  --enable-win32-dll) enable_win32_dll=yes ;;
-+
-+  --quiet | --silent) silent=yes ;;
-+
-+  --srcdir) prev=srcdir ;;
-+  --srcdir=*) srcdir="$optarg" ;;
-+
-+  --no-verify) verify_host=no ;;
-+
-+  --output | -o) prev=ofile ;;
-+  --output=*) ofile="$optarg" ;;
-+
-+  --version) echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"; exit 0 ;;
-+
-+  --with-gcc) with_gcc=yes ;;
-+  --with-gnu-ld) with_gnu_ld=yes ;;
-+
-+  --disable-lock) need_locks=no ;;
-+
-+  --cache-file=*) cache_file="$optarg" ;;
-+
-+  -*)
-+    echo "$progname: unrecognized option \`$option'" 1>&2
-+    echo "$help" 1>&2
-+    exit 1
-+    ;;
-+
-+  *)
-+    if test -z "$ltmain"; then
-+      ltmain="$option"
-+    elif test -z "$host"; then
-+# This generates an unnecessary warning for sparc-sun-solaris4.1.3_U1
-+#      if test -n "`echo $option| sed 's/[-a-z0-9.]//g'`"; then
-+#        echo "$progname: warning \`$option' is not a valid host type" 1>&2
-+#      fi
-+      host="$option"
-+    else
-+      echo "$progname: too many arguments" 1>&2
-+      echo "$help" 1>&2
-+      exit 1
-+    fi ;;
-+  esac
-+done
-+
-+if test -z "$ltmain"; then
-+  echo "$progname: you must specify a LTMAIN file" 1>&2
-+  echo "$help" 1>&2
-+  exit 1
-+fi
-+
-+if test ! -f "$ltmain"; then
-+  echo "$progname: \`$ltmain' does not exist" 1>&2
-+  echo "$help" 1>&2
-+  exit 1
-+fi
-+
-+# Quote any args containing shell metacharacters.
-+ltconfig_args=
-+for arg
-+do
-+  case "$arg" in
-+  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-+  ltconfig_args="$ltconfig_args '$arg'" ;;
-+  *) ltconfig_args="$ltconfig_args $arg" ;;
-+  esac
-+done
-+
-+# A relevant subset of AC_INIT.
-+
-+# File descriptor usage:
-+# 0 standard input
-+# 1 file creation
-+# 2 errors and warnings
-+# 3 some systems may open it to /dev/tty
-+# 4 used on the Kubota Titan
-+# 5 compiler messages saved in config.log
-+# 6 checking for... messages and results
-+if test "$silent" = yes; then
-+  exec 6>/dev/null
-+else
-+  exec 6>&1
-+fi
-+exec 5>>./config.log
-+
-+# NLS nuisances.
-+# Only set LANG and LC_ALL to C if already set.
-+# These must not be set unconditionally because not all systems understand
-+# e.g. LANG=C (notably SCO).
-+if test "X${LC_ALL+set}" = Xset; then LC_ALL=C; export LC_ALL; fi
-+if test "X${LANG+set}"   = Xset; then LANG=C;   export LANG;   fi
-+
-+if test -n "$cache_file" && test -r "$cache_file"; then
-+  echo "loading cache $cache_file within ltconfig"
-+  . $cache_file
-+fi
-+
-+if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-+  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-+  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-+    ac_n= ac_c='
-+' ac_t='	'
-+  else
-+    ac_n=-n ac_c= ac_t=
-+  fi
-+else
-+  ac_n= ac_c='\c' ac_t=
-+fi
-+
-+if test -z "$srcdir"; then
-+  # Assume the source directory is the same one as the path to LTMAIN.
-+  srcdir=`$echo "X$ltmain" | $Xsed -e 's%/[^/]*$%%'`
-+  test "$srcdir" = "$ltmain" && srcdir=.
-+fi
-+
-+trap "$rm conftest*; exit 1" 1 2 15
-+if test "$verify_host" = yes; then
-+  # Check for config.guess and config.sub.
-+  ac_aux_dir=
-+  for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-+    if test -f $ac_dir/config.guess; then
-+      ac_aux_dir=$ac_dir
-+      break
-+    fi
-+  done
-+  if test -z "$ac_aux_dir"; then
-+    echo "$progname: cannot find config.guess in $srcdir $srcdir/.. $srcdir/../.." 1>&2
-+    echo "$help" 1>&2
-+    exit 1
-+  fi
-+  ac_config_guess=$ac_aux_dir/config.guess
-+  ac_config_sub=$ac_aux_dir/config.sub
-+
-+  # Make sure we can run config.sub.
-+  if $SHELL $ac_config_sub sun4 >/dev/null 2>&1; then :
-+  else
-+    echo "$progname: cannot run $ac_config_sub" 1>&2
-+    echo "$help" 1>&2
-+    exit 1
-+  fi
-+
-+  echo $ac_n "checking host system type""... $ac_c" 1>&6
-+
-+  host_alias=$host
-+  case "$host_alias" in
-+  "")
-+    if host_alias=`$SHELL $ac_config_guess`; then :
-+    else
-+      echo "$progname: cannot guess host type; you must specify one" 1>&2
-+      echo "$help" 1>&2
-+      exit 1
-+    fi ;;
-+  esac
-+  host=`$SHELL $ac_config_sub $host_alias`
-+  echo "$ac_t$host" 1>&6
-+
-+  # Make sure the host verified.
-+  test -z "$host" && exit 1
-+
-+elif test -z "$host"; then
-+  echo "$progname: you must specify a host type if you use \`--no-verify'" 1>&2
-+  echo "$help" 1>&2
-+  exit 1
-+else
-+  host_alias=$host
-+fi
-+
-+# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
-+case "$host_os" in
-+linux-gnu*) ;;
-+linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
-+esac
-+
-+host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-+host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-+host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+
-+case "$host_os" in
-+aix3*)
-+  # AIX sometimes has problems with the GCC collect2 program.  For some
-+  # reason, if we set the COLLECT_NAMES environment variable, the problems
-+  # vanish in a puff of smoke.
-+  if test "X${COLLECT_NAMES+set}" != Xset; then
-+    COLLECT_NAMES=
-+    export COLLECT_NAMES
-+  fi
-+  ;;
-+esac
-+
-+# Determine commands to create old-style static archives.
-+old_archive_cmds='$AR cru $oldlib$oldobjs'
-+old_postinstall_cmds='chmod 644 $oldlib'
-+old_postuninstall_cmds=
-+
-+# Set a sane default for `AR'.
-+test -z "$AR" && AR=ar
-+
-+# Set a sane default for `OBJDUMP'.
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+
-+# If RANLIB is not set, then run the test.
-+if test "${RANLIB+set}" != "set"; then
-+  result=no
-+
-+  echo $ac_n "checking for ranlib... $ac_c" 1>&6
-+  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
-+  for dir in $PATH; do
-+    test -z "$dir" && dir=.
-+    if test -f $dir/ranlib || test -f $dir/ranlib$ac_exeext; then
-+      RANLIB="ranlib"
-+      result="ranlib"
-+      break
-+    fi
-+  done
-+  IFS="$save_ifs"
-+
-+  echo "$ac_t$result" 1>&6
-+fi
-+
-+if test -n "$RANLIB"; then
-+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-+  old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-+fi
-+
-+# Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin.
-+test -z "$DLLTOOL" && DLLTOOL=dlltool
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+test -z "$AS" && AS=as
-+
-+# Check to see if we are using GCC.
-+if test "$with_gcc" != yes || test -z "$CC"; then
-+  # If CC is not set, then try to find GCC or a usable CC.
-+  if test -z "$CC"; then
-+    echo $ac_n "checking for gcc... $ac_c" 1>&6
-+    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
-+    for dir in $PATH; do
-+      test -z "$dir" && dir=.
-+      if test -f $dir/gcc || test -f $dir/gcc$ac_exeext; then
-+	CC="gcc"
-+	break
-+      fi
-+    done
-+    IFS="$save_ifs"
-+
-+    if test -n "$CC"; then
-+      echo "$ac_t$CC" 1>&6
-+    else
-+      echo "$ac_t"no 1>&6
-+    fi
-+  fi
-+
-+  # Not "gcc", so try "cc", rejecting "/usr/ucb/cc".
-+  if test -z "$CC"; then
-+    echo $ac_n "checking for cc... $ac_c" 1>&6
-+    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
-+    cc_rejected=no
-+    for dir in $PATH; do
-+      test -z "$dir" && dir=.
-+      if test -f $dir/cc || test -f $dir/cc$ac_exeext; then
-+	if test "$dir/cc" = "/usr/ucb/cc"; then
-+	  cc_rejected=yes
-+	  continue
-+	fi
-+	CC="cc"
-+	break
-+      fi
-+    done
-+    IFS="$save_ifs"
-+    if test $cc_rejected = yes; then
-+      # We found a bogon in the path, so make sure we never use it.
-+      set dummy $CC
-+      shift
-+      if test $# -gt 0; then
-+	# We chose a different compiler from the bogus one.
-+	# However, it has the same name, so the bogon will be chosen
-+	# first if we set CC to just the name; use the full file name.
-+	shift
-+	set dummy "$dir/cc" "$@"
-+	shift
-+	CC="$@"
-+      fi
-+    fi
-+
-+    if test -n "$CC"; then
-+      echo "$ac_t$CC" 1>&6
-+    else
-+      echo "$ac_t"no 1>&6
-+    fi
-+
-+    if test -z "$CC"; then
-+      echo "$progname: error: no acceptable cc found in \$PATH" 1>&2
-+      exit 1
-+    fi
-+  fi
-+
-+  # Now see if the compiler is really GCC.
-+  with_gcc=no
-+  echo $ac_n "checking whether we are using GNU C... $ac_c" 1>&6
-+  echo "$progname:581: checking whether we are using GNU C" >&5
-+
-+  $rm conftest.c
-+  cat > conftest.c <<EOF
-+#ifdef __GNUC__
-+  yes;
-+#endif
-+EOF
-+  if { ac_try='${CC-cc} -E conftest.c'; { (eval echo $progname:589: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-+    with_gcc=yes
-+  fi
-+  $rm conftest.c
-+  echo "$ac_t$with_gcc" 1>&6
-+fi
-+
-+# Allow CC to be a program name with arguments.
-+set dummy $CC
-+compiler="$2"
-+
-+echo $ac_n "checking for object suffix... $ac_c" 1>&6
-+$rm conftest*
-+echo 'int i = 1;' > conftest.c
-+echo "$progname:603: checking for object suffix" >& 5
-+if { (eval echo $progname:604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; }; then
-+  # Append any warnings to the config.log.
-+  cat conftest.err 1>&5
-+
-+  for ac_file in conftest.*; do
-+    case $ac_file in
-+    *.c) ;;
-+    *) objext=`echo $ac_file | sed -e s/conftest.//` ;;
-+    esac
-+  done
-+else
-+  cat conftest.err 1>&5
-+  echo "$progname: failed program was:" >&5
-+  cat conftest.c >&5
-+fi
-+$rm conftest*
-+echo "$ac_t$objext" 1>&6
-+
-+echo $ac_n "checking for executable suffix... $ac_c" 1>&6
-+if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_cv_exeext="no"
-+  $rm conftest*
-+  echo 'main () { return 0; }' > conftest.c
-+  echo "$progname:629: checking for executable suffix" >& 5
-+  if { (eval echo $progname:630: \"$ac_link\") 1>&5; (eval $ac_link) 2>conftest.err; }; then
-+    # Append any warnings to the config.log.
-+    cat conftest.err 1>&5
-+
-+    for ac_file in conftest.*; do
-+      case $ac_file in
-+      *.c | *.err | *.$objext ) ;;
-+      *) ac_cv_exeext=.`echo $ac_file | sed -e s/conftest.//` ;;
-+      esac
-+    done
-+  else
-+    cat conftest.err 1>&5
-+    echo "$progname: failed program was:" >&5
-+    cat conftest.c >&5
-+  fi
-+  $rm conftest*
-+fi
-+if test "X$ac_cv_exeext" = Xno; then
-+  exeext=""
-+else
-+  exeext="$ac_cv_exeext"
-+fi
-+echo "$ac_t$ac_cv_exeext" 1>&6
-+
-+echo $ac_n "checking for $compiler option to produce PIC... $ac_c" 1>&6
-+pic_flag=
-+special_shlib_compile_flags=
-+wl=
-+link_static_flag=
-+no_builtin_flag=
-+
-+if test "$with_gcc" = yes; then
-+  wl='-Wl,'
-+  link_static_flag='-static'
-+
-+  case "$host_os" in
-+  beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
-+    # PIC is the default for these OSes.
-+    ;;
-+  aix*)
-+    # Below there is a dirty hack to force normal static linking with -ldl
-+    # The problem is because libdl dynamically linked with both libc and
-+    # libC (AIX C++ library), which obviously doesn't included in libraries
-+    # list by gcc. This cause undefined symbols with -static flags.
-+    # This hack allows C programs to be linked with "-static -ldl", but
-+    # we not sure about C++ programs.
-+    link_static_flag="$link_static_flag ${wl}-lC"
-+    ;;
-+  cygwin* | mingw* | os2*)
-+    # We can build DLLs from non-PIC.
-+    ;;
-+  amigaos*)
-+    # FIXME: we need at least 68020 code to build shared libraries, but
-+    # adding the `-m68020' flag to GCC prevents building anything better,
-+    # like `-m68040'.
-+    pic_flag='-m68020 -resident32 -malways-restore-a4'
-+    ;;
-+  sysv4*MP*)
-+    if test -d /usr/nec; then
-+       pic_flag=-Kconform_pic
-+    fi
-+    ;;
-+  *)
-+    pic_flag='-fPIC'
-+    ;;
-+  esac
-+else
-+  # PORTME Check for PIC flags for the system compiler.
-+  case "$host_os" in
-+  aix3* | aix4*)
-+    # All AIX code is PIC.
-+    link_static_flag='-bnso -bI:/lib/syscalls.exp'
-+    ;;
-+
-+  hpux9* | hpux10* | hpux11*)
-+    # Is there a better link_static_flag that works with the bundled CC?
-+    wl='-Wl,'
-+    link_static_flag="${wl}-a ${wl}archive"
-+    pic_flag='+Z'
-+    ;;
-+
-+  irix5* | irix6*)
-+    wl='-Wl,'
-+    link_static_flag='-non_shared'
-+    # PIC (with -KPIC) is the default.
-+    ;;
-+
-+  cygwin* | mingw* | os2*)
-+    # We can build DLLs from non-PIC.
-+    ;;
-+
-+  osf3* | osf4* | osf5*)
-+    # All OSF/1 code is PIC.
-+    wl='-Wl,'
-+    link_static_flag='-non_shared'
-+    ;;
-+
-+  sco3.2v5*)
-+    pic_flag='-Kpic'
-+    link_static_flag='-dn'
-+    special_shlib_compile_flags='-belf'
-+    ;;
-+
-+  solaris*)
-+    pic_flag='-KPIC'
-+    link_static_flag='-Bstatic'
-+    wl='-Wl,'
-+    ;;
-+
-+  sunos4*)
-+    pic_flag='-PIC'
-+    link_static_flag='-Bstatic'
-+    wl='-Qoption ld '
-+    ;;
-+
-+  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+    pic_flag='-KPIC'
-+    link_static_flag='-Bstatic'
-+    wl='-Wl,'
-+    ;;
-+
-+  uts4*)
-+    pic_flag='-pic'
-+    link_static_flag='-Bstatic'
-+    ;;
-+  sysv4*MP*)
-+    if test -d /usr/nec ;then
-+      pic_flag='-Kconform_pic'
-+      link_static_flag='-Bstatic'
-+    fi
-+    ;;
-+  *)
-+    can_build_shared=no
-+    ;;
-+  esac
-+fi
-+
-+if test -n "$pic_flag"; then
-+  echo "$ac_t$pic_flag" 1>&6
-+
-+  # Check to make sure the pic_flag actually works.
-+  echo $ac_n "checking if $compiler PIC flag $pic_flag works... $ac_c" 1>&6
-+  $rm conftest*
-+  echo "int some_variable = 0;" > conftest.c
-+  save_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS $pic_flag -DPIC"
-+  echo "$progname:776: checking if $compiler PIC flag $pic_flag works" >&5
-+  if { (eval echo $progname:777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
-+    # Append any warnings to the config.log.
-+    cat conftest.err 1>&5
-+    
-+    case "$host_os" in
-+    hpux9* | hpux10* | hpux11*)
-+      # On HP-UX, both CC and GCC only warn that PIC is supported... then they
-+      # create non-PIC objects.  So, if there were any warnings, we assume that
-+      # PIC is not supported.
-+      if test -s conftest.err; then
-+	echo "$ac_t"no 1>&6
-+	can_build_shared=no
-+	pic_flag=
-+      else
-+	echo "$ac_t"yes 1>&6
-+	pic_flag=" $pic_flag"
-+      fi
-+      ;;
-+    *)
-+      echo "$ac_t"yes 1>&6
-+      pic_flag=" $pic_flag"
-+      ;;
-+    esac
-+  else
-+    # Append any errors to the config.log.
-+    cat conftest.err 1>&5
-+    can_build_shared=no
-+    pic_flag=
-+    echo "$ac_t"no 1>&6
-+  fi
-+  CFLAGS="$save_CFLAGS"
-+  $rm conftest*
-+else
-+  echo "$ac_t"none 1>&6
-+fi
-+
-+# Check to see if options -o and -c are simultaneously supported by compiler
-+echo $ac_n "checking if $compiler supports -c -o file.o... $ac_c" 1>&6
-+$rm -r conftest 2>/dev/null
-+mkdir conftest
-+cd conftest
-+$rm conftest*
-+echo "int some_variable = 0;" > conftest.c
-+mkdir out
-+# According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-+# that will create temporary files in the current directory regardless of
-+# the output directory.  Thus, making CWD read-only will cause this test
-+# to fail, enabling locking or at least warning the user not to do parallel
-+# builds.
-+chmod -w .
-+save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS -o out/conftest2.o"
-+echo "$progname:829: checking if $compiler supports -c -o file.o" >&5
-+if { (eval echo $progname:830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.o; then
-+
-+  # The compiler can only warn and ignore the option if not recognized
-+  # So say no if there are warnings
-+    if test -s out/conftest.err; then
-+      echo "$ac_t"no 1>&6
-+      compiler_c_o=no
-+    else
-+      echo "$ac_t"yes 1>&6
-+      compiler_c_o=yes
-+    fi
-+else
-+  # Append any errors to the config.log.
-+  cat out/conftest.err 1>&5
-+  compiler_c_o=no
-+  echo "$ac_t"no 1>&6
-+fi
-+CFLAGS="$save_CFLAGS"
-+chmod u+w .
-+$rm conftest* out/*
-+rmdir out
-+cd ..
-+rmdir conftest
-+$rm -r conftest 2>/dev/null
-+
-+if test x"$compiler_c_o" = x"yes"; then
-+  # Check to see if we can write to a .lo
-+  echo $ac_n "checking if $compiler supports -c -o file.lo... $ac_c" 1>&6
-+  $rm conftest*
-+  echo "int some_variable = 0;" > conftest.c
-+  save_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -c -o conftest.lo"
-+  echo "$progname:862: checking if $compiler supports -c -o file.lo" >&5
-+if { (eval echo $progname:863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.lo; then
-+
-+    # The compiler can only warn and ignore the option if not recognized
-+    # So say no if there are warnings
-+      if test -s conftest.err; then
-+	echo "$ac_t"no 1>&6
-+	compiler_o_lo=no
-+      else
-+	echo "$ac_t"yes 1>&6
-+	compiler_o_lo=yes
-+      fi
-+  else
-+    # Append any errors to the config.log.
-+    cat conftest.err 1>&5
-+    compiler_o_lo=no
-+    echo "$ac_t"no 1>&6
-+  fi
-+  CFLAGS="$save_CFLAGS"
-+  $rm conftest*
-+else
-+  compiler_o_lo=no
-+fi
-+
-+# Check to see if we can do hard links to lock some files if needed
-+hard_links="nottested"
-+if test "$compiler_c_o" = no && test "$need_locks" != no; then
-+  # do not overwrite the value of need_locks provided by the user
-+  echo $ac_n "checking if we can lock with hard links... $ac_c" 1>&6
-+  hard_links=yes
-+  $rm conftest*
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  touch conftest.a
-+  ln conftest.a conftest.b 2>&5 || hard_links=no
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  echo "$ac_t$hard_links" 1>&6
-+  $rm conftest*
-+  if test "$hard_links" = no; then
-+    echo "*** WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2
-+    need_locks=warn
-+  fi
-+else
-+  need_locks=no
-+fi
-+
-+if test "$with_gcc" = yes; then
-+  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
-+  echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions ... $ac_c" 1>&6
-+  $rm conftest*
-+  echo "int some_variable = 0;" > conftest.c
-+  save_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.c"
-+  echo "$progname:914: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-+  if { (eval echo $progname:915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then
-+
-+    # The compiler can only warn and ignore the option if not recognized
-+    # So say no if there are warnings
-+      if test -s conftest.err; then
-+	echo "$ac_t"no 1>&6
-+	compiler_rtti_exceptions=no
-+      else
-+	echo "$ac_t"yes 1>&6
-+	compiler_rtti_exceptions=yes
-+      fi
-+  else
-+    # Append any errors to the config.log.
-+    cat conftest.err 1>&5
-+    compiler_rtti_exceptions=no
-+    echo "$ac_t"no 1>&6
-+  fi
-+  CFLAGS="$save_CFLAGS"
-+  $rm conftest*
-+
-+  if test "$compiler_rtti_exceptions" = "yes"; then
-+    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
-+  else
-+    no_builtin_flag=' -fno-builtin'
-+  fi
-+  
-+fi
-+
-+# Check for any special shared library compilation flags.
-+if test -n "$special_shlib_compile_flags"; then
-+  echo "$progname: warning: \`$CC' requires \`$special_shlib_compile_flags' to build shared libraries" 1>&2
-+  if echo "$old_CC $old_CFLAGS " | egrep -e "[ 	]$special_shlib_compile_flags[ 	]" >/dev/null; then :
-+  else
-+    echo "$progname: add \`$special_shlib_compile_flags' to the CC or CFLAGS env variable and reconfigure" 1>&2
-+    can_build_shared=no
-+  fi
-+fi
-+
-+echo $ac_n "checking if $compiler static flag $link_static_flag works... $ac_c" 1>&6
-+$rm conftest*
-+echo 'main(){return(0);}' > conftest.c
-+save_LDFLAGS="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $link_static_flag"
-+echo "$progname:958: checking if $compiler static flag $link_static_flag works" >&5
-+if { (eval echo $progname:959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+  echo "$ac_t$link_static_flag" 1>&6
-+else
-+  echo "$ac_t"none 1>&6
-+  link_static_flag=
-+fi
-+LDFLAGS="$save_LDFLAGS"
-+$rm conftest*
-+
-+if test -z "$LN_S"; then
-+  # Check to see if we can use ln -s, or we need hard links.
-+  echo $ac_n "checking whether ln -s works... $ac_c" 1>&6
-+  $rm conftest.dat
-+  if ln -s X conftest.dat 2>/dev/null; then
-+    $rm conftest.dat
-+    LN_S="ln -s"
-+  else
-+    LN_S=ln
-+  fi
-+  if test "$LN_S" = "ln -s"; then
-+    echo "$ac_t"yes 1>&6
-+  else
-+    echo "$ac_t"no 1>&6
-+  fi
-+fi
-+
-+# Make sure LD is an absolute path.
-+if test -z "$LD"; then
-+  ac_prog=ld
-+  if test "$with_gcc" = yes; then
-+    # Check if gcc -print-prog-name=ld gives a path.
-+    echo $ac_n "checking for ld used by GCC... $ac_c" 1>&6
-+    echo "$progname:991: checking for ld used by GCC" >&5
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5`
-+    case "$ac_prog" in
-+    # Accept absolute paths.
-+    [\\/]* | [A-Za-z]:[\\/]*)
-+      re_direlt='/[^/][^/]*/\.\./'
-+      # Canonicalize the path of ld
-+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-+	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-+      done
-+      test -z "$LD" && LD="$ac_prog"
-+      ;;
-+    "")
-+      # If it fails, then pretend we are not using GCC.
-+      ac_prog=ld
-+      ;;
-+    *)
-+      # If it is relative, then search for the first ld in PATH.
-+      with_gnu_ld=unknown
-+      ;;
-+    esac
-+  elif test "$with_gnu_ld" = yes; then
-+    echo $ac_n "checking for GNU ld... $ac_c" 1>&6
-+    echo "$progname:1015: checking for GNU ld" >&5
-+  else
-+    echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-+    echo "$progname:1018: checking for non-GNU ld" >&5
-+  fi
-+
-+  if test -z "$LD"; then
-+    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
-+    for ac_dir in $PATH; do
-+      test -z "$ac_dir" && ac_dir=.
-+      if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-+	LD="$ac_dir/$ac_prog"
-+	# Check to see if the program is GNU ld.  I'd rather use --version,
-+	# but apparently some GNU ld's only accept -v.
-+	# Break only if it was the GNU/non-GNU ld that we prefer.
-+	if "$LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-+	  test "$with_gnu_ld" != no && break
-+	else
-+	  test "$with_gnu_ld" != yes && break
-+	fi
-+      fi
-+    done
-+    IFS="$ac_save_ifs"
-+  fi
-+
-+  if test -n "$LD"; then
-+    echo "$ac_t$LD" 1>&6
-+  else
-+    echo "$ac_t"no 1>&6
-+  fi
-+
-+  if test -z "$LD"; then
-+    echo "$progname: error: no acceptable ld found in \$PATH" 1>&2
-+    exit 1
-+  fi
-+fi
-+
-+# Check to see if it really is or is not GNU ld.
-+echo $ac_n "checking if the linker ($LD) is GNU ld... $ac_c" 1>&6
-+# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-+  with_gnu_ld=yes
-+else
-+  with_gnu_ld=no
-+fi
-+echo "$ac_t$with_gnu_ld" 1>&6
-+
-+# See if the linker supports building shared libraries.
-+echo $ac_n "checking whether the linker ($LD) supports shared libraries... $ac_c" 1>&6
-+
-+allow_undefined_flag=
-+no_undefined_flag=
-+need_lib_prefix=unknown
-+need_version=unknown
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+archive_cmds=
-+archive_expsym_cmds=
-+old_archive_from_new_cmds=
-+export_dynamic_flag_spec=
-+whole_archive_flag_spec=
-+thread_safe_flag_spec=
-+hardcode_libdir_flag_spec=
-+hardcode_libdir_separator=
-+hardcode_direct=no
-+hardcode_minus_L=no
-+hardcode_shlibpath_var=unsupported
-+runpath_var=
-+always_export_symbols=no
-+export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+# include_expsyms should be a list of space-separated symbols to be *always*
-+# included in the symbol list
-+include_expsyms=
-+# exclude_expsyms can be an egrep regular expression of symbols to exclude
-+# it will be wrapped by ` (' and `)$', so one must not match beginning or
-+# end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-+# as well as any symbol that contains `d'.
-+exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
-+# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-+# platforms (ab)use it in PIC code, but their linkers get confused if
-+# the symbol is explicitly referenced.  Since portable code cannot
-+# rely on this symbol name, it's probably fine to never include it in
-+# preloaded symbol tables.
-+
-+case "$host_os" in
-+cygwin* | mingw*)
-+  # FIXME: the MSVC++ port hasn't been tested in a loooong time
-+  # When not using gcc, we currently assume that we are using
-+  # Microsoft Visual C++.
-+  if test "$with_gcc" != yes; then
-+    with_gnu_ld=no
-+  fi
-+  ;;
-+
-+esac
-+
-+ld_shlibs=yes
-+if test "$with_gnu_ld" = yes; then
-+  # If archive_cmds runs LD, not CC, wlarc should be empty
-+  wlarc='${wl}'
-+
-+  # See if GNU ld supports shared libraries.
-+  case "$host_os" in
-+  aix3* | aix4*)
-+    # On AIX, the GNU linker is very broken
-+    ld_shlibs=no
-+    cat <<EOF 1>&2
-+
-+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-+*** to be unable to reliably create shared libraries on AIX.
-+*** Therefore, libtool is disabling shared libraries support.  If you
-+*** really care for shared libraries, you may want to modify your PATH
-+*** so that a non-GNU linker is found, and then restart.
-+
-+EOF
-+    ;;
-+
-+  amigaos*)
-+    archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)'
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_minus_L=yes
-+
-+    # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-+    # that the semantics of dynamic libraries on AmigaOS, at least up
-+    # to version 4, is to share data among multiple programs linked
-+    # with the same dynamic library.  Since this doesn't match the
-+    # behavior of shared libraries on other platforms, we can use
-+    # them.
-+    ld_shlibs=no
-+    ;;
-+
-+  beos*)
-+    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-+      allow_undefined_flag=unsupported
-+      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-+      # support --undefined.  This deserves some investigation.  FIXME
-+      archive_cmds='$CC -nostart $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+    else
-+      ld_shlibs=no
-+    fi
-+    ;;
-+
-+  cygwin* | mingw*)
-+    # hardcode_libdir_flag_spec is actually meaningless, as there is
-+    # no search path for DLLs.
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    allow_undefined_flag=unsupported
-+    always_export_symbols=yes
-+
-+    # Extract the symbol export list from an `--export-all' def file,
-+    # then regenerate the def file from the symbol export list, so that
-+    # the compiled dll only exports the symbol export list.
-+    # Be careful not to strip the DATA tag left by newer dlltools.
-+    export_symbols_cmds='test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~
-+      test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~
-+      $DLLTOOL --export-all --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --output-def $objdir/$soname-def  $objdir/$soname-ltdll.$objext $libobjs $convenience~
-+      sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $objdir/$soname-def > $export_symbols'
-+
-+    # If DATA tags from a recent dlltool are present, honour them!
-+    archive_expsym_cmds='echo EXPORTS > $objdir/$soname-def~
-+      _lt_hint=1;
-+      cat $export_symbols | while read symbol; do
-+        set dummy \$symbol;
-+        case \$# in
-+          2) echo "	\$2 @ \$_lt_hint ; " >> $objdir/$soname-def;;
-+          *) echo "     \$2 @ \$_lt_hint \$3 ; " >> $objdir/$soname-def;;
-+        esac;
-+	_lt_hint=`expr 1 + \$_lt_hint`;
-+      done~
-+      test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~
-+      test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~
-+      $CC -Wl,--base-file,$objdir/$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~
-+      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~
-+      $CC -Wl,--base-file,$objdir/$soname-base $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~
-+      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~
-+      $CC $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts'
-+
-+      old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$libname.a' 
-+    ;;
-+
-+  netbsd*)
-+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+    else
-+      archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-+      # can we support soname and/or expsyms with a.out? -oliva
-+    fi
-+    ;;
-+
-+  solaris* | sysv5*)
-+    if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
-+      ld_shlibs=no
-+      cat <<EOF 1>&2
-+
-+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-+*** create shared libraries on Solaris systems.  Therefore, libtool
-+*** is disabling shared libraries support.  We urge you to upgrade GNU
-+*** binutils to release 2.9.1 or newer.  Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
-+
-+EOF
-+    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-+      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+    else
-+      ld_shlibs=no
-+    fi
-+    ;;      
-+
-+  sunos4*)
-+    archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linkopts'
-+    wlarc=
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  *)
-+    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-+      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+    else
-+      ld_shlibs=no
-+    fi
-+    ;;
-+  esac
-+
-+  if test "$ld_shlibs" = yes; then
-+    runpath_var=LD_RUN_PATH
-+    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-+    export_dynamic_flag_spec='${wl}--export-dynamic'
-+    case $host_os in
-+    cygwin* | mingw*)
-+      # dlltool doesn't understand --whole-archive et. al.
-+      whole_archive_flag_spec=
-+      ;;
-+    *)
-+      # ancient GNU ld didn't support --whole-archive et. al.
-+      if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
-+        whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      else
-+        whole_archive_flag_spec=
-+      fi
-+      ;;
-+    esac
-+  fi
-+else
-+  # PORTME fill in a description of your system's linker (not GNU ld)
-+  case "$host_os" in
-+  aix3*)
-+    allow_undefined_flag=unsupported
-+    always_export_symbols=yes
-+    archive_expsym_cmds='$LD -o $objdir/$soname $libobjs $deplibs $linkopts -bE:$export_symbols -T512 -H512 -bM:SRE~$AR cru $lib $objdir/$soname'
-+    # Note: this linker hardcodes the directories in LIBPATH if there
-+    # are no directories specified by -L.
-+    hardcode_minus_L=yes
-+    if test "$with_gcc" = yes && test -z "$link_static_flag"; then
-+      # Neither direct hardcoding nor static linking is supported with a
-+      # broken collect2.
-+      hardcode_direct=unsupported
-+    fi
-+    ;;
-+
-+  aix4*)
-+    hardcode_libdir_flag_spec='${wl}-b ${wl}nolibpath ${wl}-b ${wl}libpath:$libdir:/usr/lib:/lib'
-+    hardcode_libdir_separator=':'
-+    if test "$with_gcc" = yes; then
-+      collect2name=`${CC} -print-prog-name=collect2`
-+      if test -f "$collect2name" && \
-+	 strings "$collect2name" | grep resolve_lib_name >/dev/null
-+      then
-+	# We have reworked collect2
-+	hardcode_direct=yes
-+      else
-+	# We have old collect2
-+	hardcode_direct=unsupported
-+	# It fails to find uninstalled libraries when the uninstalled
-+	# path is not listed in the libpath.  Setting hardcode_minus_L
-+	# to unsupported forces relinking
-+	hardcode_minus_L=yes
-+	hardcode_libdir_flag_spec='-L$libdir'
-+	hardcode_libdir_separator=
-+      fi
-+      shared_flag='-shared'
-+    else
-+      shared_flag='${wl}-bM:SRE'
-+      hardcode_direct=yes
-+    fi
-+    allow_undefined_flag=' ${wl}-berok'
-+    archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}'
-+    archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}'
-+    case "$host_os" in aix4.[01]|aix4.[01].*)
-+      # According to Greg Wooledge, -bexpall is only supported from AIX 4.2 on
-+      always_export_symbols=yes ;;
-+    esac
-+   ;;
-+
-+  amigaos*)
-+    archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)'
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_minus_L=yes
-+    # see comment about different semantics on the GNU ld section
-+    ld_shlibs=no
-+    ;;
-+
-+  cygwin* | mingw*)
-+    # When not using gcc, we currently assume that we are using
-+    # Microsoft Visual C++.
-+    # hardcode_libdir_flag_spec is actually meaningless, as there is
-+    # no search path for DLLs.
-+    hardcode_libdir_flag_spec=' '
-+    allow_undefined_flag=unsupported
-+    # Tell ltmain to make .lib files, not .a files.
-+    libext=lib
-+    # FIXME: Setting linknames here is a bad hack.
-+    archive_cmds='$CC -o $lib $libobjs $linkopts `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-+    # The linker will automatically build a .lib file if we build a DLL.
-+    old_archive_from_new_cmds='true'
-+    # FIXME: Should let the user specify the lib program.
-+    old_archive_cmds='lib /OUT:$oldlib$oldobjs'
-+    fix_srcfile_path='`cygpath -w $srcfile`'
-+    ;;
-+
-+  freebsd1*)
-+    ld_shlibs=no
-+    ;;
-+
-+  # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-+  # support.  Future versions do this automatically, but an explicit c++rt0.o
-+  # does not break anything, and helps significantly (at the cost of a little
-+  # extra space).
-+  freebsd2.2*)
-+    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts /usr/lib/c++rt0.o'
-+    hardcode_libdir_flag_spec='-R$libdir'
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+  freebsd2*)
-+    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
-+    hardcode_direct=yes
-+    hardcode_minus_L=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+  freebsd*)
-+    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts'
-+    hardcode_libdir_flag_spec='-R$libdir'
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  hpux9* | hpux10* | hpux11*)
-+    case "$host_os" in
-+    hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;;
-+    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linkopts' ;;
-+    esac
-+    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+    hardcode_libdir_separator=:
-+    hardcode_direct=yes
-+    hardcode_minus_L=yes # Not in the search PATH, but as the default
-+			 # location of the library.
-+    export_dynamic_flag_spec='${wl}-E'
-+    ;;
-+
-+  irix5* | irix6*)
-+    if test "$with_gcc" = yes; then
-+      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+    else
-+      archive_cmds='$LD -shared $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+    fi
-+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    hardcode_libdir_separator=:
-+    ;;
-+
-+  netbsd*)
-+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'  # a.out
-+    else
-+      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linkopts'      # ELF
-+    fi
-+    hardcode_libdir_flag_spec='${wl}-R$libdir'
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  openbsd*)
-+    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
-+    hardcode_libdir_flag_spec='-R$libdir'
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  os2*)
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_minus_L=yes
-+    allow_undefined_flag=unsupported
-+    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $objdir/$libname.def~$echo DATA >> $objdir/$libname.def~$echo " SINGLE NONSHARED" >> $objdir/$libname.def~$echo EXPORTS >> $objdir/$libname.def~emxexp $libobjs >> $objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $linkopts $objdir/$libname.def'
-+    old_archive_from_new_cmds='emximp -o $objdir/$libname.a $objdir/$libname.def'
-+    ;;
-+
-+  osf3*)
-+    if test "$with_gcc" = yes; then
-+      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-+      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+    else
-+      allow_undefined_flag=' -expect_unresolved \*'
-+      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+    fi
-+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    hardcode_libdir_separator=:
-+    ;;
-+
-+  osf4* | osf5*)  # As osf3* with the addition of the -msym flag
-+    if test "$with_gcc" = yes; then
-+      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-+      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+    else
-+      allow_undefined_flag=' -expect_unresolved \*'
-+      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+    fi
-+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    hardcode_libdir_separator=:
-+    ;;
-+  rhapsody*)
-+    archive_cmds='$CC -bundle -undefined suppress -o $lib $libobjs $deplibs $linkopts'
-+    hardcode_libdir_flags_spec='-L$libdir'
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+                                       
-+  sco3.2v5*)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
-+    hardcode_shlibpath_var=no
-+    runpath_var=LD_RUN_PATH
-+    hardcode_runpath_var=yes
-+    ;;
-+
-+  solaris*)
-+    no_undefined_flag=' -z text'
-+    # $CC -shared without GNU ld will not create a library from C++
-+    # object files and a static libstdc++, better avoid it by now
-+    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts'
-+    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp'
-+    hardcode_libdir_flag_spec='-R$libdir'
-+    hardcode_shlibpath_var=no
-+    case "$host_os" in
-+    solaris2.[0-5] | solaris2.[0-5].*) ;;
-+    *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-+      whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
-+    esac
-+    ;;
-+
-+  sunos4*)
-+    archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linkopts'
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_direct=yes
-+    hardcode_minus_L=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  sysv4)
-+    if test "x$host_vendor" = xsequent; then
-+      # Use $CC to link under sequent, because it throws in some extra .o 
-+      # files that make .init and .fini sections work.
-+      archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $linkopts'
-+    else
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
-+    fi
-+    runpath_var='LD_RUN_PATH'
-+    hardcode_shlibpath_var=no
-+    hardcode_direct=no #Motorola manual says yes, but my tests say they lie 
-+    ;;  
-+
-+  sysv4.3*)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
-+    hardcode_shlibpath_var=no
-+    export_dynamic_flag_spec='-Bexport'
-+    ;;
-+
-+  sysv5*)
-+    no_undefined_flag=' -z text'
-+    # $CC -shared without GNU ld will not create a library from C++
-+    # object files and a static libstdc++, better avoid it by now
-+    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts'
-+    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp'
-+    hardcode_libdir_flag_spec=
-+    hardcode_shlibpath_var=no
-+    runpath_var='LD_RUN_PATH'
-+    ;;
-+
-+  uts4*)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  dgux*)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  sysv4*MP*)
-+    if test -d /usr/nec; then
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
-+      hardcode_shlibpath_var=no
-+      runpath_var=LD_RUN_PATH
-+      hardcode_runpath_var=yes
-+      ld_shlibs=yes
-+    fi
-+    ;;
-+
-+  sysv4.2uw2*)
-+    archive_cmds='$LD -G -o $lib $libobjs $deplibs $linkopts'
-+    hardcode_direct=yes
-+    hardcode_minus_L=no
-+    hardcode_shlibpath_var=no
-+    hardcode_runpath_var=yes
-+    runpath_var=LD_RUN_PATH
-+    ;;
-+
-+  unixware7*)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
-+    runpath_var='LD_RUN_PATH'
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  *)
-+    ld_shlibs=no
-+    ;;
-+  esac
-+fi
-+echo "$ac_t$ld_shlibs" 1>&6
-+test "$ld_shlibs" = no && can_build_shared=no
-+
-+if test -z "$NM"; then
-+  echo $ac_n "checking for BSD-compatible nm... $ac_c" 1>&6
-+  case "$NM" in
-+  [\\/]* | [A-Za-z]:[\\/]*) ;; # Let the user override the test with a path.
-+  *)
-+    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
-+    for ac_dir in $PATH /usr/ucb /usr/ccs/bin /bin; do
-+      test -z "$ac_dir" && ac_dir=.
-+      if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext; then
-+	# Check to see if the nm accepts a BSD-compat flag.
-+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-+	#   nm: unknown option "B" ignored
-+	if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-+	  NM="$ac_dir/nm -B"
-+	  break
-+	elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-+	  NM="$ac_dir/nm -p"
-+	  break
-+	else
-+	  NM=${NM="$ac_dir/nm"} # keep the first match, but
-+	  continue # so that we can try to find one that supports BSD flags
-+	fi
-+      fi
-+    done
-+    IFS="$ac_save_ifs"
-+    test -z "$NM" && NM=nm
-+    ;;
-+  esac
-+  echo "$ac_t$NM" 1>&6
-+fi
-+
-+# Check for command to grab the raw symbol name followed by C symbol from nm.
-+echo $ac_n "checking command to parse $NM output... $ac_c" 1>&6
-+
-+# These are sane defaults that work on at least a few old systems.
-+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-+
-+# Character class describing NM global symbol codes.
-+symcode='[BCDEGRST]'
-+
-+# Regexp to match symbols that can be accessed directly from C.
-+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-+
-+# Transform the above into a raw symbol and a C symbol.
-+symxfrm='\1 \2\3 \3'
-+
-+# Transform an extracted symbol line into a proper C declaration
-+global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
-+
-+# Define system-specific variables.
-+case "$host_os" in
-+aix*)
-+  symcode='[BCDT]'
-+  ;;
-+cygwin* | mingw*)
-+  symcode='[ABCDGISTW]'
-+  ;;
-+hpux*) # Its linker distinguishes data from code symbols
-+  global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^. .* \(.*\)$/extern char \1;/p'"
-+  ;;
-+irix*)
-+  symcode='[BCDEGRST]'
-+  ;;
-+solaris*)
-+  symcode='[BDT]'
-+  ;;
-+sysv4)
-+  symcode='[DFNSTU]'
-+  ;;
-+esac
-+
-+# If we're using GNU nm, then use its standard symbol codes.
-+if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
-+  symcode='[ABCDGISTW]'
-+fi
-+
-+# Try without a prefix undercore, then with it.
-+for ac_symprfx in "" "_"; do
-+
-+  # Write the raw and C identifiers.
-+  global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode\)[ 	][ 	]*\($ac_symprfx\)$sympat$/$symxfrm/p'"
-+
-+  # Check to see that the pipe works correctly.
-+  pipe_works=no
-+  $rm conftest*
-+  cat > conftest.c <<EOF
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+char nm_test_var;
-+void nm_test_func(){}
-+#ifdef __cplusplus
-+}
-+#endif
-+main(){nm_test_var='a';nm_test_func();return(0);}
-+EOF
-+
-+  echo "$progname:1653: checking if global_symbol_pipe works" >&5
-+  if { (eval echo $progname:1654: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then
-+    # Now try to grab the symbols.
-+    nlist=conftest.nm
-+    if { echo "$progname:1657: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
-+
-+      # Try sorting and uniquifying the output.
-+      if sort "$nlist" | uniq > "$nlist"T; then
-+	mv -f "$nlist"T "$nlist"
-+      else
-+	rm -f "$nlist"T
-+      fi
-+
-+      # Make sure that we snagged all the symbols we need.
-+      if egrep ' nm_test_var$' "$nlist" >/dev/null; then
-+	if egrep ' nm_test_func$' "$nlist" >/dev/null; then
-+	  cat <<EOF > conftest.c
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+EOF
-+	  # Now generate the symbol file.
-+	  eval "$global_symbol_to_cdecl"' < "$nlist" >> conftest.c'
-+
-+	  cat <<EOF >> conftest.c
-+#if defined (__STDC__) && __STDC__
-+# define lt_ptr_t void *
-+#else
-+# define lt_ptr_t char *
-+# define const
-+#endif
-+
-+/* The mapping between symbol names and symbols. */
-+const struct {
-+  const char *name;
-+  lt_ptr_t address;
-+}
-+lt_preloaded_symbols[] =
-+{
-+EOF
-+	  sed 's/^. \(.*\) \(.*\)$/  {"\2", (lt_ptr_t) \&\2},/' < "$nlist" >> conftest.c
-+	  cat <<\EOF >> conftest.c
-+  {0, (lt_ptr_t) 0}
-+};
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+EOF
-+	  # Now try linking the two files.
-+	  mv conftest.$objext conftstm.$objext
-+	  save_LIBS="$LIBS"
-+	  save_CFLAGS="$CFLAGS"
-+	  LIBS="conftstm.$objext"
-+	  CFLAGS="$CFLAGS$no_builtin_flag"
-+	  if { (eval echo $progname:1709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+	    pipe_works=yes
-+	  else
-+	    echo "$progname: failed program was:" >&5
-+	    cat conftest.c >&5
-+	  fi
-+	  LIBS="$save_LIBS"
-+	else
-+	  echo "cannot find nm_test_func in $nlist" >&5
-+	fi
-+      else
-+	echo "cannot find nm_test_var in $nlist" >&5
-+      fi
-+    else
-+      echo "cannot run $global_symbol_pipe" >&5
-+    fi
-+  else
-+    echo "$progname: failed program was:" >&5
-+    cat conftest.c >&5
-+  fi
-+  $rm conftest* conftst*
-+
-+  # Do not use the global_symbol_pipe unless it works.
-+  if test "$pipe_works" = yes; then
-+    break
-+  else
-+    global_symbol_pipe=
-+  fi
-+done
-+if test "$pipe_works" = yes; then
-+  echo "${ac_t}ok" 1>&6
-+else
-+  echo "${ac_t}failed" 1>&6
-+fi
-+
-+if test -z "$global_symbol_pipe"; then
-+  global_symbol_to_cdecl=
-+fi
-+
-+# Check hardcoding attributes.
-+echo $ac_n "checking how to hardcode library paths into programs... $ac_c" 1>&6
-+hardcode_action=
-+if test -n "$hardcode_libdir_flag_spec" || \
-+   test -n "$runpath_var"; then
-+
-+  # We can hardcode non-existant directories.
-+  if test "$hardcode_direct" != no &&
-+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-+     # have to relink, otherwise we might link with an installed library
-+     # when we should be linking with a yet-to-be-installed one
-+     ## test "$hardcode_shlibpath_var" != no &&
-+     test "$hardcode_minus_L" != no; then
-+    # Linking always hardcodes the temporary library directory.
-+    hardcode_action=relink
-+  else
-+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+    hardcode_action=immediate
-+  fi
-+else
-+  # We cannot hardcode anything, or else we can only hardcode existing
-+  # directories.
-+  hardcode_action=unsupported
-+fi
-+echo "$ac_t$hardcode_action" 1>&6
-+
-+
-+reload_flag=
-+reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+echo $ac_n "checking for $LD option to reload object files... $ac_c" 1>&6
-+# PORTME Some linkers may need a different reload flag.
-+reload_flag='-r'
-+echo "$ac_t$reload_flag" 1>&6
-+test -n "$reload_flag" && reload_flag=" $reload_flag"
-+
-+# PORTME Fill in your ld.so characteristics
-+library_names_spec=
-+libname_spec='lib$name'
-+soname_spec=
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+file_magic_cmd=
-+file_magic_test_file=
-+deplibs_check_method='unknown'
-+# Need to set the preceding variable on all platforms that support
-+# interlibrary dependencies.
-+# 'none' -- dependencies not supported.
-+# `unknown' -- same as none, but documents that we really don't know.
-+# 'pass_all' -- all dependencies passed with no checks.
-+# 'test_compile' -- check by making test program.
-+# 'file_magic [regex]' -- check by looking for files in library path
-+# which responds to the $file_magic_cmd with a given egrep regex.
-+# If you have `file' or equivalent on your system and you're not sure
-+# whether `pass_all' will *always* work, you probably want this one.
-+echo $ac_n "checking dynamic linker characteristics... $ac_c" 1>&6
-+case "$host_os" in
-+aix3*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}.so$versuffix $libname.a'
-+  shlibpath_var=LIBPATH
-+
-+  # AIX has no versioning support, so we append a major version to the name.
-+  soname_spec='${libname}${release}.so$major'
-+  ;;
-+
-+aix4*)
-+  version_type=linux
-+  # AIX has no versioning support, so currently we can not hardcode correct
-+  # soname into executable. Probably we can add versioning support to
-+  # collect2, so additional links can be useful in future.
-+  # We preserve .a as extension for shared libraries though AIX4.2
-+  # and later linker supports .so
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.a'
-+  shlibpath_var=LIBPATH
-+  deplibs_check_method=pass_all
-+  ;;
-+
-+amigaos*)
-+  library_names_spec='$libname.ixlibrary $libname.a'
-+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
-+  ;;
-+
-+beos*)
-+  library_names_spec='${libname}.so'
-+  dynamic_linker="$host_os ld.so"
-+  shlibpath_var=LIBRARY_PATH
-+  deplibs_check_method=pass_all
-+  lt_cv_dlopen="load_add_on"
-+  lt_cv_dlopen_libs=
-+  lt_cv_dlopen_self=yes
-+  ;;
-+
-+bsdi4*)
-+  version_type=linux
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-+  file_magic_cmd=/usr/bin/file
-+  file_magic_test_file=/shlib/libc.so
-+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-+  export_dynamic_flag_spec=-rdynamic
-+  # the default ld.so.conf also contains /usr/contrib/lib and
-+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-+  # libtool to hard-code these into programs
-+  ;;
-+
-+cygwin* | mingw*)
-+  version_type=windows
-+  need_version=no
-+  need_lib_prefix=no
-+  if test "$with_gcc" = yes; then
-+    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.a'
-+  else
-+    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib'
-+  fi
-+  dynamic_linker='Win32 ld.exe'
-+  deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-+  file_magic_cmd='${OBJDUMP} -f'
-+  # FIXME: first we should search . and the directory the executable is in
-+  shlibpath_var=PATH
-+  lt_cv_dlopen="LoadLibrary"
-+  lt_cv_dlopen_libs=
-+  ;;
-+
-+freebsd1*)
-+  dynamic_linker=no
-+  ;;
-+  
-+freebsd*)
-+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+  version_type=freebsd-$objformat
-+  case "$version_type" in
-+    freebsd-elf*)
-+      deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-+      file_magic_cmd=/usr/bin/file
-+      file_magic_test_file=`echo /usr/lib/libc.so*`
-+      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
-+      need_version=no
-+      need_lib_prefix=no
-+      ;;
-+    freebsd-*)
-+      deplibs_check_method=unknown
-+      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
-+      need_version=yes
-+      ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case "$host_os" in
-+  freebsd2* | freebsd3.[01]* | freebsdelf3.[01]*)
-+    shlibpath_overrides_runpath=yes
-+    ;;
-+  *) # from 3.2 on
-+    shlibpath_overrides_runpath=no
-+    ;;
-+  esac
-+  ;;
-+
-+gnu*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  deplibs_check_method=pass_all
-+  ;;
-+
-+hpux9* | hpux10* | hpux11*)
-+  # Give a soname corresponding to the major version so that dld.sl refuses to
-+  # link against other versions.
-+  dynamic_linker="$host_os dld.sl"
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  shlibpath_var=SHLIB_PATH
-+  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
-+  soname_spec='${libname}${release}.sl$major'
-+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-+  postinstall_cmds='chmod 555 $lib'
-+  case "$host_os" in
-+  hpux10.20*)
-+    # TODO:  Does this work for hpux-11 too?
-+    deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-+    file_magic_cmd=/usr/bin/file
-+    file_magic_test_file=/usr/lib/libc.sl
-+    ;;
-+  esac
-+  ;;
-+
-+irix5* | irix6*)
-+  version_type=irix
-+  need_lib_prefix=no
-+  need_version=no
-+  soname_spec='${libname}${release}.so.$major'
-+  library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so'
-+  case "$host_os" in
-+  irix5*)
-+    libsuff= shlibsuff=
-+    # this will be overridden with pass_all, but let us keep it just in case
-+    deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-+    ;;
-+  *)
-+    case "$LD" in # libtool.m4 will add one of these switches to LD
-+    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
-+    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
-+    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
-+    *) libsuff= shlibsuff= libmagic=never-match;;
-+    esac
-+    ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-+  shlibpath_overrides_runpath=no
-+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+  file_magic_cmd=/usr/bin/file
-+  file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-+  deplibs_check_method='pass_all'
-+  ;;
-+
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
-+  dynamic_linker=no
-+  ;;
-+
-+# This must be Linux ELF.
-+linux-gnu*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  deplibs_check_method=pass_all
-+
-+  if test -f /lib/ld.so.1; then
-+    dynamic_linker='GNU ld.so'
-+  else
-+    # Only the GNU ld.so supports shared libraries on MkLinux.
-+    case "$host_cpu" in
-+    powerpc*) dynamic_linker=no ;;
-+    *) dynamic_linker='Linux ld.so' ;;
-+    esac
-+  fi
-+  ;;
-+
-+netbsd*)
-+  version_type=sunos
-+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+    dynamic_linker='NetBSD (a.out) ld.so'
-+  else
-+    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-+    soname_spec='${libname}${release}.so$major'
-+    dynamic_linker='NetBSD ld.elf_so'
-+  fi
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+openbsd*)
-+  version_type=sunos
-+  if test "$with_gnu_ld" = yes; then
-+    need_lib_prefix=no
-+    need_version=no
-+  fi
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+os2*)
-+  libname_spec='$name'
-+  need_lib_prefix=no
-+  library_names_spec='$libname.dll $libname.a'
-+  dynamic_linker='OS/2 ld.exe'
-+  shlibpath_var=LIBPATH
-+  ;;
-+
-+osf3* | osf4* | osf5*)
-+  version_type=osf
-+  need_version=no
-+  soname_spec='${libname}${release}.so'
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  # this will be overridden with pass_all, but let us keep it just in case
-+  deplibs_check_method='file_magic COFF format alpha shared library'
-+  file_magic_cmd=/usr/bin/file
-+  file_magic_test_file=/shlib/libc.so
-+  deplibs_check_method='pass_all'
-+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-+  ;;
-+
-+rhapsody*)
-+  version_type=sunos
-+  library_names_spec='${libname}.so'
-+  soname_spec='${libname}.so'
-+  shlibpath_var=DYLD_LIBRARY_PATH
-+  deplibs_check_method=pass_all
-+  ;;
-+
-+sco3.2v5*)
-+  version_type=osf
-+  soname_spec='${libname}${release}.so$major'
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+solaris*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  # ldd complains unless libraries are executable
-+  postinstall_cmds='chmod +x $lib'
-+  deplibs_check_method="file_magic ELF [0-9][0-9]-bit [LM]SB dynamic lib"
-+  file_magic_cmd=/usr/bin/file
-+  file_magic_test_file=/lib/libc.so
-+  ;;
-+
-+sunos4*)
-+  version_type=sunos
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  if test "$with_gnu_ld" = yes; then
-+    need_lib_prefix=no
-+  fi
-+  need_version=yes
-+  ;;
-+
-+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case "$host_vendor" in
-+    sequent)
-+      file_magic_cmd='/bin/file'
-+      deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-+      ;;
-+    ncr)
-+      deplibs_check_method='pass_all'
-+      ;;
-+    motorola)
-+      need_lib_prefix=no
-+      need_version=no
-+      shlibpath_overrides_runpath=no
-+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-+      deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-+      file_magic_cmd=/usr/bin/file
-+      file_magic_test_file=`echo /usr/lib/libc.so*`
-+      ;;
-+  esac
-+  ;;
-+
-+uts4*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+dgux*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+sysv4*MP*)
-+  if test -d /usr/nec ;then
-+    version_type=linux
-+    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
-+    soname_spec='$libname.so.$major'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  fi
-+  ;;
-+
-+*)
-+  dynamic_linker=no
-+  ;;
-+esac
-+echo "$ac_t$dynamic_linker" 1>&6
-+test "$dynamic_linker" = no && can_build_shared=no
-+
-+# Report the final consequences.
-+echo "checking if libtool supports shared libraries... $can_build_shared" 1>&6
-+
-+# Only try to build win32 dlls if AC_LIBTOOL_WIN32_DLL was used in
-+# configure.in, otherwise build static only libraries.
-+case "$host_os" in
-+cygwin* | mingw* | os2*)
-+  if test x$can_build_shared = xyes; then
-+    test x$enable_win32_dll = xno && can_build_shared=no
-+    echo "checking if package supports dlls... $can_build_shared" 1>&6
-+  fi
-+;;
-+esac
-+
-+if test -n "$file_magic_test_file" && test -n "$file_magic_cmd"; then
-+  case "$deplibs_check_method" in
-+  "file_magic "*)
-+    file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-+    if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-+       egrep "$file_magic_regex" > /dev/null; then
-+      :
-+    else
-+      cat <<EOF 1>&2
-+
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such.  This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem.  Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool@gnu.org
-+
-+EOF
-+    fi ;;
-+  esac
-+fi
-+
-+echo $ac_n "checking whether to build shared libraries... $ac_c" 1>&6
-+test "$can_build_shared" = "no" && enable_shared=no
-+
-+# On AIX, shared libraries and static libraries use the same namespace, and
-+# are all built from PIC.
-+case "$host_os" in
-+aix3*)
-+  test "$enable_shared" = yes && enable_static=no
-+  if test -n "$RANLIB"; then
-+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+    postinstall_cmds='$RANLIB $lib'
-+  fi
-+  ;;
-+
-+aix4*)
-+  test "$enable_shared" = yes && enable_static=no
-+  ;;
-+esac
-+
-+echo "$ac_t$enable_shared" 1>&6
-+
-+# Make sure either enable_shared or enable_static is yes.
-+test "$enable_shared" = yes || enable_static=yes
-+
-+echo "checking whether to build static libraries... $enable_static" 1>&6
-+
-+if test "$hardcode_action" = relink; then
-+  # Fast installation is not supported
-+  enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+     test "$enable_shared" = no; then
-+  # Fast installation is not necessary
-+  enable_fast_install=needless
-+fi
-+
-+echo $ac_n "checking for objdir... $ac_c" 1>&6
-+rm -f .libs 2>/dev/null
-+mkdir .libs 2>/dev/null
-+if test -d .libs; then
-+  objdir=.libs
-+else
-+  # MS-DOS does not allow filenames that begin with a dot.
-+  objdir=_libs
-+fi
-+rmdir .libs 2>/dev/null
-+echo "$ac_t$objdir" 1>&6
-+
-+if test "x$enable_dlopen" != xyes; then
-+  enable_dlopen=unknown
-+  enable_dlopen_self=unknown
-+  enable_dlopen_self_static=unknown
-+else
-+if eval "test \"`echo '$''{'lt_cv_dlopen'+set}'`\" != set"; then
-+  lt_cv_dlopen=no lt_cv_dlopen_libs=
-+echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-+echo "$progname:2248: checking for dlopen in -ldl" >&5
-+ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-ldl  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 2256 "ltconfig"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dlopen();
-+
-+int main() {
-+dlopen()
-+; return 0; }
-+EOF
-+if { (eval echo $progname:2269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "$progname: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-+else
-+  echo "$ac_t""no" 1>&6
-+echo $ac_n "checking for dlopen""... $ac_c" 1>&6
-+echo "$progname:2288: checking for dlopen" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 2293 "ltconfig"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char dlopen(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dlopen();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_dlopen) || defined (__stub___dlopen)
-+choke me
-+#else
-+dlopen();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo $progname:2318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_dlopen=yes"
-+else
-+  echo "$progname: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_dlopen=no"
-+fi
-+rm -f conftest*
-+fi
-+if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  lt_cv_dlopen="dlopen"
-+else
-+  echo "$ac_t""no" 1>&6
-+echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
-+echo "$progname:2335: checking for dld_link in -ldld" >&5
-+ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-ldld  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 2343 "ltconfig"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dld_link();
-+
-+int main() {
-+dld_link()
-+; return 0; }
-+EOF
-+if { (eval echo $progname:2356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "$progname: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
-+else
-+  echo "$ac_t""no" 1>&6
-+echo $ac_n "checking for shl_load""... $ac_c" 1>&6
-+echo "$progname:2375: checking for shl_load" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 2380 "ltconfig"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char shl_load(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char shl_load();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_shl_load) || defined (__stub___shl_load)
-+choke me
-+#else
-+shl_load();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo $progname:2405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_shl_load=yes"
-+else
-+  echo "$progname: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_shl_load=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  lt_cv_dlopen="shl_load"
-+else
-+  echo "$ac_t""no" 1>&6
-+echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-+echo "$progname:2423: checking for shl_load in -ldld" >&5
-+ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-ldld  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 2431 "ltconfig"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char shl_load();
-+
-+int main() {
-+shl_load()
-+; return 0; }
-+EOF
-+if { (eval echo $progname:2445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "$progname: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+
-+fi
-+
-+    
-+fi
-+
-+  
-+fi
-+
-+
-+fi
-+
-+fi
-+
-+  if test "x$lt_cv_dlopen" != xno; then
-+    enable_dlopen=yes
-+  fi
-+
-+  case "$lt_cv_dlopen" in
-+  dlopen)
-+for ac_hdr in dlfcn.h; do
-+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+echo "$progname:2488: checking for $ac_hdr" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 2493 "ltconfig"
-+#include <$ac_hdr>
-+int fnord = 0;
-+EOF
-+ac_try="$ac_compile >/dev/null 2>conftest.out"
-+{ (eval echo $progname:2498: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=yes"
-+else
-+  echo "$ac_err" >&5
-+  echo "$progname: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=no"
-+fi
-+rm -f conftest*
-+fi
-+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+    if test "x$ac_cv_header_dlfcn_h" = xyes; then
-+      CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+    fi
-+    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+    LIBS="$lt_cv_dlopen_libs $LIBS"
-+
-+  echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
-+echo "$progname:2526: checking whether a program can dlopen itself" >&5
-+if test "${lt_cv_dlopen_self+set}" = set; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test "$cross_compiling" = yes; then
-+    lt_cv_dlopen_self=cross
-+  else
-+    cat > conftest.c <<EOF
-+#line 2534 "ltconfig"
-+
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#ifdef RTLD_GLOBAL
-+# define LTDL_GLOBAL	RTLD_GLOBAL
-+#else
-+# ifdef DL_GLOBAL
-+#  define LTDL_GLOBAL	DL_GLOBAL
-+# else
-+#  define LTDL_GLOBAL	0
-+# endif
-+#endif
-+
-+/* We may have to define LTDL_LAZY_OR_NOW in the command line if we
-+   find out it does not work in some platform. */
-+#ifndef LTDL_LAZY_OR_NOW
-+# ifdef RTLD_LAZY
-+#  define LTDL_LAZY_OR_NOW	RTLD_LAZY
-+# else
-+#  ifdef DL_LAZY
-+#   define LTDL_LAZY_OR_NOW	DL_LAZY
-+#  else
-+#   ifdef RTLD_NOW
-+#    define LTDL_LAZY_OR_NOW	RTLD_NOW
-+#   else
-+#    ifdef DL_NOW
-+#     define LTDL_LAZY_OR_NOW	DL_NOW
-+#    else
-+#     define LTDL_LAZY_OR_NOW	0
-+#    endif
-+#   endif
-+#  endif
-+# endif
-+#endif
-+
-+fnord() { int i=42;}
-+main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
-+    if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord");
-+	       if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } 
-+
-+EOF
-+if { (eval echo $progname:2580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+then
-+  lt_cv_dlopen_self=yes
-+else
-+  echo "$progname: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -fr conftest*
-+  lt_cv_dlopen_self=no
-+fi
-+rm -fr conftest*
-+fi
-+
-+fi
-+
-+echo "$ac_t""$lt_cv_dlopen_self" 1>&6
-+
-+  if test "$lt_cv_dlopen_self" = yes; then
-+    LDFLAGS="$LDFLAGS $link_static_flag"
-+  echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
-+echo "$progname:2599: checking whether a statically linked program can dlopen itself" >&5
-+if test "${lt_cv_dlopen_self_static+set}" = set; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test "$cross_compiling" = yes; then
-+    lt_cv_dlopen_self_static=cross
-+  else
-+    cat > conftest.c <<EOF
-+#line 2607 "ltconfig"
-+
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#ifdef RTLD_GLOBAL
-+# define LTDL_GLOBAL	RTLD_GLOBAL
-+#else
-+# ifdef DL_GLOBAL
-+#  define LTDL_GLOBAL	DL_GLOBAL
-+# else
-+#  define LTDL_GLOBAL	0
-+# endif
-+#endif
-+
-+/* We may have to define LTDL_LAZY_OR_NOW in the command line if we
-+   find out it does not work in some platform. */
-+#ifndef LTDL_LAZY_OR_NOW
-+# ifdef RTLD_LAZY
-+#  define LTDL_LAZY_OR_NOW	RTLD_LAZY
-+# else
-+#  ifdef DL_LAZY
-+#   define LTDL_LAZY_OR_NOW	DL_LAZY
-+#  else
-+#   ifdef RTLD_NOW
-+#    define LTDL_LAZY_OR_NOW	RTLD_NOW
-+#   else
-+#    ifdef DL_NOW
-+#     define LTDL_LAZY_OR_NOW	DL_NOW
-+#    else
-+#     define LTDL_LAZY_OR_NOW	0
-+#    endif
-+#   endif
-+#  endif
-+# endif
-+#endif
-+
-+fnord() { int i=42;}
-+main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
-+    if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord");
-+    if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } 
-+
-+EOF
-+if { (eval echo $progname:2653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+then
-+  lt_cv_dlopen_self_static=yes
-+else
-+  echo "$progname: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -fr conftest*
-+  lt_cv_dlopen_self_static=no
-+fi
-+rm -fr conftest*
-+fi
-+
-+fi
-+
-+echo "$ac_t""$lt_cv_dlopen_self_static" 1>&6
-+fi
-+    ;;
-+  esac
-+
-+  case "$lt_cv_dlopen_self" in
-+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-+  *) enable_dlopen_self=unknown ;;
-+  esac
-+
-+  case "$lt_cv_dlopen_self_static" in
-+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-+  *) enable_dlopen_self_static=unknown ;;
-+  esac
-+fi
-+
-+# Copy echo and quote the copy, instead of the original, because it is
-+# used later.
-+ltecho="$echo"
-+if test "X$ltecho" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-+   ltecho="$CONFIG_SHELL \$0 --fallback-echo"
-+fi
-+LTSHELL="$SHELL"
-+
-+LTCONFIG_VERSION="$VERSION"
-+
-+# Only quote variables if we're using ltmain.sh.
-+case "$ltmain" in
-+*.sh)
-+  # Now quote all the things that may contain metacharacters.
-+  for var in ltecho old_CC old_CFLAGS old_CPPFLAGS \
-+    old_LD old_LDFLAGS old_LIBS \
-+    old_NM old_RANLIB old_LN_S old_DLLTOOL old_OBJDUMP old_AS \
-+    AR CC LD LN_S NM LTSHELL LTCONFIG_VERSION \
-+    reload_flag reload_cmds wl \
-+    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
-+    thread_safe_flag_spec whole_archive_flag_spec libname_spec \
-+    library_names_spec soname_spec \
-+    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
-+    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds postuninstall_cmds \
-+    file_magic_cmd export_symbols_cmds deplibs_check_method allow_undefined_flag no_undefined_flag \
-+    finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
-+    hardcode_libdir_flag_spec hardcode_libdir_separator  \
-+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-+    compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
-+
-+    case "$var" in
-+    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
-+    old_postinstall_cmds | old_postuninstall_cmds | \
-+    export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
-+    postinstall_cmds | postuninstall_cmds | \
-+    finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-+      # Double-quote double-evaled strings.
-+      eval "$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-+      ;;
-+    *)
-+      eval "$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-+      ;;
-+    esac
-+  done
-+
-+  case "$ltecho" in
-+  *'\$0 --fallback-echo"')
-+    ltecho=`$echo "X$ltecho" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-+    ;;
-+  esac
-+
-+  trap "$rm \"$ofile\"; exit 1" 1 2 15
-+  echo "creating $ofile"
-+  $rm "$ofile"
-+  cat <<EOF > "$ofile"
-+#! $SHELL
-+
-+# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-+# NOTE: Changes made to this file will be lost: look at ltconfig or ltmain.sh.
-+#
-+# Copyright (C) 1996-1999 Free Software Foundation, Inc.
-+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-+Xsed="sed -e s/^X//"
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+
-+### BEGIN LIBTOOL CONFIG
-+EOF
-+  cfgfile="$ofile"
-+  ;;
-+
-+*)
-+  # Double-quote the variables that need it (for aesthetics).
-+  for var in old_CC old_CFLAGS old_CPPFLAGS \
-+    old_LD old_LDFLAGS old_LIBS \
-+    old_NM old_RANLIB old_LN_S old_DLLTOOL old_OBJDUMP old_AS; do
-+    eval "$var=\\\"\$var\\\""
-+  done
-+
-+  # Just create a config file.
-+  cfgfile="$ofile.cfg"
-+  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-+  echo "creating $cfgfile"
-+  $rm "$cfgfile"
-+  cat <<EOF > "$cfgfile"
-+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Libtool configuration file.
-+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-+EOF
-+  ;;
-+esac
-+
-+cat <<EOF >> "$cfgfile"
-+# Libtool was configured as follows, on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+#
-+# CC=$old_CC CFLAGS=$old_CFLAGS CPPFLAGS=$old_CPPFLAGS \\
-+# LD=$old_LD LDFLAGS=$old_LDFLAGS LIBS=$old_LIBS \\
-+# NM=$old_NM RANLIB=$old_RANLIB LN_S=$old_LN_S \\
-+# DLLTOOL=$old_DLLTOOL OBJDUMP=$old_OBJDUMP AS=$old_AS \\
-+#   $0$ltconfig_args
-+#
-+# Compiler and other test output produced by $progname, useful for
-+# debugging $progname, is in ./config.log if it exists.
-+
-+# The version of $progname that generated this script.
-+LTCONFIG_VERSION=$LTCONFIG_VERSION
-+
-+# Shell to use when invoking shell scripts.
-+SHELL=$LTSHELL
-+
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
-+
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
-+
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
-+
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+
-+# An echo program that does not interpret backslashes.
-+echo=$ltecho
-+
-+# The archiver.
-+AR=$AR
-+
-+# The default C compiler.
-+CC=$CC
-+
-+# The linker used to build libraries.
-+LD=$LD
-+
-+# Whether we need hard or soft links.
-+LN_S=$LN_S
-+
-+# A BSD-compatible nm program.
-+NM=$NM
-+
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
-+
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
-+
-+# Used on cygwin: assembler.
-+AS="$AS"
-+
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
-+
-+# How to create reloadable object files.
-+reload_flag=$reload_flag
-+reload_cmds=$reload_cmds
-+
-+# How to pass a linker flag through the compiler.
-+wl=$wl
-+
-+# Object file suffix (normally "o").
-+objext="$objext"
-+
-+# Old archive suffix (normally "a").
-+libext="$libext"
-+
-+# Executable file suffix (normally "").
-+exeext="$exeext"
-+
-+# Additional compiler flags for building library objects.
-+pic_flag=$pic_flag
-+
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$compiler_c_o
-+
-+# Can we write directly to a .lo ?
-+compiler_o_lo=$compiler_o_lo
-+
-+# Must we lock files when doing compilation ?
-+need_locks=$need_locks
-+
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
-+
-+# Do we need a version for libraries?
-+need_version=$need_version
-+
-+# Whether dlopen is supported.
-+dlopen=$enable_dlopen
-+
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
-+
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
-+
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$link_static_flag
-+
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$no_builtin_flag
-+
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$export_dynamic_flag_spec
-+
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$whole_archive_flag_spec
-+
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$thread_safe_flag_spec
-+
-+# Library versioning type.
-+version_type=$version_type
-+
-+# Format of library name prefix.
-+libname_spec=$libname_spec
-+
-+# List of archive names.  First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$library_names_spec
-+
-+# The coded name of the library, if different from the real name.
-+soname_spec=$soname_spec
-+
-+# Commands used to build and install an old-style archive.
-+RANLIB=$RANLIB
-+old_archive_cmds=$old_archive_cmds
-+old_postinstall_cmds=$old_postinstall_cmds
-+old_postuninstall_cmds=$old_postuninstall_cmds
-+
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$old_archive_from_new_cmds
-+
-+# Commands used to build and install a shared archive.
-+archive_cmds=$archive_cmds
-+archive_expsym_cmds=$archive_expsym_cmds
-+postinstall_cmds=$postinstall_cmds
-+postuninstall_cmds=$postuninstall_cmds
-+
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$deplibs_check_method
-+
-+# Command to use when deplibs_check_method == file_magic.
-+file_magic_cmd=$file_magic_cmd
-+
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$allow_undefined_flag
-+
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$no_undefined_flag
-+
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$finish_cmds
-+
-+# Same as above, but a single script fragment to be evaled but not shown.
-+finish_eval=$finish_eval
-+
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe=$global_symbol_pipe
-+
-+# Transform the output of nm in a proper C declaration
-+global_symbol_to_cdecl=$global_symbol_to_cdecl
-+
-+# This is the shared library runtime path variable.
-+runpath_var=$runpath_var
-+
-+# This is the shared library path variable.
-+shlibpath_var=$shlibpath_var
-+
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$hardcode_action
-+
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec=$hardcode_libdir_flag_spec
-+
-+# Whether we need a single -rpath flag with a separated argument.
-+hardcode_libdir_separator=$hardcode_libdir_separator
-+
-+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct=$hardcode_direct
-+
-+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L=$hardcode_minus_L
-+
-+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-+# the resulting binary.
-+hardcode_shlibpath_var=$hardcode_shlibpath_var
-+
-+# Compile-time system search path for libraries
-+sys_lib_search_path_spec=$sys_lib_search_path_spec
-+
-+# Run-time system search path for libraries
-+sys_lib_dlsearch_path_spec=$sys_lib_dlsearch_path_spec
-+
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path="$fix_srcfile_path"
-+
-+# Set to yes if exported symbols are required.
-+always_export_symbols=$always_export_symbols
-+
-+# The commands to list exported symbols.
-+export_symbols_cmds=$export_symbols_cmds
-+
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$exclude_expsyms
-+
-+# Symbols that must always be exported.
-+include_expsyms=$include_expsyms
-+
-+EOF
-+
-+case "$ltmain" in
-+*.sh)
-+  echo '### END LIBTOOL CONFIG' >> "$ofile"
-+  echo >> "$ofile"
-+  case "$host_os" in
-+  aix3*)
-+    cat <<\EOF >> "$ofile"
-+
-+# AIX sometimes has problems with the GCC collect2 program.  For some
-+# reason, if we set the COLLECT_NAMES environment variable, the problems
-+# vanish in a puff of smoke.
-+if test "X${COLLECT_NAMES+set}" != Xset; then
-+  COLLECT_NAMES=
-+  export COLLECT_NAMES
-+fi
-+EOF
-+    ;;
-+  esac
-+
-+  # Append the ltmain.sh script.
-+  sed '$q' "$ltmain" >> "$ofile" || (rm -f "$ofile"; exit 1)
-+  # We use sed instead of cat because bash on DJGPP gets confused if
-+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-+  # text mode, it properly converts lines to CR/LF.  This bash problem
-+  # is reportedly fixed, but why not run on old versions too?
-+
-+  chmod +x "$ofile"
-+  ;;
-+
-+*)
-+  # Compile the libtool program.
-+  echo "FIXME: would compile $ltmain"
-+  ;;
-+esac
-+
-+test -n "$cache_file" || exit 0
-+
-+# AC_CACHE_SAVE
-+trap '' 1 2 15
-+cat > confcache <<\EOF
-+# This file is a shell script that caches the results of configure
-+# tests run on this system so they can be shared between configure
-+# scripts and configure runs.  It is not useful on other systems.
-+# If it contains results you don't want to keep, you may remove or edit it.
-+#
-+# By default, configure uses ./config.cache as the cache file,
-+# creating it if it does not exist already.  You can give configure
-+# the --cache-file=FILE option to use a different cache file; that is
-+# what configure does when it calls configure scripts in
-+# subdirectories, so they share the cache.
-+# Giving --cache-file=/dev/null disables caching, for debugging configure.
-+# config.status only pays attention to the cache file if you give it the
-+# --recheck option to rerun configure.
-+#
-+EOF
-+# The following way of writing the cache mishandles newlines in values,
-+# but we know of no workaround that is simple, portable, and efficient.
-+# So, don't put newlines in cache variables' values.
-+# Ultrix sh set writes to stderr and can't be redirected directly,
-+# and sets the high bit in the cache file unless we assign to the vars.
-+(set) 2>&1 |
-+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-+  *ac_space=\ *)
-+    # `set' does not quote correctly, so add quotes (double-quote substitution
-+    # turns \\\\ into \\, and sed turns \\ into \).
-+    sed -n \
-+      -e "s/'/'\\\\''/g" \
-+      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-+    ;;
-+  *)
-+    # `set' quotes correctly as required by POSIX, so do not add quotes.
-+    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-+    ;;
-+  esac >> confcache
-+if cmp -s $cache_file confcache; then
-+  :
-+else
-+  if test -w $cache_file; then
-+    echo "updating cache $cache_file"
-+    cat confcache > $cache_file
-+  else
-+    echo "not updating unwritable cache $cache_file"
-+  fi
-+fi
-+rm -f confcache
-+
-+exit 0
-+
-+# Local Variables:
-+# mode:shell-script
-+# sh-indentation:2
-+# End:
---- metamail-2.7.orig/config/mkinstalldirs
-+++ metamail-2.7/config/mkinstalldirs
-@@ -0,0 +1,40 @@
-+#! /bin/sh
-+# mkinstalldirs --- make directory hierarchy
-+# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-+# Created: 1993-05-16
-+# Public domain
-+
-+# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $
-+
-+errstatus=0
-+
-+for file
-+do
-+   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-+   shift
-+
-+   pathcomp=
-+   for d
-+   do
-+     pathcomp="$pathcomp$d"
-+     case "$pathcomp" in
-+       -* ) pathcomp=./$pathcomp ;;
-+     esac
-+
-+     if test ! -d "$pathcomp"; then
-+        echo "mkdir $pathcomp"
-+
-+        mkdir "$pathcomp" || lasterr=$?
-+
-+        if test ! -d "$pathcomp"; then
-+  	  errstatus=$lasterr
-+        fi
-+     fi
-+
-+     pathcomp="$pathcomp/"
-+   done
-+done
-+
-+exit $errstatus
-+
-+# mkinstalldirs ends here
---- metamail-2.7.orig/Makefile.am
-+++ metamail-2.7/Makefile.am
-@@ -0,0 +1,14 @@
-+## Makefile.am -- Process this file with automake to produce Makefile.in
-+
-+auxdir                  = @ac_aux_dir@
-+AUX_DIST                = $(auxdir)/install-sh $(auxdir)/missing \
-+                        $(auxdir)/mkinstalldirs
-+AUX_DIST_EXTRA          = $(auxdir)/readline.m4 $(auxdir)/sys_errlist.m4 \
-+                        $(auxdir)/sys_siglist.m4
-+EXTRA_DIST              = bootstrap
-+
-+MAINTAINERCLEANFILES    = Makefile.in aclocal.m4 configure \
-+			metamail/config-h.in metamail/stamp-h.in
-+
-+SUBDIRS                 = replace metamail src bin 
-+ACLOCAL                 = aclocal -I $(auxdir)
---- metamail-2.7.orig/Makefile.in
-+++ metamail-2.7/Makefile.in
-@@ -0,0 +1,349 @@
-+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+
-+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
-+bindir = @bindir@
-+sbindir = @sbindir@
-+libexecdir = @libexecdir@
-+datadir = @datadir@
-+sysconfdir = @sysconfdir@
-+sharedstatedir = @sharedstatedir@
-+localstatedir = @localstatedir@
-+libdir = @libdir@
-+infodir = @infodir@
-+mandir = @mandir@
-+includedir = @includedir@
-+oldincludedir = /usr/include
-+
-+DESTDIR =
-+
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+
-+top_builddir = .
-+AUTOCONF = @AUTOCONF@
-+AUTOMAKE = @AUTOMAKE@
-+AUTOHEADER = @AUTOHEADER@
-+
-+INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+transform = @program_transform_name@
-+
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+host_alias = @host_alias@
-+host_triplet = @host@
-+AS = @AS@
-+CATCOMMAND = @CATCOMMAND@
-+CC = @CC@
-+DLLTOOL = @DLLTOOL@
-+ECHO = @ECHO@
-+EXEEXT = @EXEEXT@
-+LIBTOOL = @LIBTOOL@
-+LIBTOOL_DEPS = @LIBTOOL_DEPS@
-+LN_S = @LN_S@
-+LPRCOMMAND = @LPRCOMMAND@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAKEINFO = @MAKEINFO@
-+OBJDUMP = @OBJDUMP@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+RANLIB = @RANLIB@
-+STRIP = @STRIP@
-+VERSION = @VERSION@
-+ac_aux_dir = @ac_aux_dir@
-+
-+auxdir = @ac_aux_dir@
-+AUX_DIST = $(auxdir)/install-sh $(auxdir)/missing                         $(auxdir)/mkinstalldirs
-+
-+AUX_DIST_EXTRA = $(auxdir)/readline.m4 $(auxdir)/sys_errlist.m4                         $(auxdir)/sys_siglist.m4
-+
-+EXTRA_DIST = bootstrap
-+
-+MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure 			metamail/config-h.in metamail/stamp-h.in
-+
-+
-+SUBDIRS = replace metamail src bin 
-+ACLOCAL = aclocal -I $(auxdir)
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-+CONFIG_HEADER = ./metamail/config.h
-+CONFIG_CLEAN_FILES = 
-+DIST_COMMON =  README COPYING INSTALL Makefile.am Makefile.in aclocal.m4 \
-+configure configure.in
-+
-+
-+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-+
-+TAR = tar
-+GZIP_ENV = --best
-+all: all-redirect
-+.SUFFIXES:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-+	cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
-+
-+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-+	cd $(top_builddir) \
-+	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in 
-+	cd $(srcdir) && $(ACLOCAL)
-+
-+config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	$(SHELL) ./config.status --recheck
-+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-+	cd $(srcdir) && $(AUTOCONF)
-+
-+# This directory's subdirectories are mostly independent; you can cd
-+# into them and run `make' without going through this Makefile.
-+# To change the values of `make' variables: instead of editing Makefiles,
-+# (1) if the variable is set in `config.status', edit `config.status'
-+#     (which will cause the Makefiles to be regenerated when you run `make');
-+# (2) otherwise, pass the desired values on the `make' command line.
-+
-+@SET_MAKE@
-+
-+all-recursive install-data-recursive install-exec-recursive \
-+installdirs-recursive install-recursive uninstall-recursive  \
-+check-recursive installcheck-recursive info-recursive dvi-recursive:
-+	@set fnord $(MAKEFLAGS); amf=$$2; \
-+	dot_seen=no; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    dot_seen=yes; \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	done; \
-+	if test "$$dot_seen" = "no"; then \
-+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-+	fi; test -z "$$fail"
-+
-+mostlyclean-recursive clean-recursive distclean-recursive \
-+maintainer-clean-recursive:
-+	@set fnord $(MAKEFLAGS); amf=$$2; \
-+	dot_seen=no; \
-+	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  rev="$$subdir $$rev"; \
-+	  test "$$subdir" != "." || dot_seen=yes; \
-+	done; \
-+	test "$$dot_seen" = "no" && rev=". $$rev"; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	for subdir in $$rev; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	done && test -z "$$fail"
-+tags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-+	done
-+
-+tags: TAGS
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP)
-+	list='$(SOURCES) $(HEADERS)'; \
-+	unique=`for i in $$list; do echo $$i; done | \
-+	  awk '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	here=`pwd` && cd $(srcdir) \
-+	  && mkid -f$$here/ID $$unique $(LISP)
-+
-+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+   if test "$$subdir" = .; then :; else \
-+	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-+   fi; \
-+	done; \
-+	list='$(SOURCES) $(HEADERS)'; \
-+	unique=`for i in $$list; do echo $$i; done | \
-+	  awk '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-+	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
-+
-+mostlyclean-tags:
-+
-+clean-tags:
-+
-+distclean-tags:
-+	-rm -f TAGS ID
-+
-+maintainer-clean-tags:
-+
-+distdir = $(PACKAGE)-$(VERSION)
-+top_distdir = $(distdir)
-+
-+# This target untars the dist file and tries a VPATH configuration.  Then
-+# it guarantees that the distribution is self-contained by making another
-+# tarfile.
-+distcheck: dist
-+	-rm -rf $(distdir)
-+	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-+	mkdir $(distdir)/=build
-+	mkdir $(distdir)/=inst
-+	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-+	cd $(distdir)/=build \
-+	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-+	  && $(MAKE) $(AM_MAKEFLAGS) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-+	  && $(MAKE) $(AM_MAKEFLAGS) check \
-+	  && $(MAKE) $(AM_MAKEFLAGS) install \
-+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-+	  && $(MAKE) $(AM_MAKEFLAGS) dist
-+	-rm -rf $(distdir)
-+	@banner="$(distdir).tar.gz is ready for distribution"; \
-+	dashes=`echo "$$banner" | sed s/./=/g`; \
-+	echo "$$dashes"; \
-+	echo "$$banner"; \
-+	echo "$$dashes"
-+dist: distdir
-+	-chmod -R a+r $(distdir)
-+	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-+	-rm -rf $(distdir)
-+dist-all: distdir
-+	-chmod -R a+r $(distdir)
-+	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-+	-rm -rf $(distdir)
-+distdir: $(DISTFILES)
-+	-rm -rf $(distdir)
-+	mkdir $(distdir)
-+	-chmod 777 $(distdir)
-+	here=`cd $(top_builddir) && pwd`; \
-+	top_distdir=`cd $(distdir) && pwd`; \
-+	distdir=`cd $(distdir) && pwd`; \
-+	cd $(top_srcdir) \
-+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile
-+	@for file in $(DISTFILES); do \
-+	  d=$(srcdir); \
-+	  if test -d $$d/$$file; then \
-+	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	  fi; \
-+	done
-+	for subdir in $(SUBDIRS); do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test -d $(distdir)/$$subdir \
-+	    || mkdir $(distdir)/$$subdir \
-+	    || exit 1; \
-+	    chmod 777 $(distdir)/$$subdir; \
-+	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
-+	      || exit 1; \
-+	  fi; \
-+	done
-+info-am:
-+info: info-recursive
-+dvi-am:
-+dvi: dvi-recursive
-+check-am: all-am
-+check: check-recursive
-+installcheck-am:
-+installcheck: installcheck-recursive
-+install-exec-am:
-+install-exec: install-exec-recursive
-+
-+install-data-am:
-+install-data: install-data-recursive
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+install: install-recursive
-+uninstall-am:
-+uninstall: uninstall-recursive
-+all-am: Makefile
-+all-redirect: all-recursive
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-+installdirs: installdirs-recursive
-+installdirs-am:
-+
-+
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+
-+maintainer-clean-generic:
-+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-+mostlyclean-am:  mostlyclean-tags mostlyclean-generic
-+
-+mostlyclean: mostlyclean-recursive
-+
-+clean-am:  clean-tags clean-generic mostlyclean-am
-+
-+clean: clean-recursive
-+
-+distclean-am:  distclean-tags distclean-generic clean-am
-+	-rm -f libtool
-+
-+distclean: distclean-recursive
-+	-rm -f config.status
-+
-+maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-+		distclean-am
-+	@echo "This command is intended for maintainers to use;"
-+	@echo "it deletes files that may require special tools to rebuild."
-+
-+maintainer-clean: maintainer-clean-recursive
-+	-rm -f config.status
-+
-+.PHONY: install-data-recursive uninstall-data-recursive \
-+install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-+uninstalldirs-recursive all-recursive check-recursive \
-+installcheck-recursive info-recursive dvi-recursive \
-+mostlyclean-recursive distclean-recursive clean-recursive \
-+maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-+distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-+install-exec install-data-am install-data install-am install \
-+uninstall-am uninstall all-redirect all-am all installdirs-am \
-+installdirs mostlyclean-generic distclean-generic clean-generic \
-+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-+
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
---- metamail-2.7.orig/stamp-h.in
-+++ metamail-2.7/stamp-h.in
-@@ -0,0 +1 @@
-+timestamp
---- metamail-2.7.orig/INSTALL
-+++ metamail-2.7/INSTALL
-@@ -0,0 +1,182 @@
-+Basic Installation
-+==================
-+
-+   These are generic installation instructions.
-+
-+   The `configure' shell script attempts to guess correct values for
-+various system-dependent variables used during compilation.  It uses
-+those values to create a `Makefile' in each directory of the package.
-+It may also create one or more `.h' files containing system-dependent
-+definitions.  Finally, it creates a shell script `config.status' that
-+you can run in the future to recreate the current configuration, a file
-+`config.cache' that saves the results of its tests to speed up
-+reconfiguring, and a file `config.log' containing compiler output
-+(useful mainly for debugging `configure').
-+
-+   If you need to do unusual things to compile the package, please try
-+to figure out how `configure' could check whether to do them, and mail
-+diffs or instructions to the address given in the `README' so they can
-+be considered for the next release.  If at some point `config.cache'
-+contains results you don't want to keep, you may remove or edit it.
-+
-+   The file `configure.in' is used to create `configure' by a program
-+called `autoconf'.  You only need `configure.in' if you want to change
-+it or regenerate `configure' using a newer version of `autoconf'.
-+
-+The simplest way to compile this package is:
-+
-+  1. `cd' to the directory containing the package's source code and type
-+     `./configure' to configure the package for your system.  If you're
-+     using `csh' on an old version of System V, you might need to type
-+     `sh ./configure' instead to prevent `csh' from trying to execute
-+     `configure' itself.
-+
-+     Running `configure' takes awhile.  While running, it prints some
-+     messages telling which features it is checking for.
-+
-+  2. Type `make' to compile the package.
-+
-+  3. Optionally, type `make check' to run any self-tests that come with
-+     the package.
-+
-+  4. Type `make install' to install the programs and any data files and
-+     documentation.
-+
-+  5. You can remove the program binaries and object files from the
-+     source code directory by typing `make clean'.  To also remove the
-+     files that `configure' created (so you can compile the package for
-+     a different kind of computer), type `make distclean'.  There is
-+     also a `make maintainer-clean' target, but that is intended mainly
-+     for the package's developers.  If you use it, you may have to get
-+     all sorts of other programs in order to regenerate files that came
-+     with the distribution.
-+
-+Compilers and Options
-+=====================
-+
-+   Some systems require unusual options for compilation or linking that
-+the `configure' script does not know about.  You can give `configure'
-+initial values for variables by setting them in the environment.  Using
-+a Bourne-compatible shell, you can do that on the command line like
-+this:
-+     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
-+
-+Or on systems that have the `env' program, you can do it like this:
-+     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
-+
-+Compiling For Multiple Architectures
-+====================================
-+
-+   You can compile the package for more than one kind of computer at the
-+same time, by placing the object files for each architecture in their
-+own directory.  To do this, you must use a version of `make' that
-+supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-+directory where you want the object files and executables to go and run
-+the `configure' script.  `configure' automatically checks for the
-+source code in the directory that `configure' is in and in `..'.
-+
-+   If you have to use a `make' that does not supports the `VPATH'
-+variable, you have to compile the package for one architecture at a time
-+in the source code directory.  After you have installed the package for
-+one architecture, use `make distclean' before reconfiguring for another
-+architecture.
-+
-+Installation Names
-+==================
-+
-+   By default, `make install' will install the package's files in
-+`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-+installation prefix other than `/usr/local' by giving `configure' the
-+option `--prefix=PATH'.
-+
-+   You can specify separate installation prefixes for
-+architecture-specific files and architecture-independent files.  If you
-+give `configure' the option `--exec-prefix=PATH', the package will use
-+PATH as the prefix for installing programs and libraries.
-+Documentation and other data files will still use the regular prefix.
-+
-+   In addition, if you use an unusual directory layout you can give
-+options like `--bindir=PATH' to specify different values for particular
-+kinds of files.  Run `configure --help' for a list of the directories
-+you can set and what kinds of files go in them.
-+
-+   If the package supports it, you can cause programs to be installed
-+with an extra prefix or suffix on their names by giving `configure' the
-+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-+
-+Optional Features
-+=================
-+
-+   Some packages pay attention to `--enable-FEATURE' options to
-+`configure', where FEATURE indicates an optional part of the package.
-+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-+is something like `gnu-as' or `x' (for the X Window System).  The
-+`README' should mention any `--enable-' and `--with-' options that the
-+package recognizes.
-+
-+   For packages that use the X Window System, `configure' can usually
-+find the X include and library files automatically, but if it doesn't,
-+you can use the `configure' options `--x-includes=DIR' and
-+`--x-libraries=DIR' to specify their locations.
-+
-+Specifying the System Type
-+==========================
-+
-+   There may be some features `configure' can not figure out
-+automatically, but needs to determine by the type of host the package
-+will run on.  Usually `configure' can figure that out, but if it prints
-+a message saying it can not guess the host type, give it the
-+`--host=TYPE' option.  TYPE can either be a short name for the system
-+type, such as `sun4', or a canonical name with three fields:
-+     CPU-COMPANY-SYSTEM
-+
-+See the file `config.sub' for the possible values of each field.  If
-+`config.sub' isn't included in this package, then this package doesn't
-+need to know the host type.
-+
-+   If you are building compiler tools for cross-compiling, you can also
-+use the `--target=TYPE' option to select the type of system they will
-+produce code for and the `--build=TYPE' option to select the type of
-+system on which you are compiling the package.
-+
-+Sharing Defaults
-+================
-+
-+   If you want to set default values for `configure' scripts to share,
-+you can create a site shell script called `config.site' that gives
-+default values for variables like `CC', `cache_file', and `prefix'.
-+`configure' looks for `PREFIX/share/config.site' if it exists, then
-+`PREFIX/etc/config.site' if it exists.  Or, you can set the
-+`CONFIG_SITE' environment variable to the location of the site script.
-+A warning: not all `configure' scripts look for a site script.
-+
-+Operation Controls
-+==================
-+
-+   `configure' recognizes the following options to control how it
-+operates.
-+
-+`--cache-file=FILE'
-+     Use and save the results of the tests in FILE instead of
-+     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
-+     debugging `configure'.
-+
-+`--help'
-+     Print a summary of the options to `configure', and exit.
-+
-+`--quiet'
-+`--silent'
-+`-q'
-+     Do not print messages saying which checks are being made.  To
-+     suppress all normal output, redirect it to `/dev/null' (any error
-+     messages will still be shown).
-+
-+`--srcdir=DIR'
-+     Look for the package's source code in directory DIR.  Usually
-+     `configure' can determine that directory automatically.
-+
-+`--version'
-+     Print the version of Autoconf used to generate the `configure'
-+     script, and exit.
-+
-+`configure' also accepts some other, not widely useful, options.
---- metamail-2.7.orig/COPYING
-+++ metamail-2.7/COPYING
-@@ -0,0 +1,340 @@
-+		    GNU GENERAL PUBLIC LICENSE
-+		       Version 2, June 1991
-+
-+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ Everyone is permitted to copy and distribute verbatim copies
-+ of this license document, but changing it is not allowed.
-+
-+			    Preamble
-+
-+  The licenses for most software are designed to take away your
-+freedom to share and change it.  By contrast, the GNU General Public
-+License is intended to guarantee your freedom to share and change free
-+software--to make sure the software is free for all its users.  This
-+General Public License applies to most of the Free Software
-+Foundation's software and to any other program whose authors commit to
-+using it.  (Some other Free Software Foundation software is covered by
-+the GNU Library General Public License instead.)  You can apply it to
-+your programs, too.
-+
-+  When we speak of free software, we are referring to freedom, not
-+price.  Our General Public Licenses are designed to make sure that you
-+have the freedom to distribute copies of free software (and charge for
-+this service if you wish), that you receive source code or can get it
-+if you want it, that you can change the software or use pieces of it
-+in new free programs; and that you know you can do these things.
-+
-+  To protect your rights, we need to make restrictions that forbid
-+anyone to deny you these rights or to ask you to surrender the rights.
-+These restrictions translate to certain responsibilities for you if you
-+distribute copies of the software, or if you modify it.
-+
-+  For example, if you distribute copies of such a program, whether
-+gratis or for a fee, you must give the recipients all the rights that
-+you have.  You must make sure that they, too, receive or can get the
-+source code.  And you must show them these terms so they know their
-+rights.
-+
-+  We protect your rights with two steps: (1) copyright the software, and
-+(2) offer you this license which gives you legal permission to copy,
-+distribute and/or modify the software.
-+
-+  Also, for each author's protection and ours, we want to make certain
-+that everyone understands that there is no warranty for this free
-+software.  If the software is modified by someone else and passed on, we
-+want its recipients to know that what they have is not the original, so
-+that any problems introduced by others will not reflect on the original
-+authors' reputations.
-+
-+  Finally, any free program is threatened constantly by software
-+patents.  We wish to avoid the danger that redistributors of a free
-+program will individually obtain patent licenses, in effect making the
-+program proprietary.  To prevent this, we have made it clear that any
-+patent must be licensed for everyone's free use or not licensed at all.
-+
-+  The precise terms and conditions for copying, distribution and
-+modification follow.
-+
-+		    GNU GENERAL PUBLIC LICENSE
-+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-+
-+  0. This License applies to any program or other work which contains
-+a notice placed by the copyright holder saying it may be distributed
-+under the terms of this General Public License.  The "Program", below,
-+refers to any such program or work, and a "work based on the Program"
-+means either the Program or any derivative work under copyright law:
-+that is to say, a work containing the Program or a portion of it,
-+either verbatim or with modifications and/or translated into another
-+language.  (Hereinafter, translation is included without limitation in
-+the term "modification".)  Each licensee is addressed as "you".
-+
-+Activities other than copying, distribution and modification are not
-+covered by this License; they are outside its scope.  The act of
-+running the Program is not restricted, and the output from the Program
-+is covered only if its contents constitute a work based on the
-+Program (independent of having been made by running the Program).
-+Whether that is true depends on what the Program does.
-+
-+  1. You may copy and distribute verbatim copies of the Program's
-+source code as you receive it, in any medium, provided that you
-+conspicuously and appropriately publish on each copy an appropriate
-+copyright notice and disclaimer of warranty; keep intact all the
-+notices that refer to this License and to the absence of any warranty;
-+and give any other recipients of the Program a copy of this License
-+along with the Program.
-+
-+You may charge a fee for the physical act of transferring a copy, and
-+you may at your option offer warranty protection in exchange for a fee.
-+
-+  2. You may modify your copy or copies of the Program or any portion
-+of it, thus forming a work based on the Program, and copy and
-+distribute such modifications or work under the terms of Section 1
-+above, provided that you also meet all of these conditions:
-+
-+    a) You must cause the modified files to carry prominent notices
-+    stating that you changed the files and the date of any change.
-+
-+    b) You must cause any work that you distribute or publish, that in
-+    whole or in part contains or is derived from the Program or any
-+    part thereof, to be licensed as a whole at no charge to all third
-+    parties under the terms of this License.
-+
-+    c) If the modified program normally reads commands interactively
-+    when run, you must cause it, when started running for such
-+    interactive use in the most ordinary way, to print or display an
-+    announcement including an appropriate copyright notice and a
-+    notice that there is no warranty (or else, saying that you provide
-+    a warranty) and that users may redistribute the program under
-+    these conditions, and telling the user how to view a copy of this
-+    License.  (Exception: if the Program itself is interactive but
-+    does not normally print such an announcement, your work based on
-+    the Program is not required to print an announcement.)
-+
-+These requirements apply to the modified work as a whole.  If
-+identifiable sections of that work are not derived from the Program,
-+and can be reasonably considered independent and separate works in
-+themselves, then this License, and its terms, do not apply to those
-+sections when you distribute them as separate works.  But when you
-+distribute the same sections as part of a whole which is a work based
-+on the Program, the distribution of the whole must be on the terms of
-+this License, whose permissions for other licensees extend to the
-+entire whole, and thus to each and every part regardless of who wrote it.
-+
-+Thus, it is not the intent of this section to claim rights or contest
-+your rights to work written entirely by you; rather, the intent is to
-+exercise the right to control the distribution of derivative or
-+collective works based on the Program.
-+
-+In addition, mere aggregation of another work not based on the Program
-+with the Program (or with a work based on the Program) on a volume of
-+a storage or distribution medium does not bring the other work under
-+the scope of this License.
-+
-+  3. You may copy and distribute the Program (or a work based on it,
-+under Section 2) in object code or executable form under the terms of
-+Sections 1 and 2 above provided that you also do one of the following:
-+
-+    a) Accompany it with the complete corresponding machine-readable
-+    source code, which must be distributed under the terms of Sections
-+    1 and 2 above on a medium customarily used for software interchange; or,
-+
-+    b) Accompany it with a written offer, valid for at least three
-+    years, to give any third party, for a charge no more than your
-+    cost of physically performing source distribution, a complete
-+    machine-readable copy of the corresponding source code, to be
-+    distributed under the terms of Sections 1 and 2 above on a medium
-+    customarily used for software interchange; or,
-+
-+    c) Accompany it with the information you received as to the offer
-+    to distribute corresponding source code.  (This alternative is
-+    allowed only for noncommercial distribution and only if you
-+    received the program in object code or executable form with such
-+    an offer, in accord with Subsection b above.)
-+
-+The source code for a work means the preferred form of the work for
-+making modifications to it.  For an executable work, complete source
-+code means all the source code for all modules it contains, plus any
-+associated interface definition files, plus the scripts used to
-+control compilation and installation of the executable.  However, as a
-+special exception, the source code distributed need not include
-+anything that is normally distributed (in either source or binary
-+form) with the major components (compiler, kernel, and so on) of the
-+operating system on which the executable runs, unless that component
-+itself accompanies the executable.
-+
-+If distribution of executable or object code is made by offering
-+access to copy from a designated place, then offering equivalent
-+access to copy the source code from the same place counts as
-+distribution of the source code, even though third parties are not
-+compelled to copy the source along with the object code.
-+
-+  4. You may not copy, modify, sublicense, or distribute the Program
-+except as expressly provided under this License.  Any attempt
-+otherwise to copy, modify, sublicense or distribute the Program is
-+void, and will automatically terminate your rights under this License.
-+However, parties who have received copies, or rights, from you under
-+this License will not have their licenses terminated so long as such
-+parties remain in full compliance.
-+
-+  5. You are not required to accept this License, since you have not
-+signed it.  However, nothing else grants you permission to modify or
-+distribute the Program or its derivative works.  These actions are
-+prohibited by law if you do not accept this License.  Therefore, by
-+modifying or distributing the Program (or any work based on the
-+Program), you indicate your acceptance of this License to do so, and
-+all its terms and conditions for copying, distributing or modifying
-+the Program or works based on it.
-+
-+  6. Each time you redistribute the Program (or any work based on the
-+Program), the recipient automatically receives a license from the
-+original licensor to copy, distribute or modify the Program subject to
-+these terms and conditions.  You may not impose any further
-+restrictions on the recipients' exercise of the rights granted herein.
-+You are not responsible for enforcing compliance by third parties to
-+this License.
-+
-+  7. If, as a consequence of a court judgment or allegation of patent
-+infringement or for any other reason (not limited to patent issues),
-+conditions are imposed on you (whether by court order, agreement or
-+otherwise) that contradict the conditions of this License, they do not
-+excuse you from the conditions of this License.  If you cannot
-+distribute so as to satisfy simultaneously your obligations under this
-+License and any other pertinent obligations, then as a consequence you
-+may not distribute the Program at all.  For example, if a patent
-+license would not permit royalty-free redistribution of the Program by
-+all those who receive copies directly or indirectly through you, then
-+the only way you could satisfy both it and this License would be to
-+refrain entirely from distribution of the Program.
-+
-+If any portion of this section is held invalid or unenforceable under
-+any particular circumstance, the balance of the section is intended to
-+apply and the section as a whole is intended to apply in other
-+circumstances.
-+
-+It is not the purpose of this section to induce you to infringe any
-+patents or other property right claims or to contest validity of any
-+such claims; this section has the sole purpose of protecting the
-+integrity of the free software distribution system, which is
-+implemented by public license practices.  Many people have made
-+generous contributions to the wide range of software distributed
-+through that system in reliance on consistent application of that
-+system; it is up to the author/donor to decide if he or she is willing
-+to distribute software through any other system and a licensee cannot
-+impose that choice.
-+
-+This section is intended to make thoroughly clear what is believed to
-+be a consequence of the rest of this License.
-+
-+  8. If the distribution and/or use of the Program is restricted in
-+certain countries either by patents or by copyrighted interfaces, the
-+original copyright holder who places the Program under this License
-+may add an explicit geographical distribution limitation excluding
-+those countries, so that distribution is permitted only in or among
-+countries not thus excluded.  In such case, this License incorporates
-+the limitation as if written in the body of this License.
-+
-+  9. The Free Software Foundation may publish revised and/or new versions
-+of the General Public License from time to time.  Such new versions will
-+be similar in spirit to the present version, but may differ in detail to
-+address new problems or concerns.
-+
-+Each version is given a distinguishing version number.  If the Program
-+specifies a version number of this License which applies to it and "any
-+later version", you have the option of following the terms and conditions
-+either of that version or of any later version published by the Free
-+Software Foundation.  If the Program does not specify a version number of
-+this License, you may choose any version ever published by the Free Software
-+Foundation.
-+
-+  10. If you wish to incorporate parts of the Program into other free
-+programs whose distribution conditions are different, write to the author
-+to ask for permission.  For software which is copyrighted by the Free
-+Software Foundation, write to the Free Software Foundation; we sometimes
-+make exceptions for this.  Our decision will be guided by the two goals
-+of preserving the free status of all derivatives of our free software and
-+of promoting the sharing and reuse of software generally.
-+
-+			    NO WARRANTY
-+
-+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-+REPAIR OR CORRECTION.
-+
-+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-+POSSIBILITY OF SUCH DAMAGES.
-+
-+		     END OF TERMS AND CONDITIONS
-+
-+	    How to Apply These Terms to Your New Programs
-+
-+  If you develop a new program, and you want it to be of the greatest
-+possible use to the public, the best way to achieve this is to make it
-+free software which everyone can redistribute and change under these terms.
-+
-+  To do so, attach the following notices to the program.  It is safest
-+to attach them to the start of each source file to most effectively
-+convey the exclusion of warranty; and each file should have at least
-+the "copyright" line and a pointer to where the full notice is found.
-+
-+    <one line to give the program's name and a brief idea of what it does.>
-+    Copyright (C) <year>  <name of author>
-+
-+    This program is free software; you can redistribute it and/or modify
-+    it under the terms of the GNU General Public License as published by
-+    the Free Software Foundation; either version 2 of the License, or
-+    (at your option) any later version.
-+
-+    This program is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+    GNU General Public License for more details.
-+
-+    You should have received a copy of the GNU General Public License
-+    along with this program; if not, write to the Free Software
-+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+
-+
-+Also add information on how to contact you by electronic and paper mail.
-+
-+If the program is interactive, make it output a short notice like this
-+when it starts in an interactive mode:
-+
-+    Gnomovision version 69, Copyright (C) year  name of author
-+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-+    This is free software, and you are welcome to redistribute it
-+    under certain conditions; type `show c' for details.
-+
-+The hypothetical commands `show w' and `show c' should show the appropriate
-+parts of the General Public License.  Of course, the commands you use may
-+be called something other than `show w' and `show c'; they could even be
-+mouse-clicks or menu items--whatever suits your program.
-+
-+You should also get your employer (if you work as a programmer) or your
-+school, if any, to sign a "copyright disclaimer" for the program, if
-+necessary.  Here is a sample; alter the names:
-+
-+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-+
-+  <signature of Ty Coon>, 1 April 1989
-+  Ty Coon, President of Vice
-+
-+This General Public License does not permit incorporating your program into
-+proprietary programs.  If your program is a subroutine library, you may
-+consider it more useful to permit linking proprietary applications with the
-+library.  If this is what you want to do, use the GNU Library General
-+Public License instead of this License.
---- metamail-2.7.orig/bootstrap
-+++ metamail-2.7/bootstrap
-@@ -0,0 +1,9 @@
-+#! /bin/sh
-+
-+set -x
-+
-+aclocal -I config
-+libtoolize --force --copy
-+autoheader
-+automake --foreign --add-missing --copy
-+autoconf
diff --git a/source/n/metamail/metamail_2.7-54.diff b/source/n/metamail/metamail_2.7-54.diff
new file mode 100644
index 00000000..a8e1f980
--- /dev/null
+++ b/source/n/metamail/metamail_2.7-54.diff
@@ -0,0 +1,43055 @@
+--- metamail-2.7.orig/INSTALL
++++ metamail-2.7/INSTALL
+@@ -0,0 +1,182 @@
++Basic Installation
++==================
++
++   These are generic installation instructions.
++
++   The `configure' shell script attempts to guess correct values for
++various system-dependent variables used during compilation.  It uses
++those values to create a `Makefile' in each directory of the package.
++It may also create one or more `.h' files containing system-dependent
++definitions.  Finally, it creates a shell script `config.status' that
++you can run in the future to recreate the current configuration, a file
++`config.cache' that saves the results of its tests to speed up
++reconfiguring, and a file `config.log' containing compiler output
++(useful mainly for debugging `configure').
++
++   If you need to do unusual things to compile the package, please try
++to figure out how `configure' could check whether to do them, and mail
++diffs or instructions to the address given in the `README' so they can
++be considered for the next release.  If at some point `config.cache'
++contains results you don't want to keep, you may remove or edit it.
++
++   The file `configure.in' is used to create `configure' by a program
++called `autoconf'.  You only need `configure.in' if you want to change
++it or regenerate `configure' using a newer version of `autoconf'.
++
++The simplest way to compile this package is:
++
++  1. `cd' to the directory containing the package's source code and type
++     `./configure' to configure the package for your system.  If you're
++     using `csh' on an old version of System V, you might need to type
++     `sh ./configure' instead to prevent `csh' from trying to execute
++     `configure' itself.
++
++     Running `configure' takes awhile.  While running, it prints some
++     messages telling which features it is checking for.
++
++  2. Type `make' to compile the package.
++
++  3. Optionally, type `make check' to run any self-tests that come with
++     the package.
++
++  4. Type `make install' to install the programs and any data files and
++     documentation.
++
++  5. You can remove the program binaries and object files from the
++     source code directory by typing `make clean'.  To also remove the
++     files that `configure' created (so you can compile the package for
++     a different kind of computer), type `make distclean'.  There is
++     also a `make maintainer-clean' target, but that is intended mainly
++     for the package's developers.  If you use it, you may have to get
++     all sorts of other programs in order to regenerate files that came
++     with the distribution.
++
++Compilers and Options
++=====================
++
++   Some systems require unusual options for compilation or linking that
++the `configure' script does not know about.  You can give `configure'
++initial values for variables by setting them in the environment.  Using
++a Bourne-compatible shell, you can do that on the command line like
++this:
++     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
++
++Or on systems that have the `env' program, you can do it like this:
++     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
++
++Compiling For Multiple Architectures
++====================================
++
++   You can compile the package for more than one kind of computer at the
++same time, by placing the object files for each architecture in their
++own directory.  To do this, you must use a version of `make' that
++supports the `VPATH' variable, such as GNU `make'.  `cd' to the
++directory where you want the object files and executables to go and run
++the `configure' script.  `configure' automatically checks for the
++source code in the directory that `configure' is in and in `..'.
++
++   If you have to use a `make' that does not supports the `VPATH'
++variable, you have to compile the package for one architecture at a time
++in the source code directory.  After you have installed the package for
++one architecture, use `make distclean' before reconfiguring for another
++architecture.
++
++Installation Names
++==================
++
++   By default, `make install' will install the package's files in
++`/usr/local/bin', `/usr/local/man', etc.  You can specify an
++installation prefix other than `/usr/local' by giving `configure' the
++option `--prefix=PATH'.
++
++   You can specify separate installation prefixes for
++architecture-specific files and architecture-independent files.  If you
++give `configure' the option `--exec-prefix=PATH', the package will use
++PATH as the prefix for installing programs and libraries.
++Documentation and other data files will still use the regular prefix.
++
++   In addition, if you use an unusual directory layout you can give
++options like `--bindir=PATH' to specify different values for particular
++kinds of files.  Run `configure --help' for a list of the directories
++you can set and what kinds of files go in them.
++
++   If the package supports it, you can cause programs to be installed
++with an extra prefix or suffix on their names by giving `configure' the
++option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
++
++Optional Features
++=================
++
++   Some packages pay attention to `--enable-FEATURE' options to
++`configure', where FEATURE indicates an optional part of the package.
++They may also pay attention to `--with-PACKAGE' options, where PACKAGE
++is something like `gnu-as' or `x' (for the X Window System).  The
++`README' should mention any `--enable-' and `--with-' options that the
++package recognizes.
++
++   For packages that use the X Window System, `configure' can usually
++find the X include and library files automatically, but if it doesn't,
++you can use the `configure' options `--x-includes=DIR' and
++`--x-libraries=DIR' to specify their locations.
++
++Specifying the System Type
++==========================
++
++   There may be some features `configure' can not figure out
++automatically, but needs to determine by the type of host the package
++will run on.  Usually `configure' can figure that out, but if it prints
++a message saying it can not guess the host type, give it the
++`--host=TYPE' option.  TYPE can either be a short name for the system
++type, such as `sun4', or a canonical name with three fields:
++     CPU-COMPANY-SYSTEM
++
++See the file `config.sub' for the possible values of each field.  If
++`config.sub' isn't included in this package, then this package doesn't
++need to know the host type.
++
++   If you are building compiler tools for cross-compiling, you can also
++use the `--target=TYPE' option to select the type of system they will
++produce code for and the `--build=TYPE' option to select the type of
++system on which you are compiling the package.
++
++Sharing Defaults
++================
++
++   If you want to set default values for `configure' scripts to share,
++you can create a site shell script called `config.site' that gives
++default values for variables like `CC', `cache_file', and `prefix'.
++`configure' looks for `PREFIX/share/config.site' if it exists, then
++`PREFIX/etc/config.site' if it exists.  Or, you can set the
++`CONFIG_SITE' environment variable to the location of the site script.
++A warning: not all `configure' scripts look for a site script.
++
++Operation Controls
++==================
++
++   `configure' recognizes the following options to control how it
++operates.
++
++`--cache-file=FILE'
++     Use and save the results of the tests in FILE instead of
++     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
++     debugging `configure'.
++
++`--help'
++     Print a summary of the options to `configure', and exit.
++
++`--quiet'
++`--silent'
++`-q'
++     Do not print messages saying which checks are being made.  To
++     suppress all normal output, redirect it to `/dev/null' (any error
++     messages will still be shown).
++
++`--srcdir=DIR'
++     Look for the package's source code in directory DIR.  Usually
++     `configure' can determine that directory automatically.
++
++`--version'
++     Print the version of Autoconf used to generate the `configure'
++     script, and exit.
++
++`configure' also accepts some other, not widely useful, options.
+--- metamail-2.7.orig/Makefile.am
++++ metamail-2.7/Makefile.am
+@@ -0,0 +1,14 @@
++## Makefile.am -- Process this file with automake to produce Makefile.in
++
++auxdir                  = @ac_aux_dir@
++AUX_DIST                = $(auxdir)/install-sh $(auxdir)/missing \
++                        $(auxdir)/mkinstalldirs
++AUX_DIST_EXTRA          = $(auxdir)/readline.m4 $(auxdir)/sys_errlist.m4 \
++                        $(auxdir)/sys_siglist.m4
++EXTRA_DIST              = bootstrap
++
++MAINTAINERCLEANFILES    = Makefile.in aclocal.m4 configure \
++			metamail/config-h.in metamail/stamp-h.in
++
++SUBDIRS                 = replace metamail src bin 
++ACLOCAL                 = aclocal -I $(auxdir)
+--- metamail-2.7.orig/Makefile.in
++++ metamail-2.7/Makefile.in
+@@ -0,0 +1,349 @@
++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
++
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++
++SHELL = @SHELL@
++
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
++
++DESTDIR =
++
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++
++top_builddir = .
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
++INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++transform = @program_transform_name@
++
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++host_alias = @host_alias@
++host_triplet = @host@
++AS = @AS@
++CATCOMMAND = @CATCOMMAND@
++CC = @CC@
++DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
++EXEEXT = @EXEEXT@
++LIBTOOL = @LIBTOOL@
++LIBTOOL_DEPS = @LIBTOOL_DEPS@
++LN_S = @LN_S@
++LPRCOMMAND = @LPRCOMMAND@
++LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAKEINFO = @MAKEINFO@
++OBJDUMP = @OBJDUMP@
++OBJEXT = @OBJEXT@
++PACKAGE = @PACKAGE@
++RANLIB = @RANLIB@
++STRIP = @STRIP@
++VERSION = @VERSION@
++ac_aux_dir = @ac_aux_dir@
++
++auxdir = @ac_aux_dir@
++AUX_DIST = $(auxdir)/install-sh $(auxdir)/missing                         $(auxdir)/mkinstalldirs
++
++AUX_DIST_EXTRA = $(auxdir)/readline.m4 $(auxdir)/sys_errlist.m4                         $(auxdir)/sys_siglist.m4
++
++EXTRA_DIST = bootstrap
++
++MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure 			metamail/config-h.in metamail/stamp-h.in
++
++
++SUBDIRS = replace metamail src bin 
++ACLOCAL = aclocal -I $(auxdir)
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
++CONFIG_HEADER = ./metamail/config.h
++CONFIG_CLEAN_FILES = 
++DIST_COMMON =  README COPYING INSTALL Makefile.am Makefile.in aclocal.m4 \
++configure configure.in
++
++
++DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
++
++TAR = tar
++GZIP_ENV = --best
++all: all-redirect
++.SUFFIXES:
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
++	cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
++
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
++	cd $(top_builddir) \
++	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
++
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in 
++	cd $(srcdir) && $(ACLOCAL)
++
++config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	$(SHELL) ./config.status --recheck
++$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
++	cd $(srcdir) && $(AUTOCONF)
++
++# This directory's subdirectories are mostly independent; you can cd
++# into them and run `make' without going through this Makefile.
++# To change the values of `make' variables: instead of editing Makefiles,
++# (1) if the variable is set in `config.status', edit `config.status'
++#     (which will cause the Makefiles to be regenerated when you run `make');
++# (2) otherwise, pass the desired values on the `make' command line.
++
++@SET_MAKE@
++
++all-recursive install-data-recursive install-exec-recursive \
++installdirs-recursive install-recursive uninstall-recursive  \
++check-recursive installcheck-recursive info-recursive dvi-recursive:
++	@set fnord $(MAKEFLAGS); amf=$$2; \
++	dot_seen=no; \
++	target=`echo $@ | sed s/-recursive//`; \
++	list='$(SUBDIRS)'; for subdir in $$list; do \
++	  echo "Making $$target in $$subdir"; \
++	  if test "$$subdir" = "."; then \
++	    dot_seen=yes; \
++	    local_target="$$target-am"; \
++	  else \
++	    local_target="$$target"; \
++	  fi; \
++	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
++	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	done; \
++	if test "$$dot_seen" = "no"; then \
++	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
++	fi; test -z "$$fail"
++
++mostlyclean-recursive clean-recursive distclean-recursive \
++maintainer-clean-recursive:
++	@set fnord $(MAKEFLAGS); amf=$$2; \
++	dot_seen=no; \
++	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
++	  rev="$$subdir $$rev"; \
++	  test "$$subdir" != "." || dot_seen=yes; \
++	done; \
++	test "$$dot_seen" = "no" && rev=". $$rev"; \
++	target=`echo $@ | sed s/-recursive//`; \
++	for subdir in $$rev; do \
++	  echo "Making $$target in $$subdir"; \
++	  if test "$$subdir" = "."; then \
++	    local_target="$$target-am"; \
++	  else \
++	    local_target="$$target"; \
++	  fi; \
++	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
++	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	done && test -z "$$fail"
++tags-recursive:
++	list='$(SUBDIRS)'; for subdir in $$list; do \
++	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
++	done
++
++tags: TAGS
++
++ID: $(HEADERS) $(SOURCES) $(LISP)
++	list='$(SOURCES) $(HEADERS)'; \
++	unique=`for i in $$list; do echo $$i; done | \
++	  awk '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	here=`pwd` && cd $(srcdir) \
++	  && mkid -f$$here/ID $$unique $(LISP)
++
++TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
++	tags=; \
++	here=`pwd`; \
++	list='$(SUBDIRS)'; for subdir in $$list; do \
++   if test "$$subdir" = .; then :; else \
++	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
++   fi; \
++	done; \
++	list='$(SOURCES) $(HEADERS)'; \
++	unique=`for i in $$list; do echo $$i; done | \
++	  awk '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
++	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
++
++mostlyclean-tags:
++
++clean-tags:
++
++distclean-tags:
++	-rm -f TAGS ID
++
++maintainer-clean-tags:
++
++distdir = $(PACKAGE)-$(VERSION)
++top_distdir = $(distdir)
++
++# This target untars the dist file and tries a VPATH configuration.  Then
++# it guarantees that the distribution is self-contained by making another
++# tarfile.
++distcheck: dist
++	-rm -rf $(distdir)
++	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
++	mkdir $(distdir)/=build
++	mkdir $(distdir)/=inst
++	dc_install_base=`cd $(distdir)/=inst && pwd`; \
++	cd $(distdir)/=build \
++	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
++	  && $(MAKE) $(AM_MAKEFLAGS) \
++	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
++	  && $(MAKE) $(AM_MAKEFLAGS) check \
++	  && $(MAKE) $(AM_MAKEFLAGS) install \
++	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
++	  && $(MAKE) $(AM_MAKEFLAGS) dist
++	-rm -rf $(distdir)
++	@banner="$(distdir).tar.gz is ready for distribution"; \
++	dashes=`echo "$$banner" | sed s/./=/g`; \
++	echo "$$dashes"; \
++	echo "$$banner"; \
++	echo "$$dashes"
++dist: distdir
++	-chmod -R a+r $(distdir)
++	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
++	-rm -rf $(distdir)
++dist-all: distdir
++	-chmod -R a+r $(distdir)
++	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
++	-rm -rf $(distdir)
++distdir: $(DISTFILES)
++	-rm -rf $(distdir)
++	mkdir $(distdir)
++	-chmod 777 $(distdir)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile
++	@for file in $(DISTFILES); do \
++	  d=$(srcdir); \
++	  if test -d $$d/$$file; then \
++	    cp -pr $$d/$$file $(distdir)/$$file; \
++	  else \
++	    test -f $(distdir)/$$file \
++	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
++	    || cp -p $$d/$$file $(distdir)/$$file || :; \
++	  fi; \
++	done
++	for subdir in $(SUBDIRS); do \
++	  if test "$$subdir" = .; then :; else \
++	    test -d $(distdir)/$$subdir \
++	    || mkdir $(distdir)/$$subdir \
++	    || exit 1; \
++	    chmod 777 $(distdir)/$$subdir; \
++	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
++	      || exit 1; \
++	  fi; \
++	done
++info-am:
++info: info-recursive
++dvi-am:
++dvi: dvi-recursive
++check-am: all-am
++check: check-recursive
++installcheck-am:
++installcheck: installcheck-recursive
++install-exec-am:
++install-exec: install-exec-recursive
++
++install-data-am:
++install-data: install-data-recursive
++
++install-am: all-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++install: install-recursive
++uninstall-am:
++uninstall: uninstall-recursive
++all-am: Makefile
++all-redirect: all-recursive
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
++installdirs: installdirs-recursive
++installdirs-am:
++
++
++mostlyclean-generic:
++
++clean-generic:
++
++distclean-generic:
++	-rm -f Makefile $(CONFIG_CLEAN_FILES)
++	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
++
++maintainer-clean-generic:
++	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
++mostlyclean-am:  mostlyclean-tags mostlyclean-generic
++
++mostlyclean: mostlyclean-recursive
++
++clean-am:  clean-tags clean-generic mostlyclean-am
++
++clean: clean-recursive
++
++distclean-am:  distclean-tags distclean-generic clean-am
++	-rm -f libtool
++
++distclean: distclean-recursive
++	-rm -f config.status
++
++maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
++		distclean-am
++	@echo "This command is intended for maintainers to use;"
++	@echo "it deletes files that may require special tools to rebuild."
++
++maintainer-clean: maintainer-clean-recursive
++	-rm -f config.status
++
++.PHONY: install-data-recursive uninstall-data-recursive \
++install-exec-recursive uninstall-exec-recursive installdirs-recursive \
++uninstalldirs-recursive all-recursive check-recursive \
++installcheck-recursive info-recursive dvi-recursive \
++mostlyclean-recursive distclean-recursive clean-recursive \
++maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
++distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
++dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
++install-exec install-data-am install-data install-am install \
++uninstall-am uninstall all-redirect all-am all installdirs-am \
++installdirs mostlyclean-generic distclean-generic clean-generic \
++maintainer-clean-generic clean mostlyclean distclean maintainer-clean
++
++
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
+--- metamail-2.7.orig/src/Makefile.am
++++ metamail-2.7/src/Makefile.am
+@@ -0,0 +1,3 @@
++MAINTAINERCLEANFILES	= Makefile.in
++
++SUBDIRS			= metamail richmail
+--- metamail-2.7.orig/src/richmail/usascii.c
++++ metamail-2.7/src/richmail/usascii.c
+@@ -0,0 +1,129 @@
++/*-------------------------------------------------------------------------
++
++  usascii.c - Code for the US-ASCII specific parts of the richtext processor.
++ 
++  Copyright (c) 1992 Rhys Weatherley
++
++  Permission to use, copy, modify, and distribute this material
++  for any purpose and without fee is hereby granted, provided
++  that the above copyright notice and this permission notice
++  appear in all copies, and that the name of Rhys Weatherley not be
++  used in advertising or publicity pertaining to this
++  material without specific, prior written permission.
++  RHYS WEATHERLEY MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR
++  SUITABILITY OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED
++  "AS IS", WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++  Revision History:
++  ================
++
++   Version  DD/MM/YY  By  Description
++   -------  --------  --  --------------------------------------
++     1.0    21/06/92  RW  Original Version of usascii.c
++
++  You may contact the author by:
++  =============================
++
++   e-mail: rhys@cs.uq.oz.au
++     mail: Rhys Weatherley
++	   5 Horizon Drive
++	   Jamboree Heights
++	   Queensland 4074
++	   Australia
++
++-------------------------------------------------------------------------*/
++
++#include <stdio.h>
++#include <metamail/common.h>
++
++#include "richlex.h"
++#include "richset.h"
++
++/*
++ * Initialise the US-ASCII character set processor.
++ */
++usascii_init (name)
++char	*name;
++{
++    if (name)
++	richtextencoding (RICH_ENC_US_ASCII);
++}
++
++/*
++ * Process a command for the US-ASCII processor.
++ */
++int	usascii_command (token,negated)
++char	*token;
++int	negated;
++{
++    if (!strcmp(token,"us-ascii")) {
++    	if (negated) {
++	    charsetpop (&usascii_charset);
++	} else {
++	    charsetpush (&usascii_charset);
++	    richtextencoding (RICH_ENC_US_ASCII);
++	}
++	return (1);
++    } else {
++    	return (0);
++    }
++}
++
++/*
++ * Check for singleton US-ASCII tokens.
++ */
++int	usascii_single (token)
++char	*token;
++{
++    return (0);
++}
++
++/*
++ * Determine the width of a US-ASCII character.
++ */
++int	usascii_width (ch)
++RCHAR	ch;
++{
++    return (1);
++}
++
++/*
++ * Determine if the current character can be used as a folding point.
++ */
++int	usascii_fold (ch)
++RCHAR	ch;
++{
++    return (ch < 0x7F && isspace (ch));
++}
++
++/*
++ * Render the given US-ASCII character.
++ */
++usascii_render (ch,param)
++RCHAR	ch;
++void	*param;
++{
++    (*RichtextPutc) ((int)ch,param);
++}
++
++/*
++ * Enter or leave the US-ASCII encoding.
++ */
++usascii_encoding (newenc)
++int	newenc;
++{
++    /* Nothing to be done in this version */
++}
++
++/*
++ * Define the US-ASCII character set processor.
++ */
++struct 	charsetproc	usascii_charset =
++	  {"us-ascii",
++	   usascii_init,
++	   usascii_command,
++	   usascii_single,
++	   usascii_width,
++	   usascii_fold,
++	   usascii_render,
++	   usascii_encoding};
+--- metamail-2.7.orig/src/richmail/richtoatk.c
++++ metamail-2.7/src/richmail/richtoatk.c
+@@ -0,0 +1,98 @@
++/*
++Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++
++Permission to use, copy, modify, and distribute this material 
++for any purpose and without fee is hereby granted, provided 
++that the above copyright notice and this permission notice 
++appear in all copies, and that the name of Bellcore not be 
++used in advertising or publicity pertaining to this 
++material without the specific, prior written permission 
++of an authorized representative of Bellcore.  BELLCORE 
++MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++*/
++#include <metamail/common.h>
++
++#include "richlex.h"
++
++char *translate(t)
++char *t;
++{
++    if (!strcmp(t, "fixed")) return("typewriter");
++    if (!strcmp(t, "excerpt")) return("quotation");
++    /* Really ought to handle ISO-10646 and ISO-8859-X somehow */
++    return(t);
++}
++
++main() {
++    RCHAR c;
++    int i, JustDidNewline = 0;
++    char tok[MAX_TOKEN_SIZE + 1],*token;
++
++    fputs("\\begindata{text, 42}\n\\template{messages}\n", stdout);
++    /* The 0, 0 means that we're not implementing text/enriched */
++    while((c = richtextlex(stdin,tok + 1, 0, 0)) != (RCHAR)EOF) {
++	if (c == RICHTEXT_COMMAND || c == RICHTEXT_NEG_COMMAND) {
++	    if (c == RICHTEXT_NEG_COMMAND) {
++		tok[0] = '/';
++		token = tok;
++	    } else
++		token = tok + 1;
++            if (!strcmp(token, "lt")) {
++                putc('<', stdout);
++                JustDidNewline = 0;
++            } else if (!strcmp(token, "nl")) {
++                fputs(JustDidNewline ? "\n" : "\n\n", stdout);
++                JustDidNewline = 1;
++            } else if (!strcmp(token, "/paragraph")) {
++                fputs(JustDidNewline ? "\n\n" : "\n\n\n", stdout);
++                JustDidNewline = 1;
++            } else if (!strcmp(token, "comment")) {
++	        int tempc;
++                while (strcmp(token, "/comment")) {
++                    while ((tempc = getc(stdin)) != '<') ;
++                    for (i=0; (tempc = getc(stdin)) != '>'; ++i) {
++                        token[i] = isupper(tempc) ? tolower(tempc) : tempc;
++                    }
++                    token[i] = '\0';
++                }
++            } else if (!ignoretoken(token)) {
++                if (token[0] == '/') {
++                    putc('}', stdout);
++                } else {
++                    fprintf(stdout, "\\%s{", translate(token));
++                    JustDidNewline = 0;
++                }
++            }
++        } else if (c == '\n') {
++            putc(' ', stdout);
++            JustDidNewline = 0;
++        } else {
++            putc((int)c, stdout);
++            JustDidNewline = 0;
++        }
++    }
++    fputs("\n \n\\enddata{text, 42}\n", stdout);
++}
++
++ignoretoken(t)
++char *t;
++{
++    if (*t == '/') ++t;
++    if (!strcmp(t, "us-ascii")) return(1);
++    if (!strcmp(t, "paragraph")) return(1); /* handled otherwise */
++    if (!strcmp(t, "no-op")) return(1);
++    return(0);
++}
++
++controlputc(c)
++int c;
++{
++}
++
++controloutput(s, immediate)
++char *s;
++int immediate;
++{
++}
+--- metamail-2.7.orig/src/richmail/NOTES
++++ metamail-2.7/src/richmail/NOTES
+@@ -0,0 +1,7 @@
++
++"richtext.c" may be used as a library in another program, by defining the
++macro RICHTEXT_LIBRARY when it is compiled and calling the function
++"richtext_main(argc, argv)" with the arguments set to the normal richtext
++command-line arguments.  It is also necessary to link with "richlex.c",
++"richset.c", "usascii.c" and "iso2022.c" which provide services to
++"richtext.c".
+--- metamail-2.7.orig/src/richmail/COMMANDS
++++ metamail-2.7/src/richmail/COMMANDS
+@@ -0,0 +1,29 @@
++Commands for changing character sets in richtext:
++
++Japanese:
++
++<iso-2022-jp>		ISO-2022 encoding for mixed US-ASCII and JIS.
++<x-jis-x0201-1976>	Variant of US-ASCII for Japan.
++<x-jis-x0201>		Variant of US-ASCII for Japan.
++<x-jis-x0208-1978>	JIS X 0208-1978
++<x-jis-x0208-1983>	JIS X 0208-1983
++<x-jis-x0208>		JIS X 0208-1983
++
++Korean:
++
++<iso-2022-kr>		ISO-2022 encoding for mixed US-ASCII and Korean.
++<x-ksc-5601>		2-byte encoding of Hangul without shift/escape seqs.
++
++Internal commands:
++
++<x-iso-2022-gen-HH>	Used for ISO-2022 escape seqences.
++<x-iso-shift-in>	SI character
++<x-iso-shift-out>	SO character
++<x-iso-charset-HH>	Used for ISO-2022 ESC$)? character set designators.
++
++Notes:
++
++<iso-2022-*> text sequences may contain ISO-2022 escape sequences for changing
++character sets.  <x-jis-*-*> and <x-ksc-*> text sequences can also contain
++such escape sequences, but they start out in 2-byte mode, and are intended
++mainly for 2-byte character sequences, rather than a mixture.
+--- metamail-2.7.orig/src/richmail/richtext.c
++++ metamail-2.7/src/richmail/richtext.c
+@@ -0,0 +1,905 @@
++/*
++Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++
++Permission to use, copy, modify, and distribute this material 
++for any purpose and without fee is hereby granted, provided 
++that the above copyright notice and this permission notice 
++appear in all copies, and that the name of Bellcore not be 
++used in advertising or publicity pertaining to this 
++material without the specific, prior written permission 
++of an authorized representative of Bellcore.  BELLCORE 
++MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++*/
++
++#include <metamail/common.h>
++
++#include <curses.h>  /* This and next for tgetstr(3X) and kin */
++#include <term.h>
++
++#include "richlex.h"
++#include "richset.h"
++
++int iso2022_fputc ();
++
++/*
++ * ########################################################################
++ * The function "InitGlobals" must be updated whenever a new variable is
++ * added here or a default value is changed.  The same must be done for
++ * the next section of variables also.  This is needed because this module
++ * could be linked into another program as a library and called more than
++ * once in a single program execution.
++ * ########################################################################
++ */
++static int linepos = 0, inspace = 0, leftmargin = 0, rightmargin, biggertext=0;
++static int workingleft = 0, workingright, inexcerpt = 0, insignature = 0;
++static int highlight=0, underline=0, bold=0, nofill=0;
++static int termcolumns=80, termrows=23;
++int controlputc();
++
++/* A common problem, in justifying text, is figuring out how to format a 
++   line when part of it wants to be left-justified, part right-justified, 
++   and part centered, or some combination thereof.  There is no perfect 
++   solution to this problem, so this program takes an incredibly cheesy 
++   but simple way out:  voting.  For each character on the line, a point
++   is added to the "center" score if it is supposed to be centered, and 
++   so on.  If it is inside TWO "center" environments, two points are added.
++   This may be the world's first implementation of justification by voting...
++*/
++
++static int centerenv=0, leftjustenv=0, rightjustenv=0;
++static int centerct=0, leftjustct=0, rightjustct=0;
++static int UsePager = 0;
++static int linesused = 0;
++static int JustSawCmd=0;
++static int JustCorrect = 0;	/* Non-zero to just correct and not format */
++static int OverStrike = 0;
++static int TextEnriched = 0;
++static char MoveRight[10];
++static char highlightbuf[50], highlightendbuf[50], StartUnderline[50], StopUnderline[50];
++static char KS[50], KE[50], BoldOn[50], BoldOff[50];
++static char charsetname[50];
++static int FakeTerminal;
++
++extern tputs();
++
++static outputc(), realoutputc(), MakeWorkingMargins(), Pause(), fputsmovingright(), ResetTerminalCodes(), FinalizeTerminal(), outputstr(), FPUTS(), lc2strcmp();
++
++#define	OUTC(c)		(outputc((RCHAR)(c)))
++
++static void
++InitGlobals()
++{
++    linepos = 0;
++    inspace = 0;
++    leftmargin = 0;
++    biggertext = 0;
++    workingleft = 0;
++    inexcerpt = 0;
++    insignature = 0;
++    termcolumns = 80;
++    termrows = 23;
++    centerenv = 0;
++    leftjustenv = 0;
++    rightjustenv = 0;
++    centerct = 0;
++    leftjustct = 0;
++    rightjustct = 0;
++    UsePager = 0;
++    linesused = 0;
++    JustSawCmd = 0;
++    JustCorrect = 0;
++    highlight = 0;
++    underline = 0;
++    bold = 0;
++    TextEnriched = 0;
++    nofill = 0;
++}
++
++static void
++cleanup(signum)
++int signum;
++{
++    FinalizeTerminal();
++    signal(signum, SIG_DFL);
++    kill(getpid(), signum);
++}
++
++static InitSignals() {
++    signal(SIGINT, cleanup);
++    signal(SIGILL, cleanup);
++    signal(SIGTRAP, cleanup);
++    signal(SIGIOT, cleanup);
++    signal(SIGFPE, cleanup);
++#ifndef linux
++    signal(SIGEMT, cleanup);
++    signal(SIGBUS, cleanup);
++#endif
++    signal(SIGSEGV, cleanup);
++    signal(SIGTERM, cleanup);
++#ifdef SIGXCPU
++    signal(SIGXCPU, cleanup);
++#endif
++}
++
++static nomemabort() {
++    fprintf(stderr, "richtext: Out of memory\n");
++    FinalizeTerminal();
++    exit(-1);
++}
++
++#ifndef	RICHTEXT_LIBRARY
++
++/*
++ * Only include the main function if this module is not being used as a
++ * library call.
++ */
++
++main(argc, argv)
++int argc;
++char **argv;
++{
++  exit(richtext_main(argc, argv));
++}
++
++#endif
++
++richtext_main(argc, argv)
++int argc;
++char **argv;
++{
++    RCHAR c;
++    int i, atstart, negated,
++    ForceTermcap=0, ForcePlain=0, NotTtyEnv = 0;
++    char token[MAX_TOKEN_SIZE], *tok, *nottty;
++    char tbuf[1024], *term, *dum;
++    FILE *InputFP = stdin, *tmpfp;
++
++    InitSignals();
++    InitGlobals();
++    richtextreset();
++    strcpy(charsetname,"us-ascii");
++    dum = (char *) getenv("MM_USEPAGER");
++    if (dum && atoi(dum)) ++UsePager;
++    for (i=1; i< argc; ++i) {
++        if (!strcmp(argv[i], "-p")) {
++            ++UsePager;
++        } else if (!strcmp(argv[i],"-c")) {
++            /* Only perform correction: don't format */
++            JustCorrect = 1;
++        } else if (!strcmp(argv[i], "-f")) {
++            /* Force termcap usage */
++            ForceTermcap = 1;
++        } else if (!strcmp(argv[i], "-t")) {
++            /* Force plain text */
++            ForcePlain = 1;
++        } else if (!strcmp(argv[i],"-n")) {
++            /* Disable the richtext correction routines */
++            CorrectionEnabled = 0;
++        } else if (!strcmp(argv[i],"-m")) {
++            /* Enable the multi-byte '<' hack */
++            RichtextLessThanFlag = 1;
++	} else if (!strncmp(argv[i], "-s", 2)) {
++	    /* Specify the character set to use (and convert to lower case) */
++	    char *name;
++	    if (argv[i][2])
++		strcpy(charsetname, argv[i] + 2);
++	    else if (i < (argc - 1))
++		strcpy(charsetname, argv[++i]);
++	    name = charsetname;
++	    while (*name) {
++		if (isupper(*name))
++		    *name = tolower(*name);
++		++name;
++	    }
++	} else if (!strcmp(argv[i], "-o")) {
++	    /* Use Overstriking */
++	    OverStrike = 1;
++	    ForcePlain = 1;
++	} else if (!strcmp(argv[i], "-e")) {
++		/* Work with text/enriched instead of text/richtext */
++		TextEnriched = 1;
++        } else {
++            /* open for input */
++            tmpfp = fopen(argv[i], "r");
++            if (tmpfp)
++	    	InputFP = tmpfp;
++	    else {
++	    	perror (argv[i]);
++		exit (1);
++	    }
++        }
++    }
++    /* THIS IS THE UNIX TERMINAL INITIALIZATION CODE */
++    nottty = (char *) getenv("MM_NOTTTY");
++    if (nottty) NotTtyEnv = atoi(nottty);
++    if (UsePager && (!isatty(0) || !isatty(1) || NotTtyEnv)) {
++        UsePager = 0;   /* Disable pager if I/O has been redirected or we're under a window-oriented mail reader */
++    }
++    if ((!ForcePlain && (isatty(1) || isatty(0))) || ForceTermcap) {
++        term = (char *) getenv("TERM");
++    } else {
++        term = NULL;
++    }
++    if (term && tgetent(tbuf, term) != 1) {
++        term = NULL;
++    }
++    if (term) {
++        static char cb[1024];
++        char *cp;
++                   
++        cp = cb;
++	
++        if (dum = (char*) tgetstr("ks", &cp)) 
++	  strcpy (KS, dum); 
++	else
++	  KS[0] = '\0';
++        if (dum = (char*) tgetstr("ke", &cp)) 
++	  strcpy (KE, dum); 
++	else
++	  KE[0] = '\0';
++        if (dum = (char*) tgetstr("so", &cp))
++	  strcpy (highlightbuf, dum); highlightbuf[0] = '\0';
++        if (dum = (char*) tgetstr("se", &cp))
++	  strcpy (highlightendbuf, dum); highlightendbuf[0] = '\0';
++        if (dum = (char*) tgetstr("md", &cp)) 
++	  strcpy (BoldOn, dum); 
++	else 
++	  strcpy(BoldOn, highlightbuf);
++        if (dum = (char*) tgetstr("me", &cp)) 
++	  strcpy (BoldOff, dum); 
++	else 
++	  strcpy(BoldOff, highlightendbuf);
++        if (dum = (char*) tgetstr("us", &cp))
++	  strcpy (StartUnderline, dum);
++	else
++	  StartUnderline[0] = '\0';
++        if (dum = (char*) tgetstr("ue", &cp))
++	  strcpy (StopUnderline, dum);
++	else StopUnderline[0] = '\0';
++        if (dum = (char*) tgetstr("nd", &cp))
++	  strcpy (MoveRight, dum);
++	else {
++            MoveRight[0] = ' ';
++            MoveRight[1] = '\0';
++        }
++        /* Some TERMCAP entries have REALLY screwed up "nd" fields, sigh... */
++        if (!strcmp(MoveRight, "\014")) strcpy(MoveRight, " ");
++        termcolumns = tgetnum("co");
++        if (termcolumns <= 0) termcolumns = 80;
++        termrows = tgetnum("li");
++        if (termrows <= 0) termrows = 23;
++	else termrows--;
++        FakeTerminal=0;
++    } else if (OverStrike) {
++        KS[0] = '\0';
++        KE[0] = '\0';
++	FakeTerminal = 1;
++	BoldOn[0] = '\0';
++	BoldOff[0] = '\0';
++	highlightbuf[0] = '\0';
++	highlightendbuf[0] = '\0';
++	StartUnderline[0] = '\0';
++	StopUnderline[0] = '\0';
++	strcpy(MoveRight, " ");
++        termcolumns = 80;
++        termrows = 23;
++    } else {
++        KS[0] = '\0';
++        KE[0] = '\0';
++        FakeTerminal = 1;
++        strcpy(BoldOn, "*");
++        strcpy(BoldOff, "*");
++        strcpy(highlightbuf, "_");
++        strcpy(highlightendbuf, "_");
++        strcpy(StartUnderline, "_");
++        strcpy(StopUnderline, "_");
++        strcpy(MoveRight, " ");
++        termcolumns = 80;
++        termrows = 23;
++    }
++    /* Check for the LINES & COLUMNS hack */
++    dum = getenv("LINES");
++    if (dum && ((i=atoi(dum)) > 0)) termrows = i - 1;
++    dum = getenv("COLUMNS");
++    if (dum && ((i=atoi(dum)) > 0)) termcolumns = i;
++    charsetnameinit(charsetname);
++    RichtextPutc = iso2022_fputc;
++    if (JustCorrect) {
++        richtextcorrect(InputFP,stdout,TextEnriched);
++        return(0);
++    }
++    FPUTS(KS, stdout);
++    rightmargin = workingright = termcolumns - 1;
++    while((c = richtextlex(InputFP,token,TextEnriched, nofill)) != (RCHAR)EOF) {
++        if (c == RICHTEXT_COMMAND || c == RICHTEXT_NEG_COMMAND) { 
++            negated = (c == RICHTEXT_NEG_COMMAND);
++            tok = token;
++
++	    /* Try to process the command with the character set processors */
++	    if (charsetcommand (tok,negated))
++	        continue;
++
++	    /* Do the default action for the command */
++            switch(tok[0]) {
++                case 'b':
++                    if (!strcmp(tok, "bold")) {
++                        if (negated) {
++                            --bold;
++                            if (bold <= 0) {
++				if (FakeTerminal) outputstr(BoldOff);
++				else controloutput(BoldOff, 0);
++			    }
++                        } else {
++                            ++bold;
++                        }
++                        ResetTerminalCodes(FakeTerminal, highlight, underline,
++                                            bold, highlightbuf, highlightendbuf, 0,
++                                            StartUnderline, StopUnderline, 0, BoldOn,
++                                            BoldOff, 1);
++                    } else if (!strcmp(tok, "bigger")) {
++                        if (negated) --biggertext; else ++biggertext;
++                    }
++                    break;
++                case 'c':
++                    if (!strcmp(tok, "center")) {
++                        if (negated) --centerenv; else ++centerenv;
++                    } else if (!TextEnriched && !strcmp(tok, "comment")) {
++                        int commct=1;
++			int tempc;
++                        while (commct > 0) {
++                            while ((tempc = getc(InputFP)) != '<' 
++                                    && tempc != EOF) ;
++                            if (tempc == EOF) break;
++                            for (i=0; (tempc = getc(InputFP)) != '>' 
++                              && tempc != EOF; ++i) {
++                                token[i] = isupper(tempc) ? 
++                                  tolower(tempc) : tempc;
++				if (i == MAX_TOKEN_SIZE-2) break;
++                            }
++                            if (tempc== EOF) break;
++                            token[i] = 0;
++                            if (!strcmp(token, "/comment")) --commct;
++                            if (!strcmp(token, "comment")) ++commct;
++                        }
++                    }
++                    break;
++                case 'e':
++                    if (!strcmp(tok, "excerpt")) {
++                        atstart = !(linepos > workingleft);
++                        if (negated) {
++                            leftmargin -= 4;
++                            rightmargin += 4;
++                            --inexcerpt;
++                        } else {
++                            leftmargin += 4;
++                            rightmargin -= 4;
++                            ++inexcerpt;
++                        }
++                        MakeWorkingMargins();
++                        if (!atstart) OUTC('\n');
++                    }
++                    break;
++                case 'f':
++                    if (!strcmp(tok, "flushleft")) {
++                        if (negated) --leftjustenv; else ++leftjustenv;
++                    } else if (!strcmp(tok, "flushright")) {
++                        if (negated) --rightjustenv; else ++rightjustenv;
++                    }
++                    break;
++                case 'i':
++                    if (!strcmp(tok, "italic")) {
++                        if (negated) {
++                            --highlight;
++                            if (highlight <= 0) {
++				if (FakeTerminal) outputstr(highlightendbuf);
++				else controloutput(highlightendbuf, 0);
++			    }
++                        } else {
++                            ++highlight;
++                        }
++                        ResetTerminalCodes(FakeTerminal, highlight, underline, bold,
++                                            highlightbuf, highlightendbuf, 1, StartUnderline,
++                                            StopUnderline, 0, BoldOn, BoldOff, 0);
++                    } else if (!strcmp(tok, "indent")) {
++                        if (negated) {
++                            leftmargin -= 4;
++                        } else {
++                            leftmargin += 4;
++                        }
++                    } else if (!strcmp(tok, "indentright")) {
++                        if (negated) {
++                            rightmargin += 4;
++                        } else {
++                            rightmargin -= 4;
++                        }
++		    } else if (TextEnriched && !strcmp(tok, "iNtErNaL-nL")) {
++			OUTC('\n');
++                    }
++                    MakeWorkingMargins();
++                    break;
++                case 'l':
++                    if (!TextEnriched && !strcmp(tok, "lt")) {
++                        OUTC('<');
++                    }
++                    break;
++                case 'n':
++ 		    if (!TextEnriched && !strcmp(tok, "nl")) {
++                        OUTC('\n');
++		    } else if (TextEnriched && !strcmp(tok, "nofill")) {
++			if (negated) {
++			    --nofill;
++			} else {
++			    ++nofill;
++			}
++                    } else if (!TextEnriched && !strcmp(tok, "np")) {
++                        OUTC('\n');
++                        OUTC('\014');
++                    }
++                    break;
++                case 'o':
++                    if (!TextEnriched && !strcmp(tok, "outdent")) {
++                        if (negated) {
++                            leftmargin += 4;
++                        } else {
++                            leftmargin -= 4;
++                        }
++                    } else if (!TextEnriched && !strcmp(tok, "outdentright")) {
++                        if (negated) {
++                            rightmargin -= 4;
++                        } else {
++                            rightmargin += 4;
++                        }
++                    }
++                    MakeWorkingMargins();
++                    break;                    
++                case 'p':
++                    if (!TextEnriched && !strcmp(tok, "paragraph")) {
++                        if (negated) OUTC('\n');
++                        OUTC('\n');
++                    } else if (TextEnriched && !strcmp(tok, "param")) {
++                        int commct=1;
++                        while (commct > 0) {
++			    for (;;) {
++				c = richtextlex(InputFP,token,TextEnriched, nofill);
++				if (c == EOF || c == RICHTEXT_COMMAND || c == RICHTEXT_NEG_COMMAND)
++				    break;
++                            }
++			    if (c == EOF) break;
++			    if (!strcmp(token,"param")) {
++				if (c == RICHTEXT_NEG_COMMAND) --commct;
++				else if (c == RICHTEXT_COMMAND) ++commct;
++                        }
++                    }
++		    }
++                    break;
++                case 's':
++                    if (!TextEnriched && !strcmp(tok, "signature")) {
++                        atstart = !(linepos > workingleft);
++                        if (negated) {
++                            leftmargin -= 4;
++                            rightmargin += 4;
++                            --insignature;
++                        } else {
++                            leftmargin += 4;
++                            rightmargin -= 4;
++                            ++insignature;
++                        }
++                        MakeWorkingMargins();
++                        if (!atstart) OUTC('\n');
++                    }
++                    break;
++                case 'u':
++                    if (!strcmp(tok, "underline")) {
++                        if (negated) {
++                            --underline;
++                            if (underline <= 0) {
++				if (FakeTerminal) outputstr(StopUnderline);
++				else controloutput(StopUnderline,0);
++			    }
++                        } else {
++                            ++underline;
++                        }
++                        ResetTerminalCodes(FakeTerminal, highlight, underline, bold,
++                                            highlightbuf, highlightendbuf, 0, StartUnderline,
++                                            StopUnderline, 1, BoldOn, BoldOff, 0);
++                    }
++                    break;
++                case 'v':
++                    if (TextEnriched && !strcmp(tok, "verbatim")) {
++                        for (;;) {
++			    int tempc;
++                            while ((tempc = getc(InputFP)) != '<' 
++                                    && tempc != EOF)
++				OUTC(tempc);
++                            if (tempc == EOF) break;
++			    ungetc(tempc = getc(InputFP), InputFP);
++			    if (tempc == '<') {
++				OUTC('<');
++				getc(InputFP);
++				continue;
++			    }
++                            for (i=0; (tempc = getc(InputFP)) != '>' 
++                              && tempc != EOF; ++i) {
++                                token[i] = tempc;
++				if (i == MAX_TOKEN_SIZE-2) break;
++                            }
++                            if (tempc== EOF) break;
++                            token[i] = 0;
++                            if (!lc2strcmp(token, "/verbatim")) break;
++			    else for (i=0; token[i]; i++)
++			        OUTC(token[i]);
++                        }
++                    }
++                    break;
++                default:
++                    /* Ignore all other tokens */
++                    break;
++            }
++            JustSawCmd = 1;
++        } else if (c == '\n') {
++	    if (nofill) {
++		OUTC(c);
++	    } else if (linepos > 0 && !inspace) {
++                OUTC(' ');
++            }
++            JustSawCmd = 0;
++        } else {
++            OUTC(c);
++            JustSawCmd = 0;
++        }
++    }
++    if (term) { /* cleanup a bit for insurance */
++        controloutput(highlightendbuf, 0);
++        controloutput(StopUnderline, 0);
++    }
++    OUTC('\n'); /* for good measure */
++    FPUTS(KE, stdout);
++    fflush(stdout);
++    if (UsePager) {
++        Pause();
++    }
++    return(0);
++}
++
++static struct charsetmember OutputBuf[1000] = {0,0};
++static int PendingOutput = 0, PendingControls = 0;
++
++controlputc(c)
++int c;
++{
++    charmemberctrl (&OutputBuf[PendingOutput],(RCHAR)c);
++    ++PendingOutput;
++    ++PendingControls;
++}
++
++static immediate_controlputc(c)
++int c;
++{
++    (*RichtextPutc) (c, stdout);
++}
++
++controloutput(s, immediate)
++char *s;
++int immediate;
++{
++    tputs(s, 1, immediate ? immediate_controlputc : controlputc);
++}
++
++static folding_point (buf, pos)
++struct	charsetmember *buf;
++int	pos;
++{
++    int i;
++    for (i = pos; i > 0; --i) {
++    	if (!charisctrl (buf[i]) && charmemberfold (buf[i]))
++	    return (i);
++    }
++    return (0);
++}
++
++static calc_column (buf, pos)
++struct	charsetmember *buf;
++int	pos;
++{
++    struct charsetmember *s;
++    int col = 0;
++    for (s = buf; (s -> ch); ++s) {
++    	if (!charisctrl (*s))
++    	    col += charmemberwidth (*s);
++	else
++	    ++col;
++    }
++    return (col);
++}
++
++static FlushOut() {
++    int i, j, x;
++    static struct charsetmember NewOutputBuf[1000];
++    struct charsetmember *s;
++    int NewPendingControls=0, NewPendingOutput = 0;
++
++    OutputBuf[PendingOutput].ch = 0;
++    OutputBuf[PendingOutput].charset = NULL;
++    if (linepos >= workingright) {
++        for (i=0, j=0; j<workingright && i < PendingOutput; ++i) {
++            if (!charisctrl (OutputBuf[i])) ++j;
++        }
++	x = folding_point (OutputBuf,i);
++	if ((workingleft + 4) < x)
++	    i = x;
++	else
++            while (i > workingleft + 4) {
++                if (!charisctrl (OutputBuf[i])
++                     && isspace((unsigned char) OutputBuf[i].ch)) {
++                    break;
++                }
++                --i;
++            }
++        for (j=0; i<PendingOutput; ++j, ++i) {
++            NewOutputBuf[j] = OutputBuf[i];
++            ++NewPendingOutput;
++            if (charisctrl (NewOutputBuf[j])) ++NewPendingControls;
++        }
++        PendingOutput -= NewPendingOutput;
++        PendingControls -= NewPendingControls;
++        charmember (&OutputBuf[PendingOutput],(RCHAR)'\n');
++	PendingOutput++;
++        OutputBuf[PendingOutput].ch = 0;
++        OutputBuf[PendingOutput].charset = 0;
++#ifdef MISTAKE
++        ResetTerminalCodes(FakeTerminal, highlight, underline, bold,
++                            highlightbuf, highlightendbuf, 0, StartUnderline,
++                            StopUnderline, 0, BoldOn, BoldOff, 0);
++#endif
++    }
++    if ((rightjustct > leftjustct)
++         && (rightjustct > centerct)
++         && (rightjustct > 0)) {
++        /* right justified */
++        i = rightmargin - calc_column (OutputBuf,PendingOutput) 
++		+ PendingControls;
++        for (j=0; j<i; ++j)  {
++            controloutput(MoveRight, 1);
++        }
++        fputsmovingright(OutputBuf, stdout);
++        ++linesused;
++    } else if ((leftjustct > centerct)
++                && (leftjustct > 0)) {
++        /* left justified */
++        for (s=OutputBuf; s -> ch && isspace((unsigned char) (s -> ch)); ++s)
++	    {;}
++        fputsmovingright(s, stdout);
++        ++linesused;
++    } else if (centerct > 0) {
++        /* centered */
++        i = (termcolumns - calc_column (OutputBuf,PendingOutput) - 1
++		+ PendingControls) / 2;
++        for (j=0; j<i; ++j) {
++            controloutput(MoveRight, 1);
++        }
++        fputsmovingright(OutputBuf, stdout);
++        ++linesused;
++    } else {
++        /* Leave indentation (margins) as-is */
++        fputsmovingright(OutputBuf, stdout);
++        ++linesused;
++    }
++    if (linesused >= termrows && UsePager) Pause();
++    rightjustct = leftjustct = centerct = 0; /* not quite right for wrapping, sigh... */
++    PendingOutput = PendingControls = linepos = 0;
++    inspace = 1;
++    j = (isspace((unsigned char) NewOutputBuf[0].ch)) ? 1 : 0;
++    for ( ; j<NewPendingOutput; ++j) {
++        if (charisctrl (NewOutputBuf[j])) {
++	    OutputBuf[PendingOutput++] = NewOutputBuf[j];
++            ++PendingControls;
++        } else {
++            realoutputc(NewOutputBuf[j], 1);
++        }
++    }
++    ResetTerminalCodes(FakeTerminal, highlight, underline, bold,
++                        highlightbuf, highlightendbuf, 0, StartUnderline,
++                        StopUnderline, 0, BoldOn, BoldOff, 0);
++}
++
++static outputc(c)
++RCHAR c;
++{
++    struct charsetmember member;
++    charmember (&member,c);
++    realoutputc(member, 0);
++}
++
++static realoutputc(c, alreadyformatted)
++struct charsetmember c;
++int alreadyformatted;
++{
++    int i, newinspace;
++
++    if (c.ch == '\n') {
++    	charmember (&OutputBuf[PendingOutput],(RCHAR)'\n');
++	PendingOutput++;
++        FlushOut();
++    } else if (c.ch == '\t') {
++        int tabpos = (linepos + 8) / 8;
++        if (tabpos >= workingright) {
++    	    charmember (&OutputBuf[PendingOutput],(RCHAR)'\n');
++	    PendingOutput++;
++            FlushOut();
++        } else {
++            int spaces = (8*tabpos) - linepos;
++            while (spaces-->0) {
++    	        charmember (&OutputBuf[PendingOutput],(RCHAR)' ');
++	        PendingOutput++;
++                ++linepos;
++            }
++        }
++    } else {
++        newinspace = isspace((unsigned char) c.ch);
++        if (!inspace || !newinspace || !JustSawCmd) {
++            if (linepos == 0) {
++                int i = workingleft;
++                if (inexcerpt) {
++    	            charmember (&OutputBuf[PendingOutput],(RCHAR)'>');
++	            PendingOutput++;
++                    --i;
++                }
++                if (insignature) {
++    	            charmember (&OutputBuf[PendingOutput],(RCHAR)'+');
++	            PendingOutput++;
++                    --i;
++                }
++                while (i-->0) {
++    	            charmember (&OutputBuf[PendingOutput],(RCHAR)' ');
++	            PendingOutput++;
++                }
++                linepos = workingleft;
++            }
++            if (!alreadyformatted && biggertext && !(inspace && newinspace)) {
++    	        charmember (&OutputBuf[PendingOutput],(RCHAR)'_');
++	        PendingOutput++;
++                ++linepos;
++            }
++            inspace = newinspace;
++            linepos += charmemberwidth (c);
++	    OutputBuf[PendingOutput++] = c;
++	    if (OverStrike && !inspace) {
++		if (bold) {
++		    controlputc('\b');
++		    controlputc((int) c.ch);
++		}
++		if (highlight||underline) {
++		    controlputc('\b');
++		    controlputc('_');
++		}
++	    }
++            leftjustct += leftjustenv;
++            rightjustct += rightjustenv;
++            centerct += centerenv;
++            if (c.ch == '\014') inspace = 1;
++            if (linepos >= workingright) FlushOut();
++        }
++    }
++}
++
++static MakeWorkingMargins() {
++    int oldworkingleft=workingleft, i;
++
++    workingleft = leftmargin;
++    workingright = rightmargin;
++    if (workingleft < 0) workingleft = 0;
++    if (workingright < 0) workingright = 0;
++    if (workingright > (termcolumns - 1)) workingright = (termcolumns - 1);
++    if (workingleft > (workingright - 8)) workingleft = workingright -8;
++    if (linepos == oldworkingleft && linepos != 0) {
++        for (i=workingleft-oldworkingleft; i > 0; --i) OUTC(' ');
++    }
++}
++
++static Pause()
++{
++    int	c;
++
++    (void) fputs("Press RETURN to continue (or 'q' to quit):\n", stdout);
++    fflush(stdout);
++    c = getc(stdin);
++    if (c == 'q' || c == 'Q') exit(0);
++    linesused = 0;
++}
++
++/* Leading spaces should be output as MoveRight, to avoid 
++   having margins that are underlined or reverse video */
++
++static fputsmovingright(s, fp)
++struct charsetmember *s;
++FILE *fp;
++{
++    int inmargin=1;
++    if (!s) return;
++    while (s -> ch) {
++        if (inmargin && (s -> ch) == ' ') {
++            controloutput(MoveRight, 1);
++        } else {
++            if (inmargin) inmargin = 0;
++	    if (charisctrl (*s))
++	        (*RichtextPutc) ((int)(s -> ch), fp);
++	    else
++	    	charmemberrender (*s, fp);
++        }
++        ++s;
++    }
++}
++
++static ResetTerminalCodes(FakeTerminal, highlight, underline, bold, highlightbuf, highlightendbuf,
++                    modifiedhighlight, StartUnderline, StopUnderline, modifiedunderline,
++                    BoldOn, BoldOff, modifiedbold)
++char *highlightbuf, *highlightendbuf, *StartUnderline, *StopUnderline,
++    *BoldOn, *BoldOff;
++{
++    if (OverStrike)
++	return;
++
++    /* We always turn back on the appropriate terminal modes, because
++      on some terminals one thing turns off all of them */
++    if (highlight >= 1) {
++        if (FakeTerminal) {
++            if (modifiedhighlight && highlight == 1) outputstr(highlightbuf);
++        } else controloutput(highlightbuf, 0);
++    }
++    if (bold >= 1) {
++        if (FakeTerminal) {
++            if (modifiedbold && bold == 1) outputstr(BoldOn);
++        } else controloutput(BoldOn, 0);
++    }
++    if (underline >= 1) {
++        if (FakeTerminal) {
++            if (modifiedunderline && underline == 1) outputstr(StartUnderline);
++        } else controloutput(StartUnderline, 0);
++    }
++}
++
++static FinalizeTerminal() {
++    tputs(highlightendbuf, 1, immediate_controlputc);
++    tputs(BoldOff, 1, immediate_controlputc);
++    tputs(StopUnderline, 1, immediate_controlputc);
++    FPUTS(KE, stdout);
++}
++
++static outputstr(s)
++char *s;
++{
++    while (*s) OUTC(*s++);
++}
++
++static FPUTS(s,fp)
++unsigned char *s;
++FILE *fp;
++{
++    while(*s) (*RichtextPutc)((int)(*s++),fp);
++}
++
++static lc2strcmp(s1, s2)
++char *s1, *s2;
++{
++    if (!s1 || !s2) return (-1);
++    while (*s1 && *s2) {
++	if (*s1 != *s2 && (tolower(*s1) != *s2)) return(-1);
++	++s1; ++s2;
++    }
++    return((*s1 == *s2) ? 0 : -1);
++}
++
++static lc2strncmp(s1, s2, len)
++char *s1, *s2;
++int len;
++{
++    if (!s1 || !s2) return (-1);
++    while (*s1 && *s2 && len > 0) {
++	if (*s1 != *s2 && (tolower(*s1) != *s2)) return(-1);
++	++s1; ++s2; --len;
++    }
++    if (len <= 0) return(0);
++    return((*s1 == *s2) ? 0 : -1);
++}
+--- metamail-2.7.orig/src/richmail/Makefile.am
++++ metamail-2.7/src/richmail/Makefile.am
+@@ -0,0 +1,15 @@
++MAINTAINERCLEANFILES    = Makefile.in
++
++CFLAGS			= -lncurses
++
++INCLUDES                = -I$(top_builddir) -I$(top_builddir)/metamail \
++                        -I$(top_srcdir) -I$(top_srcdir)/metamail
++
++bin_PROGRAMS            = richtext richtoatk
++
++richtext_SOURCES	= richtext.c richlex.c richset.c usascii.c iso2022.c
++richtext_LDADD		= $(top_builddir)/metamail/libmetamail.la
++
++richtoatk_SOURCES	= richtoatk.c richlex.c richset.c usascii.c iso2022.c
++richtoatk_LDADD		= $(top_builddir)/metamail/libmetamail.la
++
+--- metamail-2.7.orig/src/richmail/iso2022.c
++++ metamail-2.7/src/richmail/iso2022.c
+@@ -0,0 +1,375 @@
++/*-------------------------------------------------------------------------
++
++  iso2022.c - Code for the ISO-2022 specific parts of the richtext processor.
++ 
++  Copyright (c) 1992 Rhys Weatherley
++
++  Permission to use, copy, modify, and distribute this material
++  for any purpose and without fee is hereby granted, provided
++  that the above copyright notice and this permission notice
++  appear in all copies, and that the name of Rhys Weatherley not be
++  used in advertising or publicity pertaining to this
++  material without specific, prior written permission.
++  RHYS WEATHERLEY MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR
++  SUITABILITY OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED
++  "AS IS", WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++  Revision History:
++  ================
++
++   Version  DD/MM/YY  By  Description
++   -------  --------  --  --------------------------------------
++     1.0    21/06/92  RW  Original Version of iso2022.c
++
++  You may contact the author by:
++  =============================
++
++   e-mail: rhys@cs.uq.oz.au
++     mail: Rhys Weatherley
++	   5 Horizon Drive
++	   Jamboree Heights
++	   Queensland 4074
++	   Australia
++
++  Acknowledgements:
++  ================
++
++  Many thanks to Yutaka Sato (ysato@etl.go.jp) for protyping ISO-2022
++  support in a previous version of richtext, on whose code this is based.
++
++-------------------------------------------------------------------------*/
++
++#include <metamail/common.h>
++
++#include "richlex.h"
++#include "richset.h"
++
++/*
++ * Global data for this module.
++ */
++static	int	SwToAscii;
++static	int	SwToOther;
++static	int	OutPrevChar;
++static	int	OutPrevPrevChar;
++static	int	OutCharLen;
++static	int	OutCharSet;
++static	int	OutAsciiMode;
++
++#define	OUT_ASCII	0
++#define	OUT_JIS		1
++#define	OUT_KSC		2
++
++#define	ESC		033
++#define	SO		016
++#define	SI		017
++
++#define	ISO_GENERIC_PREFIX	"x-iso-2022-gen-"
++#define	ISO_GENERIC_LEN		15
++#define	ISO_SHIFT_PREFIX	"x-iso-shift-"
++#define	ISO_SHIFT_LEN		12
++#define	ISO_CHARSET_PREFIX	"x-iso-charset-"
++#define	ISO_CHARSET_LEN		14
++
++/*
++ * Initialise the ISO-2022 character set processor.
++ */
++iso2022_init (name)
++char	*name;
++{
++    SwToAscii = 'B';
++    SwToOther = 'B';
++    OutPrevChar = 0;
++    OutPrevPrevChar = 0;
++    OutCharLen = 1;
++    OutCharSet = OUT_ASCII;
++    OutAsciiMode = RICH_ENC_US_ASCII;
++    if (!name)
++	return;
++    if (!strncmp (name,"iso-2022-jp",11))
++	richtextencoding (RICH_ENC_JP_ASCII);
++    else if (!strncmp (name,"iso-2022-kr",11)) {
++	richtextencoding (RICH_ENC_KR_ASCII);
++	controloutput("\033$)C",0);
++    } else
++	richtextencoding (RICH_ENC_US_ASCII);
++}
++
++/*
++ * Process a command for the ISO-2022 processor.
++ */
++int	iso2022_command (token,negated)
++char	*token;
++int	negated;
++{
++    int swchar;
++    if (!strcmp(token,"iso-2022-jp")) {
++    	if (negated) {
++	    /* Return to previous output mode */
++	    controloutput("\033(B",0);
++	    SwToAscii = 'B';
++	    charsetpop(&iso2022_charset);
++	} else {
++	    /* Enter JIS-X0208-1983 output mode */
++	    charsetpush(&iso2022_charset);
++	    richtextencoding(RICH_ENC_US_ASCII);
++	    controloutput("\033(B",0);
++	    SwToOther = 'B';
++	}
++	return (1);
++    } else if (!strcmp(token,"iso-2022-kr")) {
++	if (negated) {
++	    /* Return to previous output mode */
++	    controloutput("\017",0);
++	    charsetpop(&iso2022_charset);
++	} else {
++	    /* Enter KSC-5601 output mode */
++	    charsetpush(&iso2022_charset);
++	    richtextencoding(RICH_ENC_KR_ASCII);
++	    controloutput("\033$)C\017",0);
++	}
++	return (1);
++    } else if (!strncmp(token,"x-jis-x0201",11)) {
++    	if (negated) {
++	    /* Return to previous output mode */
++	    controloutput("\033(B",0);
++	    SwToAscii = 'B';
++	    charsetpop(&iso2022_charset);
++	} else {
++	    /* Enter JIS-X-0201-1976 output mode */
++	    charsetpush(&iso2022_charset);
++	    richtextencoding(RICH_ENC_JP_ASCII);
++	    controloutput("\033(J",0);
++	    SwToAscii = 'J';
++	}
++	return (1);
++    } else if (!strncmp(token,"x-jis-x0208",11)) {
++    	if (negated) {
++	    /* Return to previous output mode */
++	    controloutput("\033(B",0);
++	    SwToAscii = 'B';
++	    charsetpop(&iso2022_charset);
++	} else {
++	    /* Enter JIS-X0208-* output mode */
++	    charsetpush(&iso2022_charset);
++	    if (!strcmp (token + 11,"-1978"))
++		SwToOther = '@';
++	    else
++		SwToOther = 'B';
++	    richtextencoding((SwToOther == '@' ? RICH_ENC_JIS_1978 :
++					      RICH_ENC_JIS_1983));
++	    controloutput("\033$",0);
++	    controlputc(SwToOther);
++	}
++	return (1);
++    } else if (!strcmp(token,"x-ksc-5601")) {
++    	if (negated) {
++	    /* Return to previous output mode */
++	    controloutput("\017",0);
++	    charsetpop(&iso2022_charset);
++	} else {
++	    /* Enter KSC-5601 output mode */
++	    charsetpush(&iso2022_charset);
++	    richtextencoding(RICH_ENC_KSC_5601);
++	    controloutput("\033$)C\016",0);
++	}
++	return (1);
++    } else if (!strncmp (token,ISO_GENERIC_PREFIX,ISO_GENERIC_LEN)) {
++    	/* Process an escape sequence for changing character sets */
++	sscanf(token + ISO_GENERIC_LEN,"%x",&swchar);
++	if (swchar <= ' ' || swchar >= 0x7F)
++	    return (1);
++	if (negated) {
++	    /* Return to previous output mode from multi-byte mode */
++	    if (!charsettop(&iso2022_charset))
++	      charsetpush(&iso2022_charset);
++	    richtextencoding((swchar == 'J' ? RICH_ENC_JP_ASCII :
++					      RICH_ENC_US_ASCII));
++	    controloutput("\033(",0);
++	    controlputc(swchar);
++	    SwToAscii = swchar;
++	} else {
++	    /* Enter multi-byte (Japanese) mode */
++	    if (!charsettop(&iso2022_charset))
++	      charsetpush(&iso2022_charset);
++	    richtextencoding((swchar == '@' ? RICH_ENC_JIS_1978 :
++					      RICH_ENC_JIS_1983));
++	    controloutput("\033$",0);
++	    controlputc(swchar);
++	    SwToOther = swchar;
++	}
++	return (1);
++    } else if (!strncmp (token,ISO_SHIFT_PREFIX,ISO_SHIFT_LEN)) {
++    	/* Process a character set shift sequence */
++	if (!strcmp(token + ISO_SHIFT_LEN,"out") &&
++	    	RichtextCharEncoding == RICH_ENC_KR_ASCII) {
++	    /* Enter KSC-5601 2-byte mode */
++	    if (!charsettop(&iso2022_charset))
++	      charsetpush(&iso2022_charset);
++	    richtextencoding(RICH_ENC_KSC_5601);
++	    controloutput("\016",0);
++	} else if (!strcmp (token + ISO_SHIFT_LEN,"in") &&
++		RichtextCharEncoding == RICH_ENC_KSC_5601) {
++	    /* Return to US-ASCII from KSC-5601 */
++	    if (!charsettop(&iso2022_charset))
++	      charsetpush(&iso2022_charset);
++	    richtextencoding(RICH_ENC_KR_ASCII);
++	    controloutput("\017",0);
++	}
++	return (1);
++    } else {
++    	return (0);
++    }
++}
++
++/*
++ * Check for singleton ISO-2022 tokens.
++ */
++int	iso2022_single (token)
++char	*token;
++{
++    return (!strncmp (token,ISO_GENERIC_PREFIX,ISO_GENERIC_LEN) ||
++	    !strncmp (token,ISO_SHIFT_PREFIX,ISO_SHIFT_LEN) ||
++	    !strncmp (token,ISO_CHARSET_PREFIX,ISO_CHARSET_LEN));
++}
++
++/*
++ * Determine the width of a ISO-2022 character.
++ */
++int	iso2022_width (ch)
++RCHAR	ch;
++{
++    return (ch & 0xFF00 ? 2 : 1);
++}
++
++/*
++ * Determine if the current character can be used as a folding point.
++ */
++int	iso2022_fold (ch)
++RCHAR	ch;
++{
++    if (ch < 0x7F && isspace (ch)) {
++    	return (1);
++    } else {
++        return ((ch & 0xFF00) != 0);
++    }
++}
++
++/*
++ * Render the given ISO-2022 character.
++ */
++iso2022_render (ch,param)
++RCHAR	ch;
++void	*param;
++{
++    if (ch & 0xFF00) {
++	if (OutCharLen < 2) {
++	    /* Add extra escape sequences after stray ASCII characters */
++	    /* This normally happens in excerpts and signatures, etc.  */
++	    if (OutAsciiMode == RICH_ENC_JP_ASCII) {
++		(*RichtextPutc) (033,param);
++		(*RichtextPutc) ('$',param);
++		(*RichtextPutc) (SwToOther,param);
++	    } else if (OutAsciiMode == RICH_ENC_KR_ASCII) {
++		(*RichtextPutc) (SO,param);
++	    }
++	}
++        (*RichtextPutc) ((int)((ch & 0xFF00) >> 8),param);
++        (*RichtextPutc) ((int)(ch & 0xFF),param);
++    } else {
++	if (OutCharLen > 1 && ch >= 0x20) {
++	    /* Add extra escape sequences before stray ASCII characters */
++	    /* This normally happens in excerpts and signatures, etc.   */
++	    if (OutAsciiMode == RICH_ENC_JP_ASCII) {
++		(*RichtextPutc) (033,param);
++		(*RichtextPutc) ('(',param);
++		(*RichtextPutc) (SwToAscii,param);
++	    } else if (OutAsciiMode == RICH_ENC_KR_ASCII) {
++		(*RichtextPutc) (SI,param);
++	    }
++	}
++	(*RichtextPutc) ((int)(ch & 0xFF),param);
++    }
++}
++
++/*
++ * Enter or leave the ISO-2022 encoding.
++ */
++iso2022_encoding (newenc)
++int	newenc;
++{
++    switch (newenc) {
++	case RICH_ENC_US_ASCII: controloutput("\033(B",0); break;
++	case RICH_ENC_JP_ASCII: controloutput("\033(J",0); break;
++	case RICH_ENC_KR_ASCII: controloutput("\017",0);   break;
++	case RICH_ENC_JIS_1978: controloutput("\033$@",0); break;
++	case RICH_ENC_JIS_1983: controloutput("\033$B",0); break;
++	case RICH_ENC_KSC_5601: controloutput("\016",0);   break;
++	default:		controloutput("\033(B",0); break;
++    }
++}
++
++/*
++ * Define the ISO-2022-JP and ISO-2022-KR character set processor.
++ */
++struct 	charsetproc	iso2022_charset =
++	  {"iso-2022-jp:iso-2022-kr",
++	   iso2022_init,
++	   iso2022_command,
++	   iso2022_single,
++	   iso2022_width,
++	   iso2022_fold,
++	   iso2022_render,
++	   iso2022_encoding};
++
++/*
++ * Define an output routine for slotting into RichtextPutc so
++ * that ISO-2022 escape sequences are treated correctly.
++ */
++int	iso2022_fputc (ch,file)
++int	ch;
++FILE	*file;
++{
++    if (OutPrevChar == ESC && ch == '(') {
++	/* Process escape sequences that end JIS 2-byte modes */
++	OutCharLen = 1;
++	OutCharSet = OUT_ASCII;
++	OutAsciiMode = RICH_ENC_JP_ASCII;
++    }
++    if (OutPrevPrevChar == ESC && OutPrevChar == '$') {
++	/* Process escape sequences that start JIS 2-byte modes */
++        if (ch != ')') {	/* ')' is for Korean, so ignore it */
++	    OutCharLen = 2;
++	    OutCharSet = OUT_JIS;
++	    OutAsciiMode = RICH_ENC_JP_ASCII;
++	}
++    }
++    if (ch == SO) {
++	OutCharLen = 2;
++	OutCharSet = OUT_KSC;
++	OutAsciiMode = RICH_ENC_KR_ASCII;
++    } else if (ch == SI) {
++	OutCharLen = 1;
++	OutCharSet = OUT_ASCII;
++	OutAsciiMode = RICH_ENC_KR_ASCII;
++    }
++    if (ch == '\n' && OutCharLen == 2) {
++        /* Two-byte characters cannot cross line boundaries */
++	if (OutCharSet == OUT_JIS) {
++            fputc (ESC,file);
++            fputc ('(',file);
++            fputc (SwToAscii,file);
++            fputc ('\n',file);
++            fputc (ESC,file);
++            fputc ('$',file);
++            fputc (SwToOther,file);
++	} else if (OutCharSet == OUT_KSC) {
++	    fputc (SI,file);
++	    fputc ('\n',file);
++	    fputc (SO,file);
++	}
++    } else {
++        fputc (ch,file);
++    }
++    OutPrevPrevChar = OutPrevChar;
++    OutPrevChar = ch;
++}
+--- metamail-2.7.orig/src/richmail/Makefile.in
++++ metamail-2.7/src/richmail/Makefile.in
+@@ -0,0 +1,376 @@
++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
++
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++
++SHELL = @SHELL@
++
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
++
++DESTDIR =
++
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++
++top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
++INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++transform = @program_transform_name@
++
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++host_alias = @host_alias@
++host_triplet = @host@
++AS = @AS@
++CATCOMMAND = @CATCOMMAND@
++CC = @CC@
++DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
++EXEEXT = @EXEEXT@
++LIBTOOL = @LIBTOOL@
++LIBTOOL_DEPS = @LIBTOOL_DEPS@
++LN_S = @LN_S@
++LPRCOMMAND = @LPRCOMMAND@
++LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAKEINFO = @MAKEINFO@
++OBJDUMP = @OBJDUMP@
++OBJEXT = @OBJEXT@
++PACKAGE = @PACKAGE@
++RANLIB = @RANLIB@
++STRIP = @STRIP@
++VERSION = @VERSION@
++ac_aux_dir = @ac_aux_dir@
++
++MAINTAINERCLEANFILES = Makefile.in
++
++CFLAGS = -lncurses
++
++INCLUDES = -I$(top_builddir) -I$(top_builddir)/metamail                         -I$(top_srcdir) -I$(top_srcdir)/metamail
++
++
++bin_PROGRAMS = richtext richtoatk
++
++richtext_SOURCES = richtext.c richlex.c richset.c usascii.c iso2022.c
++richtext_LDADD = $(top_builddir)/metamail/libmetamail.la
++
++richtoatk_SOURCES = richtoatk.c richlex.c richset.c usascii.c iso2022.c
++richtoatk_LDADD = $(top_builddir)/metamail/libmetamail.la
++mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
++CONFIG_HEADER = ../../metamail/config.h
++CONFIG_CLEAN_FILES = 
++bin_PROGRAMS =  richtext$(EXEEXT) richtoatk$(EXEEXT)
++PROGRAMS =  $(bin_PROGRAMS)
++
++
++DEFS = @DEFS@ -I. -I$(srcdir) -I../../metamail
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++richtext_OBJECTS =  richtext.$(OBJEXT) richlex.$(OBJEXT) \
++richset.$(OBJEXT) usascii.$(OBJEXT) iso2022.$(OBJEXT)
++richtext_DEPENDENCIES =  $(top_builddir)/metamail/libmetamail.la
++richtext_LDFLAGS = 
++richtoatk_OBJECTS =  richtoatk.$(OBJEXT) richlex.$(OBJEXT) \
++richset.$(OBJEXT) usascii.$(OBJEXT) iso2022.$(OBJEXT)
++richtoatk_DEPENDENCIES =  $(top_builddir)/metamail/libmetamail.la
++richtoatk_LDFLAGS = 
++COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
++DIST_COMMON =  Makefile.am Makefile.in
++
++
++DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
++
++TAR = tar
++GZIP_ENV = --best
++DEP_FILES =  .deps/iso2022.P .deps/richlex.P .deps/richset.P \
++.deps/richtext.P .deps/richtoatk.P .deps/usascii.P
++SOURCES = $(richtext_SOURCES) $(richtoatk_SOURCES)
++OBJECTS = $(richtext_OBJECTS) $(richtoatk_OBJECTS)
++
++all: all-redirect
++.SUFFIXES:
++.SUFFIXES: .S .c .lo .o .obj .s
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
++	cd $(top_srcdir) && $(AUTOMAKE) --foreign src/richmail/Makefile
++
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
++	cd $(top_builddir) \
++	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
++
++
++mostlyclean-binPROGRAMS:
++
++clean-binPROGRAMS:
++	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
++
++distclean-binPROGRAMS:
++
++maintainer-clean-binPROGRAMS:
++
++install-binPROGRAMS: $(bin_PROGRAMS)
++	@$(NORMAL_INSTALL)
++	$(mkinstalldirs) $(DESTDIR)$(bindir)
++	@list='$(bin_PROGRAMS)'; for p in $$list; do \
++	  if test -f $$p; then \
++	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
++	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
++	  else :; fi; \
++	done
++
++uninstall-binPROGRAMS:
++	@$(NORMAL_UNINSTALL)
++	list='$(bin_PROGRAMS)'; for p in $$list; do \
++	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
++	done
++
++# FIXME: We should only use cygpath when building on Windows,
++# and only if it is available.
++.c.obj:
++	$(COMPILE) -c `cygpath -w $<`
++
++.s.o:
++	$(COMPILE) -c $<
++
++.S.o:
++	$(COMPILE) -c $<
++
++mostlyclean-compile:
++	-rm -f *.o core *.core
++	-rm -f *.$(OBJEXT)
++
++clean-compile:
++
++distclean-compile:
++	-rm -f *.tab.c
++
++maintainer-clean-compile:
++
++.s.lo:
++	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++
++.S.lo:
++	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++
++mostlyclean-libtool:
++	-rm -f *.lo
++
++clean-libtool:
++	-rm -rf .libs _libs
++
++distclean-libtool:
++
++maintainer-clean-libtool:
++
++richtext$(EXEEXT): $(richtext_OBJECTS) $(richtext_DEPENDENCIES)
++	@rm -f richtext$(EXEEXT)
++	$(LINK) $(richtext_LDFLAGS) $(richtext_OBJECTS) $(richtext_LDADD) $(LIBS)
++
++richtoatk$(EXEEXT): $(richtoatk_OBJECTS) $(richtoatk_DEPENDENCIES)
++	@rm -f richtoatk$(EXEEXT)
++	$(LINK) $(richtoatk_LDFLAGS) $(richtoatk_OBJECTS) $(richtoatk_LDADD) $(LIBS)
++
++tags: TAGS
++
++ID: $(HEADERS) $(SOURCES) $(LISP)
++	list='$(SOURCES) $(HEADERS)'; \
++	unique=`for i in $$list; do echo $$i; done | \
++	  awk '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	here=`pwd` && cd $(srcdir) \
++	  && mkid -f$$here/ID $$unique $(LISP)
++
++TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
++	tags=; \
++	here=`pwd`; \
++	list='$(SOURCES) $(HEADERS)'; \
++	unique=`for i in $$list; do echo $$i; done | \
++	  awk '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
++	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
++
++mostlyclean-tags:
++
++clean-tags:
++
++distclean-tags:
++	-rm -f TAGS ID
++
++maintainer-clean-tags:
++
++distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
++
++subdir = src/richmail
++
++distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign src/richmail/Makefile
++	@for file in $(DISTFILES); do \
++	  d=$(srcdir); \
++	  if test -d $$d/$$file; then \
++	    cp -pr $$d/$$file $(distdir)/$$file; \
++	  else \
++	    test -f $(distdir)/$$file \
++	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
++	    || cp -p $$d/$$file $(distdir)/$$file || :; \
++	  fi; \
++	done
++
++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
++
++-include $(DEP_FILES)
++
++mostlyclean-depend:
++
++clean-depend:
++
++distclean-depend:
++	-rm -rf .deps
++
++maintainer-clean-depend:
++
++%.o: %.c
++	@echo '$(COMPILE) -c $<'; \
++	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
++
++%.lo: %.c
++	@echo '$(LTCOMPILE) -c $<'; \
++	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
++	  < .deps/$(*F).pp > .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm -f .deps/$(*F).pp
++info-am:
++info: info-am
++dvi-am:
++dvi: dvi-am
++check-am: all-am
++check: check-am
++installcheck-am:
++installcheck: installcheck-am
++install-exec-am: install-binPROGRAMS
++install-exec: install-exec-am
++
++install-data-am:
++install-data: install-data-am
++
++install-am: all-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++install: install-am
++uninstall-am: uninstall-binPROGRAMS
++uninstall: uninstall-am
++all-am: Makefile $(PROGRAMS)
++all-redirect: all-am
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
++installdirs:
++	$(mkinstalldirs)  $(DESTDIR)$(bindir)
++
++
++mostlyclean-generic:
++
++clean-generic:
++
++distclean-generic:
++	-rm -f Makefile $(CONFIG_CLEAN_FILES)
++	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
++
++maintainer-clean-generic:
++	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
++mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-compile \
++		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
++		mostlyclean-generic
++
++mostlyclean: mostlyclean-am
++
++clean-am:  clean-binPROGRAMS clean-compile clean-libtool clean-tags \
++		clean-depend clean-generic mostlyclean-am
++
++clean: clean-am
++
++distclean-am:  distclean-binPROGRAMS distclean-compile distclean-libtool \
++		distclean-tags distclean-depend distclean-generic \
++		clean-am
++	-rm -f libtool
++
++distclean: distclean-am
++
++maintainer-clean-am:  maintainer-clean-binPROGRAMS \
++		maintainer-clean-compile maintainer-clean-libtool \
++		maintainer-clean-tags maintainer-clean-depend \
++		maintainer-clean-generic distclean-am
++	@echo "This command is intended for maintainers to use;"
++	@echo "it deletes files that may require special tools to rebuild."
++
++maintainer-clean: maintainer-clean-am
++
++.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
++maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
++mostlyclean-compile distclean-compile clean-compile \
++maintainer-clean-compile mostlyclean-libtool distclean-libtool \
++clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
++distclean-tags clean-tags maintainer-clean-tags distdir \
++mostlyclean-depend distclean-depend clean-depend \
++maintainer-clean-depend info-am info dvi-am dvi check check-am \
++installcheck-am installcheck install-exec-am install-exec \
++install-data-am install-data install-am install uninstall-am uninstall \
++all-redirect all-am all installdirs mostlyclean-generic \
++distclean-generic clean-generic maintainer-clean-generic clean \
++mostlyclean distclean maintainer-clean
++
++
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
+--- metamail-2.7.orig/src/richmail/richlex.h
++++ metamail-2.7/src/richmail/richlex.h
+@@ -0,0 +1,166 @@
++/*-------------------------------------------------------------------------
++
++  richlex.h - Lexical analysis routines for parsing richtext messages.
++ 
++  Copyright (c) 1992 Rhys Weatherley
++
++  Permission to use, copy, modify, and distribute this material
++  for any purpose and without fee is hereby granted, provided
++  that the above copyright notice and this permission notice
++  appear in all copies, and that the name of Rhys Weatherley not be
++  used in advertising or publicity pertaining to this
++  material without specific, prior written permission.
++  RHYS WEATHERLEY MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR
++  SUITABILITY OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED
++  "AS IS", WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++  Revision History:
++  ================
++
++   Version  DD/MM/YY  By  Description
++   -------  --------  --  --------------------------------------
++     1.0    31/01/92  RW  Original Version of richlex.h
++     1.1    19/06/92  RW  Add support for multi-byte ISO-2022 codes.
++
++  You may contact the author by:
++  =============================
++
++   e-mail: rhys@cs.uq.oz.au
++     mail: Rhys Weatherley
++	   5 Horizon Drive
++	   Jamboree Heights
++	   Queensland 4074
++	   Australia
++
++-------------------------------------------------------------------------*/
++
++#ifndef	__RICHTEXT_H__
++#define	__RICHTEXT_H__
++
++#include <metamail/common.h>
++
++BEGIN_C_DECLS
++
++//#ifdef	__cplusplus
++//extern "C" {
++//#endif
++
++/*
++ * Define the data type to be used by characters in the richtext
++ * system.  Note: this is a long because some machines, MS-DOS
++ * machines for example, only have 16-bit integers and hence won't
++ * be able to cope with large multi-byte character codes.  If
++ * something is strange with your character processing, it is
++ * probably because you aren't using the right types.
++ */
++typedef	long	RCHAR;
++
++/*
++ * Set the following variable to zero to disable the
++ * correction of richtext commands.  The default
++ * value is non-zero.
++ */
++extern	int CorrectionEnabled;
++
++/*
++ * Set the following value to non-zero to enable the
++ * multi-byte '<' hack which ignores richtext commands
++ * in multi-byte modes.  The default value is zero.
++ */
++extern	int RichtextLessThanFlag;
++
++/*
++ * Define the function to call to get characters from
++ * the message.  The calling convention of this
++ * function is: "int func (void *param)".  The default
++ * value is "fgetc".  The function must return EOF
++ * at the end of the messsage;
++ */
++extern	int (*RichtextGetc) ();
++
++/*
++ * Define the function to call to output characters from
++ * richtextcorrect.  The calling convention of this
++ * function is: "int func (int c,void *param)".  The default
++ * value is "fputc".
++ */
++extern	int (*RichtextPutc) ();
++
++/*
++ * Define the maximum size of richtext command tokens.
++ */
++#define	MAX_TOKEN_SIZE		50
++
++/*
++ * Define the special token values that are returned by
++ * the "richtextlex" function.  These values were chosen
++ * to keep away from legal ASCII.
++ *
++ * Version 1.1: modified to negative values to keep away
++ * from legal ISO-2022 and other multi-byte characters.
++ */
++#define	RICHTEXT_COMMAND	((RCHAR)(-2))
++#define	RICHTEXT_NEG_COMMAND	((RCHAR)(-3))
++
++/*
++ * Reset the richtext parsing mechanism.
++ */
++extern	richtextreset();
++
++/*
++ * Get the next token from the input stream.  RICHTEXT_COMMAND
++ * or RICHTEXT_NEG_COMMAND are returned if it is a richtext command.
++ * e.g. "<cmd>" or "</cmd>".  The "token" buffer will receive the
++ * name of the command (without <,> or /) if it is a command.  This
++ * function will also truncate commands longer than MAX_TOKEN_SIZE - 1
++ * characters and abort command parsing if white space is encountered,
++ * so, for example, errors like "<bold hi kids</bold>" don't cause
++ * problems: it will be corrected to "<bold>hi kids</bold>".
++ * The "file" parameter is passed to the function pointed to by
++ * "RichtextGetc" on each call.
++ */
++extern	RCHAR	richtextlex( /* void *file,char *token,int TextEnriched */ );
++
++/*
++ * Read the input stream, correct the richtext, and write the
++ * results to the output stream.  "outparam" is passed to the
++ * "RichtextPutc" function as the second argument, and "inparam"
++ * is passed to "richtextlex" during parsing.
++ */
++extern	richtextcorrect( /* void *inparam,void *outparam,int TextEnriched */ );
++
++#define	RICH_ENC_US_ASCII	0	/* US-ASCII encoding: one-byte */
++#define	RICH_ENC_JP_ASCII	1	/* JP-ASCII encoding: one-byte */
++#define	RICH_ENC_KR_ASCII	2	/* KR-ASCII encoding: one-byte */
++#define	RICH_ENC_JIS_1978	100	/* JIS-X-0208-1978: two-byte */
++#define	RICH_ENC_JIS_1983	101	/* JIS-X-0208-1983: two-byte */
++#define	RICH_ENC_KSC_5601	200	/* KSC-5601 (Korean): two-byte */
++
++/*
++ * The following variable contains the current character
++ * encoding in use.  This should only be read.  Setting it
++ * is done via "richtextencoding".
++ */
++extern	int	RichtextCharEncoding;
++
++/*
++ * Change the encoding used for characters not present in
++ * richtext command sequences.
++ */
++extern	richtextencoding( /* int encoding */ );
++
++/*
++ * Define a number of macros for decoding multi-byte character
++ * codes.  The names of the macros have the form "RICHCHn_xxx"
++ * where "n" is the number of bytes in the character.
++ */
++#define	RICHCH2_FIRST(c)	(((c) >> 8) & 0xFF)
++#define	RICHCH2_SECOND(c)	((c) & 0xFF)
++
++//#ifdef	__cplusplus
++//};
++//#endif
++
++END_C_DECLS
++
++#endif	/* __RICHTEXT_H__ */
+--- metamail-2.7.orig/src/richmail/richset.h
++++ metamail-2.7/src/richmail/richset.h
+@@ -0,0 +1,172 @@
++/*-------------------------------------------------------------------------
++
++  richset.h - Handling for different character sets in richtext.
++ 
++  Copyright (c) 1992 Rhys Weatherley
++
++  Permission to use, copy, modify, and distribute this material
++  for any purpose and without fee is hereby granted, provided
++  that the above copyright notice and this permission notice
++  appear in all copies, and that the name of Rhys Weatherley not be
++  used in advertising or publicity pertaining to this
++  material without specific, prior written permission.
++  RHYS WEATHERLEY MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR
++  SUITABILITY OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED
++  "AS IS", WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++  Revision History:
++  ================
++
++   Version  DD/MM/YY  By  Description
++   -------  --------  --  --------------------------------------
++     1.0    19/06/92  RW  Original Version of richset.h
++
++  You may contact the author by:
++  =============================
++
++   e-mail: rhys@cs.uq.oz.au
++     mail: Rhys Weatherley
++	   5 Horizon Drive
++	   Jamboree Heights
++	   Queensland 4074
++	   Australia
++
++-------------------------------------------------------------------------*/
++
++#ifndef	__RICHSET_H__
++#define	__RICHSET_H__
++
++#include <metamail/common.h>
++
++BEGIN_C_DECLS
++
++/*
++ * Define the interface structure for a character set processor.
++ * The fields are as follows:
++ *
++ *	names	- Colon-separated list of character set names.
++ *	init	- Initialize the character set processor.
++ *	command	- Process a command before the default processing.
++ *		  Returns non-zero if processed, zero if not.
++ *	single	- Should return non-zero for a singleton command.
++ *	width	- Get the width in terminal characters of the character.
++ *	fold	- Returns non-zero if the character can be folded at.
++ *	render	- Render the character through RichtextPutc.
++ *	encoding- Enter or leave an encoding. newenc is -1 to leave.
++ *
++ */
++struct	charsetproc
++		{
++		    char *names;
++		    int (*init) ( /* char *name */ );
++		    int (*command) ( /* char *token, int negated */ );
++		    int (*single) ( /* char *token */ );
++		    int (*width) ( /* RCHAR c */ );
++		    int (*fold) ( /* RCHAR c */ );
++		    int (*render) ( /* RCHAR c, void *param */ );
++		    int (*encoding) ( /* int newenc */ );
++		};
++
++/*
++ * Define some standard character set processors.
++ */
++extern	struct 	charsetproc	usascii_charset;
++extern	struct	charsetproc	iso2022_charset;
++
++/*
++ * Define the information to be kept in the internal buffers
++ * about a character.  If "charset" is NULL, it is a control
++ * character.
++ */
++struct	charsetmember
++		{
++		    RCHAR ch;			 /* The character itself */
++		    struct charsetproc *charset; /* Character set of ch */
++		};
++
++/*
++ * Initialise the stack of character set processors, starting with
++ * a particular base processor.  The initialisation function of all
++ * character set processors is called.
++ */
++extern	charsetinit	( /* struct charsetproc *charset, char *name */ );
++
++/*
++ * Initialise the stack, starting with a character set processor with
++ * a particular name.
++ */
++extern	charsetnameinit	( /* char *name */ );
++
++/*
++ * Push a new character set processor onto the stack.
++ */
++extern	charsetpush	( /* struct charsetproc *charset */ );
++
++/*
++ * Pop the top-most character set processor off the stack
++ * if it matches the given processor.  Note: the base
++ * processor is never popped off.
++ */
++extern	charsetpop	( /* struct charsetproc *charset */ );
++
++/*
++ * See if the character set processor on the top of the stack
++ * matches the given processor.
++ */
++extern	int	charsettop ( /* struct charsetproc *charset */ );
++
++/*
++ * Set the details for a character set member in the top-most
++ * character set.
++ */
++extern	charmember	( /* struct charsetmember *member, RCHAR ch */ );
++
++/*
++ * Set the details for a member of a specific character set.
++ */
++extern	charmemberspec	( /* struct charsetmember *member, RCHAR ch,
++			     struct charset *charset */ );
++
++/*
++ * Set the details for a output control code character.
++ */
++extern	charmemberctrl	( /* struct charsetmember *member, RCHAR ch */ );
++
++/*
++ * Determine if the given character is a control code character.
++ */
++#define	charisctrl(member)	((member).charset == (struct charsetproc *)0)
++
++/*
++ * Attempt to process a richtext command by passing it to the
++ * "command" function of all character set processors.  Returns
++ * zero if the command was not processed.
++ */
++extern	int	charsetcommand	( /* char *token, int negated */ );
++
++/*
++ * Test for an extension singleton command.
++ */
++extern	int	charsetsingle	( /* char *token */ );
++
++/*
++ * Get the width of a particular character.
++ */
++#define	charmemberwidth(member) \
++		((*((member).charset -> width)) ((member).ch))
++
++/*
++ * Determine if a character can be folded at.
++ */
++#define	charmemberfold(member) \
++		((*((member).charset -> fold)) ((member).ch))
++
++/*
++ * Render a character on an output stream.
++ */
++#define	charmemberrender(member,param) \
++		((*((member).charset -> render)) ((member).ch,param))
++
++END_C_DECLS
++
++#endif	/* __RICHSET_H__ */
+--- metamail-2.7.orig/src/richmail/richlex.c
++++ metamail-2.7/src/richmail/richlex.c
+@@ -0,0 +1,480 @@
++/*-------------------------------------------------------------------------
++
++  richlex.c - Lexical analysis routines for parsing richtext messages.
++ 
++  Copyright (c) 1992 Rhys Weatherley
++
++  Permission to use, copy, modify, and distribute this material
++  for any purpose and without fee is hereby granted, provided
++  that the above copyright notice and this permission notice
++  appear in all copies, and that the name of Rhys Weatherley not be
++  used in advertising or publicity pertaining to this
++  material without specific, prior written permission.
++  RHYS WEATHERLEY MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR
++  SUITABILITY OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED
++  "AS IS", WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++  Revision History:
++  ================
++
++   Version  DD/MM/YY  By  Description
++   -------  --------  --  --------------------------------------
++     1.0    31/01/92  RW  Original Version of richlex.c
++     1.1    19/06/92  RW  Add support for multi-byte ISO-2022 codes.
++
++  You may contact the author by:
++  =============================
++
++   e-mail: rhys@cs.uq.oz.au
++     mail: Rhys Weatherley
++	   5 Horizon Drive
++	   Jamboree Heights
++	   Queensland 4074
++	   Australia
++
++  Caveats:
++  =======
++
++  If a multi-byte character contains "<lt>", and a richtext command or
++  escape sequence is started before all bytes of the multi-byte character
++  have been read in, then some characters may be discarded.
++
++-------------------------------------------------------------------------*/
++
++#include <metamail/common.h>
++
++#include "richlex.h"
++#include "richset.h"
++
++int CorrectionEnabled = 1;	/* Zero if correction has been disabled */
++int RichtextLessThanFlag = 0;	/* Non-zero to turn on multi-byte '<' hack */
++
++//extern	int fgetc ();
++//extern	int fputc ();
++
++int (*RichtextGetc) () = fgetc;	/* Function to call to get characters */
++int (*RichtextPutc) () = fputc; /* Function to call to put characters */
++int RichtextCharEncoding = RICH_ENC_US_ASCII; /* Current encoding mode */
++
++#define	MAX_STACK_SIZE	500
++#define	MAX_FLUSH_SIZE	3
++#define	MAX_PUSH_BACK	20
++static	int	StackSize=0;
++static	char	Stack[MAX_STACK_SIZE][MAX_TOKEN_SIZE];
++static	char	NextToken[MAX_TOKEN_SIZE];
++static	int	FlushStack=0;
++static	int	FlushSize=0;
++static	int	EndInpFile=0;
++static	int	CharSize=1;
++static	int	PushbackBuffer[MAX_PUSH_BACK];
++static	int	PushbackSize=0;
++static	int	PushbackExtract=0;
++
++#define	ESC	033
++#define	SI	017
++#define	SO	016
++
++#define	RGETRAW(f)	((*RichtextGetc)(f))
++#define	RGET(f)		(PushbackSize ? richtextgetback() : RGETRAW(f))
++#define	RPUT(c,f)	((*RichtextPutc)(((int)(c)),(f)))
++#define	RUNGET(c)	(richtextunget(c))
++#define	RPUSHBACK(c)	(richtextpushback(c))
++
++/*
++ * Define a "printf" format for a generic ISO-2022 character
++ * set name that includes the hexadecimal representation of
++ * the escape sequence character that turns ISO-2022 on or off
++ * on the terminal.
++ */
++#define	ISO2022_GENERIC	"x-iso-2022-gen-%2x"
++#define	ISO2022_CHARSET "x-iso-charset-"
++
++/*
++ * Define the character set shift characters for ISO-2022-KR.
++ */
++#define	ISO2022_SHIFTIN  "x-iso-shift-in"
++#define	ISO2022_SHIFTOUT "x-iso-shift-out"
++
++/*
++ * Construct multi-byte character codes.
++ */
++#define	RICHCH_2(first,second)	((RCHAR)(((first) << 8) | (second)))
++
++/*
++ * Reset the richtext parsing mechanism.
++ */
++richtextreset()
++{
++    StackSize = 0;
++    FlushStack = 0;
++    FlushSize = 0;
++    EndInpFile = 0;
++    CharSize = 1;
++    PushbackSize = 0;
++    PushbackExtract = 0;
++    RichtextCharEncoding = RICH_ENC_US_ASCII;
++    CorrectionEnabled = 1;
++    RichtextLessThanFlag = 0;
++}
++
++/*
++ * Push a character into the push-back buffer for later
++ * retrieval by RGET.
++ */
++static	void	richtextpushback(c)
++int	c;
++{
++    PushbackBuffer[PushbackSize++] = c;
++}
++
++/*
++ * Unget a character that has been read from the input stream.
++ */
++static	void	richtextunget(c)
++int	c;
++{
++    if (PushbackSize)
++	--PushbackExtract;	/* Character was retrieved from push-back */
++    else
++	richtextpushback(c);	/* Put character into empty push-back */
++}
++
++/*
++ * Unget two characters that have been read from the input stream.
++ */
++static	void	richtextunget2(c1,c2)
++int	c1,c2;
++{
++    if (PushbackExtract > 1) {
++	PushbackExtract -= 2;	/* Go back two characters in the push-back */
++	PushbackBuffer[PushbackExtract++] = c1;
++	PushbackBuffer[PushbackExtract++] = c2;
++    } else {
++	richtextpushback(c1);	/* Put the characters into the push-back */
++	richtextpushback(c2);
++    }
++}
++
++/*
++ * Retrieve a character from the push-back buffer.
++ */
++static	int	richtextgetback()
++{
++    int c;
++    c = PushbackBuffer[PushbackExtract++];
++    if (PushbackExtract >= PushbackSize) {
++	PushbackSize = 0;
++	PushbackExtract = 0;
++    }
++    return(c);
++}
++
++/*
++ * Find a match between NextToken and an element on the stack.
++ * Returns the number of elements down from the top it is.
++ * i.e. 0 if not on the stack, 1 if at the top, etc.
++ */
++static int richtextmatchup()
++{
++    int i = StackSize;
++    while (i > 0 && i > (StackSize - MAX_FLUSH_SIZE)) {
++	--i;
++	if (!strcmp(NextToken,Stack[i]))
++	    return(StackSize - i);
++    }
++    return(0);
++}
++
++/*
++ * Determine if the current token is one of the singleton
++ * richtext commands: <nl>, <lt>, <np>.
++ */
++static richtextsingle(TextEnriched)
++int TextEnriched;
++{
++    return (charsetsingle (NextToken) ||
++	    (!TextEnriched &&
++	        (!strcmp(NextToken,"nl") ||
++		!strcmp(NextToken,"lt") ||
++		!strcmp(NextToken,"np"))));
++}
++
++/*
++ * Recognise a character that can start a richtext command.
++ */
++#define	iscmdch(c)	(isalpha(c) || isdigit(c) || (c) == '/' || (c) == '-')
++#define iscmdch2(c)	(isalpha(c) || isdigit(c) || (c) == '-')
++#define TOLOWER(c)	(isupper(c)?tolower(c):c)
++#define valid_command(c1,c2) \
++	(( c1 == '/' && iscmdch2(c2) ) || \
++	 (!TextEnriched && TOLOWER(c1) == 'l' && TOLOWER(c2) == 't' ))
++
++/*
++ * Get the next token from the input stream.  RICHTEXT_COMMAND
++ * or RICHTEXT_NEG_COMMAND are returned if it is a richtext command.
++ * e.g. "<cmd>" or "</cmd>".  The "token" buffer will receive the
++ * name of the command (without <,> or /) if it is a command.  This
++ * function will also truncate commands longer than MAX_TOKEN_SIZE - 1
++ * characters and abort command parsing if white space is encountered,
++ * so, for example, errors like "<bold hi kids</bold>" don't cause
++ * problems: it will be corrected to "<bold>hi kids</bold>".
++ */
++RCHAR richtextlex(file,token,TextEnriched, nofill)
++void *file;
++char *token;
++int TextEnriched;
++int nofill; /* Inside a nofill env we parse newlines differently */
++{
++    int c,i,lastch;
++    RCHAR cmd;
++
++    lastch = 0;		/* No previous character for multi-byte chars as yet */
++
++    /* Perform any flushing of balancing commands that is necessary */
++    if (FlushStack) {
++	/* Flush out some extra closing commands */
++	strcpy(token,Stack[StackSize - FlushSize + (--FlushStack)]);
++	return(RICHTEXT_NEG_COMMAND);
++    } else if (FlushSize) {
++	/* Finished flushing: output the pending close command */
++	StackSize -= FlushSize;
++	if (StackSize > 0)
++	    --StackSize; /* Remove the command that was being matched up */
++	FlushSize = 0;
++	strcpy(token,NextToken);
++	if (EndInpFile)
++	    return((RCHAR)EOF); /* The last flush was the end-of-file cleanup */
++	else
++	    return(RICHTEXT_NEG_COMMAND);
++    }
++
++    /* Fetch a new character or richtext command */
++    for (;;) {		/* Loop so we can come back on ignored commands */
++        c = RGET(file);
++        if (c == '<') { 
++	    /* Check for multi-byte mode, where "<" is special */
++	    int c2;
++	    if (CharSize > 1) {
++		if (RichtextLessThanFlag) {
++		    /* The multi-byte '<' hack is in effect: not a command */
++		    if (lastch)
++		        return(RICHCH_2(lastch,'<'));
++		    lastch = '<';
++		    continue;	/* Back around for another character */
++		}
++		if ((c = RGET(file)) == EOF) {
++		    RUNGET(c);
++		    return((RCHAR)'<');
++		}
++		c2 = RGET(file);
++		richtextunget2(c,c2);
++		if( !valid_command(c,c2) ){
++		    /* We have a stray less-than symbol */
++	            if (lastch)
++		        return(RICHCH_2(lastch,'<'));
++	            lastch = '<';
++	            continue;	/* Back around for another character */
++		}
++	    } else if (TextEnriched) {
++	    	c2 = RGET(file);
++		if (c2 == '<') {
++		    return((RCHAR)c);
++		} else {
++		    RUNGET(c2);
++		}
++	    }
++
++	    /* Read a command token from the input file */
++	    cmd = RICHTEXT_COMMAND;
++	    if ((c = RGET(file)) == '/') {
++	        cmd = RICHTEXT_NEG_COMMAND;
++	        c = RGET(file);
++	    }
++            for (i = 0; i < (MAX_TOKEN_SIZE - 1) && c != '>'
++	    		&& c != EOF && !isspace(c); ++i) {
++                NextToken[i] = isupper(c) ? tolower(c) : c;
++	        c = RGET(file);
++            }
++	    if (c != '>' && c != EOF && !isspace(c)) {
++		/* We have a long command: skip the rest of it */
++		while (c != '>' && c != EOF && !isspace(c))
++		    c = RGET(file);
++	    }
++            if (c == EOF) {
++		if (!StackSize)
++	    	    return((RCHAR)EOF);
++	        /* Flush the remaining commands at the end of the input file */
++	        FlushSize = StackSize;
++	        FlushStack = FlushSize;
++	        EndInpFile = 1;
++	        return(richtextlex(file,token,TextEnriched, nofill)); /* Flush something out */
++	    }
++            NextToken[i] = '\0';
++
++	    /* Process <lt> specially for multi-byte characters */
++	    if (CharSize > 1 && !TextEnriched && !strcmp(NextToken,"lt")) {
++	        if (lastch)
++		    return(RICHCH_2(lastch,'<'));
++	        lastch = '<';
++	        continue;	/* Back around for another character */
++	    }
++
++	    /* Check to see if we need to correct anything */
++	    if (!CorrectionEnabled) {
++		/* No correction to do: just skip the correction phase */
++		strcpy(token,NextToken);
++		return(cmd);
++	    }
++	    if (cmd == RICHTEXT_COMMAND) {
++		/* Save the command on the stack if not a singleton command */
++		if (!richtextsingle(TextEnriched)) {
++		    strcpy (Stack[StackSize++],NextToken);
++		}
++	    }
++	    else if (!(i = richtextmatchup()))
++		continue;	/* No matchup - just drop it */
++	    else if (i == 1)
++		--StackSize;	/* Correct match at the stack top */
++	    else {
++		/* Flush some correction elements from the stack */
++		FlushSize = i - 1;
++		FlushStack = FlushSize;
++		return(richtextlex(file,token,TextEnriched, nofill));
++	    }
++	    strcpy(token,NextToken);
++	    return(cmd);
++        } else if (c == SI) {
++	    /* Shift-in character: translate to a singleton */
++	    strcpy(token,ISO2022_SHIFTIN);
++	    return(RICHTEXT_COMMAND);
++	} else if (c == SO) {
++	    /* Shift-out character: translate to a singleton */
++	    strcpy(token,ISO2022_SHIFTOUT);
++	    return(RICHTEXT_COMMAND);
++	} else if (c == ESC) {
++	    /* Check for escape sequences that change character sizes */
++	    int newc;
++	    c = RGET(file);
++	    if (c == '$') {
++		newc = RGET(file);
++		if (newc == ')') {
++		    newc = RGET(file);	/* 4-byte ESC-$-)-? sequence */
++		    sprintf(token,ISO2022_CHARSET,newc);
++		} else {
++		    sprintf(token,ISO2022_GENERIC,newc);
++		}
++		return(RICHTEXT_COMMAND);
++	    } else if (c == '(') {
++		newc = RGET(file);
++		sprintf(token,ISO2022_GENERIC,newc);
++		return(RICHTEXT_NEG_COMMAND);
++	    } else {
++		RUNGET(c);
++		return((RCHAR)ESC);
++	    }
++        } else if (c == EOF && StackSize) {
++	    /* Flush the remaining commands at the end of the input file */
++	    FlushSize = StackSize;
++	    FlushStack = FlushSize;
++	    EndInpFile = 1;
++	    return(richtextlex(file,token,TextEnriched, nofill)); /* Flush something out */
++	} else if (CharSize > 1) {
++	    /* Recognise a multi-byte character */
++	    int newc;
++	    if (!lastch && isspace (c))
++	      return ((RCHAR)c); /* Hack for spaces in 2-byte modes */
++	    if (lastch)
++		return (RICHCH_2(lastch,c)); /* This is second of 2 chars */
++	    if ((newc = RGET(file)) == EOF) {
++		RUNGET(newc);	/* Push the EOF back into the input stream */
++		return((RCHAR)c); /* Just return the partial single-byte char */
++	    } else if (newc == '<') {
++		/* The second character could be "<lt>", so loop around */
++		lastch = c;
++		RUNGET(newc);
++		continue;
++	    } else {
++	    	return(RICHCH_2(c,newc));
++	    }
++	} else if (TextEnriched && !nofill && (c == '\n')) {
++	    int c2 = RGET(file);
++	    RUNGET(c2);
++	    if (c2 == '\n') {
++		strcpy(token, "iNtErNaL-nL");
++		return(RICHTEXT_COMMAND);
++	    } else {
++		return((RCHAR)c);
++	    }
++	} else {
++	    return((RCHAR)c);
++	}
++    }
++}
++
++/*
++ * Output a string via "RichtextPutc".
++ */
++static richtextoutstr(str,outparam)
++char *str;
++void *outparam;
++{
++    while (*str) {
++	RPUT(*str,outparam);
++	++str;
++    }
++}
++
++/*
++ * Read the input stream, correct the richtext, and write the
++ * results to the output stream.
++ */
++richtextcorrect(inparam,outparam,TextEnriched)
++void *inparam,*outparam;
++int TextEnriched;
++{
++    RCHAR c;
++    char token[MAX_TOKEN_SIZE];
++    while ((c = richtextlex(inparam,token,TextEnriched, 0)) != (RCHAR)EOF) {
++	if (c == RICHTEXT_COMMAND) {
++	    RPUT('<',outparam);
++	    richtextoutstr(token,outparam);
++	    RPUT('>',outparam);
++	} else if (c == RICHTEXT_NEG_COMMAND) {
++	    RPUT('<',outparam);
++	    RPUT('/',outparam);
++	    richtextoutstr(token,outparam);
++	    RPUT('>',outparam);
++	} else if (c >= 256) {
++	    RPUT(RICHCH2_FIRST(c),outparam);
++	    RPUT(RICHCH2_SECOND(c),outparam);
++	} else {
++	    RPUT(c,outparam);
++	}
++    }
++}
++
++/*
++ * Change the encoding used for characters not present in
++ * richtext command sequences.
++ */
++richtextencoding(encoding)
++int	encoding;
++{
++    RichtextCharEncoding = encoding;
++    switch (RichtextCharEncoding) {
++	case RICH_ENC_US_ASCII:
++	case RICH_ENC_JP_ASCII:
++	case RICH_ENC_KR_ASCII:
++		CharSize = 1;
++		break;
++
++	case RICH_ENC_JIS_1978:
++	case RICH_ENC_JIS_1983:
++	case RICH_ENC_KSC_5601:
++		CharSize = 2;
++		break;
++
++	default:CharSize = 1;
++		break;
++    }
++}
+--- metamail-2.7.orig/src/richmail/richset.c
++++ metamail-2.7/src/richmail/richset.c
+@@ -0,0 +1,222 @@
++/*-------------------------------------------------------------------------
++
++  richset.c - Handling for different character sets in richtext.
++ 
++  Copyright (c) 1992 Rhys Weatherley
++
++  Permission to use, copy, modify, and distribute this material
++  for any purpose and without fee is hereby granted, provided
++  that the above copyright notice and this permission notice
++  appear in all copies, and that the name of Rhys Weatherley not be
++  used in advertising or publicity pertaining to this
++  material without specific, prior written permission.
++  RHYS WEATHERLEY MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR
++  SUITABILITY OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED
++  "AS IS", WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++  Revision History:
++  ================
++
++   Version  DD/MM/YY  By  Description
++   -------  --------  --  --------------------------------------
++     1.0    21/06/92  RW  Original Version of richset.c
++
++  You may contact the author by:
++  =============================
++
++   e-mail: rhys@cs.uq.oz.au
++     mail: Rhys Weatherley
++	   5 Horizon Drive
++	   Jamboree Heights
++	   Queensland 4074
++	   Australia
++
++-------------------------------------------------------------------------*/
++
++#include <metamail/common.h>
++
++#include "richlex.h"
++#include "richset.h"
++
++/*
++ * Define a list of all character set processors in memory.
++ */
++static	struct	charsetproc	*CharacterSets[] =
++	  {&usascii_charset,
++	   &iso2022_charset,
++	   NULL};
++
++/*
++ * Global data for this module.
++ */
++#define	MAX_CHAR_SETS	100
++static	int	NumCharSets=0;
++static	struct	charsetproc	*CharSets[MAX_CHAR_SETS];
++static	int	CharEncStack[MAX_CHAR_SETS];
++
++/*
++ * Initialise the stack of character set processors, starting with
++ * a particular base processor.  The initialisation function of all
++ * character set processors is called.
++ */
++charsetinit (charset,name)
++struct	charsetproc *charset;
++char	*name;
++{
++    int temp = 0;
++    CharSets[0] = charset;
++    NumCharSets = 1;
++    while (CharacterSets[temp]) {
++        (*(CharacterSets[temp] -> init))
++		((CharacterSets[temp] == charset ? name : NULL));
++	++temp;
++    }
++}
++
++/*
++ * Initialise the stack, starting with a character set processor with
++ * a particular name.
++ */
++charsetnameinit	(name)
++char	*name;
++{
++    int temp = 0;
++    int succeed = 0;
++    char *temp1,*temp2;
++    struct charsetproc *charset = &usascii_charset;
++    while (!succeed && CharacterSets[temp]) {
++	temp2 = CharacterSets[temp] -> names;
++	while (!succeed && *temp2) {
++	    temp1 = name;
++	    while (*temp1 && *temp2 && *temp2 != ':' && *temp2 == *temp1) {
++		++temp1;
++		++temp2;
++	    }
++	    if (*temp1 == '\0' && (*temp2 == '\0' || *temp2 == ':')) {
++		succeed = 1;
++		charset = CharacterSets[temp];
++	    }
++	    while (*temp2 && *temp2 != ':') {
++		++temp2;
++	    }
++	    if (*temp2 == ':') {
++		++temp2;
++	    }
++	}
++	++temp;
++    }
++    charsetinit (charset,name);
++}
++
++/*
++ * Push a new character set processor onto the stack.
++ */
++charsetpush (charset)
++struct	charsetproc *charset;
++{
++    if (NumCharSets >= MAX_CHAR_SETS) {
++    	fprintf (stderr,"Too many nested character sets: aborting\n");
++	exit (1);
++    } else {
++	CharEncStack[NumCharSets - 1] = RichtextCharEncoding;
++	(*(CharSets[NumCharSets - 1] -> encoding)) (-1); /* Leave current */
++    	CharSets[NumCharSets++] = charset;
++    }
++}
++
++/*
++ * Pop the top-most character set processor off the stack
++ * if it matches the given processor.  Note: the base
++ * processor is never popped off.
++ */
++charsetpop (charset)
++struct	charsetproc *charset;
++{
++    if (NumCharSets > 1 && CharSets[NumCharSets - 1] == charset) {
++        --NumCharSets;
++	richtextencoding (CharEncStack[NumCharSets - 1]);
++	(*(CharSets[NumCharSets - 1] -> encoding)) (RichtextCharEncoding);
++    }
++}
++
++/*
++ * See if the character set processor on the top of the stack
++ * matches the given processor.
++ */
++int	charsettop (charset)
++struct	charsetproc *charset;
++{
++    if (NumCharSets > 1) {
++	return (CharSets[NumCharSets - 1] == charset);
++    } else {
++	return (0);
++    }
++}
++
++/*
++ * Set the details for a character set member in the top-most
++ * character set.
++ */
++charmember (member,ch)
++struct	charsetmember *member;
++RCHAR	ch;
++{
++    member -> ch = ch;
++    member -> charset = CharSets[NumCharSets - 1];
++}
++
++/*
++ * Set the details for a member of a specific character set.
++ */
++charmemberspec (member,ch,charset)
++struct	charsetmember *member;
++RCHAR	ch;
++struct	charsetproc *charset;
++{
++    member -> ch = ch;
++    member -> charset = charset;
++}
++
++/*
++ * Set the details for a output control code character.
++ */
++charmemberctrl (member,ch)
++struct	charsetmember *member;
++RCHAR	ch;
++{
++    member -> ch = ch;
++    member -> charset = NULL;
++}
++
++/*
++ * Attempt to process a richtext command by passing it to the
++ * "command" function of all character set processors.  Returns
++ * zero if the command was not processed.
++ */
++int	charsetcommand (token,negated)
++char	*token;
++int	negated;
++{
++    int temp = 0;
++    while (CharacterSets[temp]) {
++    	if ((*(CharacterSets[temp] -> command)) (token,negated))
++	    return (1);
++	++temp;
++    }
++    return (0);
++}
++
++/*
++ * Test for an extension singleton command.
++ */
++int	charsetsingle (token)
++char	*token;
++{
++    int temp = 0;
++    while (CharacterSets[temp]) {
++    	if ((*(CharacterSets[temp] -> single)) (token))
++	    return (1);
++	++temp;
++    }
++    return (0);
++}
+--- metamail-2.7.orig/src/Makefile.in
++++ metamail-2.7/src/Makefile.in
+@@ -0,0 +1,298 @@
++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
++
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++
++SHELL = @SHELL@
++
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
++
++DESTDIR =
++
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++
++top_builddir = ..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
++INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++transform = @program_transform_name@
++
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++host_alias = @host_alias@
++host_triplet = @host@
++AS = @AS@
++CATCOMMAND = @CATCOMMAND@
++CC = @CC@
++DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
++EXEEXT = @EXEEXT@
++LIBTOOL = @LIBTOOL@
++LIBTOOL_DEPS = @LIBTOOL_DEPS@
++LN_S = @LN_S@
++LPRCOMMAND = @LPRCOMMAND@
++LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAKEINFO = @MAKEINFO@
++OBJDUMP = @OBJDUMP@
++OBJEXT = @OBJEXT@
++PACKAGE = @PACKAGE@
++RANLIB = @RANLIB@
++STRIP = @STRIP@
++VERSION = @VERSION@
++ac_aux_dir = @ac_aux_dir@
++
++MAINTAINERCLEANFILES = Makefile.in
++
++SUBDIRS = metamail richmail
++mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
++CONFIG_HEADER = ../metamail/config.h
++CONFIG_CLEAN_FILES = 
++DIST_COMMON =  Makefile.am Makefile.in
++
++
++DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
++
++TAR = tar
++GZIP_ENV = --best
++all: all-redirect
++.SUFFIXES:
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
++	cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile
++
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
++	cd $(top_builddir) \
++	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
++
++
++# This directory's subdirectories are mostly independent; you can cd
++# into them and run `make' without going through this Makefile.
++# To change the values of `make' variables: instead of editing Makefiles,
++# (1) if the variable is set in `config.status', edit `config.status'
++#     (which will cause the Makefiles to be regenerated when you run `make');
++# (2) otherwise, pass the desired values on the `make' command line.
++
++@SET_MAKE@
++
++all-recursive install-data-recursive install-exec-recursive \
++installdirs-recursive install-recursive uninstall-recursive  \
++check-recursive installcheck-recursive info-recursive dvi-recursive:
++	@set fnord $(MAKEFLAGS); amf=$$2; \
++	dot_seen=no; \
++	target=`echo $@ | sed s/-recursive//`; \
++	list='$(SUBDIRS)'; for subdir in $$list; do \
++	  echo "Making $$target in $$subdir"; \
++	  if test "$$subdir" = "."; then \
++	    dot_seen=yes; \
++	    local_target="$$target-am"; \
++	  else \
++	    local_target="$$target"; \
++	  fi; \
++	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
++	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	done; \
++	if test "$$dot_seen" = "no"; then \
++	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
++	fi; test -z "$$fail"
++
++mostlyclean-recursive clean-recursive distclean-recursive \
++maintainer-clean-recursive:
++	@set fnord $(MAKEFLAGS); amf=$$2; \
++	dot_seen=no; \
++	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
++	  rev="$$subdir $$rev"; \
++	  test "$$subdir" != "." || dot_seen=yes; \
++	done; \
++	test "$$dot_seen" = "no" && rev=". $$rev"; \
++	target=`echo $@ | sed s/-recursive//`; \
++	for subdir in $$rev; do \
++	  echo "Making $$target in $$subdir"; \
++	  if test "$$subdir" = "."; then \
++	    local_target="$$target-am"; \
++	  else \
++	    local_target="$$target"; \
++	  fi; \
++	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
++	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	done && test -z "$$fail"
++tags-recursive:
++	list='$(SUBDIRS)'; for subdir in $$list; do \
++	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
++	done
++
++tags: TAGS
++
++ID: $(HEADERS) $(SOURCES) $(LISP)
++	list='$(SOURCES) $(HEADERS)'; \
++	unique=`for i in $$list; do echo $$i; done | \
++	  awk '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	here=`pwd` && cd $(srcdir) \
++	  && mkid -f$$here/ID $$unique $(LISP)
++
++TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
++	tags=; \
++	here=`pwd`; \
++	list='$(SUBDIRS)'; for subdir in $$list; do \
++   if test "$$subdir" = .; then :; else \
++	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
++   fi; \
++	done; \
++	list='$(SOURCES) $(HEADERS)'; \
++	unique=`for i in $$list; do echo $$i; done | \
++	  awk '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
++	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
++
++mostlyclean-tags:
++
++clean-tags:
++
++distclean-tags:
++	-rm -f TAGS ID
++
++maintainer-clean-tags:
++
++distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
++
++subdir = src
++
++distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign src/Makefile
++	@for file in $(DISTFILES); do \
++	  d=$(srcdir); \
++	  if test -d $$d/$$file; then \
++	    cp -pr $$d/$$file $(distdir)/$$file; \
++	  else \
++	    test -f $(distdir)/$$file \
++	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
++	    || cp -p $$d/$$file $(distdir)/$$file || :; \
++	  fi; \
++	done
++	for subdir in $(SUBDIRS); do \
++	  if test "$$subdir" = .; then :; else \
++	    test -d $(distdir)/$$subdir \
++	    || mkdir $(distdir)/$$subdir \
++	    || exit 1; \
++	    chmod 777 $(distdir)/$$subdir; \
++	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
++	      || exit 1; \
++	  fi; \
++	done
++info-am:
++info: info-recursive
++dvi-am:
++dvi: dvi-recursive
++check-am: all-am
++check: check-recursive
++installcheck-am:
++installcheck: installcheck-recursive
++install-exec-am:
++install-exec: install-exec-recursive
++
++install-data-am:
++install-data: install-data-recursive
++
++install-am: all-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++install: install-recursive
++uninstall-am:
++uninstall: uninstall-recursive
++all-am: Makefile
++all-redirect: all-recursive
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
++installdirs: installdirs-recursive
++installdirs-am:
++
++
++mostlyclean-generic:
++
++clean-generic:
++
++distclean-generic:
++	-rm -f Makefile $(CONFIG_CLEAN_FILES)
++	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
++
++maintainer-clean-generic:
++	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
++mostlyclean-am:  mostlyclean-tags mostlyclean-generic
++
++mostlyclean: mostlyclean-recursive
++
++clean-am:  clean-tags clean-generic mostlyclean-am
++
++clean: clean-recursive
++
++distclean-am:  distclean-tags distclean-generic clean-am
++	-rm -f libtool
++
++distclean: distclean-recursive
++
++maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
++		distclean-am
++	@echo "This command is intended for maintainers to use;"
++	@echo "it deletes files that may require special tools to rebuild."
++
++maintainer-clean: maintainer-clean-recursive
++
++.PHONY: install-data-recursive uninstall-data-recursive \
++install-exec-recursive uninstall-exec-recursive installdirs-recursive \
++uninstalldirs-recursive all-recursive check-recursive \
++installcheck-recursive info-recursive dvi-recursive \
++mostlyclean-recursive distclean-recursive clean-recursive \
++maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
++distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
++dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
++install-exec install-data-am install-data install-am install \
++uninstall-am uninstall all-redirect all-am all installdirs-am \
++installdirs mostlyclean-generic distclean-generic clean-generic \
++maintainer-clean-generic clean mostlyclean distclean maintainer-clean
++
++
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
+--- metamail-2.7.orig/src/metamail/mailcap.h
++++ metamail-2.7/src/metamail/mailcap.h
+@@ -0,0 +1,34 @@
++/*
++Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++
++Permission to use, copy, modify, and distribute this material 
++for any purpose and without fee is hereby granted, provided 
++that the above copyright notice and this permission notice 
++appear in all copies, and that the name of Bellcore not be 
++used in advertising or publicity pertaining to this 
++material without the specific, prior written permission 
++of an authorized representative of Bellcore.  BELLCORE 
++MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++*/
++
++#ifndef METAMAIL_MAILCAP_H
++#define METAMAIL_MAILCAP_H 1
++
++struct MailcapEntry {
++  char *contenttype;
++  char *command;
++  char *testcommand;
++  int needsterminal;
++  int copiousoutput;
++  int needtofree;
++  char *label;
++  char *printcommand;
++};
++
++int  ProcessMailcapFiles (char *);
++int  TryBuiltIns         (char *);
++int  ProcessMailcapFile  (char *, char*);
++
++#endif /* METAMAIL_MAILCAP_H */
+--- metamail-2.7.orig/src/metamail/output
++++ metamail-2.7/src/metamail/output
+@@ -0,0 +1,428 @@
++PWD=/home/mike/debian/metamail-2.7/src/metamail
++XAUTHORITY=/home/mike/.Xauthority
++WINDOWID=20971534
++MM_SUMMARY=7  (from Stephan Wright <stephan.wright@chello.at> )
++MM_HEADERS=
++From stephan.wright@chello.at Wed Jan 17 00:54:06 2001
++Return-path: <stephan.wright@chello.at>
++Envelope-to: mike@localhost
++Delivery-date: Wed, 17 Jan 2001 00:54:06 +0100
++Received: from localhost ([127.0.0.1] ident=mail)
++	by skair.in.natoka.at with esmtp (Exim 3.20 #1 (Debian))
++	id 14IfvR-0000eJ-00
++	for <mike@localhost>; Wed, 17 Jan 2001 00:54:05 +0100
++Received: from stud3.tuwien.ac.at [193.170.75.13]
++	by localhost with POP3 (fetchmail-5.5.3)
++	for mike@localhost (single-drop); Wed, 17 Jan 2001 00:54:05 +0100 (CET)
++Received: from mr.tuwien.ac.at (mr.tuwien.ac.at [128.130.2.10])
++	by stud3.tuwien.ac.at (8.9.3 (PHNE_18979)/8.9.3) with ESMTP id AAA08182;
++	Wed, 17 Jan 2001 00:39:08 +0100 (MET)
++Received: from viemta06.chello.at (viemta06.chello.at [195.34.133.56])
++	by mr.tuwien.ac.at (8.11.1/8.11.1) with ESMTP id f0GNd4C26837;
++	Wed, 17 Jan 2001 00:39:04 +0100 (MET)
++Received: from michelangelo.telekabel.at ([62.178.9.127])
++          by viemta06.chello.at
++          (InterMail vK.4.03.01.00 201-232-122 license 9caa03a7df1d31c048ffcc0d31ac5855)
++          with ESMTP
++          id <20010116233900.BMRG7188.viemta06@michelangelo.telekabel.at>;
++          Wed, 17 Jan 2001 00:39:00 +0100
++Message-ID: <3A64DBB9.74527B61@chello.at>
++Date: Wed, 17 Jan 2001 00:39:37 +0100
++From: Stephan Wright <stephan.wright@chello.at>
++Reply-To: stephan.wright@chello.at
++X-Mailer: Mozilla 4.01 [de] (Win95; I)
++MIME-Version: 1.0
++To: Wolfgang Hiermann <wolfgang.hiermann@teleweb.at>,
++        Susanne Schuster <e9107982@student.tuwien.ac.at>,
++        Roland Summerauer <h9751337@obelix.wu-wien.ac.at>,
++        Raimund Kirner <e9625030@student.tuwien.ac.at>,
++        "Michael Mörz" <e9625136@student.tuwien.ac.at>,
++        Doris Ulrich <e8101579@student.tuwien.ac.at>,
++        Daniel Wronski <e9625027@student.tuwien.ac.at>,
++        Balazs Lichtl <e9625772@stud3.tuwien.ac.at>
++Subject: [Fwd: Fw: Das ist aber lieb geschrieben!]
++X-Priority: 3 (Normal)
++Content-Type: multipart/mixed; boundary="------------A0D4511CCFC2DF8B814B1B9E"
++X-UIDL: *2+!!Ec8e9F>?!!70^!!
++Status: RO
++Content-Length: 32777
++Lines: 485
++
++MM_NOTTTY=1
++MM_QUIET=cat
++HOSTNAME=skair
++DEBFULLNAME=Michael Moerz
++MM_MAILER=unknown
++GDMSESSION=Gnome
++USER=mike
++MACHTYPE=i386-pc-linux-gnu
++DEBEMAIL=e9625136@stud3.tuwien.ac.at
++MAIL=/var/spool/mail/mike
++LANG=C
++DISPLAY=:0.0
++MM_USEPAGER=0
++LOGNAME=mike
++SHLVL=3
++SSH_AGENT_PID=1306
++SESSION_MANAGER=local/skair:/tmp/.ICE-unix/1263
++MM_CONTENTTYPE=multipart/mixed ; boundary = "------------A0D4511CCFC2DF8B814B1B9E"
++USERNAME=mike
++SHELL=/bin/bash
++HOSTTYPE=i386
++CVSROOT=:pserver:mike@localhost:/home/repositories
++MM_DEBUG=1
++MM_NOASK=text,text/plain,text/richtext
++MM_RUNASROOT=0
++OSTYPE=linux-gnu
++HOME=/home/mike
++TERM=xterm
++SSH_AUTH_SOCK=/tmp/ssh-ApDG1263/agent.1263
++PATH=/home/mike/debian/metamail-2.7/src/metamail/.libs:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
++_=/usr/bin/printenv
++PWD=/home/mike/debian/metamail-2.7/src/metamail
++XAUTHORITY=/home/mike/.Xauthority
++WINDOWID=20971534
++MM_SUMMARY=oding: 8bit  (from Stephan Wright <stephan.wright@chello.at> )
++MM_HEADERS=
++Content-Type: text/plain; charset=iso-8859-1
++Content-Type: text/plain; charset=iso-8859-1
++Content-Transfer-Encoding: 8bit
++Content-Transfer-Encoding: 8bit
++
++MM_NOTTTY=1
++MM_QUIET=cat
++HOSTNAME=skair
++DEBFULLNAME=Michael Moerz
++MM_MAILER=unknown
++GDMSESSION=Gnome
++USER=mike
++MACHTYPE=i386-pc-linux-gnu
++DEBEMAIL=e9625136@stud3.tuwien.ac.at
++MAIL=/var/spool/mail/mike
++LANG=C
++DISPLAY=:0.0
++MM_USEPAGER=0
++LOGNAME=mike
++SHLVL=3
++SSH_AGENT_PID=1306
++SESSION_MANAGER=local/skair:/tmp/.ICE-unix/1263
++MM_CONTENTTYPE=text/plain ; charset = iso-8859-1
++USERNAME=mike
++SHELL=/bin/bash
++HOSTTYPE=i386
++CVSROOT=:pserver:mike@localhost:/home/repositories
++MM_DEBUG=1
++MM_NOASK=text,text/plain,text/richtext
++MM_RUNASROOT=0
++OSTYPE=linux-gnu
++HOME=/home/mike
++TERM=xterm
++SSH_AUTH_SOCK=/tmp/ssh-ApDG1263/agent.1263
++PATH=/home/mike/debian/metamail-2.7/src/metamail/.libs:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
++_=/usr/bin/printenv
++PWD=/home/mike/debian/metamail-2.7/src/metamail
++XAUTHORITY=/home/mike/.Xauthority
++WINDOWID=20971534
++MM_SUMMARY=oding: 8bit  (from Stephan Wright <stephan.wright@chello.at> )
++MM_HEADERS=
++Content-Type: text/plain; charset=iso-8859-1
++Content-Type: text/plain; charset=iso-8859-1
++Content-Transfer-Encoding: 8bit
++Content-Transfer-Encoding: 8bit
++
++MM_NOTTTY=0
++MM_QUIET=cat
++HOSTNAME=skair
++DEBFULLNAME=Michael Moerz
++MM_MAILER=unknown
++GDMSESSION=Gnome
++USER=mike
++MACHTYPE=i386-pc-linux-gnu
++DEBEMAIL=e9625136@stud3.tuwien.ac.at
++MAIL=/var/spool/mail/mike
++LANG=C
++DISPLAY=:0.0
++MM_USEPAGER=0
++LOGNAME=mike
++SHLVL=3
++SSH_AGENT_PID=1306
++SESSION_MANAGER=local/skair:/tmp/.ICE-unix/1263
++MM_CONTENTTYPE=text/plain ; charset = iso-8859-1
++USERNAME=mike
++SHELL=/bin/bash
++HOSTTYPE=i386
++CVSROOT=:pserver:mike@localhost:/home/repositories
++MM_DEBUG=1
++MM_NOASK=text,text/plain,text/richtext
++MM_RUNASROOT=0
++OSTYPE=linux-gnu
++HOME=/home/mike
++TERM=xterm
++SSH_AUTH_SOCK=/tmp/ssh-ApDG1263/agent.1263
++PATH=/home/mike/debian/metamail-2.7/src/metamail/.libs:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
++_=/usr/bin/printenv
++Metamail Version 2.7, debugging turned on.
++Trying to open input file: ../../../../metamailtest
++Date: Wed, 17 Jan 2001 00:39:37 +0100
++From: Stephan Wright <stephan.wright@chello.at>
++To: Wolfgang Hiermann <wolfgang.hiermann@teleweb.at>,         Susanne Schuster <e9107982@student.tuwien.ac.at>,         Roland Summerauer <h9751337@obelix.wu-wien.ac.at>,         Raimund Kirner <e9625030@student.tuwien.ac.at>,         "Michael Mörz" <e9625136@student.tuwien.ac.at>,         Doris Ulrich <e8101579@student.tuwien.ac.at>,         Daniel Wronski <e9625027@student.tuwien.ac.at>,         Balazs Lichtl <e9625772@stud3.tuwien.ac.at>
++Subject: [Fwd: Fw: Das ist aber lieb geschrieben!]
++NEW PARAMETER: boundary VALUE: "------------A0D4511CCFC2DF8B814B1B9E"
++
++Here is the environment:
++
++Handling multipart as built-in here.  Boundary: --------------A0D4511CCFC2DF8B814B1B9E
++NEW PARAMETER: charset VALUE: iso-8859-1
++
++Here is the environment:
++
++Here is the environment:
++
++---Executing: xterm -title 'oding: 8bit  (from Stephan Wright <stephan.wright@chello.at> )' -e  metamail -P -b -c 'text/plain ; charset = iso-8859-1' /tmp/MQxhZtQ
++PWD=/home/mike/debian/metamail-2.7/src/metamail
++XAUTHORITY=/home/mike/.Xauthority
++WINDOWID=20971534
++MM_SUMMARY=inline  (from Stephan Wright <stephan.wright@chello.at> )
++MM_HEADERS=
++Content-Type: message/rfc822
++Content-Transfer-Encoding: 8bit
++Content-Disposition: inline
++
++MM_NOTTTY=1
++MM_QUIET=cat
++HOSTNAME=skair
++DEBFULLNAME=Michael Moerz
++MM_MAILER=unknown
++GDMSESSION=Gnome
++USER=mike
++MACHTYPE=i386-pc-linux-gnu
++DEBEMAIL=e9625136@stud3.tuwien.ac.at
++MAIL=/var/spool/mail/mike
++LANG=C
++DISPLAY=:0.0
++MM_USEPAGER=0
++LOGNAME=mike
++SHLVL=3
++SSH_AGENT_PID=1306
++SESSION_MANAGER=local/skair:/tmp/.ICE-unix/1263
++MM_CONTENTTYPE=message/rfc822
++USERNAME=mike
++SHELL=/bin/bash
++HOSTTYPE=i386
++CVSROOT=:pserver:mike@localhost:/home/repositories
++MM_DEBUG=1
++MM_NOASK=text,text/plain,text/richtext
++MM_RUNASROOT=0
++OSTYPE=linux-gnu
++HOME=/home/mike
++TERM=xterm
++SSH_AUTH_SOCK=/tmp/ssh-ApDG1263/agent.1263
++PATH=/home/mike/debian/metamail-2.7/src/metamail/.libs:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
++_=/usr/bin/printenv
++PWD=/home/mike/debian/metamail-2.7/src/metamail
++XAUTHORITY=/home/mike/.Xauthority
++WINDOWID=20971534
++MM_SUMMARY=Fw: Das ist aber lieb geschrieben   (from "Marion Spahlholz" <Marion.spahlholz@chello.at> )
++MM_HEADERS=
++Return-Path: <Marion.spahlholz@chello.at>
++Received: from marionharald ([213.47.119.62]) by viemta06.chello.at
++          (InterMail vK.4.03.01.00 201-232-122 license 9caa03a7df1d31c048ffcc0d31ac5855)
++          with SMTP id <20010112191934.DEQK23142.viemta06@marionharald>;
++          Fri, 12 Jan 2001 20:19:34 +0100
++Message-ID: <00b301c07ccd$7e71c8e0$3e772fd5@telekabel.at>
++From: "Marion Spahlholz" <Marion.spahlholz@chello.at>
++To: "Peter Ipser" <peter.ipser@chello.at>
++Cc: "Rudolf Meyer" <rudolf.meyer@chello.at>,
++	"Martina Fitzka" <tini@yline.com>,
++	=?iso-8859-1?Q?Evelyn_L=F6wenrosen?= <evelyn.loewenrosen@chello.at>,
++	"Stephan Wright" <stephan.wright@chello.at>
++Subject: Fw: Das ist aber lieb geschrieben!
++Date: Fri, 12 Jan 2001 20:25:59 +0100
++MIME-Version: 1.0
++Content-Type: multipart/mixed;
++	boundary="----=_NextPart_000_00B0_01C07CD5.E0149F20"
++X-Priority: 3
++X-MSMail-Priority: Normal
++X-Mailer: Microsoft Outlook Express 5.50.4133.2400
++X-MimeOLE: Produced By Microsoft MimeOLE V5.50.4133.2400
++
++MM_NOTTTY=1
++MM_QUIET=cat
++HOSTNAME=skair
++DEBFULLNAME=Michael Moerz
++MM_MAILER=unknown
++GDMSESSION=Gnome
++USER=mike
++MACHTYPE=i386-pc-linux-gnu
++DEBEMAIL=e9625136@stud3.tuwien.ac.at
++MAIL=/var/spool/mail/mike
++LANG=C
++DISPLAY=:0.0
++MM_USEPAGER=0
++LOGNAME=mike
++SHLVL=3
++SSH_AGENT_PID=1306
++SESSION_MANAGER=local/skair:/tmp/.ICE-unix/1263
++MM_CONTENTTYPE=multipart/mixed ; boundary = "----=_NextPart_000_00B0_01C07CD5.E0149F20"
++USERNAME=mike
++SHELL=/bin/bash
++HOSTTYPE=i386
++CVSROOT=:pserver:mike@localhost:/home/repositories
++MM_DEBUG=1
++MM_NOASK=text,text/plain,text/richtext
++MM_RUNASROOT=0
++OSTYPE=linux-gnu
++HOME=/home/mike
++TERM=xterm
++SSH_AUTH_SOCK=/tmp/ssh-ApDG1263/agent.1263
++PATH=/home/mike/debian/metamail-2.7/src/metamail/.libs:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
++_=/usr/bin/printenv
++PWD=/home/mike/debian/metamail-2.7/src/metamail
++XAUTHORITY=/home/mike/.Xauthority
++WINDOWID=20971534
++MM_SUMMARY=Fw: Das ist aber lieb geschrieben   (from "Marion Spahlholz" <Marion.spahlholz@chello.at> )
++MM_HEADERS=
++Content-Type: text/plain;
++	charset="iso-8859-1"
++Content-Transfer-Encoding: 8bit
++
++MM_NOTTTY=1
++MM_QUIET=cat
++HOSTNAME=skair
++DEBFULLNAME=Michael Moerz
++MM_MAILER=unknown
++GDMSESSION=Gnome
++USER=mike
++MACHTYPE=i386-pc-linux-gnu
++DEBEMAIL=e9625136@stud3.tuwien.ac.at
++MAIL=/var/spool/mail/mike
++LANG=C
++DISPLAY=:0.0
++MM_USEPAGER=0
++LOGNAME=mike
++SHLVL=3
++SSH_AGENT_PID=1306
++SESSION_MANAGER=local/skair:/tmp/.ICE-unix/1263
++MM_CONTENTTYPE=text/plain ; charset = "iso-8859-1"
++USERNAME=mike
++SHELL=/bin/bash
++HOSTTYPE=i386
++CVSROOT=:pserver:mike@localhost:/home/repositories
++MM_DEBUG=1
++MM_NOASK=text,text/plain,text/richtext
++MM_RUNASROOT=0
++OSTYPE=linux-gnu
++HOME=/home/mike
++TERM=xterm
++SSH_AUTH_SOCK=/tmp/ssh-ApDG1263/agent.1263
++PATH=/home/mike/debian/metamail-2.7/src/metamail/.libs:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
++_=/usr/bin/printenv
++PWD=/home/mike/debian/metamail-2.7/src/metamail
++XAUTHORITY=/home/mike/.Xauthority
++WINDOWID=20971534
++MM_SUMMARY=Fw: Das ist aber lieb geschrieben   (from "Marion Spahlholz" <Marion.spahlholz@chello.at> )
++MM_HEADERS=
++Content-Type: text/plain;
++	charset="iso-8859-1"
++Content-Transfer-Encoding: 8bit
++
++MM_NOTTTY=0
++MM_QUIET=cat
++HOSTNAME=skair
++DEBFULLNAME=Michael Moerz
++MM_MAILER=unknown
++GDMSESSION=Gnome
++USER=mike
++MACHTYPE=i386-pc-linux-gnu
++DEBEMAIL=e9625136@stud3.tuwien.ac.at
++MAIL=/var/spool/mail/mike
++LANG=C
++DISPLAY=:0.0
++MM_USEPAGER=0
++LOGNAME=mike
++SHLVL=3
++SSH_AGENT_PID=1306
++SESSION_MANAGER=local/skair:/tmp/.ICE-unix/1263
++MM_CONTENTTYPE=text/plain ; charset = "iso-8859-1"
++USERNAME=mike
++SHELL=/bin/bash
++HOSTTYPE=i386
++CVSROOT=:pserver:mike@localhost:/home/repositories
++MM_DEBUG=1
++MM_NOASK=text,text/plain,text/richtext
++MM_RUNASROOT=0
++OSTYPE=linux-gnu
++HOME=/home/mike
++TERM=xterm
++SSH_AUTH_SOCK=/tmp/ssh-ApDG1263/agent.1263
++PATH=/home/mike/debian/metamail-2.7/src/metamail/.libs:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
++_=/usr/bin/printenv
++Command exit status: 0
++‡(­û‡ƒ@‡ƒ@‡ƒ@‡ƒ@‡ƒ@‡ƒ@‡ƒ@ˆƒ@
++Here is the environment:
++
++From: "Marion Spahlholz" <Marion.spahlholz@chello.at>
++To: "Peter Ipser" <peter.ipser@chello.at>
++Cc: "Rudolf Meyer" <rudolf.meyer@chello.at>,  "Martina Fitzka" <tini@yline.com>,  [** iso-8859-1 charset **] Evelyn Löwenrosen‡(­û‡ƒ@‡ƒ@‡ƒ@‡ƒ@‡ƒ@‡ƒ@‡ƒ@ˆƒ@<evelyn.loewenrosen@chello.at>,  "Stephan Wright" <stephan.wright@chello.at>
++Subject: Fw: Das ist aber lieb geschrieben!
++Date: Fri, 12 Jan 2001 20:25:59 +0100
++MIME-Version: 1.0
++NEW PARAMETER: boundary VALUE: "----=_NextPart_000_00B0_01C07CD5.E0149F20"
++X-Priority: 3
++X-MSMail-Priority: Normal
++X-Mailer: Microsoft Outlook Express 5.50.4133.2400
++X-MimeOLE: Produced By Microsoft MimeOLE V5.50.4133.2400
++
++
++Here is the environment:
++
++Handling multipart as built-in here.  Boundary: ------=_NextPart_000_00B0_01C07CD5.E0149F20
++NEW PARAMETER: charset VALUE: "iso-8859-1"
++
++Here is the environment:
++
++Here is the environment:
++
++---Executing: xterm -title 'Fw: Das ist aber lieb geschrieben   (from "Marion Spahlholz" <Marion.spahlholz@chello.at> )' -e  metamail -P -b -c 'text/plain ; charset = "iso-8859-1"' /tmp/MGsYu2s
++PWD=/home/mike/debian/metamail-2.7/src/metamail
++XAUTHORITY=/home/mike/.Xauthority
++WINDOWID=20971534
++MM_SUMMARY=attachment;  filename="Fortflanzung.gif"  (from "Marion Spahlholz" <Marion.spahlholz@chello.at> )
++MM_HEADERS=
++Content-Type: image/gif;
++	name="Fortflanzung.gif"
++Content-Transfer-Encoding: base64
++Content-Disposition: attachment;
++	filename="Fortflanzung.gif"
++
++MM_NOTTTY=1
++MM_QUIET=cat
++HOSTNAME=skair
++DEBFULLNAME=Michael Moerz
++MM_MAILER=unknown
++GDMSESSION=Gnome
++USER=mike
++MACHTYPE=i386-pc-linux-gnu
++DEBEMAIL=e9625136@stud3.tuwien.ac.at
++MAIL=/var/spool/mail/mike
++LANG=C
++DISPLAY=:0.0
++MM_USEPAGER=0
++LOGNAME=mike
++SHLVL=3
++SSH_AGENT_PID=1306
++SESSION_MANAGER=local/skair:/tmp/.ICE-unix/1263
++MM_CONTENTTYPE=image/gif ; name = "Fortflanzung.gif"
++USERNAME=mike
++SHELL=/bin/bash
++HOSTTYPE=i386
++CVSROOT=:pserver:mike@localhost:/home/repositories
++MM_DEBUG=1
++MM_NOASK=text,text/plain,text/richtext
++MM_RUNASROOT=0
++OSTYPE=linux-gnu
++HOME=/home/mike
++TERM=xterm
++SSH_AUTH_SOCK=/tmp/ssh-ApDG1263/agent.1263
++PATH=/home/mike/debian/metamail-2.7/src/metamail/.libs:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
++_=/usr/bin/printenv
+--- metamail-2.7.orig/src/metamail/environment.h
++++ metamail-2.7/src/metamail/environment.h
+@@ -0,0 +1,11 @@
++#ifndef METAMAIL_ENVIRONMENT_H
++#define METAMAIL_ENVIRONMENT_H 1
++
++#define ENVIRONMENT_TMPROOT_DEFAULT_LEN 5
++#define ENVIRONMENT_TMPROOT_DEFAULT "/tmp"
++
++void addToPath                      (char *);
++void initMailHeadersFromEnvironment ();
++void initVarsFromEnvironment        ();
++
++#endif /* METAMAIL_ENVIRONMENT_H */
+--- metamail-2.7.orig/src/metamail/Makefile.am
++++ metamail-2.7/src/metamail/Makefile.am
+@@ -0,0 +1,21 @@
++MAINTAINERCLEANFILES    = Makefile.in
++
++CFLAGS			= -lncurses
++
++INCLUDES                = -I$(top_builddir) -I$(top_builddir)/metamail \
++                        -I$(top_srcdir) -I$(top_srcdir)/metamail
++
++bin_PROGRAMS            = metamail mimencode mailto splitmail
++
++metamail_SOURCES	= metamail.c codes.c uue.c shared.c environment.c \
++mailcap.c tmpfile.c
++metamail_LDADD		= $(top_builddir)/metamail/libmetamail.la
++
++mimencode_SOURCES	= mimencode.c codes.c
++mimencode_LDADD		= $(top_builddir)/metamail/libmetamail.la
++
++mailto_SOURCES		= mailto.c codes.c shared.c
++mailto_LDADD		= $(top_builddir)/metamail/libmetamail.la
++
++splitmail_SOURCES	= splitmail.c shared.c
++splitmail_LDADD		= $(top_builddir)/metamail/libmetamail.la
+--- metamail-2.7.orig/src/metamail/tmpfile.h
++++ metamail-2.7/src/metamail/tmpfile.h
+@@ -0,0 +1,15 @@
++#ifndef METAMAIL_TMPFILE_H
++#define METAMAIL_TMPFILE_H 1
++
++/* create and remove tmpfiles */
++void MkTmpFileName( char* );
++void RmTmpFileName( char* );
++/* and cleanup after doing all kind of things */
++void CleanupTmpFiles( void );
++
++/* register and unregister tmpfiles */
++/* these functions should not be invoked directly (there are exceptions) */
++void AddTmpFileName( char* );
++void DelTmpFileName( char* );
++
++#endif /* METAMAIL_TMP_FILE_H */
+--- metamail-2.7.orig/src/metamail/Makefile.in
++++ metamail-2.7/src/metamail/Makefile.in
+@@ -0,0 +1,399 @@
++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
++
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++
++SHELL = @SHELL@
++
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
++
++DESTDIR =
++
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++
++top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
++INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++transform = @program_transform_name@
++
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++host_alias = @host_alias@
++host_triplet = @host@
++AS = @AS@
++CATCOMMAND = @CATCOMMAND@
++CC = @CC@
++DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
++EXEEXT = @EXEEXT@
++LIBTOOL = @LIBTOOL@
++LIBTOOL_DEPS = @LIBTOOL_DEPS@
++LN_S = @LN_S@
++LPRCOMMAND = @LPRCOMMAND@
++LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAKEINFO = @MAKEINFO@
++OBJDUMP = @OBJDUMP@
++OBJEXT = @OBJEXT@
++PACKAGE = @PACKAGE@
++RANLIB = @RANLIB@
++STRIP = @STRIP@
++VERSION = @VERSION@
++ac_aux_dir = @ac_aux_dir@
++
++MAINTAINERCLEANFILES = Makefile.in
++
++CFLAGS = -lncurses
++
++INCLUDES = -I$(top_builddir) -I$(top_builddir)/metamail                         -I$(top_srcdir) -I$(top_srcdir)/metamail
++
++
++bin_PROGRAMS = metamail mimencode mailto splitmail
++
++metamail_SOURCES = metamail.c codes.c uue.c shared.c environment.c mailcap.c tmpfile.c
++
++metamail_LDADD = $(top_builddir)/metamail/libmetamail.la
++
++mimencode_SOURCES = mimencode.c codes.c
++mimencode_LDADD = $(top_builddir)/metamail/libmetamail.la
++
++mailto_SOURCES = mailto.c codes.c shared.c
++mailto_LDADD = $(top_builddir)/metamail/libmetamail.la
++
++splitmail_SOURCES = splitmail.c shared.c
++splitmail_LDADD = $(top_builddir)/metamail/libmetamail.la
++mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
++CONFIG_HEADER = ../../metamail/config.h
++CONFIG_CLEAN_FILES = 
++bin_PROGRAMS =  metamail$(EXEEXT) mimencode$(EXEEXT) mailto$(EXEEXT) \
++splitmail$(EXEEXT)
++PROGRAMS =  $(bin_PROGRAMS)
++
++
++DEFS = @DEFS@ -I. -I$(srcdir) -I../../metamail
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++metamail_OBJECTS =  metamail.$(OBJEXT) codes.$(OBJEXT) uue.$(OBJEXT) \
++shared.$(OBJEXT) environment.$(OBJEXT) mailcap.$(OBJEXT) \
++tmpfile.$(OBJEXT)
++metamail_DEPENDENCIES =  $(top_builddir)/metamail/libmetamail.la
++metamail_LDFLAGS = 
++mimencode_OBJECTS =  mimencode.$(OBJEXT) codes.$(OBJEXT)
++mimencode_DEPENDENCIES =  $(top_builddir)/metamail/libmetamail.la
++mimencode_LDFLAGS = 
++mailto_OBJECTS =  mailto.$(OBJEXT) codes.$(OBJEXT) shared.$(OBJEXT)
++mailto_DEPENDENCIES =  $(top_builddir)/metamail/libmetamail.la
++mailto_LDFLAGS = 
++splitmail_OBJECTS =  splitmail.$(OBJEXT) shared.$(OBJEXT)
++splitmail_DEPENDENCIES =  $(top_builddir)/metamail/libmetamail.la
++splitmail_LDFLAGS = 
++COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
++DIST_COMMON =  Makefile.am Makefile.in
++
++
++DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
++
++TAR = tar
++GZIP_ENV = --best
++DEP_FILES =  .deps/codes.P .deps/environment.P .deps/mailcap.P \
++.deps/mailto.P .deps/metamail.P .deps/mimencode.P .deps/shared.P \
++.deps/splitmail.P .deps/tmpfile.P .deps/uue.P
++SOURCES = $(metamail_SOURCES) $(mimencode_SOURCES) $(mailto_SOURCES) $(splitmail_SOURCES)
++OBJECTS = $(metamail_OBJECTS) $(mimencode_OBJECTS) $(mailto_OBJECTS) $(splitmail_OBJECTS)
++
++all: all-redirect
++.SUFFIXES:
++.SUFFIXES: .S .c .lo .o .obj .s
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
++	cd $(top_srcdir) && $(AUTOMAKE) --foreign src/metamail/Makefile
++
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
++	cd $(top_builddir) \
++	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
++
++
++mostlyclean-binPROGRAMS:
++
++clean-binPROGRAMS:
++	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
++
++distclean-binPROGRAMS:
++
++maintainer-clean-binPROGRAMS:
++
++install-binPROGRAMS: $(bin_PROGRAMS)
++	@$(NORMAL_INSTALL)
++	$(mkinstalldirs) $(DESTDIR)$(bindir)
++	@list='$(bin_PROGRAMS)'; for p in $$list; do \
++	  if test -f $$p; then \
++	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
++	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
++	  else :; fi; \
++	done
++
++uninstall-binPROGRAMS:
++	@$(NORMAL_UNINSTALL)
++	list='$(bin_PROGRAMS)'; for p in $$list; do \
++	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
++	done
++
++# FIXME: We should only use cygpath when building on Windows,
++# and only if it is available.
++.c.obj:
++	$(COMPILE) -c `cygpath -w $<`
++
++.s.o:
++	$(COMPILE) -c $<
++
++.S.o:
++	$(COMPILE) -c $<
++
++mostlyclean-compile:
++	-rm -f *.o core *.core
++	-rm -f *.$(OBJEXT)
++
++clean-compile:
++
++distclean-compile:
++	-rm -f *.tab.c
++
++maintainer-clean-compile:
++
++.s.lo:
++	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++
++.S.lo:
++	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++
++mostlyclean-libtool:
++	-rm -f *.lo
++
++clean-libtool:
++	-rm -rf .libs _libs
++
++distclean-libtool:
++
++maintainer-clean-libtool:
++
++metamail$(EXEEXT): $(metamail_OBJECTS) $(metamail_DEPENDENCIES)
++	@rm -f metamail$(EXEEXT)
++	$(LINK) $(metamail_LDFLAGS) $(metamail_OBJECTS) $(metamail_LDADD) $(LIBS)
++
++mimencode$(EXEEXT): $(mimencode_OBJECTS) $(mimencode_DEPENDENCIES)
++	@rm -f mimencode$(EXEEXT)
++	$(LINK) $(mimencode_LDFLAGS) $(mimencode_OBJECTS) $(mimencode_LDADD) $(LIBS)
++
++mailto$(EXEEXT): $(mailto_OBJECTS) $(mailto_DEPENDENCIES)
++	@rm -f mailto$(EXEEXT)
++	$(LINK) $(mailto_LDFLAGS) $(mailto_OBJECTS) $(mailto_LDADD) $(LIBS)
++
++splitmail$(EXEEXT): $(splitmail_OBJECTS) $(splitmail_DEPENDENCIES)
++	@rm -f splitmail$(EXEEXT)
++	$(LINK) $(splitmail_LDFLAGS) $(splitmail_OBJECTS) $(splitmail_LDADD) $(LIBS)
++
++tags: TAGS
++
++ID: $(HEADERS) $(SOURCES) $(LISP)
++	list='$(SOURCES) $(HEADERS)'; \
++	unique=`for i in $$list; do echo $$i; done | \
++	  awk '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	here=`pwd` && cd $(srcdir) \
++	  && mkid -f$$here/ID $$unique $(LISP)
++
++TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
++	tags=; \
++	here=`pwd`; \
++	list='$(SOURCES) $(HEADERS)'; \
++	unique=`for i in $$list; do echo $$i; done | \
++	  awk '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
++	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
++
++mostlyclean-tags:
++
++clean-tags:
++
++distclean-tags:
++	-rm -f TAGS ID
++
++maintainer-clean-tags:
++
++distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
++
++subdir = src/metamail
++
++distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign src/metamail/Makefile
++	@for file in $(DISTFILES); do \
++	  d=$(srcdir); \
++	  if test -d $$d/$$file; then \
++	    cp -pr $$d/$$file $(distdir)/$$file; \
++	  else \
++	    test -f $(distdir)/$$file \
++	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
++	    || cp -p $$d/$$file $(distdir)/$$file || :; \
++	  fi; \
++	done
++
++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
++
++-include $(DEP_FILES)
++
++mostlyclean-depend:
++
++clean-depend:
++
++distclean-depend:
++	-rm -rf .deps
++
++maintainer-clean-depend:
++
++%.o: %.c
++	@echo '$(COMPILE) -c $<'; \
++	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
++
++%.lo: %.c
++	@echo '$(LTCOMPILE) -c $<'; \
++	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
++	  < .deps/$(*F).pp > .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm -f .deps/$(*F).pp
++info-am:
++info: info-am
++dvi-am:
++dvi: dvi-am
++check-am: all-am
++check: check-am
++installcheck-am:
++installcheck: installcheck-am
++install-exec-am: install-binPROGRAMS
++install-exec: install-exec-am
++
++install-data-am:
++install-data: install-data-am
++
++install-am: all-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++install: install-am
++uninstall-am: uninstall-binPROGRAMS
++uninstall: uninstall-am
++all-am: Makefile $(PROGRAMS)
++all-redirect: all-am
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
++installdirs:
++	$(mkinstalldirs)  $(DESTDIR)$(bindir)
++
++
++mostlyclean-generic:
++
++clean-generic:
++
++distclean-generic:
++	-rm -f Makefile $(CONFIG_CLEAN_FILES)
++	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
++
++maintainer-clean-generic:
++	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
++mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-compile \
++		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
++		mostlyclean-generic
++
++mostlyclean: mostlyclean-am
++
++clean-am:  clean-binPROGRAMS clean-compile clean-libtool clean-tags \
++		clean-depend clean-generic mostlyclean-am
++
++clean: clean-am
++
++distclean-am:  distclean-binPROGRAMS distclean-compile distclean-libtool \
++		distclean-tags distclean-depend distclean-generic \
++		clean-am
++	-rm -f libtool
++
++distclean: distclean-am
++
++maintainer-clean-am:  maintainer-clean-binPROGRAMS \
++		maintainer-clean-compile maintainer-clean-libtool \
++		maintainer-clean-tags maintainer-clean-depend \
++		maintainer-clean-generic distclean-am
++	@echo "This command is intended for maintainers to use;"
++	@echo "it deletes files that may require special tools to rebuild."
++
++maintainer-clean: maintainer-clean-am
++
++.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
++maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
++mostlyclean-compile distclean-compile clean-compile \
++maintainer-clean-compile mostlyclean-libtool distclean-libtool \
++clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
++distclean-tags clean-tags maintainer-clean-tags distdir \
++mostlyclean-depend distclean-depend clean-depend \
++maintainer-clean-depend info-am info dvi-am dvi check check-am \
++installcheck-am installcheck install-exec-am install-exec \
++install-data-am install-data install-am install uninstall-am uninstall \
++all-redirect all-am all installdirs mostlyclean-generic \
++distclean-generic clean-generic maintainer-clean-generic clean \
++mostlyclean distclean maintainer-clean
++
++
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
+--- metamail-2.7.orig/src/metamail/mailcap.c
++++ metamail-2.7/src/metamail/mailcap.c
+@@ -0,0 +1,118 @@
++/*
++Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++
++Permission to use, copy, modify, and distribute this material 
++for any purpose and without fee is hereby granted, provided 
++that the above copyright notice and this permission notice 
++appear in all copies, and that the name of Bellcore not be 
++used in advertising or publicity pertaining to this 
++material without the specific, prior written permission 
++of an authorized representative of Bellcore.  BELLCORE 
++MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++*/
++/* mailcap.c - contains functions to access and parse mailcap files
++    Authors:  Nathaniel S. Borenstein, Bellcore
++              Michael Moerz <mikem@debian.org>
++*/
++
++#include <metamail/common.h>
++
++#include "mailcap.h"
++#include "metamail.h"
++
++/* Only one or the other set up builtins gets used,
++  depending on whether or not we're in the middle of 
++          a multipart/alternative body part */
++struct MailcapEntry BuiltIns[] = {
++    {"text/*", CATTEMPLATE, NULL, 0, 1, 0, "plain text", LPRTEMPLATE},
++    {NULL, NULL, NULL, 0, 0, 0}};
++
++struct MailcapEntry BuiltInsAlternative[] = {
++    {"text/plain", CATTEMPLATE, NULL, 0, 1, 0, "plain text", LPRTEMPLATE},
++    {NULL, NULL, NULL, 0, 0, 0}};
++
++/** hmm, ... 
++*/
++int
++ProcessMailcapFiles(SquirrelFile) 
++char *SquirrelFile;
++{
++    char *s, *pathcopy = NULL;
++    char *path = getenv("MAILCAPS");
++    if (!path) {
++        uid_t uid = getuid();
++        struct passwd *p;
++        p = getpwuid(uid);
++	if (p) {
++	  path = XMALLOC(char, 5 + strlen(p->pw_dir) + strlen(STDPATH));
++	}
++        strcpy(path, p->pw_dir);
++        strcat(path, STDPATH);
++        pathcopy = path;
++    } else 
++    {
++        pathcopy = XMALLOC(char, 1+strlen(path));
++        strcpy(pathcopy, path);
++        path = pathcopy;
++    }
++    while(path) {
++        s = index(path, PATH_SEPARATOR);
++        if (s) *s++ = 0;
++        if (!ProcessMailcapFile(path, SquirrelFile)) return(0);
++        path = s;
++    }
++    if (pathcopy) XFREE(pathcopy);
++    return(-1);
++}
++
++int
++TryBuiltIns(SquirrelFile) 
++char *SquirrelFile;
++{
++  int i;
++  /* Last resort -- for sites that didn't bother putting a "text" line in 
++     their mailcap files... */
++  if (DoDebug) 
++    fprintf(stderr, "Looking for '%s' in built-in content-type handling "
++	    "settings.\n", ContentType);
++  for (i=0; BuiltIns[i].contenttype; ++i) {
++    if (!TryMailcapEntry(SquirrelFile ? BuiltInsAlternative[i] : BuiltIns[i], SquirrelFile))
++      return(0);
++  }
++  return(-1);
++}
++
++int
++ProcessMailcapFile(file, SquirrelFile)
++char *file, *SquirrelFile;
++{
++    struct MailcapEntry mc;
++    FILE *fp;
++    int res;
++
++    res = IsDirectory(file);
++    if (res) {
++	if (res == 1) {
++	    fprintf(stderr, "Mailcap path entry '%s' is a directory, should be a readable file.\n", file);
++	} else if (DoDebug) {
++	/* Quietly ignore non-existent mailcap files unless debugging */
++	    fprintf(stderr, "Mailcap path entry '%s' does not exist.\n", file);
++	}
++	return(-1);
++    }
++    fp = fopen(file, "r");
++    if (DoDebug) fprintf(stderr, "Looking for '%s' in mailcap file '%s'.\n", ContentType, file);
++    while (fp && !feof(fp)) {
++        mc.needtofree = 0;
++	if (GetMailcapEntry(fp, &mc)) {
++            if (!TryMailcapEntry(mc, SquirrelFile)) {
++                fclose(fp);
++                return(0);
++            }
++	}
++    }
++    if (fp) fclose(fp);
++    return(-1);
++}
+--- metamail-2.7.orig/src/metamail/codes.c
++++ metamail-2.7/src/metamail/codes.c
+@@ -0,0 +1,432 @@
++/*
++Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++
++Permission to use, copy, modify, and distribute this material 
++for any purpose and without fee is hereby granted, provided 
++that the above copyright notice and this permission notice 
++appear in all copies, and that the name of Bellcore not be 
++used in advertising or publicity pertaining to this 
++material without the specific, prior written permission 
++of an authorized representative of Bellcore.  BELLCORE 
++MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++*/
++#include <metamail/common.h>
++
++extern char *index();
++static char basis_64[] =
++   "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
++
++static char index_64[128] = {
++    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
++    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
++    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,62, -1,-1,-1,63,
++    52,53,54,55, 56,57,58,59, 60,61,-1,-1, -1,-1,-1,-1,
++    -1, 0, 1, 2,  3, 4, 5, 6,  7, 8, 9,10, 11,12,13,14,
++    15,16,17,18, 19,20,21,22, 23,24,25,-1, -1,-1,-1,-1,
++    -1,26,27,28, 29,30,31,32, 33,34,35,36, 37,38,39,40,
++    41,42,43,44, 45,46,47,48, 49,50,51,-1, -1,-1,-1,-1
++};
++
++#define char64(c)  (((c) < 0 || (c) > 127) ? -1 : index_64[(c)])
++
++/*
++char64(c)
++char c;
++{
++    char *s = (char *) index(basis_64, c);
++    if (s) return(s-basis_64);
++    return(-1);
++}
++*/
++
++/* the following gets a character, but fakes it properly into two chars if there's a newline character */
++static int InNewline=0;
++
++int nextcharin(infile, PortableNewlines)
++FILE *infile;
++int PortableNewlines;
++{
++    int c;
++
++#ifndef NEWLINE_CHAR
++    return(getc(infile));
++#else
++    if (!PortableNewlines) return(getc(infile));
++    if (InNewline) {
++        InNewline = 0;
++        return(10); /* LF */
++    }
++    c = getc(infile);
++    if (c == NEWLINE_CHAR) {
++        InNewline = 1;
++        return(13); /* CR */
++    }
++    return(c);
++#endif
++}
++
++to64(infile, outfile, PortableNewlines) 
++FILE *infile, *outfile;
++int PortableNewlines;
++{
++    int c1, c2, c3, ct=0;
++    InNewline = 0; /* always reset it */
++    while ((c1 = nextcharin(infile, PortableNewlines)) != EOF) {
++        c2 = nextcharin(infile, PortableNewlines);
++        if (c2 == EOF) {
++            output64chunk(c1, 0, 0, 2, outfile);
++        } else {
++            c3 = nextcharin(infile, PortableNewlines);
++            if (c3 == EOF) {
++                output64chunk(c1, c2, 0, 1, outfile);
++            } else {
++                output64chunk(c1, c2, c3, 0, outfile);
++            }
++        }
++        ct += 4;
++        if (ct > 71) {
++            putc('\n', outfile);
++            ct = 0;
++        }
++    }
++    if (ct) putc('\n', outfile);
++    fflush(outfile);
++}
++
++output64chunk(c1, c2, c3, pads, outfile)
++FILE *outfile;
++{
++    putc(basis_64[c1>>2], outfile);
++    putc(basis_64[((c1 & 0x3)<< 4) | ((c2 & 0xF0) >> 4)], outfile);
++    if (pads == 2) {
++        putc('=', outfile);
++        putc('=', outfile);
++    } else if (pads) {
++        putc(basis_64[((c2 & 0xF) << 2) | ((c3 & 0xC0) >>6)], outfile);
++        putc('=', outfile);
++    } else {
++        putc(basis_64[((c2 & 0xF) << 2) | ((c3 & 0xC0) >>6)], outfile);
++        putc(basis_64[c3 & 0x3F], outfile);
++    }
++}
++
++PendingBoundary(s, Boundaries, BoundaryCt)
++char *s;
++char **Boundaries;
++int *BoundaryCt;
++{
++    int i, len;
++
++    if (s[0] != '-' || s[1] != '-') return(0);
++
++
++    for (i=0; i < *BoundaryCt; ++i) {
++	len = strlen(Boundaries[i]);
++        if (!strncmp(s, Boundaries[i], len)) {
++            if (s[len] == '-' && s[len+1] == '-') *BoundaryCt = i;
++            return(1);
++        }
++    }
++    return(0);
++}
++
++/* If we're in portable newline mode, we have to convert CRLF to the 
++    local newline convention on output */
++
++static int CRpending = 0;
++
++#ifdef NEWLINE_CHAR
++almostputc(c, outfile, PortableNewlines)
++int c;
++FILE *outfile;
++int PortableNewlines;
++{
++    if (CRpending) {
++        if (c == 10) {
++            putc(NEWLINE_CHAR, outfile);
++            CRpending = 0;
++        } else {
++            putc(13, outfile);
++	    if (c != 13) {
++            	putc(c, outfile);
++		CRpending = 0;
++	    }
++        }
++    } else {
++        if (PortableNewlines && c == 13) {
++            CRpending = 1;
++        } else {
++            putc(c, outfile);
++        }
++    }
++}
++#else
++almostputc(c, outfile, PortableNewlines)
++int c;
++FILE *outfile;
++int PortableNewlines;
++{
++    putc(c, outfile);
++}
++#endif
++
++from64(infile, outfile, boundaries, boundaryct, PortableNewlines) 
++FILE *infile, *outfile;
++char **boundaries;
++int *boundaryct;
++int PortableNewlines;
++{
++    int c1, c2, c3, c4;
++    int newline = 1, DataDone = 0;
++
++    /* always reinitialize */
++    CRpending = 0;
++    while ((c1 = getc(infile)) != EOF) {
++        if (isspace(c1)) {
++            if (c1 == '\n') {
++                newline = 1;
++            } else {
++                newline = 0;
++            }
++            continue;
++        }
++        if (newline && boundaries && c1 == '-') {
++            char Buf[200];
++            /* a dash is NOT base 64, so all bets are off if NOT a boundary */
++            ungetc(c1, infile);
++            fgets(Buf, sizeof(Buf), infile);
++            if (boundaries
++                 && (Buf[0] == '-')
++                 && (Buf[1] == '-')
++                 && PendingBoundary(Buf, boundaries, boundaryct)) {
++                return;
++            }
++            fprintf(stderr, "Ignoring unrecognized boundary line: %s\n", Buf);
++            continue;
++        }
++        if (DataDone) continue;
++        newline = 0;
++        do {
++            c2 = getc(infile);
++        } while (c2 != EOF && isspace(c2));
++        do {
++            c3 = getc(infile);
++        } while (c3 != EOF && isspace(c3));
++        do {
++            c4 = getc(infile);
++        } while (c4 != EOF && isspace(c4));
++        if (c2 == EOF || c3 == EOF || c4 == EOF) {
++            fprintf(stderr, "Warning: base64 decoder saw premature EOF!\n");
++            return;
++        }
++        if (c1 == '=' || c2 == '=') {
++            DataDone=1;
++            continue;
++        }
++        c1 = char64(c1);
++        c2 = char64(c2);
++        almostputc(((c1<<2) | ((c2&0x30)>>4)), outfile, PortableNewlines);
++        if (c3 == '=') {
++            DataDone = 1;
++        } else {
++            c3 = char64(c3);
++            almostputc((((c2&0XF) << 4) | ((c3&0x3C) >> 2)), outfile, PortableNewlines);
++            if (c4 == '=') {
++                DataDone = 1;
++            } else {
++                c4 = char64(c4);
++                almostputc((((c3&0x03) <<6) | c4), outfile, PortableNewlines);
++            }
++        }
++    }
++    if (CRpending) putc(13, outfile); /* Don't drop a lone trailing char 13 */
++}
++
++static char basis_hex[] = "0123456789ABCDEF";
++static char index_hex[128] = {
++    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
++    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
++    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
++     0, 1, 2, 3,  4, 5, 6, 7,  8, 9,-1,-1, -1,-1,-1,-1,
++    -1,10,11,12, 13,14,15,-1, -1,-1,-1,-1, -1,-1,-1,-1,
++    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
++    -1,10,11,12, 13,14,15,-1, -1,-1,-1,-1, -1,-1,-1,-1,
++    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1
++};
++
++/* The following version generated complaints on Solaris. */
++/* #define hexchar(c)  (((c) < 0 || (c) > 127) ? -1 : index_hex[(c)])  */
++/*  Since we're no longer ever calling it with anything signed, this should work: */
++#define hexchar(c)  (((c) > 127) ? -1 : index_hex[(c)])
++
++/*
++hexchar(c)
++char c;
++{
++    char *s;
++    if (islower(c)) c = toupper(c);
++    s = (char *) index(basis_hex, c);
++    if (s) return(s-basis_hex);
++    return(-1);
++}
++*/
++
++toqp(infile, outfile) 
++FILE *infile, *outfile;
++{
++    int c, ct=0, prevc=255;
++    while ((c = getc(infile)) != EOF) {
++        if ((c < 32 && (c != '\n' && c != '\t'))
++             || (c == '=')
++             || (c >= 127)
++             /* Following line is to avoid single periods alone on lines,
++               which messes up some dumb smtp implementations, sigh... */
++             || (ct == 0 && c == '.')) {
++            putc('=', outfile);
++            putc(basis_hex[c>>4], outfile);
++            putc(basis_hex[c&0xF], outfile);
++            ct += 3;
++            prevc = 'A'; /* close enough */
++        } else if (c == '\n') {
++            if (prevc == ' ' || prevc == '\t') {
++                putc('=', outfile); /* soft & hard lines */
++                putc(c, outfile);
++            }
++            putc(c, outfile);
++            ct = 0;
++            prevc = c;
++        } else {
++            if (c == 'F' && prevc == '\n') {
++                /* HORRIBLE but clever hack suggested by MTR for sendmail-avoidance */
++                c = getc(infile);
++                if (c == 'r') {
++                    c = getc(infile);
++                    if (c == 'o') {
++                        c = getc(infile);
++                        if (c == 'm') {
++                            c = getc(infile);
++                            if (c == ' ') {
++                                /* This is the case we are looking for */
++                                fputs("=46rom", outfile);
++                                ct += 6;
++                            } else {
++                                fputs("From", outfile);
++                                ct += 4;
++                            }
++                        } else {
++                            fputs("Fro", outfile);
++                            ct += 3;
++                        }
++                    } else {
++                        fputs("Fr", outfile);
++                        ct += 2;
++                    }
++                } else {
++                    putc('F', outfile);
++                    ++ct;
++                }
++                ungetc(c, infile);
++                prevc = 'x'; /* close enough -- printable */
++            } else { /* END horrible hack */
++                putc(c, outfile);
++                ++ct;
++                prevc = c;
++            }
++        }
++        if (ct > 72) {
++            putc('=', outfile);
++            putc('\n', outfile);
++            ct = 0;
++            prevc = '\n';
++        }
++    }
++    if (ct) {
++        putc('=', outfile);
++        putc('\n', outfile);
++    }
++}
++
++fromqp(infile, outfile, boundaries, boundaryct) 
++FILE *infile, *outfile;
++char **boundaries;
++int *boundaryct;
++{
++    unsigned int c1, c2;
++    int sawnewline = 1, neednewline = 0;
++    /* The neednewline hack is necessary because the newline leading into 
++      a multipart boundary is part of the boundary, not the data */
++
++    while ((c1 = getc(infile)) != EOF) {
++        if (sawnewline && boundaries && (c1 == '-')) {
++            char Buf[200];
++            unsigned char *s;
++
++            ungetc(c1, infile);
++            fgets(Buf, sizeof(Buf), infile);
++            if (boundaries
++                 && (Buf[0] == '-')
++                 && (Buf[1] == '-')
++                 && PendingBoundary(Buf, boundaries, boundaryct)) {
++                return;
++            }
++            /* Not a boundary, now we must treat THIS line as q-p, sigh */
++            if (neednewline) {
++                putc('\n', outfile);
++                neednewline = 0;
++            }
++            for (s=(unsigned char *) Buf; *s; ++s) {
++                if (*s == '=') {
++                    if (!*++s) break;
++                    if (*s == '\n') {
++                        /* ignore it */
++                        sawnewline = 1;
++                    } else {
++                        c1 = hexchar(*s);
++                        if (!*++s) break;
++                        c2 = hexchar(*s);
++                        putc(c1<<4 | c2, outfile);
++                    }
++                } else {
++#ifdef MSDOS
++                    if (*s == '\n')
++                        putc('\r', outfile);	/* insert CR for binary-mode write */
++#endif
++                    putc(*s, outfile);
++                }
++            }
++        } else {
++            if (neednewline) {
++                putc('\n', outfile);
++                neednewline = 0;
++            }
++            if (c1 == '=') {
++                sawnewline = 0;
++                c1 = getc(infile);
++                if (c1 == '\n') {
++                    /* ignore it */
++                    sawnewline = 1;
++                } else {
++                    c2 = getc(infile);
++                    c1 = hexchar(c1);
++                    c2 = hexchar(c2);
++                    putc(c1<<4 | c2, outfile);
++                    if (c2 == '\n') sawnewline = 1;
++                }
++            } else {
++                if (c1 == '\n') {
++                    sawnewline = 1;
++                    neednewline = 1;
++                } else {
++                    sawnewline = 0;
++                    putc(c1, outfile);
++                }
++            }
++        }
++    }
++    if (neednewline) {
++        putc('\n', outfile);
++        neednewline = 0;
++    }    
++}
+--- metamail-2.7.orig/src/metamail/metamail.h
++++ metamail-2.7/src/metamail/metamail.h
+@@ -0,0 +1,62 @@
++#ifndef METAMAIL_H
++#define METAMAIL_H
++
++#include <metamail/common.h>
++#include <metamail/patchlevel.h>
++
++BEGIN_C_DECLS
++
++#define CATCOMMAND  "cat"
++#define CATTEMPLATE "cat %s"
++#define METAMAIL    "metamail"
++
++#define WRITE_BINARY	"w"
++
++#define CMDSIZE 1200            /* Maximum size of command to execute */
++
++#define LINE_BUF_SIZE       2000
++
++//static char *nomem = "Out of memory!";
++extern char *mmversion;
++extern char *NoAskDefault;
++extern char *QuietDefault;
++extern char *tmproot;
++
++#define ENCODING_NONE 0
++#define ENCODING_BASE64 1
++#define ENCODING_QUOTEDPRINTABLE 2
++#define ENCODING_8BIT 3
++#define ENCODING_UUENCODE -1	/* non-standard */
++
++// for mailto.c (cutted and pasted ere)
++#define MINCHUNKSIZE 20000      /* Better be enough to hold the headers, or we
++				   die! */
++#define MAX_LINELENGTH  2000
++
++struct NoAskItem {
++    char *type;
++    struct NoAskItem *next;
++};
++
++extern char             *mailheaders;
++extern char             *MailerName;
++extern char             *ContentType;
++extern int               Quiet;
++extern struct NoAskItem *FirstNoAskItem;
++extern struct NoAskItem *FirstQuietItem;
++extern int               TransparentMode;
++extern int               RunAsRootOK;
++extern int               DoDebug;
++extern int               YankMode;
++extern int               MightAskBeforeExecuting;
++extern int               DefinitelyNotTty;
++extern int               MustNotBeTty;
++extern int               MaybePageOutput;
++
++END_C_DECLS
++
++#endif /* METAMAIL_H */
++
++
++
++
+--- metamail-2.7.orig/src/metamail/uue.c
++++ metamail-2.7/src/metamail/uue.c
+@@ -0,0 +1,124 @@
++#include <stdio.h>
++
++/*
++ * hack to metamail to decode uuencoded bodyparts
++ * Written by Keith Moore, February 1992
++ */
++
++uueget (ptr, outfp, n)
++char *ptr;
++FILE *outfp;
++{
++    unsigned char c1, c2, c3;
++    unsigned char p0, p1, p2, p3;
++
++    p0 = (ptr[0] - ' ') & 0x3F;
++    p1 = (ptr[1] - ' ') & 0x3F;
++    p2 = (ptr[2] - ' ') & 0x3F;
++    p3 = (ptr[3] - ' ') & 0x3F;
++    
++    c1 = p0 << 2 | p1 >> 4;
++    c2 = p1 << 4 | p2 >> 2;
++    c3 = p2 << 6 | p3;
++
++    if (n >= 1)
++	putc (c1, outfp);
++    if (n >= 2)
++	putc (c2, outfp);
++    if (n >= 3)
++	putc (c3, outfp);
++}
++
++
++getline (buf, size, fp)
++char *buf;
++int size;
++FILE *fp;
++{
++    int c;
++    char *ptr = buf;
++
++    for (c = 0; c < size; ++c)
++	buf[c] = ' ';
++    do {
++	c = getc (fp);
++	if (c == EOF) {
++	    *ptr = '\0';
++	    return (ptr == buf) ? -1 : 0;
++	}
++	else if (c == '\n' || c == '\r') {
++	    *ptr = '\0';
++	    return 0;
++	}
++	else if (ptr == buf && c == '>') /* ">From" line hack */
++	    continue;
++	else if (size > 0) {
++	    *ptr++ = c;
++	    size--;
++	}
++    } while (1);
++    return
++(0); /* shut lint up */
++}
++
++
++fromuue (infp, outfp, boundaries, ctptr)
++FILE *infp, *outfp;
++char **boundaries;
++int *ctptr;
++{
++    char buf[63];
++
++    while (1) {
++	if (getline (buf, sizeof buf, infp) < 0) {
++	    fprintf (stderr, "Premature EOF!\n");
++	    return;
++	}
++	if (strncmp (buf, "begin", 5) == 0)
++	    break;
++	else if (buf[0] == '-' && buf[1] == '-') {
++	    if (boundaries && PendingBoundary (buf, boundaries, ctptr))
++		return;
++	}
++    }	
++    while (1) {
++	if (getline (buf, sizeof buf, infp) < 0) {
++	    fprintf (stderr, "Premature EOF!\n");
++	    return;
++	}
++	else if (strncmp (buf, "end", 5) == 0)
++	    break;
++	else if (buf[0] == '-' && buf[1] == '-') {
++	    if (boundaries && PendingBoundary (buf, boundaries, ctptr)) {
++		fprintf (stderr, "premature end of x-uue body part\n");
++		return;
++	    }
++	    else {
++		fprintf (stderr, "ignoring invalid boundary marker\n");
++		continue;
++	    }
++        }
++        else if (*buf == '\0') continue;
++	else {
++	    int length = (*buf - ' ');
++	    if (*buf == '`')
++		length = 0;
++	    if (length < 0 || length > 63) {
++		fprintf (stderr, "fromuue: illegal length (%d)\n",
++			 length);
++	    }
++/* Nathan Maman recommends commenting out the next two lines */
++	    else if (length == 0)
++		break;
++	    else {
++		char *ptr = buf + 1;
++		while (length > 0) {
++		    uueget (ptr, outfp, length);
++		    length -= 3;
++		    ptr += 4;
++		}
++	    }
++	}
++    }
++}
++
+--- metamail-2.7.orig/src/metamail/shared.c
++++ metamail-2.7/src/metamail/shared.c
+@@ -0,0 +1,120 @@
++#include <stdio.h>
++#include <ctype.h>
++#include <config.h>
++#include <stdlib.h>  /* malloc(3) and realloc(3) */
++#ifdef SYSV
++#include <unistd.h>
++#include <sys/utsname.h>
++#endif
++
++char **Exceptions;
++int *NeedsPortableNewlines;
++int ExceptionsAlloced = 0, ExceptionsUsed = 0;
++
++ExceptionalNewline(contenttype, needsportable)
++char *contenttype;
++int needsportable;
++{
++    char *s;
++    if (ExceptionsAlloced == 0) {
++        ExceptionsAlloced = 25;
++        Exceptions = (char **) malloc(ExceptionsAlloced * sizeof(char *));
++        NeedsPortableNewlines = (int *) malloc(ExceptionsAlloced * sizeof(int));
++        if (!Exceptions || !NeedsPortableNewlines) return(-1);
++    }
++    if (ExceptionsUsed >= ExceptionsAlloced) {
++        ExceptionsAlloced += 25;
++        Exceptions = (char **) realloc(Exceptions, ExceptionsAlloced * sizeof(char *));
++        NeedsPortableNewlines = (int *) realloc(NeedsPortableNewlines, ExceptionsAlloced * sizeof(int));
++        if (!Exceptions || !NeedsPortableNewlines) return(-1);
++    }
++    s = malloc(1+strlen(contenttype));
++    if (!s) return(-1);
++    strcpy(s, contenttype);
++    Exceptions[ExceptionsUsed] = s;
++    for (; *s; ++s) {
++        if (isupper((unsigned char) *s)) *s = tolower((unsigned char) *s);
++    }
++    NeedsPortableNewlines[ExceptionsUsed] = needsportable;
++    ++ExceptionsUsed;
++    return(0);
++}
++
++DoesNeedPortableNewlines(ctype)
++char *ctype;
++{
++    int i;
++
++    /* First, handle the customization/override case */
++    for (i=0; i<ExceptionsUsed; ++i) {
++        if (!lc2strcmp(ctype, Exceptions[i])) {
++             return(NeedsPortableNewlines[i]);
++        }
++    }
++    /* But for most folks, the simple defaults will always suffice */
++    if (!lc2strncmp(ctype, "text", 4)) {
++        return(1);
++    }
++    /* The following two are weird; message & multipart should never be encoded, but they really are line-oriented, so if they ARE encoded (and for PEM, it is even legitimate) they should use portable newlines */
++    if (!lc2strncmp(ctype, "message", 7)) {
++        return(1);
++    }
++    if (!lc2strncmp(ctype, "multipart", 9)) {
++        return(1);
++    }
++    return(0);
++}
++
++lc2strncmp(s1, s2, len)
++char *s1, *s2;
++int len;
++{
++    if (!s1 || !s2) return (-1);
++    while (*s1 && *s2 && len > 0) {
++	if (*s1 != *s2 && (tolower(*s1) != *s2)) return(-1);
++	++s1; ++s2; --len;
++    }
++    if (len <= 0) return(0);
++    return((*s1 == *s2) ? 0 : -1);
++}
++
++lc2strcmp(s1, s2)
++char *s1, *s2;
++{
++    if (!s1 || !s2) return (-1);
++    while (*s1 && *s2) {
++	if (*s1 != *s2 && (tolower(*s1) != *s2)) return(-1);
++	++s1; ++s2;
++    }
++    return((*s1 == *s2) ? 0 : -1);
++}
++
++char *getmyname() {
++    static int initialized = 0;
++#ifdef SYSV
++    static struct utsname u;
++    static char *hostname = u.nodename;
++#else
++    static char hostname[60];
++#endif
++    if (!initialized) {
++#ifdef AMIGA
++        strcpy(hostname, myAddress);
++#else
++#ifdef SYSV
++    if (uname(&u) == -1) {
++        hostname = "UNKNOWN.SITE.NAME";
++    }
++#else
++#ifdef MSDOS
++    strcpy(hostname, "UNKNOWN.SITE.NAME");
++#else
++        gethostname(hostname, sizeof(hostname));
++#endif /* MSDOS */
++#endif /* SYSV */
++#endif /* AMIGA */
++        initialized = 1;
++    }
++    return(hostname);
++}
++
+--- metamail-2.7.orig/src/metamail/metamail.c
++++ metamail-2.7/src/metamail/metamail.c
+@@ -0,0 +1,2223 @@
++/*
++Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++
++Permission to use, copy, modify, and distribute this material 
++for any purpose and without fee is hereby granted, provided 
++that the above copyright notice and this permission notice 
++appear in all copies, and that the name of Bellcore not be 
++used in advertising or publicity pertaining to this 
++material without the specific, prior written permission 
++of an authorized representative of Bellcore.  BELLCORE 
++MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++*/
++/****************************************************** 
++    Metamail -- A tool to help diverse mail readers 
++                cope with diverse multimedia mail formats.
++
++    Author:  Nathaniel S. Borenstein, Bellcore
++
++ ******************************************************* */
++
++#include <metamail/common.h>
++#include <metamail/patchlevel.h>
++#include <metamail/dlist.h>
++
++#include "metamail.h"
++#include "metamail_default.h"
++#include "environment.h" /* for initializing global variables to default or
++			    environment variables and for manipulating 
++			    environment variables */
++#include "mailcap.h" /* mailcap file(s) parsing functions */
++
++
++char fileToDelete[NAME_MAX];
++
++char *FindParam();
++
++FILE *InputFP = NULL;
++
++/* mike extensions */
++int nDebug = 0;
++/* exts end */
++
++int MightAskBeforeExecuting = 1,
++    DefinitelyNotTty = 0,
++    MustNotBeTty = 0,
++    MaybePageOutput = 0,
++    MustPageOutput = 0,
++    EatLeadingNewlines = 0,
++    PrintSomeHeaders = 1,
++    DoInBackground = 0,
++    Quiet = 0,
++    TransparentMode = 0,
++    DeleteSourceFileWhenDone = 0,
++    Is822Format = 1,
++    DoDebug = 0,
++    CParamsAlloced = 0,
++    CParamsUsed = 0,
++    YankMode = 0,
++    UsingStandardInput = 0,
++    PrintingMode = 0,
++    JustWriteFiles = 0,
++    ProcessingErrors = 0;
++
++int RunAsRootOK = 0;
++
++char *ContentType = NULL,
++    *ContentEncoding = NULL,
++    *MailerName = "unknown",
++    *MailSubject = "Mail message",
++    *MailFrom = "unknown sender",
++    *MailSummary = "non-text mail message",
++    *mailheaders = NULL,
++    **CParams = NULL,
++    **CParamValues = NULL,
++    *JunkParameter = NULL;
++
++int EncodingCode = ENCODING_NONE;
++
++struct part {
++    char *ctype;
++    char *fname;
++    struct part *next;
++};
++
++struct NoAskItem *FirstNoAskItem = NULL, 
++  *FirstQuietItem = NULL;
++
++void PrintHeader();
++void ConsumeRestOfPart();
++void ParseContentParameters();
++
++sigtype cleanup();
++
++char *Cleanse(s) /* no leading or trailing space, all lower case */
++char *s;
++{
++    char *tmp, *news;
++    
++    /* strip leading white space */
++    while (*s && isspace((unsigned char) *s)) ++s;
++    news = s;
++    /* put in lower case */
++    for (tmp=s; *tmp; ++tmp) {
++        if (isupper((unsigned char) *tmp)) *tmp = 
++					     tolower((unsigned char) *tmp);
++    }
++    /* strip trailing white space */
++    while (tmp > news && *--tmp && isspace((unsigned char) *tmp)) *tmp = 0;
++    return(news);
++}
++
++char *UnquoteString(s)
++char *s;
++{
++    char *ans, *t;
++
++    if (*s != '"') return(s);
++    ans = XMALLOC(char, 1+strlen(s)); //malloc(1+strlen(s));
++    ++s;
++    t = ans;
++    while (*s) {
++        if (*s == '\\') {
++            *t++ = *++s;
++        } else if (*s == '"') {
++            break;
++        } else {
++            *t++ = *s;
++        }
++        ++s;
++    }
++    *t = 0;
++    return(ans);
++}
++
++sigtype
++cleanup(signum) 
++int signum;
++{
++    RestoreTtyState();
++    signal(signum, SIG_DFL);
++    kill(getpid(), signum);
++}
++
++char **Boundaries = NULL;
++int BoundaryCt = 0, BoundaryAlloc = 0;
++struct nextfile {
++    char *filename;
++    struct nextfile *next;
++} *FileQueue=NULL, *LastInQueue = NULL;
++
++void
++ResetGlobals() {
++    CParamsAlloced = 0;
++    CParamsUsed = 0;
++
++    ContentType = NULL;
++    ContentEncoding = NULL;
++    MailSubject = "Mail message";
++    MailFrom = "unknown sender";
++    MailSummary = "non-text mail message";
++    initMailHeadersFromEnvironment();
++    CParams = NULL;
++    CParamValues = NULL;
++    JunkParameter = NULL;
++}
++
++
++/** initializes signalhandlers to cleanup function */
++void
++initSignalHandlers() {
++    signal(SIGINT,  cleanup);
++    signal(SIGILL,  cleanup);
++    signal(SIGTRAP, cleanup);
++    signal(SIGIOT,  cleanup);
++    signal(SIGFPE,  cleanup);
++    signal(SIGSEGV, cleanup);
++    signal(SIGTERM, cleanup);
++#ifdef SIGXCPU
++    signal(SIGXCPU, cleanup);
++#endif
++}
++
++/** the main function for metamail */
++main(argc, argv)
++int argc;
++char **argv;
++{
++    int retcode = 0;
++
++    initSignalHandlers;
++    addToPath(AUXPATH);           /* add additional dirs to PATH */
++    fileToDelete[0] = 0;
++
++    ProcessArguments(argc, argv); /* calls ExitWithError on error */
++
++    if (MaybePageOutput) {
++        /* Want to send stderr to pager too, sigh... */
++        fflush(stderr);
++        close(2);
++        dup2(1, 2);
++    }
++
++    retcode = HandleMessage(NULL, 0);
++    if (! UsingStandardInput) {
++        fclose(InputFP);
++    }
++    if (fileToDelete[0]) {
++        RmTmpFileName(fileToDelete);
++        fileToDelete[0] = 0;
++    }
++
++    while (FileQueue) {
++        InputFP = fopen(FileQueue->filename, "r");
++        if (DoDebug) printf("Trying to open input file: %s\n",
++			    FileQueue->filename);
++        if (!InputFP) ExitWithError("Can't read input file");
++        if (DeleteSourceFileWhenDone) {
++            strcpy(fileToDelete, FileQueue->filename);
++        }
++        ResetGlobals();
++        retcode |= HandleMessage(NULL, 0);
++        if (! UsingStandardInput) {
++            fclose(InputFP);
++        }
++        if (fileToDelete[0]) {
++            RmTmpFileName(fileToDelete);
++            fileToDelete[0] = 0;
++        }
++        FileQueue = FileQueue->next;
++    }
++    if (MustPageOutput) PauseForUser();
++    if (DoDebug) fprintf(stderr, "end of metamail\n");
++    CleanupTmpFiles();
++    exit(ProcessingErrors? -1 : retcode);
++}
++
++void
++QueueNextFile(fname)
++char *fname;
++{
++    struct nextfile *tmp = XMALLOC( struct nextfile, 1);
++    tmp->filename = fname;
++    tmp->next = NULL;
++    if (FileQueue) {
++        LastInQueue->next = tmp;
++        LastInQueue = tmp;
++    } else {
++        FileQueue = tmp;
++        LastInQueue = tmp;
++    }
++}
++
++HandleMessage(SquirrelFile, nestingdepth)
++char *SquirrelFile;
++/* SquirrelFile, if non-NULL, is a place to save a recognized body instead of executing it. */
++int nestingdepth;
++{
++    char *boundary;
++    int FileWriteOnly = JustWriteFiles;
++
++    if (FileWriteOnly) {
++        if (!lc2strncmp(ContentType, "message/", 8)
++             || !lc2strncmp(ContentType, "multipart/", 10)) {
++            FileWriteOnly = 0; /* only leaf data */
++        }
++    }
++    if (Is822Format) {
++	if (Read822Prefix(SquirrelFile?0:1, nestingdepth)) {
++	    return -1;
++	}
++    } else /* this property is not recursive for multipart or message */
++      Is822Format = 1;
++
++    PrepareMessage();
++    if (!FileWriteOnly && !ProcessMailcapFiles(SquirrelFile)) return(0);
++	
++    if (!lc2strcmp(ContentType, "message")
++         || !lc2strcmp(ContentType, "message/rfc822")) { 
++        if (SquirrelFile) return(SaveSquirrelFile(SquirrelFile));
++        ContentType = NULL; /* reset default */
++        ContentEncoding = NULL; /* reset default */
++        return(HandleMessage(NULL, nestingdepth+1)); /* simple recursion */
++    }
++
++    boundary = FindParam("boundary");
++    if (!boundary) boundary =JunkParameter; /* backward compatibility hack */
++    if (!lc2strncmp(ContentType, "multipart", 9)) { 
++      if (!boundary) {
++	  fprintf(stderr, "Warning: No boundary for multipart data, treating as unrecognized format.\n");
++      } else {
++        char *LineBuf, NewSquirrelFile[TMPNAME_MAX];
++        char *subtype = NULL;
++        int currct, result, IsAlternative, WroteSquirrelFile, boundarylen;
++
++        if (SquirrelFile) return(SaveSquirrelFile(SquirrelFile));
++        if (boundary[0] == '"') {
++            boundary=UnquoteString(boundary);
++        }
++        subtype = index(ContentType, '/');
++        if (subtype) {
++            ++subtype;
++            subtype = Cleanse(subtype);
++        } else subtype = "mixed";
++
++        if (!MaybePageOutput && !DoInBackground) 
++	  DoInBackground = strcmp(subtype, "parallel") ? 0 : 1;
++
++        IsAlternative = strcmp(subtype, "alternative") ? 0 : 1;
++        if (IsAlternative) {
++            MkTmpFileName(NewSquirrelFile);
++            WroteSquirrelFile = 0;
++        }
++        LineBuf = XMALLOC(char, LINE_BUF_SIZE);
++        sprintf(LineBuf, "--%s", boundary);
++        strcpy(boundary, LineBuf);
++        boundarylen = strlen(boundary);
++        if (BoundaryCt >= BoundaryAlloc) {
++            BoundaryAlloc += 5;
++            if (Boundaries) 
++	        Boundaries = XREALLOC(char *, Boundaries, BoundaryAlloc);
++            else 
++	        Boundaries = XMALLOC(char *, BoundaryAlloc);
++        }
++        Boundaries[BoundaryCt++] = boundary;
++        if (DoDebug) printf("Handling multipart as built-in here.  Boundary: %s\n", boundary);
++        while (fgets(LineBuf, LINE_BUF_SIZE, InputFP)) { /* find start */
++            if (!strncmp(LineBuf, boundary, boundarylen)
++                 && ((LineBuf[boundarylen] == '\n')
++                      || (LineBuf[boundarylen] == '-'
++                           && LineBuf[boundarylen+1] == '-'
++                           && LineBuf[boundarylen+2] == '\n'))) {
++                break;
++            }
++        }
++        XFREE(LineBuf);
++        currct = BoundaryCt;
++        while(currct == BoundaryCt) {
++            if (!strcmp(subtype, "digest")) {
++                ContentType = "message/rfc822";
++            } else {
++                ContentType = NULL; /* reset default */
++            }
++            ContentEncoding = NULL; /* reset default */
++            if (IsAlternative) {
++                result = HandleMessage(NewSquirrelFile, nestingdepth+1);
++            } else{
++                result = HandleMessage(NULL, nestingdepth+1);
++            }
++            if (result) {
++                /* Need to consume the rest of the part */
++                ConsumeRestOfPart(NULL);
++            } else {
++                ++WroteSquirrelFile;
++            }
++        }
++        /* Now we've seen the last encapsulation boundary, but if there is a "postfix"
++            we must throw it away.*/
++        if (BoundaryCt > 0) {
++            ConsumeRestOfPart(NULL);
++        }
++        if (IsAlternative) {
++            if (WroteSquirrelFile) {
++                int retcode; 
++                char Cmd[TMPNAME_MAX + 15];
++                sprintf(Cmd, "%s %s", METAMAIL, NewSquirrelFile);
++                fflush(stdout); fflush(stderr);
++                retcode = system(Cmd);
++                RmTmpFileName(NewSquirrelFile);
++                return(retcode);
++            } else {
++                printf("Cannot handle any part of multipart/alternative message\n");
++            }
++        }
++	return(0);
++      }
++    } /* End of multipart handling */
++    if (!FileWriteOnly && !TryBuiltIns(SquirrelFile)) return(0);
++    if (!SquirrelFile) { /* Very last resort -- unrecognized types */
++        char Fname[NAME_MAX], *suggestedname, SugBuf[NAME_MAX];
++        FILE *fp;
++        int ans = 0, octetstream, ecode=0;
++        int JustMadeTheFile=0;
++
++        Fname[0] = 0;
++
++        suggestedname = FindParam("name");
++        if (!suggestedname) {
++            MkTmpFileName(SugBuf);
++            suggestedname = SugBuf;
++            JustMadeTheFile=1;
++        }
++        if (strlen(suggestedname) > NAME_MAX - 50)
++             suggestedname[NAME_MAX - 50] = '\0';
++        if (suggestedname[0] == '"')
++                suggestedname=UnquoteString(suggestedname);
++ 
++        octetstream = ! lc2strcmp(ContentType, "application/octet-stream");
++        if (MightAskBeforeExecuting && !DefinitelyNotTty && !MustNotBeTty) {
++            if (FileWriteOnly) {
++                printf("\nThis message contains '%s`-format data.\n", ContentType);
++            } else if (octetstream) {
++                printf("This message contains raw digital data, which can either be viewed as text\nor written to a file.\n");
++            } else {
++                printf("\nThis message contains data in an unrecognized format, %s,\nwhich can either be viewed as text or written to a file.\n", ContentType);
++            }
++            while (!ans) {
++                if (FileWriteOnly) {
++                    ans = 2;
++                } else {
++                    printf("\nWhat do you want to do with the %s data?\n1 -- See it as text\n2 -- Write it to a file\n3 -- Just skip it\n4 -- Give another content type\n\n", octetstream ? "raw" : ContentType);
++                    fgets(Fname, sizeof(Fname), stdin);
++                    ans = atoi(Fname);
++                }
++                switch(ans) {
++                    case 1:
++                        TranslateInputToOutput(InputFP, stdout, EncodingCode, "text");
++                        return(0);
++                    case 2:
++                        {
++                        int needname = 1;
++                        while (needname) {
++                            needname = 0;
++                            printf("Please enter the name of a file to which the data should be written\n(Default: %s) > ", suggestedname);
++                            fflush(stdout);
++                            fgets(Fname, sizeof(Fname), stdin);
++                            Fname[strlen(Fname) - 1] = '\0'; /* bogus newline */
++                            if (!Fname[0])
++			      strcpy(Fname, suggestedname);
++
++                            if (Fname[0] == '~' && Fname[1] == '/') {
++                                char Fname2[NAME_MAX];
++                                int uid = getuid();
++                                struct passwd *p;
++                                p = getpwuid(uid);
++                                if (!p) {
++				  strcpy( Fname, suggestedname );
++				  printf("Cannot figure out what ~ means, using temporary file %s instead\n", Fname);
++                                } else {
++                                    strcpy(Fname2, p->pw_dir);
++                                    strcat(Fname2, "/");
++                                    strcat(Fname2, Fname + 2);
++                                    strcpy(Fname, Fname2);
++                                }
++                            }
++
++			    if ( strcmp( Fname, suggestedname ) ) 
++			      RmTmpFileName( suggestedname );
++			    else  /* remove from tmp list (should persist) */
++			      DelTmpFileName( suggestedname ); 
++			    
++			    
++			    if (DoDebug) fprintf(stderr, "pre access");
++
++                            if (!JustMadeTheFile && access(Fname, F_OK) == 0) {
++                                char *s, AnsBuf[50];
++                                int overwriteans = -1;
++                                do {
++                                    printf("File %s exists.  Do you want to overwrite it (y/n) ?\n", Fname);
++                                    s = fgets(AnsBuf, sizeof(AnsBuf), stdin);
++                                    if (!s) {
++                                        overwriteans = 0;
++                                    } else {
++                                        while (s && *s && isspace((unsigned char) *s)) ++s;
++                                        if (*s == 'y' || *s == 'Y' || !*s || *s == '\n') {
++                                            overwriteans = 1;
++                                        } else if (*s == 'n' || *s == 'N' || *s == 'q' || *s == 'Q') {
++                                            overwriteans=0;
++                                        }
++                                    }
++                                    if (overwriteans == -1) printf("Please answer yes or no.\n");
++                                } while (overwriteans == -1);
++                                if (overwriteans == 0) needname = 1;
++                            }
++                        }
++                        }
++                        break;
++                    case 3:
++                        ConsumeRestOfPart(NULL);
++                        return(0);
++                        break;
++		    case 4:
++		      {
++			char *savedContentType = ContentType;
++			ContentType = malloc(64);
++			printf("Please enter new content type> ");
++			fflush(stdout);
++			fgets(ContentType, 64, stdin);
++			ContentType[strlen(ContentType) - 1] = '\0'; /* bogus newline */
++			if (!ProcessMailcapFiles(SquirrelFile)) { 
++			  free(savedContentType); 
++			  return(0); 
++			}
++			printf("\nNo matching mailcap entry found.\n");
++			free(ContentType);
++			ContentType = savedContentType;
++			ans = 0;
++			break;
++		      }
++                    default:
++                        ans = 0;
++                        break;
++                }
++            }
++        } else {
++            int ct = 0;
++            char *slash = rindex(suggestedname, '/');
++            if (slash)  {
++                ++slash;
++            } else {
++                slash = suggestedname;
++            }
++            do {
++                if (ct) {
++                    sprintf(Fname, "%s/%d-%s", tmproot, ct, slash);
++                } else {
++                    sprintf(Fname, "%s/%s", tmproot, slash);
++                }
++                ++ct;
++            } while (access(Fname, F_OK) == 0);
++            if (FileWriteOnly) {
++                printf("\nThis message contains '%s`-format data.\n", ContentType);
++            } else if (octetstream) {
++                printf("\nThis message contains raw digital data,");
++            } else {
++                printf("\nThis message contains data in an unrecognized format, %s,", ContentType);
++            }
++            printf("\nwhich is being decoded and written to the file named \"%s\".\nIf you do not want this data, you probably should delete that file.\n", Fname);
++        }
++        if (Fname[0] == 0 || Fname[0] == '\n') {
++            ConsumeRestOfPart(NULL);
++        } else {
++            fp = fopen(Fname, WRITE_BINARY);
++            if (!fp) ExitWithError("Cannot open temporary file");
++            TranslateInputToOutput(InputFP, fp, EncodingCode, ContentType);
++            ecode = fclose(fp);
++            if (ecode) {
++                printf("Could not write file %s\n", Fname);
++            } else {
++                printf("Wrote file %s\n", Fname);
++            }
++        }
++        if (!DefinitelyNotTty && MaybePageOutput && BoundaryCt > 0) PauseForUser();
++        return(ecode);
++    }
++    return(-1); /* Unrecognized, really */
++}
++
++ProcessArguments(argc, argv)
++int argc;
++char **argv;
++{
++  int i;
++  char *SourceFileName = NULL;
++
++  initVarsFromEnvironment(); /* init global vars from environment */
++
++    for (i=1; i<argc; ++i) {
++	if (argv[i][0] == '-') {
++	    switch (argv[i][1]) {
++		case '\0':
++		    /* Not really necessary, but.... */
++		    SourceFileName = NULL;
++		    UsingStandardInput = 1;
++		    break;
++		case 'b':
++		    Is822Format = 0;
++		    break;
++		case 'B':
++		    DoInBackground = 1;
++		    break;
++                case 'c':
++		    if (++i >= argc) usage();
++		    ContentType = XMALLOC(char, 1+strlen(argv[i]));
++                    strcpy(ContentType,argv[i]);
++                    /* strip leading white space */
++                    while (*ContentType && isspace((unsigned char) *ContentType)) ++ContentType;
++                    StripTrailingSpace(ContentType);
++                    ParseContentParameters(ContentType);
++                    break;
++                case 'd':
++		    MightAskBeforeExecuting = 0;
++		    break;
++		case 'e':
++		    EatLeadingNewlines = 1;
++		    break;
++		case 'E':
++		    if (++i >= argc) usage();
++		    ContentEncoding = argv[i];
++		    break;
++		case 'f':
++		    if (++i >= argc) usage();
++		    MailFrom = argv[i];
++                    break;
++                case 'h':
++                    {
++                    FILE *tmpfp;
++                    PrintingMode = 1;
++                    MightAskBeforeExecuting = 0;
++		    //#ifdef AMIGA
++		    //		    freopen("prt:", "w", stdout);
++		    //#else
++                    /* Want to make all of stdout go to printer, and this 
++                      is easier than changing every output statement,
++                      at least on UNIX... */
++                    tmpfp = popen(LPRCOMMAND, "w");
++                    if (!tmpfp) {
++                        ExitWithError("Cannot execute lpr command");
++                    }
++                    fflush(stdout);
++                    close(1);
++                    dup2(fileno(tmpfp), 1);
++		    //#endif
++                    break;
++                    }
++		case 'm':
++		    if (++i >= argc) usage();
++		    MailerName = argv[i];
++		    break;
++		case 'p':
++		    MaybePageOutput = 1;
++		    break;
++		case 'P':
++                    MaybePageOutput = 1;
++                    MustPageOutput = 1;
++		    break;
++		case 'r':
++		    RunAsRootOK = 1;
++                    break;
++                case 'R':
++#ifdef RESET_PROGRAM
++                    system(RESET_PROGRAM);
++                    if (DoDebug) printf("Executed reset\n");
++#else
++                    fprintf(stderr, "metamail warning: -R flag not supported on this system\n");
++#endif
++                    break;
++		case 's':
++		    if (++i >= argc) usage();
++		    MailSubject = argv[i];
++		    break;
++                case 'T':
++                    TransparentMode = 0;
++                    break;
++                case 'w':
++                    JustWriteFiles = 1;
++                    break;
++                case 'q':
++                    Quiet = 1;
++		    PrintSomeHeaders = 0;
++		    break;
++		case 'x':
++                    DefinitelyNotTty = 1;
++                    MustNotBeTty = 1;
++		    break;
++                case 'y':
++                    YankMode = 1;
++                    break;
++		case 'z':
++		    DeleteSourceFileWhenDone = 1;
++		    break;
++		default:
++		    usage();
++	    }
++	} else {
++	    if (SourceFileName) {
++                QueueNextFile(argv[i]);
++	    } else {
++		SourceFileName = argv[i];
++	    }
++	}
++    }
++    if (TransparentMode) {
++        RunInNewWindow(argv, argc, &SourceFileName);
++    }
++    if (MaybePageOutput && DoInBackground) {
++	MustNotBeTty = 1;
++        /*fprintf(stderr, "metamail: -B is incompatible with -p, -P, and MM_USEPAGER\n");
++        usage(); */
++    }
++    if (!Is822Format && !ContentType) {
++	fprintf(stderr, "metamail:  -b requires -c.\n");
++	usage();
++    }
++    if (DeleteSourceFileWhenDone && !SourceFileName) {
++	fprintf(stderr, "metamail:  -z requires -f.\n");
++	usage();
++    }
++    if (!RunAsRootOK && (getuid() == 0 || geteuid() == 0)) {
++	fprintf(stderr, "You can not run MetaMail as root unless you use -r or set MM_RUNASROOT.\n");
++	usage();
++    }
++    if (SourceFileName) {
++        InputFP = fopen(SourceFileName, "r");
++        if (DoDebug) printf("Trying to open input file: %s\n", SourceFileName);
++        if (!InputFP) ExitWithError("Can't read input file");
++        if (DeleteSourceFileWhenDone) {
++            strcpy(fileToDelete, SourceFileName);
++        }
++    } else {  /* input on stdin */
++        UsingStandardInput = 1;
++        if (MustNotBeTty) {
++            InputFP = stdin;
++/*            MaybePageOutput = 1; */ /* This messed up safe-tcl -- nsb 9/21/93 */
++            MightAskBeforeExecuting = 0;
++        } else {
++            int newfd = dup(0);
++            FILE *newfp;
++            if (newfd > 0) {
++                InputFP = fdopen(newfd, "r");
++                if (InputFP 
++                     && ((newfp = fopen("/dev/tty", "r")) != NULL)
++                     && !dup2(fileno(newfp), 0)) {
++                    DefinitelyNotTty = 0;
++                } else {
++                    InputFP = stdin;
++                    DefinitelyNotTty = 1;
++                    MaybePageOutput = 0;
++                }
++            }
++        }
++    }
++    if (DefinitelyNotTty && MaybePageOutput) {
++        RunInNewWindow(argv, argc, &SourceFileName);
++    }
++    if (DefinitelyNotTty) {
++        MaybePageOutput = 0;	/* Disable pager if I/O has been redirected */
++    }
++    return(0);
++}
++
++usage() {
++    fprintf(stderr, "Usage:  metamail [-b] [-B] [-d] [-e] [-h] [-r] [-R] [-p]  [-P] [-x] [-y] [-z] [-c content-type] [-E content-transfer-encoding] [-f from-name] [-m mailername] [-s subject] [message-file-name]\n");
++    ExitWithError(NULL);
++}
++
++RunInNewWindow(argv, argc, SourceFileNamePtr)
++char **argv, **SourceFileNamePtr;
++int argc;
++{
++    char *FullCmd, TmpName[TMPNAME_MAX];
++    int i, createdfile=0;
++    if (!*SourceFileNamePtr) {
++        char *LineBuf;
++        FILE *fptmp;
++
++        LineBuf = XMALLOC(char, LINE_BUF_SIZE);
++        /* Create it, ugh.  Also needs to affect later command. */
++        MkTmpFileName(TmpName);
++	DelTmpFileName(TmpName);
++        DeleteSourceFileWhenDone = 1;
++        fptmp = fopen(TmpName, WRITE_BINARY);
++        if (!fptmp) ExitWithError("Can't open temporary file\n");
++        while (fgets(LineBuf, LINE_BUF_SIZE, stdin)) {
++            fputs(LineBuf, fptmp);
++        }
++        XFREE(LineBuf);
++        fclose(fptmp);
++        *SourceFileNamePtr = TmpName;
++        createdfile = 1;
++    }
++    FullCmd = XMALLOC(char, CMDSIZE);
++    if (TransparentMode) {
++        /* In transparent mode, we want to produce stdout that is what we get in, and do EVERYTHING externally in a terminal window.  This is to make the truly brain-dead mailers like mailtool happy. I am NOT happy about having to do this.  */
++        /* So, first we copy everything to stdout */
++        sprintf(FullCmd, CATTEMPLATE, *SourceFileNamePtr);
++        system(FullCmd); /* Cheesy way to do it */
++        fflush(stdout); fflush(stderr);
++    }
++    /* Then we run ourselves in a terminal window */
++    MailSummary = "Metamail"; /* for window label */
++    CreateNewWindowPrefix(FullCmd);
++    strcat(FullCmd, METAMAIL);
++    strcat(FullCmd, " -P ");
++    if (TransparentMode) strcat(FullCmd, "-T ");
++    for (i=1; i<argc; ++i) {
++        if (strncmp(argv[i], "-x", 2)
++             && strncmp(argv[i], "-B", 2)
++             && strncmp(argv[i], "-d", 2)) {
++            strcat(FullCmd, "\"");
++            strcat(FullCmd, argv[i]);
++            strcat(FullCmd, "\" ");
++        }
++    }
++    if (createdfile) {
++        strcat(FullCmd, "-z ");
++        strcat(FullCmd, *SourceFileNamePtr);
++    }
++    if (!MightAskBeforeExecuting) {
++        strcat(FullCmd, " -d ");
++        /* The special hack for -d is HORRIBLE, but xterm screws up with the -d option in the middle of the command line! */
++    }
++    if (DoInBackground) strcat(FullCmd, " &");
++    DefinitelyNotTty = 0;
++    SetUpEnvironment();
++    if (DoDebug) fprintf(stderr, "Executing %s\n", FullCmd);
++    fflush(stdout); fflush(stderr);
++    exit(system(FullCmd));
++}
++
++
++static char *ThingsToSkip[] = {
++    "csh ",
++    "sh ",
++    "ksh ",
++    NULL
++};
++
++char *ShortCommand(progname)
++char *progname;
++{
++    int i;
++    char *s, *oldprogname;
++    static char FullProgName[500];
++
++eatmore:
++    while (*progname && (*progname == '(' || isspace((unsigned char) *progname))) {
++        ++progname;
++    }
++    oldprogname = progname;
++    for (i = 0; oldprogname == progname && ThingsToSkip[i]; ++i) {
++        if (!strncmp(progname, ThingsToSkip[i], strlen(ThingsToSkip[i]))) {
++            progname += strlen(ThingsToSkip[i]);
++        }
++    }
++    if (*progname == '-') {
++        ++progname;
++        while (*progname && !isspace((unsigned char) *progname)) ++progname;
++    }
++    if (progname != oldprogname) goto eatmore;
++    strcpy(FullProgName, progname);
++    s = index(FullProgName, ' ');
++    if (s) *s = 0;
++    s = rindex(FullProgName, '/');
++    if (s) {
++	return(s+1);
++    } else {
++	return(FullProgName);
++    }
++}    
++
++TryMailcapEntry(mc, SquirrelFile)
++struct MailcapEntry mc;
++char *SquirrelFile;
++{
++    StripTrailingSpace(mc.contenttype);
++    if (DoDebug) fprintf(stderr, "Trying mailcap entry for '%s'.\n", mc.contenttype);
++    if (PrintingMode && !mc.printcommand) return(-1);
++    if (CtypeMatch(ContentType, mc.contenttype) && PassesTest(&mc)) {
++        if (SquirrelFile) {
++            return(SaveSquirrelFile(SquirrelFile));
++        } else {
++            char TmpFileName[TMPNAME_MAX];
++            MkTmpFileName(TmpFileName);
++            return(ExecuteMailcapEntry(mc, TmpFileName, ContentType));
++        }
++    }
++    if (mc.needtofree) {
++        XFREE(mc.contenttype);
++        XFREE(mc.command);
++    }
++    return(-1);
++}
++
++SaveSquirrelFile(SquirrelFile)
++char *SquirrelFile;
++{
++    int j;
++    FILE *outfp;
++
++    if (DoDebug) printf("saving to file %s\n", SquirrelFile);
++
++    outfp = fopen(SquirrelFile, WRITE_BINARY);
++    if (!outfp) {
++        fprintf(stderr, "Cannot open %s to squirrel away a portion of a multipart/alternative\n", SquirrelFile);
++        return(-1);
++    }
++    fprintf(outfp, "Content-type: %s", ContentType);
++    for (j=0; j<CParamsUsed; ++j) {
++        fprintf(outfp, " ; ");
++        fprintf(outfp, "%s", CParams[j]);
++        fprintf(outfp, " = ");
++        fprintf(outfp, "%s", CParamValues[j]);
++    }
++    fprintf(outfp, "\n\n"); 
++    TranslateInputToOutput(InputFP, outfp, EncodingCode, ContentType);
++    if (fclose(outfp)) {
++        ExitWithError("fclose failed");
++    }
++    return(0);
++}
++
++ExecuteMailcapEntry(mc, TmpFileName, ThisContentType)
++char *TmpFileName, *ThisContentType;
++struct MailcapEntry mc;
++{
++    int resultcode=0, DidExecute, UsedTmpFileName;
++    struct part *PartsWritten=NULL;
++    char *s, *cmd;
++
++    cmd = XMALLOC(char, CMDSIZE);
++    if (PrintingMode && !mc.printcommand) return(-1);
++    BuildCommand(cmd, PrintingMode ? mc.printcommand : mc.command, TmpFileName, &UsedTmpFileName, &PartsWritten);
++    if (DoDebug) fprintf(stderr, "Match!  Built command %s.\n", cmd);
++    if (mc.copiousoutput && MaybePageOutput) {
++        strcat(cmd, " | ");
++        s = getenv("METAMAIL_PAGER");
++        if (s && strncmp(s, "metamail", 8)) {
++            /* If METAMAIL_PAGER is set to "metamail" we override it */
++            strcat(cmd, s);
++            if (!strncmp(s, "less", 4) && strncmp(s+5, "-r", 2)) {
++                fprintf(stderr, "Warning:  'less' without '-r' behaves badly for some mail types,\n\tnotably richtext.\n");
++            }
++        } else {
++            strcat(cmd, "more");
++        }
++    }
++    if (!DefinitelyNotTty) {
++        SaveTtyState();
++    }
++    if (!NeedToAskBeforeExecuting(ThisContentType)
++         || OKToRun(ThisContentType, cmd, mc.label)) {
++        char *FullCmd;
++        int ReallyNotTty;
++	//#ifndef NO_RLIMITS
++        /* Limit size of core dumps */
++        //struct rlimit rlp;
++
++        //rlp.rlim_cur = 0;
++        //rlp.rlim_max = 0;
++        //setrlimit(RLIMIT_CORE, &rlp); 
++	//#endif
++        FullCmd = XMALLOC(char, CMDSIZE);
++        ReallyNotTty = DefinitelyNotTty;
++        if (mc.needsterminal
++             && DefinitelyNotTty) {
++            int j;
++            sprintf(cmd, " %s -P -b -c '%s", METAMAIL, ThisContentType);
++            for (j=0; j<CParamsUsed; ++j) {
++                strcat(cmd, " ; ");
++                strcatquoting(cmd, CParams[j]);
++                strcat(cmd, " = ");
++                strcatquoting(cmd, CParamValues[j]);
++            }
++            strcat(cmd, "' ");
++            strcat(cmd, TmpFileName);
++            CreateNewWindowPrefix(FullCmd);
++            strcat(FullCmd, cmd);
++            DefinitelyNotTty = 0; /* For recursive call */
++        } else {
++            strcpy(FullCmd, cmd);
++        }
++        DidExecute = 0;
++        if (UsedTmpFileName || PartsWritten) {
++            int isempty;
++            if (PartsWritten) {
++                isempty = 0;
++            } else {
++                isempty = WriteTmpFile(TmpFileName, ThisContentType);
++            }
++            if (!isempty || strncmp(ThisContentType, "text", 4)) {
++                if (DoInBackground && !PartsWritten && !mc.needsterminal) {
++                    char TmpCmd[CMDSIZE];
++                    sprintf(TmpCmd, "(%s; rm %s) &", FullCmd, TmpFileName);
++                    DefinitelyNotTty = 1; /* in background */
++                    SetUpEnvironment();
++                    resultcode = ExecuteCommand(TmpCmd, 1);
++		    DelTmpFileName(TmpFileName); /* an rm ... was already added
++						    to the executing cmd */
++                    ++DidExecute;
++                } else {
++                    SetUpEnvironment();
++                    resultcode = ExecuteCommand(FullCmd, 1);
++                    RmTmpFileName(TmpFileName);
++                    ++DidExecute;
++                }
++            } else { /* empty text part, hack to not say "more" */
++                RmTmpFileName(TmpFileName);
++            }
++        } else {
++            FILE *tmpfp;
++            SetUpEnvironment();
++            (void) ExecuteCommand(FullCmd, 0);
++            tmpfp = popen(FullCmd, WRITE_BINARY);
++            TranslateInputToOutput(InputFP, tmpfp, EncodingCode, ThisContentType);
++            resultcode = tmpfp ? pclose(tmpfp) : -1;
++            ++DidExecute;
++        }
++        DefinitelyNotTty = ReallyNotTty;
++        if (!DefinitelyNotTty && DidExecute) {
++            RestoreTtyState();
++            if (mc.copiousoutput && MaybePageOutput && BoundaryCt > 0) PauseForUser();
++        }
++        if (!resultcode) {
++            XFREE(FullCmd);
++        } else {
++            fprintf(stderr, "Command failed: %s\n", FullCmd);
++            if (MaybePageOutput && BoundaryCt > 0) PauseForUser();
++            ++ProcessingErrors;
++        }
++    } else {
++        /* user does not want to execute command */
++        if (!DefinitelyNotTty) {
++            RestoreTtyState();
++        }
++        if (DoDebug) fprintf(stderr, "Not executing command.\n");
++        if (!PartsWritten) ConsumeRestOfPart(NULL);
++    }
++    if (PartsWritten) {
++        struct part *tp;
++        char HeadFile[NAME_MAX];
++
++        while (PartsWritten) {
++            tp=PartsWritten->next;
++            XFREE(PartsWritten->ctype);
++            strcpy(HeadFile, PartsWritten->fname);
++            strcat(HeadFile, "H");
++            RmTmpFileName(HeadFile);
++            RmTmpFileName(PartsWritten->fname);
++            XFREE(PartsWritten->fname);
++            XFREE(PartsWritten);
++            PartsWritten=tp;
++        }
++    }
++    if (!DefinitelyNotTty) {
++        RestoreTtyState();
++    }
++    XFREE(cmd);
++    return(0);
++}
++
++PassesTest(mc)
++struct MailcapEntry *mc;
++{
++    int result;
++    char *cmd, TmpFileName[TMPNAME_MAX];
++
++    if (!mc->testcommand) return(1);
++    MkTmpFileName(TmpFileName);
++    cmd = XMALLOC(char, CMDSIZE);
++    BuildCommand(cmd, mc->testcommand, TmpFileName, NULL, NULL);
++    if (DoDebug) printf("Executing test command: %s\n", cmd);
++    result = system(cmd);
++    XFREE(cmd);
++    return(!result);
++}
++
++char *
++GetCommand(s, t)
++char *s, **t;
++{
++    char *s2;
++    int quoted = 0;
++    s2 = XMALLOC(char, strlen(s)*2+1); /* absolute max, if all % signs */
++    *t = s2;
++    while (s && *s) {
++	if (quoted) {
++            if (*s == '%') *s2++ = '%'; /* Quote through next level, ugh! */
++
++            *s2++ = *s++;
++	    quoted = 0;
++	} else {
++	    if (*s == ';') {
++                *s2 = 0;
++		return(++s);
++	    }
++	    if (*s == '\\') {
++		quoted = 1;
++		++s;
++	    } else {
++		*s2++ = *s++;
++	    }
++	}
++    }
++    *s2 = 0;
++    return(NULL);
++}	
++
++GetMailcapEntry(fp, mc)
++FILE *fp;
++struct MailcapEntry *mc;
++{
++    int rawentryalloc = 2000, len;
++    char *rawentry, *s, *t, *LineBuf;
++
++    LineBuf = XMALLOC(char, LINE_BUF_SIZE);
++    rawentry = XMALLOC(char, 1 + rawentryalloc);
++    *rawentry = 0;
++    while (fgets(LineBuf, LINE_BUF_SIZE, fp)) {
++	if (LineBuf[0] == '#') continue;
++        len = strlen(LineBuf);
++        if (len == 0) continue;
++        if (LineBuf[len-1] == '\n') LineBuf[--len] = 0;
++	if ((len + strlen(rawentry)) > rawentryalloc) {
++	    rawentryalloc += 2000;
++	    rawentry = realloc(rawentry, rawentryalloc+1);
++	}
++	if (LineBuf[len-1] == '\\') {
++            LineBuf[len-1] = 0;
++	    strcat(rawentry, LineBuf);
++	} else {
++	    strcat(rawentry, LineBuf);
++	    break;
++	}
++    }
++    XFREE(LineBuf);
++    for (s=rawentry; *s && isspace((unsigned char) *s); ++s) ;
++    if (!*s) {
++	/* totally blank entry -- quietly ignore */
++	XFREE(rawentry);
++	return(0);
++    }
++    s = index(rawentry, ';');
++    if (!s) {
++	fprintf(stderr, "metamail: Ignoring invalid mailcap entry: %s\n", rawentry);
++	XFREE(rawentry);
++	return(0);
++    }
++    *s++ = 0;
++    mc->needsterminal = 0;
++    mc->copiousoutput = 0;
++    mc->needtofree = 1;
++    mc->testcommand = NULL;
++    mc->label = NULL;
++    mc->printcommand = NULL;
++    mc->contenttype = XMALLOC(char, 1+strlen(rawentry));
++    strcpy(mc->contenttype, rawentry);
++    t = GetCommand(s, &mc->command);
++    if (!t) {
++        XFREE(rawentry);
++        return(1);
++    }
++    while (s && *s && isspace((unsigned char) *s)) ++s;
++    s = t;
++    while (s) {
++	char *arg, *eq;
++
++        t = GetCommand(s, &arg);
++/*        if (t) *t++ = 0; */
++        eq = index(arg, '=');
++        if (eq) *eq++ = 0;
++	if (*arg) {
++	    arg = Cleanse(arg);
++	    if (!strcmp(arg, "needsterminal")) {
++		mc->needsterminal = 1;
++	    } else if (!strcmp(arg, "copiousoutput")) {
++		mc->copiousoutput = 1;
++	    } else if (eq && !strcmp(arg, "test")) {
++		mc->testcommand = eq;
++	    } else if (eq && !strcmp(arg, "description")) {
++		mc->label = eq;
++	    } else if (eq && !strcmp(arg, "label")) { 
++		mc->label = eq; /* bogus old name for description */
++	    } else if (eq && !strcmp(arg, "print")) {
++		mc->printcommand = eq;
++	    } else if (eq && !strcmp(arg, "textualnewlines")) {
++		ExceptionalNewline(mc->contenttype, atoi(eq));
++	    } else if (strcmp(arg, "notes")) { /* IGNORE notes field */
++		if (*arg && DoDebug) fprintf(stderr, "metamail: Ignoring mailcap flag: %s\n", arg);
++	    }
++	}
++	s = t;
++    }
++    XFREE(rawentry);
++    return(1);
++}
++
++ExitWithError(txt)
++char *txt;
++{
++    if (txt) fprintf(stderr, "metamail: %s\n", txt);
++    exit(-1);
++}
++
++char *
++FreshHeaderCopy(s)
++char *s;
++{
++    char *t, *newcopy;
++    int len;
++
++    while (s && *s && isspace((unsigned char) *s) && *s != '\n') ++s;
++    t = index(s, '\n');
++    while (t && (*(t+1) == ' ' || *(t+1) == '\t')) {
++        t = index(t+1, '\n');
++    }
++    len = t ? (t-s+1) : (strlen(s)+1);
++    newcopy = XMALLOC(char, len+3); /* two extra bytes for a bizarre bug caused
++                                       by the fact that FindParam calls
++				       FreshHeaderCopy and sometimes tacks on
++				       "--".
++				    */
++    strncpy(newcopy, s, len);
++    newcopy[len] = 0;
++    return(newcopy);
++}
++
++Read822Prefix(PrintHeads, nestingdepth)
++int PrintHeads, nestingdepth;
++{
++    int SawNewline = 1, bytes = 0, alloced = 1000, HasEncodedChars=0;
++    int c, oldbytes;
++    char *s, *t, *tmp;
++
++    if (!PrintSomeHeaders) PrintHeads = 0;
++    mailheaders = XMALLOC(char, alloced+1);
++    strcpy(mailheaders, "MM_HEADERS=\n");
++    bytes = 12;
++yankagain:
++    t = mailheaders + bytes;
++    oldbytes = bytes-1; /* a hack for YankMode */
++    while ((c = getc(InputFP)) != EOF) {
++        if (++bytes >= alloced) {
++            alloced += 1000;
++            mailheaders = realloc(mailheaders, alloced);
++            t = mailheaders + bytes - 1;
++        }
++        if (c == '\n') {
++            if (SawNewline) break;
++            SawNewline = 1;
++        } else SawNewline = 0;
++        *t++ = c;
++    }
++    *t = 0;
++    --bytes;
++    if (c == EOF) {
++	if (nestingdepth) {
++	    fprintf(stderr, "metamail: Incomplete multipart message -- unexpected EOF\n");
++/*            exit(ProcessingErrors); */
++        } else {
++            if (YankMode) {
++/*                ExitWithError("Could not extract a MIME message from the  body\n"); */
++		fprintf(stderr, "metamail: Could not extract a MIME message from the body\n");
++            } else {
++		fprintf(stderr, "metamail: Could not find end of mail headers.\n");
++/*                ExitWithError("Could not find end of mail headers"); */
++            }
++	}
++	BoundaryCt=0;
++	return -1;
++    }
++    for (s=mailheaders+oldbytes; *s; ++s) {
++        if (*s == '\n' && (*(s+1) != ' ') && (*(s+1) != '\t')) {
++	    if (!ContentType && !lc2strncmp(s, "\ncontent-type:", 14)) {
++		char *dum;
++                ContentType = FreshHeaderCopy(s+14);
++		/* Eliminate white space embedded in content-type */
++		while (1) {
++		    dum = index(ContentType, '/');
++		    if (!dum) break;
++		    if (isspace(*(dum-1))) {
++			for (--dum; *dum; ++dum) {
++			    *dum = *(dum+1);
++			}
++		    } else if (isspace(*++dum)) {
++			for ( ; *dum; ++dum) {
++			    *dum = *(dum+1);
++			}
++		    } else {
++			break;
++		    }
++		}
++                StripTrailingSpace(ContentType);
++                ParseContentParameters(ContentType);
++                if (PrintHeads) maybephead(s+1);
++            } else if (!ContentEncoding && !lc2strncmp(s, "\ncontent-transfer-encoding:", 27)) {
++                ContentEncoding = FreshHeaderCopy(s+27);
++                if (PrintHeads) maybephead(s+1);
++            } else if (!lc2strncmp(s, "\nsubject:", 9)) {
++                if (PrintHeads) maybephead(s+1);
++                MailSubject = FreshHeaderCopy(s+9);
++            } else if (!lc2strncmp(s, "\nfrom:", 6)) {
++                if (PrintHeads) maybephead(s+1);
++                MailFrom = FreshHeaderCopy(s+6);
++            } else if (!lc2strncmp(s, "\ncontent-description:", 4)) {
++                if(PrintHeads) maybephead(s+1);
++                MailSubject = FreshHeaderCopy(s+21);
++            } else {
++                /* Print any with encoded variables */
++                char *dum = s;
++                while (dum) {
++                    dum = index(dum, '?');
++                    if (dum && *++dum == '=') break;
++                }
++                if (dum) {
++                    char *nl = s+1;
++                    while (nl) {
++                        nl = index(nl, '\n');
++                        if (nl && !isspace((unsigned char) *++nl)) break;
++                    }
++                    if (nl && nl > dum) ++HasEncodedChars;
++                }
++                if (HasEncodedChars) {
++                    phead(s+1);
++                } else if (PrintHeads) {
++                    maybephead(s+1);
++                }
++            }
++        }
++    }
++    /* Ugly, but effective */
++    if (YankMode && !ContentType) {
++        goto yankagain;
++    }
++    if (PrintHeads) printf("\n");
++    if (!ContentType) {
++        ContentType = "text/plain";
++        CParamsUsed=0;
++    }
++    for (tmp=ContentType; *tmp; ++tmp) {
++        if (isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
++    }
++    return 0;
++}
++
++PrepareMessage() {
++    int c;
++
++    EncodingCode = ENCODING_NONE;
++    if (ContentEncoding) {
++        /* strip leading white space */
++        while (*ContentEncoding && isspace((unsigned char) *ContentEncoding)) ++ContentEncoding;
++        StripTrailingSpace(ContentEncoding);
++        if (!lc2strcmp(ContentEncoding, "base64")) {
++            EncodingCode = ENCODING_BASE64;
++        } else if (!lc2strcmp(ContentEncoding, "quoted-printable")) {
++            EncodingCode = ENCODING_QUOTEDPRINTABLE;
++        } else if (!lc2strncmp (ContentEncoding, "x-uue", 5)) {
++            fprintf (stderr, "WARNING:  Using nonstandard %s encoding, trying uuencode algorithm.\n", ContentEncoding);
++ 	    EncodingCode = ENCODING_UUENCODE;
++        } else {
++            if (lc2strcmp(ContentEncoding, "none")
++                 && !lc2strcmp(ContentEncoding, "8bit")
++                 && !lc2strcmp(ContentEncoding, "7bit")) {
++                fprintf(stderr, "Ignoring unrecognized Content-Transfer-Encoding value: %s\n", ContentEncoding);
++            }
++        }
++    }
++    if (EatLeadingNewlines) {
++        while ((c = getc(InputFP)) != EOF) {
++            if (c != '\n') {
++                ungetc(c, InputFP);
++                break;
++            }
++        }
++    }
++    SetUpEnvironment();  
++}
++
++SetUpEnvironment() { 
++    int i, j, environsize;
++    char **newenviron, *mailervar, *summaryvar, *ctypevar, *s;
++    static char ttyenv[15], debugenv[15], *noaskenv, pagerenv[15], *quietenv, rootenv[25];
++
++    /* Hack to make the code look similar for unix & dos */
++#define putenv(var)        newenviron[i++] = var;
++    for (environsize=0; environ[environsize]; ++environsize) {
++	;
++    }
++    newenviron = XMALLOC(char *, 17+environsize);
++    mailervar = XMALLOC(char, 13+strlen(MailerName));
++    sprintf(mailervar, "MM_MAILER=%s", MailerName);
++    summaryvar = XMALLOC(char, 26 + strlen(MailFrom) + strlen(MailSubject));
++    sprintf(summaryvar, "MM_SUMMARY=%s (from %s)", MailSubject, MailFrom);
++    MailSummary = summaryvar+11;
++    EliminateNastyChars(MailSummary);
++    i = 0;
++    if (ContentType) {
++        int ctypelen = 22+strlen(ContentType);
++        for (j=0; j<CParamsUsed; ++j) {
++            ctypelen += 6 + strlen(CParams[j]) + strlen(CParamValues[j]);
++        }
++        ctypevar = XMALLOC(char, ctypelen);
++        for (s=ContentType; *s; ++s) {
++            if (isupper((unsigned char) *s)) *s = tolower((unsigned char) *s);
++        }
++        while (isspace((unsigned char) *--s)) *s = 0;
++        sprintf(ctypevar, "MM_CONTENTTYPE=%s", ContentType);
++        for (j=0; j<CParamsUsed; ++j) {
++            strcat(ctypevar, " ; ");
++            strcat(ctypevar, CParams[j]);
++            strcat(ctypevar, " = ");
++            strcat(ctypevar, CParamValues[j]);
++        }
++        putenv(ctypevar);
++    }
++    putenv(mailheaders ? mailheaders : "MM_HEADERS=unknown");
++    putenv(mailervar);
++    putenv(summaryvar);
++    sprintf(ttyenv, "MM_NOTTTY=%d", DefinitelyNotTty);
++    putenv(ttyenv);
++    sprintf(debugenv, "MM_DEBUG=%d", DoDebug);
++    putenv(debugenv);
++    s = getenv("MM_QUIET");
++    if (!s) s = QuietDefault;
++    quietenv = XMALLOC(char, 15 + strlen(s));
++    if (Quiet) {
++        strcpy(quietenv, "MM_QUIET=1");
++    } else {
++        sprintf(quietenv, "MM_QUIET=%s", s);
++    }
++    putenv(quietenv);
++    s = getenv("MM_NOASK");
++    if (!s) s = NoAskDefault;
++    noaskenv = XMALLOC(char, 15 + strlen(s));
++    if (MightAskBeforeExecuting) {
++        sprintf(noaskenv, "MM_NOASK=%s", s);
++    } else {
++        strcpy(noaskenv, "MM_NOASK=1");
++    }
++    putenv(noaskenv);
++    s = getenv("MM_RUNASROOT");
++    if (!s) s = "0";
++    sprintf(rootenv, "MM_RUNASROOT=%s", s);
++    putenv(rootenv);
++    sprintf(pagerenv, "MM_USEPAGER=%d", MaybePageOutput);
++    putenv(pagerenv);
++    for (j=0; j<environsize; ++j) {
++        if (strncmp(environ[j], "MM_", 3) || !strncmp(environ[j], "MM_CHARSET", 10)) {
++            putenv(environ[j]);
++        }
++    }
++    newenviron[i] = NULL;
++    environ = newenviron;
++    if (DoDebug) {
++        printf("Here is the environment:\n\n");
++        system("printenv");
++    }
++}
++
++
++OKToRun(ctype, progname, label)
++char *ctype, *progname, *label;
++{
++    char AnsBuf[100], *s;
++
++    if (DoInBackground) return(1);
++    if (DefinitelyNotTty || MustNotBeTty) return(1);
++    while (1) {
++        printf("\n");
++        if (label) {
++            printf("This message contains %s.\nDo you want to view it using the '%s' command (y/n) [y] ? ", label, ShortCommand(progname));
++        } else {
++            printf("This message contains '%s'-format data.\nDo you want to view it using the '%s' command (y/n) [y] ? ", ctype, ShortCommand(progname));
++        }
++        s = fgets(AnsBuf, sizeof(AnsBuf), stdin);
++        if (!s) return(0); /* EOF */
++	while (s && *s && isspace((unsigned char) *s)) ++s;
++	if (*s == 'y' || *s == 'Y' || !*s || *s == '\n') return(1);
++	if (*s == 'n' || *s == 'N' || *s == 'q' || *s == 'Q') {
++	    return(0);
++	}
++	printf("Please answer yes or no.\n");
++    }
++}
++
++EliminateNastyChars(s)
++char *s;
++{
++    if (s) for( ; *s ;++s) {
++        if (isalnum((unsigned char) *s)) continue;
++	if (index(" ,.;:/?\\|[]{}()*&^%#@-_=+~<>\"", *s)) continue;
++	if (*s == '\'' || *s == '`') {
++	    *s = '"';
++	} else {
++	    *s = ' ';
++	}
++    }
++}
++
++StripTrailingSpace(s)
++char *s;
++{
++    char *t = s+strlen(s) -1;
++    while (isspace((unsigned char) *t) && (t >= s)) *t-- = 0;
++}
++
++static char *KeyHeads=NULL;
++static char **KeyHeadList;
++static int KeyKeep = 0;
++
++void setKeyHeads()
++{
++    char *s;
++    int numkeys = 0;
++
++    if ((KeyHeads = getenv("KEYHEADS")) != 0) {
++        for (s=KeyHeads;*s;++s) if (isupper((unsigned char) *s)) *s=tolower((unsigned char) *s);
++    } else if ((KeyHeads = getenv("KEYIGNHEADS")) != 0) {
++	for (s=KeyHeads;*s;++s) if (isupper((unsigned char) *s)) *s=tolower((unsigned char) *s);
++	KeyKeep = 1;
++    } else {
++	static char khtmp[] = "to:cc:subject:from:content-description:date";
++	KeyHeads = khtmp;
++    }
++    for (s=KeyHeads; *s; ++s) if (*s == ':') ++numkeys;
++    numkeys += 2;
++    KeyHeadList = XMALLOC(char *, numkeys);
++    numkeys = 0;
++    KeyHeadList[0] = KeyHeads;
++    for(s=KeyHeads; *s; ++s) {
++	if (*s == ':') {
++	    *s = '\0';
++	    KeyHeadList[++numkeys] = s+1;
++	}
++    }
++    KeyHeadList[++numkeys] = NULL;
++}
++
++/* find the first colon in a header line which appears before any spaces or control characters */
++char *
++findcolon(hdr)
++char *hdr;
++{
++    while (*hdr && !isspace(*hdr) && !iscntrl(*hdr))
++	if (*hdr == ':') return hdr;
++	else hdr++;
++    return 0;
++}
++
++/* check the header given to see if it matches any in the KeyHeadList */
++maybephead(hdr)
++char *hdr;
++{
++    char *s;
++    int numkeys=0;
++
++    if (!KeyHeads) setKeyHeads();
++
++    s = findcolon(hdr);
++    if (s) {
++	int len = s - hdr;
++        for (numkeys=0; KeyHeadList[numkeys]; ++numkeys) {
++            if (!strcmp(KeyHeadList[numkeys], "*")
++                 || !lc2strncmp(hdr, KeyHeadList[numkeys], len)) {
++		if (!KeyKeep) phead(hdr);
++		return;
++            }
++        }
++	if (KeyKeep) phead(hdr);
++	return;
++    }
++    if (!strncmp(hdr, "From ", 5) || !strncmp(hdr, ">From ", 6)) {
++	for (numkeys = 0; KeyHeadList[numkeys]; ++numkeys) {
++	    if (!strcmp(KeyHeadList[numkeys], "*")
++		 || !lc2strncmp(">from", KeyHeadList[numkeys], 5)) {
++		if (!KeyKeep) phead(hdr);
++		return;
++	    }
++	}
++	if (KeyKeep) phead(hdr);
++    }
++}
++
++/* This next routine prints out a mail header, and needs to deal with the new extended charset headers. */
++phead(s)
++char *s;
++{
++    char *t = s;
++
++    while (1) {
++	t = index(t, '\n');
++	if (!t) break;
++        if (!isspace((unsigned char) *(t+1))) {
++            *t = 0;
++	    break;
++	} else ++t;
++    }
++    PrintHeader(s, 1);
++    printf("\n");
++    if (t) *t = '\n';
++}
++
++static char PrevCharset[100] = "us-ascii";
++
++/* This is the part that actually handles the charset issues */
++void PrintHeader(s, ShowLeadingWhitespace)
++char *s;
++int ShowLeadingWhitespace;
++{
++    char *charset, *encoding, *txt, *txtend, TmpFile[TMPNAME_MAX];
++    int ecode = ENCODING_NONE, CorrectedCharset = 0;
++    FILE *fp;
++
++    while (*s && (*s != '=')) {
++        if (isspace((unsigned char) *s)) {
++            if (ShowLeadingWhitespace) {
++                putchar(' ');
++            }
++        } else {
++            putchar(*s);
++            if (!CorrectedCharset) {
++                CorrectedCharset = 1;
++                strcpy(PrevCharset, "us-ascii");
++            }
++        }
++        if (!ShowLeadingWhitespace) {
++            /* Only at most one leading space is ignored */
++            ShowLeadingWhitespace = 1;
++        }
++        ++s;
++    }
++    if (!*s) return;
++    if (*(s+1) != '?') {
++        putchar('=');
++        PrintHeader(++s, 1);
++        return;
++    }
++    charset = s+2;
++    encoding = index(charset, '?');
++    if (!encoding) {
++        putchar('=');
++        PrintHeader(++s,1);
++        return;
++    }
++    txt = index(encoding+1, '?');
++    if (!txt) {
++        putchar('=');
++        PrintHeader(++s, 1);
++        return;
++    }
++    txtend = txt;
++    do {
++        txtend = index(txtend+1, '?');
++    } while(txtend && (*(txtend+1) != '='));
++    if (!txtend) {
++        putchar('=');
++        PrintHeader(++s, 1);
++    }
++    /* Proper parse! Ready to dissect... */
++    *encoding = 0;
++    *txt = 0;
++    *txtend = 0;
++    if ((*(encoding+1) == 'q') || (*(encoding+1) == 'Q')) {
++        ecode = ENCODING_QUOTEDPRINTABLE;
++    } else if ((*(encoding+1) == 'b') || (*(encoding+1) == 'B')) {
++        ecode = ENCODING_BASE64;
++    } else {
++        fprintf(stderr, "Bad encoding value in non-ASCII header string: %s\n", encoding+1);
++    }
++    if (lc2strcmp(charset, PrevCharset)) {
++        char *s2, *charsetinuse;
++
++        strncpy(PrevCharset, charset, sizeof(PrevCharset));
++        PrevCharset[sizeof(PrevCharset) - 1] = '\0';
++        for (s2=PrevCharset; *s2; ++s2) {
++            if (isupper((unsigned char) *s2)) *s2 = tolower((unsigned char) *s2);
++        }
++        charsetinuse = getenv("MM_CHARSET");
++        if (!charsetinuse || lc2strcmp(charsetinuse, PrevCharset)) {
++            printf("[** %s charset **] ", charset);
++        }
++    }
++    if (ecode == ENCODING_NONE) {
++        printf("%s", txt+1);
++    } else {
++        /* What follows is REALLY bogus, but all my encoding stuff is pipe-oriented right now... */
++        MkTmpFileName(TmpFile);
++        fp = fopen(TmpFile, WRITE_BINARY);
++        if (!fp) {
++            fprintf(stderr, "Could not open temporary file\n");
++        } else {
++            char *t;
++            for (t=txt+1; *t; ++t) {
++                if (*t == '_') {
++                    putc(' ', fp);
++                } else if (*t == '\n') {
++                    putc(' ', fp);
++                } else {
++                    putc(*t, fp);
++                }
++            }
++            fclose(fp);
++            fp = fopen(TmpFile, "r");
++            if (!fp) {
++                fprintf(stderr, "Could not open temporary file\n");
++            } else {
++                TranslateInputToOutput(fp, stdout, ecode, "text");
++                fclose(fp);
++            }
++            RmTmpFileName(TmpFile);
++        }
++    }
++    *encoding = '?';
++    *txt = '?';
++    *txtend = '?';
++    PrintHeader(txtend + 2, 0);
++}
++
++BuildCommand(Buf, controlstring, TmpFileName, UsedTmpFileName, PartsWritten)
++char *Buf, *controlstring, *TmpFileName;
++int *UsedTmpFileName;
++struct part **PartsWritten;
++{
++    char *from, *to, *s, *p, *tmp;
++    int prefixed = 0, UsedBigFile=0, UsedLittleFiles=0, numparts=0;
++    struct part *firstpart=NULL, *thispart=NULL, *tmppart=NULL;
++
++    if (UsedTmpFileName) *UsedTmpFileName = 0;
++    if (PartsWritten) *PartsWritten = NULL;
++    for (from=controlstring, to=Buf; *from; ++from) {
++        if (prefixed) {
++            prefixed = 0;
++            switch(*from) {
++                case '%':
++                    *to++ = '%';
++                    break;
++                case 'n':
++                case 'F':
++		    if (!PartsWritten) {
++			fprintf(stderr, "metamail: Bad mailcap \"test\" clause: %s\n", controlstring);
++			ExitWithError("%%n and %%F may not be used in \"test\" clauses.  Execution terminated.");
++		    }
++                    if (UsedBigFile) {
++                        fprintf(stderr, "metamail: Bad mailcap entry: %s\n", controlstring);
++                        ExitWithError("%%n and %%F are incompatible with %%s.  Execution terminated.");
++                    }
++                    if (!UsedLittleFiles) {
++                        /* Set up parts */
++                        char *LineBuf, *boundary, TmpFileNameBuf[TMPNAME_MAX];
++                        char *oldct, *oldce, *newct;
++                        int currct, boundarylen, newctlen, j;
++                        int oldcparmsused, oldcparamsalloced;
++                        char **oldcparams, **oldcparamvalues;
++                        FILE *headfp;
++
++                        LineBuf = XMALLOC(char, LINE_BUF_SIZE);
++                        boundary = FindParam("boundary");
++			if (!boundary) {
++			    fprintf(stderr, "Bad message format: This multipart message has no boundary parameter,\n");
++			    fprintf(stderr, "but the mailcap entry for %s uses %%F or %%n.\n\n", ContentType);
++			    ExitWithError("A change to the mailcap file might make this message viewable.");
++                        }
++                        if (boundary[0] == '"') {
++                            boundary=UnquoteString(boundary);
++                        }
++                        sprintf(LineBuf, "--%s", boundary);
++                        strcpy(boundary, LineBuf);
++                        boundarylen = strlen(boundary);
++                        if (BoundaryCt >= BoundaryAlloc) {
++                            BoundaryAlloc += 5;
++                            if (Boundaries) {
++                                Boundaries = XREALLOC(char *, Boundaries,
++						      BoundaryAlloc);
++                            } else {
++                                Boundaries = XMALLOC(char *, BoundaryAlloc);
++                            }
++                        }
++                        Boundaries[BoundaryCt++] = boundary;
++                        while (fgets(LineBuf, LINE_BUF_SIZE, InputFP)) { /* find start */
++                            if (!strncmp(LineBuf, boundary, boundarylen)
++                                 && ((LineBuf[boundarylen] == '\n')
++                                      || (LineBuf[boundarylen] == '-'
++                                           && LineBuf[boundarylen+1] == '-'
++                                           && LineBuf[boundarylen+2] == '\n'))) {
++                                break;
++                            }
++                        }
++                        XFREE(LineBuf);
++                        currct = BoundaryCt;
++                        oldct=ContentType;
++                        oldce=ContentEncoding;
++                        oldcparmsused = CParamsUsed;
++                        oldcparamsalloced = CParamsAlloced;
++                        oldcparams = CParams;
++                        oldcparamvalues = CParamValues;
++                        CParams = NULL;
++                        CParamValues = NULL;
++                        CParamsUsed = 0;
++                        CParamsAlloced = 0;
++                        while(currct == BoundaryCt) {
++                            tmppart = XMALLOC(struct part, 1);
++                            if (firstpart) {
++                                thispart->next = tmppart;
++                                thispart = tmppart;
++                            } else {
++                                firstpart = thispart = tmppart;
++                            }
++                            tmppart->next = NULL;
++                            ContentType=NULL;
++                            ContentEncoding=NULL;
++                            Read822Prefix(0,0);
++                            PrepareMessage();
++                            newctlen=5+strlen(ContentType);
++                            for (j=0; j<CParamsUsed; ++j) {
++                                newctlen += 11+strlen(CParams[j]) + strlen(CParamValues[j]);
++                            }
++                            newct= XMALLOC(char, newctlen);
++                            strcpy(newct, "'");
++                            strcat(newct, ContentType);
++                            for (j=0; j<CParamsUsed; ++j) {
++                                strcat(newct, "; ");
++                                strcat(newct, CParams[j]);
++                                if (CParamValues[j][0] == '\"') {
++                                    strcat(newct, " = ");
++                                    strcat(newct, CParamValues[j]);
++                                } else {
++                                    strcat(newct, " = \"");
++                                    strcat(newct, CParamValues[j]);
++                                    strcat(newct, "\"");
++                                }
++                            }
++                            strcat(newct, "'");
++                            thispart->ctype = newct;
++                            MkTmpFileName(TmpFileNameBuf);
++                            thispart->fname = XMALLOC(char,
++						     1+strlen(TmpFileNameBuf));
++                            strcpy(thispart->fname, TmpFileNameBuf);
++                            WriteTmpFile(thispart->fname, thispart->ctype);
++                            strcat(TmpFileNameBuf, "H");
++                            headfp = fopen(TmpFileNameBuf, "w");
++                            if (headfp) {
++                                fputs(mailheaders+12, headfp);
++                                /* The +12 gets rid of MM_HEADERS=\n */
++                                fclose(headfp);
++                            }
++                            ++numparts;
++                        }
++                        ContentType=oldct;
++                        ContentEncoding=oldce;
++                        CParamsUsed = oldcparmsused;
++                        CParamsAlloced = oldcparamsalloced;
++                        CParams = oldcparams;
++                        CParamValues = oldcparamvalues;
++                        /* Now we've seen the last encapsulation boundary, but if there is a "postfix"
++                            we must throw it away.*/
++                        if (BoundaryCt > 0) {
++                            ConsumeRestOfPart(NULL);
++                        }
++                        *PartsWritten = firstpart;
++                        UsedLittleFiles=1;
++                    }
++                    if (*from == 'n') {
++                        char numbuf[10];
++                        sprintf(numbuf, "%d", numparts);
++                        strcpy(to, numbuf);
++                        to += strlen(numbuf);
++                    } else { /* %F */
++                        for (tmppart = firstpart; tmppart != NULL; tmppart = tmppart->next) {
++                            sprintf(to, "%s %s ", tmppart->ctype, tmppart->fname);
++                            to += (strlen(tmppart->ctype) + strlen(tmppart->fname) + 2);
++                        }
++                    }
++                    break;
++                case 's':
++                    if (UsedLittleFiles) {
++                        fprintf(stderr, "metamail: Bad mailcap entry: %s\n", controlstring);
++                        ExitWithError("%%n and %%F are incompatible with %%s.  Execution terminated.");
++                    }
++                    if (TmpFileName) {
++                        strcpy(to, TmpFileName);
++                        to += strlen(TmpFileName);
++                        if (UsedTmpFileName) ++(*UsedTmpFileName);
++                    }
++                    UsedBigFile = 1;
++                    break;
++                case '{':
++                    s = index(from, '}');
++                    if (!s) {
++                        fprintf(stderr, "Ignoring ill-formed parameter reference in mailcap file: %s\n", from);
++                        break;
++                    }
++                    ++from;
++                    *s = 0;
++                    /* put in lower case */
++                    for (tmp=from; *tmp; ++tmp) {
++                        if (isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
++                    }
++                    p = FindParam(from);
++                    if (p && p[0] == '"') {
++                        p=UnquoteString(p);
++                    }
++                    if (!p) p = "";
++                    *to++ = '\'';
++                    strcpynoquotes(to, p);
++                    to += strlen(p);
++                    *to++ = '\'';
++                    *s = '}'; /* restore */
++                    from = s;
++                    break;
++                case 't':
++                    /* type/subtype */
++                    strcpynoquotes(to, ContentType);
++                    to += strlen(ContentType);
++                    break;
++                default:
++                    fprintf(stderr, "Ignoring unrecognized format code in mailcap file: %%%c\n", *from);
++                    break;
++            }
++        } else if (*from == '%') {
++            prefixed = 1;
++        } else {
++            *to++ = *from;
++        }
++    }
++    *to = 0;
++}
++
++strcpynoquotes(t,f)
++char *t, *f;
++{
++    static char *badchars="|<>%*?\"`'";
++
++    while (*f) {
++        if (index(badchars, *f)) *t++ = ' '; else *t++ = *f;
++        ++f;
++    }
++}
++
++WriteTmpFile(fname, ctype)
++char *fname;
++char *ctype;
++{
++    FILE *fpout;
++    int retval = 0;
++
++    fpout = fopen(fname, WRITE_BINARY);
++    if (!fpout) {
++        perror("WriteTmpFile");
++        metamail_fatal("Can't create temporary file: ", fname);
++    }
++    TranslateInputToOutput(InputFP, fpout, EncodingCode, ctype);
++    if (ftell(fpout) == 0) retval = 1;
++    if (fclose(fpout)) ExitWithError("Can't write temporary file");
++    return(retval);
++}
++
++
++TranslateInputToOutput(InputFP, OutputFP, Ecode, ctype)
++FILE *InputFP, *OutputFP;
++int Ecode;
++char *ctype;
++{
++    int InMultipart = BoundaryCt > 0 ? 1 : 0;
++
++    switch(Ecode) {
++        case ENCODING_BASE64:
++            from64(InputFP, OutputFP, InMultipart ? Boundaries : NULL, &BoundaryCt, DoesNeedPortableNewlines(ctype));
++            break;
++        case ENCODING_QUOTEDPRINTABLE:
++            fromqp(InputFP, OutputFP, InMultipart ? Boundaries : NULL, &BoundaryCt);
++            break;
++ 	case ENCODING_UUENCODE:
++ 	    fromuue(InputFP, OutputFP, InMultipart ? Boundaries: NULL, &BoundaryCt);
++ 	    break;
++        default:
++            ConsumeRestOfPart(OutputFP);
++    }
++    if (UsingStandardInput && feof(InputFP) && !freopen("/dev/tty", "r", stdin)) {
++        fprintf(stderr, "Warning: Cannot freopen /dev/tty to stdin");
++    } else InputFP = stdin;
++}
++
++CreateNewWindowPrefix(Prefix)
++char *Prefix;
++{
++    char *override = getenv("TERMINAL_CMD");
++    if (override) {
++        strcpy(Prefix, override);
++    } else if (getenv("DISPLAY")) {
++        /* X11 */
++        strcpy(Prefix, "xterm -title '");
++        strcat(Prefix, MailSummary);
++        strcat(Prefix, "' -e ");
++    } else if (getenv("WINDOW_PARENT")) {
++        /* SunView */
++        strcpy(Prefix, "shelltool ");
++    } else if (getenv("WMHOST")) {
++        /* old Andrew WM */
++        strcpy(Prefix, "h19 ");
++    } else {
++        /* last resort is to look for /dev/tty */
++        if (!freopen("/dev/tty", "r", stdin)){
++            ExitWithError("Don't know how to create a terminal window");
++        }
++        InputFP = stdin;
++        fprintf(stderr, "Warning, reopened /dev/tty, could be strange.\n");
++        Prefix[0] = 0;
++    }
++}
++
++int HasSavedTtyState=0;
++
++SaveTtyState() {
++    /* Bogus -- would like a good portable way to reset the terminal state here */
++  ioctl(fileno(stdin), TCGETA, &MyTtyStateIn);
++  ioctl(fileno(stdout), TCGETA, &MyTtyStateOut);
++
++  HasSavedTtyState = 1;
++  }
++
++RestoreTtyState() {
++    if (HasSavedTtyState) {
++        ioctl(fileno(stdout), TCSETA, &MyTtyStateOut);
++        ioctl(fileno(stdin), TCSETA, &MyTtyStateIn);
++    }
++}
++
++NeedToAskBeforeExecuting(type)
++char *type;
++{
++    struct NoAskItem *nai;
++    if (!MightAskBeforeExecuting || DoInBackground) return(0);
++    for (nai = FirstNoAskItem; nai; nai = nai->next) {
++        if (CtypeMatch(type, nai->type)) return(0);
++    }
++    return(1);
++}
++
++NeedToBeQuiet(cmd)
++char *cmd;
++{
++    struct NoAskItem *nai;
++    for (nai = FirstQuietItem; nai; nai = nai->next) {
++        if (!lc2strcmp(nai->type, cmd)) return(1);
++    }
++    return(0);
++}
++
++CtypeMatch(ctype, pat)
++char *ctype, *pat;
++{
++    int len;
++    char pat2[200];
++
++    if (!lc2strcmp(ctype, pat)) {
++        return(1); /* exact match, case-insensitive */
++    }
++    if (index(pat, '/') == NULL) {
++        /* implicit wildcard */
++        strcpy(pat2, pat);
++        strcat(pat2, "/*");
++        pat = pat2;
++    }
++    len = strlen(pat);
++    if ((pat[--len] == '*')
++         && (pat[--len] == '/')
++         && (!lc2strncmp(ctype, pat, len))
++         && ((ctype[len] == '/') || (ctype[len] == '\0'))){
++        /* wildcard match */
++        return(1);
++    }
++    return(0);
++}
++
++ExecuteCommand(cmd, really)
++char *cmd;
++int really;
++{
++    int code;
++    if (!Quiet || DoDebug) {
++        if (!NeedToBeQuiet(ShortCommand(cmd))) {
++            printf("---Executing: %s\n", DoDebug ? cmd : ShortCommand(cmd));
++        } else if (EatLeadingNewlines) {
++            printf("\n");
++        } 
++        fflush(stdout);
++    }
++    if (really) {
++        fflush(stdout); fflush(stderr);
++        code = system(cmd);
++        if (DoDebug) printf("Command exit status: %d\n", code);
++        return(code);
++    }
++    return(0);
++}
++
++void
++ConsumeRestOfPart(outfp)
++FILE *outfp;
++{
++    char *Buf;
++    int c;
++
++    if (BoundaryCt <= 0) {
++        while ((c=getc(InputFP)) != EOF) {
++            if (outfp) putc(c, outfp);
++        }
++        return;
++    }
++    Buf = XMALLOC(char, LINE_BUF_SIZE);
++    while (fgets(Buf, LINE_BUF_SIZE, InputFP)) {
++        if ((BoundaryCt > 0)
++             && (Buf[0] == '-')
++             && (Buf[1] == '-')
++             && PendingBoundary(Buf, Boundaries, &BoundaryCt)) {
++            break;
++        }
++        if (outfp) fputs(Buf, outfp);
++    }
++    XFREE(Buf);
++}
++
++char *paramend(s)
++char *s;
++{
++    int inquotes=0;
++    while (*s) {
++        if (inquotes) {
++            if (*s == '"') {
++                inquotes = 0;
++            } else if (*s == '\\') {
++                ++s; /* skip a char */
++            }
++        } else if (*s == ';') {
++            return(s);
++        } else if (*s == '"') {
++            inquotes = 1;
++        }
++        ++s;
++    }
++    return(NULL);
++}        
++
++void
++ParseContentParameters(ct)
++char *ct;
++{
++    char *s, *t, *eq;
++
++    CParamsUsed = 0;
++    s = index(ct, ';');
++    if (!s) return;
++    *s++ = 0;
++    do {
++        t = paramend(s);
++        if (t) *t++ = 0;
++        eq = index(s, '=');
++        if (!eq) {
++            fprintf(stderr, "Ignoring unparsable content-type parameter: '%s'\n", s);
++            JunkParameter=Cleanse(s);
++        } else {
++            if (CParamsUsed >= CParamsAlloced) {
++                CParamsAlloced += 10;
++                if (CParams) {
++                    CParams = XREALLOC(char *, CParams, 1+CParamsAlloced);
++                    CParamValues = XREALLOC(char *, CParamValues, 
++					    1+CParamsAlloced);
++                } else {
++                    CParams = XMALLOC(char*, 1+CParamsAlloced);
++                    CParamValues = XMALLOC(char *, 1+CParamsAlloced);
++                }
++            }
++            *eq++ = 0;
++            s = Cleanse(s);
++            CParams[CParamsUsed] = s;
++            /* strip leading white space */
++            while (*eq && isspace((unsigned char) *eq)) ++eq;
++            /* strip trailing white space */
++            StripTrailingSpace(eq);
++            CParamValues[CParamsUsed++] = eq; 
++            if (DoDebug) printf("NEW PARAMETER: %s VALUE: %s\n", s, eq);
++        }
++        s = t;
++    } while (t);
++}
++
++char *FindParam(s)
++char *s;
++{
++    int i;
++    for (i=0; i<CParamsUsed; ++i) {
++        if (!strcmp(s, CParams[i])) {
++            return(CParamValues[i]);
++        }
++    }
++    return(NULL);
++}
++
++strcatquoting(s1, s2)
++char *s1;
++char *s2;
++{
++    strcat(s1, s2);
++#ifdef NOTDEF
++    while (*s1) ++s1;
++    while (*s2) {
++        if (*s2 == '\"' || *s2 == '\\') *s1++ = '\\';
++        *s1++ = *s2++;
++    }
++    *s1 = '\0';
++#endif
++}
++
++PauseForUser() {
++    if (DefinitelyNotTty || MustNotBeTty) return;	
++
++    fflush(stdout);
++    SaveTtyState();
++    if (StartRawStdin() != -1) {
++        printf("--Press any key to go on.--");
++    } else {
++        printf("Press RETURN to go on.\n");
++    }
++    fflush(stdout);
++    getchar();
++    RestoreTtyState();
++    printf("\n");
++}
++
++StartRawStdin() {
++    struct termio   orterm, fterm;
++    ioctl(0, TCGETA, &orterm);	/* get current (i.e. cooked) termio */
++    fterm = orterm;		/* get termio to modify */
++
++    fterm.c_lflag &= ~ICANON;	/* clear ICANON giving raw mode */
++    fterm.c_cc[VMIN] = 1;	/* set MIN char count to 1 */
++    fterm.c_cc[VTIME] = 0;	/* set NO time limit */
++    return ioctl(0, TCSETAW, &fterm);	/* modify termio for raw mode */
++}
++
++
++int IsDirectory(fname)
++char *fname;
++{
++    struct stat stbuf;
++    if (stat(fname, &stbuf)) {
++	return(-1);
++    }
++    return (((stbuf.st_mode & S_IFMT) == S_IFDIR) ? 1 : 0);
++}
++
+--- metamail-2.7.orig/src/metamail/metamail.old
++++ metamail-2.7/src/metamail/metamail.old
+@@ -0,0 +1,2756 @@
++/*
++Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++
++Permission to use, copy, modify, and distribute this material 
++for any purpose and without fee is hereby granted, provided 
++that the above copyright notice and this permission notice 
++appear in all copies, and that the name of Bellcore not be 
++used in advertising or publicity pertaining to this 
++material without the specific, prior written permission 
++of an authorized representative of Bellcore.  BELLCORE 
++MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++*/
++/****************************************************** 
++    Metamail -- A tool to help diverse mail readers 
++                cope with diverse multimedia mail formats.
++
++    Author:  Nathaniel S. Borenstein, Bellcore
++
++ ******************************************************* */
++
++#include <stdio.h>
++#include <ctype.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include "../config.h"
++#include <patchlevel.h>
++#include "dlist.h"
++
++#ifdef BORLAND
++#define F_OK 0
++extern unsigned _stklen = 16384;
++extern char *mktemp(char *);
++#define WRITE_BINARY	"w"
++#else /* BORLAND */
++#ifdef MICROSOFT
++#include <malloc.h>
++#include <stdlib.h>
++#include <time.h>
++#include <signal.h>
++#define F_OK 0
++#else
++#include <pwd.h>
++#include <sys/time.h>
++#include <sys/types.h>
++#include <sys/file.h>
++#include <signal.h>
++#ifndef AMIGA
++#ifdef SYSV
++#include <termio.h>
++#include <unistd.h>
++#else /* SYSV */
++#include <sgtty.h>
++#endif /* SYSV */
++#endif /* AMIGA */
++#endif /* MICROSOFT */
++#endif /* BORLAND */
++
++#if defined(SYSV) && !defined(linux)
++#define LPRTEMPLATE "lp %s"
++#define LPRCOMMAND "lp"
++#else
++#define LPRTEMPLATE "lpr %s"
++#define LPRCOMMAND "lpr"
++#endif
++#ifdef MSDOS
++#define CATCOMMAND  "cat"
++#define CATTEMPLATE "cat %s"
++#define METAMAIL    "metamail"
++#define TMPFILE_NAME_SIZE   128
++#define MAX_FILE_NAME_SIZE 128
++#define WRITE_BINARY	"wb"
++#else /* MSDOS */
++#ifdef AMIGA
++extern char *MkRmScript();
++#ifndef F_OK
++#define F_OK (0)
++#endif
++#define CATCOMMAND  "Type"
++#define CATTEMPLATE "Type %s"
++#define METAMAIL    "metamail <*"
++#define TMPFILE_NAME_SIZE     50
++#define MAX_FILE_NAME_SIZE 256
++#define WRITE_BINARY	"w"
++#else /* AMIGA */
++extern char **environ, *gets();
++#define CATCOMMAND  "cat"
++#define CATTEMPLATE "cat %s"
++#define METAMAIL    "metamail"
++#define TMPFILE_NAME_SIZE   1000
++#define MAX_FILE_NAME_SIZE 1000
++#define WRITE_BINARY	"w"
++#endif /* AMIGA */
++#endif /* MSDOS */
++
++#ifndef NO_RLIMITS
++#include <sys/resource.h>
++#endif
++
++#define CMDSIZE 1200 /* Maximum size of command to execute */
++
++#define LINE_BUF_SIZE       2000
++#ifndef MICROSOFT
++extern char *malloc();
++extern char *realloc();
++#endif
++extern char *getenv();
++extern char *index();
++extern char *rindex();
++char fileToDelete[MAX_FILE_NAME_SIZE];
++
++char *FindParam();
++extern FILE *popen();
++static char *nomem = "Out of memory!";
++static char *mmversion = MM_VERSTRING;
++static char *NoAskDefault = "text,text/plain,text/richtext";
++static char *QuietDefault = CATCOMMAND;
++static char *tmproot="";
++
++struct MailcapEntry {
++    char *contenttype;
++    char *command;
++    char *testcommand;
++    int needsterminal;
++    int copiousoutput;
++    int needtofree;
++    char *label;
++    char *printcommand;
++};
++
++FILE *InputFP = NULL;
++
++int MightAskBeforeExecuting = 1,
++    DefinitelyNotTty = 0,
++    MustNotBeTty = 0,
++    MaybePageOutput = 0,
++    MustPageOutput = 0,
++    EatLeadingNewlines = 0,
++    PrintSomeHeaders = 1,
++    DoInBackground = 0,
++    Quiet = 0,
++    TransparentMode = 0,
++    DeleteSourceFileWhenDone = 0,
++    Is822Format = 1,
++    DoDebug = 0,
++    CParamsAlloced = 0,
++    CParamsUsed = 0,
++    YankMode = 0,
++    UsingStandardInput = 0,
++    PrintingMode = 0,
++    JustWriteFiles = 0,
++    ProcessingErrors = 0;
++
++char *ContentType = NULL,
++    *ContentEncoding = NULL,
++    *MailerName = "unknown",
++    *MailSubject = "Mail message",
++    *MailFrom = "unknown sender",
++    *MailSummary = "non-text mail message",
++    *mailheaders = NULL,
++    **CParams = NULL,
++    **CParamValues = NULL,
++    *JunkParameter = NULL;
++
++DList* TmpNameListTail;
++
++#define ENCODING_NONE 0
++#define ENCODING_BASE64 1
++#define ENCODING_QUOTEDPRINTABLE 2
++#define ENCODING_8BIT 3
++#define ENCODING_UUENCODE -1	/* non-standard */
++int EncodingCode = ENCODING_NONE;
++
++struct part {
++    char *ctype;
++    char *fname;
++    struct part *next;
++};
++
++struct NoAskItem {
++    char *type;
++    struct NoAskItem *next;
++} *FirstNoAskItem = NULL,
++  *FirstQuietItem = NULL;
++
++#ifdef MICROSOFT
++/* Need a function prototype for TryMailcapEntry because without it MSC
++ * passes a pointer to the structure rather than the structure itself.
++ */
++TryMailcapEntry(struct MailcapEntry mc, char *SquirrelFile);
++#endif
++
++void PrintHeader();
++void ConsumeRestOfPart();
++void ParseContentParameters();
++
++void CleanupTmpFiles();
++
++sigtype cleanup();
++
++char *Cleanse(s) /* no leading or trailing space, all lower case */
++char *s;
++{
++    char *tmp, *news;
++    
++    /* strip leading white space */
++    while (*s && isspace((unsigned char) *s)) ++s;
++    news = s;
++    /* put in lower case */
++    for (tmp=s; *tmp; ++tmp) {
++        if (isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
++    }
++    /* strip trailing white space */
++    while (tmp > news && *--tmp && isspace((unsigned char) *tmp)) *tmp = 0;
++    return(news);
++}
++
++char *UnquoteString(s)
++char *s;
++{
++    char *ans, *t;
++
++    if (*s != '"') return(s);
++    ans = malloc(1+strlen(s));
++    if (!ans) ExitWithError(nomem);
++    ++s;
++    t = ans;
++    while (*s) {
++        if (*s == '\\') {
++            *t++ = *++s;
++        } else if (*s == '"') {
++            break;
++        } else {
++            *t++ = *s;
++        }
++        ++s;
++    }
++    *t = 0;
++    return(ans);
++}
++
++sigtype
++cleanup(signum) 
++int signum;
++{
++    RestoreTtyState();
++#if defined(MSDOS) || defined(AMIGA)
++    exit(signum);
++#else
++    signal(signum, SIG_DFL);
++    kill(getpid(), signum);
++#endif
++}
++
++char **Boundaries = NULL;
++int BoundaryCt = 0, BoundaryAlloc = 0;
++struct nextfile {
++    char *filename;
++    struct nextfile *next;
++} *FileQueue=NULL, *LastInQueue = NULL;
++
++void
++ResetGlobals() {
++    CParamsAlloced = 0;
++    CParamsUsed = 0;
++
++    ContentType = NULL;
++    ContentEncoding = NULL;
++    MailSubject = "Mail message";
++    MailFrom = "unknown sender";
++    MailSummary = "non-text mail message";
++    mailheaders = getenv("MM_HEADERS");
++    if (mailheaders) {
++        char *s;
++        s = malloc(15+strlen(mailheaders));
++        if (!s) ExitWithError(nomem);
++        sprintf(s, "MM_HEADERS=%s", mailheaders);
++        mailheaders = s;
++    }
++    CParams = NULL;
++    CParamValues = NULL;
++    JunkParameter = NULL;
++}
++
++void modpath(auxpath)
++char *auxpath;
++{
++    if (auxpath && *auxpath) {
++        static char *newpath = 0;
++	char *oldpath = newpath;
++        char *path = getenv("PATH");
++
++	if (!path) path = "";	/* give a default if no current path */
++	newpath = malloc(7 + strlen(path) + strlen(auxpath));
++        if (!newpath) ExitWithError(nomem);
++        sprintf(newpath, "PATH=%s:%s", auxpath, path);
++        putenv(newpath);
++	if (oldpath) free(oldpath); 	/* free up any old allocated PATH */
++    }
++}
++
++main(argc, argv)
++int argc;
++char **argv;
++{
++    int retcode;
++
++    modpath(AUXPATH);
++#ifndef MSDOS
++    signal(SIGINT, cleanup);
++#ifndef AMIGA
++    signal(SIGILL, cleanup);
++    signal(SIGTRAP, cleanup);
++    signal(SIGIOT, cleanup);
++    signal(SIGFPE, cleanup);
++#ifndef linux
++    signal(SIGEMT, cleanup);
++    signal(SIGBUS, cleanup);
++#endif
++    signal(SIGSEGV, cleanup);
++    signal(SIGTERM, cleanup);
++#endif
++#endif
++#ifdef SIGXCPU
++    signal(SIGXCPU, cleanup);
++#endif
++    tmproot = getenv("METAMAIL_TMPDIR");
++    if (!tmproot) tmproot="/tmp";
++    mailheaders = getenv("MM_HEADERS");
++    if (mailheaders) {
++        char *s;
++        s = malloc(15+strlen(mailheaders));
++        if (!s) ExitWithError(nomem);
++        sprintf(s, "MM_HEADERS=%s", mailheaders);
++        mailheaders = s;
++    }
++    fileToDelete[0] = 0;
++    ProcessArguments(argc, argv); /* calls ExitWithError on error */
++#if !defined(AMIGA) && !defined(MSDOS)
++    if (MaybePageOutput) {
++        /* Want to send stderr to pager too, sigh... */
++        fflush(stderr);
++        close(2);
++        dup2(1, 2);
++    }
++#endif
++    retcode = HandleMessage(NULL, 0);
++    if (! UsingStandardInput) {
++        fclose(InputFP);
++    }
++    if (fileToDelete[0]) {
++        unlink(fileToDelete);
++        fileToDelete[0] = 0;
++    }
++    while (FileQueue) {
++        InputFP = fopen(FileQueue->filename, "r");
++        if (DoDebug) printf("Trying to open input file: %s\n", FileQueue->filename);
++        if (!InputFP) ExitWithError("Can't read input file");
++        if (DeleteSourceFileWhenDone) {
++            strcpy(fileToDelete, FileQueue->filename);
++        }
++        ResetGlobals();
++        retcode |= HandleMessage(NULL, 0);
++        if (! UsingStandardInput) {
++            fclose(InputFP);
++        }
++        if (fileToDelete[0]) {
++            unlink(fileToDelete);
++            fileToDelete[0] = 0;
++        }
++        FileQueue = FileQueue->next;
++    }
++    if (MustPageOutput) PauseForUser();
++    CleanupTmpFiles();
++    exit(ProcessingErrors? -1 : retcode);
++}
++
++void
++QueueNextFile(fname)
++char *fname;
++{
++    struct nextfile *tmp = (struct nextfile *) malloc(sizeof (struct nextfile));
++    if (!tmp) ExitWithError(nomem);
++    tmp->filename = fname;
++    tmp->next = NULL;
++    if (FileQueue) {
++        LastInQueue->next = tmp;
++        LastInQueue = tmp;
++    } else {
++        FileQueue = tmp;
++        LastInQueue = tmp;
++    }
++}
++
++HandleMessage(SquirrelFile, nestingdepth)
++char *SquirrelFile;
++/* SquirrelFile, if non-NULL, is a place to save a recognized body instead of executing it. */
++int nestingdepth;
++{
++    char *boundary;
++    int FileWriteOnly = JustWriteFiles;
++
++    if (FileWriteOnly) {
++        if (!lc2strncmp(ContentType, "message/", 8)
++             || !lc2strncmp(ContentType, "multipart/", 10)) {
++            FileWriteOnly = 0; /* only leaf data */
++        }
++    }
++    if (Is822Format) {
++	if (Read822Prefix(SquirrelFile?0:1, nestingdepth)) {
++	    return -1;
++	}
++    } else Is822Format = 1; /* this property is not recursive for multipart or message */
++    PrepareMessage();
++    if (!FileWriteOnly && !ProcessMailcapFiles(SquirrelFile)) return(0);
++    if (!lc2strcmp(ContentType, "message")
++         || !lc2strcmp(ContentType, "message/rfc822")) { 
++        if (SquirrelFile) return(SaveSquirrelFile(SquirrelFile));
++        ContentType = NULL; /* reset default */
++        ContentEncoding = NULL; /* reset default */
++        return(HandleMessage(NULL, nestingdepth+1)); /* simple recursion */
++    }
++    boundary = FindParam("boundary");
++    if (!boundary) boundary =JunkParameter; /* backward compatibility hack */
++    if (!lc2strncmp(ContentType, "multipart", 9)) { 
++      if (!boundary) {
++	  fprintf(stderr, "Warning: No boundary for multipart data, treating as unrecognized format.\n");
++      } else {
++        char *LineBuf, NewSquirrelFile[TMPFILE_NAME_SIZE];
++        char *subtype = NULL;
++        int currct, result, IsAlternative, WroteSquirrelFile, boundarylen;
++
++        if (SquirrelFile) return(SaveSquirrelFile(SquirrelFile));
++        if (boundary[0] == '"') {
++            boundary=UnquoteString(boundary);
++        }
++        subtype = index(ContentType, '/');
++        if (subtype) {
++            ++subtype;
++            subtype = Cleanse(subtype);
++        } else subtype = "mixed";
++#ifndef MSDOS
++        if (!MaybePageOutput && !DoInBackground) DoInBackground = strcmp(subtype, "parallel") ? 0 : 1;
++#endif
++
++        IsAlternative = strcmp(subtype, "alternative") ? 0 : 1;
++        if (IsAlternative) {
++            MkTmpFileName(NewSquirrelFile);
++            WroteSquirrelFile = 0;
++        }
++        LineBuf = malloc(LINE_BUF_SIZE);
++        if (!LineBuf) ExitWithError(nomem);
++        sprintf(LineBuf, "--%s", boundary);
++        strcpy(boundary, LineBuf);
++        boundarylen = strlen(boundary);
++        if (BoundaryCt >= BoundaryAlloc) {
++            BoundaryAlloc += 5;
++            if (Boundaries) {
++                Boundaries = (char **) realloc(Boundaries, BoundaryAlloc*sizeof(char *));
++            } else {
++                Boundaries = (char **) malloc(BoundaryAlloc*sizeof(char *));
++            }
++            if (!Boundaries) ExitWithError(nomem);
++        }
++        Boundaries[BoundaryCt++] = boundary;
++        if (DoDebug) printf("Handling multipart as built-in here.  Boundary: %s\n", boundary);
++        while (fgets(LineBuf, LINE_BUF_SIZE, InputFP)) { /* find start */
++            if (!strncmp(LineBuf, boundary, boundarylen)
++                 && ((LineBuf[boundarylen] == '\n')
++                      || (LineBuf[boundarylen] == '-'
++                           && LineBuf[boundarylen+1] == '-'
++                           && LineBuf[boundarylen+2] == '\n'))) {
++                break;
++            }
++        }
++        free(LineBuf);
++        currct = BoundaryCt;
++        while(currct == BoundaryCt) {
++            if (!strcmp(subtype, "digest")) {
++                ContentType = "message/rfc822";
++            } else {
++                ContentType = NULL; /* reset default */
++            }
++            ContentEncoding = NULL; /* reset default */
++            if (IsAlternative) {
++                result = HandleMessage(NewSquirrelFile, nestingdepth+1);
++            } else{
++                result = HandleMessage(NULL, nestingdepth+1);
++            }
++            if (result) {
++                /* Need to consume the rest of the part */
++                ConsumeRestOfPart(NULL);
++            } else {
++                ++WroteSquirrelFile;
++            }
++        }
++        /* Now we've seen the last encapsulation boundary, but if there is a "postfix"
++            we must throw it away.*/
++        if (BoundaryCt > 0) {
++            ConsumeRestOfPart(NULL);
++        }
++        if (IsAlternative) {
++            if (WroteSquirrelFile) {
++                int retcode; 
++                char Cmd[TMPFILE_NAME_SIZE + 15];
++                sprintf(Cmd, "%s %s", METAMAIL, NewSquirrelFile);
++                fflush(stdout); fflush(stderr);
++                retcode = system(Cmd);
++#ifdef MSDOS
++                retcode = 0;
++#endif
++                unlink(NewSquirrelFile);
++                return(retcode);
++            } else {
++                printf("Cannot handle any part of multipart/alternative message\n");
++            }
++        }
++	return(0);
++      }
++    } /* End of multipart handling */
++    if (!FileWriteOnly && !TryBuiltIns(SquirrelFile)) return(0);
++    if (!SquirrelFile) { /* Very last resort -- unrecognized types */
++        char Fname[MAX_FILE_NAME_SIZE], *suggestedname, SugBuf[MAX_FILE_NAME_SIZE];
++        FILE *fp;
++        int ans = 0, octetstream, ecode=0;
++        suggestedname = FindParam("name");
++        if (!suggestedname) {
++            MkTmpFileName(SugBuf);
++            suggestedname = SugBuf;
++        } else if (suggestedname[0] == '"') {
++            suggestedname=UnquoteString(suggestedname);
++        }
++        octetstream = ! lc2strcmp(ContentType, "application/octet-stream");
++        if (MightAskBeforeExecuting
++             && !DefinitelyNotTty && !MustNotBeTty) {
++            if (FileWriteOnly) {
++                printf("\nThis message contains '%s`-format data.\n", ContentType);
++            } else if (octetstream) {
++                printf("This message contains raw digital data, which can either be viewed as text\nor written to a file.\n");
++            } else {
++                printf("\nThis message contains data in an unrecognized format, %s,\nwhich can either be viewed as text or written to a file.\n", ContentType);
++            }
++            while (!ans) {
++                if (FileWriteOnly) {
++                    ans = 2;
++                } else {
++                    printf("\nWhat do you want to do with the %s data?\n1 -- See it as text\n2 -- Write it to a file\n3 -- Just skip it\n\n", octetstream ? "raw" : ContentType);
++                    fgets(Fname, sizeof(Fname), stdin);
++                    ans = atoi(Fname);
++                }
++                switch(ans) {
++                    case 1:
++                        TranslateInputToOutput(InputFP, stdout, EncodingCode, "text");
++                        return(0);
++                    case 2:
++                        {
++                        int needname = 1;
++                        while (needname) {
++                            needname = 0;
++                            printf("Please enter the name of a file to which the data should be written\n(Default: %s) > ", suggestedname);
++                            fflush(stdout);
++                            fgets(Fname, sizeof(Fname), stdin);
++                            Fname[strlen(Fname) - 1] = '\0'; /* bogus newline */
++#if !defined(AMIGA) && !defined(MSDOS)
++                            if (!Fname[0]) strcpy(Fname, suggestedname);
++                            if (Fname[0] == '~' && Fname[1] == '/') {
++                                char Fname2[1000];
++                                int uid = getuid();
++                                struct passwd *p;
++                                p = getpwuid(uid);
++                                if (!p) {
++                                    MkTmpFileName(Fname);
++                                    printf("Cannot figure out what ~ means, using temporary file %s instead\n", Fname);
++                                } else {
++                                    strcpy(Fname2, p->pw_dir);
++                                    strcat(Fname2, "/");
++                                    strcat(Fname2, Fname + 2);
++                                    strcpy(Fname, Fname2);
++                                }
++                            }
++#endif
++                            if (access(Fname, F_OK) == 0) {
++                                char *s, AnsBuf[50];
++                                int overwriteans = -1;
++                                do {
++                                    printf("File %s exists.  Do you want to overwrite it (y/n) ?\n", Fname);
++                                    s = fgets(AnsBuf, sizeof(AnsBuf), stdin);
++                                    if (!s) {
++                                        overwriteans = 0;
++                                    } else {
++                                        while (s && *s && isspace((unsigned char) *s)) ++s;
++                                        if (*s == 'y' || *s == 'Y' || !*s || *s == '\n') {
++                                            overwriteans = 1;
++                                        } else if (*s == 'n' || *s == 'N' || *s == 'q' || *s == 'Q') {
++                                            overwriteans=0;
++                                        }
++                                    }
++                                    if (overwriteans == -1) printf("Please answer yes or no.\n");
++                                } while (overwriteans == -1);
++                                if (overwriteans == 0) needname = 1;
++                            }
++                        }
++                        }
++                        break;
++                    case 3:
++                        ConsumeRestOfPart(NULL);
++                        return(0);
++                        break;
++                    default:
++                        ans = 0;
++                        break;
++                }
++            }
++        } else {
++            int ct = 0;
++            char *slash = rindex(suggestedname, '/');
++#ifdef AMIGA
++	    if (slash == NULL) {
++                slash = rindex(suggestedname, ':');
++            }
++#endif
++            if (slash)  {
++                ++slash;
++            } else {
++                slash = suggestedname;
++            }
++            do {
++                if (ct) {
++#ifdef AMIGA
++                    sprintf(Fname, "T:%d-%s", ct, slash);
++                } else {
++                    sprintf(Fname, "T:%s", slash);
++#else
++                    sprintf(Fname, "%s/%d-%s", tmproot, ct, slash);
++                } else {
++                    sprintf(Fname, "%s/%s", tmproot, slash);
++#endif
++                }
++                ++ct;
++            } while (access(Fname, F_OK) == 0);
++            if (FileWriteOnly) {
++                printf("\nThis message contains '%s`-format data.\n", ContentType);
++            } else if (octetstream) {
++                printf("\nThis message contains raw digital data,");
++            } else {
++                printf("\nThis message contains data in an unrecognized format, %s,", ContentType);
++            }
++            printf("\nwhich is being decoded and written to the file named \"%s\".\nIf you do not want this data, you probably should delete that file.\n", Fname);
++        }
++        if (Fname[0] == 0 || Fname[0] == '\n') {
++            ConsumeRestOfPart(NULL);
++        } else {
++            fp = fopen(Fname, WRITE_BINARY);
++            if (!fp) ExitWithError("Cannot open temporary file");
++            TranslateInputToOutput(InputFP, fp, EncodingCode, ContentType);
++            ecode = fclose(fp);
++            if (ecode) {
++                printf("Could not write file %s\n", Fname);
++            } else {
++                printf("Wrote file %s\n", Fname);
++            }
++        }
++        if (!DefinitelyNotTty && MaybePageOutput && BoundaryCt > 0) PauseForUser();
++        return(ecode);
++    }
++    return(-1); /* Unrecognized, really */
++}
++
++ProcessArguments(argc, argv)
++int argc;
++char **argv;
++{
++    int i, RunAsRootOK = 0;
++    char *SourceFileName = NULL, *NoAskStr, *QuietStr;
++
++    QuietStr = getenv("MM_QUIET");
++    if (!QuietStr) {
++        QuietStr=QuietDefault;
++    }
++    if (!strcmp(QuietStr, "1")) {
++        Quiet = 1;
++    } else {
++        struct NoAskItem *qitem;
++        char *s, *tmp;
++        char *QuietCopy;
++
++        Quiet = 0;
++        QuietCopy = malloc(1+strlen(QuietStr));
++        if (!QuietCopy) ExitWithError(nomem);
++        strcpy(QuietCopy, QuietStr);
++        for (tmp=QuietCopy; *tmp; ++tmp) {
++            if (isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
++        }
++        do {
++            s = index(QuietCopy, ',');
++            if (s) *s++ = 0;
++            qitem = (struct NoAskItem *) malloc(sizeof (struct NoAskItem));
++            if (!qitem) ExitWithError(nomem);
++            qitem->next = FirstQuietItem;
++            qitem->type = QuietCopy;
++            FirstQuietItem = qitem;
++            QuietCopy = s;
++        } while (QuietCopy);
++    }
++    if (getenv("MM_TRANSPARENT")) {
++        TransparentMode = atoi(getenv("MM_TRANSPARENT")); /* Will not propogate recursively */
++    }
++    if (getenv("MM_RUNASROOT")) {
++        RunAsRootOK = atoi(getenv("MM_RUNASROOT"));
++    }
++    if (getenv("MM_YANKMODE")) {
++        YankMode = atoi(getenv("MM_YANKMODE")); /* Will not propogate recursively */
++    }
++    if (getenv("MM_DEBUG")) {
++        DoDebug = atoi(getenv("MM_DEBUG"));
++    }
++    if (DoDebug) printf("Metamail Version %s, debugging turned on.\n", mmversion);
++    NoAskStr = getenv("MM_NOASK");
++    if (!NoAskStr) NoAskStr = NoAskDefault;
++    if (!strcmp(NoAskStr, "1")) {
++        MightAskBeforeExecuting = 0;
++    } else {
++        struct NoAskItem *nai;
++        char *s, *tmp;
++        char *NoAskCopy;
++
++        NoAskCopy = malloc(1+strlen(NoAskStr));
++        if (!NoAskCopy) ExitWithError(nomem);
++        strcpy(NoAskCopy, NoAskStr);
++        for (tmp=NoAskCopy; *tmp; ++tmp) {
++            if (isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
++        }
++        do {
++            s = index(NoAskCopy, ',');
++            if (s) *s++ = 0;
++            nai = (struct NoAskItem *) malloc(sizeof (struct NoAskItem));
++            if (!nai) ExitWithError(nomem);
++            nai->next = FirstNoAskItem;
++            nai->type = NoAskCopy;
++            FirstNoAskItem = nai;
++            NoAskCopy = s;
++        } while (NoAskCopy);
++    }
++    MailerName = getenv("MM_MAILER");
++    if (!MailerName) MailerName = "unknown";
++    if (getenv("MM_USEPAGER")) {
++        MaybePageOutput = atoi(getenv("MM_USEPAGER"));
++    }
++    if ((getenv("MM_NOTTTY") && ((atoi(getenv("MM_NOTTTY"))) != 0))) {
++        MustNotBeTty = 1;
++    }
++    if (MustNotBeTty
++         || !isatty(0)
++         || !isatty(1)) {
++        DefinitelyNotTty = 1;
++    }
++    for (i=1; i<argc; ++i) {
++	if (argv[i][0] == '-') {
++	    switch (argv[i][1]) {
++		case '\0':
++		    /* Not really necessary, but.... */
++		    SourceFileName = NULL;
++		    UsingStandardInput = 1;
++		    break;
++		case 'b':
++		    Is822Format = 0;
++		    break;
++		case 'B':
++#ifdef MSDOS
++                    fprintf(stderr, "metamail warning: -B flag not supported on this system\n");
++#else
++		    DoInBackground = 1;
++#endif
++		    break;
++                case 'c':
++		    if (++i >= argc) usage();
++		    ContentType = malloc(1+strlen(argv[i]));
++		    if (!ContentType) ExitWithError(nomem);
++                    strcpy(ContentType,argv[i]);
++                    /* strip leading white space */
++                    while (*ContentType && isspace((unsigned char) *ContentType)) ++ContentType;
++                    StripTrailingSpace(ContentType);
++                    ParseContentParameters(ContentType);
++                    break;
++                case 'd':
++		    MightAskBeforeExecuting = 0;
++		    break;
++		case 'e':
++		    EatLeadingNewlines = 1;
++		    break;
++		case 'E':
++		    if (++i >= argc) usage();
++		    ContentEncoding = argv[i];
++		    break;
++		case 'f':
++		    if (++i >= argc) usage();
++		    MailFrom = argv[i];
++                    break;
++                case 'h':
++                    {
++                    FILE *tmpfp;
++                    PrintingMode = 1;
++                    MightAskBeforeExecuting = 0;
++#ifdef AMIGA
++		    freopen("prt:", "w", stdout);
++#else
++                    /* Want to make all of stdout go to printer, and this 
++                      is easier than changing every output statement,
++                      at least on UNIX... */
++                    tmpfp = popen(LPRCOMMAND, "w");
++                    if (!tmpfp) {
++                        ExitWithError("Cannot execute lpr command");
++                    }
++                    fflush(stdout);
++                    close(1);
++                    dup2(fileno(tmpfp), 1);
++#endif
++                    break;
++                    }
++		case 'm':
++		    if (++i >= argc) usage();
++		    MailerName = argv[i];
++		    break;
++		case 'p':
++		    MaybePageOutput = 1;
++		    break;
++		case 'P':
++                    MaybePageOutput = 1;
++                    MustPageOutput = 1;
++		    break;
++		case 'r':
++#ifdef MSDOS
++                    fprintf(stderr, "metamail warning: -r flag not supported on this system\n");
++#else
++		    RunAsRootOK = 1;
++#endif
++                    break;
++                case 'R':
++#ifdef RESET_PROGRAM
++                    system(RESET_PROGRAM);
++                    if (DoDebug) printf("Executed reset\n");
++#else
++                    fprintf(stderr, "metamail warning: -R flag not supported on this system\n");
++#endif
++                    break;
++		case 's':
++		    if (++i >= argc) usage();
++		    MailSubject = argv[i];
++		    break;
++                case 'T':
++                    TransparentMode = 0;
++                    break;
++                case 'w':
++                    JustWriteFiles = 1;
++                    break;
++                case 'q':
++                    Quiet = 1;
++		    PrintSomeHeaders = 0;
++		    break;
++		case 'x':
++                    DefinitelyNotTty = 1;
++                    MustNotBeTty = 1;
++		    break;
++                case 'y':
++                    YankMode = 1;
++                    break;
++		case 'z':
++		    DeleteSourceFileWhenDone = 1;
++		    break;
++		default:
++		    usage();
++	    }
++	} else {
++	    if (SourceFileName) {
++                QueueNextFile(argv[i]);
++	    } else {
++		SourceFileName = argv[i];
++	    }
++	}
++    }
++    if (TransparentMode) {
++        RunInNewWindow(argv, argc, &SourceFileName);
++    }
++    if (MaybePageOutput && DoInBackground) {
++	MustNotBeTty = 1;
++        /*fprintf(stderr, "metamail: -B is incompatible with -p, -P, and MM_USEPAGER\n");
++        usage(); */
++    }
++    if (!Is822Format && !ContentType) {
++	fprintf(stderr, "metamail:  -b requires -c.\n");
++	usage();
++    }
++    if (DeleteSourceFileWhenDone && !SourceFileName) {
++	fprintf(stderr, "metamail:  -z requires -f.\n");
++	usage();
++    }
++#if !defined(AMIGA) && !defined(MSDOS)
++    if (!RunAsRootOK && (getuid() == 0 || geteuid() == 0)) {
++	fprintf(stderr, "You can not run MetaMail as root unless you use -r or set MM_RUNASROOT.\n");
++	usage();
++    }
++#endif
++    if (SourceFileName) {
++        InputFP = fopen(SourceFileName, "r");
++        if (DoDebug) printf("Trying to open input file: %s\n", SourceFileName);
++        if (!InputFP) ExitWithError("Can't read input file");
++        if (DeleteSourceFileWhenDone) {
++            strcpy(fileToDelete, SourceFileName);
++        }
++    } else {  /* input on stdin */
++        UsingStandardInput = 1;
++        if (MustNotBeTty) {
++            InputFP = stdin;
++/*            MaybePageOutput = 1; */ /* This messed up safe-tcl -- nsb 9/21/93 */
++            MightAskBeforeExecuting = 0;
++        } else {
++#if defined(MSDOS) || defined(AMIGA)
++            InputFP = stdin;
++            DefinitelyNotTty = 1;
++            MaybePageOutput = 0;
++#else
++            int newfd = dup(0);
++            FILE *newfp;
++            if (newfd > 0) {
++                InputFP = fdopen(newfd, "r");
++                if (InputFP 
++                     && ((newfp = fopen("/dev/tty", "r")) != NULL)
++                     && !dup2(fileno(newfp), 0)) {
++                    DefinitelyNotTty = 0;
++                } else {
++                    InputFP = stdin;
++                    DefinitelyNotTty = 1;
++                    MaybePageOutput = 0;
++                }
++            }
++#endif
++        }
++    }
++    if (DefinitelyNotTty && MaybePageOutput) {
++        RunInNewWindow(argv, argc, &SourceFileName);
++    }
++    if (DefinitelyNotTty) {
++        MaybePageOutput = 0;	/* Disable pager if I/O has been redirected */
++    }
++    return(0);
++}
++
++usage() {
++    fprintf(stderr, "Usage:  metamail [-b] [-B] [-d] [-e] [-h] [-r] [-R] [-p]  [-P] [-x] [-y] [-z] [-c content-type] [-E content-transfer-encoding] [-f from-name] [-m mailername] [-s subject] [message-file-name]\n");
++    ExitWithError(NULL);
++}
++
++RunInNewWindow(argv, argc, SourceFileNamePtr)
++char **argv, **SourceFileNamePtr;
++int argc;
++{
++    char *FullCmd, TmpName[TMPFILE_NAME_SIZE];
++    int i, createdfile=0;
++    if (!*SourceFileNamePtr) {
++        char *LineBuf;
++        FILE *fptmp;
++
++        LineBuf = malloc(LINE_BUF_SIZE);
++        if (!LineBuf) ExitWithError(nomem);
++        /* Create it, ugh.  Also needs to affect later command. */
++        MkTmpFileName(TmpName);
++        DeleteSourceFileWhenDone = 1;
++        fptmp = fopen(TmpName, WRITE_BINARY);
++        if (!fptmp) ExitWithError("Can't open temporary file\n");
++        while (fgets(LineBuf, LINE_BUF_SIZE, stdin)) {
++            fputs(LineBuf, fptmp);
++        }
++        free(LineBuf);
++        fclose(fptmp);
++        *SourceFileNamePtr = TmpName;
++        createdfile = 1;
++    }
++    FullCmd = malloc(CMDSIZE);
++    if (!FullCmd) ExitWithError(nomem);
++    if (TransparentMode) {
++        /* In transparent mode, we want to produce stdout that is what we get in, and do EVERYTHING externally in a terminal window.  This is to make the truly brain-dead mailers like mailtool happy. I am NOT happy about having to do this.  */
++        /* So, first we copy everything to stdout */
++        sprintf(FullCmd, CATTEMPLATE, *SourceFileNamePtr);
++        system(FullCmd); /* Cheesy way to do it */
++        fflush(stdout); fflush(stderr);
++    }
++    /* Then we run ourselves in a terminal window */
++    MailSummary = "Metamail"; /* for window label */
++    CreateNewWindowPrefix(FullCmd);
++    strcat(FullCmd, METAMAIL);
++    strcat(FullCmd, " -P ");
++    if (TransparentMode) strcat(FullCmd, "-T ");
++    for (i=1; i<argc; ++i) {
++        if (strncmp(argv[i], "-x", 2)
++             && strncmp(argv[i], "-B", 2)
++             && strncmp(argv[i], "-d", 2)) {
++            strcat(FullCmd, "\"");
++            strcat(FullCmd, argv[i]);
++            strcat(FullCmd, "\" ");
++        }
++    }
++    if (createdfile) {
++        strcat(FullCmd, "-z ");
++        strcat(FullCmd, *SourceFileNamePtr);
++    }
++    if (!MightAskBeforeExecuting) {
++        strcat(FullCmd, " -d ");
++        /* The special hack for -d is HORRIBLE, but xterm screws up with the -d option in the middle of the command line! */
++    }
++    if (DoInBackground) strcat(FullCmd, " &");
++    DefinitelyNotTty = 0;
++    SetUpEnvironment();
++    if (DoDebug) fprintf(stderr, "Executing %s\n", FullCmd);
++    fflush(stdout); fflush(stderr);
++#ifdef MSDOS
++    system(FullCmd);
++    exit(0);	/* system() returns random number under MS-DOS */
++#else
++    exit(system(FullCmd));
++#endif
++}
++
++/* Only one or the other set up builtins gets used,
++  depending on whether or not we're in the middle of 
++          a multipart/alternative body part */
++struct MailcapEntry BuiltIns[] = {
++    {"text/*", CATTEMPLATE, NULL, 0, 1, 0, "plain text", LPRTEMPLATE},
++    {NULL, NULL, NULL, 0, 0, 0}};
++
++struct MailcapEntry BuiltInsAlternative[] = {
++    {"text/plain", CATTEMPLATE, NULL, 0, 1, 0, "plain text", LPRTEMPLATE},
++    {NULL, NULL, NULL, 0, 0, 0}};
++
++ProcessMailcapFiles(SquirrelFile) 
++char *SquirrelFile;
++{
++    char *s, *pathcopy = NULL;
++#ifdef MICROSOFT
++    /* For the Microsoft compiler, we use the library function _searchenv
++     * to find the mailcap file.  It will search all the directories
++     * listed in the given environment variable (PATH in this case), then
++     * construct a path to the file if it finds it.
++     */
++    /* BOGUS -- this only finds the FIRST mailcap file, we want ALL mailcap files */
++    char path[128];
++
++    _searchenv("mailcap", "PATH", path);
++    if (path[0])
++        if (!ProcessMailcapFile(path, SquirrelFile)) return(0);
++    return(-1);
++#else /* MICROSOFT */
++#ifdef BORLAND
++    char *path = getenv("MAILCAPS");
++    if (!path)
++       path = STDPATH;
++#else /* BORLAND */
++#ifdef AMIGA
++    char *path = STDPATH;
++#else /* AMIGA */
++    char *path = getenv("MAILCAPS");
++    if (!path) {
++        int uid = getuid();
++        struct passwd *p;
++        p = getpwuid(uid);
++        if (p) path = malloc(5+strlen(p->pw_dir) + sizeof(STDPATH));
++        if (!p || !path) ExitWithError(nomem);
++        strcpy(path, p->pw_dir);
++        strcat(path, STDPATH);
++        pathcopy = path;
++    } else 
++#endif /* AMIGA */
++#endif /* BORLAND */
++    {
++        pathcopy = malloc(1+strlen(path));
++        if (!pathcopy) ExitWithError(nomem);
++        strcpy(pathcopy, path);
++        path = pathcopy;
++    }
++    while(path) {
++        s = index(path, PATH_SEPARATOR);
++        if (s) *s++ = 0;
++        if (!ProcessMailcapFile(path, SquirrelFile)) return(0);
++        path = s;
++    }
++    if (pathcopy) free(pathcopy);
++    return(-1);
++#endif /* MICROSOFT */
++}
++
++TryBuiltIns(SquirrelFile) 
++char *SquirrelFile;
++{
++    int i;
++    /* Last resort -- for sites that didn't bother putting a "text" line in their mailcap files... */
++    if (DoDebug) fprintf(stderr, "Looking for '%s' in built-in content-type handling settings.\n", ContentType);
++    for (i=0; BuiltIns[i].contenttype; ++i) {
++        if (!TryMailcapEntry(SquirrelFile ? BuiltInsAlternative[i] : BuiltIns[i], SquirrelFile))    return(0);
++    }
++    return(-1);
++}
++
++ProcessMailcapFile(file, SquirrelFile)
++char *file, *SquirrelFile;
++{
++    struct MailcapEntry mc;
++    FILE *fp;
++    int res;
++
++    res = IsDirectory(file);
++    if (res) {
++	if (res == 1) {
++	    fprintf(stderr, "Mailcap path entry '%s' is a directory, should be a readable file.\n", file);
++	} else if (DoDebug) {
++	/* Quietly ignore non-existent mailcap files unless debugging */
++	    fprintf(stderr, "Mailcap path entry '%s' does not exist.\n", file);
++	}
++	return(-1);
++    }
++    fp = fopen(file, "r");
++    if (DoDebug) fprintf(stderr, "Looking for '%s' in mailcap file '%s'.\n", ContentType, file);
++    while (fp && !feof(fp)) {
++        mc.needtofree = 0;
++	if (GetMailcapEntry(fp, &mc)) {
++            if (!TryMailcapEntry(mc, SquirrelFile)) {
++                fclose(fp);
++                return(0);
++            }
++	}
++    }
++    if (fp) fclose(fp);
++    return(-1);
++}
++
++static char *ThingsToSkip[] = {
++    "csh ",
++    "sh ",
++    "ksh ",
++    NULL
++};
++
++char *ShortCommand(progname)
++char *progname;
++{
++    int i;
++    char *s, *oldprogname;
++    static char FullProgName[500];
++
++eatmore:
++    while (*progname && (*progname == '(' || isspace((unsigned char) *progname))) {
++        ++progname;
++    }
++    oldprogname = progname;
++    for (i = 0; oldprogname == progname && ThingsToSkip[i]; ++i) {
++        if (!strncmp(progname, ThingsToSkip[i], strlen(ThingsToSkip[i]))) {
++            progname += strlen(ThingsToSkip[i]);
++        }
++    }
++    if (*progname == '-') {
++        ++progname;
++        while (*progname && !isspace((unsigned char) *progname)) ++progname;
++    }
++    if (progname != oldprogname) goto eatmore;
++    strcpy(FullProgName, progname);
++    s = index(FullProgName, ' ');
++    if (s) *s = 0;
++    s = rindex(FullProgName, '/');
++    if (s) {
++	return(s+1);
++    } else {
++	return(FullProgName);
++    }
++}    
++
++TryMailcapEntry(mc, SquirrelFile)
++struct MailcapEntry mc;
++char *SquirrelFile;
++{
++    StripTrailingSpace(mc.contenttype);
++    if (DoDebug) fprintf(stderr, "Trying mailcap entry for '%s'.\n", mc.contenttype);
++    if (PrintingMode && !mc.printcommand) return(-1);
++    if (CtypeMatch(ContentType, mc.contenttype) && PassesTest(&mc)) {
++        if (SquirrelFile) {
++            return(SaveSquirrelFile(SquirrelFile));
++        } else {
++            char TmpFileName[TMPFILE_NAME_SIZE];
++            MkTmpFileName(TmpFileName);
++            return(ExecuteMailcapEntry(mc, TmpFileName, ContentType));
++        }
++    }
++    if (mc.needtofree) {
++        free(mc.contenttype);
++        free(mc.command);
++    }
++    return(-1);
++}
++
++SaveSquirrelFile(SquirrelFile)
++char *SquirrelFile;
++{
++    int j;
++    FILE *outfp;
++
++    if (DoDebug) printf("saving to file %s\n", SquirrelFile);
++
++    outfp = fopen(SquirrelFile, WRITE_BINARY);
++    if (!outfp) {
++        fprintf(stderr, "Cannot open %s to squirrel away a portion of a multipart/alternative\n", SquirrelFile);
++        return(-1);
++    }
++    fprintf(outfp, "Content-type: %s", ContentType);
++    for (j=0; j<CParamsUsed; ++j) {
++        fprintf(outfp, " ; ");
++        fprintf(outfp, CParams[j]);
++        fprintf(outfp, " = ");
++        fprintf(outfp, CParamValues[j]);
++    }
++    fprintf(outfp, "\n\n"); 
++    TranslateInputToOutput(InputFP, outfp, EncodingCode, ContentType);
++    if (fclose(outfp)) {
++        ExitWithError("fclose failed");
++    }
++    return(0);
++}
++
++ExecuteMailcapEntry(mc, TmpFileName, ThisContentType)
++char *TmpFileName, *ThisContentType;
++struct MailcapEntry mc;
++{
++    int resultcode=0, DidExecute, UsedTmpFileName;
++    struct part *PartsWritten=NULL;
++    char *s, *cmd;
++
++    cmd = malloc(CMDSIZE);
++    if (!cmd) ExitWithError(nomem);
++    if (PrintingMode && !mc.printcommand) return(-1);
++    BuildCommand(cmd, PrintingMode ? mc.printcommand : mc.command, TmpFileName, &UsedTmpFileName, &PartsWritten);
++    if (DoDebug) fprintf(stderr, "Match!  Built command %s.\n", cmd);
++    if (mc.copiousoutput && MaybePageOutput) {
++        strcat(cmd, " | ");
++        s = getenv("METAMAIL_PAGER");
++        if (s && strncmp(s, "metamail", 8)) {
++            /* If METAMAIL_PAGER is set to "metamail" we override it */
++            strcat(cmd, s);
++#ifndef AMIGA
++            if (!strncmp(s, "less", 4) && strncmp(s+5, "-r", 2)) {
++                fprintf(stderr, "Warning:  'less' without '-r' behaves badly for some mail types,\n\tnotably richtext.\n");
++            }
++#endif
++        } else {
++            strcat(cmd, "more");
++        }
++    }
++    if (!DefinitelyNotTty) {
++        SaveTtyState();
++    }
++    if (!NeedToAskBeforeExecuting(ThisContentType)
++         || OKToRun(ThisContentType, cmd, mc.label)) {
++        char *FullCmd;
++        int ReallyNotTty;
++#ifndef NO_RLIMITS
++        /* Limit size of core dumps */
++        struct rlimit rlp;
++
++        rlp.rlim_cur = 0;
++        rlp.rlim_max = 0;
++        setrlimit(RLIMIT_CORE, &rlp); 
++#endif
++        FullCmd = malloc(CMDSIZE);
++        if (!FullCmd) ExitWithError(nomem);
++        ReallyNotTty = DefinitelyNotTty;
++        if (mc.needsterminal
++             && DefinitelyNotTty) {
++            int j;
++            sprintf(cmd, " %s -P -b -c '%s", METAMAIL, ThisContentType);
++            for (j=0; j<CParamsUsed; ++j) {
++                strcat(cmd, " ; ");
++                strcatquoting(cmd, CParams[j]);
++                strcat(cmd, " = ");
++                strcatquoting(cmd, CParamValues[j]);
++            }
++            strcat(cmd, "' ");
++            strcat(cmd, TmpFileName);
++            CreateNewWindowPrefix(FullCmd);
++            strcat(FullCmd, cmd);
++            DefinitelyNotTty = 0; /* For recursive call */
++        } else {
++            strcpy(FullCmd, cmd);
++        }
++        DidExecute = 0;
++        if (UsedTmpFileName || PartsWritten) {
++            int isempty;
++            if (PartsWritten) {
++                isempty = 0;
++            } else {
++                isempty = WriteTmpFile(TmpFileName, ThisContentType);
++            }
++            if (!isempty || strncmp(ThisContentType, "text", 4)) {
++                if (DoInBackground && !PartsWritten && !mc.needsterminal) {
++#ifdef AMIGA
++                    char TmpCmd[80], TmpScriptName[40];
++                    sprintf(TmpCmd, "run execRmScript %s",
++                            MkRmScript(FullCmd, TmpFileName, TmpScriptName));
++#else
++                    char TmpCmd[CMDSIZE];
++                    sprintf(TmpCmd, "(%s; rm %s) &", FullCmd, TmpFileName);
++#endif
++                    DefinitelyNotTty = 1; /* in background */
++                    SetUpEnvironment();
++                    resultcode = ExecuteCommand(TmpCmd, 1);
++                    ++DidExecute;
++                } else {
++                    SetUpEnvironment();
++                    resultcode = ExecuteCommand(FullCmd, 1);
++                    unlink(TmpFileName);
++                    ++DidExecute;
++                }
++            } else { /* empty text part, hack to not say "more" */
++                unlink(TmpFileName);
++            }
++        } else {
++            FILE *tmpfp;
++            SetUpEnvironment();
++            (void) ExecuteCommand(FullCmd, 0);
++            tmpfp = popen(FullCmd, WRITE_BINARY);
++            TranslateInputToOutput(InputFP, tmpfp, EncodingCode, ThisContentType);
++            resultcode = tmpfp ? pclose(tmpfp) : -1;
++            ++DidExecute;
++        }
++        DefinitelyNotTty = ReallyNotTty;
++        if (!DefinitelyNotTty && DidExecute) {
++            RestoreTtyState();
++            if (mc.copiousoutput && MaybePageOutput && BoundaryCt > 0) PauseForUser();
++        }
++        if (!resultcode) {
++            free(FullCmd);
++        } else {
++            fprintf(stderr, "Command failed: %s\n", FullCmd);
++            if (MaybePageOutput && BoundaryCt > 0) PauseForUser();
++            ++ProcessingErrors;
++        }
++    } else {
++        /* user does not want to execute command */
++        if (!DefinitelyNotTty) {
++            RestoreTtyState();
++        }
++        if (DoDebug) fprintf(stderr, "Not executing command.\n");
++        if (!PartsWritten) ConsumeRestOfPart(NULL);
++    }
++    if (PartsWritten) {
++        struct part *tp;
++        char HeadFile[MAX_FILE_NAME_SIZE];
++
++        while (PartsWritten) {
++            tp=PartsWritten->next;
++            free(PartsWritten->ctype);
++            strcpy(HeadFile, PartsWritten->fname);
++            strcat(HeadFile, "H");
++            unlink(HeadFile);
++            unlink(PartsWritten->fname);
++            free(PartsWritten->fname);
++            free(PartsWritten);
++            PartsWritten=tp;
++        }
++    }
++    if (!DefinitelyNotTty) {
++        RestoreTtyState();
++    }
++    free(cmd);
++    return(0);
++}
++
++PassesTest(mc)
++struct MailcapEntry *mc;
++{
++    int result;
++    char *cmd, TmpFileName[TMPFILE_NAME_SIZE];
++
++    if (!mc->testcommand) return(1);
++    MkTmpFileName(TmpFileName);
++    cmd = malloc(CMDSIZE);
++    if (!cmd) ExitWithError(nomem);
++    BuildCommand(cmd, mc->testcommand, TmpFileName, NULL, NULL);
++    if (DoDebug) printf("Executing test command: %s\n", cmd);
++    result = system(cmd);
++#ifdef MSDOS
++    result = 0;	    /* system doesn't return a valid exit code on MS-DOS */
++                    /* note that this makes the test feature useless... */
++#endif
++    free(cmd);
++    return(!result);
++}
++
++char *
++GetCommand(s, t)
++char *s, **t;
++{
++    char *s2;
++    int quoted = 0;
++    s2 = malloc(strlen(s)*2+1); /* absolute max, if all % signs */
++    if (!s2) ExitWithError(nomem);
++    *t = s2;
++    while (s && *s) {
++	if (quoted) {
++            if (*s == '%') *s2++ = '%'; /* Quote through next level, ugh! */
++
++            *s2++ = *s++;
++	    quoted = 0;
++	} else {
++	    if (*s == ';') {
++                *s2 = 0;
++		return(++s);
++	    }
++	    if (*s == '\\') {
++		quoted = 1;
++		++s;
++	    } else {
++		*s2++ = *s++;
++	    }
++	}
++    }
++    *s2 = 0;
++    return(NULL);
++}	
++
++GetMailcapEntry(fp, mc)
++FILE *fp;
++struct MailcapEntry *mc;
++{
++    int rawentryalloc = 2000, len;
++    char *rawentry, *s, *t, *LineBuf;
++
++    LineBuf = malloc(LINE_BUF_SIZE);
++    if (!LineBuf) ExitWithError(nomem);
++    rawentry = malloc(1 + rawentryalloc);
++    if (!rawentry) ExitWithError(nomem);
++    *rawentry = 0;
++    while (fgets(LineBuf, LINE_BUF_SIZE, fp)) {
++	if (LineBuf[0] == '#') continue;
++        len = strlen(LineBuf);
++        if (len == 0) continue;
++        if (LineBuf[len-1] == '\n') LineBuf[--len] = 0;
++	if ((len + strlen(rawentry)) > rawentryalloc) {
++	    rawentryalloc += 2000;
++	    rawentry = realloc(rawentry, rawentryalloc+1);
++	    if (!rawentry) ExitWithError(nomem);
++	}
++	if (LineBuf[len-1] == '\\') {
++            LineBuf[len-1] = 0;
++	    strcat(rawentry, LineBuf);
++	} else {
++	    strcat(rawentry, LineBuf);
++	    break;
++	}
++    }
++    free(LineBuf);
++    for (s=rawentry; *s && isspace((unsigned char) *s); ++s) ;
++    if (!*s) {
++	/* totally blank entry -- quietly ignore */
++	free(rawentry);
++	return(0);
++    }
++    s = index(rawentry, ';');
++    if (!s) {
++	fprintf(stderr, "metamail: Ignoring invalid mailcap entry: %s\n", rawentry);
++	free(rawentry);
++	return(0);
++    }
++    *s++ = 0;
++    mc->needsterminal = 0;
++    mc->copiousoutput = 0;
++    mc->needtofree = 1;
++    mc->testcommand = NULL;
++    mc->label = NULL;
++    mc->printcommand = NULL;
++    mc->contenttype = malloc(1+strlen(rawentry));
++    if (!mc->contenttype) ExitWithError(nomem);
++    strcpy(mc->contenttype, rawentry);
++    t = GetCommand(s, &mc->command);
++    if (!t) {
++        free(rawentry);
++        return(1);
++    }
++    while (s && *s && isspace((unsigned char) *s)) ++s;
++    s = t;
++    while (s) {
++	char *arg, *eq;
++
++        t = GetCommand(s, &arg);
++/*        if (t) *t++ = 0; */
++        eq = index(arg, '=');
++        if (eq) *eq++ = 0;
++	if (*arg) {
++	    arg = Cleanse(arg);
++	    if (!strcmp(arg, "needsterminal")) {
++		mc->needsterminal = 1;
++	    } else if (!strcmp(arg, "copiousoutput")) {
++		mc->copiousoutput = 1;
++	    } else if (eq && !strcmp(arg, "test")) {
++		mc->testcommand = eq;
++	    } else if (eq && !strcmp(arg, "description")) {
++		mc->label = eq;
++	    } else if (eq && !strcmp(arg, "label")) { 
++		mc->label = eq; /* bogus old name for description */
++	    } else if (eq && !strcmp(arg, "print")) {
++		mc->printcommand = eq;
++	    } else if (eq && !strcmp(arg, "textualnewlines")) {
++		ExceptionalNewline(mc->contenttype, atoi(eq));
++	    } else if (strcmp(arg, "notes")) { /* IGNORE notes field */
++		if (*arg && DoDebug) fprintf(stderr, "metamail: Ignoring mailcap flag: %s\n", arg);
++	    }
++	}
++	s = t;
++    }
++    free(rawentry);
++    return(1);
++}
++
++ExitWithError(txt)
++char *txt;
++{
++    if (txt) fprintf(stderr, "metamail: %s\n", txt);
++    exit(-1);
++}
++
++char *
++FreshHeaderCopy(s)
++char *s;
++{
++    char *t, *newcopy;
++    int len;
++
++    while (s && *s && isspace((unsigned char) *s) && *s != '\n') ++s;
++    t = index(s, '\n');
++    while (t && (*(t+1) == ' ' || *(t+1) == '\t')) {
++        t = index(t+1, '\n');
++    }
++    len = t ? (t-s+1) : (strlen(s)+1);
++    newcopy = malloc(len+3);/* two extra bytes for a bizarre bug caused by the fact that FindParam calls FreshHeaderCopy and sometimes tacks on "--". */
++    if (!newcopy) ExitWithError(nomem);
++    strncpy(newcopy, s, len);
++    newcopy[len] = 0;
++    return(newcopy);
++}
++
++Read822Prefix(PrintHeads, nestingdepth)
++int PrintHeads, nestingdepth;
++{
++    int SawNewline = 1, bytes = 0, alloced = 1000, HasEncodedChars=0;
++    int c, oldbytes;
++    char *s, *t, *tmp;
++
++    if (!PrintSomeHeaders) PrintHeads = 0;
++    mailheaders = malloc(alloced+1);
++    if (!mailheaders) ExitWithError(nomem);
++    strcpy(mailheaders, "MM_HEADERS=\n");
++    bytes = 12;
++yankagain:
++    t = mailheaders + bytes;
++    oldbytes = bytes-1; /* a hack for YankMode */
++    while ((c = getc(InputFP)) != EOF) {
++        if (++bytes >= alloced) {
++            alloced += 1000;
++            mailheaders = realloc(mailheaders, alloced);
++            if (!mailheaders) ExitWithError(nomem);
++            t = mailheaders + bytes - 1;
++        }
++        if (c == '\n') {
++            if (SawNewline) break;
++            SawNewline = 1;
++        } else SawNewline = 0;
++        *t++ = c;
++    }
++    *t = 0;
++    --bytes;
++    if (c == EOF) {
++	if (nestingdepth) {
++	    fprintf(stderr, "metamail: Incomplete multipart message -- unexpected EOF\n");
++/*            exit(ProcessingErrors); */
++        } else {
++            if (YankMode) {
++/*                ExitWithError("Could not extract a MIME message from the  body\n"); */
++		fprintf(stderr, "metamail: Could not extract a MIME message from the body\n");
++            } else {
++		fprintf(stderr, "metamail: Could not find end of mail headers.\n");
++/*                ExitWithError("Could not find end of mail headers"); */
++            }
++	}
++	BoundaryCt=0;
++	return -1;
++    }
++    for (s=mailheaders+oldbytes; *s; ++s) {
++        if (*s == '\n' && (*(s+1) != ' ') && (*(s+1) != '\t')) {
++	    if (!ContentType && !lc2strncmp(s, "\ncontent-type:", 14)) {
++		char *dum;
++                ContentType = FreshHeaderCopy(s+14);
++		/* Eliminate white space embedded in content-type */
++		while (1) {
++		    dum = index(ContentType, '/');
++		    if (!dum) break;
++		    if (isspace(*(dum-1))) {
++			for (--dum; *dum; ++dum) {
++			    *dum = *(dum+1);
++			}
++		    } else if (isspace(*++dum)) {
++			for ( ; *dum; ++dum) {
++			    *dum = *(dum+1);
++			}
++		    } else {
++			break;
++		    }
++		}
++                StripTrailingSpace(ContentType);
++                ParseContentParameters(ContentType);
++                if (PrintHeads) maybephead(s+1);
++            } else if (!ContentEncoding && !lc2strncmp(s, "\ncontent-transfer-encoding:", 27)) {
++                ContentEncoding = FreshHeaderCopy(s+27);
++                if (PrintHeads) maybephead(s+1);
++            } else if (!lc2strncmp(s, "\nsubject:", 9)) {
++                if (PrintHeads) maybephead(s+1);
++                MailSubject = FreshHeaderCopy(s+9);
++            } else if (!lc2strncmp(s, "\nfrom:", 6)) {
++                if (PrintHeads) maybephead(s+1);
++                MailFrom = FreshHeaderCopy(s+6);
++            } else if (!lc2strncmp(s, "\ncontent-description:", 4)) {
++                if(PrintHeads) maybephead(s+1);
++                MailSubject = FreshHeaderCopy(s+21);
++            } else {
++                /* Print any with encoded variables */
++                char *dum = s;
++                while (dum) {
++                    dum = index(dum, '?');
++                    if (dum && *++dum == '=') break;
++                }
++                if (dum) {
++                    char *nl = s+1;
++                    while (nl) {
++                        nl = index(nl, '\n');
++                        if (nl && !isspace((unsigned char) *++nl)) break;
++                    }
++                    if (nl && nl > dum) ++HasEncodedChars;
++                }
++                if (HasEncodedChars) {
++                    phead(s+1);
++                } else if (PrintHeads) {
++                    maybephead(s+1);
++                }
++            }
++        }
++    }
++    /* Ugly, but effective */
++    if (YankMode && !ContentType) {
++        goto yankagain;
++    }
++    if (PrintHeads) printf("\n");
++    if (!ContentType) {
++        ContentType = "text/plain";
++        CParamsUsed=0;
++    }
++    for (tmp=ContentType; *tmp; ++tmp) {
++        if (isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
++    }
++    return 0;
++}
++
++PrepareMessage() {
++    int c;
++
++    EncodingCode = ENCODING_NONE;
++    if (ContentEncoding) {
++        /* strip leading white space */
++        while (*ContentEncoding && isspace((unsigned char) *ContentEncoding)) ++ContentEncoding;
++        StripTrailingSpace(ContentEncoding);
++        if (!lc2strcmp(ContentEncoding, "base64")) {
++            EncodingCode = ENCODING_BASE64;
++        } else if (!lc2strcmp(ContentEncoding, "quoted-printable")) {
++            EncodingCode = ENCODING_QUOTEDPRINTABLE;
++        } else if (!lc2strncmp (ContentEncoding, "x-uue", 5)) {
++            fprintf (stderr, "WARNING:  Using nonstandard %s encoding, trying uuencode algorithm.\n", ContentEncoding);
++ 	    EncodingCode = ENCODING_UUENCODE;
++        } else {
++            if (lc2strcmp(ContentEncoding, "none")
++                 && !lc2strcmp(ContentEncoding, "8bit")
++                 && !lc2strcmp(ContentEncoding, "7bit")) {
++                fprintf(stderr, "Ignoring unrecognized Content-Transfer-Encoding value: %s\n", ContentEncoding);
++            }
++        }
++    }
++    if (EatLeadingNewlines) {
++        while ((c = getc(InputFP)) != EOF) {
++            if (c != '\n') {
++                ungetc(c, InputFP);
++                break;
++            }
++        }
++    }
++    SetUpEnvironment();  
++}
++
++SetUpEnvironment() { 
++    int i, j, environsize;
++    char **newenviron, *mailervar, *summaryvar, *ctypevar, *s;
++    static char ttyenv[15], debugenv[15], *noaskenv, pagerenv[15], *quietenv, rootenv[25];
++
++#if !defined(AMIGA) && !defined(MSDOS)
++    /* Hack to make the code look similar for unix & dos */
++#define putenv(var)        newenviron[i++] = var;
++    for (environsize=0; environ[environsize]; ++environsize) {
++	;
++    }
++    newenviron = (char **) malloc(sizeof(char *) * (17+environsize));
++    if (!newenviron) ExitWithError(nomem);
++#endif
++    mailervar = malloc(13+strlen(MailerName));
++    if (!mailervar) ExitWithError(nomem);
++    sprintf(mailervar, "MM_MAILER=%s", MailerName);
++    summaryvar = malloc(26 + strlen(MailFrom) + strlen(MailSubject));
++    if (!summaryvar) ExitWithError(nomem);
++    sprintf(summaryvar, "MM_SUMMARY=%s (from %s)", MailSubject, MailFrom);
++    MailSummary = summaryvar+11;
++    EliminateNastyChars(MailSummary);
++    i = 0;
++    if (ContentType) {
++        int ctypelen = 22+strlen(ContentType);
++        for (j=0; j<CParamsUsed; ++j) {
++            ctypelen += 6 + strlen(CParams[j]) + strlen(CParamValues[j]);
++        }
++        ctypevar = malloc(ctypelen);
++        if (!ctypevar) ExitWithError(nomem);
++        for (s=ContentType; *s; ++s) {
++            if (isupper((unsigned char) *s)) *s = tolower((unsigned char) *s);
++        }
++        while (isspace((unsigned char) *--s)) *s = 0;
++        sprintf(ctypevar, "MM_CONTENTTYPE=%s", ContentType);
++        for (j=0; j<CParamsUsed; ++j) {
++            strcat(ctypevar, " ; ");
++            strcat(ctypevar, CParams[j]);
++            strcat(ctypevar, " = ");
++            strcat(ctypevar, CParamValues[j]);
++        }
++        putenv(ctypevar);
++    }
++    putenv(mailheaders ? mailheaders : "MM_HEADERS=unknown");
++    putenv(mailervar);
++    putenv(summaryvar);
++    sprintf(ttyenv, "MM_NOTTTY=%d", DefinitelyNotTty);
++    putenv(ttyenv);
++    sprintf(debugenv, "MM_DEBUG=%d", DoDebug);
++    putenv(debugenv);
++    s = getenv("MM_QUIET");
++    if (!s) s = QuietDefault;
++    quietenv = malloc(15 + strlen(s));
++    if (!quietenv) ExitWithError(nomem);
++    if (Quiet) {
++        strcpy(quietenv, "MM_QUIET=1");
++    } else {
++        sprintf(quietenv, "MM_QUIET=%s", s);
++    }
++    putenv(quietenv);
++    s = getenv("MM_NOASK");
++    if (!s) s = NoAskDefault;
++    noaskenv = malloc(15 + strlen(s));
++    if (!noaskenv) ExitWithError(nomem);
++    if (MightAskBeforeExecuting) {
++        sprintf(noaskenv, "MM_NOASK=%s", s);
++    } else {
++        strcpy(noaskenv, "MM_NOASK=1");
++    }
++    putenv(noaskenv);
++    s = getenv("MM_RUNASROOT");
++    if (!s) s = "0";
++    sprintf(rootenv, "MM_RUNASROOT=%s", s);
++    putenv(rootenv);
++    sprintf(pagerenv, "MM_USEPAGER=%d", MaybePageOutput);
++    putenv(pagerenv);
++#if !defined(AMIGA) && !defined(MSDOS)
++    for (j=0; j<environsize; ++j) {
++        if (strncmp(environ[j], "MM_", 3) || !strncmp(environ[j], "MM_CHARSET", 10)) {
++            putenv(environ[j]);
++        }
++    }
++    newenviron[i] = NULL;
++    environ = newenviron;
++    if (DoDebug) {
++        printf("Here is the environment:\n\n");
++        system("printenv");
++    }
++#endif
++}
++
++
++#ifdef AMIGA
++int
++putenv(def)
++char *def;
++{
++    char *cp;
++    char nameBuf[100];
++    FILE *envFile;
++
++    if ((cp = index(def, '=')) == NULL || def == cp) {
++        return(1);
++    }
++
++    strcpy(nameBuf, "ENV:");
++    strncat(nameBuf, def, cp - def);
++    nameBuf[(cp - def) + 4] = 0;
++    cp++;               /* Now points to value part of environment string. */
++
++    if ((envFile = fopen(nameBuf, "w")) == NULL) {
++        return(2);
++    }
++
++    fputs(cp, envFile);
++    fclose(envFile);
++
++    return(0);
++}
++#endif
++
++OKToRun(ctype, progname, label)
++char *ctype, *progname, *label;
++{
++    char AnsBuf[100], *s;
++
++    if (DoInBackground) return(1);
++    if (DefinitelyNotTty || MustNotBeTty) return(1);
++    while (1) {
++        printf("\n");
++        if (label) {
++            printf("This message contains %s.\nDo you want to view it using the '%s' command (y/n) [y] ? ", label, ShortCommand(progname));
++        } else {
++            printf("This message contains '%s'-format data.\nDo you want to view it using the '%s' command (y/n) [y] ? ", ctype, ShortCommand(progname));
++        }
++        s = fgets(AnsBuf, sizeof(AnsBuf), stdin);
++        if (!s) return(0); /* EOF */
++	while (s && *s && isspace((unsigned char) *s)) ++s;
++	if (*s == 'y' || *s == 'Y' || !*s || *s == '\n') return(1);
++	if (*s == 'n' || *s == 'N' || *s == 'q' || *s == 'Q') {
++	    return(0);
++	}
++	printf("Please answer yes or no.\n");
++    }
++}
++
++EliminateNastyChars(s)
++char *s;
++{
++    if (s) for( ; *s ;++s) {
++        if (isalnum((unsigned char) *s)) continue;
++	if (index(" ,.;:/?\\|[]{}()*&^%#@-_=+~<>\"", *s)) continue;
++	if (*s == '\'' || *s == '`') {
++	    *s = '"';
++	} else {
++	    *s = ' ';
++	}
++    }
++}
++
++StripTrailingSpace(s)
++char *s;
++{
++    char *t = s+strlen(s) -1;
++    while (isspace((unsigned char) *t) && (t >= s)) *t-- = 0;
++}
++
++static char *KeyHeads=NULL;
++static char **KeyHeadList;
++static int KeyKeep = 0;
++
++void setKeyHeads()
++{
++    char *s;
++    int numkeys = 0;
++
++    if ((KeyHeads = getenv("KEYHEADS")) != 0) {
++        for (s=KeyHeads;*s;++s) if (isupper((unsigned char) *s)) *s=tolower((unsigned char) *s);
++    } else if ((KeyHeads = getenv("KEYIGNHEADS")) != 0) {
++	for (s=KeyHeads;*s;++s) if (isupper((unsigned char) *s)) *s=tolower((unsigned char) *s);
++	KeyKeep = 1;
++    } else {
++	static char khtmp[] = "to:cc:subject:from:content-description:date";
++	KeyHeads = khtmp;
++    }
++    for (s=KeyHeads; *s; ++s) if (*s == ':') ++numkeys;
++    numkeys += 2;
++    KeyHeadList = (char **) malloc((numkeys) * sizeof(char *));
++    if (!KeyHeadList) ExitWithError(nomem);
++    numkeys = 0;
++    KeyHeadList[0] = KeyHeads;
++    for(s=KeyHeads; *s; ++s) {
++	if (*s == ':') {
++	    *s = '\0';
++	    KeyHeadList[++numkeys] = s+1;
++	}
++    }
++    KeyHeadList[++numkeys] = NULL;
++}
++
++/* find the first colon in a header line which appears before any spaces or control characters */
++char *
++findcolon(hdr)
++char *hdr;
++{
++    while (*hdr && !isspace(*hdr) && !iscntrl(*hdr))
++	if (*hdr == ':') return hdr;
++	else hdr++;
++    return 0;
++}
++
++/* check the header given to see if it matches any in the KeyHeadList */
++maybephead(hdr)
++char *hdr;
++{
++    char *s;
++    int numkeys=0;
++
++    if (!KeyHeads) setKeyHeads();
++
++    s = findcolon(hdr);
++    if (s) {
++	int len = s - hdr;
++        for (numkeys=0; KeyHeadList[numkeys]; ++numkeys) {
++            if (!strcmp(KeyHeadList[numkeys], "*")
++                 || !lc2strncmp(hdr, KeyHeadList[numkeys], len)) {
++		if (!KeyKeep) phead(hdr);
++		return;
++            }
++        }
++	if (KeyKeep) phead(hdr);
++	return;
++    }
++    if (!strncmp(hdr, "From ", 5) || !strncmp(hdr, ">From ", 6)) {
++	for (numkeys = 0; KeyHeadList[numkeys]; ++numkeys) {
++	    if (!strcmp(KeyHeadList[numkeys], "*")
++		 || !lc2strncmp(">from", KeyHeadList[numkeys], 5)) {
++		if (!KeyKeep) phead(hdr);
++		return;
++	    }
++	}
++	if (KeyKeep) phead(hdr);
++    }
++}
++
++/* This next routine prints out a mail header, and needs to deal with the new extended charset headers. */
++phead(s)
++char *s;
++{
++    char *t = s;
++
++    while (1) {
++	t = index(t, '\n');
++	if (!t) break;
++        if (!isspace((unsigned char) *(t+1))) {
++            *t = 0;
++	    break;
++	} else ++t;
++    }
++    PrintHeader(s, 1);
++    printf("\n");
++    if (t) *t = '\n';
++}
++
++static char PrevCharset[100] = "us-ascii";
++
++/* This is the part that actually handles the charset issues */
++void PrintHeader(s, ShowLeadingWhitespace)
++char *s;
++int ShowLeadingWhitespace;
++{
++    char *charset, *encoding, *txt, *txtend, TmpFile[TMPFILE_NAME_SIZE];
++    int ecode = ENCODING_NONE, CorrectedCharset = 0;
++    FILE *fp;
++
++    while (*s && (*s != '=')) {
++        if (isspace((unsigned char) *s)) {
++            if (ShowLeadingWhitespace) {
++                putchar(' ');
++            }
++        } else {
++            putchar(*s);
++            if (!CorrectedCharset) {
++                CorrectedCharset = 1;
++                strcpy(PrevCharset, "us-ascii");
++            }
++        }
++        if (!ShowLeadingWhitespace) {
++            /* Only at most one leading space is ignored */
++            ShowLeadingWhitespace = 1;
++        }
++        ++s;
++    }
++    if (!*s) return;
++    if (*(s+1) != '?') {
++        putchar('=');
++        PrintHeader(++s, 1);
++        return;
++    }
++    charset = s+2;
++    encoding = index(charset, '?');
++    if (!encoding) {
++        putchar('=');
++        PrintHeader(++s,1);
++        return;
++    }
++    txt = index(encoding+1, '?');
++    if (!txt) {
++        putchar('=');
++        PrintHeader(++s, 1);
++        return;
++    }
++    txtend = txt;
++    do {
++        txtend = index(txtend+1, '?');
++    } while(txtend && (*(txtend+1) != '='));
++    if (!txtend) {
++        putchar('=');
++        PrintHeader(++s, 1);
++    }
++    /* Proper parse! Ready to dissect... */
++    *encoding = 0;
++    *txt = 0;
++    *txtend = 0;
++    if ((*(encoding+1) == 'q') || (*(encoding+1) == 'Q')) {
++        ecode = ENCODING_QUOTEDPRINTABLE;
++    } else if ((*(encoding+1) == 'b') || (*(encoding+1) == 'B')) {
++        ecode = ENCODING_BASE64;
++    } else {
++        fprintf(stderr, "Bad encoding value in non-ASCII header string: %s\n", encoding+1);
++    }
++    if (lc2strcmp(charset, PrevCharset)) {
++        char *s2, *charsetinuse;
++
++        strcpy(PrevCharset, charset);
++        for (s2=PrevCharset; *s2; ++s2) {
++            if (isupper((unsigned char) *s2)) *s2 = tolower((unsigned char) *s2);
++        }
++        charsetinuse = getenv("MM_CHARSET");
++        if (!charsetinuse || lc2strcmp(charsetinuse, PrevCharset)) {
++            printf("[** %s charset **] ", charset);
++        }
++    }
++    if (ecode == ENCODING_NONE) {
++        printf(txt+1);
++    } else {
++        /* What follows is REALLY bogus, but all my encoding stuff is pipe-oriented right now... */
++        MkTmpFileName(TmpFile);
++        fp = fopen(TmpFile, WRITE_BINARY);
++        if (!fp) {
++            fprintf(stderr, "Could not open temporary file\n");
++        } else {
++            char *t;
++            for (t=txt+1; *t; ++t) {
++                if (*t == '_') {
++                    putc(' ', fp);
++                } else if (*t == '\n') {
++                    putc(' ', fp);
++                } else {
++                    putc(*t, fp);
++                }
++            }
++            fclose(fp);
++            fp = fopen(TmpFile, "r");
++            if (!fp) {
++                fprintf(stderr, "Could not open temporary file\n");
++            } else {
++                TranslateInputToOutput(fp, stdout, ecode, "text");
++                fclose(fp);
++            }
++            unlink(TmpFile);
++        }
++    }
++    *encoding = '?';
++    *txt = '?';
++    *txtend = '?';
++    PrintHeader(txtend + 2, 0);
++}
++
++BuildCommand(Buf, controlstring, TmpFileName, UsedTmpFileName, PartsWritten)
++char *Buf, *controlstring, *TmpFileName;
++int *UsedTmpFileName;
++struct part **PartsWritten;
++{
++    char *from, *to, *s, *p, *tmp;
++    int prefixed = 0, UsedBigFile=0, UsedLittleFiles=0, numparts=0;
++    struct part *firstpart=NULL, *thispart=NULL, *tmppart=NULL;
++
++    if (UsedTmpFileName) *UsedTmpFileName = 0;
++    if (PartsWritten) *PartsWritten = NULL;
++    for (from=controlstring, to=Buf; *from; ++from) {
++        if (prefixed) {
++            prefixed = 0;
++            switch(*from) {
++                case '%':
++                    *to++ = '%';
++                    break;
++                case 'n':
++                case 'F':
++		    if (!PartsWritten) {
++			fprintf(stderr, "metamail: Bad mailcap \"test\" clause: %s\n", controlstring);
++			ExitWithError("%%n and %%F may not be used in \"test\" clauses.  Execution terminated.");
++		    }
++                    if (UsedBigFile) {
++                        fprintf(stderr, "metamail: Bad mailcap entry: %s\n", controlstring);
++                        ExitWithError("%%n and %%F are incompatible with %%s.  Execution terminated.");
++                    }
++                    if (!UsedLittleFiles) {
++                        /* Set up parts */
++                        char *LineBuf, *boundary, TmpFileNameBuf[TMPFILE_NAME_SIZE];
++                        char *oldct, *oldce, *newct;
++                        int currct, boundarylen, newctlen, j;
++                        int oldcparmsused, oldcparamsalloced;
++                        char **oldcparams, **oldcparamvalues;
++                        FILE *headfp;
++
++                        LineBuf = malloc(LINE_BUF_SIZE);
++                        if (!LineBuf) ExitWithError(nomem);
++                        boundary = FindParam("boundary");
++			if (!boundary) {
++			    fprintf(stderr, "Bad message format: This multipart message has no boundary parameter,\n");
++			    fprintf(stderr, "but the mailcap entry for %s uses %%F or %%n.\n\n", ContentType);
++			    ExitWithError("A change to the mailcap file might make this message viewable.");
++                        }
++                        if (boundary[0] == '"') {
++                            boundary=UnquoteString(boundary);
++                        }
++                        sprintf(LineBuf, "--%s", boundary);
++                        strcpy(boundary, LineBuf);
++                        boundarylen = strlen(boundary);
++                        if (BoundaryCt >= BoundaryAlloc) {
++                            BoundaryAlloc += 5;
++                            if (Boundaries) {
++                                Boundaries = (char **) realloc(Boundaries, BoundaryAlloc*sizeof(char *));
++                            } else {
++                                Boundaries = (char **) malloc(BoundaryAlloc*sizeof(char *));
++                            }
++                            if (!Boundaries) ExitWithError(nomem);
++                        }
++                        Boundaries[BoundaryCt++] = boundary;
++                        while (fgets(LineBuf, LINE_BUF_SIZE, InputFP)) { /* find start */
++                            if (!strncmp(LineBuf, boundary, boundarylen)
++                                 && ((LineBuf[boundarylen] == '\n')
++                                      || (LineBuf[boundarylen] == '-'
++                                           && LineBuf[boundarylen+1] == '-'
++                                           && LineBuf[boundarylen+2] == '\n'))) {
++                                break;
++                            }
++                        }
++                        free(LineBuf);
++                        currct = BoundaryCt;
++                        oldct=ContentType;
++                        oldce=ContentEncoding;
++                        oldcparmsused = CParamsUsed;
++                        oldcparamsalloced = CParamsAlloced;
++                        oldcparams = CParams;
++                        oldcparamvalues = CParamValues;
++                        CParams = NULL;
++                        CParamValues = NULL;
++                        CParamsUsed = 0;
++                        CParamsAlloced = 0;
++                        while(currct == BoundaryCt) {
++                            tmppart = (struct part *) malloc(sizeof(struct part));
++                            if (!tmppart) ExitWithError(nomem);
++                            if (firstpart) {
++                                thispart->next = tmppart;
++                                thispart = tmppart;
++                            } else {
++                                firstpart = thispart = tmppart;
++                            }
++                            tmppart->next = NULL;
++                            ContentType=NULL;
++                            ContentEncoding=NULL;
++                            Read822Prefix(0,0);
++                            PrepareMessage();
++                            newctlen=5+strlen(ContentType);
++                            for (j=0; j<CParamsUsed; ++j) {
++                                newctlen += 11+strlen(CParams[j]) + strlen(CParamValues[j]);
++                            }
++                            newct= malloc(newctlen);
++                            if (!newct) ExitWithError(nomem);
++                            strcpy(newct, "'");
++                            strcat(newct, ContentType);
++                            for (j=0; j<CParamsUsed; ++j) {
++                                strcat(newct, "; ");
++                                strcat(newct, CParams[j]);
++                                if (CParamValues[j][0] == '\"') {
++                                    strcat(newct, " = ");
++                                    strcat(newct, CParamValues[j]);
++                                } else {
++                                    strcat(newct, " = \"");
++                                    strcat(newct, CParamValues[j]);
++                                    strcat(newct, "\"");
++                                }
++                            }
++                            strcat(newct, "'");
++                            thispart->ctype = newct;
++                            MkTmpFileName(TmpFileNameBuf);
++                            thispart->fname = malloc(1+strlen(TmpFileNameBuf));
++                            if (!thispart->fname) ExitWithError(nomem);
++                            strcpy(thispart->fname, TmpFileNameBuf);
++                            WriteTmpFile(thispart->fname, thispart->ctype);
++                            strcat(TmpFileNameBuf, "H");
++                            headfp = fopen(TmpFileNameBuf, "w");
++                            if (headfp) {
++                                fputs(mailheaders+12, headfp);
++                                /* The +12 gets rid of MM_HEADERS=\n */
++                                fclose(headfp);
++                            }
++                            ++numparts;
++                        }
++                        ContentType=oldct;
++                        ContentEncoding=oldce;
++                        CParamsUsed = oldcparmsused;
++                        CParamsAlloced = oldcparamsalloced;
++                        CParams = oldcparams;
++                        CParamValues = oldcparamvalues;
++                        /* Now we've seen the last encapsulation boundary, but if there is a "postfix"
++                            we must throw it away.*/
++                        if (BoundaryCt > 0) {
++                            ConsumeRestOfPart(NULL);
++                        }
++                        *PartsWritten = firstpart;
++                        UsedLittleFiles=1;
++                    }
++                    if (*from == 'n') {
++                        char numbuf[10];
++                        sprintf(numbuf, "%d", numparts);
++                        strcpy(to, numbuf);
++                        to += strlen(numbuf);
++                    } else { /* %F */
++                        for (tmppart = firstpart; tmppart != NULL; tmppart = tmppart->next) {
++                            sprintf(to, "%s %s ", tmppart->ctype, tmppart->fname);
++                            to += (strlen(tmppart->ctype) + strlen(tmppart->fname) + 2);
++                        }
++                    }
++                    break;
++                case 's':
++                    if (UsedLittleFiles) {
++                        fprintf(stderr, "metamail: Bad mailcap entry: %s\n", controlstring);
++                        ExitWithError("%%n and %%F are incompatible with %%s.  Execution terminated.");
++                    }
++                    if (TmpFileName) {
++                        strcpy(to, TmpFileName);
++                        to += strlen(TmpFileName);
++                        if (UsedTmpFileName) ++(*UsedTmpFileName);
++                    }
++                    UsedBigFile = 1;
++                    break;
++                case '{':
++                    s = index(from, '}');
++                    if (!s) {
++                        fprintf(stderr, "Ignoring ill-formed parameter reference in mailcap file: %s\n", from);
++                        break;
++                    }
++                    ++from;
++                    *s = 0;
++                    /* put in lower case */
++                    for (tmp=from; *tmp; ++tmp) {
++                        if (isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
++                    }
++                    p = FindParam(from);
++                    if (p && p[0] == '"') {
++                        p=UnquoteString(p);
++                    }
++                    if (!p) p = "";
++                    *to++ = '\'';
++                    strcpynoquotes(to, p);
++                    to += strlen(p);
++                    *to++ = '\'';
++                    *s = '}'; /* restore */
++                    from = s;
++                    break;
++                case 't':
++                    /* type/subtype */
++                    strcpynoquotes(to, ContentType);
++                    to += strlen(ContentType);
++                    break;
++                default:
++                    fprintf(stderr, "Ignoring unrecognized format code in mailcap file: %%%c\n", *from);
++                    break;
++            }
++        } else if (*from == '%') {
++            prefixed = 1;
++        } else {
++            *to++ = *from;
++        }
++    }
++    *to = 0;
++}
++
++strcpynoquotes(t,f)
++char *t, *f;
++{
++    static char *badchars="|<>%*?\"`'";
++
++    while (*f) {
++        if (index(badchars, *f)) *t++ = ' '; else *t++ = *f;
++        ++f;
++    }
++}
++
++WriteTmpFile(fname, ctype)
++char *fname;
++char *ctype;
++{
++    FILE *fpout;
++    int retval = 0;
++
++    fpout = fopen(fname, WRITE_BINARY);
++    if (!fpout) {
++        perror("WriteTmpFile");
++        ExitWithError("Can't create temporary file");
++    }
++    TranslateInputToOutput(InputFP, fpout, EncodingCode, ctype);
++    if (ftell(fpout) == 0) retval = 1;
++    if (fclose(fpout)) ExitWithError("Can't write temporary file");
++    return(retval);
++}
++
++
++TranslateInputToOutput(InputFP, OutputFP, Ecode, ctype)
++FILE *InputFP, *OutputFP;
++int Ecode;
++char *ctype;
++{
++    int InMultipart = BoundaryCt > 0 ? 1 : 0;
++
++    switch(Ecode) {
++        case ENCODING_BASE64:
++            from64(InputFP, OutputFP, InMultipart ? Boundaries : NULL, &BoundaryCt, DoesNeedPortableNewlines(ctype));
++            break;
++        case ENCODING_QUOTEDPRINTABLE:
++            fromqp(InputFP, OutputFP, InMultipart ? Boundaries : NULL, &BoundaryCt);
++            break;
++ 	case ENCODING_UUENCODE:
++ 	    fromuue(InputFP, OutputFP, InMultipart ? Boundaries: NULL, &BoundaryCt);
++ 	    break;
++        default:
++            ConsumeRestOfPart(OutputFP);
++    }
++#if !defined(AMIGA) && !defined(MSDOS)
++    if (UsingStandardInput && feof(InputFP) && !freopen("/dev/tty", "r", stdin)) {
++        fprintf(stderr, "Warning: Cannot freopen /dev/tty to stdin");
++    } else InputFP = stdin;
++#endif
++}
++
++CreateNewWindowPrefix(Prefix)
++char *Prefix;
++{
++    char *override = getenv("TERMINAL_CMD");
++    if (override) {
++        strcpy(Prefix, override);
++#ifdef AMIGA
++    } else {
++        /* The window should *not* run in background. We are thus unable
++         * to use NewWsh or NewCLI.
++         */
++        /* strcpy(Prefix, "newwsh CMD "); */
++        Prefix[0] = 0;
++#else
++    } else if (getenv("DISPLAY")) {
++        /* X11 */
++        strcpy(Prefix, "xterm -title '");
++        strcat(Prefix, MailSummary);
++        strcat(Prefix, "' -e ");
++    } else if (getenv("WINDOW_PARENT")) {
++        /* SunView */
++        strcpy(Prefix, "shelltool ");
++    } else if (getenv("WMHOST")) {
++        /* old Andrew WM */
++        strcpy(Prefix, "h19 ");
++    } else {
++        /* last resort is to look for /dev/tty */
++        if (!freopen("/dev/tty", "r", stdin)){
++            ExitWithError("Don't know how to create a terminal window");
++        }
++        InputFP = stdin;
++        fprintf(stderr, "Warning, reopened /dev/tty, could be strange.\n");
++        Prefix[0] = 0;
++#endif
++    }
++}
++
++int HasSavedTtyState=0;
++#if !defined(AMIGA) && !defined(MSDOS)
++#ifdef SYSV
++static struct termio MyTtyStateIn, MyTtyStateOut;
++#else
++static struct sgttyb MyTtyStateIn, MyTtyStateOut;
++#endif
++#endif
++
++SaveTtyState() {
++    /* Bogus -- would like a good portable way to reset the terminal state here */
++#if !defined(AMIGA) && !defined(MSDOS)
++#ifdef SYSV
++    ioctl(fileno(stdin), TCGETA, &MyTtyStateIn);
++    ioctl(fileno(stdout), TCGETA, &MyTtyStateOut);
++#else
++    gtty(fileno(stdin), &MyTtyStateIn);
++    gtty(fileno(stdout), &MyTtyStateOut);
++#endif
++    HasSavedTtyState = 1;
++#endif
++}
++
++RestoreTtyState() {
++#if !defined(AMIGA) && !defined(MSDOS)
++#ifdef SYSV
++    if (HasSavedTtyState) {
++        ioctl(fileno(stdout), TCSETA, &MyTtyStateOut);
++        ioctl(fileno(stdin), TCSETA, &MyTtyStateIn);
++    }
++#else
++    if (HasSavedTtyState) {
++        stty(fileno(stdout), &MyTtyStateOut);
++        stty(fileno(stdin), &MyTtyStateIn);
++    }
++#endif
++#endif
++}
++
++NeedToAskBeforeExecuting(type)
++char *type;
++{
++    struct NoAskItem *nai;
++    if (!MightAskBeforeExecuting || DoInBackground) return(0);
++    for (nai = FirstNoAskItem; nai; nai = nai->next) {
++        if (CtypeMatch(type, nai->type)) return(0);
++    }
++    return(1);
++}
++
++NeedToBeQuiet(cmd)
++char *cmd;
++{
++    struct NoAskItem *nai;
++    for (nai = FirstQuietItem; nai; nai = nai->next) {
++        if (!lc2strcmp(nai->type, cmd)) return(1);
++    }
++    return(0);
++}
++
++CtypeMatch(ctype, pat)
++char *ctype, *pat;
++{
++    int len;
++    char pat2[200];
++
++    if (!lc2strcmp(ctype, pat)) {
++        return(1); /* exact match, case-insensitive */
++    }
++    if (index(pat, '/') == NULL) {
++        /* implicit wildcard */
++        strcpy(pat2, pat);
++        strcat(pat2, "/*");
++        pat = pat2;
++    }
++    len = strlen(pat);
++    if ((pat[--len] == '*')
++         && (pat[--len] == '/')
++         && (!lc2strncmp(ctype, pat, len))
++         && ((ctype[len] == '/') || (ctype[len] == '\0'))){
++        /* wildcard match */
++        return(1);
++    }
++    return(0);
++}
++
++ExecuteCommand(cmd, really)
++char *cmd;
++int really;
++{
++    int code;
++    if (!Quiet || DoDebug) {
++        if (!NeedToBeQuiet(ShortCommand(cmd))) {
++            printf("---Executing: %s\n", DoDebug ? cmd : ShortCommand(cmd));
++        } else if (EatLeadingNewlines) {
++            printf("\n");
++        } 
++        fflush(stdout);
++    }
++    if (really) {
++        fflush(stdout); fflush(stderr);
++        code = system(cmd);
++        if (DoDebug) printf("Command exit status: %d\n", code);
++#ifdef MSDOS
++	code = 0;	/* system doesn't return a valid exit code on MS-DOS */
++#endif
++        return(code);
++    }
++    return(0);
++}
++
++MkTmpFileName(name)
++char *name;
++{
++  int   length  = MAX_FILE_NAME_SIZE;
++  char* tmpname = NULL;
++
++#ifdef AMIGA
++    strcpy(name, "T:mmXXXXXX");
++    close(mkstemp(name));
++#else
++  #ifndef MSDOS
++    sprintf(name, "%s/mm.XXXXXX", tmproot);
++    close(mkstemp(name));
++  #else
++     strcpy(name, "TXXXXXX");
++     if (!close(mkstemp(name)))
++         name[0] = 0;
++     else
++         if (DoDebug) printf("temp name = \"%s\"\n", name);
++  #endif
++#endif
++     fprintf( stderr, "strlen\n");
++     if (name) 
++       length = strlen(name);
++
++     fprintf( stderr, "after strlen\n");
++     tmpname = malloc( sizeof(char) * length );
++     fprintf( stderr, "after malloc\n");
++     strcpy( tmpname, name );
++     fprintf( stderr, "after strcpy\n");
++     dlist_insertnew( &TmpNameListTail, (void*) tmpname );
++     fprintf( stderr, "after dlistinsert\n");
++     tmpname = NULL;
++}
++
++void
++CleanupTmpFiles( void )
++{
++  DList* help = TmpNameListTail;
++  DList* old = NULL;
++  
++  while (help) {
++    if (unlink( (char*) help->data ) < 0) 
++      if (DoDebug) 
++	fprintf( stderr, "error unlinking %s\n", (char*) help->data );
++    old = help;
++    help = help->prev;
++    free( old );
++  }
++  
++  TmpNameListTail = NULL;
++}
++
++#ifdef AMIGA
++/* We need to execute a command and then remove a file "fileToRemove".
++ * MkRmScript() creates a shell script that accomplishes this. The script
++ * is written to a temporary file. The name of the script is returned.
++ */
++char *
++MkRmScript(command, fileToRemove, nameBuf)
++char *command;
++char *fileToRemove;
++char *nameBuf;
++{
++    FILE *script;
++
++    MkTmpFileName(nameBuf);
++    if ((script = fopen(nameBuf, "w")) == NULL) {
++        fprintf(stderr, "Unable to open %s for writing\n", nameBuf);
++        exit(1);
++    }
++    fprintf(script, ".BRA {\n.KET }\n%s\nDelete %s QUIET\n", command, fileToRemove);
++    fclose(script);
++    return(nameBuf);
++}
++#endif
++
++void
++ConsumeRestOfPart(outfp)
++FILE *outfp;
++{
++    char *Buf;
++    int c;
++
++    if (BoundaryCt <= 0) {
++        while ((c=getc(InputFP)) != EOF) {
++            if (outfp) putc(c, outfp);
++        }
++        return;
++    }
++    Buf = malloc(LINE_BUF_SIZE);
++    if (!Buf) ExitWithError(nomem);
++    while (fgets(Buf, LINE_BUF_SIZE, InputFP)) {
++        if ((BoundaryCt > 0)
++             && (Buf[0] == '-')
++             && (Buf[1] == '-')
++             && PendingBoundary(Buf, Boundaries, &BoundaryCt)) {
++            break;
++        }
++        if (outfp) fputs(Buf, outfp);
++    }
++    free(Buf);
++}
++
++char *paramend(s)
++char *s;
++{
++    int inquotes=0;
++    while (*s) {
++        if (inquotes) {
++            if (*s == '"') {
++                inquotes = 0;
++            } else if (*s == '\\') {
++                ++s; /* skip a char */
++            }
++        } else if (*s == ';') {
++            return(s);
++        } else if (*s == '"') {
++            inquotes = 1;
++        }
++        ++s;
++    }
++    return(NULL);
++}        
++
++void
++ParseContentParameters(ct)
++char *ct;
++{
++    char *s, *t, *eq;
++
++    CParamsUsed = 0;
++    s = index(ct, ';');
++    if (!s) return;
++    *s++ = 0;
++    do {
++        t = paramend(s);
++        if (t) *t++ = 0;
++        eq = index(s, '=');
++        if (!eq) {
++            fprintf(stderr, "Ignoring unparsable content-type parameter: '%s'\n", s);
++            JunkParameter=Cleanse(s);
++        } else {
++            if (CParamsUsed >= CParamsAlloced) {
++                CParamsAlloced += 10;
++                if (CParams) {
++                    CParams = (char **) realloc(CParams, (1+CParamsAlloced) * sizeof (char *));
++                    CParamValues = (char **) realloc(CParamValues, (1+CParamsAlloced) * sizeof (char *));
++                } else {
++                    CParams = (char **) malloc((1+CParamsAlloced) * sizeof (char *));
++                    CParamValues = (char **) malloc((1+CParamsAlloced) * sizeof (char *));
++                }
++                if (!CParams || !CParamValues) ExitWithError(nomem);
++            }
++            *eq++ = 0;
++            s = Cleanse(s);
++            CParams[CParamsUsed] = s;
++            /* strip leading white space */
++            while (*eq && isspace((unsigned char) *eq)) ++eq;
++            /* strip trailing white space */
++            StripTrailingSpace(eq);
++            CParamValues[CParamsUsed++] = eq; 
++            if (DoDebug) printf("NEW PARAMETER: %s VALUE: %s\n", s, eq);
++        }
++        s = t;
++    } while (t);
++}
++
++char *FindParam(s)
++char *s;
++{
++    int i;
++    for (i=0; i<CParamsUsed; ++i) {
++        if (!strcmp(s, CParams[i])) {
++            return(CParamValues[i]);
++        }
++    }
++    return(NULL);
++}
++
++#ifdef MSDOS
++system2(s)
++char *s;
++{
++    printf("system2: \"%s\"\n", s);
++    return(0);
++}
++#endif
++
++strcatquoting(s1, s2)
++char *s1;
++char *s2;
++{
++    strcat(s1, s2);
++#ifdef NOTDEF
++    while (*s1) ++s1;
++    while (*s2) {
++        if (*s2 == '\"' || *s2 == '\\') *s1++ = '\\';
++        *s1++ = *s2++;
++    }
++    *s1 = '\0';
++#endif
++}
++
++PauseForUser() {
++#if defined(MSDOS) || defined(AMIGA)
++    char Buf[100];
++#endif
++
++    if (DefinitelyNotTty || MustNotBeTty) return;	
++#if defined(MSDOS) || defined(AMIGA)
++    printf("Press RETURN to go on\n");
++    gets(Buf);
++#else
++    fflush(stdout);
++    SaveTtyState();
++    if (StartRawStdin() != -1) {
++        printf("--Press any key to go on.--");
++    } else {
++        printf("Press RETURN to go on.\n");
++    }
++    fflush(stdout);
++    getchar();
++    RestoreTtyState();
++    printf("\n");
++#endif
++}
++
++StartRawStdin() {
++#if !defined(AMIGA) && !defined(MSDOS)
++#ifdef SYSV
++    struct termio   orterm, fterm;
++    ioctl(0, TCGETA, &orterm);	/* get current (i.e. cooked) termio */
++    fterm = orterm;		/* get termio to modify */
++
++    fterm.c_lflag &= ~ICANON;	/* clear ICANON giving raw mode */
++    fterm.c_cc[VMIN] = 1;	/* set MIN char count to 1 */
++    fterm.c_cc[VTIME] = 0;	/* set NO time limit */
++    return ioctl(0, TCSETAW, &fterm);	/* modify termio for raw mode */
++#else
++    struct sgttyb ts;
++    gtty(fileno(stdin), &ts);
++    ts.sg_flags |= RAW;
++    return stty(fileno(stdin), &ts);
++#endif
++#else
++    return(-1);
++#endif
++}
++
++
++int IsDirectory(fname)
++char *fname;
++{
++    struct stat stbuf;
++    if (stat(fname, &stbuf)) {
++	return(-1);
++    }
++    return (((stbuf.st_mode & S_IFMT) == S_IFDIR) ? 1 : 0);
++}
++
+--- metamail-2.7.orig/src/metamail/environment.c
++++ metamail-2.7/src/metamail/environment.c
+@@ -0,0 +1,181 @@
++/* Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++
++Permission to use, copy, modify, and distribute this material 
++for any purpose and without fee is hereby granted, provided 
++that the above copyright notice and this permission notice 
++appear in all copies, and that the name of Bellcore not be 
++used in advertising or publicity pertaining to this 
++material without the specific, prior written permission 
++of an authorized representative of Bellcore.  BELLCORE 
++MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++*/
++
++/* environment.c - contains (nearly) everything for the environmenthandling
++   
++   Author: Michael Moerz <mikem@debian.org>
++*/
++
++#include "metamail.h"
++#include "environment.h"
++
++/** adds a string to the current environmet variable PATH
++    @param auxpath path to add to $PATH (=auxiliary path)
++*/
++void
++addToPath(auxpath)
++char *auxpath;
++{
++  if (auxpath && *auxpath) {    /* when pointer and auxpath[0] are != NULL */
++    static char *newpath = 0;    /* is needed! since it becomes part ov ENV */
++    char *oldpath = newpath;
++    char *path = getenv("PATH");
++    
++    if (!path) path = "";	 /* give a default if no current path */
++    newpath = XMALLOC(char, (7 + strlen(path) + strlen(auxpath)));
++    sprintf(newpath, "PATH=%s:%s", auxpath, path);
++    putenv(newpath);
++    if (oldpath) XFREE(oldpath); /* free up any old allocated PATH */
++  }
++}
++
++/** initialize global variable mailheaders from environment
++    this code is needed at several places -> own function
++*/
++void
++initMailHeadersFromEnvironment() {
++  mailheaders = getenv("MM_HEADERS");
++  if (mailheaders) {
++    char *s;
++    s = XMALLOC(char, 15+strlen(mailheaders));
++    sprintf(s, "MM_HEADERS=%s", mailheaders);
++    /* error? free mailheaders? */
++    mailheaders = s;
++  }
++}  
++
++/** initializes variables from environment variables or sets them to default
++    values if they are not found in the environment
++*/
++void
++initVarsFromEnvironment() {
++  char *QuietStr = NULL, *NoAskStr = NULL;
++
++  /* temporary directory - where all temporary files are created */
++  tmproot = getenv("METAMAIL_TMPDIR");
++  if (!tmproot) {
++    tmproot = XMALLOC(char, 5);
++    strcpy(tmproot, "/tmp");
++  }
++
++  /* */
++  initMailHeadersFromEnvironment();
++
++  /* the quietstring that can turn off output for various things */
++  QuietStr = getenv("MM_QUIET");
++  if (!QuietStr) /* when not set in the environment set default */
++    QuietStr = QuietDefault;
++  /* now either we are always quiet (="1") or we have to create a structure
++     containing information about when we have to be quiet
++  */
++  if (!strcmp(QuietStr, "1")) { /* when Quietstr == "1" */
++    Quiet = 1;
++  } else {
++    struct NoAskItem *qitem;
++    char *s, *tmp;
++    char *QuietCopy;
++
++    Quiet = 0;
++    QuietCopy = XMALLOC(char, 1+strlen(QuietStr));
++    strcpy(QuietCopy, QuietStr);
++    for (tmp=QuietCopy; *tmp; ++tmp) {
++      if (isupper((unsigned char) *tmp)) 
++	*tmp = tolower((unsigned char) *tmp);
++    }
++    do {
++      s = index(QuietCopy, ',');
++      if (s) *s++ = 0;
++      qitem = XMALLOC(struct NoAskItem, 1);
++      qitem->next = FirstQuietItem;
++      qitem->type = QuietCopy;
++      FirstQuietItem = qitem;
++      QuietCopy = s;
++    } while (QuietCopy);
++  }
++
++  /* */
++  if (getenv("MM_TRANSPARENT")) {
++    /* Will not propogate recursively */
++    TransparentMode = atoi(getenv("MM_TRANSPARENT"));
++  }
++
++  /* override for allowing to run as root -- DANGER WILL ROBINSON */
++  if (getenv("MM_RUNASROOT")) {
++    RunAsRootOK = atoi(getenv("MM_RUNASROOT"));
++  }
++
++  /* */
++  if (getenv("MM_YANKMODE")) {
++    /* Will not propogate recursively */
++    YankMode = atoi(getenv("MM_YANKMODE"));
++  }
++
++  /* debug flag */
++  if (getenv("MM_DEBUG")) {
++    DoDebug = atoi(getenv("MM_DEBUG"));
++  }
++
++  /* put that somewhere else */
++  if (DoDebug) 
++    printf("Metamail Version %s, debugging turned on.\n", mmversion);
++
++  /* similar to quiet */
++  NoAskStr = getenv("MM_NOASK");
++  if (!NoAskStr) /* when noask not set in the ENV then init to default */
++    NoAskStr = NoAskDefault;
++  if (!strcmp(NoAskStr, "1")) {
++    MightAskBeforeExecuting = 0;
++  } else {
++    struct NoAskItem *nai;
++    char *s, *tmp;
++    char *NoAskCopy;
++    
++    NoAskCopy = XMALLOC(char, 1+strlen(NoAskStr));
++    strcpy(NoAskCopy, NoAskStr);
++    for (tmp=NoAskCopy; *tmp; ++tmp) {
++      if (isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
++    }
++    do {
++      s = index(NoAskCopy, ',');
++      if (s) *s++ = 0;
++      nai = XMALLOC(struct NoAskItem, 1);
++      nai->next = FirstNoAskItem;
++      nai->type = NoAskCopy;
++      FirstNoAskItem = nai;
++      NoAskCopy = s;
++    } while (NoAskCopy);
++  }
++
++  /* hmm, perhaps mailprogram name ? */
++  MailerName = getenv("MM_MAILER");
++  if (!MailerName)
++    MailerName = "unknown";
++
++  /* */
++  if (getenv("MM_USEPAGER")) {
++    MaybePageOutput = atoi(getenv("MM_USEPAGER"));
++  }
++
++  /* setting if we have a tty or not */
++  if ((getenv("MM_NOTTTY") && ((atoi(getenv("MM_NOTTTY"))) != 0))) {
++    MustNotBeTty = 1;
++  }
++  if (MustNotBeTty
++      || !isatty(0)
++      || !isatty(1)) {
++    DefinitelyNotTty = 1;
++  }
++  
++  
++}
+--- metamail-2.7.orig/src/metamail/metamail_default.h
++++ metamail-2.7/src/metamail/metamail_default.h
+@@ -0,0 +1,9 @@
++#ifndef METAMAIL_DEFAULT_H
++#define METAMAIL_DEFAULT_H 1
++
++char *mmversion = MM_VERSTRING;
++char *NoAskDefault = "text,text/plain,text/richtext";
++char *QuietDefault = CATCOMMAND;
++char *tmproot="";
++
++#endif /* METAMAIL_DEFAULT_H */
+--- metamail-2.7.orig/src/metamail/dlistold.c
++++ metamail-2.7/src/metamail/dlistold.c
+@@ -0,0 +1,120 @@
++// Copyright: Michael Moerz 2000
++//
++// This program is free software; you can redistribute it and/or modify
++// it under the terms of the GNU General Public License as published by
++// the Free Software Foundation; either version 2 of the License, or
++// (at your option) any later version.
++//
++// This program is distributed in the hope that it will be useful,
++// but WITHOUT ANY WARRANTY; without even the implied warranty of
++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++// GNU General Public License for more details.
++//
++// You should have received a copy of the GNU General Public License with
++// the Debian GNU/Linux distribution in file /usr/share/doc/common-licenses/GPL
++// if not, write to the Free Software Foundation, Inc., 59 Temple Place,
++// Suite 330, Boston, MA  02111-1307  USA
++
++
++#include <stdlib.h>
++#include "dlist.h"
++
++/* create a new dlist node containing data */
++DList* 
++dlist_new(void* data) {
++  DList* new = malloc( sizeof(DList) * 1 );
++  
++  new->next = NULL;
++  new->prev = NULL;
++  new->data = data;
++
++  return new;
++}
++
++/* concatenate two lists */
++void
++dlist_cat(DList* tail_l1, DList* head_l2){
++  tail_l1->next = head_l2;
++  head_l2->prev = tail_l1; 
++}
++
++/* to shorten things a bit in some cases */
++DList*
++dlist_insertnew(DList** tail, void* data) {
++  DList* new = dlist_new( data );
++  return dlist_insert( tail, new );
++}
++
++/* can also be used to append to a list */
++DList*
++dlist_insert(DList** tail, DList* new) {
++  if ( (*tail) ) {
++    new->next = (*tail)->next;
++    (*tail)->next = new;
++    new->prev = (*tail);
++  }     
++
++  if ( new->next )  // if next is defined, then set its prev value correctly
++    new->next->prev = new;
++  else
++    (*tail) = new;
++  
++  return new;
++}
++
++/* retrieves the head of a list */
++DList* 
++dlist_head(DList* head){
++  DList* old;
++
++  while( head ) {
++    old = head;
++    head = head->prev;
++  }
++  
++  return old;
++}
++
++/* retrieves the tail of a list */
++DList* 
++dlist_tail(DList* head){
++  DList* old;
++
++  while( head ) {
++    old = head;
++    head = head->next;
++  }
++  
++  return old;
++}
++
++/* returns the length of the list */
++size_t 
++dlist_length(DList* head){
++  size_t n;
++
++  for (n = 0; head; ++n)
++    head = head->next;
++
++  return n;
++}
++
++/* removes an entry from the list, and returns it so that it might
++   be destroyed properly */
++DList*
++dlist_remove(DList** head, DList** tail, DList* entry) {
++  if (entry != (*head)) {  // when not head
++    if (entry->prev)       // and a previous entry exists
++      entry->prev->next = entry->next; // tell the previous our next entry
++  } else
++    (*head) = entry->next; // otherwise next entry is head
++        
++  if (entry != (*tail)) {  // when not tail
++    if (entry->next)       // and next entry exists
++      entry->next->prev = entry->prev; // tell the next entry our previous one
++  } else
++    (*tail) = entry->prev; // otherwise previous is tail
++
++  return entry;
++}
++
+--- metamail-2.7.orig/src/metamail/dlistold.h
++++ metamail-2.7/src/metamail/dlistold.h
+@@ -0,0 +1,36 @@
++// Copyright: Michael Moerz 2000
++//
++// This program is free software; you can redistribute it and/or modify
++// it under the terms of the GNU General Public License as published by
++// the Free Software Foundation; either version 2 of the License, or
++// (at your option) any later version.
++//
++// This program is distributed in the hope that it will be useful,
++// but WITHOUT ANY WARRANTY; without even the implied warranty of
++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++// GNU General Public License for more details.
++//
++// You should have received a copy of the GNU General Public License with
++// the Debian GNU/Linux distribution in file /usr/share/doc/common-licenses/GPL
++// if not, write to the Free Software Foundation, Inc., 59 Temple Place,
++// Suite 330, Boston, MA  02111-1307  USA
++
++#ifndef DRF_LIST_H
++#define DRF_LIST_H 1
++
++typedef struct dlist {
++  struct dlist* next;
++  struct dlist* prev;
++  void* data;
++} DList;
++
++extern DList* dlist_new        (void* data);
++extern void   dlist_cat        (DList* tail_l1, DList* head_l2);
++extern DList* dlist_insertnew  (DList** tail, void* data);
++extern DList* dlist_insert     (DList** tail, DList* new);
++extern DList* dlist_head       (DList* head);
++extern DList* dlist_tail       (DList* head);
++extern size_t dlist_length     (DList* head);
++extern DList* dlist_remove     (DList** head, DList** tail, DList* entry);
++
++#endif /* !DRF_LIST_H */
+--- metamail-2.7.orig/src/metamail/includeaway
++++ metamail-2.7/src/metamail/includeaway
+@@ -0,0 +1,97 @@
++#ifdef BORLAND
++#define F_OK 0
++extern unsigned _stklen = 16384;
++extern char *mktemp(char *);
++#define WRITE_BINARY	"w"
++#else /* BORLAND */
++#ifdef MICROSOFT
++#include <malloc.h>
++#include <stdlib.h>
++#include <time.h>
++#include <signal.h>
++#define F_OK 0
++#else
++
++#ifndef AMIGA
++#ifdef SYSV
++//#include <termio.h>
++//#include <unistd.h>
++#else /* SYSV */
++#include <sgtty.h>
++#endif /* SYSV */
++#endif /* AMIGA */
++#endif /* MICROSOFT */
++#endif /* BORLAND */
++
++//#if defined(SYSV) && !defined(linux)
++//#define LPRTEMPLATE "lp %s"
++//#define LPRCOMMAND "lp"
++//#else
++//#define LPRTEMPLATE "lpr %s"
++//#define LPRCOMMAND "lpr"
++
++#endif
++#ifdef MSDOS
++#define CATCOMMAND  "cat"
++#define CATTEMPLATE "cat %s"
++#define METAMAIL    "metamail"
++#define TMPFILE_NAME_SIZE   128
++#define MAX_FILE_NAME_SIZE 128
++#define WRITE_BINARY	"wb"
++#else /* MSDOS */
++#ifdef AMIGA
++extern char *MkRmScript();
++#ifndef F_OK
++#define F_OK (0)
++#endif
++#define CATCOMMAND  "Type"
++#define CATTEMPLATE "Type %s"
++#define METAMAIL    "metamail <*"
++#define TMPFILE_NAME_SIZE     50
++#define MAX_FILE_NAME_SIZE 256
++#define WRITE_BINARY	"w"
++#else /* AMIGA */
++//extern char **environ, *gets();
++//#define CATCOMMAND  "cat"
++//#define CATTEMPLATE "cat %s"
++//#define METAMAIL    "metamail"
++//#define TMPFILE_NAME_SIZE   1000
++//#define MAX_FILE_NAME_SIZE 1000
++//#define WRITE_BINARY	"w"
++#endif /* AMIGA */
++#endif /* MSDOS */
++
++//#ifndef NO_RLIMITS
++//#include <sys/resource.h>
++//#endif
++
++//#define CMDSIZE 1200 /* Maximum size of command to execute */
++
++//#define LINE_BUF_SIZE       2000
++
++#ifndef MICROSOFT
++extern char *malloc();
++extern char *realloc();
++#endif
++
++//extern FILE *popen();
++//static char *nomem = "Out of memory!";
++//static char *mmversion = MM_VERSTRING;
++//static char *NoAskDefault = "text,text/plain,text/richtext";
++//static char *QuietDefault = CATCOMMAND;
++//static char *tmproot="";
++
++//#define ENCODING_NONE 0
++//#define ENCODING_BASE64 1
++//#define ENCODING_QUOTEDPRINTABLE 2
++//#define ENCODING_8BIT 3
++//#define ENCODING_UUENCODE -1	/* non-standard */
++
++#ifdef MICROSOFT
++/* Need a function prototype for TryMailcapEntry because without it MSC
++ * passes a pointer to the structure rather than the structure itself.
++ */
++TryMailcapEntry(struct MailcapEntry mc, char *SquirrelFile);
++#endif
++
++
+--- metamail-2.7.orig/src/metamail/mimencode.c
++++ metamail-2.7/src/metamail/mimencode.c
+@@ -0,0 +1,95 @@
++/*
++Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++
++Permission to use, copy, modify, and distribute this material 
++for any purpose and without fee is hereby granted, provided 
++that the above copyright notice and this permission notice 
++appear in all copies, and that the name of Bellcore not be 
++used in advertising or publicity pertaining to this 
++material without the specific, prior written permission 
++of an authorized representative of Bellcore.  BELLCORE 
++MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++*/
++#include <metamail/common.h>
++
++//#ifdef MSDOS
++//#include <fcntl.h>
++//#endif
++
++#define BASE64 1
++#define QP 2 /* quoted-printable */
++
++main(argc, argv)
++int argc;
++char **argv;
++{
++    int encode = 1, which = BASE64, i, portablenewlines = 0;
++    FILE *fp = stdin;
++    FILE *fpo = stdout;
++
++    for (i=1; i<argc; ++i) {
++        if (argv[i][0] == '-') {
++	    switch (argv[i][1]) {
++		case 'o':
++		    if (++i >= argc) {
++			fprintf(stderr, "mimencode: -o requires a file name.\n");
++			exit(-1);
++		    }
++		    fpo = fopen(argv[i], "w");
++		    if (!fpo) {
++			perror(argv[i]);
++			exit(-1);
++		    }
++		    break;
++                case 'u':
++                    encode = 0;
++                    break;
++                case 'q':
++                    which = QP;
++                    break;
++                case 'p':
++                    portablenewlines = 1;
++                    break;
++                case 'b':
++                    which = BASE64;
++                    break;
++		default:
++                    fprintf(stderr,
++                       "Usage: %s [-u] [-q] [-b] [-p] [-o outputfile] [file name]\n", *argv);
++                    exit(-1);
++            }
++        } else {
++	  //#ifdef MSDOS
++	  //            if (encode)
++          //      fp = fopen(argv[i], "rb");
++          //  else
++          //  {
++          //      fp = fopen(argv[i], "rt");
++          //      setmode(fileno(fpo), O_BINARY);
++          //  } /* else */
++	  //#else
++            fp = fopen(argv[i], "r");
++	    //#endif /* MSDOS */
++            if (!fp) {
++                perror(argv[i]);
++                exit(-1);
++            }
++        }
++    }
++    //#ifdef MSDOS
++    //if (fp == stdin) setmode(fileno(fp), O_BINARY);
++    //#endif /* MSDOS */
++    if (which == BASE64) {
++        if (encode) {
++            to64(fp, fpo, portablenewlines);
++        } else {
++            from64(fp,fpo, (char **) NULL, (int *) 0, portablenewlines);
++        }
++    } else {
++        if (encode) toqp(fp, fpo); else fromqp(fp, fpo, NULL, 0);
++    }
++    return(0);
++}
++
+--- metamail-2.7.orig/src/metamail/tmpfile.c
++++ metamail-2.7/src/metamail/tmpfile.c
+@@ -0,0 +1,120 @@
++#include <metamail/common.h>
++#include <metamail/dlist.h> /* double linked list management */
++
++#include "tmpfile.h"
++#include "metamail.h"
++
++DList TmpNameList = { NULL, NULL };
++
++void
++MkTmpFileName(name)
++     char *name;
++{
++  int   tmpfd   = 0;
++
++  if (DoDebug) 
++    fprintf(stderr, "MkTmpFileName:\n");
++
++  if (!name) {
++    if (DoDebug)
++      fprintf(stderr, "name is null\nMkTmpFileName END\n");
++    return;
++  }
++  
++  strcpy(name, tmproot);
++  strcat(name, "/MXXXXXX");
++ 
++  if ((tmpfd = mkstemp(name)) > 0) {
++    if (close(tmpfd) == -1) {
++      metamail_warning( "couldn't close tmpfile: ", xstrerror( errno ) );
++      name[0] = 0;
++      return;
++    }
++    if (DoDebug)
++      fprintf(stderr, "name = \"%s\"\n", name);
++    AddTmpFileName( name );
++    if (DoDebug)
++      fprintf( stderr, "MkTmpFileName END\n", name);
++  } else {
++    metamail_warning( "couldn't optain tmpfile: ", xstrerror( errno ) );
++    return;
++  }
++}
++
++void
++AddTmpFileName(name)
++     char *name;
++{
++  char *tmpname = NULL;
++  if ( name ) {
++    tmpname = XMALLOC( char, strlen(name) + 1 );
++  
++    strcpy( tmpname, name );
++    dlist_insertnew( &TmpNameList, (void*) tmpname, TmpNameList.tail );
++    if (DoDebug)
++      fprintf( stderr, "AddTmpFileName: %s\n", name );
++  }
++}
++
++void
++DelTmpFileName(name)
++     char *name;
++{
++  DListEntry *help = NULL;
++  
++  if ( (help = dlist_remove( &TmpNameList, dlist_search( &TmpNameList, name, 
++							 dlist_strcmp ) ) ) ) {
++    XFREE( help->data );
++    XFREE( help );
++  } else
++    fprintf(stderr, "tried to remove non tmplist file %s\n", name);
++}
++
++void
++RmTmpFileName(name)
++     char *name;
++{
++  DListEntry* help = NULL;
++  
++  if (DoDebug) 
++    fprintf( stderr, "RmTmpFileName:\n" );
++
++  if( (help = dlist_remove( &TmpNameList, 
++			    dlist_search( &TmpNameList, name, 
++					  dlist_strcmp ) ) ) ) {
++    if (DoDebug) fprintf( stderr, "filename: %s\n", name );
++    if (!access( name, R_OK ) ) { 
++      if(unlink( name ) == -1)
++	metamail_error( stderr, "error unlinking: ", xstrerror( errno ) );
++    }
++    XFREE( help->data );
++    XFREE( help );
++  }
++}
++
++void
++CleanupTmpFiles( void )
++{
++  DListEntry* help = NULL;
++  
++  if (DoDebug) 
++    fprintf( stderr, "CleanupTmpFiles:\n" );
++
++  while ( TmpNameList.head ) {
++    if (DoDebug) fprintf(stderr, "tmpfile: %s  %X\n", TmpNameList.head->data,
++			 TmpNameList.head->next);
++    if (!access( (char*) TmpNameList.head->data, R_OK )) {
++      if (DoDebug) fprintf( stderr, "access file yes\n" );
++      if (unlink( (char*) TmpNameList.head->data ) < 0) {
++	if (DoDebug) 
++	  metamail_error( stderr, "error unlinking: ", 
++			  (char*) TmpNameList.head->data );
++      }
++    }
++    
++    help = dlist_remove( &TmpNameList, TmpNameList.head );
++    if (DoDebug) fprintf( stderr, "%X\n", help );
++    XFREE( help->data );
++    XFREE( help );
++  }
++}
+--- metamail-2.7.orig/src/metamail/splitmail.c
++++ metamail-2.7/src/metamail/splitmail.c
+@@ -0,0 +1,434 @@
++/*
++Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++
++Permission to use, copy, modify, and distribute this material 
++for any purpose and without fee is hereby granted, provided 
++that the above copyright notice and this permission notice 
++appear in all copies, and that the name of Bellcore not be 
++used in advertising or publicity pertaining to this 
++material without the specific, prior written permission 
++of an authorized representative of Bellcore.  BELLCORE 
++MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++*/
++/****************************************************** 
++    Metamail -- A tool to help diverse mail readers 
++                cope with diverse multimedia mail formats.
++
++    Author:  Nathaniel S. Borenstein, Bellcore
++
++ ******************************************************* */
++
++#include <metamail/common.h>
++
++#define MINCHUNKSIZE 20000 /* Better be enough to hold the headers, or we die! */
++
++extern char *getenv();
++extern char *getmyname();
++#define NORMALDELIVERYCMD "/usr/sbin/sendmail -t -oi"
++#define VERBOSEDELIVERYCMD "/usr/sbin/sendmail -t -v -oi"
++
++usageexit() {
++    fprintf(stderr, "Usage:  splitmail [-d] [-v] [-s splitsize] [-i id-suffix] [-p prefix] [file-name]\n");
++    exit(-1);
++}
++
++char *MonthNames[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
++char *DayNames[] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
++
++char *
++endofheader(s)
++char *s;
++{
++    char *orgs = s, c;
++    while (1) {
++	s = index(s, '\n');
++	if (!s) return(orgs+strlen(orgs));
++	c = *(s+1);
++        if (c != ' ' && c != '\t') return(s);
++        ++s;
++    }
++}
++
++main(argc, argv)
++char **argv;
++{
++    int i, DoDeliver=0, SplitSize=DEFAULT_SPLIT_SIZE, dum, InNewline=1, bytesread, whichpart=1, Verbose=0, numparts = -1, c;
++    char *fname = NULL, *bigbuf, *s, *SharedHeaders, *headend, *from, id[100], *deliverycmd, *prefix, SubjectBuf[250];
++    char *MessageID = 0, *OrigID=NULL;
++    FILE *fp;
++
++    s = getenv("METAMAIL_TMPDIR");
++    if (s) {
++        prefix = malloc(10+strlen(s));
++        if (!prefix) {
++            fprintf(stderr, "splitmail: Not enough memory\n");
++            exit(-1);
++        }
++        sprintf(prefix, "%s/split.", s);
++    } else {
++        prefix = "/tmp/split.";
++    }
++    s = getenv("SPLITSIZE");
++    if (s) {
++        dum = atoi(s);
++        if (dum < MINCHUNKSIZE) {
++            fprintf(stderr, "Ignoring SPLITSIZE environment variable of %d -- the minimum value is %d\n", dum, MINCHUNKSIZE);
++        } else {
++            SplitSize = dum;
++        }
++    }
++    for (i=1; i<argc; ++i) {
++	if (argv[i][0] == '-') {
++	    switch (argv[i][1]) {
++		case 's':
++		    if (++i >= argc) usageexit();
++		    dum = atoi(argv[i]);
++		    if (dum < MINCHUNKSIZE && dum >= 0) {
++			fprintf(stderr, "splitmail: Using minimum splitsize of %d\n", MINCHUNKSIZE);
++			dum = MINCHUNKSIZE;
++			
++		    }
++		    SplitSize = dum;
++		    break;
++		case 'd':
++		    DoDeliver = 1;
++                    break;
++                case 'p':
++		    if (++i >= argc) usageexit();
++                    prefix = argv[i];
++                    break;
++ 		case 'i':
++ 		    if( ++i >= argc) usageexit();
++ 		    MessageID = argv[i];
++ 		    break;
++		case 'v':
++		    Verbose = 1;
++		    break;
++		default:
++		    usageexit();
++	    }
++	} else {
++	    if (fname) usageexit();
++	    fname = argv[i];
++	}
++    }
++    bigbuf = malloc(100+SplitSize);
++    if (!bigbuf) {
++	fprintf(stderr, "splitmail:  Not enough memory for %d-byte chunks\n", SplitSize);
++	exit(-1);
++    }
++    SplitSize -= 1000; /* gives fudge factor for headers, line endings */
++    if (fname) {
++        struct stat stbuf;
++        if (!stat(fname, &stbuf)) {
++            /* Note:  this will sometimes be 1 too high when it is a very close call,
++              because of the desire to have complete lines.  In such cases, we send
++              a null final part */
++            numparts = 1 + (stbuf.st_size / SplitSize);
++        }
++	fp = fopen(fname, "r");
++	if (!fp) {
++	    fprintf(stderr, "splitmail: Cannot read file %s\n", fname);
++	    exit(-1);
++	}
++    } else fp = stdin;
++    headend = bigbuf;
++    while((c=getc(fp)) != EOF) {
++        if (headend >= bigbuf + SplitSize) {
++            fprintf(stderr, "splitmail: Could not find the end of the headers!\n");
++            exit(-1);
++        }
++	*headend++ = c;
++	if (c == '\n') {
++	    if (InNewline) break; /* end of headers */
++	    InNewline = 1;
++	} else {
++	    InNewline = 0;
++	}
++    }
++    if (c == EOF) {
++	fprintf(stderr, "splitmail: Could not find the end of the headers!\n");
++	exit(-1);
++    }
++    *headend = '\0';
++    SharedHeaders = malloc(1+strlen(bigbuf)); /* maximum size needed */
++    if (!SharedHeaders) {
++	fprintf(stderr, "splitmail: Not enough memory\n");
++	exit(-1);
++    }
++    from = bigbuf;
++    *SharedHeaders = '\0';
++    strcpy(SubjectBuf, "Partial Message");
++    while (from < headend) {
++	s = endofheader(from);  /* would be index(from, '\n'),
++				 but need to check for continuation lines */
++        *s = '\0';
++	if (ShareThisHeader(from, SubjectBuf, sizeof (SubjectBuf), &OrigID)) {
++	    strcat(SharedHeaders, from);
++	    strcat(SharedHeaders, "\n");
++	}
++	*s = '\n';
++	from = ++s;
++    }
++    //#ifdef AMIGA
++    //snprintf(id, sizeof(id), "%d.%s@%s%s", time(0), SeqToName(GetSequence(4)), FindConfig("NodeName"),
++    //       FindConfig("DomainName"));
++    //#else
++    //#ifdef MSDOS
++    //snprintf(id, sizeof(id), "%ld.UNKNOWN.SITE.NAME", time(NULL)); // BCR
++    //#else
++    snprintf(id, sizeof(id), "%d.%d.%d.%s", (int) getuid(), (int) getpid(), (int) time(0), getmyname());
++    //#endif /* MSDOS */
++    //#endif /* AMIGA */
++    bytesread = headend - bigbuf;
++    deliverycmd = Verbose ? VERBOSEDELIVERYCMD : NORMALDELIVERYCMD;
++    while (!feof(fp)) {
++	while (SplitSize > bytesread && !feof(fp)) {
++	    /* Need to loop because fread is weird */
++	    bytesread += fread(bigbuf + bytesread, sizeof(char), SplitSize - bytesread, fp);
++	}
++	/* Now complete the line */
++	while((c=getc(fp)) != EOF) {
++	    bigbuf[bytesread++] = c;
++	    if (c=='\n') break;
++	}
++        bigbuf[bytesread] = '\0';
++        if (feof(fp) && numparts <= 0) numparts = whichpart;
++        HandleOnePart(DoDeliver, deliverycmd, prefix, numparts, whichpart, SharedHeaders, SubjectBuf, id, MessageID, bigbuf, OrigID);
++	bytesread = 0;
++	++whichpart;
++    }
++    while (whichpart <= numparts) {
++        /* Our guess as to how many parts was OFF, hopefully only by one */
++        *bigbuf = '\0'; /* have to deliver an empty part, ugh! */
++        HandleOnePart(DoDeliver, deliverycmd, prefix, numparts, whichpart, SharedHeaders, SubjectBuf, id, MessageID, bigbuf, OrigID);
++        ++whichpart;
++    }
++    return(0);
++}
++
++HandleOnePart(DoDeliver, deliverycmd, prefix, numparts, whichpart, SharedHeaders, SubjectBuf, id, MessageID, bigbuf, OrigID)
++int DoDeliver, numparts, whichpart;
++char *deliverycmd, *prefix, *SharedHeaders, *SubjectBuf, *id, *MessageID, *bigbuf, *OrigID;
++{
++    FILE *fpout;
++    char OutputFile[1000];
++    int code;
++    //    struct  timeval	tp;
++    // struct  timezone	tzp;
++    char    *tm_zone;
++
++    if (DoDeliver) {
++        fpout = popen(deliverycmd, "w");
++    } else {
++    	int fd;
++        snprintf(OutputFile, sizeof(OutputFile), "%s%d", prefix, whichpart);
++        remove(OutputFile);
++        fpout = NULL;
++        fd = open(OutputFile, O_WRONLY|O_CREAT|O_EXCL, 0600);
++        if (fd != -1) fpout = fdopen(fd, "w");
++    }
++    if (!fpout) {
++	fprintf(stderr, "splitmail: Can't open %s for writing\n", DoDeliver ? deliverycmd : OutputFile);
++        exit(-1);
++    }
++    if (numparts != 1) { /* one-parters end up not changed at all! */
++        struct tm *gt;
++        time_t clock;
++        int secsoff, hrsoff, minsoff;
++        char signoff='+';
++
++	fputs(SharedHeaders, fpout);
++	if (OrigID) fprintf(fpout, "References: %s\n", OrigID);
++
++        clock=time(0);
++        gt = (struct tm*) gmtime(&clock);
++        hrsoff=minsoff=0;
++        fprintf(fpout, "Date: %s, %02d %s %d %02d:%02d:%02d %c%02d%02d (GMT)\n", DayNames[gt->tm_wday],
++                 gt->tm_mday, MonthNames[gt->tm_mon], 1900+gt->tm_year, gt->tm_hour,
++                 gt->tm_min, gt->tm_sec, signoff, hrsoff, minsoff);
++	//#else
++        //clock=time(0);
++        //gt = localtime(&clock);
++	//gettimeofday(&tp, &tzp);
++	//tm_zone = (char *)timezone(tzp.tz_minuteswest, gt->tm_isdst);
++	//secsoff = tzp.tz_minuteswest * 60;
++	//#else
++        secsoff= gt->tm_gmtoff;
++	//#endif
++        if (secsoff < 0) {
++            signoff = '-';
++            secsoff *= -1;
++        }
++        hrsoff = secsoff / 3600;
++        minsoff = (secsoff - (3600*hrsoff)) / 60;
++        fprintf(fpout, "Date: %s, %02d %s %d %02d:%02d:%02d %c%02d%02d (%s)\n",
++		DayNames[gt->tm_wday], gt->tm_mday, MonthNames[gt->tm_mon],
++		1900+gt->tm_year, gt->tm_hour, 
++		gt->tm_min, gt->tm_sec, signoff, hrsoff, minsoff, gt->tm_zone);
++
++        if( MessageID) {
++            fprintf(fpout, "Message-Id: <%d.%s.%s>\n",whichpart,id,MessageID);
++        }
++        fprintf(fpout, "Subject: %s (part %d of ", SubjectBuf, whichpart);
++        if (numparts > 0) {
++            fprintf(fpout, "%d)\n", numparts);
++        } else {
++            fprintf(fpout, "several)\n");
++        }
++        fprintf(fpout, "Content-type: message/partial; id=\"%s\"; number=%d", id, whichpart);
++        if (numparts > 0) fprintf(fpout, "; total=%d", numparts);
++        fprintf(fpout, "\nMIME-Version: 1.0\n\n");
++    }
++    fputs(bigbuf, fpout);
++    code = DoDeliver ? pclose(fpout) : fclose(fpout);
++    if (code) {
++        fprintf(stderr, "splitmail: %s of part %d failed\n", DoDeliver ? "Delivery" : "Writing", whichpart);
++        if (whichpart > 1) fprintf(stderr, "  (previous %d parts may have succeeded)\n", whichpart -1);
++        exit(-1);
++    }
++}
++
++static char *SharedHeads[] = {
++    "from",
++    "to",
++    "cc",
++    "bcc",
++    "newsgroup",
++    "newsgroups",
++    NULL
++};
++
++ShareThisHeader(s, SubjectBuf, size, OrigID)
++char *s;
++char *SubjectBuf;
++size_t size;
++char **OrigID;
++{
++    int i;
++    char *colon = index(s, ':');
++    if (!colon) return(0); /* don't share it in all parts */
++    *colon = '\0';
++    if (!ULstrcmp(s, "message-id")) {
++        *colon = ':';
++	*OrigID = malloc(1+strlen(++colon));
++	if (! *OrigID) {
++	    fprintf(stderr, "splitmail: Not enough memory\n");
++	    exit(-1);
++	}
++	while (*colon && isspace(*colon)) {++colon;}
++        strcpy(*OrigID, colon);
++        return(0);
++    }
++    if (!ULstrcmp(s, "subject")) {
++        *colon = ':';
++        strncpy(SubjectBuf, ++colon, size);
++        SubjectBuf[size - 1] = '\0';
++        return(0);
++    }
++    if (!ULstrcmp(s, "content-type")) {
++        if (IllegalContentType(colon+1)) {
++            fprintf(stderr, "splitmail: message has illegal content-type header, delivery cancelled.\n");
++            exit(-1);
++        }
++    }
++    for (i=0; SharedHeads[i]; ++i) {
++	if (!ULstrcmp(s, SharedHeads[i])) break;
++    }
++    *colon = ':';
++    return(SharedHeads[i] ? 1 : 0);
++}
++
++static char *tspecials = "()<>@,;:\\\"/[]?.=";
++
++IllegalContentType(ctype)
++char *ctype;
++{
++    char *ct, *semicolon, *st, *s, *param, *eq, *matcheq;
++    ct = malloc(1+strlen(ctype));
++    if (!ct) {
++        fprintf(stderr, "splitmail: out of memory!\n");
++        exit(-1);
++    }
++    strcpy(ct, ctype);
++    semicolon = index(ct, ';');
++    if (semicolon) *semicolon = 0;
++    st = index(ct, '/');
++    if (!st) {
++        fprintf(stderr, "Illegal content-type specification: %s\nAll MIME content-type headers must contain a type/subtype specification.\n", ctype);
++        return(-1);
++    }
++    if (st) *st++ = 0;
++    for (s = ct; *s; ++s) {
++        if (!isprint(*s) || index(tspecials, *s)) {
++            fprintf(stderr, "Illegal content-type specification: %s\nThe character '%c' (ASCII %d) is illegal in a MIME content-type.\n", ctype, *s, *s);
++            return(-1);
++        }
++    }
++    for (s = st; s && *s; ++s) {
++        if (!isprint(*s) || index(tspecials, *s)) {
++            fprintf(stderr, "Illegal content-type specification: %s\nThe character '%c' (ASCII %d) is illegal in a MIME content-subtype.\n", ctype, *s, *s);
++            return(-1);
++        }
++    }
++    while (semicolon) {
++        param = ++semicolon;
++        while (*param && isspace(*param)) ++param;
++        semicolon = index(param, ';');
++        if (semicolon) *semicolon = 0;
++        eq = index(param, '=');
++        if (eq) *eq++ = 0;
++        for (s = param; *s; ++s) {
++            if (!isprint(*s) || index(tspecials, *s)) {
++                fprintf(stderr, "Illegal content-type specification: %s\nThe character '%c' (ASCII %d) is illegal in a MIME content-type parameter name.\n", ctype, *s, *s);
++                return(-1);
++            }
++        }
++        while (*eq && isspace(*eq)) ++eq;
++        if (*eq == '\"') {
++            matcheq = eq;
++            do {
++                matcheq = index(matcheq+1, '\"');
++                if (!matcheq) {
++                    fprintf(stderr, "Illegal content-type specification: %s\nA quoted MIME parameter value must have matching quotation marks.\n", ctype);
++                    return(-1);
++                }
++            } while (*(matcheq-1) == '\\');
++            while (*++matcheq) {
++                if (!isspace(*matcheq)) {
++                    fprintf(stderr, "Illegal content-type specification: %s\nA quoted MIME parameter value must stop after the closing quotation mark.\n", ctype);
++                    return(-1);
++                }
++            }
++        } else {
++            for (s = eq; s && *s; ++s) {
++                if (!isprint(*s) || index(tspecials, *s)) {
++                    fprintf(stderr, "Illegal content-type specification: %s\nThe character '%c' (ASCII %d) is illegal in an unquoted MIME parameter value.\n", ctype, *s, *s);
++                    return(-1);
++                }
++            }
++        }
++    }
++    free(ct);
++    return(0);
++}
++
++int ULstrcmp(s1, s2)
++register char *s1, *s2;
++{
++    char c1,c2;
++
++    for(;;) {
++	c1 = *s1++; if (c1 <= 'Z') if (c1 >= 'A') c1 += 040;
++	c2 = *s2++; if (c2 <= 'Z') if (c2 >= 'A') c2 += 040;
++	if (c1 != c2) break;
++	if (c1 == '\0') return(0);
++    }
++    return(c1 - c2);
++}
++
++/* STILL TO DO:  
++  Get number of parts right when possible 
++*/
+--- metamail-2.7.orig/src/metamail/mailto.c
++++ metamail-2.7/src/metamail/mailto.c
+@@ -0,0 +1,2433 @@
++/*
++Copyright (c) 1992 Bell Communications Research, Inc. (Bellcore)
++
++Permission to use, copy, modify, and distribute this material 
++for any purpose and without fee is hereby granted, provided 
++that the above copyright notice and this permission notice 
++appear in all copies, and that the name of Bellcore not be 
++used in advertising or publicity pertaining to this 
++material without the specific, prior written permission 
++of an authorized representative of Bellcore.  BELLCORE 
++MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++*/
++
++/* 
++Program: mailto
++Author: Nathaniel S. Borenstein
++
++   This is a program that allows users to send MIME-format mail with much 
++   the same user interface as the Berkeley mail program.  
++
++   However, it should be stressed that this program includes
++   ABSOLUTELY NO CODE taken from Berkeley mail -- it is a 
++   "clean" reimplementation.
++
++   The user interface is directly modelled on Berkeley mail,
++   and the desiderata for its design are taken from the man
++   page for that program.
++
++   For information on using this program, consult the man page.
++
++STILL NEED TO DO/SUPPORT:
++
++-- Replace the main fgets call with something that allows in-line escape codes to do the equivalent of the tilde escapes.  Handle margins, centering, excerpts, EightBitMode, and RightToLeft mode properly.
++-- Replace EditString with something that does the right thing in-line.
++*/
++
++#include <metamail/common.h>
++
++#include <curses.h>  /* This and next for tgetstr(3X) and kin */
++#include <term.h>
++
++#include "metamail.h"
++#include "metamail_default.h"
++
++struct mailpart *CreateNewPart();
++char *getmyname(); /* Defined in shared.c */
++
++
++/* The main data structure for the multiple parts of the mail */
++
++struct mailpart {
++    int istext;
++    int isrich;
++    char *content_type;
++    int encoding_type_needed;
++    char *filename;
++    struct MailcapEntry *mc;
++    struct mailpart *next, *prev;
++};
++
++/* Some globals */
++struct mailpart *FirstPart = NULL;
++static char *Subject = NULL, *ToList = NULL, *CCList= NULL, *InReplyTo = NULL;
++FILE *fpout = NULL;
++static char *CharacterSet = NULL;
++static int PartEndsWithNewline=1;
++static int SplitSize=DEFAULT_SPLIT_SIZE;
++
++char *deadLetter = "dead.letter";
++char *signature = ".signature";
++char *mimeSignature = ".SIGNATURE";
++#define TMPFILE_NAME_SIZE   1000
++#define FILE_NAME_SIZE      1000
++
++#define DEFAULT_EDITOR      "vi"
++
++#define SYSTEM(command)     system(command);
++
++
++/* The following are the globals that can be set via .mailrc */
++int  V_askcc=0, /* To ask about the Cc field */
++     V_dot=0, /* To take a period as the end of input */
++     V_ignore=0, /* To ignore interrupts */
++     V_verbose=0, /* To run sendmail with -v */
++     V_quiet=0, /* To suppress various informational output */
++     V_keepblind=0, /* To receive a blind copy of outgoing mail. */
++     V_commasonly=0; /* To suppress using spaces as address separators */
++
++/* Codes for encoding_type_needed */
++#define ENC_NONE 0
++#define ENC_QP 1 /* quoted-printable */
++#define ENC_B64 2 /* base64 */
++
++/* Codes for JustificationState */
++#define JUST_LEFT 0
++#define JUST_RIGHT 1
++#define JUST_CENTER 2
++int JustificationState = JUST_LEFT;
++
++
++EightBitCharHelp() {
++    if (!CharacterSet || !strcmp(CharacterSet, "us-ascii")) {
++        printf("There are no extended characters available for your US-ASCII terminal.\n\n");
++        printf("If you are actually using a terminal or terminal emulator with a richer\ncharacter set, you must use the '-a' option or the 'MM_CHARSET' environment\nvariable to inform this program of that fact.\n");
++    } else {
++        static char *kbd1[] =
++          {
++            "1234567890-=",
++            "qwertyuiop[]",
++            "asdfghjkl;'`",
++            "zxcvbnm,./\\",
++            NULL
++        };
++        static char *kbd2[] = /* MUST have same # of entries as kbd1 */
++          {
++            "!@#$%^&*()_+",
++            "QWERTYUIOP{}",
++            "ASDFGHJKL:\"~",
++            "ZXCVBNM<>?|",
++            NULL
++        };
++        char *s;
++        int i, ct;
++
++        printf("Here is the keyboard map for the character set %s\n.If your terminal does not really use this character set, this may look strange.\n\n", CharacterSet);
++        for (i=0; kbd1[i]; ++i) {
++            for (ct=0, s=kbd1[i]; *s; ++s) {
++                printf("%c%c ", *s, (*s) + 128);
++                ct+=3;
++            }
++            while (ct++<40) printf(" ");
++            for (s=kbd2[i]; *s; ++s) {
++                printf("%c%c ", *s, (*s) + 128);
++            }
++            printf("\n");
++        }
++    }
++}            
++
++char *
++tmpname() {
++    char *s = malloc(30);
++    if (!s) nomemabort();
++    {
++        char *tmproot = getenv("METAMAIL_TMPDIR");
++        if (!tmproot) tmproot="/tmp";
++        if (strlen(tmproot) > 19) {
++            free(s);
++            s=malloc(12+strlen(tmproot));
++            if (!s) nomemabort();
++        }
++        sprintf(s, "%s/mm.XXXXXX", tmproot);
++    }
++    return(s);
++}
++
++TildeHelp() {
++    char *pager = getenv("PAGER");
++    char TmpName[100], CmdBuf[150];
++    FILE *fp;
++
++    strcpy(TmpName, tmpname());
++    fp = fdopen(mkstemp(TmpName), "w");
++    if (!fp) fp = stdout;
++    fprintf(fp, "The following tilde escapes are BSD-mail-compatible:\n");
++    fprintf(fp, "~? Show help on tilde escapes\n");
++    fprintf(fp, "~| RESERVED FOR BSD MAIL COMPATIBILITY\n");
++    fprintf(fp, "~f RESERVED FOR BSD MAIL COMPATIBILITY\n");
++    fprintf(fp, "~m RESERVED FOR BSD MAIL COMPATIBILITY\n");
++    fprintf(fp, "~! Shell escape\n");
++    fprintf(fp, "~~ Enter text line starting with a tilde\n");
++    fprintf(fp, "~. Send the mail and exit\n");
++    fprintf(fp, "~c Add to Cc list\n");
++    fprintf(fp, "~d Read from %s (or named file, ~d filename)\n", deadLetter);
++    fprintf(fp, "~e Edit message being composed\n");
++    fprintf(fp, "~h Edit the headers\n");
++    fprintf(fp, "~p Print out the message so far\n");
++    fprintf(fp, "~q Quit, copying to %s\n", deadLetter);
++    fprintf(fp, "~r Read the named text file into the message\n");
++    fprintf(fp, "~s Reset the subject\n");
++    fprintf(fp, "~t Add to To list\n");
++    fprintf(fp, "~v Edit using VISUAL editor\n");
++    fprintf(fp, "~w Write message to named file\n");
++    fprintf(fp, "\n");
++    fprintf(fp, "The following tilde escapes are unique to this program:\n");
++    fprintf(fp, "~/<number> Set maximum size before message is split into multiple parts\n");
++    fprintf(fp, "~?+ Show help on extended (eight-bit) characters\n");
++    fprintf(fp, "~> Indent Left Margin\n");
++    fprintf(fp, "~< Unindent Left Margin\n");
++    fprintf(fp, "~<R Indent Right Margin\n");
++    fprintf(fp, "~>R Unindent Right Margin\n");
++    fprintf(fp, "~+ Enter 8-bit mode for non-ASCII characters\n");
++    fprintf(fp, "~- Leave 8-bit mode (return to ASCII)\n");
++    fprintf(fp, "~^ Toggle \"Upside-down\" (right-to-left) mode.\n");
++    fprintf(fp, "~* Add non-text data (pictures, sounds, etc.) as a new MIME part (try it!)\n");
++    fprintf(fp, "~b Toggle bold mode\n");
++    fprintf(fp, "~i Toggle italic mode\n");
++    fprintf(fp, "~j Alter Justification (~jc = center, ~jl = flushleft, ~jr = flushright.)\n");
++    fprintf(fp, "~k Toggles whether or not to keep a 'blind' copy of your mail\n");
++    fprintf(fp, "~n Force newline (hard line break)\n");
++    fprintf(fp, "~Q Toggle quotation (excerpt) mode\n");
++    fprintf(fp, "~S Toggle Semitic text mode (combines 8-bit and left-to-right)\n");
++    fprintf(fp, "~u Toggle underline mode\n");
++    fprintf(fp, "~z Add the contents of %s as a TEXT signature.\n", signature);
++    fprintf(fp, "~Z Add the contents of %s as a NON-TEXT (MIME-format) signature.\n", mimeSignature);
++    fprintf(fp, "For further information, read the man page.\n");
++    fprintf(fp, "\n");
++    if (fp != stdout) {
++        fclose(fp);
++        snprintf(CmdBuf, sizeof(CmdBuf), "%s %s", pager ? pager : "sensible-pager", TmpName);
++        SYSTEM(CmdBuf);
++        unlink(TmpName);
++    }
++}
++
++char *gethome() {
++    struct passwd *p = getpwuid(getuid());
++    if (!p || !p->pw_dir) {
++        perror("Cannot find your home directory, using /tmp");
++        return("/tmp");
++    }
++    return (p->pw_dir);
++}
++
++
++static char standoutbuf[50], standendbuf[50], StartUnderline[50], StopUnderline[50], BoldOn[50], BoldOff[50], KS[50], KE[50];
++static int termcolumns, termrows;
++
++InitTerminal() {
++    char tbuf[1024], *term, *dum;
++
++    term = getenv("TERM");
++    if (term && tgetent(tbuf, term) != 1) {
++        term = NULL;
++    }
++    if (term) {
++        dum = KS;
++        if (tgetstr("ks", &dum)) *dum = '\0'; else KS[0] = '\0';
++        dum = KE;
++        if (tgetstr("ke", &dum)) *dum = '\0'; else KE[0] = '\0';
++        dum = standoutbuf;
++        if (tgetstr("so", &dum)) *dum = '\0'; else standoutbuf[0] = '\0';
++        dum = standendbuf;
++        if (tgetstr("se", &dum)) *dum = '\0'; else standendbuf[0] = '\0';
++        dum = BoldOn;
++        if (tgetstr("md", &dum)) *dum = '\0'; else strcpy(BoldOn, standoutbuf);
++        dum = BoldOff;
++        if (tgetstr("me", &dum)) *dum = '\0'; else strcpy(BoldOff, standendbuf);
++        dum = StartUnderline;
++        if (tgetstr("us", &dum)) *dum = '\0'; else StartUnderline[0] = '\0';
++        dum = StopUnderline;
++        if (tgetstr("ue", &dum)) *dum = '\0'; else StopUnderline[0] = '\0';
++        termcolumns = tgetnum("co");
++        if (termcolumns <= 0) termcolumns = 80;
++        termrows = tgetnum("li");
++        if (termrows <= 0) termrows = 23;
++    } else {
++        KS[0] = '\0';
++        KE[0] = '\0';
++        standoutbuf[0] = '\0';
++        standendbuf[0] = '\0';
++        BoldOn[0] = '\0';
++        BoldOff[0] = '\0';
++        StartUnderline[0] = '\0';
++        StopUnderline[0] = '\0';
++        termcolumns = 80;
++        termrows = 23;
++    }
++    fputs(KS, stdout);
++}
++
++FinalizeTerminal() {
++    tfputs(standendbuf);
++    tfputs(BoldOff);
++    tfputs(StopUnderline);
++}
++
++struct mailpart *
++NewPart() {
++    struct mailpart *p;
++    p = (struct mailpart *) malloc(sizeof(struct mailpart));
++    if (!p) nomemabort();
++    p->istext = 1;
++    p->isrich = 0;
++    p->content_type = "text/plain";
++    p->encoding_type_needed = ENC_NONE;
++    p->filename = tmpname();
++    p->mc = NULL;
++    p->next = NULL;
++    p->prev = NULL;
++    return(p);
++}
++
++nomemabort() {
++    fprintf(stderr, "mailto: Out of memory\n");
++    cleanexit(-1);
++}
++
++char *
++freshcopy(s)
++char *s;
++{
++    char *t = malloc(1+strlen(s));
++    if (!t) nomemabort();
++    strcpy(t, s);
++    return(t);
++}
++
++char *
++GetLineMalloced(prompt, def)
++char *prompt, *def;
++{
++    char Sbuf[1000], *ans;
++    printf("%s: ", prompt);
++    fflush(stdout);
++    ans = fgets(Sbuf, sizeof(Sbuf), stdin);
++    if (ans) {
++        /* Need a fresh copy */
++        ans = malloc(1+strlen(Sbuf));
++        if (!ans) nomemabort();
++        strcpy(ans, Sbuf);
++        ans[strlen(ans) - 1] = '\0'; /* trash newline */
++    } else {
++        /* Callers will free() this, so make a fresh copy as well */
++        ans = malloc(1+strlen(def));
++        if (!ans) nomemabort();
++        strcpy(ans, def);
++    }
++    return(ans);
++}
++
++char *
++EditString(prompt, s)
++char *prompt, *s;
++{
++    char *ans;
++    char NewPrompt[500];
++    if (!s) s = "";
++    snprintf(NewPrompt, sizeof(NewPrompt), "%s [%s]", prompt, s);
++    ans = GetLineMalloced(NewPrompt, s);
++    while (*ans && isspace((unsigned char) *ans)) ++ans;
++    if (!*ans) return(s);
++    return(ans);
++}
++
++char *
++AddCommasToAddressList(s)
++char *s;
++{
++    int spaces = 0;
++    char *t, *ans, *ansptr;
++
++    if (V_commasonly) {
++        ans = malloc(1+strlen(s));
++        if (!ans) nomemabort;
++        strcpy(ans, s);
++        return(ans);
++    }
++    for (t=s; *t; ++t) {
++        if (*t == ' ') ++spaces;
++    }
++    /* That provides a max size for the mallocs */
++    ans = malloc(1+strlen(s) +spaces);
++    if (!ans) nomemabort();
++    ansptr = ans;
++    for (t=s; *t; ++t) {
++        if (*t == ' ' && *(t-1) != ',') {
++            *ansptr++ = ',';
++        }
++        *ansptr++ = *t;
++    }
++    *ansptr = '\0';
++    while (--ansptr > ans && (isspace((unsigned char) *ansptr) || *ansptr == ',')) {
++        *ansptr = '\0';
++    }
++    return(ans);
++}
++
++char *
++AddToList(List, entry, definitelynew)
++char *List, *entry;
++int definitelynew;
++{
++    int len;
++    char *end = entry+strlen(entry);
++
++    while (--end >= entry && isspace((unsigned char) *end)) *end = '\0';
++    if (! *entry) return(List);
++    if (List && *List) {
++        List = realloc(List, strlen(List) + strlen(entry) + 5);
++        if (!List) nomemabort();
++        if (V_commasonly && !definitelynew) {
++            strcat(List, " ");
++        } else {
++            strcat(List, ", ");
++        }
++        strcat(List, entry);
++    } else {
++        List = malloc(strlen(entry) + 2);
++        if (!List) nomemabort();
++        strcpy(List, entry);
++    }
++    len = strlen(List);
++    while (List[--len] == ',') List[len] = '\0';
++    return(List);
++}
++
++main(argc, argv)
++char **argv;
++{
++    char *sdum, *LineBuf, CmdBuf[100];
++    int i, EightBitMode = 0, RightToLeftMode = 0, AllDone=0, EightBitSeen=0, prevaddrdone=1;
++    FILE *fpin;
++    struct mailpart *CurrentPart=NULL;
++
++    if ((LineBuf = malloc(MAX_LINELENGTH)) == NULL) {
++        fprintf(stderr, "mailto: Unable to allocate memory\n");
++        exit(10);
++    }
++    ProcessInitFiles();
++    InitSignals();
++    InitTerminal();
++    sdum = getenv("SPLITSIZE");
++    if (sdum) {
++        i = atoi(sdum);
++        if (i < MINCHUNKSIZE) {
++            fprintf(stderr, "Ignoring SPLITSIZE environment variable of %d -- the minimum value is %d\n", i, MINCHUNKSIZE);
++        } else {
++            SplitSize = i;
++        }
++    }
++
++    CharacterSet = getenv("MM_CHARSET");
++    for (i=1; i<argc; ++i) {
++        if (argv[i][0] == '-') {
++            switch (argv[i][1]) {
++                case 'a':
++                    if (argv[i][2]) {
++                        CharacterSet = &argv[i][2];
++                    } else if (++i < argc) {
++                        CharacterSet = argv[i];
++                    } else {
++                        fprintf(stderr, "mailto: -a requires a character set specification to follow\n");
++                        cleanexit(-1);
++                    }
++                    break;
++                case 'c':
++                    if (argv[i][2]) {
++                        CCList = &argv[i][2];
++                    } else if (++i < argc) {
++                        CCList = argv[i];
++                    } else {
++                        CCList = "";
++                    }
++                    break;
++                case 'r':
++                    if (argv[i][2]) {
++                        InReplyTo = &argv[i][2];
++                    } else if (++i < argc) {
++                        InReplyTo = argv[i];
++                    } else {
++                        fprintf(stderr, "mailto: -r requires a Message-ID to follow\n");
++                        cleanexit(-1);
++                    }
++                    break;
++                case 's':
++                    if (argv[i][2]) {
++                        Subject = &argv[i][2];
++                    } else if (++i < argc) {
++                        Subject = argv[i];
++                    } else {
++                        fprintf(stderr, "mailto: -s requires a subject specification to follow\n");
++                        cleanexit(-1);
++                    }
++                    break;
++                default:
++                    fprintf(stderr, "mailto:  Unrecognized option %s\n", argv[i]);
++                    cleanexit(-1);
++            }
++        } else {
++            /* It's an address, I guess */
++            ToList = AddToList(ToList, argv[i], prevaddrdone);
++            prevaddrdone = (argv[i][strlen(argv[i]) -1] == ',') ? 1 : 0;
++        }
++    }
++    if (!CharacterSet) CharacterSet = "us-ascii";
++    for (sdum = CharacterSet; *sdum; ++sdum) {
++        if (isupper(*sdum)) *sdum = tolower(*sdum);
++    }
++    if (strcmp(CharacterSet, "us-ascii")
++	 && strcmp(CharacterSet, "kio8-r")
++	 && strncmp(CharacterSet, "iso-8859-", 9)) {
++        fprintf(stderr, "mailto:  Unsupported character set: %s\n", CharacterSet);
++        exit(-1);
++    }
++    if (strcmp(CharacterSet, "us-ascii")) {
++        printf("Composing mail in character set %s\n", CharacterSet);
++    }
++    ProcessMailcapFiles();
++    if (!ToList) {
++        sdum=GetLineMalloced("To", "");
++        ToList=AddCommasToAddressList(sdum);
++        free(sdum);
++    }
++    if (!Subject) Subject=GetLineMalloced("Subject", "<NO SUBJECT>");
++    if (!CCList && V_askcc) {
++        sdum = GetLineMalloced("Cc", "");
++        CCList = AddCommasToAddressList(sdum);
++        free(sdum);
++    }
++    FirstPart = NewPart();
++    CurrentPart = FirstPart;
++    fpout = fdopen(mkstemp(CurrentPart->filename), "w");
++    if (!fpout) {
++        fprintf(stderr, "mailto:  Can't open temporary file %s\n", CurrentPart->filename);
++        cleanexit(-1);
++    }
++    while (!AllDone && fgets(LineBuf, MAX_LINELENGTH, stdin) != NULL) {
++        if (V_dot && LineBuf[0] == '.' && LineBuf[1] == '\n') {
++            AllDone = 1;
++        } else if (LineBuf[0] == '~') {
++            /* Clean up argument */
++            char *start = LineBuf+2;
++            char *end = start + strlen(start);
++            while (--end > start && isspace((unsigned char) *end)) *end = '\0';
++            while (isspace((unsigned char) *start)) ++start;
++            switch (LineBuf[1]) {
++                case '.':
++                    AllDone = 1;
++                    break;
++                case '?':
++                    if (*start == '+') {
++                        EightBitCharHelp();
++                    } else {
++                        TildeHelp();
++                    }
++                    break;
++                case '~':
++                    FputsQuotingLT(LineBuf+1, fpout, CurrentPart, EightBitMode, RightToLeftMode);
++                    break;
++                case '!':
++                    if (!V_quiet) printf("Executing: %s\n", start);
++                    SYSTEM(start);
++                    break;
++                case '>':
++                    CurrentPart->isrich = 1;
++                    fputs("<nl>", fpout);
++                    if (*start=='r' || *start == 'R') {
++                        TryClosingStyle("indentright", fpout, CurrentPart);
++                    } else {
++                        TryOpeningStyle("indent", fpout, CurrentPart, NULL);
++                    }
++                    break;
++                case '<':
++                    CurrentPart->isrich = 1;
++                    fputs("<nl>", fpout);
++                    if (*start == 'R' || *start == 'r') {
++                        TryOpeningStyle("indentright", fpout, CurrentPart, NULL);
++                    } else {
++                        TryClosingStyle("indent", fpout, CurrentPart);
++                    }
++                    break;
++                case '/':
++                    i = atoi(start);
++                    if (i < MINCHUNKSIZE) {
++                        fprintf(stderr, "Ignoring splitsize setting of %d -- the minimum value is %d\n", i, MINCHUNKSIZE);
++                    } else {
++                        SplitSize = i;
++                        if (!V_quiet) printf("Set splitsize to %d\n", i);
++                    }
++                    break;
++                case '+':
++                    if (!strcmp(CharacterSet, "us-ascii")) {
++                        fprintf(stderr, "mailto:  No 8-bit characters allowed in ASCII mail\n");
++                    } else {
++                        EightBitMode = 1;
++                        if (!V_quiet) printf("Entering text in eight-bit mode\n");
++                    }
++                    break;
++                case '-':
++                    EightBitMode = 0;
++                    if (!V_quiet) printf("Entering text in seven-bit (normal) mode\n");
++                    break;
++                case '^':
++                    RightToLeftMode = ! RightToLeftMode;
++                    if (!V_quiet) printf("%s right-to-left mode\n", RightToLeftMode ? "Entering" : "Exiting");
++                    break;
++                case '*':
++                    {
++                    struct mailpart *p = CreateNewPart();
++                    if (!p) break;
++                    TempCloseStyles(fpout);
++                    fclose(fpout);
++                    CurrentPart->next = p;
++                    CurrentPart->next->prev = CurrentPart;
++                    CurrentPart = CurrentPart->next;
++                    CurrentPart->next = NewPart();
++                    CurrentPart->next->prev = CurrentPart;
++                    CurrentPart = CurrentPart->next;
++                    fpout = fdopen(mkstemp(CurrentPart->filename), "w");
++                    if (!fpout) {
++                        fprintf(stderr, "mailto:  Can't open temporary file %s\n", CurrentPart->filename);
++                        cleanexit(-1);
++                    }
++                    ReopenStyles(fpout, CurrentPart);
++                    break;
++                    }
++                case 'b':
++                    ToggleStyle("bold", fpout, CurrentPart, BoldOn, BoldOff);
++                    break;
++                case 'c':
++                    CCList = AddToList(CCList, start, 1);
++                    if (!V_quiet) printf("Cc field is now: %s\n", CCList);
++                    break;
++                case 'd':
++                    {
++                    char fnam[FILE_NAME_SIZE];
++                    if (! *start) {
++                        snprintf(fnam, sizeof(fnam), "%s/dead.letter", gethome());
++                    } else {
++                        strcpy(fnam, start);
++                    }
++                    fpin = fopen(fnam, "r");
++                    if (!fpin) {
++                        fprintf(stderr, "mailto: Cannot open file %s\n", fnam);
++                        break;
++                    }
++                    TempCloseStyles(fpout);
++                    fclose(fpout);
++                    CurrentPart->next = NewPart();
++                    CurrentPart->next->prev = CurrentPart;
++                    CurrentPart = CurrentPart->next;
++                    CurrentPart->istext = 0;
++                    CurrentPart->content_type = "message/rfc822";
++                    fpout = fdopen(mkstemp(CurrentPart->filename), "w");
++                    if (!fpout) {
++                        fprintf(stderr, "mailto: Cannot open temporary file %s\n", CurrentPart->filename);
++                        break;
++                    }
++                    (void) TranslateInputToEncodedOutput(fpin, fpout, ENC_NONE, "");
++                    fclose(fpin);
++                    fclose(fpout);
++                    printf("Included contents of %s\n(continue)\n", fnam);
++                    CurrentPart->next = NewPart();
++                    CurrentPart->next->prev = CurrentPart;
++                    CurrentPart = CurrentPart->next;
++                    fpout = fdopen(mkstemp(CurrentPart->filename), "w");
++                    if (!fpout) {
++                        fprintf(stderr, "mailto:  Can't open temporary file %s\n", CurrentPart->filename);
++                        cleanexit(-1);
++                    }
++                    ReopenStyles(fpout, CurrentPart);
++                    break;
++                    }
++                case 'e':
++                    EditCurrentMessage(0);
++                    break;
++                case 'h':
++                    ToList = AddCommasToAddressList(EditString("To", ToList));
++                    Subject = EditString("Subject", Subject);
++                    CCList = AddCommasToAddressList(EditString("Cc", CCList));
++                    break;
++                case 'i':
++                    ToggleStyle("italic", fpout, CurrentPart, standoutbuf, standendbuf);
++                    break;
++                case 'j':
++                    {
++                    int NewJustificationState;
++                    switch (*start) {
++                        case 'c':
++                        case 'C':
++                            NewJustificationState = JUST_CENTER;
++                            break;
++                        case 'r':
++                        case 'R':
++                            NewJustificationState = JUST_RIGHT;
++                            break;
++                        case 'l':
++                        case 'L':
++                            NewJustificationState = JUST_LEFT;
++                            break;
++                        default:
++                            printf("mailto: Unrecognized justification state: %c\n", *start);
++                            NewJustificationState = JustificationState;
++                    }
++                    if (JustificationState == NewJustificationState) {
++                        if (!V_quiet) printf("mailto:  No change in justificiation\n");
++                    } else {
++                        if (CurrentPart->isrich) {
++                            if (JustificationState == JUST_CENTER) {
++                                EndStyle(fpout, "center");
++                            } else if (JustificationState == JUST_RIGHT) {
++                                EndStyle(fpout, "flushright");
++                            } else {
++                                EndStyle(fpout, "flushleft");
++                            }
++                        }
++                        CurrentPart->isrich = 1;
++                        fputs("<nl>", fpout);
++                        JustificationState = NewJustificationState;
++                        if (JustificationState == JUST_CENTER) {
++                            StartStyle(fpout, "center", NULL);
++                        } else if (JustificationState == JUST_RIGHT) {
++                            StartStyle(fpout, "flushright", NULL);
++                        } else {
++                            StartStyle(fpout, "flushleft", NULL);
++                        }
++                    }
++                    break;
++                    }
++                case 'k':
++                    V_keepblind = ! V_keepblind;
++                    if (!V_quiet) printf("%s keep a blind copy of this message\n", V_keepblind ? "Will" : "Won't");
++                    break;
++                case 'n':
++                    CurrentPart->isrich = 1;
++                    fputs("<nl>", fpout);
++                    if (!V_quiet) printf("Inserted line break\n");
++                    break;
++                case 'p':
++                    {
++                    FILE *fptmp;
++                    char Cmd[TMPFILE_NAME_SIZE + 15];
++                    char *s=tmpname();
++                    fclose(fpout);
++                    fptmp = fdopen(mkstemp(s), "w");
++                    WriteOutMessage(fptmp, ToList, Subject, CCList, FirstPart);
++                    TempCloseStyles(fptmp);
++                    fclose(fptmp);
++                    fpout = fopen(CurrentPart->filename, "a");
++                    if (!fpout) {
++                        fprintf(stderr, "mailto:  Can't open temporary file %s\n", CurrentPart->filename);
++                        cleanexit(-1);
++                    }
++                    snprintf(Cmd, sizeof(Cmd), "metamail -z %s", s);
++                    SYSTEM(Cmd);
++                    free(s);
++                    RestoreCurrentStyles();
++                    break;
++                    }
++                case 'q':
++                    TempCloseStyles(fpout);
++                    fclose(fpout);
++                    if (!WriteDeadLetter()) cleanexit(0);
++                    break;
++                case 'Q':
++                    ToggleStyle("excerpt", fpout, CurrentPart, NULL, NULL);
++                    break;
++                case 'r':
++                    if (! *start) {
++                        printf("mailto: No file name given.\n");
++                        break;
++                    }
++                    fpin = fopen(start, "r");
++                    if (!fpin) {
++                        fprintf(stderr, "mailto: Cannot open file %s\n", start);
++                        break;
++                    }
++                    EightBitSeen = TranslateInputToEncodedOutput(fpin, fpout, ENC_NONE, "");
++                    if (EightBitSeen 
++                         && (CurrentPart->istext || CurrentPart->isrich)) {
++                        if (CurrentPart->encoding_type_needed == ENC_NONE) {
++                            CurrentPart->encoding_type_needed = ENC_QP;
++                        }
++                        if (!strcmp(CharacterSet, "us-ascii")) {
++                            SwitchToEuropean();
++                        }
++                    }
++                    fclose(fpin);
++		    if (!V_quiet) printf("Included contents of %s\n", start);
++		    printf("(continue)\n");
++                    break;
++                case 'S':
++                    /* Semitic language mode toggle */
++                    if (EightBitMode) {
++                        EightBitMode = 0;
++                        RightToLeftMode = 0;
++                    } else {
++                        if (!strcmp(CharacterSet, "us-ascii")) {
++                            fprintf(stderr, "mailto:  No 8-bit characters allowed in ASCII mail\n");
++                            break;
++                        }
++                        EightBitMode = 1;
++                        RightToLeftMode = 1;
++                    }
++                    if (!V_quiet) printf("%s Eight-bit and right-to-left modes\n", RightToLeftMode ? "Entering" : "Exiting");
++                    break;
++                case 's':
++                    {
++                    char *subj=start;
++                    if (*subj) {
++                        Subject = freshcopy(subj);
++                    } else {
++                        Subject=GetLineMalloced("Subject", "<NO SUBJECT>");
++                    }
++                    break;
++                    }
++                case 't':
++                    ToList = AddToList(ToList, start, 1);
++                    if (!V_quiet) printf("To field is now: %s\n", ToList);
++                    break;
++                case 'u':
++                    ToggleStyle("underline", fpout, CurrentPart, StartUnderline, StopUnderline);
++                    break;
++                case 'v':
++                    EditCurrentMessage(1);
++                    break;
++                case 'w':
++                    {
++                    FILE *fptmp;
++                    char *fname;
++                    fclose(fpout);
++                    fname = start;
++                    fptmp = fopen(fname, "w");
++                    WriteOutMessage(fptmp, ToList, Subject, CCList, FirstPart);
++                    TempCloseStyles(fptmp);
++                    if(fclose(fptmp)) {
++                        fprintf(stderr, "Could not write file %s\n", fname);
++                    } else {
++                        printf("Wrote draft to %s\n", fname);
++                    }
++                    fpout = fopen(CurrentPart->filename, "a");
++                    if (!fpout) {
++                        fprintf(stderr, "mailto:  Can't open temporary file %s\n", CurrentPart->filename);
++                        cleanexit(-1);
++                    }
++                    break;
++                    }
++                case 'z':
++                    {
++                    char FBuf[FILE_NAME_SIZE];
++                    if (! *start) {
++                        snprintf(FBuf, sizeof(FBuf), "%s/.signature", gethome());
++                    } else {
++                        strcpy(FBuf, start);
++                    }
++                    fpin = fopen(FBuf, "r");
++                    if (!fpin) {
++                        fprintf(stderr, "mailto: Cannot open file %s\n", FBuf);
++                        break;
++                    }
++                    CurrentPart->isrich = 1;
++                    StartStyle(fpout, "signature", NULL);
++                    EightBitSeen = TranslateInputToEncodedOutput(fpin, fpout, ENC_NONE, "");
++                    if (EightBitSeen) {
++                        if (CurrentPart->encoding_type_needed == ENC_NONE) {
++                            CurrentPart->encoding_type_needed = ENC_QP;
++                        }
++                        if ((CurrentPart->istext || CurrentPart->isrich) && !strcmp(CharacterSet, "us-ascii")) {
++                            SwitchToEuropean();
++                        }
++                    }
++                    fclose(fpin);
++                    EndStyle(fpout, "signature");
++                    if (!V_quiet) printf("Included contents of %s\n", FBuf);
++		    printf("(continue)\n");
++                    break;
++                    }
++                case 'Z':
++                    {
++                    char fnam[FILE_NAME_SIZE];
++                    if (! *start) {
++                        snprintf(fnam, sizeof(fnam), "%s/.SIGNATURE", gethome());
++                    } else {
++                        strcpy(fnam, start);
++                    }
++                    fpin = fopen(fnam, "r");
++                    if (!fpin) {
++                        fprintf(stderr, "mailto: Cannot open file %s\n", fnam);
++                        break;
++                    }
++                    TempCloseStyles(fpout);
++                    fclose(fpout);
++                    CurrentPart->next = NewPart();
++                    CurrentPart->next->prev = CurrentPart;
++                    CurrentPart = CurrentPart->next;
++                    CurrentPart->istext = 0;
++                    CurrentPart->content_type = "message/rfc822";
++                    fpout = fdopen(mkstemp(CurrentPart->filename), "w");
++                    if (!fpout) {
++                        fprintf(stderr, "mailto: Cannot open temporary file %s\n", CurrentPart->filename);
++                        break;
++                    }
++                    EightBitSeen = TranslateInputToEncodedOutput(fpin, fpout, ENC_NONE, "");
++                    if (EightBitSeen &&
++                        (CurrentPart->istext || CurrentPart->isrich)) {
++                        if (CurrentPart->encoding_type_needed == ENC_NONE) {
++                            CurrentPart->encoding_type_needed = ENC_QP;
++                        }
++                        if (!strcmp(CharacterSet, "us-ascii")) {
++                            SwitchToEuropean();
++                        }
++                    }
++                    fclose(fpin);
++                    fclose(fpout);
++                    printf("Included contents of %s\n", fnam);
++		    printf("(continue)\n");
++                    CurrentPart->next = NewPart();
++                    CurrentPart->next->prev = CurrentPart;
++                    CurrentPart = CurrentPart->next;
++                    fpout = fdopen(mkstemp(CurrentPart->filename), "w");
++                    if (!fpout) {
++                        fprintf(stderr, "mailto:  Can't open temporary file %s\n", CurrentPart->filename);
++                        cleanexit(-1);
++                    }
++                    ReopenStyles(fpout, CurrentPart);
++                    break;
++                    }
++                default:
++                    printf("Unrecognized tilde escape: %c\n", LineBuf[1]);
++                    break;
++            }
++        } else {
++            FputsQuotingLT(LineBuf, fpout, CurrentPart, EightBitMode, RightToLeftMode);
++        }
++    }
++    TempCloseStyles(fpout);
++    fclose(fpout);
++    printf("EOT\n");
++    if (V_verbose) {
++        snprintf(CmdBuf, sizeof(CmdBuf), "splitmail -d -v -s %d", SplitSize);
++    } else {
++        snprintf(CmdBuf, sizeof(CmdBuf), "splitmail -d -s %d", SplitSize);
++    }
++    fpout = popen(CmdBuf, "w");
++    if (!fpout) {
++        fprintf(stderr, "mailto: Can't write to splitmail\n");
++        (void) WriteDeadLetter();
++        cleanexit(-1);
++    }
++    WriteOutMessage(fpout, ToList, Subject, CCList, FirstPart);
++    if (ferror(fpout) || pclose(fpout)) {
++        perror("mailto: Error writing to splitmail");
++        (void) WriteDeadLetter();
++        cleanexit(-1);
++    }
++    cleanexit(0); /* Never returns */
++}
++
++char *newid() {
++    static char idbuf[100];
++    static int ctr=0;
++
++    snprintf(idbuf, sizeof(idbuf), "<%d_%d_%d_%d@%s>", (int) getuid(), (int) getpid(), (int) time(0), ++ctr, getmyname());
++
++    return(idbuf);
++}
++
++WriteOutMessage(fp, ToList, Subject, CCList, FirstPart)
++FILE *fp;
++char *ToList, *Subject, *CCList;
++struct mailpart *FirstPart;
++{
++    FILE *fpin;
++    static int ctr = 0;
++    fprintf(fp, "MIME-Version: 1.0\n");
++    if (InReplyTo != NULL) {
++        EmitHeader(fp, "In-Reply-To", InReplyTo);
++    }
++    EmitHeaderWithAliases(fp, "To", ToList);
++
++    EmitHeader(fp, "Subject", Subject);
++    if (CCList && *CCList) EmitHeaderWithAliases(fp, "Cc", CCList);
++    if (V_keepblind) {
++        struct passwd *p = getpwuid(getuid());
++        if (!p) {
++            fprintf(stderr, "Can't find your user id to keep a blind copy\n");
++        } else {
++            EmitHeader(fp, "Bcc", p->pw_name);
++        }
++    }
++    fprintf(fp, "Message-ID: %s\n", newid());
++    if (!FirstPart) return; /* empty body */
++    if (FirstPart->next) {
++        char boundary[120];
++        snprintf(boundary, sizeof(boundary), "PART.BOUNDARY.%d.%d.%s.%d.%d",
++                 (int) getuid(), (int) getpid(), getmyname(), (int) time(0), ++ctr);
++        fprintf(fp, "Content-type: multipart/mixed;\n\tboundary=\"%s\"\n\n", boundary);
++        fprintf(fp, "> THIS IS A MESSAGE IN 'MIME' FORMAT.  Your mail reader does not support MIME.\n> Some parts of this will be readable as plain text.\n> To see the rest, you will need to upgrade your mail reader.\n");
++        while(FirstPart) {
++            /* First check to see if it is empty & text, in which case skip it */
++            if (FirstPart->istext) {
++                struct stat stbuf;
++                if (!stat(FirstPart->filename, &stbuf)) {
++                    if (stbuf.st_size == 0) {
++                        FirstPart = FirstPart->next;
++                        continue;
++                    }
++                }
++            }
++            fprintf(fp, "\n--%s\n", boundary);
++            WriteContentTypeAndEncoding(fp, FirstPart);
++            fprintf(fp, "\n");
++            fpin = fopen(FirstPart->filename, "r");
++            if (!fpin) {
++                fprintf(stderr, "Can't read temporary file %s\n", FirstPart->filename);
++                cleanexit(-1);
++            }
++            (void) TranslateInputToEncodedOutput(fpin, fp, FirstPart->encoding_type_needed, FirstPart->content_type);
++            fclose(fpin);
++            FirstPart = FirstPart->next;
++        }
++        fprintf(fp, "\n--%s--\n\n", boundary);
++    } else {
++        WriteContentTypeAndEncoding(fp, FirstPart);
++        fprintf(fp, "\n");
++        fpin = fopen(FirstPart->filename, "r");
++        if (!fpin) {
++            fprintf(stderr, "Can't read temporary file %s\n", FirstPart->filename);
++            cleanexit(-1);
++        }
++        (void) TranslateInputToEncodedOutput(fpin, fp, FirstPart->encoding_type_needed, FirstPart->content_type);
++        fclose(fpin);
++    }
++}
++
++WriteContentTypeAndEncoding(fp, part)
++FILE *fp;
++struct mailpart *part;
++{
++    fprintf(fp, "Content-ID: %s\n", newid());
++    if (part->istext) {
++        if (part->isrich) {
++            if (strcmp(CharacterSet, "us-ascii")
++		 && strcmp(CharacterSet, "koi8-r")
++		 && (strncmp(CharacterSet, "iso-8859-", 9) 
++                      || part->encoding_type_needed != ENC_NONE)) {
++                fprintf(fp, "Content-type: text/richtext; charset=\"%s\"\n", CharacterSet);
++            } else {
++                fprintf(fp, "Content-type: text/richtext\n");
++            }
++        } else {
++            fprintf(fp, "Content-type: ");
++            WriteCtypeNicely(fp, part->content_type);
++            if (strcmp(CharacterSet, "us-ascii")
++                 && (strncmp(CharacterSet, "iso-8859-", 9) 
++                      || part->encoding_type_needed != ENC_NONE)) {
++                fprintf(fp, "; charset=\"%s\"\n", CharacterSet);
++            } else fputs("\n", fp);
++        }
++    } else {
++        fprintf(fp, "Content-type: ");
++        WriteCtypeNicely(fp, part->content_type); /* fixes some syntactic junk */
++        fputs("\n", fp);
++    }
++    if (part->istext && part->isrich && part->encoding_type_needed == ENC_NONE) {
++        /* Don't you believe it... */
++        part->encoding_type_needed = ENC_QP;
++    }
++    if (part->encoding_type_needed == ENC_B64) {
++        fprintf(fp, "Content-Transfer-Encoding: base64\n");
++    } else if (part->encoding_type_needed == ENC_QP) {
++        fprintf(fp, "Content-Transfer-Encoding: quoted-printable\n");
++    }
++}
++
++TranslateInputToEncodedOutput(InputFP, OutputFP, Ecode, ctype)
++FILE *InputFP, *OutputFP;
++int Ecode;
++char *ctype;
++{
++    int c, EightBitSeen = 0;
++
++    switch(Ecode) {
++        case ENC_B64:
++            to64(InputFP, OutputFP, DoesNeedPortableNewlines(ctype));
++            break;
++        case ENC_QP:
++            toqp(InputFP, OutputFP);
++            break;
++        default:
++            while ((c = getc(InputFP)) != EOF){
++                if (c > 127) EightBitSeen = 1;
++                putc(c, OutputFP);
++            }
++    }
++    return(EightBitSeen);
++}
++
++#define	MAX_STACK_SIZE	500
++static int StackSize=0;
++static char *Stack[MAX_STACK_SIZE];
++static char *EnvStartStack[MAX_STACK_SIZE];
++
++/* The following two routines are used when richtext styles need to be 
++   kept open across an inserted object -- i.e. the richtext is split into 
++   two parts of a multipart message */
++
++TempCloseStyles(fp)
++FILE *fp;
++{
++    int i = StackSize;
++    while(--i>=0) {
++        fprintf(fp, "</%s>", Stack[i]);
++    }
++    tfputs(StopUnderline);
++    tfputs(standendbuf);
++    tfputs(BoldOff);
++    fflush(stdout);
++}
++
++RestoreCurrentStyles() {
++    int i=0;
++    while (i<StackSize) {
++        if (EnvStartStack[i]) {
++            tfputs(EnvStartStack[i]);
++        }
++        ++i;
++    }
++}
++
++ReopenStyles(fp, part)
++FILE *fp;
++struct mailpart *part;
++{
++    int i=0;
++    RestoreCurrentStyles();
++    if (StackSize > 0) part->isrich = 1;
++    while (i < StackSize) {
++        fprintf(fp, "<%s>", Stack[i++]);
++    }
++}
++
++richtextreset()
++{
++    StackSize = 0;
++}
++
++AlreadyInStyle(s)
++char *s;
++{
++    int i;
++    for (i=0; i<StackSize; ++i) {
++        if (!strcmp(Stack[i], s)) return(1);
++    }
++    return(0);
++}
++
++StartStyle(fp, s, envstartstr)
++FILE *fp;
++char *s;
++char *envstartstr;
++{
++    char *t;
++    fprintf(fp, "<%s>", s);
++    PartEndsWithNewline=0;
++    t = malloc(1+strlen(s));
++    if (!t) nomemabort();
++    strcpy(t, s);
++    EnvStartStack[StackSize] = envstartstr;
++    Stack[StackSize++] = t;
++    if (!V_quiet) printf("Beginning: %s\n", t);
++}
++
++EndStyle(fp, s)
++FILE *fp;
++char *s;
++{
++    int i = StackSize, j;
++    while(--i>=0) {
++        fprintf(fp, "</%s>", Stack[i]);
++        if (!strcmp(s, Stack[i])) break;
++    }
++    if (i>=0) {
++        free(Stack[i]);
++        --StackSize;
++        for (j=i; j<StackSize; ++j) {
++            Stack[j] = Stack[j+1];
++            EnvStartStack[j] = EnvStartStack[j+1];
++        }
++    } else i=0;
++    while (i<StackSize) {
++        fprintf(fp, "<%s>", Stack[i++]);
++    }
++    PartEndsWithNewline=0;
++    if (!V_quiet) printf("Ending: %s\n", s);
++}
++
++ToggleStyle(name, fp, part, turnonstr, turnoffstr)
++char *name;
++FILE *fp;
++struct mailpart *part;
++char *turnonstr, *turnoffstr;
++{
++    part->isrich = 1;
++    if (AlreadyInStyle(name)) {
++        EndStyle(fp, name);
++        if (turnoffstr) tfputs(turnoffstr);
++        RestoreCurrentStyles(); /* because on some terminals,
++                                  the same thing turns
++                                  off underlining AND bold */
++    } else {
++        StartStyle(fp, name, turnonstr);
++        if (turnonstr) tfputs(turnonstr);
++    }
++}
++
++TryOpeningStyle(name, fp, part, envstartstr)
++char *name;
++FILE *fp;
++struct mailpart *part;
++char *envstartstr;
++{
++    if (AlreadyInStyle(name)) {
++        printf("mailto: Already in %s style\n", name);
++    } else {
++        part->isrich = 1;
++        StartStyle(fp, name, envstartstr);
++    }
++}
++
++TryClosingStyle(name, fp, part)
++char *name;
++FILE *fp;
++struct mailpart *part;
++{
++    if (AlreadyInStyle(name)) {
++        part->isrich = 1;
++        EndStyle(fp, name);
++    } else {
++        printf("mailto: You aren't in a %s style\n", name);
++    }
++}
++
++FputsQuotingLT(s, fp, part, EightBitMode, RightToLeftMode)
++char *s;
++FILE *fp;
++struct mailpart *part;
++int EightBitMode, RightToLeftMode;
++{
++    static int InNewLineSequence=1;
++    int c=0;
++    char LBuf[1000], *sdum;
++    if (*s == '\n') {
++        if (InNewLineSequence) {
++            fputs("<nl>\n", fp);
++        } else {
++            fputs("<nl><nl>\n\n", fp);
++            InNewLineSequence = 1;
++        }
++        part->isrich = 1;
++        PartEndsWithNewline=1;
++        return;
++    }
++    InNewLineSequence = 0;
++    if (RightToLeftMode) {
++        sdum = s+strlen(s)-1;
++        if (*sdum == '\n') --sdum;
++        while (sdum >= s) {
++            LBuf[c++] = *sdum--;
++        }
++        LBuf[c++] = '\n';
++        LBuf[c] = '\0';
++        s = LBuf;
++    }
++    if (isspace((unsigned char) *s)) {
++        /* Lines that start with spaces should not be folded! */
++        fputs("<nl>", fp);
++        part->isrich = 1;
++    }
++    if (s) {
++        if (EightBitMode) part->encoding_type_needed = ENC_QP;
++        while (*s) {
++            c = (unsigned char) *s;
++            if (EightBitMode) {
++                if (isprint(c) && ! isspace(c)) {
++                    c = c+128;
++                }
++                putc(c, fp);
++                putc(c, stdout);
++            } else if (c == '<') {
++                part->isrich = 1;
++                fputs("<lt>", fp);
++            } else {
++                if (c > 127 || c < 0) {
++                    part->encoding_type_needed = ENC_QP;
++                    if (!strcmp(CharacterSet, "us-ascii")) {
++                        SwitchToEuropean();
++                    }
++                }
++                putc(c, fp);
++                if (RightToLeftMode) putc(c, stdout);
++            }
++            ++s;
++        }
++        PartEndsWithNewline = (c == '\n') ? 1 : 0;
++    }
++}
++
++cleanexit(code)
++int code;
++{
++    finalize();
++    exit(code);
++}
++
++finalize() {
++    while (FirstPart) {
++        unlink(FirstPart->filename);
++        FirstPart = FirstPart->next;
++    }
++    FinalizeTerminal();
++}
++
++void
++cleanup(signum)
++int signum;
++{
++    if (fpout) {
++        TempCloseStyles(fpout);
++        fclose(fpout);
++    }
++    if (signum == SIGPIPE) {
++        (void) WriteDeadLetter();
++    }
++    if (signum == SIGINT) {
++        if (V_ignore) {
++            printf("Interrupt ignored because 'ignore' is set.  Use ~q if you want to quit.\n");
++            return;
++        } else {
++            (void) WriteDeadLetter();
++        }
++    }
++    finalize();
++    signal(signum, SIG_DFL);
++    kill(getpid(), signum);
++}
++
++InitSignals() {
++    signal(SIGINT, cleanup);
++    signal(SIGPIPE, cleanup);
++    signal(SIGILL, cleanup);
++    signal(SIGTRAP, cleanup);
++    signal(SIGIOT, cleanup);
++    signal(SIGFPE, cleanup);
++    signal(SIGSEGV, cleanup);
++    signal(SIGTERM, cleanup);
++#ifdef SIGXCPU
++    signal(SIGXCPU, cleanup);
++#endif
++}
++
++WriteDeadLetter()
++{
++    FILE *fp;
++    char DeadFile[1000];
++
++    snprintf(DeadFile, sizeof(DeadFile), "%s/dead.letter", gethome());
++    fp = fopen(DeadFile, "w");
++    WriteOutMessage(fp, ToList, Subject, CCList, FirstPart);
++    if(fclose(fp)) {
++        perror("Could not write ~/dead.letter\n");
++        return(-1);
++    } else {
++        printf("Wrote draft to ~/dead.letter\n");
++        return(0);
++    }
++}
++
++struct MailcapEntry {
++    char *contenttype;
++    char *command;
++    char *testcommand;
++    char *editcommand;
++    char *composecommand;
++    char *composetypedcommand;
++    char *label;
++    int needsterminal;
++    int copiousoutput;
++    struct MailcapEntry *next;
++} *FirstMailcapEntry = NULL;
++
++/* There are a fair number of core leaks in what follows.  That should matter little -- the mailcap files are only parsed once, and are usually pretty small anyway. */
++
++char *
++GetCommand(s, t)
++char *s, **t;
++{
++    char *s2;
++    int quoted = 0;
++    s2 = malloc(strlen(s)*2); /* absolute max, if all % signs */
++    if (!s2) nomemabort();
++    *t = s2;
++    while (s && *s) {
++	if (quoted) {
++            if (*s == '%') *s2++ = '%'; /* Quote through next level, ugh! */
++
++            *s2++ = *s++;
++	    quoted = 0;
++	} else {
++	    if (*s == ';') {
++                *s2 = '\0';
++		return(++s);
++	    }
++	    if (*s == '\\') {
++		quoted = 1;
++		++s;
++	    } else {
++		*s2++ = *s++;
++	    }
++	}
++    }
++    *s2 = '\0';
++    return(NULL);
++}	
++
++char *Cleanse(s, dolc) /* no leading or trailing space, all lower case */
++char *s;
++int dolc;
++{
++    char *tmp, *news;
++    
++    /* strip leading white space */
++    while (*s && isspace((unsigned char) *s)) ++s;
++    news = s;
++    /* put in lower case, find end */
++    for (tmp=s; *tmp; ++tmp) {
++        if (dolc && isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
++    }
++    /* strip trailing white space */
++    while (--tmp && *tmp && isspace((unsigned char) *tmp)) *tmp = '\0';
++    return(news);
++}
++
++char *DeQuote(s)
++char *s;
++{
++    char *retval;
++    s = Cleanse(s, 0);
++    if (*s != '"') return(s);
++    retval = ++s;
++    while (s && *s) {
++        s = index(s, '\"');
++        if (!s) return(retval); /* but it's a bad parse */
++        if (*(s-1) != '\\') {
++            *s = '\0';
++            return(retval);
++        }
++        ++s;
++    }
++    return(retval); /* also a bad parse */
++}    
++
++struct MailcapEntry *
++GetMailcapEntry(fp)
++FILE *fp;
++{
++    int rawentryalloc = MAX_LINELENGTH, len;
++    char *rawentry, *s, *t, *LineBuf;
++    struct MailcapEntry *mc;
++
++    LineBuf = malloc(MAX_LINELENGTH);
++    if (!LineBuf) nomemabort();
++    rawentry = malloc(1 + rawentryalloc);
++    mc = (struct MailcapEntry *) malloc(sizeof (struct MailcapEntry));
++    if (!rawentry || !mc) nomemabort();
++    *rawentry = '\0';
++    while (fgets(LineBuf, MAX_LINELENGTH, fp)) {
++	if (LineBuf[0] == '#') continue;
++	len = strlen(LineBuf);
++        if (LineBuf[len-1] == '\n') LineBuf[--len] = '\0';
++	if ((len + strlen(rawentry)) > rawentryalloc) {
++            rawentryalloc += MAX_LINELENGTH;
++	    rawentry = realloc(rawentry, rawentryalloc+1);
++	    if (!rawentry) nomemabort();
++	}
++	if (LineBuf[len-1] == '\\') {
++            LineBuf[len-1] = '\0';
++	    strcat(rawentry, LineBuf);
++	} else {
++	    strcat(rawentry, LineBuf);
++	    break;
++	}
++    }
++    free(LineBuf);
++    for (s=rawentry; *s && isspace((unsigned char) *s); ++s) ;
++    if (!*s) {
++	/* totally blank entry -- quietly ignore */
++	free(rawentry);
++	return(NULL);
++    }
++    s = index(rawentry, ';');
++    if (!s) {
++	fprintf(stderr, "mailto: Ignoring invalid mailcap entry: %s\n", rawentry);
++	free(rawentry);
++	return(NULL);
++    }
++    *s++ = '\0';
++    mc->needsterminal = 0;
++    mc->copiousoutput = 0;
++    mc->testcommand = NULL;
++    mc->composecommand = NULL;
++    mc->composetypedcommand = NULL;
++    mc->editcommand = NULL;
++    mc->label = NULL;
++    mc->contenttype = malloc(1+strlen(rawentry));
++    mc->next = NULL;
++    if (!mc->contenttype) nomemabort();
++    strcpy(mc->contenttype, rawentry);
++    t = GetCommand(s, &mc->command);
++    s = t;
++    while (s) {
++	char *arg, *eq;
++
++        t = GetCommand(s, &arg);
++/*        if (t) *t++ = '\0'; */
++        eq = index(arg, '=');
++        if (eq) *eq++ = '\0';
++        arg = Cleanse(arg, 1);
++	if (!strcmp(arg, "needsterminal")) {
++	    mc->needsterminal = 1;
++	} else if (!strcmp(arg, "copiousoutput")) {
++	    mc->copiousoutput = 1;
++        } else if (eq && !strcmp(arg, "test")) {
++            mc->testcommand = DeQuote(eq);
++        } else if (eq && !strcmp(arg, "edit")) {
++            mc->editcommand = DeQuote(eq);
++        } else if (eq && !strcmp(arg, "compose")) {
++            mc->composecommand = DeQuote(eq);
++        } else if (eq && !strcmp(arg, "composetyped")) {
++            mc->composetypedcommand = DeQuote(eq);
++        } else if (eq && !strcmp(arg, "description")) {
++            mc->label = DeQuote(eq);
++        } else if (eq && !strcmp(arg, "label")) { 
++            mc->label = DeQuote(eq); /* bogus old name for description */
++        } else if (eq && !strcmp(arg, "textualnewlines")) {
++            ExceptionalNewline(mc->contenttype, atoi(eq));
++	} else if (strcmp(arg, "notes")) { /* IGNORE notes field */
++/*	    if (*arg) fprintf(stderr, "mailto: Ignoring invalid mailcap flag: %s\n", arg);  */
++	}
++	s = t;
++    }
++    free(rawentry);
++    return(mc);
++}
++
++ProcessMailcapFiles() 
++{
++    char *s, *path = getenv("MAILCAPS"), *origpath;
++    static char *stdpath = STDPATH;
++    struct MailcapEntry *mc, *CurrentMailcapEntry = NULL;
++    FILE *fp;
++
++    if (!path) {
++        int uid = getuid();
++        struct passwd *p;
++        p = getpwuid(uid);
++        if (p) path = malloc(5+strlen(p->pw_dir) + strlen(stdpath));
++        if (!p || !path) nomemabort();
++        strcpy(path, p->pw_dir);
++        strcat(path, stdpath);
++    } else {
++        char *pathcopy;
++        pathcopy = malloc(1+strlen(path));
++        if (!pathcopy) nomemabort();
++        strcpy(pathcopy, path);
++        path = pathcopy;
++    }
++    origpath = path;
++    while(path) {
++        s = index(path, PATH_SEPARATOR);
++        if (s) *s++ = '\0';
++        fp = fopen(path, "r");
++        while (fp && !feof(fp)) {
++            mc = GetMailcapEntry(fp);
++            if (!mc) continue;
++            if (!FirstMailcapEntry) {
++                FirstMailcapEntry = mc;
++                CurrentMailcapEntry = mc;
++            } else {
++                CurrentMailcapEntry->next = mc;
++                CurrentMailcapEntry = mc;
++            }
++	}
++        if (fp) fclose(fp);
++        path = s;
++    }
++    free(origpath);
++    return(-1);
++}
++
++struct mailpart *
++CreateNewPart() {
++    struct mailpart *mp;
++    struct MailcapEntry *mc = FirstMailcapEntry;
++    int i, ans, resultcode;
++    char LineBuf[100], *CmdBuf;
++
++    mp = NewPart();
++    if (!mp) return(NULL);
++    printf("Please choose which kind of data you wish to insert:\n\n");
++    printf("0: A raw file, possibly binary, of no particular data type.\n");
++    printf("1: Raw data from a file, with you specifying the content-type by hand.\n");
++    i = 1;
++    while (mc) {
++        if (mc->composecommand || mc->composetypedcommand) {
++            ++i;
++            if (mc->label) {
++                printf("%d: %s\n", i, mc->label);
++            } else {
++                printf("%d: data in '%s' format\n", i, mc->contenttype);
++            }
++        }
++        mc = mc->next;
++    }
++    printf("\n\nEnter your choice as a number from 0 to %d: ", i);
++    fflush(stdout);
++    fgets(LineBuf, sizeof(LineBuf), stdin);
++    ans = atoi(LineBuf);
++    if (ans == 0 || ans == 1) {
++        char *sdum, CTLineBuf[100];
++        FILE *fpi, *fpo;
++	printf("\nIf you want to include non-textual data from a file, enter the file name.\nTo include the output of a command, enter \"|\" followed by the command.\nIf you do not want to include anything, just press ENTER (RETURN).\n> ");
++        fflush(stdout);
++        fgets(CTLineBuf, sizeof(CTLineBuf), stdin);
++        sdum = CTLineBuf+strlen(CTLineBuf) -1;
++        while (sdum >= CTLineBuf && isspace((unsigned char) *sdum)) {
++            *sdum = '\0';
++            --sdum;
++        }
++        sdum=CTLineBuf;
++        while (*sdum && isspace((unsigned char) *sdum)) ++sdum;
++        if (! *sdum) {
++            printf("Data insertion cancelled\n");
++            return(NULL);
++        }
++	if (*sdum == '|') {
++	    fpi = popen(sdum+1, "r");
++	} else {
++	    fpi = fopen(sdum, "r");
++	}
++        if (!fpi) {
++            printf("Cannot read %s, data insertion cancelled\n", sdum);
++            return(NULL);
++        }
++        fpo = fdopen(mkstemp(mp->filename), "w");
++        if (!fpo) {
++            printf("Cannot open temporary file, data insertion cancelled\n");
++            return(NULL);
++        }
++        (void) TranslateInputToEncodedOutput(fpi, fpo, ENC_NONE, "");
++	if (*sdum == '|') {
++	    fclose(fpi);
++	} else {
++	    pclose(fpi);
++	}
++        fclose(fpo);
++        mp->istext = 0;
++        if (ans == 1) {
++            while (1) {
++                int ct;
++                printf("\nEnter the MIME Content-type value for the data from file %s\n    (type '?' for a list of locally-valid content-types): ", sdum);
++                fflush(stdout);
++                fgets(LineBuf, sizeof(LineBuf), stdin);
++		LineBuf[strlen(LineBuf)-1]='\0';
++                if (index(LineBuf, '/')) {
++                    char lc[100], *s, AnsBuf[100];
++                    strcpy(lc, LineBuf);
++                    for (s=lc; *s; ++s) {
++                        if (isupper(*s)) *s = tolower(*s);
++                    }
++                    if (!strcmp(lc, "text/plain")) break;
++                    if (!strcmp(lc, "application/octet-stream")) break;
++                    mc=FirstMailcapEntry;
++                    while (mc) {
++                        if (mc->contenttype && index(mc->contenttype, '/') && !index(mc->contenttype, '*') && !lc2strcmp(mc->contenttype, lc)) {
++                            break;
++                        }
++                        mc = mc->next;
++                    }
++                    if (mc) break;
++                    printf("The MIME content-type '%s' is not listed in your local mailcap files,\nand may not be a valid MIME type.  Do you want to use it anyway [no] ? ", LineBuf);
++                    s = fgets(AnsBuf, sizeof(AnsBuf), stdin);
++                    while (s && *s && isspace((unsigned char) *s)) ++s;
++                    if (s && (*s == 'y' || *s == 'Y')) break;
++                    continue;
++                }
++                printf("\nMIME content-type values are type/format pairs, and always include a '/'.\nThe types supported at your site include, but are not limited to:\n\n");
++                mc=FirstMailcapEntry;
++                ct = 0;
++                while (mc) {
++                    if (mc->contenttype && index(mc->contenttype, '/') && !index(mc->contenttype, '*')) {
++                        if (ct++) fputs(", ", stdout);
++                        fputs(mc->contenttype, stdout);
++                    }
++                    mc = mc->next;
++                }
++                fputs("\n\nThe MIME content-type for file inclusion is 'application/octet-stream'.\n", stdout);
++            }
++            mp->content_type = freshcopy(LineBuf);
++        } else mp->content_type=freshcopy("application/octet-stream");
++        mp->encoding_type_needed = WhichEncodingForFile(mp->filename, mp->content_type);
++        printf("Included data in '%s' format\n", mp->content_type);
++	printf("(continue)\n");
++        SetTextFlags(mp);
++        return(mp);
++    } else if (ans<0 || ans > i) {
++        printf("Data insertion cancelled\n");
++        return(NULL);
++    }
++    i=2;
++    mc=FirstMailcapEntry;
++    while (mc) {
++        if (mc->composecommand || mc->composetypedcommand) {
++            if (i == ans) break;
++            ++i;
++        }
++        mc = mc->next;
++    }
++    CmdBuf = malloc(CMDSIZE);
++    if (!CmdBuf) nomemabort();
++    BuildCommand(CmdBuf, mc->composecommand ? mc->composecommand : mc->composetypedcommand, mp->filename);
++    printf("Executing: %s\n", CmdBuf);
++    resultcode = SYSTEM(CmdBuf);
++    if (resultcode) {
++        printf("Command execution failed, nothing included\n");
++        free(CmdBuf);
++        return(NULL);
++    }
++    if (access(mp->filename, R_OK)) {
++        printf("No file was created, nothing included!\n");
++        free(CmdBuf);
++        return(NULL);
++    }
++    mp->istext = 0;
++    if (mc->composecommand) {
++        mp->content_type = mc->contenttype;
++        mp->encoding_type_needed = WhichEncodingForFile(mp->filename, mp->content_type);
++    } else {
++        char c, LineBuf[1000], *colon, *ctypebuf = NULL, *cencbuf = NULL, *s, *newfilename;
++        FILE *fp, *fpout;
++        int inheaders=1, bct=0;
++
++        s = LineBuf;
++        fp = fopen(mp->filename, "r");
++        if (!fp) {
++            fprintf(stderr, "Cannot read file %s, no data included.\n", mp->filename);
++            free(CmdBuf);
++            return(NULL);
++        }
++        while ((c = getc(fp)) != EOF && inheaders) {
++            if (c == '\n') {
++                c = getc(fp);
++                if (c == ' ' || c == '\t') {
++                    *s++ = ' ';
++                } else {
++                    /* actually process the header */
++                    *s = 0;
++                    colon = index(LineBuf, ':');
++                    if (colon) {
++                        *colon++ = 0;
++                        for (s=LineBuf; *s; ++s) {
++                            if (isupper(*s)) *s = tolower(*s);
++                        }
++                        if (!strcmp(LineBuf, "content-transfer-encoding")) {
++                            cencbuf = malloc(1+strlen(colon));
++                            if (!cencbuf) nomemabort();
++                            strcpy(cencbuf, colon);
++                        } else if (!strcmp(LineBuf, "content-type")) {
++                            ctypebuf = malloc(1+strlen(colon));
++                            if (!ctypebuf) nomemabort();
++                            strcpy(ctypebuf, colon);
++                        }
++                    }
++                    if (c == '\n') {
++                        inheaders = 0;
++                        break;
++                    }
++                    ungetc(c, fp);
++                    s = LineBuf; /* start over */
++                }
++            } else {
++                *s++ = c;
++            }
++        }
++        if (!ctypebuf) {
++            fprintf(stderr, "The command (%s) did not return a content-type value, so no data could be included.\n", CmdBuf);
++            free(CmdBuf);
++            return(NULL);
++        }
++        mp->content_type = ctypebuf;
++        if (cencbuf) {
++            while (*cencbuf && isspace(*cencbuf)) ++cencbuf;
++            for (s=cencbuf; *s; ++s) {
++                if (isupper(*s)) *s = tolower(*s);
++            }
++            if (!strncmp(cencbuf, "base64", 6)) {
++                mp->encoding_type_needed = ENC_B64;
++            } else if (!strncmp(cencbuf, "quoted-printable", 16)) {
++                mp->encoding_type_needed = ENC_QP;
++            } else {
++                fprintf(stderr, "The command (%s) returned an unrecognized content-transfer-encoding value, so no data could be included.\n", CmdBuf);
++                free(CmdBuf);
++                return(NULL);
++            }
++        } else {
++            mp->encoding_type_needed = ENC_NONE;
++        }
++        newfilename = tmpname();
++        fpout = fdopen(mkstemp(newfilename), "w");
++        if (!fpout) {
++            fprintf(stderr, "Cannot open file %s for writing, no data included.\n", newfilename);
++            free(CmdBuf);
++            return(NULL);
++        }
++        switch(mp->encoding_type_needed) {
++            case ENC_B64:
++                from64(fp, fpout, NULL, &bct, 0);
++                break;
++            case ENC_QP:
++                fromqp(fp, fpout, NULL, &bct);
++                break;
++            default:
++                while ((c = getc(fp)) != EOF) {
++                    putc(c, fpout);
++                }
++                break;
++        }
++        fclose(fp);
++        fclose(fpout);
++        unlink(mp->filename);
++        mp->filename = newfilename;
++    }
++    SetTextFlags(mp);
++    printf("Included data in '%s' format\n", mc->contenttype);
++    printf("(continue)\n");
++    free(CmdBuf);
++    return(mp);
++}
++
++SetTextFlags(mp)
++struct mailpart *mp;
++{
++    if (!lc2strncmp(mp->content_type, "text/", 5)) {
++        mp->istext = 1;
++        if (!lc2strncmp(mp->content_type, "text/richtext", 13)) {
++            mp->isrich = 1;
++        }
++    }
++}
++
++WhichEncodingForFile(fname, ctype)
++char *fname, *ctype;
++{
++    int c, linesize=0, total=0, unsafechars=0, longlines=0;
++    char *s;
++    FILE *fp = fopen(fname, "r");
++    if (!fp) {
++        /* If the stupid editing program forks, this actually will do a 
++              reasonable thing as long as it saves the file before the mail is sent */
++        return(ENC_B64); /* safest */
++    }
++    while ((c = getc(fp)) != EOF) {
++        if (c>127) ++unsafechars;
++        ++total;
++        if (c == '\n') {
++            if (linesize > 79) ++longlines;
++            linesize = 0;
++        } else ++linesize;
++        if (total>1000 && (longlines || unsafechars)) break;
++    }
++    fclose(fp);
++    if (longlines || unsafechars) {
++        for (s=ctype; *s; ++s) if (isupper((unsigned char) *s)) *s = tolower((unsigned char) *s);
++        if (!strncmp(ctype, "image/", 6)
++             || !strncmp(ctype, "audio/", 6)
++             || !strncmp(ctype, "application/octet-stream", 24)
++             || !strncmp(ctype, "video/", 6)) {
++            return(ENC_B64);
++        }
++        if (!unsafechars) return(ENC_QP);
++
++        return((total/unsafechars < 16) ? ENC_B64 : ENC_QP);
++    }
++    return(ENC_NONE);
++}
++
++BuildCommand(Buf, controlstring, TmpFileName)
++char *Buf, *controlstring, *TmpFileName;
++{
++    char *from, *to;
++    int prefixed = 0;
++    int NamedFile=0;
++
++    for (from=controlstring, to=Buf; *from; ++from) {
++        if (prefixed) {
++            prefixed = 0;
++            switch(*from) {
++                case '%':
++                    *to++ = '%';
++                    break;
++                case 's':
++                    if (TmpFileName) {
++                        strcpy(to, TmpFileName);
++                        to += strlen(TmpFileName);
++                        ++NamedFile;
++                    }
++                    break;
++                default:
++                    fprintf(stderr, "Ignoring unrecognized format code in mailcap file: %%<%c\n", *from);
++                    break;
++            }
++        } else if (*from == '%') {
++            prefixed = 1;
++        } else {
++            *to++ = *from;
++        }
++    }
++    *to = '\0';
++    if (!NamedFile) {
++        strcat(Buf, " > ");
++        strcat(Buf, TmpFileName);
++    }
++}
++
++CtypeMatch(ctype, pat)
++char *ctype, *pat;
++{
++    int len;
++    char *s;
++    for (s=ctype; *s; ++s) if (isupper((unsigned char) *s)) *s = tolower((unsigned char) *s);
++    for (s=pat; *s; ++s) if (isupper((unsigned char) *s)) *s = tolower((unsigned char) *s);
++    if (!strcmp(ctype, pat)) {
++        return(1); /* exact match, case-insensitive */
++    }
++    len = strlen(pat);
++    if ((pat[--len] == '*')
++         && (pat[--len] == '/')
++         && (!strncmp(ctype, pat, len))
++         && (ctype[len] == '/')){
++        /* wildcard match */
++        return(1);
++    }
++    return(0);
++}
++
++EditCurrentMessage(UseVisual)
++int UseVisual;
++{
++    char *editor = NULL;
++    char *CmdBuf, *CmdBuf2, LineBuf[100];
++    struct mailpart *mp, *lastmp=NULL;
++    struct MailcapEntry *mc;
++    int partct=1, ans;
++
++    CmdBuf = malloc(CMDSIZE);
++    CmdBuf2 = malloc(CMDSIZE);
++    if (!CmdBuf || !CmdBuf2) nomemabort();
++    if (!PartEndsWithNewline) {
++        putc('\n', fpout);
++        PartEndsWithNewline=1;
++    }
++    fclose(fpout);
++    if (UseVisual) editor = getenv("VISUAL");
++    if (!editor) editor = getenv("EDITOR");
++    if (!editor) editor = DEFAULT_EDITOR;
++    if (!FirstPart->next) {
++        /* Only one part */
++        snprintf(CmdBuf, sizeof(CmdBuf), "%s %s", editor, FirstPart->filename);
++        printf("Executing: %s\n", CmdBuf);
++        SYSTEM(CmdBuf);
++        if ((FirstPart->istext || FirstPart->isrich) &&
++             FirstPart->encoding_type_needed == ENC_NONE &&
++             ContainsEightBitChar(FirstPart->filename)) {
++            FirstPart->encoding_type_needed = ENC_QP;
++        }
++        fpout = fopen(FirstPart->filename, "a");
++        free(CmdBuf);
++        free(CmdBuf2);
++        return;
++    }
++    lastmp = mp = FirstPart;
++    while (mp) {
++        printf("Part #%d is of type '%s'.\n", partct, mp->content_type);
++        snprintf(CmdBuf, sizeof(CmdBuf), "%s %s", editor, mp->filename);
++        if (mp->mc && mp->mc->editcommand) {
++            BuildCommand(CmdBuf2, mp->mc->editcommand, mp->filename);
++        } else {
++            mc = FirstMailcapEntry;
++            while (mc) {
++                if (mc->editcommand && CtypeMatch(mp->content_type, mc->contenttype)) {
++                    break;
++                }
++                mc = mc->next;
++            }
++            if (mc) {
++                BuildCommand(CmdBuf2, mc->editcommand, mp->filename);
++            } else {
++                CmdBuf2[0] = '\0';
++            }
++        }
++        if (CmdBuf2[0]) {
++            printf("Which command do you want to use to edit it?\n\n");
++            printf("1: %s\n", CmdBuf2);
++            printf("2: %s\n", CmdBuf);
++            printf("\n\nEnter 1 or 2, or 0 to not edit it: ");
++            fflush(stdout);
++            fgets(LineBuf, sizeof(LineBuf), stdin);
++            ans = atoi(LineBuf);
++        } else ans = 2;
++        if (ans == 1) {
++            printf("Executing: %s\n", CmdBuf2);
++            SYSTEM(CmdBuf2);
++        } else if (ans == 2) {
++            printf("Executing: %s\n", CmdBuf);
++            SYSTEM(CmdBuf);
++        }
++        if ((mp->istext || mp->isrich) &&
++             mp->encoding_type_needed == ENC_NONE &&
++             ContainsEightBitChar(mp->filename)) {
++            mp->encoding_type_needed = ENC_QP;
++        }
++        ++partct;
++        lastmp = mp;
++        mp = mp->next;
++    }
++    fpout = fopen(lastmp->filename, "a");
++    free(CmdBuf);
++    free(CmdBuf2);
++}
++
++
++ProcessInitFiles() {
++    char fname[FILE_NAME_SIZE];
++
++    ProcessOneMailRC("/usr/lib/Mail.rc", 0);
++    snprintf(fname, sizeof(fname), "%s/.mailrc", gethome());
++    ProcessOneMailRC(fname, 0);
++    snprintf(fname, sizeof(fname), "%s/.AMS_aliases", gethome());
++    ProcessOneMailRC(fname, 1);
++}
++
++char *
++NextAliasLine(LineBuf, LineAlloced, LineCount, fp, IsAndrew)
++char *LineBuf;
++int *LineAlloced, *LineCount;
++FILE *fp;
++int IsAndrew;
++{
++    char *sbuf;
++    sbuf = malloc(MAX_LINELENGTH);
++    if (!sbuf) nomemabort();
++    if (!LineBuf) {
++        *LineAlloced = MAX_LINELENGTH + MAX_LINELENGTH;
++        LineBuf = malloc(*LineAlloced);
++        if (!LineBuf) nomemabort();
++    }
++    *LineBuf = 0;
++    *LineCount = 0;
++    while (1) {
++        if (fgets(sbuf, MAX_LINELENGTH, fp) == NULL) {
++            return(LineBuf);
++        }
++        *LineCount += strlen(sbuf);
++        if (*LineCount >= *LineAlloced) {
++            *LineAlloced += MAX_LINELENGTH;
++            LineBuf = realloc(LineBuf, *LineAlloced);
++            if (!LineBuf) nomemabort();
++        }
++        strcat(LineBuf, sbuf);
++        if (IsAndrew || LineBuf[*LineCount - 2] != '\\') return(LineBuf);
++        /* The -2 got us past the newline. */
++        LineBuf[*LineCount - 2] = ' ';
++        *LineCount -= 1;
++        LineBuf[*LineCount] = '\0';
++    }
++}
++
++ProcessOneMailRC(fname, IsAndrew)
++char *fname;
++int IsAndrew;
++{
++    FILE *fp;
++    char *LineBuf = NULL, *sdum;
++    int LineAlloced = 0, LineCount = 0;
++
++    fp = fopen(fname, "r");
++    if (!fp) return;
++    do {
++        LineBuf=NextAliasLine(LineBuf, &LineAlloced, &LineCount, fp, IsAndrew);
++        if (LineCount == 0) continue;
++        if (IsAndrew && LineBuf[0] == '#') continue;
++        for (sdum = LineBuf; *sdum; ++sdum) {
++            if (*sdum == ' ') break; /* only map first word to lower case */
++            if (isupper((unsigned char) *sdum)) *sdum = tolower((unsigned char) *sdum);
++        }
++        if (IsAndrew) {
++            HandleAliasCommand(LineBuf);
++        } else if (!strncmp(LineBuf, "set ", 4)) {
++            HandleSetCommand(LineBuf+4, 1);
++        } else if (!strncmp(LineBuf, "unset ", 6)) {
++            HandleSetCommand(LineBuf+6, 0);
++        } else if (!strncmp(LineBuf, "alias ", 6)) {
++            HandleAliasCommand(LineBuf+6);
++        } else {
++            /* ignore */
++        }
++    } while (LineCount != 0);
++    free(LineBuf);
++    fclose(fp);
++}
++
++HandleSetCommand(cmd, DoSet)
++char *cmd;
++int DoSet;
++{
++    char *s;
++    int i;
++
++    while (*cmd) {
++        while (*cmd && isspace((unsigned char) *cmd)) ++cmd;
++        for (s=cmd; *s && !isspace((unsigned char) *s); ++s) {;}
++        *s++ = '\0';
++        if (!strcmp(cmd, "askcc")) {
++            V_askcc = DoSet;
++        } else if (!strcmp(cmd, "dot")) {
++            V_dot = DoSet;
++        } else if (!strcmp(cmd, "ignore")) {
++            V_ignore = DoSet;
++        } else if (!strcmp(cmd, "verbose")) {
++            V_verbose = DoSet;
++        } else if (!strcmp(cmd, "quiet")) {
++            V_quiet = DoSet;
++        } else if (!strcmp(cmd, "keepblind")) {
++            V_keepblind = DoSet;
++        } else if (!strcmp(cmd, "commasonly")) {
++            V_commasonly = DoSet;
++        } else if (!strncmp(cmd, "splitsize ", 9)) {
++            i = atoi(cmd+10);
++            if (i < MINCHUNKSIZE) {
++                fprintf(stderr, "Ignoring splitsize mailrc setting of %d -- the minimum value is %d\n", i, MINCHUNKSIZE);
++            } else {
++                SplitSize = i;
++            }
++        } else {
++            /* ignore */
++        }
++        cmd = s;;
++    }
++}
++
++struct alias {
++    char *shortname, *longname;
++    struct alias *next;
++} *FirstAlias = NULL;
++
++HandleAliasCommand(aliasline)
++char *aliasline;
++{
++    struct alias *tmpalias;
++    char *s, *s2;
++    int len = strlen(aliasline);
++
++    if (aliasline[len - 1] == '\n') {
++        aliasline[len - 1] = '\0';
++    }
++    tmpalias = (struct alias *) malloc(sizeof (struct alias));
++    s = malloc(len + 1);
++    if (!s || !tmpalias) nomemabort();
++    strcpy(s, aliasline);
++    while (*s && isspace((unsigned char) *s)) { ++s;}
++    for (s2=s; *s2 && !isspace((unsigned char) *s2); ++s2) {;}
++    if (!*s2) {
++        if (s != s2) printf("mailto: ignoring bad alias line in init file: %s\n", aliasline);
++        free(s);
++        free(tmpalias);
++        return;
++    }
++    *s2++ = '\0';
++    tmpalias->shortname = s;
++    tmpalias->longname = s2;
++    tmpalias->next = FirstAlias;
++    FirstAlias = tmpalias;
++}
++
++EmitHeader(fp, hdr, body)
++FILE *fp;
++char *hdr;
++char *body;
++{
++    fputs(hdr, fp);
++    fputs(": ", fp);
++    HeaderFputs(body, fp, hdr);
++    fputs("\n", fp);
++/*    fprintf(fp, "%s: %s\n", hdr, body ? body : ""); */
++}
++
++char *
++firstbad(s)
++char *s;
++{
++    char *dum;
++    for (dum=s; *dum; ++dum) {
++        if (!isascii(*dum) || iscntrl(*dum)) {
++            return(dum);
++        }
++    }
++    return(NULL);
++}
++
++char *
++firstgood(s)
++char *s;
++{
++    char *dum;
++    for (dum=s; *dum; ++dum) {
++        if (isascii(*dum) && !iscntrl(*dum)) {
++            return(dum);
++        }
++    }
++    return(NULL);
++}
++
++HeaderFputs(s, fp, hdr)
++char *s;
++FILE *fp;
++char *hdr;
++{
++    char *firstnonascii, *firstascii;
++
++    if (!s) return;
++    firstnonascii=firstbad(s);
++    if (firstnonascii) {
++        if (!strcmp(CharacterSet, "us-ascii")) {
++            fprintf(stderr, "Warning:  The prevailing character set is ASCII.  Your %s header has\nnon-ASCII or non-printing ASCII characters which may be unreadable.\n", hdr);
++        }
++        while (firstnonascii) {
++            while (s < firstnonascii) {
++                putc(*s, fp);
++                ++s;
++            }
++            firstascii=firstgood(s);
++            if (!firstascii) firstascii = s+strlen(s);
++            if ((firstascii - s) > 25) firstascii = s+25; /* Short encoded words */
++            /* general format is =?charset?B or Q?encoded data?= */
++            fprintf(fp, "=?%s?Q?", CharacterSet);
++            while (s < firstascii) {
++                PutQP(*s, fp);
++                ++s;
++            }
++            fputs("?= ", fp); /* close encoded word */
++            firstnonascii=firstbad(s);
++        }
++        while (*s) {
++            putc(*s, fp);
++            ++s;
++        }
++    } else {
++        fputs(s, fp);
++    }
++}
++
++static char basis_hex[] = "0123456789ABCDEF";
++
++PutQP(c, fp)
++unsigned char c;
++FILE *fp;
++{
++    putc('=', fp);
++    putc(basis_hex[c>>4], fp);
++    putc(basis_hex[c&0xF], fp);
++}
++
++EmitHeaderWithAliases(fp, hdr, names)
++FILE *fp;
++char *hdr;
++char *names;
++{
++    fputs(hdr, fp);
++    fputs(": ", fp);
++    EmitAddresses(fp, names, hdr);
++    fputs("\n", fp);
++}
++
++EmitAddresses(fp, names, hdr)
++FILE *fp;
++char *names;
++char *hdr;
++{
++    char *s;
++    while (names) {
++        s= index(names, ',');
++        if (s) *s = '\0';
++        DeAlias(names, fp, hdr);
++        if (s) {
++            *s++ = ',';
++            fputs(",\n\t", fp);
++        }
++        names = s;
++    }
++}
++
++DeAlias(name, fp, hdr)
++char *name;
++FILE *fp;
++char *hdr;
++{
++    struct alias *tmpalias;
++    char *end, savechar;
++
++    while (isspace((unsigned char) *name)) ++name;
++    end = name+strlen(name)-1;
++    while (isspace((unsigned char) *end)) --end;
++    ++end;
++    savechar = *end;
++    for (tmpalias=FirstAlias; tmpalias; tmpalias = tmpalias->next) {
++        if (!strcmp(tmpalias->shortname, name)) { 
++/*        if (!lc2strcmp(name, tmpalias->shortname)) { */
++            *end = savechar;
++            EmitAddresses(fp, tmpalias->longname, hdr);
++            return;
++        }
++    }
++    *end = savechar;
++    HeaderFputs(name, fp, hdr);
++}
++
++
++WriteCtypeNicely(fp, ct)
++FILE *fp;
++char *ct;
++{
++    char *semi, *slash, *eq, *s;
++
++    for (s = ct; *s; ++s) {
++        if (*s == '\n') *s = ' ';
++    }
++    semi = (char *) index(ct, ';');
++    if (semi) *semi = '\0';
++    slash = (char *) index(ct, '/');
++    fputs(ct, fp);
++    if (!slash) fputs("/unknown", fp);
++    while (semi) {
++        ct = semi + 1;
++        *semi = ';';
++        semi = (char *) index(ct, ';');
++        if (semi) *semi = '\0';
++        eq = (char *) index(ct, '=');
++        if (eq) *eq = '\0';
++        fputs(";\n\t", fp);
++        while (isspace((unsigned char) *ct)) ++ct;
++        fputs(ct, fp);
++        if (eq) {
++            s = eq;
++            fputs("=", fp);
++            ++s;
++            while (isspace((unsigned char) *s)) ++s;
++            fputsquoting(s, fp);
++            *eq = '=';
++        }
++    }
++}
++
++fputsquoting(s, fp)
++char *s;
++FILE *fp;
++{
++    char *end = s + strlen(s) - 1;
++    while (isspace((unsigned char) *end) && end > s) --end;
++    if (*s == '\"') {
++        putc(*s, fp);
++        while (*++s) {
++            if (*s == '\"') break; /* MAY TERMINATE EARLY! */
++            if (*s == '\\') {
++                putc(*s, fp);
++                ++s; /* Don't check this next char */
++                if (!*s) break;
++            }
++            putc(*s, fp);
++        }
++        putc('\"', fp);
++    } else {
++        putc('\"', fp);
++        putc(*s, fp);
++        while (*++s) {
++            if (*s == '\"' || *s == '\\') {
++                putc('\\', fp);
++            }
++            putc(*s, fp);
++        }
++        putc('\"', fp);
++    }
++}
++        
++        
++controlputc(c)
++char c;
++{
++    fputc(c, stdout);
++}
++
++/* Do the equivalent of an fputs for the terminal escape stuff */
++
++tfputs(s)
++char *s;
++{
++    tputs(s, 1, controlputc);
++}
++
++ContainsEightBitChar(fname)
++char *fname;
++{
++    int c, eightBitSeen = 0;
++    FILE *fp = fopen(fname, "r");
++    if (!fp) {
++        /* If the stupid editing program forks, this actually will do a
++              reasonable thing as long as it saves the file before the mail is sent */
++        return(1); /* safest */
++    }
++    while ((c = getc(fp)) != EOF) {
++        if (c>127) {
++            eightBitSeen = 1;
++            break;
++        }
++    }
++    fclose(fp);
++    return(eightBitSeen);
++}
++
++SwitchToEuropean() {
++    printf("WARNING:  You have entered 8-bit characters in what is supposed to be\n");
++    printf("plain ASCII text.  If you are using a non-ASCII character set, you should\n");
++    printf("declare this to be the case with the MM_CHARSET environment variable.\n");
++    printf("For now, I am assuming you are using the iso-8859-1 character set,\n");
++    printf("but this may be false.\n");
++    CharacterSet = malloc(12);
++    if (!CharacterSet) nomemabort();
++    strcpy(CharacterSet, "iso-8859-1");
++}
++
++    
+--- metamail-2.7.orig/bin/Makefile.am
++++ metamail-2.7/bin/Makefile.am
+@@ -0,0 +1,9 @@
++MAINTAINERCLEANFILES    = Makefile.in
++
++bin_SCRIPTS		= audiocompose audiosend extcompose getfilename \
++			mailserver mailto-hebrew metasend mimeit \
++			patch-metamail rcvAppleSingle showaudio showexternal \
++			shownonascii showpartial showpicture sndAppleSingle \
++			sun-audio-file sun-message sun-message.csh \
++			sun-to-mime sun2mime uudepipe uuenpipe
++
+--- metamail-2.7.orig/bin/mailserver
++++ metamail-2.7/bin/mailserver
+@@ -1,4 +1,4 @@
+-#!/bin/csh -fb
++#!/bin/csh -efb
+ # (The "-fb" might need to be changed to "-f" on some systems)
+ #
+ # Mailserver -- a simple MIME mailserver script.
+@@ -18,17 +18,15 @@
+ set LOCALADDR=mail-server
+ set ROOTDIR=/usr/spool/ftp
+ set MAINTAINER=postmaster
+-set METAMAILDIR=/usr/local/bin
+ set LOGADDR=andrew@thumper.bellcore.com
+ # If LOGADDR is the empty string, no logging is done.
+ #
+ # The real program begins here.
+ 
+-setenv PATH ${METAMAILDIR}:${PATH}
+ rehash
+ set FromName=""
+ set Subject=""
+-set TmpFile=/tmp/ms.$$
++set TmpFile=`tempfile -p metamail -m 600`
+ set FOORAW=$<
+ while ("$FOORAW" != "") 
+ set FOO=(` echo "$FOORAW" | tr "[" "x"`)
+@@ -68,7 +66,7 @@
+ probably run in some circumstance other than mail delivery.
+ --------------------
+ !
+-	cat $TmpFile - | /usr/lib/sendmail $MAINTAINER
++	cat $TmpFile - | /usr/sbin/sendmail $MAINTAINER
+ 	# Takes the rest of the message from standard input
+ 	rm $TmpFile
+ 	exit 0
+@@ -86,7 +84,7 @@
+ 
+ The file you requested, if it exists, will not be sent to you.
+ !
+-	/usr/lib/sendmail -t < $TmpFile
++	/usr/sbin/sendmail -t < $TmpFile
+ 	rm $TmpFile
+ 	exit 0
+ endif
+@@ -107,7 +105,7 @@
+ --------------------------------
+ !
+ 	ls -R >> $TmpFile
+-	/usr/lib/sendmail -t < $TmpFile
++	/usr/sbin/sendmail -t < $TmpFile
+ 	rm $TmpFile
+ 	exit 0
+ endif
+@@ -135,13 +133,13 @@
+   metasend -b -t "$FromName" -f "$Subject" -m "$ct" -s "Re: $Subject"
+ 
+ !
+-	/usr/lib/sendmail -t < $TmpFile
++	/usr/sbin/sendmail -t < $TmpFile
+ 	rm $TmpFile
+ 	exit 0
+ endif
+ 
+ if ("$LOGADDR" != "") then
+-	/usr/lib/sendmail -t <<!
++	/usr/sbin/sendmail -t <<!
+ From: ${LOCALADDR}@`hostname`
+ To: $LOGADDR
+ Subject: Autosend delivery report
+--- metamail-2.7.orig/bin/getfilename
++++ metamail-2.7/bin/getfilename
+@@ -1,16 +1,36 @@
+-#!/bin/csh -fb
+-# (The "-fb" might need to be changed to "-f" on some systems)
+-#
++#!/bin/sh -e
++# Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++# 
++# Permission to use, copy, modify, and distribute this material 
++# for any purpose and without fee is hereby granted, provided 
++# that the above copyright notice and this permission notice 
++# appear in all copies, and that the name of Bellcore not be 
++# used in advertising or publicity pertaining to this 
++# material without the specific, prior written permission 
++# of an authorized representative of Bellcore.  BELLCORE 
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++# Conversion from C shell to Bourne shell by Z-Code Software Corp.
++# Conversion Copyright (c) 1992 Z-Code Software Corp.
++# Permission to use, copy, modify, and distribute this material
++# for any purpose and without fee is hereby granted, provided
++# that the above copyright notice and this permission notice
++# appear in all copies, and that the name of Z-Code Software not
++# be used in advertising or publicity pertaining to this
++# material without the specific, prior written permission
++# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
+ 
+ echo -n "Enter the name of a file in '$1' format: "
+-set fnam=$<
+-if ("" == "$fnam") then
+-    echo Aborted
+-    exit -1
+-endif
+-if (! -r  $fnam) then
+-    echo No such file
+-    exit -1
+-endif
+-cp $fnam $2
+-exit 0
++read fnam
++if test ! -r "$fnam"
++then
++	echo No such file
++	exit 1
++fi
++
++cp "$fnam" "$2"
+--- metamail-2.7.orig/bin/audiosend
++++ metamail-2.7/bin/audiosend
+@@ -1,6 +1,4 @@
+-#!/bin/csh -fb
+-# (The "-fb" might need to be changed to "-f" on some systems)
+-#
++#!/bin/sh -e
+ # Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
+ # 
+ # Permission to use, copy, modify, and distribute this material 
+@@ -13,97 +11,114 @@
+ # MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
+ # OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
+ # WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
+-#
+ 
+-if (! $?METAMAIL_TMPDIR) then
+-    set METAMAIL_TMPDIR=/tmp
+-endif
++# Conversion from C shell to Bourne shell by Z-Code Software Corp.
++# Conversion Copyright (c) 1992 Z-Code Software Corp.
++# Permission to use, copy, modify, and distribute this material
++# for any purpose and without fee is hereby granted, provided
++# that the above copyright notice and this permission notice
++# appear in all copies, and that the name of Z-Code Software not
++# be used in advertising or publicity pertaining to this
++# material without the specific, prior written permission
++# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++# Brought into line with metamail 2.7 beta release Csh version
++#    Dave Shield	February 1994
+ 
+ # This is to make metamail/showaudio do playback on the speaker, not the phone.
+-setenv AUDIOSPEAKERFORCE 1 
++AUDIOSPEAKERFORCE=1 ; export AUDIOSPEAKERFORCE
++
++if test -d /usr/sony
++then
++	dev=/dev/sb0
++else
++	dev=/dev/audio
++fi
+ 
+-if (-d /usr/sony) then
+-    set dev=/dev/sb0
++if test -f /usr/sbin/sendmail
++then
++    MAILCOMMAND=/usr/sbin/sendmail
+ else
+-    set dev=/dev/audio
+-endif
++    MAILCOMMAND=mail
++fi
+ 
+-if ( $#argv == 1 ) then
+-    set to = $1
++if test ! -z "${1:-}"
++then
++    to=$1
+ else
+     echo -n "To: "
+-    set to = $<
+-endif
++    read to
++fi
+ echo -n "Subject: "
+-set subject = $<
++read subject
+ echo -n "CC: "
+-set cc = $<
++read cc
+ 
+-record:
+-echo -n "Press RETURN when you are ready to start recording: "
+-set foo = $<
+-
+-set fname = ${METAMAIL_TMPDIR}/audio-out.$$
+-set fnameraw = ${METAMAIL_TMPDIR}/audio-raw.$$
+-
+-echo "To: " "$to" > $fname
+-echo "Subject: " "$subject" >> $fname
+-echo "CC: " "$cc" >> $fname
+-echo "MIME-Version: 1.0" >> $fname
+-echo "Content-Type: audio/basic" >> $fname
+-echo "Content-Transfer-Encoding: base64" >> $fname
+-echo  "" >> $fname
+-# THIS IS UNBELIEVABLY GRUBBY
+-onintr cleanup
+-if (! $?RECORD_AUDIO) then
+-    (/bin/cat < $dev > $fnameraw) &
+-else
+-    ($RECORD_AUDIO > $fnameraw) &
+-endif
+-jobs -l > ${METAMAIL_TMPDIR}/AUDCAT.$$
+-set foo=`/bin/cat ${METAMAIL_TMPDIR}/AUDCAT.$$`
+-/bin/rm ${METAMAIL_TMPDIR}/AUDCAT.$$
+-set PID=$foo[2]
+-echo -n "press RETURN when you are done recording: "
+-set foo=$<
+-echo One moment please...
+-/bin/sleep 1
+-echo -n Killing recording job...
+-/bin/kill -9 $PID >& /dev/null
+-mimencode -b < $fnameraw >> $fname
+-/bin/rm $fnameraw
+-echo "" >> $fname
+-
+-whatnext:
+-echo ""
+-echo "What do you want to do?"
+-echo ""
+-echo "1 -- Send mail"
+-echo "2 -- Listen to recorded message"
+-echo "3 -- Replace with a new recording"
+-echo "4 -- Quit"
+-set which = $<
+-    switch ("$which")
+-        case 1:
+-          echo -n "Sending mail, please wait...  "
+-          /usr/lib/sendmail $to  $cc < $fname
+-          if (! $status) then
+-            echo "Done."
+-            rm $fname
+-            exit
+-          else
+-            echo Mail delivery failed, draft mail is in $fname
+-          endif
+-          breaksw
+-        case 2:
+-          metamail -d $fname
+-          breaksw
+-        case 3:
+-          goto record
+-        case 4:
+-          exit
+-    endsw
+-goto whatnext
+-exit 0
+-cleanup:
+-kill -9 $PID >& /dev/null
++record=1
++
++while true
++do
++	if test $record -eq 1
++	then
++		echo -n "Press RETURN when you are ready to start recording: "
++		read foo
++
++		fname=`tempfile -p metamail -m 600`
++		fnameraw=`tempfile -p metamail -m 600`
++
++		echo "To: $to" > $fname
++		echo "Subject: $subject" >> $fname
++		echo "CC: $cc" >> $fname
++		echo "MIME-Version: 1.0" >> $fname
++		echo "Content-Type: audio/basic" >> $fname
++		echo "Content-Transfer-Encoding: base64" >> $fname
++		echo "" >> $fname
++
++		trap "kill -9 $! > /dev/null 2>&1" HUP INT TERM
++
++		if test -z "RECORD_AUDIO"
++		then
++			(cat < $dev > $fnameraw) &
++		else
++			($RECORD_AUDIO > $fnameraw) &
++		fi
++		echo -n "press RETURN when you are done recording: "
++		read foo
++		echo One moment please...
++		sleep 1
++		echo -n Killing recording job...
++		kill -9 $! > /dev/null 2>&1
++		mimencode -b < $fnameraw >> $fname
++		rm $fnameraw
++		echo "" >> $fname
++	fi
++	record=0
++
++	echo ""
++	echo "What do you want to do?"
++	echo ""
++	echo "1 -- Send mail"
++	echo "2 -- Listen to recorded message"
++	echo "3 -- Replace with a new recording"
++	echo "4 -- Quit"
++	read which
++	case $which in
++		1) echo -n "Sending mail, please wait...  "
++		  $MAILCOMMAND $to $cc < $fname
++
++		  if test $? -eq 0
++		  then
++			echo Done.
++			rm $fname
++			exit 0
++		  else
++			echo Mail delivery failed, draft is in $fname
++		  fi ;;
++		2) metamail -d $fname ;;
++		3) record=1 ;;
++		4) exit 0 ;;
++	esac
++done
+--- metamail-2.7.orig/bin/mailto-hebrew
++++ metamail-2.7/bin/mailto-hebrew
+@@ -0,0 +1,76 @@
++#!/bin/sh -e
++# Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++# 
++# Permission to use, copy, modify, and distribute this material 
++# for any purpose and without fee is hereby granted, provided 
++# that the above copyright notice and this permission notice 
++# appear in all copies, and that the name of Bellcore not be 
++# used in advertising or publicity pertaining to this 
++# material without the specific, prior written permission 
++# of an authorized representative of Bellcore.  BELLCORE 
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++# Conversion from C shell to Bourne shell
++# by Bob Glickstein, Z-Code Software Corp.
++# Conversion Copyright (c) 1992 Z-Code Software Corp. (Z-Code)
++# Permission to use, copy, modify, and distribute this material
++# for any purpose and without fee is hereby granted, provided
++# that the above copyright notice and this permission notice
++# appear in all copies, and that the name of Z-Code Software not
++# be used in advertising or publicity pertaining to this
++# material without the specific, prior written permission
++# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++# Brought into line with metamail 2.7 beta release Csh version
++#    Dave Shield	February 1994
++
++MYFONTDIR=/usr/lib/X11/fonts/misc
++
++if test ! -z "${MM_CHARSET:-}"
++then
++	if test "$MM_CHARSET" = iso-8859-8
++	then
++		mailto $*
++		exit 0
++	fi
++fi
++
++if test ! -d "$MYFONTDIR"
++then
++	echo The Hebrew font has not been installed properly on this machine.
++	exit 1
++fi
++
++if test -z "${DISPLAY:-}"
++then
++	echo Hebrew mail may only be composed under X11 or on a Hebrew terminal.
++	exit 1
++fi
++
++#
++# Do we have a font server?
++#
++FSGREP=`xset q | grep "tcp/localhost:7100"`
++if test ! -z "${FSGREP:-}"
++then
++        FPGREP=`xset q | grep $MYFONTDIR`
++        if test -z "${FPGREP:-}"
++        then
++            echo Adding $MYFONTDIR to your font path.
++            xset +fp "$MYFONTDIR"
++        else
++            echo Your font path appears to be correctly set.
++        fi
++else
++    echo Your font path appears to be correctly set.
++fi
++
++echo Running xterm to compose mail in iso-8859-8, please wait...
++
++MM_CHARSET=iso-8859-8; export MM_CHARSET
++xterm -fn \*iso-8859-8 -e mailto $*
+--- metamail-2.7.orig/bin/Makefile.in
++++ metamail-2.7/bin/Makefile.in
+@@ -0,0 +1,217 @@
++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
++
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++
++SHELL = @SHELL@
++
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
++
++DESTDIR =
++
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++
++top_builddir = ..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
++INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++transform = @program_transform_name@
++
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++host_alias = @host_alias@
++host_triplet = @host@
++AS = @AS@
++CATCOMMAND = @CATCOMMAND@
++CC = @CC@
++DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
++EXEEXT = @EXEEXT@
++LIBTOOL = @LIBTOOL@
++LIBTOOL_DEPS = @LIBTOOL_DEPS@
++LN_S = @LN_S@
++LPRCOMMAND = @LPRCOMMAND@
++LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAKEINFO = @MAKEINFO@
++OBJDUMP = @OBJDUMP@
++OBJEXT = @OBJEXT@
++PACKAGE = @PACKAGE@
++RANLIB = @RANLIB@
++STRIP = @STRIP@
++VERSION = @VERSION@
++ac_aux_dir = @ac_aux_dir@
++
++MAINTAINERCLEANFILES = Makefile.in
++
++bin_SCRIPTS = audiocompose audiosend extcompose getfilename 			mailserver mailto-hebrew metasend mimeit 			patch-metamail rcvAppleSingle showaudio showexternal 			shownonascii showpartial showpicture sndAppleSingle 			sun-audio-file sun-message sun-message.csh 			sun-to-mime sun2mime uudepipe uuenpipe
++
++mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
++CONFIG_HEADER = ../metamail/config.h
++CONFIG_CLEAN_FILES = 
++SCRIPTS =  $(bin_SCRIPTS)
++
++DIST_COMMON =  Makefile.am Makefile.in
++
++
++DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
++
++TAR = tar
++GZIP_ENV = --best
++all: all-redirect
++.SUFFIXES:
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
++	cd $(top_srcdir) && $(AUTOMAKE) --foreign bin/Makefile
++
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
++	cd $(top_builddir) \
++	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
++
++
++install-binSCRIPTS: $(bin_SCRIPTS)
++	@$(NORMAL_INSTALL)
++	$(mkinstalldirs) $(DESTDIR)$(bindir)
++	@list='$(bin_SCRIPTS)'; for p in $$list; do \
++	  if test -f $$p; then \
++	    echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
++	    $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
++	  else if test -f $(srcdir)/$$p; then \
++	    echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
++	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
++	  else :; fi; fi; \
++	done
++
++uninstall-binSCRIPTS:
++	@$(NORMAL_UNINSTALL)
++	list='$(bin_SCRIPTS)'; for p in $$list; do \
++	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
++	done
++tags: TAGS
++TAGS:
++
++
++distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
++
++subdir = bin
++
++distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign bin/Makefile
++	@for file in $(DISTFILES); do \
++	  d=$(srcdir); \
++	  if test -d $$d/$$file; then \
++	    cp -pr $$d/$$file $(distdir)/$$file; \
++	  else \
++	    test -f $(distdir)/$$file \
++	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
++	    || cp -p $$d/$$file $(distdir)/$$file || :; \
++	  fi; \
++	done
++info-am:
++info: info-am
++dvi-am:
++dvi: dvi-am
++check-am: all-am
++check: check-am
++installcheck-am:
++installcheck: installcheck-am
++install-exec-am: install-binSCRIPTS
++install-exec: install-exec-am
++
++install-data-am:
++install-data: install-data-am
++
++install-am: all-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++install: install-am
++uninstall-am: uninstall-binSCRIPTS
++uninstall: uninstall-am
++all-am: Makefile $(SCRIPTS)
++all-redirect: all-am
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
++installdirs:
++	$(mkinstalldirs)  $(DESTDIR)$(bindir)
++
++
++mostlyclean-generic:
++
++clean-generic:
++
++distclean-generic:
++	-rm -f Makefile $(CONFIG_CLEAN_FILES)
++	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
++
++maintainer-clean-generic:
++	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
++mostlyclean-am:  mostlyclean-generic
++
++mostlyclean: mostlyclean-am
++
++clean-am:  clean-generic mostlyclean-am
++
++clean: clean-am
++
++distclean-am:  distclean-generic clean-am
++	-rm -f libtool
++
++distclean: distclean-am
++
++maintainer-clean-am:  maintainer-clean-generic distclean-am
++	@echo "This command is intended for maintainers to use;"
++	@echo "it deletes files that may require special tools to rebuild."
++
++maintainer-clean: maintainer-clean-am
++
++.PHONY: uninstall-binSCRIPTS install-binSCRIPTS tags distdir info-am \
++info dvi-am dvi check check-am installcheck-am installcheck \
++install-exec-am install-exec install-data-am install-data install-am \
++install uninstall-am uninstall all-redirect all-am all installdirs \
++mostlyclean-generic distclean-generic clean-generic \
++maintainer-clean-generic clean mostlyclean distclean maintainer-clean
++
++
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
+--- metamail-2.7.orig/bin/showpicture
++++ metamail-2.7/bin/showpicture
+@@ -1,6 +1,4 @@
+-#!/bin/csh -fb
+-# (The "-fb" might need to be changed to "-f" on some systems)
+-#
++#!/bin/sh -e
+ # Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
+ # 
+ # Permission to use, copy, modify, and distribute this material 
+@@ -13,84 +11,111 @@
+ # MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
+ # OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
+ # WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
+-#
+ 
+-if (! $?METAMAIL_TMPDIR) then
+-    set METAMAIL_TMPDIR=/tmp
+-endif
+-
+-if (! $?X_VIEWER) then
+-set X_VIEWER="xloadimage -view -quiet -geometry +1+1"
+-# set X_VIEWER="xv -geometry +1+1"
+-endif
+-if ($1 == "-viewer" && $#argv > 1) then
+-    set X_VIEWER = "$2"
+-    shift
+-    shift
+-endif
+-
+-if (! $?MM_NOTTTY) then
+-    set MM_NOTTTY=0
+-endif
+-if (! $?DISPLAY) then
+-    echo ""
+-    echo This message contains a picture, which can currently only be
+-    echo viewed when running X11.  If you read this message while running
+-    echo X11, and have your DISPLAY variable set, you will then
+-    echo be able to see the picture properly.
+-    echo ""
+-    if ($MM_NOTTTY) then
+-        set fname=${METAMAIL_TMPDIR}/sp.$$
+-        echo "The picture is being automatically stored in the file $fname"
+-        echo "If you do not want this file, please delete it."
+-    else
+-        echo -n "Do you want to write the picture out to a file [y] ? "
+-        set ANS=$<
+-        if ("$ANS" =~ n* ||  "$ANS" =~ N* ) exit 0
+-        while ( 1 == 1)
+-            echo -n "File name:"
+-            set fname=$<
+-            if (! -f $fname) then
+-                break
+-            else
+-                echo "$fname already exists. Try again"
+-            endif
+-        end
+-    endif
+-    cp $1 $fname
+-    if ($status == 0) echo Wrote file $fname
+-    exit 0
+-endif
+-
+-if ($#argv == 0) then
+-    set SQUIRREL=${METAMAIL_TMPDIR}/sp.$$
+-    cat > $SQUIRREL
+-else
+-    set SQUIRREL="$*"
+-endif
++# Conversion from C shell to Bourne shell by Z-Code Software Corp.
++# Conversion Copyright (c) 1992 Z-Code Software Corp.
++# Permission to use, copy, modify, and distribute this material
++# for any purpose and without fee is hereby granted, provided
++# that the above copyright notice and this permission notice
++# appear in all copies, and that the name of Z-Code Software not
++# be used in advertising or publicity pertaining to this
++# material without the specific, prior written permission
++# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++# Brought into line with metamail 2.7 beta release Csh version
++#    Dave Shield	February 1994
+ 
+-echo NOTE:  TO MAKE THE PICTURE WINDOW GO AWAY, JUST TYPE 'q' IN IT.
+-if ($#argv == 0) then
+-    echo "==> TO SAVE THIS IMAGE, COPY THE FILE $SQUIRREL BEFORE EXITING"
+-    echo ""
+-    $X_VIEWER $SQUIRREL
+-    rm $SQUIRREL
++if test -z "${X_VIEWER:-}"
++then
++	X_VIEWER="xloadimage -view -quiet"
++# X_VIEWER="xv"
++fi
++
++if test "$1" = "-viewer" -a ! -z "$2"
++then
++	X_VIEWER=$2
++	shift
++	shift
++fi
++
++if test -z "${MM_NOTTY:-}"
++then
++	MM_NOTTY=0
++fi
++if test -z "${DISPLAY:-}"
++then
++	echo ""
++	echo This message contains a picture, which can currently only be
++	echo viewed when running X11.  If you read this message while running
++	echo X11, you will be able to see the picture properly.
++	if test $MM_NOTTY -eq 1
++	then
++		fname=$(mktemp /tmp/metamail.XXXXXX)
++		echo "The picture is being automatically stored in the file $fname"
++		echo "If you do not want this file, please delete it."
++	else
++		echo -n "Do you want to write the picture out to a file [y] ? "
++		read ANS
++		case "$ANS" in
++		    [Nn]*)	exit 0;;
++		    *)	looping=1
++			while test $looping -eq 1
++			do
++				echo -n "File name: "
++				read fname
++				if test -f "$fname"
++				then
++					echo "$fname already exists. Try again"
++				else
++					looping=0
++				fi
++			done ;;
++		esac
++	fi
++	cp "$1" "$fname"
++	if test $? -eq 0
++	then
++		echo Wrote file "$fname"
++	fi
++	exit 0
++fi
++
++if test -z "$1"
++then
++	SQUIRREL=$(mktemp /tmp/metamail.XXXXXX)
++	cat > $SQUIRREL
+ else
++	SQUIRREL="$*"
++fi
+ 
+-foreach i ($*)
+-    echo "==> TO SAVE THIS IMAGE, COPY THE FILE $i BEFORE EXITING"
+-    echo ""
+-    set dir=$i:h
+-    if ($dir != $i) then
+-	# Make the ln sure to work	
+-	cd $dir
+-    endif
+-    ln $i $$.PRESS-q-TO-EXIT 
+-    if (! $status) then 
+-        sh -c "$X_VIEWER $$.PRESS-q-TO-EXIT"
+-        rm $$.PRESS-q-TO-EXIT 
+-    else
+-        sh -c "$X_VIEWER $i"
+-    endif
+-end
+-endif
++
++echo NOTE: TO MAKE THE PICTURE WINDOW GO AWAY, JUST TYPE 'q' IN IT.
++if test -z "$1"
++then
++	echo "==> TO SAVE THIS IMAGE, COPY THE FILE $SQUIRREL BEFORE EXITING"
++	echo
++	$X_VIEWER $SQUIRREL
++	rm $SQUIRREL
++else
++	for i in $SQUIRREL
++	do
++		echo "==> TO SAVE THIS IMAGE, COPY THE FILE $i BEFORE EXITING"
++		echo
++		dir=$(dirname $i)
++		base=$(basename $i)
++		if test ! "$base" = "$i"
++		then
++			cd $dir
++		fi
++		if ln $i $$.PRESS-q-TO-EXIT  > /dev/null 2>&1
++		then
++		    $X_VIEWER $$.PRESS-q-TO-EXIT
++		    rm $$.PRESS-q-TO-EXIT 
++		else
++		    $X_VIEWER $i
++		fi
++	done
++fi
+--- metamail-2.7.orig/bin/showpartial
++++ metamail-2.7/bin/showpartial
+@@ -1,92 +1,156 @@
+-#!/bin/csh -fb
+-# (The "-fb" might need to be changed to "-f" on some systems)
+-#
+-
+-if (! $?METAMAIL_TMPDIR) then
+-    set METAMAIL_TMPDIR=/tmp
+-endif
+-
+-set TREEROOT=${METAMAIL_TMPDIR}/m-prts-`whoami`
+-if ($#argv < 3 || $#argv > 4) then
+-    echo "Usage:  showpartial file id partnum totalnum"
+-    exit -1
+-endif
+-set file=$1
++#!/bin/sh -e
++# Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++# 
++# Permission to use, copy, modify, and distribute this material 
++# for any purpose and without fee is hereby granted, provided 
++# that the above copyright notice and this permission notice 
++# appear in all copies, and that the name of Bellcore not be 
++# used in advertising or publicity pertaining to this 
++# material without the specific, prior written permission 
++# of an authorized representative of Bellcore.  BELLCORE 
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++# Conversion from C shell to Bourne shell by Z-Code Software Corp.
++# Conversion Copyright (c) 1992 Z-Code Software Corp.
++# Permission to use, copy, modify, and distribute this material
++# for any purpose and without fee is hereby granted, provided
++# that the above copyright notice and this permission notice
++# appear in all copies, and that the name of Z-Code Software not
++# be used in advertising or publicity pertaining to this
++# material without the specific, prior written permission
++# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++if [ -z "$METAMAIL_TMPDIR" ]
++then
++	METAMAIL_TMPDIR=/tmp
++fi
++
++
++
++if test -z "$3" -o ! -z "$5"
++then
++	echo "Usage: showpartial file id partnum totalnum"
++	exit 1
++fi
++
++file=$1
++
+ # This next line is because message-id can contain weird chars
+-set id=`echo $2 | tr -d  \!\$\&\*\(\)\|\'\"\;\/\<\>\\` 
+-@ partnum = $3
+-if ($#argv == 3 || $4 == "") then
+-    set totalnum=-1
++id=$(echo "$2" | tr -d \!\$\&\*\(\)\|\'\"\;\/\<\>\\\\ )
++
++partnum=$3
++
++if test -z "$4"
++then
++	totalnum=-1
++else
++	totalnum=$4
++fi
++
++if [ -n "$HOME" ] ; then
++# If we have a home directory, create a temporary dir and
++# store the name there unless the file already exists
++# and the directory it points to is valid directory
++	[ -e "$HOME/.metamail_treeroot" ] && TREEROOT=`cat $HOME/.metamail_treeroot`
++	[ -e "$TREEROOT" ] && [ ! -d "$TREEROOT" ] && rm -f "$TREEROOT" 
++	if [ ! -e "$HOME/.metamail_treeroot" ] || [ ! -e "$TREEROOT" ]; then
++		TREEROOT=`mktemp -d -t msg-parts.XXXXXX` || { echo "$0: Cannot create temporary dir!" >&2 ; exit 1; }
++		echo $TREEROOT >$HOME/.metamail_treeroot
++	fi
+ else
+-    @ totalnum = $4
+-endif
++	TREEROOT=$METAMAIL_TMPDIR/msg-parts-`whoami`
++	# Sanity check: is this a directory?
++	[ -e "$TREEROOT" ] && [ ! -d "$TREEROOT" ] && rm -f "$TREEROOT" 
++	# Sanity check, does it belong to us?
++	if [ -d "$TREEROOT" ] ; then
++		treeuid=`stat -c %u "$TREEROOT"`
++		if [ "$treeuid" -ne "`id -u`" ]; then
++			echo "$0: Tried to use $TREEROOT but it does not belong to us! Aborting." >&2
++			exit 1
++		fi
++	else
++		mkdir -p "$TREEROOT" || { echo "$0: Cannot create dir $TREEROOT!" >&2 ; exit 1; }
++	fi
++
++fi
++if test ! -d "${TREEROOT}/$id"
++then
++	mkdir "${TREEROOT}/$id"
++	if test $? -ne 0
++	then
++	        echo mkdir "${TREEROOT}/$id" failed
++		exit 1
++	fi
++fi
+ 
+-if (! -d  $TREEROOT)  then
+-    mkdir $TREEROOT
+-    if ($status) then 
+-        echo mkdir $TREEROOT failed
+-        exit -1
+-    endif
+-endif
+-if (! -d ${TREEROOT}/$id) then 
+-    mkdir ${TREEROOT}/$id
+-    if ($status) then 
+-        echo mkdir ${TREEROOT}/$id failed
+-        exit -1
+-    endif
+-endif
+-cp $file ${TREEROOT}/$id/$partnum
+-if ($status) then 
+-    echo cp $file ${TREEROOT}/$id/$partnum failed
+-    exit -1
+-endif
+-if ($totalnum == -1) then
+-    if (-e ${TREEROOT}/$id/CT) then
+-	set totalnum=`cat ${TREEROOT}/$id/CT`
+-    else
+-    	set totalnum=-1  #GROSS HACK
+-    endif
++cp $file "${TREEROOT}/$id/$partnum"
++if test $? -ne 0
++then
++	echo cp $file "${TREEROOT}/$id/$partnum" failed
++	exit 1
++fi
++
++if test $totalnum -eq -1
++then
++	if test -r "${TREEROOT}/$id/CT"
++	then
++		totalnum=`cat "${TREEROOT}/$id/CT"`
++	else
++    		totalnum=-1
++	fi
+ else
+-    echo $totalnum >! ${TREEROOT}/$id/CT
+-endif
++	echo $totalnum > "${TREEROOT}/$id/CT"
++fi
++
+ # Slightly bogus here -- the shell messes up the newlines in the headers
+-# If you put $MM_HEADERS in quotes, it doesn't help.
+ # if ($partnum == 1) then
+-#     echo $MM_HEADERS > ${TREEROOT}/$id/HDRS
++#     echo $MM_HEADERS > "${TREEROOT}/$id/HDRS"
+ # endif
+-set found=0
+-set ix=1
+-set list=""
+-set limit=$totalnum
+-if ($limit == -1) set limit=25
+-while ($ix <= $limit)
+-    if (-e ${TREEROOT}/$id/$ix) then
+-	set list="$list $ix"
+-	@ found ++
+-    endif
+-    @ ix ++
+-end
+-if ($found == $totalnum) then
+-    cd ${TREEROOT}/$id
+-    cat $list > ${TREEROOT}/$id/FULL
+-#    cat ${TREEROOT}/$id/HDRS $list > ${TREEROOT}/$id/FULL
+-    rm $list
+-    echo All parts of this ${totalnum}-part message have now been read.
+-    metamail -d  ${TREEROOT}/$id/FULL
+-    echo WARNING:  To save space, the full file is now being deleted.  
+-    echo You will have to read all $totalnum parts again to see the full message again.
+-    rm ${TREEROOT}/$id/FULL
+-    rm ${TREEROOT}/$id/CT
+-#    rm ${TREEROOT}/$id/HDRS
+-    cd
+-    rmdir ${TREEROOT}/$id
+-    rmdir ${TREEROOT} >& /dev/null
++found=0
++ix=1
++list=
++limit=$totalnum
++if test "$limit" -eq -1
++then
++	limit=25
++fi
++
++while test "$ix" -le "$limit"
++do
++	if test -f "${TREEROOT}/$id/$ix"
++	then
++		list="$list $ix"
++		found=$(($found + 1))
++	fi
++	ix=`expr $ix + 1`
++done
++
++if test $found = "$totalnum"
++then
++	cd "${TREEROOT}/$id"
++	cat $list > "${TREEROOT}/$id/FULL"
++	rm $list
++	echo All parts of this "${totalnum}"-part message have now been read.
++	metamail -d < "${TREEROOT}/$id/FULL"
++	echo WARNING:  To save space, the full file is now being deleted.  
++	echo You will have to read all "$totalnum" parts again to see the full message again.
++	rm "${TREEROOT}/$id/FULL"
++	rm "${TREEROOT}/$id/CT"
++	cd ${METAMAIL_TMPDIR}
++	rmdir "${TREEROOT}/$id"
++	rmdir ${TREEROOT} > /dev/null 2>&1
++	[ -e "$HOME/.metamail_treeroot" ] && > "$HOME/.metamail_treeroot" 
+ else
+-    if (${totalnum} == -1) then
+-        echo So far you have only read $found of the several parts of this message.
+-    else
+-        echo So far you have only read $found of the $totalnum parts of this message.
+-    endif
+-    echo When you have read them all, then you will see the message in full.
+-endif
+-    
++	if test "$totalnum" -eq -1
++	then
++		echo So far you have only read $found of the several parts of this message.
++	else
++		echo So far you have only read $found of the "$totalnum" parts of this message.
++	fi
++	echo When you have read them all, then you will see the message in full.
++fi
+--- metamail-2.7.orig/bin/showexternal
++++ metamail-2.7/bin/showexternal
+@@ -1,6 +1,4 @@
+-#!/bin/csh -fb
+-# (The "-fb" might need to be changed to "-f" on some systems)
+-#
++#!/bin/sh -e
+ # Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
+ # 
+ # Permission to use, copy, modify, and distribute this material 
+@@ -13,142 +11,174 @@
+ # MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
+ # OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
+ # WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
+-# 
+ 
+-onintr cleanup
+-if (! $?METAMAIL_TMPDIR) then
+-    set METAMAIL_TMPDIR=/tmp
+-endif
+-if (! $?FTP) then
+-    set FTP=ftp
+-endif
+-
+-if ($#argv <3) then
+-    echo "Usage: showexternal body-file access-type name [site [directory [mode [server]]]]"
+-    exit -1
+-endif
+-set bodyfile=$1
+-set atype=`echo $2 | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+-set name=$3
+-if ($#argv > 3) then
+-    set site=$4
+-else 
+-    set site=""
+-endif
+-if ($#argv > 4) then
+-    set dir=$5
+-else
+-    set dir=""
+-endif
+-if ($#argv > 5) then
+-    set mode=$6
+-else
+-    set mode=""
+-endif
+-if ($#argv > 6) then
+-    set server=$7
++# Conversion from C shell to Bourne shell by Z-Code Software Corp.
++# Conversion Copyright (c) 1992 Z-Code Software Corp.
++# Permission to use, copy, modify, and distribute this material
++# for any purpose and without fee is hereby granted, provided
++# that the above copyright notice and this permission notice
++# appear in all copies, and that the name of Z-Code Software not
++# be used in advertising or publicity pertaining to this
++# material without the specific, prior written permission
++# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++# Brought into line with metamail 2.7 beta release Csh version
++#    Dave Shield	February 1994
++
++if test -f /usr/sbin/sendmail
++then
++    MAILCOMMAND=/usr/sbin/sendmail
+ else
+-    set server=""
+-endif
++    MAILCOMMAND=/bin/mail
++fi
+ 
+-if ("$server" == "" && $atype == "mail-server") then
+-# Backward compatibility with some broken stuff
+-    set server=${name}@${site}
+-    echo WARNING -- old style mailserver syntax, using server $server
+-endif
+-
+-set ctype="`grep -i content-type: $bodyfile | sed -e 's/............: //'`"
+-if ("$ctype" == "") set ctype="text/plain"
+-set cenc=`grep -i content-transfer-encoding: $bodyfile | sed -e 's/.........................: //'`
+-set username=""
+-set pass=""
+-set TMPDIR=${METAMAIL_TMPDIR}/XXXternal.$$
++if test "$#" -lt 3
++then
++	echo "Usage: showexternal body-file access-type name [site [directory [mode]]]"
++	exit 1
++fi
++
++if [ -z "$METAMAIL_TMPDIR" ]
++then
++	METAMAIL_TMPDIR=/tmp
++fi
++
++# Check argument integrity. Don't trust mail headers
++if echo "$1$2$3$4$5$6$7" | grep -q '[[:space:]]'
++then
++	echo "Illegal white space in arguments -- possibly a mail bomb?!"
++	echo "Command was:"
++	echo \'$0\' \'$1\' \'$2\' \'$3\' \'$4\' \'$5\' \'$6\' \'$7\'
++	exit 2
++fi
++
++bodyfile=$1
++atype=$(echo "$2" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz)
++name=$3
++
++site=$4
++
++dir=$5
++
++mode=$6
++
++server=$7
++
++if test -z "$server" -a $atype = "mail-server"
++then
++	server=${name}@${site}
++	echo WARNING -- old style mailserver syntax, using server "$server"
++fi
++
++ctype=$(grep -i content-type: "$bodyfile" | sed -e 's/............: //')
++if test -z "$ctype"
++then ctype="text/plain"
++fi
++cenc=$(grep -i content-transfer-encoding: "$bodyfile" | sed -e 's/.........................: //')
++username=
++pass=
++TMPDIR=$METAMAIL_TMPDIR/XXXternal.$$
++trap 'cd $METAMAIL_TMPDIR ; rmdir "$TMPDIR" >/dev/null 2>&1' 1 2 3 15
+ mkdir $TMPDIR
+-pushd $TMPDIR
+-set NEWNAME="mm.ext.$$"
+-set NEEDSCONFIRMATION=1
+-switch ("$atype")
+-    case anon-ftp:
+-	echo "This mail message contains a POINTER (reference) to data that is "
+-	echo not included in the message itself.  Rather, the data can be retrieved 
+-	echo automatically using  anonymous FTP to a site on the network.
+-	breaksw
+-    case ftp:
+-	echo "This mail message contains a POINTER (reference) to data that is "
+-	echo not included in the message itself.  Rather, the data can be retrieved 
+-	echo automatically using  the FTP protocol to a site on the network.
+-	breaksw
+-    case mail-server:  
+-	cat > ${METAMAIL_TMPDIR}/ext.junk.$$ <<!
+-This mail message contains a POINTER (reference) to data that is 
+-not included in the message itself.  Rather, the data can be retrieved 
+-by sending a special mail message to a mail server on the network.
+-However, doing this automatically is slightly dangerous, because  someone
+-might be using this mechanism to cause YOU to send obnoxious mail.
+-For that reason, the mail message that WOULD be sent is being shown to you
+-first for your approval.
++PUSHED_DIR=`pwd`
++cd $TMPDIR
++NEWNAME="mm.ext.$$"
++NEEDSCONFIRMATION=1
++
++case $atype in
++	anon-ftp)
++		echo "This mail message contains a POINTER (reference) to data that is "
++		echo not included in the message itself.  Rather, the data can be retrieved 
++		echo automatically using anonymous FTP to a site on the network. ;;
++		
++	ftp)
++		echo "This mail message contains a POINTER (reference) to data that is "
++		echo not included in the message itself.  Rather, the data can be retrieved 
++		echo automatically using the FTP protocol to a site on the network. ;;
++
++	mail-server)
++		TMPF=$(mktemp /tmp/ext.junk.XXXXXX)
++		cat > $TMPF <<!
++This mail message contains a POINTER (reference) to data that is not
++included in the message itself.  Rather, the data can be retrieved by
++sending a special mail message to a mail server on the network.
++However, doing this automatically is slightly dangerous, because
++someone might be using this mechanism to cause YOU to send obnoxious
++mail.  For that reason, the mail message that WOULD be sent is being
++shown to you first for your approval.
+ 
+ This is the message that will be sent if you choose to go ahead and
+-retreive the external data:
++retrieve the external data:
+ 
+ Subject: Automated Mail Server Request
+-To: ${server}
++To: $server
+ 
+ !
+-	sed -e 1,/^\$/d < $bodyfile >> ${METAMAIL_TMPDIR}/ext.junk.$$
+-	more ${METAMAIL_TMPDIR}/ext.junk.$$
+-	rm ${METAMAIL_TMPDIR}/ext.junk.$$
+-	breaksw
+-    default:
+-	# IGNORE ALL THE OTHERS -- AUTOMATIC FOR LOCAL-FILE, AFS.
+-	set NEEDSCONFIRMATION=0
+-endsw
++		sed -e 1,/^\$/d < "$bodyfile" >> $TMPF
++		sensible-pager $TMPF
++		rm $TMPF ;;
++
++	*)
++		NEEDSCONFIRMATION=0 ;;
++esac
+ 
+-if ($NEEDSCONFIRMATION) then
++if test $NEEDSCONFIRMATION -ne 0
++then
+ 	echo ""
+-	echo -n "Do you want to proceed with retrieving the external data [y] ? "
+-	set ANS=$<
+-	if ("$ANS" =~ n* ||  "$ANS" =~ N* ) then
+-		cd ${METAMAIL_TMPDIR}
+-		rm -rf $TMPDIR
+-		exit 0
+-	endif
+-endif
+-
+-switch ("$atype")
+-    case anon-ftp:
+-	set username=anonymous
+-	set pass=`whoami`@`hostname`
+-	# DROP THROUGH
+-    case ftp:
+-	if ("$site" == "") then
+-	    echo -n "Site for ftp access: "
+-	    set site=$<
+-	endif
+-	if ("$username" == "") then
+-	    echo -n "User name at site ${site}: "
+-	    set username=$<
+-	endif
+-	if ("$pass" == "") then
+-	    echo -n "Password for user $username at site ${site}: "
+-	    stty -echo
+-	    set pass=$<
+-	    stty echo
+-	    echo ""
+-	endif
+-	if ("$dir" == "") then
+-	    set DIRCMD=""
+-	else
+-	    set DIRCMD="cd $dir"
+-	endif
+-	if ("$mode" == "") then
+-	    set MODECMD=""
+-	else
+-	    set MODECMD="type $mode"
+-	endif
+-	echo OBTAINING MESSAGE BODY USING FTP
+-	echo SITE: $site USER $username
+-	$FTP -n <<!
++	echo -n "Do you want to proceed with retrieving the external data? [y] "
++	read ANS
++	case "$ANS" in
++		[Nn]*)	cd $METAMAIL_TMPDIR
++			rm -rf $TMPDIR;
++			exit 0 ;;
++	esac
++fi
++
++case "$atype" in
++	anon-ftp | ftp)
++		case "$atype" in
++		anon-ftp )
++			username=anonymous
++			pass=`whoami`@`hostname`
++			;;
++		esac
++
++		if test -z "$site"
++		then
++			echo -n "Site for ftp access: "
++			read site
++		fi
++		if test -z "$username"
++		then
++			echo -n "User name at site ${site}: "
++			read username
++		fi
++		if test -z "$pass"
++		then
++			echo -n "Password for user $username at site ${site}: "
++			stty -echo
++			read pass
++			stty echo
++			echo ""
++		fi
++		if test -z "$dir"
++		then
++			DIRCMD=""
++		else
++			DIRCMD="cd $dir"
++		fi
++		if test -z "$mode"
++		then
++			MODECMD=""
++		else
++			MODECMD="type $mode"
++		fi
++		echo OBTAINING MESSAGE BODY USING FTP
++		echo SITE: "$site" USER: "$username"
++		${FTP:-ftp} -n <<!
+ open $site
+ user $username $pass
+ $DIRCMD
+@@ -156,91 +186,92 @@
+ get $name $NEWNAME
+ quit
+ !
+-	if (! -e $NEWNAME) then
+-	    echo FTP failed.
+-	    cd ${METAMAIL_TMPDIR}
+-	    rm -rf $TMPDIR
+-	    exit -1
+-	endif
+-	breaksw
+-    case afs:
+-    case local-file:
+-	if (! -e $name) then
+-	    echo local file not found
+-	    cd ${METAMAIL_TMPDIR}
+-	    rm -rf $TMPDIR
+-	    exit -1
+-	endif
+-    	set NEWNAME=$name
+-	echo GETTING BODY FROM FILE NAMED: $NEWNAME
+-	breaksw
+-    case mail-server:  # A very special case
+-	if ("$bodyfile" == "") then
+-	    echo mail-server access-type requires a body file
+-	    cd ${METAMAIL_TMPDIR}
+-	    rm -rf $TMPDIR
+-	    exit -1
+-	endif
+-	echo Subject: Automated Mail Server Request > $NEWNAME
+-	echo To: ${server} >> $NEWNAME
+-	echo "" >> $NEWNAME
+-	sed -e 1,/^\$/d < $bodyfile >> $NEWNAME
+-	echo "" >> $NEWNAME
+-	/usr/lib/sendmail -t  < $NEWNAME
+-	if ($status) then
+-	    echo sendmail failed
+-	    cd ${METAMAIL_TMPDIR}
+-	    rm -rf $TMPDIR
+-	    exit -1
+-	endif
+-	cd ${METAMAIL_TMPDIR}
+-	rm -rf $TMPDIR
+-	echo Your $ctype data has been requested from a mail server.
+-	exit 0
+-    default:
+-	echo UNRECOGNIZED ACCESS-TYPE
+-	cd ${METAMAIL_TMPDIR}
+-	rm -rf $TMPDIR
+-	exit -1
+-endsw
+-if ($cenc == base64) then
+-	mimencode -u -b < $NEWNAME > OUT
+-	mv OUT $NEWNAME
+-else if ($cenc == quoted-printable) then
+-	mimencode -u -q < $NEWNAME > OUT
+-	mv OUT $NEWNAME
+-endif
+-
+-popd
+-if ($atype == "local-file") then
+-    metamail -p  -b -c "$ctype" $NEWNAME
+-else
+-    metamail -p -b -c "$ctype" $TMPDIR/$NEWNAME
+-endif
++		if test ! -r "$NEWNAME"
++		then
++			echo FTP failed.
++			cd $METAMAIL_TMPDIR
++			rm -rf $TMPDIR
++			exit 1
++		fi
++		;;
++
++	afs|local-file)
++		if test ! -r "$name"
++		then
++			echo local file not found
++			cd $METAMAIL_TMPDIR
++			rm -rf $TMPDIR
++			exit 1
++		fi
++		NEWNAME=$name
++		echo GETTING BODY FROM FILE NAMED: "$NEWNAME" ;;
++
++	mail-server)
++		if test -z "$bodyfile"
++		then
++			echo mail-server access-type requires a body file
++			cd $METAMAIL_TMPDIR
++			rm -rf $TMPDIR
++			exit 1
++		fi
++		echo Subject: Automated Mail Server Request > "$NEWNAME"
++		echo To: "$server" >> "$NEWNAME"
++		echo >> "$NEWNAME"
++		sed -e 1,/^\$/d < "$bodyfile" >> "$NEWNAME"
++		$MAILCOMMAND -t < "$NEWNAME"
++		if test $? -ne 0
++		then
++			echo sendmail failed
++			cd $METAMAIL_TMPDIR
++			rm -rf $TMPDIR
++			exit 1
++		fi
++		cd $METAMAIL_TMPDIR
++		rm -rf $TMPDIR
++		echo Your "$ctype" data has been requested from a mail server.
++		exit 0 ;;
++	*)
++		echo UNRECOGNIZED ACCESS-TYPE
++		cd $METAMAIL_TMPDIR
++		rm -rf $TMPDIR
++		exit 1 ;;
++esac
++
++if test "$cenc" = base64
++then
++	mimencode -u -b < "$NEWNAME" > OUT
++	mv OUT "$NEWNAME"
++elif test "$cenc" = quoted-printable
++then
++	mimencode -u -q < "$NEWNAME" > OUT
++	mv OUT "$NEWNAME"
++fi
++
++cd $PUSHED_DIR
++case "$atype" in
++    local-file ) metamail -b -p -c "$ctype" "$NEWNAME" ;;
++    * ) metamail -b -p -c "$ctype" "$TMPDIR/$NEWNAME" ;;
++esac
+ 
+-if ($status) then
++if test $? -ne 0
++then
+ 	echo metamail failed
+-	cd ${METAMAIL_TMPDIR}
++	cd $METAMAIL_TMPDIR
+ 	rm -rf $TMPDIR
+-	exit -1
+-endif
++	exit 1
++fi
+ 
+-if ($NEWNAME != $name) then
++if test ! "$NEWNAME" = "$name"
++then
+ 	echo ""
+-	echo The data just displayed is stored in the file $TMPDIR/$NEWNAME
++	echo The data just displayed is stored in the file "$TMPDIR/$NEWNAME"
+ 	echo "Do you want to delete it?"
+-	rm -i $TMPDIR/$NEWNAME
+-endif
++	rm -i "$TMPDIR/$NEWNAME"
++fi
+ 
+-if (! -e ${TMPDIR}/${NEWNAME}) then
+-    cd ${METAMAIL_TMPDIR}
+-    rmdir $TMPDIR
+-endif
+-exit 0
+-
+-cleanup:
+-cd ${METAMAIL_TMPDIR}
+-if (-e $TMPDIR) then    
+-    rmdir $TMPDIR
+-endif
+-exit -1
++if test ! -r "${TMPDIR}/${NEWNAME}"
++then
++	cd /
++	cd $METAMAIL_TMPDIR
++	rmdir $TMPDIR
++fi
+--- metamail-2.7.orig/bin/rcvAppleSingle
++++ metamail-2.7/bin/rcvAppleSingle
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/sh -e
+ #
+ # Very simple shellscript to support recieving Macintosh files
+ # and store them in a UNIX filesystem used by the CAP AUFS program.
+--- metamail-2.7.orig/bin/patch-metamail
++++ metamail-2.7/bin/patch-metamail
+@@ -1,20 +1,58 @@
+-#!/bin/csh -fb
+-# (The "-fb" might need to be changed to "-f" on some systems)
+-#
+-set HOSTNAME=thumper.bellcore.com
+-set DIRNAME=pub/nsb
+-set PREFIX="mm.patch."
+-
+-if ($#argv < 2 || $#argv > 5) then
+-	echo Usage:  patch-metamail source-tree-root patch-number [hostname [dirname [prefix]]]
+-	exit -1
+-endif
+-
+-set TREEROOT=$1
+-set PATCHNUMBER=$2
+-if ($#argv > 2) set HOSTNAME=$3
+-if ($#argv > 3) set DIRNAME=$4
+-if ($#argv > 4) set PREFIX=$5
++#!/bin/sh -e
++# Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++# 
++# Permission to use, copy, modify, and distribute this material 
++# for any purpose and without fee is hereby granted, provided 
++# that the above copyright notice and this permission notice 
++# appear in all copies, and that the name of Bellcore not be 
++# used in advertising or publicity pertaining to this 
++# material without the specific, prior written permission 
++# of an authorized representative of Bellcore.  BELLCORE 
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++# Conversion from C shell to Bourne shell
++# by Bob Glickstein, Z-Code Software Corp.
++# Conversion Copyright (c) 1992 Z-Code Software Corp. (Z-Code)
++# 
++# Permission to use, copy, modify, and distribute this material for
++# any purpose and without fee is hereby granted, provided that the
++# above copyright notice and this permission notice appear in all
++# copies, and that the name of Z-Code not be used in advertising or
++# publicity pertaining to this material without the specific, prior
++# written permission of an authorized representative of Z-Code.
++# Z-CODE MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY OF
++# THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", WITHOUT ANY
++# EXPRESS OR IMPLIED WARRANTIES.
++
++HOSTNAME=thumper.bellcore.com
++DIRNAME=pub/nsb
++PREFIX=mm.patch.
++
++if test -z "$2" -o ! -z "$6"
++then
++	echo "Usage: patch-metamail source-tree-root patch-number [hostname [dirname [prefix]]]"
++	exit 1
++fi
++
++TREEROOT=$1
++PATCHNUMBER=$2
++
++if test ! -z "$3"
++then
++	HOSTNAME=$3
++fi
++
++if test ! -z "$4"
++then
++	DIRNAME=$4
++fi
++
++if test ! -z "$5"
++then
++	PREFIX=$5
++fi
+ 	
+ echo WARNING:  This program, if allowed to do so, will attempt to 
+ echo install a PATCH file for your metamail sources which are rooted 
+@@ -22,15 +60,16 @@
+ echo ""
+ echo It will use a patch file that it retrieves via anonymous ftp
+ echo from the host $HOSTNAME, in the directory $DIRNAME, 
+-echo with filenames starting with ${PREFIX}.
++echo with filenames starting with $PREFIX.
+ echo ""
+-echo -n "Do you want to install the patch in directory $TREEROOT [y/n] ? "
+-set ans=$<
+-if ($ans == "y" || $ans == "Y") then
+-    cd $TREEROOT
+-    set ident=`whoami`@`hostname`
+-    echo Using anonymous ftp with password $ident
+-    ftp -n <<!
++echo -n "Do you want to install the patch in directory $TREEROOT (y/n)? [n] "
++read ans
++
++case "$ans" in
++	[Yy]*) cd $TREEROOT
++	       ident=`whoami`@`hostname`
++	       echo Using anonymous ftp with password $ident
++	       ftp -n <<!
+ open $HOSTNAME
+ user anonymous $ident
+ cd $DIRNAME
+@@ -38,8 +77,6 @@
+ get ${PREFIX}${PATCHNUMBER}
+ quit
+ !
+-    patch -p < ${PREFIX}${PATCHNUMBER}
+-else
+-	echo Patch not installed
+-endif
+-
++	       patch -p < ${PREFIX}${PATCHNUMBER} ;;
++	*) echo Patch not installed
++esac
+--- metamail-2.7.orig/bin/showaudio
++++ metamail-2.7/bin/showaudio
+@@ -1,6 +1,4 @@
+-#!/bin/csh -fb
+-# (The "-fb" might need to be changed to "-f" on some systems)
+-#
++#!/bin/sh -e
+ # Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
+ # 
+ # Permission to use, copy, modify, and distribute this material 
+@@ -13,200 +11,309 @@
+ # MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
+ # OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
+ # WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
+-#
+ 
++# Conversion from C shell to Bourne shell by Z-Code Software Corp.
++# Conversion Copyright (c) 1992 Z-Code Software Corp.
++# Permission to use, copy, modify, and distribute this material
++# for any purpose and without fee is hereby granted, provided
++# that the above copyright notice and this permission notice
++# appear in all copies, and that the name of Z-Code Software not
++# be used in advertising or publicity pertaining to this
++# material without the specific, prior written permission
++# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
+ 
+-if (! $?METAMAIL_TMPDIR) then
+-    set METAMAIL_TMPDIR=/tmp
+-endif
+-
+-# First, figure out which machine to play it on!
+-set thishost=`hostname`
+-
+-# Note that there are some special lines in here that only work at Bellcore,
+-# Specifically involving phone playback from the machine "greenbush".
+-# Everything should work fine at other sites, though
+-set AUDIOBINDIR=/u/andrew/phone-sau/bin
+-set AUDIOPHONEHOST=greenbush
+-set AUDIOPHONEHOSTLONG=greenbush.bellcore.com
+-set AUDIOLOGMAIL=andrew@thumper.bellcore.com
+-set ORG="Bellcore"
+-set STDINPUT=0
+-if ("$1" == "-p") then
+-    set AUDIOPHONE=$2
+-    shift
+-    shift
+-endif
+-if ("$1" == "-s") then
+-    set AUDIOSPEAKERFORCE = 1
+-    shift
+-endif
+-if ($?AUDIOPHONE || $?AUDIOPHONEFORCE) then
+-    goto playphone
+-endif
+-if (! -d $AUDIOBINDIR) then
+-    set AUDIOSPEAKERFORCE=1
+-endif
+-
+-if ("$1" == "-") then
+-    set STDINPUT=1
+-    shift
+-endif
+-if ($#argv < 1) then
+-    set STDINPUT=1
+-endif
+-	
+-if (! $STDINPUT && ! $?AUDIOSPEAKERFORCE && ! $?AUDIOPHONEFORCE) then
+-    if ($?MM_NOTTTY) then
+-	if ($MM_NOTTTY == 1) then
+-	    setenv MM_NOTTTY 0
+-	    xterm -e showaudio $*
+-	    exit 0
+-	endif
+-    endif
+-choosehardware:
+-    echo This program can display audio on the speakers of some workstations, 
+-    echo "or (at some sites) it can call you on the telephone.  Please choose one:"
+-    echo ""
+-    echo "1 -- Use the computer's speaker"
+-    echo "2 -- Call me on the telephone"
+-    echo ""
+-    echo -n "Which do you prefer (1 or 2)? "
+-    set ans=$<
+-    if ($ans == 2)  then
+-	echo "OK, we'll use the telephone..."
+-	set AUDIOPHONEFORCE=1
+-	echo "In the future, you can avoid this question by setting the environment variable"
+-	echo "AUDIOPHONEFORCE to 1"
+-	goto playphone
+-    else if ($ans == 1) then
+-    	echo "OK, Attempting to play the audio using your computer's speaker.."
+-    	set AUDIOSPEAKERFORCE=1
+-	echo "In the future, you can avoid this question by setting the environment variable"
+-	echo "AUDIOSPEAKERFORCE to 1"
+-    else
+-	echo "That is NOT one of your choices."
+-	goto choosehardware
+-    endif
+-endif
+-
+-set audiohost=$thishost
+-if ($?DISPLAY) then
+-    set audiohost=`echo $DISPLAY | sed -e 's/:.*//'`
+-    if ($audiohost == "unix") set audiohost=$thishost
+-    if ($audiohost == "") set audiohost=$thishost
+-endif
+-if ($?AUDIOHOST) then
+-	set audiohost=$AUDIOHOST
+-endif
+-
+-if ($audiohost != $thishost) then
+-    echo Sending audio to $audiohost...
+-    if ($?MMS_AUDIO) then
+-        if ($STDINPUT) then
+-            cat | mms -host $audiohost "show audio/basic" -
+-        else
+-            cat $* | mms -host $audiohost "show audio/basic" -
+-        endif
+-        exit 0
+-    endif
+-
+-# The next two lines are very inefficient, but not everyone has their path right for an rsh
+-    pushd ~ >& /dev/null
+-    set thisprog=`which showaudio`
+-    popd >& /dev/null
+-    if ($STDINPUT) then
+-        cat | rsh $audiohost $thisprog -s -
+-    else
+-        cat $* | rsh $audiohost $thisprog  -s -
+-    endif
+-    exit 0
+-endif
+-
+-if (-f /usr/sbin/sfplay) then
+-    if ($#argv >= 1) then
+-	exec /usr/sbin/sfplay -i mu-law chan 1 rate 8000 end $*
+-    else
+-	cat > ${METAMAIL_TMPDIR}/audio.$$
+-	/usr/sbin/sfplay -i mu-law chan 1 rate 8000 end ${METAMAIL_TMPDIR}/audio.$$
+-	rm ${METAMAIL_TMPDIR}/audio.$$
+-	exit 0
+-    endif
+-else if (-d /usr/sony) then
+-    set dev=/dev/sb0
+-else if (-e /usr/bin/audioplay) then
+-#  Solaris 2.0
+-    /usr/bin/audioconvert -i raw,voice -f sun $* | /usr/bin/audioplay
+-    exit $status
+-else if (-e /bin/audioplay) then
+-#  Solaris 2.0
+-    /bin/audioconvert -i raw,voice -f sun $* | /bin/audioplay
+-    exit $status
+-else
+-    set dev=/dev/audio
+-endif
+-
+-if (-w $dev) then
+-echo Playing audio on $thishost using $dev, one moment please...
+-if ($#argv >= 1) then
+-        cat $* > $dev
++# Brought into line with metamail 2.7 beta release Csh version
++# Added sox support
++#    Dave Shield	February 1994
++
++thishost=`hostname`
++
++AUDIOBINDIR=/u/andrew/phone-sau/bin
++AUDIOPHONEHOST=greenbush
++AUDIOPHONEHOSTLONG=greenbush.bellcore.com
++AUDIOLOGMAIL=greenbush.bellcore.com
++ORG=Bellcore
++STDINPUT=0
++
++if test -x /usr/bin/remsh
++then
++			# Probably a System V based system
++			#  "rsh" is likely to be "restricted shell"
++	RSH=remsh
+ else
+-        cat > $dev
+-endif
+-exit 0
+-endif
++	RSH=rsh
++fi
++# SOX=/usr/remote/bin9/sox
++
++if test "$1" = "-p"
++then
++	AUDIOPHONE=$2
++	shift
++	shift
++fi
++
++if test "$1" = "-s"
++then
++	AUDIOSPEAKERFORCE=1
++	shift
++fi
++
++playphone=0
++if test ! -z "${AUDIOPHONE:-}" -o ! -z "${AUDIOPHONEFORCE:-}"
++then
++	playphone=1
++fi
++
++if test $playphone -eq 0
++then
++	if test ! -d "$AUDIOBINDIR"
++	then
++		AUDIOSPEAKERFORCE=1
++	fi
++
++	if test "$1" = "-"
++	then
++		STDINPUT=1
++		shift
++	fi
++	if test $# -eq 0
++	then
++		STDINPUT=1
++	fi
++
++	if test $STDINPUT -eq 0 -a -z "${AUDIOSPEAKERFORCE:-}" -a -z "${AUDIOPHONEFORCE:-}"
++	then
++		if test ! -z "${MM_NOTTTY:-}"
++		then
++			if test $MM_NOTTTY -eq 1
++			then
++				MM_NOTTTY=0; export MM_NOTTTY
++				xterm -e showaudio $*
++				exit 0
++			fi
++		fi
++		looping=1
++		while test $looping -eq 1
++		do
++		    echo This program can display audio on the speakers of some workstations, 
++		    echo "or (at some sites) it can call you on the telephone.  Please choose one:"
++		    echo ""
++		    echo "1 -- Use the computer's speaker"
++		    echo "2 -- Call me on the telephone"
++		    echo ""
++		    echo -n "Which do you prefer (1 or 2)? [1] "
++		    read ans
++		    if test "$ans" -eq 2
++		    then
++			echo "OK, we'll use the telephone..."
++			AUDIOPHONEFORCE=1
++			echo "In the future, you can avoid this question by setting the environment variable"
++			echo "AUDIOPHONEFORCE to 1"
++			playphone=1
++			looping=0
++		    elif test "$ans" -eq 1
++		    then
++			echo "OK, Attempting to play the audio using your computer's speaker.."
++			AUDIOSPEAKERFORCE=1
++			echo "In the future, you can avoid this question by setting the environment variable"
++			echo "AUDIOSPEAKERFORCE to 1"
++			looping=0
++		    else
++			echo "That is NOT one of your choices."
++		    fi
++		done
++	fi
++fi
++
++if test $playphone -eq 0
++then
++	audiohost=$thishost
++	if test ! -z "${DISPLAY:-}"
++	then
++		audiohost=`echo $DISPLAY | sed -e 's/:.*//'`
++		if test "$audiohost" = unix -o "$audiohost" = localhost
++		then
++			audiohost=$thishost
++		fi
++		if test -z "$audiohost"
++		then
++			audiohost=$thishost
++		fi
++	fi
++	if test ! -z "${AUDIOHOST:-}"
++	then
++		audiohost=$AUDIOHOST
++	fi
++
++	if test ! "$audiohost" = "$thishost"
++	then
++		echo Sending audio to $audiohost...
++		if test ! -z "${MMS_AUDIO}"
++		then
++			if test $STDINPUT -eq 1
++			then
++				cat | mms -host $audiohost "show audio/basic"
++			else
++				cat $* | mms -host $audiohost "show audio/basic"
++			fi
++			exit 0
++		fi
++		thisprog=`(cd; which showaudio)`
++		if test $STDINPUT -eq 1
++		then
++			cat | $RSH $audiohost $thisprog -s
++		else
++			cat $* | $RSH $audiohost $thisprog -s
++		fi
++		exit 0
++	fi
++
++
++	if test -f /usr/sbin/sfplay
++	then
++		if test $# -ne 0
++		then
++			exec /usr/sbin/sfplay -i mu-law chan 1 rate 8000 end $*
++		else
++			fname=$(mktemp /tmp/audio.XXXXXX)
++			cat > $fname
++			/usr/sbin/sfplay -i mu-law chan 1 rate 8000 end $fname
++			rm $fname
++			exit 0
++		fi
++	elif test -f /usr/bin/audioplay
++	then
++	# Solaris 2.0
++		/usr/bin/audioconvert -i raw,voice -f sun $* | /usr/bin/audioplay
++		exit $?
++	elif test -f /bin/audioplay
++	then
++	# Solaris 2.0
++		/bin/audioconvert -i raw,voice -f sun $* | /bin/audioplay
++		exit $?
++	elif test -d /usr/sony
++	then
++		dev=/dev/sb0
++	else
++		dev=/dev/audio
++	fi
+ 
+-playphone:
+-if (-d $AUDIOBINDIR) then
+-              set thisprog=`which showaudio`
+-	if (! $?AUDIOPHONE) then
+-	    if ($?MM_NOTTTY) then
+-		if ($MM_NOTTTY == 1) then
+-		    setenv MM_NOTTTY 0
+-		    xterm -e $thisprog $*
+-		    exit 0
+-		endif
+-	    endif
+-	    echo This message contains audio, which can be sent to your telephone.
+-	    echo Please enter the telephone number at which you would like to hear this
+-	    echo -n "audio message as you would dial it from INSIDE ${ORG}:  "
+-	    set AUDIOPHONE=$<
+-	endif
+-	if ($thishost == $AUDIOPHONEHOST || $thishost == $AUDIOPHONEHOSTLONG) then
+-	    echo Calling Phone number $AUDIOPHONE
+-	    echo "You MUST SAY HELLO when you answer the phone, or you will not hear the message."
+-	    mail -s "showaudio: `whoami` called $AUDIOPHONE" $AUDIOLOGMAIL < /dev/null
+-	    if ($STDINPUT) then
+-	        cat $AUDIOBINDIR/../GREET.au $* - | $AUDIOBINDIR/play -\# $AUDIOPHONE -
+-	    else
+-	        cat $AUDIOBINDIR/../GREET.au $* | $AUDIOBINDIR/play -\# $AUDIOPHONE -
+-	    endif
+-	    echo All done
+-	    exit 0
++	if test -w $dev
++	then
++		echo Playing audio on $thishost using $dev, one moment please...
++		if test $# -ne 0
++		then
++			if test ! -z "${SOX:-}"
++			then
++			    for ii in $*
++			    do
++#
++#  The "approved magic" to translate arbitary sounds
++#	to AU format is as follows:
++#
++#				$SOX -t auto $ii -c 1 -t aiff - | \
++#				$SOX -t aiff - -U -b -t au -c 1 -r 8000 $dev
++#
++#  But the following "direct" translation also seems to work
++				$SOX -t auto $ii -c 1 -t au -c 1 -r 8000 $dev
++			    done
++			else
++				cat $* > $dev
++			fi
++		else
++			if test ! -z "${SOX:-}"
++			then
++				fname=$(mktemp /tmp/audio.XXXXXX)
++				cat > $fname
++#
++#  See also above
++#
++				$SOX -t auto $fname -c 1 -t au -c 1 -r 8000 $dev
++				rm $fname
++			else
++				cat > $dev
++			fi
++		fi
++		exit 0
++	fi
++fi
++
++if test -d "$AUDIOBINDIR"
++then
++	thisprog=`which showaudio`
++	if test -z "${AUDIOPHONE:-}"
++	then
++		if test ! -z "${MM_NOTTTY:-}"
++		then
++			if test $MM_NOTTTY -eq 1
++			then
++				MM_NOTTTY=0; export MM_NOTTTY
++				xterm -e $thisprog $*
++				exit 0
++			fi
++		fi
++		echo This message contains audio, which can be sent to your telephone.
++		echo Please enter the telephone number at which you would like to hear this
++		echo -n "audio message as you would dial it from inside ${ORG}: "
++		read AUDIOPHONE
++	fi
++
++	if test "$thishost" = "$AUDIOPHONEHOST" \
++		-o "$thishost" = "$AUDIOPHONEHOSTLONG"
++	then
++		echo Calling Phone number $AUDIOPHONE
++		echo "You MUST SAY HELLO when you answer the phone, or you will not hear the message."
++		mail -s "showaudio: `whoami` called $AUDIOPHONE" $AUDIOLOGMAIL < /dev/null
++		if test $STDINPUT -eq 1
++		then
++			cat $AUDIOBINDIR/../GREET.au $* - | $AUDIOBINDIR/play -\# $AUDIOPHONE -
++		else
++			cat $AUDIOBINDIR/../GREET.au $* | $AUDIOBINDIR/play -\# $AUDIOPHONE -
++		fi
++		echo All done
++		exit 0
+ 	else
+-	    echo Trying to rsh to $AUDIOPHONEHOST to send audio via telephone
+-	    cat $* | rsh $AUDIOPHONEHOST $thisprog -p $AUDIOPHONE -
+-	    exit 0
+-	endif
+-endif
++		echo Trying to rsh to $AUDIOPHONEHOST to send audio via telephone
++		if test $STDINPUT -eq 1
++		then
++			cat $* - | $RSH $AUDIOPHONEHOST $thisprog -p $AUDIOPHONE -
++		else
++			cat $* | $RSH $AUDIOPHONEHOST $thisprog -p $AUDIOPHONE -
++		fi
++		exit 0
++	fi
++fi
+ echo ""
+-echo This message contains an audio mesage, which can not currently be
+-echo played on this type of workstation.   If you log into an appropriate 
+-echo "machine (currently a SPARCstations or Sony News workstation)"
+-echo and read this message there, you should be able to hear the audio
+-echo message.  
++echo "This message contains an audio mesage, which can not currently be"
++echo "played on this type of workstation.   If you log into an appropriate"
++echo "machine (currently a SPARCstation or Sony News workstation)"
++echo "and read this message there, you should be able to hear the audio"
++echo "message."
+ echo ""
+-if (! $?MM_NOTTTY) set MM_NOTTTY=0
+-if ($MM_NOTTTY == 1) then
+-    set fname=/tmp/mm.aud.$$
++
++if test -z "${MM_NOTTY:-}"
++then
++	MM_NOTTY=0
++fi
++if test $MM_NOTTY -eq 1
++then
++	fname=$(mktemp /tmp/metamail.XXXXXX)
+ else
+-    echo -n "Do you want to write the audio out to a file [y] ? "
+-    set ANS=$<
+-    if ("$ANS" =~ n* ||  "$ANS" =~ N* ) exit 0
+-    echo -n "File name:"
+-    set fname=$<
+-endif
+-cp $1 $fname
+-if ($status == 0) echo Wrote raw audio file: $fname
++	echo -n "Do you want to write the audio out to a file [y] ? "
++	read ANS
++	case "$ANS" in
++		[Nn]*)	exit 0 ;;
++	esac
++
++	echo -n "File name:"
++	read fname
++fi
++cp "$1" "$fname"
++if test $? -eq 0
++then
++	echo Wrote raw audio file: "$fname"
++fi
+ exit 0
+-
+--- metamail-2.7.orig/bin/sun-to-mime
++++ metamail-2.7/bin/sun-to-mime
+@@ -1,14 +1,20 @@
+-#!/bin/csh -fb
+-# (The "-fb" might need to be changed to "-f" on some systems)
+-#
+-# Provide VERY minimal support for mail generated by Sun's Openwindows mailtool.
+-# Basically, this lets you see the text part, but not much else...
++#!/bin/sh -e
++# This file Copyright (c) 1992 Z-Code Software Corp.
++# Permission to use, copy, modify, and distribute this material
++# for any purpose and without fee is hereby granted, provided
++# that the above copyright notice and this permission notice
++# appear in all copies, and that the name of Z-Code Software not
++# be used in advertising or publicity pertaining to this
++# material without the specific, prior written permission
++# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
+ 
+-if (! $?METAMAIL_TMPDIR) then
+-    set METAMAIL_TMPDIR=/tmp
+-endif
++# Brought into line with metamail 2.7 beta release Csh version
++#    Dave Shield	February 1994
+ 
+-set TMPFILE=${METAMAIL_TMPDIR}/suntomime.$$
++TMPFILE=`tempfile -p metamail -m 600`
+ echo "Content-type: multipart/mixed; boundary=--------" > $TMPFILE
+ echo "" >> $TMPFILE
+ sed -e 's/X-Sun-Data-Type:/Content-type:/' >> $TMPFILE < $1
+--- metamail-2.7.orig/bin/audiocompose
++++ metamail-2.7/bin/audiocompose
+@@ -1,6 +1,4 @@
+-#!/bin/csh -fb
+-# (The "-fb" might need to be changed to "-f" on some systems)
+-#
++#!/bin/sh -e
+ # Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
+ # 
+ # Permission to use, copy, modify, and distribute this material 
+@@ -13,64 +11,71 @@
+ # MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
+ # OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
+ # WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
+-#
+ 
+-if (! $?METAMAIL_TMPDIR) then
+-    set METAMAIL_TMPDIR=/tmp
+-endif
++# Conversion from C shell to Bourne shell by Z-Code Software Corp.
++# Conversion Copyright (c) 1992 Z-Code Software Corp.
++# Permission to use, copy, modify, and distribute this material
++# for any purpose and without fee is hereby granted, provided
++# that the above copyright notice and this permission notice
++# appear in all copies, and that the name of Z-Code Software not
++# be used in advertising or publicity pertaining to this
++# material without the specific, prior written permission
++# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
+ 
+ # This is to make metamail/showaudio do playback on the speaker, not the phone.
+-setenv AUDIOSPEAKERFORCE 1 
++AUDIOSPEAKERFORCE=1; export AUDIOSPEAKERFORCE
+ 
+-if (-d /usr/sony) then
+-    set dev=/dev/sb0
++if test -d /usr/sony
++then
++	dev=/dev/sb0
+ else
+-    set dev=/dev/audio
+-endif
++	dev=/dev/audio
++fi
+ 
+-set audiofile=$1
+-if (-e $audiofile && ! -z $audiofile) goto whatnext
++audiofile=$1
+ 
+-record:
+-echo -n "Press RETURN when you are ready to start recording: "
+-set foo = $<
+-
+-# THIS IS UNBELIEVABLY GRUBBY
+-onintr cleanup
+-if (! $?RECORD_AUDIO) then
+-    (/bin/cat < $dev > $audiofile) &
++if test -f "$audiofile" -a -s "$audiofile"
++then
++	whatnext=1
+ else
+-    ($RECORD_AUDIO > $audiofile) &
+-endif
+-jobs -l > ${METAMAIL_TMPDIR}/AUDCAT.$$
+-set foo=`/bin/cat ${METAMAIL_TMPDIR}/AUDCAT.$$`
+-/bin/rm ${METAMAIL_TMPDIR}/AUDCAT.$$
+-set PID=$foo[2]
+-echo -n "press RETURN when you are done recording: "
+-set foo=$<
+-echo One moment please...
+-/bin/sleep 1
+-echo -n Killing recording job...
+-/bin/kill -9 $PID >& /dev/null
+-
+-whatnext:
+-echo ""
+-echo "What do you want to do?"
+-echo ""
+-echo "1 -- Listen to recorded message"
+-echo "2 -- Replace with a new recording"
+-echo "3 -- All Done, Quit"
+-set which = $<
+-    switch ("$which")
+-        case 1:
+-          cat $audiofile > $dev
+-          breaksw
+-        case 2:
+-          goto record
+-        case 3:
+-          exit
+-    endsw
+-goto whatnext
+-exit 0
+-cleanup:
+-kill -9 $PID >& /dev/null
++	whatnext=0
++fi
++
++while true
++do
++	if test $whatnext -eq 1
++	then
++		echo ""
++		echo "What do you want to do?"
++		echo ""
++		echo "1 -- Listen to recorded message"
++		echo "2 -- Replace with a new recording"
++		echo "3 -- All Done, Quit"
++		read which
++		case $which in
++			1) cat "$audiofile" > $dev ;;
++			2) whatnext=0 ;;
++			3) exit 0 ;;
++		esac
++	fi
++	echo -n "Press RETURN when you are ready to start recording: "
++	read foo
++
++	trap "kill -9 $! > /dev/null 2>&1" 1 2 15
++	if test -z "$RECORD_AUDIO"
++	then
++		(cat < $dev > "$audiofile") &
++	else
++		($RECORD_AUDIO > "$audiofile") &
++	fi
++	echo -n "press RETURN when you are done recording: "
++	read foo
++	echo One moment please...
++	/bin/sleep 1
++	echo -n Killing recording job...
++	/bin/kill -9 $! > /dev/null 2>&1
++	whatnext=1
++done
+--- metamail-2.7.orig/bin/mimeit
++++ metamail-2.7/bin/mimeit
+@@ -0,0 +1,27 @@
++#!/bin/sh -e
++# mimeit - mail base64-encoded stdin
++#    with content-type $1
++#    to recipient $2
++#    with subject $3
++# All other arguments are passed on to splitmail 
++
++if [ $# -lt 3 ]; then
++	echo "Usage: $0 <content-type> <recipient> <subject> [splitmail-options]" >&2
++	exit 1
++fi
++
++ct="$1"
++to="$2"
++sub="$3"
++
++shift
++shift
++shift
++
++( echo Mime-Version: 1.0 ; \
++  echo Content-type: "$ct" ; \
++  echo To: "$to" ; \
++  echo Subject: "$sub" ; \
++  echo Content-Transfer-Encoding: base64 ;
++  echo "" ; \
++  mimencode -b ) | splitmail -d $*
+--- metamail-2.7.orig/bin/sun-message
++++ metamail-2.7/bin/sun-message
+@@ -0,0 +1,56 @@
++#!/bin/sh -e
++#
++#  This is sun-message.
++#  It looks at $2 to figure out how to decode $1,
++#  then gives the user a short menu of choices:
++#    display, save or quit.
++
++if [ "$2" = "uuencode" ]
++then 
++	fn=`tempfile -p metamail -m 600`
++	uudecode -o $fn "$1"
++
++	echo "The following file was uudecoded:"
++	echo
++
++	defans=1
++	while :
++	do
++		ls -l $fn
++
++		echo
++		echo "Please choose one:"
++		echo
++		echo "1 -- Display it as ASCII text"
++		echo "2 -- Save it as a file"
++		echo "3 -- Quit this menu"
++		echo
++		echo -n "Which do you prefer (1 - 3)? [$defans] "
++
++		read ans
++		if test -z "${ans:-}"
++		then
++			ans=$defans
++		fi
++
++		case $ans in
++			1)	sensible-pager $fn ;;
++			2)	echo -n "Save as: $HOME/"
++				read nfn
++				if test ! -z "${nfn:-}"
++				then
++					cp $fn "$HOME/$nfn"
++				else
++					echo Not Saved.
++				fi
++				;;
++			3)	rm "$1" $fn
++				exit 0
++				;;
++			*)	echo Invalid choice. ;;
++		esac
++		defans=3
++	done
++else
++	sensible-pager "$1"
++fi
+--- metamail-2.7.orig/bin/uudepipe
++++ metamail-2.7/bin/uudepipe
+@@ -0,0 +1,13 @@
++#!/bin/sh -e
++# This file Copyright (c) 1992 Z-Code Software Corp.
++# Permission to use, copy, modify, and distribute this material
++# for any purpose and without fee is hereby granted, provided
++# that the above copyright notice and this permission notice
++# appear in all copies, and that the name of Z-Code Software not
++# be used in advertising or publicity pertaining to this
++# material without the specific, prior written permission
++# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++uudecode -o /dev/stdout -- ${1+"$1"}
+--- metamail-2.7.orig/bin/shownonascii
++++ metamail-2.7/bin/shownonascii
+@@ -0,0 +1,104 @@
++#!/bin/sh -e
++# Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++# 
++# Permission to use, copy, modify, and distribute this material 
++# for any purpose and without fee is hereby granted, provided 
++# that the above copyright notice and this permission notice 
++# appear in all copies, and that the name of Bellcore not be 
++# used in advertising or publicity pertaining to this 
++# material without the specific, prior written permission 
++# of an authorized representative of Bellcore.  BELLCORE 
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++# Conversion from C shell to Bourne shell by Z-Code Software Corp.
++# Conversion Copyright (c) 1992 Z-Code Software Corp.
++# Permission to use, copy, modify, and distribute this material
++# for any purpose and without fee is hereby granted, provided
++# that the above copyright notice and this permission notice
++# appear in all copies, and that the name of Z-Code Software not
++# be used in advertising or publicity pertaining to this
++# material without the specific, prior written permission
++# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++# Brought into line with metamail 2.7 beta release Csh version
++#    Dave Shield	February 1994
++
++MYFONTDIR=/usr/lib/X11/fonts/misc
++
++CHARSET=$1
++shift
++
++if test "$1" = "-e"
++then
++	shift
++	CMD="$*"
++	RIGHTTERMCMD="$*"
++else
++	CMD="more $* /dev/null"
++	RIGHTTERMCMD="more $*"
++fi
++
++if test ! -z "${MM_CHARSET:-}"
++then
++	if test "$MM_CHARSET" = "$CHARSET"
++	then
++		$RIGHTTERMCMD
++		exit 0
++	fi
++fi
++for f in "${MM_AUXCHARSETS:-}"
++do
++	if test "$f" = "$CHARSET"
++	then
++		$RIGHTTERMCMD
++		exit 0
++	fi
++done
++
++if test ! -d "$MYFONTDIR"
++then
++	echo This message contains non-ASCII text, but the $CHARSET font
++	echo has not yet been installed on this machine.  What follows
++	echo "may be partially unreadable, but the English (ASCII) parts"
++	echo "should still be readable."
++	cat $*
++	exit 0
++fi
++
++if test -z "${DISPLAY:-}"
++then
++	echo This message contains non-ASCII text, which can only be displayed
++	echo properly if you are running X11.  What follows
++	echo "may be partially unreadable, but the English (ASCII) parts"
++	echo "should still be readable."
++	cat $*
++	exit 0
++fi
++
++#
++# Do we have a font server?
++#
++if xset q | grep -q tcp/localhost:7100
++then
++    echo Your font path appears to be correctly set.
++else
++	if xset q | grep -q $MYFONTDIR
++	then
++	    echo Your font path appears to be correctly set.
++	else
++	    echo Adding $MYFONTDIR to your font path.
++	    xset +fp "$MYFONTDIR"
++	fi
++fi
++
++echo Running xterm to display text in $CHARSET, please wait...
++
++# Bogus -- need to unsetenv MM_NOTTTY, but can't in Bourne shell.  --bobg.
++MM_NOTTTY=''
++XCHARSET=\*`echo $CHARSET | sed -e s/iso-/iso/`
++xterm -fn $XCHARSET -e $CMD
+--- metamail-2.7.orig/bin/sun2mime
++++ metamail-2.7/bin/sun2mime
+@@ -1,4 +1,4 @@
+-#!/bin/sh -f
++#!/bin/sh -e
+ #
+ # This is sun2mime.  It makes a bold attempt to transform a Sun mailtool message into
+ # MIME format.
+@@ -6,12 +6,9 @@
+ # This program is for use with sun-message which takes an arg to figure out how
+ # (or if) the message is encoded.
+ #
+-if [ x$METAMAIL_TMPDIR = x ]; then
+-    METAMAIL_TMPDIR=/tmp
+-fi
+-TMPFILE=${METAMAIL_TMPDIR}/suntomime.$$
++TMPFILE=`tempfile -p metamail -m 600`
+ 
+-/bin/nawk '
++nawk '
+   BEGIN { printf("Content-type: multipart/mixed; boundary=--------\n\n")
+           RS=""; FS="\n"; mode="HEADER" }
+   mode == "HEADER" {
+@@ -36,8 +33,8 @@
+       print
+   }
+   END { printf("----------\n") }
+-' $1 > $TMPFILE
++' "$1" > $TMPFILE
+ 
+ metamail -z $TMPFILE
+-rm -f $TMPFILE
+-
++rm $TMPFILE
++exit 0
+--- metamail-2.7.orig/bin/sndAppleSingle
++++ metamail-2.7/bin/sndAppleSingle
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/sh -e
+ #
+ # Very simple shellscript to support sending Macintosh files
+ # which are stored in a UNIX filesystem by the CAP AUFS program.
+--- metamail-2.7.orig/bin/sun-audio-file
++++ metamail-2.7/bin/sun-audio-file
+@@ -1,12 +1,20 @@
+-#!/bin/csh -fb
+-# (The "-fb" might need to be changed to "-f" on some systems)
+-#
++#!/bin/sh -e
++# This file Copyright (c) 1992 Z-Code Software Corp.
++# Permission to use, copy, modify, and distribute this material
++# for any purpose and without fee is hereby granted, provided
++# that the above copyright notice and this permission notice
++# appear in all copies, and that the name of Z-Code Software not
++# be used in advertising or publicity pertaining to this
++# material without the specific, prior written permission
++# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
+ 
+-if (! $?METAMAIL_TMPDIR) then
+-    set METAMAIL_TMPDIR=/tmp
+-endif
++# Brought into line with metamail 2.7 beta release Csh version
++#    Dave Shield	February 1994
+ 
+-cd ${METAMAIL_TMPDIR}
+-uudecode < $1
+-audiotool audio-file
+-rm -f audio-file $1
++audio-file=`tempfile -p metamail -m 600`
++uudecode -o $audio-file "$1"
++audiotool $audio-file
++rm $audio-file "$1"
+--- metamail-2.7.orig/bin/uuenpipe
++++ metamail-2.7/bin/uuenpipe
+@@ -0,0 +1,13 @@
++#!/bin/sh -e
++# This file Copyright (c) 1992 Z-Code Software Corp.
++# Permission to use, copy, modify, and distribute this material
++# for any purpose and without fee is hereby granted, provided
++# that the above copyright notice and this permission notice
++# appear in all copies, and that the name of Z-Code Software not
++# be used in advertising or publicity pertaining to this
++# material without the specific, prior written permission
++# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++uuencode -- ${1+"$1"} "$(basename "${1-UUPIPEOUT}")"
+--- metamail-2.7.orig/bin/metasend
++++ metamail-2.7/bin/metasend
+@@ -1,6 +1,4 @@
+-#!/bin/csh -fb
+-# (The "-fb" might need to be changed to "-f" on some systems)
+-#
++#!/bin/sh -e
+ # Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
+ # 
+ # Permission to use, copy, modify, and distribute this material 
+@@ -13,487 +11,591 @@
+ # MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
+ # OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
+ # WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
+-#
+ 
+-if (! $?METAMAIL_TMPDIR) then
+-    set METAMAIL_TMPDIR=/tmp
+-endif
+-
+-set hname = `hostname`
+-set idctr=0
+-set MustDelete=0
+-set batchmode=0
+-set multipart = 1
+-if ($?SPLITSIZE) then
+-    set splitsize=$SPLITSIZE
++# Conversion from C shell to Bourne shell by Z-Code Software Corp.
++# Conversion Copyright (c) 1992 Z-Code Software Corp.
++# Permission to use, copy, modify, and distribute this material
++# for any purpose and without fee is hereby granted, provided
++# that the above copyright notice and this permission notice
++# appear in all copies, and that the name of Z-Code Software not
++# be used in advertising or publicity pertaining to this
++# material without the specific, prior written permission
++# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++# Brought into line with metamail 2.7 beta release Csh version
++#    Dave Shield	February 1994
++
++hname=`hostname`
++idctr=0
++MustDelete=0
++batchmode=0
++multipart=1
++if test ! -z "${SPLITSIZE:-}"
++then
++	splitsize=$SPLITSIZE
+ else
+-    set splitsize = 100000
+-endif
+-set outputfile = ""
+-set multipartsubtype = "mixed"
+-set cdescrip = "An object packed by metasend"
+-set isentity=0
+-set newid=`date | tr " :" "__"`
+-set cid="<${newid}_$idctr@${hname}>"
+-@ idctr++
+-
+-while ($#argv > 0)
+-    switch ("$1")
+-        case "-S":
+-            shift
+-            if ($#argv == 0) then
+-                echo "-S requires a following argument, the SPLIT threshhold"
+-                exit -1
+-            endif
+-            set splitsize=$1
+-            shift
+-            breaksw
+-        case "-b":
+-            # Batch mode -- ALL args must be on command line
+-            set batchmode = 1
+-            shift
+-            breaksw
+-        case "-c":
+-            shift
+-            if ($#argv == 0) then
+-                echo "-c requires a following argument, the CC address"
+-                exit -1
+-            endif
+-            set cc="$1"
+-            shift
+-            breaksw
+-        case "-i":
+-            shift
+-            if ($#argv == 0) then
+-                echo "-i requires a following argument, the Content-ID value"
+-                exit -1
+-            endif
+-            set cid=$1
+-            shift
+-            breaksw
+-        case "-I":
+-            shift
+-            if ($#argv == 0) then
+-                echo "-I requires a following argument, the multipart Content-ID value"
+-                exit -1
+-            endif
+-            set multicid=$1
+-            shift
+-            breaksw
+-        case "-s":
+-            shift
+-            if ($#argv == 0) then
+-                echo "-s requires a following argument, the SUBJECT"
+-                exit -1
+-            endif
+-            set subject="$1"
+-            shift
+-            breaksw
+-        case "-t":
+-            shift
+-            if ($#argv == 0) then
+-                echo "-t requires a following argument, the TO address"
+-                exit -1
+-            endif
+-            set to="$1"
+-            shift
+-            breaksw
+-        case "-F":
+-            shift
+-            if ($#argv == 0) then
+-                echo "-F requires a following argument, the FROM address"
+-                exit -1
+-            endif
+-            set from="$1"
+-            shift
+-            breaksw
+-        case "-P":
+-            shift
+-            if ($#argv == 0) then
+-                echo "-P requires a following argument, the preamble file name"
+-                exit -1
+-            endif
+-            set preamblefile="$1"
+-            shift
+-            breaksw
+-        case "-e":
+-            shift
+-            if ($#argv == 0) then
+-                echo "-e requires a following argument, the ENCODING value"
+-                exit -1
+-            endif
+-            set encode=$1
+-            if ($encode == "base64") then
+-	    set encodingprog = "mimencode -b"
+-            else if ($encode == "x-uue") then
+-	        set encodingprog = "uuencode mail-body"
+-            else if ($encode == "7bit") then
+-	        set encodingprog = cat
+-           else
+-	        set encodingprog = "mimencode -q"
+-	        set encode = "quoted-printable"
+-           endif 
+-           shift
+-            breaksw
+-        case "-f":
+-            shift
+-            if ($#argv == 0) then
+-                echo "-f requires a following argument, the DATA FILE"
+-                exit -1
+-            endif
+-            set datafile=$1
+-            if (! -e  $datafile) then
+-                echo The file $datafile does not exist.
+-                exit -1
+-            endif
+-            shift
+-            breaksw
+-        case "-m":
+-            shift
+-            if ($#argv == 0) then
+-                echo "-m requires a following argument, the MIME CONTENT-TYPE"
+-                exit -1
+-            endif
+-#            set ctyperaw = $1
+-#            set  ctype=`echo $ctyperaw | tr \" \'`
+-	set ctype = "$1"
+-	if (`echo $ctype | grep /` == "") then
+-	    echo "Invalid content-type specified"
+-	    exit -1
+-	endif
+-            shift
+-            breaksw
+-        case "-o":
+-            shift
+-            if ($#argv == 0) then
+-                echo "-o requires a following argument, the output file name"
+-                exit -1
+-            endif
+-            set outputfile="$1"
+-            shift
+-            breaksw
+-        case "-/":
+-            shift
+-            if ($#argv == 0) then
+-                echo "-/ requires a following argument, the multipart subtype"
+-                exit -1
+-            endif
+-            set multipartsubtype="$1"
+-            shift
+-            breaksw
+-        case "-D":
+-            shift
+-            if ($#argv == 0) then
+-                echo "-D requires a following argument, the Content-Description value"
+-                exit -1
+-            endif
+-            set cdescrip="$1"
+-            shift
+-            breaksw
+-        case "-E":
+-            set isentity=1
+-            shift
+-            breaksw
+-        case "-z":
+-            set MustDelete=1
+-            shift
+-            breaksw
+-        case "-n":
+-            if ($isentity) then
+-              if (! $?encode) then 
+-                set encode=7bit
+-                set encodingprog=cat
+-              endif
+-              if (! $?ctype) then
+-                  set ctype=bogus
+-                  # Never used
+-               endif
+-	if ( ! $?datafile) then
+-	    echo One part is incomplete -- each part needs at least -f and -E
+-	    exit -1
+-	endif
+-            else 
+-	if ( ! $?ctype || ! $?datafile) then
+-	    echo One part is incomplete -- each part needs at least -f and -m
+-	    exit -1
+-	endif
+-            endif
+-	if (! $?encode) then
+-	        if ("$ctype" =~ text*) then
+-	              set encodingprog = "mimencode -q"
+-		set encode = "quoted-printable"
+-	        else
+-	            set encode = base64
+-	            set encodingprog = "mimencode -b"
+-	        endif
+-	endif
+-	set ctype${multipart} = "$ctype"
+-	set datafile${multipart} = $datafile
+-	set encode${multipart} = $encode
+-	set cdescrip${multipart} = "$cdescrip"
+-	set cid${multipart} = "$cid"
+-	set isentity${multipart} = $isentity
+-	set encodingprog${multipart} = "$encodingprog"
+-	unset ctype
+-	unset datafile
+-	unset encode
+-	unset encodingprog
+-	set newid=`date | tr " :" "__"`
+-	set cid="<${newid}_$idctr@${hname}>"
+-	@ idctr++
+-	set cdescrip = "An object packed by metasend"
+-	set isentity=0
+-            @  multipart++
+-	shift
+-	breaksw
+-        default:
+-            echo UNRECOGNIZED METASEND OPTION: $1
+-            exit -1
+-    endsw
+-end
+-if ($batchmode == 0) then
+-    if (! $?to) then
+-        echo -n "To: "
+-        set to = $<
+-    endif
+-    if (! $?subject) then
+-        echo -n "Subject: "
+-        set subject = $<
+-    endif
+-    if (! $?cc) then
+-        echo -n "CC: "
+-        set cc = $<
+-    endif
+-anotherpart:
+-    if (! $?ctype) then
+-        echo -n "Content-type: "
+-#        set ctyperaw = $<
+-#        set  ctype=`echo $ctyperaw | tr \" \'`
+-        set ctype = "$<"
+-    endif
+-    if (`echo $ctype | grep /` == "") then
+-        echo "Invalid content-type specified"
+-        unset ctype
+-        goto anotherpart
+-    endif
+-#    if ($ctype != $ctyperaw)  echo Double  quotes not allowed, using $ctype
+-    if (! $?datafile) then
+-        getfile:
+-        echo -n "Name of file containing $ctype data: "
+-        set datafile = $<
+-        if (! -e  $datafile) then
+-            echo The file $datafile does not exist.
+-            goto getfile
+-        endif
+-    endif
+-    if (! $?encode) then
+-        retry:
+-        echo "Do you want to encode this data for sending through the mail?"
+-        echo "  1 -- No, it is already in 7 bit ASCII"
+-        echo "  2 -- Yes, encode in base64 (most efficient)"
+-        echo "  3 -- Yes, encode in quoted-printable (less efficient, more readable)"
+-        echo "  4 -- Yes, encode it using uuencode (not standard, being phased out)"
+-        set encode=$<
+-        switch ("$encode")
+-            case 1:
+-                set encodingprog = cat
+-	  set encode = 7bit
+-                breaksw
+-            case 2:
+-                set encodingprog = "mimencode -b"
+-	  set encode = base64
+-                breaksw
+-            case 3:
+-                set encodingprog = "mimencode -q"
+-	  set encode = quoted-printable
+-                breaksw
+-            case 4:
+-                set encodingprog = "uuencode $datafile"
+-	  set encode = x-uue
+-                breaksw
+-            default:
+-                echo Unrecognized answer, please try again.
+-                goto retry
+-        endsw
+-    endif
+-    echo -n "Do you want to include another file too (y/n) [n] ? "
+-    set ans=$<
+-    if  ("$ans" =~ y*) then
+-	set ctype${multipart} = "$ctype"
+-	set datafile${multipart} = $datafile
+-	set encode${multipart} = $encode
+-	set encodingprog${multipart} = "$encodingprog"
+-	set cdescrip${multipart} = "$cdescrip"
+-	set cid${multipart} = "$cid"
+-	set isentity${multipart} = $isentity
+-	set cdescrip = "An object packed by metasend"
+-	set isentity=0
+-	unset ctype
+-	unset datafile
+-	unset encode
+-	unset encodingprog
+-	set newid=`date | tr " :" "__"`
+-	set cid="<${newid}_$idctr@${hname}>"
+-	@ idctr++
+-            @  multipart++
+-            goto anotherpart
+-     endif
++	splitsize=100000
++fi
++
++ouputfile=
++multipartsubtype=mixed
++cdescrip=    # -Immi
++attachfilename=    # -Immi
++isentity=0
++newid=`date | tr " :" "__"`
++cid="<${newid}_$idctr@${hname}>"
++idctr=`expr $idctr + 1`
++
++while test ! -z "$*"
++do
++	case $1 in
++		-S) shift
++		    if test -z "$*"
++		    then
++			echo "-S requires a following argument, the SPLIT threshhold"
++			exit 1
++		    fi
++		    splitsize=$1
++		    shift ;;
++
++		-b) batchmode=1
++		    shift ;;
++
++		-c) shift
++		    if test -z "$*"
++		    then
++		    	echo "-c requires a following argument, the CC address"
++			exit 1
++		    fi
++		    cc=$1
++		    shift ;;
++
++		-i) shift
++		    if test -z "$*"
++		    then
++			echo "-i requires a following argument, the Content-ID value"
++			exit 1
++		    fi
++		    cid=$1
++		    shift ;;
++
++		-I) shift
++		    if test -z "$*"
++		    then
++			echo "-I requires a following argument, the multipart Content-ID value"
++			exit 1
++		    fi
++		    multicid=$1
++		    shift ;;
++
++		-s) shift
++		    if test -z "$*"
++		    then
++			echo "-s requires a following argument, the SUBJECT"
++			exit 1
++		    fi
++		    subject=$1
++		    shift ;;
++
++		-t) shift
++		    if test -z "$*"
++		    then
++			echo "-t requires a following argument, the TO address"
++			exit 1
++		    fi
++		    to=$1
++		    shift ;;
++
++		-F) shift
++		    if test -z "$*"
++		    then
++			echo "-F requires a following argument, the FROM address"
++			exit 1
++		    fi
++		    from=$1
++		    shift ;;
++
++		-P) shift
++		    if test -z "$*"
++		    then
++			echo "-P requires a following argument, the preamble file name"
++			exit 1
++		    fi
++		    preamblefile=$1
++		    shift ;;
++
++		-e) shift
++		    if test -z "$*"
++		    then
++			echo "-e requires a following argument, the ENCODING value"
++			exit 1
++		    fi
++		    encode=$1
++		    case "$encode" in
++			"base64")	encodingprog="mimencode -b";;
++			"x-uue")	encodingprog="uuencode \$datafile";;
++			"7bit")		encodingprog=cat;;
++			"8bit")		encodingprog=cat;;
++			*)		encodingprog="mimencode -q"
++					encode=quoted-printable ;;
++		    esac
++		    shift ;;
++
++		-f) shift
++		    if test -z "$*"
++		    then
++			echo "-f requires a following argument, the DATA FILE"
++			exit 1
++		    fi
++		    datafile=$1
++		    if test ! -r "$datafile"
++		    then
++			echo The file "$datafile" does not exist
++			exit 1
++		    fi
++		    shift ;;
++
++		-m) shift
++		    if test -z "$*"
++		    then
++			echo "-m requires a following argument, the MIME CONTENT-TYPE"
++			exit 1
++		    fi
++		    ctype=$1
++		    if test "`echo $ctype | grep /`" = ""
++		    then
++			echo Invalid content-type specified
++			exit 1
++		    fi
++		    shift ;;
++
++		-o) shift
++		    if test -z "$*"
++		    then
++			echo "-o requires a following argument, the output file name"
++			exit 1
++		    fi
++		    outputfile=$1
++		    shift ;;
++
++		-/) shift
++		    if test -z "$*"
++		    then
++			echo "-/ requires a following argument, the multipart subtype"
++			exit 1
++		    fi
++		    multipartsubtype=$1
++		    shift ;;
++
++		-D) shift
++		    if test -z "$*"
++		    then
++			echo "-D requires a following argument, the Content-Description value"
++			exit 1
++		    fi
++		    cdescrip=$1
++		    shift ;;
++
++# begin immi
++		-A) shift
++		    if test -z "$*"
++		    then
++			echo "-A requires a following argument, the attachment file name"
++			exit 1
++		    fi
++		    attachfilename=$1
++		    shift ;;
++#end immi
++
++		-E) isentity=1
++		    shift ;;
++
++		-z) MustDelete=1
++		    shift ;;
++
++		-n) if test $isentity -ne 0
++		    then
++			if test -z "${encode:-}"
++			then
++				encode=7bit
++				encodingprog=cat
++			fi
++			if test -z "${ctype:-}"
++			then
++				ctype=bogus
++				# Never used
++			fi
++			if test -z "${datafile:-}"
++			then
++				echo One part is incomplete -- each part needs at least -f and -E
++				exit 1
++			fi
++		    else
++			if test -z "${ctype:-}" || test -z "${datafile:-}"
++			then
++				echo One part is incomplete -- each part needs at least -f and -m
++				exit 1
++			fi
++		    fi
++		    if test -z "${encode:-}"
++		    then
++		    	case "$ctype" in
++				text*)	encodingprog="mimencode -q"
++					encode=quoted-printable ;;
++				*)	encodingprog="mimencode -b"
++					encode=base64 ;;
++			esac
++		    fi
++		    eval ctype${multipart}=\"$ctype\"
++		    eval datafile${multipart}=$datafile
++		    eval encode${multipart}=$encode
++		    eval cdescrip${multipart}=\"$cdescrip\"
++		    eval attachfilename${multipart}=\"$attachfilename\"   # -Immi
++		    eval cid${multipart}=\"$cid\"
++		    eval isentity${multipart}=$isentity
++		    eval encodingprog${multipart}=\"\$encodingprog\"
++
++		    ctype=
++		    datafile=
++		    encode=
++		    encodingprog=
++		    newid=`date | tr " :" "__"`
++		    cid="<${newid}_$idctr@${hname}>"
++		    idctr=`expr $idctr + 1`
++		    cdescrip=             # -Immi
++		    attachfilename=       # -Immi
++		    isentity=0
++		    multipart=`expr $multipart + 1`
++		    shift ;;
++
++		*) echo UNRECOGNIZED METASEND OPTION: "$1"
++		   exit 1 ;;
++	esac
++done
++
++if test $batchmode -eq 0
++then
++	if test -z "${to:-}"
++	then
++		echo -n "To: "
++		read to
++	fi
++	if test -z "${subject:-}"
++	then
++        	echo -n "Subject: "
++		read subject
++	fi
++	if test -z "${cc:-}"
++	then
++		echo -n "CC: "
++		read cc
++	fi
++
++	anotherpart=1
++	while test $anotherpart -eq 1
++	do
++	    looping=1
++	    while test $looping -ne 0
++	    do
++	        if test -z "${ctype:-}"
++	        then
++        		echo -n "Content-type: "
++			read ctype
++		fi
++		if test "`echo $ctype | grep /`" = ""
++		then
++			echo Invalid content-type specified
++			ctype=
++		else
++			looping=0
++		fi
++	    done
++	    if test -z "${datafile:-}"
++	    then
++		looping=1
++		while test $looping -eq 1
++		do
++			echo -n "Name of file containing $ctype data: "
++			read datafile
++			if test -r "$datafile"
++			then
++				looping=0
++			else
++				echo "The file $datafile does not exist."
++			fi
++		done
++	    fi
++
++	    if test -z "${encode:-}"
++	    then
++		looping=1
++		while test $looping -eq 1
++		do
++			echo "Do you want to encode this data for sending through the mail?"
++			echo "  1 -- No, it is already in 7 bit ASCII"
++			echo "  2 -- Yes, encode in base64 (most efficient)"
++			echo "  3 -- Yes, encode in quoted-printable (less efficient, more readable)"
++			echo "  4 -- Yes, encode it using uuencode (not standard, being phased out)"
++			echo "  5 -- No, it is 8 bit extended ASCII"
++			read encode
++			looping=0
++			case "$encode" in
++				1) encodingprog=cat
++				   encode=7bit ;;
++				2) encodingprog="mimencode -b"
++				   encode=base64 ;;
++				3) encodingprog="mimencode -q"
++				   encode=quoted-printable ;;
++				4) encodingprog="uuencode $datafile"
++				   encode=x-uue ;;
++ 				5) encodingprog=cat
++ 				   encode=8bit ;;
++				*) echo Unrecognized answer, please try again.
++				   looping=1 ;;
++			esac
++		done
++	    fi
++
++	    echo -n "Do you want to include another file too (y/n) [n] ? "
++	    read ans
++	    case $ans in
++		[Yy]*)	
++		    eval ctype${multipart}=\"$ctype\"
++		    eval datafile${multipart}=$datafile
++		    eval encode${multipart}=$encode
++		    eval encodingprog${multipart}=\"\$encodingprog\"
++		    eval cdescrip${multipart}=\"$cdescrip\"
++		    eval attachfilename${multipart}=\"$attachfilename\"   # -Immi
++		    eval cid${multipart}=\"$cid\"
++		    eval isentity${multipart}=$isentity
++		    cdescrip=         # -Immi
++		    attachfilename=   # -Immi
++		    isentity=0
++		    ctype=
++		    datafile=
++		    encode=
++		    encodingprog=
++		    newid=`date | tr " :" "__"`
++		    cid="<${newid}_$idctr@${hname}>"
++		    idctr=`expr $idctr + 1`
++		    multipart=`expr $multipart + 1`
++		    ;;
++		*)
++		    anotherpart=0;;
++	    esac
++	done
++
+ else
+-    if ($outputfile == "") then
+-      if (! $?to || ! $?subject || ! $?ctype || ! $?datafile) then
+-        echo metasend: in batch mode, if output is not directed to a file,-t, -s, -f, and -m are all required
+-        exit -1
+-      endif
+-    else
+-      if (! $?datafile) then
+-        echo metasend:  in batch mode, -f is required.
+-      endif
+-      if ($isentity) then
+-        if (! $?ctype) then
+-          set ctype=bogus
+-          # will not be used anyway really
+-        endif
+-      endif
+-      if (! $?ctype  ) then
+-        echo metasend: in batch mode, with output directed to a file, -E or -m is required
+-        exit -1
+-      endif
+-    endif    
+-    if (! -e  $datafile) then
+-        echo metasend:  The file $datafile does not exist
+-        exit -1
+-    endif
+-#    if (! $?cc) set cc=""
+-#     if ($ctype != $ctyperaw)  echo Double  quotes not allowed, using $ctype
+-    if (! $?encode) then
+-        if ("$ctype" =~ text*) then
+-	set encodingprog = "mimencode -q"
+-	set encode = "quoted-printable"
+-        else
+-            set encodingprog = "mimencode -b"
+-            set encode = base64
+-        endif
+-    else if ($encode == "base64") then
+-        set encodingprog = "mimencode -b"
+-    else if ($encode == "x-uue") then
+-        set encodingprog = "uuencode mail-body"
+-    else if ($encode == "7bit") then
+-        set encodingprog = cat
+-    else
+-        set encodingprog = "mimencode -q"
+-        set encode = "quoted-printable"
+-    endif
+-endif
+-
+-if (! $?encode) then
+-        if ("$ctype" =~ text*) then
+-	set encode = "quoted-printable"
+-	set encodingprog = "mimencode -q"
+-        else
+-            set encode = base64
+-            set encodingprog = "mimencode -b"
+-        endif
+-endif
+-set ctype${multipart} = "$ctype"
+-set datafile${multipart} = $datafile
+-set encode${multipart} = $encode
+-set cdescrip${multipart} = "$cdescrip"
+-set cid${multipart} = "$cid"
+-set isentity${multipart} = $isentity
+-set encodingprog${multipart} = "$encodingprog"
++	if test -z "${outputfile:-}"
++	then
++	    if test -z "${to:-}" \
++		-o -z "${subject:-}" \
++		-o -z "${ctype:-}" \
++		-o -z "${datafile:-}"
++	    then
++		echo "metasend: in batch mode, if output is not directed to a file,  -t, -s, -f, and -m are all required"
++		exit 1
++	    fi
++	else
++	    if test -z "${datafile:-}"
++	    then
++		echo "metasend: in batch mode, -f is required."
++		exit 1
++	    fi
++	    if test $isentity -ne 0
++	    then
++	        if test -z "${ctype:-}"
++	        then
++			ctype=bogus
++			#  will not be used anyway
++		fi
++	    fi
++	    if test -z "${ctype:-}"
++	    then
++		echo "metasend: in batch mode, with output directed to a file, -E or -m is required."
++		exit 1
++	    fi
++	fi
++
++
++	if test ! -r "$datafile"
++	then
++		echo "metasend: The file $datafile does not exist"
++		exit 1
++	fi
++
++#	if test -z "${cc:-}"
++#	then
++#		cc=''
++#	fi
++
++	if test -z "${encode:-}"
++	then
++		case "$ctype" in
++			text*) encodingprog="mimencode -q"
++			       encode=quoted-printable ;;
++			*) encodingprog="mimencode -b"
++			   encode=base64 ;;
++		esac
++	else
++		case "$encode" in
++			base64) encodingprog="mimencode -b" ;;
++			x-uue)  encodingprog="uuencode $datafile" ;;
++			7bit)   encodingprog=cat ;;
++			8bit)   encodingprog=cat ;;
++			*) encodingprog="mimencode -q"
++			   encode=quoted-printable ;;
++		esac
++	fi
++fi
++
++if test -z "${encode:-}"
++then
++	case "$ctype" in
++		text*) encodingprog="mimencode -q"
++		       encode=quoted-printable ;;
++		*) encodingprog="mimencode -b"
++		   encode=base64 ;;
++	esac
++fi
++
++eval ctype${multipart}=\"$ctype\"
++eval datafile${multipart}=$datafile
++eval encode${multipart}=$encode
++eval cdescrip${multipart}=\"$cdescrip\"
++eval attachfilename${multipart}=\"$attachfilename\"   # -Immi
++eval cid${multipart}=\"$cid\"
++eval isentity${multipart}=$isentity
++eval encodingprog${multipart}=\"\$encodingprog\"
+ 
+-set fname = ${METAMAIL_TMPDIR}/metasend.$$
++fname=`tempfile -p metamail -m 600`
+ echo "MIME-Version: 1.0" > $fname
+-if ($?to) then
+-    echo "To: " "$to" >> $fname
+-endif
+-if ($?subject) then
+-    echo "Subject: " "$subject" >> $fname
+-endif
+-if ($?cc) then
+-    echo "CC: " "$cc" >> $fname
+-endif
+-if ($?from) then
+-    echo "From: " "$from" >> $fname
+-endif
+-if ($multipart > 1) then
+-    set  boundary = ${hname}.$$.`date | tr "  " .`
+-    set newid=`date | tr " :" "__"`
+-    if ($?multicid) then
+-        echo "Content-ID: $multicid"   >> $fname
+-    else
+-        echo "Content-ID: <${newid}_$idctr@${hname}>"   >> $fname
+-        @ idctr++
+-    endif
+-    echo "Content-type: multipart/$multipartsubtype;" >> $fname
+-    echo "	boundary="\"$boundary\" >> $fname
+-    echo "" >> $fname
+-    if ($?preamblefile) then
+-        cat $preamblefile >> $fname
+-    else
+-        echo "This is  a multimedia message in MIME  format.  If you are reading this" >> $fname
+-        echo "prefix, your mail reader does  not understand MIME.  You may wish" >> $fname
+-        echo "to look into upgrading to a newer version of  your mail reader." >> $fname
+-    endif
+-    set i=1
+-    set junkfile=${METAMAIL_TMPDIR}/mmjunk.$$
+-    while  ($multipart >= $i)
++
++if test ! -z "${to:-}"
++then echo "To: $to" >> $fname
++fi
++if test ! -z "${subject:-}"
++then echo "Subject: $subject" >> $fname
++fi
++if test ! -z "${cc:-}"
++then echo "CC: $cc" >> $fname
++fi
++if test ! -z "${from:-}"
++then echo "From: $from" >> $fname
++fi
++
++if test $multipart -gt 1
++then
++	boundary=${hname}.$$.`date | tr "  " .`
++	newid=`date | tr " :" "__"`
++	if test ! -z "${multicid:-}"
++	then
++		echo "Content-ID: $multicid" >> $fname
++	else
++		echo "Content-ID: ${newid}_$idctr@${hname}" >> $fname
++		idctr=`expr $idctr + 1`
++	fi
++	echo "Content-type: multipart/$multipartsubtype;" >> $fname
++	echo "	boundary="\"$boundary\" >> $fname
++	echo "" >> $fname
++	if test ! -z "${preamblefile:-}"
++	then
++		cat $preamblefile >> $fname
++	else
++		echo "This is  a multimedia message in MIME  format.  If you are reading this" >> $fname
++		echo "prefix, your mail reader does  not understand MIME.  You may wish" >> $fname
++		echo "to look into upgrading to a newer version of  your mail reader." >> $fname
++	fi
++
++	i=1
++	while test $multipart -ge $i
++	do
++		echo "" >> $fname
++		echo --$boundary >> $fname
++		eval isentity=\$isentity$i
++
++		if test $isentity -eq 0
++		then
++			eval echo "Content-ID: \$cid$i" >> $fname
++			eval echo "Content-type: \$ctype$i" >> $fname
++#begin immi
++			eval cdescrip=\$cdescrip$i
++			if test ! -z "$cdescrip"
++			then
++				echo "Content-Description: $cdescrip" >> $fname
++			fi
++			eval attachfilename=\$attachfilename$i
++			if test ! -z "$attachfilename"
++			then
++				echo "Content-Disposition: attachment; filename=\"$attachfilename\"" >> $fname
++			fi
++#end immi
++			eval echo "Content-Transfer-Encoding: \$encode$i" >> $fname
++			echo "" >> $fname
++		fi
++		eval \$encodingprog$i \< \"\$datafile$i\" \>\> $fname
++		i=`expr $i + 1`
++	done
++	echo "" >> $fname
++	echo --${boundary}-- >> $fname
+ 	echo "" >> $fname
+-	echo --$boundary >> $fname
+-	echo set isentity=\$isentity$i > $junkfile
+-	source $junkfile
+-	if (! $isentity) then
+-	    echo -n "Content-ID: "   >> $fname
+-	    echo echo \$cid$i \>\>  $fname > $junkfile
+-	    source $junkfile 
+-	    echo -n "Content-type: ">>$fname
+-	    echo echo \$ctype$i \>\>  $fname > $junkfile
+-	    source $junkfile 
+-	    echo -n "Content-Description: ">>$fname
+-	    echo echo \"\$cdescrip$i \" \>\>  $fname > $junkfile
+-	    source $junkfile 
+-	    echo -n "Content-Transfer-Encoding: " >>$fname
+-	    echo echo \$encode$i \>\> $fname > $junkfile
+-	    source $junkfile 
+-	    echo ""  >> $fname
+-	endif
+-	echo \$encodingprog$i \< \$datafile$i \>\> $fname > $junkfile
+-	source $junkfile 
+-	@ i++
+-    end
+-    rm $junkfile
+-    echo "" >> $fname
+-    echo --${boundary}-- >> $fname
+-    echo "" >> $fname
+-else 
+-    if (! $isentity) then
+-        echo "Content-ID: $cid"   >> $fname
+-        echo "Content-type: " $ctype >> $fname
+-        echo "Content-Description: " $cdescrip >> $fname
+-        echo "Content-Transfer-Encoding: " $encode >> $fname
+-    endif
+-    echo  "" >> $fname
+-    $encodingprog < $datafile >> $fname
+-    # Ensure last line has trailing carriage return
+-    echo "" >> $fname
+-endif
+-if ($outputfile == "") then
+-    if ($batchmode == 0) echo -n "Delivering mail, please wait...  "
+-    splitmail -s $splitsize -d $fname
+-    if (! $status) then
+-        if ($batchmode == 0) echo "Mail delivery apparently succeeded."
+-        rm $fname
+-    else if ($MustDelete == 1) then
+-        echo Mail delivery failed
+-        rm $fname
+-        exit -1
+-    else
+-        echo Mail delivery failed, draft mail is in $fname
+-        exit -1
+-    endif
+ else
+-    mv $fname $outputfile
+-    if ($status) exit -1
+-endif
++	if test $isentity -eq 0
++	then
++		echo "Content-ID: $cid" >> $fname
++		echo "Content-type: $ctype" >> $fname
++#begin immi
++		if test ! -z "$cdescrip"
++		then
++			echo "Content-Description: $cdescrip" >> $fname
++		fi
++		if test ! -z "$attachfilename"
++		then
++			echo "Content-Disposition: attachment; filename=\"$attachfilename\"" >> $fname
++		fi
++#end immi
++		echo "Content-Transfer-Encoding: $encode" >> $fname
++	fi
++	echo "" >> $fname
++	$encodingprog < "$datafile" >> $fname
++	# Ensure last line has trailing carriage return
++	echo "" >> $fname
++fi
++
++if test -z "${outputfile:-}"
++then
++	if test $batchmode = 0
++	then
++		echo -n "Delivering mail, please wait...  "
++	fi
++	splitmail -s "$splitsize" -d $fname
++
++	if test $? -eq 0
++	then
++		if test $batchmode = 0
++		then
++			echo "Mail delivery apparently succeeded."
++		fi
++		rm $fname
++	elif test "$MustDelete" -eq 1
++	then
++		echo Mail delivery failed
++		rm $fname
++		exit -1
++	else
++		echo "Mail delivery failed, draft mail is in $fname"
++		exit -1
++	fi
++else
++	mv $fname "$outputfile"
++	if test $? -ne 0
++	then
++		exit -1
++	fi
++fi
+ exit 0
+ 
++
+--- metamail-2.7.orig/bin/extcompose
++++ metamail-2.7/bin/extcompose
+@@ -1,103 +1,126 @@
+-#!/bin/csh -fb
+-# (The "-fb" might need to be changed to "-f" on some systems)
+-#
+-
+-if ($#argv < 1) then
+-    echo "Usage:  extcompose output-file-name"
++#!/bin/sh -e
++# This file Copyright (c) 1992 Z-Code Software Corp.
++# Permission to use, copy, modify, and distribute this material
++# for any purpose and without fee is hereby granted, provided
++# that the above copyright notice and this permission notice
++# appear in all copies, and that the name of Z-Code Software not
++# be used in advertising or publicity pertaining to this
++# material without the specific, prior written permission
++# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++if [ $# -lt 1 ]
++then
++    echo "Usage:  $0 output-file-name" 1>&2
+     exit 1
+-endif
+-set OUTFNAME=$1
++fi
++OUTFNAME=$1
++
++choosing=yes
++while [ $choosing = yes ]
++do
++    echo ""
++    echo "Where is the external data that you want this mail message to reference?"
++    echo "    1 -- In a local file"
++    echo "    2 -- In an AFS file"
++    echo "    3 -- In an anonymous FTP directory on the Internet"
++    echo "    4 -- In an Internet FTP directory that requires a valid login"
++    echo "    5 -- Under the control of a mail server that will send the data on request"
++    echo ""
++    echo -n "Please enter a number from 1 to 5: \c"
++    read ans
++    case "$ans" in
++        1) accesstype=local-file ;;
++	2) accesstype=afs ;;
++	3) accesstype=anon-ftp ;;
++	4) accesstype=ftp ;;
++	5) accesstype=mail-server ;;
++	* ) echo "That is NOT one of your choices." 1>&2; continue ;;
++    esac
++
++    case "$accesstype" in
++        ftp | anon-ftp )
++	    echo -n "Enter the full Internet domain name of the FTP site: "
++	    read site
++	    echo -n "Enter the name of the directory containing the file (RETURN for top-level): "
++	    read directory
++	    echo -n "Enter the name of the file itself: "
++	    read name
++	    echo -n "Enter the transfer mode (type 'image' for binary data, RETURN otherwise): "
++	    read mode
++	    if [ -n "$mode" ]
++	    then mode=ascii
++	    fi
++	    echo "Content-type: message/external-body; access-type=$accesstype; name="\"$name\"\; > "$OUTFNAME"
++	    echo -n "    site="\"$site\" >> "$OUTFNAME"
++	    if [ -n "$directory" ]
++	    then echo -n "; directory="\"$directory\">> "$OUTFNAME"
++	    fi
++	    echo -n "; mode="\"$mode\">> "$OUTFNAME"
++	    echo "">> "$OUTFNAME"
++	    choosing=no
++	    ;;
+ 
+-chooseaccesstype:
+-echo ""
+-echo "Where is the external data that you want this mail message to reference?"
+-echo "    1 -- In a local file"
+-echo "    2 -- In an AFS file"
+-echo "    3 -- In an anonymous FTP directory on the Internet"
+-echo "    4 -- In an Internet FTP directory that requires a valid login"
+-echo "    5 -- Under the control of a mail server that will send the data on request"
+-echo ""
+-echo -n "Please enter a number from 1 to 5: "
+-set ans=$<
+-if ($ans == 1)  then
+-    set accesstype=local-file
+-else if ($ans == 2) then
+-    set accesstype=afs
+-else if ($ans == 3) then
+-    set accesstype=anon-ftp
+-else if ($ans == 4) then
+-    set accesstype=ftp
+-else if ($ans == 5) then
+-    set accesstype=mail-server
+-else
+-    echo "That is NOT one of your choices."
+-    goto chooseaccesstype
+-endif
+-if ($accesstype == "ftp" || $accesstype == "anon-ftp") then
+-    echo -n "Enter the full Internet domain name of the FTP site: "
+-    set site=$<
+-    echo -n "Enter the name of the directory containing the file (RETURN for top-level): "
+-    set directory=$<
+-    echo -n "Enter the name of the file itself: "
+-    set name = $<
+-    echo -n "Enter the transfer mode (type 'image' for binary data, RETURN otherwise): "
+-    set mode = $<
+-    if ($mode == "") set mode=ascii
+-    echo "Content-type: message/external-body; access-type=$accesstype; name="\"$name\"\; > $OUTFNAME
+-    echo -n "    site="\"$site\" >> $OUTFNAME
+-    if ($directory != "") echo -n "; directory="\"$directory\">> $OUTFNAME
+-    if ($mode != "") echo -n "; mode="\"$mode\">> $OUTFNAME
+-    echo "">> $OUTFNAME
+-else if ($accesstype == "local-file" || $accesstype == "afs") then
+-fname:
+-    echo -n "Enter the full path name for the file: "
+-    set name = $<
+-    if (! -e $name) then
+-	echo "The file $name does not seem to exist."
+-	goto fname
+-    endif
+-    echo "Content-type: message/external-body; access-type=$accesstype; name="\"$name\"> $OUTFNAME
+-else if ($accesstype == "mail-server") then
+-    echo -n "Enter the full email address for the mailserver: "
+-    set server=$<
+-    echo "Content-type: message/external-body; access-type=$accesstype; server="\"$server\"> $OUTFNAME
+-else
+-    echo accesstype $accesstype not yet implemented
+-    goto chooseaccesstype
+-endif
++	local-file | afs )
++	    name=
++	    while [ -z "$name" ]
++	    do
++	        echo -n "Enter the full path name for the file: "
++		read name
++		if [ ! -f "$name" ]
++		then
++		    echo "The file $name does not seem to exist."
++		    name=
++		fi
++	    done
++	    echo "Content-type: message/external-body; access-type=$accesstype; name="\"$name\"> "$OUTFNAME"
++	    choosing=no
++	    ;;
++	
++	mail-server )
++	    echo -n "Enter the full email address for the mailserver: "
++	    read server
++	    echo "Content-type: message/external-body; access-type=$accesstype; server="\"$server\"> "$OUTFNAME"
++	    choosing=no
++	    ;;
++	
++	* )
++	    echo accesstype "$accesstype" not yet implemented
++	    ;;
++    esac
++done
+ 
+ echo -n "Please enter the MIME content-type for the externally referenced data: "
+-set ctype = $<
+-getcenc:
+-echo "Is this data already encoded for email transport?"
+-echo "  1 -- No, it is not encoded"
+-echo "  2 -- Yes, it is encoded in base64"
+-echo "  3 -- Yes, it is encoded in quoted-printable"
+-echo "  4 -- Yes, it is encoded using uuencode"
+-set encode=$<
+-switch ("$encode")
+-    case 1:
+-        set cenc=""
+-        breaksw
+-    case 2:
+-        set cenc="base64"
+-        breaksw
+-    case 3:
+-        set cenc="quoted-printable"
+-        breaksw
+-    case 4:
+-        set cenc="x-uue"
+-        breaksw
+-    default:
+-        echo "That is not one of your choices."
+-        goto getcenc
+-endsw
+-echo "" >> $OUTFNAME
+-echo "Content-type: " $ctype >> $OUTFNAME
+-if ($cenc != "") echo "Content-transfer-encoding: " $cenc >> $OUTFNAME
+-echo "" >> $OUTFNAME
+-if ($accesstype == "mail-server") then
++read ctype
++
++choosing=yes
++while [ $choosing = yes ]
++do
++    echo "Is this data already encoded for email transport?"
++    echo "  1 -- No, it is not encoded"
++    echo "  2 -- Yes, it is encoded in base64"
++    echo "  3 -- Yes, it is encoded in quoted-printable"
++    echo "  4 -- Yes, it is encoded using uuencode"
++    read encode
++    case "$encode" in
++	1 ) cenc="" choosing=no ;;
++	2 ) cenc="base64" choosing=no ;;
++	3 ) cenc="quoted-printable" choosing=no ;;
++	4 ) cenc="x-uue" choosing=no ;;
++	* ) echo "That is not one of your choices." ;;
++    esac
++done
++
++echo >> "$OUTFNAME"
++echo "Content-type: " "$ctype" >> "$OUTFNAME"
++if [ -n "$cenc" ]
++then echo "Content-transfer-encoding: " "$cenc" >> "$OUTFNAME"
++fi
++echo >> "$OUTFNAME"
++if [ "$accesstype" = "mail-server" ]
++then
+     echo "Please enter all the data to be sent to the mailserver in the message body, "
+     echo "ending with ^D or your usual end-of-data character:"
+-    cat >> $OUTFNAME
+-endif
++    cat >> "$OUTFNAME"
++fi
+--- metamail-2.7.orig/aclocal.m4
++++ metamail-2.7/aclocal.m4
+@@ -0,0 +1,3824 @@
++dnl aclocal.m4 generated automatically by aclocal 1.4-p6
++
++dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
++
++dnl This program is distributed in the hope that it will be useful,
++dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++dnl PARTICULAR PURPOSE.
++
++# Like AC_CONFIG_HEADER, but automatically create stamp file.
++
++AC_DEFUN([AM_CONFIG_HEADER],
++[AC_PREREQ([2.12])
++AC_CONFIG_HEADER([$1])
++dnl When config.status generates a header, we must update the stamp-h file.
++dnl This file resides in the same directory as the config header
++dnl that is generated.  We must strip everything past the first ":",
++dnl and everything past the last "/".
++AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
++ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
++<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
++<<am_indx=1
++for am_file in <<$1>>; do
++  case " <<$>>CONFIG_HEADERS " in
++  *" <<$>>am_file "*<<)>>
++    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
++    ;;
++  esac
++  am_indx=`expr "<<$>>am_indx" + 1`
++done<<>>dnl>>)
++changequote([,]))])
++
++# Do all the work for Automake.  This macro actually does too much --
++# some checks are only needed if your package does certain things.
++# But this isn't really a big deal.
++
++# serial 1
++
++dnl Usage:
++dnl AM_INIT_AUTOMAKE(package,version, [no-define])
++
++AC_DEFUN([AM_INIT_AUTOMAKE],
++[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
++AC_REQUIRE([AC_PROG_INSTALL])
++PACKAGE=[$1]
++AC_SUBST(PACKAGE)
++VERSION=[$2]
++AC_SUBST(VERSION)
++dnl test to see if srcdir already configured
++if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
++  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
++fi
++ifelse([$3],,
++AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
++AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
++AC_REQUIRE([AM_SANITY_CHECK])
++AC_REQUIRE([AC_ARG_PROGRAM])
++dnl FIXME This is truly gross.
++missing_dir=`cd $ac_aux_dir && pwd`
++AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
++AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
++AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
++AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
++AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
++AC_REQUIRE([AC_PROG_MAKE_SET])])
++
++# Copyright 2002  Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++
++# AM_AUTOMAKE_VERSION(VERSION)
++# ----------------------------
++# Automake X.Y traces this macro to ensure aclocal.m4 has been
++# generated from the m4 files accompanying Automake X.Y.
++AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
++
++# AM_SET_CURRENT_AUTOMAKE_VERSION
++# -------------------------------
++# Call AM_AUTOMAKE_VERSION so it can be traced.
++# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
++AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
++	 [AM_AUTOMAKE_VERSION([1.4-p6])])
++
++#
++# Check to make sure that the build environment is sane.
++#
++
++AC_DEFUN([AM_SANITY_CHECK],
++[AC_MSG_CHECKING([whether build environment is sane])
++# Just in case
++sleep 1
++echo timestamp > conftestfile
++# Do `set' in a subshell so we don't clobber the current shell's
++# arguments.  Must try -L first in case configure is actually a
++# symlink; some systems play weird games with the mod time of symlinks
++# (eg FreeBSD returns the mod time of the symlink's containing
++# directory).
++if (
++   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
++   if test "[$]*" = "X"; then
++      # -L didn't work.
++      set X `ls -t $srcdir/configure conftestfile`
++   fi
++   if test "[$]*" != "X $srcdir/configure conftestfile" \
++      && test "[$]*" != "X conftestfile $srcdir/configure"; then
++
++      # If neither matched, then we have a broken ls.  This can happen
++      # if, for instance, CONFIG_SHELL is bash and it inherits a
++      # broken ls alias from the environment.  This has actually
++      # happened.  Such a system could not be considered "sane".
++      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
++alias in your environment])
++   fi
++
++   test "[$]2" = conftestfile
++   )
++then
++   # Ok.
++   :
++else
++   AC_MSG_ERROR([newly created file is older than distributed files!
++Check your system clock])
++fi
++rm -f conftest*
++AC_MSG_RESULT(yes)])
++
++dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
++dnl The program must properly implement --version.
++AC_DEFUN([AM_MISSING_PROG],
++[AC_MSG_CHECKING(for working $2)
++# Run test in a subshell; some versions of sh will print an error if
++# an executable is not found, even if stderr is redirected.
++# Redirect stdin to placate older versions of autoconf.  Sigh.
++if ($2 --version) < /dev/null > /dev/null 2>&1; then
++   $1=$2
++   AC_MSG_RESULT(found)
++else
++   $1="$3/missing $2"
++   AC_MSG_RESULT(missing)
++fi
++AC_SUBST($1)])
++
++# Add --enable-maintainer-mode option to configure.
++# From Jim Meyering
++
++# serial 1
++
++AC_DEFUN([AM_MAINTAINER_MODE],
++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
++  dnl maintainer-mode is disabled by default
++  AC_ARG_ENABLE(maintainer-mode,
++[  --enable-maintainer-mode enable make rules and dependencies not useful
++                          (and sometimes confusing) to the casual installer],
++      USE_MAINTAINER_MODE=$enableval,
++      USE_MAINTAINER_MODE=no)
++  AC_MSG_RESULT($USE_MAINTAINER_MODE)
++  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
++  MAINT=$MAINTAINER_MODE_TRUE
++  AC_SUBST(MAINT)dnl
++]
++)
++
++# Define a conditional.
++
++AC_DEFUN([AM_CONDITIONAL],
++[AC_SUBST($1_TRUE)
++AC_SUBST($1_FALSE)
++if $2; then
++  $1_TRUE=
++  $1_FALSE='#'
++else
++  $1_TRUE='#'
++  $1_FALSE=
++fi])
++
++# libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
++
++# serial 46 AC_PROG_LIBTOOL
++
++AC_DEFUN([AC_PROG_LIBTOOL],
++[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
++
++# This can be used to rebuild libtool when needed
++LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++
++# Always use our own libtool.
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++AC_SUBST(LIBTOOL)dnl
++
++# Prevent multiple expansion
++define([AC_PROG_LIBTOOL], [])
++])
++
++AC_DEFUN([AC_LIBTOOL_SETUP],
++[AC_PREREQ(2.13)dnl
++AC_REQUIRE([AC_ENABLE_SHARED])dnl
++AC_REQUIRE([AC_ENABLE_STATIC])dnl
++AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
++AC_REQUIRE([AC_CANONICAL_HOST])dnl
++AC_REQUIRE([AC_CANONICAL_BUILD])dnl
++AC_REQUIRE([AC_PROG_CC])dnl
++AC_REQUIRE([AC_PROG_LD])dnl
++AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
++AC_REQUIRE([AC_PROG_NM])dnl
++AC_REQUIRE([LT_AC_PROG_SED])dnl
++
++AC_REQUIRE([AC_PROG_LN_S])dnl
++AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
++AC_REQUIRE([AC_OBJEXT])dnl
++AC_REQUIRE([AC_EXEEXT])dnl
++dnl
++
++_LT_AC_PROG_ECHO_BACKSLASH
++# Only perform the check for file, if the check method requires it
++case $deplibs_check_method in
++file_magic*)
++  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
++    AC_PATH_MAGIC
++  fi
++  ;;
++esac
++
++AC_CHECK_TOOL(RANLIB, ranlib, :)
++AC_CHECK_TOOL(STRIP, strip, :)
++
++ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
++ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
++enable_win32_dll=yes, enable_win32_dll=no)
++
++AC_ARG_ENABLE(libtool-lock,
++  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++
++# Some flags need to be propagated to the compiler or linker for good
++# libtool support.
++case $host in
++*-*-irix6*)
++  # Find out which ABI we are using.
++  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++    case `/usr/bin/file conftest.$ac_objext` in
++    *32-bit*)
++      LD="${LD-ld} -32"
++      ;;
++    *N32*)
++      LD="${LD-ld} -n32"
++      ;;
++    *64-bit*)
++      LD="${LD-ld} -64"
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++
++*-*-sco3.2v5*)
++  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
++  SAVE_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -belf"
++  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
++    [AC_LANG_SAVE
++     AC_LANG_C
++     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
++     AC_LANG_RESTORE])
++  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
++    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
++    CFLAGS="$SAVE_CFLAGS"
++  fi
++  ;;
++
++ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
++[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
++  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
++  AC_CHECK_TOOL(AS, as, false)
++  AC_CHECK_TOOL(OBJDUMP, objdump, false)
++
++  # recent cygwin and mingw systems supply a stub DllMain which the user
++  # can override, but on older systems we have to supply one
++  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
++    [AC_TRY_LINK([],
++      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
++      DllMain (0, 0, 0);],
++      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
++
++  case $host/$CC in
++  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
++    # old mingw systems require "-dll" to link a DLL, while more recent ones
++    # require "-mdll"
++    SAVE_CFLAGS="$CFLAGS"
++    CFLAGS="$CFLAGS -mdll"
++    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
++      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
++    CFLAGS="$SAVE_CFLAGS" ;;
++  *-*-cygwin* | *-*-pw32*)
++    # cygwin systems need to pass --dll to the linker, and not link
++    # crt.o which will require a WinMain@16 definition.
++    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
++  esac
++  ;;
++  ])
++esac
++
++_LT_AC_LTCONFIG_HACK
++
++])
++
++# AC_LIBTOOL_HEADER_ASSERT
++# ------------------------
++AC_DEFUN([AC_LIBTOOL_HEADER_ASSERT],
++[AC_CACHE_CHECK([whether $CC supports assert without backlinking],
++    [lt_cv_func_assert_works],
++    [case $host in
++    *-*-solaris*)
++      if test "$GCC" = yes && test "$with_gnu_ld" != yes; then
++        case `$CC --version 2>/dev/null` in
++        [[12]].*) lt_cv_func_assert_works=no ;;
++        *)        lt_cv_func_assert_works=yes ;;
++        esac
++      fi
++      ;;
++    esac])
++
++if test "x$lt_cv_func_assert_works" = xyes; then
++  AC_CHECK_HEADERS(assert.h)
++fi
++])# AC_LIBTOOL_HEADER_ASSERT
++
++# _LT_AC_CHECK_DLFCN
++# --------------------
++AC_DEFUN([_LT_AC_CHECK_DLFCN],
++[AC_CHECK_HEADERS(dlfcn.h)
++])# _LT_AC_CHECK_DLFCN
++
++# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
++# ---------------------------------
++AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
++[AC_REQUIRE([AC_CANONICAL_HOST])
++AC_REQUIRE([AC_PROG_NM])
++AC_REQUIRE([AC_OBJEXT])
++# Check for command to grab the raw symbol name followed by C symbol from nm.
++AC_MSG_CHECKING([command to parse $NM output])
++AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], [dnl
++
++# These are sane defaults that work on at least a few old systems.
++# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
++
++# Character class describing NM global symbol codes.
++symcode='[[BCDEGRST]]'
++
++# Regexp to match symbols that can be accessed directly from C.
++sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
++
++# Transform the above into a raw symbol and a C symbol.
++symxfrm='\1 \2\3 \3'
++
++# Transform an extracted symbol line into a proper C declaration
++lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
++
++# Transform an extracted symbol line into symbol name and symbol address
++lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++
++# Define system-specific variables.
++case $host_os in
++aix*)
++  symcode='[[BCDT]]'
++  ;;
++cygwin* | mingw* | pw32*)
++  symcode='[[ABCDGISTW]]'
++  ;;
++hpux*) # Its linker distinguishes data from code symbols
++  lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++  lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++  ;;
++irix* | nonstopux*)
++  symcode='[[BCDEGRST]]'
++  ;;
++osf*)
++  symcode='[[BCDEGQRST]]'
++  ;;
++solaris* | sysv5*)
++  symcode='[[BDT]]'
++  ;;
++sysv4)
++  symcode='[[DFNSTU]]'
++  ;;
++esac
++
++# Handle CRLF in mingw tool chain
++opt_cr=
++case $host_os in
++mingw*)
++  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
++  ;;
++esac
++
++# If we're using GNU nm, then use its standard symbol codes.
++if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
++  symcode='[[ABCDGISTW]]'
++fi
++
++# Try without a prefix undercore, then with it.
++for ac_symprfx in "" "_"; do
++
++  # Write the raw and C identifiers.
++lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++
++  # Check to see that the pipe works correctly.
++  pipe_works=no
++  rm -f conftest*
++  cat > conftest.$ac_ext <<EOF
++#ifdef __cplusplus
++extern "C" {
++#endif
++char nm_test_var;
++void nm_test_func(){}
++#ifdef __cplusplus
++}
++#endif
++int main(){nm_test_var='a';nm_test_func();return(0);}
++EOF
++
++  if AC_TRY_EVAL(ac_compile); then
++    # Now try to grab the symbols.
++    nlist=conftest.nm
++    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
++      # Try sorting and uniquifying the output.
++      if sort "$nlist" | uniq > "$nlist"T; then
++	mv -f "$nlist"T "$nlist"
++      else
++	rm -f "$nlist"T
++      fi
++
++      # Make sure that we snagged all the symbols we need.
++      if egrep ' nm_test_var$' "$nlist" >/dev/null; then
++	if egrep ' nm_test_func$' "$nlist" >/dev/null; then
++	  cat <<EOF > conftest.$ac_ext
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++EOF
++	  # Now generate the symbol file.
++	  eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext'
++
++	  cat <<EOF >> conftest.$ac_ext
++#if defined (__STDC__) && __STDC__
++# define lt_ptr void *
++#else
++# define lt_ptr char *
++# define const
++#endif
++
++/* The mapping between symbol names and symbols. */
++const struct {
++  const char *name;
++  lt_ptr address;
++}
++lt_preloaded_symbols[[]] =
++{
++EOF
++	  sed "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext
++	  cat <<\EOF >> conftest.$ac_ext
++  {0, (lt_ptr) 0}
++};
++
++#ifdef __cplusplus
++}
++#endif
++EOF
++	  # Now try linking the two files.
++	  mv conftest.$ac_objext conftstm.$ac_objext
++	  save_LIBS="$LIBS"
++	  save_CFLAGS="$CFLAGS"
++	  LIBS="conftstm.$ac_objext"
++	  CFLAGS="$CFLAGS$no_builtin_flag"
++	  if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
++	    pipe_works=yes
++	  fi
++	  LIBS="$save_LIBS"
++	  CFLAGS="$save_CFLAGS"
++	else
++	  echo "cannot find nm_test_func in $nlist" >&AC_FD_CC
++	fi
++      else
++	echo "cannot find nm_test_var in $nlist" >&AC_FD_CC
++      fi
++    else
++      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AC_FD_CC
++    fi
++  else
++    echo "$progname: failed program was:" >&AC_FD_CC
++    cat conftest.$ac_ext >&5
++  fi
++  rm -f conftest* conftst*
++
++  # Do not use the global_symbol_pipe unless it works.
++  if test "$pipe_works" = yes; then
++    break
++  else
++    lt_cv_sys_global_symbol_pipe=
++  fi
++done
++])
++global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
++if test -z "$lt_cv_sys_global_symbol_pipe"; then
++  global_symbol_to_cdecl=
++  global_symbol_to_c_name_address=
++else
++  global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
++  global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address"
++fi
++if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
++then
++  AC_MSG_RESULT(failed)
++else
++  AC_MSG_RESULT(ok)
++fi
++]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
++
++# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
++# ---------------------------------
++AC_DEFUN([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR],
++[# Find the correct PATH separator.  Usually this is `:', but
++# DJGPP uses `;' like DOS.
++if test "X${PATH_SEPARATOR+set}" != Xset; then
++  UNAME=${UNAME-`uname 2>/dev/null`}
++  case X$UNAME in
++    *-DOS) lt_cv_sys_path_separator=';' ;;
++    *)     lt_cv_sys_path_separator=':' ;;
++  esac
++  PATH_SEPARATOR=$lt_cv_sys_path_separator
++fi
++])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
++
++# _LT_AC_PROG_ECHO_BACKSLASH
++# --------------------------
++# Add some code to the start of the generated configure script which
++# will find an echo command which doesn't interpret backslashes.
++AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
++[ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
++			      [AC_DIVERT_PUSH(NOTICE)])
++_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
++
++# Check that we are running under the correct shell.
++SHELL=${CONFIG_SHELL-/bin/sh}
++
++case X$ECHO in
++X*--fallback-echo)
++  # Remove one level of quotation (which was required for Make).
++  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
++  ;;
++esac
++
++echo=${ECHO-echo}
++if test "X[$]1" = X--no-reexec; then
++  # Discard the --no-reexec flag, and continue.
++  shift
++elif test "X[$]1" = X--fallback-echo; then
++  # Avoid inline document here, it may be left over
++  :
++elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
++  # Yippee, $echo works!
++  :
++else
++  # Restart under the correct shell.
++  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
++fi
++
++if test "X[$]1" = X--fallback-echo; then
++  # used as fallback echo
++  shift
++  cat <<EOF
++$*
++EOF
++  exit 0
++fi
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++
++if test -z "$ECHO"; then
++if test "X${echo_test_string+set}" != Xset; then
++# find a string as large as possible, as long as the shell can cope with it
++  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
++    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
++    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
++       echo_test_string="`eval $cmd`" &&
++       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
++    then
++      break
++    fi
++  done
++fi
++
++if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
++   test "X$echo_testing_string" = "X$echo_test_string"; then
++  :
++else
++  # The Solaris, AIX, and Digital Unix default echo programs unquote
++  # backslashes.  This makes it impossible to quote backslashes using
++  #   echo "$something" | sed 's/\\/\\\\/g'
++  #
++  # So, first we look for a working echo in the user's PATH.
++
++  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for dir in $PATH /usr/ucb; do
++    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
++       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
++       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
++       test "X$echo_testing_string" = "X$echo_test_string"; then
++      echo="$dir/echo"
++      break
++    fi
++  done
++  IFS="$save_ifs"
++
++  if test "X$echo" = Xecho; then
++    # We didn't find a better echo, so look for alternatives.
++    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
++       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
++       test "X$echo_testing_string" = "X$echo_test_string"; then
++      # This shell has a builtin print -r that does the trick.
++      echo='print -r'
++    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
++	 test "X$CONFIG_SHELL" != X/bin/ksh; then
++      # If we have ksh, try running configure again with it.
++      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
++      export ORIGINAL_CONFIG_SHELL
++      CONFIG_SHELL=/bin/ksh
++      export CONFIG_SHELL
++      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
++    else
++      # Try using printf.
++      echo='printf %s\n'
++      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
++	 test "X$echo_testing_string" = "X$echo_test_string"; then
++	# Cool, printf works
++	:
++      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
++	   test "X$echo_testing_string" = 'X\t' &&
++	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	   test "X$echo_testing_string" = "X$echo_test_string"; then
++	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
++	export CONFIG_SHELL
++	SHELL="$CONFIG_SHELL"
++	export SHELL
++	echo="$CONFIG_SHELL [$]0 --fallback-echo"
++      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
++	   test "X$echo_testing_string" = 'X\t' &&
++	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	   test "X$echo_testing_string" = "X$echo_test_string"; then
++	echo="$CONFIG_SHELL [$]0 --fallback-echo"
++      else
++	# maybe with a smaller string...
++	prev=:
++
++	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
++	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
++	  then
++	    break
++	  fi
++	  prev="$cmd"
++	done
++
++	if test "$prev" != 'sed 50q "[$]0"'; then
++	  echo_test_string=`eval $prev`
++	  export echo_test_string
++	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
++	else
++	  # Oops.  We lost completely, so just stick with echo.
++	  echo=echo
++	fi
++      fi
++    fi
++  fi
++fi
++fi
++
++# Copy echo and quote the copy suitably for passing to libtool from
++# the Makefile, instead of quoting the original, which is used later.
++ECHO=$echo
++if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
++   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
++fi
++
++AC_SUBST(ECHO)
++AC_DIVERT_POP
++])# _LT_AC_PROG_ECHO_BACKSLASH
++
++# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
++#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
++# ------------------------------------------------------------------
++AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
++[if test "$cross_compiling" = yes; then :
++  [$4]
++else
++  AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++[#line __oline__ "configure"
++#include "confdefs.h"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++
++    exit (status);
++}]
++EOF
++  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) $1 ;;
++      x$lt_dlneed_uscore) $2 ;;
++      x$lt_unknown|x*) $3 ;;
++    esac
++  else :
++    # compilation failed
++    $3
++  fi
++fi
++rm -fr conftest*
++])# _LT_AC_TRY_DLOPEN_SELF
++
++# AC_LIBTOOL_DLOPEN_SELF
++# -------------------
++AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
++[if test "x$enable_dlopen" != xyes; then
++  enable_dlopen=unknown
++  enable_dlopen_self=unknown
++  enable_dlopen_self_static=unknown
++else
++  lt_cv_dlopen=no
++  lt_cv_dlopen_libs=
++
++  case $host_os in
++  beos*)
++    lt_cv_dlopen="load_add_on"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ;;
++
++  cygwin* | mingw* | pw32*)
++    lt_cv_dlopen="LoadLibrary"
++    lt_cv_dlopen_libs=
++   ;;
++
++  *)
++    AC_CHECK_FUNC([shl_load],
++          [lt_cv_dlopen="shl_load"],
++      [AC_CHECK_LIB([dld], [shl_load],
++            [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
++	[AC_CHECK_FUNC([dlopen],
++	      [lt_cv_dlopen="dlopen"],
++	  [AC_CHECK_LIB([dl], [dlopen],
++	        [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
++	    [AC_CHECK_LIB([svld], [dlopen],
++	          [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
++	      [AC_CHECK_LIB([dld], [dld_link],
++	            [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++	      ])
++	    ])
++	  ])
++	])
++      ])
++    ;;
++  esac
++
++  if test "x$lt_cv_dlopen" != xno; then
++    enable_dlopen=yes
++  else
++    enable_dlopen=no
++  fi
++
++  case $lt_cv_dlopen in
++  dlopen)
++    save_CPPFLAGS="$CPPFLAGS"
++    AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
++    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++
++    save_LDFLAGS="$LDFLAGS"
++    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++
++    save_LIBS="$LIBS"
++    LIBS="$lt_cv_dlopen_libs $LIBS"
++
++    AC_CACHE_CHECK([whether a program can dlopen itself],
++	  lt_cv_dlopen_self, [dnl
++	  _LT_AC_TRY_DLOPEN_SELF(
++	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
++	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
++    ])
++
++    if test "x$lt_cv_dlopen_self" = xyes; then
++      LDFLAGS="$LDFLAGS $link_static_flag"
++      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
++    	  lt_cv_dlopen_self_static, [dnl
++	  _LT_AC_TRY_DLOPEN_SELF(
++	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
++	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
++      ])
++    fi
++
++    CPPFLAGS="$save_CPPFLAGS"
++    LDFLAGS="$save_LDFLAGS"
++    LIBS="$save_LIBS"
++    ;;
++  esac
++
++  case $lt_cv_dlopen_self in
++  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
++  *) enable_dlopen_self=unknown ;;
++  esac
++
++  case $lt_cv_dlopen_self_static in
++  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
++  *) enable_dlopen_self_static=unknown ;;
++  esac
++fi
++])# AC_LIBTOOL_DLOPEN_SELF
++
++AC_DEFUN([_LT_AC_LTCONFIG_HACK],
++[AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])dnl
++# Sed substitution that helps us do robust quoting.  It backslashifies
++# metacharacters that are still active within double-quoted strings.
++Xsed='sed -e s/^X//'
++sed_quote_subst='s/\([[\\"\\`$\\\\]]\)/\\\1/g'
++
++# Same as above, but do not quote variable references.
++double_quote_subst='s/\([[\\"\\`\\\\]]\)/\\\1/g'
++
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
++
++# Constants:
++rm="rm -f"
++
++# Global variables:
++default_ofile=libtool
++can_build_shared=yes
++
++# All known linkers require a `.a' archive for static linking (except M$VC,
++# which needs '.lib').
++libext=a
++ltmain="$ac_aux_dir/ltmain.sh"
++ofile="$default_ofile"
++with_gnu_ld="$lt_cv_prog_gnu_ld"
++need_locks="$enable_libtool_lock"
++
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
++
++# Set sane defaults for various variables
++test -z "$AR" && AR=ar
++test -z "$AR_FLAGS" && AR_FLAGS=cru
++test -z "$AS" && AS=as
++test -z "$CC" && CC=cc
++test -z "$DLLTOOL" && DLLTOOL=dlltool
++test -z "$LD" && LD=ld
++test -z "$LN_S" && LN_S="ln -s"
++test -z "$MAGIC_CMD" && MAGIC_CMD=file
++test -z "$NM" && NM=nm
++test -z "$OBJDUMP" && OBJDUMP=objdump
++test -z "$RANLIB" && RANLIB=:
++test -z "$STRIP" && STRIP=:
++test -z "$ac_objext" && ac_objext=o
++
++if test x"$host" != x"$build"; then
++  ac_tool_prefix=${host_alias}-
++else
++  ac_tool_prefix=
++fi
++
++# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
++case $host_os in
++linux-gnu*) ;;
++linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
++esac
++
++case $host_os in
++aix3*)
++  # AIX sometimes has problems with the GCC collect2 program.  For some
++  # reason, if we set the COLLECT_NAMES environment variable, the problems
++  # vanish in a puff of smoke.
++  if test "X${COLLECT_NAMES+set}" != Xset; then
++    COLLECT_NAMES=
++    export COLLECT_NAMES
++  fi
++  ;;
++esac
++
++# Determine commands to create old-style static archives.
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
++old_postinstall_cmds='chmod 644 $oldlib'
++old_postuninstall_cmds=
++
++if test -n "$RANLIB"; then
++  case $host_os in
++  openbsd*)
++    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
++    ;;
++  *)
++    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++    ;;
++  esac
++  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
++fi
++
++# Allow CC to be a program name with arguments.
++set dummy $CC
++compiler="[$]2"
++
++AC_MSG_CHECKING([for objdir])
++rm -f .libs 2>/dev/null
++mkdir .libs 2>/dev/null
++if test -d .libs; then
++  objdir=.libs
++else
++  # MS-DOS does not allow filenames that begin with a dot.
++  objdir=_libs
++fi
++rmdir .libs 2>/dev/null
++AC_MSG_RESULT($objdir)
++
++
++AC_ARG_WITH(pic,
++[  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
++pic_mode="$withval", pic_mode=default)
++test -z "$pic_mode" && pic_mode=default
++
++# We assume here that the value for lt_cv_prog_cc_pic will not be cached
++# in isolation, and that seeing it set (from the cache) indicates that
++# the associated values are set (in the cache) correctly too.
++AC_MSG_CHECKING([for $compiler option to produce PIC])
++AC_CACHE_VAL(lt_cv_prog_cc_pic,
++[ lt_cv_prog_cc_pic=
++  lt_cv_prog_cc_shlib=
++  lt_cv_prog_cc_wl=
++  lt_cv_prog_cc_static=
++  lt_cv_prog_cc_no_builtin=
++  lt_cv_prog_cc_can_build_shared=$can_build_shared
++
++  if test "$GCC" = yes; then
++    lt_cv_prog_cc_wl='-Wl,'
++    lt_cv_prog_cc_static='-static'
++
++    case $host_os in
++    aix*)
++      # Below there is a dirty hack to force normal static linking with -ldl
++      # The problem is because libdl dynamically linked with both libc and
++      # libC (AIX C++ library), which obviously doesn't included in libraries
++      # list by gcc. This cause undefined symbols with -static flags.
++      # This hack allows C programs to be linked with "-static -ldl", but
++      # not sure about C++ programs.
++      lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC"
++      ;;
++    amigaos*)
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
++      ;;
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      lt_cv_prog_cc_pic='-fno-common'
++      ;;
++    cygwin* | mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_cv_prog_cc_pic='-DDLL_EXPORT'
++      ;;
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	 lt_cv_prog_cc_pic=-Kconform_pic
++      fi
++      ;;
++    *)
++      lt_cv_prog_cc_pic='-fPIC'
++      ;;
++    esac
++  else
++    # PORTME Check for PIC flags for the system compiler.
++    case $host_os in
++    aix3* | aix4* | aix5*)
++      lt_cv_prog_cc_wl='-Wl,'
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_cv_prog_cc_static='-Bstatic'
++      else
++	lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
++      fi
++      ;;
++
++    hpux9* | hpux10* | hpux11*)
++      # Is there a better lt_cv_prog_cc_static that works with the bundled CC?
++      lt_cv_prog_cc_wl='-Wl,'
++      lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive"
++      lt_cv_prog_cc_pic='+Z'
++      ;;
++
++    irix5* | irix6* | nonstopux*)
++      lt_cv_prog_cc_wl='-Wl,'
++      lt_cv_prog_cc_static='-non_shared'
++      # PIC (with -KPIC) is the default.
++      ;;
++
++    cygwin* | mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_cv_prog_cc_pic='-DDLL_EXPORT'
++      ;;
++
++    newsos6)
++      lt_cv_prog_cc_pic='-KPIC'
++      lt_cv_prog_cc_static='-Bstatic'
++      ;;
++
++    osf3* | osf4* | osf5*)
++      # All OSF/1 code is PIC.
++      lt_cv_prog_cc_wl='-Wl,'
++      lt_cv_prog_cc_static='-non_shared'
++      ;;
++
++    sco3.2v5*)
++      lt_cv_prog_cc_pic='-Kpic'
++      lt_cv_prog_cc_static='-dn'
++      lt_cv_prog_cc_shlib='-belf'
++      ;;
++
++    solaris*)
++      lt_cv_prog_cc_pic='-KPIC'
++      lt_cv_prog_cc_static='-Bstatic'
++      lt_cv_prog_cc_wl='-Wl,'
++      ;;
++
++    sunos4*)
++      lt_cv_prog_cc_pic='-PIC'
++      lt_cv_prog_cc_static='-Bstatic'
++      lt_cv_prog_cc_wl='-Qoption ld '
++      ;;
++
++    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++      lt_cv_prog_cc_pic='-KPIC'
++      lt_cv_prog_cc_static='-Bstatic'
++      lt_cv_prog_cc_wl='-Wl,'
++      ;;
++
++    uts4*)
++      lt_cv_prog_cc_pic='-pic'
++      lt_cv_prog_cc_static='-Bstatic'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec ;then
++	lt_cv_prog_cc_pic='-Kconform_pic'
++	lt_cv_prog_cc_static='-Bstatic'
++      fi
++      ;;
++
++    *)
++      lt_cv_prog_cc_can_build_shared=no
++      ;;
++    esac
++  fi
++])
++if test -z "$lt_cv_prog_cc_pic"; then
++  AC_MSG_RESULT([none])
++else
++  AC_MSG_RESULT([$lt_cv_prog_cc_pic])
++
++  # Check to make sure the pic_flag actually works.
++  AC_MSG_CHECKING([if $compiler PIC flag $lt_cv_prog_cc_pic works])
++  AC_CACHE_VAL(lt_cv_prog_cc_pic_works, [dnl
++    save_CFLAGS="$CFLAGS"
++    CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
++    AC_TRY_COMPILE([], [], [dnl
++      case $host_os in
++      hpux9* | hpux10* | hpux11*)
++	# On HP-UX, both CC and GCC only warn that PIC is supported... then
++	# they create non-PIC objects.  So, if there were any warnings, we
++	# assume that PIC is not supported.
++	if test -s conftest.err; then
++	  lt_cv_prog_cc_pic_works=no
++	else
++	  lt_cv_prog_cc_pic_works=yes
++	fi
++	;;
++      *)
++	lt_cv_prog_cc_pic_works=yes
++	;;
++      esac
++    ], [dnl
++      lt_cv_prog_cc_pic_works=no
++    ])
++    CFLAGS="$save_CFLAGS"
++  ])
++
++  if test "X$lt_cv_prog_cc_pic_works" = Xno; then
++    lt_cv_prog_cc_pic=
++    lt_cv_prog_cc_can_build_shared=no
++  else
++    lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic"
++  fi
++
++  AC_MSG_RESULT([$lt_cv_prog_cc_pic_works])
++fi
++
++# Check for any special shared library compilation flags.
++if test -n "$lt_cv_prog_cc_shlib"; then
++  AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries])
++  if echo "$old_CC $old_CFLAGS " | egrep -e "[[ 	]]$lt_cv_prog_cc_shlib[[ 	]]" >/dev/null; then :
++  else
++   AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure])
++    lt_cv_prog_cc_can_build_shared=no
++  fi
++fi
++
++AC_MSG_CHECKING([if $compiler static flag $lt_cv_prog_cc_static works])
++AC_CACHE_VAL([lt_cv_prog_cc_static_works], [dnl
++  lt_cv_prog_cc_static_works=no
++  save_LDFLAGS="$LDFLAGS"
++  LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
++  AC_TRY_LINK([], [], [lt_cv_prog_cc_static_works=yes])
++  LDFLAGS="$save_LDFLAGS"
++])
++
++# Belt *and* braces to stop my trousers falling down:
++test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static=
++AC_MSG_RESULT([$lt_cv_prog_cc_static_works])
++
++pic_flag="$lt_cv_prog_cc_pic"
++special_shlib_compile_flags="$lt_cv_prog_cc_shlib"
++wl="$lt_cv_prog_cc_wl"
++link_static_flag="$lt_cv_prog_cc_static"
++no_builtin_flag="$lt_cv_prog_cc_no_builtin"
++can_build_shared="$lt_cv_prog_cc_can_build_shared"
++
++
++# Check to see if options -o and -c are simultaneously supported by compiler
++AC_MSG_CHECKING([if $compiler supports -c -o file.$ac_objext])
++AC_CACHE_VAL([lt_cv_compiler_c_o], [
++$rm -r conftest 2>/dev/null
++mkdir conftest
++cd conftest
++echo "int some_variable = 0;" > conftest.$ac_ext
++mkdir out
++# According to Tom Tromey, Ian Lance Taylor reported there are C compilers
++# that will create temporary files in the current directory regardless of
++# the output directory.  Thus, making CWD read-only will cause this test
++# to fail, enabling locking or at least warning the user not to do parallel
++# builds.
++chmod -w .
++save_CFLAGS="$CFLAGS"
++CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
++compiler_c_o=no
++if { (eval echo configure:__oline__: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
++  # The compiler can only warn and ignore the option if not recognized
++  # So say no if there are warnings
++  if test -s out/conftest.err; then
++    lt_cv_compiler_c_o=no
++  else
++    lt_cv_compiler_c_o=yes
++  fi
++else
++  # Append any errors to the config.log.
++  cat out/conftest.err 1>&AC_FD_CC
++  lt_cv_compiler_c_o=no
++fi
++CFLAGS="$save_CFLAGS"
++chmod u+w .
++$rm conftest* out/*
++rmdir out
++cd ..
++rmdir conftest
++$rm -r conftest 2>/dev/null
++])
++compiler_c_o=$lt_cv_compiler_c_o
++AC_MSG_RESULT([$compiler_c_o])
++
++if test x"$compiler_c_o" = x"yes"; then
++  # Check to see if we can write to a .lo
++  AC_MSG_CHECKING([if $compiler supports -c -o file.lo])
++  AC_CACHE_VAL([lt_cv_compiler_o_lo], [
++  lt_cv_compiler_o_lo=no
++  save_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -c -o conftest.lo"
++  save_objext="$ac_objext"
++  ac_objext=lo
++  AC_TRY_COMPILE([], [int some_variable = 0;], [dnl
++    # The compiler can only warn and ignore the option if not recognized
++    # So say no if there are warnings
++    if test -s conftest.err; then
++      lt_cv_compiler_o_lo=no
++    else
++      lt_cv_compiler_o_lo=yes
++    fi
++  ])
++  ac_objext="$save_objext"
++  CFLAGS="$save_CFLAGS"
++  ])
++  compiler_o_lo=$lt_cv_compiler_o_lo
++  AC_MSG_RESULT([$compiler_o_lo])
++else
++  compiler_o_lo=no
++fi
++
++# Check to see if we can do hard links to lock some files if needed
++hard_links="nottested"
++if test "$compiler_c_o" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  AC_MSG_CHECKING([if we can lock with hard links])
++  hard_links=yes
++  $rm conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  AC_MSG_RESULT([$hard_links])
++  if test "$hard_links" = no; then
++    AC_MSG_WARN([\`$CC' does not support \`-c -o', so \`make -j' may be unsafe])
++    need_locks=warn
++  fi
++else
++  need_locks=no
++fi
++
++if test "$GCC" = yes; then
++  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
++  AC_MSG_CHECKING([if $compiler supports -fno-rtti -fno-exceptions])
++  echo "int some_variable = 0;" > conftest.$ac_ext
++  save_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
++  compiler_rtti_exceptions=no
++  AC_TRY_COMPILE([], [int some_variable = 0;], [dnl
++    # The compiler can only warn and ignore the option if not recognized
++    # So say no if there are warnings
++    if test -s conftest.err; then
++      compiler_rtti_exceptions=no
++    else
++      compiler_rtti_exceptions=yes
++    fi
++  ])
++  CFLAGS="$save_CFLAGS"
++  AC_MSG_RESULT([$compiler_rtti_exceptions])
++
++  if test "$compiler_rtti_exceptions" = "yes"; then
++    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
++  else
++    no_builtin_flag=' -fno-builtin'
++  fi
++fi
++
++# See if the linker supports building shared libraries.
++AC_MSG_CHECKING([whether the linker ($LD) supports shared libraries])
++
++allow_undefined_flag=
++no_undefined_flag=
++need_lib_prefix=unknown
++need_version=unknown
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++archive_cmds=
++archive_expsym_cmds=
++old_archive_from_new_cmds=
++old_archive_from_expsyms_cmds=
++export_dynamic_flag_spec=
++whole_archive_flag_spec=
++thread_safe_flag_spec=
++hardcode_into_libs=no
++hardcode_libdir_flag_spec=
++hardcode_libdir_separator=
++hardcode_direct=no
++hardcode_minus_L=no
++hardcode_shlibpath_var=unsupported
++runpath_var=
++link_all_deplibs=unknown
++always_export_symbols=no
++export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
++# include_expsyms should be a list of space-separated symbols to be *always*
++# included in the symbol list
++include_expsyms=
++# exclude_expsyms can be an egrep regular expression of symbols to exclude
++# it will be wrapped by ` (' and `)$', so one must not match beginning or
++# end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++# as well as any symbol that contains `d'.
++exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
++# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++# platforms (ab)use it in PIC code, but their linkers get confused if
++# the symbol is explicitly referenced.  Since portable code cannot
++# rely on this symbol name, it's probably fine to never include it in
++# preloaded symbol tables.
++extract_expsyms_cmds=
++
++case $host_os in
++cygwin* | mingw* | pw32*)
++  # FIXME: the MSVC++ port hasn't been tested in a loooong time
++  # When not using gcc, we currently assume that we are using
++  # Microsoft Visual C++.
++  if test "$GCC" != yes; then
++    with_gnu_ld=no
++  fi
++  ;;
++openbsd*)
++  with_gnu_ld=no
++  ;;
++esac
++
++ld_shlibs=yes
++if test "$with_gnu_ld" = yes; then
++  # If archive_cmds runs LD, not CC, wlarc should be empty
++  wlarc='${wl}'
++
++  # See if GNU ld supports shared libraries.
++  case $host_os in
++  aix3* | aix4* | aix5*)
++    # On AIX, the GNU linker is very broken
++    # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available.
++    ld_shlibs=no
++    cat <<EOF 1>&2
++
++*** Warning: the GNU linker, at least up to release 2.9.1, is reported
++*** to be unable to reliably create shared libraries on AIX.
++*** Therefore, libtool is disabling shared libraries support.  If you
++*** really care for shared libraries, you may want to modify your PATH
++*** so that a non-GNU linker is found, and then restart.
++
++EOF
++    ;;
++
++  amigaos*)
++    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_minus_L=yes
++
++    # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
++    # that the semantics of dynamic libraries on AmigaOS, at least up
++    # to version 4, is to share data among multiple programs linked
++    # with the same dynamic library.  Since this doesn't match the
++    # behavior of shared libraries on other platforms, we can use
++    # them.
++    ld_shlibs=no
++    ;;
++
++  beos*)
++    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
++      allow_undefined_flag=unsupported
++      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++      # support --undefined.  This deserves some investigation.  FIXME
++      archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++    else
++      ld_shlibs=no
++    fi
++    ;;
++
++  cygwin* | mingw* | pw32*)
++    # hardcode_libdir_flag_spec is actually meaningless, as there is
++    # no search path for DLLs.
++    hardcode_libdir_flag_spec='-L$libdir'
++    allow_undefined_flag=unsupported
++    always_export_symbols=yes
++
++    extract_expsyms_cmds='test -f $output_objdir/impgen.c || \
++      sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~
++      test -f $output_objdir/impgen.exe || (cd $output_objdir && \
++      if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
++      else $CC -o impgen impgen.c ; fi)~
++      $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
++
++    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
++
++    # cygwin and mingw dlls have different entry points and sets of symbols
++    # to exclude.
++    # FIXME: what about values for MSVC?
++    dll_entry=__cygwin_dll_entry@12
++    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~
++    case $host_os in
++    mingw*)
++      # mingw values
++      dll_entry=_DllMainCRTStartup@12
++      dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~
++      ;;
++    esac
++
++    # mingw and cygwin differ, and it's simplest to just exclude the union
++    # of the two symbol sets.
++    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12
++
++    # recent cygwin and mingw systems supply a stub DllMain which the user
++    # can override, but on older systems we have to supply one (in ltdll.c)
++    if test "x$lt_cv_need_dllmain" = "xyes"; then
++      ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
++      ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~
++	test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
++    else
++      ltdll_obj=
++      ltdll_cmds=
++    fi
++
++    # Extract the symbol export list from an `--export-all' def file,
++    # then regenerate the def file from the symbol export list, so that
++    # the compiled dll only exports the symbol export list.
++    # Be careful not to strip the DATA tag left be newer dlltools.
++    export_symbols_cmds="$ltdll_cmds"'
++      $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
++      sed -e "1,/EXPORTS/d" -e "s/ @ [[0-9]]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols'
++
++    # If the export-symbols file already is a .def file (1st line
++    # is EXPORTS), use it as is.
++    # If DATA tags from a recent dlltool are present, honour them!
++    archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then
++	cp $export_symbols $output_objdir/$soname-def;
++      else
++	echo EXPORTS > $output_objdir/$soname-def;
++	_lt_hint=1;
++	cat $export_symbols | while read symbol; do
++	 set dummy \$symbol;
++	 case \[$]# in
++	   2) echo "   \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
++	   4) echo "   \[$]2 \[$]3 \[$]4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;;
++	   *) echo "     \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;
++	 esac;
++	 _lt_hint=`expr 1 + \$_lt_hint`;
++	done;
++      fi~
++      '"$ltdll_cmds"'
++      $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
++      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~
++      $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
++      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~
++      $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
++    ;;
++
++  netbsd*)
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++      archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
++      wlarc=
++    else
++      archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++    fi
++    ;;
++
++  solaris* | sysv5*)
++    if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
++      ld_shlibs=no
++      cat <<EOF 1>&2
++
++*** Warning: The releases 2.8.* of the GNU linker cannot reliably
++*** create shared libraries on Solaris systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.9.1 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++EOF
++    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
++      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++    else
++      ld_shlibs=no
++    fi
++    ;;
++
++  sunos4*)
++    archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++    wlarc=
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  *)
++    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
++      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++    else
++      ld_shlibs=no
++    fi
++    ;;
++  esac
++
++  if test "$ld_shlibs" = yes; then
++    runpath_var=LD_RUN_PATH
++    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
++    export_dynamic_flag_spec='${wl}--export-dynamic'
++    case $host_os in
++    cygwin* | mingw* | pw32*)
++      # dlltool doesn't understand --whole-archive et. al.
++      whole_archive_flag_spec=
++      ;;
++    *)
++      # ancient GNU ld didn't support --whole-archive et. al.
++      if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
++	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++	whole_archive_flag_spec=
++      fi
++      ;;
++    esac
++  fi
++else
++  # PORTME fill in a description of your system's linker (not GNU ld)
++  case $host_os in
++  aix3*)
++    allow_undefined_flag=unsupported
++    always_export_symbols=yes
++    archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
++    # Note: this linker hardcodes the directories in LIBPATH if there
++    # are no directories specified by -L.
++    hardcode_minus_L=yes
++    if test "$GCC" = yes && test -z "$link_static_flag"; then
++      # Neither direct hardcoding nor static linking is supported with a
++      # broken collect2.
++      hardcode_direct=unsupported
++    fi
++    ;;
++
++  aix4* | aix5*)
++    if test "$host_cpu" = ia64; then
++      # On IA64, the linker does run time linking by default, so we don't
++      # have to do anything special.
++      aix_use_runtimelinking=no
++      exp_sym_flag='-Bexport'
++      no_entry_flag=""
++    else
++      aix_use_runtimelinking=no
++
++      # Test if we are trying to use run time linking or normal
++      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
++      # need to do runtime linking.
++      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++	for ld_flag in $LDFLAGS; do
++	  case $ld_flag in
++	  *-brtl*)
++	    aix_use_runtimelinking=yes
++	    break
++	  ;;
++	  esac
++	done
++      esac
++
++      exp_sym_flag='-bexport'
++      no_entry_flag='-bnoentry'
++    fi
++
++    # When large executables or shared objects are built, AIX ld can
++    # have problems creating the table of contents.  If linking a library
++    # or program results in "error TOC overflow" add -mminimal-toc to
++    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++    hardcode_direct=yes
++    archive_cmds=''
++    hardcode_libdir_separator=':'
++    if test "$GCC" = yes; then
++      case $host_os in aix4.[[012]]|aix4.[[012]].*)
++	collect2name=`${CC} -print-prog-name=collect2`
++	if test -f "$collect2name" && \
++	  strings "$collect2name" | grep resolve_lib_name >/dev/null
++	then
++	  # We have reworked collect2
++	  hardcode_direct=yes
++	else
++	  # We have old collect2
++	  hardcode_direct=unsupported
++	  # It fails to find uninstalled libraries when the uninstalled
++	  # path is not listed in the libpath.  Setting hardcode_minus_L
++	  # to unsupported forces relinking
++	  hardcode_minus_L=yes
++	  hardcode_libdir_flag_spec='-L$libdir'
++	  hardcode_libdir_separator=
++	fi
++      esac
++
++      shared_flag='-shared'
++    else
++      # not using gcc
++      if test "$host_cpu" = ia64; then
++	shared_flag='${wl}-G'
++      else
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag='${wl}-G'
++	else
++	  shared_flag='${wl}-bM:SRE'
++	fi
++      fi
++    fi
++
++    # It seems that -bexpall can do strange things, so it is better to
++    # generate a list of symbols to export.
++    always_export_symbols=yes
++    if test "$aix_use_runtimelinking" = yes; then
++      # Warning - without using the other runtime loading flags (-brtl),
++      # -berok will link without error, but may produce a broken library.
++      allow_undefined_flag='-berok'
++      hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
++      archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++    else
++      if test "$host_cpu" = ia64; then
++	hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
++	allow_undefined_flag="-z nodefs"
++	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++      else
++	hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
++	# Warning - without using the other run time loading flags,
++	# -berok will link without error, but may produce a broken library.
++	allow_undefined_flag='${wl}-berok'
++	# This is a bit strange, but is similar to how AIX traditionally builds
++	# it's shared libraries.
++	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname'
++      fi
++    fi
++    ;;
++
++  amigaos*)
++    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_minus_L=yes
++    # see comment about different semantics on the GNU ld section
++    ld_shlibs=no
++    ;;
++
++  cygwin* | mingw* | pw32*)
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    # hardcode_libdir_flag_spec is actually meaningless, as there is
++    # no search path for DLLs.
++    hardcode_libdir_flag_spec=' '
++    allow_undefined_flag=unsupported
++    # Tell ltmain to make .lib files, not .a files.
++    libext=lib
++    # FIXME: Setting linknames here is a bad hack.
++    archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
++    # The linker will automatically build a .lib file if we build a DLL.
++    old_archive_from_new_cmds='true'
++    # FIXME: Should let the user specify the lib program.
++    old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
++    fix_srcfile_path='`cygpath -w "$srcfile"`'
++    ;;
++
++  darwin* | rhapsody*)
++    case "$host_os" in
++    rhapsody* | darwin1.[[012]])
++      allow_undefined_flag='-undefined suppress'
++      ;;
++    *) # Darwin 1.3 on
++      allow_undefined_flag='-flat_namespace -undefined suppress'
++      ;;
++    esac
++    # FIXME: Relying on posixy $() will cause problems for
++    #        cross-compilation, but unfortunately the echo tests do not
++    #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
++    #	     `"' quotes if we put them in here... so don't!
++    archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
++    # We need to add '_' to the symbols in $export_symbols first
++    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    whole_archive_flag_spec='-all_load $convenience'
++    ;;
++
++  freebsd1*)
++    ld_shlibs=no
++    ;;
++
++  # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
++  # support.  Future versions do this automatically, but an explicit c++rt0.o
++  # does not break anything, and helps significantly (at the cost of a little
++  # extra space).
++  freebsd2.2*)
++    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
++    hardcode_libdir_flag_spec='-R$libdir'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  # Unfortunately, older versions of FreeBSD 2 do not have this feature.
++  freebsd2*)
++    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_direct=yes
++    hardcode_minus_L=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
++  freebsd*)
++    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++    hardcode_libdir_flag_spec='-R$libdir'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  hpux9* | hpux10* | hpux11*)
++    case $host_os in
++    hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
++    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;;
++    esac
++    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++    hardcode_libdir_separator=:
++    hardcode_direct=yes
++    hardcode_minus_L=yes # Not in the search PATH, but as the default
++			 # location of the library.
++    export_dynamic_flag_spec='${wl}-E'
++    ;;
++
++  irix5* | irix6* | nonstopux*)
++    if test "$GCC" = yes; then
++      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    else
++      archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++      hardcode_libdir_flag_spec='-rpath $libdir'
++    fi
++    hardcode_libdir_separator=:
++    link_all_deplibs=yes
++    ;;
++
++  netbsd*)
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
++    else
++      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
++    fi
++    hardcode_libdir_flag_spec='-R$libdir'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  newsos6)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_direct=yes
++    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    hardcode_libdir_separator=:
++    hardcode_shlibpath_var=no
++    ;;
++
++  openbsd*)
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++      export_dynamic_flag_spec='${wl}-E'
++    else
++      case "$host_os" in
++      openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
++	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	hardcode_libdir_flag_spec='-R$libdir'
++        ;;
++      *)
++        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++        ;;
++      esac
++    fi
++    ;;
++
++  os2*)
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_minus_L=yes
++    allow_undefined_flag=unsupported
++    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++    old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++    ;;
++
++  osf3*)
++    if test "$GCC" = yes; then
++      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
++      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++    else
++      allow_undefined_flag=' -expect_unresolved \*'
++      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++    fi
++    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    hardcode_libdir_separator=:
++    ;;
++
++  osf4* | osf5*)	# as osf3* with the addition of -msym flag
++    if test "$GCC" = yes; then
++      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
++      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    else
++      allow_undefined_flag=' -expect_unresolved \*'
++      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++      archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
++      $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++
++      #Both c and cxx compiler support -rpath directly
++      hardcode_libdir_flag_spec='-rpath $libdir'
++    fi
++    hardcode_libdir_separator=:
++    ;;
++
++  sco3.2v5*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_shlibpath_var=no
++    runpath_var=LD_RUN_PATH
++    hardcode_runpath_var=yes
++    export_dynamic_flag_spec='${wl}-Bexport'
++    ;;
++
++  solaris*)
++    # gcc --version < 3.0 without binutils cannot create self contained
++    # shared libraries reliably, requiring libgcc.a to resolve some of
++    # the object symbols generated in some cases.  Libraries that use
++    # assert need libgcc.a to resolve __eprintf, for example.  Linking
++    # a copy of libgcc.a into every shared library to guarantee resolving
++    # such symbols causes other problems:  According to Tim Van Holder
++    # <tim.van.holder@pandora.be>, C++ libraries end up with a separate
++    # (to the application) exception stack for one thing.
++    no_undefined_flag=' -z defs'
++    if test "$GCC" = yes; then
++      case `$CC --version 2>/dev/null` in
++      [[12]].*)
++	cat <<EOF 1>&2
++
++*** Warning: Releases of GCC earlier than version 3.0 cannot reliably
++*** create self contained shared libraries on Solaris systems, without
++*** introducing a dependency on libgcc.a.  Therefore, libtool is disabling
++*** -no-undefined support, which will at least allow you to build shared
++*** libraries.  However, you may find that when you link such libraries
++*** into an application without using GCC, you have to manually add
++*** \`gcc --print-libgcc-file-name\` to the link command.  We urge you to
++*** upgrade to a newer version of GCC.  Another option is to rebuild your
++*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer.
++
++EOF
++        no_undefined_flag=
++	;;
++      esac
++    fi
++    # $CC -shared without GNU ld will not create a library from C++
++    # object files and a static libstdc++, better avoid it by now
++    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++    hardcode_libdir_flag_spec='-R$libdir'
++    hardcode_shlibpath_var=no
++    case $host_os in
++    solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
++    *) # Supported since Solaris 2.6 (maybe 2.5.1?)
++      whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
++    esac
++    link_all_deplibs=yes
++    ;;
++
++  sunos4*)
++    if test "x$host_vendor" = xsequent; then
++      # Use $CC to link under sequent, because it throws in some extra .o
++      # files that make .init and .fini sections work.
++      archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++    else
++      archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
++    fi
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_direct=yes
++    hardcode_minus_L=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  sysv4)
++    case $host_vendor in
++      sni)
++        archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++        hardcode_direct=yes # is this really true???
++        ;;
++      siemens)
++        ## LD is ld it makes a PLAMLIB
++        ## CC just makes a GrossModule.
++        archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++        reload_cmds='$CC -r -o $output$reload_objs'
++        hardcode_direct=no
++        ;;
++      motorola)
++        archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++        hardcode_direct=no #Motorola manual says yes, but my tests say they lie
++        ;;
++    esac
++    runpath_var='LD_RUN_PATH'
++    hardcode_shlibpath_var=no
++    ;;
++
++  sysv4.3*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_shlibpath_var=no
++    export_dynamic_flag_spec='-Bexport'
++    ;;
++
++  sysv5*)
++    no_undefined_flag=' -z text'
++    # $CC -shared without GNU ld will not create a library from C++
++    # object files and a static libstdc++, better avoid it by now
++    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++    hardcode_libdir_flag_spec=
++    hardcode_shlibpath_var=no
++    runpath_var='LD_RUN_PATH'
++    ;;
++
++  uts4*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_shlibpath_var=no
++    ;;
++
++  dgux*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_shlibpath_var=no
++    ;;
++
++  sysv4*MP*)
++    if test -d /usr/nec; then
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var=no
++      runpath_var=LD_RUN_PATH
++      hardcode_runpath_var=yes
++      ld_shlibs=yes
++    fi
++    ;;
++
++  sysv4.2uw2*)
++    archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_direct=yes
++    hardcode_minus_L=no
++    hardcode_shlibpath_var=no
++    hardcode_runpath_var=yes
++    runpath_var=LD_RUN_PATH
++    ;;
++
++  sysv5uw7* | unixware7*)
++    no_undefined_flag='${wl}-z ${wl}text'
++    if test "$GCC" = yes; then
++      archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++    else
++      archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++    fi
++    runpath_var='LD_RUN_PATH'
++    hardcode_shlibpath_var=no
++    ;;
++
++  *)
++    ld_shlibs=no
++    ;;
++  esac
++fi
++AC_MSG_RESULT([$ld_shlibs])
++test "$ld_shlibs" = no && can_build_shared=no
++
++# Check hardcoding attributes.
++AC_MSG_CHECKING([how to hardcode library paths into programs])
++hardcode_action=
++if test -n "$hardcode_libdir_flag_spec" || \
++   test -n "$runpath_var"; then
++
++  # We can hardcode non-existant directories.
++  if test "$hardcode_direct" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$hardcode_shlibpath_var" != no &&
++     test "$hardcode_minus_L" != no; then
++    # Linking always hardcodes the temporary library directory.
++    hardcode_action=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    hardcode_action=immediate
++  fi
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  hardcode_action=unsupported
++fi
++AC_MSG_RESULT([$hardcode_action])
++
++striplib=
++old_striplib=
++AC_MSG_CHECKING([whether stripping libraries is possible])
++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
++  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
++  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
++  AC_MSG_RESULT([yes])
++else
++  AC_MSG_RESULT([no])
++fi
++
++reload_cmds='$LD$reload_flag -o $output$reload_objs'
++test -z "$deplibs_check_method" && deplibs_check_method=unknown
++
++# PORTME Fill in your ld.so characteristics
++AC_MSG_CHECKING([dynamic linker characteristics])
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++
++case $host_os in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}.so$versuffix $libname.a'
++  shlibpath_var=LIBPATH
++
++  # AIX has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}.so$major'
++  ;;
++
++aix4* | aix5*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  hardcode_into_libs=yes
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
++    library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
++    shlibpath_var=LD_LIBRARY_PATH
++  else
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
++    case $host_os in
++      aix4 | aix4.[[01]] | aix4.[[01]].*)
++	if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++	     echo ' yes '
++	     echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
++	  :
++	else
++	  can_build_shared=no
++	fi
++	;;
++    esac
++    # AIX (on Power*) has no versioning support, so currently we can
++    # not hardcode correct soname into executable. Probably we can
++    # add versioning support to collect2, so additional links can
++    # be useful in future.
++    if test "$aix_use_runtimelinking" = yes; then
++      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++      # instead of lib<name>.a to let people know that these are not
++      # typical AIX shared libraries.
++      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++    else
++      # We preserve .a as extension for shared libraries through AIX4.2
++      # and later when we are not doing run time linking.
++      library_names_spec='${libname}${release}.a $libname.a'
++      soname_spec='${libname}${release}.so$major'
++    fi
++    shlibpath_var=LIBPATH
++  fi
++  hardcode_into_libs=yes
++  ;;
++
++amigaos*)
++  library_names_spec='$libname.ixlibrary $libname.a'
++  # Create ${libname}_ixlibrary.a entries in /sys/libs.
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
++  ;;
++
++beos*)
++  library_names_spec='${libname}.so'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  ;;
++
++bsdi4*)
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  export_dynamic_flag_spec=-rdynamic
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
++  ;;
++
++cygwin* | mingw* | pw32*)
++  version_type=windows
++  need_version=no
++  need_lib_prefix=no
++  case $GCC,$host_os in
++  yes,cygwin*)
++    library_names_spec='$libname.dll.a'
++    soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'
++    postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog .libs/$dlname \$dldir/$dlname'
++    postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $rm \$dlpath'
++    ;;
++  yes,mingw*)
++    library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'
++    sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"`
++    ;;
++  yes,pw32*)
++    library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
++    ;;
++  *)
++    library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll $libname.lib'
++    ;;
++  esac
++  dynamic_linker='Win32 ld.exe'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
++  ;;
++
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
++  # FIXME: Relying on posixy $() will cause problems for
++  #        cross-compilation, but unfortunately the echo tests do not
++  #        yet detect zsh echo's removal of \ escapes.
++  library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)'
++  soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)'
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
++  ;;
++
++freebsd1*)
++  dynamic_linker=no
++  ;;
++
++freebsd*-gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU/FreeBSD ld.so'
++  ;;
++
++freebsd*)
++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  version_type=freebsd-$objformat
++  case $version_type in
++    freebsd-elf*)
++      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
++      need_version=no
++      need_lib_prefix=no
++      ;;
++    freebsd-*)
++      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
++      need_version=yes
++      ;;
++  esac
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_os in
++  freebsd2*)
++    shlibpath_overrides_runpath=yes
++    ;;
++  *)
++    shlibpath_overrides_runpath=no
++    hardcode_into_libs=yes
++    ;;
++  esac
++  ;;
++
++gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  ;;
++
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  dynamic_linker="$host_os dld.sl"
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  shlibpath_var=SHLIB_PATH
++  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
++  soname_spec='${libname}${release}.sl$major'
++  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  postinstall_cmds='chmod 555 $lib'
++  ;;
++
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++    nonstopux*) version_type=nonstopux ;;
++    *)          version_type=irix ;;
++  esac
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}.so$major'
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
++  case $host_os in
++  irix5* | nonstopux*)
++    libsuff= shlibsuff=
++    ;;
++  *)
++    case $LD in # libtool.m4 will add one of these switches to LD
++    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
++    ;;
++  esac
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  ;;
++
++# No shared lib support for Linux oldld, aout, or coff.
++linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
++  dynamic_linker=no
++  ;;
++
++# This must be Linux ELF.
++linux-gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
++
++  # We used to test for /lib/ld.so.1 and disable shared libraries on
++  # powerpc, because MkLinux only supported shared libraries with the
++  # GNU dynamic linker.  Since this was broken with cross compilers,
++  # most powerpc-linux boxes support dynamic linking these days and
++  # people can always --disable-shared, the test was removed, and we
++  # assume the GNU/Linux dynamic linker is in use.
++  dynamic_linker='GNU/Linux ld.so'
++  ;;
++
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
++    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
++    soname_spec='${libname}${release}.so$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
++
++newsos6)
++  version_type=linux
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++openbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    case "$host_os" in
++    openbsd2.[[89]] | openbsd2.[[89]].*)
++      shlibpath_overrides_runpath=no
++      ;;
++    *)
++      shlibpath_overrides_runpath=yes
++      ;;
++    esac
++  else
++    shlibpath_overrides_runpath=yes
++  fi
++  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++os2*)
++  libname_spec='$name'
++  need_lib_prefix=no
++  library_names_spec='$libname.dll $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
++
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_version=no
++  need_lib_prefix=no
++  soname_spec='${libname}${release}.so$major'
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  hardcode_into_libs=yes
++  ;;
++
++sco3.2v5*)
++  version_type=osf
++  soname_spec='${libname}${release}.so$major'
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++solaris*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  ;;
++
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
++  ;;
++
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++  version_type=linux
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_vendor in
++    sni)
++      shlibpath_overrides_runpath=no
++      need_lib_prefix=no
++      export_dynamic_flag_spec='${wl}-Blargedynsym'
++      runpath_var=LD_RUN_PATH
++      ;;
++    siemens)
++      need_lib_prefix=no
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
++  esac
++  ;;
++
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
++    soname_spec='$libname.so.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
++
++*)
++  dynamic_linker=no
++  ;;
++esac
++AC_MSG_RESULT([$dynamic_linker])
++test "$dynamic_linker" = no && can_build_shared=no
++
++# Report the final consequences.
++AC_MSG_CHECKING([if libtool supports shared libraries])
++AC_MSG_RESULT([$can_build_shared])
++
++AC_MSG_CHECKING([whether to build shared libraries])
++test "$can_build_shared" = "no" && enable_shared=no
++
++# On AIX, shared libraries and static libraries use the same namespace, and
++# are all built from PIC.
++case "$host_os" in
++aix3*)
++  test "$enable_shared" = yes && enable_static=no
++  if test -n "$RANLIB"; then
++    archive_cmds="$archive_cmds~\$RANLIB \$lib"
++    postinstall_cmds='$RANLIB $lib'
++  fi
++  ;;
++
++aix4*)
++  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++    test "$enable_shared" = yes && enable_static=no
++  fi
++  ;;
++esac
++AC_MSG_RESULT([$enable_shared])
++
++AC_MSG_CHECKING([whether to build static libraries])
++# Make sure either enable_shared or enable_static is yes.
++test "$enable_shared" = yes || enable_static=yes
++AC_MSG_RESULT([$enable_static])
++
++if test "$hardcode_action" = relink; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
++fi
++
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
++AC_LIBTOOL_DLOPEN_SELF
++
++if test "$enable_shared" = yes && test "$GCC" = yes; then
++  case $archive_cmds in
++  *'~'*)
++    # FIXME: we may have to deal with multi-command sequences.
++    ;;
++  '$CC '*)
++    # Test whether the compiler implicitly links with -lc since on some
++    # systems, -lgcc has to come before -lc. If gcc already passes -lc
++    # to ld, don't add -lc before -lgcc.
++    AC_MSG_CHECKING([whether -lc should be explicitly linked in])
++    AC_CACHE_VAL([lt_cv_archive_cmds_need_lc],
++    [$rm conftest*
++    echo 'static int dummy;' > conftest.$ac_ext
++
++    if AC_TRY_EVAL(ac_compile); then
++      soname=conftest
++      lib=conftest
++      libobjs=conftest.$ac_objext
++      deplibs=
++      wl=$lt_cv_prog_cc_wl
++      compiler_flags=-v
++      linker_flags=-v
++      verstring=
++      output_objdir=.
++      libname=conftest
++      save_allow_undefined_flag=$allow_undefined_flag
++      allow_undefined_flag=
++      if AC_TRY_EVAL(archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
++      then
++	lt_cv_archive_cmds_need_lc=no
++      else
++	lt_cv_archive_cmds_need_lc=yes
++      fi
++      allow_undefined_flag=$save_allow_undefined_flag
++    else
++      cat conftest.err 1>&5
++    fi])
++    AC_MSG_RESULT([$lt_cv_archive_cmds_need_lc])
++    ;;
++  esac
++fi
++need_lc=${lt_cv_archive_cmds_need_lc-yes}
++
++# The second clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  :
++else
++  # If there is no Makefile yet, we rely on a make rule to execute
++  # `config.status --recheck' to rerun these tests and create the
++  # libtool script then.
++  test -f Makefile && make "$ltmain"
++fi
++
++if test -f "$ltmain"; then
++  trap "$rm \"${ofile}T\"; exit 1" 1 2 15
++  $rm -f "${ofile}T"
++
++  echo creating $ofile
++
++  # Now quote all the things that may contain metacharacters while being
++  # careful not to overquote the AC_SUBSTed values.  We take copies of the
++  # variables and quote the copies for generation of the libtool script.
++  for var in echo old_CC old_CFLAGS SED \
++    AR AR_FLAGS CC LD LN_S NM SHELL \
++    reload_flag reload_cmds wl \
++    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
++    thread_safe_flag_spec whole_archive_flag_spec libname_spec \
++    library_names_spec soname_spec \
++    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
++    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \
++    postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \
++    old_striplib striplib file_magic_cmd export_symbols_cmds \
++    deplibs_check_method allow_undefined_flag no_undefined_flag \
++    finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
++    global_symbol_to_c_name_address \
++    hardcode_libdir_flag_spec hardcode_libdir_separator  \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
++
++    case $var in
++    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
++    extract_expsyms_cmds | old_archive_from_expsyms_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
++  cat <<__EOF__ > "${ofile}T"
++#! $SHELL
++
++# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
++# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
++# NOTE: Changes made to this file will be lost: look at ltmain.sh.
++#
++# Copyright (C) 1996-2000 Free Software Foundation, Inc.
++# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++# A sed that does not truncate output.
++SED=$lt_SED
++
++# Sed that helps us avoid accidentally triggering echo(1) options like -n.
++Xsed="${SED} -e s/^X//"
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++
++# ### BEGIN LIBTOOL CONFIG
++
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
++
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
++
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
++
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$need_lc
++
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
++
++# The host system.
++host_alias=$host_alias
++host=$host
++
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
++
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
++
++# The default C compiler.
++CC=$lt_CC
++
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC
++
++# The linker used to build libraries.
++LD=$lt_LD
++
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
++
++# A BSD-compatible nm program.
++NM=$lt_NM
++
++# A symbol stripping program
++STRIP=$STRIP
++
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
++
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
++
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
++
++# Used on cygwin: assembler.
++AS="$AS"
++
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
++
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
++
++# How to pass a linker flag through the compiler.
++wl=$lt_wl
++
++# Object file suffix (normally "o").
++objext="$ac_objext"
++
++# Old archive suffix (normally "a").
++libext="$libext"
++
++# Executable file suffix (normally "").
++exeext="$exeext"
++
++# Additional compiler flags for building library objects.
++pic_flag=$lt_pic_flag
++pic_mode=$pic_mode
++
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_compiler_c_o
++
++# Can we write directly to a .lo ?
++compiler_o_lo=$lt_compiler_o_lo
++
++# Must we lock files when doing compilation ?
++need_locks=$lt_need_locks
++
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
++
++# Do we need a version for libraries?
++need_version=$need_version
++
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
++
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
++
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
++
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_link_static_flag
++
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_no_builtin_flag
++
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
++
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec
++
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec
++
++# Library versioning type.
++version_type=$version_type
++
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
++
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
++
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
++
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
++
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
++
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
++
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds
++archive_expsym_cmds=$lt_archive_expsym_cmds
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
++
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
++
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
++
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
++
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag
++
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag
++
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
++
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
++
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_global_symbol_pipe
++
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_global_symbol_to_cdecl
++
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address
++
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
++
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
++
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action
++
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
++
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
++
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$lt_hardcode_libdir_separator
++
++# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$hardcode_direct
++
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$hardcode_minus_L
++
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var
++
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
++
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$link_all_deplibs
++
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$fix_srcfile_path"
++
++# Set to yes if exported symbols are required.
++always_export_symbols=$always_export_symbols
++
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_export_symbols_cmds
++
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
++
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms
++
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms
++
++# ### END LIBTOOL CONFIG
++
++__EOF__
++
++  case $host_os in
++  aix3*)
++    cat <<\EOF >> "${ofile}T"
++
++# AIX sometimes has problems with the GCC collect2 program.  For some
++# reason, if we set the COLLECT_NAMES environment variable, the problems
++# vanish in a puff of smoke.
++if test "X${COLLECT_NAMES+set}" != Xset; then
++  COLLECT_NAMES=
++  export COLLECT_NAMES
++fi
++EOF
++    ;;
++  esac
++
++  case $host_os in
++  cygwin* | mingw* | pw32* | os2*)
++    cat <<'EOF' >> "${ofile}T"
++      # This is a source program that is used to create dlls on Windows
++      # Don't remove nor modify the starting and closing comments
++# /* ltdll.c starts here */
++# #define WIN32_LEAN_AND_MEAN
++# #include <windows.h>
++# #undef WIN32_LEAN_AND_MEAN
++# #include <stdio.h>
++#
++# #ifndef __CYGWIN__
++# #  ifdef __CYGWIN32__
++# #    define __CYGWIN__ __CYGWIN32__
++# #  endif
++# #endif
++#
++# #ifdef __cplusplus
++# extern "C" {
++# #endif
++# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
++# #ifdef __cplusplus
++# }
++# #endif
++#
++# #ifdef __CYGWIN__
++# #include <cygwin/cygwin_dll.h>
++# DECLARE_CYGWIN_DLL( DllMain );
++# #endif
++# HINSTANCE __hDllInstance_base;
++#
++# BOOL APIENTRY
++# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
++# {
++#   __hDllInstance_base = hInst;
++#   return TRUE;
++# }
++# /* ltdll.c ends here */
++	# This is a source program that is used to create import libraries
++	# on Windows for dlls which lack them. Don't remove nor modify the
++	# starting and closing comments
++# /* impgen.c starts here */
++# /*   Copyright (C) 1999-2000 Free Software Foundation, Inc.
++#
++#  This file is part of GNU libtool.
++#
++#  This program is free software; you can redistribute it and/or modify
++#  it under the terms of the GNU General Public License as published by
++#  the Free Software Foundation; either version 2 of the License, or
++#  (at your option) any later version.
++#
++#  This program is distributed in the hope that it will be useful,
++#  but WITHOUT ANY WARRANTY; without even the implied warranty of
++#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++#  GNU General Public License for more details.
++#
++#  You should have received a copy of the GNU General Public License
++#  along with this program; if not, write to the Free Software
++#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#  */
++#
++# #include <stdio.h>		/* for printf() */
++# #include <unistd.h>		/* for open(), lseek(), read() */
++# #include <fcntl.h>		/* for O_RDONLY, O_BINARY */
++# #include <string.h>		/* for strdup() */
++#
++# /* O_BINARY isn't required (or even defined sometimes) under Unix */
++# #ifndef O_BINARY
++# #define O_BINARY 0
++# #endif
++#
++# static unsigned int
++# pe_get16 (fd, offset)
++#      int fd;
++#      int offset;
++# {
++#   unsigned char b[2];
++#   lseek (fd, offset, SEEK_SET);
++#   read (fd, b, 2);
++#   return b[0] + (b[1]<<8);
++# }
++#
++# static unsigned int
++# pe_get32 (fd, offset)
++#     int fd;
++#     int offset;
++# {
++#   unsigned char b[4];
++#   lseek (fd, offset, SEEK_SET);
++#   read (fd, b, 4);
++#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
++# }
++#
++# static unsigned int
++# pe_as32 (ptr)
++#      void *ptr;
++# {
++#   unsigned char *b = ptr;
++#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
++# }
++#
++# int
++# main (argc, argv)
++#     int argc;
++#     char *argv[];
++# {
++#     int dll;
++#     unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
++#     unsigned long export_rva, export_size, nsections, secptr, expptr;
++#     unsigned long name_rvas, nexp;
++#     unsigned char *expdata, *erva;
++#     char *filename, *dll_name;
++#
++#     filename = argv[1];
++#
++#     dll = open(filename, O_RDONLY|O_BINARY);
++#     if (dll < 1)
++# 	return 1;
++#
++#     dll_name = filename;
++#
++#     for (i=0; filename[i]; i++)
++# 	if (filename[i] == '/' || filename[i] == '\\'  || filename[i] == ':')
++# 	    dll_name = filename + i +1;
++#
++#     pe_header_offset = pe_get32 (dll, 0x3c);
++#     opthdr_ofs = pe_header_offset + 4 + 20;
++#     num_entries = pe_get32 (dll, opthdr_ofs + 92);
++#
++#     if (num_entries < 1) /* no exports */
++# 	return 1;
++#
++#     export_rva = pe_get32 (dll, opthdr_ofs + 96);
++#     export_size = pe_get32 (dll, opthdr_ofs + 100);
++#     nsections = pe_get16 (dll, pe_header_offset + 4 +2);
++#     secptr = (pe_header_offset + 4 + 20 +
++# 	      pe_get16 (dll, pe_header_offset + 4 + 16));
++#
++#     expptr = 0;
++#     for (i = 0; i < nsections; i++)
++#     {
++# 	char sname[8];
++# 	unsigned long secptr1 = secptr + 40 * i;
++# 	unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
++# 	unsigned long vsize = pe_get32 (dll, secptr1 + 16);
++# 	unsigned long fptr = pe_get32 (dll, secptr1 + 20);
++# 	lseek(dll, secptr1, SEEK_SET);
++# 	read(dll, sname, 8);
++# 	if (vaddr <= export_rva && vaddr+vsize > export_rva)
++# 	{
++# 	    expptr = fptr + (export_rva - vaddr);
++# 	    if (export_rva + export_size > vaddr + vsize)
++# 		export_size = vsize - (export_rva - vaddr);
++# 	    break;
++# 	}
++#     }
++#
++#     expdata = (unsigned char*)malloc(export_size);
++#     lseek (dll, expptr, SEEK_SET);
++#     read (dll, expdata, export_size);
++#     erva = expdata - export_rva;
++#
++#     nexp = pe_as32 (expdata+24);
++#     name_rvas = pe_as32 (expdata+32);
++#
++#     printf ("EXPORTS\n");
++#     for (i = 0; i<nexp; i++)
++#     {
++# 	unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
++# 	printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
++#     }
++#
++#     return 0;
++# }
++# /* impgen.c ends here */
++
++EOF
++    ;;
++  esac
++
++  # We use sed instead of cat because bash on DJGPP gets confused if
++  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
++  # text mode, it properly converts lines to CR/LF.  This bash problem
++  # is reportedly fixed, but why not run on old versions too?
++  sed '$q' "$ltmain" >> "${ofile}T" || (rm -f "${ofile}T"; exit 1)
++
++  mv -f "${ofile}T" "$ofile" || \
++    (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T")
++  chmod +x "$ofile"
++fi
++
++])# _LT_AC_LTCONFIG_HACK
++
++# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
++AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
++
++# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
++AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
++
++# AC_ENABLE_SHARED - implement the --enable-shared flag
++# Usage: AC_ENABLE_SHARED[(DEFAULT)]
++#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
++#   `yes'.
++AC_DEFUN([AC_ENABLE_SHARED],
++[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
++AC_ARG_ENABLE(shared,
++changequote(<<, >>)dnl
++<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
++changequote([, ])dnl
++[p=${PACKAGE-default}
++case $enableval in
++yes) enable_shared=yes ;;
++no) enable_shared=no ;;
++*)
++  enable_shared=no
++  # Look at the argument we got.  We use all the common list separators.
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
++  for pkg in $enableval; do
++    if test "X$pkg" = "X$p"; then
++      enable_shared=yes
++    fi
++  done
++  IFS="$ac_save_ifs"
++  ;;
++esac],
++enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
++])
++
++# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
++AC_DEFUN([AC_DISABLE_SHARED],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_ENABLE_SHARED(no)])
++
++# AC_ENABLE_STATIC - implement the --enable-static flag
++# Usage: AC_ENABLE_STATIC[(DEFAULT)]
++#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
++#   `yes'.
++AC_DEFUN([AC_ENABLE_STATIC],
++[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
++AC_ARG_ENABLE(static,
++changequote(<<, >>)dnl
++<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
++changequote([, ])dnl
++[p=${PACKAGE-default}
++case $enableval in
++yes) enable_static=yes ;;
++no) enable_static=no ;;
++*)
++  enable_static=no
++  # Look at the argument we got.  We use all the common list separators.
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
++  for pkg in $enableval; do
++    if test "X$pkg" = "X$p"; then
++      enable_static=yes
++    fi
++  done
++  IFS="$ac_save_ifs"
++  ;;
++esac],
++enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
++])
++
++# AC_DISABLE_STATIC - set the default static flag to --disable-static
++AC_DEFUN([AC_DISABLE_STATIC],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_ENABLE_STATIC(no)])
++
++
++# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
++# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
++#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
++#   `yes'.
++AC_DEFUN([AC_ENABLE_FAST_INSTALL],
++[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
++AC_ARG_ENABLE(fast-install,
++changequote(<<, >>)dnl
++<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
++changequote([, ])dnl
++[p=${PACKAGE-default}
++case $enableval in
++yes) enable_fast_install=yes ;;
++no) enable_fast_install=no ;;
++*)
++  enable_fast_install=no
++  # Look at the argument we got.  We use all the common list separators.
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
++  for pkg in $enableval; do
++    if test "X$pkg" = "X$p"; then
++      enable_fast_install=yes
++    fi
++  done
++  IFS="$ac_save_ifs"
++  ;;
++esac],
++enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
++])
++
++# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install
++AC_DEFUN([AC_DISABLE_FAST_INSTALL],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_ENABLE_FAST_INSTALL(no)])
++
++# AC_LIBTOOL_PICMODE - implement the --with-pic flag
++# Usage: AC_LIBTOOL_PICMODE[(MODE)]
++#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
++#   `both'.
++AC_DEFUN([AC_LIBTOOL_PICMODE],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++pic_mode=ifelse($#,1,$1,default)])
++
++
++# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
++AC_DEFUN([AC_PATH_TOOL_PREFIX],
++[AC_MSG_CHECKING([for $1])
++AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
++[case $MAGIC_CMD in
++  /*)
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++  ;;
++  ?:/*)
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
++  ;;
++  *)
++  ac_save_MAGIC_CMD="$MAGIC_CMD"
++  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
++dnl $ac_dummy forces splitting on constant user-supplied paths.
++dnl POSIX.2 word splitting is done only on the output of word expansions,
++dnl not every word.  This closes a longstanding sh security hole.
++  ac_dummy="ifelse([$2], , $PATH, [$2])"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$1; then
++      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
++      if test -n "$file_magic_test_file"; then
++	case $deplibs_check_method in
++	"file_magic "*)
++	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
++	    egrep "$file_magic_regex" > /dev/null; then
++	    :
++	  else
++	    cat <<EOF 1>&2
++
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such.  This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem.  Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool@gnu.org
++
++EOF
++	  fi ;;
++	esac
++      fi
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++  MAGIC_CMD="$ac_save_MAGIC_CMD"
++  ;;
++esac])
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++  AC_MSG_RESULT($MAGIC_CMD)
++else
++  AC_MSG_RESULT(no)
++fi
++])
++
++
++# AC_PATH_MAGIC - find a file program which can recognise a shared library
++AC_DEFUN([AC_PATH_MAGIC],
++[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
++AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
++if test -z "$lt_cv_path_MAGIC_CMD"; then
++  if test -n "$ac_tool_prefix"; then
++    AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
++  else
++    MAGIC_CMD=:
++  fi
++fi
++])
++
++
++# AC_PROG_LD - find the path to the GNU or non-GNU linker
++AC_DEFUN([AC_PROG_LD],
++[AC_ARG_WITH(gnu-ld,
++[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
++test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
++AC_REQUIRE([AC_PROG_CC])dnl
++AC_REQUIRE([AC_CANONICAL_HOST])dnl
++AC_REQUIRE([AC_CANONICAL_BUILD])dnl
++AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl
++ac_prog=ld
++if test "$GCC" = yes; then
++  # Check if gcc -print-prog-name=ld gives a path.
++  AC_MSG_CHECKING([for ld used by GCC])
++  case $host in
++  *-*-mingw*)
++    # gcc leaves a trailing carriage return which upsets mingw
++    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
++  *)
++    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
++  esac
++  case $ac_prog in
++    # Accept absolute paths.
++    [[\\/]]* | [[A-Za-z]]:[[\\/]]*)
++      re_direlt='/[[^/]][[^/]]*/\.\./'
++      # Canonicalize the path of ld
++      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
++      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
++	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
++      done
++      test -z "$LD" && LD="$ac_prog"
++      ;;
++  "")
++    # If it fails, then pretend we aren't using GCC.
++    ac_prog=ld
++    ;;
++  *)
++    # If it is relative, then search for the first ld in PATH.
++    with_gnu_ld=unknown
++    ;;
++  esac
++elif test "$with_gnu_ld" = yes; then
++  AC_MSG_CHECKING([for GNU ld])
++else
++  AC_MSG_CHECKING([for non-GNU ld])
++fi
++AC_CACHE_VAL(lt_cv_path_LD,
++[if test -z "$LD"; then
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for ac_dir in $PATH; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
++      lt_cv_path_LD="$ac_dir/$ac_prog"
++      # Check to see if the program is GNU ld.  I'd rather use --version,
++      # but apparently some GNU ld's only accept -v.
++      # Break only if it was the GNU/non-GNU ld that we prefer.
++      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
++	test "$with_gnu_ld" != no && break
++      else
++	test "$with_gnu_ld" != yes && break
++      fi
++    fi
++  done
++  IFS="$ac_save_ifs"
++else
++  lt_cv_path_LD="$LD" # Let the user override the test with a path.
++fi])
++LD="$lt_cv_path_LD"
++if test -n "$LD"; then
++  AC_MSG_RESULT($LD)
++else
++  AC_MSG_RESULT(no)
++fi
++test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
++AC_PROG_LD_GNU
++])
++
++# AC_PROG_LD_GNU -
++AC_DEFUN([AC_PROG_LD_GNU],
++[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
++[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
++if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
++  lt_cv_prog_gnu_ld=yes
++else
++  lt_cv_prog_gnu_ld=no
++fi])
++with_gnu_ld=$lt_cv_prog_gnu_ld
++])
++
++# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
++#   -- PORTME Some linkers may need a different reload flag.
++AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
++[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
++[lt_cv_ld_reload_flag='-r'])
++reload_flag=$lt_cv_ld_reload_flag
++test -n "$reload_flag" && reload_flag=" $reload_flag"
++])
++
++# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
++#  -- PORTME fill in with the dynamic library characteristics
++AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
++[AC_CACHE_CHECK([how to recognise dependent libraries],
++lt_cv_deplibs_check_method,
++[lt_cv_file_magic_cmd='$MAGIC_CMD'
++lt_cv_file_magic_test_file=
++lt_cv_deplibs_check_method='unknown'
++# Need to set the preceding variable on all platforms that support
++# interlibrary dependencies.
++# 'none' -- dependencies not supported.
++# `unknown' -- same as none, but documents that we really don't know.
++# 'pass_all' -- all dependencies passed with no checks.
++# 'test_compile' -- check by making test program.
++# 'file_magic [[regex]]' -- check by looking for files in library path
++# which responds to the $file_magic_cmd with a given egrep regex.
++# If you have `file' or equivalent on your system and you're not sure
++# whether `pass_all' will *always* work, you probably want this one.
++
++case $host_os in
++aix4* | aix5*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++beos*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++bsdi4*)
++  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
++  lt_cv_file_magic_cmd='/usr/bin/file -L'
++  lt_cv_file_magic_test_file=/shlib/libc.so
++  ;;
++
++cygwin* | mingw* | pw32*)
++  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++  lt_cv_file_magic_cmd='$OBJDUMP -f'
++  ;;
++
++darwin* | rhapsody*)
++  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
++  lt_cv_file_magic_cmd='/usr/bin/file -L'
++  case "$host_os" in
++  rhapsody* | darwin1.[[012]])
++    lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
++    ;;
++  *) # Darwin 1.3 on
++    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
++    ;;
++  esac
++  ;;
++
++freebsd*)
++  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++    case $host_cpu in
++    i*86 )
++      # Not sure whether the presence of OpenBSD here was a mistake.
++      # Let's accept both of them until this is cleared up.
++      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
++      lt_cv_file_magic_cmd=/usr/bin/file
++      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
++      ;;
++    esac
++  else
++    lt_cv_deplibs_check_method=pass_all
++  fi
++  ;;
++
++gnu*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++hpux10.20*|hpux11*)
++  lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
++  lt_cv_file_magic_cmd=/usr/bin/file
++  lt_cv_file_magic_test_file=/usr/lib/libc.sl
++  ;;
++
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++  irix5* | nonstopux*)
++    # this will be overridden with pass_all, but let us keep it just in case
++    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
++    ;;
++  *)
++    case $LD in
++    *-32|*"-32 ") libmagic=32-bit;;
++    *-n32|*"-n32 ") libmagic=N32;;
++    *-64|*"-64 ") libmagic=64-bit;;
++    *) libmagic=never-match;;
++    esac
++    # this will be overridden with pass_all, but let us keep it just in case
++    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
++    ;;
++  esac
++  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++# This must be Linux ELF.
++linux-gnu*)
++  case $host_cpu in
++  alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64*)
++    lt_cv_deplibs_check_method=pass_all ;;
++  *)
++    # glibc up to 2.1.1 does not perform some relocations on ARM
++    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
++  esac
++  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
++  ;;
++
++netbsd*)
++  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$'
++  else
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so$'
++  fi
++  ;;
++
++newos6*)
++  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
++  lt_cv_file_magic_cmd=/usr/bin/file
++  lt_cv_file_magic_test_file=/usr/lib/libnls.so
++  ;;
++
++openbsd*)
++  lt_cv_file_magic_cmd=/usr/bin/file
++  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
++  else
++    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
++  fi
++  ;;
++
++osf3* | osf4* | osf5*)
++  # this will be overridden with pass_all, but let us keep it just in case
++  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
++  lt_cv_file_magic_test_file=/shlib/libc.so
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++sco3.2v5*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++solaris*)
++  lt_cv_deplibs_check_method=pass_all
++  lt_cv_file_magic_test_file=/lib/libc.so
++  ;;
++
++sysv5uw[[78]]* | sysv4*uw2*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++  case $host_vendor in
++  motorola)
++    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
++    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
++    ;;
++  ncr)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  sequent)
++    lt_cv_file_magic_cmd='/bin/file'
++    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
++    ;;
++  sni)
++    lt_cv_file_magic_cmd='/bin/file'
++    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
++    lt_cv_file_magic_test_file=/lib/libc.so
++    ;;
++  siemens)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  esac
++  ;;
++esac
++])
++file_magic_cmd=$lt_cv_file_magic_cmd
++deplibs_check_method=$lt_cv_deplibs_check_method
++])
++
++
++# AC_PROG_NM - find the path to a BSD-compatible name lister
++AC_DEFUN([AC_PROG_NM],
++[AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl
++AC_MSG_CHECKING([for BSD-compatible nm])
++AC_CACHE_VAL(lt_cv_path_NM,
++[if test -n "$NM"; then
++  # Let the user override the test.
++  lt_cv_path_NM="$NM"
++else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
++    test -z "$ac_dir" && ac_dir=.
++    tmp_nm=$ac_dir/${ac_tool_prefix}nm
++    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
++      # Check to see if the nm accepts a BSD-compat flag.
++      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
++      #   nm: unknown option "B" ignored
++      # Tru64's nm complains that /dev/null is an invalid object file
++      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
++	lt_cv_path_NM="$tmp_nm -B"
++	break
++      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
++	lt_cv_path_NM="$tmp_nm -p"
++	break
++      else
++	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++	continue # so that we can try to find one that supports BSD flags
++      fi
++    fi
++  done
++  IFS="$ac_save_ifs"
++  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
++fi])
++NM="$lt_cv_path_NM"
++AC_MSG_RESULT([$NM])
++])
++
++# AC_CHECK_LIBM - check for math library
++AC_DEFUN([AC_CHECK_LIBM],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
++LIBM=
++case $host in
++*-*-beos* | *-*-cygwin* | *-*-pw32*)
++  # These system don't have libm
++  ;;
++*-ncr-sysv4.3*)
++  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
++  AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
++  ;;
++*)
++  AC_CHECK_LIB(m, main, LIBM="-lm")
++  ;;
++esac
++])
++
++# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
++# the libltdl convenience library and LTDLINCL to the include flags for
++# the libltdl header and adds --enable-ltdl-convenience to the
++# configure arguments.  Note that LIBLTDL and LTDLINCL are not
++# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
++# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
++# with '${top_builddir}/' and LTDLINCL will be prefixed with
++# '${top_srcdir}/' (note the single quotes!).  If your package is not
++# flat and you're not using automake, define top_builddir and
++# top_srcdir appropriately in the Makefiles.
++AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++  case $enable_ltdl_convenience in
++  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
++  "") enable_ltdl_convenience=yes
++      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
++  esac
++  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
++  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
++  # For backwards non-gettext consistent compatibility...
++  INCLTDL="$LTDLINCL"
++])
++
++# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
++# the libltdl installable library and LTDLINCL to the include flags for
++# the libltdl header and adds --enable-ltdl-install to the configure
++# arguments.  Note that LIBLTDL and LTDLINCL are not AC_SUBSTed, nor is
++# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
++# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
++# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed
++# with '${top_srcdir}/' (note the single quotes!).  If your package is
++# not flat and you're not using automake, define top_builddir and
++# top_srcdir appropriately in the Makefiles.
++# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
++AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++  AC_CHECK_LIB(ltdl, main,
++  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
++  [if test x"$enable_ltdl_install" = xno; then
++     AC_MSG_WARN([libltdl not installed, but installation disabled])
++   else
++     enable_ltdl_install=yes
++   fi
++  ])
++  if test x"$enable_ltdl_install" = x"yes"; then
++    ac_configure_args="$ac_configure_args --enable-ltdl-install"
++    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
++    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
++  else
++    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
++    LIBLTDL="-lltdl"
++    LTDLINCL=
++  fi
++  # For backwards non-gettext consistent compatibility...
++  INCLTDL="$LTDLINCL"
++])
++
++# old names
++AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
++AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
++AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
++AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
++AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
++AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
++AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
++
++# This is just to silence aclocal about the macro not being used
++ifelse([AC_DISABLE_FAST_INSTALL])
++
++# NOTE: This macro has been submitted for inclusion into   #
++#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
++#  a released version of Autoconf we should remove this    #
++#  macro and use it instead.                               #
++# LT_AC_PROG_SED
++# --------------
++# Check for a fully-functional sed program, that truncates
++# as few characters as possible.  Prefer GNU sed if found.
++AC_DEFUN([LT_AC_PROG_SED],
++[AC_MSG_CHECKING([for a sed that does not truncate output])
++AC_CACHE_VAL(lt_cv_path_SED,
++[# Loop through the user's path and test for sed and gsed.
++# Then use that list of sed's as ones to test for truncation.
++as_executable_p="test -f"
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_prog in sed gsed; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
++      if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
++        _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"
++      fi
++    done
++  done
++done
++
++  # Create a temporary directory, and hook for its removal unless debugging.
++$debug ||
++{
++  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
++  trap '{ (exit 1); exit 1; }' 1 2 13 15
++}
++
++# Create a (secure) tmp directory for tmp files.
++: ${TMPDIR=/tmp}
++{
++  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` &&
++  test -n "$tmp" && test -d "$tmp"
++}  ||
++{
++  tmp=$TMPDIR/sed$$-$RANDOM
++  (umask 077 && mkdir $tmp)
++} ||
++{
++   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
++   { (exit 1); exit 1; }
++}
++  _max=0
++  _count=0
++  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
++  # along with /bin/sed that truncates output.
++  for _sed in $_sed_list /usr/xpg4/bin/sed; do
++    test ! -f ${_sed} && break
++    cat /dev/null > "$tmp/sed.in"
++    _count=0
++    echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in"
++    # Check for GNU sed and select it if it is found.
++    if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
++      lt_cv_path_SED=${_sed}
++      break
++    fi
++    while true; do
++      cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
++      mv "$tmp/sed.tmp" "$tmp/sed.in"
++      cp "$tmp/sed.in" "$tmp/sed.nl"
++      echo >>"$tmp/sed.nl"
++      ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
++      cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
++      # 40000 chars as input seems more than enough
++      test $_count -gt 10 && break
++      _count=`expr $_count + 1`
++      if test $_count -gt $_max; then
++        _max=$_count
++        lt_cv_path_SED=$_sed
++      fi
++    done
++  done
++  rm -rf "$tmp"
++])
++if test "X$SED" != "X"; then
++  lt_cv_path_SED=$SED
++else
++  SED=$lt_cv_path_SED
++fi
++AC_MSG_RESULT([$SED])
++])
++
+--- metamail-2.7.orig/bootstrap
++++ metamail-2.7/bootstrap
+@@ -0,0 +1,9 @@
++#! /bin/sh
++
++set -x
++
++aclocal -I config
++libtoolize --force --copy
++autoheader
++automake --foreign --add-missing --copy
++autoconf
+--- metamail-2.7.orig/man/richtext.1
++++ metamail-2.7/man/richtext.1
+@@ -6,6 +6,8 @@
+ \fBrichtext\fP [
+ .B \-c
+ ] [
++.B \-e
++] [
+ .B \-f
+ ] [
+ .B \-m
+@@ -53,6 +55,12 @@
+ to just correct the raw richtext and write the corrected version to its
+ standard output, without performing any formatting.
+ .TP 8
++.B \-e
++This option directs
++.I richtext
++to interpret the input as MIME type text/enriched rather than text/richtext.
++The text/enriched format is defined in RFC 1896.
++.TP 8
+ .B \-f
+ This option directs
+ .I richtext
+--- metamail-2.7.orig/man/mailto.1
++++ metamail-2.7/man/mailto.1
+@@ -1,6 +1,6 @@
+ .TH MAILTO 1 "Release 1" "Bellcore Prototype"
+ .SH NAME
+-mailto - Simple mutlimedia mail sending program
++mailto - Simple multimedia mail sending program
+ .SH SYNOPSIS
+ .ta 8n
+ \fBmailto\fP	[-a] [-c] [-s] [recipient name(s)]
+@@ -74,9 +74,9 @@
+ 
+ Basically, mailto can include the following things in mail:
+ 
+-1.  Simple formatted text, using the MIME type "text/richtext".  This allows you to add emphasis to your message using underlining, bold text, italic (diaplsyed as reverse video), centering, and the like.
++1.  Simple formatted text, using the MIME type "text/richtext".  This allows you to add emphasis to your message using underlining, bold text, italic (displayed as reverse video), centering, and the like.
+ 
+-2.  Non-text data.  Metamail can include pictures, sounds, and other non-textual data in the middle of any mail message.  The mailcap configuration mechanism can even make this process reasonably user-friendly, but a knowledgable user can include non-textual data even in the absence of a proper mailcap entry.
++2.  Non-text data.  Metamail can include pictures, sounds, and other non-textual data in the middle of any mail message.  The mailcap configuration mechanism can even make this process reasonably user-friendly, but a knowledgeable user can include non-textual data even in the absence of a proper mailcap entry.
+ 
+ 3.  Text including non-ASCII characters, such as Hebrew or Russian.  Currently, mailto directly supports only the ISO-8859-* family of character sets, which means that it does not meet the needs of Asian users, in particular.  However, languages that can not be expressed in the ISO-8859 family can still be included in the same way non-text data can be included.
+ 
+@@ -230,7 +230,7 @@
+    dot -- controls whether or not a period alone on a line 
+         should be interpreted as terminating your mail
+    ignore -- controls whether or not interrupts are ignored
+-   verbose -- controls the verbosity of output from /usr/lib/sendmail
++   verbose -- controls the verbosity of output from /usr/sbin/sendmail
+    quiet -- controls the verbosity of output from the mailto program.
+    keepblind -- controls whether or not a 'blind' copy of the mail is kept.
+   commasonly -- controls whether or not a space character
+@@ -275,7 +275,7 @@
+ 
+ .I 
+ Altered editing behavior:
+-The ~e and ~v commands, which are used to edit the message being composed, will behave differently in mailto if the mail includes non-text portions.  In such cases, each part will be edited separately, in sequence, which makes it impossble for the user to accidentally mess up the inter-part boundaries.  Moreover, if the mailcap entry for a given data type includes an "edit" field, the user will be given the choice of editing with the program named there or editing with his usual (text) editor.  In most cases, this will be a choice between using a structured editor or editing the raw data stream.
++The ~e and ~v commands, which are used to edit the message being composed, will behave differently in mailto if the mail includes non-text portions.  In such cases, each part will be edited separately, in sequence, which makes it impossible for the user to accidentally mess up the inter-part boundaries.  Moreover, if the mailcap entry for a given data type includes an "edit" field, the user will be given the choice of editing with the program named there or editing with his usual (text) editor.  In most cases, this will be a choice between using a structured editor or editing the raw data stream.
+ 
+ .I 
+ Altered behavior for large messages:
+@@ -283,7 +283,7 @@
+ 
+ .I
+ New -r command-line option 
+-The -r comand-line option is not found in standard Berkeley mail.
++The -r command line option is not found in standard Berkeley mail.
+ 
+ .SH SUMMARY OF OPTIONS
+ -a <charset> -- specifies an alternate character set in use.  This had better be the one your terminal is actually using.  Currently it must be in the iso-8859 character set family.
+--- metamail-2.7.orig/man/metamail.1
++++ metamail-2.7/man/metamail.1
+@@ -38,6 +38,9 @@
+ .B \-e 
+ This option tells metamail to "eat" leading newlines in message bodies.  This is particularly useful for MH-format mail.
+ .TP 8
++.B \-E <contentencoding>
++This option tells metamail to use the specified content transfer encoding rather than the one in the headers, if any.  
++.TP 8
+ .B \-f <address>
+ This option specifies the name of the sender of the message.  Otherwise, this is determined from the header, if possible.  This information will be placed in the environment to make it available to any interpreters called by metamail.
+ .TP 8
+@@ -63,7 +66,7 @@
+ This option specifies that it is OK to run as root.  By default, metamail refuses to run if the real or effective user id is root.  You can get the same effect using the MM_RUNASROOT environment variable.
+ .TP 8
+ .B \-R
+-This option specifies that the /usr/ucb/reset should be executed to reset the terminal state, before any other I/O activity.
++This option specifies that the /usr/bin/reset should be executed to reset the terminal state, before any other I/O activity.
+ .TP 8
+ .B \-s <subject>  
+ This option specifies the subject of the mail message.  By default, this information is obtained from the headers.  This information will be placed in the environment to make it available to any interpreters called by metamail.
+@@ -105,11 +108,13 @@
+ 
+ The default search path is equivalent to
+ 
+-$HOME/.mailcap:/usr/local/etc/mailcap:/usr/etc/mailcap:/etc/mailcap:/etc/mail/mailcap:/usr/public/lib/mailcap"
++.na
++$HOME/.mailcap:\:/usr/local/etc/mailcap:\:/usr/etc/mailcap:\:/etc/mailcap:\:/etc/mail/mailcap:\:/usr/public/lib/mailcap
++.ad
+ 
+ It can be overridden by setting the MAILCAPS environment variable.  Note: Metamail does not actually interpret environment variables such as $HOME or the "~" syntax in this path search.
+ 
+-The format of mailcap files is explained in the manual entry for mailcap(4).
++The format of mailcap files is explained in the manual entry for mailcap(5).
+ 
+ .SH NON-ASCII HEADER FIELDS
+ Metamail has rudimentary built-in support for the emerging Internet standards for non-ASCII data in mail headers.  What this means is that such data will be recognized, decoded, and sent to the terminal.  This behavior may be more or less reasonable, depending on the character set in the header data and the capability of the user's terminal, but it will rarely be any worse than showing such data in its encoded form.
+@@ -199,7 +204,7 @@
+ .SH FILES
+ $HOME/.mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap -- default path for mailcap files.
+ .SH SEE ALSO
+-audiocompose(1), audiosend(1), ezview(1), getfilename(1), mailto-hebrew(1), mailto(1), metasend(1), mmencode(1), richtext(1), showaudio(1), showexternal(1), shownonascii(1), showpartial(1), showpicture(1), mailcap(4)
++audiocompose(1), audiosend(1), ezview(1), getfilename(1), mailto-hebrew(1), mailto(1), metasend(1), mimencode(1), richtext(1), showaudio(1), showexternal(1), shownonascii(1), showpartial(1), showpicture(1), mailcap(5)
+ .SH BUGS
+ In a multipart/alternative body or body parts, some headers in the embedded part that should be displayed may not be displayed.  This will rarely be a problem.  Also, in a multipart/alternative, anything of type "multipart" or "message" is considered to be a recognized part, regardless of the recognizability of its contents.  This might be a problem, only further experience will tell.
+ 
+--- metamail-2.7.orig/man/uuenpipe.1
++++ metamail-2.7/man/uuenpipe.1
+@@ -0,0 +1,44 @@
++.TH UUENPIPE 1 "1998 March 2nd" "METAMAIL" "Debian Linux Manual"
++.SH NAME
++uuenpipe \- uuencode a file
++.SH SYNOPSIS
++.B uuenpipe
++.RI [ filename ]
++.SH "DESCRIPTION"
++This manual page documents briefly the
++.B uuenpipe
++command.
++This manual page was written for the
++.B Debian GNU/Linux
++distribution (but may be used by others), because the original
++program does not have a manual page.
++.PP
++.B uuenpipe
++uuencodes
++.I filename
++(or the standard input if
++.I filename
++were not supplied) and prints the result to the standard output.
++When
++.I filename
++is supplied,
++.B uuenpipe
++acts as if the following command were invoked.
++.IP
++.NF
++uuencode
++.I filename
++.I filename
++.FI
++.LP
++Otherwise, it would act according to the behaviour of the next
++command.
++.IP
++.NF
++uuencode
++.I UUPIPEOUT
++.FI
++.LP
++.SH AUTHOR
++.B uuenpipe
++is part of mm package.  Manual page added by Herbert Xu.
+--- metamail-2.7.orig/man/splitmail.1
++++ metamail-2.7/man/splitmail.1
+@@ -8,23 +8,24 @@
+ .SH DESCRIPTION
+ The
+ .I splitmail
+-program will take an email message and break it up into smaller pieces using the "message/partial" type defined by MIME, the proposed Internet standard for multimedia mail formats.  
++program will take an email message and break it up into smaller pieces using the "message/partial" type defined by MIME(1), the proposed Internet standard for multimedia mail formats.  
+ 
+ By default it will take the message either from standard input or the named file, and will produce a set of partial message files with names like "/tmp/split.1" for the first part, and so on.  The prefix "/tmp/split." can be overridden using the "-p" option.  
+ 
+-If the -d option is specified, the mail will actually be delivered.  If -v is specified, the verbose flag will be passed to sendmail.
++If the -d option is specified, the mail will actually be delivered.  If -v is specified, the verbose flag will be passed to \fBsendmail\fR(8).
+ 
+-The -i option can be used to make splitmail generate the pieces with similar (but not identical) message-id fields, in a format which allows them to be easily correlated with one another and which end with the suffix provided on the command line after -i.
++The -i option can be used to make \fBsplitmail\fR generate the pieces with similar (but not identical) message-id fields, in a format which allows them to be easily correlated with one another and which end with the suffix provided on the command line after -i.
+ 
+-The default chunk size for spliting messages is 250000 at most sites, though this is also a compile-time option.  This can be overriden with the -s switch, or with the environment variable SPLITSIZE.
++The default chunk size for splitting messages is 250000 at most sites, though this is also a compile-time option.  This can be overridden with the -s switch, or with the environment variable SPLITSIZE.
+ 
+ Messages smaller than the chunk size will not be turned into partial messages, but will be written to a single file or delivered as a single message.
+ .SH ENVIRONMENT
+ SPLITSIZE overrides the default chunk size.  Setting SPLITSIZE to, say, 4000000 will effectively ensure that your messages are unlikely ever to be split, but it may cause them to be rejected by some mail transport software.
+ .SH SEE ALSO
+-mailto(1), metamail(1)
++.PP
++\fBmailto\fR(1), \fBmetamail\fR(1), \fBMIME\fR(1), \fBmunpack\fR(1)
+ .SH BUGS
+-If the size of the input is just on the fencepost, and if it is coming from a file rather than standard input, splitmail will sometimes estimate the number of parts wrong and will have to write out an extra part.  This is harmless but annoying.  It is especially annoying if the estimate was 2 but the real number was 1.
++If the size of the input is just on the fencepost, and if it is coming from a file rather than standard input, \fBsplitmail\fR will sometimes estimate the number of parts wrong and will have to write out an extra part.  This is harmless but annoying.  It is especially annoying if the estimate was 2 but the real number was 1.
+ .SH COPYRIGHT
+ Copyright (c) 1992 Bell Communications Research, Inc. (Bellcore)
+ 
+--- metamail-2.7.orig/man/patch-metamail.1
++++ metamail-2.7/man/patch-metamail.1
+@@ -8,7 +8,7 @@
+ .SH DESCRIPTION
+ The
+ .I patch-metamail
+-program will attempt to retreive a patch file for the metamail distribution, using anonymous ftp to a trusted server, and then install that patch in your local copy of the distribution.
++program will attempt to retrieve a patch file for the metamail distribution, using anonymous ftp to a trusted server, and then install that patch in your local copy of the distribution.
+ 
+ The first two arguments, which are required, are the root directory of your local copy of the metamail source directory, and the patch number.  The former is site-dependent, the latter is patch-dependent.
+ 
+--- metamail-2.7.orig/man/uudepipe.1
++++ metamail-2.7/man/uudepipe.1
+@@ -0,0 +1,24 @@
++.TH UUDEPIPE 1 "1998 March 2nd" "METAMAIL" "Debian Linux Manual"
++.SH NAME
++uudepipe \- uudecode a file
++.SH SYNOPSIS
++.B uudepipe
++.RI [ filename ]
++.SH "DESCRIPTION"
++This manual page documents briefly the
++.B uudepipe
++command.
++This manual page was written for the
++.B Debian GNU/Linux
++distribution (but may be used by others), because the original
++program does not have a manual page.
++.PP
++.B uudepipe
++uudecodes
++.I filename
++(or the standard input if
++.I filename
++were not supplied) and prints the result to the standard output.
++.SH AUTHOR
++.B uudepipe
++is part of mm package.  Manual page added by Herbert Xu.
+--- metamail-2.7.orig/man/mmencode.1
++++ metamail-2.7/man/mmencode.1
+@@ -1,8 +1,6 @@
+ .TH MIMENCODE 1 "Release 1" "Bellcore Prototype"
+ .SH NAME
+ mimencode - Translate to and from mail-oriented encoding formats
+-
+-(Same program also installed as "mmencode".)
+ .SH SYNOPSIS
+ .ta 8n
+ \fBmimencode\fP	[-u] [-b] [-q] [-p] [file name] [-o outputfile]
+@@ -37,8 +35,6 @@
+ for mail and news use.  The reason is simple:  uuencode doesn't work very well in a number of circumstances and ways.  In particular, uuencode uses characters that don't translate well across all mail gateways (particularly ASCII <-> EBCDIC gateways).  Also, uuencode is not standard -- there are several variants floating around, encoding and decoding things in different and incompatible ways, with no "standard" on which to base an implementation.  Finally, uuencode does not generally work well in a pipe, although some variants have been modified to do so.  Mimencode implements the encodings which were defined for MIME as uuencode replacements, and should be considerably more robust for email use.
+ .SH SEE ALSO
+ metamail(1), mailto(1)
+-.SH BUGS
+-This program was originally distributed as "mmencode".  That name turns out to conflict with a program of the same name that is part of the Slate software from BBN, but totally changing the name to mimencode would create other problems (notably with portability to systems where the left half of file names is limited to 8 characters).  Currently, it is being distributed with links under BOTH names.  The programs in the distribution that call the program all call it as "mimencode", so the "mmencode" version may be deleted at sites where it causes a problem.  (The source files are still named "mmencode" rather than "mimencode".)
+ .SH COPYRIGHT
+ Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
+ 
+--- metamail-2.7.orig/man/mailcap.5
++++ metamail-2.7/man/mailcap.5
+@@ -0,0 +1,69 @@
++.TH MAILCAP 5 "Release 2" "Bellcore Prototype"
++.SH NAME
++mailcap - metamail capabilities file
++.SH DESCRIPTION
++The
++.I mailcap
++file is read by the 
++.I metamail
++program to determine how to display non-text at the local site.
++
++The syntax of a mailcap file is quite simple, at least compared to termcap files.  Any line that starts with "#" is a comment.  Blank lines are ignored.  Otherwise, each line defines a single mailcap entry for a single content type.  Long lines may be continued by ending them with a backslash character, \\.
++
++Each individual mailcap entry consists of a content-type specification, a command to execute, and (possibly) a set of optional "flag" values.  For example, a very simple mailcap entry (which is actually a built-in default behavior for metamail) would look like this:
++
++text/plain; cat %s
++
++The optional flags can be used to specify additional information about the mail-handling command.  For example:
++
++text/plain; cat %s; copiousoutput
++
++can be used to indicate that the output of the 'cat' command may be voluminous, requiring either a scrolling window, a pager, or some other appropriate coping mechanism.
++
++The "type" field (text/plain, in the above example) is simply any legal content type name, as defined by informational RFC 1524.  In practice, this is almost any string.  It is the string that will be matched against the "Content-type" header (or the value passed in with -c) to decide if this is the mailcap entry that matches the current message.  Additionally, the type field may specify a subtype (e.g. "text/ISO-8859-1") or a wildcard to match all subtypes (e.g. "image/*").
++
++The "command" field is any UNIX command ("cat %s" in the above example), and is used to specify the interpreter for the given type of message.  It will be passed to the shell via the system(3) facility.  Semicolons and backslashes within the command must be quoted with backslashes.  If the command contains "%s", those two characters will be replaced by the name of a file that contains the body of the message. If it contains "%t', those two characters will be replaced by the content-type field, including the subtype, if any.  (That is, if the content-type was "image/pbm; opt1=something-else", then "%t" would be replaced by "image/pbm".)   If the command field contains  "%{" followed by a parameter name and a closing "}", then all those characters will be replaced by the value of the named parameter, if any, from the Content-type header.   Thus, in the previous example, "%{opt1}" will be replaced by "something-else".  Finally, if the command contains "\%", those two characters will be replaced by a single % character.  (In fact, the backslash can be used to quote any character, including itself.)
++
++If no "%s" appears in the command field, then instead of placing the message body in a temporary file, metamail will pass the body to the command on the standard input.  This is helpful in saving /tmp file space, but can be problematic for window-oriented applications under some window systems such as MGR.
++
++Two special codes can appear in the viewing command for objects of type multipart (any subtype).  These are "%n" and "%F".  %n will be replaced by the number of parts within the multipart object.  %F will be replaced by a series of arguments, two for each part, giving first the content-type and then the name of the temporary file where the decoded part has been stored.  In addition, for each file created by %F, a second file is created, with the same name followed by "H", which contains the header information for that body part.  This will not be needed by most multipart handlers, but it is there if you ever need it.  
++
++The "notes=xxx" field is an uninterpreted string that is used to specify the name of the person who installed this entry in the mailcap file.  (The "xxx" may be replaced by any text string.)
++
++The "test=xxx" field is a command that is executed to determine whether or not the mailcap line actually applies.  That is, if the content-type field matches the content-type on the message, but a "test=" field is present, then the test must succeed before the mailcap line is considered to "match" the message being viewed.  The command may be any UNIX command, using the same syntax and the same %-escapes as for the viewing command, as described above.  A command is considered to succeed if it exits with a zero exit status, and to fail otherwise.
++
++The "print=xxx" field is a command that is executed to print the data instead of display it interactively.  This behavior is usually a consequence of invoking metamail with the "-h" switch.
++
++The "textualnewlines" field can be used in the rather obscure case where metamail's default rules for treating newlines in base64-encoded data are unsatisfactory.  By default, metamail will translate CRLF to the local newline character in decoded base64 output if the content-type is "text" (any subtype), but will not do so otherwise.  A mailcap entry with a field of "textualnewlines=1" will force such translation for the specified content-type, while "textualnewlines=0" will guarantee that the translation does not take place even for textual content-types.
++
++The "compose" field may be used to specify a program that can be used to compose a new body or body part in the given format.  Its intended use is to support mail composing agents that support the composition of multiple types of mail using external composing agents. As with the view-command, the compose command will be executed after replacing certain escape sequences starting with "%".  In particular, %s should be replaced by the name of a file to which the composed data is to be written by the specified composing program, thus allowing th3e calling program (e.g. metamail) to tell the called program where to store the composed data.  If %s does not appear, then the composed data will be assumed to be written by the composing programs to standard output.   The result of the composing program may be data that is NOT yet suitable for mail transport -- that is, a Content-Transfer-Encoding may still need to be applied to the data.
++
++The "composetyped" field is similar to the "compose" field, but is to be used when the composing program needs to specify the Content-type header field to be applied to the composed data.  The "compose" field is simpler, and is preferred for use with existing (non-mail-oriented) programs for composing data in a given format.  The "composetyped" field is necessary when the Content-type information must include auxilliary parameters, and the composition program must then know enough about mail formats to produce output that includes the mail type information, and to apply any necessary Content-Transfer-Encoding.   Conceptually, "compose" specifies a program that simply outputs the specified type of data in its raw form, while "composetyped" specifies a program that outputs the data as a MIME object, with all necessary Content-* headers already in place.
++
++.TP 8
++.B needsterminal
++If this flag is given, the named interpreter needs to interact with the user on a terminal.  In some environments (e.g. a window-oriented mail reader under X11) this will require the creation of a new terminal emulation window, while in most environments it will not.  If the mailcap entry specifies "needsterminal" and metamail is not running on a terminal (as determined by isatty(3), the -x option, and the MM_NOTTTY environment variable) then metamail will try to run the command in a new terminal emulation window.  Currently, metamail knows how to create new windows under the X11, SunTools, and WM window systems.
++.TP 8
++.B copiousoutput
++This flag should be given whenever the interpreter is capable of producing more than a few lines of output on stdout, and does no interaction with the user.  If the mailcap entry specifies copiousoutput, and pagination has been requested via the "-p" command, then the output of the command being executed will be piped through a pagination program ("more" by default, but this can be overridden with the METAMAIL_PAGER environment variable).
++.SH BUILT-IN CONTENT-TYPE SUPPORT
++The metamail program has built-in support for a few key content-types.  In particular, it supports the text type, the multipart and multipart/alternative type, and the message/rfc822 types.  This support is incomplete for many subtypes -- for example, it only supports US-ASCII text in general.  This kind of built-in support can be OVERRIDDEN by an entry in any mailcap file on the user's search path.  Metamail also has rudimentary built-in support for types that are totally unrecognized -- i.e. for which no mailcap entry or built-in handler exists.  For such unrecognized types, metamail will write a file with a "clean" copy of the data -- i.e. a copy in which all mail headers have been removed, and in which any 7-bit transport encoding has been decoded.
++.SH FILES
++$HOME/.mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap -- default path for mailcap files.
++.SH SEE ALSO
++metamail(1)
++.SH COPYRIGHT
++Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++
++Permission to use, copy, modify, and distribute this material 
++for any purpose and without fee is hereby granted, provided 
++that the above copyright notice and this permission notice 
++appear in all copies, and that the name of Bellcore not be 
++used in advertising or publicity pertaining to this 
++material without the specific, prior written permission 
++of an authorized representative of Bellcore.  BELLCORE 
++MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++.SH AUTHOR
++Nathaniel S. Borenstein
+--- metamail-2.7.orig/man/mailcap.4
++++ metamail-2.7/man/mailcap.4
+@@ -20,13 +20,9 @@
+ 
+ can be used to indicate that the output of the 'cat' command may be voluminous, requiring either a scrolling window, a pager, or some other appropriate coping mechanism.
+ 
+-The "type" field (text/plain, in the above example) is simply any legal content type name, as defined by RFC 822.  In practice, this is almost any string.  It is the string that will be matched against the "Content-type" header (or the value passed in with -c) to decide if this is the mailcap entry that matches the current message.  Additionally, the type field may specify a subtype (e.g. "text/ISO-8859-1") or a wildcard to match all subtypes (e.g. "image/*").
++The "type" field (text/plain, in the above example) is simply any legal content type name, as defined by informational RFC 1524.  In practice, this is almost any string.  It is the string that will be matched against the "Content-type" header (or the value passed in with -c) to decide if this is the mailcap entry that matches the current message.  Additionally, the type field may specify a subtype (e.g. "text/ISO-8859-1") or a wildcard to match all subtypes (e.g. "image/*").
+ 
+-The "command" field is any UNIX command ("cat %s" in the above example), and is used to specify the interpreter for the given type of message.  It will be passed to the shell via the system(3) facility.  Semicolons and backslashes within the command must be quoted with backslashes.  If the command contains "%s", those two characters will be replaced by the name of a file that contains the body of the message. If it contains "%t', those two characters will be replaced by the content-type field, including the subtype, if any.  (That is, if the content-type was "image/pbm; opt1=something-else", then "%t" would be replaced by "image/pbm".)   If the command field contains  "%{" followed by a parameter name and a closing "}", then all those characters will be replaced by the value of the named parameter, if any, from the Content-type header.   Thus, in the previous example, "%{opt1}" will be replaced by "something-else".  Finally, if the command contains "\%", those two characters will be replaced by a single % ch
+-
+-
+-
+-aracter.  (In fact, the backslash can be used to quote any character, including itself.)
++The "command" field is any UNIX command ("cat %s" in the above example), and is used to specify the interpreter for the given type of message.  It will be passed to the shell via the system(3) facility.  Semicolons and backslashes within the command must be quoted with backslashes.  If the command contains "%s", those two characters will be replaced by the name of a file that contains the body of the message. If it contains "%t', those two characters will be replaced by the content-type field, including the subtype, if any.  (That is, if the content-type was "image/pbm; opt1=something-else", then "%t" would be replaced by "image/pbm".)   If the command field contains  "%{" followed by a parameter name and a closing "}", then all those characters will be replaced by the value of the named parameter, if any, from the Content-type header.   Thus, in the previous example, "%{opt1}" will be replaced by "something-else".  Finally, if the command contains "\%", those two characters will be replaced by a single % character.  (In fact, the backslash can be used to quote any character, including itself.)
+ 
+ If no "%s" appears in the command field, then instead of placing the message body in a temporary file, metamail will pass the body to the command on the standard input.  This is helpful in saving /tmp file space, but can be problematic for window-oriented applications under some window systems such as MGR.
+ 
+--- metamail-2.7.orig/man/metasend.1
++++ metamail-2.7/man/metasend.1
+@@ -12,7 +12,7 @@
+ 
+ With no arguments, the program will ask the user for the To, Subject, and CC fields.  It will then ask for the name of a MIME content-type.  Next, it will ask the user for the name of an existing file containing that type of data.  After this, it will ask what encoding type, if any, should be applied to this data.  Finally, it  will ask if the user wants to  include information  from an additional file, in which case the last three questions will be repeated for  the next file.
+ 
+-Alternately, all of this information can be provided on the comand line, using the following options:
++Alternately, all of this information can be provided on the command line, using the following options:
+ 
+     -b -- specifies Batch (non-interactive) Mode.  Will exit with an error message if all additional needed information is not provided on the command line.
+     -c cc -- specifies the CC address
+--- metamail-2.7.orig/metamail/xstrerror.c
++++ metamail-2.7/metamail/xstrerror.c
+@@ -0,0 +1,32 @@
++/* xstrerror.c -- strerror wrapper with bound checking
++   Fri Jun 16 18:30:00 1995  Pat Rankin  <rankin@eql.caltech.edu>
++   This code is in the public domain.
++*/
++
++#if HAVE_CONFIG_H
++#  include <config.h>
++#endif
++
++#include "common.h"
++
++extern char *strerror ();
++
++/* If strerror returns NULL, we'll format the number into a static buffer.  */
++#define ERRSTR_FMT "undocumented error #%d"
++static char xstrerror_buf[sizeof ERRSTR_FMT + 20];
++
++/* Like strerror, but result is never a null pointer.  */
++char *
++xstrerror (int errnum)
++{
++  char *errstr = strerror (errnum);
++
++  /* If `errnum' is out of range, result might be NULL.  We'll fix that.  */
++  if (!errstr)
++    {
++      sprintf (xstrerror_buf, ERRSTR_FMT, errnum);
++      errstr = xstrerror_buf;
++    }
++
++  return errstr;
++}
+--- metamail-2.7.orig/metamail/xstrdup.c
++++ metamail-2.7/metamail/xstrdup.c
+@@ -0,0 +1,35 @@
++/* xstrdup.c -- strdup implementation with out of memory reporting
++   Copyright (C) 2000 Gary V. Vaughan
++  
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2, or (at your option)
++   any later version.
++  
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++  
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++*/
++
++#ifndef WITH_DMALLOC
++
++#if HAVE_CONFIG_H
++# include <config.h>
++#endif
++
++#include "common.h"
++
++char *
++xstrdup (string)
++     const char *string;
++{
++  return string ? strcpy (xmalloc (strlen (string) + 1), string) : NULL;
++}
++
++#endif /* !WITH_DMALLOC */
++
+--- metamail-2.7.orig/metamail/config.h.in
++++ metamail-2.7/metamail/config.h.in
+@@ -0,0 +1,119 @@
++/* metamail/config.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
++
++/* Define to empty if the keyword does not work.  */
++#undef const
++
++/* Define to `unsigned' if <sys/types.h> doesn't define.  */
++#undef size_t
++
++/* Define if you have the ANSI C header files.  */
++#undef STDC_HEADERS
++
++/* Define if you can safely include both <sys/time.h> and <time.h>.  */
++#undef TIME_WITH_SYS_TIME
++
++/* Define if you have the basename function.  */
++#undef HAVE_BASENAME
++
++/* Define if you have the bcmp function.  */
++#undef HAVE_BCMP
++
++/* Define if you have the bcopy function.  */
++#undef HAVE_BCOPY
++
++/* Define if you have the bzero function.  */
++#undef HAVE_BZERO
++
++/* Define if you have the calloc function.  */
++#undef HAVE_CALLOC
++
++/* Define if you have the index function.  */
++#undef HAVE_INDEX
++
++/* Define if you have the initstate function.  */
++#undef HAVE_INITSTATE
++
++/* Define if you have the kill function.  */
++#undef HAVE_KILL
++
++/* Define if you have the killpg function.  */
++#undef HAVE_KILLPG
++
++/* Define if you have the memcmp function.  */
++#undef HAVE_MEMCMP
++
++/* Define if you have the memcpy function.  */
++#undef HAVE_MEMCPY
++
++/* Define if you have the memset function.  */
++#undef HAVE_MEMSET
++
++/* Define if you have the putenv function.  */
++#undef HAVE_PUTENV
++
++/* Define if you have the rand function.  */
++#undef HAVE_RAND
++
++/* Define if you have the random function.  */
++#undef HAVE_RANDOM
++
++/* Define if you have the rindex function.  */
++#undef HAVE_RINDEX
++
++/* Define if you have the srand function.  */
++#undef HAVE_SRAND
++
++/* Define if you have the strchr function.  */
++#undef HAVE_STRCHR
++
++/* Define if you have the strerror function.  */
++#undef HAVE_STRERROR
++
++/* Define if you have the strrchr function.  */
++#undef HAVE_STRRCHR
++
++/* Define if you have the vfprintf function.  */
++#undef HAVE_VFPRINTF
++
++/* Define if you have the <assert.h> header file.  */
++#undef HAVE_ASSERT_H
++
++/* Define if you have the <dlfcn.h> header file.  */
++#undef HAVE_DLFCN_H
++
++/* Define if you have the <errno.h> header file.  */
++#undef HAVE_ERRNO_H
++
++/* Define if you have the <signal.h> header file.  */
++#undef HAVE_SIGNAL_H
++
++/* Define if you have the <stdarg.h> header file.  */
++#undef HAVE_STDARG_H
++
++/* Define if you have the <stdlib.h> header file.  */
++#undef HAVE_STDLIB_H
++
++/* Define if you have the <string.h> header file.  */
++#undef HAVE_STRING_H
++
++/* Define if you have the <strings.h> header file.  */
++#undef HAVE_STRINGS_H
++
++/* Define if you have the <sys/time.h> header file.  */
++#undef HAVE_SYS_TIME_H
++
++/* Define if you have the <time.h> header file.  */
++#undef HAVE_TIME_H
++
++/* Define if you have the <unistd.h> header file.  */
++#undef HAVE_UNISTD_H
++
++/* Define if you have the <varargs.h> header file.  */
++#undef HAVE_VARARGS_H
++
++/* Name of package */
++#undef PACKAGE
++
++/* Version number of package */
++#undef VERSION
++
+--- metamail-2.7.orig/metamail/Makefile.am
++++ metamail-2.7/metamail/Makefile.am
+@@ -0,0 +1,27 @@
++MAINTAINERCLEANFILES	= Makefile.in
++
++INCLUDES 		= -I$(top_builddir) -I$(top_srcdir)
++
++pkginclude_HEADERS	= common.h error.h
++
++lib_LTLIBRARIES		= libmetamail.la
++
++libmetamail_la_SOURCES	= error.c dlist.c xmalloc.c xstrerror.c \
++			xstrdup.c 
++
++common.h: stamp-common
++	@:
++stamp-common: $(srcdir)/common-h.in $(top_builddir)/config.status
++	cd $(top_builddir) \
++	  && CONFIG_FILES= CONFIGHEADERS= CONFIG_OTHER=metamail/common.h \
++	  $(SHELL) ./config.status
++	echo timestamp > $@
++
++dist-hook:
++	rm -f $(distdir)/common.h
++
++
++
++
++
++
+--- metamail-2.7.orig/metamail/common.h
++++ metamail-2.7/metamail/common.h
+@@ -0,0 +1,203 @@
++/*  -*- Mode: C -*-
++ * --------------------------------------------------------------------
++ * DO NOT EDIT THIS FILE!  It has been automatically generated
++ * from:    configure.in and common.h.in
++ * on host: diziet
++ * --------------------------------------------------------------------
++ */
++
++#ifndef METAMAIL_COMMON_H
++#define METAMAIL_COMMON_H 1
++
++#include <stdio.h>
++#include <ctype.h>        // ??? ok here
++#include <sys/types.h>
++#include <sys/stat.h>     // ??? ok here
++
++// ??? following ok here without check?
++#include <pwd.h>
++#include <sys/time.h>
++#include <sys/types.h>
++#include <sys/file.h>
++#include <signal.h>
++
++#include <termio.h>
++#include <fcntl.h>
++#include <sys/utsname.h>
++
++#include <linux/limits.h>
++
++#include <stdlib.h>
++#include <unistd.h>
++#include <errno.h>
++
++#ifndef errno
++/* Some sytems #define this! */
++extern int errno;
++#endif
++
++#include <string.h>
++
++#include <stdarg.h>
++#ifndef VA_START
++#  define VA_START(a, f) va_start(a, f)
++#endif /* VA_START */
++
++
++#include <assert.h>
++#define METAMAIL_ASSERT assert
++
++
++#if TIME_WITH_SYS_TIME
++# include <sys/time.h>
++# include <time.h>
++#else
++# if HAVE_SYS_TIME_H
++#  include <sys/time.h>
++# else
++#  include <time.h>
++# endif
++#endif
++
++#ifndef PARAMS
++#  if __STDC__
++#    ifndef NOPROTOS
++#      define PARAMS(args)        args
++#    endif
++#  endif
++#  ifndef PARAMS
++#    define PARAMS(args)          ()
++#  endif
++#endif
++
++#ifndef EXIT_SUCCESS
++#  define EXIT_SUCCESS  0
++#  define EXIT_FAILURE  1
++#endif
++      
++#ifdef __cplusplus
++#  define BEGIN_C_DECLS         extern "C" {
++#  define END_C_DECLS           }
++#else
++#  define BEGIN_C_DECLS
++#  define END_C_DECLS
++#endif
++
++#ifdef __GNUC__
++#  ifndef const
++#    define const       __const
++#  endif
++#  ifndef signed
++#    define signed      __signed
++#  endif
++#  ifndef volatile
++#    define volatile    __volatile
++#  endif
++#else
++#  ifdef __STDC__
++#    undef  signed
++#    define signed
++#    undef  volatile
++#    define volatile
++#  endif
++#endif
++
++#ifdef __STDC__
++#  define STR(x)          #x
++#  define CONC(x, y)      x##y
++   typedef void* sic_ptr;
++#else
++#  define STR(x)          "x"
++#  define CONC(x, y)      x/**/y
++   typedef char* sic_ptr;
++#endif
++
++
++#define XCALLOC(type, num)      ((type *) xcalloc ((num), sizeof(type)))
++#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
++#define XREALLOC(type, p, num)  ((type *) xrealloc ((p), (num) * sizeof(type)))
++#define XFREE(stale)                            do {        \
++              if (stale) { free ((sic_ptr) stale);  stale = 0; }    \
++                                                      } while (0)
++
++
++BEGIN_C_DECLS
++
++extern void *xcalloc    (size_t num, size_t size);
++extern void *xmalloc    (size_t num);
++extern void *xrealloc   (void *p, size_t num);
++extern char *xstrdup    (const char *string);
++extern char *xstrerror  (int errnum);
++
++END_C_DECLS
++
++#if WITH_DMALLOC
++#  include <dmalloc.h>
++#endif
++
++//metamail specific stuff below (this are the additions from Michael Moerz)
++
++#define RESET_PROGRAM "/usr/bin/reset"
++
++//#define NO_RLIMITS 1
++#define sigtype void
++
++/* This constant should define the ASCII code for newlines on systems where 
++   the newline convention is other than CRLF.  On UNIX, it is ^J, ASCII 10. 
++    Here we define it as '\n' which should be right on MOST systems... */
++#define NEWLINE_CHAR '\n'
++
++/* The following defines the default size at which long
++    messages will be split into multiple messages of type
++    "message/partial" by the mailto and splitmail commands,
++    at least. */
++#ifndef DEFAULT_SPLIT_SIZE
++#define DEFAULT_SPLIT_SIZE 250000
++#endif
++
++#define PATH_SEPARATOR ':'
++#ifndef STDPATH
++#define STDPATH "/.mailcap:/usr/local/etc/mailcap:/usr/etc/mailcap:/etc/mailcap:/etc/mail/mailcap:/usr/public/lib/mailcap"
++#endif
++
++/* The following can be set to a directory or colon-separated list of 
++  directories that will be prepended to the user's search path before 
++  executing any mailcap-derived commands. 
++
++  It should be set to NULL if there are no directories to prepend.  
++*/
++
++#define AUXPATH NULL
++
++
++#define TMPFILE_NAME_SIZE   1000
++#define MAX_FILE_NAME_SIZE 1000
++
++BEGIN_C_DECLS
++
++extern char **environ, *gets();
++
++extern char *getenv();
++extern char *index();
++extern char *rindex();
++
++extern FILE *popen();
++
++END_C_DECLS
++
++//#ifndef NO_RLIMITS
++//#include <sys/resource.h>
++//#endif
++
++
++
++#define LPRCOMMAND "lp"
++#define LPRTEMPLATE "lp %s"
++#define CATCOMMAND "cat"
++#define CATTEMPLATE "cat %s"
++#define TMPNAME_MAX NAME_MAX
++static struct termio MyTtyStateIn, MyTtyStateOut;
++
++
++
++#endif /* !METAMAIL_COMMON_H */
+--- metamail-2.7.orig/metamail/Makefile.in
++++ metamail-2.7/metamail/Makefile.in
+@@ -0,0 +1,426 @@
++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
++
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++
++SHELL = @SHELL@
++
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
++
++DESTDIR =
++
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++
++top_builddir = ..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
++INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++transform = @program_transform_name@
++
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++host_alias = @host_alias@
++host_triplet = @host@
++AS = @AS@
++CATCOMMAND = @CATCOMMAND@
++CC = @CC@
++DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
++EXEEXT = @EXEEXT@
++LIBTOOL = @LIBTOOL@
++LIBTOOL_DEPS = @LIBTOOL_DEPS@
++LN_S = @LN_S@
++LPRCOMMAND = @LPRCOMMAND@
++LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAKEINFO = @MAKEINFO@
++OBJDUMP = @OBJDUMP@
++OBJEXT = @OBJEXT@
++PACKAGE = @PACKAGE@
++RANLIB = @RANLIB@
++STRIP = @STRIP@
++VERSION = @VERSION@
++ac_aux_dir = @ac_aux_dir@
++
++MAINTAINERCLEANFILES = Makefile.in
++
++INCLUDES = -I$(top_builddir) -I$(top_srcdir)
++
++pkginclude_HEADERS = common.h error.h
++
++lib_LTLIBRARIES = libmetamail.la
++
++libmetamail_la_SOURCES = error.c dlist.c xmalloc.c xstrerror.c 			xstrdup.c 
++
++mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
++CONFIG_HEADER = config.h
++CONFIG_CLEAN_FILES = 
++LTLIBRARIES =  $(lib_LTLIBRARIES)
++
++
++DEFS = @DEFS@ -I. -I$(srcdir) -I.
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++libmetamail_la_LDFLAGS = 
++libmetamail_la_LIBADD = 
++libmetamail_la_OBJECTS =  error.lo dlist.lo xmalloc.lo xstrerror.lo \
++xstrdup.lo
++CFLAGS = @CFLAGS@
++COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
++HEADERS =  $(pkginclude_HEADERS)
++
++DIST_COMMON =  ./stamp-h.in Makefile.am Makefile.in config.h.in
++
++
++DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
++
++TAR = tar
++GZIP_ENV = --best
++DEP_FILES =  .deps/dlist.P .deps/error.P .deps/xmalloc.P .deps/xstrdup.P \
++.deps/xstrerror.P
++SOURCES = $(libmetamail_la_SOURCES)
++OBJECTS = $(libmetamail_la_OBJECTS)
++
++all: all-redirect
++.SUFFIXES:
++.SUFFIXES: .S .c .lo .o .obj .s
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
++	cd $(top_srcdir) && $(AUTOMAKE) --foreign metamail/Makefile
++
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
++	cd $(top_builddir) \
++	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
++
++
++config.h: stamp-h
++	@if test ! -f $@; then \
++		rm -f stamp-h; \
++		$(MAKE) stamp-h; \
++	else :; fi
++stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
++	cd $(top_builddir) \
++	  && CONFIG_FILES= CONFIG_HEADERS=metamail/config.h \
++	     $(SHELL) ./config.status
++	@echo timestamp > stamp-h 2> /dev/null
++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in
++	@if test ! -f $@; then \
++		rm -f $(srcdir)/stamp-h.in; \
++		$(MAKE) $(srcdir)/stamp-h.in; \
++	else :; fi
++$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
++	cd $(top_srcdir) && $(AUTOHEADER)
++	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
++
++mostlyclean-hdr:
++
++clean-hdr:
++
++distclean-hdr:
++	-rm -f config.h
++
++maintainer-clean-hdr:
++
++mostlyclean-libLTLIBRARIES:
++
++clean-libLTLIBRARIES:
++	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
++
++distclean-libLTLIBRARIES:
++
++maintainer-clean-libLTLIBRARIES:
++
++install-libLTLIBRARIES: $(lib_LTLIBRARIES)
++	@$(NORMAL_INSTALL)
++	$(mkinstalldirs) $(DESTDIR)$(libdir)
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	  if test -f $$p; then \
++	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
++	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
++	  else :; fi; \
++	done
++
++uninstall-libLTLIBRARIES:
++	@$(NORMAL_UNINSTALL)
++	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
++	done
++
++# FIXME: We should only use cygpath when building on Windows,
++# and only if it is available.
++.c.obj:
++	$(COMPILE) -c `cygpath -w $<`
++
++.s.o:
++	$(COMPILE) -c $<
++
++.S.o:
++	$(COMPILE) -c $<
++
++mostlyclean-compile:
++	-rm -f *.o core *.core
++	-rm -f *.$(OBJEXT)
++
++clean-compile:
++
++distclean-compile:
++	-rm -f *.tab.c
++
++maintainer-clean-compile:
++
++.s.lo:
++	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++
++.S.lo:
++	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++
++mostlyclean-libtool:
++	-rm -f *.lo
++
++clean-libtool:
++	-rm -rf .libs _libs
++
++distclean-libtool:
++
++maintainer-clean-libtool:
++
++libmetamail.la: $(libmetamail_la_OBJECTS) $(libmetamail_la_DEPENDENCIES)
++	$(LINK) -rpath $(libdir) $(libmetamail_la_LDFLAGS) $(libmetamail_la_OBJECTS) $(libmetamail_la_LIBADD) $(LIBS)
++
++install-pkgincludeHEADERS: $(pkginclude_HEADERS)
++	@$(NORMAL_INSTALL)
++	$(mkinstalldirs) $(DESTDIR)$(pkgincludedir)
++	@list='$(pkginclude_HEADERS)'; for p in $$list; do \
++	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
++	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p"; \
++	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p; \
++	done
++
++uninstall-pkgincludeHEADERS:
++	@$(NORMAL_UNINSTALL)
++	list='$(pkginclude_HEADERS)'; for p in $$list; do \
++	  rm -f $(DESTDIR)$(pkgincludedir)/$$p; \
++	done
++
++tags: TAGS
++
++ID: $(HEADERS) $(SOURCES) $(LISP)
++	list='$(SOURCES) $(HEADERS)'; \
++	unique=`for i in $$list; do echo $$i; done | \
++	  awk '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	here=`pwd` && cd $(srcdir) \
++	  && mkid -f$$here/ID $$unique $(LISP)
++
++TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
++	tags=; \
++	here=`pwd`; \
++	list='$(SOURCES) $(HEADERS)'; \
++	unique=`for i in $$list; do echo $$i; done | \
++	  awk '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
++	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP))
++
++mostlyclean-tags:
++
++clean-tags:
++
++distclean-tags:
++	-rm -f TAGS ID
++
++maintainer-clean-tags:
++
++distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
++
++subdir = metamail
++
++distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign metamail/Makefile
++	@for file in $(DISTFILES); do \
++	  d=$(srcdir); \
++	  if test -d $$d/$$file; then \
++	    cp -pr $$d/$$file $(distdir)/$$file; \
++	  else \
++	    test -f $(distdir)/$$file \
++	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
++	    || cp -p $$d/$$file $(distdir)/$$file || :; \
++	  fi; \
++	done
++	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
++
++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
++
++-include $(DEP_FILES)
++
++mostlyclean-depend:
++
++clean-depend:
++
++distclean-depend:
++	-rm -rf .deps
++
++maintainer-clean-depend:
++
++%.o: %.c
++	@echo '$(COMPILE) -c $<'; \
++	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
++
++%.lo: %.c
++	@echo '$(LTCOMPILE) -c $<'; \
++	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
++	  < .deps/$(*F).pp > .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm -f .deps/$(*F).pp
++info-am:
++info: info-am
++dvi-am:
++dvi: dvi-am
++check-am: all-am
++check: check-am
++installcheck-am:
++installcheck: installcheck-am
++all-recursive-am: config.h
++	$(MAKE) $(AM_MAKEFLAGS) all-recursive
++
++install-exec-am: install-libLTLIBRARIES
++install-exec: install-exec-am
++
++install-data-am: install-pkgincludeHEADERS
++install-data: install-data-am
++
++install-am: all-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++install: install-am
++uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgincludeHEADERS
++uninstall: uninstall-am
++all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h
++all-redirect: all-am
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
++installdirs:
++	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(pkgincludedir)
++
++
++mostlyclean-generic:
++
++clean-generic:
++
++distclean-generic:
++	-rm -f Makefile $(CONFIG_CLEAN_FILES)
++	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
++
++maintainer-clean-generic:
++	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
++mostlyclean-am:  mostlyclean-hdr mostlyclean-libLTLIBRARIES \
++		mostlyclean-compile mostlyclean-libtool \
++		mostlyclean-tags mostlyclean-depend mostlyclean-generic
++
++mostlyclean: mostlyclean-am
++
++clean-am:  clean-hdr clean-libLTLIBRARIES clean-compile clean-libtool \
++		clean-tags clean-depend clean-generic mostlyclean-am
++
++clean: clean-am
++
++distclean-am:  distclean-hdr distclean-libLTLIBRARIES distclean-compile \
++		distclean-libtool distclean-tags distclean-depend \
++		distclean-generic clean-am
++	-rm -f libtool
++
++distclean: distclean-am
++
++maintainer-clean-am:  maintainer-clean-hdr \
++		maintainer-clean-libLTLIBRARIES \
++		maintainer-clean-compile maintainer-clean-libtool \
++		maintainer-clean-tags maintainer-clean-depend \
++		maintainer-clean-generic distclean-am
++	@echo "This command is intended for maintainers to use;"
++	@echo "it deletes files that may require special tools to rebuild."
++
++maintainer-clean: maintainer-clean-am
++
++.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
++mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
++clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
++uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
++distclean-compile clean-compile maintainer-clean-compile \
++mostlyclean-libtool distclean-libtool clean-libtool \
++maintainer-clean-libtool uninstall-pkgincludeHEADERS \
++install-pkgincludeHEADERS tags mostlyclean-tags distclean-tags \
++clean-tags maintainer-clean-tags distdir mostlyclean-depend \
++distclean-depend clean-depend maintainer-clean-depend info-am info \
++dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
++install-exec-am install-exec install-data-am install-data install-am \
++install uninstall-am uninstall all-redirect all-am all installdirs \
++mostlyclean-generic distclean-generic clean-generic \
++maintainer-clean-generic clean mostlyclean distclean maintainer-clean
++
++
++common.h: stamp-common
++	@:
++stamp-common: $(srcdir)/common-h.in $(top_builddir)/config.status
++	cd $(top_builddir) \
++	  && CONFIG_FILES= CONFIGHEADERS= CONFIG_OTHER=metamail/common.h \
++	  $(SHELL) ./config.status
++	echo timestamp > $@
++
++dist-hook:
++	rm -f $(distdir)/common.h
++
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
+--- metamail-2.7.orig/metamail/xmalloc.c
++++ metamail-2.7/metamail/xmalloc.c
+@@ -0,0 +1,38 @@
++#if HAVE_CONFIG_H
++#  include <config.h>
++#endif
++
++#include "common.h"
++#include "error.h"
++
++void *
++xmalloc (size_t num)
++{
++  void *new = malloc (num);
++  if (!new)
++    metamail_fatal ("Memory exhausted");
++  return new;
++}
++
++void *
++xrealloc (void *p, size_t num)
++{
++  void *new;
++  
++  if (!p)
++    return xmalloc (num);
++  
++  new = realloc (p, num);
++  if (!new)
++    metamail_fatal ("Memory exhausted");
++  
++  return new;
++}
++
++void *
++xcalloc (size_t num, size_t size)
++{
++  void *new = xmalloc (num * size); // is implemented by malloc, cause calloc
++  bzero (new, num * size);          // is not available in some older C libs
++  return new;
++}
+--- metamail-2.7.orig/metamail/error.h
++++ metamail-2.7/metamail/error.h
+@@ -0,0 +1,17 @@
++#ifndef COMMON_ERROR_H
++#define COMMON_ERROR_H 1
++      
++#include <metamail/common.h>
++
++BEGIN_C_DECLS
++      
++extern const char *program_name;
++extern void set_program_name PARAMS((const char *argv0));
++      
++extern void metamail_warning      PARAMS((const char *message, ...));
++extern void metamail_error        PARAMS((const char *message, ...));
++extern void metamail_fatal        PARAMS((const char *message, ...));
++      
++END_C_DECLS
++      
++#endif /* !COMMON_ERROR_H */
+--- metamail-2.7.orig/metamail/patchlevel.h
++++ metamail-2.7/metamail/patchlevel.h
+@@ -0,0 +1,19 @@
++/* This is the metamail distribution, version number as given below.
++
++Version history:
++
++  Version 1.X was Bellcore-internal and pre-MIME.
++  Version 2.0 was the first MIME-compliant release, also Bellcore-internal.
++  Version 2.1 was the first public release, January 1992.
++  Version 2.2 was the second public release, April 1992.  Major changes included:
++      -- Ports to UNIX variants & MS-DOS.
++      -- The new "mailto" program
++      -- Innumerable smaller fixes & enhancements
++  Version 2.3 was the June, 1992 release, with many more patches and 
++      enhancements, including a Commodore Amiga port.
++  Version 2.4 was the December, 1992 release, including many bug fixes and a vastly expanded (and now separately packaged) contrib directory.
++  Version 2.5 was the June, 1993 release, with mostly just bug fixes from 2.4.
++  Version 2.6 was the July, 1993 release, with important bug fixes from 2.5.
++  Version 2.7 was the February, 1994 release, mostly bug fixes.
++*/
++#define MM_VERSTRING "2.7"
+--- metamail-2.7.orig/metamail/common-h.in
++++ metamail-2.7/metamail/common-h.in
+@@ -0,0 +1,162 @@
++## common-h.in -- Process this file with configure to produce common.h
++## Copyright (C) 2000 Gary V. Vaughan
++##
++## addition and changes that were made are Copyright (C) 2000 Michael Moerz
++##
++## This program is free software; you can redistribute it and/or modify
++## it under the terms of the GNU General Public License as published by
++## the Free Software Foundation; either version 2, or (at your option)
++## any later version.
++##  
++## This program is distributed in the hope that it will be useful,
++## but WITHOUT ANY WARRANTY; without even the implied warranty of
++## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++## GNU General Public License for more details.
++##  
++## You should have received a copy of the GNU General Public License
++## along with this program; if not, write to the Free Software
++## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++
++#if TIME_WITH_SYS_TIME
++# include <sys/time.h>
++# include <time.h>
++#else
++# if HAVE_SYS_TIME_H
++#  include <sys/time.h>
++# else
++#  include <time.h>
++# endif
++#endif
++
++#ifndef PARAMS
++#  if __STDC__
++#    ifndef NOPROTOS
++#      define PARAMS(args)        args
++#    endif
++#  endif
++#  ifndef PARAMS
++#    define PARAMS(args)          ()
++#  endif
++#endif
++
++#ifndef EXIT_SUCCESS
++#  define EXIT_SUCCESS  0
++#  define EXIT_FAILURE  1
++#endif
++      
++#ifdef __cplusplus
++#  define BEGIN_C_DECLS         extern "C" {
++#  define END_C_DECLS           }
++#else
++#  define BEGIN_C_DECLS
++#  define END_C_DECLS
++#endif
++
++#ifdef __GNUC__
++#  ifndef const
++#    define const       __const
++#  endif
++#  ifndef signed
++#    define signed      __signed
++#  endif
++#  ifndef volatile
++#    define volatile    __volatile
++#  endif
++#else
++#  ifdef __STDC__
++#    undef  signed
++#    define signed
++#    undef  volatile
++#    define volatile
++#  endif
++#endif
++
++#ifdef __STDC__
++#  define STR(x)          #x
++#  define CONC(x, y)      x##y
++   typedef void* sic_ptr;
++#else
++#  define STR(x)          "x"
++#  define CONC(x, y)      x/**/y
++   typedef char* sic_ptr;
++#endif
++
++
++#define XCALLOC(type, num)      ((type *) xcalloc ((num), sizeof(type)))
++#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
++#define XREALLOC(type, p, num)  ((type *) xrealloc ((p), (num) * sizeof(type)))
++#define XFREE(stale)                            do {        \
++              if (stale) { free ((sic_ptr) stale);  stale = 0; }    \
++                                                      } while (0)
++
++
++BEGIN_C_DECLS
++
++extern void *xcalloc    (size_t num, size_t size);
++extern void *xmalloc    (size_t num);
++extern void *xrealloc   (void *p, size_t num);
++extern char *xstrdup    (const char *string);
++extern char *xstrerror  (int errnum);
++
++END_C_DECLS
++
++#if WITH_DMALLOC
++#  include <dmalloc.h>
++#endif
++
++//metamail specific stuff below (this are the additions from Michael Moerz)
++
++#define RESET_PROGRAM "/usr/bin/reset"
++
++//#define NO_RLIMITS 1
++#define sigtype void
++
++/* This constant should define the ASCII code for newlines on systems where 
++   the newline convention is other than CRLF.  On UNIX, it is ^J, ASCII 10. 
++    Here we define it as '\n' which should be right on MOST systems... */
++#define NEWLINE_CHAR '\n'
++
++/* The following defines the default size at which long
++    messages will be split into multiple messages of type
++    "message/partial" by the mailto and splitmail commands,
++    at least. */
++#ifndef DEFAULT_SPLIT_SIZE
++#define DEFAULT_SPLIT_SIZE 250000
++#endif
++
++#define PATH_SEPARATOR ':'
++#ifndef STDPATH
++#define STDPATH "/.mailcap:/usr/local/etc/mailcap:/usr/etc/mailcap:/etc/mailcap:/etc/mail/mailcap:/usr/public/lib/mailcap"
++#endif
++
++/* The following can be set to a directory or colon-separated list of 
++  directories that will be prepended to the user's search path before 
++  executing any mailcap-derived commands. 
++
++  It should be set to NULL if there are no directories to prepend.  
++*/
++
++#define AUXPATH NULL
++
++
++#define TMPFILE_NAME_SIZE   1000
++#define MAX_FILE_NAME_SIZE 1000
++
++BEGIN_C_DECLS
++
++extern char **environ, *gets();
++
++extern char *getenv();
++extern char *index();
++extern char *rindex();
++
++extern FILE *popen();
++
++END_C_DECLS
++
++//#ifndef NO_RLIMITS
++//#include <sys/resource.h>
++//#endif
++
++
++
+--- metamail-2.7.orig/metamail/stamp-common
++++ metamail-2.7/metamail/stamp-common
+@@ -0,0 +1 @@
++timestamp
+--- metamail-2.7.orig/metamail/dlist.c
++++ metamail-2.7/metamail/dlist.c
+@@ -0,0 +1,176 @@
++#include "common.h"
++#include "dlist.h"
++
++/* null structure to easy initializing to NULL */
++const DList DListNULL = { NULL, NULL };
++
++/* create a new dlist node containing data */
++DListEntry* 
++dlist_new(void* data) {
++  DListEntry* new = XMALLOC( DListEntry, 1 );
++  
++  new->next = NULL;
++  new->prev = NULL;
++  new->data = data;
++
++  return new;
++}
++
++/* concatenate two lists */
++void
++dlist_cat(DList* list1, DList* list2){
++  list1->tail->next = list2->head;
++  list2->head->prev = list1->tail;
++  list1->tail = list2->tail;
++}
++
++/* to shorten things a bit in some cases */
++DListEntry*
++dlist_insertnew(DList* list, void* data, DListEntry* pos) {
++  DListEntry* new = dlist_new( data );
++  return dlist_insert( list, new, pos );
++}
++
++/* can be used to insert an entry at a specific position in a dlist.
++   use with caution on empty list, cause it might fail then. */
++DListEntry*
++dlist_insert(DList* list, DListEntry* new, DListEntry* pos) {
++
++  if ( pos ) { // if pos not null, insert
++    new->next = pos->next;
++    pos->next = new;
++    new->prev = pos;
++  } else if( ! list->head && ! list->tail ) { // otherwise treat as empty
++    new->next = NULL;                         // list
++    new->prev = NULL;
++    list->head = new;
++  } else
++    return NULL;    // not an empty list -> error
++  
++  if ( new->next )  // set tail when tail
++    new->next->prev = new;
++  else
++    list->tail = new;
++  
++  return new;
++}
++
++/* can only be used to append to the end of a list */
++DListEntry*
++dlist_append(DList* list, DListEntry* new) {
++  if ( list->tail ) { // if list tail exists, then link with it
++    new->next = list->tail->next;
++    list->tail->next = new;
++  } else {
++    new->next = NULL;
++    list->head = new;
++  }
++
++  new->prev = list->tail;
++
++  if ( new->next )  // if next is defined, then set its prev value correctly
++    new->next->prev = new;
++  else
++    list->tail = new;
++  
++  return new;
++}
++
++
++
++DListEntry* 
++dlist_insert_sort (DList* list, DListEntry* new, dlist_comp cmp) {
++  
++}
++
++/* retrieves the head of a list */
++DListEntry* 
++dlist_head(DList* list) {
++  DListEntry *help = list->tail;
++  DListEntry *old  = NULL;
++  
++  while( help ) {
++    old = help;
++    help = help->prev;
++  }
++  
++  return old;
++}
++
++/* retrieves the tail of a list */
++DListEntry* 
++dlist_tail(DList* list) {
++  DListEntry *help = list->head;
++  DListEntry *old  = NULL;
++
++  while( help ) {
++    old = help;
++    help = help->next;
++  }
++  
++  return old;
++}
++
++/* returns the length of the list */
++size_t 
++dlist_length(DList* list){
++  DListEntry *help = list->head;
++  size_t n;
++
++  for (n = 0; help; ++n)
++    help = help->next;
++
++  return n;
++}
++
++/* removes an entry from the list, and returns it so that it might
++   be destroyed properly */
++DListEntry*
++dlist_remove(DList* list, DListEntry* entry) {
++  if (entry) {
++    if (entry != list->head) {  // when not head
++      if (entry->prev)       // and a previous entry exists
++	entry->prev->next = entry->next; // tell the previous our next entry
++    } else
++      list->head = entry->next; // otherwise next entry is head
++    
++    if (entry != list->tail) {  // when not tail
++      if (entry->next)       // and next entry exists
++	entry->next->prev = entry->prev; // tell the next entry our previous 
++    } else
++    list->tail = entry->prev; // otherwise previous is tail
++  }
++
++  return entry;
++}
++
++/* checks a list to be ok (debugging) verifies head, tail and prints list */
++dlist_check( DList* list ) {
++  // should be implemented
++}
++
++
++DListEntry*
++dlist_search(DList* list, void* data, dlist_comp cmp) 
++{
++  DListEntry *help = list->head;
++
++  if (list) {
++    while ( help ) {
++      if ( cmp( data, help->data ) == 0 ) 
++	return help;
++      else
++	help = help->next;
++    }
++  }
++  
++  return NULL;
++}
++
++
++int
++dlist_strcmp(void* data1, void* data2)
++{
++  return strcmp( (char*) data1, (char*) data2 );
++}
++
+--- metamail-2.7.orig/metamail/splitmail.c
++++ metamail-2.7/metamail/splitmail.c
+@@ -41,8 +41,8 @@
+ #define VERBOSEDELIVERYCMD VerboseDeliveryCmd
+ #else
+ extern char *getenv();
+-#define NORMALDELIVERYCMD "/usr/lib/sendmail -t -oi"
+-#define VERBOSEDELIVERYCMD "/usr/lib/sendmail -t -v -oi"
++#define NORMALDELIVERYCMD "/usr/sbin/sendmail -t -oi"
++#define VERBOSEDELIVERYCMD "/usr/sbin/sendmail -t -v -oi"
+ #endif
+ 
+ usageexit() {
+@@ -194,7 +194,7 @@
+ 	s = endofheader(from);  /* would be index(from, '\n'),
+ 				 but need to check for continuation lines */
+         *s = '\0';
+-	if (ShareThisHeader(from, SubjectBuf, &OrigID)) {
++	if (ShareThisHeader(from, SubjectBuf, sizeof (SubjectBuf), &OrigID)) {
+ 	    strcat(SharedHeaders, from);
+ 	    strcat(SharedHeaders, "\n");
+ 	}
+@@ -339,9 +339,10 @@
+     NULL
+ };
+ 
+-ShareThisHeader(s, SubjectBuf, OrigID)
++ShareThisHeader(s, SubjectBuf, size, OrigID)
+ char *s;
+ char *SubjectBuf;
++size_t size;
+ char **OrigID;
+ {
+     int i;
+@@ -361,7 +362,8 @@
+     }
+     if (!ULstrcmp(s, "subject")) {
+         *colon = ':';
+-        strcpy(SubjectBuf, ++colon);
++	strncpy(SubjectBuf, ++colon, size);
++	SubjectBuf[size - 1] = '\0';
+         return(0);
+     }
+     if (!ULstrcmp(s, "content-type")) {
+--- metamail-2.7.orig/metamail/stamp-h.in
++++ metamail-2.7/metamail/stamp-h.in
+@@ -0,0 +1 @@
++timestamp
+--- metamail-2.7.orig/metamail/dlist.h
++++ metamail-2.7/metamail/dlist.h
+@@ -0,0 +1,43 @@
++#ifndef COMMON_LIST_H
++#define COMMON_LIST_H 1
++
++#include <metamail/common.h>
++
++BEGIN_C_DECLS
++
++typedef int (*dlist_comp) (void*, void*);
++
++typedef struct dlistentry {
++  struct dlistentry *next;
++  struct dlistentry *prev;
++  void *data;
++} DListEntry;
++
++typedef struct dlist {
++  DListEntry *head;
++  DListEntry *tail;
++} DList;
++
++extern const DList DListNULL;
++
++extern DListEntry *dlist_new         (void* data);
++extern void        dlist_cat         (DList* list1, DList* list2);
++extern DListEntry *dlist_insert_new  (DList* list, void* data,
++				      DListEntry* pos);
++extern DListEntry *dlist_insert      (DList* list, DListEntry* new,
++				      DListEntry* pos);
++extern DListEntry *dlist_insert_sort (DList* list, DListEntry* new, 
++				      dlist_comp cmp);
++extern DListEntry *dlist_append      (DList* list, DListEntry* new);
++extern DListEntry *dlist_head        (DList* list);
++extern DListEntry *dlist_tail        (DList* list);
++extern size_t      dlist_length      (DList* list);
++extern DListEntry *dlist_remove      (DList* list, DListEntry* entry);
++
++extern DListEntry *dlist_search      (DList* list, void* data, dlist_comp cmp);
++
++extern int dlist_strcmp              (void* data1, void* data2);
++
++END_C_DECLS
++
++#endif /* !COMMON_LIST_H */
+--- metamail-2.7.orig/metamail/error.c
++++ metamail-2.7/metamail/error.c
+@@ -0,0 +1,82 @@
++#if HAVE_CONFIG_H
++#  include "config.h"
++#endif
++
++#include "common.h"
++#include "error.h"
++
++#include <libgen.h>  /* basename(3) */
++const char *program_name = NULL;
++      
++static void error PARAMS((int exit_status, const char *mode,
++			  const char *message, va_list ap));
++      
++void
++set_program_name (path)
++     const char *path;
++{
++  METAMAIL_ASSERT (!program_name);
++  program_name = (char*) xstrdup ( (char*) basename (path));
++}
++
++static void
++error (exit_status, mode, message, ap)
++     int exit_status;
++     const char *mode;
++     const char *message;
++     va_list ap;
++{
++  fprintf (stderr, "%s: %s: ", program_name, mode);
++  vfprintf (stderr, message, ap);
++  fprintf (stderr, ".\n");
++
++  if (exit_status >= 0)
++    exit (exit_status);
++}
++
++void
++#if HAVE_STDARG_H
++metamail_warning (const char *message, ...)
++#else
++metamail_warning (message, va_alist)
++     const char *message;
++     va_dcl
++#endif
++{
++  va_list ap;
++  VA_START (ap, message);
++  error (-1, "warning", message, ap);
++  va_end (ap);
++}
++
++void
++#if HAVE_STDARG_H
++metamail_error (const char *message, ...)
++#else
++metamail_error (message, va_alist)
++     const char *message;
++     va_dcl
++#endif
++{
++  va_list ap;
++  VA_START (ap, message);
++  error (-1, "ERROR", message, ap);
++  va_end (ap);
++}
++      
++void
++#if HAVE_STDARG_H
++metamail_fatal (const char *message, ...)
++#else
++metamail_fatal (message, va_alist)
++     const char *message;
++     va_dcl
++#endif
++{
++  va_list ap;
++  VA_START (ap, message);
++  error (EXIT_FAILURE, "FATAL", message, ap);
++  va_end (ap);
++}
++
++
+--- metamail-2.7.orig/metamail/libcommon.la
++++ metamail-2.7/metamail/libcommon.la
+@@ -0,0 +1,28 @@
++# libcommon.la - a libtool library file
++# Generated by ltmain.sh - GNU libtool 1.3.5 (1.385.2.206 2000/05/27 11:12:27)
++#
++# Please DO NOT delete this file!
++# It is necessary for linking the library.
++
++# The name that we can dlopen(3).
++dlname=''
++
++# Names of this library.
++library_names='libcommon.so.0.0.0 libcommon.so.0 libcommon.so'
++
++# The name of the static archive.
++old_library='libcommon.a'
++
++# Libraries that this one depends upon.
++dependency_libs=''
++
++# Version information for libcommon.
++current=0
++age=0
++revision=0
++
++# Is this an already installed library?
++installed=no
++
++# Directory that this library needs to be installed in:
++libdir='/usr/lib'
+--- metamail-2.7.orig/configure.in
++++ metamail-2.7/configure.in
+@@ -0,0 +1,361 @@
++dnl Process this file with autoconf to produce a configure script.
++dnl AC_REVISION($Revision: 1.4 $)dnl
++AC_INIT(src/metamail/metamail.c)
++AC_CONFIG_AUX_DIR(config)
++AM_CONFIG_HEADER(metamail/config.h)
++AM_INIT_AUTOMAKE(metamail, 0.0.1)
++AM_MAINTAINER_MODE
++
++AC_CANONICAL_HOST
++
++dnl Checks for programs.
++AC_PROG_CC
++AM_PROG_LIBTOOL
++AC_SUBST(LIBTOOL_DEPS)
++
++AC_CHECK_PROG(LPRCOMMAND, lp, lp)
++AC_CHECK_PROG(LPRCOMMAND, lpr, lpr)
++
++AC_CHECK_PROG(CATCOMMAND, cat, cat)
++AC_CHECK_PROG(CATCOMMAND, type, type)
++
++
++dnl Checks for libraries.
++
++dnl Checks for header files.
++dnl varargscheck ?
++dnl AC_HEADER_STDC
++AC_CHECK_HEADERS(stdlib.h unistd.h errno.h assert.h)
++AC_CHECK_HEADERS(sys/time.h time.h signal.h)
++AC_CHECK_HEADERS(string.h strings.h, break)
++
++# @start variadic
++case $am_cv_prog_cc_stdc,$ac_cv_header_varargs_h in
++no,)
++	# Non-ANSI compiler, so we must use varargs.h.
++	AC_CHECK_HEADERS(varargs.h)
++	;;
++*,yes)
++	# Parent package is using varargs.h which is incompatible with 
++	# stdarg.h, so we do the same (recheck to generate checking...
++	# message).
++	AC_CHECK_HEADERS(varargs.h)
++	;;
++*)
++	# If stdarg.h is present define HAVE_STDARG_H.
++	AC_CHECK_HEADERS(stdarg.h)
++	;;
++esac
++
++case x$ac_cv_header_stdarg_h$ac_cv_header_varargs_h in
++x*yes*) ;;
++*) AC_MSG_ERROR(Could not find stdarg.h or varargs.h, one of which is \
++required for the build process.) ;;
++esac
++# @end variadic
++
++dnl Checks for typedefs, structures, and compiler characteristics.
++AC_C_CONST
++AC_TYPE_SIZE_T
++AC_HEADER_TIME
++
++dnl Checks for library functions.
++dnl bzero is ok, 
++AC_CHECK_FUNCS(killpg kill)
++AC_CHECK_FUNCS(bcopy memcpy)
++AC_CHECK_FUNCS(bzero memset, break)
++AC_CHECK_FUNCS(bcmp memcmp)
++AC_CHECK_FUNCS(index strchr)
++AC_CHECK_FUNCS(rindex strrchr)
++AC_CHECK_FUNCS(initstate srand)
++AC_CHECK_FUNCS(random rand)
++
++AC_CHECK_FUNCS(calloc)
++AC_REPLACE_FUNCS(basename strerror vfprintf)
++AC_REPLACE_FUNCS(putenv)
++
++dnl *****************************************
++dnl create a metamail common header file, holding all needed definitions
++dnl for copatiblity
++AC_OUTPUT_COMMANDS([
++  if test -n "$CONFIG_FILES" && test -n "$CONFIG_HEADERS"; then
++    # If both these vars are non-empty, then config.status wasn't run by
++    # automake rules (which always set one or the other to empty).
++    CONFIG_OTHER=${CONFIG_OTHER-METAMAIL/common.h}
++  fi
++  case "$CONFIG_OTHER" in
++  *metamail/common.h*)
++    outfile=metamail/common.h
++    stampfile=metamail/stamp-common
++    tmpfile=${outfile}T
++    dirname="sed s,^.*/,,g"
++
++    echo creating $outfile
++    cat > $tmpfile << _EOF_
++/*  -*- Mode: C -*-
++ * --------------------------------------------------------------------
++ * DO NOT EDIT THIS FILE!  It has been automatically generated
++ * from:    configure.in and `echo $outfile|$dirname`.in
++ * on host: `(hostname || uname -n) 2>/dev/null | sed 1q`
++ * --------------------------------------------------------------------
++ */
++
++#ifndef METAMAIL_COMMON_H
++#define METAMAIL_COMMON_H 1
++
++#include <stdio.h>
++#include <ctype.h>        // ??? ok here
++#include <sys/types.h>
++#include <sys/stat.h>     // ??? ok here
++
++// ??? following ok here without check?
++#include <pwd.h>
++#include <sys/time.h>
++#include <sys/types.h>
++#include <sys/file.h>
++#include <signal.h>
++
++#include <termio.h>
++#include <fcntl.h>
++#include <sys/utsname.h>
++_EOF_
++
++    case "${host}" in
++      *-*-linux-gnu*) cat >> $tmpfile << '_EOF_'
++
++#include <linux/limits.h>
++
++_EOF_
++;;
++    esac
++
++# @end 5
++# @start 4
++    # Add the code to include these headers only if autoconf has
++    # shown them to be present.
++    if test x$ac_cv_header_stdlib_h = xyes; then
++      echo '#include <stdlib.h>' >> $tmpfile
++    fi
++    if test x$ac_cv_header_unistd_h = xyes; then
++      echo '#include <unistd.h>' >> $tmpfile
++    fi
++    if test x$ac_cv_header_sys_wait_h = xyes; then
++      echo '#include <sys/wait.h>' >> $tmpfile
++    fi
++    if test x$ac_cv_header_errno_h = xyes; then
++      echo '#include <errno.h>' >> $tmpfile
++    fi
++    cat >> $tmpfile << '_EOF_'
++
++#ifndef errno
++/* Some sytems #define this! */
++extern int errno;
++#endif
++
++_EOF_
++    if test x$ac_cv_header_string_h = xyes; then
++      echo '#include <string.h>' >> $tmpfile
++    elif test x$ac_cv_header_strings_h = xyes; then
++      echo '#include <strings.h>' >> $tmpfile
++    fi
++
++# *******************
++# start variadic parameters 
++#
++    if test x$ac_cv_header_stdarg_h = xyes \
++	&& test x$ac_cv_header_varargs_h != xyes
++    then
++      cat >> $tmpfile << '_EOF_'
++
++#include <stdarg.h>
++#ifndef VA_START
++#  define VA_START(a, f) va_start(a, f)
++#endif /* VA_START */
++
++_EOF_
++    else
++      cat >> $tmpfile << '_EOF_'
++	
++#include <varargs.h>
++#ifndef VA_START
++#  define VA_START(a, f) va_start(a)
++#endif /* VA_START */
++       
++_EOF_
++    fi
++#
++# end variadic parameters
++# ***********************
++
++    if test x$ac_cv_header_assert_h = xyes; then
++      cat >> $tmpfile << '_EOF_'
++
++#include <assert.h>
++#define METAMAIL_ASSERT assert
++
++_EOF_
++else
++        echo '#define METAMAIL_ASSERT(expr)  ((void) 0)' >> $tmpfile
++    fi
++# @end 4
++# @start 5
++    if test x$ac_cv_func_killpg = xno && \
++       test x$ac_cv_func_kill = xyes; then
++      cat >> $tmpfile << '_EOF_'
++#define killbg(pid, sig) ((int) kill (-(pid), sig))
++_EOF_
++    fi 
++    if test x$ac_cv_func_bcopy = xno && \
++       test x$ac_cv_func_memcpy = xyes; then
++      cat >> $tmpfile << '_EOF_'
++#define bcopy(src, dest, n) ((void) memcpy (dest, src, n))
++_EOF_
++    fi
++    if test x$ac_cv_func_bzero = xno && \
++       test x$ac_cv_func_memset = xyes; then
++      cat >> $tmpfile << '_EOF_'
++#define bzero(buf, bytes) ((void) memset (buf, 0, bytes))
++_EOF_
++    fi
++    if test x$ac_cv_func_bcmp = xno && \
++       test x$ac_cv_func_memcmp = xyes; then
++      echo '#define bcmp memcmp' >> $tmpfile
++    fi
++    if test x$ac_cv_func_index = xno && \
++       test x$ac_cv_func_strchr = xyes; then
++      echo '#define index strchr' >> $tmpfile
++    fi
++    if test x$ac_cv_func_rindex = xno && \
++       test x$ac_cv_func_strrchr = xyes; then
++      echo '#define rindex strrchr' >> $tmpfile
++    fi
++    if test x$ac_cv_func_initstate = xno && \
++       test x$ac_cv_func_srand = xyes; then
++      echo '#define initstate srand' >> $tmpfile
++    fi
++    if test x$ac_cv_func_random = xno && \
++       test x$ac_cv_func_rand = xyes; then
++      echo '#define random rand' >> $tmpfile
++    fi
++
++    # The ugly but portable cpp stuff comes from here
++    infile=$srcdir/metamail/`echo $outfile | sed 's,.*/,,g;s,\..*$,,g'`-h.in
++    sed '/^##.*$/d' $infile >> $tmpfile 
++
++# @end 5
++    ${RM-/bin/rm -f} ${tmpfile}2 2>/dev/null
++    if test x$ac_cv_func_basename = xno; then
++      echo 'extern char *basename PARAMS((const char *path));' >> ${tmpfile}2
++    fi
++    if test x$ac_cv_func_strerror = xno; then
++      echo 'extern char *strerror PARAMS((int err));' >> ${tmpfile}2
++    fi
++    if test x$ac_cv_func_strsignal = xno; then
++      echo 'extern char *strsignal PARAMS((int signo));' >> ${tmpfile}2
++    fi
++    if test x$ac_cv_func_vfprintf = xno; then
++      echo 'extern int vfprintf PARAMS((FILE *file, const char* format, va_list ap));' >> ${tmpfile}2
++    fi
++    if test x$ac_cv_func_waitpid = xno; then 
++	echo 'extern pid_t waitpid PARAMS((pid_t pid, int *pstatus, int options));' >> ${tmpfile}2
++    fi
++
++    if test -f ${tmpfile}2; then
++      cat >> $tmpfile << '_EOF_'
++
++BEGIN_C_DECLS
++_EOF_
++      cat ${tmpfile}2 >> $tmpfile
++      echo 'END_C_DECLS' >> $tmpfile
++      ${RM-/bin/rm -f} ${tmpfile}2 2>/dev/null
++    fi
++
++    if test -n ${LPRCOMMAND}; then
++      echo '#define LPRCOMMAND "'${LPRCOMMAND}'"' >> $tmpfile
++      echo '#define LPRTEMPLATE "'${LPRCOMMAND}' %s"' >> $tmpfile
++    fi
++    if test -n ${CATCOMMAND}; then
++      echo '#define CATCOMMAND "'${CATCOMMAND}'"' >> $tmpfile
++      echo '#define CATTEMPLATE "'${CATCOMMAND}' %s"' >> $tmpfile
++    fi
++
++    case "${host}" in
++      *-*-linux-gnu*) cat >> $tmpfile << '_EOF_'
++#define TMPNAME_MAX NAME_MAX
++static struct termio MyTtyStateIn, MyTtyStateOut;
++
++_EOF_
++;;
++      *) cat >> $tmpfile << '_EOF_'
++
++#define TMPNAME_MAX	1000
++#define NAME_MAX	1000
++static struct sgttyb MyTtyStateIn, MyTtyStateOut;
++
++_EOF_
++;;
++    esac
++
++    cat >> $tmpfile << '_EOF_'
++
++
++#endif /* !METAMAIL_COMMON_H */
++_EOF_
++
++    if cmp -s $tmpfile $outfile; then
++      echo $outfile is unchanged
++      rm -f $tmpfile
++    else
++      mv $tmpfile $outfile
++      touch $stampfile
++    fi
++    ;;
++  esac
++# @start 5
++],[
++  srcdir=$srcdir
++  ac_cv_func_bzero=$ac_cv_func_bzero
++  ac_cv_func_memset=$ac_cv_func_memset
++  ac_cv_func_strchr=$ac_cv_func_strchr
++  ac_cv_func_strrchr=$ac_cv_func_strrchr
++# @end 5
++  ac_cv_func_basename=$ac_cv_func_basename
++  ac_cv_func_strcspn=$ac_cv_func_strcspn
++  ac_cv_func_strerror=$ac_cv_func_strerror
++  ac_cv_func_strsignal=$ac_cv_func_strsignal
++  ac_cv_func_strspn=$ac_cv_func_strspn
++  ac_cv_func_vfprintf=$ac_cv_func_vfprintf
++  ac_cv_func_waitpid=$ac_cv_func_waitpid
++  ac_cv_header_assert_h=$ac_cv_header_assert_h
++  ac_cv_header_errno_h=$ac_cv_header_errno_h
++  ac_cv_header_stdlib_h=$ac_cv_header_stdlib_h
++  ac_cv_header_stdarg_h=$ac_cv_header_stdarg_h
++  ac_cv_header_string_h=$ac_cv_header_string_h
++  ac_cv_header_strings_h=$ac_cv_header_strings_h
++  ac_cv_header_sys_wait_h=$ac_cv_header_sys_wait_h
++  ac_cv_header_unistd_h=$ac_cv_header_unistd_h
++  ac_cv_header_varargs_h=$ac_cv_header_varargs_h
++  LPRCOMMAND=$LPRCOMMAND
++  CATCOMMAND=$CATCOMMAND
++  host=$host
++# @start 5
++])
++# @end 5
++# @start 1
++
++dnl *****************************************
++dnl export of variable settings for Makefiles
++
++dnl for libtool to work LTLIBOJS is needed (currently bug of autoconf)
++Xsed="sed -e s/^X//"
++LTLIBOBJS=`echo X"$LIBOBJS"|[$Xsed -e "s,\.[^.]* ,.lo ,g;s,\.[^.]*$,.lo,"]`
++AC_SUBST(LTLIBOBJS)
++
++dnl the aux dir (for holding config & autodenerated stuff)
++AC_SUBST(ac_aux_dir)
++AC_SUBST(LPRCOMMAND)
++AC_SUBST(CATCOMMAND)
++
++AC_OUTPUT([Makefile replace/Makefile metamail/Makefile src/Makefile \
++	   src/metamail/Makefile src/richmail/Makefile bin/Makefile],
++[test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h.in])
+--- metamail-2.7.orig/fonts/Xshownonascii
++++ metamail-2.7/fonts/Xshownonascii
+@@ -1,7 +1,7 @@
+ #!/bin/csh -fb
+ # (The "-fb" might need to be changed to "-f" on some systems)
+ #
+-set MYFONTDIR=/u/nsb/lib/fonts
++set MYFONTDIR=/usr/lib/X11/fonts/misc
+ 
+ set CHARSET="$1"
+ shift
+--- metamail-2.7.orig/fonts/Xmailto-hebrew
++++ metamail-2.7/fonts/Xmailto-hebrew
+@@ -1,7 +1,7 @@
+ #!/bin/csh -fb
+ # (The "-fb" might need to be changed to "-f" on some systems)
+ #
+-set MYFONTDIR=/u/nsb/lib/fonts
++set MYFONTDIR=/usr/lib/X11/fonts/misc
+ 
+ if ($?MM_CHARSET) then
+     if ($MM_CHARSET == iso-8859-8) then
+--- metamail-2.7.orig/fonts/Makefile
++++ metamail-2.7/fonts/Makefile
+@@ -10,7 +10,9 @@
+ #FONTSUFFIX=fb
+ #DIRBUILDER=bldfamily
+ 
+-all: shownonascii heb6x13.${FONTSUFFIX} heb8x13.${FONTSUFFIX} heb8x13B.${FONTSUFFIX} mailto-hebrew
++RM=rm
++
++all: heb6x13.${FONTSUFFIX} heb8x13.${FONTSUFFIX} heb8x13B.${FONTSUFFIX}
+ 
+ heb6x13.${FONTSUFFIX}: heb6x13.bdf
+ #	convertfont -o heb6x13 heb6x13.bdf
+@@ -36,4 +38,4 @@
+ 	chmod +x mailto-hebrew
+ 
+ clean:
+-	rm -f heb6x13.${FONTSUFFIX} heb8x13.${FONTSUFFIX} heb8x13B.${FONTSUFFIX}  shownonascii mailto-hebrew fonts.dir
++	$(RM) -f heb6x13.${FONTSUFFIX} heb8x13.${FONTSUFFIX} heb8x13B.${FONTSUFFIX}  shownonascii mailto-hebrew fonts.dir
+--- metamail-2.7.orig/config/missing
++++ metamail-2.7/config/missing
+@@ -0,0 +1,190 @@
++#! /bin/sh
++# Common stub for a few missing GNU programs while installing.
++# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
++# Franc,ois Pinard <pinard@iro.umontreal.ca>, 1996.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
++
++if test $# -eq 0; then
++  echo 1>&2 "Try \`$0 --help' for more information"
++  exit 1
++fi
++
++case "$1" in
++
++  -h|--h|--he|--hel|--help)
++    echo "\
++$0 [OPTION]... PROGRAM [ARGUMENT]...
++
++Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
++error status if there is no known handling for PROGRAM.
++
++Options:
++  -h, --help      display this help and exit
++  -v, --version   output version information and exit
++
++Supported PROGRAM values:
++  aclocal      touch file \`aclocal.m4'
++  autoconf     touch file \`configure'
++  autoheader   touch file \`config.h.in'
++  automake     touch all \`Makefile.in' files
++  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
++  flex         create \`lex.yy.c', if possible, from existing .c
++  lex          create \`lex.yy.c', if possible, from existing .c
++  makeinfo     touch the output file
++  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
++    ;;
++
++  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
++    echo "missing - GNU libit 0.0"
++    ;;
++
++  -*)
++    echo 1>&2 "$0: Unknown \`$1' option"
++    echo 1>&2 "Try \`$0 --help' for more information"
++    exit 1
++    ;;
++
++  aclocal)
++    echo 1>&2 "\
++WARNING: \`$1' is missing on your system.  You should only need it if
++         you modified \`acinclude.m4' or \`configure.in'.  You might want
++         to install the \`Automake' and \`Perl' packages.  Grab them from
++         any GNU archive site."
++    touch aclocal.m4
++    ;;
++
++  autoconf)
++    echo 1>&2 "\
++WARNING: \`$1' is missing on your system.  You should only need it if
++         you modified \`configure.in'.  You might want to install the
++         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
++         archive site."
++    touch configure
++    ;;
++
++  autoheader)
++    echo 1>&2 "\
++WARNING: \`$1' is missing on your system.  You should only need it if
++         you modified \`acconfig.h' or \`configure.in'.  You might want
++         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
++         from any GNU archive site."
++    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in`
++    test -z "$files" && files="config.h"
++    touch_files=
++    for f in $files; do
++      case "$f" in
++      *:*) touch_files="$touch_files "`echo "$f" |
++				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
++      *) touch_files="$touch_files $f.in";;
++      esac
++    done
++    touch $touch_files
++    ;;
++
++  automake)
++    echo 1>&2 "\
++WARNING: \`$1' is missing on your system.  You should only need it if
++         you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
++         You might want to install the \`Automake' and \`Perl' packages.
++         Grab them from any GNU archive site."
++    find . -type f -name Makefile.am -print |
++	   sed 's/\.am$/.in/' |
++	   while read f; do touch "$f"; done
++    ;;
++
++  bison|yacc)
++    echo 1>&2 "\
++WARNING: \`$1' is missing on your system.  You should only need it if
++         you modified a \`.y' file.  You may need the \`Bison' package
++         in order for those modifications to take effect.  You can get
++         \`Bison' from any GNU archive site."
++    rm -f y.tab.c y.tab.h
++    if [ $# -ne 1 ]; then
++        eval LASTARG="\${$#}"
++	case "$LASTARG" in
++	*.y)
++	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
++	    if [ -f "$SRCFILE" ]; then
++	         cp "$SRCFILE" y.tab.c
++	    fi
++	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
++	    if [ -f "$SRCFILE" ]; then
++	         cp "$SRCFILE" y.tab.h
++	    fi
++	  ;;
++	esac
++    fi
++    if [ ! -f y.tab.h ]; then
++	echo >y.tab.h
++    fi
++    if [ ! -f y.tab.c ]; then
++	echo 'main() { return 0; }' >y.tab.c
++    fi
++    ;;
++
++  lex|flex)
++    echo 1>&2 "\
++WARNING: \`$1' is missing on your system.  You should only need it if
++         you modified a \`.l' file.  You may need the \`Flex' package
++         in order for those modifications to take effect.  You can get
++         \`Flex' from any GNU archive site."
++    rm -f lex.yy.c
++    if [ $# -ne 1 ]; then
++        eval LASTARG="\${$#}"
++	case "$LASTARG" in
++	*.l)
++	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
++	    if [ -f "$SRCFILE" ]; then
++	         cp "$SRCFILE" lex.yy.c
++	    fi
++	  ;;
++	esac
++    fi
++    if [ ! -f lex.yy.c ]; then
++	echo 'main() { return 0; }' >lex.yy.c
++    fi
++    ;;
++
++  makeinfo)
++    echo 1>&2 "\
++WARNING: \`$1' is missing on your system.  You should only need it if
++         you modified a \`.texi' or \`.texinfo' file, or any other file
++         indirectly affecting the aspect of the manual.  The spurious
++         call might also be the consequence of using a buggy \`make' (AIX,
++         DU, IRIX).  You might want to install the \`Texinfo' package or
++         the \`GNU make' package.  Grab either from any GNU archive site."
++    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
++    if test -z "$file"; then
++      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
++      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
++    fi
++    touch $file
++    ;;
++
++  *)
++    echo 1>&2 "\
++WARNING: \`$1' is needed, and you do not seem to have it handy on your
++         system.  You might have modified some files without having the
++         proper tools for further handling them.  Check the \`README' file,
++         it often tells you about the needed prerequirements for installing
++         this package.  You may also peek at any GNU archive site, in case
++         some other package would contain this missing \`$1' program."
++    exit 1
++    ;;
++esac
++
++exit 0
+--- metamail-2.7.orig/config/mkinstalldirs
++++ metamail-2.7/config/mkinstalldirs
+@@ -0,0 +1,40 @@
++#! /bin/sh
++# mkinstalldirs --- make directory hierarchy
++# Author: Noah Friedman <friedman@prep.ai.mit.edu>
++# Created: 1993-05-16
++# Public domain
++
++# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $
++
++errstatus=0
++
++for file
++do
++   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
++   shift
++
++   pathcomp=
++   for d
++   do
++     pathcomp="$pathcomp$d"
++     case "$pathcomp" in
++       -* ) pathcomp=./$pathcomp ;;
++     esac
++
++     if test ! -d "$pathcomp"; then
++        echo "mkdir $pathcomp"
++
++        mkdir "$pathcomp" || lasterr=$?
++
++        if test ! -d "$pathcomp"; then
++  	  errstatus=$lasterr
++        fi
++     fi
++
++     pathcomp="$pathcomp/"
++   done
++done
++
++exit $errstatus
++
++# mkinstalldirs ends here
+--- metamail-2.7.orig/config/depcomp
++++ metamail-2.7/config/depcomp
+@@ -0,0 +1,411 @@
++#! /bin/sh
++
++# depcomp - compile a program generating dependencies as side-effects
++# Copyright 1999, 2000 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
++
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
++
++if test -z "$depmode" || test -z "$source" || test -z "$object"; then
++  echo "depcomp: Variables source, object and depmode must be set" 1>&2
++  exit 1
++fi
++# `libtool' can also be set to `yes' or `no'.
++
++depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
++tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
++
++rm -f "$tmpdepfile"
++
++# Some modes work just like other modes, but use different flags.  We
++# parameterize here, but still list the modes in the big case below,
++# to make depend.m4 easier to write.  Note that we *cannot* use a case
++# here, because this file can only contain one case statement.
++if test "$depmode" = hp; then
++  # HP compiler uses -M and no extra arg.
++  gccflag=-M
++  depmode=gcc
++fi
++
++if test "$depmode" = dashXmstdout; then
++   # This is just like dashmstdout with a different argument.
++   dashmflag=-xM
++   depmode=dashmstdout
++fi
++
++case "$depmode" in
++gcc3)
++## gcc 3 implements dependency tracking that does exactly what
++## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
++## it if -MD -MP comes after the -MF stuff.  Hmm.
++  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
++  stat=$?
++  if test $stat -eq 0; then :
++  else
++    rm -f "$tmpdepfile"
++    exit $stat
++  fi
++  mv "$tmpdepfile" "$depfile"
++  ;;
++
++gcc)
++## There are various ways to get dependency output from gcc.  Here's
++## why we pick this rather obscure method:
++## - Don't want to use -MD because we'd like the dependencies to end
++##   up in a subdir.  Having to rename by hand is ugly.
++##   (We might end up doing this anyway to support other compilers.)
++## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
++##   -MM, not -M (despite what the docs say).
++## - Using -M directly means running the compiler twice (even worse
++##   than renaming).
++  if test -z "$gccflag"; then
++    gccflag=-MD,
++  fi
++  "$@" -Wp,"$gccflag$tmpdepfile"
++  stat=$?
++  if test $stat -eq 0; then :
++  else
++    rm -f "$tmpdepfile"
++    exit $stat
++  fi
++  rm -f "$depfile"
++  echo "$object : \\" > "$depfile"
++  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
++## The second -e expression handles DOS-style file names with drive letters.
++  sed -e 's/^[^:]*: / /' \
++      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
++## This next piece of magic avoids the `deleted header file' problem.
++## The problem is that when a header file which appears in a .P file
++## is deleted, the dependency causes make to die (because there is
++## typically no way to rebuild the header).  We avoid this by adding
++## dummy dependencies for each header file.  Too bad gcc doesn't do
++## this for us directly.
++  tr ' ' '
++' < "$tmpdepfile" |
++## Some versions of gcc put a space before the `:'.  On the theory
++## that the space means something, we add a space to the output as
++## well.
++## Some versions of the HPUX 10.20 sed can't process this invocation
++## correctly.  Breaking it into two sed invocations is a workaround.
++    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
++  rm -f "$tmpdepfile"
++  ;;
++
++hp)
++  # This case exists only to let depend.m4 do its work.  It works by
++  # looking at the text of this script.  This case will never be run,
++  # since it is checked for above.
++  exit 1
++  ;;
++
++sgi)
++  if test "$libtool" = yes; then
++    "$@" "-Wp,-MDupdate,$tmpdepfile"
++  else
++    "$@" -MDupdate "$tmpdepfile"
++  fi
++  stat=$?
++  if test $stat -eq 0; then :
++  else
++    rm -f "$tmpdepfile"
++    exit $stat
++  fi
++  rm -f "$depfile"
++
++  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
++    echo "$object : \\" > "$depfile"
++
++    # Clip off the initial element (the dependent).  Don't try to be
++    # clever and replace this with sed code, as IRIX sed won't handle
++    # lines with more than a fixed number of characters (4096 in
++    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
++    # the IRIX cc adds comments like `#:fec' to the end of the
++    # dependency line.
++    tr ' ' '
++' < "$tmpdepfile" \
++    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
++    tr '
++' ' ' >> $depfile
++    echo >> $depfile
++
++    # The second pass generates a dummy entry for each header file.
++    tr ' ' '
++' < "$tmpdepfile" \
++   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
++   >> $depfile
++  else
++    # The sourcefile does not contain any dependencies, so just
++    # store a dummy comment line, to avoid errors with the Makefile
++    # "include basename.Plo" scheme.
++    echo "#dummy" > "$depfile"
++  fi
++  rm -f "$tmpdepfile"
++  ;;
++
++aix)
++  # The C for AIX Compiler uses -M and outputs the dependencies
++  # in a .u file.  This file always lives in the current directory.
++  # Also, the AIX compiler puts `$object:' at the start of each line;
++  # $object doesn't have directory information.
++  stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
++  tmpdepfile="$stripped.u"
++  outname="$stripped.o"
++  if test "$libtool" = yes; then
++    "$@" -Wc,-M
++  else
++    "$@" -M
++  fi
++
++  stat=$?
++  if test $stat -eq 0; then :
++  else
++    rm -f "$tmpdepfile"
++    exit $stat
++  fi
++
++  if test -f "$tmpdepfile"; then
++    # Each line is of the form `foo.o: dependent.h'.
++    # Do two passes, one to just change these to
++    # `$object: dependent.h' and one to simply `dependent.h:'.
++    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
++    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
++  else
++    # The sourcefile does not contain any dependencies, so just
++    # store a dummy comment line, to avoid errors with the Makefile
++    # "include basename.Plo" scheme.
++    echo "#dummy" > "$depfile"
++  fi
++  rm -f "$tmpdepfile"
++  ;;
++
++tru64)
++   # The Tru64 AIX compiler uses -MD to generate dependencies as a side
++   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
++   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put 
++   # dependencies in `foo.d' instead, so we check for that too.
++   # Subdirectories are respected.
++
++   tmpdepfile1="$object.d"
++   tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` 
++   if test "$libtool" = yes; then
++      "$@" -Wc,-MD
++   else
++      "$@" -MD
++   fi
++
++   stat=$?
++   if test $stat -eq 0; then :
++   else
++      rm -f "$tmpdepfile1" "$tmpdepfile2"
++      exit $stat
++   fi
++
++   if test -f "$tmpdepfile1"; then
++      tmpdepfile="$tmpdepfile1"
++   else
++      tmpdepfile="$tmpdepfile2"
++   fi
++   if test -f "$tmpdepfile"; then
++      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
++      # That's a space and a tab in the [].
++      sed -e 's,^.*\.[a-z]*:[ 	]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
++   else
++      echo "#dummy" > "$depfile"
++   fi
++   rm -f "$tmpdepfile"
++   ;;
++
++#nosideeffect)
++  # This comment above is used by automake to tell side-effect
++  # dependency tracking mechanisms from slower ones.
++
++dashmstdout)
++  # Important note: in order to support this mode, a compiler *must*
++  # always write the proprocessed file to stdout, regardless of -o,
++  # because we must use -o when running libtool.
++  test -z "$dashmflag" && dashmflag=-M
++  ( IFS=" "
++    case " $* " in
++    *" --mode=compile "*) # this is libtool, let us make it quiet
++      for arg
++      do # cycle over the arguments
++        case "$arg" in
++	"--mode=compile")
++	  # insert --quiet before "--mode=compile"
++	  set fnord "$@" --quiet
++	  shift # fnord
++	  ;;
++	esac
++	set fnord "$@" "$arg"
++	shift # fnord
++	shift # "$arg"
++      done
++      ;;
++    esac
++    "$@" $dashmflag | sed 's:^[^:]*\:[ 	]*:'"$object"'\: :' > "$tmpdepfile"
++  ) &
++  proc=$!
++  "$@"
++  stat=$?
++  wait "$proc"
++  if test "$stat" != 0; then exit $stat; fi
++  rm -f "$depfile"
++  cat < "$tmpdepfile" > "$depfile"
++  tr ' ' '
++' < "$tmpdepfile" | \
++## Some versions of the HPUX 10.20 sed can't process this invocation
++## correctly.  Breaking it into two sed invocations is a workaround.
++    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
++  rm -f "$tmpdepfile"
++  ;;
++
++dashXmstdout)
++  # This case only exists to satisfy depend.m4.  It is never actually
++  # run, as this mode is specially recognized in the preamble.
++  exit 1
++  ;;
++
++makedepend)
++  # X makedepend
++  (
++    shift
++    cleared=no
++    for arg in "$@"; do
++      case $cleared in no)
++        set ""; shift
++	cleared=yes
++      esac
++      case "$arg" in
++        -D*|-I*)
++	  set fnord "$@" "$arg"; shift;;
++	-*)
++	  ;;
++	*)
++	  set fnord "$@" "$arg"; shift;;
++      esac
++    done
++    obj_suffix="`echo $object | sed 's/^.*\././'`"
++    touch "$tmpdepfile"
++    ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
++  ) &
++  proc=$!
++  "$@"
++  stat=$?
++  wait "$proc"
++  if test "$stat" != 0; then exit $stat; fi
++  rm -f "$depfile"
++  cat < "$tmpdepfile" > "$depfile"
++  tail +3 "$tmpdepfile" | tr ' ' '
++' | \
++## Some versions of the HPUX 10.20 sed can't process this invocation
++## correctly.  Breaking it into two sed invocations is a workaround.
++    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
++  rm -f "$tmpdepfile" "$tmpdepfile".bak
++  ;;
++
++cpp)
++  # Important note: in order to support this mode, a compiler *must*
++  # always write the proprocessed file to stdout, regardless of -o,
++  # because we must use -o when running libtool.
++  ( IFS=" "
++    case " $* " in
++    *" --mode=compile "*)
++      for arg
++      do # cycle over the arguments
++        case $arg in
++	"--mode=compile")
++	  # insert --quiet before "--mode=compile"
++	  set fnord "$@" --quiet
++	  shift # fnord
++	  ;;
++	esac
++	set fnord "$@" "$arg"
++	shift # fnord
++	shift # "$arg"
++      done
++      ;;
++    esac
++    "$@" -E |
++    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
++    sed '$ s: \\$::' > "$tmpdepfile"
++  ) &
++  proc=$!
++  "$@"
++  stat=$?
++  wait "$proc"
++  if test "$stat" != 0; then exit $stat; fi
++  rm -f "$depfile"
++  echo "$object : \\" > "$depfile"
++  cat < "$tmpdepfile" >> "$depfile"
++  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
++  rm -f "$tmpdepfile"
++  ;;
++
++msvisualcpp)
++  # Important note: in order to support this mode, a compiler *must*
++  # always write the proprocessed file to stdout, regardless of -o,
++  # because we must use -o when running libtool.
++  ( IFS=" "
++    case " $* " in
++    *" --mode=compile "*)
++      for arg
++      do # cycle over the arguments
++        case $arg in
++	"--mode=compile")
++	  # insert --quiet before "--mode=compile"
++	  set fnord "$@" --quiet
++	  shift # fnord
++	  ;;
++	esac
++	set fnord "$@" "$arg"
++	shift # fnord
++	shift # "$arg"
++      done
++      ;;
++    esac
++    "$@" -E |
++    sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
++  ) &
++  proc=$!
++  "$@"
++  stat=$?
++  wait "$proc"
++  if test "$stat" != 0; then exit $stat; fi
++  rm -f "$depfile"
++  echo "$object : \\" > "$depfile"
++  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
++  echo "	" >> "$depfile"
++  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
++  rm -f "$tmpdepfile"
++  ;;
++
++none)
++  exec "$@"
++  ;;
++
++*)
++  echo "Unknown depmode $depmode" 1>&2
++  exit 1
++  ;;
++esac
++
++exit 0
+--- metamail-2.7.orig/config/ltconfig
++++ metamail-2.7/config/ltconfig
+@@ -0,0 +1,3115 @@
++#! /bin/sh
++
++# ltconfig - Create a system-specific libtool.
++# Copyright (C) 1996-1999 Free Software Foundation, Inc.
++# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
++#
++# This file is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++# A lot of this script is taken from autoconf-2.10.
++
++# Check that we are running under the correct shell.
++SHELL=${CONFIG_SHELL-/bin/sh}
++echo=echo
++if test "X$1" = X--no-reexec; then
++  # Discard the --no-reexec flag, and continue.
++  shift
++elif test "X$1" = X--fallback-echo; then
++  # Avoid inline document here, it may be left over
++  :
++elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
++  # Yippee, $echo works!
++  :
++else
++  # Restart under the correct shell.
++  exec "$SHELL" "$0" --no-reexec ${1+"$@"}
++fi
++
++if test "X$1" = X--fallback-echo; then
++  # used as fallback echo
++  shift
++  cat <<EOF
++$*
++EOF
++  exit 0
++fi
++
++# Find the correct PATH separator.  Usually this is `:', but
++# DJGPP uses `;' like DOS.
++if test "X${PATH_SEPARATOR+set}" != Xset; then
++  UNAME=${UNAME-`uname 2>/dev/null`}
++  case X$UNAME in
++    *-DOS) PATH_SEPARATOR=';' ;;
++    *)     PATH_SEPARATOR=':' ;;
++  esac
++fi
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++
++if test "X${echo_test_string+set}" != Xset; then
++  # find a string as large as possible, as long as the shell can cope with it
++  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
++    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
++    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
++       echo_test_string="`eval $cmd`" &&
++       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null; then
++      break
++    fi
++  done
++fi
++
++if test "X`($echo '\t') 2>/dev/null`" != 'X\t' ||
++   test "X`($echo "$echo_test_string") 2>/dev/null`" != X"$echo_test_string"; then
++  # The Solaris, AIX, and Digital Unix default echo programs unquote
++  # backslashes.  This makes it impossible to quote backslashes using
++  #   echo "$something" | sed 's/\\/\\\\/g'
++  #
++  # So, first we look for a working echo in the user's PATH.
++
++  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
++  for dir in $PATH /usr/ucb; do
++    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
++       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
++       test "X`($dir/echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
++      echo="$dir/echo"
++      break
++    fi
++  done
++  IFS="$save_ifs"
++
++  if test "X$echo" = Xecho; then
++    # We didn't find a better echo, so look for alternatives.
++    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
++       test "X`(print -r "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
++      # This shell has a builtin print -r that does the trick.
++      echo='print -r'
++    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
++	 test "X$CONFIG_SHELL" != X/bin/ksh; then
++      # If we have ksh, try running ltconfig again with it.
++      ORIGINAL_CONFIG_SHELL="${CONFIG_SHELL-/bin/sh}"
++      export ORIGINAL_CONFIG_SHELL
++      CONFIG_SHELL=/bin/ksh
++      export CONFIG_SHELL
++      exec "$CONFIG_SHELL" "$0" --no-reexec ${1+"$@"}
++    else
++      # Try using printf.
++      echo='printf "%s\n"'
++      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++	 test "X`($echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
++	# Cool, printf works
++	:
++      elif test "X`("$ORIGINAL_CONFIG_SHELL" "$0" --fallback-echo '\t') 2>/dev/null`" = 'X\t' &&
++	   test "X`("$ORIGINAL_CONFIG_SHELL" "$0" --fallback-echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
++	CONFIG_SHELL="$ORIGINAL_CONFIG_SHELL"
++	export CONFIG_SHELL
++	SHELL="$CONFIG_SHELL"
++	export SHELL
++	echo="$CONFIG_SHELL $0 --fallback-echo"
++      elif test "X`("$CONFIG_SHELL" "$0" --fallback-echo '\t') 2>/dev/null`" = 'X\t' &&
++	   test "X`("$CONFIG_SHELL" "$0" --fallback-echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
++	echo="$CONFIG_SHELL $0 --fallback-echo"
++      else
++	# maybe with a smaller string...
++	prev=:
++
++	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
++	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null; then
++	    break
++	  fi
++	  prev="$cmd"
++	done
++
++	if test "$prev" != 'sed 50q "$0"'; then
++	  echo_test_string=`eval $prev`
++	  export echo_test_string
++	  exec "${ORIGINAL_CONFIG_SHELL}" "$0" ${1+"$@"}
++	else
++	  # Oops.  We lost completely, so just stick with echo.
++	  echo=echo
++	fi
++      fi
++    fi
++  fi
++fi
++
++# Sed substitution that helps us do robust quoting.  It backslashifies
++# metacharacters that are still active within double-quoted strings.
++Xsed='sed -e s/^X//'
++sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
++
++# Same as above, but do not quote variable references.
++double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
++
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
++
++# The name of this program.
++progname=`$echo "X$0" | $Xsed -e 's%^.*/%%'`
++
++# Constants:
++PROGRAM=ltconfig
++PACKAGE=libtool
++VERSION=1.3.5
++TIMESTAMP=" (1.385.2.206 2000/05/27 11:12:27)"
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++rm="rm -f"
++
++help="Try \`$progname --help' for more information."
++
++# Global variables:
++default_ofile=libtool
++can_build_shared=yes
++enable_shared=yes
++# All known linkers require a `.a' archive for static linking (except M$VC,
++# which needs '.lib').
++enable_static=yes
++enable_fast_install=yes
++enable_dlopen=unknown
++enable_win32_dll=no
++ltmain=
++silent=
++srcdir=
++ac_config_guess=
++ac_config_sub=
++host=
++nonopt=
++ofile="$default_ofile"
++verify_host=yes
++with_gcc=no
++with_gnu_ld=no
++need_locks=yes
++ac_ext=c
++objext=o
++libext=a
++exeext=
++cache_file=
++
++old_AR="$AR"
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
++old_CPPFLAGS="$CPPFLAGS"
++old_LDFLAGS="$LDFLAGS"
++old_LD="$LD"
++old_LN_S="$LN_S"
++old_LIBS="$LIBS"
++old_NM="$NM"
++old_RANLIB="$RANLIB"
++old_DLLTOOL="$DLLTOOL"
++old_OBJDUMP="$OBJDUMP"
++old_AS="$AS"
++
++# Parse the command line options.
++args=
++prev=
++for option
++do
++  case "$option" in
++  -*=*) optarg=`echo "$option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
++  *) optarg= ;;
++  esac
++
++  # If the previous option needs an argument, assign it.
++  if test -n "$prev"; then
++    eval "$prev=\$option"
++    prev=
++    continue
++  fi
++
++  case "$option" in
++  --help) cat <<EOM
++Usage: $progname [OPTION]... [HOST [LTMAIN]]
++
++Generate a system-specific libtool script.
++
++    --debug                enable verbose shell tracing
++    --disable-shared       do not build shared libraries
++    --disable-static       do not build static libraries
++    --disable-fast-install do not optimize for fast installation
++    --enable-dlopen        enable dlopen support
++    --enable-win32-dll     enable building dlls on win32 hosts
++    --help                 display this help and exit
++    --no-verify            do not verify that HOST is a valid host type
++-o, --output=FILE          specify the output file [default=$default_ofile]
++    --quiet                same as \`--silent'
++    --silent               do not print informational messages
++    --srcdir=DIR           find \`config.guess' in DIR
++    --version              output version information and exit
++    --with-gcc             assume that the GNU C compiler will be used
++    --with-gnu-ld          assume that the C compiler uses the GNU linker
++    --disable-lock         disable file locking
++    --cache-file=FILE      configure cache file
++
++LTMAIN is the \`ltmain.sh' shell script fragment or \`ltmain.c' program
++that provides basic libtool functionality.
++
++HOST is the canonical host system name [default=guessed].
++EOM
++  exit 0
++  ;;
++
++  --debug)
++    echo "$progname: enabling shell trace mode"
++    set -x
++    ;;
++
++  --disable-shared) enable_shared=no ;;
++
++  --disable-static) enable_static=no ;;
++
++  --disable-fast-install) enable_fast_install=no ;;
++
++  --enable-dlopen) enable_dlopen=yes ;;
++
++  --enable-win32-dll) enable_win32_dll=yes ;;
++
++  --quiet | --silent) silent=yes ;;
++
++  --srcdir) prev=srcdir ;;
++  --srcdir=*) srcdir="$optarg" ;;
++
++  --no-verify) verify_host=no ;;
++
++  --output | -o) prev=ofile ;;
++  --output=*) ofile="$optarg" ;;
++
++  --version) echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"; exit 0 ;;
++
++  --with-gcc) with_gcc=yes ;;
++  --with-gnu-ld) with_gnu_ld=yes ;;
++
++  --disable-lock) need_locks=no ;;
++
++  --cache-file=*) cache_file="$optarg" ;;
++
++  -*)
++    echo "$progname: unrecognized option \`$option'" 1>&2
++    echo "$help" 1>&2
++    exit 1
++    ;;
++
++  *)
++    if test -z "$ltmain"; then
++      ltmain="$option"
++    elif test -z "$host"; then
++# This generates an unnecessary warning for sparc-sun-solaris4.1.3_U1
++#      if test -n "`echo $option| sed 's/[-a-z0-9.]//g'`"; then
++#        echo "$progname: warning \`$option' is not a valid host type" 1>&2
++#      fi
++      host="$option"
++    else
++      echo "$progname: too many arguments" 1>&2
++      echo "$help" 1>&2
++      exit 1
++    fi ;;
++  esac
++done
++
++if test -z "$ltmain"; then
++  echo "$progname: you must specify a LTMAIN file" 1>&2
++  echo "$help" 1>&2
++  exit 1
++fi
++
++if test ! -f "$ltmain"; then
++  echo "$progname: \`$ltmain' does not exist" 1>&2
++  echo "$help" 1>&2
++  exit 1
++fi
++
++# Quote any args containing shell metacharacters.
++ltconfig_args=
++for arg
++do
++  case "$arg" in
++  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
++  ltconfig_args="$ltconfig_args '$arg'" ;;
++  *) ltconfig_args="$ltconfig_args $arg" ;;
++  esac
++done
++
++# A relevant subset of AC_INIT.
++
++# File descriptor usage:
++# 0 standard input
++# 1 file creation
++# 2 errors and warnings
++# 3 some systems may open it to /dev/tty
++# 4 used on the Kubota Titan
++# 5 compiler messages saved in config.log
++# 6 checking for... messages and results
++if test "$silent" = yes; then
++  exec 6>/dev/null
++else
++  exec 6>&1
++fi
++exec 5>>./config.log
++
++# NLS nuisances.
++# Only set LANG and LC_ALL to C if already set.
++# These must not be set unconditionally because not all systems understand
++# e.g. LANG=C (notably SCO).
++if test "X${LC_ALL+set}" = Xset; then LC_ALL=C; export LC_ALL; fi
++if test "X${LANG+set}"   = Xset; then LANG=C;   export LANG;   fi
++
++if test -n "$cache_file" && test -r "$cache_file"; then
++  echo "loading cache $cache_file within ltconfig"
++  . $cache_file
++fi
++
++if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
++  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
++  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
++    ac_n= ac_c='
++' ac_t='	'
++  else
++    ac_n=-n ac_c= ac_t=
++  fi
++else
++  ac_n= ac_c='\c' ac_t=
++fi
++
++if test -z "$srcdir"; then
++  # Assume the source directory is the same one as the path to LTMAIN.
++  srcdir=`$echo "X$ltmain" | $Xsed -e 's%/[^/]*$%%'`
++  test "$srcdir" = "$ltmain" && srcdir=.
++fi
++
++trap "$rm conftest*; exit 1" 1 2 15
++if test "$verify_host" = yes; then
++  # Check for config.guess and config.sub.
++  ac_aux_dir=
++  for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
++    if test -f $ac_dir/config.guess; then
++      ac_aux_dir=$ac_dir
++      break
++    fi
++  done
++  if test -z "$ac_aux_dir"; then
++    echo "$progname: cannot find config.guess in $srcdir $srcdir/.. $srcdir/../.." 1>&2
++    echo "$help" 1>&2
++    exit 1
++  fi
++  ac_config_guess=$ac_aux_dir/config.guess
++  ac_config_sub=$ac_aux_dir/config.sub
++
++  # Make sure we can run config.sub.
++  if $SHELL $ac_config_sub sun4 >/dev/null 2>&1; then :
++  else
++    echo "$progname: cannot run $ac_config_sub" 1>&2
++    echo "$help" 1>&2
++    exit 1
++  fi
++
++  echo $ac_n "checking host system type""... $ac_c" 1>&6
++
++  host_alias=$host
++  case "$host_alias" in
++  "")
++    if host_alias=`$SHELL $ac_config_guess`; then :
++    else
++      echo "$progname: cannot guess host type; you must specify one" 1>&2
++      echo "$help" 1>&2
++      exit 1
++    fi ;;
++  esac
++  host=`$SHELL $ac_config_sub $host_alias`
++  echo "$ac_t$host" 1>&6
++
++  # Make sure the host verified.
++  test -z "$host" && exit 1
++
++elif test -z "$host"; then
++  echo "$progname: you must specify a host type if you use \`--no-verify'" 1>&2
++  echo "$help" 1>&2
++  exit 1
++else
++  host_alias=$host
++fi
++
++# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
++case "$host_os" in
++linux-gnu*) ;;
++linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
++esac
++
++host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
++host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
++host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++
++case "$host_os" in
++aix3*)
++  # AIX sometimes has problems with the GCC collect2 program.  For some
++  # reason, if we set the COLLECT_NAMES environment variable, the problems
++  # vanish in a puff of smoke.
++  if test "X${COLLECT_NAMES+set}" != Xset; then
++    COLLECT_NAMES=
++    export COLLECT_NAMES
++  fi
++  ;;
++esac
++
++# Determine commands to create old-style static archives.
++old_archive_cmds='$AR cru $oldlib$oldobjs'
++old_postinstall_cmds='chmod 644 $oldlib'
++old_postuninstall_cmds=
++
++# Set a sane default for `AR'.
++test -z "$AR" && AR=ar
++
++# Set a sane default for `OBJDUMP'.
++test -z "$OBJDUMP" && OBJDUMP=objdump
++
++# If RANLIB is not set, then run the test.
++if test "${RANLIB+set}" != "set"; then
++  result=no
++
++  echo $ac_n "checking for ranlib... $ac_c" 1>&6
++  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
++  for dir in $PATH; do
++    test -z "$dir" && dir=.
++    if test -f $dir/ranlib || test -f $dir/ranlib$ac_exeext; then
++      RANLIB="ranlib"
++      result="ranlib"
++      break
++    fi
++  done
++  IFS="$save_ifs"
++
++  echo "$ac_t$result" 1>&6
++fi
++
++if test -n "$RANLIB"; then
++  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
++  old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++fi
++
++# Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin.
++test -z "$DLLTOOL" && DLLTOOL=dlltool
++test -z "$OBJDUMP" && OBJDUMP=objdump
++test -z "$AS" && AS=as
++
++# Check to see if we are using GCC.
++if test "$with_gcc" != yes || test -z "$CC"; then
++  # If CC is not set, then try to find GCC or a usable CC.
++  if test -z "$CC"; then
++    echo $ac_n "checking for gcc... $ac_c" 1>&6
++    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
++    for dir in $PATH; do
++      test -z "$dir" && dir=.
++      if test -f $dir/gcc || test -f $dir/gcc$ac_exeext; then
++	CC="gcc"
++	break
++      fi
++    done
++    IFS="$save_ifs"
++
++    if test -n "$CC"; then
++      echo "$ac_t$CC" 1>&6
++    else
++      echo "$ac_t"no 1>&6
++    fi
++  fi
++
++  # Not "gcc", so try "cc", rejecting "/usr/ucb/cc".
++  if test -z "$CC"; then
++    echo $ac_n "checking for cc... $ac_c" 1>&6
++    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
++    cc_rejected=no
++    for dir in $PATH; do
++      test -z "$dir" && dir=.
++      if test -f $dir/cc || test -f $dir/cc$ac_exeext; then
++	if test "$dir/cc" = "/usr/ucb/cc"; then
++	  cc_rejected=yes
++	  continue
++	fi
++	CC="cc"
++	break
++      fi
++    done
++    IFS="$save_ifs"
++    if test $cc_rejected = yes; then
++      # We found a bogon in the path, so make sure we never use it.
++      set dummy $CC
++      shift
++      if test $# -gt 0; then
++	# We chose a different compiler from the bogus one.
++	# However, it has the same name, so the bogon will be chosen
++	# first if we set CC to just the name; use the full file name.
++	shift
++	set dummy "$dir/cc" "$@"
++	shift
++	CC="$@"
++      fi
++    fi
++
++    if test -n "$CC"; then
++      echo "$ac_t$CC" 1>&6
++    else
++      echo "$ac_t"no 1>&6
++    fi
++
++    if test -z "$CC"; then
++      echo "$progname: error: no acceptable cc found in \$PATH" 1>&2
++      exit 1
++    fi
++  fi
++
++  # Now see if the compiler is really GCC.
++  with_gcc=no
++  echo $ac_n "checking whether we are using GNU C... $ac_c" 1>&6
++  echo "$progname:581: checking whether we are using GNU C" >&5
++
++  $rm conftest.c
++  cat > conftest.c <<EOF
++#ifdef __GNUC__
++  yes;
++#endif
++EOF
++  if { ac_try='${CC-cc} -E conftest.c'; { (eval echo $progname:589: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++    with_gcc=yes
++  fi
++  $rm conftest.c
++  echo "$ac_t$with_gcc" 1>&6
++fi
++
++# Allow CC to be a program name with arguments.
++set dummy $CC
++compiler="$2"
++
++echo $ac_n "checking for object suffix... $ac_c" 1>&6
++$rm conftest*
++echo 'int i = 1;' > conftest.c
++echo "$progname:603: checking for object suffix" >& 5
++if { (eval echo $progname:604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; }; then
++  # Append any warnings to the config.log.
++  cat conftest.err 1>&5
++
++  for ac_file in conftest.*; do
++    case $ac_file in
++    *.c) ;;
++    *) objext=`echo $ac_file | sed -e s/conftest.//` ;;
++    esac
++  done
++else
++  cat conftest.err 1>&5
++  echo "$progname: failed program was:" >&5
++  cat conftest.c >&5
++fi
++$rm conftest*
++echo "$ac_t$objext" 1>&6
++
++echo $ac_n "checking for executable suffix... $ac_c" 1>&6
++if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_cv_exeext="no"
++  $rm conftest*
++  echo 'main () { return 0; }' > conftest.c
++  echo "$progname:629: checking for executable suffix" >& 5
++  if { (eval echo $progname:630: \"$ac_link\") 1>&5; (eval $ac_link) 2>conftest.err; }; then
++    # Append any warnings to the config.log.
++    cat conftest.err 1>&5
++
++    for ac_file in conftest.*; do
++      case $ac_file in
++      *.c | *.err | *.$objext ) ;;
++      *) ac_cv_exeext=.`echo $ac_file | sed -e s/conftest.//` ;;
++      esac
++    done
++  else
++    cat conftest.err 1>&5
++    echo "$progname: failed program was:" >&5
++    cat conftest.c >&5
++  fi
++  $rm conftest*
++fi
++if test "X$ac_cv_exeext" = Xno; then
++  exeext=""
++else
++  exeext="$ac_cv_exeext"
++fi
++echo "$ac_t$ac_cv_exeext" 1>&6
++
++echo $ac_n "checking for $compiler option to produce PIC... $ac_c" 1>&6
++pic_flag=
++special_shlib_compile_flags=
++wl=
++link_static_flag=
++no_builtin_flag=
++
++if test "$with_gcc" = yes; then
++  wl='-Wl,'
++  link_static_flag='-static'
++
++  case "$host_os" in
++  beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
++    # PIC is the default for these OSes.
++    ;;
++  aix*)
++    # Below there is a dirty hack to force normal static linking with -ldl
++    # The problem is because libdl dynamically linked with both libc and
++    # libC (AIX C++ library), which obviously doesn't included in libraries
++    # list by gcc. This cause undefined symbols with -static flags.
++    # This hack allows C programs to be linked with "-static -ldl", but
++    # we not sure about C++ programs.
++    link_static_flag="$link_static_flag ${wl}-lC"
++    ;;
++  cygwin* | mingw* | os2*)
++    # We can build DLLs from non-PIC.
++    ;;
++  amigaos*)
++    # FIXME: we need at least 68020 code to build shared libraries, but
++    # adding the `-m68020' flag to GCC prevents building anything better,
++    # like `-m68040'.
++    pic_flag='-m68020 -resident32 -malways-restore-a4'
++    ;;
++  sysv4*MP*)
++    if test -d /usr/nec; then
++       pic_flag=-Kconform_pic
++    fi
++    ;;
++  *)
++    pic_flag='-fPIC'
++    ;;
++  esac
++else
++  # PORTME Check for PIC flags for the system compiler.
++  case "$host_os" in
++  aix3* | aix4*)
++    # All AIX code is PIC.
++    link_static_flag='-bnso -bI:/lib/syscalls.exp'
++    ;;
++
++  hpux9* | hpux10* | hpux11*)
++    # Is there a better link_static_flag that works with the bundled CC?
++    wl='-Wl,'
++    link_static_flag="${wl}-a ${wl}archive"
++    pic_flag='+Z'
++    ;;
++
++  irix5* | irix6*)
++    wl='-Wl,'
++    link_static_flag='-non_shared'
++    # PIC (with -KPIC) is the default.
++    ;;
++
++  cygwin* | mingw* | os2*)
++    # We can build DLLs from non-PIC.
++    ;;
++
++  osf3* | osf4* | osf5*)
++    # All OSF/1 code is PIC.
++    wl='-Wl,'
++    link_static_flag='-non_shared'
++    ;;
++
++  sco3.2v5*)
++    pic_flag='-Kpic'
++    link_static_flag='-dn'
++    special_shlib_compile_flags='-belf'
++    ;;
++
++  solaris*)
++    pic_flag='-KPIC'
++    link_static_flag='-Bstatic'
++    wl='-Wl,'
++    ;;
++
++  sunos4*)
++    pic_flag='-PIC'
++    link_static_flag='-Bstatic'
++    wl='-Qoption ld '
++    ;;
++
++  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++    pic_flag='-KPIC'
++    link_static_flag='-Bstatic'
++    wl='-Wl,'
++    ;;
++
++  uts4*)
++    pic_flag='-pic'
++    link_static_flag='-Bstatic'
++    ;;
++  sysv4*MP*)
++    if test -d /usr/nec ;then
++      pic_flag='-Kconform_pic'
++      link_static_flag='-Bstatic'
++    fi
++    ;;
++  *)
++    can_build_shared=no
++    ;;
++  esac
++fi
++
++if test -n "$pic_flag"; then
++  echo "$ac_t$pic_flag" 1>&6
++
++  # Check to make sure the pic_flag actually works.
++  echo $ac_n "checking if $compiler PIC flag $pic_flag works... $ac_c" 1>&6
++  $rm conftest*
++  echo "int some_variable = 0;" > conftest.c
++  save_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS $pic_flag -DPIC"
++  echo "$progname:776: checking if $compiler PIC flag $pic_flag works" >&5
++  if { (eval echo $progname:777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
++    # Append any warnings to the config.log.
++    cat conftest.err 1>&5
++    
++    case "$host_os" in
++    hpux9* | hpux10* | hpux11*)
++      # On HP-UX, both CC and GCC only warn that PIC is supported... then they
++      # create non-PIC objects.  So, if there were any warnings, we assume that
++      # PIC is not supported.
++      if test -s conftest.err; then
++	echo "$ac_t"no 1>&6
++	can_build_shared=no
++	pic_flag=
++      else
++	echo "$ac_t"yes 1>&6
++	pic_flag=" $pic_flag"
++      fi
++      ;;
++    *)
++      echo "$ac_t"yes 1>&6
++      pic_flag=" $pic_flag"
++      ;;
++    esac
++  else
++    # Append any errors to the config.log.
++    cat conftest.err 1>&5
++    can_build_shared=no
++    pic_flag=
++    echo "$ac_t"no 1>&6
++  fi
++  CFLAGS="$save_CFLAGS"
++  $rm conftest*
++else
++  echo "$ac_t"none 1>&6
++fi
++
++# Check to see if options -o and -c are simultaneously supported by compiler
++echo $ac_n "checking if $compiler supports -c -o file.o... $ac_c" 1>&6
++$rm -r conftest 2>/dev/null
++mkdir conftest
++cd conftest
++$rm conftest*
++echo "int some_variable = 0;" > conftest.c
++mkdir out
++# According to Tom Tromey, Ian Lance Taylor reported there are C compilers
++# that will create temporary files in the current directory regardless of
++# the output directory.  Thus, making CWD read-only will cause this test
++# to fail, enabling locking or at least warning the user not to do parallel
++# builds.
++chmod -w .
++save_CFLAGS="$CFLAGS"
++CFLAGS="$CFLAGS -o out/conftest2.o"
++echo "$progname:829: checking if $compiler supports -c -o file.o" >&5
++if { (eval echo $progname:830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.o; then
++
++  # The compiler can only warn and ignore the option if not recognized
++  # So say no if there are warnings
++    if test -s out/conftest.err; then
++      echo "$ac_t"no 1>&6
++      compiler_c_o=no
++    else
++      echo "$ac_t"yes 1>&6
++      compiler_c_o=yes
++    fi
++else
++  # Append any errors to the config.log.
++  cat out/conftest.err 1>&5
++  compiler_c_o=no
++  echo "$ac_t"no 1>&6
++fi
++CFLAGS="$save_CFLAGS"
++chmod u+w .
++$rm conftest* out/*
++rmdir out
++cd ..
++rmdir conftest
++$rm -r conftest 2>/dev/null
++
++if test x"$compiler_c_o" = x"yes"; then
++  # Check to see if we can write to a .lo
++  echo $ac_n "checking if $compiler supports -c -o file.lo... $ac_c" 1>&6
++  $rm conftest*
++  echo "int some_variable = 0;" > conftest.c
++  save_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -c -o conftest.lo"
++  echo "$progname:862: checking if $compiler supports -c -o file.lo" >&5
++if { (eval echo $progname:863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.lo; then
++
++    # The compiler can only warn and ignore the option if not recognized
++    # So say no if there are warnings
++      if test -s conftest.err; then
++	echo "$ac_t"no 1>&6
++	compiler_o_lo=no
++      else
++	echo "$ac_t"yes 1>&6
++	compiler_o_lo=yes
++      fi
++  else
++    # Append any errors to the config.log.
++    cat conftest.err 1>&5
++    compiler_o_lo=no
++    echo "$ac_t"no 1>&6
++  fi
++  CFLAGS="$save_CFLAGS"
++  $rm conftest*
++else
++  compiler_o_lo=no
++fi
++
++# Check to see if we can do hard links to lock some files if needed
++hard_links="nottested"
++if test "$compiler_c_o" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  echo $ac_n "checking if we can lock with hard links... $ac_c" 1>&6
++  hard_links=yes
++  $rm conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  echo "$ac_t$hard_links" 1>&6
++  $rm conftest*
++  if test "$hard_links" = no; then
++    echo "*** WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2
++    need_locks=warn
++  fi
++else
++  need_locks=no
++fi
++
++if test "$with_gcc" = yes; then
++  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
++  echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions ... $ac_c" 1>&6
++  $rm conftest*
++  echo "int some_variable = 0;" > conftest.c
++  save_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.c"
++  echo "$progname:914: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++  if { (eval echo $progname:915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then
++
++    # The compiler can only warn and ignore the option if not recognized
++    # So say no if there are warnings
++      if test -s conftest.err; then
++	echo "$ac_t"no 1>&6
++	compiler_rtti_exceptions=no
++      else
++	echo "$ac_t"yes 1>&6
++	compiler_rtti_exceptions=yes
++      fi
++  else
++    # Append any errors to the config.log.
++    cat conftest.err 1>&5
++    compiler_rtti_exceptions=no
++    echo "$ac_t"no 1>&6
++  fi
++  CFLAGS="$save_CFLAGS"
++  $rm conftest*
++
++  if test "$compiler_rtti_exceptions" = "yes"; then
++    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
++  else
++    no_builtin_flag=' -fno-builtin'
++  fi
++  
++fi
++
++# Check for any special shared library compilation flags.
++if test -n "$special_shlib_compile_flags"; then
++  echo "$progname: warning: \`$CC' requires \`$special_shlib_compile_flags' to build shared libraries" 1>&2
++  if echo "$old_CC $old_CFLAGS " | egrep -e "[ 	]$special_shlib_compile_flags[ 	]" >/dev/null; then :
++  else
++    echo "$progname: add \`$special_shlib_compile_flags' to the CC or CFLAGS env variable and reconfigure" 1>&2
++    can_build_shared=no
++  fi
++fi
++
++echo $ac_n "checking if $compiler static flag $link_static_flag works... $ac_c" 1>&6
++$rm conftest*
++echo 'main(){return(0);}' > conftest.c
++save_LDFLAGS="$LDFLAGS"
++LDFLAGS="$LDFLAGS $link_static_flag"
++echo "$progname:958: checking if $compiler static flag $link_static_flag works" >&5
++if { (eval echo $progname:959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++  echo "$ac_t$link_static_flag" 1>&6
++else
++  echo "$ac_t"none 1>&6
++  link_static_flag=
++fi
++LDFLAGS="$save_LDFLAGS"
++$rm conftest*
++
++if test -z "$LN_S"; then
++  # Check to see if we can use ln -s, or we need hard links.
++  echo $ac_n "checking whether ln -s works... $ac_c" 1>&6
++  $rm conftest.dat
++  if ln -s X conftest.dat 2>/dev/null; then
++    $rm conftest.dat
++    LN_S="ln -s"
++  else
++    LN_S=ln
++  fi
++  if test "$LN_S" = "ln -s"; then
++    echo "$ac_t"yes 1>&6
++  else
++    echo "$ac_t"no 1>&6
++  fi
++fi
++
++# Make sure LD is an absolute path.
++if test -z "$LD"; then
++  ac_prog=ld
++  if test "$with_gcc" = yes; then
++    # Check if gcc -print-prog-name=ld gives a path.
++    echo $ac_n "checking for ld used by GCC... $ac_c" 1>&6
++    echo "$progname:991: checking for ld used by GCC" >&5
++    ac_prog=`($CC -print-prog-name=ld) 2>&5`
++    case "$ac_prog" in
++    # Accept absolute paths.
++    [\\/]* | [A-Za-z]:[\\/]*)
++      re_direlt='/[^/][^/]*/\.\./'
++      # Canonicalize the path of ld
++      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
++      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
++	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
++      done
++      test -z "$LD" && LD="$ac_prog"
++      ;;
++    "")
++      # If it fails, then pretend we are not using GCC.
++      ac_prog=ld
++      ;;
++    *)
++      # If it is relative, then search for the first ld in PATH.
++      with_gnu_ld=unknown
++      ;;
++    esac
++  elif test "$with_gnu_ld" = yes; then
++    echo $ac_n "checking for GNU ld... $ac_c" 1>&6
++    echo "$progname:1015: checking for GNU ld" >&5
++  else
++    echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
++    echo "$progname:1018: checking for non-GNU ld" >&5
++  fi
++
++  if test -z "$LD"; then
++    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
++    for ac_dir in $PATH; do
++      test -z "$ac_dir" && ac_dir=.
++      if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
++	LD="$ac_dir/$ac_prog"
++	# Check to see if the program is GNU ld.  I'd rather use --version,
++	# but apparently some GNU ld's only accept -v.
++	# Break only if it was the GNU/non-GNU ld that we prefer.
++	if "$LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
++	  test "$with_gnu_ld" != no && break
++	else
++	  test "$with_gnu_ld" != yes && break
++	fi
++      fi
++    done
++    IFS="$ac_save_ifs"
++  fi
++
++  if test -n "$LD"; then
++    echo "$ac_t$LD" 1>&6
++  else
++    echo "$ac_t"no 1>&6
++  fi
++
++  if test -z "$LD"; then
++    echo "$progname: error: no acceptable ld found in \$PATH" 1>&2
++    exit 1
++  fi
++fi
++
++# Check to see if it really is or is not GNU ld.
++echo $ac_n "checking if the linker ($LD) is GNU ld... $ac_c" 1>&6
++# I'd rather use --version here, but apparently some GNU ld's only accept -v.
++if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
++  with_gnu_ld=yes
++else
++  with_gnu_ld=no
++fi
++echo "$ac_t$with_gnu_ld" 1>&6
++
++# See if the linker supports building shared libraries.
++echo $ac_n "checking whether the linker ($LD) supports shared libraries... $ac_c" 1>&6
++
++allow_undefined_flag=
++no_undefined_flag=
++need_lib_prefix=unknown
++need_version=unknown
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++archive_cmds=
++archive_expsym_cmds=
++old_archive_from_new_cmds=
++export_dynamic_flag_spec=
++whole_archive_flag_spec=
++thread_safe_flag_spec=
++hardcode_libdir_flag_spec=
++hardcode_libdir_separator=
++hardcode_direct=no
++hardcode_minus_L=no
++hardcode_shlibpath_var=unsupported
++runpath_var=
++always_export_symbols=no
++export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
++# include_expsyms should be a list of space-separated symbols to be *always*
++# included in the symbol list
++include_expsyms=
++# exclude_expsyms can be an egrep regular expression of symbols to exclude
++# it will be wrapped by ` (' and `)$', so one must not match beginning or
++# end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++# as well as any symbol that contains `d'.
++exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
++# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++# platforms (ab)use it in PIC code, but their linkers get confused if
++# the symbol is explicitly referenced.  Since portable code cannot
++# rely on this symbol name, it's probably fine to never include it in
++# preloaded symbol tables.
++
++case "$host_os" in
++cygwin* | mingw*)
++  # FIXME: the MSVC++ port hasn't been tested in a loooong time
++  # When not using gcc, we currently assume that we are using
++  # Microsoft Visual C++.
++  if test "$with_gcc" != yes; then
++    with_gnu_ld=no
++  fi
++  ;;
++
++esac
++
++ld_shlibs=yes
++if test "$with_gnu_ld" = yes; then
++  # If archive_cmds runs LD, not CC, wlarc should be empty
++  wlarc='${wl}'
++
++  # See if GNU ld supports shared libraries.
++  case "$host_os" in
++  aix3* | aix4*)
++    # On AIX, the GNU linker is very broken
++    ld_shlibs=no
++    cat <<EOF 1>&2
++
++*** Warning: the GNU linker, at least up to release 2.9.1, is reported
++*** to be unable to reliably create shared libraries on AIX.
++*** Therefore, libtool is disabling shared libraries support.  If you
++*** really care for shared libraries, you may want to modify your PATH
++*** so that a non-GNU linker is found, and then restart.
++
++EOF
++    ;;
++
++  amigaos*)
++    archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_minus_L=yes
++
++    # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
++    # that the semantics of dynamic libraries on AmigaOS, at least up
++    # to version 4, is to share data among multiple programs linked
++    # with the same dynamic library.  Since this doesn't match the
++    # behavior of shared libraries on other platforms, we can use
++    # them.
++    ld_shlibs=no
++    ;;
++
++  beos*)
++    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
++      allow_undefined_flag=unsupported
++      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++      # support --undefined.  This deserves some investigation.  FIXME
++      archive_cmds='$CC -nostart $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
++    else
++      ld_shlibs=no
++    fi
++    ;;
++
++  cygwin* | mingw*)
++    # hardcode_libdir_flag_spec is actually meaningless, as there is
++    # no search path for DLLs.
++    hardcode_libdir_flag_spec='-L$libdir'
++    allow_undefined_flag=unsupported
++    always_export_symbols=yes
++
++    # Extract the symbol export list from an `--export-all' def file,
++    # then regenerate the def file from the symbol export list, so that
++    # the compiled dll only exports the symbol export list.
++    # Be careful not to strip the DATA tag left by newer dlltools.
++    export_symbols_cmds='test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~
++      test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~
++      $DLLTOOL --export-all --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --output-def $objdir/$soname-def  $objdir/$soname-ltdll.$objext $libobjs $convenience~
++      sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $objdir/$soname-def > $export_symbols'
++
++    # If DATA tags from a recent dlltool are present, honour them!
++    archive_expsym_cmds='echo EXPORTS > $objdir/$soname-def~
++      _lt_hint=1;
++      cat $export_symbols | while read symbol; do
++        set dummy \$symbol;
++        case \$# in
++          2) echo "	\$2 @ \$_lt_hint ; " >> $objdir/$soname-def;;
++          *) echo "     \$2 @ \$_lt_hint \$3 ; " >> $objdir/$soname-def;;
++        esac;
++	_lt_hint=`expr 1 + \$_lt_hint`;
++      done~
++      test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~
++      test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~
++      $CC -Wl,--base-file,$objdir/$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~
++      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~
++      $CC -Wl,--base-file,$objdir/$soname-base $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~
++      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~
++      $CC $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts'
++
++      old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$libname.a' 
++    ;;
++
++  netbsd*)
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++    else
++      archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
++      # can we support soname and/or expsyms with a.out? -oliva
++    fi
++    ;;
++
++  solaris* | sysv5*)
++    if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
++      ld_shlibs=no
++      cat <<EOF 1>&2
++
++*** Warning: The releases 2.8.* of the GNU linker cannot reliably
++*** create shared libraries on Solaris systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.9.1 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++EOF
++    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
++      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++    else
++      ld_shlibs=no
++    fi
++    ;;      
++
++  sunos4*)
++    archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linkopts'
++    wlarc=
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  *)
++    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
++      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++    else
++      ld_shlibs=no
++    fi
++    ;;
++  esac
++
++  if test "$ld_shlibs" = yes; then
++    runpath_var=LD_RUN_PATH
++    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
++    export_dynamic_flag_spec='${wl}--export-dynamic'
++    case $host_os in
++    cygwin* | mingw*)
++      # dlltool doesn't understand --whole-archive et. al.
++      whole_archive_flag_spec=
++      ;;
++    *)
++      # ancient GNU ld didn't support --whole-archive et. al.
++      if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
++        whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++        whole_archive_flag_spec=
++      fi
++      ;;
++    esac
++  fi
++else
++  # PORTME fill in a description of your system's linker (not GNU ld)
++  case "$host_os" in
++  aix3*)
++    allow_undefined_flag=unsupported
++    always_export_symbols=yes
++    archive_expsym_cmds='$LD -o $objdir/$soname $libobjs $deplibs $linkopts -bE:$export_symbols -T512 -H512 -bM:SRE~$AR cru $lib $objdir/$soname'
++    # Note: this linker hardcodes the directories in LIBPATH if there
++    # are no directories specified by -L.
++    hardcode_minus_L=yes
++    if test "$with_gcc" = yes && test -z "$link_static_flag"; then
++      # Neither direct hardcoding nor static linking is supported with a
++      # broken collect2.
++      hardcode_direct=unsupported
++    fi
++    ;;
++
++  aix4*)
++    hardcode_libdir_flag_spec='${wl}-b ${wl}nolibpath ${wl}-b ${wl}libpath:$libdir:/usr/lib:/lib'
++    hardcode_libdir_separator=':'
++    if test "$with_gcc" = yes; then
++      collect2name=`${CC} -print-prog-name=collect2`
++      if test -f "$collect2name" && \
++	 strings "$collect2name" | grep resolve_lib_name >/dev/null
++      then
++	# We have reworked collect2
++	hardcode_direct=yes
++      else
++	# We have old collect2
++	hardcode_direct=unsupported
++	# It fails to find uninstalled libraries when the uninstalled
++	# path is not listed in the libpath.  Setting hardcode_minus_L
++	# to unsupported forces relinking
++	hardcode_minus_L=yes
++	hardcode_libdir_flag_spec='-L$libdir'
++	hardcode_libdir_separator=
++      fi
++      shared_flag='-shared'
++    else
++      shared_flag='${wl}-bM:SRE'
++      hardcode_direct=yes
++    fi
++    allow_undefined_flag=' ${wl}-berok'
++    archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}'
++    archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}'
++    case "$host_os" in aix4.[01]|aix4.[01].*)
++      # According to Greg Wooledge, -bexpall is only supported from AIX 4.2 on
++      always_export_symbols=yes ;;
++    esac
++   ;;
++
++  amigaos*)
++    archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_minus_L=yes
++    # see comment about different semantics on the GNU ld section
++    ld_shlibs=no
++    ;;
++
++  cygwin* | mingw*)
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    # hardcode_libdir_flag_spec is actually meaningless, as there is
++    # no search path for DLLs.
++    hardcode_libdir_flag_spec=' '
++    allow_undefined_flag=unsupported
++    # Tell ltmain to make .lib files, not .a files.
++    libext=lib
++    # FIXME: Setting linknames here is a bad hack.
++    archive_cmds='$CC -o $lib $libobjs $linkopts `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
++    # The linker will automatically build a .lib file if we build a DLL.
++    old_archive_from_new_cmds='true'
++    # FIXME: Should let the user specify the lib program.
++    old_archive_cmds='lib /OUT:$oldlib$oldobjs'
++    fix_srcfile_path='`cygpath -w $srcfile`'
++    ;;
++
++  freebsd1*)
++    ld_shlibs=no
++    ;;
++
++  # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
++  # support.  Future versions do this automatically, but an explicit c++rt0.o
++  # does not break anything, and helps significantly (at the cost of a little
++  # extra space).
++  freebsd2.2*)
++    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts /usr/lib/c++rt0.o'
++    hardcode_libdir_flag_spec='-R$libdir'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  # Unfortunately, older versions of FreeBSD 2 do not have this feature.
++  freebsd2*)
++    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
++    hardcode_direct=yes
++    hardcode_minus_L=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
++  freebsd*)
++    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts'
++    hardcode_libdir_flag_spec='-R$libdir'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  hpux9* | hpux10* | hpux11*)
++    case "$host_os" in
++    hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;;
++    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linkopts' ;;
++    esac
++    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++    hardcode_libdir_separator=:
++    hardcode_direct=yes
++    hardcode_minus_L=yes # Not in the search PATH, but as the default
++			 # location of the library.
++    export_dynamic_flag_spec='${wl}-E'
++    ;;
++
++  irix5* | irix6*)
++    if test "$with_gcc" = yes; then
++      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++    else
++      archive_cmds='$LD -shared $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++    fi
++    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    hardcode_libdir_separator=:
++    ;;
++
++  netbsd*)
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'  # a.out
++    else
++      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linkopts'      # ELF
++    fi
++    hardcode_libdir_flag_spec='${wl}-R$libdir'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  openbsd*)
++    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
++    hardcode_libdir_flag_spec='-R$libdir'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  os2*)
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_minus_L=yes
++    allow_undefined_flag=unsupported
++    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $objdir/$libname.def~$echo DATA >> $objdir/$libname.def~$echo " SINGLE NONSHARED" >> $objdir/$libname.def~$echo EXPORTS >> $objdir/$libname.def~emxexp $libobjs >> $objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $linkopts $objdir/$libname.def'
++    old_archive_from_new_cmds='emximp -o $objdir/$libname.a $objdir/$libname.def'
++    ;;
++
++  osf3*)
++    if test "$with_gcc" = yes; then
++      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
++      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++    else
++      allow_undefined_flag=' -expect_unresolved \*'
++      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++    fi
++    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    hardcode_libdir_separator=:
++    ;;
++
++  osf4* | osf5*)  # As osf3* with the addition of the -msym flag
++    if test "$with_gcc" = yes; then
++      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
++      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++    else
++      allow_undefined_flag=' -expect_unresolved \*'
++      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++    fi
++    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    hardcode_libdir_separator=:
++    ;;
++  rhapsody*)
++    archive_cmds='$CC -bundle -undefined suppress -o $lib $libobjs $deplibs $linkopts'
++    hardcode_libdir_flags_spec='-L$libdir'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++                                       
++  sco3.2v5*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
++    hardcode_shlibpath_var=no
++    runpath_var=LD_RUN_PATH
++    hardcode_runpath_var=yes
++    ;;
++
++  solaris*)
++    no_undefined_flag=' -z text'
++    # $CC -shared without GNU ld will not create a library from C++
++    # object files and a static libstdc++, better avoid it by now
++    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts'
++    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp'
++    hardcode_libdir_flag_spec='-R$libdir'
++    hardcode_shlibpath_var=no
++    case "$host_os" in
++    solaris2.[0-5] | solaris2.[0-5].*) ;;
++    *) # Supported since Solaris 2.6 (maybe 2.5.1?)
++      whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
++    esac
++    ;;
++
++  sunos4*)
++    archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linkopts'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_direct=yes
++    hardcode_minus_L=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  sysv4)
++    if test "x$host_vendor" = xsequent; then
++      # Use $CC to link under sequent, because it throws in some extra .o 
++      # files that make .init and .fini sections work.
++      archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $linkopts'
++    else
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
++    fi
++    runpath_var='LD_RUN_PATH'
++    hardcode_shlibpath_var=no
++    hardcode_direct=no #Motorola manual says yes, but my tests say they lie 
++    ;;  
++
++  sysv4.3*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
++    hardcode_shlibpath_var=no
++    export_dynamic_flag_spec='-Bexport'
++    ;;
++
++  sysv5*)
++    no_undefined_flag=' -z text'
++    # $CC -shared without GNU ld will not create a library from C++
++    # object files and a static libstdc++, better avoid it by now
++    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts'
++    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp'
++    hardcode_libdir_flag_spec=
++    hardcode_shlibpath_var=no
++    runpath_var='LD_RUN_PATH'
++    ;;
++
++  uts4*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_shlibpath_var=no
++    ;;
++
++  dgux*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_shlibpath_var=no
++    ;;
++
++  sysv4*MP*)
++    if test -d /usr/nec; then
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
++      hardcode_shlibpath_var=no
++      runpath_var=LD_RUN_PATH
++      hardcode_runpath_var=yes
++      ld_shlibs=yes
++    fi
++    ;;
++
++  sysv4.2uw2*)
++    archive_cmds='$LD -G -o $lib $libobjs $deplibs $linkopts'
++    hardcode_direct=yes
++    hardcode_minus_L=no
++    hardcode_shlibpath_var=no
++    hardcode_runpath_var=yes
++    runpath_var=LD_RUN_PATH
++    ;;
++
++  unixware7*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
++    runpath_var='LD_RUN_PATH'
++    hardcode_shlibpath_var=no
++    ;;
++
++  *)
++    ld_shlibs=no
++    ;;
++  esac
++fi
++echo "$ac_t$ld_shlibs" 1>&6
++test "$ld_shlibs" = no && can_build_shared=no
++
++if test -z "$NM"; then
++  echo $ac_n "checking for BSD-compatible nm... $ac_c" 1>&6
++  case "$NM" in
++  [\\/]* | [A-Za-z]:[\\/]*) ;; # Let the user override the test with a path.
++  *)
++    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
++    for ac_dir in $PATH /usr/ucb /usr/ccs/bin /bin; do
++      test -z "$ac_dir" && ac_dir=.
++      if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext; then
++	# Check to see if the nm accepts a BSD-compat flag.
++	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
++	#   nm: unknown option "B" ignored
++	if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
++	  NM="$ac_dir/nm -B"
++	  break
++	elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
++	  NM="$ac_dir/nm -p"
++	  break
++	else
++	  NM=${NM="$ac_dir/nm"} # keep the first match, but
++	  continue # so that we can try to find one that supports BSD flags
++	fi
++      fi
++    done
++    IFS="$ac_save_ifs"
++    test -z "$NM" && NM=nm
++    ;;
++  esac
++  echo "$ac_t$NM" 1>&6
++fi
++
++# Check for command to grab the raw symbol name followed by C symbol from nm.
++echo $ac_n "checking command to parse $NM output... $ac_c" 1>&6
++
++# These are sane defaults that work on at least a few old systems.
++# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
++
++# Character class describing NM global symbol codes.
++symcode='[BCDEGRST]'
++
++# Regexp to match symbols that can be accessed directly from C.
++sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
++
++# Transform the above into a raw symbol and a C symbol.
++symxfrm='\1 \2\3 \3'
++
++# Transform an extracted symbol line into a proper C declaration
++global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
++
++# Define system-specific variables.
++case "$host_os" in
++aix*)
++  symcode='[BCDT]'
++  ;;
++cygwin* | mingw*)
++  symcode='[ABCDGISTW]'
++  ;;
++hpux*) # Its linker distinguishes data from code symbols
++  global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^. .* \(.*\)$/extern char \1;/p'"
++  ;;
++irix*)
++  symcode='[BCDEGRST]'
++  ;;
++solaris*)
++  symcode='[BDT]'
++  ;;
++sysv4)
++  symcode='[DFNSTU]'
++  ;;
++esac
++
++# If we're using GNU nm, then use its standard symbol codes.
++if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
++  symcode='[ABCDGISTW]'
++fi
++
++# Try without a prefix undercore, then with it.
++for ac_symprfx in "" "_"; do
++
++  # Write the raw and C identifiers.
++  global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode\)[ 	][ 	]*\($ac_symprfx\)$sympat$/$symxfrm/p'"
++
++  # Check to see that the pipe works correctly.
++  pipe_works=no
++  $rm conftest*
++  cat > conftest.c <<EOF
++#ifdef __cplusplus
++extern "C" {
++#endif
++char nm_test_var;
++void nm_test_func(){}
++#ifdef __cplusplus
++}
++#endif
++main(){nm_test_var='a';nm_test_func();return(0);}
++EOF
++
++  echo "$progname:1653: checking if global_symbol_pipe works" >&5
++  if { (eval echo $progname:1654: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then
++    # Now try to grab the symbols.
++    nlist=conftest.nm
++    if { echo "$progname:1657: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
++
++      # Try sorting and uniquifying the output.
++      if sort "$nlist" | uniq > "$nlist"T; then
++	mv -f "$nlist"T "$nlist"
++      else
++	rm -f "$nlist"T
++      fi
++
++      # Make sure that we snagged all the symbols we need.
++      if egrep ' nm_test_var$' "$nlist" >/dev/null; then
++	if egrep ' nm_test_func$' "$nlist" >/dev/null; then
++	  cat <<EOF > conftest.c
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++EOF
++	  # Now generate the symbol file.
++	  eval "$global_symbol_to_cdecl"' < "$nlist" >> conftest.c'
++
++	  cat <<EOF >> conftest.c
++#if defined (__STDC__) && __STDC__
++# define lt_ptr_t void *
++#else
++# define lt_ptr_t char *
++# define const
++#endif
++
++/* The mapping between symbol names and symbols. */
++const struct {
++  const char *name;
++  lt_ptr_t address;
++}
++lt_preloaded_symbols[] =
++{
++EOF
++	  sed 's/^. \(.*\) \(.*\)$/  {"\2", (lt_ptr_t) \&\2},/' < "$nlist" >> conftest.c
++	  cat <<\EOF >> conftest.c
++  {0, (lt_ptr_t) 0}
++};
++
++#ifdef __cplusplus
++}
++#endif
++EOF
++	  # Now try linking the two files.
++	  mv conftest.$objext conftstm.$objext
++	  save_LIBS="$LIBS"
++	  save_CFLAGS="$CFLAGS"
++	  LIBS="conftstm.$objext"
++	  CFLAGS="$CFLAGS$no_builtin_flag"
++	  if { (eval echo $progname:1709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++	    pipe_works=yes
++	  else
++	    echo "$progname: failed program was:" >&5
++	    cat conftest.c >&5
++	  fi
++	  LIBS="$save_LIBS"
++	else
++	  echo "cannot find nm_test_func in $nlist" >&5
++	fi
++      else
++	echo "cannot find nm_test_var in $nlist" >&5
++      fi
++    else
++      echo "cannot run $global_symbol_pipe" >&5
++    fi
++  else
++    echo "$progname: failed program was:" >&5
++    cat conftest.c >&5
++  fi
++  $rm conftest* conftst*
++
++  # Do not use the global_symbol_pipe unless it works.
++  if test "$pipe_works" = yes; then
++    break
++  else
++    global_symbol_pipe=
++  fi
++done
++if test "$pipe_works" = yes; then
++  echo "${ac_t}ok" 1>&6
++else
++  echo "${ac_t}failed" 1>&6
++fi
++
++if test -z "$global_symbol_pipe"; then
++  global_symbol_to_cdecl=
++fi
++
++# Check hardcoding attributes.
++echo $ac_n "checking how to hardcode library paths into programs... $ac_c" 1>&6
++hardcode_action=
++if test -n "$hardcode_libdir_flag_spec" || \
++   test -n "$runpath_var"; then
++
++  # We can hardcode non-existant directories.
++  if test "$hardcode_direct" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$hardcode_shlibpath_var" != no &&
++     test "$hardcode_minus_L" != no; then
++    # Linking always hardcodes the temporary library directory.
++    hardcode_action=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    hardcode_action=immediate
++  fi
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  hardcode_action=unsupported
++fi
++echo "$ac_t$hardcode_action" 1>&6
++
++
++reload_flag=
++reload_cmds='$LD$reload_flag -o $output$reload_objs'
++echo $ac_n "checking for $LD option to reload object files... $ac_c" 1>&6
++# PORTME Some linkers may need a different reload flag.
++reload_flag='-r'
++echo "$ac_t$reload_flag" 1>&6
++test -n "$reload_flag" && reload_flag=" $reload_flag"
++
++# PORTME Fill in your ld.so characteristics
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++file_magic_cmd=
++file_magic_test_file=
++deplibs_check_method='unknown'
++# Need to set the preceding variable on all platforms that support
++# interlibrary dependencies.
++# 'none' -- dependencies not supported.
++# `unknown' -- same as none, but documents that we really don't know.
++# 'pass_all' -- all dependencies passed with no checks.
++# 'test_compile' -- check by making test program.
++# 'file_magic [regex]' -- check by looking for files in library path
++# which responds to the $file_magic_cmd with a given egrep regex.
++# If you have `file' or equivalent on your system and you're not sure
++# whether `pass_all' will *always* work, you probably want this one.
++echo $ac_n "checking dynamic linker characteristics... $ac_c" 1>&6
++case "$host_os" in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}.so$versuffix $libname.a'
++  shlibpath_var=LIBPATH
++
++  # AIX has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}.so$major'
++  ;;
++
++aix4*)
++  version_type=linux
++  # AIX has no versioning support, so currently we can not hardcode correct
++  # soname into executable. Probably we can add versioning support to
++  # collect2, so additional links can be useful in future.
++  # We preserve .a as extension for shared libraries though AIX4.2
++  # and later linker supports .so
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.a'
++  shlibpath_var=LIBPATH
++  deplibs_check_method=pass_all
++  ;;
++
++amigaos*)
++  library_names_spec='$libname.ixlibrary $libname.a'
++  # Create ${libname}_ixlibrary.a entries in /sys/libs.
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
++  ;;
++
++beos*)
++  library_names_spec='${libname}.so'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  deplibs_check_method=pass_all
++  lt_cv_dlopen="load_add_on"
++  lt_cv_dlopen_libs=
++  lt_cv_dlopen_self=yes
++  ;;
++
++bsdi4*)
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
++  file_magic_cmd=/usr/bin/file
++  file_magic_test_file=/shlib/libc.so
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  export_dynamic_flag_spec=-rdynamic
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
++  ;;
++
++cygwin* | mingw*)
++  version_type=windows
++  need_version=no
++  need_lib_prefix=no
++  if test "$with_gcc" = yes; then
++    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.a'
++  else
++    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib'
++  fi
++  dynamic_linker='Win32 ld.exe'
++  deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++  file_magic_cmd='${OBJDUMP} -f'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
++  lt_cv_dlopen="LoadLibrary"
++  lt_cv_dlopen_libs=
++  ;;
++
++freebsd1*)
++  dynamic_linker=no
++  ;;
++  
++freebsd*)
++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  version_type=freebsd-$objformat
++  case "$version_type" in
++    freebsd-elf*)
++      deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
++      file_magic_cmd=/usr/bin/file
++      file_magic_test_file=`echo /usr/lib/libc.so*`
++      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
++      need_version=no
++      need_lib_prefix=no
++      ;;
++    freebsd-*)
++      deplibs_check_method=unknown
++      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
++      need_version=yes
++      ;;
++  esac
++  shlibpath_var=LD_LIBRARY_PATH
++  case "$host_os" in
++  freebsd2* | freebsd3.[01]* | freebsdelf3.[01]*)
++    shlibpath_overrides_runpath=yes
++    ;;
++  *) # from 3.2 on
++    shlibpath_overrides_runpath=no
++    ;;
++  esac
++  ;;
++
++gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  deplibs_check_method=pass_all
++  ;;
++
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  dynamic_linker="$host_os dld.sl"
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  shlibpath_var=SHLIB_PATH
++  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
++  soname_spec='${libname}${release}.sl$major'
++  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  postinstall_cmds='chmod 555 $lib'
++  case "$host_os" in
++  hpux10.20*)
++    # TODO:  Does this work for hpux-11 too?
++    deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
++    file_magic_cmd=/usr/bin/file
++    file_magic_test_file=/usr/lib/libc.sl
++    ;;
++  esac
++  ;;
++
++irix5* | irix6*)
++  version_type=irix
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}.so.$major'
++  library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so'
++  case "$host_os" in
++  irix5*)
++    libsuff= shlibsuff=
++    # this will be overridden with pass_all, but let us keep it just in case
++    deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
++    ;;
++  *)
++    case "$LD" in # libtool.m4 will add one of these switches to LD
++    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
++    ;;
++  esac
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  file_magic_cmd=/usr/bin/file
++  file_magic_test_file=`echo /lib${libsuff}/libc.so*`
++  deplibs_check_method='pass_all'
++  ;;
++
++# No shared lib support for Linux oldld, aout, or coff.
++linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
++  dynamic_linker=no
++  ;;
++
++# This must be Linux ELF.
++linux-gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  deplibs_check_method=pass_all
++
++  if test -f /lib/ld.so.1; then
++    dynamic_linker='GNU ld.so'
++  else
++    # Only the GNU ld.so supports shared libraries on MkLinux.
++    case "$host_cpu" in
++    powerpc*) dynamic_linker=no ;;
++    *) dynamic_linker='Linux ld.so' ;;
++    esac
++  fi
++  ;;
++
++netbsd*)
++  version_type=sunos
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
++    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
++    soname_spec='${libname}${release}.so$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++openbsd*)
++  version_type=sunos
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++    need_version=no
++  fi
++  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++os2*)
++  libname_spec='$name'
++  need_lib_prefix=no
++  library_names_spec='$libname.dll $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
++
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_version=no
++  soname_spec='${libname}${release}.so'
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
++  shlibpath_var=LD_LIBRARY_PATH
++  # this will be overridden with pass_all, but let us keep it just in case
++  deplibs_check_method='file_magic COFF format alpha shared library'
++  file_magic_cmd=/usr/bin/file
++  file_magic_test_file=/shlib/libc.so
++  deplibs_check_method='pass_all'
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  ;;
++
++rhapsody*)
++  version_type=sunos
++  library_names_spec='${libname}.so'
++  soname_spec='${libname}.so'
++  shlibpath_var=DYLD_LIBRARY_PATH
++  deplibs_check_method=pass_all
++  ;;
++
++sco3.2v5*)
++  version_type=osf
++  soname_spec='${libname}${release}.so$major'
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++solaris*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  deplibs_check_method="file_magic ELF [0-9][0-9]-bit [LM]SB dynamic lib"
++  file_magic_cmd=/usr/bin/file
++  file_magic_test_file=/lib/libc.so
++  ;;
++
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
++  ;;
++
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++  version_type=linux
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  case "$host_vendor" in
++    sequent)
++      file_magic_cmd='/bin/file'
++      deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
++      ;;
++    ncr)
++      deplibs_check_method='pass_all'
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
++      file_magic_cmd=/usr/bin/file
++      file_magic_test_file=`echo /usr/lib/libc.so*`
++      ;;
++  esac
++  ;;
++
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
++    soname_spec='$libname.so.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
++
++*)
++  dynamic_linker=no
++  ;;
++esac
++echo "$ac_t$dynamic_linker" 1>&6
++test "$dynamic_linker" = no && can_build_shared=no
++
++# Report the final consequences.
++echo "checking if libtool supports shared libraries... $can_build_shared" 1>&6
++
++# Only try to build win32 dlls if AC_LIBTOOL_WIN32_DLL was used in
++# configure.in, otherwise build static only libraries.
++case "$host_os" in
++cygwin* | mingw* | os2*)
++  if test x$can_build_shared = xyes; then
++    test x$enable_win32_dll = xno && can_build_shared=no
++    echo "checking if package supports dlls... $can_build_shared" 1>&6
++  fi
++;;
++esac
++
++if test -n "$file_magic_test_file" && test -n "$file_magic_cmd"; then
++  case "$deplibs_check_method" in
++  "file_magic "*)
++    file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++    if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
++       egrep "$file_magic_regex" > /dev/null; then
++      :
++    else
++      cat <<EOF 1>&2
++
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such.  This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem.  Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool@gnu.org
++
++EOF
++    fi ;;
++  esac
++fi
++
++echo $ac_n "checking whether to build shared libraries... $ac_c" 1>&6
++test "$can_build_shared" = "no" && enable_shared=no
++
++# On AIX, shared libraries and static libraries use the same namespace, and
++# are all built from PIC.
++case "$host_os" in
++aix3*)
++  test "$enable_shared" = yes && enable_static=no
++  if test -n "$RANLIB"; then
++    archive_cmds="$archive_cmds~\$RANLIB \$lib"
++    postinstall_cmds='$RANLIB $lib'
++  fi
++  ;;
++
++aix4*)
++  test "$enable_shared" = yes && enable_static=no
++  ;;
++esac
++
++echo "$ac_t$enable_shared" 1>&6
++
++# Make sure either enable_shared or enable_static is yes.
++test "$enable_shared" = yes || enable_static=yes
++
++echo "checking whether to build static libraries... $enable_static" 1>&6
++
++if test "$hardcode_action" = relink; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
++fi
++
++echo $ac_n "checking for objdir... $ac_c" 1>&6
++rm -f .libs 2>/dev/null
++mkdir .libs 2>/dev/null
++if test -d .libs; then
++  objdir=.libs
++else
++  # MS-DOS does not allow filenames that begin with a dot.
++  objdir=_libs
++fi
++rmdir .libs 2>/dev/null
++echo "$ac_t$objdir" 1>&6
++
++if test "x$enable_dlopen" != xyes; then
++  enable_dlopen=unknown
++  enable_dlopen_self=unknown
++  enable_dlopen_self_static=unknown
++else
++if eval "test \"`echo '$''{'lt_cv_dlopen'+set}'`\" != set"; then
++  lt_cv_dlopen=no lt_cv_dlopen_libs=
++echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
++echo "$progname:2248: checking for dlopen in -ldl" >&5
++ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-ldl  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 2256 "ltconfig"
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char dlopen();
++
++int main() {
++dlopen()
++; return 0; }
++EOF
++if { (eval echo $progname:2269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "$progname: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++else
++  echo "$ac_t""no" 1>&6
++echo $ac_n "checking for dlopen""... $ac_c" 1>&6
++echo "$progname:2288: checking for dlopen" >&5
++if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 2293 "ltconfig"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char dlopen(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char dlopen();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_dlopen) || defined (__stub___dlopen)
++choke me
++#else
++dlopen();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo $progname:2318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_dlopen=yes"
++else
++  echo "$progname: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_dlopen=no"
++fi
++rm -f conftest*
++fi
++if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  lt_cv_dlopen="dlopen"
++else
++  echo "$ac_t""no" 1>&6
++echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
++echo "$progname:2335: checking for dld_link in -ldld" >&5
++ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-ldld  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 2343 "ltconfig"
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char dld_link();
++
++int main() {
++dld_link()
++; return 0; }
++EOF
++if { (eval echo $progname:2356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "$progname: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
++else
++  echo "$ac_t""no" 1>&6
++echo $ac_n "checking for shl_load""... $ac_c" 1>&6
++echo "$progname:2375: checking for shl_load" >&5
++if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 2380 "ltconfig"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char shl_load(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char shl_load();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_shl_load) || defined (__stub___shl_load)
++choke me
++#else
++shl_load();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo $progname:2405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_shl_load=yes"
++else
++  echo "$progname: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_shl_load=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  lt_cv_dlopen="shl_load"
++else
++  echo "$ac_t""no" 1>&6
++echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
++echo "$progname:2423: checking for shl_load in -ldld" >&5
++ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-ldld  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 2431 "ltconfig"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char shl_load();
++
++int main() {
++shl_load()
++; return 0; }
++EOF
++if { (eval echo $progname:2445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "$progname: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++
++fi
++
++    
++fi
++
++  
++fi
++
++
++fi
++
++fi
++
++  if test "x$lt_cv_dlopen" != xno; then
++    enable_dlopen=yes
++  fi
++
++  case "$lt_cv_dlopen" in
++  dlopen)
++for ac_hdr in dlfcn.h; do
++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
++echo "$progname:2488: checking for $ac_hdr" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 2493 "ltconfig"
++#include <$ac_hdr>
++int fnord = 0;
++EOF
++ac_try="$ac_compile >/dev/null 2>conftest.out"
++{ (eval echo $progname:2498: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=yes"
++else
++  echo "$ac_err" >&5
++  echo "$progname: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
++fi
++rm -f conftest*
++fi
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++    if test "x$ac_cv_header_dlfcn_h" = xyes; then
++      CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++    fi
++    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++    LIBS="$lt_cv_dlopen_libs $LIBS"
++
++  echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
++echo "$progname:2526: checking whether a program can dlopen itself" >&5
++if test "${lt_cv_dlopen_self+set}" = set; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test "$cross_compiling" = yes; then
++    lt_cv_dlopen_self=cross
++  else
++    cat > conftest.c <<EOF
++#line 2534 "ltconfig"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++# define LTDL_GLOBAL	RTLD_GLOBAL
++#else
++# ifdef DL_GLOBAL
++#  define LTDL_GLOBAL	DL_GLOBAL
++# else
++#  define LTDL_GLOBAL	0
++# endif
++#endif
++
++/* We may have to define LTDL_LAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LTDL_LAZY_OR_NOW
++# ifdef RTLD_LAZY
++#  define LTDL_LAZY_OR_NOW	RTLD_LAZY
++# else
++#  ifdef DL_LAZY
++#   define LTDL_LAZY_OR_NOW	DL_LAZY
++#  else
++#   ifdef RTLD_NOW
++#    define LTDL_LAZY_OR_NOW	RTLD_NOW
++#   else
++#    ifdef DL_NOW
++#     define LTDL_LAZY_OR_NOW	DL_NOW
++#    else
++#     define LTDL_LAZY_OR_NOW	0
++#    endif
++#   endif
++#  endif
++# endif
++#endif
++
++fnord() { int i=42;}
++main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
++    if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord");
++	       if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } 
++
++EOF
++if { (eval echo $progname:2580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++then
++  lt_cv_dlopen_self=yes
++else
++  echo "$progname: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -fr conftest*
++  lt_cv_dlopen_self=no
++fi
++rm -fr conftest*
++fi
++
++fi
++
++echo "$ac_t""$lt_cv_dlopen_self" 1>&6
++
++  if test "$lt_cv_dlopen_self" = yes; then
++    LDFLAGS="$LDFLAGS $link_static_flag"
++  echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
++echo "$progname:2599: checking whether a statically linked program can dlopen itself" >&5
++if test "${lt_cv_dlopen_self_static+set}" = set; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test "$cross_compiling" = yes; then
++    lt_cv_dlopen_self_static=cross
++  else
++    cat > conftest.c <<EOF
++#line 2607 "ltconfig"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++# define LTDL_GLOBAL	RTLD_GLOBAL
++#else
++# ifdef DL_GLOBAL
++#  define LTDL_GLOBAL	DL_GLOBAL
++# else
++#  define LTDL_GLOBAL	0
++# endif
++#endif
++
++/* We may have to define LTDL_LAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LTDL_LAZY_OR_NOW
++# ifdef RTLD_LAZY
++#  define LTDL_LAZY_OR_NOW	RTLD_LAZY
++# else
++#  ifdef DL_LAZY
++#   define LTDL_LAZY_OR_NOW	DL_LAZY
++#  else
++#   ifdef RTLD_NOW
++#    define LTDL_LAZY_OR_NOW	RTLD_NOW
++#   else
++#    ifdef DL_NOW
++#     define LTDL_LAZY_OR_NOW	DL_NOW
++#    else
++#     define LTDL_LAZY_OR_NOW	0
++#    endif
++#   endif
++#  endif
++# endif
++#endif
++
++fnord() { int i=42;}
++main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
++    if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord");
++    if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } 
++
++EOF
++if { (eval echo $progname:2653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++then
++  lt_cv_dlopen_self_static=yes
++else
++  echo "$progname: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -fr conftest*
++  lt_cv_dlopen_self_static=no
++fi
++rm -fr conftest*
++fi
++
++fi
++
++echo "$ac_t""$lt_cv_dlopen_self_static" 1>&6
++fi
++    ;;
++  esac
++
++  case "$lt_cv_dlopen_self" in
++  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
++  *) enable_dlopen_self=unknown ;;
++  esac
++
++  case "$lt_cv_dlopen_self_static" in
++  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
++  *) enable_dlopen_self_static=unknown ;;
++  esac
++fi
++
++# Copy echo and quote the copy, instead of the original, because it is
++# used later.
++ltecho="$echo"
++if test "X$ltecho" = "X$CONFIG_SHELL $0 --fallback-echo"; then
++   ltecho="$CONFIG_SHELL \$0 --fallback-echo"
++fi
++LTSHELL="$SHELL"
++
++LTCONFIG_VERSION="$VERSION"
++
++# Only quote variables if we're using ltmain.sh.
++case "$ltmain" in
++*.sh)
++  # Now quote all the things that may contain metacharacters.
++  for var in ltecho old_CC old_CFLAGS old_CPPFLAGS \
++    old_LD old_LDFLAGS old_LIBS \
++    old_NM old_RANLIB old_LN_S old_DLLTOOL old_OBJDUMP old_AS \
++    AR CC LD LN_S NM LTSHELL LTCONFIG_VERSION \
++    reload_flag reload_cmds wl \
++    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
++    thread_safe_flag_spec whole_archive_flag_spec libname_spec \
++    library_names_spec soname_spec \
++    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
++    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds postuninstall_cmds \
++    file_magic_cmd export_symbols_cmds deplibs_check_method allow_undefined_flag no_undefined_flag \
++    finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
++    hardcode_libdir_flag_spec hardcode_libdir_separator  \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
++
++    case "$var" in
++    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
++  case "$ltecho" in
++  *'\$0 --fallback-echo"')
++    ltecho=`$echo "X$ltecho" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
++    ;;
++  esac
++
++  trap "$rm \"$ofile\"; exit 1" 1 2 15
++  echo "creating $ofile"
++  $rm "$ofile"
++  cat <<EOF > "$ofile"
++#! $SHELL
++
++# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
++# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
++# NOTE: Changes made to this file will be lost: look at ltconfig or ltmain.sh.
++#
++# Copyright (C) 1996-1999 Free Software Foundation, Inc.
++# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++# Sed that helps us avoid accidentally triggering echo(1) options like -n.
++Xsed="sed -e s/^X//"
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++
++### BEGIN LIBTOOL CONFIG
++EOF
++  cfgfile="$ofile"
++  ;;
++
++*)
++  # Double-quote the variables that need it (for aesthetics).
++  for var in old_CC old_CFLAGS old_CPPFLAGS \
++    old_LD old_LDFLAGS old_LIBS \
++    old_NM old_RANLIB old_LN_S old_DLLTOOL old_OBJDUMP old_AS; do
++    eval "$var=\\\"\$var\\\""
++  done
++
++  # Just create a config file.
++  cfgfile="$ofile.cfg"
++  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
++  echo "creating $cfgfile"
++  $rm "$cfgfile"
++  cat <<EOF > "$cfgfile"
++# `$echo "$cfgfile" | sed 's%^.*/%%'` - Libtool configuration file.
++# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
++EOF
++  ;;
++esac
++
++cat <<EOF >> "$cfgfile"
++# Libtool was configured as follows, on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++#
++# CC=$old_CC CFLAGS=$old_CFLAGS CPPFLAGS=$old_CPPFLAGS \\
++# LD=$old_LD LDFLAGS=$old_LDFLAGS LIBS=$old_LIBS \\
++# NM=$old_NM RANLIB=$old_RANLIB LN_S=$old_LN_S \\
++# DLLTOOL=$old_DLLTOOL OBJDUMP=$old_OBJDUMP AS=$old_AS \\
++#   $0$ltconfig_args
++#
++# Compiler and other test output produced by $progname, useful for
++# debugging $progname, is in ./config.log if it exists.
++
++# The version of $progname that generated this script.
++LTCONFIG_VERSION=$LTCONFIG_VERSION
++
++# Shell to use when invoking shell scripts.
++SHELL=$LTSHELL
++
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
++
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
++
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
++
++# The host system.
++host_alias=$host_alias
++host=$host
++
++# An echo program that does not interpret backslashes.
++echo=$ltecho
++
++# The archiver.
++AR=$AR
++
++# The default C compiler.
++CC=$CC
++
++# The linker used to build libraries.
++LD=$LD
++
++# Whether we need hard or soft links.
++LN_S=$LN_S
++
++# A BSD-compatible nm program.
++NM=$NM
++
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
++
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
++
++# Used on cygwin: assembler.
++AS="$AS"
++
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
++
++# How to create reloadable object files.
++reload_flag=$reload_flag
++reload_cmds=$reload_cmds
++
++# How to pass a linker flag through the compiler.
++wl=$wl
++
++# Object file suffix (normally "o").
++objext="$objext"
++
++# Old archive suffix (normally "a").
++libext="$libext"
++
++# Executable file suffix (normally "").
++exeext="$exeext"
++
++# Additional compiler flags for building library objects.
++pic_flag=$pic_flag
++
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$compiler_c_o
++
++# Can we write directly to a .lo ?
++compiler_o_lo=$compiler_o_lo
++
++# Must we lock files when doing compilation ?
++need_locks=$need_locks
++
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
++
++# Do we need a version for libraries?
++need_version=$need_version
++
++# Whether dlopen is supported.
++dlopen=$enable_dlopen
++
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
++
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
++
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$link_static_flag
++
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$no_builtin_flag
++
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$export_dynamic_flag_spec
++
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$whole_archive_flag_spec
++
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$thread_safe_flag_spec
++
++# Library versioning type.
++version_type=$version_type
++
++# Format of library name prefix.
++libname_spec=$libname_spec
++
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$library_names_spec
++
++# The coded name of the library, if different from the real name.
++soname_spec=$soname_spec
++
++# Commands used to build and install an old-style archive.
++RANLIB=$RANLIB
++old_archive_cmds=$old_archive_cmds
++old_postinstall_cmds=$old_postinstall_cmds
++old_postuninstall_cmds=$old_postuninstall_cmds
++
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$old_archive_from_new_cmds
++
++# Commands used to build and install a shared archive.
++archive_cmds=$archive_cmds
++archive_expsym_cmds=$archive_expsym_cmds
++postinstall_cmds=$postinstall_cmds
++postuninstall_cmds=$postuninstall_cmds
++
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$deplibs_check_method
++
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$file_magic_cmd
++
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$allow_undefined_flag
++
++# Flag that forces no undefined symbols.
++no_undefined_flag=$no_undefined_flag
++
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$finish_cmds
++
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$finish_eval
++
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$global_symbol_pipe
++
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$global_symbol_to_cdecl
++
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
++
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
++
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action
++
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$hardcode_libdir_flag_spec
++
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$hardcode_libdir_separator
++
++# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$hardcode_direct
++
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$hardcode_minus_L
++
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var
++
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$sys_lib_search_path_spec
++
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$sys_lib_dlsearch_path_spec
++
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$fix_srcfile_path"
++
++# Set to yes if exported symbols are required.
++always_export_symbols=$always_export_symbols
++
++# The commands to list exported symbols.
++export_symbols_cmds=$export_symbols_cmds
++
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$exclude_expsyms
++
++# Symbols that must always be exported.
++include_expsyms=$include_expsyms
++
++EOF
++
++case "$ltmain" in
++*.sh)
++  echo '### END LIBTOOL CONFIG' >> "$ofile"
++  echo >> "$ofile"
++  case "$host_os" in
++  aix3*)
++    cat <<\EOF >> "$ofile"
++
++# AIX sometimes has problems with the GCC collect2 program.  For some
++# reason, if we set the COLLECT_NAMES environment variable, the problems
++# vanish in a puff of smoke.
++if test "X${COLLECT_NAMES+set}" != Xset; then
++  COLLECT_NAMES=
++  export COLLECT_NAMES
++fi
++EOF
++    ;;
++  esac
++
++  # Append the ltmain.sh script.
++  sed '$q' "$ltmain" >> "$ofile" || (rm -f "$ofile"; exit 1)
++  # We use sed instead of cat because bash on DJGPP gets confused if
++  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
++  # text mode, it properly converts lines to CR/LF.  This bash problem
++  # is reportedly fixed, but why not run on old versions too?
++
++  chmod +x "$ofile"
++  ;;
++
++*)
++  # Compile the libtool program.
++  echo "FIXME: would compile $ltmain"
++  ;;
++esac
++
++test -n "$cache_file" || exit 0
++
++# AC_CACHE_SAVE
++trap '' 1 2 15
++cat > confcache <<\EOF
++# This file is a shell script that caches the results of configure
++# tests run on this system so they can be shared between configure
++# scripts and configure runs.  It is not useful on other systems.
++# If it contains results you don't want to keep, you may remove or edit it.
++#
++# By default, configure uses ./config.cache as the cache file,
++# creating it if it does not exist already.  You can give configure
++# the --cache-file=FILE option to use a different cache file; that is
++# what configure does when it calls configure scripts in
++# subdirectories, so they share the cache.
++# Giving --cache-file=/dev/null disables caching, for debugging configure.
++# config.status only pays attention to the cache file if you give it the
++# --recheck option to rerun configure.
++#
++EOF
++# The following way of writing the cache mishandles newlines in values,
++# but we know of no workaround that is simple, portable, and efficient.
++# So, don't put newlines in cache variables' values.
++# Ultrix sh set writes to stderr and can't be redirected directly,
++# and sets the high bit in the cache file unless we assign to the vars.
++(set) 2>&1 |
++  case `(ac_space=' '; set | grep ac_space) 2>&1` in
++  *ac_space=\ *)
++    # `set' does not quote correctly, so add quotes (double-quote substitution
++    # turns \\\\ into \\, and sed turns \\ into \).
++    sed -n \
++      -e "s/'/'\\\\''/g" \
++      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
++    ;;
++  *)
++    # `set' quotes correctly as required by POSIX, so do not add quotes.
++    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
++    ;;
++  esac >> confcache
++if cmp -s $cache_file confcache; then
++  :
++else
++  if test -w $cache_file; then
++    echo "updating cache $cache_file"
++    cat confcache > $cache_file
++  else
++    echo "not updating unwritable cache $cache_file"
++  fi
++fi
++rm -f confcache
++
++exit 0
++
++# Local Variables:
++# mode:shell-script
++# sh-indentation:2
++# End:
+--- metamail-2.7.orig/config/install-sh
++++ metamail-2.7/config/install-sh
+@@ -0,0 +1,251 @@
++#!/bin/sh
++#
++# install - install a program, script, or datafile
++# This comes from X11R5 (mit/util/scripts/install.sh).
++#
++# Copyright 1991 by the Massachusetts Institute of Technology
++#
++# Permission to use, copy, modify, distribute, and sell this software and its
++# documentation for any purpose is hereby granted without fee, provided that
++# the above copyright notice appear in all copies and that both that
++# copyright notice and this permission notice appear in supporting
++# documentation, and that the name of M.I.T. not be used in advertising or
++# publicity pertaining to distribution of the software without specific,
++# written prior permission.  M.I.T. makes no representations about the
++# suitability of this software for any purpose.  It is provided "as is"
++# without express or implied warranty.
++#
++# Calling this script install-sh is preferred over install.sh, to prevent
++# `make' implicit rules from creating a file called install from it
++# when there is no Makefile.
++#
++# This script is compatible with the BSD install script, but was written
++# from scratch.  It can only install one file at a time, a restriction
++# shared with many OS's install programs.
++
++
++# set DOITPROG to echo to test this script
++
++# Don't use :- since 4.3BSD and earlier shells don't like it.
++doit="${DOITPROG-}"
++
++
++# put in absolute paths if you don't have them in your path; or use env. vars.
++
++mvprog="${MVPROG-mv}"
++cpprog="${CPPROG-cp}"
++chmodprog="${CHMODPROG-chmod}"
++chownprog="${CHOWNPROG-chown}"
++chgrpprog="${CHGRPPROG-chgrp}"
++stripprog="${STRIPPROG-strip}"
++rmprog="${RMPROG-rm}"
++mkdirprog="${MKDIRPROG-mkdir}"
++
++transformbasename=""
++transform_arg=""
++instcmd="$mvprog"
++chmodcmd="$chmodprog 0755"
++chowncmd=""
++chgrpcmd=""
++stripcmd=""
++rmcmd="$rmprog -f"
++mvcmd="$mvprog"
++src=""
++dst=""
++dir_arg=""
++
++while [ x"$1" != x ]; do
++    case $1 in
++	-c) instcmd="$cpprog"
++	    shift
++	    continue;;
++
++	-d) dir_arg=true
++	    shift
++	    continue;;
++
++	-m) chmodcmd="$chmodprog $2"
++	    shift
++	    shift
++	    continue;;
++
++	-o) chowncmd="$chownprog $2"
++	    shift
++	    shift
++	    continue;;
++
++	-g) chgrpcmd="$chgrpprog $2"
++	    shift
++	    shift
++	    continue;;
++
++	-s) stripcmd="$stripprog"
++	    shift
++	    continue;;
++
++	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
++	    shift
++	    continue;;
++
++	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
++	    shift
++	    continue;;
++
++	*)  if [ x"$src" = x ]
++	    then
++		src=$1
++	    else
++		# this colon is to work around a 386BSD /bin/sh bug
++		:
++		dst=$1
++	    fi
++	    shift
++	    continue;;
++    esac
++done
++
++if [ x"$src" = x ]
++then
++	echo "install:	no input file specified"
++	exit 1
++else
++	true
++fi
++
++if [ x"$dir_arg" != x ]; then
++	dst=$src
++	src=""
++	
++	if [ -d $dst ]; then
++		instcmd=:
++		chmodcmd=""
++	else
++		instcmd=mkdir
++	fi
++else
++
++# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
++# might cause directories to be created, which would be especially bad 
++# if $src (and thus $dsttmp) contains '*'.
++
++	if [ -f $src -o -d $src ]
++	then
++		true
++	else
++		echo "install:  $src does not exist"
++		exit 1
++	fi
++	
++	if [ x"$dst" = x ]
++	then
++		echo "install:	no destination specified"
++		exit 1
++	else
++		true
++	fi
++
++# If destination is a directory, append the input filename; if your system
++# does not like double slashes in filenames, you may need to add some logic
++
++	if [ -d $dst ]
++	then
++		dst="$dst"/`basename $src`
++	else
++		true
++	fi
++fi
++
++## this sed command emulates the dirname command
++dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
++
++# Make sure that the destination directory exists.
++#  this part is taken from Noah Friedman's mkinstalldirs script
++
++# Skip lots of stat calls in the usual case.
++if [ ! -d "$dstdir" ]; then
++defaultIFS='	
++'
++IFS="${IFS-${defaultIFS}}"
++
++oIFS="${IFS}"
++# Some sh's can't handle IFS=/ for some reason.
++IFS='%'
++set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
++IFS="${oIFS}"
++
++pathcomp=''
++
++while [ $# -ne 0 ] ; do
++	pathcomp="${pathcomp}${1}"
++	shift
++
++	if [ ! -d "${pathcomp}" ] ;
++        then
++		$mkdirprog "${pathcomp}"
++	else
++		true
++	fi
++
++	pathcomp="${pathcomp}/"
++done
++fi
++
++if [ x"$dir_arg" != x ]
++then
++	$doit $instcmd $dst &&
++
++	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
++	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
++	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
++	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
++else
++
++# If we're going to rename the final executable, determine the name now.
++
++	if [ x"$transformarg" = x ] 
++	then
++		dstfile=`basename $dst`
++	else
++		dstfile=`basename $dst $transformbasename | 
++			sed $transformarg`$transformbasename
++	fi
++
++# don't allow the sed command to completely eliminate the filename
++
++	if [ x"$dstfile" = x ] 
++	then
++		dstfile=`basename $dst`
++	else
++		true
++	fi
++
++# Make a temp file name in the proper directory.
++
++	dsttmp=$dstdir/#inst.$$#
++
++# Move or copy the file name to the temp name
++
++	$doit $instcmd $src $dsttmp &&
++
++	trap "rm -f ${dsttmp}" 0 &&
++
++# and set any options; do chmod last to preserve setuid bits
++
++# If any of these fail, we abort the whole thing.  If we want to
++# ignore errors from any of these, just make sure not to ignore
++# errors from the above "$doit $instcmd $src $dsttmp" command.
++
++	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
++	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
++	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
++	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
++
++# Now rename the file to the real destination.
++
++	$doit $rmcmd -f $dstdir/$dstfile &&
++	$doit $mvcmd $dsttmp $dstdir/$dstfile 
++
++fi &&
++
++
++exit 0
+--- metamail-2.7.orig/config/ltmain.sh
++++ metamail-2.7/config/ltmain.sh
+@@ -0,0 +1,5107 @@
++# ltmain.sh - Provide generalized library-building support services.
++# NOTE: Changing this file will not affect anything until you rerun configure.
++#
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
++# Free Software Foundation, Inc.
++# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++# Check that we have a working $echo.
++if test "X$1" = X--no-reexec; then
++  # Discard the --no-reexec flag, and continue.
++  shift
++elif test "X$1" = X--fallback-echo; then
++  # Avoid inline document here, it may be left over
++  :
++elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
++  # Yippee, $echo works!
++  :
++else
++  # Restart under the correct shell, and then maybe $echo will work.
++  exec $SHELL "$0" --no-reexec ${1+"$@"}
++fi
++
++if test "X$1" = X--fallback-echo; then
++  # used as fallback echo
++  shift
++  cat <<EOF
++$*
++EOF
++  exit 0
++fi
++
++# The name of this program.
++progname=`$echo "$0" | ${SED} 's%^.*/%%'`
++modename="$progname"
++
++# Constants.
++PROGRAM=ltmain.sh
++PACKAGE=libtool
++VERSION=1.4.3
++TIMESTAMP=" (1.922.2.111 2002/10/23 02:54:36)"
++
++default_mode=
++help="Try \`$progname --help' for more information."
++magic="%%%MAGIC variable%%%"
++mkdir="mkdir"
++mv="mv -f"
++rm="rm -f"
++
++# Sed substitution that helps us do robust quoting.  It backslashifies
++# metacharacters that are still active within double-quoted strings.
++Xsed="${SED}"' -e 1s/^X//'
++sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
++# test EBCDIC or ASCII                                                         
++case `echo A|od -x` in                                                         
++ *[Cc]1*) # EBCDIC based system                                                
++  SP2NL="tr '\100' '\n'"                                                       
++  NL2SP="tr '\r\n' '\100\100'"                                                 
++  ;;                                                                           
++ *) # Assume ASCII based system                                                
++  SP2NL="tr '\040' '\012'"                                                     
++  NL2SP="tr '\015\012' '\040\040'"                                             
++  ;;                                                                           
++esac                                                                           
++
++# NLS nuisances.
++# Only set LANG and LC_ALL to C if already set.
++# These must not be set unconditionally because not all systems understand
++# e.g. LANG=C (notably SCO).
++# We save the old values to restore during execute mode.
++if test "${LC_ALL+set}" = set; then
++  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
++fi
++if test "${LANG+set}" = set; then
++  save_LANG="$LANG"; LANG=C; export LANG
++fi
++
++# Make sure IFS has a sensible default
++: ${IFS=" 	"}
++
++if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
++  echo "$modename: not configured to build any kind of library" 1>&2
++  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
++  exit 1
++fi
++
++# Global variables.
++mode=$default_mode
++nonopt=
++prev=
++prevopt=
++run=
++show="$echo"
++show_help=
++execute_dlfiles=
++lo2o="s/\\.lo\$/.${objext}/"
++o2lo="s/\\.${objext}\$/.lo/"
++
++# Parse our command line options once, thoroughly.
++while test $# -gt 0
++do
++  arg="$1"
++  shift
++
++  case $arg in
++  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
++  *) optarg= ;;
++  esac
++
++  # If the previous option needs an argument, assign it.
++  if test -n "$prev"; then
++    case $prev in
++    execute_dlfiles)
++      execute_dlfiles="$execute_dlfiles $arg"
++      ;;
++    *)
++      eval "$prev=\$arg"
++      ;;
++    esac
++
++    prev=
++    prevopt=
++    continue
++  fi
++
++  # Have we seen a non-optional argument yet?
++  case $arg in
++  --help)
++    show_help=yes
++    ;;
++
++  --version)
++    echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
++    exit 0
++    ;;
++
++  --config)
++    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
++    exit 0
++    ;;
++
++  --debug)
++    echo "$progname: enabling shell trace mode"
++    set -x
++    ;;
++
++  --dry-run | -n)
++    run=:
++    ;;
++
++  --features)
++    echo "host: $host"
++    if test "$build_libtool_libs" = yes; then
++      echo "enable shared libraries"
++    else
++      echo "disable shared libraries"
++    fi
++    if test "$build_old_libs" = yes; then
++      echo "enable static libraries"
++    else
++      echo "disable static libraries"
++    fi
++    exit 0
++    ;;
++
++  --finish) mode="finish" ;;
++
++  --mode) prevopt="--mode" prev=mode ;;
++  --mode=*) mode="$optarg" ;;
++
++  --preserve-dup-deps) duplicate_deps="yes" ;;
++
++  --quiet | --silent)
++    show=:
++    ;;
++
++  -dlopen)
++    prevopt="-dlopen"
++    prev=execute_dlfiles
++    ;;
++
++  -*)
++    $echo "$modename: unrecognized option \`$arg'" 1>&2
++    $echo "$help" 1>&2
++    exit 1
++    ;;
++
++  *)
++    nonopt="$arg"
++    break
++    ;;
++  esac
++done
++
++if test -n "$prevopt"; then
++  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
++  $echo "$help" 1>&2
++  exit 1
++fi
++
++# If this variable is set in any of the actions, the command in it
++# will be execed at the end.  This prevents here-documents from being
++# left over by shells.
++exec_cmd=
++
++if test -z "$show_help"; then
++
++  # Infer the operation mode.
++  if test -z "$mode"; then
++    case $nonopt in
++    *cc | *++ | gcc* | *-gcc* | g++* | xlc*)
++      mode=link
++      for arg
++      do
++	case $arg in
++	-c)
++	   mode=compile
++	   break
++	   ;;
++	esac
++      done
++      ;;
++    *db | *dbx | *strace | *truss)
++      mode=execute
++      ;;
++    *install*|cp|mv)
++      mode=install
++      ;;
++    *rm)
++      mode=uninstall
++      ;;
++    *)
++      # If we have no mode, but dlfiles were specified, then do execute mode.
++      test -n "$execute_dlfiles" && mode=execute
++
++      # Just use the default operation mode.
++      if test -z "$mode"; then
++	if test -n "$nonopt"; then
++	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
++	else
++	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
++	fi
++      fi
++      ;;
++    esac
++  fi
++
++  # Only execute mode is allowed to have -dlopen flags.
++  if test -n "$execute_dlfiles" && test "$mode" != execute; then
++    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
++    $echo "$help" 1>&2
++    exit 1
++  fi
++
++  # Change the help message to a mode-specific one.
++  generic_help="$help"
++  help="Try \`$modename --help --mode=$mode' for more information."
++
++  # These modes are in order of execution frequency so that they run quickly.
++  case $mode in
++  # libtool compile mode
++  compile)
++    modename="$modename: compile"
++    # Get the compilation command and the source file.
++    base_compile=
++    prev=
++    lastarg=
++    srcfile="$nonopt"
++    suppress_output=
++
++    user_target=no
++    for arg
++    do
++      case $prev in
++      "") ;;
++      xcompiler)
++	# Aesthetically quote the previous argument.
++	prev=
++	lastarg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
++
++	case $arg in
++	# Double-quote args containing other shell metacharacters.
++	# Many Bourne shells cannot handle close brackets correctly
++	# in scan sets, so we specify it separately.
++	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	  arg="\"$arg\""
++	  ;;
++	esac
++
++	# Add the previous argument to base_compile.
++	if test -z "$base_compile"; then
++	  base_compile="$lastarg"
++	else
++	  base_compile="$base_compile $lastarg"
++	fi
++	continue
++	;;
++      esac
++
++      # Accept any command-line options.
++      case $arg in
++      -o)
++	if test "$user_target" != "no"; then
++	  $echo "$modename: you cannot specify \`-o' more than once" 1>&2
++	  exit 1
++	fi
++	user_target=next
++	;;
++
++      -static)
++	build_old_libs=yes
++	continue
++	;;
++
++      -prefer-pic)
++	pic_mode=yes
++	continue
++	;;
++
++      -prefer-non-pic)
++	pic_mode=no
++	continue
++	;;
++
++      -Xcompiler)
++	prev=xcompiler
++	continue
++	;;
++
++      -Wc,*)
++	args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
++	lastarg=
++	save_ifs="$IFS"; IFS=','
++	for arg in $args; do
++	  IFS="$save_ifs"
++
++	  # Double-quote args containing other shell metacharacters.
++	  # Many Bourne shells cannot handle close brackets correctly
++	  # in scan sets, so we specify it separately.
++	  case $arg in
++	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	    arg="\"$arg\""
++	    ;;
++	  esac
++	  lastarg="$lastarg $arg"
++	done
++	IFS="$save_ifs"
++	lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
++
++	# Add the arguments to base_compile.
++	if test -z "$base_compile"; then
++	  base_compile="$lastarg"
++	else
++	  base_compile="$base_compile $lastarg"
++	fi
++	continue
++	;;
++      esac
++
++      case $user_target in
++      next)
++	# The next one is the -o target name
++	user_target=yes
++	continue
++	;;
++      yes)
++	# We got the output file
++	user_target=set
++	libobj="$arg"
++	continue
++	;;
++      esac
++
++      # Accept the current argument as the source file.
++      lastarg="$srcfile"
++      srcfile="$arg"
++
++      # Aesthetically quote the previous argument.
++
++      # Backslashify any backslashes, double quotes, and dollar signs.
++      # These are the only characters that are still specially
++      # interpreted inside of double-quoted scrings.
++      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
++
++      # Double-quote args containing other shell metacharacters.
++      # Many Bourne shells cannot handle close brackets correctly
++      # in scan sets, so we specify it separately.
++      case $lastarg in
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	lastarg="\"$lastarg\""
++	;;
++      esac
++
++      # Add the previous argument to base_compile.
++      if test -z "$base_compile"; then
++	base_compile="$lastarg"
++      else
++	base_compile="$base_compile $lastarg"
++      fi
++    done
++
++    case $user_target in
++    set)
++      ;;
++    no)
++      # Get the name of the library object.
++      libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
++      ;;
++    *)
++      $echo "$modename: you must specify a target with \`-o'" 1>&2
++      exit 1
++      ;;
++    esac
++
++    # Recognize several different file suffixes.
++    # If the user specifies -o file.o, it is replaced with file.lo
++    xform='[cCFSfmso]'
++    case $libobj in
++    *.ada) xform=ada ;;
++    *.adb) xform=adb ;;
++    *.ads) xform=ads ;;
++    *.asm) xform=asm ;;
++    *.c++) xform=c++ ;;
++    *.cc) xform=cc ;;
++    *.cpp) xform=cpp ;;
++    *.cxx) xform=cxx ;;
++    *.f90) xform=f90 ;;
++    *.for) xform=for ;;
++    esac
++
++    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
++
++    case $libobj in
++    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
++    *)
++      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
++      exit 1
++      ;;
++    esac
++
++    if test -z "$base_compile"; then
++      $echo "$modename: you must specify a compilation command" 1>&2
++      $echo "$help" 1>&2
++      exit 1
++    fi
++
++    # Delete any leftover library objects.
++    if test "$build_old_libs" = yes; then
++      removelist="$obj $libobj"
++    else
++      removelist="$libobj"
++    fi
++
++    $run $rm $removelist
++    trap "$run $rm $removelist; exit 1" 1 2 15
++
++    # On Cygwin there's no "real" PIC flag so we must build both object types
++    case $host_os in
++    cygwin* | mingw* | pw32* | os2*)
++      pic_mode=default
++      ;;
++    esac
++    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
++      # non-PIC code in shared libraries is not supported
++      pic_mode=default
++    fi
++
++    # Calculate the filename of the output object if compiler does
++    # not support -o with -c
++    if test "$compiler_c_o" = no; then
++      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
++      lockfile="$output_obj.lock"
++      removelist="$removelist $output_obj $lockfile"
++      trap "$run $rm $removelist; exit 1" 1 2 15
++    else
++      need_locks=no
++      lockfile=
++    fi
++
++    # Lock this critical section if it is needed
++    # We use this script file to make the link, it avoids creating a new file
++    if test "$need_locks" = yes; then
++      until $run ln "$0" "$lockfile" 2>/dev/null; do
++	$show "Waiting for $lockfile to be removed"
++	sleep 2
++      done
++    elif test "$need_locks" = warn; then
++      if test -f "$lockfile"; then
++	echo "\
++*** ERROR, $lockfile exists and contains:
++`cat $lockfile 2>/dev/null`
++
++This indicates that another process is trying to use the same
++temporary object file, and libtool could not work around it because
++your compiler does not support \`-c' and \`-o' together.  If you
++repeat this compilation, it may succeed, by chance, but you had better
++avoid parallel builds (make -j) in this platform, or get a better
++compiler."
++
++	$run $rm $removelist
++	exit 1
++      fi
++      echo $srcfile > "$lockfile"
++    fi
++
++    if test -n "$fix_srcfile_path"; then
++      eval srcfile=\"$fix_srcfile_path\"
++    fi
++
++    # Only build a PIC object if we are building libtool libraries.
++    if test "$build_libtool_libs" = yes; then
++      # Without this assignment, base_compile gets emptied.
++      fbsd_hideous_sh_bug=$base_compile
++
++      if test "$pic_mode" != no; then
++	# All platforms use -DPIC, to notify preprocessed assembler code.
++	command="$base_compile $srcfile $pic_flag -DPIC"
++      else
++	# Don't build PIC code
++	command="$base_compile $srcfile"
++      fi
++      if test "$build_old_libs" = yes; then
++	lo_libobj="$libobj"
++	dir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
++	if test "X$dir" = "X$libobj"; then
++	  dir="$objdir"
++	else
++	  dir="$dir/$objdir"
++	fi
++	libobj="$dir/"`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
++
++	if test -d "$dir"; then
++	  $show "$rm $libobj"
++	  $run $rm $libobj
++	else
++	  $show "$mkdir $dir"
++	  $run $mkdir $dir
++	  status=$?
++	  if test $status -ne 0 && test ! -d $dir; then
++	    exit $status
++	  fi
++	fi
++      fi
++      if test "$compiler_o_lo" = yes; then
++	output_obj="$libobj"
++	command="$command -o $output_obj"
++      elif test "$compiler_c_o" = yes; then
++	output_obj="$obj"
++	command="$command -o $output_obj"
++      fi
++
++      $run $rm "$output_obj"
++      $show "$command"
++      if $run eval "$command"; then :
++      else
++	test -n "$output_obj" && $run $rm $removelist
++	exit 1
++      fi
++
++      if test "$need_locks" = warn &&
++	 test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
++	echo "\
++*** ERROR, $lockfile contains:
++`cat $lockfile 2>/dev/null`
++
++but it should contain:
++$srcfile
++
++This indicates that another process is trying to use the same
++temporary object file, and libtool could not work around it because
++your compiler does not support \`-c' and \`-o' together.  If you
++repeat this compilation, it may succeed, by chance, but you had better
++avoid parallel builds (make -j) in this platform, or get a better
++compiler."
++
++	$run $rm $removelist
++	exit 1
++      fi
++
++      # Just move the object if needed, then go on to compile the next one
++      if test x"$output_obj" != x"$libobj"; then
++	$show "$mv $output_obj $libobj"
++	if $run $mv $output_obj $libobj; then :
++	else
++	  error=$?
++	  $run $rm $removelist
++	  exit $error
++	fi
++      fi
++
++      # If we have no pic_flag, then copy the object into place and finish.
++      if (test -z "$pic_flag" || test "$pic_mode" != default) &&
++	 test "$build_old_libs" = yes; then
++	# Rename the .lo from within objdir to obj
++	if test -f $obj; then
++	  $show $rm $obj
++	  $run $rm $obj
++	fi
++
++	$show "$mv $libobj $obj"
++	if $run $mv $libobj $obj; then :
++	else
++	  error=$?
++	  $run $rm $removelist
++	  exit $error
++	fi
++
++	xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
++	if test "X$xdir" = "X$obj"; then
++	  xdir="."
++	else
++	  xdir="$xdir"
++	fi
++	baseobj=`$echo "X$obj" | $Xsed -e "s%.*/%%"`
++	libobj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
++	# Now arrange that obj and lo_libobj become the same file
++	$show "(cd $xdir && $LN_S $baseobj $libobj)"
++	if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then
++	  # Unlock the critical section if it was locked
++	  if test "$need_locks" != no; then
++	    $run $rm "$lockfile"
++	  fi
++	  exit 0
++	else
++	  error=$?
++	  $run $rm $removelist
++	  exit $error
++	fi
++      fi
++
++      # Allow error messages only from the first compilation.
++      suppress_output=' >/dev/null 2>&1'
++    fi
++
++    # Only build a position-dependent object if we build old libraries.
++    if test "$build_old_libs" = yes; then
++      if test "$pic_mode" != yes; then
++	# Don't build PIC code
++	command="$base_compile $srcfile"
++      else
++	# All platforms use -DPIC, to notify preprocessed assembler code.
++	command="$base_compile $srcfile $pic_flag -DPIC"
++      fi
++      if test "$compiler_c_o" = yes; then
++	command="$command -o $obj"
++	output_obj="$obj"
++      fi
++
++      # Suppress compiler output if we already did a PIC compilation.
++      command="$command$suppress_output"
++      $run $rm "$output_obj"
++      $show "$command"
++      if $run eval "$command"; then :
++      else
++	$run $rm $removelist
++	exit 1
++      fi
++
++      if test "$need_locks" = warn &&
++	 test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
++	echo "\
++*** ERROR, $lockfile contains:
++`cat $lockfile 2>/dev/null`
++
++but it should contain:
++$srcfile
++
++This indicates that another process is trying to use the same
++temporary object file, and libtool could not work around it because
++your compiler does not support \`-c' and \`-o' together.  If you
++repeat this compilation, it may succeed, by chance, but you had better
++avoid parallel builds (make -j) in this platform, or get a better
++compiler."
++
++	$run $rm $removelist
++	exit 1
++      fi
++
++      # Just move the object if needed
++      if test x"$output_obj" != x"$obj"; then
++	$show "$mv $output_obj $obj"
++	if $run $mv $output_obj $obj; then :
++	else
++	  error=$?
++	  $run $rm $removelist
++	  exit $error
++	fi
++      fi
++
++      # Create an invalid libtool object if no PIC, so that we do not
++      # accidentally link it into a program.
++      if test "$build_libtool_libs" != yes; then
++	$show "echo timestamp > $libobj"
++	$run eval "echo timestamp > \$libobj" || exit $?
++      else
++	# Move the .lo from within objdir
++	$show "$mv $libobj $lo_libobj"
++	if $run $mv $libobj $lo_libobj; then :
++	else
++	  error=$?
++	  $run $rm $removelist
++	  exit $error
++	fi
++      fi
++    fi
++
++    # Unlock the critical section if it was locked
++    if test "$need_locks" != no; then
++      $run $rm "$lockfile"
++    fi
++
++    exit 0
++    ;;
++
++  # libtool link mode
++  link | relink)
++    modename="$modename: link"
++    case $host in
++    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++      # It is impossible to link a dll without this setting, and
++      # we shouldn't force the makefile maintainer to figure out
++      # which system we are compiling for in order to pass an extra
++      # flag for every libtool invokation.
++      # allow_undefined=no
++
++      # FIXME: Unfortunately, there are problems with the above when trying
++      # to make a dll which has undefined symbols, in which case not
++      # even a static library is built.  For now, we need to specify
++      # -no-undefined on the libtool link line when we can be certain
++      # that all symbols are satisfied, otherwise we get a static library.
++      allow_undefined=yes
++      ;;
++    *)
++      allow_undefined=yes
++      ;;
++    esac
++    libtool_args="$nonopt"
++    compile_command="$nonopt"
++    finalize_command="$nonopt"
++
++    compile_rpath=
++    finalize_rpath=
++    compile_shlibpath=
++    finalize_shlibpath=
++    convenience=
++    old_convenience=
++    deplibs=
++    old_deplibs=
++    compiler_flags=
++    linker_flags=
++    dllsearchpath=
++    lib_search_path=`pwd`
++    inst_prefix_dir=
++
++    avoid_version=no
++    dlfiles=
++    dlprefiles=
++    dlself=no
++    export_dynamic=no
++    export_symbols=
++    export_symbols_regex=
++    generated=
++    libobjs=
++    ltlibs=
++    module=no
++    no_install=no
++    objs=
++    prefer_static_libs=no
++    preload=no
++    prev=
++    prevarg=
++    release=
++    rpath=
++    xrpath=
++    perm_rpath=
++    temp_rpath=
++    thread_safe=no
++    vinfo=
++
++    # We need to know -static, to get the right output filenames.
++    for arg
++    do
++      case $arg in
++      -all-static | -static)
++	if test "X$arg" = "X-all-static"; then
++	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
++	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
++	  fi
++	  if test -n "$link_static_flag"; then
++	    dlopen_self=$dlopen_self_static
++	  fi
++	else
++	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
++	    dlopen_self=$dlopen_self_static
++	  fi
++	fi
++	build_libtool_libs=no
++	build_old_libs=yes
++	prefer_static_libs=yes
++	break
++	;;
++      esac
++    done
++
++    # See if our shared archives depend on static archives.
++    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
++
++    # Go through the arguments, transforming them on the way.
++    while test $# -gt 0; do
++      arg="$1"
++      shift
++      case $arg in
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
++	;;
++      *) qarg=$arg ;;
++      esac
++      libtool_args="$libtool_args $qarg"
++
++      # If the previous option needs an argument, assign it.
++      if test -n "$prev"; then
++	case $prev in
++	output)
++	  compile_command="$compile_command @OUTPUT@"
++	  finalize_command="$finalize_command @OUTPUT@"
++	  ;;
++	esac
++
++	case $prev in
++	dlfiles|dlprefiles)
++	  if test "$preload" = no; then
++	    # Add the symbol object into the linking commands.
++	    compile_command="$compile_command @SYMFILE@"
++	    finalize_command="$finalize_command @SYMFILE@"
++	    preload=yes
++	  fi
++	  case $arg in
++	  *.la | *.lo) ;;  # We handle these cases below.
++	  force)
++	    if test "$dlself" = no; then
++	      dlself=needless
++	      export_dynamic=yes
++	    fi
++	    prev=
++	    continue
++	    ;;
++	  self)
++	    if test "$prev" = dlprefiles; then
++	      dlself=yes
++	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
++	      dlself=yes
++	    else
++	      dlself=needless
++	      export_dynamic=yes
++	    fi
++	    prev=
++	    continue
++	    ;;
++	  *)
++	    if test "$prev" = dlfiles; then
++	      dlfiles="$dlfiles $arg"
++	    else
++	      dlprefiles="$dlprefiles $arg"
++	    fi
++	    prev=
++	    continue
++	    ;;
++	  esac
++	  ;;
++	expsyms)
++	  export_symbols="$arg"
++	  if test ! -f "$arg"; then
++	    $echo "$modename: symbol file \`$arg' does not exist"
++	    exit 1
++	  fi
++	  prev=
++	  continue
++	  ;;
++	expsyms_regex)
++	  export_symbols_regex="$arg"
++	  prev=
++	  continue
++	  ;;
++	inst_prefix)
++	  inst_prefix_dir="$arg"
++	  prev=
++	  continue
++	  ;;
++	release)
++	  release="-$arg"
++	  prev=
++	  continue
++	  ;;
++	rpath | xrpath)
++	  # We need an absolute path.
++	  case $arg in
++	  [\\/]* | [A-Za-z]:[\\/]*) ;;
++	  *)
++	    $echo "$modename: only absolute run-paths are allowed" 1>&2
++	    exit 1
++	    ;;
++	  esac
++	  if test "$prev" = rpath; then
++	    case "$rpath " in
++	    *" $arg "*) ;;
++	    *) rpath="$rpath $arg" ;;
++	    esac
++	  else
++	    case "$xrpath " in
++	    *" $arg "*) ;;
++	    *) xrpath="$xrpath $arg" ;;
++	    esac
++	  fi
++	  prev=
++	  continue
++	  ;;
++	xcompiler)
++	  compiler_flags="$compiler_flags $qarg"
++	  prev=
++	  compile_command="$compile_command $qarg"
++	  finalize_command="$finalize_command $qarg"
++	  continue
++	  ;;
++	xlinker)
++	  linker_flags="$linker_flags $qarg"
++	  compiler_flags="$compiler_flags $wl$qarg"
++	  prev=
++	  compile_command="$compile_command $wl$qarg"
++	  finalize_command="$finalize_command $wl$qarg"
++	  continue
++	  ;;
++	*)
++	  eval "$prev=\"\$arg\""
++	  prev=
++	  continue
++	  ;;
++	esac
++      fi # test -n $prev
++
++      prevarg="$arg"
++
++      case $arg in
++      -all-static)
++	if test -n "$link_static_flag"; then
++	  compile_command="$compile_command $link_static_flag"
++	  finalize_command="$finalize_command $link_static_flag"
++	fi
++	continue
++	;;
++
++      -allow-undefined)
++	# FIXME: remove this flag sometime in the future.
++	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
++	continue
++	;;
++
++      -avoid-version)
++	avoid_version=yes
++	continue
++	;;
++
++      -dlopen)
++	prev=dlfiles
++	continue
++	;;
++
++      -dlpreopen)
++	prev=dlprefiles
++	continue
++	;;
++
++      -export-dynamic)
++	export_dynamic=yes
++	continue
++	;;
++
++      -export-symbols | -export-symbols-regex)
++	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
++	  $echo "$modename: more than one -exported-symbols argument is not allowed"
++	  exit 1
++	fi
++	if test "X$arg" = "X-export-symbols"; then
++	  prev=expsyms
++	else
++	  prev=expsyms_regex
++	fi
++	continue
++	;;
++
++      -inst-prefix-dir)
++       prev=inst_prefix
++       continue
++       ;;
++
++      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
++      # so, if we see these flags be careful not to treat them like -L
++      -L[A-Z][A-Z]*:*)
++	case $with_gcc/$host in
++	no/*-*-irix* | no/*-*-nonstopux*)
++	  compile_command="$compile_command $arg"
++	  finalize_command="$finalize_command $arg"
++	  ;;
++	esac
++	continue
++	;;
++
++      -L*)
++	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
++	# We need an absolute path.
++	case $dir in
++	[\\/]* | [A-Za-z]:[\\/]*) ;;
++	*)
++	  absdir=`cd "$dir" && pwd`
++	  if test -z "$absdir"; then
++	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
++	    exit 1
++	  fi
++	  dir="$absdir"
++	  ;;
++	esac
++	case "$deplibs " in
++	*" -L$dir "*) ;;
++	*)
++	  deplibs="$deplibs -L$dir"
++	  lib_search_path="$lib_search_path $dir"
++	  ;;
++	esac
++	case $host in
++	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++	  case :$dllsearchpath: in
++	  *":$dir:"*) ;;
++	  *) dllsearchpath="$dllsearchpath:$dir";;
++	  esac
++	  ;;
++	esac
++	continue
++	;;
++
++      -l*)
++	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
++	  case $host in
++	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
++	    # These systems don't actually have a C or math library (as such)
++	    continue
++	    ;;
++	  *-*-mingw* | *-*-os2*)
++	    # These systems don't actually have a C library (as such)
++	    test "X$arg" = "X-lc" && continue
++	    ;;
++	  *-*-openbsd* | *-*-freebsd*)
++	    # Do not include libc due to us having libc/libc_r.
++	    test "X$arg" = "X-lc" && continue
++	    ;;
++	  esac
++	 elif test "X$arg" = "X-lc_r"; then
++	  case $host in
++	 *-*-openbsd* | *-*-freebsd*)
++	    # Do not include libc_r directly, use -pthread flag.
++	    continue
++	    ;;
++	  esac
++	fi
++	deplibs="$deplibs $arg"
++	continue
++	;;
++
++      -module)
++	module=yes
++	continue
++	;;
++
++      -no-fast-install)
++	fast_install=no
++	continue
++	;;
++
++      -no-install)
++	case $host in
++	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++	  # The PATH hackery in wrapper scripts is required on Windows
++	  # in order for the loader to find any dlls it needs.
++	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
++	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
++	  fast_install=no
++	  ;;
++	*) no_install=yes ;;
++	esac
++	continue
++	;;
++
++      -no-undefined)
++	allow_undefined=no
++	continue
++	;;
++
++      -o) prev=output ;;
++
++      -release)
++	prev=release
++	continue
++	;;
++
++      -rpath)
++	prev=rpath
++	continue
++	;;
++
++      -R)
++	prev=xrpath
++	continue
++	;;
++
++      -R*)
++	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
++	# We need an absolute path.
++	case $dir in
++	[\\/]* | [A-Za-z]:[\\/]*) ;;
++	*)
++	  $echo "$modename: only absolute run-paths are allowed" 1>&2
++	  exit 1
++	  ;;
++	esac
++	case "$xrpath " in
++	*" $dir "*) ;;
++	*) xrpath="$xrpath $dir" ;;
++	esac
++	continue
++	;;
++
++      -static)
++	# The effects of -static are defined in a previous loop.
++	# We used to do the same as -all-static on platforms that
++	# didn't have a PIC flag, but the assumption that the effects
++	# would be equivalent was wrong.  It would break on at least
++	# Digital Unix and AIX.
++	continue
++	;;
++
++      -thread-safe)
++	thread_safe=yes
++	continue
++	;;
++
++      -version-info)
++	prev=vinfo
++	continue
++	;;
++
++      -Wc,*)
++	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
++	arg=
++	save_ifs="$IFS"; IFS=','
++	for flag in $args; do
++	  IFS="$save_ifs"
++	  case $flag in
++	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	    flag="\"$flag\""
++	    ;;
++	  esac
++	  arg="$arg $wl$flag"
++	  compiler_flags="$compiler_flags $flag"
++	done
++	IFS="$save_ifs"
++	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
++	;;
++
++      -Wl,*)
++	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
++	arg=
++	save_ifs="$IFS"; IFS=','
++	for flag in $args; do
++	  IFS="$save_ifs"
++	  case $flag in
++	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	    flag="\"$flag\""
++	    ;;
++	  esac
++	  arg="$arg $wl$flag"
++	  compiler_flags="$compiler_flags $wl$flag"
++	  linker_flags="$linker_flags $flag"
++	done
++	IFS="$save_ifs"
++	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
++	;;
++
++      -Xcompiler)
++	prev=xcompiler
++	continue
++	;;
++
++      -Xlinker)
++	prev=xlinker
++	continue
++	;;
++
++      # Some other compiler flag.
++      -* | +*)
++	# Unknown arguments in both finalize_command and compile_command need
++	# to be aesthetically quoted because they are evaled later.
++	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
++	case $arg in
++	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	  arg="\"$arg\""
++	  ;;
++	esac
++	;;
++
++      *.lo | *.$objext)
++	# A library or standard object.
++	if test "$prev" = dlfiles; then
++	  # This file was specified with -dlopen.
++	  if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
++	    dlfiles="$dlfiles $arg"
++	    prev=
++	    continue
++	  else
++	    # If libtool objects are unsupported, then we need to preload.
++	    prev=dlprefiles
++	  fi
++	fi
++
++	if test "$prev" = dlprefiles; then
++	  # Preload the old-style object.
++	  dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e "$lo2o"`
++	  prev=
++	else
++	  case $arg in
++	  *.lo) libobjs="$libobjs $arg" ;;
++	  *) objs="$objs $arg" ;;
++	  esac
++	fi
++	;;
++
++      *.$libext)
++	# An archive.
++	deplibs="$deplibs $arg"
++	old_deplibs="$old_deplibs $arg"
++	continue
++	;;
++
++      *.la)
++	# A libtool-controlled library.
++
++	if test "$prev" = dlfiles; then
++	  # This library was specified with -dlopen.
++	  dlfiles="$dlfiles $arg"
++	  prev=
++	elif test "$prev" = dlprefiles; then
++	  # The library was specified with -dlpreopen.
++	  dlprefiles="$dlprefiles $arg"
++	  prev=
++	else
++	  deplibs="$deplibs $arg"
++	fi
++	continue
++	;;
++
++      # Some other compiler argument.
++      *)
++	# Unknown arguments in both finalize_command and compile_command need
++	# to be aesthetically quoted because they are evaled later.
++	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
++	case $arg in
++	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	  arg="\"$arg\""
++	  ;;
++	esac
++	;;
++      esac # arg
++
++      # Now actually substitute the argument into the commands.
++      if test -n "$arg"; then
++	compile_command="$compile_command $arg"
++	finalize_command="$finalize_command $arg"
++      fi
++    done # argument parsing loop
++
++    if test -n "$prev"; then
++      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
++      $echo "$help" 1>&2
++      exit 1
++    fi
++
++    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
++      eval arg=\"$export_dynamic_flag_spec\"
++      compile_command="$compile_command $arg"
++      finalize_command="$finalize_command $arg"
++    fi
++
++    # calculate the name of the file, without its directory
++    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
++    libobjs_save="$libobjs"
++
++    if test -n "$shlibpath_var"; then
++      # get the directories listed in $shlibpath_var
++      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
++    else
++      shlib_search_path=
++    fi
++    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
++    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
++
++    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
++    if test "X$output_objdir" = "X$output"; then
++      output_objdir="$objdir"
++    else
++      output_objdir="$output_objdir/$objdir"
++    fi
++    # Create the object directory.
++    if test ! -d $output_objdir; then
++      $show "$mkdir $output_objdir"
++      $run $mkdir $output_objdir
++      status=$?
++      if test $status -ne 0 && test ! -d $output_objdir; then
++	exit $status
++      fi
++    fi
++
++    # Determine the type of output
++    case $output in
++    "")
++      $echo "$modename: you must specify an output file" 1>&2
++      $echo "$help" 1>&2
++      exit 1
++      ;;
++    *.$libext) linkmode=oldlib ;;
++    *.lo | *.$objext) linkmode=obj ;;
++    *.la) linkmode=lib ;;
++    *) linkmode=prog ;; # Anything else should be a program.
++    esac
++
++    specialdeplibs=
++    libs=
++    # Find all interdependent deplibs by searching for libraries
++    # that are linked more than once (e.g. -la -lb -la)
++    for deplib in $deplibs; do
++      if test "X$duplicate_deps" = "Xyes" ; then
++	case "$libs " in
++	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++	esac
++      fi
++      libs="$libs $deplib"
++    done
++    deplibs=
++    newdependency_libs=
++    newlib_search_path=
++    need_relink=no # whether we're linking any uninstalled libtool libraries
++    notinst_deplibs= # not-installed libtool libraries
++    notinst_path= # paths that contain not-installed libtool libraries
++    case $linkmode in
++    lib)
++	passes="conv link"
++	for file in $dlfiles $dlprefiles; do
++	  case $file in
++	  *.la) ;;
++	  *)
++	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
++	    exit 1
++	    ;;
++	  esac
++	done
++	;;
++    prog)
++	compile_deplibs=
++	finalize_deplibs=
++	alldeplibs=no
++	newdlfiles=
++	newdlprefiles=
++	passes="conv scan dlopen dlpreopen link"
++	;;
++    *)  passes="conv"
++	;;
++    esac
++    for pass in $passes; do
++      if test $linkmode = prog; then
++	# Determine which files to process
++	case $pass in
++	dlopen)
++	  libs="$dlfiles"
++	  save_deplibs="$deplibs" # Collect dlpreopened libraries
++	  deplibs=
++	  ;;
++	dlpreopen) libs="$dlprefiles" ;;
++	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
++	esac
++      fi
++      for deplib in $libs; do
++	lib=
++	found=no
++	case $deplib in
++	-l*)
++	  if test $linkmode = oldlib && test $linkmode = obj; then
++	    $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
++	    continue
++	  fi
++	  if test $pass = conv; then
++	    deplibs="$deplib $deplibs"
++	    continue
++	  fi
++	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
++	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
++	    # Search the libtool library
++	    lib="$searchdir/lib${name}.la"
++	    if test -f "$lib"; then
++	      found=yes
++	      break
++	    fi
++	  done
++	  if test "$found" != yes; then
++	    # deplib doesn't seem to be a libtool library
++	    if test "$linkmode,$pass" = "prog,link"; then
++	      compile_deplibs="$deplib $compile_deplibs"
++	      finalize_deplibs="$deplib $finalize_deplibs"
++	    else
++	      deplibs="$deplib $deplibs"
++	      test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs"
++	    fi
++	    continue
++	  fi
++	  ;; # -l
++	-L*)
++	  case $linkmode in
++	  lib)
++	    deplibs="$deplib $deplibs"
++	    test $pass = conv && continue
++	    newdependency_libs="$deplib $newdependency_libs"
++	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
++	    ;;
++	  prog)
++	    if test $pass = conv; then
++	      deplibs="$deplib $deplibs"
++	      continue
++	    fi
++	    if test $pass = scan; then
++	      deplibs="$deplib $deplibs"
++	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
++	    else
++	      compile_deplibs="$deplib $compile_deplibs"
++	      finalize_deplibs="$deplib $finalize_deplibs"
++	    fi
++	    ;;
++	  *)
++	    $echo "$modename: warning: \`-L' is ignored for archives/objects: $deplib" 1>&2
++	    ;;
++	  esac # linkmode
++	  continue
++	  ;; # -L
++	-R*)
++	  if test $pass = link; then
++	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
++	    # Make sure the xrpath contains only unique directories.
++	    case "$xrpath " in
++	    *" $dir "*) ;;
++	    *) xrpath="$xrpath $dir" ;;
++	    esac
++	  fi
++	  deplibs="$deplib $deplibs"
++	  continue
++	  ;;
++	*.la) lib="$deplib" ;;
++	*.$libext)
++	  if test $pass = conv; then
++	    deplibs="$deplib $deplibs"
++	    continue
++	  fi
++	  case $linkmode in
++	  lib)
++	    if test "$deplibs_check_method" != pass_all; then
++	      echo
++	      echo "*** Warning: Trying to link with static lib archive $deplib."
++	      echo "*** I have the capability to make that library automatically link in when"
++	      echo "*** you link to this library.  But I can only do this if you have a"
++	      echo "*** shared version of the library, which you do not appear to have"
++	      echo "*** because the file extensions .$libext of this argument makes me believe"
++	      echo "*** that it is just a static archive that I should not used here."
++	    else
++	      echo
++	      echo "*** Warning: Linking the shared library $output against the"
++	      echo "*** static library $deplib is not portable!"
++	      deplibs="$deplib $deplibs"
++	    fi
++	    continue
++	    ;;
++	  prog)
++	    if test $pass != link; then
++	      deplibs="$deplib $deplibs"
++	    else
++	      compile_deplibs="$deplib $compile_deplibs"
++	      finalize_deplibs="$deplib $finalize_deplibs"
++	    fi
++	    continue
++	    ;;
++	  esac # linkmode
++	  ;; # *.$libext
++	*.lo | *.$objext)
++	  if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
++	    # If there is no dlopen support or we're linking statically,
++	    # we need to preload.
++	    newdlprefiles="$newdlprefiles $deplib"
++	    compile_deplibs="$deplib $compile_deplibs"
++	    finalize_deplibs="$deplib $finalize_deplibs"
++	  else
++	    newdlfiles="$newdlfiles $deplib"
++	  fi
++	  continue
++	  ;;
++	%DEPLIBS%)
++	  alldeplibs=yes
++	  continue
++	  ;;
++	esac # case $deplib
++	if test $found = yes || test -f "$lib"; then :
++	else
++	  $echo "$modename: cannot find the library \`$lib'" 1>&2
++	  exit 1
++	fi
++
++	# Check to see that this really is a libtool archive.
++	if (${SED} -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
++	else
++	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
++	  exit 1
++	fi
++
++	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
++	test "X$ladir" = "X$lib" && ladir="."
++
++	dlname=
++	dlopen=
++	dlpreopen=
++	libdir=
++	library_names=
++	old_library=
++	# If the library was installed with an old release of libtool,
++	# it will not redefine variable installed.
++	installed=yes
++
++	# Read the .la file
++	case $lib in
++	*/* | *\\*) . $lib ;;
++	*) . ./$lib ;;
++	esac
++
++	if test "$linkmode,$pass" = "lib,link" ||
++	   test "$linkmode,$pass" = "prog,scan" ||
++	   { test $linkmode = oldlib && test $linkmode = obj; }; then
++	   # Add dl[pre]opened files of deplib
++	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
++	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
++	fi
++
++	if test $pass = conv; then
++	  # Only check for convenience libraries
++	  deplibs="$lib $deplibs"
++	  if test -z "$libdir"; then
++	    if test -z "$old_library"; then
++	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
++	      exit 1
++	    fi
++	    # It is a libtool convenience library, so add in its objects.
++	    convenience="$convenience $ladir/$objdir/$old_library"
++	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
++	    tmp_libs=
++	    for deplib in $dependency_libs; do
++	      deplibs="$deplib $deplibs"
++              if test "X$duplicate_deps" = "Xyes" ; then
++	        case "$tmp_libs " in
++	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++	        esac
++              fi
++	      tmp_libs="$tmp_libs $deplib"
++	    done
++	  elif test $linkmode != prog && test $linkmode != lib; then
++	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
++	    exit 1
++	  fi
++	  continue
++	fi # $pass = conv
++
++	# Get the name of the library we link against.
++	linklib=
++	for l in $old_library $library_names; do
++	  linklib="$l"
++	done
++	if test -z "$linklib"; then
++	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
++	  exit 1
++	fi
++
++	# This library was specified with -dlopen.
++	if test $pass = dlopen; then
++	  if test -z "$libdir"; then
++	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
++	    exit 1
++	  fi
++	  if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
++	    # If there is no dlname, no dlopen support or we're linking
++	    # statically, we need to preload.
++	    dlprefiles="$dlprefiles $lib"
++	  else
++	    newdlfiles="$newdlfiles $lib"
++	  fi
++	  continue
++	fi # $pass = dlopen
++
++	# We need an absolute path.
++	case $ladir in
++	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
++	*)
++	  abs_ladir=`cd "$ladir" && pwd`
++	  if test -z "$abs_ladir"; then
++	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
++	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
++	    abs_ladir="$ladir"
++	  fi
++	  ;;
++	esac
++	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
++
++	# Find the relevant object directory and library name.
++	if test "X$installed" = Xyes; then
++	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
++	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
++	    dir="$ladir"
++	    absdir="$abs_ladir"
++	    libdir="$abs_ladir"
++	  else
++	    dir="$libdir"
++	    absdir="$libdir"
++	  fi
++	else
++	  dir="$ladir/$objdir"
++	  absdir="$abs_ladir/$objdir"
++	  # Remove this search path later
++	  notinst_path="$notinst_path $abs_ladir"
++	fi # $installed = yes
++	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
++
++	# This library was specified with -dlpreopen.
++	if test $pass = dlpreopen; then
++	  if test -z "$libdir"; then
++	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
++	    exit 1
++	  fi
++	  # Prefer using a static library (so that no silly _DYNAMIC symbols
++	  # are required to link).
++	  if test -n "$old_library"; then
++	    newdlprefiles="$newdlprefiles $dir/$old_library"
++	  # Otherwise, use the dlname, so that lt_dlopen finds it.
++	  elif test -n "$dlname"; then
++	    newdlprefiles="$newdlprefiles $dir/$dlname"
++	  else
++	    newdlprefiles="$newdlprefiles $dir/$linklib"
++	  fi
++	fi # $pass = dlpreopen
++
++	if test -z "$libdir"; then
++	  # Link the convenience library
++	  if test $linkmode = lib; then
++	    deplibs="$dir/$old_library $deplibs"
++	  elif test "$linkmode,$pass" = "prog,link"; then
++	    compile_deplibs="$dir/$old_library $compile_deplibs"
++	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
++	  else
++	    deplibs="$lib $deplibs"
++	  fi
++	  continue
++	fi
++
++	if test $linkmode = prog && test $pass != link; then
++	  newlib_search_path="$newlib_search_path $ladir"
++	  deplibs="$lib $deplibs"
++
++	  linkalldeplibs=no
++	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
++	     test "$build_libtool_libs" = no; then
++	    linkalldeplibs=yes
++	  fi
++
++	  tmp_libs=
++	  for deplib in $dependency_libs; do
++	    case $deplib in
++	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
++	    esac
++	    # Need to link against all dependency_libs?
++	    if test $linkalldeplibs = yes; then
++	      deplibs="$deplib $deplibs"
++	    else
++	      # Need to hardcode shared library paths
++	      # or/and link against static libraries
++	      newdependency_libs="$deplib $newdependency_libs"
++	    fi
++	    if test "X$duplicate_deps" = "Xyes" ; then
++	      case "$tmp_libs " in
++	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++	      esac
++	    fi
++	    tmp_libs="$tmp_libs $deplib"
++	  done # for deplib
++	  continue
++	fi # $linkmode = prog...
++
++	link_static=no # Whether the deplib will be linked statically
++	if test -n "$library_names" &&
++	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
++	  # Link against this shared library
++
++	  if test "$linkmode,$pass" = "prog,link" ||
++	   { test $linkmode = lib && test $hardcode_into_libs = yes; }; then
++	    # Hardcode the library path.
++	    # Skip directories that are in the system default run-time
++	    # search path.
++	    case " $sys_lib_dlsearch_path " in
++	    *" $absdir "*) ;;
++	    *)
++	      case "$compile_rpath " in
++	      *" $absdir "*) ;;
++	      *) compile_rpath="$compile_rpath $absdir"
++	      esac
++	      ;;
++	    esac
++	    case " $sys_lib_dlsearch_path " in
++	    *" $libdir "*) ;;
++	    *)
++	      case "$finalize_rpath " in
++	      *" $libdir "*) ;;
++	      *) finalize_rpath="$finalize_rpath $libdir"
++	      esac
++	      ;;
++	    esac
++	    if test $linkmode = prog; then
++	      # We need to hardcode the library path
++	      if test -n "$shlibpath_var"; then
++		# Make sure the rpath contains only unique directories.
++		case "$temp_rpath " in
++		*" $dir "*) ;;
++		*" $absdir "*) ;;
++		*) temp_rpath="$temp_rpath $dir" ;;
++		esac
++	      fi
++	    fi
++	  fi # $linkmode,$pass = prog,link...
++
++	  if test "$alldeplibs" = yes &&
++	     { test "$deplibs_check_method" = pass_all ||
++	       { test "$build_libtool_libs" = yes &&
++		 test -n "$library_names"; }; }; then
++	    # We only need to search for static libraries
++	    continue
++	  fi
++
++	  if test "$installed" = no; then
++	    notinst_deplibs="$notinst_deplibs $lib"
++	    need_relink=yes
++	  fi
++
++	  if test -n "$old_archive_from_expsyms_cmds"; then
++	    # figure out the soname
++	    set dummy $library_names
++	    realname="$2"
++	    shift; shift
++	    libname=`eval \\$echo \"$libname_spec\"`
++	    # use dlname if we got it. it's perfectly good, no?
++	    if test -n "$dlname"; then
++	      soname="$dlname"
++	    elif test -n "$soname_spec"; then
++	      # bleh windows
++	      case $host in
++	      *cygwin*)
++		major=`expr $current - $age`
++		versuffix="-$major"
++		;;
++	      esac
++	      eval soname=\"$soname_spec\"
++	    else
++	      soname="$realname"
++	    fi
++
++	    # Make a new name for the extract_expsyms_cmds to use
++	    soroot="$soname"
++	    soname=`echo $soroot | ${SED} -e 's/^.*\///'`
++	    newlib="libimp-`echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
++
++	    # If the library has no export list, then create one now
++	    if test -f "$output_objdir/$soname-def"; then :
++	    else
++	      $show "extracting exported symbol list from \`$soname'"
++	      save_ifs="$IFS"; IFS='~'
++	      eval cmds=\"$extract_expsyms_cmds\"
++	      for cmd in $cmds; do
++		IFS="$save_ifs"
++		$show "$cmd"
++		$run eval "$cmd" || exit $?
++	      done
++	      IFS="$save_ifs"
++	    fi
++
++	    # Create $newlib
++	    if test -f "$output_objdir/$newlib"; then :; else
++	      $show "generating import library for \`$soname'"
++	      save_ifs="$IFS"; IFS='~'
++	      eval cmds=\"$old_archive_from_expsyms_cmds\"
++	      for cmd in $cmds; do
++		IFS="$save_ifs"
++		$show "$cmd"
++		$run eval "$cmd" || exit $?
++	      done
++	      IFS="$save_ifs"
++	    fi
++	    # make sure the library variables are pointing to the new library
++	    dir=$output_objdir
++	    linklib=$newlib
++	  fi # test -n $old_archive_from_expsyms_cmds
++
++	  if test $linkmode = prog || test "$mode" != relink; then
++	    add_shlibpath=
++	    add_dir=
++	    add=
++	    lib_linked=yes
++	    case $hardcode_action in
++	    immediate | unsupported)
++	      if test "$hardcode_direct" = no; then
++		add="$dir/$linklib"
++	      elif test "$hardcode_minus_L" = no; then
++		case $host in
++		*-*-sunos*) add_shlibpath="$dir" ;;
++		esac
++		add_dir="-L$dir"
++		add="-l$name"
++	      elif test "$hardcode_shlibpath_var" = no; then
++		add_shlibpath="$dir"
++		add="-l$name"
++	      else
++		lib_linked=no
++	      fi
++	      ;;
++	    relink)
++	      if test "$hardcode_direct" = yes; then
++		add="$dir/$linklib"
++	      elif test "$hardcode_minus_L" = yes; then
++		add_dir="-L$dir"
++		# Try looking first in the location we're being installed to.
++		if test -n "$inst_prefix_dir"; then
++		  case "$libdir" in
++		  [\/]*)
++		    add_dir="-L$inst_prefix_dir$libdir $add_dir"
++		    ;;
++		  esac
++		fi
++		add="-l$name"
++	      elif test "$hardcode_shlibpath_var" = yes; then
++		add_shlibpath="$dir"
++		add="-l$name"
++	      else
++		lib_linked=no
++	      fi
++	      ;;
++	    *) lib_linked=no ;;
++	    esac
++
++	    if test "$lib_linked" != yes; then
++	      $echo "$modename: configuration error: unsupported hardcode properties"
++	      exit 1
++	    fi
++
++	    if test -n "$add_shlibpath"; then
++	      case :$compile_shlibpath: in
++	      *":$add_shlibpath:"*) ;;
++	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
++	      esac
++	    fi
++	    if test $linkmode = prog; then
++	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
++	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
++	    else
++	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
++	      test -n "$add" && deplibs="$add $deplibs"
++	      if test "$hardcode_direct" != yes && \
++		 test "$hardcode_minus_L" != yes && \
++		 test "$hardcode_shlibpath_var" = yes; then
++		case :$finalize_shlibpath: in
++		*":$libdir:"*) ;;
++		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
++		esac
++	      fi
++	    fi
++	  fi
++
++	  if test $linkmode = prog || test "$mode" = relink; then
++	    add_shlibpath=
++	    add_dir=
++	    add=
++	    # Finalize command for both is simple: just hardcode it.
++	    if test "$hardcode_direct" = yes; then
++	      add="$libdir/$linklib"
++	    elif test "$hardcode_minus_L" = yes; then
++	      add_dir="-L$libdir"
++	      add="-l$name"
++	    elif test "$hardcode_shlibpath_var" = yes; then
++	      case :$finalize_shlibpath: in
++	      *":$libdir:"*) ;;
++	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
++	      esac
++	      add="-l$name"
++	    else
++	      # We cannot seem to hardcode it, guess we'll fake it.
++	      add_dir="-L$libdir"
++	      # Try looking first in the location we're being installed to.
++	      if test -n "$inst_prefix_dir"; then
++		case "$libdir" in
++		[\/]*)
++		  add_dir="-L$inst_prefix_dir$libdir $add_dir"
++		  ;;
++		esac
++	      fi
++	      add="-l$name"
++	    fi
++
++	    if test $linkmode = prog; then
++	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
++	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
++	    else
++	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
++	      test -n "$add" && deplibs="$add $deplibs"
++	    fi
++	  fi
++	elif test $linkmode = prog; then
++	  if test "$alldeplibs" = yes &&
++	     { test "$deplibs_check_method" = pass_all ||
++	       { test "$build_libtool_libs" = yes &&
++		 test -n "$library_names"; }; }; then
++	    # We only need to search for static libraries
++	    continue
++	  fi
++
++	  # Try to link the static library
++	  # Here we assume that one of hardcode_direct or hardcode_minus_L
++	  # is not unsupported.  This is valid on all known static and
++	  # shared platforms.
++	  if test "$hardcode_direct" != unsupported; then
++	    test -n "$old_library" && linklib="$old_library"
++	    compile_deplibs="$dir/$linklib $compile_deplibs"
++	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
++	  else
++	    compile_deplibs="-l$name -L$dir $compile_deplibs"
++	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
++	  fi
++	elif test "$build_libtool_libs" = yes; then
++	  # Not a shared library
++	  if test "$deplibs_check_method" != pass_all; then
++	    # We're trying link a shared library against a static one
++	    # but the system doesn't support it.
++
++	    # Just print a warning and add the library to dependency_libs so
++	    # that the program can be linked against the static library.
++	    echo
++	    echo "*** Warning: This system can not link to static lib archive $lib."
++	    echo "*** I have the capability to make that library automatically link in when"
++	    echo "*** you link to this library.  But I can only do this if you have a"
++	    echo "*** shared version of the library, which you do not appear to have."
++	    if test "$module" = yes; then
++	      echo "*** But as you try to build a module library, libtool will still create "
++	      echo "*** a static module, that should work as long as the dlopening application"
++	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
++	      if test -z "$global_symbol_pipe"; then
++		echo
++		echo "*** However, this would only work if libtool was able to extract symbol"
++		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
++		echo "*** not find such a program.  So, this module is probably useless."
++		echo "*** \`nm' from GNU binutils and a full rebuild may help."
++	      fi
++	      if test "$build_old_libs" = no; then
++		build_libtool_libs=module
++		build_old_libs=yes
++	      else
++		build_libtool_libs=no
++	      fi
++	    fi
++	  else
++	    convenience="$convenience $dir/$old_library"
++	    old_convenience="$old_convenience $dir/$old_library"
++	    deplibs="$dir/$old_library $deplibs"
++	    link_static=yes
++	  fi
++	fi # link shared/static library?
++
++	if test $linkmode = lib; then
++	  if test -n "$dependency_libs" &&
++	     { test $hardcode_into_libs != yes || test $build_old_libs = yes ||
++	       test $link_static = yes; }; then
++	    # Extract -R from dependency_libs
++	    temp_deplibs=
++	    for libdir in $dependency_libs; do
++	      case $libdir in
++	      -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
++		   case " $xrpath " in
++		   *" $temp_xrpath "*) ;;
++		   *) xrpath="$xrpath $temp_xrpath";;
++		   esac;;
++	      *) temp_deplibs="$temp_deplibs $libdir";;
++	      esac
++	    done
++	    dependency_libs="$temp_deplibs"
++	  fi
++
++	  newlib_search_path="$newlib_search_path $absdir"
++	  # Link against this library
++	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
++	  # ... and its dependency_libs
++	  tmp_libs=
++	  for deplib in $dependency_libs; do
++	    newdependency_libs="$deplib $newdependency_libs"
++	    if test "X$duplicate_deps" = "Xyes" ; then
++	      case "$tmp_libs " in
++	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++	      esac
++	    fi
++	    tmp_libs="$tmp_libs $deplib"
++	  done
++
++	  if test $link_all_deplibs != no; then
++	    # Add the search paths of all dependency libraries
++	    for deplib in $dependency_libs; do
++	      case $deplib in
++	      -L*) path="$deplib" ;;
++	      *.la)
++		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
++		test "X$dir" = "X$deplib" && dir="."
++		# We need an absolute path.
++		case $dir in
++		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
++		*)
++		  absdir=`cd "$dir" && pwd`
++		  if test -z "$absdir"; then
++		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
++		    absdir="$dir"
++		  fi
++		  ;;
++		esac
++		if grep "^installed=no" $deplib > /dev/null; then
++		  path="-L$absdir/$objdir"
++		else
++		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
++		  if test -z "$libdir"; then
++		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
++		    exit 1
++		  fi
++		  if test "$absdir" != "$libdir"; then
++		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
++		  fi
++		  path="-L$absdir"
++		fi
++		;;
++	      *) continue ;;
++	      esac
++	      case " $deplibs " in
++	      *" $path "*) ;;
++	      *) deplibs="$deplibs $path" ;;
++	      esac
++	    done
++	  fi # link_all_deplibs != no
++	fi # linkmode = lib
++      done # for deplib in $libs
++      if test $pass = dlpreopen; then
++	# Link the dlpreopened libraries before other libraries
++	for deplib in $save_deplibs; do
++	  deplibs="$deplib $deplibs"
++	done
++      fi
++      if test $pass != dlopen; then
++	test $pass != scan && dependency_libs="$newdependency_libs"
++	if test $pass != conv; then
++	  # Make sure lib_search_path contains only unique directories.
++	  lib_search_path=
++	  for dir in $newlib_search_path; do
++	    case "$lib_search_path " in
++	    *" $dir "*) ;;
++	    *) lib_search_path="$lib_search_path $dir" ;;
++	    esac
++	  done
++	  newlib_search_path=
++	fi
++
++	if test "$linkmode,$pass" != "prog,link"; then
++	  vars="deplibs"
++	else
++	  vars="compile_deplibs finalize_deplibs"
++	fi
++	for var in $vars dependency_libs; do
++	  # Add libraries to $var in reverse order
++	  eval tmp_libs=\"\$$var\"
++	  new_libs=
++	  for deplib in $tmp_libs; do
++	    case $deplib in
++	    -L*) new_libs="$deplib $new_libs" ;;
++	    *)
++	      case " $specialdeplibs " in
++	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
++	      *)
++		case " $new_libs " in
++		*" $deplib "*) ;;
++		*) new_libs="$deplib $new_libs" ;;
++		esac
++		;;
++	      esac
++	      ;;
++	    esac
++	  done
++	  tmp_libs=
++	  for deplib in $new_libs; do
++	    case $deplib in
++	    -L*)
++	      case " $tmp_libs " in
++	      *" $deplib "*) ;;
++	      *) tmp_libs="$tmp_libs $deplib" ;;
++	      esac
++	      ;;
++	    *) tmp_libs="$tmp_libs $deplib" ;;
++	    esac
++	  done
++	  eval $var=\"$tmp_libs\"
++	done # for var
++      fi
++      if test "$pass" = "conv" &&
++       { test "$linkmode" = "lib" || test "$linkmode" = "prog"; }; then
++	libs="$deplibs" # reset libs
++	deplibs=
++      fi
++    done # for pass
++    if test $linkmode = prog; then
++      dlfiles="$newdlfiles"
++      dlprefiles="$newdlprefiles"
++    fi
++
++    case $linkmode in
++    oldlib)
++      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
++	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
++      fi
++
++      if test -n "$rpath"; then
++	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
++      fi
++
++      if test -n "$xrpath"; then
++	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
++      fi
++
++      if test -n "$vinfo"; then
++	$echo "$modename: warning: \`-version-info' is ignored for archives" 1>&2
++      fi
++
++      if test -n "$release"; then
++	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
++      fi
++
++      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
++	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
++      fi
++
++      # Now set the variables for building old libraries.
++      build_libtool_libs=no
++      oldlibs="$output"
++      objs="$objs$old_deplibs"
++      ;;
++
++    lib)
++      # Make sure we only generate libraries of the form `libNAME.la'.
++      case $outputname in
++      lib*)
++	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
++	eval libname=\"$libname_spec\"
++	;;
++      *)
++	if test "$module" = no; then
++	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
++	  $echo "$help" 1>&2
++	  exit 1
++	fi
++	if test "$need_lib_prefix" != no; then
++	  # Add the "lib" prefix for modules if required
++	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
++	  eval libname=\"$libname_spec\"
++	else
++	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
++	fi
++	;;
++      esac
++
++      if test -n "$objs"; then
++	if test "$deplibs_check_method" != pass_all; then
++	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
++	  exit 1
++	else
++	  echo
++	  echo "*** Warning: Linking the shared library $output against the non-libtool"
++	  echo "*** objects $objs is not portable!"
++	  libobjs="$libobjs $objs"
++	fi
++      fi
++
++      if test "$dlself" != no; then
++	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
++      fi
++
++      set dummy $rpath
++      if test $# -gt 2; then
++	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
++      fi
++      install_libdir="$2"
++
++      oldlibs=
++      if test -z "$rpath"; then
++	if test "$build_libtool_libs" = yes; then
++	  # Building a libtool convenience library.
++	  libext=al
++	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
++	  build_libtool_libs=convenience
++	  build_old_libs=yes
++	fi
++
++	if test -n "$vinfo"; then
++	  $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2
++	fi
++
++	if test -n "$release"; then
++	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
++	fi
++      else
++
++	# Parse the version information argument.
++	save_ifs="$IFS"; IFS=':'
++	set dummy $vinfo 0 0 0
++	IFS="$save_ifs"
++
++	if test -n "$8"; then
++	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
++	  $echo "$help" 1>&2
++	  exit 1
++	fi
++
++	current="$2"
++	revision="$3"
++	age="$4"
++
++	# Check that each of the things are valid numbers.
++	case $current in
++	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++	*)
++	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
++	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
++	  exit 1
++	  ;;
++	esac
++
++	case $revision in
++	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++	*)
++	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
++	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
++	  exit 1
++	  ;;
++	esac
++
++	case $age in
++	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++	*)
++	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
++	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
++	  exit 1
++	  ;;
++	esac
++
++	if test $age -gt $current; then
++	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
++	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
++	  exit 1
++	fi
++
++	# Calculate the version variables.
++	major=
++	versuffix=
++	verstring=
++	case $version_type in
++	none) ;;
++
++	darwin)
++	  # Like Linux, but with the current version available in
++	  # verstring for coding it into the library header
++	  major=.`expr $current - $age`
++	  versuffix="$major.$age.$revision"
++	  # Darwin ld doesn't like 0 for these options...
++	  minor_current=`expr $current + 1`
++	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
++	  ;;
++
++	freebsd-aout)
++	  major=".$current"
++	  versuffix=".$current.$revision";
++	  ;;
++
++	freebsd-elf)
++	  major=".$current"
++	  versuffix=".$current";
++	  ;;
++
++	irix | nonstopux)
++	  major=`expr $current - $age + 1`
++
++	  case $version_type in
++	    nonstopux) verstring_prefix=nonstopux ;;
++	    *)         verstring_prefix=sgi ;;
++	  esac
++	  verstring="$verstring_prefix$major.$revision"
++
++	  # Add in all the interfaces that we are compatible with.
++	  loop=$revision
++	  while test $loop != 0; do
++	    iface=`expr $revision - $loop`
++	    loop=`expr $loop - 1`
++	    verstring="$verstring_prefix$major.$iface:$verstring"
++	  done
++
++	  # Before this point, $major must not contain `.'.
++	  major=.$major
++	  versuffix="$major.$revision"
++	  ;;
++
++	linux)
++	  major=.`expr $current - $age`
++	  versuffix="$major.$age.$revision"
++	  ;;
++
++	osf)
++	  major=.`expr $current - $age`
++	  versuffix=".$current.$age.$revision"
++	  verstring="$current.$age.$revision"
++
++	  # Add in all the interfaces that we are compatible with.
++	  loop=$age
++	  while test $loop != 0; do
++	    iface=`expr $current - $loop`
++	    loop=`expr $loop - 1`
++	    verstring="$verstring:${iface}.0"
++	  done
++
++	  # Make executables depend on our current version.
++	  verstring="$verstring:${current}.0"
++	  ;;
++
++	sunos)
++	  major=".$current"
++	  versuffix=".$current.$revision"
++	  ;;
++
++	windows)
++	  # Use '-' rather than '.', since we only want one
++	  # extension on DOS 8.3 filesystems.
++	  major=`expr $current - $age`
++	  versuffix="-$major"
++	  ;;
++
++	*)
++	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
++	  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
++	  exit 1
++	  ;;
++	esac
++
++	# Clear the version info if we defaulted, and they specified a release.
++	if test -z "$vinfo" && test -n "$release"; then
++	  major=
++	  verstring="0.0"
++	  case $version_type in
++	  darwin)
++	    # we can't check for "0.0" in archive_cmds due to quoting
++	    # problems, so we reset it completely
++	    verstring=""
++	    ;;
++	  *)
++	    verstring="0.0"
++	    ;;
++	  esac
++	  if test "$need_version" = no; then
++	    versuffix=
++	  else
++	    versuffix=".0.0"
++	  fi
++	fi
++
++	# Remove version info from name if versioning should be avoided
++	if test "$avoid_version" = yes && test "$need_version" = no; then
++	  major=
++	  versuffix=
++	  verstring=""
++	fi
++
++	# Check to see if the archive will have undefined symbols.
++	if test "$allow_undefined" = yes; then
++	  if test "$allow_undefined_flag" = unsupported; then
++	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
++	    build_libtool_libs=no
++	    build_old_libs=yes
++	  fi
++	else
++	  # Don't allow undefined symbols.
++	  allow_undefined_flag="$no_undefined_flag"
++	fi
++      fi
++
++      if test "$mode" != relink; then
++	# Remove our outputs.
++	$show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
++	$run ${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*
++      fi
++
++      # Now set the variables for building old libraries.
++      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
++	oldlibs="$oldlibs $output_objdir/$libname.$libext"
++
++	# Transform .lo files to .o files.
++	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
++      fi
++
++      # Eliminate all temporary directories.
++      for path in $notinst_path; do
++	lib_search_path=`echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
++	deplibs=`echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
++	dependency_libs=`echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
++      done
++
++      if test -n "$xrpath"; then
++	# If the user specified any rpath flags, then add them.
++	temp_xrpath=
++	for libdir in $xrpath; do
++	  temp_xrpath="$temp_xrpath -R$libdir"
++	  case "$finalize_rpath " in
++	  *" $libdir "*) ;;
++	  *) finalize_rpath="$finalize_rpath $libdir" ;;
++	  esac
++	done
++	if test $hardcode_into_libs != yes || test $build_old_libs = yes; then
++	  dependency_libs="$temp_xrpath $dependency_libs"
++	fi
++      fi
++
++      # Make sure dlfiles contains only unique files that won't be dlpreopened
++      old_dlfiles="$dlfiles"
++      dlfiles=
++      for lib in $old_dlfiles; do
++	case " $dlprefiles $dlfiles " in
++	*" $lib "*) ;;
++	*) dlfiles="$dlfiles $lib" ;;
++	esac
++      done
++
++      # Make sure dlprefiles contains only unique files
++      old_dlprefiles="$dlprefiles"
++      dlprefiles=
++      for lib in $old_dlprefiles; do
++	case "$dlprefiles " in
++	*" $lib "*) ;;
++	*) dlprefiles="$dlprefiles $lib" ;;
++	esac
++      done
++
++      if test "$build_libtool_libs" = yes; then
++	if test -n "$rpath"; then
++	  case $host in
++	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
++	    # these systems don't actually have a c library (as such)!
++	    ;;
++	  *-*-rhapsody* | *-*-darwin1.[012])
++	    # Rhapsody C library is in the System framework
++	    deplibs="$deplibs -framework System"
++	    ;;
++	  *-*-netbsd*)
++	    # Don't link with libc until the a.out ld.so is fixed.
++	    ;;
++	  *-*-openbsd* | *-*-freebsd*)
++	    # Do not include libc due to us having libc/libc_r.
++	    ;;
++	  *)
++	    # Add libc to deplibs on all other systems if necessary.
++	    if test $build_libtool_need_lc = "yes"; then
++	      deplibs="$deplibs -lc"
++	    fi
++	    ;;
++	  esac
++	fi
++
++	# Transform deplibs into only deplibs that can be linked in shared.
++	name_save=$name
++	libname_save=$libname
++	release_save=$release
++	versuffix_save=$versuffix
++	major_save=$major
++	# I'm not sure if I'm treating the release correctly.  I think
++	# release should show up in the -l (ie -lgmp5) so we don't want to
++	# add it in twice.  Is that correct?
++	release=""
++	versuffix=""
++	major=""
++	newdeplibs=
++	droppeddeps=no
++	case $deplibs_check_method in
++	pass_all)
++	  # Don't check for shared/static.  Everything works.
++	  # This might be a little naive.  We might want to check
++	  # whether the library exists or not.  But this is on
++	  # osf3 & osf4 and I'm not really sure... Just
++	  # implementing what was already the behaviour.
++	  newdeplibs=$deplibs
++	  ;;
++	test_compile)
++	  # This code stresses the "libraries are programs" paradigm to its
++	  # limits. Maybe even breaks it.  We compile a program, linking it
++	  # against the deplibs as a proxy for the library.  Then we can check
++	  # whether they linked in statically or dynamically with ldd.
++	  $rm conftest.c
++	  cat > conftest.c <<EOF
++	  int main() { return 0; }
++EOF
++	  $rm conftest
++	  $CC -o conftest conftest.c $deplibs
++	  if test $? -eq 0 ; then
++	    ldd_output=`ldd conftest`
++	    for i in $deplibs; do
++	      name="`expr $i : '-l\(.*\)'`"
++	      # If $name is empty we are operating on a -L argument.
++	      if test -n "$name" && test "$name" != "0"; then
++		libname=`eval \\$echo \"$libname_spec\"`
++		deplib_matches=`eval \\$echo \"$library_names_spec\"`
++		set dummy $deplib_matches
++		deplib_match=$2
++		if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
++		  newdeplibs="$newdeplibs $i"
++		else
++		  droppeddeps=yes
++		  echo
++		  echo "*** Warning: dynamic linker does not accept needed library $i."
++		  echo "*** I have the capability to make that library automatically link in when"
++		  echo "*** you link to this library.  But I can only do this if you have a"
++		  echo "*** shared version of the library, which I believe you do not have"
++		  echo "*** because a test_compile did reveal that the linker did not use it for"
++		  echo "*** its dynamic dependency list that programs get resolved with at runtime."
++		fi
++	      else
++		newdeplibs="$newdeplibs $i"
++	      fi
++	    done
++	  else
++	    # Error occured in the first compile.  Let's try to salvage
++	    # the situation: Compile a separate program for each library.
++	    for i in $deplibs; do
++	      name="`expr $i : '-l\(.*\)'`"
++	     # If $name is empty we are operating on a -L argument.
++	      if test -n "$name" && test "$name" != "0"; then
++		$rm conftest
++		$CC -o conftest conftest.c $i
++		# Did it work?
++		if test $? -eq 0 ; then
++		  ldd_output=`ldd conftest`
++		  libname=`eval \\$echo \"$libname_spec\"`
++		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
++		  set dummy $deplib_matches
++		  deplib_match=$2
++		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
++		    newdeplibs="$newdeplibs $i"
++		  else
++		    droppeddeps=yes
++		    echo
++		    echo "*** Warning: dynamic linker does not accept needed library $i."
++		    echo "*** I have the capability to make that library automatically link in when"
++		    echo "*** you link to this library.  But I can only do this if you have a"
++		    echo "*** shared version of the library, which you do not appear to have"
++		    echo "*** because a test_compile did reveal that the linker did not use this one"
++		    echo "*** as a dynamic dependency that programs can get resolved with at runtime."
++		  fi
++		else
++		  droppeddeps=yes
++		  echo
++		  echo "*** Warning!  Library $i is needed by this library but I was not able to"
++		  echo "***  make it link in!  You will probably need to install it or some"
++		  echo "*** library that it depends on before this library will be fully"
++		  echo "*** functional.  Installing it before continuing would be even better."
++		fi
++	      else
++		newdeplibs="$newdeplibs $i"
++	      fi
++	    done
++	  fi
++	  ;;
++	file_magic*)
++	  set dummy $deplibs_check_method
++	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
++	  for a_deplib in $deplibs; do
++	    name="`expr $a_deplib : '-l\(.*\)'`"
++	    # If $name is empty we are operating on a -L argument.
++	    if test -n "$name" && test "$name" != "0"; then
++	      libname=`eval \\$echo \"$libname_spec\"`
++	      for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
++		    potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
++		    for potent_lib in $potential_libs; do
++		      # Follow soft links.
++		      if ls -lLd "$potent_lib" 2>/dev/null \
++			 | grep " -> " >/dev/null; then
++			continue
++		      fi
++		      # The statement above tries to avoid entering an
++		      # endless loop below, in case of cyclic links.
++		      # We might still enter an endless loop, since a link
++		      # loop can be closed while we follow links,
++		      # but so what?
++		      potlib="$potent_lib"
++		      while test -h "$potlib" 2>/dev/null; do
++			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
++			case $potliblink in
++			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
++			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
++			esac
++		      done
++		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
++			 | ${SED} 10q \
++			 | egrep "$file_magic_regex" > /dev/null; then
++			newdeplibs="$newdeplibs $a_deplib"
++			a_deplib=""
++			break 2
++		      fi
++		    done
++	      done
++	      if test -n "$a_deplib" ; then
++		droppeddeps=yes
++		echo
++		echo "*** Warning: linker path does not have real file for library $a_deplib."
++		echo "*** I have the capability to make that library automatically link in when"
++		echo "*** you link to this library.  But I can only do this if you have a"
++		echo "*** shared version of the library, which you do not appear to have"
++		echo "*** because I did check the linker path looking for a file starting"
++		if test -z "$potlib" ; then
++		  echo "*** with $libname but no candidates were found. (...for file magic test)"
++		else
++		  echo "*** with $libname and none of the candidates passed a file format test"
++		  echo "*** using a file magic. Last file checked: $potlib"
++		fi
++	      fi
++	    else
++	      # Add a -L argument.
++	      newdeplibs="$newdeplibs $a_deplib"
++	    fi
++	  done # Gone through all deplibs.
++	  ;;
++	match_pattern*)
++	  set dummy $deplibs_check_method
++	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
++	  for a_deplib in $deplibs; do
++	    name="`expr $a_deplib : '-l\(.*\)'`"
++	    # If $name is empty we are operating on a -L argument.
++	    if test -n "$name" && test "$name" != "0"; then
++	      libname=`eval \\$echo \"$libname_spec\"`
++	      for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
++		potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
++		for potent_lib in $potential_libs; do
++		  potlib="$potent_lib" # see symlink-check below in file_magic test
++		  if eval echo \"$potent_lib\" 2>/dev/null \
++		      | ${SED} 10q \
++		      | egrep "$match_pattern_regex" > /dev/null; then
++		    newdeplibs="$newdeplibs $a_deplib"
++		    a_deplib=""
++		    break 2
++		  fi
++		done
++	      done
++	      if test -n "$a_deplib" ; then
++		droppeddeps=yes
++		echo
++		echo "*** Warning: linker path does not have real file for library $a_deplib."
++		echo "*** I have the capability to make that library automatically link in when"
++		echo "*** you link to this library.  But I can only do this if you have a"
++		echo "*** shared version of the library, which you do not appear to have"
++		echo "*** because I did check the linker path looking for a file starting"
++		if test -z "$potlib" ; then
++		  echo "*** with $libname but no candidates were found. (...for regex pattern test)"
++		else
++		  echo "*** with $libname and none of the candidates passed a file format test"
++		  echo "*** using a regex pattern. Last file checked: $potlib"
++		fi
++	      fi
++	    else
++	      # Add a -L argument.
++	      newdeplibs="$newdeplibs $a_deplib"
++	    fi
++	  done # Gone through all deplibs.
++	  ;;
++	none | unknown | *)
++	  newdeplibs=""
++	  if $echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
++	       -e 's/ -[LR][^ ]*//g' -e 's/[ 	]//g' |
++	     grep . >/dev/null; then
++	    echo
++	    if test "X$deplibs_check_method" = "Xnone"; then
++	      echo "*** Warning: inter-library dependencies are not supported in this platform."
++	    else
++	      echo "*** Warning: inter-library dependencies are not known to be supported."
++	    fi
++	    echo "*** All declared inter-library dependencies are being dropped."
++	    droppeddeps=yes
++	  fi
++	  ;;
++	esac
++	versuffix=$versuffix_save
++	major=$major_save
++	release=$release_save
++	libname=$libname_save
++	name=$name_save
++
++	case $host in
++	*-*-rhapsody* | *-*-darwin1.[012])
++	  # On Rhapsody replace the C library is the System framework
++	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
++	  ;;
++	esac
++
++	if test "$droppeddeps" = yes; then
++	  if test "$module" = yes; then
++	    echo
++	    echo "*** Warning: libtool could not satisfy all declared inter-library"
++	    echo "*** dependencies of module $libname.  Therefore, libtool will create"
++	    echo "*** a static module, that should work as long as the dlopening"
++	    echo "*** application is linked with the -dlopen flag."
++	    if test -z "$global_symbol_pipe"; then
++	      echo
++	      echo "*** However, this would only work if libtool was able to extract symbol"
++	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
++	      echo "*** not find such a program.  So, this module is probably useless."
++	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
++	    fi
++	    if test "$build_old_libs" = no; then
++	      oldlibs="$output_objdir/$libname.$libext"
++	      build_libtool_libs=module
++	      build_old_libs=yes
++	    else
++	      build_libtool_libs=no
++	    fi
++	  else
++	    echo "*** The inter-library dependencies that have been dropped here will be"
++	    echo "*** automatically added whenever a program is linked with this library"
++	    echo "*** or is declared to -dlopen it."
++
++	    if test $allow_undefined = no; then
++	      echo
++	      echo "*** Since this library must not contain undefined symbols,"
++	      echo "*** because either the platform does not support them or"
++	      echo "*** it was explicitly requested with -no-undefined,"
++	      echo "*** libtool will only create a static version of it."
++	      if test "$build_old_libs" = no; then
++		oldlibs="$output_objdir/$libname.$libext"
++		build_libtool_libs=module
++		build_old_libs=yes
++	      else
++		build_libtool_libs=no
++	      fi
++	    fi
++	  fi
++	fi
++	# Done checking deplibs!
++	deplibs=$newdeplibs
++      fi
++
++      # All the library-specific variables (install_libdir is set above).
++      library_names=
++      old_library=
++      dlname=
++
++      # Test again, we may have decided not to build it any more
++      if test "$build_libtool_libs" = yes; then
++	if test $hardcode_into_libs = yes; then
++	  # Hardcode the library paths
++	  hardcode_libdirs=
++	  dep_rpath=
++	  rpath="$finalize_rpath"
++	  test "$mode" != relink && rpath="$compile_rpath$rpath"
++	  for libdir in $rpath; do
++	    if test -n "$hardcode_libdir_flag_spec"; then
++	      if test -n "$hardcode_libdir_separator"; then
++		if test -z "$hardcode_libdirs"; then
++		  hardcode_libdirs="$libdir"
++		else
++		  # Just accumulate the unique libdirs.
++		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
++		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
++		    ;;
++		  *)
++		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
++		    ;;
++		  esac
++		fi
++	      else
++		eval flag=\"$hardcode_libdir_flag_spec\"
++		dep_rpath="$dep_rpath $flag"
++	      fi
++	    elif test -n "$runpath_var"; then
++	      case "$perm_rpath " in
++	      *" $libdir "*) ;;
++	      *) perm_rpath="$perm_rpath $libdir" ;;
++	      esac
++	    fi
++	  done
++	  # Substitute the hardcoded libdirs into the rpath.
++	  if test -n "$hardcode_libdir_separator" &&
++	     test -n "$hardcode_libdirs"; then
++	    libdir="$hardcode_libdirs"
++	    eval dep_rpath=\"$hardcode_libdir_flag_spec\"
++	  fi
++	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
++	    # We should set the runpath_var.
++	    rpath=
++	    for dir in $perm_rpath; do
++	      rpath="$rpath$dir:"
++	    done
++	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
++	  fi
++	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
++	fi
++
++	shlibpath="$finalize_shlibpath"
++	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
++	if test -n "$shlibpath"; then
++	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
++	fi
++
++	# Get the real and link names of the library.
++	eval library_names=\"$library_names_spec\"
++	set dummy $library_names
++	realname="$2"
++	shift; shift
++
++	if test -n "$soname_spec"; then
++	  eval soname=\"$soname_spec\"
++	else
++	  soname="$realname"
++	fi
++	test -z "$dlname" && dlname=$soname
++
++	lib="$output_objdir/$realname"
++	for link
++	do
++	  linknames="$linknames $link"
++	done
++
++	# Ensure that we have .o objects for linkers which dislike .lo
++	# (e.g. aix) in case we are running --disable-static
++	for obj in $libobjs; do
++	  xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
++	  if test "X$xdir" = "X$obj"; then
++	    xdir="."
++	  else
++	    xdir="$xdir"
++	  fi
++	  baseobj=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
++	  oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
++	  if test ! -f $xdir/$oldobj; then
++	    $show "(cd $xdir && ${LN_S} $baseobj $oldobj)"
++	    $run eval '(cd $xdir && ${LN_S} $baseobj $oldobj)' || exit $?
++	  fi
++	done
++
++	# Use standard objects if they are pic
++	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
++
++	# Prepare the list of exported symbols
++	if test -z "$export_symbols"; then
++	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
++	    $show "generating symbol list for \`$libname.la'"
++	    export_symbols="$output_objdir/$libname.exp"
++	    $run $rm $export_symbols
++	    eval cmds=\"$export_symbols_cmds\"
++	    save_ifs="$IFS"; IFS='~'
++	    for cmd in $cmds; do
++	      IFS="$save_ifs"
++	      $show "$cmd"
++	      $run eval "$cmd" || exit $?
++	    done
++	    IFS="$save_ifs"
++	    if test -n "$export_symbols_regex"; then
++	      $show "egrep -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
++	      $run eval 'egrep -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
++	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
++	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
++	    fi
++	  fi
++	fi
++
++	if test -n "$export_symbols" && test -n "$include_expsyms"; then
++	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
++	fi
++
++	if test -n "$convenience"; then
++	  if test -n "$whole_archive_flag_spec"; then
++	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
++	  else
++	    gentop="$output_objdir/${outputname}x"
++	    $show "${rm}r $gentop"
++	    $run ${rm}r "$gentop"
++	    $show "mkdir $gentop"
++	    $run mkdir "$gentop"
++	    status=$?
++	    if test $status -ne 0 && test ! -d "$gentop"; then
++	      exit $status
++	    fi
++	    generated="$generated $gentop"
++
++	    for xlib in $convenience; do
++	      # Extract the objects.
++	      case $xlib in
++	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
++	      *) xabs=`pwd`"/$xlib" ;;
++	      esac
++	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
++	      xdir="$gentop/$xlib"
++
++	      $show "${rm}r $xdir"
++	      $run ${rm}r "$xdir"
++	      $show "mkdir $xdir"
++	      $run mkdir "$xdir"
++	      status=$?
++	      if test $status -ne 0 && test ! -d "$xdir"; then
++		exit $status
++	      fi
++	      $show "(cd $xdir && $AR x $xabs)"
++	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
++
++	      libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
++	    done
++	  fi
++	fi
++
++	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
++	  eval flag=\"$thread_safe_flag_spec\"
++	  linker_flags="$linker_flags $flag"
++	fi
++
++	# Make a backup of the uninstalled library when relinking
++	if test "$mode" = relink; then
++	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
++	fi
++
++	# Do each of the archive commands.
++	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
++	  eval cmds=\"$archive_expsym_cmds\"
++	else
++	  save_deplibs="$deplibs"
++	  for conv in $convenience; do
++	    tmp_deplibs=
++	    for test_deplib in $deplibs; do
++	      if test "$test_deplib" != "$conv"; then
++		tmp_deplibs="$tmp_deplibs $test_deplib"
++	      fi
++	    done
++	    deplibs="$tmp_deplibs"
++	  done
++	  eval cmds=\"$archive_cmds\"
++	  deplibs="$save_deplibs"
++	fi
++	save_ifs="$IFS"; IFS='~'
++	for cmd in $cmds; do
++	  IFS="$save_ifs"
++	  $show "$cmd"
++	  $run eval "$cmd" || exit $?
++	done
++	IFS="$save_ifs"
++
++	# Restore the uninstalled library and exit
++	if test "$mode" = relink; then
++	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
++	  exit 0
++	fi
++
++	# Create links to the real library.
++	for linkname in $linknames; do
++	  if test "$realname" != "$linkname"; then
++	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
++	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
++	  fi
++	done
++
++	# If -module or -export-dynamic was specified, set the dlname.
++	if test "$module" = yes || test "$export_dynamic" = yes; then
++	  # On all known operating systems, these are identical.
++	  dlname="$soname"
++	fi
++      fi
++      ;;
++
++    obj)
++      if test -n "$deplibs"; then
++	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
++      fi
++
++      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
++	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
++      fi
++
++      if test -n "$rpath"; then
++	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
++      fi
++
++      if test -n "$xrpath"; then
++	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
++      fi
++
++      if test -n "$vinfo"; then
++	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
++      fi
++
++      if test -n "$release"; then
++	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
++      fi
++
++      case $output in
++      *.lo)
++	if test -n "$objs$old_deplibs"; then
++	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
++	  exit 1
++	fi
++	libobj="$output"
++	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
++	;;
++      *)
++	libobj=
++	obj="$output"
++	;;
++      esac
++
++      # Delete the old objects.
++      $run $rm $obj $libobj
++
++      # Objects from convenience libraries.  This assumes
++      # single-version convenience libraries.  Whenever we create
++      # different ones for PIC/non-PIC, this we'll have to duplicate
++      # the extraction.
++      reload_conv_objs=
++      gentop=
++      # reload_cmds runs $LD directly, so let us get rid of
++      # -Wl from whole_archive_flag_spec
++      wl=
++
++      if test -n "$convenience"; then
++	if test -n "$whole_archive_flag_spec"; then
++	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
++	else
++	  gentop="$output_objdir/${obj}x"
++	  $show "${rm}r $gentop"
++	  $run ${rm}r "$gentop"
++	  $show "mkdir $gentop"
++	  $run mkdir "$gentop"
++	  status=$?
++	  if test $status -ne 0 && test ! -d "$gentop"; then
++	    exit $status
++	  fi
++	  generated="$generated $gentop"
++
++	  for xlib in $convenience; do
++	    # Extract the objects.
++	    case $xlib in
++	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
++	    *) xabs=`pwd`"/$xlib" ;;
++	    esac
++	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
++	    xdir="$gentop/$xlib"
++
++	    $show "${rm}r $xdir"
++	    $run ${rm}r "$xdir"
++	    $show "mkdir $xdir"
++	    $run mkdir "$xdir"
++	    status=$?
++	    if test $status -ne 0 && test ! -d "$xdir"; then
++	      exit $status
++	    fi
++	    $show "(cd $xdir && $AR x $xabs)"
++	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
++
++	    reload_conv_objs="$reload_objs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
++	  done
++	fi
++      fi
++
++      # Create the old-style object.
++      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
++
++      output="$obj"
++      eval cmds=\"$reload_cmds\"
++      save_ifs="$IFS"; IFS='~'
++      for cmd in $cmds; do
++	IFS="$save_ifs"
++	$show "$cmd"
++	$run eval "$cmd" || exit $?
++      done
++      IFS="$save_ifs"
++
++      # Exit if we aren't doing a library object file.
++      if test -z "$libobj"; then
++	if test -n "$gentop"; then
++	  $show "${rm}r $gentop"
++	  $run ${rm}r $gentop
++	fi
++
++	exit 0
++      fi
++
++      if test "$build_libtool_libs" != yes; then
++	if test -n "$gentop"; then
++	  $show "${rm}r $gentop"
++	  $run ${rm}r $gentop
++	fi
++
++	# Create an invalid libtool object if no PIC, so that we don't
++	# accidentally link it into a program.
++	$show "echo timestamp > $libobj"
++	$run eval "echo timestamp > $libobj" || exit $?
++	exit 0
++      fi
++
++      if test -n "$pic_flag" || test "$pic_mode" != default; then
++	# Only do commands if we really have different PIC objects.
++	reload_objs="$libobjs $reload_conv_objs"
++	output="$libobj"
++	eval cmds=\"$reload_cmds\"
++	save_ifs="$IFS"; IFS='~'
++	for cmd in $cmds; do
++	  IFS="$save_ifs"
++	  $show "$cmd"
++	  $run eval "$cmd" || exit $?
++	done
++	IFS="$save_ifs"
++      else
++	# Just create a symlink.
++	$show $rm $libobj
++	$run $rm $libobj
++	xdir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
++	if test "X$xdir" = "X$libobj"; then
++	  xdir="."
++	else
++	  xdir="$xdir"
++	fi
++	baseobj=`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
++	oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
++	$show "(cd $xdir && $LN_S $oldobj $baseobj)"
++	$run eval '(cd $xdir && $LN_S $oldobj $baseobj)' || exit $?
++      fi
++
++      if test -n "$gentop"; then
++	$show "${rm}r $gentop"
++	$run ${rm}r $gentop
++      fi
++
++      exit 0
++      ;;
++
++    prog)
++      case $host in
++	*cygwin*) output=`echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
++      esac
++      if test -n "$vinfo"; then
++	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
++      fi
++
++      if test -n "$release"; then
++	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
++      fi
++
++      if test "$preload" = yes; then
++	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
++	   test "$dlopen_self_static" = unknown; then
++	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
++	fi
++      fi
++
++      case $host in
++      *-*-rhapsody* | *-*-darwin1.[012])
++	# On Rhapsody replace the C library is the System framework
++	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
++	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
++	case $host in
++	*darwin*)
++	  # Don't allow lazy linking, it breaks C++ global constructors
++	  compile_command="$compile_command ${wl}-bind_at_load"
++	  finalize_command="$finalize_command ${wl}-bind_at_load"
++	  ;;
++	esac
++	;;
++      esac
++
++      compile_command="$compile_command $compile_deplibs"
++      finalize_command="$finalize_command $finalize_deplibs"
++
++      if test -n "$rpath$xrpath"; then
++	# If the user specified any rpath flags, then add them.
++	for libdir in $rpath $xrpath; do
++	  # This is the magic to use -rpath.
++	  case "$finalize_rpath " in
++	  *" $libdir "*) ;;
++	  *) finalize_rpath="$finalize_rpath $libdir" ;;
++	  esac
++	done
++      fi
++
++      # Now hardcode the library paths
++      rpath=
++      hardcode_libdirs=
++      for libdir in $compile_rpath $finalize_rpath; do
++	if test -n "$hardcode_libdir_flag_spec"; then
++	  if test -n "$hardcode_libdir_separator"; then
++	    if test -z "$hardcode_libdirs"; then
++	      hardcode_libdirs="$libdir"
++	    else
++	      # Just accumulate the unique libdirs.
++	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
++	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
++		;;
++	      *)
++		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
++		;;
++	      esac
++	    fi
++	  else
++	    eval flag=\"$hardcode_libdir_flag_spec\"
++	    rpath="$rpath $flag"
++	  fi
++	elif test -n "$runpath_var"; then
++	  case "$perm_rpath " in
++	  *" $libdir "*) ;;
++	  *) perm_rpath="$perm_rpath $libdir" ;;
++	  esac
++	fi
++	case $host in
++	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++	  case :$dllsearchpath: in
++	  *":$libdir:"*) ;;
++	  *) dllsearchpath="$dllsearchpath:$libdir";;
++	  esac
++	  ;;
++	esac
++      done
++      # Substitute the hardcoded libdirs into the rpath.
++      if test -n "$hardcode_libdir_separator" &&
++	 test -n "$hardcode_libdirs"; then
++	libdir="$hardcode_libdirs"
++	eval rpath=\" $hardcode_libdir_flag_spec\"
++      fi
++      compile_rpath="$rpath"
++
++      rpath=
++      hardcode_libdirs=
++      for libdir in $finalize_rpath; do
++	if test -n "$hardcode_libdir_flag_spec"; then
++	  if test -n "$hardcode_libdir_separator"; then
++	    if test -z "$hardcode_libdirs"; then
++	      hardcode_libdirs="$libdir"
++	    else
++	      # Just accumulate the unique libdirs.
++	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
++	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
++		;;
++	      *)
++		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
++		;;
++	      esac
++	    fi
++	  else
++	    eval flag=\"$hardcode_libdir_flag_spec\"
++	    rpath="$rpath $flag"
++	  fi
++	elif test -n "$runpath_var"; then
++	  case "$finalize_perm_rpath " in
++	  *" $libdir "*) ;;
++	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
++	  esac
++	fi
++      done
++      # Substitute the hardcoded libdirs into the rpath.
++      if test -n "$hardcode_libdir_separator" &&
++	 test -n "$hardcode_libdirs"; then
++	libdir="$hardcode_libdirs"
++	eval rpath=\" $hardcode_libdir_flag_spec\"
++      fi
++      finalize_rpath="$rpath"
++
++      if test -n "$libobjs" && test "$build_old_libs" = yes; then
++	# Transform all the library objects into standard objects.
++	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
++	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
++      fi
++
++      dlsyms=
++      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
++	if test -n "$NM" && test -n "$global_symbol_pipe"; then
++	  dlsyms="${outputname}S.c"
++	else
++	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
++	fi
++      fi
++
++      if test -n "$dlsyms"; then
++	case $dlsyms in
++	"") ;;
++	*.c)
++	  # Discover the nlist of each of the dlfiles.
++	  nlist="$output_objdir/${outputname}.nm"
++
++	  $show "$rm $nlist ${nlist}S ${nlist}T"
++	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
++
++	  # Parse the name list into a source file.
++	  $show "creating $output_objdir/$dlsyms"
++
++	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
++/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
++/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
++
++#ifdef __cplusplus
++extern \"C\" {
++#endif
++
++/* Prevent the only kind of declaration conflicts we can make. */
++#define lt_preloaded_symbols some_other_symbol
++
++/* External symbol declarations for the compiler. */\
++"
++
++	  if test "$dlself" = yes; then
++	    $show "generating symbol list for \`$output'"
++
++	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
++
++	    # Add our own program objects to the symbol list.
++	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
++	    for arg in $progfiles; do
++	      $show "extracting global C symbols from \`$arg'"
++	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
++	    done
++
++	    if test -n "$exclude_expsyms"; then
++	      $run eval 'egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
++	      $run eval '$mv "$nlist"T "$nlist"'
++	    fi
++
++	    if test -n "$export_symbols_regex"; then
++	      $run eval 'egrep -e "$export_symbols_regex" "$nlist" > "$nlist"T'
++	      $run eval '$mv "$nlist"T "$nlist"'
++	    fi
++
++	    # Prepare the list of exported symbols
++	    if test -z "$export_symbols"; then
++	      export_symbols="$output_objdir/$output.exp"
++	      $run $rm $export_symbols
++	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
++	    else
++	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
++	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
++	      $run eval 'mv "$nlist"T "$nlist"'
++	    fi
++	  fi
++
++	  for arg in $dlprefiles; do
++	    $show "extracting global C symbols from \`$arg'"
++	    name=`echo "$arg" | ${SED} -e 's%^.*/%%'`
++	    $run eval 'echo ": $name " >> "$nlist"'
++	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
++	  done
++
++	  if test -z "$run"; then
++	    # Make sure we have at least an empty file.
++	    test -f "$nlist" || : > "$nlist"
++
++	    if test -n "$exclude_expsyms"; then
++	      egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
++	      $mv "$nlist"T "$nlist"
++	    fi
++
++	    # Try sorting and uniquifying the output.
++	    if grep -v "^: " < "$nlist" |
++		if sort -k 3 </dev/null >/dev/null 2>&1; then
++		  sort -k 3
++		else
++		  sort +2
++		fi |
++		uniq > "$nlist"S; then
++	      :
++	    else
++	      grep -v "^: " < "$nlist" > "$nlist"S
++	    fi
++
++	    if test -f "$nlist"S; then
++	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
++	    else
++	      echo '/* NONE */' >> "$output_objdir/$dlsyms"
++	    fi
++
++	    $echo >> "$output_objdir/$dlsyms" "\
++
++#undef lt_preloaded_symbols
++
++#if defined (__STDC__) && __STDC__
++# define lt_ptr void *
++#else
++# define lt_ptr char *
++# define const
++#endif
++
++/* The mapping between symbol names and symbols. */
++const struct {
++  const char *name;
++  lt_ptr address;
++}
++lt_preloaded_symbols[] =
++{\
++"
++
++	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
++
++	    $echo >> "$output_objdir/$dlsyms" "\
++  {0, (lt_ptr) 0}
++};
++
++/* This works around a problem in FreeBSD linker */
++#ifdef FREEBSD_WORKAROUND
++static const void *lt_preloaded_setup() {
++  return lt_preloaded_symbols;
++}
++#endif
++
++#ifdef __cplusplus
++}
++#endif\
++"
++	  fi
++
++	  pic_flag_for_symtable=
++	  case $host in
++	  # compiling the symbol table file with pic_flag works around
++	  # a FreeBSD bug that causes programs to crash when -lm is
++	  # linked before any other PIC object.  But we must not use
++	  # pic_flag when linking with -static.  The problem exists in
++	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
++	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
++	    case "$compile_command " in
++	    *" -static "*) ;;
++	    *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";;
++	    esac;;
++	  *-*-hpux*)
++	    case "$compile_command " in
++	    *" -static "*) ;;
++	    *) pic_flag_for_symtable=" $pic_flag -DPIC";;
++	    esac
++	  esac
++
++	  # Now compile the dynamic symbol file.
++	  $show "(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
++	  $run eval '(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
++
++	  # Clean up the generated files.
++	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
++	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
++
++	  # Transform the symbol file into the correct name.
++	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++	  ;;
++	*)
++	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
++	  exit 1
++	  ;;
++	esac
++      else
++	# We keep going just in case the user didn't refer to
++	# lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
++	# really was required.
++
++	# Nullify the symbol file.
++	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
++	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
++      fi
++
++      if test $need_relink = no || test "$build_libtool_libs" != yes; then
++	# Replace the output file specification.
++	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
++	link_command="$compile_command$compile_rpath"
++
++	# We have no uninstalled library dependencies, so finalize right now.
++	$show "$link_command"
++	$run eval "$link_command"
++	status=$?
++
++	# Delete the generated files.
++	if test -n "$dlsyms"; then
++	  $show "$rm $output_objdir/${outputname}S.${objext}"
++	  $run $rm "$output_objdir/${outputname}S.${objext}"
++	fi
++
++	exit $status
++      fi
++
++      if test -n "$shlibpath_var"; then
++	# We should set the shlibpath_var
++	rpath=
++	for dir in $temp_rpath; do
++	  case $dir in
++	  [\\/]* | [A-Za-z]:[\\/]*)
++	    # Absolute path.
++	    rpath="$rpath$dir:"
++	    ;;
++	  *)
++	    # Relative path: add a thisdir entry.
++	    rpath="$rpath\$thisdir/$dir:"
++	    ;;
++	  esac
++	done
++	temp_rpath="$rpath"
++      fi
++
++      if test -n "$compile_shlibpath$finalize_shlibpath"; then
++	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
++      fi
++      if test -n "$finalize_shlibpath"; then
++	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
++      fi
++
++      compile_var=
++      finalize_var=
++      if test -n "$runpath_var"; then
++	if test -n "$perm_rpath"; then
++	  # We should set the runpath_var.
++	  rpath=
++	  for dir in $perm_rpath; do
++	    rpath="$rpath$dir:"
++	  done
++	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
++	fi
++	if test -n "$finalize_perm_rpath"; then
++	  # We should set the runpath_var.
++	  rpath=
++	  for dir in $finalize_perm_rpath; do
++	    rpath="$rpath$dir:"
++	  done
++	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
++	fi
++      fi
++
++      if test "$no_install" = yes; then
++	# We don't need to create a wrapper script.
++	link_command="$compile_var$compile_command$compile_rpath"
++	# Replace the output file specification.
++	link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
++	# Delete the old output file.
++	$run $rm $output
++	# Link the executable and exit
++	$show "$link_command"
++	$run eval "$link_command" || exit $?
++	exit 0
++      fi
++
++      if test "$hardcode_action" = relink; then
++	# Fast installation is not supported
++	link_command="$compile_var$compile_command$compile_rpath"
++	relink_command="$finalize_var$finalize_command$finalize_rpath"
++
++	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
++	$echo "$modename: \`$output' will be relinked during installation" 1>&2
++      else
++	if test "$fast_install" != no; then
++	  link_command="$finalize_var$compile_command$finalize_rpath"
++	  if test "$fast_install" = yes; then
++	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
++	  else
++	    # fast_install is set to needless
++	    relink_command=
++	  fi
++	else
++	  link_command="$compile_var$compile_command$compile_rpath"
++	  relink_command="$finalize_var$finalize_command$finalize_rpath"
++	fi
++      fi
++
++      # Replace the output file specification.
++      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
++
++      # Delete the old output files.
++      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
++
++      $show "$link_command"
++      $run eval "$link_command" || exit $?
++
++      # Now create the wrapper script.
++      $show "creating $output"
++
++      # Quote the relink command for shipping.
++      if test -n "$relink_command"; then
++	# Preserve any variables that may affect compiler behavior
++	for var in $variables_saved_for_relink; do
++	  if eval test -z \"\${$var+set}\"; then
++	    relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
++	  elif eval var_value=\$$var; test -z "$var_value"; then
++	    relink_command="$var=; export $var; $relink_command"
++	  else
++	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
++	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
++	  fi
++	done
++	relink_command="(cd `pwd`; $relink_command)"
++	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++      fi
++
++      # Quote $echo for shipping.
++      if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
++	case $0 in
++	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
++	*) qecho="$SHELL `pwd`/$0 --fallback-echo";;
++	esac
++	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
++      else
++	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
++      fi
++
++      # Only actually do things if our run command is non-null.
++      if test -z "$run"; then
++	# win32 will think the script is a binary if it has
++	# a .exe suffix, so we strip it off here.
++	case $output in
++	  *.exe) output=`echo $output|${SED} 's,.exe$,,'` ;;
++	esac
++	# test for cygwin because mv fails w/o .exe extensions
++	case $host in
++	  *cygwin*) exeext=.exe ;;
++	  *) exeext= ;;
++	esac
++	$rm $output
++	trap "$rm $output; exit 1" 1 2 15
++
++	$echo > $output "\
++#! $SHELL
++
++# $output - temporary wrapper script for $objdir/$outputname
++# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
++#
++# The $output program cannot be directly executed until all the libtool
++# libraries that it depends on are installed.
++#
++# This wrapper script should never be moved out of the build directory.
++# If it is, it will not operate correctly.
++
++# Sed substitution that helps us do robust quoting.  It backslashifies
++# metacharacters that are still active within double-quoted strings.
++Xsed="${SED}"' -e 1s/^X//'
++sed_quote_subst='$sed_quote_subst'
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
++
++relink_command=\"$relink_command\"
++
++# This environment variable determines our operation mode.
++if test \"\$libtool_install_magic\" = \"$magic\"; then
++  # install mode needs the following variable:
++  notinst_deplibs='$notinst_deplibs'
++else
++  # When we are sourced in execute mode, \$file and \$echo are already set.
++  if test \"\$libtool_execute_magic\" != \"$magic\"; then
++    echo=\"$qecho\"
++    file=\"\$0\"
++    # Make sure echo works.
++    if test \"X\$1\" = X--no-reexec; then
++      # Discard the --no-reexec flag, and continue.
++      shift
++    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
++      # Yippee, \$echo works!
++      :
++    else
++      # Restart under the correct shell, and then maybe \$echo will work.
++      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
++    fi
++  fi\
++"
++	$echo >> $output "\
++
++  # Find the directory that this script lives in.
++  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
++  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
++
++  # Follow symbolic links until we get to the real thisdir.
++  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
++  while test -n \"\$file\"; do
++    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
++
++    # If there was a directory component, then change thisdir.
++    if test \"x\$destdir\" != \"x\$file\"; then
++      case \"\$destdir\" in
++      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
++      *) thisdir=\"\$thisdir/\$destdir\" ;;
++      esac
++    fi
++
++    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
++    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
++  done
++
++  # Try to get the absolute directory name.
++  absdir=\`cd \"\$thisdir\" && pwd\`
++  test -n \"\$absdir\" && thisdir=\"\$absdir\"
++"
++
++	if test "$fast_install" = yes; then
++	  echo >> $output "\
++  program=lt-'$outputname'$exeext
++  progdir=\"\$thisdir/$objdir\"
++
++  if test ! -f \"\$progdir/\$program\" || \\
++     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
++       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
++
++    file=\"\$\$-\$program\"
++
++    if test ! -d \"\$progdir\"; then
++      $mkdir \"\$progdir\"
++    else
++      $rm \"\$progdir/\$file\"
++    fi"
++
++	  echo >> $output "\
++
++    # relink executable if necessary
++    if test -n \"\$relink_command\"; then
++      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
++      else
++	$echo \"\$relink_command_output\" >&2
++	$rm \"\$progdir/\$file\"
++	exit 1
++      fi
++    fi
++
++    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
++    { $rm \"\$progdir/\$program\";
++      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
++    $rm \"\$progdir/\$file\"
++  fi"
++	else
++	  echo >> $output "\
++  program='$outputname'
++  progdir=\"\$thisdir/$objdir\"
++"
++	fi
++
++	echo >> $output "\
++
++  if test -f \"\$progdir/\$program\"; then"
++
++	# Export our shlibpath_var if we have one.
++	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
++	  $echo >> $output "\
++    # Add our own library path to $shlibpath_var
++    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
++
++    # Some systems cannot cope with colon-terminated $shlibpath_var
++    # The second colon is a workaround for a bug in BeOS R4 ${SED}
++    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
++
++    export $shlibpath_var
++"
++	fi
++
++	# fixup the dll searchpath if we need to.
++	if test -n "$dllsearchpath"; then
++	  $echo >> $output "\
++    # Add the dll search path components to the executable PATH
++    PATH=$dllsearchpath:\$PATH
++"
++	fi
++
++	$echo >> $output "\
++    if test \"\$libtool_execute_magic\" != \"$magic\"; then
++      # Run the actual program with our arguments.
++"
++	case $host in
++	# win32 systems need to use the prog path for dll
++	# lookup to work
++	*-*-cygwin* | *-*-pw32*)
++	  $echo >> $output "\
++      exec \$progdir/\$program \${1+\"\$@\"}
++"
++	  ;;
++
++	# Backslashes separate directories on plain windows
++	*-*-mingw | *-*-os2*)
++	  $echo >> $output "\
++      exec \$progdir\\\\\$program \${1+\"\$@\"}
++"
++	  ;;
++
++	*)
++	  $echo >> $output "\
++      # Export the path to the program.
++      PATH=\"\$progdir:\$PATH\"
++      export PATH
++
++      exec \$program \${1+\"\$@\"}
++"
++	  ;;
++	esac
++	$echo >> $output "\
++      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
++      exit 1
++    fi
++  else
++    # The program doesn't exist.
++    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
++    \$echo \"This script is just a wrapper for \$program.\" 1>&2
++    echo \"See the $PACKAGE documentation for more information.\" 1>&2
++    exit 1
++  fi
++fi\
++"
++	chmod +x $output
++      fi
++      exit 0
++      ;;
++    esac
++
++    # See if we need to build an old-fashioned archive.
++    for oldlib in $oldlibs; do
++
++      if test "$build_libtool_libs" = convenience; then
++	oldobjs="$libobjs_save"
++	addlibs="$convenience"
++	build_libtool_libs=no
++      else
++	if test "$build_libtool_libs" = module; then
++	  oldobjs="$libobjs_save"
++	  build_libtool_libs=no
++	else
++	  oldobjs="$objs$old_deplibs "`$echo "X$libobjs_save" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`
++	fi
++	addlibs="$old_convenience"
++      fi
++
++      if test -n "$addlibs"; then
++	gentop="$output_objdir/${outputname}x"
++	$show "${rm}r $gentop"
++	$run ${rm}r "$gentop"
++	$show "mkdir $gentop"
++	$run mkdir "$gentop"
++	status=$?
++	if test $status -ne 0 && test ! -d "$gentop"; then
++	  exit $status
++	fi
++	generated="$generated $gentop"
++
++	# Add in members from convenience archives.
++	for xlib in $addlibs; do
++	  # Extract the objects.
++	  case $xlib in
++	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
++	  *) xabs=`pwd`"/$xlib" ;;
++	  esac
++	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
++	  xdir="$gentop/$xlib"
++
++	  $show "${rm}r $xdir"
++	  $run ${rm}r "$xdir"
++	  $show "mkdir $xdir"
++	  $run mkdir "$xdir"
++	  status=$?
++	  if test $status -ne 0 && test ! -d "$xdir"; then
++	    exit $status
++	  fi
++	  $show "(cd $xdir && $AR x $xabs)"
++	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
++
++	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
++	done
++      fi
++
++      # Do each command in the archive commands.
++      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
++	eval cmds=\"$old_archive_from_new_cmds\"
++      else
++	# Ensure that we have .o objects in place in case we decided
++	# not to build a shared library, and have fallen back to building
++	# static libs even though --disable-static was passed!
++	for oldobj in $oldobjs; do
++	  if test ! -f $oldobj; then
++	    xdir=`$echo "X$oldobj" | $Xsed -e 's%/[^/]*$%%'`
++	    if test "X$xdir" = "X$oldobj"; then
++	      xdir="."
++	    else
++	      xdir="$xdir"
++	    fi
++	    baseobj=`$echo "X$oldobj" | $Xsed -e 's%^.*/%%'`
++	    obj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
++	    $show "(cd $xdir && ${LN_S} $obj $baseobj)"
++	    $run eval '(cd $xdir && ${LN_S} $obj $baseobj)' || exit $?
++	  fi
++	done
++
++	eval cmds=\"$old_archive_cmds\"
++      fi
++      save_ifs="$IFS"; IFS='~'
++      for cmd in $cmds; do
++	IFS="$save_ifs"
++	$show "$cmd"
++	$run eval "$cmd" || exit $?
++      done
++      IFS="$save_ifs"
++    done
++
++    if test -n "$generated"; then
++      $show "${rm}r$generated"
++      $run ${rm}r$generated
++    fi
++
++    # Now create the libtool archive.
++    case $output in
++    *.la)
++      old_library=
++      test "$build_old_libs" = yes && old_library="$libname.$libext"
++      $show "creating $output"
++
++      # Preserve any variables that may affect compiler behavior
++      for var in $variables_saved_for_relink; do
++	if eval test -z \"\${$var+set}\"; then
++	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
++	elif eval var_value=\$$var; test -z "$var_value"; then
++	  relink_command="$var=; export $var; $relink_command"
++	else
++	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
++	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
++	fi
++      done
++      # Quote the link command for shipping.
++      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
++      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++
++      # Only create the output if not a dry run.
++      if test -z "$run"; then
++	for installed in no yes; do
++	  if test "$installed" = yes; then
++	    if test -z "$install_libdir"; then
++	      break
++	    fi
++	    output="$output_objdir/$outputname"i
++	    # Replace all uninstalled libtool libraries with the installed ones
++	    newdependency_libs=
++	    for deplib in $dependency_libs; do
++	      case $deplib in
++	      *.la)
++		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
++		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
++		if test -z "$libdir"; then
++		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
++		  exit 1
++		fi
++		newdependency_libs="$newdependency_libs $libdir/$name"
++		;;
++	      *) newdependency_libs="$newdependency_libs $deplib" ;;
++	      esac
++	    done
++	    dependency_libs="$newdependency_libs"
++	    newdlfiles=
++	    for lib in $dlfiles; do
++	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
++	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
++	      if test -z "$libdir"; then
++		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
++		exit 1
++	      fi
++	      newdlfiles="$newdlfiles $libdir/$name"
++	    done
++	    dlfiles="$newdlfiles"
++	    newdlprefiles=
++	    for lib in $dlprefiles; do
++	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
++	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
++	      if test -z "$libdir"; then
++		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
++		exit 1
++	      fi
++	      newdlprefiles="$newdlprefiles $libdir/$name"
++	    done
++	    dlprefiles="$newdlprefiles"
++	  fi
++	  $rm $output
++	  # place dlname in correct position for cygwin
++	  tdlname=$dlname
++	  case $host,$output,$installed,$module,$dlname in
++	    *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
++	  esac
++	  $echo > $output "\
++# $outputname - a libtool library file
++# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
++#
++# Please DO NOT delete this file!
++# It is necessary for linking the library.
++
++# The name that we can dlopen(3).
++dlname='$tdlname'
++
++# Names of this library.
++library_names='$library_names'
++
++# The name of the static archive.
++old_library='$old_library'
++
++# Libraries that this one depends upon.
++dependency_libs='$dependency_libs'
++
++# Version information for $libname.
++current=$current
++age=$age
++revision=$revision
++
++# Is this an already installed library?
++installed=$installed
++
++# Files to dlopen/dlpreopen
++dlopen='$dlfiles'
++dlpreopen='$dlprefiles'
++
++# Directory that this library needs to be installed in:
++libdir='$install_libdir'"
++	  if test "$installed" = no && test $need_relink = yes; then
++	    $echo >> $output "\
++relink_command=\"$relink_command\""
++	  fi
++	done
++      fi
++
++      # Do a symbolic link so that the libtool archive can be found in
++      # LD_LIBRARY_PATH before the program is installed.
++      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
++      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
++      ;;
++    esac
++    exit 0
++    ;;
++
++  # libtool install mode
++  install)
++    modename="$modename: install"
++
++    # There may be an optional sh(1) argument at the beginning of
++    # install_prog (especially on Windows NT).
++    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
++       # Allow the use of GNU shtool's install command.
++       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
++      # Aesthetically quote it.
++      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
++      case $arg in
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
++	arg="\"$arg\""
++	;;
++      esac
++      install_prog="$arg "
++      arg="$1"
++      shift
++    else
++      install_prog=
++      arg="$nonopt"
++    fi
++
++    # The real first argument should be the name of the installation program.
++    # Aesthetically quote it.
++    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
++    case $arg in
++    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
++      arg="\"$arg\""
++      ;;
++    esac
++    install_prog="$install_prog$arg"
++
++    # We need to accept at least all the BSD install flags.
++    dest=
++    files=
++    opts=
++    prev=
++    install_type=
++    isdir=no
++    stripme=
++    for arg
++    do
++      if test -n "$dest"; then
++	files="$files $dest"
++	dest="$arg"
++	continue
++      fi
++
++      case $arg in
++      -d) isdir=yes ;;
++      -f) prev="-f" ;;
++      -g) prev="-g" ;;
++      -m) prev="-m" ;;
++      -o) prev="-o" ;;
++      -s)
++	stripme=" -s"
++	continue
++	;;
++      -*) ;;
++
++      *)
++	# If the previous option needed an argument, then skip it.
++	if test -n "$prev"; then
++	  prev=
++	else
++	  dest="$arg"
++	  continue
++	fi
++	;;
++      esac
++
++      # Aesthetically quote the argument.
++      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
++      case $arg in
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
++	arg="\"$arg\""
++	;;
++      esac
++      install_prog="$install_prog $arg"
++    done
++
++    if test -z "$install_prog"; then
++      $echo "$modename: you must specify an install program" 1>&2
++      $echo "$help" 1>&2
++      exit 1
++    fi
++
++    if test -n "$prev"; then
++      $echo "$modename: the \`$prev' option requires an argument" 1>&2
++      $echo "$help" 1>&2
++      exit 1
++    fi
++
++    if test -z "$files"; then
++      if test -z "$dest"; then
++	$echo "$modename: no file or destination specified" 1>&2
++      else
++	$echo "$modename: you must specify a destination" 1>&2
++      fi
++      $echo "$help" 1>&2
++      exit 1
++    fi
++
++    # Strip any trailing slash from the destination.
++    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
++
++    # Check to see that the destination is a directory.
++    test -d "$dest" && isdir=yes
++    if test "$isdir" = yes; then
++      destdir="$dest"
++      destname=
++    else
++      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
++      test "X$destdir" = "X$dest" && destdir=.
++      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
++
++      # Not a directory, so check to see that there is only one file specified.
++      set dummy $files
++      if test $# -gt 2; then
++	$echo "$modename: \`$dest' is not a directory" 1>&2
++	$echo "$help" 1>&2
++	exit 1
++      fi
++    fi
++    case $destdir in
++    [\\/]* | [A-Za-z]:[\\/]*) ;;
++    *)
++      for file in $files; do
++	case $file in
++	*.lo) ;;
++	*)
++	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
++	  $echo "$help" 1>&2
++	  exit 1
++	  ;;
++	esac
++      done
++      ;;
++    esac
++
++    # This variable tells wrapper scripts just to set variables rather
++    # than running their programs.
++    libtool_install_magic="$magic"
++
++    staticlibs=
++    future_libdirs=
++    current_libdirs=
++    for file in $files; do
++
++      # Do each installation.
++      case $file in
++      *.$libext)
++	# Do the static libraries later.
++	staticlibs="$staticlibs $file"
++	;;
++
++      *.la)
++	# Check to see that this really is a libtool archive.
++	if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
++	else
++	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
++	  $echo "$help" 1>&2
++	  exit 1
++	fi
++
++	library_names=
++	old_library=
++	relink_command=
++	# If there is no directory component, then add one.
++	case $file in
++	*/* | *\\*) . $file ;;
++	*) . ./$file ;;
++	esac
++
++	# Add the libdir to current_libdirs if it is the destination.
++	if test "X$destdir" = "X$libdir"; then
++	  case "$current_libdirs " in
++	  *" $libdir "*) ;;
++	  *) current_libdirs="$current_libdirs $libdir" ;;
++	  esac
++	else
++	  # Note the libdir as a future libdir.
++	  case "$future_libdirs " in
++	  *" $libdir "*) ;;
++	  *) future_libdirs="$future_libdirs $libdir" ;;
++	  esac
++	fi
++
++	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
++	test "X$dir" = "X$file/" && dir=
++	dir="$dir$objdir"
++
++	if test -n "$relink_command"; then
++          # Determine the prefix the user has applied to our future dir.
++          inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
++ 
++          # Don't allow the user to place us outside of our expected
++          # location b/c this prevents finding dependent libraries that
++          # are installed to the same prefix.
++          if test "$inst_prefix_dir" = "$destdir"; then
++            $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
++            exit 1
++          fi
++ 
++          if test -n "$inst_prefix_dir"; then
++            # Stick the inst_prefix_dir data into the link command.
++            relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
++          else
++            relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
++          fi
++
++	  $echo "$modename: warning: relinking \`$file'" 1>&2
++	  $show "$relink_command"
++	  if $run eval "$relink_command"; then :
++	  else
++	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
++	    exit 1
++	  fi
++	fi
++
++	# See the names of the shared library.
++	set dummy $library_names
++	if test -n "$2"; then
++	  realname="$2"
++	  shift
++	  shift
++
++	  srcname="$realname"
++	  test -n "$relink_command" && srcname="$realname"T
++
++	  # Install the shared library and build the symlinks.
++	  $show "$install_prog $dir/$srcname $destdir/$realname"
++	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
++	  if test -n "$stripme" && test -n "$striplib"; then
++	    $show "$striplib $destdir/$realname"
++	    $run eval "$striplib $destdir/$realname" || exit $?
++	  fi
++
++	  if test $# -gt 0; then
++	    # Delete the old symlinks, and create new ones.
++	    for linkname
++	    do
++	      if test "$linkname" != "$realname"; then
++		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
++		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
++	      fi
++	    done
++	  fi
++
++	  # Do each command in the postinstall commands.
++	  lib="$destdir/$realname"
++	  eval cmds=\"$postinstall_cmds\"
++	  save_ifs="$IFS"; IFS='~'
++	  for cmd in $cmds; do
++	    IFS="$save_ifs"
++	    $show "$cmd"
++	    $run eval "$cmd" || exit $?
++	  done
++	  IFS="$save_ifs"
++	fi
++
++	# Install the pseudo-library for information purposes.
++	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
++	instname="$dir/$name"i
++	$show "$install_prog $instname $destdir/$name"
++	$run eval "$install_prog $instname $destdir/$name" || exit $?
++
++	# Maybe install the static library, too.
++	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
++	;;
++
++      *.lo)
++	# Install (i.e. copy) a libtool object.
++
++	# Figure out destination file name, if it wasn't already specified.
++	if test -n "$destname"; then
++	  destfile="$destdir/$destname"
++	else
++	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
++	  destfile="$destdir/$destfile"
++	fi
++
++	# Deduce the name of the destination old-style object file.
++	case $destfile in
++	*.lo)
++	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
++	  ;;
++	*.$objext)
++	  staticdest="$destfile"
++	  destfile=
++	  ;;
++	*)
++	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
++	  $echo "$help" 1>&2
++	  exit 1
++	  ;;
++	esac
++
++	# Install the libtool object if requested.
++	if test -n "$destfile"; then
++	  $show "$install_prog $file $destfile"
++	  $run eval "$install_prog $file $destfile" || exit $?
++	fi
++
++	# Install the old object if enabled.
++	if test "$build_old_libs" = yes; then
++	  # Deduce the name of the old-style object file.
++	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
++
++	  $show "$install_prog $staticobj $staticdest"
++	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
++	fi
++	exit 0
++	;;
++
++      *)
++	# Figure out destination file name, if it wasn't already specified.
++	if test -n "$destname"; then
++	  destfile="$destdir/$destname"
++	else
++	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
++	  destfile="$destdir/$destfile"
++	fi
++
++	# Do a test to see if this is really a libtool program.
++	case $host in
++	*cygwin*|*mingw*)
++	    wrapper=`echo $file | ${SED} -e 's,.exe$,,'`
++	    ;;
++	*)
++	    wrapper=$file
++	    ;;
++	esac
++	if (${SED} -e '4q' $wrapper | egrep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
++	  notinst_deplibs=
++	  relink_command=
++
++	  # If there is no directory component, then add one.
++	  case $file in
++	  */* | *\\*) . $wrapper ;;
++	  *) . ./$wrapper ;;
++	  esac
++
++	  # Check the variables that should have been set.
++	  if test -z "$notinst_deplibs"; then
++	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
++	    exit 1
++	  fi
++
++	  finalize=yes
++	  for lib in $notinst_deplibs; do
++	    # Check to see that each library is installed.
++	    libdir=
++	    if test -f "$lib"; then
++	      # If there is no directory component, then add one.
++	      case $lib in
++	      */* | *\\*) . $lib ;;
++	      *) . ./$lib ;;
++	      esac
++	    fi
++	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
++	    if test -n "$libdir" && test ! -f "$libfile"; then
++	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
++	      finalize=no
++	    fi
++	  done
++
++	  relink_command=
++	  # If there is no directory component, then add one.
++	  case $file in
++	  */* | *\\*) . $wrapper ;;
++	  *) . ./$wrapper ;;
++	  esac
++
++	  outputname=
++	  if test "$fast_install" = no && test -n "$relink_command"; then
++	    if test "$finalize" = yes && test -z "$run"; then
++	      tmpdir="/tmp"
++	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
++	      tmpdir="$tmpdir/libtool-$$"
++	      if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
++	      else
++		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
++		continue
++	      fi
++	      file=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
++	      outputname="$tmpdir/$file"
++	      # Replace the output file specification.
++	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
++
++	      $show "$relink_command"
++	      if $run eval "$relink_command"; then :
++	      else
++		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
++		${rm}r "$tmpdir"
++		continue
++	      fi
++	      file="$outputname"
++	    else
++	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
++	    fi
++	  else
++	    # Install the binary that we compiled earlier.
++	    file=`$echo "X$file" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
++	  fi
++	fi
++
++	# remove .exe since cygwin /usr/bin/install will append another
++	# one anyways
++	case $install_prog,$host in
++	/usr/bin/install*,*cygwin*)
++	  case $file:$destfile in
++	  *.exe:*.exe)
++	    # this is ok
++	    ;;
++	  *.exe:*)
++	    destfile=$destfile.exe
++	    ;;
++	  *:*.exe)
++	    destfile=`echo $destfile | ${SED} -e 's,.exe$,,'`
++	    ;;
++	  esac
++	  ;;
++	esac
++	$show "$install_prog$stripme $file $destfile"
++	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
++	test -n "$outputname" && ${rm}r "$tmpdir"
++	;;
++      esac
++    done
++
++    for file in $staticlibs; do
++      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
++
++      # Set up the ranlib parameters.
++      oldlib="$destdir/$name"
++
++      $show "$install_prog $file $oldlib"
++      $run eval "$install_prog \$file \$oldlib" || exit $?
++
++      if test -n "$stripme" && test -n "$striplib"; then
++	$show "$old_striplib $oldlib"
++	$run eval "$old_striplib $oldlib" || exit $?
++      fi
++
++      # Do each command in the postinstall commands.
++      eval cmds=\"$old_postinstall_cmds\"
++      save_ifs="$IFS"; IFS='~'
++      for cmd in $cmds; do
++	IFS="$save_ifs"
++	$show "$cmd"
++	$run eval "$cmd" || exit $?
++      done
++      IFS="$save_ifs"
++    done
++
++    if test -n "$future_libdirs"; then
++      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
++    fi
++
++    if test -n "$current_libdirs"; then
++      # Maybe just do a dry run.
++      test -n "$run" && current_libdirs=" -n$current_libdirs"
++      exec_cmd='$SHELL $0 --finish$current_libdirs'
++    else
++      exit 0
++    fi
++    ;;
++
++  # libtool finish mode
++  finish)
++    modename="$modename: finish"
++    libdirs="$nonopt"
++    admincmds=
++
++    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
++      for dir
++      do
++	libdirs="$libdirs $dir"
++      done
++
++      for libdir in $libdirs; do
++	if test -n "$finish_cmds"; then
++	  # Do each command in the finish commands.
++	  eval cmds=\"$finish_cmds\"
++	  save_ifs="$IFS"; IFS='~'
++	  for cmd in $cmds; do
++	    IFS="$save_ifs"
++	    $show "$cmd"
++	    $run eval "$cmd" || admincmds="$admincmds
++       $cmd"
++	  done
++	  IFS="$save_ifs"
++	fi
++	if test -n "$finish_eval"; then
++	  # Do the single finish_eval.
++	  eval cmds=\"$finish_eval\"
++	  $run eval "$cmds" || admincmds="$admincmds
++       $cmds"
++	fi
++      done
++    fi
++
++    # Exit here if they wanted silent mode.
++    test "$show" = ":" && exit 0
++
++    echo "----------------------------------------------------------------------"
++    echo "Libraries have been installed in:"
++    for libdir in $libdirs; do
++      echo "   $libdir"
++    done
++    echo
++    echo "If you ever happen to want to link against installed libraries"
++    echo "in a given directory, LIBDIR, you must either use libtool, and"
++    echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
++    echo "flag during linking and do at least one of the following:"
++    if test -n "$shlibpath_var"; then
++      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
++      echo "     during execution"
++    fi
++    if test -n "$runpath_var"; then
++      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
++      echo "     during linking"
++    fi
++    if test -n "$hardcode_libdir_flag_spec"; then
++      libdir=LIBDIR
++      eval flag=\"$hardcode_libdir_flag_spec\"
++
++      echo "   - use the \`$flag' linker flag"
++    fi
++    if test -n "$admincmds"; then
++      echo "   - have your system administrator run these commands:$admincmds"
++    fi
++    if test -f /etc/ld.so.conf; then
++      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
++    fi
++    echo
++    echo "See any operating system documentation about shared libraries for"
++    echo "more information, such as the ld(1) and ld.so(8) manual pages."
++    echo "----------------------------------------------------------------------"
++    exit 0
++    ;;
++
++  # libtool execute mode
++  execute)
++    modename="$modename: execute"
++
++    # The first argument is the command name.
++    cmd="$nonopt"
++    if test -z "$cmd"; then
++      $echo "$modename: you must specify a COMMAND" 1>&2
++      $echo "$help"
++      exit 1
++    fi
++
++    # Handle -dlopen flags immediately.
++    for file in $execute_dlfiles; do
++      if test ! -f "$file"; then
++	$echo "$modename: \`$file' is not a file" 1>&2
++	$echo "$help" 1>&2
++	exit 1
++      fi
++
++      dir=
++      case $file in
++      *.la)
++	# Check to see that this really is a libtool archive.
++	if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
++	else
++	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
++	  $echo "$help" 1>&2
++	  exit 1
++	fi
++
++	# Read the libtool library.
++	dlname=
++	library_names=
++
++	# If there is no directory component, then add one.
++	case $file in
++	*/* | *\\*) . $file ;;
++	*) . ./$file ;;
++	esac
++
++	# Skip this library if it cannot be dlopened.
++	if test -z "$dlname"; then
++	  # Warn if it was a shared library.
++	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
++	  continue
++	fi
++
++	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
++	test "X$dir" = "X$file" && dir=.
++
++	if test -f "$dir/$objdir/$dlname"; then
++	  dir="$dir/$objdir"
++	else
++	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
++	  exit 1
++	fi
++	;;
++
++      *.lo)
++	# Just add the directory containing the .lo file.
++	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
++	test "X$dir" = "X$file" && dir=.
++	;;
++
++      *)
++	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
++	continue
++	;;
++      esac
++
++      # Get the absolute pathname.
++      absdir=`cd "$dir" && pwd`
++      test -n "$absdir" && dir="$absdir"
++
++      # Now add the directory to shlibpath_var.
++      if eval "test -z \"\$$shlibpath_var\""; then
++	eval "$shlibpath_var=\"\$dir\""
++      else
++	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
++      fi
++    done
++
++    # This variable tells wrapper scripts just to set shlibpath_var
++    # rather than running their programs.
++    libtool_execute_magic="$magic"
++
++    # Check if any of the arguments is a wrapper script.
++    args=
++    for file
++    do
++      case $file in
++      -*) ;;
++      *)
++	# Do a test to see if this is really a libtool program.
++	if (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++	  # If there is no directory component, then add one.
++	  case $file in
++	  */* | *\\*) . $file ;;
++	  *) . ./$file ;;
++	  esac
++
++	  # Transform arg to wrapped name.
++	  file="$progdir/$program"
++	fi
++	;;
++      esac
++      # Quote arguments (to preserve shell metacharacters).
++      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
++      args="$args \"$file\""
++    done
++
++    if test -z "$run"; then
++      if test -n "$shlibpath_var"; then
++	# Export the shlibpath_var.
++	eval "export $shlibpath_var"
++      fi
++
++      # Restore saved enviroment variables
++      if test "${save_LC_ALL+set}" = set; then
++	LC_ALL="$save_LC_ALL"; export LC_ALL
++      fi
++      if test "${save_LANG+set}" = set; then
++	LANG="$save_LANG"; export LANG
++      fi
++
++      # Now prepare to actually exec the command.
++      exec_cmd="\$cmd$args"
++    else
++      # Display what would be done.
++      if test -n "$shlibpath_var"; then
++	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
++	$echo "export $shlibpath_var"
++      fi
++      $echo "$cmd$args"
++      exit 0
++    fi
++    ;;
++
++  # libtool clean and uninstall mode
++  clean | uninstall)
++    modename="$modename: $mode"
++    rm="$nonopt"
++    files=
++    rmforce=
++    exit_status=0
++
++    # This variable tells wrapper scripts just to set variables rather
++    # than running their programs.
++    libtool_install_magic="$magic"
++
++    for arg
++    do
++      case $arg in
++      -f) rm="$rm $arg"; rmforce=yes ;;
++      -*) rm="$rm $arg" ;;
++      *) files="$files $arg" ;;
++      esac
++    done
++
++    if test -z "$rm"; then
++      $echo "$modename: you must specify an RM program" 1>&2
++      $echo "$help" 1>&2
++      exit 1
++    fi
++
++    rmdirs=
++
++    for file in $files; do
++      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
++      if test "X$dir" = "X$file"; then
++	dir=.
++	objdir="$objdir"
++      else
++	objdir="$dir/$objdir"
++      fi
++      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
++      test $mode = uninstall && objdir="$dir"
++
++      # Remember objdir for removal later, being careful to avoid duplicates
++      if test $mode = clean; then
++	case " $rmdirs " in
++	  *" $objdir "*) ;;
++	  *) rmdirs="$rmdirs $objdir" ;;
++	esac
++      fi
++
++      # Don't error if the file doesn't exist and rm -f was used.
++      if (test -L "$file") >/dev/null 2>&1 \
++	|| (test -h "$file") >/dev/null 2>&1 \
++	|| test -f "$file"; then
++	:
++      elif test -d "$file"; then
++	exit_status=1
++	continue
++      elif test "$rmforce" = yes; then
++	continue
++      fi
++
++      rmfiles="$file"
++
++      case $name in
++      *.la)
++	# Possibly a libtool archive, so verify it.
++	if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++	  . $dir/$name
++
++	  # Delete the libtool libraries and symlinks.
++	  for n in $library_names; do
++	    rmfiles="$rmfiles $objdir/$n"
++	  done
++	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
++	  test $mode = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
++
++	  if test $mode = uninstall; then
++	    if test -n "$library_names"; then
++	      # Do each command in the postuninstall commands.
++	      eval cmds=\"$postuninstall_cmds\"
++	      save_ifs="$IFS"; IFS='~'
++	      for cmd in $cmds; do
++		IFS="$save_ifs"
++		$show "$cmd"
++		$run eval "$cmd"
++		if test $? != 0 && test "$rmforce" != yes; then
++		  exit_status=1
++		fi
++	      done
++	      IFS="$save_ifs"
++	    fi
++
++	    if test -n "$old_library"; then
++	      # Do each command in the old_postuninstall commands.
++	      eval cmds=\"$old_postuninstall_cmds\"
++	      save_ifs="$IFS"; IFS='~'
++	      for cmd in $cmds; do
++		IFS="$save_ifs"
++		$show "$cmd"
++		$run eval "$cmd"
++		if test $? != 0 && test "$rmforce" != yes; then
++		  exit_status=1
++		fi
++	      done
++	      IFS="$save_ifs"
++	    fi
++	    # FIXME: should reinstall the best remaining shared library.
++	  fi
++	fi
++	;;
++
++      *.lo)
++	if test "$build_old_libs" = yes; then
++	  oldobj=`$echo "X$name" | $Xsed -e "$lo2o"`
++	  rmfiles="$rmfiles $dir/$oldobj"
++	fi
++	;;
++
++      *)
++	# Do a test to see if this is a libtool program.
++	if test $mode = clean &&
++	   (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++	  relink_command=
++	  . $dir/$file
++
++	  rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
++	  if test "$fast_install" = yes && test -n "$relink_command"; then
++	    rmfiles="$rmfiles $objdir/lt-$name"
++	  fi
++	fi
++	;;
++      esac
++      $show "$rm $rmfiles"
++      $run $rm $rmfiles || exit_status=1
++    done
++
++    # Try to remove the ${objdir}s in the directories where we deleted files
++    for dir in $rmdirs; do
++      if test -d "$dir"; then
++	$show "rmdir $dir"
++	$run rmdir $dir >/dev/null 2>&1
++      fi
++    done
++
++    exit $exit_status
++    ;;
++
++  "")
++    $echo "$modename: you must specify a MODE" 1>&2
++    $echo "$generic_help" 1>&2
++    exit 1
++    ;;
++  esac
++
++  if test -z "$exec_cmd"; then
++    $echo "$modename: invalid operation mode \`$mode'" 1>&2
++    $echo "$generic_help" 1>&2
++    exit 1
++  fi
++fi # test -z "$show_help"
++
++if test -n "$exec_cmd"; then
++  eval exec $exec_cmd
++  exit 1
++fi
++
++# We need to display help for each of the modes.
++case $mode in
++"") $echo \
++"Usage: $modename [OPTION]... [MODE-ARG]...
++
++Provide generalized library-building support services.
++
++    --config          show all configuration variables
++    --debug           enable verbose shell tracing
++-n, --dry-run         display commands without modifying any files
++    --features        display basic configuration information and exit
++    --finish          same as \`--mode=finish'
++    --help            display this help message and exit
++    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
++    --quiet           same as \`--silent'
++    --silent          don't print informational messages
++    --version         print version information
++
++MODE must be one of the following:
++
++      clean           remove files from the build directory
++      compile         compile a source file into a libtool object
++      execute         automatically set library path, then run a program
++      finish          complete the installation of libtool libraries
++      install         install libraries or executables
++      link            create a library or an executable
++      uninstall       remove libraries from an installed directory
++
++MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
++a more detailed description of MODE."
++  exit 0
++  ;;
++
++clean)
++  $echo \
++"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
++
++Remove files from the build directory.
++
++RM is the name of the program to use to delete files associated with each FILE
++(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
++to RM.
++
++If FILE is a libtool library, object or program, all the files associated
++with it are deleted. Otherwise, only FILE itself is deleted using RM."
++  ;;
++
++compile)
++  $echo \
++"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
++
++Compile a source file into a libtool library object.
++
++This mode accepts the following additional options:
++
++  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
++  -prefer-pic       try to building PIC objects only
++  -prefer-non-pic   try to building non-PIC objects only
++  -static           always build a \`.o' file suitable for static linking
++
++COMPILE-COMMAND is a command to be used in creating a \`standard' object file
++from the given SOURCEFILE.
++
++The output file name is determined by removing the directory component from
++SOURCEFILE, then substituting the C source code suffix \`.c' with the
++library object suffix, \`.lo'."
++  ;;
++
++execute)
++  $echo \
++"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
++
++Automatically set library path, then run a program.
++
++This mode accepts the following additional options:
++
++  -dlopen FILE      add the directory containing FILE to the library path
++
++This mode sets the library path environment variable according to \`-dlopen'
++flags.
++
++If any of the ARGS are libtool executable wrappers, then they are translated
++into their corresponding uninstalled binary, and any of their required library
++directories are added to the library path.
++
++Then, COMMAND is executed, with ARGS as arguments."
++  ;;
++
++finish)
++  $echo \
++"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
++
++Complete the installation of libtool libraries.
++
++Each LIBDIR is a directory that contains libtool libraries.
++
++The commands that this mode executes may require superuser privileges.  Use
++the \`--dry-run' option if you just want to see what would be executed."
++  ;;
++
++install)
++  $echo \
++"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
++
++Install executables or libraries.
++
++INSTALL-COMMAND is the installation command.  The first component should be
++either the \`install' or \`cp' program.
++
++The rest of the components are interpreted as arguments to that command (only
++BSD-compatible install options are recognized)."
++  ;;
++
++link)
++  $echo \
++"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
++
++Link object files or libraries together to form another library, or to
++create an executable program.
++
++LINK-COMMAND is a command using the C compiler that you would use to create
++a program from several object files.
++
++The following components of LINK-COMMAND are treated specially:
++
++  -all-static       do not do any dynamic linking at all
++  -avoid-version    do not add a version suffix if possible
++  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
++  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
++  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
++  -export-symbols SYMFILE
++		    try to export only the symbols listed in SYMFILE
++  -export-symbols-regex REGEX
++		    try to export only the symbols matching REGEX
++  -LLIBDIR          search LIBDIR for required installed libraries
++  -lNAME            OUTPUT-FILE requires the installed library libNAME
++  -module           build a library that can dlopened
++  -no-fast-install  disable the fast-install mode
++  -no-install       link a not-installable executable
++  -no-undefined     declare that a library does not refer to external symbols
++  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
++  -release RELEASE  specify package release information
++  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
++  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
++  -static           do not do any dynamic linking of libtool libraries
++  -version-info CURRENT[:REVISION[:AGE]]
++		    specify library version info [each variable defaults to 0]
++
++All other options (arguments beginning with \`-') are ignored.
++
++Every other argument is treated as a filename.  Files ending in \`.la' are
++treated as uninstalled libtool libraries, other files are standard or library
++object files.
++
++If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
++only library objects (\`.lo' files) may be specified, and \`-rpath' is
++required, except when creating a convenience library.
++
++If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
++using \`ar' and \`ranlib', or on Windows using \`lib'.
++
++If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
++is created, otherwise an executable program is created."
++  ;;
++
++uninstall)
++  $echo \
++"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
++
++Remove libraries from an installation directory.
++
++RM is the name of the program to use to delete files associated with each FILE
++(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
++to RM.
++
++If FILE is a libtool library, all the files associated with it are deleted.
++Otherwise, only FILE itself is deleted using RM."
++  ;;
++
++*)
++  $echo "$modename: invalid operation mode \`$mode'" 1>&2
++  $echo "$help" 1>&2
++  exit 1
++  ;;
++esac
++
++echo
++$echo "Try \`$modename --help' for more information about other modes."
++
++exit 0
++
++# Local Variables:
++# mode:shell-script
++# sh-indentation:2
++# End:
+--- metamail-2.7.orig/debian/mime.noinstall
++++ metamail-2.7/debian/mime.noinstall
+@@ -0,0 +1,5 @@
++image/*; showpicture -viewer xv %s; description="All Graphic Images"
++image/*; showpicture -viewer "xloadimage -view -quiet" %s; description="All Graphic Images"
++audio/*; showaudio %s; description="All Audio Subtypes"
++audio/basic; showaudio %s; compose="audiocompose %s"; edit="audiocompose %s"; description="An Audio Fragment"
++audio-file; sun-audio-file %s; description="Sun Audio Message"
+--- metamail-2.7.orig/debian/control
++++ metamail-2.7/debian/control
+@@ -0,0 +1,23 @@
++Source: metamail
++Section: mail
++Priority: optional
++Maintainer: Debian QA Group <packages@qa.debian.org>
++Build-Depends: debhelper (>= 5), autotools-dev, libncurses-dev
++Standards-Version: 3.7.2
++
++Package: metamail
++Section: mail
++Architecture: any
++Depends: ${shlibs:Depends}, ${misc:Depends}
++Recommends: sharutils, mime-support (>=3.11-1)
++Description: implementation of MIME
++ Metamail is an implementation of Multi-purpose Internet Mail
++ Extensions (MIME), a proposed standard for multimedia electronic
++ mail on the Internet.
++ .
++ Metamail is configurable and extensible via the "mailcap" mechanism
++ described in an informational RFC that is a companion to the MIME
++ document.  Metamail can be used to turn virtually any mail reader
++ program into a multimedia mail reader.  For information about how
++ to change mail readers so that they can use Metamail, please read
++ the file `/usr/share/doc/metamail/mailers.txt.gz'.
+--- metamail-2.7.orig/debian/mimencode.1
++++ metamail-2.7/debian/mimencode.1
+@@ -0,0 +1,52 @@
++.TH MIMENCODE 1 "Release 1" "Bellcore Prototype"
++.SH NAME
++mimencode - Translate to and from mail-oriented encoding formats
++.SH SYNOPSIS
++.ta 8n
++\fBmimencode\fP	[-u] [-b] [-q] [-p] [file name] [-o outputfile]
++.br
++.SH DESCRIPTION
++The
++.I mimencode
++program simply converts a byte stream into (or out of) one of the standard mail encoding formats defined by MIME, the proposed standard for internet multimedia mail formats.  Such an encoding is necessary because binary data cannot be sent through the mail.  The encodings understood by mimencode are preferable to the use of the uuencode/uudecode programs, for use in mail, in several respects that were important to the authors of MIME.
++
++By default, mimencode reads standard input, and sends a "base64" encoded version of the input to standard output.
++
++The (really not necessary) "-b" option tells mimencode to use the "base64" encoding.
++
++The "-q" option tells mimencode to use the "quoted-printable" encoding instead of base64.
++
++The "-u" option tells mimencode to 
++.I
++decode
++the standard input rather than encode it.  
++
++The "-p" option tells mimencode to translate decoded CRLF sequences into the local newline convention during decoding and to do the reverse during encoding.  This option is only meaningful when  -b (base64 encoding) is in effect.
++
++If a file name argument is given, input is read from that file rather than from standard input.
++
++The "-o" option, which must be followed by a file name, sends output to the named file rather than to standard output.
++.SH RATIONALE
++.I
++Mimencode
++is intended to be a replacement for 
++.I
++uuencode
++for mail and news use.  The reason is simple:  uuencode doesn't work very well in a number of circumstances and ways.  In particular, uuencode uses characters that don't translate well across all mail gateways (particularly ASCII <-> EBCDIC gateways).  Also, uuencode is not standard -- there are several variants floating around, encoding and decoding things in different and incompatible ways, with no "standard" on which to base an implementation.  Finally, uuencode does not generally work well in a pipe, although some variants have been modified to do so.  Mimencode implements the encodings which were defined for MIME as uuencode replacements, and should be considerably more robust for email use.
++.SH SEE ALSO
++metamail(1), mailto(1)
++.SH COPYRIGHT
++Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++
++Permission to use, copy, modify, and distribute this material 
++for any purpose and without fee is hereby granted, provided 
++that the above copyright notice and this permission notice 
++appear in all copies, and that the name of Bellcore not be 
++used in advertising or publicity pertaining to this 
++material without the specific, prior written permission 
++of an authorized representative of Bellcore.  BELLCORE 
++MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++.SH AUTHOR
++Nathaniel S. Borenstein
+--- metamail-2.7.orig/debian/copyright
++++ metamail-2.7/debian/copyright
+@@ -0,0 +1,37 @@
++This is the Debian GNU/Linux prepackaged version of Metamail.
++
++This package was put together by Michael Meskes <meskes@debian.org>,
++from sources obtained from:
++ ftp.bellcore.com:/pub/nsb/mm2.7.tar.Z and /pub/nsb/contrib2.7.tar.Z
++
++This package was then worked on by Herbert Xu <herbert@debian.org>.
++
++****************************************************************
++Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++
++Permission to use, copy, modify, and distribute this material 
++for any purpose and without fee is hereby granted, provided 
++that the above copyright notice and this permission notice 
++appear in all copies, and that the name of Bellcore not be 
++used in advertising or publicity pertaining to this 
++material without the specific, prior written permission 
++of an authorized representative of Bellcore.  BELLCORE 
++MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++****************************************************************
++
++Most scripts are:
++
++# Conversion from C shell to Bourne shell by Z-Code Software Corp.
++# Conversion Copyright (c) 1992 Z-Code Software Corp.
++# Permission to use, copy, modify, and distribute this material
++# for any purpose and without fee is hereby granted, provided
++# that the above copyright notice and this permission notice
++# appear in all copies, and that the name of Z-Code Software not
++# be used in advertising or publicity pertaining to this
++# material without the specific, prior written permission
++# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
+--- metamail-2.7.orig/debian/metamail.files
++++ metamail-2.7/debian/metamail.files
+@@ -0,0 +1,3 @@
++usr/bin
++usr/lib/libmetamail.so.*
++
+--- metamail-2.7.orig/debian/mime
++++ metamail-2.7/debian/mime
+@@ -0,0 +1,7 @@
++text/plain; shownonascii iso-8859-1 %s; description="Plain ASCII Text"; test=test "$(echo %{charset} | tr "[A-Z]" "[a-z]")" = iso-8859-1 -a "$DISPLAY" != ""
++text/richtext; richtext %s; description="Richtext"; copiousoutput; priority=4
++text/richtext; shownonascii iso-8859-1 -e richtext -p %s; description="Richtext"; copiousoutput; test=test "$(echo %{charset} | tr "[A-Z]" "[a-z]")" = iso-8859-1 -a "$DISPLAY" != ""
++text/enriched; richtext -e %s; description="Enriched Text"; copiousoutput; priority=4
++text/enriched; shownonascii iso-8859-1 -e richtext -e -p %s; description="Enriched Text"; copiousoutput; test=test "$(echo %{charset} | tr "[A-Z]" "[a-z]")" = iso-8859-1 -a "$DISPLAY" != ""
++message/partial; showpartial %s %{id} %{number} %{total}; description="An incomplete message"
++message/external-body; showexternal %s %{access-type} %{name} %{site} %{directory} %{mode} %{server}; needsterminal; description="A reference to data stored in an external location"; composetyped="extcompose %s"
+--- metamail-2.7.orig/debian/README.Debian
++++ metamail-2.7/debian/README.Debian
+@@ -0,0 +1,12 @@
++This is the Debian GNU/Linux prepackaged version of the metamail package.
++
++It installs only a basis of the scripts included in the original metamail
++package. Excluded are Apple specifics (rcvAppleSingle, sndAppleSingle),
++sun specifics (sun-message.csh, sun-audio-file, sun-message, sun-to-mime,
++sun2mime), hebrew specifics (mailto-hebrew), mailserver extensions 
++(mailserver), binary wrapper extensions for mimeencode (mmencode) and richtoak.
++
++I had to fix the source by adding a doublinked list that stores all opened
++tmp files. This list is used at before the program terminates so that all
++tmp files get properly removed.
++
+--- metamail-2.7.orig/debian/rules
++++ metamail-2.7/debian/rules
+@@ -0,0 +1,111 @@
++#!/usr/bin/make -f
++# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
++
++# Uncomment this to turn on verbose mode.
++export DH_VERBOSE=1
++
++export INTERNAL_DESTDIR=debian/tmp
++
++MAJOR=0
++MINOR=0.0
++
++source-updates:
++	dh_testdir
++	sh bootstrap
++
++build: build-stamp
++build-stamp:
++	dh_testdir
++	ln -sf /usr/share/misc/config.sub /usr/share/misc/config.guess config
++	chmod +x ./configure
++	./configure --prefix=/usr
++	$(MAKE)
++	touch $@
++
++clean:
++	dh_testdir
++	dh_testroot
++	-if test -e Makefile; then \
++	  if test -e Makefile.in; then \
++		$(MAKE) distclean; \
++	  else \
++		$(MAKE) clean; \
++	  fi \
++	 fi
++	rm -f config/config.sub config/config.guess
++	dh_clean build-stamp install-stamp mimencode.1
++
++install: install-stamp
++install-stamp: build
++	dh_testdir
++	dh_testroot
++	dh_clean -k
++	dh_installdirs
++
++	-$(MAKE) install DESTDIR=`pwd`/$(INTERNAL_DESTDIR)
++
++	cd $(INTERNAL_DESTDIR)/usr/bin && rm sun-message.csh mailserver \
++	  rcvAppleSingle richtoatk sndAppleSingle sun-audio-file \
++          sun-message sun-to-mime sun2mime mailto-hebrew
++
++	touch $@
++
++binary-indep:
++# No arch-indep packages to be built here.
++
++binary-arch: build install metamail
++
++
++metamail: build install
++	dh_testdir -pmetamail
++	dh_testroot -pmetamail
++
++	dh_installdirs -pmetamail
++	dh_movefiles -pmetamail
++	cp man/mmencode.1 debian/mimencode.1
++
++	dh_link -pmetamail usr/lib/libmetamail.so.$(MAJOR).$(MINOR) \
++	  usr/lib/libmetamail.so.$(MAJOR)
++
++	dh_installdocs -pmetamail CREDITS README mailers.txt \
++	  debian/mime.noinstall
++	dh_installchangelogs -pmetamail
++	dh_installmime -pmetamail
++	dh_installman -pmetamail
++	dh_strip -pmetamail
++	dh_compress -pmetamail
++	dh_fixperms -pmetamail
++	dh_makeshlibs -pmetamail
++	dh_installdeb -pmetamail
++	dh_shlibdeps -pmetamail -l$(shell pwd)/debian/metamail/usr/lib
++	dh_gencontrol -pmetamail -- -isp
++	dh_md5sums -pmetamail
++	dh_builddeb -pmetamail
++
++#libmetamail0: build install
++#	dh_testdir -plibmetamail0
++#	dh_testroot -plibmetamail0
++
++#	dh_installdirs -plibmetamail0
++#	dh_movefiles -plibmetamail0
++
++#	dh_link -plibmetamail0 usr/lib/libmetamail.so.$(MAJOR).$(MINOR) \
++#	  usr/lib/libmetamail.so.$(MAJOR)
++
++#	dh_installdocs -plibmetamail0
++#	dh_installchangelogs -plibmetamail0
++#	dh_strip -plibmetamail0
++#	dh_compress -plibmetamail0
++#	dh_fixperms -plibmetamail0
++#	dh_installdeb -plibmetamail0
++#	dh_shlibdeps -plibmetamail0
++#	dh_gencontrol -plibmetamail0
++#	dh_makeshlibs -plibmetamail0 -V
++#	dh_md5sums -plibmetamail0
++#	dh_builddeb -plibmetamail0
++
++
++binary: binary-indep binary-arch
++.PHONY: build clean binary-indep binary-arch binary
++
++
+--- metamail-2.7.orig/debian/manpages
++++ metamail-2.7/debian/manpages
+@@ -0,0 +1,20 @@
++man/audiocompose.1
++man/audiosend.1
++man/extcompose.1
++man/getfilename.1
++man/mailto.1
++man/metamail.1
++man/metasend.1
++man/mime.1
++man/patch-metamail.1
++man/richtext.1
++man/showaudio.1
++man/showexternal.1
++man/shownonascii.1
++man/showpartial.1
++man/showpicture.1
++man/splitmail.1
++man/uudepipe.1
++man/uuenpipe.1
++debian/mimeit.1
++debian/mimencode.1
+--- metamail-2.7.orig/debian/shlibs.local
++++ metamail-2.7/debian/shlibs.local
+@@ -0,0 +1 @@
++libmetamail 0 
+--- metamail-2.7.orig/debian/changelog
++++ metamail-2.7/debian/changelog
+@@ -0,0 +1,453 @@
++metamail (2.7-54) unstable; urgency=low
++
++  * QA upload.
++  * Fix bashisms in bin/showaudio. checkbashisms reports false positives
++    in patch-metamail ($HOSTNAME is defined in that script). (Closes: #465349)
++
++ -- Marc 'HE' Brockschmidt <he@debian.org>  Sun, 09 Mar 2008 00:36:59 +0100
++
++metamail (2.7-53) unstable; urgency=low
++
++  * QA upload.
++  * src/metamail/splitmail.c: Fix segfault on 64-bit machines.  Thanks to
++    John Hughes for the patch.  Closes: #410466.
++  * debian/compat: Set DH_COMPAT here rather than in debian/rules.
++  * debian/rules: Replace dh_installmanpages with dh_installman.
++
++ -- Matej Vela <vela@debian.org>  Sun, 15 Apr 2007 18:01:02 +0200
++
++metamail (2.7-52) unstable; urgency=low
++
++  * QA Group upload.
++  * Set Standards-Version to 3.7.2.
++  * Set DH_COMPAT to 5.
++  * Fixed "Does not provide filenames for attachments", closes:
++    #321968. Patch by Immanuel Halupczok <debian-bugs@karimmi.de>.
++  * Fixed "dumps core with -w option", closes: #357163.
++    Patch by Justin Pryzby <justinpryzby@users.sourceforge.net>.
++
++ -- Anibal Monsalve Salazar <anibal@debian.org>  Wed, 19 Jul 2006 12:53:40 +1000
++
++metamail (2.7-51) unstable; urgency=high
++
++  * QA upload.
++  * Fixed "[CVE-2006-0709] crashes with very long boundaries in
++    messages", closes: #352482, #353539. Patch thanks to
++    Ulf Harnhammar <metaur@telia.com>.
++
++ -- Anibal Monsalve Salazar <anibal@debian.org>  Thu, 23 Feb 2006 09:17:36 +1100
++
++metamail (2.7-50) unstable; urgency=low
++
++  * QA upload.
++  * Automatically update config.sub and config.guess from autotools-dev.
++    Closes: #338566.
++  * man/metamail.1: Fix search path formatting.
++
++ -- Matej Vela <vela@debian.org>  Fri, 11 Nov 2005 07:42:03 +0100
++
++metamail (2.7-49) unstable; urgency=low
++
++  * QA upload.
++  * bin/uuenpipe, bin/uudepipe: Properly handle unreadable files,
++    filenames beginning with "-", and filenames containing whitespace.
++    (These scripts were not meant to take options.)  Closes: #273195.
++  * src/metamail/mailto.c (GetLineMalloced): Fix segfault caused by
++    freeing static storage.  Closes: #300756.
++  * man/metamail.1: Document the -E option.  Closes: #177823.
++  * man/richtext.1: Document the -e option.  Closes: #296120.
++  * Conforms to Standards version 3.6.2.
++
++ -- Matej Vela <vela@debian.org>  Fri, 19 Aug 2005 11:25:02 +0200
++
++metamail (2.7-48) unstable; urgency=low
++
++  * QA Group upload by Javier Fernandez-Sanguino
++  * Fix typos in manpages with patches provided by A Costa (Closes: #311450,
++    #311451, #311452, #311453)
++  * Fix use of temporary files in showpartial so that uses cannot introduce
++    a DOS through the use of hard links. Temporary files are created with
++    mktemp and their filename is stored in ~/.metamail_treeroot (Closes:
++    #321473)
++
++ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Wed, 17 Aug 2005 00:17:20 +0200
++
++metamail (2.7-47) unstable; urgency=low
++
++  * QA Group upload by Anibal Monsalve Salazar.
++  * Fixed "Add/Improve SEE ALSO section for splitmail/mimeit" (Closes:
++    #245647). Patch by Helge Kreutzmann <kreutzm@itp.uni-hannover.de>.
++  * Fixed "8-bit encoding is supported by metamail but not by metasend script"
++    (Closes: #285914). Patch by Sergey Kogan <kogan@sklad.bacon.ru>.
++  * Fixed "additional option when handling unrecognized content types"
++    (Closes: #249823). Patch by Daniel Kraft <da_kraft@web.de>.
++  * Fixed "debug message 'pre access' left in released version
++    (Closes: #184410). Patch by <pmaydell@chiark.greenend.org.uk>.
++
++ -- Anibal Monsalve Salazar <anibal@debian.org>  Sun, 13 Feb 2005 10:43:55 +1100
++
++metamail (2.7-46) unstable; urgency=low
++
++  * QA Group upload orphaning this package
++  * Incorporates previous NMUs (closes: #164074, #185005, #233935)
++  * debian/control: make build-dependency on debhelper versioned
++
++ -- Andrew Pollock <apollock@debian.org>  Tue,  9 Nov 2004 22:14:08 +1100
++
++metamail (2.7-45.3) unstable; urgency=medium
++
++  * Non-maintainer upload by the Security Team
++  * Adjust the patch since Christian 'Naddy' Weisgerber discovered an
++    overzealous use of sizeof().
++
++ -- Martin Schulze <joey@infodrom.org>  Tue,  2 Mar 2004 20:08:51 +0100
++
++metamail (2.7-45.2) unstable; urgency=high
++
++  * NMU
++  * [src/metamail/metamail.c, src/metamail/splitmail.c] Address CAN-2004-0104
++    and CAN-2004-0105 (format string vulnerabilities and buffer overflows).
++    (Addresses #233640 for sid)
++  * [bin/audiocompose] Quote file reference.
++  * [metamail/splitmail.c] Use /usr/sbin/sendmail rather than
++    /usr/lib/sendmail.
++
++ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Fri, 20 Feb 2004 21:22:16 +0100
++
++metamail (2.7-45.1) unstable; urgency=low
++
++  * NMU
++  * Fixed FTBFS: (Closes: #164074)
++    * [configure.in] Added AM_MAINTAINER_MODE.
++    * [debian/rules] Introduced "source-updates" target.
++    * [debian/control] Dropped "libtool" and "automake" build dependencies.
++    * Regenerated auto* files.
++  * [bin/audiosend] Fixed shell syntax by adding a 'then'.
++  * [debian/control] Removed full stop from the one line description.
++
++ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Sun, 16 Mar 2003 13:38:42 +0100
++
++metamail (2.7-45) unstable; urgency=low
++
++  * eliminated nasty tmpfile bug that caused removal of temporary files
++    though they were in use by processes that have been backgrounded by
++    metamail. (Closes: #141966)
++
++ -- Michael Moerz <mikem@debian.org>  Mon, 15 Apr 2002 11:07:17 +0200
++
++metamail (2.7-44) unstable; urgency=low
++
++  * renamed mmencode reference from metamail manpage to mimencode
++    (Closes: #137347)
++  * removed mailcap manpage from metamail package so that can go into
++    the mime-support package (Closes:  #139989)
++
++ -- Michael Moerz <mikem@debian.org>  Wed,  3 Apr 2002 02:24:53 +0200
++
++metamail (2.7-43) unstable; urgency=low
++
++  * fixed 64bit architecture problems caused by missing prototypes of
++    functions. The actual pactch was developed by 
++    John R.Daily" <jdaily@progeny.com> (Closes: #126109)
++  * fixed usage message of mimencode by using a patch supplied by
++    David Fries <dfries@mail.win.org> (Closes: #119075)
++
++ -- Michael Moerz <mikem@debian.org>  Sat, 22 Dec 2001 00:35:19 +0100
++
++metamail (2.7-42) unstable; urgency=low
++
++  * fixed bug that caused mailto to honour newlines incorrectly when
++    mimetypes are asked for and checked.
++
++ -- Michael Moerz <mikem@debian.org>  Mon, 15 Oct 2001 22:11:35 +0200
++
++metamail (2.7-41) unstable; urgency=low
++
++  * fixed a minor bug regarding the man page of metamail saying /usr/ucb/reset
++    and not /usr/bin/reset (Closes: #110889)
++  * fixed broken showpartial (Closes: #107538)
++
++ -- Michael Moerz <mikem@debian.org>  Sat,  1 Sep 2001 20:32:01 +0200
++
++metamail (2.7-40) unstable; urgency=low
++
++  * Removed non functional downwards compatiblity code for older
++    mime-support which called install-mime when the previous metamail
++    version was less than 2-7.34. (Closes: #100993)
++  * hardened dependency to mime-support (version 3.11-1 or higher has
++    to be installed now)
++
++ -- Michael Moerz <mikem@debian.org>  Sat, 16 Jun 2001 13:48:12 +0200
++
++metamail (2.7-39) unstable; urgency=low
++
++  * fixed a bug that created a segfault when saving an attachment.
++    (Closes: #88766)
++
++ -- Michael Moerz <e9625136@stud3.tuwien.ac.at>  Tue, 20 Mar 2001 20:52:20 +0100
++
++metamail (2.7-38) unstable; urgency=low
++
++  * stupid me has again missed a build depends for libncurses-dev.
++    This is fixed now. (Closes: #86559)
++
++ -- Michael Moerz <e9625136@stud3.tuwien.ac.at>  Sun, 25 Feb 2001 17:05:45 +0100
++
++metamail (2.7-37) unstable; urgency=low
++
++  * Fixed broken build caused by not using a shell for interpreting
++    the bootstrap script (Closes: #85764).
++  * changed rules file so that not only the existence of Makefile
++    is checked, but of Makefile.in too and the decision is made
++    to use make clean or make destclean (Makefile.in present).
++  * fixed build depends to enlist libtool & automake too.
++    (Closes: #86128)
++  * fixed disappearing of mimencode (Closes: #86083)
++
++ -- Michael Moerz <e9625136@stud3.tuwien.ac.at>  Tue, 13 Feb 2001 14:08:20 +0100
++
++metamail (2.7-36) unstable; urgency=low
++
++  * Fixed broken showpartial where a variable was not set correctly
++    (nullified) and that caused that showpartial didn't work.
++    (Closes: #58614)
++  * Fixed mimeit manpage refering to mm package instead of metamail
++    (Closes: #63033)
++  * added a README.Debian pointing out the debian specific
++    modifications to the package
++  * Fixed the leaving tmp-files behind bug. So now metamail removes
++    all files it generates in /tmp before it terminates.
++    (Closes: #39011)
++  * DH_COMPAT=2 is now in place and functional
++  * converted build-process and .c and .h files to use autoconf and
++    automake. (Now the package will build under woody again.) 
++
++ -- Michael Moerz <e9625136@stud3.tuwien.ac.at>  Thu, 18 Jan 2001 04:26:05 +0100
++
++metamail (2.7-35) unstable; urgency=low
++
++  * Fixed a typo in metasend that resulted in Content-Description
++    being blank when -n wasn't set. (Closes: #70761)
++
++ -- Teemu Hukkanen <tjhukkan@iki.fi>  Sun, 10 Sep 2000 21:58:00 +0300
++
++metamail (2.7-34) frozen unstable; urgency=low
++
++  * The install-all target tried to strip shell scripts, plus several
++    additional flaws, which prevented building, closes: #55260.
++  * Updated for newer mime-support, closes: #47097. Downgraded
++    mime-support dependency to a recommendation, and removed useless
++    version (as the new scheme is used, and 2.02-1 is too old for it).
++  * Updated for Policy 3.1.1.
++
++ -- Josip Rodin <jrodin@jagor.srce.hr>  Tue,  8 Feb 2000 21:15:19 +0100
++
++metamail (2.7-33) unstable; urgency=low
++
++  * Orphaning metamail.
++
++ -- Herbert Xu <herbert@debian.org>  Sat, 20 Nov 1999 20:33:36 -0600
++
++metamail (2.7-32) unstable; urgency=low
++
++  * Fixed postinst script where it didn't add mailcap entries for an initial
++    install.
++  * Don't warn about wild cards in mailcap (fixes #30910).
++  * Use $() instead of `` for command substitution (fixes #33487).
++    Note that metamail does %{} substitutions with the correct quoting.
++    Indeed, it filters out characters like ` so there is no problem even if
++    this fix were not there.  But other applications that currently do not do
++    the required quoting should do so.
++    Also, all packages that add entries to mailcap should check their entries
++    and replace all `` with % substitutions inside with $() so as to avoid
++    the obscure shell rule that `` is terminated by a un-backslashed back-
++    quote.  Indeed, if this back-quote occurs within single or double quotes,
++    the result is undefined.
++
++ -- Herbert Xu <herbert@debian.org>  Sun, 14 Mar 1999 12:58:05 +1100
++
++metamail (2.7-31) frozen unstable; urgency=low
++
++  * Uploaded to slink.
++
++ -- Herbert Xu <herbert@debian.org>  Sun, 15 Nov 1998 15:11:52 +1100
++
++metamail (2.7-30) unstable; urgency=low
++
++  * Use lpr instead of lp for linux (fixes #27259).
++  * Removed all traces of mmencode (fixes #28746).
++  * Rebuilt with libncruses4.
++
++ -- Herbert Xu <herbert@debian.org>  Sat, 31 Oct 1998 15:16:13 +1100
++
++metamail (2.7-29) unstable; urgency=medium
++
++  * Applied security patch from Topi Miettinen (fixes #26877).
++
++ -- Herbert Xu <herbert@debian.org>  Tue, 22 Sep 1998 14:29:27 +1000
++
++metamail (2.7-28) frozen unstable; urgency=high
++
++  * Fixed showpartial (fixes #23595).
++
++ -- Herbert Xu <herbert@debian.org>  Thu, 18 Jun 1998 09:41:50 +1000
++
++metamail (2.7-27) unstable; urgency=low
++
++  * Fixed shownonascii (fixes #19862).
++  * Manually add mimencode.1.
++
++ -- Herbert Xu <herbert@debian.org>  Wed, 18 Mar 1998 21:06:39 +1100
++
++metamail (2.7-26) unstable; urgency=low
++
++  * Added -e to all shell scripts (fixes #19802).
++  * Removed #!/bin/sh header from mime.noinstall.
++
++ -- Herbert Xu <herbert@debian.org>  Tue, 17 Mar 1998 21:22:25 +1100
++
++metamail (2.7-25) unstable; urgency=low
++
++  * Use sensible-pager instead of pager.
++  * Upgraded to Standard Version 2.4.0.0.
++  * Removed
++    . mailserver
++    . mailto-hebrew
++    . rcvAppSingle
++    . richtoatk
++    . sndAppSingle
++    . sun-audio-file
++    . sun-message
++    . sun-to-mime
++    . sun2mime
++    as they were either not functional or useless and without a manpage.
++  * Added manpages to mimeit, uuencode and uudecode (fixes #6332).
++  * Converted to debhelper.
++  * Moved mailcap from section 4 to section 5.
++
++ -- Herbert Xu <herbert@debian.org>  Mon,  2 Mar 1998 15:46:44 +1100
++
++metamail (2.7-24) unstable; urgency=high
++
++  * Use tempfile for temporary files.
++  * Removed sun-message.csh.
++
++ -- Herbert Xu <herbert@debian.org>  Wed, 15 Oct 1997 10:29:16 +1000
++
++metamail (2.7-23) unstable; urgency=low
++
++  * Fixed uudepipe (#12371).
++
++ -- Herbert Xu <herbert@debian.org>  Tue,  2 Sep 1997 21:37:01 +1000
++
++metamail (2.7-22) unstable; urgency=low
++
++  * Recompiled with libc6.
++  * Removed recommendation of xv | xloadimage (#9706).
++
++ -- Herbert Xu <herbert@debian.org>  Sat, 21 Jun 1997 16:17:29 +1000
++
++metamail (2.7-21) stable frozen unstable; urgency=high
++
++  * Recompiled with gcc-2.7.2.1-8.
++
++ -- Herbert Xu <herbert@debian.org>  Sun, 4 May 1997 23:16:22 +1000
++
++metamail (2.7-20) stable frozen unstable; urgency=high
++
++  * Applyed Olaf Kirch's patch for a possible security hole.
++  * Changed all /usr/lib/sendmail to /usr/sbin/sendmail.
++
++ -- Herbert Xu <herbert@debian.org>  Wed, 30 Apr 1997 16:30:51 +1000
++
++metamail (2.7-19) unstable; urgency=low
++
++  * Be smarter about running install-mime when upgrading (#7859).
++  * Changed links to undocumented.7 to undocumented.7.gz.
++
++ -- Herbert Xu <herbert@debian.org>  Mon, 10 Mar 1997 19:44:54 +1100
++
++metamail (2.7-18) unstable; urgency=low
++
++  * Substitued which for whence (#7233).
++
++ -- Herbert Xu <herbert@debian.org>  Tue, 11 Feb 1997 17:34:39 +1100
++
++metamail (2.7-17) unstable; urgency=low
++
++  * New maintainer.
++  * Changed all "RM=/bin/rm" to "RM=rm" in Makefiles.
++  * Modified debian/rules and Makefiles to use debstd.
++  * Adding undocumented links.
++  * Adding #!/bin/sh to shell scripts to help identification.
++  * Fixed bug #6104 and removed extraneous blanks in mailcap.4.
++
++ -- Herbert Xu <herbert@debian.org>  Wed, 15 Jan 1997 20:45:07 +1100
++
++metamail (2.7-16) unstable; urgency=LOW
++
++  * Fixed postinst (Bug#5606)
++
++ -- Michael Meskes <meskes@debian.org>  Thu, 5 Dec 1996 14:55:23 +0100
++
++metamail (2.7-15) frozen unstable; urgency=MEDIUM
++
++  * sun2mime now calls /usr/bin/nawk (Bug#5488)
++
++ -- Michael Meskes <meskes@debian.org>  Tue, 19 Nov 1996 09:37:17 +0100
++
++metamail (2.7-14) frozen unstable; urgency=MEDIUM
++
++  * Corrected metasend (and other scripts) to not call echo-n (Bug#5397).
++  * remove echo-n from distribution
++
++ -- Michael Meskes <meskes@debian.org>  Wed, 13 Nov 1996 17:25:19 +0100
++
++metamail (2.7-13) unstable; urgency=LOW
++
++  * Cleaned up postinst (Bug#4720). Other install-mime calls are now
++  * installed just as a doc file.
++
++ -- Michael Meskes <meskes@debian.org>  Sat, 12 Oct 1996 15:15:50 +0200
++
++metamail (2.7-12) unstable; urgency=LOW
++
++  * Added 'Recommends: sharutils' (Bug#4616)
++
++ -- Michael Meskes <meskes@debian.org>  Mon, 30 Sep 1996 14:01:30 +0200
++
++metamail (2.7-11) unstable; urgency=LOW
++
++  * Moved Bourne shell scripts into bin directory, so dpkg-source works.
++  * Fixed showpicture to not use a geometry
++
++ -- Michael Meskes <meskes@debian.org>  Sun, 29 Sep 1996 13:52:41 +0200
++
++metamail (2.7-10) unstable; urgency=LOW
++
++  * Fixed that silly naming bug that caused postinst to be installed as
++  * binary in /usr/bin (bug#4425)
++
++ -- Michael Meskes <meskes@debian.org>  Sat, 7 Sep 1996 12:59:13 +0200
++
++metamail (2.7-9) unstable; urgency=LOW
++
++  * Corrected some minor bugs in debian/ directory and adjusted debian/rules
++  * accordingly. Conversion to new packaging scheme is now completed.
++
++ -- Michael Meskes <meskes@debian.org>  Sun, 1 Sep 1996 11:39:03 +0200
++
++metamail (2.7-8) unstable; urgency=LOW
++
++  * Corrected font name in postinst
++  * Corrected rules file to not install /usr/doc/copyright/README
++
++ -- Michael Meskes <meskes@debian.org>  Thu, 29 Aug 1996 17:11:43 +0200
++
++metamail (2.7-7) unstable; urgency=LOW
++
++  * Corrected dependency (Bug#4305)
++  * New packaging scheme
++
++ -- Michael Meskes <meskes@debian.org>  Wed, 28 Aug 1996 14:05:10 +0200
++
+--- metamail-2.7.orig/debian/mimeit.1
++++ metamail-2.7/debian/mimeit.1
+@@ -0,0 +1,28 @@
++.TH MIMEIT 1 "1998 March 1st" "METAMAIL" "Debian Linux Manual"
++.SH NAME
++mimeit \- base64-encode stdin and mail it
++.SH SYNOPSIS
++.B mimeit
++.I content-type recipient subject
++.RI [ splitmail-options ]
++.SH "DESCRIPTION"
++This manual page documents briefly the
++.B mimeit
++command.
++This manual page was written for the
++.B Debian GNU/Linux
++distribution (but may be used by others), because the original
++program does not have a manual page.
++.PP
++.B mimeit
++base64-encodes the message read from stdin and sends it off
++using
++.BR splitmail (1).
++It will pass all but the first three parameters to \fBsplitmail\fR(1).
++.SH AUTHOR
++.B mimeit
++is part of metamail package.  Manual page added by Herbert Xu
++and fixed by Michael Moerz <e9625136@stud3.tuwien.ac.at>.
++.SH SEE ALSO
++.PP
++\fBMIME\fR(1), \fBsplitmail\fR(1), \fBmunpack\fR(1), \fBmetamail\fR(1)
+--- metamail-2.7.orig/debian/compat
++++ metamail-2.7/debian/compat
+@@ -0,0 +1 @@
++5
+--- metamail-2.7.orig/replace/Makefile.am
++++ metamail-2.7/replace/Makefile.am
+@@ -0,0 +1,9 @@
++## Makefile.am -- Process this file with automake to produce Makefile.in
++
++MAINTAINERCLEANFILES	= Makefile.in
++
++INCLUDES		=  -I$(top_builddir) -I$(top_srcdir)
++
++noinst_LTLIBRARIES	= libreplace.la
++libreplace_la_SOURCES	= 
++libreplace_la_LIBADD	= @LTLIBOBJS@
+--- metamail-2.7.orig/replace/putenv.c
++++ metamail-2.7/replace/putenv.c
+@@ -0,0 +1,100 @@
++/* Copyright (C) 1991 Free Software Foundation, Inc.
++This file is part of the GNU C Library.
++
++The GNU C Library is free software; you can redistribute it and/or
++modify it under the terms of the GNU Library General Public License as
++published by the Free Software Foundation; either version 2 of the
++License, or (at your option) any later version.
++
++The GNU C Library is distributed in the hope that it will be useful,
++but WITHOUT ANY WARRANTY; without even the implied warranty of
++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++Library General Public License for more details.
++
++You should have received a copy of the GNU Library General Public
++License along with the GNU C Library; see the file COPYING.LIB.  If
++not, write to the Free Software Foundation, Inc., 675 Mass Ave,
++Cambridge, MA 02139, USA.  */
++
++#include <config.h>
++#include <sys/types.h>
++#include <errno.h>
++#ifdef STDC_HEADERS
++#include <stdlib.h>
++#else
++extern int errno;
++#endif
++
++#if defined(STDC_HEADERS) || defined(USG) || defined(SYSV)
++#include <string.h>
++#else /* not (STDC_HEADERS or USG) */
++#include <strings.h>
++#endif /* STDC_HEADERS or USG */
++
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
++
++#ifndef NULL
++#define NULL 0
++#endif
++
++#if !__STDC__
++#define const
++#endif
++
++extern char **environ;
++
++/* Put STRING, which is of the form "NAME=VALUE", in the environment.  */
++int
++putenv (string)
++     const char *string;
++{
++  char *name_end = index (string, '=');
++  register size_t size;
++  register char **ep;
++
++  if (name_end == NULL)
++    {
++      /* Remove the variable from the environment.  */
++      size = strlen (string);
++      for (ep = environ; *ep != NULL; ++ep)
++	if (!strncmp (*ep, string, size) && (*ep)[size] == '=')
++	  {
++	    while (ep[1] != NULL)
++	      {
++		ep[0] = ep[1];
++		++ep;
++	      }
++	    *ep = NULL;
++	    return 0;
++	  }
++    }
++
++  size = 0;
++  for (ep = environ; *ep != NULL; ++ep)
++    if (!strncmp (*ep, string, name_end - string) &&
++	(*ep)[name_end - string] == '=')
++      break;
++    else
++      ++size;
++
++  if (*ep == NULL)
++    {
++      static char **last_environ = NULL;
++      char **new_environ = (char **) malloc ((size + 2) * sizeof (char *));
++      if (new_environ == NULL)
++	return -1;
++      (void) bcopy ((char *) environ, (char *) new_environ, size * sizeof (char *));
++      new_environ[size] = (char *) string;
++      new_environ[size + 1] = NULL;
++      if (last_environ != NULL)
++	free ((char *) last_environ);
++      last_environ = new_environ;
++      environ = new_environ;
++    }
++  else
++    *ep = (char *) string;
++
++  return 0;
++}
+--- metamail-2.7.orig/replace/basename.c
++++ metamail-2.7/replace/basename.c
+@@ -0,0 +1,45 @@
++/* basename.c -- implement basename() for architectures without it
++   Copyright (C) 2000 Gary V. Vaughan
++  
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2, or (at your option)
++   any later version.
++  
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++  
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++*/
++#if HAVE_CONFIG_H
++#  include <config.h>
++#endif
++
++#if HAVE_STRING_H
++#  include <string.h>
++#elif HAVE_STRINGS_H
++#  include <strings.h>
++#endif
++
++#if !HAVE_STRRCHR
++#  ifndef strrchr
++#    define strrchr rindex
++#  endif
++#endif
++
++char*
++basename (path)
++     char *path;
++{
++  /* Search for the last directory separator in PATH.  */
++  char *basename = strrchr (path, '/');
++  
++  /* If found, return the address of the following character,
++     or the start of the parameter passed in.  */
++  return basename ? ++basename : (char*)path;
++}
++
+--- metamail-2.7.orig/replace/Makefile.in
++++ metamail-2.7/replace/Makefile.in
+@@ -0,0 +1,343 @@
++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
++
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++
++SHELL = @SHELL@
++
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
++
++DESTDIR =
++
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++
++top_builddir = ..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
++INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++transform = @program_transform_name@
++
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++host_alias = @host_alias@
++host_triplet = @host@
++AS = @AS@
++CATCOMMAND = @CATCOMMAND@
++CC = @CC@
++DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
++EXEEXT = @EXEEXT@
++LIBTOOL = @LIBTOOL@
++LIBTOOL_DEPS = @LIBTOOL_DEPS@
++LN_S = @LN_S@
++LPRCOMMAND = @LPRCOMMAND@
++LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAKEINFO = @MAKEINFO@
++OBJDUMP = @OBJDUMP@
++OBJEXT = @OBJEXT@
++PACKAGE = @PACKAGE@
++RANLIB = @RANLIB@
++STRIP = @STRIP@
++VERSION = @VERSION@
++ac_aux_dir = @ac_aux_dir@
++
++MAINTAINERCLEANFILES = Makefile.in
++
++INCLUDES = -I$(top_builddir) -I$(top_srcdir)
++
++noinst_LTLIBRARIES = libreplace.la
++libreplace_la_SOURCES = 
++libreplace_la_LIBADD = @LTLIBOBJS@
++mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
++CONFIG_HEADER = ../metamail/config.h
++CONFIG_CLEAN_FILES = 
++LTLIBRARIES =  $(noinst_LTLIBRARIES)
++
++
++DEFS = @DEFS@ -I. -I$(srcdir) -I../metamail
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++libreplace_la_LDFLAGS = 
++libreplace_la_DEPENDENCIES =  @LTLIBOBJS@
++libreplace_la_OBJECTS = 
++CFLAGS = @CFLAGS@
++COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
++DIST_COMMON =  Makefile.am Makefile.in basename.c putenv.c strerror.c \
++vfprintf.c
++
++
++DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
++
++TAR = tar
++GZIP_ENV = --best
++DEP_FILES =  .deps/basename.P .deps/putenv.P .deps/strerror.P \
++.deps/vfprintf.P
++SOURCES = $(libreplace_la_SOURCES)
++OBJECTS = $(libreplace_la_OBJECTS)
++
++all: all-redirect
++.SUFFIXES:
++.SUFFIXES: .S .c .lo .o .obj .s
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
++	cd $(top_srcdir) && $(AUTOMAKE) --foreign replace/Makefile
++
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
++	cd $(top_builddir) \
++	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
++
++
++mostlyclean-noinstLTLIBRARIES:
++
++clean-noinstLTLIBRARIES:
++	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
++
++distclean-noinstLTLIBRARIES:
++
++maintainer-clean-noinstLTLIBRARIES:
++
++# FIXME: We should only use cygpath when building on Windows,
++# and only if it is available.
++.c.obj:
++	$(COMPILE) -c `cygpath -w $<`
++
++.s.o:
++	$(COMPILE) -c $<
++
++.S.o:
++	$(COMPILE) -c $<
++
++mostlyclean-compile:
++	-rm -f *.o core *.core
++	-rm -f *.$(OBJEXT)
++
++clean-compile:
++
++distclean-compile:
++	-rm -f *.tab.c
++
++maintainer-clean-compile:
++
++.s.lo:
++	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++
++.S.lo:
++	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++
++mostlyclean-libtool:
++	-rm -f *.lo
++
++clean-libtool:
++	-rm -rf .libs _libs
++
++distclean-libtool:
++
++maintainer-clean-libtool:
++
++libreplace.la: $(libreplace_la_OBJECTS) $(libreplace_la_DEPENDENCIES)
++	$(LINK)  $(libreplace_la_LDFLAGS) $(libreplace_la_OBJECTS) $(libreplace_la_LIBADD) $(LIBS)
++
++tags: TAGS
++
++ID: $(HEADERS) $(SOURCES) $(LISP)
++	list='$(SOURCES) $(HEADERS)'; \
++	unique=`for i in $$list; do echo $$i; done | \
++	  awk '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	here=`pwd` && cd $(srcdir) \
++	  && mkid -f$$here/ID $$unique $(LISP)
++
++TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
++	tags=; \
++	here=`pwd`; \
++	list='$(SOURCES) $(HEADERS)'; \
++	unique=`for i in $$list; do echo $$i; done | \
++	  awk '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
++	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
++
++mostlyclean-tags:
++
++clean-tags:
++
++distclean-tags:
++	-rm -f TAGS ID
++
++maintainer-clean-tags:
++
++distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
++
++subdir = replace
++
++distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign replace/Makefile
++	@for file in $(DISTFILES); do \
++	  d=$(srcdir); \
++	  if test -d $$d/$$file; then \
++	    cp -pr $$d/$$file $(distdir)/$$file; \
++	  else \
++	    test -f $(distdir)/$$file \
++	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
++	    || cp -p $$d/$$file $(distdir)/$$file || :; \
++	  fi; \
++	done
++
++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
++
++-include $(DEP_FILES)
++
++mostlyclean-depend:
++
++clean-depend:
++
++distclean-depend:
++	-rm -rf .deps
++
++maintainer-clean-depend:
++
++%.o: %.c
++	@echo '$(COMPILE) -c $<'; \
++	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
++
++%.lo: %.c
++	@echo '$(LTCOMPILE) -c $<'; \
++	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
++	  < .deps/$(*F).pp > .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm -f .deps/$(*F).pp
++info-am:
++info: info-am
++dvi-am:
++dvi: dvi-am
++check-am: all-am
++check: check-am
++installcheck-am:
++installcheck: installcheck-am
++install-exec-am:
++install-exec: install-exec-am
++
++install-data-am:
++install-data: install-data-am
++
++install-am: all-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++install: install-am
++uninstall-am:
++uninstall: uninstall-am
++all-am: Makefile $(LTLIBRARIES)
++all-redirect: all-am
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
++installdirs:
++
++
++mostlyclean-generic:
++
++clean-generic:
++
++distclean-generic:
++	-rm -f Makefile $(CONFIG_CLEAN_FILES)
++	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
++
++maintainer-clean-generic:
++	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
++mostlyclean-am:  mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
++		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
++		mostlyclean-generic
++
++mostlyclean: mostlyclean-am
++
++clean-am:  clean-noinstLTLIBRARIES clean-compile clean-libtool \
++		clean-tags clean-depend clean-generic mostlyclean-am
++
++clean: clean-am
++
++distclean-am:  distclean-noinstLTLIBRARIES distclean-compile \
++		distclean-libtool distclean-tags distclean-depend \
++		distclean-generic clean-am
++	-rm -f libtool
++
++distclean: distclean-am
++
++maintainer-clean-am:  maintainer-clean-noinstLTLIBRARIES \
++		maintainer-clean-compile maintainer-clean-libtool \
++		maintainer-clean-tags maintainer-clean-depend \
++		maintainer-clean-generic distclean-am
++	@echo "This command is intended for maintainers to use;"
++	@echo "it deletes files that may require special tools to rebuild."
++
++maintainer-clean: maintainer-clean-am
++
++.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
++clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
++mostlyclean-compile distclean-compile clean-compile \
++maintainer-clean-compile mostlyclean-libtool distclean-libtool \
++clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
++distclean-tags clean-tags maintainer-clean-tags distdir \
++mostlyclean-depend distclean-depend clean-depend \
++maintainer-clean-depend info-am info dvi-am dvi check check-am \
++installcheck-am installcheck install-exec-am install-exec \
++install-data-am install-data install-am install uninstall-am uninstall \
++all-redirect all-am all installdirs mostlyclean-generic \
++distclean-generic clean-generic maintainer-clean-generic clean \
++mostlyclean distclean maintainer-clean
++
++
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
+--- metamail-2.7.orig/replace/strerror.c
++++ metamail-2.7/replace/strerror.c
+@@ -0,0 +1,610 @@
++/* strerror.c -- implement strerror() for architectures without it
++   Written by Fred Fish.  fnf@cygnus.com
++   This file is in the public domain.  --Per Bothner.
++*/
++
++#if HAVE_CONFIG_H
++#  include <config.h>
++#endif
++
++#ifdef HAVE_SYS_ERRLIST
++/* Note that errno.h (not sure what OS) or stdio.h (BSD 4.4, at least)
++   might declare sys_errlist in a way that the compiler might consider
++   incompatible with our later declaration, perhaps by using const
++   attributes.  So we hide the declaration in errno.h (if any) using a
++   macro. */
++#define sys_errlist no_such_symbol
++#endif
++
++#include <stdio.h>
++
++#if HAVE_ERRNO_H
++#  include <errno.h>
++#endif
++
++#ifdef HAVE_SYS_ERRLIST
++#  undef sys_errlist
++#endif
++
++/*  Routines imported from standard C runtime libraries. */
++
++#ifdef __STDC__
++#include <stddef.h>
++extern void *malloc (size_t size);				/* 4.10.3.3 */
++extern void *memset (void *s, int c, size_t n);			/* 4.11.6.1 */
++#else	/* !__STDC__ */
++extern char *malloc ();		/* Standard memory allocater */
++extern char *memset ();
++#endif	/* __STDC__ */
++
++#ifndef MAX
++#  define MAX(a,b) ((a) > (b) ? (a) : (b))
++#endif
++
++/* Translation table for errno values.  See intro(2) in most UNIX systems
++   Programmers Reference Manuals.
++
++   Note that this table is generally only accessed when it is used at runtime
++   to initialize errno name and message tables that are indexed by errno
++   value.
++
++   Not all of these errnos will exist on all systems.  This table is the only
++   thing that should have to be updated as new error numbers are introduced.
++   It's sort of ugly, but at least its portable. */
++
++struct error_info
++{
++  int value;		/* The numeric value from <errno.h> */
++  const char *name;	/* The equivalent symbolic value */
++#ifndef HAVE_SYS_ERRLIST
++  const char *msg;	/* Short message about this value */
++#endif
++};
++
++#ifndef HAVE_SYS_ERRLIST
++#   define ENTRY(value, name, msg)	{value, name, msg}
++#else
++#   define ENTRY(value, name, msg)	{value, name}
++#endif
++
++static const struct error_info error_table[] =
++{
++#if defined (EPERM)
++  ENTRY(EPERM, "EPERM", "Not owner"),
++#endif
++#if defined (ENOENT)
++  ENTRY(ENOENT, "ENOENT", "No such file or directory"),
++#endif
++#if defined (ESRCH)
++  ENTRY(ESRCH, "ESRCH", "No such process"),
++#endif
++#if defined (EINTR)
++  ENTRY(EINTR, "EINTR", "Interrupted system call"),
++#endif
++#if defined (EIO)
++  ENTRY(EIO, "EIO", "I/O error"),
++#endif
++#if defined (ENXIO)
++  ENTRY(ENXIO, "ENXIO", "No such device or address"),
++#endif
++#if defined (E2BIG)
++  ENTRY(E2BIG, "E2BIG", "Arg list too long"),
++#endif
++#if defined (ENOEXEC)
++  ENTRY(ENOEXEC, "ENOEXEC", "Exec format error"),
++#endif
++#if defined (EBADF)
++  ENTRY(EBADF, "EBADF", "Bad file number"),
++#endif
++#if defined (ECHILD)
++  ENTRY(ECHILD, "ECHILD", "No child processes"),
++#endif
++#if defined (EWOULDBLOCK)	/* Put before EAGAIN, sometimes aliased */
++  ENTRY(EWOULDBLOCK, "EWOULDBLOCK", "Operation would block"),
++#endif
++#if defined (EAGAIN)
++  ENTRY(EAGAIN, "EAGAIN", "No more processes"),
++#endif
++#if defined (ENOMEM)
++  ENTRY(ENOMEM, "ENOMEM", "Not enough space"),
++#endif
++#if defined (EACCES)
++  ENTRY(EACCES, "EACCES", "Permission denied"),
++#endif
++#if defined (EFAULT)
++  ENTRY(EFAULT, "EFAULT", "Bad address"),
++#endif
++#if defined (ENOTBLK)
++  ENTRY(ENOTBLK, "ENOTBLK", "Block device required"),
++#endif
++#if defined (EBUSY)
++  ENTRY(EBUSY, "EBUSY", "Device busy"),
++#endif
++#if defined (EEXIST)
++  ENTRY(EEXIST, "EEXIST", "File exists"),
++#endif
++#if defined (EXDEV)
++  ENTRY(EXDEV, "EXDEV", "Cross-device link"),
++#endif
++#if defined (ENODEV)
++  ENTRY(ENODEV, "ENODEV", "No such device"),
++#endif
++#if defined (ENOTDIR)
++  ENTRY(ENOTDIR, "ENOTDIR", "Not a directory"),
++#endif
++#if defined (EISDIR)
++  ENTRY(EISDIR, "EISDIR", "Is a directory"),
++#endif
++#if defined (EINVAL)
++  ENTRY(EINVAL, "EINVAL", "Invalid argument"),
++#endif
++#if defined (ENFILE)
++  ENTRY(ENFILE, "ENFILE", "File table overflow"),
++#endif
++#if defined (EMFILE)
++  ENTRY(EMFILE, "EMFILE", "Too many open files"),
++#endif
++#if defined (ENOTTY)
++  ENTRY(ENOTTY, "ENOTTY", "Not a typewriter"),
++#endif
++#if defined (ETXTBSY)
++  ENTRY(ETXTBSY, "ETXTBSY", "Text file busy"),
++#endif
++#if defined (EFBIG)
++  ENTRY(EFBIG, "EFBIG", "File too large"),
++#endif
++#if defined (ENOSPC)
++  ENTRY(ENOSPC, "ENOSPC", "No space left on device"),
++#endif
++#if defined (ESPIPE)
++  ENTRY(ESPIPE, "ESPIPE", "Illegal seek"),
++#endif
++#if defined (EROFS)
++  ENTRY(EROFS, "EROFS", "Read-only file system"),
++#endif
++#if defined (EMLINK)
++  ENTRY(EMLINK, "EMLINK", "Too many links"),
++#endif
++#if defined (EPIPE)
++  ENTRY(EPIPE, "EPIPE", "Broken pipe"),
++#endif
++#if defined (EDOM)
++  ENTRY(EDOM, "EDOM", "Math argument out of domain of func"),
++#endif
++#if defined (ERANGE)
++  ENTRY(ERANGE, "ERANGE", "Math result not representable"),
++#endif
++#if defined (ENOMSG)
++  ENTRY(ENOMSG, "ENOMSG", "No message of desired type"),
++#endif
++#if defined (EIDRM)
++  ENTRY(EIDRM, "EIDRM", "Identifier removed"),
++#endif
++#if defined (ECHRNG)
++  ENTRY(ECHRNG, "ECHRNG", "Channel number out of range"),
++#endif
++#if defined (EL2NSYNC)
++  ENTRY(EL2NSYNC, "EL2NSYNC", "Level 2 not synchronized"),
++#endif
++#if defined (EL3HLT)
++  ENTRY(EL3HLT, "EL3HLT", "Level 3 halted"),
++#endif
++#if defined (EL3RST)
++  ENTRY(EL3RST, "EL3RST", "Level 3 reset"),
++#endif
++#if defined (ELNRNG)
++  ENTRY(ELNRNG, "ELNRNG", "Link number out of range"),
++#endif
++#if defined (EUNATCH)
++  ENTRY(EUNATCH, "EUNATCH", "Protocol driver not attached"),
++#endif
++#if defined (ENOCSI)
++  ENTRY(ENOCSI, "ENOCSI", "No CSI structure available"),
++#endif
++#if defined (EL2HLT)
++  ENTRY(EL2HLT, "EL2HLT", "Level 2 halted"),
++#endif
++#if defined (EDEADLK)
++  ENTRY(EDEADLK, "EDEADLK", "Deadlock condition"),
++#endif
++#if defined (ENOLCK)
++  ENTRY(ENOLCK, "ENOLCK", "No record locks available"),
++#endif
++#if defined (EBADE)
++  ENTRY(EBADE, "EBADE", "Invalid exchange"),
++#endif
++#if defined (EBADR)
++  ENTRY(EBADR, "EBADR", "Invalid request descriptor"),
++#endif
++#if defined (EXFULL)
++  ENTRY(EXFULL, "EXFULL", "Exchange full"),
++#endif
++#if defined (ENOANO)
++  ENTRY(ENOANO, "ENOANO", "No anode"),
++#endif
++#if defined (EBADRQC)
++  ENTRY(EBADRQC, "EBADRQC", "Invalid request code"),
++#endif
++#if defined (EBADSLT)
++  ENTRY(EBADSLT, "EBADSLT", "Invalid slot"),
++#endif
++#if defined (EDEADLOCK)
++  ENTRY(EDEADLOCK, "EDEADLOCK", "File locking deadlock error"),
++#endif
++#if defined (EBFONT)
++  ENTRY(EBFONT, "EBFONT", "Bad font file format"),
++#endif
++#if defined (ENOSTR)
++  ENTRY(ENOSTR, "ENOSTR", "Device not a stream"),
++#endif
++#if defined (ENODATA)
++  ENTRY(ENODATA, "ENODATA", "No data available"),
++#endif
++#if defined (ETIME)
++  ENTRY(ETIME, "ETIME", "Timer expired"),
++#endif
++#if defined (ENOSR)
++  ENTRY(ENOSR, "ENOSR", "Out of streams resources"),
++#endif
++#if defined (ENONET)
++  ENTRY(ENONET, "ENONET", "Machine is not on the network"),
++#endif
++#if defined (ENOPKG)
++  ENTRY(ENOPKG, "ENOPKG", "Package not installed"),
++#endif
++#if defined (EREMOTE)
++  ENTRY(EREMOTE, "EREMOTE", "Object is remote"),
++#endif
++#if defined (ENOLINK)
++  ENTRY(ENOLINK, "ENOLINK", "Link has been severed"),
++#endif
++#if defined (EADV)
++  ENTRY(EADV, "EADV", "Advertise error"),
++#endif
++#if defined (ESRMNT)
++  ENTRY(ESRMNT, "ESRMNT", "Srmount error"),
++#endif
++#if defined (ECOMM)
++  ENTRY(ECOMM, "ECOMM", "Communication error on send"),
++#endif
++#if defined (EPROTO)
++  ENTRY(EPROTO, "EPROTO", "Protocol error"),
++#endif
++#if defined (EMULTIHOP)
++  ENTRY(EMULTIHOP, "EMULTIHOP", "Multihop attempted"),
++#endif
++#if defined (EDOTDOT)
++  ENTRY(EDOTDOT, "EDOTDOT", "RFS specific error"),
++#endif
++#if defined (EBADMSG)
++  ENTRY(EBADMSG, "EBADMSG", "Not a data message"),
++#endif
++#if defined (ENAMETOOLONG)
++  ENTRY(ENAMETOOLONG, "ENAMETOOLONG", "File name too long"),
++#endif
++#if defined (EOVERFLOW)
++  ENTRY(EOVERFLOW, "EOVERFLOW", "Value too large for defined data type"),
++#endif
++#if defined (ENOTUNIQ)
++  ENTRY(ENOTUNIQ, "ENOTUNIQ", "Name not unique on network"),
++#endif
++#if defined (EBADFD)
++  ENTRY(EBADFD, "EBADFD", "File descriptor in bad state"),
++#endif
++#if defined (EREMCHG)
++  ENTRY(EREMCHG, "EREMCHG", "Remote address changed"),
++#endif
++#if defined (ELIBACC)
++  ENTRY(ELIBACC, "ELIBACC", "Can not access a needed shared library"),
++#endif
++#if defined (ELIBBAD)
++  ENTRY(ELIBBAD, "ELIBBAD", "Accessing a corrupted shared library"),
++#endif
++#if defined (ELIBSCN)
++  ENTRY(ELIBSCN, "ELIBSCN", ".lib section in a.out corrupted"),
++#endif
++#if defined (ELIBMAX)
++  ENTRY(ELIBMAX, "ELIBMAX", "Attempting to link in too many shared libraries"),
++#endif
++#if defined (ELIBEXEC)
++  ENTRY(ELIBEXEC, "ELIBEXEC", "Cannot exec a shared library directly"),
++#endif
++#if defined (EILSEQ)
++  ENTRY(EILSEQ, "EILSEQ", "Illegal byte sequence"),
++#endif
++#if defined (ENOSYS)
++  ENTRY(ENOSYS, "ENOSYS", "Operation not applicable"),
++#endif
++#if defined (ELOOP)
++  ENTRY(ELOOP, "ELOOP", "Too many symbolic links encountered"),
++#endif
++#if defined (ERESTART)
++  ENTRY(ERESTART, "ERESTART", "Interrupted system call should be restarted"),
++#endif
++#if defined (ESTRPIPE)
++  ENTRY(ESTRPIPE, "ESTRPIPE", "Streams pipe error"),
++#endif
++#if defined (ENOTEMPTY)
++  ENTRY(ENOTEMPTY, "ENOTEMPTY", "Directory not empty"),
++#endif
++#if defined (EUSERS)
++  ENTRY(EUSERS, "EUSERS", "Too many users"),
++#endif
++#if defined (ENOTSOCK)
++  ENTRY(ENOTSOCK, "ENOTSOCK", "Socket operation on non-socket"),
++#endif
++#if defined (EDESTADDRREQ)
++  ENTRY(EDESTADDRREQ, "EDESTADDRREQ", "Destination address required"),
++#endif
++#if defined (EMSGSIZE)
++  ENTRY(EMSGSIZE, "EMSGSIZE", "Message too long"),
++#endif
++#if defined (EPROTOTYPE)
++  ENTRY(EPROTOTYPE, "EPROTOTYPE", "Protocol wrong type for socket"),
++#endif
++#if defined (ENOPROTOOPT)
++  ENTRY(ENOPROTOOPT, "ENOPROTOOPT", "Protocol not available"),
++#endif
++#if defined (EPROTONOSUPPORT)
++  ENTRY(EPROTONOSUPPORT, "EPROTONOSUPPORT", "Protocol not supported"),
++#endif
++#if defined (ESOCKTNOSUPPORT)
++  ENTRY(ESOCKTNOSUPPORT, "ESOCKTNOSUPPORT", "Socket type not supported"),
++#endif
++#if defined (EOPNOTSUPP)
++  ENTRY(EOPNOTSUPP, "EOPNOTSUPP", "Operation not supported on transport endpoint"),
++#endif
++#if defined (EPFNOSUPPORT)
++  ENTRY(EPFNOSUPPORT, "EPFNOSUPPORT", "Protocol family not supported"),
++#endif
++#if defined (EAFNOSUPPORT)
++  ENTRY(EAFNOSUPPORT, "EAFNOSUPPORT", "Address family not supported by protocol"),
++#endif
++#if defined (EADDRINUSE)
++  ENTRY(EADDRINUSE, "EADDRINUSE", "Address already in use"),
++#endif
++#if defined (EADDRNOTAVAIL)
++  ENTRY(EADDRNOTAVAIL, "EADDRNOTAVAIL","Cannot assign requested address"),
++#endif
++#if defined (ENETDOWN)
++  ENTRY(ENETDOWN, "ENETDOWN", "Network is down"),
++#endif
++#if defined (ENETUNREACH)
++  ENTRY(ENETUNREACH, "ENETUNREACH", "Network is unreachable"),
++#endif
++#if defined (ENETRESET)
++  ENTRY(ENETRESET, "ENETRESET", "Network dropped connection because of reset"),
++#endif
++#if defined (ECONNABORTED)
++  ENTRY(ECONNABORTED, "ECONNABORTED", "Software caused connection abort"),
++#endif
++#if defined (ECONNRESET)
++  ENTRY(ECONNRESET, "ECONNRESET", "Connection reset by peer"),
++#endif
++#if defined (ENOBUFS)
++  ENTRY(ENOBUFS, "ENOBUFS", "No buffer space available"),
++#endif
++#if defined (EISCONN)
++  ENTRY(EISCONN, "EISCONN", "Transport endpoint is already connected"),
++#endif
++#if defined (ENOTCONN)
++  ENTRY(ENOTCONN, "ENOTCONN", "Transport endpoint is not connected"),
++#endif
++#if defined (ESHUTDOWN)
++  ENTRY(ESHUTDOWN, "ESHUTDOWN", "Cannot send after transport endpoint shutdown"),
++#endif
++#if defined (ETOOMANYREFS)
++  ENTRY(ETOOMANYREFS, "ETOOMANYREFS", "Too many references: cannot splice"),
++#endif
++#if defined (ETIMEDOUT)
++  ENTRY(ETIMEDOUT, "ETIMEDOUT", "Connection timed out"),
++#endif
++#if defined (ECONNREFUSED)
++  ENTRY(ECONNREFUSED, "ECONNREFUSED", "Connection refused"),
++#endif
++#if defined (EHOSTDOWN)
++  ENTRY(EHOSTDOWN, "EHOSTDOWN", "Host is down"),
++#endif
++#if defined (EHOSTUNREACH)
++  ENTRY(EHOSTUNREACH, "EHOSTUNREACH", "No route to host"),
++#endif
++#if defined (EALREADY)
++  ENTRY(EALREADY, "EALREADY", "Operation already in progress"),
++#endif
++#if defined (EINPROGRESS)
++  ENTRY(EINPROGRESS, "EINPROGRESS", "Operation now in progress"),
++#endif
++#if defined (ESTALE)
++  ENTRY(ESTALE, "ESTALE", "Stale NFS file handle"),
++#endif
++#if defined (EUCLEAN)
++  ENTRY(EUCLEAN, "EUCLEAN", "Structure needs cleaning"),
++#endif
++#if defined (ENOTNAM)
++  ENTRY(ENOTNAM, "ENOTNAM", "Not a XENIX named type file"),
++#endif
++#if defined (ENAVAIL)
++  ENTRY(ENAVAIL, "ENAVAIL", "No XENIX semaphores available"),
++#endif
++#if defined (EISNAM)
++  ENTRY(EISNAM, "EISNAM", "Is a named type file"),
++#endif
++#if defined (EREMOTEIO)
++  ENTRY(EREMOTEIO, "EREMOTEIO", "Remote I/O error"),
++#endif
++  ENTRY(0, NULL, NULL)
++};
++
++#ifdef EVMSERR
++/* This is not in the table, because the numeric value of EVMSERR (32767)
++   lies outside the range of sys_errlist[].  */
++static struct { int value; const char *name, *msg; }
++  evmserr = { EVMSERR, "EVMSERR", "VMS-specific error" };
++#endif
++
++/* Translation table allocated and initialized at runtime.  Indexed by the
++   errno value to find the equivalent symbolic value. */
++
++static const char **error_names;
++static int num_error_names = 0;
++
++/* Translation table allocated and initialized at runtime, if it does not
++   already exist in the host environment.  Indexed by the errno value to find
++   the descriptive string.
++
++   We don't export it for use in other modules because even though it has the
++   same name, it differs from other implementations in that it is dynamically
++   initialized rather than statically initialized. */
++
++#ifndef HAVE_SYS_ERRLIST
++
++static int sys_nerr;
++static const char **sys_errlist;
++
++#else
++
++extern int sys_nerr;
++extern char *sys_errlist[];
++
++#endif
++
++
++#ifndef HAVE_SYS_ERRLIST
++/*
++
++NAME
++
++	init_error_tables -- initialize the name and message tables
++
++SYNOPSIS
++
++	static void init_error_tables ();
++
++DESCRIPTION
++
++	Using the error_table, which is initialized at compile time, generate
++	the error_names and the sys_errlist (if needed) tables, which are
++	indexed at runtime by a specific errno value.
++
++BUGS
++
++	The initialization of the tables may fail under low memory conditions,
++	in which case we don't do anything particularly useful, but we don't
++	bomb either.  Who knows, it might succeed at a later point if we free
++	some memory in the meantime.  In any case, the other routines know
++	how to deal with lack of a table after trying to initialize it.  This
++	may or may not be considered to be a bug, that we don't specifically
++	warn about this particular failure mode.
++
++*/
++
++static void
++init_error_tables ()
++{
++  const struct error_info *eip;
++  int nbytes;
++
++  /* If we haven't already scanned the error_table once to find the maximum
++     errno value, then go find it now. */
++
++  if (num_error_names == 0)
++    {
++      for (eip = error_table; eip -> name != NULL; eip++)
++	{
++	  if (eip -> value >= num_error_names)
++	    {
++	      num_error_names = eip -> value + 1;
++	    }
++	}
++    }
++
++  /* Now attempt to allocate the sys_errlist table, zero it out, and then
++     initialize it from the statically initialized error_table. */
++
++  if (sys_errlist == NULL)
++    {
++      nbytes = num_error_names * sizeof (char *);
++      if ((sys_errlist = (const char **) malloc (nbytes)) != NULL)
++	{
++	  memset (sys_errlist, 0, nbytes);
++	  sys_nerr = num_error_names;
++	  for (eip = error_table; eip -> name != NULL; eip++)
++	    {
++	      sys_errlist[eip -> value] = eip -> msg;
++	    }
++	}
++    }
++}
++#endif
++
++
++/*
++
++NAME
++
++	strerror -- map an error number to an error message string
++
++SYNOPSIS
++
++	char *strerror (int errnoval)
++
++DESCRIPTION
++
++	Maps an errno number to an error message string, the contents of
++	which are implementation defined.  On systems which have the external
++	variables sys_nerr and sys_errlist, these strings will be the same
++	as the ones used by perror().
++
++	If the supplied error number is within the valid range of indices
++	for the sys_errlist, but no message is available for the particular
++	error number, then returns the string "Error NUM", where NUM is the
++	error number.
++
++	If the supplied error number is not a valid index into sys_errlist,
++	returns NULL.
++
++	The returned string is only guaranteed to be valid only until the
++	next call to strerror.
++
++*/
++
++char *
++strerror (errnoval)
++  int errnoval;
++{
++  char *msg;
++  static char buf[32];
++
++#ifndef HAVE_SYS_ERRLIST
++
++  if (error_names == NULL)
++    {
++      init_error_tables ();
++    }
++
++#endif
++
++  if ((errnoval < 0) || (errnoval >= sys_nerr))
++    {
++#ifdef EVMSERR
++      if (errnoval == evmserr.value)
++	msg = evmserr.msg;
++      else
++#endif
++      /* Out of range, just return NULL */
++      msg = NULL;
++    }
++  else if ((sys_errlist == NULL) || (sys_errlist[errnoval] == NULL))
++    {
++      /* In range, but no sys_errlist or no entry at this index. */
++      sprintf (buf, "Error %d", errnoval);
++      msg = buf;
++    }
++  else
++    {
++      /* In range, and a valid message.  Just return the message. */
++      msg = (char *) sys_errlist[errnoval];
++    }
++  
++  return (msg);
++}
+--- metamail-2.7.orig/replace/vfprintf.c
++++ metamail-2.7/replace/vfprintf.c
+@@ -0,0 +1,43 @@
++/* vfprintf.c -- implement vfprintf() for architectures without it
++   Copyright (C) 2000 Gary V. Vaughan
++  
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2, or (at your option)
++   any later version.
++  
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++  
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++*/
++
++#if HAVE_CONFIG_H
++#  include <config.h>
++#endif
++
++#include <stdio.h>
++
++#if HAVE_STDARG_H && !HAVE_VARARGS_H
++#  include <stdarg.h>
++#else /*!HAVE_STDARG_H || HAVE_VARARGS_H*/
++#  include <varargs.h>
++#endif /*HAVE_STDARG_H && !HAVE_VARARGS_H*/
++
++/* Some systems define this! */
++#undef vfprintf
++
++extern int _doprnt ();
++
++int
++vfprintf (file, format, ap)
++     FILE *file;
++     const char *format;
++     va_list ap;
++{
++   return _doprnt (format, ap, file);
++}
+--- metamail-2.7.orig/COPYING
++++ metamail-2.7/COPYING
+@@ -0,0 +1,340 @@
++		    GNU GENERAL PUBLIC LICENSE
++		       Version 2, June 1991
++
++ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
++     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ Everyone is permitted to copy and distribute verbatim copies
++ of this license document, but changing it is not allowed.
++
++			    Preamble
++
++  The licenses for most software are designed to take away your
++freedom to share and change it.  By contrast, the GNU General Public
++License is intended to guarantee your freedom to share and change free
++software--to make sure the software is free for all its users.  This
++General Public License applies to most of the Free Software
++Foundation's software and to any other program whose authors commit to
++using it.  (Some other Free Software Foundation software is covered by
++the GNU Library General Public License instead.)  You can apply it to
++your programs, too.
++
++  When we speak of free software, we are referring to freedom, not
++price.  Our General Public Licenses are designed to make sure that you
++have the freedom to distribute copies of free software (and charge for
++this service if you wish), that you receive source code or can get it
++if you want it, that you can change the software or use pieces of it
++in new free programs; and that you know you can do these things.
++
++  To protect your rights, we need to make restrictions that forbid
++anyone to deny you these rights or to ask you to surrender the rights.
++These restrictions translate to certain responsibilities for you if you
++distribute copies of the software, or if you modify it.
++
++  For example, if you distribute copies of such a program, whether
++gratis or for a fee, you must give the recipients all the rights that
++you have.  You must make sure that they, too, receive or can get the
++source code.  And you must show them these terms so they know their
++rights.
++
++  We protect your rights with two steps: (1) copyright the software, and
++(2) offer you this license which gives you legal permission to copy,
++distribute and/or modify the software.
++
++  Also, for each author's protection and ours, we want to make certain
++that everyone understands that there is no warranty for this free
++software.  If the software is modified by someone else and passed on, we
++want its recipients to know that what they have is not the original, so
++that any problems introduced by others will not reflect on the original
++authors' reputations.
++
++  Finally, any free program is threatened constantly by software
++patents.  We wish to avoid the danger that redistributors of a free
++program will individually obtain patent licenses, in effect making the
++program proprietary.  To prevent this, we have made it clear that any
++patent must be licensed for everyone's free use or not licensed at all.
++
++  The precise terms and conditions for copying, distribution and
++modification follow.
++
++		    GNU GENERAL PUBLIC LICENSE
++   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
++
++  0. This License applies to any program or other work which contains
++a notice placed by the copyright holder saying it may be distributed
++under the terms of this General Public License.  The "Program", below,
++refers to any such program or work, and a "work based on the Program"
++means either the Program or any derivative work under copyright law:
++that is to say, a work containing the Program or a portion of it,
++either verbatim or with modifications and/or translated into another
++language.  (Hereinafter, translation is included without limitation in
++the term "modification".)  Each licensee is addressed as "you".
++
++Activities other than copying, distribution and modification are not
++covered by this License; they are outside its scope.  The act of
++running the Program is not restricted, and the output from the Program
++is covered only if its contents constitute a work based on the
++Program (independent of having been made by running the Program).
++Whether that is true depends on what the Program does.
++
++  1. You may copy and distribute verbatim copies of the Program's
++source code as you receive it, in any medium, provided that you
++conspicuously and appropriately publish on each copy an appropriate
++copyright notice and disclaimer of warranty; keep intact all the
++notices that refer to this License and to the absence of any warranty;
++and give any other recipients of the Program a copy of this License
++along with the Program.
++
++You may charge a fee for the physical act of transferring a copy, and
++you may at your option offer warranty protection in exchange for a fee.
++
++  2. You may modify your copy or copies of the Program or any portion
++of it, thus forming a work based on the Program, and copy and
++distribute such modifications or work under the terms of Section 1
++above, provided that you also meet all of these conditions:
++
++    a) You must cause the modified files to carry prominent notices
++    stating that you changed the files and the date of any change.
++
++    b) You must cause any work that you distribute or publish, that in
++    whole or in part contains or is derived from the Program or any
++    part thereof, to be licensed as a whole at no charge to all third
++    parties under the terms of this License.
++
++    c) If the modified program normally reads commands interactively
++    when run, you must cause it, when started running for such
++    interactive use in the most ordinary way, to print or display an
++    announcement including an appropriate copyright notice and a
++    notice that there is no warranty (or else, saying that you provide
++    a warranty) and that users may redistribute the program under
++    these conditions, and telling the user how to view a copy of this
++    License.  (Exception: if the Program itself is interactive but
++    does not normally print such an announcement, your work based on
++    the Program is not required to print an announcement.)
++
++These requirements apply to the modified work as a whole.  If
++identifiable sections of that work are not derived from the Program,
++and can be reasonably considered independent and separate works in
++themselves, then this License, and its terms, do not apply to those
++sections when you distribute them as separate works.  But when you
++distribute the same sections as part of a whole which is a work based
++on the Program, the distribution of the whole must be on the terms of
++this License, whose permissions for other licensees extend to the
++entire whole, and thus to each and every part regardless of who wrote it.
++
++Thus, it is not the intent of this section to claim rights or contest
++your rights to work written entirely by you; rather, the intent is to
++exercise the right to control the distribution of derivative or
++collective works based on the Program.
++
++In addition, mere aggregation of another work not based on the Program
++with the Program (or with a work based on the Program) on a volume of
++a storage or distribution medium does not bring the other work under
++the scope of this License.
++
++  3. You may copy and distribute the Program (or a work based on it,
++under Section 2) in object code or executable form under the terms of
++Sections 1 and 2 above provided that you also do one of the following:
++
++    a) Accompany it with the complete corresponding machine-readable
++    source code, which must be distributed under the terms of Sections
++    1 and 2 above on a medium customarily used for software interchange; or,
++
++    b) Accompany it with a written offer, valid for at least three
++    years, to give any third party, for a charge no more than your
++    cost of physically performing source distribution, a complete
++    machine-readable copy of the corresponding source code, to be
++    distributed under the terms of Sections 1 and 2 above on a medium
++    customarily used for software interchange; or,
++
++    c) Accompany it with the information you received as to the offer
++    to distribute corresponding source code.  (This alternative is
++    allowed only for noncommercial distribution and only if you
++    received the program in object code or executable form with such
++    an offer, in accord with Subsection b above.)
++
++The source code for a work means the preferred form of the work for
++making modifications to it.  For an executable work, complete source
++code means all the source code for all modules it contains, plus any
++associated interface definition files, plus the scripts used to
++control compilation and installation of the executable.  However, as a
++special exception, the source code distributed need not include
++anything that is normally distributed (in either source or binary
++form) with the major components (compiler, kernel, and so on) of the
++operating system on which the executable runs, unless that component
++itself accompanies the executable.
++
++If distribution of executable or object code is made by offering
++access to copy from a designated place, then offering equivalent
++access to copy the source code from the same place counts as
++distribution of the source code, even though third parties are not
++compelled to copy the source along with the object code.
++
++  4. You may not copy, modify, sublicense, or distribute the Program
++except as expressly provided under this License.  Any attempt
++otherwise to copy, modify, sublicense or distribute the Program is
++void, and will automatically terminate your rights under this License.
++However, parties who have received copies, or rights, from you under
++this License will not have their licenses terminated so long as such
++parties remain in full compliance.
++
++  5. You are not required to accept this License, since you have not
++signed it.  However, nothing else grants you permission to modify or
++distribute the Program or its derivative works.  These actions are
++prohibited by law if you do not accept this License.  Therefore, by
++modifying or distributing the Program (or any work based on the
++Program), you indicate your acceptance of this License to do so, and
++all its terms and conditions for copying, distributing or modifying
++the Program or works based on it.
++
++  6. Each time you redistribute the Program (or any work based on the
++Program), the recipient automatically receives a license from the
++original licensor to copy, distribute or modify the Program subject to
++these terms and conditions.  You may not impose any further
++restrictions on the recipients' exercise of the rights granted herein.
++You are not responsible for enforcing compliance by third parties to
++this License.
++
++  7. If, as a consequence of a court judgment or allegation of patent
++infringement or for any other reason (not limited to patent issues),
++conditions are imposed on you (whether by court order, agreement or
++otherwise) that contradict the conditions of this License, they do not
++excuse you from the conditions of this License.  If you cannot
++distribute so as to satisfy simultaneously your obligations under this
++License and any other pertinent obligations, then as a consequence you
++may not distribute the Program at all.  For example, if a patent
++license would not permit royalty-free redistribution of the Program by
++all those who receive copies directly or indirectly through you, then
++the only way you could satisfy both it and this License would be to
++refrain entirely from distribution of the Program.
++
++If any portion of this section is held invalid or unenforceable under
++any particular circumstance, the balance of the section is intended to
++apply and the section as a whole is intended to apply in other
++circumstances.
++
++It is not the purpose of this section to induce you to infringe any
++patents or other property right claims or to contest validity of any
++such claims; this section has the sole purpose of protecting the
++integrity of the free software distribution system, which is
++implemented by public license practices.  Many people have made
++generous contributions to the wide range of software distributed
++through that system in reliance on consistent application of that
++system; it is up to the author/donor to decide if he or she is willing
++to distribute software through any other system and a licensee cannot
++impose that choice.
++
++This section is intended to make thoroughly clear what is believed to
++be a consequence of the rest of this License.
++
++  8. If the distribution and/or use of the Program is restricted in
++certain countries either by patents or by copyrighted interfaces, the
++original copyright holder who places the Program under this License
++may add an explicit geographical distribution limitation excluding
++those countries, so that distribution is permitted only in or among
++countries not thus excluded.  In such case, this License incorporates
++the limitation as if written in the body of this License.
++
++  9. The Free Software Foundation may publish revised and/or new versions
++of the General Public License from time to time.  Such new versions will
++be similar in spirit to the present version, but may differ in detail to
++address new problems or concerns.
++
++Each version is given a distinguishing version number.  If the Program
++specifies a version number of this License which applies to it and "any
++later version", you have the option of following the terms and conditions
++either of that version or of any later version published by the Free
++Software Foundation.  If the Program does not specify a version number of
++this License, you may choose any version ever published by the Free Software
++Foundation.
++
++  10. If you wish to incorporate parts of the Program into other free
++programs whose distribution conditions are different, write to the author
++to ask for permission.  For software which is copyrighted by the Free
++Software Foundation, write to the Free Software Foundation; we sometimes
++make exceptions for this.  Our decision will be guided by the two goals
++of preserving the free status of all derivatives of our free software and
++of promoting the sharing and reuse of software generally.
++
++			    NO WARRANTY
++
++  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
++FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
++OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
++PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
++OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
++MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
++TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
++PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
++REPAIR OR CORRECTION.
++
++  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
++WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
++REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
++INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
++OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
++TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
++YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
++PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
++POSSIBILITY OF SUCH DAMAGES.
++
++		     END OF TERMS AND CONDITIONS
++
++	    How to Apply These Terms to Your New Programs
++
++  If you develop a new program, and you want it to be of the greatest
++possible use to the public, the best way to achieve this is to make it
++free software which everyone can redistribute and change under these terms.
++
++  To do so, attach the following notices to the program.  It is safest
++to attach them to the start of each source file to most effectively
++convey the exclusion of warranty; and each file should have at least
++the "copyright" line and a pointer to where the full notice is found.
++
++    <one line to give the program's name and a brief idea of what it does.>
++    Copyright (C) <year>  <name of author>
++
++    This program is free software; you can redistribute it and/or modify
++    it under the terms of the GNU General Public License as published by
++    the Free Software Foundation; either version 2 of the License, or
++    (at your option) any later version.
++
++    This program is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++    GNU General Public License for more details.
++
++    You should have received a copy of the GNU General Public License
++    along with this program; if not, write to the Free Software
++    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++
++
++Also add information on how to contact you by electronic and paper mail.
++
++If the program is interactive, make it output a short notice like this
++when it starts in an interactive mode:
++
++    Gnomovision version 69, Copyright (C) year  name of author
++    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
++    This is free software, and you are welcome to redistribute it
++    under certain conditions; type `show c' for details.
++
++The hypothetical commands `show w' and `show c' should show the appropriate
++parts of the General Public License.  Of course, the commands you use may
++be called something other than `show w' and `show c'; they could even be
++mouse-clicks or menu items--whatever suits your program.
++
++You should also get your employer (if you work as a programmer) or your
++school, if any, to sign a "copyright disclaimer" for the program, if
++necessary.  Here is a sample; alter the names:
++
++  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
++  `Gnomovision' (which makes passes at compilers) written by James Hacker.
++
++  <signature of Ty Coon>, 1 April 1989
++  Ty Coon, President of Vice
++
++This General Public License does not permit incorporating your program into
++proprietary programs.  If your program is a subroutine library, you may
++consider it more useful to permit linking proprietary applications with the
++library.  If this is what you want to do, use the GNU Library General
++Public License instead of this License.
+--- metamail-2.7.orig/stamp-h.in
++++ metamail-2.7/stamp-h.in
+@@ -0,0 +1 @@
++timestamp
+--- metamail-2.7.orig/configure
++++ metamail-2.7/configure
+@@ -0,0 +1,7333 @@
++#! /bin/sh
++
++# Guess values for system-dependent variables and create Makefiles.
++# Generated automatically using autoconf version 2.13 
++# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
++#
++# This configure script is free software; the Free Software Foundation
++# gives unlimited permission to copy, distribute and modify it.
++
++# Defaults:
++ac_help=
++ac_default_prefix=/usr/local
++# Any additions from configure.in:
++ac_help="$ac_help
++  --enable-maintainer-mode enable make rules and dependencies not useful
++                          (and sometimes confusing) to the casual installer"
++ac_help="$ac_help
++  --enable-shared[=PKGS]  build shared libraries [default=yes]"
++ac_help="$ac_help
++  --enable-static[=PKGS]  build static libraries [default=yes]"
++ac_help="$ac_help
++  --enable-fast-install[=PKGS]  optimize for fast installation [default=yes]"
++ac_help="$ac_help
++  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
++
++# Find the correct PATH separator.  Usually this is `:', but
++# DJGPP uses `;' like DOS.
++if test "X${PATH_SEPARATOR+set}" != Xset; then
++  UNAME=${UNAME-`uname 2>/dev/null`}
++  case X$UNAME in
++    *-DOS) lt_cv_sys_path_separator=';' ;;
++    *)     lt_cv_sys_path_separator=':' ;;
++  esac
++  PATH_SEPARATOR=$lt_cv_sys_path_separator
++fi
++
++
++# Check that we are running under the correct shell.
++SHELL=${CONFIG_SHELL-/bin/sh}
++
++case X$ECHO in
++X*--fallback-echo)
++  # Remove one level of quotation (which was required for Make).
++  ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
++  ;;
++esac
++
++echo=${ECHO-echo}
++if test "X$1" = X--no-reexec; then
++  # Discard the --no-reexec flag, and continue.
++  shift
++elif test "X$1" = X--fallback-echo; then
++  # Avoid inline document here, it may be left over
++  :
++elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
++  # Yippee, $echo works!
++  :
++else
++  # Restart under the correct shell.
++  exec $SHELL "$0" --no-reexec ${1+"$@"}
++fi
++
++if test "X$1" = X--fallback-echo; then
++  # used as fallback echo
++  shift
++  cat <<EOF
++
++EOF
++  exit 0
++fi
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++
++if test -z "$ECHO"; then
++if test "X${echo_test_string+set}" != Xset; then
++# find a string as large as possible, as long as the shell can cope with it
++  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
++    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
++    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
++       echo_test_string="`eval $cmd`" &&
++       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
++    then
++      break
++    fi
++  done
++fi
++
++if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
++   test "X$echo_testing_string" = "X$echo_test_string"; then
++  :
++else
++  # The Solaris, AIX, and Digital Unix default echo programs unquote
++  # backslashes.  This makes it impossible to quote backslashes using
++  #   echo "$something" | sed 's/\\/\\\\/g'
++  #
++  # So, first we look for a working echo in the user's PATH.
++
++  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for dir in $PATH /usr/ucb; do
++    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
++       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
++       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
++       test "X$echo_testing_string" = "X$echo_test_string"; then
++      echo="$dir/echo"
++      break
++    fi
++  done
++  IFS="$save_ifs"
++
++  if test "X$echo" = Xecho; then
++    # We didn't find a better echo, so look for alternatives.
++    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
++       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
++       test "X$echo_testing_string" = "X$echo_test_string"; then
++      # This shell has a builtin print -r that does the trick.
++      echo='print -r'
++    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
++	 test "X$CONFIG_SHELL" != X/bin/ksh; then
++      # If we have ksh, try running configure again with it.
++      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
++      export ORIGINAL_CONFIG_SHELL
++      CONFIG_SHELL=/bin/ksh
++      export CONFIG_SHELL
++      exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
++    else
++      # Try using printf.
++      echo='printf %s\n'
++      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
++	 test "X$echo_testing_string" = "X$echo_test_string"; then
++	# Cool, printf works
++	:
++      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
++	   test "X$echo_testing_string" = 'X\t' &&
++	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	   test "X$echo_testing_string" = "X$echo_test_string"; then
++	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
++	export CONFIG_SHELL
++	SHELL="$CONFIG_SHELL"
++	export SHELL
++	echo="$CONFIG_SHELL $0 --fallback-echo"
++      elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
++	   test "X$echo_testing_string" = 'X\t' &&
++	   echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	   test "X$echo_testing_string" = "X$echo_test_string"; then
++	echo="$CONFIG_SHELL $0 --fallback-echo"
++      else
++	# maybe with a smaller string...
++	prev=:
++
++	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
++	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
++	  then
++	    break
++	  fi
++	  prev="$cmd"
++	done
++
++	if test "$prev" != 'sed 50q "$0"'; then
++	  echo_test_string=`eval $prev`
++	  export echo_test_string
++	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
++	else
++	  # Oops.  We lost completely, so just stick with echo.
++	  echo=echo
++	fi
++      fi
++    fi
++  fi
++fi
++fi
++
++# Copy echo and quote the copy suitably for passing to libtool from
++# the Makefile, instead of quoting the original, which is used later.
++ECHO=$echo
++if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
++   ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
++fi
++
++
++ac_help="$ac_help
++  --disable-libtool-lock  avoid locking (might break parallel builds)"
++ac_help="$ac_help
++  --with-pic              try to use only PIC/non-PIC objects [default=use both]"
++
++# Initialize some variables set by options.
++# The variables have the same names as the options, with
++# dashes changed to underlines.
++build=NONE
++cache_file=./config.cache
++exec_prefix=NONE
++host=NONE
++no_create=
++nonopt=NONE
++no_recursion=
++prefix=NONE
++program_prefix=NONE
++program_suffix=NONE
++program_transform_name=s,x,x,
++silent=
++site=
++srcdir=
++target=NONE
++verbose=
++x_includes=NONE
++x_libraries=NONE
++bindir='${exec_prefix}/bin'
++sbindir='${exec_prefix}/sbin'
++libexecdir='${exec_prefix}/libexec'
++datadir='${prefix}/share'
++sysconfdir='${prefix}/etc'
++sharedstatedir='${prefix}/com'
++localstatedir='${prefix}/var'
++libdir='${exec_prefix}/lib'
++includedir='${prefix}/include'
++oldincludedir='/usr/include'
++infodir='${prefix}/info'
++mandir='${prefix}/man'
++
++# Initialize some other variables.
++subdirs=
++MFLAGS= MAKEFLAGS=
++SHELL=${CONFIG_SHELL-/bin/sh}
++# Maximum number of lines to put in a shell here document.
++ac_max_here_lines=12
++
++ac_prev=
++for ac_option
++do
++
++  # If the previous option needs an argument, assign it.
++  if test -n "$ac_prev"; then
++    eval "$ac_prev=\$ac_option"
++    ac_prev=
++    continue
++  fi
++
++  case "$ac_option" in
++  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
++  *) ac_optarg= ;;
++  esac
++
++  # Accept the important Cygnus configure options, so we can diagnose typos.
++
++  case "$ac_option" in
++
++  -bindir | --bindir | --bindi | --bind | --bin | --bi)
++    ac_prev=bindir ;;
++  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
++    bindir="$ac_optarg" ;;
++
++  -build | --build | --buil | --bui | --bu)
++    ac_prev=build ;;
++  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
++    build="$ac_optarg" ;;
++
++  -cache-file | --cache-file | --cache-fil | --cache-fi \
++  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
++    ac_prev=cache_file ;;
++  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
++  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
++    cache_file="$ac_optarg" ;;
++
++  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
++    ac_prev=datadir ;;
++  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
++  | --da=*)
++    datadir="$ac_optarg" ;;
++
++  -disable-* | --disable-*)
++    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
++    # Reject names that are not valid shell variable names.
++    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
++      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
++    fi
++    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
++    eval "enable_${ac_feature}=no" ;;
++
++  -enable-* | --enable-*)
++    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
++    # Reject names that are not valid shell variable names.
++    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
++      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
++    fi
++    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
++    case "$ac_option" in
++      *=*) ;;
++      *) ac_optarg=yes ;;
++    esac
++    eval "enable_${ac_feature}='$ac_optarg'" ;;
++
++  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
++  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
++  | --exec | --exe | --ex)
++    ac_prev=exec_prefix ;;
++  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
++  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
++  | --exec=* | --exe=* | --ex=*)
++    exec_prefix="$ac_optarg" ;;
++
++  -gas | --gas | --ga | --g)
++    # Obsolete; use --with-gas.
++    with_gas=yes ;;
++
++  -help | --help | --hel | --he)
++    # Omit some internal or obsolete options to make the list less imposing.
++    # This message is too long to be a string in the A/UX 3.1 sh.
++    cat << EOF
++Usage: configure [options] [host]
++Options: [defaults in brackets after descriptions]
++Configuration:
++  --cache-file=FILE       cache test results in FILE
++  --help                  print this message
++  --no-create             do not create output files
++  --quiet, --silent       do not print \`checking...' messages
++  --version               print the version of autoconf that created configure
++Directory and file names:
++  --prefix=PREFIX         install architecture-independent files in PREFIX
++                          [$ac_default_prefix]
++  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
++                          [same as prefix]
++  --bindir=DIR            user executables in DIR [EPREFIX/bin]
++  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
++  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
++  --datadir=DIR           read-only architecture-independent data in DIR
++                          [PREFIX/share]
++  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
++  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
++                          [PREFIX/com]
++  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
++  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
++  --includedir=DIR        C header files in DIR [PREFIX/include]
++  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
++  --infodir=DIR           info documentation in DIR [PREFIX/info]
++  --mandir=DIR            man documentation in DIR [PREFIX/man]
++  --srcdir=DIR            find the sources in DIR [configure dir or ..]
++  --program-prefix=PREFIX prepend PREFIX to installed program names
++  --program-suffix=SUFFIX append SUFFIX to installed program names
++  --program-transform-name=PROGRAM
++                          run sed PROGRAM on installed program names
++EOF
++    cat << EOF
++Host type:
++  --build=BUILD           configure for building on BUILD [BUILD=HOST]
++  --host=HOST             configure for HOST [guessed]
++  --target=TARGET         configure for TARGET [TARGET=HOST]
++Features and packages:
++  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
++  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
++  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
++  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
++  --x-includes=DIR        X include files are in DIR
++  --x-libraries=DIR       X library files are in DIR
++EOF
++    if test -n "$ac_help"; then
++      echo "--enable and --with options recognized:$ac_help"
++    fi
++    exit 0 ;;
++
++  -host | --host | --hos | --ho)
++    ac_prev=host ;;
++  -host=* | --host=* | --hos=* | --ho=*)
++    host="$ac_optarg" ;;
++
++  -includedir | --includedir | --includedi | --included | --include \
++  | --includ | --inclu | --incl | --inc)
++    ac_prev=includedir ;;
++  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
++  | --includ=* | --inclu=* | --incl=* | --inc=*)
++    includedir="$ac_optarg" ;;
++
++  -infodir | --infodir | --infodi | --infod | --info | --inf)
++    ac_prev=infodir ;;
++  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
++    infodir="$ac_optarg" ;;
++
++  -libdir | --libdir | --libdi | --libd)
++    ac_prev=libdir ;;
++  -libdir=* | --libdir=* | --libdi=* | --libd=*)
++    libdir="$ac_optarg" ;;
++
++  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
++  | --libexe | --libex | --libe)
++    ac_prev=libexecdir ;;
++  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
++  | --libexe=* | --libex=* | --libe=*)
++    libexecdir="$ac_optarg" ;;
++
++  -localstatedir | --localstatedir | --localstatedi | --localstated \
++  | --localstate | --localstat | --localsta | --localst \
++  | --locals | --local | --loca | --loc | --lo)
++    ac_prev=localstatedir ;;
++  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
++  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
++  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
++    localstatedir="$ac_optarg" ;;
++
++  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
++    ac_prev=mandir ;;
++  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
++    mandir="$ac_optarg" ;;
++
++  -nfp | --nfp | --nf)
++    # Obsolete; use --without-fp.
++    with_fp=no ;;
++
++  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
++  | --no-cr | --no-c)
++    no_create=yes ;;
++
++  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
++  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
++    no_recursion=yes ;;
++
++  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
++  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
++  | --oldin | --oldi | --old | --ol | --o)
++    ac_prev=oldincludedir ;;
++  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
++  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
++  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
++    oldincludedir="$ac_optarg" ;;
++
++  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
++    ac_prev=prefix ;;
++  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
++    prefix="$ac_optarg" ;;
++
++  -program-prefix | --program-prefix | --program-prefi | --program-pref \
++  | --program-pre | --program-pr | --program-p)
++    ac_prev=program_prefix ;;
++  -program-prefix=* | --program-prefix=* | --program-prefi=* \
++  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
++    program_prefix="$ac_optarg" ;;
++
++  -program-suffix | --program-suffix | --program-suffi | --program-suff \
++  | --program-suf | --program-su | --program-s)
++    ac_prev=program_suffix ;;
++  -program-suffix=* | --program-suffix=* | --program-suffi=* \
++  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
++    program_suffix="$ac_optarg" ;;
++
++  -program-transform-name | --program-transform-name \
++  | --program-transform-nam | --program-transform-na \
++  | --program-transform-n | --program-transform- \
++  | --program-transform | --program-transfor \
++  | --program-transfo | --program-transf \
++  | --program-trans | --program-tran \
++  | --progr-tra | --program-tr | --program-t)
++    ac_prev=program_transform_name ;;
++  -program-transform-name=* | --program-transform-name=* \
++  | --program-transform-nam=* | --program-transform-na=* \
++  | --program-transform-n=* | --program-transform-=* \
++  | --program-transform=* | --program-transfor=* \
++  | --program-transfo=* | --program-transf=* \
++  | --program-trans=* | --program-tran=* \
++  | --progr-tra=* | --program-tr=* | --program-t=*)
++    program_transform_name="$ac_optarg" ;;
++
++  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
++  | -silent | --silent | --silen | --sile | --sil)
++    silent=yes ;;
++
++  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
++    ac_prev=sbindir ;;
++  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
++  | --sbi=* | --sb=*)
++    sbindir="$ac_optarg" ;;
++
++  -sharedstatedir | --sharedstatedir | --sharedstatedi \
++  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
++  | --sharedst | --shareds | --shared | --share | --shar \
++  | --sha | --sh)
++    ac_prev=sharedstatedir ;;
++  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
++  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
++  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
++  | --sha=* | --sh=*)
++    sharedstatedir="$ac_optarg" ;;
++
++  -site | --site | --sit)
++    ac_prev=site ;;
++  -site=* | --site=* | --sit=*)
++    site="$ac_optarg" ;;
++
++  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
++    ac_prev=srcdir ;;
++  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
++    srcdir="$ac_optarg" ;;
++
++  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
++  | --syscon | --sysco | --sysc | --sys | --sy)
++    ac_prev=sysconfdir ;;
++  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
++  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
++    sysconfdir="$ac_optarg" ;;
++
++  -target | --target | --targe | --targ | --tar | --ta | --t)
++    ac_prev=target ;;
++  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
++    target="$ac_optarg" ;;
++
++  -v | -verbose | --verbose | --verbos | --verbo | --verb)
++    verbose=yes ;;
++
++  -version | --version | --versio | --versi | --vers)
++    echo "configure generated by autoconf version 2.13"
++    exit 0 ;;
++
++  -with-* | --with-*)
++    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
++    # Reject names that are not valid shell variable names.
++    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
++      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
++    fi
++    ac_package=`echo $ac_package| sed 's/-/_/g'`
++    case "$ac_option" in
++      *=*) ;;
++      *) ac_optarg=yes ;;
++    esac
++    eval "with_${ac_package}='$ac_optarg'" ;;
++
++  -without-* | --without-*)
++    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
++    # Reject names that are not valid shell variable names.
++    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
++      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
++    fi
++    ac_package=`echo $ac_package| sed 's/-/_/g'`
++    eval "with_${ac_package}=no" ;;
++
++  --x)
++    # Obsolete; use --with-x.
++    with_x=yes ;;
++
++  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
++  | --x-incl | --x-inc | --x-in | --x-i)
++    ac_prev=x_includes ;;
++  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
++  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
++    x_includes="$ac_optarg" ;;
++
++  -x-libraries | --x-libraries | --x-librarie | --x-librari \
++  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
++    ac_prev=x_libraries ;;
++  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
++  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
++    x_libraries="$ac_optarg" ;;
++
++  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
++    ;;
++
++  *)
++    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
++      echo "configure: warning: $ac_option: invalid host type" 1>&2
++    fi
++    if test "x$nonopt" != xNONE; then
++      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
++    fi
++    nonopt="$ac_option"
++    ;;
++
++  esac
++done
++
++if test -n "$ac_prev"; then
++  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
++fi
++
++trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
++
++# File descriptor usage:
++# 0 standard input
++# 1 file creation
++# 2 errors and warnings
++# 3 some systems may open it to /dev/tty
++# 4 used on the Kubota Titan
++# 6 checking for... messages and results
++# 5 compiler messages saved in config.log
++if test "$silent" = yes; then
++  exec 6>/dev/null
++else
++  exec 6>&1
++fi
++exec 5>./config.log
++
++echo "\
++This file contains any messages produced by compilers while
++running configure, to aid debugging if configure makes a mistake.
++" 1>&5
++
++# Strip out --no-create and --no-recursion so they do not pile up.
++# Also quote any args containing shell metacharacters.
++ac_configure_args=
++for ac_arg
++do
++  case "$ac_arg" in
++  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
++  | --no-cr | --no-c) ;;
++  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
++  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
++  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
++  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
++  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
++  esac
++done
++
++# NLS nuisances.
++# Only set these to C if already set.  These must not be set unconditionally
++# because not all systems understand e.g. LANG=C (notably SCO).
++# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
++# Non-C LC_CTYPE values break the ctype check.
++if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
++if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
++if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
++if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
++
++# confdefs.h avoids OS command line length limits that DEFS can exceed.
++rm -rf conftest* confdefs.h
++# AIX cpp loses on an empty file, so make sure it contains at least a newline.
++echo > confdefs.h
++
++# A filename unique to this package, relative to the directory that
++# configure is in, which we can look for to find out if srcdir is correct.
++ac_unique_file=src/metamail/metamail.c
++
++# Find the source files, if location was not specified.
++if test -z "$srcdir"; then
++  ac_srcdir_defaulted=yes
++  # Try the directory containing this script, then its parent.
++  ac_prog=$0
++  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
++  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
++  srcdir=$ac_confdir
++  if test ! -r $srcdir/$ac_unique_file; then
++    srcdir=..
++  fi
++else
++  ac_srcdir_defaulted=no
++fi
++if test ! -r $srcdir/$ac_unique_file; then
++  if test "$ac_srcdir_defaulted" = yes; then
++    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
++  else
++    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
++  fi
++fi
++srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
++
++# Prefer explicitly selected file to automatically selected ones.
++if test -z "$CONFIG_SITE"; then
++  if test "x$prefix" != xNONE; then
++    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
++  else
++    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
++  fi
++fi
++for ac_site_file in $CONFIG_SITE; do
++  if test -r "$ac_site_file"; then
++    echo "loading site script $ac_site_file"
++    . "$ac_site_file"
++  fi
++done
++
++if test -r "$cache_file"; then
++  echo "loading cache $cache_file"
++  . $cache_file
++else
++  echo "creating cache $cache_file"
++  > $cache_file
++fi
++
++ac_ext=c
++# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cc_cross
++
++ac_exeext=
++ac_objext=o
++if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
++  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
++  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
++    ac_n= ac_c='
++' ac_t='	'
++  else
++    ac_n=-n ac_c= ac_t=
++  fi
++else
++  ac_n= ac_c='\c' ac_t=
++fi
++
++
++ac_aux_dir=
++for ac_dir in config $srcdir/config; do
++  if test -f $ac_dir/install-sh; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/install-sh -c"
++    break
++  elif test -f $ac_dir/install.sh; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/install.sh -c"
++    break
++  fi
++done
++if test -z "$ac_aux_dir"; then
++  { echo "configure: error: can not find install-sh or install.sh in config $srcdir/config" 1>&2; exit 1; }
++fi
++ac_config_guess=$ac_aux_dir/config.guess
++ac_config_sub=$ac_aux_dir/config.sub
++ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
++
++
++
++
++am__api_version="1.4"
++# Find a good install program.  We prefer a C program (faster),
++# so one script is as good as another.  But avoid the broken or
++# incompatible versions:
++# SysV /etc/install, /usr/sbin/install
++# SunOS /usr/etc/install
++# IRIX /sbin/install
++# AIX /bin/install
++# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
++# AFS /usr/afsws/bin/install, which mishandles nonexistent args
++# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
++# ./install, which can be erroneously created by make from ./install.sh.
++echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
++echo "configure:734: checking for a BSD compatible install" >&5
++if test -z "$INSTALL"; then
++if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
++  for ac_dir in $PATH; do
++    # Account for people who put trailing slashes in PATH elements.
++    case "$ac_dir/" in
++    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
++    *)
++      # OSF1 and SCO ODT 3.0 have their own names for install.
++      # Don't use installbsd from OSF since it installs stuff as root
++      # by default.
++      for ac_prog in ginstall scoinst install; do
++        if test -f $ac_dir/$ac_prog; then
++	  if test $ac_prog = install &&
++            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
++	    # AIX install.  It has an incompatible calling convention.
++	    :
++	  else
++	    ac_cv_path_install="$ac_dir/$ac_prog -c"
++	    break 2
++	  fi
++	fi
++      done
++      ;;
++    esac
++  done
++  IFS="$ac_save_IFS"
++
++fi
++  if test "${ac_cv_path_install+set}" = set; then
++    INSTALL="$ac_cv_path_install"
++  else
++    # As a last resort, use the slow shell script.  We don't cache a
++    # path for INSTALL within a source directory, because that will
++    # break other packages using the cache if that directory is
++    # removed, or if the path is relative.
++    INSTALL="$ac_install_sh"
++  fi
++fi
++echo "$ac_t""$INSTALL" 1>&6
++
++# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
++# It thinks the first close brace ends the variable substitution.
++test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
++
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
++
++test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
++
++echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
++echo "configure:787: checking whether build environment is sane" >&5
++# Just in case
++sleep 1
++echo timestamp > conftestfile
++# Do `set' in a subshell so we don't clobber the current shell's
++# arguments.  Must try -L first in case configure is actually a
++# symlink; some systems play weird games with the mod time of symlinks
++# (eg FreeBSD returns the mod time of the symlink's containing
++# directory).
++if (
++   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
++   if test "$*" = "X"; then
++      # -L didn't work.
++      set X `ls -t $srcdir/configure conftestfile`
++   fi
++   if test "$*" != "X $srcdir/configure conftestfile" \
++      && test "$*" != "X conftestfile $srcdir/configure"; then
++
++      # If neither matched, then we have a broken ls.  This can happen
++      # if, for instance, CONFIG_SHELL is bash and it inherits a
++      # broken ls alias from the environment.  This has actually
++      # happened.  Such a system could not be considered "sane".
++      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
++alias in your environment" 1>&2; exit 1; }
++   fi
++
++   test "$2" = conftestfile
++   )
++then
++   # Ok.
++   :
++else
++   { echo "configure: error: newly created file is older than distributed files!
++Check your system clock" 1>&2; exit 1; }
++fi
++rm -f conftest*
++echo "$ac_t""yes" 1>&6
++if test "$program_transform_name" = s,x,x,; then
++  program_transform_name=
++else
++  # Double any \ or $.  echo might interpret backslashes.
++  cat <<\EOF_SED > conftestsed
++s,\\,\\\\,g; s,\$,$$,g
++EOF_SED
++  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
++  rm -f conftestsed
++fi
++test "$program_prefix" != NONE &&
++  program_transform_name="s,^,${program_prefix},; $program_transform_name"
++# Use a double $ so make ignores it.
++test "$program_suffix" != NONE &&
++  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
++
++# sed with no file args requires a program.
++test "$program_transform_name" = "" && program_transform_name="s,x,x,"
++
++echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
++echo "configure:844: checking whether ${MAKE-make} sets \${MAKE}" >&5
++set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftestmake <<\EOF
++all:
++	@echo 'ac_maketemp="${MAKE}"'
++EOF
++# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
++eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
++if test -n "$ac_maketemp"; then
++  eval ac_cv_prog_make_${ac_make}_set=yes
++else
++  eval ac_cv_prog_make_${ac_make}_set=no
++fi
++rm -f conftestmake
++fi
++if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  SET_MAKE=
++else
++  echo "$ac_t""no" 1>&6
++  SET_MAKE="MAKE=${MAKE-make}"
++fi
++
++
++PACKAGE=metamail
++
++VERSION=0.0.1
++
++if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
++  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
++fi
++cat >> confdefs.h <<EOF
++#define PACKAGE "$PACKAGE"
++EOF
++
++cat >> confdefs.h <<EOF
++#define VERSION "$VERSION"
++EOF
++
++
++
++missing_dir=`cd $ac_aux_dir && pwd`
++echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
++echo "configure:890: checking for working aclocal-${am__api_version}" >&5
++# Run test in a subshell; some versions of sh will print an error if
++# an executable is not found, even if stderr is redirected.
++# Redirect stdin to placate older versions of autoconf.  Sigh.
++if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
++   ACLOCAL=aclocal-${am__api_version}
++   echo "$ac_t""found" 1>&6
++else
++   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
++   echo "$ac_t""missing" 1>&6
++fi
++
++echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
++echo "configure:903: checking for working autoconf" >&5
++# Run test in a subshell; some versions of sh will print an error if
++# an executable is not found, even if stderr is redirected.
++# Redirect stdin to placate older versions of autoconf.  Sigh.
++if (autoconf --version) < /dev/null > /dev/null 2>&1; then
++   AUTOCONF=autoconf
++   echo "$ac_t""found" 1>&6
++else
++   AUTOCONF="$missing_dir/missing autoconf"
++   echo "$ac_t""missing" 1>&6
++fi
++
++echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
++echo "configure:916: checking for working automake-${am__api_version}" >&5
++# Run test in a subshell; some versions of sh will print an error if
++# an executable is not found, even if stderr is redirected.
++# Redirect stdin to placate older versions of autoconf.  Sigh.
++if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
++   AUTOMAKE=automake-${am__api_version}
++   echo "$ac_t""found" 1>&6
++else
++   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
++   echo "$ac_t""missing" 1>&6
++fi
++
++echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
++echo "configure:929: checking for working autoheader" >&5
++# Run test in a subshell; some versions of sh will print an error if
++# an executable is not found, even if stderr is redirected.
++# Redirect stdin to placate older versions of autoconf.  Sigh.
++if (autoheader --version) < /dev/null > /dev/null 2>&1; then
++   AUTOHEADER=autoheader
++   echo "$ac_t""found" 1>&6
++else
++   AUTOHEADER="$missing_dir/missing autoheader"
++   echo "$ac_t""missing" 1>&6
++fi
++
++echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
++echo "configure:942: checking for working makeinfo" >&5
++# Run test in a subshell; some versions of sh will print an error if
++# an executable is not found, even if stderr is redirected.
++# Redirect stdin to placate older versions of autoconf.  Sigh.
++if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
++   MAKEINFO=makeinfo
++   echo "$ac_t""found" 1>&6
++else
++   MAKEINFO="$missing_dir/missing makeinfo"
++   echo "$ac_t""missing" 1>&6
++fi
++
++
++echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
++echo "configure:956: checking whether to enable maintainer-specific portions of Makefiles" >&5
++    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
++if test "${enable_maintainer_mode+set}" = set; then
++  enableval="$enable_maintainer_mode"
++  USE_MAINTAINER_MODE=$enableval
++else
++  USE_MAINTAINER_MODE=no
++fi
++
++  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
++  
++
++if test $USE_MAINTAINER_MODE = yes; then
++  MAINTAINER_MODE_TRUE=
++  MAINTAINER_MODE_FALSE='#'
++else
++  MAINTAINER_MODE_TRUE='#'
++  MAINTAINER_MODE_FALSE=
++fi
++  MAINT=$MAINTAINER_MODE_TRUE
++  
++
++
++
++# Make sure we can run config.sub.
++if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
++else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
++fi
++
++echo $ac_n "checking host system type""... $ac_c" 1>&6
++echo "configure:986: checking host system type" >&5
++
++host_alias=$host
++case "$host_alias" in
++NONE)
++  case $nonopt in
++  NONE)
++    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
++    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
++    fi ;;
++  *) host_alias=$nonopt ;;
++  esac ;;
++esac
++
++host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
++host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
++host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
++host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++echo "$ac_t""$host" 1>&6
++
++
++# Extract the first word of "gcc", so it can be a program name with args.
++set dummy gcc; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:1010: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_CC="gcc"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++fi
++fi
++CC="$ac_cv_prog_CC"
++if test -n "$CC"; then
++  echo "$ac_t""$CC" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++if test -z "$CC"; then
++  # Extract the first word of "cc", so it can be a program name with args.
++set dummy cc; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:1040: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_prog_rejected=no
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
++        ac_prog_rejected=yes
++	continue
++      fi
++      ac_cv_prog_CC="cc"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++if test $ac_prog_rejected = yes; then
++  # We found a bogon in the path, so make sure we never use it.
++  set dummy $ac_cv_prog_CC
++  shift
++  if test $# -gt 0; then
++    # We chose a different compiler from the bogus one.
++    # However, it has the same basename, so the bogon will be chosen
++    # first if we set CC to just the basename; use the full file name.
++    shift
++    set dummy "$ac_dir/$ac_word" "$@"
++    shift
++    ac_cv_prog_CC="$@"
++  fi
++fi
++fi
++fi
++CC="$ac_cv_prog_CC"
++if test -n "$CC"; then
++  echo "$ac_t""$CC" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++  if test -z "$CC"; then
++    case "`uname -s`" in
++    *win32* | *WIN32*)
++      # Extract the first word of "cl", so it can be a program name with args.
++set dummy cl; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:1091: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_CC="cl"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++fi
++fi
++CC="$ac_cv_prog_CC"
++if test -n "$CC"; then
++  echo "$ac_t""$CC" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++ ;;
++    esac
++  fi
++  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
++fi
++
++echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
++echo "configure:1123: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++
++ac_ext=c
++# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cc_cross
++
++cat > conftest.$ac_ext << EOF
++
++#line 1134 "configure"
++#include "confdefs.h"
++
++main(){return(0);}
++EOF
++if { (eval echo configure:1139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  ac_cv_prog_cc_works=yes
++  # If we can't run a trivial program, we are probably using a cross compiler.
++  if (./conftest; exit) 2>/dev/null; then
++    ac_cv_prog_cc_cross=no
++  else
++    ac_cv_prog_cc_cross=yes
++  fi
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_prog_cc_works=no
++fi
++rm -fr conftest*
++ac_ext=c
++# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cc_cross
++
++echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
++if test $ac_cv_prog_cc_works = no; then
++  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
++fi
++echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
++echo "configure:1165: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
++cross_compiling=$ac_cv_prog_cc_cross
++
++echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
++echo "configure:1170: checking whether we are using GNU C" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.c <<EOF
++#ifdef __GNUC__
++  yes;
++#endif
++EOF
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++  ac_cv_prog_gcc=yes
++else
++  ac_cv_prog_gcc=no
++fi
++fi
++
++echo "$ac_t""$ac_cv_prog_gcc" 1>&6
++
++if test $ac_cv_prog_gcc = yes; then
++  GCC=yes
++else
++  GCC=
++fi
++
++ac_test_CFLAGS="${CFLAGS+set}"
++ac_save_CFLAGS="$CFLAGS"
++CFLAGS=
++echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
++echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  echo 'void f(){}' > conftest.c
++if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
++  ac_cv_prog_cc_g=yes
++else
++  ac_cv_prog_cc_g=no
++fi
++rm -f conftest*
++
++fi
++
++echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
++if test "$ac_test_CFLAGS" = set; then
++  CFLAGS="$ac_save_CFLAGS"
++elif test $ac_cv_prog_cc_g = yes; then
++  if test "$GCC" = yes; then
++    CFLAGS="-g -O2"
++  else
++    CFLAGS="-g"
++  fi
++else
++  if test "$GCC" = yes; then
++    CFLAGS="-O2"
++  else
++    CFLAGS=
++  fi
++fi
++
++# Find the correct PATH separator.  Usually this is `:', but
++# DJGPP uses `;' like DOS.
++if test "X${PATH_SEPARATOR+set}" != Xset; then
++  UNAME=${UNAME-`uname 2>/dev/null`}
++  case X$UNAME in
++    *-DOS) lt_cv_sys_path_separator=';' ;;
++    *)     lt_cv_sys_path_separator=':' ;;
++  esac
++  PATH_SEPARATOR=$lt_cv_sys_path_separator
++fi
++
++echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
++echo "configure:1241: checking for Cygwin environment" >&5
++if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 1246 "configure"
++#include "confdefs.h"
++
++int main() {
++
++#ifndef __CYGWIN__
++#define __CYGWIN__ __CYGWIN32__
++#endif
++return __CYGWIN__;
++; return 0; }
++EOF
++if { (eval echo configure:1257: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  rm -rf conftest*
++  ac_cv_cygwin=yes
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  ac_cv_cygwin=no
++fi
++rm -f conftest*
++rm -f conftest*
++fi
++
++echo "$ac_t""$ac_cv_cygwin" 1>&6
++CYGWIN=
++test "$ac_cv_cygwin" = yes && CYGWIN=yes
++echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
++echo "configure:1274: checking for mingw32 environment" >&5
++if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 1279 "configure"
++#include "confdefs.h"
++
++int main() {
++return __MINGW32__;
++; return 0; }
++EOF
++if { (eval echo configure:1286: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  rm -rf conftest*
++  ac_cv_mingw32=yes
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  ac_cv_mingw32=no
++fi
++rm -f conftest*
++rm -f conftest*
++fi
++
++echo "$ac_t""$ac_cv_mingw32" 1>&6
++MINGW32=
++test "$ac_cv_mingw32" = yes && MINGW32=yes
++echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
++echo "configure:1303: checking how to run the C preprocessor" >&5
++# On Suns, sometimes $CPP names a directory.
++if test -n "$CPP" && test -d "$CPP"; then
++  CPP=
++fi
++if test -z "$CPP"; then
++if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++    # This must be in double quotes, not single quotes, because CPP may get
++  # substituted into the Makefile and "${CC-cc}" will confuse make.
++  CPP="${CC-cc} -E"
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp.
++  cat > conftest.$ac_ext <<EOF
++#line 1318 "configure"
++#include "confdefs.h"
++#include <assert.h>
++Syntax Error
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:1324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  :
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  CPP="${CC-cc} -E -traditional-cpp"
++  cat > conftest.$ac_ext <<EOF
++#line 1335 "configure"
++#include "confdefs.h"
++#include <assert.h>
++Syntax Error
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:1341: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  :
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  CPP="${CC-cc} -nologo -E"
++  cat > conftest.$ac_ext <<EOF
++#line 1352 "configure"
++#include "confdefs.h"
++#include <assert.h>
++Syntax Error
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:1358: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  :
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  CPP=/lib/cpp
++fi
++rm -f conftest*
++fi
++rm -f conftest*
++fi
++rm -f conftest*
++  ac_cv_prog_CPP="$CPP"
++fi
++  CPP="$ac_cv_prog_CPP"
++else
++  ac_cv_prog_CPP="$CPP"
++fi
++echo "$ac_t""$CPP" 1>&6
++
++# Check whether --enable-shared or --disable-shared was given.
++if test "${enable_shared+set}" = set; then
++  enableval="$enable_shared"
++  p=${PACKAGE-default}
++case $enableval in
++yes) enable_shared=yes ;;
++no) enable_shared=no ;;
++*)
++  enable_shared=no
++  # Look at the argument we got.  We use all the common list separators.
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
++  for pkg in $enableval; do
++    if test "X$pkg" = "X$p"; then
++      enable_shared=yes
++    fi
++  done
++  IFS="$ac_save_ifs"
++  ;;
++esac
++else
++  enable_shared=yes
++fi
++
++# Check whether --enable-static or --disable-static was given.
++if test "${enable_static+set}" = set; then
++  enableval="$enable_static"
++  p=${PACKAGE-default}
++case $enableval in
++yes) enable_static=yes ;;
++no) enable_static=no ;;
++*)
++  enable_static=no
++  # Look at the argument we got.  We use all the common list separators.
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
++  for pkg in $enableval; do
++    if test "X$pkg" = "X$p"; then
++      enable_static=yes
++    fi
++  done
++  IFS="$ac_save_ifs"
++  ;;
++esac
++else
++  enable_static=yes
++fi
++
++# Check whether --enable-fast-install or --disable-fast-install was given.
++if test "${enable_fast_install+set}" = set; then
++  enableval="$enable_fast_install"
++  p=${PACKAGE-default}
++case $enableval in
++yes) enable_fast_install=yes ;;
++no) enable_fast_install=no ;;
++*)
++  enable_fast_install=no
++  # Look at the argument we got.  We use all the common list separators.
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
++  for pkg in $enableval; do
++    if test "X$pkg" = "X$p"; then
++      enable_fast_install=yes
++    fi
++  done
++  IFS="$ac_save_ifs"
++  ;;
++esac
++else
++  enable_fast_install=yes
++fi
++
++echo $ac_n "checking build system type""... $ac_c" 1>&6
++echo "configure:1452: checking build system type" >&5
++
++build_alias=$build
++case "$build_alias" in
++NONE)
++  case $nonopt in
++  NONE) build_alias=$host_alias ;;
++  *) build_alias=$nonopt ;;
++  esac ;;
++esac
++
++build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
++build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
++build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
++build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++echo "$ac_t""$build" 1>&6
++
++# Check whether --with-gnu-ld or --without-gnu-ld was given.
++if test "${with_gnu_ld+set}" = set; then
++  withval="$with_gnu_ld"
++  test "$withval" = no || with_gnu_ld=yes
++else
++  with_gnu_ld=no
++fi
++
++ac_prog=ld
++if test "$GCC" = yes; then
++  # Check if gcc -print-prog-name=ld gives a path.
++  echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
++echo "configure:1481: checking for ld used by GCC" >&5
++  case $host in
++  *-*-mingw*)
++    # gcc leaves a trailing carriage return which upsets mingw
++    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
++  *)
++    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
++  esac
++  case $ac_prog in
++    # Accept absolute paths.
++    [\\/]* | [A-Za-z]:[\\/]*)
++      re_direlt='/[^/][^/]*/\.\./'
++      # Canonicalize the path of ld
++      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
++      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
++	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
++      done
++      test -z "$LD" && LD="$ac_prog"
++      ;;
++  "")
++    # If it fails, then pretend we aren't using GCC.
++    ac_prog=ld
++    ;;
++  *)
++    # If it is relative, then search for the first ld in PATH.
++    with_gnu_ld=unknown
++    ;;
++  esac
++elif test "$with_gnu_ld" = yes; then
++  echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
++echo "configure:1511: checking for GNU ld" >&5
++else
++  echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
++echo "configure:1514: checking for non-GNU ld" >&5
++fi
++if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test -z "$LD"; then
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for ac_dir in $PATH; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
++      lt_cv_path_LD="$ac_dir/$ac_prog"
++      # Check to see if the program is GNU ld.  I'd rather use --version,
++      # but apparently some GNU ld's only accept -v.
++      # Break only if it was the GNU/non-GNU ld that we prefer.
++      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
++	test "$with_gnu_ld" != no && break
++      else
++	test "$with_gnu_ld" != yes && break
++      fi
++    fi
++  done
++  IFS="$ac_save_ifs"
++else
++  lt_cv_path_LD="$LD" # Let the user override the test with a path.
++fi
++fi
++
++LD="$lt_cv_path_LD"
++if test -n "$LD"; then
++  echo "$ac_t""$LD" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
++echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
++echo "configure:1549: checking if the linker ($LD) is GNU ld" >&5
++if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
++if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
++  lt_cv_prog_gnu_ld=yes
++else
++  lt_cv_prog_gnu_ld=no
++fi
++fi
++
++echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6
++with_gnu_ld=$lt_cv_prog_gnu_ld
++
++
++echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
++echo "configure:1566: checking for $LD option to reload object files" >&5
++if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  lt_cv_ld_reload_flag='-r'
++fi
++
++echo "$ac_t""$lt_cv_ld_reload_flag" 1>&6
++reload_flag=$lt_cv_ld_reload_flag
++test -n "$reload_flag" && reload_flag=" $reload_flag"
++
++echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
++echo "configure:1578: checking for BSD-compatible nm" >&5
++if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test -n "$NM"; then
++  # Let the user override the test.
++  lt_cv_path_NM="$NM"
++else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
++    test -z "$ac_dir" && ac_dir=.
++    tmp_nm=$ac_dir/${ac_tool_prefix}nm
++    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
++      # Check to see if the nm accepts a BSD-compat flag.
++      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
++      #   nm: unknown option "B" ignored
++      # Tru64's nm complains that /dev/null is an invalid object file
++      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
++	lt_cv_path_NM="$tmp_nm -B"
++	break
++      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
++	lt_cv_path_NM="$tmp_nm -p"
++	break
++      else
++	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++	continue # so that we can try to find one that supports BSD flags
++      fi
++    fi
++  done
++  IFS="$ac_save_ifs"
++  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
++fi
++fi
++
++NM="$lt_cv_path_NM"
++echo "$ac_t""$NM" 1>&6
++
++echo $ac_n "checking for a sed that does not truncate output""... $ac_c" 1>&6
++echo "configure:1616: checking for a sed that does not truncate output" >&5
++if eval "test \"`echo '$''{'lt_cv_path_SED'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  # Loop through the user's path and test for sed and gsed.
++# Then use that list of sed's as ones to test for truncation.
++as_executable_p="test -f"
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_prog in sed gsed; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
++      if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
++        _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"
++      fi
++    done
++  done
++done
++
++  # Create a temporary directory, and hook for its removal unless debugging.
++$debug ||
++{
++  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
++  trap '{ (exit 1); exit 1; }' 1 2 13 15
++}
++
++# Create a (secure) tmp directory for tmp files.
++: ${TMPDIR=/tmp}
++{
++  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` &&
++  test -n "$tmp" && test -d "$tmp"
++}  ||
++{
++  tmp=$TMPDIR/sed$$-$RANDOM
++  (umask 077 && mkdir $tmp)
++} ||
++{
++   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
++   { (exit 1); exit 1; }
++}
++  _max=0
++  _count=0
++  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
++  # along with /bin/sed that truncates output.
++  for _sed in $_sed_list /usr/xpg4/bin/sed; do
++    test ! -f ${_sed} && break
++    cat /dev/null > "$tmp/sed.in"
++    _count=0
++    echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in"
++    # Check for GNU sed and select it if it is found.
++    if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
++      lt_cv_path_SED=${_sed}
++      break
++    fi
++    while true; do
++      cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
++      mv "$tmp/sed.tmp" "$tmp/sed.in"
++      cp "$tmp/sed.in" "$tmp/sed.nl"
++      echo >>"$tmp/sed.nl"
++      ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
++      cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
++      # 40000 chars as input seems more than enough
++      test $_count -gt 10 && break
++      _count=`expr $_count + 1`
++      if test $_count -gt $_max; then
++        _max=$_count
++        lt_cv_path_SED=$_sed
++      fi
++    done
++  done
++  rm -rf "$tmp"
++
++fi
++
++if test "X$SED" != "X"; then
++  lt_cv_path_SED=$SED
++else
++  SED=$lt_cv_path_SED
++fi
++echo "$ac_t""$SED" 1>&6
++
++echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
++echo "configure:1700: checking whether ln -s works" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  rm -f conftestdata
++if ln -s X conftestdata 2>/dev/null
++then
++  rm -f conftestdata
++  ac_cv_prog_LN_S="ln -s"
++else
++  ac_cv_prog_LN_S=ln
++fi
++fi
++LN_S="$ac_cv_prog_LN_S"
++if test "$ac_cv_prog_LN_S" = "ln -s"; then
++  echo "$ac_t""yes" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++echo $ac_n "checking how to recognise dependent libraries""... $ac_c" 1>&6
++echo "configure:1721: checking how to recognise dependent libraries" >&5
++if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  lt_cv_file_magic_cmd='$MAGIC_CMD'
++lt_cv_file_magic_test_file=
++lt_cv_deplibs_check_method='unknown'
++# Need to set the preceding variable on all platforms that support
++# interlibrary dependencies.
++# 'none' -- dependencies not supported.
++# `unknown' -- same as none, but documents that we really don't know.
++# 'pass_all' -- all dependencies passed with no checks.
++# 'test_compile' -- check by making test program.
++# 'file_magic [[regex]]' -- check by looking for files in library path
++# which responds to the $file_magic_cmd with a given egrep regex.
++# If you have `file' or equivalent on your system and you're not sure
++# whether `pass_all' will *always* work, you probably want this one.
++
++case $host_os in
++aix4* | aix5*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++beos*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++bsdi4*)
++  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
++  lt_cv_file_magic_cmd='/usr/bin/file -L'
++  lt_cv_file_magic_test_file=/shlib/libc.so
++  ;;
++
++cygwin* | mingw* | pw32*)
++  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++  lt_cv_file_magic_cmd='$OBJDUMP -f'
++  ;;
++
++darwin* | rhapsody*)
++  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
++  lt_cv_file_magic_cmd='/usr/bin/file -L'
++  case "$host_os" in
++  rhapsody* | darwin1.[012])
++    lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
++    ;;
++  *) # Darwin 1.3 on
++    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
++    ;;
++  esac
++  ;;
++
++freebsd*)
++  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++    case $host_cpu in
++    i*86 )
++      # Not sure whether the presence of OpenBSD here was a mistake.
++      # Let's accept both of them until this is cleared up.
++      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
++      lt_cv_file_magic_cmd=/usr/bin/file
++      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
++      ;;
++    esac
++  else
++    lt_cv_deplibs_check_method=pass_all
++  fi
++  ;;
++
++gnu*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++hpux10.20*|hpux11*)
++  lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
++  lt_cv_file_magic_cmd=/usr/bin/file
++  lt_cv_file_magic_test_file=/usr/lib/libc.sl
++  ;;
++
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++  irix5* | nonstopux*)
++    # this will be overridden with pass_all, but let us keep it just in case
++    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
++    ;;
++  *)
++    case $LD in
++    *-32|*"-32 ") libmagic=32-bit;;
++    *-n32|*"-n32 ") libmagic=N32;;
++    *-64|*"-64 ") libmagic=64-bit;;
++    *) libmagic=never-match;;
++    esac
++    # this will be overridden with pass_all, but let us keep it just in case
++    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
++    ;;
++  esac
++  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++# This must be Linux ELF.
++linux-gnu*)
++  case $host_cpu in
++  alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64*)
++    lt_cv_deplibs_check_method=pass_all ;;
++  *)
++    # glibc up to 2.1.1 does not perform some relocations on ARM
++    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
++  esac
++  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
++  ;;
++
++netbsd*)
++  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
++  else
++    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
++  fi
++  ;;
++
++newos6*)
++  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
++  lt_cv_file_magic_cmd=/usr/bin/file
++  lt_cv_file_magic_test_file=/usr/lib/libnls.so
++  ;;
++
++openbsd*)
++  lt_cv_file_magic_cmd=/usr/bin/file
++  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
++  else
++    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
++  fi
++  ;;
++
++osf3* | osf4* | osf5*)
++  # this will be overridden with pass_all, but let us keep it just in case
++  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
++  lt_cv_file_magic_test_file=/shlib/libc.so
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++sco3.2v5*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++solaris*)
++  lt_cv_deplibs_check_method=pass_all
++  lt_cv_file_magic_test_file=/lib/libc.so
++  ;;
++
++sysv5uw[78]* | sysv4*uw2*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++  case $host_vendor in
++  motorola)
++    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
++    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
++    ;;
++  ncr)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  sequent)
++    lt_cv_file_magic_cmd='/bin/file'
++    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
++    ;;
++  sni)
++    lt_cv_file_magic_cmd='/bin/file'
++    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
++    lt_cv_file_magic_test_file=/lib/libc.so
++    ;;
++  siemens)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  esac
++  ;;
++esac
++
++fi
++
++echo "$ac_t""$lt_cv_deplibs_check_method" 1>&6
++file_magic_cmd=$lt_cv_file_magic_cmd
++deplibs_check_method=$lt_cv_deplibs_check_method
++
++echo $ac_n "checking for object suffix""... $ac_c" 1>&6
++echo "configure:1907: checking for object suffix" >&5
++if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  rm -f conftest*
++echo 'int i = 1;' > conftest.$ac_ext
++if { (eval echo configure:1913: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  for ac_file in conftest.*; do
++    case $ac_file in
++    *.c) ;;
++    *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
++    esac
++  done
++else
++  { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
++fi
++rm -f conftest*
++fi
++
++echo "$ac_t""$ac_cv_objext" 1>&6
++OBJEXT=$ac_cv_objext
++ac_objext=$ac_cv_objext
++
++
++
++echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
++echo "configure:1933: checking for executable suffix" >&5
++if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
++  ac_cv_exeext=.exe
++else
++  rm -f conftest*
++  echo 'int main () { return 0; }' > conftest.$ac_ext
++  ac_cv_exeext=
++  if { (eval echo configure:1943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++    for file in conftest.*; do
++      case $file in
++      *.$ac_ext | *.c | *.o | *.obj) ;;
++      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
++      esac
++    done
++  else
++    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
++  fi
++  rm -f conftest*
++  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
++fi
++fi
++
++EXEEXT=""
++test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
++echo "$ac_t""${ac_cv_exeext}" 1>&6
++ac_exeext=$EXEEXT
++
++if test $host != $build; then
++  ac_tool_prefix=${host_alias}-
++else
++  ac_tool_prefix=
++fi
++
++
++
++
++# Check for command to grab the raw symbol name followed by C symbol from nm.
++echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6
++echo "configure:1974: checking command to parse $NM output" >&5
++if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  
++# These are sane defaults that work on at least a few old systems.
++# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
++
++# Character class describing NM global symbol codes.
++symcode='[BCDEGRST]'
++
++# Regexp to match symbols that can be accessed directly from C.
++sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
++
++# Transform the above into a raw symbol and a C symbol.
++symxfrm='\1 \2\3 \3'
++
++# Transform an extracted symbol line into a proper C declaration
++lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
++
++# Transform an extracted symbol line into symbol name and symbol address
++lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++
++# Define system-specific variables.
++case $host_os in
++aix*)
++  symcode='[BCDT]'
++  ;;
++cygwin* | mingw* | pw32*)
++  symcode='[ABCDGISTW]'
++  ;;
++hpux*) # Its linker distinguishes data from code symbols
++  lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++  lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++  ;;
++irix* | nonstopux*)
++  symcode='[BCDEGRST]'
++  ;;
++osf*)
++  symcode='[BCDEGQRST]'
++  ;;
++solaris* | sysv5*)
++  symcode='[BDT]'
++  ;;
++sysv4)
++  symcode='[DFNSTU]'
++  ;;
++esac
++
++# Handle CRLF in mingw tool chain
++opt_cr=
++case $host_os in
++mingw*)
++  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
++  ;;
++esac
++
++# If we're using GNU nm, then use its standard symbol codes.
++if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
++  symcode='[ABCDGISTW]'
++fi
++
++# Try without a prefix undercore, then with it.
++for ac_symprfx in "" "_"; do
++
++  # Write the raw and C identifiers.
++lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++
++  # Check to see that the pipe works correctly.
++  pipe_works=no
++  rm -f conftest*
++  cat > conftest.$ac_ext <<EOF
++#ifdef __cplusplus
++extern "C" {
++#endif
++char nm_test_var;
++void nm_test_func(){}
++#ifdef __cplusplus
++}
++#endif
++int main(){nm_test_var='a';nm_test_func();return(0);}
++EOF
++
++  if { (eval echo configure:2057: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++    # Now try to grab the symbols.
++    nlist=conftest.nm
++    if { (eval echo configure:2060: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then
++      # Try sorting and uniquifying the output.
++      if sort "$nlist" | uniq > "$nlist"T; then
++	mv -f "$nlist"T "$nlist"
++      else
++	rm -f "$nlist"T
++      fi
++
++      # Make sure that we snagged all the symbols we need.
++      if egrep ' nm_test_var$' "$nlist" >/dev/null; then
++	if egrep ' nm_test_func$' "$nlist" >/dev/null; then
++	  cat <<EOF > conftest.$ac_ext
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++EOF
++	  # Now generate the symbol file.
++	  eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext'
++
++	  cat <<EOF >> conftest.$ac_ext
++#if defined (__STDC__) && __STDC__
++# define lt_ptr void *
++#else
++# define lt_ptr char *
++# define const
++#endif
++
++/* The mapping between symbol names and symbols. */
++const struct {
++  const char *name;
++  lt_ptr address;
++}
++lt_preloaded_symbols[] =
++{
++EOF
++	  sed "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext
++	  cat <<\EOF >> conftest.$ac_ext
++  {0, (lt_ptr) 0}
++};
++
++#ifdef __cplusplus
++}
++#endif
++EOF
++	  # Now try linking the two files.
++	  mv conftest.$ac_objext conftstm.$ac_objext
++	  save_LIBS="$LIBS"
++	  save_CFLAGS="$CFLAGS"
++	  LIBS="conftstm.$ac_objext"
++	  CFLAGS="$CFLAGS$no_builtin_flag"
++	  if { (eval echo configure:2111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
++	    pipe_works=yes
++	  fi
++	  LIBS="$save_LIBS"
++	  CFLAGS="$save_CFLAGS"
++	else
++	  echo "cannot find nm_test_func in $nlist" >&5
++	fi
++      else
++	echo "cannot find nm_test_var in $nlist" >&5
++      fi
++    else
++      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
++    fi
++  else
++    echo "$progname: failed program was:" >&5
++    cat conftest.$ac_ext >&5
++  fi
++  rm -f conftest* conftst*
++
++  # Do not use the global_symbol_pipe unless it works.
++  if test "$pipe_works" = yes; then
++    break
++  else
++    lt_cv_sys_global_symbol_pipe=
++  fi
++done
++
++fi
++
++global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
++if test -z "$lt_cv_sys_global_symbol_pipe"; then
++  global_symbol_to_cdecl=
++  global_symbol_to_c_name_address=
++else
++  global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
++  global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address"
++fi
++if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
++then
++  echo "$ac_t""failed" 1>&6
++else
++  echo "$ac_t""ok" 1>&6
++fi
++
++for ac_hdr in dlfcn.h
++do
++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
++echo "configure:2160: checking for $ac_hdr" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 2165 "configure"
++#include "confdefs.h"
++#include <$ac_hdr>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:2170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=yes"
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
++fi
++rm -f conftest*
++fi
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_hdr 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++
++
++
++
++
++# Only perform the check for file, if the check method requires it
++case $deplibs_check_method in
++file_magic*)
++  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
++    echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
++echo "configure:2206: checking for ${ac_tool_prefix}file" >&5
++if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  case $MAGIC_CMD in
++  /*)
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++  ;;
++  ?:/*)
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
++  ;;
++  *)
++  ac_save_MAGIC_CMD="$MAGIC_CMD"
++  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="/usr/bin:$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/${ac_tool_prefix}file; then
++      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
++      if test -n "$file_magic_test_file"; then
++	case $deplibs_check_method in
++	"file_magic "*)
++	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
++	    egrep "$file_magic_regex" > /dev/null; then
++	    :
++	  else
++	    cat <<EOF 1>&2
++
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such.  This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem.  Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool@gnu.org
++
++EOF
++	  fi ;;
++	esac
++      fi
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++  MAGIC_CMD="$ac_save_MAGIC_CMD"
++  ;;
++esac
++fi
++
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++  echo "$ac_t""$MAGIC_CMD" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++if test -z "$lt_cv_path_MAGIC_CMD"; then
++  if test -n "$ac_tool_prefix"; then
++    echo $ac_n "checking for file""... $ac_c" 1>&6
++echo "configure:2268: checking for file" >&5
++if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  case $MAGIC_CMD in
++  /*)
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++  ;;
++  ?:/*)
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
++  ;;
++  *)
++  ac_save_MAGIC_CMD="$MAGIC_CMD"
++  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="/usr/bin:$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/file; then
++      lt_cv_path_MAGIC_CMD="$ac_dir/file"
++      if test -n "$file_magic_test_file"; then
++	case $deplibs_check_method in
++	"file_magic "*)
++	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
++	    egrep "$file_magic_regex" > /dev/null; then
++	    :
++	  else
++	    cat <<EOF 1>&2
++
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such.  This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem.  Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool@gnu.org
++
++EOF
++	  fi ;;
++	esac
++      fi
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++  MAGIC_CMD="$ac_save_MAGIC_CMD"
++  ;;
++esac
++fi
++
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++  echo "$ac_t""$MAGIC_CMD" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++  else
++    MAGIC_CMD=:
++  fi
++fi
++
++  fi
++  ;;
++esac
++
++# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
++set dummy ${ac_tool_prefix}ranlib; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:2339: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test -n "$RANLIB"; then
++  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
++else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++fi
++fi
++RANLIB="$ac_cv_prog_RANLIB"
++if test -n "$RANLIB"; then
++  echo "$ac_t""$RANLIB" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++
++if test -z "$ac_cv_prog_RANLIB"; then
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "ranlib", so it can be a program name with args.
++set dummy ranlib; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:2371: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test -n "$RANLIB"; then
++  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
++else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_RANLIB="ranlib"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
++fi
++fi
++RANLIB="$ac_cv_prog_RANLIB"
++if test -n "$RANLIB"; then
++  echo "$ac_t""$RANLIB" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++else
++  RANLIB=":"
++fi
++fi
++
++# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
++set dummy ${ac_tool_prefix}strip; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:2406: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test -n "$STRIP"; then
++  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
++else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++fi
++fi
++STRIP="$ac_cv_prog_STRIP"
++if test -n "$STRIP"; then
++  echo "$ac_t""$STRIP" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++
++if test -z "$ac_cv_prog_STRIP"; then
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "strip", so it can be a program name with args.
++set dummy strip; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:2438: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test -n "$STRIP"; then
++  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
++else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_STRIP="strip"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++  test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":"
++fi
++fi
++STRIP="$ac_cv_prog_STRIP"
++if test -n "$STRIP"; then
++  echo "$ac_t""$STRIP" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++else
++  STRIP=":"
++fi
++fi
++
++
++enable_dlopen=no
++enable_win32_dll=no
++
++# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
++if test "${enable_libtool_lock+set}" = set; then
++  enableval="$enable_libtool_lock"
++  :
++fi
++
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++
++# Some flags need to be propagated to the compiler or linker for good
++# libtool support.
++case $host in
++*-*-irix6*)
++  # Find out which ABI we are using.
++  echo '#line 2487 "configure"' > conftest.$ac_ext
++  if { (eval echo configure:2488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++    case `/usr/bin/file conftest.$ac_objext` in
++    *32-bit*)
++      LD="${LD-ld} -32"
++      ;;
++    *N32*)
++      LD="${LD-ld} -n32"
++      ;;
++    *64-bit*)
++      LD="${LD-ld} -64"
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++
++*-*-sco3.2v5*)
++  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
++  SAVE_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -belf"
++  echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
++echo "configure:2509: checking whether the C compiler needs -belf" >&5
++if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  
++     ac_ext=c
++# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cc_cross
++
++     cat > conftest.$ac_ext <<EOF
++#line 2522 "configure"
++#include "confdefs.h"
++
++int main() {
++
++; return 0; }
++EOF
++if { (eval echo configure:2529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  lt_cv_cc_needs_belf=yes
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  lt_cv_cc_needs_belf=no
++fi
++rm -f conftest*
++     ac_ext=c
++# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cc_cross
++
++fi
++
++echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
++  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
++    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
++    CFLAGS="$SAVE_CFLAGS"
++  fi
++  ;;
++
++
++esac
++
++# Sed substitution that helps us do robust quoting.  It backslashifies
++# metacharacters that are still active within double-quoted strings.
++Xsed='sed -e s/^X//'
++sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
++
++# Same as above, but do not quote variable references.
++double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
++
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
++
++# Constants:
++rm="rm -f"
++
++# Global variables:
++default_ofile=libtool
++can_build_shared=yes
++
++# All known linkers require a `.a' archive for static linking (except M$VC,
++# which needs '.lib').
++libext=a
++ltmain="$ac_aux_dir/ltmain.sh"
++ofile="$default_ofile"
++with_gnu_ld="$lt_cv_prog_gnu_ld"
++need_locks="$enable_libtool_lock"
++
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
++
++# Set sane defaults for various variables
++test -z "$AR" && AR=ar
++test -z "$AR_FLAGS" && AR_FLAGS=cru
++test -z "$AS" && AS=as
++test -z "$CC" && CC=cc
++test -z "$DLLTOOL" && DLLTOOL=dlltool
++test -z "$LD" && LD=ld
++test -z "$LN_S" && LN_S="ln -s"
++test -z "$MAGIC_CMD" && MAGIC_CMD=file
++test -z "$NM" && NM=nm
++test -z "$OBJDUMP" && OBJDUMP=objdump
++test -z "$RANLIB" && RANLIB=:
++test -z "$STRIP" && STRIP=:
++test -z "$ac_objext" && ac_objext=o
++
++if test x"$host" != x"$build"; then
++  ac_tool_prefix=${host_alias}-
++else
++  ac_tool_prefix=
++fi
++
++# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
++case $host_os in
++linux-gnu*) ;;
++linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
++esac
++
++case $host_os in
++aix3*)
++  # AIX sometimes has problems with the GCC collect2 program.  For some
++  # reason, if we set the COLLECT_NAMES environment variable, the problems
++  # vanish in a puff of smoke.
++  if test "X${COLLECT_NAMES+set}" != Xset; then
++    COLLECT_NAMES=
++    export COLLECT_NAMES
++  fi
++  ;;
++esac
++
++# Determine commands to create old-style static archives.
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
++old_postinstall_cmds='chmod 644 $oldlib'
++old_postuninstall_cmds=
++
++if test -n "$RANLIB"; then
++  case $host_os in
++  openbsd*)
++    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
++    ;;
++  *)
++    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++    ;;
++  esac
++  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
++fi
++
++# Allow CC to be a program name with arguments.
++set dummy $CC
++compiler="$2"
++
++echo $ac_n "checking for objdir""... $ac_c" 1>&6
++echo "configure:2649: checking for objdir" >&5
++rm -f .libs 2>/dev/null
++mkdir .libs 2>/dev/null
++if test -d .libs; then
++  objdir=.libs
++else
++  # MS-DOS does not allow filenames that begin with a dot.
++  objdir=_libs
++fi
++rmdir .libs 2>/dev/null
++echo "$ac_t""$objdir" 1>&6
++
++
++# Check whether --with-pic or --without-pic was given.
++if test "${with_pic+set}" = set; then
++  withval="$with_pic"
++  pic_mode="$withval"
++else
++  pic_mode=default
++fi
++
++test -z "$pic_mode" && pic_mode=default
++
++# We assume here that the value for lt_cv_prog_cc_pic will not be cached
++# in isolation, and that seeing it set (from the cache) indicates that
++# the associated values are set (in the cache) correctly too.
++echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
++echo "configure:2676: checking for $compiler option to produce PIC" >&5
++if eval "test \"`echo '$''{'lt_cv_prog_cc_pic'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++   lt_cv_prog_cc_pic=
++  lt_cv_prog_cc_shlib=
++  lt_cv_prog_cc_wl=
++  lt_cv_prog_cc_static=
++  lt_cv_prog_cc_no_builtin=
++  lt_cv_prog_cc_can_build_shared=$can_build_shared
++
++  if test "$GCC" = yes; then
++    lt_cv_prog_cc_wl='-Wl,'
++    lt_cv_prog_cc_static='-static'
++
++    case $host_os in
++    aix*)
++      # Below there is a dirty hack to force normal static linking with -ldl
++      # The problem is because libdl dynamically linked with both libc and
++      # libC (AIX C++ library), which obviously doesn't included in libraries
++      # list by gcc. This cause undefined symbols with -static flags.
++      # This hack allows C programs to be linked with "-static -ldl", but
++      # not sure about C++ programs.
++      lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC"
++      ;;
++    amigaos*)
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
++      ;;
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      lt_cv_prog_cc_pic='-fno-common'
++      ;;
++    cygwin* | mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_cv_prog_cc_pic='-DDLL_EXPORT'
++      ;;
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	 lt_cv_prog_cc_pic=-Kconform_pic
++      fi
++      ;;
++    *)
++      lt_cv_prog_cc_pic='-fPIC'
++      ;;
++    esac
++  else
++    # PORTME Check for PIC flags for the system compiler.
++    case $host_os in
++    aix3* | aix4* | aix5*)
++      lt_cv_prog_cc_wl='-Wl,'
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_cv_prog_cc_static='-Bstatic'
++      else
++	lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
++      fi
++      ;;
++
++    hpux9* | hpux10* | hpux11*)
++      # Is there a better lt_cv_prog_cc_static that works with the bundled CC?
++      lt_cv_prog_cc_wl='-Wl,'
++      lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive"
++      lt_cv_prog_cc_pic='+Z'
++      ;;
++
++    irix5* | irix6* | nonstopux*)
++      lt_cv_prog_cc_wl='-Wl,'
++      lt_cv_prog_cc_static='-non_shared'
++      # PIC (with -KPIC) is the default.
++      ;;
++
++    cygwin* | mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_cv_prog_cc_pic='-DDLL_EXPORT'
++      ;;
++
++    newsos6)
++      lt_cv_prog_cc_pic='-KPIC'
++      lt_cv_prog_cc_static='-Bstatic'
++      ;;
++
++    osf3* | osf4* | osf5*)
++      # All OSF/1 code is PIC.
++      lt_cv_prog_cc_wl='-Wl,'
++      lt_cv_prog_cc_static='-non_shared'
++      ;;
++
++    sco3.2v5*)
++      lt_cv_prog_cc_pic='-Kpic'
++      lt_cv_prog_cc_static='-dn'
++      lt_cv_prog_cc_shlib='-belf'
++      ;;
++
++    solaris*)
++      lt_cv_prog_cc_pic='-KPIC'
++      lt_cv_prog_cc_static='-Bstatic'
++      lt_cv_prog_cc_wl='-Wl,'
++      ;;
++
++    sunos4*)
++      lt_cv_prog_cc_pic='-PIC'
++      lt_cv_prog_cc_static='-Bstatic'
++      lt_cv_prog_cc_wl='-Qoption ld '
++      ;;
++
++    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++      lt_cv_prog_cc_pic='-KPIC'
++      lt_cv_prog_cc_static='-Bstatic'
++      lt_cv_prog_cc_wl='-Wl,'
++      ;;
++
++    uts4*)
++      lt_cv_prog_cc_pic='-pic'
++      lt_cv_prog_cc_static='-Bstatic'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec ;then
++	lt_cv_prog_cc_pic='-Kconform_pic'
++	lt_cv_prog_cc_static='-Bstatic'
++      fi
++      ;;
++
++    *)
++      lt_cv_prog_cc_can_build_shared=no
++      ;;
++    esac
++  fi
++
++fi
++
++if test -z "$lt_cv_prog_cc_pic"; then
++  echo "$ac_t""none" 1>&6
++else
++  echo "$ac_t""$lt_cv_prog_cc_pic" 1>&6
++
++  # Check to make sure the pic_flag actually works.
++  echo $ac_n "checking if $compiler PIC flag $lt_cv_prog_cc_pic works""... $ac_c" 1>&6
++echo "configure:2824: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
++  if eval "test \"`echo '$''{'lt_cv_prog_cc_pic_works'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++      save_CFLAGS="$CFLAGS"
++    CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
++    cat > conftest.$ac_ext <<EOF
++#line 2831 "configure"
++#include "confdefs.h"
++
++int main() {
++
++; return 0; }
++EOF
++if { (eval echo configure:2838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  rm -rf conftest*
++        case $host_os in
++      hpux9* | hpux10* | hpux11*)
++	# On HP-UX, both CC and GCC only warn that PIC is supported... then
++	# they create non-PIC objects.  So, if there were any warnings, we
++	# assume that PIC is not supported.
++	if test -s conftest.err; then
++	  lt_cv_prog_cc_pic_works=no
++	else
++	  lt_cv_prog_cc_pic_works=yes
++	fi
++	;;
++      *)
++	lt_cv_prog_cc_pic_works=yes
++	;;
++      esac
++    
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++        lt_cv_prog_cc_pic_works=no
++    
++fi
++rm -f conftest*
++    CFLAGS="$save_CFLAGS"
++  
++fi
++
++
++  if test "X$lt_cv_prog_cc_pic_works" = Xno; then
++    lt_cv_prog_cc_pic=
++    lt_cv_prog_cc_can_build_shared=no
++  else
++    lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic"
++  fi
++
++  echo "$ac_t""$lt_cv_prog_cc_pic_works" 1>&6
++fi
++
++# Check for any special shared library compilation flags.
++if test -n "$lt_cv_prog_cc_shlib"; then
++  echo "configure: warning: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" 1>&2
++  if echo "$old_CC $old_CFLAGS " | egrep -e "[ 	]$lt_cv_prog_cc_shlib[ 	]" >/dev/null; then :
++  else
++   echo "configure: warning: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" 1>&2
++    lt_cv_prog_cc_can_build_shared=no
++  fi
++fi
++
++echo $ac_n "checking if $compiler static flag $lt_cv_prog_cc_static works""... $ac_c" 1>&6
++echo "configure:2890: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
++if eval "test \"`echo '$''{'lt_cv_prog_cc_static_works'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++    lt_cv_prog_cc_static_works=no
++  save_LDFLAGS="$LDFLAGS"
++  LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
++  cat > conftest.$ac_ext <<EOF
++#line 2898 "configure"
++#include "confdefs.h"
++
++int main() {
++
++; return 0; }
++EOF
++if { (eval echo configure:2905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  lt_cv_prog_cc_static_works=yes
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++fi
++rm -f conftest*
++  LDFLAGS="$save_LDFLAGS"
++
++fi
++
++
++# Belt *and* braces to stop my trousers falling down:
++test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static=
++echo "$ac_t""$lt_cv_prog_cc_static_works" 1>&6
++
++pic_flag="$lt_cv_prog_cc_pic"
++special_shlib_compile_flags="$lt_cv_prog_cc_shlib"
++wl="$lt_cv_prog_cc_wl"
++link_static_flag="$lt_cv_prog_cc_static"
++no_builtin_flag="$lt_cv_prog_cc_no_builtin"
++can_build_shared="$lt_cv_prog_cc_can_build_shared"
++
++
++# Check to see if options -o and -c are simultaneously supported by compiler
++echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
++echo "configure:2932: checking if $compiler supports -c -o file.$ac_objext" >&5
++if eval "test \"`echo '$''{'lt_cv_compiler_c_o'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  
++$rm -r conftest 2>/dev/null
++mkdir conftest
++cd conftest
++echo "int some_variable = 0;" > conftest.$ac_ext
++mkdir out
++# According to Tom Tromey, Ian Lance Taylor reported there are C compilers
++# that will create temporary files in the current directory regardless of
++# the output directory.  Thus, making CWD read-only will cause this test
++# to fail, enabling locking or at least warning the user not to do parallel
++# builds.
++chmod -w .
++save_CFLAGS="$CFLAGS"
++CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
++compiler_c_o=no
++if { (eval echo configure:2951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
++  # The compiler can only warn and ignore the option if not recognized
++  # So say no if there are warnings
++  if test -s out/conftest.err; then
++    lt_cv_compiler_c_o=no
++  else
++    lt_cv_compiler_c_o=yes
++  fi
++else
++  # Append any errors to the config.log.
++  cat out/conftest.err 1>&5
++  lt_cv_compiler_c_o=no
++fi
++CFLAGS="$save_CFLAGS"
++chmod u+w .
++$rm conftest* out/*
++rmdir out
++cd ..
++rmdir conftest
++$rm -r conftest 2>/dev/null
++
++fi
++
++compiler_c_o=$lt_cv_compiler_c_o
++echo "$ac_t""$compiler_c_o" 1>&6
++
++if test x"$compiler_c_o" = x"yes"; then
++  # Check to see if we can write to a .lo
++  echo $ac_n "checking if $compiler supports -c -o file.lo""... $ac_c" 1>&6
++echo "configure:2980: checking if $compiler supports -c -o file.lo" >&5
++  if eval "test \"`echo '$''{'lt_cv_compiler_o_lo'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  
++  lt_cv_compiler_o_lo=no
++  save_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -c -o conftest.lo"
++  save_objext="$ac_objext"
++  ac_objext=lo
++  cat > conftest.$ac_ext <<EOF
++#line 2991 "configure"
++#include "confdefs.h"
++
++int main() {
++int some_variable = 0;
++; return 0; }
++EOF
++if { (eval echo configure:2998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  rm -rf conftest*
++      # The compiler can only warn and ignore the option if not recognized
++    # So say no if there are warnings
++    if test -s conftest.err; then
++      lt_cv_compiler_o_lo=no
++    else
++      lt_cv_compiler_o_lo=yes
++    fi
++  
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++fi
++rm -f conftest*
++  ac_objext="$save_objext"
++  CFLAGS="$save_CFLAGS"
++  
++fi
++
++  compiler_o_lo=$lt_cv_compiler_o_lo
++  echo "$ac_t""$compiler_o_lo" 1>&6
++else
++  compiler_o_lo=no
++fi
++
++# Check to see if we can do hard links to lock some files if needed
++hard_links="nottested"
++if test "$compiler_c_o" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6
++echo "configure:3029: checking if we can lock with hard links" >&5
++  hard_links=yes
++  $rm conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  echo "$ac_t""$hard_links" 1>&6
++  if test "$hard_links" = no; then
++    echo "configure: warning: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" 1>&2
++    need_locks=warn
++  fi
++else
++  need_locks=no
++fi
++
++if test "$GCC" = yes; then
++  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
++  echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6
++echo "configure:3048: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++  echo "int some_variable = 0;" > conftest.$ac_ext
++  save_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
++  compiler_rtti_exceptions=no
++  cat > conftest.$ac_ext <<EOF
++#line 3054 "configure"
++#include "confdefs.h"
++
++int main() {
++int some_variable = 0;
++; return 0; }
++EOF
++if { (eval echo configure:3061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  rm -rf conftest*
++      # The compiler can only warn and ignore the option if not recognized
++    # So say no if there are warnings
++    if test -s conftest.err; then
++      compiler_rtti_exceptions=no
++    else
++      compiler_rtti_exceptions=yes
++    fi
++  
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++fi
++rm -f conftest*
++  CFLAGS="$save_CFLAGS"
++  echo "$ac_t""$compiler_rtti_exceptions" 1>&6
++
++  if test "$compiler_rtti_exceptions" = "yes"; then
++    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
++  else
++    no_builtin_flag=' -fno-builtin'
++  fi
++fi
++
++# See if the linker supports building shared libraries.
++echo $ac_n "checking whether the linker ($LD) supports shared libraries""... $ac_c" 1>&6
++echo "configure:3088: checking whether the linker ($LD) supports shared libraries" >&5
++
++allow_undefined_flag=
++no_undefined_flag=
++need_lib_prefix=unknown
++need_version=unknown
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++archive_cmds=
++archive_expsym_cmds=
++old_archive_from_new_cmds=
++old_archive_from_expsyms_cmds=
++export_dynamic_flag_spec=
++whole_archive_flag_spec=
++thread_safe_flag_spec=
++hardcode_into_libs=no
++hardcode_libdir_flag_spec=
++hardcode_libdir_separator=
++hardcode_direct=no
++hardcode_minus_L=no
++hardcode_shlibpath_var=unsupported
++runpath_var=
++link_all_deplibs=unknown
++always_export_symbols=no
++export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
++# include_expsyms should be a list of space-separated symbols to be *always*
++# included in the symbol list
++include_expsyms=
++# exclude_expsyms can be an egrep regular expression of symbols to exclude
++# it will be wrapped by ` (' and `)$', so one must not match beginning or
++# end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++# as well as any symbol that contains `d'.
++exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
++# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++# platforms (ab)use it in PIC code, but their linkers get confused if
++# the symbol is explicitly referenced.  Since portable code cannot
++# rely on this symbol name, it's probably fine to never include it in
++# preloaded symbol tables.
++extract_expsyms_cmds=
++
++case $host_os in
++cygwin* | mingw* | pw32*)
++  # FIXME: the MSVC++ port hasn't been tested in a loooong time
++  # When not using gcc, we currently assume that we are using
++  # Microsoft Visual C++.
++  if test "$GCC" != yes; then
++    with_gnu_ld=no
++  fi
++  ;;
++openbsd*)
++  with_gnu_ld=no
++  ;;
++esac
++
++ld_shlibs=yes
++if test "$with_gnu_ld" = yes; then
++  # If archive_cmds runs LD, not CC, wlarc should be empty
++  wlarc='${wl}'
++
++  # See if GNU ld supports shared libraries.
++  case $host_os in
++  aix3* | aix4* | aix5*)
++    # On AIX, the GNU linker is very broken
++    # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available.
++    ld_shlibs=no
++    cat <<EOF 1>&2
++
++*** Warning: the GNU linker, at least up to release 2.9.1, is reported
++*** to be unable to reliably create shared libraries on AIX.
++*** Therefore, libtool is disabling shared libraries support.  If you
++*** really care for shared libraries, you may want to modify your PATH
++*** so that a non-GNU linker is found, and then restart.
++
++EOF
++    ;;
++
++  amigaos*)
++    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_minus_L=yes
++
++    # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
++    # that the semantics of dynamic libraries on AmigaOS, at least up
++    # to version 4, is to share data among multiple programs linked
++    # with the same dynamic library.  Since this doesn't match the
++    # behavior of shared libraries on other platforms, we can use
++    # them.
++    ld_shlibs=no
++    ;;
++
++  beos*)
++    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
++      allow_undefined_flag=unsupported
++      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++      # support --undefined.  This deserves some investigation.  FIXME
++      archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++    else
++      ld_shlibs=no
++    fi
++    ;;
++
++  cygwin* | mingw* | pw32*)
++    # hardcode_libdir_flag_spec is actually meaningless, as there is
++    # no search path for DLLs.
++    hardcode_libdir_flag_spec='-L$libdir'
++    allow_undefined_flag=unsupported
++    always_export_symbols=yes
++
++    extract_expsyms_cmds='test -f $output_objdir/impgen.c || \
++      sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~
++      test -f $output_objdir/impgen.exe || (cd $output_objdir && \
++      if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
++      else $CC -o impgen impgen.c ; fi)~
++      $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
++
++    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
++
++    # cygwin and mingw dlls have different entry points and sets of symbols
++    # to exclude.
++    # FIXME: what about values for MSVC?
++    dll_entry=__cygwin_dll_entry@12
++    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~
++    case $host_os in
++    mingw*)
++      # mingw values
++      dll_entry=_DllMainCRTStartup@12
++      dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~
++      ;;
++    esac
++
++    # mingw and cygwin differ, and it's simplest to just exclude the union
++    # of the two symbol sets.
++    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12
++
++    # recent cygwin and mingw systems supply a stub DllMain which the user
++    # can override, but on older systems we have to supply one (in ltdll.c)
++    if test "x$lt_cv_need_dllmain" = "xyes"; then
++      ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
++      ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~
++	test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
++    else
++      ltdll_obj=
++      ltdll_cmds=
++    fi
++
++    # Extract the symbol export list from an `--export-all' def file,
++    # then regenerate the def file from the symbol export list, so that
++    # the compiled dll only exports the symbol export list.
++    # Be careful not to strip the DATA tag left be newer dlltools.
++    export_symbols_cmds="$ltdll_cmds"'
++      $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
++      sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols'
++
++    # If the export-symbols file already is a .def file (1st line
++    # is EXPORTS), use it as is.
++    # If DATA tags from a recent dlltool are present, honour them!
++    archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then
++	cp $export_symbols $output_objdir/$soname-def;
++      else
++	echo EXPORTS > $output_objdir/$soname-def;
++	_lt_hint=1;
++	cat $export_symbols | while read symbol; do
++	 set dummy \$symbol;
++	 case \$# in
++	   2) echo "   \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
++	   4) echo "   \$2 \$3 \$4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;;
++	   *) echo "     \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;;
++	 esac;
++	 _lt_hint=`expr 1 + \$_lt_hint`;
++	done;
++      fi~
++      '"$ltdll_cmds"'
++      $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
++      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~
++      $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
++      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~
++      $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
++    ;;
++
++  netbsd*)
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++      archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
++      wlarc=
++    else
++      archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++    fi
++    ;;
++
++  solaris* | sysv5*)
++    if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
++      ld_shlibs=no
++      cat <<EOF 1>&2
++
++*** Warning: The releases 2.8.* of the GNU linker cannot reliably
++*** create shared libraries on Solaris systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.9.1 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++EOF
++    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
++      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++    else
++      ld_shlibs=no
++    fi
++    ;;
++
++  sunos4*)
++    archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++    wlarc=
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  *)
++    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
++      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++    else
++      ld_shlibs=no
++    fi
++    ;;
++  esac
++
++  if test "$ld_shlibs" = yes; then
++    runpath_var=LD_RUN_PATH
++    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
++    export_dynamic_flag_spec='${wl}--export-dynamic'
++    case $host_os in
++    cygwin* | mingw* | pw32*)
++      # dlltool doesn't understand --whole-archive et. al.
++      whole_archive_flag_spec=
++      ;;
++    *)
++      # ancient GNU ld didn't support --whole-archive et. al.
++      if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
++	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++	whole_archive_flag_spec=
++      fi
++      ;;
++    esac
++  fi
++else
++  # PORTME fill in a description of your system's linker (not GNU ld)
++  case $host_os in
++  aix3*)
++    allow_undefined_flag=unsupported
++    always_export_symbols=yes
++    archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
++    # Note: this linker hardcodes the directories in LIBPATH if there
++    # are no directories specified by -L.
++    hardcode_minus_L=yes
++    if test "$GCC" = yes && test -z "$link_static_flag"; then
++      # Neither direct hardcoding nor static linking is supported with a
++      # broken collect2.
++      hardcode_direct=unsupported
++    fi
++    ;;
++
++  aix4* | aix5*)
++    if test "$host_cpu" = ia64; then
++      # On IA64, the linker does run time linking by default, so we don't
++      # have to do anything special.
++      aix_use_runtimelinking=no
++      exp_sym_flag='-Bexport'
++      no_entry_flag=""
++    else
++      aix_use_runtimelinking=no
++
++      # Test if we are trying to use run time linking or normal
++      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
++      # need to do runtime linking.
++      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++	for ld_flag in $LDFLAGS; do
++	  case $ld_flag in
++	  *-brtl*)
++	    aix_use_runtimelinking=yes
++	    break
++	  ;;
++	  esac
++	done
++      esac
++
++      exp_sym_flag='-bexport'
++      no_entry_flag='-bnoentry'
++    fi
++
++    # When large executables or shared objects are built, AIX ld can
++    # have problems creating the table of contents.  If linking a library
++    # or program results in "error TOC overflow" add -mminimal-toc to
++    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++    hardcode_direct=yes
++    archive_cmds=''
++    hardcode_libdir_separator=':'
++    if test "$GCC" = yes; then
++      case $host_os in aix4.[012]|aix4.[012].*)
++	collect2name=`${CC} -print-prog-name=collect2`
++	if test -f "$collect2name" && \
++	  strings "$collect2name" | grep resolve_lib_name >/dev/null
++	then
++	  # We have reworked collect2
++	  hardcode_direct=yes
++	else
++	  # We have old collect2
++	  hardcode_direct=unsupported
++	  # It fails to find uninstalled libraries when the uninstalled
++	  # path is not listed in the libpath.  Setting hardcode_minus_L
++	  # to unsupported forces relinking
++	  hardcode_minus_L=yes
++	  hardcode_libdir_flag_spec='-L$libdir'
++	  hardcode_libdir_separator=
++	fi
++      esac
++
++      shared_flag='-shared'
++    else
++      # not using gcc
++      if test "$host_cpu" = ia64; then
++	shared_flag='${wl}-G'
++      else
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag='${wl}-G'
++	else
++	  shared_flag='${wl}-bM:SRE'
++	fi
++      fi
++    fi
++
++    # It seems that -bexpall can do strange things, so it is better to
++    # generate a list of symbols to export.
++    always_export_symbols=yes
++    if test "$aix_use_runtimelinking" = yes; then
++      # Warning - without using the other runtime loading flags (-brtl),
++      # -berok will link without error, but may produce a broken library.
++      allow_undefined_flag='-berok'
++      hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
++      archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++    else
++      if test "$host_cpu" = ia64; then
++	hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
++	allow_undefined_flag="-z nodefs"
++	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++      else
++	hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
++	# Warning - without using the other run time loading flags,
++	# -berok will link without error, but may produce a broken library.
++	allow_undefined_flag='${wl}-berok'
++	# This is a bit strange, but is similar to how AIX traditionally builds
++	# it's shared libraries.
++	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname'
++      fi
++    fi
++    ;;
++
++  amigaos*)
++    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_minus_L=yes
++    # see comment about different semantics on the GNU ld section
++    ld_shlibs=no
++    ;;
++
++  cygwin* | mingw* | pw32*)
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    # hardcode_libdir_flag_spec is actually meaningless, as there is
++    # no search path for DLLs.
++    hardcode_libdir_flag_spec=' '
++    allow_undefined_flag=unsupported
++    # Tell ltmain to make .lib files, not .a files.
++    libext=lib
++    # FIXME: Setting linknames here is a bad hack.
++    archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
++    # The linker will automatically build a .lib file if we build a DLL.
++    old_archive_from_new_cmds='true'
++    # FIXME: Should let the user specify the lib program.
++    old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
++    fix_srcfile_path='`cygpath -w "$srcfile"`'
++    ;;
++
++  darwin* | rhapsody*)
++    case "$host_os" in
++    rhapsody* | darwin1.[012])
++      allow_undefined_flag='-undefined suppress'
++      ;;
++    *) # Darwin 1.3 on
++      allow_undefined_flag='-flat_namespace -undefined suppress'
++      ;;
++    esac
++    # FIXME: Relying on posixy $() will cause problems for
++    #        cross-compilation, but unfortunately the echo tests do not
++    #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
++    #	     `"' quotes if we put them in here... so don't!
++    archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
++    # We need to add '_' to the symbols in $export_symbols first
++    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    whole_archive_flag_spec='-all_load $convenience'
++    ;;
++
++  freebsd1*)
++    ld_shlibs=no
++    ;;
++
++  # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
++  # support.  Future versions do this automatically, but an explicit c++rt0.o
++  # does not break anything, and helps significantly (at the cost of a little
++  # extra space).
++  freebsd2.2*)
++    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
++    hardcode_libdir_flag_spec='-R$libdir'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  # Unfortunately, older versions of FreeBSD 2 do not have this feature.
++  freebsd2*)
++    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_direct=yes
++    hardcode_minus_L=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
++  freebsd*)
++    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++    hardcode_libdir_flag_spec='-R$libdir'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  hpux9* | hpux10* | hpux11*)
++    case $host_os in
++    hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
++    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;;
++    esac
++    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++    hardcode_libdir_separator=:
++    hardcode_direct=yes
++    hardcode_minus_L=yes # Not in the search PATH, but as the default
++			 # location of the library.
++    export_dynamic_flag_spec='${wl}-E'
++    ;;
++
++  irix5* | irix6* | nonstopux*)
++    if test "$GCC" = yes; then
++      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    else
++      archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++      hardcode_libdir_flag_spec='-rpath $libdir'
++    fi
++    hardcode_libdir_separator=:
++    link_all_deplibs=yes
++    ;;
++
++  netbsd*)
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
++    else
++      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
++    fi
++    hardcode_libdir_flag_spec='-R$libdir'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  newsos6)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_direct=yes
++    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    hardcode_libdir_separator=:
++    hardcode_shlibpath_var=no
++    ;;
++
++  openbsd*)
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++      export_dynamic_flag_spec='${wl}-E'
++    else
++      case "$host_os" in
++      openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	hardcode_libdir_flag_spec='-R$libdir'
++        ;;
++      *)
++        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++        ;;
++      esac
++    fi
++    ;;
++
++  os2*)
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_minus_L=yes
++    allow_undefined_flag=unsupported
++    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++    old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++    ;;
++
++  osf3*)
++    if test "$GCC" = yes; then
++      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
++      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++    else
++      allow_undefined_flag=' -expect_unresolved \*'
++      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++    fi
++    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    hardcode_libdir_separator=:
++    ;;
++
++  osf4* | osf5*)	# as osf3* with the addition of -msym flag
++    if test "$GCC" = yes; then
++      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
++      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    else
++      allow_undefined_flag=' -expect_unresolved \*'
++      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++      archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
++      $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++
++      #Both c and cxx compiler support -rpath directly
++      hardcode_libdir_flag_spec='-rpath $libdir'
++    fi
++    hardcode_libdir_separator=:
++    ;;
++
++  sco3.2v5*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_shlibpath_var=no
++    runpath_var=LD_RUN_PATH
++    hardcode_runpath_var=yes
++    export_dynamic_flag_spec='${wl}-Bexport'
++    ;;
++
++  solaris*)
++    # gcc --version < 3.0 without binutils cannot create self contained
++    # shared libraries reliably, requiring libgcc.a to resolve some of
++    # the object symbols generated in some cases.  Libraries that use
++    # assert need libgcc.a to resolve __eprintf, for example.  Linking
++    # a copy of libgcc.a into every shared library to guarantee resolving
++    # such symbols causes other problems:  According to Tim Van Holder
++    # <tim.van.holder@pandora.be>, C++ libraries end up with a separate
++    # (to the application) exception stack for one thing.
++    no_undefined_flag=' -z defs'
++    if test "$GCC" = yes; then
++      case `$CC --version 2>/dev/null` in
++      [12].*)
++	cat <<EOF 1>&2
++
++*** Warning: Releases of GCC earlier than version 3.0 cannot reliably
++*** create self contained shared libraries on Solaris systems, without
++*** introducing a dependency on libgcc.a.  Therefore, libtool is disabling
++*** -no-undefined support, which will at least allow you to build shared
++*** libraries.  However, you may find that when you link such libraries
++*** into an application without using GCC, you have to manually add
++*** \`gcc --print-libgcc-file-name\` to the link command.  We urge you to
++*** upgrade to a newer version of GCC.  Another option is to rebuild your
++*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer.
++
++EOF
++        no_undefined_flag=
++	;;
++      esac
++    fi
++    # $CC -shared without GNU ld will not create a library from C++
++    # object files and a static libstdc++, better avoid it by now
++    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++    hardcode_libdir_flag_spec='-R$libdir'
++    hardcode_shlibpath_var=no
++    case $host_os in
++    solaris2.[0-5] | solaris2.[0-5].*) ;;
++    *) # Supported since Solaris 2.6 (maybe 2.5.1?)
++      whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
++    esac
++    link_all_deplibs=yes
++    ;;
++
++  sunos4*)
++    if test "x$host_vendor" = xsequent; then
++      # Use $CC to link under sequent, because it throws in some extra .o
++      # files that make .init and .fini sections work.
++      archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++    else
++      archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
++    fi
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_direct=yes
++    hardcode_minus_L=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  sysv4)
++    case $host_vendor in
++      sni)
++        archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++        hardcode_direct=yes # is this really true???
++        ;;
++      siemens)
++        ## LD is ld it makes a PLAMLIB
++        ## CC just makes a GrossModule.
++        archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++        reload_cmds='$CC -r -o $output$reload_objs'
++        hardcode_direct=no
++        ;;
++      motorola)
++        archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++        hardcode_direct=no #Motorola manual says yes, but my tests say they lie
++        ;;
++    esac
++    runpath_var='LD_RUN_PATH'
++    hardcode_shlibpath_var=no
++    ;;
++
++  sysv4.3*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_shlibpath_var=no
++    export_dynamic_flag_spec='-Bexport'
++    ;;
++
++  sysv5*)
++    no_undefined_flag=' -z text'
++    # $CC -shared without GNU ld will not create a library from C++
++    # object files and a static libstdc++, better avoid it by now
++    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++    hardcode_libdir_flag_spec=
++    hardcode_shlibpath_var=no
++    runpath_var='LD_RUN_PATH'
++    ;;
++
++  uts4*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_shlibpath_var=no
++    ;;
++
++  dgux*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_shlibpath_var=no
++    ;;
++
++  sysv4*MP*)
++    if test -d /usr/nec; then
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var=no
++      runpath_var=LD_RUN_PATH
++      hardcode_runpath_var=yes
++      ld_shlibs=yes
++    fi
++    ;;
++
++  sysv4.2uw2*)
++    archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_direct=yes
++    hardcode_minus_L=no
++    hardcode_shlibpath_var=no
++    hardcode_runpath_var=yes
++    runpath_var=LD_RUN_PATH
++    ;;
++
++  sysv5uw7* | unixware7*)
++    no_undefined_flag='${wl}-z ${wl}text'
++    if test "$GCC" = yes; then
++      archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++    else
++      archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++    fi
++    runpath_var='LD_RUN_PATH'
++    hardcode_shlibpath_var=no
++    ;;
++
++  *)
++    ld_shlibs=no
++    ;;
++  esac
++fi
++echo "$ac_t""$ld_shlibs" 1>&6
++test "$ld_shlibs" = no && can_build_shared=no
++
++# Check hardcoding attributes.
++echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
++echo "configure:3787: checking how to hardcode library paths into programs" >&5
++hardcode_action=
++if test -n "$hardcode_libdir_flag_spec" || \
++   test -n "$runpath_var"; then
++
++  # We can hardcode non-existant directories.
++  if test "$hardcode_direct" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$hardcode_shlibpath_var" != no &&
++     test "$hardcode_minus_L" != no; then
++    # Linking always hardcodes the temporary library directory.
++    hardcode_action=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    hardcode_action=immediate
++  fi
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  hardcode_action=unsupported
++fi
++echo "$ac_t""$hardcode_action" 1>&6
++
++striplib=
++old_striplib=
++echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6
++echo "configure:3815: checking whether stripping libraries is possible" >&5
++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
++  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
++  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
++  echo "$ac_t""yes" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++reload_cmds='$LD$reload_flag -o $output$reload_objs'
++test -z "$deplibs_check_method" && deplibs_check_method=unknown
++
++# PORTME Fill in your ld.so characteristics
++echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
++echo "configure:3829: checking dynamic linker characteristics" >&5
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++
++case $host_os in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}.so$versuffix $libname.a'
++  shlibpath_var=LIBPATH
++
++  # AIX has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}.so$major'
++  ;;
++
++aix4* | aix5*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  hardcode_into_libs=yes
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
++    library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
++    shlibpath_var=LD_LIBRARY_PATH
++  else
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
++    case $host_os in
++      aix4 | aix4.[01] | aix4.[01].*)
++	if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++	     echo ' yes '
++	     echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
++	  :
++	else
++	  can_build_shared=no
++	fi
++	;;
++    esac
++    # AIX (on Power*) has no versioning support, so currently we can
++    # not hardcode correct soname into executable. Probably we can
++    # add versioning support to collect2, so additional links can
++    # be useful in future.
++    if test "$aix_use_runtimelinking" = yes; then
++      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++      # instead of lib<name>.a to let people know that these are not
++      # typical AIX shared libraries.
++      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++    else
++      # We preserve .a as extension for shared libraries through AIX4.2
++      # and later when we are not doing run time linking.
++      library_names_spec='${libname}${release}.a $libname.a'
++      soname_spec='${libname}${release}.so$major'
++    fi
++    shlibpath_var=LIBPATH
++  fi
++  hardcode_into_libs=yes
++  ;;
++
++amigaos*)
++  library_names_spec='$libname.ixlibrary $libname.a'
++  # Create ${libname}_ixlibrary.a entries in /sys/libs.
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
++  ;;
++
++beos*)
++  library_names_spec='${libname}.so'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  ;;
++
++bsdi4*)
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  export_dynamic_flag_spec=-rdynamic
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
++  ;;
++
++cygwin* | mingw* | pw32*)
++  version_type=windows
++  need_version=no
++  need_lib_prefix=no
++  case $GCC,$host_os in
++  yes,cygwin*)
++    library_names_spec='$libname.dll.a'
++    soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
++    postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog .libs/$dlname \$dldir/$dlname'
++    postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $rm \$dlpath'
++    ;;
++  yes,mingw*)
++    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
++    sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"`
++    ;;
++  yes,pw32*)
++    library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll'
++    ;;
++  *)
++    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib'
++    ;;
++  esac
++  dynamic_linker='Win32 ld.exe'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
++  ;;
++
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
++  # FIXME: Relying on posixy $() will cause problems for
++  #        cross-compilation, but unfortunately the echo tests do not
++  #        yet detect zsh echo's removal of \ escapes.
++  library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)'
++  soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)'
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
++  ;;
++
++freebsd1*)
++  dynamic_linker=no
++  ;;
++
++freebsd*-gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU/FreeBSD ld.so'
++  ;;
++
++freebsd*)
++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  version_type=freebsd-$objformat
++  case $version_type in
++    freebsd-elf*)
++      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
++      need_version=no
++      need_lib_prefix=no
++      ;;
++    freebsd-*)
++      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
++      need_version=yes
++      ;;
++  esac
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_os in
++  freebsd2*)
++    shlibpath_overrides_runpath=yes
++    ;;
++  *)
++    shlibpath_overrides_runpath=no
++    hardcode_into_libs=yes
++    ;;
++  esac
++  ;;
++
++gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  ;;
++
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  dynamic_linker="$host_os dld.sl"
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  shlibpath_var=SHLIB_PATH
++  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
++  soname_spec='${libname}${release}.sl$major'
++  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  postinstall_cmds='chmod 555 $lib'
++  ;;
++
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++    nonstopux*) version_type=nonstopux ;;
++    *)          version_type=irix ;;
++  esac
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}.so$major'
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
++  case $host_os in
++  irix5* | nonstopux*)
++    libsuff= shlibsuff=
++    ;;
++  *)
++    case $LD in # libtool.m4 will add one of these switches to LD
++    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
++    ;;
++  esac
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  ;;
++
++# No shared lib support for Linux oldld, aout, or coff.
++linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
++  dynamic_linker=no
++  ;;
++
++# This must be Linux ELF.
++linux-gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
++
++  # We used to test for /lib/ld.so.1 and disable shared libraries on
++  # powerpc, because MkLinux only supported shared libraries with the
++  # GNU dynamic linker.  Since this was broken with cross compilers,
++  # most powerpc-linux boxes support dynamic linking these days and
++  # people can always --disable-shared, the test was removed, and we
++  # assume the GNU/Linux dynamic linker is in use.
++  dynamic_linker='GNU/Linux ld.so'
++  ;;
++
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
++    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
++    soname_spec='${libname}${release}.so$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
++
++newsos6)
++  version_type=linux
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++openbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    case "$host_os" in
++    openbsd2.[89] | openbsd2.[89].*)
++      shlibpath_overrides_runpath=no
++      ;;
++    *)
++      shlibpath_overrides_runpath=yes
++      ;;
++    esac
++  else
++    shlibpath_overrides_runpath=yes
++  fi
++  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++os2*)
++  libname_spec='$name'
++  need_lib_prefix=no
++  library_names_spec='$libname.dll $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
++
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_version=no
++  need_lib_prefix=no
++  soname_spec='${libname}${release}.so$major'
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  hardcode_into_libs=yes
++  ;;
++
++sco3.2v5*)
++  version_type=osf
++  soname_spec='${libname}${release}.so$major'
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++solaris*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  ;;
++
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
++  ;;
++
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++  version_type=linux
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_vendor in
++    sni)
++      shlibpath_overrides_runpath=no
++      need_lib_prefix=no
++      export_dynamic_flag_spec='${wl}-Blargedynsym'
++      runpath_var=LD_RUN_PATH
++      ;;
++    siemens)
++      need_lib_prefix=no
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
++  esac
++  ;;
++
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
++    soname_spec='$libname.so.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
++
++*)
++  dynamic_linker=no
++  ;;
++esac
++echo "$ac_t""$dynamic_linker" 1>&6
++test "$dynamic_linker" = no && can_build_shared=no
++
++# Report the final consequences.
++echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6
++echo "configure:4253: checking if libtool supports shared libraries" >&5
++echo "$ac_t""$can_build_shared" 1>&6
++
++echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6
++echo "configure:4257: checking whether to build shared libraries" >&5
++test "$can_build_shared" = "no" && enable_shared=no
++
++# On AIX, shared libraries and static libraries use the same namespace, and
++# are all built from PIC.
++case "$host_os" in
++aix3*)
++  test "$enable_shared" = yes && enable_static=no
++  if test -n "$RANLIB"; then
++    archive_cmds="$archive_cmds~\$RANLIB \$lib"
++    postinstall_cmds='$RANLIB $lib'
++  fi
++  ;;
++
++aix4*)
++  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++    test "$enable_shared" = yes && enable_static=no
++  fi
++  ;;
++esac
++echo "$ac_t""$enable_shared" 1>&6
++
++echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6
++echo "configure:4280: checking whether to build static libraries" >&5
++# Make sure either enable_shared or enable_static is yes.
++test "$enable_shared" = yes || enable_static=yes
++echo "$ac_t""$enable_static" 1>&6
++
++if test "$hardcode_action" = relink; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
++fi
++
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
++if test "x$enable_dlopen" != xyes; then
++  enable_dlopen=unknown
++  enable_dlopen_self=unknown
++  enable_dlopen_self_static=unknown
++else
++  lt_cv_dlopen=no
++  lt_cv_dlopen_libs=
++
++  case $host_os in
++  beos*)
++    lt_cv_dlopen="load_add_on"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ;;
++
++  cygwin* | mingw* | pw32*)
++    lt_cv_dlopen="LoadLibrary"
++    lt_cv_dlopen_libs=
++   ;;
++
++  *)
++    echo $ac_n "checking for shl_load""... $ac_c" 1>&6
++echo "configure:4321: checking for shl_load" >&5
++if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 4326 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char shl_load(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char shl_load();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_shl_load) || defined (__stub___shl_load)
++choke me
++#else
++shl_load();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:4349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_shl_load=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_shl_load=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  lt_cv_dlopen="shl_load"
++else
++  echo "$ac_t""no" 1>&6
++echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
++echo "configure:4367: checking for shl_load in -ldld" >&5
++ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-ldld  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 4375 "configure"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char shl_load();
++
++int main() {
++shl_load()
++; return 0; }
++EOF
++if { (eval echo configure:4386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
++else
++  echo "$ac_t""no" 1>&6
++echo $ac_n "checking for dlopen""... $ac_c" 1>&6
++echo "configure:4405: checking for dlopen" >&5
++if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 4410 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char dlopen(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char dlopen();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_dlopen) || defined (__stub___dlopen)
++choke me
++#else
++dlopen();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:4433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_dlopen=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_dlopen=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  lt_cv_dlopen="dlopen"
++else
++  echo "$ac_t""no" 1>&6
++echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
++echo "configure:4451: checking for dlopen in -ldl" >&5
++ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-ldl  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 4459 "configure"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char dlopen();
++
++int main() {
++dlopen()
++; return 0; }
++EOF
++if { (eval echo configure:4470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++else
++  echo "$ac_t""no" 1>&6
++echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
++echo "configure:4489: checking for dlopen in -lsvld" >&5
++ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-lsvld  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 4497 "configure"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char dlopen();
++
++int main() {
++dlopen()
++; return 0; }
++EOF
++if { (eval echo configure:4508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
++else
++  echo "$ac_t""no" 1>&6
++echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
++echo "configure:4527: checking for dld_link in -ldld" >&5
++ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-ldld  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 4535 "configure"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char dld_link();
++
++int main() {
++dld_link()
++; return 0; }
++EOF
++if { (eval echo configure:4546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++	      
++fi
++
++	    
++fi
++
++	  
++fi
++
++	
++fi
++
++      
++fi
++
++    ;;
++  esac
++
++  if test "x$lt_cv_dlopen" != xno; then
++    enable_dlopen=yes
++  else
++    enable_dlopen=no
++  fi
++
++  case $lt_cv_dlopen in
++  dlopen)
++    save_CPPFLAGS="$CPPFLAGS"
++        test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++
++    save_LDFLAGS="$LDFLAGS"
++    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++
++    save_LIBS="$LIBS"
++    LIBS="$lt_cv_dlopen_libs $LIBS"
++
++    echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
++echo "configure:4602: checking whether a program can dlopen itself" >&5
++if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  	  if test "$cross_compiling" = yes; then :
++  lt_cv_dlopen_self=cross
++else
++    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++#line 4612 "configure"
++#include "confdefs.h"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++
++    exit (status);
++}
++EOF
++  if { (eval echo configure:4673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
++    esac
++  else :
++    # compilation failed
++    lt_cv_dlopen_self=no
++  fi
++fi
++rm -fr conftest*
++
++    
++fi
++
++echo "$ac_t""$lt_cv_dlopen_self" 1>&6
++
++    if test "x$lt_cv_dlopen_self" = xyes; then
++      LDFLAGS="$LDFLAGS $link_static_flag"
++      echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
++echo "configure:4696: checking whether a statically linked program can dlopen itself" >&5
++if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  	  if test "$cross_compiling" = yes; then :
++  lt_cv_dlopen_self_static=cross
++else
++    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++#line 4706 "configure"
++#include "confdefs.h"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++
++    exit (status);
++}
++EOF
++  if { (eval echo configure:4767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
++    esac
++  else :
++    # compilation failed
++    lt_cv_dlopen_self_static=no
++  fi
++fi
++rm -fr conftest*
++
++      
++fi
++
++echo "$ac_t""$lt_cv_dlopen_self_static" 1>&6
++    fi
++
++    CPPFLAGS="$save_CPPFLAGS"
++    LDFLAGS="$save_LDFLAGS"
++    LIBS="$save_LIBS"
++    ;;
++  esac
++
++  case $lt_cv_dlopen_self in
++  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
++  *) enable_dlopen_self=unknown ;;
++  esac
++
++  case $lt_cv_dlopen_self_static in
++  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
++  *) enable_dlopen_self_static=unknown ;;
++  esac
++fi
++
++
++if test "$enable_shared" = yes && test "$GCC" = yes; then
++  case $archive_cmds in
++  *'~'*)
++    # FIXME: we may have to deal with multi-command sequences.
++    ;;
++  '$CC '*)
++    # Test whether the compiler implicitly links with -lc since on some
++    # systems, -lgcc has to come before -lc. If gcc already passes -lc
++    # to ld, don't add -lc before -lgcc.
++    echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6
++echo "configure:4816: checking whether -lc should be explicitly linked in" >&5
++    if eval "test \"`echo '$''{'lt_cv_archive_cmds_need_lc'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  $rm conftest*
++    echo 'static int dummy;' > conftest.$ac_ext
++
++    if { (eval echo configure:4823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++      soname=conftest
++      lib=conftest
++      libobjs=conftest.$ac_objext
++      deplibs=
++      wl=$lt_cv_prog_cc_wl
++      compiler_flags=-v
++      linker_flags=-v
++      verstring=
++      output_objdir=.
++      libname=conftest
++      save_allow_undefined_flag=$allow_undefined_flag
++      allow_undefined_flag=
++      if { (eval echo configure:4836: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
++      then
++	lt_cv_archive_cmds_need_lc=no
++      else
++	lt_cv_archive_cmds_need_lc=yes
++      fi
++      allow_undefined_flag=$save_allow_undefined_flag
++    else
++      cat conftest.err 1>&5
++    fi
++fi
++
++    echo "$ac_t""$lt_cv_archive_cmds_need_lc" 1>&6
++    ;;
++  esac
++fi
++need_lc=${lt_cv_archive_cmds_need_lc-yes}
++
++# The second clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  :
++else
++  # If there is no Makefile yet, we rely on a make rule to execute
++  # `config.status --recheck' to rerun these tests and create the
++  # libtool script then.
++  test -f Makefile && make "$ltmain"
++fi
++
++if test -f "$ltmain"; then
++  trap "$rm \"${ofile}T\"; exit 1" 1 2 15
++  $rm -f "${ofile}T"
++
++  echo creating $ofile
++
++  # Now quote all the things that may contain metacharacters while being
++  # careful not to overquote the AC_SUBSTed values.  We take copies of the
++  # variables and quote the copies for generation of the libtool script.
++  for var in echo old_CC old_CFLAGS SED \
++    AR AR_FLAGS CC LD LN_S NM SHELL \
++    reload_flag reload_cmds wl \
++    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
++    thread_safe_flag_spec whole_archive_flag_spec libname_spec \
++    library_names_spec soname_spec \
++    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
++    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \
++    postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \
++    old_striplib striplib file_magic_cmd export_symbols_cmds \
++    deplibs_check_method allow_undefined_flag no_undefined_flag \
++    finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
++    global_symbol_to_c_name_address \
++    hardcode_libdir_flag_spec hardcode_libdir_separator  \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
++
++    case $var in
++    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
++    extract_expsyms_cmds | old_archive_from_expsyms_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
++  cat <<__EOF__ > "${ofile}T"
++#! $SHELL
++
++# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
++# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
++# NOTE: Changes made to this file will be lost: look at ltmain.sh.
++#
++# Copyright (C) 1996-2000 Free Software Foundation, Inc.
++# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++# A sed that does not truncate output.
++SED=$lt_SED
++
++# Sed that helps us avoid accidentally triggering echo(1) options like -n.
++Xsed="${SED} -e s/^X//"
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++
++# ### BEGIN LIBTOOL CONFIG
++
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
++
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
++
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
++
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$need_lc
++
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
++
++# The host system.
++host_alias=$host_alias
++host=$host
++
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
++
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
++
++# The default C compiler.
++CC=$lt_CC
++
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC
++
++# The linker used to build libraries.
++LD=$lt_LD
++
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
++
++# A BSD-compatible nm program.
++NM=$lt_NM
++
++# A symbol stripping program
++STRIP=$STRIP
++
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
++
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
++
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
++
++# Used on cygwin: assembler.
++AS="$AS"
++
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
++
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
++
++# How to pass a linker flag through the compiler.
++wl=$lt_wl
++
++# Object file suffix (normally "o").
++objext="$ac_objext"
++
++# Old archive suffix (normally "a").
++libext="$libext"
++
++# Executable file suffix (normally "").
++exeext="$exeext"
++
++# Additional compiler flags for building library objects.
++pic_flag=$lt_pic_flag
++pic_mode=$pic_mode
++
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_compiler_c_o
++
++# Can we write directly to a .lo ?
++compiler_o_lo=$lt_compiler_o_lo
++
++# Must we lock files when doing compilation ?
++need_locks=$lt_need_locks
++
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
++
++# Do we need a version for libraries?
++need_version=$need_version
++
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
++
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
++
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
++
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_link_static_flag
++
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_no_builtin_flag
++
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
++
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec
++
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec
++
++# Library versioning type.
++version_type=$version_type
++
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
++
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
++
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
++
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
++
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
++
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
++
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds
++archive_expsym_cmds=$lt_archive_expsym_cmds
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
++
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
++
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
++
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
++
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag
++
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag
++
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
++
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
++
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_global_symbol_pipe
++
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_global_symbol_to_cdecl
++
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address
++
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
++
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
++
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action
++
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
++
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
++
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$lt_hardcode_libdir_separator
++
++# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$hardcode_direct
++
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$hardcode_minus_L
++
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var
++
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
++
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$link_all_deplibs
++
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$fix_srcfile_path"
++
++# Set to yes if exported symbols are required.
++always_export_symbols=$always_export_symbols
++
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_export_symbols_cmds
++
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
++
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms
++
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms
++
++# ### END LIBTOOL CONFIG
++
++__EOF__
++
++  case $host_os in
++  aix3*)
++    cat <<\EOF >> "${ofile}T"
++
++# AIX sometimes has problems with the GCC collect2 program.  For some
++# reason, if we set the COLLECT_NAMES environment variable, the problems
++# vanish in a puff of smoke.
++if test "X${COLLECT_NAMES+set}" != Xset; then
++  COLLECT_NAMES=
++  export COLLECT_NAMES
++fi
++EOF
++    ;;
++  esac
++
++  case $host_os in
++  cygwin* | mingw* | pw32* | os2*)
++    cat <<'EOF' >> "${ofile}T"
++      # This is a source program that is used to create dlls on Windows
++      # Don't remove nor modify the starting and closing comments
++# /* ltdll.c starts here */
++# #define WIN32_LEAN_AND_MEAN
++# #include <windows.h>
++# #undef WIN32_LEAN_AND_MEAN
++# #include <stdio.h>
++#
++# #ifndef __CYGWIN__
++# #  ifdef __CYGWIN32__
++# #    define __CYGWIN__ __CYGWIN32__
++# #  endif
++# #endif
++#
++# #ifdef __cplusplus
++# extern "C" {
++# #endif
++# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
++# #ifdef __cplusplus
++# }
++# #endif
++#
++# #ifdef __CYGWIN__
++# #include <cygwin/cygwin_dll.h>
++# DECLARE_CYGWIN_DLL( DllMain );
++# #endif
++# HINSTANCE __hDllInstance_base;
++#
++# BOOL APIENTRY
++# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
++# {
++#   __hDllInstance_base = hInst;
++#   return TRUE;
++# }
++# /* ltdll.c ends here */
++	# This is a source program that is used to create import libraries
++	# on Windows for dlls which lack them. Don't remove nor modify the
++	# starting and closing comments
++# /* impgen.c starts here */
++# /*   Copyright (C) 1999-2000 Free Software Foundation, Inc.
++#
++#  This file is part of GNU libtool.
++#
++#  This program is free software; you can redistribute it and/or modify
++#  it under the terms of the GNU General Public License as published by
++#  the Free Software Foundation; either version 2 of the License, or
++#  (at your option) any later version.
++#
++#  This program is distributed in the hope that it will be useful,
++#  but WITHOUT ANY WARRANTY; without even the implied warranty of
++#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++#  GNU General Public License for more details.
++#
++#  You should have received a copy of the GNU General Public License
++#  along with this program; if not, write to the Free Software
++#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#  */
++#
++# #include <stdio.h>		/* for printf() */
++# #include <unistd.h>		/* for open(), lseek(), read() */
++# #include <fcntl.h>		/* for O_RDONLY, O_BINARY */
++# #include <string.h>		/* for strdup() */
++#
++# /* O_BINARY isn't required (or even defined sometimes) under Unix */
++# #ifndef O_BINARY
++# #define O_BINARY 0
++# #endif
++#
++# static unsigned int
++# pe_get16 (fd, offset)
++#      int fd;
++#      int offset;
++# {
++#   unsigned char b[2];
++#   lseek (fd, offset, SEEK_SET);
++#   read (fd, b, 2);
++#   return b[0] + (b[1]<<8);
++# }
++#
++# static unsigned int
++# pe_get32 (fd, offset)
++#     int fd;
++#     int offset;
++# {
++#   unsigned char b[4];
++#   lseek (fd, offset, SEEK_SET);
++#   read (fd, b, 4);
++#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
++# }
++#
++# static unsigned int
++# pe_as32 (ptr)
++#      void *ptr;
++# {
++#   unsigned char *b = ptr;
++#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
++# }
++#
++# int
++# main (argc, argv)
++#     int argc;
++#     char *argv[];
++# {
++#     int dll;
++#     unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
++#     unsigned long export_rva, export_size, nsections, secptr, expptr;
++#     unsigned long name_rvas, nexp;
++#     unsigned char *expdata, *erva;
++#     char *filename, *dll_name;
++#
++#     filename = argv[1];
++#
++#     dll = open(filename, O_RDONLY|O_BINARY);
++#     if (dll < 1)
++# 	return 1;
++#
++#     dll_name = filename;
++#
++#     for (i=0; filename[i]; i++)
++# 	if (filename[i] == '/' || filename[i] == '\\'  || filename[i] == ':')
++# 	    dll_name = filename + i +1;
++#
++#     pe_header_offset = pe_get32 (dll, 0x3c);
++#     opthdr_ofs = pe_header_offset + 4 + 20;
++#     num_entries = pe_get32 (dll, opthdr_ofs + 92);
++#
++#     if (num_entries < 1) /* no exports */
++# 	return 1;
++#
++#     export_rva = pe_get32 (dll, opthdr_ofs + 96);
++#     export_size = pe_get32 (dll, opthdr_ofs + 100);
++#     nsections = pe_get16 (dll, pe_header_offset + 4 +2);
++#     secptr = (pe_header_offset + 4 + 20 +
++# 	      pe_get16 (dll, pe_header_offset + 4 + 16));
++#
++#     expptr = 0;
++#     for (i = 0; i < nsections; i++)
++#     {
++# 	char sname[8];
++# 	unsigned long secptr1 = secptr + 40 * i;
++# 	unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
++# 	unsigned long vsize = pe_get32 (dll, secptr1 + 16);
++# 	unsigned long fptr = pe_get32 (dll, secptr1 + 20);
++# 	lseek(dll, secptr1, SEEK_SET);
++# 	read(dll, sname, 8);
++# 	if (vaddr <= export_rva && vaddr+vsize > export_rva)
++# 	{
++# 	    expptr = fptr + (export_rva - vaddr);
++# 	    if (export_rva + export_size > vaddr + vsize)
++# 		export_size = vsize - (export_rva - vaddr);
++# 	    break;
++# 	}
++#     }
++#
++#     expdata = (unsigned char*)malloc(export_size);
++#     lseek (dll, expptr, SEEK_SET);
++#     read (dll, expdata, export_size);
++#     erva = expdata - export_rva;
++#
++#     nexp = pe_as32 (expdata+24);
++#     name_rvas = pe_as32 (expdata+32);
++#
++#     printf ("EXPORTS\n");
++#     for (i = 0; i<nexp; i++)
++#     {
++# 	unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
++# 	printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
++#     }
++#
++#     return 0;
++# }
++# /* impgen.c ends here */
++
++EOF
++    ;;
++  esac
++
++  # We use sed instead of cat because bash on DJGPP gets confused if
++  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
++  # text mode, it properly converts lines to CR/LF.  This bash problem
++  # is reportedly fixed, but why not run on old versions too?
++  sed '$q' "$ltmain" >> "${ofile}T" || (rm -f "${ofile}T"; exit 1)
++
++  mv -f "${ofile}T" "$ofile" || \
++    (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T")
++  chmod +x "$ofile"
++fi
++
++
++
++
++
++# This can be used to rebuild libtool when needed
++LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++
++# Always use our own libtool.
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++
++# Prevent multiple expansion
++
++
++
++
++# Extract the first word of "lp", so it can be a program name with args.
++set dummy lp; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:5425: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_LPRCOMMAND'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test -n "$LPRCOMMAND"; then
++  ac_cv_prog_LPRCOMMAND="$LPRCOMMAND" # Let the user override the test.
++else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_LPRCOMMAND="lp"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++fi
++fi
++LPRCOMMAND="$ac_cv_prog_LPRCOMMAND"
++if test -n "$LPRCOMMAND"; then
++  echo "$ac_t""$LPRCOMMAND" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++# Extract the first word of "lpr", so it can be a program name with args.
++set dummy lpr; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:5454: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_LPRCOMMAND'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test -n "$LPRCOMMAND"; then
++  ac_cv_prog_LPRCOMMAND="$LPRCOMMAND" # Let the user override the test.
++else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_LPRCOMMAND="lpr"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++fi
++fi
++LPRCOMMAND="$ac_cv_prog_LPRCOMMAND"
++if test -n "$LPRCOMMAND"; then
++  echo "$ac_t""$LPRCOMMAND" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++
++# Extract the first word of "cat", so it can be a program name with args.
++set dummy cat; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:5484: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_CATCOMMAND'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test -n "$CATCOMMAND"; then
++  ac_cv_prog_CATCOMMAND="$CATCOMMAND" # Let the user override the test.
++else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_CATCOMMAND="cat"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++fi
++fi
++CATCOMMAND="$ac_cv_prog_CATCOMMAND"
++if test -n "$CATCOMMAND"; then
++  echo "$ac_t""$CATCOMMAND" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++# Extract the first word of "type", so it can be a program name with args.
++set dummy type; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:5513: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_CATCOMMAND'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test -n "$CATCOMMAND"; then
++  ac_cv_prog_CATCOMMAND="$CATCOMMAND" # Let the user override the test.
++else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_CATCOMMAND="type"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++fi
++fi
++CATCOMMAND="$ac_cv_prog_CATCOMMAND"
++if test -n "$CATCOMMAND"; then
++  echo "$ac_t""$CATCOMMAND" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++
++
++
++for ac_hdr in stdlib.h unistd.h errno.h assert.h
++do
++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
++echo "configure:5546: checking for $ac_hdr" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 5551 "configure"
++#include "confdefs.h"
++#include <$ac_hdr>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:5556: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=yes"
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
++fi
++rm -f conftest*
++fi
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_hdr 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++for ac_hdr in sys/time.h time.h signal.h
++do
++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
++echo "configure:5586: checking for $ac_hdr" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 5591 "configure"
++#include "confdefs.h"
++#include <$ac_hdr>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:5596: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=yes"
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
++fi
++rm -f conftest*
++fi
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_hdr 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++for ac_hdr in string.h strings.h
++do
++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
++echo "configure:5626: checking for $ac_hdr" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 5631 "configure"
++#include "confdefs.h"
++#include <$ac_hdr>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:5636: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=yes"
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
++fi
++rm -f conftest*
++fi
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_hdr 1
++EOF
++ break
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++
++# @start variadic
++case $am_cv_prog_cc_stdc,$ac_cv_header_varargs_h in
++no,)
++	# Non-ANSI compiler, so we must use varargs.h.
++	for ac_hdr in varargs.h
++do
++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
++echo "configure:5671: checking for $ac_hdr" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 5676 "configure"
++#include "confdefs.h"
++#include <$ac_hdr>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:5681: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=yes"
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
++fi
++rm -f conftest*
++fi
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_hdr 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++	;;
++*,yes)
++	# Parent package is using varargs.h which is incompatible with 
++	# stdarg.h, so we do the same (recheck to generate checking...
++	# message).
++	for ac_hdr in varargs.h
++do
++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
++echo "configure:5716: checking for $ac_hdr" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 5721 "configure"
++#include "confdefs.h"
++#include <$ac_hdr>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:5726: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=yes"
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
++fi
++rm -f conftest*
++fi
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_hdr 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++	;;
++*)
++	# If stdarg.h is present define HAVE_STDARG_H.
++	for ac_hdr in stdarg.h
++do
++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
++echo "configure:5759: checking for $ac_hdr" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 5764 "configure"
++#include "confdefs.h"
++#include <$ac_hdr>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:5769: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=yes"
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
++fi
++rm -f conftest*
++fi
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_hdr 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++	;;
++esac
++
++case x$ac_cv_header_stdarg_h$ac_cv_header_varargs_h in
++x*yes*) ;;
++*) { echo "configure: error: Could not find stdarg.h or varargs.h" 1>&2; exit 1; } ;;
++esac
++# @end variadic
++
++echo $ac_n "checking for working const""... $ac_c" 1>&6
++echo "configure:5805: checking for working const" >&5
++if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 5810 "configure"
++#include "confdefs.h"
++
++int main() {
++
++/* Ultrix mips cc rejects this.  */
++typedef int charset[2]; const charset x;
++/* SunOS 4.1.1 cc rejects this.  */
++char const *const *ccp;
++char **p;
++/* NEC SVR4.0.2 mips cc rejects this.  */
++struct point {int x, y;};
++static struct point const zero = {0,0};
++/* AIX XL C 1.02.0.0 rejects this.
++   It does not let you subtract one const X* pointer from another in an arm
++   of an if-expression whose if-part is not a constant expression */
++const char *g = "string";
++ccp = &g + (g ? g-g : 0);
++/* HPUX 7.0 cc rejects these. */
++++ccp;
++p = (char**) ccp;
++ccp = (char const *const *) p;
++{ /* SCO 3.2v4 cc rejects this.  */
++  char *t;
++  char const *s = 0 ? (char *) 0 : (char const *) 0;
++
++  *t++ = 0;
++}
++{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
++  int x[] = {25, 17};
++  const int *foo = &x[0];
++  ++foo;
++}
++{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
++  typedef const int *iptr;
++  iptr p = 0;
++  ++p;
++}
++{ /* AIX XL C 1.02.0.0 rejects this saying
++     "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
++  struct s { int j; const int *ap[3]; };
++  struct s *b; b->j = 5;
++}
++{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
++  const int foo = 10;
++}
++
++; return 0; }
++EOF
++if { (eval echo configure:5859: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  rm -rf conftest*
++  ac_cv_c_const=yes
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  ac_cv_c_const=no
++fi
++rm -f conftest*
++fi
++
++echo "$ac_t""$ac_cv_c_const" 1>&6
++if test $ac_cv_c_const = no; then
++  cat >> confdefs.h <<\EOF
++#define const 
++EOF
++
++fi
++
++echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
++echo "configure:5880: checking for ANSI C header files" >&5
++if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 5885 "configure"
++#include "confdefs.h"
++#include <stdlib.h>
++#include <stdarg.h>
++#include <string.h>
++#include <float.h>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:5893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  ac_cv_header_stdc=yes
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  ac_cv_header_stdc=no
++fi
++rm -f conftest*
++
++if test $ac_cv_header_stdc = yes; then
++  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
++cat > conftest.$ac_ext <<EOF
++#line 5910 "configure"
++#include "confdefs.h"
++#include <string.h>
++EOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  egrep "memchr" >/dev/null 2>&1; then
++  :
++else
++  rm -rf conftest*
++  ac_cv_header_stdc=no
++fi
++rm -f conftest*
++
++fi
++
++if test $ac_cv_header_stdc = yes; then
++  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
++cat > conftest.$ac_ext <<EOF
++#line 5928 "configure"
++#include "confdefs.h"
++#include <stdlib.h>
++EOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  egrep "free" >/dev/null 2>&1; then
++  :
++else
++  rm -rf conftest*
++  ac_cv_header_stdc=no
++fi
++rm -f conftest*
++
++fi
++
++if test $ac_cv_header_stdc = yes; then
++  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
++if test "$cross_compiling" = yes; then
++  :
++else
++  cat > conftest.$ac_ext <<EOF
++#line 5949 "configure"
++#include "confdefs.h"
++#include <ctype.h>
++#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
++#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
++int main () { int i; for (i = 0; i < 256; i++)
++if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
++exit (0); }
++
++EOF
++if { (eval echo configure:5960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++then
++  :
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -fr conftest*
++  ac_cv_header_stdc=no
++fi
++rm -fr conftest*
++fi
++
++fi
++fi
++
++echo "$ac_t""$ac_cv_header_stdc" 1>&6
++if test $ac_cv_header_stdc = yes; then
++  cat >> confdefs.h <<\EOF
++#define STDC_HEADERS 1
++EOF
++
++fi
++
++echo $ac_n "checking for size_t""... $ac_c" 1>&6
++echo "configure:5984: checking for size_t" >&5
++if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 5989 "configure"
++#include "confdefs.h"
++#include <sys/types.h>
++#if STDC_HEADERS
++#include <stdlib.h>
++#include <stddef.h>
++#endif
++EOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
++  rm -rf conftest*
++  ac_cv_type_size_t=yes
++else
++  rm -rf conftest*
++  ac_cv_type_size_t=no
++fi
++rm -f conftest*
++
++fi
++echo "$ac_t""$ac_cv_type_size_t" 1>&6
++if test $ac_cv_type_size_t = no; then
++  cat >> confdefs.h <<\EOF
++#define size_t unsigned
++EOF
++
++fi
++
++echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
++echo "configure:6017: checking whether time.h and sys/time.h may both be included" >&5
++if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 6022 "configure"
++#include "confdefs.h"
++#include <sys/types.h>
++#include <sys/time.h>
++#include <time.h>
++int main() {
++struct tm *tp;
++; return 0; }
++EOF
++if { (eval echo configure:6031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  rm -rf conftest*
++  ac_cv_header_time=yes
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  ac_cv_header_time=no
++fi
++rm -f conftest*
++fi
++
++echo "$ac_t""$ac_cv_header_time" 1>&6
++if test $ac_cv_header_time = yes; then
++  cat >> confdefs.h <<\EOF
++#define TIME_WITH_SYS_TIME 1
++EOF
++
++fi
++
++
++for ac_func in killpg kill
++do
++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++echo "configure:6055: checking for $ac_func" >&5
++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 6060 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char $ac_func();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++$ac_func();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:6083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_func 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++for ac_func in bcopy memcpy
++do
++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++echo "configure:6110: checking for $ac_func" >&5
++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 6115 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char $ac_func();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++$ac_func();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:6138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_func 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++for ac_func in bzero memset
++do
++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++echo "configure:6165: checking for $ac_func" >&5
++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 6170 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char $ac_func();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++$ac_func();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:6193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_func 1
++EOF
++ break
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++for ac_func in bcmp memcmp
++do
++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++echo "configure:6220: checking for $ac_func" >&5
++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 6225 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char $ac_func();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++$ac_func();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:6248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_func 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++for ac_func in index strchr
++do
++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++echo "configure:6275: checking for $ac_func" >&5
++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 6280 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char $ac_func();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++$ac_func();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:6303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_func 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++for ac_func in rindex strrchr
++do
++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++echo "configure:6330: checking for $ac_func" >&5
++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 6335 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char $ac_func();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++$ac_func();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:6358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_func 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++for ac_func in initstate srand
++do
++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++echo "configure:6385: checking for $ac_func" >&5
++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 6390 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char $ac_func();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++$ac_func();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:6413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_func 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++for ac_func in random rand
++do
++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++echo "configure:6440: checking for $ac_func" >&5
++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 6445 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char $ac_func();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++$ac_func();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:6468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_func 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++
++for ac_func in calloc
++do
++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++echo "configure:6496: checking for $ac_func" >&5
++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 6501 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char $ac_func();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++$ac_func();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:6524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_func 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++for ac_func in basename strerror vfprintf
++do
++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++echo "configure:6551: checking for $ac_func" >&5
++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 6556 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char $ac_func();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++$ac_func();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:6579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_func 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}"
++fi
++done
++
++
++for ac_func in putenv
++do
++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++echo "configure:6608: checking for $ac_func" >&5
++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 6613 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char $ac_func();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++$ac_func();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:6636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_func 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}"
++fi
++done
++
++
++
++
++# @end 5
++# @start 1
++
++
++Xsed="sed -e s/^X//"
++LTLIBOBJS=`echo X"$LIBOBJS"|$Xsed -e "s,\.[^.]* ,.lo ,g;s,\.[^.]*$,.lo,"`
++
++
++
++
++
++
++trap '' 1 2 15
++cat > confcache <<\EOF
++# This file is a shell script that caches the results of configure
++# tests run on this system so they can be shared between configure
++# scripts and configure runs.  It is not useful on other systems.
++# If it contains results you don't want to keep, you may remove or edit it.
++#
++# By default, configure uses ./config.cache as the cache file,
++# creating it if it does not exist already.  You can give configure
++# the --cache-file=FILE option to use a different cache file; that is
++# what configure does when it calls configure scripts in
++# subdirectories, so they share the cache.
++# Giving --cache-file=/dev/null disables caching, for debugging configure.
++# config.status only pays attention to the cache file if you give it the
++# --recheck option to rerun configure.
++#
++EOF
++# The following way of writing the cache mishandles newlines in values,
++# but we know of no workaround that is simple, portable, and efficient.
++# So, don't put newlines in cache variables' values.
++# Ultrix sh set writes to stderr and can't be redirected directly,
++# and sets the high bit in the cache file unless we assign to the vars.
++(set) 2>&1 |
++  case `(ac_space=' '; set | grep ac_space) 2>&1` in
++  *ac_space=\ *)
++    # `set' does not quote correctly, so add quotes (double-quote substitution
++    # turns \\\\ into \\, and sed turns \\ into \).
++    sed -n \
++      -e "s/'/'\\\\''/g" \
++      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
++    ;;
++  *)
++    # `set' quotes correctly as required by POSIX, so do not add quotes.
++    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
++    ;;
++  esac >> confcache
++if cmp -s $cache_file confcache; then
++  :
++else
++  if test -w $cache_file; then
++    echo "updating cache $cache_file"
++    cat confcache > $cache_file
++  else
++    echo "not updating unwritable cache $cache_file"
++  fi
++fi
++rm -f confcache
++
++trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
++
++test "x$prefix" = xNONE && prefix=$ac_default_prefix
++# Let make expand exec_prefix.
++test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
++
++# Any assignment to VPATH causes Sun make to only execute
++# the first set of double-colon rules, so remove it if not needed.
++# If there is a colon in the path, we need to keep it.
++if test "x$srcdir" = x.; then
++  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
++fi
++
++trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
++
++DEFS=-DHAVE_CONFIG_H
++
++# Without the "./", some shells look in PATH for config.status.
++: ${CONFIG_STATUS=./config.status}
++
++echo creating $CONFIG_STATUS
++rm -f $CONFIG_STATUS
++cat > $CONFIG_STATUS <<EOF
++#! /bin/sh
++# Generated automatically by configure.
++# Run this file to recreate the current configuration.
++# This directory was configured as follows,
++# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++#
++# $0 $ac_configure_args
++#
++# Compiler output produced by configure, useful for debugging
++# configure, is in ./config.log if it exists.
++
++ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
++for ac_option
++do
++  case "\$ac_option" in
++  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
++    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
++  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
++    echo "$CONFIG_STATUS generated by autoconf version 2.13"
++    exit 0 ;;
++  -help | --help | --hel | --he | --h)
++    echo "\$ac_cs_usage"; exit 0 ;;
++  *) echo "\$ac_cs_usage"; exit 1 ;;
++  esac
++done
++
++ac_given_srcdir=$srcdir
++ac_given_INSTALL="$INSTALL"
++
++trap 'rm -fr `echo "Makefile replace/Makefile metamail/Makefile src/Makefile \
++	   src/metamail/Makefile src/richmail/Makefile bin/Makefile metamail/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
++EOF
++cat >> $CONFIG_STATUS <<EOF
++
++# Protect against being on the right side of a sed subst in config.status.
++sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
++ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
++$ac_vpsub
++$extrasub
++s%@SHELL@%$SHELL%g
++s%@CFLAGS@%$CFLAGS%g
++s%@CPPFLAGS@%$CPPFLAGS%g
++s%@CXXFLAGS@%$CXXFLAGS%g
++s%@FFLAGS@%$FFLAGS%g
++s%@DEFS@%$DEFS%g
++s%@LDFLAGS@%$LDFLAGS%g
++s%@LIBS@%$LIBS%g
++s%@exec_prefix@%$exec_prefix%g
++s%@prefix@%$prefix%g
++s%@program_transform_name@%$program_transform_name%g
++s%@bindir@%$bindir%g
++s%@sbindir@%$sbindir%g
++s%@libexecdir@%$libexecdir%g
++s%@datadir@%$datadir%g
++s%@sysconfdir@%$sysconfdir%g
++s%@sharedstatedir@%$sharedstatedir%g
++s%@localstatedir@%$localstatedir%g
++s%@libdir@%$libdir%g
++s%@includedir@%$includedir%g
++s%@oldincludedir@%$oldincludedir%g
++s%@infodir@%$infodir%g
++s%@mandir@%$mandir%g
++s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
++s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
++s%@INSTALL_DATA@%$INSTALL_DATA%g
++s%@PACKAGE@%$PACKAGE%g
++s%@VERSION@%$VERSION%g
++s%@ACLOCAL@%$ACLOCAL%g
++s%@AUTOCONF@%$AUTOCONF%g
++s%@AUTOMAKE@%$AUTOMAKE%g
++s%@AUTOHEADER@%$AUTOHEADER%g
++s%@MAKEINFO@%$MAKEINFO%g
++s%@SET_MAKE@%$SET_MAKE%g
++s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
++s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
++s%@MAINT@%$MAINT%g
++s%@host@%$host%g
++s%@host_alias@%$host_alias%g
++s%@host_cpu@%$host_cpu%g
++s%@host_vendor@%$host_vendor%g
++s%@host_os@%$host_os%g
++s%@CC@%$CC%g
++s%@build@%$build%g
++s%@build_alias@%$build_alias%g
++s%@build_cpu@%$build_cpu%g
++s%@build_vendor@%$build_vendor%g
++s%@build_os@%$build_os%g
++s%@LN_S@%$LN_S%g
++s%@OBJEXT@%$OBJEXT%g
++s%@EXEEXT@%$EXEEXT%g
++s%@ECHO@%$ECHO%g
++s%@RANLIB@%$RANLIB%g
++s%@STRIP@%$STRIP%g
++s%@CPP@%$CPP%g
++s%@LIBTOOL@%$LIBTOOL%g
++s%@LIBTOOL_DEPS@%$LIBTOOL_DEPS%g
++s%@LPRCOMMAND@%$LPRCOMMAND%g
++s%@CATCOMMAND@%$CATCOMMAND%g
++s%@LIBOBJS@%$LIBOBJS%g
++s%@LTLIBOBJS@%$LTLIBOBJS%g
++s%@ac_aux_dir@%$ac_aux_dir%g
++
++CEOF
++EOF
++
++cat >> $CONFIG_STATUS <<\EOF
++
++# Split the substitutions into bite-sized pieces for seds with
++# small command number limits, like on Digital OSF/1 and HP-UX.
++ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
++ac_file=1 # Number of current file.
++ac_beg=1 # First line for current file.
++ac_end=$ac_max_sed_cmds # Line after last line for current file.
++ac_more_lines=:
++ac_sed_cmds=""
++while $ac_more_lines; do
++  if test $ac_beg -gt 1; then
++    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
++  else
++    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
++  fi
++  if test ! -s conftest.s$ac_file; then
++    ac_more_lines=false
++    rm -f conftest.s$ac_file
++  else
++    if test -z "$ac_sed_cmds"; then
++      ac_sed_cmds="sed -f conftest.s$ac_file"
++    else
++      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
++    fi
++    ac_file=`expr $ac_file + 1`
++    ac_beg=$ac_end
++    ac_end=`expr $ac_end + $ac_max_sed_cmds`
++  fi
++done
++if test -z "$ac_sed_cmds"; then
++  ac_sed_cmds=cat
++fi
++EOF
++
++cat >> $CONFIG_STATUS <<EOF
++
++CONFIG_FILES=\${CONFIG_FILES-"Makefile replace/Makefile metamail/Makefile src/Makefile \
++	   src/metamail/Makefile src/richmail/Makefile bin/Makefile"}
++EOF
++cat >> $CONFIG_STATUS <<\EOF
++for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
++  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
++  case "$ac_file" in
++  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
++       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
++  *) ac_file_in="${ac_file}.in" ;;
++  esac
++
++  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
++
++  # Remove last slash and all that follows it.  Not all systems have dirname.
++  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
++  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
++    # The file is in a subdirectory.
++    test ! -d "$ac_dir" && mkdir "$ac_dir"
++    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
++    # A "../" for each directory in $ac_dir_suffix.
++    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
++  else
++    ac_dir_suffix= ac_dots=
++  fi
++
++  case "$ac_given_srcdir" in
++  .)  srcdir=.
++      if test -z "$ac_dots"; then top_srcdir=.
++      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
++  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
++  *) # Relative path.
++    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
++    top_srcdir="$ac_dots$ac_given_srcdir" ;;
++  esac
++
++  case "$ac_given_INSTALL" in
++  [/$]*) INSTALL="$ac_given_INSTALL" ;;
++  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
++  esac
++
++  echo creating "$ac_file"
++  rm -f "$ac_file"
++  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
++  case "$ac_file" in
++  *Makefile*) ac_comsub="1i\\
++# $configure_input" ;;
++  *) ac_comsub= ;;
++  esac
++
++  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
++  sed -e "$ac_comsub
++s%@configure_input@%$configure_input%g
++s%@srcdir@%$srcdir%g
++s%@top_srcdir@%$top_srcdir%g
++s%@INSTALL@%$INSTALL%g
++" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
++fi; done
++rm -f conftest.s*
++
++# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
++# NAME is the cpp macro being defined and VALUE is the value it is being given.
++#
++# ac_d sets the value in "#define NAME VALUE" lines.
++ac_dA='s%^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
++ac_dB='\([ 	][ 	]*\)[^ 	]*%\1#\2'
++ac_dC='\3'
++ac_dD='%g'
++# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
++ac_uA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
++ac_uB='\([ 	]\)%\1#\2define\3'
++ac_uC=' '
++ac_uD='\4%g'
++# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
++ac_eA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
++ac_eB='$%\1#\2define\3'
++ac_eC=' '
++ac_eD='%g'
++
++if test "${CONFIG_HEADERS+set}" != set; then
++EOF
++cat >> $CONFIG_STATUS <<EOF
++  CONFIG_HEADERS="metamail/config.h"
++EOF
++cat >> $CONFIG_STATUS <<\EOF
++fi
++for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
++  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
++  case "$ac_file" in
++  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
++       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
++  *) ac_file_in="${ac_file}.in" ;;
++  esac
++
++  echo creating $ac_file
++
++  rm -f conftest.frag conftest.in conftest.out
++  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
++  cat $ac_file_inputs > conftest.in
++
++EOF
++
++# Transform confdefs.h into a sed script conftest.vals that substitutes
++# the proper values into config.h.in to produce config.h.  And first:
++# Protect against being on the right side of a sed subst in config.status.
++# Protect against being in an unquoted here document in config.status.
++rm -f conftest.vals
++cat > conftest.hdr <<\EOF
++s/[\\&%]/\\&/g
++s%[\\$`]%\\&%g
++s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
++s%ac_d%ac_u%gp
++s%ac_u%ac_e%gp
++EOF
++sed -n -f conftest.hdr confdefs.h > conftest.vals
++rm -f conftest.hdr
++
++# This sed command replaces #undef with comments.  This is necessary, for
++# example, in the case of _POSIX_SOURCE, which is predefined and required
++# on some systems where configure will not decide to define it.
++cat >> conftest.vals <<\EOF
++s%^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
++EOF
++
++# Break up conftest.vals because some shells have a limit on
++# the size of here documents, and old seds have small limits too.
++
++rm -f conftest.tail
++while :
++do
++  ac_lines=`grep -c . conftest.vals`
++  # grep -c gives empty output for an empty file on some AIX systems.
++  if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
++  # Write a limited-size here document to conftest.frag.
++  echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
++  sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
++  echo 'CEOF
++  sed -f conftest.frag conftest.in > conftest.out
++  rm -f conftest.in
++  mv conftest.out conftest.in
++' >> $CONFIG_STATUS
++  sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
++  rm -f conftest.vals
++  mv conftest.tail conftest.vals
++done
++rm -f conftest.vals
++
++cat >> $CONFIG_STATUS <<\EOF
++  rm -f conftest.frag conftest.h
++  echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
++  cat conftest.in >> conftest.h
++  rm -f conftest.in
++  if cmp -s $ac_file conftest.h 2>/dev/null; then
++    echo "$ac_file is unchanged"
++    rm -f conftest.h
++  else
++    # Remove last slash and all that follows it.  Not all systems have dirname.
++      ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
++      if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
++      # The file is in a subdirectory.
++      test ! -d "$ac_dir" && mkdir "$ac_dir"
++    fi
++    rm -f $ac_file
++    mv conftest.h $ac_file
++  fi
++fi; done
++
++EOF
++cat >> $CONFIG_STATUS <<EOF
++
++
++  srcdir=$srcdir
++  ac_cv_func_bzero=$ac_cv_func_bzero
++  ac_cv_func_memset=$ac_cv_func_memset
++  ac_cv_func_strchr=$ac_cv_func_strchr
++  ac_cv_func_strrchr=$ac_cv_func_strrchr
++# @end 5
++  ac_cv_func_basename=$ac_cv_func_basename
++  ac_cv_func_strcspn=$ac_cv_func_strcspn
++  ac_cv_func_strerror=$ac_cv_func_strerror
++  ac_cv_func_strsignal=$ac_cv_func_strsignal
++  ac_cv_func_strspn=$ac_cv_func_strspn
++  ac_cv_func_vfprintf=$ac_cv_func_vfprintf
++  ac_cv_func_waitpid=$ac_cv_func_waitpid
++  ac_cv_header_assert_h=$ac_cv_header_assert_h
++  ac_cv_header_errno_h=$ac_cv_header_errno_h
++  ac_cv_header_stdlib_h=$ac_cv_header_stdlib_h
++  ac_cv_header_stdarg_h=$ac_cv_header_stdarg_h
++  ac_cv_header_string_h=$ac_cv_header_string_h
++  ac_cv_header_strings_h=$ac_cv_header_strings_h
++  ac_cv_header_sys_wait_h=$ac_cv_header_sys_wait_h
++  ac_cv_header_unistd_h=$ac_cv_header_unistd_h
++  ac_cv_header_varargs_h=$ac_cv_header_varargs_h
++  LPRCOMMAND=$LPRCOMMAND
++  CATCOMMAND=$CATCOMMAND
++  host=$host
++# @start 5
++
++
++EOF
++cat >> $CONFIG_STATUS <<\EOF
++test -z "$CONFIG_HEADERS" || echo timestamp > metamail/stamp-h
++
++  if test -n "$CONFIG_FILES" && test -n "$CONFIG_HEADERS"; then
++    # If both these vars are non-empty, then config.status wasn't run by
++    # automake rules (which always set one or the other to empty).
++    CONFIG_OTHER=${CONFIG_OTHER-METAMAIL/common.h}
++  fi
++  case "$CONFIG_OTHER" in
++  *metamail/common.h*)
++    outfile=metamail/common.h
++    stampfile=metamail/stamp-common
++    tmpfile=${outfile}T
++    dirname="sed s,^.*/,,g"
++
++    echo creating $outfile
++    cat > $tmpfile << _EOF_
++/*  -*- Mode: C -*-
++ * --------------------------------------------------------------------
++ * DO NOT EDIT THIS FILE!  It has been automatically generated
++ * from:    configure.in and `echo $outfile|$dirname`.in
++ * on host: `(hostname || uname -n) 2>/dev/null | sed 1q`
++ * --------------------------------------------------------------------
++ */
++
++#ifndef METAMAIL_COMMON_H
++#define METAMAIL_COMMON_H 1
++
++#include <stdio.h>
++#include <ctype.h>        // ??? ok here
++#include <sys/types.h>
++#include <sys/stat.h>     // ??? ok here
++
++// ??? following ok here without check?
++#include <pwd.h>
++#include <sys/time.h>
++#include <sys/types.h>
++#include <sys/file.h>
++#include <signal.h>
++
++#include <termio.h>
++#include <fcntl.h>
++#include <sys/utsname.h>
++_EOF_
++
++    case "${host}" in
++      *-*-linux-gnu*) cat >> $tmpfile << '_EOF_'
++
++#include <linux/limits.h>
++
++_EOF_
++;;
++    esac
++
++# @end 5
++# @start 4
++    # Add the code to include these headers only if autoconf has
++    # shown them to be present.
++    if test x$ac_cv_header_stdlib_h = xyes; then
++      echo '#include <stdlib.h>' >> $tmpfile
++    fi
++    if test x$ac_cv_header_unistd_h = xyes; then
++      echo '#include <unistd.h>' >> $tmpfile
++    fi
++    if test x$ac_cv_header_sys_wait_h = xyes; then
++      echo '#include <sys/wait.h>' >> $tmpfile
++    fi
++    if test x$ac_cv_header_errno_h = xyes; then
++      echo '#include <errno.h>' >> $tmpfile
++    fi
++    cat >> $tmpfile << '_EOF_'
++
++#ifndef errno
++/* Some sytems #define this! */
++extern int errno;
++#endif
++
++_EOF_
++    if test x$ac_cv_header_string_h = xyes; then
++      echo '#include <string.h>' >> $tmpfile
++    elif test x$ac_cv_header_strings_h = xyes; then
++      echo '#include <strings.h>' >> $tmpfile
++    fi
++
++# *******************
++# start variadic parameters 
++#
++    if test x$ac_cv_header_stdarg_h = xyes \
++	&& test x$ac_cv_header_varargs_h != xyes
++    then
++      cat >> $tmpfile << '_EOF_'
++
++#include <stdarg.h>
++#ifndef VA_START
++#  define VA_START(a, f) va_start(a, f)
++#endif /* VA_START */
++
++_EOF_
++    else
++      cat >> $tmpfile << '_EOF_'
++	
++#include <varargs.h>
++#ifndef VA_START
++#  define VA_START(a, f) va_start(a)
++#endif /* VA_START */
++       
++_EOF_
++    fi
++#
++# end variadic parameters
++# ***********************
++
++    if test x$ac_cv_header_assert_h = xyes; then
++      cat >> $tmpfile << '_EOF_'
++
++#include <assert.h>
++#define METAMAIL_ASSERT assert
++
++_EOF_
++else
++        echo '#define METAMAIL_ASSERT(expr)  ((void) 0)' >> $tmpfile
++    fi
++# @end 4
++# @start 5
++    if test x$ac_cv_func_killpg = xno && \
++       test x$ac_cv_func_kill = xyes; then
++      cat >> $tmpfile << '_EOF_'
++#define killbg(pid, sig) ((int) kill (-(pid), sig))
++_EOF_
++    fi 
++    if test x$ac_cv_func_bcopy = xno && \
++       test x$ac_cv_func_memcpy = xyes; then
++      cat >> $tmpfile << '_EOF_'
++#define bcopy(src, dest, n) ((void) memcpy (dest, src, n))
++_EOF_
++    fi
++    if test x$ac_cv_func_bzero = xno && \
++       test x$ac_cv_func_memset = xyes; then
++      cat >> $tmpfile << '_EOF_'
++#define bzero(buf, bytes) ((void) memset (buf, 0, bytes))
++_EOF_
++    fi
++    if test x$ac_cv_func_bcmp = xno && \
++       test x$ac_cv_func_memcmp = xyes; then
++      echo '#define bcmp memcmp' >> $tmpfile
++    fi
++    if test x$ac_cv_func_index = xno && \
++       test x$ac_cv_func_strchr = xyes; then
++      echo '#define index strchr' >> $tmpfile
++    fi
++    if test x$ac_cv_func_rindex = xno && \
++       test x$ac_cv_func_strrchr = xyes; then
++      echo '#define rindex strrchr' >> $tmpfile
++    fi
++    if test x$ac_cv_func_initstate = xno && \
++       test x$ac_cv_func_srand = xyes; then
++      echo '#define initstate srand' >> $tmpfile
++    fi
++    if test x$ac_cv_func_random = xno && \
++       test x$ac_cv_func_rand = xyes; then
++      echo '#define random rand' >> $tmpfile
++    fi
++
++    # The ugly but portable cpp stuff comes from here
++    infile=$srcdir/metamail/`echo $outfile | sed 's,.*/,,g;s,\..*$,,g'`-h.in
++    sed '/^##.*$/d' $infile >> $tmpfile 
++
++# @end 5
++    ${RM-/bin/rm -f} ${tmpfile}2 2>/dev/null
++    if test x$ac_cv_func_basename = xno; then
++      echo 'extern char *basename PARAMS((const char *path));' >> ${tmpfile}2
++    fi
++    if test x$ac_cv_func_strerror = xno; then
++      echo 'extern char *strerror PARAMS((int err));' >> ${tmpfile}2
++    fi
++    if test x$ac_cv_func_strsignal = xno; then
++      echo 'extern char *strsignal PARAMS((int signo));' >> ${tmpfile}2
++    fi
++    if test x$ac_cv_func_vfprintf = xno; then
++      echo 'extern int vfprintf PARAMS((FILE *file, const char* format, va_list ap));' >> ${tmpfile}2
++    fi
++    if test x$ac_cv_func_waitpid = xno; then 
++	echo 'extern pid_t waitpid PARAMS((pid_t pid, int *pstatus, int options));' >> ${tmpfile}2
++    fi
++
++    if test -f ${tmpfile}2; then
++      cat >> $tmpfile << '_EOF_'
++
++BEGIN_C_DECLS
++_EOF_
++      cat ${tmpfile}2 >> $tmpfile
++      echo 'END_C_DECLS' >> $tmpfile
++      ${RM-/bin/rm -f} ${tmpfile}2 2>/dev/null
++    fi
++
++    if test -n ${LPRCOMMAND}; then
++      echo '#define LPRCOMMAND "'${LPRCOMMAND}'"' >> $tmpfile
++      echo '#define LPRTEMPLATE "'${LPRCOMMAND}' %s"' >> $tmpfile
++    fi
++    if test -n ${CATCOMMAND}; then
++      echo '#define CATCOMMAND "'${CATCOMMAND}'"' >> $tmpfile
++      echo '#define CATTEMPLATE "'${CATCOMMAND}' %s"' >> $tmpfile
++    fi
++
++    case "${host}" in
++      *-*-linux-gnu*) cat >> $tmpfile << '_EOF_'
++#define TMPNAME_MAX NAME_MAX
++static struct termio MyTtyStateIn, MyTtyStateOut;
++
++_EOF_
++;;
++      *) cat >> $tmpfile << '_EOF_'
++
++#define TMPNAME_MAX	1000
++#define NAME_MAX	1000
++static struct sgttyb MyTtyStateIn, MyTtyStateOut;
++
++_EOF_
++;;
++    esac
++
++    cat >> $tmpfile << '_EOF_'
++
++
++#endif /* !METAMAIL_COMMON_H */
++_EOF_
++
++    if cmp -s $tmpfile $outfile; then
++      echo $outfile is unchanged
++      rm -f $tmpfile
++    else
++      mv $tmpfile $outfile
++      touch $stampfile
++    fi
++    ;;
++  esac
++# @start 5
++
++test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h.in
++exit 0
++EOF
++chmod +x $CONFIG_STATUS
++rm -fr confdefs* $ac_clean_files
++test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
++
diff --git a/source/n/mtr/mtr.SlackBuild b/source/n/mtr/mtr.SlackBuild
index 4f53c587..4ebea21e 100755
--- a/source/n/mtr/mtr.SlackBuild
+++ b/source/n/mtr/mtr.SlackBuild
@@ -84,7 +84,6 @@ mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   AUTHORS COPYING* FORMATS INSTALL NEWS README* SECURITY TODO \
   $PKG/usr/doc/$PKGNAM-$VERSION
-chmod -R a-w $PKG/usr/doc/$PKGNAM-$VERSION/*
 
 # If there's a ChangeLog, installing at least part of the recent history
 # is useful, but don't let it get totally out of control:
diff --git a/source/n/mutt/mutt.SlackBuild b/source/n/mutt/mutt.SlackBuild
index e9ca3275..3de6e307 100755
--- a/source/n/mutt/mutt.SlackBuild
+++ b/source/n/mutt/mutt.SlackBuild
@@ -1,6 +1,5 @@
 #!/bin/sh
-
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2002-2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,47 +19,64 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+PKGNAM=mutt
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
-VERSION=1.4.2.3
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-2}
-
+TMP=${TMP:-/tmp}
+CWD=`pwd` 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-if [ "$ARCH" = "i486" ]; then
+if [ "$ARCH" = "i386" ]; then
+  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+elif [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
 PKG=$TMP/package-mutt
 rm -rf $PKG
-mkdir -p $TMP $PKG
+mkdir $PKG
 cd $TMP
-rm -rf $(basename mutt-$VERSION i)
-tar xvf $CWD/mutt-$VERSION.tar.bz2 || exit 1
-cd $(basename mutt-$VERSION i) || exit 1
-
+rm -rf mutt-$VERSION
+tar xvf $CWD/mutt-$VERSION.tar.?z* || exit 1
+cd mutt-$VERSION || exit 1
 chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \; -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \;
+
+# "error creating gpgme context: Not operational?" bugfix
+# http://dev.mutt.org/trac/ticket/3300
+zcat $CWD/mutt.gpgme.diff.gz | patch -p1 --verbose || exit 1
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --mandir=/usr/man \
+  --docdir=/usr/doc/mutt-$VERSION \
+  --with-docdir=/usr/doc/mutt-$VERSION \
   --sysconfdir=/etc/mutt \
   --with-mailpath=/var/spool/mail \
   --enable-pop \
   --enable-imap \
   --with-ssl \
+  --with-sasl \
+  --enable-smtp \
+  --enable-gpgme \
+  --enable-hcache \
   --enable-locales-fix \
   --without-wc-funcs \
   --build=$ARCH-slackware-linux
@@ -68,26 +84,49 @@ CFLAGS="$SLKCFLAGS" \
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+# Strip binaries:
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
 
-gzip -9 $PKG/usr/man/man?/*
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 
-# Don't mv the mutt docs directory, because mutt uses 'em.
-# Make a link instead.
-( cd $PKG/usr/doc ; rm -rf mutt-$VERSION ; ln -sf mutt mutt-$VERSION )
 # This stuff is redundant or not useful to most people, IMHO.
 # If you want it, use the source, Luke.
-rm -rf \
-  $PKG/usr/doc/mutt/html \
-  $PKG/usr/doc/mutt/ChangeLog
+rm -f $PKG/usr/doc/mutt-$VERSION/*.html
+rm -f $PKG/etc/mutt/*.dist
+
+# This is an ancient artifact
+rm -f $PKG/usr/doc/mutt-$VERSION/samples/ca-bundle.crt
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
 
 mv $PKG/etc/mutt/Muttrc $PKG/etc/mutt/Muttrc.new
 
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
-
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/mutt-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n ../mutt-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source/n/mutt/mutt.gpgme.diff b/source/n/mutt/mutt.gpgme.diff
new file mode 100644
index 00000000..8f8c40a4
--- /dev/null
+++ b/source/n/mutt/mutt.gpgme.diff
@@ -0,0 +1,34 @@
+--- mutt-1.5.20/init.c.orig	2009-07-21 17:54:59 +0200
++++ mutt-1.5.20/init.c	2009-07-21 17:59:47 +0200
+@@ -37,7 +37,6 @@
+ #endif
+ 
+ 
+-
+ #include "mx.h"
+ #include "init.h"
+ #include "mailbox.h"
+@@ -50,6 +49,10 @@
+ #include <errno.h>
+ #include <sys/wait.h>
+ 
++#if defined(CRYPT_BACKEND_GPGME)
++#include <gpgme.h>
++#endif
++
+ #define CHECK_PAGER \
+   if ((CurrentMenu == MENU_PAGER) && (idx >= 0) &&	\
+ 	    (MuttVars[idx].flags & R_RESORT)) \
+@@ -3262,6 +3265,11 @@
+ 
+   mutt_read_histfile ();
+ 
++#ifdef CRYPT_BACKEND_GPGME
++  /* needed since version 1.2.0, ticket #3300 */
++  gpgme_check_version (NULL);
++#endif
++
+ #if 0
+   set_option (OPTWEED); /* turn weeding on by default */
+ #endif
+
diff --git a/source/n/nc/nc.SlackBuild b/source/n/nc/nc.SlackBuild
index aafa123b..90f133d9 100755
--- a/source/n/nc/nc.SlackBuild
+++ b/source/n/nc/nc.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,15 +23,26 @@
 
 VERSION=1.10
 SRCVER=110
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 CWD=$(pwd)
diff --git a/source/n/net-snmp/net-snmp.SlackBuild b/source/n/net-snmp/net-snmp.SlackBuild
index c9ca3e71..88ef2d43 100755
--- a/source/n/net-snmp/net-snmp.SlackBuild
+++ b/source/n/net-snmp/net-snmp.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,8 +22,8 @@
 
 
 PKGNAM=net-snmp
-VERSION=${VERSION:-5.5}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -60,6 +60,8 @@ rm -rf ${PKGNAM}-${VERSION}
 tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
 cd ${PKGNAM}-$VERSION
 
+zcat $CWD/net-snmp.net-snmp-create-v3-user.etc.snmpd.conf.diff.gz | patch -p1 --verbose || exit 1
+
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
 find . \
@@ -90,6 +92,10 @@ CFLAGS="$SLKCFLAGS" \
   --program-prefix= \
   --build=$ARCH-slackware-linux
 
+# This appears to require additional third-party python modules?
+# Maybe something for later.
+# --with-python-modules 
+
 # Build and install:
 # This seems to not play well with "-j N"...
 make INSTALLDIRS=vendor || exit 1
@@ -143,17 +149,9 @@ fi
 # This removes our DESTDIR from the packlist filenames, to keep perl's
 # internal inventories consistent and correct.
 find $PKG -name .packlist | while read plist ; do
-  sed -e "s%/share/man%/man%g" \
-      -e "s%$PKG%%g" \
-      -e "s%\.1$%\.1\.gz%g" \
-      -e "s%\.2$%\.2\.gz%g" \
-      -e "s%\.3$%\.3\.gz%g" \
-      -e "s%\.3pm$%\.3pm\.gz%g" \
-      -e "s%\.4$%\.4\.gz%g" \
-      -e "s%\.5$%\.5\.gz%g" \
-      -e "s%\.6$%\.6\.gz%g" \
-      -e "s%\.7$%\.7\.gz%g" \
-      -e "s%\.8$%\.8\.gz%g" \
+  sed -e "s%$PKG%%g" \
+      -e "s%/share/man%/man%g" \
+      -re "s%\.([1-9]n?|3pm)$%&.gz%g   # extend man filenames for .gz" \
       ${plist} > ${plist}.new
       mv -f ${plist}.new ${plist}
 done
diff --git a/source/n/net-snmp/net-snmp.net-snmp-create-v3-user.etc.snmpd.conf.diff b/source/n/net-snmp/net-snmp.net-snmp-create-v3-user.etc.snmpd.conf.diff
new file mode 100644
index 00000000..b726c471
--- /dev/null
+++ b/source/n/net-snmp/net-snmp.net-snmp-create-v3-user.etc.snmpd.conf.diff
@@ -0,0 +1,14 @@
+Let net-snmp-create-v3-user save settings into /etc/ instead of /usr/
+
+diff -up net-snmp-5.5/net-snmp-create-v3-user.in.orig net-snmp-5.5/net-snmp-create-v3-user.in
+--- net-snmp-5.5/net-snmp-create-v3-user.in.orig	2008-07-22 16:33:25.000000000 +0200
++++ net-snmp-5.5/net-snmp-create-v3-user.in	2009-09-29 16:30:36.000000000 +0200
+@@ -158,7 +158,7 @@ if test ! -d $outfile ; then
+     touch $outfile
+ fi
+ echo $line >> $outfile
+-outfile="@datadir@/snmp/snmpd.conf"
++outfile="/etc/snmp/snmpd.conf"
+ line="$token $user"
+ echo "adding the following line to $outfile:"
+ echo "  " $line
diff --git a/source/n/net-tools/net-tools.SlackBuild b/source/n/net-tools/net-tools.SlackBuild
index e757722a..5f11755d 100755
--- a/source/n/net-tools/net-tools.SlackBuild
+++ b/source/n/net-tools/net-tools.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,9 +23,17 @@
 
 PKGNAM=net-tools
 VERSION=${VERSION:-1.60}
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -41,6 +49,8 @@ elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 cd $TMP
@@ -54,8 +64,11 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-zcat $CWD/net-tools_1.60-19.diff.gz | patch -p1 --backup --verbose || exit
-zcat $CWD/net-tools.diff.gz | patch -p1 --backup --verbose || exit
+zcat $CWD/net-tools_1.60-23.diff.gz | patch -p1 --backup --verbose || exit 1
+zcat $CWD/net-tools.diff.gz | patch -p1 --backup --verbose || exit 1
+zcat $CWD/net-tools.struct.x25_address.gcc4.diff.gz | patch -p1 --backup --verbose || exit 1
+zcat $CWD/net-tools.switch.default.gcc4.diff.gz | patch -p1 --backup --verbose || exit 1
+zcat $CWD/net-tools.mii-tool.string.diff.gz | patch -p1 --backup --verbose || exit 1
 
 mkdir -p $PKG/usr/doc/net-tools-1.60
 cp -a README README.ipv6 $PKG/usr/doc/net-tools-1.60
diff --git a/source/n/net-tools/net-tools.mii-tool.string.diff b/source/n/net-tools/net-tools.mii-tool.string.diff
new file mode 100644
index 00000000..aaa5b09e
--- /dev/null
+++ b/source/n/net-tools/net-tools.mii-tool.string.diff
@@ -0,0 +1,29 @@
+--- ./mii-tool.c.orig	2000-05-21 09:31:17.000000000 -0500
++++ ./mii-tool.c	2010-08-12 12:46:05.063607571 -0500
+@@ -379,16 +379,16 @@
+ /*--------------------------------------------------------------------*/
+ 
+ const char *usage =
+-"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]
+-       -V, --version               display version information
+-       -v, --verbose               more verbose output
+-       -R, --reset                 reset MII to poweron state
+-       -r, --restart               restart autonegotiation
+-       -w, --watch                 monitor for link status changes
+-       -l, --log                   with -w, write events to syslog
+-       -A, --advertise=media,...   advertise only specified media
+-       -F, --force=media           force specified media technology
+-media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,
++"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...] \n\
++       -V, --version               display version information \n\
++       -v, --verbose               more verbose output \n\
++       -R, --reset                 reset MII to poweron state \n\
++       -r, --restart               restart autonegotiation \n\
++       -w, --watch                 monitor for link status changes \n\
++       -l, --log                   with -w, write events to syslog \n\
++       -A, --advertise=media,...   advertise only specified media \n\
++       -F, --force=media           force specified media technology \n\
++media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD, \n\
+        (to advertise both HD and FD) 100baseTx, 10baseT\n";
+ 
+ int main(int argc, char **argv)
diff --git a/source/n/net-tools/net-tools.struct.x25_address.gcc4.diff b/source/n/net-tools/net-tools.struct.x25_address.gcc4.diff
new file mode 100644
index 00000000..25a42ed7
--- /dev/null
+++ b/source/n/net-tools/net-tools.struct.x25_address.gcc4.diff
@@ -0,0 +1,11 @@
+--- ./lib/x25_sr.c.orig	2000-05-20 08:38:10.000000000 -0500
++++ ./lib/x25_sr.c	2010-08-12 12:13:35.147112052 -0500
+@@ -77,7 +77,7 @@
+   rt.sigdigits=sigdigits;
+ 
+   /* x25_route_struct.address isn't type struct sockaddr_x25, Why? */
+-  memcpy(&rt.address, &sx25.sx25_addr, sizeof(x25_address));
++  memcpy(&rt.address, &sx25.sx25_addr, sizeof(struct x25_address));
+ 
+   while (*args) {
+ 	if (!strcmp(*args,"device") || !strcmp(*args,"dev")) {
diff --git a/source/n/net-tools/net-tools.switch.default.gcc4.diff b/source/n/net-tools/net-tools.switch.default.gcc4.diff
new file mode 100644
index 00000000..4d7090e0
--- /dev/null
+++ b/source/n/net-tools/net-tools.switch.default.gcc4.diff
@@ -0,0 +1,42 @@
+--- ./hostname.c.orig	2001-04-08 12:04:23.000000000 -0500
++++ ./hostname.c	2010-08-12 12:19:29.181510641 -0500
+@@ -78,6 +78,7 @@
+             fprintf(stderr, _("%s: name too long\n"), program_name);
+             break;
+         default:
++            break;
+         }
+ 	exit(1);
+     }
+@@ -98,6 +99,7 @@
+ 	    fprintf(stderr, _("%s: name too long\n"), program_name);
+ 	    break;
+ 	default:
++            break;
+ 	}
+ 	exit(1);
+     };
+@@ -117,6 +119,7 @@
+ 	    fprintf(stderr, _("%s: name too long\n"), program_name);
+ 	    break;
+ 	default:
++	    break;
+ 	}
+ 	exit(1);
+     };
+@@ -174,6 +177,7 @@
+ 	printf("%s\n", hp->h_name);
+ 	break;
+     default:
++        break;
+     }
+ }
+ 
+@@ -330,7 +334,6 @@
+ 	case 'h':
+ 	default:
+ 	    usage();
+-
+ 	};
+ 
+ 
diff --git a/source/n/net-tools/net-tools_1.60-19.diff b/source/n/net-tools/net-tools_1.60-19.diff
deleted file mode 100644
index f754f02d..00000000
--- a/source/n/net-tools/net-tools_1.60-19.diff
+++ /dev/null
@@ -1,29401 +0,0 @@
---- net-tools-1.60.orig/lib/ether.c
-+++ net-tools-1.60/lib/ether.c
-@@ -2,7 +2,7 @@
-  * lib/ether.c        This file contains an implementation of the "Ethernet"
-  *              support functions.
-  *
-- * Version:     $Id: ether.c,v 1.7 1999/09/27 11:00:47 philip Exp $
-+ * Version:     $Id: ether.c,v 1.8 2002/07/30 05:17:29 ecki Exp $
-  *
-  * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
-  *              Copyright 1993 MicroWalt Corporation
-@@ -39,7 +39,7 @@
- {
-     static char buff[64];
- 
--    snprintf(buff, sizeof(buff), "%02X:%02X:%02X:%02X:%02X:%02X",
-+    snprintf(buff, sizeof(buff), "%02x:%02x:%02x:%02x:%02x:%02x",
- 	     (ptr[0] & 0377), (ptr[1] & 0377), (ptr[2] & 0377),
- 	     (ptr[3] & 0377), (ptr[4] & 0377), (ptr[5] & 0377)
- 	);
---- net-tools-1.60.orig/lib/inet6.c
-+++ net-tools-1.60/lib/inet6.c
-@@ -3,7 +3,7 @@
-  *              support functions for the net-tools.
-  *              (most of it copied from lib/inet.c 1.26).
-  *
-- * Version:     $Id: inet6.c,v 1.10 2000/10/28 11:04:00 pb Exp $
-+ * Version:     $Id: inet6.c,v 1.12 2002/12/10 01:03:09 ecki Exp $
-  *
-  * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
-  *              Copyright 1993 MicroWalt Corporation
-@@ -44,6 +44,21 @@
- 
- extern int h_errno;		/* some netdb.h versions don't export this */
- 
-+char * fix_v4_address(char *buf, struct in6_addr *in6) 
-+{ 
-+	if (IN6_IS_ADDR_V4MAPPED(in6->s6_addr)) { 
-+			char *s =strchr(buf, '.'); 
-+			if (s) { 
-+				while (s > buf && *s != ':')
-+					--s;
-+				if (*s == ':') ++s; 	
-+				else s = NULL; 
-+			} 	
-+			if (s) return s;
-+	} 
-+	return buf; 
-+} 
-+
- static int INET6_resolve(char *name, struct sockaddr_in6 *sin6)
- {
-     struct addrinfo req, *ai;
-@@ -83,14 +98,14 @@
- 	return (-1);
-     }
-     if (numeric & 0x7FFF) {
--	inet_ntop(AF_INET6, &sin6->sin6_addr, name, 80);
-+	inet_ntop( AF_INET6, &sin6->sin6_addr, name, 80);
- 	return (0);
-     }
-     if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
-         if (numeric & 0x8000)
- 	    strcpy(name, "default");
- 	else
--	    strcpy(name, "*");
-+	    strcpy(name, "[::]");
- 	return (0);
-     }
- 
-@@ -109,13 +124,14 @@
- }
- 
- 
-+
- /* Display an Internet socket address. */
- static char *INET6_print(unsigned char *ptr)
- {
-     static char name[80];
- 
-     inet_ntop(AF_INET6, (struct in6_addr *) ptr, name, 80);
--    return name;
-+	return fix_v4_address(name, (struct in6_addr *)ptr);
- }
- 
- 
-@@ -129,13 +145,14 @@
- 	return safe_strncpy(buff, _("[NONE SET]"), sizeof(buff));
-     if (INET6_rresolve(buff, (struct sockaddr_in6 *) sap, numeric) != 0)
- 	return safe_strncpy(buff, _("[UNKNOWN]"), sizeof(buff));
--    return (buff);
-+    return (fix_v4_address(buff, &((struct sockaddr_in6 *)sap)->sin6_addr));
- }
- 
- 
- static int INET6_getsock(char *bufp, struct sockaddr *sap)
- {
-     struct sockaddr_in6 *sin6;
-+	char *p;
- 
-     sin6 = (struct sockaddr_in6 *) sap;
-     sin6->sin6_family = AF_INET6;
-@@ -143,7 +160,9 @@
- 
-     if (inet_pton(AF_INET6, bufp, sin6->sin6_addr.s6_addr) <= 0)
- 	return (-1);
--
-+	p = fix_v4_address(bufp, &sin6->sin6_addr);
-+	if (p != bufp) 
-+		memcpy(bufp, p, strlen(p)+1); 
-     return 16;			/* ?;) */
- }
- 
---- net-tools-1.60.orig/lib/inet6_gr.c
-+++ net-tools-1.60/lib/inet6_gr.c
-@@ -1,4 +1,4 @@
--/*
-+ /*
-    Modifications:
-    1998-07-01 - Arnaldo Carvalho de Melo - GNU gettext instead of catgets,
-    snprintf instead of sprintf
-@@ -71,11 +71,15 @@
-         printf(_("INET6 (IPv6) not configured in this system.\n"));
- 	return 1;
-     }
--    printf(_("Kernel IPv6 routing table\n"));
- 
--    printf(_("Destination                                 "
--	     "Next Hop                                "
--	     "Flags Metric Ref    Use Iface\n"));
-+    if (numeric & RTF_CACHE)
-+    	printf(_("Kernel IPv6 routing cache\n"));
-+    else
-+    	printf(_("Kernel IPv6 routing table\n"));
-+
-+    printf(_("Destination                    "
-+	     "Next Hop                   "
-+	     "Flag Met Ref Use If\n"));
- 
-     while (fgets(buff, 1023, fp)) {
- 	num = sscanf(buff, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %4s%4s%4s%4s%4s%4s%4s%4s %02x %4s%4s%4s%4s%4s%4s%4s%4s %08x %08x %08x %08x %s\n",
-@@ -87,13 +91,19 @@
- 		     &slen,
- 		     naddr6p[0], naddr6p[1], naddr6p[2], naddr6p[3],
- 		     naddr6p[4], naddr6p[5], naddr6p[6], naddr6p[7],
--		     &metric, &use, &refcnt, &iflags, iface);
-+		     &metric, &refcnt, &use, &iflags, iface);
- #if 0
- 	if (num < 23)
- 	    continue;
- #endif
--	if (!(iflags & RTF_UP))
--	    continue;
-+	if (iflags & RTF_CACHE) {
-+		if (!(numeric & RTF_CACHE))
-+			continue;
-+	} else {
-+		if (numeric & RTF_CACHE)
-+			continue;
-+	}
-+			
- 	/* Fetch and resolve the target address. */
- 	snprintf(addr6, sizeof(addr6), "%s:%s:%s:%s:%s:%s:%s:%s",
- 		 addr6p[0], addr6p[1], addr6p[2], addr6p[3],
-@@ -112,7 +122,12 @@
- 		 inet6_aftype.sprint((struct sockaddr *) &snaddr6, 1));
- 
- 	/* Decode the flags. */
--	strcpy(flags, "U");
-+
-+	flags[0]=0;
-+	if (iflags & RTF_UP)
-+	    strcat(flags, "U");
-+	if (iflags & RTF_REJECT)
-+	    strcat(flags, "!");
- 	if (iflags & RTF_GATEWAY)
- 	    strcat(flags, "G");
- 	if (iflags & RTF_HOST)
-@@ -123,9 +138,19 @@
- 	    strcat(flags, "A");
- 	if (iflags & RTF_CACHE)
- 	    strcat(flags, "C");
-+	if (iflags & RTF_ALLONLINK)
-+	    strcat(flags, "a");
-+	if (iflags & RTF_EXPIRES)
-+	    strcat(flags, "e");
-+	if (iflags & RTF_MODIFIED)
-+	    strcat(flags, "m");
-+	if (iflags & RTF_NONEXTHOP)
-+	    strcat(flags, "n");
-+	if (iflags & RTF_FLOW)
-+	    strcat(flags, "f");
- 
- 	/* Print the info. */
--	printf("%-43s %-39s %-5s %-6d %-2d %7d %-8s\n",
-+	printf("%-30s %-26s %-4s %-3d %-1d%6d %s\n",
- 	       addr6, naddr6, flags, metric, refcnt, use, iface);
-     }
- 
-@@ -144,8 +169,7 @@
-     char addr6p[8][5], haddrp[6][3];
- 
-     if (!fp) {
--	ESYSNOT("nd_print", "ND Table");
--	return 1;
-+	return rprint_fib6(ext, numeric | RTF_CACHE);
-     }
-     printf(_("Kernel IPv6 Neighbour Cache\n"));
- 
---- net-tools-1.60.orig/lib/ipx_gr.c
-+++ net-tools-1.60/lib/ipx_gr.c
-@@ -38,21 +38,27 @@
-     char net[128], router_net[128];
-     char router_node[128];
-     int num;
--    FILE *fp = fopen(_PATH_PROCNET_IPX_ROUTE, "r");
-+    FILE *fp;
-     struct aftype *ap;
-     struct sockaddr sa;
- 
--    if ((ap = get_afntype(AF_IPX)) == NULL) {
--	EINTERN("lib/ipx_rt.c", "AF_IPX missing");
--	return (-1);
--    }
-+    fp = fopen(_PATH_PROCNET_IPX_ROUTE1, "r");
- 
-     if (!fp) {
--        perror(_PATH_PROCNET_IPX_ROUTE);
--        printf(_("IPX not configured in this system.\n"));
-+        fp = fopen(_PATH_PROCNET_IPX_ROUTE2, "r");
-+    }
-+    
-+    if (!fp) {
-+        perror(NULL);
-+        printf(_("IPX routing not in file %s or %s found.\n"), _PATH_PROCNET_IPX_ROUTE1, _PATH_PROCNET_IPX_ROUTE2);
- 	return 1;
-     }
- 
-+    if ((ap = get_afntype(AF_IPX)) == NULL) {
-+	EINTERN("lib/ipx_rt.c", "AF_IPX missing");
-+	return (-1);
-+    }
-+
-     printf(_("Kernel IPX routing table\n"));	/* xxx */
-     printf(_("Destination               Router Net                Router Node\n"));
- 
---- net-tools-1.60.orig/lib/proc.c
-+++ net-tools-1.60/lib/proc.c
-@@ -1,11 +1,12 @@
- /* Tolerant /proc file parser. Copyright 1998 Andi Kleen */
--/* $Id: proc.c,v 1.4 1999/01/05 20:54:00 philip Exp $ */ 
-+/* $Id: proc.c,v 1.5 2007/12/01 18:44:57 ecki Exp $ */ 
- /* Fixme: cannot currently cope with removed fields */ 
- 
- #include <string.h>
- #include <stdarg.h>
- #include <stdio.h>
- #include <ctype.h>
-+#include <unistd.h>
- 
- /* Caller must free return string. */
- 
-@@ -72,3 +73,22 @@
-     va_end(ap);
-     return flag;
- }
-+
-+
-+FILE *proc_fopen(const char *name)
-+{
-+    static char *buffer;
-+    static size_t pagesz;
-+    FILE *fd = fopen(name, "r");
-+
-+    if (fd == NULL)
-+      return NULL;
-+      
-+    if (!buffer) {
-+      pagesz = getpagesize();
-+      buffer = malloc(pagesz);
-+    }
-+    
-+    setvbuf(fd, buffer, _IOFBF, pagesz);
-+    return fd;
-+}
---- net-tools-1.60.orig/lib/proc.h
-+++ net-tools-1.60/lib/proc.h
-@@ -1,5 +1,7 @@
--
--
--/* Generate a suitable scanf format for a column title line */
-+/* 
-+ * prototypes for proc.c
-+ */
- char *proc_gen_fmt(char *name, int more, FILE * fh,...);
- int   proc_guess_fmt(char *name, FILE* fh,...);
-+FILE *proc_fopen(const char *name);
-+
---- net-tools-1.60.orig/lib/util-ank.c
-+++ net-tools-1.60/lib/util-ank.c
-@@ -293,7 +293,7 @@
- 	return 0;
- }
- 
--const char *format_host(int af, void *addr, __u8 *abuf, int alen)
-+const char *format_host(int af, void *addr, char *abuf, int alen)
- {
- #ifdef RESOLVE_HOSTNAMES
- 	if (resolve_hosts) {
---- net-tools-1.60.orig/lib/Makefile
-+++ net-tools-1.60/lib/Makefile
-@@ -16,7 +16,7 @@
- #
- 
- 
--HWOBJS	 = hw.o loopback.o slip.o ether.o ax25.o ppp.o arcnet.o tr.o tunnel.o frame.o sit.o rose.o ash.o fddi.o hippi.o hdlclapb.o strip.o irda.o ec_hw.o x25.o
-+HWOBJS	 = hw.o loopback.o slip.o ether.o ax25.o ppp.o arcnet.o tr.o tunnel.o frame.o sit.o rose.o ash.o fddi.o hippi.o hdlclapb.o strip.o irda.o ec_hw.o x25.o eui64.o
- AFOBJS	 = unix.o inet.o inet6.o ax25.o ipx.o ddp.o ipx.o netrom.o af.o rose.o econet.o x25.o
- AFGROBJS = inet_gr.o inet6_gr.o ipx_gr.o ddp_gr.o netrom_gr.o ax25_gr.o rose_gr.o getroute.o x25_gr.o
- AFSROBJS = inet_sr.o inet6_sr.o netrom_sr.o ipx_sr.o setroute.o x25_sr.o
---- net-tools-1.60.orig/lib/ddp_gr.c
-+++ net-tools-1.60/lib/ddp_gr.c
-@@ -1,3 +1,20 @@
-+/*
-+ * lib/ddp_gr.c         Prinbting of DDP (AppleTalk) routing table
-+ *                      used by the NET-LIB.
-+ *
-+ * NET-LIB      
-+ *
-+ * Version:     $Id: ddp_gr.c,v 1.4 2002/06/02 05:25:15 ecki Exp $
-+ *
-+ * Author:      Ajax <ajax@firest0rm.org>
-+ *
-+ * Modification:
-+ *  2002-06-02 integrated into main source by Bernd Eckenfels
-+ *
-+ */
-+
-+/* TODO: name lookups (/etc/atalk.names?  NBP?) */
-+
- #include "config.h"
- 
- #if HAVE_AFATALK
-@@ -16,9 +33,61 @@
- #include "pathnames.h"
- #include "intl.h"
- 
-+/* stolen from inet_gr.c */
-+#define flags_decode(i,o) do {                  \
-+        o[0] = '\0';                            \
-+        if (i & RTF_UP) strcat(o, "U");         \
-+        if (i & RTF_GATEWAY) strcat(o, "G");    \
-+        if (i & RTF_REJECT) strcat(o, "!");     \
-+        if (i & RTF_HOST) strcat(o, "H");       \
-+        if (i & RTF_REINSTATE) strcat(o, "R");  \
-+        if (i & RTF_DYNAMIC) strcat(o, "D");    \
-+        if (i & RTF_MODIFIED) strcat(o, "M");   \
-+        if (i & RTF_DEFAULT) strcat(o, "d");    \
-+        if (i & RTF_ALLONLINK) strcat(o, "a");  \
-+        if (i & RTF_ADDRCONF) strcat(o, "c");   \
-+        if (i & RTF_NONEXTHOP) strcat(o, "o");  \
-+        if (i & RTF_EXPIRES) strcat(o, "e");    \
-+        if (i & RTF_CACHE) strcat(o, "c");      \
-+        if (i & RTF_FLOW) strcat(o, "f");       \
-+        if (i & RTF_POLICY) strcat(o, "p");     \
-+        if (i & RTF_LOCAL) strcat(o, "l");      \
-+        if (i & RTF_MTU) strcat(o, "u");        \
-+        if (i & RTF_WINDOW) strcat(o, "w");     \
-+        if (i & RTF_IRTT) strcat(o, "i");       \
-+        if (i & RTF_NOTCACHED) strcat(o, "n");  \
-+    } while (0)
-+
- int DDP_rprint(int options)
- {
--    fprintf(stderr, _("Routing table for `ddp' not yet supported.\n"));
--    return (1);
-+    FILE *fp;
-+    char *dest, *gw, *dev, *flags;
-+    char oflags[32];
-+    char *hdr = "Destination     Gateway         Device          Flags";
-+
-+    fp = fopen(_PATH_PROCNET_ATALK_ROUTE, "r");
-+
-+    if (!fp) {
-+        perror("Error opening " _PATH_PROCNET_ATALK_ROUTE);
-+        fprintf(stderr, "DDP (AppleTalk) not configured on this system.\n");
-+        return 1;
-+    }
-+
-+    fscanf(fp, "%as %as %as %as\n", &dest, &gw, &flags, &dev);
-+    free(dest); free(gw); free(dev); free(flags);
-+
-+    printf("%s\n", hdr);
-+
-+    while (fscanf(fp, "%as %as %as %as\n", &dest, &gw, &flags, &dev) == 4) {
-+        int iflags = atoi(flags);
-+        flags_decode(iflags, oflags);
-+        printf("%-16s%-16s%-16s%-s\n", dest, gw, dev, oflags);
-+        free(dest); free(gw); free(dev); free(flags);
-+    }
-+
-+    fclose(fp);
-+    
-+    return 0;
-+
- }
- #endif
---- net-tools-1.60.orig/lib/hw.c
-+++ net-tools-1.60/lib/hw.c
-@@ -2,7 +2,7 @@
-  * lib/hw.c   This file contains the top-level part of the hardware
-  *              support functions module.
-  *
-- * Version:     $Id: hw.c,v 1.17 2000/05/20 13:38:10 pb Exp $
-+ * Version:     $Id: hw.c,v 1.18 2001/11/12 02:12:05 ecki Exp $
-  *
-  * Maintainer:  Bernd 'eckes' Eckenfels, <net-tools@lina.inka.de>
-  *
-@@ -73,6 +73,8 @@
- 
- extern struct hwtype ec_hwtype;
- 
-+extern struct hwtype eui64_hwtype;
-+
- static struct hwtype *hwtypes[] =
- {
- 
-@@ -144,6 +146,9 @@
- #if HAVE_HWX25
-     &x25_hwtype,
- #endif
-+#if HAVE_HWEUI64
-+    &eui64_hwtype,
-+#endif
-     &unspec_hwtype,
-     NULL
- };
-@@ -217,6 +222,9 @@
- #if HAVE_HWEC
-     ec_hwtype.title = _("Econet");
- #endif
-+#if HAVE_HWEUI64
-+    eui64_hwtype.title = _("Generic EUI-64");
-+#endif
-     sVhwinit = 1;
- }
- 
---- net-tools-1.60.orig/lib/inet.c
-+++ net-tools-1.60/lib/inet.c
-@@ -3,7 +3,7 @@
-  *              support functions for the net-tools.
-  *              (NET-3 base distribution).
-  *
-- * Version:    $Id: inet.c,v 1.13 1999/12/11 13:35:56 freitag Exp $
-+ * Version:    $Id: inet.c,v 1.14 2003/10/19 11:57:37 pb Exp $
-  *
-  * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
-  *              Copyright 1993 MicroWalt Corporation
-@@ -144,7 +144,7 @@
-     struct hostent *ent;
-     struct netent *np;
-     struct addr *pn;
--    unsigned long ad, host_ad;
-+    u_int32_t ad, host_ad;
-     int host = 0;
- 
-     /* Grmpf. -FvK */
-@@ -155,7 +155,7 @@
- 	errno = EAFNOSUPPORT;
- 	return (-1);
-     }
--    ad = (unsigned long) sin->sin_addr.s_addr;
-+    ad = sin->sin_addr.s_addr;
- #ifdef DEBUG
-     fprintf (stderr, "rresolve: %08lx, mask %08x, num %08x \n", ad, netmask, numeric);
- #endif
---- net-tools-1.60.orig/lib/inet_sr.c
-+++ net-tools-1.60/lib/inet_sr.c
-@@ -3,6 +3,7 @@
-    1998-07-01 - Arnaldo Carvalho de Melo - GNU gettext instead of catgets
-    1999-10-07 - Kurt Garloff		 - for -host and gws: prefer host names
- 						over networks (or even reject)
-+   2003-10-11 - Maik Broemme		 - gcc 3.x warnign fixes (default: break;)
-  */
- 
- #include "config.h"
-@@ -104,7 +105,6 @@
-        isnet = 1; break;
-     case 2:
-        isnet = 0; break;
--    default:
-     }
- 
-     /* Fill in the other fields. */
---- net-tools-1.60.orig/lib/ipx.c
-+++ net-tools-1.60/lib/ipx.c
-@@ -133,6 +133,9 @@
-     char *ep;
-     int nbo;
- 
-+    if (!sai)
-+    	return (-1);
-+    	
-     sai->sipx_family = AF_IPX;
-     sai->sipx_network = htonl(0);
-     sai->sipx_node[0] = sai->sipx_node[1] = sai->sipx_node[2] =
---- net-tools-1.60.orig/lib/interface.c
-+++ net-tools-1.60/lib/interface.c
-@@ -7,7 +7,7 @@
-    8/2000  Andi Kleen make the list operations a bit more efficient.
-    People are crazy enough to use thousands of aliases now.
- 
--   $Id: interface.c,v 1.14 2001/02/10 19:31:15 pb Exp $
-+   $Id: interface.c,v 1.28 2003/05/29 02:09:14 ecki Exp $
-  */
- 
- #include "config.h"
-@@ -23,6 +23,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <ctype.h>
-+#include <string.h>
- 
- #if HAVE_AFIPX
- #if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)
-@@ -87,14 +88,20 @@
- 
- int ife_short;
- 
-+int if_list_all = 0;	/* do we have requested the complete proc list, yet? */
-+
- static struct interface *int_list, *int_last;
- 
- static int if_readlist_proc(char *);
- 
--static struct interface *add_interface(char *name)
-+static struct interface *if_cache_add(char *name)
- {
-     struct interface *ife, **nextp, *new;
- 
-+    if (!int_list)
-+    	int_last = NULL;
-+
-+    /* the cache is sorted, so if we hit a smaller if, exit */
-     for (ife = int_last; ife; ife = ife->prev) {
- 	    int n = nstrcmp(ife->name, name); 
- 	    if (n == 0) 
-@@ -104,7 +111,7 @@
-     }
-     new(new); 
-     safe_strncpy(new->name, name, IFNAMSIZ); 
--    nextp = ife ? &ife->next : &int_list;
-+    nextp = ife ? &ife->next : &int_list; // keep sorting
-     new->prev = ife;
-     new->next = *nextp; 
-     if (new->next) 
-@@ -117,19 +124,22 @@
- 
- struct interface *lookup_interface(char *name)
- {
--    struct interface *ife = NULL;
--
--    if (if_readlist_proc(name) < 0) 
--	    return NULL; 
--    ife = add_interface(name); 
--    return ife;
-+   /* if we have read all, use it */
-+   if (if_list_all)
-+   	return if_cache_add(name);
-+
-+   /* otherwise we read a limited list */
-+   if (if_readlist_proc(name) < 0)
-+   	return NULL;
-+ 
-+   return if_cache_add(name);
- }
- 
- int for_all_interfaces(int (*doit) (struct interface *, void *), void *cookie)
- {
-     struct interface *ife;
- 
--    if (!int_list && (if_readlist() < 0))
-+    if (!if_list_all && (if_readlist() < 0))
- 	return -1;
-     for (ife = int_list; ife; ife = ife->next) {
- 	int err = doit(ife, cookie);
-@@ -139,13 +149,15 @@
-     return 0;
- }
- 
--int free_interface_list(void)
-+int if_cache_free(void)
- {
-     struct interface *ife;
-     while ((ife = int_list) != NULL) {
- 	int_list = ife->next;
- 	free(ife);
-     }
-+    int_last = NULL;
-+    if_list_all = 0;
-     return 0;
- }
- 
-@@ -180,7 +192,7 @@
- 	}
- 	if (ifc.ifc_len == sizeof(struct ifreq) * numreqs) {
- 	    /* assume it overflowed and try again */
--	    numreqs += 10;
-+	    numreqs *= 2;
- 	    continue;
- 	}
- 	break;
-@@ -188,7 +200,7 @@
- 
-     ifr = ifc.ifc_req;
-     for (n = 0; n < ifc.ifc_len; n += sizeof(struct ifreq)) {
--	add_interface(ifr->ifr_name);
-+	if_cache_add(ifr->ifr_name);
- 	ifr++;
-     }
-     err = 0;
-@@ -198,7 +210,7 @@
-     return err;
- }
- 
--static char *get_name(char *name, char *p)
-+char *get_name(char *name, char *p)
- {
-     while (isspace(*p))
- 	p++;
-@@ -206,16 +218,19 @@
- 	if (isspace(*p))
- 	    break;
- 	if (*p == ':') {	/* could be an alias */
--	    char *dot = p, *dotname = name;
--	    *name++ = *p++;
--	    while (isdigit(*p))
--		*name++ = *p++;
--	    if (*p != ':') {	/* it wasn't, backup */
--		p = dot;
--		name = dotname;
-+		char *dot = p++;
-+ 		while (*p && isdigit(*p)) p++;
-+		if (*p == ':') {
-+			/* Yes it is, backup and copy it. */
-+			p = dot;
-+			*name++ = *p++;
-+			while (*p && isdigit(*p)) {
-+				*name++ = *p++;
-+			}
-+		} else {
-+			/* No, it isn't */
-+			p = dot;
- 	    }
--	    if (*p == '\0')
--		return NULL;
- 	    p++;
- 	    break;
- 	}
-@@ -225,7 +240,7 @@
-     return p;
- }
- 
--static int procnetdev_version(char *buf)
-+int procnetdev_version(char *buf)
- {
-     if (strstr(buf, "compressed"))
- 	return 3;
-@@ -234,12 +249,12 @@
-     return 1;
- }
- 
--static int get_dev_fields(char *bp, struct interface *ife)
-+int get_dev_fields(char *bp, struct interface *ife)
- {
-     switch (procnetdev_vsn) {
-     case 3:
- 	sscanf(bp,
--	"%llu %llu %lu %lu %lu %lu %lu %lu %llu %llu %lu %lu %lu %lu %lu %lu",
-+	"%Lu %Lu %lu %lu %lu %lu %lu %lu %Lu %Lu %lu %lu %lu %lu %lu %lu",
- 	       &ife->stats.rx_bytes,
- 	       &ife->stats.rx_packets,
- 	       &ife->stats.rx_errors,
-@@ -259,7 +274,7 @@
- 	       &ife->stats.tx_compressed);
- 	break;
-     case 2:
--	sscanf(bp, "%llu %llu %lu %lu %lu %lu %llu %llu %lu %lu %lu %lu %lu",
-+	sscanf(bp, "%Lu %Lu %lu %lu %lu %lu %Lu %Lu %lu %lu %lu %lu %lu",
- 	       &ife->stats.rx_bytes,
- 	       &ife->stats.rx_packets,
- 	       &ife->stats.rx_errors,
-@@ -277,7 +292,7 @@
- 	ife->stats.rx_multicast = 0;
- 	break;
-     case 1:
--	sscanf(bp, "%llu %lu %lu %lu %lu %llu %lu %lu %lu %lu %lu",
-+	sscanf(bp, "%Lu %lu %lu %lu %lu %Lu %lu %lu %lu %lu %lu",
- 	       &ife->stats.rx_packets,
- 	       &ife->stats.rx_errors,
- 	       &ife->stats.rx_dropped,
-@@ -300,22 +315,16 @@
- 
- static int if_readlist_proc(char *target)
- {
--    static int proc_read; 
-     FILE *fh;
-     char buf[512];
-     struct interface *ife;
-     int err;
- 
--    if (proc_read) 
--	    return 0; 
--    if (!target) 
--	    proc_read = 1;
--
-     fh = fopen(_PATH_PROCNET_DEV, "r");
-     if (!fh) {
- 		fprintf(stderr, _("Warning: cannot open %s (%s). Limited output.\n"),
- 			_PATH_PROCNET_DEV, strerror(errno)); 
--		return if_readconf();
-+		return -2;
- 	}	
-     fgets(buf, sizeof buf, fh);	/* eat line */
-     fgets(buf, sizeof buf, fh);
-@@ -350,7 +359,7 @@
-     while (fgets(buf, sizeof buf, fh)) {
- 	char *s, name[IFNAMSIZ];
- 	s = get_name(name, buf);    
--	ife = add_interface(name);
-+	ife = if_cache_add(name);
- 	get_dev_fields(s, ife);
- 	ife->statistics_valid = 1;
- 	if (target && !strcmp(target,name))
-@@ -359,7 +368,6 @@
-     if (ferror(fh)) {
- 	perror(_PATH_PROCNET_DEV);
- 	err = -1;
--	proc_read = 0; 
-     }
- 
- #if 0
-@@ -371,9 +379,16 @@
- 
- int if_readlist(void) 
- { 
--    int err = if_readlist_proc(NULL); 
--    if (!err)
--	    err = if_readconf();
-+    /* caller will/should check not to call this too often 
-+     *   (i.e. only if if_list_all == 0 
-+     */
-+    int err = 0;
-+    
-+    err |= if_readlist_proc(NULL); 
-+    err |= if_readconf();
-+
-+    if_list_all = 1;
-+
-     return err;
- } 
- 
-@@ -579,11 +594,11 @@
- 
- void ife_print_short(struct interface *ptr)
- {
--    printf("%-5.5s ", ptr->name);
--    printf("%5d %3d", ptr->mtu, ptr->metric);
-+    printf("%-9s ", ptr->name);
-+    printf("%5d %-2d ", ptr->mtu, ptr->metric);
-     /* If needed, display the interface statistics. */
-     if (ptr->statistics_valid) {
--	printf("%8llu %6lu %6lu %6lu",
-+	printf("%8llu %6lu %6lu %-6lu ",
- 	       ptr->stats.rx_packets, ptr->stats.rx_errors,
- 	       ptr->stats.rx_dropped, ptr->stats.rx_fifo_errors);
- 	printf("%8llu %6lu %6lu %6lu ",
-@@ -636,8 +651,8 @@
-     int hf;
-     int can_compress = 0;
-     unsigned long long rx, tx, short_rx, short_tx;
--    char Rext[5]="b";
--    char Text[5]="b";
-+    const char *Rext = "B";
-+    const char *Text = "B";
- 
- #if HAVE_AFIPX
-     static struct aftype *ipxtype = NULL;
-@@ -670,7 +685,7 @@
-     if (hw == NULL)
- 	hw = get_hwntype(-1);
- 
--    printf(_("%-9.9s Link encap:%s  "), ptr->name, hw->title);
-+    printf(_("%-9s Link encap:%s  "), ptr->name, hw->title);
-     /* For some hardware types (eg Ash, ATM) we don't print the 
-        hardware address if it's null.  */
-     if (hw->print != NULL && (! (hw_null_address(hw, ptr->hwaddr) &&
-@@ -843,10 +858,38 @@
- 	tx = ptr->stats.tx_bytes;
- 	short_rx = rx * 10;  
- 	short_tx = tx * 10;
--	if (rx > 1048576) { short_rx /= 1048576;  strcpy(Rext, "Mb"); }
--	else if (rx > 1024) { short_rx /= 1024;  strcpy(Rext, "Kb"); }
--	if (tx > 1048576) { short_tx /= 1048576;  strcpy(Text, "Mb"); }
--	else if (tx > 1024) { short_tx /= 1024;  strcpy(Text, "Kb"); }
-+	if (rx > 1125899906842624ull) {
-+	    short_rx /= 1125899906842624ull;
-+	    Rext = "PiB";
-+	} else if (rx > 1099511627776ull) {
-+	    short_rx /= 1099511627776ull;
-+	    Rext = "TiB";
-+	} else if (rx > 1073741824ull) {
-+	    short_rx /= 1073741824ull;
-+	    Rext = "GiB";
-+	} else if (rx > 1048576) {
-+	    short_rx /= 1048576;
-+	    Rext = "MiB";
-+	} else if (rx > 1024) {
-+	    short_rx /= 1024;
-+	    Rext = "KiB";
-+	}
-+	if (tx > 1125899906842624ull) {
-+	    short_tx /= 1125899906842624ull;
-+	    Text = "PiB";
-+	} else 	if (tx > 1099511627776ull) {
-+	    short_tx /= 1099511627776ull;
-+	    Text = "TiB";
-+	} else if (tx > 1073741824ull) {
-+	    short_tx /= 1073741824ull;
-+	    Text = "GiB";
-+	} else if (tx > 1048576) {
-+	    short_tx /= 1048576;
-+	    Text = "MiB";
-+	} else if (tx > 1024) {
-+	    short_tx /= 1024;
-+	    Text = "KiB";
-+	}
- 
- 	printf("          ");
- 	printf(_("TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"),
-@@ -867,7 +910,7 @@
-     }
- 
-     if ((ptr->map.irq || ptr->map.mem_start || ptr->map.dma ||
--	 ptr->map.base_addr)) {
-+	 ptr->map.base_addr >= 0x100)) {
- 	printf("          ");
- 	if (ptr->map.irq)
- 	    printf(_("Interrupt:%d "), ptr->map.irq);
---- net-tools-1.60.orig/lib/net-features.h
-+++ net-tools-1.60/lib/net-features.h
-@@ -295,6 +295,13 @@
- "-"
- #endif
- "HDLC/LAPB "
-+
-+#if HAVE_HWEUI64
-+"+"
-+#else
-+"-"
-+#endif
-+"EUI64 "
- ;
- 
- 
---- net-tools-1.60.orig/lib/nstrcmp.c
-+++ net-tools-1.60/lib/nstrcmp.c
-@@ -1,34 +1,157 @@
- /* Copyright 1998 by Andi Kleen. Subject to the GPL. */
--/* $Id: nstrcmp.c,v 1.2 1998/11/15 20:11:38 freitag Exp $ */ 
-+/* rewritten by bernd eckenfels because of complicated alias semantic */
-+/* $Id: nstrcmp.c,v 1.4 2004/06/03 22:49:17 ecki Exp $ */ 
- #include <ctype.h>
- #include <stdlib.h>
-+#include <string.h>
- #include "util.h"
- 
--/* like strcmp(), but knows about numbers */
--int nstrcmp(const char *astr, const char *b)
-+
-+/* return numerical :999 suffix or null. sideeffect: replace ':' with \0 */
-+char* cutalias(char* name)
- {
--    const char *a = astr;
-+	int digit = 0;
-+	int pos;
-+	
-+	for(pos=strlen(name); pos>0; pos--)
-+	{
-+		if (name[pos-1]==':' && digit)
-+		{
-+			name[pos-1]='\0';
-+			return name+pos;
-+		}
-+		if (!isdigit(name[pos-1]))
-+			break;
-+		digit = 1;
-+	}
-+	return NULL;
-+}
- 
--    while (*a == *b) {
--	if (*a == '\0')
--	    return 0;
--	a++;
--	b++;
--    }
--    if (isdigit(*a)) {
--	if (!isdigit(*b))
--	    return -1;
--	while (a > astr) {
--	    a--;
--	    if (!isdigit(*a)) {
--		a++;
--		break;
--	    }
--	    if (!isdigit(*b))
--		return -1;
--	    b--;
-+
-+/* return index of last non digit or -1 if it does not end with digits */
-+int rindex_nondigit(char *name)
-+{
-+	int pos = strlen(name);
-+
-+	for(pos=strlen(name); pos>0; pos--)
-+	{
-+		if (!isdigit(name[pos-1]))
-+			return pos;
- 	}
--	return atoi(a) > atoi(b) ? 1 : -1;
--    }
--    return *a - *b;
-+	return 0;
-+}
-+
-+
-+/* like strcmp(), but knows about numbers and ':' alias suffix */
-+int nstrcmp(const char *ap, const char *bp)
-+{
-+	char *a = (char*)strdup(ap);
-+	char *b = (char*)strdup(bp);
-+	char *an, *bn;
-+	int av = 0, bv = 0;
-+	char *aalias=cutalias(a);
-+	char *balias=cutalias(b);
-+	int aindex=rindex_nondigit(a);
-+	int bindex=rindex_nondigit(b);
-+	int complen=(aindex<bindex)?aindex:bindex;
-+	int res = strncmp(a, b, complen);
-+
-+	if (res != 0)
-+		{ free(a); free(b); return res; }
-+		
-+	if (aindex > bindex)
-+		{ free(a); free(b); return 1; }
-+		
-+	if (aindex < bindex)
-+		{ free(a); free(b); return -1; }
-+		
-+	an = a+aindex;
-+	bn = b+bindex;
-+	
-+	av = atoi(an);
-+	bv = atoi(bn);
-+	
-+	if (av < bv)
-+		{ free(a); free(b); return -1; }
-+		
-+	if (av > bv)
-+		{ free(a); free(b); return 1; }
-+		
-+	av = -1;
-+	if (aalias != NULL)
-+		av = atoi(aalias);
-+	
-+	bv = -1;
-+	if (balias != NULL)
-+		bv = atoi(balias);
-+	
-+	free(a); free(b);
-+	
-+	if (av < bv)
-+		return -1;
-+		
-+	if (av > bv)
-+		return 1;
-+		
-+	return 0;
-+}
-+
-+
-+#ifdef NSTRCMP_TEST
-+
-+int cs(int s)
-+{
-+	if (s < 0) return -1;
-+	if (s > 0) return 1;
-+	return 0;
-+}
-+
-+
-+int dotest(char* a, char* b, int exp)
-+{
-+	int res = nstrcmp(a, b);
-+	int err = (cs(res) != cs(exp));
-+	printf("nstrcmp(\"%s\", \"%s\")=%d %d %s\n", a, b, res, exp, err?"WRONG":"OK");
-+	return err;
- }
-+
-+int main()
-+{
-+	int err = 0;
-+	
-+	err |= dotest("eth1", "eth1", 0);
-+	err |= dotest("eth0:1", "eth0:1", 0);
-+	err |= dotest("lan", "lan", 0);
-+	err |= dotest("100", "100", 0);
-+	err |= dotest("", "", 0);
-+	err |= dotest(":", ":", 0);
-+	err |= dotest("a:b:c", "a:b:c", 0);
-+	err |= dotest("a:", "a:", 0);
-+	err |= dotest(":a", ":a", 0);
-+
-+	err |= dotest("a", "aa", -1);	
-+	err |= dotest("eth0", "eth1", -1);
-+	err |= dotest("eth1", "eth20", -1);
-+	err |= dotest("eth20", "eth100", -1);
-+	err |= dotest("eth1", "eth13", -1);
-+	err |= dotest("eth", "eth2", -1);
-+	err |= dotest("eth0:1", "eth0:2", -1);
-+	err |= dotest("eth1:10", "eth13:10", -1);
-+	err |= dotest("eth1:1", "eth1:13", -1);
-+	err |= dotest("a", "a:", -1);
-+	
-+	err |= dotest("aa", "a", 1);
-+	err |= dotest("eth2", "eth1", 1);
-+	err |= dotest("eth13", "eth1", 1);	
-+	err |= dotest("eth2", "eth", 1);
-+	err |= dotest("eth2:10", "eth2:1", 1);
-+	err |= dotest("eth2:5", "eth2:4", 1);
-+	err |= dotest("eth3:2", "eth2:3", 1);
-+	err |= dotest("eth13:1", "eth1:0", 1);
-+	err |= dotest("a:", "a", 1);
-+	err |= dotest("a1b12", "a1b2", 1);
-+
-+	return err;
-+}
-+
-+#endif
---- net-tools-1.60.orig/lib/pathnames.h
-+++ net-tools-1.60/lib/pathnames.h
-@@ -1,4 +1,3 @@
--
- /*
-  * lib/pathnames.h    This file contains the definitions of the path 
-  *                      names used by the NET-LIB.
-@@ -29,8 +28,10 @@
- #define _PATH_PROCNET_NR_NODES		"/proc/net/nr_nodes"
- #define _PATH_PROCNET_ARP		"/proc/net/arp"
- #define _PATH_PROCNET_AX25		"/proc/net/ax25"
--#define _PATH_PROCNET_IPX		"/proc/net/ipx"
--#define _PATH_PROCNET_IPX_ROUTE		"/proc/net/ipx_route"
-+#define _PATH_PROCNET_IPX_SOCKET1	"/proc/net/ipx/socket"
-+#define _PATH_PROCNET_IPX_SOCKET2	"/proc/net/ipx"
-+#define _PATH_PROCNET_IPX_ROUTE1	"/proc/net/ipx/route"
-+#define _PATH_PROCNET_IPX_ROUTE2	"/proc/net/ipx_route"
- #define _PATH_PROCNET_ATALK		"/proc/net/appletalk"
- #define _PATH_PROCNET_IP_BLK		"/proc/net/ip_block"
- #define _PATH_PROCNET_IP_FWD		"/proc/net/ip_forward"
-@@ -45,6 +46,7 @@
- #define _PATH_PROCNET_X25              "/proc/net/x25"
- #define _PATH_PROCNET_X25_ROUTE                "/proc/net/x25_routes"
- #define _PATH_PROCNET_DEV_MCAST		"/proc/net/dev_mcast"
-+#define _PATH_PROCNET_ATALK_ROUTE	"/proc/net/atalk_route"
- 
- /* pathname for the netlink device */
- #define _PATH_DEV_ROUTE	"/dev/route"
---- net-tools-1.60.orig/lib/tr.c
-+++ net-tools-1.60/lib/tr.c
-@@ -2,7 +2,7 @@
-  * lib/tr.c   This file contains an implementation of the "Tokenring"
-  *              support functions.
-  *
-- * Version:     $Id: tr.c,v 1.8 2000/02/02 08:56:30 freitag Exp $
-+ * Version:     $Id: tr.c,v 1.9 2005/05/16 03:15:12 ecki Exp $
-  *
-  * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
-  *              Copyright 1993 MicroWalt Corporation
-@@ -30,8 +30,14 @@
- #include "net-support.h"
- #include "pathnames.h"
- #include "intl.h"
-+#include "util.h"
- 
-+
-+/* actual definition at the end of file */
- extern struct hwtype tr_hwtype;
-+#ifdef ARPHRD_IEEE802_TR
-+extern struct hwtype tr_hwtype1;
-+#endif
- 
- static char *pr_tr(unsigned char *ptr)
- {
-@@ -42,7 +48,7 @@
- 	     (ptr[3] & 0377), (ptr[4] & 0377), (ptr[5] & 0377)
- 	);
-     return (buff);
--}
-+      }
- 
- 
- static int in_tr(char *bufp, struct sockaddr *sap)
-@@ -51,7 +57,17 @@
-     char c, *orig;
-     int i, val;
- 
-+#ifdef ARPHRD_IEEE802_TR
-+    if (kernel_version() < KRELEASE(2,3,30)) { 
-+        sap->sa_family = tr_hwtype.type;
-+    } else { 
-+        sap->sa_family = tr_hwtype1.type;
-+    } 	
-+#else
-     sap->sa_family = tr_hwtype.type;
-+    #warning "Limited functionality, no support for ARPHRD_IEEE802_TR (old kernel headers?)"
-+#endif
-+
-     ptr = sap->sa_data;
- 
-     i = 0;
---- net-tools-1.60.orig/lib/util.h
-+++ net-tools-1.60/lib/util.h
-@@ -14,3 +14,6 @@
- 
- char *safe_strncpy(char *dst, const char *src, size_t size); 
- 
-+
-+#define netmin(a,b) ((a)<(b) ? (a) : (b))
-+#define netmax(a,b) ((a)>(b) ? (a) : (b))
---- net-tools-1.60.orig/lib/irda.c
-+++ net-tools-1.60/lib/irda.c
-@@ -1,13 +1,15 @@
- /*********************************************************************
-  *                
-  * Filename:      irda.c
-- * Version:       0.1
-- * Description:   A first attempt to make ifconfig understand IrDA
-+ * Version:       0.2
-+ * Description:   A second attempt to make ifconfig understand IrDA
-  * Status:        Experimental.
-  * Author:        Dag Brattli <dagb@cs.uit.no>
-  * Created at:    Wed Apr 21 09:03:09 1999
-  * Modified at:   Wed Apr 21 09:17:05 1999
-  * Modified by:   Dag Brattli <dagb@cs.uit.no>
-+ * Modified at:   Wed May  1 11:51:44 CEST 2002
-+ * Modified by:   Christoph Bartelmus <christoph@bartelmus.de>
-  * 
-  *     This program is free software; you can redistribute it and/or 
-  *     modify it under the terms of the GNU General Public License as 
-@@ -59,9 +61,9 @@
-  */
- static char *irda_print(unsigned char *ptr)
- {
--    static char buff[8];
-+    static char buff[12];
- 
--    sprintf(&buff[strlen(buff)], "%02x:%02x:%02x:%02x", ptr[3], ptr[2], 
-+    snprintf(buff, 12, "%02x:%02x:%02x:%02x", ptr[3], ptr[2], 
- 	    ptr[1], ptr[0]);
- 
-     return (buff);
---- net-tools-1.60.orig/lib/x25_sr.c
-+++ net-tools-1.60/lib/x25_sr.c
-@@ -67,7 +67,7 @@
-   strcpy(target, *args++);
- 
-   /* Clean out the x25_route_struct structure. */
--  memset((char *) &rt, 0, sizeof(struct x25_route_struct));
-+  memset((char *) &rt, 0, sizeof(rt));
- 
- 
-   if ((sigdigits = x25_aftype.input(0, target, (struct sockaddr *)&sx25)) < 0) {
-@@ -76,8 +76,8 @@
-   }
-   rt.sigdigits=sigdigits;
- 
--  /* x25_route_struct.address isn't type struct sockaddr_x25, Why? */
--  memcpy(&rt.address, &sx25.sx25_addr, sizeof(x25_address));
-+  /* this works with 2.4 and 2.6 headers struct x25_address vs. typedef */
-+  memcpy(&rt.address, &sx25.sx25_addr, sizeof(sx25.sx25_addr));
- 
-   while (*args) {
- 	if (!strcmp(*args,"device") || !strcmp(*args,"dev")) {
---- net-tools-1.60.orig/lib/eui64.c
-+++ net-tools-1.60/lib/eui64.c
-@@ -0,0 +1,155 @@
-+/*
-+ * lib/eui64.c  This file contains support for generic EUI-64 hw addressing
-+ *
-+ * Version:     $Id: eui64.c,v 1.1 2001/11/12 02:12:05 ecki Exp $
-+ *
-+ * Author:      Daniel Stodden <stodden@in.tum.de>
-+ *              Copyright 2001 Daniel Stodden
-+ *
-+ *              blueprinted from ether.c 
-+ *              Copyright 1993 MicroWalt Corporation
-+ *
-+ *              This program is free software; you can redistribute it
-+ *              and/or  modify it under  the terms of  the GNU General
-+ *              Public  License as  published  by  the  Free  Software
-+ *              Foundation;  either  version 2 of the License, or  (at
-+ *              your option) any later version.
-+ */
-+#include "config.h"
-+
-+#if HAVE_HWEUI64
-+
-+#include <sys/types.h>
-+#include <sys/ioctl.h>
-+#include <sys/socket.h>
-+#include <net/if_arp.h>
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <ctype.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <string.h>
-+#include <termios.h>
-+#include <unistd.h>
-+#include "net-support.h"
-+#include "pathnames.h"
-+#include "intl.h"
-+
-+/*
-+ * EUI-64 constants
-+ */
-+
-+#define EUI64_ALEN	8
-+
-+#ifndef ARPHRD_EUI64
-+#define ARPHRD_EUI64	27
-+#warning "ARPHRD_EUI64 not defined in <net/if_arp.h>. Using private value 27"
-+#endif
-+
-+struct hwtype eui64_hwtype;
-+
-+/* Display an EUI-64 address in readable format. */
-+static char *pr_eui64( unsigned char *ptr )
-+{
-+	static char buff[64];
-+
-+	snprintf(buff, sizeof(buff), "%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X",
-+		 (ptr[0] & 0377), (ptr[1] & 0377), (ptr[2] & 0377), (ptr[3] & 0377), 
-+		 (ptr[4] & 0377), (ptr[5] & 0377), (ptr[6] & 0377), (ptr[7] & 0377)
-+		);
-+	return (buff);
-+}
-+
-+/* Start the PPP encapsulation on the file descriptor. */
-+static int in_eui64( char *bufp, struct sockaddr *sap )
-+{
-+	unsigned char *ptr;
-+	char c, *orig;
-+	int i;
-+	unsigned val;
-+
-+	sap->sa_family = eui64_hwtype.type;
-+	ptr = sap->sa_data;
-+
-+	i = 0;
-+	orig = bufp;
-+	
-+	while ((*bufp != '\0') && (i < EUI64_ALEN)) {
-+		val = 0;
-+		c = *bufp++;
-+		if (isdigit(c))
-+			val = c - '0';
-+		else if (c >= 'a' && c <= 'f')
-+			val = c - 'a' + 10;
-+		else if (c >= 'A' && c <= 'F')
-+			val = c - 'A' + 10;
-+		else {
-+#ifdef DEBUG
-+			fprintf( stderr, _("in_eui64(%s): invalid eui64 address!\n"), 
-+				 orig );
-+#endif
-+			errno = EINVAL;
-+			return (-1);
-+		}
-+
-+		val <<= 4;
-+		c = *bufp;
-+		if (isdigit(c))
-+			val |= c - '0';
-+		else if (c >= 'a' && c <= 'f')
-+			val |= c - 'a' + 10;
-+		else if (c >= 'A' && c <= 'F')
-+			val |= c - 'A' + 10;
-+		else if (c == ':' || c == 0)
-+			val >>= 4;
-+		else {
-+#ifdef DEBUG
-+			fprintf( stderr, _("in_eui64(%s): invalid eui64 address!\n"), 
-+				 orig );
-+#endif
-+			errno = EINVAL;
-+			return (-1);
-+		}
-+
-+		if (c != 0)
-+			bufp++;
-+
-+		*ptr++ = (unsigned char) (val & 0377);
-+		i++;
-+		
-+		/* We might get a semicolon here - not required. */
-+		if (*bufp == ':') {
-+			if (i == EUI64_ALEN) {
-+#ifdef DEBUG
-+				fprintf(stderr, _("in_eui64(%s): trailing : ignored!\n"),
-+					orig)
-+#endif
-+					; /* nothing */
-+			}
-+			bufp++;
-+		}
-+	}
-+
-+	/* That's it.  Any trailing junk? */
-+	if ((i == EUI64_ALEN) && (*bufp != '\0')) {
-+#ifdef DEBUG
-+		fprintf(stderr, _("in_eui64(%s): trailing junk!\n"), orig);
-+		errno = EINVAL;
-+		return (-1);
-+#endif
-+	}
-+#ifdef DEBUG
-+	fprintf(stderr, "in_eui64(%s): %s\n", orig, pr_eui64(sap->sa_data));
-+#endif
-+
-+    return (0);
-+}
-+
-+struct hwtype eui64_hwtype =
-+{
-+	"eui64", NULL, /*"EUI-64 addressing", */ ARPHRD_EUI64, EUI64_ALEN,
-+	pr_eui64, in_eui64, NULL, 0
-+};
-+
-+
-+#endif				/* HAVE_EUI64 */
---- net-tools-1.60.orig/rarp.c
-+++ net-tools-1.60/rarp.c
-@@ -3,7 +3,7 @@
-  *              that maintains the kernel's RARP cache.  It is derived
-  *              from Fred N. van Kempen's arp command.
-  *
-- * Version:	$Id: rarp.c,v 1.6 2001/04/08 17:05:05 pb Exp $
-+ * Version:	$Id: rarp.c,v 1.9 2007/12/02 02:19:52 ecki Exp $
-  *
-  * Usage:       rarp -d hostname                      Delete entry
-  *              rarp -s hostname ethernet_address     Add entry
-@@ -40,6 +40,7 @@
- #include "net-support.h"
- #include "version.h"
- #include "pathnames.h"
-+#include "proc.h"
- 
- static char no_rarp_message[] = N_("This kernel does not support RARP.\n");
- 
-@@ -154,7 +155,7 @@
- 
- static int display_cache(void)
- {
--    FILE *fd = fopen(_PATH_PROCNET_RARP, "r");
-+    FILE *fd = proc_fopen(_PATH_PROCNET_RARP);
-     char buffer[256];
-     if (fd == NULL) {
- 	if (errno == ENOENT)
---- net-tools-1.60.orig/slattach.c
-+++ net-tools-1.60/slattach.c
-@@ -73,7 +73,7 @@
- 
- 
- const char *Release = RELEASE,
--	   *Version = "@(#) slattach 1.21 (1999-11-21)",
-+	   *Version = "$Id: slattach.c,v 1.11 2005/12/04 05:15:36 ecki Exp $",
- 	   *Signature = "net-tools, Fred N. van Kempen et al.";
- 
- 
-@@ -115,7 +115,7 @@
- int		opt_k = 0;		/* "keepalive" value		*/
- #endif
- int		opt_l = 0;		/* "lock it" flag		*/
--int		opt_L = 0;		/* clocal flag			*/
-+int		opt_L = 0;		/* 3-wire mode flag		*/
- int		opt_m = 0;		/* "set RAW mode" flag		*/
- int		opt_n = 0;		/* "set No Mesg" flag		*/
- #ifdef SIOCSOUTFILL
-@@ -342,9 +342,11 @@
-   tty->c_oflag = (0);				/* output flags		*/
-   tty->c_lflag = (0);				/* local flags		*/
-   speed = (tty->c_cflag & CBAUD);		/* save current speed	*/
--  tty->c_cflag = (CRTSCTS | HUPCL | CREAD);	/* UART flags		*/
-+  tty->c_cflag = (HUPCL | CREAD);		/* UART flags		*/
-   if (opt_L) 
- 	tty->c_cflag |= CLOCAL;
-+  else
-+	tty->c_cflag |= CRTSCTS;
-   tty->c_cflag |= speed;			/* restore speed	*/
-   return(0);
- }
---- net-tools-1.60.orig/include/util-ank.h
-+++ net-tools-1.60/include/util-ank.h
-@@ -75,6 +75,6 @@
- extern int do_class(int argc, char **argv);
- extern int do_filter(int argc, char **argv);
- 
--extern const char *format_host(int af, void *addr, __u8 *abuf, int alen);
-+extern const char *format_host(int af, void *addr, char *abuf, int alen);
- 
- #endif /* __UTILS_H__ */
---- net-tools-1.60.orig/include/interface.h
-+++ net-tools-1.60/include/interface.h
-@@ -64,13 +64,17 @@
- extern int if_fetch(struct interface *ife);
- 
- extern int for_all_interfaces(int (*)(struct interface *, void *), void *);
--extern int free_interface_list(void);
-+extern int if_cache_free(void);
- extern struct interface *lookup_interface(char *name);
- extern int if_readlist(void);
- 
- extern int do_if_fetch(struct interface *ife);
- extern int do_if_print(struct interface *ife, void *cookie);
- 
-+extern int    procnetdev_version(char *buf);
-+extern int    get_dev_fields(char *bp, struct interface *ife);
-+extern char * get_name(char *name, char *p);
-+
- extern void ife_print(struct interface *ptr);
- 
- extern int ife_short;
---- net-tools-1.60.orig/include/mii.h
-+++ net-tools-1.60/include/mii.h
-@@ -6,11 +6,14 @@
-  * Copyright (C) 2000 David A. Hinds -- dhinds@pcmcia.sourceforge.org
-  */
- 
--#ifndef _LINUX_MII_H
--#define _LINUX_MII_H
-+#ifndef _NETTOOL_MII_H
-+#define _NETTOOLS_MII_H
-+
-+#include <linux/sockios.h>
- 
- /* network interface ioctl's for MII commands */
- #ifndef SIOCGMIIPHY
-+#warning "SIOCGMIIPHY is not defined by your kernel source"
- #define SIOCGMIIPHY (SIOCDEVPRIVATE)	/* Read from current PHY */
- #define SIOCGMIIREG (SIOCDEVPRIVATE+1) 	/* Read any PHY register */
- #define SIOCSMIIREG (SIOCDEVPRIVATE+2) 	/* Write any PHY register */
-@@ -38,6 +41,7 @@
- #define  MII_BMCR_RESTART	0x0200
- #define  MII_BMCR_DUPLEX	0x0100
- #define  MII_BMCR_COLTEST	0x0080
-+#define  MII_BMCR_SPEED1000	0x0040
- 
- /* Basic Mode Status Register */
- #define MII_BMSR		0x01
-@@ -83,4 +87,17 @@
- #define  MII_ANER_PAGE_RX	0x0002
- #define  MII_ANER_LP_AN_ABLE	0x0001
- 
--#endif /* _LINUX_MII_H */
-+#define MII_CTRL1000		0x09
-+#define   MII_BMCR2_1000FULL	0x0200
-+#define   MII_BMCR2_1000HALF	0x0100
-+
-+#define MII_STAT1000		0x0a
-+#define   MII_LPA2_1000LOCALOK  0x2000
-+#define   MII_LPA2_1000REMRXOK	0x1000
-+#define   MII_LPA2_1000FULL	0x0800
-+#define   MII_LPA2_1000HALF	0x0400
-+
-+/* Last register we need for show_basic_mii() */
-+#define MII_BASIC_MAX          (MII_STAT1000+1)
-+
-+#endif /* _NETTOOLS_MII_H */
---- net-tools-1.60.orig/man/en_US/rarp.8
-+++ net-tools-1.60/man/en_US/rarp.8
-@@ -61,8 +61,8 @@
- Create a RARP address mapping entry for host
- .B hostname
- with hardware address set to
--.B hw_addr
--.  The format of the hardware address is dependent on the hardware
-+.BR hw_addr .
-+The format of the hardware address is dependent on the hardware
- class, but for most classes one can assume that the usual presentation
- can be used.  For the Ethernet class, this is 6 bytes in hexadecimal,
- separated by colons.
---- net-tools-1.60.orig/man/en_US/arp.8
-+++ net-tools-1.60/man/en_US/arp.8
-@@ -1,56 +1,111 @@
--.TH ARP 8 "5 Jan 1999" "net-tools" "Linux Programmer's Manual"
-+.TH ARP 8 "2007-12-01" "net-tools" "Linux Programmer's Manual"
- .SH NAME
- arp \- manipulate the system ARP cache
- .SH SYNOPSIS
- .B arp 
- .RB [ \-vn ] 
--.RB [ "\-H type" ] 
--.RB [ "-i if" ] 
--.B -a 
--.RB [ hostname ]
-+.RB [ \-H 
-+.IR type ] 
-+.RB [ \-i
-+.IR if ] 
-+.RB [ \-a ] 
-+.RI [ hostname ]
- .PP
- .B arp 
- .RB [ \-v ]
--.RB [ "\-i if" ] 
--.B "\-d hostname"
-+.RB [ \-i
-+.IR if ] 
-+.B \-d 
-+.I hostname
- .RB [ pub ]
- .PP
- .B arp 
- .RB [ \-v ] 
--.RB [ "\-H type" ] 
--.RB [ "\-i if" ] 
--.B -s hostname hw_addr
-+.RB [ \-H
-+.IR type ] 
-+.RB [ \-i
-+.IR if ] 
-+.B \-s
-+.I hostname hw_addr
- .RB [ temp ] 
- .PP
- .B arp 
- .RB [ \-v ] 
--.RB [ "\-H type" ] 
--.RB [ "\-i if" ] 
--.B -s hostname hw_addr
--.RB [ "netmask nm" ] 
-+.RB [ \-H
-+.IR type ] 
-+.RB [ \-i
-+.IR if ] 
-+.B \-s
-+.I hostname hw_addr
-+.RB [ netmask
-+.IR nm ] 
- .B pub
- .PP
- .B arp 
- .RB [ \-v ] 
--.RB [ "\-H type" ] 
--.RB [ "\-i if" ] 
--.B -Ds hostname ifa
--.RB [ "netmask nm" ] 
-+.RB [ \-H
-+.IR type ] 
-+.RB [ \-i
-+.IR if ] 
-+.B \-Ds 
-+.I hostname
-+.I ifname
-+.RB [ netmask
-+.IR nm ] 
- .B pub
- .PP
- .B arp 
- .RB [ \-vnD ]
--.RB [ "\-H type" ] 
--.RB [ "-i if" ]
--.B -f [filename]
-+.RB [ \-H 
-+.IR type ] 
-+.RB [ \-i
-+.IR if ]
-+.B \-f 
-+.RI [ filename ]
- 
- .SH DESCRIPTION
- .B Arp
--manipulates the kernel's ARP cache in various ways.  The primary options
--are clearing an address mapping entry and manually setting up one.  For
--debugging purposes, the
-+manipulates or displays the kernel's IPv4 network neighbour cache. It can add
-+entries to the table, delete one or display the current content.
-+
-+.B ARP
-+stands for Address Resolution Protocol, which is used to find the media
-+access control address of a network neighbour for a given IPv4 Address.
-+.SH MODES
- .B arp
--program also allows a complete dump of the ARP cache.
-+with no mode specifier will print the current content of the table. It is
-+possible to limit the number of entries printed, by specifying an hardware
-+address type, interface name or host address.
-+
-+.B arp -d
-+.I address
-+will delete a ARP table entry. Root or netadmin priveledge is required to do
-+this. The entry is found by IP address. If a hostname is given, it will be
-+resolved before looking up the entry in the ARP table.
-+
-+.B arp -s
-+.I address hw_addr
-+is used to set up a new table entry. The format of the 
-+.I hw_addr
-+parameter is dependent on the hardware class, but for most classes one can
-+assume that the usual presentation can be used.  For the Ethernet class,
-+this is 6 bytes in hexadecimal, separated by colons. When adding proxy arp
-+entries (that is those with the
-+.BR pub lish 
-+flag set a 
-+.B netmask 
-+may be specified to proxy arp for entire subnets. This is not good
-+practice, but is supported by older kernels because it can be
-+useful. If the
-+.B temp
-+flag is not supplied entries will be permanent stored into the ARP
-+cache. To simplyfy setting up entries for one of your own network interfaces, you can use the
-+.B "arp \-Ds"
-+.I address ifname
-+form. In that case the hardware address is taken from the interface with the
-+specified name.
-+
-+.br
- .SH OPTIONS
- .TP
- .B "\-v, \-\-verbose"
-@@ -76,21 +131,13 @@
- and
- .RB "NET/ROM (" netrom ")."
- .TP
--.B "\-a [hostname], \-\-display [hostname]"
--Shows the entries of the specified hosts.  If the
--.B hostname
--parameter is not used,
--.B all
--entries will be displayed.
--.TP
--.B "\-d hostname, \-\-delete hostname"
--Remove any entry for the specified host.  This can be used if the
--indicated host is brought down, for example.
-+.B \-a
-+Use alternate BSD style output format (with no fixed columns).
- .TP
- .B "\-D, \-\-use-device"
--Use the interface
--.BR ifa "'s"
--hardware address.
-+Instead of a hw_addr, the given argument is the name of an interface. 
-+.B arp
-+will use the MAC address of that interface for the table entry. This is usually the best option to set up a proxy ARP entry to yourself.
- .TP
- .B "\-i If, \-\-device If"
- Select an interface. When dumping the ARP cache only entries matching
-@@ -106,33 +153,15 @@
- .B NOTE:
- This has to be different from the interface to which the IP
- datagrams will be routed.
--.TP
--.B "\-s hostname hw_addr, \-\-set hostname"
--Manually create an ARP address mapping entry for host
--.B hostname
--with hardware address set to
--.B hw_addr
--.  The format of the hardware address is dependent on the hardware
--class, but for most classes one can assume that the usual presentation
--can be used.  For the Ethernet class, this is 6 bytes in hexadecimal,
--separated by colons. When adding proxy arp entries (that is those with
--the 
--.BR pub lish 
--flag set a 
--.B netmask 
--may be specified to proxy arp for entire subnets. This is not good
--practice, but is supported by older kernels because it can be
--useful. If the
--.B temp
--flag is not supplied entries will be permanent stored into the ARP
--cache.
--.br
- .B NOTE:
- As of kernel 2.2.0 it is no longer possible to set an ARP entry for an 
- entire subnet. Linux instead does automagic proxy arp when a route
- exists and it is forwarding. See 
- .BR arp (7)
--for details.
-+for details. Also the
-+.B dontpub
-+option which is available for delete and set operations cannot be 
-+used with 2.4 and newer kernels.
- .TP
- .B "\-f filename, \-\-file filename"
- Similar to the
-@@ -167,8 +196,18 @@
- and published entries have the
- .B P
- flag.
-+.SH EXSAMPLES
-+.B /usr/sbin/arp -i eth0 -Ds 10.0.0.2 eth1 pub
-+
-+This will answer ARP requests for 10.0.0.2 on eth0 with the MAC address for
-+eth1.
-+
-+.B /usr/sbin/arp -i eth1 -d 10.0.0.1
-+
-+Delete the ARP table entry for 10.0.0.1 on interface eth1. This will match
-+published proxy ARP entries and permanent entries.
- .SH FILES
--.I /proc/net/arp,
-+.I /proc/net/arp
- .br
- .I /etc/networks
- .br
-@@ -178,5 +217,4 @@
- .SH SEE ALSO
- rarp(8), route(8), ifconfig(8), netstat(8)
- .SH AUTHORS
--Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> with a lot of improvements
--from net-tools Maintainer Bernd Eckenfels <net-tools@lina.inka.de>.
-+Fred N. van Kempen <waltje@uwalt.nl.mugnet.org>, Bernd Eckenfels <net-tools@lina.inka.de>.
---- net-tools-1.60.orig/man/en_US/ethers.5
-+++ net-tools-1.60/man/en_US/ethers.5
-@@ -1,4 +1,4 @@
--.TH ETHERS 5 "April 26th, 1996" "" "File formats"
-+.TH ETHERS 5 "May 15th, 2005" "" "File formats"
- .SH NAME \"{{{roff}}}\"{{{
- ethers \- Ethernet address to IP number database
- .\"}}}
-@@ -10,8 +10,8 @@
- \fIEthernet-address\fP  \fIIP-number\fP
- .RE
- .sp
--The two items are separated by any number of SPACE and/or TAB char
--acters.   A \fB#\fP at the beginning of a line starts a comment
-+The two items are separated by any number of SPACE and/or TAB characters.
-+A \fB#\fP at the beginning of a line starts a comment
- which extends to the end of the line.  The \fIEthernet-address\fP is
- written as
- .IR x : x : x : x : x : x ,
---- net-tools-1.60.orig/man/en_US/ifconfig.8
-+++ net-tools-1.60/man/en_US/ifconfig.8
-@@ -1,10 +1,10 @@
--.TH IFCONFIG 8 "14 August 2000" "net-tools" "Linux Programmer's Manual"
-+.TH IFCONFIG 8 "2007-12-02" "net-tools" "Linux Programmer's Manual"
- .SH NAME
- ifconfig \- configure a network interface
- .SH SYNOPSIS
--.B "ifconfig [interface]"
-+.B "ifconfig [-v] [-a] [-s] [interface]"
- .br
--.B "ifconfig interface [aftype] options | address ..."
-+.B "ifconfig [-v] interface [aftype] options | address ..."
- .SH DESCRIPTION
- .B Ifconfig
- is used to configure the kernel-resident network interfaces.  It is
-@@ -41,11 +41,27 @@
- (AMPR Packet radio).
- .SH OPTIONS
- .TP
-+.B -a
-+display all interfaces which are currently available, even if down
-+.TP
-+.B -s
-+display a short list (like netstat -i)
-+.TP
-+.B -v
-+be more verbose for some error conditions
-+.TP
- .B interface
- The name of the interface.  This is usually a driver name followed by
- a unit number, for example
- .B eth0
--for the first Ethernet interface.
-+for the first Ethernet interface. If your kernel supports alias interfaces,
-+you can specify them with 
-+.B eth0:0
-+for the first alias of eth0. You can use them to assign a second address. To
-+delete an alias interface use
-+.BR "ifconfig eth0:0 down" .
-+Note: for every scope (i.e. same net with address/netmask combination) all
-+aliases are deleted, if you delete the first (primary).
- .TP
- .B up
- This flag causes the interface to be activated.  It is implicitly
-@@ -173,11 +189,20 @@
- are shared with all alias addresses on the same device. If you want per-address
- statistics you should add explicit accounting
- rules for the address using the 
--.BR ipchains(8)
-+.BR ipchains (8)
-+or
-+.BR iptables (8)
- command.
- .LP
--Interrupt problems with Ethernet device drivers fail with EAGAIN. See
--.I http://cesdis.gsfc.nasa.gov/linux/misc/irq-conflict.html
-+Since net-tools 1.60-4 ifconfig is printing byte counters and human readable
-+counters with IEC 60027-2 units. So 1 KiB are 2^10 byte. Note, the numbers 
-+are truncated to one decimal (which can by quite a large error if you 
-+consider 0.1 PiB is 112.589.990.684.262 bytes :)
-+.LP
-+Interrupt problems with Ethernet device drivers fail with EAGAIN
-+.I (SIOCSIIFLAGS: Resource temporarily unavailable)
-+it is most likely a interrupt conflict. See
-+.I http://www.scyld.com/expert/irq-conflict.html
- for more information.
- .SH FILES
- .I /proc/net/socket 
-@@ -189,7 +214,9 @@
- While appletalk DDP and IPX addresses will be displayed they cannot be
- altered by this command.
- .SH SEE ALSO
--route(8), netstat(8), arp(8), rarp(8), ipchains(8)
-+route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5).
-+.br
-+http://physics.nist.gov/cuu/Units/binary.html - Prefixes for binary multiples
- .SH AUTHORS
- Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
- .br
-@@ -198,3 +225,5 @@
- Phil Blundell, <Philip.Blundell@pobox.com>
- .br
- Andi Kleen
-+.br
-+Bernd Eckenfels, <net-tools@lina.inka.de>
---- net-tools-1.60.orig/man/en_US/netstat.8
-+++ net-tools-1.60/man/en_US/netstat.8
-@@ -8,7 +8,7 @@
- .\" Modified: Tuan Hoang tqhoang@bigfoot.com 
- .\"
- .\"
--.TH NETSTAT 8 "19 December 2000" "net-tools" "Linux Programmer's Manual"
-+.TH NETSTAT 8 "2007-12-02" "net-tools" "Linux Programmer's Manual"
- 
- .SH NAME
- netstat \- Print network connections, routing tables, interface statistics, masquerade connections, and multicast memberships
-@@ -23,7 +23,7 @@
- .RB [ \-\-listening | \-l ]
- .RB [ \-\-all | \-a ]
- .RB [ \-\-numeric | \-n ]
--.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ]
-+.RB [ \-\-numeric-hosts "] [" \-\-numeric-ports "] [" \-\-numeric-users ]
- .RB [ \-\-symbolic | \-N ]
- .RB [ \-\-extend | \-e  [ \-\-extend | \-e] ]
- .RB [ \-\-timers | \-o ]
-@@ -37,31 +37,30 @@
- .RB [ \-\-extend | \-e  [ \-\-extend | \-e] ]
- .RB [ \-\-verbose | \-v ]
- .RB [ \-\-numeric | \-n ]
--.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ]
-+.RB [ \-\-numeric-hosts "] [" \-\-numeric-ports "] [" \-\-numeric-users ]
- .RB [ \-\-continuous | \-c]
- .P
- .B netstat
- .RB { \-\-interfaces | \-i }
--.RI [ iface ]
- .RB [ \-\-all | \-a ]
- .RB [ \-\-extend | \-e  [ \-\-extend | \-e] ]
- .RB [ \-\-verbose | \-v ]
- .RB [ \-\-program | \-p ]
- .RB [ \-\-numeric | \-n ]
--.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ]
-+.RB [ \-\-numeric-hosts "] [" \-\-numeric-ports "] [" \-\-numeric-users ]
- .RB [ \-\-continuous | \-c]
- .P
- .B netstat
- .RB { \-\-groups | \-g }
- .RB [ \-\-numeric | \-n ]
--.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ]
-+.RB [ \-\-numeric-hosts "] [" \-\-numeric-ports "] [" \-\-numeric-users ]
- .RB [ \-\-continuous | \-c]
- .P
- .B netstat
- .RB { \-\-masquerade | \-M }
- .RB [ \-\-extend | \-e ]
- .RB [ \-\-numeric | \-n ]
--.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ]
-+.RB [ \-\-numeric-hosts "] [" \-\-numeric-ports "] [" \-\-numeric-users ]
- .RB [ \-\-continuous | \-c]
- .P
- .B netstat
-@@ -78,6 +77,8 @@
- .P
- .IR address_family_options :
- .PP
-+.RB [ -4 ]
-+.RB [ -6 ]
- .RB [ \-\-protocol= { inet , unix , ipx , ax25 , netrom , ddp }[, ...] ]
- .RB [ \-\-unix | \-x ] 
- .RB [ \-\-inet | \-\-ip ]
-@@ -98,12 +99,17 @@
- address families, then the active sockets of all configured address
- families will be printed.
- .SS "\-\-route , \-r"
--Display the kernel routing tables.
-+Display the kernel routing tables. See the description in 
-+.BR route (8) 
-+for details. 
-+.B netstat -r 
-+and 
-+.B route -e 
-+produce the same output.
- .SS "\-\-groups , \-g"
- Display multicast group membership information for IPv4 and IPv6.
--.SS "\-\-interface=\fIiface \fR, \fB\-i"
--Display a table of all network interfaces, or the specified
--.IR iface ) .
-+.SS "\-\-interfaces, \-i"
-+Display a table of all network interfaces.
- .SS "\-\-masquerade , \-M"
- Display a list of masqueraded connections.
- .SS "\-\-statistics , \-s"
-@@ -165,12 +171,11 @@
- .SS "\-a, \-\-all"
- Show both listening and non-listening sockets.  With the
- .B --interfaces
--option, show interfaces that are not marked 
-+option, show interfaces that are not up
- .SS "\-F"
- Print routing information from the FIB.  (This is the default.)
- .SS "\-C"
- Print routing information from the route cache.
--.IR UP .
- .P
- .SH OUTPUT
- .P
-@@ -221,7 +226,7 @@
- The socket is waiting after close to handle packets still in the network.
- .TP
- .I
--CLOSED
-+CLOSE
- The socket is not being used.
- .TP
- .I
-@@ -438,7 +443,7 @@
- .P
- .SH AUTHORS
- The netstat user interface was written by Fred Baumgarten
--<dc6iq@insu1.etec.uni-karlsruhe.de> the man page basically
-+<dc6iq@insu1.etec.uni-karlsruhe.de>, the man page basically
- by Matt Welsh <mdw@tc.cornell.edu>. It was updated by
- Alan Cox <Alan.Cox@linux.org> but could do with a bit more
- work.  It was updated again by Tuan Hoang
---- net-tools-1.60.orig/man/en_US/route.8
-+++ net-tools-1.60/man/en_US/route.8
-@@ -1,4 +1,4 @@
--.TH ROUTE 8 "2 January 2000" "net-tools" "Linux Programmer's Manual"
-+.TH ROUTE 8 "2007-12-02" "net-tools" "Linux Programmer's Manual"
- .SH NAME
- route \- show / manipulate the IP routing table
- .SH SYNOPSIS
-@@ -141,7 +141,7 @@
- set the TCP Maximum Segment Size (MSS) for connections over this route
- to M bytes. 
- The default is the device MTU minus headers, or a lower MTU when path mtu 
--discovery occured. This setting can be used to force smaller TCP packets on the
-+discovery occurred. This setting can be used to force smaller TCP packets on the
- other end when path mtu discovery does not work (usually because of
- misconfigured firewalls that block ICMP Fragmentation Needed)
- .TP 
-@@ -179,17 +179,20 @@
- 
- .SH EXAMPLES
- .TP
--.B route add -net 127.0.0.0
--adds the normal loopback entry, using netmask 255.0.0.0 (class A net,
--determined from the destination address) and associated with the 
--"lo" device (assuming this device was prviously set up correctly with
-+.B route add -net 127.0.0.0 netmask 255.0.0.0 dev lo
-+adds the normal loopback entry, using netmask 255.0.0.0 and associated with the 
-+"lo" device (assuming this device was previously set up correctly with
- .BR ifconfig (8)). 
- 
- .TP 
- .B route add -net 192.56.76.0 netmask 255.255.255.0 dev eth0
--adds a route to the network 192.56.76.x via 
--"eth0". The Class C netmask modifier is not really necessary here because
--192.* is a Class C IP address. The word "dev" can be omitted here. 
-+adds a route to the local network 192.56.76.x via 
-+"eth0".  The word "dev" can be omitted here. 
-+
-+.TP
-+.B route del default
-+deletes the current default route, which is labeled "default" or 0.0.0.0
-+in the destination field of the current routing table.
- 
- .TP
- .B route add default gw mango-gw
-@@ -289,7 +292,7 @@
- Interface to which packets for this route will be sent.
- .TP
- .B MSS 
--Default maximum segement size for TCP connections over this route.
-+Default maximum segment size for TCP connections over this route.
- .TP
- .B Window  
- Default window size for TCP connections over this route.
-@@ -323,4 +326,4 @@
- Linus Torvalds for pl15. Alan Cox added the mss and window options for
- Linux 1.1.22. irtt support and merged with netstat from Bernd Eckenfels.
- .SH AUTHOR
--Currently maintained by Phil Blundell <Philip.Blundell@pobox.com>.
-+Currently maintained by Phil Blundell <Philip.Blundell@pobox.com> and Bernd Eckenfels <net-tools@lina.inka.de>.
---- net-tools-1.60.orig/man/en_US/slattach.8
-+++ net-tools-1.60/man/en_US/slattach.8
-@@ -1,4 +1,4 @@
--.TH SLATTACH 8 "12 Feb 1994" "" ""
-+.TH SLATTACH 8 "10 Oct 2006" "" ""
- .SH NAME
- slattach \- attach a network interface to a serial line
- .SH SYNOPSIS
-@@ -24,6 +24,7 @@
- .B "[-h]"
- Exit when the carrier is lost. This works on both /dev/tty and /dev/cua
- devices by directly monitoring the carrier status every 15 seconds.
-+.TP
- .B "[-v]"
- Enable verbose output.  Useful in shell scripts.
- .TP
-@@ -41,7 +42,7 @@
- .TP
- .B "[-e]"
- Exit right after initializing device, instead of waiting for the
--line to hangup.
-+line to hang up.
- .TP
- .B "[-L]"
- Enable 3 wire operation. The terminal is moved into CLOCAL mode, 
-@@ -50,8 +51,8 @@
- .B "[-p proto]"
- Set a specific kind of protocol to use on the line.  The default
- is set to
--.B "cslip"
--, i.e. compressed SLIP.  Other possible values are
-+.BR "cslip" ,
-+i.e. compressed SLIP.  Other possible values are
- .B "slip"
- (normal SLIP), 
- .B "adaptive"
---- net-tools-1.60.orig/man/en_US/mii-tool.8
-+++ net-tools-1.60/man/en_US/mii-tool.8
-@@ -1,7 +1,7 @@
- .\" Copyright (C) 2000 David A. Hinds -- dhinds@pcmcia.sourceforge.org
- .\" mii-tool.8 1.5 2000/04/25 22:58:19
- .\"
--.TH MII-TOOL 8 "2000/04/25 22:58:19" "net-tools"
-+.TH MII-TOOL 8 "2004/03/28 23:30:00" "net-tools"
- 
- .SH NAME
- mii-tool \- view, manipulate media-independent interface status
-@@ -72,7 +72,24 @@
- commas.  Valid media are \fB100baseT4\fR, \fB100baseTx-FD\fR,
- \fB100baseTx-HD\fR, \fB10baseT-FD\fR, and \fB10baseT-HD\fR.
- 
-+.SH DIAGNOSTICS
-+.TP
-+SIOCGMIIPHY on 'eth?' failed: Invalid argument
-+If the interface is not running (up), kernel will refuse to report its link state.
-+.TP
-+SIOCGMIIPHY on 'eth?' failed: Operation not permitted
-+Most kernels restrict access to root.
-+.TP
-+SIOCGMIIPHY on 'eth?' failed: No such device
-+This error is shown, if the kernel does not know about the named device.
-+.TP
-+SIOCGMIIPHY on 'eth?' failed: Operation not supported 
-+The interface in question does not support MII queries. Most likely, it does not have 
-+MII transceivers, at all.
-+
- .SH AUTHORS
- David Hinds \- dhinds@pcmcia.sourceforge.org
- .br
- Donald Becker \- becker@scyld.com
-+.br
-+Bernd Eckenfels \- ecki@debian.org
---- net-tools-1.60.orig/man/fr_FR/arp.8
-+++ net-tools-1.60/man/fr_FR/arp.8
-@@ -140,8 +140,8 @@
- Similaire à l'option 
- .B \-s
- , mais cette fois les informations d'adresses sont prises dans le fichier
--.B nom_de_fichier
--. Ceci peut être utilisé si les entrées ARP à configurer sont
-+.BR nom_de_fichier .
-+Ceci peut être utilisé si les entrées ARP à configurer sont
- nombreuses.  Le nom du fichier de données est très souvent nommé
- .B /etc/ethers
- , mais ce n'est pas officiel.
-@@ -160,8 +160,8 @@
- .LP
- Chaque entrée complète se trouvant dans le cache ARP est marquée de
- l'indicateur
--.B C
--. Les entrées permanentes sont marquées de l'indicateur
-+.BR C .
-+Les entrées permanentes sont marquées de l'indicateur
- .B M
- et les entrées 'pub' ont l'indicateur
- .B P
---- net-tools-1.60.orig/man/fr_FR/hostname.1
-+++ net-tools-1.60/man/fr_FR/hostname.1
-@@ -84,8 +84,8 @@
- .LP
- .B hostname
- fournit le nom du système tel qu'il est retourné par la fonction
--.BR getdomainname (2)
--. Ceci est connu comme nom de domaine YP/NIS du système.
-+.BR getdomainname (2).
-+Ceci est connu comme nom de domaine YP/NIS du système.
- 
- 
- .LP
-@@ -145,8 +145,8 @@
- .LP
- La façon dont vous pouvez le changer dépend de la configuration
- (habituellement dans 
--.IR /etc/host.conf )
--. Si le fichier 'hosts' est analysé avant d'interroger le DNS ou 
-+.IR /etc/host.conf ).
-+Si le fichier 'hosts' est analysé avant d'interroger le DNS ou 
- NIS) vous pouvez le changer dans le fichier 
- .IR /etc/hosts .
- 
---- net-tools-1.60.orig/man/fr_FR/ifconfig.8
-+++ net-tools-1.60/man/fr_FR/ifconfig.8
-@@ -1,4 +1,4 @@
--.TH IFCONFIG 8 "4 August 1997" "net-tools" "Linux Programmer's Manual"
-+.TH IFCONFIG 8 "2007-12-02" "net-tools" "Linux Programmer's Manual"
- .SH NOM
- ifconfig \- configure une interface réseau
- .SH SYNOPSIS
-@@ -60,14 +60,14 @@
- .TP
- .B "[\-]promisc"
- Valide ou invalide le mode
--.B promiscuous
--.  S'il est validé, tous les paquets circulant sur le réseau
-+.BR promiscuous .
-+S'il est validé, tous les paquets circulant sur le réseau
- seront reçus sur cette interface.
- .TP
- .B "[\-]allmulti"
- Valide ou invalide le fonctionnement de l'interface en mode
--.B all-multicast
--.  S'il est validé, tous les paquets multicast circulant sur le réseau
-+.BR all-multicast .
-+S'il est validé, tous les paquets multicast circulant sur le réseau
- seront reçus sur cette interface.
- .TP
- .B "metric N"
-@@ -196,7 +196,7 @@
- Même si les adresses appletalk DDP et IPX peuvent être affichées,
- elles ne peuvent être modifiées avec cette commande.
- .SH VOIR AUSSI
--route(8), netstat(8), arp(8), rarp(8), ipchains(8)
-+route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5).
- .SH AUTHORS
- Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
- .br
---- net-tools-1.60.orig/man/fr_FR/netstat.8
-+++ net-tools-1.60/man/fr_FR/netstat.8
-@@ -8,7 +8,7 @@
- .\" Modified: Tuan Hoang tuan@optimus.mitre.org 
- .\"
- .\"
--.TH NETSTAT 8 "25 Fév 1999" "net-tools" "Linux Programmer's Manual"
-+.TH NETSTAT 8 "2007-12-02" "net-tools" "Linux Programmer's Manual"
- 
- .SH NAME
- netstat \- Affiche les connexions réseau, les tables de routage, les
-@@ -106,7 +106,7 @@
- .BR route (8)
- pour plus de détails.
- 
--.SS "\-i, \-\-interface \fIiface\fI"
-+.SS "\-i, \-\-interfaces \fIiface\fI"
- Si vous utilisez l'option
- .BR -i ", " --interfaces
- , une table de toutes (ou de l'interface
-@@ -118,8 +118,8 @@
- .BR ifconfig (8).
- .B "netstat -ei"
- affiche une table ou une seule entrée d'interface comme la commande 
--.B ifconfig
--. Avec le paramètre
-+.BR ifconfig .
-+Avec le paramètre
- .B -a
- , vous pouvez inclure les interfaces qui ne sont pas configurées (c.a.d qui
- n'ont pas l'indicateur
-@@ -249,7 +249,7 @@
- avant d'entreprendre la fermeture.
- .TP
- .I
--CLOSED
-+CLOSE
- La socket n'est pas utilisée.
- .TP
- .I
-@@ -409,8 +409,7 @@
- Depuis la version 2.2 du noyau, netstat -i n'affiche plus les statistiques
- des interfaces alias. Pour obtenir les compteurs par interface alias, vous
- devez définir des règles spécifiques à l'aide de la commande
--.BR ipchains(8) 
--.  
-+.BR ipchains (8).
- 
- .SH FICHIERS
- .ta
---- net-tools-1.60.orig/man/fr_FR/rarp.8
-+++ net-tools-1.60/man/fr_FR/rarp.8
-@@ -55,8 +55,8 @@
- Crée manuellement une correspondance d'adresses RARP pour l'hôte
- .B nom_d_hôte
- avec l'adresse matérielle
--.B adr_materielle
--. Le format de l'adresse matérielle est dépendant du matériel,
-+.BR adr_materielle .
-+Le format de l'adresse matérielle est dépendant du matériel,
- mais pour la plupart on peut considérer que la présentation classique
- peut être utilisée.  Pour la classe Ethernet, c'est 6 octets en hexadécimal,
- séparés par des double-points.
---- net-tools-1.60.orig/man/fr_FR/route.8
-+++ net-tools-1.60/man/fr_FR/route.8
-@@ -1,4 +1,4 @@
--.TH ROUTE 8 "8 Août 1997" "net-tools" "Linux Programmer's Manual"
-+.TH ROUTE 8 "2007-12-02" "net-tools" "Linux Programmer's Manual"
- .SH NAME
- route \- affiche / manipule la table de routage IP
- .SH SYNOPSIS
-@@ -330,6 +330,6 @@
- la gestion des fenêtres et MSS pour Linux 1.1.22. Le support de irtt 
- et la fusion avec netstat ont été réalisés par Bernd Eckenfels.
- .SH AUTEUR
--Maintenu par Phil Blundell <Philip.Blundell@pobox.com>.
-+Maintenu par Phil Blundell <Philip.Blundell@pobox.com> et Bernd Eckenfels <net-tools@lina.inka.de>.
- .SH TRADUCTION
--Jean-Michel VANSTEENE (vanstee@worldnet.fr)
-+Jean-Michel VANSTEENE <vanstee@worldnet.fr>
---- net-tools-1.60.orig/man/pt_BR/ifconfig.8
-+++ net-tools-1.60/man/pt_BR/ifconfig.8
-@@ -1,4 +1,4 @@
--.TH IFCONFIG 8 "10 de fevereiro de 1996" "net-tools" "Manual do Programador Linux"
-+.TH IFCONFIG 8 "2007-12-02" "net-tools" "Manual do Programador Linux"
- .SH NOME
- ifconfig \- configura uma interface de rede
- .SH SINOPSE
-@@ -169,7 +169,7 @@
- Os endereços appletalk DDP e IPX serão mostrados, mas não podem ser alterados
- com este comando.
- .SH VEJA TAMBÉM
--route(8), netstat(8), arp(8), rarp(8), ipchains(8)
-+route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5).
- .SH AUTORES
- Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
- Alan Cox, <Alan.Cox@linux.org>
---- net-tools-1.60.orig/man/pt_BR/netstat.8
-+++ net-tools-1.60/man/pt_BR/netstat.8
-@@ -8,7 +8,7 @@
- .\" Traduzido para português por Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- .\" Revisado por Jorge Luiz Godoy Filho <jorge@bestway.com.br>
- .\"
--.TH NETSTAT 8 "19 de maio de 1997" "net-tools" "Manual do Programador Linux"
-+.TH NETSTAT 8 "2007-12-02" "net-tools" "Manual do Programador Linux"
- 
- .SH NOME
- netstat \- Mostra conexões de rede, tabelas de roteamento, estatísticas de interface e conexões
-@@ -97,7 +97,7 @@
- .BR route (8)
- para maiores detalhes.
- 
--.SS "\-i, \-\-interface \fIiface\fI"
-+.SS "\-i, \-\-interfaces \fIiface\fI"
- Se você usar a opção
- .BR -i ", " --interfaces
- , uma tabela de todas (ou da
---- net-tools-1.60.orig/man/pt_BR/rarp.8
-+++ net-tools-1.60/man/pt_BR/rarp.8
-@@ -50,8 +50,8 @@
- Cria um mapeamento de endereços RARP para a máquina
- .B máquina
- com endereço de hardware configurado para
--.B endereço_hardware
--.  O formato do endereço de hardware depende da classe do hardware, mas
-+.B endereço_hardware.
-+O formato do endereço de hardware depende da classe do hardware, mas
- para a maioria das classes você pode assumir que a apresentação usual pode
- ser usada.  Para a classe Ethernet, são 6 bytes em hexadecimal, separados
- por dois pontos (:).
---- net-tools-1.60.orig/man/pt_BR/route.8
-+++ net-tools-1.60/man/pt_BR/route.8
-@@ -1,4 +1,4 @@
--.TH ROUTE 8 "27 Jan 1996" "net-tools" "Manual do Programador Linux"
-+.TH ROUTE 8 "2007-12-02" "net-tools" "Manual do Programador Linux"
- .SH NOME
- route \- mostra / manipula a tabela de roteamento IP
- .SH SINOPSE
-@@ -321,7 +321,7 @@
- Linus Torvalds para a versão pl15. Alan Cox adicionou as opções para
- mss e window no kernel 1.1.22. O suporte a irtt (compartilhado com o
- netstat) foi feito por Bernd Eckenfels.
-+.SH AUTHOR
-+Currently maintained by Phil Blundell <Philip.Blundell@pobox.com> and Bernd Eckenfels <net-tools@lina.inka.de>.
- .SH TRADUÇÃO
- Arnaldo Carvalho de Melo <acme@conectiva.com.br> - 13/04/1998
--.SH BUGS
--nenhum :)
---- net-tools-1.60.orig/man/de_DE/ifconfig.8
-+++ net-tools-1.60/man/de_DE/ifconfig.8
-@@ -1,4 +1,4 @@
--.TH IFCONFIG 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
-+.TH IFCONFIG 8 "2007-12-02" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
- .SH NAME
- ifconfig \- Konfiguration einer Netzwerkskarte
- .SH SYNOPSIS
-@@ -193,7 +193,7 @@
- W\(:ahrend AppleTalk DDP und IPX Adressen angezeigt werden, k\(:onnen sie mit
- diesem Kommando nicht ge\(:andert werden.
- .SH SIEHE AUCH
--route(8), netstat(8), arp(8), rarp(8), ipchains(8)
-+route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5).
- .SH AUTOREN
- Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
- .br
---- net-tools-1.60.orig/man/de_DE/route.8
-+++ net-tools-1.60/man/de_DE/route.8
-@@ -1,4 +1,4 @@
--.TH ROUTE 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
-+.TH ROUTE 8 "2007-12-02" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
- .SH NAME
- route \- Anzeigen der IP-Routen-Tabelle
- .SH SYNOPSIS
-@@ -345,6 +345,6 @@
- irtt beigesteuert und den Code mit dem von Netstat vereinigt.
- .SH AUTOREN
- .B Route
--wird zur Zeit von Phil Blundel (Philip.Blundell@pobox.com) gewartet.
-+wird zur Zeit von Phil Blundel <Philip.Blundell@pobox.com> und Bernd Eckenfels <net-tools@lina.inka.de> gewartet.
- .SH \(:Ubersetzung
- Ralf B\(:achle <ralf@gnu.org>
---- net-tools-1.60.orig/man/de_DE/netstat.8
-+++ net-tools-1.60/man/de_DE/netstat.8
-@@ -9,7 +9,7 @@
- .\" Modified: Tuan Hoang tuan@optimus.mitre.org 
- .\"
- .\"
--.TH NETSTAT 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
-+.TH NETSTAT 8 "2007-12-02" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
- 
- .SH NAME
- netstat \- Anzeige von Netzwerksverbindungen, Routentabellen, Schnittstellenstatistiken, maskierten Verbindungen, Netlink-Nachrichten und Mitgliedschaft in Multicastgruppen
-@@ -44,7 +44,6 @@
- .B netstat
- .RB [ \-veenpac ]
- .RB { \-\-interfaces | \-i }
--.RI [ Schnittstelle ]
- 
- .PP
- 
-@@ -68,6 +67,8 @@
- .SH BESCHREIBUNG
- .B Netstat
- zeigt Informationen des Linux Netzwerkssystems an.
-+.PP
-+.B Bitte beachten Sie, dass der Inhalt der deutschen man-page nicht vollst\(:andig ist, im Moment.
- 
- .SS "(no option)"
- Ohne Optionen zeigt
-@@ -103,18 +104,17 @@
- Wegen Details siehe
- .BR route (8).
- 
--.SS "\-i, \-\-interface \fISchnittstelle\fI"
-+.SS "\-i, \-\-interfaces"
- Wird die
- .BR -i ", " --interfaces
--Option verwendet,  so wird eine Tabelle aller (oder der angegebenen
--.IR Schnittstellen ) 
-+Option verwendet,  so wird eine Tabelle aller Schnittstellen
- ausgedruckt.  Die Ausgabe ist im Format von
- .B "ifconfig -e"
- und wird in
- .BR ifconfig (8)
- beschrieben.
- .B "netstat -ei" 
--druckt eine Tabelle oder einen Eintrag f\(:ur einen einzelnes Interface wie
-+druckt eine Tabelle f\(:ur Interfaces wie
- .BR ifconfig .
- Die
- .B -a
-@@ -182,7 +182,7 @@
- und
- .BR \-\-ddp.
- 
--.SS "\-c, \-\-continous"
-+.SS "\-c, \-\-continuous"
- Mit dieser Option wiederholt
- .B netstat
- im Sekundenabstand die Ausgabe, bis es abgebrochen wird.
---- net-tools-1.60.orig/po/pt_BR.po
-+++ net-tools-1.60/po/pt_BR.po
-@@ -10,275 +10,287 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: net-tools 1.54\n"
--"POT-Creation-Date: 2000-02-14 02:31+0100\n"
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2007-06-30 12:28+0900\n"
- "PO-Revision-Date: 1999-03-01 02:38+0100\n"
- "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=ISO8859-9\n"
- "Content-Transfer-Encoding: 8bit\n"
- 
--#: ../arp.c:110 ../arp.c:269
-+#: ../arp.c:112 ../arp.c:279
-+#, c-format
- msgid "arp: need host name\n"
- msgstr "arp: preciso do nome da máquina\n"
- 
--#: ../arp.c:207 ../arp.c:221
-+#: ../arp.c:215 ../arp.c:230
- #, c-format
- msgid "No ARP entry for %s\n"
- msgstr "Nenhuma entrada ARP para %s\n"
- 
--#: ../arp.c:239
-+#: ../arp.c:248
- #, c-format
- msgid "arp: cant get HW-Address for `%s': %s.\n"
- msgstr "arp: não foi possível obter o endereço de hardware para `%s': %s.\n"
- 
--#: ../arp.c:243
-+#: ../arp.c:252
-+#, c-format
- msgid "arp: protocol type mismatch.\n"
- msgstr "arp: erro no tipo do protocolo.\n"
- 
--#: ../arp.c:252
-+#: ../arp.c:261
- #, c-format
- msgid "arp: device `%s' has HW address %s `%s'.\n"
- msgstr "arp: o dispositivo `%s' tem endereço de hardware %s `%s'.\n"
- 
--#: ../arp.c:282
-+#: ../arp.c:293
-+#, c-format
- msgid "arp: need hardware address\n"
- msgstr "arp: preciso do endereço de hardware\n"
- 
--#: ../arp.c:290
-+#: ../arp.c:301
-+#, c-format
- msgid "arp: invalid hardware address\n"
- msgstr "arp: endereço inválido de hardware\n"
- 
--#: ../arp.c:387
-+#: ../arp.c:398
- #, c-format
- msgid "arp: cannot open etherfile %s !\n"
- msgstr "arp: não foi possível abrir o arquivo etherfile %s!\n"
- 
--#: ../arp.c:403
-+#: ../arp.c:414
- #, c-format
- msgid "arp: format error on line %u of etherfile %s !\n"
- msgstr "arp: erro de formato na linha %u do arquivo etherfile %s!\n"
- 
--#: ../arp.c:416
-+#: ../arp.c:427
- #, c-format
- msgid "arp: cannot set entry on line %u of etherfile %s !\n"
- msgstr "arp: não foi possível configurar a linha %u do arquivo etherfile %s!\n"
- 
--#: ../arp.c:437
--msgid "Address\t\t\tHWtype\tHWaddress\t    Flags Mask\t\t  Iface\n"
-+#: ../arp.c:448
-+#, fuzzy, c-format
-+msgid ""
-+"Address                  HWtype  HWaddress           Flags Mask            "
-+"Iface\n"
- msgstr "Endereço\t\tTipoHW\tEndereçoHW\t Flags Mascara\t\t Iface\n"
- 
--#: ../arp.c:467
-+#: ../arp.c:476
-+#, fuzzy
-+msgid "<from_interface>"
-+msgstr "%s: interface desconhecida.\n"
-+
-+#: ../arp.c:478
- msgid "(incomplete)"
- msgstr "(incompleto)"
- 
--#: ../arp.c:484
-+#: ../arp.c:495
- #, c-format
- msgid "%s (%s) at "
- msgstr "%s (%s) em "
- 
--#: ../arp.c:490
-+#: ../arp.c:501
-+#, c-format
- msgid "<incomplete> "
- msgstr "<incompleto> "
- 
--#: ../arp.c:496
-+#: ../arp.c:507
- #, c-format
- msgid "netmask %s "
- msgstr "mascara %s "
- 
--#: ../arp.c:513
-+#: ../arp.c:524
- #, c-format
- msgid "on %s\n"
- msgstr "em %s\n"
- 
--#: ../arp.c:592
-+#: ../arp.c:605
- #, c-format
- msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
- msgstr "Entradas: %d\tIgnorada: %d\tEncontrada: %d\n"
- 
--#: ../arp.c:596
-+#: ../arp.c:609
- #, c-format
- msgid "%s (%s) -- no entry\n"
- msgstr "%s (%s) -- nenhuma entrada\n"
- 
--#: ../arp.c:598
-+#: ../arp.c:611
- #, c-format
- msgid "arp: in %d entries no match found.\n"
- msgstr "arp: em %d entradas não foi encontrado.\n"
- 
--#: ../arp.c:613
-+#: ../arp.c:626
-+#, c-format
- msgid ""
- "Usage:\n"
- "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
- "cache\n"
- msgstr ""
- "Uso:\n"
--"  arp [-vn]  [<HW>] [-i <if>] [-a] [<máquina>]             <-Mostra cache "
--"ARP\n"
-+"  arp [-vn]  [<HW>] [-i <if>] [-a] [<máquina>]             <-Mostra cache ARP\n"
- 
--#: ../arp.c:614
-+#: ../arp.c:627
-+#, fuzzy, c-format
- msgid ""
--"  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP "
-+"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
- "entry\n"
--msgstr ""
--"  arp [-v]          [-i <if>] -d  <máquina>  [pub][nopub]  <-Remove entrada "
--"ARP\n"
-+msgstr "  arp [-v]          [-i <if>] -d  <máquina>  [pub][nopub]  <-Remove entrada ARP\n"
- 
--#: ../arp.c:615
-+#: ../arp.c:628
-+#, fuzzy, c-format
- msgid ""
--"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from "
-+"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
- "file\n"
- msgstr ""
- "  arp [-vnD] [<HW>] [-i <if>] -f  [<arquivo>]         <-Inclui entrada de "
- "arquivo\n"
- 
--#: ../arp.c:616
-+#: ../arp.c:629
-+#, fuzzy, c-format
- msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add "
-+"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
- "entry\n"
--msgstr ""
--"  arp [-v] [<HW>] [-i <if>] -s <máquina> <end_hw> [temp][nopub] <-Inc. "
--"Entrada\n"
--
--#: ../arp.c:617
--msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
--"<-''-\n"
--msgstr ""
--"  arp [-v]   [<HW>] [-i <if>] -s  <máquina> <end_hw>  [netmask <nm>] pub  "
--"<-''-\n"
-+msgstr "  arp [-v] [<HW>] [-i <if>] -s <máquina> <end_hw> [temp][nopub] <-Inc. Entrada\n"
- 
--#: ../arp.c:618
-+#: ../arp.c:630
-+#, fuzzy, c-format
- msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      "
-+"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
- "<-''-\n"
- "\n"
--msgstr ""
--"  arp [-v]   [<HW>] [-i <if>] -Ds <máquina>  <if> [netmask <nm>] pub      "
--"<-''-\n"
-+msgstr "  arp [-v]   [<HW>] [-i <if>] -Ds <máquina>  <if> [netmask <nm>] pub      <-''-\n"
- 
--#: ../arp.c:620
-+#: ../arp.c:632
-+#, c-format
- msgid ""
- "        -a                       display (all) hosts in alternative (BSD) "
- "style\n"
--msgstr ""
--"        -a               mostra (todas as) máquinas no estilo alternativo "
--"(BSD)\n"
-+msgstr "        -a               mostra (todas as) máquinas no estilo alternativo (BSD)\n"
- 
--#: ../arp.c:621
-+#: ../arp.c:633
-+#, c-format
- msgid "        -s, --set                set a new ARP entry\n"
- msgstr "        -s, --set                define uma nova entrada ARP\n"
- 
--#: ../arp.c:622
-+#: ../arp.c:634
-+#, c-format
- msgid "        -d, --delete             delete a specified entry\n"
- msgstr "        -d, --delete             remove a entrada especificada\n"
- 
--#: ../arp.c:623 ../netstat.c:1436 ../route.c:85
-+#: ../arp.c:635 ../netstat.c:1503 ../route.c:86
-+#, c-format
- msgid "        -v, --verbose            be verbose\n"
- msgstr "        -v, --verbose           listagem detalhada\n"
- 
--#: ../arp.c:624 ../netstat.c:1437 ../route.c:86
--msgid "        -n, --numeric            dont resolve names\n"
-+#: ../arp.c:636 ../netstat.c:1504 ../route.c:87
-+#, fuzzy, c-format
-+msgid "        -n, --numeric            don't resolve names\n"
- msgstr "        -n, --numeric           não resolve nomes\n"
- 
--#: ../arp.c:625
-+#: ../arp.c:637
-+#, c-format
- msgid ""
- "        -i, --device             specify network interface (e.g. eth0)\n"
- msgstr ""
- "        -i, --device             especifica a interface de rede (ex: eth0)\n"
- 
--#: ../arp.c:626
-+#: ../arp.c:638
-+#, c-format
- msgid "        -D, --use-device         read <hwaddr> from given device\n"
- msgstr "        -D, --use-device         leia <hwaddr> de um dispositivo\n"
- 
--#: ../arp.c:627
-+#: ../arp.c:639
-+#, c-format
- msgid "        -A, -p, --protocol       specify protocol family\n"
- msgstr "        -A, -p, --protocol       especifica a família de protocolos\n"
- 
--#: ../arp.c:628
-+#: ../arp.c:640
-+#, c-format
- msgid ""
--"        -f, --file               read new entries from file or from "
--"/etc/ethers\n"
-+"        -f, --file               read new entries from file or from /etc/"
-+"ethers\n"
- "\n"
- msgstr ""
--"        -f, --file             leia novas entradas de arquivo ou de "
--"/etc/ethers\n"
-+"        -f, --file             leia novas entradas de arquivo ou de /etc/"
-+"ethers\n"
- "\n"
- 
--#: ../arp.c:630 ../rarp.c:181
-+#: ../arp.c:642 ../rarp.c:182
- #, c-format
- msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
--msgstr ""
--" <HW>=Use '-H <hw>' para especificar o tipo de endereço de hw. Default: %s\n"
-+msgstr " <HW>=Use '-H <hw>' para especificar o tipo de endereço de hw. Default: %s\n"
- 
--#: ../arp.c:631 ../rarp.c:182
-+#: ../arp.c:643 ../rarp.c:183
-+#, c-format
- msgid "  List of possible hardware types (which support ARP):\n"
- msgstr "  Lista dos tipos de hardware possíveis (que suportam ARP):\n"
- 
--#: ../arp.c:664
-+#: ../arp.c:677 ../arp.c:762
- #, c-format
- msgid "%s: hardware type not supported!\n"
- msgstr "%s: tipo de hardware não suportado!\n"
- 
--#: ../arp.c:668
-+#: ../arp.c:681
- #, c-format
- msgid "%s: address family not supported!\n"
- msgstr "%s: família de endereços não suportada!\n"
- 
--#: ../arp.c:703
-+#: ../arp.c:716
-+#, c-format
- msgid "arp: -N not yet supported.\n"
- msgstr "arp: -N ainda não suportada.\n"
- 
--#: ../arp.c:713
-+#: ../arp.c:726
- #, c-format
- msgid "arp: %s: unknown address family.\n"
- msgstr "arp: %s: família de endereços desconhecida.\n"
- 
--#: ../arp.c:722
-+#: ../arp.c:735
- #, c-format
- msgid "arp: %s: unknown hardware type.\n"
- msgstr "arp: %s: tipo de hardware desconhecido.\n"
- 
--#: ../arp.c:741
-+#: ../arp.c:754
- #, c-format
- msgid "arp: %s: kernel only supports 'inet'.\n"
- msgstr "arp: %s: kernel somente suporta ínet'.\n"
- 
--#: ../arp.c:746
-+#: ../arp.c:767
- #, c-format
- msgid "arp: %s: hardware type without ARP support.\n"
- msgstr "arp: %s: tipo de hardware sem suporte a ARP.\n"
- 
--#: ../hostname.c:69
-+#: ../hostname.c:71
- #, c-format
- msgid "Setting nodename to `%s'\n"
- msgstr "Configurando nome do nó como `%s'\n"
- 
--#: ../hostname.c:74
-+#: ../hostname.c:76
- #, c-format
- msgid "%s: you must be root to change the node name\n"
- msgstr "%s: você deve ser root para mudar o nome do nó\n"
- 
--#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116
-+#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117
- #, c-format
- msgid "%s: name too long\n"
- msgstr "%s: nome muito longo\n"
- 
--#: ../hostname.c:89
-+#: ../hostname.c:91
- #, c-format
- msgid "Setting hostname to `%s'\n"
- msgstr "Configurando nome da máquina para `%s'\n"
- 
--#: ../hostname.c:94
-+#: ../hostname.c:96
- #, c-format
- msgid "%s: you must be root to change the host name\n"
- msgstr "%s: você deve ser root para mudar o nome da máquina\n"
- 
--#: ../hostname.c:108
-+#: ../hostname.c:109
- #, c-format
- msgid "Setting domainname to `%s'\n"
- msgstr "Configurando nome do domínio para `%s'\n"
- 
--#: ../hostname.c:113
-+#: ../hostname.c:114
- #, c-format
- msgid "%s: you must be root to change the domain name\n"
- msgstr "%s: você deve ser root para mudar o nome do domínio\n"
-@@ -303,37 +315,38 @@
- msgid "Result: h_addr_list=`%s'\n"
- msgstr "Resultado: h_addr_list=`%s'\n"
- 
--#: ../hostname.c:209
-+#: ../hostname.c:208
- #, c-format
- msgid "%s: can't open `%s'\n"
- msgstr "%s: não foi possível abrir `%s'\n"
- 
--#: ../hostname.c:223
-+#: ../hostname.c:222
-+#, c-format
- msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
--msgstr ""
--"Uso: hostname [-v] {máquina|-F arquivo}       configura nome da máquina (de "
--"arquivo)\n"
-+msgstr "Uso: hostname [-v] {máquina|-F arquivo}       configura nome da máquina (de arquivo)\n"
- 
--#: ../hostname.c:224
-+#: ../hostname.c:223
-+#, c-format
- msgid ""
- "       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
- msgstr ""
- "       domainname [-v] {domínio_nis|-F file} configura nome do domínio NIS\n"
- "                                             (a partir de arquivo)\n"
- 
--#: ../hostname.c:226
-+#: ../hostname.c:225
-+#, c-format
- msgid ""
- "       nodename [-v] {nodename|-F file}      set DECnet node name (from "
- "file)\n"
--msgstr ""
--"Uso: hostname [-v] {máquina|-F arquivo}   configura o nome do nó DECnet (de "
--"arquivo)\n"
-+msgstr "Uso: hostname [-v] {máquina|-F arquivo}   configura o nome do nó DECnet (de arquivo)\n"
- 
--#: ../hostname.c:228
-+#: ../hostname.c:227
-+#, c-format
- msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
- msgstr "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  mostra nome formatado\n"
- 
--#: ../hostname.c:229
-+#: ../hostname.c:228
-+#, c-format
- msgid ""
- "       hostname [-v]                         display hostname\n"
- "\n"
-@@ -341,7 +354,8 @@
- "     hostname [-v]                            mostra nome da máquina\n"
- "\n"
- 
--#: ../hostname.c:230
-+#: ../hostname.c:229
-+#, c-format
- msgid ""
- "       hostname -V|--version|-h|--help       print info and exit\n"
- "\n"
-@@ -349,7 +363,8 @@
- "     hostname -V|--version|-h|--help          mostra informações e termina\n"
- "\n"
- 
--#: ../hostname.c:231
-+#: ../hostname.c:230
-+#, c-format
- msgid ""
- "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
- "\n"
-@@ -357,35 +372,43 @@
- "    dnsdomainname=máquina -d, {yp,nis,}domainname=hostname -y\n"
- "\n"
- 
--#: ../hostname.c:232
-+#: ../hostname.c:231
-+#, c-format
- msgid "    -s, --short           short host name\n"
- msgstr "    -s, --short           nome curto da máquina\n"
- 
--#: ../hostname.c:233
-+#: ../hostname.c:232
-+#, c-format
- msgid "    -a, --alias           alias names\n"
- msgstr "    -a, --alias           aliases para a máquina\n"
- 
--#: ../hostname.c:234
-+#: ../hostname.c:233
-+#, c-format
- msgid "    -i, --ip-address      addresses for the hostname\n"
- msgstr "    -i, --ip-address      endereços da máquina\n"
- 
--#: ../hostname.c:235
-+#: ../hostname.c:234
-+#, c-format
- msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
- msgstr "    -f, --fqdn, --long    nome longo da máquina (FQDN)\n"
- 
--#: ../hostname.c:236
-+#: ../hostname.c:235
-+#, c-format
- msgid "    -d, --domain          DNS domain name\n"
- msgstr "    -d, --domain          nome do domínio DNS\n"
- 
--#: ../hostname.c:237
-+#: ../hostname.c:236
-+#, c-format
- msgid "    -y, --yp, --nis       NIS/YP domainname\n"
- msgstr "    -y, --yp, --nis       nome do domínio NIS/YP\n"
- 
--#: ../hostname.c:239
-+#: ../hostname.c:238
-+#, c-format
- msgid "    -n, --node            DECnet node name\n"
- msgstr "    -n, --node            nome do nó DECnet\n"
- 
--#: ../hostname.c:241
-+#: ../hostname.c:240
-+#, c-format
- msgid ""
- "    -F, --file            read hostname or NIS domainname from given file\n"
- "\n"
-@@ -393,7 +416,8 @@
- "    -F, --file            leia o nome da máquina ou domínio NIS do arquivo\n"
- "\n"
- 
--#: ../hostname.c:243
-+#: ../hostname.c:242
-+#, c-format
- msgid ""
- "   This command can read or set the hostname or the NIS domainname. You can\n"
- "   also read the DNS domain or the FQDN (fully qualified domain name).\n"
-@@ -413,15 +437,16 @@
- msgstr "%s: Você não pode mudar o nome do domínio DNS com este comando\n"
- 
- #: ../hostname.c:339
-+#, c-format
- msgid ""
- "\n"
- "Unless you are using bind or NIS for host lookups you can change the DNS\n"
- msgstr ""
- "\n"
--"A menos que esteja usando bind ou NIS para resolução de nomes você pode "
--"mudar\n"
-+"A menos que esteja usando bind ou NIS para resolução de nomes você pode mudar\n"
- 
- #: ../hostname.c:340
-+#, c-format
- msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
- msgstr "o nome do domínio DNS (que é parte do FQDN) no arquivo /etc/hosts.\n"
- 
-@@ -440,552 +465,453 @@
- msgid "getnodename()=`%s'\n"
- msgstr "getnodename()=`%s'\n"
- 
--#: ../ifconfig.c:159
--#, c-format
--msgid "%-9.9s Link encap:%s  "
--msgstr "%-9.9s  Encapsulamento do Link: %s  "
-+#: ../ifconfig.c:107
-+#, fuzzy, c-format
-+msgid ""
-+"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
-+"Flg\n"
-+msgstr "Iface     MTU Met  RX-OK RX-ERR RX-DRP RX-OVR  TX-OK TX-ERR TX-DRP TX-OV Opções\n"
- 
--#: ../ifconfig.c:164
--#, c-format
--msgid "HWaddr %s  "
--msgstr "Endereço de HW %s  "
-+#: ../ifconfig.c:129 ../ifconfig.c:161
-+#, fuzzy, c-format
-+msgid "%s: ERROR while getting interface flags: %s\n"
-+msgstr ""
-+"%s: erro obtendo informações da interface: %s\n"
-+"\n"
- 
--#: ../ifconfig.c:167
-+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
-+#: ../ifconfig.c:973
- #, c-format
--msgid "Media:%s"
--msgstr "Mídia:%s"
-+msgid "No support for INET on this system.\n"
-+msgstr "Este sistema não tem suporte a INET.\n"
- 
--#: ../ifconfig.c:169
--msgid "(auto)"
--msgstr "(auto)"
-+#: ../ifconfig.c:193
-+#, fuzzy, c-format
-+msgid "%s: ERROR while testing interface flags: %s\n"
-+msgstr ""
-+"%s: erro obtendo informações da interface: %s\n"
-+"\n"
- 
--#: ../ifconfig.c:176
--#, c-format
--msgid "          %s addr:%s "
--msgstr "          %s end.: %s "
-+#: ../ifconfig.c:202
-+#, fuzzy, c-format
-+msgid ""
-+"Usage:\n"
-+"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
-+msgstr ""
-+"Uso:\n"
-+"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <endereço>]\n"
- 
--#: ../ifconfig.c:179
-+#: ../ifconfig.c:204
- #, c-format
--msgid " P-t-P:%s "
--msgstr " P-a-P:%s "
-+msgid "  [add <address>[/<prefixlen>]]\n"
-+msgstr "  [add <endereço>[/<tam_prefixo>]]\n"
- 
--#: ../ifconfig.c:182
-+#: ../ifconfig.c:205
- #, c-format
--msgid " Bcast:%s "
--msgstr " Bcast:%s "
-+msgid "  [del <address>[/<prefixlen>]]\n"
-+msgstr "  [del <endereço>[/<tam_prefixo>]]\n"
- 
--#: ../ifconfig.c:184
-+#: ../ifconfig.c:206
- #, c-format
--msgid " Mask:%s\n"
--msgstr " Masc:%s\n"
-+msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
-+msgstr "  [[-]broadcast [<endereço>]]  [[-]pointopoint [<endereço>]]\n"
- 
--#: ../ifconfig.c:201
-+#: ../ifconfig.c:207
- #, c-format
--msgid "          inet6 addr: %s/%d"
--msgstr "          endereço inet6: %s/%d"
--
--#: ../ifconfig.c:203
--msgid " Scope:"
--msgstr " Escopo:"
--
--#: ../ifconfig.c:206
--msgid "Global"
--msgstr "Global"
-+msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
-+msgstr "  [netmask <endereço>]  [dstaddr <endereço>]  [tunnel <endereço>]\n"
- 
--#: ../ifconfig.c:209
--msgid "Link"
--msgstr "Link"
-+#: ../ifconfig.c:210
-+#, c-format
-+msgid "  [outfill <NN>] [keepalive <NN>]\n"
-+msgstr "  [outfill <NN>] [keepalive <NN>]\n"
- 
- #: ../ifconfig.c:212
--msgid "Site"
--msgstr "Site"
--
--#: ../ifconfig.c:215
--msgid "Compat"
--msgstr "Compat"
--
--#: ../ifconfig.c:218
--msgid "Host"
--msgstr "Máquina"
--
--#: ../ifconfig.c:221
--msgid "Unknown"
--msgstr "Desconhecido"
--
--#: ../ifconfig.c:236
- #, c-format
--msgid "          IPX/Ethernet II addr:%s\n"
--msgstr "      Endereço IPX/Ethernet II:%s\n"
-+msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
-+msgstr "  [hw <HW> <endereço>]  [metric <NN>]  [mtu <NN>]\n"
- 
--#: ../ifconfig.c:239
-+#: ../ifconfig.c:213
- #, c-format
--msgid "          IPX/Ethernet SNAP addr:%s\n"
--msgstr "      Endereço IPX/Ethernet SNAP:%s\n"
-+msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-+msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
- 
--#: ../ifconfig.c:242
-+#: ../ifconfig.c:214
- #, c-format
--msgid "          IPX/Ethernet 802.2 addr:%s\n"
--msgstr "      Endereço IPX/Ethernet 802.2:%s\n"
-+msgid "  [multicast]  [[-]promisc]\n"
-+msgstr "  [multicast]  [[-]promisc]\n"
- 
--#: ../ifconfig.c:245
-+#: ../ifconfig.c:215
- #, c-format
--msgid "          IPX/Ethernet 802.3 addr:%s\n"
--msgstr "      Endereço IPX/Ethernet 802.3:%s\n"
-+msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
-+msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <tipo>]\n"
- 
--#: ../ifconfig.c:255
-+#: ../ifconfig.c:217
- #, c-format
--msgid "          EtherTalk Phase 2 addr:%s\n"
--msgstr "          Endereço EtherTalk fase 2:%s\n"
-+msgid "  [txqueuelen <NN>]\n"
-+msgstr "  [txqueuelen <NN>]\n"
- 
--#: ../ifconfig.c:264
-+#: ../ifconfig.c:220
- #, c-format
--msgid "          econet addr:%s\n"
--msgstr "          Endereço econet:%s\n"
--
--#: ../ifconfig.c:270
--msgid "[NO FLAGS] "
--msgstr "[NENHUMA FLAG] "
--
--#: ../ifconfig.c:272
--msgid "UP "
--msgstr "UP "
--
--#: ../ifconfig.c:274
--msgid "BROADCAST "
--msgstr "BROADCAST"
--
--#: ../ifconfig.c:276
--msgid "DEBUG "
--msgstr "DEBUG "
--
--#: ../ifconfig.c:278
--msgid "LOOPBACK "
--msgstr "LOOPBACK"
--
--#: ../ifconfig.c:280
--msgid "POINTOPOINT "
--msgstr "POINTOPOINT "
--
--#: ../ifconfig.c:282
--msgid "NOTRAILERS "
--msgstr "NOTRAILERS "
--
--#: ../ifconfig.c:284
--msgid "RUNNING "
--msgstr "RUNNING "
-+msgid "  [[-]dynamic]\n"
-+msgstr "  [[-]dynamic]\n"
- 
--#: ../ifconfig.c:286
--msgid "NOARP "
--msgstr "NOARP "
-+#: ../ifconfig.c:222
-+#, c-format
-+msgid ""
-+"  [up|down] ...\n"
-+"\n"
-+msgstr ""
-+"  [up|down] ...\n"
-+"\n"
- 
--#: ../ifconfig.c:288
--msgid "PROMISC "
--msgstr "PROMISC "
-+#: ../ifconfig.c:224
-+#, c-format
-+msgid "  <HW>=Hardware Type.\n"
-+msgstr "  <HW>=Tipo de Hardware.\n"
- 
--#: ../ifconfig.c:290
--msgid "ALLMULTI "
--msgstr "ALLMULTI "
-+#: ../ifconfig.c:225
-+#, c-format
-+msgid "  List of possible hardware types:\n"
-+msgstr "  Lista dos tipos possíveis de hardware:\n"
- 
--#: ../ifconfig.c:292
--msgid "SLAVE "
--msgstr "SLAVE "
-+#. 1 = ARPable
-+#: ../ifconfig.c:227
-+#, c-format
-+msgid "  <AF>=Address family. Default: %s\n"
-+msgstr "  <AF>=Família de endereços. Default: %s\n"
- 
--#: ../ifconfig.c:294
--msgid "MASTER "
--msgstr "MASTER "
-+#: ../ifconfig.c:228
-+#, c-format
-+msgid "  List of possible address families:\n"
-+msgstr "  Lista de famílias de endereços possíveis:\n"
- 
--#: ../ifconfig.c:296
--msgid "MULTICAST "
--msgstr "MULTICAST "
-+#: ../ifconfig.c:303
-+#, c-format
-+msgid "ifconfig: option `%s' not recognised.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:299
--msgid "DYNAMIC "
--msgstr "DYNAMIC "
-+#: ../ifconfig.c:305 ../ifconfig.c:962
-+#, c-format
-+msgid "ifconfig: `--help' gives usage information.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:302
-+#: ../ifconfig.c:380
- #, c-format
--msgid " MTU:%d  Metric:%d"
--msgstr " MTU:%d  Métrica:%d"
-+msgid "Unknown media type.\n"
-+msgstr "Tipo desconhecido de mídia.\n"
- 
--#: ../ifconfig.c:306
-+#: ../ifconfig.c:417
- #, c-format
--msgid "  Outfill:%d  Keepalive:%d"
--msgstr "  Outfill:%d  Keepalive:%d"
-+msgid ""
-+"Warning: Interface %s still in promisc mode... maybe other application is "
-+"running?\n"
-+msgstr ""
- 
--#: ../ifconfig.c:320
-+#: ../ifconfig.c:429
- #, c-format
--msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
--msgstr "Pacotes RX:%lu erros:%lu descartados:%lu sobreposições:%lu frame:%lu\n"
-+msgid "Warning: Interface %s still in MULTICAST mode.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:325
-+#: ../ifconfig.c:441
- #, c-format
--msgid "             compressed:%lu\n"
--msgstr "             compactados:%lu\n"
-+msgid "Warning: Interface %s still in ALLMULTI mode.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:329
-+#: ../ifconfig.c:465
- #, c-format
--msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
-+msgid "Warning: Interface %s still in DYNAMIC mode.\n"
- msgstr ""
--"Pacotes TX:%lu erros:%lu descartados:%lu sobreposições:%lu portadora:%lu\n"
- 
--#: ../ifconfig.c:333
-+#: ../ifconfig.c:523
- #, c-format
--msgid "          collisions:%lu "
--msgstr "          colisões:%lu "
-+msgid "Warning: Interface %s still in BROADCAST mode.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:335
-+#: ../ifconfig.c:652
- #, c-format
--msgid "compressed:%lu "
--msgstr "compactados:%lu "
-+msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:337
-+#: ../ifconfig.c:684
- #, c-format
--msgid "txqueuelen:%d "
--msgstr "txqueuelen:%d "
--
--#: ../ifconfig.c:345
--#, c-format
--msgid "Interrupt:%d "
--msgstr "IRQ:%d "
--
--#. Only print devices using it for
--#. I/O maps
--#: ../ifconfig.c:348
--#, c-format
--msgid "Base address:0x%x "
--msgstr "Endereço de E/S:0x%x "
-+msgid "hw address type `%s' has no handler to set address. failed.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:350
-+#: ../ifconfig.c:693
- #, c-format
--msgid "Memory:%lx-%lx "
--msgstr "Memória:%lx-%lx "
-+msgid "%s: invalid %s address.\n"
-+msgstr "%s: endereço %s inválido.\n"
- 
--#: ../ifconfig.c:353
-+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
- #, c-format
--msgid "DMA chan:%x "
--msgstr "Canal DMA:%x "
-+msgid "No support for INET6 on this system.\n"
-+msgstr "Este sistema não tem suporte a INET6.\n"
- 
--#: ../ifconfig.c:384 ../ifconfig.c:405
-+#: ../ifconfig.c:780 ../ifconfig.c:871
- #, c-format
--msgid "%s: unknown interface: %s\n"
--msgstr "%s: interface desconhecida: %s\n"
--
--#: ../ifconfig.c:421
--msgid ""
--"Usage:\n"
--"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <address>]\n"
--msgstr ""
--"Uso:\n"
--"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <endereço>]\n"
--
--#: ../ifconfig.c:425
--msgid "  [add <address>[/<prefixlen>]]\n"
--msgstr "  [add <endereço>[/<tam_prefixo>]]\n"
--
--#: ../ifconfig.c:427
--msgid "  [del <address>[/<prefixlen>]]\n"
--msgstr "  [del <endereço>[/<tam_prefixo>]]\n"
--
--#: ../ifconfig.c:432
--msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
--msgstr "  [[-]broadcast [<endereço>]]  [[-]pointopoint [<endereço>]]\n"
--
--#: ../ifconfig.c:433
--msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
--msgstr "  [netmask <endereço>]  [dstaddr <endereço>]  [tunnel <endereço>]\n"
--
--#: ../ifconfig.c:436
--msgid "  [outfill <NN>] [keepalive <NN>]\n"
--msgstr "  [outfill <NN>] [keepalive <NN>]\n"
--
--#: ../ifconfig.c:438
--msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
--msgstr "  [hw <HW> <endereço>]  [metric <NN>]  [mtu <NN>]\n"
--
--#: ../ifconfig.c:439
--msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
--msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
--
--#: ../ifconfig.c:440
--msgid "  [multicast]  [[-]promisc]\n"
--msgstr "  [multicast]  [[-]promisc]\n"
--
--#: ../ifconfig.c:441
--msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
--msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <tipo>]\n"
--
--#: ../ifconfig.c:443
--msgid "  [txqueuelen <NN>]\n"
--msgstr "  [txqueuelen <NN>]\n"
--
--#: ../ifconfig.c:446
--msgid "  [[-]dynamic]\n"
--msgstr "  [[-]dynamic]\n"
--
--#: ../ifconfig.c:448
--msgid ""
--"  [up|down] ...\n"
--"\n"
-+msgid "Interface %s not initialized\n"
- msgstr ""
--"  [up|down] ...\n"
--"\n"
--
--#: ../ifconfig.c:450
--msgid "  <HW>=Hardware Type.\n"
--msgstr "  <HW>=Tipo de Hardware.\n"
--
--#: ../ifconfig.c:451
--msgid "  List of possible hardware types:\n"
--msgstr "  Lista dos tipos possíveis de hardware:\n"
--
--#. 1 = ARPable
--#: ../ifconfig.c:453
--#, c-format
--msgid "  <AF>=Address family. Default: %s\n"
--msgstr "  <AF>=Família de endereços. Default: %s\n"
--
--#: ../ifconfig.c:454
--msgid "  List of possible address families:\n"
--msgstr "  Lista de famílias de endereços possíveis:\n"
--
--#: ../ifconfig.c:593
--msgid "Unknown media type.\n"
--msgstr "Tipo desconhecido de mídia.\n"
- 
--#: ../ifconfig.c:881
--#, c-format
--msgid "%s: invalid %s address.\n"
-+#: ../ifconfig.c:792 ../ifconfig.c:882
-+#, fuzzy, c-format
-+msgid "Bad address.\n"
- msgstr "%s: endereço %s inválido.\n"
- 
--#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011
--msgid "No support for INET6 on this system.\n"
--msgstr "Este sistema não tem suporte a INET6.\n"
--
--#: ../ifconfig.c:983
-+#: ../ifconfig.c:885
-+#, c-format
- msgid "Address deletion not supported on this system.\n"
- msgstr "Remoção de endereço não suportada neste sistema.\n"
- 
--#: ../ifconfig.c:1066
--msgid "No support for INET on this system.\n"
--msgstr "Este sistema não tem suporte a INET.\n"
-+#: ../ifconfig.c:957
-+#, fuzzy, c-format
-+msgid "ifconfig: Cannot set address for this protocol family.\n"
-+msgstr "Não sei como configurar endereços para a família %d.\n"
- 
--#: ../ifconfig.c:1076
-+#: ../ifconfig.c:983
-+#, c-format
- msgid "No support for ECONET on this system.\n"
- msgstr "Este sistema não tem suporte a ECONET.\n"
- 
--#: ../ifconfig.c:1084
-+#: ../ifconfig.c:991
- #, c-format
- msgid "Don't know how to set addresses for family %d.\n"
- msgstr "Não sei como configurar endereços para a família %d.\n"
- 
--#: ../netstat.c:383
-+#: ../ifconfig.c:1021
-+#, c-format
-+msgid "WARNING: at least one error occured. (%d)\n"
-+msgstr ""
-+
-+#: ../netstat.c:434
- #, c-format
- msgid ""
- "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
--msgstr ""
--"(Não foi possível ler informações para \"-p\": geteuid()=%d mas você deve "
--"ser root.)\n"
-+msgstr "(Não foi possível ler informações para \"-p\": geteuid()=%d mas você deve ser root.)\n"
- 
--#: ../netstat.c:387
-+#: ../netstat.c:438
-+#, c-format
- msgid ""
- "(Not all processes could be identified, non-owned process info\n"
- " will not be shown, you would have to be root to see it all.)\n"
- msgstr ""
--"(Nem todos os processos puderam ser identificados, informações sobre "
--"processos\n"
-+"(Nem todos os processos puderam ser identificados, informações sobre processos\n"
- " de outrem não serão mostrados, você deve ser root para vê-los todos.)\n"
- 
--#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166
-+#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
- msgid "LISTENING"
- msgstr "OUVINDO"
- 
--#: ../netstat.c:395
-+#: ../netstat.c:446
- msgid "CONN SENT"
- msgstr "CONN ENVIADO"
- 
--#: ../netstat.c:396 ../netstat.c:1168
-+#: ../netstat.c:447 ../netstat.c:1268
- msgid "DISC SENT"
- msgstr "DISC ENVIADO"
- 
--#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169
-+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
- msgid "ESTABLISHED"
- msgstr "ESTABELECIDA"
- 
--#: ../netstat.c:419
-+#: ../netstat.c:470
-+#, c-format
- msgid "Active NET/ROM sockets\n"
- msgstr "Ative sockets NET/ROM\n"
- 
--#: ../netstat.c:420
-+#: ../netstat.c:471
-+#, c-format
- msgid ""
--"User       Dest       Source     Device  State        Vr/Vs    Send-Q  "
--"Recv-Q\n"
--msgstr ""
--"Usuário    Destino    Origem  Dispositivo Estado      Vr/Vs  Send-Q  Recv-Q\n"
-+"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
-+"Q\n"
-+msgstr "Usuário    Destino    Origem  Dispositivo Estado      Vr/Vs  Send-Q  Recv-Q\n"
- 
--#: ../netstat.c:430 ../netstat.c:1208
-+#: ../netstat.c:481 ../netstat.c:1308
- #, c-format
- msgid "Problem reading data from %s\n"
- msgstr "Problemas lendo dados de %s\n"
- 
--#: ../netstat.c:465
-+#: ../netstat.c:516
- msgid "SYN_SENT"
- msgstr "SYN_ENVIADO"
- 
--#: ../netstat.c:466
-+#: ../netstat.c:517
- msgid "SYN_RECV"
- msgstr "SYN_RECEBIDO"
- 
--#: ../netstat.c:467
-+#: ../netstat.c:518
- msgid "FIN_WAIT1"
- msgstr "ESPERA_FIN1"
- 
--#: ../netstat.c:468
-+#: ../netstat.c:519
- msgid "FIN_WAIT2"
- msgstr "ESPERA_FIN2"
- 
--#: ../netstat.c:469
-+#: ../netstat.c:520
- msgid "TIME_WAIT"
- msgstr "TIME_WAIT"
- 
--#: ../netstat.c:470
-+#: ../netstat.c:521
- msgid "CLOSE"
- msgstr "FECHAR"
- 
--#: ../netstat.c:471
-+#: ../netstat.c:522
- msgid "CLOSE_WAIT"
- msgstr "ESPERANDO_FECHAR"
- 
--#: ../netstat.c:472
-+#: ../netstat.c:523
- msgid "LAST_ACK"
- msgstr "ÚLTIMO_ACK"
- 
--#: ../netstat.c:473
-+#: ../netstat.c:524
- msgid "LISTEN"
- msgstr "OUÇA"
- 
--#: ../netstat.c:474
-+#: ../netstat.c:525
- msgid "CLOSING"
- msgstr "FECHANDO"
- 
--#: ../netstat.c:544
-+#: ../netstat.c:596
- #, c-format
- msgid "warning, got bogus igmp6 line %d.\n"
- msgstr "atenção, recebi linha igmp6 inválida %d.\n"
- 
--#: ../netstat.c:549 ../netstat.c:587 ../netstat.c:670 ../netstat.c:803
--#: ../netstat.c:935 ../netstat.c:940
-+#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
-+#: ../netstat.c:1032 ../netstat.c:1037
- #, c-format
- msgid "netstat: unsupported address family %d !\n"
- msgstr "netstat: família de protocolos %d não suportada!\n"
- 
--#: ../netstat.c:562 ../netstat.c:567 ../netstat.c:575 ../netstat.c:582
-+#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
- #, c-format
- msgid "warning, got bogus igmp line %d.\n"
- msgstr "atenção, recebi linha igmp inválida %d.\n"
- 
--#: ../netstat.c:666
-+#: ../netstat.c:677
-+#, fuzzy, c-format
-+msgid "Active X.25 sockets\n"
-+msgstr "Ativar sockets AX.25\n"
-+
-+#. IMHO, Vr/Vs is not very usefull --SF
-+#: ../netstat.c:679
-+#, fuzzy, c-format
-+msgid ""
-+"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
-+"Q\n"
-+msgstr "Destino    Origem Dispositivo Estado       Vr/Vs  Send-Q  Recv-Q\n"
-+
-+#: ../netstat.c:759
-+#, c-format
- msgid "warning, got bogus tcp line.\n"
- msgstr "atenção, recebi linha tcp inválida.\n"
- 
--#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975
-+#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
- #, c-format
- msgid "off (0.00/%ld/%d)"
- msgstr "desligado (0.00/%ld/%ld)"
- 
--#: ../netstat.c:708
-+#: ../netstat.c:804
- #, c-format
- msgid "on (%2.2f/%ld/%d)"
- msgstr "em (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:713
-+#: ../netstat.c:809
- #, c-format
- msgid "keepalive (%2.2f/%ld/%d)"
- msgstr "keepalive (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:718
-+#: ../netstat.c:814
- #, c-format
- msgid "timewait (%2.2f/%ld/%d)"
- msgstr "timewait (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985
-+#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
- #, c-format
- msgid "unkn-%d (%2.2f/%ld/%d)"
- msgstr "desconh.-%d (%2.2f/%ld)"
- 
--#: ../netstat.c:799
-+#: ../netstat.c:894
-+#, c-format
- msgid "warning, got bogus udp line.\n"
- msgstr "atenção, recebi linha udp inválida.\n"
- 
--#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108
-+#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
- msgid "UNKNOWN"
- msgstr "DESCONHECIDA"
- 
--#: ../netstat.c:860 ../netstat.c:980
-+#: ../netstat.c:958 ../netstat.c:1080
- #, c-format
- msgid "on%d (%2.2f/%ld/%d)"
- msgstr "ligado %d (%2.2f/%ld)"
- 
--#: ../netstat.c:949
-+#: ../netstat.c:1046
-+#, c-format
- msgid "warning, got bogus raw line.\n"
- msgstr "atenção, recebi linha raw inválida.\n"
- 
--#: ../netstat.c:1028
-+#: ../netstat.c:1128
-+#, c-format
- msgid "warning, got bogus unix line.\n"
- msgstr "atenção, recebi linha unix inválida.\n"
- 
--#: ../netstat.c:1055
-+#: ../netstat.c:1155
- msgid "STREAM"
- msgstr "STREAM"
- 
--#: ../netstat.c:1059
-+#: ../netstat.c:1159
- msgid "DGRAM"
- msgstr "DGRAM"
- 
--#: ../netstat.c:1063
-+#: ../netstat.c:1163
- msgid "RAW"
- msgstr "RAW"
- 
--#: ../netstat.c:1067
-+#: ../netstat.c:1167
- msgid "RDM"
- msgstr "RDM"
- 
--#: ../netstat.c:1071
-+#: ../netstat.c:1171
- msgid "SEQPACKET"
- msgstr "SEQPACKET"
- 
--#: ../netstat.c:1080
-+#: ../netstat.c:1180
- msgid "FREE"
- msgstr "LIVRE"
- 
--#: ../netstat.c:1096
-+#: ../netstat.c:1196
- msgid "CONNECTING"
- msgstr "CONECTANDO"
- 
--#: ../netstat.c:1100
-+#: ../netstat.c:1200
- msgid "CONNECTED"
- msgstr "CONECTADO"
- 
--#: ../netstat.c:1104
-+#: ../netstat.c:1204
- msgid "DISCONNECTING"
- msgstr "DESCONECTANDO"
- 
--#: ../netstat.c:1135
-+#: ../netstat.c:1235
-+#, c-format
- msgid "Active UNIX domain sockets "
- msgstr "Domain sockets UNIX ativos "
- 
--#: ../netstat.c:1137 ../netstat.c:1666
-+#: ../netstat.c:1237 ../netstat.c:1756
-+#, c-format
- msgid "(servers and established)"
- msgstr "(servidores e estabelecidas)"
- 
--#: ../netstat.c:1140 ../netstat.c:1669
-+#: ../netstat.c:1240 ../netstat.c:1759
-+#, c-format
- msgid "(only servers)"
- msgstr "(sem os servidores)"
- 
--#: ../netstat.c:1142 ../netstat.c:1671
-+#: ../netstat.c:1242 ../netstat.c:1761
-+#, c-format
- msgid "(w/o servers)"
- msgstr "(sem os servidores)"
- 
--#: ../netstat.c:1145
-+#: ../netstat.c:1245
-+#, c-format
- msgid ""
- "\n"
- "Proto RefCnt Flags       Type       State         I-Node"
-@@ -993,114 +919,118 @@
- "\n"
- "Proto CntRef Flags       Tipo       Estado        I-Node Rota"
- 
--#: ../netstat.c:1147
-+#: ../netstat.c:1247
-+#, c-format
- msgid " Path\n"
- msgstr " Caminho\n"
- 
--#: ../netstat.c:1167
-+#: ../netstat.c:1267
- msgid "SABM SENT"
- msgstr "SABM ENVIADO"
- 
--#: ../netstat.c:1170
-+#: ../netstat.c:1270
- msgid "RECOVERY"
- msgstr "RECUPERAÇÃO"
- 
--#: ../netstat.c:1184
-+#: ../netstat.c:1284
-+#, c-format
- msgid "Active AX.25 sockets\n"
- msgstr "Ativar sockets AX.25\n"
- 
--#: ../netstat.c:1185
-+#: ../netstat.c:1285
-+#, c-format
- msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
- msgstr "Destino    Origem Dispositivo Estado       Vr/Vs  Send-Q  Recv-Q\n"
- 
--#: ../netstat.c:1228
-+#: ../netstat.c:1328
- #, c-format
- msgid "problem reading data from %s\n"
- msgstr "problemas lendo dados de %s\n"
- 
--#: ../netstat.c:1279
-+#: ../netstat.c:1379
-+#, c-format
- msgid ""
- "Active IPX sockets\n"
- "Proto Recv-Q Send-Q Local Address              Foreign Address            "
- "State"
- msgstr ""
- "Sockets IPX ativos\n"
--"Proto Recv-Q Send-Q Endereço Local             Endereço Remoto           "
--"Estado"
-+"Proto Recv-Q Send-Q Endereço Local             Endereço Remoto           Estado"
- 
--#: ../netstat.c:1281
-+#: ../netstat.c:1381
-+#, c-format
- msgid " User"
- msgstr " Usuário"
- 
--#: ../netstat.c:1315
-+#: ../netstat.c:1415
- msgid "ESTAB"
- msgstr "ESTAB"
- 
--#: ../netstat.c:1323
-+#: ../netstat.c:1423
- msgid "UNK."
- msgstr "DESC."
- 
--#: ../netstat.c:1367
--msgid "     - no statistics available -"
--msgstr "     - estatísticas não disponíveis -"
--
--#: ../netstat.c:1370
--msgid "[NO FLAGS]"
--msgstr "[SEM FLAGS]"
--
--#: ../netstat.c:1400
-+#: ../netstat.c:1461
-+#, c-format
- msgid "Kernel Interface table\n"
- msgstr "Tabela de Interfaces do Kernel\n"
- 
--#: ../netstat.c:1401
-+#: ../netstat.c:1465
-+#, fuzzy, c-format
- msgid ""
--"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
-+"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
- "Flg\n"
--msgstr ""
--"Iface     MTU Met  RX-OK RX-ERR RX-DRP RX-OVR  TX-OK TX-ERR TX-DRP TX-OV "
--"Opções\n"
-+msgstr "Iface     MTU Met  RX-OK RX-ERR RX-DRP RX-OVR  TX-OK TX-ERR TX-DRP TX-OV Opções\n"
- 
--#: ../netstat.c:1404
-+#: ../netstat.c:1469
- msgid "missing interface information"
- msgstr "falta informação da interface"
- 
--#: ../netstat.c:1425
-+#: ../netstat.c:1492
-+#, c-format
- msgid ""
--"usage: netstat [-veenNcCF] [<Af>] -r         netstat "
--"{-V|--version|-h|--help}\n"
-+"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
-+"help}\n"
- msgstr ""
- "uso: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--help}\n"
- 
--#: ../netstat.c:1426
-+#: ../netstat.c:1493
-+#, c-format
- msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
- msgstr "     netstat [-vnNcaeo] [<Socket>]\n"
- 
--#: ../netstat.c:1427
-+#: ../netstat.c:1494
-+#, c-format
- msgid ""
- "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
- "\n"
- msgstr "     netstat [-vnNcaeo] [<Socket>]\n"
- 
--#: ../netstat.c:1429
-+#: ../netstat.c:1496
-+#, c-format
- msgid "        -r, --route              display routing table\n"
- msgstr "        -r, --route             mostra tabela de roteamento\n"
- 
--#: ../netstat.c:1430
-+#: ../netstat.c:1497
-+#, c-format
- msgid "        -i, --interfaces         display interface table\n"
- msgstr "        -i, --interfaces        mostra tabela de interfaces\n"
- 
--#: ../netstat.c:1431
-+#: ../netstat.c:1498
-+#, c-format
- msgid "        -g, --groups             display multicast group memberships\n"
- msgstr ""
- "        -o, --timers            mostra temporizadores\n"
- "\n"
- 
--#: ../netstat.c:1432
-+#: ../netstat.c:1499
-+#, c-format
- msgid ""
- "        -s, --statistics         display networking statistics (like SNMP)\n"
- msgstr "        -i, --interfaces        mostra tabela de interfaces\n"
- 
--#: ../netstat.c:1434
-+#: ../netstat.c:1501
-+#, c-format
- msgid ""
- "        -M, --masquerade         display masqueraded connections\n"
- "\n"
-@@ -1108,19 +1038,38 @@
- "        -M, --masquerade        mostra conexões mascaradas\n"
- "\n"
- 
--#: ../netstat.c:1438 ../route.c:87
-+#: ../netstat.c:1505
-+#, fuzzy, c-format
-+msgid "        --numeric-hosts          don't resolve host names\n"
-+msgstr "        -n, --numeric           não resolve nomes\n"
-+
-+#: ../netstat.c:1506
-+#, fuzzy, c-format
-+msgid "        --numeric-ports          don't resolve port names\n"
-+msgstr "        -n, --numeric           não resolve nomes\n"
-+
-+#: ../netstat.c:1507
-+#, fuzzy, c-format
-+msgid "        --numeric-users          don't resolve user names\n"
-+msgstr "        -n, --numeric           não resolve nomes\n"
-+
-+#: ../netstat.c:1508
-+#, c-format
- msgid "        -N, --symbolic           resolve hardware names\n"
- msgstr "        -n, --numeric           não resolve nomes\n"
- 
--#: ../netstat.c:1439 ../route.c:88
-+#: ../netstat.c:1509 ../route.c:88
-+#, c-format
- msgid "        -e, --extend             display other/more information\n"
- msgstr "        -e, --extend             mostra outras/mais informações\n"
- 
--#: ../netstat.c:1440
-+#: ../netstat.c:1510
-+#, c-format
- msgid "        -p, --programs           display PID/Program name for sockets\n"
- msgstr "        -r, --route             mostra tabela de roteamento\n"
- 
--#: ../netstat.c:1441
-+#: ../netstat.c:1511
-+#, c-format
- msgid ""
- "        -c, --continuous         continuous listing\n"
- "\n"
-@@ -1128,30 +1077,33 @@
- "        -c, --continuous        listagem contínua\n"
- "\n"
- 
--#: ../netstat.c:1442
-+#: ../netstat.c:1512
-+#, c-format
- msgid "        -l, --listening          display listening server sockets\n"
- msgstr "        -L, --netlink           mostra mensagens netlink do kernel\n"
- 
--#: ../netstat.c:1443
-+#: ../netstat.c:1513
-+#, c-format
- msgid ""
- "        -a, --all, --listening   display all sockets (default: connected)\n"
- msgstr "        -a, --all, --listening  mostra tudo\n"
- 
--#: ../netstat.c:1444
-+#: ../netstat.c:1514
-+#, c-format
- msgid "        -o, --timers             display timers\n"
- msgstr ""
- "        -o, --timers            mostra temporizadores\n"
- "\n"
- 
--#: ../netstat.c:1445 ../route.c:89
-+#: ../netstat.c:1515 ../route.c:89
-+#, c-format
- msgid ""
- "        -F, --fib                display Forwarding Information Base "
- "(default)\n"
--msgstr ""
--"        -F, --fib             mostra a Base de Informações de Repasse "
--"(default)\n"
-+msgstr "        -F, --fib             mostra a Base de Informações de Repasse (default)\n"
- 
--#: ../netstat.c:1446 ../route.c:90
-+#: ../netstat.c:1516 ../route.c:90
-+#, c-format
- msgid ""
- "        -C, --cache              display routing cache instead of FIB\n"
- "\n"
-@@ -1159,136 +1111,145 @@
- "        -C, --cache              mostra cache de roteamento no lugar da FIB\n"
- "\n"
- 
--#: ../netstat.c:1448
-+#: ../netstat.c:1518
-+#, c-format
- msgid ""
--"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
--"--netrom\n"
-+"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-+"netrom\n"
- msgstr ""
--"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
--"--netrom\n"
-+"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-+"netrom\n"
- 
--#: ../netstat.c:1449 ../route.c:92
--#, c-format
--msgid "  <AF>=Use '-A <af>' or '--<af>' Default: %s\n"
-+#: ../netstat.c:1519
-+#, fuzzy, c-format
-+msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
- msgstr "  <AF>=Use '-A <af>' ou [--<af>' Default: %s\n"
- 
--#: ../netstat.c:1450 ../route.c:93
-+#: ../netstat.c:1520 ../route.c:93
-+#, c-format
- msgid "  List of possible address families (which support routing):\n"
--msgstr ""
--"  Lista das famílias de endereços possíveis (que suportam roteamento):\n"
-+msgstr "  Lista das famílias de endereços possíveis (que suportam roteamento):\n"
- 
--#: ../netstat.c:1663
-+#: ../netstat.c:1753
-+#, c-format
- msgid "Active Internet connections "
- msgstr "Conexões Internet Ativas "
- 
--#: ../netstat.c:1673
-+#: ../netstat.c:1763
-+#, c-format
- msgid ""
- "\n"
--"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
--"  "
-+"Proto Recv-Q Send-Q Local Address           Foreign Address         "
-+"State      "
- msgstr ""
- "\n"
--"Proto Recv-Q Send-Q Endereço Local          Endereço Remoto         Estado   "
--"  "
-+"Proto Recv-Q Send-Q Endereço Local          Endereço Remoto         Estado     "
- 
--#: ../netstat.c:1675
-+#: ../netstat.c:1765
-+#, c-format
- msgid " User       Inode     "
- msgstr " Usuário   "
- 
--#: ../netstat.c:1678
-+#: ../netstat.c:1768
-+#, c-format
- msgid " Timer"
- msgstr " Temporizador"
- 
--#: ../netstat.c:1708
-+#: ../netstat.c:1798
-+#, c-format
- msgid "IPv4 Group Memberships\n"
- msgstr "IPv4 Group Memberships\n"
- 
--#: ../netstat.c:1709
-+#: ../netstat.c:1799
-+#, c-format
- msgid "Interface       RefCnt Group\n"
- msgstr "Interface       CntRef Grupo\n"
- 
--#: ../rarp.c:43
-+#: ../rarp.c:44
- msgid "This kernel does not support RARP.\n"
- msgstr "Este kernel não tem suporte a RARP.\n"
- 
--#: ../rarp.c:82
-+#: ../rarp.c:83
- #, c-format
- msgid "no RARP entry for %s.\n"
- msgstr "Sem entrada RARP para %s.\n"
- 
--#: ../rarp.c:95
-+#: ../rarp.c:96
- #, c-format
- msgid "%s: bad hardware address\n"
- msgstr "%s: endereço de hardware inválido\n"
- 
--#: ../rarp.c:127
-+#: ../rarp.c:128
- #, c-format
- msgid "rarp: cannot open file %s:%s.\n"
- msgstr "rarp: não foi possível abrir o arquivo %s:%s.\n"
- 
--#: ../rarp.c:139
-+#: ../rarp.c:140
- #, c-format
- msgid "rarp: format error at %s:%u\n"
- msgstr "rarp: erro de formato em %s:%u\n"
- 
--#: ../rarp.c:143 ../rarp.c:287
-+#: ../rarp.c:144 ../rarp.c:289
- #, c-format
- msgid "rarp: %s: unknown host\n"
- msgstr "rarp: %s: máquina desconhecida\n"
- 
--#: ../rarp.c:146
-+#: ../rarp.c:147
- #, c-format
- msgid "rarp: cannot set entry from %s:%u\n"
- msgstr "rarp: não é possível incluir uma entrada para %s:%u\n"
- 
--#: ../rarp.c:175
-+#: ../rarp.c:176
-+#, c-format
- msgid "Usage: rarp -a                               list entries in cache.\n"
- msgstr ""
- "Uso: rarp -a                                   lista entradas no cache\n"
- 
--#: ../rarp.c:176
-+#: ../rarp.c:177
-+#, c-format
- msgid "       rarp -d <hostname>                    delete entry from cache.\n"
--msgstr ""
--"     rarp -d máquina                           remove entrada do cache\n"
-+msgstr "     rarp -d máquina                           remove entrada do cache\n"
- 
--#: ../rarp.c:177
-+#: ../rarp.c:178
-+#, c-format
- msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
--msgstr ""
--"     rarp [-t tipo-hw] -s máquina endereço-hw  adiciona entrada ao cache\n"
-+msgstr "     rarp [-t tipo-hw] -s máquina endereço-hw  adiciona entrada ao cache\n"
- 
--#: ../rarp.c:178
-+#: ../rarp.c:179
-+#, c-format
- msgid ""
- "       rarp -f                               add entries from /etc/ethers.\n"
- msgstr ""
- "       rarp -f                               adiciona entradas a partir do\n"
- "                                             arquivo ethers.\n"
- 
--#: ../rarp.c:179
-+#: ../rarp.c:180
-+#, c-format
- msgid ""
- "       rarp -V                               display program version.\n"
- "\n"
--msgstr ""
--"     rarp -V                                   mostra versão do programa\n"
-+msgstr "     rarp -V                                   mostra versão do programa\n"
- 
--#: ../rarp.c:236
-+#: ../rarp.c:238
- #, c-format
- msgid "%s: illegal option mix.\n"
- msgstr "%s: mistura ilegal de opções.\n"
- 
--#: ../rarp.c:267
-+#: ../rarp.c:269
- #, c-format
- msgid "rarp: %s: unknown hardware type.\n"
- msgstr "rarp: %s: tipo desconhecido de hardware.\n"
- 
--#: ../route.c:79
-+#: ../route.c:80
-+#, c-format
- msgid ""
- "Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
- msgstr ""
--"Uso: route [-nNvee] [-FC] [famílias_de_endereços]  Lista as tabelas de "
--"rotea-\n"
-+"Uso: route [-nNvee] [-FC] [famílias_de_endereços]  Lista as tabelas de rotea-\n"
- "                                                   mento do kernel\n"
- 
--#: ../route.c:80
-+#: ../route.c:81
-+#, c-format
- msgid ""
- "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
- "\n"
-@@ -1298,35 +1259,42 @@
- "                                                   mento da família.\n"
- "\n"
- 
--#: ../route.c:82
-+#: ../route.c:83
-+#, c-format
- msgid ""
- "       route {-h|--help} [<AF>]              Detailed usage syntax for "
- "specified AF.\n"
- msgstr ""
--"       route {-h|--help} [família_de_endereços]    Sintaxe para a AF "
--"(Família\n"
--"                                                   de endereços) "
--"espeficicada.\n"
-+"       route {-h|--help} [família_de_endereços]    Sintaxe para a AF (Família\n"
-+"                                                   de endereços) espeficicada.\n"
- 
--#: ../route.c:83
-+#: ../route.c:84
-+#, c-format
- msgid ""
- "       route {-V|--version}                  Display version/author and "
- "exit.\n"
- "\n"
- msgstr ""
--"       route {-V|--version}                        Mostra a versão do "
--"comando\n"
-+"       route {-V|--version}                        Mostra a versão do comando\n"
- "                                                   e sai.\n"
- 
-+#: ../route.c:92
-+#, fuzzy, c-format
-+msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
-+msgstr "  <AF>=Use '-A <af>' ou [--<af>' Default: %s\n"
-+
- #: ../plipconfig.c:66
-+#, c-format
- msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
- msgstr "Uso: ifconfig [-a] [-i] [-v] interface\n"
- 
- #: ../plipconfig.c:67
-+#, c-format
- msgid "                  [nibble NN] [trigger NN]\n"
- msgstr "                [[família] endereço]\n"
- 
- #: ../plipconfig.c:68
-+#, c-format
- msgid "       plipconfig -V | --version\n"
- msgstr "       plipconfig -V | --version\n"
- 
-@@ -1335,25 +1303,29 @@
- msgid "%s\tnibble %lu  trigger %lu\n"
- msgstr "%s\tnibble %lu  trigger %lu\n"
- 
--#: ../iptunnel.c:79
-+#: ../iptunnel.c:85
-+#, c-format
- msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
- msgstr "Uso: iptunnel { add | change | del | show } [ NOME ]\n"
- 
--#: ../iptunnel.c:80
-+#: ../iptunnel.c:86
-+#, c-format
- msgid ""
- "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
--msgstr ""
--"          [ mode { ipip | gre | sit } ] [ remote END ] [ local END ]\n"
-+msgstr "          [ mode { ipip | gre | sit } ] [ remote END ] [ local END ]\n"
- 
--#: ../iptunnel.c:81
-+#: ../iptunnel.c:87
-+#, c-format
- msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
- msgstr "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
- 
--#: ../iptunnel.c:82
-+#: ../iptunnel.c:88
-+#, c-format
- msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
- msgstr "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev DISP_FÍSICO ]\n"
- 
--#: ../iptunnel.c:83
-+#: ../iptunnel.c:89
-+#, c-format
- msgid ""
- "       iptunnel -V | --version\n"
- "\n"
-@@ -1361,451 +1333,734 @@
- "       iptunnel -V | --version\n"
- "\n"
- 
--#: ../iptunnel.c:84
-+#: ../iptunnel.c:90
-+#, c-format
- msgid "Where: NAME := STRING\n"
- msgstr "Onde: NAME := STRING\n"
- 
--#: ../iptunnel.c:85
-+#: ../iptunnel.c:91
-+#, c-format
- msgid "       ADDR := { IP_ADDRESS | any }\n"
- msgstr "       END := { ENDEREÇO_IP | any }\n"
- 
--#: ../iptunnel.c:86
-+#: ../iptunnel.c:92
-+#, c-format
- msgid "       TOS  := { NUMBER | inherit }\n"
- msgstr "       TOS  := { NÚMERO | inherit }\n"
- 
--#: ../iptunnel.c:87
-+#: ../iptunnel.c:93
-+#, c-format
- msgid "       TTL  := { 1..255 | inherit }\n"
- msgstr "       TTL  := { 1..255 | inherit }\n"
- 
--#: ../iptunnel.c:88
-+#: ../iptunnel.c:94
-+#, c-format
- msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
- msgstr "       KEY  := { QUATRO_NÚMEROS_SEPARADOS_POR_PONTOS | NÚMERO }\n"
- 
--#: ../iptunnel.c:326
-+#: ../iptunnel.c:332
-+#, c-format
- msgid "Keys are not allowed with ipip and sit.\n"
- msgstr "Chaves não são permitidas com ipip e sit.\n"
- 
--#: ../iptunnel.c:346
-+#: ../iptunnel.c:352
-+#, c-format
- msgid "Broadcast tunnel requires a source address.\n"
- msgstr "Um túnel de broadcast precisa de um endereço de origem.\n"
- 
--#: ../iptunnel.c:361
-+#: ../iptunnel.c:367
-+#, c-format
- msgid "ttl != 0 and noptmudisc are incompatible\n"
- msgstr "ttl != 0 e noptmudisc são incompatíveis\n"
- 
--#: ../iptunnel.c:373
-+#: ../iptunnel.c:379
-+#, c-format
- msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
- msgstr "não foi possível determinar o modo do túnel (ip, gre ou sit)\n"
- 
--#: ../iptunnel.c:411
-+#: ../iptunnel.c:417
- #, c-format
- msgid "%s: %s/ip  remote %s  local %s "
- msgstr "%s: %s/ip  remoto %s  local %s "
- 
--#: ../iptunnel.c:415
-+#: ../iptunnel.c:421
- msgid "unknown"
- msgstr "Desconhecido"
- 
--#: ../iptunnel.c:447
-+#: ../iptunnel.c:453
-+#, c-format
- msgid "  Drop packets out of sequence.\n"
- msgstr "  Descarte pacotes fora de seqüência.\n"
- 
--#: ../iptunnel.c:449
-+#: ../iptunnel.c:455
-+#, c-format
- msgid "  Checksum in received packet is required.\n"
- msgstr "  É necessário checksum nos pacotes recebidos.\n"
- 
--#: ../iptunnel.c:451
-+#: ../iptunnel.c:457
-+#, c-format
- msgid "  Sequence packets on output.\n"
- msgstr "  Seqüencie pacotes na saída.\n"
- 
--#: ../iptunnel.c:453
-+#: ../iptunnel.c:459
-+#, c-format
- msgid "  Checksum output packets.\n"
- msgstr "  Calcule o checksum para pacotes de saída.\n"
- 
--#: ../iptunnel.c:481
-+#: ../iptunnel.c:487
-+#, c-format
- msgid "Wrong format of /proc/net/dev. Sorry.\n"
- msgstr "Formato errado de /proc/net/dev. Desculpe.\n"
- 
--#: ../iptunnel.c:494
-+#: ../iptunnel.c:500
- #, c-format
- msgid "Failed to get type of [%s]\n"
- msgstr "Não foi possível obter o tipo de [%s]\n"
- 
--#: ../iptunnel.c:510
-+#: ../iptunnel.c:516
-+#, c-format
- msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
- msgstr "RX: Pacotes    Bytes        Erros  CsunErrs ForaSeq  Mcasts\n"
- 
--#: ../iptunnel.c:513
-+#: ../iptunnel.c:519
-+#, c-format
- msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
- msgstr "TX: Pacotes    Bytes        Erros  DeadLoop SemRota  SemBufs\n"
- 
--#: ../statistics.c:45
-+#: ../statistics.c:47
- msgid "ICMP input histogram:"
- msgstr "Histograma de entrada ICMP:"
- 
--#: ../statistics.c:46
-+#: ../statistics.c:48
- msgid "ICMP output histogram:"
- msgstr "Histograma de saída ICMP"
- 
--#: ../statistics.c:63
-+#: ../statistics.c:65
- #, c-format
- msgid "Forwarding is %s"
- msgstr "Repassagem está %s"
- 
--#: ../statistics.c:64
--#, c-format
--msgid "Default TTL is %d"
-+#: ../statistics.c:66
-+#, fuzzy, c-format
-+msgid "Default TTL is %u"
- msgstr "Default TTL é %d"
- 
--#: ../statistics.c:65
--#, c-format
--msgid "%d total packets received"
-+#: ../statistics.c:67
-+#, fuzzy, c-format
-+msgid "%u total packets received"
- msgstr "%d total de pacotes recebidos"
- 
--#: ../statistics.c:66
--#, c-format
--msgid "%d with invalid headers"
-+#: ../statistics.c:68
-+#, fuzzy, c-format
-+msgid "%u with invalid headers"
- msgstr "%d com cabeçalhos inválidos"
- 
--#: ../statistics.c:67
--#, c-format
--msgid "%d with invalid addresses"
-+#: ../statistics.c:69
-+#, fuzzy, c-format
-+msgid "%u with invalid addresses"
- msgstr "%d com endereços inválidos"
- 
--#: ../statistics.c:68
--#, c-format
--msgid "%d forwarded"
-+#: ../statistics.c:70
-+#, fuzzy, c-format
-+msgid "%u forwarded"
- msgstr "%d repassados"
- 
--#: ../statistics.c:69
--#, c-format
--msgid "%d with unknown protocol"
-+#: ../statistics.c:71
-+#, fuzzy, c-format
-+msgid "%u with unknown protocol"
- msgstr "%d com protocolo desconhecido"
- 
--#: ../statistics.c:70
--#, c-format
--msgid "%d incoming packets discarded"
-+#: ../statistics.c:72
-+#, fuzzy, c-format
-+msgid "%u incoming packets discarded"
- msgstr "%d pacotes entrantes descartados"
- 
--#: ../statistics.c:71
--#, c-format
--msgid "%d incoming packets delivered"
-+#: ../statistics.c:73
-+#, fuzzy, c-format
-+msgid "%u incoming packets delivered"
- msgstr "%d pacotes entrantes despachados"
- 
--#: ../statistics.c:72
--#, c-format
--msgid "%d requests sent out"
-+#: ../statistics.c:74
-+#, fuzzy, c-format
-+msgid "%u requests sent out"
- msgstr "%d requisições enviadas"
- 
- #. ?
--#: ../statistics.c:73
--#, c-format
--msgid "%d outgoing packets dropped"
-+#: ../statistics.c:75
-+#, fuzzy, c-format
-+msgid "%u outgoing packets dropped"
- msgstr "%d pacotes saintes descartados"
- 
--#: ../statistics.c:74
--#, c-format
--msgid "%d dropped because of missing route"
-+#: ../statistics.c:76
-+#, fuzzy, c-format
-+msgid "%u dropped because of missing route"
- msgstr "%d descartados devido a falta de rota"
- 
--#: ../statistics.c:75
--#, c-format
--msgid "%d fragments dropped after timeout"
-+#: ../statistics.c:77
-+#, fuzzy, c-format
-+msgid "%u fragments dropped after timeout"
- msgstr "%d fragmentos descartados após estouro de tempo"
- 
--#: ../statistics.c:76
--#, c-format
--msgid "%d reassemblies required"
-+#: ../statistics.c:78
-+#, fuzzy, c-format
-+msgid "%u reassemblies required"
- msgstr "%d remontagens requeridas"
- 
- #. ?
--#: ../statistics.c:77
--#, c-format
--msgid "%d packets reassembled ok"
-+#: ../statistics.c:79
-+#, fuzzy, c-format
-+msgid "%u packets reassembled ok"
- msgstr "%d pacotes remontados sem problemas"
- 
--#: ../statistics.c:78
--#, c-format
--msgid "%d packet reassembles failed"
-+#: ../statistics.c:80
-+#, fuzzy, c-format
-+msgid "%u packet reassembles failed"
- msgstr "%d remontagens de pacotes falharam"
- 
--#: ../statistics.c:79
--#, c-format
--msgid "%d fragments received ok"
-+#: ../statistics.c:81
-+#, fuzzy, c-format
-+msgid "%u fragments received ok"
- msgstr "%d fragmentos recebidos sem problemas"
- 
--#: ../statistics.c:80
--#, c-format
--msgid "%d fragments failed"
-+#: ../statistics.c:82
-+#, fuzzy, c-format
-+msgid "%u fragments failed"
- msgstr "%d fragmentos falharam"
- 
--#: ../statistics.c:81
--#, c-format
--msgid "%d fragments created"
-+#: ../statistics.c:83
-+#, fuzzy, c-format
-+msgid "%u fragments created"
- msgstr "%d fragmentos criados"
- 
--#: ../statistics.c:86
--#, c-format
--msgid "%d ICMP messages received"
-+#: ../statistics.c:88
-+#, fuzzy, c-format
-+msgid "%u ICMP messages received"
- msgstr "%d mensagens ICMP recebidas"
- 
--#: ../statistics.c:87
--#, c-format
--msgid "%d input ICMP message failed."
-+#: ../statistics.c:89
-+#, fuzzy, c-format
-+msgid "%u input ICMP message failed."
- msgstr "%d mensagens ICMP entrantes falharam."
- 
--#: ../statistics.c:88 ../statistics.c:101
--#, c-format
--msgid "destination unreachable: %d"
-+#: ../statistics.c:90 ../statistics.c:103
-+#, fuzzy, c-format
-+msgid "destination unreachable: %u"
- msgstr "destino não alcançável: %d"
- 
--#: ../statistics.c:89
--#, c-format
--msgid "timeout in transit: %d"
-+#: ../statistics.c:91
-+#, fuzzy, c-format
-+msgid "timeout in transit: %u"
- msgstr "estouro de tempo em trânsito: %d"
- 
--#: ../statistics.c:90 ../statistics.c:103
--#, c-format
--msgid "wrong parameters: %d"
-+#: ../statistics.c:92 ../statistics.c:105
-+#, fuzzy, c-format
-+msgid "wrong parameters: %u"
- msgstr "parâmetros errados: %d"
- 
- #. ?
--#: ../statistics.c:91
--#, c-format
--msgid "source quenchs: %d"
-+#: ../statistics.c:93
-+#, fuzzy, c-format
-+msgid "source quenches: %u"
- msgstr "source quenchs: %d"
- 
--#: ../statistics.c:92
--#, c-format
--msgid "redirects: %d"
-+#: ../statistics.c:94
-+#, fuzzy, c-format
-+msgid "redirects: %u"
- msgstr "redireções: %d"
- 
--#: ../statistics.c:93
--#, c-format
--msgid "echo requests: %d"
-+#: ../statistics.c:95
-+#, fuzzy, c-format
-+msgid "echo requests: %u"
- msgstr "requisições de eco: %d"
- 
--#: ../statistics.c:94 ../statistics.c:107
--#, c-format
--msgid "echo replies: %d"
-+#: ../statistics.c:96 ../statistics.c:109
-+#, fuzzy, c-format
-+msgid "echo replies: %u"
- msgstr "respostas de eco: %d"
- 
--#: ../statistics.c:95
--#, c-format
--msgid "timestamp request: %d"
-+#: ../statistics.c:97
-+#, fuzzy, c-format
-+msgid "timestamp request: %u"
- msgstr "requisições de timestamp: %d"
- 
--#: ../statistics.c:96
--#, c-format
--msgid "timestamp reply: %d"
-+#: ../statistics.c:98
-+#, fuzzy, c-format
-+msgid "timestamp reply: %u"
- msgstr "respostas a timestamps: %d"
- 
--#: ../statistics.c:97
--#, c-format
--msgid "address mask request: %d"
-+#: ../statistics.c:99
-+#, fuzzy, c-format
-+msgid "address mask request: %u"
- msgstr "requisições de mascara de endereço: %d"
- 
- #. ?
--#: ../statistics.c:98
--msgid "address mask replies"
--msgstr "resposta a mascara de endereço"
-+#: ../statistics.c:100 ../statistics.c:113
-+#, fuzzy, c-format
-+msgid "address mask replies: %u"
-+msgstr "respostas a máscara de endereço: %d"
- 
- #. ?
--#: ../statistics.c:99
--#, c-format
--msgid "%d ICMP messages sent"
-+#: ../statistics.c:101
-+#, fuzzy, c-format
-+msgid "%u ICMP messages sent"
- msgstr "%d mensagens ICMP enviadas"
- 
--#: ../statistics.c:100
--#, c-format
--msgid "%d ICMP messages failed"
-+#: ../statistics.c:102
-+#, fuzzy, c-format
-+msgid "%u ICMP messages failed"
- msgstr "%d mensagens ICMP falharam"
- 
--#: ../statistics.c:102
--#, c-format
--msgid "time exceeded: %d"
-+#: ../statistics.c:104
-+#, fuzzy, c-format
-+msgid "time exceeded: %u"
- msgstr "tempo excedido: %d"
- 
- #. ?
--#: ../statistics.c:104
--#, c-format
--msgid "source quench: %d"
-+#: ../statistics.c:106
-+#, fuzzy, c-format
-+msgid "source quench: %u"
- msgstr "source quench: %d"
- 
--#: ../statistics.c:105
--#, c-format
--msgid "redirect: %d"
-+#: ../statistics.c:107
-+#, fuzzy, c-format
-+msgid "redirect: %u"
- msgstr "redireções: %d"
- 
--#: ../statistics.c:106
--#, c-format
--msgid "echo request: %d"
-+#: ../statistics.c:108
-+#, fuzzy, c-format
-+msgid "echo request: %u"
- msgstr "requisições de eco: %d"
- 
--#: ../statistics.c:108
--#, c-format
--msgid "timestamp requests: %d"
-+#: ../statistics.c:110
-+#, fuzzy, c-format
-+msgid "timestamp requests: %u"
- msgstr "requisições de timestamp: %d"
- 
--#: ../statistics.c:109
--#, c-format
--msgid "timestamp replies: %d"
-+#: ../statistics.c:111
-+#, fuzzy, c-format
-+msgid "timestamp replies: %u"
- msgstr "respostas a timestamp: %d"
- 
--#: ../statistics.c:110
--#, c-format
--msgid "address mask requests: %d"
-+#: ../statistics.c:112
-+#, fuzzy, c-format
-+msgid "address mask requests: %u"
- msgstr "requisições de máscara de endereço: %d"
- 
--#: ../statistics.c:111
--#, c-format
--msgid "address mask replies: %d"
--msgstr "respostas a máscara de endereço: %d"
--
--#: ../statistics.c:116
-+#: ../statistics.c:118
- #, c-format
- msgid "RTO algorithm is %s"
- msgstr "Algorítmo RTO é %s"
- 
--#: ../statistics.c:120
--#, c-format
--msgid "%d active connections openings"
-+#: ../statistics.c:122
-+#, fuzzy, c-format
-+msgid "%u active connections openings"
- msgstr "%d tentativas de conexão falharam"
- 
--#: ../statistics.c:121
--#, c-format
--msgid "%d passive connection openings"
-+#: ../statistics.c:123
-+#, fuzzy, c-format
-+msgid "%u passive connection openings"
- msgstr "%d opens passivos"
- 
--#: ../statistics.c:122
--#, c-format
--msgid "%d failed connection attempts"
-+#: ../statistics.c:124
-+#, fuzzy, c-format
-+msgid "%u failed connection attempts"
- msgstr "%d tentativas de conexão falharam"
- 
--#: ../statistics.c:123
--#, c-format
--msgid "%d connection resets received"
-+#: ../statistics.c:125
-+#, fuzzy, c-format
-+msgid "%u connection resets received"
- msgstr "%d resets de conexão recebidas"
- 
--#: ../statistics.c:124
--#, c-format
--msgid "%d connections established"
-+#: ../statistics.c:126
-+#, fuzzy, c-format
-+msgid "%u connections established"
- msgstr "%d conexões estabelecidas"
- 
--#: ../statistics.c:125
--#, c-format
--msgid "%d segments received"
-+#: ../statistics.c:127
-+#, fuzzy, c-format
-+msgid "%u segments received"
- msgstr "%d segmentos recebidos"
- 
--#: ../statistics.c:126
--#, c-format
--msgid "%d segments send out"
-+#: ../statistics.c:128
-+#, fuzzy, c-format
-+msgid "%u segments send out"
- msgstr "%d segmentos enviados"
- 
--#: ../statistics.c:127
--#, c-format
--msgid "%d segments retransmited"
-+#: ../statistics.c:129
-+#, fuzzy, c-format
-+msgid "%u segments retransmited"
- msgstr "%d segmentos retransmitidos"
- 
--#: ../statistics.c:128
--#, c-format
--msgid "%d bad segments received."
-+#: ../statistics.c:130
-+#, fuzzy, c-format
-+msgid "%u bad segments received."
- msgstr "%d segmentos ruins recebidos."
- 
--#: ../statistics.c:129
--#, c-format
--msgid "%d resets sent"
-+#: ../statistics.c:131
-+#, fuzzy, c-format
-+msgid "%u resets sent"
- msgstr "%d resets enviados"
- 
--#: ../statistics.c:134
--#, c-format
--msgid "%d packets received"
-+#: ../statistics.c:136
-+#, fuzzy, c-format
-+msgid "%u packets received"
- msgstr "%d pacotes recebidos"
- 
--#: ../statistics.c:135
--#, c-format
--msgid "%d packets to unknown port received."
-+#: ../statistics.c:137
-+#, fuzzy, c-format
-+msgid "%u packets to unknown port received."
- msgstr "%d pacotes para portas desconhecidas recebidos."
- 
--#: ../statistics.c:136
--#, c-format
--msgid "%d packet receive errors"
-+#: ../statistics.c:138
-+#, fuzzy, c-format
-+msgid "%u packet receive errors"
- msgstr "%d erros de recepção de pacotes"
- 
--#: ../statistics.c:137
--#, c-format
--msgid "%d packets sent"
-+#: ../statistics.c:139
-+#, fuzzy, c-format
-+msgid "%u packets sent"
- msgstr "%d pacotes enviados"
- 
--#: ../statistics.c:142
-+#: ../statistics.c:144
-+#, fuzzy, c-format
-+msgid "%u SYN cookies sent"
-+msgstr "%d pacotes enviados"
-+
-+#: ../statistics.c:145
-+#, fuzzy, c-format
-+msgid "%u SYN cookies received"
-+msgstr "%d pacotes recebidos"
-+
-+#: ../statistics.c:146
-+#, fuzzy, c-format
-+msgid "%u invalid SYN cookies received"
-+msgstr "%d pacotes recebidos"
-+
-+#: ../statistics.c:148
-+#, fuzzy, c-format
-+msgid "%u resets received for embryonic SYN_RECV sockets"
-+msgstr "%d resets recebidos para sockets embriônicos SYN_RECV"
-+
-+#: ../statistics.c:150
-+#, fuzzy, c-format
-+msgid "%u packets pruned from receive queue because of socket buffer overrun"
-+msgstr "%d pacotes retirados da fila de recepção devido a sobreposição de buffers de sockets"
-+
-+#. obsolete: 2.2.0 doesn't do that anymore
-+#: ../statistics.c:153
-+#, fuzzy, c-format
-+msgid "%u packets pruned from receive queue"
-+msgstr "%d pacotes retirados da fila de fora de ordem (out-of-order)"
-+
-+#: ../statistics.c:154
-+#, fuzzy, c-format
-+msgid ""
-+"%u packets dropped from out-of-order queue because of socket buffer overrun"
-+msgstr "%d pacotes descartados da fila de fora de ordem devido a sobreposição de buffers de sockets"
-+
-+#: ../statistics.c:156
-+#, fuzzy, c-format
-+msgid "%u ICMP packets dropped because they were out-of-window"
-+msgstr "%d pacotes ICMP descartados porque estavam fora da janela"
-+
-+#: ../statistics.c:158
-+#, fuzzy, c-format
-+msgid "%u ICMP packets dropped because socket was locked"
-+msgstr "%d pacotes ICMP descartadas porque o socket estava bloqueado"
-+
-+#: ../statistics.c:160
-+#, c-format
-+msgid "%u TCP sockets finished time wait in fast timer"
-+msgstr ""
-+
-+#: ../statistics.c:161
-+#, c-format
-+msgid "%u time wait sockets recycled by time stamp"
-+msgstr ""
-+
-+#: ../statistics.c:162
-+#, c-format
-+msgid "%u TCP sockets finished time wait in slow timer"
-+msgstr ""
-+
-+#: ../statistics.c:163
-+#, c-format
-+msgid "%u passive connections rejected because of time stamp"
-+msgstr ""
-+
-+#: ../statistics.c:165
-+#, c-format
-+msgid "%u active connections rejected because of time stamp"
-+msgstr ""
-+
-+#: ../statistics.c:167
- #, c-format
--msgid "%d SYN cookies sent"
-+msgid "%u packets rejects in established connections because of timestamp"
-+msgstr ""
-+
-+#: ../statistics.c:169
-+#, fuzzy, c-format
-+msgid "%u delayed acks sent"
- msgstr "%d pacotes enviados"
- 
--#: ../statistics.c:143
-+#: ../statistics.c:170
- #, c-format
--msgid "%d SYN cookies received"
--msgstr "%d pacotes recebidos"
-+msgid "%u delayed acks further delayed because of locked socket"
-+msgstr ""
- 
--#: ../statistics.c:144
-+#: ../statistics.c:172
- #, c-format
--msgid "%d invalid SYN cookies received"
--msgstr "%d pacotes recebidos"
-+msgid "Quick ack mode was activated %u times"
-+msgstr ""
- 
--#: ../statistics.c:146
-+#: ../statistics.c:173
- #, c-format
--msgid "%d resets received for embryonic SYN_RECV sockets"
--msgstr "%d resets recebidos para sockets embriônicos SYN_RECV"
-+msgid "%u times the listen queue of a socket overflowed"
-+msgstr ""
- 
--#: ../statistics.c:148
-+#: ../statistics.c:175
- #, c-format
--msgid "%d packets pruned from receive queue because of socket buffer overrun"
-+msgid "%u SYNs to LISTEN sockets ignored"
- msgstr ""
--"%d pacotes retirados da fila de recepção devido a sobreposição de buffers de "
--"sockets"
- 
--#. obsolete: 2.2.0 doesn't do that anymore
--#: ../statistics.c:151
-+#: ../statistics.c:176
-+#, c-format
-+msgid "%u packets directly queued to recvmsg prequeue."
-+msgstr ""
-+
-+#: ../statistics.c:178
- #, c-format
--msgid "%d packets pruned from out-of-order queue"
-+msgid "%u of bytes directly received from backlog"
-+msgstr ""
-+
-+#: ../statistics.c:180
-+#, c-format
-+msgid "%u of bytes directly received from prequeue"
-+msgstr ""
-+
-+#: ../statistics.c:182
-+#, fuzzy, c-format
-+msgid "%u packets dropped from prequeue"
- msgstr "%d pacotes retirados da fila de fora de ordem (out-of-order)"
- 
--#: ../statistics.c:152
-+#: ../statistics.c:183
-+#, fuzzy, c-format
-+msgid "%u packet headers predicted"
-+msgstr "%d pacotes recebidos"
-+
-+#: ../statistics.c:184
- #, c-format
--msgid ""
--"%d packets dropped from out-of-order queue because of socket buffer overrun"
-+msgid "%u packets header predicted and directly queued to user"
- msgstr ""
--"%d pacotes descartados da fila de fora de ordem devido a sobreposição de "
--"buffers de sockets"
- 
--#: ../statistics.c:154
-+#: ../statistics.c:186
- #, c-format
--msgid "%d ICMP packets dropped because they were out-of-window"
--msgstr "%d pacotes ICMP descartados porque estavam fora da janela"
-+msgid "Ran %u times out of system memory during packet sending"
-+msgstr ""
- 
--#: ../statistics.c:156
-+#: ../statistics.c:188
-+#, fuzzy, c-format
-+msgid "%u acknowledgments not containing data received"
-+msgstr "%d pacotes para portas desconhecidas recebidos."
-+
-+#: ../statistics.c:189
- #, c-format
--msgid "%d ICMP packets dropped because socket was locked"
--msgstr "%d pacotes ICMP descartadas porque o socket estava bloqueado"
-+msgid "%u predicted acknowledgments"
-+msgstr ""
-+
-+#: ../statistics.c:190
-+#, c-format
-+msgid "%u times recovered from packet loss due to fast retransmit"
-+msgstr ""
-+
-+#: ../statistics.c:191
-+#, c-format
-+msgid "%u times recovered from packet loss due to SACK data"
-+msgstr ""
-+
-+#: ../statistics.c:192
-+#, fuzzy, c-format
-+msgid "%u bad SACKs received"
-+msgstr "%d segmentos ruins recebidos."
-+
-+#: ../statistics.c:193
-+#, c-format
-+msgid "Detected reordering %u times using FACK"
-+msgstr ""
-+
-+#: ../statistics.c:194
-+#, c-format
-+msgid "Detected reordering %u times using SACK"
-+msgstr ""
-+
-+#: ../statistics.c:195
-+#, c-format
-+msgid "Detected reordering %u times using time stamp"
-+msgstr ""
-+
-+#: ../statistics.c:196
-+#, c-format
-+msgid "Detected reordering %u times using reno fast retransmit"
-+msgstr ""
-+
-+#: ../statistics.c:197
-+#, c-format
-+msgid "%u congestion windows fully recovered"
-+msgstr ""
-+
-+#: ../statistics.c:198
-+#, c-format
-+msgid "%u congestion windows partially recovered using Hoe heuristic"
-+msgstr ""
-+
-+#: ../statistics.c:199
-+#, c-format
-+msgid "%u congestion window recovered using DSACK"
-+msgstr ""
-+
-+#: ../statistics.c:200
-+#, c-format
-+msgid "%u congestion windows recovered after partial ack"
-+msgstr ""
-+
-+#: ../statistics.c:201
-+#, fuzzy, c-format
-+msgid "%u retransmits lost"
-+msgstr "%d resets enviados"
-+
-+#: ../statistics.c:202
-+#, c-format
-+msgid "%u timeouts after reno fast retransmit"
-+msgstr ""
-+
-+#: ../statistics.c:203
-+#, c-format
-+msgid "%u timeouts after SACK recovery"
-+msgstr ""
-+
-+#: ../statistics.c:204
-+#, c-format
-+msgid "%u timeouts in loss state"
-+msgstr ""
-+
-+#: ../statistics.c:205
-+#, fuzzy, c-format
-+msgid "%u fast retransmits"
-+msgstr "%d segmentos retransmitidos"
-+
-+#: ../statistics.c:206
-+#, c-format
-+msgid "%u forward retransmits"
-+msgstr ""
-+
-+#: ../statistics.c:207
-+#, c-format
-+msgid "%u retransmits in slow start"
-+msgstr ""
-+
-+#: ../statistics.c:208
-+#, c-format
-+msgid "%u other TCP timeouts"
-+msgstr ""
-+
-+#: ../statistics.c:209
-+#, fuzzy, c-format
-+msgid "%u reno fast retransmits failed"
-+msgstr "%d segmentos retransmitidos"
-+
-+#: ../statistics.c:210
-+#, fuzzy, c-format
-+msgid "%u sack retransmits failed"
-+msgstr "%d remontagens de pacotes falharam"
-+
-+#: ../statistics.c:211
-+#, c-format
-+msgid "%u times receiver scheduled too late for direct processing"
-+msgstr ""
-+
-+#: ../statistics.c:212
-+#, fuzzy, c-format
-+msgid "%u packets collapsed in receive queue due to low socket buffer"
-+msgstr "%d pacotes retirados da fila de recepção devido a sobreposição de buffers de sockets"
-+
-+#: ../statistics.c:213
-+#, c-format
-+msgid "%u DSACKs sent for old packets"
-+msgstr ""
-+
-+#: ../statistics.c:214
-+#, c-format
-+msgid "%u DSACKs sent for out of order packets"
-+msgstr ""
-+
-+#: ../statistics.c:215
-+#, fuzzy, c-format
-+msgid "%u DSACKs received"
-+msgstr "%d pacotes recebidos"
-+
-+#: ../statistics.c:216
-+#, fuzzy, c-format
-+msgid "%u DSACKs for out of order packets received"
-+msgstr "%d total de pacotes recebidos"
-+
-+#: ../statistics.c:217
-+#, fuzzy, c-format
-+msgid "%u connections reset due to unexpected SYN"
-+msgstr "%d resets de conexão recebidas"
-+
-+#: ../statistics.c:218
-+#, fuzzy, c-format
-+msgid "%u connections reset due to unexpected data"
-+msgstr "%d resets de conexão recebidas"
-+
-+#: ../statistics.c:219
-+#, fuzzy, c-format
-+msgid "%u connections reset due to early user close"
-+msgstr "%d resets de conexão recebidas"
-+
-+#: ../statistics.c:220
-+#, c-format
-+msgid "%u connections aborted due to memory pressure"
-+msgstr ""
-+
-+#: ../statistics.c:221
-+#, fuzzy, c-format
-+msgid "%u connections aborted due to timeout"
-+msgstr "%d resets de conexão recebidas"
- 
- #: ../statistics.c:222
-+#, c-format
-+msgid "%u connections aborted after user close in linger timeout"
-+msgstr ""
-+
-+#: ../statistics.c:223
-+#, c-format
-+msgid "%u times unabled to send RST due to no memory"
-+msgstr ""
-+
-+#: ../statistics.c:224
-+#, c-format
-+msgid "TCP ran low on memory %u times"
-+msgstr ""
-+
-+#: ../statistics.c:225
-+#, c-format
-+msgid "%u TCP data loss events"
-+msgstr ""
-+
-+#: ../statistics.c:292
- msgid "enabled"
- msgstr "habilitado"
- 
--#: ../statistics.c:222
-+#: ../statistics.c:292
- msgid "disabled"
- msgstr "desabilitado"
- 
--#: ../statistics.c:272
--#, c-format
--msgid "unknown title %s\n"
--msgstr "título %s desconhecido\n"
--
--#: ../statistics.c:298
-+#: ../statistics.c:375
- msgid "error parsing /proc/net/snmp"
- msgstr "erro lendo /proc/net/snmp"
- 
--#: ../statistics.c:311
-+#: ../statistics.c:388
- msgid "cannot open /proc/net/snmp"
- msgstr "não foi possível abrir /proc/net/snmp"
- 
-@@ -1819,89 +2074,95 @@
- msgid "Cannot change line discipline to `%s'.\n"
- msgstr "Não foi possível mudar a disciplina da linha para `%s'.\n"
- 
--#: ../lib/af.c:145 ../lib/hw.c:148
-+#: ../lib/af.c:153 ../lib/hw.c:161
- msgid "UNSPEC"
- msgstr "Não Especificado"
- 
--#: ../lib/af.c:147
-+#: ../lib/af.c:155
- msgid "UNIX Domain"
- msgstr "UNIX Domain"
- 
--#: ../lib/af.c:150
-+#: ../lib/af.c:158
- msgid "DARPA Internet"
- msgstr "DARPA Internet"
- 
--#: ../lib/af.c:153
-+#: ../lib/af.c:161
- msgid "IPv6"
- msgstr "IPv6"
- 
--#: ../lib/af.c:156 ../lib/hw.c:169
-+#: ../lib/af.c:164 ../lib/hw.c:182
- msgid "AMPR AX.25"
- msgstr "AX.25 AMPR"
- 
--#: ../lib/af.c:159 ../lib/hw.c:175
-+#: ../lib/af.c:167 ../lib/hw.c:188
- msgid "AMPR NET/ROM"
- msgstr "NET/ROM AMPR"
- 
--#: ../lib/af.c:162
-+#: ../lib/af.c:170
- msgid "Novell IPX"
- msgstr "Novell IPX"
- 
--#: ../lib/af.c:165
-+#: ../lib/af.c:173
- msgid "Appletalk DDP"
- msgstr "Appletalk DDP"
- 
--#: ../lib/af.c:168 ../lib/hw.c:207
-+#: ../lib/af.c:176 ../lib/hw.c:223
- msgid "Econet"
- msgstr "Econet"
- 
--#: ../lib/af.c:171 ../lib/hw.c:172
-+#: ../lib/af.c:179
-+msgid "CCITT X.25"
-+msgstr ""
-+
-+#: ../lib/af.c:182 ../lib/hw.c:185
- msgid "AMPR ROSE"
- msgstr "AMPR ROSE"
- 
--#: ../lib/af.c:174 ../lib/hw.c:160
-+#: ../lib/af.c:185 ../lib/hw.c:173
- msgid "Ash"
- msgstr "Ash"
- 
--#: ../lib/af.c:232
-+#: ../lib/af.c:243
-+#, c-format
- msgid "Please don't supply more than one address family.\n"
- msgstr "Por favor não especifique mais que uma família de endereços.\n"
- 
--#: ../lib/af.c:293
-+#: ../lib/af.c:304
-+#, c-format
- msgid "Too much address family arguments.\n"
- msgstr "Excesso no número de famílias de endereços.\n"
- 
--#: ../lib/af.c:304
-+#: ../lib/af.c:315
- #, c-format
- msgid "Unknown address family `%s'.\n"
- msgstr "Família de endereços `%s' desconhecida.\n"
- 
--#: ../lib/arcnet.c:53 ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52
--#: ../lib/fddi.c:67 ../lib/hippi.c:68 ../lib/inet.c:244 ../lib/inet.c:259
--#: ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ../lib/rose.c:71
--#: ../lib/rose.c:126 ../lib/unix.c:56 ../lib/unix.c:76
--msgid "[NONE SET]"
--msgstr "[Nenhum configurado]"
--
--#: ../lib/arcnet.c:81 ../lib/arcnet.c:96
-+#: ../lib/arcnet.c:70 ../lib/arcnet.c:85
- #, c-format
- msgid "in_arcnet(%s): invalid arcnet address!\n"
- msgstr "in_arcnet(%s): endereço arcnet inválido!\n"
- 
--#: ../lib/arcnet.c:108
-+#: ../lib/arcnet.c:97
- #, c-format
- msgid "in_arcnet(%s): trailing : ignored!\n"
- msgstr "in_arcnet(%s): trailing : ignorado!\n"
- 
--#: ../lib/arcnet.c:120
-+#: ../lib/arcnet.c:109
- #, c-format
- msgid "in_arcnet(%s): trailing junk!\n"
- msgstr "in_arcnet(%s): lixo no trailing!\n"
- 
- #: ../lib/ash.c:81
-+#, c-format
- msgid "Malformed Ash address"
- msgstr "Endereço Ash mal formado"
- 
-+#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244
-+#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78
-+#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76
-+msgid "[NONE SET]"
-+msgstr "[Nenhum configurado]"
-+
- #: ../lib/ax25.c:97 ../lib/netrom.c:100
- msgid "Invalid callsign"
- msgstr "Callsign inválido"
-@@ -1911,22 +2172,21 @@
- msgstr "Callsign muito longo"
- 
- #: ../lib/ax25_gr.c:47
-+#, c-format
- msgid "AX.25 not configured in this system.\n"
- msgstr "O AX.25 não foi configurado neste sistema.\n"
- 
- #: ../lib/ax25_gr.c:50
-+#, c-format
- msgid "Kernel AX.25 routing table\n"
- msgstr "Tabela de roteamento AX.25 do kernel\n"
- 
- #. xxx
- #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
-+#, c-format
- msgid "Destination  Iface    Use\n"
- msgstr "Destino      Iface    Uso\n"
- 
--#: ../lib/ddp_gr.c:21
--msgid "Routing table for `ddp' not yet supported.\n"
--msgstr "Tabela de roteamento para `ddp' ainda não suportada.\n"
--
- #: ../lib/ether.c:74 ../lib/ether.c:91
- #, c-format
- msgid "in_ether(%s): invalid ether address!\n"
-@@ -1942,253 +2202,268 @@
- msgid "in_ether(%s): trailing junk!\n"
- msgstr "in_ether(%s): lixo no trailing!\n"
- 
--#: ../lib/fddi.c:95 ../lib/fddi.c:110
-+#: ../lib/fddi.c:84 ../lib/fddi.c:99
- #, c-format
- msgid "in_fddi(%s): invalid fddi address!\n"
- msgstr "in_fddi(%S): endereço fddi inválido!\n"
- 
--#: ../lib/fddi.c:122
-+#: ../lib/fddi.c:111
- #, c-format
- msgid "in_fddi(%s): trailing : ignored!\n"
- msgstr "in_fddi(%s): trailing : ignorado!\n"
- 
--#: ../lib/fddi.c:134
-+#: ../lib/fddi.c:123
- #, c-format
- msgid "in_fddi(%s): trailing junk!\n"
- msgstr "in_fddi(%s): lixo no trailing!\n"
- 
--#: ../lib/getroute.c:97 ../lib/setroute.c:76
-+#: ../lib/getroute.c:101 ../lib/setroute.c:80
- #, c-format
- msgid "Address family `%s' not supported.\n"
- msgstr "Família de endereços `%s' não suportada.\n"
- 
--#: ../lib/getroute.c:103 ../lib/setroute.c:80
-+#: ../lib/getroute.c:107 ../lib/setroute.c:84
- #, c-format
- msgid "No routing for address family `%s'.\n"
- msgstr "Nenhum roteamento para a família `%s'\n"
- 
--#: ../lib/hippi.c:96 ../lib/hippi.c:111
-+#: ../lib/hippi.c:84 ../lib/hippi.c:99
- #, c-format
- msgid "in_hippi(%s): invalid hippi address!\n"
- msgstr "in_fddi(%S): endereço fddi inválido!\n"
- 
--#: ../lib/hippi.c:123
-+#: ../lib/hippi.c:111
- #, c-format
- msgid "in_hippi(%s): trailing : ignored!\n"
- msgstr "in_fddi(%s): trailing : ignorado!\n"
- 
--#: ../lib/hippi.c:134
-+#: ../lib/hippi.c:122
- #, c-format
- msgid "in_hippi(%s): trailing junk!\n"
- msgstr "in_fddi(%s): lixo no trailing!\n"
- 
--#: ../lib/hw.c:147
-+#: ../lib/hw.c:160
- msgid "Local Loopback"
- msgstr "Loopback Local"
- 
--#: ../lib/hw.c:150
-+#: ../lib/hw.c:163
- msgid "Serial Line IP"
- msgstr "SLIP"
- 
--#: ../lib/hw.c:151
-+#: ../lib/hw.c:164
- msgid "VJ Serial Line IP"
- msgstr "SLIP VJ"
- 
--#: ../lib/hw.c:152
-+#: ../lib/hw.c:165
- msgid "6-bit Serial Line IP"
- msgstr "SLIP 6 bits"
- 
--#: ../lib/hw.c:153
-+#: ../lib/hw.c:166
- msgid "VJ 6-bit Serial Line IP"
- msgstr "SLIP VJ 6 bits"
- 
--#: ../lib/hw.c:154
-+#: ../lib/hw.c:167
- msgid "Adaptive Serial Line IP"
- msgstr "SLIP Adaptativo"
- 
--#: ../lib/hw.c:157
-+#: ../lib/hw.c:170
- msgid "Ethernet"
- msgstr "Ethernet"
- 
--#: ../lib/hw.c:163
-+#: ../lib/hw.c:176
- msgid "Fiber Distributed Data Interface"
- msgstr "FDDI - Fibra Ótica"
- 
--#: ../lib/hw.c:166
-+#: ../lib/hw.c:179
- msgid "HIPPI"
- msgstr "HIPPI"
- 
--#: ../lib/hw.c:178
-+#: ../lib/hw.c:191
-+msgid "generic X.25"
-+msgstr ""
-+
-+#: ../lib/hw.c:194
- msgid "IPIP Tunnel"
- msgstr "Túnel IPIP"
- 
--#: ../lib/hw.c:181
-+#: ../lib/hw.c:197
- msgid "Point-to-Point Protocol"
- msgstr "Protocolo Ponto-a-Ponto"
- 
--#: ../lib/hw.c:184
-+#: ../lib/hw.c:200
- msgid "(Cisco)-HDLC"
- msgstr "(Cisco)-HDLC"
- 
--#: ../lib/hw.c:185
-+#: ../lib/hw.c:201
- msgid "LAPB"
- msgstr "LAPB"
- 
--#: ../lib/hw.c:188
-+#: ../lib/hw.c:204
- msgid "ARCnet"
- msgstr "ARCnet"
- 
--#: ../lib/hw.c:191
-+#: ../lib/hw.c:207
- msgid "Frame Relay DLCI"
- msgstr "Frame Relay DLCI"
- 
--#: ../lib/hw.c:192
-+#: ../lib/hw.c:208
- msgid "Frame Relay Access Device"
- msgstr "FRAD - Dispositivo de Acesso a Frame Relay"
- 
--#: ../lib/hw.c:195
-+#: ../lib/hw.c:211
- msgid "IPv6-in-IPv4"
- msgstr "IPv6 sobre IPv4"
- 
--#: ../lib/hw.c:198
-+#: ../lib/hw.c:214
- msgid "IrLAP"
- msgstr "IrLAP"
- 
--#: ../lib/hw.c:201
-+#: ../lib/hw.c:217
- msgid "16/4 Mbps Token Ring"
- msgstr "16/4 Mbps Token Ring"
- 
--#: ../lib/hw.c:203
-+#: ../lib/hw.c:219
- msgid "16/4 Mbps Token Ring (New)"
- msgstr "16/4 Mbps Token Ring (Novo)"
- 
-+#: ../lib/hw.c:226
-+msgid "Generic EUI-64"
-+msgstr ""
-+
- #: ../lib/inet.c:153 ../lib/inet6.c:79
- #, c-format
- msgid "rresolve: unsupport address family %d !\n"
- msgstr "rresolve: família de endereços %d não suportada!\n"
- 
--#: ../lib/inet6_gr.c:79
-+#: ../lib/inet6.c:131
-+#, fuzzy
-+msgid "[UNKNOWN]"
-+msgstr "DESCONHECIDA"
-+
-+#: ../lib/inet6_gr.c:71
-+#, c-format
- msgid "INET6 (IPv6) not configured in this system.\n"
- msgstr "NET/ROM não configurado neste sistema.\n"
- 
--#: ../lib/inet6_gr.c:82
-+#: ../lib/inet6_gr.c:74
-+#, c-format
- msgid "Kernel IPv6 routing table\n"
- msgstr "Tabela de Roteamento IPv6 do Kernel\n"
- 
--#: ../lib/inet6_gr.c:84
-+#: ../lib/inet6_gr.c:76
-+#, c-format
- msgid ""
--"Destination                                 Next Hop                         "
--"       Flags Metric Ref    Use Iface\n"
--msgstr ""
--"Destino                                     Próximo \"Hop\"                  "
--"        Opções Métrica Ref   Uso Iface\n"
-+"Destination                                 Next "
-+"Hop                                Flags Metric Ref    Use Iface\n"
-+msgstr "Destino                                     Próximo \"Hop\"                          Opções Métrica Ref   Uso Iface\n"
- 
--#: ../lib/inet6_gr.c:158
-+#: ../lib/inet6_gr.c:150
-+#, c-format
- msgid "Kernel IPv6 Neighbour Cache\n"
- msgstr "Cache de Vizinhos IPv6 do Kernel\n"
- 
--#: ../lib/inet6_gr.c:161
-+#: ../lib/inet6_gr.c:153
-+#, c-format
- msgid ""
- "Neighbour                                   HW Address        Iface    Flags "
- "Ref State\n"
--msgstr ""
--"Vizinho                                     Endereço HW       Iface   Opções "
--"Estado Ref\n"
-+msgstr "Vizinho                                     Endereço HW       Iface   Opções Estado Ref\n"
- 
--#: ../lib/inet6_gr.c:165
-+#: ../lib/inet6_gr.c:157
-+#, c-format
- msgid ""
- "Neighbour                                   HW Address        Iface    Flags "
- "Ref State            Stale(sec) Delete(sec)\n"
- msgstr ""
--"Vizinho                                     Endereço HW       Iface   Opções "
--"Estado Ref\n"
-+"Vizinho                                     Endereço HW       Iface   Opções Estado Ref\n"
- "       Parado(seg) Remover(seg)\n"
- 
- #: ../lib/inet6_sr.c:46
-+#, c-format
- msgid "Usage: inet6_route [-vF] del Target\n"
- msgstr "Uso: inet6_route [-vF] del Destino\n"
- 
- #: ../lib/inet6_sr.c:47
-+#, c-format
- msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
- msgstr "       inet6_route [-vF] add Destino [gw Gw] [metric M] [[dev] If]\n"
- 
- #: ../lib/inet6_sr.c:48
-+#, c-format
- msgid "       inet6_route [-FC] flush      NOT supported\n"
- msgstr "       inet6_route [-FC] flush      NÃO suportado\n"
- 
--#: ../lib/inet6_sr.c:182
-+#: ../lib/inet6_sr.c:188
-+#, c-format
- msgid "Flushing `inet6' routing table not supported\n"
- msgstr "Limpeza da tabela de roteamento `inet6' não é suportada\n"
- 
- #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
-+#, c-format
- msgid "INET (IPv4) not configured in this system.\n"
- msgstr "NET/ROM não configurado neste sistema.\n"
- 
- #: ../lib/inet_gr.c:53
-+#, c-format
- msgid "Kernel IP routing table\n"
- msgstr "Tabela de Roteamento IP do Kernel\n"
- 
- #: ../lib/inet_gr.c:56
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags Metric Ref    Use "
- "Iface\n"
--msgstr ""
--"Destino         Roteador        MáscaraGen.    Opções Métrica Ref   Uso "
--"Iface\n"
-+msgstr "Destino         Roteador        MáscaraGen.    Opções Métrica Ref   Uso Iface\n"
- 
- #: ../lib/inet_gr.c:59
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags   MSS Window  irtt "
- "Iface\n"
--msgstr ""
--"Destino         Roteador        MáscaraGen.    Opções   MSS Janela  irtt "
--"Iface\n"
-+msgstr "Destino         Roteador        MáscaraGen.    Opções   MSS Janela  irtt Iface\n"
- 
- #: ../lib/inet_gr.c:62
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt\n"
--msgstr ""
--"Destino         Roteador        MáscaraGen     Opções Métrica Ref   Uso "
--"Iface    MSS   Janela irtt\n"
-+msgstr "Destino         Roteador        MáscaraGen     Opções Métrica Ref   Uso Iface    MSS   Janela irtt\n"
- 
- #: ../lib/inet_gr.c:237
-+#, c-format
- msgid "Kernel IP routing cache\n"
- msgstr "Tabela de Roteamento IP do Kernel\n"
- 
- #: ../lib/inet_gr.c:258
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface\n"
--msgstr ""
--"Destino         Roteador        MáscaraGen.    Opções Métrica Ref   Uso "
--"Iface\n"
-+msgstr "Destino         Roteador        MáscaraGen.    Opções Métrica Ref   Uso Iface\n"
- 
- #: ../lib/inet_gr.c:261
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags   MSS Window  irtt "
- "Iface\n"
--msgstr ""
--"Destino         Roteador        MáscaraGen.    Opções   MSS Janela  irtt "
--"Iface\n"
-+msgstr "Destino         Roteador        MáscaraGen.    Opções   MSS Janela  irtt Iface\n"
- 
- #: ../lib/inet_gr.c:266
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt  HH  Arp\n"
--msgstr ""
--"Destino         Roteador        Origem         Opções Métrica Ref   Uso "
--"Iface    MSS   Janela irtt   HH  Arp\n"
-+msgstr "Destino         Roteador        Origem         Opções Métrica Ref   Uso Iface    MSS   Janela irtt   HH  Arp\n"
- 
- #: ../lib/inet_gr.c:290
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
--msgstr ""
--"Destino         Roteador        Origem         Opções Métrica Ref   Uso "
--"Iface    MSS   Janela irtt   HH  Arp\n"
-+msgstr "Destino         Roteador        Origem         Opções Métrica Ref   Uso Iface    MSS   Janela irtt   HH  Arp\n"
- 
--#: ../lib/inet_sr.c:50
-+#: ../lib/inet_sr.c:51
-+#, c-format
- msgid ""
- "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
- "[[dev] If]\n"
-@@ -2196,31 +2471,36 @@
- "Uso: inet_route [-vF] del {-host|-net} Destino[/prefixo] [gw Gw] [metric M] "
- "[[dev] If]\n"
- 
--#: ../lib/inet_sr.c:51
-+#: ../lib/inet_sr.c:52
-+#, c-format
- msgid ""
- "       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
- msgstr ""
- "       inet_route [-vF] add {-host|-net} Destino[/prefixo] [gw Gw] [metric "
- "M]\n"
- 
--#: ../lib/inet_sr.c:52
-+#: ../lib/inet_sr.c:53
-+#, c-format
- msgid ""
- "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
- msgstr ""
- "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
- 
--#: ../lib/inet_sr.c:53
-+#: ../lib/inet_sr.c:54
-+#, c-format
- msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
- msgstr "                              [mod] [dyn] [reinstate] [[dev] If]\n"
- 
--#: ../lib/inet_sr.c:54
-+#: ../lib/inet_sr.c:55
-+#, c-format
- msgid ""
- "       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
- msgstr ""
- "       inet_route [-vF] add {-host|-net} Destino[/prefixo] [metric M] "
- "reject\n"
- 
--#: ../lib/inet_sr.c:55
-+#: ../lib/inet_sr.c:56
-+#, c-format
- msgid "       inet_route [-FC] flush      NOT supported\n"
- msgstr "       inet_route [-FC] flush      NÃO suportado\n"
- 
-@@ -2230,14 +2510,17 @@
- msgstr "route: %s: não é possível usar uma REDE como roteador!\n"
- 
- #: ../lib/inet_sr.c:174
-+#, c-format
- msgid "route: Invalid MSS/MTU.\n"
- msgstr "route: MSS inválido.\n"
- 
- #: ../lib/inet_sr.c:187
-+#, c-format
- msgid "route: Invalid window.\n"
- msgstr "route: janela inválida.\n"
- 
- #: ../lib/inet_sr.c:203
-+#, c-format
- msgid "route: Invalid initial rtt.\n"
- msgstr "route: rtt inicial inválido.\n"
- 
-@@ -2252,75 +2535,92 @@
- msgstr "route: netmask %s inválida\n"
- 
- #: ../lib/inet_sr.c:270
-+#, c-format
- msgid "route: netmask doesn't match route address\n"
- msgstr "route: a netmask não casa com o endereço de rede\n"
- 
- #: ../lib/inet_sr.c:306
-+#, c-format
- msgid "Flushing `inet' routing table not supported\n"
- msgstr "Não é suportado limpar a tabela de roteamento `inet'\n"
- 
- #: ../lib/inet_sr.c:310
-+#, c-format
- msgid "Modifying `inet' routing cache not supported\n"
- msgstr "Não é suportado modificar o cache de roteamento `inet'\n"
- 
- #: ../lib/ipx_gr.c:52
-+#, c-format
- msgid "IPX not configured in this system.\n"
- msgstr "O AX.25 não foi configurado neste sistema.\n"
- 
- #: ../lib/ipx_gr.c:56
-+#, c-format
- msgid "Kernel IPX routing table\n"
- msgstr "Tabela de roteamento IPX do kernel\n"
- 
- #. xxx
- #: ../lib/ipx_gr.c:57
-+#, c-format
- msgid "Destination               Router Net                Router Node\n"
- msgstr "Destino                   Rede Roteadora            Nó Roteador\n"
- 
- #: ../lib/ipx_sr.c:33
-+#, c-format
- msgid "IPX: this needs to be written\n"
- msgstr "NET/ROM: isto precisa ser escrito\n"
- 
--#: ../lib/masq_info.c:197
-+#: ../lib/masq_info.c:198
-+#, c-format
- msgid "IP masquerading entries\n"
- msgstr "Entradas de IP mascarado\n"
- 
--#: ../lib/masq_info.c:200
-+#: ../lib/masq_info.c:201
-+#, c-format
- msgid "prot   expire source               destination          ports\n"
- msgstr "prot   expira origem               destino             portas\n"
- 
--#: ../lib/masq_info.c:203
-+#: ../lib/masq_info.c:204
-+#, c-format
- msgid ""
--"prot   expire    initseq delta prevd source               destination        "
--"  ports\n"
-+"prot   expire    initseq delta prevd source               "
-+"destination          ports\n"
- msgstr ""
--"prot   expira    initseq delta prevd origem               destino            "
--" portas\n"
-+"prot   expira    initseq delta prevd origem               "
-+"destino             portas\n"
- 
- #: ../lib/netrom_gr.c:48
-+#, c-format
- msgid "NET/ROM not configured in this system.\n"
- msgstr "NET/ROM não configurado neste sistema.\n"
- 
- #: ../lib/netrom_gr.c:51
-+#, c-format
- msgid "Kernel NET/ROM routing table\n"
- msgstr "Tabela de roteamento NET/ROM do kernel\n"
- 
- #: ../lib/netrom_gr.c:52
-+#, c-format
- msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
- msgstr "Destino      Mnemônico Qualidade Vizinho   Iface\n"
- 
- #: ../lib/netrom_sr.c:34
-+#, c-format
- msgid "netrom usage\n"
- msgstr "uso de netrom\n"
- 
- #: ../lib/netrom_sr.c:44
-+#, c-format
- msgid "NET/ROM: this needs to be written\n"
- msgstr "NET/ROM: isto precisa ser escrito\n"
- 
- #: ../lib/ppp.c:44
-+#, c-format
- msgid "You cannot start PPP with this program.\n"
- msgstr "Você não pode iniciar o PPP com este programa.\n"
- 
- #: ../lib/ppp_ac.c:38
-+#, c-format
- msgid "Sorry, use pppd!\n"
- msgstr "Desculpe, use o pppd!\n"
- 
-@@ -2329,51 +2629,314 @@
- msgstr "Endereço do nó deve ter dez dígitos"
- 
- #: ../lib/rose_gr.c:51
-+#, c-format
- msgid "ROSE not configured in this system.\n"
- msgstr "ROSE não configurada neste sistema.\n"
- 
- #: ../lib/rose_gr.c:54
-+#, c-format
- msgid "Kernel ROSE routing table\n"
- msgstr "Tabela de roteamento ROSE do kernel\n"
- 
--#: ../lib/tr.c:70 ../lib/tr.c:85
-+#: ../lib/tr.c:86 ../lib/tr.c:101
- #, c-format
- msgid "in_tr(%s): invalid token ring address!\n"
- msgstr "in_tr(%s): endereço token ring inválido!\n"
- 
--#: ../lib/tr.c:97
-+#: ../lib/tr.c:113
- #, c-format
- msgid "in_tr(%s): trailing : ignored!\n"
- msgstr "in_tr(%s): trailing : ignorado!\n"
- 
--#: ../lib/tr.c:109
-+#: ../lib/tr.c:125
- #, c-format
- msgid "in_tr(%s): trailing junk!\n"
- msgstr "in_tr(%s): lixo no trailing!\n"
- 
--#: ../lib/interface.c:124
-+#: ../lib/interface.c:176
- #, c-format
- msgid "warning: no inet socket available: %s\n"
- msgstr "atenção: nenhum socket inet disponível: %s\n"
- 
--#: ../lib/interface.c:270
-+#: ../lib/interface.c:325
- #, c-format
- msgid "Warning: cannot open %s (%s). Limited output.\n"
- msgstr "Atenção: não foi possível abrir %s (%s). Saída limitada.\n"
- 
- #. Give better error message for this case.
--#: ../lib/interface.c:504
-+#: ../lib/interface.c:571
- msgid "Device not found"
- msgstr "%s: dispositivo não encontrado"
- 
--#: ../lib/interface.c:508
-+#: ../lib/interface.c:575
- #, c-format
- msgid "%s: error fetching interface information: %s\n"
-+msgstr "%s: erro obtendo informações da interface: %s\n"
-+
-+#: ../lib/interface.c:608
-+msgid "     - no statistics available -"
-+msgstr "     - estatísticas não disponíveis -"
-+
-+#: ../lib/interface.c:612
-+#, c-format
-+msgid "[NO FLAGS]"
-+msgstr "[SEM FLAGS]"
-+
-+#: ../lib/interface.c:688
-+#, c-format
-+msgid "%-9.9s Link encap:%s  "
-+msgstr "%-9.9s  Encapsulamento do Link: %s  "
-+
-+#: ../lib/interface.c:693
-+#, c-format
-+msgid "HWaddr %s  "
-+msgstr "Endereço de HW %s  "
-+
-+#: ../lib/interface.c:696
-+#, c-format
-+msgid "Media:%s"
-+msgstr "Mídia:%s"
-+
-+#: ../lib/interface.c:698
-+#, c-format
-+msgid "(auto)"
-+msgstr "(auto)"
-+
-+#: ../lib/interface.c:705
-+#, c-format
-+msgid "          %s addr:%s "
-+msgstr "          %s end.: %s "
-+
-+#: ../lib/interface.c:708
-+#, c-format
-+msgid " P-t-P:%s "
-+msgstr " P-a-P:%s "
-+
-+#: ../lib/interface.c:711
-+#, c-format
-+msgid " Bcast:%s "
-+msgstr " Bcast:%s "
-+
-+#: ../lib/interface.c:713
-+#, c-format
-+msgid " Mask:%s\n"
-+msgstr " Masc:%s\n"
-+
-+#: ../lib/interface.c:730
-+#, c-format
-+msgid "          inet6 addr: %s/%d"
-+msgstr "          endereço inet6: %s/%d"
-+
-+#: ../lib/interface.c:732
-+#, c-format
-+msgid " Scope:"
-+msgstr " Escopo:"
-+
-+#: ../lib/interface.c:735
-+#, c-format
-+msgid "Global"
-+msgstr "Global"
-+
-+#: ../lib/interface.c:738
-+#, c-format
-+msgid "Link"
-+msgstr "Link"
-+
-+#: ../lib/interface.c:741
-+#, c-format
-+msgid "Site"
-+msgstr "Site"
-+
-+#: ../lib/interface.c:744
-+#, c-format
-+msgid "Compat"
-+msgstr "Compat"
-+
-+#: ../lib/interface.c:747
-+#, c-format
-+msgid "Host"
-+msgstr "Máquina"
-+
-+#: ../lib/interface.c:750
-+#, c-format
-+msgid "Unknown"
-+msgstr "Desconhecido"
-+
-+#: ../lib/interface.c:765
-+#, c-format
-+msgid "          IPX/Ethernet II addr:%s\n"
-+msgstr "      Endereço IPX/Ethernet II:%s\n"
-+
-+#: ../lib/interface.c:768
-+#, c-format
-+msgid "          IPX/Ethernet SNAP addr:%s\n"
-+msgstr "      Endereço IPX/Ethernet SNAP:%s\n"
-+
-+#: ../lib/interface.c:771
-+#, c-format
-+msgid "          IPX/Ethernet 802.2 addr:%s\n"
-+msgstr "      Endereço IPX/Ethernet 802.2:%s\n"
-+
-+#: ../lib/interface.c:774
-+#, c-format
-+msgid "          IPX/Ethernet 802.3 addr:%s\n"
-+msgstr "      Endereço IPX/Ethernet 802.3:%s\n"
-+
-+#: ../lib/interface.c:784
-+#, c-format
-+msgid "          EtherTalk Phase 2 addr:%s\n"
-+msgstr "          Endereço EtherTalk fase 2:%s\n"
-+
-+#: ../lib/interface.c:793
-+#, c-format
-+msgid "          econet addr:%s\n"
-+msgstr "          Endereço econet:%s\n"
-+
-+#: ../lib/interface.c:800
-+#, c-format
-+msgid "[NO FLAGS] "
-+msgstr "[NENHUMA FLAG] "
-+
-+#: ../lib/interface.c:802
-+#, c-format
-+msgid "UP "
-+msgstr "UP "
-+
-+#: ../lib/interface.c:804
-+#, c-format
-+msgid "BROADCAST "
-+msgstr "BROADCAST"
-+
-+#: ../lib/interface.c:806
-+#, c-format
-+msgid "DEBUG "
-+msgstr "DEBUG "
-+
-+#: ../lib/interface.c:808
-+#, c-format
-+msgid "LOOPBACK "
-+msgstr "LOOPBACK"
-+
-+#: ../lib/interface.c:810
-+#, c-format
-+msgid "POINTOPOINT "
-+msgstr "POINTOPOINT "
-+
-+#: ../lib/interface.c:812
-+#, c-format
-+msgid "NOTRAILERS "
-+msgstr "NOTRAILERS "
-+
-+#: ../lib/interface.c:814
-+#, c-format
-+msgid "RUNNING "
-+msgstr "RUNNING "
-+
-+#: ../lib/interface.c:816
-+#, c-format
-+msgid "NOARP "
-+msgstr "NOARP "
-+
-+#: ../lib/interface.c:818
-+#, c-format
-+msgid "PROMISC "
-+msgstr "PROMISC "
-+
-+#: ../lib/interface.c:820
-+#, c-format
-+msgid "ALLMULTI "
-+msgstr "ALLMULTI "
-+
-+#: ../lib/interface.c:822
-+#, c-format
-+msgid "SLAVE "
-+msgstr "SLAVE "
-+
-+#: ../lib/interface.c:824
-+#, c-format
-+msgid "MASTER "
-+msgstr "MASTER "
-+
-+#: ../lib/interface.c:826
-+#, c-format
-+msgid "MULTICAST "
-+msgstr "MULTICAST "
-+
-+#: ../lib/interface.c:829
-+#, c-format
-+msgid "DYNAMIC "
-+msgstr "DYNAMIC "
-+
-+#. DONT FORGET TO ADD THE FLAGS IN ife_print_short
-+#: ../lib/interface.c:832
-+#, c-format
-+msgid " MTU:%d  Metric:%d"
-+msgstr " MTU:%d  Métrica:%d"
-+
-+#: ../lib/interface.c:836
-+#, c-format
-+msgid "  Outfill:%d  Keepalive:%d"
-+msgstr "  Outfill:%d  Keepalive:%d"
-+
-+#: ../lib/interface.c:850
-+#, fuzzy, c-format
-+msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
-+msgstr "Pacotes RX:%lu erros:%lu descartados:%lu sobreposições:%lu frame:%lu\n"
-+
-+#: ../lib/interface.c:855
-+#, c-format
-+msgid "             compressed:%lu\n"
-+msgstr "             compactados:%lu\n"
-+
-+#: ../lib/interface.c:895
-+#, fuzzy, c-format
-+msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
-+msgstr "Pacotes TX:%lu erros:%lu descartados:%lu sobreposições:%lu portadora:%lu\n"
-+
-+#: ../lib/interface.c:899
-+#, c-format
-+msgid "          collisions:%lu "
-+msgstr "          colisões:%lu "
-+
-+#: ../lib/interface.c:901
-+#, c-format
-+msgid "compressed:%lu "
-+msgstr "compactados:%lu "
-+
-+#: ../lib/interface.c:903
-+#, c-format
-+msgid "txqueuelen:%d "
-+msgstr "txqueuelen:%d "
-+
-+#: ../lib/interface.c:905
-+#, c-format
-+msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
- msgstr ""
--"%s: erro obtendo informações da interface: %s\n"
--"\n"
- 
--#: ../lib/sockets.c:59
-+#: ../lib/interface.c:916
-+#, c-format
-+msgid "Interrupt:%d "
-+msgstr "IRQ:%d "
-+
-+#. Only print devices using it for
-+#. I/O maps
-+#: ../lib/interface.c:919
-+#, c-format
-+msgid "Base address:0x%x "
-+msgstr "Endereço de E/S:0x%x "
-+
-+#: ../lib/interface.c:921
-+#, c-format
-+msgid "Memory:%lx-%lx "
-+msgstr "Memória:%lx-%lx "
-+
-+#: ../lib/interface.c:924
-+#, c-format
-+msgid "DMA chan:%x "
-+msgstr "Canal DMA:%x "
-+
-+#: ../lib/sockets.c:63
-+#, c-format
- msgid "No usable address families found.\n"
- msgstr "Nenhuma família de endereços que possa ser usada foi encontrada.\n"
- 
-@@ -2397,29 +2960,32 @@
- msgid "ip: argument is wrong: %s\n"
- msgstr "ip: argumento errado: %s\n"
- 
--#: ../ipmaddr.c:56
-+#: ../ipmaddr.c:61
-+#, c-format
- msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
- msgstr "Uso: ipmaddr [ add | del ] ENDMULTI dev STRING\n"
- 
--#: ../ipmaddr.c:57
-+#: ../ipmaddr.c:62
-+#, c-format
- msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
- msgstr "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
- 
--#: ../ipmaddr.c:58
-+#: ../ipmaddr.c:63
-+#, c-format
- msgid "       ipmaddr -V | -version\n"
- msgstr "       ipmaddr -V | -version\n"
- 
--#: ../ipmaddr.c:258
-+#: ../ipmaddr.c:263
- #, c-format
- msgid "family %d "
- msgstr "família %d "
- 
--#: ../ipmaddr.c:267
-+#: ../ipmaddr.c:272
- #, c-format
- msgid " users %d"
- msgstr " usuários %d"
- 
--#: ../ipmaddr.c:353
-+#: ../ipmaddr.c:358
- msgid "Cannot create socket"
- msgstr "Não foi possível criar o socket"
- 
-@@ -2434,6 +3000,7 @@
- msgstr "slattach: tty_lock: (%s): %s\n"
- 
- #: ../slattach.c:192
-+#, c-format
- msgid "slattach: cannot write PID file\n"
- msgstr "slattach: não foi possível escrever o arquivo PID\n"
- 
-@@ -2452,39 +3019,69 @@
- msgid "slattach: tty_hangup(RAISE): %s\n"
- msgstr "slattach: tty_hangup(RAISE): %s\n"
- 
--#: ../slattach.c:486
-+#: ../slattach.c:468
-+#, fuzzy, c-format
-+msgid "slattach: tty name too long\n"
-+msgstr "%s: nome muito longo\n"
-+
-+#: ../slattach.c:498
-+#, c-format
- msgid "slattach: tty_open: cannot get current state!\n"
- msgstr "slattach: tty_open: não foi possível obter o estado corrente!\n"
- 
--#: ../slattach.c:493
-+#: ../slattach.c:505
-+#, c-format
- msgid "slattach: tty_open: cannot get current line disc!\n"
--msgstr ""
--"slattach: tty_open: não foi possível obter a disciplina de linha corrente!\n"
-+msgstr "slattach: tty_open: não foi possível obter a disciplina de linha corrente!\n"
- 
--#: ../slattach.c:501
-+#: ../slattach.c:513
-+#, c-format
- msgid "slattach: tty_open: cannot set RAW mode!\n"
- msgstr "slattach: tty_open: não foi possível configurar o modo RAW!\n"
- 
--#: ../slattach.c:508
-+#: ../slattach.c:520
- #, c-format
- msgid "slattach: tty_open: cannot set %s bps!\n"
- msgstr "slattach: tty_open: não foi possível configurar %s bps!\n"
- 
--#: ../slattach.c:518
-+#: ../slattach.c:530
-+#, c-format
- msgid "slattach: tty_open: cannot set 8N1 mode!\n"
- msgstr "slattach: tty_open: não foi possível configurar modo 8N1!\n"
- 
--#: ../slattach.c:686
-+#: ../slattach.c:672
-+#, c-format
-+msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n"
-+msgstr ""
-+
-+#: ../slattach.c:704
- #, c-format
- msgid "%s started"
- msgstr "%s inicializado"
- 
--#: ../slattach.c:687
-+#: ../slattach.c:705
- #, c-format
- msgid " on %s"
- msgstr " em %s"
- 
--#: ../slattach.c:688
-+#: ../slattach.c:706
- #, c-format
- msgid " interface %s\n"
- msgstr "%s: interface desconhecida.\n"
-+
-+#~ msgid ""
-+#~ "  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
-+#~ "<-''-\n"
-+#~ msgstr "  arp [-v]   [<HW>] [-i <if>] -s  <máquina> <end_hw>  [netmask <nm>] pub  <-''-\n"
-+
-+#~ msgid "%s: unknown interface: %s\n"
-+#~ msgstr "%s: interface desconhecida: %s\n"
-+
-+#~ msgid "address mask replies"
-+#~ msgstr "resposta a mascara de endereço"
-+
-+#~ msgid "unknown title %s\n"
-+#~ msgstr "título %s desconhecido\n"
-+
-+#~ msgid "Routing table for `ddp' not yet supported.\n"
-+#~ msgstr "Tabela de roteamento para `ddp' ainda não suportada.\n"
---- net-tools-1.60.orig/po/Makefile
-+++ net-tools-1.60/po/Makefile
-@@ -3,13 +3,13 @@
- INSTALL_DATA= ${INSTALL} -m 644
- INSTALLNLSDIR=${BASEDIR}/usr/share/locale
- 
--TUPDATE = tupdate
-+TUPDATE = msgmerge
- 
- NLSPACKAGE = net-tools
- 
- -include ../config.make
- ifeq ($(I18N),1)
--CATALOGS = de.mo fr.mo pt_BR.mo et_EE.mo cs.mo
-+CATALOGS = de.mo fr.mo pt_BR.mo et_EE.mo cs.mo ja.mo
- else
- CATALOGS =
- endif
-@@ -49,7 +49,7 @@
- 		lang=`echo $$cat | sed 's/.mo//'`; \
- 		mv $$lang.po $$lang.old.po; \
- 		echo "$$lang:"; \
--		if $(TUPDATE) $(NLSPACKAGE).pot $$lang.old.po > $$lang.po; then \
-+		if $(TUPDATE) $$lang.old.po $(NLSPACKAGE).pot > $$lang.po; then \
- 		rm -f $$lang.old.po; \
- 	else \
- 	 	echo "tupdate for $$cat failed!"; \
---- net-tools-1.60.orig/po/et_EE.po
-+++ net-tools-1.60/po/et_EE.po
-@@ -6,7 +6,8 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: net-tools 1.58\n"
--"POT-Creation-Date: 2001-02-15 21:28+0200\n"
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2007-06-30 12:28+0900\n"
- "PO-Revision-Date: 2001-02-15 18:00+0300\n"
- "Last-Translator: Meelis Roos <mroos@linux.ee>\n"
- "Language-Team: Estonian <linux-ee@eenet.ee>\n"
-@@ -14,53 +15,58 @@
- "Content-Type: text/plain; charset=iso-8859-15\n"
- "Content-Transfer-Encoding: 8bit\n"
- 
--#: ../arp.c:110 ../arp.c:269
-+#: ../arp.c:112 ../arp.c:279
-+#, c-format
- msgid "arp: need host name\n"
- msgstr "arp: puudub hosti nimi\n"
- 
--#: ../arp.c:207 ../arp.c:221
-+#: ../arp.c:215 ../arp.c:230
- #, c-format
- msgid "No ARP entry for %s\n"
- msgstr "%s jaoks pole ARP kirjet\n"
- 
--#: ../arp.c:239
-+#: ../arp.c:248
- #, c-format
- msgid "arp: cant get HW-Address for `%s': %s.\n"
- msgstr "arp: ei saa riistvaralist aadressi `%s' jaoks: %s\n"
- 
--#: ../arp.c:243
-+#: ../arp.c:252
-+#, c-format
- msgid "arp: protocol type mismatch.\n"
- msgstr "arp: vale protokolli tüüp\n"
- 
--#: ../arp.c:252
-+#: ../arp.c:261
- #, c-format
- msgid "arp: device `%s' has HW address %s `%s'.\n"
- msgstr "arp: seadmel `%s' on riistvaraline aadress %s `%s'\n"
- 
--#: ../arp.c:282
-+#: ../arp.c:293
-+#, c-format
- msgid "arp: need hardware address\n"
- msgstr "arp: puudub riistvaraline aadress\n"
- 
--#: ../arp.c:290
-+#: ../arp.c:301
-+#, c-format
- msgid "arp: invalid hardware address\n"
- msgstr "arp: vigane riistvaraline aadress\n"
- 
--#: ../arp.c:387
-+#: ../arp.c:398
- #, c-format
- msgid "arp: cannot open etherfile %s !\n"
- msgstr "arp: ei saa avada faili %s\n"
- 
--#: ../arp.c:403
-+#: ../arp.c:414
- #, c-format
- msgid "arp: format error on line %u of etherfile %s !\n"
- msgstr "arp: formaadiviga real %u failis %s\n"
- 
--#: ../arp.c:416
-+#: ../arp.c:427
- #, c-format
- msgid "arp: cannot set entry on line %u of etherfile %s !\n"
- msgstr "arp: ei saa kehtestada ARP kirjet real %u failis %s\n"
- 
--#: ../arp.c:437
-+#: ../arp.c:448
-+#, c-format
- msgid ""
- "Address                  HWtype  HWaddress           Flags Mask            "
- "Iface\n"
-@@ -68,45 +74,52 @@
- "Aadress                  HWtüüp  HWaadress           Lipud Mask            "
- "Liides\n"
- 
--#: ../arp.c:467
-+#: ../arp.c:476
-+#, fuzzy
-+msgid "<from_interface>"
-+msgstr " liides %s\n"
-+
-+#: ../arp.c:478
- msgid "(incomplete)"
- msgstr "(mittetäielik)"
- 
--#: ../arp.c:484
-+#: ../arp.c:495
- #, c-format
- msgid "%s (%s) at "
- msgstr "%s (%s) aadressil "
- 
--#: ../arp.c:490
-+#: ../arp.c:501
-+#, c-format
- msgid "<incomplete> "
- msgstr "<mittetäielik>"
- 
--#: ../arp.c:496
-+#: ../arp.c:507
- #, c-format
- msgid "netmask %s "
- msgstr "võrgumask %s "
- 
--#: ../arp.c:513
-+#: ../arp.c:524
- #, c-format
- msgid "on %s\n"
- msgstr "liides %s\n"
- 
--#: ../arp.c:592
-+#: ../arp.c:605
- #, c-format
- msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
- msgstr "ARP kirjeid kokku: %s\tignoreerisin: %d\tleidsin: %d\n"
- 
--#: ../arp.c:596
-+#: ../arp.c:609
- #, c-format
- msgid "%s (%s) -- no entry\n"
- msgstr "%s (%s) -- pole kirjet\n"
- 
--#: ../arp.c:598
-+#: ../arp.c:611
- #, c-format
- msgid "arp: in %d entries no match found.\n"
- msgstr "arp: ei leidnud %d kirje hulgast sobivat\n"
- 
--#: ../arp.c:613
-+#: ../arp.c:626
-+#, c-format
- msgid ""
- "Usage:\n"
- "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
-@@ -116,47 +129,45 @@
- "ARP cache vaatamine:\n"
- "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hosti nimi>]\n"
- 
--#: ../arp.c:614
-+#: ../arp.c:627
-+#, fuzzy, c-format
- msgid ""
--"  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP "
-+"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
- "entry\n"
- msgstr ""
- "ARP kirje kustutamine:\n"
- "  arp [-v]          [-i <if>] -d  <hosti nimi> [pub] [nopub]\n"
- 
--#: ../arp.c:615
-+#: ../arp.c:628
-+#, fuzzy, c-format
- msgid ""
--"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from "
-+"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
- "file\n"
- msgstr ""
- "ARP kirjete lisamine failist:\n"
- "  arp [-vnD] [<HW>] [-i <if>] -f  [<failinimi>]\n"
- 
--#: ../arp.c:616
-+#: ../arp.c:629
-+#, fuzzy, c-format
- msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add "
-+"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
- "entry\n"
- msgstr ""
- "ARP kirje lisamine:\n"
- "  arp [-v]   [<HW>] [-i <if>] -s  <hosti nimi> <hwaddr> [temp] [nopub]\n"
- 
--#: ../arp.c:617
--msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
--"<-''-\n"
--msgstr ""
--"  arp [-v]   [<HW>] [-i <if>] -s  <hosti nimi> <hwaddr> [netmask <nm>] pub\n"
--
--#: ../arp.c:618
-+#: ../arp.c:630
-+#, fuzzy, c-format
- msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      "
-+"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
- "<-''-\n"
- "\n"
- msgstr ""
- "  arp [-v]   [<HW>] [-i <if>] -Ds <hosti nimi> <if> [netmask <nm>] pub\n"
- "\n"
- 
--#: ../arp.c:620
-+#: ../arp.c:632
-+#, c-format
- msgid ""
- "        -a                       display (all) hosts in alternative (BSD) "
- "style\n"
-@@ -164,122 +175,132 @@
- "        -a                       näita kõiki hoste alternatiivsel (BSD) "
- "kujul\n"
- 
--#: ../arp.c:621
-+#: ../arp.c:633
-+#, c-format
- msgid "        -s, --set                set a new ARP entry\n"
- msgstr "        -s, --set                uue ARP kirje seadmine\n"
- 
--#: ../arp.c:622
-+#: ../arp.c:634
-+#, c-format
- msgid "        -d, --delete             delete a specified entry\n"
- msgstr "        -d, --delete             määratud kirje kustutamine\n"
- 
--#: ../arp.c:623 ../netstat.c:1485 ../route.c:85
-+#: ../arp.c:635 ../netstat.c:1503 ../route.c:86
-+#, c-format
- msgid "        -v, --verbose            be verbose\n"
- msgstr "        -v, --verbose            jutukas väljund\n"
- 
--#: ../arp.c:624
-+#: ../arp.c:636 ../netstat.c:1504 ../route.c:87
-+#, c-format
- msgid "        -n, --numeric            don't resolve names\n"
- msgstr "        -n, --numeric            mitte lahendada nimesid\n"
- 
--#: ../arp.c:625
-+#: ../arp.c:637
-+#, c-format
- msgid ""
- "        -i, --device             specify network interface (e.g. eth0)\n"
- msgstr ""
- "        -i, --device             võrguliidese täpsustamine (näiteks eth0)\n"
- 
--#: ../arp.c:626
-+#: ../arp.c:638
-+#, c-format
- msgid "        -D, --use-device         read <hwaddr> from given device\n"
- msgstr "        -D, --use-device         lugeda <hwaddr> vastavalt liideselt\n"
- 
--#: ../arp.c:627
-+#: ../arp.c:639
-+#, c-format
- msgid "        -A, -p, --protocol       specify protocol family\n"
- msgstr "        -A, -p, --protocol       protokollipere määramine\n"
- 
--#: ../arp.c:628
-+#: ../arp.c:640
-+#, c-format
- msgid ""
--"        -f, --file               read new entries from file or from "
--"/etc/ethers\n"
-+"        -f, --file               read new entries from file or from /etc/"
-+"ethers\n"
- "\n"
- msgstr ""
--"        -f, --file               lugeda kirjed antud failist või "
--"/etc/ethers'st\n"
-+"        -f, --file               lugeda kirjed antud failist või /etc/"
-+"ethers'st\n"
- "\n"
- 
--#: ../arp.c:630 ../rarp.c:181
-+#: ../arp.c:642 ../rarp.c:182
- #, c-format
- msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
- msgstr ""
- "  <HW>=kasutage '-H <hw>' riistvaralise aadressi määramiseks.\n"
- "       Vaikimisi: %s\n"
- 
--#: ../arp.c:631 ../rarp.c:182
-+#: ../arp.c:643 ../rarp.c:183
-+#, c-format
- msgid "  List of possible hardware types (which support ARP):\n"
- msgstr "  Võimalike ARP-i toetavate riistvara tüüpide nimekiri:\n"
- 
--#: ../arp.c:664 ../arp.c:749
-+#: ../arp.c:677 ../arp.c:762
- #, c-format
- msgid "%s: hardware type not supported!\n"
- msgstr "arp: riistvara tüüpi %s ei toetata\n"
- 
--#: ../arp.c:668
-+#: ../arp.c:681
- #, c-format
- msgid "%s: address family not supported!\n"
- msgstr "arp: aadressiperekonda %s ei toetata\n"
- 
--#: ../arp.c:703
-+#: ../arp.c:716
-+#, c-format
- msgid "arp: -N not yet supported.\n"
- msgstr "arp: -N toetust pole veel\n"
- 
--#: ../arp.c:713
-+#: ../arp.c:726
- #, c-format
- msgid "arp: %s: unknown address family.\n"
- msgstr "arp: tundmatu aadressiperekond %s\n"
- 
--#: ../arp.c:722
-+#: ../arp.c:735
- #, c-format
- msgid "arp: %s: unknown hardware type.\n"
- msgstr "arp: tundmatu riistvara tüüp %s\n"
- 
--#: ../arp.c:741
-+#: ../arp.c:754
- #, c-format
- msgid "arp: %s: kernel only supports 'inet'.\n"
- msgstr "arp: tuumas on ainult 'inet' aadressiperekonna toetus\n"
- 
--#: ../arp.c:754
-+#: ../arp.c:767
- #, c-format
- msgid "arp: %s: hardware type without ARP support.\n"
- msgstr "arp: riistvara tüübil %s pole ARP toetust\n"
- 
--#: ../hostname.c:69
-+#: ../hostname.c:71
- #, c-format
- msgid "Setting nodename to `%s'\n"
- msgstr "Sean sõlme nimeks `%s'\n"
- 
--#: ../hostname.c:74
-+#: ../hostname.c:76
- #, c-format
- msgid "%s: you must be root to change the node name\n"
- msgstr "%s: ainult root saab sõlme nime muuta\n"
- 
--#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116
-+#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117
- #, c-format
- msgid "%s: name too long\n"
- msgstr "%s: nimi on liiga pikk\n"
- 
--#: ../hostname.c:89
-+#: ../hostname.c:91
- #, c-format
- msgid "Setting hostname to `%s'\n"
- msgstr "Sean hosti nimeks `%s'\n"
- 
--#: ../hostname.c:94
-+#: ../hostname.c:96
- #, c-format
- msgid "%s: you must be root to change the host name\n"
- msgstr "%s: ainult root saab hosti nime muuta\n"
- 
--#: ../hostname.c:108
-+#: ../hostname.c:109
- #, c-format
- msgid "Setting domainname to `%s'\n"
- msgstr "Sean domeeni nimeks `%s'\n"
- 
--#: ../hostname.c:113
-+#: ../hostname.c:114
- #, c-format
- msgid "%s: you must be root to change the domain name\n"
- msgstr "%s: ainult root saab domeeni nime muuta\n"
-@@ -304,25 +325,28 @@
- msgid "Result: h_addr_list=`%s'\n"
- msgstr "Tulemus: h_addr_list=`%s'\n"
- 
--#: ../hostname.c:209
-+#: ../hostname.c:208
- #, c-format
- msgid "%s: can't open `%s'\n"
- msgstr "%s: ei saa avada faili `%s'\n"
- 
--#: ../hostname.c:223
-+#: ../hostname.c:222
-+#, c-format
- msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
- msgstr ""
- "Kasutamine:\n"
- "  hostname [-v] {hosti nimi|-F fail}         hosti nime seadmine (ka "
- "failist)\n"
- 
--#: ../hostname.c:224
-+#: ../hostname.c:223
-+#, c-format
- msgid ""
- "       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
- msgstr ""
- "  domainname [-v] {nisdomeen|-F fail}        NIS domeeni nime seadmine\n"
- 
--#: ../hostname.c:226
-+#: ../hostname.c:225
-+#, c-format
- msgid ""
- "       nodename [-v] {nodename|-F file}      set DECnet node name (from "
- "file)\n"
-@@ -330,18 +354,21 @@
- "  nodename [-v] {nodename|-F fail}           DECneti võrgusõlme nime "
- "seadmine\n"
- 
--#: ../hostname.c:228
-+#: ../hostname.c:227
-+#, c-format
- msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
- msgstr ""
- "  hostname [-v] [-d|-f|-s|-a|-i|-y|-n]       nime näitamine antud formaadis\n"
- 
--#: ../hostname.c:229
-+#: ../hostname.c:228
-+#, c-format
- msgid ""
- "       hostname [-v]                         display hostname\n"
- "\n"
- msgstr "  hostname [-v]                              hosti nime näitamine\n"
- 
--#: ../hostname.c:230
-+#: ../hostname.c:229
-+#, c-format
- msgid ""
- "       hostname -V|--version|-h|--help       print info and exit\n"
- "\n"
-@@ -350,7 +377,8 @@
- "  hostname -h|--help                         seesama abiinfo\n"
- "\n"
- 
--#: ../hostname.c:231
-+#: ../hostname.c:230
-+#, c-format
- msgid ""
- "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
- "\n"
-@@ -358,36 +386,44 @@
- "  dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
- "\n"
- 
--#: ../hostname.c:232
-+#: ../hostname.c:231
-+#, c-format
- msgid "    -s, --short           short host name\n"
- msgstr "    -s, --short           lühike hosti nimi\n"
- 
--#: ../hostname.c:233
-+#: ../hostname.c:232
-+#, c-format
- msgid "    -a, --alias           alias names\n"
- msgstr "     -a, --alias          alias-nimed\n"
- 
--#: ../hostname.c:234
-+#: ../hostname.c:233
-+#, c-format
- msgid "    -i, --ip-address      addresses for the hostname\n"
- msgstr "    -i, --ip-address      hosti IP aadressid\n"
- 
--#: ../hostname.c:235
-+#: ../hostname.c:234
-+#, c-format
- msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
- msgstr ""
- "    -f, --fqdn, --long    pikk hosti nimi (FQDN - täielik süsteeminimi)\n"
- 
--#: ../hostname.c:236
-+#: ../hostname.c:235
-+#, c-format
- msgid "    -d, --domain          DNS domain name\n"
- msgstr "    -d, --domain          DNS domeeni nimi\n"
- 
--#: ../hostname.c:237
-+#: ../hostname.c:236
-+#, c-format
- msgid "    -y, --yp, --nis       NIS/YP domainname\n"
- msgstr "    -y, --yp, --nis       NIS/YP domeeni nimi\n"
- 
--#: ../hostname.c:239
-+#: ../hostname.c:238
-+#, c-format
- msgid "    -n, --node            DECnet node name\n"
- msgstr "    -n, --node            DECneti võrgusõlme nimi\n"
- 
--#: ../hostname.c:241
-+#: ../hostname.c:240
-+#, c-format
- msgid ""
- "    -F, --file            read hostname or NIS domainname from given file\n"
- "\n"
-@@ -395,7 +431,8 @@
- "    -F, --file            lugeda hosti või NIS domeeni nimi failist\n"
- "\n"
- 
--#: ../hostname.c:243
-+#: ../hostname.c:242
-+#, c-format
- msgid ""
- "   This command can read or set the hostname or the NIS domainname. You can\n"
- "   also read the DNS domain or the FQDN (fully qualified domain name).\n"
-@@ -415,6 +452,7 @@
- msgstr "%s: selle käsuga ei saa muuta DNS domeeni nime\n"
- 
- #: ../hostname.c:339
-+#, c-format
- msgid ""
- "\n"
- "Unless you are using bind or NIS for host lookups you can change the DNS\n"
-@@ -423,6 +461,7 @@
- "Kui Te EI kasuta bind'i ega NIS'i nimede lahendamiseks, saate DNS domeeni\n"
- 
- #: ../hostname.c:340
-+#, c-format
- msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
- msgstr "(mis on täieliku nime osa) nime muuta failist /etc/hosts.\n"
- 
-@@ -441,76 +480,97 @@
- msgid "getnodename()=`%s'\n"
- msgstr "getnodename()=`%s'\n"
- 
--#: ../ifconfig.c:110
-+#: ../ifconfig.c:107
-+#, c-format
- msgid ""
--"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
-+"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
- "Flg\n"
- msgstr ""
--"Liides  MTU Meetr. RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
-+"Liides  MTU Meetr RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
- "Lip\n"
- 
--#: ../ifconfig.c:132 ../ifconfig.c:164
--#, c-format
--msgid "%s: unknown interface: %s\n"
--msgstr "ifconfig: tundmatu liides %s: %s\n"
-+#: ../ifconfig.c:129 ../ifconfig.c:161
-+#, fuzzy, c-format
-+msgid "%s: ERROR while getting interface flags: %s\n"
-+msgstr "%s: viga liidese info küsimisel: %s\n"
- 
--#: ../ifconfig.c:156 ../ifconfig.c:740 ../ifconfig.c:831 ../ifconfig.c:937
-+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
-+#: ../ifconfig.c:973
-+#, c-format
- msgid "No support for INET on this system.\n"
- msgstr "Antud süsteem ei toeta INET aadressiperekonda\n"
- 
--#: ../ifconfig.c:179
-+#: ../ifconfig.c:193
-+#, fuzzy, c-format
-+msgid "%s: ERROR while testing interface flags: %s\n"
-+msgstr "%s: viga liidese info küsimisel: %s\n"
-+
-+#: ../ifconfig.c:202
-+#, fuzzy, c-format
- msgid ""
- "Usage:\n"
--"  ifconfig [-a] [-i] [-v] [-s] <interface> [[<AF>] <address>]\n"
-+"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
- msgstr ""
- "Kasutamine:\n"
- "  ifconfig [-a] [-i] [-v] [-s] <liides> [[<AF>] <aadress>]\n"
- 
--#: ../ifconfig.c:181
-+#: ../ifconfig.c:204
-+#, c-format
- msgid "  [add <address>[/<prefixlen>]]\n"
- msgstr "  [add <aadress>[/<prefiksi pikkus>]]\n"
- 
--#: ../ifconfig.c:182
-+#: ../ifconfig.c:205
-+#, c-format
- msgid "  [del <address>[/<prefixlen>]]\n"
- msgstr "  [del <aadress>[/<prefiksi pikkus>]]\n"
- 
--#: ../ifconfig.c:183
-+#: ../ifconfig.c:206
-+#, c-format
- msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
- msgstr "  [[-]broadcast [<aadress>]]  [[-]pointopoint [<aadress>]]\n"
- 
--#: ../ifconfig.c:184
-+#: ../ifconfig.c:207
-+#, c-format
- msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
- msgstr "  [netmask <aadress>]  [dstaddr <aadress>]  [tunnel <aadress>]\n"
- 
--#: ../ifconfig.c:187
-+#: ../ifconfig.c:210
-+#, c-format
- msgid "  [outfill <NN>] [keepalive <NN>]\n"
- msgstr "  [outfill <NN>] [keepalive <NN>]\n"
- 
--#: ../ifconfig.c:189
-+#: ../ifconfig.c:212
-+#, c-format
- msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
- msgstr "  [hw <HW> <aadress>]  [metric <NN>]  [mtu <NN>]\n"
- 
--#: ../ifconfig.c:190
-+#: ../ifconfig.c:213
-+#, c-format
- msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
- msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
- 
--#: ../ifconfig.c:191
-+#: ../ifconfig.c:214
-+#, c-format
- msgid "  [multicast]  [[-]promisc]\n"
- msgstr "  [multicast]  [[-]promisc]\n"
- 
--#: ../ifconfig.c:192
-+#: ../ifconfig.c:215
-+#, c-format
- msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
- msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <tüüp>]\n"
- 
--#: ../ifconfig.c:194
-+#: ../ifconfig.c:217
-+#, c-format
- msgid "  [txqueuelen <NN>]\n"
- msgstr "  [txqueuelen <NN>]\n"
- 
--#: ../ifconfig.c:197
-+#: ../ifconfig.c:220
-+#, c-format
- msgid "  [[-]dynamic]\n"
- msgstr "  [[-]dynamic]\n"
- 
--#: ../ifconfig.c:199
-+#: ../ifconfig.c:222
-+#, c-format
- msgid ""
- "  [up|down] ...\n"
- "\n"
-@@ -518,73 +578,134 @@
- "  [up|down] ...\n"
- "\n"
- 
--#: ../ifconfig.c:201
-+#: ../ifconfig.c:224
-+#, c-format
- msgid "  <HW>=Hardware Type.\n"
- msgstr "  <HW>=riistvara tüüp\n"
- 
--#: ../ifconfig.c:202
-+#: ../ifconfig.c:225
-+#, c-format
- msgid "  List of possible hardware types:\n"
- msgstr "  Võimalike riistvara tüüpide nimekiri:\n"
- 
- #. 1 = ARPable
--#: ../ifconfig.c:204
-+#: ../ifconfig.c:227
- #, c-format
- msgid "  <AF>=Address family. Default: %s\n"
- msgstr "  <AF>=aadressiperekond, vaikimisi %s\n"
- 
--#: ../ifconfig.c:205
-+#: ../ifconfig.c:228
-+#, c-format
- msgid "  List of possible address families:\n"
- msgstr "  Võimalike aadressiperekondade nimekiri:\n"
- 
--#: ../ifconfig.c:361
-+#: ../ifconfig.c:303
-+#, c-format
-+msgid "ifconfig: option `%s' not recognised.\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:305 ../ifconfig.c:962
-+#, c-format
-+msgid "ifconfig: `--help' gives usage information.\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:380
-+#, c-format
- msgid "Unknown media type.\n"
- msgstr "Tundmatu meedia tüüp\n"
- 
--#: ../ifconfig.c:653
-+#: ../ifconfig.c:417
-+#, c-format
-+msgid ""
-+"Warning: Interface %s still in promisc mode... maybe other application is "
-+"running?\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:429
-+#, c-format
-+msgid "Warning: Interface %s still in MULTICAST mode.\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:441
-+#, c-format
-+msgid "Warning: Interface %s still in ALLMULTI mode.\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:465
-+#, c-format
-+msgid "Warning: Interface %s still in DYNAMIC mode.\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:523
-+#, c-format
-+msgid "Warning: Interface %s still in BROADCAST mode.\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:652
-+#, c-format
-+msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:684
- #, c-format
- msgid "hw address type `%s' has no handler to set address. failed.\n"
- msgstr ""
- "riistvara aadressi tüübil `%s' pole käsitlejat aadressi seadmiseks - ebaõnn\n"
- 
--#: ../ifconfig.c:662
-+#: ../ifconfig.c:693
- #, c-format
- msgid "%s: invalid %s address.\n"
- msgstr "%s: vigane %s aadress\n"
- 
--#: ../ifconfig.c:706 ../ifconfig.c:796 ../ifconfig.c:882
-+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
-+#, c-format
- msgid "No support for INET6 on this system.\n"
- msgstr "Antud süsteem ei toeta INET6 aadressiperekonda\n"
- 
--#: ../ifconfig.c:749 ../ifconfig.c:840
-+#: ../ifconfig.c:780 ../ifconfig.c:871
- #, c-format
- msgid "Interface %s not initialized\n"
- msgstr "Liides %s pole initsialiseeritud\n"
- 
--#: ../ifconfig.c:761 ../ifconfig.c:851
-+#: ../ifconfig.c:792 ../ifconfig.c:882
-+#, c-format
- msgid "Bad address.\n"
- msgstr "Vigane aadress\n"
- 
--#: ../ifconfig.c:854
-+#: ../ifconfig.c:885
-+#, c-format
- msgid "Address deletion not supported on this system.\n"
- msgstr "Antud süsteem ei toeta aadresside kustutamist\n"
- 
--#: ../ifconfig.c:947
-+#: ../ifconfig.c:957
-+#, fuzzy, c-format
-+msgid "ifconfig: Cannot set address for this protocol family.\n"
-+msgstr "Ei oska seada aadresse aadressiperekonna %d jaoks\n"
-+
-+#: ../ifconfig.c:983
-+#, c-format
- msgid "No support for ECONET on this system.\n"
- msgstr "Antud süsteem ei toeta ECONET aadressiperekonda\n"
- 
--#: ../ifconfig.c:955
-+#: ../ifconfig.c:991
- #, c-format
- msgid "Don't know how to set addresses for family %d.\n"
- msgstr "Ei oska seada aadresse aadressiperekonna %d jaoks\n"
- 
--#: ../netstat.c:429
-+#: ../ifconfig.c:1021
-+#, c-format
-+msgid "WARNING: at least one error occured. (%d)\n"
-+msgstr ""
-+
-+#: ../netstat.c:434
- #, c-format
- msgid ""
- "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
- msgstr ""
- "(\"-p\" jaoks ei saanud infot lugeda: geteuid()=%d, aga vaja oleks root'u)\n"
- 
--#: ../netstat.c:433
-+#: ../netstat.c:438
-+#, c-format
- msgid ""
- "(Not all processes could be identified, non-owned process info\n"
- " will not be shown, you would have to be root to see it all.)\n"
-@@ -592,210 +713,223 @@
- "(Mõnesid protsesse ei saanud identifitseerida, teiste kasutajate\n"
- "info lugemiseks peab olema root)\n"
- 
--#: ../netstat.c:440 ../netstat.c:1171 ../netstat.c:1248
-+#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
- msgid "LISTENING"
- msgstr "LISTENING"
- 
--#: ../netstat.c:441
-+#: ../netstat.c:446
- msgid "CONN SENT"
- msgstr "CONN SENT"
- 
--#: ../netstat.c:442 ../netstat.c:1250
-+#: ../netstat.c:447 ../netstat.c:1268
- msgid "DISC SENT"
- msgstr "DISC SENT"
- 
--#: ../netstat.c:443 ../netstat.c:510 ../netstat.c:889 ../netstat.c:1251
-+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
- msgid "ESTABLISHED"
- msgstr "ESTABLISHED"
- 
--#: ../netstat.c:465
-+#: ../netstat.c:470
-+#, c-format
- msgid "Active NET/ROM sockets\n"
- msgstr "Aktiivsed NET/ROM soklid\n"
- 
--#: ../netstat.c:466
-+#: ../netstat.c:471
-+#, c-format
- msgid ""
--"User       Dest       Source     Device  State        Vr/Vs    Send-Q  "
--"Recv-Q\n"
-+"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
-+"Q\n"
- msgstr ""
- "Kasutaja   Sihtpunkt  Lähtepunkt Liides  Olek         Vr/Vs    SaatJrk "
- "VvJrk\n"
- 
--#: ../netstat.c:476 ../netstat.c:1290
-+#: ../netstat.c:481 ../netstat.c:1308
- #, c-format
- msgid "Problem reading data from %s\n"
- msgstr "Probleem andmete lugemisel failist %s\n"
- 
--#: ../netstat.c:511
-+#: ../netstat.c:516
- msgid "SYN_SENT"
- msgstr "SYN_SENT"
- 
--#: ../netstat.c:512
-+#: ../netstat.c:517
- msgid "SYN_RECV"
- msgstr "SYN_RECV"
- 
--#: ../netstat.c:513
-+#: ../netstat.c:518
- msgid "FIN_WAIT1"
- msgstr "FIN_WAIT1"
- 
--#: ../netstat.c:514
-+#: ../netstat.c:519
- msgid "FIN_WAIT2"
- msgstr "FIN_WAIT2"
- 
--#: ../netstat.c:515
-+#: ../netstat.c:520
- msgid "TIME_WAIT"
- msgstr "TIME_WAIT"
- 
--#: ../netstat.c:516
-+#: ../netstat.c:521
- msgid "CLOSE"
- msgstr "CLOSE"
- 
--#: ../netstat.c:517
-+#: ../netstat.c:522
- msgid "CLOSE_WAIT"
- msgstr "CLOSE_WAIT"
- 
--#: ../netstat.c:518
-+#: ../netstat.c:523
- msgid "LAST_ACK"
- msgstr "LAST_ACK"
- 
--#: ../netstat.c:519
-+#: ../netstat.c:524
- msgid "LISTEN"
- msgstr "LISTEN"
- 
--#: ../netstat.c:520
-+#: ../netstat.c:525
- msgid "CLOSING"
- msgstr "CLOSING"
- 
--#: ../netstat.c:587
-+#: ../netstat.c:596
- #, c-format
- msgid "warning, got bogus igmp6 line %d.\n"
- msgstr "Hoiatus - sain imeliku igmp6 rea (nr. %d)\n"
- 
--#: ../netstat.c:592 ../netstat.c:630 ../netstat.c:751 ../netstat.c:883
--#: ../netstat.c:1014 ../netstat.c:1019
-+#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
-+#: ../netstat.c:1032 ../netstat.c:1037
- #, c-format
- msgid "netstat: unsupported address family %d !\n"
- msgstr "netstat: aadressiperekonda %d ei toetata\n"
- 
--#: ../netstat.c:605 ../netstat.c:610 ../netstat.c:618 ../netstat.c:625
-+#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
- #, c-format
- msgid "warning, got bogus igmp line %d.\n"
- msgstr "Hoiatus - sain imeliku igmp rea (nr. %d)\n"
- 
--#: ../netstat.c:668
-+#: ../netstat.c:677
-+#, c-format
- msgid "Active X.25 sockets\n"
- msgstr "Aktiivsed X.25 soklid\n"
- 
- #. IMHO, Vr/Vs is not very usefull --SF
--#: ../netstat.c:670
-+#: ../netstat.c:679
-+#, c-format
- msgid ""
--"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  "
--"Recv-Q\n"
-+"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
-+"Q\n"
- msgstr ""
- "Sihtpunkt    Lähtepunkt      Liides  LCI  Olek         Vr/Vs  SaatJrk VvJrk\n"
- 
--#: ../netstat.c:747
-+#: ../netstat.c:759
-+#, c-format
- msgid "warning, got bogus tcp line.\n"
- msgstr "Hoiatus - sain imeliku tcp rea\n"
- 
--#: ../netstat.c:788 ../netstat.c:938 ../netstat.c:1057
-+#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
- #, c-format
- msgid "off (0.00/%ld/%d)"
- msgstr "eikäi ((0.00/%ld/%d)"
- 
--#: ../netstat.c:792
-+#: ../netstat.c:804
- #, c-format
- msgid "on (%2.2f/%ld/%d)"
- msgstr "käib (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:797
-+#: ../netstat.c:809
- #, c-format
- msgid "keepalive (%2.2f/%ld/%d)"
- msgstr "keepalive (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:802
-+#: ../netstat.c:814
- #, c-format
- msgid "timewait (%2.2f/%ld/%d)"
- msgstr "timewait (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:807 ../netstat.c:947 ../netstat.c:1067
-+#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
- #, c-format
- msgid "unkn-%d (%2.2f/%ld/%d)"
- msgstr "eitea-%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:879
-+#: ../netstat.c:894
-+#, c-format
- msgid "warning, got bogus udp line.\n"
- msgstr "Hoiatus - sain imeliku udp rea\n"
- 
--#: ../netstat.c:897 ../netstat.c:1157 ../netstat.c:1190
-+#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
- msgid "UNKNOWN"
- msgstr "TUNDMATU"
- 
--#: ../netstat.c:943 ../netstat.c:1062
-+#: ../netstat.c:958 ../netstat.c:1080
- #, c-format
- msgid "on%d (%2.2f/%ld/%d)"
- msgstr "käib-%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:1028
-+#: ../netstat.c:1046
-+#, c-format
- msgid "warning, got bogus raw line.\n"
- msgstr "Hoiatus - sain imeliku raw rea\n"
- 
--#: ../netstat.c:1110
-+#: ../netstat.c:1128
-+#, c-format
- msgid "warning, got bogus unix line.\n"
- msgstr "Hoiatus - sain imeliku unix rea\n"
- 
--#: ../netstat.c:1137
-+#: ../netstat.c:1155
- msgid "STREAM"
- msgstr "STREAM"
- 
--#: ../netstat.c:1141
-+#: ../netstat.c:1159
- msgid "DGRAM"
- msgstr "DGRAM"
- 
--#: ../netstat.c:1145
-+#: ../netstat.c:1163
- msgid "RAW"
- msgstr "RAW"
- 
--#: ../netstat.c:1149
-+#: ../netstat.c:1167
- msgid "RDM"
- msgstr "RDM"
- 
--#: ../netstat.c:1153
-+#: ../netstat.c:1171
- msgid "SEQPACKET"
- msgstr "SEQPACKET"
- 
--#: ../netstat.c:1162
-+#: ../netstat.c:1180
- msgid "FREE"
- msgstr "VABA"
- 
--#: ../netstat.c:1178
-+#: ../netstat.c:1196
- msgid "CONNECTING"
- msgstr "ÜHENDUMAS"
- 
--#: ../netstat.c:1182
-+#: ../netstat.c:1200
- msgid "CONNECTED"
- msgstr "ÜHENDATUD"
- 
--#: ../netstat.c:1186
-+#: ../netstat.c:1204
- msgid "DISCONNECTING"
- msgstr "LAHTIÜHENDUMAS"
- 
--#: ../netstat.c:1217
-+#: ../netstat.c:1235
-+#, c-format
- msgid "Active UNIX domain sockets "
- msgstr "Aktiivsed UNIX domeeni soklid "
- 
--#: ../netstat.c:1219 ../netstat.c:1729
-+#: ../netstat.c:1237 ../netstat.c:1756
-+#, c-format
- msgid "(servers and established)"
- msgstr "(serverid ja ühendatud)"
- 
--#: ../netstat.c:1222 ../netstat.c:1732
-+#: ../netstat.c:1240 ../netstat.c:1759
-+#, c-format
- msgid "(only servers)"
- msgstr "(ainult serverid)"
- 
--#: ../netstat.c:1224 ../netstat.c:1734
-+#: ../netstat.c:1242 ../netstat.c:1761
-+#, c-format
- msgid "(w/o servers)"
- msgstr "(ilma serveriteta)"
- 
--#: ../netstat.c:1227
-+#: ../netstat.c:1245
-+#, c-format
- msgid ""
- "\n"
- "Proto RefCnt Flags       Type       State         I-Node"
-@@ -803,32 +937,36 @@
- "\n"
- "Proto Mitu   Lipud       Tüüp       Olek         I-kirje "
- 
--#: ../netstat.c:1229
-+#: ../netstat.c:1247
-+#, c-format
- msgid " Path\n"
- msgstr "Tee\n"
- 
--#: ../netstat.c:1249
-+#: ../netstat.c:1267
- msgid "SABM SENT"
- msgstr "SABM SENT"
- 
--#: ../netstat.c:1252
-+#: ../netstat.c:1270
- msgid "RECOVERY"
- msgstr "RECOVERY"
- 
--#: ../netstat.c:1266
-+#: ../netstat.c:1284
-+#, c-format
- msgid "Active AX.25 sockets\n"
- msgstr "Aktiivsed AX.25 soklid\n"
- 
--#: ../netstat.c:1267
-+#: ../netstat.c:1285
-+#, c-format
- msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
- msgstr "Sihtpunkt  Lähtepunkt Liides  Olek         Vr/Vs    SaatJrk VvJrk\n"
- 
--#: ../netstat.c:1310
-+#: ../netstat.c:1328
- #, c-format
- msgid "problem reading data from %s\n"
- msgstr "Probleem andmete lugemisel failist %s\n"
- 
--#: ../netstat.c:1361
-+#: ../netstat.c:1379
-+#, c-format
- msgid ""
- "Active IPX sockets\n"
- "Proto Recv-Q Send-Q Local Address              Foreign Address            "
-@@ -838,47 +976,53 @@
- "Proto VvJrk  SaatJrk Kohalik aadress           Väline aadress             "
- "Olek "
- 
--#: ../netstat.c:1363
-+#: ../netstat.c:1381
-+#, c-format
- msgid " User"
- msgstr " Kasutaja"
- 
--#: ../netstat.c:1397
-+#: ../netstat.c:1415
- msgid "ESTAB"
- msgstr "ESTAB"
- 
--#: ../netstat.c:1405
-+#: ../netstat.c:1423
- msgid "UNK."
- msgstr "UNK."
- 
--#: ../netstat.c:1443
-+#: ../netstat.c:1461
-+#, c-format
- msgid "Kernel Interface table\n"
- msgstr "Tuuma liideste tabel\n"
- 
--#: ../netstat.c:1447
-+#: ../netstat.c:1465
-+#, fuzzy, c-format
- msgid ""
--"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
-+"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
- "Flg\n"
- msgstr ""
--"Liides  MTU Meetr RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
-+"Liides  MTU Meetr. RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
- "Lip\n"
- 
--#: ../netstat.c:1451
-+#: ../netstat.c:1469
- msgid "missing interface information"
- msgstr "Puudulik informatsioon liideste kohta"
- 
--#: ../netstat.c:1474
-+#: ../netstat.c:1492
-+#, c-format
- msgid ""
--"usage: netstat [-veenNcCF] [<Af>] -r         netstat "
--"{-V|--version|-h|--help}\n"
-+"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
-+"help}\n"
- msgstr ""
- "Kasutamine: netstat [-veenNcCF] [<Af>] -r\n"
- "            netstat {-V|--version|-h|--help}\n"
- 
--#: ../netstat.c:1475
-+#: ../netstat.c:1493
-+#, c-format
- msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
- msgstr "            netstat [-vnNcaeol] [<Sokkel> ...]\n"
- 
--#: ../netstat.c:1476
-+#: ../netstat.c:1494
-+#, c-format
- msgid ""
- "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
- "\n"
-@@ -886,25 +1030,30 @@
- "            netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
- "\n"
- 
--#: ../netstat.c:1478
-+#: ../netstat.c:1496
-+#, c-format
- msgid "        -r, --route              display routing table\n"
- msgstr "        -r, --route              ruutingutabeli näitamine\n"
- 
--#: ../netstat.c:1479
-+#: ../netstat.c:1497
-+#, c-format
- msgid "        -i, --interfaces         display interface table\n"
- msgstr "        -i, --interfaces         liideste tabeli näitamine\n"
- 
--#: ../netstat.c:1480
-+#: ../netstat.c:1498
-+#, c-format
- msgid "        -g, --groups             display multicast group memberships\n"
- msgstr "        -g, --groups             multiedastuse gruppide näitamine\n"
- 
--#: ../netstat.c:1481
-+#: ../netstat.c:1499
-+#, c-format
- msgid ""
- "        -s, --statistics         display networking statistics (like SNMP)\n"
- msgstr ""
- "        -s, --statistics         võrgu statistika näitamine (SNMP stiilis)\n"
- 
--#: ../netstat.c:1483
-+#: ../netstat.c:1501
-+#, c-format
- msgid ""
- "        -M, --masquerade         display masqueraded connections\n"
- "\n"
-@@ -912,36 +1061,39 @@
- "        -M, --masquerade         maskeeritavate ühenduste näitamine\n"
- "\n"
- 
--#: ../netstat.c:1486 ../route.c:86
--msgid "        -n, --numeric            dont resolve names\n"
--msgstr "        -n, --numeric            mitte lahendada numbreid nimedeks\n"
--
--#: ../netstat.c:1487
--msgid "        --numeric-hosts          dont resolve host names\n"
-+#: ../netstat.c:1505
-+#, fuzzy, c-format
-+msgid "        --numeric-hosts          don't resolve host names\n"
- msgstr "        --numeric-hosts          mitte lahendada hostinimesid\n"
- 
--#: ../netstat.c:1488
--msgid "        --numeric-ports          dont resolve port names\n"
-+#: ../netstat.c:1506
-+#, fuzzy, c-format
-+msgid "        --numeric-ports          don't resolve port names\n"
- msgstr "        --numeric-ports          mitte lahendada pordinimesid\n"
- 
--#: ../netstat.c:1489
--msgid "        --numeric-users          dont resolve user names\n"
-+#: ../netstat.c:1507
-+#, fuzzy, c-format
-+msgid "        --numeric-users          don't resolve user names\n"
- msgstr "        --numeric-users          mitte lahendada kasutajanimesid\n"
- 
--#: ../netstat.c:1490
-+#: ../netstat.c:1508
-+#, c-format
- msgid "        -N, --symbolic           resolve hardware names\n"
- msgstr "        -N, --symbolic           lahendada riistvara aadressid\n"
- 
--#: ../netstat.c:1491 ../route.c:87
-+#: ../netstat.c:1509 ../route.c:88
-+#, c-format
- msgid "        -e, --extend             display other/more information\n"
- msgstr "        -e, --extend             muu info/lisainfo näitamine\n"
- 
--#: ../netstat.c:1492
-+#: ../netstat.c:1510
-+#, c-format
- msgid "        -p, --programs           display PID/Program name for sockets\n"
- msgstr ""
- "        -p, --programs           soklite kohta PID/protsessi nime näitamine\n"
- 
--#: ../netstat.c:1493
-+#: ../netstat.c:1511
-+#, c-format
- msgid ""
- "        -c, --continuous         continuous listing\n"
- "\n"
-@@ -949,22 +1101,26 @@
- "        -c, --continuous         pidevalt uuenev nimekiri\n"
- "\n"
- 
--#: ../netstat.c:1494
-+#: ../netstat.c:1512
-+#, c-format
- msgid "        -l, --listening          display listening server sockets\n"
- msgstr "        -l, --listening          kuulavate serversoklite näitamine\n"
- 
--#: ../netstat.c:1495
-+#: ../netstat.c:1513
-+#, c-format
- msgid ""
- "        -a, --all, --listening   display all sockets (default: connected)\n"
- msgstr ""
- "        -a, --all, --listening   kõigi soklite näitamine (vaikimisi "
- "ühendatud)\n"
- 
--#: ../netstat.c:1496
-+#: ../netstat.c:1514
-+#, c-format
- msgid "        -o, --timers             display timers\n"
- msgstr "        -o, --timers             taimerite näitamine\n"
- 
--#: ../netstat.c:1497 ../route.c:88
-+#: ../netstat.c:1515 ../route.c:89
-+#, c-format
- msgid ""
- "        -F, --fib                display Forwarding Information Base "
- "(default)\n"
-@@ -972,7 +1128,8 @@
- "        -F, --fib                üldiste ruutingutabelite näitamine "
- "(vaikimisi)\n"
- 
--#: ../netstat.c:1498 ../route.c:89
-+#: ../netstat.c:1516 ../route.c:90
-+#, c-format
- msgid ""
- "        -C, --cache              display routing cache instead of FIB\n"
- "\n"
-@@ -981,108 +1138,121 @@
- "näitamine\n"
- "\n"
- 
--#: ../netstat.c:1500
-+#: ../netstat.c:1518
-+#, c-format
- msgid ""
--"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
--"--netrom\n"
-+"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-+"netrom\n"
- msgstr ""
--"  <Sokkel>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
--"--netrom\n"
-+"  <Sokkel>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-+"netrom\n"
- 
--#: ../netstat.c:1501 ../route.c:91
--#, c-format
--msgid "  <AF>=Use '-A <af>' or '--<af>' Default: %s\n"
-+#: ../netstat.c:1519
-+#, fuzzy, c-format
-+msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
- msgstr "  <AF>=kasutage '-A <af>' või '--<af>' vaikimisi: %s\n"
- 
--#: ../netstat.c:1502 ../route.c:92
-+#: ../netstat.c:1520 ../route.c:93
-+#, c-format
- msgid "  List of possible address families (which support routing):\n"
- msgstr "  Võimalike ruutingu toetavate aadressiperekondade nimekiri:\n"
- 
--#: ../netstat.c:1726
-+#: ../netstat.c:1753
-+#, c-format
- msgid "Active Internet connections "
- msgstr "Aktiivsed internetiühendused "
- 
--#: ../netstat.c:1736
-+#: ../netstat.c:1763
-+#, c-format
- msgid ""
- "\n"
--"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
--"  "
-+"Proto Recv-Q Send-Q Local Address           Foreign Address         "
-+"State      "
- msgstr ""
- "\n"
--"Proto  VvJrk SaatJrk Kohalik aadress        Väline aadress          Olek     "
--"  "
-+"Proto  VvJrk SaatJrk Kohalik aadress        Väline aadress          "
-+"Olek       "
- 
--#: ../netstat.c:1738
-+#: ../netstat.c:1765
-+#, c-format
- msgid " User       Inode     "
- msgstr " Kasutaja   I-kirje   "
- 
--#: ../netstat.c:1741
-+#: ../netstat.c:1768
-+#, c-format
- msgid " Timer"
- msgstr " Taimer"
- 
--#: ../netstat.c:1771
-+#: ../netstat.c:1798
-+#, c-format
- msgid "IPv4 Group Memberships\n"
- msgstr "IPv4 grupikuuluvused\n"
- 
--#: ../netstat.c:1772
-+#: ../netstat.c:1799
-+#, c-format
- msgid "Interface       RefCnt Group\n"
- msgstr "Liides          Mitu   Grupp\n"
- 
--#: ../rarp.c:43
-+#: ../rarp.c:44
- msgid "This kernel does not support RARP.\n"
- msgstr "rarp: tuum ei toeta RARP'i\n"
- 
--#: ../rarp.c:82
-+#: ../rarp.c:83
- #, c-format
- msgid "no RARP entry for %s.\n"
- msgstr "rarp: %s jaoks pole RARP kirjet\n"
- 
--#: ../rarp.c:95
-+#: ../rarp.c:96
- #, c-format
- msgid "%s: bad hardware address\n"
- msgstr "rarp: vigane riistvaraline aadress %s\n"
- 
--#: ../rarp.c:127
-+#: ../rarp.c:128
- #, c-format
- msgid "rarp: cannot open file %s:%s.\n"
- msgstr "rarp: ei saa avada faili %s:%s\n"
- 
--#: ../rarp.c:139
-+#: ../rarp.c:140
- #, c-format
- msgid "rarp: format error at %s:%u\n"
- msgstr "rarp: vorminguviga failis %s real %u\n"
- 
--#: ../rarp.c:143 ../rarp.c:287
-+#: ../rarp.c:144 ../rarp.c:289
- #, c-format
- msgid "rarp: %s: unknown host\n"
- msgstr "rarp: tundmatu host %s\n"
- 
--#: ../rarp.c:146
-+#: ../rarp.c:147
- #, c-format
- msgid "rarp: cannot set entry from %s:%u\n"
- msgstr "rarp: ei saa kehtestada kirjet failist %s realt %u\n"
- 
--#: ../rarp.c:175
-+#: ../rarp.c:176
-+#, c-format
- msgid "Usage: rarp -a                               list entries in cache.\n"
- msgstr ""
- "Kasutamine:\n"
- "  rarp -a                              puhvris olevate kirjete vaatamine\n"
- 
--#: ../rarp.c:176
-+#: ../rarp.c:177
-+#, c-format
- msgid "       rarp -d <hostname>                    delete entry from cache.\n"
- msgstr "  rarp -d <hosti nimi>                 kirje kustutamine puhvrist\n"
- 
--#: ../rarp.c:177
-+#: ../rarp.c:178
-+#, c-format
- msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
- msgstr "  rarp [<HW>] -s <hosti nimi> <hwaddr> kirje lisamine puhvrisse\n"
- 
--#: ../rarp.c:178
-+#: ../rarp.c:179
-+#, c-format
- msgid ""
- "       rarp -f                               add entries from /etc/ethers.\n"
- msgstr ""
- "  rarp -f                              kirjete lisamine failist /etc/ethers\n"
- 
--#: ../rarp.c:179
-+#: ../rarp.c:180
-+#, c-format
- msgid ""
- "       rarp -V                               display program version.\n"
- "\n"
-@@ -1090,24 +1260,26 @@
- "  rarp -V                              programmi versiooni näitamine\n"
- "\n"
- 
--#: ../rarp.c:236
-+#: ../rarp.c:238
- #, c-format
- msgid "%s: illegal option mix.\n"
- msgstr "%s: lubamatu võtmete kombinatsioon\n"
- 
--#: ../rarp.c:267
-+#: ../rarp.c:269
- #, c-format
- msgid "rarp: %s: unknown hardware type.\n"
- msgstr "rarp: tundmatu riistvara tüüp %s\n"
- 
--#: ../route.c:79
-+#: ../route.c:80
-+#, c-format
- msgid ""
- "Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
- msgstr ""
- "Kasutamine:\n"
- "    route [-nNvee] [-FC] [<AF>]           Tuuma ruutingutabeli näitamine\n"
- 
--#: ../route.c:80
-+#: ../route.c:81
-+#, c-format
- msgid ""
- "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
- "\n"
-@@ -1115,7 +1287,8 @@
- "    route [-v] [-FC] {add|del|flush} ...  Tuuma ruutingutabeli muutmine\n"
- "\n"
- 
--#: ../route.c:82
-+#: ../route.c:83
-+#, c-format
- msgid ""
- "       route {-h|--help} [<AF>]              Detailed usage syntax for "
- "specified AF.\n"
-@@ -1123,7 +1296,8 @@
- "    route {-h|--help} [<AF>]              Detailne süntaks perekonna AF "
- "jaoks\n"
- 
--#: ../route.c:83
-+#: ../route.c:84
-+#, c-format
- msgid ""
- "       route {-V|--version}                  Display version/author and "
- "exit.\n"
-@@ -1132,15 +1306,23 @@
- "    route {-V|--version}                  Versiooni ja oskuste näitamine\n"
- "\n"
- 
-+#: ../route.c:92
-+#, fuzzy, c-format
-+msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
-+msgstr "  <AF>=kasutage '-A <af>' või '--<af>' vaikimisi: %s\n"
-+
- #: ../plipconfig.c:66
-+#, c-format
- msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
- msgstr "Kasutamine:  plipconfig [-a] [-i] [-v] liides\n"
- 
- #: ../plipconfig.c:67
-+#, c-format
- msgid "                  [nibble NN] [trigger NN]\n"
- msgstr "                        [nibble NN] [trigger NN]\n"
- 
- #: ../plipconfig.c:68
-+#, c-format
- msgid "       plipconfig -V | --version\n"
- msgstr "             plipconfig -V | --version\n"
- 
-@@ -1149,25 +1331,30 @@
- msgid "%s\tnibble %lu  trigger %lu\n"
- msgstr "%s\tnibble %lu  trigger %lu\n"
- 
--#: ../iptunnel.c:84
-+#: ../iptunnel.c:85
-+#, c-format
- msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
- msgstr "Kasutamine: iptunnel { add | change | del | show } [ NIMI ]\n"
- 
--#: ../iptunnel.c:85
-+#: ../iptunnel.c:86
-+#, c-format
- msgid ""
- "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
- msgstr ""
- "             [ mode { ipip | gre | sit } ] [ remote AADR ] [ local AADR ]\n"
- 
--#: ../iptunnel.c:86
-+#: ../iptunnel.c:87
-+#, c-format
- msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
- msgstr "             [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
- 
--#: ../iptunnel.c:87
-+#: ../iptunnel.c:88
-+#, c-format
- msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
- msgstr "             [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev LIIDES ]\n"
- 
--#: ../iptunnel.c:88
-+#: ../iptunnel.c:89
-+#, c-format
- msgid ""
- "       iptunnel -V | --version\n"
- "\n"
-@@ -1175,83 +1362,99 @@
- "             iptunnel -V | --version\n"
- "\n"
- 
--#: ../iptunnel.c:89
-+#: ../iptunnel.c:90
-+#, c-format
- msgid "Where: NAME := STRING\n"
- msgstr "Kus:   NIMI := STRING\n"
- 
--#: ../iptunnel.c:90
-+#: ../iptunnel.c:91
-+#, c-format
- msgid "       ADDR := { IP_ADDRESS | any }\n"
- msgstr "       AADR := { IP_AADRESS | any }\n"
- 
--#: ../iptunnel.c:91
-+#: ../iptunnel.c:92
-+#, c-format
- msgid "       TOS  := { NUMBER | inherit }\n"
- msgstr "       TOS  := { ARV | inherit }\n"
- 
--#: ../iptunnel.c:92
-+#: ../iptunnel.c:93
-+#, c-format
- msgid "       TTL  := { 1..255 | inherit }\n"
- msgstr "       TTL  := { 1..255 | inherit }\n"
- 
--#: ../iptunnel.c:93
-+#: ../iptunnel.c:94
-+#, c-format
- msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
- msgstr ""
- "       KEY  := { PUNKTIDEGA_ARVUNELIK | ARV }\n"
- "       LIIDES := FÜÜSILISE_LIIDESE_NIMI\n"
- 
--#: ../iptunnel.c:331
-+#: ../iptunnel.c:332
-+#, c-format
- msgid "Keys are not allowed with ipip and sit.\n"
- msgstr "ipip ja sit juures ei ole võtmed lubatud\n"
- 
--#: ../iptunnel.c:351
-+#: ../iptunnel.c:352
-+#, c-format
- msgid "Broadcast tunnel requires a source address.\n"
- msgstr "Leviedastusega tunnel vajab lähteaadressi\n"
- 
--#: ../iptunnel.c:366
-+#: ../iptunnel.c:367
-+#, c-format
- msgid "ttl != 0 and noptmudisc are incompatible\n"
- msgstr "ttl != 0 ning noptmudisc ei sobi kokku\n"
- 
--#: ../iptunnel.c:378
-+#: ../iptunnel.c:379
-+#, c-format
- msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
- msgstr "Ei suuda määrata tunneli moodi (ipip, gre või sit)\n"
- 
--#: ../iptunnel.c:416
-+#: ../iptunnel.c:417
- #, c-format
- msgid "%s: %s/ip  remote %s  local %s "
- msgstr "%s: %s/ip teises otsas %s  siin %s "
- 
--#: ../iptunnel.c:420
-+#: ../iptunnel.c:421
- msgid "unknown"
- msgstr "tundmatu"
- 
--#: ../iptunnel.c:452
-+#: ../iptunnel.c:453
-+#, c-format
- msgid "  Drop packets out of sequence.\n"
- msgstr "  Järjekorravälised paketid visatakse minema\n"
- 
--#: ../iptunnel.c:454
-+#: ../iptunnel.c:455
-+#, c-format
- msgid "  Checksum in received packet is required.\n"
- msgstr "  Vastuvõetavates pakettides on kontrollsumma kohustuslik\n"
- 
--#: ../iptunnel.c:456
-+#: ../iptunnel.c:457
-+#, c-format
- msgid "  Sequence packets on output.\n"
- msgstr "  Väljuvad paketid varustatakse järjekorranumbritega\n"
- 
--#: ../iptunnel.c:458
-+#: ../iptunnel.c:459
-+#, c-format
- msgid "  Checksum output packets.\n"
- msgstr "  Väljuvad paketid varustatakse kontrollsummaga\n"
- 
--#: ../iptunnel.c:486
-+#: ../iptunnel.c:487
-+#, c-format
- msgid "Wrong format of /proc/net/dev. Sorry.\n"
- msgstr "/proc/net/dev on vales formaadis. Vale tuuma versioon?\n"
- 
--#: ../iptunnel.c:499
-+#: ../iptunnel.c:500
- #, c-format
- msgid "Failed to get type of [%s]\n"
- msgstr "Ei suutnud kindlaks teha liidese %s tüüpi\n"
- 
--#: ../iptunnel.c:515
-+#: ../iptunnel.c:516
-+#, c-format
- msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
- msgstr "RX: Pakette    Baite        Vigu   KSumVigu JrkVigu  Levipakette\n"
- 
--#: ../iptunnel.c:518
-+#: ../iptunnel.c:519
-+#, c-format
- msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
- msgstr "TX: Pakette    Baite        Vigu   DeadLoop EiRuudi  MäluOtsas\n"
- 
-@@ -1658,13 +1861,13 @@
- msgstr "%u paketti pandi otse recvmsg eeljärjekorda"
- 
- #: ../statistics.c:178
--#, c-format
--msgid "%u packets directly received from backlog"
-+#, fuzzy, c-format
-+msgid "%u of bytes directly received from backlog"
- msgstr "%u paketti võeti vastu otse backlog-ist"
- 
- #: ../statistics.c:180
--#, c-format
--msgid "%u packets directly received from prequeue"
-+#, fuzzy, c-format
-+msgid "%u of bytes directly received from prequeue"
- msgstr "%u paketti võeti vastu otse eeljärjekorrast"
- 
- #: ../statistics.c:182
-@@ -1673,8 +1876,8 @@
- msgstr "%u paketti kustutati eeljärjekorrast"
- 
- #: ../statistics.c:183
--#, c-format
--msgid "%u packets header predicted"
-+#, fuzzy, c-format
-+msgid "%u packet headers predicted"
- msgstr "%u paketti päise õige ennustusega"
- 
- #: ../statistics.c:184
-@@ -1687,19 +1890,210 @@
- msgid "Ran %u times out of system memory during packet sending"
- msgstr "Pakettide saatmisel sai %u korda süsteemne mälu otsa"
- 
--#: ../statistics.c:253
-+#: ../statistics.c:188
-+#, fuzzy, c-format
-+msgid "%u acknowledgments not containing data received"
-+msgstr "%u sisenevat paketti tundmatule pordile"
-+
-+#: ../statistics.c:189
-+#, c-format
-+msgid "%u predicted acknowledgments"
-+msgstr ""
-+
-+#: ../statistics.c:190
-+#, c-format
-+msgid "%u times recovered from packet loss due to fast retransmit"
-+msgstr ""
-+
-+#: ../statistics.c:191
-+#, c-format
-+msgid "%u times recovered from packet loss due to SACK data"
-+msgstr ""
-+
-+#: ../statistics.c:192
-+#, fuzzy, c-format
-+msgid "%u bad SACKs received"
-+msgstr "%u vigast segmenti võeti vastu"
-+
-+#: ../statistics.c:193
-+#, c-format
-+msgid "Detected reordering %u times using FACK"
-+msgstr ""
-+
-+#: ../statistics.c:194
-+#, c-format
-+msgid "Detected reordering %u times using SACK"
-+msgstr ""
-+
-+#: ../statistics.c:195
-+#, c-format
-+msgid "Detected reordering %u times using time stamp"
-+msgstr ""
-+
-+#: ../statistics.c:196
-+#, c-format
-+msgid "Detected reordering %u times using reno fast retransmit"
-+msgstr ""
-+
-+#: ../statistics.c:197
-+#, fuzzy, c-format
-+msgid "%u congestion windows fully recovered"
-+msgstr "%u ühenduse katkestust saabus"
-+
-+#: ../statistics.c:198
-+#, c-format
-+msgid "%u congestion windows partially recovered using Hoe heuristic"
-+msgstr ""
-+
-+#: ../statistics.c:199
-+#, c-format
-+msgid "%u congestion window recovered using DSACK"
-+msgstr ""
-+
-+#: ../statistics.c:200
-+#, c-format
-+msgid "%u congestion windows recovered after partial ack"
-+msgstr ""
-+
-+#: ../statistics.c:201
-+#, fuzzy, c-format
-+msgid "%u retransmits lost"
-+msgstr "%u katkestust saadeti"
-+
-+#: ../statistics.c:202
-+#, fuzzy, c-format
-+msgid "%u timeouts after reno fast retransmit"
-+msgstr "%u segmenti saadeti uuesti"
-+
-+#: ../statistics.c:203
-+#, c-format
-+msgid "%u timeouts after SACK recovery"
-+msgstr ""
-+
-+#: ../statistics.c:204
-+#, c-format
-+msgid "%u timeouts in loss state"
-+msgstr ""
-+
-+#: ../statistics.c:205
-+#, fuzzy, c-format
-+msgid "%u fast retransmits"
-+msgstr "%u segmenti saadeti uuesti"
-+
-+#: ../statistics.c:206
-+#, fuzzy, c-format
-+msgid "%u forward retransmits"
-+msgstr "%u edastati"
-+
-+#: ../statistics.c:207
-+#, c-format
-+msgid "%u retransmits in slow start"
-+msgstr ""
-+
-+#: ../statistics.c:208
-+#, c-format
-+msgid "%u other TCP timeouts"
-+msgstr ""
-+
-+#: ../statistics.c:209
-+#, fuzzy, c-format
-+msgid "%u reno fast retransmits failed"
-+msgstr "%u segmenti saadeti uuesti"
-+
-+#: ../statistics.c:210
-+#, fuzzy, c-format
-+msgid "%u sack retransmits failed"
-+msgstr "%u pakettide kokkupanekut ebaõnnestus"
-+
-+#: ../statistics.c:211
-+#, c-format
-+msgid "%u times receiver scheduled too late for direct processing"
-+msgstr ""
-+
-+#: ../statistics.c:212
-+#, fuzzy, c-format
-+msgid "%u packets collapsed in receive queue due to low socket buffer"
-+msgstr ""
-+"%u paketti kustutati vastuvõtu järjekorrast sokli puhvri ületäitumise tõttu"
-+
-+#: ../statistics.c:213
-+#, c-format
-+msgid "%u DSACKs sent for old packets"
-+msgstr ""
-+
-+#: ../statistics.c:214
-+#, c-format
-+msgid "%u DSACKs sent for out of order packets"
-+msgstr ""
-+
-+#: ../statistics.c:215
-+#, fuzzy, c-format
-+msgid "%u DSACKs received"
-+msgstr "%u paketti võeti vastu"
-+
-+#: ../statistics.c:216
-+#, fuzzy, c-format
-+msgid "%u DSACKs for out of order packets received"
-+msgstr "kokku võeti vastu %u paketti"
-+
-+#: ../statistics.c:217
-+#, fuzzy, c-format
-+msgid "%u connections reset due to unexpected SYN"
-+msgstr "%u ühenduse katkestust saabus"
-+
-+#: ../statistics.c:218
-+#, fuzzy, c-format
-+msgid "%u connections reset due to unexpected data"
-+msgstr "%u ühenduse katkestust saabus"
-+
-+#: ../statistics.c:219
-+#, fuzzy, c-format
-+msgid "%u connections reset due to early user close"
-+msgstr "%u ühenduse katkestust saabus"
-+
-+#: ../statistics.c:220
-+#, c-format
-+msgid "%u connections aborted due to memory pressure"
-+msgstr ""
-+
-+#: ../statistics.c:221
-+#, fuzzy, c-format
-+msgid "%u connections aborted due to timeout"
-+msgstr "%u aktiivsest ühendusest keelduti ajatempli tõttu"
-+
-+#: ../statistics.c:222
-+#, c-format
-+msgid "%u connections aborted after user close in linger timeout"
-+msgstr ""
-+
-+#: ../statistics.c:223
-+#, c-format
-+msgid "%u times unabled to send RST due to no memory"
-+msgstr ""
-+
-+#: ../statistics.c:224
-+#, c-format
-+msgid "TCP ran low on memory %u times"
-+msgstr ""
-+
-+#: ../statistics.c:225
-+#, c-format
-+msgid "%u TCP data loss events"
-+msgstr ""
-+
-+#: ../statistics.c:292
- msgid "enabled"
- msgstr "lubatud"
- 
--#: ../statistics.c:253
-+#: ../statistics.c:292
- msgid "disabled"
- msgstr "keelatud"
- 
--#: ../statistics.c:336
-+#: ../statistics.c:375
- msgid "error parsing /proc/net/snmp"
- msgstr "Viga /proc/net/snmp analüüsimisel"
- 
--#: ../statistics.c:349
-+#: ../statistics.c:388
- msgid "cannot open /proc/net/snmp"
- msgstr "Ei saa avada faili /proc/net/snmp"
- 
-@@ -1713,7 +2107,7 @@
- msgid "Cannot change line discipline to `%s'.\n"
- msgstr "Ei suuda seada `%s' liiniprotokolliks\n"
- 
--#: ../lib/af.c:153 ../lib/hw.c:156
-+#: ../lib/af.c:153 ../lib/hw.c:161
- msgid "UNSPEC"
- msgstr "UNSPEC"
- 
-@@ -1729,11 +2123,11 @@
- msgid "IPv6"
- msgstr "IPv6"
- 
--#: ../lib/af.c:164 ../lib/hw.c:177
-+#: ../lib/af.c:164 ../lib/hw.c:182
- msgid "AMPR AX.25"
- msgstr "AMPR AX.25"
- 
--#: ../lib/af.c:167 ../lib/hw.c:183
-+#: ../lib/af.c:167 ../lib/hw.c:188
- msgid "AMPR NET/ROM"
- msgstr "AMPR NET/ROM"
- 
-@@ -1745,7 +2139,7 @@
- msgid "Appletalk DDP"
- msgstr "Appletalk DDP"
- 
--#: ../lib/af.c:176 ../lib/hw.c:218
-+#: ../lib/af.c:176 ../lib/hw.c:223
- msgid "Econet"
- msgstr "Econet"
- 
-@@ -1753,19 +2147,21 @@
- msgid "CCITT X.25"
- msgstr "CCITT X.25"
- 
--#: ../lib/af.c:182 ../lib/hw.c:180
-+#: ../lib/af.c:182 ../lib/hw.c:185
- msgid "AMPR ROSE"
- msgstr "AMPR ROSE"
- 
--#: ../lib/af.c:185 ../lib/hw.c:168
-+#: ../lib/af.c:185 ../lib/hw.c:173
- msgid "Ash"
- msgstr "Ash"
- 
- #: ../lib/af.c:243
-+#, c-format
- msgid "Please don't supply more than one address family.\n"
- msgstr "Meil on kombeks üks aadressiperekond korraga\n"
- 
- #: ../lib/af.c:304
-+#, c-format
- msgid "Too much address family arguments.\n"
- msgstr "Liiga palju aadressiperekonna argumente\n"
- 
-@@ -1790,6 +2186,7 @@
- msgstr "in_arcnet(%s): sodi lõpus\n"
- 
- #: ../lib/ash.c:81
-+#, c-format
- msgid "Malformed Ash address"
- msgstr "Vigane Ash aadress"
- 
-@@ -1808,22 +2205,21 @@
- msgstr "Liiga pikk kutsung"
- 
- #: ../lib/ax25_gr.c:47
-+#, c-format
- msgid "AX.25 not configured in this system.\n"
- msgstr "AX.25 pole antud süsteemis konfigureeritud\n"
- 
- #: ../lib/ax25_gr.c:50
-+#, c-format
- msgid "Kernel AX.25 routing table\n"
- msgstr "Tuuma AX.25 ruutingutabel\n"
- 
- #. xxx
- #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
-+#, c-format
- msgid "Destination  Iface    Use\n"
- msgstr "Sihtpunkt    Liides   Kasutus\n"
- 
--#: ../lib/ddp_gr.c:21
--msgid "Routing table for `ddp' not yet supported.\n"
--msgstr "`ddp' jaoks ruutingutabelit veel ei oska\n"
--
- #: ../lib/ether.c:74 ../lib/ether.c:91
- #, c-format
- msgid "in_ether(%s): invalid ether address!\n"
-@@ -1879,90 +2275,94 @@
- msgid "in_hippi(%s): trailing junk!\n"
- msgstr "in_hippi(%s): sodi lõpus\n"
- 
--#: ../lib/hw.c:155
-+#: ../lib/hw.c:160
- msgid "Local Loopback"
- msgstr "Kohalik loopback"
- 
--#: ../lib/hw.c:158
-+#: ../lib/hw.c:163
- msgid "Serial Line IP"
- msgstr "Serial Line IP"
- 
--#: ../lib/hw.c:159
-+#: ../lib/hw.c:164
- msgid "VJ Serial Line IP"
- msgstr "VJ Serial Line IP"
- 
--#: ../lib/hw.c:160
-+#: ../lib/hw.c:165
- msgid "6-bit Serial Line IP"
- msgstr "6-bitine Serial Line IP"
- 
--#: ../lib/hw.c:161
-+#: ../lib/hw.c:166
- msgid "VJ 6-bit Serial Line IP"
- msgstr "VJ 6-bitine Serial Line IP"
- 
--#: ../lib/hw.c:162
-+#: ../lib/hw.c:167
- msgid "Adaptive Serial Line IP"
- msgstr "Adaptiivne Serial Line IP"
- 
--#: ../lib/hw.c:165
-+#: ../lib/hw.c:170
- msgid "Ethernet"
- msgstr "Ethernet"
- 
--#: ../lib/hw.c:171
-+#: ../lib/hw.c:176
- msgid "Fiber Distributed Data Interface"
- msgstr "Fiber Distributed Data Interface"
- 
--#: ../lib/hw.c:174
-+#: ../lib/hw.c:179
- msgid "HIPPI"
- msgstr "HIPPI"
- 
--#: ../lib/hw.c:186
-+#: ../lib/hw.c:191
- msgid "generic X.25"
- msgstr "üldine X.25"
- 
--#: ../lib/hw.c:189
-+#: ../lib/hw.c:194
- msgid "IPIP Tunnel"
- msgstr "IPIP tunnel"
- 
--#: ../lib/hw.c:192
-+#: ../lib/hw.c:197
- msgid "Point-to-Point Protocol"
- msgstr "Kakspunktprotokoll"
- 
--#: ../lib/hw.c:195
-+#: ../lib/hw.c:200
- msgid "(Cisco)-HDLC"
- msgstr "(Cisco-)HDLC"
- 
--#: ../lib/hw.c:196
-+#: ../lib/hw.c:201
- msgid "LAPB"
- msgstr "LAPB"
- 
--#: ../lib/hw.c:199
-+#: ../lib/hw.c:204
- msgid "ARCnet"
- msgstr "ARCnet"
- 
--#: ../lib/hw.c:202
-+#: ../lib/hw.c:207
- msgid "Frame Relay DLCI"
- msgstr "Frame Relay DLCI"
- 
--#: ../lib/hw.c:203
-+#: ../lib/hw.c:208
- msgid "Frame Relay Access Device"
- msgstr "Frame Relay Access Device"
- 
--#: ../lib/hw.c:206
-+#: ../lib/hw.c:211
- msgid "IPv6-in-IPv4"
- msgstr "IPv6-in-IPv4"
- 
--#: ../lib/hw.c:209
-+#: ../lib/hw.c:214
- msgid "IrLAP"
- msgstr "IrLAP"
- 
--#: ../lib/hw.c:212
-+#: ../lib/hw.c:217
- msgid "16/4 Mbps Token Ring"
- msgstr "16/4 Mbps Token Ring"
- 
--#: ../lib/hw.c:214
-+#: ../lib/hw.c:219
- msgid "16/4 Mbps Token Ring (New)"
- msgstr "16/4 Mbps Token Ring (New)"
- 
-+#: ../lib/hw.c:226
-+msgid "Generic EUI-64"
-+msgstr ""
-+
- #: ../lib/inet.c:153 ../lib/inet6.c:79
- #, c-format
- msgid "rresolve: unsupport address family %d !\n"
-@@ -1972,27 +2372,32 @@
- msgid "[UNKNOWN]"
- msgstr "[TUNDMATU]"
- 
--#: ../lib/inet6_gr.c:79
-+#: ../lib/inet6_gr.c:71
-+#, c-format
- msgid "INET6 (IPv6) not configured in this system.\n"
- msgstr "INET6 (IPv6) pole antud süsteemis konfigureeritud\n"
- 
--#: ../lib/inet6_gr.c:82
-+#: ../lib/inet6_gr.c:74
-+#, c-format
- msgid "Kernel IPv6 routing table\n"
- msgstr "Tuuma IPv6 ruutingutabel\n"
- 
--#: ../lib/inet6_gr.c:84
-+#: ../lib/inet6_gr.c:76
-+#, c-format
- msgid ""
--"Destination                                 Next Hop                         "
--"       Flags Metric Ref    Use Iface\n"
-+"Destination                                 Next "
-+"Hop                                Flags Metric Ref    Use Iface\n"
- msgstr ""
--"Sihtpunkt                                   Järgmine samm                    "
--"       Lipud Meetr  Mitu Kasut Liides\n"
-+"Sihtpunkt                                   Järgmine "
-+"samm                           Lipud Meetr  Mitu Kasut Liides\n"
- 
--#: ../lib/inet6_gr.c:158
-+#: ../lib/inet6_gr.c:150
-+#, c-format
- msgid "Kernel IPv6 Neighbour Cache\n"
- msgstr "Tuuma IPv6 naabrite puhver\n"
- 
--#: ../lib/inet6_gr.c:161
-+#: ../lib/inet6_gr.c:153
-+#, c-format
- msgid ""
- "Neighbour                                   HW Address        Iface    Flags "
- "Ref State\n"
-@@ -2000,7 +2405,8 @@
- "Naaber                                      HW Aadress        Liides   Lipud "
- "Mitu Olek\n"
- 
--#: ../lib/inet6_gr.c:165
-+#: ../lib/inet6_gr.c:157
-+#, c-format
- msgid ""
- "Neighbour                                   HW Address        Iface    Flags "
- "Ref State            Stale(sec) Delete(sec)\n"
-@@ -2009,31 +2415,38 @@
- "Mitu Olek            Stale(sec) Delete(sec)\n"
- 
- #: ../lib/inet6_sr.c:46
-+#, c-format
- msgid "Usage: inet6_route [-vF] del Target\n"
- msgstr "Kasutamine: route [-vF] del AADRESS\n"
- 
- #: ../lib/inet6_sr.c:47
-+#, c-format
- msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
- msgstr ""
- "            route [-vF] add AADRESS [gw GW] [metric M] [[dev] LIIDES]\n"
- 
- #: ../lib/inet6_sr.c:48
-+#, c-format
- msgid "       inet6_route [-FC] flush      NOT supported\n"
- msgstr "            route [-FC] flush      Seda EI toetata\n"
- 
- #: ../lib/inet6_sr.c:188
-+#, c-format
- msgid "Flushing `inet6' routing table not supported\n"
- msgstr "`inet6' ruutingutabeli tühjendamist ei toetata\n"
- 
- #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
-+#, c-format
- msgid "INET (IPv4) not configured in this system.\n"
- msgstr "INET (IPv4) pole antud süsteemis konfigureeritud\n"
- 
- #: ../lib/inet_gr.c:53
-+#, c-format
- msgid "Kernel IP routing table\n"
- msgstr "Tuuma IP ruutingutabel\n"
- 
- #: ../lib/inet_gr.c:56
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags Metric Ref    Use "
- "Iface\n"
-@@ -2042,6 +2455,7 @@
- "Liides\n"
- 
- #: ../lib/inet_gr.c:59
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags   MSS Window  irtt "
- "Iface\n"
-@@ -2050,6 +2464,7 @@
- "Liides\n"
- 
- #: ../lib/inet_gr.c:62
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt\n"
-@@ -2058,10 +2473,12 @@
- "Liides   MSS   Aken   irtt\n"
- 
- #: ../lib/inet_gr.c:237
-+#, c-format
- msgid "Kernel IP routing cache\n"
- msgstr "Tuuma IP ruutingu puhver\n"
- 
- #: ../lib/inet_gr.c:258
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface\n"
-@@ -2070,6 +2487,7 @@
- "Liides\n"
- 
- #: ../lib/inet_gr.c:261
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags   MSS Window  irtt "
- "Iface\n"
-@@ -2078,6 +2496,7 @@
- "Liides\n"
- 
- #: ../lib/inet_gr.c:266
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt  HH  Arp\n"
-@@ -2086,6 +2505,7 @@
- "Liides   MSS    Aken  irtt  HH  Arp\n"
- 
- #: ../lib/inet_gr.c:290
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
-@@ -2093,7 +2513,8 @@
- "Lähtepunkt      Sihtpunkt       Ruuter          Lipud Meetr  Mitu Kasut "
- "Liides   MSS   Aken   irtt  TOS HHRef HHUptod     SpecDst\n"
- 
--#: ../lib/inet_sr.c:50
-+#: ../lib/inet_sr.c:51
-+#, c-format
- msgid ""
- "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
- "[[dev] If]\n"
-@@ -2101,31 +2522,36 @@
- "Kasutamine: route [-vF] del {-host|-net} AADRESS[/PREFIKS] [gw GW] [metric "
- "M] [[dev] LIIDES]\n"
- 
--#: ../lib/inet_sr.c:51
-+#: ../lib/inet_sr.c:52
-+#, c-format
- msgid ""
- "       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
- msgstr ""
- "            route [-vF] add {-host|-net} AADRESS[/PREFIKS] [gw GW] [metric "
- "M]\n"
- 
--#: ../lib/inet_sr.c:52
-+#: ../lib/inet_sr.c:53
-+#, c-format
- msgid ""
- "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
- msgstr ""
- "                              [netmask N] [mss MSS] [window W] [irtt I]\n"
- 
--#: ../lib/inet_sr.c:53
-+#: ../lib/inet_sr.c:54
-+#, c-format
- msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
- msgstr "                              [mod] [dyn] [reinstate] [[dev] LIIDES]\n"
- 
--#: ../lib/inet_sr.c:54
-+#: ../lib/inet_sr.c:55
-+#, c-format
- msgid ""
- "       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
- msgstr ""
- "            route [-vF] add {-host|-net} AADRESS[/PREFIKS] [metric M] "
- "reject\n"
- 
--#: ../lib/inet_sr.c:55
-+#: ../lib/inet_sr.c:56
-+#, c-format
- msgid "       inet_route [-FC] flush      NOT supported\n"
- msgstr "            route [-FC] flush      Seda EI toetata\n"
- 
-@@ -2135,14 +2561,17 @@
- msgstr "route: %s: võrku ei saa kasutada ruuterina\n"
- 
- #: ../lib/inet_sr.c:174
-+#, c-format
- msgid "route: Invalid MSS/MTU.\n"
- msgstr "route: vigane MSS/MTU\n"
- 
- #: ../lib/inet_sr.c:187
-+#, c-format
- msgid "route: Invalid window.\n"
- msgstr "route: Vigane akna suurus\n"
- 
- #: ../lib/inet_sr.c:203
-+#, c-format
- msgid "route: Invalid initial rtt.\n"
- msgstr "route: vigane algne rtt\n"
- 
-@@ -2157,75 +2586,92 @@
- msgstr "route: vale võrgumask %s\n"
- 
- #: ../lib/inet_sr.c:270
-+#, c-format
- msgid "route: netmask doesn't match route address\n"
- msgstr "route: võrgumask ei sobi ruutingu aadressiga\n"
- 
- #: ../lib/inet_sr.c:306
-+#, c-format
- msgid "Flushing `inet' routing table not supported\n"
- msgstr "`inet' ruutingutabeli tühjendamist ei toetata\n"
- 
- #: ../lib/inet_sr.c:310
-+#, c-format
- msgid "Modifying `inet' routing cache not supported\n"
- msgstr "`inet' ruutingu puhvri muutmist ei toetata\n"
- 
- #: ../lib/ipx_gr.c:52
-+#, c-format
- msgid "IPX not configured in this system.\n"
- msgstr "IPX pole antud süsteemis konfigureeritud\n"
- 
- #: ../lib/ipx_gr.c:56
-+#, c-format
- msgid "Kernel IPX routing table\n"
- msgstr "Tuuma IPX ruutingutabel\n"
- 
- #. xxx
- #: ../lib/ipx_gr.c:57
-+#, c-format
- msgid "Destination               Router Net                Router Node\n"
- msgstr "Sihtpunkt                 Ruuteri võrk              Ruuter ise\n"
- 
- #: ../lib/ipx_sr.c:33
-+#, c-format
- msgid "IPX: this needs to be written\n"
- msgstr "IPX osa vajab ümbertegemist\n"
- 
- #: ../lib/masq_info.c:198
-+#, c-format
- msgid "IP masquerading entries\n"
- msgstr "IP maskeerimise kirjed\n"
- 
- #: ../lib/masq_info.c:201
-+#, c-format
- msgid "prot   expire source               destination          ports\n"
- msgstr "Proto  Aegub  Lähtepunkt           Sihtpunkt            Pordid\n"
- 
- #: ../lib/masq_info.c:204
-+#, c-format
- msgid ""
--"prot   expire    initseq delta prevd source               destination        "
--"  ports\n"
-+"prot   expire    initseq delta prevd source               "
-+"destination          ports\n"
- msgstr ""
--"Proto  Aegub     Initseq Delta Prevd Lähtepunkt           Sihtpunkt          "
--"  Pordid\n"
-+"Proto  Aegub     Initseq Delta Prevd Lähtepunkt           "
-+"Sihtpunkt            Pordid\n"
- 
- #: ../lib/netrom_gr.c:48
-+#, c-format
- msgid "NET/ROM not configured in this system.\n"
- msgstr "NET/ROM pole antud süsteemis konfigureeritud\n"
- 
- #: ../lib/netrom_gr.c:51
-+#, c-format
- msgid "Kernel NET/ROM routing table\n"
- msgstr "Tuuma NET/ROM ruutingutabel\n"
- 
- #: ../lib/netrom_gr.c:52
-+#, c-format
- msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
- msgstr "Sihtpunkt   Mnemoonika Kvaliteet Naaber    Liides\n"
- 
- #: ../lib/netrom_sr.c:34
-+#, c-format
- msgid "netrom usage\n"
- msgstr "netrom kasutus\n"
- 
- #: ../lib/netrom_sr.c:44
-+#, c-format
- msgid "NET/ROM: this needs to be written\n"
- msgstr "NET/ROM osa vajab ümbertegemist\n"
- 
- #: ../lib/ppp.c:44
-+#, c-format
- msgid "You cannot start PPP with this program.\n"
- msgstr "Sellest programmist ei saa PPP-d käivitada\n"
- 
- #: ../lib/ppp_ac.c:38
-+#, c-format
- msgid "Sorry, use pppd!\n"
- msgstr "Palun kasutage pppd'd\n"
- 
-@@ -2234,287 +2680,314 @@
- msgstr "Sõlme aadress peab olema kümnekohaline"
- 
- #: ../lib/rose_gr.c:51
-+#, c-format
- msgid "ROSE not configured in this system.\n"
- msgstr "ROSE pole antud süsteemis konfigureeritud\n"
- 
- #: ../lib/rose_gr.c:54
-+#, c-format
- msgid "Kernel ROSE routing table\n"
- msgstr "Tuuma ROSE ruutingutabel\n"
- 
--#: ../lib/tr.c:70 ../lib/tr.c:85
-+#: ../lib/tr.c:86 ../lib/tr.c:101
- #, c-format
- msgid "in_tr(%s): invalid token ring address!\n"
- msgstr "in_tr(%s): vigane token ring-aadress\n"
- 
--#: ../lib/tr.c:97
-+#: ../lib/tr.c:113
- #, c-format
- msgid "in_tr(%s): trailing : ignored!\n"
- msgstr "in_tr(%s): ignoreerin lõpetavat koolonit\n"
- 
--#: ../lib/tr.c:109
-+#: ../lib/tr.c:125
- #, c-format
- msgid "in_tr(%s): trailing junk!\n"
- msgstr "in_tr(%s): sodi lõpus\n"
- 
--#: ../lib/interface.c:164
-+#: ../lib/interface.c:176
- #, c-format
- msgid "warning: no inet socket available: %s\n"
- msgstr "Hoiatus: `inet' sokleid ei ole: %s\n"
- 
--#: ../lib/interface.c:316
-+#: ../lib/interface.c:325
- #, c-format
- msgid "Warning: cannot open %s (%s). Limited output.\n"
- msgstr "Hoiatus: ei saa avada faili %s (%s). Väljund on piiratud.\n"
- 
- #. Give better error message for this case.
--#: ../lib/interface.c:556
-+#: ../lib/interface.c:571
- msgid "Device not found"
- msgstr "Liidest ei leitud"
- 
--#: ../lib/interface.c:560
-+#: ../lib/interface.c:575
- #, c-format
- msgid "%s: error fetching interface information: %s\n"
- msgstr "%s: viga liidese info küsimisel: %s\n"
- 
--#: ../lib/interface.c:593
-+#: ../lib/interface.c:608
- msgid "     - no statistics available -"
- msgstr "     - statistikat ei ole      -"
- 
--#: ../lib/interface.c:597
-+#: ../lib/interface.c:612
-+#, c-format
- msgid "[NO FLAGS]"
- msgstr "[LIPPE POLE]"
- 
--#: ../lib/interface.c:673
-+#: ../lib/interface.c:688
- #, c-format
- msgid "%-9.9s Link encap:%s  "
- msgstr "%-9.9s kapseldus:%s  "
- 
--#: ../lib/interface.c:678
-+#: ../lib/interface.c:693
- #, c-format
- msgid "HWaddr %s  "
- msgstr "HWaddr %s  "
- 
--#: ../lib/interface.c:681
-+#: ../lib/interface.c:696
- #, c-format
- msgid "Media:%s"
- msgstr "meedia:%s"
- 
--#: ../lib/interface.c:683
-+#: ../lib/interface.c:698
-+#, c-format
- msgid "(auto)"
- msgstr "(auto)"
- 
--#: ../lib/interface.c:690
-+#: ../lib/interface.c:705
- #, c-format
- msgid "          %s addr:%s "
- msgstr "          %s aadress:%s "
- 
--#: ../lib/interface.c:693
-+#: ../lib/interface.c:708
- #, c-format
- msgid " P-t-P:%s "
- msgstr " P-t-P:%s "
- 
--#: ../lib/interface.c:696
-+#: ../lib/interface.c:711
- #, c-format
- msgid " Bcast:%s "
- msgstr " bcast:%s "
- 
--#: ../lib/interface.c:698
-+#: ../lib/interface.c:713
- #, c-format
- msgid " Mask:%s\n"
- msgstr " mask:%s\n"
- 
--#: ../lib/interface.c:715
-+#: ../lib/interface.c:730
- #, c-format
- msgid "          inet6 addr: %s/%d"
- msgstr "          inet6 aadr: %s/%d"
- 
--#: ../lib/interface.c:717
-+#: ../lib/interface.c:732
-+#, c-format
- msgid " Scope:"
- msgstr " skoop:"
- 
--#: ../lib/interface.c:720
-+#: ../lib/interface.c:735
-+#, c-format
- msgid "Global"
- msgstr "globaalne"
- 
--#: ../lib/interface.c:723
-+#: ../lib/interface.c:738
-+#, c-format
- msgid "Link"
- msgstr "ühendus"
- 
--#: ../lib/interface.c:726
-+#: ../lib/interface.c:741
-+#, c-format
- msgid "Site"
- msgstr "site"
- 
--#: ../lib/interface.c:729
-+#: ../lib/interface.c:744
-+#, c-format
- msgid "Compat"
- msgstr "ühilduvus"
- 
--#: ../lib/interface.c:732
-+#: ../lib/interface.c:747
-+#, c-format
- msgid "Host"
- msgstr "host"
- 
--#: ../lib/interface.c:735
-+#: ../lib/interface.c:750
-+#, c-format
- msgid "Unknown"
- msgstr "tundmatu"
- 
--#: ../lib/interface.c:750
-+#: ../lib/interface.c:765
- #, c-format
- msgid "          IPX/Ethernet II addr:%s\n"
- msgstr "          IPX/Ethernet II aadr:%s\n"
- 
--#: ../lib/interface.c:753
-+#: ../lib/interface.c:768
- #, c-format
- msgid "          IPX/Ethernet SNAP addr:%s\n"
- msgstr "          IPX/Ethernet SNAP aadr:%s\n"
- 
--#: ../lib/interface.c:756
-+#: ../lib/interface.c:771
- #, c-format
- msgid "          IPX/Ethernet 802.2 addr:%s\n"
- msgstr "          IPX/Ethernet 802.2 aadr:%s\n"
- 
--#: ../lib/interface.c:759
-+#: ../lib/interface.c:774
- #, c-format
- msgid "          IPX/Ethernet 802.3 addr:%s\n"
- msgstr "          IPX/Ethernet 802.3 aadr:%s\n"
- 
--#: ../lib/interface.c:769
-+#: ../lib/interface.c:784
- #, c-format
- msgid "          EtherTalk Phase 2 addr:%s\n"
- msgstr "          EtherTalk Phase 2 aadr:%s\n"
- 
--#: ../lib/interface.c:778
-+#: ../lib/interface.c:793
- #, c-format
- msgid "          econet addr:%s\n"
- msgstr "          econeti aadr:%s\n"
- 
--#: ../lib/interface.c:785
-+#: ../lib/interface.c:800
-+#, c-format
- msgid "[NO FLAGS] "
- msgstr "[LIPPE POLE]"
- 
--#: ../lib/interface.c:787
-+#: ../lib/interface.c:802
-+#, c-format
- msgid "UP "
- msgstr "UP "
- 
--#: ../lib/interface.c:789
-+#: ../lib/interface.c:804
-+#, c-format
- msgid "BROADCAST "
- msgstr "BROADCAST "
- 
--#: ../lib/interface.c:791
-+#: ../lib/interface.c:806
-+#, c-format
- msgid "DEBUG "
- msgstr "DEBUG "
- 
--#: ../lib/interface.c:793
-+#: ../lib/interface.c:808
-+#, c-format
- msgid "LOOPBACK "
- msgstr "LOOPBACK "
- 
--#: ../lib/interface.c:795
-+#: ../lib/interface.c:810
-+#, c-format
- msgid "POINTOPOINT "
- msgstr "POINTOPOINT "
- 
--#: ../lib/interface.c:797
-+#: ../lib/interface.c:812
-+#, c-format
- msgid "NOTRAILERS "
- msgstr "NOTRAILERS "
- 
--#: ../lib/interface.c:799
-+#: ../lib/interface.c:814
-+#, c-format
- msgid "RUNNING "
- msgstr "RUNNING "
- 
--#: ../lib/interface.c:801
-+#: ../lib/interface.c:816
-+#, c-format
- msgid "NOARP "
- msgstr "NOARP "
- 
--#: ../lib/interface.c:803
-+#: ../lib/interface.c:818
-+#, c-format
- msgid "PROMISC "
- msgstr "PROMISC "
- 
--#: ../lib/interface.c:805
-+#: ../lib/interface.c:820
-+#, c-format
- msgid "ALLMULTI "
- msgstr "ALLMULTI "
- 
--#: ../lib/interface.c:807
-+#: ../lib/interface.c:822
-+#, c-format
- msgid "SLAVE "
- msgstr "SLAVE "
- 
--#: ../lib/interface.c:809
-+#: ../lib/interface.c:824
-+#, c-format
- msgid "MASTER "
- msgstr "MASTER "
- 
--#: ../lib/interface.c:811
-+#: ../lib/interface.c:826
-+#, c-format
- msgid "MULTICAST "
- msgstr "MULTICAST "
- 
--#: ../lib/interface.c:814
-+#: ../lib/interface.c:829
-+#, c-format
- msgid "DYNAMIC "
- msgstr "DYNAMIC "
- 
- #. DONT FORGET TO ADD THE FLAGS IN ife_print_short
--#: ../lib/interface.c:817
-+#: ../lib/interface.c:832
- #, c-format
- msgid " MTU:%d  Metric:%d"
- msgstr " MTU:%d meetrika:%d"
- 
--#: ../lib/interface.c:821
-+#: ../lib/interface.c:836
- #, c-format
- msgid "  Outfill:%d  Keepalive:%d"
- msgstr "  ülalhoidepakettide intervall:%d  ülalhoidetaimaut:%d"
- 
--#: ../lib/interface.c:835
-+#: ../lib/interface.c:850
- #, c-format
- msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
- msgstr "RX pakette:%llu vigu:%lu ära visatud:%lu ületäit:%lu kaadri vigu:%lu\n"
- 
--#: ../lib/interface.c:840
-+#: ../lib/interface.c:855
- #, c-format
- msgid "             compressed:%lu\n"
- msgstr "             pakitud:%lu\n"
- 
--#: ../lib/interface.c:852
-+#: ../lib/interface.c:895
- #, c-format
- msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
- msgstr "TX pakette:%llu vigu:%lu ära visatud:%lu ületäit:%lu carrier:%lu\n"
- 
--#: ../lib/interface.c:856
-+#: ../lib/interface.c:899
- #, c-format
- msgid "          collisions:%lu "
- msgstr "          kollisioone:%lu "
- 
--#: ../lib/interface.c:858
-+#: ../lib/interface.c:901
- #, c-format
- msgid "compressed:%lu "
- msgstr "pakitud:%lu "
- 
--#: ../lib/interface.c:860
-+#: ../lib/interface.c:903
- #, c-format
- msgid "txqueuelen:%d "
- msgstr "txqueuelen:%d "
- 
--#: ../lib/interface.c:862
-+#: ../lib/interface.c:905
- #, c-format
- msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
- msgstr "RX baite:%llu (%lu.%lu %s)  TX baite:%llu (%lu.%lu %s)\n"
- 
--#: ../lib/interface.c:873
-+#: ../lib/interface.c:916
- #, c-format
- msgid "Interrupt:%d "
- msgstr "katkestus:%d "
- 
- #. Only print devices using it for
- #. I/O maps
--#: ../lib/interface.c:876
-+#: ../lib/interface.c:919
- #, c-format
- msgid "Base address:0x%x "
- msgstr "baasaadress:0x%x "
- 
--#: ../lib/interface.c:878
-+#: ../lib/interface.c:921
- #, c-format
- msgid "Memory:%lx-%lx "
- msgstr "mälu:%lx-%lx "
- 
--#: ../lib/interface.c:881
-+#: ../lib/interface.c:924
- #, c-format
- msgid "DMA chan:%x "
- msgstr "DMA kanal:%x "
- 
- #: ../lib/sockets.c:63
-+#, c-format
- msgid "No usable address families found.\n"
- msgstr "Ei leidnud ühtegi kasutatavat aadressiperekonda\n"
- 
-@@ -2538,29 +3011,32 @@
- msgid "ip: argument is wrong: %s\n"
- msgstr "iptunnel: vale argument %s\n"
- 
--#: ../ipmaddr.c:58
-+#: ../ipmaddr.c:61
-+#, c-format
- msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
- msgstr "Kasutamine: ipmaddr [ add | del ] MULTIAADR dev STRING\n"
- 
--#: ../ipmaddr.c:59
-+#: ../ipmaddr.c:62
-+#, c-format
- msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
- msgstr "            ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
- 
--#: ../ipmaddr.c:60
-+#: ../ipmaddr.c:63
-+#, c-format
- msgid "       ipmaddr -V | -version\n"
- msgstr "            ipmaddr -V | -version\n"
- 
--#: ../ipmaddr.c:260
-+#: ../ipmaddr.c:263
- #, c-format
- msgid "family %d "
- msgstr "perekond %d "
- 
--#: ../ipmaddr.c:269
-+#: ../ipmaddr.c:272
- #, c-format
- msgid " users %d"
- msgstr " kasutajaid %d"
- 
--#: ../ipmaddr.c:355
-+#: ../ipmaddr.c:358
- msgid "Cannot create socket"
- msgstr "Ei saa avada soklit"
- 
-@@ -2575,6 +3051,7 @@
- msgstr "slattach: tty_lock: (%s): %s\n"
- 
- #: ../slattach.c:192
-+#, c-format
- msgid "slattach: cannot write PID file\n"
- msgstr "slattach: ei saa PID faili kirjutada\n"
- 
-@@ -2594,18 +3071,22 @@
- msgstr "slattach: tty_hangup(RAISE): %s\n"
- 
- #: ../slattach.c:468
-+#, c-format
- msgid "slattach: tty name too long\n"
- msgstr "slattach: terminali nimi on liiga pikk\n"
- 
- #: ../slattach.c:498
-+#, c-format
- msgid "slattach: tty_open: cannot get current state!\n"
- msgstr "slattach: tty_open: ei saa lugeda jooksvat olekut\n"
- 
- #: ../slattach.c:505
-+#, c-format
- msgid "slattach: tty_open: cannot get current line disc!\n"
- msgstr "slattach: tty_open: liiniprotokolli küsimine ebaõnnestus\n"
- 
- #: ../slattach.c:513
-+#, c-format
- msgid "slattach: tty_open: cannot set RAW mode!\n"
- msgstr "slattach: tty_open: ei saa seada RAW moodi\n"
- 
-@@ -2615,6 +3096,7 @@
- msgstr "slattach: tty_open: ei saa seada kiiruseks %s bps\n"
- 
- #: ../slattach.c:530
-+#, c-format
- msgid "slattach: tty_open: cannot set 8N1 mode!\n"
- msgstr "slattach: tty_open: ei saa seada 8N1 moodi\n"
- 
-@@ -2637,3 +3119,20 @@
- #, c-format
- msgid " interface %s\n"
- msgstr " liides %s\n"
-+
-+#~ msgid ""
-+#~ "  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
-+#~ "<-''-\n"
-+#~ msgstr ""
-+#~ "  arp [-v]   [<HW>] [-i <if>] -s  <hosti nimi> <hwaddr> [netmask <nm>] "
-+#~ "pub\n"
-+
-+#~ msgid "%s: unknown interface: %s\n"
-+#~ msgstr "ifconfig: tundmatu liides %s: %s\n"
-+
-+#~ msgid "        -n, --numeric            dont resolve names\n"
-+#~ msgstr ""
-+#~ "        -n, --numeric            mitte lahendada numbreid nimedeks\n"
-+
-+#~ msgid "Routing table for `ddp' not yet supported.\n"
-+#~ msgstr "`ddp' jaoks ruutingutabelit veel ei oska\n"
---- net-tools-1.60.orig/po/de.po
-+++ net-tools-1.60/po/de.po
-@@ -1,106 +1,121 @@
--# $Id: de.po,v 1.10 2000/08/01 03:19:48 ecki Exp $
-+# $Id: de.po,v 1.11 2003/10/25 21:15:09 ecki Exp $
- # German translation for net-tools 1.51
- # Copyright (C) 1999 Ralf Bächle <ralf@gnu.org>
- msgid ""
- msgstr ""
- "Project-Id-Version: net-tools 1.51\n"
--"POT-Creation-Date: 2000-02-14 02:31+0100\n"
--"PO-Revision-Date: 1998-03-01 00:02+0100\n"
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2007-06-30 12:28+0900\n"
-+"PO-Revision-Date: 2005-06-13 00:02+0100\n"
- "Last-Translator: Ralf Bächle <ralf@gnu.org>\n"
- "Language-Team:\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=iso8859-1\n"
- "Content-Transfer-Encoding: 8bit\n"
- 
--#: ../arp.c:110 ../arp.c:269
-+#: ../arp.c:112 ../arp.c:279
-+#, c-format
- msgid "arp: need host name\n"
--msgstr "arp: Hostname muß angegeben werden\n"
-+msgstr "arp: Hostname muss angegeben werden\n"
- 
--#: ../arp.c:207 ../arp.c:221
-+#: ../arp.c:215 ../arp.c:230
- #, c-format
- msgid "No ARP entry for %s\n"
--msgstr "Kein ARP Eintrag für %s\n"
-+msgstr "Kein ARP-Eintrag für %s\n"
- 
--#: ../arp.c:239
-+#: ../arp.c:248
- #, c-format
- msgid "arp: cant get HW-Address for `%s': %s.\n"
- msgstr "rarp: Kann Eintrag aus %s : %u nicht setzen.\n"
- 
--#: ../arp.c:243
-+#: ../arp.c:252
-+#, c-format
- msgid "arp: protocol type mismatch.\n"
- msgstr "arp: unpassende Protokolltypen.\n"
- 
--#: ../arp.c:252
-+#: ../arp.c:261
- #, c-format
- msgid "arp: device `%s' has HW address %s `%s'.\n"
--msgstr "arp: Gerät ,,%s'' hat HW-Adresse %s ,,%s''.\n"
-+msgstr "arp: Gerät »%s« hat HW-Adresse %s »%s«.\n"
- 
--#: ../arp.c:282
-+#: ../arp.c:293
-+#, c-format
- msgid "arp: need hardware address\n"
--msgstr "arp: Hardwareadresse muß angegeben werden\n"
-+msgstr "arp: Hardwareadresse muss angegeben werden\n"
- 
--#: ../arp.c:290
-+#: ../arp.c:301
-+#, c-format
- msgid "arp: invalid hardware address\n"
- msgstr "arp: ungültige Hardwareadresse\n"
- 
--#: ../arp.c:387
-+#: ../arp.c:398
- #, c-format
- msgid "arp: cannot open etherfile %s !\n"
- msgstr "arp: Kann %s nicht öffnen!\n"
- 
--#: ../arp.c:403
-+#: ../arp.c:414
- #, c-format
- msgid "arp: format error on line %u of etherfile %s !\n"
- msgstr "arp: Formatfehler in Zeile %u von Etherfile %s.\n"
- 
--#: ../arp.c:416
-+#: ../arp.c:427
- #, c-format
- msgid "arp: cannot set entry on line %u of etherfile %s !\n"
- msgstr "arp: Kann Eintrag auf Zeile %u von Etherdatei %s nicht setzen!\n"
- 
--#: ../arp.c:437
--msgid "Address\t\t\tHWtype\tHWaddress\t    Flags Mask\t\t  Iface\n"
-+#: ../arp.c:448
-+#, fuzzy, c-format
-+msgid ""
-+"Address                  HWtype  HWaddress           Flags Mask            "
-+"Iface\n"
- msgstr "Adresse\t\t\tHWTyp\tHWAdresse\t    Flags   Maske\t\t  Iface\n"
- 
--#: ../arp.c:467
-+#: ../arp.c:476
-+#, fuzzy
-+msgid "<from_interface>"
-+msgstr " Schnittstelle: %s\n"
-+
-+#: ../arp.c:478
- msgid "(incomplete)"
--msgstr "(unvollsändig)"
-+msgstr "(unvollständig)"
- 
--#: ../arp.c:484
-+#: ../arp.c:495
- #, c-format
- msgid "%s (%s) at "
- msgstr "%s (%s) auf "
- 
--#: ../arp.c:490
-+#: ../arp.c:501
-+#, c-format
- msgid "<incomplete> "
- msgstr "<unvollständig> "
- 
--#: ../arp.c:496
-+#: ../arp.c:507
- #, c-format
- msgid "netmask %s "
- msgstr "netzmaske %s "
- 
--#: ../arp.c:513
-+#: ../arp.c:524
- #, c-format
- msgid "on %s\n"
- msgstr "auf %s\n"
- 
--#: ../arp.c:592
-+#: ../arp.c:605
- #, c-format
- msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
- msgstr "Einträge: %d   Ignoriert: %d   Gefunden: %d\n"
- 
--#: ../arp.c:596
-+#: ../arp.c:609
- #, c-format
- msgid "%s (%s) -- no entry\n"
- msgstr "%s (%s) -- kein Eintrag\n"
- 
--#: ../arp.c:598
-+#: ../arp.c:611
- #, c-format
- msgid "arp: in %d entries no match found.\n"
--msgstr "arp: In %d Einträgen wurde kein Zutreffender gefunden.\n"
-+msgstr "arp: In %d Einträgen wurde kein zutreffender gefunden.\n"
- 
--#: ../arp.c:613
-+#: ../arp.c:626
-+#, c-format
- msgid ""
- "Usage:\n"
- "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
-@@ -109,157 +124,165 @@
- "Benutzung:\n"
- "  arp [-vn]  [<HW>] [-i <if>] [-a] [<Hostname>]\n"
- 
--#: ../arp.c:614
-+#: ../arp.c:627
-+#, fuzzy, c-format
- msgid ""
--"  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP "
-+"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
- "entry\n"
- msgstr "  arp [-v]          [-i <if>] -d  <Hostname> [pub][nopub]\n"
- 
--#: ../arp.c:615
-+#: ../arp.c:628
-+#, fuzzy, c-format
- msgid ""
--"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from "
-+"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
- "file\n"
- msgstr "  arp [-vnD] [<HW>] [-i <if>] -f  <Dateiname>           <- Eintrag aus Datei hinzufügen\n"
- 
--#: ../arp.c:616
-+#: ../arp.c:629
-+#, fuzzy, c-format
- msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add "
-+"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
- "entry\n"
- msgstr ""
- "  arp [-v]   [<HW>] [-i <if>] -s  <Rechnername> <hwaddr> [temp][nopub]\n"
- 
--#: ../arp.c:617
--msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
--"<-''-\n"
--msgstr ""
--"  arp [-v]   [<HW>] [-i <if>] -s  <Hostname> <hwaddr> [netmask <nm>] pub\n"
--
--#: ../arp.c:618
-+#: ../arp.c:630
-+#, fuzzy, c-format
- msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      "
-+"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
- "<-''-\n"
- "\n"
- msgstr "  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub\n"
- 
--#: ../arp.c:620
-+#: ../arp.c:632
-+#, c-format
- msgid ""
- "        -a                       display (all) hosts in alternative (BSD) "
- "style\n"
- msgstr "        -a                       Alle Hosts im BSD-Format anzeigen\n"
- 
--#: ../arp.c:621
-+#: ../arp.c:633
-+#, c-format
- msgid "        -s, --set                set a new ARP entry\n"
- msgstr "        -s, --set                Neuen ARP-Eintrag setzen\n"
- 
--#: ../arp.c:622
-+#: ../arp.c:634
-+#, c-format
- msgid "        -d, --delete             delete a specified entry\n"
- msgstr "        -d, --delete             Einen bestimmten Eintrag löschen\n"
- 
--#: ../arp.c:623 ../netstat.c:1436 ../route.c:85
-+#: ../arp.c:635 ../netstat.c:1503 ../route.c:86
-+#, c-format
- msgid "        -v, --verbose            be verbose\n"
- msgstr "        -v, --verbose            Ausführliche Ausgaben\n"
- 
--#: ../arp.c:624 ../netstat.c:1437 ../route.c:86
--msgid "        -n, --numeric            dont resolve names\n"
-+#: ../arp.c:636 ../netstat.c:1504 ../route.c:87
-+#, fuzzy, c-format
-+msgid "        -n, --numeric            don't resolve names\n"
- msgstr "        -n, --numeric            Adressen nicht nach Namen auflösen\n"
- 
--#: ../arp.c:625
-+#: ../arp.c:637
-+#, c-format
- msgid ""
- "        -i, --device             specify network interface (e.g. eth0)\n"
--msgstr "        -i, --device             Netzwerksgerät (z.B. eth0) angeben\n"
-+msgstr "        -i, --device             Netzwerkgerät (z.B. eth0) angeben\n"
- 
--#: ../arp.c:626
-+#: ../arp.c:638
-+#, c-format
- msgid "        -D, --use-device         read <hwaddr> from given device\n"
- msgstr "        -D, --use-device         <hwaddr> von gegebenem Gerät lesen\n"
- 
--#: ../arp.c:627
-+#: ../arp.c:639
-+#, c-format
- msgid "        -A, -p, --protocol       specify protocol family\n"
- msgstr "        -A, -p, --protocol              Routentabelle anzeigen\n"
- 
--#: ../arp.c:628
-+#: ../arp.c:640
-+#, c-format
- msgid ""
--"        -f, --file               read new entries from file or from "
--"/etc/ethers\n"
-+"        -f, --file               read new entries from file or from /etc/"
-+"ethers\n"
- "\n"
- msgstr ""
- "        -f, --file               Neue Einträge aus Datei lesen\n"
- "\n"
- 
--#: ../arp.c:630 ../rarp.c:181
-+#: ../arp.c:642 ../rarp.c:182
- #, c-format
- msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
- msgstr "  <HW>='-H <hw>' um Hardwareadresstyp anzugeben.  Standard: %s\n"
- 
--#: ../arp.c:631 ../rarp.c:182
-+#: ../arp.c:643 ../rarp.c:183
-+#, c-format
- msgid "  List of possible hardware types (which support ARP):\n"
- msgstr "  Liste möglicher Hardwaretypen, die ARP unterstützen:\n"
- 
--#: ../arp.c:664
-+#: ../arp.c:677 ../arp.c:762
- #, c-format
- msgid "%s: hardware type not supported!\n"
- msgstr "%s: Hardwaretyp nicht unterstützt!\n"
- 
--#: ../arp.c:668
-+#: ../arp.c:681
- #, c-format
- msgid "%s: address family not supported!\n"
- msgstr "%s: Adressfamilie nicht unterstützt!\n"
- 
--#: ../arp.c:703
-+#: ../arp.c:716
-+#, c-format
- msgid "arp: -N not yet supported.\n"
- msgstr "arp: -N noch nicht unterstützt.\n"
- 
--#: ../arp.c:713
-+#: ../arp.c:726
- #, c-format
- msgid "arp: %s: unknown address family.\n"
- msgstr "arp: %s: unbekannte Adressfamilie.\n"
- 
--#: ../arp.c:722
-+#: ../arp.c:735
- #, c-format
- msgid "arp: %s: unknown hardware type.\n"
- msgstr "arp: %s: unbekannter Hardwaretyp.\n"
- 
--#: ../arp.c:741
-+#: ../arp.c:754
- #, c-format
- msgid "arp: %s: kernel only supports 'inet'.\n"
--msgstr "arp: %s: Kernel unterstützt nur ,,inet''.\n"
-+msgstr "arp: %s: Kernel unterstützt nur »inet«.\n"
- 
--#: ../arp.c:746
-+#: ../arp.c:767
- #, c-format
- msgid "arp: %s: hardware type without ARP support.\n"
- msgstr "arp: %s: Hardware unterstützt kein ARP.\n"
- 
--#: ../hostname.c:69
-+#: ../hostname.c:71
- #, c-format
- msgid "Setting nodename to `%s'\n"
--msgstr "Rechnernamen auf ,,%s'' setzen\n"
-+msgstr "Rechnernamen auf »%s« setzen\n"
- 
--#: ../hostname.c:74
-+#: ../hostname.c:76
- #, c-format
- msgid "%s: you must be root to change the node name\n"
- msgstr "%s: Nur Root darf den Rechnernamen ändern\n"
- 
--#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116
-+#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117
- #, c-format
- msgid "%s: name too long\n"
- msgstr "%s: name zu lang\n"
- 
--#: ../hostname.c:89
-+#: ../hostname.c:91
- #, c-format
- msgid "Setting hostname to `%s'\n"
--msgstr "Setze Hostname auf ,,%s''\n"
-+msgstr "Setze Hostname auf »%s«\n"
- 
--#: ../hostname.c:94
-+#: ../hostname.c:96
- #, c-format
- msgid "%s: you must be root to change the host name\n"
--msgstr "%s: Nur Root darf then Rechnernamen ändern\n"
-+msgstr "%s: Nur Root darf den Rechnernamen ändern\n"
- 
--#: ../hostname.c:108
-+#: ../hostname.c:109
- #, c-format
- msgid "Setting domainname to `%s'\n"
--msgstr "Setze domainname auf ,,%s''\n"
-+msgstr "Setze domainname auf »%s«\n"
- 
--#: ../hostname.c:113
-+#: ../hostname.c:114
- #, c-format
- msgid "%s: you must be root to change the domain name\n"
- msgstr "%s: Nur Root darf den Domainnamen ändern\n"
-@@ -267,51 +290,56 @@
- #: ../hostname.c:131
- #, c-format
- msgid "Resolving `%s' ...\n"
--msgstr "Löse ,,%s'' auf ...\n"
-+msgstr "Löse »%s« auf ...\n"
- 
- #: ../hostname.c:137
- #, c-format
- msgid "Result: h_name=`%s'\n"
--msgstr "Ergebnis: h_name=,,%s''\n"
-+msgstr "Ergebnis: h_name=»%s«\n"
- 
- #: ../hostname.c:142
- #, c-format
- msgid "Result: h_aliases=`%s'\n"
--msgstr "Ergebnis: h_aliases=,,%s''\n"
-+msgstr "Ergebnis: h_aliases=»%s«\n"
- 
- #: ../hostname.c:147
- #, c-format
- msgid "Result: h_addr_list=`%s'\n"
--msgstr "Ergebnis: h_addr_list=,,%s''\n"
-+msgstr "Ergebnis: h_addr_list=»%s«\n"
- 
--#: ../hostname.c:209
-+#: ../hostname.c:208
- #, c-format
- msgid "%s: can't open `%s'\n"
--msgstr "%s: Kann ,,%s'' nicht öffnen\n"
-+msgstr "%s: Kann »%s« nicht öffnen\n"
- 
--#: ../hostname.c:223
-+#: ../hostname.c:222
-+#, c-format
- msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
- msgstr ""
- "Benutzung: hostname [-v] {Hostname|-F Datei} Hostname (aus Datei) setzen\n"
- 
--#: ../hostname.c:224
-+#: ../hostname.c:223
-+#, c-format
- msgid ""
- "       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
- msgstr ""
--"       domainname [-v] {nisdomain|-F file}   NIS Domainname (aus Datei) "
-+"       domainname [-v] {nisdomain|-F file}   NIS-Domainname (aus Datei) "
- "setzen.\n"
- 
--#: ../hostname.c:226
-+#: ../hostname.c:225
-+#, c-format
- msgid ""
- "       nodename [-v] {nodename|-F file}      set DECnet node name (from "
- "file)\n"
- msgstr "       nodename [-v] {Rechnername|-F Datei}\n"
- 
--#: ../hostname.c:228
-+#: ../hostname.c:227
-+#, c-format
- msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
- msgstr "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]\n"
- 
--#: ../hostname.c:229
-+#: ../hostname.c:228
-+#, c-format
- msgid ""
- "       hostname [-v]                         display hostname\n"
- "\n"
-@@ -319,7 +347,8 @@
- "       hostname [-v]                         Hostnamen anzeigen\n"
- "\n"
- 
--#: ../hostname.c:230
-+#: ../hostname.c:229
-+#, c-format
- msgid ""
- "       hostname -V|--version|-h|--help       print info and exit\n"
- "\n"
-@@ -328,7 +357,8 @@
- "beenden.\n"
- "\n"
- 
--#: ../hostname.c:231
-+#: ../hostname.c:230
-+#, c-format
- msgid ""
- "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
- "\n"
-@@ -336,43 +366,52 @@
- "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
- "\n"
- 
--#: ../hostname.c:232
-+#: ../hostname.c:231
-+#, c-format
- msgid "    -s, --short           short host name\n"
- msgstr "    -s, --short           Kurzer Hostname\n"
- 
--#: ../hostname.c:233
-+#: ../hostname.c:232
-+#, c-format
- msgid "    -a, --alias           alias names\n"
- msgstr "    -a, --alias           Namensalias\n"
- 
--#: ../hostname.c:234
-+#: ../hostname.c:233
-+#, c-format
- msgid "    -i, --ip-address      addresses for the hostname\n"
- msgstr "    -i, --ip-address      Adressen für den Hostnamen\n"
- 
--#: ../hostname.c:235
-+#: ../hostname.c:234
-+#, c-format
- msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
- msgstr "    -f, --fqdn, --long    Langer Hostname (FQDN)\n"
- 
--#: ../hostname.c:236
-+#: ../hostname.c:235
-+#, c-format
- msgid "    -d, --domain          DNS domain name\n"
--msgstr "    -d, --domain          DNS Domainname\n"
-+msgstr "    -d, --domain          DNS-Domainname\n"
- 
--#: ../hostname.c:237
-+#: ../hostname.c:236
-+#, c-format
- msgid "    -y, --yp, --nis       NIS/YP domainname\n"
--msgstr "    -y, --yp, --nis       NIS/YP Domainname\n"
-+msgstr "    -y, --yp, --nis       NIS/YP-Domainname\n"
- 
--#: ../hostname.c:239
-+#: ../hostname.c:238
-+#, c-format
- msgid "    -n, --node            DECnet node name\n"
--msgstr "    -n, --node            DECnet Knotennamen\n"
-+msgstr "    -n, --node            DECnet-Knotennamen\n"
- 
--#: ../hostname.c:241
-+#: ../hostname.c:240
-+#, c-format
- msgid ""
- "    -F, --file            read hostname or NIS domainname from given file\n"
- "\n"
- msgstr ""
--"    -F, --file            Hostnamen oder NIS Domainnamen aus Datei lesen\n"
-+"    -F, --file            Hostnamen oder NIS-Domainnamen aus Datei lesen\n"
- "\n"
- 
--#: ../hostname.c:243
-+#: ../hostname.c:242
-+#, c-format
- msgid ""
- "   This command can read or set the hostname or the NIS domainname. You can\n"
- "   also read the DNS domain or the FQDN (fully qualified domain name).\n"
-@@ -380,395 +419,268 @@
- "   FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n"
- "   part of the FQDN) in the /etc/hosts file.\n"
- msgstr ""
--"   Dies Kommando setzt oder gibt den Hostnamen oder NIS Domainnamen aus.\n"
--"   Es ist ebenfalls möglich die DNS Domain oder den FQDN (langen Hostnamen)\n"
-+"   Dies Kommando setzt oder gibt den Hostnamen oder NIS-Domainnamen aus.\n"
-+"   Es ist ebenfalls möglich die DNS-Domain oder den FQDN (langen Hostnamen)\n"
- "   ausgeben zu lassen.  Außer wenn DNS oder NIS als Namensdienst verwendet\n"
--"   wird, können FQDN (Fully Qualified Domain Name) und DNS Domainname (welcher\n"
-+"   wird, können FQDN (Fully Qualified Domain Name) und DNS-Domainname (welcher\n"
- "   Teil des FQDNs ist) in /etc/hosts geändert werden.\n"
- 
- #: ../hostname.c:338
- #, c-format
- msgid "%s: You can't change the DNS domain name with this command\n"
--msgstr "%s: Mit diesem Program kann der DNS Domainname nicht geändert werden\n"
-+msgstr "%s: Mit diesem Programm kann der DNS-Domainname nicht geändert werden\n"
- 
- #: ../hostname.c:339
-+#, c-format
- msgid ""
- "\n"
- "Unless you are using bind or NIS for host lookups you can change the DNS\n"
- msgstr ""
- "\n"
--"Wenn Bind oder NIS nicht zur Hostnamensauflösung benutzt werden, kann der "
--"DNS\n"
-+"Wenn Bind oder NIS nicht zur Hostnamensauflösung benutzt werden, kann der DNS\n"
- 
- #: ../hostname.c:340
-+#, c-format
- msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
--msgstr ""
--"Domainname (welcher Teil des FQDN ist) in der Datei /etc/hosts geändert "
--"werden.\n"
-+msgstr "Domainname (welcher Teil des FQDN ist) in der Datei /etc/hosts geändert werden.\n"
- 
- #: ../hostname.c:357
- #, c-format
- msgid "gethostname()=`%s'\n"
--msgstr "gethostname()=,,%s''\n"
-+msgstr "gethostname()=»%s«\n"
- 
- #: ../hostname.c:374
- #, c-format
- msgid "getdomainname()=`%s'\n"
--msgstr "getdomainname()=,,%s''\n"
-+msgstr "getdomainname()=»%s«\n"
- 
- #: ../hostname.c:389
- #, c-format
- msgid "getnodename()=`%s'\n"
--msgstr "getnodename()=,,%s''\n"
-+msgstr "getnodename()=»%s«\n"
- 
--#: ../ifconfig.c:159
--#, c-format
--msgid "%-9.9s Link encap:%s  "
--msgstr "%-9.9s Protokoll:%s  "
-+#: ../ifconfig.c:107
-+#, fuzzy, c-format
-+msgid ""
-+"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
-+"Flg\n"
-+msgstr "SStelle MTU Met    RX-OK RX-Feh RX-DRP RX-Ülf    TX-OK TX-Feh TX-DRP TX-Üb Flg\n"
- 
--#: ../ifconfig.c:164
--#, c-format
--msgid "HWaddr %s  "
--msgstr "Hardware Adresse %s  "
-+#: ../ifconfig.c:129 ../ifconfig.c:161
-+#, fuzzy, c-format
-+msgid "%s: ERROR while getting interface flags: %s\n"
-+msgstr "%s: Fehler beim Auslesen der Schnittstelleninformation: %s\n"
- 
--#: ../ifconfig.c:167
-+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
-+#: ../ifconfig.c:973
- #, c-format
--msgid "Media:%s"
--msgstr "Medium:%s"
-+msgid "No support for INET on this system.\n"
-+msgstr "INET ist auf diesem System nicht verfügbar.\n"
- 
--#: ../ifconfig.c:169
--msgid "(auto)"
--msgstr "(auto)"
-+#: ../ifconfig.c:193
-+#, fuzzy, c-format
-+msgid "%s: ERROR while testing interface flags: %s\n"
-+msgstr "%s: Fehler beim Auslesen der Schnittstelleninformation: %s\n"
- 
--#: ../ifconfig.c:176
--#, c-format
--msgid "          %s addr:%s "
--msgstr "          %s Adresse:%s "
-+#: ../ifconfig.c:202
-+#, fuzzy, c-format
-+msgid ""
-+"Usage:\n"
-+"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
-+msgstr ""
-+"Syntax:\n"
-+"  ifconfig [-a] [-i] [-v] <Schnittstelle> [[<AF>] <Adresse>]\n"
- 
--#: ../ifconfig.c:179
-+#: ../ifconfig.c:204
- #, c-format
--msgid " P-t-P:%s "
--msgstr " P-z-P:%s "
-+msgid "  [add <address>[/<prefixlen>]]\n"
-+msgstr "  [add <Adresse>[/<Präfixlänge>]]\n"
- 
--#: ../ifconfig.c:182
-+#: ../ifconfig.c:205
- #, c-format
--msgid " Bcast:%s "
--msgstr " Bcast:%s "
-+msgid "  [del <address>[/<prefixlen>]]\n"
-+msgstr "  [del <Adresse>[/<Präfixlänge>]]\n"
- 
--#: ../ifconfig.c:184
-+#: ../ifconfig.c:206
- #, c-format
--msgid " Mask:%s\n"
--msgstr " Maske:%s\n"
-+msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
-+msgstr "  [[-]broadcast [<Adresse>]]  [[-]pointopoint [<Adresse>]]\n"
- 
--#: ../ifconfig.c:201
-+#: ../ifconfig.c:207
- #, c-format
--msgid "          inet6 addr: %s/%d"
--msgstr "          inet6 Adresse: %s/%d"
--
--#: ../ifconfig.c:203
--msgid " Scope:"
--msgstr " Gültigkeitsbereich:"
--
--#: ../ifconfig.c:206
--msgid "Global"
--msgstr "Global"
-+msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
-+msgstr "  [netmask <Adresse>]  [dstaddr <Adresse>]  [tunnel <Adresse>]\n"
- 
--#: ../ifconfig.c:209
--msgid "Link"
--msgstr "Verbindung"
-+#: ../ifconfig.c:210
-+#, c-format
-+msgid "  [outfill <NN>] [keepalive <NN>]\n"
-+msgstr "  [outfill <NN>] [keepalive <NN>]\n"
- 
- #: ../ifconfig.c:212
--msgid "Site"
--msgstr "Standort"
--
--#: ../ifconfig.c:215
--msgid "Compat"
--msgstr "Kompatibilität"
--
--#: ../ifconfig.c:218
--msgid "Host"
--msgstr "Maschine"
--
--#: ../ifconfig.c:221
--msgid "Unknown"
--msgstr "Unbekannt"
--
--#: ../ifconfig.c:236
- #, c-format
--msgid "          IPX/Ethernet II addr:%s\n"
--msgstr "          IPX/Ethernet II Adresse:%s\n"
-+msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
-+msgstr "  [hw <HW> <Adresse>]  [metric <NN>]  [mtu <NN>]\n"
- 
--#: ../ifconfig.c:239
-+#: ../ifconfig.c:213
- #, c-format
--msgid "          IPX/Ethernet SNAP addr:%s\n"
--msgstr "          IPX/Ethernet SNAP Adresse:%s\n"
-+msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-+msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
- 
--#: ../ifconfig.c:242
-+#: ../ifconfig.c:214
- #, c-format
--msgid "          IPX/Ethernet 802.2 addr:%s\n"
--msgstr "          IPX/Ethernet 802.2 Adresse:%s\n"
-+msgid "  [multicast]  [[-]promisc]\n"
-+msgstr "  [multicast]  [[-]promisc]\n"
- 
--#: ../ifconfig.c:245
-+#: ../ifconfig.c:215
- #, c-format
--msgid "          IPX/Ethernet 802.3 addr:%s\n"
--msgstr "          IPX/Ethernet 802.3 Adresse:%s\n"
-+msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
-+msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <Typ>]\n"
- 
--#: ../ifconfig.c:255
-+#: ../ifconfig.c:217
- #, c-format
--msgid "          EtherTalk Phase 2 addr:%s\n"
--msgstr "          EtherTalk Phase 2 Adresse:%s\n"
-+msgid "  [txqueuelen <NN>]\n"
-+msgstr "  [txqueuelen <Länge>]\n"
- 
--#: ../ifconfig.c:264
-+#: ../ifconfig.c:220
- #, c-format
--msgid "          econet addr:%s\n"
--msgstr "          econet Adresse:%s\n"
--
--#: ../ifconfig.c:270
--msgid "[NO FLAGS] "
--msgstr "[KEINE FLAGS] "
--
--#: ../ifconfig.c:272
--msgid "UP "
--msgstr "UP "
--
--#: ../ifconfig.c:274
--msgid "BROADCAST "
--msgstr "BROADCAST "
--
--#: ../ifconfig.c:276
--msgid "DEBUG "
--msgstr "DEBUG "
--
--#: ../ifconfig.c:278
--msgid "LOOPBACK "
--msgstr "LOOPBACK "
--
--#: ../ifconfig.c:280
--msgid "POINTOPOINT "
--msgstr "PUNKTZUPUNKT "
--
--#: ../ifconfig.c:282
--msgid "NOTRAILERS "
--msgstr "NOTRAILERS "
-+msgid "  [[-]dynamic]\n"
-+msgstr "  [[-]dynamic]\n"
- 
--#: ../ifconfig.c:284
--msgid "RUNNING "
--msgstr "RUNNING "
-+#: ../ifconfig.c:222
-+#, c-format
-+msgid ""
-+"  [up|down] ...\n"
-+"\n"
-+msgstr ""
-+"  [up|down] ...\n"
-+"\n"
- 
--#: ../ifconfig.c:286
--msgid "NOARP "
--msgstr "NOARP "
-+#: ../ifconfig.c:224
-+#, c-format
-+msgid "  <HW>=Hardware Type.\n"
-+msgstr "  <HW>=Hardwaretyp.\n"
- 
--#: ../ifconfig.c:288
--msgid "PROMISC "
--msgstr "PROMISC "
-+#: ../ifconfig.c:225
-+#, c-format
-+msgid "  List of possible hardware types:\n"
-+msgstr "  Liste möglicher Hardwaretypen:\n"
- 
--#: ../ifconfig.c:290
--msgid "ALLMULTI "
--msgstr "ALLMULTI "
-+#. 1 = ARPable
-+#: ../ifconfig.c:227
-+#, c-format
-+msgid "  <AF>=Address family. Default: %s\n"
-+msgstr "  <AF>=Adressfamilie.  Standardwert: %s\n"
- 
--#: ../ifconfig.c:292
--msgid "SLAVE "
--msgstr "SLAVE "
-+#: ../ifconfig.c:228
-+#, c-format
-+msgid "  List of possible address families:\n"
-+msgstr "  List der möglichen Adressfamilien:\n"
- 
--#: ../ifconfig.c:294
--msgid "MASTER "
--msgstr "MASTER "
-+#: ../ifconfig.c:303
-+#, c-format
-+msgid "ifconfig: option `%s' not recognised.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:296
--msgid "MULTICAST "
--msgstr "MULTICAST "
-+#: ../ifconfig.c:305 ../ifconfig.c:962
-+#, c-format
-+msgid "ifconfig: `--help' gives usage information.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:299
--msgid "DYNAMIC "
--msgstr "DYNAMIC "
-+#: ../ifconfig.c:380
-+#, c-format
-+msgid "Unknown media type.\n"
-+msgstr "Typ des Mediums unbekannt.\n"
- 
--#: ../ifconfig.c:302
-+#: ../ifconfig.c:417
- #, c-format
--msgid " MTU:%d  Metric:%d"
--msgstr " MTU:%d  Metric:%d"
-+msgid ""
-+"Warning: Interface %s still in promisc mode... maybe other application is "
-+"running?\n"
-+msgstr ""
- 
--#: ../ifconfig.c:306
-+#: ../ifconfig.c:429
- #, c-format
--msgid "  Outfill:%d  Keepalive:%d"
--msgstr "  Outfill:%d  Keepalive:%d"
-+msgid "Warning: Interface %s still in MULTICAST mode.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:320
-+#: ../ifconfig.c:441
- #, c-format
--msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
-+msgid "Warning: Interface %s still in ALLMULTI mode.\n"
- msgstr ""
--"Empfangene Pakete:%lu Fehler:%lu Weggeworfen:%lu Überlauf:%lu Rahmen:%lu\n"
- 
--#: ../ifconfig.c:325
-+#: ../ifconfig.c:465
- #, c-format
--msgid "             compressed:%lu\n"
--msgstr "             komprimiert:%lu\n"
-+msgid "Warning: Interface %s still in DYNAMIC mode.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:329
-+#: ../ifconfig.c:523
- #, c-format
--msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
-+msgid "Warning: Interface %s still in BROADCAST mode.\n"
- msgstr ""
--"Verschickte Pakete:%lu Fehler:%lu Weggeworfen:%lu Überlauf:%lu Träger:%lu\n"
- 
--#: ../ifconfig.c:333
-+#: ../ifconfig.c:652
- #, c-format
--msgid "          collisions:%lu "
--msgstr "          Kollisionen:%lu "
-+msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:335
-+#: ../ifconfig.c:684
- #, c-format
--msgid "compressed:%lu "
--msgstr "Komprimiert:%lu "
-+msgid "hw address type `%s' has no handler to set address. failed.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:337
-+#: ../ifconfig.c:693
- #, c-format
--msgid "txqueuelen:%d "
--msgstr "Sendewarteschlangenlänge:%d "
-+msgid "%s: invalid %s address.\n"
-+msgstr "%s: ungültige %s Adresse.\n"
- 
--#: ../ifconfig.c:345
-+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
- #, c-format
--msgid "Interrupt:%d "
--msgstr "Interrupt:%d "
--
--#. Only print devices using it for
--#. I/O maps
--#: ../ifconfig.c:348
--#, c-format
--msgid "Base address:0x%x "
--msgstr "Basisadresse:0x%x "
--
--#: ../ifconfig.c:350
--#, c-format
--msgid "Memory:%lx-%lx "
--msgstr "Speicher:%lx-%lx "
--
--#: ../ifconfig.c:353
--#, c-format
--msgid "DMA chan:%x "
--msgstr "DMA Kanal:%x "
-+msgid "No support for INET6 on this system.\n"
-+msgstr "INET6 ist auf diesem System nicht verfügbar.\n"
- 
--#: ../ifconfig.c:384 ../ifconfig.c:405
-+#: ../ifconfig.c:780 ../ifconfig.c:871
- #, c-format
--msgid "%s: unknown interface: %s\n"
--msgstr "%s: unbekannte Schnittstelle: %s\n"
--
--#: ../ifconfig.c:421
--msgid ""
--"Usage:\n"
--"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <address>]\n"
--msgstr ""
--"Syntax:\n"
--"  ifconfig [-a] [-i] [-v] <Schnittstelle> [[<AF>] <Adresse>]\n"
--
--#: ../ifconfig.c:425
--msgid "  [add <address>[/<prefixlen>]]\n"
--msgstr "  [add <Adresse>[/<Prefixlänge>]]\n"
--
--#: ../ifconfig.c:427
--msgid "  [del <address>[/<prefixlen>]]\n"
--msgstr "  [del <Adresse>[/<Prefixlänge>]]\n"
--
--#: ../ifconfig.c:432
--msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
--msgstr "  [[-]broadcast [<Adresse>]]  [[-]pointopoint [<Adresse>]]\n"
--
--#: ../ifconfig.c:433
--msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
--msgstr "  [netmask <Addresse>]  [dstaddr <Adresse>]  [tunnel <Adresse>]\n"
--
--#: ../ifconfig.c:436
--msgid "  [outfill <NN>] [keepalive <NN>]\n"
--msgstr "  [outfill <NN>] [keepalive <NN>]\n"
--
--#: ../ifconfig.c:438
--msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
--msgstr "  [hw <HW> <Adresse>]  [metric <NN>]  [mtu <NN>]\n"
--
--#: ../ifconfig.c:439
--msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
--msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
--
--#: ../ifconfig.c:440
--msgid "  [multicast]  [[-]promisc]\n"
--msgstr "  [multicast]  [[-]promisc]\n"
--
--#: ../ifconfig.c:441
--msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
--msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <Typ>]\n"
--
--#: ../ifconfig.c:443
--msgid "  [txqueuelen <NN>]\n"
--msgstr "  [txqueuelen <Länge>]\n"
--
--#: ../ifconfig.c:446
--msgid "  [[-]dynamic]\n"
--msgstr "  [[-]dynamic]\n"
--
--#: ../ifconfig.c:448
--msgid ""
--"  [up|down] ...\n"
--"\n"
-+msgid "Interface %s not initialized\n"
- msgstr ""
--"  [up|down] ...\n"
--"\n"
--
--#: ../ifconfig.c:450
--msgid "  <HW>=Hardware Type.\n"
--msgstr "  <HW>=Hardwaretyp.\n"
--
--#: ../ifconfig.c:451
--msgid "  List of possible hardware types:\n"
--msgstr "  Liste möglicher Hardwaretypen:\n"
--
--#. 1 = ARPable
--#: ../ifconfig.c:453
--#, c-format
--msgid "  <AF>=Address family. Default: %s\n"
--msgstr "  <AF>=Adressfamilie.  Standardwert: %s\n"
--
--#: ../ifconfig.c:454
--msgid "  List of possible address families:\n"
--msgstr "  List der möglichen Adressfamilien:\n"
--
--#: ../ifconfig.c:593
--msgid "Unknown media type.\n"
--msgstr "Typ des Mediums unbekannt.\n"
- 
--#: ../ifconfig.c:881
--#, c-format
--msgid "%s: invalid %s address.\n"
-+#: ../ifconfig.c:792 ../ifconfig.c:882
-+#, fuzzy, c-format
-+msgid "Bad address.\n"
- msgstr "%s: ungültige %s Adresse.\n"
- 
--#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011
--msgid "No support for INET6 on this system.\n"
--msgstr "INET6 ist auf diesem System nicht verfügbar.\n"
--
--#: ../ifconfig.c:983
-+#: ../ifconfig.c:885
-+#, c-format
- msgid "Address deletion not supported on this system.\n"
--msgstr "Das Löschen von Adressen ist auf diesem System nicht unterstützt.\n"
-+msgstr "Das Löschen von Adressen wird auf diesem System nicht unterstützt.\n"
- 
--#: ../ifconfig.c:1066
--msgid "No support for INET on this system.\n"
--msgstr "INET ist auf diesem System nicht verfügbar.\n"
-+#: ../ifconfig.c:957
-+#, fuzzy, c-format
-+msgid "ifconfig: Cannot set address for this protocol family.\n"
-+msgstr "Kann die Adressen der Familie %d nicht setzen.\n"
- 
--#: ../ifconfig.c:1076
-+#: ../ifconfig.c:983
-+#, c-format
- msgid "No support for ECONET on this system.\n"
- msgstr "ECONET wird auf diesem System nicht unterstützt.\n"
- 
--#: ../ifconfig.c:1084
-+#: ../ifconfig.c:991
- #, c-format
- msgid "Don't know how to set addresses for family %d.\n"
- msgstr "Kann die Adressen der Familie %d nicht setzen.\n"
- 
--#: ../netstat.c:383
-+#: ../ifconfig.c:1021
-+#, c-format
-+msgid "WARNING: at least one error occured. (%d)\n"
-+msgstr ""
-+
-+#: ../netstat.c:434
- #, c-format
- msgid ""
- "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
--msgstr ""
--"(Für \"-p\": geteuid()=%d konnte keine Information gelesen werden; sie "
--"sollten Root sein.)\n"
-+msgstr "(Für \"-p\": geteuid()=%d konnte keine Information gelesen werden; sie sollten Root sein.)\n"
- 
--#: ../netstat.c:387
-+#: ../netstat.c:438
-+#, c-format
- msgid ""
- "(Not all processes could be identified, non-owned process info\n"
- " will not be shown, you would have to be root to see it all.)\n"
-@@ -776,198 +688,220 @@
- "(Es konnten nicht alle Prozesse identifiziert werden; Informationen über\n"
- "nicht-eigene Processe werden nicht angezeigt; Root kann sie anzeigen.)\n"
- 
--#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166
-+#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
- msgid "LISTENING"
- msgstr "HÖRT"
- 
--#: ../netstat.c:395
-+#: ../netstat.c:446
- msgid "CONN SENT"
- msgstr "VERBINGSAUFBAU GESCHICKT"
- 
--#: ../netstat.c:396 ../netstat.c:1168
-+#: ../netstat.c:447 ../netstat.c:1268
- msgid "DISC SENT"
- msgstr "VERBINDUNGSABBAU GESCHICKT"
- 
--#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169
-+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
- msgid "ESTABLISHED"
- msgstr "VERBUNDEN"
- 
--#: ../netstat.c:419
-+#: ../netstat.c:470
-+#, c-format
- msgid "Active NET/ROM sockets\n"
- msgstr "Aktive NET/ROM Sockets\n"
- 
--#: ../netstat.c:420
-+#: ../netstat.c:471
-+#, c-format
- msgid ""
--"User       Dest       Source     Device  State        Vr/Vs    Send-Q  "
--"Recv-Q\n"
--msgstr ""
--"Benutzer   Ziel       Quelle     Gerät   Zustand      Vr/Vs    Send-Q  "
--"Recv-Q\n"
-+"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
-+"Q\n"
-+msgstr "Benutzer   Ziel       Quelle     Gerät   Zustand      Vr/Vs    Send-Q  Recv-Q\n"
- 
--#: ../netstat.c:430 ../netstat.c:1208
-+#: ../netstat.c:481 ../netstat.c:1308
- #, c-format
- msgid "Problem reading data from %s\n"
- msgstr "Probleme beim Lesen von %s\n"
- 
--#: ../netstat.c:465
-+#: ../netstat.c:516
- msgid "SYN_SENT"
- msgstr "SYN_SENT"
- 
--#: ../netstat.c:466
-+#: ../netstat.c:517
- msgid "SYN_RECV"
- msgstr "SYN_RECV"
- 
--#: ../netstat.c:467
-+#: ../netstat.c:518
- msgid "FIN_WAIT1"
- msgstr "FIN_WAIT1"
- 
--#: ../netstat.c:468
-+#: ../netstat.c:519
- msgid "FIN_WAIT2"
- msgstr "FIN_WAIT2"
- 
--#: ../netstat.c:469
-+#: ../netstat.c:520
- msgid "TIME_WAIT"
- msgstr "TIME_WAIT"
- 
--#: ../netstat.c:470
-+#: ../netstat.c:521
- msgid "CLOSE"
- msgstr "CLOSE"
- 
--#: ../netstat.c:471
-+#: ../netstat.c:522
- msgid "CLOSE_WAIT"
- msgstr "CLOSE_WAIT"
- 
--#: ../netstat.c:472
-+#: ../netstat.c:523
- msgid "LAST_ACK"
- msgstr "LAST_ACK"
- 
--#: ../netstat.c:473
-+#: ../netstat.c:524
- msgid "LISTEN"
- msgstr "LISTEN"
- 
--#: ../netstat.c:474
-+#: ../netstat.c:525
- msgid "CLOSING"
- msgstr "CLOSING"
- 
--#: ../netstat.c:544
-+#: ../netstat.c:596
- #, c-format
- msgid "warning, got bogus igmp6 line %d.\n"
- msgstr "Warnung, fehlerhafte igmp6 line %d.\n"
- 
--#: ../netstat.c:549 ../netstat.c:587 ../netstat.c:670 ../netstat.c:803
--#: ../netstat.c:935 ../netstat.c:940
-+#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
-+#: ../netstat.c:1032 ../netstat.c:1037
- #, c-format
- msgid "netstat: unsupported address family %d !\n"
- msgstr "netstat: Nicht unterstützte Adressfamilie %d!\n"
- 
--#: ../netstat.c:562 ../netstat.c:567 ../netstat.c:575 ../netstat.c:582
-+#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
- #, c-format
- msgid "warning, got bogus igmp line %d.\n"
- msgstr "Warnung, fehlerhafte igmp-Zeile %d.\n"
- 
--#: ../netstat.c:666
-+#: ../netstat.c:677
-+#, fuzzy, c-format
-+msgid "Active X.25 sockets\n"
-+msgstr "Aktive AX.25 Sockets\n"
-+
-+#. IMHO, Vr/Vs is not very usefull --SF
-+#: ../netstat.c:679
-+#, fuzzy, c-format
-+msgid ""
-+"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
-+"Q\n"
-+msgstr "Ziel       Quelle     Gerät   Zustand      Vr/Vs    Send-Q  Empf-Q\n"
-+
-+#: ../netstat.c:759
-+#, c-format
- msgid "warning, got bogus tcp line.\n"
- msgstr "Warnung, fehlerhafte TCP Zeile.\n"
- 
--#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975
-+#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
- #, c-format
- msgid "off (0.00/%ld/%d)"
- msgstr "aus (0.00/%ld/%d)"
- 
--#: ../netstat.c:708
-+#: ../netstat.c:804
- #, c-format
- msgid "on (%2.2f/%ld/%d)"
- msgstr "ein (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:713
-+#: ../netstat.c:809
- #, fuzzy, c-format
- msgid "keepalive (%2.2f/%ld/%d)"
- msgstr "ein%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:718
-+#: ../netstat.c:814
- #, fuzzy, c-format
- msgid "timewait (%2.2f/%ld/%d)"
- msgstr "ein%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985
-+#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
- #, c-format
- msgid "unkn-%d (%2.2f/%ld/%d)"
- msgstr "unkn-%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:799
-+#: ../netstat.c:894
-+#, c-format
- msgid "warning, got bogus udp line.\n"
- msgstr "Warnung, fehlerhafe UDP-Zeile.\n"
- 
--#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108
-+#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
- msgid "UNKNOWN"
- msgstr "UNBEKANNT"
- 
--#: ../netstat.c:860 ../netstat.c:980
-+#: ../netstat.c:958 ../netstat.c:1080
- #, c-format
- msgid "on%d (%2.2f/%ld/%d)"
- msgstr "ein%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:949
-+#: ../netstat.c:1046
-+#, c-format
- msgid "warning, got bogus raw line.\n"
- msgstr "Warnung, fehlerhafte raw-Zeile.\n"
- 
--#: ../netstat.c:1028
-+#: ../netstat.c:1128
-+#, c-format
- msgid "warning, got bogus unix line.\n"
- msgstr "Warnung, fehlerhafte UNIX-Zeile.\n"
- 
--#: ../netstat.c:1055
-+#: ../netstat.c:1155
- msgid "STREAM"
- msgstr "STREAM"
- 
--#: ../netstat.c:1059
-+#: ../netstat.c:1159
- msgid "DGRAM"
- msgstr "DGRAM"
- 
--#: ../netstat.c:1063
-+#: ../netstat.c:1163
- msgid "RAW"
- msgstr "RAW"
- 
--#: ../netstat.c:1067
-+#: ../netstat.c:1167
- msgid "RDM"
- msgstr "RDM"
- 
--#: ../netstat.c:1071
-+#: ../netstat.c:1171
- msgid "SEQPACKET"
--msgstr "SEQPACKET"
-+msgstr "SEQPAKET"
- 
--#: ../netstat.c:1080
-+#: ../netstat.c:1180
- msgid "FREE"
- msgstr "FREI"
- 
--#: ../netstat.c:1096
-+#: ../netstat.c:1196
- msgid "CONNECTING"
- msgstr "VERBINDUNGSAUFBAU"
- 
--#: ../netstat.c:1100
-+#: ../netstat.c:1200
- msgid "CONNECTED"
- msgstr "VERBUNDEN"
- 
--#: ../netstat.c:1104
-+#: ../netstat.c:1204
- msgid "DISCONNECTING"
- msgstr "VERBINDUNGSABBAU"
- 
--#: ../netstat.c:1135
-+#: ../netstat.c:1235
-+#, c-format
- msgid "Active UNIX domain sockets "
--msgstr "Aktive Sockets in der UNIX Domäne "
-+msgstr "Aktive Sockets in der UNIX-Domäne "
- 
--#: ../netstat.c:1137 ../netstat.c:1666
-+#: ../netstat.c:1237 ../netstat.c:1756
-+#, c-format
- msgid "(servers and established)"
- msgstr "(Server und stehende Verbindungen)"
- 
--#: ../netstat.c:1140 ../netstat.c:1669
-+#: ../netstat.c:1240 ../netstat.c:1759
-+#, c-format
- msgid "(only servers)"
- msgstr "(Nur Server)"
- 
--#: ../netstat.c:1142 ../netstat.c:1671
-+#: ../netstat.c:1242 ../netstat.c:1761
-+#, c-format
- msgid "(w/o servers)"
- msgstr "(ohne Server)"
- 
--#: ../netstat.c:1145
-+#: ../netstat.c:1245
-+#, c-format
- msgid ""
- "\n"
- "Proto RefCnt Flags       Type       State         I-Node"
-@@ -975,90 +909,90 @@
- "\n"
- "Proto RefZäh Flaggen     Typ        Zustand       I-Node"
- 
--#: ../netstat.c:1147
-+#: ../netstat.c:1247
-+#, c-format
- msgid " Path\n"
- msgstr " Pfad\n"
- 
--#: ../netstat.c:1167
-+#: ../netstat.c:1267
- msgid "SABM SENT"
- msgstr "SABM GESCHICKT"
- 
--#: ../netstat.c:1170
-+#: ../netstat.c:1270
- msgid "RECOVERY"
- msgstr "WIEDERHERSTELLUNG"
- 
--#: ../netstat.c:1184
-+#: ../netstat.c:1284
-+#, c-format
- msgid "Active AX.25 sockets\n"
- msgstr "Aktive AX.25 Sockets\n"
- 
--#: ../netstat.c:1185
-+#: ../netstat.c:1285
-+#, c-format
- msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
- msgstr "Ziel       Quelle     Gerät   Zustand      Vr/Vs    Send-Q  Empf-Q\n"
- 
--#: ../netstat.c:1228
-+#: ../netstat.c:1328
- #, c-format
- msgid "problem reading data from %s\n"
- msgstr "Problem beim Lesen von Daten von %s\n"
- 
--#: ../netstat.c:1279
-+#: ../netstat.c:1379
-+#, c-format
- msgid ""
- "Active IPX sockets\n"
- "Proto Recv-Q Send-Q Local Address              Foreign Address            "
- "State"
- msgstr ""
- "Aktive IPX Sockets\n"
--"Proto Recv-Q Send-Q Lokale Adresse             Gegenaddress               "
-+"Proto Recv-Q Send-Q Lokale Adresse             Gegenadresse               "
- "Zustand"
- 
--#: ../netstat.c:1281
-+#: ../netstat.c:1381
-+#, c-format
- msgid " User"
- msgstr " Benutzer"
- 
--#: ../netstat.c:1315
-+#: ../netstat.c:1415
- msgid "ESTAB"
- msgstr "VERBUNDEN"
- 
--#: ../netstat.c:1323
-+#: ../netstat.c:1423
- msgid "UNK."
- msgstr "UNB."
- 
--#: ../netstat.c:1367
--msgid "     - no statistics available -"
--msgstr "     - keine Statistiken verfügbar -"
--
--#: ../netstat.c:1370
--msgid "[NO FLAGS]"
--msgstr "[KEINE FLAGS]"
--
--#: ../netstat.c:1400
-+#: ../netstat.c:1461
-+#, c-format
- msgid "Kernel Interface table\n"
--msgstr "Kernel Schnittstellentabelle\n"
-+msgstr "Kernel-Schnittstellentabelle\n"
- 
--#: ../netstat.c:1401
-+#: ../netstat.c:1465
-+#, fuzzy, c-format
- msgid ""
--"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
--"Flg\n"
--msgstr ""
--"SStelle MTU Met    RX-OK RX-Feh RX-DRP RX-Ülf    TX-OK TX-Feh TX-DRP TX-Üb "
-+"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
- "Flg\n"
-+msgstr "SStelle MTU Met    RX-OK RX-Feh RX-DRP RX-Ülf    TX-OK TX-Feh TX-DRP TX-Üb Flg\n"
- 
--#: ../netstat.c:1404
-+#: ../netstat.c:1469
- msgid "missing interface information"
--msgstr "Fehlende Interfaceinformation"
-+msgstr "Fehlende Interfaceinformationen"
- 
--#: ../netstat.c:1425
-+#: ../netstat.c:1492
-+#, c-format
- msgid ""
--"usage: netstat [-veenNcCF] [<Af>] -r         netstat "
--"{-V|--version|-h|--help}\n"
-+"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
-+"help}\n"
- msgstr ""
- "Benutzung: netstat [-veenNcCF] [<Af>] -r\n"
- "           netstat {-V|--version|-h|--help}\n"
- 
--#: ../netstat.c:1426
-+#: ../netstat.c:1493
-+#, c-format
- msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
- msgstr "       netstat [-vnNcaeol] [<Socket> ...]\n"
- 
--#: ../netstat.c:1427
-+#: ../netstat.c:1494
-+#, c-format
- msgid ""
- "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
- "\n"
-@@ -1066,27 +1000,32 @@
- "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
- "\n"
- 
--#: ../netstat.c:1429
-+#: ../netstat.c:1496
-+#, c-format
- msgid "        -r, --route              display routing table\n"
- msgstr "        -r, --route              Routentabelle anzeigen\n"
- 
--#: ../netstat.c:1430
-+#: ../netstat.c:1497
-+#, c-format
- msgid "        -i, --interfaces         display interface table\n"
- msgstr "        -i, --interfaces         Schnittstellentabelle auflisten\n"
- 
--#: ../netstat.c:1431
-+#: ../netstat.c:1498
-+#, c-format
- msgid "        -g, --groups             display multicast group memberships\n"
- msgstr ""
- "        -g, --groups             Mitgliedschaft in Multicastgruppen "
- "anzeigen\n"
- 
--#: ../netstat.c:1432
-+#: ../netstat.c:1499
-+#, c-format
- msgid ""
- "        -s, --statistics         display networking statistics (like SNMP)\n"
- msgstr ""
- "        -s, --statistics         Netzwerksstatistiken anzeigen (wie SNMP)\n"
- 
--#: ../netstat.c:1434
-+#: ../netstat.c:1501
-+#, c-format
- msgid ""
- "        -M, --masquerade         display masqueraded connections\n"
- "\n"
-@@ -1094,23 +1033,38 @@
- "        -M, --masquerade         Maskierte Verbindungen auflisten\n"
- "\n"
- 
--#: ../netstat.c:1438 ../route.c:87
-+#: ../netstat.c:1505
-+#, fuzzy, c-format
-+msgid "        --numeric-hosts          don't resolve host names\n"
-+msgstr "        -n, --numeric            Adressen nicht nach Namen auflösen\n"
-+
-+#: ../netstat.c:1506
-+#, fuzzy, c-format
-+msgid "        --numeric-ports          don't resolve port names\n"
-+msgstr "        -n, --numeric            Adressen nicht nach Namen auflösen\n"
-+
-+#: ../netstat.c:1507
-+#, fuzzy, c-format
-+msgid "        --numeric-users          don't resolve user names\n"
-+msgstr "        -n, --numeric            Adressen nicht nach Namen auflösen\n"
-+
-+#: ../netstat.c:1508
-+#, c-format
- msgid "        -N, --symbolic           resolve hardware names\n"
- msgstr "        -N, --symbolic           Hardwarenamen auflösen\n"
- 
--#: ../netstat.c:1439 ../route.c:88
--#, fuzzy
-+#: ../netstat.c:1509 ../route.c:88
-+#, fuzzy, c-format
- msgid "        -e, --extend             display other/more information\n"
--msgstr ""
--"        -e, --extend             Weitere / zusätzliche Informationen "
--"anzeigen\n"
-+msgstr "        -e, --extend             Weitere / zusätzliche Informationen anzeigen\n"
- 
--#: ../netstat.c:1440
-+#: ../netstat.c:1510
-+#, c-format
- msgid "        -p, --programs           display PID/Program name for sockets\n"
--msgstr ""
--"        -p, --programs           PID/Programmnamen für Sockets anzeigen\n"
-+msgstr "        -p, --programs           PID/Programmnamen für Sockets anzeigen\n"
- 
--#: ../netstat.c:1441
-+#: ../netstat.c:1511
-+#, c-format
- msgid ""
- "        -c, --continuous         continuous listing\n"
- "\n"
-@@ -1118,24 +1072,27 @@
- "        -c, --continuous         Anzeige laufend aktualisieren\n"
- "\n"
- 
--#: ../netstat.c:1442
-+#: ../netstat.c:1512
-+#, c-format
- msgid "        -l, --listening          display listening server sockets\n"
- msgstr ""
- "        -l, --listening          Empfangsbereite Serversockets auflisten\n"
- 
--#: ../netstat.c:1443
-+#: ../netstat.c:1513
-+#, c-format
- msgid ""
- "        -a, --all, --listening   display all sockets (default: connected)\n"
- msgstr ""
- "        -a, --all, --listening   Alle Sockets anzeigen (normal: nur "
- "verbundene)\n"
- 
--#: ../netstat.c:1444
-+#: ../netstat.c:1514
-+#, c-format
- msgid "        -o, --timers             display timers\n"
- msgstr "        -o, --timers             Timer auflisten\n"
- 
--#: ../netstat.c:1445 ../route.c:89
--#, fuzzy
-+#: ../netstat.c:1515 ../route.c:89
-+#, fuzzy, c-format
- msgid ""
- "        -F, --fib                display Forwarding Information Base "
- "(default)\n"
-@@ -1143,7 +1100,8 @@
- "        -F, --fib                Forwarding Infomation Base anzeigen "
- "(Standard)\n"
- 
--#: ../netstat.c:1446 ../route.c:90
-+#: ../netstat.c:1516 ../route.c:90
-+#, c-format
- msgid ""
- "        -C, --cache              display routing cache instead of FIB\n"
- "\n"
-@@ -1151,110 +1109,118 @@
- "        -C, --cache              Routencache statt FIB anzeigen\n"
- "\n"
- 
--#: ../netstat.c:1448
-+#: ../netstat.c:1518
-+#, c-format
- msgid ""
--"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
--"--netrom\n"
-+"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-+"netrom\n"
- msgstr ""
--"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
--"--netrom\n"
-+"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-+"netrom\n"
- 
--#: ../netstat.c:1449 ../route.c:92
--#, c-format
--msgid "  <AF>=Use '-A <af>' or '--<af>' Default: %s\n"
-+#: ../netstat.c:1519
-+#, fuzzy, c-format
-+msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
- msgstr "  <AF>=,,-A <af>'' or ,,--<af>'' benutzen. Standard: %s\n"
- 
--#: ../netstat.c:1450 ../route.c:93
-+#: ../netstat.c:1520 ../route.c:93
-+#, c-format
- msgid "  List of possible address families (which support routing):\n"
- msgstr "  Liste möglicher Adressfamilien, die Routen unterstützen:\n"
- 
--#: ../netstat.c:1663
-+#: ../netstat.c:1753
-+#, c-format
- msgid "Active Internet connections "
- msgstr "Aktive Internetverbindungen "
- 
--#: ../netstat.c:1673
-+#: ../netstat.c:1763
-+#, c-format
- msgid ""
- "\n"
--"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
--"  "
-+"Proto Recv-Q Send-Q Local Address           Foreign Address         "
-+"State      "
- msgstr ""
- "\n"
--"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
--"  "
-+"Proto Recv-Q Send-Q Local Address           Foreign Address         "
-+"State      "
- 
--#: ../netstat.c:1675
-+#: ../netstat.c:1765
-+#, c-format
- msgid " User       Inode     "
- msgstr " Benutzer   Inode     "
- 
--#: ../netstat.c:1678
-+#: ../netstat.c:1768
-+#, c-format
- msgid " Timer"
- msgstr " Timer"
- 
--#: ../netstat.c:1708
-+#: ../netstat.c:1798
-+#, c-format
- msgid "IPv4 Group Memberships\n"
--msgstr "IPv4 Gruppenmitgliedschaften\n"
-+msgstr "IPv4-Gruppenmitgliedschaften\n"
- 
--#: ../netstat.c:1709
-+#: ../netstat.c:1799
-+#, c-format
- msgid "Interface       RefCnt Group\n"
- msgstr "Schnittstelle   RefZäh Grupp\n"
- 
--#: ../rarp.c:43
-+#: ../rarp.c:44
- msgid "This kernel does not support RARP.\n"
- msgstr "Dieser Kernel unterstützt kein RARP.\n"
- 
--#: ../rarp.c:82
-+#: ../rarp.c:83
- #, c-format
- msgid "no RARP entry for %s.\n"
--msgstr "Kein RARP Eintrag für %s.\n"
-+msgstr "Kein RARP-Eintrag für %s.\n"
- 
--#: ../rarp.c:95
-+#: ../rarp.c:96
- #, c-format
- msgid "%s: bad hardware address\n"
- msgstr "%s: fehlerhafte Hardwareadresse\n"
- 
--#: ../rarp.c:127
-+#: ../rarp.c:128
- #, c-format
- msgid "rarp: cannot open file %s:%s.\n"
- msgstr "rarp: kann Datei %s:%s nicht öffnen.\n"
- 
--#: ../rarp.c:139
-+#: ../rarp.c:140
- #, c-format
- msgid "rarp: format error at %s:%u\n"
- msgstr "rarp: Formatfehler bei %s:%u\n"
- 
--#: ../rarp.c:143 ../rarp.c:287
-+#: ../rarp.c:144 ../rarp.c:289
- #, c-format
- msgid "rarp: %s: unknown host\n"
- msgstr "rarp: %s: Unbekannter Host\n"
- 
--#: ../rarp.c:146
-+#: ../rarp.c:147
- #, c-format
- msgid "rarp: cannot set entry from %s:%u\n"
- msgstr "rarp: Kann Eintrag aus %s:%u nicht setzen.\n"
- 
--#: ../rarp.c:175
-+#: ../rarp.c:176
-+#, c-format
- msgid "Usage: rarp -a                               list entries in cache.\n"
--msgstr ""
--"Benutzung: rarp -a                               Einträge im Cache listen.\n"
-+msgstr "Benutzung: rarp -a                               Einträge im Cache listen.\n"
- 
--#: ../rarp.c:176
-+#: ../rarp.c:177
-+#, c-format
- msgid "       rarp -d <hostname>                    delete entry from cache.\n"
--msgstr ""
--"       rarp -d <hostname>                    Eintrag aus dem Cache löschen.\n"
-+msgstr "       rarp -d <hostname>                    Eintrag aus dem Cache löschen.\n"
- 
--#: ../rarp.c:177
-+#: ../rarp.c:178
-+#, c-format
- msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
--msgstr ""
--"       rarp [<HW>] -s <hostname> <hwaddr>    Eintrag zum Cache zufügen.\n"
-+msgstr "       rarp [<HW>] -s <hostname> <hwaddr>    Eintrag zum Cache zufügen.\n"
- 
--#: ../rarp.c:178
-+#: ../rarp.c:179
-+#, c-format
- msgid ""
- "       rarp -f                               add entries from /etc/ethers.\n"
--msgstr ""
--"       rarp -f                               Einträge aus /etc/ethers "
--"zufügen.\n"
-+msgstr "       rarp -f                               Einträge aus /etc/ethers zufügen.\n"
- 
--#: ../rarp.c:179
-+#: ../rarp.c:180
-+#, c-format
- msgid ""
- "       rarp -V                               display program version.\n"
- "\n"
-@@ -1262,24 +1228,26 @@
- "       rarp -V                               Programmversion anzeigen.\n"
- "\n"
- 
--#: ../rarp.c:236
-+#: ../rarp.c:238
- #, c-format
- msgid "%s: illegal option mix.\n"
- msgstr "%s: Unerlaubte Mischung von Optionen.\n"
- 
--#: ../rarp.c:267
-+#: ../rarp.c:269
- #, c-format
- msgid "rarp: %s: unknown hardware type.\n"
--msgstr "rarp: %s: unknown hardware type.\n"
-+msgstr "rarp: %s: unbekannter Hardwaretyp.\n"
- 
--#: ../route.c:79
-+#: ../route.c:80
-+#, c-format
- msgid ""
- "Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
- msgstr ""
- "Benutzung: route [-nNvee] [-FC] [<AF>]           Kernelroutentabelle "
- "anzeigen\n"
- 
--#: ../route.c:80
-+#: ../route.c:81
-+#, c-format
- msgid ""
- "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
- "\n"
-@@ -1287,14 +1255,15 @@
- "       route [-v] [-FC] {add|del|flush} ...  Routentabelle für AF ändern.\n"
- "\n"
- 
--#: ../route.c:82
-+#: ../route.c:83
-+#, c-format
- msgid ""
- "       route {-h|--help} [<AF>]              Detailed usage syntax for "
- "specified AF.\n"
--msgstr ""
--"       route {-h|--help} [<AF>]              Genaue Syntax für AF anzeigen.\n"
-+msgstr "       route {-h|--help} [<AF>]              Genaue Syntax für AF anzeigen.\n"
- 
--#: ../route.c:83
-+#: ../route.c:84
-+#, c-format
- msgid ""
- "       route {-V|--version}                  Display version/author and "
- "exit.\n"
-@@ -1304,590 +1273,891 @@
- "Ende.\n"
- "\n"
- 
-+#: ../route.c:92
-+#, fuzzy, c-format
-+msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
-+msgstr "  <AF>=,,-A <af>'' or ,,--<af>'' benutzen. Standard: %s\n"
-+
- #: ../plipconfig.c:66
-+#, c-format
- msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
- msgstr "Benutzung: plipconfig [-a] [-i] [-v] Interface\n"
- 
- #: ../plipconfig.c:67
-+#, c-format
- msgid "                  [nibble NN] [trigger NN]\n"
- msgstr "                  [nibble NN] [trigger NN]\n"
- 
- #: ../plipconfig.c:68
--#, fuzzy
-+#, c-format
- msgid "       plipconfig -V | --version\n"
--msgstr "       plipconfig -V\n"
-+msgstr "       plipconfig -V | --version\n"
- 
- #: ../plipconfig.c:74
- #, c-format
- msgid "%s\tnibble %lu  trigger %lu\n"
- msgstr "%s\tnibble %lu  trigger %lu\n"
- 
--#: ../iptunnel.c:79
-+#: ../iptunnel.c:85
-+#, c-format
- msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
- msgstr "Benutzung: iptunnel { add | change | del | show } [ NAME ]\n"
- 
--#: ../iptunnel.c:80
-+#: ../iptunnel.c:86
-+#, c-format
- msgid ""
- "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
- msgstr "          [ mode { ipip | gre | sit } ] [ remote ADR ] [ local ADR ]\n"
- 
--#: ../iptunnel.c:81
-+#: ../iptunnel.c:87
-+#, c-format
- msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
- msgstr "          [ [i|o]seq ] [ [i|o]key SCHLÜSSEL ] [ [i|o]csum ]\n"
- 
--#: ../iptunnel.c:82
--#, fuzzy
-+#: ../iptunnel.c:88
-+#, c-format
- msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
--msgstr ""
--"          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_GERÄt ]\n"
--"\n"
-+msgstr "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_GERÄt ]\n"
- 
--#: ../iptunnel.c:83
-+#: ../iptunnel.c:89
-+#, c-format
- msgid ""
- "       iptunnel -V | --version\n"
- "\n"
- msgstr ""
-+"       iptunnel -V | --version\n"
-+"\n"
- 
--#: ../iptunnel.c:84
-+#: ../iptunnel.c:90
-+#, c-format
- msgid "Where: NAME := STRING\n"
- msgstr "Wobei: NAME := ZEICHENKETTE\n"
- 
--#: ../iptunnel.c:85
-+#: ../iptunnel.c:91
-+#, c-format
- msgid "       ADDR := { IP_ADDRESS | any }\n"
- msgstr "       ADR := { IP_ADRESSE | any }\n"
- 
--#: ../iptunnel.c:86
-+#: ../iptunnel.c:92
-+#, c-format
- msgid "       TOS  := { NUMBER | inherit }\n"
- msgstr "       TOS  := { NUMBER | inherit }\n"
- 
--#: ../iptunnel.c:87
-+#: ../iptunnel.c:93
-+#, c-format
- msgid "       TTL  := { 1..255 | inherit }\n"
- msgstr "       TTL  := { 1..255 | inherit }\n"
- 
--#: ../iptunnel.c:88
-+#: ../iptunnel.c:94
-+#, c-format
- msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
- msgstr "       KEY  := { DOTTED_QUAD | ZAHL }\n"
- 
--#: ../iptunnel.c:326
-+#: ../iptunnel.c:332
-+#, c-format
- msgid "Keys are not allowed with ipip and sit.\n"
- msgstr "Schlüssel sind mit ipip und sit nicht erlaubt.\n"
- 
--#: ../iptunnel.c:346
-+#: ../iptunnel.c:352
-+#, c-format
- msgid "Broadcast tunnel requires a source address.\n"
- msgstr "Ein Broadcasttunnel ist nur mit einer Quelladresse möglich\n"
- 
--#: ../iptunnel.c:361
-+#: ../iptunnel.c:367
-+#, c-format
- msgid "ttl != 0 and noptmudisc are incompatible\n"
- msgstr "ttl != 0 und noptmudisc sind inkompatibel\n"
- 
--#: ../iptunnel.c:373
-+#: ../iptunnel.c:379
-+#, c-format
- msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
- msgstr ""
- "Die Tunnelbetriebsart (ipip, fre oder sit) kann nicht festgestellt werden\n"
- 
--#: ../iptunnel.c:411
-+#: ../iptunnel.c:417
- #, c-format
- msgid "%s: %s/ip  remote %s  local %s "
- msgstr "%s: %s/ip  Gegenseite %s  lokal %s "
- 
--#: ../iptunnel.c:415
-+#: ../iptunnel.c:421
- msgid "unknown"
- msgstr "Unbekannt"
- 
--#: ../iptunnel.c:447
-+#: ../iptunnel.c:453
-+#, c-format
- msgid "  Drop packets out of sequence.\n"
- msgstr "  Pakete außer der Reihenfolge fallenlassen.\n"
- 
--#: ../iptunnel.c:449
-+#: ../iptunnel.c:455
-+#, c-format
- msgid "  Checksum in received packet is required.\n"
- msgstr "  Prüfsumme im empfangenen Paket wird benötigt.\n"
- 
--#: ../iptunnel.c:451
-+#: ../iptunnel.c:457
-+#, c-format
- msgid "  Sequence packets on output.\n"
- msgstr "  Pakete in Reihenfolge ausgeben.\n"
- 
--#: ../iptunnel.c:453
-+#: ../iptunnel.c:459
-+#, c-format
- msgid "  Checksum output packets.\n"
- msgstr "  Prüfsumme für ausgegebene Pakete berechnen.\n"
- 
--#: ../iptunnel.c:481
-+#: ../iptunnel.c:487
-+#, c-format
- msgid "Wrong format of /proc/net/dev. Sorry.\n"
--msgstr "Falsches Format von /proc/net/dev. Tut mir leid\n"
-+msgstr "Falsches Format von /proc/net/dev. Tut mir leid.\n"
- 
--#: ../iptunnel.c:494
-+#: ../iptunnel.c:500
- #, c-format
- msgid "Failed to get type of [%s]\n"
- msgstr "Kann den Typ von [%s] nicht holen\n"
- 
--#: ../iptunnel.c:510
-+#: ../iptunnel.c:516
-+#, c-format
- msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
- msgstr "RX: Pakete     Bytes        Fehler CsumErrs OutOfSeq Mcasts\n"
- 
--#: ../iptunnel.c:513
-+#: ../iptunnel.c:519
-+#, c-format
- msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
- msgstr "TX: Pakete     Bytes        Fehler DeadLoop NoRoute  NoBufs\n"
- 
--#: ../statistics.c:45
-+#: ../statistics.c:47
- msgid "ICMP input histogram:"
--msgstr "ICMP Eingabehistogramm:"
-+msgstr "ICMP-Eingabehistogramm:"
- 
--#: ../statistics.c:46
-+#: ../statistics.c:48
- msgid "ICMP output histogram:"
--msgstr "ICMP Ausgabehistogramm:"
-+msgstr "ICMP-Ausgabehistogramm:"
- 
--#: ../statistics.c:63
-+#: ../statistics.c:65
- #, c-format
- msgid "Forwarding is %s"
- msgstr "Weiterleitung ist %s"
- 
--#: ../statistics.c:64
--#, c-format
--msgid "Default TTL is %d"
-+#: ../statistics.c:66
-+#, fuzzy, c-format
-+msgid "Default TTL is %u"
- msgstr "Standard-TTL ist %d"
- 
--#: ../statistics.c:65
--#, c-format
--msgid "%d total packets received"
--msgstr "%d Pakete insgesamt empfangen"
-+#: ../statistics.c:67
-+#, fuzzy, c-format
-+msgid "%u total packets received"
-+msgstr "%d Pakete insgesamt empfangen"
- 
--#: ../statistics.c:66
--#, c-format
--msgid "%d with invalid headers"
--msgstr "%d with ungültigen Headern"
-+#: ../statistics.c:68
-+#, fuzzy, c-format
-+msgid "%u with invalid headers"
-+msgstr "%d mit ungültigen Headern"
- 
--#: ../statistics.c:67
--#, c-format
--msgid "%d with invalid addresses"
-+#: ../statistics.c:69
-+#, fuzzy, c-format
-+msgid "%u with invalid addresses"
- msgstr "%d mit ungültigen Adressen"
- 
--#: ../statistics.c:68
--#, c-format
--msgid "%d forwarded"
-+#: ../statistics.c:70
-+#, fuzzy, c-format
-+msgid "%u forwarded"
- msgstr "%d weitergeleitet"
- 
--#: ../statistics.c:69
--#, c-format
--msgid "%d with unknown protocol"
-+#: ../statistics.c:71
-+#, fuzzy, c-format
-+msgid "%u with unknown protocol"
- msgstr "%d mit unbekanntem Protokoll"
- 
--#: ../statistics.c:70
--#, c-format
--msgid "%d incoming packets discarded"
-+#: ../statistics.c:72
-+#, fuzzy, c-format
-+msgid "%u incoming packets discarded"
- msgstr "%d eingehende Pakete weggeworfen"
- 
--#: ../statistics.c:71
--#, c-format
--msgid "%d incoming packets delivered"
-+#: ../statistics.c:73
-+#, fuzzy, c-format
-+msgid "%u incoming packets delivered"
- msgstr "%d eingehende Pakete zugestellt"
- 
--#: ../statistics.c:72
--#, c-format
--msgid "%d requests sent out"
-+#: ../statistics.c:74
-+#, fuzzy, c-format
-+msgid "%u requests sent out"
- msgstr "%d Anfragen ausgesandt"
- 
- #. ?
--#: ../statistics.c:73
--#, c-format
--msgid "%d outgoing packets dropped"
-+#: ../statistics.c:75
-+#, fuzzy, c-format
-+msgid "%u outgoing packets dropped"
- msgstr "%d ausgehende Pakete weggeworfen"
- 
--#: ../statistics.c:74
--#, c-format
--msgid "%d dropped because of missing route"
-+#: ../statistics.c:76
-+#, fuzzy, c-format
-+msgid "%u dropped because of missing route"
- msgstr "%d weggeworfen wegen fehlender Route"
- 
--#: ../statistics.c:75
--#, c-format
--msgid "%d fragments dropped after timeout"
-+#: ../statistics.c:77
-+#, fuzzy, c-format
-+msgid "%u fragments dropped after timeout"
- msgstr "%d Fragmente nach Timeout weggeworfen"
- 
--#: ../statistics.c:76
--#, c-format
--msgid "%d reassemblies required"
-+#: ../statistics.c:78
-+#, fuzzy, c-format
-+msgid "%u reassemblies required"
- msgstr "%d Wiederzusammenstellungen nötig"
- 
- #. ?
--#: ../statistics.c:77
--#, c-format
--msgid "%d packets reassembled ok"
-+#: ../statistics.c:79
-+#, fuzzy, c-format
-+msgid "%u packets reassembled ok"
- msgstr "%d Fragmente korrekt empfangen"
- 
--#: ../statistics.c:78
--#, c-format
--msgid "%d packet reassembles failed"
-+#: ../statistics.c:80
-+#, fuzzy, c-format
-+msgid "%u packet reassembles failed"
- msgstr "%d fehlgeschlagene Paketdefragmentierungen"
- 
--#: ../statistics.c:79
--#, c-format
--msgid "%d fragments received ok"
-+#: ../statistics.c:81
-+#, fuzzy, c-format
-+msgid "%u fragments received ok"
- msgstr "%d Fragmente korrekt empfangen"
- 
--#: ../statistics.c:80
--#, c-format
--msgid "%d fragments failed"
--msgstr "%d Fragmente Fehlgeschlagen"
-+#: ../statistics.c:82
-+#, fuzzy, c-format
-+msgid "%u fragments failed"
-+msgstr "%d Fragmente fehlgeschlagen"
- 
--#: ../statistics.c:81
--#, c-format
--msgid "%d fragments created"
-+#: ../statistics.c:83
-+#, fuzzy, c-format
-+msgid "%u fragments created"
- msgstr "%d Fragmente erzeugt"
- 
--#: ../statistics.c:86
--#, c-format
--msgid "%d ICMP messages received"
--msgstr "%d ICMP Nachrichten empfangen"
-+#: ../statistics.c:88
-+#, fuzzy, c-format
-+msgid "%u ICMP messages received"
-+msgstr "%d ICMP-Nachrichten empfangen"
- 
--#: ../statistics.c:87
--#, c-format
--msgid "%d input ICMP message failed."
--msgstr "%d eingegangene ICMP Nachrichten fehlgeschlagen"
-+#: ../statistics.c:89
-+#, fuzzy, c-format
-+msgid "%u input ICMP message failed."
-+msgstr "%d eingegangene ICMP-Nachrichten fehlgeschlagen"
- 
--#: ../statistics.c:88 ../statistics.c:101
--#, c-format
--msgid "destination unreachable: %d"
-+#: ../statistics.c:90 ../statistics.c:103
-+#, fuzzy, c-format
-+msgid "destination unreachable: %u"
- msgstr "Ziel unerreichbar: %d"
- 
--#: ../statistics.c:89
--#, c-format
--msgid "timeout in transit: %d"
-+#: ../statistics.c:91
-+#, fuzzy, c-format
-+msgid "timeout in transit: %u"
- msgstr "Timeout beim Transit: %d"
- 
--#: ../statistics.c:90 ../statistics.c:103
--#, c-format
--msgid "wrong parameters: %d"
-+#: ../statistics.c:92 ../statistics.c:105
-+#, fuzzy, c-format
-+msgid "wrong parameters: %u"
- msgstr "Fehlerhafte Parameter: %d"
- 
- #. ?
--#: ../statistics.c:91
--#, c-format
--msgid "source quenchs: %d"
-+#: ../statistics.c:93
-+#, fuzzy, c-format
-+msgid "source quenches: %u"
- msgstr "Source Quenchs: %d"
- 
--#: ../statistics.c:92
--#, c-format
--msgid "redirects: %d"
-+#: ../statistics.c:94
-+#, fuzzy, c-format
-+msgid "redirects: %u"
- msgstr "Umleitungen: %d"
- 
--#: ../statistics.c:93
--#, c-format
--msgid "echo requests: %d"
--msgstr "Echo Requests: %d"
-+#: ../statistics.c:95
-+#, fuzzy, c-format
-+msgid "echo requests: %u"
-+msgstr "Echo Anfragen: %d"
- 
--#: ../statistics.c:94 ../statistics.c:107
--#, c-format
--msgid "echo replies: %d"
-+#: ../statistics.c:96 ../statistics.c:109
-+#, fuzzy, c-format
-+msgid "echo replies: %u"
- msgstr "Echo Antworten: %d"
- 
--#: ../statistics.c:95
--#, c-format
--msgid "timestamp request: %d"
-+#: ../statistics.c:97
-+#, fuzzy, c-format
-+msgid "timestamp request: %u"
- msgstr "Zeitstempelanfragen: %d"
- 
--#: ../statistics.c:96
--#, c-format
--msgid "timestamp reply: %d"
-+#: ../statistics.c:98
-+#, fuzzy, c-format
-+msgid "timestamp reply: %u"
- msgstr "Zeitstempelantworten: %d"
- 
--#: ../statistics.c:97
--#, c-format
--msgid "address mask request: %d"
-+#: ../statistics.c:99
-+#, fuzzy, c-format
-+msgid "address mask request: %u"
- msgstr "Adressmaskenanfragen: %d"
- 
- #. ?
--#: ../statistics.c:98
--msgid "address mask replies"
--msgstr "Adressmaskenantworten"
-+#: ../statistics.c:100 ../statistics.c:113
-+#, fuzzy, c-format
-+msgid "address mask replies: %u"
-+msgstr "Adressmaskenantworten: %d"
- 
- #. ?
--#: ../statistics.c:99
--#, c-format
--msgid "%d ICMP messages sent"
-+#: ../statistics.c:101
-+#, fuzzy, c-format
-+msgid "%u ICMP messages sent"
- msgstr "%d ICMP-Nachrichten geschickt"
- 
--#: ../statistics.c:100
--#, c-format
--msgid "%d ICMP messages failed"
--msgstr "%d ICMP Nachrichten fehlgeschlagen"
--
- #: ../statistics.c:102
--#, c-format
--msgid "time exceeded: %d"
-+#, fuzzy, c-format
-+msgid "%u ICMP messages failed"
-+msgstr "%d ICMP-Nachrichten fehlgeschlagen"
-+
-+#: ../statistics.c:104
-+#, fuzzy, c-format
-+msgid "time exceeded: %u"
- msgstr "Zeitüberschreitung: %d"
- 
- #. ?
--#: ../statistics.c:104
--#, c-format
--msgid "source quench: %d"
-+#: ../statistics.c:106
-+#, fuzzy, c-format
-+msgid "source quench: %u"
- msgstr "Source Quench: %d"
- 
--#: ../statistics.c:105
--#, c-format
--msgid "redirect: %d"
-+#: ../statistics.c:107
-+#, fuzzy, c-format
-+msgid "redirect: %u"
- msgstr "Umleitungen: %d"
- 
--#: ../statistics.c:106
--#, c-format
--msgid "echo request: %d"
-+#: ../statistics.c:108
-+#, fuzzy, c-format
-+msgid "echo request: %u"
- msgstr "Echo Anfragen: %d"
- 
--#: ../statistics.c:108
--#, c-format
--msgid "timestamp requests: %d"
-+#: ../statistics.c:110
-+#, fuzzy, c-format
-+msgid "timestamp requests: %u"
- msgstr "Zeitstempel Anfragen: %d"
- 
--#: ../statistics.c:109
--#, c-format
--msgid "timestamp replies: %d"
-+#: ../statistics.c:111
-+#, fuzzy, c-format
-+msgid "timestamp replies: %u"
- msgstr "Zeitstempel Antworten: %d"
- 
--#: ../statistics.c:110
--#, c-format
--msgid "address mask requests: %d"
-+#: ../statistics.c:112
-+#, fuzzy, c-format
-+msgid "address mask requests: %u"
- msgstr "Adressmaskenanfragen: %d"
- 
--#: ../statistics.c:111
-+#: ../statistics.c:118
- #, c-format
--msgid "address mask replies: %d"
--msgstr "Adressmaskenantworten: %d"
-+msgid "RTO algorithm is %s"
-+msgstr "RTO-Algorithmus ist %s"
-+
-+#: ../statistics.c:122
-+#, fuzzy, c-format
-+msgid "%u active connections openings"
-+msgstr "%d Verbindungen aktiv geöffnet"
-+
-+#: ../statistics.c:123
-+#, fuzzy, c-format
-+msgid "%u passive connection openings"
-+msgstr "%d Verbindungen passiv geöffnet"
-+
-+#: ../statistics.c:124
-+#, fuzzy, c-format
-+msgid "%u failed connection attempts"
-+msgstr "%d fehlerhafte Verbindungsversuche"
-+
-+#: ../statistics.c:125
-+#, fuzzy, c-format
-+msgid "%u connection resets received"
-+msgstr "%d Verbindungsrücksetzungen empfangen"
-+
-+#: ../statistics.c:126
-+#, fuzzy, c-format
-+msgid "%u connections established"
-+msgstr "%d Verbindungen aufgebaut"
-+
-+#: ../statistics.c:127
-+#, fuzzy, c-format
-+msgid "%u segments received"
-+msgstr "%d Segmente empfangen"
-+
-+#: ../statistics.c:128
-+#, fuzzy, c-format
-+msgid "%u segments send out"
-+msgstr "%d Segmente abgeschickt"
-+
-+#: ../statistics.c:129
-+#, fuzzy, c-format
-+msgid "%u segments retransmited"
-+msgstr "%d Segmente erneut geschickt"
-+
-+#: ../statistics.c:130
-+#, fuzzy, c-format
-+msgid "%u bad segments received."
-+msgstr "%d fehlerhafte Segmente empfangen."
-+
-+#: ../statistics.c:131
-+#, fuzzy, c-format
-+msgid "%u resets sent"
-+msgstr "%d Rücksetzungen geschickt"
-+
-+#: ../statistics.c:136
-+#, fuzzy, c-format
-+msgid "%u packets received"
-+msgstr "%d Pakete empfangen"
-+
-+#: ../statistics.c:137
-+#, fuzzy, c-format
-+msgid "%u packets to unknown port received."
-+msgstr "%d Pakete für unbekannte Ports empfangen."
-+
-+#: ../statistics.c:138
-+#, fuzzy, c-format
-+msgid "%u packet receive errors"
-+msgstr "%d Paketempfangsfehler"
-+
-+#: ../statistics.c:139
-+#, fuzzy, c-format
-+msgid "%u packets sent"
-+msgstr "%d Pakete geschickt"
-+
-+#: ../statistics.c:144
-+#, fuzzy, c-format
-+msgid "%u SYN cookies sent"
-+msgstr "%d SYN-Cookies verschickt"
-+
-+#: ../statistics.c:145
-+#, fuzzy, c-format
-+msgid "%u SYN cookies received"
-+msgstr "%d SYN-Cookies empfangen"
- 
--#: ../statistics.c:116
-+#: ../statistics.c:146
-+#, fuzzy, c-format
-+msgid "%u invalid SYN cookies received"
-+msgstr "%d ungültige SYN-Cookies empfangen"
-+
-+#: ../statistics.c:148
-+#, fuzzy, c-format
-+msgid "%u resets received for embryonic SYN_RECV sockets"
-+msgstr "%d Rücksetzungen für embrionische SYN_RECV-Sockets"
-+
-+#: ../statistics.c:150
-+#, fuzzy, c-format
-+msgid "%u packets pruned from receive queue because of socket buffer overrun"
-+msgstr "%d Pakete wegen Socketpufferüberlauf aus der Empfangswarteschlange weggeworfen"
-+
-+#. obsolete: 2.2.0 doesn't do that anymore
-+#: ../statistics.c:153
-+#, fuzzy, c-format
-+msgid "%u packets pruned from receive queue"
-+msgstr "%d Pakete aus der ungeordneten Warteschlange weggeworfen"
-+
-+#: ../statistics.c:154
-+#, fuzzy, c-format
-+msgid ""
-+"%u packets dropped from out-of-order queue because of socket buffer overrun"
-+msgstr "%d Pakete aus der ungeordneten Warteschlange wegen Pufferüberlauf weggeworfen"
-+
-+#: ../statistics.c:156
-+#, fuzzy, c-format
-+msgid "%u ICMP packets dropped because they were out-of-window"
-+msgstr "%d ICMP-Pakete weggeworfen die außerhalb des Fensters waren"
-+
-+#: ../statistics.c:158
-+#, fuzzy, c-format
-+msgid "%u ICMP packets dropped because socket was locked"
-+msgstr "%d ICMP-Pakete verworfen weil Socket gesperrt war"
-+
-+#: ../statistics.c:160
- #, c-format
--msgid "RTO algorithm is %s"
--msgstr "RTO Algorithmus is %s"
-+msgid "%u TCP sockets finished time wait in fast timer"
-+msgstr ""
- 
--#: ../statistics.c:120
-+#: ../statistics.c:161
- #, c-format
--msgid "%d active connections openings"
--msgstr "%d Verbindungen aktiv geöffnet"
-+msgid "%u time wait sockets recycled by time stamp"
-+msgstr ""
- 
--#: ../statistics.c:121
-+#: ../statistics.c:162
- #, c-format
--msgid "%d passive connection openings"
--msgstr "%d Verbindungen passiv geöffnet"
-+msgid "%u TCP sockets finished time wait in slow timer"
-+msgstr ""
- 
--#: ../statistics.c:122
-+#: ../statistics.c:163
- #, c-format
--msgid "%d failed connection attempts"
--msgstr "%d fehlerhafte Verbindungsversuche"
-+msgid "%u passive connections rejected because of time stamp"
-+msgstr ""
- 
--#: ../statistics.c:123
-+#: ../statistics.c:165
- #, c-format
--msgid "%d connection resets received"
--msgstr "%d Verbindungsrücksetzungen empfangen"
-+msgid "%u active connections rejected because of time stamp"
-+msgstr ""
- 
--#: ../statistics.c:124
-+#: ../statistics.c:167
- #, c-format
--msgid "%d connections established"
--msgstr "%d Verbindungen aufgebaut"
-+msgid "%u packets rejects in established connections because of timestamp"
-+msgstr ""
- 
--#: ../statistics.c:125
-+#: ../statistics.c:169
-+#, fuzzy, c-format
-+msgid "%u delayed acks sent"
-+msgstr "%d Pakete geschickt"
-+
-+#: ../statistics.c:170
- #, c-format
--msgid "%d segments received"
--msgstr "%d Segmente empfangen"
-+msgid "%u delayed acks further delayed because of locked socket"
-+msgstr ""
- 
--#: ../statistics.c:126
-+#: ../statistics.c:172
- #, c-format
--msgid "%d segments send out"
--msgstr "%d Segmente abgeschickt"
-+msgid "Quick ack mode was activated %u times"
-+msgstr ""
- 
--#: ../statistics.c:127
-+#: ../statistics.c:173
- #, c-format
--msgid "%d segments retransmited"
--msgstr "%d Segmente erneut geschickt"
-+msgid "%u times the listen queue of a socket overflowed"
-+msgstr ""
- 
--#: ../statistics.c:128
-+#: ../statistics.c:175
- #, c-format
--msgid "%d bad segments received."
--msgstr "%d fehlerhafte Segmente empfangen."
-+msgid "%u SYNs to LISTEN sockets ignored"
-+msgstr ""
- 
--#: ../statistics.c:129
-+#: ../statistics.c:176
- #, c-format
--msgid "%d resets sent"
--msgstr "%d Rücksetzungen geschickt"
-+msgid "%u packets directly queued to recvmsg prequeue."
-+msgstr ""
- 
--#: ../statistics.c:134
-+#: ../statistics.c:178
- #, c-format
--msgid "%d packets received"
-+msgid "%u of bytes directly received from backlog"
-+msgstr ""
-+
-+#: ../statistics.c:180
-+#, c-format
-+msgid "%u of bytes directly received from prequeue"
-+msgstr ""
-+
-+#: ../statistics.c:182
-+#, fuzzy, c-format
-+msgid "%u packets dropped from prequeue"
-+msgstr "%d Pakete aus der ungeordneten Warteschlange weggeworfen"
-+
-+#: ../statistics.c:183
-+#, fuzzy, c-format
-+msgid "%u packet headers predicted"
- msgstr "%d Pakete empfangen"
- 
--#: ../statistics.c:135
-+#: ../statistics.c:184
- #, c-format
--msgid "%d packets to unknown port received."
-+msgid "%u packets header predicted and directly queued to user"
-+msgstr ""
-+
-+#: ../statistics.c:186
-+#, c-format
-+msgid "Ran %u times out of system memory during packet sending"
-+msgstr ""
-+
-+#: ../statistics.c:188
-+#, fuzzy, c-format
-+msgid "%u acknowledgments not containing data received"
- msgstr "%d Pakete für unbekannte Ports empfangen."
- 
--#: ../statistics.c:136
-+#: ../statistics.c:189
- #, c-format
--msgid "%d packet receive errors"
--msgstr "%d Paketempfangsfehler"
-+msgid "%u predicted acknowledgments"
-+msgstr ""
- 
--#: ../statistics.c:137
-+#: ../statistics.c:190
- #, c-format
--msgid "%d packets sent"
--msgstr "%d Pakete geschickt"
-+msgid "%u times recovered from packet loss due to fast retransmit"
-+msgstr ""
- 
--#: ../statistics.c:142
-+#: ../statistics.c:191
- #, c-format
--msgid "%d SYN cookies sent"
--msgstr "%d SYN-Cookies verschickt"
-+msgid "%u times recovered from packet loss due to SACK data"
-+msgstr ""
- 
--#: ../statistics.c:143
-+#: ../statistics.c:192
-+#, fuzzy, c-format
-+msgid "%u bad SACKs received"
-+msgstr "%d fehlerhafte Segmente empfangen."
-+
-+#: ../statistics.c:193
- #, c-format
--msgid "%d SYN cookies received"
--msgstr "%d SYN-Cookies empfangen"
-+msgid "Detected reordering %u times using FACK"
-+msgstr ""
- 
--#: ../statistics.c:144
-+#: ../statistics.c:194
- #, c-format
--msgid "%d invalid SYN cookies received"
--msgstr "%d ungültige SYN-Cookies empfangen"
-+msgid "Detected reordering %u times using SACK"
-+msgstr ""
- 
--#: ../statistics.c:146
-+#: ../statistics.c:195
- #, c-format
--msgid "%d resets received for embryonic SYN_RECV sockets"
--msgstr "%d Rücksetzungen fuer embrionische SYN_RECV Sockets"
-+msgid "Detected reordering %u times using time stamp"
-+msgstr ""
- 
--#: ../statistics.c:148
-+#: ../statistics.c:196
- #, c-format
--msgid "%d packets pruned from receive queue because of socket buffer overrun"
-+msgid "Detected reordering %u times using reno fast retransmit"
- msgstr ""
--"%d Pakete wegen Socketpufferüberlauf aus der Empfangswarteschlange "
--"weggeworfen"
- 
--#. obsolete: 2.2.0 doesn't do that anymore
--#: ../statistics.c:151
-+#: ../statistics.c:197
- #, c-format
--msgid "%d packets pruned from out-of-order queue"
--msgstr "%d Pakete aus der ungeordneten Warteschlange weggeworfen"
-+msgid "%u congestion windows fully recovered"
-+msgstr ""
- 
--#: ../statistics.c:152
-+#: ../statistics.c:198
- #, c-format
--msgid ""
--"%d packets dropped from out-of-order queue because of socket buffer overrun"
-+msgid "%u congestion windows partially recovered using Hoe heuristic"
- msgstr ""
--"%d Pakete aus der ungeordneten Warteschlange wegen Pufferüberlauf weggeworfen"
- 
--#: ../statistics.c:154
-+#: ../statistics.c:199
- #, c-format
--msgid "%d ICMP packets dropped because they were out-of-window"
--msgstr "%d ICMP Pakete weggeworfen die auserhalb des Fensters waren"
-+msgid "%u congestion window recovered using DSACK"
-+msgstr ""
- 
--#: ../statistics.c:156
-+#: ../statistics.c:200
-+#, c-format
-+msgid "%u congestion windows recovered after partial ack"
-+msgstr ""
-+
-+#: ../statistics.c:201
-+#, fuzzy, c-format
-+msgid "%u retransmits lost"
-+msgstr "%d Rücksetzungen geschickt"
-+
-+#: ../statistics.c:202
-+#, c-format
-+msgid "%u timeouts after reno fast retransmit"
-+msgstr ""
-+
-+#: ../statistics.c:203
-+#, c-format
-+msgid "%u timeouts after SACK recovery"
-+msgstr ""
-+
-+#: ../statistics.c:204
-+#, c-format
-+msgid "%u timeouts in loss state"
-+msgstr ""
-+
-+#: ../statistics.c:205
-+#, fuzzy, c-format
-+msgid "%u fast retransmits"
-+msgstr "%d Segmente erneut geschickt"
-+
-+#: ../statistics.c:206
-+#, c-format
-+msgid "%u forward retransmits"
-+msgstr ""
-+
-+#: ../statistics.c:207
-+#, c-format
-+msgid "%u retransmits in slow start"
-+msgstr ""
-+
-+#: ../statistics.c:208
-+#, c-format
-+msgid "%u other TCP timeouts"
-+msgstr ""
-+
-+#: ../statistics.c:209
-+#, fuzzy, c-format
-+msgid "%u reno fast retransmits failed"
-+msgstr "%d Segmente erneut geschickt"
-+
-+#: ../statistics.c:210
-+#, fuzzy, c-format
-+msgid "%u sack retransmits failed"
-+msgstr "%d fehlgeschlagene Paketdefragmentierungen"
-+
-+#: ../statistics.c:211
-+#, c-format
-+msgid "%u times receiver scheduled too late for direct processing"
-+msgstr ""
-+
-+#: ../statistics.c:212
-+#, fuzzy, c-format
-+msgid "%u packets collapsed in receive queue due to low socket buffer"
-+msgstr "%d Pakete wegen Socketpufferüberlauf aus der Empfangswarteschlange weggeworfen"
-+
-+#: ../statistics.c:213
-+#, c-format
-+msgid "%u DSACKs sent for old packets"
-+msgstr ""
-+
-+#: ../statistics.c:214
-+#, c-format
-+msgid "%u DSACKs sent for out of order packets"
-+msgstr ""
-+
-+#: ../statistics.c:215
-+#, fuzzy, c-format
-+msgid "%u DSACKs received"
-+msgstr "%d Pakete empfangen"
-+
-+#: ../statistics.c:216
-+#, fuzzy, c-format
-+msgid "%u DSACKs for out of order packets received"
-+msgstr "%d Pakete insgesamt empfangen"
-+
-+#: ../statistics.c:217
-+#, fuzzy, c-format
-+msgid "%u connections reset due to unexpected SYN"
-+msgstr "%d Verbindungsrücksetzungen empfangen"
-+
-+#: ../statistics.c:218
-+#, fuzzy, c-format
-+msgid "%u connections reset due to unexpected data"
-+msgstr "%d Verbindungsrücksetzungen empfangen"
-+
-+#: ../statistics.c:219
-+#, fuzzy, c-format
-+msgid "%u connections reset due to early user close"
-+msgstr "%d Verbindungsrücksetzungen empfangen"
-+
-+#: ../statistics.c:220
- #, c-format
--msgid "%d ICMP packets dropped because socket was locked"
--msgstr "%d ICMP Pakete verworfen weil Socket gesperrt war"
-+msgid "%u connections aborted due to memory pressure"
-+msgstr ""
-+
-+#: ../statistics.c:221
-+#, fuzzy, c-format
-+msgid "%u connections aborted due to timeout"
-+msgstr "%d Verbindungsrücksetzungen empfangen"
- 
- #: ../statistics.c:222
-+#, c-format
-+msgid "%u connections aborted after user close in linger timeout"
-+msgstr ""
-+
-+#: ../statistics.c:223
-+#, c-format
-+msgid "%u times unabled to send RST due to no memory"
-+msgstr ""
-+
-+#: ../statistics.c:224
-+#, c-format
-+msgid "TCP ran low on memory %u times"
-+msgstr ""
-+
-+#: ../statistics.c:225
-+#, c-format
-+msgid "%u TCP data loss events"
-+msgstr ""
-+
-+#: ../statistics.c:292
- msgid "enabled"
- msgstr "aktiviert"
- 
--#: ../statistics.c:222
-+#: ../statistics.c:292
- msgid "disabled"
- msgstr "deaktiviert"
- 
--#: ../statistics.c:272
--#, c-format
--msgid "unknown title %s\n"
--msgstr "Unbekannter Titel %s\n"
--
--#: ../statistics.c:298
-+#: ../statistics.c:375
- msgid "error parsing /proc/net/snmp"
- msgstr "Fehler beim Parsen von /proc/net/snmp"
- 
--#: ../statistics.c:311
-+#: ../statistics.c:388
- msgid "cannot open /proc/net/snmp"
- msgstr "Kann /proc/net/snmp nicht öffnen"
- 
- #: ../lib/activate.c:69
- #, c-format
- msgid "Hardware type `%s' not supported.\n"
--msgstr "Hardwaretyp ,,%s'' nicht unterstützt.\n"
-+msgstr "Hardwaretyp »%s« nicht unterstützt.\n"
- 
- #: ../lib/activate.c:73
- #, c-format
- msgid "Cannot change line discipline to `%s'.\n"
--msgstr "Kann line discipline nicht auf ``%s'' setzen.\n"
-+msgstr "Kann line discipline nicht auf »%s« setzen.\n"
- 
--#: ../lib/af.c:145 ../lib/hw.c:148
-+#: ../lib/af.c:153 ../lib/hw.c:161
- msgid "UNSPEC"
- msgstr "UNSPEC"
- 
--#: ../lib/af.c:147
-+#: ../lib/af.c:155
- msgid "UNIX Domain"
--msgstr "UNIX Domain"
-+msgstr "UNIX-Domain"
- 
--#: ../lib/af.c:150
-+#: ../lib/af.c:158
- msgid "DARPA Internet"
--msgstr "DARPA Internet"
-+msgstr "DARPA-Internet"
- 
--#: ../lib/af.c:153
-+#: ../lib/af.c:161
- msgid "IPv6"
- msgstr "IPv6"
- 
--#: ../lib/af.c:156 ../lib/hw.c:169
-+#: ../lib/af.c:164 ../lib/hw.c:182
- msgid "AMPR AX.25"
- msgstr "AMPR AX.25"
- 
--#: ../lib/af.c:159 ../lib/hw.c:175
-+#: ../lib/af.c:167 ../lib/hw.c:188
- msgid "AMPR NET/ROM"
- msgstr "AMPR NET/ROM"
- 
--#: ../lib/af.c:162
-+#: ../lib/af.c:170
- msgid "Novell IPX"
- msgstr ""
- 
--#: ../lib/af.c:165
-+#: ../lib/af.c:173
- msgid "Appletalk DDP"
- msgstr "Appletalk DDP"
- 
--#: ../lib/af.c:168 ../lib/hw.c:207
-+#: ../lib/af.c:176 ../lib/hw.c:223
- msgid "Econet"
- msgstr "Econet"
- 
--#: ../lib/af.c:171 ../lib/hw.c:172
-+#: ../lib/af.c:179
-+msgid "CCITT X.25"
-+msgstr ""
-+
-+#: ../lib/af.c:182 ../lib/hw.c:185
- msgid "AMPR ROSE"
- msgstr "AMPR ROSE"
- 
--#: ../lib/af.c:174 ../lib/hw.c:160
-+#: ../lib/af.c:185 ../lib/hw.c:173
- msgid "Ash"
- msgstr "Ash"
- 
--#: ../lib/af.c:232
-+#: ../lib/af.c:243
-+#, c-format
- msgid "Please don't supply more than one address family.\n"
- msgstr "Bitte nur eine Adressfamilie angeben.\n"
- 
--#: ../lib/af.c:293
-+#: ../lib/af.c:304
-+#, c-format
- msgid "Too much address family arguments.\n"
- msgstr "Zu viele Adressfamilien angegeben.\n"
- 
--#: ../lib/af.c:304
-+#: ../lib/af.c:315
- #, c-format
- msgid "Unknown address family `%s'.\n"
--msgstr "Unbekannte Adressfamilie `%s'.\n"
--
--#: ../lib/arcnet.c:53 ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52
--#: ../lib/fddi.c:67 ../lib/hippi.c:68 ../lib/inet.c:244 ../lib/inet.c:259
--#: ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ../lib/rose.c:71
--#: ../lib/rose.c:126 ../lib/unix.c:56 ../lib/unix.c:76
--msgid "[NONE SET]"
--msgstr "[NICHT GESETZT]"
-+msgstr "Unbekannte Adressfamilie »%s«.\n"
- 
--#: ../lib/arcnet.c:81 ../lib/arcnet.c:96
-+#: ../lib/arcnet.c:70 ../lib/arcnet.c:85
- #, c-format
- msgid "in_arcnet(%s): invalid arcnet address!\n"
- msgstr "in_arcnet(%s): Ungültige ARCnet-Adresse!\n"
- 
--#: ../lib/arcnet.c:108
-+#: ../lib/arcnet.c:97
- #, c-format
- msgid "in_arcnet(%s): trailing : ignored!\n"
- msgstr "in_arcnet(%s): angehängt : ignoriert!\n"
- 
--#: ../lib/arcnet.c:120
-+#: ../lib/arcnet.c:109
- #, c-format
- msgid "in_arcnet(%s): trailing junk!\n"
- msgstr "in_arcnet(%s): Nachfolgender Müll!\n"
- 
- #: ../lib/ash.c:81
-+#, c-format
- msgid "Malformed Ash address"
--msgstr "Fehlerhafte Ash Adresse"
-+msgstr "Fehlerhafte Ash-Adresse"
-+
-+#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244
-+#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78
-+#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76
-+msgid "[NONE SET]"
-+msgstr "[NICHT GESETZT]"
- 
- #: ../lib/ax25.c:97 ../lib/netrom.c:100
- msgid "Invalid callsign"
-@@ -1898,22 +2168,21 @@
- msgstr "Rufzeichen zu lang"
- 
- #: ../lib/ax25_gr.c:47
-+#, c-format
- msgid "AX.25 not configured in this system.\n"
- msgstr "AX.25 ist auf diesem System nicht konfiguriert.\n"
- 
- #: ../lib/ax25_gr.c:50
-+#, c-format
- msgid "Kernel AX.25 routing table\n"
- msgstr "Kernel AX.25 Routentabelle\n"
- 
- #. xxx
- #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
-+#, c-format
- msgid "Destination  Iface    Use\n"
- msgstr "Ziel         SStelle  Benutzer\n"
- 
--#: ../lib/ddp_gr.c:21
--msgid "Routing table for `ddp' not yet supported.\n"
--msgstr "DDP-Routentabelle wird noch nicht unterstützt.\n"
--
- #: ../lib/ether.c:74 ../lib/ether.c:91
- #, c-format
- msgid "in_ether(%s): invalid ether address!\n"
-@@ -1929,153 +2198,168 @@
- msgid "in_ether(%s): trailing junk!\n"
- msgstr "in_ether(%s): Nachfolgender Müll!\n"
- 
--#: ../lib/fddi.c:95 ../lib/fddi.c:110
-+#: ../lib/fddi.c:84 ../lib/fddi.c:99
- #, c-format
- msgid "in_fddi(%s): invalid fddi address!\n"
- msgstr "in_fddi(%s): Ungültige FDDI-Adresse!\n"
- 
--#: ../lib/fddi.c:122
-+#: ../lib/fddi.c:111
- #, c-format
- msgid "in_fddi(%s): trailing : ignored!\n"
- msgstr "in_fddi(%s): nachfolgend : ignoriert!\n"
- 
--#: ../lib/fddi.c:134
-+#: ../lib/fddi.c:123
- #, c-format
- msgid "in_fddi(%s): trailing junk!\n"
- msgstr "in_fddi(%s): Nachfolgender Müll!\n"
- 
--#: ../lib/getroute.c:97 ../lib/setroute.c:76
-+#: ../lib/getroute.c:101 ../lib/setroute.c:80
- #, c-format
- msgid "Address family `%s' not supported.\n"
- msgstr "Adressfamilie `%s' wird nicht unterstützt.\n"
- 
--#: ../lib/getroute.c:103 ../lib/setroute.c:80
-+#: ../lib/getroute.c:107 ../lib/setroute.c:84
- #, c-format
- msgid "No routing for address family `%s'.\n"
- msgstr "Kein Routen für Adressfamilie `%s'.\n"
- 
--#: ../lib/hippi.c:96 ../lib/hippi.c:111
-+#: ../lib/hippi.c:84 ../lib/hippi.c:99
- #, c-format
- msgid "in_hippi(%s): invalid hippi address!\n"
- msgstr "in_hippi(%s): Ungültige HIPPI-Adresse!\n"
- 
--#: ../lib/hippi.c:123
-+#: ../lib/hippi.c:111
- #, c-format
- msgid "in_hippi(%s): trailing : ignored!\n"
- msgstr "in_hippi(%s): nachfolgend : ignoriert!\n"
- 
--#: ../lib/hippi.c:134
-+#: ../lib/hippi.c:122
- #, c-format
- msgid "in_hippi(%s): trailing junk!\n"
- msgstr "in_hippi(%s): Nachfolgender Müll!\n"
- 
--#: ../lib/hw.c:147
-+#: ../lib/hw.c:160
- msgid "Local Loopback"
- msgstr "Lokale Schleife"
- 
--#: ../lib/hw.c:150
-+#: ../lib/hw.c:163
- msgid "Serial Line IP"
- msgstr "Serielle IP"
- 
--#: ../lib/hw.c:151
-+#: ../lib/hw.c:164
- msgid "VJ Serial Line IP"
- msgstr "Serielle VJ-IP"
- 
--#: ../lib/hw.c:152
-+#: ../lib/hw.c:165
- msgid "6-bit Serial Line IP"
- msgstr "6-bit Serielle IP"
- 
--#: ../lib/hw.c:153
-+#: ../lib/hw.c:166
- msgid "VJ 6-bit Serial Line IP"
- msgstr "VJ 6-bit Serielle IP"
- 
--#: ../lib/hw.c:154
-+#: ../lib/hw.c:167
- msgid "Adaptive Serial Line IP"
- msgstr "Adaptive Serielle IP"
- 
--#: ../lib/hw.c:157
-+#: ../lib/hw.c:170
- msgid "Ethernet"
- msgstr "Ethernet"
- 
--#: ../lib/hw.c:163
-+#: ../lib/hw.c:176
- msgid "Fiber Distributed Data Interface"
- msgstr "Fiber Distributed Data Interface"
- 
--#: ../lib/hw.c:166
-+#: ../lib/hw.c:179
- msgid "HIPPI"
- msgstr "HIPPI"
- 
--#: ../lib/hw.c:178
-+#: ../lib/hw.c:191
-+msgid "generic X.25"
-+msgstr ""
-+
-+#: ../lib/hw.c:194
- msgid "IPIP Tunnel"
- msgstr "IPIP Tunnel"
- 
--#: ../lib/hw.c:181
-+#: ../lib/hw.c:197
- msgid "Point-to-Point Protocol"
--msgstr "Punkt-zu-Punkt Verbindung"
-+msgstr "Punkt-zu-Punkt-Verbindung"
- 
--#: ../lib/hw.c:184
-+#: ../lib/hw.c:200
- msgid "(Cisco)-HDLC"
- msgstr "(Cisco)-HDLC"
- 
--#: ../lib/hw.c:185
-+#: ../lib/hw.c:201
- msgid "LAPB"
- msgstr "LAPB"
- 
--#: ../lib/hw.c:188
-+#: ../lib/hw.c:204
- msgid "ARCnet"
- msgstr "ARCnet"
- 
--#: ../lib/hw.c:191
-+#: ../lib/hw.c:207
- msgid "Frame Relay DLCI"
- msgstr "Frame Relay DLCI"
- 
--#: ../lib/hw.c:192
-+#: ../lib/hw.c:208
- msgid "Frame Relay Access Device"
- msgstr "Frame Relay Access Device"
- 
--#: ../lib/hw.c:195
-+#: ../lib/hw.c:211
- msgid "IPv6-in-IPv4"
- msgstr "IPv6-nach-IPv4"
- 
--#: ../lib/hw.c:198
--#, fuzzy
-+#: ../lib/hw.c:214
- msgid "IrLAP"
--msgstr "LAPB"
-+msgstr "IrLAP"
- 
--#: ../lib/hw.c:201
-+#: ../lib/hw.c:217
- msgid "16/4 Mbps Token Ring"
- msgstr ""
- 
--#: ../lib/hw.c:203
-+#: ../lib/hw.c:219
- msgid "16/4 Mbps Token Ring (New)"
- msgstr ""
- 
-+#: ../lib/hw.c:226
-+msgid "Generic EUI-64"
-+msgstr ""
-+
- #: ../lib/inet.c:153 ../lib/inet6.c:79
- #, c-format
- msgid "rresolve: unsupport address family %d !\n"
- msgstr "rresolve: nicht unterstützte Adressfamilie %d !\n"
- 
--#: ../lib/inet6_gr.c:79
-+#: ../lib/inet6.c:131
-+#, fuzzy
-+msgid "[UNKNOWN]"
-+msgstr "UNBEKANNT"
-+
-+#: ../lib/inet6_gr.c:71
-+#, c-format
- msgid "INET6 (IPv6) not configured in this system.\n"
- msgstr "INET6 (IPv6) ist auf diesem System nicht konfiguriert.\n"
- 
--#: ../lib/inet6_gr.c:82
-+#: ../lib/inet6_gr.c:74
-+#, c-format
- msgid "Kernel IPv6 routing table\n"
--msgstr "Kernel IPv6 Routentabelle\n"
-+msgstr "Kernel-IPv6-Routentabelle\n"
- 
--#: ../lib/inet6_gr.c:84
-+#: ../lib/inet6_gr.c:76
-+#, c-format
- msgid ""
--"Destination                                 Next Hop                         "
--"       Flags Metric Ref    Use Iface\n"
--msgstr ""
--"Ziel                                        Nächster Hop                     "
--"            Flags Metric Ref    Benutzer Iface\n"
-+"Destination                                 Next "
-+"Hop                                Flags Metric Ref    Use Iface\n"
-+msgstr "Ziel                                        Nächster Hop                                 Flags Metric Ref    Benutzer Iface\n"
- 
--#: ../lib/inet6_gr.c:158
-+#: ../lib/inet6_gr.c:150
-+#, c-format
- msgid "Kernel IPv6 Neighbour Cache\n"
- msgstr "Kernel IPv6 Nachbarcache\n"
- 
--#: ../lib/inet6_gr.c:161
-+#: ../lib/inet6_gr.c:153
-+#, c-format
- msgid ""
- "Neighbour                                   HW Address        Iface    Flags "
- "Ref State\n"
-@@ -2083,39 +2367,45 @@
- "Nachbar                                     HW-Adresse        Iface    Flags "
- "Ref Zustand\n"
- 
--#: ../lib/inet6_gr.c:165
-+#: ../lib/inet6_gr.c:157
-+#, c-format
- msgid ""
- "Neighbour                                   HW Address        Iface    Flags "
- "Ref State            Stale(sec) Delete(sec)\n"
--msgstr ""
--"Nachbar                                     HW-Adresse        Iface    Flags "
--"Ref Zustand          Stale(sec) Löschen(sec)\n"
-+msgstr "Nachbar                                     HW-Adresse        Iface    Flags Ref Zustand          Stale(sec) Löschen(sec)\n"
- 
- #: ../lib/inet6_sr.c:46
-+#, c-format
- msgid "Usage: inet6_route [-vF] del Target\n"
- msgstr "Benutzung: inet6_route [-vF] del Ziel\n"
- 
- #: ../lib/inet6_sr.c:47
-+#, c-format
- msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
- msgstr "       inet6_route [-vF] add Ziel [gw Gateway] [metric M] [[dev] If]\n"
- 
- #: ../lib/inet6_sr.c:48
-+#, c-format
- msgid "       inet6_route [-FC] flush      NOT supported\n"
- msgstr "       inet6_route [-FC] flush      NICHT unterstützt\n"
- 
--#: ../lib/inet6_sr.c:182
-+#: ../lib/inet6_sr.c:188
-+#, c-format
- msgid "Flushing `inet6' routing table not supported\n"
--msgstr ",,Flush'' für IPv6 Routentabelle nicht unterstützt\n"
-+msgstr "»Flush« für IPv6-Routentabelle nicht unterstützt\n"
- 
- #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
-+#, c-format
- msgid "INET (IPv4) not configured in this system.\n"
- msgstr "INET (IPv4) ist auf diesem System nicht konfiguriert.\n"
- 
- #: ../lib/inet_gr.c:53
-+#, c-format
- msgid "Kernel IP routing table\n"
--msgstr "Kernel IP Routentabelle\n"
-+msgstr "Kernel-IP-Routentabelle\n"
- 
- #: ../lib/inet_gr.c:56
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags Metric Ref    Use "
- "Iface\n"
-@@ -2124,6 +2414,7 @@
- "Iface\n"
- 
- #: ../lib/inet_gr.c:59
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags   MSS Window  irtt "
- "Iface\n"
-@@ -2132,6 +2423,7 @@
- "Iface\n"
- 
- #: ../lib/inet_gr.c:62
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt\n"
-@@ -2140,10 +2432,12 @@
- "Iface    MSS   Fenster irtt\n"
- 
- #: ../lib/inet_gr.c:237
-+#, c-format
- msgid "Kernel IP routing cache\n"
--msgstr "Kernel IP Routencache\n"
-+msgstr "Kernel-IP-Routencache\n"
- 
- #: ../lib/inet_gr.c:258
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface\n"
-@@ -2152,6 +2446,7 @@
- "Iface\n"
- 
- #: ../lib/inet_gr.c:261
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags   MSS Window  irtt "
- "Iface\n"
-@@ -2160,6 +2455,7 @@
- "Iface\n"
- 
- #: ../lib/inet_gr.c:266
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt  HH  Arp\n"
-@@ -2168,6 +2464,7 @@
- "Iface    MSS   Fenster irtt   HH  Arp\n"
- 
- #: ../lib/inet_gr.c:290
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
-@@ -2175,37 +2472,39 @@
- "Quelle          Ziel            Gateway         Flags Metrik Ref    Ben "
- "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
- 
--#: ../lib/inet_sr.c:50
-+#: ../lib/inet_sr.c:51
-+#, c-format
- msgid ""
- "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
- "[[dev] If]\n"
--msgstr ""
--"Benutzung: inet_route [-vF] del {-host|-net} Ziel[/prefix] [gw Gw] [metric "
--"M] [[dev] If]\n"
-+msgstr "Benutzung: inet_route [-vF] del {-host|-net} Ziel[/Präfix] [gw Gw] [metric M] [[dev] If]\n"
- 
--#: ../lib/inet_sr.c:51
-+#: ../lib/inet_sr.c:52
-+#, c-format
- msgid ""
- "       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
--msgstr ""
--"       inet_route [-vF] add {-host|-net} Ziel[/Prefix] [gw Gw] [metric M]\n"
-+msgstr "       inet_route [-vF] add {-host|-net} Ziel[/Präfix] [gw Gw] [metric M]\n"
- 
--#: ../lib/inet_sr.c:52
-+#: ../lib/inet_sr.c:53
-+#, c-format
- msgid ""
- "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
- msgstr ""
- "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
- 
--#: ../lib/inet_sr.c:53
-+#: ../lib/inet_sr.c:54
-+#, c-format
- msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
- msgstr "                              [mod] [dyn] [reinstate] [[dev] If]\n"
- 
--#: ../lib/inet_sr.c:54
-+#: ../lib/inet_sr.c:55
-+#, c-format
- msgid ""
- "       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
--msgstr ""
--"       inet_route [-vF] add {-host|-net} Ziel[/Präfix] [metric M] reject\n"
-+msgstr "       inet_route [-vF] add {-host|-net} Ziel[/Präfix] [metric M] reject\n"
- 
--#: ../lib/inet_sr.c:55
-+#: ../lib/inet_sr.c:56
-+#, c-format
- msgid "       inet_route [-FC] flush      NOT supported\n"
- msgstr "       inet_route [-FC] flush      NICHT unterstützt\n"
- 
-@@ -2215,15 +2514,17 @@
- msgstr "route: %s: Netzadresse als Gateway ungültig!\n"
- 
- #: ../lib/inet_sr.c:174
--#, fuzzy
-+#, fuzzy, c-format
- msgid "route: Invalid MSS/MTU.\n"
- msgstr "route: Ungültige MSS.\n"
- 
- #: ../lib/inet_sr.c:187
-+#, c-format
- msgid "route: Invalid window.\n"
- msgstr "route: Ungültige Fenstergröße.\n"
- 
- #: ../lib/inet_sr.c:203
-+#, c-format
- msgid "route: Invalid initial rtt.\n"
- msgstr "route: Ungültige Start-RTT.\n"
- 
-@@ -2238,126 +2539,408 @@
- msgstr "Route: Fehlerhafte Netzmaske %s\n"
- 
- #: ../lib/inet_sr.c:270
-+#, c-format
- msgid "route: netmask doesn't match route address\n"
- msgstr "route: Netzmaske passt nicht zur Routenadresse\n"
- 
- #: ../lib/inet_sr.c:306
-+#, c-format
- msgid "Flushing `inet' routing table not supported\n"
--msgstr ",,Flush'' der Inet-Routentabelle nicht unterstützt\n"
-+msgstr "»Flush« der Inet-Routentabelle nicht unterstützt\n"
- 
- #: ../lib/inet_sr.c:310
-+#, c-format
- msgid "Modifying `inet' routing cache not supported\n"
--msgstr "Änderung des ,,Inet'' Routencaches nicht unterstützt\n"
-+msgstr "Änderung des »Inet« Routencaches nicht unterstützt\n"
- 
- #: ../lib/ipx_gr.c:52
-+#, c-format
- msgid "IPX not configured in this system.\n"
- msgstr "IPX ist auf diesem System nicht konfiguriert.\n"
- 
- #: ../lib/ipx_gr.c:56
-+#, c-format
- msgid "Kernel IPX routing table\n"
--msgstr "Kernel IPX Routentabelle\n"
-+msgstr "Kernel-IPX-Routentabelle\n"
- 
- #. xxx
- #: ../lib/ipx_gr.c:57
-+#, c-format
- msgid "Destination               Router Net                Router Node\n"
--msgstr "Ziel                      Router Netz               Router Knoten\n"
-+msgstr "Ziel                      Router-Netz               Router-Knoten\n"
- 
- #: ../lib/ipx_sr.c:33
-+#, c-format
- msgid "IPX: this needs to be written\n"
--msgstr "IPX: dies muß noch geschrieben werden\n"
-+msgstr "IPX: dies muss noch geschrieben werden\n"
- 
--#: ../lib/masq_info.c:197
-+#: ../lib/masq_info.c:198
-+#, c-format
- msgid "IP masquerading entries\n"
- msgstr "IP-Maskierungseinträge\n"
- 
--#: ../lib/masq_info.c:200
-+#: ../lib/masq_info.c:201
-+#, c-format
- msgid "prot   expire source               destination          ports\n"
- msgstr "Prot   expire Quelle               Ziel                 Ports\n"
- 
--#: ../lib/masq_info.c:203
-+#: ../lib/masq_info.c:204
-+#, c-format
- msgid ""
--"prot   expire    initseq delta prevd source               destination        "
--"  ports\n"
-+"prot   expire    initseq delta prevd source               "
-+"destination          ports\n"
- msgstr ""
--"Prot   Ablauf    Anf-Seq Delta Prevd Quelle               Ziel               "
--"  Ports\n"
-+"Prot   Ablauf    Anf-Seq Delta Prevd Quelle               "
-+"Ziel                 Ports\n"
- 
- #: ../lib/netrom_gr.c:48
-+#, c-format
- msgid "NET/ROM not configured in this system.\n"
- msgstr "NET/ROM ist auf diesem System nicht verfügbar.\n"
- 
- #: ../lib/netrom_gr.c:51
-+#, c-format
- msgid "Kernel NET/ROM routing table\n"
--msgstr "Kernel NET/ROM Routentabelle\n"
-+msgstr "Kernel-NET/ROM-Routentabelle\n"
- 
- #: ../lib/netrom_gr.c:52
-+#, c-format
- msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
- msgstr "Ziel         Mnemonic  Qualität  Nachbar  Iface\n"
- 
- #: ../lib/netrom_sr.c:34
-+#, c-format
- msgid "netrom usage\n"
--msgstr "NET/ROM Benutzung\n"
-+msgstr "NET/ROM-Benutzung\n"
- 
- #: ../lib/netrom_sr.c:44
-+#, c-format
- msgid "NET/ROM: this needs to be written\n"
--msgstr "NET/ROM: Dies muß noch geschrieben werden\n"
-+msgstr "NET/ROM: Dies muss noch geschrieben werden\n"
- 
- #: ../lib/ppp.c:44
-+#, c-format
- msgid "You cannot start PPP with this program.\n"
- msgstr "Mit diesem Programm kann PPP nicht gestartet werden.\n"
- 
- #: ../lib/ppp_ac.c:38
-+#, c-format
- msgid "Sorry, use pppd!\n"
--msgstr "Bitte benutzen sie pppd.\n"
-+msgstr "Bitte benutzen Sie pppd.\n"
- 
- #: ../lib/rose.c:87
- msgid "Node address must be ten digits"
--msgstr "Knotenadresse muß zehn Ziffern haben"
-+msgstr "Knotenadresse muss zehn Ziffern haben"
- 
- #: ../lib/rose_gr.c:51
-+#, c-format
- msgid "ROSE not configured in this system.\n"
- msgstr "ROSE ist auf diesem System nicht verfügbar.\n"
- 
- #: ../lib/rose_gr.c:54
-+#, c-format
- msgid "Kernel ROSE routing table\n"
--msgstr "ROSE Kernel Routentabelle\n"
-+msgstr "ROSE-Kernel-Routentabelle\n"
- 
--#: ../lib/tr.c:70 ../lib/tr.c:85
-+#: ../lib/tr.c:86 ../lib/tr.c:101
- #, c-format
- msgid "in_tr(%s): invalid token ring address!\n"
- msgstr "in_tr(%s): ungültige Tokenringadresse!\n"
- 
--#: ../lib/tr.c:97
-+#: ../lib/tr.c:113
- #, c-format
- msgid "in_tr(%s): trailing : ignored!\n"
- msgstr "in_tr(%s): nachfolgend : ignoriert!\n"
- 
--#: ../lib/tr.c:109
-+#: ../lib/tr.c:125
- #, c-format
- msgid "in_tr(%s): trailing junk!\n"
- msgstr "in_tr(%s): nachfolgender Müll!\n"
- 
--#: ../lib/interface.c:124
-+#: ../lib/interface.c:176
- #, c-format
- msgid "warning: no inet socket available: %s\n"
--msgstr "Warnung: Keine INET Sockets verfügbar: %s\n"
-+msgstr "Warnung: Keine INET-Sockets verfügbar: %s\n"
- 
--#: ../lib/interface.c:270
-+#: ../lib/interface.c:325
- #, c-format
- msgid "Warning: cannot open %s (%s). Limited output.\n"
- msgstr ""
- 
- #. Give better error message for this case.
--#: ../lib/interface.c:504
-+#: ../lib/interface.c:571
- msgid "Device not found"
- msgstr "Gerät nicht gefunden"
- 
--#: ../lib/interface.c:508
-+#: ../lib/interface.c:575
- #, c-format
- msgid "%s: error fetching interface information: %s\n"
- msgstr "%s: Fehler beim Auslesen der Schnittstelleninformation: %s\n"
- 
--#: ../lib/sockets.c:59
-+#: ../lib/interface.c:608
-+msgid "     - no statistics available -"
-+msgstr "     - keine Statistiken verfügbar -"
-+
-+#: ../lib/interface.c:612
-+#, c-format
-+msgid "[NO FLAGS]"
-+msgstr "[KEINE FLAGS]"
-+
-+#: ../lib/interface.c:688
-+#, c-format
-+msgid "%-9.9s Link encap:%s  "
-+msgstr "%-9.9s Protokoll:%s  "
-+
-+#: ../lib/interface.c:693
-+#, c-format
-+msgid "HWaddr %s  "
-+msgstr "Hardware Adresse %s  "
-+
-+#: ../lib/interface.c:696
-+#, c-format
-+msgid "Media:%s"
-+msgstr "Medium:%s"
-+
-+#: ../lib/interface.c:698
-+#, c-format
-+msgid "(auto)"
-+msgstr "(auto)"
-+
-+#: ../lib/interface.c:705
-+#, c-format
-+msgid "          %s addr:%s "
-+msgstr "          %s Adresse:%s "
-+
-+#: ../lib/interface.c:708
-+#, c-format
-+msgid " P-t-P:%s "
-+msgstr " P-z-P:%s "
-+
-+#: ../lib/interface.c:711
-+#, c-format
-+msgid " Bcast:%s "
-+msgstr " Bcast:%s "
-+
-+#: ../lib/interface.c:713
-+#, c-format
-+msgid " Mask:%s\n"
-+msgstr " Maske:%s\n"
-+
-+#: ../lib/interface.c:730
-+#, c-format
-+msgid "          inet6 addr: %s/%d"
-+msgstr "          inet6-Adresse: %s/%d"
-+
-+#: ../lib/interface.c:732
-+#, c-format
-+msgid " Scope:"
-+msgstr " Gültigkeitsbereich:"
-+
-+#: ../lib/interface.c:735
-+#, c-format
-+msgid "Global"
-+msgstr "Global"
-+
-+#: ../lib/interface.c:738
-+#, c-format
-+msgid "Link"
-+msgstr "Verbindung"
-+
-+#: ../lib/interface.c:741
-+#, c-format
-+msgid "Site"
-+msgstr "Standort"
-+
-+#: ../lib/interface.c:744
-+#, c-format
-+msgid "Compat"
-+msgstr "Kompatibilität"
-+
-+#: ../lib/interface.c:747
-+#, c-format
-+msgid "Host"
-+msgstr "Maschine"
-+
-+#: ../lib/interface.c:750
-+#, c-format
-+msgid "Unknown"
-+msgstr "Unbekannt"
-+
-+#: ../lib/interface.c:765
-+#, c-format
-+msgid "          IPX/Ethernet II addr:%s\n"
-+msgstr "          IPX/Ethernet II Adresse:%s\n"
-+
-+#: ../lib/interface.c:768
-+#, c-format
-+msgid "          IPX/Ethernet SNAP addr:%s\n"
-+msgstr "          IPX/Ethernet SNAP Adresse:%s\n"
-+
-+#: ../lib/interface.c:771
-+#, c-format
-+msgid "          IPX/Ethernet 802.2 addr:%s\n"
-+msgstr "          IPX/Ethernet 802.2 Adresse:%s\n"
-+
-+#: ../lib/interface.c:774
-+#, c-format
-+msgid "          IPX/Ethernet 802.3 addr:%s\n"
-+msgstr "          IPX/Ethernet 802.3 Adresse:%s\n"
-+
-+#: ../lib/interface.c:784
-+#, c-format
-+msgid "          EtherTalk Phase 2 addr:%s\n"
-+msgstr "          EtherTalk Phase 2 Adresse:%s\n"
-+
-+#: ../lib/interface.c:793
-+#, c-format
-+msgid "          econet addr:%s\n"
-+msgstr "          econet Adresse:%s\n"
-+
-+#: ../lib/interface.c:800
-+#, c-format
-+msgid "[NO FLAGS] "
-+msgstr "[KEINE FLAGS] "
-+
-+#: ../lib/interface.c:802
-+#, c-format
-+msgid "UP "
-+msgstr "UP "
-+
-+#: ../lib/interface.c:804
-+#, c-format
-+msgid "BROADCAST "
-+msgstr "BROADCAST "
-+
-+#: ../lib/interface.c:806
-+#, c-format
-+msgid "DEBUG "
-+msgstr "DEBUG "
-+
-+#: ../lib/interface.c:808
-+#, c-format
-+msgid "LOOPBACK "
-+msgstr "LOOPBACK "
-+
-+#: ../lib/interface.c:810
-+#, c-format
-+msgid "POINTOPOINT "
-+msgstr "PUNKTZUPUNKT "
-+
-+#: ../lib/interface.c:812
-+#, c-format
-+msgid "NOTRAILERS "
-+msgstr "NOTRAILERS "
-+
-+#: ../lib/interface.c:814
-+#, c-format
-+msgid "RUNNING "
-+msgstr "RUNNING "
-+
-+#: ../lib/interface.c:816
-+#, c-format
-+msgid "NOARP "
-+msgstr "NOARP "
-+
-+#: ../lib/interface.c:818
-+#, c-format
-+msgid "PROMISC "
-+msgstr "PROMISC "
-+
-+#: ../lib/interface.c:820
-+#, c-format
-+msgid "ALLMULTI "
-+msgstr "ALLMULTI "
-+
-+#: ../lib/interface.c:822
-+#, c-format
-+msgid "SLAVE "
-+msgstr "SLAVE "
-+
-+#: ../lib/interface.c:824
-+#, c-format
-+msgid "MASTER "
-+msgstr "MASTER "
-+
-+#: ../lib/interface.c:826
-+#, c-format
-+msgid "MULTICAST "
-+msgstr "MULTICAST "
-+
-+#: ../lib/interface.c:829
-+#, c-format
-+msgid "DYNAMIC "
-+msgstr "DYNAMIC "
-+
-+#. DONT FORGET TO ADD THE FLAGS IN ife_print_short
-+#: ../lib/interface.c:832
-+#, c-format
-+msgid " MTU:%d  Metric:%d"
-+msgstr " MTU:%d  Metrik:%d"
-+
-+#: ../lib/interface.c:836
-+#, c-format
-+msgid "  Outfill:%d  Keepalive:%d"
-+msgstr "  Outfill:%d  Keepalive:%d"
-+
-+#: ../lib/interface.c:850
-+#, fuzzy, c-format
-+msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
-+msgstr "Empfangene Pakete:%lu Fehler:%lu Weggeworfen:%lu Überlauf:%lu Rahmen:%lu\n"
-+
-+#: ../lib/interface.c:855
-+#, c-format
-+msgid "             compressed:%lu\n"
-+msgstr "             komprimiert:%lu\n"
-+
-+#: ../lib/interface.c:895
-+#, fuzzy, c-format
-+msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
-+msgstr "Verschickte Pakete:%lu Fehler:%lu Weggeworfen:%lu Überlauf:%lu Träger:%lu\n"
-+
-+#: ../lib/interface.c:899
-+#, c-format
-+msgid "          collisions:%lu "
-+msgstr "          Kollisionen:%lu "
-+
-+#: ../lib/interface.c:901
-+#, c-format
-+msgid "compressed:%lu "
-+msgstr "Komprimiert:%lu "
-+
-+#: ../lib/interface.c:903
-+#, c-format
-+msgid "txqueuelen:%d "
-+msgstr "Sendewarteschlangenlänge:%d "
-+
-+#: ../lib/interface.c:905
-+#, c-format
-+msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
-+msgstr ""
-+
-+#: ../lib/interface.c:916
-+#, c-format
-+msgid "Interrupt:%d "
-+msgstr "Interrupt:%d "
-+
-+#. Only print devices using it for
-+#. I/O maps
-+#: ../lib/interface.c:919
-+#, c-format
-+msgid "Base address:0x%x "
-+msgstr "Basisadresse:0x%x "
-+
-+#: ../lib/interface.c:921
-+#, c-format
-+msgid "Memory:%lx-%lx "
-+msgstr "Speicher:%lx-%lx "
-+
-+#: ../lib/interface.c:924
-+#, c-format
-+msgid "DMA chan:%x "
-+msgstr "DMA Kanal:%x "
-+
-+#: ../lib/sockets.c:63
-+#, c-format
- msgid "No usable address families found.\n"
- msgstr "Keine benutzbaren Adressfamilien gefunden.\n"
- 
-@@ -2369,41 +2952,44 @@
- #: ../lib/util-ank.c:238
- #, c-format
- msgid "ip: %s is invalid inet prefix\n"
--msgstr "ip: %s ist ein ungültiges INET-Prefix\n"
-+msgstr "ip: %s ist ein ungültiges INET-Präfix\n"
- 
- #: ../lib/util-ank.c:248
- #, c-format
- msgid "ip: %s is invalid IPv4 address\n"
--msgstr "ip: %s ist eine ungültige IPv4 Adresse\n"
-+msgstr "ip: %s ist eine ungültige IPv4-Adresse\n"
- 
- #: ../lib/util-ank.c:256
- #, c-format
- msgid "ip: argument is wrong: %s\n"
- msgstr "ip: Fehlerhaftes Argument: %s\n"
- 
--#: ../ipmaddr.c:56
-+#: ../ipmaddr.c:61
-+#, c-format
- msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
- msgstr "Benutzung: ipmaddr [ add | del ] MULTIADR dev NAME\n"
- 
--#: ../ipmaddr.c:57
-+#: ../ipmaddr.c:62
-+#, c-format
- msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
- msgstr "       ipmaddr show [ dev NAME ] [ ipv4 | ipv6 | link | all ]\n"
- 
--#: ../ipmaddr.c:58
-+#: ../ipmaddr.c:63
-+#, c-format
- msgid "       ipmaddr -V | -version\n"
- msgstr ""
- 
--#: ../ipmaddr.c:258
-+#: ../ipmaddr.c:263
- #, c-format
- msgid "family %d "
- msgstr "familie %d "
- 
--#: ../ipmaddr.c:267
-+#: ../ipmaddr.c:272
- #, c-format
- msgid " users %d"
- msgstr " Benutzer %d"
- 
--#: ../ipmaddr.c:353
-+#: ../ipmaddr.c:358
- msgid "Cannot create socket"
- msgstr "Kann Socket nicht öffnen"
- 
-@@ -2418,13 +3004,14 @@
- msgstr "slattach: tty_lock: (%s): %s\n"
- 
- #: ../slattach.c:192
-+#, c-format
- msgid "slattach: cannot write PID file\n"
- msgstr "slattach: Kann PID-Datei nicht schreiben\n"
- 
- #: ../slattach.c:202
- #, c-format
- msgid "slattach: tty_lock: UUCP user %s unknown!\n"
--msgstr "slattach: tty_lock: UUCP Benutzer %s unbekannt!\n"
-+msgstr "slattach: tty_lock: UUCP-Benutzer %s unbekannt!\n"
- 
- #: ../slattach.c:430
- #, c-format
-@@ -2436,39 +3023,71 @@
- msgid "slattach: tty_hangup(RAISE): %s\n"
- msgstr "slattach: tty_hangup(RAISE): %s\n"
- 
--#: ../slattach.c:486
-+#: ../slattach.c:468
-+#, fuzzy, c-format
-+msgid "slattach: tty name too long\n"
-+msgstr "%s: name zu lang\n"
-+
-+#: ../slattach.c:498
-+#, c-format
- msgid "slattach: tty_open: cannot get current state!\n"
- msgstr "slattach: tty_open: kann aktuellen Zustand nicht auslesen!\n"
- 
--#: ../slattach.c:493
-+#: ../slattach.c:505
-+#, c-format
- msgid "slattach: tty_open: cannot get current line disc!\n"
- msgstr ""
- "slattach: tty_open: Kann augenblicklichen Leitungszustand nicht auslesen!\n"
- 
--#: ../slattach.c:501
-+#: ../slattach.c:513
-+#, c-format
- msgid "slattach: tty_open: cannot set RAW mode!\n"
- msgstr "slattach: tty_open: Kann RAW-Modus nicht setzen!\n"
- 
--#: ../slattach.c:508
-+#: ../slattach.c:520
- #, c-format
- msgid "slattach: tty_open: cannot set %s bps!\n"
- msgstr "slattach: tty_open: Kann %s bps nicht setzen!\n"
- 
--#: ../slattach.c:518
-+#: ../slattach.c:530
-+#, c-format
- msgid "slattach: tty_open: cannot set 8N1 mode!\n"
- msgstr "slattach: tty_open: Kann 8N1-Modus nicht setzen!\n"
- 
--#: ../slattach.c:686
-+#: ../slattach.c:672
-+#, c-format
-+msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n"
-+msgstr ""
-+
-+#: ../slattach.c:704
- #, c-format
- msgid "%s started"
- msgstr "%s gestartet"
- 
--#: ../slattach.c:687
-+#: ../slattach.c:705
- #, c-format
- msgid " on %s"
- msgstr " auf %s"
- 
--#: ../slattach.c:688
-+#: ../slattach.c:706
- #, c-format
- msgid " interface %s\n"
- msgstr " Schnittstelle: %s\n"
-+
-+msgid ""
-+"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
-+"<-''-\n"
-+msgstr ""
-+"  arp [-v]   [<HW>] [-i <if>] -s  <Hostname> <hwaddr> [netmask <nm>] pub\n"
-+
-+msgid "%s: unknown interface: %s\n"
-+msgstr "%s: unbekannte Schnittstelle: %s\n"
-+
-+msgid "address mask replies"
-+msgstr "Adressmaskenantworten"
-+
-+msgid "unknown title %s\n"
-+msgstr "Unbekannter Titel %s\n"
-+
-+msgid "Routing table for `ddp' not yet supported.\n"
-+msgstr "DDP-Routentabelle wird noch nicht unterstützt.\n"
---- net-tools-1.60.orig/po/fr.po
-+++ net-tools-1.60/po/fr.po
-@@ -4,7 +4,8 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: net-tools 1.51\n"
--"POT-Creation-Date: 2000-02-14 02:31+0100\n"
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2007-06-30 12:28+0900\n"
- "PO-Revision-Date: 1998-03-01 00:02+0100\n"
- "Last-Translator: J.M.Vansteene <vanstee@worldnet.fr>\n"
- "Language-Team:\n"
-@@ -12,273 +13,277 @@
- "Content-Type: text/plain; charset=iso8859-1\n"
- "Content-Transfer-Encoding: 8bit\n"
- 
--#: ../arp.c:110 ../arp.c:269
-+#: ../arp.c:112 ../arp.c:279
-+#, c-format
- msgid "arp: need host name\n"
- msgstr "arp: nécessite un nom d'hôte\n"
- 
--#: ../arp.c:207 ../arp.c:221
-+#: ../arp.c:215 ../arp.c:230
- #, c-format
- msgid "No ARP entry for %s\n"
- msgstr "Pas d'entrée ARP pour %s\n"
- 
--#: ../arp.c:239
-+#: ../arp.c:248
- #, fuzzy, c-format
- msgid "arp: cant get HW-Address for `%s': %s.\n"
- msgstr "rarp: ne peut définir l'entrée depuis %s:%u\n"
- 
--#: ../arp.c:243
-+#: ../arp.c:252
-+#, c-format
- msgid "arp: protocol type mismatch.\n"
- msgstr ""
- 
--#: ../arp.c:252
-+#: ../arp.c:261
- #, c-format
- msgid "arp: device `%s' has HW address %s `%s'.\n"
- msgstr ""
- 
--#: ../arp.c:282
-+#: ../arp.c:293
-+#, c-format
- msgid "arp: need hardware address\n"
- msgstr "arp: nécessite une adresse matériel\n"
- 
--#: ../arp.c:290
-+#: ../arp.c:301
-+#, c-format
- msgid "arp: invalid hardware address\n"
- msgstr "arp: adresse matériel invalide\n"
- 
--#: ../arp.c:387
-+#: ../arp.c:398
- #, c-format
- msgid "arp: cannot open etherfile %s !\n"
- msgstr "arp: ne peut ouvrir le fichier ether %s !\n"
- 
--#: ../arp.c:403
-+#: ../arp.c:414
- #, c-format
- msgid "arp: format error on line %u of etherfile %s !\n"
- msgstr "arp: erreur de format ligne %u du fichier ether %s !\n"
- 
--#: ../arp.c:416
-+#: ../arp.c:427
- #, c-format
- msgid "arp: cannot set entry on line %u of etherfile %s !\n"
- msgstr "arp: ne peut définir l'entrée en ligne %u du fichier ether %s !\n"
- 
--#: ../arp.c:437
--msgid "Address\t\t\tHWtype\tHWaddress\t    Flags Mask\t\t  Iface\n"
-+#: ../arp.c:448
-+#, fuzzy, c-format
-+msgid ""
-+"Address                  HWtype  HWaddress           Flags Mask            "
-+"Iface\n"
- msgstr "Adresse\t\t\tTypeMap\tAdresseMat\t   Indicateurs\t\t  Iface\n"
- 
--#: ../arp.c:467
-+#: ../arp.c:476
-+#, fuzzy
-+msgid "<from_interface>"
-+msgstr "%s: interface inconnue: %s\n"
-+
-+#: ../arp.c:478
- msgid "(incomplete)"
- msgstr ""
- 
--#: ../arp.c:484
-+#: ../arp.c:495
- #, c-format
- msgid "%s (%s) at "
- msgstr ""
- 
--#: ../arp.c:490
-+#: ../arp.c:501
-+#, c-format
- msgid "<incomplete> "
- msgstr ""
- 
--#: ../arp.c:496
-+#: ../arp.c:507
- #, c-format
- msgid "netmask %s "
- msgstr ""
- 
--#: ../arp.c:513
-+#: ../arp.c:524
- #, c-format
- msgid "on %s\n"
- msgstr ""
- 
--#: ../arp.c:592
-+#: ../arp.c:605
- #, c-format
- msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
- msgstr "Entrées: %d\tIgnorées: %d\tTrouvées: %d\n"
- 
--#: ../arp.c:596
-+#: ../arp.c:609
- #, c-format
- msgid "%s (%s) -- no entry\n"
- msgstr ""
- 
--#: ../arp.c:598
-+#: ../arp.c:611
- #, c-format
- msgid "arp: in %d entries no match found.\n"
- msgstr "arp: aucune correspondance trouvée dans %d entrées\n"
- 
--#: ../arp.c:613
-+#: ../arp.c:626
-+#, c-format
- msgid ""
- "Usage:\n"
- "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
- "cache\n"
- msgstr ""
- "Syntaxe:\n"
--"  arp [-vn]  [<MAT>] [-i <if>] [-a] [<hôte>]              <-Affiche cache "
--"ARP\n"
-+"  arp [-vn]  [<MAT>] [-i <if>] [-a] [<hôte>]              <-Affiche cache ARP\n"
- 
--#: ../arp.c:614
-+#: ../arp.c:627
-+#, fuzzy, c-format
- msgid ""
--"  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP "
-+"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
- "entry\n"
--msgstr ""
--"  arp [-v]          [-i <if>] -d  <hôte> [pub][nopub]     <-Supprime entrée "
--"ARP\n"
-+msgstr "  arp [-v]          [-i <if>] -d  <hôte> [pub][nopub]     <-Supprime entrée ARP\n"
- 
--#: ../arp.c:615
--#, fuzzy
-+#: ../arp.c:628
-+#, fuzzy, c-format
- msgid ""
--"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from "
-+"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
- "file\n"
--msgstr ""
--"  arp [-vnD] [<MAT>] [-i <if>] -f  <fichier>              <-Ajout entrée "
--"depuis fichier\n"
-+msgstr "  arp [-vnD] [<MAT>] [-i <if>] -f  <fichier>              <-Ajout entrée depuis fichier\n"
- 
--#: ../arp.c:616
-+#: ../arp.c:629
-+#, fuzzy, c-format
- msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add "
-+"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
- "entry\n"
--msgstr ""
--"  arp [-v]   [<MAT>] [-i <if>] -s  <hôte> <adrmat> [temp][nopub] <-Ajout "
--"entrée\n"
-+msgstr "  arp [-v]   [<MAT>] [-i <if>] -s  <hôte> <adrmat> [temp][nopub] <-Ajout entrée\n"
- 
--#: ../arp.c:617
--msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
--"<-''-\n"
--msgstr ""
--"  arp [-v]   [<MAT>] [-i <if>] -s  <hôte> <adrmat> [netmask <nm>] pub  "
--"<-''-\n"
--
--#: ../arp.c:618
-+#: ../arp.c:630
-+#, fuzzy, c-format
- msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      "
-+"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
- "<-''-\n"
- "\n"
- msgstr ""
--"  arp [-v]   [<MAT>] [-i <if>] -Ds <hôte> <if> [netmask <nm>] pub      "
--"<-''-\n"
-+"  arp [-v]   [<MAT>] [-i <if>] -Ds <hôte> <if> [netmask <nm>] pub      <-''-\n"
- "\n"
- 
--#: ../arp.c:620
-+#: ../arp.c:632
-+#, c-format
- msgid ""
- "        -a                       display (all) hosts in alternative (BSD) "
- "style\n"
--msgstr ""
--"        -a                       affiche (tous) les hôtes en style BSD\n"
-+msgstr "        -a                       affiche (tous) les hôtes en style BSD\n"
- 
--#: ../arp.c:621
-+#: ../arp.c:633
-+#, c-format
- msgid "        -s, --set                set a new ARP entry\n"
- msgstr "        -s, --set                définit une nouvelle entrée ARP\n"
- 
--#: ../arp.c:622
-+#: ../arp.c:634
-+#, c-format
- msgid "        -d, --delete             delete a specified entry\n"
- msgstr "        -d, --delete             supprime une entrée\n"
- 
--#: ../arp.c:623 ../netstat.c:1436 ../route.c:85
-+#: ../arp.c:635 ../netstat.c:1503 ../route.c:86
-+#, c-format
- msgid "        -v, --verbose            be verbose\n"
- msgstr "        -v, --verbose            mode verbeux\n"
- 
--#: ../arp.c:624 ../netstat.c:1437 ../route.c:86
--msgid "        -n, --numeric            dont resolve names\n"
-+#: ../arp.c:636 ../netstat.c:1504 ../route.c:87
-+#, fuzzy, c-format
-+msgid "        -n, --numeric            don't resolve names\n"
- msgstr "        -n, --numeric            ne résout pas les noms\n"
- 
--#: ../arp.c:625
-+#: ../arp.c:637
-+#, c-format
- msgid ""
- "        -i, --device             specify network interface (e.g. eth0)\n"
--msgstr ""
--"        -i, --device             spécifie l'interface réseau (p.ex. eth0)\n"
-+msgstr "        -i, --device             spécifie l'interface réseau (p.ex. eth0)\n"
- 
--#: ../arp.c:626
-+#: ../arp.c:638
-+#, c-format
- msgid "        -D, --use-device         read <hwaddr> from given device\n"
--msgstr ""
--"        -D, --use-device         lit l'<adrmat> depuis le périphérique\n"
-+msgstr "        -D, --use-device         lit l'<adrmat> depuis le périphérique\n"
- 
--#: ../arp.c:627
--#, fuzzy
-+#: ../arp.c:639
-+#, fuzzy, c-format
- msgid "        -A, -p, --protocol       specify protocol family\n"
- msgstr "        -r, --route              affiche la table de routage\n"
- 
--#: ../arp.c:628
--#, fuzzy
-+#: ../arp.c:640
-+#, fuzzy, c-format
- msgid ""
--"        -f, --file               read new entries from file or from "
--"/etc/ethers\n"
-+"        -f, --file               read new entries from file or from /etc/"
-+"ethers\n"
- "\n"
- msgstr ""
- "        -f, --file               lit les nouvelles entrées dans le fichier\n"
- "\n"
- 
--#: ../arp.c:630 ../rarp.c:181
-+#: ../arp.c:642 ../rarp.c:182
- #, c-format
- msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
--msgstr ""
--"  <HW>=Utilisez '-H <hw>' pour spécifier le type d'adresse matériel. Défaut: "
--"%s\n"
-+msgstr "  <HW>=Utilisez '-H <hw>' pour spécifier le type d'adresse matériel. Défaut: %s\n"
- 
--#: ../arp.c:631 ../rarp.c:182
-+#: ../arp.c:643 ../rarp.c:183
-+#, c-format
- msgid "  List of possible hardware types (which support ARP):\n"
- msgstr "  Liste les types de matériels supportant ARP:\n"
- 
--#: ../arp.c:664
-+#: ../arp.c:677 ../arp.c:762
- #, c-format
- msgid "%s: hardware type not supported!\n"
- msgstr "%s: type de matétiel non supporté !\n"
- 
--#: ../arp.c:668
-+#: ../arp.c:681
- #, c-format
- msgid "%s: address family not supported!\n"
- msgstr "%s: famille d'adresses non supportée !\n"
- 
--#: ../arp.c:703
--#, fuzzy
-+#: ../arp.c:716
-+#, fuzzy, c-format
- msgid "arp: -N not yet supported.\n"
- msgstr "Table de routage pour `ddp' pas encore supporté.\n"
- 
--#: ../arp.c:713
-+#: ../arp.c:726
- #, c-format
- msgid "arp: %s: unknown address family.\n"
- msgstr "arp: %s: famille d'adresses inconnue.\n"
- 
--#: ../arp.c:722
-+#: ../arp.c:735
- #, c-format
- msgid "arp: %s: unknown hardware type.\n"
- msgstr "arp: %s: type de matériel inconnu.\n"
- 
--#: ../arp.c:741
-+#: ../arp.c:754
- #, c-format
- msgid "arp: %s: kernel only supports 'inet'.\n"
- msgstr "arp: %s: le noyau ne supporte que 'inet'.\n"
- 
--#: ../arp.c:746
-+#: ../arp.c:767
- #, c-format
- msgid "arp: %s: hardware type without ARP support.\n"
- msgstr "arp: %s: type de matériel sans support ARP.\n"
- 
--#: ../hostname.c:69
-+#: ../hostname.c:71
- #, c-format
- msgid "Setting nodename to `%s'\n"
- msgstr "Définit le nom de noeud à `%s'\n"
- 
--#: ../hostname.c:74
-+#: ../hostname.c:76
- #, c-format
- msgid "%s: you must be root to change the node name\n"
- msgstr "%s: vous devez être root pour changer le nom de noeud\n"
- 
--#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116
-+#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117
- #, c-format
- msgid "%s: name too long\n"
- msgstr "%s: nom trop long\n"
- 
--#: ../hostname.c:89
-+#: ../hostname.c:91
- #, c-format
- msgid "Setting hostname to `%s'\n"
- msgstr "Définit le nom d'hôte à `%s'\n"
- 
--#: ../hostname.c:94
-+#: ../hostname.c:96
- #, c-format
- msgid "%s: you must be root to change the host name\n"
- msgstr "%s: vous devez être root pour changer le nom d'hôte\n"
- 
--#: ../hostname.c:108
-+#: ../hostname.c:109
- #, c-format
- msgid "Setting domainname to `%s'\n"
- msgstr "Définit le nom de domaine à `%s'\n"
- 
--#: ../hostname.c:113
-+#: ../hostname.c:114
- #, c-format
- msgid "%s: you must be root to change the domain name\n"
- msgstr "%s: vous devez être root pour changer le nom de domaine\n"
-@@ -303,38 +308,36 @@
- msgid "Result: h_addr_list=`%s'\n"
- msgstr "Résultat : h_addr_list=`%s'\n"
- 
--#: ../hostname.c:209
-+#: ../hostname.c:208
- #, c-format
- msgid "%s: can't open `%s'\n"
- msgstr "%s: ne peut ouvrir `%s'\n"
- 
--#: ../hostname.c:223
-+#: ../hostname.c:222
-+#, c-format
- msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
--msgstr ""
--"Syntaxe : hostname [-v] {hôte|-F fichier}      définit le nom d'hôte (depuis "
--"le fichier)\n"
-+msgstr "Syntaxe : hostname [-v] {hôte|-F fichier}      définit le nom d'hôte (depuis le fichier)\n"
- 
--#: ../hostname.c:224
-+#: ../hostname.c:223
-+#, c-format
- msgid ""
- "       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
--msgstr ""
--"       domainname [-v] {domaine_nis|-F fichier}   définit le domaine NIS "
--"(depuis le fichier)\n"
-+msgstr "       domainname [-v] {domaine_nis|-F fichier}   définit le domaine NIS (depuis le fichier)\n"
- 
--#: ../hostname.c:226
--#, fuzzy
-+#: ../hostname.c:225
-+#, fuzzy, c-format
- msgid ""
- "       nodename [-v] {nodename|-F file}      set DECnet node name (from "
- "file)\n"
--msgstr ""
--"       nodename [-v] {nom_noeud|-F fichier}      Définit le nom de noeud "
--"DECnet (depuis le fichier)\n"
-+msgstr "       nodename [-v] {nom_noeud|-F fichier}      Définit le nom de noeud DECnet (depuis le fichier)\n"
- 
--#: ../hostname.c:228
-+#: ../hostname.c:227
-+#, c-format
- msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
- msgstr "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  affiche le nom formatté\n"
- 
--#: ../hostname.c:229
-+#: ../hostname.c:228
-+#, c-format
- msgid ""
- "       hostname [-v]                         display hostname\n"
- "\n"
-@@ -342,7 +345,8 @@
- "       hostname [-v]                         affiche le nom d'hôte\n"
- "\n"
- 
--#: ../hostname.c:230
-+#: ../hostname.c:229
-+#, c-format
- msgid ""
- "       hostname -V|--version|-h|--help       print info and exit\n"
- "\n"
-@@ -350,7 +354,8 @@
- "       hostname -V|--version|-h|--help       affiche des infos et termine\n"
- "\n"
- 
--#: ../hostname.c:231
-+#: ../hostname.c:230
-+#, c-format
- msgid ""
- "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
- "\n"
-@@ -358,45 +363,52 @@
- "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
- "\n"
- 
--#: ../hostname.c:232
-+#: ../hostname.c:231
-+#, c-format
- msgid "    -s, --short           short host name\n"
- msgstr "    -s, --short           nom d'hôte court\n"
- 
--#: ../hostname.c:233
-+#: ../hostname.c:232
-+#, c-format
- msgid "    -a, --alias           alias names\n"
- msgstr "    -a, --alias           noms d'alias\n"
- 
--#: ../hostname.c:234
-+#: ../hostname.c:233
-+#, c-format
- msgid "    -i, --ip-address      addresses for the hostname\n"
- msgstr "    -i, --ip-address      adresses de l'hôte\n"
- 
--#: ../hostname.c:235
-+#: ../hostname.c:234
-+#, c-format
- msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
- msgstr "    -f, --fqdn, --long    nom d'hôte long (FQDN)\n"
- 
--#: ../hostname.c:236
-+#: ../hostname.c:235
-+#, c-format
- msgid "    -d, --domain          DNS domain name\n"
- msgstr "    -d, --domain          nom de domaine DNS\n"
- 
--#: ../hostname.c:237
-+#: ../hostname.c:236
-+#, c-format
- msgid "    -y, --yp, --nis       NIS/YP domainname\n"
- msgstr "    -y, --yp, --nis       nom de domaine NIS/YP\n"
- 
--#: ../hostname.c:239
-+#: ../hostname.c:238
-+#, c-format
- msgid "    -n, --node            DECnet node name\n"
- msgstr "    -n, --node            nom de noeud DECnet\n"
- 
--#: ../hostname.c:241
--#, fuzzy
-+#: ../hostname.c:240
-+#, fuzzy, c-format
- msgid ""
- "    -F, --file            read hostname or NIS domainname from given file\n"
- "\n"
- msgstr ""
--"    -F, --file            lit le nom d'hôte ou le nom de domaine NIS depuis "
--"le fichier\n"
-+"    -F, --file            lit le nom d'hôte ou le nom de domaine NIS depuis le fichier\n"
- "\n"
- 
--#: ../hostname.c:243
-+#: ../hostname.c:242
-+#, c-format
- msgid ""
- "   This command can read or set the hostname or the NIS domainname. You can\n"
- "   also read the DNS domain or the FQDN (fully qualified domain name).\n"
-@@ -411,15 +423,16 @@
- msgstr "%s: Vous ne pouvez changer le nom de domaine DNS avec cette commande\n"
- 
- #: ../hostname.c:339
-+#, c-format
- msgid ""
- "\n"
- "Unless you are using bind or NIS for host lookups you can change the DNS\n"
- msgstr ""
- "\n"
--"Sauf si vous utilisez bind ou NIS pour les recherches d'hôtes, vous pouvez "
--"changer le\n"
-+"Sauf si vous utilisez bind ou NIS pour les recherches d'hôtes, vous pouvez changer le\n"
- 
- #: ../hostname.c:340
-+#, c-format
- msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
- msgstr ""
- "nom de domaine DNS (qui fait partie du FQDN) dans le fichier /etc/hosts.\n"
-@@ -439,554 +452,453 @@
- msgid "getnodename()=`%s'\n"
- msgstr "getnodename()=`%s'\n"
- 
--#: ../ifconfig.c:159
--#, c-format
--msgid "%-9.9s Link encap:%s  "
--msgstr "%-9.9s Lien encap:%s  "
-+#: ../ifconfig.c:107
-+#, fuzzy, c-format
-+msgid ""
-+"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
-+"Flg\n"
-+msgstr ""
-+"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
-+"Indic\n"
- 
--#: ../ifconfig.c:164
--#, c-format
--msgid "HWaddr %s  "
--msgstr "HWaddr %s  "
-+#: ../ifconfig.c:129 ../ifconfig.c:161
-+#, fuzzy, c-format
-+msgid "%s: ERROR while getting interface flags: %s\n"
-+msgstr "%s: erreur lors de la recherche d'infos sur l'interface: %s\n"
- 
--#: ../ifconfig.c:167
-+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
-+#: ../ifconfig.c:973
- #, c-format
--msgid "Media:%s"
--msgstr "Media:%s"
-+msgid "No support for INET on this system.\n"
-+msgstr "Pas de support de INET sur ce système.\n"
- 
--#: ../ifconfig.c:169
--msgid "(auto)"
--msgstr "(auto)"
-+#: ../ifconfig.c:193
-+#, fuzzy, c-format
-+msgid "%s: ERROR while testing interface flags: %s\n"
-+msgstr "%s: erreur lors de la recherche d'infos sur l'interface: %s\n"
- 
--#: ../ifconfig.c:176
--#, c-format
--msgid "          %s addr:%s "
--msgstr "          %s adr:%s "
-+#: ../ifconfig.c:202
-+#, fuzzy, c-format
-+msgid ""
-+"Usage:\n"
-+"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
-+msgstr ""
-+"Syntaxe:\n"
-+"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <adresse>]\n"
- 
--#: ../ifconfig.c:179
-+#: ../ifconfig.c:204
- #, c-format
--msgid " P-t-P:%s "
--msgstr " P-t-P:%s "
-+msgid "  [add <address>[/<prefixlen>]]\n"
-+msgstr "  [add <adresse>[/<lg_prefixe>]]\n"
- 
--#: ../ifconfig.c:182
-+#: ../ifconfig.c:205
- #, c-format
--msgid " Bcast:%s "
--msgstr " Bcast:%s "
-+msgid "  [del <address>[/<prefixlen>]]\n"
-+msgstr "  [del <adresse>[/<lg_prefixe>]]\n"
- 
--#: ../ifconfig.c:184
-+#: ../ifconfig.c:206
- #, c-format
--msgid " Mask:%s\n"
--msgstr " Masque:%s\n"
-+msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
-+msgstr "  [[-]broadcast [<adresse>]]  [[-]pointopoint [<adresse>]]\n"
- 
--#: ../ifconfig.c:201
--#, c-format
--msgid "          inet6 addr: %s/%d"
--msgstr "          adr inet6: %s/%d"
-+#: ../ifconfig.c:207
-+#, fuzzy, c-format
-+msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
-+msgstr "  [netmask <adresse>]  [dstaddr <adresse>]  [tunnel <adresse>]\n"
- 
--#: ../ifconfig.c:203
--msgid " Scope:"
--msgstr " Scope:"
-+#: ../ifconfig.c:210
-+#, c-format
-+msgid "  [outfill <NN>] [keepalive <NN>]\n"
-+msgstr "  [outfill <NN>] [keepalive <NN>]\n"
- 
--#: ../ifconfig.c:206
--msgid "Global"
--msgstr "Global"
-+#: ../ifconfig.c:212
-+#, c-format
-+msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
-+msgstr "  [hw <HW> <adresse>]  [metric <NN>]  [mtu <NN>]\n"
- 
--#: ../ifconfig.c:209
--msgid "Link"
--msgstr "Lien"
-+#: ../ifconfig.c:213
-+#, c-format
-+msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-+msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
- 
--#: ../ifconfig.c:212
--msgid "Site"
--msgstr "Site"
-+#: ../ifconfig.c:214
-+#, c-format
-+msgid "  [multicast]  [[-]promisc]\n"
-+msgstr "  [multicast]  [[-]promisc]\n"
- 
- #: ../ifconfig.c:215
--msgid "Compat"
--msgstr "Compat"
-+#, c-format
-+msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
-+msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
- 
--#: ../ifconfig.c:218
--msgid "Host"
--msgstr "Hôte"
-+#: ../ifconfig.c:217
-+#, fuzzy, c-format
-+msgid "  [txqueuelen <NN>]\n"
-+msgstr "  [txqueuelen longueur]\n"
- 
--#: ../ifconfig.c:221
--msgid "Unknown"
--msgstr "Inconnu"
-+#: ../ifconfig.c:220
-+#, c-format
-+msgid "  [[-]dynamic]\n"
-+msgstr "  [[-]dynamic]\n"
- 
--#: ../ifconfig.c:236
-+#: ../ifconfig.c:222
- #, c-format
--msgid "          IPX/Ethernet II addr:%s\n"
--msgstr "          adr IPX/Ethernet II:%s\n"
-+msgid ""
-+"  [up|down] ...\n"
-+"\n"
-+msgstr ""
-+"  [up|down] ...\n"
-+"\n"
- 
--#: ../ifconfig.c:239
-+#: ../ifconfig.c:224
- #, c-format
--msgid "          IPX/Ethernet SNAP addr:%s\n"
--msgstr "          adr IPX/Ethernet SNAP:%s\n"
-+msgid "  <HW>=Hardware Type.\n"
-+msgstr "  <HW>=Type de matériel.\n"
- 
--#: ../ifconfig.c:242
-+#: ../ifconfig.c:225
- #, c-format
--msgid "          IPX/Ethernet 802.2 addr:%s\n"
--msgstr "          adr IPX/Ethernet 802.2:%s\n"
-+msgid "  List of possible hardware types:\n"
-+msgstr "  Liste des types de matériels possibles:\n"
- 
--#: ../ifconfig.c:245
-+#. 1 = ARPable
-+#: ../ifconfig.c:227
- #, c-format
--msgid "          IPX/Ethernet 802.3 addr:%s\n"
--msgstr "          adr IPX/Ethernet 802.3:%s\n"
-+msgid "  <AF>=Address family. Default: %s\n"
-+msgstr "  <AF>=famille d'Adresses. Défaut: %s\n"
- 
--#: ../ifconfig.c:255
-+#: ../ifconfig.c:228
- #, c-format
--msgid "          EtherTalk Phase 2 addr:%s\n"
--msgstr "          adr EtherTalk Phase 2:%s\n"
-+msgid "  List of possible address families:\n"
-+msgstr "  Liste des familles d'adresses possibles:\n"
- 
--#: ../ifconfig.c:264
-+#: ../ifconfig.c:303
- #, c-format
--msgid "          econet addr:%s\n"
--msgstr "          adr econet:%s\n"
-+msgid "ifconfig: option `%s' not recognised.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:270
--msgid "[NO FLAGS] "
--msgstr "[PAS INDICATEURS] "
-+#: ../ifconfig.c:305 ../ifconfig.c:962
-+#, c-format
-+msgid "ifconfig: `--help' gives usage information.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:272
--msgid "UP "
--msgstr "UP "
-+#: ../ifconfig.c:380
-+#, c-format
-+msgid "Unknown media type.\n"
-+msgstr "Type de média inconnu.\n"
- 
--#: ../ifconfig.c:274
--msgid "BROADCAST "
--msgstr "BROADCAST "
-+#: ../ifconfig.c:417
-+#, c-format
-+msgid ""
-+"Warning: Interface %s still in promisc mode... maybe other application is "
-+"running?\n"
-+msgstr ""
- 
--#: ../ifconfig.c:276
--msgid "DEBUG "
--msgstr "DEBUG "
-+#: ../ifconfig.c:429
-+#, c-format
-+msgid "Warning: Interface %s still in MULTICAST mode.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:278
--msgid "LOOPBACK "
--msgstr "LOOPBACK "
-+#: ../ifconfig.c:441
-+#, c-format
-+msgid "Warning: Interface %s still in ALLMULTI mode.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:280
--msgid "POINTOPOINT "
--msgstr "POINTOPOINT "
-+#: ../ifconfig.c:465
-+#, c-format
-+msgid "Warning: Interface %s still in DYNAMIC mode.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:282
--msgid "NOTRAILERS "
--msgstr "NOTRAILERS "
-+#: ../ifconfig.c:523
-+#, c-format
-+msgid "Warning: Interface %s still in BROADCAST mode.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:284
--msgid "RUNNING "
--msgstr "RUNNING "
-+#: ../ifconfig.c:652
-+#, c-format
-+msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:286
--msgid "NOARP "
--msgstr "NOARP "
-+#: ../ifconfig.c:684
-+#, c-format
-+msgid "hw address type `%s' has no handler to set address. failed.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:288
--msgid "PROMISC "
--msgstr "PROMISC "
-+#: ../ifconfig.c:693
-+#, c-format
-+msgid "%s: invalid %s address.\n"
-+msgstr "%s: adresse %s invalide.\n"
- 
--#: ../ifconfig.c:290
--msgid "ALLMULTI "
--msgstr "ALLMULTI "
--
--#: ../ifconfig.c:292
--msgid "SLAVE "
--msgstr "SLAVE "
--
--#: ../ifconfig.c:294
--msgid "MASTER "
--msgstr "MASTER "
--
--#: ../ifconfig.c:296
--msgid "MULTICAST "
--msgstr "MULTICAST "
--
--#: ../ifconfig.c:299
--msgid "DYNAMIC "
--msgstr "DYNAMIC "
--
--#: ../ifconfig.c:302
--#, c-format
--msgid " MTU:%d  Metric:%d"
--msgstr " MTU:%d  Metric:%d"
--
--#: ../ifconfig.c:306
--#, c-format
--msgid "  Outfill:%d  Keepalive:%d"
--msgstr "  Outfill:%d  Keepalive:%d"
--
--#: ../ifconfig.c:320
--#, c-format
--msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
--msgstr "Paquets Reçus:%lu erreurs:%lu jetés:%lu débordements:%lu trames:%lu\n"
--
--#: ../ifconfig.c:325
--#, c-format
--msgid "             compressed:%lu\n"
--msgstr "             compressés:%lu\n"
--
--#: ../ifconfig.c:329
--#, c-format
--msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
--msgstr ""
--"Paquets transmis:%lu erreurs:%lu jetés:%lu débordements:%lu carrier:%lu\n"
--
--#: ../ifconfig.c:333
-+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
- #, c-format
--msgid "          collisions:%lu "
--msgstr "          collisions:%lu "
--
--#: ../ifconfig.c:335
--#, c-format
--msgid "compressed:%lu "
--msgstr "compressés:%lu "
--
--#: ../ifconfig.c:337
--#, c-format
--msgid "txqueuelen:%d "
--msgstr "lg file transmission:%d "
--
--#: ../ifconfig.c:345
--#, c-format
--msgid "Interrupt:%d "
--msgstr "Interruption:%d "
--
--#. Only print devices using it for
--#. I/O maps
--#: ../ifconfig.c:348
--#, c-format
--msgid "Base address:0x%x "
--msgstr "Adresse de base:0x%x "
--
--#: ../ifconfig.c:350
--#, c-format
--msgid "Memory:%lx-%lx "
--msgstr "Mémoire:%lx-%lx "
--
--#: ../ifconfig.c:353
--#, c-format
--msgid "DMA chan:%x "
--msgstr "Canal DMA:%x "
-+msgid "No support for INET6 on this system.\n"
-+msgstr "Pas de support de INET6 sur ce système.\n"
- 
--#: ../ifconfig.c:384 ../ifconfig.c:405
-+#: ../ifconfig.c:780 ../ifconfig.c:871
- #, c-format
--msgid "%s: unknown interface: %s\n"
--msgstr "%s: interface inconnue: %s\n"
--
--#: ../ifconfig.c:421
--msgid ""
--"Usage:\n"
--"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <address>]\n"
--msgstr ""
--"Syntaxe:\n"
--"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <adresse>]\n"
--
--#: ../ifconfig.c:425
--msgid "  [add <address>[/<prefixlen>]]\n"
--msgstr "  [add <adresse>[/<lg_prefixe>]]\n"
--
--#: ../ifconfig.c:427
--msgid "  [del <address>[/<prefixlen>]]\n"
--msgstr "  [del <adresse>[/<lg_prefixe>]]\n"
--
--#: ../ifconfig.c:432
--msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
--msgstr "  [[-]broadcast [<adresse>]]  [[-]pointopoint [<adresse>]]\n"
--
--#: ../ifconfig.c:433
--#, fuzzy
--msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
--msgstr "  [netmask <adresse>]  [dstaddr <adresse>]  [tunnel <adresse>]\n"
--
--#: ../ifconfig.c:436
--msgid "  [outfill <NN>] [keepalive <NN>]\n"
--msgstr "  [outfill <NN>] [keepalive <NN>]\n"
--
--#: ../ifconfig.c:438
--msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
--msgstr "  [hw <HW> <adresse>]  [metric <NN>]  [mtu <NN>]\n"
--
--#: ../ifconfig.c:439
--msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
--msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
--
--#: ../ifconfig.c:440
--msgid "  [multicast]  [[-]promisc]\n"
--msgstr "  [multicast]  [[-]promisc]\n"
--
--#: ../ifconfig.c:441
--msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
--msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
--
--#: ../ifconfig.c:443
--#, fuzzy
--msgid "  [txqueuelen <NN>]\n"
--msgstr "  [txqueuelen longueur]\n"
--
--#: ../ifconfig.c:446
--msgid "  [[-]dynamic]\n"
--msgstr "  [[-]dynamic]\n"
--
--#: ../ifconfig.c:448
--msgid ""
--"  [up|down] ...\n"
--"\n"
-+msgid "Interface %s not initialized\n"
- msgstr ""
--"  [up|down] ...\n"
--"\n"
--
--#: ../ifconfig.c:450
--msgid "  <HW>=Hardware Type.\n"
--msgstr "  <HW>=Type de matériel.\n"
--
--#: ../ifconfig.c:451
--msgid "  List of possible hardware types:\n"
--msgstr "  Liste des types de matériels possibles:\n"
--
--#. 1 = ARPable
--#: ../ifconfig.c:453
--#, c-format
--msgid "  <AF>=Address family. Default: %s\n"
--msgstr "  <AF>=famille d'Adresses. Défaut: %s\n"
--
--#: ../ifconfig.c:454
--msgid "  List of possible address families:\n"
--msgstr "  Liste des familles d'adresses possibles:\n"
--
--#: ../ifconfig.c:593
--msgid "Unknown media type.\n"
--msgstr "Type de média inconnu.\n"
- 
--#: ../ifconfig.c:881
--#, c-format
--msgid "%s: invalid %s address.\n"
-+#: ../ifconfig.c:792 ../ifconfig.c:882
-+#, fuzzy, c-format
-+msgid "Bad address.\n"
- msgstr "%s: adresse %s invalide.\n"
- 
--#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011
--msgid "No support for INET6 on this system.\n"
--msgstr "Pas de support de INET6 sur ce système.\n"
--
--#: ../ifconfig.c:983
-+#: ../ifconfig.c:885
-+#, c-format
- msgid "Address deletion not supported on this system.\n"
- msgstr "Suppression d'adresses pas supporté par ce système.\n"
- 
--#: ../ifconfig.c:1066
--msgid "No support for INET on this system.\n"
--msgstr "Pas de support de INET sur ce système.\n"
-+#: ../ifconfig.c:957
-+#, fuzzy, c-format
-+msgid "ifconfig: Cannot set address for this protocol family.\n"
-+msgstr "Ne sait pas comment définir les adresses pour la famille %d.\n"
- 
--#: ../ifconfig.c:1076
-+#: ../ifconfig.c:983
-+#, c-format
- msgid "No support for ECONET on this system.\n"
- msgstr "Pas de support de ECONET sur ce système.\n"
- 
--#: ../ifconfig.c:1084
-+#: ../ifconfig.c:991
- #, c-format
- msgid "Don't know how to set addresses for family %d.\n"
- msgstr "Ne sait pas comment définir les adresses pour la famille %d.\n"
- 
--#: ../netstat.c:383
-+#: ../ifconfig.c:1021
-+#, c-format
-+msgid "WARNING: at least one error occured. (%d)\n"
-+msgstr ""
-+
-+#: ../netstat.c:434
- #, c-format
- msgid ""
- "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
--msgstr ""
--"(Pas d'infos lues pour \"-p\": geteuid()=%d mais vous devez être root.)\n"
-+msgstr "(Pas d'infos lues pour \"-p\": geteuid()=%d mais vous devez être root.)\n"
- 
--#: ../netstat.c:387
-+#: ../netstat.c:438
-+#, c-format
- msgid ""
- "(Not all processes could be identified, non-owned process info\n"
- " will not be shown, you would have to be root to see it all.)\n"
- msgstr ""
- "(Tous les processus ne peuvent être identifiés, les infos sur les processus\n"
--"non possédés ne seront pas affichées, vous devez être root pour les voir "
--"toutes.)\n"
-+"non possédés ne seront pas affichées, vous devez être root pour les voir toutes.)\n"
- 
--#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166
-+#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
- msgid "LISTENING"
- msgstr "LISTENING"
- 
--#: ../netstat.c:395
-+#: ../netstat.c:446
- msgid "CONN SENT"
- msgstr "CONN SENT"
- 
--#: ../netstat.c:396 ../netstat.c:1168
-+#: ../netstat.c:447 ../netstat.c:1268
- msgid "DISC SENT"
- msgstr "DISC SENT"
- 
--#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169
-+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
- msgid "ESTABLISHED"
- msgstr "ESTABLISHED"
- 
--#: ../netstat.c:419
-+#: ../netstat.c:470
-+#, c-format
- msgid "Active NET/ROM sockets\n"
- msgstr "sockets NET/ROM actives\n"
- 
--#: ../netstat.c:420
-+#: ../netstat.c:471
-+#, c-format
- msgid ""
--"User       Dest       Source     Device  State        Vr/Vs    Send-Q  "
--"Recv-Q\n"
-+"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
-+"Q\n"
- msgstr ""
--"Utilisatr  Dest       Source     Periph  Etat         Vr/Vs    Send-Q  "
--"Recv-Q\n"
-+"Utilisatr  Dest       Source     Periph  Etat         Vr/Vs    Send-Q  Recv-"
-+"Q\n"
- 
--#: ../netstat.c:430 ../netstat.c:1208
-+#: ../netstat.c:481 ../netstat.c:1308
- #, c-format
- msgid "Problem reading data from %s\n"
- msgstr ""
- 
--#: ../netstat.c:465
-+#: ../netstat.c:516
- msgid "SYN_SENT"
- msgstr "SYN_SENT"
- 
--#: ../netstat.c:466
-+#: ../netstat.c:517
- msgid "SYN_RECV"
- msgstr "SYN_RECV"
- 
--#: ../netstat.c:467
-+#: ../netstat.c:518
- msgid "FIN_WAIT1"
- msgstr "FIN_WAIT1"
- 
--#: ../netstat.c:468
-+#: ../netstat.c:519
- msgid "FIN_WAIT2"
- msgstr "FIN_WAIT2"
- 
--#: ../netstat.c:469
-+#: ../netstat.c:520
- msgid "TIME_WAIT"
- msgstr "TIME_WAIT"
- 
--#: ../netstat.c:470
-+#: ../netstat.c:521
- msgid "CLOSE"
- msgstr "CLOSE"
- 
--#: ../netstat.c:471
-+#: ../netstat.c:522
- msgid "CLOSE_WAIT"
- msgstr "CLOSE_WAIT"
- 
--#: ../netstat.c:472
-+#: ../netstat.c:523
- msgid "LAST_ACK"
- msgstr "LAST_ACK"
- 
--#: ../netstat.c:473
-+#: ../netstat.c:524
- msgid "LISTEN"
- msgstr "LISTEN"
- 
--#: ../netstat.c:474
-+#: ../netstat.c:525
- msgid "CLOSING"
- msgstr "CLOSING"
- 
--#: ../netstat.c:544
-+#: ../netstat.c:596
- #, c-format
- msgid "warning, got bogus igmp6 line %d.\n"
- msgstr "attention, ligne igmp6 en erreur %d.\n"
- 
--#: ../netstat.c:549 ../netstat.c:587 ../netstat.c:670 ../netstat.c:803
--#: ../netstat.c:935 ../netstat.c:940
-+#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
-+#: ../netstat.c:1032 ../netstat.c:1037
- #, c-format
- msgid "netstat: unsupported address family %d !\n"
- msgstr "netstat: famille d'adresses pas supportée %d !\n"
- 
--#: ../netstat.c:562 ../netstat.c:567 ../netstat.c:575 ../netstat.c:582
-+#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
- #, c-format
- msgid "warning, got bogus igmp line %d.\n"
- msgstr "attention, ligne igmp6 en erreur %d.\n"
- 
--#: ../netstat.c:666
-+#: ../netstat.c:677
-+#, fuzzy, c-format
-+msgid "Active X.25 sockets\n"
-+msgstr "Sockets AX.25 actives\n"
-+
-+#. IMHO, Vr/Vs is not very usefull --SF
-+#: ../netstat.c:679
-+#, fuzzy, c-format
-+msgid ""
-+"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
-+"Q\n"
-+msgstr "Dest       Source     Periph  Etat         Vr/Vs    Send-Q  Recv-Q\n"
-+
-+#: ../netstat.c:759
-+#, c-format
- msgid "warning, got bogus tcp line.\n"
- msgstr "attention, ligne tcp en erreur.\n"
- 
--#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975
-+#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
- #, c-format
- msgid "off (0.00/%ld/%d)"
- msgstr "off (0.00/%ld/%d)"
- 
--#: ../netstat.c:708
-+#: ../netstat.c:804
- #, fuzzy, c-format
- msgid "on (%2.2f/%ld/%d)"
- msgstr "on%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:713
-+#: ../netstat.c:809
- #, fuzzy, c-format
- msgid "keepalive (%2.2f/%ld/%d)"
- msgstr "on%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:718
-+#: ../netstat.c:814
- #, fuzzy, c-format
- msgid "timewait (%2.2f/%ld/%d)"
- msgstr "on%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985
-+#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
- #, c-format
- msgid "unkn-%d (%2.2f/%ld/%d)"
- msgstr "unkn-%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:799
-+#: ../netstat.c:894
-+#, c-format
- msgid "warning, got bogus udp line.\n"
- msgstr "attention, ligne udp en erreur.\n"
- 
--#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108
-+#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
- msgid "UNKNOWN"
- msgstr "INCONNU"
- 
--#: ../netstat.c:860 ../netstat.c:980
-+#: ../netstat.c:958 ../netstat.c:1080
- #, c-format
- msgid "on%d (%2.2f/%ld/%d)"
- msgstr "on%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:949
-+#: ../netstat.c:1046
-+#, c-format
- msgid "warning, got bogus raw line.\n"
- msgstr "attention, ligne raw en erreur.\n"
- 
--#: ../netstat.c:1028
-+#: ../netstat.c:1128
-+#, c-format
- msgid "warning, got bogus unix line.\n"
- msgstr "attention, ligne unix en erreur.\n"
- 
--#: ../netstat.c:1055
-+#: ../netstat.c:1155
- msgid "STREAM"
- msgstr "STREAM"
- 
--#: ../netstat.c:1059
-+#: ../netstat.c:1159
- msgid "DGRAM"
- msgstr "DGRAM"
- 
--#: ../netstat.c:1063
-+#: ../netstat.c:1163
- msgid "RAW"
- msgstr "RAW"
- 
--#: ../netstat.c:1067
-+#: ../netstat.c:1167
- msgid "RDM"
- msgstr "RDM"
- 
--#: ../netstat.c:1071
-+#: ../netstat.c:1171
- msgid "SEQPACKET"
- msgstr "SEQPACKET"
- 
--#: ../netstat.c:1080
-+#: ../netstat.c:1180
- msgid "FREE"
- msgstr "LIBRE"
- 
--#: ../netstat.c:1096
-+#: ../netstat.c:1196
- msgid "CONNECTING"
- msgstr "ENCONNEXION"
- 
--#: ../netstat.c:1100
-+#: ../netstat.c:1200
- msgid "CONNECTED"
- msgstr "CONNECTE"
- 
--#: ../netstat.c:1104
-+#: ../netstat.c:1204
- msgid "DISCONNECTING"
- msgstr "ENDECONNEXION"
- 
--#: ../netstat.c:1135
-+#: ../netstat.c:1235
-+#, c-format
- msgid "Active UNIX domain sockets "
- msgstr "Sockets du domaine UNIX actives"
- 
--#: ../netstat.c:1137 ../netstat.c:1666
-+#: ../netstat.c:1237 ../netstat.c:1756
-+#, c-format
- msgid "(servers and established)"
- msgstr "(serveurs et établies)"
- 
--#: ../netstat.c:1140 ../netstat.c:1669
-+#: ../netstat.c:1240 ../netstat.c:1759
-+#, c-format
- msgid "(only servers)"
- msgstr "(seulement serveurs)"
- 
--#: ../netstat.c:1142 ../netstat.c:1671
-+#: ../netstat.c:1242 ../netstat.c:1761
-+#, c-format
- msgid "(w/o servers)"
- msgstr "(sans serveurs)"
- 
--#: ../netstat.c:1145
-+#: ../netstat.c:1245
-+#, c-format
- msgid ""
- "\n"
- "Proto RefCnt Flags       Type       State         I-Node"
-@@ -994,32 +906,36 @@
- "\n"
- "Proto RefCpt Indicatrs   Type       Etat          I-Node"
- 
--#: ../netstat.c:1147
-+#: ../netstat.c:1247
-+#, c-format
- msgid " Path\n"
- msgstr " Chemin\n"
- 
--#: ../netstat.c:1167
-+#: ../netstat.c:1267
- msgid "SABM SENT"
- msgstr "SABM SENT"
- 
--#: ../netstat.c:1170
-+#: ../netstat.c:1270
- msgid "RECOVERY"
- msgstr "RECOVERY"
- 
--#: ../netstat.c:1184
-+#: ../netstat.c:1284
-+#, c-format
- msgid "Active AX.25 sockets\n"
- msgstr "Sockets AX.25 actives\n"
- 
--#: ../netstat.c:1185
-+#: ../netstat.c:1285
-+#, c-format
- msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
- msgstr "Dest       Source     Periph  Etat         Vr/Vs    Send-Q  Recv-Q\n"
- 
--#: ../netstat.c:1228
-+#: ../netstat.c:1328
- #, c-format
- msgid "problem reading data from %s\n"
- msgstr ""
- 
--#: ../netstat.c:1279
-+#: ../netstat.c:1379
-+#, c-format
- msgid ""
- "Active IPX sockets\n"
- "Proto Recv-Q Send-Q Local Address              Foreign Address            "
-@@ -1029,55 +945,53 @@
- "Proto Recv-Q Send-Q Adresse locale             Adresse distante           "
- "Etat"
- 
--#: ../netstat.c:1281
-+#: ../netstat.c:1381
-+#, c-format
- msgid " User"
- msgstr "Utilisatr"
- 
--#: ../netstat.c:1315
-+#: ../netstat.c:1415
- msgid "ESTAB"
- msgstr "ESTAB"
- 
--#: ../netstat.c:1323
-+#: ../netstat.c:1423
- msgid "UNK."
- msgstr "UNK."
- 
--#: ../netstat.c:1367
--msgid "     - no statistics available -"
--msgstr ""
--
--#: ../netstat.c:1370
--msgid "[NO FLAGS]"
--msgstr "[PAS INDICATEURS]"
--
--#: ../netstat.c:1400
-+#: ../netstat.c:1461
-+#, c-format
- msgid "Kernel Interface table\n"
- msgstr "Table d'interfaces noyau\n"
- 
--#: ../netstat.c:1401
-+#: ../netstat.c:1465
-+#, fuzzy, c-format
- msgid ""
--"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
-+"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
- "Flg\n"
- msgstr ""
- "Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
- "Indic\n"
- 
--#: ../netstat.c:1404
-+#: ../netstat.c:1469
- msgid "missing interface information"
- msgstr "informations d'interface manquantes"
- 
--#: ../netstat.c:1425
-+#: ../netstat.c:1492
-+#, c-format
- msgid ""
--"usage: netstat [-veenNcCF] [<Af>] -r         netstat "
--"{-V|--version|-h|--help}\n"
-+"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
-+"help}\n"
- msgstr ""
--"syntaxe: netstat [-veenNcCF] [<Af>] -r         netstat "
--"{-V|--version|-h|--help}\n"
-+"syntaxe: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
-+"help}\n"
- 
--#: ../netstat.c:1426
-+#: ../netstat.c:1493
-+#, c-format
- msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
- msgstr "       netstat [-vnNcaeol] [<Socket> ...]\n"
- 
--#: ../netstat.c:1427
-+#: ../netstat.c:1494
-+#, c-format
- msgid ""
- "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
- "\n"
-@@ -1085,27 +999,30 @@
- "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
- "\n"
- 
--#: ../netstat.c:1429
-+#: ../netstat.c:1496
-+#, c-format
- msgid "        -r, --route              display routing table\n"
- msgstr "        -r, --route              affiche la table de routage\n"
- 
--#: ../netstat.c:1430
-+#: ../netstat.c:1497
-+#, c-format
- msgid "        -i, --interfaces         display interface table\n"
- msgstr "        -i, --interfaces         affiche la table d'interfaces\n"
- 
--#: ../netstat.c:1431
-+#: ../netstat.c:1498
-+#, c-format
- msgid "        -g, --groups             display multicast group memberships\n"
- msgstr ""
- "        -g, --groups             affiche les membres d'un groupe multicast\n"
- 
--#: ../netstat.c:1432
-+#: ../netstat.c:1499
-+#, c-format
- msgid ""
- "        -s, --statistics         display networking statistics (like SNMP)\n"
--msgstr ""
--"        -s, --statistics         affiche les statistiques réseau (comme "
--"SNMP)\n"
-+msgstr "        -s, --statistics         affiche les statistiques réseau (comme SNMP)\n"
- 
--#: ../netstat.c:1434
-+#: ../netstat.c:1501
-+#, c-format
- msgid ""
- "        -M, --masquerade         display masqueraded connections\n"
- "\n"
-@@ -1113,23 +1030,41 @@
- "        -M, --masquerade         affiche les connexions masquées\n"
- "\n"
- 
--#: ../netstat.c:1438 ../route.c:87
-+#: ../netstat.c:1505
-+#, fuzzy, c-format
-+msgid "        --numeric-hosts          don't resolve host names\n"
-+msgstr "        -n, --numeric            ne résout pas les noms\n"
-+
-+#: ../netstat.c:1506
-+#, fuzzy, c-format
-+msgid "        --numeric-ports          don't resolve port names\n"
-+msgstr "        -n, --numeric            ne résout pas les noms\n"
-+
-+#: ../netstat.c:1507
-+#, fuzzy, c-format
-+msgid "        --numeric-users          don't resolve user names\n"
-+msgstr "        -n, --numeric            ne résout pas les noms\n"
-+
-+#: ../netstat.c:1508
-+#, c-format
- msgid "        -N, --symbolic           resolve hardware names\n"
- msgstr "        -N, --symbolic           résoud les noms matériels\n"
- 
--#: ../netstat.c:1439 ../route.c:88
--#, fuzzy
-+#: ../netstat.c:1509 ../route.c:88
-+#, fuzzy, c-format
- msgid "        -e, --extend             display other/more information\n"
- msgstr ""
- "        -e, --extend             affiche d'autres/plus d'informations\n"
- 
--#: ../netstat.c:1440
-+#: ../netstat.c:1510
-+#, c-format
- msgid "        -p, --programs           display PID/Program name for sockets\n"
- msgstr ""
- "        -p, --programs           affiche le nom du programme/PID des "
- "sockets\n"
- 
--#: ../netstat.c:1441
-+#: ../netstat.c:1511
-+#, c-format
- msgid ""
- "        -c, --continuous         continuous listing\n"
- "\n"
-@@ -1137,32 +1072,31 @@
- "        -c, --continuous         listing continu\n"
- "\n"
- 
--#: ../netstat.c:1442
-+#: ../netstat.c:1512
-+#, c-format
- msgid "        -l, --listening          display listening server sockets\n"
--msgstr ""
--"        -l, --listening          affiche les sockets du serveur à l'écoute\n"
-+msgstr "        -l, --listening          affiche les sockets du serveur à l'écoute\n"
- 
--#: ../netstat.c:1443
-+#: ../netstat.c:1513
-+#, c-format
- msgid ""
- "        -a, --all, --listening   display all sockets (default: connected)\n"
--msgstr ""
--"        -a, --all, --listening   affiche toutes les prises (défaut: "
--"connectés)\n"
-+msgstr "        -a, --all, --listening   affiche toutes les prises (défaut: connectés)\n"
- 
--#: ../netstat.c:1444
-+#: ../netstat.c:1514
-+#, c-format
- msgid "        -o, --timers             display timers\n"
- msgstr "        -o, --timers             affiche les timers\n"
- 
--#: ../netstat.c:1445 ../route.c:89
--#, fuzzy
-+#: ../netstat.c:1515 ../route.c:89
-+#, fuzzy, c-format
- msgid ""
- "        -F, --fib                display Forwarding Information Base "
- "(default)\n"
--msgstr ""
--"        -F, --fib                affiche la Forwarding Infomation Base "
--"(défaut)\n"
-+msgstr "        -F, --fib                affiche la Forwarding Infomation Base (défaut)\n"
- 
--#: ../netstat.c:1446 ../route.c:90
-+#: ../netstat.c:1516 ../route.c:90
-+#, c-format
- msgid ""
- "        -C, --cache              display routing cache instead of FIB\n"
- "\n"
-@@ -1170,110 +1104,118 @@
- "        -C, --cache              affiche le cache de routage au lieu de FIB\n"
- "\n"
- 
--#: ../netstat.c:1448
-+#: ../netstat.c:1518
-+#, c-format
- msgid ""
--"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
--"--netrom\n"
-+"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-+"netrom\n"
- msgstr ""
--"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
--"--netrom\n"
-+"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-+"netrom\n"
- 
--#: ../netstat.c:1449 ../route.c:92
--#, c-format
--msgid "  <AF>=Use '-A <af>' or '--<af>' Default: %s\n"
-+#: ../netstat.c:1519
-+#, fuzzy, c-format
-+msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
- msgstr "  <AF>=Utiliser '-A <af>' ou '--<af>' Défaut: %s\n"
- 
--#: ../netstat.c:1450 ../route.c:93
-+#: ../netstat.c:1520 ../route.c:93
-+#, c-format
- msgid "  List of possible address families (which support routing):\n"
- msgstr "  Liste les familles d'adresses possibles (supportant le routage):\n"
- 
--#: ../netstat.c:1663
-+#: ../netstat.c:1753
-+#, c-format
- msgid "Active Internet connections "
- msgstr "Connexions Internet actives "
- 
--#: ../netstat.c:1673
-+#: ../netstat.c:1763
-+#, c-format
- msgid ""
- "\n"
--"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
--"  "
-+"Proto Recv-Q Send-Q Local Address           Foreign Address         "
-+"State      "
- msgstr ""
- "\n"
--"Proto Recv-Q Send-Q Adresse locale          Adresse distante        Etat     "
--"  "
-+"Proto Recv-Q Send-Q Adresse locale          Adresse distante        "
-+"Etat       "
- 
--#: ../netstat.c:1675
-+#: ../netstat.c:1765
-+#, c-format
- msgid " User       Inode     "
- msgstr " Utilisatr  Inode     "
- 
--#: ../netstat.c:1678
-+#: ../netstat.c:1768
-+#, c-format
- msgid " Timer"
- msgstr " Timer"
- 
--#: ../netstat.c:1708
-+#: ../netstat.c:1798
-+#, c-format
- msgid "IPv4 Group Memberships\n"
- msgstr ""
- 
--#: ../netstat.c:1709
-+#: ../netstat.c:1799
-+#, c-format
- msgid "Interface       RefCnt Group\n"
- msgstr ""
- 
--#: ../rarp.c:43
-+#: ../rarp.c:44
- msgid "This kernel does not support RARP.\n"
- msgstr "Ce noyau ne supporte pas RARP.\n"
- 
--#: ../rarp.c:82
-+#: ../rarp.c:83
- #, c-format
- msgid "no RARP entry for %s.\n"
- msgstr "pas d'entrée RARP pour %s.\n"
- 
--#: ../rarp.c:95
-+#: ../rarp.c:96
- #, c-format
- msgid "%s: bad hardware address\n"
- msgstr "%s: mauvaise adresse matériel\n"
- 
--#: ../rarp.c:127
-+#: ../rarp.c:128
- #, c-format
- msgid "rarp: cannot open file %s:%s.\n"
- msgstr "rarp: ne peut ouvrir le fichier %s:%s.\n"
- 
--#: ../rarp.c:139
-+#: ../rarp.c:140
- #, c-format
- msgid "rarp: format error at %s:%u\n"
- msgstr "rarp: erreur de format à %s:%u\n"
- 
--#: ../rarp.c:143 ../rarp.c:287
-+#: ../rarp.c:144 ../rarp.c:289
- #, c-format
- msgid "rarp: %s: unknown host\n"
- msgstr "rarp: %s: hôte inconnu\n"
- 
--#: ../rarp.c:146
-+#: ../rarp.c:147
- #, c-format
- msgid "rarp: cannot set entry from %s:%u\n"
- msgstr "rarp: ne peut définir l'entrée depuis %s:%u\n"
- 
--#: ../rarp.c:175
-+#: ../rarp.c:176
-+#, c-format
- msgid "Usage: rarp -a                               list entries in cache.\n"
--msgstr ""
--"Usage: rarp -a                               liste les entrées en cache.\n"
-+msgstr "Usage: rarp -a                               liste les entrées en cache.\n"
- 
--#: ../rarp.c:176
-+#: ../rarp.c:177
-+#, c-format
- msgid "       rarp -d <hostname>                    delete entry from cache.\n"
--msgstr ""
--"       rarp -d <hostname>                    supprime l'entrée du cache.\n"
-+msgstr "       rarp -d <hostname>                    supprime l'entrée du cache.\n"
- 
--#: ../rarp.c:177
-+#: ../rarp.c:178
-+#, c-format
- msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
--msgstr ""
--"       rarp [<HW>] -s <hostname> <adrmat>    ajoute l'entrée au cache.\n"
-+msgstr "       rarp [<HW>] -s <hostname> <adrmat>    ajoute l'entrée au cache.\n"
- 
--#: ../rarp.c:178
-+#: ../rarp.c:179
-+#, c-format
- msgid ""
- "       rarp -f                               add entries from /etc/ethers.\n"
--msgstr ""
--"       rarp -f                               ajoute les entrées depuis "
--"/etc/ethers.\n"
-+msgstr "       rarp -f                               ajoute les entrées depuis /etc/ethers.\n"
- 
--#: ../rarp.c:179
-+#: ../rarp.c:180
-+#, c-format
- msgid ""
- "       rarp -V                               display program version.\n"
- "\n"
-@@ -1281,24 +1223,26 @@
- "       rarp -V                               affiche la version.\n"
- "\n"
- 
--#: ../rarp.c:236
-+#: ../rarp.c:238
- #, c-format
- msgid "%s: illegal option mix.\n"
- msgstr "%s: combinaison d'options illégales.\n"
- 
--#: ../rarp.c:267
-+#: ../rarp.c:269
- #, c-format
- msgid "rarp: %s: unknown hardware type.\n"
- msgstr "rarp: %s: type de matériel inconnu.\n"
- 
--#: ../route.c:79
-+#: ../route.c:80
-+#, c-format
- msgid ""
- "Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
- msgstr ""
- "Syntaxe: route [-nNvee] [-FC] [<AF>]           Liste les tables de routage "
- "noyau\n"
- 
--#: ../route.c:80
-+#: ../route.c:81
-+#, c-format
- msgid ""
- "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
- "\n"
-@@ -1307,15 +1251,15 @@
- "pour AF.\n"
- "\n"
- 
--#: ../route.c:82
-+#: ../route.c:83
-+#, c-format
- msgid ""
- "       route {-h|--help} [<AF>]              Detailed usage syntax for "
- "specified AF.\n"
--msgstr ""
--"       route {-h|--help} [<AF>]              Utilisation détaillée pour l'AF "
--"spécifié.\n"
-+msgstr "       route {-h|--help} [<AF>]              Utilisation détaillée pour l'AF spécifié.\n"
- 
--#: ../route.c:83
-+#: ../route.c:84
-+#, c-format
- msgid ""
- "       route {-V|--version}                  Display version/author and "
- "exit.\n"
-@@ -1325,16 +1269,23 @@
- "termine.\n"
- "\n"
- 
-+#: ../route.c:92
-+#, fuzzy, c-format
-+msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
-+msgstr "  <AF>=Utiliser '-A <af>' ou '--<af>' Défaut: %s\n"
-+
- #: ../plipconfig.c:66
-+#, c-format
- msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
- msgstr "Syntaxe: plipconfig [-a] [-i] [-v] interface\n"
- 
- #: ../plipconfig.c:67
-+#, c-format
- msgid "                  [nibble NN] [trigger NN]\n"
- msgstr "                  [nibble NN] [trigger NN]\n"
- 
- #: ../plipconfig.c:68
--#, fuzzy
-+#, fuzzy, c-format
- msgid "       plipconfig -V | --version\n"
- msgstr "       plipconfig -V\n"
- 
-@@ -1343,474 +1294,763 @@
- msgid "%s\tnibble %lu  trigger %lu\n"
- msgstr "%s\tnibble %lu  trigger %lu\n"
- 
--#: ../iptunnel.c:79
-+#: ../iptunnel.c:85
-+#, c-format
- msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
- msgstr ""
- 
--#: ../iptunnel.c:80
-+#: ../iptunnel.c:86
-+#, c-format
- msgid ""
- "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
- msgstr ""
- 
--#: ../iptunnel.c:81
-+#: ../iptunnel.c:87
-+#, c-format
- msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
- msgstr ""
- 
--#: ../iptunnel.c:82
-+#: ../iptunnel.c:88
-+#, c-format
- msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
- msgstr ""
- 
--#: ../iptunnel.c:83
-+#: ../iptunnel.c:89
-+#, c-format
- msgid ""
- "       iptunnel -V | --version\n"
- "\n"
- msgstr ""
- 
--#: ../iptunnel.c:84
-+#: ../iptunnel.c:90
-+#, c-format
- msgid "Where: NAME := STRING\n"
- msgstr ""
- 
--#: ../iptunnel.c:85
-+#: ../iptunnel.c:91
-+#, c-format
- msgid "       ADDR := { IP_ADDRESS | any }\n"
- msgstr ""
- 
--#: ../iptunnel.c:86
-+#: ../iptunnel.c:92
-+#, c-format
- msgid "       TOS  := { NUMBER | inherit }\n"
- msgstr ""
- 
--#: ../iptunnel.c:87
-+#: ../iptunnel.c:93
-+#, c-format
- msgid "       TTL  := { 1..255 | inherit }\n"
- msgstr ""
- 
--#: ../iptunnel.c:88
-+#: ../iptunnel.c:94
-+#, c-format
- msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
- msgstr ""
- 
--#: ../iptunnel.c:326
-+#: ../iptunnel.c:332
-+#, c-format
- msgid "Keys are not allowed with ipip and sit.\n"
- msgstr ""
- 
--#: ../iptunnel.c:346
-+#: ../iptunnel.c:352
-+#, c-format
- msgid "Broadcast tunnel requires a source address.\n"
- msgstr ""
- 
--#: ../iptunnel.c:361
-+#: ../iptunnel.c:367
-+#, c-format
- msgid "ttl != 0 and noptmudisc are incompatible\n"
- msgstr ""
- 
--#: ../iptunnel.c:373
-+#: ../iptunnel.c:379
-+#, c-format
- msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
- msgstr ""
- 
--#: ../iptunnel.c:411
-+#: ../iptunnel.c:417
- #, c-format
- msgid "%s: %s/ip  remote %s  local %s "
- msgstr ""
- 
--#: ../iptunnel.c:415
-+#: ../iptunnel.c:421
- #, fuzzy
- msgid "unknown"
- msgstr "Inconnu"
- 
--#: ../iptunnel.c:447
-+#: ../iptunnel.c:453
-+#, c-format
- msgid "  Drop packets out of sequence.\n"
- msgstr ""
- 
--#: ../iptunnel.c:449
-+#: ../iptunnel.c:455
-+#, c-format
- msgid "  Checksum in received packet is required.\n"
- msgstr ""
- 
--#: ../iptunnel.c:451
-+#: ../iptunnel.c:457
-+#, c-format
- msgid "  Sequence packets on output.\n"
- msgstr ""
- 
--#: ../iptunnel.c:453
-+#: ../iptunnel.c:459
-+#, c-format
- msgid "  Checksum output packets.\n"
- msgstr ""
- 
--#: ../iptunnel.c:481
-+#: ../iptunnel.c:487
-+#, c-format
- msgid "Wrong format of /proc/net/dev. Sorry.\n"
- msgstr ""
- 
--#: ../iptunnel.c:494
-+#: ../iptunnel.c:500
- #, c-format
- msgid "Failed to get type of [%s]\n"
- msgstr ""
- 
--#: ../iptunnel.c:510
-+#: ../iptunnel.c:516
-+#, c-format
- msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
- msgstr ""
- 
--#: ../iptunnel.c:513
-+#: ../iptunnel.c:519
-+#, c-format
- msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
- msgstr ""
- 
--#: ../statistics.c:45
-+#: ../statistics.c:47
- msgid "ICMP input histogram:"
- msgstr "Histogramme d'entrée ICMP"
- 
--#: ../statistics.c:46
-+#: ../statistics.c:48
- msgid "ICMP output histogram:"
- msgstr "Histogramme de sortie ICMP"
- 
--#: ../statistics.c:63
-+#: ../statistics.c:65
- #, c-format
- msgid "Forwarding is %s"
- msgstr "Réacheminement est %s"
- 
--#: ../statistics.c:64
--#, c-format
--msgid "Default TTL is %d"
-+#: ../statistics.c:66
-+#, fuzzy, c-format
-+msgid "Default TTL is %u"
- msgstr "TTL par défaut est %d"
- 
--#: ../statistics.c:65
--#, c-format
--msgid "%d total packets received"
-+#: ../statistics.c:67
-+#, fuzzy, c-format
-+msgid "%u total packets received"
- msgstr "%d paquets totaux reçus"
- 
--#: ../statistics.c:66
--#, c-format
--msgid "%d with invalid headers"
-+#: ../statistics.c:68
-+#, fuzzy, c-format
-+msgid "%u with invalid headers"
- msgstr "%d avec en-tête invalides"
- 
--#: ../statistics.c:67
--#, c-format
--msgid "%d with invalid addresses"
-+#: ../statistics.c:69
-+#, fuzzy, c-format
-+msgid "%u with invalid addresses"
- msgstr "%d avec adresses invalides"
- 
--#: ../statistics.c:68
--#, c-format
--msgid "%d forwarded"
-+#: ../statistics.c:70
-+#, fuzzy, c-format
-+msgid "%u forwarded"
- msgstr "%d réacheminées"
- 
--#: ../statistics.c:69
--#, c-format
--msgid "%d with unknown protocol"
-+#: ../statistics.c:71
-+#, fuzzy, c-format
-+msgid "%u with unknown protocol"
- msgstr "%d avec protocole inconnu"
- 
--#: ../statistics.c:70
--#, c-format
--msgid "%d incoming packets discarded"
-+#: ../statistics.c:72
-+#, fuzzy, c-format
-+msgid "%u incoming packets discarded"
- msgstr "%d paquets entrant jetés"
- 
--#: ../statistics.c:71
--#, c-format
--msgid "%d incoming packets delivered"
-+#: ../statistics.c:73
-+#, fuzzy, c-format
-+msgid "%u incoming packets delivered"
- msgstr "%d paquets entrant délivrés"
- 
--#: ../statistics.c:72
--#, c-format
--msgid "%d requests sent out"
-+#: ../statistics.c:74
-+#, fuzzy, c-format
-+msgid "%u requests sent out"
- msgstr "%d requêtes envoyées"
- 
- #. ?
--#: ../statistics.c:73
--#, c-format
--msgid "%d outgoing packets dropped"
-+#: ../statistics.c:75
-+#, fuzzy, c-format
-+msgid "%u outgoing packets dropped"
- msgstr "%d paquets sortant jetés"
- 
--#: ../statistics.c:74
--#, c-format
--msgid "%d dropped because of missing route"
-+#: ../statistics.c:76
-+#, fuzzy, c-format
-+msgid "%u dropped because of missing route"
- msgstr "%d jetés pour cause de route manquante"
- 
--#: ../statistics.c:75
--#, c-format
--msgid "%d fragments dropped after timeout"
-+#: ../statistics.c:77
-+#, fuzzy, c-format
-+msgid "%u fragments dropped after timeout"
- msgstr "%d fragments jetés après timeout"
- 
--#: ../statistics.c:76
--#, c-format
--msgid "%d reassemblies required"
-+#: ../statistics.c:78
-+#, fuzzy, c-format
-+msgid "%u reassemblies required"
- msgstr "%d nécessitant un réassemblage"
- 
- #. ?
--#: ../statistics.c:77
--#, c-format
--msgid "%d packets reassembled ok"
-+#: ../statistics.c:79
-+#, fuzzy, c-format
-+msgid "%u packets reassembled ok"
- msgstr "%d paquets réassemblés correctement"
- 
--#: ../statistics.c:78
--#, c-format
--msgid "%d packet reassembles failed"
-+#: ../statistics.c:80
-+#, fuzzy, c-format
-+msgid "%u packet reassembles failed"
- msgstr "%d paquets mal réassemblés"
- 
--#: ../statistics.c:79
--#, c-format
--msgid "%d fragments received ok"
-+#: ../statistics.c:81
-+#, fuzzy, c-format
-+msgid "%u fragments received ok"
- msgstr "%d fragments reçus correctement"
- 
--#: ../statistics.c:80
--#, c-format
--msgid "%d fragments failed"
-+#: ../statistics.c:82
-+#, fuzzy, c-format
-+msgid "%u fragments failed"
- msgstr "%d fragments en échec"
- 
--#: ../statistics.c:81
--#, c-format
--msgid "%d fragments created"
-+#: ../statistics.c:83
-+#, fuzzy, c-format
-+msgid "%u fragments created"
- msgstr "%d fragments créés"
- 
--#: ../statistics.c:86
--#, c-format
--msgid "%d ICMP messages received"
-+#: ../statistics.c:88
-+#, fuzzy, c-format
-+msgid "%u ICMP messages received"
- msgstr "%d messages ICMP reçus"
- 
--#: ../statistics.c:87
--#, c-format
--msgid "%d input ICMP message failed."
-+#: ../statistics.c:89
-+#, fuzzy, c-format
-+msgid "%u input ICMP message failed."
- msgstr "%d messages d'entrée ICMP en échec"
- 
--#: ../statistics.c:88 ../statistics.c:101
--#, c-format
--msgid "destination unreachable: %d"
-+#: ../statistics.c:90 ../statistics.c:103
-+#, fuzzy, c-format
-+msgid "destination unreachable: %u"
- msgstr "destination injoignable: %d"
- 
--#: ../statistics.c:89
--#, c-format
--msgid "timeout in transit: %d"
-+#: ../statistics.c:91
-+#, fuzzy, c-format
-+msgid "timeout in transit: %u"
- msgstr "timeout en transmission: %d"
- 
--#: ../statistics.c:90 ../statistics.c:103
--#, c-format
--msgid "wrong parameters: %d"
-+#: ../statistics.c:92 ../statistics.c:105
-+#, fuzzy, c-format
-+msgid "wrong parameters: %u"
- msgstr "mauvais paramètre: %d"
- 
- #. ?
--#: ../statistics.c:91
--#, c-format
--msgid "source quenchs: %d"
-+#: ../statistics.c:93
-+#, fuzzy, c-format
-+msgid "source quenches: %u"
- msgstr "Source Quenchs: %d"
- 
--#: ../statistics.c:92
--#, c-format
--msgid "redirects: %d"
-+#: ../statistics.c:94
-+#, fuzzy, c-format
-+msgid "redirects: %u"
- msgstr "Redirections: %d"
- 
--#: ../statistics.c:93
--#, c-format
--msgid "echo requests: %d"
-+#: ../statistics.c:95
-+#, fuzzy, c-format
-+msgid "echo requests: %u"
- msgstr "requêtes echo: %d"
- 
--#: ../statistics.c:94 ../statistics.c:107
--#, c-format
--msgid "echo replies: %d"
-+#: ../statistics.c:96 ../statistics.c:109
-+#, fuzzy, c-format
-+msgid "echo replies: %u"
- msgstr "réponses echo: %d"
- 
--#: ../statistics.c:95
--#, c-format
--msgid "timestamp request: %d"
-+#: ../statistics.c:97
-+#, fuzzy, c-format
-+msgid "timestamp request: %u"
- msgstr "requêtes datées: %d"
- 
--#: ../statistics.c:96
--#, c-format
--msgid "timestamp reply: %d"
-+#: ../statistics.c:98
-+#, fuzzy, c-format
-+msgid "timestamp reply: %u"
- msgstr "réponses datées: %d"
- 
--#: ../statistics.c:97
--#, c-format
--msgid "address mask request: %d"
-+#: ../statistics.c:99
-+#, fuzzy, c-format
-+msgid "address mask request: %u"
- msgstr "requêtes de masque d'adresse: %d"
- 
- #. ?
--#: ../statistics.c:98
--msgid "address mask replies"
--msgstr "réponses de masque d'adresses"
-+#: ../statistics.c:100 ../statistics.c:113
-+#, fuzzy, c-format
-+msgid "address mask replies: %u"
-+msgstr "réponses de masque d'adresse: %d"
- 
- #. ?
--#: ../statistics.c:99
--#, c-format
--msgid "%d ICMP messages sent"
-+#: ../statistics.c:101
-+#, fuzzy, c-format
-+msgid "%u ICMP messages sent"
- msgstr "%d messages ICMP envoyés"
- 
--#: ../statistics.c:100
--#, c-format
--msgid "%d ICMP messages failed"
-+#: ../statistics.c:102
-+#, fuzzy, c-format
-+msgid "%u ICMP messages failed"
- msgstr "%d messages ICMP en échec"
- 
--#: ../statistics.c:102
--#, c-format
--msgid "time exceeded: %d"
-+#: ../statistics.c:104
-+#, fuzzy, c-format
-+msgid "time exceeded: %u"
- msgstr "temps dépassé: %d"
- 
- #. ?
--#: ../statistics.c:104
--#, c-format
--msgid "source quench: %d"
-+#: ../statistics.c:106
-+#, fuzzy, c-format
-+msgid "source quench: %u"
- msgstr "Source Quench: %d"
- 
--#: ../statistics.c:105
--#, c-format
--msgid "redirect: %d"
-+#: ../statistics.c:107
-+#, fuzzy, c-format
-+msgid "redirect: %u"
- msgstr "redirection: %d"
- 
--#: ../statistics.c:106
--#, c-format
--msgid "echo request: %d"
-+#: ../statistics.c:108
-+#, fuzzy, c-format
-+msgid "echo request: %u"
- msgstr "requête echo: %d"
- 
--#: ../statistics.c:108
--#, c-format
--msgid "timestamp requests: %d"
-+#: ../statistics.c:110
-+#, fuzzy, c-format
-+msgid "timestamp requests: %u"
- msgstr "requêtes datées: %d"
- 
--#: ../statistics.c:109
--#, c-format
--msgid "timestamp replies: %d"
-+#: ../statistics.c:111
-+#, fuzzy, c-format
-+msgid "timestamp replies: %u"
- msgstr "réponses datées: %d"
- 
--#: ../statistics.c:110
--#, c-format
--msgid "address mask requests: %d"
-+#: ../statistics.c:112
-+#, fuzzy, c-format
-+msgid "address mask requests: %u"
- msgstr "requêtes de masque d'adresse: %d"
- 
--#: ../statistics.c:111
--#, c-format
--msgid "address mask replies: %d"
--msgstr "réponses de masque d'adresse: %d"
--
--#: ../statistics.c:116
-+#: ../statistics.c:118
- #, c-format
- msgid "RTO algorithm is %s"
- msgstr "algorithme RTO est %s"
- 
--#: ../statistics.c:120
--#, c-format
--msgid "%d active connections openings"
-+#: ../statistics.c:122
-+#, fuzzy, c-format
-+msgid "%u active connections openings"
- msgstr "%d ouvertures de connexions actives"
- 
--#: ../statistics.c:121
--#, c-format
--msgid "%d passive connection openings"
-+#: ../statistics.c:123
-+#, fuzzy, c-format
-+msgid "%u passive connection openings"
- msgstr "%d ouvertures de connexions passives"
- 
--#: ../statistics.c:122
--#, c-format
--msgid "%d failed connection attempts"
-+#: ../statistics.c:124
-+#, fuzzy, c-format
-+msgid "%u failed connection attempts"
- msgstr "%d tentatives de connexion échouées"
- 
--#: ../statistics.c:123
--#, c-format
--msgid "%d connection resets received"
-+#: ../statistics.c:125
-+#, fuzzy, c-format
-+msgid "%u connection resets received"
- msgstr "%d réinitialisations de connexions reçues"
- 
--#: ../statistics.c:124
--#, c-format
--msgid "%d connections established"
-+#: ../statistics.c:126
-+#, fuzzy, c-format
-+msgid "%u connections established"
- msgstr "%d connexions établies"
- 
--#: ../statistics.c:125
--#, c-format
--msgid "%d segments received"
-+#: ../statistics.c:127
-+#, fuzzy, c-format
-+msgid "%u segments received"
- msgstr "%d segments reçus"
- 
--#: ../statistics.c:126
--#, c-format
--msgid "%d segments send out"
-+#: ../statistics.c:128
-+#, fuzzy, c-format
-+msgid "%u segments send out"
- msgstr "%d segments envoyés"
- 
--#: ../statistics.c:127
--#, c-format
--msgid "%d segments retransmited"
-+#: ../statistics.c:129
-+#, fuzzy, c-format
-+msgid "%u segments retransmited"
- msgstr "%d segments retransmis"
- 
--#: ../statistics.c:128
--#, c-format
--msgid "%d bad segments received."
-+#: ../statistics.c:130
-+#, fuzzy, c-format
-+msgid "%u bad segments received."
- msgstr "%d mauvais segments reçus."
- 
--#: ../statistics.c:129
--#, c-format
--msgid "%d resets sent"
-+#: ../statistics.c:131
-+#, fuzzy, c-format
-+msgid "%u resets sent"
- msgstr "%d réinitialisations envoyées"
- 
--#: ../statistics.c:134
--#, c-format
--msgid "%d packets received"
-+#: ../statistics.c:136
-+#, fuzzy, c-format
-+msgid "%u packets received"
- msgstr "%d paquets reçus"
- 
--#: ../statistics.c:135
--#, c-format
--msgid "%d packets to unknown port received."
-+#: ../statistics.c:137
-+#, fuzzy, c-format
-+msgid "%u packets to unknown port received."
- msgstr "%d paquets reçus pour un port inconnu"
- 
--#: ../statistics.c:136
--#, c-format
--msgid "%d packet receive errors"
-+#: ../statistics.c:138
-+#, fuzzy, c-format
-+msgid "%u packet receive errors"
- msgstr "%d erreurs en réception de paquets"
- 
--#: ../statistics.c:137
-+#: ../statistics.c:139
-+#, fuzzy, c-format
-+msgid "%u packets sent"
-+msgstr "%d paquets envoyés"
-+
-+#: ../statistics.c:144
-+#, fuzzy, c-format
-+msgid "%u SYN cookies sent"
-+msgstr "%d SYN-Cookies reçus"
-+
-+#: ../statistics.c:145
-+#, fuzzy, c-format
-+msgid "%u SYN cookies received"
-+msgstr "%d SYN-Cookies reçus"
-+
-+#: ../statistics.c:146
-+#, fuzzy, c-format
-+msgid "%u invalid SYN cookies received"
-+msgstr "%d SYN-Cookies reçus incorrects"
-+
-+#: ../statistics.c:148
-+#, fuzzy, c-format
-+msgid "%u resets received for embryonic SYN_RECV sockets"
-+msgstr "%d réinitialisations reçues pour sockets SYN_RECV embryonnaires"
-+
-+#: ../statistics.c:150
-+#, fuzzy, c-format
-+msgid "%u packets pruned from receive queue because of socket buffer overrun"
-+msgstr "%d paquets supprimés de la file de réception en raison de tampon de sockets plein"
-+
-+#. obsolete: 2.2.0 doesn't do that anymore
-+#: ../statistics.c:153
-+#, fuzzy, c-format
-+msgid "%u packets pruned from receive queue"
-+msgstr "%d paquets supprimés de la file hors service"
-+
-+#: ../statistics.c:154
-+#, fuzzy, c-format
-+msgid ""
-+"%u packets dropped from out-of-order queue because of socket buffer overrun"
-+msgstr "%d paquets jetés de la file hors service en raison de tampon de sockets plein"
-+
-+#: ../statistics.c:156
-+#, fuzzy, c-format
-+msgid "%u ICMP packets dropped because they were out-of-window"
-+msgstr "%d ICMP paquets jetés car hors de la fenêtre"
-+
-+#: ../statistics.c:158
-+#, fuzzy, c-format
-+msgid "%u ICMP packets dropped because socket was locked"
-+msgstr "%d paquets ICMP jetés car la socket a été vérouillée"
-+
-+#: ../statistics.c:160
- #, c-format
--msgid "%d packets sent"
-+msgid "%u TCP sockets finished time wait in fast timer"
-+msgstr ""
-+
-+#: ../statistics.c:161
-+#, c-format
-+msgid "%u time wait sockets recycled by time stamp"
-+msgstr ""
-+
-+#: ../statistics.c:162
-+#, c-format
-+msgid "%u TCP sockets finished time wait in slow timer"
-+msgstr ""
-+
-+#: ../statistics.c:163
-+#, c-format
-+msgid "%u passive connections rejected because of time stamp"
-+msgstr ""
-+
-+#: ../statistics.c:165
-+#, c-format
-+msgid "%u active connections rejected because of time stamp"
-+msgstr ""
-+
-+#: ../statistics.c:167
-+#, c-format
-+msgid "%u packets rejects in established connections because of timestamp"
-+msgstr ""
-+
-+#: ../statistics.c:169
-+#, fuzzy, c-format
-+msgid "%u delayed acks sent"
- msgstr "%d paquets envoyés"
- 
--#: ../statistics.c:142
-+#: ../statistics.c:170
- #, c-format
--msgid "%d SYN cookies sent"
-+msgid "%u delayed acks further delayed because of locked socket"
- msgstr ""
- 
--#: ../statistics.c:143
-+#: ../statistics.c:172
- #, c-format
--msgid "%d SYN cookies received"
--msgstr "%d SYN-Cookies reçus"
-+msgid "Quick ack mode was activated %u times"
-+msgstr ""
- 
--#: ../statistics.c:144
-+#: ../statistics.c:173
- #, c-format
--msgid "%d invalid SYN cookies received"
--msgstr "%d SYN-Cookies reçus incorrects"
-+msgid "%u times the listen queue of a socket overflowed"
-+msgstr ""
- 
--#: ../statistics.c:146
-+#: ../statistics.c:175
- #, c-format
--msgid "%d resets received for embryonic SYN_RECV sockets"
--msgstr "%d réinitialisations reçues pour sockets SYN_RECV embryonnaires"
-+msgid "%u SYNs to LISTEN sockets ignored"
-+msgstr ""
- 
--#: ../statistics.c:148
-+#: ../statistics.c:176
- #, c-format
--msgid "%d packets pruned from receive queue because of socket buffer overrun"
-+msgid "%u packets directly queued to recvmsg prequeue."
- msgstr ""
--"%d paquets supprimés de la file de réception en raison de tampon de sockets "
--"plein"
- 
--#. obsolete: 2.2.0 doesn't do that anymore
--#: ../statistics.c:151
-+#: ../statistics.c:178
-+#, c-format
-+msgid "%u of bytes directly received from backlog"
-+msgstr ""
-+
-+#: ../statistics.c:180
- #, c-format
--msgid "%d packets pruned from out-of-order queue"
-+msgid "%u of bytes directly received from prequeue"
-+msgstr ""
-+
-+#: ../statistics.c:182
-+#, fuzzy, c-format
-+msgid "%u packets dropped from prequeue"
- msgstr "%d paquets supprimés de la file hors service"
- 
--#: ../statistics.c:152
-+#: ../statistics.c:183
-+#, fuzzy, c-format
-+msgid "%u packet headers predicted"
-+msgstr "%d paquets reçus"
-+
-+#: ../statistics.c:184
- #, c-format
--msgid ""
--"%d packets dropped from out-of-order queue because of socket buffer overrun"
-+msgid "%u packets header predicted and directly queued to user"
- msgstr ""
--"%d paquets jetés de la file hors service en raison de tampon de sockets plein"
- 
--#: ../statistics.c:154
-+#: ../statistics.c:186
- #, c-format
--msgid "%d ICMP packets dropped because they were out-of-window"
--msgstr "%d ICMP paquets jetés car hors de la fenêtre"
-+msgid "Ran %u times out of system memory during packet sending"
-+msgstr ""
- 
--#: ../statistics.c:156
-+#: ../statistics.c:188
-+#, fuzzy, c-format
-+msgid "%u acknowledgments not containing data received"
-+msgstr "%d paquets reçus pour un port inconnu"
-+
-+#: ../statistics.c:189
- #, c-format
--msgid "%d ICMP packets dropped because socket was locked"
--msgstr "%d paquets ICMP jetés car la socket a été vérouillée"
-+msgid "%u predicted acknowledgments"
-+msgstr ""
-+
-+#: ../statistics.c:190
-+#, c-format
-+msgid "%u times recovered from packet loss due to fast retransmit"
-+msgstr ""
-+
-+#: ../statistics.c:191
-+#, c-format
-+msgid "%u times recovered from packet loss due to SACK data"
-+msgstr ""
-+
-+#: ../statistics.c:192
-+#, fuzzy, c-format
-+msgid "%u bad SACKs received"
-+msgstr "%d mauvais segments reçus."
-+
-+#: ../statistics.c:193
-+#, c-format
-+msgid "Detected reordering %u times using FACK"
-+msgstr ""
-+
-+#: ../statistics.c:194
-+#, c-format
-+msgid "Detected reordering %u times using SACK"
-+msgstr ""
-+
-+#: ../statistics.c:195
-+#, c-format
-+msgid "Detected reordering %u times using time stamp"
-+msgstr ""
-+
-+#: ../statistics.c:196
-+#, c-format
-+msgid "Detected reordering %u times using reno fast retransmit"
-+msgstr ""
-+
-+#: ../statistics.c:197
-+#, c-format
-+msgid "%u congestion windows fully recovered"
-+msgstr ""
-+
-+#: ../statistics.c:198
-+#, c-format
-+msgid "%u congestion windows partially recovered using Hoe heuristic"
-+msgstr ""
-+
-+#: ../statistics.c:199
-+#, c-format
-+msgid "%u congestion window recovered using DSACK"
-+msgstr ""
-+
-+#: ../statistics.c:200
-+#, c-format
-+msgid "%u congestion windows recovered after partial ack"
-+msgstr ""
-+
-+#: ../statistics.c:201
-+#, fuzzy, c-format
-+msgid "%u retransmits lost"
-+msgstr "%d réinitialisations envoyées"
-+
-+#: ../statistics.c:202
-+#, c-format
-+msgid "%u timeouts after reno fast retransmit"
-+msgstr ""
-+
-+#: ../statistics.c:203
-+#, c-format
-+msgid "%u timeouts after SACK recovery"
-+msgstr ""
-+
-+#: ../statistics.c:204
-+#, c-format
-+msgid "%u timeouts in loss state"
-+msgstr ""
-+
-+#: ../statistics.c:205
-+#, fuzzy, c-format
-+msgid "%u fast retransmits"
-+msgstr "%d segments retransmis"
-+
-+#: ../statistics.c:206
-+#, c-format
-+msgid "%u forward retransmits"
-+msgstr ""
-+
-+#: ../statistics.c:207
-+#, c-format
-+msgid "%u retransmits in slow start"
-+msgstr ""
-+
-+#: ../statistics.c:208
-+#, c-format
-+msgid "%u other TCP timeouts"
-+msgstr ""
-+
-+#: ../statistics.c:209
-+#, fuzzy, c-format
-+msgid "%u reno fast retransmits failed"
-+msgstr "%d segments retransmis"
-+
-+#: ../statistics.c:210
-+#, fuzzy, c-format
-+msgid "%u sack retransmits failed"
-+msgstr "%d paquets mal réassemblés"
-+
-+#: ../statistics.c:211
-+#, c-format
-+msgid "%u times receiver scheduled too late for direct processing"
-+msgstr ""
-+
-+#: ../statistics.c:212
-+#, fuzzy, c-format
-+msgid "%u packets collapsed in receive queue due to low socket buffer"
-+msgstr "%d paquets supprimés de la file de réception en raison de tampon de sockets plein"
-+
-+#: ../statistics.c:213
-+#, c-format
-+msgid "%u DSACKs sent for old packets"
-+msgstr ""
-+
-+#: ../statistics.c:214
-+#, c-format
-+msgid "%u DSACKs sent for out of order packets"
-+msgstr ""
-+
-+#: ../statistics.c:215
-+#, fuzzy, c-format
-+msgid "%u DSACKs received"
-+msgstr "%d paquets reçus"
-+
-+#: ../statistics.c:216
-+#, fuzzy, c-format
-+msgid "%u DSACKs for out of order packets received"
-+msgstr "%d paquets totaux reçus"
-+
-+#: ../statistics.c:217
-+#, fuzzy, c-format
-+msgid "%u connections reset due to unexpected SYN"
-+msgstr "%d réinitialisations de connexions reçues"
-+
-+#: ../statistics.c:218
-+#, fuzzy, c-format
-+msgid "%u connections reset due to unexpected data"
-+msgstr "%d réinitialisations de connexions reçues"
-+
-+#: ../statistics.c:219
-+#, fuzzy, c-format
-+msgid "%u connections reset due to early user close"
-+msgstr "%d réinitialisations de connexions reçues"
-+
-+#: ../statistics.c:220
-+#, c-format
-+msgid "%u connections aborted due to memory pressure"
-+msgstr ""
-+
-+#: ../statistics.c:221
-+#, fuzzy, c-format
-+msgid "%u connections aborted due to timeout"
-+msgstr "%d réinitialisations de connexions reçues"
- 
- #: ../statistics.c:222
-+#, c-format
-+msgid "%u connections aborted after user close in linger timeout"
-+msgstr ""
-+
-+#: ../statistics.c:223
-+#, c-format
-+msgid "%u times unabled to send RST due to no memory"
-+msgstr ""
-+
-+#: ../statistics.c:224
-+#, c-format
-+msgid "TCP ran low on memory %u times"
-+msgstr ""
-+
-+#: ../statistics.c:225
-+#, c-format
-+msgid "%u TCP data loss events"
-+msgstr ""
-+
-+#: ../statistics.c:292
- msgid "enabled"
- msgstr "activée"
- 
--#: ../statistics.c:222
-+#: ../statistics.c:292
- msgid "disabled"
- msgstr "désactivée"
- 
--#: ../statistics.c:272
--#, c-format
--msgid "unknown title %s\n"
--msgstr "titre inconnu %s\n"
--
--#: ../statistics.c:298
-+#: ../statistics.c:375
- msgid "error parsing /proc/net/snmp"
- msgstr "erreur d'analyse de /proc/net/snmp"
- 
--#: ../statistics.c:311
-+#: ../statistics.c:388
- msgid "cannot open /proc/net/snmp"
- msgstr "ne peut ouvrir /proc/net/snmp"
- 
-@@ -1824,89 +2064,95 @@
- msgid "Cannot change line discipline to `%s'.\n"
- msgstr "Ne peut changer la discipline de ligne à `%s'.\n"
- 
--#: ../lib/af.c:145 ../lib/hw.c:148
-+#: ../lib/af.c:153 ../lib/hw.c:161
- msgid "UNSPEC"
- msgstr "UNSPEC"
- 
--#: ../lib/af.c:147
-+#: ../lib/af.c:155
- msgid "UNIX Domain"
- msgstr "Domaine UNIX"
- 
--#: ../lib/af.c:150
-+#: ../lib/af.c:158
- msgid "DARPA Internet"
- msgstr "DARPA Internet"
- 
--#: ../lib/af.c:153
-+#: ../lib/af.c:161
- msgid "IPv6"
- msgstr "IPv6"
- 
--#: ../lib/af.c:156 ../lib/hw.c:169
-+#: ../lib/af.c:164 ../lib/hw.c:182
- msgid "AMPR AX.25"
- msgstr "AMPR AX.25"
- 
--#: ../lib/af.c:159 ../lib/hw.c:175
-+#: ../lib/af.c:167 ../lib/hw.c:188
- msgid "AMPR NET/ROM"
- msgstr "AMPR NET/ROM"
- 
--#: ../lib/af.c:162
-+#: ../lib/af.c:170
- msgid "Novell IPX"
- msgstr ""
- 
--#: ../lib/af.c:165
-+#: ../lib/af.c:173
- msgid "Appletalk DDP"
- msgstr "Appletalk DDP"
- 
--#: ../lib/af.c:168 ../lib/hw.c:207
-+#: ../lib/af.c:176 ../lib/hw.c:223
- msgid "Econet"
- msgstr "Econet"
- 
--#: ../lib/af.c:171 ../lib/hw.c:172
-+#: ../lib/af.c:179
-+msgid "CCITT X.25"
-+msgstr ""
-+
-+#: ../lib/af.c:182 ../lib/hw.c:185
- msgid "AMPR ROSE"
- msgstr "AMPR ROSE"
- 
--#: ../lib/af.c:174 ../lib/hw.c:160
-+#: ../lib/af.c:185 ../lib/hw.c:173
- msgid "Ash"
- msgstr "Ash"
- 
--#: ../lib/af.c:232
-+#: ../lib/af.c:243
-+#, c-format
- msgid "Please don't supply more than one address family.\n"
- msgstr "Ne fournissez pas plus d'une famille d'adresses SVP.\n"
- 
--#: ../lib/af.c:293
-+#: ../lib/af.c:304
-+#, c-format
- msgid "Too much address family arguments.\n"
- msgstr "Trop d'arguments de familles d'adresses.\n"
- 
--#: ../lib/af.c:304
-+#: ../lib/af.c:315
- #, c-format
- msgid "Unknown address family `%s'.\n"
- msgstr "Famille d'adresses inconnue `%s'.\n"
- 
--#: ../lib/arcnet.c:53 ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52
--#: ../lib/fddi.c:67 ../lib/hippi.c:68 ../lib/inet.c:244 ../lib/inet.c:259
--#: ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ../lib/rose.c:71
--#: ../lib/rose.c:126 ../lib/unix.c:56 ../lib/unix.c:76
--msgid "[NONE SET]"
--msgstr "[INDEFINI]"
--
--#: ../lib/arcnet.c:81 ../lib/arcnet.c:96
-+#: ../lib/arcnet.c:70 ../lib/arcnet.c:85
- #, c-format
- msgid "in_arcnet(%s): invalid arcnet address!\n"
- msgstr "in_arcnet(%s): adresse arcnet invalide !\n"
- 
--#: ../lib/arcnet.c:108
-+#: ../lib/arcnet.c:97
- #, c-format
- msgid "in_arcnet(%s): trailing : ignored!\n"
- msgstr "in_arcnet(%s): restant : ignoré !\n"
- 
--#: ../lib/arcnet.c:120
-+#: ../lib/arcnet.c:109
- #, c-format
- msgid "in_arcnet(%s): trailing junk!\n"
- msgstr "in_arcnet(%s): le restant à la poubelle !\n"
- 
- #: ../lib/ash.c:81
-+#, c-format
- msgid "Malformed Ash address"
- msgstr "Adresse Ash malformée"
- 
-+#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244
-+#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78
-+#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76
-+msgid "[NONE SET]"
-+msgstr "[INDEFINI]"
-+
- #: ../lib/ax25.c:97 ../lib/netrom.c:100
- msgid "Invalid callsign"
- msgstr "Signal d'appel invalide"
-@@ -1916,22 +2162,21 @@
- msgstr "Signal d'appel trop long"
- 
- #: ../lib/ax25_gr.c:47
-+#, c-format
- msgid "AX.25 not configured in this system.\n"
- msgstr "AX.25 pas configuré sur ce système.\n"
- 
- #: ../lib/ax25_gr.c:50
-+#, c-format
- msgid "Kernel AX.25 routing table\n"
- msgstr "Table de routage AX.25 du noyau\n"
- 
- #. xxx
- #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
-+#, c-format
- msgid "Destination  Iface    Use\n"
- msgstr "Destination  Iface    Utilisation\n"
- 
--#: ../lib/ddp_gr.c:21
--msgid "Routing table for `ddp' not yet supported.\n"
--msgstr "Table de routage pour `ddp' pas encore supporté.\n"
--
- #: ../lib/ether.c:74 ../lib/ether.c:91
- #, c-format
- msgid "in_ether(%s): invalid ether address!\n"
-@@ -1947,153 +2192,171 @@
- msgid "in_ether(%s): trailing junk!\n"
- msgstr "in_ether(%s): le restant à la poubelle !\n"
- 
--#: ../lib/fddi.c:95 ../lib/fddi.c:110
-+#: ../lib/fddi.c:84 ../lib/fddi.c:99
- #, c-format
- msgid "in_fddi(%s): invalid fddi address!\n"
- msgstr "in_fddi(%s): adresse fddi invalide!\n"
- 
--#: ../lib/fddi.c:122
-+#: ../lib/fddi.c:111
- #, c-format
- msgid "in_fddi(%s): trailing : ignored!\n"
- msgstr "in_fddi(%s): restant ignoré !\n"
- 
--#: ../lib/fddi.c:134
-+#: ../lib/fddi.c:123
- #, c-format
- msgid "in_fddi(%s): trailing junk!\n"
- msgstr "in_fddi(%s): le restant à la poubelle !\n"
- 
--#: ../lib/getroute.c:97 ../lib/setroute.c:76
-+#: ../lib/getroute.c:101 ../lib/setroute.c:80
- #, c-format
- msgid "Address family `%s' not supported.\n"
- msgstr "Famille d'adresses `%s' non supportée.\n"
- 
--#: ../lib/getroute.c:103 ../lib/setroute.c:80
-+#: ../lib/getroute.c:107 ../lib/setroute.c:84
- #, c-format
- msgid "No routing for address family `%s'.\n"
- msgstr "Pas de routage pour la famille d'adresses `%s'.\n"
- 
--#: ../lib/hippi.c:96 ../lib/hippi.c:111
-+#: ../lib/hippi.c:84 ../lib/hippi.c:99
- #, c-format
- msgid "in_hippi(%s): invalid hippi address!\n"
- msgstr "in_hippi(%s): adresse hippi invalide!\n"
- 
--#: ../lib/hippi.c:123
-+#: ../lib/hippi.c:111
- #, c-format
- msgid "in_hippi(%s): trailing : ignored!\n"
- msgstr "in_hippi(%s): restant ignoré !\n"
- 
--#: ../lib/hippi.c:134
-+#: ../lib/hippi.c:122
- #, c-format
- msgid "in_hippi(%s): trailing junk!\n"
- msgstr "in_hippi(%s): le restant à la poubelle !\n"
- 
--#: ../lib/hw.c:147
-+#: ../lib/hw.c:160
- msgid "Local Loopback"
- msgstr "Boucle locale"
- 
--#: ../lib/hw.c:150
-+#: ../lib/hw.c:163
- msgid "Serial Line IP"
- msgstr "IP ligne série"
- 
--#: ../lib/hw.c:151
-+#: ../lib/hw.c:164
- msgid "VJ Serial Line IP"
- msgstr "IP ligne série - VJ "
- 
--#: ../lib/hw.c:152
-+#: ../lib/hw.c:165
- msgid "6-bit Serial Line IP"
- msgstr "IP ligne série - 6 bits"
- 
--#: ../lib/hw.c:153
-+#: ../lib/hw.c:166
- msgid "VJ 6-bit Serial Line IP"
- msgstr "IP ligne série - 6 bits VJ"
- 
--#: ../lib/hw.c:154
-+#: ../lib/hw.c:167
- msgid "Adaptive Serial Line IP"
- msgstr "IP ligne série adaptative"
- 
--#: ../lib/hw.c:157
-+#: ../lib/hw.c:170
- msgid "Ethernet"
- msgstr "Ethernet"
- 
--#: ../lib/hw.c:163
-+#: ../lib/hw.c:176
- msgid "Fiber Distributed Data Interface"
- msgstr "Fiber Distributed Data Interface"
- 
--#: ../lib/hw.c:166
-+#: ../lib/hw.c:179
- msgid "HIPPI"
- msgstr "HIPPI"
- 
--#: ../lib/hw.c:178
-+#: ../lib/hw.c:191
-+msgid "generic X.25"
-+msgstr ""
-+
-+#: ../lib/hw.c:194
- msgid "IPIP Tunnel"
- msgstr "IPIP Tunnel"
- 
--#: ../lib/hw.c:181
-+#: ../lib/hw.c:197
- msgid "Point-to-Point Protocol"
- msgstr "Protocole Point-à-Point"
- 
--#: ../lib/hw.c:184
-+#: ../lib/hw.c:200
- msgid "(Cisco)-HDLC"
- msgstr "(Cisco)-HDLC"
- 
--#: ../lib/hw.c:185
-+#: ../lib/hw.c:201
- msgid "LAPB"
- msgstr "LAPB"
- 
--#: ../lib/hw.c:188
-+#: ../lib/hw.c:204
- msgid "ARCnet"
- msgstr "ARCnet"
- 
--#: ../lib/hw.c:191
-+#: ../lib/hw.c:207
- msgid "Frame Relay DLCI"
- msgstr "Frame Relay DLCI"
- 
--#: ../lib/hw.c:192
-+#: ../lib/hw.c:208
- msgid "Frame Relay Access Device"
- msgstr "Périphériue d'accès Frame Relay"
- 
--#: ../lib/hw.c:195
-+#: ../lib/hw.c:211
- msgid "IPv6-in-IPv4"
- msgstr "IPv6-dans-IPv4"
- 
--#: ../lib/hw.c:198
-+#: ../lib/hw.c:214
- #, fuzzy
- msgid "IrLAP"
- msgstr "LAPB"
- 
--#: ../lib/hw.c:201
-+#: ../lib/hw.c:217
- msgid "16/4 Mbps Token Ring"
- msgstr ""
- 
--#: ../lib/hw.c:203
-+#: ../lib/hw.c:219
- msgid "16/4 Mbps Token Ring (New)"
- msgstr ""
- 
-+#: ../lib/hw.c:226
-+msgid "Generic EUI-64"
-+msgstr ""
-+
- #: ../lib/inet.c:153 ../lib/inet6.c:79
- #, c-format
- msgid "rresolve: unsupport address family %d !\n"
- msgstr "rresolve: famille d'adresses non suportée %d !\n"
- 
--#: ../lib/inet6_gr.c:79
-+#: ../lib/inet6.c:131
-+#, fuzzy
-+msgid "[UNKNOWN]"
-+msgstr "INCONNU"
-+
-+#: ../lib/inet6_gr.c:71
-+#, c-format
- msgid "INET6 (IPv6) not configured in this system.\n"
- msgstr "INET6 (IPv6) pas configuré sur ce système.\n"
- 
--#: ../lib/inet6_gr.c:82
-+#: ../lib/inet6_gr.c:74
-+#, c-format
- msgid "Kernel IPv6 routing table\n"
- msgstr "Table de routage IPv6 du noyau\n"
- 
--#: ../lib/inet6_gr.c:84
-+#: ../lib/inet6_gr.c:76
-+#, c-format
- msgid ""
--"Destination                                 Next Hop                         "
--"       Flags Metric Ref    Use Iface\n"
-+"Destination                                 Next "
-+"Hop                                Flags Metric Ref    Use Iface\n"
- msgstr ""
--"Destination                                 Prochain Hop                     "
--"       Indic Metric Ref    Utilis. Iface\n"
-+"Destination                                 Prochain "
-+"Hop                            Indic Metric Ref    Utilis. Iface\n"
- 
--#: ../lib/inet6_gr.c:158
-+#: ../lib/inet6_gr.c:150
-+#, c-format
- msgid "Kernel IPv6 Neighbour Cache\n"
- msgstr "Cache voisin IPv6 du noyau\n"
- 
--#: ../lib/inet6_gr.c:161
-+#: ../lib/inet6_gr.c:153
-+#, c-format
- msgid ""
- "Neighbour                                   HW Address        Iface    Flags "
- "Ref State\n"
-@@ -2101,39 +2364,45 @@
- "Voisin                                      Adresse MAT       Iface    Indic "
- "Ref Etat\n"
- 
--#: ../lib/inet6_gr.c:165
-+#: ../lib/inet6_gr.c:157
-+#, c-format
- msgid ""
- "Neighbour                                   HW Address        Iface    Flags "
- "Ref State            Stale(sec) Delete(sec)\n"
--msgstr ""
--"Voisin                                      Adresse MAT       Iface    Indic "
--"Ref Etat             Bloqué(sec) Détuit(sec)\n"
-+msgstr "Voisin                                      Adresse MAT       Iface    Indic Ref Etat             Bloqué(sec) Détuit(sec)\n"
- 
- #: ../lib/inet6_sr.c:46
-+#, c-format
- msgid "Usage: inet6_route [-vF] del Target\n"
- msgstr "Syntaxe: inet6_route [-vF] del Cible\n"
- 
- #: ../lib/inet6_sr.c:47
-+#, c-format
- msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
- msgstr "       inet6_route [-vF] add Cible [gw Gw] [metric M] [[dev] If]\n"
- 
- #: ../lib/inet6_sr.c:48
-+#, c-format
- msgid "       inet6_route [-FC] flush      NOT supported\n"
- msgstr "       inet6_route [-FC] flush      PAS supporté\n"
- 
--#: ../lib/inet6_sr.c:182
-+#: ../lib/inet6_sr.c:188
-+#, c-format
- msgid "Flushing `inet6' routing table not supported\n"
- msgstr "Flush de table de routage `inet6' pas supporté\n"
- 
- #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
-+#, c-format
- msgid "INET (IPv4) not configured in this system.\n"
- msgstr "INET (IPv4) pas configuré sur ce système.\n"
- 
- #: ../lib/inet_gr.c:53
-+#, c-format
- msgid "Kernel IP routing table\n"
- msgstr "Table de routage IP du noyau\n"
- 
- #: ../lib/inet_gr.c:56
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags Metric Ref    Use "
- "Iface\n"
-@@ -2142,26 +2411,26 @@
- "Iface\n"
- 
- #: ../lib/inet_gr.c:59
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags   MSS Window  irtt "
- "Iface\n"
--msgstr ""
--"Destination     Passerelle      Genmask         Indic   MSS Fenêtre irtt "
--"Iface\n"
-+msgstr "Destination     Passerelle      Genmask         Indic   MSS Fenêtre irtt Iface\n"
- 
- #: ../lib/inet_gr.c:62
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt\n"
--msgstr ""
--"Destination     Passerelle      Genmask         Indic Metric Ref    Use "
--"Iface    MSS  Fenêtre irtt\n"
-+msgstr "Destination     Passerelle      Genmask         Indic Metric Ref    Use Iface    MSS  Fenêtre irtt\n"
- 
- #: ../lib/inet_gr.c:237
-+#, c-format
- msgid "Kernel IP routing cache\n"
- msgstr "cache de routage IP du noyau\n"
- 
- #: ../lib/inet_gr.c:258
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface\n"
-@@ -2170,30 +2439,28 @@
- "Iface\n"
- 
- #: ../lib/inet_gr.c:261
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags   MSS Window  irtt "
- "Iface\n"
--msgstr ""
--"Source          Destination     Passerelle      Indic   MSS Fenêtre irtt "
--"Iface\n"
-+msgstr "Source          Destination     Passerelle      Indic   MSS Fenêtre irtt Iface\n"
- 
- #: ../lib/inet_gr.c:266
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt  HH  Arp\n"
--msgstr ""
--"Source          Destination     Passerelle      Indic Metric Ref    Use "
--"Iface    MSS  Fenêtre irtt  HH  Arp\n"
-+msgstr "Source          Destination     Passerelle      Indic Metric Ref    Use Iface    MSS  Fenêtre irtt  HH  Arp\n"
- 
- #: ../lib/inet_gr.c:290
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
--msgstr ""
--"Source          Destination     Passerelle      Flags Metric Ref    Use "
--"Iface    MSS  Fenêtre irtt  TOS HHRef HHUptod     SpecDst\n"
-+msgstr "Source          Destination     Passerelle      Flags Metric Ref    Use Iface    MSS  Fenêtre irtt  TOS HHRef HHUptod     SpecDst\n"
- 
--#: ../lib/inet_sr.c:50
-+#: ../lib/inet_sr.c:51
-+#, c-format
- msgid ""
- "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
- "[[dev] If]\n"
-@@ -2201,29 +2468,34 @@
- "Syntaxe: inet_route [-vF] del {-host|-net} Cible[/prefix] [gw Gw] [metric M] "
- "[[dev] If]\n"
- 
--#: ../lib/inet_sr.c:51
-+#: ../lib/inet_sr.c:52
-+#, c-format
- msgid ""
- "       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
- msgstr ""
- "       inet_route [-vF] add {-host|-net} Cible[/prefix] [gw Gw] [metric M]\n"
- 
--#: ../lib/inet_sr.c:52
-+#: ../lib/inet_sr.c:53
-+#, c-format
- msgid ""
- "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
- msgstr ""
- "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
- 
--#: ../lib/inet_sr.c:53
-+#: ../lib/inet_sr.c:54
-+#, c-format
- msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
- msgstr "                              [mod] [dyn] [reinstate] [[dev] If]\n"
- 
--#: ../lib/inet_sr.c:54
-+#: ../lib/inet_sr.c:55
-+#, c-format
- msgid ""
- "       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
- msgstr ""
- "       inet_route [-vF] add {-host|-net} Cible[/prefix] [metric M] reject\n"
- 
--#: ../lib/inet_sr.c:55
-+#: ../lib/inet_sr.c:56
-+#, c-format
- msgid "       inet_route [-FC] flush      NOT supported\n"
- msgstr "       inet_route [-FC] flush      PAS supporté\n"
- 
-@@ -2233,15 +2505,17 @@
- msgstr "route: %s: ne peut utiliser un RESEAU comme passerelle!\n"
- 
- #: ../lib/inet_sr.c:174
--#, fuzzy
-+#, fuzzy, c-format
- msgid "route: Invalid MSS/MTU.\n"
- msgstr "route: MSS invalide.\n"
- 
- #: ../lib/inet_sr.c:187
-+#, c-format
- msgid "route: Invalid window.\n"
- msgstr "route: fenêtre invalide.\n"
- 
- #: ../lib/inet_sr.c:203
-+#, c-format
- msgid "route: Invalid initial rtt.\n"
- msgstr "route: rtt initial invalide.\n"
- 
-@@ -2256,75 +2530,92 @@
- msgstr "route: netmask bogué %s\n"
- 
- #: ../lib/inet_sr.c:270
-+#, c-format
- msgid "route: netmask doesn't match route address\n"
- msgstr "route: netmask ne correspond pas à l'adresse de route\n"
- 
- #: ../lib/inet_sr.c:306
-+#, c-format
- msgid "Flushing `inet' routing table not supported\n"
- msgstr "Flush de table de routage `inet' pas supporté\n"
- 
- #: ../lib/inet_sr.c:310
-+#, c-format
- msgid "Modifying `inet' routing cache not supported\n"
- msgstr "Modification de cache de routage `inet' pas supporté\n"
- 
- #: ../lib/ipx_gr.c:52
-+#, c-format
- msgid "IPX not configured in this system.\n"
- msgstr "IPX pas configuré sur ce système.\n"
- 
- #: ../lib/ipx_gr.c:56
-+#, c-format
- msgid "Kernel IPX routing table\n"
- msgstr "Table de routage IPX du noyau\n"
- 
- #. xxx
- #: ../lib/ipx_gr.c:57
-+#, c-format
- msgid "Destination               Router Net                Router Node\n"
- msgstr "Destination               Réseau Routeur            Noeud Routeur\n"
- 
- #: ../lib/ipx_sr.c:33
-+#, c-format
- msgid "IPX: this needs to be written\n"
- msgstr "IPX: ceci doit être écrit\n"
- 
--#: ../lib/masq_info.c:197
-+#: ../lib/masq_info.c:198
-+#, c-format
- msgid "IP masquerading entries\n"
- msgstr "Entrées IP Masquerade\n"
- 
--#: ../lib/masq_info.c:200
-+#: ../lib/masq_info.c:201
-+#, c-format
- msgid "prot   expire source               destination          ports\n"
- msgstr "prot   expire source               destination          ports\n"
- 
--#: ../lib/masq_info.c:203
-+#: ../lib/masq_info.c:204
-+#, c-format
- msgid ""
--"prot   expire    initseq delta prevd source               destination        "
--"  ports\n"
-+"prot   expire    initseq delta prevd source               "
-+"destination          ports\n"
- msgstr ""
--"prot   expire    initseq delta precd source               destination        "
--"  ports\n"
-+"prot   expire    initseq delta precd source               "
-+"destination          ports\n"
- 
- #: ../lib/netrom_gr.c:48
-+#, c-format
- msgid "NET/ROM not configured in this system.\n"
- msgstr "NET/ROM pas configuré sur ce système.\n"
- 
- #: ../lib/netrom_gr.c:51
-+#, c-format
- msgid "Kernel NET/ROM routing table\n"
- msgstr "Table de routage NET/ROM du noyau\n"
- 
- #: ../lib/netrom_gr.c:52
-+#, c-format
- msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
- msgstr "Destination  Mnemoniq  Qualité  Voisin     Iface\n"
- 
- #: ../lib/netrom_sr.c:34
-+#, c-format
- msgid "netrom usage\n"
- msgstr "utilisation netrom\n"
- 
- #: ../lib/netrom_sr.c:44
-+#, c-format
- msgid "NET/ROM: this needs to be written\n"
- msgstr "NET/ROM: ceci doit être écrit\n"
- 
- #: ../lib/ppp.c:44
-+#, c-format
- msgid "You cannot start PPP with this program.\n"
- msgstr "Vous ne pouvez démarrer PPP avec ce programme.\n"
- 
- #: ../lib/ppp_ac.c:38
-+#, c-format
- msgid "Sorry, use pppd!\n"
- msgstr "Désolé, utilisez pppd !\n"
- 
-@@ -2333,49 +2624,314 @@
- msgstr "L'adresse de noeud doit avoir 10 chiffres"
- 
- #: ../lib/rose_gr.c:51
-+#, c-format
- msgid "ROSE not configured in this system.\n"
- msgstr "ROSE pas configuré sur ce système.\n"
- 
- #: ../lib/rose_gr.c:54
-+#, c-format
- msgid "Kernel ROSE routing table\n"
- msgstr "Table de routage ROSE du noyau\n"
- 
--#: ../lib/tr.c:70 ../lib/tr.c:85
-+#: ../lib/tr.c:86 ../lib/tr.c:101
- #, c-format
- msgid "in_tr(%s): invalid token ring address!\n"
- msgstr "in_tr(%s): adresse token-ring invalide !\n"
- 
--#: ../lib/tr.c:97
-+#: ../lib/tr.c:113
- #, c-format
- msgid "in_tr(%s): trailing : ignored!\n"
- msgstr "in_tr(%s): restant : ignoré !\n"
- 
--#: ../lib/tr.c:109
-+#: ../lib/tr.c:125
- #, c-format
- msgid "in_tr(%s): trailing junk!\n"
- msgstr "in_tr(%s): restant à la poubelle !\n"
- 
--#: ../lib/interface.c:124
-+#: ../lib/interface.c:176
- #, c-format
- msgid "warning: no inet socket available: %s\n"
- msgstr "attention: pas de socket inet disponible: %s\n"
- 
--#: ../lib/interface.c:270
-+#: ../lib/interface.c:325
- #, c-format
- msgid "Warning: cannot open %s (%s). Limited output.\n"
- msgstr ""
- 
- #. Give better error message for this case.
--#: ../lib/interface.c:504
-+#: ../lib/interface.c:571
- msgid "Device not found"
- msgstr "Périphérique non trouvé"
- 
--#: ../lib/interface.c:508
-+#: ../lib/interface.c:575
- #, c-format
- msgid "%s: error fetching interface information: %s\n"
- msgstr "%s: erreur lors de la recherche d'infos sur l'interface: %s\n"
- 
--#: ../lib/sockets.c:59
-+#: ../lib/interface.c:608
-+msgid "     - no statistics available -"
-+msgstr ""
-+
-+#: ../lib/interface.c:612
-+#, c-format
-+msgid "[NO FLAGS]"
-+msgstr "[PAS INDICATEURS]"
-+
-+#: ../lib/interface.c:688
-+#, c-format
-+msgid "%-9.9s Link encap:%s  "
-+msgstr "%-9.9s Lien encap:%s  "
-+
-+#: ../lib/interface.c:693
-+#, c-format
-+msgid "HWaddr %s  "
-+msgstr "HWaddr %s  "
-+
-+#: ../lib/interface.c:696
-+#, c-format
-+msgid "Media:%s"
-+msgstr "Media:%s"
-+
-+#: ../lib/interface.c:698
-+#, c-format
-+msgid "(auto)"
-+msgstr "(auto)"
-+
-+#: ../lib/interface.c:705
-+#, c-format
-+msgid "          %s addr:%s "
-+msgstr "          %s adr:%s "
-+
-+#: ../lib/interface.c:708
-+#, c-format
-+msgid " P-t-P:%s "
-+msgstr " P-t-P:%s "
-+
-+#: ../lib/interface.c:711
-+#, c-format
-+msgid " Bcast:%s "
-+msgstr " Bcast:%s "
-+
-+#: ../lib/interface.c:713
-+#, c-format
-+msgid " Mask:%s\n"
-+msgstr " Masque:%s\n"
-+
-+#: ../lib/interface.c:730
-+#, c-format
-+msgid "          inet6 addr: %s/%d"
-+msgstr "          adr inet6: %s/%d"
-+
-+#: ../lib/interface.c:732
-+#, c-format
-+msgid " Scope:"
-+msgstr " Scope:"
-+
-+#: ../lib/interface.c:735
-+#, c-format
-+msgid "Global"
-+msgstr "Global"
-+
-+#: ../lib/interface.c:738
-+#, c-format
-+msgid "Link"
-+msgstr "Lien"
-+
-+#: ../lib/interface.c:741
-+#, c-format
-+msgid "Site"
-+msgstr "Site"
-+
-+#: ../lib/interface.c:744
-+#, c-format
-+msgid "Compat"
-+msgstr "Compat"
-+
-+#: ../lib/interface.c:747
-+#, c-format
-+msgid "Host"
-+msgstr "Hôte"
-+
-+#: ../lib/interface.c:750
-+#, c-format
-+msgid "Unknown"
-+msgstr "Inconnu"
-+
-+#: ../lib/interface.c:765
-+#, c-format
-+msgid "          IPX/Ethernet II addr:%s\n"
-+msgstr "          adr IPX/Ethernet II:%s\n"
-+
-+#: ../lib/interface.c:768
-+#, c-format
-+msgid "          IPX/Ethernet SNAP addr:%s\n"
-+msgstr "          adr IPX/Ethernet SNAP:%s\n"
-+
-+#: ../lib/interface.c:771
-+#, c-format
-+msgid "          IPX/Ethernet 802.2 addr:%s\n"
-+msgstr "          adr IPX/Ethernet 802.2:%s\n"
-+
-+#: ../lib/interface.c:774
-+#, c-format
-+msgid "          IPX/Ethernet 802.3 addr:%s\n"
-+msgstr "          adr IPX/Ethernet 802.3:%s\n"
-+
-+#: ../lib/interface.c:784
-+#, c-format
-+msgid "          EtherTalk Phase 2 addr:%s\n"
-+msgstr "          adr EtherTalk Phase 2:%s\n"
-+
-+#: ../lib/interface.c:793
-+#, c-format
-+msgid "          econet addr:%s\n"
-+msgstr "          adr econet:%s\n"
-+
-+#: ../lib/interface.c:800
-+#, c-format
-+msgid "[NO FLAGS] "
-+msgstr "[PAS INDICATEURS] "
-+
-+#: ../lib/interface.c:802
-+#, c-format
-+msgid "UP "
-+msgstr "UP "
-+
-+#: ../lib/interface.c:804
-+#, c-format
-+msgid "BROADCAST "
-+msgstr "BROADCAST "
-+
-+#: ../lib/interface.c:806
-+#, c-format
-+msgid "DEBUG "
-+msgstr "DEBUG "
-+
-+#: ../lib/interface.c:808
-+#, c-format
-+msgid "LOOPBACK "
-+msgstr "LOOPBACK "
-+
-+#: ../lib/interface.c:810
-+#, c-format
-+msgid "POINTOPOINT "
-+msgstr "POINTOPOINT "
-+
-+#: ../lib/interface.c:812
-+#, c-format
-+msgid "NOTRAILERS "
-+msgstr "NOTRAILERS "
-+
-+#: ../lib/interface.c:814
-+#, c-format
-+msgid "RUNNING "
-+msgstr "RUNNING "
-+
-+#: ../lib/interface.c:816
-+#, c-format
-+msgid "NOARP "
-+msgstr "NOARP "
-+
-+#: ../lib/interface.c:818
-+#, c-format
-+msgid "PROMISC "
-+msgstr "PROMISC "
-+
-+#: ../lib/interface.c:820
-+#, c-format
-+msgid "ALLMULTI "
-+msgstr "ALLMULTI "
-+
-+#: ../lib/interface.c:822
-+#, c-format
-+msgid "SLAVE "
-+msgstr "SLAVE "
-+
-+#: ../lib/interface.c:824
-+#, c-format
-+msgid "MASTER "
-+msgstr "MASTER "
-+
-+#: ../lib/interface.c:826
-+#, c-format
-+msgid "MULTICAST "
-+msgstr "MULTICAST "
-+
-+#: ../lib/interface.c:829
-+#, c-format
-+msgid "DYNAMIC "
-+msgstr "DYNAMIC "
-+
-+#. DONT FORGET TO ADD THE FLAGS IN ife_print_short
-+#: ../lib/interface.c:832
-+#, c-format
-+msgid " MTU:%d  Metric:%d"
-+msgstr " MTU:%d  Metric:%d"
-+
-+#: ../lib/interface.c:836
-+#, c-format
-+msgid "  Outfill:%d  Keepalive:%d"
-+msgstr "  Outfill:%d  Keepalive:%d"
-+
-+#: ../lib/interface.c:850
-+#, fuzzy, c-format
-+msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
-+msgstr "Paquets Reçus:%lu erreurs:%lu jetés:%lu débordements:%lu trames:%lu\n"
-+
-+#: ../lib/interface.c:855
-+#, c-format
-+msgid "             compressed:%lu\n"
-+msgstr "             compressés:%lu\n"
-+
-+#: ../lib/interface.c:895
-+#, fuzzy, c-format
-+msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
-+msgstr "Paquets transmis:%lu erreurs:%lu jetés:%lu débordements:%lu carrier:%lu\n"
-+
-+#: ../lib/interface.c:899
-+#, c-format
-+msgid "          collisions:%lu "
-+msgstr "          collisions:%lu "
-+
-+#: ../lib/interface.c:901
-+#, c-format
-+msgid "compressed:%lu "
-+msgstr "compressés:%lu "
-+
-+#: ../lib/interface.c:903
-+#, c-format
-+msgid "txqueuelen:%d "
-+msgstr "lg file transmission:%d "
-+
-+#: ../lib/interface.c:905
-+#, c-format
-+msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
-+msgstr ""
-+
-+#: ../lib/interface.c:916
-+#, c-format
-+msgid "Interrupt:%d "
-+msgstr "Interruption:%d "
-+
-+#. Only print devices using it for
-+#. I/O maps
-+#: ../lib/interface.c:919
-+#, c-format
-+msgid "Base address:0x%x "
-+msgstr "Adresse de base:0x%x "
-+
-+#: ../lib/interface.c:921
-+#, c-format
-+msgid "Memory:%lx-%lx "
-+msgstr "Mémoire:%lx-%lx "
-+
-+#: ../lib/interface.c:924
-+#, c-format
-+msgid "DMA chan:%x "
-+msgstr "Canal DMA:%x "
-+
-+#: ../lib/sockets.c:63
-+#, c-format
- msgid "No usable address families found.\n"
- msgstr "Pas de famille d'adresses utilisable trouvée.\n"
- 
-@@ -2399,29 +2955,32 @@
- msgid "ip: argument is wrong: %s\n"
- msgstr "ip: argument incorrect: %s\n"
- 
--#: ../ipmaddr.c:56
-+#: ../ipmaddr.c:61
-+#, c-format
- msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
- msgstr "Syntaxe: ipmaddr [ add | del ] MULTIADR dev CHAINE\n"
- 
--#: ../ipmaddr.c:57
-+#: ../ipmaddr.c:62
-+#, c-format
- msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
- msgstr "       ipmaddr show [ dev CHAINE ] [ ipv4 | ipv6 | link | all ]\n"
- 
--#: ../ipmaddr.c:58
-+#: ../ipmaddr.c:63
-+#, c-format
- msgid "       ipmaddr -V | -version\n"
- msgstr ""
- 
--#: ../ipmaddr.c:258
-+#: ../ipmaddr.c:263
- #, c-format
- msgid "family %d "
- msgstr ""
- 
--#: ../ipmaddr.c:267
-+#: ../ipmaddr.c:272
- #, c-format
- msgid " users %d"
- msgstr ""
- 
--#: ../ipmaddr.c:353
-+#: ../ipmaddr.c:358
- msgid "Cannot create socket"
- msgstr "Ne peut créer une socket"
- 
-@@ -2436,6 +2995,7 @@
- msgstr ""
- 
- #: ../slattach.c:192
-+#, fuzzy, c-format
- msgid "slattach: cannot write PID file\n"
- msgstr "slattach: tty_lock: (%s): %s\n"
- 
-@@ -2454,59 +3014,88 @@
- msgid "slattach: tty_hangup(RAISE): %s\n"
- msgstr "slattach: tty_hangup(RAISE): %s\n"
- 
--#: ../slattach.c:486
-+#: ../slattach.c:468
-+#, fuzzy, c-format
-+msgid "slattach: tty name too long\n"
-+msgstr "%s: nom trop long\n"
-+
-+#: ../slattach.c:498
-+#, c-format
- msgid "slattach: tty_open: cannot get current state!\n"
- msgstr "slattach: tty_open: ne peut obtenir l'état courant !\n"
- 
--#: ../slattach.c:493
-+#: ../slattach.c:505
-+#, c-format
- msgid "slattach: tty_open: cannot get current line disc!\n"
- msgstr ""
- "slattach: tty_open: ne peut obtenir la discipline de ligne actuelle !\n"
- 
--#: ../slattach.c:501
-+#: ../slattach.c:513
-+#, c-format
- msgid "slattach: tty_open: cannot set RAW mode!\n"
- msgstr "slattach: tty_open: ne peut activer le mode RAW !\n"
- 
--#: ../slattach.c:508
-+#: ../slattach.c:520
- #, c-format
- msgid "slattach: tty_open: cannot set %s bps!\n"
- msgstr "slattach: tty_open: ne peut passer à %s bps!\n"
- 
--#: ../slattach.c:518
-+#: ../slattach.c:530
-+#, c-format
- msgid "slattach: tty_open: cannot set 8N1 mode!\n"
- msgstr "slattach: tty_open: ne peut activer le mode 8N1 !\n"
- 
--#: ../slattach.c:686
-+#: ../slattach.c:672
-+#, c-format
-+msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n"
-+msgstr ""
-+
-+#: ../slattach.c:704
- #, c-format
- msgid "%s started"
- msgstr ""
- 
--#: ../slattach.c:687
-+#: ../slattach.c:705
- #, c-format
- msgid " on %s"
- msgstr ""
- 
--#: ../slattach.c:688
-+#: ../slattach.c:706
- #, fuzzy, c-format
- msgid " interface %s\n"
- msgstr "%s: interface inconnue: %s\n"
- 
- #~ msgid ""
--#~ "   This comand can get or set the hostname or the NIS domainname. You can\n"
--#~ msgstr ""
--#~ "   Cette commande ne peut obtenir ou définir le nom d'hôte ou le domaine "
--#~ "NIS. Vous pouvez\n"
-+#~ "  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
-+#~ "<-''-\n"
-+#~ msgstr "  arp [-v]   [<MAT>] [-i <if>] -s  <hôte> <adrmat> [netmask <nm>] pub  <-''-\n"
-+
-+#~ msgid "%s: unknown interface: %s\n"
-+#~ msgstr "%s: interface inconnue: %s\n"
-+
-+#~ msgid "address mask replies"
-+#~ msgstr "réponses de masque d'adresses"
-+
-+#~ msgid "unknown title %s\n"
-+#~ msgstr "titre inconnu %s\n"
-+
-+#~ msgid "Routing table for `ddp' not yet supported.\n"
-+#~ msgstr "Table de routage pour `ddp' pas encore supporté.\n"
-+
-+#~ msgid ""
-+#~ "   This comand can get or set the hostname or the NIS domainname. You "
-+#~ "can\n"
-+#~ msgstr "   Cette commande ne peut obtenir ou définir le nom d'hôte ou le domaine NIS. Vous pouvez\n"
- 
- #~ msgid ""
- #~ "   also get the DNS domain or the FQDN (fully qualified domain name).\n"
- #~ msgstr ""
--#~ "   aussi obtenir le domaine DNS ou le FQDN (fully qualified domain name).\n"
-+#~ "   aussi obtenir le domaine DNS ou le FQDN (fully qualified domain "
-+#~ "name).\n"
- 
- #~ msgid ""
- #~ "   Unless you are using bind or NIS for host lookups you can change the\n"
--#~ msgstr ""
--#~ "   Sauf si vous utilisez bind ou NIS pour les recherches d'hôtes, vous "
--#~ "pouvez changer le\n"
-+#~ msgstr "   Sauf si vous utilisez bind ou NIS pour les recherches d'hôtes, vous pouvez changer le\n"
- 
- #~ msgid ""
- #~ "   FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n"
---- net-tools-1.60.orig/po/net-tools.pot
-+++ net-tools-1.60/po/net-tools.pot
-@@ -1,253 +1,275 @@
- # SOME DESCRIPTIVE TITLE.
--# Copyright (C) YEAR Free Software Foundation, Inc.
-+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-+# This file is distributed under the same license as the PACKAGE package.
- # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
- #
- #, fuzzy
- msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
--"POT-Creation-Date: 2001-04-15 15:40+0100\n"
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2007-06-30 12:28+0900\n"
- "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
- "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
- "Language-Team: LANGUAGE <LL@li.org>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=CHARSET\n"
--"Content-Transfer-Encoding: ENCODING\n"
-+"Content-Transfer-Encoding: 8bit\n"
- 
--#: ../arp.c:111 ../arp.c:270
-+#: ../arp.c:112 ../arp.c:279
-+#, c-format
- msgid "arp: need host name\n"
- msgstr ""
- 
--#: ../arp.c:208 ../arp.c:222
-+#: ../arp.c:215 ../arp.c:230
- #, c-format
- msgid "No ARP entry for %s\n"
- msgstr ""
- 
--#: ../arp.c:240
-+#: ../arp.c:248
- #, c-format
- msgid "arp: cant get HW-Address for `%s': %s.\n"
- msgstr ""
- 
--#: ../arp.c:244
-+#: ../arp.c:252
-+#, c-format
- msgid "arp: protocol type mismatch.\n"
- msgstr ""
- 
--#: ../arp.c:253
-+#: ../arp.c:261
- #, c-format
- msgid "arp: device `%s' has HW address %s `%s'.\n"
- msgstr ""
- 
--#: ../arp.c:283
-+#: ../arp.c:293
-+#, c-format
- msgid "arp: need hardware address\n"
- msgstr ""
- 
--#: ../arp.c:291
-+#: ../arp.c:301
-+#, c-format
- msgid "arp: invalid hardware address\n"
- msgstr ""
- 
--#: ../arp.c:388
-+#: ../arp.c:398
- #, c-format
- msgid "arp: cannot open etherfile %s !\n"
- msgstr ""
- 
--#: ../arp.c:404
-+#: ../arp.c:414
- #, c-format
- msgid "arp: format error on line %u of etherfile %s !\n"
- msgstr ""
- 
--#: ../arp.c:417
-+#: ../arp.c:427
- #, c-format
- msgid "arp: cannot set entry on line %u of etherfile %s !\n"
- msgstr ""
- 
--#: ../arp.c:438
-+#: ../arp.c:448
-+#, c-format
- msgid ""
- "Address                  HWtype  HWaddress           Flags Mask            "
- "Iface\n"
- msgstr ""
- 
--#: ../arp.c:468
-+#: ../arp.c:476
-+msgid "<from_interface>"
-+msgstr ""
-+
-+#: ../arp.c:478
- msgid "(incomplete)"
- msgstr ""
- 
--#: ../arp.c:485
-+#: ../arp.c:495
- #, c-format
- msgid "%s (%s) at "
- msgstr ""
- 
--#: ../arp.c:491
-+#: ../arp.c:501
-+#, c-format
- msgid "<incomplete> "
- msgstr ""
- 
--#: ../arp.c:497
-+#: ../arp.c:507
- #, c-format
- msgid "netmask %s "
- msgstr ""
- 
--#: ../arp.c:514
-+#: ../arp.c:524
- #, c-format
- msgid "on %s\n"
- msgstr ""
- 
--#: ../arp.c:593
-+#: ../arp.c:605
- #, c-format
- msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
- msgstr ""
- 
--#: ../arp.c:597
-+#: ../arp.c:609
- #, c-format
- msgid "%s (%s) -- no entry\n"
- msgstr ""
- 
--#: ../arp.c:599
-+#: ../arp.c:611
- #, c-format
- msgid "arp: in %d entries no match found.\n"
- msgstr ""
- 
--#: ../arp.c:614
-+#: ../arp.c:626
-+#, c-format
- msgid ""
- "Usage:\n"
- "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
- "cache\n"
- msgstr ""
- 
--#: ../arp.c:615
-+#: ../arp.c:627
-+#, c-format
- msgid ""
--"  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP "
-+"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
- "entry\n"
- msgstr ""
- 
--#: ../arp.c:616
-+#: ../arp.c:628
-+#, c-format
- msgid ""
--"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from "
-+"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
- "file\n"
- msgstr ""
- 
--#: ../arp.c:617
-+#: ../arp.c:629
-+#, c-format
- msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add "
-+"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
- "entry\n"
- msgstr ""
- 
--#: ../arp.c:618
--msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
--"<-''-\n"
--msgstr ""
--
--#: ../arp.c:619
-+#: ../arp.c:630
-+#, c-format
- msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      "
-+"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
- "<-''-\n"
- "\n"
- msgstr ""
- 
--#: ../arp.c:621
-+#: ../arp.c:632
-+#, c-format
- msgid ""
- "        -a                       display (all) hosts in alternative (BSD) "
- "style\n"
- msgstr ""
- 
--#: ../arp.c:622
-+#: ../arp.c:633
-+#, c-format
- msgid "        -s, --set                set a new ARP entry\n"
- msgstr ""
- 
--#: ../arp.c:623
-+#: ../arp.c:634
-+#, c-format
- msgid "        -d, --delete             delete a specified entry\n"
- msgstr ""
- 
--#: ../arp.c:624 ../netstat.c:1490 ../route.c:86
-+#: ../arp.c:635 ../netstat.c:1503 ../route.c:86
-+#, c-format
- msgid "        -v, --verbose            be verbose\n"
- msgstr ""
- 
--#: ../arp.c:625 ../netstat.c:1491 ../route.c:87
-+#: ../arp.c:636 ../netstat.c:1504 ../route.c:87
-+#, c-format
- msgid "        -n, --numeric            don't resolve names\n"
- msgstr ""
- 
--#: ../arp.c:626
-+#: ../arp.c:637
-+#, c-format
- msgid ""
- "        -i, --device             specify network interface (e.g. eth0)\n"
- msgstr ""
- 
--#: ../arp.c:627
-+#: ../arp.c:638
-+#, c-format
- msgid "        -D, --use-device         read <hwaddr> from given device\n"
- msgstr ""
- 
--#: ../arp.c:628
-+#: ../arp.c:639
-+#, c-format
- msgid "        -A, -p, --protocol       specify protocol family\n"
- msgstr ""
- 
--#: ../arp.c:629
-+#: ../arp.c:640
-+#, c-format
- msgid ""
--"        -f, --file               read new entries from file or from "
--"/etc/ethers\n"
-+"        -f, --file               read new entries from file or from /etc/"
-+"ethers\n"
- "\n"
- msgstr ""
- 
--#: ../arp.c:631 ../rarp.c:182
-+#: ../arp.c:642 ../rarp.c:182
- #, c-format
- msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
- msgstr ""
- 
--#: ../arp.c:632 ../rarp.c:183
-+#: ../arp.c:643 ../rarp.c:183
-+#, c-format
- msgid "  List of possible hardware types (which support ARP):\n"
- msgstr ""
- 
--#: ../arp.c:666 ../arp.c:751
-+#: ../arp.c:677 ../arp.c:762
- #, c-format
- msgid "%s: hardware type not supported!\n"
- msgstr ""
- 
--#: ../arp.c:670
-+#: ../arp.c:681
- #, c-format
- msgid "%s: address family not supported!\n"
- msgstr ""
- 
--#: ../arp.c:705
-+#: ../arp.c:716
-+#, c-format
- msgid "arp: -N not yet supported.\n"
- msgstr ""
- 
--#: ../arp.c:715
-+#: ../arp.c:726
- #, c-format
- msgid "arp: %s: unknown address family.\n"
- msgstr ""
- 
--#: ../arp.c:724
-+#: ../arp.c:735
- #, c-format
- msgid "arp: %s: unknown hardware type.\n"
- msgstr ""
- 
--#: ../arp.c:743
-+#: ../arp.c:754
- #, c-format
- msgid "arp: %s: kernel only supports 'inet'.\n"
- msgstr ""
- 
--#: ../arp.c:756
-+#: ../arp.c:767
- #, c-format
- msgid "arp: %s: hardware type without ARP support.\n"
- msgstr ""
- 
--#: ../hostname.c:70
-+#: ../hostname.c:71
- #, c-format
- msgid "Setting nodename to `%s'\n"
- msgstr ""
- 
--#: ../hostname.c:75
-+#: ../hostname.c:76
- #, c-format
- msgid "%s: you must be root to change the node name\n"
- msgstr ""
- 
--#: ../hostname.c:78 ../hostname.c:98 ../hostname.c:117
-+#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117
- #, c-format
- msgid "%s: name too long\n"
- msgstr ""
- 
--#: ../hostname.c:90
-+#: ../hostname.c:91
- #, c-format
- msgid "Setting hostname to `%s'\n"
- msgstr ""
- 
--#: ../hostname.c:95
-+#: ../hostname.c:96
- #, c-format
- msgid "%s: you must be root to change the host name\n"
- msgstr ""
-@@ -262,103 +284,119 @@
- msgid "%s: you must be root to change the domain name\n"
- msgstr ""
- 
--#: ../hostname.c:132
-+#: ../hostname.c:131
- #, c-format
- msgid "Resolving `%s' ...\n"
- msgstr ""
- 
--#: ../hostname.c:138
-+#: ../hostname.c:137
- #, c-format
- msgid "Result: h_name=`%s'\n"
- msgstr ""
- 
--#: ../hostname.c:143
-+#: ../hostname.c:142
- #, c-format
- msgid "Result: h_aliases=`%s'\n"
- msgstr ""
- 
--#: ../hostname.c:148
-+#: ../hostname.c:147
- #, c-format
- msgid "Result: h_addr_list=`%s'\n"
- msgstr ""
- 
--#: ../hostname.c:210
-+#: ../hostname.c:208
- #, c-format
- msgid "%s: can't open `%s'\n"
- msgstr ""
- 
--#: ../hostname.c:224
-+#: ../hostname.c:222
-+#, c-format
- msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
- msgstr ""
- 
--#: ../hostname.c:225
-+#: ../hostname.c:223
-+#, c-format
- msgid ""
- "       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
- msgstr ""
- 
--#: ../hostname.c:227
-+#: ../hostname.c:225
-+#, c-format
- msgid ""
- "       nodename [-v] {nodename|-F file}      set DECnet node name (from "
- "file)\n"
- msgstr ""
- 
--#: ../hostname.c:229
-+#: ../hostname.c:227
-+#, c-format
- msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
- msgstr ""
- 
--#: ../hostname.c:230
-+#: ../hostname.c:228
-+#, c-format
- msgid ""
- "       hostname [-v]                         display hostname\n"
- "\n"
- msgstr ""
- 
--#: ../hostname.c:231
-+#: ../hostname.c:229
-+#, c-format
- msgid ""
- "       hostname -V|--version|-h|--help       print info and exit\n"
- "\n"
- msgstr ""
- 
--#: ../hostname.c:232
-+#: ../hostname.c:230
-+#, c-format
- msgid ""
- "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
- "\n"
- msgstr ""
- 
--#: ../hostname.c:233
-+#: ../hostname.c:231
-+#, c-format
- msgid "    -s, --short           short host name\n"
- msgstr ""
- 
--#: ../hostname.c:234
-+#: ../hostname.c:232
-+#, c-format
- msgid "    -a, --alias           alias names\n"
- msgstr ""
- 
--#: ../hostname.c:235
-+#: ../hostname.c:233
-+#, c-format
- msgid "    -i, --ip-address      addresses for the hostname\n"
- msgstr ""
- 
--#: ../hostname.c:236
-+#: ../hostname.c:234
-+#, c-format
- msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
- msgstr ""
- 
--#: ../hostname.c:237
-+#: ../hostname.c:235
-+#, c-format
- msgid "    -d, --domain          DNS domain name\n"
- msgstr ""
- 
--#: ../hostname.c:238
-+#: ../hostname.c:236
-+#, c-format
- msgid "    -y, --yp, --nis       NIS/YP domainname\n"
- msgstr ""
- 
--#: ../hostname.c:240
-+#: ../hostname.c:238
-+#, c-format
- msgid "    -n, --node            DECnet node name\n"
- msgstr ""
- 
--#: ../hostname.c:242
-+#: ../hostname.c:240
-+#, c-format
- msgid ""
- "    -F, --file            read hostname or NIS domainname from given file\n"
- "\n"
- msgstr ""
- 
--#: ../hostname.c:244
-+#: ../hostname.c:242
-+#, c-format
- msgid ""
- "   This command can read or set the hostname or the NIS domainname. You can\n"
- "   also read the DNS domain or the FQDN (fully qualified domain name).\n"
-@@ -367,587 +405,706 @@
- "   part of the FQDN) in the /etc/hosts file.\n"
- msgstr ""
- 
--#: ../hostname.c:340
-+#: ../hostname.c:338
- #, c-format
- msgid "%s: You can't change the DNS domain name with this command\n"
- msgstr ""
- 
--#: ../hostname.c:341
-+#: ../hostname.c:339
-+#, c-format
- msgid ""
- "\n"
- "Unless you are using bind or NIS for host lookups you can change the DNS\n"
- msgstr ""
- 
--#: ../hostname.c:342
-+#: ../hostname.c:340
-+#, c-format
- msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
- msgstr ""
- 
--#: ../hostname.c:359
-+#: ../hostname.c:357
- #, c-format
- msgid "gethostname()=`%s'\n"
- msgstr ""
- 
--#: ../hostname.c:376
-+#: ../hostname.c:374
- #, c-format
- msgid "getdomainname()=`%s'\n"
- msgstr ""
- 
--#: ../hostname.c:391
-+#: ../hostname.c:389
- #, c-format
- msgid "getnodename()=`%s'\n"
- msgstr ""
- 
--#: ../ifconfig.c:108
-+#: ../ifconfig.c:107
-+#, c-format
- msgid ""
--"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
-+"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
- "Flg\n"
- msgstr ""
- 
--#: ../ifconfig.c:130 ../ifconfig.c:162
-+#: ../ifconfig.c:129 ../ifconfig.c:161
- #, c-format
--msgid "%s: unknown interface: %s\n"
-+msgid "%s: ERROR while getting interface flags: %s\n"
- msgstr ""
- 
--#: ../ifconfig.c:154 ../ifconfig.c:734 ../ifconfig.c:825 ../ifconfig.c:936
-+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
-+#: ../ifconfig.c:973
-+#, c-format
- msgid "No support for INET on this system.\n"
- msgstr ""
- 
--#: ../ifconfig.c:177
-+#: ../ifconfig.c:193
-+#, c-format
-+msgid "%s: ERROR while testing interface flags: %s\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:202
-+#, c-format
- msgid ""
- "Usage:\n"
--"  ifconfig [-a] [-i] [-v] [-s] <interface> [[<AF>] <address>]\n"
-+"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
- msgstr ""
- 
--#: ../ifconfig.c:179
-+#: ../ifconfig.c:204
-+#, c-format
- msgid "  [add <address>[/<prefixlen>]]\n"
- msgstr ""
- 
--#: ../ifconfig.c:180
-+#: ../ifconfig.c:205
-+#, c-format
- msgid "  [del <address>[/<prefixlen>]]\n"
- msgstr ""
- 
--#: ../ifconfig.c:181
-+#: ../ifconfig.c:206
-+#, c-format
- msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
- msgstr ""
- 
--#: ../ifconfig.c:182
-+#: ../ifconfig.c:207
-+#, c-format
- msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
- msgstr ""
- 
--#: ../ifconfig.c:185
-+#: ../ifconfig.c:210
-+#, c-format
- msgid "  [outfill <NN>] [keepalive <NN>]\n"
- msgstr ""
- 
--#: ../ifconfig.c:187
-+#: ../ifconfig.c:212
-+#, c-format
- msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
- msgstr ""
- 
--#: ../ifconfig.c:188
-+#: ../ifconfig.c:213
-+#, c-format
- msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
- msgstr ""
- 
--#: ../ifconfig.c:189
-+#: ../ifconfig.c:214
-+#, c-format
- msgid "  [multicast]  [[-]promisc]\n"
- msgstr ""
- 
--#: ../ifconfig.c:190
-+#: ../ifconfig.c:215
-+#, c-format
- msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
- msgstr ""
- 
--#: ../ifconfig.c:192
-+#: ../ifconfig.c:217
-+#, c-format
- msgid "  [txqueuelen <NN>]\n"
- msgstr ""
- 
--#: ../ifconfig.c:195
-+#: ../ifconfig.c:220
-+#, c-format
- msgid "  [[-]dynamic]\n"
- msgstr ""
- 
--#: ../ifconfig.c:197
-+#: ../ifconfig.c:222
-+#, c-format
- msgid ""
- "  [up|down] ...\n"
- "\n"
- msgstr ""
- 
--#: ../ifconfig.c:199
-+#: ../ifconfig.c:224
-+#, c-format
- msgid "  <HW>=Hardware Type.\n"
- msgstr ""
- 
--#: ../ifconfig.c:200
-+#: ../ifconfig.c:225
-+#, c-format
- msgid "  List of possible hardware types:\n"
- msgstr ""
- 
- #. 1 = ARPable
--#: ../ifconfig.c:202
-+#: ../ifconfig.c:227
- #, c-format
- msgid "  <AF>=Address family. Default: %s\n"
- msgstr ""
- 
--#: ../ifconfig.c:203
-+#: ../ifconfig.c:228
-+#, c-format
- msgid "  List of possible address families:\n"
- msgstr ""
- 
--#: ../ifconfig.c:278
-+#: ../ifconfig.c:303
- #, c-format
- msgid "ifconfig: option `%s' not recognised.\n"
- msgstr ""
- 
--#: ../ifconfig.c:280 ../ifconfig.c:925
-+#: ../ifconfig.c:305 ../ifconfig.c:962
-+#, c-format
- msgid "ifconfig: `--help' gives usage information.\n"
- msgstr ""
- 
--#: ../ifconfig.c:355
-+#: ../ifconfig.c:380
-+#, c-format
- msgid "Unknown media type.\n"
- msgstr ""
- 
--#: ../ifconfig.c:647
-+#: ../ifconfig.c:417
-+#, c-format
-+msgid ""
-+"Warning: Interface %s still in promisc mode... maybe other application is "
-+"running?\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:429
-+#, c-format
-+msgid "Warning: Interface %s still in MULTICAST mode.\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:441
-+#, c-format
-+msgid "Warning: Interface %s still in ALLMULTI mode.\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:465
-+#, c-format
-+msgid "Warning: Interface %s still in DYNAMIC mode.\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:523
-+#, c-format
-+msgid "Warning: Interface %s still in BROADCAST mode.\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:652
-+#, c-format
-+msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:684
- #, c-format
- msgid "hw address type `%s' has no handler to set address. failed.\n"
- msgstr ""
- 
--#: ../ifconfig.c:656
-+#: ../ifconfig.c:693
- #, c-format
- msgid "%s: invalid %s address.\n"
- msgstr ""
- 
--#: ../ifconfig.c:700 ../ifconfig.c:790 ../ifconfig.c:876
-+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
-+#, c-format
- msgid "No support for INET6 on this system.\n"
- msgstr ""
- 
--#: ../ifconfig.c:743 ../ifconfig.c:834
-+#: ../ifconfig.c:780 ../ifconfig.c:871
- #, c-format
- msgid "Interface %s not initialized\n"
- msgstr ""
- 
--#: ../ifconfig.c:755 ../ifconfig.c:845
-+#: ../ifconfig.c:792 ../ifconfig.c:882
-+#, c-format
- msgid "Bad address.\n"
- msgstr ""
- 
--#: ../ifconfig.c:848
-+#: ../ifconfig.c:885
-+#, c-format
- msgid "Address deletion not supported on this system.\n"
- msgstr ""
- 
--#: ../ifconfig.c:920
-+#: ../ifconfig.c:957
-+#, c-format
- msgid "ifconfig: Cannot set address for this protocol family.\n"
- msgstr ""
- 
--#: ../ifconfig.c:946
-+#: ../ifconfig.c:983
-+#, c-format
- msgid "No support for ECONET on this system.\n"
- msgstr ""
- 
--#: ../ifconfig.c:954
-+#: ../ifconfig.c:991
- #, c-format
- msgid "Don't know how to set addresses for family %d.\n"
- msgstr ""
- 
--#: ../netstat.c:430
-+#: ../ifconfig.c:1021
-+#, c-format
-+msgid "WARNING: at least one error occured. (%d)\n"
-+msgstr ""
-+
-+#: ../netstat.c:434
- #, c-format
- msgid ""
- "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
- msgstr ""
- 
--#: ../netstat.c:434
-+#: ../netstat.c:438
-+#, c-format
- msgid ""
- "(Not all processes could be identified, non-owned process info\n"
- " will not be shown, you would have to be root to see it all.)\n"
- msgstr ""
- 
--#: ../netstat.c:441 ../netstat.c:1176 ../netstat.c:1253
-+#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
- msgid "LISTENING"
- msgstr ""
- 
--#: ../netstat.c:442
-+#: ../netstat.c:446
- msgid "CONN SENT"
- msgstr ""
- 
--#: ../netstat.c:443 ../netstat.c:1255
-+#: ../netstat.c:447 ../netstat.c:1268
- msgid "DISC SENT"
- msgstr ""
- 
--#: ../netstat.c:444 ../netstat.c:511 ../netstat.c:894 ../netstat.c:1256
-+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
- msgid "ESTABLISHED"
- msgstr ""
- 
--#: ../netstat.c:466
-+#: ../netstat.c:470
-+#, c-format
- msgid "Active NET/ROM sockets\n"
- msgstr ""
- 
--#: ../netstat.c:467
-+#: ../netstat.c:471
-+#, c-format
- msgid ""
--"User       Dest       Source     Device  State        Vr/Vs    Send-Q  "
--"Recv-Q\n"
-+"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
-+"Q\n"
- msgstr ""
- 
--#: ../netstat.c:477 ../netstat.c:1295
-+#: ../netstat.c:481 ../netstat.c:1308
- #, c-format
- msgid "Problem reading data from %s\n"
- msgstr ""
- 
--#: ../netstat.c:512
-+#: ../netstat.c:516
- msgid "SYN_SENT"
- msgstr ""
- 
--#: ../netstat.c:513
-+#: ../netstat.c:517
- msgid "SYN_RECV"
- msgstr ""
- 
--#: ../netstat.c:514
-+#: ../netstat.c:518
- msgid "FIN_WAIT1"
- msgstr ""
- 
--#: ../netstat.c:515
-+#: ../netstat.c:519
- msgid "FIN_WAIT2"
- msgstr ""
- 
--#: ../netstat.c:516
-+#: ../netstat.c:520
- msgid "TIME_WAIT"
- msgstr ""
- 
--#: ../netstat.c:517
-+#: ../netstat.c:521
- msgid "CLOSE"
- msgstr ""
- 
--#: ../netstat.c:518
-+#: ../netstat.c:522
- msgid "CLOSE_WAIT"
- msgstr ""
- 
--#: ../netstat.c:519
-+#: ../netstat.c:523
- msgid "LAST_ACK"
- msgstr ""
- 
--#: ../netstat.c:520
-+#: ../netstat.c:524
- msgid "LISTEN"
- msgstr ""
- 
--#: ../netstat.c:521
-+#: ../netstat.c:525
- msgid "CLOSING"
- msgstr ""
- 
--#: ../netstat.c:592
-+#: ../netstat.c:596
- #, c-format
- msgid "warning, got bogus igmp6 line %d.\n"
- msgstr ""
- 
--#: ../netstat.c:597 ../netstat.c:635 ../netstat.c:756 ../netstat.c:888
--#: ../netstat.c:1019 ../netstat.c:1024
-+#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
-+#: ../netstat.c:1032 ../netstat.c:1037
- #, c-format
- msgid "netstat: unsupported address family %d !\n"
- msgstr ""
- 
--#: ../netstat.c:610 ../netstat.c:615 ../netstat.c:623 ../netstat.c:630
-+#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
- #, c-format
- msgid "warning, got bogus igmp line %d.\n"
- msgstr ""
- 
--#: ../netstat.c:673
-+#: ../netstat.c:677
-+#, c-format
- msgid "Active X.25 sockets\n"
- msgstr ""
- 
- #. IMHO, Vr/Vs is not very usefull --SF
--#: ../netstat.c:675
-+#: ../netstat.c:679
-+#, c-format
- msgid ""
--"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  "
--"Recv-Q\n"
-+"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
-+"Q\n"
- msgstr ""
- 
--#: ../netstat.c:752
-+#: ../netstat.c:759
-+#, c-format
- msgid "warning, got bogus tcp line.\n"
- msgstr ""
- 
--#: ../netstat.c:793 ../netstat.c:943 ../netstat.c:1062
-+#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
- #, c-format
- msgid "off (0.00/%ld/%d)"
- msgstr ""
- 
--#: ../netstat.c:797
-+#: ../netstat.c:804
- #, c-format
- msgid "on (%2.2f/%ld/%d)"
- msgstr ""
- 
--#: ../netstat.c:802
-+#: ../netstat.c:809
- #, c-format
- msgid "keepalive (%2.2f/%ld/%d)"
- msgstr ""
- 
--#: ../netstat.c:807
-+#: ../netstat.c:814
- #, c-format
- msgid "timewait (%2.2f/%ld/%d)"
- msgstr ""
- 
--#: ../netstat.c:812 ../netstat.c:952 ../netstat.c:1072
-+#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
- #, c-format
- msgid "unkn-%d (%2.2f/%ld/%d)"
- msgstr ""
- 
--#: ../netstat.c:884
-+#: ../netstat.c:894
-+#, c-format
- msgid "warning, got bogus udp line.\n"
- msgstr ""
- 
--#: ../netstat.c:902 ../netstat.c:1162 ../netstat.c:1195
-+#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
- msgid "UNKNOWN"
- msgstr ""
- 
--#: ../netstat.c:948 ../netstat.c:1067
-+#: ../netstat.c:958 ../netstat.c:1080
- #, c-format
- msgid "on%d (%2.2f/%ld/%d)"
- msgstr ""
- 
--#: ../netstat.c:1033
-+#: ../netstat.c:1046
-+#, c-format
- msgid "warning, got bogus raw line.\n"
- msgstr ""
- 
--#: ../netstat.c:1115
-+#: ../netstat.c:1128
-+#, c-format
- msgid "warning, got bogus unix line.\n"
- msgstr ""
- 
--#: ../netstat.c:1142
-+#: ../netstat.c:1155
- msgid "STREAM"
- msgstr ""
- 
--#: ../netstat.c:1146
-+#: ../netstat.c:1159
- msgid "DGRAM"
- msgstr ""
- 
--#: ../netstat.c:1150
-+#: ../netstat.c:1163
- msgid "RAW"
- msgstr ""
- 
--#: ../netstat.c:1154
-+#: ../netstat.c:1167
- msgid "RDM"
- msgstr ""
- 
--#: ../netstat.c:1158
-+#: ../netstat.c:1171
- msgid "SEQPACKET"
- msgstr ""
- 
--#: ../netstat.c:1167
-+#: ../netstat.c:1180
- msgid "FREE"
- msgstr ""
- 
--#: ../netstat.c:1183
-+#: ../netstat.c:1196
- msgid "CONNECTING"
- msgstr ""
- 
--#: ../netstat.c:1187
-+#: ../netstat.c:1200
- msgid "CONNECTED"
- msgstr ""
- 
--#: ../netstat.c:1191
-+#: ../netstat.c:1204
- msgid "DISCONNECTING"
- msgstr ""
- 
--#: ../netstat.c:1222
-+#: ../netstat.c:1235
-+#, c-format
- msgid "Active UNIX domain sockets "
- msgstr ""
- 
--#: ../netstat.c:1224 ../netstat.c:1735
-+#: ../netstat.c:1237 ../netstat.c:1756
-+#, c-format
- msgid "(servers and established)"
- msgstr ""
- 
--#: ../netstat.c:1227 ../netstat.c:1738
-+#: ../netstat.c:1240 ../netstat.c:1759
-+#, c-format
- msgid "(only servers)"
- msgstr ""
- 
--#: ../netstat.c:1229 ../netstat.c:1740
-+#: ../netstat.c:1242 ../netstat.c:1761
-+#, c-format
- msgid "(w/o servers)"
- msgstr ""
- 
--#: ../netstat.c:1232
-+#: ../netstat.c:1245
-+#, c-format
- msgid ""
- "\n"
- "Proto RefCnt Flags       Type       State         I-Node"
- msgstr ""
- 
--#: ../netstat.c:1234
-+#: ../netstat.c:1247
-+#, c-format
- msgid " Path\n"
- msgstr ""
- 
--#: ../netstat.c:1254
-+#: ../netstat.c:1267
- msgid "SABM SENT"
- msgstr ""
- 
--#: ../netstat.c:1257
-+#: ../netstat.c:1270
- msgid "RECOVERY"
- msgstr ""
- 
--#: ../netstat.c:1271
-+#: ../netstat.c:1284
-+#, c-format
- msgid "Active AX.25 sockets\n"
- msgstr ""
- 
--#: ../netstat.c:1272
-+#: ../netstat.c:1285
-+#, c-format
- msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
- msgstr ""
- 
--#: ../netstat.c:1315
-+#: ../netstat.c:1328
- #, c-format
- msgid "problem reading data from %s\n"
- msgstr ""
- 
--#: ../netstat.c:1366
-+#: ../netstat.c:1379
-+#, c-format
- msgid ""
- "Active IPX sockets\n"
- "Proto Recv-Q Send-Q Local Address              Foreign Address            "
- "State"
- msgstr ""
- 
--#: ../netstat.c:1368
-+#: ../netstat.c:1381
-+#, c-format
- msgid " User"
- msgstr ""
- 
--#: ../netstat.c:1402
-+#: ../netstat.c:1415
- msgid "ESTAB"
- msgstr ""
- 
--#: ../netstat.c:1410
-+#: ../netstat.c:1423
- msgid "UNK."
- msgstr ""
- 
--#: ../netstat.c:1448
-+#: ../netstat.c:1461
-+#, c-format
- msgid "Kernel Interface table\n"
- msgstr ""
- 
--#: ../netstat.c:1452
-+#: ../netstat.c:1465
-+#, c-format
- msgid ""
--"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
-+"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
- "Flg\n"
- msgstr ""
- 
--#: ../netstat.c:1456
-+#: ../netstat.c:1469
- msgid "missing interface information"
- msgstr ""
- 
--#: ../netstat.c:1479
-+#: ../netstat.c:1492
-+#, c-format
- msgid ""
--"usage: netstat [-veenNcCF] [<Af>] -r         netstat "
--"{-V|--version|-h|--help}\n"
-+"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
-+"help}\n"
- msgstr ""
- 
--#: ../netstat.c:1480
-+#: ../netstat.c:1493
-+#, c-format
- msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
- msgstr ""
- 
--#: ../netstat.c:1481
-+#: ../netstat.c:1494
-+#, c-format
- msgid ""
- "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
- "\n"
- msgstr ""
- 
--#: ../netstat.c:1483
-+#: ../netstat.c:1496
-+#, c-format
- msgid "        -r, --route              display routing table\n"
- msgstr ""
- 
--#: ../netstat.c:1484
-+#: ../netstat.c:1497
-+#, c-format
- msgid "        -i, --interfaces         display interface table\n"
- msgstr ""
- 
--#: ../netstat.c:1485
-+#: ../netstat.c:1498
-+#, c-format
- msgid "        -g, --groups             display multicast group memberships\n"
- msgstr ""
- 
--#: ../netstat.c:1486
-+#: ../netstat.c:1499
-+#, c-format
- msgid ""
- "        -s, --statistics         display networking statistics (like SNMP)\n"
- msgstr ""
- 
--#: ../netstat.c:1488
-+#: ../netstat.c:1501
-+#, c-format
- msgid ""
- "        -M, --masquerade         display masqueraded connections\n"
- "\n"
- msgstr ""
- 
--#: ../netstat.c:1492
-+#: ../netstat.c:1505
-+#, c-format
- msgid "        --numeric-hosts          don't resolve host names\n"
- msgstr ""
- 
--#: ../netstat.c:1493
-+#: ../netstat.c:1506
-+#, c-format
- msgid "        --numeric-ports          don't resolve port names\n"
- msgstr ""
- 
--#: ../netstat.c:1494
-+#: ../netstat.c:1507
-+#, c-format
- msgid "        --numeric-users          don't resolve user names\n"
- msgstr ""
- 
--#: ../netstat.c:1495
-+#: ../netstat.c:1508
-+#, c-format
- msgid "        -N, --symbolic           resolve hardware names\n"
- msgstr ""
- 
--#: ../netstat.c:1496 ../route.c:88
-+#: ../netstat.c:1509 ../route.c:88
-+#, c-format
- msgid "        -e, --extend             display other/more information\n"
- msgstr ""
- 
--#: ../netstat.c:1497
-+#: ../netstat.c:1510
-+#, c-format
- msgid "        -p, --programs           display PID/Program name for sockets\n"
- msgstr ""
- 
--#: ../netstat.c:1498
-+#: ../netstat.c:1511
-+#, c-format
- msgid ""
- "        -c, --continuous         continuous listing\n"
- "\n"
- msgstr ""
- 
--#: ../netstat.c:1499
-+#: ../netstat.c:1512
-+#, c-format
- msgid "        -l, --listening          display listening server sockets\n"
- msgstr ""
- 
--#: ../netstat.c:1500
-+#: ../netstat.c:1513
-+#, c-format
- msgid ""
- "        -a, --all, --listening   display all sockets (default: connected)\n"
- msgstr ""
- 
--#: ../netstat.c:1501
-+#: ../netstat.c:1514
-+#, c-format
- msgid "        -o, --timers             display timers\n"
- msgstr ""
- 
--#: ../netstat.c:1502 ../route.c:89
-+#: ../netstat.c:1515 ../route.c:89
-+#, c-format
- msgid ""
- "        -F, --fib                display Forwarding Information Base "
- "(default)\n"
- msgstr ""
- 
--#: ../netstat.c:1503 ../route.c:90
-+#: ../netstat.c:1516 ../route.c:90
-+#, c-format
- msgid ""
- "        -C, --cache              display routing cache instead of FIB\n"
- "\n"
- msgstr ""
- 
--#: ../netstat.c:1505
-+#: ../netstat.c:1518
-+#, c-format
- msgid ""
--"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
--"--netrom\n"
-+"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-+"netrom\n"
- msgstr ""
- 
--#: ../netstat.c:1506 ../route.c:92
-+#: ../netstat.c:1519
- #, c-format
--msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
-+msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
- msgstr ""
- 
--#: ../netstat.c:1507 ../route.c:93
-+#: ../netstat.c:1520 ../route.c:93
-+#, c-format
- msgid "  List of possible address families (which support routing):\n"
- msgstr ""
- 
--#: ../netstat.c:1732
-+#: ../netstat.c:1753
-+#, c-format
- msgid "Active Internet connections "
- msgstr ""
- 
--#: ../netstat.c:1742
-+#: ../netstat.c:1763
-+#, c-format
- msgid ""
- "\n"
--"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
--"  "
-+"Proto Recv-Q Send-Q Local Address           Foreign Address         "
-+"State      "
- msgstr ""
- 
--#: ../netstat.c:1744
-+#: ../netstat.c:1765
-+#, c-format
- msgid " User       Inode     "
- msgstr ""
- 
--#: ../netstat.c:1747
-+#: ../netstat.c:1768
-+#, c-format
- msgid " Timer"
- msgstr ""
- 
--#: ../netstat.c:1777
-+#: ../netstat.c:1798
-+#, c-format
- msgid "IPv4 Group Memberships\n"
- msgstr ""
- 
--#: ../netstat.c:1778
-+#: ../netstat.c:1799
-+#, c-format
- msgid "Interface       RefCnt Group\n"
- msgstr ""
- 
-@@ -986,23 +1143,28 @@
- msgstr ""
- 
- #: ../rarp.c:176
-+#, c-format
- msgid "Usage: rarp -a                               list entries in cache.\n"
- msgstr ""
- 
- #: ../rarp.c:177
-+#, c-format
- msgid "       rarp -d <hostname>                    delete entry from cache.\n"
- msgstr ""
- 
- #: ../rarp.c:178
-+#, c-format
- msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
- msgstr ""
- 
- #: ../rarp.c:179
-+#, c-format
- msgid ""
- "       rarp -f                               add entries from /etc/ethers.\n"
- msgstr ""
- 
- #: ../rarp.c:180
-+#, c-format
- msgid ""
- "       rarp -V                               display program version.\n"
- "\n"
-@@ -1019,38 +1181,50 @@
- msgstr ""
- 
- #: ../route.c:80
-+#, c-format
- msgid ""
- "Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
- msgstr ""
- 
- #: ../route.c:81
-+#, c-format
- msgid ""
- "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
- "\n"
- msgstr ""
- 
- #: ../route.c:83
-+#, c-format
- msgid ""
- "       route {-h|--help} [<AF>]              Detailed usage syntax for "
- "specified AF.\n"
- msgstr ""
- 
- #: ../route.c:84
-+#, c-format
- msgid ""
- "       route {-V|--version}                  Display version/author and "
- "exit.\n"
- "\n"
- msgstr ""
- 
-+#: ../route.c:92
-+#, c-format
-+msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
-+msgstr ""
-+
- #: ../plipconfig.c:66
-+#, c-format
- msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
- msgstr ""
- 
- #: ../plipconfig.c:67
-+#, c-format
- msgid "                  [nibble NN] [trigger NN]\n"
- msgstr ""
- 
- #: ../plipconfig.c:68
-+#, c-format
- msgid "       plipconfig -V | --version\n"
- msgstr ""
- 
-@@ -1060,61 +1234,75 @@
- msgstr ""
- 
- #: ../iptunnel.c:85
-+#, c-format
- msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
- msgstr ""
- 
- #: ../iptunnel.c:86
-+#, c-format
- msgid ""
- "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
- msgstr ""
- 
- #: ../iptunnel.c:87
-+#, c-format
- msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
- msgstr ""
- 
- #: ../iptunnel.c:88
-+#, c-format
- msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
- msgstr ""
- 
- #: ../iptunnel.c:89
-+#, c-format
- msgid ""
- "       iptunnel -V | --version\n"
- "\n"
- msgstr ""
- 
- #: ../iptunnel.c:90
-+#, c-format
- msgid "Where: NAME := STRING\n"
- msgstr ""
- 
- #: ../iptunnel.c:91
-+#, c-format
- msgid "       ADDR := { IP_ADDRESS | any }\n"
- msgstr ""
- 
- #: ../iptunnel.c:92
-+#, c-format
- msgid "       TOS  := { NUMBER | inherit }\n"
- msgstr ""
- 
- #: ../iptunnel.c:93
-+#, c-format
- msgid "       TTL  := { 1..255 | inherit }\n"
- msgstr ""
- 
- #: ../iptunnel.c:94
-+#, c-format
- msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
- msgstr ""
- 
- #: ../iptunnel.c:332
-+#, c-format
- msgid "Keys are not allowed with ipip and sit.\n"
- msgstr ""
- 
- #: ../iptunnel.c:352
-+#, c-format
- msgid "Broadcast tunnel requires a source address.\n"
- msgstr ""
- 
- #: ../iptunnel.c:367
-+#, c-format
- msgid "ttl != 0 and noptmudisc are incompatible\n"
- msgstr ""
- 
- #: ../iptunnel.c:379
-+#, c-format
- msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
- msgstr ""
- 
-@@ -1128,22 +1316,27 @@
- msgstr ""
- 
- #: ../iptunnel.c:453
-+#, c-format
- msgid "  Drop packets out of sequence.\n"
- msgstr ""
- 
- #: ../iptunnel.c:455
-+#, c-format
- msgid "  Checksum in received packet is required.\n"
- msgstr ""
- 
- #: ../iptunnel.c:457
-+#, c-format
- msgid "  Sequence packets on output.\n"
- msgstr ""
- 
- #: ../iptunnel.c:459
-+#, c-format
- msgid "  Checksum output packets.\n"
- msgstr ""
- 
- #: ../iptunnel.c:487
-+#, c-format
- msgid "Wrong format of /proc/net/dev. Sorry.\n"
- msgstr ""
- 
-@@ -1153,10 +1346,12 @@
- msgstr ""
- 
- #: ../iptunnel.c:516
-+#, c-format
- msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
- msgstr ""
- 
- #: ../iptunnel.c:519
-+#, c-format
- msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
- msgstr ""
- 
-@@ -1563,12 +1758,12 @@
- 
- #: ../statistics.c:178
- #, c-format
--msgid "%u packets directly received from backlog"
-+msgid "%u of bytes directly received from backlog"
- msgstr ""
- 
- #: ../statistics.c:180
- #, c-format
--msgid "%u packets directly received from prequeue"
-+msgid "%u of bytes directly received from prequeue"
- msgstr ""
- 
- #: ../statistics.c:182
-@@ -1578,7 +1773,7 @@
- 
- #: ../statistics.c:183
- #, c-format
--msgid "%u packets header predicted"
-+msgid "%u packet headers predicted"
- msgstr ""
- 
- #: ../statistics.c:184
-@@ -1591,19 +1786,209 @@
- msgid "Ran %u times out of system memory during packet sending"
- msgstr ""
- 
--#: ../statistics.c:253
-+#: ../statistics.c:188
-+#, c-format
-+msgid "%u acknowledgments not containing data received"
-+msgstr ""
-+
-+#: ../statistics.c:189
-+#, c-format
-+msgid "%u predicted acknowledgments"
-+msgstr ""
-+
-+#: ../statistics.c:190
-+#, c-format
-+msgid "%u times recovered from packet loss due to fast retransmit"
-+msgstr ""
-+
-+#: ../statistics.c:191
-+#, c-format
-+msgid "%u times recovered from packet loss due to SACK data"
-+msgstr ""
-+
-+#: ../statistics.c:192
-+#, c-format
-+msgid "%u bad SACKs received"
-+msgstr ""
-+
-+#: ../statistics.c:193
-+#, c-format
-+msgid "Detected reordering %u times using FACK"
-+msgstr ""
-+
-+#: ../statistics.c:194
-+#, c-format
-+msgid "Detected reordering %u times using SACK"
-+msgstr ""
-+
-+#: ../statistics.c:195
-+#, c-format
-+msgid "Detected reordering %u times using time stamp"
-+msgstr ""
-+
-+#: ../statistics.c:196
-+#, c-format
-+msgid "Detected reordering %u times using reno fast retransmit"
-+msgstr ""
-+
-+#: ../statistics.c:197
-+#, c-format
-+msgid "%u congestion windows fully recovered"
-+msgstr ""
-+
-+#: ../statistics.c:198
-+#, c-format
-+msgid "%u congestion windows partially recovered using Hoe heuristic"
-+msgstr ""
-+
-+#: ../statistics.c:199
-+#, c-format
-+msgid "%u congestion window recovered using DSACK"
-+msgstr ""
-+
-+#: ../statistics.c:200
-+#, c-format
-+msgid "%u congestion windows recovered after partial ack"
-+msgstr ""
-+
-+#: ../statistics.c:201
-+#, c-format
-+msgid "%u retransmits lost"
-+msgstr ""
-+
-+#: ../statistics.c:202
-+#, c-format
-+msgid "%u timeouts after reno fast retransmit"
-+msgstr ""
-+
-+#: ../statistics.c:203
-+#, c-format
-+msgid "%u timeouts after SACK recovery"
-+msgstr ""
-+
-+#: ../statistics.c:204
-+#, c-format
-+msgid "%u timeouts in loss state"
-+msgstr ""
-+
-+#: ../statistics.c:205
-+#, c-format
-+msgid "%u fast retransmits"
-+msgstr ""
-+
-+#: ../statistics.c:206
-+#, c-format
-+msgid "%u forward retransmits"
-+msgstr ""
-+
-+#: ../statistics.c:207
-+#, c-format
-+msgid "%u retransmits in slow start"
-+msgstr ""
-+
-+#: ../statistics.c:208
-+#, c-format
-+msgid "%u other TCP timeouts"
-+msgstr ""
-+
-+#: ../statistics.c:209
-+#, c-format
-+msgid "%u reno fast retransmits failed"
-+msgstr ""
-+
-+#: ../statistics.c:210
-+#, c-format
-+msgid "%u sack retransmits failed"
-+msgstr ""
-+
-+#: ../statistics.c:211
-+#, c-format
-+msgid "%u times receiver scheduled too late for direct processing"
-+msgstr ""
-+
-+#: ../statistics.c:212
-+#, c-format
-+msgid "%u packets collapsed in receive queue due to low socket buffer"
-+msgstr ""
-+
-+#: ../statistics.c:213
-+#, c-format
-+msgid "%u DSACKs sent for old packets"
-+msgstr ""
-+
-+#: ../statistics.c:214
-+#, c-format
-+msgid "%u DSACKs sent for out of order packets"
-+msgstr ""
-+
-+#: ../statistics.c:215
-+#, c-format
-+msgid "%u DSACKs received"
-+msgstr ""
-+
-+#: ../statistics.c:216
-+#, c-format
-+msgid "%u DSACKs for out of order packets received"
-+msgstr ""
-+
-+#: ../statistics.c:217
-+#, c-format
-+msgid "%u connections reset due to unexpected SYN"
-+msgstr ""
-+
-+#: ../statistics.c:218
-+#, c-format
-+msgid "%u connections reset due to unexpected data"
-+msgstr ""
-+
-+#: ../statistics.c:219
-+#, c-format
-+msgid "%u connections reset due to early user close"
-+msgstr ""
-+
-+#: ../statistics.c:220
-+#, c-format
-+msgid "%u connections aborted due to memory pressure"
-+msgstr ""
-+
-+#: ../statistics.c:221
-+#, c-format
-+msgid "%u connections aborted due to timeout"
-+msgstr ""
-+
-+#: ../statistics.c:222
-+#, c-format
-+msgid "%u connections aborted after user close in linger timeout"
-+msgstr ""
-+
-+#: ../statistics.c:223
-+#, c-format
-+msgid "%u times unabled to send RST due to no memory"
-+msgstr ""
-+
-+#: ../statistics.c:224
-+#, c-format
-+msgid "TCP ran low on memory %u times"
-+msgstr ""
-+
-+#: ../statistics.c:225
-+#, c-format
-+msgid "%u TCP data loss events"
-+msgstr ""
-+
-+#: ../statistics.c:292
- msgid "enabled"
- msgstr ""
- 
--#: ../statistics.c:253
-+#: ../statistics.c:292
- msgid "disabled"
- msgstr ""
- 
--#: ../statistics.c:336
-+#: ../statistics.c:375
- msgid "error parsing /proc/net/snmp"
- msgstr ""
- 
--#: ../statistics.c:349
-+#: ../statistics.c:388
- msgid "cannot open /proc/net/snmp"
- msgstr ""
- 
-@@ -1617,7 +2002,7 @@
- msgid "Cannot change line discipline to `%s'.\n"
- msgstr ""
- 
--#: ../lib/af.c:153 ../lib/hw.c:156
-+#: ../lib/af.c:153 ../lib/hw.c:161
- msgid "UNSPEC"
- msgstr ""
- 
-@@ -1633,11 +2018,11 @@
- msgid "IPv6"
- msgstr ""
- 
--#: ../lib/af.c:164 ../lib/hw.c:177
-+#: ../lib/af.c:164 ../lib/hw.c:182
- msgid "AMPR AX.25"
- msgstr ""
- 
--#: ../lib/af.c:167 ../lib/hw.c:183
-+#: ../lib/af.c:167 ../lib/hw.c:188
- msgid "AMPR NET/ROM"
- msgstr ""
- 
-@@ -1649,7 +2034,7 @@
- msgid "Appletalk DDP"
- msgstr ""
- 
--#: ../lib/af.c:176 ../lib/hw.c:218
-+#: ../lib/af.c:176 ../lib/hw.c:223
- msgid "Econet"
- msgstr ""
- 
-@@ -1657,19 +2042,21 @@
- msgid "CCITT X.25"
- msgstr ""
- 
--#: ../lib/af.c:182 ../lib/hw.c:180
-+#: ../lib/af.c:182 ../lib/hw.c:185
- msgid "AMPR ROSE"
- msgstr ""
- 
--#: ../lib/af.c:185 ../lib/hw.c:168
-+#: ../lib/af.c:185 ../lib/hw.c:173
- msgid "Ash"
- msgstr ""
- 
- #: ../lib/af.c:243
-+#, c-format
- msgid "Please don't supply more than one address family.\n"
- msgstr ""
- 
- #: ../lib/af.c:304
-+#, c-format
- msgid "Too much address family arguments.\n"
- msgstr ""
- 
-@@ -1694,6 +2081,7 @@
- msgstr ""
- 
- #: ../lib/ash.c:81
-+#, c-format
- msgid "Malformed Ash address"
- msgstr ""
- 
-@@ -1712,22 +2100,21 @@
- msgstr ""
- 
- #: ../lib/ax25_gr.c:47
-+#, c-format
- msgid "AX.25 not configured in this system.\n"
- msgstr ""
- 
- #: ../lib/ax25_gr.c:50
-+#, c-format
- msgid "Kernel AX.25 routing table\n"
- msgstr ""
- 
- #. xxx
- #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
-+#, c-format
- msgid "Destination  Iface    Use\n"
- msgstr ""
- 
--#: ../lib/ddp_gr.c:21
--msgid "Routing table for `ddp' not yet supported.\n"
--msgstr ""
--
- #: ../lib/ether.c:74 ../lib/ether.c:91
- #, c-format
- msgid "in_ether(%s): invalid ether address!\n"
-@@ -1783,90 +2170,94 @@
- msgid "in_hippi(%s): trailing junk!\n"
- msgstr ""
- 
--#: ../lib/hw.c:155
-+#: ../lib/hw.c:160
- msgid "Local Loopback"
- msgstr ""
- 
--#: ../lib/hw.c:158
-+#: ../lib/hw.c:163
- msgid "Serial Line IP"
- msgstr ""
- 
--#: ../lib/hw.c:159
-+#: ../lib/hw.c:164
- msgid "VJ Serial Line IP"
- msgstr ""
- 
--#: ../lib/hw.c:160
-+#: ../lib/hw.c:165
- msgid "6-bit Serial Line IP"
- msgstr ""
- 
--#: ../lib/hw.c:161
-+#: ../lib/hw.c:166
- msgid "VJ 6-bit Serial Line IP"
- msgstr ""
- 
--#: ../lib/hw.c:162
-+#: ../lib/hw.c:167
- msgid "Adaptive Serial Line IP"
- msgstr ""
- 
--#: ../lib/hw.c:165
-+#: ../lib/hw.c:170
- msgid "Ethernet"
- msgstr ""
- 
--#: ../lib/hw.c:171
-+#: ../lib/hw.c:176
- msgid "Fiber Distributed Data Interface"
- msgstr ""
- 
--#: ../lib/hw.c:174
-+#: ../lib/hw.c:179
- msgid "HIPPI"
- msgstr ""
- 
--#: ../lib/hw.c:186
-+#: ../lib/hw.c:191
- msgid "generic X.25"
- msgstr ""
- 
--#: ../lib/hw.c:189
-+#: ../lib/hw.c:194
- msgid "IPIP Tunnel"
- msgstr ""
- 
--#: ../lib/hw.c:192
-+#: ../lib/hw.c:197
- msgid "Point-to-Point Protocol"
- msgstr ""
- 
--#: ../lib/hw.c:195
-+#: ../lib/hw.c:200
- msgid "(Cisco)-HDLC"
- msgstr ""
- 
--#: ../lib/hw.c:196
-+#: ../lib/hw.c:201
- msgid "LAPB"
- msgstr ""
- 
--#: ../lib/hw.c:199
-+#: ../lib/hw.c:204
- msgid "ARCnet"
- msgstr ""
- 
--#: ../lib/hw.c:202
-+#: ../lib/hw.c:207
- msgid "Frame Relay DLCI"
- msgstr ""
- 
--#: ../lib/hw.c:203
-+#: ../lib/hw.c:208
- msgid "Frame Relay Access Device"
- msgstr ""
- 
--#: ../lib/hw.c:206
-+#: ../lib/hw.c:211
- msgid "IPv6-in-IPv4"
- msgstr ""
- 
--#: ../lib/hw.c:209
-+#: ../lib/hw.c:214
- msgid "IrLAP"
- msgstr ""
- 
--#: ../lib/hw.c:212
-+#: ../lib/hw.c:217
- msgid "16/4 Mbps Token Ring"
- msgstr ""
- 
--#: ../lib/hw.c:214
-+#: ../lib/hw.c:219
- msgid "16/4 Mbps Token Ring (New)"
- msgstr ""
- 
-+#: ../lib/hw.c:226
-+msgid "Generic EUI-64"
-+msgstr ""
-+
- #: ../lib/inet.c:153 ../lib/inet6.c:79
- #, c-format
- msgid "rresolve: unsupport address family %d !\n"
-@@ -1877,131 +2268,157 @@
- msgstr ""
- 
- #: ../lib/inet6_gr.c:71
-+#, c-format
- msgid "INET6 (IPv6) not configured in this system.\n"
- msgstr ""
- 
- #: ../lib/inet6_gr.c:74
-+#, c-format
- msgid "Kernel IPv6 routing table\n"
- msgstr ""
- 
- #: ../lib/inet6_gr.c:76
-+#, c-format
- msgid ""
--"Destination                                 Next Hop                         "
--"       Flags Metric Ref    Use Iface\n"
-+"Destination                                 Next "
-+"Hop                                Flags Metric Ref    Use Iface\n"
- msgstr ""
- 
- #: ../lib/inet6_gr.c:150
-+#, c-format
- msgid "Kernel IPv6 Neighbour Cache\n"
- msgstr ""
- 
- #: ../lib/inet6_gr.c:153
-+#, c-format
- msgid ""
- "Neighbour                                   HW Address        Iface    Flags "
- "Ref State\n"
- msgstr ""
- 
- #: ../lib/inet6_gr.c:157
-+#, c-format
- msgid ""
- "Neighbour                                   HW Address        Iface    Flags "
- "Ref State            Stale(sec) Delete(sec)\n"
- msgstr ""
- 
- #: ../lib/inet6_sr.c:46
-+#, c-format
- msgid "Usage: inet6_route [-vF] del Target\n"
- msgstr ""
- 
- #: ../lib/inet6_sr.c:47
-+#, c-format
- msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
- msgstr ""
- 
- #: ../lib/inet6_sr.c:48
-+#, c-format
- msgid "       inet6_route [-FC] flush      NOT supported\n"
- msgstr ""
- 
- #: ../lib/inet6_sr.c:188
-+#, c-format
- msgid "Flushing `inet6' routing table not supported\n"
- msgstr ""
- 
- #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
-+#, c-format
- msgid "INET (IPv4) not configured in this system.\n"
- msgstr ""
- 
- #: ../lib/inet_gr.c:53
-+#, c-format
- msgid "Kernel IP routing table\n"
- msgstr ""
- 
- #: ../lib/inet_gr.c:56
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags Metric Ref    Use "
- "Iface\n"
- msgstr ""
- 
- #: ../lib/inet_gr.c:59
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags   MSS Window  irtt "
- "Iface\n"
- msgstr ""
- 
- #: ../lib/inet_gr.c:62
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt\n"
- msgstr ""
- 
- #: ../lib/inet_gr.c:237
-+#, c-format
- msgid "Kernel IP routing cache\n"
- msgstr ""
- 
- #: ../lib/inet_gr.c:258
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface\n"
- msgstr ""
- 
- #: ../lib/inet_gr.c:261
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags   MSS Window  irtt "
- "Iface\n"
- msgstr ""
- 
- #: ../lib/inet_gr.c:266
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt  HH  Arp\n"
- msgstr ""
- 
- #: ../lib/inet_gr.c:290
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
- msgstr ""
- 
--#: ../lib/inet_sr.c:50
-+#: ../lib/inet_sr.c:51
-+#, c-format
- msgid ""
- "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
- "[[dev] If]\n"
- msgstr ""
- 
--#: ../lib/inet_sr.c:51
-+#: ../lib/inet_sr.c:52
-+#, c-format
- msgid ""
- "       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
- msgstr ""
- 
--#: ../lib/inet_sr.c:52
-+#: ../lib/inet_sr.c:53
-+#, c-format
- msgid ""
- "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
- msgstr ""
- 
--#: ../lib/inet_sr.c:53
-+#: ../lib/inet_sr.c:54
-+#, c-format
- msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
- msgstr ""
- 
--#: ../lib/inet_sr.c:54
-+#: ../lib/inet_sr.c:55
-+#, c-format
- msgid ""
- "       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
- msgstr ""
- 
--#: ../lib/inet_sr.c:55
-+#: ../lib/inet_sr.c:56
-+#, c-format
- msgid "       inet_route [-FC] flush      NOT supported\n"
- msgstr ""
- 
-@@ -2011,14 +2428,17 @@
- msgstr ""
- 
- #: ../lib/inet_sr.c:174
-+#, c-format
- msgid "route: Invalid MSS/MTU.\n"
- msgstr ""
- 
- #: ../lib/inet_sr.c:187
-+#, c-format
- msgid "route: Invalid window.\n"
- msgstr ""
- 
- #: ../lib/inet_sr.c:203
-+#, c-format
- msgid "route: Invalid initial rtt.\n"
- msgstr ""
- 
-@@ -2033,73 +2453,90 @@
- msgstr ""
- 
- #: ../lib/inet_sr.c:270
-+#, c-format
- msgid "route: netmask doesn't match route address\n"
- msgstr ""
- 
- #: ../lib/inet_sr.c:306
-+#, c-format
- msgid "Flushing `inet' routing table not supported\n"
- msgstr ""
- 
- #: ../lib/inet_sr.c:310
-+#, c-format
- msgid "Modifying `inet' routing cache not supported\n"
- msgstr ""
- 
- #: ../lib/ipx_gr.c:52
-+#, c-format
- msgid "IPX not configured in this system.\n"
- msgstr ""
- 
- #: ../lib/ipx_gr.c:56
-+#, c-format
- msgid "Kernel IPX routing table\n"
- msgstr ""
- 
- #. xxx
- #: ../lib/ipx_gr.c:57
-+#, c-format
- msgid "Destination               Router Net                Router Node\n"
- msgstr ""
- 
- #: ../lib/ipx_sr.c:33
-+#, c-format
- msgid "IPX: this needs to be written\n"
- msgstr ""
- 
- #: ../lib/masq_info.c:198
-+#, c-format
- msgid "IP masquerading entries\n"
- msgstr ""
- 
- #: ../lib/masq_info.c:201
-+#, c-format
- msgid "prot   expire source               destination          ports\n"
- msgstr ""
- 
- #: ../lib/masq_info.c:204
-+#, c-format
- msgid ""
--"prot   expire    initseq delta prevd source               destination        "
--"  ports\n"
-+"prot   expire    initseq delta prevd source               "
-+"destination          ports\n"
- msgstr ""
- 
- #: ../lib/netrom_gr.c:48
-+#, c-format
- msgid "NET/ROM not configured in this system.\n"
- msgstr ""
- 
- #: ../lib/netrom_gr.c:51
-+#, c-format
- msgid "Kernel NET/ROM routing table\n"
- msgstr ""
- 
- #: ../lib/netrom_gr.c:52
-+#, c-format
- msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
- msgstr ""
- 
- #: ../lib/netrom_sr.c:34
-+#, c-format
- msgid "netrom usage\n"
- msgstr ""
- 
- #: ../lib/netrom_sr.c:44
-+#, c-format
- msgid "NET/ROM: this needs to be written\n"
- msgstr ""
- 
- #: ../lib/ppp.c:44
-+#, c-format
- msgid "You cannot start PPP with this program.\n"
- msgstr ""
- 
- #: ../lib/ppp_ac.c:38
-+#, c-format
- msgid "Sorry, use pppd!\n"
- msgstr ""
- 
-@@ -2108,287 +2545,314 @@
- msgstr ""
- 
- #: ../lib/rose_gr.c:51
-+#, c-format
- msgid "ROSE not configured in this system.\n"
- msgstr ""
- 
- #: ../lib/rose_gr.c:54
-+#, c-format
- msgid "Kernel ROSE routing table\n"
- msgstr ""
- 
--#: ../lib/tr.c:70 ../lib/tr.c:85
-+#: ../lib/tr.c:86 ../lib/tr.c:101
- #, c-format
- msgid "in_tr(%s): invalid token ring address!\n"
- msgstr ""
- 
--#: ../lib/tr.c:97
-+#: ../lib/tr.c:113
- #, c-format
- msgid "in_tr(%s): trailing : ignored!\n"
- msgstr ""
- 
--#: ../lib/tr.c:109
-+#: ../lib/tr.c:125
- #, c-format
- msgid "in_tr(%s): trailing junk!\n"
- msgstr ""
- 
--#: ../lib/interface.c:164
-+#: ../lib/interface.c:176
- #, c-format
- msgid "warning: no inet socket available: %s\n"
- msgstr ""
- 
--#: ../lib/interface.c:316
-+#: ../lib/interface.c:325
- #, c-format
- msgid "Warning: cannot open %s (%s). Limited output.\n"
- msgstr ""
- 
- #. Give better error message for this case.
--#: ../lib/interface.c:556
-+#: ../lib/interface.c:571
- msgid "Device not found"
- msgstr ""
- 
--#: ../lib/interface.c:560
-+#: ../lib/interface.c:575
- #, c-format
- msgid "%s: error fetching interface information: %s\n"
- msgstr ""
- 
--#: ../lib/interface.c:593
-+#: ../lib/interface.c:608
- msgid "     - no statistics available -"
- msgstr ""
- 
--#: ../lib/interface.c:597
-+#: ../lib/interface.c:612
-+#, c-format
- msgid "[NO FLAGS]"
- msgstr ""
- 
--#: ../lib/interface.c:673
-+#: ../lib/interface.c:688
- #, c-format
- msgid "%-9.9s Link encap:%s  "
- msgstr ""
- 
--#: ../lib/interface.c:678
-+#: ../lib/interface.c:693
- #, c-format
- msgid "HWaddr %s  "
- msgstr ""
- 
--#: ../lib/interface.c:681
-+#: ../lib/interface.c:696
- #, c-format
- msgid "Media:%s"
- msgstr ""
- 
--#: ../lib/interface.c:683
-+#: ../lib/interface.c:698
-+#, c-format
- msgid "(auto)"
- msgstr ""
- 
--#: ../lib/interface.c:690
-+#: ../lib/interface.c:705
- #, c-format
- msgid "          %s addr:%s "
- msgstr ""
- 
--#: ../lib/interface.c:693
-+#: ../lib/interface.c:708
- #, c-format
- msgid " P-t-P:%s "
- msgstr ""
- 
--#: ../lib/interface.c:696
-+#: ../lib/interface.c:711
- #, c-format
- msgid " Bcast:%s "
- msgstr ""
- 
--#: ../lib/interface.c:698
-+#: ../lib/interface.c:713
- #, c-format
- msgid " Mask:%s\n"
- msgstr ""
- 
--#: ../lib/interface.c:715
-+#: ../lib/interface.c:730
- #, c-format
- msgid "          inet6 addr: %s/%d"
- msgstr ""
- 
--#: ../lib/interface.c:717
-+#: ../lib/interface.c:732
-+#, c-format
- msgid " Scope:"
- msgstr ""
- 
--#: ../lib/interface.c:720
-+#: ../lib/interface.c:735
-+#, c-format
- msgid "Global"
- msgstr ""
- 
--#: ../lib/interface.c:723
-+#: ../lib/interface.c:738
-+#, c-format
- msgid "Link"
- msgstr ""
- 
--#: ../lib/interface.c:726
-+#: ../lib/interface.c:741
-+#, c-format
- msgid "Site"
- msgstr ""
- 
--#: ../lib/interface.c:729
-+#: ../lib/interface.c:744
-+#, c-format
- msgid "Compat"
- msgstr ""
- 
--#: ../lib/interface.c:732
-+#: ../lib/interface.c:747
-+#, c-format
- msgid "Host"
- msgstr ""
- 
--#: ../lib/interface.c:735
-+#: ../lib/interface.c:750
-+#, c-format
- msgid "Unknown"
- msgstr ""
- 
--#: ../lib/interface.c:750
-+#: ../lib/interface.c:765
- #, c-format
- msgid "          IPX/Ethernet II addr:%s\n"
- msgstr ""
- 
--#: ../lib/interface.c:753
-+#: ../lib/interface.c:768
- #, c-format
- msgid "          IPX/Ethernet SNAP addr:%s\n"
- msgstr ""
- 
--#: ../lib/interface.c:756
-+#: ../lib/interface.c:771
- #, c-format
- msgid "          IPX/Ethernet 802.2 addr:%s\n"
- msgstr ""
- 
--#: ../lib/interface.c:759
-+#: ../lib/interface.c:774
- #, c-format
- msgid "          IPX/Ethernet 802.3 addr:%s\n"
- msgstr ""
- 
--#: ../lib/interface.c:769
-+#: ../lib/interface.c:784
- #, c-format
- msgid "          EtherTalk Phase 2 addr:%s\n"
- msgstr ""
- 
--#: ../lib/interface.c:778
-+#: ../lib/interface.c:793
- #, c-format
- msgid "          econet addr:%s\n"
- msgstr ""
- 
--#: ../lib/interface.c:785
-+#: ../lib/interface.c:800
-+#, c-format
- msgid "[NO FLAGS] "
- msgstr ""
- 
--#: ../lib/interface.c:787
-+#: ../lib/interface.c:802
-+#, c-format
- msgid "UP "
- msgstr ""
- 
--#: ../lib/interface.c:789
-+#: ../lib/interface.c:804
-+#, c-format
- msgid "BROADCAST "
- msgstr ""
- 
--#: ../lib/interface.c:791
-+#: ../lib/interface.c:806
-+#, c-format
- msgid "DEBUG "
- msgstr ""
- 
--#: ../lib/interface.c:793
-+#: ../lib/interface.c:808
-+#, c-format
- msgid "LOOPBACK "
- msgstr ""
- 
--#: ../lib/interface.c:795
-+#: ../lib/interface.c:810
-+#, c-format
- msgid "POINTOPOINT "
- msgstr ""
- 
--#: ../lib/interface.c:797
-+#: ../lib/interface.c:812
-+#, c-format
- msgid "NOTRAILERS "
- msgstr ""
- 
--#: ../lib/interface.c:799
-+#: ../lib/interface.c:814
-+#, c-format
- msgid "RUNNING "
- msgstr ""
- 
--#: ../lib/interface.c:801
-+#: ../lib/interface.c:816
-+#, c-format
- msgid "NOARP "
- msgstr ""
- 
--#: ../lib/interface.c:803
-+#: ../lib/interface.c:818
-+#, c-format
- msgid "PROMISC "
- msgstr ""
- 
--#: ../lib/interface.c:805
-+#: ../lib/interface.c:820
-+#, c-format
- msgid "ALLMULTI "
- msgstr ""
- 
--#: ../lib/interface.c:807
-+#: ../lib/interface.c:822
-+#, c-format
- msgid "SLAVE "
- msgstr ""
- 
--#: ../lib/interface.c:809
-+#: ../lib/interface.c:824
-+#, c-format
- msgid "MASTER "
- msgstr ""
- 
--#: ../lib/interface.c:811
-+#: ../lib/interface.c:826
-+#, c-format
- msgid "MULTICAST "
- msgstr ""
- 
--#: ../lib/interface.c:814
-+#: ../lib/interface.c:829
-+#, c-format
- msgid "DYNAMIC "
- msgstr ""
- 
- #. DONT FORGET TO ADD THE FLAGS IN ife_print_short
--#: ../lib/interface.c:817
-+#: ../lib/interface.c:832
- #, c-format
- msgid " MTU:%d  Metric:%d"
- msgstr ""
- 
--#: ../lib/interface.c:821
-+#: ../lib/interface.c:836
- #, c-format
- msgid "  Outfill:%d  Keepalive:%d"
- msgstr ""
- 
--#: ../lib/interface.c:835
-+#: ../lib/interface.c:850
- #, c-format
- msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
- msgstr ""
- 
--#: ../lib/interface.c:840
-+#: ../lib/interface.c:855
- #, c-format
- msgid "             compressed:%lu\n"
- msgstr ""
- 
--#: ../lib/interface.c:852
-+#: ../lib/interface.c:895
- #, c-format
- msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
- msgstr ""
- 
--#: ../lib/interface.c:856
-+#: ../lib/interface.c:899
- #, c-format
- msgid "          collisions:%lu "
- msgstr ""
- 
--#: ../lib/interface.c:858
-+#: ../lib/interface.c:901
- #, c-format
- msgid "compressed:%lu "
- msgstr ""
- 
--#: ../lib/interface.c:860
-+#: ../lib/interface.c:903
- #, c-format
- msgid "txqueuelen:%d "
- msgstr ""
- 
--#: ../lib/interface.c:862
-+#: ../lib/interface.c:905
- #, c-format
- msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
- msgstr ""
- 
--#: ../lib/interface.c:873
-+#: ../lib/interface.c:916
- #, c-format
- msgid "Interrupt:%d "
- msgstr ""
- 
- #. Only print devices using it for
- #. I/O maps
--#: ../lib/interface.c:876
-+#: ../lib/interface.c:919
- #, c-format
- msgid "Base address:0x%x "
- msgstr ""
- 
--#: ../lib/interface.c:878
-+#: ../lib/interface.c:921
- #, c-format
- msgid "Memory:%lx-%lx "
- msgstr ""
- 
--#: ../lib/interface.c:881
-+#: ../lib/interface.c:924
- #, c-format
- msgid "DMA chan:%x "
- msgstr ""
- 
- #: ../lib/sockets.c:63
-+#, c-format
- msgid "No usable address families found.\n"
- msgstr ""
- 
-@@ -2413,14 +2877,17 @@
- msgstr ""
- 
- #: ../ipmaddr.c:61
-+#, c-format
- msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
- msgstr ""
- 
- #: ../ipmaddr.c:62
-+#, c-format
- msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
- msgstr ""
- 
- #: ../ipmaddr.c:63
-+#, c-format
- msgid "       ipmaddr -V | -version\n"
- msgstr ""
- 
-@@ -2449,6 +2916,7 @@
- msgstr ""
- 
- #: ../slattach.c:192
-+#, c-format
- msgid "slattach: cannot write PID file\n"
- msgstr ""
- 
-@@ -2468,18 +2936,22 @@
- msgstr ""
- 
- #: ../slattach.c:468
-+#, c-format
- msgid "slattach: tty name too long\n"
- msgstr ""
- 
- #: ../slattach.c:498
-+#, c-format
- msgid "slattach: tty_open: cannot get current state!\n"
- msgstr ""
- 
- #: ../slattach.c:505
-+#, c-format
- msgid "slattach: tty_open: cannot get current line disc!\n"
- msgstr ""
- 
- #: ../slattach.c:513
-+#, c-format
- msgid "slattach: tty_open: cannot set RAW mode!\n"
- msgstr ""
- 
-@@ -2489,6 +2961,7 @@
- msgstr ""
- 
- #: ../slattach.c:530
-+#, c-format
- msgid "slattach: tty_open: cannot set 8N1 mode!\n"
- msgstr ""
- 
---- net-tools-1.60.orig/po/cs.po
-+++ net-tools-1.60/po/cs.po
-@@ -5,7 +5,8 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: net-tools-1.51\n"
--"POT-Creation-Date: 2000-02-14 02:31+0100\n"
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2007-06-30 12:28+0900\n"
- "PO-Revision-Date: 1999-08-29 23:20+0200\n"
- "Last-Translator: Jiøí Pavlovský <pavlovsk@ff.cuni.cz>\n"
- "Language-Team: Czech <cs@li.org>\n"
-@@ -13,96 +14,110 @@
- "Content-Type: text/plain; charset=iso-8859-2\n"
- "Content-Transfer-Encoding: 8bit\n"
- 
--#: ../arp.c:110 ../arp.c:269
-+#: ../arp.c:112 ../arp.c:279
-+#, c-format
- msgid "arp: need host name\n"
- msgstr "arp: je tøeba jméno poèítaèe\n"
- 
--#: ../arp.c:207 ../arp.c:221
-+#: ../arp.c:215 ../arp.c:230
- #, c-format
- msgid "No ARP entry for %s\n"
- msgstr "Pro %s neexistuje ARP polo¾ka\n"
- 
--#: ../arp.c:239
-+#: ../arp.c:248
- #, c-format
- msgid "arp: cant get HW-Address for `%s': %s.\n"
- msgstr "arp: HW adresu `%s' nelze zjistit: %s\n"
- 
--#: ../arp.c:243
-+#: ../arp.c:252
-+#, c-format
- msgid "arp: protocol type mismatch.\n"
- msgstr "arp: chybnì zadaný typ protokolu\n"
- 
--#: ../arp.c:252
-+#: ../arp.c:261
- #, c-format
- msgid "arp: device `%s' has HW address %s `%s'.\n"
- msgstr "arp: zaøízení `%s' má Hw adresu %s `%s'.\n"
- 
--#: ../arp.c:282
-+#: ../arp.c:293
-+#, c-format
- msgid "arp: need hardware address\n"
- msgstr "arp: je tøeba hardwarová adresa\n"
- 
--#: ../arp.c:290
-+#: ../arp.c:301
-+#, c-format
- msgid "arp: invalid hardware address\n"
- msgstr "arp: nesprávná hardwarová adresa\n"
- 
--#: ../arp.c:387
-+#: ../arp.c:398
- #, c-format
- msgid "arp: cannot open etherfile %s !\n"
- msgstr "arp: databázi ethernetových adres %s nelze otevøít!\n"
- 
--#: ../arp.c:403
-+#: ../arp.c:414
- #, c-format
- msgid "arp: format error on line %u of etherfile %s !\n"
- msgstr "arp: syntaktická chyba na øádku %u databáze ethernetových adres %s!\n"
- 
--#: ../arp.c:416
-+#: ../arp.c:427
- #, c-format
- msgid "arp: cannot set entry on line %u of etherfile %s !\n"
- msgstr ""
- "arp: polo¾ku na øádku %u databáze ethernetových adres %s nelze nastavit!\n"
- 
--#: ../arp.c:437
--msgid "Address\t\t\tHWtype\tHWaddress\t    Flags Mask\t\t  Iface\n"
-+#: ../arp.c:448
-+#, fuzzy, c-format
-+msgid ""
-+"Address                  HWtype  HWaddress           Flags Mask            "
-+"Iface\n"
- msgstr "Adresa\t\t\t HWtyp\t HWadresa\t     Pøíz  Maska\t\t   Rozhraní\n"
- 
--#: ../arp.c:467
-+#: ../arp.c:476
-+#, fuzzy
-+msgid "<from_interface>"
-+msgstr " rozhraní %s\n"
-+
-+#: ../arp.c:478
- msgid "(incomplete)"
- msgstr "(nekompletní)"
- 
--#: ../arp.c:484
-+#: ../arp.c:495
- #, c-format
- msgid "%s (%s) at "
- msgstr "%s (%s) na "
- 
--#: ../arp.c:490
-+#: ../arp.c:501
-+#, c-format
- msgid "<incomplete> "
- msgstr "<nekompletní>"
- 
--#: ../arp.c:496
-+#: ../arp.c:507
- #, c-format
- msgid "netmask %s "
- msgstr "sí»ová maska %s "
- 
--#: ../arp.c:513
-+#: ../arp.c:524
- #, c-format
- msgid "on %s\n"
- msgstr "na %s\n"
- 
--#: ../arp.c:592
-+#: ../arp.c:605
- #, c-format
- msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
- msgstr "Polo¾ky: %d\tVynecháno: %d\tNalezeno: %d\n"
- 
--#: ../arp.c:596
-+#: ../arp.c:609
- #, c-format
- msgid "%s (%s) -- no entry\n"
- msgstr "%s (%s) -- ¾ádná polo¾ka\n"
- 
--#: ../arp.c:598
-+#: ../arp.c:611
- #, c-format
- msgid "arp: in %d entries no match found.\n"
- msgstr "arp: ¾ádná z polo¾ek (%d) nevyhovuje.\n"
- 
--#: ../arp.c:613
-+#: ../arp.c:626
-+#, c-format
- msgid ""
- "Usage:\n"
- "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
-@@ -112,49 +127,46 @@
- "  arp [-vn]  [<HW>] [-i <if> [-a] [<poèítaè>]             <-Zobrazí ARP "
- "cache\n"
- 
--#: ../arp.c:614
-+#: ../arp.c:627
-+#, fuzzy, c-format
- msgid ""
--"  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP "
-+"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
- "entry\n"
- msgstr ""
- "  arp [-v]          [-i <if>] -d <poèítaè> [pub][nopub]   <-Sma¾e polo¾ku "
- "ARP\n"
- 
--#: ../arp.c:615
--#, fuzzy
-+#: ../arp.c:628
-+#, fuzzy, c-format
- msgid ""
--"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from "
-+"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
- "file\n"
- msgstr ""
- "  arp [-vnD] [<HW>] [-i <if>] -f <soubor>                 <-Pøidá polo¾ku "
- "ze\n"
- "                                                          souboru\n"
- 
--#: ../arp.c:616
-+#: ../arp.c:629
-+#, fuzzy, c-format
- msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add "
-+"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
- "entry\n"
- msgstr ""
- "  arp [-v]   [<HW> [-i <if> -s   <poèítaè> <hwadr> [temp][nopub] <-Pøidá "
- "polo¾ku\n"
- 
--#: ../arp.c:617
--msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
--"<-''-\n"
--msgstr ""
--"  arp [-v]   [<HW>] [-i <if>] -s <soubor> <hwadr> [sí»mask <èís>]  <-''-\n"
--
--#: ../arp.c:618
-+#: ../arp.c:630
-+#, fuzzy, c-format
- msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      "
-+"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
- "<-''-\n"
- "\n"
- msgstr ""
- "  arp [-v]   [<HW> [-i <if> -Ds  <poèítaè> <if> [sí»mask <èís>] pub      "
- "<-''-\n"
- 
--#: ../arp.c:620
-+#: ../arp.c:632
-+#, c-format
- msgid ""
- "        -a                       display (all) hosts in alternative (BSD) "
- "style\n"
-@@ -162,126 +174,134 @@
- "        -a                       zobrazí jmna v¹ech poèítaèù alternativním\n"
- "                                 (BSD) zpùsobem\n"
- 
--#: ../arp.c:621
-+#: ../arp.c:633
-+#, c-format
- msgid "        -s, --set                set a new ARP entry\n"
- msgstr "        -s, --set                nastaví novou ARP polo¾ku\n"
- 
--#: ../arp.c:622
-+#: ../arp.c:634
-+#, c-format
- msgid "        -d, --delete             delete a specified entry\n"
- msgstr "        -d, --delete             sma¾e zadanou ARP polo¾ku\n"
- 
--#: ../arp.c:623 ../netstat.c:1436 ../route.c:85
-+#: ../arp.c:635 ../netstat.c:1503 ../route.c:86
-+#, c-format
- msgid "        -v, --verbose            be verbose\n"
- msgstr ""
- "        -v, --verbose            bude vypisovat podrobné zprávy\n"
- "                                 o èinnosti\n"
- 
--#: ../arp.c:624 ../netstat.c:1437 ../route.c:86
--msgid "        -n, --numeric            dont resolve names\n"
-+#: ../arp.c:636 ../netstat.c:1504 ../route.c:87
-+#, fuzzy, c-format
-+msgid "        -n, --numeric            don't resolve names\n"
- msgstr ""
- "        -n, --numeric            nebude pøevádìt èíselné adresy\n"
- "                                 na kanonická jména\n"
- 
--#: ../arp.c:625
-+#: ../arp.c:637
-+#, c-format
- msgid ""
- "        -i, --device             specify network interface (e.g. eth0)\n"
- msgstr "        -i, --device             zadává sí»ové rozhraní (napø. eth0)\n"
- 
--#: ../arp.c:626
-+#: ../arp.c:638
-+#, c-format
- msgid "        -D, --use-device         read <hwaddr> from given device\n"
- msgstr "        -D, --use-device         ète <hwadr> ze zadaného zaøízení\n"
- 
--#: ../arp.c:627
--#, fuzzy
-+#: ../arp.c:639
-+#, fuzzy, c-format
- msgid "        -A, -p, --protocol       specify protocol family\n"
- msgstr "         -r, --route              vypí¹e smìrovací tabulku\n"
- 
--#: ../arp.c:628
--#, fuzzy
-+#: ../arp.c:640
-+#, fuzzy, c-format
- msgid ""
--"        -f, --file               read new entries from file or from "
--"/etc/ethers\n"
-+"        -f, --file               read new entries from file or from /etc/"
-+"ethers\n"
- "\n"
- msgstr ""
- "        -f, --file               ète nové polo¾ky ze souboru\n"
- "\n"
- 
--#: ../arp.c:630 ../rarp.c:181
-+#: ../arp.c:642 ../rarp.c:182
- #, c-format
- msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
- msgstr ""
- "  <HW>=Pou¾ijte '-H <hw> pro zadání hardwarového typu adresy.\n"
- "  Implicitnì: %s\n"
- 
--#: ../arp.c:631 ../rarp.c:182
-+#: ../arp.c:643 ../rarp.c:183
-+#, c-format
- msgid "  List of possible hardware types (which support ARP):\n"
- msgstr "  Seznam mo¾ných hardwarových typù (podporujících ARP):\n"
- 
--#: ../arp.c:664
-+#: ../arp.c:677 ../arp.c:762
- #, c-format
- msgid "%s: hardware type not supported!\n"
- msgstr "hardwarový typ %s není podporován!\n"
- 
--#: ../arp.c:668
-+#: ../arp.c:681
- #, c-format
- msgid "%s: address family not supported!\n"
- msgstr "tøída adres %s není podporována!\n"
- 
--#: ../arp.c:703
-+#: ../arp.c:716
-+#, c-format
- msgid "arp: -N not yet supported.\n"
- msgstr "arp: pøepínaè -N není zatím podporován\n"
- 
--#: ../arp.c:713
-+#: ../arp.c:726
- #, c-format
- msgid "arp: %s: unknown address family.\n"
- msgstr "arp: neznámá tøída adres %s.\n"
- 
--#: ../arp.c:722
-+#: ../arp.c:735
- #, c-format
- msgid "arp: %s: unknown hardware type.\n"
- msgstr "arp: neznámý hardwarový typ %s.\n"
- 
--#: ../arp.c:741
-+#: ../arp.c:754
- #, c-format
- msgid "arp: %s: kernel only supports 'inet'.\n"
- msgstr "arp: %s: jádro podporuje pouze 'inet'.\n"
- 
--#: ../arp.c:746
-+#: ../arp.c:767
- #, c-format
- msgid "arp: %s: hardware type without ARP support.\n"
- msgstr "arp: hardwarový typ %s nepodporuje ARP.\n"
- 
--#: ../hostname.c:69
-+#: ../hostname.c:71
- #, c-format
- msgid "Setting nodename to `%s'\n"
- msgstr "Nastavuji jméno uzlu na `%s'\n"
- 
--#: ../hostname.c:74
-+#: ../hostname.c:76
- #, c-format
- msgid "%s: you must be root to change the node name\n"
- msgstr "%s: jméno uzlu mù¾e zmìnit pouze superu¾ivatel\n"
- 
--#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116
-+#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117
- #, c-format
- msgid "%s: name too long\n"
- msgstr "jméno %s je pøíli¹ dlouhé\n"
- 
--#: ../hostname.c:89
-+#: ../hostname.c:91
- #, c-format
- msgid "Setting hostname to `%s'\n"
- msgstr "Nastavuji jméno poèítaèe na `%s'\n"
- 
--#: ../hostname.c:94
-+#: ../hostname.c:96
- #, c-format
- msgid "%s: you must be root to change the host name\n"
- msgstr "%s: jméno poèítaèe mù¾e zmìnit pouze superu¾ivatel\n"
- 
--#: ../hostname.c:108
-+#: ../hostname.c:109
- #, c-format
- msgid "Setting domainname to `%s'\n"
- msgstr "Nastavuji jméno domény na `%s'\n"
- 
--#: ../hostname.c:113
-+#: ../hostname.c:114
- #, c-format
- msgid "%s: you must be root to change the domain name\n"
- msgstr "%s: jméno domény mù¾e zmìnit pouze superu¾ivatel\n"
-@@ -306,26 +326,29 @@
- msgid "Result: h_addr_list=`%s'\n"
- msgstr "Výsledek: h_addr_list=`%s'\n"
- 
--#: ../hostname.c:209
-+#: ../hostname.c:208
- #, c-format
- msgid "%s: can't open `%s'\n"
- msgstr "%s: `%s' nelze otevøít\n"
- 
--#: ../hostname.c:223
-+#: ../hostname.c:222
-+#, c-format
- msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
- msgstr ""
- "Pou¾ití:\n"
- "    hostname [-v] {jméno|-F soubor}       nastaví jméno poèítaèe (ze "
- "souboru)\n"
- 
--#: ../hostname.c:224
-+#: ../hostname.c:223
-+#, c-format
- msgid ""
- "       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
- msgstr ""
- "    domainname [-v] {jméno|-F soubor}     nastaví jméno NIS domény (ze\n"
- "                                          souboru)\n"
- 
--#: ../hostname.c:226
-+#: ../hostname.c:225
-+#, c-format
- msgid ""
- "       nodename [-v] {nodename|-F file}      set DECnet node name (from "
- "file)\n"
-@@ -333,11 +356,13 @@
- "    nodename [-v] {jméno|-F soubor}       nastaví jméno DECnet uzlu (ze\n"
- "                                          souboru)\n"
- 
--#: ../hostname.c:228
-+#: ../hostname.c:227
-+#, c-format
- msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
- msgstr "    hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  vypí¹e formátované jméno\n"
- 
--#: ../hostname.c:229
-+#: ../hostname.c:228
-+#, c-format
- msgid ""
- "       hostname [-v]                         display hostname\n"
- "\n"
-@@ -345,7 +370,8 @@
- "    hostname [-v]                         vypí¹e jméno poèítaèe\n"
- "\n"
- 
--#: ../hostname.c:230
-+#: ../hostname.c:229
-+#, c-format
- msgid ""
- "       hostname -V|--version|-h|--help       print info and exit\n"
- "\n"
-@@ -353,7 +379,8 @@
- "    hostname -V|--version|-h|--help       vypí¹e informace a skonèí\n"
- "\n"
- 
--#: ../hostname.c:231
-+#: ../hostname.c:230
-+#, c-format
- msgid ""
- "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
- "\n"
-@@ -361,35 +388,43 @@
- "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
- "\n"
- 
--#: ../hostname.c:232
-+#: ../hostname.c:231
-+#, c-format
- msgid "    -s, --short           short host name\n"
- msgstr "    -s, --short           krátké jméno poèítaèe\n"
- 
--#: ../hostname.c:233
-+#: ../hostname.c:232
-+#, c-format
- msgid "    -a, --alias           alias names\n"
- msgstr "    -a, --alias           pøezdívky\n"
- 
--#: ../hostname.c:234
-+#: ../hostname.c:233
-+#, c-format
- msgid "    -i, --ip-address      addresses for the hostname\n"
- msgstr "    -i, --ip-address      adresy odpovídající jménu poèítaèe\n"
- 
--#: ../hostname.c:235
-+#: ../hostname.c:234
-+#, c-format
- msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
- msgstr "    -f, --fqdn, --long    dlouhé jméno poèítaèe (kanonické)\n"
- 
--#: ../hostname.c:236
-+#: ../hostname.c:235
-+#, c-format
- msgid "    -d, --domain          DNS domain name\n"
- msgstr "    -d, --domain          jméno DNS domény\n"
- 
--#: ../hostname.c:237
-+#: ../hostname.c:236
-+#, c-format
- msgid "    -y, --yp, --nis       NIS/YP domainname\n"
- msgstr "    -y, --yp, --nis       jméno NIS/YP domény\n"
- 
--#: ../hostname.c:239
-+#: ../hostname.c:238
-+#, c-format
- msgid "    -n, --node            DECnet node name\n"
- msgstr "    -n, --node            jméno DECnet uzlu\n"
- 
--#: ../hostname.c:241
-+#: ../hostname.c:240
-+#, c-format
- msgid ""
- "    -F, --file            read hostname or NIS domainname from given file\n"
- "\n"
-@@ -397,7 +432,8 @@
- "    -F, --file            ète jméno poèítaèe èi nis domény ze souboru\n"
- "\n"
- 
--#: ../hostname.c:243
-+#: ../hostname.c:242
-+#, c-format
- msgid ""
- "   This command can read or set the hostname or the NIS domainname. You can\n"
- "   also read the DNS domain or the FQDN (fully qualified domain name).\n"
-@@ -412,6 +448,7 @@
- msgstr "%s: Tímto pøíkazem nelze DNS jméno domény zmìnit\n"
- 
- #: ../hostname.c:339
-+#, c-format
- msgid ""
- "\n"
- "Unless you are using bind or NIS for host lookups you can change the DNS\n"
-@@ -421,6 +458,7 @@
- "zmìnit\n"
- 
- #: ../hostname.c:340
-+#, c-format
- msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
- msgstr ""
- "DNS jméno domény (je souèástí kanonického jména poèítaèe) v souboru\n"
-@@ -441,349 +479,223 @@
- msgid "getnodename()=`%s'\n"
- msgstr "getnodename()=`%s'\n"
- 
--#: ../ifconfig.c:159
--#, c-format
--msgid "%-9.9s Link encap:%s  "
--msgstr "%-9.9s Zapouzdøení:%s  "
-+#: ../ifconfig.c:107
-+#, fuzzy, c-format
-+msgid ""
-+"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
-+"Flg\n"
-+msgstr ""
-+"Rozhr   MTU Met    PØ-OK PØ-CHYB PØ-ZAH PØ-PØT   OD-OK OD-CHYB OD-ZAH OD-PØT "
-+"PØZ\n"
- 
--#: ../ifconfig.c:164
--#, c-format
--msgid "HWaddr %s  "
--msgstr "HWadr %s  "
-+#: ../ifconfig.c:129 ../ifconfig.c:161
-+#, fuzzy, c-format
-+msgid "%s: ERROR while getting interface flags: %s\n"
-+msgstr "%s: chyba pøi získávání informací o rozhraní %s\n"
- 
--#: ../ifconfig.c:167
-+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
-+#: ../ifconfig.c:973
- #, c-format
--msgid "Media:%s"
--msgstr "Médium:%s"
-+msgid "No support for INET on this system.\n"
-+msgstr "Tento systém nepodporuje INET.\n"
- 
--#: ../ifconfig.c:169
--msgid "(auto)"
--msgstr "(auto)"
-+#: ../ifconfig.c:193
-+#, fuzzy, c-format
-+msgid "%s: ERROR while testing interface flags: %s\n"
-+msgstr "%s: chyba pøi získávání informací o rozhraní %s\n"
- 
--#: ../ifconfig.c:176
--#, c-format
--msgid "          %s addr:%s "
--msgstr "          %s adr:%s "
-+#: ../ifconfig.c:202
-+#, fuzzy, c-format
-+msgid ""
-+"Usage:\n"
-+"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
-+msgstr ""
-+"Pou¾ití:\n"
-+"  ifconfig [-a] [-i] [-v] <rozhraní> [[<AF>] <adresa>]\n"
- 
--#: ../ifconfig.c:179
-+#: ../ifconfig.c:204
- #, c-format
--msgid " P-t-P:%s "
--msgstr " P-t-P:%s "
-+msgid "  [add <address>[/<prefixlen>]]\n"
-+msgstr "  [add <adresa>[/<délka prefixu>]]\n"
- 
--# V ostatních katalozích se pøekládá Broadcast -> v¹esmìrové vysílání.
--# Tudi¾ bcast -> V¹esmìr :)
--#: ../ifconfig.c:182
-+#: ../ifconfig.c:205
- #, c-format
--msgid " Bcast:%s "
--msgstr " V¹esmìr:%s "
-+msgid "  [del <address>[/<prefixlen>]]\n"
-+msgstr "  [del <adresa>[/<délka prefixu>]]\n"
- 
--#: ../ifconfig.c:184
-+#: ../ifconfig.c:206
- #, c-format
--msgid " Mask:%s\n"
--msgstr "Maska:%s\n"
-+msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
-+msgstr "  [[-]broadcast [<adresa>]]  [[-]pointopoint [<adresa>]]\n"
- 
--#: ../ifconfig.c:201
-+#: ../ifconfig.c:207
- #, c-format
--msgid "          inet6 addr: %s/%d"
--msgstr "          inet6-adr: %s/%d"
-+msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
-+msgstr "  [netmask <adresa>]  [dstaddr <adresa>]  [tunnel <adresa>]\n"
- 
--#: ../ifconfig.c:203
--msgid " Scope:"
--msgstr " Rozsah:"
-+#: ../ifconfig.c:210
-+#, c-format
-+msgid "  [outfill <NN>] [keepalive <NN>]\n"
-+msgstr "  [outfill <NN>] [keepalive <NN>]\n"
- 
--#: ../ifconfig.c:206
--msgid "Global"
--msgstr "Globál"
-+#: ../ifconfig.c:212
-+#, c-format
-+msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
-+msgstr "  [hw <HW> <adresa>]  [metric <NN>]  [mtu <NN>]\n"
- 
--#: ../ifconfig.c:209
--msgid "Link"
--msgstr "Linka"
-+#: ../ifconfig.c:213
-+#, c-format
-+msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-+msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
- 
--#: ../ifconfig.c:212
--msgid "Site"
--msgstr "Stanovi¹tì"
-+#: ../ifconfig.c:214
-+#, c-format
-+msgid "  [multicast]  [[-]promisc]\n"
-+msgstr "  [multicast]  [[-]promisc]\n"
- 
- #: ../ifconfig.c:215
--msgid "Compat"
--msgstr "Kompatibilita"
-+#, c-format
-+msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
-+msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <typ>]\n"
- 
--#: ../ifconfig.c:218
--msgid "Host"
--msgstr "Poèítaè"
-+#: ../ifconfig.c:217
-+#, c-format
-+msgid "  [txqueuelen <NN>]\n"
-+msgstr "  [txqueuelen délka]\n"
- 
--#: ../ifconfig.c:221
--msgid "Unknown"
--msgstr "Neznám."
-+#: ../ifconfig.c:220
-+#, c-format
-+msgid "  [[-]dynamic]\n"
-+msgstr "  [[-]dynamic]\n"
- 
--#: ../ifconfig.c:236
-+#: ../ifconfig.c:222
- #, c-format
--msgid "          IPX/Ethernet II addr:%s\n"
--msgstr "          IPX/Ethernet II adr: %s\n"
-+msgid ""
-+"  [up|down] ...\n"
-+"\n"
-+msgstr ""
-+"  [up|down] ...\n"
-+"\n"
- 
--#: ../ifconfig.c:239
-+#: ../ifconfig.c:224
- #, c-format
--msgid "          IPX/Ethernet SNAP addr:%s\n"
--msgstr "          IPX/Ethernet SNAP adr:%s\n"
-+msgid "  <HW>=Hardware Type.\n"
-+msgstr "   <HW>=Hardwarový Typ.\n"
- 
--#: ../ifconfig.c:242
-+#: ../ifconfig.c:225
- #, c-format
--msgid "          IPX/Ethernet 802.2 addr:%s\n"
--msgstr "          IPX/Ethernet 802.2 adr:%s\n"
-+msgid "  List of possible hardware types:\n"
-+msgstr "  Seznam mo¾ných hardwarových typù:\n"
- 
--#: ../ifconfig.c:245
-+#. 1 = ARPable
-+#: ../ifconfig.c:227
- #, c-format
--msgid "          IPX/Ethernet 802.3 addr:%s\n"
--msgstr "          IPX/Ethernet 802.3 adr:%s\n"
-+msgid "  <AF>=Address family. Default: %s\n"
-+msgstr "   <AF>=tøída adres. Implicitní: %s\n"
- 
--#: ../ifconfig.c:255
-+#: ../ifconfig.c:228
- #, c-format
--msgid "          EtherTalk Phase 2 addr:%s\n"
--msgstr "          EtherTalk Phase 2 adr:%s\n"
-+msgid "  List of possible address families:\n"
-+msgstr "  Seznam mo¾ných tøíd adres:\n"
- 
--#: ../ifconfig.c:264
-+#: ../ifconfig.c:303
- #, c-format
--msgid "          econet addr:%s\n"
--msgstr "          econet adr:%s\n"
-+msgid "ifconfig: option `%s' not recognised.\n"
-+msgstr ""
- 
--# Hic sunt leones ...
--#: ../ifconfig.c:270
--msgid "[NO FLAGS] "
--msgstr "[®ÁDNÉ PØÍZNAKY]"
-+#: ../ifconfig.c:305 ../ifconfig.c:962
-+#, c-format
-+msgid "ifconfig: `--help' gives usage information.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:272
--msgid "UP "
--msgstr "AKTIVOVÁNO "
-+#: ../ifconfig.c:380
-+#, c-format
-+msgid "Unknown media type.\n"
-+msgstr "Neznámý typ média.\n"
- 
--#: ../ifconfig.c:274
--msgid "BROADCAST "
--msgstr "V©ESMÌROVÉ_VYSÍLÁNÍ "
-+#: ../ifconfig.c:417
-+#, c-format
-+msgid ""
-+"Warning: Interface %s still in promisc mode... maybe other application is "
-+"running?\n"
-+msgstr ""
- 
--#: ../ifconfig.c:276
--msgid "DEBUG "
--msgstr "DEBUG "
-+#: ../ifconfig.c:429
-+#, c-format
-+msgid "Warning: Interface %s still in MULTICAST mode.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:278
--msgid "LOOPBACK "
--msgstr "SMYÈKA "
-+#: ../ifconfig.c:441
-+#, c-format
-+msgid "Warning: Interface %s still in ALLMULTI mode.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:280
--msgid "POINTOPOINT "
--msgstr "POINTOPOINT "
-+#: ../ifconfig.c:465
-+#, c-format
-+msgid "Warning: Interface %s still in DYNAMIC mode.\n"
-+msgstr ""
- 
--# ??
--#: ../ifconfig.c:282
--msgid "NOTRAILERS "
--msgstr "NOTRAILERS "
-+#: ../ifconfig.c:523
-+#, c-format
-+msgid "Warning: Interface %s still in BROADCAST mode.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:284
--msgid "RUNNING "
--msgstr "BÌ®Í "
-+#: ../ifconfig.c:652
-+#, c-format
-+msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:286
--msgid "NOARP "
--msgstr "NEARP "
-+#: ../ifconfig.c:684
-+#, c-format
-+msgid "hw address type `%s' has no handler to set address. failed.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:288
--msgid "PROMISC "
--msgstr "PROMISK "
-+#: ../ifconfig.c:693
-+#, c-format
-+msgid "%s: invalid %s address.\n"
-+msgstr "%s: adresa %s je nesprávná.\n"
- 
--#: ../ifconfig.c:290
--msgid "ALLMULTI "
--msgstr "ALLMULTI "
-+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
-+#, c-format
-+msgid "No support for INET6 on this system.\n"
-+msgstr "Tento systém nepodporuje INET6.\n"
- 
--#: ../ifconfig.c:292
--msgid "SLAVE "
--msgstr "SLAVE "
-+#: ../ifconfig.c:780 ../ifconfig.c:871
-+#, c-format
-+msgid "Interface %s not initialized\n"
-+msgstr ""
- 
--#: ../ifconfig.c:294
--msgid "MASTER "
--msgstr "MASTER "
-+#: ../ifconfig.c:792 ../ifconfig.c:882
-+#, fuzzy, c-format
-+msgid "Bad address.\n"
-+msgstr "%s: adresa %s je nesprávná.\n"
- 
--#: ../ifconfig.c:296
--msgid "MULTICAST "
--msgstr "MULTICAST "
--
--#: ../ifconfig.c:299
--msgid "DYNAMIC "
--msgstr "DYNAMIC "
--
--#: ../ifconfig.c:302
--#, c-format
--msgid " MTU:%d  Metric:%d"
--msgstr " MTU:%d  Metrika:%d"
--
--#: ../ifconfig.c:306
--#, c-format
--msgid "  Outfill:%d  Keepalive:%d"
--msgstr "  Outfill:%d  Keepalive:%d"
--
--#: ../ifconfig.c:320
--#, c-format
--msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
--msgstr "pøijmutých paketù:%lu chyb:%lu zahozeno:%lu pøeteèení:%lu rámcù:%lu\n"
--
--#: ../ifconfig.c:325
--#, c-format
--msgid "             compressed:%lu\n"
--msgstr "             komprimováno:%lu\n"
--
--# carrier?
--#: ../ifconfig.c:329
--#, c-format
--msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
--msgstr "odeslaných paketù:%lu chyb:%lu zahozeno:%lu pøeteèení:%lu pøenos:%lu\n"
--
--#: ../ifconfig.c:333
--#, c-format
--msgid "          collisions:%lu "
--msgstr "          kolizí:%lu "
--
--#: ../ifconfig.c:335
--#, c-format
--msgid "compressed:%lu "
--msgstr "komprimováno:%lu "
--
--#: ../ifconfig.c:337
--#, c-format
--msgid "txqueuelen:%d "
--msgstr "délka odchozí fronty:%d "
--
--#: ../ifconfig.c:345
--#, c-format
--msgid "Interrupt:%d "
--msgstr "Pøeru¹ení:%d "
--
--#. Only print devices using it for
--#. I/O maps
--#: ../ifconfig.c:348
--#, c-format
--msgid "Base address:0x%x "
--msgstr "Vstupnì/Výstupní port:0x%x "
--
--#: ../ifconfig.c:350
--#, c-format
--msgid "Memory:%lx-%lx "
--msgstr "Pamì»:%lx-%lx "
--
--#: ../ifconfig.c:353
--#, c-format
--msgid "DMA chan:%x "
--msgstr "Kanál DMA:%x "
--
--#: ../ifconfig.c:384 ../ifconfig.c:405
--#, c-format
--msgid "%s: unknown interface: %s\n"
--msgstr "%s: rozhraní %s není známo\n"
--
--#: ../ifconfig.c:421
--msgid ""
--"Usage:\n"
--"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <address>]\n"
--msgstr ""
--"Pou¾ití:\n"
--"  ifconfig [-a] [-i] [-v] <rozhraní> [[<AF>] <adresa>]\n"
--
--#: ../ifconfig.c:425
--msgid "  [add <address>[/<prefixlen>]]\n"
--msgstr "  [add <adresa>[/<délka prefixu>]]\n"
--
--#: ../ifconfig.c:427
--msgid "  [del <address>[/<prefixlen>]]\n"
--msgstr "  [del <adresa>[/<délka prefixu>]]\n"
--
--#: ../ifconfig.c:432
--msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
--msgstr "  [[-]broadcast [<adresa>]]  [[-]pointopoint [<adresa>]]\n"
--
--#: ../ifconfig.c:433
--msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
--msgstr "  [netmask <adresa>]  [dstaddr <adresa>]  [tunnel <adresa>]\n"
--
--#: ../ifconfig.c:436
--msgid "  [outfill <NN>] [keepalive <NN>]\n"
--msgstr "  [outfill <NN>] [keepalive <NN>]\n"
--
--#: ../ifconfig.c:438
--msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
--msgstr "  [hw <HW> <adresa>]  [metric <NN>]  [mtu <NN>]\n"
--
--#: ../ifconfig.c:439
--msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
--msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
--
--#: ../ifconfig.c:440
--msgid "  [multicast]  [[-]promisc]\n"
--msgstr "  [multicast]  [[-]promisc]\n"
--
--#: ../ifconfig.c:441
--msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
--msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <typ>]\n"
--
--#: ../ifconfig.c:443
--msgid "  [txqueuelen <NN>]\n"
--msgstr "  [txqueuelen délka]\n"
--
--#: ../ifconfig.c:446
--msgid "  [[-]dynamic]\n"
--msgstr "  [[-]dynamic]\n"
--
--#: ../ifconfig.c:448
--msgid ""
--"  [up|down] ...\n"
--"\n"
--msgstr ""
--"  [up|down] ...\n"
--"\n"
--
--#: ../ifconfig.c:450
--msgid "  <HW>=Hardware Type.\n"
--msgstr "   <HW>=Hardwarový Typ.\n"
--
--#: ../ifconfig.c:451
--msgid "  List of possible hardware types:\n"
--msgstr "  Seznam mo¾ných hardwarových typù:\n"
--
--#. 1 = ARPable
--#: ../ifconfig.c:453
--#, c-format
--msgid "  <AF>=Address family. Default: %s\n"
--msgstr "   <AF>=tøída adres. Implicitní: %s\n"
--
--#: ../ifconfig.c:454
--msgid "  List of possible address families:\n"
--msgstr "  Seznam mo¾ných tøíd adres:\n"
--
--#: ../ifconfig.c:593
--msgid "Unknown media type.\n"
--msgstr "Neznámý typ média.\n"
--
--#: ../ifconfig.c:881
-+#: ../ifconfig.c:885
- #, c-format
--msgid "%s: invalid %s address.\n"
--msgstr "%s: adresa %s je nesprávná.\n"
--
--#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011
--msgid "No support for INET6 on this system.\n"
--msgstr "Tento systém nepodporuje INET6.\n"
--
--#: ../ifconfig.c:983
- msgid "Address deletion not supported on this system.\n"
- msgstr "Tento systém nepodporuje mazání adres.\n"
- 
--#: ../ifconfig.c:1066
--msgid "No support for INET on this system.\n"
--msgstr "Tento systém nepodporuje INET.\n"
-+#: ../ifconfig.c:957
-+#, fuzzy, c-format
-+msgid "ifconfig: Cannot set address for this protocol family.\n"
-+msgstr "Nevím, jak nastavit adresu tøídy %d.\n"
- 
--#: ../ifconfig.c:1076
-+#: ../ifconfig.c:983
-+#, c-format
- msgid "No support for ECONET on this system.\n"
- msgstr "Tento systém nepodporuje ECONET.\n"
- 
--#: ../ifconfig.c:1084
-+#: ../ifconfig.c:991
- #, c-format
- msgid "Don't know how to set addresses for family %d.\n"
- msgstr "Nevím, jak nastavit adresu tøídy %d.\n"
- 
--#: ../netstat.c:383
-+#: ../ifconfig.c:1021
-+#, c-format
-+msgid "WARNING: at least one error occured. (%d)\n"
-+msgstr ""
-+
-+#: ../netstat.c:434
- #, c-format
- msgid ""
- "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
-@@ -792,7 +704,8 @@
- "jste\n"
- "byl superu¾ivatelem)\n"
- 
--#: ../netstat.c:387
-+#: ../netstat.c:438
-+#, c-format
- msgid ""
- "(Not all processes could be identified, non-owned process info\n"
- " will not be shown, you would have to be root to see it all.)\n"
-@@ -801,199 +714,223 @@
- "pouze o procesech, jich¾ jste vlastníkem. Aby jste mohl vidìt v¹e, musel\n"
- "byste být superu¾ivatelem.)\n"
- 
--#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166
-+#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
- msgid "LISTENING"
- msgstr "NASLOUCHÁ"
- 
--#: ../netstat.c:395
-+#: ../netstat.c:446
- msgid "CONN SENT"
- msgstr "CONN ODESLÁN"
- 
--#: ../netstat.c:396 ../netstat.c:1168
-+#: ../netstat.c:447 ../netstat.c:1268
- msgid "DISC SENT"
- msgstr "DISC ODESLÁN"
- 
--#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169
-+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
- msgid "ESTABLISHED"
- msgstr "SPOJENO"
- 
--#: ../netstat.c:419
-+#: ../netstat.c:470
-+#, c-format
- msgid "Active NET/ROM sockets\n"
- msgstr "Aktivní NET/ROM sokety\n"
- 
--#: ../netstat.c:420
-+#: ../netstat.c:471
-+#, c-format
- msgid ""
--"User       Dest       Source     Device  State        Vr/Vs    Send-Q  "
--"Recv-Q\n"
-+"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
-+"Q\n"
- msgstr ""
--"U¾ivatel   Cíl        Zdroj      Zaøízení Stav        Vr/Vs    Odch-F "
--"Pøích-F\n"
-+"U¾ivatel   Cíl        Zdroj      Zaøízení Stav        Vr/Vs    Odch-F Pøích-"
-+"F\n"
- 
--#: ../netstat.c:430 ../netstat.c:1208
-+#: ../netstat.c:481 ../netstat.c:1308
- #, c-format
- msgid "Problem reading data from %s\n"
- msgstr "Chyba pøi ètení dat z %s\n"
- 
- # následující radìji ponechat v originále ?!
--#: ../netstat.c:465
-+#: ../netstat.c:516
- msgid "SYN_SENT"
- msgstr "SYN_SENT"
- 
--#: ../netstat.c:466
-+#: ../netstat.c:517
- msgid "SYN_RECV"
- msgstr "SYN_RECV"
- 
--#: ../netstat.c:467
-+#: ../netstat.c:518
- msgid "FIN_WAIT1"
- msgstr "FIN_WAIT1"
- 
--#: ../netstat.c:468
-+#: ../netstat.c:519
- msgid "FIN_WAIT2"
- msgstr "FIN_WAIT2"
- 
--#: ../netstat.c:469
-+#: ../netstat.c:520
- msgid "TIME_WAIT"
- msgstr "TIME_WAIT"
- 
--#: ../netstat.c:470
-+#: ../netstat.c:521
- msgid "CLOSE"
- msgstr "ZAVØEN"
- 
--#: ../netstat.c:471
-+#: ../netstat.c:522
- msgid "CLOSE_WAIT"
- msgstr "CLOSE_WAIT"
- 
--#: ../netstat.c:472
-+#: ../netstat.c:523
- msgid "LAST_ACK"
- msgstr "POSLEDNÍ ACK"
- 
--#: ../netstat.c:473
-+#: ../netstat.c:524
- msgid "LISTEN"
- msgstr "LISTEN"
- 
--#: ../netstat.c:474
-+#: ../netstat.c:525
- msgid "CLOSING"
- msgstr "ZAVíRÁ"
- 
--#: ../netstat.c:544
-+#: ../netstat.c:596
- #, c-format
- msgid "warning, got bogus igmp6 line %d.\n"
- msgstr "varování, nesmyslný igmp6 øádek %d.\n"
- 
--#: ../netstat.c:549 ../netstat.c:587 ../netstat.c:670 ../netstat.c:803
--#: ../netstat.c:935 ../netstat.c:940
-+#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
-+#: ../netstat.c:1032 ../netstat.c:1037
- #, c-format
- msgid "netstat: unsupported address family %d !\n"
- msgstr "netstat: tøída adres %d není podporována !\n"
- 
--#: ../netstat.c:562 ../netstat.c:567 ../netstat.c:575 ../netstat.c:582
-+#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
- #, c-format
- msgid "warning, got bogus igmp line %d.\n"
- msgstr "varování, nesmyslný igmp øádek %d.\n"
- 
--#: ../netstat.c:666
-+#: ../netstat.c:677
-+#, fuzzy, c-format
-+msgid "Active X.25 sockets\n"
-+msgstr "Aktivní AX.25 sokety\n"
-+
-+#. IMHO, Vr/Vs is not very usefull --SF
-+#: ../netstat.c:679
-+#, fuzzy, c-format
-+msgid ""
-+"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
-+"Q\n"
-+msgstr "Cíl        Zdroj      Zaøíz   Stav         Vr/Vs    Odhod-F Pøích-F\n"
-+
-+#: ../netstat.c:759
-+#, c-format
- msgid "warning, got bogus tcp line.\n"
- msgstr "varování, nesmyslný tcp øádek.\n"
- 
--#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975
-+#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
- #, c-format
- msgid "off (0.00/%ld/%d)"
- msgstr "vyp (0.00/%ld/%d)"
- 
--#: ../netstat.c:708
-+#: ../netstat.c:804
- #, fuzzy, c-format
- msgid "on (%2.2f/%ld/%d)"
- msgstr "zap%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:713
-+#: ../netstat.c:809
- #, fuzzy, c-format
- msgid "keepalive (%2.2f/%ld/%d)"
- msgstr "zap%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:718
-+#: ../netstat.c:814
- #, fuzzy, c-format
- msgid "timewait (%2.2f/%ld/%d)"
- msgstr "zap%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985
-+#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
- #, c-format
- msgid "unkn-%d (%2.2f/%ld/%d)"
- msgstr "nezn-%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:799
-+#: ../netstat.c:894
-+#, c-format
- msgid "warning, got bogus udp line.\n"
- msgstr "varování, nesmyslný udp øádek.\n"
- 
--#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108
-+#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
- msgid "UNKNOWN"
- msgstr "NEZNÁM"
- 
--#: ../netstat.c:860 ../netstat.c:980
-+#: ../netstat.c:958 ../netstat.c:1080
- #, c-format
- msgid "on%d (%2.2f/%ld/%d)"
- msgstr "zap%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:949
-+#: ../netstat.c:1046
-+#, c-format
- msgid "warning, got bogus raw line.\n"
- msgstr "varování, nesmyslný 'raw' øádek.\n"
- 
--#: ../netstat.c:1028
-+#: ../netstat.c:1128
-+#, c-format
- msgid "warning, got bogus unix line.\n"
- msgstr "varování, netstat 'unix' øádek.\n"
- 
--#: ../netstat.c:1055
-+#: ../netstat.c:1155
- msgid "STREAM"
- msgstr "STREAM"
- 
--#: ../netstat.c:1059
-+#: ../netstat.c:1159
- msgid "DGRAM"
- msgstr "DGRAM"
- 
--#: ../netstat.c:1063
-+#: ../netstat.c:1163
- msgid "RAW"
- msgstr "RAW"
- 
--#: ../netstat.c:1067
-+#: ../netstat.c:1167
- msgid "RDM"
- msgstr "RDM"
- 
--#: ../netstat.c:1071
-+#: ../netstat.c:1171
- msgid "SEQPACKET"
- msgstr "SEQPACKET"
- 
--#: ../netstat.c:1080
-+#: ../netstat.c:1180
- msgid "FREE"
- msgstr "NEALOKOVÁN"
- 
--#: ../netstat.c:1096
-+#: ../netstat.c:1196
- msgid "CONNECTING"
- msgstr "SPOJUJE"
- 
--#: ../netstat.c:1100
-+#: ../netstat.c:1200
- msgid "CONNECTED"
- msgstr "SPOJEN"
- 
--#: ../netstat.c:1104
-+#: ../netstat.c:1204
- msgid "DISCONNECTING"
- msgstr "ODPOJUJE"
- 
--#: ../netstat.c:1135
-+#: ../netstat.c:1235
-+#, c-format
- msgid "Active UNIX domain sockets "
- msgstr "Aktivní sokety domény UNIX "
- 
--#: ../netstat.c:1137 ../netstat.c:1666
-+#: ../netstat.c:1237 ../netstat.c:1756
-+#, c-format
- msgid "(servers and established)"
- msgstr "(servery a navázaná spojení)"
- 
--#: ../netstat.c:1140 ../netstat.c:1669
-+#: ../netstat.c:1240 ../netstat.c:1759
-+#, c-format
- msgid "(only servers)"
- msgstr "(pouze servery)"
- 
--#: ../netstat.c:1142 ../netstat.c:1671
-+#: ../netstat.c:1242 ../netstat.c:1761
-+#, c-format
- msgid "(w/o servers)"
- msgstr "(w/o servery)"
- 
--#: ../netstat.c:1145
-+#: ../netstat.c:1245
-+#, c-format
- msgid ""
- "\n"
- "Proto RefCnt Flags       Type       State         I-Node"
-@@ -1001,90 +938,92 @@
- "\n"
- "Proto Èítaè  Pøíznaky    Typ        Stav          I-Uzel"
- 
--#: ../netstat.c:1147
-+#: ../netstat.c:1247
-+#, c-format
- msgid " Path\n"
- msgstr " Cesta\n"
- 
--#: ../netstat.c:1167
-+#: ../netstat.c:1267
- msgid "SABM SENT"
- msgstr "SABM ODESLÁN"
- 
--#: ../netstat.c:1170
-+#: ../netstat.c:1270
- msgid "RECOVERY"
- msgstr "OBNOVA"
- 
--#: ../netstat.c:1184
-+#: ../netstat.c:1284
-+#, c-format
- msgid "Active AX.25 sockets\n"
- msgstr "Aktivní AX.25 sokety\n"
- 
--#: ../netstat.c:1185
-+#: ../netstat.c:1285
-+#, c-format
- msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
- msgstr "Cíl        Zdroj      Zaøíz   Stav         Vr/Vs    Odhod-F Pøích-F\n"
- 
--#: ../netstat.c:1228
-+#: ../netstat.c:1328
- #, c-format
- msgid "problem reading data from %s\n"
- msgstr "chyba pøi ètení dat z %s\n"
- 
--#: ../netstat.c:1279
-+#: ../netstat.c:1379
-+#, c-format
- msgid ""
- "Active IPX sockets\n"
- "Proto Recv-Q Send-Q Local Address              Foreign Address            "
- "State"
- msgstr ""
- "Aktivní IPX sokety\n"
--"Proto Pøích-F Odch-F Lokál adresa              Vzdálená adresa               "
--" Stav"
-+"Proto Pøích-F Odch-F Lokál adresa              Vzdálená "
-+"adresa                Stav"
- 
--#: ../netstat.c:1281
-+#: ../netstat.c:1381
-+#, c-format
- msgid " User"
- msgstr " U¾ivatel"
- 
--#: ../netstat.c:1315
-+#: ../netstat.c:1415
- msgid "ESTAB"
- msgstr "SPOJEN"
- 
--#: ../netstat.c:1323
-+#: ../netstat.c:1423
- msgid "UNK."
- msgstr "NEZ."
- 
--#: ../netstat.c:1367
--msgid "     - no statistics available -"
--msgstr "     - statistická data nejsou dostupná -"
--
--#: ../netstat.c:1370
--msgid "[NO FLAGS]"
--msgstr "[®ÁDNÉ PØÍZNAKY]"
--
--#: ../netstat.c:1400
-+#: ../netstat.c:1461
-+#, c-format
- msgid "Kernel Interface table\n"
- msgstr "Tabulka rozhraní v jádru\n"
- 
--#: ../netstat.c:1401
-+#: ../netstat.c:1465
-+#, fuzzy, c-format
- msgid ""
--"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
-+"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
- "Flg\n"
- msgstr ""
- "Rozhr   MTU Met    PØ-OK PØ-CHYB PØ-ZAH PØ-PØT   OD-OK OD-CHYB OD-ZAH OD-PØT "
- "PØZ\n"
- 
--#: ../netstat.c:1404
-+#: ../netstat.c:1469
- msgid "missing interface information"
- msgstr "chybí informace o rozhraní"
- 
--#: ../netstat.c:1425
-+#: ../netstat.c:1492
-+#, c-format
- msgid ""
--"usage: netstat [-veenNcCF] [<Af>] -r         netstat "
--"{-V|--version|-h|--help}\n"
-+"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
-+"help}\n"
- msgstr ""
--"Pou¾ití: netstat [--veenNcCF] [<TA>] -r       netstat "
--"{-V|--version|-h|--help}\n"
-+"Pou¾ití: netstat [--veenNcCF] [<TA>] -r       netstat {-V|--version|-h|--"
-+"help}\n"
- 
--#: ../netstat.c:1426
-+#: ../netstat.c:1493
-+#, c-format
- msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
- msgstr "         netstat [-vnNcaeol] [<Soket> ...]\n"
- 
--#: ../netstat.c:1427
-+#: ../netstat.c:1494
-+#, c-format
- msgid ""
- "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
- "\n"
-@@ -1092,27 +1031,32 @@
- "         netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
- "\n"
- 
--#: ../netstat.c:1429
-+#: ../netstat.c:1496
-+#, c-format
- msgid "        -r, --route              display routing table\n"
- msgstr "         -r, --route              vypí¹e smìrovací tabulku\n"
- 
--#: ../netstat.c:1430
-+#: ../netstat.c:1497
-+#, c-format
- msgid "        -i, --interfaces         display interface table\n"
- msgstr "         -i, --interfaces         vypí¹e tabulku rozhraní\n"
- 
--#: ../netstat.c:1431
-+#: ../netstat.c:1498
-+#, c-format
- msgid "        -g, --groups             display multicast group memberships\n"
- msgstr ""
- "         -g, --groups             vypí¹e èlenství v multicast skupinách\n"
- 
--#: ../netstat.c:1432
-+#: ../netstat.c:1499
-+#, c-format
- msgid ""
- "        -s, --statistics         display networking statistics (like SNMP)\n"
- msgstr ""
- "         -s, --statistics         vypí¹e statistiku sí»ové aktivity (jako "
- "SNMP)\n"
- 
--#: ../netstat.c:1434
-+#: ../netstat.c:1501
-+#, c-format
- msgid ""
- "        -M, --masquerade         display masqueraded connections\n"
- "\n"
-@@ -1120,20 +1064,45 @@
- "         -M, --masquerade         vypí¹e maskovaná spojení\n"
- "\n"
- 
--#: ../netstat.c:1438 ../route.c:87
-+#: ../netstat.c:1505
-+#, fuzzy, c-format
-+msgid "        --numeric-hosts          don't resolve host names\n"
-+msgstr ""
-+"        -n, --numeric            nebude pøevádìt èíselné adresy\n"
-+"                                 na kanonická jména\n"
-+
-+#: ../netstat.c:1506
-+#, fuzzy, c-format
-+msgid "        --numeric-ports          don't resolve port names\n"
-+msgstr ""
-+"        -n, --numeric            nebude pøevádìt èíselné adresy\n"
-+"                                 na kanonická jména\n"
-+
-+#: ../netstat.c:1507
-+#, fuzzy, c-format
-+msgid "        --numeric-users          don't resolve user names\n"
-+msgstr ""
-+"        -n, --numeric            nebude pøevádìt èíselné adresy\n"
-+"                                 na kanonická jména\n"
-+
-+#: ../netstat.c:1508
-+#, c-format
- msgid "        -N, --symbolic           resolve hardware names\n"
- msgstr "         -N, --symbolic           pøevede hw jména\n"
- 
--#: ../netstat.c:1439 ../route.c:88
-+#: ../netstat.c:1509 ../route.c:88
-+#, c-format
- msgid "        -e, --extend             display other/more information\n"
- msgstr "         -e, --extend             vypí¹e podrobnìj¹í informace\n"
- 
--#: ../netstat.c:1440
-+#: ../netstat.c:1510
-+#, c-format
- msgid "        -p, --programs           display PID/Program name for sockets\n"
- msgstr ""
- "         -p, --programs           vypí¹e PID/jméno programu pro sokety\n"
- 
--#: ../netstat.c:1441
-+#: ../netstat.c:1511
-+#, c-format
- msgid ""
- "        -c, --continuous         continuous listing\n"
- "\n"
-@@ -1141,23 +1110,27 @@
- "         -c, --continuous         nepøeru¹ovaný výpis\n"
- "\n"
- 
--#: ../netstat.c:1442
-+#: ../netstat.c:1512
-+#, c-format
- msgid "        -l, --listening          display listening server sockets\n"
- msgstr ""
- "         -l, --listening          vypí¹e sokety, na nich¾ je nasloucháno\n"
- 
--#: ../netstat.c:1443
-+#: ../netstat.c:1513
-+#, c-format
- msgid ""
- "        -a, --all, --listening   display all sockets (default: connected)\n"
- msgstr ""
- "         -a, --all, --listening   vypí¹e v¹echny sokety (implicitnì: "
- "spojené)\n"
- 
--#: ../netstat.c:1444
-+#: ../netstat.c:1514
-+#, c-format
- msgid "        -o, --timers             display timers\n"
- msgstr "         -o, --timers             zobrazí èasovaèe\n"
- 
--#: ../netstat.c:1445 ../route.c:89
-+#: ../netstat.c:1515 ../route.c:89
-+#, c-format
- msgid ""
- "        -F, --fib                display Forwarding Information Base "
- "(default)\n"
-@@ -1165,112 +1138,126 @@
- "         -F, --fib                zobrazí Forwarding Infomation Base\n"
- "                                  (implicitní)\n"
- 
--#: ../netstat.c:1446 ../route.c:90
-+#: ../netstat.c:1516 ../route.c:90
-+#, c-format
- msgid ""
- "        -C, --cache              display routing cache instead of FIB\n"
- "\n"
- msgstr "         -C, --cache              místo FIB zobrazí smìrovací cache\n"
- 
--#: ../netstat.c:1448
-+#: ../netstat.c:1518
-+#, c-format
- msgid ""
--"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
--"--netrom\n"
-+"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-+"netrom\n"
- msgstr ""
--"  <Soket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
--"--netrom\n"
-+"  <Soket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-+"netrom\n"
- 
--#: ../netstat.c:1449 ../route.c:92
--#, c-format
--msgid "  <AF>=Use '-A <af>' or '--<af>' Default: %s\n"
-+#: ../netstat.c:1519
-+#, fuzzy, c-format
-+msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
- msgstr "   <AF>=Pou¾ijte '-A <af>' or '--<af>' Implicitní: %s\n"
- 
--#: ../netstat.c:1450 ../route.c:93
-+#: ../netstat.c:1520 ../route.c:93
-+#, c-format
- msgid "  List of possible address families (which support routing):\n"
- msgstr "  Seznam mo¾ných tøíd adres (podporujících smìrování):\n"
- 
--#: ../netstat.c:1663
-+#: ../netstat.c:1753
-+#, c-format
- msgid "Active Internet connections "
- msgstr "Aktivní Internetová spojení "
- 
--#: ../netstat.c:1673
-+#: ../netstat.c:1763
-+#, c-format
- msgid ""
- "\n"
--"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
--"  "
-+"Proto Recv-Q Send-Q Local Address           Foreign Address         "
-+"State      "
- msgstr ""
- "\n"
- "Proto Pøích-F Odch-F Místní Adresa          Vzdálená Adresa         Stav     "
- 
--#: ../netstat.c:1675
-+#: ../netstat.c:1765
-+#, c-format
- msgid " User       Inode     "
- msgstr " U¾ivatel   I-uzel    "
- 
--#: ../netstat.c:1678
-+#: ../netstat.c:1768
-+#, c-format
- msgid " Timer"
- msgstr " Èasovaè"
- 
--#: ../netstat.c:1708
-+#: ../netstat.c:1798
-+#, c-format
- msgid "IPv4 Group Memberships\n"
- msgstr "Èlenství v IPv4 skupinách\n"
- 
--#: ../netstat.c:1709
-+#: ../netstat.c:1799
-+#, c-format
- msgid "Interface       RefCnt Group\n"
- msgstr "Rozhraní        Èítaè  Skupina\n"
- 
--#: ../rarp.c:43
-+#: ../rarp.c:44
- msgid "This kernel does not support RARP.\n"
- msgstr "Toto jádro nepodporuje RARP.\n"
- 
--#: ../rarp.c:82
-+#: ../rarp.c:83
- #, c-format
- msgid "no RARP entry for %s.\n"
- msgstr "pro %s neexistuje RARP polo¾ka.\n"
- 
--#: ../rarp.c:95
-+#: ../rarp.c:96
- #, c-format
- msgid "%s: bad hardware address\n"
- msgstr "hardwarová adresa %s je nesprávná\n"
- 
--#: ../rarp.c:127
-+#: ../rarp.c:128
- #, c-format
- msgid "rarp: cannot open file %s:%s.\n"
- msgstr "rarp: soubor %s:%s nelze otevøít.\n"
- 
--#: ../rarp.c:139
-+#: ../rarp.c:140
- #, c-format
- msgid "rarp: format error at %s:%u\n"
- msgstr "rarp: syntaktická chyba na øádku %2$u souboru %1$s\n"
- 
--#: ../rarp.c:143 ../rarp.c:287
-+#: ../rarp.c:144 ../rarp.c:289
- #, c-format
- msgid "rarp: %s: unknown host\n"
- msgstr "rarp: poèítaè %s není znám\n"
- 
--#: ../rarp.c:146
-+#: ../rarp.c:147
- #, c-format
- msgid "rarp: cannot set entry from %s:%u\n"
- msgstr "rarp: nelze nastavit polo¾ku z øádku %2$u souboru %1$s\n"
- 
--#: ../rarp.c:175
-+#: ../rarp.c:176
-+#, c-format
- msgid "Usage: rarp -a                               list entries in cache.\n"
- msgstr "Pou¾ití: rarp -a                            vypí¹e polo¾ky z cache.\n"
- 
--#: ../rarp.c:176
-+#: ../rarp.c:177
-+#, c-format
- msgid "       rarp -d <hostname>                    delete entry from cache.\n"
- msgstr "         rarp -d <jméno>                    sma¾e polo¾ku z cache.\n"
- 
--#: ../rarp.c:177
-+#: ../rarp.c:178
-+#, c-format
- msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
- msgstr ""
- "         rarp [<HW>] -s <jméno> <hwadr>       pøidá polo¾ku do cache.\n"
- 
--#: ../rarp.c:178
-+#: ../rarp.c:179
-+#, c-format
- msgid ""
- "       rarp -f                               add entries from /etc/ethers.\n"
- msgstr ""
- "         rarp -f                               pøidá polo¾ky z /etc/ethers.\n"
- 
--#: ../rarp.c:179
-+#: ../rarp.c:180
-+#, c-format
- msgid ""
- "       rarp -V                               display program version.\n"
- "\n"
-@@ -1279,24 +1266,26 @@
- "programu.\n"
- "\n"
- 
--#: ../rarp.c:236
-+#: ../rarp.c:238
- #, c-format
- msgid "%s: illegal option mix.\n"
- msgstr "Kombinace pøepínaèù %s je nesprávná.\n"
- 
--#: ../rarp.c:267
-+#: ../rarp.c:269
- #, c-format
- msgid "rarp: %s: unknown hardware type.\n"
- msgstr "rarp: hardwarový typ %s není znám.\n"
- 
--#: ../route.c:79
-+#: ../route.c:80
-+#, c-format
- msgid ""
- "Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
- msgstr ""
- "Pou¾ití: route [-nNvee] [-FC] [<AF>]         Zobrazí smìrovací tabulky v "
- "jádru\n"
- 
--#: ../route.c:80
-+#: ../route.c:81
-+#, c-format
- msgid ""
- "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
- "\n"
-@@ -1305,14 +1294,16 @@
- "AF.\n"
- "\n"
- 
--#: ../route.c:82
-+#: ../route.c:83
-+#, c-format
- msgid ""
- "       route {-h|--help} [<AF>]              Detailed usage syntax for "
- "specified AF.\n"
- msgstr ""
- "       route {-h|--help [<AF>]               Nápovìda pro pou¾ití s AF.\n"
- 
--#: ../route.c:83
-+#: ../route.c:84
-+#, c-format
- msgid ""
- "       route {-V|--version}                  Display version/author and "
- "exit.\n"
-@@ -1321,15 +1312,23 @@
- "       route {-V|--version}                  Vypí¹e oznaèení verze a autora\n"
- "                                             programu.\n"
- 
-+#: ../route.c:92
-+#, fuzzy, c-format
-+msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
-+msgstr "   <AF>=Pou¾ijte '-A <af>' or '--<af>' Implicitní: %s\n"
-+
- #: ../plipconfig.c:66
-+#, c-format
- msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
- msgstr "Pou¾ití: plipconfig [-a] [-i] [-v] rozhraní\n"
- 
- #: ../plipconfig.c:67
-+#, c-format
- msgid "                  [nibble NN] [trigger NN]\n"
- msgstr "                  [nibble NN] [trigger NN]\n"
- 
- #: ../plipconfig.c:68
-+#, c-format
- msgid "       plipconfig -V | --version\n"
- msgstr "       plipconfig -V | --version\n"
- 
-@@ -1338,25 +1337,30 @@
- msgid "%s\tnibble %lu  trigger %lu\n"
- msgstr "%s\tnibble %lu  trigger %lu\n"
- 
--#: ../iptunnel.c:79
-+#: ../iptunnel.c:85
-+#, c-format
- msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
- msgstr "Pou¾ití: iptunnel { add | change | del | show } [ JMÉNO ]\n"
- 
--#: ../iptunnel.c:80
-+#: ../iptunnel.c:86
-+#, c-format
- msgid ""
- "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
- msgstr ""
- "          [ mode { ipip | gre | sit } ] [ vzdálená ADR ] [ místní ADR ]\n"
- 
--#: ../iptunnel.c:81
-+#: ../iptunnel.c:87
-+#, c-format
- msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
- msgstr "          [ [i|o]seq ] [ [i|o]key KLÍÈ ] [ [i|o]csum ]\n"
- 
--#: ../iptunnel.c:82
-+#: ../iptunnel.c:88
-+#, c-format
- msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
- msgstr "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev ZAØÍZENÍ ]\n"
- 
--#: ../iptunnel.c:83
-+#: ../iptunnel.c:89
-+#, c-format
- msgid ""
- "       iptunnel -V | --version\n"
- "\n"
-@@ -1364,450 +1368,737 @@
- "       iptunnel -V | --version\n"
- "\n"
- 
--#: ../iptunnel.c:84
-+#: ../iptunnel.c:90
-+#, c-format
- msgid "Where: NAME := STRING\n"
- msgstr "Kde: JMÉNO := ØETÌZEC\n"
- 
--#: ../iptunnel.c:85
-+#: ../iptunnel.c:91
-+#, c-format
- msgid "       ADDR := { IP_ADDRESS | any }\n"
- msgstr "       ADR := { IP-ADRESA | any }\n"
- 
--#: ../iptunnel.c:86
-+#: ../iptunnel.c:92
-+#, c-format
- msgid "       TOS  := { NUMBER | inherit }\n"
- msgstr "       TOS  := { ÈÍSLO | inherit }\n"
- 
--#: ../iptunnel.c:87
-+#: ../iptunnel.c:93
-+#, c-format
- msgid "       TTL  := { 1..255 | inherit }\n"
- msgstr "       TTL  := { 1..255 | inherit }\n"
- 
--#: ../iptunnel.c:88
-+#: ../iptunnel.c:94
-+#, c-format
- msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
- msgstr "       KLÍÈ  := { DOTTED_QUAD | ÈÍSLO }\n"
- 
--#: ../iptunnel.c:326
-+#: ../iptunnel.c:332
-+#, c-format
- msgid "Keys are not allowed with ipip and sit.\n"
- msgstr "S ipip a sit nejsou klíèe povoleny.\n"
- 
--#: ../iptunnel.c:346
-+#: ../iptunnel.c:352
-+#, c-format
- msgid "Broadcast tunnel requires a source address.\n"
- msgstr "Tunel se v¹esmìrovým vysíláním vy¾aduje zdrojovou adresu.\n"
- 
--#: ../iptunnel.c:361
-+#: ../iptunnel.c:367
-+#, c-format
- msgid "ttl != 0 and noptmudisc are incompatible\n"
- msgstr "ttl != 0 a noptmudisc se navzájem vyluèují\n"
- 
--#: ../iptunnel.c:373
-+#: ../iptunnel.c:379
-+#, c-format
- msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
- msgstr "re¾im tunelu (ipip, gre èi sit) nelze zjistit\n"
- 
--#: ../iptunnel.c:411
-+#: ../iptunnel.c:417
- #, c-format
- msgid "%s: %s/ip  remote %s  local %s "
- msgstr "%s: %s/ip  vzdálený %s  místní %s "
- 
--#: ../iptunnel.c:415
-+#: ../iptunnel.c:421
- msgid "unknown"
- msgstr "Neznám."
- 
--#: ../iptunnel.c:447
-+#: ../iptunnel.c:453
-+#, c-format
- msgid "  Drop packets out of sequence.\n"
- msgstr "  Zahazuje pakety mimo poøadí.\n"
- 
--#: ../iptunnel.c:449
-+#: ../iptunnel.c:455
-+#, c-format
- msgid "  Checksum in received packet is required.\n"
- msgstr "  Pøijímané pakety musí mít kontrolní souèet.\n"
- 
- # ???
--#: ../iptunnel.c:451
-+#: ../iptunnel.c:457
-+#, c-format
- msgid "  Sequence packets on output.\n"
- msgstr "  Øadí odchozí pakety.\n"
- 
--#: ../iptunnel.c:453
-+#: ../iptunnel.c:459
-+#, c-format
- msgid "  Checksum output packets.\n"
- msgstr "  Odchozí pakety budou mít kontrolní souèet.\n"
- 
--#: ../iptunnel.c:481
-+#: ../iptunnel.c:487
-+#, c-format
- msgid "Wrong format of /proc/net/dev. Sorry.\n"
- msgstr "Lituji, formát /proc/net/dev je chybný.\n"
- 
--#: ../iptunnel.c:494
-+#: ../iptunnel.c:500
- #, c-format
- msgid "Failed to get type of [%s]\n"
- msgstr "Typ [%s] se nepodaøilo zjistit.\n"
- 
--#: ../iptunnel.c:510
-+#: ../iptunnel.c:516
-+#, c-format
- msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
- msgstr "RX: Pakety     Bajty        Chyby  CsumChyb MimoPoø  Mcasts\n"
- 
--#: ../iptunnel.c:513
-+#: ../iptunnel.c:519
-+#, c-format
- msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
- msgstr "TX: Pakety     Bajty        Chyby  DeadLoop NoRoute  NoBufs\n"
- 
--#: ../statistics.c:45
-+#: ../statistics.c:47
- msgid "ICMP input histogram:"
- msgstr "histogram ICMP vstupu:"
- 
--#: ../statistics.c:46
-+#: ../statistics.c:48
- msgid "ICMP output histogram:"
- msgstr "histogram ICMP výstupu:"
- 
--#: ../statistics.c:63
-+#: ../statistics.c:65
- #, c-format
- msgid "Forwarding is %s"
- msgstr "Pøedávání je %s"
- 
--#: ../statistics.c:64
--#, c-format
--msgid "Default TTL is %d"
-+#: ../statistics.c:66
-+#, fuzzy, c-format
-+msgid "Default TTL is %u"
- msgstr "Implicitní TTL je %d"
- 
--#: ../statistics.c:65
--#, c-format
--msgid "%d total packets received"
-+#: ../statistics.c:67
-+#, fuzzy, c-format
-+msgid "%u total packets received"
- msgstr "celkem pøijmutých paketù: %d"
- 
--#: ../statistics.c:66
--#, c-format
--msgid "%d with invalid headers"
-+#: ../statistics.c:68
-+#, fuzzy, c-format
-+msgid "%u with invalid headers"
- msgstr "s nesprávnými hlavièkami: %d"
- 
--#: ../statistics.c:67
--#, c-format
--msgid "%d with invalid addresses"
-+#: ../statistics.c:69
-+#, fuzzy, c-format
-+msgid "%u with invalid addresses"
- msgstr "s nesprávnými adresami: %d"
- 
--#: ../statistics.c:68
--#, c-format
--msgid "%d forwarded"
-+#: ../statistics.c:70
-+#, fuzzy, c-format
-+msgid "%u forwarded"
- msgstr "pøedáno: %d"
- 
--#: ../statistics.c:69
--#, c-format
--msgid "%d with unknown protocol"
-+#: ../statistics.c:71
-+#, fuzzy, c-format
-+msgid "%u with unknown protocol"
- msgstr "s neznámým protokolem: %d"
- 
--#: ../statistics.c:70
--#, c-format
--msgid "%d incoming packets discarded"
-+#: ../statistics.c:72
-+#, fuzzy, c-format
-+msgid "%u incoming packets discarded"
- msgstr "poèet zahozených pøíchozích paketù: %d"
- 
--#: ../statistics.c:71
--#, c-format
--msgid "%d incoming packets delivered"
-+#: ../statistics.c:73
-+#, fuzzy, c-format
-+msgid "%u incoming packets delivered"
- msgstr "poèet doruèených pøíchozích paketù: %d"
- 
--#: ../statistics.c:72
--#, c-format
--msgid "%d requests sent out"
-+#: ../statistics.c:74
-+#, fuzzy, c-format
-+msgid "%u requests sent out"
- msgstr "poèet odeslaných po¾adavkù: %d"
- 
- #. ?
--#: ../statistics.c:73
--#, c-format
--msgid "%d outgoing packets dropped"
-+#: ../statistics.c:75
-+#, fuzzy, c-format
-+msgid "%u outgoing packets dropped"
- msgstr "poèet zahozených odchozích paketù: %d"
- 
--#: ../statistics.c:74
--#, c-format
--msgid "%d dropped because of missing route"
-+#: ../statistics.c:76
-+#, fuzzy, c-format
-+msgid "%u dropped because of missing route"
- msgstr "zahozeno kvùli chybìjící cestì: %d"
- 
--#: ../statistics.c:75
--#, c-format
--msgid "%d fragments dropped after timeout"
-+#: ../statistics.c:77
-+#, fuzzy, c-format
-+msgid "%u fragments dropped after timeout"
- msgstr "poèet fragmentù zahozených po vypr¹ení èasu: %d"
- 
--#: ../statistics.c:76
--#, c-format
--msgid "%d reassemblies required"
-+#: ../statistics.c:78
-+#, fuzzy, c-format
-+msgid "%u reassemblies required"
- msgstr "poèet nutných znovusestavení: %d"
- 
- #. ?
--#: ../statistics.c:77
--#, c-format
--msgid "%d packets reassembled ok"
-+#: ../statistics.c:79
-+#, fuzzy, c-format
-+msgid "%u packets reassembled ok"
- msgstr "poèet v poøádku znovu sestavených paketù: %d"
- 
--#: ../statistics.c:78
--#, c-format
--msgid "%d packet reassembles failed"
-+#: ../statistics.c:80
-+#, fuzzy, c-format
-+msgid "%u packet reassembles failed"
- msgstr "poèet paketù, je¾ se nepodaøilo znovu sestavit: %d"
- 
--#: ../statistics.c:79
--#, c-format
--msgid "%d fragments received ok"
-+#: ../statistics.c:81
-+#, fuzzy, c-format
-+msgid "%u fragments received ok"
- msgstr "poèet v poøádku pøijmutých fragmentù: %d"
- 
--#: ../statistics.c:80
--#, c-format
--msgid "%d fragments failed"
-+#: ../statistics.c:82
-+#, fuzzy, c-format
-+msgid "%u fragments failed"
- msgstr "poèet chybných fragmentù: %d"
- 
--#: ../statistics.c:81
--#, c-format
--msgid "%d fragments created"
-+#: ../statistics.c:83
-+#, fuzzy, c-format
-+msgid "%u fragments created"
- msgstr "poèet vytvoøených fragmentù: %d"
- 
--#: ../statistics.c:86
--#, c-format
--msgid "%d ICMP messages received"
-+#: ../statistics.c:88
-+#, fuzzy, c-format
-+msgid "%u ICMP messages received"
- msgstr "poèet pøijmutých ICMP zpráv: %d"
- 
--#: ../statistics.c:87
--#, c-format
--msgid "%d input ICMP message failed."
-+#: ../statistics.c:89
-+#, fuzzy, c-format
-+msgid "%u input ICMP message failed."
- msgstr "poèet chybných pøíchozích ICMP zpráv: %d"
- 
--#: ../statistics.c:88 ../statistics.c:101
--#, c-format
--msgid "destination unreachable: %d"
-+#: ../statistics.c:90 ../statistics.c:103
-+#, fuzzy, c-format
-+msgid "destination unreachable: %u"
- msgstr "adresát nedostupný: %d"
- 
--#: ../statistics.c:89
--#, c-format
--msgid "timeout in transit: %d"
-+#: ../statistics.c:91
-+#, fuzzy, c-format
-+msgid "timeout in transit: %u"
- msgstr "vypr¹el èas pøi pøenosu: %d"
- 
--#: ../statistics.c:90 ../statistics.c:103
--#, c-format
--msgid "wrong parameters: %d"
-+#: ../statistics.c:92 ../statistics.c:105
-+#, fuzzy, c-format
-+msgid "wrong parameters: %u"
- msgstr "chybné parametry: %d"
- 
- #. ?
--#: ../statistics.c:91
--#, c-format
--msgid "source quenchs: %d"
-+#: ../statistics.c:93
-+#, fuzzy, c-format
-+msgid "source quenches: %u"
- msgstr "øízení toku dat: %d"
- 
--#: ../statistics.c:92
--#, c-format
--msgid "redirects: %d"
-+#: ../statistics.c:94
-+#, fuzzy, c-format
-+msgid "redirects: %u"
- msgstr "zmìna cesty: %d"
- 
--#: ../statistics.c:93
--#, c-format
--msgid "echo requests: %d"
-+#: ../statistics.c:95
-+#, fuzzy, c-format
-+msgid "echo requests: %u"
- msgstr "¾ádost o echo: %d"
- 
--#: ../statistics.c:94 ../statistics.c:107
--#, c-format
--msgid "echo replies: %d"
-+#: ../statistics.c:96 ../statistics.c:109
-+#, fuzzy, c-format
-+msgid "echo replies: %u"
- msgstr "odpovìï na ¾ádost o echo: %d"
- 
--#: ../statistics.c:95
--#, c-format
--msgid "timestamp request: %d"
-+#: ../statistics.c:97
-+#, fuzzy, c-format
-+msgid "timestamp request: %u"
- msgstr "¾ádost o èas: %d"
- 
--#: ../statistics.c:96
--#, c-format
--msgid "timestamp reply: %d"
-+#: ../statistics.c:98
-+#, fuzzy, c-format
-+msgid "timestamp reply: %u"
- msgstr "odpovìï na ¾ádost o èas: %d"
- 
--#: ../statistics.c:97
--#, c-format
--msgid "address mask request: %d"
-+#: ../statistics.c:99
-+#, fuzzy, c-format
-+msgid "address mask request: %u"
- msgstr "¾ádost o masku podsítì: %d"
- 
- #. ?
--#: ../statistics.c:98
--msgid "address mask replies"
--msgstr "odpovìdi na ¾ádost o masku podsítì"
-+#: ../statistics.c:100 ../statistics.c:113
-+#, fuzzy, c-format
-+msgid "address mask replies: %u"
-+msgstr "odpovìï na ¾ádost o masku podsítì: %d"
- 
- #. ?
--#: ../statistics.c:99
--#, c-format
--msgid "%d ICMP messages sent"
-+#: ../statistics.c:101
-+#, fuzzy, c-format
-+msgid "%u ICMP messages sent"
- msgstr "poèet odeslaných ICMP zpráv: %d"
- 
--#: ../statistics.c:100
--#, c-format
--msgid "%d ICMP messages failed"
-+#: ../statistics.c:102
-+#, fuzzy, c-format
-+msgid "%u ICMP messages failed"
- msgstr "poèet chybných ICMP zpráv: %d"
- 
--#: ../statistics.c:102
--#, c-format
--msgid "time exceeded: %d"
-+#: ../statistics.c:104
-+#, fuzzy, c-format
-+msgid "time exceeded: %u"
- msgstr "vypr¹ení ¾ivotnosti: %d"
- 
- #. ?
--#: ../statistics.c:104
--#, c-format
--msgid "source quench: %d"
-+#: ../statistics.c:106
-+#, fuzzy, c-format
-+msgid "source quench: %u"
- msgstr "øízení toku dat: %d"
- 
--#: ../statistics.c:105
--#, c-format
--msgid "redirect: %d"
-+#: ../statistics.c:107
-+#, fuzzy, c-format
-+msgid "redirect: %u"
- msgstr "zmìna cesty: %d"
- 
--#: ../statistics.c:106
--#, c-format
--msgid "echo request: %d"
-+#: ../statistics.c:108
-+#, fuzzy, c-format
-+msgid "echo request: %u"
- msgstr "¾ádost o echo: %d"
- 
--#: ../statistics.c:108
--#, c-format
--msgid "timestamp requests: %d"
-+#: ../statistics.c:110
-+#, fuzzy, c-format
-+msgid "timestamp requests: %u"
- msgstr "¾ádost o èas: %d"
- 
--#: ../statistics.c:109
--#, c-format
--msgid "timestamp replies: %d"
-+#: ../statistics.c:111
-+#, fuzzy, c-format
-+msgid "timestamp replies: %u"
- msgstr "odpovìï na ¾ádost o èas: %d"
- 
--#: ../statistics.c:110
--#, c-format
--msgid "address mask requests: %d"
-+#: ../statistics.c:112
-+#, fuzzy, c-format
-+msgid "address mask requests: %u"
- msgstr "¾ádost o masku podsítì: %d"
- 
--#: ../statistics.c:111
--#, c-format
--msgid "address mask replies: %d"
--msgstr "odpovìï na ¾ádost o masku podsítì: %d"
--
--#: ../statistics.c:116
-+#: ../statistics.c:118
- #, c-format
- msgid "RTO algorithm is %s"
- msgstr "RTO algoritmus je %s"
- 
--#: ../statistics.c:120
--#, c-format
--msgid "%d active connections openings"
-+#: ../statistics.c:122
-+#, fuzzy, c-format
-+msgid "%u active connections openings"
- msgstr "poèet aktivnì navázaných spojení: %d"
- 
--#: ../statistics.c:121
--#, c-format
--msgid "%d passive connection openings"
-+#: ../statistics.c:123
-+#, fuzzy, c-format
-+msgid "%u passive connection openings"
- msgstr "poèet pasivnì navázaných spojení: %d"
- 
--#: ../statistics.c:122
--#, c-format
--msgid "%d failed connection attempts"
-+#: ../statistics.c:124
-+#, fuzzy, c-format
-+msgid "%u failed connection attempts"
- msgstr "poèet neúspì¹ných pokusù o spojení: %d"
- 
--#: ../statistics.c:123
--#, c-format
--msgid "%d connection resets received"
-+#: ../statistics.c:125
-+#, fuzzy, c-format
-+msgid "%u connection resets received"
- msgstr "poèet pøijmutých resetù: %d"
- 
--#: ../statistics.c:124
--#, c-format
--msgid "%d connections established"
-+#: ../statistics.c:126
-+#, fuzzy, c-format
-+msgid "%u connections established"
- msgstr "poèet navázaných spojení: %d"
- 
--#: ../statistics.c:125
--#, c-format
--msgid "%d segments received"
-+#: ../statistics.c:127
-+#, fuzzy, c-format
-+msgid "%u segments received"
- msgstr "poèet pøijmutých segmentù: %d"
- 
--#: ../statistics.c:126
--#, c-format
--msgid "%d segments send out"
-+#: ../statistics.c:128
-+#, fuzzy, c-format
-+msgid "%u segments send out"
- msgstr "poèet odeslaných segmentù: %d"
- 
--#: ../statistics.c:127
--#, c-format
--msgid "%d segments retransmited"
-+#: ../statistics.c:129
-+#, fuzzy, c-format
-+msgid "%u segments retransmited"
- msgstr "poèet pøenesených segmentù: %d"
- 
--#: ../statistics.c:128
--#, c-format
--msgid "%d bad segments received."
-+#: ../statistics.c:130
-+#, fuzzy, c-format
-+msgid "%u bad segments received."
- msgstr "poèet chybných pøíchozích segmentù: %d."
- 
--#: ../statistics.c:129
--#, c-format
--msgid "%d resets sent"
-+#: ../statistics.c:131
-+#, fuzzy, c-format
-+msgid "%u resets sent"
- msgstr "poèet odeslaných resetù: %d"
- 
--#: ../statistics.c:134
--#, c-format
--msgid "%d packets received"
-+#: ../statistics.c:136
-+#, fuzzy, c-format
-+msgid "%u packets received"
- msgstr "poèet pøijmutých paketù: %d"
- 
--#: ../statistics.c:135
--#, c-format
--msgid "%d packets to unknown port received."
-+#: ../statistics.c:137
-+#, fuzzy, c-format
-+msgid "%u packets to unknown port received."
- msgstr "poèet paketù pøijmutých pro neznámý port: %d."
- 
--#: ../statistics.c:136
--#, c-format
--msgid "%d packet receive errors"
-+#: ../statistics.c:138
-+#, fuzzy, c-format
-+msgid "%u packet receive errors"
- msgstr "poèet chyb pøi pøíjmu paketù: %d"
- 
--#: ../statistics.c:137
--#, c-format
--msgid "%d packets sent"
-+#: ../statistics.c:139
-+#, fuzzy, c-format
-+msgid "%u packets sent"
- msgstr "poèet odeslaných paketù: %d"
- 
--#: ../statistics.c:142
--#, c-format
--msgid "%d SYN cookies sent"
-+#: ../statistics.c:144
-+#, fuzzy, c-format
-+msgid "%u SYN cookies sent"
- msgstr "poèet odeslaných SYN cookies: %d"
- 
--#: ../statistics.c:143
--#, c-format
--msgid "%d SYN cookies received"
-+#: ../statistics.c:145
-+#, fuzzy, c-format
-+msgid "%u SYN cookies received"
- msgstr "poèet pøijmutých SYN cookies: %d"
- 
--#: ../statistics.c:144
--#, c-format
--msgid "%d invalid SYN cookies received"
-+#: ../statistics.c:146
-+#, fuzzy, c-format
-+msgid "%u invalid SYN cookies received"
- msgstr "poèet chybných pøíchozích SYN cookies: %d"
- 
--#: ../statistics.c:146
--#, c-format
--msgid "%d resets received for embryonic SYN_RECV sockets"
-+#: ../statistics.c:148
-+#, fuzzy, c-format
-+msgid "%u resets received for embryonic SYN_RECV sockets"
- msgstr "poèet resetù pøijmutých pro sokety ve stavu SYN_PØÍCH: %d"
- 
--#: ../statistics.c:148
--#, c-format
--msgid "%d packets pruned from receive queue because of socket buffer overrun"
-+#: ../statistics.c:150
-+#, fuzzy, c-format
-+msgid "%u packets pruned from receive queue because of socket buffer overrun"
- msgstr "poèet paketù odstranìných z fronty kvùli pøeteèení bufferu soketu: %d"
- 
- #. obsolete: 2.2.0 doesn't do that anymore
--#: ../statistics.c:151
--#, c-format
--msgid "%d packets pruned from out-of-order queue"
-+#: ../statistics.c:153
-+#, fuzzy, c-format
-+msgid "%u packets pruned from receive queue"
- msgstr "poèet paketù odstranìných z fronty mimo-poøadí: %d"
- 
--#: ../statistics.c:152
--#, c-format
-+#: ../statistics.c:154
-+#, fuzzy, c-format
- msgid ""
--"%d packets dropped from out-of-order queue because of socket buffer overrun"
-+"%u packets dropped from out-of-order queue because of socket buffer overrun"
- msgstr ""
- "poèet paketù zahozených z fronty mimo-poøadí kvùli pøeteèení bufferu soketu: "
- "%d"
- 
--#: ../statistics.c:154
--#, c-format
--msgid "%d ICMP packets dropped because they were out-of-window"
-+#: ../statistics.c:156
-+#, fuzzy, c-format
-+msgid "%u ICMP packets dropped because they were out-of-window"
- msgstr "poèet ICMP paketù zahozených, proto¾e byly mimo-okno: %d"
- 
--#: ../statistics.c:156
--#, c-format
--msgid "%d ICMP packets dropped because socket was locked"
-+#: ../statistics.c:158
-+#, fuzzy, c-format
-+msgid "%u ICMP packets dropped because socket was locked"
- msgstr "poèet ICMP paketù zahozených kvùli zamèenému soketu: %d"
- 
-+#: ../statistics.c:160
-+#, c-format
-+msgid "%u TCP sockets finished time wait in fast timer"
-+msgstr ""
-+
-+#: ../statistics.c:161
-+#, c-format
-+msgid "%u time wait sockets recycled by time stamp"
-+msgstr ""
-+
-+#: ../statistics.c:162
-+#, c-format
-+msgid "%u TCP sockets finished time wait in slow timer"
-+msgstr ""
-+
-+#: ../statistics.c:163
-+#, c-format
-+msgid "%u passive connections rejected because of time stamp"
-+msgstr ""
-+
-+#: ../statistics.c:165
-+#, c-format
-+msgid "%u active connections rejected because of time stamp"
-+msgstr ""
-+
-+#: ../statistics.c:167
-+#, c-format
-+msgid "%u packets rejects in established connections because of timestamp"
-+msgstr ""
-+
-+#: ../statistics.c:169
-+#, fuzzy, c-format
-+msgid "%u delayed acks sent"
-+msgstr "poèet odeslaných paketù: %d"
-+
-+#: ../statistics.c:170
-+#, c-format
-+msgid "%u delayed acks further delayed because of locked socket"
-+msgstr ""
-+
-+#: ../statistics.c:172
-+#, c-format
-+msgid "Quick ack mode was activated %u times"
-+msgstr ""
-+
-+#: ../statistics.c:173
-+#, c-format
-+msgid "%u times the listen queue of a socket overflowed"
-+msgstr ""
-+
-+#: ../statistics.c:175
-+#, c-format
-+msgid "%u SYNs to LISTEN sockets ignored"
-+msgstr ""
-+
-+#: ../statistics.c:176
-+#, c-format
-+msgid "%u packets directly queued to recvmsg prequeue."
-+msgstr ""
-+
-+#: ../statistics.c:178
-+#, c-format
-+msgid "%u of bytes directly received from backlog"
-+msgstr ""
-+
-+#: ../statistics.c:180
-+#, c-format
-+msgid "%u of bytes directly received from prequeue"
-+msgstr ""
-+
-+#: ../statistics.c:182
-+#, fuzzy, c-format
-+msgid "%u packets dropped from prequeue"
-+msgstr "poèet paketù odstranìných z fronty mimo-poøadí: %d"
-+
-+#: ../statistics.c:183
-+#, fuzzy, c-format
-+msgid "%u packet headers predicted"
-+msgstr "poèet pøijmutých paketù: %d"
-+
-+#: ../statistics.c:184
-+#, c-format
-+msgid "%u packets header predicted and directly queued to user"
-+msgstr ""
-+
-+#: ../statistics.c:186
-+#, c-format
-+msgid "Ran %u times out of system memory during packet sending"
-+msgstr ""
-+
-+#: ../statistics.c:188
-+#, fuzzy, c-format
-+msgid "%u acknowledgments not containing data received"
-+msgstr "poèet paketù pøijmutých pro neznámý port: %d."
-+
-+#: ../statistics.c:189
-+#, c-format
-+msgid "%u predicted acknowledgments"
-+msgstr ""
-+
-+#: ../statistics.c:190
-+#, c-format
-+msgid "%u times recovered from packet loss due to fast retransmit"
-+msgstr ""
-+
-+#: ../statistics.c:191
-+#, c-format
-+msgid "%u times recovered from packet loss due to SACK data"
-+msgstr ""
-+
-+#: ../statistics.c:192
-+#, fuzzy, c-format
-+msgid "%u bad SACKs received"
-+msgstr "poèet chybných pøíchozích segmentù: %d."
-+
-+#: ../statistics.c:193
-+#, c-format
-+msgid "Detected reordering %u times using FACK"
-+msgstr ""
-+
-+#: ../statistics.c:194
-+#, c-format
-+msgid "Detected reordering %u times using SACK"
-+msgstr ""
-+
-+#: ../statistics.c:195
-+#, c-format
-+msgid "Detected reordering %u times using time stamp"
-+msgstr ""
-+
-+#: ../statistics.c:196
-+#, c-format
-+msgid "Detected reordering %u times using reno fast retransmit"
-+msgstr ""
-+
-+#: ../statistics.c:197
-+#, c-format
-+msgid "%u congestion windows fully recovered"
-+msgstr ""
-+
-+#: ../statistics.c:198
-+#, c-format
-+msgid "%u congestion windows partially recovered using Hoe heuristic"
-+msgstr ""
-+
-+#: ../statistics.c:199
-+#, c-format
-+msgid "%u congestion window recovered using DSACK"
-+msgstr ""
-+
-+#: ../statistics.c:200
-+#, c-format
-+msgid "%u congestion windows recovered after partial ack"
-+msgstr ""
-+
-+#: ../statistics.c:201
-+#, fuzzy, c-format
-+msgid "%u retransmits lost"
-+msgstr "poèet odeslaných resetù: %d"
-+
-+#: ../statistics.c:202
-+#, c-format
-+msgid "%u timeouts after reno fast retransmit"
-+msgstr ""
-+
-+#: ../statistics.c:203
-+#, c-format
-+msgid "%u timeouts after SACK recovery"
-+msgstr ""
-+
-+#: ../statistics.c:204
-+#, c-format
-+msgid "%u timeouts in loss state"
-+msgstr ""
-+
-+#: ../statistics.c:205
-+#, fuzzy, c-format
-+msgid "%u fast retransmits"
-+msgstr "poèet pøenesených segmentù: %d"
-+
-+#: ../statistics.c:206
-+#, c-format
-+msgid "%u forward retransmits"
-+msgstr ""
-+
-+#: ../statistics.c:207
-+#, c-format
-+msgid "%u retransmits in slow start"
-+msgstr ""
-+
-+#: ../statistics.c:208
-+#, c-format
-+msgid "%u other TCP timeouts"
-+msgstr ""
-+
-+#: ../statistics.c:209
-+#, fuzzy, c-format
-+msgid "%u reno fast retransmits failed"
-+msgstr "poèet pøenesených segmentù: %d"
-+
-+#: ../statistics.c:210
-+#, fuzzy, c-format
-+msgid "%u sack retransmits failed"
-+msgstr "poèet paketù, je¾ se nepodaøilo znovu sestavit: %d"
-+
-+#: ../statistics.c:211
-+#, c-format
-+msgid "%u times receiver scheduled too late for direct processing"
-+msgstr ""
-+
-+#: ../statistics.c:212
-+#, fuzzy, c-format
-+msgid "%u packets collapsed in receive queue due to low socket buffer"
-+msgstr "poèet paketù odstranìných z fronty kvùli pøeteèení bufferu soketu: %d"
-+
-+#: ../statistics.c:213
-+#, c-format
-+msgid "%u DSACKs sent for old packets"
-+msgstr ""
-+
-+#: ../statistics.c:214
-+#, c-format
-+msgid "%u DSACKs sent for out of order packets"
-+msgstr ""
-+
-+#: ../statistics.c:215
-+#, fuzzy, c-format
-+msgid "%u DSACKs received"
-+msgstr "poèet pøijmutých paketù: %d"
-+
-+#: ../statistics.c:216
-+#, fuzzy, c-format
-+msgid "%u DSACKs for out of order packets received"
-+msgstr "celkem pøijmutých paketù: %d"
-+
-+#: ../statistics.c:217
-+#, fuzzy, c-format
-+msgid "%u connections reset due to unexpected SYN"
-+msgstr "poèet pøijmutých resetù: %d"
-+
-+#: ../statistics.c:218
-+#, fuzzy, c-format
-+msgid "%u connections reset due to unexpected data"
-+msgstr "poèet pøijmutých resetù: %d"
-+
-+#: ../statistics.c:219
-+#, fuzzy, c-format
-+msgid "%u connections reset due to early user close"
-+msgstr "poèet pøijmutých resetù: %d"
-+
-+#: ../statistics.c:220
-+#, c-format
-+msgid "%u connections aborted due to memory pressure"
-+msgstr ""
-+
-+#: ../statistics.c:221
-+#, fuzzy, c-format
-+msgid "%u connections aborted due to timeout"
-+msgstr "poèet pøijmutých resetù: %d"
-+
- #: ../statistics.c:222
-+#, c-format
-+msgid "%u connections aborted after user close in linger timeout"
-+msgstr ""
-+
-+#: ../statistics.c:223
-+#, c-format
-+msgid "%u times unabled to send RST due to no memory"
-+msgstr ""
-+
-+#: ../statistics.c:224
-+#, c-format
-+msgid "TCP ran low on memory %u times"
-+msgstr ""
-+
-+#: ../statistics.c:225
-+#, c-format
-+msgid "%u TCP data loss events"
-+msgstr ""
-+
-+#: ../statistics.c:292
- msgid "enabled"
- msgstr "zapnuto"
- 
--#: ../statistics.c:222
-+#: ../statistics.c:292
- msgid "disabled"
- msgstr "vypnuto"
- 
--#: ../statistics.c:272
--#, c-format
--msgid "unknown title %s\n"
--msgstr "titulek %s je neznámý\n"
--
--#: ../statistics.c:298
-+#: ../statistics.c:375
- msgid "error parsing /proc/net/snmp"
- msgstr "chyba pøi zpracování /proc/net/snmp"
- 
--#: ../statistics.c:311
-+#: ../statistics.c:388
- msgid "cannot open /proc/net/snmp"
- msgstr "/proc/net/snmp nelze otevøít"
- 
-@@ -1821,89 +2112,95 @@
- msgid "Cannot change line discipline to `%s'.\n"
- msgstr "Linkovou disciplínu nelze na `%s' zmìnit.\n"
- 
--#: ../lib/af.c:145 ../lib/hw.c:148
-+#: ../lib/af.c:153 ../lib/hw.c:161
- msgid "UNSPEC"
- msgstr "NEZNÁM"
- 
--#: ../lib/af.c:147
-+#: ../lib/af.c:155
- msgid "UNIX Domain"
- msgstr "Doména UNIX"
- 
--#: ../lib/af.c:150
-+#: ../lib/af.c:158
- msgid "DARPA Internet"
- msgstr "DARPA Internet"
- 
--#: ../lib/af.c:153
-+#: ../lib/af.c:161
- msgid "IPv6"
- msgstr "IPv6"
- 
--#: ../lib/af.c:156 ../lib/hw.c:169
-+#: ../lib/af.c:164 ../lib/hw.c:182
- msgid "AMPR AX.25"
- msgstr "AMPR AX.25"
- 
--#: ../lib/af.c:159 ../lib/hw.c:175
-+#: ../lib/af.c:167 ../lib/hw.c:188
- msgid "AMPR NET/ROM"
- msgstr "AMPR NET/ROM"
- 
--#: ../lib/af.c:162
-+#: ../lib/af.c:170
- msgid "Novell IPX"
- msgstr "Novell IPX"
- 
--#: ../lib/af.c:165
-+#: ../lib/af.c:173
- msgid "Appletalk DDP"
- msgstr "Appletalk DDP"
- 
--#: ../lib/af.c:168 ../lib/hw.c:207
-+#: ../lib/af.c:176 ../lib/hw.c:223
- msgid "Econet"
- msgstr "Econet"
- 
--#: ../lib/af.c:171 ../lib/hw.c:172
-+#: ../lib/af.c:179
-+msgid "CCITT X.25"
-+msgstr ""
-+
-+#: ../lib/af.c:182 ../lib/hw.c:185
- msgid "AMPR ROSE"
- msgstr "AMPR ROSE"
- 
--#: ../lib/af.c:174 ../lib/hw.c:160
-+#: ../lib/af.c:185 ../lib/hw.c:173
- msgid "Ash"
- msgstr "Ash"
- 
--#: ../lib/af.c:232
-+#: ../lib/af.c:243
-+#, c-format
- msgid "Please don't supply more than one address family.\n"
- msgstr "Nezadávejte více ne¾ jednu tøídu adres.\n"
- 
--#: ../lib/af.c:293
-+#: ../lib/af.c:304
-+#, c-format
- msgid "Too much address family arguments.\n"
- msgstr "Bylo zadáno pøíli¹ mnoho tøíd adres.\n"
- 
--#: ../lib/af.c:304
-+#: ../lib/af.c:315
- #, c-format
- msgid "Unknown address family `%s'.\n"
- msgstr "Tøída adres `%s' není známa.\n"
- 
--#: ../lib/arcnet.c:53 ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52
--#: ../lib/fddi.c:67 ../lib/hippi.c:68 ../lib/inet.c:244 ../lib/inet.c:259
--#: ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ../lib/rose.c:71
--#: ../lib/rose.c:126 ../lib/unix.c:56 ../lib/unix.c:76
--msgid "[NONE SET]"
--msgstr "[NENASTAVENO]"
--
--#: ../lib/arcnet.c:81 ../lib/arcnet.c:96
-+#: ../lib/arcnet.c:70 ../lib/arcnet.c:85
- #, c-format
- msgid "in_arcnet(%s): invalid arcnet address!\n"
- msgstr "in_arcnet(%s): chybná arcnet adresa!\n"
- 
--#: ../lib/arcnet.c:108
-+#: ../lib/arcnet.c:97
- #, c-format
- msgid "in_arcnet(%s): trailing : ignored!\n"
- msgstr "in_arcnet(%s): nadbyteèné : ignorováno!\n"
- 
--#: ../lib/arcnet.c:120
-+#: ../lib/arcnet.c:109
- #, c-format
- msgid "in_arcnet(%s): trailing junk!\n"
- msgstr "in_arcnet(%s): nadbyteèné znaky!\n"
- 
- #: ../lib/ash.c:81
-+#, c-format
- msgid "Malformed Ash address"
- msgstr "Chybná Ash adresa"
- 
-+#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244
-+#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78
-+#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76
-+msgid "[NONE SET]"
-+msgstr "[NENASTAVENO]"
-+
- #: ../lib/ax25.c:97 ../lib/netrom.c:100
- msgid "Invalid callsign"
- msgstr "Nesprávný volací znak"
-@@ -1913,22 +2210,21 @@
- msgstr "Volací znak je pøíli¹ dlouhý."
- 
- #: ../lib/ax25_gr.c:47
-+#, c-format
- msgid "AX.25 not configured in this system.\n"
- msgstr "AX.25 není na tomto systému nakonfigurováno.\n"
- 
- #: ../lib/ax25_gr.c:50
-+#, c-format
- msgid "Kernel AX.25 routing table\n"
- msgstr "Smìrovací tabulka v jádru pro AX.25\n"
- 
- #. xxx
- #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
-+#, c-format
- msgid "Destination  Iface    Use\n"
- msgstr "Adresát      Rozhraní U¾ití\n"
- 
--#: ../lib/ddp_gr.c:21
--msgid "Routing table for `ddp' not yet supported.\n"
--msgstr "Smìrovací tabulka pro `ddp' není zatím podporována.\n"
--
- #: ../lib/ether.c:74 ../lib/ether.c:91
- #, c-format
- msgid "in_ether(%s): invalid ether address!\n"
-@@ -1944,153 +2240,171 @@
- msgid "in_ether(%s): trailing junk!\n"
- msgstr "in_ether(%s): nadbyteèné znaky!\n"
- 
--#: ../lib/fddi.c:95 ../lib/fddi.c:110
-+#: ../lib/fddi.c:84 ../lib/fddi.c:99
- #, c-format
- msgid "in_fddi(%s): invalid fddi address!\n"
- msgstr "in_fddi(%s): chybná fddi adresa!\n"
- 
--#: ../lib/fddi.c:122
-+#: ../lib/fddi.c:111
- #, c-format
- msgid "in_fddi(%s): trailing : ignored!\n"
- msgstr "in_fddi(%s): nadbyteèné : ignorováno!\n"
- 
--#: ../lib/fddi.c:134
-+#: ../lib/fddi.c:123
- #, c-format
- msgid "in_fddi(%s): trailing junk!\n"
- msgstr "in_fddi(%s): nadbyteèné znaky!\n"
- 
--#: ../lib/getroute.c:97 ../lib/setroute.c:76
-+#: ../lib/getroute.c:101 ../lib/setroute.c:80
- #, c-format
- msgid "Address family `%s' not supported.\n"
- msgstr "Tøída adres `%s' není podporována.\n"
- 
--#: ../lib/getroute.c:103 ../lib/setroute.c:80
-+#: ../lib/getroute.c:107 ../lib/setroute.c:84
- #, c-format
- msgid "No routing for address family `%s'.\n"
- msgstr "Pro tøídu adres `%s' není ¾ádné smìrování.\n"
- 
--#: ../lib/hippi.c:96 ../lib/hippi.c:111
-+#: ../lib/hippi.c:84 ../lib/hippi.c:99
- #, c-format
- msgid "in_hippi(%s): invalid hippi address!\n"
- msgstr "in_hippi(%s): chybná hippi adresa!\n"
- 
--#: ../lib/hippi.c:123
-+#: ../lib/hippi.c:111
- #, c-format
- msgid "in_hippi(%s): trailing : ignored!\n"
- msgstr "in_hippi(%s): nadbyteèné : ignorováno!\n"
- 
--#: ../lib/hippi.c:134
-+#: ../lib/hippi.c:122
- #, c-format
- msgid "in_hippi(%s): trailing junk!\n"
- msgstr "in_hippi(%s): nadbyteèné znaky!\n"
- 
--#: ../lib/hw.c:147
-+#: ../lib/hw.c:160
- msgid "Local Loopback"
- msgstr "Místní smyèka"
- 
--#: ../lib/hw.c:150
-+#: ../lib/hw.c:163
- msgid "Serial Line IP"
- msgstr "IP po sériové lince"
- 
--#: ../lib/hw.c:151
-+#: ../lib/hw.c:164
- msgid "VJ Serial Line IP"
- msgstr "Vj IP po sériové lince"
- 
--#: ../lib/hw.c:152
-+#: ../lib/hw.c:165
- msgid "6-bit Serial Line IP"
- msgstr "6bitový IP po sériové lince"
- 
--#: ../lib/hw.c:153
-+#: ../lib/hw.c:166
- msgid "VJ 6-bit Serial Line IP"
- msgstr "6bitový VJ IP po sériové lince"
- 
--#: ../lib/hw.c:154
-+#: ../lib/hw.c:167
- msgid "Adaptive Serial Line IP"
- msgstr "Adaptivní IP po sériové lince"
- 
--#: ../lib/hw.c:157
-+#: ../lib/hw.c:170
- msgid "Ethernet"
- msgstr "Ethernet"
- 
--#: ../lib/hw.c:163
-+#: ../lib/hw.c:176
- msgid "Fiber Distributed Data Interface"
- msgstr "Fiber Distributed Data Interface"
- 
--#: ../lib/hw.c:166
-+#: ../lib/hw.c:179
- msgid "HIPPI"
- msgstr "HIPPI"
- 
--#: ../lib/hw.c:178
-+#: ../lib/hw.c:191
-+msgid "generic X.25"
-+msgstr ""
-+
-+#: ../lib/hw.c:194
- msgid "IPIP Tunnel"
- msgstr "IPIP Tunnel"
- 
--#: ../lib/hw.c:181
-+#: ../lib/hw.c:197
- msgid "Point-to-Point Protocol"
- msgstr "Point-to-Point Protokol"
- 
--#: ../lib/hw.c:184
-+#: ../lib/hw.c:200
- msgid "(Cisco)-HDLC"
- msgstr "(Cisco)-HDLC"
- 
--#: ../lib/hw.c:185
-+#: ../lib/hw.c:201
- msgid "LAPB"
- msgstr "LAPB"
- 
--#: ../lib/hw.c:188
-+#: ../lib/hw.c:204
- msgid "ARCnet"
- msgstr "ARCnet"
- 
--#: ../lib/hw.c:191
-+#: ../lib/hw.c:207
- msgid "Frame Relay DLCI"
- msgstr "Frame Relay DLCI"
- 
--#: ../lib/hw.c:192
-+#: ../lib/hw.c:208
- msgid "Frame Relay Access Device"
- msgstr "Pøístupové zaøízení Frame Relay"
- 
--#: ../lib/hw.c:195
-+#: ../lib/hw.c:211
- msgid "IPv6-in-IPv4"
- msgstr "IPv6-in-IPv4"
- 
--#: ../lib/hw.c:198
-+#: ../lib/hw.c:214
- msgid "IrLAP"
- msgstr "IrLAP"
- 
--#: ../lib/hw.c:201
-+#: ../lib/hw.c:217
- msgid "16/4 Mbps Token Ring"
- msgstr "Token Ring 16/4 Mb/s"
- 
--#: ../lib/hw.c:203
-+#: ../lib/hw.c:219
- #, fuzzy
- msgid "16/4 Mbps Token Ring (New)"
- msgstr "Token Ring 16/4 Mb/s"
- 
-+#: ../lib/hw.c:226
-+msgid "Generic EUI-64"
-+msgstr ""
-+
- #: ../lib/inet.c:153 ../lib/inet6.c:79
- #, c-format
- msgid "rresolve: unsupport address family %d !\n"
- msgstr "rresolve: tøída adres %d není podporována!\n"
- 
--#: ../lib/inet6_gr.c:79
-+#: ../lib/inet6.c:131
-+#, fuzzy
-+msgid "[UNKNOWN]"
-+msgstr "NEZNÁM"
-+
-+#: ../lib/inet6_gr.c:71
-+#, c-format
- msgid "INET6 (IPv6) not configured in this system.\n"
- msgstr "INET6 (IPv6) není na tomto systému nakonfigurováno.\n"
- 
--#: ../lib/inet6_gr.c:82
-+#: ../lib/inet6_gr.c:74
-+#, c-format
- msgid "Kernel IPv6 routing table\n"
- msgstr "Smìrovací tabulka v jádru pro IPv6\n"
- 
--#: ../lib/inet6_gr.c:84
-+#: ../lib/inet6_gr.c:76
-+#, c-format
- msgid ""
--"Destination                                 Next Hop                         "
--"       Flags Metric Ref    Use Iface\n"
-+"Destination                                 Next "
-+"Hop                                Flags Metric Ref    Use Iface\n"
- msgstr ""
--"Adresát                                     Dal¹í Smìrovaè                   "
--"       Pøízn Metrika Odkaz U¾it Rozhraní\n"
-+"Adresát                                     Dal¹í "
-+"Smìrovaè                          Pøízn Metrika Odkaz U¾it Rozhraní\n"
- 
--#: ../lib/inet6_gr.c:158
-+#: ../lib/inet6_gr.c:150
-+#, c-format
- msgid "Kernel IPv6 Neighbour Cache\n"
- msgstr "Cache sousedù v jádru pro IPv6\n"
- 
--#: ../lib/inet6_gr.c:161
-+#: ../lib/inet6_gr.c:153
-+#, c-format
- msgid ""
- "Neighbour                                   HW Address        Iface    Flags "
- "Ref State\n"
-@@ -2098,7 +2412,8 @@
- "Soused                                      HW Adresa         Rozhraní Pøízn "
- "Odkazy Stav\n"
- 
--#: ../lib/inet6_gr.c:165
-+#: ../lib/inet6_gr.c:157
-+#, c-format
- msgid ""
- "Neighbour                                   HW Address        Iface    Flags "
- "Ref State            Stale(sec) Delete(sec)\n"
-@@ -2107,30 +2422,37 @@
- "Pøíznaky Odkazy Stav          Pro¹lý(sec) Smazat(sec)\n"
- 
- #: ../lib/inet6_sr.c:46
-+#, c-format
- msgid "Usage: inet6_route [-vF] del Target\n"
- msgstr "Pou¾ití: inet6_route [-vF] del Cíl\n"
- 
- #: ../lib/inet6_sr.c:47
-+#, c-format
- msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
- msgstr "       inet6_route [-vF] add Cíl [gw Gw] [metrika M] [[dev] If]\n"
- 
- #: ../lib/inet6_sr.c:48
-+#, c-format
- msgid "       inet6_route [-FC] flush      NOT supported\n"
- msgstr "       inet6_route [-FC] flush      NENÍ podporováno\n"
- 
--#: ../lib/inet6_sr.c:182
-+#: ../lib/inet6_sr.c:188
-+#, c-format
- msgid "Flushing `inet6' routing table not supported\n"
- msgstr "Smìrovací tabulku `inet6' nelze vyprazdòovat\n"
- 
- #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
-+#, c-format
- msgid "INET (IPv4) not configured in this system.\n"
- msgstr "INET (IPv4) není na tomto systému nakonfigurováno.\n"
- 
- #: ../lib/inet_gr.c:53
-+#, c-format
- msgid "Kernel IP routing table\n"
- msgstr "Smìrovací tabulka v jádru pro IP\n"
- 
- #: ../lib/inet_gr.c:56
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags Metric Ref    Use "
- "Iface\n"
-@@ -2139,6 +2461,7 @@
- "Rozhraní\n"
- 
- #: ../lib/inet_gr.c:59
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags   MSS Window  irtt "
- "Iface\n"
-@@ -2147,6 +2470,7 @@
- "Rozhraní\n"
- 
- #: ../lib/inet_gr.c:62
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt\n"
-@@ -2155,10 +2479,12 @@
- "Rozhraní MSS   Okno   irtt\n"
- 
- #: ../lib/inet_gr.c:237
-+#, c-format
- msgid "Kernel IP routing cache\n"
- msgstr "Smìrovací cache v jádru pro IP\n"
- 
- #: ../lib/inet_gr.c:258
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface\n"
-@@ -2167,6 +2493,7 @@
- "Rozhraní\n"
- 
- #: ../lib/inet_gr.c:261
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags   MSS Window  irtt "
- "Iface\n"
-@@ -2175,6 +2502,7 @@
- "Rozhraní\n"
- 
- #: ../lib/inet_gr.c:266
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt  HH  Arp\n"
-@@ -2183,6 +2511,7 @@
- "Rozhraní MSS   Okno   irtt HH   Arp\n"
- 
- #: ../lib/inet_gr.c:290
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
-@@ -2190,7 +2519,8 @@
- "Odesílatel      Adresát         Maska           Pøízn Metrik Odkazy U¾t "
- "Rozhraní MSS    Okno irtt   TOS HHOdk HHAktuál    Zvlá¹tCíl\n"
- 
--#: ../lib/inet_sr.c:50
-+#: ../lib/inet_sr.c:51
-+#, c-format
- msgid ""
- "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
- "[[dev] If]\n"
-@@ -2198,29 +2528,34 @@
- "Pou¾ití: inet_route [-vF] del {-host|-net} Cíl[/prefix] [gw Gw] [metrika M] "
- "[[dev] If]\n"
- 
--#: ../lib/inet_sr.c:51
-+#: ../lib/inet_sr.c:52
-+#, c-format
- msgid ""
- "       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
- msgstr ""
- "       inet_route [-vF] add {-host|-net} Cíl[/prefix] [gw Gw] [metrika M]\n"
- 
--#: ../lib/inet_sr.c:52
-+#: ../lib/inet_sr.c:53
-+#, c-format
- msgid ""
- "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
- msgstr ""
- "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
- 
--#: ../lib/inet_sr.c:53
-+#: ../lib/inet_sr.c:54
-+#, c-format
- msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
- msgstr "                              [mod] [dyn] [reinstate] [[dev] If]\n"
- 
--#: ../lib/inet_sr.c:54
-+#: ../lib/inet_sr.c:55
-+#, c-format
- msgid ""
- "       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
- msgstr ""
- "       inet_route [-vF] add {-host|-net} Cíl/[prefix] [metrika M] reject\n"
- 
--#: ../lib/inet_sr.c:55
-+#: ../lib/inet_sr.c:56
-+#, c-format
- msgid "       inet_route [-FC] flush      NOT supported\n"
- msgstr "       inet_route [-FC] flush      NENÍ podporováno\n"
- 
-@@ -2230,15 +2565,17 @@
- msgstr "route: %s: sí» nelze pou¾ít jako bránu!\n"
- 
- #: ../lib/inet_sr.c:174
--#, fuzzy
-+#, fuzzy, c-format
- msgid "route: Invalid MSS/MTU.\n"
- msgstr "route: Nesprávné NSS.\n"
- 
- #: ../lib/inet_sr.c:187
-+#, c-format
- msgid "route: Invalid window.\n"
- msgstr "route: Nesprávné okno.\n"
- 
- #: ../lib/inet_sr.c:203
-+#, c-format
- msgid "route: Invalid initial rtt.\n"
- msgstr "route: Nesprávné zahajovací rtt.\n"
- 
-@@ -2253,75 +2590,92 @@
- msgstr "route: sí»ová maska %s je nesprávná\n"
- 
- #: ../lib/inet_sr.c:270
-+#, c-format
- msgid "route: netmask doesn't match route address\n"
- msgstr "route: sí»ová maska nevyhovuje adrese cesty\n"
- 
- #: ../lib/inet_sr.c:306
-+#, c-format
- msgid "Flushing `inet' routing table not supported\n"
- msgstr "Smìrovací cache `inet' nelze vyprazdòovat\n"
- 
- #: ../lib/inet_sr.c:310
-+#, c-format
- msgid "Modifying `inet' routing cache not supported\n"
- msgstr "Smìrovací cache `inet' nelze mìnit\n"
- 
- #: ../lib/ipx_gr.c:52
-+#, c-format
- msgid "IPX not configured in this system.\n"
- msgstr "IPX není na tomto systému nakonfigurováno.\n"
- 
- #: ../lib/ipx_gr.c:56
-+#, c-format
- msgid "Kernel IPX routing table\n"
- msgstr "Smìrovací tabulka v jádru pro IPX\n"
- 
- #. xxx
- #: ../lib/ipx_gr.c:57
-+#, c-format
- msgid "Destination               Router Net                Router Node\n"
- msgstr "Cíl                       Smìrovaè Sí»              Smìrovaè Uzel\n"
- 
- #: ../lib/ipx_sr.c:33
-+#, c-format
- msgid "IPX: this needs to be written\n"
- msgstr "IPX: toto je tøeba ulo¾it\n"
- 
--#: ../lib/masq_info.c:197
-+#: ../lib/masq_info.c:198
-+#, c-format
- msgid "IP masquerading entries\n"
- msgstr "IP maskovací polo¾ky\n"
- 
--#: ../lib/masq_info.c:200
-+#: ../lib/masq_info.c:201
-+#, c-format
- msgid "prot   expire source               destination          ports\n"
- msgstr "prot   ¾ivot  zdroj                cíl                  porty\n"
- 
--#: ../lib/masq_info.c:203
-+#: ../lib/masq_info.c:204
-+#, c-format
- msgid ""
--"prot   expire    initseq delta prevd source               destination        "
--"  ports\n"
-+"prot   expire    initseq delta prevd source               "
-+"destination          ports\n"
- msgstr ""
--"prot   ¾ivot     zahajsek delta pøedchd zdroj             cíl                "
--"   porty\n"
-+"prot   ¾ivot     zahajsek delta pøedchd zdroj             "
-+"cíl                   porty\n"
- 
- #: ../lib/netrom_gr.c:48
-+#, c-format
- msgid "NET/ROM not configured in this system.\n"
- msgstr "NET/ROM není na tomto systému nakonfigurováno.\n"
- 
- #: ../lib/netrom_gr.c:51
-+#, c-format
- msgid "Kernel NET/ROM routing table\n"
- msgstr "Smìrovací tabulka v jádru pro NET/ROM\n"
- 
- #: ../lib/netrom_gr.c:52
-+#, c-format
- msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
- msgstr "Cíl          Mnemonika Kvalita  Soused     Rozhraní\n"
- 
- #: ../lib/netrom_sr.c:34
-+#, c-format
- msgid "netrom usage\n"
- msgstr "pou¾ití netrom\n"
- 
- #: ../lib/netrom_sr.c:44
-+#, c-format
- msgid "NET/ROM: this needs to be written\n"
- msgstr "NET/ROM: toto je potøeba ulo¾it\n"
- 
- #: ../lib/ppp.c:44
-+#, c-format
- msgid "You cannot start PPP with this program.\n"
- msgstr "Tímto programem nelze PPP spustit.\n"
- 
- #: ../lib/ppp_ac.c:38
-+#, c-format
- msgid "Sorry, use pppd!\n"
- msgstr "Lituji, pou¾ijte pppd!\n"
- 
-@@ -2330,49 +2684,319 @@
- msgstr "Adresa uzlu musí mít 10 èíslic"
- 
- #: ../lib/rose_gr.c:51
-+#, c-format
- msgid "ROSE not configured in this system.\n"
- msgstr "ROSE není na tomto systému nakonfigurováno.\n"
- 
- #: ../lib/rose_gr.c:54
-+#, c-format
- msgid "Kernel ROSE routing table\n"
- msgstr "Smìrovací tabulka v jádru pro ROSE\n"
- 
--#: ../lib/tr.c:70 ../lib/tr.c:85
-+#: ../lib/tr.c:86 ../lib/tr.c:101
- #, c-format
- msgid "in_tr(%s): invalid token ring address!\n"
- msgstr "in_tr(%s): nesprávná token ring adresa!\n"
- 
--#: ../lib/tr.c:97
-+#: ../lib/tr.c:113
- #, c-format
- msgid "in_tr(%s): trailing : ignored!\n"
- msgstr "in_tr(%s): nadbyteèné: ignorováno!\n"
- 
--#: ../lib/tr.c:109
-+#: ../lib/tr.c:125
- #, c-format
- msgid "in_tr(%s): trailing junk!\n"
- msgstr "in_tr(%s): nadbyteèné znaky!\n"
- 
--#: ../lib/interface.c:124
-+#: ../lib/interface.c:176
- #, c-format
- msgid "warning: no inet socket available: %s\n"
- msgstr "varování: není dostupný ¾ádný inet soket: %s\n"
- 
--#: ../lib/interface.c:270
-+#: ../lib/interface.c:325
- #, c-format
- msgid "Warning: cannot open %s (%s). Limited output.\n"
- msgstr ""
- 
- #. Give better error message for this case.
--#: ../lib/interface.c:504
-+#: ../lib/interface.c:571
- msgid "Device not found"
- msgstr "Zaøízení nebylo nalezeno"
- 
--#: ../lib/interface.c:508
-+#: ../lib/interface.c:575
- #, c-format
- msgid "%s: error fetching interface information: %s\n"
- msgstr "%s: chyba pøi získávání informací o rozhraní %s\n"
- 
--#: ../lib/sockets.c:59
-+#: ../lib/interface.c:608
-+msgid "     - no statistics available -"
-+msgstr "     - statistická data nejsou dostupná -"
-+
-+#: ../lib/interface.c:612
-+#, c-format
-+msgid "[NO FLAGS]"
-+msgstr "[®ÁDNÉ PØÍZNAKY]"
-+
-+#: ../lib/interface.c:688
-+#, c-format
-+msgid "%-9.9s Link encap:%s  "
-+msgstr "%-9.9s Zapouzdøení:%s  "
-+
-+#: ../lib/interface.c:693
-+#, c-format
-+msgid "HWaddr %s  "
-+msgstr "HWadr %s  "
-+
-+#: ../lib/interface.c:696
-+#, c-format
-+msgid "Media:%s"
-+msgstr "Médium:%s"
-+
-+#: ../lib/interface.c:698
-+#, c-format
-+msgid "(auto)"
-+msgstr "(auto)"
-+
-+#: ../lib/interface.c:705
-+#, c-format
-+msgid "          %s addr:%s "
-+msgstr "          %s adr:%s "
-+
-+#: ../lib/interface.c:708
-+#, c-format
-+msgid " P-t-P:%s "
-+msgstr " P-t-P:%s "
-+
-+# V ostatních katalozích se pøekládá Broadcast -> v¹esmìrové vysílání.
-+# Tudi¾ bcast -> V¹esmìr :)
-+#: ../lib/interface.c:711
-+#, c-format
-+msgid " Bcast:%s "
-+msgstr " V¹esmìr:%s "
-+
-+#: ../lib/interface.c:713
-+#, c-format
-+msgid " Mask:%s\n"
-+msgstr "Maska:%s\n"
-+
-+#: ../lib/interface.c:730
-+#, c-format
-+msgid "          inet6 addr: %s/%d"
-+msgstr "          inet6-adr: %s/%d"
-+
-+#: ../lib/interface.c:732
-+#, c-format
-+msgid " Scope:"
-+msgstr " Rozsah:"
-+
-+#: ../lib/interface.c:735
-+#, c-format
-+msgid "Global"
-+msgstr "Globál"
-+
-+#: ../lib/interface.c:738
-+#, c-format
-+msgid "Link"
-+msgstr "Linka"
-+
-+#: ../lib/interface.c:741
-+#, c-format
-+msgid "Site"
-+msgstr "Stanovi¹tì"
-+
-+#: ../lib/interface.c:744
-+#, c-format
-+msgid "Compat"
-+msgstr "Kompatibilita"
-+
-+#: ../lib/interface.c:747
-+#, c-format
-+msgid "Host"
-+msgstr "Poèítaè"
-+
-+#: ../lib/interface.c:750
-+#, c-format
-+msgid "Unknown"
-+msgstr "Neznám."
-+
-+#: ../lib/interface.c:765
-+#, c-format
-+msgid "          IPX/Ethernet II addr:%s\n"
-+msgstr "          IPX/Ethernet II adr: %s\n"
-+
-+#: ../lib/interface.c:768
-+#, c-format
-+msgid "          IPX/Ethernet SNAP addr:%s\n"
-+msgstr "          IPX/Ethernet SNAP adr:%s\n"
-+
-+#: ../lib/interface.c:771
-+#, c-format
-+msgid "          IPX/Ethernet 802.2 addr:%s\n"
-+msgstr "          IPX/Ethernet 802.2 adr:%s\n"
-+
-+#: ../lib/interface.c:774
-+#, c-format
-+msgid "          IPX/Ethernet 802.3 addr:%s\n"
-+msgstr "          IPX/Ethernet 802.3 adr:%s\n"
-+
-+#: ../lib/interface.c:784
-+#, c-format
-+msgid "          EtherTalk Phase 2 addr:%s\n"
-+msgstr "          EtherTalk Phase 2 adr:%s\n"
-+
-+#: ../lib/interface.c:793
-+#, c-format
-+msgid "          econet addr:%s\n"
-+msgstr "          econet adr:%s\n"
-+
-+# Hic sunt leones ...
-+#: ../lib/interface.c:800
-+#, c-format
-+msgid "[NO FLAGS] "
-+msgstr "[®ÁDNÉ PØÍZNAKY]"
-+
-+#: ../lib/interface.c:802
-+#, c-format
-+msgid "UP "
-+msgstr "AKTIVOVÁNO "
-+
-+#: ../lib/interface.c:804
-+#, c-format
-+msgid "BROADCAST "
-+msgstr "V©ESMÌROVÉ_VYSÍLÁNÍ "
-+
-+#: ../lib/interface.c:806
-+#, c-format
-+msgid "DEBUG "
-+msgstr "DEBUG "
-+
-+#: ../lib/interface.c:808
-+#, c-format
-+msgid "LOOPBACK "
-+msgstr "SMYÈKA "
-+
-+#: ../lib/interface.c:810
-+#, c-format
-+msgid "POINTOPOINT "
-+msgstr "POINTOPOINT "
-+
-+# ??
-+#: ../lib/interface.c:812
-+#, c-format
-+msgid "NOTRAILERS "
-+msgstr "NOTRAILERS "
-+
-+#: ../lib/interface.c:814
-+#, c-format
-+msgid "RUNNING "
-+msgstr "BÌ®Í "
-+
-+#: ../lib/interface.c:816
-+#, c-format
-+msgid "NOARP "
-+msgstr "NEARP "
-+
-+#: ../lib/interface.c:818
-+#, c-format
-+msgid "PROMISC "
-+msgstr "PROMISK "
-+
-+#: ../lib/interface.c:820
-+#, c-format
-+msgid "ALLMULTI "
-+msgstr "ALLMULTI "
-+
-+#: ../lib/interface.c:822
-+#, c-format
-+msgid "SLAVE "
-+msgstr "SLAVE "
-+
-+#: ../lib/interface.c:824
-+#, c-format
-+msgid "MASTER "
-+msgstr "MASTER "
-+
-+#: ../lib/interface.c:826
-+#, c-format
-+msgid "MULTICAST "
-+msgstr "MULTICAST "
-+
-+#: ../lib/interface.c:829
-+#, c-format
-+msgid "DYNAMIC "
-+msgstr "DYNAMIC "
-+
-+#. DONT FORGET TO ADD THE FLAGS IN ife_print_short
-+#: ../lib/interface.c:832
-+#, c-format
-+msgid " MTU:%d  Metric:%d"
-+msgstr " MTU:%d  Metrika:%d"
-+
-+#: ../lib/interface.c:836
-+#, c-format
-+msgid "  Outfill:%d  Keepalive:%d"
-+msgstr "  Outfill:%d  Keepalive:%d"
-+
-+#: ../lib/interface.c:850
-+#, fuzzy, c-format
-+msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
-+msgstr "pøijmutých paketù:%lu chyb:%lu zahozeno:%lu pøeteèení:%lu rámcù:%lu\n"
-+
-+#: ../lib/interface.c:855
-+#, c-format
-+msgid "             compressed:%lu\n"
-+msgstr "             komprimováno:%lu\n"
-+
-+# carrier?
-+#: ../lib/interface.c:895
-+#, fuzzy, c-format
-+msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
-+msgstr "odeslaných paketù:%lu chyb:%lu zahozeno:%lu pøeteèení:%lu pøenos:%lu\n"
-+
-+#: ../lib/interface.c:899
-+#, c-format
-+msgid "          collisions:%lu "
-+msgstr "          kolizí:%lu "
-+
-+#: ../lib/interface.c:901
-+#, c-format
-+msgid "compressed:%lu "
-+msgstr "komprimováno:%lu "
-+
-+#: ../lib/interface.c:903
-+#, c-format
-+msgid "txqueuelen:%d "
-+msgstr "délka odchozí fronty:%d "
-+
-+#: ../lib/interface.c:905
-+#, c-format
-+msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
-+msgstr ""
-+
-+#: ../lib/interface.c:916
-+#, c-format
-+msgid "Interrupt:%d "
-+msgstr "Pøeru¹ení:%d "
-+
-+#. Only print devices using it for
-+#. I/O maps
-+#: ../lib/interface.c:919
-+#, c-format
-+msgid "Base address:0x%x "
-+msgstr "Vstupnì/Výstupní port:0x%x "
-+
-+#: ../lib/interface.c:921
-+#, c-format
-+msgid "Memory:%lx-%lx "
-+msgstr "Pamì»:%lx-%lx "
-+
-+#: ../lib/interface.c:924
-+#, c-format
-+msgid "DMA chan:%x "
-+msgstr "Kanál DMA:%x "
-+
-+#: ../lib/sockets.c:63
-+#, c-format
- msgid "No usable address families found.\n"
- msgstr "Nebyla nalezena ¾ádná pou¾itelná tøída adres.\n"
- 
-@@ -2396,29 +3020,32 @@
- msgid "ip: argument is wrong: %s\n"
- msgstr "ip: argument %s je nesprávný\n"
- 
--#: ../ipmaddr.c:56
-+#: ../ipmaddr.c:61
-+#, c-format
- msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
- msgstr " Usage: ipmaddr [ add | del ] MULTIADR dev ØETÌZEC\n"
- 
--#: ../ipmaddr.c:57
-+#: ../ipmaddr.c:62
-+#, c-format
- msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
- msgstr "       ipmaddr show [ dev ØETÌZEC ] [ ipv4 | ipv6 | link | all ]\n"
- 
--#: ../ipmaddr.c:58
-+#: ../ipmaddr.c:63
-+#, c-format
- msgid "       ipmaddr -V | -version\n"
- msgstr "       ipmaddr -V | -version\n"
- 
--#: ../ipmaddr.c:258
-+#: ../ipmaddr.c:263
- #, c-format
- msgid "family %d "
- msgstr "tøída %d "
- 
--#: ../ipmaddr.c:267
-+#: ../ipmaddr.c:272
- #, c-format
- msgid " users %d"
- msgstr " u¾ivatelé %d"
- 
--#: ../ipmaddr.c:353
-+#: ../ipmaddr.c:358
- msgid "Cannot create socket"
- msgstr "Soket nelze vytvoøit"
- 
-@@ -2433,6 +3060,7 @@
- msgstr "slattach: tty_lock: (%s): %s\n"
- 
- #: ../slattach.c:192
-+#, c-format
- msgid "slattach: cannot write PID file\n"
- msgstr "slattach: do PID souboru nelze zapisovat\n"
- 
-@@ -2451,44 +3079,77 @@
- msgid "slattach: tty_hangup(RAISE): %s\n"
- msgstr "slattach: tty_hangup(RAISE): %s\n"
- 
--#: ../slattach.c:486
-+#: ../slattach.c:468
-+#, fuzzy, c-format
-+msgid "slattach: tty name too long\n"
-+msgstr "jméno %s je pøíli¹ dlouhé\n"
-+
-+#: ../slattach.c:498
-+#, c-format
- msgid "slattach: tty_open: cannot get current state!\n"
- msgstr "slattach: tty_open: aktuální stav nelze zjistit!\n"
- 
--#: ../slattach.c:493
-+#: ../slattach.c:505
-+#, c-format
- msgid "slattach: tty_open: cannot get current line disc!\n"
- msgstr "slattach: tty_open: aktuální linkovou disciplínu nelze zjistit!\n"
- 
--#: ../slattach.c:501
-+#: ../slattach.c:513
-+#, c-format
- msgid "slattach: tty_open: cannot set RAW mode!\n"
- msgstr "slattach: tty_open: re¾im RAW nelze nastavit!\n"
- 
--#: ../slattach.c:508
-+#: ../slattach.c:520
- #, c-format
- msgid "slattach: tty_open: cannot set %s bps!\n"
- msgstr "slattach: tty_open: %s bps nelze nastavit!\n"
- 
--#: ../slattach.c:518
-+#: ../slattach.c:530
-+#, c-format
- msgid "slattach: tty_open: cannot set 8N1 mode!\n"
- msgstr "slattach: tty_open: re¾im 8N1 nelze nastavit!\n"
- 
--#: ../slattach.c:686
-+#: ../slattach.c:672
-+#, c-format
-+msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n"
-+msgstr ""
-+
-+#: ../slattach.c:704
- #, c-format
- msgid "%s started"
- msgstr "protokol %s spu¹tìn"
- 
--#: ../slattach.c:687
-+#: ../slattach.c:705
- #, c-format
- msgid " on %s"
- msgstr " na %s"
- 
--#: ../slattach.c:688
-+#: ../slattach.c:706
- #, c-format
- msgid " interface %s\n"
- msgstr " rozhraní %s\n"
- 
- #~ msgid ""
--#~ "   This comand can read or set the hostname or the NIS domainname. You can\n"
-+#~ "  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
-+#~ "<-''-\n"
-+#~ msgstr ""
-+#~ "  arp [-v]   [<HW>] [-i <if>] -s <soubor> <hwadr> [sí»mask <èís>]  <-''-\n"
-+
-+#~ msgid "%s: unknown interface: %s\n"
-+#~ msgstr "%s: rozhraní %s není známo\n"
-+
-+#~ msgid "address mask replies"
-+#~ msgstr "odpovìdi na ¾ádost o masku podsítì"
-+
-+#~ msgid "unknown title %s\n"
-+#~ msgstr "titulek %s je neznámý\n"
-+
-+#~ msgid "Routing table for `ddp' not yet supported.\n"
-+#~ msgstr "Smìrovací tabulka pro `ddp' není zatím podporována.\n"
-+
-+#~ msgid ""
-+#~ "   This comand can read or set the hostname or the NIS domainname. You "
-+#~ "can\n"
- #~ msgstr ""
- #~ "   Tento program zji¹»uje a nastavuje jméno poèítaèe èi NIS domény. Mù¾e "
- #~ "také\n"
-@@ -2500,7 +3161,8 @@
- #~ msgid ""
- #~ "   Unless you are using bind or NIS for host lookups you can change the\n"
- #~ msgstr ""
--#~ "   Pokud nepou¾íváte bind èi NIS pro vyhledávání jmen poèítaèù, pak mù¾ete\n"
-+#~ "   Pokud nepou¾íváte bind èi NIS pro vyhledávání jmen poèítaèù, pak "
-+#~ "mù¾ete\n"
- 
- #~ msgid ""
- #~ "   FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n"
---- net-tools-1.60.orig/po/ja.po
-+++ net-tools-1.60/po/ja.po
-@@ -0,0 +1,3133 @@
-+# Net-tool Japanese locale data
-+# Kenshi Muto <kmuto@debian.org>, 2007.
-+# Yasuyuki Furukawa <yasu@on.cs.keio.ac.jp>, 1999.
-+#
-+msgid ""
-+msgstr ""
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2007-06-30 12:28+0900\n"
-+"PO-Revision-Date: 2007-07-04 20:47+0900\n"
-+"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
-+"Language-Team: Japanese\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8-bit\n"
-+
-+#: ../arp.c:112 ../arp.c:279
-+#, c-format
-+msgid "arp: need host name\n"
-+msgstr "arp: ホスト��必���\n"
-+
-+#: ../arp.c:215 ../arp.c:230
-+#, c-format
-+msgid "No ARP entry for %s\n"
-+msgstr "%s�ARPエントリ��り��ん\n"
-+
-+#: ../arp.c:248
-+#, c-format
-+msgid "arp: cant get HW-Address for `%s': %s.\n"
-+msgstr "arp: '%s'��ードウェアアドレスを�得����ん: %s.\n"
-+
-+#: ../arp.c:252
-+#, c-format
-+msgid "arp: protocol type mismatch.\n"
-+msgstr "arp: プロトコルタイプ������ん.\n"
-+
-+#: ../arp.c:261
-+#, c-format
-+msgid "arp: device `%s' has HW address %s `%s'.\n"
-+msgstr "arp: デ�イス`%s'��ードウェアアドレス%s `%s'��.\n"
-+
-+#: ../arp.c:293
-+#, c-format
-+msgid "arp: need hardware address\n"
-+msgstr "arp: �ードウェアアドレス�必���\n"
-+
-+#: ../arp.c:301
-+#, c-format
-+msgid "arp: invalid hardware address\n"
-+msgstr "arp: �ードウェアアドレス���当��\n"
-+
-+#: ../arp.c:398
-+#, c-format
-+msgid "arp: cannot open etherfile %s !\n"
-+msgstr "arp: etherファイル%s�開���ん!\n"
-+
-+#: ../arp.c:414
-+#, c-format
-+msgid "arp: format error on line %u of etherfile %s !\n"
-+msgstr "arp: %u行(ファイル%s)�フォーマットエラー��り��!\n"
-+
-+#: ../arp.c:427
-+#, c-format
-+msgid "arp: cannot set entry on line %u of etherfile %s !\n"
-+msgstr "arp: etherファイル%u行(%s)�エントリを設定����ん!\n"
-+
-+#: ../arp.c:448
-+#, c-format
-+msgid ""
-+"Address                  HWtype  HWaddress           Flags Mask            "
-+"Iface\n"
-+msgstr "アドレス               HWタイプ  HWアドレス         フラグ マスク インタフェース\n"
-+
-+#: ../arp.c:476
-+msgid "<from_interface>"
-+msgstr "<起点インタフェース>"
-+
-+#: ../arp.c:478
-+msgid "(incomplete)"
-+msgstr "(�完全)"
-+
-+# translatable?
-+#: ../arp.c:495
-+#, c-format
-+msgid "%s (%s) at "
-+msgstr "%s (%s) at "
-+
-+#: ../arp.c:501
-+#, c-format
-+msgid "<incomplete> "
-+msgstr "<�完全> "
-+
-+#: ../arp.c:507
-+#, c-format
-+msgid "netmask %s "
-+msgstr "�ットマスク %s "
-+
-+# translatable?
-+#: ../arp.c:524
-+#, c-format
-+msgid "on %s\n"
-+msgstr "on %s\n"
-+
-+#: ../arp.c:605
-+#, c-format
-+msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
-+msgstr "エントリ: %d\tスキップ: %d\t発見: %d\n"
-+
-+#: ../arp.c:609
-+#, c-format
-+msgid "%s (%s) -- no entry\n"
-+msgstr "%s (%s) -- エントリ��\n"
-+
-+#: ../arp.c:611
-+#, c-format
-+msgid "arp: in %d entries no match found.\n"
-+msgstr "arp: %d�エントリ中, 一致�るも��見��り��ん.\n"
-+
-+#: ../arp.c:626
-+#, c-format
-+msgid ""
-+"Usage:\n"
-+"  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
-+"cache\n"
-+msgstr ""
-+"使用法:\n"
-+"  arp [-vn]  [<HW>] [-i <インタフェース>]\n"
-+"                                [-a] [<ホスト�>]   ‥‥ ARPキャッシュ�表"
-+"示\n"
-+
-+#: ../arp.c:627
-+#, c-format
-+msgid ""
-+"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
-+"entry\n"
-+msgstr "  arp [-v]    [-i <インタフェース>]  -d  <ホスト�> [pub] ‥‥ARPエントリを削除\n"
-+
-+#: ../arp.c:628
-+#, c-format
-+msgid ""
-+"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
-+"file\n"
-+msgstr ""
-+"  arp [-vnD] [<HW>] [-i <インタフェース>] \n"
-+"                              -f  <ファイル�>  ‥‥ファイル�らエントリを追加\n"
-+
-+#: ../arp.c:629
-+#, c-format
-+msgid ""
-+"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
-+"entry\n"
-+msgstr ""
-+"  arp [-v]   [<HW>] [-i <インタフェース>]\n"
-+"             -s <ホスト�> <�ードウェアアドレス> [temp] ‥‥エントリを追加\n"
-+
-+# FIXME:What does '' mean?
-+#: ../arp.c:630
-+#, c-format
-+msgid ""
-+"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
-+"<-''-\n"
-+"\n"
-+msgstr ""
-+"  arp [-v]   [<HW>] [-i <インタフェース>] -Ds <ホスト�>\n"
-+"              <インタフェース> [netmask <�ットマスク>] pub     ‥‥     〃\n"
-+
-+#: ../arp.c:632
-+#, c-format
-+msgid ""
-+"        -a                       display (all) hosts in alternative (BSD) "
-+"style\n"
-+msgstr ""
-+"        -a                 新��(BSD)スタイル�エントリ�れ�全ホストを表示"
-+"�る\n"
-+
-+#: ../arp.c:633
-+#, c-format
-+msgid "        -s, --set                set a new ARP entry\n"
-+msgstr "        -s, --set          新�ARPエントリを設定�る\n"
-+
-+#: ../arp.c:634
-+#, c-format
-+msgid "        -d, --delete             delete a specified entry\n"
-+msgstr "        -d, --delete       指定エントリを削除�る\n"
-+
-+#: ../arp.c:635 ../netstat.c:1503 ../route.c:86
-+#, c-format
-+msgid "        -v, --verbose            be verbose\n"
-+msgstr "        -v, --verbose            詳細表示を行��\n"
-+
-+#: ../arp.c:636 ../netstat.c:1504 ../route.c:87
-+#, c-format
-+msgid "        -n, --numeric            don't resolve names\n"
-+msgstr "        -n, --numeric            ���レゾルブを���\n"
-+
-+#: ../arp.c:637
-+#, c-format
-+msgid ""
-+"        -i, --device             specify network interface (e.g. eth0)\n"
-+msgstr "        -i, --device       �ットワークインタフェース�指定(例 eth0)\n"
-+
-+#: ../arp.c:638
-+#, c-format
-+msgid "        -D, --use-device         read <hwaddr> from given device\n"
-+msgstr ""
-+"        -D, --use-device   与�られ�デ�イス�ら\n"
-+"                                    <HWアドレス>を読�込む\n"
-+
-+#: ../arp.c:639
-+#, c-format
-+msgid "        -A, -p, --protocol       specify protocol family\n"
-+msgstr "        -A, -p, --protocol       プロトコルファミリを指定�る\n"
-+
-+#: ../arp.c:640
-+#, c-format
-+msgid ""
-+"        -f, --file               read new entries from file or from /etc/"
-+"ethers\n"
-+"\n"
-+msgstr "        -f, --file         /etc/ethersファイル�ら新�エントリを読�込む\n\n"
-+
-+#: ../arp.c:642 ../rarp.c:182
-+#, c-format
-+msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
-+msgstr "  <HW>=�ードウェアアドレスタイプを指定�る��'-H <hw>'を使��下��。標準: %s\n"
-+
-+#: ../arp.c:643 ../rarp.c:183
-+#, c-format
-+msgid "  List of possible hardware types (which support ARP):\n"
-+msgstr "  (ARPをサ�ート��)指定�能��ードウェアタイプ�リスト:\n"
-+
-+#: ../arp.c:677 ../arp.c:762
-+#, c-format
-+msgid "%s: hardware type not supported!\n"
-+msgstr "%s: �ードウェアタイプ�サ�ート�れ����ん!\n"
-+
-+#: ../arp.c:681
-+#, c-format
-+msgid "%s: address family not supported!\n"
-+msgstr "%s: アドレスファミリ�サ�ート�れ����ん!\n"
-+
-+#: ../arp.c:716
-+#, c-format
-+msgid "arp: -N not yet supported.\n"
-+msgstr "arp: -N���サ�ート�����ん.\n"
-+
-+#: ../arp.c:726
-+#, c-format
-+msgid "arp: %s: unknown address family.\n"
-+msgstr "arp: %s: �明�アドレスファミリ��.\n"
-+
-+#: ../arp.c:735
-+#, c-format
-+msgid "arp: %s: unknown hardware type.\n"
-+msgstr "arp: %s: �明��ードウェアタイプ��.\n"
-+
-+#: ../arp.c:754
-+#, c-format
-+msgid "arp: %s: kernel only supports 'inet'.\n"
-+msgstr "arp: %s: カー�ル�'inet'以外�サ�ート�����ん.\n"
-+
-+#: ../arp.c:767
-+#, c-format
-+msgid "arp: %s: hardware type without ARP support.\n"
-+msgstr "arp: %s: ARPサ�ート����ードウェアタイプ��.\n"
-+
-+#: ../hostname.c:71
-+#, c-format
-+msgid "Setting nodename to `%s'\n"
-+msgstr "ノード�を`%s'�設定����\n"
-+
-+#: ../hostname.c:76
-+#, c-format
-+msgid "%s: you must be root to change the node name\n"
-+msgstr "%s: ノード��変更�ルート���れ��り��ん\n"
-+
-+#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117
-+#, c-format
-+msgid "%s: name too long\n"
-+msgstr "%s: ���長����\n"
-+
-+#: ../hostname.c:91
-+#, c-format
-+msgid "Setting hostname to `%s'\n"
-+msgstr "ホスト�を`%s'�設定����\n"
-+
-+#: ../hostname.c:96
-+#, c-format
-+msgid "%s: you must be root to change the host name\n"
-+msgstr "%s: ホスト��変更�ルート���れ��り��ん\n"
-+
-+#: ../hostname.c:109
-+#, c-format
-+msgid "Setting domainname to `%s'\n"
-+msgstr "ドメインを`%s'�設定����\n"
-+
-+#: ../hostname.c:114
-+#, c-format
-+msgid "%s: you must be root to change the domain name\n"
-+msgstr "%s: ドメイン��変更�ルート���れ��り��ん\n"
-+
-+#: ../hostname.c:131
-+#, c-format
-+msgid "Resolving `%s' ...\n"
-+msgstr "`%s'をレゾルブ中 ...\n"
-+
-+#: ../hostname.c:137
-+#, c-format
-+msgid "Result: h_name=`%s'\n"
-+msgstr "�果: h_name=`%s'\n"
-+
-+#: ../hostname.c:142
-+#, c-format
-+msgid "Result: h_aliases=`%s'\n"
-+msgstr "�果: h_aliases=`%s'\n"
-+
-+#: ../hostname.c:147
-+#, c-format
-+msgid "Result: h_addr_list=`%s'\n"
-+msgstr "�果: h_addr_list=`%s'\n"
-+
-+#: ../hostname.c:208
-+#, c-format
-+msgid "%s: can't open `%s'\n"
-+msgstr "%s: `%s'を開���ん\n"
-+
-+#: ../hostname.c:222
-+#, c-format
-+msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
-+msgstr "使用法: hostname   [-v] {ホスト�|-F ファイル}    (ファイル�よる)ホスト��設定\n"
-+
-+#: ../hostname.c:223
-+#, c-format
-+msgid ""
-+"       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
-+msgstr "        domainname [-v] {NISドメイン|-F ファイル} (ファイル�よる)NISドメイン��設定\n"
-+
-+#: ../hostname.c:225
-+#, c-format
-+msgid ""
-+"       nodename [-v] {nodename|-F file}      set DECnet node name (from "
-+"file)\n"
-+msgstr ""
-+"nodename [-v] {ノード�|-F ファイル}  (ファイル�よる)DECnetノード��設定\n"
-+
-+#: ../hostname.c:227
-+#, c-format
-+msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
-+msgstr "        hostname [-v] [-d|-f|-s|-a|-i|-y]     形�を指定��表示\n"
-+
-+#: ../hostname.c:228
-+#, c-format
-+msgid ""
-+"       hostname [-v]                         display hostname\n"
-+"\n"
-+msgstr ""
-+"        hostname [-v]                         ホスト��出力\n"
-+"\n"
-+
-+#: ../hostname.c:229
-+#, c-format
-+msgid ""
-+"       hostname -V|--version|-h|--help       print info and exit\n"
-+"\n"
-+msgstr ""
-+"        hostname -V|--version|-h|--help       諸情報を出力��終了\n"
-+"\n"
-+"\n"
-+
-+#: ../hostname.c:230
-+#, c-format
-+msgid ""
-+"    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
-+"\n"
-+msgstr "    dnsdomainname=ホスト� -d, {yp,nis,}domainname=ホスト� -y\n\n"
-+
-+#: ../hostname.c:231
-+#, c-format
-+msgid "    -s, --short           short host name\n"
-+msgstr "    -s, --short           短縮ホスト�\n"
-+
-+#: ../hostname.c:232
-+#, c-format
-+msgid "    -a, --alias           alias names\n"
-+msgstr "    -a, --alias           エイリアス�\n"
-+
-+#: ../hostname.c:233
-+#, c-format
-+msgid "    -i, --ip-address      addresses for the hostname\n"
-+msgstr "    -i, --ip-address      ホスト��対�るアドレス\n"
-+
-+#: ../hostname.c:234
-+#, c-format
-+msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
-+msgstr "    -f, --fqdn, --long    ロングホスト�(FQDN)\n"
-+
-+#: ../hostname.c:235
-+#, c-format
-+msgid "    -d, --domain          DNS domain name\n"
-+msgstr "    -d, --domain          DNSドメイン�\n"
-+
-+#: ../hostname.c:236
-+#, c-format
-+msgid "    -y, --yp, --nis       NIS/YP domainname\n"
-+msgstr "    -y, --yp, --nis       NIS/YPドメイン�\n"
-+
-+#: ../hostname.c:238
-+#, c-format
-+msgid "    -n, --node            DECnet node name\n"
-+msgstr "    -n, --node            DECnetノード�\n"
-+
-+#: ../hostname.c:240
-+#, c-format
-+msgid ""
-+"    -F, --file            read hostname or NIS domainname from given file\n"
-+"\n"
-+msgstr "    -F, --file            指定�ファイル�らホスト��NISドメイン�を読�込む\n\n"
-+
-+#: ../hostname.c:242
-+#, c-format
-+msgid ""
-+"   This command can read or set the hostname or the NIS domainname. You can\n"
-+"   also read the DNS domain or the FQDN (fully qualified domain name).\n"
-+"   Unless you are using bind or NIS for host lookups you can change the\n"
-+"   FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n"
-+"   part of the FQDN) in the /etc/hosts file.\n"
-+msgstr ""
-+"   ��コマンド���ホスト����NISドメイン�を読�込����設定����。\n"
-+"   DNSドメイン���FDN(完全修飾ドメイン�)を読�込む��も����。\n"
-+"   ホスト���照�Bind�よ�, NISも使���場�, /etc/hostsファイル��る\n"
-+"   FQDNや, (FQDN�一部分�)ドメイン�を変更����.\n"
-+
-+#: ../hostname.c:338
-+#, c-format
-+msgid "%s: You can't change the DNS domain name with this command\n"
-+msgstr "%s: ��コマンド��DNSドメイン��変更����ん.\n"
-+
-+#: ../hostname.c:339
-+#, c-format
-+msgid ""
-+"\n"
-+"Unless you are using bind or NIS for host lookups you can change the DNS\n"
-+msgstr ""
-+"\n"
-+"ホスト���照�Bind�よ�, NISも使���場��/etc/hostsファイル\n"
-+
-+#: ../hostname.c:340
-+#, c-format
-+msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
-+msgstr "��るFQDNや, (FQDN�一部分�)ドメイン�を変更����.\n"
-+
-+#: ../hostname.c:357
-+#, c-format
-+msgid "gethostname()=`%s'\n"
-+msgstr "gethostname()=`%s'\n"
-+
-+#: ../hostname.c:374
-+#, c-format
-+msgid "getdomainname()=`%s'\n"
-+msgstr "getdomainname()=`%s'\n"
-+
-+#: ../hostname.c:389
-+#, c-format
-+msgid "getnodename()=`%s'\n"
-+msgstr "getnodename()=`%s'\n"
-+
-+#: ../ifconfig.c:107
-+#, c-format
-+msgid ""
-+"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
-+"Flg\n"
-+msgstr "Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR フラグ\n"
-+
-+#: ../ifconfig.c:129 ../ifconfig.c:161
-+#, c-format
-+msgid "%s: ERROR while getting interface flags: %s\n"
-+msgstr "%s: インタフェースフラグ��得中�エラー�発生����:%s\n"
-+
-+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
-+#: ../ifconfig.c:973
-+#, c-format
-+msgid "No support for INET on this system.\n"
-+msgstr "INET���システム��サ�ート�れ����ん.\n"
-+
-+#: ../ifconfig.c:193
-+#, c-format
-+msgid "%s: ERROR while testing interface flags: %s\n"
-+msgstr "%s: インタフェースフラグ�テスト中�エラー�発生����: %s\n"
-+
-+#: ../ifconfig.c:202
-+#, c-format
-+msgid ""
-+"Usage:\n"
-+"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
-+msgstr ""
-+"使用法:\n"
-+"  ifconfig [-a] [-v] [-s] <インタフェース> [[<AF>] <アドレス>]\n"
-+
-+#: ../ifconfig.c:204
-+#, c-format
-+msgid "  [add <address>[/<prefixlen>]]\n"
-+msgstr "  [add <アドレス>[/<プレフィックス長>]]\n"
-+
-+#: ../ifconfig.c:205
-+#, c-format
-+msgid "  [del <address>[/<prefixlen>]]\n"
-+msgstr "   [del <アドレス>[/<プレフィックス長>]]\n"
-+
-+#: ../ifconfig.c:206
-+#, c-format
-+msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
-+msgstr "  [[-]broadcast [<アドレス>]]  [[-]pointopoint [<アドレス>]]\n"
-+
-+#: ../ifconfig.c:207
-+#, c-format
-+msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
-+msgstr "  [netmask <アドレス>]  [dstaddr <アドレス>]  [tunnel <アドレス>]\n"
-+
-+#: ../ifconfig.c:210
-+#, c-format
-+msgid "  [outfill <NN>] [keepalive <NN>]\n"
-+msgstr "  [outfill <数値>] [keepalive <数値>]\n"
-+
-+#: ../ifconfig.c:212
-+#, c-format
-+msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
-+msgstr "  [hw <HW> <アドレス>]  [metric <数値>]  [mtu <数値>]\n"
-+
-+#: ../ifconfig.c:213
-+#, c-format
-+msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-+msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-+
-+#: ../ifconfig.c:214
-+#, c-format
-+msgid "  [multicast]  [[-]promisc]\n"
-+msgstr "  [multicast]  [[-]promisc]\n"
-+
-+#: ../ifconfig.c:215
-+#, c-format
-+msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
-+msgstr "  [mem_start <開始アドレス>] [io_addr <IOアドレス>] [irq <番�>] [media <タイプ>]\n"
-+
-+#: ../ifconfig.c:217
-+#, c-format
-+msgid "  [txqueuelen <NN>]\n"
-+msgstr "   [txqueuelen <TXキュー長>]\n"
-+
-+#: ../ifconfig.c:220
-+#, c-format
-+msgid "  [[-]dynamic]\n"
-+msgstr "  [[-]dynamic]\n"
-+
-+#: ../ifconfig.c:222
-+#, c-format
-+msgid ""
-+"  [up|down] ...\n"
-+"\n"
-+msgstr "  [up|down] ...\n\n"
-+
-+#: ../ifconfig.c:224
-+#, c-format
-+msgid "  <HW>=Hardware Type.\n"
-+msgstr "  <HW>=�ードウェアタイプ.\n"
-+
-+#: ../ifconfig.c:225
-+#, c-format
-+msgid "  List of possible hardware types:\n"
-+msgstr "  利用�能��ードウェアタイプ�リスト:\n"
-+
-+#. 1 = ARPable
-+#: ../ifconfig.c:227
-+#, c-format
-+msgid "  <AF>=Address family. Default: %s\n"
-+msgstr "  <AF>=アドレスファミリ. 標準: %s\n"
-+
-+#: ../ifconfig.c:228
-+#, c-format
-+msgid "  List of possible address families:\n"
-+msgstr "  利用�能�アドレスファミリ�リスト:\n"
-+
-+#: ../ifconfig.c:303
-+#, c-format
-+msgid "ifconfig: option `%s' not recognised.\n"
-+msgstr "ifconfig: オプション`%s'を解釈����ん.\n"
-+
-+#: ../ifconfig.c:305 ../ifconfig.c:962
-+#, c-format
-+msgid "ifconfig: `--help' gives usage information.\n"
-+msgstr "ifconfig: `--help'�使用法を見られ��.\n"
-+
-+#: ../ifconfig.c:380
-+#, c-format
-+msgid "Unknown media type.\n"
-+msgstr "�明�メディアタイプ��.\n"
-+
-+#: ../ifconfig.c:417
-+#, c-format
-+msgid ""
-+"Warning: Interface %s still in promisc mode... maybe other application is "
-+"running?\n"
-+msgstr "警告: インタフェース%s���promiscモード��...�ら�他�アプリケーション�実行中���り��ん�?\n"
-+
-+#: ../ifconfig.c:429
-+#, c-format
-+msgid "Warning: Interface %s still in MULTICAST mode.\n"
-+msgstr "警告: インタフェース%s���MULTICASTモード��.\n"
-+
-+#: ../ifconfig.c:441
-+#, c-format
-+msgid "Warning: Interface %s still in ALLMULTI mode.\n"
-+msgstr "警告: インタフェース%s���ALLMULTIモード��.\n"
-+
-+#: ../ifconfig.c:465
-+#, c-format
-+msgid "Warning: Interface %s still in DYNAMIC mode.\n"
-+msgstr "警告: インタフェース%s���DYNAMICモード��.\n"
-+
-+#: ../ifconfig.c:523
-+#, c-format
-+msgid "Warning: Interface %s still in BROADCAST mode.\n"
-+msgstr "警告: インタフェース%s���BROADCASTモード��.\n"
-+
-+#: ../ifconfig.c:652
-+#, c-format
-+msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
-+msgstr "警告: インタフェース%s���POINTOPOINTモード��.\n"
-+
-+#: ../ifconfig.c:684
-+#, c-format
-+msgid "hw address type `%s' has no handler to set address. failed.\n"
-+msgstr "�ードウェアアドレスタイプ`%s'�アドレスを設定�る�ンドラを������ん. 失敗����.\n"
-+
-+#: ../ifconfig.c:693
-+#, c-format
-+msgid "%s: invalid %s address.\n"
-+msgstr "%s: ��切�アドレス��(%s).\n"
-+
-+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
-+#, c-format
-+msgid "No support for INET6 on this system.\n"
-+msgstr "INET6���システム��サ�ート�れ����ん.\n"
-+
-+#: ../ifconfig.c:780 ../ifconfig.c:871
-+#, c-format
-+msgid "Interface %s not initialized\n"
-+msgstr "インタフェース%s��期化�れ����ん.\n"
-+
-+#: ../ifconfig.c:792 ../ifconfig.c:882
-+#, c-format
-+msgid "Bad address.\n"
-+msgstr "��切�アドレス��.\n"
-+
-+#: ../ifconfig.c:885
-+#, c-format
-+msgid "Address deletion not supported on this system.\n"
-+msgstr "アドレス削除���システム��サ�ート�れ����ん.\n"
-+
-+#: ../ifconfig.c:957
-+#, c-format
-+msgid "ifconfig: Cannot set address for this protocol family.\n"
-+msgstr "ifconfig:��プロトコルファミリ�アドレスを設定����ん.\n"
-+
-+#: ../ifconfig.c:983
-+#, c-format
-+msgid "No support for ECONET on this system.\n"
-+msgstr "ECONET���システム��サ�ート�れ����ん.\n"
-+
-+#: ../ifconfig.c:991
-+#, c-format
-+msgid "Don't know how to set addresses for family %d.\n"
-+msgstr "ファミリ%d�アドレス�設定方法��明��.\n"
-+
-+#: ../ifconfig.c:1021
-+#, c-format
-+msgid "WARNING: at least one error occured. (%d)\n"
-+msgstr "警告: 少���も1��エラー�発生����. (%d)\n"
-+
-+#: ../netstat.c:434
-+#, c-format
-+msgid ""
-+"(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
-+msgstr "(\"-p\"�情報を読�込���ん���: geteuid()=%d ���ルート��る����.)\n"
-+
-+#: ../netstat.c:438
-+#, c-format
-+msgid ""
-+"(Not all processes could be identified, non-owned process info\n"
-+" will not be shown, you would have to be root to see it all.)\n"
-+msgstr ""
-+"(一部�プロセス�識別�れ���, 所有�����プロセス�情報�\n"
-+"表示�れ��ん。�れら全�を見る��ルート��る必���り��.)\n"
-+
-+# translatable?
-+#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
-+msgid "LISTENING"
-+msgstr "LISTENING"
-+
-+# translatable?
-+#: ../netstat.c:446
-+msgid "CONN SENT"
-+msgstr "CONN SENT"
-+
-+# translatable?
-+#: ../netstat.c:447 ../netstat.c:1268
-+msgid "DISC SENT"
-+msgstr "DISC SENT"
-+
-+# translatable?
-+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
-+msgid "ESTABLISHED"
-+msgstr "ESTABLISHED"
-+
-+#: ../netstat.c:470
-+#, c-format
-+msgid "Active NET/ROM sockets\n"
-+msgstr "稼�中�NET/ROMソケット\n"
-+
-+#: ../netstat.c:471
-+#, c-format
-+msgid ""
-+"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
-+"Q\n"
-+msgstr "ユーザ     �信先     発信元    デ�イス  状態        Vr/Vs    �信-Q  �信-Q\n"
-+
-+#: ../netstat.c:481 ../netstat.c:1308
-+#, c-format
-+msgid "Problem reading data from %s\n"
-+msgstr "%s�ら�データ�読�込���題\n"
-+
-+# translatable?
-+#: ../netstat.c:516
-+msgid "SYN_SENT"
-+msgstr "SYN_SENT"
-+
-+# translatable?
-+#: ../netstat.c:517
-+msgid "SYN_RECV"
-+msgstr "SYN_RECV"
-+
-+# translatable?
-+#: ../netstat.c:518
-+msgid "FIN_WAIT1"
-+msgstr "FIN_WAIT1"
-+
-+# translatable?
-+#: ../netstat.c:519
-+msgid "FIN_WAIT2"
-+msgstr "FIN_WAIT2"
-+
-+# translatable?
-+#: ../netstat.c:520
-+msgid "TIME_WAIT"
-+msgstr "TIME_WAIT"
-+
-+# translatable?
-+#: ../netstat.c:521
-+msgid "CLOSE"
-+msgstr "CLOSE"
-+
-+# translatable?
-+#: ../netstat.c:522
-+msgid "CLOSE_WAIT"
-+msgstr "CLOSE_WAIT"
-+
-+# translatable?
-+#: ../netstat.c:523
-+msgid "LAST_ACK"
-+msgstr "LAST_ACK"
-+
-+# translatable?
-+#: ../netstat.c:524
-+msgid "LISTEN"
-+msgstr "LISTEN"
-+
-+# translatable?
-+#: ../netstat.c:525
-+msgid "CLOSING"
-+msgstr "CLOSING"
-+
-+#: ../netstat.c:596
-+#, c-format
-+msgid "warning, got bogus igmp6 line %d.\n"
-+msgstr "警告, ��igmp6ライン%dを得���.\n"
-+
-+#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
-+#: ../netstat.c:1032 ../netstat.c:1037
-+#, c-format
-+msgid "netstat: unsupported address family %d !\n"
-+msgstr "netstat: サ�ート����アドレスファミリ%d��!\n"
-+
-+# c-format
-+#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
-+#, c-format
-+msgid "warning, got bogus igmp line %d.\n"
-+msgstr "警告, ��igmpライン%dを得���.\n"
-+
-+#: ../netstat.c:677
-+#, c-format
-+msgid "Active X.25 sockets\n"
-+msgstr "稼�中�X.25ソケット\n"
-+
-+#. IMHO, Vr/Vs is not very usefull --SF
-+#: ../netstat.c:679
-+#, c-format
-+msgid ""
-+"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
-+"Q\n"
-+msgstr "�信先       発信元        デ�イス  LCI  状態         Vr/Vs  �信-Q  �信-Q\n"
-+
-+#: ../netstat.c:759
-+#, c-format
-+msgid "warning, got bogus tcp line.\n"
-+msgstr "警告, ��TCPラインを得���.\n"
-+
-+#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
-+#, c-format
-+msgid "off (0.00/%ld/%d)"
-+msgstr "オフ (0.00/%ld/%d)"
-+
-+#: ../netstat.c:804
-+#, c-format
-+msgid "on (%2.2f/%ld/%d)"
-+msgstr "オン (%2.2f/%ld/%d)"
-+
-+#: ../netstat.c:809
-+#, c-format
-+msgid "keepalive (%2.2f/%ld/%d)"
-+msgstr "キープアライブ (%2.2f/%ld/%d)"
-+
-+#: ../netstat.c:814
-+#, c-format
-+msgid "timewait (%2.2f/%ld/%d)"
-+msgstr "時間待� (%2.2f/%ld/%d)"
-+
-+#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
-+#, c-format
-+msgid "unkn-%d (%2.2f/%ld/%d)"
-+msgstr "�明-%d (%2.2f/%ld/%d)"
-+
-+#: ../netstat.c:894
-+#, c-format
-+msgid "warning, got bogus udp line.\n"
-+msgstr "警告, ��UDPラインを得���.\n"
-+
-+#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
-+msgid "UNKNOWN"
-+msgstr "�明"
-+
-+#: ../netstat.c:958 ../netstat.c:1080
-+#, c-format
-+msgid "on%d (%2.2f/%ld/%d)"
-+msgstr "オン%d (%2.2f/%ld/%d)"
-+
-+#: ../netstat.c:1046
-+#, c-format
-+msgid "warning, got bogus raw line.\n"
-+msgstr "警告, ��Rawラインを得���.\n"
-+
-+#: ../netstat.c:1128
-+#, c-format
-+msgid "warning, got bogus unix line.\n"
-+msgstr "警告, ��unixラインを得���.\n"
-+
-+# translatable?
-+#: ../netstat.c:1155
-+msgid "STREAM"
-+msgstr "STREAM"
-+
-+# translatable?
-+#: ../netstat.c:1159
-+msgid "DGRAM"
-+msgstr "DGRAM"
-+
-+# translatable?
-+#: ../netstat.c:1163
-+msgid "RAW"
-+msgstr "RAW"
-+
-+# translatable?
-+#: ../netstat.c:1167
-+msgid "RDM"
-+msgstr "RDM"
-+
-+# translatable?
-+#: ../netstat.c:1171
-+msgid "SEQPACKET"
-+msgstr "SEQPACKET"
-+
-+# translatable?
-+#: ../netstat.c:1180
-+msgid "FREE"
-+msgstr "FREE"
-+
-+# translatable?
-+#: ../netstat.c:1196
-+msgid "CONNECTING"
-+msgstr "CONNECTING"
-+
-+# translatable?
-+#: ../netstat.c:1200
-+msgid "CONNECTED"
-+msgstr "CONNECTED"
-+
-+# translatable?
-+#: ../netstat.c:1204
-+msgid "DISCONNECTING"
-+msgstr "DISCONNECTING"
-+
-+#: ../netstat.c:1235
-+#, c-format
-+msgid "Active UNIX domain sockets "
-+msgstr "稼�中�UNIXドメインソケット "
-+
-+#: ../netstat.c:1237 ../netstat.c:1756
-+#, c-format
-+msgid "(servers and established)"
-+msgstr "(サー��確立)"
-+
-+#: ../netstat.c:1240 ../netstat.c:1759
-+#, c-format
-+msgid "(only servers)"
-+msgstr "(サー���)"
-+
-+#: ../netstat.c:1242 ../netstat.c:1761
-+#, c-format
-+msgid "(w/o servers)"
-+msgstr "(w/oサー�)"
-+
-+#: ../netstat.c:1245
-+#, c-format
-+msgid ""
-+"\n"
-+"Proto RefCnt Flags       Type       State         I-Node"
-+msgstr ""
-+"\n"
-+"Proto RefCnt フラグ      タイプ     状態         Iノード"
-+
-+#: ../netstat.c:1247
-+#, c-format
-+msgid " Path\n"
-+msgstr " パス\n"
-+
-+# translatable?
-+#: ../netstat.c:1267
-+msgid "SABM SENT"
-+msgstr "SABM SENT"
-+
-+# translatable?
-+#: ../netstat.c:1270
-+msgid "RECOVERY"
-+msgstr "RECOVERY"
-+
-+#: ../netstat.c:1284
-+#, c-format
-+msgid "Active AX.25 sockets\n"
-+msgstr "稼�中�AX.25ソケット\n"
-+
-+#: ../netstat.c:1285
-+#, c-format
-+msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
-+msgstr "�信先     発信元     デ�イス 状態        Vr/Vs    �信-Q  �信-Q\n"
-+
-+#: ../netstat.c:1328
-+#, c-format
-+msgid "problem reading data from %s\n"
-+msgstr "%s�ら�データ読�込�中��題\n"
-+
-+#: ../netstat.c:1379
-+#, c-format
-+msgid ""
-+"Active IPX sockets\n"
-+"Proto Recv-Q Send-Q Local Address              Foreign Address            "
-+"State"
-+msgstr ""
-+"稼�中�IPXソケット\n"
-+"Proto �信-Q �信-Q 内部アドレス               外部アドレス               状"
-+"æ…‹"
-+
-+#: ../netstat.c:1381
-+#, c-format
-+msgid " User"
-+msgstr " ユーザ"
-+
-+# translatable?
-+#: ../netstat.c:1415
-+msgid "ESTAB"
-+msgstr "ESTAB"
-+
-+# translatable?
-+#: ../netstat.c:1423
-+msgid "UNK."
-+msgstr "UNK."
-+
-+#: ../netstat.c:1461
-+#, c-format
-+msgid "Kernel Interface table\n"
-+msgstr "カー�ルインタフェーステーブル\n"
-+
-+#: ../netstat.c:1465
-+#, c-format
-+msgid ""
-+"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
-+"Flg\n"
-+msgstr "Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR フラグ\n"
-+
-+#: ../netstat.c:1469
-+msgid "missing interface information"
-+msgstr "インタフェース情報�足り��ん"
-+
-+#: ../netstat.c:1492
-+#, c-format
-+msgid ""
-+"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
-+"help}\n"
-+msgstr ""
-+"使用法: netstat [-veenNcCF] [<アドレスファミリ>] -r\n"
-+"        netstat {-V|--version|-h|--help}\n"
-+
-+#: ../netstat.c:1493
-+#, c-format
-+msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
-+msgstr "        netstat [-vnNcaeol] [<ソケット> ...]\n"
-+
-+#: ../netstat.c:1494
-+#, c-format
-+msgid ""
-+"       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
-+"\n"
-+msgstr "        netstat { [-veenNac] -i | [-cnNe] -M | -s }\n\n"
-+
-+#: ../netstat.c:1496
-+#, c-format
-+msgid "        -r, --route              display routing table\n"
-+msgstr "        -r, --routing            経路テーブル�表示\n"
-+
-+#: ../netstat.c:1497
-+#, c-format
-+msgid "        -i, --interfaces         display interface table\n"
-+msgstr "        -i, --interfaces         インタフェーステーブル�表示\n"
-+
-+#: ../netstat.c:1498
-+#, c-format
-+msgid "        -g, --groups             display multicast group memberships\n"
-+msgstr "        -g, --groups             マル�キャスト・グループメン�シップ�表示\n"
-+
-+#: ../netstat.c:1499
-+#, c-format
-+msgid ""
-+"        -s, --statistics         display networking statistics (like SNMP)\n"
-+msgstr ""
-+"        -s, --statistics         (SNMP�よ��)�ットワーク統計を表示\n"
-+
-+#: ../netstat.c:1501
-+#, c-format
-+msgid ""
-+"        -M, --masquerade         display masqueraded connections\n"
-+"\n"
-+msgstr ""
-+"        -M, --masquerade         マスカレード接続�表示\n"
-+"\n"
-+
-+#: ../netstat.c:1505
-+#, c-format
-+msgid "        --numeric-hosts          don't resolve host names\n"
-+msgstr "        --numeric-hosts          ホスト�をレゾルブ���\n"
-+
-+#: ../netstat.c:1506
-+#, c-format
-+msgid "        --numeric-ports          don't resolve port names\n"
-+msgstr "        --numeric-ports          �ート�をレゾルブ���\n"
-+
-+#: ../netstat.c:1507
-+#, c-format
-+msgid "        --numeric-users          don't resolve user names\n"
-+msgstr "        --numeric-users          ユーザ�をレゾルブ���\n"
-+
-+#: ../netstat.c:1508
-+#, c-format
-+msgid "        -N, --symbolic           resolve hardware names\n"
-+msgstr "        -N, --symbolic           �ードウェア�をレゾルブ�る\n"
-+
-+#: ../netstat.c:1509 ../route.c:88
-+#, c-format
-+msgid "        -e, --extend             display other/more information\n"
-+msgstr "        -e, --extend             他�情報や多��情報を表示�る\n"
-+
-+#: ../netstat.c:1510
-+#, c-format
-+msgid "        -p, --programs           display PID/Program name for sockets\n"
-+msgstr "        -p, --programs           ソケット�PID/プログラム�を表示�る\n"
-+
-+#: ../netstat.c:1511
-+#, c-format
-+msgid ""
-+"        -c, --continuous         continuous listing\n"
-+"\n"
-+msgstr ""
-+"        -c, --continous          継続的�表示\n"
-+"\n"
-+
-+#: ../netstat.c:1512
-+#, c-format
-+msgid "        -l, --listening          display listening server sockets\n"
-+msgstr "        -l, --listening          サー��listenソケット�表示\n"
-+
-+#: ../netstat.c:1513
-+#, c-format
-+msgid ""
-+"        -a, --all, --listening   display all sockets (default: connected)\n"
-+msgstr "        -a, --all, --listening   全��情報を表示 (標準: connected)\n"
-+
-+#: ../netstat.c:1514
-+#, c-format
-+msgid "        -o, --timers             display timers\n"
-+msgstr "        -o, --timers             タイマ�表示\n"
-+
-+#: ../netstat.c:1515 ../route.c:89
-+#, c-format
-+msgid ""
-+"        -F, --fib                display Forwarding Information Base "
-+"(default)\n"
-+msgstr "        -F, --fib                フォワード情報ベースを表示�る(標準)\n"
-+
-+#: ../netstat.c:1516 ../route.c:90
-+#, c-format
-+msgid ""
-+"        -C, --cache              display routing cache instead of FIB\n"
-+"\n"
-+msgstr "        -C, --cache              FIB���り�経路キャッシュを表示�る\n\n"
-+
-+#: ../netstat.c:1518
-+#, c-format
-+msgid ""
-+"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-+"netrom\n"
-+msgstr ""
-+"  <ソケット>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-+"netrom\n"
-+
-+#: ../netstat.c:1519
-+#, c-format
-+msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
-+msgstr "  <AF>='-6|-4'���'-A <af>'���'--<af>'を利用; 標準: %s\n"
-+
-+#: ../netstat.c:1520 ../route.c:93
-+#, c-format
-+msgid "  List of possible address families (which support routing):\n"
-+msgstr "  (ルーティングをサ�ート��)利用�能�アドレスファミリ�リスト:\n"
-+
-+#: ../netstat.c:1753
-+#, c-format
-+msgid "Active Internet connections "
-+msgstr "稼�中�インター�ット接続 "
-+
-+#: ../netstat.c:1763
-+#, c-format
-+msgid ""
-+"\n"
-+"Proto Recv-Q Send-Q Local Address           Foreign Address         "
-+"State      "
-+msgstr ""
-+"\n"
-+"Proto �信-Q �信-Q 内部アドレス            外部アドレス            状"
-+"æ…‹       "
-+
-+#: ../netstat.c:1765
-+#, c-format
-+msgid " User       Inode     "
-+msgstr " ユーザ    Iノード    "
-+
-+#: ../netstat.c:1768
-+#, c-format
-+msgid " Timer"
-+msgstr "タイマ"
-+
-+#: ../netstat.c:1798
-+#, c-format
-+msgid "IPv4 Group Memberships\n"
-+msgstr "IPv4グループメン�シップ\n"
-+
-+#: ../netstat.c:1799
-+#, c-format
-+msgid "Interface       RefCnt Group\n"
-+msgstr "インタフェース �照Cnt グループ\n"
-+
-+#: ../rarp.c:44
-+msgid "This kernel does not support RARP.\n"
-+msgstr "��カー�ル�RARPをサ�ート�����ん.\n"
-+
-+#: ../rarp.c:83
-+#, c-format
-+msgid "no RARP entry for %s.\n"
-+msgstr "%s�RARPエントリ��り��ん.\n"
-+
-+#: ../rarp.c:96
-+#, c-format
-+msgid "%s: bad hardware address\n"
-+msgstr "%s: �正��ードウェアアドレス��\n"
-+
-+#: ../rarp.c:128
-+#, c-format
-+msgid "rarp: cannot open file %s:%s.\n"
-+msgstr "rarp: ファイル%sを開���ん:%s.\n"
-+
-+#: ../rarp.c:140
-+#, c-format
-+msgid "rarp: format error at %s:%u\n"
-+msgstr "rarp: %s:%u行�フォーマットエラー��り��\n"
-+
-+#: ../rarp.c:144 ../rarp.c:289
-+#, c-format
-+msgid "rarp: %s: unknown host\n"
-+msgstr "rarp: %s: �明�ホスト��\n"
-+
-+#: ../rarp.c:147
-+#, c-format
-+msgid "rarp: cannot set entry from %s:%u\n"
-+msgstr "rarp: %s:%u行�らエントリを設定����ん\n"
-+
-+#: ../rarp.c:176
-+#, c-format
-+msgid "Usage: rarp -a                               list entries in cache.\n"
-+msgstr ""
-+"使用法: rarp -a                              キャッシュエントリ�表示.\n"
-+
-+#: ../rarp.c:177
-+#, c-format
-+msgid "       rarp -d <hostname>                    delete entry from cache.\n"
-+msgstr ""
-+"       rarp -d <ホスト�>                    キャッシュ�らエントリを削除�"
-+"ã‚‹.\n"
-+
-+#: ../rarp.c:178
-+#, c-format
-+msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
-+msgstr ""
-+"       rarp [<HW>] -s <ホスト�> <�ードウェアアドレス>\n"
-+"                                             キャッシュ�エントリを追加.\n"
-+
-+#: ../rarp.c:179
-+#, c-format
-+msgid ""
-+"       rarp -f                               add entries from /etc/ethers.\n"
-+msgstr ""
-+"       rarp -f                               /etc/ethers�らエントリ追加.\n"
-+
-+#: ../rarp.c:180
-+#, c-format
-+msgid ""
-+"       rarp -V                               display program version.\n"
-+"\n"
-+msgstr "       rarp -V                               �ージョン情報�出力.\n"
-+
-+#: ../rarp.c:238
-+#, c-format
-+msgid "%s: illegal option mix.\n"
-+msgstr "%s: オプション�組���間������.\n"
-+
-+#: ../rarp.c:269
-+#, c-format
-+msgid "rarp: %s: unknown hardware type.\n"
-+msgstr "rarp: %s: �ードウェアタイプ��明��.\n"
-+
-+#: ../route.c:80
-+#, c-format
-+msgid ""
-+"Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
-+msgstr "使用法:route [-nNvee] [-FC] [アドレスファミリ]  カー�ル経路テーブル�表示.\n"
-+
-+#: ../route.c:81
-+#, c-format
-+msgid ""
-+"       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
-+"\n"
-+msgstr ""
-+"       route [-v] [-FC] {add|del|flush}‥‥\n"
-+"\t\t\t\t   アドレスファミリ�経路テーブル�設定.\n"
-+"\n"
-+
-+#: ../route.c:83
-+#, c-format
-+msgid ""
-+"       route {-h|--help} [<AF>]              Detailed usage syntax for "
-+"specified AF.\n"
-+msgstr ""
-+"       route {-h|--help} [アドレスファミリ]\n"
-+"                                     アドレスファミリ特定�文法�説明.\n"
-+
-+#: ../route.c:84
-+#, c-format
-+msgid ""
-+"       route {-V|--version}                  Display version/author and "
-+"exit.\n"
-+"\n"
-+msgstr "       route {-V|--version}          �ージョン/作者情報�出力�終了.\n\n"
-+
-+#: ../route.c:92
-+#, c-format
-+msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
-+msgstr "  <AF>='-A <af>'���'--<af>'を利用; 標準: %s\n"
-+
-+#: ../plipconfig.c:66
-+#, c-format
-+msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
-+msgstr "使用法: plipconfig [-a] [-i] [-v] インタフェース\n"
-+
-+#: ../plipconfig.c:67
-+#, c-format
-+msgid "                  [nibble NN] [trigger NN]\n"
-+msgstr "                  [nibble 数値] [trigger 数値]\n"
-+
-+#: ../plipconfig.c:68
-+#, c-format
-+msgid "       plipconfig -V | --version\n"
-+msgstr "       plipconfig -V | --version\n"
-+
-+# translatable?
-+#: ../plipconfig.c:74
-+#, c-format
-+msgid "%s\tnibble %lu  trigger %lu\n"
-+msgstr "%s\tnibble %lu  trigger %lu\n"
-+
-+#: ../iptunnel.c:85
-+#, c-format
-+msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
-+msgstr "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
-+
-+#: ../iptunnel.c:86
-+#, c-format
-+msgid ""
-+"          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
-+msgstr "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
-+
-+#: ../iptunnel.c:87
-+#, c-format
-+msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
-+msgstr "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
-+
-+#: ../iptunnel.c:88
-+#, c-format
-+msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
-+msgstr "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
-+
-+#: ../iptunnel.c:89
-+#, c-format
-+msgid ""
-+"       iptunnel -V | --version\n"
-+"\n"
-+msgstr "       iptunnel -V | --version\n\n"
-+
-+#: ../iptunnel.c:90
-+#, c-format
-+msgid "Where: NAME := STRING\n"
-+msgstr "�味: NAME := STRING\n"
-+
-+#: ../iptunnel.c:91
-+#, c-format
-+msgid "       ADDR := { IP_ADDRESS | any }\n"
-+msgstr "       ADDR := { IP_ADDRESS | any }\n"
-+
-+#: ../iptunnel.c:92
-+#, c-format
-+msgid "       TOS  := { NUMBER | inherit }\n"
-+msgstr "       TOS  := { NUMBER | inherit }\n"
-+
-+#: ../iptunnel.c:93
-+#, c-format
-+msgid "       TTL  := { 1..255 | inherit }\n"
-+msgstr "       TTL  := { 1..255 | inherit }\n"
-+
-+#: ../iptunnel.c:94
-+#, c-format
-+msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
-+msgstr "       KEY  := { DOTTED_QUAD | NUMBER }\n"
-+
-+#: ../iptunnel.c:332
-+#, c-format
-+msgid "Keys are not allowed with ipip and sit.\n"
-+msgstr "キー�ipip�よ�sit��許��れ��ん.\n"
-+
-+#: ../iptunnel.c:352
-+#, c-format
-+msgid "Broadcast tunnel requires a source address.\n"
-+msgstr "ブロードキャストトン�ル�発信元アドレス�必���.\n"
-+
-+#: ../iptunnel.c:367
-+#, c-format
-+msgid "ttl != 0 and noptmudisc are incompatible\n"
-+msgstr "ttl != 0�よ�noptmudisc�矛盾���\n"
-+
-+#: ../iptunnel.c:379
-+#, c-format
-+msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
-+msgstr "トン�ルモードを決定����ん(ipip, gre���sit)\n"
-+
-+#: ../iptunnel.c:417
-+#, c-format
-+msgid "%s: %s/ip  remote %s  local %s "
-+msgstr "%s: %s/ip  リモート%s  ローカル%s "
-+
-+#: ../iptunnel.c:421
-+msgid "unknown"
-+msgstr "�明"
-+
-+# FIXME: what does it mean?
-+#: ../iptunnel.c:453
-+#, c-format
-+msgid "  Drop packets out of sequence.\n"
-+msgstr "  シーケンス�ら外れ�パケットをドロップ.\n"
-+
-+#: ../iptunnel.c:455
-+#, c-format
-+msgid "  Checksum in received packet is required.\n"
-+msgstr "  �信パケット��ェックサム�必須��.\n"
-+
-+# FIXME: what does it mean?
-+#: ../iptunnel.c:457
-+#, c-format
-+msgid "  Sequence packets on output.\n"
-+msgstr "  �信�シーケンスパケット.\n"
-+
-+# FIXME: what does it mean?
-+#: ../iptunnel.c:459
-+#, c-format
-+msgid "  Checksum output packets.\n"
-+msgstr "  �信パケット��ェックサム.\n"
-+
-+#: ../iptunnel.c:487
-+#, c-format
-+msgid "Wrong format of /proc/net/dev. Sorry.\n"
-+msgstr "/proc/net/dev��正�フォーマット��. ����ん.\n"
-+
-+#: ../iptunnel.c:500
-+#, c-format
-+msgid "Failed to get type of [%s]\n"
-+msgstr "[%s]�タイプ��得�失敗\n"
-+
-+#: ../iptunnel.c:516
-+#, c-format
-+msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
-+msgstr "RX: パケット   �イト      エラー  CsumErrs outOfSeq マル�キャスト\n"
-+
-+#: ../iptunnel.c:519
-+#, c-format
-+msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
-+msgstr "TX: パケット   �イト       エラー DeadLoop NoRoute  �ッファ��\n"
-+
-+#: ../statistics.c:47
-+msgid "ICMP input histogram:"
-+msgstr "ICMP入力ヒストグラム:"
-+
-+#: ../statistics.c:48
-+msgid "ICMP output histogram:"
-+msgstr "ICMP出力ヒストグラム:"
-+
-+#: ../statistics.c:65
-+#, c-format
-+msgid "Forwarding is %s"
-+msgstr "フォワード�%s��"
-+
-+#: ../statistics.c:66
-+#, c-format
-+msgid "Default TTL is %u"
-+msgstr "標準TTL�%u��"
-+
-+#: ../statistics.c:67
-+#, c-format
-+msgid "%u total packets received"
-+msgstr "�計%uパケットを�信"
-+
-+#: ../statistics.c:68
-+#, c-format
-+msgid "%u with invalid headers"
-+msgstr "��当�ヘッダ�%u"
-+
-+#: ../statistics.c:69
-+#, c-format
-+msgid "%u with invalid addresses"
-+msgstr "��当�アドレス�%u"
-+
-+#: ../statistics.c:70
-+#, c-format
-+msgid "%u forwarded"
-+msgstr "%u�転�"
-+
-+#: ../statistics.c:71
-+#, c-format
-+msgid "%u with unknown protocol"
-+msgstr "%u��明�プロトコル"
-+
-+#: ../statistics.c:72
-+#, c-format
-+msgid "%u incoming packets discarded"
-+msgstr "%u��信パケットを破棄"
-+
-+#: ../statistics.c:73
-+#, c-format
-+msgid "%u incoming packets delivered"
-+msgstr "%u��信パケットを��"
-+
-+#: ../statistics.c:74
-+#, c-format
-+msgid "%u requests sent out"
-+msgstr "%u��求を�信"
-+
-+#. ?
-+#: ../statistics.c:75
-+#, c-format
-+msgid "%u outgoing packets dropped"
-+msgstr "%u��信パケットをドロップ"
-+
-+#: ../statistics.c:76
-+#, c-format
-+msgid "%u dropped because of missing route"
-+msgstr "�明�経路�%uをドロップ"
-+
-+#: ../statistics.c:77
-+#, c-format
-+msgid "%u fragments dropped after timeout"
-+msgstr "タイムアウト後�%u�フラグメントをドロップ"
-+
-+#: ../statistics.c:78
-+#, c-format
-+msgid "%u reassemblies required"
-+msgstr "%u��構築�必�"
-+
-+#. ?
-+#: ../statistics.c:79
-+#, c-format
-+msgid "%u packets reassembled ok"
-+msgstr "%uパケット��構築��功"
-+
-+#: ../statistics.c:80
-+#, c-format
-+msgid "%u packet reassembles failed"
-+msgstr "%uパケット��構築�失敗"
-+
-+#: ../statistics.c:81
-+#, c-format
-+msgid "%u fragments received ok"
-+msgstr "%uフラグメント��信��功"
-+
-+#: ../statistics.c:82
-+#, c-format
-+msgid "%u fragments failed"
-+msgstr "%uフラグメント�失敗"
-+
-+#: ../statistics.c:83
-+#, c-format
-+msgid "%u fragments created"
-+msgstr "%uフラグメントを生�"
-+
-+#: ../statistics.c:88
-+#, c-format
-+msgid "%u ICMP messages received"
-+msgstr "%u�ICMPメッセージ�信"
-+
-+#: ../statistics.c:89
-+#, c-format
-+msgid "%u input ICMP message failed."
-+msgstr "%u�ICMPメッセージ入力失敗."
-+
-+#: ../statistics.c:90 ../statistics.c:103
-+#, c-format
-+msgid "destination unreachable: %u"
-+msgstr "�信先到���: %u"
-+
-+#: ../statistics.c:91
-+#, c-format
-+msgid "timeout in transit: %u"
-+msgstr "�信時間オー�: %u"
-+
-+#: ../statistics.c:92 ../statistics.c:105
-+#, c-format
-+msgid "wrong parameters: %u"
-+msgstr "���パラメータ: %u"
-+
-+#. ?
-+#: ../statistics.c:93
-+#, c-format
-+msgid "source quenches: %u"
-+msgstr "発信元消滅: %u"
-+
-+#: ../statistics.c:94
-+#, c-format
-+msgid "redirects: %u"
-+msgstr "リダイレクト: %u"
-+
-+#: ../statistics.c:95
-+#, c-format
-+msgid "echo requests: %u"
-+msgstr "エコー�求: %u"
-+
-+#: ../statistics.c:96 ../statistics.c:109
-+#, c-format
-+msgid "echo replies: %u"
-+msgstr "エコー応答: %u"
-+
-+#: ../statistics.c:97
-+#, c-format
-+msgid "timestamp request: %u"
-+msgstr "タイムスタンプ�求: %u"
-+
-+#: ../statistics.c:98
-+#, c-format
-+msgid "timestamp reply: %u"
-+msgstr "タイムスタンプ応答: %u"
-+
-+#: ../statistics.c:99
-+#, c-format
-+msgid "address mask request: %u"
-+msgstr "アドレスマスク�求: %u"
-+
-+#. ?
-+#: ../statistics.c:100 ../statistics.c:113
-+#, c-format
-+msgid "address mask replies: %u"
-+msgstr "アドレスマスク応答: %u"
-+
-+#. ?
-+#: ../statistics.c:101
-+#, c-format
-+msgid "%u ICMP messages sent"
-+msgstr "%u�ICMPメッセージ�信"
-+
-+#: ../statistics.c:102
-+#, c-format
-+msgid "%u ICMP messages failed"
-+msgstr "%u�ICMPメッセージ失敗"
-+
-+#: ../statistics.c:104
-+#, c-format
-+msgid "time exceeded: %u"
-+msgstr "時間切れ: %u"
-+
-+#. ?
-+#: ../statistics.c:106
-+#, c-format
-+msgid "source quench: %u"
-+msgstr "発信元消滅: %u"
-+
-+#: ../statistics.c:107
-+#, c-format
-+msgid "redirect: %u"
-+msgstr "リダイレクト: %u"
-+
-+#: ../statistics.c:108
-+#, c-format
-+msgid "echo request: %u"
-+msgstr "エコー�求: %u"
-+
-+#: ../statistics.c:110
-+#, c-format
-+msgid "timestamp requests: %u"
-+msgstr "タイムスタンプ�求: %u"
-+
-+#: ../statistics.c:111
-+#, c-format
-+msgid "timestamp replies: %u"
-+msgstr "タイムスタンプ応答: %u"
-+
-+#: ../statistics.c:112
-+#, c-format
-+msgid "address mask requests: %u"
-+msgstr "アドレスマスク�求: %u"
-+
-+#: ../statistics.c:118
-+#, c-format
-+msgid "RTO algorithm is %s"
-+msgstr "RTOアルゴリズム�%s��"
-+
-+#: ../statistics.c:122
-+#, c-format
-+msgid "%u active connections openings"
-+msgstr "%u�能動接続開始"
-+
-+#: ../statistics.c:123
-+#, c-format
-+msgid "%u passive connection openings"
-+msgstr "%u��動接続開始"
-+
-+#: ../statistics.c:124
-+#, c-format
-+msgid "%u failed connection attempts"
-+msgstr "%u�接続試行失敗"
-+
-+#: ../statistics.c:125
-+#, c-format
-+msgid "%u connection resets received"
-+msgstr "%u�接続リセット�信"
-+
-+#: ../statistics.c:126
-+#, c-format
-+msgid "%u connections established"
-+msgstr "%u�接続確立"
-+
-+#: ../statistics.c:127
-+#, c-format
-+msgid "%u segments received"
-+msgstr "%uセグメント��信"
-+
-+#: ../statistics.c:128
-+#, c-format
-+msgid "%u segments send out"
-+msgstr "%uセグメント��信"
-+
-+#: ../statistics.c:129
-+#, c-format
-+msgid "%u segments retransmited"
-+msgstr "%uセグメント��転�"
-+
-+#: ../statistics.c:130
-+#, c-format
-+msgid "%u bad segments received."
-+msgstr "%u��正セグメント�信."
-+
-+#: ../statistics.c:131
-+#, c-format
-+msgid "%u resets sent"
-+msgstr "%u�リセット�信"
-+
-+#: ../statistics.c:136
-+#, c-format
-+msgid "%u packets received"
-+msgstr "%uパケット�信"
-+
-+#: ../statistics.c:137
-+#, c-format
-+msgid "%u packets to unknown port received."
-+msgstr "�明��ート�ら�%uパケット��信."
-+
-+#: ../statistics.c:138
-+#, c-format
-+msgid "%u packet receive errors"
-+msgstr "%u�パケット�信エラー"
-+
-+#: ../statistics.c:139
-+#, c-format
-+msgid "%u packets sent"
-+msgstr "%u�パケットを�信"
-+
-+#: ../statistics.c:144
-+#, c-format
-+msgid "%u SYN cookies sent"
-+msgstr "%u�SYNクッキーを�信"
-+
-+#: ../statistics.c:145
-+#, c-format
-+msgid "%u SYN cookies received"
-+msgstr "%u�SYNクッキーを�信"
-+
-+#: ../statistics.c:146
-+#, c-format
-+msgid "%u invalid SYN cookies received"
-+msgstr "%u���当�SYNクッキーを�信"
-+
-+#: ../statistics.c:148
-+#, c-format
-+msgid "%u resets received for embryonic SYN_RECV sockets"
-+msgstr "%u�未完��SYN_RECVソケット�対�るリセットを�信"
-+
-+#: ../statistics.c:150
-+#, c-format
-+msgid "%u packets pruned from receive queue because of socket buffer overrun"
-+msgstr "%u�パケットをソケット�ッファオー�ラン����信キュー�ら除外"
-+
-+#. obsolete: 2.2.0 doesn't do that anymore
-+#: ../statistics.c:153
-+#, c-format
-+msgid "%u packets pruned from receive queue"
-+msgstr "%u�パケットを�信キュー�ら除外"
-+
-+#: ../statistics.c:154
-+#, c-format
-+msgid ""
-+"%u packets dropped from out-of-order queue because of socket buffer overrun"
-+msgstr "%u�パケット�ソケット�ッファオー�ーラン���out-of-orderキュー�らドロップ"
-+
-+#: ../statistics.c:156
-+#, c-format
-+msgid "%u ICMP packets dropped because they were out-of-window"
-+msgstr "%u�ICMPパケット�out-of-window���ドロップ"
-+
-+#: ../statistics.c:158
-+#, c-format
-+msgid "%u ICMP packets dropped because socket was locked"
-+msgstr "%u�ICMPパケットをソケット�ロック�よ��ドロップ"
-+
-+# FIXME: what does it mean?
-+#: ../statistics.c:160
-+#, c-format
-+msgid "%u TCP sockets finished time wait in fast timer"
-+msgstr "%u�TCPソケット�ファーストタイマ��時間待�を完了"
-+
-+# FIXME
-+#: ../statistics.c:161
-+#, c-format
-+msgid "%u time wait sockets recycled by time stamp"
-+msgstr "%u�時間待�ソケット�タイムスタンプ��利用"
-+
-+# FIXME
-+#: ../statistics.c:162
-+#, c-format
-+msgid "%u TCP sockets finished time wait in slow timer"
-+msgstr "%u�TCPソケット�スロータイマ��時間待�を完了"
-+
-+#: ../statistics.c:163
-+#, c-format
-+msgid "%u passive connections rejected because of time stamp"
-+msgstr "%u��動的接続�タイムスタンプ����拒�"
-+
-+#: ../statistics.c:165
-+#, c-format
-+msgid "%u active connections rejected because of time stamp"
-+msgstr "%u�能動的接続�タイムスタンプ����拒�"
-+
-+#: ../statistics.c:167
-+#, c-format
-+msgid "%u packets rejects in established connections because of timestamp"
-+msgstr "%u�パケット�タイムスタンプ����接続確立を拒�"
-+
-+#: ../statistics.c:169
-+#, c-format
-+msgid "%u delayed acks sent"
-+msgstr "%u��延ackを�信"
-+
-+# FIXME
-+#: ../statistics.c:170
-+#, c-format
-+msgid "%u delayed acks further delayed because of locked socket"
-+msgstr "%u��延ack�ロック�れ�ソケット�����ら��延"
-+
-+#: ../statistics.c:172
-+#, c-format
-+msgid "Quick ack mode was activated %u times"
-+msgstr "クイックackモード�%u回稼�"
-+
-+# FIXME
-+#: ../statistics.c:173
-+#, c-format
-+msgid "%u times the listen queue of a socket overflowed"
-+msgstr "ソケット�リスンキュー�%u回オー�フロー"
-+
-+# FIXME
-+#: ../statistics.c:175
-+#, c-format
-+msgid "%u SYNs to LISTEN sockets ignored"
-+msgstr "%u�ソケットリスンSYN�無視"
-+
-+#: ../statistics.c:176
-+#, c-format
-+msgid "%u packets directly queued to recvmsg prequeue."
-+msgstr "%uパケットをrecvmsgプレキュー�直接キュー."
-+
-+#: ../statistics.c:178
-+#, c-format
-+msgid "%u of bytes directly received from backlog"
-+msgstr "%u�イトを�ックログ�ら直接�信"
-+
-+#: ../statistics.c:180
-+#, c-format
-+msgid "%u of bytes directly received from prequeue"
-+msgstr "%u�イトをプレキュー�ら直接�信"
-+
-+#: ../statistics.c:182
-+#, c-format
-+msgid "%u packets dropped from prequeue"
-+msgstr "%u�パケットをプレキュー�らドロップ"
-+
-+#: ../statistics.c:183
-+#, c-format
-+msgid "%u packet headers predicted"
-+msgstr "%u�パケットヘッダを予測"
-+
-+#: ../statistics.c:184
-+#, c-format
-+msgid "%u packets header predicted and directly queued to user"
-+msgstr "%u�パケットヘッダを予測��ユーザ�直接キュー"
-+
-+#: ../statistics.c:186
-+#, c-format
-+msgid "Ran %u times out of system memory during packet sending"
-+msgstr "%u回�パケット�信中�システムメモリ��れ"
-+
-+#: ../statistics.c:188
-+#, c-format
-+msgid "%u acknowledgments not containing data received"
-+msgstr "データを����%u�承���信"
-+
-+#: ../statistics.c:189
-+#, c-format
-+msgid "%u predicted acknowledgments"
-+msgstr "%u�予測承�"
-+
-+#: ../statistics.c:190
-+#, c-format
-+msgid "%u times recovered from packet loss due to fast retransmit"
-+msgstr "高速����よるパケットロス�%u回�回復"
-+
-+#: ../statistics.c:191
-+#, c-format
-+msgid "%u times recovered from packet loss due to SACK data"
-+msgstr "SACKデータ�よるパケットロス�%u回�回復"
-+
-+#: ../statistics.c:192
-+#, c-format
-+msgid "%u bad SACKs received"
-+msgstr "%u��正�SACKを�信"
-+
-+#: ../statistics.c:193
-+#, c-format
-+msgid "Detected reordering %u times using FACK"
-+msgstr "FACKを使��%u回�検出�れ�並�替�"
-+
-+#: ../statistics.c:194
-+#, c-format
-+msgid "Detected reordering %u times using SACK"
-+msgstr "SACKを使��%u回�検出�れ�並�替�"
-+
-+#: ../statistics.c:195
-+#, c-format
-+msgid "Detected reordering %u times using time stamp"
-+msgstr "タイムスタンプを使��%u回�検出�れ�並�替�"
-+
-+# FIXME:what does it mean?
-+#: ../statistics.c:196
-+#, c-format
-+msgid "Detected reordering %u times using reno fast retransmit"
-+msgstr "高速��を使��%u回�検出�れ�並�替�"
-+
-+#: ../statistics.c:197
-+#, c-format
-+msgid "%u congestion windows fully recovered"
-+msgstr "%u�輻輳ウィンドウを完全�回復"
-+
-+#: ../statistics.c:198
-+#, c-format
-+msgid "%u congestion windows partially recovered using Hoe heuristic"
-+msgstr "Hoeヒューリスティックを使��%u�輻輳ウィンドウを部分的�回復"
-+
-+#: ../statistics.c:199
-+#, c-format
-+msgid "%u congestion window recovered using DSACK"
-+msgstr "DSACKを使��%u�輻輳ウィンドウを回復"
-+
-+#: ../statistics.c:200
-+#, c-format
-+msgid "%u congestion windows recovered after partial ack"
-+msgstr "部分ack後�%u�輻輳ウィンドウを回復"
-+
-+#: ../statistics.c:201
-+#, c-format
-+msgid "%u retransmits lost"
-+msgstr "%u���ロスト"
-+
-+# FIXME
-+#: ../statistics.c:202
-+#, c-format
-+msgid "%u timeouts after reno fast retransmit"
-+msgstr "高速��後�%u�タイムアウト"
-+
-+#: ../statistics.c:203
-+#, c-format
-+msgid "%u timeouts after SACK recovery"
-+msgstr "SACK復元後�%u�タイムアウト"
-+
-+#: ../statistics.c:204
-+#, c-format
-+msgid "%u timeouts in loss state"
-+msgstr "状態ロス��%u�タイムアウト"
-+
-+#: ../statistics.c:205
-+#, c-format
-+msgid "%u fast retransmits"
-+msgstr "%u�高速��"
-+
-+#: ../statistics.c:206
-+#, c-format
-+msgid "%u forward retransmits"
-+msgstr "%u�転���"
-+
-+#: ../statistics.c:207
-+#, c-format
-+msgid "%u retransmits in slow start"
-+msgstr "スロースタート��%u���"
-+
-+#: ../statistics.c:208
-+#, c-format
-+msgid "%u other TCP timeouts"
-+msgstr "%u���他�TCPタイムアウト"
-+
-+# FIXME
-+#: ../statistics.c:209
-+#, c-format
-+msgid "%u reno fast retransmits failed"
-+msgstr "%d�高速��失敗"
-+
-+#: ../statistics.c:210
-+#, c-format
-+msgid "%u sack retransmits failed"
-+msgstr "%u�sack��失敗"
-+
-+# FIXME
-+#: ../statistics.c:211
-+#, c-format
-+msgid "%u times receiver scheduled too late for direct processing"
-+msgstr "直接処������る�スケジュール�れ�%u回�レシー�"
-+
-+# FIXME
-+#: ../statistics.c:212
-+#, c-format
-+msgid "%u packets collapsed in receive queue due to low socket buffer"
-+msgstr "%u�パケットを低ソケット�ッファ�����信キュー�ら除外"
-+
-+#: ../statistics.c:213
-+#, c-format
-+msgid "%u DSACKs sent for old packets"
-+msgstr "%u�DSACKを��パケット����信"
-+
-+#: ../statistics.c:214
-+#, c-format
-+msgid "%u DSACKs sent for out of order packets"
-+msgstr "%u�DSACKを順�外パケット����信"
-+
-+#: ../statistics.c:215
-+#, c-format
-+msgid "%u DSACKs received"
-+msgstr "%u�DSACKを�信"
-+
-+#: ../statistics.c:216
-+#, c-format
-+msgid "%u DSACKs for out of order packets received"
-+msgstr "%u�DSACKを順�外パケット����信"
-+
-+#: ../statistics.c:217
-+#, c-format
-+msgid "%u connections reset due to unexpected SYN"
-+msgstr "予期��SYN����%u�接続をリセット"
-+
-+#: ../statistics.c:218
-+#, c-format
-+msgid "%u connections reset due to unexpected data"
-+msgstr "予期��データ����%u�接続をリセット"
-+
-+#: ../statistics.c:219
-+#, c-format
-+msgid "%u connections reset due to early user close"
-+msgstr "早期�ユーザ�クローズ����%u�接続をリセット"
-+
-+#: ../statistics.c:220
-+#, c-format
-+msgid "%u connections aborted due to memory pressure"
-+msgstr "メモリ�制約����%u�接続を中止"
-+
-+#: ../statistics.c:221
-+#, c-format
-+msgid "%u connections aborted due to timeout"
-+msgstr "タイムアウト����%u�接続を中止"
-+
-+# FIXME
-+#: ../statistics.c:222
-+#, c-format
-+msgid "%u connections aborted after user close in linger timeout"
-+msgstr "ユーザ�長期タイムアウト��クローズ後�%u�接続�中止"
-+
-+#: ../statistics.c:223
-+#, c-format
-+msgid "%u times unabled to send RST due to no memory"
-+msgstr "メモリ�足����RST��信�%u回�能"
-+
-+# FIXME
-+#: ../statistics.c:224
-+#, c-format
-+msgid "TCP ran low on memory %u times"
-+msgstr "TCP�少��メモリ�%u回実行"
-+
-+#: ../statistics.c:225
-+#, c-format
-+msgid "%u TCP data loss events"
-+msgstr "%u�TCPデータ�イベントをロス"
-+
-+#: ../statistics.c:292
-+msgid "enabled"
-+msgstr "有効"
-+
-+#: ../statistics.c:292
-+msgid "disabled"
-+msgstr "無効"
-+
-+#: ../statistics.c:375
-+msgid "error parsing /proc/net/snmp"
-+msgstr "/proc/net/snmp�処�中�エラー�発生����"
-+
-+#: ../statistics.c:388
-+msgid "cannot open /proc/net/snmp"
-+msgstr "/proc/net/snmpを開���ん"
-+
-+#: ../lib/activate.c:69
-+#, c-format
-+msgid "Hardware type `%s' not supported.\n"
-+msgstr "�ードウェアタイプ`%s'�サ�ート�れ����ん.\n"
-+
-+#: ../lib/activate.c:73
-+#, c-format
-+msgid "Cannot change line discipline to `%s'.\n"
-+msgstr "`%s'�line disciplineを変更����ん.\n"
-+
-+#: ../lib/af.c:153 ../lib/hw.c:161
-+msgid "UNSPEC"
-+msgstr "�明��ット"
-+
-+#: ../lib/af.c:155
-+msgid "UNIX Domain"
-+msgstr "UNIXドメイン"
-+
-+#: ../lib/af.c:158
-+msgid "DARPA Internet"
-+msgstr "DARPAインター�ット"
-+
-+#: ../lib/af.c:161
-+msgid "IPv6"
-+msgstr "IPv6"
-+
-+#: ../lib/af.c:164 ../lib/hw.c:182
-+msgid "AMPR AX.25"
-+msgstr "AMPR AX.25"
-+
-+#: ../lib/af.c:167 ../lib/hw.c:188
-+msgid "AMPR NET/ROM"
-+msgstr "AMPR NET/ROM"
-+
-+#: ../lib/af.c:170
-+msgid "Novell IPX"
-+msgstr "Novell IPX"
-+
-+#: ../lib/af.c:173
-+msgid "Appletalk DDP"
-+msgstr "アップルトークDDP"
-+
-+#: ../lib/af.c:176 ../lib/hw.c:223
-+msgid "Econet"
-+msgstr "エコ�ット"
-+
-+#: ../lib/af.c:179
-+msgid "CCITT X.25"
-+msgstr "CCITT X.25"
-+
-+#: ../lib/af.c:182 ../lib/hw.c:185
-+msgid "AMPR ROSE"
-+msgstr "AMPR ROSE"
-+
-+#: ../lib/af.c:185 ../lib/hw.c:173
-+msgid "Ash"
-+msgstr "Ash"
-+
-+#: ../lib/af.c:243
-+#, c-format
-+msgid "Please don't supply more than one address family.\n"
-+msgstr "複数�アドレスファミリを����下��.\n"
-+
-+#: ../lib/af.c:304
-+#, c-format
-+msgid "Too much address family arguments.\n"
-+msgstr "アドレスファミリ�引数�多����.\n"
-+
-+#: ../lib/af.c:315
-+#, c-format
-+msgid "Unknown address family `%s'.\n"
-+msgstr "�明�アドレスファミリ�� `%s'.\n"
-+
-+#: ../lib/arcnet.c:70 ../lib/arcnet.c:85
-+#, c-format
-+msgid "in_arcnet(%s): invalid arcnet address!\n"
-+msgstr "in_arcnet(%s): ��当�ARCNETアドレス��!\n"
-+
-+#: ../lib/arcnet.c:97
-+#, c-format
-+msgid "in_arcnet(%s): trailing : ignored!\n"
-+msgstr "in_arcnet(%s): trailing : 無効!\n"
-+
-+# translatable?
-+#: ../lib/arcnet.c:109
-+#, c-format
-+msgid "in_arcnet(%s): trailing junk!\n"
-+msgstr "in_arcnet(%s): trailing junk!\n"
-+
-+#: ../lib/ash.c:81
-+#, c-format
-+msgid "Malformed Ash address"
-+msgstr "異常�Ashアドレス��"
-+
-+#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244
-+#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78
-+#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76
-+msgid "[NONE SET]"
-+msgstr "[設定��]"
-+
-+#: ../lib/ax25.c:97 ../lib/netrom.c:100
-+msgid "Invalid callsign"
-+msgstr "��当�コールサイン��"
-+
-+#: ../lib/ax25.c:110 ../lib/netrom.c:113
-+msgid "Callsign too long"
-+msgstr "コールサイン�長����"
-+
-+#: ../lib/ax25_gr.c:47
-+#, c-format
-+msgid "AX.25 not configured in this system.\n"
-+msgstr "AX.25���システム��設定�れ����ん.\n"
-+
-+#: ../lib/ax25_gr.c:50
-+#, c-format
-+msgid "Kernel AX.25 routing table\n"
-+msgstr "カー�ル AX.25経路テーブル\n"
-+
-+#. xxx
-+#: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
-+#, c-format
-+msgid "Destination  Iface    Use\n"
-+msgstr "�信先サイト Iface    使用数\n"
-+
-+#: ../lib/ether.c:74 ../lib/ether.c:91
-+#, c-format
-+msgid "in_ether(%s): invalid ether address!\n"
-+msgstr "in_ether(%s): ��当�イーサアドレス!\n"
-+
-+#: ../lib/ether.c:105
-+#, c-format
-+msgid "in_ether(%s): trailing : ignored!\n"
-+msgstr "in_ether(%s): trailing : 無効!\n"
-+
-+# translatable?
-+#: ../lib/ether.c:117
-+#, c-format
-+msgid "in_ether(%s): trailing junk!\n"
-+msgstr "in_ether(%s): trailing junk!\n"
-+
-+#: ../lib/fddi.c:84 ../lib/fddi.c:99
-+#, c-format
-+msgid "in_fddi(%s): invalid fddi address!\n"
-+msgstr "in_fddi(%s): ��当�fddiアドレス!\n"
-+
-+#: ../lib/fddi.c:111
-+#, c-format
-+msgid "in_fddi(%s): trailing : ignored!\n"
-+msgstr "in_fddi(%s): trailing : 無効!\n"
-+
-+# translatable?
-+#: ../lib/fddi.c:123
-+#, c-format
-+msgid "in_fddi(%s): trailing junk!\n"
-+msgstr "in_fddi(%s): trailing junk!\n"
-+
-+#: ../lib/getroute.c:101 ../lib/setroute.c:80
-+#, c-format
-+msgid "Address family `%s' not supported.\n"
-+msgstr "アドレスファミリ`%s'�サ�ート�れ����ん.\n"
-+
-+#: ../lib/getroute.c:107 ../lib/setroute.c:84
-+#, c-format
-+msgid "No routing for address family `%s'.\n"
-+msgstr "アドレスファミリ`%s'��経路�見��り��ん.\n"
-+
-+#: ../lib/hippi.c:84 ../lib/hippi.c:99
-+#, c-format
-+msgid "in_hippi(%s): invalid hippi address!\n"
-+msgstr "in_hippi(%s): ��当�hippiアドレス��!\n"
-+
-+#: ../lib/hippi.c:111
-+#, c-format
-+msgid "in_hippi(%s): trailing : ignored!\n"
-+msgstr "in_hippi(%s): trailing : 無効!\n"
-+
-+# translatable?
-+#: ../lib/hippi.c:122
-+#, c-format
-+msgid "in_hippi(%s): trailing junk!\n"
-+msgstr "in_hippi(%s): trailing junk!\n"
-+
-+#: ../lib/hw.c:160
-+msgid "Local Loopback"
-+msgstr "ローカルループ�ック"
-+
-+#: ../lib/hw.c:163
-+msgid "Serial Line IP"
-+msgstr "シリアルラインIP"
-+
-+#: ../lib/hw.c:164
-+msgid "VJ Serial Line IP"
-+msgstr "VJシリアルラインIP"
-+
-+#: ../lib/hw.c:165
-+msgid "6-bit Serial Line IP"
-+msgstr "6ビットシリアルラインIP"
-+
-+#: ../lib/hw.c:166
-+msgid "VJ 6-bit Serial Line IP"
-+msgstr "VJ 6ビットシリアルラインIP"
-+
-+#: ../lib/hw.c:167
-+msgid "Adaptive Serial Line IP"
-+msgstr "AdaptiveシリアルラインIP"
-+
-+#: ../lib/hw.c:170
-+msgid "Ethernet"
-+msgstr "イーサ�ット"
-+
-+# translatable?
-+#: ../lib/hw.c:176
-+msgid "Fiber Distributed Data Interface"
-+msgstr "Fiber Distributed Data Interface"
-+
-+#: ../lib/hw.c:179
-+msgid "HIPPI"
-+msgstr "HIPPI"
-+
-+#: ../lib/hw.c:191
-+msgid "generic X.25"
-+msgstr "ジェ�リックX.25"
-+
-+#: ../lib/hw.c:194
-+msgid "IPIP Tunnel"
-+msgstr "IPIPトン�ル"
-+
-+#: ../lib/hw.c:197
-+msgid "Point-to-Point Protocol"
-+msgstr "Point-to-Pointプロトコル"
-+
-+#: ../lib/hw.c:200
-+msgid "(Cisco)-HDLC"
-+msgstr "(Cisco)-HDLC"
-+
-+#: ../lib/hw.c:201
-+msgid "LAPB"
-+msgstr "LAPB"
-+
-+#: ../lib/hw.c:204
-+msgid "ARCnet"
-+msgstr "ARC�ット"
-+
-+#: ../lib/hw.c:207
-+msgid "Frame Relay DLCI"
-+msgstr "フレームリレーDLCI"
-+
-+#: ../lib/hw.c:208
-+msgid "Frame Relay Access Device"
-+msgstr "フレームリレーアクセスデ�イス"
-+
-+#: ../lib/hw.c:211
-+msgid "IPv6-in-IPv4"
-+msgstr "IPv6-in-IPv4"
-+
-+#: ../lib/hw.c:214
-+msgid "IrLAP"
-+msgstr "IrLAP"
-+
-+#: ../lib/hw.c:217
-+msgid "16/4 Mbps Token Ring"
-+msgstr "16/4 Mbpsトークンリング"
-+
-+#: ../lib/hw.c:219
-+msgid "16/4 Mbps Token Ring (New)"
-+msgstr "16/4 Mbpsトークンリング(新)"
-+
-+#: ../lib/hw.c:226
-+msgid "Generic EUI-64"
-+msgstr "ジェ�リックEUI-64"
-+
-+#: ../lib/inet.c:153 ../lib/inet6.c:79
-+#, c-format
-+msgid "rresolve: unsupport address family %d !\n"
-+msgstr "rresolve: アドレスファミリ%dをサ�ート�����ん!\n"
-+
-+#: ../lib/inet6.c:131
-+msgid "[UNKNOWN]"
-+msgstr "[�明]"
-+
-+#: ../lib/inet6_gr.c:71
-+#, c-format
-+msgid "INET6 (IPv6) not configured in this system.\n"
-+msgstr "INET6(IPv6)���システム��利用��るよ�設定�れ����ん.\n"
-+
-+#: ../lib/inet6_gr.c:74
-+#, c-format
-+msgid "Kernel IPv6 routing table\n"
-+msgstr "カー�ルIPv6 経路テーブル\n"
-+
-+#: ../lib/inet6_gr.c:76
-+#, c-format
-+msgid ""
-+"Destination                                 Next "
-+"Hop                                Flags Metric Ref    Use Iface\n"
-+msgstr "�信先サイト                                次回ホップ                             フラグ Metric Ref 使用数 インタフェース\n"
-+
-+#: ../lib/inet6_gr.c:150
-+#, c-format
-+msgid "Kernel IPv6 Neighbour Cache\n"
-+msgstr "カー�ルIPv6 近隣�ットワーク�キャッシュ\n"
-+
-+#: ../lib/inet6_gr.c:153
-+#, c-format
-+msgid ""
-+"Neighbour                                   HW Address        Iface    Flags "
-+"Ref State\n"
-+msgstr ""
-+"近隣サイト                               �ードウェアアドレス Iface   フラグ "
-+"Ref 状態\n"
-+
-+#: ../lib/inet6_gr.c:157
-+#, c-format
-+msgid ""
-+"Neighbour                                   HW Address        Iface    Flags "
-+"Ref State            Stale(sec) Delete(sec)\n"
-+msgstr ""
-+"近隣サイト                               �ードウェアアドレス Iface   フラグ "
-+"Ref 状態             Stale[秒]  Delete[秒]\n"
-+
-+#: ../lib/inet6_sr.c:46
-+#, c-format
-+msgid "Usage: inet6_route [-vF] del Target\n"
-+msgstr "使用法: inet6_route [-vF] del ターゲット\n"
-+
-+#: ../lib/inet6_sr.c:47
-+#, c-format
-+msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
-+msgstr ""
-+"        inet6_route [-vF] add ターゲット \n"
-+"                    [gw ゲートウェイ] [metric メトリック]\n"
-+"                    [[dev] インタフェース]\n"
-+
-+#: ../lib/inet6_sr.c:48
-+#, c-format
-+msgid "       inet6_route [-FC] flush      NOT supported\n"
-+msgstr "        inet6_route [-FC] flush      サ�ート�����ん\n"
-+
-+#: ../lib/inet6_sr.c:188
-+#, c-format
-+msgid "Flushing `inet6' routing table not supported\n"
-+msgstr "`inet6'経路テーブル�フラッシュ�サ�ート�����ん\n"
-+
-+#: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
-+#, c-format
-+msgid "INET (IPv4) not configured in this system.\n"
-+msgstr "INET(IPv4)���システム��利用��るよ��設定�れ����ん.\n"
-+
-+#: ../lib/inet_gr.c:53
-+#, c-format
-+msgid "Kernel IP routing table\n"
-+msgstr "カー�ルIP経路テーブル\n"
-+
-+#: ../lib/inet_gr.c:56
-+#, c-format
-+msgid ""
-+"Destination     Gateway         Genmask         Flags Metric Ref    Use "
-+"Iface\n"
-+msgstr "�信先サイト    ゲートウェイ    �ットマスク   フラグ Metric Ref 使用数 インタフェース\n"
-+
-+#: ../lib/inet_gr.c:59
-+#, c-format
-+msgid ""
-+"Destination     Gateway         Genmask         Flags   MSS Window  irtt "
-+"Iface\n"
-+msgstr "�信先サイト    ゲートウェイ    �ットマスク   フラグ   MSS Window  irtt インタフェース\n"
-+
-+#: ../lib/inet_gr.c:62
-+#, c-format
-+msgid ""
-+"Destination     Gateway         Genmask         Flags Metric Ref    Use "
-+"Iface    MSS   Window irtt\n"
-+msgstr ""
-+"�信先サイト   ゲートウェイ    �ットマスク    フラグ Metric Ref 使用数 "
-+"Iface    MSS   Window irtt\n"
-+
-+#: ../lib/inet_gr.c:237
-+#, c-format
-+msgid "Kernel IP routing cache\n"
-+msgstr "カー�ルIP経路キャッシュ\n"
-+
-+#: ../lib/inet_gr.c:258
-+#, c-format
-+msgid ""
-+"Source          Destination     Gateway         Flags Metric Ref    Use "
-+"Iface\n"
-+msgstr "発信元サイト   �信先サイト    ゲートウェイ    フラグ Metric Ref 使用数 インタフェース\n"
-+
-+#: ../lib/inet_gr.c:261
-+#, c-format
-+msgid ""
-+"Source          Destination     Gateway         Flags   MSS Window  irtt "
-+"Iface\n"
-+msgstr "発信元サイト    �信先サイト    ゲートウェイ   フラグ   MSS Window  irtt インタフェース\n"
-+
-+#: ../lib/inet_gr.c:266
-+#, c-format
-+msgid ""
-+"Source          Destination     Gateway         Flags Metric Ref    Use "
-+"Iface    MSS   Window irtt  HH  Arp\n"
-+msgstr ""
-+"発信元サイト    �信先サイト    ゲートウェイ   フラグ Metric Ref 使用数 "
-+"Iface    MSS   Window irtt   HH  Arp\n"
-+
-+#: ../lib/inet_gr.c:290
-+#, c-format
-+msgid ""
-+"Source          Destination     Gateway         Flags Metric Ref    Use "
-+"Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
-+msgstr ""
-+"発信元サイト   �信先サイト     ゲートウェイ   フラグ Metric Ref 使用数 "
-+"Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
-+
-+#: ../lib/inet_sr.c:51
-+#, c-format
-+msgid ""
-+"Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
-+"[[dev] If]\n"
-+msgstr ""
-+"使用法:inet_route [-vF] del {-host|-net} �信先[/プレフィックス]\n"
-+"                   [gw ゲートウェイ] [metric メトリック]\n"
-+"                   [[dev] インタフェース]\n"
-+
-+#: ../lib/inet_sr.c:52
-+#, c-format
-+msgid ""
-+"       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
-+msgstr ""
-+"       inet_route [-vF] add {-host|-net} �信先[/プレフィックス]\n"
-+"                   [gw ゲートウェイ] [metric メトリック]\n"
-+
-+#: ../lib/inet_sr.c:53
-+#, c-format
-+msgid ""
-+"                              [netmask N] [mss Mss] [window W] [irtt I]\n"
-+msgstr "            [netmask �ットマスク] [mss Mss] [window W] [irtt I]\n"
-+
-+#: ../lib/inet_sr.c:54
-+#, c-format
-+msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
-+msgstr "            [mod] [dyn] [reinstate] [[dev] インタフェース]\n"
-+
-+#: ../lib/inet_sr.c:55
-+#, c-format
-+msgid ""
-+"       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
-+msgstr ""
-+"       inet_route [-vF] add {-host|-net} �信先[/プレフィックス]\n"
-+"                   [metric メトリック] reject\n"
-+
-+#: ../lib/inet_sr.c:56
-+#, c-format
-+msgid "       inet_route [-FC] flush      NOT supported\n"
-+msgstr "        inet_route [-FC] flush      サ�ート�����ん\n"
-+
-+#: ../lib/inet_sr.c:158
-+#, c-format
-+msgid "route: %s: cannot use a NETWORK as gateway!\n"
-+msgstr "route: %s: NETWORKをゲートウェイ���使���ん!\n"
-+
-+#: ../lib/inet_sr.c:174
-+#, c-format
-+msgid "route: Invalid MSS/MTU.\n"
-+msgstr "route: MSS/MTU���当��.\n"
-+
-+#: ../lib/inet_sr.c:187
-+#, c-format
-+msgid "route: Invalid window.\n"
-+msgstr "route: window���当��.\n"
-+
-+#: ../lib/inet_sr.c:203
-+#, c-format
-+msgid "route: Invalid initial rtt.\n"
-+msgstr "route: �期rtt���当��.\n"
-+
-+#: ../lib/inet_sr.c:261
-+#, c-format
-+msgid "route: netmask %.8x doesn't make sense with host route\n"
-+msgstr "route: �ットマスク%.8x�ホスト経路を検出���ん\n"
-+
-+#: ../lib/inet_sr.c:265
-+#, c-format
-+msgid "route: bogus netmask %s\n"
-+msgstr "route: ���ットマスク`%s'��\n"
-+
-+#: ../lib/inet_sr.c:270
-+#, c-format
-+msgid "route: netmask doesn't match route address\n"
-+msgstr "route: �ットマスク�経路アドレス�一致���ん\n"
-+
-+#: ../lib/inet_sr.c:306
-+#, c-format
-+msgid "Flushing `inet' routing table not supported\n"
-+msgstr "`inet'経路テーブル�フラッシュ�サ�ート�����ん\n"
-+
-+#: ../lib/inet_sr.c:310
-+#, c-format
-+msgid "Modifying `inet' routing cache not supported\n"
-+msgstr "`inet'経路テーブル�変更�サ�ート�����ん\n"
-+
-+#: ../lib/ipx_gr.c:52
-+#, c-format
-+msgid "IPX not configured in this system.\n"
-+msgstr "IPX���システム��設定�れ����ん.\n"
-+
-+#: ../lib/ipx_gr.c:56
-+#, c-format
-+msgid "Kernel IPX routing table\n"
-+msgstr "カー�ルIPX経路テーブル\n"
-+
-+#. xxx
-+#: ../lib/ipx_gr.c:57
-+#, c-format
-+msgid "Destination               Router Net                Router Node\n"
-+msgstr "�信先サイト              ルータ �ット             ルータノード\n"
-+
-+#: ../lib/ipx_sr.c:33
-+#, c-format
-+msgid "IPX: this needs to be written\n"
-+msgstr "IPX: �れ�書�込��必���\n"
-+
-+#: ../lib/masq_info.c:198
-+#, c-format
-+msgid "IP masquerading entries\n"
-+msgstr "IPマスカレード エントリ\n"
-+
-+#: ../lib/masq_info.c:201
-+#, c-format
-+msgid "prot   expire source               destination          ports\n"
-+msgstr "プロト expire 発信元サイト         �信先サイト         �ート\n"
-+
-+#: ../lib/masq_info.c:204
-+#, c-format
-+msgid ""
-+"prot   expire    initseq delta prevd source               "
-+"destination          ports\n"
-+msgstr ""
-+"プロト expire    �期seq delta prevd 発信元サイト         �信先サイ"
-+"ト         �ート\n"
-+
-+#: ../lib/netrom_gr.c:48
-+#, c-format
-+msgid "NET/ROM not configured in this system.\n"
-+msgstr "NET/ROM���システム��利用�能�よ��設定�れ����ん.\n"
-+
-+#: ../lib/netrom_gr.c:51
-+#, c-format
-+msgid "Kernel NET/ROM routing table\n"
-+msgstr "カー�ルNET/ROM経路テーブル\n"
-+
-+#: ../lib/netrom_gr.c:52
-+#, c-format
-+msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
-+msgstr "�信先サイト ニーモニック �質  近隣サイト インタフェース\n"
-+
-+#: ../lib/netrom_sr.c:34
-+#, c-format
-+msgid "netrom usage\n"
-+msgstr "netrom使用法\n"
-+
-+#: ../lib/netrom_sr.c:44
-+#, c-format
-+msgid "NET/ROM: this needs to be written\n"
-+msgstr "NET/ROM: �れ�書�込��必���\n"
-+
-+#: ../lib/ppp.c:44
-+#, c-format
-+msgid "You cannot start PPP with this program.\n"
-+msgstr "��プログラム��PPPを開始����ん. \n"
-+
-+#: ../lib/ppp_ac.c:38
-+#, c-format
-+msgid "Sorry, use pppd!\n"
-+msgstr "申�訳�り��ん�, pppdを使��下��!\n"
-+
-+#: ../lib/rose.c:87
-+msgid "Node address must be ten digits"
-+msgstr "ノードアドレス�10進数���れ��り��ん"
-+
-+#: ../lib/rose_gr.c:51
-+#, c-format
-+msgid "ROSE not configured in this system.\n"
-+msgstr "ROSE���システム��利用�能�よ��設定�れ����ん\n"
-+
-+#: ../lib/rose_gr.c:54
-+#, c-format
-+msgid "Kernel ROSE routing table\n"
-+msgstr "カー�ルROSE経路テーブル\n"
-+
-+#: ../lib/tr.c:86 ../lib/tr.c:101
-+#, c-format
-+msgid "in_tr(%s): invalid token ring address!\n"
-+msgstr "in_tr(%s): ��当�トークンリングアドレス��!\n"
-+
-+#: ../lib/tr.c:113
-+#, c-format
-+msgid "in_tr(%s): trailing : ignored!\n"
-+msgstr "in_tr(%s): trailing : 無効!\n"
-+
-+# translatable?
-+#: ../lib/tr.c:125
-+#, c-format
-+msgid "in_tr(%s): trailing junk!\n"
-+msgstr "in_tr(%s): trailing junk!\n"
-+
-+#: ../lib/interface.c:176
-+#, c-format
-+msgid "warning: no inet socket available: %s\n"
-+msgstr "警告: Inetソケット�利用����ん: %s\n"
-+
-+#: ../lib/interface.c:325
-+#, c-format
-+msgid "Warning: cannot open %s (%s). Limited output.\n"
-+msgstr "警告: %sを開���ん(%s). �定�れ�出力��.\n"
-+
-+#. Give better error message for this case.
-+#: ../lib/interface.c:571
-+msgid "Device not found"
-+msgstr "デ�イス�見��り��ん"
-+
-+#: ../lib/interface.c:575
-+#, c-format
-+msgid "%s: error fetching interface information: %s\n"
-+msgstr "%s: インタフェース情報を�得中�エラー�発生����: %s\n"
-+
-+#: ../lib/interface.c:608
-+msgid "     - no statistics available -"
-+msgstr "     - 統計情報を利用����ん -"
-+
-+#: ../lib/interface.c:612
-+#, c-format
-+msgid "[NO FLAGS]"
-+msgstr "[フラグ��]"
-+
-+#: ../lib/interface.c:688
-+#, c-format
-+msgid "%-9.9s Link encap:%s  "
-+msgstr "%-9.9s リンク方法:%s  "
-+
-+#: ../lib/interface.c:693
-+#, c-format
-+msgid "HWaddr %s  "
-+msgstr "�ードウェアアドレス %s "
-+
-+#: ../lib/interface.c:696
-+#, c-format
-+msgid "Media:%s"
-+msgstr "メディア:%s"
-+
-+#: ../lib/interface.c:698
-+#, c-format
-+msgid "(auto)"
-+msgstr "(自動)"
-+
-+#: ../lib/interface.c:705
-+#, c-format
-+msgid "          %s addr:%s "
-+msgstr "          %sアドレス:%s"
-+
-+#: ../lib/interface.c:708
-+#, c-format
-+msgid " P-t-P:%s "
-+msgstr " P-t-P:%s "
-+
-+#: ../lib/interface.c:711
-+#, c-format
-+msgid " Bcast:%s "
-+msgstr " ブロードキャスト:%s "
-+
-+#: ../lib/interface.c:713
-+#, c-format
-+msgid " Mask:%s\n"
-+msgstr " マスク:%s\n"
-+
-+#: ../lib/interface.c:730
-+#, c-format
-+msgid "          inet6 addr: %s/%d"
-+msgstr "          inet6アドレス: %s/%d"
-+
-+#: ../lib/interface.c:732
-+#, c-format
-+msgid " Scope:"
-+msgstr " 範囲:"
-+
-+#: ../lib/interface.c:735
-+#, c-format
-+msgid "Global"
-+msgstr "グロー�ル"
-+
-+#: ../lib/interface.c:738
-+#, c-format
-+msgid "Link"
-+msgstr "リンク"
-+
-+#: ../lib/interface.c:741
-+#, c-format
-+msgid "Site"
-+msgstr "サイト"
-+
-+# translatable?
-+#: ../lib/interface.c:744
-+#, c-format
-+msgid "Compat"
-+msgstr "Compat"
-+
-+#: ../lib/interface.c:747
-+#, c-format
-+msgid "Host"
-+msgstr "ホスト"
-+
-+#: ../lib/interface.c:750
-+#, c-format
-+msgid "Unknown"
-+msgstr "�明"
-+
-+#: ../lib/interface.c:765
-+#, c-format
-+msgid "          IPX/Ethernet II addr:%s\n"
-+msgstr "          IPX/イーサ�ットIIアドレス:%s\n"
-+
-+#: ../lib/interface.c:768
-+#, c-format
-+msgid "          IPX/Ethernet SNAP addr:%s\n"
-+msgstr "          IPX/イーサ�ットSNAPアドレス:%s\n"
-+
-+#: ../lib/interface.c:771
-+#, c-format
-+msgid "          IPX/Ethernet 802.2 addr:%s\n"
-+msgstr "          IPX/イーサ�ット802.2アドレス:%s\n"
-+
-+#: ../lib/interface.c:774
-+#, c-format
-+msgid "          IPX/Ethernet 802.3 addr:%s\n"
-+msgstr "          IPX/イーサ�ット802.3アドレス:%s\n"
-+
-+#: ../lib/interface.c:784
-+#, c-format
-+msgid "          EtherTalk Phase 2 addr:%s\n"
-+msgstr "          イーサトーク フェーズ2アドレス:%s\n"
-+
-+#: ../lib/interface.c:793
-+#, c-format
-+msgid "          econet addr:%s\n"
-+msgstr "          エコ�ットアドレス:%s\n"
-+
-+#: ../lib/interface.c:800
-+#, c-format
-+msgid "[NO FLAGS] "
-+msgstr "[フラグ��]"
-+
-+# translatable?
-+#: ../lib/interface.c:802
-+#, c-format
-+msgid "UP "
-+msgstr "UP "
-+
-+# translatable?
-+#: ../lib/interface.c:804
-+#, c-format
-+msgid "BROADCAST "
-+msgstr "BROADCAST "
-+
-+# translatable?
-+#: ../lib/interface.c:806
-+#, c-format
-+msgid "DEBUG "
-+msgstr "DEBUG "
-+
-+# translatable?
-+#: ../lib/interface.c:808
-+#, c-format
-+msgid "LOOPBACK "
-+msgstr "LOOPBACK "
-+
-+# translatable?
-+#: ../lib/interface.c:810
-+#, c-format
-+msgid "POINTOPOINT "
-+msgstr "POINTOPOINT "
-+
-+# translatable?
-+#: ../lib/interface.c:812
-+#, c-format
-+msgid "NOTRAILERS "
-+msgstr "NOTRAILERS "
-+
-+# translatable?
-+#: ../lib/interface.c:814
-+#, c-format
-+msgid "RUNNING "
-+msgstr "RUNNING "
-+
-+# translatable?
-+#: ../lib/interface.c:816
-+#, c-format
-+msgid "NOARP "
-+msgstr "NOARP "
-+
-+# translatable?
-+#: ../lib/interface.c:818
-+#, c-format
-+msgid "PROMISC "
-+msgstr "PROMISC "
-+
-+# translatable?
-+#: ../lib/interface.c:820
-+#, c-format
-+msgid "ALLMULTI "
-+msgstr "ALLMULTI "
-+
-+# translatable?
-+#: ../lib/interface.c:822
-+#, c-format
-+msgid "SLAVE "
-+msgstr "SLAVE "
-+
-+# translatable?
-+#: ../lib/interface.c:824
-+#, c-format
-+msgid "MASTER "
-+msgstr "MASTER "
-+
-+# translatable?
-+#: ../lib/interface.c:826
-+#, c-format
-+msgid "MULTICAST "
-+msgstr "MULTICAST "
-+
-+# translatable?
-+#: ../lib/interface.c:829
-+#, c-format
-+msgid "DYNAMIC "
-+msgstr "DYNAMIC "
-+
-+#. DONT FORGET TO ADD THE FLAGS IN ife_print_short
-+#: ../lib/interface.c:832
-+#, c-format
-+msgid " MTU:%d  Metric:%d"
-+msgstr " MTU:%d  メトリック:%d"
-+
-+# translatable?
-+#: ../lib/interface.c:836
-+#, c-format
-+msgid "  Outfill:%d  Keepalive:%d"
-+msgstr "  Outfill:%d  キープアライブ:%d"
-+
-+#: ../lib/interface.c:850
-+#, c-format
-+msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
-+msgstr "RXパケット:%llu エラー:%lu �失:%lu オー�ラン:%lu フレーム:%lu\n"
-+
-+#: ../lib/interface.c:855
-+#, c-format
-+msgid "             compressed:%lu\n"
-+msgstr "             圧縮:%lu\n"
-+
-+#: ../lib/interface.c:895
-+#, c-format
-+msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
-+msgstr "TXパケット:%llu エラー:%lu �失:%lu オー�ラン:%lu キャリア:%lu\n"
-+
-+#: ../lib/interface.c:899
-+#, c-format
-+msgid "          collisions:%lu "
-+msgstr "      ��(Collisions):%lu "
-+
-+#: ../lib/interface.c:901
-+#, c-format
-+msgid "compressed:%lu "
-+msgstr "圧縮:%lu "
-+
-+#: ../lib/interface.c:903
-+#, c-format
-+msgid "txqueuelen:%d "
-+msgstr "TXキュー長:%d "
-+
-+#: ../lib/interface.c:905
-+#, c-format
-+msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
-+msgstr "RX�イト:%llu (%lu.%lu %s)  TX�イト:%llu (%lu.%lu %s)\n"
-+
-+#: ../lib/interface.c:916
-+#, c-format
-+msgid "Interrupt:%d "
-+msgstr "割り込�:%d "
-+
-+#. Only print devices using it for
-+#. I/O maps
-+#: ../lib/interface.c:919
-+#, c-format
-+msgid "Base address:0x%x "
-+msgstr "ベースアドレス:0x%x "
-+
-+#: ../lib/interface.c:921
-+#, c-format
-+msgid "Memory:%lx-%lx "
-+msgstr "メモリ:%lx-%lx "
-+
-+#: ../lib/interface.c:924
-+#, c-format
-+msgid "DMA chan:%x "
-+msgstr "DMA�ェイン:%x "
-+
-+#: ../lib/sockets.c:63
-+#, c-format
-+msgid "No usable address families found.\n"
-+msgstr "利用�能�アドレスファミリ�見��り��ん.\n"
-+
-+#: ../lib/util-ank.c:229
-+#, c-format
-+msgid "ip: %s is invalid inet address\n"
-+msgstr "ip: %s���切�Inetアドレス��.\n"
-+
-+#: ../lib/util-ank.c:238
-+#, c-format
-+msgid "ip: %s is invalid inet prefix\n"
-+msgstr "ip: %s���切�Inetプレフィックス��\n"
-+
-+#: ../lib/util-ank.c:248
-+#, c-format
-+msgid "ip: %s is invalid IPv4 address\n"
-+msgstr "ip: %s���切�IPv4アドレス��.\n"
-+
-+#: ../lib/util-ank.c:256
-+#, c-format
-+msgid "ip: argument is wrong: %s\n"
-+msgstr "ip: 引数�間������: %s\n"
-+
-+#: ../ipmaddr.c:61
-+#, c-format
-+msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
-+msgstr "使用法: ipmaddr [ add | del ] マル�キャストアドレス dev 文字列\n"
-+
-+#: ../ipmaddr.c:62
-+#, c-format
-+msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
-+msgstr "        ipmaddr show [ dev 文字列 ] [ ipv4 | ipv6 | link | all ]\n"
-+
-+#: ../ipmaddr.c:63
-+#, c-format
-+msgid "       ipmaddr -V | -version\n"
-+msgstr "       ipmaddr -V | -version\n"
-+
-+#: ../ipmaddr.c:263
-+#, c-format
-+msgid "family %d "
-+msgstr "ファミリ %d "
-+
-+#: ../ipmaddr.c:272
-+#, c-format
-+msgid " users %d"
-+msgstr " ユーザ %d"
-+
-+#: ../ipmaddr.c:358
-+msgid "Cannot create socket"
-+msgstr "ソケットを作�����ん"
-+
-+#: ../slattach.c:180
-+#, c-format
-+msgid "slattach: /dev/%s already locked!\n"
-+msgstr "slattach: /dev/%s ����ロック�れ����!\n"
-+
-+#: ../slattach.c:186
-+#, c-format
-+msgid "slattach: tty_lock: (%s): %s\n"
-+msgstr "slattach: tty_lock: (%s): %s\n"
-+
-+#: ../slattach.c:192
-+#, c-format
-+msgid "slattach: cannot write PID file\n"
-+msgstr "slattach: PIDファイルを書�込���ん\n"
-+
-+#: ../slattach.c:202
-+#, c-format
-+msgid "slattach: tty_lock: UUCP user %s unknown!\n"
-+msgstr "slattach: tty_lock: UUCPユーザ%s��明��!\n"
-+
-+#: ../slattach.c:430
-+#, c-format
-+msgid "slattach: tty_hangup(DROP): %s\n"
-+msgstr "slattach: tty_hangup(DROP): %s\n"
-+
-+#: ../slattach.c:437
-+#, c-format
-+msgid "slattach: tty_hangup(RAISE): %s\n"
-+msgstr "slattach: tty_hangup(RAISE): %s\n"
-+
-+#: ../slattach.c:468
-+#, c-format
-+msgid "slattach: tty name too long\n"
-+msgstr "slattach: tty��長����\n"
-+
-+#: ../slattach.c:498
-+#, c-format
-+msgid "slattach: tty_open: cannot get current state!\n"
-+msgstr "slattach: tty_open: �在�状態を得られ��ん!\n"
-+
-+#: ../slattach.c:505
-+#, c-format
-+msgid "slattach: tty_open: cannot get current line disc!\n"
-+msgstr "slattach: tty_open: �在�ライン・ディスクを得られ��ん!\n"
-+
-+#: ../slattach.c:513
-+#, c-format
-+msgid "slattach: tty_open: cannot set RAW mode!\n"
-+msgstr "slattach: tty_open: RAWモードを設定����ん!\n"
-+
-+#: ../slattach.c:520
-+#, c-format
-+msgid "slattach: tty_open: cannot set %s bps!\n"
-+msgstr "slattach: tty_open: %s bpsを設定����ん!\n"
-+
-+#: ../slattach.c:530
-+#, c-format
-+msgid "slattach: tty_open: cannot set 8N1 mode!\n"
-+msgstr "slattach: tty_open: 8N1モード�設定����ん!\n"
-+
-+#: ../slattach.c:672
-+#, c-format
-+msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n"
-+msgstr "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n"
-+
-+#: ../slattach.c:704
-+#, c-format
-+msgid "%s started"
-+msgstr "%sを開始����"
-+
-+#: ../slattach.c:705
-+#, c-format
-+msgid " on %s"
-+msgstr "(%s上)"
-+
-+#: ../slattach.c:706
-+#, c-format
-+msgid " interface %s\n"
-+msgstr " インタフェース %s\n"
---- net-tools-1.60.orig/ipmaddr.c
-+++ net-tools-1.60/ipmaddr.c
-@@ -291,13 +291,15 @@
- static int multiaddr_list(int argc, char **argv)
- {
- 	struct ma_info *list = NULL;
-+	size_t l;
- 
- 	while (argc > 0) {
- 		if (strcmp(*argv, "dev") == 0) {
- 			NEXT_ARG();
--			if (filter_dev[0])
-+			l = strlen(*argv);
-+			if (l <= 0 || l >= sizeof(filter_dev))
- 				usage();
--			strcpy(filter_dev, *argv);
-+			strncpy(filter_dev, *argv, sizeof (filter_dev));
- 		} else if (strcmp(*argv, "all") == 0) {
- 			filter_family = AF_UNSPEC;
- 		} else if (strcmp(*argv, "ipv4") == 0) {
-@@ -307,9 +309,10 @@
- 		} else if (strcmp(*argv, "link") == 0) {
- 			filter_family = AF_PACKET;
- 		} else {
--			if (filter_dev[0])
-+			l = strlen(*argv);
-+			if (l <= 0 || l >= sizeof(filter_dev))
- 				usage();
--			strcpy(filter_dev, *argv);
-+			strncpy(filter_dev, *argv, sizeof (filter_dev));
- 		}
- 		argv++; argc--;
- 	}
---- net-tools-1.60.orig/Makefile
-+++ net-tools-1.60/Makefile
-@@ -76,7 +76,7 @@
- NET_LIB_PATH = lib
- NET_LIB_NAME = net-tools
- 
--PROGS	:= ifconfig hostname arp netstat route rarp slattach plipconfig nameif
-+PROGS	:= ifconfig arp netstat route rarp slattach plipconfig nameif # hostname
- 
- -include config.make
- ifeq ($(HAVE_IP_TOOLS),1)
-@@ -88,7 +88,7 @@
- 
- # Compiler and Linker Options
- # You may need to uncomment and edit these if you are using libc5 and IPv6.
--COPTS = -D_GNU_SOURCE -O2 -Wall -g # -I/usr/inet6/include
-+COPTS = -D_GNU_SOURCE -O2 -Wall # -g -I/usr/inet6/include
- ifeq ($(origin LOPTS), undefined)
- LOPTS = 
- endif
-@@ -116,6 +116,18 @@
- CFLAGS	= $(COPTS) -I. -idirafter ./include/ -I$(NET_LIB_PATH)
- LDFLAGS	= $(LOPTS) -L$(NET_LIB_PATH)
- 
-+INSTALL = install
-+INSTALL_PROGRAM = $(INSTALL) -p    -o root -g root  -m  755
-+          
-+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-+CFLAGS += -g
-+endif
-+
-+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-+INSTALL_PROGRAM += -s
-+endif
-+
-+
- SUBDIRS	= man/ $(NET_LIB_PATH)/
- 
- ifeq ($(origin CC), undefined)
-@@ -223,29 +235,29 @@
- installbin:
- 	install -m 0755 -d ${BASEDIR}/sbin
- 	install -m 0755 -d ${BASEDIR}/bin
--	install -m 0755 arp        ${BASEDIR}/sbin
--	install -m 0755 hostname   ${BASEDIR}/bin
--	install -m 0755 ifconfig   ${BASEDIR}/sbin
--	install -m 0755 nameif     ${BASEDIR}/sbin
--	install -m 0755 netstat    ${BASEDIR}/bin
--	install -m 0755 plipconfig $(BASEDIR)/sbin
--	install -m 0755 rarp       ${BASEDIR}/sbin
--	install -m 0755 route      ${BASEDIR}/sbin
--	install -m 0755 slattach   $(BASEDIR)/sbin
-+	$(INSTALL_PROGRAM) arp        ${BASEDIR}/sbin
-+#	$(INSTALL_PROGRAM) hostname   ${BASEDIR}/bin
-+	$(INSTALL_PROGRAM) ifconfig   ${BASEDIR}/sbin
-+	$(INSTALL_PROGRAM) nameif     ${BASEDIR}/sbin
-+	$(INSTALL_PROGRAM) netstat    ${BASEDIR}/bin
-+	$(INSTALL_PROGRAM) plipconfig $(BASEDIR)/sbin
-+	$(INSTALL_PROGRAM) rarp       ${BASEDIR}/sbin
-+	$(INSTALL_PROGRAM) route      ${BASEDIR}/sbin
-+	$(INSTALL_PROGRAM) slattach   $(BASEDIR)/sbin
- ifeq ($(HAVE_IP_TOOLS),1)
--	install -m 0755 ipmaddr    $(BASEDIR)/sbin
--	install -m 0755 iptunnel   $(BASEDIR)/sbin
-+	$(INSTALL_PROGRAM) ipmaddr    $(BASEDIR)/sbin
-+	$(INSTALL_PROGRAM) iptunnel   $(BASEDIR)/sbin
- endif
- ifeq ($(HAVE_MII),1)
--	install -m 0755 mii-tool   $(BASEDIR)/sbin
--endif
--	ln -fs hostname $(BASEDIR)/bin/dnsdomainname
--	ln -fs hostname $(BASEDIR)/bin/ypdomainname
--	ln -fs hostname $(BASEDIR)/bin/nisdomainname
--	ln -fs hostname $(BASEDIR)/bin/domainname
--ifeq ($(HAVE_AFDECnet),1)
--	ln -fs hostname $(BASEDIR)/bin/nodename
-+	$(INSTALL_PROGRAM) mii-tool   $(BASEDIR)/sbin
- endif
-+#	ln -fs hostname $(BASEDIR)/bin/dnsdomainname
-+#	ln -fs hostname $(BASEDIR)/bin/ypdomainname
-+#	ln -fs hostname $(BASEDIR)/bin/nisdomainname
-+#	ln -fs hostname $(BASEDIR)/bin/domainname
-+#ifeq ($(HAVE_AFDECnet),1)
-+#	ln -fs hostname $(BASEDIR)/bin/nodename
-+#endif
- 
- savebin:
- 	@for i in ${BASEDIR}/sbin/arp ${BASEDIR}/sbin/ifconfig \
---- net-tools-1.60.orig/README
-+++ net-tools-1.60/README
-@@ -10,7 +10,7 @@
- subsystem of the Linux kernel.  This includes arp, hostname, ifconfig,
- netstat, rarp and route.  Additionally, this package contains
- utilities relating to particular network hardware types (plipconfig,
--slattach) and advanced aspects of IP configuration (iptunnel,
-+slattach, mii-tool) and advanced aspects of IP configuration (iptunnel,
- ipmaddr).
- 
- Please include the output of "program --version" when reporting bugs.
-@@ -24,10 +24,14 @@
- 
-    INSTALLING		Installation instructions.
- 
--   COPYING		Your free copy of the GNU Public License.
--
-    TODO			Some things that need to be done.
- 
-+The  Homepage (including CVS repository, release downloads and a form to
-+request enhancements) is hosted by BerliOS Developer. Please consider to
-+join the project if you want to contribute:
-+
-+                  http://net-tools.berlios.de/
-+
- 
-                           Notes
-                           -----
---- net-tools-1.60.orig/arp.c
-+++ net-tools-1.60/arp.c
-@@ -8,7 +8,7 @@
-  *              NET-3 Networking Distribution for the LINUX operating
-  *              system.
-  *
-- * Version:     $Id: arp.c,v 1.20 2001/04/08 17:05:05 pb Exp $
-+ * Version:     $Id: arp.c,v 1.25 2005/12/04 02:57:15 ecki Exp $
-  *
-  * Maintainer:  Bernd 'eckes' Eckenfels, <net-tools@lina.inka.de>
-  *
-@@ -100,9 +100,10 @@
- {
-     char host[128];
-     struct arpreq req;
--    struct sockaddr sa;
-+    struct sockaddr_storage ss;
-+    struct sockaddr *sa;
-     int flags = 0;
--    int err;
-+    int deleted = 0;
- 
-     memset((char *) &req, 0, sizeof(req));
- 
-@@ -112,12 +113,13 @@
- 	return (-1);
-     }
-     safe_strncpy(host, *args, (sizeof host));
--    if (ap->input(0, host, &sa) < 0) {
-+    sa = (struct sockaddr *)&ss;
-+    if (ap->input(0, host, sa) < 0) {
- 	ap->herror(host);
- 	return (-1);
-     }
-     /* If a host has more than one address, use the correct one! */
--    memcpy((char *) &req.arp_pa, (char *) &sa, sizeof(struct sockaddr));
-+    memcpy((char *) &req.arp_pa, (char *) sa, sizeof(struct sockaddr));
- 
-     if (hw_set)
- 	req.arp_ha.sa_family = hw->type;
-@@ -148,7 +150,7 @@
- 	    continue;
- 	}
- 	if (!strcmp(*args, "dontpub")) {
--#ifdef HAVE_ATF_DONTPUB
-+#ifdef ATF_DONTPUB
- 	    req.arp_flags |= ATF_DONTPUB;
- #else
- 	    ENOSUPP("arp", "ATF_DONTPUB");
-@@ -157,7 +159,7 @@
- 	    continue;
- 	}
- 	if (!strcmp(*args, "auto")) {
--#ifdef HAVE_ATF_MAGIC
-+#ifdef ATF_MAGIC
- 	    req.arp_flags |= ATF_MAGIC;
- #else
- 	    ENOSUPP("arp", "ATF_MAGIC");
-@@ -177,11 +179,11 @@
- 		usage();
- 	    if (strcmp(*args, "255.255.255.255") != 0) {
- 		strcpy(host, *args);
--		if (ap->input(0, host, &sa) < 0) {
-+		if (ap->input(0, host, sa) < 0) {
- 		    ap->herror(host);
- 		    return (-1);
- 		}
--		memcpy((char *) &req.arp_netmask, (char *) &sa,
-+		memcpy((char *) &req.arp_netmask, (char *) sa,
- 		       sizeof(struct sockaddr));
- 		req.arp_flags |= ATF_NETMASK;
- 	    }
-@@ -190,35 +192,41 @@
- 	}
- 	usage();
-     }
-+
-+    // if neighter priv nor pub is given, work on both
-     if (flags == 0)
- 	flags = 3;
- 
-     strcpy(req.arp_dev, device);
- 
--    err = -1;
-+    /* unfortuatelly the kernel interface does not allow us to
-+       delete private entries anlone, so we need this hack
-+       to avoid "not found" errors if we try both. */
-+    deleted = 0;
- 
-     /* Call the kernel. */
-     if (flags & 2) {
- 	if (opt_v)
--	    fprintf(stderr, "arp: SIOCDARP(nopub)\n");
--	if ((err = ioctl(sockfd, SIOCDARP, &req) < 0)) {
--	    if (errno == ENXIO) {
-+	    fprintf(stderr, "arp: SIOCDARP(dontpub)\n");
-+	if (ioctl(sockfd, SIOCDARP, &req) < 0) {
-+	    if ((errno == ENXIO) || (errno == ENOENT)) {
- 		if (flags & 1)
--		    goto nopub;
-+		    goto dontpub;
- 		printf(_("No ARP entry for %s\n"), host);
- 		return (-1);
- 	    }
--	    perror("SIOCDARP(priv)");
-+	    perror("SIOCDARP(dontpub)");
- 	    return (-1);
--	}
-+	} else
-+	  deleted = 1;
-     }
--    if ((flags & 1) && (err)) {
--      nopub:
-+    if (!deleted && (flags & 1)) {
-+      dontpub:
- 	req.arp_flags |= ATF_PUBL;
- 	if (opt_v)
- 	    fprintf(stderr, "arp: SIOCDARP(pub)\n");
- 	if (ioctl(sockfd, SIOCDARP, &req) < 0) {
--	    if (errno == ENXIO) {
-+	    if ((errno == ENXIO) || (errno == ENOENT)) {
- 		printf(_("No ARP entry for %s\n"), host);
- 		return (-1);
- 	    }
-@@ -260,7 +268,8 @@
- {
-     char host[128];
-     struct arpreq req;
--    struct sockaddr sa;
-+    struct sockaddr_storage ss;
-+    struct sockaddr *sa;
-     int flags;
- 
-     memset((char *) &req, 0, sizeof(req));
-@@ -271,12 +280,13 @@
- 	return (-1);
-     }
-     safe_strncpy(host, *args++, (sizeof host));
--    if (ap->input(0, host, &sa) < 0) {
-+    sa = (struct sockaddr *)&ss;
-+    if (ap->input(0, host, sa) < 0) {
- 	ap->herror(host);
- 	return (-1);
-     }
-     /* If a host has more than one address, use the correct one! */
--    memcpy((char *) &req.arp_pa, (char *) &sa, sizeof(struct sockaddr));
-+    memcpy((char *) &req.arp_pa, (char *) sa, sizeof(struct sockaddr));
- 
-     /* Fetch the hardware address. */
-     if (*args == NULL) {
-@@ -317,7 +327,7 @@
- 	    continue;
- 	}
- 	if (!strcmp(*args, "dontpub")) {
--#ifdef HAVE_ATF_DONTPUB
-+#ifdef ATF_DONTPUB
- 	    flags |= ATF_DONTPUB;
- #else
- 	    ENOSUPP("arp", "ATF_DONTPUB");
-@@ -326,7 +336,7 @@
- 	    continue;
- 	}
- 	if (!strcmp(*args, "auto")) {
--#ifdef HAVE_ATF_MAGIC
-+#ifdef ATF_MAGIC
- 	    flags |= ATF_MAGIC;
- #else
- 	    ENOSUPP("arp", "ATF_MAGIC");
-@@ -346,11 +356,11 @@
- 		usage();
- 	    if (strcmp(*args, "255.255.255.255") != 0) {
- 		strcpy(host, *args);
--		if (ap->input(0, host, &sa) < 0) {
-+		if (ap->input(0, host, sa) < 0) {
- 		    ap->herror(host);
- 		    return (-1);
- 		}
--		memcpy((char *) &req.arp_netmask, (char *) &sa,
-+		memcpy((char *) &req.arp_netmask, (char *) sa,
- 		       sizeof(struct sockaddr));
- 		flags |= ATF_NETMASK;
- 	    }
-@@ -445,11 +455,11 @@
- 	strcat(flags, "M");
-     if (arp_flags & ATF_PUBL)
- 	strcat(flags, "P");
--#ifdef HAVE_ATF_MAGIC
-+#ifdef ATF_MAGIC
-     if (arp_flags & ATF_MAGIC)
- 	strcat(flags, "A");
- #endif
--#ifdef HAVE_ATF_DONTPUB
-+#ifdef ATF_DONTPUB
-     if (arp_flags & ATF_DONTPUB)
- 	strcat(flags, "!");
- #endif
-@@ -463,7 +473,7 @@
- 
-     if (!(arp_flags & ATF_COM)) {
- 	if (arp_flags & ATF_PUBL)
--	    printf("%-8.8s%-20.20s", "*", "*");
-+	    printf("%-8.8s%-20.20s", "*", _("<from_interface>"));
- 	else
- 	    printf("%-8.8s%-20.20s", "", _("(incomplete)"));
-     } else {
-@@ -486,7 +496,7 @@
- 
-     if (!(arp_flags & ATF_COM)) {
- 	if (arp_flags & ATF_PUBL)
--	    printf("* ");
-+	    printf("<from_interface> ");
- 	else
- 	    printf(_("<incomplete> "));
-     } else {
-@@ -499,12 +509,12 @@
-     if (arp_flags & ATF_PERM)
- 	printf("PERM ");
-     if (arp_flags & ATF_PUBL)
--	printf("PUP ");
--#ifdef HAVE_ATF_MAGIC
-+	printf("PUB ");
-+#ifdef ATF_MAGIC
-     if (arp_flags & ATF_MAGIC)
- 	printf("AUTO ");
- #endif
--#ifdef HAVE_ATF_DONTPUB
-+#ifdef ATF_DONTPUB
-     if (arp_flags & ATF_DONTPUB)
- 	printf("DONTPUB ");
- #endif
-@@ -519,7 +529,8 @@
- static int arp_show(char *name)
- {
-     char host[100];
--    struct sockaddr sa;
-+    struct sockaddr_storage ss;
-+    struct sockaddr *sa;
-     char ip[100];
-     char hwa[100];
-     char mask[100];
-@@ -532,14 +543,15 @@
- 
-     host[0] = '\0';
- 
-+    sa = (struct sockaddr *)&ss;
-     if (name != NULL) {
- 	/* Resolve the host name. */
- 	safe_strncpy(host, name, (sizeof host));
--	if (ap->input(0, host, &sa) < 0) {
-+	if (ap->input(0, host, sa) < 0) {
- 	    ap->herror(host);
- 	    return (-1);
- 	}
--	safe_strncpy(host, ap->sprint(&sa, 1), sizeof(host));
-+	safe_strncpy(host, ap->sprint(sa, 1), sizeof(host));
-     }
-     /* Open the PROCps kernel table. */
-     if ((fp = fopen(_PATH_PROCNET_ARP, "r")) == NULL) {
-@@ -575,10 +587,10 @@
- 	    if (opt_n)
- 		hostname = "?";
- 	    else {
--		if (ap->input(0, ip, &sa) < 0)
-+		if (ap->input(0, ip, sa) < 0)
- 		    hostname = ip;
- 		else
--		    hostname = ap->sprint(&sa, opt_n | 0x8000);
-+		    hostname = ap->sprint(sa, opt_n | 0x8000);
- 		if (strcmp(hostname, ip) == 0)
- 		    hostname = "?";
- 	    }
-@@ -612,11 +624,10 @@
- static void usage(void)
- {
-     fprintf(stderr, _("Usage:\n  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP cache\n"));
--    fprintf(stderr, _("  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP entry\n"));
--    fprintf(stderr, _("  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from file\n"));
--    fprintf(stderr, _("  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add entry\n"));
--    fprintf(stderr, _("  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  <-''-\n"));
--    fprintf(stderr, _("  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      <-''-\n\n"));
-+    fprintf(stderr, _("  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP entry\n"));
-+    fprintf(stderr, _("  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from file\n"));
-+    fprintf(stderr, _("  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add entry\n"));
-+    fprintf(stderr, _("  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          <-''-\n\n"));
-     
-     fprintf(stderr, _("        -a                       display (all) hosts in alternative (BSD) style\n"));
-     fprintf(stderr, _("        -s, --set                set a new ARP entry\n"));
---- net-tools-1.60.orig/config.in
-+++ net-tools-1.60/config.in
-@@ -49,16 +49,16 @@
- * 
- bool 'UNIX protocol family' HAVE_AFUNIX y
- bool 'INET (TCP/IP) protocol family' HAVE_AFINET y
--bool 'INET6 (IPv6) protocol family' HAVE_AFINET6 n
-+bool 'INET6 (IPv6) protocol family' HAVE_AFINET6 y
- bool 'Novell IPX/SPX protocol family' HAVE_AFIPX y
- bool 'Appletalk DDP protocol family' HAVE_AFATALK y
- bool 'AX25 (packet radio) protocol family' HAVE_AFAX25 y
- bool 'NET/ROM (packet radio) protocol family' HAVE_AFNETROM y
--bool 'Rose (packet radio) protocol family' HAVE_AFROSE n
-+bool 'Rose (packet radio) protocol family' HAVE_AFROSE y
- bool 'X.25 (CCITT) protocol family' HAVE_AFX25 y
--bool 'Econet protocol family' HAVE_AFECONET n
-+bool 'Econet protocol family' HAVE_AFECONET y
- bool 'DECnet protocol family' HAVE_AFDECnet n
--bool 'Ash protocol family' HAVE_AFASH n
-+bool 'Ash protocol family' HAVE_AFASH y
- *
- *
- *            Device Hardware types.
-@@ -71,21 +71,23 @@
- bool 'STRIP (Metricom radio) support' HAVE_HWSTRIP y
- bool 'Token ring (generic) support' HAVE_HWTR y
- bool 'AX25 (packet radio) support' HAVE_HWAX25 y
--bool 'Rose (packet radio) support' HAVE_HWROSE n
-+bool 'Rose (packet radio) support' HAVE_HWROSE y
- bool 'NET/ROM (packet radio) support' HAVE_HWNETROM y
- bool 'X.25 (generic) support' HAVE_HWX25 y
- bool 'DLCI/FRAD (frame relay) support' HAVE_HWFR y
--bool 'SIT (IPv6-in-IPv4) support' HAVE_HWSIT n
--bool 'FDDI (generic) support' HAVE_HWFDDI n
--bool 'HIPPI (generic) support' HAVE_HWHIPPI n
--bool 'Ash hardware support' HAVE_HWASH n
--bool '(Cisco)-HDLC/LAPB support' HAVE_HWHDLCLAPB n
-+bool 'SIT (IPv6-in-IPv4) support' HAVE_HWSIT y
-+bool 'FDDI (generic) support' HAVE_HWFDDI y
-+bool 'HIPPI (generic) support' HAVE_HWHIPPI y
-+bool 'Ash hardware support' HAVE_HWASH y
-+bool '(Cisco)-HDLC/LAPB support' HAVE_HWHDLCLAPB y
- bool 'IrDA support' HAVE_HWIRDA y
--bool 'Econet hardware support' HAVE_HWEC n
-+bool 'Econet hardware support' HAVE_HWEC y
-+bool 'Generic EUI-64 hardware support' HAVE_HWEUI64 y
-+
- *
- *
- *           Other Features.
- *
--bool 'IP Masquerading support' HAVE_FW_MASQUERADE n
--bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS n
--bool 'Build mii-tool' HAVE_MII n
-+bool 'IP Masquerading support' HAVE_FW_MASQUERADE y
-+bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS y
-+bool 'Build mii-tool' HAVE_MII y
---- net-tools-1.60.orig/hostname.c
-+++ net-tools-1.60/hostname.c
-@@ -9,20 +9,19 @@
-  *              dnsdmoainname   
-  *              nisdomainname {name|-F file}
-  *
-- * Version:     hostname 1.96 (1996-02-18)
-+ * Version:     hostname 1.101 (2003-10-11)
-  *
-  * Author:      Peter Tobias <tobias@et-inf.fho-emden.de>
-  *
-  * Changes:
-- *      {1.90}  Peter Tobias :          Added -a and -i options.
-- *      {1.91}  Bernd Eckenfels :       -v,-V rewritten, long_opts 
-- *                                      (major rewrite), usage.
-- *960120 {1.95} Bernd Eckenfels :       -y/nisdomainname - support for get/
-- *                                      setdomainname added 
-- *960218 {1.96} Bernd Eckenfels :       netinet/in.h added
-- *980629 {1.97} Arnaldo Carvalho de Melo : gettext instead of catgets for i18n
-- *20000213 {1.99} Arnaldo Carvalho de Melo : fixed some i18n strings
-+ *         {1.90}  Peter Tobias : Added -a and -i options.
-+ *         {1.91}  Bernd Eckenfels : -v,-V rewritten, long_opts (major rewrite), usage.
-+ *19960120 {1.95}  Bernd Eckenfels : -y/nisdomainname - support for get/setdomainname added 
-+ *19960218 {1.96}  Bernd Eckenfels : netinet/in.h added
-+ *19980629 {1.97}  Arnaldo Carvalho de Melo : gettext instead of catgets for i18n
-+ *20000213 {1.99}  Arnaldo Carvalho de Melo : fixed some i18n strings
-  *20010404 {1.100} Arnaldo Carvalho de Melo: use setlocale
-+ *20031011 {1.101} Maik Broemme: gcc 3.x fixes (default: break)
-  *
-  *              This program is free software; you can redistribute it
-  *              and/or  modify it under  the terms of  the GNU General
-@@ -31,7 +30,9 @@
-  *              your option) any later version.
-  */
- #include <stdio.h>
-+#include <stdlib.h>
- #include <unistd.h>
-+#include <stdlib.h>
- #include <getopt.h>
- #include <string.h>
- #include <netdb.h>
-@@ -78,6 +79,7 @@
-             fprintf(stderr, _("%s: name too long\n"), program_name);
-             break;
-         default:
-+	    break;
-         }
- 	exit(1);
-     }
-@@ -97,7 +99,6 @@
- 	case EINVAL:
- 	    fprintf(stderr, _("%s: name too long\n"), program_name);
- 	    break;
--	default:
- 	}
- 	exit(1);
-     };
-@@ -116,7 +117,6 @@
- 	case EINVAL:
- 	    fprintf(stderr, _("%s: name too long\n"), program_name);
- 	    break;
--	default:
- 	}
- 	exit(1);
-     };
-@@ -173,7 +173,6 @@
- 	    *p = '\0';
- 	printf("%s\n", hp->h_name);
- 	break;
--    default:
-     }
- }
- 
-@@ -326,11 +325,12 @@
- 	    break;
- 	case 'V':
- 	    version();
-+	    break; // not reached
- 	case '?':
- 	case 'h':
- 	default:
- 	    usage();
--
-+	    break; // not reached
- 	};
- 
- 
---- net-tools-1.60.orig/ifconfig.c
-+++ net-tools-1.60/ifconfig.c
-@@ -3,7 +3,7 @@
-  *              that either displays or sets the characteristics of
-  *              one or more of the system's networking interfaces.
-  *
-- * Version:     $Id: ifconfig.c,v 1.50 2001/04/13 18:25:18 pb Exp $
-+ * Version:     $Id: ifconfig.c,v 1.57 2002/12/10 00:56:41 ecki Exp $
-  *
-  * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
-  *              and others.  Copyright 1993 MicroWalt Corporation
-@@ -88,7 +88,6 @@
- char *Release = RELEASE, *Version = "ifconfig 1.42 (2001-04-13)";
- 
- int opt_a = 0;			/* show all interfaces          */
--int opt_i = 0;			/* show the statistics          */
- int opt_v = 0;			/* debugging output flag        */
- 
- int addr_family = 0;		/* currently selected AF        */
-@@ -105,7 +104,7 @@
-     int res;
- 
-     if (ife_short)
--	printf(_("Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
-+	printf(_("Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
- 
-     if (!ifname) {
- 	res = for_all_interfaces(do_if_print, &opt_a);
-@@ -127,7 +126,7 @@
- 
-     safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
-     if (ioctl(skfd, SIOCGIFFLAGS, &ifr) < 0) {
--	fprintf(stderr, _("%s: unknown interface: %s\n"), 
-+	fprintf(stderr, _("%s: ERROR while getting interface flags: %s\n"), 
- 		ifname,	strerror(errno));
- 	return (-1);
-     }
-@@ -159,7 +158,7 @@
- 
-     safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
-     if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) {
--	fprintf(stderr, _("%s: unknown interface: %s\n"), 
-+	fprintf(stderr, _("%s: ERROR while getting interface flags: %s\n"), 
- 		ifname, strerror(errno));
- 	return -1;
-     }
-@@ -172,9 +171,35 @@
-     return (0);
- }
- 
-+/** test is a specified flag is set */
-+static int test_flag(char *ifname, short flags)
-+{
-+    struct ifreq ifr;
-+    int fd;
-+
-+    if (strchr(ifname, ':')) {
-+        /* This is a v4 alias interface.  Downing it via a socket for
-+	   another AF may have bad consequences. */
-+        fd = get_socket_for_af(AF_INET);
-+	if (fd < 0) {
-+	    fprintf(stderr, _("No support for INET on this system.\n"));
-+	    return -1;
-+	}
-+    } else
-+        fd = skfd;
-+
-+    safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
-+    if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) {
-+	fprintf(stderr, _("%s: ERROR while testing interface flags: %s\n"), 
-+		ifname, strerror(errno));
-+	return -1;
-+    }
-+    return (ifr.ifr_flags & flags);
-+}
-+
- static void usage(void)
- {
--    fprintf(stderr, _("Usage:\n  ifconfig [-a] [-i] [-v] [-s] <interface> [[<AF>] <address>]\n"));
-+    fprintf(stderr, _("Usage:\n  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"));
- #if HAVE_AFINET
-     fprintf(stderr, _("  [add <address>[/<prefixlen>]]\n"));
-     fprintf(stderr, _("  [del <address>[/<prefixlen>]]\n"));
-@@ -208,7 +233,7 @@
- static void version(void)
- {
-     fprintf(stderr, "%s\n%s\n", Release, Version);
--    exit(0);
-+    exit(E_USAGE);
- }
- 
- static int set_netmask(int skfd, struct ifreq *ifr, struct sockaddr *sa)
-@@ -222,18 +247,19 @@
- 		strerror(errno));
- 	err = 1;
-     }
--    return 0;
-+    return err;
- }
- 
- int main(int argc, char **argv)
- {
-     struct sockaddr sa;
-+    struct sockaddr samask;
-     struct sockaddr_in sin;
-     char host[128];
-     struct aftype *ap;
-     struct hwtype *hw;
-     struct ifreq ifr;
--    int goterr = 0, didnetmask = 0;
-+    int goterr = 0, didnetmask = 0, neednetmask=0;
-     char **spp;
-     int fd;
- #if HAVE_AFINET6
-@@ -388,6 +414,8 @@
- 	}
- 	if (!strcmp(*spp, "-promisc")) {
- 	    goterr |= clr_flag(ifr.ifr_name, IFF_PROMISC);
-+	    if (test_flag(ifr.ifr_name, IFF_PROMISC) > 0)
-+	    	fprintf(stderr, _("Warning: Interface %s still in promisc mode... maybe other application is running?\n"), ifr.ifr_name);
- 	    spp++;
- 	    continue;
- 	}
-@@ -398,6 +426,8 @@
- 	}
- 	if (!strcmp(*spp, "-multicast")) {
- 	    goterr |= clr_flag(ifr.ifr_name, IFF_MULTICAST);
-+	    if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0)
-+	    	fprintf(stderr, _("Warning: Interface %s still in MULTICAST mode.\n"), ifr.ifr_name);
- 	    spp++;
- 	    continue;
- 	}
-@@ -408,6 +438,8 @@
- 	}
- 	if (!strcmp(*spp, "-allmulti")) {
- 	    goterr |= clr_flag(ifr.ifr_name, IFF_ALLMULTI);
-+	    if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0)
-+	    	fprintf(stderr, _("Warning: Interface %s still in ALLMULTI mode.\n"), ifr.ifr_name);
- 	    spp++;
- 	    continue;
- 	}
-@@ -430,6 +462,8 @@
- 	if (!strcmp(*spp, "-dynamic")) {
- 	    goterr |= clr_flag(ifr.ifr_name, IFF_DYNAMIC);
- 	    spp++;
-+	    if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0)
-+	    	fprintf(stderr, _("Warning: Interface %s still in DYNAMIC mode.\n"), ifr.ifr_name);
- 	    continue;
- 	}
- #endif
-@@ -486,6 +520,8 @@
- 
- 	if (!strcmp(*spp, "-broadcast")) {
- 	    goterr |= clr_flag(ifr.ifr_name, IFF_BROADCAST);
-+	    if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0)
-+	    	fprintf(stderr, _("Warning: Interface %s still in BROADCAST mode.\n"), ifr.ifr_name);
- 	    spp++;
- 	    continue;
- 	}
-@@ -493,7 +529,10 @@
- 	    if (*++spp != NULL) {
- 		safe_strncpy(host, *spp, (sizeof host));
- 		if (ap->input(0, host, &sa) < 0) {
--		    ap->herror(host);
-+		    if (ap->herror)
-+		    	ap->herror(host);
-+		    else
-+		    	fprintf(stderr, _("ifconfig: Error resolving '%s' for broadcast\n"), host);
- 		    goterr = 1;
- 		    spp++;
- 		    continue;
-@@ -515,7 +554,10 @@
- 		usage();
- 	    safe_strncpy(host, *spp, (sizeof host));
- 	    if (ap->input(0, host, &sa) < 0) {
--		ap->herror(host);
-+		    if (ap->herror)
-+		    	ap->herror(host);
-+		    else
-+		    	fprintf(stderr, _("ifconfig: Error resolving '%s' for dstaddr\n"), host);
- 		goterr = 1;
- 		spp++;
- 		continue;
-@@ -535,13 +577,16 @@
- 		usage();
- 	    safe_strncpy(host, *spp, (sizeof host));
- 	    if (ap->input(0, host, &sa) < 0) {
--		ap->herror(host);
-+		    if (ap->herror)
-+		    	ap->herror(host);
-+		    else
-+		    	fprintf(stderr, _("ifconfig: Error resolving '%s' for netmask\n"), host);
- 		goterr = 1;
- 		spp++;
- 		continue;
- 	    }
- 	    didnetmask++;
--	    goterr = set_netmask(ap->fd, &ifr, &sa);
-+	    goterr |= set_netmask(ap->fd, &ifr, &sa);
- 	    spp++;
- 	    continue;
- 	}
-@@ -613,6 +658,8 @@
- 	if (!strcmp(*spp, "-pointopoint")) {
- 	    goterr |= clr_flag(ifr.ifr_name, IFF_POINTOPOINT);
- 	    spp++;
-+	    if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0)
-+	    	fprintf(stderr, _("Warning: Interface %s still in POINTOPOINT mode.\n"), ifr.ifr_name);
- 	    continue;
- 	}
- 	if (!strcmp(*spp, "pointopoint")) {
-@@ -620,7 +667,10 @@
- 		spp++;
- 		safe_strncpy(host, *spp, (sizeof host));
- 		if (ap->input(0, host, &sa)) {
--		    ap->herror(host);
-+		    if (ap->herror)
-+		    	ap->herror(host);
-+		    else
-+		    	fprintf(stderr, _("ifconfig: Error resolving '%s' for pointopoint\n"), host);
- 		    goterr = 1;
- 		    spp++;
- 		    continue;
-@@ -661,8 +711,12 @@
- 	    memcpy((char *) &ifr.ifr_hwaddr, (char *) &sa,
- 		   sizeof(struct sockaddr));
- 	    if (ioctl(skfd, SIOCSIFHWADDR, &ifr) < 0) {
--		fprintf(stderr, "SIOCSIFHWADDR: %s\n",
--			strerror(errno));
-+		if (errno == EBUSY)
-+			fprintf(stderr, "SIOCSIFHWADDR: %s - you may need to down the interface\n",
-+				strerror(errno));
-+		else
-+			fprintf(stderr, "SIOCSIFHWADDR: %s\n",
-+				strerror(errno));
- 		goterr = 1;
- 	    }
- 	    spp++;
-@@ -681,12 +735,15 @@
- 			usage();
- 		    *cp = 0;
- 		} else {
--		    prefix_len = 0;
-+		    prefix_len = 128;
- 		}
- 		safe_strncpy(host, *spp, (sizeof host));
- 		if (inet6_aftype.input(1, host, 
- 				       (struct sockaddr *) &sa6) < 0) {
--		    inet6_aftype.herror(host);
-+		    if (inet6_aftype.herror)
-+		    	inet6_aftype.herror(host);
-+		    else
-+		    	fprintf(stderr, _("ifconfig: Error resolving '%s' for add\n"), host);
- 		    goterr = 1;
- 		    spp++;
- 		    continue;
-@@ -771,7 +828,7 @@
- 			usage();
- 		    *cp = 0;
- 		} else {
--		    prefix_len = 0;
-+		    prefix_len = 128;
- 		}
- 		safe_strncpy(host, *spp, (sizeof host));
- 		if (inet6_aftype.input(1, host, 
-@@ -800,6 +857,8 @@
- 		}
- 		ifr6.ifr6_ifindex = ifr.ifr_ifindex;
- 		ifr6.ifr6_prefixlen = prefix_len;
-+		if (opt_v)
-+			fprintf(stderr, "now deleting: ioctl(SIOCDIFADDR,{ifindex=%d,prefixlen=%ld})\n",ifr.ifr_ifindex,prefix_len);
- 		if (ioctl(fd, SIOCDIFADDR, &ifr6) < 0) {
- 		    fprintf(stderr, "SIOCDIFADDR: %s\n",
- 			    strerror(errno));
-@@ -859,7 +918,7 @@
- 		    usage();
- 		*cp = 0;
- 	    } else {
--		prefix_len = 0;
-+		prefix_len = 128;
- 	    }
- 	    safe_strncpy(host, *spp, (sizeof host));
- 	    if (inet6_aftype.input(1, host, (struct sockaddr *) &sa6) < 0) {
-@@ -903,7 +962,7 @@
- 	/* FIXME: sa is too small for INET6 addresses, inet6 should use that too, 
- 	   broadcast is unexpected */
- 	if (ap->getmask) {
--	    switch (ap->getmask(host, &sa, NULL)) {
-+	    switch (ap->getmask(host, &samask, NULL)) {
- 	    case -1:
- 		usage();
- 		break;
-@@ -911,8 +970,8 @@
- 		if (didnetmask)
- 		    usage();
- 
--		goterr = set_netmask(skfd, &ifr, &sa);
--		didnetmask++;
-+		// remeber to set the netmask from samask later
-+		neednetmask = 1;
- 		break;
- 	    }
- 	}
-@@ -921,9 +980,11 @@
- 	   exit(1);
- 	}
- 	if (ap->input(0, host, &sa) < 0) {
--	    ap->herror(host);
--	    fprintf(stderr, _("ifconfig: `--help' gives usage information.\n"));
--	    exit(1);
-+	    if (ap->herror)
-+	    	ap->herror(host);
-+	    else
-+	    	fprintf(stderr,_("ifconfig: error resolving '%s' to set address for af=%s\n"), host, ap->name); fprintf(stderr,
-+	    _("ifconfig: `--help' gives usage information.\n")); exit(1);
- 	}
- 	memcpy((char *) &ifr.ifr_addr, (char *) &sa, sizeof(struct sockaddr));
- 	{
-@@ -980,6 +1041,14 @@
- 	spp++;
-     }
- 
-+    if (neednetmask) {
-+	goterr |= set_netmask(skfd, &ifr, &samask);
-+	didnetmask++;
-+    }
-+
-+    if (opt_v && goterr)
-+    	fprintf(stderr, _("WARNING: at least one error occured. (%d)\n"), goterr);
-+
-     return (goterr);
- }
- 
---- net-tools-1.60.orig/netstat.c
-+++ net-tools-1.60/netstat.c
-@@ -6,7 +6,7 @@
-  *              NET-3 Networking Distribution for the LINUX operating
-  *              system.
-  *
-- * Version:     $Id: netstat.c,v 1.43 2001/04/15 14:41:17 pb Exp $
-+ * Version:     $Id: netstat.c,v 1.55 2007/12/01 19:00:40 ecki Exp $
-  *
-  * Authors:     Fred Baumgarten, <dc6iq@insu1.etec.uni-karlsruhe.de>
-  *              Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
-@@ -94,6 +94,7 @@
- #include "sockets.h"
- #include "interface.h"
- #include "util.h"
-+#include "proc.h"
- 
- #define PROGNAME_WIDTH 20
- 
-@@ -153,7 +154,7 @@
- FILE *procinfo;
- 
- #define INFO_GUTS1(file,name,proc)			\
--  procinfo = fopen((file), "r");			\
-+  procinfo = proc_fopen((file));			\
-   if (procinfo == NULL) {				\
-     if (errno != ENOENT) {				\
-       perror((file));					\
-@@ -174,7 +175,7 @@
- #if HAVE_AFINET6
- #define INFO_GUTS2(file,proc)				\
-   lnr = 0;						\
--  procinfo = fopen((file), "r");		       	\
-+  procinfo = proc_fopen((file));		       	\
-   if (procinfo != NULL) {				\
-     do {						\
-       if (fgets(buffer, sizeof(buffer), procinfo))	\
-@@ -216,7 +217,7 @@
- 
- static struct prg_node {
-     struct prg_node *next;
--    int inode;
-+    unsigned long inode;
-     char name[PROGNAME_WIDTH];
- } *prg_hash[PRG_HASH_SIZE];
- 
-@@ -249,7 +250,7 @@
- /* NOT working as of glibc-2.0.7: */
- #undef  DIRENT_HAVE_D_TYPE_WORKS
- 
--static void prg_cache_add(int inode, char *name)
-+static void prg_cache_add(unsigned long inode, char *name)
- {
-     unsigned hi = PRG_HASHIT(inode);
-     struct prg_node **pnp,*pn;
-@@ -272,7 +273,7 @@
-     strcpy(pn->name,name);
- }
- 
--static const char *prg_cache_get(int inode)
-+static const char *prg_cache_get(unsigned long inode)
- {
-     unsigned hi=PRG_HASHIT(inode);
-     struct prg_node *pn;
-@@ -295,16 +296,18 @@
-     prg_cache_loaded=0;
- }
- 
--static void extract_type_1_socket_inode(const char lname[], long * inode_p) {
-+static int extract_type_1_socket_inode(const char lname[], unsigned long * inode_p) {
- 
-     /* If lname is of the form "socket:[12345]", extract the "12345"
-        as *inode_p.  Otherwise, return -1 as *inode_p.
-        */
- 
--    if (strlen(lname) < PRG_SOCKET_PFXl+3) *inode_p = -1;
--    else if (memcmp(lname, PRG_SOCKET_PFX, PRG_SOCKET_PFXl)) *inode_p = -1;
--    else if (lname[strlen(lname)-1] != ']') *inode_p = -1;
--    else {
-+    if (strlen(lname) < PRG_SOCKET_PFXl+3) return(-1);
-+    
-+    if (memcmp(lname, PRG_SOCKET_PFX, PRG_SOCKET_PFXl)) return(-1);
-+    if (lname[strlen(lname)-1] != ']') return(-1);
-+
-+    {
-         char inode_str[strlen(lname + 1)];  /* e.g. "12345" */
-         const int inode_str_len = strlen(lname) - PRG_SOCKET_PFXl - 1;
-         char *serr;
-@@ -313,37 +316,41 @@
-         inode_str[inode_str_len] = '\0';
-         *inode_p = strtol(inode_str,&serr,0);
-         if (!serr || *serr || *inode_p < 0 || *inode_p >= INT_MAX) 
--            *inode_p = -1;
-+            return(-1);
-     }
-+    return(0);
- }
- 
- 
- 
--static void extract_type_2_socket_inode(const char lname[], long * inode_p) {
-+static int extract_type_2_socket_inode(const char lname[], unsigned long * inode_p) {
- 
-     /* If lname is of the form "[0000]:12345", extract the "12345"
-        as *inode_p.  Otherwise, return -1 as *inode_p.
-        */
- 
--    if (strlen(lname) < PRG_SOCKET_PFX2l+1) *inode_p = -1;
--    else if (memcmp(lname, PRG_SOCKET_PFX2, PRG_SOCKET_PFX2l)) *inode_p = -1;
--    else {
-+    if (strlen(lname) < PRG_SOCKET_PFX2l+1) return(-1);
-+    if (memcmp(lname, PRG_SOCKET_PFX2, PRG_SOCKET_PFX2l)) return(-1);
-+
-+    {
-         char *serr;
- 
-         *inode_p=strtol(lname + PRG_SOCKET_PFX2l,&serr,0);
-         if (!serr || *serr || *inode_p < 0 || *inode_p >= INT_MAX) 
--            *inode_p = -1;
-+            return(-1);
-     }
-+    return(0);
- }
- 
- 
- 
-+
- static void prg_cache_load(void)
- {
-     char line[LINE_MAX],eacces=0;
-     int procfdlen,fd,cmdllen,lnamelen;
-     char lname[30],cmdlbuf[512],finbuf[PROGNAME_WIDTH];
--    long inode;
-+    unsigned long inode;
-     const char *cs,*cmdlp;
-     DIR *dirproc=NULL,*dirfd=NULL;
-     struct dirent *direproc,*direfd;
-@@ -386,11 +393,9 @@
- 	    lnamelen=readlink(line,lname,sizeof(lname)-1);
-             lname[lnamelen] = '\0';  /*make it a null-terminated string*/
- 
--            extract_type_1_socket_inode(lname, &inode);
--
--            if (inode < 0) extract_type_2_socket_inode(lname, &inode);
--
--            if (inode < 0) continue;
-+            if (extract_type_1_socket_inode(lname, &inode) < 0)
-+              if (extract_type_2_socket_inode(lname, &inode) < 0)
-+                continue;
- 
- 	    if (!cmdlp) {
- 		if (procfdlen - PATH_FD_SUFFl + PATH_CMDLINEl >= 
-@@ -450,7 +455,7 @@
-     char buffer[256], dev[16];
-     int st, vs, vr, sendq, recvq, ret;
- 
--    f = fopen(_PATH_PROCNET_NR, "r");
-+    f = proc_fopen(_PATH_PROCNET_NR);
-     if (f == NULL) {
- 	if (errno != ENOENT) {
- 	    perror(_PATH_PROCNET_NR);
-@@ -527,15 +532,15 @@
- 
-     if (flag_exp > 1) {
- 	if (!(flag_not & FLAG_NUM_USER) && ((pw = getpwuid(uid)) != NULL))
--	    printf("%-10s ", pw->pw_name);
-+	    printf(" %-10s ", pw->pw_name);
- 	else
--	    printf("%-10d ", uid);
--	printf("%-10ld ",inode);
-+	    printf(" %-10d ", uid);
-+	printf("%-10lu ",inode);
-     }
-     if (flag_prg)
--	printf("%-" PROGNAME_WIDTHs "s",prg_cache_get(inode));
-+	printf(" %-16s",prg_cache_get(inode));
-     if (flag_opt)
--	printf("%s", timers);
-+	printf(" %s", timers);
-     putchar('\n');
- }
- 
-@@ -646,7 +651,7 @@
- #if HAVE_AFX25
- static int x25_info(void)
- {
--       FILE *f=fopen(_PATH_PROCNET_X25, "r");
-+       FILE *f=proc_fopen(_PATH_PROCNET_X25);
-        char buffer[256],dev[16];
-        int st,vs,vr,sendq,recvq,lci;
-        static char *x25_state[5]=
-@@ -657,7 +662,7 @@
-                "ESTABLISHED",
-                "RECOVERY"
-        };
--       if(!(f=fopen(_PATH_PROCNET_X25, "r")))
-+       if(!(f=proc_fopen(_PATH_PROCNET_X25)))
-        {
-                if (errno != ENOENT) {
-                        perror(_PATH_PROCNET_X25);
-@@ -705,6 +710,7 @@
-     unsigned long rxq, txq, time_len, retr, inode;
-     int num, local_port, rem_port, d, state, uid, timer_run, timeout;
-     char rem_addr[128], local_addr[128], timers[64], buffer[1024], more[512];
-+    char *protname;
-     struct aftype *ap;
- #if HAVE_AFINET6
-     struct sockaddr_in6 localaddr, remaddr;
-@@ -719,12 +725,13 @@
- 	return;
- 
-     num = sscanf(line,
--    "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %ld %512s\n",
-+    "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %512s\n",
- 		 &d, local_addr, &local_port, rem_addr, &rem_port, &state,
- 		 &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more);
- 
-     if (strlen(local_addr) > 8) {
- #if HAVE_AFINET6
-+	protname = "tcp6";
- 	/* Demangle what the kernel gives us */
- 	sscanf(local_addr, "%08X%08X%08X%08X",
- 	       &in6.s6_addr32[0], &in6.s6_addr32[1],
-@@ -740,6 +747,7 @@
- 	remaddr.sin6_family = AF_INET6;
- #endif
-     } else {
-+	protname = "tcp";
- 	sscanf(local_addr, "%X",
- 	       &((struct sockaddr_in *) &localaddr)->sin_addr.s_addr);
- 	sscanf(rem_addr, "%X",
-@@ -813,8 +821,8 @@
- 			 timer_run, (double) time_len / HZ, retr, timeout);
- 		break;
- 	    }
--	printf("tcp   %6ld %6ld %-23s %-23s %-12s",
--	       rxq, txq, local_addr, rem_addr, _(tcp_state[state]));
-+	printf("%-4s  %6ld %6ld %-*s %-*s %-11s",
-+	       protname, rxq, txq, netmax(23,strlen(local_addr)), local_addr, netmax(23,strlen(rem_addr)), rem_addr, _(tcp_state[state]));
- 
- 	finish_this_one(uid,inode,timers);
-     }
-@@ -831,6 +839,7 @@
-     char buffer[8192], local_addr[64], rem_addr[64];
-     char *udp_state, timers[64], more[512];
-     int num, local_port, rem_port, d, state, timer_run, uid, timeout;
-+    char *protname;
- #if HAVE_AFINET6
-     struct sockaddr_in6 localaddr, remaddr;
-     char addr6[INET6_ADDRSTRLEN];
-@@ -847,13 +856,14 @@
- 
-     more[0] = '\0';
-     num = sscanf(line,
--		 "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %ld %512s\n",
-+		 "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %512s\n",
- 		 &d, local_addr, &local_port,
- 		 rem_addr, &rem_port, &state,
- 	  &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more);
- 
-     if (strlen(local_addr) > 8) {
- #if HAVE_AFINET6
-+	protname="udp6";
- 	sscanf(local_addr, "%08X%08X%08X%08X",
- 	       &in6.s6_addr32[0], &in6.s6_addr32[1],
- 	       &in6.s6_addr32[2], &in6.s6_addr32[3]);
-@@ -868,6 +878,7 @@
- 	remaddr.sin6_family = AF_INET6;
- #endif
-     } else {
-+        protname="udp";
- 	sscanf(local_addr, "%X",
- 	       &((struct sockaddr_in *) &localaddr)->sin_addr.s_addr);
- 	sscanf(rem_addr, "%X",
-@@ -953,8 +964,8 @@
- 			 retr, timeout);
- 		break;
- 	    }
--	printf("udp   %6ld %6ld %-23s %-23s %-12s",
--	       rxq, txq, local_addr, rem_addr, udp_state);
-+	printf("%-4s  %6ld %6ld %-23s %-23s %-11s",
-+	       protname, rxq, txq, local_addr, rem_addr, udp_state);
- 
- 	finish_this_one(uid,inode,timers);
-     }
-@@ -971,6 +982,7 @@
-     char buffer[8192], local_addr[64], rem_addr[64];
-     char timers[64], more[512];
-     int num, local_port, rem_port, d, state, timer_run, uid, timeout;
-+    char *protname;
- #if HAVE_AFINET6
-     struct sockaddr_in6 localaddr, remaddr;
-     char addr6[INET6_ADDRSTRLEN];
-@@ -987,12 +999,13 @@
- 
-     more[0] = '\0';
-     num = sscanf(line,
--		 "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %ld %512s\n",
-+		 "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %512s\n",
- 		 &d, local_addr, &local_port, rem_addr, &rem_port, &state,
- 	  &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more);
- 
-     if (strlen(local_addr) > 8) {
- #if HAVE_AFINET6
-+	protname = "raw6";
- 	sscanf(local_addr, "%08X%08X%08X%08X",
- 	       &in6.s6_addr32[0], &in6.s6_addr32[1],
-            &in6.s6_addr32[2], &in6.s6_addr32[3]);
-@@ -1007,6 +1020,7 @@
- 	remaddr.sin6_family = AF_INET6;
- #endif
-     } else {
-+        protname = "raw";
- 	sscanf(local_addr, "%X",
- 	       &((struct sockaddr_in *) &localaddr)->sin_addr.s_addr);
- 	sscanf(rem_addr, "%X",
-@@ -1074,8 +1088,8 @@
- 			 retr, timeout);
- 		break;
- 	    }
--	printf("raw   %6ld %6ld %-23s %-23s %-12d",
--	       rxq, txq, local_addr, rem_addr, state);
-+	printf("%-4s  %6ld %6ld %-23s %-23s %-11d",
-+	       protname, rxq, txq, local_addr, rem_addr, state);
- 
- 	finish_this_one(uid,inode,timers);
-     }
-@@ -1099,9 +1113,9 @@
-     static int has = 0;
-     char path[MAXPATHLEN], ss_flags[32];
-     char *ss_proto, *ss_state, *ss_type;
--    int num, state, type, inode;
-+    int num, state, type;
-     void *d;
--    unsigned long refcnt, proto, flags;
-+    unsigned long refcnt, proto, flags, inode;
- 
-     if (nr == 0) {
- 	if (strstr(line, "Inode"))
-@@ -1109,14 +1123,14 @@
- 	return;
-     }
-     path[0] = '\0';
--    num = sscanf(line, "%p: %lX %lX %lX %X %X %d %s",
-+    num = sscanf(line, "%p: %lX %lX %lX %X %X %lu %s",
- 		 &d, &refcnt, &proto, &flags, &type, &state, &inode, path);
-     if (num < 6) {
- 	fprintf(stderr, _("warning, got bogus unix line.\n"));
- 	return;
-     }
-     if (!(has & HAS_INODE))
--	snprintf(path,sizeof(path),"%d",inode);
-+	snprintf(path,sizeof(path),"%lu",inode);
- 
-     if (!flag_all) {
-     	if ((state == SS_UNCONNECTED) && (flags & SO_ACCEPTCON)) {
-@@ -1208,9 +1222,9 @@
-     printf("%-5s %-6ld %-11s %-10s %-13s ",
- 	   ss_proto, refcnt, ss_flags, ss_type, ss_state);
-     if (has & HAS_INODE)
--	printf("%-6d ",inode);
-+	printf("%-8lu ",inode);
-     else
--	printf("-      ");
-+	printf("-        ");
-     if (flag_prg)
- 	printf("%-" PROGNAME_WIDTHs "s",(has & HAS_INODE?prg_cache_get(inode):"-"));
-     puts(path);
-@@ -1229,7 +1243,7 @@
- 	printf(_("(w/o servers)"));
-     }
- 
--    printf(_("\nProto RefCnt Flags       Type       State         I-Node"));
-+    printf(_("\nProto RefCnt Flags       Type       State         I-Node  "));
-     print_progname_banner();
-     printf(_(" Path\n"));	/* xxx */
- 
-@@ -1256,7 +1270,7 @@
- 	N_("ESTABLISHED"),
- 	N_("RECOVERY")
-     };
--    if (!(f = fopen(_PATH_PROCNET_AX25, "r"))) {
-+    if (!(f = proc_fopen(_PATH_PROCNET_AX25))) {
- 	if (errno != ENOENT) {
- 	    perror(_PATH_PROCNET_AX25);
- 	    return (-1);
-@@ -1350,18 +1364,37 @@
-     char sad[50], dad[50];
-     struct sockaddr sa;
-     unsigned sport = 0, dport = 0;
--
--    if (!(f = fopen(_PATH_PROCNET_IPX, "r"))) {
--	if (errno != ENOENT) {
--	    perror(_PATH_PROCNET_IPX);
--	    return (-1);
--	}
--	if (flag_arg || flag_ver)
--	    ESYSNOT("netstat", "AF IPX");
--	if (flag_arg)
--	    return (1);
--	else
--	    return (0);
-+    struct stat s;
-+    
-+    f = proc_fopen(_PATH_PROCNET_IPX_SOCKET1);
-+    if (!f) {
-+        if (errno != ENOENT) {
-+            perror(_PATH_PROCNET_IPX_SOCKET1);
-+            return (-1);
-+        }
-+        f = proc_fopen(_PATH_PROCNET_IPX_SOCKET2);
-+
-+        /* We need to check for directory */
-+        if (f) {
-+            fstat(fileno(f), &s);
-+            if (!S_ISREG(s.st_mode)) {
-+                fclose(f);
-+                f=NULL;
-+            }
-+        }
-+
-+        if (!f) {
-+            if (errno != ENOENT) {
-+	        perror(_PATH_PROCNET_IPX_SOCKET2);
-+	        return (-1);
-+	    }
-+	    if (flag_arg || flag_ver)
-+	        ESYSNOT("netstat", "AF IPX");
-+	    if (flag_arg)
-+	        return (1);
-+ 	    else
-+	        return (0);
-+        }
-     }
-     printf(_("Active IPX sockets\nProto Recv-Q Send-Q Local Address              Foreign Address            State"));	/* xxx */
-     if (flag_exp > 1)
-@@ -1381,7 +1414,7 @@
- 	    sscanf(st, "%X", &sport);	/* net byt order */
- 	    sport = ntohs(sport);
- 	} else {
--	    EINTERN("netstat.c", _PATH_PROCNET_IPX " sport format error");
-+	    EINTERN("netstat.c", "ipx socket format error in source port");
- 	    return (-1);
- 	}
- 	nc = 0;
-@@ -1391,7 +1424,7 @@
- 		sscanf(st, "%X", &dport);	/* net byt order */
- 		dport = ntohs(dport);
- 	    } else {
--		EINTERN("netstat.c", _PATH_PROCNET_IPX " dport format error");
-+		EINTERN("netstat.c", "ipx soket format error in destination port");
- 		return (-1);
- 	    }
- 	} else
-@@ -1449,7 +1482,7 @@
-     }
-     if (flag_exp < 2) {
- 	ife_short = 1;
--	printf(_("Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
-+	printf(_("Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
-     }
- 
-     if (for_all_interfaces(do_if_print, &flag_all) < 0) {
-@@ -1457,7 +1490,7 @@
- 	exit(1);
-     }
-     if (flag_cnt)
--	free_interface_list();
-+	if_cache_free();
-     else {
- 	close(skfd);
- 	skfd = -1;
-@@ -1503,7 +1536,7 @@
-     fprintf(stderr, _("        -C, --cache              display routing cache instead of FIB\n\n"));
- 
-     fprintf(stderr, _("  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --netrom\n"));
--    fprintf(stderr, _("  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"), DFLT_AF);
-+    fprintf(stderr, _("  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"), DFLT_AF);
-     fprintf(stderr, _("  List of possible address families (which support routing):\n"));
-     print_aflist(1); /* 1 = routeable */
-     exit(E_USAGE);
-@@ -1514,7 +1547,7 @@
-  (int argc, char *argv[]) {
-     int i;
-     int lop;
--    struct option longopts[] =
-+    static struct option longopts[] =
-     {
- 	AFTRANS_OPTS,
- 	{"version", 0, 0, 'V'},
-@@ -1556,7 +1589,7 @@
-     getroute_init();		/* Set up AF routing support */
- 
-     afname[0] = '\0';
--    while ((i = getopt_long(argc, argv, "MCFA:acdegphinNorstuVv?wxl", longopts, &lop)) != EOF)
-+    while ((i = getopt_long(argc, argv, "MCFA:acdegphinNorstuVv?wxl64", longopts, &lop)) != EOF)
- 	switch (i) {
- 	case -1:
- 	    break;
-@@ -1624,6 +1657,14 @@
- 	case 'o':
- 	    flag_opt++;
- 	    break;
-+	case '6':
-+	    if (aftrans_opt("inet6"))
-+		exit(1);
-+	    break;
-+	case '4':
-+	    if (aftrans_opt("inet"))
-+		exit(1);
-+	    break;
- 	case 'V':
- 	    version();
- 	    /*NOTREACHED */
-@@ -1741,10 +1782,11 @@
- 	    }
- 	    printf(_("\nProto Recv-Q Send-Q Local Address           Foreign Address         State      "));	/* xxx */
- 	    if (flag_exp > 1)
--		printf(_(" User       Inode     "));
--	    print_progname_banner();
-+		printf(_(" User       Inode      "));
-+            if (flag_prg)
-+                printf(_(" PID/Program name"));
- 	    if (flag_opt)
--		printf(_(" Timer"));	/* xxx */
-+		printf(_(" Timer"));
- 	    printf("\n");
- #else
- 	    if (flag_arg) {
-@@ -1845,6 +1887,7 @@
- 	    }
- #endif
- 	}
-+	            
- 	if (!flag_cnt || i)
- 	    break;
- 	sleep(1);
---- net-tools-1.60.orig/route.c
-+++ net-tools-1.60/route.c
-@@ -2,7 +2,7 @@
-  * route        This file contains an implementation of the command
-  *              that manages the IP routing table in the kernel.
-  *
-- * Version:     $Id: route.c,v 1.9 2001/04/15 14:41:17 pb Exp $
-+ * Version:     $Id: route.c,v 1.10 2002/07/30 05:24:20 ecki Exp $
-  *
-  * Maintainer:  Bernd 'eckes' Eckenfels, <net-tools@lina.inka.de>
-  *
-@@ -142,7 +142,7 @@
-     }
- 
-     /* Fetch the command-line arguments. */
--    while ((i = getopt_long(argc, argv, "A:eCFhnNVv?", longopts, &lop)) != EOF)
-+    while ((i = getopt_long(argc, argv, "A:eCFhnN64Vv?", longopts, &lop)) != EOF)
- 	switch (i) {
- 	case -1:
- 	    break;
-@@ -176,6 +176,14 @@
- 	    if ((i = aftrans_opt(optarg)))
- 		exit(i);
- 	    break;
-+	case '6':
-+	    if ((i = aftrans_opt("inet6")))
-+		exit(i);
-+	    break;
-+	case '4':
-+	    if ((i = aftrans_opt("inet")))
-+		exit(i);
-+	    break;
- 	case 'V':
- 	    version();
- 	case 'h':
---- net-tools-1.60.orig/statistics.c
-+++ net-tools-1.60/statistics.c
-@@ -1,6 +1,6 @@
- /*
-  * Copyright 1997,1999,2000 Andi Kleen. Subject to the GPL. 
-- * $Id: statistics.c,v 1.14 2001/02/02 18:01:23 pb Exp $
-+ * $Id: statistics.c,v 1.20 2007/12/01 18:44:56 ecki Exp $
-  * 19980630 - i18n - Arnaldo Carvalho de Melo <acme@conectiva.com.br> 
-  * 19981113 - i18n fixes - Arnaldo Carvalho de Melo <acme@conectiva.com.br> 
-  * 19990101 - added net/netstat, -t, -u, -w supprt - Bernd Eckenfels 
-@@ -11,6 +11,7 @@
- #include <string.h>
- #include "config.h"
- #include "intl.h"
-+#include "proc.h"
- 
- /* #define WARN 1 */
- 
-@@ -172,19 +173,59 @@
-     { "DelayedACKLost", N_("Quick ack mode was activated %u times"), opt_number },
-     { "ListenOverflows", N_("%u times the listen queue of a socket overflowed"),
-       opt_number },
--    { "ListenDrops", N_("%u SYNs to LISTEN sockets ignored"), opt_number },
-+    { "ListenDrops", N_("%u SYNs to LISTEN sockets dropped"), opt_number },
-     { "TCPPrequeued", N_("%u packets directly queued to recvmsg prequeue."), 
-       opt_number },
--    { "TCPDirectCopyFromBacklog", N_("%u packets directly received"
--				     " from backlog"), opt_number },
--    { "TCPDirectCopyFromPrequeue", N_("%u packets directly received"
--				      " from prequeue"), opt_number },
-+    { "TCPDirectCopyFromBacklog", N_("%u bytes directly in process context from backlog"), opt_number },
-+    { "TCPDirectCopyFromPrequeue", N_("%u bytes directly received in process context from prequeue"),
-+				      opt_number },
-     { "TCPPrequeueDropped", N_("%u packets dropped from prequeue"), opt_number },
--    { "TCPHPHits", N_("%u packets header predicted"), number },
-+    { "TCPHPHits", N_("%u packet headers predicted"), number },
-     { "TCPHPHitsToUser", N_("%u packets header predicted and "
- 			    "directly queued to user"), opt_number },
-     { "SockMallocOOM", N_("Ran %u times out of system memory during " 
- 			  "packet sending"), opt_number }, 
-+    { "TCPPureAcks", N_("%u acknowledgments not containing data payload received"), opt_number },
-+    { "TCPHPAcks", N_("%u predicted acknowledgments"), opt_number },
-+    { "TCPRenoRecovery", N_("%u times recovered from packet loss due to fast retransmit"), opt_number },
-+    { "TCPSackRecovery", N_("%u times recovered from packet loss by selective acknowledgements"), opt_number },
-+    { "TCPSACKReneging", N_("%u bad SACK blocks received"), opt_number },
-+    { "TCPFACKReorder", N_("Detected reordering %u times using FACK"), opt_number },
-+    { "TCPSACKReorder", N_("Detected reordering %u times using SACK"), opt_number },
-+    { "TCPTSReorder", N_("Detected reordering %u times using time stamp"), opt_number },
-+    { "TCPRenoReorder", N_("Detected reordering %u times using reno fast retransmit"), opt_number },
-+    { "TCPFullUndo", N_("%u congestion windows fully recovered without slow start"), opt_number }, 
-+    { "TCPPartialUndo", N_("%u congestion windows partially recovered using Hoe heuristic"), opt_number },
-+    { "TCPDSackUndo", N_("%u congestion window recovered without slow start using DSACK"), opt_number },
-+    { "TCPLossUndo", N_("%u congestion windows recovered without slow start after partial ack"), opt_number },
-+    { "TCPLostRetransmits", N_("%u retransmits lost"), opt_number },
-+    { "TCPRenoFailures",  N_("%u timeouts after reno fast retransmit"), opt_number },
-+    { "TCPSackFailures",  N_("%u timeouts after SACK recovery"), opt_number },
-+    { "TCPLossFailures",  N_("%u timeouts in loss state"), opt_number },
-+    { "TCPFastRetrans", N_("%u fast retransmits"), opt_number },
-+    { "TCPForwardRetrans", N_("%u forward retransmits"), opt_number }, 
-+    { "TCPSlowStartRetrans", N_("%u retransmits in slow start"), opt_number },
-+    { "TCPTimeouts", N_("%u other TCP timeouts"), opt_number },
-+    { "TCPRenoRecoveryFailed", N_("%u reno fast retransmits failed"), opt_number },
-+    { "TCPSackRecoveryFail", N_("%u SACK retransmits failed"), opt_number },
-+    { "TCPSchedulerFailed", N_("%u times receiver scheduled too late for direct processing"), opt_number },
-+    { "TCPRcvCollapsed", N_("%u packets collapsed in receive queue due to low socket buffer"), opt_number },
-+    { "TCPDSACKOldSent", N_("%u DSACKs sent for old packets"), opt_number },
-+    { "TCPDSACKOfoSent", N_("%u DSACKs sent for out of order packets"), opt_number },
-+    { "TCPDSACKRecv", N_("%u DSACKs received"), opt_number },
-+    { "TCPDSACKOfoRecv", N_("%u DSACKs for out of order packets received"), opt_number },
-+    { "TCPAbortOnSyn", N_("%u connections reset due to unexpected SYN"), opt_number },
-+    { "TCPAbortOnData", N_("%u connections reset due to unexpected data"), opt_number },
-+    { "TCPAbortOnClose", N_("%u connections reset due to early user close"), opt_number },
-+    { "TCPAbortOnMemory", N_("%u connections aborted due to memory pressure"), opt_number },
-+    { "TCPAbortOnTimeout", N_("%u connections aborted due to timeout"), opt_number },
-+    { "TCPAbortOnLinger", N_("%u connections aborted after user close in linger timeout"), opt_number },
-+    { "TCPAbortFailed", N_("%u times unabled to send RST due to no memory"), opt_number }, 
-+    { "TCPMemoryPressures", N_("TCP ran low on memory %u times"), opt_number }, 
-+    { "TCPLoss", N_("%u TCP data loss events"), opt_number },
-+    { "TCPDSACKUndo", N_("%u congestion windows recovered without slow start by DSACK"), 
-+	opt_number },
-+    { "TCPRenoRecoveryFail", N_("%u classic Reno fast retransmits failed"), opt_number },
- };
- 
- struct tabtab {
-@@ -222,7 +263,8 @@
- 	    ent = bsearch(&key, tab->tab, tab->size / sizeof(struct entry),
- 			  sizeof(struct entry), cmpentries);
-     if (!ent) {			/* try our best */
--	printf("%*s%s: %d\n", states[state].indent, "", title, val);
-+	if (val) 
-+		printf("%*s%s: %d\n", states[state].indent, "", title, val);
- 	return;
-     }
-     type = ent->type;
-@@ -289,14 +331,17 @@
- 	return &dummytab;
- }
- 
--void process_fd(FILE *f)
-+int process_fd(FILE *f)
- {
--    char buf1[1024], buf2[1024];
-+    char buf1[2048], buf2[2048];
-     char *sp, *np, *p;
-     while (fgets(buf1, sizeof buf1, f)) {
- 	int endflag;
- 	struct tabtab *tab;
- 
-+        if (buf1[0] == '\n') // skip empty first line in 2.6 kernels
-+            continue;
-+            
- 	if (!fgets(buf2, sizeof buf2, f))
- 	    break;
- 	sp = strchr(buf1, ':');
-@@ -330,11 +375,10 @@
- 	    sp = p + 1;
- 	}
-     }
--  return;
-+  return 0;
-   
- formaterr:
--  perror(_("error parsing /proc/net/snmp"));
--  return;
-+  return -1;
- }
- 
- 
-@@ -344,22 +388,25 @@
- 
-     f_raw = flag_raw; f_tcp = flag_tcp; f_udp = flag_udp;
-     
--    f = fopen("/proc/net/snmp", "r");
-+    f = proc_fopen("/proc/net/snmp");
-     if (!f) {
- 	perror(_("cannot open /proc/net/snmp"));
- 	return;
-     }
--    process_fd(f);
-+
-+    if (process_fd(f) < 0)
-+      fprintf(stderr, _("Problem while parsing /proc/net/snmp\n"));
- 
-     if (ferror(f))
- 	perror("/proc/net/snmp");
- 
-     fclose(f);
- 
--    f = fopen("/proc/net/netstat", "r");
-+    f = proc_fopen("/proc/net/netstat");
- 
-     if (f) {
--    	process_fd(f);
-+    	if (process_fd(f) <0)
-+          fprintf(stderr, _("Problem while parsing /proc/net/netstat\n"));
- 
-         if (ferror(f))
- 	    perror("/proc/net/netstat");
---- net-tools-1.60.orig/nameif.c
-+++ net-tools-1.60/nameif.c
-@@ -3,7 +3,7 @@
-  * Writen 2000 by Andi Kleen.
-  * Subject to the Gnu Public License, version 2.  
-  * TODO: make it support token ring etc.
-- * $Id: nameif.c,v 1.1 2000/10/18 17:26:29 ak Exp $
-+ * $Id: nameif.c,v 1.4 2003/09/11 03:46:49 ak Exp $
-  */ 
- #ifndef _GNU_SOURCE 
- #define _GNU_SOURCE
-@@ -117,7 +117,8 @@
- }
- 
- struct change { 
--	struct change *next,**pprev;
-+	struct change *next;
-+	int found;
- 	char ifname[IFNAMSIZ+1];
- 	unsigned char mac[6];
- }; 
-@@ -139,10 +140,7 @@
- 			ch->ifname, pos); 
- 	if (parsemac(p,ch->mac) < 0) 
- 		complain(_("cannot parse MAC `%s' at %s"), p, pos); 
--	if (clist) 
--		clist->pprev = &ch->next;
- 	ch->next = clist;
--	ch->pprev = &clist;
- 	clist = ch;
- 	return 0; 
- }
-@@ -177,7 +175,7 @@
- 		if (*p == '\0')
- 			continue; 
- 		n = strcspn(p, " \t"); 
--		if (n > IFNAMSIZ) 
-+		if (n > IFNAMSIZ-1) 
- 			complain(_("interface name too long at line %d"), line);  
- 		memcpy(ch->ifname, p, n); 
- 		ch->ifname[n] = 0; 
-@@ -200,7 +198,7 @@
- 
- void usage(void)
- {
--	fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}")); 
-+	fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}\n")); 
- 	exit(1); 
- }
- 
-@@ -277,21 +275,21 @@
- 		ch = lookupmac(mac); 
- 		if (!ch) 
- 			continue;
--			
--		*ch->pprev = ch->next;
-+		
-+		ch->found = 1;	
- 		if (strcmp(p, ch->ifname)) { 
- 			if (setname(p, ch->ifname) < 0)  
- 				complain(_("cannot change name of %s to %s: %s"),
- 						p, ch->ifname, strerror(errno)); 
- 		} 
--		free(ch);
- 	} 
- 	fclose(ifh); 
- 	
- 	while (clist) { 
- 		struct change *ch = clist;
- 		clist = clist->next;
--		warning(_("interface '%s' not found"), ch->ifname); 
-+		if (!ch->found)
-+			warning(_("interface '%s' not found"), ch->ifname); 
- 		free(ch); 
- 	}
- 
---- net-tools-1.60.orig/mii-tool.c
-+++ net-tools-1.60/mii-tool.c
-@@ -29,8 +29,7 @@
- 	http://www.national.com/pf/DP/DP83840.html
- */
- 
--static char version[] =
--"mii-tool.c 1.9 2000/04/28 00:56:08 (David Hinds)\n";
-+static char Version[] = "$Id: mii-tool.c,v 1.9 2006/09/27 20:59:18 ecki Exp $\n(Author: David Hinds based on Donald Becker's mii-diag)";
- 
- #include <unistd.h>
- #include <stdlib.h>
-@@ -46,16 +45,19 @@
- #include <sys/socket.h>
- #include <sys/ioctl.h>
- #include <net/if.h>
-+#include <linux/sockios.h>
-+
- #ifndef __GLIBC__
- #include <linux/if_arp.h>
- #include <linux/if_ether.h>
- #endif
- #include "mii.h"
-+#include "version.h"
- 
- #define MAX_ETH		8		/* Maximum # of interfaces */
- 
- /* Table of known MII's */
--static struct {
-+static const struct {
-     u_short	id1, id2;
-     char	*name;
- } mii_id[] = {
-@@ -74,6 +76,9 @@
-     { 0x0181, 0x4410, "Quality QS6612" },
-     { 0x0282, 0x1c50, "SMSC 83C180" },
-     { 0x0300, 0xe540, "TDK 78Q2120" },
-+    { 0x0141, 0x0c20, "Yukon 88E1011" },
-+    { 0x0141, 0x0cc0, "Yukon-EC 88E1111" },
-+    { 0x0141, 0x0c90, "Yukon-2 88E1112" },
- };
- #define NMII (sizeof(mii_id)/sizeof(mii_id[0]))
- 
-@@ -137,40 +142,48 @@
- 
- const struct {
-     char	*name;
--    u_short	value;
-+    u_short	value[2];
- } media[] = {
-     /* The order through 100baseT4 matches bits in the BMSR */
--    { "10baseT-HD",	MII_AN_10BASET_HD },
--    { "10baseT-FD",	MII_AN_10BASET_FD },
--    { "100baseTx-HD",	MII_AN_100BASETX_HD },
--    { "100baseTx-FD",	MII_AN_100BASETX_FD },
--    { "100baseT4",	MII_AN_100BASET4 },
--    { "100baseTx",	MII_AN_100BASETX_FD | MII_AN_100BASETX_HD },
--    { "10baseT",	MII_AN_10BASET_FD | MII_AN_10BASET_HD },
-+    { "10baseT-HD",	{MII_AN_10BASET_HD} },
-+    { "10baseT-FD",	{MII_AN_10BASET_FD} },
-+    { "100baseTx-HD",	{MII_AN_100BASETX_HD} },
-+    { "100baseTx-FD",	{MII_AN_100BASETX_FD} },
-+    { "100baseT4",	{MII_AN_100BASET4} },
-+    { "100baseTx",	{MII_AN_100BASETX_FD | MII_AN_100BASETX_HD} },
-+    { "10baseT",	{MII_AN_10BASET_FD | MII_AN_10BASET_HD} },
-+
-+    { "1000baseT-HD",	{0, MII_BMCR2_1000HALF} },
-+    { "1000baseT-FD",	{0, MII_BMCR2_1000FULL} },
-+    { "1000baseT",	{0, MII_BMCR2_1000HALF|MII_BMCR2_1000FULL} },
- };
- #define NMEDIA (sizeof(media)/sizeof(media[0]))
- 	
- /* Parse an argument list of media types */
--static int parse_media(char *arg)
-+static int parse_media(char *arg, unsigned *bmcr2)
- {
-     int mask, i;
-     char *s;
-     mask = strtoul(arg, &s, 16);
-     if ((*arg != '\0') && (*s == '\0')) {
- 	if ((mask & MII_AN_ABILITY_MASK) &&
--	    !(mask & ~MII_AN_ABILITY_MASK))
--	    return mask;
-+	    !(mask & ~MII_AN_ABILITY_MASK)) {
-+		*bmcr2 = 0;
-+		return mask;
-+	}
- 	goto failed;
--    } else {
--	mask = 0;
--	s = strtok(arg, ", ");
--	do {
-+    }
-+    mask = 0;
-+    *bmcr2 = 0;
-+    s = strtok(arg, ", ");
-+    do {
- 	    for (i = 0; i < NMEDIA; i++)
--		if (strcasecmp(media[i].name, s) == 0) break;
-+		if (s && strcasecmp(media[i].name, s) == 0) break;
- 	    if (i == NMEDIA) goto failed;
--	    mask |= media[i].value;
--	} while ((s = strtok(NULL, ", ")) != NULL);
--    }
-+	    mask |= media[i].value[0];
-+	    *bmcr2 |= media[i].value[1];
-+    } while ((s = strtok(NULL, ", ")) != NULL);
-+
-     return mask;
- failed:
-     fprintf(stderr, "Invalid media specification '%s'.\n", arg);
-@@ -179,11 +192,24 @@
- 
- /*--------------------------------------------------------------------*/
- 
--static char *media_list(int mask, int best)
-+static const char *media_list(unsigned mask, unsigned mask2, int best)
- {
-     static char buf[100];
-     int i;
-     *buf = '\0';
-+
-+    if (mask & MII_BMCR_SPEED1000) {
-+	if (mask2 & MII_BMCR2_1000HALF) {
-+	    strcat(buf, " ");
-+	    strcat(buf, "1000baseT-HD");
-+	    if (best) goto out;
-+	}
-+	if (mask2 & MII_BMCR2_1000FULL) {
-+	    strcat(buf, " ");
-+	    strcat(buf, "1000baseT-FD");
-+	    if (best) goto out;
-+	}
-+    }
-     mask >>= 5;
-     for (i = 4; i >= 0; i--) {
- 	if (mask & (1<<i)) {
-@@ -192,6 +218,7 @@
- 	    if (best) break;
- 	}
-     }
-+ out:
-     if (mask & (1<<5))
- 	strcat(buf, " flow-control");
-     return buf;
-@@ -201,15 +228,15 @@
- {
-     char buf[100];
-     int i, mii_val[32];
--    int bmcr, bmsr, advert, lkpar;
-+    unsigned bmcr, bmsr, advert, lkpar, bmcr2, lpa2;
- 
-     /* Some bits in the BMSR are latched, but we can't rely on being
-        the only reader, so only the current values are meaningful */
-     mdio_read(sock, MII_BMSR);
--    for (i = 0; i < ((verbose > 1) ? 32 : 8); i++)
-+    for (i = 0; i < ((verbose > 1) ? 32 : MII_BASIC_MAX); i++)
- 	mii_val[i] = mdio_read(sock, i);
- 
--    if (mii_val[MII_BMCR] == 0xffff) {
-+    if (mii_val[MII_BMCR] == 0xffff  || mii_val[MII_BMSR] == 0x0000) {
- 	fprintf(stderr, "  No MII transceiver present!.\n");
- 	return -1;
-     }
-@@ -217,6 +244,7 @@
-     /* Descriptive rename. */
-     bmcr = mii_val[MII_BMCR]; bmsr = mii_val[MII_BMSR];
-     advert = mii_val[MII_ANAR]; lkpar = mii_val[MII_ANLPAR];
-+    bmcr2 = mii_val[MII_CTRL1000]; lpa2 = mii_val[MII_STAT1000];
- 
-     sprintf(buf, "%s: ", ifr.ifr_name);
-     if (bmcr & MII_BMCR_AN_ENA) {
-@@ -224,7 +252,7 @@
- 	    if (advert & lkpar) {
- 		strcat(buf, (lkpar & MII_AN_ACK) ?
- 		       "negotiated" : "no autonegotiation,");
--		strcat(buf, media_list(advert & lkpar, 1));
-+		strcat(buf, media_list(advert & lkpar, bmcr2 & lpa2>>2, 1));
- 		strcat(buf, ", ");
- 	    } else {
- 		strcat(buf, "autonegotiation failed, ");
-@@ -234,8 +262,10 @@
- 	}
-     } else {
- 	sprintf(buf+strlen(buf), "%s Mbit, %s duplex, ",
--	       (bmcr & MII_BMCR_100MBIT) ? "100" : "10",
--	       (bmcr & MII_BMCR_DUPLEX) ? "full" : "half");
-+		((bmcr2 & (MII_BMCR2_1000HALF | MII_BMCR2_1000FULL)) & lpa2 >> 2)
-+		? "1000"
-+		: (bmcr & MII_BMCR_100MBIT) ? "100" : "10",
-+		(bmcr & MII_BMCR_DUPLEX) ? "full" : "half");
-     }
-     strcat(buf, (bmsr & MII_BMSR_LINK_VALID) ? "link ok" : "no link");
- 
-@@ -296,12 +326,13 @@
- 	if (bmsr & MII_BMSR_REMOTE_FAULT)
- 	    printf("remote fault, ");
- 	printf((bmsr & MII_BMSR_LINK_VALID) ? "link ok" : "no link");
--	printf("\n  capabilities:%s", media_list(bmsr >> 6, 0));
--	printf("\n  advertising: %s", media_list(advert, 0));
-+	printf("\n  capabilities:%s", media_list(bmsr >> 6, bmcr2, 0));
-+	printf("\n  advertising: %s", media_list(advert, lpa2 >> 2, 0));
- 	if (lkpar & MII_AN_ABILITY_MASK)
--	    printf("\n  link partner:%s", media_list(lkpar, 0));
-+	    printf("\n  link partner:%s", media_list(lkpar, bmcr2, 0));
- 	printf("\n");
-     }
-+    fflush(stdout);
-     return 0;
- }
- 
-@@ -329,7 +360,7 @@
- 	printf("resetting the transceiver...\n");
- 	mdio_write(skfd, MII_BMCR, MII_BMCR_RESET);
-     }
--    if (nway_advertise) {
-+    if (nway_advertise > 0) {
- 	mdio_write(skfd, MII_ANAR, nway_advertise | 1);
- 	opt_restart = 1;
-     }
-@@ -379,27 +410,38 @@
- /*--------------------------------------------------------------------*/
- 
- const char *usage =
--"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]
--       -V, --version               display version information
--       -v, --verbose               more verbose output
--       -R, --reset                 reset MII to poweron state
--       -r, --restart               restart autonegotiation
--       -w, --watch                 monitor for link status changes
--       -l, --log                   with -w, write events to syslog
--       -A, --advertise=media,...   advertise only specified media
--       -F, --force=media           force specified media technology
--media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,
--       (to advertise both HD and FD) 100baseTx, 10baseT\n";
-+"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]\n"
-+"       -V, --version               display version information\n"
-+"       -v, --verbose               more verbose output\n"
-+"       -R, --reset                 reset MII to poweron state\n"
-+"       -r, --restart               restart autonegotiation\n"
-+"       -w, --watch                 monitor for link status changes\n"
-+"       -l, --log                   with -w, write events to syslog\n"
-+"       -A, --advertise=media,...   advertise only specified media\n"
-+"       -F, --force=media           force specified media technology\n"
-+"media: 1000baseTx-HD, 1000baseTx-FD,\n"
-+"       100baseT4, 100baseTx-FD, 100baseTx-HD,\n"
-+"       10baseT-FD, 10baseT-HD,\n"
-+"       (to advertise both HD and FD) 1000baseTx, 100baseTx, 10baseT\n";
-+
-+
-+static void version(void)
-+{
-+    fprintf(stderr, "%s\n%s\n", Version, RELEASE);
-+    exit(5); /* E_VERSION */
-+}
-+
- 
- int main(int argc, char **argv)
- {
-     int i, c, ret, errflag = 0;
-     char s[6];
-+    unsigned ctrl1000 = 0;
-     
-     while ((c = getopt_long(argc, argv, "A:F:p:lrRvVw?", longopts, 0)) != EOF)
- 	switch (c) {
--	case 'A': nway_advertise = parse_media(optarg); break;
--	case 'F': fixed_speed = parse_media(optarg); break;
-+	case 'A': nway_advertise = parse_media(optarg, &ctrl1000); break;
-+	case 'F': fixed_speed = parse_media(optarg, &ctrl1000); break;
- 	case 'p': override_phy = atoi(optarg); break;
- 	case 'r': opt_restart++;	break;
- 	case 'R': opt_reset++;		break;
-@@ -411,6 +453,10 @@
- 	}
-     /* Check for a few inappropriate option combinations */
-     if (opt_watch) verbose = 0;
-+
-+    if ((nway_advertise < 0) || (fixed_speed < 0))
-+    	return 2;
-+
-     if (errflag || (fixed_speed & (fixed_speed-1)) ||
- 	(fixed_speed && (opt_restart || nway_advertise))) {
- 	fprintf(stderr, usage, argv[0]);
-@@ -418,7 +464,7 @@
-     }
- 
-     if (opt_version)
--	printf(version);
-+	version();
- 
-     /* Open a basic socket. */
-     if ((skfd = socket(AF_INET, SOCK_DGRAM,0)) < 0) {
-@@ -426,6 +472,9 @@
- 	exit(-1);
-     }
- 
-+    if (verbose > 1)
-+    	printf("Using SIOCGMIIPHY=0x%x\n", SIOCGMIIPHY);	
-+
-     /* No remaining args means show all interfaces. */
-     if (optind == argc) {
- 	ret = 1;
---- net-tools-1.60.orig/debian/changelog
-+++ net-tools-1.60/debian/changelog
-@@ -0,0 +1,277 @@
-+net-tools (1.60-19) unstable; urgency=low
-+
-+  * fixed netstat(8) (interfaceS) reported by Liu Xing. (Closes Bug #435690)
-+  * fixed interface name truncation (Closes Bug #405521)
-+    Thank you Csaba Szep.
-+  * fixed pt error string (Closes: Bug#403033)
-+  * fixed route samples (Closes: Bug#400844, #368697) Thanks Danny Rathjens.
-+  * fixed ifconfig(8) see also section (Closes: Bug#365916) Dan Jacobs.
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Sun, 02 Dec 2007 06:27:41 +0100
-+
-+net-tools (1.60-18) unstable; urgency=low
-+
-+  * Thanks for the l10n NMU to Kenshi Muto
-+  * fixed hostname compile problems
-+  * better error handling and speedup for proc file reading
-+  * improved mii-tool (more media types)
-+  * fixed string length contraint in ipmaddr
-+  * fixed ipx /proc/net (alternate naming)
-+  * smaller fixed to netstat(8) (de) 2002-02-20 - still incomplete
-+  * expanded arp(8) (en) 2007-12-01
-+  * added -4 and -6 to netstat(8) 02 October 2003
-+  * formatting fixed rarp(8)+slattach(8)  [en]
-+  * formatting fixed arp(8), rarp(8), ifconfig(8), hostname(1) [fr]
-+  * fixed slattach -L to not require HW handshake anymore
-+  * netstat -n: show v4inv6 mapped addressses as v4
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Sun, 02 Dec 2007 03:28:17 +0100
-+
-+net-tools (1.60-17.2) unstable; urgency=low
-+
-+  * l10n NMU
-+  * Set conflict against ja-trans which has obsolete Japanese
-+    translations only for net-tools. (closes: #447327)
-+
-+ -- Kenshi Muto <kmuto@debian.org>  Sat, 20 Oct 2007 18:00:34 +0900
-+
-+net-tools (1.60-17.1) unstable; urgency=low
-+
-+  * l10n NMU
-+  * Updated net-tools.pot.
-+  * Updated Japanese translation (closes: Bug#432338)
-+  * Updated German translation (closes: #313808)
-+
-+ -- Kenshi Muto <kmuto@debian.org>  Thu, 11 Oct 2007 19:44:26 +0900
-+
-+net-tools (1.60-17) unstable; urgency=medium
-+
-+  * arp.c: bus error on sparc64 with latest gcc fixed. (Closes: Bug#340384)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Sun, 04 Dec 2005 05:47:05 +0100
-+
-+net-tools (1.60-16) unstable; urgency=low
-+
-+  * spelling fix to slattach(8) (Closes: Bug#326124 (patch by A.Costa)
-+  * inet.c: portability fix for 64bit.
-+  * comment cleanups to aliagn with 1.65 cvs
-+    * net-support.h, inet_sr.c, nstrcmp.c, arp.c, ether.h
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Mon, 24 Oct 2005 22:05:38 +0200
-+
-+net-tools (1.60-15) unstable; urgency=low
-+
-+  * minor formating fix to ifconfig(8)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Thu, 30 Jun 2005 21:49:52 +0200
-+
-+net-tools (1.60-14) unstable; urgency=low
-+
-+  * added iptables(8) in ifconfig(8) (thanks Toralf Förster)
-+  * more usage updates in ifconfig.8 (used upstream HEAD=1.11)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Thu, 30 Jun 2005 20:51:18 +0200
-+
-+net-tools (1.60-13) unstable; urgency=low  Thu, 30 Jun 2005 20:49:57 +0200
-+
-+  * X25 code compiles with 2.4 and 2.6 kernel headers (Closes: Bug#271678)
-+  * IMPORTANT: make ifconfig show alias interfaces in 2.6 again. 
-+  * resort media type array to match kernel (Closes: Bug#199920)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Tue, 17 May 2005 01:28:51 +0200
-+
-+net-tools (1.60-12) unstable; urgency=low
-+
-+  * make TR hw address type work for new kernel (Closes: Bug #79462, #203400)
-+  * update-po uses msgmerge, new net-tools.pot (Closes: Bug: 271426)
-+  * de-support dontpub option in arp -? und arp.8 (Closes: Bug #203396)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Mon, 16 May 2005 06:33:48 +0200
-+
-+net-tools (1.60-11) unstable; urgency=low
-+
-+  * spelling fixes (Closes: Bug #305640, #305638, 305637)
-+  * nameif.c avoid overflow by malicious kernel
-+  * avoid overflow of the TX-OK Column (Closes: Bug #308922)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Sat, 14 May 2005 01:48:45 +0200
-+
-+net-tools (1.60-10) unstable; urgency=low
-+
-+  * typo fix in po/de.po for german arp command output (Closes: Bug #176151)
-+  * added diagnostics messages to mii-tool.8 (Closes: Bug #239229)
-+  * new version of nstrcmp (Closes: Bug #226503)
-+  * enable EUI64 support
-+  * stadanrds version 3.6.1 (no changes)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Fri, 23 Apr 2004 00:57:20 +0200
-+
-+net-tools (1.60-9) unstable; urgency=medium
-+
-+  * debian/changelog: fixed in last entry fixed bug from 197925 to 197924
-+  * include linux/sockios.h for SIOCGMIIPHY definition (new style)
-+    which will fix MII reporting on 2.4 kernels. (Closes: Bug #133648)
-+    NOTE: this will now require root to work, it will also not work on
-+    older kernels.
-+  * Rene Engelhard's patch to make AF X25 compile with 2.6 headers (Closes: Bug #223091)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Mon, 29 Dec 2003 13:42:20 +0100
-+
-+net-tools (1.60-8) unstable; urgency=medium
-+
-+  * lib/interface.c: backed off change which skipped reading ioctl 
-+    interfacelist, if _proc interfacelist was ok, which does not work,
-+    because alias interfaces are only in ioctl list available. It is 
-+    also falling back to the original lib/nstrcml.c because the
-+    comparision if : is present does not work.
-+    (Closes: bug #197924, #197582, #197269)
-+  * bumped standards version (no changes)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Sat, 28 Jun 2003 02:56:38 +0200
-+
-+net-tools (1.60-7) unstable; urgency=low
-+
-+  * interfaces.c: cvs version fixes Connectiva Bug #5711 (Closes: #149576)
-+    from Eduardo Pereira Habkost
-+  * netstat.c: cvs version adds support for tcp6,udp6,icmp6 protocols
-+  * netstat.c: cvs version adds support for -4 or -6 cmd line shortcut
-+  * netstat.c: cvs version adds fix for inode 
-+    signedness (Closes: #134600, #78932)
-+  * ifconfig: removed -i from usage (Closes: #181528)
-+  * make gcc 3.3 happy: added ull unsigned long long prefix to constant
-+  * lib/ddp_gr.c+pathnames.h: first support for appletalk routing from cvs
-+  * lib/eui64.c+hw.c+Makefile: forst support for new hw type from cvs
-+  * lib/interface.c: cvs fix for column run-into (Closes: #161080)
-+  * lib/irda.c,lib/ipx.c: cvs update
-+  * lib/nstrcmp.c: new, faster version, fixes b-lookups for ifconfig
-+  * hostanme.c: gcc 3.3 fix from cvs (not compiled in net-tools.deb)
-+  * lib/interface: fixed memory globbering
-+    (Closes: #135744, #149579, #185187)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Thu, 12 Jun 2003 05:44:38 +0200
-+
-+net-tools (1.60-6) unstable; urgency=low
-+
-+  * took route.c from upstream cvs: allow -6 and -4 option
-+  * took statistics.c from upstream cvs: more complete netstat -S
-+  * took README from upstream cvs: fix COPYING file title and removed
-+    the line (Closes: #102139)
-+  * took arp.c from upstream: fixed name "PUB", better not found handling,
-+    implicite proxy arp mac changed from '*' to '<from_interface>',
-+    usage line made shorter
-+  * added mii-tool in control file (Closes: #172473)
-+  * fixed description of binary multiple in man page (Closes: #182487)
-+  * fixed interpunctation in netstat(8) (Closes: #191660)
-+  * fixed compile warning in inet_sr.c by removing empty default: label in
-+    switch
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Wed, 28 May 2003 22:35:12 +0200
-+
-+net-tools (1.60-5) unstable; urgency=low
-+
-+  * thanks Andrew for the 4.1 NMU
-+  * NMU: Apply nameif patch from Matt Domsch. (Closes: #178209)
-+  * Fix FTB bug (string concatenation in gcc 3.3) (Closes: #194995)
-+  * Fix segfault in mii-tool by using cvs version (Closes: #139027)
-+  * fixed plural of authors to make lintian happy (I JOIN YOU :)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Wed, 28 May 2003 22:04:14 +0200
-+
-+net-tools (1.60-4.1) unstable; urgency=low
-+
-+  * NMU
-+  * Apply nameif patch from Matt Domsch. (Closes: #178209)
-+
-+ -- Andrew Suffield <asuffield@debian.org>  Wed,  9 Apr 2003 21:44:09 +0100
-+
-+net-tools (1.60-4) unstable; urgency=medium
-+
-+  * fixed (upstream) spurious newline in ifconfig
-+    Thanks Jonathen, Closes: Bug #109379
-+  * fixed SI-Units printout in ifconfig (Closes: Bug #110629, #97029, #100167)
-+  * this is done by including lib/interfaces.c from upstream cvs
-+  * also added ifconfig man page from upstream cvs
-+  * fixed (upstream) man page about netstat's --interface opt. (Closes: Bug#120475)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Sat, 24 Nov 2001 06:26:37 +0100
-+
-+net-tools (1.60-3) unstable; urgency=medium
-+
-+  * fixed upstream error where counters in ifconfig/netstat -i are 0
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Sat, 10 Nov 2001 18:12:13 +0100
-+
-+net-tools (1.60-2) unstable; urgency=low
-+
-+  * Fixed the following bug: (Closes: #117837)
-+  * inserted ifconfig.c from upstream cvs to do this
-+  * bumped debian Standard 3.1.1 -> 3.5.6 and removed -g from linking
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Thu,  1 Nov 2001 02:51:33 +0100
-+
-+net-tools (1.60-1) unstable; urgency=low
-+
-+  * New upstream
-+  * Phil fixed the following Bugs upstream: (Closes: #91919, #93048, #90282)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Mon, 16 Apr 2001 02:28:12 +0200
-+
-+net-tools (1.59-1) unstable; urgency=low
-+
-+  * added Build Dependencies (closes bug: #89083)
-+  * new upstream version
-+  * removed dh_suidregister and a few comments from rules file
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Sun, 18 Mar 2001 03:00:33 +0100
-+
-+net-tools (1.58-2) unstable; urgency=low
-+
-+  * backported ifconfig change from 1.59 to avoid closing socket too early
-+    on some systems (depending on the protocols installed). 
-+    Closes Bug: #85688, #85743
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Tue, 13 Feb 2001 01:39:59 +0100
-+
-+net-tools (1.58-1) unstable; urgency=low
-+
-+  * new upstream version
-+  * removed local man pages for now (Closes: bug #83894)
-+  * install nameif in /sbin
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Sat, 10 Feb 2001 21:50:30 +0100
-+
-+net-tools (1.57-2) unstable; urgency=high
-+
-+  * rebuild, this is believed to closes: #75825
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Sat, 30 Dec 2000 22:43:01 +0100
-+
-+net-tools (1.57-1) unstable; urgency=low
-+
-+  * new debian maintainer (thanks Anthony for the Work!)
-+  * new upstream version
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Mon, 14 Aug 2000 02:40:13 +0200
-+
-+net-tools (1.54-3) unstable; urgency=low
-+
-+  * Argggh. Don't use that horrible dh_installmanpages hack. (Closes:
-+    Bug#68925, Bug#68879)
-+
-+ -- Anthony Towns <ajt@debian.org>  Sun, 13 Aug 2000 00:12:05 +1000
-+
-+net-tools (1.54-2) unstable; urgency=low
-+
-+  * Reapply slattach patch from netbase 3.16-3.
-+
-+ -- Anthony Towns <ajt@debian.org>  Thu, 10 Aug 2000 11:32:58 +1000
-+
-+net-tools (1.54-1) unstable; urgency=low
-+
-+  * Split from netbase.
-+
-+ -- Anthony Towns <ajt@debian.org>  Mon, 17 Jul 2000 07:34:12 +1000
-+
-+Local variables:
-+mode: debian-changelog
-+End:
---- net-tools-1.60.orig/debian/copyright
-+++ net-tools-1.60/debian/copyright
-@@ -0,0 +1,18 @@
-+This debian package is maintained by Bernd Eckenfels <ecki@debian.org> since 
-+Mon, 14 Aug 2000 02:42:13 +0200. Debian Informations will be uploaded
-+upstream, too.
-+
-+This package was debianized by Anthony Towns <ajt@debian.org> on
-+Mon, 17 Jul 2000 07:34:12 +1000. It was originally part of the netbase
-+package.
-+
-+It was downloaded from http://www.tazenda.demon.co.uk/phil/net-tools/
-+
-+Upstream Authors: Phil Blundell <philb@gnu.org>, 
-+                  Bernd Eckenfels <net-tools@lina.inka.de>
-+
-+Copyright:
-+
-+Distributed under the terms of the GNU General Public License version 2,
-+as published by the Free Software Foundation. On Debian systems you can
-+find a copy of this license in /usr/share/common-licenses/GPL.
---- net-tools-1.60.orig/debian/dirs
-+++ net-tools-1.60/debian/dirs
-@@ -0,0 +1 @@
-+usr/sbin
---- net-tools-1.60.orig/debian/config.make
-+++ net-tools-1.60/debian/config.make
-@@ -0,0 +1,36 @@
-+I18N=1
-+HAVE_AFUNIX=1
-+HAVE_AFINET=1
-+HAVE_AFINET6=1
-+HAVE_AFIPX=1
-+HAVE_AFATALK=1
-+HAVE_AFAX25=1
-+HAVE_AFNETROM=1
-+HAVE_AFROSE=1
-+HAVE_AFX25=1
-+HAVE_AFECONET=1
-+HAVE_AFDECnet=1
-+HAVE_AFASH=1
-+HAVE_HWETHER=1
-+HAVE_HWARC=1
-+HAVE_HWSLIP=1
-+HAVE_HWPPP=1
-+HAVE_HWTUNNEL=1
-+HAVE_HWSTRIP=1
-+HAVE_HWTR=1
-+HAVE_HWAX25=1
-+HAVE_HWROSE=1
-+HAVE_HWNETROM=1
-+HAVE_HWX25=1
-+HAVE_HWFR=1
-+HAVE_HWSIT=1
-+HAVE_HWFDDI=1
-+HAVE_HWHIPPI=1
-+HAVE_HWASH=1
-+HAVE_HWHDLCLAPB=1
-+HAVE_HWIRDA=1
-+HAVE_HWEC=1
-+HAVE_EUI64=1
-+HAVE_FW_MASQUERADE=1
-+HAVE_IP_TOOLS=1
-+HAVE_MII=1
---- net-tools-1.60.orig/debian/control
-+++ net-tools-1.60/debian/control
-@@ -0,0 +1,21 @@
-+Source: net-tools
-+Section: net
-+Priority: important
-+Build-Depends: debhelper, gettext
-+Maintainer: Bernd Eckenfels <ecki@debian.org>
-+Standards-Version: 3.6.1
-+
-+Package: net-tools
-+Architecture: any
-+Depends: ${shlibs:Depends}
-+Replaces: netbase (<< 4.00), ja-trans (<= 0.8-2)
-+Conflicts: ja-trans (<= 0.8-2)
-+Description: The NET-3 networking toolkit
-+ This package includes the important tools for controlling the network
-+ subsystem of the Linux kernel.  This includes arp, ifconfig, netstat, 
-+ rarp, nameif and route.  Additionally, this package contains utilities
-+ relating to particular network hardware types (plipconfig, slattach, 
-+ mii-tool) and advanced aspects of IP configuration (iptunnel, ipmaddr).
-+ .
-+ In the upstream package 'hostname' and friends are included. Those are
-+ not installed by this package, since there is a special "hostname*.deb".
---- net-tools-1.60.orig/debian/rules
-+++ net-tools-1.60/debian/rules
-@@ -0,0 +1,74 @@
-+#!/usr/bin/make -f
-+# Sample debian/rules that uses debhelper.
-+# GNU copyright 1997 to 1999 by Joey Hess.
-+
-+# Uncomment this to turn on verbose mode.
-+#export DH_VERBOSE=1
-+
-+# This is the debhelper compatability version to use.
-+export DH_COMPAT=1
-+
-+configure: configure-stamp
-+configure-stamp:
-+	dh_testdir
-+	touch configure-stamp
-+
-+build: configure-stamp build-stamp
-+build-stamp:
-+	dh_testdir
-+	cp debian/config.h config.h
-+	cp debian/config.make config.make
-+	$(MAKE)
-+	touch build-stamp
-+
-+clean:
-+	dh_testdir
-+	dh_testroot
-+	rm -f build-stamp configure-stamp
-+	-$(MAKE) clobber
-+	dh_clean
-+
-+install: build
-+	dh_testdir
-+	dh_testroot
-+	dh_clean -k
-+	dh_installdirs
-+	$(MAKE) update BASEDIR=`pwd`/debian/tmp
-+	mv debian/tmp/sbin/arp debian/tmp/usr/sbin/arp
-+	# we don't want man pages for domainname and friends... (yet)
-+	rm -rf debian/tmp/usr/share/man/*/man1/ debian/tmp/usr/share/man/man1/
-+	# we don't install local manpages until policy is clear
-+	rm -rf debian/tmp/usr/share/man/*_*/
-+
-+
-+# Build architecture-independent files here.
-+binary-indep: build install
-+# We have nothing to do by default.
-+
-+# Build architecture-dependent files here.
-+binary-arch: build install
-+#	dh_testversion
-+	dh_testdir
-+	dh_testroot
-+#	dh_installdebconf	
-+	dh_installdocs
-+	dh_installexamples
-+	dh_installmenu
-+	dh_installcron
-+#	dh_installmanpages
-+	dh_installinfo
-+#	dh_undocumented
-+	dh_installchangelogs 
-+	dh_link
-+	dh_strip
-+	dh_compress
-+	dh_fixperms
-+#	dh_makeshlibs
-+	dh_installdeb
-+	dh_shlibdeps
-+	dh_gencontrol -- -isp
-+	dh_md5sums
-+	dh_builddeb
-+
-+binary: binary-indep binary-arch
-+.PHONY: build clean binary-indep binary-arch binary install
---- net-tools-1.60.orig/debian/config.h
-+++ net-tools-1.60/debian/config.h
-@@ -0,0 +1,75 @@
-+/*
-+* config.h	Automatically generated configuration includefile
-+*
-+* NET-TOOLS	A collection of programs that form the base set of the
-+*		NET-3 Networking Distribution for the LINUX operating
-+*		system.
-+*
-+*		DO  NOT  EDIT  DIRECTLY
-+*
-+*/
-+
-+/* 
-+ * 
-+ * Internationalization
-+ * 
-+ * The net-tools package has currently been translated to French,
-+ * German and Brazilian Portugese.  Other translations are, of
-+ * course, welcome.  Answer `n' here if you have no support for
-+ * internationalization on your system.
-+ * 
-+ */
-+#define I18N 1
-+
-+/* 
-+ * 
-+ * Protocol Families.
-+ * 
-+ */
-+#define HAVE_AFUNIX 1
-+#define HAVE_AFINET 1
-+#define HAVE_AFINET6 1
-+#define HAVE_AFIPX 1
-+#define HAVE_AFATALK 1
-+#define HAVE_AFAX25 1
-+#define HAVE_AFNETROM 1
-+#define HAVE_AFROSE 1
-+#define HAVE_AFX25 1
-+#define HAVE_AFECONET 1
-+#define HAVE_AFDECnet 1
-+#define HAVE_AFASH 1
-+
-+/* 
-+ * 
-+ * Device Hardware types.
-+ * 
-+ */
-+#define HAVE_HWETHER 1
-+#define HAVE_HWARC 1
-+#define HAVE_HWSLIP 1
-+#define HAVE_HWPPP 1
-+#define HAVE_HWTUNNEL 1
-+#define HAVE_HWSTRIP 1
-+#define HAVE_HWTR 1
-+#define HAVE_HWAX25 1
-+#define HAVE_HWROSE 1
-+#define HAVE_HWNETROM 1
-+#define HAVE_HWX25 1
-+#define HAVE_HWFR 1
-+#define HAVE_HWSIT 1
-+#define HAVE_HWFDDI 1
-+#define HAVE_HWHIPPI 1
-+#define HAVE_HWASH 1
-+#define HAVE_HWHDLCLAPB 1
-+#define HAVE_HWIRDA 1
-+#define HAVE_HWEC 1
-+#define HAVE_HWEUI64 1
-+
-+/* 
-+ * 
-+ * Other Features.
-+ * 
-+ */
-+#define HAVE_FW_MASQUERADE 1
-+#define HAVE_IP_TOOLS 1
-+#define HAVE_MII 1
---- net-tools-1.60.orig/debian/docs
-+++ net-tools-1.60/debian/docs
-@@ -0,0 +1,3 @@
-+README
-+README.ipv6
-+TODO
diff --git a/source/n/net-tools/net-tools_1.60-23.diff b/source/n/net-tools/net-tools_1.60-23.diff
new file mode 100644
index 00000000..449d62c3
--- /dev/null
+++ b/source/n/net-tools/net-tools_1.60-23.diff
@@ -0,0 +1,33404 @@
+--- net-tools-1.60.orig/debian/compat
++++ net-tools-1.60/debian/compat
+@@ -0,0 +1 @@
++5
+--- net-tools-1.60.orig/debian/README.source
++++ net-tools-1.60/debian/README.source
+@@ -0,0 +1,5 @@
++This package uses quilt to manage all modifications to the upstream
++source.  Changes are stored in the source package as diffs in
++debian/patches and applied during the build.
++
++See /usr/share/doc/quilt/README.source for a detailed explanation.
+--- net-tools-1.60.orig/debian/rules
++++ net-tools-1.60/debian/rules
+@@ -0,0 +1,81 @@
++#!/usr/bin/make -f
++
++include /usr/share/quilt/quilt.make
++
++# Uncomment this to turn on verbose mode.
++#export DH_VERBOSE=1
++
++# This has to be exported to make some magic below work.
++export DH_OPTIONS
++
++# These are used for cross-compiling and for saving the configure script
++# from having to guess our platform (since we know it already)
++DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
++DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
++
++configure: configure-stamp
++configure-stamp: $(QUILT_STAMPFN)
++	[ ! -f config.make ] || mv config.make debian/config.make.bk
++	cp -f debian/config.make config.make
++	[ ! -f config.h ] || mv config.h debian/config.h.bk
++	cp -f debian/config.h config.h
++	dh_testdir
++	touch $@
++
++build: build-stamp
++build-stamp: configure-stamp
++	dh_testdir
++	$(MAKE) PROGS="ifconfig arp netstat route rarp slattach plipconfig \
++		nameif iptunnel ipmaddr mii-tool"
++	touch $@
++
++clean: unpatch
++	dh_testdir
++	dh_testroot
++	rm -f build-stamp configure-stamp
++	[ ! -f Makefile ] || $(MAKE) clobber
++	[ ! -f debian/config.h.bk ] || \
++		mv debian/config.h.bk config.h
++	[ ! -f debian/config.make.bk ] || \
++		mv debian/config.make.bk config.make
++	dh_clean
++
++MANPAGES = arp.8 ethers.5 ifconfig.8 mii-tool.8 nameif.8 netstat.8 \
++	   plipconfig.8 rarp.8 route.8 slattach.8
++
++install: build
++	dh_testdir
++	dh_testroot
++	dh_clean -k
++	dh_installdirs bin sbin usr/sbin
++	dh_install
++	$(MAKE) -C po install BASEDIR=$(CURDIR)/debian/net-tools
++	dh_installman --language=de \
++		$(wildcard $(addprefix man/de_DE/,$(MANPAGES)))
++	dh_installman --language=C \
++		$(wildcard $(addprefix man/en_US/,$(MANPAGES)))
++	dh_installman --language=fr \
++		$(wildcard $(addprefix man/fr_FR/,$(MANPAGES)))
++	dh_installman --language=pt_BR \
++		$(wildcard $(addprefix man/pt_BR/,$(MANPAGES)))
++
++binary-indep: build install
++
++binary-arch: build install
++	dh_testdir
++	dh_testroot
++	dh_installchangelogs
++	dh_installdocs README README.ipv6 TODO
++	dh_link
++	dh_strip
++	dh_compress
++	dh_fixperms
++	dh_installdeb
++	dh_shlibdeps
++	dh_gencontrol
++	dh_md5sums
++	dh_builddeb
++
++binary: binary-arch binary-indep
++.PHONY: build clean binary-indep binary-arch binary install install-indep \
++	install-arch
+--- net-tools-1.60.orig/debian/config.h
++++ net-tools-1.60/debian/config.h
+@@ -0,0 +1,75 @@
++/*
++* config.h	Automatically generated configuration includefile
++*
++* NET-TOOLS	A collection of programs that form the base set of the
++*		NET-3 Networking Distribution for the LINUX operating
++*		system.
++*
++*		DO  NOT  EDIT  DIRECTLY
++*
++*/
++
++/* 
++ * 
++ * Internationalization
++ * 
++ * The net-tools package has currently been translated to French,
++ * German and Brazilian Portugese.  Other translations are, of
++ * course, welcome.  Answer `n' here if you have no support for
++ * internationalization on your system.
++ * 
++ */
++#define I18N 1
++
++/* 
++ * 
++ * Protocol Families.
++ * 
++ */
++#define HAVE_AFUNIX 1
++#define HAVE_AFINET 1
++#define HAVE_AFINET6 1
++#define HAVE_AFIPX 1
++#define HAVE_AFATALK 1
++#define HAVE_AFAX25 1
++#define HAVE_AFNETROM 1
++#define HAVE_AFROSE 1
++#define HAVE_AFX25 1
++#define HAVE_AFECONET 1
++#define HAVE_AFDECnet 1
++#define HAVE_AFASH 1
++
++/* 
++ * 
++ * Device Hardware types.
++ * 
++ */
++#define HAVE_HWETHER 1
++#define HAVE_HWARC 1
++#define HAVE_HWSLIP 1
++#define HAVE_HWPPP 1
++#define HAVE_HWTUNNEL 1
++#define HAVE_HWSTRIP 1
++#define HAVE_HWTR 1
++#define HAVE_HWAX25 1
++#define HAVE_HWROSE 1
++#define HAVE_HWNETROM 1
++#define HAVE_HWX25 1
++#define HAVE_HWFR 1
++#define HAVE_HWSIT 1
++#define HAVE_HWFDDI 1
++#define HAVE_HWHIPPI 1
++#define HAVE_HWASH 1
++#define HAVE_HWHDLCLAPB 1
++#define HAVE_HWIRDA 1
++#define HAVE_HWEC 1
++#define HAVE_HWEUI64 1
++
++/* 
++ * 
++ * Other Features.
++ * 
++ */
++#define HAVE_FW_MASQUERADE 1
++#define HAVE_IP_TOOLS 1
++#define HAVE_MII 1
+--- net-tools-1.60.orig/debian/config.make
++++ net-tools-1.60/debian/config.make
+@@ -0,0 +1,36 @@
++I18N=1
++HAVE_AFUNIX=1
++HAVE_AFINET=1
++HAVE_AFINET6=1
++HAVE_AFIPX=1
++HAVE_AFATALK=1
++HAVE_AFAX25=1
++HAVE_AFNETROM=1
++HAVE_AFROSE=1
++HAVE_AFX25=1
++HAVE_AFECONET=1
++HAVE_AFDECnet=1
++HAVE_AFASH=1
++HAVE_HWETHER=1
++HAVE_HWARC=1
++HAVE_HWSLIP=1
++HAVE_HWPPP=1
++HAVE_HWTUNNEL=1
++HAVE_HWSTRIP=1
++HAVE_HWTR=1
++HAVE_HWAX25=1
++HAVE_HWROSE=1
++HAVE_HWNETROM=1
++HAVE_HWX25=1
++HAVE_HWFR=1
++HAVE_HWSIT=1
++HAVE_HWFDDI=1
++HAVE_HWHIPPI=1
++HAVE_HWASH=1
++HAVE_HWHDLCLAPB=1
++HAVE_HWIRDA=1
++HAVE_HWEC=1
++HAVE_EUI64=1
++HAVE_FW_MASQUERADE=1
++HAVE_IP_TOOLS=1
++HAVE_MII=1
+--- net-tools-1.60.orig/debian/install
++++ net-tools-1.60/debian/install
+@@ -0,0 +1,11 @@
++arp		/usr/sbin
++ifconfig	/sbin
++nameif		/sbin
++plipconfig	/sbin
++rarp		/sbin
++route		/sbin
++slattach	/sbin
++ipmaddr		/sbin
++iptunnel	/sbin
++mii-tool	/sbin
++netstat		/bin
+--- net-tools-1.60.orig/debian/control
++++ net-tools-1.60/debian/control
+@@ -0,0 +1,22 @@
++Source: net-tools
++Section: net
++Priority: important
++Build-Depends: debhelper (> 5), gettext, quilt
++Maintainer: net-tools Team <pkg-net-tools-maintainers@lists.alioth.debian.org>
++Uploaders: Luk Claes <luk@debian.org>, Martín Ferrari <tincho@debian.org>
++Standards-Version: 3.8.1
++
++Package: net-tools
++Architecture: any
++Depends: ${shlibs:Depends}
++Replaces: netbase (<< 4.00), ja-trans (<= 0.8-2)
++Conflicts: ja-trans (<= 0.8-2)
++Description: The NET-3 networking toolkit
++ This package includes the important tools for controlling the network
++ subsystem of the Linux kernel.  This includes arp, ifconfig, netstat, 
++ rarp, nameif and route.  Additionally, this package contains utilities
++ relating to particular network hardware types (plipconfig, slattach, 
++ mii-tool) and advanced aspects of IP configuration (iptunnel, ipmaddr).
++ .
++ In the upstream package 'hostname' and friends are included. Those are
++ not installed by this package, since there is a special "hostname*.deb".
+--- net-tools-1.60.orig/debian/copyright
++++ net-tools-1.60/debian/copyright
+@@ -0,0 +1,31 @@
++Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=437
++Upstream-Maintainer: Phil Blundell <philb@gnu.org>, 
++                     Bernd Eckenfels <net-tools@lina.inka.de>
++Upstream-Source: https://developer.berlios.de/projects/net-tools/
++
++Files: *
++Copyright: © 1988-1994 MicroWalt Corporation
++Copyright: © 1995-1996 Bernd Eckenfels
++Copyright: © 1997-2000 Andi Kleen
++Copyright: © 1997-2000 Donald Becker
++License: GPL-2+
++ The copyright attribution has been derived from individual files' text, but
++ each file may have different copyright holders, and some may be missing. See
++ the source code for details.
++ .
++ This program is free software; you can redistribute it and/or modify it under
++ the terms of  the GNU General Public  License as  published by  the  Free
++ Software Foundation;  either  version 2 of the License, or  (at your option)
++ any later version.
++ .
++ On Debian GNU/Linux systems, the complete text of the GNU General Public
++ License can be found in `/usr/share/common-licenses/GPL-2'
++
++Files: debian/*
++Copyright: © 2008-2009 Luk Claes, Martín Ferrari
++Copyright: © 2000-2007 Bernd Eckenfels
++Copyright: © 2000 Anthony Towns
++License: GPL-2+
++ It is assumed that all contributors put their work under the same license
++ as the module itself.
++
+--- net-tools-1.60.orig/debian/changelog
++++ net-tools-1.60/debian/changelog
+@@ -0,0 +1,347 @@
++net-tools (1.60-23) unstable; urgency=low
++
++  * debian/patches/Bug#254243-netstat.c-wide-opt.patch: Converted last patch
++    from Luar Roji to a quilt patch.
++  * Many changes done in diff.gz that are also present in upstream's CVS:
++    - debian/patches/CVS-20020730-route.c_opts_64.patch
++    - debian/patches/CVS-20061011-ipmaddr.c_buffer_overflow.patch
++    - debian/patches/CVS-20081003-statistics.c_sync.patch
++    - debian/patches/CVS-20071202-rarp.c_sync.patch
++    - debian/patches/CVS-20070316-netstat.c_sync.patch
++    - debian/patches/CVS-20060927-mii-tool.c_sync.patch
++    - debian/patches/CVS-20051204-arp.c_sync.patch
++    - debian/patches/CVS-20030911-nameif.c_sync.patch
++    - debian/patches/CVS-20081002-ifconfig.c_sync.patch
++    - debian/patches/CVS-20031011-hostname.c_sync.patch
++    - debian/patches/CVS-20051204-slttach.c_sync.patch
++    - debian/patches/CVS-20061011-includes_sync.patch
++    - debian/patches/CVS-lib_sync.patch
++    - debian/patches/CVS-20081003-config.in_sync.patch
++    - debian/patches/CVS-20081002-manpages_sync.patch
++  * Some unsyncable patches converted from diff.gz:
++    - debian/patches/netstat.c-assorted_changes.patch
++    - debian/patches/translations.patch
++    - debian/patches/local-manpages.patch
++    - debian/patches/lib_local_changes.patch
++    - debian/patches/netstat.c-local_changes.patch
++  * Reverted changes to Makefile and README.
++  * debian/watch: added watchfile.
++  * debian/control, debian/compat: Added versioned dependency on debhelper (it
++    was version 1!)
++  * debian/rules: made from scratch. Closes: #443063.
++  * Added quilt dependencies and hooks.
++  * debian/control: updated Standards-Version.
++  * debian/README.source: added to comply with S-V 3.8.1.
++  * debian/patches/local-manpages.patch: more manpage fixes.
++  * debian/patches/translations.patch: fix encoding for .po files.
++  * debia/rules: supercede Makefile install with custom commands.
++  * debian/copyright: new format, and attempt to provide a real copyright
++    file. Still, the attribution is a mess.
++  * debian/patches/Bug#345331-socket_overflow.patch: patch from Antonio Galea
++    that solves an issue when the socket number exceeds 2^31. Closes: #345331.
++
++ -- Martín Ferrari <tincho@debian.org>  Mon, 16 Mar 2009 01:58:18 -0300
++
++net-tools (1.60-22) unstable; urgency=low
++
++  * Add new command line option -W/--wide to netstat which prevents 
++    truncation of IPv6 addresses (Closes: #254243). Thanks Luar Roji.
++
++ -- Luk Claes <luk@debian.org>  Sun, 16 Nov 2008 17:53:05 +0100
++
++net-tools (1.60-21) unstable; urgency=low
++
++  * Update maintainer to net-tools Team.
++  * Support ipv6 stats in netstat (Closes: #453859).
++  * Fix closes statements in changelog entry.
++  * Add hardware support for InfiniBand (Closes: #294252).
++
++ -- Luk Claes <luk@debian.org>  Sat, 27 Sep 2008 19:40:40 +0200
++
++net-tools (1.60-20) unstable; urgency=low
++
++  * New maintainer (Closes: #486004).
++  * Don't segfault when /proc/net/dev is not available (Closes: #222209).
++  * Find IPv6 addresses for interfaces with ifindex > 255 (Closes: #433543).
++  * Skip . and .. in netstat as they are invalid (Closes: #234447).
++  * Fix hyphenation for manpages (Closes: #288343).
++
++ -- Luk Claes <luk@debian.org>  Tue, 16 Sep 2008 15:22:20 +0200
++
++net-tools (1.60-19) unstable; urgency=low
++
++  * fixed netstat(8) (interfaceS) reported by Liu Xing. (Closes: Bug#435690)
++  * fixed interface name truncation (Closes: Bug#405521)
++    Thank you Csaba Szep.
++  * fixed pt error string (Closes: Bug#403033)
++  * fixed route samples (Closes: Bug#400844, #368697) Thanks Danny Rathjens.
++  * fixed ifconfig(8) see also section (Closes: Bug#365916) Dan Jacobs.
++
++ -- Bernd Eckenfels <ecki@debian.org>  Sun, 02 Dec 2007 06:27:41 +0100
++
++net-tools (1.60-18) unstable; urgency=low
++
++  * Thanks for the l10n NMU to Kenshi Muto
++  * fixed hostname compile problems
++  * better error handling and speedup for proc file reading
++  * improved mii-tool (more media types)
++  * fixed string length contraint in ipmaddr
++  * fixed ipx /proc/net (alternate naming)
++  * smaller fixed to netstat(8) (de) 2002-02-20 - still incomplete
++  * expanded arp(8) (en) 2007-12-01
++  * added -4 and -6 to netstat(8) 02 October 2003
++  * formatting fixed rarp(8)+slattach(8)  [en]
++  * formatting fixed arp(8), rarp(8), ifconfig(8), hostname(1) [fr]
++  * fixed slattach -L to not require HW handshake anymore
++  * netstat -n: show v4inv6 mapped addressses as v4
++
++ -- Bernd Eckenfels <ecki@debian.org>  Sun, 02 Dec 2007 03:28:17 +0100
++
++net-tools (1.60-17.2) unstable; urgency=low
++
++  * l10n NMU
++  * Set conflict against ja-trans which has obsolete Japanese
++    translations only for net-tools. (closes: #447327)
++
++ -- Kenshi Muto <kmuto@debian.org>  Sat, 20 Oct 2007 18:00:34 +0900
++
++net-tools (1.60-17.1) unstable; urgency=low
++
++  * l10n NMU
++  * Updated net-tools.pot.
++  * Updated Japanese translation (closes: Bug#432338)
++  * Updated German translation (closes: #313808)
++
++ -- Kenshi Muto <kmuto@debian.org>  Thu, 11 Oct 2007 19:44:26 +0900
++
++net-tools (1.60-17) unstable; urgency=medium
++
++  * arp.c: bus error on sparc64 with latest gcc fixed. (Closes: Bug#340384)
++
++ -- Bernd Eckenfels <ecki@debian.org>  Sun, 04 Dec 2005 05:47:05 +0100
++
++net-tools (1.60-16) unstable; urgency=low
++
++  * spelling fix to slattach(8) (Closes: Bug#326124 (patch by A.Costa)
++  * inet.c: portability fix for 64bit.
++  * comment cleanups to aliagn with 1.65 cvs
++    * net-support.h, inet_sr.c, nstrcmp.c, arp.c, ether.h
++
++ -- Bernd Eckenfels <ecki@debian.org>  Mon, 24 Oct 2005 22:05:38 +0200
++
++net-tools (1.60-15) unstable; urgency=low
++
++  * minor formating fix to ifconfig(8)
++
++ -- Bernd Eckenfels <ecki@debian.org>  Thu, 30 Jun 2005 21:49:52 +0200
++
++net-tools (1.60-14) unstable; urgency=low
++
++  * added iptables(8) in ifconfig(8) (thanks Toralf Förster)
++  * more usage updates in ifconfig.8 (used upstream HEAD=1.11)
++
++ -- Bernd Eckenfels <ecki@debian.org>  Thu, 30 Jun 2005 20:51:18 +0200
++
++net-tools (1.60-13) unstable; urgency=low
++
++  * X25 code compiles with 2.4 and 2.6 kernel headers (Closes: Bug#271678)
++  * IMPORTANT: make ifconfig show alias interfaces in 2.6 again. 
++  * resort media type array to match kernel (Closes: Bug#199920)
++
++ -- Bernd Eckenfels <ecki@debian.org>  Tue, 17 May 2005 01:28:51 +0200
++
++net-tools (1.60-12) unstable; urgency=low
++
++  * make TR hw address type work for new kernel (Closes: Bug #79462, #203400)
++  * update-po uses msgmerge, new net-tools.pot (Closes: Bug: 271426)
++  * de-support dontpub option in arp -? und arp.8 (Closes: Bug #203396)
++
++ -- Bernd Eckenfels <ecki@debian.org>  Mon, 16 May 2005 06:33:48 +0200
++
++net-tools (1.60-11) unstable; urgency=low
++
++  * spelling fixes (Closes: Bug #305640, #305638, 305637)
++  * nameif.c avoid overflow by malicious kernel
++  * avoid overflow of the TX-OK Column (Closes: Bug #308922)
++
++ -- Bernd Eckenfels <ecki@debian.org>  Sat, 14 May 2005 01:48:45 +0200
++
++net-tools (1.60-10) unstable; urgency=low
++
++  * typo fix in po/de.po for german arp command output (Closes: Bug #176151)
++  * added diagnostics messages to mii-tool.8 (Closes: Bug #239229)
++  * new version of nstrcmp (Closes: Bug #226503)
++  * enable EUI64 support
++  * stadanrds version 3.6.1 (no changes)
++
++ -- Bernd Eckenfels <ecki@debian.org>  Fri, 23 Apr 2004 00:57:20 +0200
++
++net-tools (1.60-9) unstable; urgency=medium
++
++  * debian/changelog: fixed in last entry fixed bug from 197925 to 197924
++  * include linux/sockios.h for SIOCGMIIPHY definition (new style)
++    which will fix MII reporting on 2.4 kernels. (Closes: Bug #133648)
++    NOTE: this will now require root to work, it will also not work on
++    older kernels.
++  * Rene Engelhard's patch to make AF X25 compile with 2.6 headers (Closes: Bug #223091)
++
++ -- Bernd Eckenfels <ecki@debian.org>  Mon, 29 Dec 2003 13:42:20 +0100
++
++net-tools (1.60-8) unstable; urgency=medium
++
++  * lib/interface.c: backed off change which skipped reading ioctl 
++    interfacelist, if _proc interfacelist was ok, which does not work,
++    because alias interfaces are only in ioctl list available. It is 
++    also falling back to the original lib/nstrcml.c because the
++    comparision if : is present does not work.
++    (Closes: bug #197924, #197582, #197269)
++  * bumped standards version (no changes)
++
++ -- Bernd Eckenfels <ecki@debian.org>  Sat, 28 Jun 2003 02:56:38 +0200
++
++net-tools (1.60-7) unstable; urgency=low
++
++  * interfaces.c: cvs version fixes Connectiva Bug #5711 (Closes: #149576)
++    from Eduardo Pereira Habkost
++  * netstat.c: cvs version adds support for tcp6,udp6,icmp6 protocols
++  * netstat.c: cvs version adds support for -4 or -6 cmd line shortcut
++  * netstat.c: cvs version adds fix for inode 
++    signedness (Closes: #134600, #78932)
++  * ifconfig: removed -i from usage (Closes: #181528)
++  * make gcc 3.3 happy: added ull unsigned long long prefix to constant
++  * lib/ddp_gr.c+pathnames.h: first support for appletalk routing from cvs
++  * lib/eui64.c+hw.c+Makefile: forst support for new hw type from cvs
++  * lib/interface.c: cvs fix for column run-into (Closes: #161080)
++  * lib/irda.c,lib/ipx.c: cvs update
++  * lib/nstrcmp.c: new, faster version, fixes b-lookups for ifconfig
++  * hostanme.c: gcc 3.3 fix from cvs (not compiled in net-tools.deb)
++  * lib/interface: fixed memory globbering
++    (Closes: #135744, #149579, #185187)
++
++ -- Bernd Eckenfels <ecki@debian.org>  Thu, 12 Jun 2003 05:44:38 +0200
++
++net-tools (1.60-6) unstable; urgency=low
++
++  * took route.c from upstream cvs: allow -6 and -4 option
++  * took statistics.c from upstream cvs: more complete netstat -S
++  * took README from upstream cvs: fix COPYING file title and removed
++    the line (Closes: #102139)
++  * took arp.c from upstream: fixed name "PUB", better not found handling,
++    implicite proxy arp mac changed from '*' to '<from_interface>',
++    usage line made shorter
++  * added mii-tool in control file (Closes: #172473)
++  * fixed description of binary multiple in man page (Closes: #182487)
++  * fixed interpunctation in netstat(8) (Closes: #191660)
++  * fixed compile warning in inet_sr.c by removing empty default: label in
++    switch
++
++ -- Bernd Eckenfels <ecki@debian.org>  Wed, 28 May 2003 22:35:12 +0200
++
++net-tools (1.60-5) unstable; urgency=low
++
++  * thanks Andrew for the 4.1 NMU
++  * NMU: Apply nameif patch from Matt Domsch. (Closes: #178209)
++  * Fix FTB bug (string concatenation in gcc 3.3) (Closes: #194995)
++  * Fix segfault in mii-tool by using cvs version (Closes: #139027)
++  * fixed plural of authors to make lintian happy (I JOIN YOU :)
++
++ -- Bernd Eckenfels <ecki@debian.org>  Wed, 28 May 2003 22:04:14 +0200
++
++net-tools (1.60-4.1) unstable; urgency=low
++
++  * NMU
++  * Apply nameif patch from Matt Domsch. (Closes: #178209)
++
++ -- Andrew Suffield <asuffield@debian.org>  Wed,  9 Apr 2003 21:44:09 +0100
++
++net-tools (1.60-4) unstable; urgency=medium
++
++  * fixed (upstream) spurious newline in ifconfig
++    Thanks Jonathen, Closes: Bug #109379
++  * fixed SI-Units printout in ifconfig (Closes: Bug #110629, #97029, #100167)
++  * this is done by including lib/interfaces.c from upstream cvs
++  * also added ifconfig man page from upstream cvs
++  * fixed (upstream) man page about netstat's --interface opt. (Closes: Bug#120475)
++
++ -- Bernd Eckenfels <ecki@debian.org>  Sat, 24 Nov 2001 06:26:37 +0100
++
++net-tools (1.60-3) unstable; urgency=medium
++
++  * fixed upstream error where counters in ifconfig/netstat -i are 0
++
++ -- Bernd Eckenfels <ecki@debian.org>  Sat, 10 Nov 2001 18:12:13 +0100
++
++net-tools (1.60-2) unstable; urgency=low
++
++  * Fixed the following bug: (Closes: #117837)
++  * inserted ifconfig.c from upstream cvs to do this
++  * bumped debian Standard 3.1.1 -> 3.5.6 and removed -g from linking
++
++ -- Bernd Eckenfels <ecki@debian.org>  Thu,  1 Nov 2001 02:51:33 +0100
++
++net-tools (1.60-1) unstable; urgency=low
++
++  * New upstream
++  * Phil fixed the following Bugs upstream: (Closes: #91919, #93048, #90282)
++
++ -- Bernd Eckenfels <ecki@debian.org>  Mon, 16 Apr 2001 02:28:12 +0200
++
++net-tools (1.59-1) unstable; urgency=low
++
++  * added Build Dependencies (closes bug: #89083)
++  * new upstream version
++  * removed dh_suidregister and a few comments from rules file
++
++ -- Bernd Eckenfels <ecki@debian.org>  Sun, 18 Mar 2001 03:00:33 +0100
++
++net-tools (1.58-2) unstable; urgency=low
++
++  * backported ifconfig change from 1.59 to avoid closing socket too early
++    on some systems (depending on the protocols installed). 
++    Closes Bug: #85688, #85743
++
++ -- Bernd Eckenfels <ecki@debian.org>  Tue, 13 Feb 2001 01:39:59 +0100
++
++net-tools (1.58-1) unstable; urgency=low
++
++  * new upstream version
++  * removed local man pages for now (Closes: bug #83894)
++  * install nameif in /sbin
++
++ -- Bernd Eckenfels <ecki@debian.org>  Sat, 10 Feb 2001 21:50:30 +0100
++
++net-tools (1.57-2) unstable; urgency=high
++
++  * rebuild, this is believed to closes: #75825
++
++ -- Bernd Eckenfels <ecki@debian.org>  Sat, 30 Dec 2000 22:43:01 +0100
++
++net-tools (1.57-1) unstable; urgency=low
++
++  * new debian maintainer (thanks Anthony for the Work!)
++  * new upstream version
++
++ -- Bernd Eckenfels <ecki@debian.org>  Mon, 14 Aug 2000 02:40:13 +0200
++
++net-tools (1.54-3) unstable; urgency=low
++
++  * Argggh. Don't use that horrible dh_installmanpages hack. (Closes:
++    Bug#68925, Bug#68879)
++
++ -- Anthony Towns <ajt@debian.org>  Sun, 13 Aug 2000 00:12:05 +1000
++
++net-tools (1.54-2) unstable; urgency=low
++
++  * Reapply slattach patch from netbase 3.16-3.
++
++ -- Anthony Towns <ajt@debian.org>  Thu, 10 Aug 2000 11:32:58 +1000
++
++net-tools (1.54-1) unstable; urgency=low
++
++  * Split from netbase.
++
++ -- Anthony Towns <ajt@debian.org>  Mon, 17 Jul 2000 07:34:12 +1000
++
++Local variables:
++mode: debian-changelog
++End:
+--- net-tools-1.60.orig/debian/watch
++++ net-tools-1.60/debian/watch
+@@ -0,0 +1,3 @@
++version=3
++
++http://download.berlios.de/net-tools/net-tools-(\d.*)\.tar\.(?:bz2|gz)
+--- net-tools-1.60.orig/debian/patches/CVS-20081003-config.in_sync.patch
++++ net-tools-1.60/debian/patches/CVS-20081003-config.in_sync.patch
+@@ -0,0 +1,74 @@
++Sync with upstream CVS, complete log:
++
++Revision 1.24 - Fri Oct 3 02:09:57 2008 UTC by ecki
++moved H suport for Infiniband to the right section
++
++Revision 1.23 - Fri Oct 3 01:55:07 2008 UTC by ecki
++Add hardware support for InfiniBand (Debian Bug #294252 Tom Duffy from Sun).
++
++Revision 1.22 - Fri Jun 4 00:06:50 2004 UTC by ecki
++default all options which work with recent systems  to on
++
++Revision 1.21 - Mon Nov 12 02:12:05 2001 UTC by ecki
++added EUI64 Hardware Address Family
++Daniel Stodden <stodden@in.tum.de>
++
++Index: net-tools/config.in
++===================================================================
++--- net-tools.orig/config.in
+++++ net-tools/config.in
++@@ -49,16 +49,16 @@ bool 'Does your system support GNU gette
++ * 
++ bool 'UNIX protocol family' HAVE_AFUNIX y
++ bool 'INET (TCP/IP) protocol family' HAVE_AFINET y
++-bool 'INET6 (IPv6) protocol family' HAVE_AFINET6 n
+++bool 'INET6 (IPv6) protocol family' HAVE_AFINET6 y
++ bool 'Novell IPX/SPX protocol family' HAVE_AFIPX y
++ bool 'Appletalk DDP protocol family' HAVE_AFATALK y
++ bool 'AX25 (packet radio) protocol family' HAVE_AFAX25 y
++ bool 'NET/ROM (packet radio) protocol family' HAVE_AFNETROM y
++-bool 'Rose (packet radio) protocol family' HAVE_AFROSE n
+++bool 'Rose (packet radio) protocol family' HAVE_AFROSE y
++ bool 'X.25 (CCITT) protocol family' HAVE_AFX25 y
++-bool 'Econet protocol family' HAVE_AFECONET n
+++bool 'Econet protocol family' HAVE_AFECONET y
++ bool 'DECnet protocol family' HAVE_AFDECnet n
++-bool 'Ash protocol family' HAVE_AFASH n
+++bool 'Ash protocol family' HAVE_AFASH y
++ *
++ *
++ *            Device Hardware types.
++@@ -71,21 +71,23 @@ bool 'IPIP Tunnel support' HAVE_HWTUNNEL
++ bool 'STRIP (Metricom radio) support' HAVE_HWSTRIP y
++ bool 'Token ring (generic) support' HAVE_HWTR y
++ bool 'AX25 (packet radio) support' HAVE_HWAX25 y
++-bool 'Rose (packet radio) support' HAVE_HWROSE n
+++bool 'Rose (packet radio) support' HAVE_HWROSE y
++ bool 'NET/ROM (packet radio) support' HAVE_HWNETROM y
++ bool 'X.25 (generic) support' HAVE_HWX25 y
++ bool 'DLCI/FRAD (frame relay) support' HAVE_HWFR y
++-bool 'SIT (IPv6-in-IPv4) support' HAVE_HWSIT n
++-bool 'FDDI (generic) support' HAVE_HWFDDI n
++-bool 'HIPPI (generic) support' HAVE_HWHIPPI n
++-bool 'Ash hardware support' HAVE_HWASH n
++-bool '(Cisco)-HDLC/LAPB support' HAVE_HWHDLCLAPB n
+++bool 'SIT (IPv6-in-IPv4) support' HAVE_HWSIT y
+++bool 'FDDI (generic) support' HAVE_HWFDDI y
+++bool 'HIPPI (generic) support' HAVE_HWHIPPI y
+++bool 'Ash hardware support' HAVE_HWASH y
+++bool '(Cisco)-HDLC/LAPB support' HAVE_HWHDLCLAPB y
++ bool 'IrDA support' HAVE_HWIRDA y
++-bool 'Econet hardware support' HAVE_HWEC n
+++bool 'Econet hardware support' HAVE_HWEC y
+++bool 'Generic EUI-64 hardware support' HAVE_HWEUI64 y
+++bool 'InfiniBand hardware support' HAVE_HWIB y
++ *
++ *
++ *           Other Features.
++ *
++-bool 'IP Masquerading support' HAVE_FW_MASQUERADE n
++-bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS n
++-bool 'Build mii-tool' HAVE_MII n
+++bool 'IP Masquerading support' HAVE_FW_MASQUERADE y
+++bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS y
+++bool 'Build mii-tool' HAVE_MII y
+--- net-tools-1.60.orig/debian/patches/local-manpages.patch
++++ net-tools-1.60/debian/patches/local-manpages.patch
+@@ -0,0 +1,1759 @@
++Formatting fixes to manpages, not found upstream.
++
++Index: net-tools/man/de_DE/arp.8
++===================================================================
++--- net-tools.orig/man/de_DE/arp.8
+++++ net-tools/man/de_DE/arp.8
++@@ -1,12 +1,12 @@
++-.TH ARP 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
+++.TH ARP 8 "6. M\(:arz 1999" "net\-tools" "Handbuch f\(:ur Linuxprogrammierer"
++ .SH NAME
++ arp \- Manipulation des ARP-Caches
++ .SH SYNOPSIS
++ .B arp 
++ .RB [ \-vn ] 
++ .RB [ "\-H Typ" ] 
++-.RB [ "-i Schnittstelle" ] 
++-.B -a 
+++.RB [ "\-i Schnittstelle" ] 
+++.B \-a 
++ .RB [ Rechnername ]
++ .PP
++ .B arp 
++@@ -19,14 +19,14 @@ arp \- Manipulation des ARP-Caches
++ .RB [ \-v ] 
++ .RB [ "\-H Typ" ] 
++ .RB [ "\-i Schnittstelle" ] 
++-.B -s Rechnername hw_adr
+++.B \-s Rechnername hw_adr
++ .RB [ temp ] 
++ .PP
++ .B arp 
++ .RB [ \-v ] 
++ .RB [ "\-H Typ" ] 
++ .RB [ "\-i Interface" ] 
++-.B -s Rechnername hw_adr
+++.B \-s Rechnername hw_adr
++ .RB [ "netmask nm" ] 
++ .B pub
++ .PP
++@@ -34,15 +34,15 @@ arp \- Manipulation des ARP-Caches
++ .RB [ \-v ] 
++ .RB [ "\-H Typ" ] 
++ .RB [ "\-i Schnittstelle" ] 
++-.B -Ds Rechnername ifa
+++.B \-Ds Rechnername ifa
++ .RB [ "netmask nm" ] 
++ .B pub
++ .PP
++ .B arp 
++ .RB [ \-vnD ]
++ .RB [ "\-H Typ" ] 
++-.RB [ "-i Schnittstelle" ]
++-.B -f [Dateiname]
+++.RB [ "\-i Schnittstelle" ]
+++.B \-f [Dateiname]
++ 
++ .SH BESCHREIBUNG
++ .B Arp
++@@ -61,7 +61,7 @@ Ausf\(:uhrlichere Ausgaben.
++ macht numerische Adressausgaben anstatt zu versuche, den symbolischen Rechner-,
++ Port- oder Benutzernamen zu ermitteln.
++ .TP
++-.B "\-H type, \-\-hw-type type"
+++.B "\-H type, \-\-hw\-type type"
++ Beim Setzen oder Auslesen des ARP-Caches schr\(:ankt diese Option
++ ein, auf welcher Klasse von Eintr\(:agen 
++ .B arp
++@@ -86,7 +86,7 @@ Argument verwendet, so werden alle Eintr
++ Alle Eintr\(:age f\(:ur den angegebenen Host entfernen.  Dies kann z.B.
++ benutzt werden, wenn ein System angehalten wird.
++ .TP
++-.B "\-D, \-\-use-device"
+++.B "\-D, \-\-use\-device"
++ Die Hardwareadresse der Netzwerksschnittstelle
++ .B ifa
++ verwenden.
++@@ -180,6 +180,6 @@ Flagge.
++ ethers(5), rarp(8), route(8), ifconfig(8), netstat(8)
++ .SH AUTOREN
++ Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> mit vielen Verbesserungen vom
++-Verwalter der Net-Tools Bernd Eckenfels <net-tools@lina.inka.de>.
+++Verwalter der Net-Tools Bernd Eckenfels <net\-tools@lina.inka.de>.
++ .SH \(:Ubersetzung
++ Ralf B\(:achle <ralf@gnu.org>
++Index: net-tools/man/de_DE/hostname.1
++===================================================================
++--- net-tools.orig/man/de_DE/hostname.1
+++++ net-tools/man/de_DE/hostname.1
++@@ -3,7 +3,7 @@
++ .\"
++ .\" German translation by Ralf Baechle (ralf@gnu.org)
++ .\"
++-.TH HOSTNAME 1 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
+++.TH HOSTNAME 1 "6. M\(:arz 1999" "net\-tools" "Handbuch f\(:ur Linuxprogrammierer"
++ 
++ .SH NAME
++ hostname \- den Rechnernamen anzeigen oder setzen.
++@@ -28,7 +28,7 @@ nodename \- den DECnet-Knotennamen anzei
++ .RB [ \-f ]
++ .RB [ \-\-fqdn ]
++ .RB [ \-i ]
++-.RB [ \-\-ip-address ]
+++.RB [ \-\-ip\-address ]
++ .RB [ \-\-long ]
++ .RB [ \-s ]
++ .RB [ \-\-short ]
++@@ -195,7 +195,7 @@ ge\(:andert werden.
++ .I "\-h, \-\-help"
++ Kurzanleitung ausdrucken und beenden.
++ .TP
++-.I "\-i, \-\-ip-address"
+++.I "\-i, \-\-ip\-address"
++ Die IP-Adresse(n) des Rechners anzeigen und beenden.
++ .TP
++ .I "\-n, \-\-node"
++@@ -220,9 +220,9 @@ Option gegeben wird, dann kann Root auch
++ .SH DATEIEN
++ .B /etc/hosts
++ .SH AUTOREN
++-Peter Tobias, <tobias@et-inf.fho-emden.de>
+++Peter Tobias, <tobias@et\-inf.fho\-emden.de>
++ .br
++-Bernd Eckenfels, <net-tools@lina.inka.de> (NIS and manpage).
+++Bernd Eckenfels, <net\-tools@lina.inka.de> (NIS and manpage).
++ .br
++ Steve Whitehouse, <SteveW@ACM.org> (DECnet support and manpage).
++ .SH \(:Ubersetzung
++Index: net-tools/man/de_DE/ifconfig.8
++===================================================================
++--- net-tools.orig/man/de_DE/ifconfig.8
+++++ net-tools/man/de_DE/ifconfig.8
++@@ -1,4 +1,4 @@
++-.TH IFCONFIG 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
+++.TH IFCONFIG 8 "2007-12-02" "net\-tools" "Handbuch f\(:ur Linuxprogrammierer"
++ .SH NAME
++ ifconfig \- Konfiguration einer Netzwerkskarte
++ .SH SYNOPSIS
++@@ -19,7 +19,7 @@ Wird ein einzelne
++ .BR Schnittstelle nargument
++ angegeben, so zeigt es nur den Zustand der angegebenen Netzwerksschnittstelle
++ an.  Wird ein einzelne
++-.B -a
+++.B \-a
++ Option angegeben, zeigt es den Zustand aller Schnittstellen an, selbst wenn
++ diese inaktiviert sind.  Ansonsten konfiguriert
++ .B ifconfig
++@@ -130,13 +130,13 @@ sind
++ kann benutzt werden, damit der Treiber automatischen den Typ des Mediums
++ erkennt.  Wiederum unterst\(:utzen dies nicht alle Treiber.
++ .TP
++-.B "[-]broadcast [Adr]"
+++.B "[\-]broadcast [Adr]"
++ Wird das Adressargument gegeben, so wird die Protokolladresse f\(:ur Broadcast
++ f\(:ur diese Schnittstelle gesetzt.  Ansonsten wird die
++ .B IFF_BROADCAST
++ Flagge f\(:ur diese Schnittstelle gesetzt bzw. gel\(:oscht.
++ .TP
++-.B "[-]pointopoint [Adr]"
+++.B "[\-]pointopoint [Adr]"
++ Dieses Schl\(:usselwort aktiviert den
++ .B Punkt-zu-Punkt
++ Modus einer Schnittstelle.  Das bedeutet, da\(ss eine Verbindung zwischen zwei
++@@ -193,7 +193,7 @@ Kommando gemacht werden.
++ W\(:ahrend AppleTalk DDP und IPX Adressen angezeigt werden, k\(:onnen sie mit
++ diesem Kommando nicht ge\(:andert werden.
++ .SH SIEHE AUCH
++-route(8), netstat(8), arp(8), rarp(8), ipchains(8)
+++route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5).
++ .SH AUTOREN
++ Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
++ .br
++Index: net-tools/man/de_DE/netstat.8
++===================================================================
++--- net-tools.orig/man/de_DE/netstat.8
+++++ net-tools/man/de_DE/netstat.8
++@@ -9,7 +9,7 @@
++ .\" Modified: Tuan Hoang tuan@optimus.mitre.org 
++ .\"
++ .\"
++-.TH NETSTAT 8 "2007-12-02" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
+++.TH NETSTAT 8 "2007-12-02" "net\-tools" "Handbuch f\(:ur Linuxprogrammierer"
++ 
++ .SH NAME
++ netstat \- Anzeige von Netzwerksverbindungen, Routentabellen, Schnittstellenstatistiken, maskierten Verbindungen, Netlink-Nachrichten und Mitgliedschaft in Multicastgruppen
++@@ -76,17 +76,17 @@ Ohne Optionen zeigt
++ den Zustand von offenen Sockets an.  Wird keine Adressfamilie angegeben, dann
++ werden die offenen Sockets aller konfigurierten Adressfamilien gedruckt.
++ Die Option
++-.B -e
+++.B \-e
++ gibt zus\(:atzliche Informationen aus (User ID).  Mit der Option
++-.B -v
+++.B \-v
++ gibt
++ .B netstat
++ zus\(:atzlich Fehlermeldungen \(:uber von Kernel nicht unterst\(:utzte
++ Adressfamilien aus.  Die Option
++-.B -p
+++.B \-p
++ gibt zus\(:atzlich die PID und den Namen des Programms, das den Socket
++ ge\(:offnet hat, aus.
++-.B -a
+++.B \-a
++ druckt alle Sockets einschlie\(sslich der auf Verbinungen wartenden
++ Serversockets aus.  Die Adressfamilie
++ .B inet
++@@ -96,9 +96,9 @@ zeigt RAW, UDP und TCP Sockets an.
++ Die
++ .BR \-r ", " \-\-route
++ Option gibt die Routentabellen des Kernels im gleichen Format wie
++-.B "route -e" 
+++.B "route \-e" 
++ aus.
++-.B "netstat -er" 
+++.B "netstat \-er" 
++ benutzt das Ausgabeformat von
++ .BR route .
++ Wegen Details siehe
++@@ -106,18 +106,18 @@ Wegen Details siehe
++ 
++ .SS "\-i, \-\-interfaces"
++ Wird die
++-.BR -i ", " --interfaces
+++.BR \-i ", " \-\-interfaces
++ Option verwendet,  so wird eine Tabelle aller Schnittstellen
++ ausgedruckt.  Die Ausgabe ist im Format von
++-.B "ifconfig -e"
+++.B "ifconfig \-e"
++ und wird in
++ .BR ifconfig (8)
++ beschrieben.
++-.B "netstat -ei" 
+++.B "netstat \-ei" 
++ druckt eine Tabelle f\(:ur Interfaces wie
++ .BR ifconfig .
++ Die
++-.B -a
+++.B \-a
++ Option schlie\(sst Schnittstellen, die gar nicht konfiguriert sind in die
++ Ausgabe ein, d.h. die die
++ .BR U = UP
++@@ -126,7 +126,7 @@ Flagge nicht gesetzt haben).
++ .SS "\-M, \-\-masquerade"
++ 
++ Eine Liste aller maskierten Sitzungen wird dargestellt.  Der
++-.B -e 
+++.B \-e 
++ Schalter schlie\(sst zus\(:atzlich Information \(:uber Sequenznummern und
++ Deltas, die durch das Umschreiben von FTP-Sitzungen (PORT Kommando) verursacht
++ werden.  Maskieren wird dazu verwendet um Maschinen mit inoffiziellen
++@@ -196,24 +196,24 @@ im Sekundenabstand die Ausgabe, bis es a
++ .SS "Proto" 
++ Das von Socket verwendete Protokoll (TCP, UDP, RAW).
++ 
++-.SS "Recv-Q"
+++.SS "Recv\-Q"
++ Die Anzahl von Bytes, die noch nicht von der Anwendung vom Socket abgeholt
++ wurden.
++ 
++-.SS "Send-Q"
+++.SS "Send\-Q"
++ Die Anzahl von Bytes, die von der Gegenseite noch nicht best\(:atigt wurde.
++ 
++ .SS "Lokale Adresse" 
++ Die lokale Adresse (lokaler Rechnername) und Portnummer des Sockets.  Au\(sser
++ bei Verwendung der
++-.B -n
+++.B \-n
++ Option wird die Socketadresse nach dem kanonischen Rechnernamen und die
++ Portnummer in den zugeh\(:origen Dienstenamen aufgel\(sst.
++ 
++ .SS "Gegenadresse"
++ Die Adresse und Portnummer der Gegenseite des Sockets.  Wie bei lokalen
++ Adressen schaltet der
++-.B -n
+++.B \-n
++ Schalter die Umwandlung von Rechneradresse und Portnummer ab.
++ 
++ .SS "State"
++@@ -267,7 +267,7 @@ Der Socket wartet auf eingehende Verbind
++ angezeit, wenn die
++ The socket is listening for incoming connections. Those sockets are only
++ displayed if the
++-.BR -a , --listening
+++.BR \-a , \-\-listening
++ Option gegeben wird.
++ .TP
++ .I
++@@ -285,7 +285,7 @@ Der Name oder die Benutzer-ID des Eigent
++ .SS "PID/Program name"
++ Durch einen Schr\(:agstrich abgetrenntes Paar von Prozess-ID und Programmname
++ des Programms, das diesen Socket besitzt.  Die Option
++-.B -p
+++.B \-p
++ schaltet die Anzeige dieser Spalte ein.  Es werden
++ .B root
++ Privilegien ben\(:otigt um die n\(:otigen Daten zu erhalten.  F\(:ur IPX
++@@ -359,7 +359,7 @@ Der Socket ist unbenutzt
++ H\(:Ort
++ Der Socket lauscht nach Verbindungsanfragen.  Diese Sockets werden nur
++ angezeigt, wenn die
++-.BR -a , --listening
+++.BR \-a , \-\-listening
++ Option gesetzt ist.
++ .TP
++ .I
++@@ -411,7 +411,7 @@ werden.)
++ 
++ .PP
++ .SH BEMERKUNGEN
++-Seit der Kern Version 2.2 zeigt netstat -i keine Schnittstellenstatistiken
+++Seit der Kern Version 2.2 zeigt netstat \-i keine Schnittstellenstatistiken
++ von Schnittstellenaliasen mehr an.  Um Statistiken per Schnittstelle zur
++ erhalten, m\(:ussen jetzt mit dem
++ .BR ipchains(8) 
++@@ -489,14 +489,14 @@ so kann unsinnige Information ausgegeben
++ unwahrscheinlich.
++ .br
++ Die
++-.B netstat -i
+++.B netstat \-i
++ die beschrieben wird sollte nach einigem S\(:aubern der BETA-Version des
++ Codes des Net-Tools Packets funktionieren.
++ 
++ .PP
++ .SH AUTOREN
++ Die Benutzerschnittstelle wurde von Fred Baumgarten
++-<dc6iq@insu1.etec.uni-karlsruhe.de> geschrieben, die Manpage zum gr\(:o\(ssten
+++<dc6iq@insu1.etec.uni\-karlsruhe.de> geschrieben, die Manpage zum gr\(:o\(ssten
++ Teil von Matt Welsh <mdw@tc.cornell.edu>.  Sie wurde von Alan Cox
++ <Alan.Cox@linux.org> aktualisiert, ben\(:otigt aber weitere Arbeit.
++ .br
++Index: net-tools/man/de_DE/plipconfig.8
++===================================================================
++--- net-tools.orig/man/de_DE/plipconfig.8
+++++ net-tools/man/de_DE/plipconfig.8
++@@ -1,4 +1,4 @@
++-.TH PLIPCONFIG 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
+++.TH PLIPCONFIG 8 "6. M\(:arz 1999" "net\-tools" "Handbuch f\(:ur Linuxprogrammierer"
++ .SH NAME
++ plipconfig \- Einstellung von PLIP Schnittstellen-Parametern
++ .SH SYNOPSIS
++Index: net-tools/man/de_DE/rarp.8
++===================================================================
++--- net-tools.orig/man/de_DE/rarp.8
+++++ net-tools/man/de_DE/rarp.8
++@@ -1,14 +1,14 @@
++-.TH RARP 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
+++.TH RARP 8 "6. M\(:arz 1999" "net\-tools" "Handbuch f\(:ur Linuxprogrammierer"
++ .SH NAME
++ rarp \- Manipulation des RARP-Caches
++ .SH SYNOPSIS
++-.B "rarp [-V] [--version] [-h] [--help]"
+++.B "rarp [\-V] [\-\-version] [\-h] [\-\-help]"
++ .br
++-.B "rarp -a"
+++.B "rarp \-a"
++ .br
++-.B "rarp [-v] -d Rechnername ..."
+++.B "rarp [\-v] \-d Rechnername ..."
++ .br
++-.B "rarp [-v] [-t type] -s Rechnername hw_addr"
+++.B "rarp [\-v] [\-t type] \-s Rechnername hw_addr"
++ .SH BESCHREIBUNG
++ .B Rarp
++ kann die RARP-Tabelle des Kernels auf verschiedene Arten manipulieren.  Die
++Index: net-tools/man/de_DE/route.8
++===================================================================
++--- net-tools.orig/man/de_DE/route.8
+++++ net-tools/man/de_DE/route.8
++@@ -1,4 +1,4 @@
++-.TH ROUTE 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
+++.TH ROUTE 8 "2007-12-02" "net\-tools" "Handbuch f\(:ur Linuxprogrammierer"
++ .SH NAME
++ route \- Anzeigen der IP-Routen-Tabelle
++ .SH SYNOPSIS
++@@ -51,11 +51,11 @@ Schnittstelle]
++ .RB [ \-V ] 
++ .RB [ \-\-version ]
++ .RB [ \-h ]
++-.RB [ \--help ]
+++.RB [ \-\-help ]
++ .SH BESCHREIBUNG
++ .B Route
++ wird zum \(:Andern der IP-Routing-Tabelle der Kernels verwendet.  Seine
++-prim\(:are Verwendung ist statische Routen f\*:ur bestimmte Rechner oder
+++prim\(:are Verwendung ist statische Routen f\(:ur bestimmte Rechner oder
++ Netzwerke \(:uber eine Schnittstelle einzutragen, nachdem diese mit dem
++ Programm
++ .BR ifconfig (8)
++@@ -92,13 +92,13 @@ Das
++ ist ein Netzwerk.
++ 
++ .TP
++-.B -host
+++.B \-host
++ daS
++ .B Ziel
++ ist ein Rechner
++ 
++ .TP 
++-.B -F
+++.B \-F
++ Zeit die FIB Routentabelle des Kerns an.  Das Ausgabeformat kann mit den
++ Optionen
++ .B \-e
++@@ -107,7 +107,7 @@ and
++ ge\(:andert werden.
++ 
++ .TP 
++-.B -C
+++.B \-C
++ zeigt den Routencache des Kernels an.
++ 
++ .TP
++@@ -120,8 +120,8 @@ f\(:ugt eine Route zu.
++ 
++ .TP
++ .B Ziel
++-Das Zielnetzwerk oder -System.  Die Angabe von sowohl IP-Adressen in Form
++-von dezimalen durch Punkt getrennten Quadrupeln als auch Rechner- und
+++Das Zielnetzwerk oder \(hySystem.  Die Angabe von sowohl IP-Adressen in Form
+++von dezimalen durch Punkt getrennten Quadrupeln als auch Rechner\(hy und
++ Netznamen ist zul\(:assig.
++ 
++ .TP
++@@ -130,7 +130,7 @@ Netznamen ist zul\(:assig.
++ 
++ .TP
++ .B gw Router
++-Alle IP-Pakete f\(:ur das Zielnetzwerk / -System werden zum angegebenen
+++Alle IP-Pakete f\(:ur das Zielnetzwerk / \(hySystem werden zum angegebenen
++ Router weitergeleitet.
++ 
++ .B ANMERKUNG:
++@@ -202,7 +202,7 @@ der Optionen (metric, netmask, gw und de
++ 
++ .SH BEISPIELE
++ .TP
++-.B route add -net 127.0.0.0
+++.B route add \-net 127.0.0.0
++ erzeugt die normale Loopbackroute mit der Netzmaske 255.0.0.0 (Netzwerk Klasse
++ A, ermittelt aus der Zieladresse) und assoziert sie mit der Schnittstelle lo
++ unter der Annahme, da\(ss dieses Ger\(:at vorher mit
++@@ -210,18 +210,18 @@ unter der Annahme, da\(ss dieses Ger\(:a
++ konfiguriert wurde. 
++ 
++ .TP 
++-.B route add -net 192.56.76.0 netmask 255.255.255.0 dev eth0
+++.B route add \-net 192.56.76.0 netmask 255.255.255.0 dev eth0
++ Legt eine Route zum Netzwerk 192.56.76.x \(:uber eth0 an.  Die Angabe der
++ Klasse C Netzmaske ist in diesem Fall nicht n\(:otig, 192.* Klasse C
++ IP-Adressen sind.  Das Wort dev darf in diesem Fall ausgelassen werden.
++ 
++ .TP
++-.B route add default gw mango-gw
+++.B route add default gw mango\-gw
++ legt eine Standardroute, d.h. eine Route die verwendet wird, wenn keine andere
++-Route passt, an.  Alle Pakete \(:uber diese Route werden \(:uber mango-gw
+++Route passt, an.  Alle Pakete \(:uber diese Route werden \(:uber mango\-gw
++ weitergeleitet.  Die Schnittstelle, die tats\(:achlich f\(:ur diese Route
++-verwendet wird, h\(:angt davon ab, wie mango-gw erreicht werden kann.  Zuvor
++-mu\(ss mango-gw bereits \(:uber eine andere Route erreicht werden k\(:onnen.
+++verwendet wird, h\(:angt davon ab, wie mango\-gw erreicht werden kann.  Zuvor
+++mu\(ss mango\-gw bereits \(:uber eine andere Route erreicht werden k\(:onnen.
++ 
++ .TP
++ .B route add ipx4 sl0
++@@ -229,7 +229,7 @@ Legt eine Route zum Rechner ipx4 \(:uber
++ wird angenommen da\(ss ipx4 der SLIP-Rechner auf der Gegenseite ist.
++ 
++ .TP
++-.B route add -net 192.57.66.0 netmask 255.255.255.0 gw ipx4
+++.B route add \-net 192.57.66.0 netmask 255.255.255.0 gw ipx4
++ Dieses Kommando sorgt daf\(:ur, dass das Netz 192.57.66.x \(:uber die
++ obige Route \(:uber die SLIP-Schnittstelle weitergeleitet wird.
++ 
++@@ -250,7 +250,7 @@ Dies installiert eine zur\(:uckweisende 
++ Die Ausgabe der Kernelroutentabelle besteht aus folgenden Spalten
++ .TP
++ .B Ziel
++-Das Zielnetzwerk oder -System.
+++Das Zielnetzwerk oder \(hySystem.
++ .TP
++ .B Router
++ Die Adresse des weiterleitenden Routers oder "*", wenn keine gesetzt ist.
++@@ -296,10 +296,10 @@ von Routend\(:amonen ben\(:otigt werden.
++ Anzahl der Referenzen auf diese Route.  Wird vom Linux Kern nicht benutzt.
++ .TP
++ .B Benutzer
++-Zahl der Suchvorg\(:ange nach dieser Route.  Abh\(:angig von -F und -C
++-werden entweder fehlgeschlagene Suchen im Cache (-F) oder Cache-Treffer (-C)
++-Count of lookups for the route.  Depending on the use of -F and -C this will
++-be either route cache misses (-F) or hits (-C).
+++Zahl der Suchvorg\(:ange nach dieser Route.  Abh\(:angig von \-F und \-C
+++werden entweder fehlgeschlagene Suchen im Cache (\-F) oder Cache-Treffer (\-C)
+++Count of lookups for the route.  Depending on the use of \-F and \-C this will
+++be either route cache misses (\-F) or hits (\-C).
++ .TP
++ .B Schnittstelle
++ Schnittstelle auf die Pakete f\(:ur diese Route geleitet werden.
++@@ -345,6 +345,6 @@ zugef\(:ugt.  Bernd Eckenfels hat schlie
++ irtt beigesteuert und den Code mit dem von Netstat vereinigt.
++ .SH AUTOREN
++ .B Route
++-wird zur Zeit von Phil Blundel (Philip.Blundell@pobox.com) gewartet.
+++wird zur Zeit von Phil Blundel <Philip.Blundell@pobox.com> und Bernd Eckenfels <net-tools@lina.inka.de> gewartet.
++ .SH \(:Ubersetzung
++ Ralf B\(:achle <ralf@gnu.org>
++Index: net-tools/man/de_DE/slattach.8
++===================================================================
++--- net-tools.orig/man/de_DE/slattach.8
+++++ net-tools/man/de_DE/slattach.8
++@@ -1,8 +1,8 @@
++-.TH SLATTACH 8 "6. M\(:arz 1999" "net-tools" "slattach"
+++.TH SLATTACH 8 "6. M\(:arz 1999" "net\-tools" "slattach"
++ .SH NAME
++ slattach \- Anbindung einer Netzwerksschnittstelle an eine serielle Verbindung
++ .SH SYNOPSIS
++-.B "slattach [-dehlLmnqv] [-c Kommando] [-p Protokoll] [-s Geschwindigkeit]
+++.B "slattach [\-dehlLmnqv] [\-c Kommando] [\-p Protokoll] [\-s Geschwindigkeit]
++ [Terminal]"
++ .br
++ .SH BESCHREIBUNG
++@@ -12,46 +12,46 @@ Reihe von m\(:oglichen Netzwerksmodi umz
++ m\(:oglich, es zur Verbindung mit anderen Computern zu verwenden.
++ .SH OPTIONEN
++ .TP
++-.B "[-c Kommando]"
+++.B "[\-c Kommando]"
++ Den Befehl
++ .B Kommando
++ beim Auflegen der Verbindung ausf\(:uhren.  Die kann benutzt werden um
++ Skripte laufen zu lassen oder eine Verbindung nach Abbruch wiederaufzubauen.
++ .TP
++-.B "[-d]"
+++.B "[\-d]"
++ Zus\(:atzliche Ausgaben zur Fehlersuche einschalten.  N\(:utzlich, wenn
++ eine Konfiguration nicht arbeitet.
++ .TP
++-.B "[-h]"
+++.B "[\-h]"
++ Beenden, wenn der Tr\(:ager verloren geht.  Dies funktioniert sowohl auf
++ /dev/tty als auch auf /dev/cua Ger\(:aten dadurch, da\(ss der Tr\(:ager
++ alle 15 Sekunden \(:uberpr\(:uft wird.
++-.B "[-v]"
+++.B "[\-v]"
++ Ausf\(:uhrliche Ausgaben.  Die ist n\(:utzlich in Shellskripten.
++ .TP
++-.B "[-q]"
+++.B "[\-q]"
++ Schaltet alle Ausgaben aus.
++ .TP
++-.B "[-l]"
+++.B "[\-l]"
++ Erzeugt eine Sperrdatei in /var/lock \(:ahnlich wie UUCP.
++ .TP
++-.B "[-n]"
+++.B "[\-n]"
++ Equivalent mit dem
++ .B mesg n
++ Befehl.
++ .TP
++-.B "[-m]"
+++.B "[\-m]"
++ Versetzt \fBnot\fP die Verbindung in den 8-bit raw-Modus.
++ .TP
++-.B "[-e]"
+++.B "[\-e]"
++ Beenden sofort nach der Initialisierung des Ger\(:ats anstelle darauf zu
++ warten, da\(ss die Leitung aufgelegt wird.
++ .TP
++-.B "[-L]"
+++.B "[\-L]"
++ Aktiviert 3-Draht-Betrieb.  Das Terminal wird in die CLOCAL Betriebsart
++ geschaltet und der Tr\(:ager wird nicht \(:uberwacht.
++ .TP
++-.B "[-p Protokoll]"
+++.B "[\-p Protokoll]"
++ Setzt ein spezifisches Protkoll um eine Leitung zu benutzen.  Die
++ Voreinstellung ist
++ .BR cslip ,
++@@ -79,7 +79,7 @@ Verbindungen sollte stattdessen das
++ .B axattach
++ Programm verwendet werden.
++ .TP
++-.B "[-s Geschwindigkeit]"
+++.B "[\-s Geschwindigkeit]"
++ Setzt eine von der Voreinstellung abweichende \(:Ubertragungseschwindigkeit.
++ .PP
++ Werden keine Argument gegeben, sie wird das aktuelle Terminal, das ist
++Index: net-tools/man/en_US/arp.8
++===================================================================
++--- net-tools.orig/man/en_US/arp.8
+++++ net-tools/man/en_US/arp.8
++@@ -1,4 +1,4 @@
++-.TH ARP 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
+++.TH ARP 8 "2007-12-01" "net\-tools" "Linux Programmer's Manual"
++ .SH NAME
++ arp \- manipulate the system ARP cache
++ .SH SYNOPSIS
++@@ -167,8 +167,8 @@ used with 2.4 and newer kernels.
++ Similar to the
++ .B \-s
++ option, only this time the address info is taken from file
++-.B filename
++-.  This can be used if ARP entries for a lot of hosts have to be
+++.B filename.
+++This can be used if ARP entries for a lot of hosts have to be
++ set up.  The name of the data file is very often
++ .IR /etc/ethers , 
++ but this is not official. If no filename is specified /etc/ethers
++@@ -196,7 +196,7 @@ flag. Permanent entries are marked with
++ and published entries have the
++ .B P
++ flag.
++-.SH EXAMPLES
+++.SH EXSAMPLES
++ .B /usr/sbin/arp -i eth0 -Ds 10.0.0.2 eth1 pub
++ 
++ This will answer ARP requests for 10.0.0.2 on eth0 with the MAC address for
++Index: net-tools/man/en_US/ethers.5
++===================================================================
++--- net-tools.orig/man/en_US/ethers.5
+++++ net-tools/man/en_US/ethers.5
++@@ -1,4 +1,4 @@
++-.TH ETHERS 5 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
+++.TH ETHERS 5 "May 15th, 2005" "" "File formats"
++ .SH NAME \"{{{roff}}}\"{{{
++ ethers \- Ethernet address to IP number database
++ .\"}}}
++@@ -7,17 +7,17 @@ ethers \- Ethernet address to IP number 
++ IP numbers, one line for each IP number:
++ .sp
++ .RS
++-\fIEthernet\-address\fP  \fIIP\-number\fP
+++\fIEthernet-address\fP  \fIIP-number\fP
++ .RE
++ .sp
++ The two items are separated by any number of SPACE and/or TAB characters.
++ A \fB#\fP at the beginning of a line starts a comment
++-which extends to the end of the line.  The \fIEthernet\-address\fP is
+++which extends to the end of the line.  The \fIEthernet-address\fP is
++ written as
++ .IR x : x : x : x : x : x ,
++ where \fIx\fP is a hexadecimal number between \fB0\fP and \fBff\fP
++ which represents one byte of the address, which is in network byte
++-order (big-endian).  The \fIIP\-number\fP may be a hostname which
+++order (big-endian).  The \fIIP-number\fP may be a hostname which
++ can be resolved by DNS or a dot separated number.
++ .\"}}}
++ .SH EXAMPLES \"{{{
++Index: net-tools/man/en_US/hostname.1
++===================================================================
++--- net-tools.orig/man/en_US/hostname.1
+++++ net-tools/man/en_US/hostname.1
++@@ -1,4 +1,4 @@
++-.TH HOSTNAME 1 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
+++.TH HOSTNAME 1 "28 Jan 1996" "net\-tools" "Linux Programmer's Manual"
++ 
++ .SH NAME
++ hostname \- show or set the system's host name
++Index: net-tools/man/en_US/ifconfig.8
++===================================================================
++--- net-tools.orig/man/en_US/ifconfig.8
+++++ net-tools/man/en_US/ifconfig.8
++@@ -1,4 +1,4 @@
++-.TH IFCONFIG 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
+++.TH IFCONFIG 8 "2007-12-02" "net\-tools" "Linux Programmer's Manual"
++ .SH NAME
++ ifconfig \- configure a network interface
++ .SH SYNOPSIS
++@@ -45,7 +45,7 @@ supported address families include
++ display all interfaces which are currently available, even if down
++ .TP
++ .B -s
++-display a short list (like netstat -i)
+++display a short list (like netstat \-i)
++ .TP
++ .B -v
++ be more verbose for some error conditions
++Index: net-tools/man/en_US/mii-tool.8
++===================================================================
++--- net-tools.orig/man/en_US/mii-tool.8
+++++ net-tools/man/en_US/mii-tool.8
++@@ -1,7 +1,7 @@
++ .\" Copyright (C) 2000 David A. Hinds -- dhinds@pcmcia.sourceforge.org
++ .\" mii-tool.8 1.5 2000/04/25 22:58:19
++ .\"
++-.TH MII\-TOOL 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
+++.TH MII\-TOOL 8 "2004/03/28 23:30:00" "net\-tools"
++ 
++ .SH NAME
++ mii\-tool \- view, manipulate media-independent interface status
++Index: net-tools/man/en_US/nameif.8
++===================================================================
++--- net-tools.orig/man/en_US/nameif.8
+++++ net-tools/man/en_US/nameif.8
++@@ -1,4 +1,4 @@
++-.TH NAMEIF 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
+++.TH NAMEIF 8 "18 Oct 2000" "net\-tools" "Linux's Administrator's Manual"
++ .SH NAME
++ nameif \- name network interfaces based on MAC addresses
++ .SH SYNOPSIS
++Index: net-tools/man/en_US/netstat.8
++===================================================================
++--- net-tools.orig/man/en_US/netstat.8
+++++ net-tools/man/en_US/netstat.8
++@@ -23,7 +23,7 @@ netstat \- Print network connections, ro
++ .RB [ \-\-listening | \-l ]
++ .RB [ \-\-all | \-a ]
++ .RB [ \-\-numeric | \-n ]
++-.RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ]
+++.RB [ \-\-numeric-hosts "] [" \-\-numeric-ports "] [" \-\-numeric\-users ]
++ .RB [ \-\-symbolic | \-N ]
++ .RB [ \-\-extend | \-e  [ \-\-extend | \-e] ]
++ .RB [ \-\-timers | \-o ]
++@@ -186,11 +186,9 @@ Print routing information from the route
++ .SS "Proto" 
++ The protocol (tcp, udp, raw) used by the socket. 
++ .SS "Recv\-Q"
++-Established: The count of bytes not copied by the user program connected to this socket.
++-Listening: Since Kernel 2.6.18 this column contains the current syn backlog.
+++The count of bytes not copied by the user program connected to this socket.
++ .SS "Send\-Q"
++-Established: The count of bytes not acknowledged by the remote host.
++-Listening: Since Kernel 2.6.18 this column contains the maximum size of the syn backlog.
+++The count of bytes not acknowledged by the remote host.
++ .SS "Local Address" 
++ Address and port number of the local end of the socket.  Unless the
++ .BR \-\-numeric " (" \-n )
++Index: net-tools/man/en_US/plipconfig.8
++===================================================================
++--- net-tools.orig/man/en_US/plipconfig.8
+++++ net-tools/man/en_US/plipconfig.8
++@@ -1,4 +1,4 @@
++-.TH PLIPCONFIG 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
+++.TH PLIPCONFIG 8 "17 February 1995" "" ""
++ .SH NAME
++ plipconfig \- fine tune PLIP device parameters 
++ .SH SYNOPSIS
++Index: net-tools/man/en_US/rarp.8
++===================================================================
++--- net-tools.orig/man/en_US/rarp.8
+++++ net-tools/man/en_US/rarp.8
++@@ -1,4 +1,4 @@
++-.TH RARP 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
+++.TH RARP 8 "4 August 1997" "net\-tools" "Linux Programmer's Manual"
++ .SH NAME
++ rarp \- manipulate the system RARP table
++ .SH SYNOPSIS
++Index: net-tools/man/en_US/route.8
++===================================================================
++--- net-tools.orig/man/en_US/route.8
+++++ net-tools/man/en_US/route.8
++@@ -1,4 +1,4 @@
++-.TH ROUTE 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
+++.TH ROUTE 8 "2007-12-02" "net\-tools" "Linux Programmer's Manual"
++ .SH NAME
++ route \- show / manipulate the IP routing table
++ .SH SYNOPSIS
++Index: net-tools/man/en_US/slattach.8
++===================================================================
++--- net-tools.orig/man/en_US/slattach.8
+++++ net-tools/man/en_US/slattach.8
++@@ -1,4 +1,4 @@
++-.TH SLATTACH 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
+++.TH SLATTACH 8 "10 Oct 2006" "" ""
++ .SH NAME
++ slattach \- attach a network interface to a serial line
++ .SH SYNOPSIS
++Index: net-tools/man/fr_FR/arp.8
++===================================================================
++--- net-tools.orig/man/fr_FR/arp.8
+++++ net-tools/man/fr_FR/arp.8
++@@ -1,12 +1,12 @@
++-.TH ARP 8 "5 Jan 1999" "net-tools" "Linux Programmer's Manual"
+++.TH ARP 8 "5 Jan 1999" "net\-tools" "Linux Programmer's Manual"
++ .SH NOM
++ arp \- manipule la table ARP du système
++ .SH SYNOPSIS
++ .B arp 
++ .RB [ \-vn ] 
++ .RB [ "\-H type" ] 
++-.RB [ "-i if" ] 
++-.B -a 
+++.RB [ "\-i if" ] 
+++.B \-a 
++ .RB [ nom_hôte ]
++ .PP
++ .B arp 
++@@ -19,14 +19,14 @@ arp \- manipule la table ARP du système
++ .RB [ \-v ] 
++ .RB [ "\-H type" ] 
++ .RB [ "\-i if" ] 
++-.B -s nom_hôte hw_addr
+++.B \-s nom_hôte hw_addr
++ .RB [ temp ] 
++ .PP
++ .B arp 
++ .RB [ \-v ] 
++ .RB [ "\-H type" ] 
++ .RB [ "\-i if" ] 
++-.B -s nom_hôte hw_addr
+++.B \-s nom_hôte hw_addr
++ .RB [ "netmask nm" ] 
++ .B pub
++ .PP
++@@ -34,15 +34,15 @@ arp \- manipule la table ARP du système
++ .RB [ \-v ] 
++ .RB [ "\-H type" ] 
++ .RB [ "\-i if" ] 
++-.B -Ds nom_hôte ifa
+++.B \-Ds nom_hôte ifa
++ .RB [ "netmask nm" ] 
++ .B pub
++ .PP
++ .B arp 
++ .RB [ \-vnD ]
++ .RB [ "\-H type" ] 
++-.RB [ "-i if" ]
++-.B -f nom_fichier
+++.RB [ "\-i if" ]
+++.B \-f nom_fichier
++ 
++ .SH DESCRIPTION
++ .B Arp
++@@ -61,7 +61,7 @@ Dit à l'utilisateur ce qui se passe en é
++ Affiche les adresses numériques au lieu d'essayer de déterminer les nom
++ d'hôtes symboliques.
++ .TP
++-.B "\-H type, \-\-hw-type type"
+++.B "\-H type, \-\-hw\-type type"
++ En positionnant ou lisant les entrées ARP, ce paramètre optionnel indique
++ à 
++ .B arp
++@@ -92,7 +92,7 @@ les entrées seront affichées.
++ Enlève une entrée pour l'hôte spécifié.  Ceci peut être
++ utilisé si l'hôte concerné ne fonctionne plus, par exemple.
++ .TP
++-.B "\-D, \-\-use-device"
+++.B "\-D, \-\-use\-device"
++ Utilise l'adresse matérielle de l'interface
++ .BR ifa
++ .
++@@ -178,7 +178,7 @@ et les entrées 'pub' ont l'indicateur
++ rarp(8), route(8), ifconfig(8), netstat(8)
++ .SH AUTEUR
++ Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> avec les améliorations
++-apportées par le mainteneur des net-tools Bernd Eckenfels
++-<net-tools@lina.inka.de>.
+++apportées par le mainteneur des net\-tools Bernd Eckenfels
+++<net\-tools@lina.inka.de>.
++ .SH TRADUCTION
++ Jean Michel VANSTEENE (vanstee@worldnet.fr)
++Index: net-tools/man/fr_FR/hostname.1
++===================================================================
++--- net-tools.orig/man/fr_FR/hostname.1
+++++ net-tools/man/fr_FR/hostname.1
++@@ -1,4 +1,4 @@
++-.TH HOSTNAME 1 "15 Mars 1999" "net-tools" "Linux Programmer's Manual"
+++.TH HOSTNAME 1 "15 Mars 1999" "net\-tools" "Linux Programmer's Manual"
++ .SH NOM
++ hostname \- affiche ou définit le nom d'hôte du système
++ .br
++@@ -22,7 +22,7 @@ nodename \- affiche ou définit le nom de
++ .RB [ \-f ]
++ .RB [ \-\-fqdn ]
++ .RB [ \-i ]
++-.RB [ \-\-ip-address ]
+++.RB [ \-\-ip\-address ]
++ .RB [ \-\-long ]
++ .RB [ \-s ]
++ .RB [ \-\-short ]
++@@ -177,7 +177,7 @@ le nom FQDN et le nom de domaine (qui fa
++ .I "\-h, \-\-help"
++ Affiche un message d'aide et se termine.
++ .TP
++-.I "\-i, \-\-ip-address"
+++.I "\-i, \-\-ip\-address"
++ Affiche la (les) adresse(s) IP de l'hôte.
++ .TP
++ .I "\-n, \-\-node"
++@@ -203,9 +203,9 @@ Affiche le nom de domaine NIS. Si un par
++ .SH FICHIERS
++ .B /etc/hosts
++ .SH AUTEURS
++-Peter Tobias, <tobias@et-inf.fho-emden.de>
+++Peter Tobias, <tobias@et\-inf.fho\-emden.de>
++ .br
++-Bernd Eckenfels, <net-tools@lina.inka.de> (NIS et pages de manuel).
+++Bernd Eckenfels, <net\-tools@lina.inka.de> (NIS et pages de manuel).
++ .br
++ Steve Whitehouse, <SteveW@ACM.org> (Support DECnet et pages de manuel).
++ .SH TRADUCTION
++Index: net-tools/man/fr_FR/ifconfig.8
++===================================================================
++--- net-tools.orig/man/fr_FR/ifconfig.8
+++++ net-tools/man/fr_FR/ifconfig.8
++@@ -1,4 +1,4 @@
++-.TH IFCONFIG 8 "4 August 1997" "net-tools" "Linux Programmer's Manual"
+++.TH IFCONFIG 8 "2007-12-02" "net\-tools" "Linux Programmer's Manual"
++ .SH NOM
++ ifconfig \- configure une interface réseau
++ .SH SYNOPSIS
++@@ -20,7 +20,7 @@ seul le paramètre
++ .B interface
++ est donné, il affiche seulement l'état de l'interface correspondante;
++ si seul le paramètre
++-.B -a
+++.B \-a
++ est fourni, il affiche l'état de toutes les interfaces, même celles qui
++ ne sont pas actives.
++ Autrement, il considère qu'il faut positionner de nouvelles valeurs.
++@@ -128,14 +128,14 @@ permet d'indiquer au pilote de détecter 
++ utilisé. Une fois de plus, tous les périphériques ne supportent pas cette
++ option.
++ .TP
++-.B "[-]broadcast [adr]"
+++.B "[\-]broadcast [adr]"
++ Si l'adresse est également donnée, définit l'adresse broadcast
++ protocolaire pour cette interface. Autrement, il permet d'armer (ou désarmer)
++ l'indicateur
++ .B IFF_BROADCAST
++ de l'interface.
++ .TP
++-.B "[-]pointopoint [adr]"
+++.B "[\-]pointopoint [adr]"
++ Ce mot clé valide le mode
++ .B point-à-point
++ d'une interface, signifiant qu'il existe un lien direct entre 2 machines,
++@@ -196,7 +196,7 @@ comptabilité particulières pour l'adress
++ Même si les adresses appletalk DDP et IPX peuvent être affichées,
++ elles ne peuvent être modifiées avec cette commande.
++ .SH VOIR AUSSI
++-route(8), netstat(8), arp(8), rarp(8), ipchains(8)
+++route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5).
++ .SH AUTHORS
++ Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
++ .br
++Index: net-tools/man/fr_FR/netstat.8
++===================================================================
++--- net-tools.orig/man/fr_FR/netstat.8
+++++ net-tools/man/fr_FR/netstat.8
++@@ -8,7 +8,7 @@
++ .\" Modified: Tuan Hoang tuan@optimus.mitre.org 
++ .\"
++ .\"
++-.TH NETSTAT 8 "2007-12-02" "net-tools" "Linux Programmer's Manual"
+++.TH NETSTAT 8 "2007-12-02" "net\-tools" "Linux Programmer's Manual"
++ 
++ .SH NAME
++ netstat \- Affiche les connexions réseau, les tables de routage, les
++@@ -76,17 +76,17 @@ ouvertes. C'est l'option par défaut : si
++ d'adresses, les sockets actives de toutes les familles d'adresses seront
++ affichées.
++ Avec le paramètre
++-.B -e
+++.B \-e
++ vous obtenez quelques informations supplémentaires (userid). Avec le paramètre
++-.B -v
+++.B \-v
++ vous pouvez demander à netstat de signaler des familles d'adresses connues
++ non supportées par le noyau. Le paramètre
++-.B -o
+++.B \-o
++ affiche des informations supplémentaires sur les timers réseau. En donnant
++ le paramètre
++-.B -p
+++.B \-p
++ vous verrez le PID et le nom du processus à qui appartient la socket. Le paramètre
++-.B -a
+++.B \-a
++ affiche toutes les sockets, y compris les sockets d'écoute des serveurs. La famille
++ d'adresses
++ .B inet
++@@ -97,9 +97,9 @@ Avec le paramètre
++ .BR \-r ", " \-\-route
++ vous pouvez visualiser les tables de routage dans le même format qu'avec la
++ commande
++-.B "route -e" 
+++.B "route \-e" 
++ .
++-.B "netstat -er" 
+++.B "netstat \-er" 
++ utilisera le format de la commande
++ .BR route .
++ Veuillez consulter
++@@ -108,19 +108,19 @@ pour plus de détails.
++ 
++ .SS "\-i, \-\-interfaces \fIiface\fI"
++ Si vous utilisez l'option
++-.BR -i ", " --interfaces
+++.BR \-i ", " \-\-interfaces
++ , une table de toutes (ou de l'interface
++ .IR iface 
++ spécifiée) les interfaces réseau sera affichée. Le format de sortie est le
++ même que celui de la commande
++-.B "ifconfig -e"
+++.B "ifconfig \-e"
++ , et est décrit dans
++ .BR ifconfig (8).
++-.B "netstat -ei"
+++.B "netstat \-ei"
++ affiche une table ou une seule entrée d'interface comme la commande 
++ .BR ifconfig .
++ Avec le paramètre
++-.B -a
+++.B \-a
++ , vous pouvez inclure les interfaces qui ne sont pas configurées (c.a.d qui
++ n'ont pas l'indicateur
++ .BR U = UP
++@@ -129,7 +129,7 @@ armé).
++ .SS "\-M, \-\-masquerade"
++ 
++ Permet de voir les sessions ayant de l'IP-masquerade. Avec le paramètre
++-.B -e 
+++.B \-e 
++ vous pouvez inclure quelques informations concernant les numéros de
++ séquence et les deltas causés par des réécritures de données sur des
++ sessions FTP (commande PORT). Le support de l'IP-Masquerade est utilisé
++@@ -197,24 +197,24 @@ l'interrompiez.
++ .SS "Proto" 
++ Le protocole (TCP, UDP, RAW) utilisé par la socket. 
++ 
++-.SS "Recv-Q"
+++.SS "Recv\-Q"
++ Le nombre d'octets non encore lus par le programme utilisateur connecté
++ à cette socket.
++ 
++-.SS "Send-Q"
+++.SS "Send\-Q"
++ Le nombre d'octets non encore acquittés par l'hôte distant.
++ 
++ .SS "Local Address (Adresse locale)" 
++ L'adresse locale (nom d'hôte local) et numéro de port de la
++ socket. Sauf si l'option
++-.B -n
+++.B \-n
++ est donnée, l'adresse de la prise est traduite en nom d'hôte,
++ et le numéro de port est traduit en nom de service correspondant.
++ 
++ .SS "Foreign Address (Adresse distante)"
++ L'adresse distante (nom d'hôte distant) et le numéro de port de
++ la prise. Comme pour l'adresse locale et le numéro de port, l'option
++-.B -n
+++.B \-n
++ invalide la traduction du nom d'hôte et de service.
++ 
++ .SS "State (Etat)"
++@@ -264,7 +264,7 @@ Le distant termine, et la socket est fer
++ LISTEN
++ La socket est à l'écoute de connexions entrantes. Ces sockets ne sont
++ affichées que si le paramètre
++-.BR -a , --listening
+++.BR \-a , \-\-listening
++ est fourni.
++ .TP
++ .I
++@@ -282,7 +282,7 @@ Le nom d'utilisateur ou l'UID du proprié
++ .SS "PID/Program name (PID/Nom de Programme)"
++ Le PID et le nom du programme (séparés par un slash) propriétaire de la
++ socket. Le paramètre
++-.B -p
+++.B \-p
++ active l'affichage de cette colonne. Vous devez avoir les droits de
++ .B root
++ puisque vous devez avoir les droits d'accès aux processus pour visualiser
++@@ -357,7 +357,7 @@ La socket n'est pas allouée
++ LISTENING
++ La socket est à l'écoute de demandes de connexions. Ces sockets ne sont
++ affichées que si le paramètre
++-.BR -a , --listening
+++.BR \-a , \-\-listening
++ est fourni.
++ .TP
++ .I
++@@ -406,7 +406,7 @@ Affiche le chemin correspondant à l'atta
++ 
++ .PP
++ .SH NOTES
++-Depuis la version 2.2 du noyau, netstat -i n'affiche plus les statistiques
+++Depuis la version 2.2 du noyau, netstat \-i n'affiche plus les statistiques
++ des interfaces alias. Pour obtenir les compteurs par interface alias, vous
++ devez définir des règles spécifiques à l'aide de la commande
++ .BR ipchains (8).
++@@ -482,18 +482,18 @@ si une socket change d'état au moment ou
++ Ceci est peut probable.
++ .br
++ Le paramètre
++-.B netstat -i
+++.B netstat \-i
++ est décrit tel qu'il fonctionnera lorsque le code de la version BETA du
++-paquetage net-tools aura été nettoyé.
+++paquetage net\-tools aura été nettoyé.
++ 
++ .PP
++ .SH AUTEURS
++ L'interface utilisateur de netstat a été développée par
++-Fred Baumgarten <dc6iq@insu1.etec.uni-karlsruhe.de>. Les pages du
+++Fred Baumgarten <dc6iq@insu1.etec.uni\-karlsruhe.de>. Les pages du
++ manuel essentiellement écrites par Matt Welsh
++ <mdw@tc.cornell.edu>. Mis à jour par Alan Cox <Alan.Cox@linux.org>.
++ .br
++-La page de manuel et la commande incluse dans le paquetage net-tools
+++La page de manuel et la commande incluse dans le paquetage net\-tools
++ a été totallement réécrite par Bernd Eckenfels 
++ <ecki@linux.de>.
++ .SH TRADUCTION
++Index: net-tools/man/fr_FR/rarp.8
++===================================================================
++--- net-tools.orig/man/fr_FR/rarp.8
+++++ net-tools/man/fr_FR/rarp.8
++@@ -1,14 +1,14 @@
++-.TH RARP 8 "4 Août 1997" "net-tools" "Linux Programmer's Manual"
+++.TH RARP 8 "4 Août 1997" "net\-tools" "Linux Programmer's Manual"
++ .SH NOM
++ rarp \- manipule la table système RARP
++ .SH SYNOPSIS
++-.B "rarp [-V] [--version] [-h] [--help]"
+++.B "rarp [\-V] [\-\-version] [\-h] [\-\-help]"
++ .br
++-.B "rarp -a"
+++.B "rarp \-a"
++ .br
++-.B "rarp [-v] -d nom_d_hote ..."
+++.B "rarp [\-v] \-d nom_d_hote ..."
++ .br
++-.B "rarp [-v] [-t type] -s nom_d_hote adr_materiel"
+++.B "rarp [\-v] [\-t type] \-s nom_d_hote adr_materiel"
++ .SH DESCRIPTION
++ .B Rarp
++ manipule la table RARP du noyau de différentes façons.  Les options de base
++Index: net-tools/man/fr_FR/route.8
++===================================================================
++--- net-tools.orig/man/fr_FR/route.8
+++++ net-tools/man/fr_FR/route.8
++@@ -1,4 +1,4 @@
++-.TH ROUTE 8 "8 Août 1997" "net-tools" "Linux Programmer's Manual"
+++.TH ROUTE 8 "2007-12-02" "net\-tools" "Linux Programmer's Manual"
++ .SH NAME
++ route \- affiche / manipule la table de routage IP
++ .SH SYNOPSIS
++@@ -51,7 +51,7 @@ If]
++ .RB [ \-V ] 
++ .RB [ \-\-version ]
++ .RB [ \-h ]
++-.RB [ \--help ]
+++.RB [ \-\-help ]
++ .SH DESCRIPTION
++ .B Route
++ manipule la table de routage IP du noyau.  Son utilisation première
++@@ -77,7 +77,7 @@ savoir pourquoi la route vers votre serv
++ .TP
++ .B \-e
++ utilise
++-.BR netstat (8)-format
+++.BR netstat (8)\-format
++ pour l'affichage de la table de routage.
++ .B \-ee 
++ Génère une très longue ligne avec tous les paramètres à partir de la table
++@@ -90,13 +90,13 @@ la
++ est un réseau.
++ 
++ .TP
++-.B -host
+++.B \-host
++ la
++ .B cible 
++ est un hôte.
++ 
++ .TP 
++-.B -F
+++.B \-F
++ affiche la table de routage FIB du noyau. L'organisation peut être changée avec
++ .B \-e
++ et
++@@ -104,7 +104,7 @@ et
++ .
++ 
++ .TP 
++-.B -C
+++.B \-C
++ affiche le cache de routage du noyau. 
++ 
++ .TP
++@@ -188,25 +188,25 @@ modificateurs de route (metric - netmask
++ 
++ .SH EXEMPLES
++ .TP
++-.B route add -net 127.0.0.0
+++.B route add \-net 127.0.0.0
++ ajoute l'entrée loopback normale, en utilisant le masque 255.0.0.0 (réseau
++ de classe A, selon l'adresse de destination) et associée avec l'interface 
++ "lo" (en supposant que ce périphérique a été correctement configuré avec
++ .BR ifconfig (8)). 
++ 
++ .TP 
++-.B route add -net 192.56.76.0 netmask 255.255.255.0 dev eth0
+++.B route add \-net 192.56.76.0 netmask 255.255.255.0 dev eth0
++ ajoute une route vers le réseau 192.56.76.x via 
++ "eth0". Le masque de classe C n'est pas vraiment nécessaire ici car
++ 192.* est une adresse IP de classe C. Le mot "dev" peut être omis. 
++ 
++ .TP
++-.B route add default gw mango-gw
+++.B route add default gw mango\-gw
++ ajoute une route par défaut (qui sera utilisée si aucune autre route ne
++ convient). Tous les paquets empreintant cette route passeront par
++-"mango-gw". Le périphérique qui sera effectivement utilisé pour cette route
++-dépend de la façon dont on atteint "mango-gw" - la route statique vers
++-"mango-gw" devra être préalablement configurée. 
+++"mango\-gw". Le périphérique qui sera effectivement utilisé pour cette route
+++dépend de la façon dont on atteint "mango\-gw" - la route statique vers
+++"mango\-gw" devra être préalablement configurée. 
++ 
++ .TP
++ .B route add ipx4 sl0
++@@ -214,7 +214,7 @@ ajoute une route vers l'hôte "ipx4" via 
++ "ipx4" est l'hôte SLIP).
++ 
++ .TP
++-.B route add -net 192.57.66.0 netmask 255.255.255.0 gw ipx4
+++.B route add \-net 192.57.66.0 netmask 255.255.255.0 gw ipx4
++ Cette commande route le réseau "192.57.66.x" par l'ancienne route vers l'interface SLIP.
++ 
++ .TP
++@@ -285,8 +285,8 @@ de routage.
++ Nombre de références à cette route. (Pas utilisé dans le noyau Linux.)
++ .TP
++ .B Use
++-Count of lookups for the route.  Depending on the use of -F and -C this will
++-be either route cache misses (-F) or hits (-C).
+++Count of lookups for the route.  Depending on the use of \-F and \-C this will
+++be either route cache misses (\-F) or hits (\-C).
++ .TP
++ .B Iface
++ Interface vers laquelle les paquets empruntant cette route seront envoyés.
++@@ -330,6 +330,6 @@ Linus Torvalds pour pl15. Alan Cox a ajo
++ la gestion des fenêtres et MSS pour Linux 1.1.22. Le support de irtt 
++ et la fusion avec netstat ont été réalisés par Bernd Eckenfels.
++ .SH AUTEUR
++-Maintenu par Phil Blundell <Philip.Blundell@pobox.com>.
+++Maintenu par Phil Blundell <Philip.Blundell@pobox.com> et Bernd Eckenfels <net-tools@lina.inka.de>.
++ .SH TRADUCTION
++-Jean-Michel VANSTEENE (vanstee@worldnet.fr)
+++Jean-Michel VANSTEENE <vanstee@worldnet.fr>
++Index: net-tools/man/fr_FR/slattach.8
++===================================================================
++--- net-tools.orig/man/fr_FR/slattach.8
+++++ net-tools/man/fr_FR/slattach.8
++@@ -2,7 +2,7 @@
++ .SH NOM
++ slattach \- attache une interface réseau à une ligne série
++ .SH SYNOPSIS
++-.B "slattach [-dehlLmnqv] [-c commande] [-p proto] [-s vitesse] [tty]"
+++.B "slattach [\-dehlLmnqv] [\-c commande] [\-p proto] [\-s vitesse] [tty]"
++ .br
++ .SH DESCRIPTION
++ .B Slattach
++@@ -12,46 +12,46 @@ ceci vous permettant de l'utiliser pour 
++ vers d'autres systèmes.
++ .SH OPTIONS
++ .TP
++-.B "[-c commande]"
+++.B "[\-c commande]"
++ Exécute
++ .B `commande'
++ lorsque la ligne est suspendue. Ceci peut être utilisé pour lancer
++ des scripts ou réétablir des connexions quand un lien tombe.
++ .TP
++-.B "[-d]"
+++.B "[\-d]"
++ Valide le débogage.  Utile pour déterminer pourquoi une configuration
++ ne fonctionne pas.
++ .TP
++-.B "[-h]"
+++.B "[\-h]"
++ Termine lorsque la porteuse est perdue. Ceci fonctionne à la fois sur
++ les périphériques /dev/tty et /dev/cua en contrôlant directement
++ l'état de la porteuse toutes les 15 secondes.
++ .TP
++-.B "[-v]"
+++.B "[\-v]"
++ Valide le mode verbeux.  Utile pour les shell scripts.
++ .TP
++-.B "[-q]"
+++.B "[\-q]"
++ Opère en mode silencieux - pas de messages du tout.
++ .TP
++-.B "[-l]"
+++.B "[\-l]"
++ Crée un fichier de vérouillage pour le périphérique comme
++ pour UUCP dans /var/lock.
++ .TP
++-.B "[-n]"
+++.B "[\-n]"
++ Equivalent à la commande "mesg n".
++ .TP
++-.B "[-m]"
+++.B "[\-m]"
++ \fBn'\fPinitialise \fBpas\fP la ligne en mode raw 8 bits.
++ .TP
++-.B "[-e]"
+++.B "[\-e]"
++ Termine correctement après l'initialisation du périphérique,
++ au lieu d'attendre que la ligne soit suspendue.
++ .TP
++-.B "[-L]"
+++.B "[\-L]"
++ Valide les opérations 3 lignes. Le terminal est mis en mode CLOCAL, 
++ la surveillance de porteuse est invalidée.
++ .TP
++-.B "[-p proto]"
+++.B "[\-p proto]"
++ Définit le protocole spécifique à utiliser sur la ligne.
++ La valeur par défaut est 
++ .B "cslip"
++@@ -75,7 +75,7 @@ pour être actif sur la ligne. Pour les c
++ .B axattach
++ doit être utilisé.
++ .TP
++-.B "[-s vitesse]"
+++.B "[\-s vitesse]"
++ Définit la vitesse de la ligne, différente de la valeur par défaut.
++ .PP
++ Si aucun argument n'est donné, la ligne courante du terminal
++Index: net-tools/man/pt_BR/arp.8
++===================================================================
++--- net-tools.orig/man/pt_BR/arp.8
+++++ net-tools/man/pt_BR/arp.8
++@@ -1,12 +1,12 @@
++-.TH ARP 8 "22 de junho de 1996" "net-tools" "Manual do Programador Linux"
+++.TH ARP 8 "22 de junho de 1996" "net\-tools" "Manual do Programador Linux"
++ .SH NOME
++ arp \- manipula o cache ARP do sistema
++ .SH SINOPSE
++ .B arp 
++ .RB [ \-vn ] 
++ .RB [ "\-H tipo" ] 
++-.RB [ "-i if" ] 
++-.B -a 
+++.RB [ "\-i if" ] 
+++.B \-a 
++ .RB [ máquina ]
++ .PP
++ .B arp 
++@@ -20,7 +20,7 @@ arp \- manipula o cache ARP do sistema
++ .RB [ \-v ] 
++ .RB [ "\-H tipo" ] 
++ .RB [ "\-i if" ] 
++-.B -s máquina endereço_hardware
+++.B \-s máquina endereço_hardware
++ .RB [ temp ] 
++ .RB [ nopub ]
++ .PP
++@@ -28,7 +28,7 @@ arp \- manipula o cache ARP do sistema
++ .RB [ \-v ] 
++ .RB [ "\-H tipo" ] 
++ .RB [ "\-i if" ] 
++-.B -s máquina endereço_hardware
+++.B \-s máquina endereço_hardware
++ .RB [ "netmask nm" ] 
++ .B pub
++ .PP
++@@ -36,15 +36,15 @@ arp \- manipula o cache ARP do sistema
++ .RB [ \-v ] 
++ .RB [ "\-H tipo" ] 
++ .RB [ "\-i if" ] 
++-.B -Ds máquina ifa
+++.B \-Ds máquina ifa
++ .RB [ "netmask nm" ] 
++ .B pub
++ .PP
++ .B arp 
++ .RB [ \-vnD ]
++ .RB [ "\-H tipo" ] 
++-.RB [ "-i if" ]
++-.B -f arquivo
+++.RB [ "\-i if" ]
+++.B \-f arquivo
++ 
++ .SH DESCRIÇÃO
++ .B arp
++@@ -62,7 +62,7 @@ Mostra ao usuário o que está acontecendo
++ mostra endereços numéricos, ao invés de tentar determinar os nomes simbólicos da
++ máquina, porta e usuário.
++ .TP
++-.B "\-H type, \-\-hw-type type"
+++.B "\-H type, \-\-hw\-type type"
++ Quando configurando ou lendo o cache ARP, este parâmetro opcional informa ao
++ .B arp
++ que classe de entradas devem ser verificadas. O valor padrão deste parâmetro é
++@@ -96,7 +96,7 @@ ou
++ para decidir se uma entrada pública ou privada deve ser removida. Se você
++ não informar uma destas flags as duas entradas serão removidas.
++ .TP
++-.B "\-D, \-\-use-device"
+++.B "\-D, \-\-use\-device"
++ Usa o endereço de hardware da interface 
++ .BR ifa
++ .TP
++@@ -170,7 +170,7 @@ e entradas publicadas tem uma flag 
++ .I /etc/ethers
++ .SH AUTOR
++ Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> com muitas melhorias
++-feitas pelo mantenedor do net-tools, Bernd Eckenfels <net-tools@lina.inka.de>.
+++feitas pelo mantenedor do net\-tools, Bernd Eckenfels <net\-tools@lina.inka.de>.
++ Tradução para a língua portuguesa feita por
++ Arnaldo Carvalho de Melo <acme@conectiva.com.br> em 11/abril/1998.
++ Revisado por 
++Index: net-tools/man/pt_BR/hostname.1
++===================================================================
++--- net-tools.orig/man/pt_BR/hostname.1
+++++ net-tools/man/pt_BR/hostname.1
++@@ -1,4 +1,4 @@
++-.TH HOSTNAME 1 "28 de janeiro de 1996" "net-tools" "Manual do Programador Linux"
+++.TH HOSTNAME 1 "28 de janeiro de 1996" "net\-tools" "Manual do Programador Linux"
++ 
++ .SH NOME
++ hostname \- mostra ou configura o nome da máquina 
++@@ -21,7 +21,7 @@ ypdomainname \- mostra ou configura o no
++ .RB [ \-f ]
++ .RB [ \-\-fqdn ]
++ .RB [ \-i ]
++-.RB [ \-\-ip-address ]
+++.RB [ \-\-ip\-address ]
++ .RB [ \-\-long ]
++ .RB [ \-s ]
++ .RB [ \-\-short ]
++@@ -161,7 +161,7 @@ do domínio DNS (que é parte do FQDN) no 
++ .I "\-h, \-\-help"
++ Mostra uma mensagem sobre como utilizar o comando e termina.
++ .TP
++-.I "\-i, \-\-ip-address"
+++.I "\-i, \-\-ip\-address"
++ Mostra o(s) endereço(s) IP da máquina.
++ .TP
++ .I "\-s, \-\-short"
++@@ -180,9 +180,9 @@ Mostra o nome do domínio NIS. Se um parâ
++ .SH ARQUIVOS
++ .B /etc/hosts
++ .SH AUTOR
++-Peter Tobias, <tobias@et-inf.fho-emden.de>
+++Peter Tobias, <tobias@et\-inf.fho\-emden.de>
++ .BR
++-Bernd Eckenfels, <net-tools@lina.inka.de> (NIS e página man).
+++Bernd Eckenfels, <net\-tools@lina.inka.de> (NIS e página man).
++ .BR
++ Arnaldo Carvalho de Melo, <acme@conectiva.com.br> Tradução para a língua
++ portuguesa.
++Index: net-tools/man/pt_BR/ifconfig.8
++===================================================================
++--- net-tools.orig/man/pt_BR/ifconfig.8
+++++ net-tools/man/pt_BR/ifconfig.8
++@@ -1,4 +1,4 @@
++-.TH IFCONFIG 8 "10 de fevereiro de 1996" "net-tools" "Manual do Programador Linux"
+++.TH IFCONFIG 8 "2007-12-02" "net\-tools" "Manual do Programador Linux"
++ .SH NOME
++ ifconfig \- configura uma interface de rede
++ .SH SINOPSE
++@@ -61,7 +61,7 @@ o sinal de menos (\-) estiver presente a
++ .TP
++ .B "[\-]trailers" 
++ Habilita ou desabilita o uso de trailer em frames Ethernet. Não é
++-utilizada na implementação atual do pacote net-tools.
+++utilizada na implementação atual do pacote net\-tools.
++ .TP
++ .B "[\-]allmulti" 
++ Habilita ou desabilita o modo
++@@ -97,7 +97,7 @@ uso de sub-redes.
++ Configura a linha de interrupção (IRQ) usada por este dispositivo. Muitos
++ dispositivos não suportam configuração dinâmica de IRQ.
++ .TP
++-.B "[-]broadcast [endereço]"
+++.B "[\-]broadcast [endereço]"
++ Se o argumento endereço for informado, configura o endereço de protocolo
++ broadcast para esta interface. De outra forma ele somente configura a flag
++ .B IFF_BROADCAST
++@@ -105,7 +105,7 @@ da interface.  Se a palavra-chave for pr
++ .B (-)
++ , então a flag é removida.
++ .TP
++-.B "[-]pointopoint [endereço]"
+++.B "[\-]pointopoint [endereço]"
++ Esta palavra-chave habilita o modo
++ .B ponto-a-ponto
++ da interface, significando que ela é um link direto entre duas máquinas
++@@ -169,7 +169,7 @@ endereços usando o comando
++ Os endereços appletalk DDP e IPX serão mostrados, mas não podem ser alterados
++ com este comando.
++ .SH VEJA TAMBÉM
++-route(8), netstat(8), arp(8), rarp(8), ipchains(8)
+++route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5).
++ .SH AUTORES
++ Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
++ Alan Cox, <Alan.Cox@linux.org>
++Index: net-tools/man/pt_BR/netstat.8
++===================================================================
++--- net-tools.orig/man/pt_BR/netstat.8
+++++ net-tools/man/pt_BR/netstat.8
++@@ -8,7 +8,7 @@
++ .\" Traduzido para português por Arnaldo Carvalho de Melo <acme@conectiva.com.br>
++ .\" Revisado por Jorge Luiz Godoy Filho <jorge@bestway.com.br>
++ .\"
++-.TH NETSTAT 8 "2007-12-02" "net-tools" "Manual do Programador Linux"
+++.TH NETSTAT 8 "2007-12-02" "net\-tools" "Manual do Programador Linux"
++ 
++ .SH NOME
++ netstat \- Mostra conexões de rede, tabelas de roteamento, estatísticas de interface e conexões
++@@ -72,14 +72,14 @@ Você pode ver o estado das conexões de r
++ abertos. Esta é a operação padrão: se você não especificar nenhuma
++ família de endereços, os sockets ativos de todas as famílias de endereços
++ configuradas serão mostrados. Com
++-.B -e
+++.B \-e
++ você obterá informações adicionais (userid). Com a chave
++-.B -v
+++.B \-v
++ você poderá fazer com que o netstat reclame sobre famílias de endereços
++ conhecidas que não sejam suportadas pelo kernel. A opção
++-.B -o
+++.B \-o
++ mostra algumas informações adicionais sobre temporizadores de rede.
++-.B -a
+++.B \-a
++ mostra todos os sockets, incluindo sockets de servidores. A família de
++ endereços
++ .B inet
++@@ -89,8 +89,8 @@ mostrará sockets raw, udp e tcp.
++ Com a opção
++ .BR \-r ", " \-\-route
++ você obterá as tabelas de roteamento do kernel no mesmo formato usado por
++-.BR "route -e" .
++-.B "netstat -er" 
+++.BR "route \-e" .
+++.B "netstat \-er" 
++ usará o formato de apresentação do comando
++ .BR route .
++ Por favor veja
++@@ -99,18 +99,18 @@ para maiores detalhes.
++ 
++ .SS "\-i, \-\-interfaces \fIiface\fI"
++ Se você usar a opção
++-.BR -i ", " --interfaces
+++.BR \-i ", " \-\-interfaces
++ , uma tabela de todas (ou da
++ .IR iface
++ especificada) as interfaces de rede será mostrada. A saída usa o formato
++-.B "ifconfig -e"
+++.B "ifconfig \-e"
++ , e é descrita em
++ .BR ifconfig (8).
++-.B "netstat -ei" 
+++.B "netstat \-ei" 
++ mostrará uma tabela ou uma entrada de interface como
++ .B ifconfig
++ mostra. Com a chave
++-.B -a
+++.B \-a
++ , você pode incluir interfaces que não estejam configuradas (i.e. não tem
++ a flag 
++ .BR U = UP
++@@ -119,7 +119,7 @@ configurada).
++ .SS "\-M, \-\-masquerade"
++ 
++ Uma lista de todas as sessões mascaradas também pode ser vista. Com a chave
++-.B -e 
+++.B \-e 
++ você pode incluir mais algumas informações sobre numeração sequencial e deltas
++ , causados por reescritas de dados em sessões FTP (comando PORT).
++ O suporte a mascaramento é usado para esconder máquinas em endereços de
++@@ -179,23 +179,23 @@ você o interrompa.
++ .SS "Proto" 
++ O protocolo (tcp, udp, raw) usado pelo socket.
++ 
++-.SS "Recv-Q"
+++.SS "Recv\-Q"
++ O contador de bytes não copiados pelo programa conectado a este socket.
++ 
++-.SS "Send-Q"
+++.SS "Send\-Q"
++ O contador de bytes não confirmados pela máquina remota.
++ 
++ .SS "Endereço Local" 
++ O endereço local (nome da máquina local) e o numero da porta do socket. A menos
++ que a chave
++-.B -n
+++.B \-n
++ seja especificada o endereço do socket será resolvido para seu nome de máquina
++ canônico e o número da porta será traduzido para o serviço correspondente.
++ 
++ .SS "Endereço Remoto"
++ O endereço remoto (nome da máquina remota) e o número da porta do socket. Como
++ com o endereço local, a chave
++-.B -n
+++.B \-n
++ desliga a resolução do nome da máquina e do serviço.
++ 
++ .SS "Estado"
++@@ -245,7 +245,7 @@ confirmação.
++ OUVINDO
++ O socket está ouvindo por conexões. Estes socket são somente mostrados se
++ a chave
++-.BR -a , --listening
+++.BR \-a , \-\-listening
++ for especificada.
++ .TP
++ .I
++@@ -329,7 +329,7 @@ Este socket não está alocado.
++ LISTENING
++ O socket está aguardando por uma solicitação de conexão. São mostrados
++ apenas se as opções
++-.BR -a , --listening
+++.BR \-a , \-\-listening
++ forem selecionadas.
++ .TP
++ .I
++@@ -372,7 +372,7 @@ Mostra o caminho (path) do processo do q
++ 
++ .PP
++ .SH NOTAS
++-Desde o kernel 2.2 o netstat -i não mostra estatísticas para apelidos (aliases)
+++Desde o kernel 2.2 o netstat \-i não mostra estatísticas para apelidos (aliases)
++ de interfaces. Para obter contadores por apelido de interface você precisa
++ configurar regras explícitas usando o comando
++ +.BR ipchains(8)
++@@ -447,20 +447,20 @@ Ocasionalmente informações estranhas pod
++ enquanto é visualizado. Isso é incomum.
++ .br
++ As opções descritas para
++-.B netstat -i
+++.B netstat \-i
++ foram descritas como deverão funcionar após alguma limpeza da liberação
++-BETA do pacote net-tools.
+++BETA do pacote net\-tools.
++ 
++ .PP
++ .SH AUTORES
++ A interface com o usuário foi escrita por Fred Baumgarten
++-<dc6iq@insu1.etec.uni-karlsruhe.de> a página do manual basicamente
+++<dc6iq@insu1.etec.uni\-karlsruhe.de> a página do manual basicamente
++ por Matt Welsh <mdw@tc.cornell.edu>. Foi atualizada por
++ Alan Cox <Alan.Cox@linux.org> mas poderia ter sido feita com um pouco
++ mais de trabalho.
++ .BR
++ .LP
++-A página do manual e os comandos incluídos no pacote net-tools
+++A página do manual e os comandos incluídos no pacote net\-tools
++ foram totalmente reescritos desde Bernd Eckenfels
++ <ecki@linux.de>.
++ .BR
++Index: net-tools/man/pt_BR/rarp.8
++===================================================================
++--- net-tools.orig/man/pt_BR/rarp.8
+++++ net-tools/man/pt_BR/rarp.8
++@@ -1,12 +1,12 @@
++-.TH RARP 8 "10 de fevereiro de 1996" "net-tools" "Manual do Programador Linux"
+++.TH RARP 8 "10 de fevereiro de 1996" "net\-tools" "Manual do Programador Linux"
++ .SH NOME
++ rarp \- manipula a tabela RARP do sistema
++ .SH SINOPSE
++-.B "rarp [-v] [-t tipo] -a [máquina]"
+++.B "rarp [\-v] [\-t tipo] \-a [máquina]"
++ .br
++-.B "rarp [-v] -d máquina ..."
+++.B "rarp [\-v] \-d máquina ..."
++ .br
++-.B "rarp [-v] [-t tipo] -s máquina endereço_hardware"
+++.B "rarp [\-v] [\-t tipo] \-s máquina endereço_hardware"
++ .SH DESCRIÇÃO
++ .B Rarp
++ manipula as tabelas RARP do kernel de varias formas. As opções principais
++Index: net-tools/man/pt_BR/route.8
++===================================================================
++--- net-tools.orig/man/pt_BR/route.8
+++++ net-tools/man/pt_BR/route.8
++@@ -1,4 +1,4 @@
++-.TH ROUTE 8 "27 Jan 1996" "net-tools" "Manual do Programador Linux"
+++.TH ROUTE 8 "2007-12-02" "net\-tools" "Manual do Programador Linux"
++ .SH NOME
++ route \- mostra / manipula a tabela de roteamento IP
++ .SH SINOPSE
++@@ -47,7 +47,7 @@ If]
++ .RB [ \-V ] 
++ .RB [ \-\-version ]
++ .RB [ \-h ]
++-.RB [ \--help ]
+++.RB [ \-\-help ]
++ .SH DESCRICAO
++ .B Route
++ manipula a tabela de roteamento IP do kernel. Seu principal uso é
++@@ -186,7 +186,7 @@ modificadores do route (metric - netmask
++ 
++ .SH EXEMPLOS
++ .TP
++-.B route add -net 127.0.0.0
+++.B route add \-net 127.0.0.0
++ Adiciona a entrada para a interface loopback normal, usando mascara igual
++ a 255.0.0.0 (rede classe A, determinada a partir do endereço de destino),
++ associada ao dispositivo "lo" (assumindo que este dispositivo tenha sido
++@@ -194,17 +194,17 @@ previamente configurado com o
++ .BR ifconfig (8)). 
++ 
++ .TP 
++-.B route add -net 192.56.76.0 netmask 255.255.255.0 dev eth0
+++.B route add \-net 192.56.76.0 netmask 255.255.255.0 dev eth0
++ Adiciona uma rota para a rede 192.56.76.x através da interface "eth0". O 
++ modificador de mascara classe C não é realmente necessário aqui por que
++ 192.* é um endereço IP de classe C. A palavra "dev" pode ser omitida aqui.
++ 
++ .TP
++-.B route add default gw mango-gw
+++.B route add default gw mango\-gw
++ Adiciona uma rota default (que será usada se nenhuma outra rota for encontrada).
++-Todos os pacotes que usarem esta rota serão passados para a máquina "mango-gw".
+++Todos os pacotes que usarem esta rota serão passados para a máquina "mango\-gw".
++ O dispositivo que será utilizado para esta rota depende de como é possível
++-alcançar "mango-gw" - a rota estática para "mango-gw" terá que ser configurada
+++alcançar "mango\-gw" - a rota estática para "mango\-gw" terá que ser configurada
++ previamente.
++ 
++ .TP
++@@ -213,12 +213,12 @@ Adiciona uma rota para a máquina "ipx4" 
++ que "ipx4" é a máquina SLIP).
++ 
++ .TP
++-.B route add -net 192.57.66.0 netmask 255.255.255.0 gw ipx4
+++.B route add \-net 192.57.66.0 netmask 255.255.255.0 gw ipx4
++ Este comando adiciona a rede "192.57.66.x" para ser alcançada através da
++ rota anterior através da interface SLIP.
++ 
++ .TP
++-.B route add -net 224.0.0.0 netmask 240.0.0.0 dev eth0
+++.B route add \-net 224.0.0.0 netmask 240.0.0.0 dev eth0
++ Isto é bem obscura, documentada para que as pessoas saibam como usá-la. 
++ Configura para que todas as rotas IP classe D (multicast) vão através da
++ interface "eth0". Esta é a linha de configuração normal a ser usada com
++@@ -239,8 +239,8 @@ A rede ou máquina de destino.
++ A máquina roteador ou '*' se nenhuma estiver configurada.
++ .TP
++ .B Mascara Genérica
++-A mascara para a rede destino. '255.255.255.255' para uma máquina de destino,
++-'0.0.0.0' para a rota
+++A mascara para a rede destino. '255.255.255.255' para uma máquina de
+++destino, '0.0.0.0' para a rota
++ .B default
++ .
++ .TP
++@@ -321,7 +321,7 @@ para o linux foi originalmente escrito p
++ Linus Torvalds para a versão pl15. Alan Cox adicionou as opções para
++ mss e window no kernel 1.1.22. O suporte a irtt (compartilhado com o
++ netstat) foi feito por Bernd Eckenfels.
+++.SH AUTHOR
+++Currently maintained by Phil Blundell <Philip.Blundell@pobox.com> and Bernd Eckenfels <net-tools@lina.inka.de>.
++ .SH TRADUÇÃO
++ Arnaldo Carvalho de Melo <acme@conectiva.com.br> - 13/04/1998
++-.SH BUGS
++-nenhum :)
+--- net-tools-1.60.orig/debian/patches/CVS-20020730-route.c_opts_64.patch
++++ net-tools-1.60/debian/patches/CVS-20020730-route.c_opts_64.patch
+@@ -0,0 +1,39 @@
++Add support for -6 & -4 flags to route.c
++From upstream CVS
++Index: net-tools/route.c
++===================================================================
++--- net-tools.orig/route.c
+++++ net-tools/route.c
++@@ -2,7 +2,7 @@
++  * route        This file contains an implementation of the command
++  *              that manages the IP routing table in the kernel.
++  *
++- * Version:     $Id: route.c,v 1.9 2001/04/15 14:41:17 pb Exp $
+++ * Version:     $Id: route.c,v 1.10 2002/07/30 05:24:20 ecki Exp $
++  *
++  * Maintainer:  Bernd 'eckes' Eckenfels, <net-tools@lina.inka.de>
++  *
++@@ -142,7 +142,7 @@ int main(int argc, char **argv)
++     }
++ 
++     /* Fetch the command-line arguments. */
++-    while ((i = getopt_long(argc, argv, "A:eCFhnNVv?", longopts, &lop)) != EOF)
+++    while ((i = getopt_long(argc, argv, "A:eCFhnN64Vv?", longopts, &lop)) != EOF)
++ 	switch (i) {
++ 	case -1:
++ 	    break;
++@@ -176,6 +176,14 @@ int main(int argc, char **argv)
++ 	    if ((i = aftrans_opt(optarg)))
++ 		exit(i);
++ 	    break;
+++	case '6':
+++	    if ((i = aftrans_opt("inet6")))
+++		exit(i);
+++	    break;
+++	case '4':
+++	    if ((i = aftrans_opt("inet")))
+++		exit(i);
+++	    break;
++ 	case 'V':
++ 	    version();
++ 	case 'h':
+--- net-tools-1.60.orig/debian/patches/CVS-lib_sync.patch
++++ net-tools-1.60/debian/patches/CVS-lib_sync.patch
+@@ -0,0 +1,1873 @@
++Sync with upstream CVS, for most files in lib/
++
++Index: net-tools/lib/Makefile
++===================================================================
++--- net-tools.orig/lib/Makefile
+++++ net-tools/lib/Makefile
++@@ -16,7 +16,7 @@
++ #
++ 
++ 
++-HWOBJS	 = hw.o loopback.o slip.o ether.o ax25.o ppp.o arcnet.o tr.o tunnel.o frame.o sit.o rose.o ash.o fddi.o hippi.o hdlclapb.o strip.o irda.o ec_hw.o x25.o
+++HWOBJS	 = hw.o loopback.o slip.o ether.o ax25.o ppp.o arcnet.o tr.o tunnel.o frame.o sit.o rose.o ash.o fddi.o hippi.o hdlclapb.o strip.o irda.o ec_hw.o x25.o eui64.o ib.o
++ AFOBJS	 = unix.o inet.o inet6.o ax25.o ipx.o ddp.o ipx.o netrom.o af.o rose.o econet.o x25.o
++ AFGROBJS = inet_gr.o inet6_gr.o ipx_gr.o ddp_gr.o netrom_gr.o ax25_gr.o rose_gr.o getroute.o x25_gr.o
++ AFSROBJS = inet_sr.o inet6_sr.o netrom_sr.o ipx_sr.o setroute.o x25_sr.o
++Index: net-tools/lib/ddp_gr.c
++===================================================================
++--- net-tools.orig/lib/ddp_gr.c
+++++ net-tools/lib/ddp_gr.c
++@@ -1,3 +1,20 @@
+++/*
+++ * lib/ddp_gr.c         Prinbting of DDP (AppleTalk) routing table
+++ *                      used by the NET-LIB.
+++ *
+++ * NET-LIB      
+++ *
+++ * Version:     $Id: ddp_gr.c,v 1.4 2002/06/02 05:25:15 ecki Exp $
+++ *
+++ * Author:      Ajax <ajax@firest0rm.org>
+++ *
+++ * Modification:
+++ *  2002-06-02 integrated into main source by Bernd Eckenfels
+++ *
+++ */
+++
+++/* TODO: name lookups (/etc/atalk.names?  NBP?) */
+++
++ #include "config.h"
++ 
++ #if HAVE_AFATALK
++@@ -16,9 +33,61 @@
++ #include "pathnames.h"
++ #include "intl.h"
++ 
+++/* stolen from inet_gr.c */
+++#define flags_decode(i,o) do {                  \
+++        o[0] = '\0';                            \
+++        if (i & RTF_UP) strcat(o, "U");         \
+++        if (i & RTF_GATEWAY) strcat(o, "G");    \
+++        if (i & RTF_REJECT) strcat(o, "!");     \
+++        if (i & RTF_HOST) strcat(o, "H");       \
+++        if (i & RTF_REINSTATE) strcat(o, "R");  \
+++        if (i & RTF_DYNAMIC) strcat(o, "D");    \
+++        if (i & RTF_MODIFIED) strcat(o, "M");   \
+++        if (i & RTF_DEFAULT) strcat(o, "d");    \
+++        if (i & RTF_ALLONLINK) strcat(o, "a");  \
+++        if (i & RTF_ADDRCONF) strcat(o, "c");   \
+++        if (i & RTF_NONEXTHOP) strcat(o, "o");  \
+++        if (i & RTF_EXPIRES) strcat(o, "e");    \
+++        if (i & RTF_CACHE) strcat(o, "c");      \
+++        if (i & RTF_FLOW) strcat(o, "f");       \
+++        if (i & RTF_POLICY) strcat(o, "p");     \
+++        if (i & RTF_LOCAL) strcat(o, "l");      \
+++        if (i & RTF_MTU) strcat(o, "u");        \
+++        if (i & RTF_WINDOW) strcat(o, "w");     \
+++        if (i & RTF_IRTT) strcat(o, "i");       \
+++        if (i & RTF_NOTCACHED) strcat(o, "n");  \
+++    } while (0)
+++
++ int DDP_rprint(int options)
++ {
++-    fprintf(stderr, _("Routing table for `ddp' not yet supported.\n"));
++-    return (1);
+++    FILE *fp;
+++    char *dest, *gw, *dev, *flags;
+++    char oflags[32];
+++    char *hdr = "Destination     Gateway         Device          Flags";
+++
+++    fp = fopen(_PATH_PROCNET_ATALK_ROUTE, "r");
+++
+++    if (!fp) {
+++        perror("Error opening " _PATH_PROCNET_ATALK_ROUTE);
+++        fprintf(stderr, "DDP (AppleTalk) not configured on this system.\n");
+++        return 1;
+++    }
+++
+++    fscanf(fp, "%as %as %as %as\n", &dest, &gw, &flags, &dev);
+++    free(dest); free(gw); free(dev); free(flags);
+++
+++    printf("%s\n", hdr);
+++
+++    while (fscanf(fp, "%as %as %as %as\n", &dest, &gw, &flags, &dev) == 4) {
+++        int iflags = atoi(flags);
+++        flags_decode(iflags, oflags);
+++        printf("%-16s%-16s%-16s%-s\n", dest, gw, dev, oflags);
+++        free(dest); free(gw); free(dev); free(flags);
+++    }
+++
+++    fclose(fp);
+++    
+++    return 0;
+++
++ }
++ #endif
++Index: net-tools/lib/ether.c
++===================================================================
++--- net-tools.orig/lib/ether.c
+++++ net-tools/lib/ether.c
++@@ -2,7 +2,7 @@
++  * lib/ether.c        This file contains an implementation of the "Ethernet"
++  *              support functions.
++  *
++- * Version:     $Id: ether.c,v 1.7 1999/09/27 11:00:47 philip Exp $
+++ * Version:     $Id: ether.c,v 1.8 2002/07/30 05:17:29 ecki Exp $
++  *
++  * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
++  *              Copyright 1993 MicroWalt Corporation
++@@ -39,7 +39,7 @@ static char *pr_ether(unsigned char *ptr
++ {
++     static char buff[64];
++ 
++-    snprintf(buff, sizeof(buff), "%02X:%02X:%02X:%02X:%02X:%02X",
+++    snprintf(buff, sizeof(buff), "%02x:%02x:%02x:%02x:%02x:%02x",
++ 	     (ptr[0] & 0377), (ptr[1] & 0377), (ptr[2] & 0377),
++ 	     (ptr[3] & 0377), (ptr[4] & 0377), (ptr[5] & 0377)
++ 	);
++Index: net-tools/lib/hw.c
++===================================================================
++--- net-tools.orig/lib/hw.c
+++++ net-tools/lib/hw.c
++@@ -2,7 +2,7 @@
++  * lib/hw.c   This file contains the top-level part of the hardware
++  *              support functions module.
++  *
++- * Version:     $Id: hw.c,v 1.17 2000/05/20 13:38:10 pb Exp $
+++ * Version:     $Id: hw.c,v 1.19 2008/10/03 01:52:04 ecki Exp $
++  *
++  * Maintainer:  Bernd 'eckes' Eckenfels, <net-tools@lina.inka.de>
++  *
++@@ -73,6 +73,10 @@ extern struct hwtype irda_hwtype;
++ 
++ extern struct hwtype ec_hwtype;
++ 
+++extern struct hwtype ib_hwtype;
+++
+++extern struct hwtype eui64_hwtype;
+++
++ static struct hwtype *hwtypes[] =
++ {
++ 
++@@ -144,6 +148,12 @@ static struct hwtype *hwtypes[] =
++ #if HAVE_HWX25
++     &x25_hwtype,
++ #endif
+++#if HAVE_HWIB
+++    &ib_hwtype,
+++#endif
+++#if HAVE_HWEUI64
+++    &eui64_hwtype,
+++#endif
++     &unspec_hwtype,
++     NULL
++ };
++@@ -217,6 +227,12 @@ void hwinit()
++ #if HAVE_HWEC
++     ec_hwtype.title = _("Econet");
++ #endif
+++#if HAVE_HWIB
+++    ib_hwtype.title = _("InfiniBand");
+++#endif
+++#if HAVE_HWEUI64
+++    eui64_hwtype.title = _("Generic EUI-64");
+++#endif
++     sVhwinit = 1;
++ }
++ 
++Index: net-tools/lib/inet.c
++===================================================================
++--- net-tools.orig/lib/inet.c
+++++ net-tools/lib/inet.c
++@@ -3,7 +3,7 @@
++  *              support functions for the net-tools.
++  *              (NET-3 base distribution).
++  *
++- * Version:    $Id: inet.c,v 1.13 1999/12/11 13:35:56 freitag Exp $
+++ * Version:    $Id: inet.c,v 1.14 2003/10/19 11:57:37 pb Exp $
++  *
++  * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
++  *              Copyright 1993 MicroWalt Corporation
++@@ -144,7 +144,7 @@ static int INET_rresolve(char *name, siz
++     struct hostent *ent;
++     struct netent *np;
++     struct addr *pn;
++-    unsigned long ad, host_ad;
+++    u_int32_t ad, host_ad;
++     int host = 0;
++ 
++     /* Grmpf. -FvK */
++@@ -155,7 +155,7 @@ static int INET_rresolve(char *name, siz
++ 	errno = EAFNOSUPPORT;
++ 	return (-1);
++     }
++-    ad = (unsigned long) sin->sin_addr.s_addr;
+++    ad = sin->sin_addr.s_addr;
++ #ifdef DEBUG
++     fprintf (stderr, "rresolve: %08lx, mask %08x, num %08x \n", ad, netmask, numeric);
++ #endif
++Index: net-tools/lib/inet6.c
++===================================================================
++--- net-tools.orig/lib/inet6.c
+++++ net-tools/lib/inet6.c
++@@ -3,7 +3,7 @@
++  *              support functions for the net-tools.
++  *              (most of it copied from lib/inet.c 1.26).
++  *
++- * Version:     $Id: inet6.c,v 1.10 2000/10/28 11:04:00 pb Exp $
+++ * Version:     $Id: inet6.c,v 1.12 2002/12/10 01:03:09 ecki Exp $
++  *
++  * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
++  *              Copyright 1993 MicroWalt Corporation
++@@ -44,6 +44,21 @@
++ 
++ extern int h_errno;		/* some netdb.h versions don't export this */
++ 
+++char * fix_v4_address(char *buf, struct in6_addr *in6) 
+++{ 
+++	if (IN6_IS_ADDR_V4MAPPED(in6->s6_addr)) { 
+++			char *s =strchr(buf, '.'); 
+++			if (s) { 
+++				while (s > buf && *s != ':')
+++					--s;
+++				if (*s == ':') ++s; 	
+++				else s = NULL; 
+++			} 	
+++			if (s) return s;
+++	} 
+++	return buf; 
+++} 
+++
++ static int INET6_resolve(char *name, struct sockaddr_in6 *sin6)
++ {
++     struct addrinfo req, *ai;
++@@ -83,14 +98,14 @@ static int INET6_rresolve(char *name, st
++ 	return (-1);
++     }
++     if (numeric & 0x7FFF) {
++-	inet_ntop(AF_INET6, &sin6->sin6_addr, name, 80);
+++	inet_ntop( AF_INET6, &sin6->sin6_addr, name, 80);
++ 	return (0);
++     }
++     if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
++         if (numeric & 0x8000)
++ 	    strcpy(name, "default");
++ 	else
++-	    strcpy(name, "*");
+++	    strcpy(name, "[::]");
++ 	return (0);
++     }
++ 
++@@ -109,13 +124,14 @@ static void INET6_reserror(char *text)
++ }
++ 
++ 
+++
++ /* Display an Internet socket address. */
++ static char *INET6_print(unsigned char *ptr)
++ {
++     static char name[80];
++ 
++     inet_ntop(AF_INET6, (struct in6_addr *) ptr, name, 80);
++-    return name;
+++	return fix_v4_address(name, (struct in6_addr *)ptr);
++ }
++ 
++ 
++@@ -129,13 +145,14 @@ static char *INET6_sprint(struct sockadd
++ 	return safe_strncpy(buff, _("[NONE SET]"), sizeof(buff));
++     if (INET6_rresolve(buff, (struct sockaddr_in6 *) sap, numeric) != 0)
++ 	return safe_strncpy(buff, _("[UNKNOWN]"), sizeof(buff));
++-    return (buff);
+++    return (fix_v4_address(buff, &((struct sockaddr_in6 *)sap)->sin6_addr));
++ }
++ 
++ 
++ static int INET6_getsock(char *bufp, struct sockaddr *sap)
++ {
++     struct sockaddr_in6 *sin6;
+++	char *p;
++ 
++     sin6 = (struct sockaddr_in6 *) sap;
++     sin6->sin6_family = AF_INET6;
++@@ -143,7 +160,9 @@ static int INET6_getsock(char *bufp, str
++ 
++     if (inet_pton(AF_INET6, bufp, sin6->sin6_addr.s6_addr) <= 0)
++ 	return (-1);
++-
+++	p = fix_v4_address(bufp, &sin6->sin6_addr);
+++	if (p != bufp) 
+++		memcpy(bufp, p, strlen(p)+1); 
++     return 16;			/* ?;) */
++ }
++ 
++Index: net-tools/lib/inet6_gr.c
++===================================================================
++--- net-tools.orig/lib/inet6_gr.c
+++++ net-tools/lib/inet6_gr.c
++@@ -1,4 +1,4 @@
++-/*
+++ /*
++    Modifications:
++    1998-07-01 - Arnaldo Carvalho de Melo - GNU gettext instead of catgets,
++    snprintf instead of sprintf
++@@ -71,11 +71,15 @@ int rprint_fib6(int ext, int numeric)
++         printf(_("INET6 (IPv6) not configured in this system.\n"));
++ 	return 1;
++     }
++-    printf(_("Kernel IPv6 routing table\n"));
++ 
++-    printf(_("Destination                                 "
++-	     "Next Hop                                "
++-	     "Flags Metric Ref    Use Iface\n"));
+++    if (numeric & RTF_CACHE)
+++    	printf(_("Kernel IPv6 routing cache\n"));
+++    else
+++    	printf(_("Kernel IPv6 routing table\n"));
+++
+++    printf(_("Destination                    "
+++	     "Next Hop                   "
+++	     "Flag Met Ref Use If\n"));
++ 
++     while (fgets(buff, 1023, fp)) {
++ 	num = sscanf(buff, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %4s%4s%4s%4s%4s%4s%4s%4s %02x %4s%4s%4s%4s%4s%4s%4s%4s %08x %08x %08x %08x %s\n",
++@@ -87,13 +91,19 @@ int rprint_fib6(int ext, int numeric)
++ 		     &slen,
++ 		     naddr6p[0], naddr6p[1], naddr6p[2], naddr6p[3],
++ 		     naddr6p[4], naddr6p[5], naddr6p[6], naddr6p[7],
++-		     &metric, &use, &refcnt, &iflags, iface);
+++		     &metric, &refcnt, &use, &iflags, iface);
++ #if 0
++ 	if (num < 23)
++ 	    continue;
++ #endif
++-	if (!(iflags & RTF_UP))
++-	    continue;
+++	if (iflags & RTF_CACHE) {
+++		if (!(numeric & RTF_CACHE))
+++			continue;
+++	} else {
+++		if (numeric & RTF_CACHE)
+++			continue;
+++	}
+++			
++ 	/* Fetch and resolve the target address. */
++ 	snprintf(addr6, sizeof(addr6), "%s:%s:%s:%s:%s:%s:%s:%s",
++ 		 addr6p[0], addr6p[1], addr6p[2], addr6p[3],
++@@ -112,7 +122,12 @@ int rprint_fib6(int ext, int numeric)
++ 		 inet6_aftype.sprint((struct sockaddr *) &snaddr6, 1));
++ 
++ 	/* Decode the flags. */
++-	strcpy(flags, "U");
+++
+++	flags[0]=0;
+++	if (iflags & RTF_UP)
+++	    strcat(flags, "U");
+++	if (iflags & RTF_REJECT)
+++	    strcat(flags, "!");
++ 	if (iflags & RTF_GATEWAY)
++ 	    strcat(flags, "G");
++ 	if (iflags & RTF_HOST)
++@@ -123,9 +138,19 @@ int rprint_fib6(int ext, int numeric)
++ 	    strcat(flags, "A");
++ 	if (iflags & RTF_CACHE)
++ 	    strcat(flags, "C");
+++	if (iflags & RTF_ALLONLINK)
+++	    strcat(flags, "a");
+++	if (iflags & RTF_EXPIRES)
+++	    strcat(flags, "e");
+++	if (iflags & RTF_MODIFIED)
+++	    strcat(flags, "m");
+++	if (iflags & RTF_NONEXTHOP)
+++	    strcat(flags, "n");
+++	if (iflags & RTF_FLOW)
+++	    strcat(flags, "f");
++ 
++ 	/* Print the info. */
++-	printf("%-43s %-39s %-5s %-6d %-2d %7d %-8s\n",
+++	printf("%-30s %-26s %-4s %-3d %-1d%6d %s\n",
++ 	       addr6, naddr6, flags, metric, refcnt, use, iface);
++     }
++ 
++@@ -144,8 +169,7 @@ int rprint_cache6(int ext, int numeric)
++     char addr6p[8][5], haddrp[6][3];
++ 
++     if (!fp) {
++-	ESYSNOT("nd_print", "ND Table");
++-	return 1;
+++	return rprint_fib6(ext, numeric | RTF_CACHE);
++     }
++     printf(_("Kernel IPv6 Neighbour Cache\n"));
++ 
++Index: net-tools/lib/inet_sr.c
++===================================================================
++--- net-tools.orig/lib/inet_sr.c
+++++ net-tools/lib/inet_sr.c
++@@ -3,6 +3,7 @@
++    1998-07-01 - Arnaldo Carvalho de Melo - GNU gettext instead of catgets
++    1999-10-07 - Kurt Garloff		 - for -host and gws: prefer host names
++ 						over networks (or even reject)
+++   2003-10-11 - Maik Broemme		 - gcc 3.x warnign fixes (default: break;)
++  */
++ 
++ #include "config.h"
++@@ -104,7 +105,6 @@ static int INET_setroute(int action, int
++        isnet = 1; break;
++     case 2:
++        isnet = 0; break;
++-    default:
++     }
++ 
++     /* Fill in the other fields. */
++Index: net-tools/lib/interface.c
++===================================================================
++--- net-tools.orig/lib/interface.c
+++++ net-tools/lib/interface.c
++@@ -7,7 +7,7 @@
++    8/2000  Andi Kleen make the list operations a bit more efficient.
++    People are crazy enough to use thousands of aliases now.
++ 
++-   $Id: interface.c,v 1.14 2001/02/10 19:31:15 pb Exp $
+++   $Id: interface.c,v 1.30 2005/08/23 22:46:51 ecki Exp $
++  */
++ 
++ #include "config.h"
++@@ -23,6 +23,7 @@
++ #include <string.h>
++ #include <unistd.h>
++ #include <ctype.h>
+++#include <string.h>
++ 
++ #if HAVE_AFIPX
++ #if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)
++@@ -87,14 +88,20 @@ int procnetdev_vsn = 1;
++ 
++ int ife_short;
++ 
+++int if_list_all = 0;	/* do we have requested the complete proc list, yet? */
+++
++ static struct interface *int_list, *int_last;
++ 
++ static int if_readlist_proc(char *);
++ 
++-static struct interface *add_interface(char *name)
+++static struct interface *if_cache_add(char *name)
++ {
++     struct interface *ife, **nextp, *new;
++ 
+++    if (!int_list)
+++    	int_last = NULL;
+++
+++    /* the cache is sorted, so if we hit a smaller if, exit */
++     for (ife = int_last; ife; ife = ife->prev) {
++ 	    int n = nstrcmp(ife->name, name); 
++ 	    if (n == 0) 
++@@ -104,7 +111,7 @@ static struct interface *add_interface(c
++     }
++     new(new); 
++     safe_strncpy(new->name, name, IFNAMSIZ); 
++-    nextp = ife ? &ife->next : &int_list;
+++    nextp = ife ? &ife->next : &int_list; // keep sorting
++     new->prev = ife;
++     new->next = *nextp; 
++     if (new->next) 
++@@ -117,19 +124,22 @@ static struct interface *add_interface(c
++ 
++ struct interface *lookup_interface(char *name)
++ {
++-    struct interface *ife = NULL;
++-
++-    if (if_readlist_proc(name) < 0) 
++-	    return NULL; 
++-    ife = add_interface(name); 
++-    return ife;
+++   /* if we have read all, use it */
+++   if (if_list_all)
+++   	return if_cache_add(name);
+++
+++   /* otherwise we read a limited list */
+++   if (if_readlist_proc(name) < 0)
+++   	return NULL;
+++ 
+++   return if_cache_add(name);
++ }
++ 
++ int for_all_interfaces(int (*doit) (struct interface *, void *), void *cookie)
++ {
++     struct interface *ife;
++ 
++-    if (!int_list && (if_readlist() < 0))
+++    if (!if_list_all && (if_readlist() < 0))
++ 	return -1;
++     for (ife = int_list; ife; ife = ife->next) {
++ 	int err = doit(ife, cookie);
++@@ -139,13 +149,15 @@ int for_all_interfaces(int (*doit) (stru
++     return 0;
++ }
++ 
++-int free_interface_list(void)
+++int if_cache_free(void)
++ {
++     struct interface *ife;
++     while ((ife = int_list) != NULL) {
++ 	int_list = ife->next;
++ 	free(ife);
++     }
+++    int_last = NULL;
+++    if_list_all = 0;
++     return 0;
++ }
++ 
++@@ -180,7 +192,7 @@ static int if_readconf(void)
++ 	}
++ 	if (ifc.ifc_len == sizeof(struct ifreq) * numreqs) {
++ 	    /* assume it overflowed and try again */
++-	    numreqs += 10;
+++	    numreqs *= 2;
++ 	    continue;
++ 	}
++ 	break;
++@@ -188,7 +200,7 @@ static int if_readconf(void)
++ 
++     ifr = ifc.ifc_req;
++     for (n = 0; n < ifc.ifc_len; n += sizeof(struct ifreq)) {
++-	add_interface(ifr->ifr_name);
+++	if_cache_add(ifr->ifr_name);
++ 	ifr++;
++     }
++     err = 0;
++@@ -198,7 +210,7 @@ out:
++     return err;
++ }
++ 
++-static char *get_name(char *name, char *p)
+++char *get_name(char *name, char *p)
++ {
++     while (isspace(*p))
++ 	p++;
++@@ -206,16 +218,19 @@ static char *get_name(char *name, char *
++ 	if (isspace(*p))
++ 	    break;
++ 	if (*p == ':') {	/* could be an alias */
++-	    char *dot = p, *dotname = name;
++-	    *name++ = *p++;
++-	    while (isdigit(*p))
++-		*name++ = *p++;
++-	    if (*p != ':') {	/* it wasn't, backup */
++-		p = dot;
++-		name = dotname;
+++		char *dot = p++;
+++ 		while (*p && isdigit(*p)) p++;
+++		if (*p == ':') {
+++			/* Yes it is, backup and copy it. */
+++			p = dot;
+++			*name++ = *p++;
+++			while (*p && isdigit(*p)) {
+++				*name++ = *p++;
+++			}
+++		} else {
+++			/* No, it isn't */
+++			p = dot;
++ 	    }
++-	    if (*p == '\0')
++-		return NULL;
++ 	    p++;
++ 	    break;
++ 	}
++@@ -225,7 +240,7 @@ static char *get_name(char *name, char *
++     return p;
++ }
++ 
++-static int procnetdev_version(char *buf)
+++int procnetdev_version(char *buf)
++ {
++     if (strstr(buf, "compressed"))
++ 	return 3;
++@@ -234,12 +249,12 @@ static int procnetdev_version(char *buf)
++     return 1;
++ }
++ 
++-static int get_dev_fields(char *bp, struct interface *ife)
+++int get_dev_fields(char *bp, struct interface *ife)
++ {
++     switch (procnetdev_vsn) {
++     case 3:
++ 	sscanf(bp,
++-	"%llu %llu %lu %lu %lu %lu %lu %lu %llu %llu %lu %lu %lu %lu %lu %lu",
+++	"%Lu %Lu %lu %lu %lu %lu %lu %lu %Lu %Lu %lu %lu %lu %lu %lu %lu",
++ 	       &ife->stats.rx_bytes,
++ 	       &ife->stats.rx_packets,
++ 	       &ife->stats.rx_errors,
++@@ -259,7 +274,7 @@ static int get_dev_fields(char *bp, stru
++ 	       &ife->stats.tx_compressed);
++ 	break;
++     case 2:
++-	sscanf(bp, "%llu %llu %lu %lu %lu %lu %llu %llu %lu %lu %lu %lu %lu",
+++	sscanf(bp, "%Lu %Lu %lu %lu %lu %lu %Lu %Lu %lu %lu %lu %lu %lu",
++ 	       &ife->stats.rx_bytes,
++ 	       &ife->stats.rx_packets,
++ 	       &ife->stats.rx_errors,
++@@ -277,7 +292,7 @@ static int get_dev_fields(char *bp, stru
++ 	ife->stats.rx_multicast = 0;
++ 	break;
++     case 1:
++-	sscanf(bp, "%llu %lu %lu %lu %lu %llu %lu %lu %lu %lu %lu",
+++	sscanf(bp, "%Lu %lu %lu %lu %lu %Lu %lu %lu %lu %lu %lu",
++ 	       &ife->stats.rx_packets,
++ 	       &ife->stats.rx_errors,
++ 	       &ife->stats.rx_dropped,
++@@ -300,22 +315,16 @@ static int get_dev_fields(char *bp, stru
++ 
++ static int if_readlist_proc(char *target)
++ {
++-    static int proc_read; 
++     FILE *fh;
++     char buf[512];
++     struct interface *ife;
++     int err;
++ 
++-    if (proc_read) 
++-	    return 0; 
++-    if (!target) 
++-	    proc_read = 1;
++-
++     fh = fopen(_PATH_PROCNET_DEV, "r");
++     if (!fh) {
++ 		fprintf(stderr, _("Warning: cannot open %s (%s). Limited output.\n"),
++ 			_PATH_PROCNET_DEV, strerror(errno)); 
++-		return if_readconf();
+++		return -2;
++ 	}	
++     fgets(buf, sizeof buf, fh);	/* eat line */
++     fgets(buf, sizeof buf, fh);
++@@ -350,7 +359,7 @@ static int if_readlist_proc(char *target
++     while (fgets(buf, sizeof buf, fh)) {
++ 	char *s, name[IFNAMSIZ];
++ 	s = get_name(name, buf);    
++-	ife = add_interface(name);
+++	ife = if_cache_add(name);
++ 	get_dev_fields(s, ife);
++ 	ife->statistics_valid = 1;
++ 	if (target && !strcmp(target,name))
++@@ -359,7 +368,6 @@ static int if_readlist_proc(char *target
++     if (ferror(fh)) {
++ 	perror(_PATH_PROCNET_DEV);
++ 	err = -1;
++-	proc_read = 0; 
++     }
++ 
++ #if 0
++@@ -371,9 +379,16 @@ static int if_readlist_proc(char *target
++ 
++ int if_readlist(void) 
++ { 
++-    int err = if_readlist_proc(NULL); 
++-    if (!err)
++-	    err = if_readconf();
+++    /* caller will/should check not to call this too often 
+++     *   (i.e. only if if_list_all == 0 
+++     */
+++    int err = 0;
+++
+++    err |= if_readlist_proc(NULL); 
+++    err |= if_readconf();
+++
+++    if_list_all = 1;
+++
++     return err;
++ } 
++ 
++@@ -580,10 +595,10 @@ int do_if_print(struct interface *ife, v
++ void ife_print_short(struct interface *ptr)
++ {
++     printf("%-5.5s ", ptr->name);
++-    printf("%5d %3d", ptr->mtu, ptr->metric);
+++    printf("%5d %-2d ", ptr->mtu, ptr->metric);
++     /* If needed, display the interface statistics. */
++     if (ptr->statistics_valid) {
++-	printf("%8llu %6lu %6lu %6lu",
+++	printf("%8llu %6lu %6lu %-6lu ",
++ 	       ptr->stats.rx_packets, ptr->stats.rx_errors,
++ 	       ptr->stats.rx_dropped, ptr->stats.rx_fifo_errors);
++ 	printf("%8llu %6lu %6lu %6lu ",
++@@ -636,9 +651,10 @@ void ife_print_long(struct interface *pt
++     int hf;
++     int can_compress = 0;
++     unsigned long long rx, tx, short_rx, short_tx;
++-    char Rext[5]="b";
++-    char Text[5]="b";
++-
+++    const char *Rext = "B";
+++    const char *Text = "B";
+++    static char flags[200];
+++    
++ #if HAVE_AFIPX
++     static struct aftype *ipxtype = NULL;
++ #endif
++@@ -670,32 +686,70 @@ void ife_print_long(struct interface *pt
++     if (hw == NULL)
++ 	hw = get_hwntype(-1);
++ 
++-    printf(_("%-9.9s Link encap:%s  "), ptr->name, hw->title);
++-    /* For some hardware types (eg Ash, ATM) we don't print the 
++-       hardware address if it's null.  */
++-    if (hw->print != NULL && (! (hw_null_address(hw, ptr->hwaddr) &&
++-				  hw->suppress_null_addr)))
++-	printf(_("HWaddr %s  "), hw->print(ptr->hwaddr));
++-#ifdef IFF_PORTSEL
++-    if (ptr->flags & IFF_PORTSEL) {
++-	printf(_("Media:%s"), if_port_text[ptr->map.port][0]);
++-	if (ptr->flags & IFF_AUTOMEDIA)
++-	    printf(_("(auto)"));
++-    }
+++    sprintf(flags, "flags=%d<", ptr->flags);
+++    /* DONT FORGET TO ADD THE FLAGS IN ife_print_short, too */
+++    if (ptr->flags == 0)
+++	strcat(flags,">");
+++    if (ptr->flags & IFF_UP)
+++	strcat(flags,_("UP,"));
+++    if (ptr->flags & IFF_BROADCAST)
+++	strcat(flags,_("BROADCAST,"));
+++    if (ptr->flags & IFF_DEBUG)
+++	strcat(flags,_("DEBUG,"));
+++    if (ptr->flags & IFF_LOOPBACK)
+++	strcat(flags,_("LOOPBACK,"));
+++    if (ptr->flags & IFF_POINTOPOINT)
+++	strcat(flags,_("POINTOPOINT,"));
+++    if (ptr->flags & IFF_NOTRAILERS)
+++	strcat(flags,_("NOTRAILERS,"));
+++    if (ptr->flags & IFF_RUNNING)
+++	strcat(flags,_("RUNNING,"));
+++    if (ptr->flags & IFF_NOARP)
+++	strcat(flags,_("NOARP,"));
+++    if (ptr->flags & IFF_PROMISC)
+++	strcat(flags,_("PROMISC,"));
+++    if (ptr->flags & IFF_ALLMULTI)
+++	strcat(flags,_("ALLMULTI,"));
+++    if (ptr->flags & IFF_SLAVE)
+++	strcat(flags,_("SLAVE,"));
+++    if (ptr->flags & IFF_MASTER)
+++	strcat(flags,_("MASTER,"));
+++    if (ptr->flags & IFF_MULTICAST)
+++	strcat(flags,_("MULTICAST,"));
+++#ifdef HAVE_DYNAMIC
+++    if (ptr->flags & IFF_DYNAMIC)
+++	strcat(flags,_("DYNAMIC,"));
+++#endif
+++    /* DONT FORGET TO ADD THE FLAGS IN ife_print_short */
+++    if (flags[strlen(flags)-1] == ',')
+++      flags[strlen(flags)-1] = '>';
+++    else
+++      flags[strlen(flags)-1] = 0;
+++      
+++
+++    printf(_("%s: %s  mtu %d  metric %d"),
+++	   ptr->name, flags, ptr->mtu, ptr->metric ? ptr->metric : 1);
+++#ifdef SIOCSKEEPALIVE
+++    if (ptr->outfill || ptr->keepalive)
+++	printf(_("  outfill %d  keepalive %d"),
+++	       ptr->outfill, ptr->keepalive);
++ #endif
++     printf("\n");
++ 
+++
+++
++ #if HAVE_AFINET
++     if (ptr->has_ip) {
++-	printf(_("          %s addr:%s "), ap->name,
+++	printf(_("        %s %s"), ap->name,
++ 	       ap->sprint(&ptr->addr, 1));
++-	if (ptr->flags & IFF_POINTOPOINT) {
++-	    printf(_(" P-t-P:%s "), ap->sprint(&ptr->dstaddr, 1));
++-	}
+++	printf(_("  netmask %s"), ap->sprint(&ptr->netmask, 1));
++ 	if (ptr->flags & IFF_BROADCAST) {
++-	    printf(_(" Bcast:%s "), ap->sprint(&ptr->broadaddr, 1));
+++	    printf(_("  broadcast %s"), ap->sprint(&ptr->broadaddr, 1));
+++	}
+++	if (ptr->flags & IFF_POINTOPOINT) {
+++	    printf(_("  destination %s"), ap->sprint(&ptr->dstaddr, 1));
++ 	}
++-	printf(_(" Mask:%s\n"), ap->sprint(&ptr->netmask, 1));
+++	printf("\n");
++     }
++ #endif
++ 
++@@ -712,29 +766,30 @@ void ife_print_long(struct interface *pt
++ 			addr6p[0], addr6p[1], addr6p[2], addr6p[3],
++ 			addr6p[4], addr6p[5], addr6p[6], addr6p[7]);
++ 		inet6_aftype.input(1, addr6, (struct sockaddr *) &sap);
++-		printf(_("          inet6 addr: %s/%d"),
++-		 inet6_aftype.sprint((struct sockaddr *) &sap, 1), plen);
++-		printf(_(" Scope:"));
++-		switch (scope) {
++-		case 0:
++-		    printf(_("Global"));
++-		    break;
++-		case IPV6_ADDR_LINKLOCAL:
++-		    printf(_("Link"));
++-		    break;
++-		case IPV6_ADDR_SITELOCAL:
++-		    printf(_("Site"));
++-		    break;
++-		case IPV6_ADDR_COMPATv4:
++-		    printf(_("Compat"));
++-		    break;
++-		case IPV6_ADDR_LOOPBACK:
++-		    printf(_("Host"));
++-		    break;
++-		default:
++-		    printf(_("Unknown"));
+++		printf(_("        %s %s  prefixlen %d"),
+++			inet6_aftype.name, 
+++			inet6_aftype.sprint((struct sockaddr *) &sap, 1), 
+++			plen);
+++		printf(_("  scopeid 0x%x"), scope);
+++
+++		flags[0] = '<'; flags[1] = 0;
+++		if (scope & IPV6_ADDR_COMPATv4) {
+++		    	strcat(flags, _("compat,"));
+++		    	scope -= IPV6_ADDR_COMPATv4;
++ 		}
++-		printf("\n");
+++		if (scope == 0)
+++			strcat(flags, _("global,"));
+++		if (scope & IPV6_ADDR_LINKLOCAL)
+++			strcat(flags, _("link,"));
+++		if (scope & IPV6_ADDR_SITELOCAL)
+++			strcat(flags, _("site,"));
+++		if (scope & IPV6_ADDR_LOOPBACK)
+++			strcat(flags, _("host,"));
+++		if (flags[strlen(flags)-1] == ',')
+++			flags[strlen(flags)-1] = '>';
+++		else
+++			flags[strlen(flags)-1] = 0;
+++		printf("%s\n", flags);
++ 	    }
++ 	}
++ 	fclose(f);
++@@ -747,17 +802,17 @@ void ife_print_long(struct interface *pt
++ 
++     if (ipxtype != NULL) {
++ 	if (ptr->has_ipx_bb)
++-	    printf(_("          IPX/Ethernet II addr:%s\n"),
++-		   ipxtype->sprint(&ptr->ipxaddr_bb, 1));
+++	    printf(_("        %s Ethernet-II   %s\n"),
+++		   ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_bb, 1));
++ 	if (ptr->has_ipx_sn)
++-	    printf(_("          IPX/Ethernet SNAP addr:%s\n"),
++-		   ipxtype->sprint(&ptr->ipxaddr_sn, 1));
+++	    printf(_("        %s Ethernet-SNAP %s\n"),
+++		   ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_sn, 1));
++ 	if (ptr->has_ipx_e2)
++-	    printf(_("          IPX/Ethernet 802.2 addr:%s\n"),
++-		   ipxtype->sprint(&ptr->ipxaddr_e2, 1));
+++	    printf(_("        %s Ethernet802.2 %s\n"),
+++		   ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_e2, 1));
++ 	if (ptr->has_ipx_e3)
++-	    printf(_("          IPX/Ethernet 802.3 addr:%s\n"),
++-		   ipxtype->sprint(&ptr->ipxaddr_e3, 1));
+++	    printf(_("        %s Ethernet802.3 %s\n"),
+++		   ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_e3, 1));
++     }
++ #endif
++ 
++@@ -766,7 +821,7 @@ void ife_print_long(struct interface *pt
++ 	ddptype = get_afntype(AF_APPLETALK);
++     if (ddptype != NULL) {
++ 	if (ptr->has_ddp)
++-	    printf(_("          EtherTalk Phase 2 addr:%s\n"), ddptype->sprint(&ptr->ddpaddr, 1));
+++	    printf(_("        %s %s\n"), ddptype->name, ddptype->sprint(&ptr->ddpaddr, 1));
++     }
++ #endif
++ 
++@@ -775,53 +830,30 @@ void ife_print_long(struct interface *pt
++ 	ectype = get_afntype(AF_ECONET);
++     if (ectype != NULL) {
++ 	if (ptr->has_econet)
++-	    printf(_("          econet addr:%s\n"), ectype->sprint(&ptr->ecaddr, 1));
+++	    printf(_("        %s %s\n"), ectype->name, ectype->sprint(&ptr->ecaddr, 1));
++     }
++ #endif
++ 
++-    printf("          ");
++-    /* DONT FORGET TO ADD THE FLAGS IN ife_print_short, too */
++-    if (ptr->flags == 0)
++-	printf(_("[NO FLAGS] "));
++-    if (ptr->flags & IFF_UP)
++-	printf(_("UP "));
++-    if (ptr->flags & IFF_BROADCAST)
++-	printf(_("BROADCAST "));
++-    if (ptr->flags & IFF_DEBUG)
++-	printf(_("DEBUG "));
++-    if (ptr->flags & IFF_LOOPBACK)
++-	printf(_("LOOPBACK "));
++-    if (ptr->flags & IFF_POINTOPOINT)
++-	printf(_("POINTOPOINT "));
++-    if (ptr->flags & IFF_NOTRAILERS)
++-	printf(_("NOTRAILERS "));
++-    if (ptr->flags & IFF_RUNNING)
++-	printf(_("RUNNING "));
++-    if (ptr->flags & IFF_NOARP)
++-	printf(_("NOARP "));
++-    if (ptr->flags & IFF_PROMISC)
++-	printf(_("PROMISC "));
++-    if (ptr->flags & IFF_ALLMULTI)
++-	printf(_("ALLMULTI "));
++-    if (ptr->flags & IFF_SLAVE)
++-	printf(_("SLAVE "));
++-    if (ptr->flags & IFF_MASTER)
++-	printf(_("MASTER "));
++-    if (ptr->flags & IFF_MULTICAST)
++-	printf(_("MULTICAST "));
++-#ifdef HAVE_DYNAMIC
++-    if (ptr->flags & IFF_DYNAMIC)
++-	printf(_("DYNAMIC "));
++-#endif
++-    /* DONT FORGET TO ADD THE FLAGS IN ife_print_short */
++-    printf(_(" MTU:%d  Metric:%d"),
++-	   ptr->mtu, ptr->metric ? ptr->metric : 1);
++-#ifdef SIOCSKEEPALIVE
++-    if (ptr->outfill || ptr->keepalive)
++-	printf(_("  Outfill:%d  Keepalive:%d"),
++-	       ptr->outfill, ptr->keepalive);
+++    /* For some hardware types (eg Ash, ATM) we don't print the 
+++       hardware address if it's null.  */
+++    if (hw->print != NULL && (! (hw_null_address(hw, ptr->hwaddr) &&
+++				  hw->suppress_null_addr)))
+++	printf(_("        %s %s"), hw->name, hw->print(ptr->hwaddr));
+++    else
+++	printf(_("        %s"), hw->name);
+++    if (ptr->tx_queue_len != -1)
+++    	printf(_("  txqueuelen %d"), ptr->tx_queue_len);
+++    printf("  (%s)\n", hw->title);
+++
+++#ifdef IFF_PORTSEL
+++    if (ptr->flags & IFF_PORTSEL) {
+++	printf(_("        media %s"), if_port_text[ptr->map.port][0]);
+++	if (ptr->flags & IFF_AUTOMEDIA)
+++	    printf(_("autoselect"));
+++    	printf("\n");
+++    }
++ #endif
++-    printf("\n");
+++
++ 
++     /* If needed, display the interface statistics. */
++ 
++@@ -830,55 +862,87 @@ void ife_print_long(struct interface *pt
++ 	 *      not for the aliases, although strictly speaking they're shared
++ 	 *      by all addresses.
++ 	 */
++-	printf("          ");
++-
++-	printf(_("RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"),
++-	       ptr->stats.rx_packets, ptr->stats.rx_errors,
++-	       ptr->stats.rx_dropped, ptr->stats.rx_fifo_errors,
++-	       ptr->stats.rx_frame_errors);
++-	if (can_compress)
++-	    printf(_("             compressed:%lu\n"), ptr->stats.rx_compressed);
++-
++ 	rx = ptr->stats.rx_bytes;  
++-	tx = ptr->stats.tx_bytes;
++ 	short_rx = rx * 10;  
+++	if (rx > 1125899906842624ull) {
+++	    short_rx /= 1125899906842624ull;
+++	    Rext = "PiB";
+++	} else if (rx > 1099511627776ull) {
+++	    short_rx /= 1099511627776ull;
+++	    Rext = "TiB";
+++	} else if (rx > 1073741824ull) {
+++	    short_rx /= 1073741824ull;
+++	    Rext = "GiB";
+++	} else if (rx > 1048576) {
+++	    short_rx /= 1048576;
+++	    Rext = "MiB";
+++	} else if (rx > 1024) {
+++	    short_rx /= 1024;
+++	    Rext = "KiB";
+++	}
+++	tx = ptr->stats.tx_bytes;
++ 	short_tx = tx * 10;
++-	if (rx > 1048576) { short_rx /= 1048576;  strcpy(Rext, "Mb"); }
++-	else if (rx > 1024) { short_rx /= 1024;  strcpy(Rext, "Kb"); }
++-	if (tx > 1048576) { short_tx /= 1048576;  strcpy(Text, "Mb"); }
++-	else if (tx > 1024) { short_tx /= 1024;  strcpy(Text, "Kb"); }
++-
++-	printf("          ");
++-	printf(_("TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"),
++-	       ptr->stats.tx_packets, ptr->stats.tx_errors,
++-	       ptr->stats.tx_dropped, ptr->stats.tx_fifo_errors,
++-	       ptr->stats.tx_carrier_errors);
++-	printf(_("          collisions:%lu "), ptr->stats.collisions);
++-	if (can_compress)
++-	    printf(_("compressed:%lu "), ptr->stats.tx_compressed);
++-	if (ptr->tx_queue_len != -1)
++-	    printf(_("txqueuelen:%d "), ptr->tx_queue_len);
++-	printf("\n          ");
++-	printf(_("RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"),
+++	if (tx > 1125899906842624ull) {
+++	    short_tx /= 1125899906842624ull;
+++	    Text = "PiB";
+++	} else 	if (tx > 1099511627776ull) {
+++	    short_tx /= 1099511627776ull;
+++	    Text = "TiB";
+++	} else if (tx > 1073741824ull) {
+++	    short_tx /= 1073741824ull;
+++	    Text = "GiB";
+++	} else if (tx > 1048576) {
+++	    short_tx /= 1048576;
+++	    Text = "MiB";
+++	} else if (tx > 1024) {
+++	    short_tx /= 1024;
+++	    Text = "KiB";
+++	}
+++
+++	printf("        ");
+++	printf(_("RX packets %llu  bytes %llu (%lu.%lu %s)\n"), 
+++		ptr->stats.rx_packets, 
++ 	       rx, (unsigned long)(short_rx / 10), 
++-	       (unsigned long)(short_rx % 10), Rext, 
++-	       tx, (unsigned long)(short_tx / 10), 
++-	       (unsigned long)(short_tx % 10), Text);
+++	       (unsigned long)(short_rx % 10), Rext);
+++	if (can_compress) {
+++  	    printf("        ");
+++	    printf(_("RX compressed:%lu\n"), ptr->stats.rx_compressed);
+++	}
+++	printf("        ");
+++	printf(_("RX errors %lu  dropped %lu  overruns %lu  frame %lu\n"),
+++	       ptr->stats.rx_errors, ptr->stats.rx_dropped, 
+++	       ptr->stats.rx_fifo_errors, ptr->stats.rx_frame_errors);
+++
+++
+++	printf("        ");
+++	printf(_("TX packets %llu  bytes %llu (%lu.%lu %s)\n"),
+++		ptr->stats.tx_packets, 
+++	        tx, (unsigned long)(short_tx / 10), 
+++	        (unsigned long)(short_tx % 10), Text);
+++	if (can_compress) {
+++  	    printf("        ");
+++	    printf(_("TX compressed %lu\n"), ptr->stats.tx_compressed);
+++	}
+++	printf("        ");
+++	printf(_("TX errors %lu  dropped %lu overruns %lu  carrier %lu  collisions %lu\n"),
+++	       ptr->stats.tx_errors,
+++	       ptr->stats.tx_dropped, ptr->stats.tx_fifo_errors,
+++	       ptr->stats.tx_carrier_errors, ptr->stats.collisions);
++     }
++ 
++     if ((ptr->map.irq || ptr->map.mem_start || ptr->map.dma ||
++-	 ptr->map.base_addr)) {
++-	printf("          ");
+++	 ptr->map.base_addr >= 0x100)) {
+++	printf("        device ");
++ 	if (ptr->map.irq)
++-	    printf(_("Interrupt:%d "), ptr->map.irq);
+++	    printf(_("interrupt %d  "), ptr->map.irq);
++ 	if (ptr->map.base_addr >= 0x100)	/* Only print devices using it for 
++ 						   I/O maps */
++-	    printf(_("Base address:0x%x "), ptr->map.base_addr);
+++	    printf(_("base 0x%x  "), ptr->map.base_addr);
++ 	if (ptr->map.mem_start) {
++-	    printf(_("Memory:%lx-%lx "), ptr->map.mem_start, ptr->map.mem_end);
+++	    printf(_("memory 0x%lx-%lx  "), ptr->map.mem_start, ptr->map.mem_end);
++ 	}
++ 	if (ptr->map.dma)
++-	    printf(_("DMA chan:%x "), ptr->map.dma);
+++	    printf(_("  dma 0x%x"), ptr->map.dma);
++ 	printf("\n");
++     }
++     printf("\n");
++Index: net-tools/lib/ipx.c
++===================================================================
++--- net-tools.orig/lib/ipx.c
+++++ net-tools/lib/ipx.c
++@@ -133,6 +133,9 @@ static int IPX_input(int type, char *buf
++     char *ep;
++     int nbo;
++ 
+++    if (!sai)
+++    	return (-1);
+++    	
++     sai->sipx_family = AF_IPX;
++     sai->sipx_network = htonl(0);
++     sai->sipx_node[0] = sai->sipx_node[1] = sai->sipx_node[2] =
++Index: net-tools/lib/ipx_gr.c
++===================================================================
++--- net-tools.orig/lib/ipx_gr.c
+++++ net-tools/lib/ipx_gr.c
++@@ -38,21 +38,27 @@ int IPX_rprint(int options)
++     char net[128], router_net[128];
++     char router_node[128];
++     int num;
++-    FILE *fp = fopen(_PATH_PROCNET_IPX_ROUTE, "r");
+++    FILE *fp;
++     struct aftype *ap;
++     struct sockaddr sa;
++ 
++-    if ((ap = get_afntype(AF_IPX)) == NULL) {
++-	EINTERN("lib/ipx_rt.c", "AF_IPX missing");
++-	return (-1);
++-    }
+++    fp = fopen(_PATH_PROCNET_IPX_ROUTE1, "r");
++ 
++     if (!fp) {
++-        perror(_PATH_PROCNET_IPX_ROUTE);
++-        printf(_("IPX not configured in this system.\n"));
+++        fp = fopen(_PATH_PROCNET_IPX_ROUTE2, "r");
+++    }
+++    
+++    if (!fp) {
+++        perror(NULL);
+++        printf(_("IPX routing not in file %s or %s found.\n"), _PATH_PROCNET_IPX_ROUTE1, _PATH_PROCNET_IPX_ROUTE2);
++ 	return 1;
++     }
++ 
+++    if ((ap = get_afntype(AF_IPX)) == NULL) {
+++	EINTERN("lib/ipx_rt.c", "AF_IPX missing");
+++	return (-1);
+++    }
+++
++     printf(_("Kernel IPX routing table\n"));	/* xxx */
++     printf(_("Destination               Router Net                Router Node\n"));
++ 
++Index: net-tools/lib/irda.c
++===================================================================
++--- net-tools.orig/lib/irda.c
+++++ net-tools/lib/irda.c
++@@ -1,13 +1,15 @@
++ /*********************************************************************
++  *                
++  * Filename:      irda.c
++- * Version:       0.1
++- * Description:   A first attempt to make ifconfig understand IrDA
+++ * Version:       0.2
+++ * Description:   A second attempt to make ifconfig understand IrDA
++  * Status:        Experimental.
++  * Author:        Dag Brattli <dagb@cs.uit.no>
++  * Created at:    Wed Apr 21 09:03:09 1999
++  * Modified at:   Wed Apr 21 09:17:05 1999
++  * Modified by:   Dag Brattli <dagb@cs.uit.no>
+++ * Modified at:   Wed May  1 11:51:44 CEST 2002
+++ * Modified by:   Christoph Bartelmus <christoph@bartelmus.de>
++  * 
++  *     This program is free software; you can redistribute it and/or 
++  *     modify it under the terms of the GNU General Public License as 
++@@ -59,9 +61,9 @@
++  */
++ static char *irda_print(unsigned char *ptr)
++ {
++-    static char buff[8];
+++    static char buff[12];
++ 
++-    sprintf(&buff[strlen(buff)], "%02x:%02x:%02x:%02x", ptr[3], ptr[2], 
+++    snprintf(buff, 12, "%02x:%02x:%02x:%02x", ptr[3], ptr[2], 
++ 	    ptr[1], ptr[0]);
++ 
++     return (buff);
++Index: net-tools/lib/net-features.h
++===================================================================
++--- net-tools.orig/lib/net-features.h
+++++ net-tools/lib/net-features.h
++@@ -295,6 +295,13 @@ static char *Features =
++ "-"
++ #endif
++ "HDLC/LAPB "
+++
+++#if HAVE_HWEUI64
+++"+"
+++#else
+++"-"
+++#endif
+++"EUI64 "
++ ;
++ 
++ 
++Index: net-tools/lib/nstrcmp.c
++===================================================================
++--- net-tools.orig/lib/nstrcmp.c
+++++ net-tools/lib/nstrcmp.c
++@@ -1,34 +1,157 @@
++ /* Copyright 1998 by Andi Kleen. Subject to the GPL. */
++-/* $Id: nstrcmp.c,v 1.2 1998/11/15 20:11:38 freitag Exp $ */ 
+++/* rewritten by bernd eckenfels because of complicated alias semantic */
+++/* $Id: nstrcmp.c,v 1.4 2004/06/03 22:49:17 ecki Exp $ */ 
++ #include <ctype.h>
++ #include <stdlib.h>
+++#include <string.h>
++ #include "util.h"
++ 
++-/* like strcmp(), but knows about numbers */
++-int nstrcmp(const char *astr, const char *b)
+++
+++/* return numerical :999 suffix or null. sideeffect: replace ':' with \0 */
+++char* cutalias(char* name)
++ {
++-    const char *a = astr;
+++	int digit = 0;
+++	int pos;
+++	
+++	for(pos=strlen(name); pos>0; pos--)
+++	{
+++		if (name[pos-1]==':' && digit)
+++		{
+++			name[pos-1]='\0';
+++			return name+pos;
+++		}
+++		if (!isdigit(name[pos-1]))
+++			break;
+++		digit = 1;
+++	}
+++	return NULL;
+++}
++ 
++-    while (*a == *b) {
++-	if (*a == '\0')
++-	    return 0;
++-	a++;
++-	b++;
++-    }
++-    if (isdigit(*a)) {
++-	if (!isdigit(*b))
++-	    return -1;
++-	while (a > astr) {
++-	    a--;
++-	    if (!isdigit(*a)) {
++-		a++;
++-		break;
++-	    }
++-	    if (!isdigit(*b))
++-		return -1;
++-	    b--;
+++
+++/* return index of last non digit or -1 if it does not end with digits */
+++int rindex_nondigit(char *name)
+++{
+++	int pos = strlen(name);
+++
+++	for(pos=strlen(name); pos>0; pos--)
+++	{
+++		if (!isdigit(name[pos-1]))
+++			return pos;
++ 	}
++-	return atoi(a) > atoi(b) ? 1 : -1;
++-    }
++-    return *a - *b;
+++	return 0;
+++}
+++
+++
+++/* like strcmp(), but knows about numbers and ':' alias suffix */
+++int nstrcmp(const char *ap, const char *bp)
+++{
+++	char *a = (char*)strdup(ap);
+++	char *b = (char*)strdup(bp);
+++	char *an, *bn;
+++	int av = 0, bv = 0;
+++	char *aalias=cutalias(a);
+++	char *balias=cutalias(b);
+++	int aindex=rindex_nondigit(a);
+++	int bindex=rindex_nondigit(b);
+++	int complen=(aindex<bindex)?aindex:bindex;
+++	int res = strncmp(a, b, complen);
+++
+++	if (res != 0)
+++		{ free(a); free(b); return res; }
+++		
+++	if (aindex > bindex)
+++		{ free(a); free(b); return 1; }
+++		
+++	if (aindex < bindex)
+++		{ free(a); free(b); return -1; }
+++		
+++	an = a+aindex;
+++	bn = b+bindex;
+++	
+++	av = atoi(an);
+++	bv = atoi(bn);
+++	
+++	if (av < bv)
+++		{ free(a); free(b); return -1; }
+++		
+++	if (av > bv)
+++		{ free(a); free(b); return 1; }
+++		
+++	av = -1;
+++	if (aalias != NULL)
+++		av = atoi(aalias);
+++	
+++	bv = -1;
+++	if (balias != NULL)
+++		bv = atoi(balias);
+++	
+++	free(a); free(b);
+++	
+++	if (av < bv)
+++		return -1;
+++		
+++	if (av > bv)
+++		return 1;
+++		
+++	return 0;
+++}
+++
+++
+++#ifdef NSTRCMP_TEST
+++
+++int cs(int s)
+++{
+++	if (s < 0) return -1;
+++	if (s > 0) return 1;
+++	return 0;
+++}
+++
+++
+++int dotest(char* a, char* b, int exp)
+++{
+++	int res = nstrcmp(a, b);
+++	int err = (cs(res) != cs(exp));
+++	printf("nstrcmp(\"%s\", \"%s\")=%d %d %s\n", a, b, res, exp, err?"WRONG":"OK");
+++	return err;
++ }
+++
+++int main()
+++{
+++	int err = 0;
+++	
+++	err |= dotest("eth1", "eth1", 0);
+++	err |= dotest("eth0:1", "eth0:1", 0);
+++	err |= dotest("lan", "lan", 0);
+++	err |= dotest("100", "100", 0);
+++	err |= dotest("", "", 0);
+++	err |= dotest(":", ":", 0);
+++	err |= dotest("a:b:c", "a:b:c", 0);
+++	err |= dotest("a:", "a:", 0);
+++	err |= dotest(":a", ":a", 0);
+++
+++	err |= dotest("a", "aa", -1);	
+++	err |= dotest("eth0", "eth1", -1);
+++	err |= dotest("eth1", "eth20", -1);
+++	err |= dotest("eth20", "eth100", -1);
+++	err |= dotest("eth1", "eth13", -1);
+++	err |= dotest("eth", "eth2", -1);
+++	err |= dotest("eth0:1", "eth0:2", -1);
+++	err |= dotest("eth1:10", "eth13:10", -1);
+++	err |= dotest("eth1:1", "eth1:13", -1);
+++	err |= dotest("a", "a:", -1);
+++	
+++	err |= dotest("aa", "a", 1);
+++	err |= dotest("eth2", "eth1", 1);
+++	err |= dotest("eth13", "eth1", 1);	
+++	err |= dotest("eth2", "eth", 1);
+++	err |= dotest("eth2:10", "eth2:1", 1);
+++	err |= dotest("eth2:5", "eth2:4", 1);
+++	err |= dotest("eth3:2", "eth2:3", 1);
+++	err |= dotest("eth13:1", "eth1:0", 1);
+++	err |= dotest("a:", "a", 1);
+++	err |= dotest("a1b12", "a1b2", 1);
+++
+++	return err;
+++}
+++
+++#endif
++Index: net-tools/lib/pathnames.h
++===================================================================
++--- net-tools.orig/lib/pathnames.h
+++++ net-tools/lib/pathnames.h
++@@ -1,4 +1,3 @@
++-
++ /*
++  * lib/pathnames.h    This file contains the definitions of the path 
++  *                      names used by the NET-LIB.
++@@ -29,8 +28,10 @@
++ #define _PATH_PROCNET_NR_NODES		"/proc/net/nr_nodes"
++ #define _PATH_PROCNET_ARP		"/proc/net/arp"
++ #define _PATH_PROCNET_AX25		"/proc/net/ax25"
++-#define _PATH_PROCNET_IPX		"/proc/net/ipx"
++-#define _PATH_PROCNET_IPX_ROUTE		"/proc/net/ipx_route"
+++#define _PATH_PROCNET_IPX_SOCKET1	"/proc/net/ipx/socket"
+++#define _PATH_PROCNET_IPX_SOCKET2	"/proc/net/ipx"
+++#define _PATH_PROCNET_IPX_ROUTE1	"/proc/net/ipx/route"
+++#define _PATH_PROCNET_IPX_ROUTE2	"/proc/net/ipx_route"
++ #define _PATH_PROCNET_ATALK		"/proc/net/appletalk"
++ #define _PATH_PROCNET_IP_BLK		"/proc/net/ip_block"
++ #define _PATH_PROCNET_IP_FWD		"/proc/net/ip_forward"
++@@ -45,6 +46,7 @@
++ #define _PATH_PROCNET_X25              "/proc/net/x25"
++ #define _PATH_PROCNET_X25_ROUTE                "/proc/net/x25_routes"
++ #define _PATH_PROCNET_DEV_MCAST		"/proc/net/dev_mcast"
+++#define _PATH_PROCNET_ATALK_ROUTE	"/proc/net/atalk_route"
++ 
++ /* pathname for the netlink device */
++ #define _PATH_DEV_ROUTE	"/dev/route"
++Index: net-tools/lib/proc.c
++===================================================================
++--- net-tools.orig/lib/proc.c
+++++ net-tools/lib/proc.c
++@@ -1,11 +1,12 @@
++ /* Tolerant /proc file parser. Copyright 1998 Andi Kleen */
++-/* $Id: proc.c,v 1.4 1999/01/05 20:54:00 philip Exp $ */ 
+++/* $Id: proc.c,v 1.5 2007/12/01 18:44:57 ecki Exp $ */ 
++ /* Fixme: cannot currently cope with removed fields */ 
++ 
++ #include <string.h>
++ #include <stdarg.h>
++ #include <stdio.h>
++ #include <ctype.h>
+++#include <unistd.h>
++ 
++ /* Caller must free return string. */
++ 
++@@ -72,3 +73,22 @@ int proc_guess_fmt(char *name, FILE *fh,
++     va_end(ap);
++     return flag;
++ }
+++
+++
+++FILE *proc_fopen(const char *name)
+++{
+++    static char *buffer;
+++    static size_t pagesz;
+++    FILE *fd = fopen(name, "r");
+++
+++    if (fd == NULL)
+++      return NULL;
+++      
+++    if (!buffer) {
+++      pagesz = getpagesize();
+++      buffer = malloc(pagesz);
+++    }
+++    
+++    setvbuf(fd, buffer, _IOFBF, pagesz);
+++    return fd;
+++}
++Index: net-tools/lib/proc.h
++===================================================================
++--- net-tools.orig/lib/proc.h
+++++ net-tools/lib/proc.h
++@@ -1,5 +1,7 @@
++-
++-
++-/* Generate a suitable scanf format for a column title line */
+++/* 
+++ * prototypes for proc.c
+++ */
++ char *proc_gen_fmt(char *name, int more, FILE * fh,...);
++ int   proc_guess_fmt(char *name, FILE* fh,...);
+++FILE *proc_fopen(const char *name);
+++
++Index: net-tools/lib/tr.c
++===================================================================
++--- net-tools.orig/lib/tr.c
+++++ net-tools/lib/tr.c
++@@ -2,7 +2,7 @@
++  * lib/tr.c   This file contains an implementation of the "Tokenring"
++  *              support functions.
++  *
++- * Version:     $Id: tr.c,v 1.8 2000/02/02 08:56:30 freitag Exp $
+++ * Version:     $Id: tr.c,v 1.9 2005/05/16 03:15:12 ecki Exp $
++  *
++  * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
++  *              Copyright 1993 MicroWalt Corporation
++@@ -30,8 +30,14 @@
++ #include "net-support.h"
++ #include "pathnames.h"
++ #include "intl.h"
+++#include "util.h"
++ 
+++
+++/* actual definition at the end of file */
++ extern struct hwtype tr_hwtype;
+++#ifdef ARPHRD_IEEE802_TR
+++extern struct hwtype tr_hwtype1;
+++#endif
++ 
++ static char *pr_tr(unsigned char *ptr)
++ {
++@@ -42,7 +48,7 @@ static char *pr_tr(unsigned char *ptr)
++ 	     (ptr[3] & 0377), (ptr[4] & 0377), (ptr[5] & 0377)
++ 	);
++     return (buff);
++-}
+++      }
++ 
++ 
++ static int in_tr(char *bufp, struct sockaddr *sap)
++@@ -51,7 +57,17 @@ static int in_tr(char *bufp, struct sock
++     char c, *orig;
++     int i, val;
++ 
+++#ifdef ARPHRD_IEEE802_TR
+++    if (kernel_version() < KRELEASE(2,3,30)) { 
+++        sap->sa_family = tr_hwtype.type;
+++    } else { 
+++        sap->sa_family = tr_hwtype1.type;
+++    } 	
+++#else
++     sap->sa_family = tr_hwtype.type;
+++    #warning "Limited functionality, no support for ARPHRD_IEEE802_TR (old kernel headers?)"
+++#endif
+++
++     ptr = sap->sa_data;
++ 
++     i = 0;
++Index: net-tools/lib/util-ank.c
++===================================================================
++--- net-tools.orig/lib/util-ank.c
+++++ net-tools/lib/util-ank.c
++@@ -293,7 +293,7 @@ int inet_addr_match(inet_prefix *a, inet
++ 	return 0;
++ }
++ 
++-const char *format_host(int af, void *addr, __u8 *abuf, int alen)
+++const char *format_host(int af, void *addr, char *abuf, int alen)
++ {
++ #ifdef RESOLVE_HOSTNAMES
++ 	if (resolve_hosts) {
++Index: net-tools/lib/util.h
++===================================================================
++--- net-tools.orig/lib/util.h
+++++ net-tools/lib/util.h
++@@ -14,3 +14,6 @@ int nstrcmp(const char *, const char *);
++ 
++ char *safe_strncpy(char *dst, const char *src, size_t size); 
++ 
+++
+++#define netmin(a,b) ((a)<(b) ? (a) : (b))
+++#define netmax(a,b) ((a)>(b) ? (a) : (b))
++Index: net-tools/lib/x25_sr.c
++===================================================================
++--- net-tools.orig/lib/x25_sr.c
+++++ net-tools/lib/x25_sr.c
++@@ -67,7 +67,7 @@ static int X25_setroute(int action, int 
++   strcpy(target, *args++);
++ 
++   /* Clean out the x25_route_struct structure. */
++-  memset((char *) &rt, 0, sizeof(struct x25_route_struct));
+++  memset((char *) &rt, 0, sizeof(rt));
++ 
++ 
++   if ((sigdigits = x25_aftype.input(0, target, (struct sockaddr *)&sx25)) < 0) {
++@@ -76,8 +76,8 @@ static int X25_setroute(int action, int 
++   }
++   rt.sigdigits=sigdigits;
++ 
++-  /* x25_route_struct.address isn't type struct sockaddr_x25, Why? */
++-  memcpy(&rt.address, &sx25.sx25_addr, sizeof(x25_address));
+++  /* this works with 2.4 and 2.6 headers struct x25_address vs. typedef */
+++  memcpy(&rt.address, &sx25.sx25_addr, sizeof(sx25.sx25_addr));
++ 
++   while (*args) {
++ 	if (!strcmp(*args,"device") || !strcmp(*args,"dev")) {
++Index: net-tools/lib/eui64.c
++===================================================================
++--- /dev/null
+++++ net-tools/lib/eui64.c
++@@ -0,0 +1,155 @@
+++/*
+++ * lib/eui64.c  This file contains support for generic EUI-64 hw addressing
+++ *
+++ * Version:     $Id: eui64.c,v 1.1 2001/11/12 02:12:05 ecki Exp $
+++ *
+++ * Author:      Daniel Stodden <stodden@in.tum.de>
+++ *              Copyright 2001 Daniel Stodden
+++ *
+++ *              blueprinted from ether.c 
+++ *              Copyright 1993 MicroWalt Corporation
+++ *
+++ *              This program is free software; you can redistribute it
+++ *              and/or  modify it under  the terms of  the GNU General
+++ *              Public  License as  published  by  the  Free  Software
+++ *              Foundation;  either  version 2 of the License, or  (at
+++ *              your option) any later version.
+++ */
+++#include "config.h"
+++
+++#if HAVE_HWEUI64
+++
+++#include <sys/types.h>
+++#include <sys/ioctl.h>
+++#include <sys/socket.h>
+++#include <net/if_arp.h>
+++#include <stdlib.h>
+++#include <stdio.h>
+++#include <ctype.h>
+++#include <errno.h>
+++#include <fcntl.h>
+++#include <string.h>
+++#include <termios.h>
+++#include <unistd.h>
+++#include "net-support.h"
+++#include "pathnames.h"
+++#include "intl.h"
+++
+++/*
+++ * EUI-64 constants
+++ */
+++
+++#define EUI64_ALEN	8
+++
+++#ifndef ARPHRD_EUI64
+++#define ARPHRD_EUI64	27
+++#warning "ARPHRD_EUI64 not defined in <net/if_arp.h>. Using private value 27"
+++#endif
+++
+++struct hwtype eui64_hwtype;
+++
+++/* Display an EUI-64 address in readable format. */
+++static char *pr_eui64( unsigned char *ptr )
+++{
+++	static char buff[64];
+++
+++	snprintf(buff, sizeof(buff), "%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X",
+++		 (ptr[0] & 0377), (ptr[1] & 0377), (ptr[2] & 0377), (ptr[3] & 0377), 
+++		 (ptr[4] & 0377), (ptr[5] & 0377), (ptr[6] & 0377), (ptr[7] & 0377)
+++		);
+++	return (buff);
+++}
+++
+++/* Start the PPP encapsulation on the file descriptor. */
+++static int in_eui64( char *bufp, struct sockaddr *sap )
+++{
+++	unsigned char *ptr;
+++	char c, *orig;
+++	int i;
+++	unsigned val;
+++
+++	sap->sa_family = eui64_hwtype.type;
+++	ptr = sap->sa_data;
+++
+++	i = 0;
+++	orig = bufp;
+++	
+++	while ((*bufp != '\0') && (i < EUI64_ALEN)) {
+++		val = 0;
+++		c = *bufp++;
+++		if (isdigit(c))
+++			val = c - '0';
+++		else if (c >= 'a' && c <= 'f')
+++			val = c - 'a' + 10;
+++		else if (c >= 'A' && c <= 'F')
+++			val = c - 'A' + 10;
+++		else {
+++#ifdef DEBUG
+++			fprintf( stderr, _("in_eui64(%s): invalid eui64 address!\n"), 
+++				 orig );
+++#endif
+++			errno = EINVAL;
+++			return (-1);
+++		}
+++
+++		val <<= 4;
+++		c = *bufp;
+++		if (isdigit(c))
+++			val |= c - '0';
+++		else if (c >= 'a' && c <= 'f')
+++			val |= c - 'a' + 10;
+++		else if (c >= 'A' && c <= 'F')
+++			val |= c - 'A' + 10;
+++		else if (c == ':' || c == 0)
+++			val >>= 4;
+++		else {
+++#ifdef DEBUG
+++			fprintf( stderr, _("in_eui64(%s): invalid eui64 address!\n"), 
+++				 orig );
+++#endif
+++			errno = EINVAL;
+++			return (-1);
+++		}
+++
+++		if (c != 0)
+++			bufp++;
+++
+++		*ptr++ = (unsigned char) (val & 0377);
+++		i++;
+++		
+++		/* We might get a semicolon here - not required. */
+++		if (*bufp == ':') {
+++			if (i == EUI64_ALEN) {
+++#ifdef DEBUG
+++				fprintf(stderr, _("in_eui64(%s): trailing : ignored!\n"),
+++					orig)
+++#endif
+++					; /* nothing */
+++			}
+++			bufp++;
+++		}
+++	}
+++
+++	/* That's it.  Any trailing junk? */
+++	if ((i == EUI64_ALEN) && (*bufp != '\0')) {
+++#ifdef DEBUG
+++		fprintf(stderr, _("in_eui64(%s): trailing junk!\n"), orig);
+++		errno = EINVAL;
+++		return (-1);
+++#endif
+++	}
+++#ifdef DEBUG
+++	fprintf(stderr, "in_eui64(%s): %s\n", orig, pr_eui64(sap->sa_data));
+++#endif
+++
+++    return (0);
+++}
+++
+++struct hwtype eui64_hwtype =
+++{
+++	"eui64", NULL, /*"EUI-64 addressing", */ ARPHRD_EUI64, EUI64_ALEN,
+++	pr_eui64, in_eui64, NULL, 0
+++};
+++
+++
+++#endif				/* HAVE_EUI64 */
++Index: net-tools/lib/ib.c
++===================================================================
++--- /dev/null
+++++ net-tools/lib/ib.c
++@@ -0,0 +1,147 @@
+++/*
+++ * lib/ib.c        This file contains an implementation of the "Infiniband"
+++ *              support functions.
+++ *
+++ * Version:     $Id: ib.c,v 1.1 2005/02/06 11:00:47 tduffy Exp $
+++ *
+++ * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
+++ *              Copyright 1993 MicroWalt Corporation
+++ *		Tom Duffy <tduffy@sun.com>
+++ *
+++ *              This program is free software; you can redistribute it
+++ *              and/or  modify it under  the terms of  the GNU General
+++ *              Public  License as  published  by  the  Free  Software
+++ *              Foundation;  either  version 2 of the License, or  (at
+++ *              your option) any later version.
+++ */
+++#include "config.h"
+++
+++#if HAVE_HWIB
+++#include <sys/types.h>
+++#include <sys/socket.h>
+++#include <net/if_arp.h>
+++#include <linux/if_infiniband.h>
+++#include <stdlib.h>
+++#include <stdio.h>
+++#include <errno.h>
+++#include <ctype.h>
+++#include <string.h>
+++#include <unistd.h>
+++#include "net-support.h"
+++#include "pathnames.h"
+++#include "intl.h"
+++#include "util.h"
+++
+++extern struct hwtype ib_hwtype;
+++
+++
+++/* Display an InfiniBand address in readable format. */
+++static char *pr_ib(unsigned char *ptr)
+++{
+++    static char buff[128];
+++    char *pos;
+++    unsigned int i;
+++
+++    pos = buff;
+++    for (i = 0; i < INFINIBAND_ALEN; i++) {
+++	pos += sprintf(pos, "%02X:", (*ptr++ & 0377));
+++    }
+++    buff[strlen(buff) - 1] = '\0';
+++
+++    /* snprintf(buff, sizeof(buff), "%02X:%02X:%02X:%02X:%02X:%02X",
+++	     (ptr[0] & 0377), (ptr[1] & 0377), (ptr[2] & 0377),
+++	     (ptr[3] & 0377), (ptr[4] & 0377), (ptr[5] & 0377)
+++	);
+++    */
+++    return (buff);
+++}
+++
+++
+++/* Input an Infiniband address and convert to binary. */
+++static int in_ib(char *bufp, struct sockaddr *sap)
+++{
+++    unsigned char *ptr;
+++    char c, *orig;
+++    int i;
+++    unsigned val;
+++
+++    sap->sa_family = ib_hwtype.type;
+++    ptr = sap->sa_data;
+++
+++    i = 0;
+++    orig = bufp;
+++    while ((*bufp != '\0') && (i < INFINIBAND_ALEN)) {
+++	val = 0;
+++	c = *bufp++;
+++	if (isdigit(c))
+++	    val = c - '0';
+++	else if (c >= 'a' && c <= 'f')
+++	    val = c - 'a' + 10;
+++	else if (c >= 'A' && c <= 'F')
+++	    val = c - 'A' + 10;
+++	else {
+++#ifdef DEBUG
+++	    fprintf(stderr, _("in_ib(%s): invalid infiniband address!\n"), orig);
+++#endif
+++	    errno = EINVAL;
+++	    return (-1);
+++	}
+++	val <<= 4;
+++	c = *bufp;
+++	if (isdigit(c))
+++	    val |= c - '0';
+++	else if (c >= 'a' && c <= 'f')
+++	    val |= c - 'a' + 10;
+++	else if (c >= 'A' && c <= 'F')
+++	    val |= c - 'A' + 10;
+++	else if (c == ':' || c == 0)
+++	    val >>= 4;
+++	else {
+++#ifdef DEBUG
+++	    fprintf(stderr, _("in_ib(%s): invalid infiniband address!\n"), orig);
+++#endif
+++	    errno = EINVAL;
+++	    return (-1);
+++	}
+++	if (c != 0)
+++	    bufp++;
+++	*ptr++ = (unsigned char) (val & 0377);
+++	i++;
+++
+++	/* We might get a semicolon here - not required. */
+++	if (*bufp == ':') {
+++	    if (i == INFINIBAND_ALEN) {
+++#ifdef DEBUG
+++		fprintf(stderr, _("in_ib(%s): trailing : ignored!\n"),
+++			orig)
+++#endif
+++		    ;		/* nothing */
+++	    }
+++	    bufp++;
+++	}
+++    }
+++
+++    /* That's it.  Any trailing junk? */
+++    if ((i == INFINIBAND_ALEN) && (*bufp != '\0')) {
+++#ifdef DEBUG
+++	fprintf(stderr, _("in_ib(%s): trailing junk!\n"), orig);
+++	errno = EINVAL;
+++	return (-1);
+++#endif
+++    }
+++#ifdef DEBUG
+++    fprintf(stderr, "in_ib(%s): %s\n", orig, pr_ib(sap->sa_data));
+++#endif
+++
+++    return (0);
+++}
+++
+++
+++struct hwtype ib_hwtype =
+++{
+++    "infiniband", NULL, ARPHRD_INFINIBAND, INFINIBAND_ALEN,
+++    pr_ib, in_ib, NULL
+++};
+++
+++
+++#endif				/* HAVE_HWIB */
+--- net-tools-1.60.orig/debian/patches/CVS-20051204-slttach.c_sync.patch
++++ net-tools-1.60/debian/patches/CVS-20051204-slttach.c_sync.patch
+@@ -0,0 +1,43 @@
++Sync with upstream CVS, complete log:
++
++Revision 1.11 - Sun Dec 4 05:15:36 2005 UTC by ecki
++use file version
++
++Revision 1.10 - Sun Dec 4 05:14:08 2005 UTC by ecki
++make slattach 3-wire -L mode work (no RTSCTS) (Debian Bug #175743)
++
++Index: net-tools/slattach.c
++===================================================================
++--- net-tools.orig/slattach.c
+++++ net-tools/slattach.c
++@@ -73,7 +73,7 @@
++ 
++ 
++ const char *Release = RELEASE,
++-	   *Version = "@(#) slattach 1.21 (1999-11-21)",
+++	   *Version = "$Id: slattach.c,v 1.11 2005/12/04 05:15:36 ecki Exp $",
++ 	   *Signature = "net-tools, Fred N. van Kempen et al.";
++ 
++ 
++@@ -115,7 +115,7 @@ int		opt_h = 0;		/* "hangup" on carrier 
++ int		opt_k = 0;		/* "keepalive" value		*/
++ #endif
++ int		opt_l = 0;		/* "lock it" flag		*/
++-int		opt_L = 0;		/* clocal flag			*/
+++int		opt_L = 0;		/* 3-wire mode flag		*/
++ int		opt_m = 0;		/* "set RAW mode" flag		*/
++ int		opt_n = 0;		/* "set No Mesg" flag		*/
++ #ifdef SIOCSOUTFILL
++@@ -342,9 +342,11 @@ tty_set_raw(struct termios *tty)
++   tty->c_oflag = (0);				/* output flags		*/
++   tty->c_lflag = (0);				/* local flags		*/
++   speed = (tty->c_cflag & CBAUD);		/* save current speed	*/
++-  tty->c_cflag = (CRTSCTS | HUPCL | CREAD);	/* UART flags		*/
+++  tty->c_cflag = (HUPCL | CREAD);		/* UART flags		*/
++   if (opt_L) 
++ 	tty->c_cflag |= CLOCAL;
+++  else
+++	tty->c_cflag |= CRTSCTS;
++   tty->c_cflag |= speed;			/* restore speed	*/
++   return(0);
++ }
+--- net-tools-1.60.orig/debian/patches/CVS-20071202-rarp.c_sync.patch
++++ net-tools-1.60/debian/patches/CVS-20071202-rarp.c_sync.patch
+@@ -0,0 +1,41 @@
++Sync with upstream CVS, complete log:
++
++Revision 1.9 - Sun Dec 2 02:19:52 2007 UTC by ecki
++more backoff
++
++Revision 1.8 - Sat Dec 1 19:36:55 2007 UTC by ecki
++backoff proc_fopen usage from etherfile.
++
++Revision 1.7 - Sat Dec 1 18:51:09 2007 UTC by ecki
++Page aligned fopen buffer
++
++Index: net-tools/rarp.c
++===================================================================
++--- net-tools.orig/rarp.c
+++++ net-tools/rarp.c
++@@ -3,7 +3,7 @@
++  *              that maintains the kernel's RARP cache.  It is derived
++  *              from Fred N. van Kempen's arp command.
++  *
++- * Version:	$Id: rarp.c,v 1.6 2001/04/08 17:05:05 pb Exp $
+++ * Version:	$Id: rarp.c,v 1.9 2007/12/02 02:19:52 ecki Exp $
++  *
++  * Usage:       rarp -d hostname                      Delete entry
++  *              rarp -s hostname ethernet_address     Add entry
++@@ -40,6 +40,7 @@
++ #include "net-support.h"
++ #include "version.h"
++ #include "pathnames.h"
+++#include "proc.h"
++ 
++ static char no_rarp_message[] = N_("This kernel does not support RARP.\n");
++ 
++@@ -154,7 +155,7 @@ static int rarp_file(int fd, const char 
++ 
++ static int display_cache(void)
++ {
++-    FILE *fd = fopen(_PATH_PROCNET_RARP, "r");
+++    FILE *fd = proc_fopen(_PATH_PROCNET_RARP);
++     char buffer[256];
++     if (fd == NULL) {
++ 	if (errno == ENOENT)
+--- net-tools-1.60.orig/debian/patches/CVS-20081003-statistics.c_sync.patch
++++ net-tools-1.60/debian/patches/CVS-20081003-statistics.c_sync.patch
+@@ -0,0 +1,385 @@
++Sync with upstream CVS, complete log:
++
++Revision 1.21 - Fri Oct 3 00:05:20 2008 UTC by ecki
++Enable netstat -s for IPv6 (Debian Bug #453859 from Varun Chandramohan)
++
++Revision 1.20 - Sat Dec 1 18:44:56 2007 UTC by ecki
++Faster pagesize aligned fopen for netstat -s (Eric Dumazet)
++
++Revision 1.19 - Sat Dec 1 18:29:05 2007 UTC by ecki
++Better netstat -s error handling and larger buffers
++
++Revision 1.18 - Wed Feb 12 03:30:57 2003 UTC by ak
++Add text for two new TCP statistics and fix some existing descriptions
++
++Revision 1.17 - Sun Apr 28 15:41:01 2002 UTC by ak
++Fix some counter descriptions.  Noted by Jamal Hadi.
++
++Revision 1.16 - Wed Oct 24 11:57:05 2001 UTC by ak
++(Finally) update netstat -s for 2.4 statistics.
++
++Revision 1.15 - Fri Oct 19 09:28:01 2001 UTC by ak
++Only print unknown statistics when their counter is > 0.
++
++Index: net-tools/statistics.c
++===================================================================
++--- net-tools.orig/statistics.c
+++++ net-tools/statistics.c
++@@ -1,6 +1,6 @@
++ /*
++  * Copyright 1997,1999,2000 Andi Kleen. Subject to the GPL. 
++- * $Id: statistics.c,v 1.14 2001/02/02 18:01:23 pb Exp $
+++ * $Id: statistics.c,v 1.21 2008/10/03 00:05:20 ecki Exp $
++  * 19980630 - i18n - Arnaldo Carvalho de Melo <acme@conectiva.com.br> 
++  * 19981113 - i18n fixes - Arnaldo Carvalho de Melo <acme@conectiva.com.br> 
++  * 19990101 - added net/netstat, -t, -u, -w supprt - Bernd Eckenfels 
++@@ -11,6 +11,7 @@
++ #include <string.h>
++ #include "config.h"
++ #include "intl.h"
+++#include "proc.h"
++ 
++ /* #define WARN 1 */
++ 
++@@ -83,6 +84,32 @@ struct entry Iptab[] =
++     {"FragCreates", N_("%u fragments created"), opt_number}
++ };
++ 
+++struct entry Ip6tab[] =
+++{
+++    {"Ip6InReceives", N_("%u total packets received"), number},
+++    {"Ip6InHdrErrors", N_("%u with invalid headers"), opt_number},
+++    {"Ip6InTooBigErrors", N_("%u with packets too big"), opt_number},
+++    {"Ip6InNoRoutes", N_("%u incoming packets with no route"), opt_number},
+++    {"Ip6InAddrErrors", N_("%u with invalid addresses"), opt_number},
+++    {"Ip6InUnknownProtos", N_("%u with unknown protocol"), opt_number},
+++    {"Ip6InTruncatedPkts", N_("%u with truncated packets"), opt_number},
+++    {"Ip6InDiscards", N_("%u incoming packets discarded"), number},
+++    {"Ip6InDelivers", N_("%u incoming packets delivered"), number},
+++    {"Ip6OutForwDatagrams", N_("%u forwarded"), number},
+++    {"Ip6OutRequests", N_("%u requests sent out"), number},     /*? */
+++    {"Ip6OutDiscards", N_("%u outgoing packets dropped"), opt_number},
+++    {"Ip6OutNoRoutes", N_("%u dropped because of missing route"), opt_number},
+++    {"Ip6ReasmTimeout", N_("%u fragments dropped after timeout"), opt_number},
+++    {"Ip6ReasmReqds", N_("%u reassemblies required"), opt_number}, /* ? */
+++    {"Ip6ReasmOKs", N_("%u packets reassembled ok"), opt_number},
+++    {"Ip6ReasmFails", N_("%u packet reassembles failed"), opt_number},
+++    {"Ip6FragOKs", N_("%u fragments received ok"), opt_number},
+++    {"Ip6FragFails", N_("%u fragments failed"), opt_number},
+++    {"Ip6FragCreates", N_("%u fragments created"), opt_number},
+++    {"Ip6InMcastPkts", N_("%u incoming multicast packets"), opt_number},
+++    {"Ip6OutMcastPkts", N_("%u outgoing multicast packets"), opt_number}
+++};
+++
++ struct entry Icmptab[] =
++ {
++     {"InMsgs", N_("%u ICMP messages received"), number},
++@@ -113,6 +140,41 @@ struct entry Icmptab[] =
++     {"OutAddrMaskReps", N_("address mask replies: %u"), i_outp_icmp | I_TITLE},
++ };
++ 
+++struct entry Icmp6tab[] =
+++{
+++    {"Icmp6InMsgs", N_("%u ICMP messages received"), number},
+++    {"Icmp6InErrors", N_("%u input ICMP message failed."), number},
+++    {"Icmp6InDestUnreachs", N_("destination unreachable: %u"), i_inp_icmp | I_TITLE},
+++    {"Icmp6InPktTooBigs", N_("packets too big: %u"), i_inp_icmp | I_TITLE},
+++    {"Icmp6InTimeExcds", N_("received ICMPv6 time exceeded: %u"), i_inp_icmp | I_TITLE},
+++    {"Icmp6InParmProblems", N_("parameter problem: %u"), i_inp_icmp | I_TITLE},
+++    {"Icmp6InEchos", N_("echo requests: %u"), i_inp_icmp | I_TITLE},
+++    {"Icmp6InEchoReplies", N_("echo replies: %u"), i_inp_icmp | I_TITLE},
+++    {"Icmp6InGroupMembQueries", N_("group member queries: %u"), i_inp_icmp | I_TITLE},
+++    {"Icmp6InGroupMembResponses", N_("group member responses: %u"), i_inp_icmp | I_TITLE},
+++    {"Icmp6InGroupMembReductions", N_("group member reductions: %u"), i_inp_icmp | I_TITLE},
+++    {"Icmp6InRouterSolicits", N_("router solicits: %u"), i_inp_icmp | I_TITLE},
+++    {"Icmp6InRouterAdvertisements", N_("router advertisement: %u"), i_inp_icmp | I_TITLE},
+++    {"Icmp6InNeighborSolicits", N_("neighbour solicits: %u"), i_inp_icmp | I_TITLE},
+++    {"Icmp6InNeighborAdvertisements", N_("neighbour advertisement: %u"), i_inp_icmp | I_TITLE},
+++    {"Icmp6InRedirects", N_("redirects: %u"), i_inp_icmp | I_TITLE},
+++    {"Icmp6OutMsgs", N_("%u ICMP messages sent"), number},
+++    {"Icmp6OutDestUnreachs", N_("destination unreachable: %u"), i_outp_icmp | I_TITLE},
+++    {"Icmp6OutPktTooBigs", N_("packets too big: %u"), i_outp_icmp | I_TITLE},
+++    {"Icmp6OutTimeExcds", N_("sent ICMPv6 time exceeded: %u"), i_outp_icmp | I_TITLE},
+++    {"Icmp6OutParmProblems", N_("parameter problem: %u"), i_outp_icmp | I_TITLE},
+++    {"Icmp6OutEchos", N_("echo requests: %u"), i_outp_icmp | I_TITLE},
+++    {"Icmp6OutEchoReplies", N_("echo replies: %u"), i_outp_icmp | I_TITLE},
+++    {"Icmp6OutGroupMembQueries", N_("group member queries: %u"), i_outp_icmp | I_TITLE},
+++    {"Icmp6OutGroupMembResponses", N_("group member responses: %u"), i_outp_icmp | I_TITLE},
+++    {"Icmp6OutGroupMembReductions", N_("group member reductions: %u"), i_outp_icmp | I_TITLE},
+++    {"Icmp6OutRouterSolicits", N_("router solicits: %u"), i_outp_icmp | I_TITLE},
+++    {"Icmp6OutRouterAdvertisements ", N_("router advertisement: %u"), i_outp_icmp | I_TITLE},
+++    {"Icmp6OutNeighborSolicits", N_("neighbor solicits: %u"), i_outp_icmp | I_TITLE},
+++    {"Icmp6OutNeighborAdvertisements", N_("neighbor advertisements: %u"), i_outp_icmp | I_TITLE},
+++    {"Icmp6OutRedirects", N_("redirects: %u"), i_outp_icmp | I_TITLE},
+++};
+++
++ struct entry Tcptab[] =
++ {
++     {"RtoAlgorithm", N_("RTO algorithm is %s"), i_rto_alg | I_STATIC},
++@@ -139,6 +201,14 @@ struct entry Udptab[] =
++     {"OutDatagrams", N_("%u packets sent"), number},
++ };
++ 
+++struct entry Udp6tab[] =
+++{
+++    {"Udp6InDatagrams", N_("%u packets received"), number},
+++    {"Udp6NoPorts", N_("%u packets to unknown port received."), number},
+++    {"Udp6InErrors", N_("%u packet receive errors"), number},
+++    {"Udp6OutDatagrams", N_("%u packets sent"), number},
+++};
+++
++ struct entry Tcpexttab[] =
++ {
++     {"SyncookiesSent", N_("%u SYN cookies sent"), opt_number},
++@@ -172,19 +242,59 @@ struct entry Tcpexttab[] =
++     { "DelayedACKLost", N_("Quick ack mode was activated %u times"), opt_number },
++     { "ListenOverflows", N_("%u times the listen queue of a socket overflowed"),
++       opt_number },
++-    { "ListenDrops", N_("%u SYNs to LISTEN sockets ignored"), opt_number },
+++    { "ListenDrops", N_("%u SYNs to LISTEN sockets dropped"), opt_number },
++     { "TCPPrequeued", N_("%u packets directly queued to recvmsg prequeue."), 
++       opt_number },
++-    { "TCPDirectCopyFromBacklog", N_("%u packets directly received"
++-				     " from backlog"), opt_number },
++-    { "TCPDirectCopyFromPrequeue", N_("%u packets directly received"
++-				      " from prequeue"), opt_number },
+++    { "TCPDirectCopyFromBacklog", N_("%u bytes directly in process context from backlog"), opt_number },
+++    { "TCPDirectCopyFromPrequeue", N_("%u bytes directly received in process context from prequeue"),
+++				      opt_number },
++     { "TCPPrequeueDropped", N_("%u packets dropped from prequeue"), opt_number },
++-    { "TCPHPHits", N_("%u packets header predicted"), number },
+++    { "TCPHPHits", N_("%u packet headers predicted"), number },
++     { "TCPHPHitsToUser", N_("%u packets header predicted and "
++ 			    "directly queued to user"), opt_number },
++     { "SockMallocOOM", N_("Ran %u times out of system memory during " 
++ 			  "packet sending"), opt_number }, 
+++    { "TCPPureAcks", N_("%u acknowledgments not containing data payload received"), opt_number },
+++    { "TCPHPAcks", N_("%u predicted acknowledgments"), opt_number },
+++    { "TCPRenoRecovery", N_("%u times recovered from packet loss due to fast retransmit"), opt_number },
+++    { "TCPSackRecovery", N_("%u times recovered from packet loss by selective acknowledgements"), opt_number },
+++    { "TCPSACKReneging", N_("%u bad SACK blocks received"), opt_number },
+++    { "TCPFACKReorder", N_("Detected reordering %u times using FACK"), opt_number },
+++    { "TCPSACKReorder", N_("Detected reordering %u times using SACK"), opt_number },
+++    { "TCPTSReorder", N_("Detected reordering %u times using time stamp"), opt_number },
+++    { "TCPRenoReorder", N_("Detected reordering %u times using reno fast retransmit"), opt_number },
+++    { "TCPFullUndo", N_("%u congestion windows fully recovered without slow start"), opt_number }, 
+++    { "TCPPartialUndo", N_("%u congestion windows partially recovered using Hoe heuristic"), opt_number },
+++    { "TCPDSackUndo", N_("%u congestion window recovered without slow start using DSACK"), opt_number },
+++    { "TCPLossUndo", N_("%u congestion windows recovered without slow start after partial ack"), opt_number },
+++    { "TCPLostRetransmits", N_("%u retransmits lost"), opt_number },
+++    { "TCPRenoFailures",  N_("%u timeouts after reno fast retransmit"), opt_number },
+++    { "TCPSackFailures",  N_("%u timeouts after SACK recovery"), opt_number },
+++    { "TCPLossFailures",  N_("%u timeouts in loss state"), opt_number },
+++    { "TCPFastRetrans", N_("%u fast retransmits"), opt_number },
+++    { "TCPForwardRetrans", N_("%u forward retransmits"), opt_number }, 
+++    { "TCPSlowStartRetrans", N_("%u retransmits in slow start"), opt_number },
+++    { "TCPTimeouts", N_("%u other TCP timeouts"), opt_number },
+++    { "TCPRenoRecoveryFailed", N_("%u reno fast retransmits failed"), opt_number },
+++    { "TCPSackRecoveryFail", N_("%u SACK retransmits failed"), opt_number },
+++    { "TCPSchedulerFailed", N_("%u times receiver scheduled too late for direct processing"), opt_number },
+++    { "TCPRcvCollapsed", N_("%u packets collapsed in receive queue due to low socket buffer"), opt_number },
+++    { "TCPDSACKOldSent", N_("%u DSACKs sent for old packets"), opt_number },
+++    { "TCPDSACKOfoSent", N_("%u DSACKs sent for out of order packets"), opt_number },
+++    { "TCPDSACKRecv", N_("%u DSACKs received"), opt_number },
+++    { "TCPDSACKOfoRecv", N_("%u DSACKs for out of order packets received"), opt_number },
+++    { "TCPAbortOnSyn", N_("%u connections reset due to unexpected SYN"), opt_number },
+++    { "TCPAbortOnData", N_("%u connections reset due to unexpected data"), opt_number },
+++    { "TCPAbortOnClose", N_("%u connections reset due to early user close"), opt_number },
+++    { "TCPAbortOnMemory", N_("%u connections aborted due to memory pressure"), opt_number },
+++    { "TCPAbortOnTimeout", N_("%u connections aborted due to timeout"), opt_number },
+++    { "TCPAbortOnLinger", N_("%u connections aborted after user close in linger timeout"), opt_number },
+++    { "TCPAbortFailed", N_("%u times unabled to send RST due to no memory"), opt_number }, 
+++    { "TCPMemoryPressures", N_("TCP ran low on memory %u times"), opt_number }, 
+++    { "TCPLoss", N_("%u TCP data loss events"), opt_number },
+++    { "TCPDSACKUndo", N_("%u congestion windows recovered without slow start by DSACK"), 
+++	opt_number },
+++    { "TCPRenoRecoveryFail", N_("%u classic Reno fast retransmits failed"), opt_number },
++ };
++ 
++ struct tabtab {
++@@ -204,6 +314,15 @@ struct tabtab snmptabs[] =
++     {NULL}
++ };
++ 
+++struct tabtab snmp6tabs[] =
+++{
+++    {"Ip6", Ip6tab, sizeof(Ip6tab), &f_raw},
+++    {"Icmp6", Icmp6tab, sizeof(Icmp6tab), &f_raw},
+++    {"Udp6", Udp6tab, sizeof(Udp6tab), &f_udp},
+++    {"Tcp6", Tcptab, sizeof(Tcptab), &f_tcp},
+++    {NULL}
+++};
+++
++ /* XXX IGMP */
++ 
++ int cmpentries(const void *a, const void *b)
++@@ -222,7 +341,8 @@ void printval(struct tabtab *tab, char *
++ 	    ent = bsearch(&key, tab->tab, tab->size / sizeof(struct entry),
++ 			  sizeof(struct entry), cmpentries);
++     if (!ent) {			/* try our best */
++-	printf("%*s%s: %d\n", states[state].indent, "", title, val);
+++	if (val) 
+++		printf("%*s%s: %d\n", states[state].indent, "", title, val);
++ 	return;
++     }
++     type = ent->type;
++@@ -289,14 +409,17 @@ struct tabtab *newtable(struct tabtab *t
++ 	return &dummytab;
++ }
++ 
++-void process_fd(FILE *f)
+++int process_fd(FILE *f, int all, char *filter)
++ {
++-    char buf1[1024], buf2[1024];
+++    char buf1[2048], buf2[2048];
++     char *sp, *np, *p;
++     while (fgets(buf1, sizeof buf1, f)) {
++ 	int endflag;
++ 	struct tabtab *tab;
++ 
+++        if (buf1[0] == '\n') // skip empty first line in 2.6 kernels
+++            continue;
+++            
++ 	if (!fgets(buf2, sizeof buf2, f))
++ 	    break;
++ 	sp = strchr(buf1, ':');
++@@ -305,6 +428,10 @@ void process_fd(FILE *f)
++ 	    goto formaterr;
++ 	*sp = '\0';
++ 
+++        if (!all)
+++           if (strncmp(buf1, filter, strlen(filter)))
+++               continue;
+++
++ 	tab = newtable(snmptabs, buf1);
++ 	if (tab == NULL) {
++ 		printf("unknown %s\n", buf1);
++@@ -330,13 +457,47 @@ void process_fd(FILE *f)
++ 	    sp = p + 1;
++ 	}
++     }
++-  return;
+++  return 0;
++   
++ formaterr:
++-  perror(_("error parsing /proc/net/snmp"));
++-  return;
+++  return -1;
+++}
+++
+++void cpytitle(char *original, char *new)
+++{
+++     char *ptr = original;
+++     while(*ptr != '6' && *ptr != '\0') {
+++           *new = *ptr;
+++            new++;
+++            ptr++;
+++     }
+++    *new = *ptr;
+++    new++;
+++    *new = '\0';
++ }
++ 
+++void process6_fd(FILE *f)
+++{
+++   char buf1[1024],buf2[50],buf3[1024];
+++   unsigned long val;
+++   struct tabtab *tab = NULL;
+++   int cpflg = 0;
+++
+++   while (fgets(buf1, sizeof buf1, f)) {
+++          sscanf(buf1, "%s %lu", buf2, &val);
+++          if(!cpflg) {
+++             cpytitle(buf2, buf3);
+++             tab = newtable(snmp6tabs, buf3);
+++             cpflg = 1;
+++          }
+++          if(!strstr(buf2, buf3)) {
+++             cpytitle(buf2, buf3);
+++             tab = newtable(snmp6tabs, buf3);
+++          }
+++          printval(tab, buf2, val);
+++   }
+++
+++}
++ 
++ void parsesnmp(int flag_raw, int flag_tcp, int flag_udp)
++ {
++@@ -344,22 +505,25 @@ void parsesnmp(int flag_raw, int flag_tc
++ 
++     f_raw = flag_raw; f_tcp = flag_tcp; f_udp = flag_udp;
++     
++-    f = fopen("/proc/net/snmp", "r");
+++    f = proc_fopen("/proc/net/snmp");
++     if (!f) {
++ 	perror(_("cannot open /proc/net/snmp"));
++ 	return;
++     }
++-    process_fd(f);
+++
+++    if (process_fd(f, 1, NULL) < 0)
+++      fprintf(stderr, _("Problem while parsing /proc/net/snmp\n"));
++ 
++     if (ferror(f))
++ 	perror("/proc/net/snmp");
++ 
++     fclose(f);
++ 
++-    f = fopen("/proc/net/netstat", "r");
+++    f = proc_fopen("/proc/net/netstat");
++ 
++     if (f) {
++-    	process_fd(f);
+++    	if (process_fd(f, 1, NULL) <0)
+++          fprintf(stderr, _("Problem while parsing /proc/net/netstat\n"));
++ 
++         if (ferror(f))
++ 	    perror("/proc/net/netstat");
++@@ -369,6 +533,33 @@ void parsesnmp(int flag_raw, int flag_tc
++     return;
++ }
++     
+++void parsesnmp6(int flag_raw, int flag_tcp, int flag_udp)
+++{
+++    FILE *f;
+++
+++    f_raw = flag_raw; f_tcp = flag_tcp; f_udp = flag_udp;
+++
+++    f = fopen("/proc/net/snmp6", "r");
+++    if (!f) {
+++        perror(_("cannot open /proc/net/snmp6"));
+++        return;
+++    }
+++    process6_fd(f);
+++    if (ferror(f))
+++        perror("/proc/net/snmp6");
+++
+++    fclose(f);
+++    f = fopen("/proc/net/snmp", "r");
+++    if (!f) {
+++        perror(_("cannot open /proc/net/snmp"));
+++        return;
+++    }
+++    process_fd(f, 0, "Tcp");
+++    if (ferror(f))
+++        perror("/proc/net/snmp");
+++
+++    fclose(f);
+++}
++ 
++ void inittab(void)
++ {
++@@ -379,3 +570,13 @@ void inittab(void)
++ 	qsort(t->tab, t->size / sizeof(struct entry),
++ 	      sizeof(struct entry), cmpentries);
++ }
+++
+++void inittab6(void)
+++{
+++    struct tabtab *t;
+++
+++    for (t = snmp6tabs; t->title; t++)
+++        qsort(t->tab, t->size / sizeof(struct entry),
+++              sizeof(struct entry), cmpentries);
+++}
+++
+--- net-tools-1.60.orig/debian/patches/CVS-20051204-arp.c_sync.patch
++++ net-tools-1.60/debian/patches/CVS-20051204-arp.c_sync.patch
+@@ -0,0 +1,311 @@
++Sync with upstream CVS, complete log:
++
++Revision 1.25 - Sun Dec 4 02:57:15 2005 UTC by ecki
++In order to fix alignment bugs with recent GCCs I have to use
++sockaddr_storage instead of sockaddr for allocation.
++http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=340384
++Thanks to Blars Blarson, Jurij Smakov and Steve Langasek
++
++Revision 1.24 - Mon May 16 04:30:17 2005 UTC by ecki
++desupport dontpub in arp.8 and arp -? (Debian Bug #203396)
++
++Revision 1.23 - Sat Feb 8 19:56:25 2003 UTC by ecki
++fixed an logic error in the "not found" handling for deleting entries
++also added a documentation comment and newer errno values for 2.4
++Thanks to niteowl@intrinsity.com for pointing out.
++
++Revision 1.22 - Tue Dec 10 01:01:24 2002 UTC by ecki
++change confusing "*" into "<from_interface>"
++
++Revision 1.21 - Sun May 6 02:14:07 2001 UTC by ecki
++changed a type arp -a now prints PUB instead of PUP for proxy arp entries
++
++Index: net-tools/arp.c
++===================================================================
++--- net-tools.orig/arp.c
+++++ net-tools/arp.c
++@@ -8,7 +8,7 @@
++  *              NET-3 Networking Distribution for the LINUX operating
++  *              system.
++  *
++- * Version:     $Id: arp.c,v 1.20 2001/04/08 17:05:05 pb Exp $
+++ * Version:     $Id: arp.c,v 1.25 2005/12/04 02:57:15 ecki Exp $
++  *
++  * Maintainer:  Bernd 'eckes' Eckenfels, <net-tools@lina.inka.de>
++  *
++@@ -100,9 +100,10 @@ static int arp_del(char **args)
++ {
++     char host[128];
++     struct arpreq req;
++-    struct sockaddr sa;
+++    struct sockaddr_storage ss;
+++    struct sockaddr *sa;
++     int flags = 0;
++-    int err;
+++    int deleted = 0;
++ 
++     memset((char *) &req, 0, sizeof(req));
++ 
++@@ -112,12 +113,13 @@ static int arp_del(char **args)
++ 	return (-1);
++     }
++     safe_strncpy(host, *args, (sizeof host));
++-    if (ap->input(0, host, &sa) < 0) {
+++    sa = (struct sockaddr *)&ss;
+++    if (ap->input(0, host, sa) < 0) {
++ 	ap->herror(host);
++ 	return (-1);
++     }
++     /* If a host has more than one address, use the correct one! */
++-    memcpy((char *) &req.arp_pa, (char *) &sa, sizeof(struct sockaddr));
+++    memcpy((char *) &req.arp_pa, (char *) sa, sizeof(struct sockaddr));
++ 
++     if (hw_set)
++ 	req.arp_ha.sa_family = hw->type;
++@@ -148,7 +150,7 @@ static int arp_del(char **args)
++ 	    continue;
++ 	}
++ 	if (!strcmp(*args, "dontpub")) {
++-#ifdef HAVE_ATF_DONTPUB
+++#ifdef ATF_DONTPUB
++ 	    req.arp_flags |= ATF_DONTPUB;
++ #else
++ 	    ENOSUPP("arp", "ATF_DONTPUB");
++@@ -157,7 +159,7 @@ static int arp_del(char **args)
++ 	    continue;
++ 	}
++ 	if (!strcmp(*args, "auto")) {
++-#ifdef HAVE_ATF_MAGIC
+++#ifdef ATF_MAGIC
++ 	    req.arp_flags |= ATF_MAGIC;
++ #else
++ 	    ENOSUPP("arp", "ATF_MAGIC");
++@@ -177,11 +179,11 @@ static int arp_del(char **args)
++ 		usage();
++ 	    if (strcmp(*args, "255.255.255.255") != 0) {
++ 		strcpy(host, *args);
++-		if (ap->input(0, host, &sa) < 0) {
+++		if (ap->input(0, host, sa) < 0) {
++ 		    ap->herror(host);
++ 		    return (-1);
++ 		}
++-		memcpy((char *) &req.arp_netmask, (char *) &sa,
+++		memcpy((char *) &req.arp_netmask, (char *) sa,
++ 		       sizeof(struct sockaddr));
++ 		req.arp_flags |= ATF_NETMASK;
++ 	    }
++@@ -190,35 +192,41 @@ static int arp_del(char **args)
++ 	}
++ 	usage();
++     }
+++
+++    // if neighter priv nor pub is given, work on both
++     if (flags == 0)
++ 	flags = 3;
++ 
++     strcpy(req.arp_dev, device);
++ 
++-    err = -1;
+++    /* unfortuatelly the kernel interface does not allow us to
+++       delete private entries anlone, so we need this hack
+++       to avoid "not found" errors if we try both. */
+++    deleted = 0;
++ 
++     /* Call the kernel. */
++     if (flags & 2) {
++ 	if (opt_v)
++-	    fprintf(stderr, "arp: SIOCDARP(nopub)\n");
++-	if ((err = ioctl(sockfd, SIOCDARP, &req) < 0)) {
++-	    if (errno == ENXIO) {
+++	    fprintf(stderr, "arp: SIOCDARP(dontpub)\n");
+++	if (ioctl(sockfd, SIOCDARP, &req) < 0) {
+++	    if ((errno == ENXIO) || (errno == ENOENT)) {
++ 		if (flags & 1)
++-		    goto nopub;
+++		    goto dontpub;
++ 		printf(_("No ARP entry for %s\n"), host);
++ 		return (-1);
++ 	    }
++-	    perror("SIOCDARP(priv)");
+++	    perror("SIOCDARP(dontpub)");
++ 	    return (-1);
++-	}
+++	} else
+++	  deleted = 1;
++     }
++-    if ((flags & 1) && (err)) {
++-      nopub:
+++    if (!deleted && (flags & 1)) {
+++      dontpub:
++ 	req.arp_flags |= ATF_PUBL;
++ 	if (opt_v)
++ 	    fprintf(stderr, "arp: SIOCDARP(pub)\n");
++ 	if (ioctl(sockfd, SIOCDARP, &req) < 0) {
++-	    if (errno == ENXIO) {
+++	    if ((errno == ENXIO) || (errno == ENOENT)) {
++ 		printf(_("No ARP entry for %s\n"), host);
++ 		return (-1);
++ 	    }
++@@ -260,7 +268,8 @@ static int arp_set(char **args)
++ {
++     char host[128];
++     struct arpreq req;
++-    struct sockaddr sa;
+++    struct sockaddr_storage ss;
+++    struct sockaddr *sa;
++     int flags;
++ 
++     memset((char *) &req, 0, sizeof(req));
++@@ -271,12 +280,13 @@ static int arp_set(char **args)
++ 	return (-1);
++     }
++     safe_strncpy(host, *args++, (sizeof host));
++-    if (ap->input(0, host, &sa) < 0) {
+++    sa = (struct sockaddr *)&ss;
+++    if (ap->input(0, host, sa) < 0) {
++ 	ap->herror(host);
++ 	return (-1);
++     }
++     /* If a host has more than one address, use the correct one! */
++-    memcpy((char *) &req.arp_pa, (char *) &sa, sizeof(struct sockaddr));
+++    memcpy((char *) &req.arp_pa, (char *) sa, sizeof(struct sockaddr));
++ 
++     /* Fetch the hardware address. */
++     if (*args == NULL) {
++@@ -317,7 +327,7 @@ static int arp_set(char **args)
++ 	    continue;
++ 	}
++ 	if (!strcmp(*args, "dontpub")) {
++-#ifdef HAVE_ATF_DONTPUB
+++#ifdef ATF_DONTPUB
++ 	    flags |= ATF_DONTPUB;
++ #else
++ 	    ENOSUPP("arp", "ATF_DONTPUB");
++@@ -326,7 +336,7 @@ static int arp_set(char **args)
++ 	    continue;
++ 	}
++ 	if (!strcmp(*args, "auto")) {
++-#ifdef HAVE_ATF_MAGIC
+++#ifdef ATF_MAGIC
++ 	    flags |= ATF_MAGIC;
++ #else
++ 	    ENOSUPP("arp", "ATF_MAGIC");
++@@ -346,11 +356,11 @@ static int arp_set(char **args)
++ 		usage();
++ 	    if (strcmp(*args, "255.255.255.255") != 0) {
++ 		strcpy(host, *args);
++-		if (ap->input(0, host, &sa) < 0) {
+++		if (ap->input(0, host, sa) < 0) {
++ 		    ap->herror(host);
++ 		    return (-1);
++ 		}
++-		memcpy((char *) &req.arp_netmask, (char *) &sa,
+++		memcpy((char *) &req.arp_netmask, (char *) sa,
++ 		       sizeof(struct sockaddr));
++ 		flags |= ATF_NETMASK;
++ 	    }
++@@ -445,11 +455,11 @@ static void arp_disp_2(char *name, int t
++ 	strcat(flags, "M");
++     if (arp_flags & ATF_PUBL)
++ 	strcat(flags, "P");
++-#ifdef HAVE_ATF_MAGIC
+++#ifdef ATF_MAGIC
++     if (arp_flags & ATF_MAGIC)
++ 	strcat(flags, "A");
++ #endif
++-#ifdef HAVE_ATF_DONTPUB
+++#ifdef ATF_DONTPUB
++     if (arp_flags & ATF_DONTPUB)
++ 	strcat(flags, "!");
++ #endif
++@@ -463,7 +473,7 @@ static void arp_disp_2(char *name, int t
++ 
++     if (!(arp_flags & ATF_COM)) {
++ 	if (arp_flags & ATF_PUBL)
++-	    printf("%-8.8s%-20.20s", "*", "*");
+++	    printf("%-8.8s%-20.20s", "*", _("<from_interface>"));
++ 	else
++ 	    printf("%-8.8s%-20.20s", "", _("(incomplete)"));
++     } else {
++@@ -486,7 +496,7 @@ static void arp_disp(char *name, char *i
++ 
++     if (!(arp_flags & ATF_COM)) {
++ 	if (arp_flags & ATF_PUBL)
++-	    printf("* ");
+++	    printf("<from_interface> ");
++ 	else
++ 	    printf(_("<incomplete> "));
++     } else {
++@@ -499,12 +509,12 @@ static void arp_disp(char *name, char *i
++     if (arp_flags & ATF_PERM)
++ 	printf("PERM ");
++     if (arp_flags & ATF_PUBL)
++-	printf("PUP ");
++-#ifdef HAVE_ATF_MAGIC
+++	printf("PUB ");
+++#ifdef ATF_MAGIC
++     if (arp_flags & ATF_MAGIC)
++ 	printf("AUTO ");
++ #endif
++-#ifdef HAVE_ATF_DONTPUB
+++#ifdef ATF_DONTPUB
++     if (arp_flags & ATF_DONTPUB)
++ 	printf("DONTPUB ");
++ #endif
++@@ -519,7 +529,8 @@ static void arp_disp(char *name, char *i
++ static int arp_show(char *name)
++ {
++     char host[100];
++-    struct sockaddr sa;
+++    struct sockaddr_storage ss;
+++    struct sockaddr *sa;
++     char ip[100];
++     char hwa[100];
++     char mask[100];
++@@ -532,14 +543,15 @@ static int arp_show(char *name)
++ 
++     host[0] = '\0';
++ 
+++    sa = (struct sockaddr *)&ss;
++     if (name != NULL) {
++ 	/* Resolve the host name. */
++ 	safe_strncpy(host, name, (sizeof host));
++-	if (ap->input(0, host, &sa) < 0) {
+++	if (ap->input(0, host, sa) < 0) {
++ 	    ap->herror(host);
++ 	    return (-1);
++ 	}
++-	safe_strncpy(host, ap->sprint(&sa, 1), sizeof(host));
+++	safe_strncpy(host, ap->sprint(sa, 1), sizeof(host));
++     }
++     /* Open the PROCps kernel table. */
++     if ((fp = fopen(_PATH_PROCNET_ARP, "r")) == NULL) {
++@@ -575,10 +587,10 @@ static int arp_show(char *name)
++ 	    if (opt_n)
++ 		hostname = "?";
++ 	    else {
++-		if (ap->input(0, ip, &sa) < 0)
+++		if (ap->input(0, ip, sa) < 0)
++ 		    hostname = ip;
++ 		else
++-		    hostname = ap->sprint(&sa, opt_n | 0x8000);
+++		    hostname = ap->sprint(sa, opt_n | 0x8000);
++ 		if (strcmp(hostname, ip) == 0)
++ 		    hostname = "?";
++ 	    }
++@@ -612,11 +624,10 @@ static void version(void)
++ static void usage(void)
++ {
++     fprintf(stderr, _("Usage:\n  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP cache\n"));
++-    fprintf(stderr, _("  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP entry\n"));
++-    fprintf(stderr, _("  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from file\n"));
++-    fprintf(stderr, _("  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add entry\n"));
++-    fprintf(stderr, _("  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  <-''-\n"));
++-    fprintf(stderr, _("  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      <-''-\n\n"));
+++    fprintf(stderr, _("  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP entry\n"));
+++    fprintf(stderr, _("  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from file\n"));
+++    fprintf(stderr, _("  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add entry\n"));
+++    fprintf(stderr, _("  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          <-''-\n\n"));
++     
++     fprintf(stderr, _("        -a                       display (all) hosts in alternative (BSD) style\n"));
++     fprintf(stderr, _("        -s, --set                set a new ARP entry\n"));
+--- net-tools-1.60.orig/debian/patches/CVS-20081002-ifconfig.c_sync.patch
++++ net-tools-1.60/debian/patches/CVS-20081002-ifconfig.c_sync.patch
+@@ -0,0 +1,379 @@
++Sync with upstream CVS, complete log:
++
++Revision 1.58 - Thu Oct 2 23:31:04 2008 UTC by ecki
++Avoid segfault of ifconfig(8) on missing /proc/net/dev
++(Debian Bug #222209 Pierre Lombard, Tollef Fog Heen)
++
++Revision 1.57 - Tue Dec 10 00:56:41 2002 UTC by ecki
++- change columns of netstat -i/ifconfig -s to avoid run-into (Stefan Illner)
++- prevent segfault on protocol families without host error member
++- use /128 as default prefix if not specified instead of /0
++
++Revision 1.56 - Fri Jul 5 17:36:02 2002 UTC by ecki
++Jack Bloch noticed that the hw comamnd of ifconfig returns a
++confusing -EBUSY if interface is up (on lkml).
++
++Revision 1.55 - Wed Jul 3 23:40:47 2002 UTC by ecki
++there is no such thing as -i option for ifconfig
++removed variable, fixed usage, added options to english man page
++
++Revision 1.54 - Thu Nov 1 03:00:13 2001 UTC by ecki
++delay the setting of netmask derived from /mask after setting address
++(Debian Bug #116573 reported by Brian Warner)
++
++Revision 1.53 - Thu Nov 1 01:54:49 2001 UTC by ecki
++minor fix to return E_USAGE on -V instead of exit(0);
++
++Revision 1.52 - Thu Nov 1 01:48:31 2001 UTC by ecki
++failed to set error flag if netmask setting reported an error
++(Debian Bug #117837 reported by Sam Clegg)
++
++Revision 1.51 - Fri Jun 29 03:48:51 2001 UTC by ecki
++this will check after clearing a flag, that it is indeed cleared. it will
++also be a bit more verbose and precise on errors. See Debian Bug #102474
++
++Index: net-tools/ifconfig.c
++===================================================================
++--- net-tools.orig/ifconfig.c
+++++ net-tools/ifconfig.c
++@@ -3,7 +3,7 @@
++  *              that either displays or sets the characteristics of
++  *              one or more of the system's networking interfaces.
++  *
++- * Version:     $Id: ifconfig.c,v 1.50 2001/04/13 18:25:18 pb Exp $
+++ * Version:     $Id: ifconfig.c,v 1.58 2008/10/02 23:31:04 ecki Exp $
++  *
++  * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
++  *              and others.  Copyright 1993 MicroWalt Corporation
++@@ -88,7 +88,6 @@ struct in6_ifreq {
++ char *Release = RELEASE, *Version = "ifconfig 1.42 (2001-04-13)";
++ 
++ int opt_a = 0;			/* show all interfaces          */
++-int opt_i = 0;			/* show the statistics          */
++ int opt_v = 0;			/* debugging output flag        */
++ 
++ int addr_family = 0;		/* currently selected AF        */
++@@ -105,7 +104,7 @@ static int if_print(char *ifname)
++     int res;
++ 
++     if (ife_short)
++-	printf(_("Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
+++	printf(_("Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
++ 
++     if (!ifname) {
++ 	res = for_all_interfaces(do_if_print, &opt_a);
++@@ -113,6 +112,9 @@ static int if_print(char *ifname)
++ 	struct interface *ife;
++ 
++ 	ife = lookup_interface(ifname);
+++	if (!ife) {
+++		return -1;
+++	}
++ 	res = do_if_fetch(ife); 
++ 	if (res >= 0) 
++ 	    ife_print(ife);
++@@ -127,7 +129,7 @@ static int set_flag(char *ifname, short 
++ 
++     safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
++     if (ioctl(skfd, SIOCGIFFLAGS, &ifr) < 0) {
++-	fprintf(stderr, _("%s: unknown interface: %s\n"), 
+++	fprintf(stderr, _("%s: ERROR while getting interface flags: %s\n"), 
++ 		ifname,	strerror(errno));
++ 	return (-1);
++     }
++@@ -159,7 +161,7 @@ static int clr_flag(char *ifname, short 
++ 
++     safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
++     if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) {
++-	fprintf(stderr, _("%s: unknown interface: %s\n"), 
+++	fprintf(stderr, _("%s: ERROR while getting interface flags: %s\n"), 
++ 		ifname, strerror(errno));
++ 	return -1;
++     }
++@@ -172,9 +174,35 @@ static int clr_flag(char *ifname, short 
++     return (0);
++ }
++ 
+++/** test is a specified flag is set */
+++static int test_flag(char *ifname, short flags)
+++{
+++    struct ifreq ifr;
+++    int fd;
+++
+++    if (strchr(ifname, ':')) {
+++        /* This is a v4 alias interface.  Downing it via a socket for
+++	   another AF may have bad consequences. */
+++        fd = get_socket_for_af(AF_INET);
+++	if (fd < 0) {
+++	    fprintf(stderr, _("No support for INET on this system.\n"));
+++	    return -1;
+++	}
+++    } else
+++        fd = skfd;
+++
+++    safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
+++    if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) {
+++	fprintf(stderr, _("%s: ERROR while testing interface flags: %s\n"), 
+++		ifname, strerror(errno));
+++	return -1;
+++    }
+++    return (ifr.ifr_flags & flags);
+++}
+++
++ static void usage(void)
++ {
++-    fprintf(stderr, _("Usage:\n  ifconfig [-a] [-i] [-v] [-s] <interface> [[<AF>] <address>]\n"));
+++    fprintf(stderr, _("Usage:\n  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"));
++ #if HAVE_AFINET
++     fprintf(stderr, _("  [add <address>[/<prefixlen>]]\n"));
++     fprintf(stderr, _("  [del <address>[/<prefixlen>]]\n"));
++@@ -208,7 +236,7 @@ static void usage(void)
++ static void version(void)
++ {
++     fprintf(stderr, "%s\n%s\n", Release, Version);
++-    exit(0);
+++    exit(E_USAGE);
++ }
++ 
++ static int set_netmask(int skfd, struct ifreq *ifr, struct sockaddr *sa)
++@@ -222,18 +250,19 @@ static int set_netmask(int skfd, struct 
++ 		strerror(errno));
++ 	err = 1;
++     }
++-    return 0;
+++    return err;
++ }
++ 
++ int main(int argc, char **argv)
++ {
++     struct sockaddr sa;
+++    struct sockaddr samask;
++     struct sockaddr_in sin;
++     char host[128];
++     struct aftype *ap;
++     struct hwtype *hw;
++     struct ifreq ifr;
++-    int goterr = 0, didnetmask = 0;
+++    int goterr = 0, didnetmask = 0, neednetmask=0;
++     char **spp;
++     int fd;
++ #if HAVE_AFINET6
++@@ -388,6 +417,8 @@ int main(int argc, char **argv)
++ 	}
++ 	if (!strcmp(*spp, "-promisc")) {
++ 	    goterr |= clr_flag(ifr.ifr_name, IFF_PROMISC);
+++	    if (test_flag(ifr.ifr_name, IFF_PROMISC) > 0)
+++	    	fprintf(stderr, _("Warning: Interface %s still in promisc mode... maybe other application is running?\n"), ifr.ifr_name);
++ 	    spp++;
++ 	    continue;
++ 	}
++@@ -398,6 +429,8 @@ int main(int argc, char **argv)
++ 	}
++ 	if (!strcmp(*spp, "-multicast")) {
++ 	    goterr |= clr_flag(ifr.ifr_name, IFF_MULTICAST);
+++	    if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0)
+++	    	fprintf(stderr, _("Warning: Interface %s still in MULTICAST mode.\n"), ifr.ifr_name);
++ 	    spp++;
++ 	    continue;
++ 	}
++@@ -408,6 +441,8 @@ int main(int argc, char **argv)
++ 	}
++ 	if (!strcmp(*spp, "-allmulti")) {
++ 	    goterr |= clr_flag(ifr.ifr_name, IFF_ALLMULTI);
+++	    if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0)
+++	    	fprintf(stderr, _("Warning: Interface %s still in ALLMULTI mode.\n"), ifr.ifr_name);
++ 	    spp++;
++ 	    continue;
++ 	}
++@@ -430,6 +465,8 @@ int main(int argc, char **argv)
++ 	if (!strcmp(*spp, "-dynamic")) {
++ 	    goterr |= clr_flag(ifr.ifr_name, IFF_DYNAMIC);
++ 	    spp++;
+++	    if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0)
+++	    	fprintf(stderr, _("Warning: Interface %s still in DYNAMIC mode.\n"), ifr.ifr_name);
++ 	    continue;
++ 	}
++ #endif
++@@ -486,6 +523,8 @@ int main(int argc, char **argv)
++ 
++ 	if (!strcmp(*spp, "-broadcast")) {
++ 	    goterr |= clr_flag(ifr.ifr_name, IFF_BROADCAST);
+++	    if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0)
+++	    	fprintf(stderr, _("Warning: Interface %s still in BROADCAST mode.\n"), ifr.ifr_name);
++ 	    spp++;
++ 	    continue;
++ 	}
++@@ -493,7 +532,10 @@ int main(int argc, char **argv)
++ 	    if (*++spp != NULL) {
++ 		safe_strncpy(host, *spp, (sizeof host));
++ 		if (ap->input(0, host, &sa) < 0) {
++-		    ap->herror(host);
+++		    if (ap->herror)
+++		    	ap->herror(host);
+++		    else
+++		    	fprintf(stderr, _("ifconfig: Error resolving '%s' for broadcast\n"), host);
++ 		    goterr = 1;
++ 		    spp++;
++ 		    continue;
++@@ -515,7 +557,10 @@ int main(int argc, char **argv)
++ 		usage();
++ 	    safe_strncpy(host, *spp, (sizeof host));
++ 	    if (ap->input(0, host, &sa) < 0) {
++-		ap->herror(host);
+++		    if (ap->herror)
+++		    	ap->herror(host);
+++		    else
+++		    	fprintf(stderr, _("ifconfig: Error resolving '%s' for dstaddr\n"), host);
++ 		goterr = 1;
++ 		spp++;
++ 		continue;
++@@ -535,13 +580,16 @@ int main(int argc, char **argv)
++ 		usage();
++ 	    safe_strncpy(host, *spp, (sizeof host));
++ 	    if (ap->input(0, host, &sa) < 0) {
++-		ap->herror(host);
+++		    if (ap->herror)
+++		    	ap->herror(host);
+++		    else
+++		    	fprintf(stderr, _("ifconfig: Error resolving '%s' for netmask\n"), host);
++ 		goterr = 1;
++ 		spp++;
++ 		continue;
++ 	    }
++ 	    didnetmask++;
++-	    goterr = set_netmask(ap->fd, &ifr, &sa);
+++	    goterr |= set_netmask(ap->fd, &ifr, &sa);
++ 	    spp++;
++ 	    continue;
++ 	}
++@@ -613,6 +661,8 @@ int main(int argc, char **argv)
++ 	if (!strcmp(*spp, "-pointopoint")) {
++ 	    goterr |= clr_flag(ifr.ifr_name, IFF_POINTOPOINT);
++ 	    spp++;
+++	    if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0)
+++	    	fprintf(stderr, _("Warning: Interface %s still in POINTOPOINT mode.\n"), ifr.ifr_name);
++ 	    continue;
++ 	}
++ 	if (!strcmp(*spp, "pointopoint")) {
++@@ -620,7 +670,10 @@ int main(int argc, char **argv)
++ 		spp++;
++ 		safe_strncpy(host, *spp, (sizeof host));
++ 		if (ap->input(0, host, &sa)) {
++-		    ap->herror(host);
+++		    if (ap->herror)
+++		    	ap->herror(host);
+++		    else
+++		    	fprintf(stderr, _("ifconfig: Error resolving '%s' for pointopoint\n"), host);
++ 		    goterr = 1;
++ 		    spp++;
++ 		    continue;
++@@ -661,8 +714,12 @@ int main(int argc, char **argv)
++ 	    memcpy((char *) &ifr.ifr_hwaddr, (char *) &sa,
++ 		   sizeof(struct sockaddr));
++ 	    if (ioctl(skfd, SIOCSIFHWADDR, &ifr) < 0) {
++-		fprintf(stderr, "SIOCSIFHWADDR: %s\n",
++-			strerror(errno));
+++		if (errno == EBUSY)
+++			fprintf(stderr, "SIOCSIFHWADDR: %s - you may need to down the interface\n",
+++				strerror(errno));
+++		else
+++			fprintf(stderr, "SIOCSIFHWADDR: %s\n",
+++				strerror(errno));
++ 		goterr = 1;
++ 	    }
++ 	    spp++;
++@@ -681,12 +738,15 @@ int main(int argc, char **argv)
++ 			usage();
++ 		    *cp = 0;
++ 		} else {
++-		    prefix_len = 0;
+++		    prefix_len = 128;
++ 		}
++ 		safe_strncpy(host, *spp, (sizeof host));
++ 		if (inet6_aftype.input(1, host, 
++ 				       (struct sockaddr *) &sa6) < 0) {
++-		    inet6_aftype.herror(host);
+++		    if (inet6_aftype.herror)
+++		    	inet6_aftype.herror(host);
+++		    else
+++		    	fprintf(stderr, _("ifconfig: Error resolving '%s' for add\n"), host);
++ 		    goterr = 1;
++ 		    spp++;
++ 		    continue;
++@@ -771,7 +831,7 @@ int main(int argc, char **argv)
++ 			usage();
++ 		    *cp = 0;
++ 		} else {
++-		    prefix_len = 0;
+++		    prefix_len = 128;
++ 		}
++ 		safe_strncpy(host, *spp, (sizeof host));
++ 		if (inet6_aftype.input(1, host, 
++@@ -800,6 +860,8 @@ int main(int argc, char **argv)
++ 		}
++ 		ifr6.ifr6_ifindex = ifr.ifr_ifindex;
++ 		ifr6.ifr6_prefixlen = prefix_len;
+++		if (opt_v)
+++			fprintf(stderr, "now deleting: ioctl(SIOCDIFADDR,{ifindex=%d,prefixlen=%ld})\n",ifr.ifr_ifindex,prefix_len);
++ 		if (ioctl(fd, SIOCDIFADDR, &ifr6) < 0) {
++ 		    fprintf(stderr, "SIOCDIFADDR: %s\n",
++ 			    strerror(errno));
++@@ -859,7 +921,7 @@ int main(int argc, char **argv)
++ 		    usage();
++ 		*cp = 0;
++ 	    } else {
++-		prefix_len = 0;
+++		prefix_len = 128;
++ 	    }
++ 	    safe_strncpy(host, *spp, (sizeof host));
++ 	    if (inet6_aftype.input(1, host, (struct sockaddr *) &sa6) < 0) {
++@@ -903,7 +965,7 @@ int main(int argc, char **argv)
++ 	/* FIXME: sa is too small for INET6 addresses, inet6 should use that too, 
++ 	   broadcast is unexpected */
++ 	if (ap->getmask) {
++-	    switch (ap->getmask(host, &sa, NULL)) {
+++	    switch (ap->getmask(host, &samask, NULL)) {
++ 	    case -1:
++ 		usage();
++ 		break;
++@@ -911,8 +973,8 @@ int main(int argc, char **argv)
++ 		if (didnetmask)
++ 		    usage();
++ 
++-		goterr = set_netmask(skfd, &ifr, &sa);
++-		didnetmask++;
+++		// remeber to set the netmask from samask later
+++		neednetmask = 1;
++ 		break;
++ 	    }
++ 	}
++@@ -921,9 +983,11 @@ int main(int argc, char **argv)
++ 	   exit(1);
++ 	}
++ 	if (ap->input(0, host, &sa) < 0) {
++-	    ap->herror(host);
++-	    fprintf(stderr, _("ifconfig: `--help' gives usage information.\n"));
++-	    exit(1);
+++	    if (ap->herror)
+++	    	ap->herror(host);
+++	    else
+++	    	fprintf(stderr,_("ifconfig: error resolving '%s' to set address for af=%s\n"), host, ap->name); fprintf(stderr,
+++	    _("ifconfig: `--help' gives usage information.\n")); exit(1);
++ 	}
++ 	memcpy((char *) &ifr.ifr_addr, (char *) &sa, sizeof(struct sockaddr));
++ 	{
++@@ -980,6 +1044,14 @@ int main(int argc, char **argv)
++ 	spp++;
++     }
++ 
+++    if (neednetmask) {
+++	goterr |= set_netmask(skfd, &ifr, &samask);
+++	didnetmask++;
+++    }
+++
+++    if (opt_v && goterr)
+++    	fprintf(stderr, _("WARNING: at least one error occured. (%d)\n"), goterr);
+++
++     return (goterr);
++ }
++ 
+--- net-tools-1.60.orig/debian/patches/CVS-20060927-mii-tool.c_sync.patch
++++ net-tools-1.60/debian/patches/CVS-20060927-mii-tool.c_sync.patch
+@@ -0,0 +1,341 @@
++Sync with upstream CVS, complete log:
++
++Revision 1.9 - Wed Sep 27 20:59:18 2006 UTC by ecki
++
++GigE Support by Stephen Hemminger from
++http://developer.osdl.org/shemminger/prototypes/mii-tool.tar.bz2
++with verbose register patch from Dean Gaudet
++
++Revision 1.8 - Thu Jun 3 22:18:26 2004 UTC by ecki
++
++added linebreak to  version signature
++
++Revision 1.7 - Mon Oct 20 22:22:22 2003 UTC by ecki
++make sure version string is helpful
++
++Revision 1.6 - Mon Oct 20 22:01:13 2003 UTC by ecki
++patch to recognize more hardware without MII support (from Redhat Bug#77882,
++notified by Tilmann Bubeck).
++
++Revision 1.5 - Sat Jun 28 03:19:04 2003 UTC by ecki
++Use new style MII ioctls only. This will give you a warning, if compiled
++with old kernel source tree. It will also not work if compiled with
++new source on old kernels. The new ioctls also require root for reading, the
++old didnt. This fixes Debian bug #133648. No fallback compatibility
++is included for reasons of cleaner source.
++
++Revision 1.4 - Wed May 28 19:41:16 2003 UTC by ecki
++make it compile on stricter gcc3.3
++
++Revision 1.3 - Sun Sep 15 00:25:14 2002 UTC by ecki
++Implemented the Sean Reifenschneider suggested fflush() to the --watch
++function of mii-tool.
++
++Revision 1.2 - Fri Jun 14 01:08:20 2002 UTC by ecki
++this fixes segfault on -A "" and -F "" in mii-tool reported in debian
++bug #139027
++
++Index: net-tools/mii-tool.c
++===================================================================
++--- net-tools.orig/mii-tool.c
+++++ net-tools/mii-tool.c
++@@ -29,8 +29,7 @@
++ 	http://www.national.com/pf/DP/DP83840.html
++ */
++ 
++-static char version[] =
++-"mii-tool.c 1.9 2000/04/28 00:56:08 (David Hinds)\n";
+++static char Version[] = "$Id: mii-tool.c,v 1.9 2006/09/27 20:59:18 ecki Exp $\n(Author: David Hinds based on Donald Becker's mii-diag)";
++ 
++ #include <unistd.h>
++ #include <stdlib.h>
++@@ -46,16 +45,19 @@ static char version[] =
++ #include <sys/socket.h>
++ #include <sys/ioctl.h>
++ #include <net/if.h>
+++#include <linux/sockios.h>
+++
++ #ifndef __GLIBC__
++ #include <linux/if_arp.h>
++ #include <linux/if_ether.h>
++ #endif
++ #include "mii.h"
+++#include "version.h"
++ 
++ #define MAX_ETH		8		/* Maximum # of interfaces */
++ 
++ /* Table of known MII's */
++-static struct {
+++static const struct {
++     u_short	id1, id2;
++     char	*name;
++ } mii_id[] = {
++@@ -74,6 +76,9 @@ static struct {
++     { 0x0181, 0x4410, "Quality QS6612" },
++     { 0x0282, 0x1c50, "SMSC 83C180" },
++     { 0x0300, 0xe540, "TDK 78Q2120" },
+++    { 0x0141, 0x0c20, "Yukon 88E1011" },
+++    { 0x0141, 0x0cc0, "Yukon-EC 88E1111" },
+++    { 0x0141, 0x0c90, "Yukon-2 88E1112" },
++ };
++ #define NMII (sizeof(mii_id)/sizeof(mii_id[0]))
++ 
++@@ -137,40 +142,48 @@ static void mdio_write(int skfd, int loc
++ 
++ const struct {
++     char	*name;
++-    u_short	value;
+++    u_short	value[2];
++ } media[] = {
++     /* The order through 100baseT4 matches bits in the BMSR */
++-    { "10baseT-HD",	MII_AN_10BASET_HD },
++-    { "10baseT-FD",	MII_AN_10BASET_FD },
++-    { "100baseTx-HD",	MII_AN_100BASETX_HD },
++-    { "100baseTx-FD",	MII_AN_100BASETX_FD },
++-    { "100baseT4",	MII_AN_100BASET4 },
++-    { "100baseTx",	MII_AN_100BASETX_FD | MII_AN_100BASETX_HD },
++-    { "10baseT",	MII_AN_10BASET_FD | MII_AN_10BASET_HD },
+++    { "10baseT-HD",	{MII_AN_10BASET_HD} },
+++    { "10baseT-FD",	{MII_AN_10BASET_FD} },
+++    { "100baseTx-HD",	{MII_AN_100BASETX_HD} },
+++    { "100baseTx-FD",	{MII_AN_100BASETX_FD} },
+++    { "100baseT4",	{MII_AN_100BASET4} },
+++    { "100baseTx",	{MII_AN_100BASETX_FD | MII_AN_100BASETX_HD} },
+++    { "10baseT",	{MII_AN_10BASET_FD | MII_AN_10BASET_HD} },
+++
+++    { "1000baseT-HD",	{0, MII_BMCR2_1000HALF} },
+++    { "1000baseT-FD",	{0, MII_BMCR2_1000FULL} },
+++    { "1000baseT",	{0, MII_BMCR2_1000HALF|MII_BMCR2_1000FULL} },
++ };
++ #define NMEDIA (sizeof(media)/sizeof(media[0]))
++ 	
++ /* Parse an argument list of media types */
++-static int parse_media(char *arg)
+++static int parse_media(char *arg, unsigned *bmcr2)
++ {
++     int mask, i;
++     char *s;
++     mask = strtoul(arg, &s, 16);
++     if ((*arg != '\0') && (*s == '\0')) {
++ 	if ((mask & MII_AN_ABILITY_MASK) &&
++-	    !(mask & ~MII_AN_ABILITY_MASK))
++-	    return mask;
+++	    !(mask & ~MII_AN_ABILITY_MASK)) {
+++		*bmcr2 = 0;
+++		return mask;
+++	}
++ 	goto failed;
++-    } else {
++-	mask = 0;
++-	s = strtok(arg, ", ");
++-	do {
+++    }
+++    mask = 0;
+++    *bmcr2 = 0;
+++    s = strtok(arg, ", ");
+++    do {
++ 	    for (i = 0; i < NMEDIA; i++)
++-		if (strcasecmp(media[i].name, s) == 0) break;
+++		if (s && strcasecmp(media[i].name, s) == 0) break;
++ 	    if (i == NMEDIA) goto failed;
++-	    mask |= media[i].value;
++-	} while ((s = strtok(NULL, ", ")) != NULL);
++-    }
+++	    mask |= media[i].value[0];
+++	    *bmcr2 |= media[i].value[1];
+++    } while ((s = strtok(NULL, ", ")) != NULL);
+++
++     return mask;
++ failed:
++     fprintf(stderr, "Invalid media specification '%s'.\n", arg);
++@@ -179,11 +192,24 @@ failed:
++ 
++ /*--------------------------------------------------------------------*/
++ 
++-static char *media_list(int mask, int best)
+++static const char *media_list(unsigned mask, unsigned mask2, int best)
++ {
++     static char buf[100];
++     int i;
++     *buf = '\0';
+++
+++    if (mask & MII_BMCR_SPEED1000) {
+++	if (mask2 & MII_BMCR2_1000HALF) {
+++	    strcat(buf, " ");
+++	    strcat(buf, "1000baseT-HD");
+++	    if (best) goto out;
+++	}
+++	if (mask2 & MII_BMCR2_1000FULL) {
+++	    strcat(buf, " ");
+++	    strcat(buf, "1000baseT-FD");
+++	    if (best) goto out;
+++	}
+++    }
++     mask >>= 5;
++     for (i = 4; i >= 0; i--) {
++ 	if (mask & (1<<i)) {
++@@ -192,6 +218,7 @@ static char *media_list(int mask, int be
++ 	    if (best) break;
++ 	}
++     }
+++ out:
++     if (mask & (1<<5))
++ 	strcat(buf, " flow-control");
++     return buf;
++@@ -201,15 +228,15 @@ int show_basic_mii(int sock, int phy_id)
++ {
++     char buf[100];
++     int i, mii_val[32];
++-    int bmcr, bmsr, advert, lkpar;
+++    unsigned bmcr, bmsr, advert, lkpar, bmcr2, lpa2;
++ 
++     /* Some bits in the BMSR are latched, but we can't rely on being
++        the only reader, so only the current values are meaningful */
++     mdio_read(sock, MII_BMSR);
++-    for (i = 0; i < ((verbose > 1) ? 32 : 8); i++)
+++    for (i = 0; i < ((verbose > 1) ? 32 : MII_BASIC_MAX); i++)
++ 	mii_val[i] = mdio_read(sock, i);
++ 
++-    if (mii_val[MII_BMCR] == 0xffff) {
+++    if (mii_val[MII_BMCR] == 0xffff  || mii_val[MII_BMSR] == 0x0000) {
++ 	fprintf(stderr, "  No MII transceiver present!.\n");
++ 	return -1;
++     }
++@@ -217,6 +244,7 @@ int show_basic_mii(int sock, int phy_id)
++     /* Descriptive rename. */
++     bmcr = mii_val[MII_BMCR]; bmsr = mii_val[MII_BMSR];
++     advert = mii_val[MII_ANAR]; lkpar = mii_val[MII_ANLPAR];
+++    bmcr2 = mii_val[MII_CTRL1000]; lpa2 = mii_val[MII_STAT1000];
++ 
++     sprintf(buf, "%s: ", ifr.ifr_name);
++     if (bmcr & MII_BMCR_AN_ENA) {
++@@ -224,7 +252,7 @@ int show_basic_mii(int sock, int phy_id)
++ 	    if (advert & lkpar) {
++ 		strcat(buf, (lkpar & MII_AN_ACK) ?
++ 		       "negotiated" : "no autonegotiation,");
++-		strcat(buf, media_list(advert & lkpar, 1));
+++		strcat(buf, media_list(advert & lkpar, bmcr2 & lpa2>>2, 1));
++ 		strcat(buf, ", ");
++ 	    } else {
++ 		strcat(buf, "autonegotiation failed, ");
++@@ -234,8 +262,10 @@ int show_basic_mii(int sock, int phy_id)
++ 	}
++     } else {
++ 	sprintf(buf+strlen(buf), "%s Mbit, %s duplex, ",
++-	       (bmcr & MII_BMCR_100MBIT) ? "100" : "10",
++-	       (bmcr & MII_BMCR_DUPLEX) ? "full" : "half");
+++		((bmcr2 & (MII_BMCR2_1000HALF | MII_BMCR2_1000FULL)) & lpa2 >> 2)
+++		? "1000"
+++		: (bmcr & MII_BMCR_100MBIT) ? "100" : "10",
+++		(bmcr & MII_BMCR_DUPLEX) ? "full" : "half");
++     }
++     strcat(buf, (bmsr & MII_BMSR_LINK_VALID) ? "link ok" : "no link");
++ 
++@@ -296,12 +326,13 @@ int show_basic_mii(int sock, int phy_id)
++ 	if (bmsr & MII_BMSR_REMOTE_FAULT)
++ 	    printf("remote fault, ");
++ 	printf((bmsr & MII_BMSR_LINK_VALID) ? "link ok" : "no link");
++-	printf("\n  capabilities:%s", media_list(bmsr >> 6, 0));
++-	printf("\n  advertising: %s", media_list(advert, 0));
+++	printf("\n  capabilities:%s", media_list(bmsr >> 6, bmcr2, 0));
+++	printf("\n  advertising: %s", media_list(advert, lpa2 >> 2, 0));
++ 	if (lkpar & MII_AN_ABILITY_MASK)
++-	    printf("\n  link partner:%s", media_list(lkpar, 0));
+++	    printf("\n  link partner:%s", media_list(lkpar, bmcr2, 0));
++ 	printf("\n");
++     }
+++    fflush(stdout);
++     return 0;
++ }
++ 
++@@ -329,7 +360,7 @@ static int do_one_xcvr(int skfd, char *i
++ 	printf("resetting the transceiver...\n");
++ 	mdio_write(skfd, MII_BMCR, MII_BMCR_RESET);
++     }
++-    if (nway_advertise) {
+++    if (nway_advertise > 0) {
++ 	mdio_write(skfd, MII_ANAR, nway_advertise | 1);
++ 	opt_restart = 1;
++     }
++@@ -379,27 +410,38 @@ static void watch_one_xcvr(int skfd, cha
++ /*--------------------------------------------------------------------*/
++ 
++ const char *usage =
++-"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]
++-       -V, --version               display version information
++-       -v, --verbose               more verbose output
++-       -R, --reset                 reset MII to poweron state
++-       -r, --restart               restart autonegotiation
++-       -w, --watch                 monitor for link status changes
++-       -l, --log                   with -w, write events to syslog
++-       -A, --advertise=media,...   advertise only specified media
++-       -F, --force=media           force specified media technology
++-media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,
++-       (to advertise both HD and FD) 100baseTx, 10baseT\n";
+++"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]\n"
+++"       -V, --version               display version information\n"
+++"       -v, --verbose               more verbose output\n"
+++"       -R, --reset                 reset MII to poweron state\n"
+++"       -r, --restart               restart autonegotiation\n"
+++"       -w, --watch                 monitor for link status changes\n"
+++"       -l, --log                   with -w, write events to syslog\n"
+++"       -A, --advertise=media,...   advertise only specified media\n"
+++"       -F, --force=media           force specified media technology\n"
+++"media: 1000baseTx-HD, 1000baseTx-FD,\n"
+++"       100baseT4, 100baseTx-FD, 100baseTx-HD,\n"
+++"       10baseT-FD, 10baseT-HD,\n"
+++"       (to advertise both HD and FD) 1000baseTx, 100baseTx, 10baseT\n";
+++
+++
+++static void version(void)
+++{
+++    fprintf(stderr, "%s\n%s\n", Version, RELEASE);
+++    exit(5); /* E_VERSION */
+++}
+++
++ 
++ int main(int argc, char **argv)
++ {
++     int i, c, ret, errflag = 0;
++     char s[6];
+++    unsigned ctrl1000 = 0;
++     
++     while ((c = getopt_long(argc, argv, "A:F:p:lrRvVw?", longopts, 0)) != EOF)
++ 	switch (c) {
++-	case 'A': nway_advertise = parse_media(optarg); break;
++-	case 'F': fixed_speed = parse_media(optarg); break;
+++	case 'A': nway_advertise = parse_media(optarg, &ctrl1000); break;
+++	case 'F': fixed_speed = parse_media(optarg, &ctrl1000); break;
++ 	case 'p': override_phy = atoi(optarg); break;
++ 	case 'r': opt_restart++;	break;
++ 	case 'R': opt_reset++;		break;
++@@ -411,6 +453,10 @@ int main(int argc, char **argv)
++ 	}
++     /* Check for a few inappropriate option combinations */
++     if (opt_watch) verbose = 0;
+++
+++    if ((nway_advertise < 0) || (fixed_speed < 0))
+++    	return 2;
+++
++     if (errflag || (fixed_speed & (fixed_speed-1)) ||
++ 	(fixed_speed && (opt_restart || nway_advertise))) {
++ 	fprintf(stderr, usage, argv[0]);
++@@ -418,7 +464,7 @@ int main(int argc, char **argv)
++     }
++ 
++     if (opt_version)
++-	printf(version);
+++	version();
++ 
++     /* Open a basic socket. */
++     if ((skfd = socket(AF_INET, SOCK_DGRAM,0)) < 0) {
++@@ -426,6 +472,9 @@ int main(int argc, char **argv)
++ 	exit(-1);
++     }
++ 
+++    if (verbose > 1)
+++    	printf("Using SIOCGMIIPHY=0x%x\n", SIOCGMIIPHY);	
+++
++     /* No remaining args means show all interfaces. */
++     if (optind == argc) {
++ 	ret = 1;
+--- net-tools-1.60.orig/debian/patches/CVS-20070316-netstat.c_sync.patch
++++ net-tools-1.60/debian/patches/CVS-20070316-netstat.c_sync.patch
+@@ -0,0 +1,484 @@
++Sync with upstream's CVS until rev 1.53
++
++Revision 1.53 - Thu Mar 16 08:59:42 2006 UTC by ecki
++
++Debian Bug #260587 fixed, make sure the Columns state and user in netstat -t -e
++are separated by blanks. This may cause scripts to fail parsing by column width.
++Better wait for the script compatible output. Problems exists for ESTABLIHED
++state only.
++
++Revision 1.52 - Tue Aug 2 22:28:10 2005 UTC by ecki
++make ipx in 2.6 work (perhaps).
++Fixes http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=318503
++
++Revision 1.51 - Thu Jun 3 22:27:37 2004 UTC by ecki
++avoid namespace conflicts
++
++Revision 1.50 - Tue Dec 10 00:56:41 2002 UTC by ecki
++ - change columns of netstat -i/ifconfig -s to avoid run-into (Stefan Illner)
++ - prevent segfault on protocol families without host error member
++ - use /128 as default prefix if not specified instead of /0
++
++Revision 1.49 - Tue Jul 23 21:08:16 2002 UTC by ecki
++allow support for -6 and -4 options to netstat, also allow both, and
++print out tcp6, udp6 or raw6 if it is a v6 socket
++
++Revision 1.48 - Thu Jun 27 18:04:02 2002 UTC by ecki
++fixing debian bug #151130 reported by Dan Jacobson where netstat
++was printing 81 chars in a line for tcp, udp and raw.
++
++Revision 1.47 - Tue Feb 19 01:12:49 2002 UTC by ecki
++inodes in unix domain sockets are now padded to 8chars (netstat -x)
++
++Revision 1.46 - Tue Feb 19 00:55:35 2002 UTC by ecki
++fixes debian bug#134600 (sigsegv in netstat on negative inoded in
++/proc/net/udp) on "netstat -lpu". Thanks to Arnaud Giersch for the report.
++
++Revision 1.45 - Sun Nov 25 06:48:50 2001 UTC by ecki
++this fixes Debian Bug #109164 (netstat -ci does only print stats once). It
++also renames add_interface and free_interface list to if_cache_add/free.
++I am not sure if removing the "proc_read" flag will harm performance, looks
++likt this check is never triggereed. Anyway, we need more efficient b-search
++sooner or later.
++
++Revision 1.44 - Sun Aug 26 05:25:21 2001 UTC by ak
++Fix netstat -- don't print all v4 addresses as v4-mapped-in-v6.
++
++Index: net-tools/netstat.c
++===================================================================
++--- net-tools.orig/netstat.c
+++++ net-tools/netstat.c
++@@ -6,7 +6,7 @@
++  *              NET-3 Networking Distribution for the LINUX operating
++  *              system.
++  *
++- * Version:     $Id: netstat.c,v 1.43 2001/04/15 14:41:17 pb Exp $
+++ * Version:     $Id: netstat.c,v 1.54 2007/12/01 18:12:34 ecki Exp $
++  *
++  * Authors:     Fred Baumgarten, <dc6iq@insu1.etec.uni-karlsruhe.de>
++  *              Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
++@@ -216,7 +216,7 @@ FILE *procinfo;
++ 
++ static struct prg_node {
++     struct prg_node *next;
++-    int inode;
+++    unsigned long inode;
++     char name[PROGNAME_WIDTH];
++ } *prg_hash[PRG_HASH_SIZE];
++ 
++@@ -249,7 +249,7 @@ static char prg_cache_loaded = 0;
++ /* NOT working as of glibc-2.0.7: */
++ #undef  DIRENT_HAVE_D_TYPE_WORKS
++ 
++-static void prg_cache_add(int inode, char *name)
+++static void prg_cache_add(unsigned long inode, char *name)
++ {
++     unsigned hi = PRG_HASHIT(inode);
++     struct prg_node **pnp,*pn;
++@@ -272,7 +272,7 @@ static void prg_cache_add(int inode, cha
++     strcpy(pn->name,name);
++ }
++ 
++-static const char *prg_cache_get(int inode)
+++static const char *prg_cache_get(unsigned long inode)
++ {
++     unsigned hi=PRG_HASHIT(inode);
++     struct prg_node *pn;
++@@ -295,16 +295,18 @@ static void prg_cache_clear(void)
++     prg_cache_loaded=0;
++ }
++ 
++-static void extract_type_1_socket_inode(const char lname[], long * inode_p) {
+++static int extract_type_1_socket_inode(const char lname[], unsigned long * inode_p) {
++ 
++     /* If lname is of the form "socket:[12345]", extract the "12345"
++        as *inode_p.  Otherwise, return -1 as *inode_p.
++        */
++ 
++-    if (strlen(lname) < PRG_SOCKET_PFXl+3) *inode_p = -1;
++-    else if (memcmp(lname, PRG_SOCKET_PFX, PRG_SOCKET_PFXl)) *inode_p = -1;
++-    else if (lname[strlen(lname)-1] != ']') *inode_p = -1;
++-    else {
+++    if (strlen(lname) < PRG_SOCKET_PFXl+3) return(-1);
+++    
+++    if (memcmp(lname, PRG_SOCKET_PFX, PRG_SOCKET_PFXl)) return(-1);
+++    if (lname[strlen(lname)-1] != ']') return(-1);
+++
+++    {
++         char inode_str[strlen(lname + 1)];  /* e.g. "12345" */
++         const int inode_str_len = strlen(lname) - PRG_SOCKET_PFXl - 1;
++         char *serr;
++@@ -313,37 +315,41 @@ static void extract_type_1_socket_inode(
++         inode_str[inode_str_len] = '\0';
++         *inode_p = strtol(inode_str,&serr,0);
++         if (!serr || *serr || *inode_p < 0 || *inode_p >= INT_MAX) 
++-            *inode_p = -1;
+++            return(-1);
++     }
+++    return(0);
++ }
++ 
++ 
++ 
++-static void extract_type_2_socket_inode(const char lname[], long * inode_p) {
+++static int extract_type_2_socket_inode(const char lname[], unsigned long * inode_p) {
++ 
++     /* If lname is of the form "[0000]:12345", extract the "12345"
++        as *inode_p.  Otherwise, return -1 as *inode_p.
++        */
++ 
++-    if (strlen(lname) < PRG_SOCKET_PFX2l+1) *inode_p = -1;
++-    else if (memcmp(lname, PRG_SOCKET_PFX2, PRG_SOCKET_PFX2l)) *inode_p = -1;
++-    else {
+++    if (strlen(lname) < PRG_SOCKET_PFX2l+1) return(-1);
+++    if (memcmp(lname, PRG_SOCKET_PFX2, PRG_SOCKET_PFX2l)) return(-1);
+++
+++    {
++         char *serr;
++ 
++         *inode_p=strtol(lname + PRG_SOCKET_PFX2l,&serr,0);
++         if (!serr || *serr || *inode_p < 0 || *inode_p >= INT_MAX) 
++-            *inode_p = -1;
+++            return(-1);
++     }
+++    return(0);
++ }
++ 
++ 
++ 
+++
++ static void prg_cache_load(void)
++ {
++     char line[LINE_MAX],eacces=0;
++     int procfdlen,fd,cmdllen,lnamelen;
++     char lname[30],cmdlbuf[512],finbuf[PROGNAME_WIDTH];
++-    long inode;
+++    unsigned long inode;
++     const char *cs,*cmdlp;
++     DIR *dirproc=NULL,*dirfd=NULL;
++     struct dirent *direproc,*direfd;
++@@ -386,11 +392,9 @@ static void prg_cache_load(void)
++ 	    lnamelen=readlink(line,lname,sizeof(lname)-1);
++             lname[lnamelen] = '\0';  /*make it a null-terminated string*/
++ 
++-            extract_type_1_socket_inode(lname, &inode);
++-
++-            if (inode < 0) extract_type_2_socket_inode(lname, &inode);
++-
++-            if (inode < 0) continue;
+++            if (extract_type_1_socket_inode(lname, &inode) < 0)
+++              if (extract_type_2_socket_inode(lname, &inode) < 0)
+++                continue;
++ 
++ 	    if (!cmdlp) {
++ 		if (procfdlen - PATH_FD_SUFFl + PATH_CMDLINEl >= 
++@@ -527,10 +531,10 @@ static void finish_this_one(int uid, uns
++ 
++     if (flag_exp > 1) {
++ 	if (!(flag_not & FLAG_NUM_USER) && ((pw = getpwuid(uid)) != NULL))
++-	    printf("%-10s ", pw->pw_name);
+++	    printf(" %-10s ", pw->pw_name);
++ 	else
++-	    printf("%-10d ", uid);
++-	printf("%-10ld ",inode);
+++	    printf(" %-10d ", uid);
+++	printf("%-10lu ",inode);
++     }
++     if (flag_prg)
++ 	printf("%-" PROGNAME_WIDTHs "s",prg_cache_get(inode));
++@@ -705,6 +709,7 @@ static void tcp_do_one(int lnr, const ch
++     unsigned long rxq, txq, time_len, retr, inode;
++     int num, local_port, rem_port, d, state, uid, timer_run, timeout;
++     char rem_addr[128], local_addr[128], timers[64], buffer[1024], more[512];
+++    char *protname;
++     struct aftype *ap;
++ #if HAVE_AFINET6
++     struct sockaddr_in6 localaddr, remaddr;
++@@ -719,12 +724,13 @@ static void tcp_do_one(int lnr, const ch
++ 	return;
++ 
++     num = sscanf(line,
++-    "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %ld %512s\n",
+++    "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %512s\n",
++ 		 &d, local_addr, &local_port, rem_addr, &rem_port, &state,
++ 		 &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more);
++ 
++     if (strlen(local_addr) > 8) {
++ #if HAVE_AFINET6
+++	protname = "tcp6";
++ 	/* Demangle what the kernel gives us */
++ 	sscanf(local_addr, "%08X%08X%08X%08X",
++ 	       &in6.s6_addr32[0], &in6.s6_addr32[1],
++@@ -740,6 +746,7 @@ static void tcp_do_one(int lnr, const ch
++ 	remaddr.sin6_family = AF_INET6;
++ #endif
++     } else {
+++	protname = "tcp";
++ 	sscanf(local_addr, "%X",
++ 	       &((struct sockaddr_in *) &localaddr)->sin_addr.s_addr);
++ 	sscanf(rem_addr, "%X",
++@@ -813,8 +820,8 @@ static void tcp_do_one(int lnr, const ch
++ 			 timer_run, (double) time_len / HZ, retr, timeout);
++ 		break;
++ 	    }
++-	printf("tcp   %6ld %6ld %-23s %-23s %-12s",
++-	       rxq, txq, local_addr, rem_addr, _(tcp_state[state]));
+++	printf("%-4s  %6ld %6ld %-*s %-*s %-11s",
+++	       protname, rxq, txq, netmax(23,strlen(local_addr)), local_addr, netmax(23,strlen(rem_addr)), rem_addr, _(tcp_state[state]));
++ 
++ 	finish_this_one(uid,inode,timers);
++     }
++@@ -831,6 +838,7 @@ static void udp_do_one(int lnr, const ch
++     char buffer[8192], local_addr[64], rem_addr[64];
++     char *udp_state, timers[64], more[512];
++     int num, local_port, rem_port, d, state, timer_run, uid, timeout;
+++    char *protname;
++ #if HAVE_AFINET6
++     struct sockaddr_in6 localaddr, remaddr;
++     char addr6[INET6_ADDRSTRLEN];
++@@ -847,13 +855,14 @@ static void udp_do_one(int lnr, const ch
++ 
++     more[0] = '\0';
++     num = sscanf(line,
++-		 "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %ld %512s\n",
+++		 "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %512s\n",
++ 		 &d, local_addr, &local_port,
++ 		 rem_addr, &rem_port, &state,
++ 	  &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more);
++ 
++     if (strlen(local_addr) > 8) {
++ #if HAVE_AFINET6
+++	protname="udp6";
++ 	sscanf(local_addr, "%08X%08X%08X%08X",
++ 	       &in6.s6_addr32[0], &in6.s6_addr32[1],
++ 	       &in6.s6_addr32[2], &in6.s6_addr32[3]);
++@@ -868,6 +877,7 @@ static void udp_do_one(int lnr, const ch
++ 	remaddr.sin6_family = AF_INET6;
++ #endif
++     } else {
+++        protname="udp";
++ 	sscanf(local_addr, "%X",
++ 	       &((struct sockaddr_in *) &localaddr)->sin_addr.s_addr);
++ 	sscanf(rem_addr, "%X",
++@@ -953,8 +963,8 @@ static void udp_do_one(int lnr, const ch
++ 			 retr, timeout);
++ 		break;
++ 	    }
++-	printf("udp   %6ld %6ld %-23s %-23s %-12s",
++-	       rxq, txq, local_addr, rem_addr, udp_state);
+++	printf("%-4s  %6ld %6ld %-23s %-23s %-11s",
+++	       protname, rxq, txq, local_addr, rem_addr, udp_state);
++ 
++ 	finish_this_one(uid,inode,timers);
++     }
++@@ -971,6 +981,7 @@ static void raw_do_one(int lnr, const ch
++     char buffer[8192], local_addr[64], rem_addr[64];
++     char timers[64], more[512];
++     int num, local_port, rem_port, d, state, timer_run, uid, timeout;
+++    char *protname;
++ #if HAVE_AFINET6
++     struct sockaddr_in6 localaddr, remaddr;
++     char addr6[INET6_ADDRSTRLEN];
++@@ -987,12 +998,13 @@ static void raw_do_one(int lnr, const ch
++ 
++     more[0] = '\0';
++     num = sscanf(line,
++-		 "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %ld %512s\n",
+++		 "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %512s\n",
++ 		 &d, local_addr, &local_port, rem_addr, &rem_port, &state,
++ 	  &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more);
++ 
++     if (strlen(local_addr) > 8) {
++ #if HAVE_AFINET6
+++	protname = "raw6";
++ 	sscanf(local_addr, "%08X%08X%08X%08X",
++ 	       &in6.s6_addr32[0], &in6.s6_addr32[1],
++            &in6.s6_addr32[2], &in6.s6_addr32[3]);
++@@ -1007,6 +1019,7 @@ static void raw_do_one(int lnr, const ch
++ 	remaddr.sin6_family = AF_INET6;
++ #endif
++     } else {
+++        protname = "raw";
++ 	sscanf(local_addr, "%X",
++ 	       &((struct sockaddr_in *) &localaddr)->sin_addr.s_addr);
++ 	sscanf(rem_addr, "%X",
++@@ -1074,8 +1087,8 @@ static void raw_do_one(int lnr, const ch
++ 			 retr, timeout);
++ 		break;
++ 	    }
++-	printf("raw   %6ld %6ld %-23s %-23s %-12d",
++-	       rxq, txq, local_addr, rem_addr, state);
+++	printf("%-4s  %6ld %6ld %-23s %-23s %-11d",
+++	       protname, rxq, txq, local_addr, rem_addr, state);
++ 
++ 	finish_this_one(uid,inode,timers);
++     }
++@@ -1099,9 +1112,9 @@ static void unix_do_one(int nr, const ch
++     static int has = 0;
++     char path[MAXPATHLEN], ss_flags[32];
++     char *ss_proto, *ss_state, *ss_type;
++-    int num, state, type, inode;
+++    int num, state, type;
++     void *d;
++-    unsigned long refcnt, proto, flags;
+++    unsigned long refcnt, proto, flags, inode;
++ 
++     if (nr == 0) {
++ 	if (strstr(line, "Inode"))
++@@ -1109,14 +1122,14 @@ static void unix_do_one(int nr, const ch
++ 	return;
++     }
++     path[0] = '\0';
++-    num = sscanf(line, "%p: %lX %lX %lX %X %X %d %s",
+++    num = sscanf(line, "%p: %lX %lX %lX %X %X %lu %s",
++ 		 &d, &refcnt, &proto, &flags, &type, &state, &inode, path);
++     if (num < 6) {
++ 	fprintf(stderr, _("warning, got bogus unix line.\n"));
++ 	return;
++     }
++     if (!(has & HAS_INODE))
++-	snprintf(path,sizeof(path),"%d",inode);
+++	snprintf(path,sizeof(path),"%lu",inode);
++ 
++     if (!flag_all) {
++     	if ((state == SS_UNCONNECTED) && (flags & SO_ACCEPTCON)) {
++@@ -1208,9 +1221,9 @@ static void unix_do_one(int nr, const ch
++     printf("%-5s %-6ld %-11s %-10s %-13s ",
++ 	   ss_proto, refcnt, ss_flags, ss_type, ss_state);
++     if (has & HAS_INODE)
++-	printf("%-6d ",inode);
+++	printf("%-8lu ",inode);
++     else
++-	printf("-      ");
+++	printf("-        ");
++     if (flag_prg)
++ 	printf("%-" PROGNAME_WIDTHs "s",(has & HAS_INODE?prg_cache_get(inode):"-"));
++     puts(path);
++@@ -1350,18 +1363,37 @@ static int ipx_info(void)
++     char sad[50], dad[50];
++     struct sockaddr sa;
++     unsigned sport = 0, dport = 0;
++-
++-    if (!(f = fopen(_PATH_PROCNET_IPX, "r"))) {
++-	if (errno != ENOENT) {
++-	    perror(_PATH_PROCNET_IPX);
++-	    return (-1);
++-	}
++-	if (flag_arg || flag_ver)
++-	    ESYSNOT("netstat", "AF IPX");
++-	if (flag_arg)
++-	    return (1);
++-	else
++-	    return (0);
+++    struct stat s;
+++    
+++    f = fopen(_PATH_PROCNET_IPX_SOCKET1, "r");
+++    if (!f) {
+++        if (errno != ENOENT) {
+++            perror(_PATH_PROCNET_IPX_SOCKET1);
+++            return (-1);
+++        }
+++        f = fopen(_PATH_PROCNET_IPX_SOCKET2, "r");
+++
+++        /* We need to check for directory */
+++        if (f) {
+++            fstat(fileno(f), &s);
+++            if (!S_ISREG(s.st_mode)) {
+++                fclose(f);
+++                f=NULL;
+++            }
+++        }
+++
+++        if (!f) {
+++            if (errno != ENOENT) {
+++	        perror(_PATH_PROCNET_IPX_SOCKET2);
+++	        return (-1);
+++	    }
+++	    if (flag_arg || flag_ver)
+++	        ESYSNOT("netstat", "AF IPX");
+++	    if (flag_arg)
+++	        return (1);
+++ 	    else
+++	        return (0);
+++        }
++     }
++     printf(_("Active IPX sockets\nProto Recv-Q Send-Q Local Address              Foreign Address            State"));	/* xxx */
++     if (flag_exp > 1)
++@@ -1381,7 +1413,7 @@ static int ipx_info(void)
++ 	    sscanf(st, "%X", &sport);	/* net byt order */
++ 	    sport = ntohs(sport);
++ 	} else {
++-	    EINTERN("netstat.c", _PATH_PROCNET_IPX " sport format error");
+++	    EINTERN("netstat.c", "ipx socket format error in source port");
++ 	    return (-1);
++ 	}
++ 	nc = 0;
++@@ -1391,7 +1423,7 @@ static int ipx_info(void)
++ 		sscanf(st, "%X", &dport);	/* net byt order */
++ 		dport = ntohs(dport);
++ 	    } else {
++-		EINTERN("netstat.c", _PATH_PROCNET_IPX " dport format error");
+++		EINTERN("netstat.c", "ipx soket format error in destination port");
++ 		return (-1);
++ 	    }
++ 	} else
++@@ -1449,7 +1481,7 @@ static int iface_info(void)
++     }
++     if (flag_exp < 2) {
++ 	ife_short = 1;
++-	printf(_("Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
+++	printf(_("Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
++     }
++ 
++     if (for_all_interfaces(do_if_print, &flag_all) < 0) {
++@@ -1457,7 +1489,7 @@ static int iface_info(void)
++ 	exit(1);
++     }
++     if (flag_cnt)
++-	free_interface_list();
+++	if_cache_free();
++     else {
++ 	close(skfd);
++ 	skfd = -1;
++@@ -1503,7 +1535,7 @@ static void usage(void)
++     fprintf(stderr, _("        -C, --cache              display routing cache instead of FIB\n\n"));
++ 
++     fprintf(stderr, _("  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --netrom\n"));
++-    fprintf(stderr, _("  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"), DFLT_AF);
+++    fprintf(stderr, _("  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"), DFLT_AF);
++     fprintf(stderr, _("  List of possible address families (which support routing):\n"));
++     print_aflist(1); /* 1 = routeable */
++     exit(E_USAGE);
++@@ -1514,7 +1546,7 @@ int main
++  (int argc, char *argv[]) {
++     int i;
++     int lop;
++-    struct option longopts[] =
+++    static struct option longopts[] =
++     {
++ 	AFTRANS_OPTS,
++ 	{"version", 0, 0, 'V'},
++@@ -1556,7 +1588,7 @@ int main
++     getroute_init();		/* Set up AF routing support */
++ 
++     afname[0] = '\0';
++-    while ((i = getopt_long(argc, argv, "MCFA:acdegphinNorstuVv?wxl", longopts, &lop)) != EOF)
+++    while ((i = getopt_long(argc, argv, "MCFA:acdegphinNorstuVv?wxl64", longopts, &lop)) != EOF)
++ 	switch (i) {
++ 	case -1:
++ 	    break;
++@@ -1624,6 +1656,14 @@ int main
++ 	case 'o':
++ 	    flag_opt++;
++ 	    break;
+++	case '6':
+++	    if (aftrans_opt("inet6"))
+++		exit(1);
+++	    break;
+++	case '4':
+++	    if (aftrans_opt("inet"))
+++		exit(1);
+++	    break;
++ 	case 'V':
++ 	    version();
++ 	    /*NOTREACHED */
+--- net-tools-1.60.orig/debian/patches/netstat.c-local_changes.patch
++++ net-tools-1.60/debian/patches/netstat.c-local_changes.patch
+@@ -0,0 +1,61 @@
++Undocumented patches found in diff.gz.
++
++Index: net-tools/netstat.c
++===================================================================
++--- net-tools.orig/netstat.c
+++++ net-tools/netstat.c
++@@ -387,6 +387,10 @@ static void prg_cache_load(void)
++ #ifdef DIRENT_HAVE_D_TYPE_WORKS
++ 	    if (direfd->d_type!=DT_LNK) 
++ 		continue;
+++#else
+++	    /* Skip . and .. */
+++	    if (!isdigit(direfd->d_name[0]))
+++		continue;
++ #endif
++ 	    if (procfdlen+1+strlen(direfd->d_name)+1>sizeof(line)) 
++ 		continue;
++@@ -541,9 +545,9 @@ static void finish_this_one(int uid, uns
++ 	printf("%-10lu ",inode);
++     }
++     if (flag_prg)
++-	printf("%-" PROGNAME_WIDTHs "s",prg_cache_get(inode));
+++	printf(" %-16s",prg_cache_get(inode));
++     if (flag_opt)
++-	printf("%s", timers);
+++	printf(" %s", timers);
++     putchar('\n');
++ }
++ 
++@@ -1250,7 +1254,7 @@ static int unix_info(void)
++ 	printf(_("(w/o servers)"));
++     }
++ 
++-    printf(_("\nProto RefCnt Flags       Type       State         I-Node"));
+++    printf(_("\nProto RefCnt Flags       Type       State         I-Node  "));
++     print_progname_banner();
++     printf(_(" Path\n"));	/* xxx */
++ 
++@@ -1813,10 +1817,11 @@ int main
++ 	    }
++ 	    printf(_("\nProto Recv-Q Send-Q Local Address           Foreign Address         State      "));	/* xxx */
++ 	    if (flag_exp > 1)
++-		printf(_(" User       Inode     "));
++-	    print_progname_banner();
+++		printf(_(" User       Inode      "));
+++            if (flag_prg)
+++                printf(_(" PID/Program name"));
++ 	    if (flag_opt)
++-		printf(_(" Timer"));	/* xxx */
+++		printf(_(" Timer"));
++ 	    printf("\n");
++ #else
++ 	    if (flag_arg) {
++@@ -1917,6 +1922,7 @@ int main
++ 	    }
++ #endif
++ 	}
+++	            
++ 	if (!flag_cnt || i)
++ 	    break;
++ 	sleep(1);
+--- net-tools-1.60.orig/debian/patches/CVS-20061011-ipmaddr.c_buffer_overflow.patch
++++ net-tools-1.60/debian/patches/CVS-20061011-ipmaddr.c_buffer_overflow.patch
+@@ -0,0 +1,36 @@
++Patch by Jochen Voss, already applied in upstream CVS. (Bug #392263)
++Index: net-tools/ipmaddr.c
++===================================================================
++--- net-tools.orig/ipmaddr.c
+++++ net-tools/ipmaddr.c
++@@ -291,13 +291,15 @@ static void print_mlist(FILE *fp, struct
++ static int multiaddr_list(int argc, char **argv)
++ {
++ 	struct ma_info *list = NULL;
+++	size_t l;
++ 
++ 	while (argc > 0) {
++ 		if (strcmp(*argv, "dev") == 0) {
++ 			NEXT_ARG();
++-			if (filter_dev[0])
+++			l = strlen(*argv);
+++			if (l <= 0 || l >= sizeof(filter_dev))
++ 				usage();
++-			strcpy(filter_dev, *argv);
+++			strncpy(filter_dev, *argv, sizeof (filter_dev));
++ 		} else if (strcmp(*argv, "all") == 0) {
++ 			filter_family = AF_UNSPEC;
++ 		} else if (strcmp(*argv, "ipv4") == 0) {
++@@ -307,9 +309,10 @@ static int multiaddr_list(int argc, char
++ 		} else if (strcmp(*argv, "link") == 0) {
++ 			filter_family = AF_PACKET;
++ 		} else {
++-			if (filter_dev[0])
+++			l = strlen(*argv);
+++			if (l <= 0 || l >= sizeof(filter_dev))
++ 				usage();
++-			strcpy(filter_dev, *argv);
+++			strncpy(filter_dev, *argv, sizeof (filter_dev));
++ 		}
++ 		argv++; argc--;
++ 	}
+--- net-tools-1.60.orig/debian/patches/series
++++ net-tools-1.60/debian/patches/series
+@@ -0,0 +1,22 @@
++CVS-20020730-route.c_opts_64.patch
++CVS-20030911-nameif.c_sync.patch
++CVS-20031011-hostname.c_sync.patch
++CVS-20051204-arp.c_sync.patch
++CVS-20051204-slttach.c_sync.patch
++CVS-20060927-mii-tool.c_sync.patch
++CVS-20061011-includes_sync.patch
++CVS-20061011-ipmaddr.c_buffer_overflow.patch
++CVS-20070316-netstat.c_sync.patch
++CVS-20071202-rarp.c_sync.patch
++CVS-20081002-ifconfig.c_sync.patch
++CVS-20081003-statistics.c_sync.patch
++CVS-lib_sync.patch
++CVS-20081003-config.in_sync.patch
++CVS-20081002-manpages_sync.patch
++netstat.c-assorted_changes.patch
++Bug#254243-netstat.c-wide-opt.patch
++netstat.c-local_changes.patch
++translations.patch
++lib_local_changes.patch
++local-manpages.patch
++Bug#345331-socket_overflow.patch
+--- net-tools-1.60.orig/debian/patches/Bug#345331-socket_overflow.patch
++++ net-tools-1.60/debian/patches/Bug#345331-socket_overflow.patch
+@@ -0,0 +1,28 @@
++Patch by Antonio Galea <ant9000@netwise.it> to solve the socket number overflow
++from #345331
++
++diff -urNad net-tools-1.60/netstat.c /tmp/dpep.15Gej9/net-tools-1.60/netstat.c
++--- net-tools-1.60/netstat.c	2005-12-30 16:52:15.000000000 +0100
+++++ /tmp/dpep.15Gej9/net-tools-1.60/netstat.c	2005-12-30 16:56:00.000000000 +0100
++@@ -313,8 +313,8 @@
++ 
++         strncpy(inode_str, lname+PRG_SOCKET_PFXl, inode_str_len);
++         inode_str[inode_str_len] = '\0';
++-        *inode_p = strtol(inode_str,&serr,0);
++-        if (!serr || *serr || *inode_p < 0 || *inode_p >= INT_MAX) 
+++        *inode_p = strtoul(inode_str,&serr,0);
+++        if (!serr || *serr)
++             return(-1);
++     }
++     return(0);
++@@ -334,8 +334,8 @@
++     {
++         char *serr;
++ 
++-        *inode_p=strtol(lname + PRG_SOCKET_PFX2l,&serr,0);
++-        if (!serr || *serr || *inode_p < 0 || *inode_p >= INT_MAX) 
+++        *inode_p=strtoul(lname + PRG_SOCKET_PFX2l,&serr,0);
+++        if (!serr || *serr)
++             return(-1);
++     }
++     return(0);
+--- net-tools-1.60.orig/debian/patches/lib_local_changes.patch
++++ net-tools-1.60/debian/patches/lib_local_changes.patch
+@@ -0,0 +1,410 @@
++Changes extracted from diff.gz, not present in upstream's CVS.
++
++Index: net-tools/lib/ec_hw.c
++===================================================================
++--- net-tools.orig/lib/ec_hw.c
+++++ net-tools/lib/ec_hw.c
++@@ -16,6 +16,8 @@
++ 
++ #if HAVE_HWEC
++ 
+++#include <stddef.h>
+++
++ #include <net/if_arp.h>
++ #include "net-support.h"
++ 
++Index: net-tools/lib/fddi.c
++===================================================================
++--- net-tools.orig/lib/fddi.c
+++++ net-tools/lib/fddi.c
++@@ -26,6 +26,7 @@
++ #error "No FDDI Support in your current Kernelsource Tree."
++ #error "Disable HW Type FDDI"
++ #endif
+++#include <linux/types.h>
++ #if __GLIBC__ >= 2
++ #include <netinet/if_fddi.h>
++ #else
++Index: net-tools/lib/interface.c
++===================================================================
++--- net-tools.orig/lib/interface.c
+++++ net-tools/lib/interface.c
++@@ -594,7 +594,7 @@ int do_if_print(struct interface *ife, v
++ 
++ void ife_print_short(struct interface *ptr)
++ {
++-    printf("%-5.5s ", ptr->name);
+++    printf("%-9s ", ptr->name);
++     printf("%5d %-2d ", ptr->mtu, ptr->metric);
++     /* If needed, display the interface statistics. */
++     if (ptr->statistics_valid) {
++@@ -653,8 +653,7 @@ void ife_print_long(struct interface *pt
++     unsigned long long rx, tx, short_rx, short_tx;
++     const char *Rext = "B";
++     const char *Text = "B";
++-    static char flags[200];
++-    
+++
++ #if HAVE_AFIPX
++     static struct aftype *ipxtype = NULL;
++ #endif
++@@ -686,70 +685,32 @@ void ife_print_long(struct interface *pt
++     if (hw == NULL)
++ 	hw = get_hwntype(-1);
++ 
++-    sprintf(flags, "flags=%d<", ptr->flags);
++-    /* DONT FORGET TO ADD THE FLAGS IN ife_print_short, too */
++-    if (ptr->flags == 0)
++-	strcat(flags,">");
++-    if (ptr->flags & IFF_UP)
++-	strcat(flags,_("UP,"));
++-    if (ptr->flags & IFF_BROADCAST)
++-	strcat(flags,_("BROADCAST,"));
++-    if (ptr->flags & IFF_DEBUG)
++-	strcat(flags,_("DEBUG,"));
++-    if (ptr->flags & IFF_LOOPBACK)
++-	strcat(flags,_("LOOPBACK,"));
++-    if (ptr->flags & IFF_POINTOPOINT)
++-	strcat(flags,_("POINTOPOINT,"));
++-    if (ptr->flags & IFF_NOTRAILERS)
++-	strcat(flags,_("NOTRAILERS,"));
++-    if (ptr->flags & IFF_RUNNING)
++-	strcat(flags,_("RUNNING,"));
++-    if (ptr->flags & IFF_NOARP)
++-	strcat(flags,_("NOARP,"));
++-    if (ptr->flags & IFF_PROMISC)
++-	strcat(flags,_("PROMISC,"));
++-    if (ptr->flags & IFF_ALLMULTI)
++-	strcat(flags,_("ALLMULTI,"));
++-    if (ptr->flags & IFF_SLAVE)
++-	strcat(flags,_("SLAVE,"));
++-    if (ptr->flags & IFF_MASTER)
++-	strcat(flags,_("MASTER,"));
++-    if (ptr->flags & IFF_MULTICAST)
++-	strcat(flags,_("MULTICAST,"));
++-#ifdef HAVE_DYNAMIC
++-    if (ptr->flags & IFF_DYNAMIC)
++-	strcat(flags,_("DYNAMIC,"));
++-#endif
++-    /* DONT FORGET TO ADD THE FLAGS IN ife_print_short */
++-    if (flags[strlen(flags)-1] == ',')
++-      flags[strlen(flags)-1] = '>';
++-    else
++-      flags[strlen(flags)-1] = 0;
++-      
++-
++-    printf(_("%s: %s  mtu %d  metric %d"),
++-	   ptr->name, flags, ptr->mtu, ptr->metric ? ptr->metric : 1);
++-#ifdef SIOCSKEEPALIVE
++-    if (ptr->outfill || ptr->keepalive)
++-	printf(_("  outfill %d  keepalive %d"),
++-	       ptr->outfill, ptr->keepalive);
+++    printf(_("%-9s Link encap:%s  "), ptr->name, hw->title);
+++    /* For some hardware types (eg Ash, ATM) we don't print the 
+++       hardware address if it's null.  */
+++    if (hw->print != NULL && (! (hw_null_address(hw, ptr->hwaddr) &&
+++				  hw->suppress_null_addr)))
+++	printf(_("HWaddr %s  "), hw->print(ptr->hwaddr));
+++#ifdef IFF_PORTSEL
+++    if (ptr->flags & IFF_PORTSEL) {
+++	printf(_("Media:%s"), if_port_text[ptr->map.port][0]);
+++	if (ptr->flags & IFF_AUTOMEDIA)
+++	    printf(_("(auto)"));
+++    }
++ #endif
++     printf("\n");
++ 
++-
++-
++ #if HAVE_AFINET
++     if (ptr->has_ip) {
++-	printf(_("        %s %s"), ap->name,
+++	printf(_("          %s addr:%s "), ap->name,
++ 	       ap->sprint(&ptr->addr, 1));
++-	printf(_("  netmask %s"), ap->sprint(&ptr->netmask, 1));
++-	if (ptr->flags & IFF_BROADCAST) {
++-	    printf(_("  broadcast %s"), ap->sprint(&ptr->broadaddr, 1));
++-	}
++ 	if (ptr->flags & IFF_POINTOPOINT) {
++-	    printf(_("  destination %s"), ap->sprint(&ptr->dstaddr, 1));
+++	    printf(_(" P-t-P:%s "), ap->sprint(&ptr->dstaddr, 1));
++ 	}
++-	printf("\n");
+++	if (ptr->flags & IFF_BROADCAST) {
+++	    printf(_(" Bcast:%s "), ap->sprint(&ptr->broadaddr, 1));
+++	}
+++	printf(_(" Mask:%s\n"), ap->sprint(&ptr->netmask, 1));
++     }
++ #endif
++ 
++@@ -757,7 +718,7 @@ void ife_print_long(struct interface *pt
++     /* FIXME: should be integrated into interface.c.   */
++ 
++     if ((f = fopen(_PATH_PROCNET_IFINET6, "r")) != NULL) {
++-	while (fscanf(f, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %02x %02x %02x %20s\n",
+++	while (fscanf(f, "%4s%4s%4s%4s%4s%4s%4s%4s %08x %02x %02x %02x %20s\n",
++ 		      addr6p[0], addr6p[1], addr6p[2], addr6p[3],
++ 		      addr6p[4], addr6p[5], addr6p[6], addr6p[7],
++ 		  &if_idx, &plen, &scope, &dad_status, devname) != EOF) {
++@@ -766,30 +727,29 @@ void ife_print_long(struct interface *pt
++ 			addr6p[0], addr6p[1], addr6p[2], addr6p[3],
++ 			addr6p[4], addr6p[5], addr6p[6], addr6p[7]);
++ 		inet6_aftype.input(1, addr6, (struct sockaddr *) &sap);
++-		printf(_("        %s %s  prefixlen %d"),
++-			inet6_aftype.name, 
++-			inet6_aftype.sprint((struct sockaddr *) &sap, 1), 
++-			plen);
++-		printf(_("  scopeid 0x%x"), scope);
++-
++-		flags[0] = '<'; flags[1] = 0;
++-		if (scope & IPV6_ADDR_COMPATv4) {
++-		    	strcat(flags, _("compat,"));
++-		    	scope -= IPV6_ADDR_COMPATv4;
+++		printf(_("          inet6 addr: %s/%d"),
+++		 inet6_aftype.sprint((struct sockaddr *) &sap, 1), plen);
+++		printf(_(" Scope:"));
+++		switch (scope) {
+++		case 0:
+++		    printf(_("Global"));
+++		    break;
+++		case IPV6_ADDR_LINKLOCAL:
+++		    printf(_("Link"));
+++		    break;
+++		case IPV6_ADDR_SITELOCAL:
+++		    printf(_("Site"));
+++		    break;
+++		case IPV6_ADDR_COMPATv4:
+++		    printf(_("Compat"));
+++		    break;
+++		case IPV6_ADDR_LOOPBACK:
+++		    printf(_("Host"));
+++		    break;
+++		default:
+++		    printf(_("Unknown"));
++ 		}
++-		if (scope == 0)
++-			strcat(flags, _("global,"));
++-		if (scope & IPV6_ADDR_LINKLOCAL)
++-			strcat(flags, _("link,"));
++-		if (scope & IPV6_ADDR_SITELOCAL)
++-			strcat(flags, _("site,"));
++-		if (scope & IPV6_ADDR_LOOPBACK)
++-			strcat(flags, _("host,"));
++-		if (flags[strlen(flags)-1] == ',')
++-			flags[strlen(flags)-1] = '>';
++-		else
++-			flags[strlen(flags)-1] = 0;
++-		printf("%s\n", flags);
+++		printf("\n");
++ 	    }
++ 	}
++ 	fclose(f);
++@@ -802,17 +762,17 @@ void ife_print_long(struct interface *pt
++ 
++     if (ipxtype != NULL) {
++ 	if (ptr->has_ipx_bb)
++-	    printf(_("        %s Ethernet-II   %s\n"),
++-		   ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_bb, 1));
+++	    printf(_("          IPX/Ethernet II addr:%s\n"),
+++		   ipxtype->sprint(&ptr->ipxaddr_bb, 1));
++ 	if (ptr->has_ipx_sn)
++-	    printf(_("        %s Ethernet-SNAP %s\n"),
++-		   ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_sn, 1));
+++	    printf(_("          IPX/Ethernet SNAP addr:%s\n"),
+++		   ipxtype->sprint(&ptr->ipxaddr_sn, 1));
++ 	if (ptr->has_ipx_e2)
++-	    printf(_("        %s Ethernet802.2 %s\n"),
++-		   ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_e2, 1));
+++	    printf(_("          IPX/Ethernet 802.2 addr:%s\n"),
+++		   ipxtype->sprint(&ptr->ipxaddr_e2, 1));
++ 	if (ptr->has_ipx_e3)
++-	    printf(_("        %s Ethernet802.3 %s\n"),
++-		   ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_e3, 1));
+++	    printf(_("          IPX/Ethernet 802.3 addr:%s\n"),
+++		   ipxtype->sprint(&ptr->ipxaddr_e3, 1));
++     }
++ #endif
++ 
++@@ -821,7 +781,7 @@ void ife_print_long(struct interface *pt
++ 	ddptype = get_afntype(AF_APPLETALK);
++     if (ddptype != NULL) {
++ 	if (ptr->has_ddp)
++-	    printf(_("        %s %s\n"), ddptype->name, ddptype->sprint(&ptr->ddpaddr, 1));
+++	    printf(_("          EtherTalk Phase 2 addr:%s\n"), ddptype->sprint(&ptr->ddpaddr, 1));
++     }
++ #endif
++ 
++@@ -830,30 +790,53 @@ void ife_print_long(struct interface *pt
++ 	ectype = get_afntype(AF_ECONET);
++     if (ectype != NULL) {
++ 	if (ptr->has_econet)
++-	    printf(_("        %s %s\n"), ectype->name, ectype->sprint(&ptr->ecaddr, 1));
+++	    printf(_("          econet addr:%s\n"), ectype->sprint(&ptr->ecaddr, 1));
++     }
++ #endif
++ 
++-    /* For some hardware types (eg Ash, ATM) we don't print the 
++-       hardware address if it's null.  */
++-    if (hw->print != NULL && (! (hw_null_address(hw, ptr->hwaddr) &&
++-				  hw->suppress_null_addr)))
++-	printf(_("        %s %s"), hw->name, hw->print(ptr->hwaddr));
++-    else
++-	printf(_("        %s"), hw->name);
++-    if (ptr->tx_queue_len != -1)
++-    	printf(_("  txqueuelen %d"), ptr->tx_queue_len);
++-    printf("  (%s)\n", hw->title);
++-
++-#ifdef IFF_PORTSEL
++-    if (ptr->flags & IFF_PORTSEL) {
++-	printf(_("        media %s"), if_port_text[ptr->map.port][0]);
++-	if (ptr->flags & IFF_AUTOMEDIA)
++-	    printf(_("autoselect"));
++-    	printf("\n");
++-    }
+++    printf("          ");
+++    /* DONT FORGET TO ADD THE FLAGS IN ife_print_short, too */
+++    if (ptr->flags == 0)
+++	printf(_("[NO FLAGS] "));
+++    if (ptr->flags & IFF_UP)
+++	printf(_("UP "));
+++    if (ptr->flags & IFF_BROADCAST)
+++	printf(_("BROADCAST "));
+++    if (ptr->flags & IFF_DEBUG)
+++	printf(_("DEBUG "));
+++    if (ptr->flags & IFF_LOOPBACK)
+++	printf(_("LOOPBACK "));
+++    if (ptr->flags & IFF_POINTOPOINT)
+++	printf(_("POINTOPOINT "));
+++    if (ptr->flags & IFF_NOTRAILERS)
+++	printf(_("NOTRAILERS "));
+++    if (ptr->flags & IFF_RUNNING)
+++	printf(_("RUNNING "));
+++    if (ptr->flags & IFF_NOARP)
+++	printf(_("NOARP "));
+++    if (ptr->flags & IFF_PROMISC)
+++	printf(_("PROMISC "));
+++    if (ptr->flags & IFF_ALLMULTI)
+++	printf(_("ALLMULTI "));
+++    if (ptr->flags & IFF_SLAVE)
+++	printf(_("SLAVE "));
+++    if (ptr->flags & IFF_MASTER)
+++	printf(_("MASTER "));
+++    if (ptr->flags & IFF_MULTICAST)
+++	printf(_("MULTICAST "));
+++#ifdef HAVE_DYNAMIC
+++    if (ptr->flags & IFF_DYNAMIC)
+++	printf(_("DYNAMIC "));
++ #endif
++-
+++    /* DONT FORGET TO ADD THE FLAGS IN ife_print_short */
+++    printf(_(" MTU:%d  Metric:%d"),
+++	   ptr->mtu, ptr->metric ? ptr->metric : 1);
+++#ifdef SIOCSKEEPALIVE
+++    if (ptr->outfill || ptr->keepalive)
+++	printf(_("  Outfill:%d  Keepalive:%d"),
+++	       ptr->outfill, ptr->keepalive);
+++#endif
+++    printf("\n");
++ 
++     /* If needed, display the interface statistics. */
++ 
++@@ -862,8 +845,19 @@ void ife_print_long(struct interface *pt
++ 	 *      not for the aliases, although strictly speaking they're shared
++ 	 *      by all addresses.
++ 	 */
+++	printf("          ");
+++
+++	printf(_("RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"),
+++	       ptr->stats.rx_packets, ptr->stats.rx_errors,
+++	       ptr->stats.rx_dropped, ptr->stats.rx_fifo_errors,
+++	       ptr->stats.rx_frame_errors);
+++	if (can_compress)
+++	    printf(_("             compressed:%lu\n"), ptr->stats.rx_compressed);
+++
++ 	rx = ptr->stats.rx_bytes;  
+++	tx = ptr->stats.tx_bytes;
++ 	short_rx = rx * 10;  
+++	short_tx = tx * 10;
++ 	if (rx > 1125899906842624ull) {
++ 	    short_rx /= 1125899906842624ull;
++ 	    Rext = "PiB";
++@@ -880,8 +874,6 @@ void ife_print_long(struct interface *pt
++ 	    short_rx /= 1024;
++ 	    Rext = "KiB";
++ 	}
++-	tx = ptr->stats.tx_bytes;
++-	short_tx = tx * 10;
++ 	if (tx > 1125899906842624ull) {
++ 	    short_tx /= 1125899906842624ull;
++ 	    Text = "PiB";
++@@ -899,50 +891,37 @@ void ife_print_long(struct interface *pt
++ 	    Text = "KiB";
++ 	}
++ 
++-	printf("        ");
++-	printf(_("RX packets %llu  bytes %llu (%lu.%lu %s)\n"), 
++-		ptr->stats.rx_packets, 
++-	       rx, (unsigned long)(short_rx / 10), 
++-	       (unsigned long)(short_rx % 10), Rext);
++-	if (can_compress) {
++-  	    printf("        ");
++-	    printf(_("RX compressed:%lu\n"), ptr->stats.rx_compressed);
++-	}
++-	printf("        ");
++-	printf(_("RX errors %lu  dropped %lu  overruns %lu  frame %lu\n"),
++-	       ptr->stats.rx_errors, ptr->stats.rx_dropped, 
++-	       ptr->stats.rx_fifo_errors, ptr->stats.rx_frame_errors);
++-
++-
++-	printf("        ");
++-	printf(_("TX packets %llu  bytes %llu (%lu.%lu %s)\n"),
++-		ptr->stats.tx_packets, 
++-	        tx, (unsigned long)(short_tx / 10), 
++-	        (unsigned long)(short_tx % 10), Text);
++-	if (can_compress) {
++-  	    printf("        ");
++-	    printf(_("TX compressed %lu\n"), ptr->stats.tx_compressed);
++-	}
++-	printf("        ");
++-	printf(_("TX errors %lu  dropped %lu overruns %lu  carrier %lu  collisions %lu\n"),
++-	       ptr->stats.tx_errors,
+++	printf("          ");
+++	printf(_("TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"),
+++	       ptr->stats.tx_packets, ptr->stats.tx_errors,
++ 	       ptr->stats.tx_dropped, ptr->stats.tx_fifo_errors,
++-	       ptr->stats.tx_carrier_errors, ptr->stats.collisions);
+++	       ptr->stats.tx_carrier_errors);
+++	printf(_("          collisions:%lu "), ptr->stats.collisions);
+++	if (can_compress)
+++	    printf(_("compressed:%lu "), ptr->stats.tx_compressed);
+++	if (ptr->tx_queue_len != -1)
+++	    printf(_("txqueuelen:%d "), ptr->tx_queue_len);
+++	printf("\n          ");
+++	printf(_("RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"),
+++	       rx, (unsigned long)(short_rx / 10), 
+++	       (unsigned long)(short_rx % 10), Rext, 
+++	       tx, (unsigned long)(short_tx / 10), 
+++	       (unsigned long)(short_tx % 10), Text);
++     }
++ 
++     if ((ptr->map.irq || ptr->map.mem_start || ptr->map.dma ||
++ 	 ptr->map.base_addr >= 0x100)) {
++-	printf("        device ");
+++	printf("          ");
++ 	if (ptr->map.irq)
++-	    printf(_("interrupt %d  "), ptr->map.irq);
+++	    printf(_("Interrupt:%d "), ptr->map.irq);
++ 	if (ptr->map.base_addr >= 0x100)	/* Only print devices using it for 
++ 						   I/O maps */
++-	    printf(_("base 0x%x  "), ptr->map.base_addr);
+++	    printf(_("Base address:0x%x "), ptr->map.base_addr);
++ 	if (ptr->map.mem_start) {
++-	    printf(_("memory 0x%lx-%lx  "), ptr->map.mem_start, ptr->map.mem_end);
+++	    printf(_("Memory:%lx-%lx "), ptr->map.mem_start, ptr->map.mem_end);
++ 	}
++ 	if (ptr->map.dma)
++-	    printf(_("  dma 0x%x"), ptr->map.dma);
+++	    printf(_("DMA chan:%x "), ptr->map.dma);
++ 	printf("\n");
++     }
++     printf("\n");
+--- net-tools-1.60.orig/debian/patches/CVS-20061011-includes_sync.patch
++++ net-tools-1.60/debian/patches/CVS-20061011-includes_sync.patch
+@@ -0,0 +1,113 @@
++Sync with upstream CVS, complete log:
++
++2006-10-10 22:14  ecki
++
++	* util-ank.h: fixed signedness compiler warning
++
++2006-09-27 17:59  ecki
++
++	* mii.h: GigE Support by Stephen Hemminger from
++	  http://developer.osdl.org/shemminger/prototypes/mii-tool.tar.bz2
++	  with verbose register patch from Dean Gaudet
++
++2003-06-28 00:19  ecki
++
++	* mii.h: Use new style MII ioctls only. This will give you a
++	  warning, if compiled with old kernel source tree. It will also
++	  not work if compiled with new source on old kernels. The new
++	  ioctls also require root for reading, the old didnt. This fixes
++	  Debian bug #133648. No fallback compatibility is included for
++	  reasons of cleaner source.
++
++2002-03-04 21:47  ecki
++
++	* interface.h: export procnetdev_version, get_dev_fields, get_name
++	  from lib/interface.c for general usage (e.g. in my next patch to
++	  iptunnel)
++
++2001-11-25 03:48  ecki
++
++	* interface.h: this fixes Debian Bug #109164 (netstat -ci does only
++	  print stats once). It also renames add_interface and
++	  free_interface list to if_cache_add/free.  I am not sure if
++	  removing the "proc_read" flag will harm performance, looks likt
++	  this check is never triggereed. Anyway, we need more efficient
++	  b-search sooner or later.
++
++--- net-tools-1.60.orig/include/util-ank.h
+++++ net-tools-1.60/include/util-ank.h
++@@ -75,6 +75,6 @@
++ extern int do_class(int argc, char **argv);
++ extern int do_filter(int argc, char **argv);
++ 
++-extern const char *format_host(int af, void *addr, __u8 *abuf, int alen);
+++extern const char *format_host(int af, void *addr, char *abuf, int alen);
++ 
++ #endif /* __UTILS_H__ */
++--- net-tools-1.60.orig/include/mii.h
+++++ net-tools-1.60/include/mii.h
++@@ -6,11 +6,14 @@
++  * Copyright (C) 2000 David A. Hinds -- dhinds@pcmcia.sourceforge.org
++  */
++ 
++-#ifndef _LINUX_MII_H
++-#define _LINUX_MII_H
+++#ifndef _NETTOOL_MII_H
+++#define _NETTOOLS_MII_H
+++
+++#include <linux/sockios.h>
++ 
++ /* network interface ioctl's for MII commands */
++ #ifndef SIOCGMIIPHY
+++#warning "SIOCGMIIPHY is not defined by your kernel source"
++ #define SIOCGMIIPHY (SIOCDEVPRIVATE)	/* Read from current PHY */
++ #define SIOCGMIIREG (SIOCDEVPRIVATE+1) 	/* Read any PHY register */
++ #define SIOCSMIIREG (SIOCDEVPRIVATE+2) 	/* Write any PHY register */
++@@ -38,6 +41,7 @@
++ #define  MII_BMCR_RESTART	0x0200
++ #define  MII_BMCR_DUPLEX	0x0100
++ #define  MII_BMCR_COLTEST	0x0080
+++#define  MII_BMCR_SPEED1000	0x0040
++ 
++ /* Basic Mode Status Register */
++ #define MII_BMSR		0x01
++@@ -83,4 +87,17 @@
++ #define  MII_ANER_PAGE_RX	0x0002
++ #define  MII_ANER_LP_AN_ABLE	0x0001
++ 
++-#endif /* _LINUX_MII_H */
+++#define MII_CTRL1000		0x09
+++#define   MII_BMCR2_1000FULL	0x0200
+++#define   MII_BMCR2_1000HALF	0x0100
+++
+++#define MII_STAT1000		0x0a
+++#define   MII_LPA2_1000LOCALOK  0x2000
+++#define   MII_LPA2_1000REMRXOK	0x1000
+++#define   MII_LPA2_1000FULL	0x0800
+++#define   MII_LPA2_1000HALF	0x0400
+++
+++/* Last register we need for show_basic_mii() */
+++#define MII_BASIC_MAX          (MII_STAT1000+1)
+++
+++#endif /* _NETTOOLS_MII_H */
++--- net-tools-1.60.orig/include/interface.h
+++++ net-tools-1.60/include/interface.h
++@@ -64,13 +64,17 @@
++ extern int if_fetch(struct interface *ife);
++ 
++ extern int for_all_interfaces(int (*)(struct interface *, void *), void *);
++-extern int free_interface_list(void);
+++extern int if_cache_free(void);
++ extern struct interface *lookup_interface(char *name);
++ extern int if_readlist(void);
++ 
++ extern int do_if_fetch(struct interface *ife);
++ extern int do_if_print(struct interface *ife, void *cookie);
++ 
+++extern int    procnetdev_version(char *buf);
+++extern int    get_dev_fields(char *bp, struct interface *ife);
+++extern char * get_name(char *name, char *p);
+++
++ extern void ife_print(struct interface *ptr);
++ 
++ extern int ife_short;
+--- net-tools-1.60.orig/debian/patches/CVS-20031011-hostname.c_sync.patch
++++ net-tools-1.60/debian/patches/CVS-20031011-hostname.c_sync.patch
+@@ -0,0 +1,97 @@
++Sync with upstream CVS, complete log:
++
++Revision 1.12 - Sat Oct 11 21:08:10 2003 UTC by ecki
++Maik Broemme contributed gcc warning fixes (break after default: label)
++
++Revision 1.11 - Thu Jun 12 03:22:30 2003 UTC by ecki
++make hostname compile warnign free with gcc 3.3 (Ec)
++
++Index: net-tools/hostname.c
++===================================================================
++--- net-tools.orig/hostname.c
+++++ net-tools/hostname.c
++@@ -9,20 +9,19 @@
++  *              dnsdmoainname   
++  *              nisdomainname {name|-F file}
++  *
++- * Version:     hostname 1.96 (1996-02-18)
+++ * Version:     hostname 1.101 (2003-10-11)
++  *
++  * Author:      Peter Tobias <tobias@et-inf.fho-emden.de>
++  *
++  * Changes:
++- *      {1.90}  Peter Tobias :          Added -a and -i options.
++- *      {1.91}  Bernd Eckenfels :       -v,-V rewritten, long_opts 
++- *                                      (major rewrite), usage.
++- *960120 {1.95} Bernd Eckenfels :       -y/nisdomainname - support for get/
++- *                                      setdomainname added 
++- *960218 {1.96} Bernd Eckenfels :       netinet/in.h added
++- *980629 {1.97} Arnaldo Carvalho de Melo : gettext instead of catgets for i18n
++- *20000213 {1.99} Arnaldo Carvalho de Melo : fixed some i18n strings
+++ *         {1.90}  Peter Tobias : Added -a and -i options.
+++ *         {1.91}  Bernd Eckenfels : -v,-V rewritten, long_opts (major rewrite), usage.
+++ *19960120 {1.95}  Bernd Eckenfels : -y/nisdomainname - support for get/setdomainname added 
+++ *19960218 {1.96}  Bernd Eckenfels : netinet/in.h added
+++ *19980629 {1.97}  Arnaldo Carvalho de Melo : gettext instead of catgets for i18n
+++ *20000213 {1.99}  Arnaldo Carvalho de Melo : fixed some i18n strings
++  *20010404 {1.100} Arnaldo Carvalho de Melo: use setlocale
+++ *20031011 {1.101} Maik Broemme: gcc 3.x fixes (default: break)
++  *
++  *              This program is free software; you can redistribute it
++  *              and/or  modify it under  the terms of  the GNU General
++@@ -31,7 +30,9 @@
++  *              your option) any later version.
++  */
++ #include <stdio.h>
+++#include <stdlib.h>
++ #include <unistd.h>
+++#include <stdlib.h>
++ #include <getopt.h>
++ #include <string.h>
++ #include <netdb.h>
++@@ -78,6 +79,7 @@ static void setnname(char *nname)
++             fprintf(stderr, _("%s: name too long\n"), program_name);
++             break;
++         default:
+++	    break;
++         }
++ 	exit(1);
++     }
++@@ -97,7 +99,6 @@ static void sethname(char *hname)
++ 	case EINVAL:
++ 	    fprintf(stderr, _("%s: name too long\n"), program_name);
++ 	    break;
++-	default:
++ 	}
++ 	exit(1);
++     };
++@@ -116,7 +117,6 @@ static void setdname(char *dname)
++ 	case EINVAL:
++ 	    fprintf(stderr, _("%s: name too long\n"), program_name);
++ 	    break;
++-	default:
++ 	}
++ 	exit(1);
++     };
++@@ -173,7 +173,6 @@ static void showhname(char *hname, int c
++ 	    *p = '\0';
++ 	printf("%s\n", hp->h_name);
++ 	break;
++-    default:
++     }
++ }
++ 
++@@ -326,11 +325,12 @@ int main(int argc, char **argv)
++ 	    break;
++ 	case 'V':
++ 	    version();
+++	    break; // not reached
++ 	case '?':
++ 	case 'h':
++ 	default:
++ 	    usage();
++-
+++	    break; // not reached
++ 	};
++ 
++ 
+--- net-tools-1.60.orig/debian/patches/Bug#254243-netstat.c-wide-opt.patch
++++ net-tools-1.60/debian/patches/Bug#254243-netstat.c-wide-opt.patch
+@@ -0,0 +1,113 @@
++This patch adds the --wide option to netstat, to avoid truncation of ipv6
++addresses, by Luar Roji. (Bug #254243)
++
++Already in upstream's CVS (rev 1.60)
++
++Index: net-tools/man/en_US/netstat.8
++===================================================================
++--- net-tools.orig/man/en_US/netstat.8
+++++ net-tools/man/en_US/netstat.8
++@@ -8,7 +8,7 @@
++ .\" Modified: Tuan Hoang tqhoang@bigfoot.com 
++ .\"
++ .\"
++-.TH NETSTAT 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
+++.TH NETSTAT 8 "2008-11-16" "net\-tools" "Linux Programmer's Manual"
++ 
++ .SH NAME
++ netstat \- Print network connections, routing tables, interface statistics, masquerade connections, and multicast memberships
++@@ -118,6 +118,9 @@ Display summary statistics for each prot
++ .SS "\-\-verbose , \-v"
++ Tell the user what is going on by being verbose. Especially print some
++ useful information about unconfigured address families.
+++.SS "\-\-wide , \-W"
+++Do not truncate IP addresses by using output as wide as needed. This is
+++optional for now to not break existing scripts.
++ .SS "\-\-numeric , \-n"
++ Show numerical addresses instead of trying to determine symbolic host, port
++ or user names.
++Index: net-tools/netstat.c
++===================================================================
++--- net-tools.orig/netstat.c
+++++ net-tools/netstat.c
++@@ -149,6 +149,7 @@ int flag_udp = 0;
++ int flag_igmp= 0;
++ int flag_rom = 0;
++ int flag_exp = 1;
+++int flag_wide= 0;
++ int flag_prg = 0;
++ int flag_arg = 0;
++ int flag_ver = 0;
++@@ -782,16 +783,20 @@ static void tcp_do_one(int lnr, const ch
++ 		 get_sname(htons(local_port), "tcp",
++ 			   flag_not & FLAG_NUM_PORT));
++ 
++-	if ((strlen(local_addr) + strlen(buffer)) > 22)
++-	    local_addr[22 - strlen(buffer)] = '\0';
+++	if (!flag_wide) {
+++	    if ((strlen(local_addr) + strlen(buffer)) > 22)
+++		local_addr[22 - strlen(buffer)] = '\0';
+++	}
++ 
++ 	strcat(local_addr, ":");
++ 	strcat(local_addr, buffer);
++ 	snprintf(buffer, sizeof(buffer), "%s",
++ 		 get_sname(htons(rem_port), "tcp", flag_not & FLAG_NUM_PORT));
++ 
++-	if ((strlen(rem_addr) + strlen(buffer)) > 22)
++-	    rem_addr[22 - strlen(buffer)] = '\0';
+++	if (!flag_wide) {
+++	    if ((strlen(rem_addr) + strlen(buffer)) > 22)
+++		rem_addr[22 - strlen(buffer)] = '\0';
+++	}
++ 
++ 	strcat(rem_addr, ":");
++ 	strcat(rem_addr, buffer);
++@@ -1511,9 +1516,9 @@ static void version(void)
++ 
++ static void usage(void)
++ {
++-    fprintf(stderr, _("usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--help}\n"));
++-    fprintf(stderr, _("       netstat [-vnNcaeol] [<Socket> ...]\n"));
++-    fprintf(stderr, _("       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n\n"));
+++    fprintf(stderr, _("usage: netstat [-vWeenNcCF] [<Af>] -r         netstat {-V|--version|-h|--help}\n"));
+++    fprintf(stderr, _("       netstat [-vWnNcaeol] [<Socket> ...]\n"));
+++    fprintf(stderr, _("       netstat { [-vWeenNac] -i | [-cWnNe] -M | -s }\n\n"));
++ 
++     fprintf(stderr, _("        -r, --route              display routing table\n"));
++     fprintf(stderr, _("        -i, --interfaces         display interface table\n"));
++@@ -1523,6 +1528,7 @@ static void usage(void)
++     fprintf(stderr, _("        -M, --masquerade         display masqueraded connections\n\n"));
++ #endif
++     fprintf(stderr, _("        -v, --verbose            be verbose\n"));
+++    fprintf(stderr, _("        -W, --wide               don't truncate IP addresses\n"));
++     fprintf(stderr, _("        -n, --numeric            don't resolve names\n"));
++     fprintf(stderr, _("        --numeric-hosts          don't resolve host names\n"));
++     fprintf(stderr, _("        --numeric-ports          don't resolve port names\n"));
++@@ -1572,6 +1578,7 @@ int main
++ 	{"programs", 0, 0, 'p'},
++ 	{"verbose", 0, 0, 'v'},
++ 	{"statistics", 0, 0, 's'},
+++	{"wide", 0, 0, 'W'},
++ 	{"numeric", 0, 0, 'n'},
++ 	{"numeric-hosts", 0, 0, '!'},
++ 	{"numeric-ports", 0, 0, '@'},
++@@ -1591,7 +1598,7 @@ int main
++     getroute_init();		/* Set up AF routing support */
++ 
++     afname[0] = '\0';
++-    while ((i = getopt_long(argc, argv, "MCFA:acdegphinNorstuVv?wxl64", longopts, &lop)) != EOF)
+++    while ((i = getopt_long(argc, argv, "MCFA:acdegphinNorstuWVv?wxl64", longopts, &lop)) != EOF)
++ 	switch (i) {
++ 	case -1:
++ 	    break;
++@@ -1635,6 +1642,9 @@ int main
++ 	case 'i':
++ 	    flag_int++;
++ 	    break;
+++	case 'W':
+++	    flag_wide++;
+++	    break;
++ 	case 'n':
++ 	    flag_not |= FLAG_NUM;
++ 	    break;
+--- net-tools-1.60.orig/debian/patches/CVS-20081002-manpages_sync.patch
++++ net-tools-1.60/debian/patches/CVS-20081002-manpages_sync.patch
+@@ -0,0 +1,1398 @@
++Sync from upstream's CVS for all manpages. Full log:
++
++2008-10-02 20:16  ecki
++
++	* en_US/: arp.8, ethers.5, hostname.1, ifconfig.8, mii-tool.8,
++	  nameif.8, netstat.8, plipconfig.8, rarp.8, route.8, slattach.8:
++	  Fix hypen in man pages (Debian Bug#288343 from Andrew Moise) Move
++	  man pages to sysadmin books update samples for route(8) (Debian
++	  Bug#400844, #368697 Danny Rathjens) update see also for
++	  ifconfig(8) (Debian Bug#365916 Dan Jacobs)
++
++2008-10-02 19:42  ecki
++
++	* en_US/arp.8: fix some more hypens, changed book name and updated
++	  date to 2008-10-03
++
++2008-10-02 19:30  ecki
++
++	* en_US/netstat.8: document the additional info in Send-Q/Recv-Q
++	  with recent kernels for listening sockets.
++
++2008-06-16 21:18  ecki
++
++	* en_US/arp.8: Spelling error (Debian Bug #486448 reported by
++	  Volker Stolz)
++
++2007-12-02 01:42  ecki
++
++	* de_DE/netstat.8, en_US/netstat.8, fr_FR/netstat.8,
++	  pt_BR/netstat.8: fixed interfaceS spelling (Debian Bug #435690).
++	  Thanks Alan and Liu Xing.
++
++2007-12-01 15:19  ecki
++
++	* en_US/arp.8: cleanup man page (arp.8 2007-12-01)
++
++2007-11-07 20:01  ecki
++
++	* en_US/ifconfig.8: Fix Formatting Bug for ifconfig.8 (Debian
++	  Bug#450432 reported by Ivan Shmakov)
++
++2006-10-10 02:58  ecki
++
++	* en_US/slattach.8: formatting fixes from Justin Pryzby in Debian
++	  Bug #391495
++
++2005-09-04 00:51  ecki
++
++	* en_US/slattach.8 (tags: net-tools-1_65): Spelling fix for Debian
++	  Bug#326124 reported by A. Costa.
++
++2005-06-30 16:26  ecki
++
++	* en_US/ifconfig.8: minor formatting
++
++2005-06-30 15:42  ecki
++
++	* en_US/ifconfig.8: added pointer to iptables(8) not only
++	  ipchains(8) (Toralf Förster)
++
++2005-05-16 01:30  ecki
++
++	* en_US/arp.8: desupport dontpub in arp.8 and arp -? (Debian Bug
++	  #203396)
++
++2005-05-13 19:34  ecki
++
++	* en_US/ethers.5: line break fix debian bug #305637
++
++2005-05-13 19:31  ecki
++
++	* en_US/mii-tool.8: spellig fix debian bug #305638
++
++2005-05-13 19:28  ecki
++
++	* en_US/route.8: spelling fix debian bug #305640
++
++2004-06-29 17:28  ecki
++
++	* en_US/netstat.8 (tags: net-tools-1_65): little formatting fix
++
++2004-03-28 18:35  ecki
++
++	* en_US/mii-tool.8 (tags: net-tools-1_65): added diagnostics
++	  (closes debian bug #239229: EINVAL for downed interface)
++
++2003-10-02 17:06  ecki
++
++	* en_US/: netstat.8, route.8 (tags: net-tools-1_65): fixes for man
++	  page bugs reported by Hugh Redelmeier.
++
++2003-05-28 17:59  ecki
++
++	* en_US/: ifconfig.8 (tags: net-tools-1_65), netstat.8: fixed
++	  wording of binary units counters and interpunctuation in
++	  netstat(8)
++
++2003-02-25 18:03  ecki
++
++	* en_US/ifconfig.8: Marc Lehmann pointed out that binary prefixes
++	  are made up by the IEEE and are not official SI yet. (Debian Bug
++	  #182478)
++
++2003-02-08 19:49  ecki
++
++	* en_US/ifconfig.8: add a comment about alias interfaces and
++	  primary interface of scopes (intended to fix Debian wishlist bug
++	  #179780 and normal bug #64458)
++
++2002-07-03 20:40  ecki
++
++	* en_US/ifconfig.8: there is no such thing as -i option for
++	  ifconfig removed variable, fixed usage, added options to english
++	  man page
++
++2002-02-20 11:31  ecki
++
++	* de_DE/netstat.8 (tags: net-tools-1_65): fixed typo in german man
++	  page and added a comment that man page is currently not
++	  completely up-to-date.
++
++2001-11-24 02:56  ecki
++
++	* de_DE/netstat.8, en_US/netstat.8: fixed minor errors in netstat.8
++	  man page (--numeric-users was missing, some font problems and
++	  --interfaces has no <interface> argument (Debian Bug #120475)
++	  thanks for the report to Uwe Hermann.
++
++2001-11-11 22:46  ecki
++
++	* en_US/ifconfig.8: added documentation about SI prefixes for
++	  decimal numbers
++
++2001-11-05 10:12  ecki
++
++	* en_US/rarp.8, fr_FR/arp.8, fr_FR/hostname.1, fr_FR/ifconfig.8,
++	  fr_FR/netstat.8, fr_FR/rarp.8, pt_BR/rarp.8 (utags:
++	  net-tools-1_65): changed troff syntax according to ESR's report
++
++2001-11-05 10:07  ecki
++
++	* en_US/arp.8 (tags: net-tools-1_65): fixed troff syntax, as
++	  reported by ESR. Did not changed the date of the man page.
++
++2001-06-29 04:47  ecki
++
++	* en_US/ifconfig.8: made man page more useful and added right link
++	  for irq conflicts in ifconfig.8
++
++2001-06-29 00:50  ecki
++
++	* fr_FR/netstat.8: man page fix CLOSED -> CLOSE
++
++2001-06-29 00:15  ecki
++
++	* en_US/netstat.8: fixed CLOSED -> CLOSE in french and english
++	  manpage as of bug report from Matthew Tippett
++
++Index: net-tools/man/de_DE/netstat.8
++===================================================================
++--- net-tools.orig/man/de_DE/netstat.8
+++++ net-tools/man/de_DE/netstat.8
++@@ -9,7 +9,7 @@
++ .\" Modified: Tuan Hoang tuan@optimus.mitre.org 
++ .\"
++ .\"
++-.TH NETSTAT 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
+++.TH NETSTAT 8 "2007-12-02" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
++ 
++ .SH NAME
++ netstat \- Anzeige von Netzwerksverbindungen, Routentabellen, Schnittstellenstatistiken, maskierten Verbindungen, Netlink-Nachrichten und Mitgliedschaft in Multicastgruppen
++@@ -44,7 +44,6 @@ netstat \- Anzeige von Netzwerksverbindu
++ .B netstat
++ .RB [ \-veenpac ]
++ .RB { \-\-interfaces | \-i }
++-.RI [ Schnittstelle ]
++ 
++ .PP
++ 
++@@ -68,6 +67,8 @@ netstat \- Anzeige von Netzwerksverbindu
++ .SH BESCHREIBUNG
++ .B Netstat
++ zeigt Informationen des Linux Netzwerkssystems an.
+++.PP
+++.B Bitte beachten Sie, dass der Inhalt der deutschen man-page nicht vollst\(:andig ist, im Moment.
++ 
++ .SS "(no option)"
++ Ohne Optionen zeigt
++@@ -103,18 +104,17 @@ benutzt das Ausgabeformat von
++ Wegen Details siehe
++ .BR route (8).
++ 
++-.SS "\-i, \-\-interface \fISchnittstelle\fI"
+++.SS "\-i, \-\-interfaces"
++ Wird die
++ .BR -i ", " --interfaces
++-Option verwendet,  so wird eine Tabelle aller (oder der angegebenen
++-.IR Schnittstellen ) 
+++Option verwendet,  so wird eine Tabelle aller Schnittstellen
++ ausgedruckt.  Die Ausgabe ist im Format von
++ .B "ifconfig -e"
++ und wird in
++ .BR ifconfig (8)
++ beschrieben.
++ .B "netstat -ei" 
++-druckt eine Tabelle oder einen Eintrag f\(:ur einen einzelnes Interface wie
+++druckt eine Tabelle f\(:ur Interfaces wie
++ .BR ifconfig .
++ Die
++ .B -a
++@@ -182,7 +182,7 @@ Dies hat den gleichen Effekt wie die Lan
++ und
++ .BR \-\-ddp.
++ 
++-.SS "\-c, \-\-continous"
+++.SS "\-c, \-\-continuous"
++ Mit dieser Option wiederholt
++ .B netstat
++ im Sekundenabstand die Ausgabe, bis es abgebrochen wird.
++Index: net-tools/man/en_US/arp.8
++===================================================================
++--- net-tools.orig/man/en_US/arp.8
+++++ net-tools/man/en_US/arp.8
++@@ -1,56 +1,111 @@
++-.TH ARP 8 "5 Jan 1999" "net-tools" "Linux Programmer's Manual"
+++.TH ARP 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
++ .SH NAME
++ arp \- manipulate the system ARP cache
++ .SH SYNOPSIS
++ .B arp 
++ .RB [ \-vn ] 
++-.RB [ "\-H type" ] 
++-.RB [ "-i if" ] 
++-.B -a 
++-.RB [ hostname ]
+++.RB [ \-H 
+++.IR type ] 
+++.RB [ \-i
+++.IR if ] 
+++.RB [ \-a ] 
+++.RI [ hostname ]
++ .PP
++ .B arp 
++ .RB [ \-v ]
++-.RB [ "\-i if" ] 
++-.B "\-d hostname"
+++.RB [ \-i
+++.IR if ] 
+++.B \-d 
+++.I hostname
++ .RB [ pub ]
++ .PP
++ .B arp 
++ .RB [ \-v ] 
++-.RB [ "\-H type" ] 
++-.RB [ "\-i if" ] 
++-.B -s hostname hw_addr
+++.RB [ \-H
+++.IR type ] 
+++.RB [ \-i
+++.IR if ] 
+++.B \-s
+++.I hostname hw_addr
++ .RB [ temp ] 
++ .PP
++ .B arp 
++ .RB [ \-v ] 
++-.RB [ "\-H type" ] 
++-.RB [ "\-i if" ] 
++-.B -s hostname hw_addr
++-.RB [ "netmask nm" ] 
+++.RB [ \-H
+++.IR type ] 
+++.RB [ \-i
+++.IR if ] 
+++.B \-s
+++.I hostname hw_addr
+++.RB [ netmask
+++.IR nm ] 
++ .B pub
++ .PP
++ .B arp 
++ .RB [ \-v ] 
++-.RB [ "\-H type" ] 
++-.RB [ "\-i if" ] 
++-.B -Ds hostname ifa
++-.RB [ "netmask nm" ] 
+++.RB [ \-H
+++.IR type ] 
+++.RB [ \-i
+++.IR if ] 
+++.B \-Ds 
+++.I hostname
+++.I ifname
+++.RB [ netmask
+++.IR nm ] 
++ .B pub
++ .PP
++ .B arp 
++ .RB [ \-vnD ]
++-.RB [ "\-H type" ] 
++-.RB [ "-i if" ]
++-.B -f [filename]
+++.RB [ \-H 
+++.IR type ] 
+++.RB [ \-i
+++.IR if ]
+++.B \-f 
+++.RI [ filename ]
++ 
++ .SH DESCRIPTION
++ .B Arp
++-manipulates the kernel's ARP cache in various ways.  The primary options
++-are clearing an address mapping entry and manually setting up one.  For
++-debugging purposes, the
+++manipulates or displays the kernel's IPv4 network neighbour cache. It can add
+++entries to the table, delete one or display the current content.
+++
+++.B ARP
+++stands for Address Resolution Protocol, which is used to find the media
+++access control address of a network neighbour for a given IPv4 Address.
+++.SH MODES
++ .B arp
++-program also allows a complete dump of the ARP cache.
+++with no mode specifier will print the current content of the table. It is
+++possible to limit the number of entries printed, by specifying an hardware
+++address type, interface name or host address.
+++
+++.B arp -d
+++.I address
+++will delete a ARP table entry. Root or netadmin priveledge is required to do
+++this. The entry is found by IP address. If a hostname is given, it will be
+++resolved before looking up the entry in the ARP table.
+++
+++.B arp -s
+++.I address hw_addr
+++is used to set up a new table entry. The format of the 
+++.I hw_addr
+++parameter is dependent on the hardware class, but for most classes one can
+++assume that the usual presentation can be used.  For the Ethernet class,
+++this is 6 bytes in hexadecimal, separated by colons. When adding proxy arp
+++entries (that is those with the
+++.BR pub lish 
+++flag set a 
+++.B netmask 
+++may be specified to proxy arp for entire subnets. This is not good
+++practice, but is supported by older kernels because it can be
+++useful. If the
+++.B temp
+++flag is not supplied entries will be permanent stored into the ARP
+++cache. To simplyfy setting up entries for one of your own network interfaces, you can use the
+++.B "arp \-Ds"
+++.I address ifname
+++form. In that case the hardware address is taken from the interface with the
+++specified name.
+++
+++.br
++ .SH OPTIONS
++ .TP
++ .B "\-v, \-\-verbose"
++@@ -60,7 +115,7 @@ Tell the user what is going on by being 
++ shows numerical addresses instead of trying to determine symbolic host, port
++ or user names.
++ .TP
++-.B "\-H type, \-\-hw-type type"
+++.B "\-H type, \-\-hw\-type type"
++ When setting or reading the ARP cache, this optional parameter tells
++ .B arp
++ which class of entries it should check for.  The default value of
++@@ -76,21 +131,13 @@ Other values might include network techn
++ and
++ .RB "NET/ROM (" netrom ")."
++ .TP
++-.B "\-a [hostname], \-\-display [hostname]"
++-Shows the entries of the specified hosts.  If the
++-.B hostname
++-parameter is not used,
++-.B all
++-entries will be displayed.
++-.TP
++-.B "\-d hostname, \-\-delete hostname"
++-Remove any entry for the specified host.  This can be used if the
++-indicated host is brought down, for example.
+++.B \-a
+++Use alternate BSD style output format (with no fixed columns).
++ .TP
++ .B "\-D, \-\-use-device"
++-Use the interface
++-.BR ifa "'s"
++-hardware address.
+++Instead of a hw_addr, the given argument is the name of an interface. 
+++.B arp
+++will use the MAC address of that interface for the table entry. This is usually the best option to set up a proxy ARP entry to yourself.
++ .TP
++ .B "\-i If, \-\-device If"
++ Select an interface. When dumping the ARP cache only entries matching
++@@ -106,33 +153,15 @@ be answered. 
++ .B NOTE:
++ This has to be different from the interface to which the IP
++ datagrams will be routed.
++-.TP
++-.B "\-s hostname hw_addr, \-\-set hostname"
++-Manually create an ARP address mapping entry for host
++-.B hostname
++-with hardware address set to
++-.B hw_addr
++-.  The format of the hardware address is dependent on the hardware
++-class, but for most classes one can assume that the usual presentation
++-can be used.  For the Ethernet class, this is 6 bytes in hexadecimal,
++-separated by colons. When adding proxy arp entries (that is those with
++-the 
++-.BR pub lish 
++-flag set a 
++-.B netmask 
++-may be specified to proxy arp for entire subnets. This is not good
++-practice, but is supported by older kernels because it can be
++-useful. If the
++-.B temp
++-flag is not supplied entries will be permanent stored into the ARP
++-cache.
++-.br
++ .B NOTE:
++ As of kernel 2.2.0 it is no longer possible to set an ARP entry for an 
++ entire subnet. Linux instead does automagic proxy arp when a route
++ exists and it is forwarding. See 
++ .BR arp (7)
++-for details.
+++for details. Also the
+++.B dontpub
+++option which is available for delete and set operations cannot be 
+++used with 2.4 and newer kernels.
++ .TP
++ .B "\-f filename, \-\-file filename"
++ Similar to the
++@@ -167,8 +196,18 @@ flag. Permanent entries are marked with
++ and published entries have the
++ .B P
++ flag.
+++.SH EXAMPLES
+++.B /usr/sbin/arp -i eth0 -Ds 10.0.0.2 eth1 pub
+++
+++This will answer ARP requests for 10.0.0.2 on eth0 with the MAC address for
+++eth1.
+++
+++.B /usr/sbin/arp -i eth1 -d 10.0.0.1
+++
+++Delete the ARP table entry for 10.0.0.1 on interface eth1. This will match
+++published proxy ARP entries and permanent entries.
++ .SH FILES
++-.I /proc/net/arp,
+++.I /proc/net/arp
++ .br
++ .I /etc/networks
++ .br
++@@ -178,5 +217,4 @@ flag.
++ .SH SEE ALSO
++ rarp(8), route(8), ifconfig(8), netstat(8)
++ .SH AUTHORS
++-Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> with a lot of improvements
++-from net-tools Maintainer Bernd Eckenfels <net-tools@lina.inka.de>.
+++Fred N. van Kempen <waltje@uwalt.nl.mugnet.org>, Bernd Eckenfels <net\-tools@lina.inka.de>.
++Index: net-tools/man/en_US/ethers.5
++===================================================================
++--- net-tools.orig/man/en_US/ethers.5
+++++ net-tools/man/en_US/ethers.5
++@@ -1,4 +1,4 @@
++-.TH ETHERS 5 "April 26th, 1996" "" "File formats"
+++.TH ETHERS 5 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
++ .SH NAME \"{{{roff}}}\"{{{
++ ethers \- Ethernet address to IP number database
++ .\"}}}
++@@ -7,17 +7,17 @@ ethers \- Ethernet address to IP number 
++ IP numbers, one line for each IP number:
++ .sp
++ .RS
++-\fIEthernet-address\fP  \fIIP-number\fP
+++\fIEthernet\-address\fP  \fIIP\-number\fP
++ .RE
++ .sp
++-The two items are separated by any number of SPACE and/or TAB char
++-acters.   A \fB#\fP at the beginning of a line starts a comment
++-which extends to the end of the line.  The \fIEthernet-address\fP is
+++The two items are separated by any number of SPACE and/or TAB characters.
+++A \fB#\fP at the beginning of a line starts a comment
+++which extends to the end of the line.  The \fIEthernet\-address\fP is
++ written as
++ .IR x : x : x : x : x : x ,
++ where \fIx\fP is a hexadecimal number between \fB0\fP and \fBff\fP
++ which represents one byte of the address, which is in network byte
++-order (big-endian).  The \fIIP-number\fP may be a hostname which
+++order (big-endian).  The \fIIP\-number\fP may be a hostname which
++ can be resolved by DNS or a dot separated number.
++ .\"}}}
++ .SH EXAMPLES \"{{{
++Index: net-tools/man/en_US/hostname.1
++===================================================================
++--- net-tools.orig/man/en_US/hostname.1
+++++ net-tools/man/en_US/hostname.1
++@@ -1,4 +1,4 @@
++-.TH HOSTNAME 1 "28 Jan 1996" "net-tools" "Linux Programmer's Manual"
+++.TH HOSTNAME 1 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
++ 
++ .SH NAME
++ hostname \- show or set the system's host name
++@@ -23,7 +23,7 @@ nodename \- show or set the system's DEC
++ .RB [ \-f ]
++ .RB [ \-\-fqdn ]
++ .RB [ \-i ]
++-.RB [ \-\-ip-address ]
+++.RB [ \-\-ip\-address ]
++ .RB [ \-\-long ]
++ .RB [ \-s ]
++ .RB [ \-\-short ]
++@@ -181,7 +181,7 @@ part of the FQDN) in the \fI/etc/hosts\f
++ .I "\-h, \-\-help"
++ Print a usage message and exit.
++ .TP
++-.I "\-i, \-\-ip-address"
+++.I "\-i, \-\-ip\-address"
++ Display the IP address(es) of the host.
++ .TP
++ .I "\-n, \-\-node"
++@@ -205,9 +205,9 @@ Display the NIS domain name. If a parame
++ .SH FILES
++ .B /etc/hosts
++ .SH AUTHOR
++-Peter Tobias, <tobias@et-inf.fho-emden.de>
+++Peter Tobias, <tobias@et\-inf.fho\-emden.de>
++ .br
++-Bernd Eckenfels, <net-tools@lina.inka.de> (NIS and manpage).
+++Bernd Eckenfels, <net\-tools@lina.inka.de> (NIS and manpage).
++ .br
++ Steve Whitehouse, <SteveW@ACM.org> (DECnet support and manpage).
++ 
++Index: net-tools/man/en_US/ifconfig.8
++===================================================================
++--- net-tools.orig/man/en_US/ifconfig.8
+++++ net-tools/man/en_US/ifconfig.8
++@@ -1,10 +1,10 @@
++-.TH IFCONFIG 8 "14 August 2000" "net-tools" "Linux Programmer's Manual"
+++.TH IFCONFIG 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
++ .SH NAME
++ ifconfig \- configure a network interface
++ .SH SYNOPSIS
++-.B "ifconfig [interface]"
+++.B "ifconfig [-v] [-a] [-s] [interface]"
++ .br
++-.B "ifconfig interface [aftype] options | address ..."
+++.B "ifconfig [-v] interface [aftype] options | address ..."
++ .SH DESCRIPTION
++ .B Ifconfig
++ is used to configure the kernel-resident network interfaces.  It is
++@@ -18,7 +18,7 @@ a single
++ .B interface
++ argument is given, it displays the status of the given interface
++ only; if a single
++-.B -a
+++.B \-a
++ argument is given, it displays the status of all interfaces, even
++ those that are down.  Otherwise, it configures an interface.
++ 
++@@ -41,11 +41,27 @@ supported address families include
++ (AMPR Packet radio).
++ .SH OPTIONS
++ .TP
+++.B -a
+++display all interfaces which are currently available, even if down
+++.TP
+++.B -s
+++display a short list (like netstat -i)
+++.TP
+++.B -v
+++be more verbose for some error conditions
+++.TP
++ .B interface
++ The name of the interface.  This is usually a driver name followed by
++ a unit number, for example
++ .B eth0
++-for the first Ethernet interface.
+++for the first Ethernet interface. If your kernel supports alias interfaces,
+++you can specify them with 
+++.B eth0:0
+++for the first alias of eth0. You can use them to assign a second address. To
+++delete an alias interface use
+++.BR "ifconfig eth0:0 down" .
+++Note: for every scope (i.e. same net with address/netmask combination) all
+++aliases are deleted, if you delete the first (primary).
++ .TP
++ .B up
++ This flag causes the interface to be activated.  It is implicitly
++@@ -122,13 +138,13 @@ are 
++ can be used to tell the driver to auto-sense the media.  Again, not
++ all drivers can do this.
++ .TP
++-.B "[-]broadcast [addr]"
+++.B "[\-]broadcast [addr]"
++ If the address argument is given, set the protocol broadcast
++ address for this interface.  Otherwise, set (or clear) the
++ .B IFF_BROADCAST
++ flag for the interface.
++ .TP
++-.B "[-]pointopoint [addr]"
+++.B "[\-]pointopoint [addr]"
++ This keyword enables the
++ .B point-to-point
++ mode of an interface, meaning that it is a direct link between two
++@@ -173,11 +189,20 @@ alias interfaces anymore. The statistics
++ are shared with all alias addresses on the same device. If you want per-address
++ statistics you should add explicit accounting
++ rules for the address using the 
++-.BR ipchains(8)
+++.BR ipchains (8)
+++or
+++.BR iptables (8)
++ command.
++ .LP
++-Interrupt problems with Ethernet device drivers fail with EAGAIN. See
++-.I http://cesdis.gsfc.nasa.gov/linux/misc/irq-conflict.html
+++Since net\-tools 1.60\-4 ifconfig is printing byte counters and human readable
+++counters with IEC 60027-2 units. So 1 KiB are 2^10 byte. Note, the numbers 
+++are truncated to one decimal (which can by quite a large error if you 
+++consider 0.1 PiB is 112.589.990.684.262 bytes :)
+++.LP
+++Interrupt problems with Ethernet device drivers fail with EAGAIN
+++.I (SIOCSIIFLAGS: Resource temporarily unavailable)
+++it is most likely a interrupt conflict. See
+++.I http://www.scyld.com/expert/irq\-conflict.html
++ for more information.
++ .SH FILES
++ .I /proc/net/socket 
++@@ -189,7 +214,9 @@ for more information.
++ While appletalk DDP and IPX addresses will be displayed they cannot be
++ altered by this command.
++ .SH SEE ALSO
++-route(8), netstat(8), arp(8), rarp(8), ipchains(8)
+++route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5).
+++.br
+++http://physics.nist.gov/cuu/Units/binary.html - Prefixes for binary multiples
++ .SH AUTHORS
++ Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
++ .br
++@@ -198,3 +225,5 @@ Alan Cox, <Alan.Cox@linux.org>
++ Phil Blundell, <Philip.Blundell@pobox.com>
++ .br
++ Andi Kleen
+++.br
+++Bernd Eckenfels, <net\-tools@lina.inka.de>
++Index: net-tools/man/en_US/mii-tool.8
++===================================================================
++--- net-tools.orig/man/en_US/mii-tool.8
+++++ net-tools/man/en_US/mii-tool.8
++@@ -1,13 +1,13 @@
++ .\" Copyright (C) 2000 David A. Hinds -- dhinds@pcmcia.sourceforge.org
++ .\" mii-tool.8 1.5 2000/04/25 22:58:19
++ .\"
++-.TH MII-TOOL 8 "2000/04/25 22:58:19" "net-tools"
+++.TH MII\-TOOL 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
++ 
++ .SH NAME
++-mii-tool \- view, manipulate media-independent interface status
+++mii\-tool \- view, manipulate media-independent interface status
++ 
++ .SH SYNOPSIS
++-.B mii-tool
+++.B mii\-tool
++ [\fB\-v\fR, \fB\-\-verbose\fR]
++ [\fB\-V\fR, \fB\-\-version\fR]
++ [\fB\-R\fR, \fB\-\-reset\fR]
++@@ -32,12 +32,12 @@ single-speed hubs, are unable to autoneg
++ devices, the MII protocol also allows for establishing a link by
++ simply detecting either a 10baseT or 100baseT link beat.  The \fB\-F\fR
++ or \fB\-\-force\fR options can be used to force the MII to operate in
++-one mode, instead of autonegotiating.  The \fB\-A\fR and \fB-F\fR
+++one mode, instead of autonegotiating.  The \fB\-A\fR and \fB\-F\fR
++ options are mutually exclusive.
++ .PP
++ The default short output reports the negotiated link speed and link
++ status for each interface.  If an interface or interfaces are not
++-specified on the command line, then \fBmii-tool\fR will check any
+++specified on the command line, then \fBmii\-tool\fR will check any
++ available interfaces from \fBeth0\fR through \fBeth7\fR.
++ .SH OPTIONS
++ .TP
++@@ -59,7 +59,7 @@ Watch interface(s) and report changes in
++ interfaces are polled at one second intervals.
++ .TP
++ \fB\-l\fR, \fB\-\-log\fR
++-Used with \fB-w\fR, records link status changes in the system log
+++Used with \fB\-w\fR, records link status changes in the system log
++ instead of printing on standard output.
++ .TP
++ \fB\-F\fI media\fR, \fB\-\-force=\fImedia\fR
++@@ -72,7 +72,24 @@ media technologies.  Multiple technologi
++ commas.  Valid media are \fB100baseT4\fR, \fB100baseTx-FD\fR,
++ \fB100baseTx-HD\fR, \fB10baseT-FD\fR, and \fB10baseT-HD\fR.
++ 
+++.SH DIAGNOSTICS
+++.TP
+++SIOCGMIIPHY on 'eth?' failed: Invalid argument
+++If the interface is not running (up), kernel will refuse to report its link state.
+++.TP
+++SIOCGMIIPHY on 'eth?' failed: Operation not permitted
+++Most kernels restrict access to root.
+++.TP
+++SIOCGMIIPHY on 'eth?' failed: No such device
+++This error is shown, if the kernel does not know about the named device.
+++.TP
+++SIOCGMIIPHY on 'eth?' failed: Operation not supported 
+++The interface in question does not support MII queries. Most likely, it does not have 
+++MII transceivers, at all.
+++
++ .SH AUTHORS
++ David Hinds \- dhinds@pcmcia.sourceforge.org
++ .br
++ Donald Becker \- becker@scyld.com
+++.br
+++Bernd Eckenfels \- ecki@debian.org
++Index: net-tools/man/en_US/nameif.8
++===================================================================
++--- net-tools.orig/man/en_US/nameif.8
+++++ net-tools/man/en_US/nameif.8
++@@ -1,10 +1,10 @@
++-.TH NAMEIF 8 "18 Oct 2000" "net-tools" "Linux's Administrator's Manual"
+++.TH NAMEIF 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
++ .SH NAME
++ nameif \- name network interfaces based on MAC addresses
++ .SH SYNOPSIS
++-.B "nameif [-c configfile] [-s]"
+++.B "nameif [\-c configfile] [\-s]"
++ .br
++-.B "nameif [-c configfile] [-s] {interface macaddress}"
+++.B "nameif [\-c configfile] [\-s] {interface macaddress}"
++ .SH DESCRIPTION
++ .B nameif 
++ renames network interfaces based on mac addresses. When no arguments are
++@@ -18,11 +18,11 @@ looks for the interface with the given M
++ name given.
++ 
++ When the 
++-.I -s
+++.I \-s
++ argument is given all error messages go to the syslog.
++ 
++ When the 
++-.I -c 
+++.I \-c 
++ argument is given with a file name that file is read instead of /etc/mactab.
++ 
++ .SH NOTES
++Index: net-tools/man/en_US/netstat.8
++===================================================================
++--- net-tools.orig/man/en_US/netstat.8
+++++ net-tools/man/en_US/netstat.8
++@@ -8,7 +8,7 @@
++ .\" Modified: Tuan Hoang tqhoang@bigfoot.com 
++ .\"
++ .\"
++-.TH NETSTAT 8 "19 December 2000" "net-tools" "Linux Programmer's Manual"
+++.TH NETSTAT 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
++ 
++ .SH NAME
++ netstat \- Print network connections, routing tables, interface statistics, masquerade connections, and multicast memberships
++@@ -23,7 +23,7 @@ netstat \- Print network connections, ro
++ .RB [ \-\-listening | \-l ]
++ .RB [ \-\-all | \-a ]
++ .RB [ \-\-numeric | \-n ]
++-.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ]
+++.RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ]
++ .RB [ \-\-symbolic | \-N ]
++ .RB [ \-\-extend | \-e  [ \-\-extend | \-e] ]
++ .RB [ \-\-timers | \-o ]
++@@ -37,31 +37,30 @@ netstat \- Print network connections, ro
++ .RB [ \-\-extend | \-e  [ \-\-extend | \-e] ]
++ .RB [ \-\-verbose | \-v ]
++ .RB [ \-\-numeric | \-n ]
++-.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ]
+++.RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ]
++ .RB [ \-\-continuous | \-c]
++ .P
++ .B netstat
++ .RB { \-\-interfaces | \-i }
++-.RI [ iface ]
++ .RB [ \-\-all | \-a ]
++ .RB [ \-\-extend | \-e  [ \-\-extend | \-e] ]
++ .RB [ \-\-verbose | \-v ]
++ .RB [ \-\-program | \-p ]
++ .RB [ \-\-numeric | \-n ]
++-.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ]
+++.RB [ \-\-numeric-hosts "] [" \-\-numeric-ports "] [" \-\-numeric-users ]
++ .RB [ \-\-continuous | \-c]
++ .P
++ .B netstat
++ .RB { \-\-groups | \-g }
++ .RB [ \-\-numeric | \-n ]
++-.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ]
+++.RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ]
++ .RB [ \-\-continuous | \-c]
++ .P
++ .B netstat
++ .RB { \-\-masquerade | \-M }
++ .RB [ \-\-extend | \-e ]
++ .RB [ \-\-numeric | \-n ]
++-.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ]
+++.RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ]
++ .RB [ \-\-continuous | \-c]
++ .P
++ .B netstat
++@@ -78,6 +77,8 @@ netstat \- Print network connections, ro
++ .P
++ .IR address_family_options :
++ .PP
+++.RB [ -4 ]
+++.RB [ -6 ]
++ .RB [ \-\-protocol= { inet , unix , ipx , ax25 , netrom , ddp }[, ...] ]
++ .RB [ \-\-unix | \-x ] 
++ .RB [ \-\-inet | \-\-ip ]
++@@ -98,12 +99,17 @@ displays a list of open sockets.  If you
++ address families, then the active sockets of all configured address
++ families will be printed.
++ .SS "\-\-route , \-r"
++-Display the kernel routing tables.
+++Display the kernel routing tables. See the description in 
+++.BR route (8) 
+++for details. 
+++.B netstat -r 
+++and 
+++.B route -e 
+++produce the same output.
++ .SS "\-\-groups , \-g"
++ Display multicast group membership information for IPv4 and IPv6.
++-.SS "\-\-interface=\fIiface \fR, \fB\-i"
++-Display a table of all network interfaces, or the specified
++-.IR iface ) .
+++.SS "\-\-interfaces, \-i"
+++Display a table of all network interfaces.
++ .SS "\-\-masquerade , \-M"
++ Display a list of masqueraded connections.
++ .SS "\-\-statistics , \-s"
++@@ -115,13 +121,13 @@ useful information about unconfigured ad
++ .SS "\-\-numeric , \-n"
++ Show numerical addresses instead of trying to determine symbolic host, port
++ or user names.
++-.SS "\-\-numeric-hosts"
+++.SS "\-\-numeric\-hosts"
++ shows numerical host addresses but does not affect the resolution of
++ port or user names.
++-.SS "\-\-numeric-ports"
+++.SS "\-\-numeric\-ports"
++ shows numerical port numbers but does not affect the resolution of
++ host or user names.
++-.SS "\-\-numeric-users"
+++.SS "\-\-numeric\-users"
++ shows numerical user IDs but does not affect the resolution of host or
++ port names.
++ 
++@@ -164,23 +170,24 @@ Show the PID and name of the program to 
++ Show only listening sockets.  (These are omitted by default.)
++ .SS "\-a, \-\-all"
++ Show both listening and non-listening sockets.  With the
++-.B --interfaces
++-option, show interfaces that are not marked 
+++.B \-\-interfaces
+++option, show interfaces that are not up
++ .SS "\-F"
++ Print routing information from the FIB.  (This is the default.)
++ .SS "\-C"
++ Print routing information from the route cache.
++-.IR UP .
++ .P
++ .SH OUTPUT
++ .P
++ .SS Active Internet connections \fR(TCP, UDP, raw)\fR
++ .SS "Proto" 
++ The protocol (tcp, udp, raw) used by the socket. 
++-.SS "Recv-Q"
++-The count of bytes not copied by the user program connected to this socket.
++-.SS "Send-Q"
++-The count of bytes not acknowledged by the remote host.
+++.SS "Recv\-Q"
+++Established: The count of bytes not copied by the user program connected to this socket.
+++Listening: Since Kernel 2.6.18 this column contains the current syn backlog.
+++.SS "Send\-Q"
+++Established: The count of bytes not acknowledged by the remote host.
+++Listening: Since Kernel 2.6.18 this column contains the maximum size of the syn backlog.
++ .SS "Local Address" 
++ Address and port number of the local end of the socket.  Unless the
++ .BR \-\-numeric " (" \-n )
++@@ -221,7 +228,7 @@ TIME_WAIT
++ The socket is waiting after close to handle packets still in the network.
++ .TP
++ .I
++-CLOSED
+++CLOSE
++ The socket is not being used.
++ .TP
++ .I
++@@ -255,7 +262,7 @@ The username or the user id (UID) of the
++ .SS "PID/Program name"
++ Slash-separated pair of the process id (PID) and process name of the 
++ process that owns the socket.
++-.B --program
+++.B \-\-program
++ causes this column to be included.  You will also need
++ .I superuser
++ privileges to see this information on sockets you don't own.  This
++@@ -358,7 +365,7 @@ to the socket.
++ .PP
++ .SH NOTES
++ Starting with Linux release 2.2 
++-.B netstat -i 
+++.B netstat \-i 
++ does not show interface statistics for alias interfaces. To get per
++ alias interface counters you need to setup explicit rules using the
++ .BR ipchains(8) 
++@@ -438,12 +445,12 @@ as it is viewed. This is unlikely to occ
++ .P
++ .SH AUTHORS
++ The netstat user interface was written by Fred Baumgarten
++-<dc6iq@insu1.etec.uni-karlsruhe.de> the man page basically
+++<dc6iq@insu1.etec.uni\-karlsruhe.de>, the man page basically
++ by Matt Welsh <mdw@tc.cornell.edu>. It was updated by
++ Alan Cox <Alan.Cox@linux.org> but could do with a bit more
++ work.  It was updated again by Tuan Hoang
++ <tqhoang@bigfoot.com>.
++ .br
++-The man page and the command included in the net-tools
+++The man page and the command included in the net\-tools
++ package is totally rewritten by Bernd Eckenfels 
++ <ecki@linux.de>.
++Index: net-tools/man/en_US/plipconfig.8
++===================================================================
++--- net-tools.orig/man/en_US/plipconfig.8
+++++ net-tools/man/en_US/plipconfig.8
++@@ -1,4 +1,4 @@
++-.TH PLIPCONFIG 8 "17 February 1995" "" ""
+++.TH PLIPCONFIG 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
++ .SH NAME
++ plipconfig \- fine tune PLIP device parameters 
++ .SH SYNOPSIS
++Index: net-tools/man/en_US/rarp.8
++===================================================================
++--- net-tools.orig/man/en_US/rarp.8
+++++ net-tools/man/en_US/rarp.8
++@@ -1,20 +1,20 @@
++-.TH RARP 8 "4 August 1997" "net-tools" "Linux Programmer's Manual"
+++.TH RARP 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
++ .SH NAME
++ rarp \- manipulate the system RARP table
++ .SH SYNOPSIS
++-.B "rarp [-V] [--version] [-h] [--help]"
+++.B "rarp [\-V] [\-\-version] [\-h] [\-\-help]"
++ .br
++-.B "rarp -a"
+++.B "rarp \-a"
++ .br
++-.B "rarp [-v] -d hostname ..."
+++.B "rarp [\-v] \-d hostname ..."
++ .br
++-.B "rarp [-v] [-t type] -s hostname hw_addr"
+++.B "rarp [\-v] [\-t type] \-s hostname hw_addr"
++ .SH NOTE
++ .P
++ This program is obsolete.  From version 2.3, the Linux kernel 
++ no longer contains RARP support.  For a replacement RARP daemon, see
++ .I
++-ftp://ftp.dementia.org/pub/net-tools
+++ftp://ftp.dementia.org/pub/net\-tools
++ .SH DESCRIPTION
++ .B Rarp
++ manipulates the kernel's RARP table in various ways.  The primary options
++@@ -61,8 +61,8 @@ Remove all RARP entries for the specifie
++ Create a RARP address mapping entry for host
++ .B hostname
++ with hardware address set to
++-.B hw_addr
++-.  The format of the hardware address is dependent on the hardware
+++.BR hw_addr .
+++The format of the hardware address is dependent on the hardware
++ class, but for most classes one can assume that the usual presentation
++ can be used.  For the Ethernet class, this is 6 bytes in hexadecimal,
++ separated by colons.
++Index: net-tools/man/en_US/route.8
++===================================================================
++--- net-tools.orig/man/en_US/route.8
+++++ net-tools/man/en_US/route.8
++@@ -1,4 +1,4 @@
++-.TH ROUTE 8 "2 January 2000" "net-tools" "Linux Programmer's Manual"
+++.TH ROUTE 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
++ .SH NAME
++ route \- show / manipulate the IP routing table
++ .SH SYNOPSIS
++@@ -51,7 +51,7 @@ If]
++ .RB [ \-V ] 
++ .RB [ \-\-version ]
++ .RB [ \-h ]
++-.RB [ \--help ]
+++.RB [ \-\-help ]
++ .SH DESCRIPTION
++ .B Route
++ manipulates the kernel's IP routing tables.  Its primary use is to set
++@@ -73,16 +73,16 @@ displays the current contents of the rou
++ .SH OPTIONS
++ .TP
++ .B \-A family
++-use the specified address family (eg `inet'; use `route --help' for a full 
+++use the specified address family (eg `inet'; use `route \-\-help' for a full 
++ list).
++ 
++ .TP 
++-.B -F
+++.B \-F
++ operate on the kernel's FIB (Forwarding Information Base) routing
++ table. 
++ This is the default.
++ .TP 
++-.B -C
+++.B \-C
++ operate on the kernel's routing cache.
++ 
++ .TP
++@@ -96,7 +96,7 @@ nameserver has vanished.
++ .TP
++ .B \-e
++ use
++-.BR netstat (8)-format
+++.BR netstat (8)\-format
++ for displaying the routing table.
++ .B \-ee 
++ will generate a very long line with all parameters from the routing table.
++@@ -117,7 +117,7 @@ the
++ .B target
++ is a network.
++ .TP
++-.B -host
+++.B \-host
++ the
++ .B target 
++ is a host.
++@@ -141,7 +141,7 @@ set the metric field in the routing tabl
++ set the TCP Maximum Segment Size (MSS) for connections over this route
++ to M bytes. 
++ The default is the device MTU minus headers, or a lower MTU when path mtu 
++-discovery occured. This setting can be used to force smaller TCP packets on the
+++discovery occurred. This setting can be used to force smaller TCP packets on the
++ other end when path mtu discovery does not work (usually because of
++ misconfigured firewalls that block ICMP Fragmentation Needed)
++ .TP 
++@@ -179,24 +179,27 @@ modifiers (metric - netmask - gw - dev) 
++ 
++ .SH EXAMPLES
++ .TP
++-.B route add -net 127.0.0.0
++-adds the normal loopback entry, using netmask 255.0.0.0 (class A net,
++-determined from the destination address) and associated with the 
++-"lo" device (assuming this device was prviously set up correctly with
+++.B route add \-net 127.0.0.0 netmask 255.0.0.0 dev lo
+++adds the normal loopback entry, using netmask 255.0.0.0 and associated with the 
+++"lo" device (assuming this device was previously set up correctly with
++ .BR ifconfig (8)). 
++ 
++ .TP 
++-.B route add -net 192.56.76.0 netmask 255.255.255.0 dev eth0
++-adds a route to the network 192.56.76.x via 
++-"eth0". The Class C netmask modifier is not really necessary here because
++-192.* is a Class C IP address. The word "dev" can be omitted here. 
+++.B route add \-net 192.56.76.0 netmask 255.255.255.0 dev eth0
+++adds a route to the local network 192.56.76.x via 
+++"eth0".  The word "dev" can be omitted here. 
++ 
++ .TP
++-.B route add default gw mango-gw
+++.B route del default
+++deletes the current default route, which is labeled "default" or 0.0.0.0
+++in the destination field of the current routing table.
+++
+++.TP
+++.B route add default gw mango\-gw
++ adds a default route (which will be used if no other route matches).
++-All packets using this route will be gatewayed through "mango-gw". The
+++All packets using this route will be gatewayed through "mango\-gw". The
++ device which will actually be used for that route depends on how we
++-can reach "mango-gw" - the static route to "mango-gw" will have to be
+++can reach "mango\-gw" - the static route to "mango\-gw" will have to be
++ set up before. 
++ 
++ .TP
++@@ -205,18 +208,18 @@ Adds the route to the "ipx4" host via th
++ "ipx4" is the SLIP host).
++ 
++ .TP
++-.B route add -net 192.57.66.0 netmask 255.255.255.0 gw ipx4
+++.B route add \-net 192.57.66.0 netmask 255.255.255.0 gw ipx4
++ This command adds the net "192.57.66.x" to be gatewayed through the former
++ route to the SLIP interface.
++ 
++ .TP
++-.B route add -net 224.0.0.0 netmask 240.0.0.0 dev eth0
+++.B route add \-net 224.0.0.0 netmask 240.0.0.0 dev eth0
++ This is an obscure one documented so people know how to do it. This sets
++ all of the class D (multicast) IP routes to go via "eth0". This is the
++ correct normal configuration line with a multicasting kernel. 
++ 
++ .TP
++-.B route add -net 10.0.0.0 netmask 255.0.0.0 reject
+++.B route add \-net 10.0.0.0 netmask 255.0.0.0 reject
++ This installs a rejecting route for the private network "10.x.x.x."
++ 
++ .LP
++@@ -282,14 +285,14 @@ recent kernels, but may be needed by rou
++ Number of references to this route. (Not used in the Linux kernel.)
++ .TP
++ .B Use
++-Count of lookups for the route.  Depending on the use of -F and -C this will
++-be either route cache misses (-F) or hits (-C).
+++Count of lookups for the route.  Depending on the use of \-F and \-C this will
+++be either route cache misses (\-F) or hits (\-C).
++ .TP
++ .B Iface
++ Interface to which packets for this route will be sent.
++ .TP
++ .B MSS 
++-Default maximum segement size for TCP connections over this route.
+++Default maximum segment size for TCP connections over this route.
++ .TP
++ .B Window  
++ Default window size for TCP connections over this route.
++@@ -323,4 +326,4 @@ for Linux was originally written by Fred
++ Linus Torvalds for pl15. Alan Cox added the mss and window options for
++ Linux 1.1.22. irtt support and merged with netstat from Bernd Eckenfels.
++ .SH AUTHOR
++-Currently maintained by Phil Blundell <Philip.Blundell@pobox.com>.
+++Currently maintained by Phil Blundell <Philip.Blundell@pobox.com> and Bernd Eckenfels <net-tools@lina.inka.de>.
++Index: net-tools/man/en_US/slattach.8
++===================================================================
++--- net-tools.orig/man/en_US/slattach.8
+++++ net-tools/man/en_US/slattach.8
++@@ -1,8 +1,8 @@
++-.TH SLATTACH 8 "12 Feb 1994" "" ""
+++.TH SLATTACH 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
++ .SH NAME
++ slattach \- attach a network interface to a serial line
++ .SH SYNOPSIS
++-.B "slattach [-dehlLmnqv] [-c command] [-p proto] [-s speed] [tty]"
+++.B "slattach [\-dehlLmnqv] [\-c command] [\-p proto] [\-s speed] [tty]"
++ .br
++ .SH DESCRIPTION
++ .B Slattach
++@@ -11,47 +11,48 @@ is a tiny little program that can be use
++ you to use it for point-to-point links to other computers.
++ .SH OPTIONS
++ .TP
++-.B "[-c command]"
+++.B "[\-c command]"
++ Execute
++ .B command
++ when the line is hung up. This can be used to run scripts or re-establish
++ connections when a link goes down.
++ .TP
++-.B "[-d]"
+++.B "[\-d]"
++ Enable debugging output.  Useful when determining why a given
++ setup doesn't work.
++ .TP
++-.B "[-h]"
+++.B "[\-h]"
++ Exit when the carrier is lost. This works on both /dev/tty and /dev/cua
++ devices by directly monitoring the carrier status every 15 seconds.
++-.B "[-v]"
+++.TP
+++.B "[\-v]"
++ Enable verbose output.  Useful in shell scripts.
++ .TP
++-.B "[-q]"
+++.B "[\-q]"
++ Operate in quiet mode - no messages at all.
++ .TP
++-.B "[-l]"
+++.B "[\-l]"
++ Create an UUCP-style lockfile for the device in /var/lock.
++ .TP
++-.B "[-n]"
+++.B "[\-n]"
++ Equivalent to the "mesg n" command.
++ .TP
++-.B "[-m]"
+++.B "[\-m]"
++ Do \fBnot\fP initialize the line into 8 bits raw mode.
++ .TP
++-.B "[-e]"
+++.B "[\-e]"
++ Exit right after initializing device, instead of waiting for the
++-line to hangup.
+++line to hang up.
++ .TP
++-.B "[-L]"
+++.B "[\-L]"
++ Enable 3 wire operation. The terminal is moved into CLOCAL mode, 
++ carrier watching is disabled.
++ .TP
++-.B "[-p proto]"
+++.B "[\-p proto]"
++ Set a specific kind of protocol to use on the line.  The default
++ is set to
++-.B "cslip"
++-, i.e. compressed SLIP.  Other possible values are
+++.BR "cslip" ,
+++i.e. compressed SLIP.  Other possible values are
++ .B "slip"
++ (normal SLIP), 
++ .B "adaptive"
++@@ -70,7 +71,7 @@ to be active on the line. For kiss conne
++ .B axattach
++ program should be used.
++ .TP
++-.B "[-s speed]"
+++.B "[\-s speed]"
++ Set a specific line speed, other than the default.
++ .PP
++ If no arguments are given, the current terminal line (usually: the
++Index: net-tools/man/fr_FR/arp.8
++===================================================================
++--- net-tools.orig/man/fr_FR/arp.8
+++++ net-tools/man/fr_FR/arp.8
++@@ -140,8 +140,8 @@ pour un sous réseau entier.
++ Similaire à l'option 
++ .B \-s
++ , mais cette fois les informations d'adresses sont prises dans le fichier
++-.B nom_de_fichier
++-. Ceci peut être utilisé si les entrées ARP à configurer sont
+++.BR nom_de_fichier .
+++Ceci peut être utilisé si les entrées ARP à configurer sont
++ nombreuses.  Le nom du fichier de données est très souvent nommé
++ .B /etc/ethers
++ , mais ce n'est pas officiel.
++@@ -160,8 +160,8 @@ en notation décimale pointée.
++ .LP
++ Chaque entrée complète se trouvant dans le cache ARP est marquée de
++ l'indicateur
++-.B C
++-. Les entrées permanentes sont marquées de l'indicateur
+++.BR C .
+++Les entrées permanentes sont marquées de l'indicateur
++ .B M
++ et les entrées 'pub' ont l'indicateur
++ .B P
++Index: net-tools/man/fr_FR/hostname.1
++===================================================================
++--- net-tools.orig/man/fr_FR/hostname.1
+++++ net-tools/man/fr_FR/hostname.1
++@@ -84,8 +84,8 @@ Appelé sans argument, le programme affic
++ .LP
++ .B hostname
++ fournit le nom du système tel qu'il est retourné par la fonction
++-.BR getdomainname (2)
++-. Ceci est connu comme nom de domaine YP/NIS du système.
+++.BR getdomainname (2).
+++Ceci est connu comme nom de domaine YP/NIS du système.
++ 
++ 
++ .LP
++@@ -145,8 +145,8 @@ Le nom de domaine DNS est la partie suiv
++ .LP
++ La façon dont vous pouvez le changer dépend de la configuration
++ (habituellement dans 
++-.IR /etc/host.conf )
++-. Si le fichier 'hosts' est analysé avant d'interroger le DNS ou 
+++.IR /etc/host.conf ).
+++Si le fichier 'hosts' est analysé avant d'interroger le DNS ou 
++ NIS) vous pouvez le changer dans le fichier 
++ .IR /etc/hosts .
++ 
++Index: net-tools/man/fr_FR/ifconfig.8
++===================================================================
++--- net-tools.orig/man/fr_FR/ifconfig.8
+++++ net-tools/man/fr_FR/ifconfig.8
++@@ -60,14 +60,14 @@ le signe moins (\-) est présent, l'optio
++ .TP
++ .B "[\-]promisc"
++ Valide ou invalide le mode
++-.B promiscuous
++-.  S'il est validé, tous les paquets circulant sur le réseau
+++.BR promiscuous .
+++S'il est validé, tous les paquets circulant sur le réseau
++ seront reçus sur cette interface.
++ .TP
++ .B "[\-]allmulti"
++ Valide ou invalide le fonctionnement de l'interface en mode
++-.B all-multicast
++-.  S'il est validé, tous les paquets multicast circulant sur le réseau
+++.BR all-multicast .
+++S'il est validé, tous les paquets multicast circulant sur le réseau
++ seront reçus sur cette interface.
++ .TP
++ .B "metric N"
++Index: net-tools/man/fr_FR/netstat.8
++===================================================================
++--- net-tools.orig/man/fr_FR/netstat.8
+++++ net-tools/man/fr_FR/netstat.8
++@@ -8,7 +8,7 @@
++ .\" Modified: Tuan Hoang tuan@optimus.mitre.org 
++ .\"
++ .\"
++-.TH NETSTAT 8 "25 Fév 1999" "net-tools" "Linux Programmer's Manual"
+++.TH NETSTAT 8 "2007-12-02" "net-tools" "Linux Programmer's Manual"
++ 
++ .SH NAME
++ netstat \- Affiche les connexions réseau, les tables de routage, les
++@@ -106,7 +106,7 @@ Veuillez consulter
++ .BR route (8)
++ pour plus de détails.
++ 
++-.SS "\-i, \-\-interface \fIiface\fI"
+++.SS "\-i, \-\-interfaces \fIiface\fI"
++ Si vous utilisez l'option
++ .BR -i ", " --interfaces
++ , une table de toutes (ou de l'interface
++@@ -118,8 +118,8 @@ même que celui de la commande
++ .BR ifconfig (8).
++ .B "netstat -ei"
++ affiche une table ou une seule entrée d'interface comme la commande 
++-.B ifconfig
++-. Avec le paramètre
+++.BR ifconfig .
+++Avec le paramètre
++ .B -a
++ , vous pouvez inclure les interfaces qui ne sont pas configurées (c.a.d qui
++ n'ont pas l'indicateur
++@@ -249,7 +249,7 @@ La socket attend le traitement de tous l
++ avant d'entreprendre la fermeture.
++ .TP
++ .I
++-CLOSED
+++CLOSE
++ La socket n'est pas utilisée.
++ .TP
++ .I
++@@ -409,8 +409,7 @@ Affiche le chemin correspondant à l'atta
++ Depuis la version 2.2 du noyau, netstat -i n'affiche plus les statistiques
++ des interfaces alias. Pour obtenir les compteurs par interface alias, vous
++ devez définir des règles spécifiques à l'aide de la commande
++-.BR ipchains(8) 
++-.  
+++.BR ipchains (8).
++ 
++ .SH FICHIERS
++ .ta
++Index: net-tools/man/fr_FR/rarp.8
++===================================================================
++--- net-tools.orig/man/fr_FR/rarp.8
+++++ net-tools/man/fr_FR/rarp.8
++@@ -55,8 +55,8 @@ Supprime toutes les entrées RARP relativ
++ Crée manuellement une correspondance d'adresses RARP pour l'hôte
++ .B nom_d_hôte
++ avec l'adresse matérielle
++-.B adr_materielle
++-. Le format de l'adresse matérielle est dépendant du matériel,
+++.BR adr_materielle .
+++Le format de l'adresse matérielle est dépendant du matériel,
++ mais pour la plupart on peut considérer que la présentation classique
++ peut être utilisée.  Pour la classe Ethernet, c'est 6 octets en hexadécimal,
++ séparés par des double-points.
++Index: net-tools/man/pt_BR/netstat.8
++===================================================================
++--- net-tools.orig/man/pt_BR/netstat.8
+++++ net-tools/man/pt_BR/netstat.8
++@@ -8,7 +8,7 @@
++ .\" Traduzido para português por Arnaldo Carvalho de Melo <acme@conectiva.com.br>
++ .\" Revisado por Jorge Luiz Godoy Filho <jorge@bestway.com.br>
++ .\"
++-.TH NETSTAT 8 "19 de maio de 1997" "net-tools" "Manual do Programador Linux"
+++.TH NETSTAT 8 "2007-12-02" "net-tools" "Manual do Programador Linux"
++ 
++ .SH NOME
++ netstat \- Mostra conexões de rede, tabelas de roteamento, estatísticas de interface e conexões
++@@ -97,7 +97,7 @@ Por favor veja
++ .BR route (8)
++ para maiores detalhes.
++ 
++-.SS "\-i, \-\-interface \fIiface\fI"
+++.SS "\-i, \-\-interfaces \fIiface\fI"
++ Se você usar a opção
++ .BR -i ", " --interfaces
++ , uma tabela de todas (ou da
++Index: net-tools/man/pt_BR/rarp.8
++===================================================================
++--- net-tools.orig/man/pt_BR/rarp.8
+++++ net-tools/man/pt_BR/rarp.8
++@@ -50,8 +50,8 @@ máquina indicada for desligada, por exem
++ Cria um mapeamento de endereços RARP para a máquina
++ .B máquina
++ com endereço de hardware configurado para
++-.B endereço_hardware
++-.  O formato do endereço de hardware depende da classe do hardware, mas
+++.B endereço_hardware.
+++O formato do endereço de hardware depende da classe do hardware, mas
++ para a maioria das classes você pode assumir que a apresentação usual pode
++ ser usada.  Para a classe Ethernet, são 6 bytes em hexadecimal, separados
++ por dois pontos (:).
+--- net-tools-1.60.orig/debian/patches/translations.patch
++++ net-tools-1.60/debian/patches/translations.patch
+@@ -0,0 +1,24458 @@
++Probably unsyncable changes, extracted from diff.gz
++
++Index: net-tools/po/pt_BR.po
++===================================================================
++--- net-tools.orig/po/pt_BR.po
+++++ net-tools/po/pt_BR.po
++@@ -10,275 +10,287 @@
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: net-tools 1.54\n"
++-"POT-Creation-Date: 2000-02-14 02:31+0100\n"
+++"Report-Msgid-Bugs-To: \n"
+++"POT-Creation-Date: 2007-06-30 12:28+0900\n"
++ "PO-Revision-Date: 1999-03-01 02:38+0100\n"
++ "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
++ "MIME-Version: 1.0\n"
++-"Content-Type: text/plain; charset=ISO8859-9\n"
+++"Content-Type: text/plain; charset=ISO-8859-9\n"
++ "Content-Transfer-Encoding: 8bit\n"
++ 
++-#: ../arp.c:110 ../arp.c:269
+++#: ../arp.c:112 ../arp.c:279
+++#, c-format
++ msgid "arp: need host name\n"
++ msgstr "arp: preciso do nome da máquina\n"
++ 
++-#: ../arp.c:207 ../arp.c:221
+++#: ../arp.c:215 ../arp.c:230
++ #, c-format
++ msgid "No ARP entry for %s\n"
++ msgstr "Nenhuma entrada ARP para %s\n"
++ 
++-#: ../arp.c:239
+++#: ../arp.c:248
++ #, c-format
++ msgid "arp: cant get HW-Address for `%s': %s.\n"
++ msgstr "arp: não foi possível obter o endereço de hardware para `%s': %s.\n"
++ 
++-#: ../arp.c:243
+++#: ../arp.c:252
+++#, c-format
++ msgid "arp: protocol type mismatch.\n"
++ msgstr "arp: erro no tipo do protocolo.\n"
++ 
++-#: ../arp.c:252
+++#: ../arp.c:261
++ #, c-format
++ msgid "arp: device `%s' has HW address %s `%s'.\n"
++ msgstr "arp: o dispositivo `%s' tem endereço de hardware %s `%s'.\n"
++ 
++-#: ../arp.c:282
+++#: ../arp.c:293
+++#, c-format
++ msgid "arp: need hardware address\n"
++ msgstr "arp: preciso do endereço de hardware\n"
++ 
++-#: ../arp.c:290
+++#: ../arp.c:301
+++#, c-format
++ msgid "arp: invalid hardware address\n"
++ msgstr "arp: endereço inválido de hardware\n"
++ 
++-#: ../arp.c:387
+++#: ../arp.c:398
++ #, c-format
++ msgid "arp: cannot open etherfile %s !\n"
++ msgstr "arp: não foi possível abrir o arquivo etherfile %s!\n"
++ 
++-#: ../arp.c:403
+++#: ../arp.c:414
++ #, c-format
++ msgid "arp: format error on line %u of etherfile %s !\n"
++ msgstr "arp: erro de formato na linha %u do arquivo etherfile %s!\n"
++ 
++-#: ../arp.c:416
+++#: ../arp.c:427
++ #, c-format
++ msgid "arp: cannot set entry on line %u of etherfile %s !\n"
++ msgstr "arp: não foi possível configurar a linha %u do arquivo etherfile %s!\n"
++ 
++-#: ../arp.c:437
++-msgid "Address\t\t\tHWtype\tHWaddress\t    Flags Mask\t\t  Iface\n"
+++#: ../arp.c:448
+++#, fuzzy, c-format
+++msgid ""
+++"Address                  HWtype  HWaddress           Flags Mask            "
+++"Iface\n"
++ msgstr "Endereço\t\tTipoHW\tEndereçoHW\t Flags Mascara\t\t Iface\n"
++ 
++-#: ../arp.c:467
+++#: ../arp.c:476
+++#, fuzzy
+++msgid "<from_interface>"
+++msgstr "%s: interface desconhecida.\n"
+++
+++#: ../arp.c:478
++ msgid "(incomplete)"
++ msgstr "(incompleto)"
++ 
++-#: ../arp.c:484
+++#: ../arp.c:495
++ #, c-format
++ msgid "%s (%s) at "
++ msgstr "%s (%s) em "
++ 
++-#: ../arp.c:490
+++#: ../arp.c:501
+++#, c-format
++ msgid "<incomplete> "
++ msgstr "<incompleto> "
++ 
++-#: ../arp.c:496
+++#: ../arp.c:507
++ #, c-format
++ msgid "netmask %s "
++ msgstr "mascara %s "
++ 
++-#: ../arp.c:513
+++#: ../arp.c:524
++ #, c-format
++ msgid "on %s\n"
++ msgstr "em %s\n"
++ 
++-#: ../arp.c:592
+++#: ../arp.c:605
++ #, c-format
++ msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
++ msgstr "Entradas: %d\tIgnorada: %d\tEncontrada: %d\n"
++ 
++-#: ../arp.c:596
+++#: ../arp.c:609
++ #, c-format
++ msgid "%s (%s) -- no entry\n"
++ msgstr "%s (%s) -- nenhuma entrada\n"
++ 
++-#: ../arp.c:598
+++#: ../arp.c:611
++ #, c-format
++ msgid "arp: in %d entries no match found.\n"
++ msgstr "arp: em %d entradas não foi encontrado.\n"
++ 
++-#: ../arp.c:613
+++#: ../arp.c:626
+++#, c-format
++ msgid ""
++ "Usage:\n"
++ "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
++ "cache\n"
++ msgstr ""
++ "Uso:\n"
++-"  arp [-vn]  [<HW>] [-i <if>] [-a] [<máquina>]             <-Mostra cache "
++-"ARP\n"
+++"  arp [-vn]  [<HW>] [-i <if>] [-a] [<máquina>]             <-Mostra cache ARP\n"
++ 
++-#: ../arp.c:614
+++#: ../arp.c:627
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP "
+++"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
++ "entry\n"
++-msgstr ""
++-"  arp [-v]          [-i <if>] -d  <máquina>  [pub][nopub]  <-Remove entrada "
++-"ARP\n"
+++msgstr "  arp [-v]          [-i <if>] -d  <máquina>  [pub][nopub]  <-Remove entrada ARP\n"
++ 
++-#: ../arp.c:615
+++#: ../arp.c:628
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from "
+++"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
++ "file\n"
++ msgstr ""
++ "  arp [-vnD] [<HW>] [-i <if>] -f  [<arquivo>]         <-Inclui entrada de "
++ "arquivo\n"
++ 
++-#: ../arp.c:616
+++#: ../arp.c:629
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add "
+++"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
++ "entry\n"
++-msgstr ""
++-"  arp [-v] [<HW>] [-i <if>] -s <máquina> <end_hw> [temp][nopub] <-Inc. "
++-"Entrada\n"
++-
++-#: ../arp.c:617
++-msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
++-"<-''-\n"
++-msgstr ""
++-"  arp [-v]   [<HW>] [-i <if>] -s  <máquina> <end_hw>  [netmask <nm>] pub  "
++-"<-''-\n"
+++msgstr "  arp [-v] [<HW>] [-i <if>] -s <máquina> <end_hw> [temp][nopub] <-Inc. Entrada\n"
++ 
++-#: ../arp.c:618
+++#: ../arp.c:630
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      "
+++"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
++ "<-''-\n"
++ "\n"
++-msgstr ""
++-"  arp [-v]   [<HW>] [-i <if>] -Ds <máquina>  <if> [netmask <nm>] pub      "
++-"<-''-\n"
+++msgstr "  arp [-v]   [<HW>] [-i <if>] -Ds <máquina>  <if> [netmask <nm>] pub      <-''-\n"
++ 
++-#: ../arp.c:620
+++#: ../arp.c:632
+++#, c-format
++ msgid ""
++ "        -a                       display (all) hosts in alternative (BSD) "
++ "style\n"
++-msgstr ""
++-"        -a               mostra (todas as) máquinas no estilo alternativo "
++-"(BSD)\n"
+++msgstr "        -a               mostra (todas as) máquinas no estilo alternativo (BSD)\n"
++ 
++-#: ../arp.c:621
+++#: ../arp.c:633
+++#, c-format
++ msgid "        -s, --set                set a new ARP entry\n"
++ msgstr "        -s, --set                define uma nova entrada ARP\n"
++ 
++-#: ../arp.c:622
+++#: ../arp.c:634
+++#, c-format
++ msgid "        -d, --delete             delete a specified entry\n"
++ msgstr "        -d, --delete             remove a entrada especificada\n"
++ 
++-#: ../arp.c:623 ../netstat.c:1436 ../route.c:85
+++#: ../arp.c:635 ../netstat.c:1503 ../route.c:86
+++#, c-format
++ msgid "        -v, --verbose            be verbose\n"
++ msgstr "        -v, --verbose           listagem detalhada\n"
++ 
++-#: ../arp.c:624 ../netstat.c:1437 ../route.c:86
++-msgid "        -n, --numeric            dont resolve names\n"
+++#: ../arp.c:636 ../netstat.c:1504 ../route.c:87
+++#, fuzzy, c-format
+++msgid "        -n, --numeric            don't resolve names\n"
++ msgstr "        -n, --numeric           não resolve nomes\n"
++ 
++-#: ../arp.c:625
+++#: ../arp.c:637
+++#, c-format
++ msgid ""
++ "        -i, --device             specify network interface (e.g. eth0)\n"
++ msgstr ""
++ "        -i, --device             especifica a interface de rede (ex: eth0)\n"
++ 
++-#: ../arp.c:626
+++#: ../arp.c:638
+++#, c-format
++ msgid "        -D, --use-device         read <hwaddr> from given device\n"
++ msgstr "        -D, --use-device         leia <hwaddr> de um dispositivo\n"
++ 
++-#: ../arp.c:627
+++#: ../arp.c:639
+++#, c-format
++ msgid "        -A, -p, --protocol       specify protocol family\n"
++ msgstr "        -A, -p, --protocol       especifica a família de protocolos\n"
++ 
++-#: ../arp.c:628
+++#: ../arp.c:640
+++#, c-format
++ msgid ""
++-"        -f, --file               read new entries from file or from "
++-"/etc/ethers\n"
+++"        -f, --file               read new entries from file or from /etc/"
+++"ethers\n"
++ "\n"
++ msgstr ""
++-"        -f, --file             leia novas entradas de arquivo ou de "
++-"/etc/ethers\n"
+++"        -f, --file             leia novas entradas de arquivo ou de /etc/"
+++"ethers\n"
++ "\n"
++ 
++-#: ../arp.c:630 ../rarp.c:181
+++#: ../arp.c:642 ../rarp.c:182
++ #, c-format
++ msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
++-msgstr ""
++-" <HW>=Use '-H <hw>' para especificar o tipo de endereço de hw. Default: %s\n"
+++msgstr " <HW>=Use '-H <hw>' para especificar o tipo de endereço de hw. Default: %s\n"
++ 
++-#: ../arp.c:631 ../rarp.c:182
+++#: ../arp.c:643 ../rarp.c:183
+++#, c-format
++ msgid "  List of possible hardware types (which support ARP):\n"
++ msgstr "  Lista dos tipos de hardware possíveis (que suportam ARP):\n"
++ 
++-#: ../arp.c:664
+++#: ../arp.c:677 ../arp.c:762
++ #, c-format
++ msgid "%s: hardware type not supported!\n"
++ msgstr "%s: tipo de hardware não suportado!\n"
++ 
++-#: ../arp.c:668
+++#: ../arp.c:681
++ #, c-format
++ msgid "%s: address family not supported!\n"
++ msgstr "%s: família de endereços não suportada!\n"
++ 
++-#: ../arp.c:703
+++#: ../arp.c:716
+++#, c-format
++ msgid "arp: -N not yet supported.\n"
++ msgstr "arp: -N ainda não suportada.\n"
++ 
++-#: ../arp.c:713
+++#: ../arp.c:726
++ #, c-format
++ msgid "arp: %s: unknown address family.\n"
++ msgstr "arp: %s: família de endereços desconhecida.\n"
++ 
++-#: ../arp.c:722
+++#: ../arp.c:735
++ #, c-format
++ msgid "arp: %s: unknown hardware type.\n"
++ msgstr "arp: %s: tipo de hardware desconhecido.\n"
++ 
++-#: ../arp.c:741
+++#: ../arp.c:754
++ #, c-format
++ msgid "arp: %s: kernel only supports 'inet'.\n"
++ msgstr "arp: %s: kernel somente suporta ínet'.\n"
++ 
++-#: ../arp.c:746
+++#: ../arp.c:767
++ #, c-format
++ msgid "arp: %s: hardware type without ARP support.\n"
++ msgstr "arp: %s: tipo de hardware sem suporte a ARP.\n"
++ 
++-#: ../hostname.c:69
+++#: ../hostname.c:71
++ #, c-format
++ msgid "Setting nodename to `%s'\n"
++ msgstr "Configurando nome do nó como `%s'\n"
++ 
++-#: ../hostname.c:74
+++#: ../hostname.c:76
++ #, c-format
++ msgid "%s: you must be root to change the node name\n"
++ msgstr "%s: você deve ser root para mudar o nome do nó\n"
++ 
++-#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116
+++#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117
++ #, c-format
++ msgid "%s: name too long\n"
++ msgstr "%s: nome muito longo\n"
++ 
++-#: ../hostname.c:89
+++#: ../hostname.c:91
++ #, c-format
++ msgid "Setting hostname to `%s'\n"
++ msgstr "Configurando nome da máquina para `%s'\n"
++ 
++-#: ../hostname.c:94
+++#: ../hostname.c:96
++ #, c-format
++ msgid "%s: you must be root to change the host name\n"
++ msgstr "%s: você deve ser root para mudar o nome da máquina\n"
++ 
++-#: ../hostname.c:108
+++#: ../hostname.c:109
++ #, c-format
++ msgid "Setting domainname to `%s'\n"
++ msgstr "Configurando nome do domínio para `%s'\n"
++ 
++-#: ../hostname.c:113
+++#: ../hostname.c:114
++ #, c-format
++ msgid "%s: you must be root to change the domain name\n"
++ msgstr "%s: você deve ser root para mudar o nome do domínio\n"
++@@ -303,37 +315,38 @@ msgstr "Resultado: h_aliases=`%s'\n"
++ msgid "Result: h_addr_list=`%s'\n"
++ msgstr "Resultado: h_addr_list=`%s'\n"
++ 
++-#: ../hostname.c:209
+++#: ../hostname.c:208
++ #, c-format
++ msgid "%s: can't open `%s'\n"
++ msgstr "%s: não foi possível abrir `%s'\n"
++ 
++-#: ../hostname.c:223
+++#: ../hostname.c:222
+++#, c-format
++ msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
++-msgstr ""
++-"Uso: hostname [-v] {máquina|-F arquivo}       configura nome da máquina (de "
++-"arquivo)\n"
+++msgstr "Uso: hostname [-v] {máquina|-F arquivo}       configura nome da máquina (de arquivo)\n"
++ 
++-#: ../hostname.c:224
+++#: ../hostname.c:223
+++#, c-format
++ msgid ""
++ "       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
++ msgstr ""
++ "       domainname [-v] {domínio_nis|-F file} configura nome do domínio NIS\n"
++ "                                             (a partir de arquivo)\n"
++ 
++-#: ../hostname.c:226
+++#: ../hostname.c:225
+++#, c-format
++ msgid ""
++ "       nodename [-v] {nodename|-F file}      set DECnet node name (from "
++ "file)\n"
++-msgstr ""
++-"Uso: hostname [-v] {máquina|-F arquivo}   configura o nome do nó DECnet (de "
++-"arquivo)\n"
+++msgstr "Uso: hostname [-v] {máquina|-F arquivo}   configura o nome do nó DECnet (de arquivo)\n"
++ 
++-#: ../hostname.c:228
+++#: ../hostname.c:227
+++#, c-format
++ msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
++ msgstr "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  mostra nome formatado\n"
++ 
++-#: ../hostname.c:229
+++#: ../hostname.c:228
+++#, c-format
++ msgid ""
++ "       hostname [-v]                         display hostname\n"
++ "\n"
++@@ -341,7 +354,8 @@ msgstr ""
++ "     hostname [-v]                            mostra nome da máquina\n"
++ "\n"
++ 
++-#: ../hostname.c:230
+++#: ../hostname.c:229
+++#, c-format
++ msgid ""
++ "       hostname -V|--version|-h|--help       print info and exit\n"
++ "\n"
++@@ -349,7 +363,8 @@ msgstr ""
++ "     hostname -V|--version|-h|--help          mostra informações e termina\n"
++ "\n"
++ 
++-#: ../hostname.c:231
+++#: ../hostname.c:230
+++#, c-format
++ msgid ""
++ "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
++ "\n"
++@@ -357,35 +372,43 @@ msgstr ""
++ "    dnsdomainname=máquina -d, {yp,nis,}domainname=hostname -y\n"
++ "\n"
++ 
++-#: ../hostname.c:232
+++#: ../hostname.c:231
+++#, c-format
++ msgid "    -s, --short           short host name\n"
++ msgstr "    -s, --short           nome curto da máquina\n"
++ 
++-#: ../hostname.c:233
+++#: ../hostname.c:232
+++#, c-format
++ msgid "    -a, --alias           alias names\n"
++ msgstr "    -a, --alias           aliases para a máquina\n"
++ 
++-#: ../hostname.c:234
+++#: ../hostname.c:233
+++#, c-format
++ msgid "    -i, --ip-address      addresses for the hostname\n"
++ msgstr "    -i, --ip-address      endereços da máquina\n"
++ 
++-#: ../hostname.c:235
+++#: ../hostname.c:234
+++#, c-format
++ msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
++ msgstr "    -f, --fqdn, --long    nome longo da máquina (FQDN)\n"
++ 
++-#: ../hostname.c:236
+++#: ../hostname.c:235
+++#, c-format
++ msgid "    -d, --domain          DNS domain name\n"
++ msgstr "    -d, --domain          nome do domínio DNS\n"
++ 
++-#: ../hostname.c:237
+++#: ../hostname.c:236
+++#, c-format
++ msgid "    -y, --yp, --nis       NIS/YP domainname\n"
++ msgstr "    -y, --yp, --nis       nome do domínio NIS/YP\n"
++ 
++-#: ../hostname.c:239
+++#: ../hostname.c:238
+++#, c-format
++ msgid "    -n, --node            DECnet node name\n"
++ msgstr "    -n, --node            nome do nó DECnet\n"
++ 
++-#: ../hostname.c:241
+++#: ../hostname.c:240
+++#, c-format
++ msgid ""
++ "    -F, --file            read hostname or NIS domainname from given file\n"
++ "\n"
++@@ -393,7 +416,8 @@ msgstr ""
++ "    -F, --file            leia o nome da máquina ou domínio NIS do arquivo\n"
++ "\n"
++ 
++-#: ../hostname.c:243
+++#: ../hostname.c:242
+++#, c-format
++ msgid ""
++ "   This command can read or set the hostname or the NIS domainname. You can\n"
++ "   also read the DNS domain or the FQDN (fully qualified domain name).\n"
++@@ -413,15 +437,16 @@ msgid "%s: You can't change the DNS doma
++ msgstr "%s: Você não pode mudar o nome do domínio DNS com este comando\n"
++ 
++ #: ../hostname.c:339
+++#, c-format
++ msgid ""
++ "\n"
++ "Unless you are using bind or NIS for host lookups you can change the DNS\n"
++ msgstr ""
++ "\n"
++-"A menos que esteja usando bind ou NIS para resolução de nomes você pode "
++-"mudar\n"
+++"A menos que esteja usando bind ou NIS para resolução de nomes você pode mudar\n"
++ 
++ #: ../hostname.c:340
+++#, c-format
++ msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
++ msgstr "o nome do domínio DNS (que é parte do FQDN) no arquivo /etc/hosts.\n"
++ 
++@@ -440,552 +465,453 @@ msgstr "getdomainname()=`%s'\n"
++ msgid "getnodename()=`%s'\n"
++ msgstr "getnodename()=`%s'\n"
++ 
++-#: ../ifconfig.c:159
++-#, c-format
++-msgid "%-9.9s Link encap:%s  "
++-msgstr "%-9.9s  Encapsulamento do Link: %s  "
+++#: ../ifconfig.c:107
+++#, fuzzy, c-format
+++msgid ""
+++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
+++"Flg\n"
+++msgstr "Iface     MTU Met  RX-OK RX-ERR RX-DRP RX-OVR  TX-OK TX-ERR TX-DRP TX-OV Opções\n"
++ 
++-#: ../ifconfig.c:164
++-#, c-format
++-msgid "HWaddr %s  "
++-msgstr "Endereço de HW %s  "
+++#: ../ifconfig.c:129 ../ifconfig.c:161
+++#, fuzzy, c-format
+++msgid "%s: ERROR while getting interface flags: %s\n"
+++msgstr ""
+++"%s: erro obtendo informações da interface: %s\n"
+++"\n"
++ 
++-#: ../ifconfig.c:167
+++#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
+++#: ../ifconfig.c:973
++ #, c-format
++-msgid "Media:%s"
++-msgstr "Mídia:%s"
+++msgid "No support for INET on this system.\n"
+++msgstr "Este sistema não tem suporte a INET.\n"
++ 
++-#: ../ifconfig.c:169
++-msgid "(auto)"
++-msgstr "(auto)"
+++#: ../ifconfig.c:193
+++#, fuzzy, c-format
+++msgid "%s: ERROR while testing interface flags: %s\n"
+++msgstr ""
+++"%s: erro obtendo informações da interface: %s\n"
+++"\n"
++ 
++-#: ../ifconfig.c:176
++-#, c-format
++-msgid "          %s addr:%s "
++-msgstr "          %s end.: %s "
+++#: ../ifconfig.c:202
+++#, fuzzy, c-format
+++msgid ""
+++"Usage:\n"
+++"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
+++msgstr ""
+++"Uso:\n"
+++"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <endereço>]\n"
++ 
++-#: ../ifconfig.c:179
+++#: ../ifconfig.c:204
++ #, c-format
++-msgid " P-t-P:%s "
++-msgstr " P-a-P:%s "
+++msgid "  [add <address>[/<prefixlen>]]\n"
+++msgstr "  [add <endereço>[/<tam_prefixo>]]\n"
++ 
++-#: ../ifconfig.c:182
+++#: ../ifconfig.c:205
++ #, c-format
++-msgid " Bcast:%s "
++-msgstr " Bcast:%s "
+++msgid "  [del <address>[/<prefixlen>]]\n"
+++msgstr "  [del <endereço>[/<tam_prefixo>]]\n"
++ 
++-#: ../ifconfig.c:184
+++#: ../ifconfig.c:206
++ #, c-format
++-msgid " Mask:%s\n"
++-msgstr " Masc:%s\n"
+++msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
+++msgstr "  [[-]broadcast [<endereço>]]  [[-]pointopoint [<endereço>]]\n"
++ 
++-#: ../ifconfig.c:201
+++#: ../ifconfig.c:207
++ #, c-format
++-msgid "          inet6 addr: %s/%d"
++-msgstr "          endereço inet6: %s/%d"
++-
++-#: ../ifconfig.c:203
++-msgid " Scope:"
++-msgstr " Escopo:"
++-
++-#: ../ifconfig.c:206
++-msgid "Global"
++-msgstr "Global"
+++msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
+++msgstr "  [netmask <endereço>]  [dstaddr <endereço>]  [tunnel <endereço>]\n"
++ 
++-#: ../ifconfig.c:209
++-msgid "Link"
++-msgstr "Link"
+++#: ../ifconfig.c:210
+++#, c-format
+++msgid "  [outfill <NN>] [keepalive <NN>]\n"
+++msgstr "  [outfill <NN>] [keepalive <NN>]\n"
++ 
++ #: ../ifconfig.c:212
++-msgid "Site"
++-msgstr "Site"
++-
++-#: ../ifconfig.c:215
++-msgid "Compat"
++-msgstr "Compat"
++-
++-#: ../ifconfig.c:218
++-msgid "Host"
++-msgstr "Máquina"
++-
++-#: ../ifconfig.c:221
++-msgid "Unknown"
++-msgstr "Desconhecido"
++-
++-#: ../ifconfig.c:236
++ #, c-format
++-msgid "          IPX/Ethernet II addr:%s\n"
++-msgstr "      Endereço IPX/Ethernet II:%s\n"
+++msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
+++msgstr "  [hw <HW> <endereço>]  [metric <NN>]  [mtu <NN>]\n"
++ 
++-#: ../ifconfig.c:239
+++#: ../ifconfig.c:213
++ #, c-format
++-msgid "          IPX/Ethernet SNAP addr:%s\n"
++-msgstr "      Endereço IPX/Ethernet SNAP:%s\n"
+++msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
+++msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
++ 
++-#: ../ifconfig.c:242
+++#: ../ifconfig.c:214
++ #, c-format
++-msgid "          IPX/Ethernet 802.2 addr:%s\n"
++-msgstr "      Endereço IPX/Ethernet 802.2:%s\n"
+++msgid "  [multicast]  [[-]promisc]\n"
+++msgstr "  [multicast]  [[-]promisc]\n"
++ 
++-#: ../ifconfig.c:245
+++#: ../ifconfig.c:215
++ #, c-format
++-msgid "          IPX/Ethernet 802.3 addr:%s\n"
++-msgstr "      Endereço IPX/Ethernet 802.3:%s\n"
+++msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
+++msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <tipo>]\n"
++ 
++-#: ../ifconfig.c:255
+++#: ../ifconfig.c:217
++ #, c-format
++-msgid "          EtherTalk Phase 2 addr:%s\n"
++-msgstr "          Endereço EtherTalk fase 2:%s\n"
+++msgid "  [txqueuelen <NN>]\n"
+++msgstr "  [txqueuelen <NN>]\n"
++ 
++-#: ../ifconfig.c:264
+++#: ../ifconfig.c:220
++ #, c-format
++-msgid "          econet addr:%s\n"
++-msgstr "          Endereço econet:%s\n"
++-
++-#: ../ifconfig.c:270
++-msgid "[NO FLAGS] "
++-msgstr "[NENHUMA FLAG] "
++-
++-#: ../ifconfig.c:272
++-msgid "UP "
++-msgstr "UP "
++-
++-#: ../ifconfig.c:274
++-msgid "BROADCAST "
++-msgstr "BROADCAST"
++-
++-#: ../ifconfig.c:276
++-msgid "DEBUG "
++-msgstr "DEBUG "
++-
++-#: ../ifconfig.c:278
++-msgid "LOOPBACK "
++-msgstr "LOOPBACK"
++-
++-#: ../ifconfig.c:280
++-msgid "POINTOPOINT "
++-msgstr "POINTOPOINT "
++-
++-#: ../ifconfig.c:282
++-msgid "NOTRAILERS "
++-msgstr "NOTRAILERS "
++-
++-#: ../ifconfig.c:284
++-msgid "RUNNING "
++-msgstr "RUNNING "
+++msgid "  [[-]dynamic]\n"
+++msgstr "  [[-]dynamic]\n"
++ 
++-#: ../ifconfig.c:286
++-msgid "NOARP "
++-msgstr "NOARP "
+++#: ../ifconfig.c:222
+++#, c-format
+++msgid ""
+++"  [up|down] ...\n"
+++"\n"
+++msgstr ""
+++"  [up|down] ...\n"
+++"\n"
++ 
++-#: ../ifconfig.c:288
++-msgid "PROMISC "
++-msgstr "PROMISC "
+++#: ../ifconfig.c:224
+++#, c-format
+++msgid "  <HW>=Hardware Type.\n"
+++msgstr "  <HW>=Tipo de Hardware.\n"
++ 
++-#: ../ifconfig.c:290
++-msgid "ALLMULTI "
++-msgstr "ALLMULTI "
+++#: ../ifconfig.c:225
+++#, c-format
+++msgid "  List of possible hardware types:\n"
+++msgstr "  Lista dos tipos possíveis de hardware:\n"
++ 
++-#: ../ifconfig.c:292
++-msgid "SLAVE "
++-msgstr "SLAVE "
+++#. 1 = ARPable
+++#: ../ifconfig.c:227
+++#, c-format
+++msgid "  <AF>=Address family. Default: %s\n"
+++msgstr "  <AF>=Família de endereços. Default: %s\n"
++ 
++-#: ../ifconfig.c:294
++-msgid "MASTER "
++-msgstr "MASTER "
+++#: ../ifconfig.c:228
+++#, c-format
+++msgid "  List of possible address families:\n"
+++msgstr "  Lista de famílias de endereços possíveis:\n"
++ 
++-#: ../ifconfig.c:296
++-msgid "MULTICAST "
++-msgstr "MULTICAST "
+++#: ../ifconfig.c:303
+++#, c-format
+++msgid "ifconfig: option `%s' not recognised.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:299
++-msgid "DYNAMIC "
++-msgstr "DYNAMIC "
+++#: ../ifconfig.c:305 ../ifconfig.c:962
+++#, c-format
+++msgid "ifconfig: `--help' gives usage information.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:302
+++#: ../ifconfig.c:380
++ #, c-format
++-msgid " MTU:%d  Metric:%d"
++-msgstr " MTU:%d  Métrica:%d"
+++msgid "Unknown media type.\n"
+++msgstr "Tipo desconhecido de mídia.\n"
++ 
++-#: ../ifconfig.c:306
+++#: ../ifconfig.c:417
++ #, c-format
++-msgid "  Outfill:%d  Keepalive:%d"
++-msgstr "  Outfill:%d  Keepalive:%d"
+++msgid ""
+++"Warning: Interface %s still in promisc mode... maybe other application is "
+++"running?\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:320
+++#: ../ifconfig.c:429
++ #, c-format
++-msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
++-msgstr "Pacotes RX:%lu erros:%lu descartados:%lu sobreposições:%lu frame:%lu\n"
+++msgid "Warning: Interface %s still in MULTICAST mode.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:325
+++#: ../ifconfig.c:441
++ #, c-format
++-msgid "             compressed:%lu\n"
++-msgstr "             compactados:%lu\n"
+++msgid "Warning: Interface %s still in ALLMULTI mode.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:329
+++#: ../ifconfig.c:465
++ #, c-format
++-msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
+++msgid "Warning: Interface %s still in DYNAMIC mode.\n"
++ msgstr ""
++-"Pacotes TX:%lu erros:%lu descartados:%lu sobreposições:%lu portadora:%lu\n"
++ 
++-#: ../ifconfig.c:333
+++#: ../ifconfig.c:523
++ #, c-format
++-msgid "          collisions:%lu "
++-msgstr "          colisões:%lu "
+++msgid "Warning: Interface %s still in BROADCAST mode.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:335
+++#: ../ifconfig.c:652
++ #, c-format
++-msgid "compressed:%lu "
++-msgstr "compactados:%lu "
+++msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:337
+++#: ../ifconfig.c:684
++ #, c-format
++-msgid "txqueuelen:%d "
++-msgstr "txqueuelen:%d "
++-
++-#: ../ifconfig.c:345
++-#, c-format
++-msgid "Interrupt:%d "
++-msgstr "IRQ:%d "
++-
++-#. Only print devices using it for
++-#. I/O maps
++-#: ../ifconfig.c:348
++-#, c-format
++-msgid "Base address:0x%x "
++-msgstr "Endereço de E/S:0x%x "
+++msgid "hw address type `%s' has no handler to set address. failed.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:350
+++#: ../ifconfig.c:693
++ #, c-format
++-msgid "Memory:%lx-%lx "
++-msgstr "Memória:%lx-%lx "
+++msgid "%s: invalid %s address.\n"
+++msgstr "%s: endereço %s inválido.\n"
++ 
++-#: ../ifconfig.c:353
+++#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
++ #, c-format
++-msgid "DMA chan:%x "
++-msgstr "Canal DMA:%x "
+++msgid "No support for INET6 on this system.\n"
+++msgstr "Este sistema não tem suporte a INET6.\n"
++ 
++-#: ../ifconfig.c:384 ../ifconfig.c:405
+++#: ../ifconfig.c:780 ../ifconfig.c:871
++ #, c-format
++-msgid "%s: unknown interface: %s\n"
++-msgstr "%s: interface desconhecida: %s\n"
++-
++-#: ../ifconfig.c:421
++-msgid ""
++-"Usage:\n"
++-"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <address>]\n"
++-msgstr ""
++-"Uso:\n"
++-"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <endereço>]\n"
++-
++-#: ../ifconfig.c:425
++-msgid "  [add <address>[/<prefixlen>]]\n"
++-msgstr "  [add <endereço>[/<tam_prefixo>]]\n"
++-
++-#: ../ifconfig.c:427
++-msgid "  [del <address>[/<prefixlen>]]\n"
++-msgstr "  [del <endereço>[/<tam_prefixo>]]\n"
++-
++-#: ../ifconfig.c:432
++-msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
++-msgstr "  [[-]broadcast [<endereço>]]  [[-]pointopoint [<endereço>]]\n"
++-
++-#: ../ifconfig.c:433
++-msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
++-msgstr "  [netmask <endereço>]  [dstaddr <endereço>]  [tunnel <endereço>]\n"
++-
++-#: ../ifconfig.c:436
++-msgid "  [outfill <NN>] [keepalive <NN>]\n"
++-msgstr "  [outfill <NN>] [keepalive <NN>]\n"
++-
++-#: ../ifconfig.c:438
++-msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
++-msgstr "  [hw <HW> <endereço>]  [metric <NN>]  [mtu <NN>]\n"
++-
++-#: ../ifconfig.c:439
++-msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
++-msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
++-
++-#: ../ifconfig.c:440
++-msgid "  [multicast]  [[-]promisc]\n"
++-msgstr "  [multicast]  [[-]promisc]\n"
++-
++-#: ../ifconfig.c:441
++-msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
++-msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <tipo>]\n"
++-
++-#: ../ifconfig.c:443
++-msgid "  [txqueuelen <NN>]\n"
++-msgstr "  [txqueuelen <NN>]\n"
++-
++-#: ../ifconfig.c:446
++-msgid "  [[-]dynamic]\n"
++-msgstr "  [[-]dynamic]\n"
++-
++-#: ../ifconfig.c:448
++-msgid ""
++-"  [up|down] ...\n"
++-"\n"
+++msgid "Interface %s not initialized\n"
++ msgstr ""
++-"  [up|down] ...\n"
++-"\n"
++-
++-#: ../ifconfig.c:450
++-msgid "  <HW>=Hardware Type.\n"
++-msgstr "  <HW>=Tipo de Hardware.\n"
++-
++-#: ../ifconfig.c:451
++-msgid "  List of possible hardware types:\n"
++-msgstr "  Lista dos tipos possíveis de hardware:\n"
++-
++-#. 1 = ARPable
++-#: ../ifconfig.c:453
++-#, c-format
++-msgid "  <AF>=Address family. Default: %s\n"
++-msgstr "  <AF>=Família de endereços. Default: %s\n"
++-
++-#: ../ifconfig.c:454
++-msgid "  List of possible address families:\n"
++-msgstr "  Lista de famílias de endereços possíveis:\n"
++-
++-#: ../ifconfig.c:593
++-msgid "Unknown media type.\n"
++-msgstr "Tipo desconhecido de mídia.\n"
++ 
++-#: ../ifconfig.c:881
++-#, c-format
++-msgid "%s: invalid %s address.\n"
+++#: ../ifconfig.c:792 ../ifconfig.c:882
+++#, fuzzy, c-format
+++msgid "Bad address.\n"
++ msgstr "%s: endereço %s inválido.\n"
++ 
++-#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011
++-msgid "No support for INET6 on this system.\n"
++-msgstr "Este sistema não tem suporte a INET6.\n"
++-
++-#: ../ifconfig.c:983
+++#: ../ifconfig.c:885
+++#, c-format
++ msgid "Address deletion not supported on this system.\n"
++ msgstr "Remoção de endereço não suportada neste sistema.\n"
++ 
++-#: ../ifconfig.c:1066
++-msgid "No support for INET on this system.\n"
++-msgstr "Este sistema não tem suporte a INET.\n"
+++#: ../ifconfig.c:957
+++#, fuzzy, c-format
+++msgid "ifconfig: Cannot set address for this protocol family.\n"
+++msgstr "Não sei como configurar endereços para a família %d.\n"
++ 
++-#: ../ifconfig.c:1076
+++#: ../ifconfig.c:983
+++#, c-format
++ msgid "No support for ECONET on this system.\n"
++ msgstr "Este sistema não tem suporte a ECONET.\n"
++ 
++-#: ../ifconfig.c:1084
+++#: ../ifconfig.c:991
++ #, c-format
++ msgid "Don't know how to set addresses for family %d.\n"
++ msgstr "Não sei como configurar endereços para a família %d.\n"
++ 
++-#: ../netstat.c:383
+++#: ../ifconfig.c:1021
+++#, c-format
+++msgid "WARNING: at least one error occured. (%d)\n"
+++msgstr ""
+++
+++#: ../netstat.c:434
++ #, c-format
++ msgid ""
++ "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
++-msgstr ""
++-"(Não foi possível ler informações para \"-p\": geteuid()=%d mas você deve "
++-"ser root.)\n"
+++msgstr "(Não foi possível ler informações para \"-p\": geteuid()=%d mas você deve ser root.)\n"
++ 
++-#: ../netstat.c:387
+++#: ../netstat.c:438
+++#, c-format
++ msgid ""
++ "(Not all processes could be identified, non-owned process info\n"
++ " will not be shown, you would have to be root to see it all.)\n"
++ msgstr ""
++-"(Nem todos os processos puderam ser identificados, informações sobre "
++-"processos\n"
+++"(Nem todos os processos puderam ser identificados, informações sobre processos\n"
++ " de outrem não serão mostrados, você deve ser root para vê-los todos.)\n"
++ 
++-#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166
+++#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
++ msgid "LISTENING"
++ msgstr "OUVINDO"
++ 
++-#: ../netstat.c:395
+++#: ../netstat.c:446
++ msgid "CONN SENT"
++ msgstr "CONN ENVIADO"
++ 
++-#: ../netstat.c:396 ../netstat.c:1168
+++#: ../netstat.c:447 ../netstat.c:1268
++ msgid "DISC SENT"
++ msgstr "DISC ENVIADO"
++ 
++-#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169
+++#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
++ msgid "ESTABLISHED"
++ msgstr "ESTABELECIDA"
++ 
++-#: ../netstat.c:419
+++#: ../netstat.c:470
+++#, c-format
++ msgid "Active NET/ROM sockets\n"
++ msgstr "Ative sockets NET/ROM\n"
++ 
++-#: ../netstat.c:420
+++#: ../netstat.c:471
+++#, c-format
++ msgid ""
++-"User       Dest       Source     Device  State        Vr/Vs    Send-Q  "
++-"Recv-Q\n"
++-msgstr ""
++-"Usuário    Destino    Origem  Dispositivo Estado      Vr/Vs  Send-Q  Recv-Q\n"
+++"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
+++"Q\n"
+++msgstr "Usuário    Destino    Origem  Dispositivo Estado      Vr/Vs  Send-Q  Recv-Q\n"
++ 
++-#: ../netstat.c:430 ../netstat.c:1208
+++#: ../netstat.c:481 ../netstat.c:1308
++ #, c-format
++ msgid "Problem reading data from %s\n"
++ msgstr "Problemas lendo dados de %s\n"
++ 
++-#: ../netstat.c:465
+++#: ../netstat.c:516
++ msgid "SYN_SENT"
++ msgstr "SYN_ENVIADO"
++ 
++-#: ../netstat.c:466
+++#: ../netstat.c:517
++ msgid "SYN_RECV"
++ msgstr "SYN_RECEBIDO"
++ 
++-#: ../netstat.c:467
+++#: ../netstat.c:518
++ msgid "FIN_WAIT1"
++ msgstr "ESPERA_FIN1"
++ 
++-#: ../netstat.c:468
+++#: ../netstat.c:519
++ msgid "FIN_WAIT2"
++ msgstr "ESPERA_FIN2"
++ 
++-#: ../netstat.c:469
+++#: ../netstat.c:520
++ msgid "TIME_WAIT"
++ msgstr "TIME_WAIT"
++ 
++-#: ../netstat.c:470
+++#: ../netstat.c:521
++ msgid "CLOSE"
++ msgstr "FECHAR"
++ 
++-#: ../netstat.c:471
+++#: ../netstat.c:522
++ msgid "CLOSE_WAIT"
++ msgstr "ESPERANDO_FECHAR"
++ 
++-#: ../netstat.c:472
+++#: ../netstat.c:523
++ msgid "LAST_ACK"
++ msgstr "ÚLTIMO_ACK"
++ 
++-#: ../netstat.c:473
+++#: ../netstat.c:524
++ msgid "LISTEN"
++ msgstr "OUÇA"
++ 
++-#: ../netstat.c:474
+++#: ../netstat.c:525
++ msgid "CLOSING"
++ msgstr "FECHANDO"
++ 
++-#: ../netstat.c:544
+++#: ../netstat.c:596
++ #, c-format
++ msgid "warning, got bogus igmp6 line %d.\n"
++ msgstr "atenção, recebi linha igmp6 inválida %d.\n"
++ 
++-#: ../netstat.c:549 ../netstat.c:587 ../netstat.c:670 ../netstat.c:803
++-#: ../netstat.c:935 ../netstat.c:940
+++#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
+++#: ../netstat.c:1032 ../netstat.c:1037
++ #, c-format
++ msgid "netstat: unsupported address family %d !\n"
++ msgstr "netstat: família de protocolos %d não suportada!\n"
++ 
++-#: ../netstat.c:562 ../netstat.c:567 ../netstat.c:575 ../netstat.c:582
+++#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
++ #, c-format
++ msgid "warning, got bogus igmp line %d.\n"
++ msgstr "atenção, recebi linha igmp inválida %d.\n"
++ 
++-#: ../netstat.c:666
+++#: ../netstat.c:677
+++#, fuzzy, c-format
+++msgid "Active X.25 sockets\n"
+++msgstr "Ativar sockets AX.25\n"
+++
+++#. IMHO, Vr/Vs is not very usefull --SF
+++#: ../netstat.c:679
+++#, fuzzy, c-format
+++msgid ""
+++"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
+++"Q\n"
+++msgstr "Destino    Origem Dispositivo Estado       Vr/Vs  Send-Q  Recv-Q\n"
+++
+++#: ../netstat.c:759
+++#, c-format
++ msgid "warning, got bogus tcp line.\n"
++ msgstr "atenção, recebi linha tcp inválida.\n"
++ 
++-#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975
+++#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
++ #, c-format
++ msgid "off (0.00/%ld/%d)"
++ msgstr "desligado (0.00/%ld/%ld)"
++ 
++-#: ../netstat.c:708
+++#: ../netstat.c:804
++ #, c-format
++ msgid "on (%2.2f/%ld/%d)"
++ msgstr "em (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:713
+++#: ../netstat.c:809
++ #, c-format
++ msgid "keepalive (%2.2f/%ld/%d)"
++ msgstr "keepalive (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:718
+++#: ../netstat.c:814
++ #, c-format
++ msgid "timewait (%2.2f/%ld/%d)"
++ msgstr "timewait (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985
+++#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
++ #, c-format
++ msgid "unkn-%d (%2.2f/%ld/%d)"
++ msgstr "desconh.-%d (%2.2f/%ld)"
++ 
++-#: ../netstat.c:799
+++#: ../netstat.c:894
+++#, c-format
++ msgid "warning, got bogus udp line.\n"
++ msgstr "atenção, recebi linha udp inválida.\n"
++ 
++-#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108
+++#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
++ msgid "UNKNOWN"
++ msgstr "DESCONHECIDA"
++ 
++-#: ../netstat.c:860 ../netstat.c:980
+++#: ../netstat.c:958 ../netstat.c:1080
++ #, c-format
++ msgid "on%d (%2.2f/%ld/%d)"
++ msgstr "ligado %d (%2.2f/%ld)"
++ 
++-#: ../netstat.c:949
+++#: ../netstat.c:1046
+++#, c-format
++ msgid "warning, got bogus raw line.\n"
++ msgstr "atenção, recebi linha raw inválida.\n"
++ 
++-#: ../netstat.c:1028
+++#: ../netstat.c:1128
+++#, c-format
++ msgid "warning, got bogus unix line.\n"
++ msgstr "atenção, recebi linha unix inválida.\n"
++ 
++-#: ../netstat.c:1055
+++#: ../netstat.c:1155
++ msgid "STREAM"
++ msgstr "STREAM"
++ 
++-#: ../netstat.c:1059
+++#: ../netstat.c:1159
++ msgid "DGRAM"
++ msgstr "DGRAM"
++ 
++-#: ../netstat.c:1063
+++#: ../netstat.c:1163
++ msgid "RAW"
++ msgstr "RAW"
++ 
++-#: ../netstat.c:1067
+++#: ../netstat.c:1167
++ msgid "RDM"
++ msgstr "RDM"
++ 
++-#: ../netstat.c:1071
+++#: ../netstat.c:1171
++ msgid "SEQPACKET"
++ msgstr "SEQPACKET"
++ 
++-#: ../netstat.c:1080
+++#: ../netstat.c:1180
++ msgid "FREE"
++ msgstr "LIVRE"
++ 
++-#: ../netstat.c:1096
+++#: ../netstat.c:1196
++ msgid "CONNECTING"
++ msgstr "CONECTANDO"
++ 
++-#: ../netstat.c:1100
+++#: ../netstat.c:1200
++ msgid "CONNECTED"
++ msgstr "CONECTADO"
++ 
++-#: ../netstat.c:1104
+++#: ../netstat.c:1204
++ msgid "DISCONNECTING"
++ msgstr "DESCONECTANDO"
++ 
++-#: ../netstat.c:1135
+++#: ../netstat.c:1235
+++#, c-format
++ msgid "Active UNIX domain sockets "
++ msgstr "Domain sockets UNIX ativos "
++ 
++-#: ../netstat.c:1137 ../netstat.c:1666
+++#: ../netstat.c:1237 ../netstat.c:1756
+++#, c-format
++ msgid "(servers and established)"
++ msgstr "(servidores e estabelecidas)"
++ 
++-#: ../netstat.c:1140 ../netstat.c:1669
+++#: ../netstat.c:1240 ../netstat.c:1759
+++#, c-format
++ msgid "(only servers)"
++ msgstr "(sem os servidores)"
++ 
++-#: ../netstat.c:1142 ../netstat.c:1671
+++#: ../netstat.c:1242 ../netstat.c:1761
+++#, c-format
++ msgid "(w/o servers)"
++ msgstr "(sem os servidores)"
++ 
++-#: ../netstat.c:1145
+++#: ../netstat.c:1245
+++#, c-format
++ msgid ""
++ "\n"
++ "Proto RefCnt Flags       Type       State         I-Node"
++@@ -993,114 +919,118 @@ msgstr ""
++ "\n"
++ "Proto CntRef Flags       Tipo       Estado        I-Node Rota"
++ 
++-#: ../netstat.c:1147
+++#: ../netstat.c:1247
+++#, c-format
++ msgid " Path\n"
++ msgstr " Caminho\n"
++ 
++-#: ../netstat.c:1167
+++#: ../netstat.c:1267
++ msgid "SABM SENT"
++ msgstr "SABM ENVIADO"
++ 
++-#: ../netstat.c:1170
+++#: ../netstat.c:1270
++ msgid "RECOVERY"
++ msgstr "RECUPERAÇÃO"
++ 
++-#: ../netstat.c:1184
+++#: ../netstat.c:1284
+++#, c-format
++ msgid "Active AX.25 sockets\n"
++ msgstr "Ativar sockets AX.25\n"
++ 
++-#: ../netstat.c:1185
+++#: ../netstat.c:1285
+++#, c-format
++ msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
++ msgstr "Destino    Origem Dispositivo Estado       Vr/Vs  Send-Q  Recv-Q\n"
++ 
++-#: ../netstat.c:1228
+++#: ../netstat.c:1328
++ #, c-format
++ msgid "problem reading data from %s\n"
++ msgstr "problemas lendo dados de %s\n"
++ 
++-#: ../netstat.c:1279
+++#: ../netstat.c:1379
+++#, c-format
++ msgid ""
++ "Active IPX sockets\n"
++ "Proto Recv-Q Send-Q Local Address              Foreign Address            "
++ "State"
++ msgstr ""
++ "Sockets IPX ativos\n"
++-"Proto Recv-Q Send-Q Endereço Local             Endereço Remoto           "
++-"Estado"
+++"Proto Recv-Q Send-Q Endereço Local             Endereço Remoto           Estado"
++ 
++-#: ../netstat.c:1281
+++#: ../netstat.c:1381
+++#, c-format
++ msgid " User"
++ msgstr " Usuário"
++ 
++-#: ../netstat.c:1315
+++#: ../netstat.c:1415
++ msgid "ESTAB"
++ msgstr "ESTAB"
++ 
++-#: ../netstat.c:1323
+++#: ../netstat.c:1423
++ msgid "UNK."
++ msgstr "DESC."
++ 
++-#: ../netstat.c:1367
++-msgid "     - no statistics available -"
++-msgstr "     - estatísticas não disponíveis -"
++-
++-#: ../netstat.c:1370
++-msgid "[NO FLAGS]"
++-msgstr "[SEM FLAGS]"
++-
++-#: ../netstat.c:1400
+++#: ../netstat.c:1461
+++#, c-format
++ msgid "Kernel Interface table\n"
++ msgstr "Tabela de Interfaces do Kernel\n"
++ 
++-#: ../netstat.c:1401
+++#: ../netstat.c:1465
+++#, fuzzy, c-format
++ msgid ""
++-"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
+++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
++ "Flg\n"
++-msgstr ""
++-"Iface     MTU Met  RX-OK RX-ERR RX-DRP RX-OVR  TX-OK TX-ERR TX-DRP TX-OV "
++-"Opções\n"
+++msgstr "Iface     MTU Met  RX-OK RX-ERR RX-DRP RX-OVR  TX-OK TX-ERR TX-DRP TX-OV Opções\n"
++ 
++-#: ../netstat.c:1404
+++#: ../netstat.c:1469
++ msgid "missing interface information"
++ msgstr "falta informação da interface"
++ 
++-#: ../netstat.c:1425
+++#: ../netstat.c:1492
+++#, c-format
++ msgid ""
++-"usage: netstat [-veenNcCF] [<Af>] -r         netstat "
++-"{-V|--version|-h|--help}\n"
+++"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
+++"help}\n"
++ msgstr ""
++ "uso: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--help}\n"
++ 
++-#: ../netstat.c:1426
+++#: ../netstat.c:1493
+++#, c-format
++ msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
++ msgstr "     netstat [-vnNcaeo] [<Socket>]\n"
++ 
++-#: ../netstat.c:1427
+++#: ../netstat.c:1494
+++#, c-format
++ msgid ""
++ "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
++ "\n"
++ msgstr "     netstat [-vnNcaeo] [<Socket>]\n"
++ 
++-#: ../netstat.c:1429
+++#: ../netstat.c:1496
+++#, c-format
++ msgid "        -r, --route              display routing table\n"
++ msgstr "        -r, --route             mostra tabela de roteamento\n"
++ 
++-#: ../netstat.c:1430
+++#: ../netstat.c:1497
+++#, c-format
++ msgid "        -i, --interfaces         display interface table\n"
++ msgstr "        -i, --interfaces        mostra tabela de interfaces\n"
++ 
++-#: ../netstat.c:1431
+++#: ../netstat.c:1498
+++#, c-format
++ msgid "        -g, --groups             display multicast group memberships\n"
++ msgstr ""
++ "        -o, --timers            mostra temporizadores\n"
++ "\n"
++ 
++-#: ../netstat.c:1432
+++#: ../netstat.c:1499
+++#, c-format
++ msgid ""
++ "        -s, --statistics         display networking statistics (like SNMP)\n"
++ msgstr "        -i, --interfaces        mostra tabela de interfaces\n"
++ 
++-#: ../netstat.c:1434
+++#: ../netstat.c:1501
+++#, c-format
++ msgid ""
++ "        -M, --masquerade         display masqueraded connections\n"
++ "\n"
++@@ -1108,19 +1038,38 @@ msgstr ""
++ "        -M, --masquerade        mostra conexões mascaradas\n"
++ "\n"
++ 
++-#: ../netstat.c:1438 ../route.c:87
+++#: ../netstat.c:1505
+++#, fuzzy, c-format
+++msgid "        --numeric-hosts          don't resolve host names\n"
+++msgstr "        -n, --numeric           não resolve nomes\n"
+++
+++#: ../netstat.c:1506
+++#, fuzzy, c-format
+++msgid "        --numeric-ports          don't resolve port names\n"
+++msgstr "        -n, --numeric           não resolve nomes\n"
+++
+++#: ../netstat.c:1507
+++#, fuzzy, c-format
+++msgid "        --numeric-users          don't resolve user names\n"
+++msgstr "        -n, --numeric           não resolve nomes\n"
+++
+++#: ../netstat.c:1508
+++#, c-format
++ msgid "        -N, --symbolic           resolve hardware names\n"
++ msgstr "        -n, --numeric           não resolve nomes\n"
++ 
++-#: ../netstat.c:1439 ../route.c:88
+++#: ../netstat.c:1509 ../route.c:88
+++#, c-format
++ msgid "        -e, --extend             display other/more information\n"
++ msgstr "        -e, --extend             mostra outras/mais informações\n"
++ 
++-#: ../netstat.c:1440
+++#: ../netstat.c:1510
+++#, c-format
++ msgid "        -p, --programs           display PID/Program name for sockets\n"
++ msgstr "        -r, --route             mostra tabela de roteamento\n"
++ 
++-#: ../netstat.c:1441
+++#: ../netstat.c:1511
+++#, c-format
++ msgid ""
++ "        -c, --continuous         continuous listing\n"
++ "\n"
++@@ -1128,30 +1077,33 @@ msgstr ""
++ "        -c, --continuous        listagem contínua\n"
++ "\n"
++ 
++-#: ../netstat.c:1442
+++#: ../netstat.c:1512
+++#, c-format
++ msgid "        -l, --listening          display listening server sockets\n"
++ msgstr "        -L, --netlink           mostra mensagens netlink do kernel\n"
++ 
++-#: ../netstat.c:1443
+++#: ../netstat.c:1513
+++#, c-format
++ msgid ""
++ "        -a, --all, --listening   display all sockets (default: connected)\n"
++ msgstr "        -a, --all, --listening  mostra tudo\n"
++ 
++-#: ../netstat.c:1444
+++#: ../netstat.c:1514
+++#, c-format
++ msgid "        -o, --timers             display timers\n"
++ msgstr ""
++ "        -o, --timers            mostra temporizadores\n"
++ "\n"
++ 
++-#: ../netstat.c:1445 ../route.c:89
+++#: ../netstat.c:1515 ../route.c:89
+++#, c-format
++ msgid ""
++ "        -F, --fib                display Forwarding Information Base "
++ "(default)\n"
++-msgstr ""
++-"        -F, --fib             mostra a Base de Informações de Repasse "
++-"(default)\n"
+++msgstr "        -F, --fib             mostra a Base de Informações de Repasse (default)\n"
++ 
++-#: ../netstat.c:1446 ../route.c:90
+++#: ../netstat.c:1516 ../route.c:90
+++#, c-format
++ msgid ""
++ "        -C, --cache              display routing cache instead of FIB\n"
++ "\n"
++@@ -1159,136 +1111,145 @@ msgstr ""
++ "        -C, --cache              mostra cache de roteamento no lugar da FIB\n"
++ "\n"
++ 
++-#: ../netstat.c:1448
+++#: ../netstat.c:1518
+++#, c-format
++ msgid ""
++-"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
++-"--netrom\n"
+++"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
+++"netrom\n"
++ msgstr ""
++-"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
++-"--netrom\n"
+++"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
+++"netrom\n"
++ 
++-#: ../netstat.c:1449 ../route.c:92
++-#, c-format
++-msgid "  <AF>=Use '-A <af>' or '--<af>' Default: %s\n"
+++#: ../netstat.c:1519
+++#, fuzzy, c-format
+++msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
++ msgstr "  <AF>=Use '-A <af>' ou [--<af>' Default: %s\n"
++ 
++-#: ../netstat.c:1450 ../route.c:93
+++#: ../netstat.c:1520 ../route.c:93
+++#, c-format
++ msgid "  List of possible address families (which support routing):\n"
++-msgstr ""
++-"  Lista das famílias de endereços possíveis (que suportam roteamento):\n"
+++msgstr "  Lista das famílias de endereços possíveis (que suportam roteamento):\n"
++ 
++-#: ../netstat.c:1663
+++#: ../netstat.c:1753
+++#, c-format
++ msgid "Active Internet connections "
++ msgstr "Conexões Internet Ativas "
++ 
++-#: ../netstat.c:1673
+++#: ../netstat.c:1763
+++#, c-format
++ msgid ""
++ "\n"
++-"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
++-"  "
+++"Proto Recv-Q Send-Q Local Address           Foreign Address         "
+++"State      "
++ msgstr ""
++ "\n"
++-"Proto Recv-Q Send-Q Endereço Local          Endereço Remoto         Estado   "
++-"  "
+++"Proto Recv-Q Send-Q Endereço Local          Endereço Remoto         Estado     "
++ 
++-#: ../netstat.c:1675
+++#: ../netstat.c:1765
+++#, c-format
++ msgid " User       Inode     "
++ msgstr " Usuário   "
++ 
++-#: ../netstat.c:1678
+++#: ../netstat.c:1768
+++#, c-format
++ msgid " Timer"
++ msgstr " Temporizador"
++ 
++-#: ../netstat.c:1708
+++#: ../netstat.c:1798
+++#, c-format
++ msgid "IPv4 Group Memberships\n"
++ msgstr "IPv4 Group Memberships\n"
++ 
++-#: ../netstat.c:1709
+++#: ../netstat.c:1799
+++#, c-format
++ msgid "Interface       RefCnt Group\n"
++ msgstr "Interface       CntRef Grupo\n"
++ 
++-#: ../rarp.c:43
+++#: ../rarp.c:44
++ msgid "This kernel does not support RARP.\n"
++ msgstr "Este kernel não tem suporte a RARP.\n"
++ 
++-#: ../rarp.c:82
+++#: ../rarp.c:83
++ #, c-format
++ msgid "no RARP entry for %s.\n"
++ msgstr "Sem entrada RARP para %s.\n"
++ 
++-#: ../rarp.c:95
+++#: ../rarp.c:96
++ #, c-format
++ msgid "%s: bad hardware address\n"
++ msgstr "%s: endereço de hardware inválido\n"
++ 
++-#: ../rarp.c:127
+++#: ../rarp.c:128
++ #, c-format
++ msgid "rarp: cannot open file %s:%s.\n"
++ msgstr "rarp: não foi possível abrir o arquivo %s:%s.\n"
++ 
++-#: ../rarp.c:139
+++#: ../rarp.c:140
++ #, c-format
++ msgid "rarp: format error at %s:%u\n"
++ msgstr "rarp: erro de formato em %s:%u\n"
++ 
++-#: ../rarp.c:143 ../rarp.c:287
+++#: ../rarp.c:144 ../rarp.c:289
++ #, c-format
++ msgid "rarp: %s: unknown host\n"
++ msgstr "rarp: %s: máquina desconhecida\n"
++ 
++-#: ../rarp.c:146
+++#: ../rarp.c:147
++ #, c-format
++ msgid "rarp: cannot set entry from %s:%u\n"
++ msgstr "rarp: não é possível incluir uma entrada para %s:%u\n"
++ 
++-#: ../rarp.c:175
+++#: ../rarp.c:176
+++#, c-format
++ msgid "Usage: rarp -a                               list entries in cache.\n"
++ msgstr ""
++ "Uso: rarp -a                                   lista entradas no cache\n"
++ 
++-#: ../rarp.c:176
+++#: ../rarp.c:177
+++#, c-format
++ msgid "       rarp -d <hostname>                    delete entry from cache.\n"
++-msgstr ""
++-"     rarp -d máquina                           remove entrada do cache\n"
+++msgstr "     rarp -d máquina                           remove entrada do cache\n"
++ 
++-#: ../rarp.c:177
+++#: ../rarp.c:178
+++#, c-format
++ msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
++-msgstr ""
++-"     rarp [-t tipo-hw] -s máquina endereço-hw  adiciona entrada ao cache\n"
+++msgstr "     rarp [-t tipo-hw] -s máquina endereço-hw  adiciona entrada ao cache\n"
++ 
++-#: ../rarp.c:178
+++#: ../rarp.c:179
+++#, c-format
++ msgid ""
++ "       rarp -f                               add entries from /etc/ethers.\n"
++ msgstr ""
++ "       rarp -f                               adiciona entradas a partir do\n"
++ "                                             arquivo ethers.\n"
++ 
++-#: ../rarp.c:179
+++#: ../rarp.c:180
+++#, c-format
++ msgid ""
++ "       rarp -V                               display program version.\n"
++ "\n"
++-msgstr ""
++-"     rarp -V                                   mostra versão do programa\n"
+++msgstr "     rarp -V                                   mostra versão do programa\n"
++ 
++-#: ../rarp.c:236
+++#: ../rarp.c:238
++ #, c-format
++ msgid "%s: illegal option mix.\n"
++ msgstr "%s: mistura ilegal de opções.\n"
++ 
++-#: ../rarp.c:267
+++#: ../rarp.c:269
++ #, c-format
++ msgid "rarp: %s: unknown hardware type.\n"
++ msgstr "rarp: %s: tipo desconhecido de hardware.\n"
++ 
++-#: ../route.c:79
+++#: ../route.c:80
+++#, c-format
++ msgid ""
++ "Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
++ msgstr ""
++-"Uso: route [-nNvee] [-FC] [famílias_de_endereços]  Lista as tabelas de "
++-"rotea-\n"
+++"Uso: route [-nNvee] [-FC] [famílias_de_endereços]  Lista as tabelas de rotea-\n"
++ "                                                   mento do kernel\n"
++ 
++-#: ../route.c:80
+++#: ../route.c:81
+++#, c-format
++ msgid ""
++ "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
++ "\n"
++@@ -1298,35 +1259,42 @@ msgstr ""
++ "                                                   mento da família.\n"
++ "\n"
++ 
++-#: ../route.c:82
+++#: ../route.c:83
+++#, c-format
++ msgid ""
++ "       route {-h|--help} [<AF>]              Detailed usage syntax for "
++ "specified AF.\n"
++ msgstr ""
++-"       route {-h|--help} [família_de_endereços]    Sintaxe para a AF "
++-"(Família\n"
++-"                                                   de endereços) "
++-"espeficicada.\n"
+++"       route {-h|--help} [família_de_endereços]    Sintaxe para a AF (Família\n"
+++"                                                   de endereços) espeficicada.\n"
++ 
++-#: ../route.c:83
+++#: ../route.c:84
+++#, c-format
++ msgid ""
++ "       route {-V|--version}                  Display version/author and "
++ "exit.\n"
++ "\n"
++ msgstr ""
++-"       route {-V|--version}                        Mostra a versão do "
++-"comando\n"
+++"       route {-V|--version}                        Mostra a versão do comando\n"
++ "                                                   e sai.\n"
++ 
+++#: ../route.c:92
+++#, fuzzy, c-format
+++msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
+++msgstr "  <AF>=Use '-A <af>' ou [--<af>' Default: %s\n"
+++
++ #: ../plipconfig.c:66
+++#, c-format
++ msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
++ msgstr "Uso: ifconfig [-a] [-i] [-v] interface\n"
++ 
++ #: ../plipconfig.c:67
+++#, c-format
++ msgid "                  [nibble NN] [trigger NN]\n"
++ msgstr "                [[família] endereço]\n"
++ 
++ #: ../plipconfig.c:68
+++#, c-format
++ msgid "       plipconfig -V | --version\n"
++ msgstr "       plipconfig -V | --version\n"
++ 
++@@ -1335,25 +1303,29 @@ msgstr "       plipconfig -V | --version
++ msgid "%s\tnibble %lu  trigger %lu\n"
++ msgstr "%s\tnibble %lu  trigger %lu\n"
++ 
++-#: ../iptunnel.c:79
+++#: ../iptunnel.c:85
+++#, c-format
++ msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
++ msgstr "Uso: iptunnel { add | change | del | show } [ NOME ]\n"
++ 
++-#: ../iptunnel.c:80
+++#: ../iptunnel.c:86
+++#, c-format
++ msgid ""
++ "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
++-msgstr ""
++-"          [ mode { ipip | gre | sit } ] [ remote END ] [ local END ]\n"
+++msgstr "          [ mode { ipip | gre | sit } ] [ remote END ] [ local END ]\n"
++ 
++-#: ../iptunnel.c:81
+++#: ../iptunnel.c:87
+++#, c-format
++ msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
++ msgstr "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
++ 
++-#: ../iptunnel.c:82
+++#: ../iptunnel.c:88
+++#, c-format
++ msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
++ msgstr "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev DISP_FÍSICO ]\n"
++ 
++-#: ../iptunnel.c:83
+++#: ../iptunnel.c:89
+++#, c-format
++ msgid ""
++ "       iptunnel -V | --version\n"
++ "\n"
++@@ -1361,451 +1333,734 @@ msgstr ""
++ "       iptunnel -V | --version\n"
++ "\n"
++ 
++-#: ../iptunnel.c:84
+++#: ../iptunnel.c:90
+++#, c-format
++ msgid "Where: NAME := STRING\n"
++ msgstr "Onde: NAME := STRING\n"
++ 
++-#: ../iptunnel.c:85
+++#: ../iptunnel.c:91
+++#, c-format
++ msgid "       ADDR := { IP_ADDRESS | any }\n"
++ msgstr "       END := { ENDEREÇO_IP | any }\n"
++ 
++-#: ../iptunnel.c:86
+++#: ../iptunnel.c:92
+++#, c-format
++ msgid "       TOS  := { NUMBER | inherit }\n"
++ msgstr "       TOS  := { NÚMERO | inherit }\n"
++ 
++-#: ../iptunnel.c:87
+++#: ../iptunnel.c:93
+++#, c-format
++ msgid "       TTL  := { 1..255 | inherit }\n"
++ msgstr "       TTL  := { 1..255 | inherit }\n"
++ 
++-#: ../iptunnel.c:88
+++#: ../iptunnel.c:94
+++#, c-format
++ msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
++ msgstr "       KEY  := { QUATRO_NÚMEROS_SEPARADOS_POR_PONTOS | NÚMERO }\n"
++ 
++-#: ../iptunnel.c:326
+++#: ../iptunnel.c:332
+++#, c-format
++ msgid "Keys are not allowed with ipip and sit.\n"
++ msgstr "Chaves não são permitidas com ipip e sit.\n"
++ 
++-#: ../iptunnel.c:346
+++#: ../iptunnel.c:352
+++#, c-format
++ msgid "Broadcast tunnel requires a source address.\n"
++ msgstr "Um túnel de broadcast precisa de um endereço de origem.\n"
++ 
++-#: ../iptunnel.c:361
+++#: ../iptunnel.c:367
+++#, c-format
++ msgid "ttl != 0 and noptmudisc are incompatible\n"
++ msgstr "ttl != 0 e noptmudisc são incompatíveis\n"
++ 
++-#: ../iptunnel.c:373
+++#: ../iptunnel.c:379
+++#, c-format
++ msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
++ msgstr "não foi possível determinar o modo do túnel (ip, gre ou sit)\n"
++ 
++-#: ../iptunnel.c:411
+++#: ../iptunnel.c:417
++ #, c-format
++ msgid "%s: %s/ip  remote %s  local %s "
++ msgstr "%s: %s/ip  remoto %s  local %s "
++ 
++-#: ../iptunnel.c:415
+++#: ../iptunnel.c:421
++ msgid "unknown"
++ msgstr "Desconhecido"
++ 
++-#: ../iptunnel.c:447
+++#: ../iptunnel.c:453
+++#, c-format
++ msgid "  Drop packets out of sequence.\n"
++ msgstr "  Descarte pacotes fora de seqüência.\n"
++ 
++-#: ../iptunnel.c:449
+++#: ../iptunnel.c:455
+++#, c-format
++ msgid "  Checksum in received packet is required.\n"
++ msgstr "  É necessário checksum nos pacotes recebidos.\n"
++ 
++-#: ../iptunnel.c:451
+++#: ../iptunnel.c:457
+++#, c-format
++ msgid "  Sequence packets on output.\n"
++ msgstr "  Seqüencie pacotes na saída.\n"
++ 
++-#: ../iptunnel.c:453
+++#: ../iptunnel.c:459
+++#, c-format
++ msgid "  Checksum output packets.\n"
++ msgstr "  Calcule o checksum para pacotes de saída.\n"
++ 
++-#: ../iptunnel.c:481
+++#: ../iptunnel.c:487
+++#, c-format
++ msgid "Wrong format of /proc/net/dev. Sorry.\n"
++ msgstr "Formato errado de /proc/net/dev. Desculpe.\n"
++ 
++-#: ../iptunnel.c:494
+++#: ../iptunnel.c:500
++ #, c-format
++ msgid "Failed to get type of [%s]\n"
++ msgstr "Não foi possível obter o tipo de [%s]\n"
++ 
++-#: ../iptunnel.c:510
+++#: ../iptunnel.c:516
+++#, c-format
++ msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
++ msgstr "RX: Pacotes    Bytes        Erros  CsunErrs ForaSeq  Mcasts\n"
++ 
++-#: ../iptunnel.c:513
+++#: ../iptunnel.c:519
+++#, c-format
++ msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
++ msgstr "TX: Pacotes    Bytes        Erros  DeadLoop SemRota  SemBufs\n"
++ 
++-#: ../statistics.c:45
+++#: ../statistics.c:47
++ msgid "ICMP input histogram:"
++ msgstr "Histograma de entrada ICMP:"
++ 
++-#: ../statistics.c:46
+++#: ../statistics.c:48
++ msgid "ICMP output histogram:"
++ msgstr "Histograma de saída ICMP"
++ 
++-#: ../statistics.c:63
+++#: ../statistics.c:65
++ #, c-format
++ msgid "Forwarding is %s"
++ msgstr "Repassagem está %s"
++ 
++-#: ../statistics.c:64
++-#, c-format
++-msgid "Default TTL is %d"
+++#: ../statistics.c:66
+++#, fuzzy, c-format
+++msgid "Default TTL is %u"
++ msgstr "Default TTL é %d"
++ 
++-#: ../statistics.c:65
++-#, c-format
++-msgid "%d total packets received"
+++#: ../statistics.c:67
+++#, fuzzy, c-format
+++msgid "%u total packets received"
++ msgstr "%d total de pacotes recebidos"
++ 
++-#: ../statistics.c:66
++-#, c-format
++-msgid "%d with invalid headers"
+++#: ../statistics.c:68
+++#, fuzzy, c-format
+++msgid "%u with invalid headers"
++ msgstr "%d com cabeçalhos inválidos"
++ 
++-#: ../statistics.c:67
++-#, c-format
++-msgid "%d with invalid addresses"
+++#: ../statistics.c:69
+++#, fuzzy, c-format
+++msgid "%u with invalid addresses"
++ msgstr "%d com endereços inválidos"
++ 
++-#: ../statistics.c:68
++-#, c-format
++-msgid "%d forwarded"
+++#: ../statistics.c:70
+++#, fuzzy, c-format
+++msgid "%u forwarded"
++ msgstr "%d repassados"
++ 
++-#: ../statistics.c:69
++-#, c-format
++-msgid "%d with unknown protocol"
+++#: ../statistics.c:71
+++#, fuzzy, c-format
+++msgid "%u with unknown protocol"
++ msgstr "%d com protocolo desconhecido"
++ 
++-#: ../statistics.c:70
++-#, c-format
++-msgid "%d incoming packets discarded"
+++#: ../statistics.c:72
+++#, fuzzy, c-format
+++msgid "%u incoming packets discarded"
++ msgstr "%d pacotes entrantes descartados"
++ 
++-#: ../statistics.c:71
++-#, c-format
++-msgid "%d incoming packets delivered"
+++#: ../statistics.c:73
+++#, fuzzy, c-format
+++msgid "%u incoming packets delivered"
++ msgstr "%d pacotes entrantes despachados"
++ 
++-#: ../statistics.c:72
++-#, c-format
++-msgid "%d requests sent out"
+++#: ../statistics.c:74
+++#, fuzzy, c-format
+++msgid "%u requests sent out"
++ msgstr "%d requisições enviadas"
++ 
++ #. ?
++-#: ../statistics.c:73
++-#, c-format
++-msgid "%d outgoing packets dropped"
+++#: ../statistics.c:75
+++#, fuzzy, c-format
+++msgid "%u outgoing packets dropped"
++ msgstr "%d pacotes saintes descartados"
++ 
++-#: ../statistics.c:74
++-#, c-format
++-msgid "%d dropped because of missing route"
+++#: ../statistics.c:76
+++#, fuzzy, c-format
+++msgid "%u dropped because of missing route"
++ msgstr "%d descartados devido a falta de rota"
++ 
++-#: ../statistics.c:75
++-#, c-format
++-msgid "%d fragments dropped after timeout"
+++#: ../statistics.c:77
+++#, fuzzy, c-format
+++msgid "%u fragments dropped after timeout"
++ msgstr "%d fragmentos descartados após estouro de tempo"
++ 
++-#: ../statistics.c:76
++-#, c-format
++-msgid "%d reassemblies required"
+++#: ../statistics.c:78
+++#, fuzzy, c-format
+++msgid "%u reassemblies required"
++ msgstr "%d remontagens requeridas"
++ 
++ #. ?
++-#: ../statistics.c:77
++-#, c-format
++-msgid "%d packets reassembled ok"
+++#: ../statistics.c:79
+++#, fuzzy, c-format
+++msgid "%u packets reassembled ok"
++ msgstr "%d pacotes remontados sem problemas"
++ 
++-#: ../statistics.c:78
++-#, c-format
++-msgid "%d packet reassembles failed"
+++#: ../statistics.c:80
+++#, fuzzy, c-format
+++msgid "%u packet reassembles failed"
++ msgstr "%d remontagens de pacotes falharam"
++ 
++-#: ../statistics.c:79
++-#, c-format
++-msgid "%d fragments received ok"
+++#: ../statistics.c:81
+++#, fuzzy, c-format
+++msgid "%u fragments received ok"
++ msgstr "%d fragmentos recebidos sem problemas"
++ 
++-#: ../statistics.c:80
++-#, c-format
++-msgid "%d fragments failed"
+++#: ../statistics.c:82
+++#, fuzzy, c-format
+++msgid "%u fragments failed"
++ msgstr "%d fragmentos falharam"
++ 
++-#: ../statistics.c:81
++-#, c-format
++-msgid "%d fragments created"
+++#: ../statistics.c:83
+++#, fuzzy, c-format
+++msgid "%u fragments created"
++ msgstr "%d fragmentos criados"
++ 
++-#: ../statistics.c:86
++-#, c-format
++-msgid "%d ICMP messages received"
+++#: ../statistics.c:88
+++#, fuzzy, c-format
+++msgid "%u ICMP messages received"
++ msgstr "%d mensagens ICMP recebidas"
++ 
++-#: ../statistics.c:87
++-#, c-format
++-msgid "%d input ICMP message failed."
+++#: ../statistics.c:89
+++#, fuzzy, c-format
+++msgid "%u input ICMP message failed."
++ msgstr "%d mensagens ICMP entrantes falharam."
++ 
++-#: ../statistics.c:88 ../statistics.c:101
++-#, c-format
++-msgid "destination unreachable: %d"
+++#: ../statistics.c:90 ../statistics.c:103
+++#, fuzzy, c-format
+++msgid "destination unreachable: %u"
++ msgstr "destino não alcançável: %d"
++ 
++-#: ../statistics.c:89
++-#, c-format
++-msgid "timeout in transit: %d"
+++#: ../statistics.c:91
+++#, fuzzy, c-format
+++msgid "timeout in transit: %u"
++ msgstr "estouro de tempo em trânsito: %d"
++ 
++-#: ../statistics.c:90 ../statistics.c:103
++-#, c-format
++-msgid "wrong parameters: %d"
+++#: ../statistics.c:92 ../statistics.c:105
+++#, fuzzy, c-format
+++msgid "wrong parameters: %u"
++ msgstr "parâmetros errados: %d"
++ 
++ #. ?
++-#: ../statistics.c:91
++-#, c-format
++-msgid "source quenchs: %d"
+++#: ../statistics.c:93
+++#, fuzzy, c-format
+++msgid "source quenches: %u"
++ msgstr "source quenchs: %d"
++ 
++-#: ../statistics.c:92
++-#, c-format
++-msgid "redirects: %d"
+++#: ../statistics.c:94
+++#, fuzzy, c-format
+++msgid "redirects: %u"
++ msgstr "redireções: %d"
++ 
++-#: ../statistics.c:93
++-#, c-format
++-msgid "echo requests: %d"
+++#: ../statistics.c:95
+++#, fuzzy, c-format
+++msgid "echo requests: %u"
++ msgstr "requisições de eco: %d"
++ 
++-#: ../statistics.c:94 ../statistics.c:107
++-#, c-format
++-msgid "echo replies: %d"
+++#: ../statistics.c:96 ../statistics.c:109
+++#, fuzzy, c-format
+++msgid "echo replies: %u"
++ msgstr "respostas de eco: %d"
++ 
++-#: ../statistics.c:95
++-#, c-format
++-msgid "timestamp request: %d"
+++#: ../statistics.c:97
+++#, fuzzy, c-format
+++msgid "timestamp request: %u"
++ msgstr "requisições de timestamp: %d"
++ 
++-#: ../statistics.c:96
++-#, c-format
++-msgid "timestamp reply: %d"
+++#: ../statistics.c:98
+++#, fuzzy, c-format
+++msgid "timestamp reply: %u"
++ msgstr "respostas a timestamps: %d"
++ 
++-#: ../statistics.c:97
++-#, c-format
++-msgid "address mask request: %d"
+++#: ../statistics.c:99
+++#, fuzzy, c-format
+++msgid "address mask request: %u"
++ msgstr "requisições de mascara de endereço: %d"
++ 
++ #. ?
++-#: ../statistics.c:98
++-msgid "address mask replies"
++-msgstr "resposta a mascara de endereço"
+++#: ../statistics.c:100 ../statistics.c:113
+++#, fuzzy, c-format
+++msgid "address mask replies: %u"
+++msgstr "respostas a máscara de endereço: %d"
++ 
++ #. ?
++-#: ../statistics.c:99
++-#, c-format
++-msgid "%d ICMP messages sent"
+++#: ../statistics.c:101
+++#, fuzzy, c-format
+++msgid "%u ICMP messages sent"
++ msgstr "%d mensagens ICMP enviadas"
++ 
++-#: ../statistics.c:100
++-#, c-format
++-msgid "%d ICMP messages failed"
+++#: ../statistics.c:102
+++#, fuzzy, c-format
+++msgid "%u ICMP messages failed"
++ msgstr "%d mensagens ICMP falharam"
++ 
++-#: ../statistics.c:102
++-#, c-format
++-msgid "time exceeded: %d"
+++#: ../statistics.c:104
+++#, fuzzy, c-format
+++msgid "time exceeded: %u"
++ msgstr "tempo excedido: %d"
++ 
++ #. ?
++-#: ../statistics.c:104
++-#, c-format
++-msgid "source quench: %d"
+++#: ../statistics.c:106
+++#, fuzzy, c-format
+++msgid "source quench: %u"
++ msgstr "source quench: %d"
++ 
++-#: ../statistics.c:105
++-#, c-format
++-msgid "redirect: %d"
+++#: ../statistics.c:107
+++#, fuzzy, c-format
+++msgid "redirect: %u"
++ msgstr "redireções: %d"
++ 
++-#: ../statistics.c:106
++-#, c-format
++-msgid "echo request: %d"
+++#: ../statistics.c:108
+++#, fuzzy, c-format
+++msgid "echo request: %u"
++ msgstr "requisições de eco: %d"
++ 
++-#: ../statistics.c:108
++-#, c-format
++-msgid "timestamp requests: %d"
+++#: ../statistics.c:110
+++#, fuzzy, c-format
+++msgid "timestamp requests: %u"
++ msgstr "requisições de timestamp: %d"
++ 
++-#: ../statistics.c:109
++-#, c-format
++-msgid "timestamp replies: %d"
+++#: ../statistics.c:111
+++#, fuzzy, c-format
+++msgid "timestamp replies: %u"
++ msgstr "respostas a timestamp: %d"
++ 
++-#: ../statistics.c:110
++-#, c-format
++-msgid "address mask requests: %d"
+++#: ../statistics.c:112
+++#, fuzzy, c-format
+++msgid "address mask requests: %u"
++ msgstr "requisições de máscara de endereço: %d"
++ 
++-#: ../statistics.c:111
++-#, c-format
++-msgid "address mask replies: %d"
++-msgstr "respostas a máscara de endereço: %d"
++-
++-#: ../statistics.c:116
+++#: ../statistics.c:118
++ #, c-format
++ msgid "RTO algorithm is %s"
++ msgstr "Algorítmo RTO é %s"
++ 
++-#: ../statistics.c:120
++-#, c-format
++-msgid "%d active connections openings"
+++#: ../statistics.c:122
+++#, fuzzy, c-format
+++msgid "%u active connections openings"
++ msgstr "%d tentativas de conexão falharam"
++ 
++-#: ../statistics.c:121
++-#, c-format
++-msgid "%d passive connection openings"
+++#: ../statistics.c:123
+++#, fuzzy, c-format
+++msgid "%u passive connection openings"
++ msgstr "%d opens passivos"
++ 
++-#: ../statistics.c:122
++-#, c-format
++-msgid "%d failed connection attempts"
+++#: ../statistics.c:124
+++#, fuzzy, c-format
+++msgid "%u failed connection attempts"
++ msgstr "%d tentativas de conexão falharam"
++ 
++-#: ../statistics.c:123
++-#, c-format
++-msgid "%d connection resets received"
+++#: ../statistics.c:125
+++#, fuzzy, c-format
+++msgid "%u connection resets received"
++ msgstr "%d resets de conexão recebidas"
++ 
++-#: ../statistics.c:124
++-#, c-format
++-msgid "%d connections established"
+++#: ../statistics.c:126
+++#, fuzzy, c-format
+++msgid "%u connections established"
++ msgstr "%d conexões estabelecidas"
++ 
++-#: ../statistics.c:125
++-#, c-format
++-msgid "%d segments received"
+++#: ../statistics.c:127
+++#, fuzzy, c-format
+++msgid "%u segments received"
++ msgstr "%d segmentos recebidos"
++ 
++-#: ../statistics.c:126
++-#, c-format
++-msgid "%d segments send out"
+++#: ../statistics.c:128
+++#, fuzzy, c-format
+++msgid "%u segments send out"
++ msgstr "%d segmentos enviados"
++ 
++-#: ../statistics.c:127
++-#, c-format
++-msgid "%d segments retransmited"
+++#: ../statistics.c:129
+++#, fuzzy, c-format
+++msgid "%u segments retransmited"
++ msgstr "%d segmentos retransmitidos"
++ 
++-#: ../statistics.c:128
++-#, c-format
++-msgid "%d bad segments received."
+++#: ../statistics.c:130
+++#, fuzzy, c-format
+++msgid "%u bad segments received."
++ msgstr "%d segmentos ruins recebidos."
++ 
++-#: ../statistics.c:129
++-#, c-format
++-msgid "%d resets sent"
+++#: ../statistics.c:131
+++#, fuzzy, c-format
+++msgid "%u resets sent"
++ msgstr "%d resets enviados"
++ 
++-#: ../statistics.c:134
++-#, c-format
++-msgid "%d packets received"
+++#: ../statistics.c:136
+++#, fuzzy, c-format
+++msgid "%u packets received"
++ msgstr "%d pacotes recebidos"
++ 
++-#: ../statistics.c:135
++-#, c-format
++-msgid "%d packets to unknown port received."
+++#: ../statistics.c:137
+++#, fuzzy, c-format
+++msgid "%u packets to unknown port received."
++ msgstr "%d pacotes para portas desconhecidas recebidos."
++ 
++-#: ../statistics.c:136
++-#, c-format
++-msgid "%d packet receive errors"
+++#: ../statistics.c:138
+++#, fuzzy, c-format
+++msgid "%u packet receive errors"
++ msgstr "%d erros de recepção de pacotes"
++ 
++-#: ../statistics.c:137
++-#, c-format
++-msgid "%d packets sent"
+++#: ../statistics.c:139
+++#, fuzzy, c-format
+++msgid "%u packets sent"
++ msgstr "%d pacotes enviados"
++ 
++-#: ../statistics.c:142
+++#: ../statistics.c:144
+++#, fuzzy, c-format
+++msgid "%u SYN cookies sent"
+++msgstr "%d pacotes enviados"
+++
+++#: ../statistics.c:145
+++#, fuzzy, c-format
+++msgid "%u SYN cookies received"
+++msgstr "%d pacotes recebidos"
+++
+++#: ../statistics.c:146
+++#, fuzzy, c-format
+++msgid "%u invalid SYN cookies received"
+++msgstr "%d pacotes recebidos"
+++
+++#: ../statistics.c:148
+++#, fuzzy, c-format
+++msgid "%u resets received for embryonic SYN_RECV sockets"
+++msgstr "%d resets recebidos para sockets embriônicos SYN_RECV"
+++
+++#: ../statistics.c:150
+++#, fuzzy, c-format
+++msgid "%u packets pruned from receive queue because of socket buffer overrun"
+++msgstr "%d pacotes retirados da fila de recepção devido a sobreposição de buffers de sockets"
+++
+++#. obsolete: 2.2.0 doesn't do that anymore
+++#: ../statistics.c:153
+++#, fuzzy, c-format
+++msgid "%u packets pruned from receive queue"
+++msgstr "%d pacotes retirados da fila de fora de ordem (out-of-order)"
+++
+++#: ../statistics.c:154
+++#, fuzzy, c-format
+++msgid ""
+++"%u packets dropped from out-of-order queue because of socket buffer overrun"
+++msgstr "%d pacotes descartados da fila de fora de ordem devido a sobreposição de buffers de sockets"
+++
+++#: ../statistics.c:156
+++#, fuzzy, c-format
+++msgid "%u ICMP packets dropped because they were out-of-window"
+++msgstr "%d pacotes ICMP descartados porque estavam fora da janela"
+++
+++#: ../statistics.c:158
+++#, fuzzy, c-format
+++msgid "%u ICMP packets dropped because socket was locked"
+++msgstr "%d pacotes ICMP descartadas porque o socket estava bloqueado"
+++
+++#: ../statistics.c:160
+++#, c-format
+++msgid "%u TCP sockets finished time wait in fast timer"
+++msgstr ""
+++
+++#: ../statistics.c:161
+++#, c-format
+++msgid "%u time wait sockets recycled by time stamp"
+++msgstr ""
+++
+++#: ../statistics.c:162
+++#, c-format
+++msgid "%u TCP sockets finished time wait in slow timer"
+++msgstr ""
+++
+++#: ../statistics.c:163
+++#, c-format
+++msgid "%u passive connections rejected because of time stamp"
+++msgstr ""
+++
+++#: ../statistics.c:165
+++#, c-format
+++msgid "%u active connections rejected because of time stamp"
+++msgstr ""
+++
+++#: ../statistics.c:167
++ #, c-format
++-msgid "%d SYN cookies sent"
+++msgid "%u packets rejects in established connections because of timestamp"
+++msgstr ""
+++
+++#: ../statistics.c:169
+++#, fuzzy, c-format
+++msgid "%u delayed acks sent"
++ msgstr "%d pacotes enviados"
++ 
++-#: ../statistics.c:143
+++#: ../statistics.c:170
++ #, c-format
++-msgid "%d SYN cookies received"
++-msgstr "%d pacotes recebidos"
+++msgid "%u delayed acks further delayed because of locked socket"
+++msgstr ""
++ 
++-#: ../statistics.c:144
+++#: ../statistics.c:172
++ #, c-format
++-msgid "%d invalid SYN cookies received"
++-msgstr "%d pacotes recebidos"
+++msgid "Quick ack mode was activated %u times"
+++msgstr ""
++ 
++-#: ../statistics.c:146
+++#: ../statistics.c:173
++ #, c-format
++-msgid "%d resets received for embryonic SYN_RECV sockets"
++-msgstr "%d resets recebidos para sockets embriônicos SYN_RECV"
+++msgid "%u times the listen queue of a socket overflowed"
+++msgstr ""
++ 
++-#: ../statistics.c:148
+++#: ../statistics.c:175
++ #, c-format
++-msgid "%d packets pruned from receive queue because of socket buffer overrun"
+++msgid "%u SYNs to LISTEN sockets ignored"
++ msgstr ""
++-"%d pacotes retirados da fila de recepção devido a sobreposição de buffers de "
++-"sockets"
++ 
++-#. obsolete: 2.2.0 doesn't do that anymore
++-#: ../statistics.c:151
+++#: ../statistics.c:176
+++#, c-format
+++msgid "%u packets directly queued to recvmsg prequeue."
+++msgstr ""
+++
+++#: ../statistics.c:178
++ #, c-format
++-msgid "%d packets pruned from out-of-order queue"
+++msgid "%u of bytes directly received from backlog"
+++msgstr ""
+++
+++#: ../statistics.c:180
+++#, c-format
+++msgid "%u of bytes directly received from prequeue"
+++msgstr ""
+++
+++#: ../statistics.c:182
+++#, fuzzy, c-format
+++msgid "%u packets dropped from prequeue"
++ msgstr "%d pacotes retirados da fila de fora de ordem (out-of-order)"
++ 
++-#: ../statistics.c:152
+++#: ../statistics.c:183
+++#, fuzzy, c-format
+++msgid "%u packet headers predicted"
+++msgstr "%d pacotes recebidos"
+++
+++#: ../statistics.c:184
++ #, c-format
++-msgid ""
++-"%d packets dropped from out-of-order queue because of socket buffer overrun"
+++msgid "%u packets header predicted and directly queued to user"
++ msgstr ""
++-"%d pacotes descartados da fila de fora de ordem devido a sobreposição de "
++-"buffers de sockets"
++ 
++-#: ../statistics.c:154
+++#: ../statistics.c:186
++ #, c-format
++-msgid "%d ICMP packets dropped because they were out-of-window"
++-msgstr "%d pacotes ICMP descartados porque estavam fora da janela"
+++msgid "Ran %u times out of system memory during packet sending"
+++msgstr ""
++ 
++-#: ../statistics.c:156
+++#: ../statistics.c:188
+++#, fuzzy, c-format
+++msgid "%u acknowledgments not containing data received"
+++msgstr "%d pacotes para portas desconhecidas recebidos."
+++
+++#: ../statistics.c:189
++ #, c-format
++-msgid "%d ICMP packets dropped because socket was locked"
++-msgstr "%d pacotes ICMP descartadas porque o socket estava bloqueado"
+++msgid "%u predicted acknowledgments"
+++msgstr ""
+++
+++#: ../statistics.c:190
+++#, c-format
+++msgid "%u times recovered from packet loss due to fast retransmit"
+++msgstr ""
+++
+++#: ../statistics.c:191
+++#, c-format
+++msgid "%u times recovered from packet loss due to SACK data"
+++msgstr ""
+++
+++#: ../statistics.c:192
+++#, fuzzy, c-format
+++msgid "%u bad SACKs received"
+++msgstr "%d segmentos ruins recebidos."
+++
+++#: ../statistics.c:193
+++#, c-format
+++msgid "Detected reordering %u times using FACK"
+++msgstr ""
+++
+++#: ../statistics.c:194
+++#, c-format
+++msgid "Detected reordering %u times using SACK"
+++msgstr ""
+++
+++#: ../statistics.c:195
+++#, c-format
+++msgid "Detected reordering %u times using time stamp"
+++msgstr ""
+++
+++#: ../statistics.c:196
+++#, c-format
+++msgid "Detected reordering %u times using reno fast retransmit"
+++msgstr ""
+++
+++#: ../statistics.c:197
+++#, c-format
+++msgid "%u congestion windows fully recovered"
+++msgstr ""
+++
+++#: ../statistics.c:198
+++#, c-format
+++msgid "%u congestion windows partially recovered using Hoe heuristic"
+++msgstr ""
+++
+++#: ../statistics.c:199
+++#, c-format
+++msgid "%u congestion window recovered using DSACK"
+++msgstr ""
+++
+++#: ../statistics.c:200
+++#, c-format
+++msgid "%u congestion windows recovered after partial ack"
+++msgstr ""
+++
+++#: ../statistics.c:201
+++#, fuzzy, c-format
+++msgid "%u retransmits lost"
+++msgstr "%d resets enviados"
+++
+++#: ../statistics.c:202
+++#, c-format
+++msgid "%u timeouts after reno fast retransmit"
+++msgstr ""
+++
+++#: ../statistics.c:203
+++#, c-format
+++msgid "%u timeouts after SACK recovery"
+++msgstr ""
+++
+++#: ../statistics.c:204
+++#, c-format
+++msgid "%u timeouts in loss state"
+++msgstr ""
+++
+++#: ../statistics.c:205
+++#, fuzzy, c-format
+++msgid "%u fast retransmits"
+++msgstr "%d segmentos retransmitidos"
+++
+++#: ../statistics.c:206
+++#, c-format
+++msgid "%u forward retransmits"
+++msgstr ""
+++
+++#: ../statistics.c:207
+++#, c-format
+++msgid "%u retransmits in slow start"
+++msgstr ""
+++
+++#: ../statistics.c:208
+++#, c-format
+++msgid "%u other TCP timeouts"
+++msgstr ""
+++
+++#: ../statistics.c:209
+++#, fuzzy, c-format
+++msgid "%u reno fast retransmits failed"
+++msgstr "%d segmentos retransmitidos"
+++
+++#: ../statistics.c:210
+++#, fuzzy, c-format
+++msgid "%u sack retransmits failed"
+++msgstr "%d remontagens de pacotes falharam"
+++
+++#: ../statistics.c:211
+++#, c-format
+++msgid "%u times receiver scheduled too late for direct processing"
+++msgstr ""
+++
+++#: ../statistics.c:212
+++#, fuzzy, c-format
+++msgid "%u packets collapsed in receive queue due to low socket buffer"
+++msgstr "%d pacotes retirados da fila de recepção devido a sobreposição de buffers de sockets"
+++
+++#: ../statistics.c:213
+++#, c-format
+++msgid "%u DSACKs sent for old packets"
+++msgstr ""
+++
+++#: ../statistics.c:214
+++#, c-format
+++msgid "%u DSACKs sent for out of order packets"
+++msgstr ""
+++
+++#: ../statistics.c:215
+++#, fuzzy, c-format
+++msgid "%u DSACKs received"
+++msgstr "%d pacotes recebidos"
+++
+++#: ../statistics.c:216
+++#, fuzzy, c-format
+++msgid "%u DSACKs for out of order packets received"
+++msgstr "%d total de pacotes recebidos"
+++
+++#: ../statistics.c:217
+++#, fuzzy, c-format
+++msgid "%u connections reset due to unexpected SYN"
+++msgstr "%d resets de conexão recebidas"
+++
+++#: ../statistics.c:218
+++#, fuzzy, c-format
+++msgid "%u connections reset due to unexpected data"
+++msgstr "%d resets de conexão recebidas"
+++
+++#: ../statistics.c:219
+++#, fuzzy, c-format
+++msgid "%u connections reset due to early user close"
+++msgstr "%d resets de conexão recebidas"
+++
+++#: ../statistics.c:220
+++#, c-format
+++msgid "%u connections aborted due to memory pressure"
+++msgstr ""
+++
+++#: ../statistics.c:221
+++#, fuzzy, c-format
+++msgid "%u connections aborted due to timeout"
+++msgstr "%d resets de conexão recebidas"
++ 
++ #: ../statistics.c:222
+++#, c-format
+++msgid "%u connections aborted after user close in linger timeout"
+++msgstr ""
+++
+++#: ../statistics.c:223
+++#, c-format
+++msgid "%u times unabled to send RST due to no memory"
+++msgstr ""
+++
+++#: ../statistics.c:224
+++#, c-format
+++msgid "TCP ran low on memory %u times"
+++msgstr ""
+++
+++#: ../statistics.c:225
+++#, c-format
+++msgid "%u TCP data loss events"
+++msgstr ""
+++
+++#: ../statistics.c:292
++ msgid "enabled"
++ msgstr "habilitado"
++ 
++-#: ../statistics.c:222
+++#: ../statistics.c:292
++ msgid "disabled"
++ msgstr "desabilitado"
++ 
++-#: ../statistics.c:272
++-#, c-format
++-msgid "unknown title %s\n"
++-msgstr "título %s desconhecido\n"
++-
++-#: ../statistics.c:298
+++#: ../statistics.c:375
++ msgid "error parsing /proc/net/snmp"
++ msgstr "erro lendo /proc/net/snmp"
++ 
++-#: ../statistics.c:311
+++#: ../statistics.c:388
++ msgid "cannot open /proc/net/snmp"
++ msgstr "não foi possível abrir /proc/net/snmp"
++ 
++@@ -1819,89 +2074,95 @@ msgstr "O tipo de hardware `%s' não é su
++ msgid "Cannot change line discipline to `%s'.\n"
++ msgstr "Não foi possível mudar a disciplina da linha para `%s'.\n"
++ 
++-#: ../lib/af.c:145 ../lib/hw.c:148
+++#: ../lib/af.c:153 ../lib/hw.c:161
++ msgid "UNSPEC"
++ msgstr "Não Especificado"
++ 
++-#: ../lib/af.c:147
+++#: ../lib/af.c:155
++ msgid "UNIX Domain"
++ msgstr "UNIX Domain"
++ 
++-#: ../lib/af.c:150
+++#: ../lib/af.c:158
++ msgid "DARPA Internet"
++ msgstr "DARPA Internet"
++ 
++-#: ../lib/af.c:153
+++#: ../lib/af.c:161
++ msgid "IPv6"
++ msgstr "IPv6"
++ 
++-#: ../lib/af.c:156 ../lib/hw.c:169
+++#: ../lib/af.c:164 ../lib/hw.c:182
++ msgid "AMPR AX.25"
++ msgstr "AX.25 AMPR"
++ 
++-#: ../lib/af.c:159 ../lib/hw.c:175
+++#: ../lib/af.c:167 ../lib/hw.c:188
++ msgid "AMPR NET/ROM"
++ msgstr "NET/ROM AMPR"
++ 
++-#: ../lib/af.c:162
+++#: ../lib/af.c:170
++ msgid "Novell IPX"
++ msgstr "Novell IPX"
++ 
++-#: ../lib/af.c:165
+++#: ../lib/af.c:173
++ msgid "Appletalk DDP"
++ msgstr "Appletalk DDP"
++ 
++-#: ../lib/af.c:168 ../lib/hw.c:207
+++#: ../lib/af.c:176 ../lib/hw.c:223
++ msgid "Econet"
++ msgstr "Econet"
++ 
++-#: ../lib/af.c:171 ../lib/hw.c:172
+++#: ../lib/af.c:179
+++msgid "CCITT X.25"
+++msgstr ""
+++
+++#: ../lib/af.c:182 ../lib/hw.c:185
++ msgid "AMPR ROSE"
++ msgstr "AMPR ROSE"
++ 
++-#: ../lib/af.c:174 ../lib/hw.c:160
+++#: ../lib/af.c:185 ../lib/hw.c:173
++ msgid "Ash"
++ msgstr "Ash"
++ 
++-#: ../lib/af.c:232
+++#: ../lib/af.c:243
+++#, c-format
++ msgid "Please don't supply more than one address family.\n"
++ msgstr "Por favor não especifique mais que uma família de endereços.\n"
++ 
++-#: ../lib/af.c:293
+++#: ../lib/af.c:304
+++#, c-format
++ msgid "Too much address family arguments.\n"
++ msgstr "Excesso no número de famílias de endereços.\n"
++ 
++-#: ../lib/af.c:304
+++#: ../lib/af.c:315
++ #, c-format
++ msgid "Unknown address family `%s'.\n"
++ msgstr "Família de endereços `%s' desconhecida.\n"
++ 
++-#: ../lib/arcnet.c:53 ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52
++-#: ../lib/fddi.c:67 ../lib/hippi.c:68 ../lib/inet.c:244 ../lib/inet.c:259
++-#: ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ../lib/rose.c:71
++-#: ../lib/rose.c:126 ../lib/unix.c:56 ../lib/unix.c:76
++-msgid "[NONE SET]"
++-msgstr "[Nenhum configurado]"
++-
++-#: ../lib/arcnet.c:81 ../lib/arcnet.c:96
+++#: ../lib/arcnet.c:70 ../lib/arcnet.c:85
++ #, c-format
++ msgid "in_arcnet(%s): invalid arcnet address!\n"
++ msgstr "in_arcnet(%s): endereço arcnet inválido!\n"
++ 
++-#: ../lib/arcnet.c:108
+++#: ../lib/arcnet.c:97
++ #, c-format
++ msgid "in_arcnet(%s): trailing : ignored!\n"
++ msgstr "in_arcnet(%s): trailing : ignorado!\n"
++ 
++-#: ../lib/arcnet.c:120
+++#: ../lib/arcnet.c:109
++ #, c-format
++ msgid "in_arcnet(%s): trailing junk!\n"
++ msgstr "in_arcnet(%s): lixo no trailing!\n"
++ 
++ #: ../lib/ash.c:81
+++#, c-format
++ msgid "Malformed Ash address"
++ msgstr "Endereço Ash mal formado"
++ 
+++#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244
+++#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78
+++#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76
+++msgid "[NONE SET]"
+++msgstr "[Nenhum configurado]"
+++
++ #: ../lib/ax25.c:97 ../lib/netrom.c:100
++ msgid "Invalid callsign"
++ msgstr "Callsign inválido"
++@@ -1911,22 +2172,21 @@ msgid "Callsign too long"
++ msgstr "Callsign muito longo"
++ 
++ #: ../lib/ax25_gr.c:47
+++#, c-format
++ msgid "AX.25 not configured in this system.\n"
++ msgstr "O AX.25 não foi configurado neste sistema.\n"
++ 
++ #: ../lib/ax25_gr.c:50
+++#, c-format
++ msgid "Kernel AX.25 routing table\n"
++ msgstr "Tabela de roteamento AX.25 do kernel\n"
++ 
++ #. xxx
++ #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
+++#, c-format
++ msgid "Destination  Iface    Use\n"
++ msgstr "Destino      Iface    Uso\n"
++ 
++-#: ../lib/ddp_gr.c:21
++-msgid "Routing table for `ddp' not yet supported.\n"
++-msgstr "Tabela de roteamento para `ddp' ainda não suportada.\n"
++-
++ #: ../lib/ether.c:74 ../lib/ether.c:91
++ #, c-format
++ msgid "in_ether(%s): invalid ether address!\n"
++@@ -1942,253 +2202,268 @@ msgstr "in_ether(%s): trailing : ignorad
++ msgid "in_ether(%s): trailing junk!\n"
++ msgstr "in_ether(%s): lixo no trailing!\n"
++ 
++-#: ../lib/fddi.c:95 ../lib/fddi.c:110
+++#: ../lib/fddi.c:84 ../lib/fddi.c:99
++ #, c-format
++ msgid "in_fddi(%s): invalid fddi address!\n"
++ msgstr "in_fddi(%S): endereço fddi inválido!\n"
++ 
++-#: ../lib/fddi.c:122
+++#: ../lib/fddi.c:111
++ #, c-format
++ msgid "in_fddi(%s): trailing : ignored!\n"
++ msgstr "in_fddi(%s): trailing : ignorado!\n"
++ 
++-#: ../lib/fddi.c:134
+++#: ../lib/fddi.c:123
++ #, c-format
++ msgid "in_fddi(%s): trailing junk!\n"
++ msgstr "in_fddi(%s): lixo no trailing!\n"
++ 
++-#: ../lib/getroute.c:97 ../lib/setroute.c:76
+++#: ../lib/getroute.c:101 ../lib/setroute.c:80
++ #, c-format
++ msgid "Address family `%s' not supported.\n"
++ msgstr "Família de endereços `%s' não suportada.\n"
++ 
++-#: ../lib/getroute.c:103 ../lib/setroute.c:80
+++#: ../lib/getroute.c:107 ../lib/setroute.c:84
++ #, c-format
++ msgid "No routing for address family `%s'.\n"
++ msgstr "Nenhum roteamento para a família `%s'\n"
++ 
++-#: ../lib/hippi.c:96 ../lib/hippi.c:111
+++#: ../lib/hippi.c:84 ../lib/hippi.c:99
++ #, c-format
++ msgid "in_hippi(%s): invalid hippi address!\n"
++ msgstr "in_fddi(%S): endereço fddi inválido!\n"
++ 
++-#: ../lib/hippi.c:123
+++#: ../lib/hippi.c:111
++ #, c-format
++ msgid "in_hippi(%s): trailing : ignored!\n"
++ msgstr "in_fddi(%s): trailing : ignorado!\n"
++ 
++-#: ../lib/hippi.c:134
+++#: ../lib/hippi.c:122
++ #, c-format
++ msgid "in_hippi(%s): trailing junk!\n"
++ msgstr "in_fddi(%s): lixo no trailing!\n"
++ 
++-#: ../lib/hw.c:147
+++#: ../lib/hw.c:160
++ msgid "Local Loopback"
++ msgstr "Loopback Local"
++ 
++-#: ../lib/hw.c:150
+++#: ../lib/hw.c:163
++ msgid "Serial Line IP"
++ msgstr "SLIP"
++ 
++-#: ../lib/hw.c:151
+++#: ../lib/hw.c:164
++ msgid "VJ Serial Line IP"
++ msgstr "SLIP VJ"
++ 
++-#: ../lib/hw.c:152
+++#: ../lib/hw.c:165
++ msgid "6-bit Serial Line IP"
++ msgstr "SLIP 6 bits"
++ 
++-#: ../lib/hw.c:153
+++#: ../lib/hw.c:166
++ msgid "VJ 6-bit Serial Line IP"
++ msgstr "SLIP VJ 6 bits"
++ 
++-#: ../lib/hw.c:154
+++#: ../lib/hw.c:167
++ msgid "Adaptive Serial Line IP"
++ msgstr "SLIP Adaptativo"
++ 
++-#: ../lib/hw.c:157
+++#: ../lib/hw.c:170
++ msgid "Ethernet"
++ msgstr "Ethernet"
++ 
++-#: ../lib/hw.c:163
+++#: ../lib/hw.c:176
++ msgid "Fiber Distributed Data Interface"
++ msgstr "FDDI - Fibra Ótica"
++ 
++-#: ../lib/hw.c:166
+++#: ../lib/hw.c:179
++ msgid "HIPPI"
++ msgstr "HIPPI"
++ 
++-#: ../lib/hw.c:178
+++#: ../lib/hw.c:191
+++msgid "generic X.25"
+++msgstr ""
+++
+++#: ../lib/hw.c:194
++ msgid "IPIP Tunnel"
++ msgstr "Túnel IPIP"
++ 
++-#: ../lib/hw.c:181
+++#: ../lib/hw.c:197
++ msgid "Point-to-Point Protocol"
++ msgstr "Protocolo Ponto-a-Ponto"
++ 
++-#: ../lib/hw.c:184
+++#: ../lib/hw.c:200
++ msgid "(Cisco)-HDLC"
++ msgstr "(Cisco)-HDLC"
++ 
++-#: ../lib/hw.c:185
+++#: ../lib/hw.c:201
++ msgid "LAPB"
++ msgstr "LAPB"
++ 
++-#: ../lib/hw.c:188
+++#: ../lib/hw.c:204
++ msgid "ARCnet"
++ msgstr "ARCnet"
++ 
++-#: ../lib/hw.c:191
+++#: ../lib/hw.c:207
++ msgid "Frame Relay DLCI"
++ msgstr "Frame Relay DLCI"
++ 
++-#: ../lib/hw.c:192
+++#: ../lib/hw.c:208
++ msgid "Frame Relay Access Device"
++ msgstr "FRAD - Dispositivo de Acesso a Frame Relay"
++ 
++-#: ../lib/hw.c:195
+++#: ../lib/hw.c:211
++ msgid "IPv6-in-IPv4"
++ msgstr "IPv6 sobre IPv4"
++ 
++-#: ../lib/hw.c:198
+++#: ../lib/hw.c:214
++ msgid "IrLAP"
++ msgstr "IrLAP"
++ 
++-#: ../lib/hw.c:201
+++#: ../lib/hw.c:217
++ msgid "16/4 Mbps Token Ring"
++ msgstr "16/4 Mbps Token Ring"
++ 
++-#: ../lib/hw.c:203
+++#: ../lib/hw.c:219
++ msgid "16/4 Mbps Token Ring (New)"
++ msgstr "16/4 Mbps Token Ring (Novo)"
++ 
+++#: ../lib/hw.c:226
+++msgid "Generic EUI-64"
+++msgstr ""
+++
++ #: ../lib/inet.c:153 ../lib/inet6.c:79
++ #, c-format
++ msgid "rresolve: unsupport address family %d !\n"
++ msgstr "rresolve: família de endereços %d não suportada!\n"
++ 
++-#: ../lib/inet6_gr.c:79
+++#: ../lib/inet6.c:131
+++#, fuzzy
+++msgid "[UNKNOWN]"
+++msgstr "DESCONHECIDA"
+++
+++#: ../lib/inet6_gr.c:71
+++#, c-format
++ msgid "INET6 (IPv6) not configured in this system.\n"
++ msgstr "NET/ROM não configurado neste sistema.\n"
++ 
++-#: ../lib/inet6_gr.c:82
+++#: ../lib/inet6_gr.c:74
+++#, c-format
++ msgid "Kernel IPv6 routing table\n"
++ msgstr "Tabela de Roteamento IPv6 do Kernel\n"
++ 
++-#: ../lib/inet6_gr.c:84
+++#: ../lib/inet6_gr.c:76
+++#, c-format
++ msgid ""
++-"Destination                                 Next Hop                         "
++-"       Flags Metric Ref    Use Iface\n"
++-msgstr ""
++-"Destino                                     Próximo \"Hop\"                  "
++-"        Opções Métrica Ref   Uso Iface\n"
+++"Destination                                 Next "
+++"Hop                                Flags Metric Ref    Use Iface\n"
+++msgstr "Destino                                     Próximo \"Hop\"                          Opções Métrica Ref   Uso Iface\n"
++ 
++-#: ../lib/inet6_gr.c:158
+++#: ../lib/inet6_gr.c:150
+++#, c-format
++ msgid "Kernel IPv6 Neighbour Cache\n"
++ msgstr "Cache de Vizinhos IPv6 do Kernel\n"
++ 
++-#: ../lib/inet6_gr.c:161
+++#: ../lib/inet6_gr.c:153
+++#, c-format
++ msgid ""
++ "Neighbour                                   HW Address        Iface    Flags "
++ "Ref State\n"
++-msgstr ""
++-"Vizinho                                     Endereço HW       Iface   Opções "
++-"Estado Ref\n"
+++msgstr "Vizinho                                     Endereço HW       Iface   Opções Estado Ref\n"
++ 
++-#: ../lib/inet6_gr.c:165
+++#: ../lib/inet6_gr.c:157
+++#, c-format
++ msgid ""
++ "Neighbour                                   HW Address        Iface    Flags "
++ "Ref State            Stale(sec) Delete(sec)\n"
++ msgstr ""
++-"Vizinho                                     Endereço HW       Iface   Opções "
++-"Estado Ref\n"
+++"Vizinho                                     Endereço HW       Iface   Opções Estado Ref\n"
++ "       Parado(seg) Remover(seg)\n"
++ 
++ #: ../lib/inet6_sr.c:46
+++#, c-format
++ msgid "Usage: inet6_route [-vF] del Target\n"
++ msgstr "Uso: inet6_route [-vF] del Destino\n"
++ 
++ #: ../lib/inet6_sr.c:47
+++#, c-format
++ msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
++ msgstr "       inet6_route [-vF] add Destino [gw Gw] [metric M] [[dev] If]\n"
++ 
++ #: ../lib/inet6_sr.c:48
+++#, c-format
++ msgid "       inet6_route [-FC] flush      NOT supported\n"
++ msgstr "       inet6_route [-FC] flush      NÃO suportado\n"
++ 
++-#: ../lib/inet6_sr.c:182
+++#: ../lib/inet6_sr.c:188
+++#, c-format
++ msgid "Flushing `inet6' routing table not supported\n"
++ msgstr "Limpeza da tabela de roteamento `inet6' não é suportada\n"
++ 
++ #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
+++#, c-format
++ msgid "INET (IPv4) not configured in this system.\n"
++ msgstr "NET/ROM não configurado neste sistema.\n"
++ 
++ #: ../lib/inet_gr.c:53
+++#, c-format
++ msgid "Kernel IP routing table\n"
++ msgstr "Tabela de Roteamento IP do Kernel\n"
++ 
++ #: ../lib/inet_gr.c:56
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
++ "Iface\n"
++-msgstr ""
++-"Destino         Roteador        MáscaraGen.    Opções Métrica Ref   Uso "
++-"Iface\n"
+++msgstr "Destino         Roteador        MáscaraGen.    Opções Métrica Ref   Uso Iface\n"
++ 
++ #: ../lib/inet_gr.c:59
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags   MSS Window  irtt "
++ "Iface\n"
++-msgstr ""
++-"Destino         Roteador        MáscaraGen.    Opções   MSS Janela  irtt "
++-"Iface\n"
+++msgstr "Destino         Roteador        MáscaraGen.    Opções   MSS Janela  irtt Iface\n"
++ 
++ #: ../lib/inet_gr.c:62
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt\n"
++-msgstr ""
++-"Destino         Roteador        MáscaraGen     Opções Métrica Ref   Uso "
++-"Iface    MSS   Janela irtt\n"
+++msgstr "Destino         Roteador        MáscaraGen     Opções Métrica Ref   Uso Iface    MSS   Janela irtt\n"
++ 
++ #: ../lib/inet_gr.c:237
+++#, c-format
++ msgid "Kernel IP routing cache\n"
++ msgstr "Tabela de Roteamento IP do Kernel\n"
++ 
++ #: ../lib/inet_gr.c:258
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface\n"
++-msgstr ""
++-"Destino         Roteador        MáscaraGen.    Opções Métrica Ref   Uso "
++-"Iface\n"
+++msgstr "Destino         Roteador        MáscaraGen.    Opções Métrica Ref   Uso Iface\n"
++ 
++ #: ../lib/inet_gr.c:261
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags   MSS Window  irtt "
++ "Iface\n"
++-msgstr ""
++-"Destino         Roteador        MáscaraGen.    Opções   MSS Janela  irtt "
++-"Iface\n"
+++msgstr "Destino         Roteador        MáscaraGen.    Opções   MSS Janela  irtt Iface\n"
++ 
++ #: ../lib/inet_gr.c:266
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt  HH  Arp\n"
++-msgstr ""
++-"Destino         Roteador        Origem         Opções Métrica Ref   Uso "
++-"Iface    MSS   Janela irtt   HH  Arp\n"
+++msgstr "Destino         Roteador        Origem         Opções Métrica Ref   Uso Iface    MSS   Janela irtt   HH  Arp\n"
++ 
++ #: ../lib/inet_gr.c:290
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
++-msgstr ""
++-"Destino         Roteador        Origem         Opções Métrica Ref   Uso "
++-"Iface    MSS   Janela irtt   HH  Arp\n"
+++msgstr "Destino         Roteador        Origem         Opções Métrica Ref   Uso Iface    MSS   Janela irtt   HH  Arp\n"
++ 
++-#: ../lib/inet_sr.c:50
+++#: ../lib/inet_sr.c:51
+++#, c-format
++ msgid ""
++ "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
++ "[[dev] If]\n"
++@@ -2196,31 +2471,36 @@ msgstr ""
++ "Uso: inet_route [-vF] del {-host|-net} Destino[/prefixo] [gw Gw] [metric M] "
++ "[[dev] If]\n"
++ 
++-#: ../lib/inet_sr.c:51
+++#: ../lib/inet_sr.c:52
+++#, c-format
++ msgid ""
++ "       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
++ msgstr ""
++ "       inet_route [-vF] add {-host|-net} Destino[/prefixo] [gw Gw] [metric "
++ "M]\n"
++ 
++-#: ../lib/inet_sr.c:52
+++#: ../lib/inet_sr.c:53
+++#, c-format
++ msgid ""
++ "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
++ msgstr ""
++ "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
++ 
++-#: ../lib/inet_sr.c:53
+++#: ../lib/inet_sr.c:54
+++#, c-format
++ msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
++ msgstr "                              [mod] [dyn] [reinstate] [[dev] If]\n"
++ 
++-#: ../lib/inet_sr.c:54
+++#: ../lib/inet_sr.c:55
+++#, c-format
++ msgid ""
++ "       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
++ msgstr ""
++ "       inet_route [-vF] add {-host|-net} Destino[/prefixo] [metric M] "
++ "reject\n"
++ 
++-#: ../lib/inet_sr.c:55
+++#: ../lib/inet_sr.c:56
+++#, c-format
++ msgid "       inet_route [-FC] flush      NOT supported\n"
++ msgstr "       inet_route [-FC] flush      NÃO suportado\n"
++ 
++@@ -2230,14 +2510,17 @@ msgid "route: %s: cannot use a NETWORK a
++ msgstr "route: %s: não é possível usar uma REDE como roteador!\n"
++ 
++ #: ../lib/inet_sr.c:174
+++#, c-format
++ msgid "route: Invalid MSS/MTU.\n"
++ msgstr "route: MSS inválido.\n"
++ 
++ #: ../lib/inet_sr.c:187
+++#, c-format
++ msgid "route: Invalid window.\n"
++ msgstr "route: janela inválida.\n"
++ 
++ #: ../lib/inet_sr.c:203
+++#, c-format
++ msgid "route: Invalid initial rtt.\n"
++ msgstr "route: rtt inicial inválido.\n"
++ 
++@@ -2252,75 +2535,92 @@ msgid "route: bogus netmask %s\n"
++ msgstr "route: netmask %s inválida\n"
++ 
++ #: ../lib/inet_sr.c:270
+++#, c-format
++ msgid "route: netmask doesn't match route address\n"
++ msgstr "route: a netmask não casa com o endereço de rede\n"
++ 
++ #: ../lib/inet_sr.c:306
+++#, c-format
++ msgid "Flushing `inet' routing table not supported\n"
++ msgstr "Não é suportado limpar a tabela de roteamento `inet'\n"
++ 
++ #: ../lib/inet_sr.c:310
+++#, c-format
++ msgid "Modifying `inet' routing cache not supported\n"
++ msgstr "Não é suportado modificar o cache de roteamento `inet'\n"
++ 
++ #: ../lib/ipx_gr.c:52
+++#, c-format
++ msgid "IPX not configured in this system.\n"
++ msgstr "O AX.25 não foi configurado neste sistema.\n"
++ 
++ #: ../lib/ipx_gr.c:56
+++#, c-format
++ msgid "Kernel IPX routing table\n"
++ msgstr "Tabela de roteamento IPX do kernel\n"
++ 
++ #. xxx
++ #: ../lib/ipx_gr.c:57
+++#, c-format
++ msgid "Destination               Router Net                Router Node\n"
++ msgstr "Destino                   Rede Roteadora            Nó Roteador\n"
++ 
++ #: ../lib/ipx_sr.c:33
+++#, c-format
++ msgid "IPX: this needs to be written\n"
++ msgstr "NET/ROM: isto precisa ser escrito\n"
++ 
++-#: ../lib/masq_info.c:197
+++#: ../lib/masq_info.c:198
+++#, c-format
++ msgid "IP masquerading entries\n"
++ msgstr "Entradas de IP mascarado\n"
++ 
++-#: ../lib/masq_info.c:200
+++#: ../lib/masq_info.c:201
+++#, c-format
++ msgid "prot   expire source               destination          ports\n"
++ msgstr "prot   expira origem               destino             portas\n"
++ 
++-#: ../lib/masq_info.c:203
+++#: ../lib/masq_info.c:204
+++#, c-format
++ msgid ""
++-"prot   expire    initseq delta prevd source               destination        "
++-"  ports\n"
+++"prot   expire    initseq delta prevd source               "
+++"destination          ports\n"
++ msgstr ""
++-"prot   expira    initseq delta prevd origem               destino            "
++-" portas\n"
+++"prot   expira    initseq delta prevd origem               "
+++"destino             portas\n"
++ 
++ #: ../lib/netrom_gr.c:48
+++#, c-format
++ msgid "NET/ROM not configured in this system.\n"
++ msgstr "NET/ROM não configurado neste sistema.\n"
++ 
++ #: ../lib/netrom_gr.c:51
+++#, c-format
++ msgid "Kernel NET/ROM routing table\n"
++ msgstr "Tabela de roteamento NET/ROM do kernel\n"
++ 
++ #: ../lib/netrom_gr.c:52
+++#, c-format
++ msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
++ msgstr "Destino      Mnemônico Qualidade Vizinho   Iface\n"
++ 
++ #: ../lib/netrom_sr.c:34
+++#, c-format
++ msgid "netrom usage\n"
++ msgstr "uso de netrom\n"
++ 
++ #: ../lib/netrom_sr.c:44
+++#, c-format
++ msgid "NET/ROM: this needs to be written\n"
++ msgstr "NET/ROM: isto precisa ser escrito\n"
++ 
++ #: ../lib/ppp.c:44
+++#, c-format
++ msgid "You cannot start PPP with this program.\n"
++ msgstr "Você não pode iniciar o PPP com este programa.\n"
++ 
++ #: ../lib/ppp_ac.c:38
+++#, c-format
++ msgid "Sorry, use pppd!\n"
++ msgstr "Desculpe, use o pppd!\n"
++ 
++@@ -2329,51 +2629,314 @@ msgid "Node address must be ten digits"
++ msgstr "Endereço do nó deve ter dez dígitos"
++ 
++ #: ../lib/rose_gr.c:51
+++#, c-format
++ msgid "ROSE not configured in this system.\n"
++ msgstr "ROSE não configurada neste sistema.\n"
++ 
++ #: ../lib/rose_gr.c:54
+++#, c-format
++ msgid "Kernel ROSE routing table\n"
++ msgstr "Tabela de roteamento ROSE do kernel\n"
++ 
++-#: ../lib/tr.c:70 ../lib/tr.c:85
+++#: ../lib/tr.c:86 ../lib/tr.c:101
++ #, c-format
++ msgid "in_tr(%s): invalid token ring address!\n"
++ msgstr "in_tr(%s): endereço token ring inválido!\n"
++ 
++-#: ../lib/tr.c:97
+++#: ../lib/tr.c:113
++ #, c-format
++ msgid "in_tr(%s): trailing : ignored!\n"
++ msgstr "in_tr(%s): trailing : ignorado!\n"
++ 
++-#: ../lib/tr.c:109
+++#: ../lib/tr.c:125
++ #, c-format
++ msgid "in_tr(%s): trailing junk!\n"
++ msgstr "in_tr(%s): lixo no trailing!\n"
++ 
++-#: ../lib/interface.c:124
+++#: ../lib/interface.c:176
++ #, c-format
++ msgid "warning: no inet socket available: %s\n"
++ msgstr "atenção: nenhum socket inet disponível: %s\n"
++ 
++-#: ../lib/interface.c:270
+++#: ../lib/interface.c:325
++ #, c-format
++ msgid "Warning: cannot open %s (%s). Limited output.\n"
++ msgstr "Atenção: não foi possível abrir %s (%s). Saída limitada.\n"
++ 
++ #. Give better error message for this case.
++-#: ../lib/interface.c:504
+++#: ../lib/interface.c:571
++ msgid "Device not found"
++ msgstr "%s: dispositivo não encontrado"
++ 
++-#: ../lib/interface.c:508
+++#: ../lib/interface.c:575
++ #, c-format
++ msgid "%s: error fetching interface information: %s\n"
+++msgstr "%s: erro obtendo informações da interface: %s\n"
+++
+++#: ../lib/interface.c:608
+++msgid "     - no statistics available -"
+++msgstr "     - estatísticas não disponíveis -"
+++
+++#: ../lib/interface.c:612
+++#, c-format
+++msgid "[NO FLAGS]"
+++msgstr "[SEM FLAGS]"
+++
+++#: ../lib/interface.c:688
+++#, c-format
+++msgid "%-9.9s Link encap:%s  "
+++msgstr "%-9.9s  Encapsulamento do Link: %s  "
+++
+++#: ../lib/interface.c:693
+++#, c-format
+++msgid "HWaddr %s  "
+++msgstr "Endereço de HW %s  "
+++
+++#: ../lib/interface.c:696
+++#, c-format
+++msgid "Media:%s"
+++msgstr "Mídia:%s"
+++
+++#: ../lib/interface.c:698
+++#, c-format
+++msgid "(auto)"
+++msgstr "(auto)"
+++
+++#: ../lib/interface.c:705
+++#, c-format
+++msgid "          %s addr:%s "
+++msgstr "          %s end.: %s "
+++
+++#: ../lib/interface.c:708
+++#, c-format
+++msgid " P-t-P:%s "
+++msgstr " P-a-P:%s "
+++
+++#: ../lib/interface.c:711
+++#, c-format
+++msgid " Bcast:%s "
+++msgstr " Bcast:%s "
+++
+++#: ../lib/interface.c:713
+++#, c-format
+++msgid " Mask:%s\n"
+++msgstr " Masc:%s\n"
+++
+++#: ../lib/interface.c:730
+++#, c-format
+++msgid "          inet6 addr: %s/%d"
+++msgstr "          endereço inet6: %s/%d"
+++
+++#: ../lib/interface.c:732
+++#, c-format
+++msgid " Scope:"
+++msgstr " Escopo:"
+++
+++#: ../lib/interface.c:735
+++#, c-format
+++msgid "Global"
+++msgstr "Global"
+++
+++#: ../lib/interface.c:738
+++#, c-format
+++msgid "Link"
+++msgstr "Link"
+++
+++#: ../lib/interface.c:741
+++#, c-format
+++msgid "Site"
+++msgstr "Site"
+++
+++#: ../lib/interface.c:744
+++#, c-format
+++msgid "Compat"
+++msgstr "Compat"
+++
+++#: ../lib/interface.c:747
+++#, c-format
+++msgid "Host"
+++msgstr "Máquina"
+++
+++#: ../lib/interface.c:750
+++#, c-format
+++msgid "Unknown"
+++msgstr "Desconhecido"
+++
+++#: ../lib/interface.c:765
+++#, c-format
+++msgid "          IPX/Ethernet II addr:%s\n"
+++msgstr "      Endereço IPX/Ethernet II:%s\n"
+++
+++#: ../lib/interface.c:768
+++#, c-format
+++msgid "          IPX/Ethernet SNAP addr:%s\n"
+++msgstr "      Endereço IPX/Ethernet SNAP:%s\n"
+++
+++#: ../lib/interface.c:771
+++#, c-format
+++msgid "          IPX/Ethernet 802.2 addr:%s\n"
+++msgstr "      Endereço IPX/Ethernet 802.2:%s\n"
+++
+++#: ../lib/interface.c:774
+++#, c-format
+++msgid "          IPX/Ethernet 802.3 addr:%s\n"
+++msgstr "      Endereço IPX/Ethernet 802.3:%s\n"
+++
+++#: ../lib/interface.c:784
+++#, c-format
+++msgid "          EtherTalk Phase 2 addr:%s\n"
+++msgstr "          Endereço EtherTalk fase 2:%s\n"
+++
+++#: ../lib/interface.c:793
+++#, c-format
+++msgid "          econet addr:%s\n"
+++msgstr "          Endereço econet:%s\n"
+++
+++#: ../lib/interface.c:800
+++#, c-format
+++msgid "[NO FLAGS] "
+++msgstr "[NENHUMA FLAG] "
+++
+++#: ../lib/interface.c:802
+++#, c-format
+++msgid "UP "
+++msgstr "UP "
+++
+++#: ../lib/interface.c:804
+++#, c-format
+++msgid "BROADCAST "
+++msgstr "BROADCAST"
+++
+++#: ../lib/interface.c:806
+++#, c-format
+++msgid "DEBUG "
+++msgstr "DEBUG "
+++
+++#: ../lib/interface.c:808
+++#, c-format
+++msgid "LOOPBACK "
+++msgstr "LOOPBACK"
+++
+++#: ../lib/interface.c:810
+++#, c-format
+++msgid "POINTOPOINT "
+++msgstr "POINTOPOINT "
+++
+++#: ../lib/interface.c:812
+++#, c-format
+++msgid "NOTRAILERS "
+++msgstr "NOTRAILERS "
+++
+++#: ../lib/interface.c:814
+++#, c-format
+++msgid "RUNNING "
+++msgstr "RUNNING "
+++
+++#: ../lib/interface.c:816
+++#, c-format
+++msgid "NOARP "
+++msgstr "NOARP "
+++
+++#: ../lib/interface.c:818
+++#, c-format
+++msgid "PROMISC "
+++msgstr "PROMISC "
+++
+++#: ../lib/interface.c:820
+++#, c-format
+++msgid "ALLMULTI "
+++msgstr "ALLMULTI "
+++
+++#: ../lib/interface.c:822
+++#, c-format
+++msgid "SLAVE "
+++msgstr "SLAVE "
+++
+++#: ../lib/interface.c:824
+++#, c-format
+++msgid "MASTER "
+++msgstr "MASTER "
+++
+++#: ../lib/interface.c:826
+++#, c-format
+++msgid "MULTICAST "
+++msgstr "MULTICAST "
+++
+++#: ../lib/interface.c:829
+++#, c-format
+++msgid "DYNAMIC "
+++msgstr "DYNAMIC "
+++
+++#. DONT FORGET TO ADD THE FLAGS IN ife_print_short
+++#: ../lib/interface.c:832
+++#, c-format
+++msgid " MTU:%d  Metric:%d"
+++msgstr " MTU:%d  Métrica:%d"
+++
+++#: ../lib/interface.c:836
+++#, c-format
+++msgid "  Outfill:%d  Keepalive:%d"
+++msgstr "  Outfill:%d  Keepalive:%d"
+++
+++#: ../lib/interface.c:850
+++#, fuzzy, c-format
+++msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
+++msgstr "Pacotes RX:%lu erros:%lu descartados:%lu sobreposições:%lu frame:%lu\n"
+++
+++#: ../lib/interface.c:855
+++#, c-format
+++msgid "             compressed:%lu\n"
+++msgstr "             compactados:%lu\n"
+++
+++#: ../lib/interface.c:895
+++#, fuzzy, c-format
+++msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
+++msgstr "Pacotes TX:%lu erros:%lu descartados:%lu sobreposições:%lu portadora:%lu\n"
+++
+++#: ../lib/interface.c:899
+++#, c-format
+++msgid "          collisions:%lu "
+++msgstr "          colisões:%lu "
+++
+++#: ../lib/interface.c:901
+++#, c-format
+++msgid "compressed:%lu "
+++msgstr "compactados:%lu "
+++
+++#: ../lib/interface.c:903
+++#, c-format
+++msgid "txqueuelen:%d "
+++msgstr "txqueuelen:%d "
+++
+++#: ../lib/interface.c:905
+++#, c-format
+++msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
++ msgstr ""
++-"%s: erro obtendo informações da interface: %s\n"
++-"\n"
++ 
++-#: ../lib/sockets.c:59
+++#: ../lib/interface.c:916
+++#, c-format
+++msgid "Interrupt:%d "
+++msgstr "IRQ:%d "
+++
+++#. Only print devices using it for
+++#. I/O maps
+++#: ../lib/interface.c:919
+++#, c-format
+++msgid "Base address:0x%x "
+++msgstr "Endereço de E/S:0x%x "
+++
+++#: ../lib/interface.c:921
+++#, c-format
+++msgid "Memory:%lx-%lx "
+++msgstr "Memória:%lx-%lx "
+++
+++#: ../lib/interface.c:924
+++#, c-format
+++msgid "DMA chan:%x "
+++msgstr "Canal DMA:%x "
+++
+++#: ../lib/sockets.c:63
+++#, c-format
++ msgid "No usable address families found.\n"
++ msgstr "Nenhuma família de endereços que possa ser usada foi encontrada.\n"
++ 
++@@ -2397,29 +2960,32 @@ msgstr "%s: endereço %s inválido.\n"
++ msgid "ip: argument is wrong: %s\n"
++ msgstr "ip: argumento errado: %s\n"
++ 
++-#: ../ipmaddr.c:56
+++#: ../ipmaddr.c:61
+++#, c-format
++ msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
++ msgstr "Uso: ipmaddr [ add | del ] ENDMULTI dev STRING\n"
++ 
++-#: ../ipmaddr.c:57
+++#: ../ipmaddr.c:62
+++#, c-format
++ msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
++ msgstr "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
++ 
++-#: ../ipmaddr.c:58
+++#: ../ipmaddr.c:63
+++#, c-format
++ msgid "       ipmaddr -V | -version\n"
++ msgstr "       ipmaddr -V | -version\n"
++ 
++-#: ../ipmaddr.c:258
+++#: ../ipmaddr.c:263
++ #, c-format
++ msgid "family %d "
++ msgstr "família %d "
++ 
++-#: ../ipmaddr.c:267
+++#: ../ipmaddr.c:272
++ #, c-format
++ msgid " users %d"
++ msgstr " usuários %d"
++ 
++-#: ../ipmaddr.c:353
+++#: ../ipmaddr.c:358
++ msgid "Cannot create socket"
++ msgstr "Não foi possível criar o socket"
++ 
++@@ -2434,6 +3000,7 @@ msgid "slattach: tty_lock: (%s): %s\n"
++ msgstr "slattach: tty_lock: (%s): %s\n"
++ 
++ #: ../slattach.c:192
+++#, c-format
++ msgid "slattach: cannot write PID file\n"
++ msgstr "slattach: não foi possível escrever o arquivo PID\n"
++ 
++@@ -2452,39 +3019,69 @@ msgstr "slattach: tty_hangup(DROP): %s\n
++ msgid "slattach: tty_hangup(RAISE): %s\n"
++ msgstr "slattach: tty_hangup(RAISE): %s\n"
++ 
++-#: ../slattach.c:486
+++#: ../slattach.c:468
+++#, fuzzy, c-format
+++msgid "slattach: tty name too long\n"
+++msgstr "%s: nome muito longo\n"
+++
+++#: ../slattach.c:498
+++#, c-format
++ msgid "slattach: tty_open: cannot get current state!\n"
++ msgstr "slattach: tty_open: não foi possível obter o estado corrente!\n"
++ 
++-#: ../slattach.c:493
+++#: ../slattach.c:505
+++#, c-format
++ msgid "slattach: tty_open: cannot get current line disc!\n"
++-msgstr ""
++-"slattach: tty_open: não foi possível obter a disciplina de linha corrente!\n"
+++msgstr "slattach: tty_open: não foi possível obter a disciplina de linha corrente!\n"
++ 
++-#: ../slattach.c:501
+++#: ../slattach.c:513
+++#, c-format
++ msgid "slattach: tty_open: cannot set RAW mode!\n"
++ msgstr "slattach: tty_open: não foi possível configurar o modo RAW!\n"
++ 
++-#: ../slattach.c:508
+++#: ../slattach.c:520
++ #, c-format
++ msgid "slattach: tty_open: cannot set %s bps!\n"
++ msgstr "slattach: tty_open: não foi possível configurar %s bps!\n"
++ 
++-#: ../slattach.c:518
+++#: ../slattach.c:530
+++#, c-format
++ msgid "slattach: tty_open: cannot set 8N1 mode!\n"
++ msgstr "slattach: tty_open: não foi possível configurar modo 8N1!\n"
++ 
++-#: ../slattach.c:686
+++#: ../slattach.c:672
+++#, c-format
+++msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n"
+++msgstr ""
+++
+++#: ../slattach.c:704
++ #, c-format
++ msgid "%s started"
++ msgstr "%s inicializado"
++ 
++-#: ../slattach.c:687
+++#: ../slattach.c:705
++ #, c-format
++ msgid " on %s"
++ msgstr " em %s"
++ 
++-#: ../slattach.c:688
+++#: ../slattach.c:706
++ #, c-format
++ msgid " interface %s\n"
++ msgstr "%s: interface desconhecida.\n"
+++
+++#~ msgid ""
+++#~ "  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
+++#~ "<-''-\n"
+++#~ msgstr "  arp [-v]   [<HW>] [-i <if>] -s  <máquina> <end_hw>  [netmask <nm>] pub  <-''-\n"
+++
+++#~ msgid "%s: unknown interface: %s\n"
+++#~ msgstr "%s: interface desconhecida: %s\n"
+++
+++#~ msgid "address mask replies"
+++#~ msgstr "resposta a mascara de endereço"
+++
+++#~ msgid "unknown title %s\n"
+++#~ msgstr "título %s desconhecido\n"
+++
+++#~ msgid "Routing table for `ddp' not yet supported.\n"
+++#~ msgstr "Tabela de roteamento para `ddp' ainda não suportada.\n"
++Index: net-tools/po/net-tools.pot
++===================================================================
++--- net-tools.orig/po/net-tools.pot
+++++ net-tools/po/net-tools.pot
++@@ -1,253 +1,275 @@
++ # SOME DESCRIPTIVE TITLE.
++-# Copyright (C) YEAR Free Software Foundation, Inc.
+++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+++# This file is distributed under the same license as the PACKAGE package.
++ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
++ #
++ #, fuzzy
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: PACKAGE VERSION\n"
++-"POT-Creation-Date: 2001-04-15 15:40+0100\n"
+++"Report-Msgid-Bugs-To: \n"
+++"POT-Creation-Date: 2007-06-30 12:28+0900\n"
++ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
++ "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
++ "Language-Team: LANGUAGE <LL@li.org>\n"
++ "MIME-Version: 1.0\n"
++ "Content-Type: text/plain; charset=CHARSET\n"
++-"Content-Transfer-Encoding: ENCODING\n"
+++"Content-Transfer-Encoding: 8bit\n"
++ 
++-#: ../arp.c:111 ../arp.c:270
+++#: ../arp.c:112 ../arp.c:279
+++#, c-format
++ msgid "arp: need host name\n"
++ msgstr ""
++ 
++-#: ../arp.c:208 ../arp.c:222
+++#: ../arp.c:215 ../arp.c:230
++ #, c-format
++ msgid "No ARP entry for %s\n"
++ msgstr ""
++ 
++-#: ../arp.c:240
+++#: ../arp.c:248
++ #, c-format
++ msgid "arp: cant get HW-Address for `%s': %s.\n"
++ msgstr ""
++ 
++-#: ../arp.c:244
+++#: ../arp.c:252
+++#, c-format
++ msgid "arp: protocol type mismatch.\n"
++ msgstr ""
++ 
++-#: ../arp.c:253
+++#: ../arp.c:261
++ #, c-format
++ msgid "arp: device `%s' has HW address %s `%s'.\n"
++ msgstr ""
++ 
++-#: ../arp.c:283
+++#: ../arp.c:293
+++#, c-format
++ msgid "arp: need hardware address\n"
++ msgstr ""
++ 
++-#: ../arp.c:291
+++#: ../arp.c:301
+++#, c-format
++ msgid "arp: invalid hardware address\n"
++ msgstr ""
++ 
++-#: ../arp.c:388
+++#: ../arp.c:398
++ #, c-format
++ msgid "arp: cannot open etherfile %s !\n"
++ msgstr ""
++ 
++-#: ../arp.c:404
+++#: ../arp.c:414
++ #, c-format
++ msgid "arp: format error on line %u of etherfile %s !\n"
++ msgstr ""
++ 
++-#: ../arp.c:417
+++#: ../arp.c:427
++ #, c-format
++ msgid "arp: cannot set entry on line %u of etherfile %s !\n"
++ msgstr ""
++ 
++-#: ../arp.c:438
+++#: ../arp.c:448
+++#, c-format
++ msgid ""
++ "Address                  HWtype  HWaddress           Flags Mask            "
++ "Iface\n"
++ msgstr ""
++ 
++-#: ../arp.c:468
+++#: ../arp.c:476
+++msgid "<from_interface>"
+++msgstr ""
+++
+++#: ../arp.c:478
++ msgid "(incomplete)"
++ msgstr ""
++ 
++-#: ../arp.c:485
+++#: ../arp.c:495
++ #, c-format
++ msgid "%s (%s) at "
++ msgstr ""
++ 
++-#: ../arp.c:491
+++#: ../arp.c:501
+++#, c-format
++ msgid "<incomplete> "
++ msgstr ""
++ 
++-#: ../arp.c:497
+++#: ../arp.c:507
++ #, c-format
++ msgid "netmask %s "
++ msgstr ""
++ 
++-#: ../arp.c:514
+++#: ../arp.c:524
++ #, c-format
++ msgid "on %s\n"
++ msgstr ""
++ 
++-#: ../arp.c:593
+++#: ../arp.c:605
++ #, c-format
++ msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
++ msgstr ""
++ 
++-#: ../arp.c:597
+++#: ../arp.c:609
++ #, c-format
++ msgid "%s (%s) -- no entry\n"
++ msgstr ""
++ 
++-#: ../arp.c:599
+++#: ../arp.c:611
++ #, c-format
++ msgid "arp: in %d entries no match found.\n"
++ msgstr ""
++ 
++-#: ../arp.c:614
+++#: ../arp.c:626
+++#, c-format
++ msgid ""
++ "Usage:\n"
++ "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
++ "cache\n"
++ msgstr ""
++ 
++-#: ../arp.c:615
+++#: ../arp.c:627
+++#, c-format
++ msgid ""
++-"  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP "
+++"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
++ "entry\n"
++ msgstr ""
++ 
++-#: ../arp.c:616
+++#: ../arp.c:628
+++#, c-format
++ msgid ""
++-"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from "
+++"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
++ "file\n"
++ msgstr ""
++ 
++-#: ../arp.c:617
+++#: ../arp.c:629
+++#, c-format
++ msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add "
+++"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
++ "entry\n"
++ msgstr ""
++ 
++-#: ../arp.c:618
++-msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
++-"<-''-\n"
++-msgstr ""
++-
++-#: ../arp.c:619
+++#: ../arp.c:630
+++#, c-format
++ msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      "
+++"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
++ "<-''-\n"
++ "\n"
++ msgstr ""
++ 
++-#: ../arp.c:621
+++#: ../arp.c:632
+++#, c-format
++ msgid ""
++ "        -a                       display (all) hosts in alternative (BSD) "
++ "style\n"
++ msgstr ""
++ 
++-#: ../arp.c:622
+++#: ../arp.c:633
+++#, c-format
++ msgid "        -s, --set                set a new ARP entry\n"
++ msgstr ""
++ 
++-#: ../arp.c:623
+++#: ../arp.c:634
+++#, c-format
++ msgid "        -d, --delete             delete a specified entry\n"
++ msgstr ""
++ 
++-#: ../arp.c:624 ../netstat.c:1490 ../route.c:86
+++#: ../arp.c:635 ../netstat.c:1503 ../route.c:86
+++#, c-format
++ msgid "        -v, --verbose            be verbose\n"
++ msgstr ""
++ 
++-#: ../arp.c:625 ../netstat.c:1491 ../route.c:87
+++#: ../arp.c:636 ../netstat.c:1504 ../route.c:87
+++#, c-format
++ msgid "        -n, --numeric            don't resolve names\n"
++ msgstr ""
++ 
++-#: ../arp.c:626
+++#: ../arp.c:637
+++#, c-format
++ msgid ""
++ "        -i, --device             specify network interface (e.g. eth0)\n"
++ msgstr ""
++ 
++-#: ../arp.c:627
+++#: ../arp.c:638
+++#, c-format
++ msgid "        -D, --use-device         read <hwaddr> from given device\n"
++ msgstr ""
++ 
++-#: ../arp.c:628
+++#: ../arp.c:639
+++#, c-format
++ msgid "        -A, -p, --protocol       specify protocol family\n"
++ msgstr ""
++ 
++-#: ../arp.c:629
+++#: ../arp.c:640
+++#, c-format
++ msgid ""
++-"        -f, --file               read new entries from file or from "
++-"/etc/ethers\n"
+++"        -f, --file               read new entries from file or from /etc/"
+++"ethers\n"
++ "\n"
++ msgstr ""
++ 
++-#: ../arp.c:631 ../rarp.c:182
+++#: ../arp.c:642 ../rarp.c:182
++ #, c-format
++ msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
++ msgstr ""
++ 
++-#: ../arp.c:632 ../rarp.c:183
+++#: ../arp.c:643 ../rarp.c:183
+++#, c-format
++ msgid "  List of possible hardware types (which support ARP):\n"
++ msgstr ""
++ 
++-#: ../arp.c:666 ../arp.c:751
+++#: ../arp.c:677 ../arp.c:762
++ #, c-format
++ msgid "%s: hardware type not supported!\n"
++ msgstr ""
++ 
++-#: ../arp.c:670
+++#: ../arp.c:681
++ #, c-format
++ msgid "%s: address family not supported!\n"
++ msgstr ""
++ 
++-#: ../arp.c:705
+++#: ../arp.c:716
+++#, c-format
++ msgid "arp: -N not yet supported.\n"
++ msgstr ""
++ 
++-#: ../arp.c:715
+++#: ../arp.c:726
++ #, c-format
++ msgid "arp: %s: unknown address family.\n"
++ msgstr ""
++ 
++-#: ../arp.c:724
+++#: ../arp.c:735
++ #, c-format
++ msgid "arp: %s: unknown hardware type.\n"
++ msgstr ""
++ 
++-#: ../arp.c:743
+++#: ../arp.c:754
++ #, c-format
++ msgid "arp: %s: kernel only supports 'inet'.\n"
++ msgstr ""
++ 
++-#: ../arp.c:756
+++#: ../arp.c:767
++ #, c-format
++ msgid "arp: %s: hardware type without ARP support.\n"
++ msgstr ""
++ 
++-#: ../hostname.c:70
+++#: ../hostname.c:71
++ #, c-format
++ msgid "Setting nodename to `%s'\n"
++ msgstr ""
++ 
++-#: ../hostname.c:75
+++#: ../hostname.c:76
++ #, c-format
++ msgid "%s: you must be root to change the node name\n"
++ msgstr ""
++ 
++-#: ../hostname.c:78 ../hostname.c:98 ../hostname.c:117
+++#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117
++ #, c-format
++ msgid "%s: name too long\n"
++ msgstr ""
++ 
++-#: ../hostname.c:90
+++#: ../hostname.c:91
++ #, c-format
++ msgid "Setting hostname to `%s'\n"
++ msgstr ""
++ 
++-#: ../hostname.c:95
+++#: ../hostname.c:96
++ #, c-format
++ msgid "%s: you must be root to change the host name\n"
++ msgstr ""
++@@ -262,103 +284,119 @@ msgstr ""
++ msgid "%s: you must be root to change the domain name\n"
++ msgstr ""
++ 
++-#: ../hostname.c:132
+++#: ../hostname.c:131
++ #, c-format
++ msgid "Resolving `%s' ...\n"
++ msgstr ""
++ 
++-#: ../hostname.c:138
+++#: ../hostname.c:137
++ #, c-format
++ msgid "Result: h_name=`%s'\n"
++ msgstr ""
++ 
++-#: ../hostname.c:143
+++#: ../hostname.c:142
++ #, c-format
++ msgid "Result: h_aliases=`%s'\n"
++ msgstr ""
++ 
++-#: ../hostname.c:148
+++#: ../hostname.c:147
++ #, c-format
++ msgid "Result: h_addr_list=`%s'\n"
++ msgstr ""
++ 
++-#: ../hostname.c:210
+++#: ../hostname.c:208
++ #, c-format
++ msgid "%s: can't open `%s'\n"
++ msgstr ""
++ 
++-#: ../hostname.c:224
+++#: ../hostname.c:222
+++#, c-format
++ msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
++ msgstr ""
++ 
++-#: ../hostname.c:225
+++#: ../hostname.c:223
+++#, c-format
++ msgid ""
++ "       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
++ msgstr ""
++ 
++-#: ../hostname.c:227
+++#: ../hostname.c:225
+++#, c-format
++ msgid ""
++ "       nodename [-v] {nodename|-F file}      set DECnet node name (from "
++ "file)\n"
++ msgstr ""
++ 
++-#: ../hostname.c:229
+++#: ../hostname.c:227
+++#, c-format
++ msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
++ msgstr ""
++ 
++-#: ../hostname.c:230
+++#: ../hostname.c:228
+++#, c-format
++ msgid ""
++ "       hostname [-v]                         display hostname\n"
++ "\n"
++ msgstr ""
++ 
++-#: ../hostname.c:231
+++#: ../hostname.c:229
+++#, c-format
++ msgid ""
++ "       hostname -V|--version|-h|--help       print info and exit\n"
++ "\n"
++ msgstr ""
++ 
++-#: ../hostname.c:232
+++#: ../hostname.c:230
+++#, c-format
++ msgid ""
++ "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
++ "\n"
++ msgstr ""
++ 
++-#: ../hostname.c:233
+++#: ../hostname.c:231
+++#, c-format
++ msgid "    -s, --short           short host name\n"
++ msgstr ""
++ 
++-#: ../hostname.c:234
+++#: ../hostname.c:232
+++#, c-format
++ msgid "    -a, --alias           alias names\n"
++ msgstr ""
++ 
++-#: ../hostname.c:235
+++#: ../hostname.c:233
+++#, c-format
++ msgid "    -i, --ip-address      addresses for the hostname\n"
++ msgstr ""
++ 
++-#: ../hostname.c:236
+++#: ../hostname.c:234
+++#, c-format
++ msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
++ msgstr ""
++ 
++-#: ../hostname.c:237
+++#: ../hostname.c:235
+++#, c-format
++ msgid "    -d, --domain          DNS domain name\n"
++ msgstr ""
++ 
++-#: ../hostname.c:238
+++#: ../hostname.c:236
+++#, c-format
++ msgid "    -y, --yp, --nis       NIS/YP domainname\n"
++ msgstr ""
++ 
++-#: ../hostname.c:240
+++#: ../hostname.c:238
+++#, c-format
++ msgid "    -n, --node            DECnet node name\n"
++ msgstr ""
++ 
++-#: ../hostname.c:242
+++#: ../hostname.c:240
+++#, c-format
++ msgid ""
++ "    -F, --file            read hostname or NIS domainname from given file\n"
++ "\n"
++ msgstr ""
++ 
++-#: ../hostname.c:244
+++#: ../hostname.c:242
+++#, c-format
++ msgid ""
++ "   This command can read or set the hostname or the NIS domainname. You can\n"
++ "   also read the DNS domain or the FQDN (fully qualified domain name).\n"
++@@ -367,587 +405,706 @@ msgid ""
++ "   part of the FQDN) in the /etc/hosts file.\n"
++ msgstr ""
++ 
++-#: ../hostname.c:340
+++#: ../hostname.c:338
++ #, c-format
++ msgid "%s: You can't change the DNS domain name with this command\n"
++ msgstr ""
++ 
++-#: ../hostname.c:341
+++#: ../hostname.c:339
+++#, c-format
++ msgid ""
++ "\n"
++ "Unless you are using bind or NIS for host lookups you can change the DNS\n"
++ msgstr ""
++ 
++-#: ../hostname.c:342
+++#: ../hostname.c:340
+++#, c-format
++ msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
++ msgstr ""
++ 
++-#: ../hostname.c:359
+++#: ../hostname.c:357
++ #, c-format
++ msgid "gethostname()=`%s'\n"
++ msgstr ""
++ 
++-#: ../hostname.c:376
+++#: ../hostname.c:374
++ #, c-format
++ msgid "getdomainname()=`%s'\n"
++ msgstr ""
++ 
++-#: ../hostname.c:391
+++#: ../hostname.c:389
++ #, c-format
++ msgid "getnodename()=`%s'\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:108
+++#: ../ifconfig.c:107
+++#, c-format
++ msgid ""
++-"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
+++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
++ "Flg\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:130 ../ifconfig.c:162
+++#: ../ifconfig.c:129 ../ifconfig.c:161
++ #, c-format
++-msgid "%s: unknown interface: %s\n"
+++msgid "%s: ERROR while getting interface flags: %s\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:154 ../ifconfig.c:734 ../ifconfig.c:825 ../ifconfig.c:936
+++#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
+++#: ../ifconfig.c:973
+++#, c-format
++ msgid "No support for INET on this system.\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:177
+++#: ../ifconfig.c:193
+++#, c-format
+++msgid "%s: ERROR while testing interface flags: %s\n"
+++msgstr ""
+++
+++#: ../ifconfig.c:202
+++#, c-format
++ msgid ""
++ "Usage:\n"
++-"  ifconfig [-a] [-i] [-v] [-s] <interface> [[<AF>] <address>]\n"
+++"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:179
+++#: ../ifconfig.c:204
+++#, c-format
++ msgid "  [add <address>[/<prefixlen>]]\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:180
+++#: ../ifconfig.c:205
+++#, c-format
++ msgid "  [del <address>[/<prefixlen>]]\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:181
+++#: ../ifconfig.c:206
+++#, c-format
++ msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:182
+++#: ../ifconfig.c:207
+++#, c-format
++ msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:185
+++#: ../ifconfig.c:210
+++#, c-format
++ msgid "  [outfill <NN>] [keepalive <NN>]\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:187
+++#: ../ifconfig.c:212
+++#, c-format
++ msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:188
+++#: ../ifconfig.c:213
+++#, c-format
++ msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:189
+++#: ../ifconfig.c:214
+++#, c-format
++ msgid "  [multicast]  [[-]promisc]\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:190
+++#: ../ifconfig.c:215
+++#, c-format
++ msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:192
+++#: ../ifconfig.c:217
+++#, c-format
++ msgid "  [txqueuelen <NN>]\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:195
+++#: ../ifconfig.c:220
+++#, c-format
++ msgid "  [[-]dynamic]\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:197
+++#: ../ifconfig.c:222
+++#, c-format
++ msgid ""
++ "  [up|down] ...\n"
++ "\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:199
+++#: ../ifconfig.c:224
+++#, c-format
++ msgid "  <HW>=Hardware Type.\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:200
+++#: ../ifconfig.c:225
+++#, c-format
++ msgid "  List of possible hardware types:\n"
++ msgstr ""
++ 
++ #. 1 = ARPable
++-#: ../ifconfig.c:202
+++#: ../ifconfig.c:227
++ #, c-format
++ msgid "  <AF>=Address family. Default: %s\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:203
+++#: ../ifconfig.c:228
+++#, c-format
++ msgid "  List of possible address families:\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:278
+++#: ../ifconfig.c:303
++ #, c-format
++ msgid "ifconfig: option `%s' not recognised.\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:280 ../ifconfig.c:925
+++#: ../ifconfig.c:305 ../ifconfig.c:962
+++#, c-format
++ msgid "ifconfig: `--help' gives usage information.\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:355
+++#: ../ifconfig.c:380
+++#, c-format
++ msgid "Unknown media type.\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:647
+++#: ../ifconfig.c:417
+++#, c-format
+++msgid ""
+++"Warning: Interface %s still in promisc mode... maybe other application is "
+++"running?\n"
+++msgstr ""
+++
+++#: ../ifconfig.c:429
+++#, c-format
+++msgid "Warning: Interface %s still in MULTICAST mode.\n"
+++msgstr ""
+++
+++#: ../ifconfig.c:441
+++#, c-format
+++msgid "Warning: Interface %s still in ALLMULTI mode.\n"
+++msgstr ""
+++
+++#: ../ifconfig.c:465
+++#, c-format
+++msgid "Warning: Interface %s still in DYNAMIC mode.\n"
+++msgstr ""
+++
+++#: ../ifconfig.c:523
+++#, c-format
+++msgid "Warning: Interface %s still in BROADCAST mode.\n"
+++msgstr ""
+++
+++#: ../ifconfig.c:652
+++#, c-format
+++msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
+++msgstr ""
+++
+++#: ../ifconfig.c:684
++ #, c-format
++ msgid "hw address type `%s' has no handler to set address. failed.\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:656
+++#: ../ifconfig.c:693
++ #, c-format
++ msgid "%s: invalid %s address.\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:700 ../ifconfig.c:790 ../ifconfig.c:876
+++#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
+++#, c-format
++ msgid "No support for INET6 on this system.\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:743 ../ifconfig.c:834
+++#: ../ifconfig.c:780 ../ifconfig.c:871
++ #, c-format
++ msgid "Interface %s not initialized\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:755 ../ifconfig.c:845
+++#: ../ifconfig.c:792 ../ifconfig.c:882
+++#, c-format
++ msgid "Bad address.\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:848
+++#: ../ifconfig.c:885
+++#, c-format
++ msgid "Address deletion not supported on this system.\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:920
+++#: ../ifconfig.c:957
+++#, c-format
++ msgid "ifconfig: Cannot set address for this protocol family.\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:946
+++#: ../ifconfig.c:983
+++#, c-format
++ msgid "No support for ECONET on this system.\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:954
+++#: ../ifconfig.c:991
++ #, c-format
++ msgid "Don't know how to set addresses for family %d.\n"
++ msgstr ""
++ 
++-#: ../netstat.c:430
+++#: ../ifconfig.c:1021
+++#, c-format
+++msgid "WARNING: at least one error occured. (%d)\n"
+++msgstr ""
+++
+++#: ../netstat.c:434
++ #, c-format
++ msgid ""
++ "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
++ msgstr ""
++ 
++-#: ../netstat.c:434
+++#: ../netstat.c:438
+++#, c-format
++ msgid ""
++ "(Not all processes could be identified, non-owned process info\n"
++ " will not be shown, you would have to be root to see it all.)\n"
++ msgstr ""
++ 
++-#: ../netstat.c:441 ../netstat.c:1176 ../netstat.c:1253
+++#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
++ msgid "LISTENING"
++ msgstr ""
++ 
++-#: ../netstat.c:442
+++#: ../netstat.c:446
++ msgid "CONN SENT"
++ msgstr ""
++ 
++-#: ../netstat.c:443 ../netstat.c:1255
+++#: ../netstat.c:447 ../netstat.c:1268
++ msgid "DISC SENT"
++ msgstr ""
++ 
++-#: ../netstat.c:444 ../netstat.c:511 ../netstat.c:894 ../netstat.c:1256
+++#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
++ msgid "ESTABLISHED"
++ msgstr ""
++ 
++-#: ../netstat.c:466
+++#: ../netstat.c:470
+++#, c-format
++ msgid "Active NET/ROM sockets\n"
++ msgstr ""
++ 
++-#: ../netstat.c:467
+++#: ../netstat.c:471
+++#, c-format
++ msgid ""
++-"User       Dest       Source     Device  State        Vr/Vs    Send-Q  "
++-"Recv-Q\n"
+++"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
+++"Q\n"
++ msgstr ""
++ 
++-#: ../netstat.c:477 ../netstat.c:1295
+++#: ../netstat.c:481 ../netstat.c:1308
++ #, c-format
++ msgid "Problem reading data from %s\n"
++ msgstr ""
++ 
++-#: ../netstat.c:512
+++#: ../netstat.c:516
++ msgid "SYN_SENT"
++ msgstr ""
++ 
++-#: ../netstat.c:513
+++#: ../netstat.c:517
++ msgid "SYN_RECV"
++ msgstr ""
++ 
++-#: ../netstat.c:514
+++#: ../netstat.c:518
++ msgid "FIN_WAIT1"
++ msgstr ""
++ 
++-#: ../netstat.c:515
+++#: ../netstat.c:519
++ msgid "FIN_WAIT2"
++ msgstr ""
++ 
++-#: ../netstat.c:516
+++#: ../netstat.c:520
++ msgid "TIME_WAIT"
++ msgstr ""
++ 
++-#: ../netstat.c:517
+++#: ../netstat.c:521
++ msgid "CLOSE"
++ msgstr ""
++ 
++-#: ../netstat.c:518
+++#: ../netstat.c:522
++ msgid "CLOSE_WAIT"
++ msgstr ""
++ 
++-#: ../netstat.c:519
+++#: ../netstat.c:523
++ msgid "LAST_ACK"
++ msgstr ""
++ 
++-#: ../netstat.c:520
+++#: ../netstat.c:524
++ msgid "LISTEN"
++ msgstr ""
++ 
++-#: ../netstat.c:521
+++#: ../netstat.c:525
++ msgid "CLOSING"
++ msgstr ""
++ 
++-#: ../netstat.c:592
+++#: ../netstat.c:596
++ #, c-format
++ msgid "warning, got bogus igmp6 line %d.\n"
++ msgstr ""
++ 
++-#: ../netstat.c:597 ../netstat.c:635 ../netstat.c:756 ../netstat.c:888
++-#: ../netstat.c:1019 ../netstat.c:1024
+++#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
+++#: ../netstat.c:1032 ../netstat.c:1037
++ #, c-format
++ msgid "netstat: unsupported address family %d !\n"
++ msgstr ""
++ 
++-#: ../netstat.c:610 ../netstat.c:615 ../netstat.c:623 ../netstat.c:630
+++#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
++ #, c-format
++ msgid "warning, got bogus igmp line %d.\n"
++ msgstr ""
++ 
++-#: ../netstat.c:673
+++#: ../netstat.c:677
+++#, c-format
++ msgid "Active X.25 sockets\n"
++ msgstr ""
++ 
++ #. IMHO, Vr/Vs is not very usefull --SF
++-#: ../netstat.c:675
+++#: ../netstat.c:679
+++#, c-format
++ msgid ""
++-"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  "
++-"Recv-Q\n"
+++"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
+++"Q\n"
++ msgstr ""
++ 
++-#: ../netstat.c:752
+++#: ../netstat.c:759
+++#, c-format
++ msgid "warning, got bogus tcp line.\n"
++ msgstr ""
++ 
++-#: ../netstat.c:793 ../netstat.c:943 ../netstat.c:1062
+++#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
++ #, c-format
++ msgid "off (0.00/%ld/%d)"
++ msgstr ""
++ 
++-#: ../netstat.c:797
+++#: ../netstat.c:804
++ #, c-format
++ msgid "on (%2.2f/%ld/%d)"
++ msgstr ""
++ 
++-#: ../netstat.c:802
+++#: ../netstat.c:809
++ #, c-format
++ msgid "keepalive (%2.2f/%ld/%d)"
++ msgstr ""
++ 
++-#: ../netstat.c:807
+++#: ../netstat.c:814
++ #, c-format
++ msgid "timewait (%2.2f/%ld/%d)"
++ msgstr ""
++ 
++-#: ../netstat.c:812 ../netstat.c:952 ../netstat.c:1072
+++#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
++ #, c-format
++ msgid "unkn-%d (%2.2f/%ld/%d)"
++ msgstr ""
++ 
++-#: ../netstat.c:884
+++#: ../netstat.c:894
+++#, c-format
++ msgid "warning, got bogus udp line.\n"
++ msgstr ""
++ 
++-#: ../netstat.c:902 ../netstat.c:1162 ../netstat.c:1195
+++#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
++ msgid "UNKNOWN"
++ msgstr ""
++ 
++-#: ../netstat.c:948 ../netstat.c:1067
+++#: ../netstat.c:958 ../netstat.c:1080
++ #, c-format
++ msgid "on%d (%2.2f/%ld/%d)"
++ msgstr ""
++ 
++-#: ../netstat.c:1033
+++#: ../netstat.c:1046
+++#, c-format
++ msgid "warning, got bogus raw line.\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1115
+++#: ../netstat.c:1128
+++#, c-format
++ msgid "warning, got bogus unix line.\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1142
+++#: ../netstat.c:1155
++ msgid "STREAM"
++ msgstr ""
++ 
++-#: ../netstat.c:1146
+++#: ../netstat.c:1159
++ msgid "DGRAM"
++ msgstr ""
++ 
++-#: ../netstat.c:1150
+++#: ../netstat.c:1163
++ msgid "RAW"
++ msgstr ""
++ 
++-#: ../netstat.c:1154
+++#: ../netstat.c:1167
++ msgid "RDM"
++ msgstr ""
++ 
++-#: ../netstat.c:1158
+++#: ../netstat.c:1171
++ msgid "SEQPACKET"
++ msgstr ""
++ 
++-#: ../netstat.c:1167
+++#: ../netstat.c:1180
++ msgid "FREE"
++ msgstr ""
++ 
++-#: ../netstat.c:1183
+++#: ../netstat.c:1196
++ msgid "CONNECTING"
++ msgstr ""
++ 
++-#: ../netstat.c:1187
+++#: ../netstat.c:1200
++ msgid "CONNECTED"
++ msgstr ""
++ 
++-#: ../netstat.c:1191
+++#: ../netstat.c:1204
++ msgid "DISCONNECTING"
++ msgstr ""
++ 
++-#: ../netstat.c:1222
+++#: ../netstat.c:1235
+++#, c-format
++ msgid "Active UNIX domain sockets "
++ msgstr ""
++ 
++-#: ../netstat.c:1224 ../netstat.c:1735
+++#: ../netstat.c:1237 ../netstat.c:1756
+++#, c-format
++ msgid "(servers and established)"
++ msgstr ""
++ 
++-#: ../netstat.c:1227 ../netstat.c:1738
+++#: ../netstat.c:1240 ../netstat.c:1759
+++#, c-format
++ msgid "(only servers)"
++ msgstr ""
++ 
++-#: ../netstat.c:1229 ../netstat.c:1740
+++#: ../netstat.c:1242 ../netstat.c:1761
+++#, c-format
++ msgid "(w/o servers)"
++ msgstr ""
++ 
++-#: ../netstat.c:1232
+++#: ../netstat.c:1245
+++#, c-format
++ msgid ""
++ "\n"
++ "Proto RefCnt Flags       Type       State         I-Node"
++ msgstr ""
++ 
++-#: ../netstat.c:1234
+++#: ../netstat.c:1247
+++#, c-format
++ msgid " Path\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1254
+++#: ../netstat.c:1267
++ msgid "SABM SENT"
++ msgstr ""
++ 
++-#: ../netstat.c:1257
+++#: ../netstat.c:1270
++ msgid "RECOVERY"
++ msgstr ""
++ 
++-#: ../netstat.c:1271
+++#: ../netstat.c:1284
+++#, c-format
++ msgid "Active AX.25 sockets\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1272
+++#: ../netstat.c:1285
+++#, c-format
++ msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1315
+++#: ../netstat.c:1328
++ #, c-format
++ msgid "problem reading data from %s\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1366
+++#: ../netstat.c:1379
+++#, c-format
++ msgid ""
++ "Active IPX sockets\n"
++ "Proto Recv-Q Send-Q Local Address              Foreign Address            "
++ "State"
++ msgstr ""
++ 
++-#: ../netstat.c:1368
+++#: ../netstat.c:1381
+++#, c-format
++ msgid " User"
++ msgstr ""
++ 
++-#: ../netstat.c:1402
+++#: ../netstat.c:1415
++ msgid "ESTAB"
++ msgstr ""
++ 
++-#: ../netstat.c:1410
+++#: ../netstat.c:1423
++ msgid "UNK."
++ msgstr ""
++ 
++-#: ../netstat.c:1448
+++#: ../netstat.c:1461
+++#, c-format
++ msgid "Kernel Interface table\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1452
+++#: ../netstat.c:1465
+++#, c-format
++ msgid ""
++-"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
+++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
++ "Flg\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1456
+++#: ../netstat.c:1469
++ msgid "missing interface information"
++ msgstr ""
++ 
++-#: ../netstat.c:1479
+++#: ../netstat.c:1492
+++#, c-format
++ msgid ""
++-"usage: netstat [-veenNcCF] [<Af>] -r         netstat "
++-"{-V|--version|-h|--help}\n"
+++"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
+++"help}\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1480
+++#: ../netstat.c:1493
+++#, c-format
++ msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1481
+++#: ../netstat.c:1494
+++#, c-format
++ msgid ""
++ "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
++ "\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1483
+++#: ../netstat.c:1496
+++#, c-format
++ msgid "        -r, --route              display routing table\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1484
+++#: ../netstat.c:1497
+++#, c-format
++ msgid "        -i, --interfaces         display interface table\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1485
+++#: ../netstat.c:1498
+++#, c-format
++ msgid "        -g, --groups             display multicast group memberships\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1486
+++#: ../netstat.c:1499
+++#, c-format
++ msgid ""
++ "        -s, --statistics         display networking statistics (like SNMP)\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1488
+++#: ../netstat.c:1501
+++#, c-format
++ msgid ""
++ "        -M, --masquerade         display masqueraded connections\n"
++ "\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1492
+++#: ../netstat.c:1505
+++#, c-format
++ msgid "        --numeric-hosts          don't resolve host names\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1493
+++#: ../netstat.c:1506
+++#, c-format
++ msgid "        --numeric-ports          don't resolve port names\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1494
+++#: ../netstat.c:1507
+++#, c-format
++ msgid "        --numeric-users          don't resolve user names\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1495
+++#: ../netstat.c:1508
+++#, c-format
++ msgid "        -N, --symbolic           resolve hardware names\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1496 ../route.c:88
+++#: ../netstat.c:1509 ../route.c:88
+++#, c-format
++ msgid "        -e, --extend             display other/more information\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1497
+++#: ../netstat.c:1510
+++#, c-format
++ msgid "        -p, --programs           display PID/Program name for sockets\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1498
+++#: ../netstat.c:1511
+++#, c-format
++ msgid ""
++ "        -c, --continuous         continuous listing\n"
++ "\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1499
+++#: ../netstat.c:1512
+++#, c-format
++ msgid "        -l, --listening          display listening server sockets\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1500
+++#: ../netstat.c:1513
+++#, c-format
++ msgid ""
++ "        -a, --all, --listening   display all sockets (default: connected)\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1501
+++#: ../netstat.c:1514
+++#, c-format
++ msgid "        -o, --timers             display timers\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1502 ../route.c:89
+++#: ../netstat.c:1515 ../route.c:89
+++#, c-format
++ msgid ""
++ "        -F, --fib                display Forwarding Information Base "
++ "(default)\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1503 ../route.c:90
+++#: ../netstat.c:1516 ../route.c:90
+++#, c-format
++ msgid ""
++ "        -C, --cache              display routing cache instead of FIB\n"
++ "\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1505
+++#: ../netstat.c:1518
+++#, c-format
++ msgid ""
++-"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
++-"--netrom\n"
+++"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
+++"netrom\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1506 ../route.c:92
+++#: ../netstat.c:1519
++ #, c-format
++-msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
+++msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1507 ../route.c:93
+++#: ../netstat.c:1520 ../route.c:93
+++#, c-format
++ msgid "  List of possible address families (which support routing):\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1732
+++#: ../netstat.c:1753
+++#, c-format
++ msgid "Active Internet connections "
++ msgstr ""
++ 
++-#: ../netstat.c:1742
+++#: ../netstat.c:1763
+++#, c-format
++ msgid ""
++ "\n"
++-"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
++-"  "
+++"Proto Recv-Q Send-Q Local Address           Foreign Address         "
+++"State      "
++ msgstr ""
++ 
++-#: ../netstat.c:1744
+++#: ../netstat.c:1765
+++#, c-format
++ msgid " User       Inode     "
++ msgstr ""
++ 
++-#: ../netstat.c:1747
+++#: ../netstat.c:1768
+++#, c-format
++ msgid " Timer"
++ msgstr ""
++ 
++-#: ../netstat.c:1777
+++#: ../netstat.c:1798
+++#, c-format
++ msgid "IPv4 Group Memberships\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1778
+++#: ../netstat.c:1799
+++#, c-format
++ msgid "Interface       RefCnt Group\n"
++ msgstr ""
++ 
++@@ -986,23 +1143,28 @@ msgid "rarp: cannot set entry from %s:%u
++ msgstr ""
++ 
++ #: ../rarp.c:176
+++#, c-format
++ msgid "Usage: rarp -a                               list entries in cache.\n"
++ msgstr ""
++ 
++ #: ../rarp.c:177
+++#, c-format
++ msgid "       rarp -d <hostname>                    delete entry from cache.\n"
++ msgstr ""
++ 
++ #: ../rarp.c:178
+++#, c-format
++ msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
++ msgstr ""
++ 
++ #: ../rarp.c:179
+++#, c-format
++ msgid ""
++ "       rarp -f                               add entries from /etc/ethers.\n"
++ msgstr ""
++ 
++ #: ../rarp.c:180
+++#, c-format
++ msgid ""
++ "       rarp -V                               display program version.\n"
++ "\n"
++@@ -1019,38 +1181,50 @@ msgid "rarp: %s: unknown hardware type.\
++ msgstr ""
++ 
++ #: ../route.c:80
+++#, c-format
++ msgid ""
++ "Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
++ msgstr ""
++ 
++ #: ../route.c:81
+++#, c-format
++ msgid ""
++ "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
++ "\n"
++ msgstr ""
++ 
++ #: ../route.c:83
+++#, c-format
++ msgid ""
++ "       route {-h|--help} [<AF>]              Detailed usage syntax for "
++ "specified AF.\n"
++ msgstr ""
++ 
++ #: ../route.c:84
+++#, c-format
++ msgid ""
++ "       route {-V|--version}                  Display version/author and "
++ "exit.\n"
++ "\n"
++ msgstr ""
++ 
+++#: ../route.c:92
+++#, c-format
+++msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
+++msgstr ""
+++
++ #: ../plipconfig.c:66
+++#, c-format
++ msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
++ msgstr ""
++ 
++ #: ../plipconfig.c:67
+++#, c-format
++ msgid "                  [nibble NN] [trigger NN]\n"
++ msgstr ""
++ 
++ #: ../plipconfig.c:68
+++#, c-format
++ msgid "       plipconfig -V | --version\n"
++ msgstr ""
++ 
++@@ -1060,61 +1234,75 @@ msgid "%s\tnibble %lu  trigger %lu\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:85
+++#, c-format
++ msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:86
+++#, c-format
++ msgid ""
++ "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:87
+++#, c-format
++ msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:88
+++#, c-format
++ msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:89
+++#, c-format
++ msgid ""
++ "       iptunnel -V | --version\n"
++ "\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:90
+++#, c-format
++ msgid "Where: NAME := STRING\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:91
+++#, c-format
++ msgid "       ADDR := { IP_ADDRESS | any }\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:92
+++#, c-format
++ msgid "       TOS  := { NUMBER | inherit }\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:93
+++#, c-format
++ msgid "       TTL  := { 1..255 | inherit }\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:94
+++#, c-format
++ msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:332
+++#, c-format
++ msgid "Keys are not allowed with ipip and sit.\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:352
+++#, c-format
++ msgid "Broadcast tunnel requires a source address.\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:367
+++#, c-format
++ msgid "ttl != 0 and noptmudisc are incompatible\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:379
+++#, c-format
++ msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
++ msgstr ""
++ 
++@@ -1128,22 +1316,27 @@ msgid "unknown"
++ msgstr ""
++ 
++ #: ../iptunnel.c:453
+++#, c-format
++ msgid "  Drop packets out of sequence.\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:455
+++#, c-format
++ msgid "  Checksum in received packet is required.\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:457
+++#, c-format
++ msgid "  Sequence packets on output.\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:459
+++#, c-format
++ msgid "  Checksum output packets.\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:487
+++#, c-format
++ msgid "Wrong format of /proc/net/dev. Sorry.\n"
++ msgstr ""
++ 
++@@ -1153,10 +1346,12 @@ msgid "Failed to get type of [%s]\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:516
+++#, c-format
++ msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:519
+++#, c-format
++ msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
++ msgstr ""
++ 
++@@ -1563,12 +1758,12 @@ msgstr ""
++ 
++ #: ../statistics.c:178
++ #, c-format
++-msgid "%u packets directly received from backlog"
+++msgid "%u of bytes directly received from backlog"
++ msgstr ""
++ 
++ #: ../statistics.c:180
++ #, c-format
++-msgid "%u packets directly received from prequeue"
+++msgid "%u of bytes directly received from prequeue"
++ msgstr ""
++ 
++ #: ../statistics.c:182
++@@ -1578,7 +1773,7 @@ msgstr ""
++ 
++ #: ../statistics.c:183
++ #, c-format
++-msgid "%u packets header predicted"
+++msgid "%u packet headers predicted"
++ msgstr ""
++ 
++ #: ../statistics.c:184
++@@ -1591,19 +1786,209 @@ msgstr ""
++ msgid "Ran %u times out of system memory during packet sending"
++ msgstr ""
++ 
++-#: ../statistics.c:253
+++#: ../statistics.c:188
+++#, c-format
+++msgid "%u acknowledgments not containing data received"
+++msgstr ""
+++
+++#: ../statistics.c:189
+++#, c-format
+++msgid "%u predicted acknowledgments"
+++msgstr ""
+++
+++#: ../statistics.c:190
+++#, c-format
+++msgid "%u times recovered from packet loss due to fast retransmit"
+++msgstr ""
+++
+++#: ../statistics.c:191
+++#, c-format
+++msgid "%u times recovered from packet loss due to SACK data"
+++msgstr ""
+++
+++#: ../statistics.c:192
+++#, c-format
+++msgid "%u bad SACKs received"
+++msgstr ""
+++
+++#: ../statistics.c:193
+++#, c-format
+++msgid "Detected reordering %u times using FACK"
+++msgstr ""
+++
+++#: ../statistics.c:194
+++#, c-format
+++msgid "Detected reordering %u times using SACK"
+++msgstr ""
+++
+++#: ../statistics.c:195
+++#, c-format
+++msgid "Detected reordering %u times using time stamp"
+++msgstr ""
+++
+++#: ../statistics.c:196
+++#, c-format
+++msgid "Detected reordering %u times using reno fast retransmit"
+++msgstr ""
+++
+++#: ../statistics.c:197
+++#, c-format
+++msgid "%u congestion windows fully recovered"
+++msgstr ""
+++
+++#: ../statistics.c:198
+++#, c-format
+++msgid "%u congestion windows partially recovered using Hoe heuristic"
+++msgstr ""
+++
+++#: ../statistics.c:199
+++#, c-format
+++msgid "%u congestion window recovered using DSACK"
+++msgstr ""
+++
+++#: ../statistics.c:200
+++#, c-format
+++msgid "%u congestion windows recovered after partial ack"
+++msgstr ""
+++
+++#: ../statistics.c:201
+++#, c-format
+++msgid "%u retransmits lost"
+++msgstr ""
+++
+++#: ../statistics.c:202
+++#, c-format
+++msgid "%u timeouts after reno fast retransmit"
+++msgstr ""
+++
+++#: ../statistics.c:203
+++#, c-format
+++msgid "%u timeouts after SACK recovery"
+++msgstr ""
+++
+++#: ../statistics.c:204
+++#, c-format
+++msgid "%u timeouts in loss state"
+++msgstr ""
+++
+++#: ../statistics.c:205
+++#, c-format
+++msgid "%u fast retransmits"
+++msgstr ""
+++
+++#: ../statistics.c:206
+++#, c-format
+++msgid "%u forward retransmits"
+++msgstr ""
+++
+++#: ../statistics.c:207
+++#, c-format
+++msgid "%u retransmits in slow start"
+++msgstr ""
+++
+++#: ../statistics.c:208
+++#, c-format
+++msgid "%u other TCP timeouts"
+++msgstr ""
+++
+++#: ../statistics.c:209
+++#, c-format
+++msgid "%u reno fast retransmits failed"
+++msgstr ""
+++
+++#: ../statistics.c:210
+++#, c-format
+++msgid "%u sack retransmits failed"
+++msgstr ""
+++
+++#: ../statistics.c:211
+++#, c-format
+++msgid "%u times receiver scheduled too late for direct processing"
+++msgstr ""
+++
+++#: ../statistics.c:212
+++#, c-format
+++msgid "%u packets collapsed in receive queue due to low socket buffer"
+++msgstr ""
+++
+++#: ../statistics.c:213
+++#, c-format
+++msgid "%u DSACKs sent for old packets"
+++msgstr ""
+++
+++#: ../statistics.c:214
+++#, c-format
+++msgid "%u DSACKs sent for out of order packets"
+++msgstr ""
+++
+++#: ../statistics.c:215
+++#, c-format
+++msgid "%u DSACKs received"
+++msgstr ""
+++
+++#: ../statistics.c:216
+++#, c-format
+++msgid "%u DSACKs for out of order packets received"
+++msgstr ""
+++
+++#: ../statistics.c:217
+++#, c-format
+++msgid "%u connections reset due to unexpected SYN"
+++msgstr ""
+++
+++#: ../statistics.c:218
+++#, c-format
+++msgid "%u connections reset due to unexpected data"
+++msgstr ""
+++
+++#: ../statistics.c:219
+++#, c-format
+++msgid "%u connections reset due to early user close"
+++msgstr ""
+++
+++#: ../statistics.c:220
+++#, c-format
+++msgid "%u connections aborted due to memory pressure"
+++msgstr ""
+++
+++#: ../statistics.c:221
+++#, c-format
+++msgid "%u connections aborted due to timeout"
+++msgstr ""
+++
+++#: ../statistics.c:222
+++#, c-format
+++msgid "%u connections aborted after user close in linger timeout"
+++msgstr ""
+++
+++#: ../statistics.c:223
+++#, c-format
+++msgid "%u times unabled to send RST due to no memory"
+++msgstr ""
+++
+++#: ../statistics.c:224
+++#, c-format
+++msgid "TCP ran low on memory %u times"
+++msgstr ""
+++
+++#: ../statistics.c:225
+++#, c-format
+++msgid "%u TCP data loss events"
+++msgstr ""
+++
+++#: ../statistics.c:292
++ msgid "enabled"
++ msgstr ""
++ 
++-#: ../statistics.c:253
+++#: ../statistics.c:292
++ msgid "disabled"
++ msgstr ""
++ 
++-#: ../statistics.c:336
+++#: ../statistics.c:375
++ msgid "error parsing /proc/net/snmp"
++ msgstr ""
++ 
++-#: ../statistics.c:349
+++#: ../statistics.c:388
++ msgid "cannot open /proc/net/snmp"
++ msgstr ""
++ 
++@@ -1617,7 +2002,7 @@ msgstr ""
++ msgid "Cannot change line discipline to `%s'.\n"
++ msgstr ""
++ 
++-#: ../lib/af.c:153 ../lib/hw.c:156
+++#: ../lib/af.c:153 ../lib/hw.c:161
++ msgid "UNSPEC"
++ msgstr ""
++ 
++@@ -1633,11 +2018,11 @@ msgstr ""
++ msgid "IPv6"
++ msgstr ""
++ 
++-#: ../lib/af.c:164 ../lib/hw.c:177
+++#: ../lib/af.c:164 ../lib/hw.c:182
++ msgid "AMPR AX.25"
++ msgstr ""
++ 
++-#: ../lib/af.c:167 ../lib/hw.c:183
+++#: ../lib/af.c:167 ../lib/hw.c:188
++ msgid "AMPR NET/ROM"
++ msgstr ""
++ 
++@@ -1649,7 +2034,7 @@ msgstr ""
++ msgid "Appletalk DDP"
++ msgstr ""
++ 
++-#: ../lib/af.c:176 ../lib/hw.c:218
+++#: ../lib/af.c:176 ../lib/hw.c:223
++ msgid "Econet"
++ msgstr ""
++ 
++@@ -1657,19 +2042,21 @@ msgstr ""
++ msgid "CCITT X.25"
++ msgstr ""
++ 
++-#: ../lib/af.c:182 ../lib/hw.c:180
+++#: ../lib/af.c:182 ../lib/hw.c:185
++ msgid "AMPR ROSE"
++ msgstr ""
++ 
++-#: ../lib/af.c:185 ../lib/hw.c:168
+++#: ../lib/af.c:185 ../lib/hw.c:173
++ msgid "Ash"
++ msgstr ""
++ 
++ #: ../lib/af.c:243
+++#, c-format
++ msgid "Please don't supply more than one address family.\n"
++ msgstr ""
++ 
++ #: ../lib/af.c:304
+++#, c-format
++ msgid "Too much address family arguments.\n"
++ msgstr ""
++ 
++@@ -1694,6 +2081,7 @@ msgid "in_arcnet(%s): trailing junk!\n"
++ msgstr ""
++ 
++ #: ../lib/ash.c:81
+++#, c-format
++ msgid "Malformed Ash address"
++ msgstr ""
++ 
++@@ -1712,22 +2100,21 @@ msgid "Callsign too long"
++ msgstr ""
++ 
++ #: ../lib/ax25_gr.c:47
+++#, c-format
++ msgid "AX.25 not configured in this system.\n"
++ msgstr ""
++ 
++ #: ../lib/ax25_gr.c:50
+++#, c-format
++ msgid "Kernel AX.25 routing table\n"
++ msgstr ""
++ 
++ #. xxx
++ #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
+++#, c-format
++ msgid "Destination  Iface    Use\n"
++ msgstr ""
++ 
++-#: ../lib/ddp_gr.c:21
++-msgid "Routing table for `ddp' not yet supported.\n"
++-msgstr ""
++-
++ #: ../lib/ether.c:74 ../lib/ether.c:91
++ #, c-format
++ msgid "in_ether(%s): invalid ether address!\n"
++@@ -1783,90 +2170,94 @@ msgstr ""
++ msgid "in_hippi(%s): trailing junk!\n"
++ msgstr ""
++ 
++-#: ../lib/hw.c:155
+++#: ../lib/hw.c:160
++ msgid "Local Loopback"
++ msgstr ""
++ 
++-#: ../lib/hw.c:158
+++#: ../lib/hw.c:163
++ msgid "Serial Line IP"
++ msgstr ""
++ 
++-#: ../lib/hw.c:159
+++#: ../lib/hw.c:164
++ msgid "VJ Serial Line IP"
++ msgstr ""
++ 
++-#: ../lib/hw.c:160
+++#: ../lib/hw.c:165
++ msgid "6-bit Serial Line IP"
++ msgstr ""
++ 
++-#: ../lib/hw.c:161
+++#: ../lib/hw.c:166
++ msgid "VJ 6-bit Serial Line IP"
++ msgstr ""
++ 
++-#: ../lib/hw.c:162
+++#: ../lib/hw.c:167
++ msgid "Adaptive Serial Line IP"
++ msgstr ""
++ 
++-#: ../lib/hw.c:165
+++#: ../lib/hw.c:170
++ msgid "Ethernet"
++ msgstr ""
++ 
++-#: ../lib/hw.c:171
+++#: ../lib/hw.c:176
++ msgid "Fiber Distributed Data Interface"
++ msgstr ""
++ 
++-#: ../lib/hw.c:174
+++#: ../lib/hw.c:179
++ msgid "HIPPI"
++ msgstr ""
++ 
++-#: ../lib/hw.c:186
+++#: ../lib/hw.c:191
++ msgid "generic X.25"
++ msgstr ""
++ 
++-#: ../lib/hw.c:189
+++#: ../lib/hw.c:194
++ msgid "IPIP Tunnel"
++ msgstr ""
++ 
++-#: ../lib/hw.c:192
+++#: ../lib/hw.c:197
++ msgid "Point-to-Point Protocol"
++ msgstr ""
++ 
++-#: ../lib/hw.c:195
+++#: ../lib/hw.c:200
++ msgid "(Cisco)-HDLC"
++ msgstr ""
++ 
++-#: ../lib/hw.c:196
+++#: ../lib/hw.c:201
++ msgid "LAPB"
++ msgstr ""
++ 
++-#: ../lib/hw.c:199
+++#: ../lib/hw.c:204
++ msgid "ARCnet"
++ msgstr ""
++ 
++-#: ../lib/hw.c:202
+++#: ../lib/hw.c:207
++ msgid "Frame Relay DLCI"
++ msgstr ""
++ 
++-#: ../lib/hw.c:203
+++#: ../lib/hw.c:208
++ msgid "Frame Relay Access Device"
++ msgstr ""
++ 
++-#: ../lib/hw.c:206
+++#: ../lib/hw.c:211
++ msgid "IPv6-in-IPv4"
++ msgstr ""
++ 
++-#: ../lib/hw.c:209
+++#: ../lib/hw.c:214
++ msgid "IrLAP"
++ msgstr ""
++ 
++-#: ../lib/hw.c:212
+++#: ../lib/hw.c:217
++ msgid "16/4 Mbps Token Ring"
++ msgstr ""
++ 
++-#: ../lib/hw.c:214
+++#: ../lib/hw.c:219
++ msgid "16/4 Mbps Token Ring (New)"
++ msgstr ""
++ 
+++#: ../lib/hw.c:226
+++msgid "Generic EUI-64"
+++msgstr ""
+++
++ #: ../lib/inet.c:153 ../lib/inet6.c:79
++ #, c-format
++ msgid "rresolve: unsupport address family %d !\n"
++@@ -1877,131 +2268,157 @@ msgid "[UNKNOWN]"
++ msgstr ""
++ 
++ #: ../lib/inet6_gr.c:71
+++#, c-format
++ msgid "INET6 (IPv6) not configured in this system.\n"
++ msgstr ""
++ 
++ #: ../lib/inet6_gr.c:74
+++#, c-format
++ msgid "Kernel IPv6 routing table\n"
++ msgstr ""
++ 
++ #: ../lib/inet6_gr.c:76
+++#, c-format
++ msgid ""
++-"Destination                                 Next Hop                         "
++-"       Flags Metric Ref    Use Iface\n"
+++"Destination                                 Next "
+++"Hop                                Flags Metric Ref    Use Iface\n"
++ msgstr ""
++ 
++ #: ../lib/inet6_gr.c:150
+++#, c-format
++ msgid "Kernel IPv6 Neighbour Cache\n"
++ msgstr ""
++ 
++ #: ../lib/inet6_gr.c:153
+++#, c-format
++ msgid ""
++ "Neighbour                                   HW Address        Iface    Flags "
++ "Ref State\n"
++ msgstr ""
++ 
++ #: ../lib/inet6_gr.c:157
+++#, c-format
++ msgid ""
++ "Neighbour                                   HW Address        Iface    Flags "
++ "Ref State            Stale(sec) Delete(sec)\n"
++ msgstr ""
++ 
++ #: ../lib/inet6_sr.c:46
+++#, c-format
++ msgid "Usage: inet6_route [-vF] del Target\n"
++ msgstr ""
++ 
++ #: ../lib/inet6_sr.c:47
+++#, c-format
++ msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
++ msgstr ""
++ 
++ #: ../lib/inet6_sr.c:48
+++#, c-format
++ msgid "       inet6_route [-FC] flush      NOT supported\n"
++ msgstr ""
++ 
++ #: ../lib/inet6_sr.c:188
+++#, c-format
++ msgid "Flushing `inet6' routing table not supported\n"
++ msgstr ""
++ 
++ #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
+++#, c-format
++ msgid "INET (IPv4) not configured in this system.\n"
++ msgstr ""
++ 
++ #: ../lib/inet_gr.c:53
+++#, c-format
++ msgid "Kernel IP routing table\n"
++ msgstr ""
++ 
++ #: ../lib/inet_gr.c:56
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
++ "Iface\n"
++ msgstr ""
++ 
++ #: ../lib/inet_gr.c:59
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags   MSS Window  irtt "
++ "Iface\n"
++ msgstr ""
++ 
++ #: ../lib/inet_gr.c:62
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt\n"
++ msgstr ""
++ 
++ #: ../lib/inet_gr.c:237
+++#, c-format
++ msgid "Kernel IP routing cache\n"
++ msgstr ""
++ 
++ #: ../lib/inet_gr.c:258
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface\n"
++ msgstr ""
++ 
++ #: ../lib/inet_gr.c:261
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags   MSS Window  irtt "
++ "Iface\n"
++ msgstr ""
++ 
++ #: ../lib/inet_gr.c:266
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt  HH  Arp\n"
++ msgstr ""
++ 
++ #: ../lib/inet_gr.c:290
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
++ msgstr ""
++ 
++-#: ../lib/inet_sr.c:50
+++#: ../lib/inet_sr.c:51
+++#, c-format
++ msgid ""
++ "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
++ "[[dev] If]\n"
++ msgstr ""
++ 
++-#: ../lib/inet_sr.c:51
+++#: ../lib/inet_sr.c:52
+++#, c-format
++ msgid ""
++ "       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
++ msgstr ""
++ 
++-#: ../lib/inet_sr.c:52
+++#: ../lib/inet_sr.c:53
+++#, c-format
++ msgid ""
++ "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
++ msgstr ""
++ 
++-#: ../lib/inet_sr.c:53
+++#: ../lib/inet_sr.c:54
+++#, c-format
++ msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
++ msgstr ""
++ 
++-#: ../lib/inet_sr.c:54
+++#: ../lib/inet_sr.c:55
+++#, c-format
++ msgid ""
++ "       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
++ msgstr ""
++ 
++-#: ../lib/inet_sr.c:55
+++#: ../lib/inet_sr.c:56
+++#, c-format
++ msgid "       inet_route [-FC] flush      NOT supported\n"
++ msgstr ""
++ 
++@@ -2011,14 +2428,17 @@ msgid "route: %s: cannot use a NETWORK a
++ msgstr ""
++ 
++ #: ../lib/inet_sr.c:174
+++#, c-format
++ msgid "route: Invalid MSS/MTU.\n"
++ msgstr ""
++ 
++ #: ../lib/inet_sr.c:187
+++#, c-format
++ msgid "route: Invalid window.\n"
++ msgstr ""
++ 
++ #: ../lib/inet_sr.c:203
+++#, c-format
++ msgid "route: Invalid initial rtt.\n"
++ msgstr ""
++ 
++@@ -2033,73 +2453,90 @@ msgid "route: bogus netmask %s\n"
++ msgstr ""
++ 
++ #: ../lib/inet_sr.c:270
+++#, c-format
++ msgid "route: netmask doesn't match route address\n"
++ msgstr ""
++ 
++ #: ../lib/inet_sr.c:306
+++#, c-format
++ msgid "Flushing `inet' routing table not supported\n"
++ msgstr ""
++ 
++ #: ../lib/inet_sr.c:310
+++#, c-format
++ msgid "Modifying `inet' routing cache not supported\n"
++ msgstr ""
++ 
++ #: ../lib/ipx_gr.c:52
+++#, c-format
++ msgid "IPX not configured in this system.\n"
++ msgstr ""
++ 
++ #: ../lib/ipx_gr.c:56
+++#, c-format
++ msgid "Kernel IPX routing table\n"
++ msgstr ""
++ 
++ #. xxx
++ #: ../lib/ipx_gr.c:57
+++#, c-format
++ msgid "Destination               Router Net                Router Node\n"
++ msgstr ""
++ 
++ #: ../lib/ipx_sr.c:33
+++#, c-format
++ msgid "IPX: this needs to be written\n"
++ msgstr ""
++ 
++ #: ../lib/masq_info.c:198
+++#, c-format
++ msgid "IP masquerading entries\n"
++ msgstr ""
++ 
++ #: ../lib/masq_info.c:201
+++#, c-format
++ msgid "prot   expire source               destination          ports\n"
++ msgstr ""
++ 
++ #: ../lib/masq_info.c:204
+++#, c-format
++ msgid ""
++-"prot   expire    initseq delta prevd source               destination        "
++-"  ports\n"
+++"prot   expire    initseq delta prevd source               "
+++"destination          ports\n"
++ msgstr ""
++ 
++ #: ../lib/netrom_gr.c:48
+++#, c-format
++ msgid "NET/ROM not configured in this system.\n"
++ msgstr ""
++ 
++ #: ../lib/netrom_gr.c:51
+++#, c-format
++ msgid "Kernel NET/ROM routing table\n"
++ msgstr ""
++ 
++ #: ../lib/netrom_gr.c:52
+++#, c-format
++ msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
++ msgstr ""
++ 
++ #: ../lib/netrom_sr.c:34
+++#, c-format
++ msgid "netrom usage\n"
++ msgstr ""
++ 
++ #: ../lib/netrom_sr.c:44
+++#, c-format
++ msgid "NET/ROM: this needs to be written\n"
++ msgstr ""
++ 
++ #: ../lib/ppp.c:44
+++#, c-format
++ msgid "You cannot start PPP with this program.\n"
++ msgstr ""
++ 
++ #: ../lib/ppp_ac.c:38
+++#, c-format
++ msgid "Sorry, use pppd!\n"
++ msgstr ""
++ 
++@@ -2108,287 +2545,314 @@ msgid "Node address must be ten digits"
++ msgstr ""
++ 
++ #: ../lib/rose_gr.c:51
+++#, c-format
++ msgid "ROSE not configured in this system.\n"
++ msgstr ""
++ 
++ #: ../lib/rose_gr.c:54
+++#, c-format
++ msgid "Kernel ROSE routing table\n"
++ msgstr ""
++ 
++-#: ../lib/tr.c:70 ../lib/tr.c:85
+++#: ../lib/tr.c:86 ../lib/tr.c:101
++ #, c-format
++ msgid "in_tr(%s): invalid token ring address!\n"
++ msgstr ""
++ 
++-#: ../lib/tr.c:97
+++#: ../lib/tr.c:113
++ #, c-format
++ msgid "in_tr(%s): trailing : ignored!\n"
++ msgstr ""
++ 
++-#: ../lib/tr.c:109
+++#: ../lib/tr.c:125
++ #, c-format
++ msgid "in_tr(%s): trailing junk!\n"
++ msgstr ""
++ 
++-#: ../lib/interface.c:164
+++#: ../lib/interface.c:176
++ #, c-format
++ msgid "warning: no inet socket available: %s\n"
++ msgstr ""
++ 
++-#: ../lib/interface.c:316
+++#: ../lib/interface.c:325
++ #, c-format
++ msgid "Warning: cannot open %s (%s). Limited output.\n"
++ msgstr ""
++ 
++ #. Give better error message for this case.
++-#: ../lib/interface.c:556
+++#: ../lib/interface.c:571
++ msgid "Device not found"
++ msgstr ""
++ 
++-#: ../lib/interface.c:560
+++#: ../lib/interface.c:575
++ #, c-format
++ msgid "%s: error fetching interface information: %s\n"
++ msgstr ""
++ 
++-#: ../lib/interface.c:593
+++#: ../lib/interface.c:608
++ msgid "     - no statistics available -"
++ msgstr ""
++ 
++-#: ../lib/interface.c:597
+++#: ../lib/interface.c:612
+++#, c-format
++ msgid "[NO FLAGS]"
++ msgstr ""
++ 
++-#: ../lib/interface.c:673
+++#: ../lib/interface.c:688
++ #, c-format
++ msgid "%-9.9s Link encap:%s  "
++ msgstr ""
++ 
++-#: ../lib/interface.c:678
+++#: ../lib/interface.c:693
++ #, c-format
++ msgid "HWaddr %s  "
++ msgstr ""
++ 
++-#: ../lib/interface.c:681
+++#: ../lib/interface.c:696
++ #, c-format
++ msgid "Media:%s"
++ msgstr ""
++ 
++-#: ../lib/interface.c:683
+++#: ../lib/interface.c:698
+++#, c-format
++ msgid "(auto)"
++ msgstr ""
++ 
++-#: ../lib/interface.c:690
+++#: ../lib/interface.c:705
++ #, c-format
++ msgid "          %s addr:%s "
++ msgstr ""
++ 
++-#: ../lib/interface.c:693
+++#: ../lib/interface.c:708
++ #, c-format
++ msgid " P-t-P:%s "
++ msgstr ""
++ 
++-#: ../lib/interface.c:696
+++#: ../lib/interface.c:711
++ #, c-format
++ msgid " Bcast:%s "
++ msgstr ""
++ 
++-#: ../lib/interface.c:698
+++#: ../lib/interface.c:713
++ #, c-format
++ msgid " Mask:%s\n"
++ msgstr ""
++ 
++-#: ../lib/interface.c:715
+++#: ../lib/interface.c:730
++ #, c-format
++ msgid "          inet6 addr: %s/%d"
++ msgstr ""
++ 
++-#: ../lib/interface.c:717
+++#: ../lib/interface.c:732
+++#, c-format
++ msgid " Scope:"
++ msgstr ""
++ 
++-#: ../lib/interface.c:720
+++#: ../lib/interface.c:735
+++#, c-format
++ msgid "Global"
++ msgstr ""
++ 
++-#: ../lib/interface.c:723
+++#: ../lib/interface.c:738
+++#, c-format
++ msgid "Link"
++ msgstr ""
++ 
++-#: ../lib/interface.c:726
+++#: ../lib/interface.c:741
+++#, c-format
++ msgid "Site"
++ msgstr ""
++ 
++-#: ../lib/interface.c:729
+++#: ../lib/interface.c:744
+++#, c-format
++ msgid "Compat"
++ msgstr ""
++ 
++-#: ../lib/interface.c:732
+++#: ../lib/interface.c:747
+++#, c-format
++ msgid "Host"
++ msgstr ""
++ 
++-#: ../lib/interface.c:735
+++#: ../lib/interface.c:750
+++#, c-format
++ msgid "Unknown"
++ msgstr ""
++ 
++-#: ../lib/interface.c:750
+++#: ../lib/interface.c:765
++ #, c-format
++ msgid "          IPX/Ethernet II addr:%s\n"
++ msgstr ""
++ 
++-#: ../lib/interface.c:753
+++#: ../lib/interface.c:768
++ #, c-format
++ msgid "          IPX/Ethernet SNAP addr:%s\n"
++ msgstr ""
++ 
++-#: ../lib/interface.c:756
+++#: ../lib/interface.c:771
++ #, c-format
++ msgid "          IPX/Ethernet 802.2 addr:%s\n"
++ msgstr ""
++ 
++-#: ../lib/interface.c:759
+++#: ../lib/interface.c:774
++ #, c-format
++ msgid "          IPX/Ethernet 802.3 addr:%s\n"
++ msgstr ""
++ 
++-#: ../lib/interface.c:769
+++#: ../lib/interface.c:784
++ #, c-format
++ msgid "          EtherTalk Phase 2 addr:%s\n"
++ msgstr ""
++ 
++-#: ../lib/interface.c:778
+++#: ../lib/interface.c:793
++ #, c-format
++ msgid "          econet addr:%s\n"
++ msgstr ""
++ 
++-#: ../lib/interface.c:785
+++#: ../lib/interface.c:800
+++#, c-format
++ msgid "[NO FLAGS] "
++ msgstr ""
++ 
++-#: ../lib/interface.c:787
+++#: ../lib/interface.c:802
+++#, c-format
++ msgid "UP "
++ msgstr ""
++ 
++-#: ../lib/interface.c:789
+++#: ../lib/interface.c:804
+++#, c-format
++ msgid "BROADCAST "
++ msgstr ""
++ 
++-#: ../lib/interface.c:791
+++#: ../lib/interface.c:806
+++#, c-format
++ msgid "DEBUG "
++ msgstr ""
++ 
++-#: ../lib/interface.c:793
+++#: ../lib/interface.c:808
+++#, c-format
++ msgid "LOOPBACK "
++ msgstr ""
++ 
++-#: ../lib/interface.c:795
+++#: ../lib/interface.c:810
+++#, c-format
++ msgid "POINTOPOINT "
++ msgstr ""
++ 
++-#: ../lib/interface.c:797
+++#: ../lib/interface.c:812
+++#, c-format
++ msgid "NOTRAILERS "
++ msgstr ""
++ 
++-#: ../lib/interface.c:799
+++#: ../lib/interface.c:814
+++#, c-format
++ msgid "RUNNING "
++ msgstr ""
++ 
++-#: ../lib/interface.c:801
+++#: ../lib/interface.c:816
+++#, c-format
++ msgid "NOARP "
++ msgstr ""
++ 
++-#: ../lib/interface.c:803
+++#: ../lib/interface.c:818
+++#, c-format
++ msgid "PROMISC "
++ msgstr ""
++ 
++-#: ../lib/interface.c:805
+++#: ../lib/interface.c:820
+++#, c-format
++ msgid "ALLMULTI "
++ msgstr ""
++ 
++-#: ../lib/interface.c:807
+++#: ../lib/interface.c:822
+++#, c-format
++ msgid "SLAVE "
++ msgstr ""
++ 
++-#: ../lib/interface.c:809
+++#: ../lib/interface.c:824
+++#, c-format
++ msgid "MASTER "
++ msgstr ""
++ 
++-#: ../lib/interface.c:811
+++#: ../lib/interface.c:826
+++#, c-format
++ msgid "MULTICAST "
++ msgstr ""
++ 
++-#: ../lib/interface.c:814
+++#: ../lib/interface.c:829
+++#, c-format
++ msgid "DYNAMIC "
++ msgstr ""
++ 
++ #. DONT FORGET TO ADD THE FLAGS IN ife_print_short
++-#: ../lib/interface.c:817
+++#: ../lib/interface.c:832
++ #, c-format
++ msgid " MTU:%d  Metric:%d"
++ msgstr ""
++ 
++-#: ../lib/interface.c:821
+++#: ../lib/interface.c:836
++ #, c-format
++ msgid "  Outfill:%d  Keepalive:%d"
++ msgstr ""
++ 
++-#: ../lib/interface.c:835
+++#: ../lib/interface.c:850
++ #, c-format
++ msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
++ msgstr ""
++ 
++-#: ../lib/interface.c:840
+++#: ../lib/interface.c:855
++ #, c-format
++ msgid "             compressed:%lu\n"
++ msgstr ""
++ 
++-#: ../lib/interface.c:852
+++#: ../lib/interface.c:895
++ #, c-format
++ msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
++ msgstr ""
++ 
++-#: ../lib/interface.c:856
+++#: ../lib/interface.c:899
++ #, c-format
++ msgid "          collisions:%lu "
++ msgstr ""
++ 
++-#: ../lib/interface.c:858
+++#: ../lib/interface.c:901
++ #, c-format
++ msgid "compressed:%lu "
++ msgstr ""
++ 
++-#: ../lib/interface.c:860
+++#: ../lib/interface.c:903
++ #, c-format
++ msgid "txqueuelen:%d "
++ msgstr ""
++ 
++-#: ../lib/interface.c:862
+++#: ../lib/interface.c:905
++ #, c-format
++ msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
++ msgstr ""
++ 
++-#: ../lib/interface.c:873
+++#: ../lib/interface.c:916
++ #, c-format
++ msgid "Interrupt:%d "
++ msgstr ""
++ 
++ #. Only print devices using it for
++ #. I/O maps
++-#: ../lib/interface.c:876
+++#: ../lib/interface.c:919
++ #, c-format
++ msgid "Base address:0x%x "
++ msgstr ""
++ 
++-#: ../lib/interface.c:878
+++#: ../lib/interface.c:921
++ #, c-format
++ msgid "Memory:%lx-%lx "
++ msgstr ""
++ 
++-#: ../lib/interface.c:881
+++#: ../lib/interface.c:924
++ #, c-format
++ msgid "DMA chan:%x "
++ msgstr ""
++ 
++ #: ../lib/sockets.c:63
+++#, c-format
++ msgid "No usable address families found.\n"
++ msgstr ""
++ 
++@@ -2413,14 +2877,17 @@ msgid "ip: argument is wrong: %s\n"
++ msgstr ""
++ 
++ #: ../ipmaddr.c:61
+++#, c-format
++ msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
++ msgstr ""
++ 
++ #: ../ipmaddr.c:62
+++#, c-format
++ msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
++ msgstr ""
++ 
++ #: ../ipmaddr.c:63
+++#, c-format
++ msgid "       ipmaddr -V | -version\n"
++ msgstr ""
++ 
++@@ -2449,6 +2916,7 @@ msgid "slattach: tty_lock: (%s): %s\n"
++ msgstr ""
++ 
++ #: ../slattach.c:192
+++#, c-format
++ msgid "slattach: cannot write PID file\n"
++ msgstr ""
++ 
++@@ -2468,18 +2936,22 @@ msgid "slattach: tty_hangup(RAISE): %s\n
++ msgstr ""
++ 
++ #: ../slattach.c:468
+++#, c-format
++ msgid "slattach: tty name too long\n"
++ msgstr ""
++ 
++ #: ../slattach.c:498
+++#, c-format
++ msgid "slattach: tty_open: cannot get current state!\n"
++ msgstr ""
++ 
++ #: ../slattach.c:505
+++#, c-format
++ msgid "slattach: tty_open: cannot get current line disc!\n"
++ msgstr ""
++ 
++ #: ../slattach.c:513
+++#, c-format
++ msgid "slattach: tty_open: cannot set RAW mode!\n"
++ msgstr ""
++ 
++@@ -2489,6 +2961,7 @@ msgid "slattach: tty_open: cannot set %s
++ msgstr ""
++ 
++ #: ../slattach.c:530
+++#, c-format
++ msgid "slattach: tty_open: cannot set 8N1 mode!\n"
++ msgstr ""
++ 
++Index: net-tools/po/et_EE.po
++===================================================================
++--- net-tools.orig/po/et_EE.po
+++++ net-tools/po/et_EE.po
++@@ -6,7 +6,8 @@
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: net-tools 1.58\n"
++-"POT-Creation-Date: 2001-02-15 21:28+0200\n"
+++"Report-Msgid-Bugs-To: \n"
+++"POT-Creation-Date: 2007-06-30 12:28+0900\n"
++ "PO-Revision-Date: 2001-02-15 18:00+0300\n"
++ "Last-Translator: Meelis Roos <mroos@linux.ee>\n"
++ "Language-Team: Estonian <linux-ee@eenet.ee>\n"
++@@ -14,53 +15,58 @@ msgstr ""
++ "Content-Type: text/plain; charset=iso-8859-15\n"
++ "Content-Transfer-Encoding: 8bit\n"
++ 
++-#: ../arp.c:110 ../arp.c:269
+++#: ../arp.c:112 ../arp.c:279
+++#, c-format
++ msgid "arp: need host name\n"
++ msgstr "arp: puudub hosti nimi\n"
++ 
++-#: ../arp.c:207 ../arp.c:221
+++#: ../arp.c:215 ../arp.c:230
++ #, c-format
++ msgid "No ARP entry for %s\n"
++ msgstr "%s jaoks pole ARP kirjet\n"
++ 
++-#: ../arp.c:239
+++#: ../arp.c:248
++ #, c-format
++ msgid "arp: cant get HW-Address for `%s': %s.\n"
++ msgstr "arp: ei saa riistvaralist aadressi `%s' jaoks: %s\n"
++ 
++-#: ../arp.c:243
+++#: ../arp.c:252
+++#, c-format
++ msgid "arp: protocol type mismatch.\n"
++ msgstr "arp: vale protokolli tüüp\n"
++ 
++-#: ../arp.c:252
+++#: ../arp.c:261
++ #, c-format
++ msgid "arp: device `%s' has HW address %s `%s'.\n"
++ msgstr "arp: seadmel `%s' on riistvaraline aadress %s `%s'\n"
++ 
++-#: ../arp.c:282
+++#: ../arp.c:293
+++#, c-format
++ msgid "arp: need hardware address\n"
++ msgstr "arp: puudub riistvaraline aadress\n"
++ 
++-#: ../arp.c:290
+++#: ../arp.c:301
+++#, c-format
++ msgid "arp: invalid hardware address\n"
++ msgstr "arp: vigane riistvaraline aadress\n"
++ 
++-#: ../arp.c:387
+++#: ../arp.c:398
++ #, c-format
++ msgid "arp: cannot open etherfile %s !\n"
++ msgstr "arp: ei saa avada faili %s\n"
++ 
++-#: ../arp.c:403
+++#: ../arp.c:414
++ #, c-format
++ msgid "arp: format error on line %u of etherfile %s !\n"
++ msgstr "arp: formaadiviga real %u failis %s\n"
++ 
++-#: ../arp.c:416
+++#: ../arp.c:427
++ #, c-format
++ msgid "arp: cannot set entry on line %u of etherfile %s !\n"
++ msgstr "arp: ei saa kehtestada ARP kirjet real %u failis %s\n"
++ 
++-#: ../arp.c:437
+++#: ../arp.c:448
+++#, c-format
++ msgid ""
++ "Address                  HWtype  HWaddress           Flags Mask            "
++ "Iface\n"
++@@ -68,45 +74,52 @@ msgstr ""
++ "Aadress                  HWtüüp  HWaadress           Lipud Mask            "
++ "Liides\n"
++ 
++-#: ../arp.c:467
+++#: ../arp.c:476
+++#, fuzzy
+++msgid "<from_interface>"
+++msgstr " liides %s\n"
+++
+++#: ../arp.c:478
++ msgid "(incomplete)"
++ msgstr "(mittetäielik)"
++ 
++-#: ../arp.c:484
+++#: ../arp.c:495
++ #, c-format
++ msgid "%s (%s) at "
++ msgstr "%s (%s) aadressil "
++ 
++-#: ../arp.c:490
+++#: ../arp.c:501
+++#, c-format
++ msgid "<incomplete> "
++ msgstr "<mittetäielik>"
++ 
++-#: ../arp.c:496
+++#: ../arp.c:507
++ #, c-format
++ msgid "netmask %s "
++ msgstr "võrgumask %s "
++ 
++-#: ../arp.c:513
+++#: ../arp.c:524
++ #, c-format
++ msgid "on %s\n"
++ msgstr "liides %s\n"
++ 
++-#: ../arp.c:592
+++#: ../arp.c:605
++ #, c-format
++ msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
++ msgstr "ARP kirjeid kokku: %s\tignoreerisin: %d\tleidsin: %d\n"
++ 
++-#: ../arp.c:596
+++#: ../arp.c:609
++ #, c-format
++ msgid "%s (%s) -- no entry\n"
++ msgstr "%s (%s) -- pole kirjet\n"
++ 
++-#: ../arp.c:598
+++#: ../arp.c:611
++ #, c-format
++ msgid "arp: in %d entries no match found.\n"
++ msgstr "arp: ei leidnud %d kirje hulgast sobivat\n"
++ 
++-#: ../arp.c:613
+++#: ../arp.c:626
+++#, c-format
++ msgid ""
++ "Usage:\n"
++ "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
++@@ -116,47 +129,45 @@ msgstr ""
++ "ARP cache vaatamine:\n"
++ "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hosti nimi>]\n"
++ 
++-#: ../arp.c:614
+++#: ../arp.c:627
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP "
+++"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
++ "entry\n"
++ msgstr ""
++ "ARP kirje kustutamine:\n"
++ "  arp [-v]          [-i <if>] -d  <hosti nimi> [pub] [nopub]\n"
++ 
++-#: ../arp.c:615
+++#: ../arp.c:628
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from "
+++"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
++ "file\n"
++ msgstr ""
++ "ARP kirjete lisamine failist:\n"
++ "  arp [-vnD] [<HW>] [-i <if>] -f  [<failinimi>]\n"
++ 
++-#: ../arp.c:616
+++#: ../arp.c:629
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add "
+++"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
++ "entry\n"
++ msgstr ""
++ "ARP kirje lisamine:\n"
++ "  arp [-v]   [<HW>] [-i <if>] -s  <hosti nimi> <hwaddr> [temp] [nopub]\n"
++ 
++-#: ../arp.c:617
++-msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
++-"<-''-\n"
++-msgstr ""
++-"  arp [-v]   [<HW>] [-i <if>] -s  <hosti nimi> <hwaddr> [netmask <nm>] pub\n"
++-
++-#: ../arp.c:618
+++#: ../arp.c:630
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      "
+++"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
++ "<-''-\n"
++ "\n"
++ msgstr ""
++ "  arp [-v]   [<HW>] [-i <if>] -Ds <hosti nimi> <if> [netmask <nm>] pub\n"
++ "\n"
++ 
++-#: ../arp.c:620
+++#: ../arp.c:632
+++#, c-format
++ msgid ""
++ "        -a                       display (all) hosts in alternative (BSD) "
++ "style\n"
++@@ -164,122 +175,132 @@ msgstr ""
++ "        -a                       näita kõiki hoste alternatiivsel (BSD) "
++ "kujul\n"
++ 
++-#: ../arp.c:621
+++#: ../arp.c:633
+++#, c-format
++ msgid "        -s, --set                set a new ARP entry\n"
++ msgstr "        -s, --set                uue ARP kirje seadmine\n"
++ 
++-#: ../arp.c:622
+++#: ../arp.c:634
+++#, c-format
++ msgid "        -d, --delete             delete a specified entry\n"
++ msgstr "        -d, --delete             määratud kirje kustutamine\n"
++ 
++-#: ../arp.c:623 ../netstat.c:1485 ../route.c:85
+++#: ../arp.c:635 ../netstat.c:1503 ../route.c:86
+++#, c-format
++ msgid "        -v, --verbose            be verbose\n"
++ msgstr "        -v, --verbose            jutukas väljund\n"
++ 
++-#: ../arp.c:624
+++#: ../arp.c:636 ../netstat.c:1504 ../route.c:87
+++#, c-format
++ msgid "        -n, --numeric            don't resolve names\n"
++ msgstr "        -n, --numeric            mitte lahendada nimesid\n"
++ 
++-#: ../arp.c:625
+++#: ../arp.c:637
+++#, c-format
++ msgid ""
++ "        -i, --device             specify network interface (e.g. eth0)\n"
++ msgstr ""
++ "        -i, --device             võrguliidese täpsustamine (näiteks eth0)\n"
++ 
++-#: ../arp.c:626
+++#: ../arp.c:638
+++#, c-format
++ msgid "        -D, --use-device         read <hwaddr> from given device\n"
++ msgstr "        -D, --use-device         lugeda <hwaddr> vastavalt liideselt\n"
++ 
++-#: ../arp.c:627
+++#: ../arp.c:639
+++#, c-format
++ msgid "        -A, -p, --protocol       specify protocol family\n"
++ msgstr "        -A, -p, --protocol       protokollipere määramine\n"
++ 
++-#: ../arp.c:628
+++#: ../arp.c:640
+++#, c-format
++ msgid ""
++-"        -f, --file               read new entries from file or from "
++-"/etc/ethers\n"
+++"        -f, --file               read new entries from file or from /etc/"
+++"ethers\n"
++ "\n"
++ msgstr ""
++-"        -f, --file               lugeda kirjed antud failist või "
++-"/etc/ethers'st\n"
+++"        -f, --file               lugeda kirjed antud failist või /etc/"
+++"ethers'st\n"
++ "\n"
++ 
++-#: ../arp.c:630 ../rarp.c:181
+++#: ../arp.c:642 ../rarp.c:182
++ #, c-format
++ msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
++ msgstr ""
++ "  <HW>=kasutage '-H <hw>' riistvaralise aadressi määramiseks.\n"
++ "       Vaikimisi: %s\n"
++ 
++-#: ../arp.c:631 ../rarp.c:182
+++#: ../arp.c:643 ../rarp.c:183
+++#, c-format
++ msgid "  List of possible hardware types (which support ARP):\n"
++ msgstr "  Võimalike ARP-i toetavate riistvara tüüpide nimekiri:\n"
++ 
++-#: ../arp.c:664 ../arp.c:749
+++#: ../arp.c:677 ../arp.c:762
++ #, c-format
++ msgid "%s: hardware type not supported!\n"
++ msgstr "arp: riistvara tüüpi %s ei toetata\n"
++ 
++-#: ../arp.c:668
+++#: ../arp.c:681
++ #, c-format
++ msgid "%s: address family not supported!\n"
++ msgstr "arp: aadressiperekonda %s ei toetata\n"
++ 
++-#: ../arp.c:703
+++#: ../arp.c:716
+++#, c-format
++ msgid "arp: -N not yet supported.\n"
++ msgstr "arp: -N toetust pole veel\n"
++ 
++-#: ../arp.c:713
+++#: ../arp.c:726
++ #, c-format
++ msgid "arp: %s: unknown address family.\n"
++ msgstr "arp: tundmatu aadressiperekond %s\n"
++ 
++-#: ../arp.c:722
+++#: ../arp.c:735
++ #, c-format
++ msgid "arp: %s: unknown hardware type.\n"
++ msgstr "arp: tundmatu riistvara tüüp %s\n"
++ 
++-#: ../arp.c:741
+++#: ../arp.c:754
++ #, c-format
++ msgid "arp: %s: kernel only supports 'inet'.\n"
++ msgstr "arp: tuumas on ainult 'inet' aadressiperekonna toetus\n"
++ 
++-#: ../arp.c:754
+++#: ../arp.c:767
++ #, c-format
++ msgid "arp: %s: hardware type without ARP support.\n"
++ msgstr "arp: riistvara tüübil %s pole ARP toetust\n"
++ 
++-#: ../hostname.c:69
+++#: ../hostname.c:71
++ #, c-format
++ msgid "Setting nodename to `%s'\n"
++ msgstr "Sean sõlme nimeks `%s'\n"
++ 
++-#: ../hostname.c:74
+++#: ../hostname.c:76
++ #, c-format
++ msgid "%s: you must be root to change the node name\n"
++ msgstr "%s: ainult root saab sõlme nime muuta\n"
++ 
++-#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116
+++#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117
++ #, c-format
++ msgid "%s: name too long\n"
++ msgstr "%s: nimi on liiga pikk\n"
++ 
++-#: ../hostname.c:89
+++#: ../hostname.c:91
++ #, c-format
++ msgid "Setting hostname to `%s'\n"
++ msgstr "Sean hosti nimeks `%s'\n"
++ 
++-#: ../hostname.c:94
+++#: ../hostname.c:96
++ #, c-format
++ msgid "%s: you must be root to change the host name\n"
++ msgstr "%s: ainult root saab hosti nime muuta\n"
++ 
++-#: ../hostname.c:108
+++#: ../hostname.c:109
++ #, c-format
++ msgid "Setting domainname to `%s'\n"
++ msgstr "Sean domeeni nimeks `%s'\n"
++ 
++-#: ../hostname.c:113
+++#: ../hostname.c:114
++ #, c-format
++ msgid "%s: you must be root to change the domain name\n"
++ msgstr "%s: ainult root saab domeeni nime muuta\n"
++@@ -304,25 +325,28 @@ msgstr "Tulemus: h_aliases=`%s'\n"
++ msgid "Result: h_addr_list=`%s'\n"
++ msgstr "Tulemus: h_addr_list=`%s'\n"
++ 
++-#: ../hostname.c:209
+++#: ../hostname.c:208
++ #, c-format
++ msgid "%s: can't open `%s'\n"
++ msgstr "%s: ei saa avada faili `%s'\n"
++ 
++-#: ../hostname.c:223
+++#: ../hostname.c:222
+++#, c-format
++ msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
++ msgstr ""
++ "Kasutamine:\n"
++ "  hostname [-v] {hosti nimi|-F fail}         hosti nime seadmine (ka "
++ "failist)\n"
++ 
++-#: ../hostname.c:224
+++#: ../hostname.c:223
+++#, c-format
++ msgid ""
++ "       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
++ msgstr ""
++ "  domainname [-v] {nisdomeen|-F fail}        NIS domeeni nime seadmine\n"
++ 
++-#: ../hostname.c:226
+++#: ../hostname.c:225
+++#, c-format
++ msgid ""
++ "       nodename [-v] {nodename|-F file}      set DECnet node name (from "
++ "file)\n"
++@@ -330,18 +354,21 @@ msgstr ""
++ "  nodename [-v] {nodename|-F fail}           DECneti võrgusõlme nime "
++ "seadmine\n"
++ 
++-#: ../hostname.c:228
+++#: ../hostname.c:227
+++#, c-format
++ msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
++ msgstr ""
++ "  hostname [-v] [-d|-f|-s|-a|-i|-y|-n]       nime näitamine antud formaadis\n"
++ 
++-#: ../hostname.c:229
+++#: ../hostname.c:228
+++#, c-format
++ msgid ""
++ "       hostname [-v]                         display hostname\n"
++ "\n"
++ msgstr "  hostname [-v]                              hosti nime näitamine\n"
++ 
++-#: ../hostname.c:230
+++#: ../hostname.c:229
+++#, c-format
++ msgid ""
++ "       hostname -V|--version|-h|--help       print info and exit\n"
++ "\n"
++@@ -350,7 +377,8 @@ msgstr ""
++ "  hostname -h|--help                         seesama abiinfo\n"
++ "\n"
++ 
++-#: ../hostname.c:231
+++#: ../hostname.c:230
+++#, c-format
++ msgid ""
++ "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
++ "\n"
++@@ -358,36 +386,44 @@ msgstr ""
++ "  dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
++ "\n"
++ 
++-#: ../hostname.c:232
+++#: ../hostname.c:231
+++#, c-format
++ msgid "    -s, --short           short host name\n"
++ msgstr "    -s, --short           lühike hosti nimi\n"
++ 
++-#: ../hostname.c:233
+++#: ../hostname.c:232
+++#, c-format
++ msgid "    -a, --alias           alias names\n"
++ msgstr "     -a, --alias          alias-nimed\n"
++ 
++-#: ../hostname.c:234
+++#: ../hostname.c:233
+++#, c-format
++ msgid "    -i, --ip-address      addresses for the hostname\n"
++ msgstr "    -i, --ip-address      hosti IP aadressid\n"
++ 
++-#: ../hostname.c:235
+++#: ../hostname.c:234
+++#, c-format
++ msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
++ msgstr ""
++ "    -f, --fqdn, --long    pikk hosti nimi (FQDN - täielik süsteeminimi)\n"
++ 
++-#: ../hostname.c:236
+++#: ../hostname.c:235
+++#, c-format
++ msgid "    -d, --domain          DNS domain name\n"
++ msgstr "    -d, --domain          DNS domeeni nimi\n"
++ 
++-#: ../hostname.c:237
+++#: ../hostname.c:236
+++#, c-format
++ msgid "    -y, --yp, --nis       NIS/YP domainname\n"
++ msgstr "    -y, --yp, --nis       NIS/YP domeeni nimi\n"
++ 
++-#: ../hostname.c:239
+++#: ../hostname.c:238
+++#, c-format
++ msgid "    -n, --node            DECnet node name\n"
++ msgstr "    -n, --node            DECneti võrgusõlme nimi\n"
++ 
++-#: ../hostname.c:241
+++#: ../hostname.c:240
+++#, c-format
++ msgid ""
++ "    -F, --file            read hostname or NIS domainname from given file\n"
++ "\n"
++@@ -395,7 +431,8 @@ msgstr ""
++ "    -F, --file            lugeda hosti või NIS domeeni nimi failist\n"
++ "\n"
++ 
++-#: ../hostname.c:243
+++#: ../hostname.c:242
+++#, c-format
++ msgid ""
++ "   This command can read or set the hostname or the NIS domainname. You can\n"
++ "   also read the DNS domain or the FQDN (fully qualified domain name).\n"
++@@ -415,6 +452,7 @@ msgid "%s: You can't change the DNS doma
++ msgstr "%s: selle käsuga ei saa muuta DNS domeeni nime\n"
++ 
++ #: ../hostname.c:339
+++#, c-format
++ msgid ""
++ "\n"
++ "Unless you are using bind or NIS for host lookups you can change the DNS\n"
++@@ -423,6 +461,7 @@ msgstr ""
++ "Kui Te EI kasuta bind'i ega NIS'i nimede lahendamiseks, saate DNS domeeni\n"
++ 
++ #: ../hostname.c:340
+++#, c-format
++ msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
++ msgstr "(mis on täieliku nime osa) nime muuta failist /etc/hosts.\n"
++ 
++@@ -441,76 +480,97 @@ msgstr "getdomainname()=`%s'\n"
++ msgid "getnodename()=`%s'\n"
++ msgstr "getnodename()=`%s'\n"
++ 
++-#: ../ifconfig.c:110
+++#: ../ifconfig.c:107
+++#, c-format
++ msgid ""
++-"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
+++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
++ "Flg\n"
++ msgstr ""
++-"Liides  MTU Meetr. RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
+++"Liides  MTU Meetr RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
++ "Lip\n"
++ 
++-#: ../ifconfig.c:132 ../ifconfig.c:164
++-#, c-format
++-msgid "%s: unknown interface: %s\n"
++-msgstr "ifconfig: tundmatu liides %s: %s\n"
+++#: ../ifconfig.c:129 ../ifconfig.c:161
+++#, fuzzy, c-format
+++msgid "%s: ERROR while getting interface flags: %s\n"
+++msgstr "%s: viga liidese info küsimisel: %s\n"
++ 
++-#: ../ifconfig.c:156 ../ifconfig.c:740 ../ifconfig.c:831 ../ifconfig.c:937
+++#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
+++#: ../ifconfig.c:973
+++#, c-format
++ msgid "No support for INET on this system.\n"
++ msgstr "Antud süsteem ei toeta INET aadressiperekonda\n"
++ 
++-#: ../ifconfig.c:179
+++#: ../ifconfig.c:193
+++#, fuzzy, c-format
+++msgid "%s: ERROR while testing interface flags: %s\n"
+++msgstr "%s: viga liidese info küsimisel: %s\n"
+++
+++#: ../ifconfig.c:202
+++#, fuzzy, c-format
++ msgid ""
++ "Usage:\n"
++-"  ifconfig [-a] [-i] [-v] [-s] <interface> [[<AF>] <address>]\n"
+++"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
++ msgstr ""
++ "Kasutamine:\n"
++ "  ifconfig [-a] [-i] [-v] [-s] <liides> [[<AF>] <aadress>]\n"
++ 
++-#: ../ifconfig.c:181
+++#: ../ifconfig.c:204
+++#, c-format
++ msgid "  [add <address>[/<prefixlen>]]\n"
++ msgstr "  [add <aadress>[/<prefiksi pikkus>]]\n"
++ 
++-#: ../ifconfig.c:182
+++#: ../ifconfig.c:205
+++#, c-format
++ msgid "  [del <address>[/<prefixlen>]]\n"
++ msgstr "  [del <aadress>[/<prefiksi pikkus>]]\n"
++ 
++-#: ../ifconfig.c:183
+++#: ../ifconfig.c:206
+++#, c-format
++ msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
++ msgstr "  [[-]broadcast [<aadress>]]  [[-]pointopoint [<aadress>]]\n"
++ 
++-#: ../ifconfig.c:184
+++#: ../ifconfig.c:207
+++#, c-format
++ msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
++ msgstr "  [netmask <aadress>]  [dstaddr <aadress>]  [tunnel <aadress>]\n"
++ 
++-#: ../ifconfig.c:187
+++#: ../ifconfig.c:210
+++#, c-format
++ msgid "  [outfill <NN>] [keepalive <NN>]\n"
++ msgstr "  [outfill <NN>] [keepalive <NN>]\n"
++ 
++-#: ../ifconfig.c:189
+++#: ../ifconfig.c:212
+++#, c-format
++ msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
++ msgstr "  [hw <HW> <aadress>]  [metric <NN>]  [mtu <NN>]\n"
++ 
++-#: ../ifconfig.c:190
+++#: ../ifconfig.c:213
+++#, c-format
++ msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
++ msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
++ 
++-#: ../ifconfig.c:191
+++#: ../ifconfig.c:214
+++#, c-format
++ msgid "  [multicast]  [[-]promisc]\n"
++ msgstr "  [multicast]  [[-]promisc]\n"
++ 
++-#: ../ifconfig.c:192
+++#: ../ifconfig.c:215
+++#, c-format
++ msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
++ msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <tüüp>]\n"
++ 
++-#: ../ifconfig.c:194
+++#: ../ifconfig.c:217
+++#, c-format
++ msgid "  [txqueuelen <NN>]\n"
++ msgstr "  [txqueuelen <NN>]\n"
++ 
++-#: ../ifconfig.c:197
+++#: ../ifconfig.c:220
+++#, c-format
++ msgid "  [[-]dynamic]\n"
++ msgstr "  [[-]dynamic]\n"
++ 
++-#: ../ifconfig.c:199
+++#: ../ifconfig.c:222
+++#, c-format
++ msgid ""
++ "  [up|down] ...\n"
++ "\n"
++@@ -518,73 +578,134 @@ msgstr ""
++ "  [up|down] ...\n"
++ "\n"
++ 
++-#: ../ifconfig.c:201
+++#: ../ifconfig.c:224
+++#, c-format
++ msgid "  <HW>=Hardware Type.\n"
++ msgstr "  <HW>=riistvara tüüp\n"
++ 
++-#: ../ifconfig.c:202
+++#: ../ifconfig.c:225
+++#, c-format
++ msgid "  List of possible hardware types:\n"
++ msgstr "  Võimalike riistvara tüüpide nimekiri:\n"
++ 
++ #. 1 = ARPable
++-#: ../ifconfig.c:204
+++#: ../ifconfig.c:227
++ #, c-format
++ msgid "  <AF>=Address family. Default: %s\n"
++ msgstr "  <AF>=aadressiperekond, vaikimisi %s\n"
++ 
++-#: ../ifconfig.c:205
+++#: ../ifconfig.c:228
+++#, c-format
++ msgid "  List of possible address families:\n"
++ msgstr "  Võimalike aadressiperekondade nimekiri:\n"
++ 
++-#: ../ifconfig.c:361
+++#: ../ifconfig.c:303
+++#, c-format
+++msgid "ifconfig: option `%s' not recognised.\n"
+++msgstr ""
+++
+++#: ../ifconfig.c:305 ../ifconfig.c:962
+++#, c-format
+++msgid "ifconfig: `--help' gives usage information.\n"
+++msgstr ""
+++
+++#: ../ifconfig.c:380
+++#, c-format
++ msgid "Unknown media type.\n"
++ msgstr "Tundmatu meedia tüüp\n"
++ 
++-#: ../ifconfig.c:653
+++#: ../ifconfig.c:417
+++#, c-format
+++msgid ""
+++"Warning: Interface %s still in promisc mode... maybe other application is "
+++"running?\n"
+++msgstr ""
+++
+++#: ../ifconfig.c:429
+++#, c-format
+++msgid "Warning: Interface %s still in MULTICAST mode.\n"
+++msgstr ""
+++
+++#: ../ifconfig.c:441
+++#, c-format
+++msgid "Warning: Interface %s still in ALLMULTI mode.\n"
+++msgstr ""
+++
+++#: ../ifconfig.c:465
+++#, c-format
+++msgid "Warning: Interface %s still in DYNAMIC mode.\n"
+++msgstr ""
+++
+++#: ../ifconfig.c:523
+++#, c-format
+++msgid "Warning: Interface %s still in BROADCAST mode.\n"
+++msgstr ""
+++
+++#: ../ifconfig.c:652
+++#, c-format
+++msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
+++msgstr ""
+++
+++#: ../ifconfig.c:684
++ #, c-format
++ msgid "hw address type `%s' has no handler to set address. failed.\n"
++ msgstr ""
++ "riistvara aadressi tüübil `%s' pole käsitlejat aadressi seadmiseks - ebaõnn\n"
++ 
++-#: ../ifconfig.c:662
+++#: ../ifconfig.c:693
++ #, c-format
++ msgid "%s: invalid %s address.\n"
++ msgstr "%s: vigane %s aadress\n"
++ 
++-#: ../ifconfig.c:706 ../ifconfig.c:796 ../ifconfig.c:882
+++#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
+++#, c-format
++ msgid "No support for INET6 on this system.\n"
++ msgstr "Antud süsteem ei toeta INET6 aadressiperekonda\n"
++ 
++-#: ../ifconfig.c:749 ../ifconfig.c:840
+++#: ../ifconfig.c:780 ../ifconfig.c:871
++ #, c-format
++ msgid "Interface %s not initialized\n"
++ msgstr "Liides %s pole initsialiseeritud\n"
++ 
++-#: ../ifconfig.c:761 ../ifconfig.c:851
+++#: ../ifconfig.c:792 ../ifconfig.c:882
+++#, c-format
++ msgid "Bad address.\n"
++ msgstr "Vigane aadress\n"
++ 
++-#: ../ifconfig.c:854
+++#: ../ifconfig.c:885
+++#, c-format
++ msgid "Address deletion not supported on this system.\n"
++ msgstr "Antud süsteem ei toeta aadresside kustutamist\n"
++ 
++-#: ../ifconfig.c:947
+++#: ../ifconfig.c:957
+++#, fuzzy, c-format
+++msgid "ifconfig: Cannot set address for this protocol family.\n"
+++msgstr "Ei oska seada aadresse aadressiperekonna %d jaoks\n"
+++
+++#: ../ifconfig.c:983
+++#, c-format
++ msgid "No support for ECONET on this system.\n"
++ msgstr "Antud süsteem ei toeta ECONET aadressiperekonda\n"
++ 
++-#: ../ifconfig.c:955
+++#: ../ifconfig.c:991
++ #, c-format
++ msgid "Don't know how to set addresses for family %d.\n"
++ msgstr "Ei oska seada aadresse aadressiperekonna %d jaoks\n"
++ 
++-#: ../netstat.c:429
+++#: ../ifconfig.c:1021
+++#, c-format
+++msgid "WARNING: at least one error occured. (%d)\n"
+++msgstr ""
+++
+++#: ../netstat.c:434
++ #, c-format
++ msgid ""
++ "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
++ msgstr ""
++ "(\"-p\" jaoks ei saanud infot lugeda: geteuid()=%d, aga vaja oleks root'u)\n"
++ 
++-#: ../netstat.c:433
+++#: ../netstat.c:438
+++#, c-format
++ msgid ""
++ "(Not all processes could be identified, non-owned process info\n"
++ " will not be shown, you would have to be root to see it all.)\n"
++@@ -592,210 +713,223 @@ msgstr ""
++ "(Mõnesid protsesse ei saanud identifitseerida, teiste kasutajate\n"
++ "info lugemiseks peab olema root)\n"
++ 
++-#: ../netstat.c:440 ../netstat.c:1171 ../netstat.c:1248
+++#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
++ msgid "LISTENING"
++ msgstr "LISTENING"
++ 
++-#: ../netstat.c:441
+++#: ../netstat.c:446
++ msgid "CONN SENT"
++ msgstr "CONN SENT"
++ 
++-#: ../netstat.c:442 ../netstat.c:1250
+++#: ../netstat.c:447 ../netstat.c:1268
++ msgid "DISC SENT"
++ msgstr "DISC SENT"
++ 
++-#: ../netstat.c:443 ../netstat.c:510 ../netstat.c:889 ../netstat.c:1251
+++#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
++ msgid "ESTABLISHED"
++ msgstr "ESTABLISHED"
++ 
++-#: ../netstat.c:465
+++#: ../netstat.c:470
+++#, c-format
++ msgid "Active NET/ROM sockets\n"
++ msgstr "Aktiivsed NET/ROM soklid\n"
++ 
++-#: ../netstat.c:466
+++#: ../netstat.c:471
+++#, c-format
++ msgid ""
++-"User       Dest       Source     Device  State        Vr/Vs    Send-Q  "
++-"Recv-Q\n"
+++"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
+++"Q\n"
++ msgstr ""
++ "Kasutaja   Sihtpunkt  Lähtepunkt Liides  Olek         Vr/Vs    SaatJrk "
++ "VvJrk\n"
++ 
++-#: ../netstat.c:476 ../netstat.c:1290
+++#: ../netstat.c:481 ../netstat.c:1308
++ #, c-format
++ msgid "Problem reading data from %s\n"
++ msgstr "Probleem andmete lugemisel failist %s\n"
++ 
++-#: ../netstat.c:511
+++#: ../netstat.c:516
++ msgid "SYN_SENT"
++ msgstr "SYN_SENT"
++ 
++-#: ../netstat.c:512
+++#: ../netstat.c:517
++ msgid "SYN_RECV"
++ msgstr "SYN_RECV"
++ 
++-#: ../netstat.c:513
+++#: ../netstat.c:518
++ msgid "FIN_WAIT1"
++ msgstr "FIN_WAIT1"
++ 
++-#: ../netstat.c:514
+++#: ../netstat.c:519
++ msgid "FIN_WAIT2"
++ msgstr "FIN_WAIT2"
++ 
++-#: ../netstat.c:515
+++#: ../netstat.c:520
++ msgid "TIME_WAIT"
++ msgstr "TIME_WAIT"
++ 
++-#: ../netstat.c:516
+++#: ../netstat.c:521
++ msgid "CLOSE"
++ msgstr "CLOSE"
++ 
++-#: ../netstat.c:517
+++#: ../netstat.c:522
++ msgid "CLOSE_WAIT"
++ msgstr "CLOSE_WAIT"
++ 
++-#: ../netstat.c:518
+++#: ../netstat.c:523
++ msgid "LAST_ACK"
++ msgstr "LAST_ACK"
++ 
++-#: ../netstat.c:519
+++#: ../netstat.c:524
++ msgid "LISTEN"
++ msgstr "LISTEN"
++ 
++-#: ../netstat.c:520
+++#: ../netstat.c:525
++ msgid "CLOSING"
++ msgstr "CLOSING"
++ 
++-#: ../netstat.c:587
+++#: ../netstat.c:596
++ #, c-format
++ msgid "warning, got bogus igmp6 line %d.\n"
++ msgstr "Hoiatus - sain imeliku igmp6 rea (nr. %d)\n"
++ 
++-#: ../netstat.c:592 ../netstat.c:630 ../netstat.c:751 ../netstat.c:883
++-#: ../netstat.c:1014 ../netstat.c:1019
+++#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
+++#: ../netstat.c:1032 ../netstat.c:1037
++ #, c-format
++ msgid "netstat: unsupported address family %d !\n"
++ msgstr "netstat: aadressiperekonda %d ei toetata\n"
++ 
++-#: ../netstat.c:605 ../netstat.c:610 ../netstat.c:618 ../netstat.c:625
+++#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
++ #, c-format
++ msgid "warning, got bogus igmp line %d.\n"
++ msgstr "Hoiatus - sain imeliku igmp rea (nr. %d)\n"
++ 
++-#: ../netstat.c:668
+++#: ../netstat.c:677
+++#, c-format
++ msgid "Active X.25 sockets\n"
++ msgstr "Aktiivsed X.25 soklid\n"
++ 
++ #. IMHO, Vr/Vs is not very usefull --SF
++-#: ../netstat.c:670
+++#: ../netstat.c:679
+++#, c-format
++ msgid ""
++-"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  "
++-"Recv-Q\n"
+++"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
+++"Q\n"
++ msgstr ""
++ "Sihtpunkt    Lähtepunkt      Liides  LCI  Olek         Vr/Vs  SaatJrk VvJrk\n"
++ 
++-#: ../netstat.c:747
+++#: ../netstat.c:759
+++#, c-format
++ msgid "warning, got bogus tcp line.\n"
++ msgstr "Hoiatus - sain imeliku tcp rea\n"
++ 
++-#: ../netstat.c:788 ../netstat.c:938 ../netstat.c:1057
+++#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
++ #, c-format
++ msgid "off (0.00/%ld/%d)"
++ msgstr "eikäi ((0.00/%ld/%d)"
++ 
++-#: ../netstat.c:792
+++#: ../netstat.c:804
++ #, c-format
++ msgid "on (%2.2f/%ld/%d)"
++ msgstr "käib (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:797
+++#: ../netstat.c:809
++ #, c-format
++ msgid "keepalive (%2.2f/%ld/%d)"
++ msgstr "keepalive (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:802
+++#: ../netstat.c:814
++ #, c-format
++ msgid "timewait (%2.2f/%ld/%d)"
++ msgstr "timewait (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:807 ../netstat.c:947 ../netstat.c:1067
+++#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
++ #, c-format
++ msgid "unkn-%d (%2.2f/%ld/%d)"
++ msgstr "eitea-%d (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:879
+++#: ../netstat.c:894
+++#, c-format
++ msgid "warning, got bogus udp line.\n"
++ msgstr "Hoiatus - sain imeliku udp rea\n"
++ 
++-#: ../netstat.c:897 ../netstat.c:1157 ../netstat.c:1190
+++#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
++ msgid "UNKNOWN"
++ msgstr "TUNDMATU"
++ 
++-#: ../netstat.c:943 ../netstat.c:1062
+++#: ../netstat.c:958 ../netstat.c:1080
++ #, c-format
++ msgid "on%d (%2.2f/%ld/%d)"
++ msgstr "käib-%d (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:1028
+++#: ../netstat.c:1046
+++#, c-format
++ msgid "warning, got bogus raw line.\n"
++ msgstr "Hoiatus - sain imeliku raw rea\n"
++ 
++-#: ../netstat.c:1110
+++#: ../netstat.c:1128
+++#, c-format
++ msgid "warning, got bogus unix line.\n"
++ msgstr "Hoiatus - sain imeliku unix rea\n"
++ 
++-#: ../netstat.c:1137
+++#: ../netstat.c:1155
++ msgid "STREAM"
++ msgstr "STREAM"
++ 
++-#: ../netstat.c:1141
+++#: ../netstat.c:1159
++ msgid "DGRAM"
++ msgstr "DGRAM"
++ 
++-#: ../netstat.c:1145
+++#: ../netstat.c:1163
++ msgid "RAW"
++ msgstr "RAW"
++ 
++-#: ../netstat.c:1149
+++#: ../netstat.c:1167
++ msgid "RDM"
++ msgstr "RDM"
++ 
++-#: ../netstat.c:1153
+++#: ../netstat.c:1171
++ msgid "SEQPACKET"
++ msgstr "SEQPACKET"
++ 
++-#: ../netstat.c:1162
+++#: ../netstat.c:1180
++ msgid "FREE"
++ msgstr "VABA"
++ 
++-#: ../netstat.c:1178
+++#: ../netstat.c:1196
++ msgid "CONNECTING"
++ msgstr "ÜHENDUMAS"
++ 
++-#: ../netstat.c:1182
+++#: ../netstat.c:1200
++ msgid "CONNECTED"
++ msgstr "ÜHENDATUD"
++ 
++-#: ../netstat.c:1186
+++#: ../netstat.c:1204
++ msgid "DISCONNECTING"
++ msgstr "LAHTIÜHENDUMAS"
++ 
++-#: ../netstat.c:1217
+++#: ../netstat.c:1235
+++#, c-format
++ msgid "Active UNIX domain sockets "
++ msgstr "Aktiivsed UNIX domeeni soklid "
++ 
++-#: ../netstat.c:1219 ../netstat.c:1729
+++#: ../netstat.c:1237 ../netstat.c:1756
+++#, c-format
++ msgid "(servers and established)"
++ msgstr "(serverid ja ühendatud)"
++ 
++-#: ../netstat.c:1222 ../netstat.c:1732
+++#: ../netstat.c:1240 ../netstat.c:1759
+++#, c-format
++ msgid "(only servers)"
++ msgstr "(ainult serverid)"
++ 
++-#: ../netstat.c:1224 ../netstat.c:1734
+++#: ../netstat.c:1242 ../netstat.c:1761
+++#, c-format
++ msgid "(w/o servers)"
++ msgstr "(ilma serveriteta)"
++ 
++-#: ../netstat.c:1227
+++#: ../netstat.c:1245
+++#, c-format
++ msgid ""
++ "\n"
++ "Proto RefCnt Flags       Type       State         I-Node"
++@@ -803,32 +937,36 @@ msgstr ""
++ "\n"
++ "Proto Mitu   Lipud       Tüüp       Olek         I-kirje "
++ 
++-#: ../netstat.c:1229
+++#: ../netstat.c:1247
+++#, c-format
++ msgid " Path\n"
++ msgstr "Tee\n"
++ 
++-#: ../netstat.c:1249
+++#: ../netstat.c:1267
++ msgid "SABM SENT"
++ msgstr "SABM SENT"
++ 
++-#: ../netstat.c:1252
+++#: ../netstat.c:1270
++ msgid "RECOVERY"
++ msgstr "RECOVERY"
++ 
++-#: ../netstat.c:1266
+++#: ../netstat.c:1284
+++#, c-format
++ msgid "Active AX.25 sockets\n"
++ msgstr "Aktiivsed AX.25 soklid\n"
++ 
++-#: ../netstat.c:1267
+++#: ../netstat.c:1285
+++#, c-format
++ msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
++ msgstr "Sihtpunkt  Lähtepunkt Liides  Olek         Vr/Vs    SaatJrk VvJrk\n"
++ 
++-#: ../netstat.c:1310
+++#: ../netstat.c:1328
++ #, c-format
++ msgid "problem reading data from %s\n"
++ msgstr "Probleem andmete lugemisel failist %s\n"
++ 
++-#: ../netstat.c:1361
+++#: ../netstat.c:1379
+++#, c-format
++ msgid ""
++ "Active IPX sockets\n"
++ "Proto Recv-Q Send-Q Local Address              Foreign Address            "
++@@ -838,47 +976,53 @@ msgstr ""
++ "Proto VvJrk  SaatJrk Kohalik aadress           Väline aadress             "
++ "Olek "
++ 
++-#: ../netstat.c:1363
+++#: ../netstat.c:1381
+++#, c-format
++ msgid " User"
++ msgstr " Kasutaja"
++ 
++-#: ../netstat.c:1397
+++#: ../netstat.c:1415
++ msgid "ESTAB"
++ msgstr "ESTAB"
++ 
++-#: ../netstat.c:1405
+++#: ../netstat.c:1423
++ msgid "UNK."
++ msgstr "UNK."
++ 
++-#: ../netstat.c:1443
+++#: ../netstat.c:1461
+++#, c-format
++ msgid "Kernel Interface table\n"
++ msgstr "Tuuma liideste tabel\n"
++ 
++-#: ../netstat.c:1447
+++#: ../netstat.c:1465
+++#, fuzzy, c-format
++ msgid ""
++-"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
+++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
++ "Flg\n"
++ msgstr ""
++-"Liides  MTU Meetr RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
+++"Liides  MTU Meetr. RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
++ "Lip\n"
++ 
++-#: ../netstat.c:1451
+++#: ../netstat.c:1469
++ msgid "missing interface information"
++ msgstr "Puudulik informatsioon liideste kohta"
++ 
++-#: ../netstat.c:1474
+++#: ../netstat.c:1492
+++#, c-format
++ msgid ""
++-"usage: netstat [-veenNcCF] [<Af>] -r         netstat "
++-"{-V|--version|-h|--help}\n"
+++"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
+++"help}\n"
++ msgstr ""
++ "Kasutamine: netstat [-veenNcCF] [<Af>] -r\n"
++ "            netstat {-V|--version|-h|--help}\n"
++ 
++-#: ../netstat.c:1475
+++#: ../netstat.c:1493
+++#, c-format
++ msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
++ msgstr "            netstat [-vnNcaeol] [<Sokkel> ...]\n"
++ 
++-#: ../netstat.c:1476
+++#: ../netstat.c:1494
+++#, c-format
++ msgid ""
++ "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
++ "\n"
++@@ -886,25 +1030,30 @@ msgstr ""
++ "            netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
++ "\n"
++ 
++-#: ../netstat.c:1478
+++#: ../netstat.c:1496
+++#, c-format
++ msgid "        -r, --route              display routing table\n"
++ msgstr "        -r, --route              ruutingutabeli näitamine\n"
++ 
++-#: ../netstat.c:1479
+++#: ../netstat.c:1497
+++#, c-format
++ msgid "        -i, --interfaces         display interface table\n"
++ msgstr "        -i, --interfaces         liideste tabeli näitamine\n"
++ 
++-#: ../netstat.c:1480
+++#: ../netstat.c:1498
+++#, c-format
++ msgid "        -g, --groups             display multicast group memberships\n"
++ msgstr "        -g, --groups             multiedastuse gruppide näitamine\n"
++ 
++-#: ../netstat.c:1481
+++#: ../netstat.c:1499
+++#, c-format
++ msgid ""
++ "        -s, --statistics         display networking statistics (like SNMP)\n"
++ msgstr ""
++ "        -s, --statistics         võrgu statistika näitamine (SNMP stiilis)\n"
++ 
++-#: ../netstat.c:1483
+++#: ../netstat.c:1501
+++#, c-format
++ msgid ""
++ "        -M, --masquerade         display masqueraded connections\n"
++ "\n"
++@@ -912,36 +1061,39 @@ msgstr ""
++ "        -M, --masquerade         maskeeritavate ühenduste näitamine\n"
++ "\n"
++ 
++-#: ../netstat.c:1486 ../route.c:86
++-msgid "        -n, --numeric            dont resolve names\n"
++-msgstr "        -n, --numeric            mitte lahendada numbreid nimedeks\n"
++-
++-#: ../netstat.c:1487
++-msgid "        --numeric-hosts          dont resolve host names\n"
+++#: ../netstat.c:1505
+++#, fuzzy, c-format
+++msgid "        --numeric-hosts          don't resolve host names\n"
++ msgstr "        --numeric-hosts          mitte lahendada hostinimesid\n"
++ 
++-#: ../netstat.c:1488
++-msgid "        --numeric-ports          dont resolve port names\n"
+++#: ../netstat.c:1506
+++#, fuzzy, c-format
+++msgid "        --numeric-ports          don't resolve port names\n"
++ msgstr "        --numeric-ports          mitte lahendada pordinimesid\n"
++ 
++-#: ../netstat.c:1489
++-msgid "        --numeric-users          dont resolve user names\n"
+++#: ../netstat.c:1507
+++#, fuzzy, c-format
+++msgid "        --numeric-users          don't resolve user names\n"
++ msgstr "        --numeric-users          mitte lahendada kasutajanimesid\n"
++ 
++-#: ../netstat.c:1490
+++#: ../netstat.c:1508
+++#, c-format
++ msgid "        -N, --symbolic           resolve hardware names\n"
++ msgstr "        -N, --symbolic           lahendada riistvara aadressid\n"
++ 
++-#: ../netstat.c:1491 ../route.c:87
+++#: ../netstat.c:1509 ../route.c:88
+++#, c-format
++ msgid "        -e, --extend             display other/more information\n"
++ msgstr "        -e, --extend             muu info/lisainfo näitamine\n"
++ 
++-#: ../netstat.c:1492
+++#: ../netstat.c:1510
+++#, c-format
++ msgid "        -p, --programs           display PID/Program name for sockets\n"
++ msgstr ""
++ "        -p, --programs           soklite kohta PID/protsessi nime näitamine\n"
++ 
++-#: ../netstat.c:1493
+++#: ../netstat.c:1511
+++#, c-format
++ msgid ""
++ "        -c, --continuous         continuous listing\n"
++ "\n"
++@@ -949,22 +1101,26 @@ msgstr ""
++ "        -c, --continuous         pidevalt uuenev nimekiri\n"
++ "\n"
++ 
++-#: ../netstat.c:1494
+++#: ../netstat.c:1512
+++#, c-format
++ msgid "        -l, --listening          display listening server sockets\n"
++ msgstr "        -l, --listening          kuulavate serversoklite näitamine\n"
++ 
++-#: ../netstat.c:1495
+++#: ../netstat.c:1513
+++#, c-format
++ msgid ""
++ "        -a, --all, --listening   display all sockets (default: connected)\n"
++ msgstr ""
++ "        -a, --all, --listening   kõigi soklite näitamine (vaikimisi "
++ "ühendatud)\n"
++ 
++-#: ../netstat.c:1496
+++#: ../netstat.c:1514
+++#, c-format
++ msgid "        -o, --timers             display timers\n"
++ msgstr "        -o, --timers             taimerite näitamine\n"
++ 
++-#: ../netstat.c:1497 ../route.c:88
+++#: ../netstat.c:1515 ../route.c:89
+++#, c-format
++ msgid ""
++ "        -F, --fib                display Forwarding Information Base "
++ "(default)\n"
++@@ -972,7 +1128,8 @@ msgstr ""
++ "        -F, --fib                üldiste ruutingutabelite näitamine "
++ "(vaikimisi)\n"
++ 
++-#: ../netstat.c:1498 ../route.c:89
+++#: ../netstat.c:1516 ../route.c:90
+++#, c-format
++ msgid ""
++ "        -C, --cache              display routing cache instead of FIB\n"
++ "\n"
++@@ -981,108 +1138,121 @@ msgstr ""
++ "näitamine\n"
++ "\n"
++ 
++-#: ../netstat.c:1500
+++#: ../netstat.c:1518
+++#, c-format
++ msgid ""
++-"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
++-"--netrom\n"
+++"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
+++"netrom\n"
++ msgstr ""
++-"  <Sokkel>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
++-"--netrom\n"
+++"  <Sokkel>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
+++"netrom\n"
++ 
++-#: ../netstat.c:1501 ../route.c:91
++-#, c-format
++-msgid "  <AF>=Use '-A <af>' or '--<af>' Default: %s\n"
+++#: ../netstat.c:1519
+++#, fuzzy, c-format
+++msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
++ msgstr "  <AF>=kasutage '-A <af>' või '--<af>' vaikimisi: %s\n"
++ 
++-#: ../netstat.c:1502 ../route.c:92
+++#: ../netstat.c:1520 ../route.c:93
+++#, c-format
++ msgid "  List of possible address families (which support routing):\n"
++ msgstr "  Võimalike ruutingu toetavate aadressiperekondade nimekiri:\n"
++ 
++-#: ../netstat.c:1726
+++#: ../netstat.c:1753
+++#, c-format
++ msgid "Active Internet connections "
++ msgstr "Aktiivsed internetiühendused "
++ 
++-#: ../netstat.c:1736
+++#: ../netstat.c:1763
+++#, c-format
++ msgid ""
++ "\n"
++-"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
++-"  "
+++"Proto Recv-Q Send-Q Local Address           Foreign Address         "
+++"State      "
++ msgstr ""
++ "\n"
++-"Proto  VvJrk SaatJrk Kohalik aadress        Väline aadress          Olek     "
++-"  "
+++"Proto  VvJrk SaatJrk Kohalik aadress        Väline aadress          "
+++"Olek       "
++ 
++-#: ../netstat.c:1738
+++#: ../netstat.c:1765
+++#, c-format
++ msgid " User       Inode     "
++ msgstr " Kasutaja   I-kirje   "
++ 
++-#: ../netstat.c:1741
+++#: ../netstat.c:1768
+++#, c-format
++ msgid " Timer"
++ msgstr " Taimer"
++ 
++-#: ../netstat.c:1771
+++#: ../netstat.c:1798
+++#, c-format
++ msgid "IPv4 Group Memberships\n"
++ msgstr "IPv4 grupikuuluvused\n"
++ 
++-#: ../netstat.c:1772
+++#: ../netstat.c:1799
+++#, c-format
++ msgid "Interface       RefCnt Group\n"
++ msgstr "Liides          Mitu   Grupp\n"
++ 
++-#: ../rarp.c:43
+++#: ../rarp.c:44
++ msgid "This kernel does not support RARP.\n"
++ msgstr "rarp: tuum ei toeta RARP'i\n"
++ 
++-#: ../rarp.c:82
+++#: ../rarp.c:83
++ #, c-format
++ msgid "no RARP entry for %s.\n"
++ msgstr "rarp: %s jaoks pole RARP kirjet\n"
++ 
++-#: ../rarp.c:95
+++#: ../rarp.c:96
++ #, c-format
++ msgid "%s: bad hardware address\n"
++ msgstr "rarp: vigane riistvaraline aadress %s\n"
++ 
++-#: ../rarp.c:127
+++#: ../rarp.c:128
++ #, c-format
++ msgid "rarp: cannot open file %s:%s.\n"
++ msgstr "rarp: ei saa avada faili %s:%s\n"
++ 
++-#: ../rarp.c:139
+++#: ../rarp.c:140
++ #, c-format
++ msgid "rarp: format error at %s:%u\n"
++ msgstr "rarp: vorminguviga failis %s real %u\n"
++ 
++-#: ../rarp.c:143 ../rarp.c:287
+++#: ../rarp.c:144 ../rarp.c:289
++ #, c-format
++ msgid "rarp: %s: unknown host\n"
++ msgstr "rarp: tundmatu host %s\n"
++ 
++-#: ../rarp.c:146
+++#: ../rarp.c:147
++ #, c-format
++ msgid "rarp: cannot set entry from %s:%u\n"
++ msgstr "rarp: ei saa kehtestada kirjet failist %s realt %u\n"
++ 
++-#: ../rarp.c:175
+++#: ../rarp.c:176
+++#, c-format
++ msgid "Usage: rarp -a                               list entries in cache.\n"
++ msgstr ""
++ "Kasutamine:\n"
++ "  rarp -a                              puhvris olevate kirjete vaatamine\n"
++ 
++-#: ../rarp.c:176
+++#: ../rarp.c:177
+++#, c-format
++ msgid "       rarp -d <hostname>                    delete entry from cache.\n"
++ msgstr "  rarp -d <hosti nimi>                 kirje kustutamine puhvrist\n"
++ 
++-#: ../rarp.c:177
+++#: ../rarp.c:178
+++#, c-format
++ msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
++ msgstr "  rarp [<HW>] -s <hosti nimi> <hwaddr> kirje lisamine puhvrisse\n"
++ 
++-#: ../rarp.c:178
+++#: ../rarp.c:179
+++#, c-format
++ msgid ""
++ "       rarp -f                               add entries from /etc/ethers.\n"
++ msgstr ""
++ "  rarp -f                              kirjete lisamine failist /etc/ethers\n"
++ 
++-#: ../rarp.c:179
+++#: ../rarp.c:180
+++#, c-format
++ msgid ""
++ "       rarp -V                               display program version.\n"
++ "\n"
++@@ -1090,24 +1260,26 @@ msgstr ""
++ "  rarp -V                              programmi versiooni näitamine\n"
++ "\n"
++ 
++-#: ../rarp.c:236
+++#: ../rarp.c:238
++ #, c-format
++ msgid "%s: illegal option mix.\n"
++ msgstr "%s: lubamatu võtmete kombinatsioon\n"
++ 
++-#: ../rarp.c:267
+++#: ../rarp.c:269
++ #, c-format
++ msgid "rarp: %s: unknown hardware type.\n"
++ msgstr "rarp: tundmatu riistvara tüüp %s\n"
++ 
++-#: ../route.c:79
+++#: ../route.c:80
+++#, c-format
++ msgid ""
++ "Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
++ msgstr ""
++ "Kasutamine:\n"
++ "    route [-nNvee] [-FC] [<AF>]           Tuuma ruutingutabeli näitamine\n"
++ 
++-#: ../route.c:80
+++#: ../route.c:81
+++#, c-format
++ msgid ""
++ "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
++ "\n"
++@@ -1115,7 +1287,8 @@ msgstr ""
++ "    route [-v] [-FC] {add|del|flush} ...  Tuuma ruutingutabeli muutmine\n"
++ "\n"
++ 
++-#: ../route.c:82
+++#: ../route.c:83
+++#, c-format
++ msgid ""
++ "       route {-h|--help} [<AF>]              Detailed usage syntax for "
++ "specified AF.\n"
++@@ -1123,7 +1296,8 @@ msgstr ""
++ "    route {-h|--help} [<AF>]              Detailne süntaks perekonna AF "
++ "jaoks\n"
++ 
++-#: ../route.c:83
+++#: ../route.c:84
+++#, c-format
++ msgid ""
++ "       route {-V|--version}                  Display version/author and "
++ "exit.\n"
++@@ -1132,15 +1306,23 @@ msgstr ""
++ "    route {-V|--version}                  Versiooni ja oskuste näitamine\n"
++ "\n"
++ 
+++#: ../route.c:92
+++#, fuzzy, c-format
+++msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
+++msgstr "  <AF>=kasutage '-A <af>' või '--<af>' vaikimisi: %s\n"
+++
++ #: ../plipconfig.c:66
+++#, c-format
++ msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
++ msgstr "Kasutamine:  plipconfig [-a] [-i] [-v] liides\n"
++ 
++ #: ../plipconfig.c:67
+++#, c-format
++ msgid "                  [nibble NN] [trigger NN]\n"
++ msgstr "                        [nibble NN] [trigger NN]\n"
++ 
++ #: ../plipconfig.c:68
+++#, c-format
++ msgid "       plipconfig -V | --version\n"
++ msgstr "             plipconfig -V | --version\n"
++ 
++@@ -1149,25 +1331,30 @@ msgstr "             plipconfig -V | --v
++ msgid "%s\tnibble %lu  trigger %lu\n"
++ msgstr "%s\tnibble %lu  trigger %lu\n"
++ 
++-#: ../iptunnel.c:84
+++#: ../iptunnel.c:85
+++#, c-format
++ msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
++ msgstr "Kasutamine: iptunnel { add | change | del | show } [ NIMI ]\n"
++ 
++-#: ../iptunnel.c:85
+++#: ../iptunnel.c:86
+++#, c-format
++ msgid ""
++ "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
++ msgstr ""
++ "             [ mode { ipip | gre | sit } ] [ remote AADR ] [ local AADR ]\n"
++ 
++-#: ../iptunnel.c:86
+++#: ../iptunnel.c:87
+++#, c-format
++ msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
++ msgstr "             [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
++ 
++-#: ../iptunnel.c:87
+++#: ../iptunnel.c:88
+++#, c-format
++ msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
++ msgstr "             [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev LIIDES ]\n"
++ 
++-#: ../iptunnel.c:88
+++#: ../iptunnel.c:89
+++#, c-format
++ msgid ""
++ "       iptunnel -V | --version\n"
++ "\n"
++@@ -1175,83 +1362,99 @@ msgstr ""
++ "             iptunnel -V | --version\n"
++ "\n"
++ 
++-#: ../iptunnel.c:89
+++#: ../iptunnel.c:90
+++#, c-format
++ msgid "Where: NAME := STRING\n"
++ msgstr "Kus:   NIMI := STRING\n"
++ 
++-#: ../iptunnel.c:90
+++#: ../iptunnel.c:91
+++#, c-format
++ msgid "       ADDR := { IP_ADDRESS | any }\n"
++ msgstr "       AADR := { IP_AADRESS | any }\n"
++ 
++-#: ../iptunnel.c:91
+++#: ../iptunnel.c:92
+++#, c-format
++ msgid "       TOS  := { NUMBER | inherit }\n"
++ msgstr "       TOS  := { ARV | inherit }\n"
++ 
++-#: ../iptunnel.c:92
+++#: ../iptunnel.c:93
+++#, c-format
++ msgid "       TTL  := { 1..255 | inherit }\n"
++ msgstr "       TTL  := { 1..255 | inherit }\n"
++ 
++-#: ../iptunnel.c:93
+++#: ../iptunnel.c:94
+++#, c-format
++ msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
++ msgstr ""
++ "       KEY  := { PUNKTIDEGA_ARVUNELIK | ARV }\n"
++ "       LIIDES := FÜÜSILISE_LIIDESE_NIMI\n"
++ 
++-#: ../iptunnel.c:331
+++#: ../iptunnel.c:332
+++#, c-format
++ msgid "Keys are not allowed with ipip and sit.\n"
++ msgstr "ipip ja sit juures ei ole võtmed lubatud\n"
++ 
++-#: ../iptunnel.c:351
+++#: ../iptunnel.c:352
+++#, c-format
++ msgid "Broadcast tunnel requires a source address.\n"
++ msgstr "Leviedastusega tunnel vajab lähteaadressi\n"
++ 
++-#: ../iptunnel.c:366
+++#: ../iptunnel.c:367
+++#, c-format
++ msgid "ttl != 0 and noptmudisc are incompatible\n"
++ msgstr "ttl != 0 ning noptmudisc ei sobi kokku\n"
++ 
++-#: ../iptunnel.c:378
+++#: ../iptunnel.c:379
+++#, c-format
++ msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
++ msgstr "Ei suuda määrata tunneli moodi (ipip, gre või sit)\n"
++ 
++-#: ../iptunnel.c:416
+++#: ../iptunnel.c:417
++ #, c-format
++ msgid "%s: %s/ip  remote %s  local %s "
++ msgstr "%s: %s/ip teises otsas %s  siin %s "
++ 
++-#: ../iptunnel.c:420
+++#: ../iptunnel.c:421
++ msgid "unknown"
++ msgstr "tundmatu"
++ 
++-#: ../iptunnel.c:452
+++#: ../iptunnel.c:453
+++#, c-format
++ msgid "  Drop packets out of sequence.\n"
++ msgstr "  Järjekorravälised paketid visatakse minema\n"
++ 
++-#: ../iptunnel.c:454
+++#: ../iptunnel.c:455
+++#, c-format
++ msgid "  Checksum in received packet is required.\n"
++ msgstr "  Vastuvõetavates pakettides on kontrollsumma kohustuslik\n"
++ 
++-#: ../iptunnel.c:456
+++#: ../iptunnel.c:457
+++#, c-format
++ msgid "  Sequence packets on output.\n"
++ msgstr "  Väljuvad paketid varustatakse järjekorranumbritega\n"
++ 
++-#: ../iptunnel.c:458
+++#: ../iptunnel.c:459
+++#, c-format
++ msgid "  Checksum output packets.\n"
++ msgstr "  Väljuvad paketid varustatakse kontrollsummaga\n"
++ 
++-#: ../iptunnel.c:486
+++#: ../iptunnel.c:487
+++#, c-format
++ msgid "Wrong format of /proc/net/dev. Sorry.\n"
++ msgstr "/proc/net/dev on vales formaadis. Vale tuuma versioon?\n"
++ 
++-#: ../iptunnel.c:499
+++#: ../iptunnel.c:500
++ #, c-format
++ msgid "Failed to get type of [%s]\n"
++ msgstr "Ei suutnud kindlaks teha liidese %s tüüpi\n"
++ 
++-#: ../iptunnel.c:515
+++#: ../iptunnel.c:516
+++#, c-format
++ msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
++ msgstr "RX: Pakette    Baite        Vigu   KSumVigu JrkVigu  Levipakette\n"
++ 
++-#: ../iptunnel.c:518
+++#: ../iptunnel.c:519
+++#, c-format
++ msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
++ msgstr "TX: Pakette    Baite        Vigu   DeadLoop EiRuudi  MäluOtsas\n"
++ 
++@@ -1658,13 +1861,13 @@ msgid "%u packets directly queued to rec
++ msgstr "%u paketti pandi otse recvmsg eeljärjekorda"
++ 
++ #: ../statistics.c:178
++-#, c-format
++-msgid "%u packets directly received from backlog"
+++#, fuzzy, c-format
+++msgid "%u of bytes directly received from backlog"
++ msgstr "%u paketti võeti vastu otse backlog-ist"
++ 
++ #: ../statistics.c:180
++-#, c-format
++-msgid "%u packets directly received from prequeue"
+++#, fuzzy, c-format
+++msgid "%u of bytes directly received from prequeue"
++ msgstr "%u paketti võeti vastu otse eeljärjekorrast"
++ 
++ #: ../statistics.c:182
++@@ -1673,8 +1876,8 @@ msgid "%u packets dropped from prequeue"
++ msgstr "%u paketti kustutati eeljärjekorrast"
++ 
++ #: ../statistics.c:183
++-#, c-format
++-msgid "%u packets header predicted"
+++#, fuzzy, c-format
+++msgid "%u packet headers predicted"
++ msgstr "%u paketti päise õige ennustusega"
++ 
++ #: ../statistics.c:184
++@@ -1687,19 +1890,210 @@ msgstr "%u paketti päise õige ennustuseg
++ msgid "Ran %u times out of system memory during packet sending"
++ msgstr "Pakettide saatmisel sai %u korda süsteemne mälu otsa"
++ 
++-#: ../statistics.c:253
+++#: ../statistics.c:188
+++#, fuzzy, c-format
+++msgid "%u acknowledgments not containing data received"
+++msgstr "%u sisenevat paketti tundmatule pordile"
+++
+++#: ../statistics.c:189
+++#, c-format
+++msgid "%u predicted acknowledgments"
+++msgstr ""
+++
+++#: ../statistics.c:190
+++#, c-format
+++msgid "%u times recovered from packet loss due to fast retransmit"
+++msgstr ""
+++
+++#: ../statistics.c:191
+++#, c-format
+++msgid "%u times recovered from packet loss due to SACK data"
+++msgstr ""
+++
+++#: ../statistics.c:192
+++#, fuzzy, c-format
+++msgid "%u bad SACKs received"
+++msgstr "%u vigast segmenti võeti vastu"
+++
+++#: ../statistics.c:193
+++#, c-format
+++msgid "Detected reordering %u times using FACK"
+++msgstr ""
+++
+++#: ../statistics.c:194
+++#, c-format
+++msgid "Detected reordering %u times using SACK"
+++msgstr ""
+++
+++#: ../statistics.c:195
+++#, c-format
+++msgid "Detected reordering %u times using time stamp"
+++msgstr ""
+++
+++#: ../statistics.c:196
+++#, c-format
+++msgid "Detected reordering %u times using reno fast retransmit"
+++msgstr ""
+++
+++#: ../statistics.c:197
+++#, fuzzy, c-format
+++msgid "%u congestion windows fully recovered"
+++msgstr "%u ühenduse katkestust saabus"
+++
+++#: ../statistics.c:198
+++#, c-format
+++msgid "%u congestion windows partially recovered using Hoe heuristic"
+++msgstr ""
+++
+++#: ../statistics.c:199
+++#, c-format
+++msgid "%u congestion window recovered using DSACK"
+++msgstr ""
+++
+++#: ../statistics.c:200
+++#, c-format
+++msgid "%u congestion windows recovered after partial ack"
+++msgstr ""
+++
+++#: ../statistics.c:201
+++#, fuzzy, c-format
+++msgid "%u retransmits lost"
+++msgstr "%u katkestust saadeti"
+++
+++#: ../statistics.c:202
+++#, fuzzy, c-format
+++msgid "%u timeouts after reno fast retransmit"
+++msgstr "%u segmenti saadeti uuesti"
+++
+++#: ../statistics.c:203
+++#, c-format
+++msgid "%u timeouts after SACK recovery"
+++msgstr ""
+++
+++#: ../statistics.c:204
+++#, c-format
+++msgid "%u timeouts in loss state"
+++msgstr ""
+++
+++#: ../statistics.c:205
+++#, fuzzy, c-format
+++msgid "%u fast retransmits"
+++msgstr "%u segmenti saadeti uuesti"
+++
+++#: ../statistics.c:206
+++#, fuzzy, c-format
+++msgid "%u forward retransmits"
+++msgstr "%u edastati"
+++
+++#: ../statistics.c:207
+++#, c-format
+++msgid "%u retransmits in slow start"
+++msgstr ""
+++
+++#: ../statistics.c:208
+++#, c-format
+++msgid "%u other TCP timeouts"
+++msgstr ""
+++
+++#: ../statistics.c:209
+++#, fuzzy, c-format
+++msgid "%u reno fast retransmits failed"
+++msgstr "%u segmenti saadeti uuesti"
+++
+++#: ../statistics.c:210
+++#, fuzzy, c-format
+++msgid "%u sack retransmits failed"
+++msgstr "%u pakettide kokkupanekut ebaõnnestus"
+++
+++#: ../statistics.c:211
+++#, c-format
+++msgid "%u times receiver scheduled too late for direct processing"
+++msgstr ""
+++
+++#: ../statistics.c:212
+++#, fuzzy, c-format
+++msgid "%u packets collapsed in receive queue due to low socket buffer"
+++msgstr ""
+++"%u paketti kustutati vastuvõtu järjekorrast sokli puhvri ületäitumise tõttu"
+++
+++#: ../statistics.c:213
+++#, c-format
+++msgid "%u DSACKs sent for old packets"
+++msgstr ""
+++
+++#: ../statistics.c:214
+++#, c-format
+++msgid "%u DSACKs sent for out of order packets"
+++msgstr ""
+++
+++#: ../statistics.c:215
+++#, fuzzy, c-format
+++msgid "%u DSACKs received"
+++msgstr "%u paketti võeti vastu"
+++
+++#: ../statistics.c:216
+++#, fuzzy, c-format
+++msgid "%u DSACKs for out of order packets received"
+++msgstr "kokku võeti vastu %u paketti"
+++
+++#: ../statistics.c:217
+++#, fuzzy, c-format
+++msgid "%u connections reset due to unexpected SYN"
+++msgstr "%u ühenduse katkestust saabus"
+++
+++#: ../statistics.c:218
+++#, fuzzy, c-format
+++msgid "%u connections reset due to unexpected data"
+++msgstr "%u ühenduse katkestust saabus"
+++
+++#: ../statistics.c:219
+++#, fuzzy, c-format
+++msgid "%u connections reset due to early user close"
+++msgstr "%u ühenduse katkestust saabus"
+++
+++#: ../statistics.c:220
+++#, c-format
+++msgid "%u connections aborted due to memory pressure"
+++msgstr ""
+++
+++#: ../statistics.c:221
+++#, fuzzy, c-format
+++msgid "%u connections aborted due to timeout"
+++msgstr "%u aktiivsest ühendusest keelduti ajatempli tõttu"
+++
+++#: ../statistics.c:222
+++#, c-format
+++msgid "%u connections aborted after user close in linger timeout"
+++msgstr ""
+++
+++#: ../statistics.c:223
+++#, c-format
+++msgid "%u times unabled to send RST due to no memory"
+++msgstr ""
+++
+++#: ../statistics.c:224
+++#, c-format
+++msgid "TCP ran low on memory %u times"
+++msgstr ""
+++
+++#: ../statistics.c:225
+++#, c-format
+++msgid "%u TCP data loss events"
+++msgstr ""
+++
+++#: ../statistics.c:292
++ msgid "enabled"
++ msgstr "lubatud"
++ 
++-#: ../statistics.c:253
+++#: ../statistics.c:292
++ msgid "disabled"
++ msgstr "keelatud"
++ 
++-#: ../statistics.c:336
+++#: ../statistics.c:375
++ msgid "error parsing /proc/net/snmp"
++ msgstr "Viga /proc/net/snmp analüüsimisel"
++ 
++-#: ../statistics.c:349
+++#: ../statistics.c:388
++ msgid "cannot open /proc/net/snmp"
++ msgstr "Ei saa avada faili /proc/net/snmp"
++ 
++@@ -1713,7 +2107,7 @@ msgstr "Riistvara tüüpi `%s' ei toetata\
++ msgid "Cannot change line discipline to `%s'.\n"
++ msgstr "Ei suuda seada `%s' liiniprotokolliks\n"
++ 
++-#: ../lib/af.c:153 ../lib/hw.c:156
+++#: ../lib/af.c:153 ../lib/hw.c:161
++ msgid "UNSPEC"
++ msgstr "UNSPEC"
++ 
++@@ -1729,11 +2123,11 @@ msgstr "DARPA Internet"
++ msgid "IPv6"
++ msgstr "IPv6"
++ 
++-#: ../lib/af.c:164 ../lib/hw.c:177
+++#: ../lib/af.c:164 ../lib/hw.c:182
++ msgid "AMPR AX.25"
++ msgstr "AMPR AX.25"
++ 
++-#: ../lib/af.c:167 ../lib/hw.c:183
+++#: ../lib/af.c:167 ../lib/hw.c:188
++ msgid "AMPR NET/ROM"
++ msgstr "AMPR NET/ROM"
++ 
++@@ -1745,7 +2139,7 @@ msgstr "Novell IPX"
++ msgid "Appletalk DDP"
++ msgstr "Appletalk DDP"
++ 
++-#: ../lib/af.c:176 ../lib/hw.c:218
+++#: ../lib/af.c:176 ../lib/hw.c:223
++ msgid "Econet"
++ msgstr "Econet"
++ 
++@@ -1753,19 +2147,21 @@ msgstr "Econet"
++ msgid "CCITT X.25"
++ msgstr "CCITT X.25"
++ 
++-#: ../lib/af.c:182 ../lib/hw.c:180
+++#: ../lib/af.c:182 ../lib/hw.c:185
++ msgid "AMPR ROSE"
++ msgstr "AMPR ROSE"
++ 
++-#: ../lib/af.c:185 ../lib/hw.c:168
+++#: ../lib/af.c:185 ../lib/hw.c:173
++ msgid "Ash"
++ msgstr "Ash"
++ 
++ #: ../lib/af.c:243
+++#, c-format
++ msgid "Please don't supply more than one address family.\n"
++ msgstr "Meil on kombeks üks aadressiperekond korraga\n"
++ 
++ #: ../lib/af.c:304
+++#, c-format
++ msgid "Too much address family arguments.\n"
++ msgstr "Liiga palju aadressiperekonna argumente\n"
++ 
++@@ -1790,6 +2186,7 @@ msgid "in_arcnet(%s): trailing junk!\n"
++ msgstr "in_arcnet(%s): sodi lõpus\n"
++ 
++ #: ../lib/ash.c:81
+++#, c-format
++ msgid "Malformed Ash address"
++ msgstr "Vigane Ash aadress"
++ 
++@@ -1808,22 +2205,21 @@ msgid "Callsign too long"
++ msgstr "Liiga pikk kutsung"
++ 
++ #: ../lib/ax25_gr.c:47
+++#, c-format
++ msgid "AX.25 not configured in this system.\n"
++ msgstr "AX.25 pole antud süsteemis konfigureeritud\n"
++ 
++ #: ../lib/ax25_gr.c:50
+++#, c-format
++ msgid "Kernel AX.25 routing table\n"
++ msgstr "Tuuma AX.25 ruutingutabel\n"
++ 
++ #. xxx
++ #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
+++#, c-format
++ msgid "Destination  Iface    Use\n"
++ msgstr "Sihtpunkt    Liides   Kasutus\n"
++ 
++-#: ../lib/ddp_gr.c:21
++-msgid "Routing table for `ddp' not yet supported.\n"
++-msgstr "`ddp' jaoks ruutingutabelit veel ei oska\n"
++-
++ #: ../lib/ether.c:74 ../lib/ether.c:91
++ #, c-format
++ msgid "in_ether(%s): invalid ether address!\n"
++@@ -1879,90 +2275,94 @@ msgstr "in_hippi(%s): ignoreerin lõpetav
++ msgid "in_hippi(%s): trailing junk!\n"
++ msgstr "in_hippi(%s): sodi lõpus\n"
++ 
++-#: ../lib/hw.c:155
+++#: ../lib/hw.c:160
++ msgid "Local Loopback"
++ msgstr "Kohalik loopback"
++ 
++-#: ../lib/hw.c:158
+++#: ../lib/hw.c:163
++ msgid "Serial Line IP"
++ msgstr "Serial Line IP"
++ 
++-#: ../lib/hw.c:159
+++#: ../lib/hw.c:164
++ msgid "VJ Serial Line IP"
++ msgstr "VJ Serial Line IP"
++ 
++-#: ../lib/hw.c:160
+++#: ../lib/hw.c:165
++ msgid "6-bit Serial Line IP"
++ msgstr "6-bitine Serial Line IP"
++ 
++-#: ../lib/hw.c:161
+++#: ../lib/hw.c:166
++ msgid "VJ 6-bit Serial Line IP"
++ msgstr "VJ 6-bitine Serial Line IP"
++ 
++-#: ../lib/hw.c:162
+++#: ../lib/hw.c:167
++ msgid "Adaptive Serial Line IP"
++ msgstr "Adaptiivne Serial Line IP"
++ 
++-#: ../lib/hw.c:165
+++#: ../lib/hw.c:170
++ msgid "Ethernet"
++ msgstr "Ethernet"
++ 
++-#: ../lib/hw.c:171
+++#: ../lib/hw.c:176
++ msgid "Fiber Distributed Data Interface"
++ msgstr "Fiber Distributed Data Interface"
++ 
++-#: ../lib/hw.c:174
+++#: ../lib/hw.c:179
++ msgid "HIPPI"
++ msgstr "HIPPI"
++ 
++-#: ../lib/hw.c:186
+++#: ../lib/hw.c:191
++ msgid "generic X.25"
++ msgstr "üldine X.25"
++ 
++-#: ../lib/hw.c:189
+++#: ../lib/hw.c:194
++ msgid "IPIP Tunnel"
++ msgstr "IPIP tunnel"
++ 
++-#: ../lib/hw.c:192
+++#: ../lib/hw.c:197
++ msgid "Point-to-Point Protocol"
++ msgstr "Kakspunktprotokoll"
++ 
++-#: ../lib/hw.c:195
+++#: ../lib/hw.c:200
++ msgid "(Cisco)-HDLC"
++ msgstr "(Cisco-)HDLC"
++ 
++-#: ../lib/hw.c:196
+++#: ../lib/hw.c:201
++ msgid "LAPB"
++ msgstr "LAPB"
++ 
++-#: ../lib/hw.c:199
+++#: ../lib/hw.c:204
++ msgid "ARCnet"
++ msgstr "ARCnet"
++ 
++-#: ../lib/hw.c:202
+++#: ../lib/hw.c:207
++ msgid "Frame Relay DLCI"
++ msgstr "Frame Relay DLCI"
++ 
++-#: ../lib/hw.c:203
+++#: ../lib/hw.c:208
++ msgid "Frame Relay Access Device"
++ msgstr "Frame Relay Access Device"
++ 
++-#: ../lib/hw.c:206
+++#: ../lib/hw.c:211
++ msgid "IPv6-in-IPv4"
++ msgstr "IPv6-in-IPv4"
++ 
++-#: ../lib/hw.c:209
+++#: ../lib/hw.c:214
++ msgid "IrLAP"
++ msgstr "IrLAP"
++ 
++-#: ../lib/hw.c:212
+++#: ../lib/hw.c:217
++ msgid "16/4 Mbps Token Ring"
++ msgstr "16/4 Mbps Token Ring"
++ 
++-#: ../lib/hw.c:214
+++#: ../lib/hw.c:219
++ msgid "16/4 Mbps Token Ring (New)"
++ msgstr "16/4 Mbps Token Ring (New)"
++ 
+++#: ../lib/hw.c:226
+++msgid "Generic EUI-64"
+++msgstr ""
+++
++ #: ../lib/inet.c:153 ../lib/inet6.c:79
++ #, c-format
++ msgid "rresolve: unsupport address family %d !\n"
++@@ -1972,27 +2372,32 @@ msgstr "rresolve: toetuseta aadressipere
++ msgid "[UNKNOWN]"
++ msgstr "[TUNDMATU]"
++ 
++-#: ../lib/inet6_gr.c:79
+++#: ../lib/inet6_gr.c:71
+++#, c-format
++ msgid "INET6 (IPv6) not configured in this system.\n"
++ msgstr "INET6 (IPv6) pole antud süsteemis konfigureeritud\n"
++ 
++-#: ../lib/inet6_gr.c:82
+++#: ../lib/inet6_gr.c:74
+++#, c-format
++ msgid "Kernel IPv6 routing table\n"
++ msgstr "Tuuma IPv6 ruutingutabel\n"
++ 
++-#: ../lib/inet6_gr.c:84
+++#: ../lib/inet6_gr.c:76
+++#, c-format
++ msgid ""
++-"Destination                                 Next Hop                         "
++-"       Flags Metric Ref    Use Iface\n"
+++"Destination                                 Next "
+++"Hop                                Flags Metric Ref    Use Iface\n"
++ msgstr ""
++-"Sihtpunkt                                   Järgmine samm                    "
++-"       Lipud Meetr  Mitu Kasut Liides\n"
+++"Sihtpunkt                                   Järgmine "
+++"samm                           Lipud Meetr  Mitu Kasut Liides\n"
++ 
++-#: ../lib/inet6_gr.c:158
+++#: ../lib/inet6_gr.c:150
+++#, c-format
++ msgid "Kernel IPv6 Neighbour Cache\n"
++ msgstr "Tuuma IPv6 naabrite puhver\n"
++ 
++-#: ../lib/inet6_gr.c:161
+++#: ../lib/inet6_gr.c:153
+++#, c-format
++ msgid ""
++ "Neighbour                                   HW Address        Iface    Flags "
++ "Ref State\n"
++@@ -2000,7 +2405,8 @@ msgstr ""
++ "Naaber                                      HW Aadress        Liides   Lipud "
++ "Mitu Olek\n"
++ 
++-#: ../lib/inet6_gr.c:165
+++#: ../lib/inet6_gr.c:157
+++#, c-format
++ msgid ""
++ "Neighbour                                   HW Address        Iface    Flags "
++ "Ref State            Stale(sec) Delete(sec)\n"
++@@ -2009,31 +2415,38 @@ msgstr ""
++ "Mitu Olek            Stale(sec) Delete(sec)\n"
++ 
++ #: ../lib/inet6_sr.c:46
+++#, c-format
++ msgid "Usage: inet6_route [-vF] del Target\n"
++ msgstr "Kasutamine: route [-vF] del AADRESS\n"
++ 
++ #: ../lib/inet6_sr.c:47
+++#, c-format
++ msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
++ msgstr ""
++ "            route [-vF] add AADRESS [gw GW] [metric M] [[dev] LIIDES]\n"
++ 
++ #: ../lib/inet6_sr.c:48
+++#, c-format
++ msgid "       inet6_route [-FC] flush      NOT supported\n"
++ msgstr "            route [-FC] flush      Seda EI toetata\n"
++ 
++ #: ../lib/inet6_sr.c:188
+++#, c-format
++ msgid "Flushing `inet6' routing table not supported\n"
++ msgstr "`inet6' ruutingutabeli tühjendamist ei toetata\n"
++ 
++ #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
+++#, c-format
++ msgid "INET (IPv4) not configured in this system.\n"
++ msgstr "INET (IPv4) pole antud süsteemis konfigureeritud\n"
++ 
++ #: ../lib/inet_gr.c:53
+++#, c-format
++ msgid "Kernel IP routing table\n"
++ msgstr "Tuuma IP ruutingutabel\n"
++ 
++ #: ../lib/inet_gr.c:56
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
++ "Iface\n"
++@@ -2042,6 +2455,7 @@ msgstr ""
++ "Liides\n"
++ 
++ #: ../lib/inet_gr.c:59
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags   MSS Window  irtt "
++ "Iface\n"
++@@ -2050,6 +2464,7 @@ msgstr ""
++ "Liides\n"
++ 
++ #: ../lib/inet_gr.c:62
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt\n"
++@@ -2058,10 +2473,12 @@ msgstr ""
++ "Liides   MSS   Aken   irtt\n"
++ 
++ #: ../lib/inet_gr.c:237
+++#, c-format
++ msgid "Kernel IP routing cache\n"
++ msgstr "Tuuma IP ruutingu puhver\n"
++ 
++ #: ../lib/inet_gr.c:258
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface\n"
++@@ -2070,6 +2487,7 @@ msgstr ""
++ "Liides\n"
++ 
++ #: ../lib/inet_gr.c:261
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags   MSS Window  irtt "
++ "Iface\n"
++@@ -2078,6 +2496,7 @@ msgstr ""
++ "Liides\n"
++ 
++ #: ../lib/inet_gr.c:266
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt  HH  Arp\n"
++@@ -2086,6 +2505,7 @@ msgstr ""
++ "Liides   MSS    Aken  irtt  HH  Arp\n"
++ 
++ #: ../lib/inet_gr.c:290
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
++@@ -2093,7 +2513,8 @@ msgstr ""
++ "Lähtepunkt      Sihtpunkt       Ruuter          Lipud Meetr  Mitu Kasut "
++ "Liides   MSS   Aken   irtt  TOS HHRef HHUptod     SpecDst\n"
++ 
++-#: ../lib/inet_sr.c:50
+++#: ../lib/inet_sr.c:51
+++#, c-format
++ msgid ""
++ "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
++ "[[dev] If]\n"
++@@ -2101,31 +2522,36 @@ msgstr ""
++ "Kasutamine: route [-vF] del {-host|-net} AADRESS[/PREFIKS] [gw GW] [metric "
++ "M] [[dev] LIIDES]\n"
++ 
++-#: ../lib/inet_sr.c:51
+++#: ../lib/inet_sr.c:52
+++#, c-format
++ msgid ""
++ "       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
++ msgstr ""
++ "            route [-vF] add {-host|-net} AADRESS[/PREFIKS] [gw GW] [metric "
++ "M]\n"
++ 
++-#: ../lib/inet_sr.c:52
+++#: ../lib/inet_sr.c:53
+++#, c-format
++ msgid ""
++ "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
++ msgstr ""
++ "                              [netmask N] [mss MSS] [window W] [irtt I]\n"
++ 
++-#: ../lib/inet_sr.c:53
+++#: ../lib/inet_sr.c:54
+++#, c-format
++ msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
++ msgstr "                              [mod] [dyn] [reinstate] [[dev] LIIDES]\n"
++ 
++-#: ../lib/inet_sr.c:54
+++#: ../lib/inet_sr.c:55
+++#, c-format
++ msgid ""
++ "       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
++ msgstr ""
++ "            route [-vF] add {-host|-net} AADRESS[/PREFIKS] [metric M] "
++ "reject\n"
++ 
++-#: ../lib/inet_sr.c:55
+++#: ../lib/inet_sr.c:56
+++#, c-format
++ msgid "       inet_route [-FC] flush      NOT supported\n"
++ msgstr "            route [-FC] flush      Seda EI toetata\n"
++ 
++@@ -2135,14 +2561,17 @@ msgid "route: %s: cannot use a NETWORK a
++ msgstr "route: %s: võrku ei saa kasutada ruuterina\n"
++ 
++ #: ../lib/inet_sr.c:174
+++#, c-format
++ msgid "route: Invalid MSS/MTU.\n"
++ msgstr "route: vigane MSS/MTU\n"
++ 
++ #: ../lib/inet_sr.c:187
+++#, c-format
++ msgid "route: Invalid window.\n"
++ msgstr "route: Vigane akna suurus\n"
++ 
++ #: ../lib/inet_sr.c:203
+++#, c-format
++ msgid "route: Invalid initial rtt.\n"
++ msgstr "route: vigane algne rtt\n"
++ 
++@@ -2157,75 +2586,92 @@ msgid "route: bogus netmask %s\n"
++ msgstr "route: vale võrgumask %s\n"
++ 
++ #: ../lib/inet_sr.c:270
+++#, c-format
++ msgid "route: netmask doesn't match route address\n"
++ msgstr "route: võrgumask ei sobi ruutingu aadressiga\n"
++ 
++ #: ../lib/inet_sr.c:306
+++#, c-format
++ msgid "Flushing `inet' routing table not supported\n"
++ msgstr "`inet' ruutingutabeli tühjendamist ei toetata\n"
++ 
++ #: ../lib/inet_sr.c:310
+++#, c-format
++ msgid "Modifying `inet' routing cache not supported\n"
++ msgstr "`inet' ruutingu puhvri muutmist ei toetata\n"
++ 
++ #: ../lib/ipx_gr.c:52
+++#, c-format
++ msgid "IPX not configured in this system.\n"
++ msgstr "IPX pole antud süsteemis konfigureeritud\n"
++ 
++ #: ../lib/ipx_gr.c:56
+++#, c-format
++ msgid "Kernel IPX routing table\n"
++ msgstr "Tuuma IPX ruutingutabel\n"
++ 
++ #. xxx
++ #: ../lib/ipx_gr.c:57
+++#, c-format
++ msgid "Destination               Router Net                Router Node\n"
++ msgstr "Sihtpunkt                 Ruuteri võrk              Ruuter ise\n"
++ 
++ #: ../lib/ipx_sr.c:33
+++#, c-format
++ msgid "IPX: this needs to be written\n"
++ msgstr "IPX osa vajab ümbertegemist\n"
++ 
++ #: ../lib/masq_info.c:198
+++#, c-format
++ msgid "IP masquerading entries\n"
++ msgstr "IP maskeerimise kirjed\n"
++ 
++ #: ../lib/masq_info.c:201
+++#, c-format
++ msgid "prot   expire source               destination          ports\n"
++ msgstr "Proto  Aegub  Lähtepunkt           Sihtpunkt            Pordid\n"
++ 
++ #: ../lib/masq_info.c:204
+++#, c-format
++ msgid ""
++-"prot   expire    initseq delta prevd source               destination        "
++-"  ports\n"
+++"prot   expire    initseq delta prevd source               "
+++"destination          ports\n"
++ msgstr ""
++-"Proto  Aegub     Initseq Delta Prevd Lähtepunkt           Sihtpunkt          "
++-"  Pordid\n"
+++"Proto  Aegub     Initseq Delta Prevd Lähtepunkt           "
+++"Sihtpunkt            Pordid\n"
++ 
++ #: ../lib/netrom_gr.c:48
+++#, c-format
++ msgid "NET/ROM not configured in this system.\n"
++ msgstr "NET/ROM pole antud süsteemis konfigureeritud\n"
++ 
++ #: ../lib/netrom_gr.c:51
+++#, c-format
++ msgid "Kernel NET/ROM routing table\n"
++ msgstr "Tuuma NET/ROM ruutingutabel\n"
++ 
++ #: ../lib/netrom_gr.c:52
+++#, c-format
++ msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
++ msgstr "Sihtpunkt   Mnemoonika Kvaliteet Naaber    Liides\n"
++ 
++ #: ../lib/netrom_sr.c:34
+++#, c-format
++ msgid "netrom usage\n"
++ msgstr "netrom kasutus\n"
++ 
++ #: ../lib/netrom_sr.c:44
+++#, c-format
++ msgid "NET/ROM: this needs to be written\n"
++ msgstr "NET/ROM osa vajab ümbertegemist\n"
++ 
++ #: ../lib/ppp.c:44
+++#, c-format
++ msgid "You cannot start PPP with this program.\n"
++ msgstr "Sellest programmist ei saa PPP-d käivitada\n"
++ 
++ #: ../lib/ppp_ac.c:38
+++#, c-format
++ msgid "Sorry, use pppd!\n"
++ msgstr "Palun kasutage pppd'd\n"
++ 
++@@ -2234,287 +2680,314 @@ msgid "Node address must be ten digits"
++ msgstr "Sõlme aadress peab olema kümnekohaline"
++ 
++ #: ../lib/rose_gr.c:51
+++#, c-format
++ msgid "ROSE not configured in this system.\n"
++ msgstr "ROSE pole antud süsteemis konfigureeritud\n"
++ 
++ #: ../lib/rose_gr.c:54
+++#, c-format
++ msgid "Kernel ROSE routing table\n"
++ msgstr "Tuuma ROSE ruutingutabel\n"
++ 
++-#: ../lib/tr.c:70 ../lib/tr.c:85
+++#: ../lib/tr.c:86 ../lib/tr.c:101
++ #, c-format
++ msgid "in_tr(%s): invalid token ring address!\n"
++ msgstr "in_tr(%s): vigane token ring-aadress\n"
++ 
++-#: ../lib/tr.c:97
+++#: ../lib/tr.c:113
++ #, c-format
++ msgid "in_tr(%s): trailing : ignored!\n"
++ msgstr "in_tr(%s): ignoreerin lõpetavat koolonit\n"
++ 
++-#: ../lib/tr.c:109
+++#: ../lib/tr.c:125
++ #, c-format
++ msgid "in_tr(%s): trailing junk!\n"
++ msgstr "in_tr(%s): sodi lõpus\n"
++ 
++-#: ../lib/interface.c:164
+++#: ../lib/interface.c:176
++ #, c-format
++ msgid "warning: no inet socket available: %s\n"
++ msgstr "Hoiatus: `inet' sokleid ei ole: %s\n"
++ 
++-#: ../lib/interface.c:316
+++#: ../lib/interface.c:325
++ #, c-format
++ msgid "Warning: cannot open %s (%s). Limited output.\n"
++ msgstr "Hoiatus: ei saa avada faili %s (%s). Väljund on piiratud.\n"
++ 
++ #. Give better error message for this case.
++-#: ../lib/interface.c:556
+++#: ../lib/interface.c:571
++ msgid "Device not found"
++ msgstr "Liidest ei leitud"
++ 
++-#: ../lib/interface.c:560
+++#: ../lib/interface.c:575
++ #, c-format
++ msgid "%s: error fetching interface information: %s\n"
++ msgstr "%s: viga liidese info küsimisel: %s\n"
++ 
++-#: ../lib/interface.c:593
+++#: ../lib/interface.c:608
++ msgid "     - no statistics available -"
++ msgstr "     - statistikat ei ole      -"
++ 
++-#: ../lib/interface.c:597
+++#: ../lib/interface.c:612
+++#, c-format
++ msgid "[NO FLAGS]"
++ msgstr "[LIPPE POLE]"
++ 
++-#: ../lib/interface.c:673
+++#: ../lib/interface.c:688
++ #, c-format
++ msgid "%-9.9s Link encap:%s  "
++ msgstr "%-9.9s kapseldus:%s  "
++ 
++-#: ../lib/interface.c:678
+++#: ../lib/interface.c:693
++ #, c-format
++ msgid "HWaddr %s  "
++ msgstr "HWaddr %s  "
++ 
++-#: ../lib/interface.c:681
+++#: ../lib/interface.c:696
++ #, c-format
++ msgid "Media:%s"
++ msgstr "meedia:%s"
++ 
++-#: ../lib/interface.c:683
+++#: ../lib/interface.c:698
+++#, c-format
++ msgid "(auto)"
++ msgstr "(auto)"
++ 
++-#: ../lib/interface.c:690
+++#: ../lib/interface.c:705
++ #, c-format
++ msgid "          %s addr:%s "
++ msgstr "          %s aadress:%s "
++ 
++-#: ../lib/interface.c:693
+++#: ../lib/interface.c:708
++ #, c-format
++ msgid " P-t-P:%s "
++ msgstr " P-t-P:%s "
++ 
++-#: ../lib/interface.c:696
+++#: ../lib/interface.c:711
++ #, c-format
++ msgid " Bcast:%s "
++ msgstr " bcast:%s "
++ 
++-#: ../lib/interface.c:698
+++#: ../lib/interface.c:713
++ #, c-format
++ msgid " Mask:%s\n"
++ msgstr " mask:%s\n"
++ 
++-#: ../lib/interface.c:715
+++#: ../lib/interface.c:730
++ #, c-format
++ msgid "          inet6 addr: %s/%d"
++ msgstr "          inet6 aadr: %s/%d"
++ 
++-#: ../lib/interface.c:717
+++#: ../lib/interface.c:732
+++#, c-format
++ msgid " Scope:"
++ msgstr " skoop:"
++ 
++-#: ../lib/interface.c:720
+++#: ../lib/interface.c:735
+++#, c-format
++ msgid "Global"
++ msgstr "globaalne"
++ 
++-#: ../lib/interface.c:723
+++#: ../lib/interface.c:738
+++#, c-format
++ msgid "Link"
++ msgstr "ühendus"
++ 
++-#: ../lib/interface.c:726
+++#: ../lib/interface.c:741
+++#, c-format
++ msgid "Site"
++ msgstr "site"
++ 
++-#: ../lib/interface.c:729
+++#: ../lib/interface.c:744
+++#, c-format
++ msgid "Compat"
++ msgstr "ühilduvus"
++ 
++-#: ../lib/interface.c:732
+++#: ../lib/interface.c:747
+++#, c-format
++ msgid "Host"
++ msgstr "host"
++ 
++-#: ../lib/interface.c:735
+++#: ../lib/interface.c:750
+++#, c-format
++ msgid "Unknown"
++ msgstr "tundmatu"
++ 
++-#: ../lib/interface.c:750
+++#: ../lib/interface.c:765
++ #, c-format
++ msgid "          IPX/Ethernet II addr:%s\n"
++ msgstr "          IPX/Ethernet II aadr:%s\n"
++ 
++-#: ../lib/interface.c:753
+++#: ../lib/interface.c:768
++ #, c-format
++ msgid "          IPX/Ethernet SNAP addr:%s\n"
++ msgstr "          IPX/Ethernet SNAP aadr:%s\n"
++ 
++-#: ../lib/interface.c:756
+++#: ../lib/interface.c:771
++ #, c-format
++ msgid "          IPX/Ethernet 802.2 addr:%s\n"
++ msgstr "          IPX/Ethernet 802.2 aadr:%s\n"
++ 
++-#: ../lib/interface.c:759
+++#: ../lib/interface.c:774
++ #, c-format
++ msgid "          IPX/Ethernet 802.3 addr:%s\n"
++ msgstr "          IPX/Ethernet 802.3 aadr:%s\n"
++ 
++-#: ../lib/interface.c:769
+++#: ../lib/interface.c:784
++ #, c-format
++ msgid "          EtherTalk Phase 2 addr:%s\n"
++ msgstr "          EtherTalk Phase 2 aadr:%s\n"
++ 
++-#: ../lib/interface.c:778
+++#: ../lib/interface.c:793
++ #, c-format
++ msgid "          econet addr:%s\n"
++ msgstr "          econeti aadr:%s\n"
++ 
++-#: ../lib/interface.c:785
+++#: ../lib/interface.c:800
+++#, c-format
++ msgid "[NO FLAGS] "
++ msgstr "[LIPPE POLE]"
++ 
++-#: ../lib/interface.c:787
+++#: ../lib/interface.c:802
+++#, c-format
++ msgid "UP "
++ msgstr "UP "
++ 
++-#: ../lib/interface.c:789
+++#: ../lib/interface.c:804
+++#, c-format
++ msgid "BROADCAST "
++ msgstr "BROADCAST "
++ 
++-#: ../lib/interface.c:791
+++#: ../lib/interface.c:806
+++#, c-format
++ msgid "DEBUG "
++ msgstr "DEBUG "
++ 
++-#: ../lib/interface.c:793
+++#: ../lib/interface.c:808
+++#, c-format
++ msgid "LOOPBACK "
++ msgstr "LOOPBACK "
++ 
++-#: ../lib/interface.c:795
+++#: ../lib/interface.c:810
+++#, c-format
++ msgid "POINTOPOINT "
++ msgstr "POINTOPOINT "
++ 
++-#: ../lib/interface.c:797
+++#: ../lib/interface.c:812
+++#, c-format
++ msgid "NOTRAILERS "
++ msgstr "NOTRAILERS "
++ 
++-#: ../lib/interface.c:799
+++#: ../lib/interface.c:814
+++#, c-format
++ msgid "RUNNING "
++ msgstr "RUNNING "
++ 
++-#: ../lib/interface.c:801
+++#: ../lib/interface.c:816
+++#, c-format
++ msgid "NOARP "
++ msgstr "NOARP "
++ 
++-#: ../lib/interface.c:803
+++#: ../lib/interface.c:818
+++#, c-format
++ msgid "PROMISC "
++ msgstr "PROMISC "
++ 
++-#: ../lib/interface.c:805
+++#: ../lib/interface.c:820
+++#, c-format
++ msgid "ALLMULTI "
++ msgstr "ALLMULTI "
++ 
++-#: ../lib/interface.c:807
+++#: ../lib/interface.c:822
+++#, c-format
++ msgid "SLAVE "
++ msgstr "SLAVE "
++ 
++-#: ../lib/interface.c:809
+++#: ../lib/interface.c:824
+++#, c-format
++ msgid "MASTER "
++ msgstr "MASTER "
++ 
++-#: ../lib/interface.c:811
+++#: ../lib/interface.c:826
+++#, c-format
++ msgid "MULTICAST "
++ msgstr "MULTICAST "
++ 
++-#: ../lib/interface.c:814
+++#: ../lib/interface.c:829
+++#, c-format
++ msgid "DYNAMIC "
++ msgstr "DYNAMIC "
++ 
++ #. DONT FORGET TO ADD THE FLAGS IN ife_print_short
++-#: ../lib/interface.c:817
+++#: ../lib/interface.c:832
++ #, c-format
++ msgid " MTU:%d  Metric:%d"
++ msgstr " MTU:%d meetrika:%d"
++ 
++-#: ../lib/interface.c:821
+++#: ../lib/interface.c:836
++ #, c-format
++ msgid "  Outfill:%d  Keepalive:%d"
++ msgstr "  ülalhoidepakettide intervall:%d  ülalhoidetaimaut:%d"
++ 
++-#: ../lib/interface.c:835
+++#: ../lib/interface.c:850
++ #, c-format
++ msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
++ msgstr "RX pakette:%llu vigu:%lu ära visatud:%lu ületäit:%lu kaadri vigu:%lu\n"
++ 
++-#: ../lib/interface.c:840
+++#: ../lib/interface.c:855
++ #, c-format
++ msgid "             compressed:%lu\n"
++ msgstr "             pakitud:%lu\n"
++ 
++-#: ../lib/interface.c:852
+++#: ../lib/interface.c:895
++ #, c-format
++ msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
++ msgstr "TX pakette:%llu vigu:%lu ära visatud:%lu ületäit:%lu carrier:%lu\n"
++ 
++-#: ../lib/interface.c:856
+++#: ../lib/interface.c:899
++ #, c-format
++ msgid "          collisions:%lu "
++ msgstr "          kollisioone:%lu "
++ 
++-#: ../lib/interface.c:858
+++#: ../lib/interface.c:901
++ #, c-format
++ msgid "compressed:%lu "
++ msgstr "pakitud:%lu "
++ 
++-#: ../lib/interface.c:860
+++#: ../lib/interface.c:903
++ #, c-format
++ msgid "txqueuelen:%d "
++ msgstr "txqueuelen:%d "
++ 
++-#: ../lib/interface.c:862
+++#: ../lib/interface.c:905
++ #, c-format
++ msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
++ msgstr "RX baite:%llu (%lu.%lu %s)  TX baite:%llu (%lu.%lu %s)\n"
++ 
++-#: ../lib/interface.c:873
+++#: ../lib/interface.c:916
++ #, c-format
++ msgid "Interrupt:%d "
++ msgstr "katkestus:%d "
++ 
++ #. Only print devices using it for
++ #. I/O maps
++-#: ../lib/interface.c:876
+++#: ../lib/interface.c:919
++ #, c-format
++ msgid "Base address:0x%x "
++ msgstr "baasaadress:0x%x "
++ 
++-#: ../lib/interface.c:878
+++#: ../lib/interface.c:921
++ #, c-format
++ msgid "Memory:%lx-%lx "
++ msgstr "mälu:%lx-%lx "
++ 
++-#: ../lib/interface.c:881
+++#: ../lib/interface.c:924
++ #, c-format
++ msgid "DMA chan:%x "
++ msgstr "DMA kanal:%x "
++ 
++ #: ../lib/sockets.c:63
+++#, c-format
++ msgid "No usable address families found.\n"
++ msgstr "Ei leidnud ühtegi kasutatavat aadressiperekonda\n"
++ 
++@@ -2538,29 +3011,32 @@ msgstr "iptunnel: %s on vigane IPv4 aadr
++ msgid "ip: argument is wrong: %s\n"
++ msgstr "iptunnel: vale argument %s\n"
++ 
++-#: ../ipmaddr.c:58
+++#: ../ipmaddr.c:61
+++#, c-format
++ msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
++ msgstr "Kasutamine: ipmaddr [ add | del ] MULTIAADR dev STRING\n"
++ 
++-#: ../ipmaddr.c:59
+++#: ../ipmaddr.c:62
+++#, c-format
++ msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
++ msgstr "            ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
++ 
++-#: ../ipmaddr.c:60
+++#: ../ipmaddr.c:63
+++#, c-format
++ msgid "       ipmaddr -V | -version\n"
++ msgstr "            ipmaddr -V | -version\n"
++ 
++-#: ../ipmaddr.c:260
+++#: ../ipmaddr.c:263
++ #, c-format
++ msgid "family %d "
++ msgstr "perekond %d "
++ 
++-#: ../ipmaddr.c:269
+++#: ../ipmaddr.c:272
++ #, c-format
++ msgid " users %d"
++ msgstr " kasutajaid %d"
++ 
++-#: ../ipmaddr.c:355
+++#: ../ipmaddr.c:358
++ msgid "Cannot create socket"
++ msgstr "Ei saa avada soklit"
++ 
++@@ -2575,6 +3051,7 @@ msgid "slattach: tty_lock: (%s): %s\n"
++ msgstr "slattach: tty_lock: (%s): %s\n"
++ 
++ #: ../slattach.c:192
+++#, c-format
++ msgid "slattach: cannot write PID file\n"
++ msgstr "slattach: ei saa PID faili kirjutada\n"
++ 
++@@ -2594,18 +3071,22 @@ msgid "slattach: tty_hangup(RAISE): %s\n
++ msgstr "slattach: tty_hangup(RAISE): %s\n"
++ 
++ #: ../slattach.c:468
+++#, c-format
++ msgid "slattach: tty name too long\n"
++ msgstr "slattach: terminali nimi on liiga pikk\n"
++ 
++ #: ../slattach.c:498
+++#, c-format
++ msgid "slattach: tty_open: cannot get current state!\n"
++ msgstr "slattach: tty_open: ei saa lugeda jooksvat olekut\n"
++ 
++ #: ../slattach.c:505
+++#, c-format
++ msgid "slattach: tty_open: cannot get current line disc!\n"
++ msgstr "slattach: tty_open: liiniprotokolli küsimine ebaõnnestus\n"
++ 
++ #: ../slattach.c:513
+++#, c-format
++ msgid "slattach: tty_open: cannot set RAW mode!\n"
++ msgstr "slattach: tty_open: ei saa seada RAW moodi\n"
++ 
++@@ -2615,6 +3096,7 @@ msgid "slattach: tty_open: cannot set %s
++ msgstr "slattach: tty_open: ei saa seada kiiruseks %s bps\n"
++ 
++ #: ../slattach.c:530
+++#, c-format
++ msgid "slattach: tty_open: cannot set 8N1 mode!\n"
++ msgstr "slattach: tty_open: ei saa seada 8N1 moodi\n"
++ 
++@@ -2637,3 +3119,20 @@ msgstr " pordil %s"
++ #, c-format
++ msgid " interface %s\n"
++ msgstr " liides %s\n"
+++
+++#~ msgid ""
+++#~ "  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
+++#~ "<-''-\n"
+++#~ msgstr ""
+++#~ "  arp [-v]   [<HW>] [-i <if>] -s  <hosti nimi> <hwaddr> [netmask <nm>] "
+++#~ "pub\n"
+++
+++#~ msgid "%s: unknown interface: %s\n"
+++#~ msgstr "ifconfig: tundmatu liides %s: %s\n"
+++
+++#~ msgid "        -n, --numeric            dont resolve names\n"
+++#~ msgstr ""
+++#~ "        -n, --numeric            mitte lahendada numbreid nimedeks\n"
+++
+++#~ msgid "Routing table for `ddp' not yet supported.\n"
+++#~ msgstr "`ddp' jaoks ruutingutabelit veel ei oska\n"
++Index: net-tools/po/cs.po
++===================================================================
++--- net-tools.orig/po/cs.po
+++++ net-tools/po/cs.po
++@@ -5,7 +5,8 @@
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: net-tools-1.51\n"
++-"POT-Creation-Date: 2000-02-14 02:31+0100\n"
+++"Report-Msgid-Bugs-To: \n"
+++"POT-Creation-Date: 2007-06-30 12:28+0900\n"
++ "PO-Revision-Date: 1999-08-29 23:20+0200\n"
++ "Last-Translator: Jiøí Pavlovský <pavlovsk@ff.cuni.cz>\n"
++ "Language-Team: Czech <cs@li.org>\n"
++@@ -13,96 +14,110 @@ msgstr ""
++ "Content-Type: text/plain; charset=iso-8859-2\n"
++ "Content-Transfer-Encoding: 8bit\n"
++ 
++-#: ../arp.c:110 ../arp.c:269
+++#: ../arp.c:112 ../arp.c:279
+++#, c-format
++ msgid "arp: need host name\n"
++ msgstr "arp: je tøeba jméno poèítaèe\n"
++ 
++-#: ../arp.c:207 ../arp.c:221
+++#: ../arp.c:215 ../arp.c:230
++ #, c-format
++ msgid "No ARP entry for %s\n"
++ msgstr "Pro %s neexistuje ARP polo¾ka\n"
++ 
++-#: ../arp.c:239
+++#: ../arp.c:248
++ #, c-format
++ msgid "arp: cant get HW-Address for `%s': %s.\n"
++ msgstr "arp: HW adresu `%s' nelze zjistit: %s\n"
++ 
++-#: ../arp.c:243
+++#: ../arp.c:252
+++#, c-format
++ msgid "arp: protocol type mismatch.\n"
++ msgstr "arp: chybnì zadaný typ protokolu\n"
++ 
++-#: ../arp.c:252
+++#: ../arp.c:261
++ #, c-format
++ msgid "arp: device `%s' has HW address %s `%s'.\n"
++ msgstr "arp: zaøízení `%s' má Hw adresu %s `%s'.\n"
++ 
++-#: ../arp.c:282
+++#: ../arp.c:293
+++#, c-format
++ msgid "arp: need hardware address\n"
++ msgstr "arp: je tøeba hardwarová adresa\n"
++ 
++-#: ../arp.c:290
+++#: ../arp.c:301
+++#, c-format
++ msgid "arp: invalid hardware address\n"
++ msgstr "arp: nesprávná hardwarová adresa\n"
++ 
++-#: ../arp.c:387
+++#: ../arp.c:398
++ #, c-format
++ msgid "arp: cannot open etherfile %s !\n"
++ msgstr "arp: databázi ethernetových adres %s nelze otevøít!\n"
++ 
++-#: ../arp.c:403
+++#: ../arp.c:414
++ #, c-format
++ msgid "arp: format error on line %u of etherfile %s !\n"
++ msgstr "arp: syntaktická chyba na øádku %u databáze ethernetových adres %s!\n"
++ 
++-#: ../arp.c:416
+++#: ../arp.c:427
++ #, c-format
++ msgid "arp: cannot set entry on line %u of etherfile %s !\n"
++ msgstr ""
++ "arp: polo¾ku na øádku %u databáze ethernetových adres %s nelze nastavit!\n"
++ 
++-#: ../arp.c:437
++-msgid "Address\t\t\tHWtype\tHWaddress\t    Flags Mask\t\t  Iface\n"
+++#: ../arp.c:448
+++#, fuzzy, c-format
+++msgid ""
+++"Address                  HWtype  HWaddress           Flags Mask            "
+++"Iface\n"
++ msgstr "Adresa\t\t\t HWtyp\t HWadresa\t     Pøíz  Maska\t\t   Rozhraní\n"
++ 
++-#: ../arp.c:467
+++#: ../arp.c:476
+++#, fuzzy
+++msgid "<from_interface>"
+++msgstr " rozhraní %s\n"
+++
+++#: ../arp.c:478
++ msgid "(incomplete)"
++ msgstr "(nekompletní)"
++ 
++-#: ../arp.c:484
+++#: ../arp.c:495
++ #, c-format
++ msgid "%s (%s) at "
++ msgstr "%s (%s) na "
++ 
++-#: ../arp.c:490
+++#: ../arp.c:501
+++#, c-format
++ msgid "<incomplete> "
++ msgstr "<nekompletní>"
++ 
++-#: ../arp.c:496
+++#: ../arp.c:507
++ #, c-format
++ msgid "netmask %s "
++ msgstr "sí»ová maska %s "
++ 
++-#: ../arp.c:513
+++#: ../arp.c:524
++ #, c-format
++ msgid "on %s\n"
++ msgstr "na %s\n"
++ 
++-#: ../arp.c:592
+++#: ../arp.c:605
++ #, c-format
++ msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
++ msgstr "Polo¾ky: %d\tVynecháno: %d\tNalezeno: %d\n"
++ 
++-#: ../arp.c:596
+++#: ../arp.c:609
++ #, c-format
++ msgid "%s (%s) -- no entry\n"
++ msgstr "%s (%s) -- ¾ádná polo¾ka\n"
++ 
++-#: ../arp.c:598
+++#: ../arp.c:611
++ #, c-format
++ msgid "arp: in %d entries no match found.\n"
++ msgstr "arp: ¾ádná z polo¾ek (%d) nevyhovuje.\n"
++ 
++-#: ../arp.c:613
+++#: ../arp.c:626
+++#, c-format
++ msgid ""
++ "Usage:\n"
++ "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
++@@ -112,49 +127,46 @@ msgstr ""
++ "  arp [-vn]  [<HW>] [-i <if> [-a] [<poèítaè>]             <-Zobrazí ARP "
++ "cache\n"
++ 
++-#: ../arp.c:614
+++#: ../arp.c:627
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP "
+++"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
++ "entry\n"
++ msgstr ""
++ "  arp [-v]          [-i <if>] -d <poèítaè> [pub][nopub]   <-Sma¾e polo¾ku "
++ "ARP\n"
++ 
++-#: ../arp.c:615
++-#, fuzzy
+++#: ../arp.c:628
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from "
+++"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
++ "file\n"
++ msgstr ""
++ "  arp [-vnD] [<HW>] [-i <if>] -f <soubor>                 <-Pøidá polo¾ku "
++ "ze\n"
++ "                                                          souboru\n"
++ 
++-#: ../arp.c:616
+++#: ../arp.c:629
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add "
+++"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
++ "entry\n"
++ msgstr ""
++ "  arp [-v]   [<HW> [-i <if> -s   <poèítaè> <hwadr> [temp][nopub] <-Pøidá "
++ "polo¾ku\n"
++ 
++-#: ../arp.c:617
++-msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
++-"<-''-\n"
++-msgstr ""
++-"  arp [-v]   [<HW>] [-i <if>] -s <soubor> <hwadr> [sí»mask <èís>]  <-''-\n"
++-
++-#: ../arp.c:618
+++#: ../arp.c:630
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      "
+++"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
++ "<-''-\n"
++ "\n"
++ msgstr ""
++ "  arp [-v]   [<HW> [-i <if> -Ds  <poèítaè> <if> [sí»mask <èís>] pub      "
++ "<-''-\n"
++ 
++-#: ../arp.c:620
+++#: ../arp.c:632
+++#, c-format
++ msgid ""
++ "        -a                       display (all) hosts in alternative (BSD) "
++ "style\n"
++@@ -162,126 +174,134 @@ msgstr ""
++ "        -a                       zobrazí jmna v¹ech poèítaèù alternativním\n"
++ "                                 (BSD) zpùsobem\n"
++ 
++-#: ../arp.c:621
+++#: ../arp.c:633
+++#, c-format
++ msgid "        -s, --set                set a new ARP entry\n"
++ msgstr "        -s, --set                nastaví novou ARP polo¾ku\n"
++ 
++-#: ../arp.c:622
+++#: ../arp.c:634
+++#, c-format
++ msgid "        -d, --delete             delete a specified entry\n"
++ msgstr "        -d, --delete             sma¾e zadanou ARP polo¾ku\n"
++ 
++-#: ../arp.c:623 ../netstat.c:1436 ../route.c:85
+++#: ../arp.c:635 ../netstat.c:1503 ../route.c:86
+++#, c-format
++ msgid "        -v, --verbose            be verbose\n"
++ msgstr ""
++ "        -v, --verbose            bude vypisovat podrobné zprávy\n"
++ "                                 o èinnosti\n"
++ 
++-#: ../arp.c:624 ../netstat.c:1437 ../route.c:86
++-msgid "        -n, --numeric            dont resolve names\n"
+++#: ../arp.c:636 ../netstat.c:1504 ../route.c:87
+++#, fuzzy, c-format
+++msgid "        -n, --numeric            don't resolve names\n"
++ msgstr ""
++ "        -n, --numeric            nebude pøevádìt èíselné adresy\n"
++ "                                 na kanonická jména\n"
++ 
++-#: ../arp.c:625
+++#: ../arp.c:637
+++#, c-format
++ msgid ""
++ "        -i, --device             specify network interface (e.g. eth0)\n"
++ msgstr "        -i, --device             zadává sí»ové rozhraní (napø. eth0)\n"
++ 
++-#: ../arp.c:626
+++#: ../arp.c:638
+++#, c-format
++ msgid "        -D, --use-device         read <hwaddr> from given device\n"
++ msgstr "        -D, --use-device         ète <hwadr> ze zadaného zaøízení\n"
++ 
++-#: ../arp.c:627
++-#, fuzzy
+++#: ../arp.c:639
+++#, fuzzy, c-format
++ msgid "        -A, -p, --protocol       specify protocol family\n"
++ msgstr "         -r, --route              vypí¹e smìrovací tabulku\n"
++ 
++-#: ../arp.c:628
++-#, fuzzy
+++#: ../arp.c:640
+++#, fuzzy, c-format
++ msgid ""
++-"        -f, --file               read new entries from file or from "
++-"/etc/ethers\n"
+++"        -f, --file               read new entries from file or from /etc/"
+++"ethers\n"
++ "\n"
++ msgstr ""
++ "        -f, --file               ète nové polo¾ky ze souboru\n"
++ "\n"
++ 
++-#: ../arp.c:630 ../rarp.c:181
+++#: ../arp.c:642 ../rarp.c:182
++ #, c-format
++ msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
++ msgstr ""
++ "  <HW>=Pou¾ijte '-H <hw> pro zadání hardwarového typu adresy.\n"
++ "  Implicitnì: %s\n"
++ 
++-#: ../arp.c:631 ../rarp.c:182
+++#: ../arp.c:643 ../rarp.c:183
+++#, c-format
++ msgid "  List of possible hardware types (which support ARP):\n"
++ msgstr "  Seznam mo¾ných hardwarových typù (podporujících ARP):\n"
++ 
++-#: ../arp.c:664
+++#: ../arp.c:677 ../arp.c:762
++ #, c-format
++ msgid "%s: hardware type not supported!\n"
++ msgstr "hardwarový typ %s není podporován!\n"
++ 
++-#: ../arp.c:668
+++#: ../arp.c:681
++ #, c-format
++ msgid "%s: address family not supported!\n"
++ msgstr "tøída adres %s není podporována!\n"
++ 
++-#: ../arp.c:703
+++#: ../arp.c:716
+++#, c-format
++ msgid "arp: -N not yet supported.\n"
++ msgstr "arp: pøepínaè -N není zatím podporován\n"
++ 
++-#: ../arp.c:713
+++#: ../arp.c:726
++ #, c-format
++ msgid "arp: %s: unknown address family.\n"
++ msgstr "arp: neznámá tøída adres %s.\n"
++ 
++-#: ../arp.c:722
+++#: ../arp.c:735
++ #, c-format
++ msgid "arp: %s: unknown hardware type.\n"
++ msgstr "arp: neznámý hardwarový typ %s.\n"
++ 
++-#: ../arp.c:741
+++#: ../arp.c:754
++ #, c-format
++ msgid "arp: %s: kernel only supports 'inet'.\n"
++ msgstr "arp: %s: jádro podporuje pouze 'inet'.\n"
++ 
++-#: ../arp.c:746
+++#: ../arp.c:767
++ #, c-format
++ msgid "arp: %s: hardware type without ARP support.\n"
++ msgstr "arp: hardwarový typ %s nepodporuje ARP.\n"
++ 
++-#: ../hostname.c:69
+++#: ../hostname.c:71
++ #, c-format
++ msgid "Setting nodename to `%s'\n"
++ msgstr "Nastavuji jméno uzlu na `%s'\n"
++ 
++-#: ../hostname.c:74
+++#: ../hostname.c:76
++ #, c-format
++ msgid "%s: you must be root to change the node name\n"
++ msgstr "%s: jméno uzlu mù¾e zmìnit pouze superu¾ivatel\n"
++ 
++-#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116
+++#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117
++ #, c-format
++ msgid "%s: name too long\n"
++ msgstr "jméno %s je pøíli¹ dlouhé\n"
++ 
++-#: ../hostname.c:89
+++#: ../hostname.c:91
++ #, c-format
++ msgid "Setting hostname to `%s'\n"
++ msgstr "Nastavuji jméno poèítaèe na `%s'\n"
++ 
++-#: ../hostname.c:94
+++#: ../hostname.c:96
++ #, c-format
++ msgid "%s: you must be root to change the host name\n"
++ msgstr "%s: jméno poèítaèe mù¾e zmìnit pouze superu¾ivatel\n"
++ 
++-#: ../hostname.c:108
+++#: ../hostname.c:109
++ #, c-format
++ msgid "Setting domainname to `%s'\n"
++ msgstr "Nastavuji jméno domény na `%s'\n"
++ 
++-#: ../hostname.c:113
+++#: ../hostname.c:114
++ #, c-format
++ msgid "%s: you must be root to change the domain name\n"
++ msgstr "%s: jméno domény mù¾e zmìnit pouze superu¾ivatel\n"
++@@ -306,26 +326,29 @@ msgstr "Výsledek: h_aliases=`%s'\n"
++ msgid "Result: h_addr_list=`%s'\n"
++ msgstr "Výsledek: h_addr_list=`%s'\n"
++ 
++-#: ../hostname.c:209
+++#: ../hostname.c:208
++ #, c-format
++ msgid "%s: can't open `%s'\n"
++ msgstr "%s: `%s' nelze otevøít\n"
++ 
++-#: ../hostname.c:223
+++#: ../hostname.c:222
+++#, c-format
++ msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
++ msgstr ""
++ "Pou¾ití:\n"
++ "    hostname [-v] {jméno|-F soubor}       nastaví jméno poèítaèe (ze "
++ "souboru)\n"
++ 
++-#: ../hostname.c:224
+++#: ../hostname.c:223
+++#, c-format
++ msgid ""
++ "       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
++ msgstr ""
++ "    domainname [-v] {jméno|-F soubor}     nastaví jméno NIS domény (ze\n"
++ "                                          souboru)\n"
++ 
++-#: ../hostname.c:226
+++#: ../hostname.c:225
+++#, c-format
++ msgid ""
++ "       nodename [-v] {nodename|-F file}      set DECnet node name (from "
++ "file)\n"
++@@ -333,11 +356,13 @@ msgstr ""
++ "    nodename [-v] {jméno|-F soubor}       nastaví jméno DECnet uzlu (ze\n"
++ "                                          souboru)\n"
++ 
++-#: ../hostname.c:228
+++#: ../hostname.c:227
+++#, c-format
++ msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
++ msgstr "    hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  vypí¹e formátované jméno\n"
++ 
++-#: ../hostname.c:229
+++#: ../hostname.c:228
+++#, c-format
++ msgid ""
++ "       hostname [-v]                         display hostname\n"
++ "\n"
++@@ -345,7 +370,8 @@ msgstr ""
++ "    hostname [-v]                         vypí¹e jméno poèítaèe\n"
++ "\n"
++ 
++-#: ../hostname.c:230
+++#: ../hostname.c:229
+++#, c-format
++ msgid ""
++ "       hostname -V|--version|-h|--help       print info and exit\n"
++ "\n"
++@@ -353,7 +379,8 @@ msgstr ""
++ "    hostname -V|--version|-h|--help       vypí¹e informace a skonèí\n"
++ "\n"
++ 
++-#: ../hostname.c:231
+++#: ../hostname.c:230
+++#, c-format
++ msgid ""
++ "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
++ "\n"
++@@ -361,35 +388,43 @@ msgstr ""
++ "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
++ "\n"
++ 
++-#: ../hostname.c:232
+++#: ../hostname.c:231
+++#, c-format
++ msgid "    -s, --short           short host name\n"
++ msgstr "    -s, --short           krátké jméno poèítaèe\n"
++ 
++-#: ../hostname.c:233
+++#: ../hostname.c:232
+++#, c-format
++ msgid "    -a, --alias           alias names\n"
++ msgstr "    -a, --alias           pøezdívky\n"
++ 
++-#: ../hostname.c:234
+++#: ../hostname.c:233
+++#, c-format
++ msgid "    -i, --ip-address      addresses for the hostname\n"
++ msgstr "    -i, --ip-address      adresy odpovídající jménu poèítaèe\n"
++ 
++-#: ../hostname.c:235
+++#: ../hostname.c:234
+++#, c-format
++ msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
++ msgstr "    -f, --fqdn, --long    dlouhé jméno poèítaèe (kanonické)\n"
++ 
++-#: ../hostname.c:236
+++#: ../hostname.c:235
+++#, c-format
++ msgid "    -d, --domain          DNS domain name\n"
++ msgstr "    -d, --domain          jméno DNS domény\n"
++ 
++-#: ../hostname.c:237
+++#: ../hostname.c:236
+++#, c-format
++ msgid "    -y, --yp, --nis       NIS/YP domainname\n"
++ msgstr "    -y, --yp, --nis       jméno NIS/YP domény\n"
++ 
++-#: ../hostname.c:239
+++#: ../hostname.c:238
+++#, c-format
++ msgid "    -n, --node            DECnet node name\n"
++ msgstr "    -n, --node            jméno DECnet uzlu\n"
++ 
++-#: ../hostname.c:241
+++#: ../hostname.c:240
+++#, c-format
++ msgid ""
++ "    -F, --file            read hostname or NIS domainname from given file\n"
++ "\n"
++@@ -397,7 +432,8 @@ msgstr ""
++ "    -F, --file            ète jméno poèítaèe èi nis domény ze souboru\n"
++ "\n"
++ 
++-#: ../hostname.c:243
+++#: ../hostname.c:242
+++#, c-format
++ msgid ""
++ "   This command can read or set the hostname or the NIS domainname. You can\n"
++ "   also read the DNS domain or the FQDN (fully qualified domain name).\n"
++@@ -412,6 +448,7 @@ msgid "%s: You can't change the DNS doma
++ msgstr "%s: Tímto pøíkazem nelze DNS jméno domény zmìnit\n"
++ 
++ #: ../hostname.c:339
+++#, c-format
++ msgid ""
++ "\n"
++ "Unless you are using bind or NIS for host lookups you can change the DNS\n"
++@@ -421,6 +458,7 @@ msgstr ""
++ "zmìnit\n"
++ 
++ #: ../hostname.c:340
+++#, c-format
++ msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
++ msgstr ""
++ "DNS jméno domény (je souèástí kanonického jména poèítaèe) v souboru\n"
++@@ -441,349 +479,223 @@ msgstr "getdomainname()=`%s'\n"
++ msgid "getnodename()=`%s'\n"
++ msgstr "getnodename()=`%s'\n"
++ 
++-#: ../ifconfig.c:159
++-#, c-format
++-msgid "%-9.9s Link encap:%s  "
++-msgstr "%-9.9s Zapouzdøení:%s  "
+++#: ../ifconfig.c:107
+++#, fuzzy, c-format
+++msgid ""
+++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
+++"Flg\n"
+++msgstr ""
+++"Rozhr   MTU Met    PØ-OK PØ-CHYB PØ-ZAH PØ-PØT   OD-OK OD-CHYB OD-ZAH OD-PØT "
+++"PØZ\n"
++ 
++-#: ../ifconfig.c:164
++-#, c-format
++-msgid "HWaddr %s  "
++-msgstr "HWadr %s  "
+++#: ../ifconfig.c:129 ../ifconfig.c:161
+++#, fuzzy, c-format
+++msgid "%s: ERROR while getting interface flags: %s\n"
+++msgstr "%s: chyba pøi získávání informací o rozhraní %s\n"
++ 
++-#: ../ifconfig.c:167
+++#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
+++#: ../ifconfig.c:973
++ #, c-format
++-msgid "Media:%s"
++-msgstr "Médium:%s"
+++msgid "No support for INET on this system.\n"
+++msgstr "Tento systém nepodporuje INET.\n"
++ 
++-#: ../ifconfig.c:169
++-msgid "(auto)"
++-msgstr "(auto)"
+++#: ../ifconfig.c:193
+++#, fuzzy, c-format
+++msgid "%s: ERROR while testing interface flags: %s\n"
+++msgstr "%s: chyba pøi získávání informací o rozhraní %s\n"
++ 
++-#: ../ifconfig.c:176
++-#, c-format
++-msgid "          %s addr:%s "
++-msgstr "          %s adr:%s "
+++#: ../ifconfig.c:202
+++#, fuzzy, c-format
+++msgid ""
+++"Usage:\n"
+++"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
+++msgstr ""
+++"Pou¾ití:\n"
+++"  ifconfig [-a] [-i] [-v] <rozhraní> [[<AF>] <adresa>]\n"
++ 
++-#: ../ifconfig.c:179
+++#: ../ifconfig.c:204
++ #, c-format
++-msgid " P-t-P:%s "
++-msgstr " P-t-P:%s "
+++msgid "  [add <address>[/<prefixlen>]]\n"
+++msgstr "  [add <adresa>[/<délka prefixu>]]\n"
++ 
++-# V ostatních katalozích se pøekládá Broadcast -> v¹esmìrové vysílání.
++-# Tudi¾ bcast -> V¹esmìr :)
++-#: ../ifconfig.c:182
+++#: ../ifconfig.c:205
++ #, c-format
++-msgid " Bcast:%s "
++-msgstr " V¹esmìr:%s "
+++msgid "  [del <address>[/<prefixlen>]]\n"
+++msgstr "  [del <adresa>[/<délka prefixu>]]\n"
++ 
++-#: ../ifconfig.c:184
+++#: ../ifconfig.c:206
++ #, c-format
++-msgid " Mask:%s\n"
++-msgstr "Maska:%s\n"
+++msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
+++msgstr "  [[-]broadcast [<adresa>]]  [[-]pointopoint [<adresa>]]\n"
++ 
++-#: ../ifconfig.c:201
+++#: ../ifconfig.c:207
++ #, c-format
++-msgid "          inet6 addr: %s/%d"
++-msgstr "          inet6-adr: %s/%d"
+++msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
+++msgstr "  [netmask <adresa>]  [dstaddr <adresa>]  [tunnel <adresa>]\n"
++ 
++-#: ../ifconfig.c:203
++-msgid " Scope:"
++-msgstr " Rozsah:"
+++#: ../ifconfig.c:210
+++#, c-format
+++msgid "  [outfill <NN>] [keepalive <NN>]\n"
+++msgstr "  [outfill <NN>] [keepalive <NN>]\n"
++ 
++-#: ../ifconfig.c:206
++-msgid "Global"
++-msgstr "Globál"
+++#: ../ifconfig.c:212
+++#, c-format
+++msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
+++msgstr "  [hw <HW> <adresa>]  [metric <NN>]  [mtu <NN>]\n"
++ 
++-#: ../ifconfig.c:209
++-msgid "Link"
++-msgstr "Linka"
+++#: ../ifconfig.c:213
+++#, c-format
+++msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
+++msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
++ 
++-#: ../ifconfig.c:212
++-msgid "Site"
++-msgstr "Stanovi¹tì"
+++#: ../ifconfig.c:214
+++#, c-format
+++msgid "  [multicast]  [[-]promisc]\n"
+++msgstr "  [multicast]  [[-]promisc]\n"
++ 
++ #: ../ifconfig.c:215
++-msgid "Compat"
++-msgstr "Kompatibilita"
+++#, c-format
+++msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
+++msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <typ>]\n"
++ 
++-#: ../ifconfig.c:218
++-msgid "Host"
++-msgstr "Poèítaè"
+++#: ../ifconfig.c:217
+++#, c-format
+++msgid "  [txqueuelen <NN>]\n"
+++msgstr "  [txqueuelen délka]\n"
++ 
++-#: ../ifconfig.c:221
++-msgid "Unknown"
++-msgstr "Neznám."
+++#: ../ifconfig.c:220
+++#, c-format
+++msgid "  [[-]dynamic]\n"
+++msgstr "  [[-]dynamic]\n"
++ 
++-#: ../ifconfig.c:236
+++#: ../ifconfig.c:222
++ #, c-format
++-msgid "          IPX/Ethernet II addr:%s\n"
++-msgstr "          IPX/Ethernet II adr: %s\n"
+++msgid ""
+++"  [up|down] ...\n"
+++"\n"
+++msgstr ""
+++"  [up|down] ...\n"
+++"\n"
++ 
++-#: ../ifconfig.c:239
+++#: ../ifconfig.c:224
++ #, c-format
++-msgid "          IPX/Ethernet SNAP addr:%s\n"
++-msgstr "          IPX/Ethernet SNAP adr:%s\n"
+++msgid "  <HW>=Hardware Type.\n"
+++msgstr "   <HW>=Hardwarový Typ.\n"
++ 
++-#: ../ifconfig.c:242
+++#: ../ifconfig.c:225
++ #, c-format
++-msgid "          IPX/Ethernet 802.2 addr:%s\n"
++-msgstr "          IPX/Ethernet 802.2 adr:%s\n"
+++msgid "  List of possible hardware types:\n"
+++msgstr "  Seznam mo¾ných hardwarových typù:\n"
++ 
++-#: ../ifconfig.c:245
+++#. 1 = ARPable
+++#: ../ifconfig.c:227
++ #, c-format
++-msgid "          IPX/Ethernet 802.3 addr:%s\n"
++-msgstr "          IPX/Ethernet 802.3 adr:%s\n"
+++msgid "  <AF>=Address family. Default: %s\n"
+++msgstr "   <AF>=tøída adres. Implicitní: %s\n"
++ 
++-#: ../ifconfig.c:255
+++#: ../ifconfig.c:228
++ #, c-format
++-msgid "          EtherTalk Phase 2 addr:%s\n"
++-msgstr "          EtherTalk Phase 2 adr:%s\n"
+++msgid "  List of possible address families:\n"
+++msgstr "  Seznam mo¾ných tøíd adres:\n"
++ 
++-#: ../ifconfig.c:264
+++#: ../ifconfig.c:303
++ #, c-format
++-msgid "          econet addr:%s\n"
++-msgstr "          econet adr:%s\n"
+++msgid "ifconfig: option `%s' not recognised.\n"
+++msgstr ""
++ 
++-# Hic sunt leones ...
++-#: ../ifconfig.c:270
++-msgid "[NO FLAGS] "
++-msgstr "[®ÁDNÉ PØÍZNAKY]"
+++#: ../ifconfig.c:305 ../ifconfig.c:962
+++#, c-format
+++msgid "ifconfig: `--help' gives usage information.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:272
++-msgid "UP "
++-msgstr "AKTIVOVÁNO "
+++#: ../ifconfig.c:380
+++#, c-format
+++msgid "Unknown media type.\n"
+++msgstr "Neznámý typ média.\n"
++ 
++-#: ../ifconfig.c:274
++-msgid "BROADCAST "
++-msgstr "V©ESMÌROVÉ_VYSÍLÁNÍ "
+++#: ../ifconfig.c:417
+++#, c-format
+++msgid ""
+++"Warning: Interface %s still in promisc mode... maybe other application is "
+++"running?\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:276
++-msgid "DEBUG "
++-msgstr "DEBUG "
+++#: ../ifconfig.c:429
+++#, c-format
+++msgid "Warning: Interface %s still in MULTICAST mode.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:278
++-msgid "LOOPBACK "
++-msgstr "SMYÈKA "
+++#: ../ifconfig.c:441
+++#, c-format
+++msgid "Warning: Interface %s still in ALLMULTI mode.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:280
++-msgid "POINTOPOINT "
++-msgstr "POINTOPOINT "
+++#: ../ifconfig.c:465
+++#, c-format
+++msgid "Warning: Interface %s still in DYNAMIC mode.\n"
+++msgstr ""
++ 
++-# ??
++-#: ../ifconfig.c:282
++-msgid "NOTRAILERS "
++-msgstr "NOTRAILERS "
+++#: ../ifconfig.c:523
+++#, c-format
+++msgid "Warning: Interface %s still in BROADCAST mode.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:284
++-msgid "RUNNING "
++-msgstr "BÌ®Í "
+++#: ../ifconfig.c:652
+++#, c-format
+++msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:286
++-msgid "NOARP "
++-msgstr "NEARP "
+++#: ../ifconfig.c:684
+++#, c-format
+++msgid "hw address type `%s' has no handler to set address. failed.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:288
++-msgid "PROMISC "
++-msgstr "PROMISK "
+++#: ../ifconfig.c:693
+++#, c-format
+++msgid "%s: invalid %s address.\n"
+++msgstr "%s: adresa %s je nesprávná.\n"
++ 
++-#: ../ifconfig.c:290
++-msgid "ALLMULTI "
++-msgstr "ALLMULTI "
+++#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
+++#, c-format
+++msgid "No support for INET6 on this system.\n"
+++msgstr "Tento systém nepodporuje INET6.\n"
++ 
++-#: ../ifconfig.c:292
++-msgid "SLAVE "
++-msgstr "SLAVE "
+++#: ../ifconfig.c:780 ../ifconfig.c:871
+++#, c-format
+++msgid "Interface %s not initialized\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:294
++-msgid "MASTER "
++-msgstr "MASTER "
+++#: ../ifconfig.c:792 ../ifconfig.c:882
+++#, fuzzy, c-format
+++msgid "Bad address.\n"
+++msgstr "%s: adresa %s je nesprávná.\n"
++ 
++-#: ../ifconfig.c:296
++-msgid "MULTICAST "
++-msgstr "MULTICAST "
++-
++-#: ../ifconfig.c:299
++-msgid "DYNAMIC "
++-msgstr "DYNAMIC "
++-
++-#: ../ifconfig.c:302
++-#, c-format
++-msgid " MTU:%d  Metric:%d"
++-msgstr " MTU:%d  Metrika:%d"
++-
++-#: ../ifconfig.c:306
++-#, c-format
++-msgid "  Outfill:%d  Keepalive:%d"
++-msgstr "  Outfill:%d  Keepalive:%d"
++-
++-#: ../ifconfig.c:320
++-#, c-format
++-msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
++-msgstr "pøijmutých paketù:%lu chyb:%lu zahozeno:%lu pøeteèení:%lu rámcù:%lu\n"
++-
++-#: ../ifconfig.c:325
++-#, c-format
++-msgid "             compressed:%lu\n"
++-msgstr "             komprimováno:%lu\n"
++-
++-# carrier?
++-#: ../ifconfig.c:329
++-#, c-format
++-msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
++-msgstr "odeslaných paketù:%lu chyb:%lu zahozeno:%lu pøeteèení:%lu pøenos:%lu\n"
++-
++-#: ../ifconfig.c:333
++-#, c-format
++-msgid "          collisions:%lu "
++-msgstr "          kolizí:%lu "
++-
++-#: ../ifconfig.c:335
++-#, c-format
++-msgid "compressed:%lu "
++-msgstr "komprimováno:%lu "
++-
++-#: ../ifconfig.c:337
++-#, c-format
++-msgid "txqueuelen:%d "
++-msgstr "délka odchozí fronty:%d "
++-
++-#: ../ifconfig.c:345
++-#, c-format
++-msgid "Interrupt:%d "
++-msgstr "Pøeru¹ení:%d "
++-
++-#. Only print devices using it for
++-#. I/O maps
++-#: ../ifconfig.c:348
++-#, c-format
++-msgid "Base address:0x%x "
++-msgstr "Vstupnì/Výstupní port:0x%x "
++-
++-#: ../ifconfig.c:350
++-#, c-format
++-msgid "Memory:%lx-%lx "
++-msgstr "Pamì»:%lx-%lx "
++-
++-#: ../ifconfig.c:353
++-#, c-format
++-msgid "DMA chan:%x "
++-msgstr "Kanál DMA:%x "
++-
++-#: ../ifconfig.c:384 ../ifconfig.c:405
++-#, c-format
++-msgid "%s: unknown interface: %s\n"
++-msgstr "%s: rozhraní %s není známo\n"
++-
++-#: ../ifconfig.c:421
++-msgid ""
++-"Usage:\n"
++-"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <address>]\n"
++-msgstr ""
++-"Pou¾ití:\n"
++-"  ifconfig [-a] [-i] [-v] <rozhraní> [[<AF>] <adresa>]\n"
++-
++-#: ../ifconfig.c:425
++-msgid "  [add <address>[/<prefixlen>]]\n"
++-msgstr "  [add <adresa>[/<délka prefixu>]]\n"
++-
++-#: ../ifconfig.c:427
++-msgid "  [del <address>[/<prefixlen>]]\n"
++-msgstr "  [del <adresa>[/<délka prefixu>]]\n"
++-
++-#: ../ifconfig.c:432
++-msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
++-msgstr "  [[-]broadcast [<adresa>]]  [[-]pointopoint [<adresa>]]\n"
++-
++-#: ../ifconfig.c:433
++-msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
++-msgstr "  [netmask <adresa>]  [dstaddr <adresa>]  [tunnel <adresa>]\n"
++-
++-#: ../ifconfig.c:436
++-msgid "  [outfill <NN>] [keepalive <NN>]\n"
++-msgstr "  [outfill <NN>] [keepalive <NN>]\n"
++-
++-#: ../ifconfig.c:438
++-msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
++-msgstr "  [hw <HW> <adresa>]  [metric <NN>]  [mtu <NN>]\n"
++-
++-#: ../ifconfig.c:439
++-msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
++-msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
++-
++-#: ../ifconfig.c:440
++-msgid "  [multicast]  [[-]promisc]\n"
++-msgstr "  [multicast]  [[-]promisc]\n"
++-
++-#: ../ifconfig.c:441
++-msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
++-msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <typ>]\n"
++-
++-#: ../ifconfig.c:443
++-msgid "  [txqueuelen <NN>]\n"
++-msgstr "  [txqueuelen délka]\n"
++-
++-#: ../ifconfig.c:446
++-msgid "  [[-]dynamic]\n"
++-msgstr "  [[-]dynamic]\n"
++-
++-#: ../ifconfig.c:448
++-msgid ""
++-"  [up|down] ...\n"
++-"\n"
++-msgstr ""
++-"  [up|down] ...\n"
++-"\n"
++-
++-#: ../ifconfig.c:450
++-msgid "  <HW>=Hardware Type.\n"
++-msgstr "   <HW>=Hardwarový Typ.\n"
++-
++-#: ../ifconfig.c:451
++-msgid "  List of possible hardware types:\n"
++-msgstr "  Seznam mo¾ných hardwarových typù:\n"
++-
++-#. 1 = ARPable
++-#: ../ifconfig.c:453
++-#, c-format
++-msgid "  <AF>=Address family. Default: %s\n"
++-msgstr "   <AF>=tøída adres. Implicitní: %s\n"
++-
++-#: ../ifconfig.c:454
++-msgid "  List of possible address families:\n"
++-msgstr "  Seznam mo¾ných tøíd adres:\n"
++-
++-#: ../ifconfig.c:593
++-msgid "Unknown media type.\n"
++-msgstr "Neznámý typ média.\n"
++-
++-#: ../ifconfig.c:881
+++#: ../ifconfig.c:885
++ #, c-format
++-msgid "%s: invalid %s address.\n"
++-msgstr "%s: adresa %s je nesprávná.\n"
++-
++-#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011
++-msgid "No support for INET6 on this system.\n"
++-msgstr "Tento systém nepodporuje INET6.\n"
++-
++-#: ../ifconfig.c:983
++ msgid "Address deletion not supported on this system.\n"
++ msgstr "Tento systém nepodporuje mazání adres.\n"
++ 
++-#: ../ifconfig.c:1066
++-msgid "No support for INET on this system.\n"
++-msgstr "Tento systém nepodporuje INET.\n"
+++#: ../ifconfig.c:957
+++#, fuzzy, c-format
+++msgid "ifconfig: Cannot set address for this protocol family.\n"
+++msgstr "Nevím, jak nastavit adresu tøídy %d.\n"
++ 
++-#: ../ifconfig.c:1076
+++#: ../ifconfig.c:983
+++#, c-format
++ msgid "No support for ECONET on this system.\n"
++ msgstr "Tento systém nepodporuje ECONET.\n"
++ 
++-#: ../ifconfig.c:1084
+++#: ../ifconfig.c:991
++ #, c-format
++ msgid "Don't know how to set addresses for family %d.\n"
++ msgstr "Nevím, jak nastavit adresu tøídy %d.\n"
++ 
++-#: ../netstat.c:383
+++#: ../ifconfig.c:1021
+++#, c-format
+++msgid "WARNING: at least one error occured. (%d)\n"
+++msgstr ""
+++
+++#: ../netstat.c:434
++ #, c-format
++ msgid ""
++ "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
++@@ -792,7 +704,8 @@ msgstr ""
++ "jste\n"
++ "byl superu¾ivatelem)\n"
++ 
++-#: ../netstat.c:387
+++#: ../netstat.c:438
+++#, c-format
++ msgid ""
++ "(Not all processes could be identified, non-owned process info\n"
++ " will not be shown, you would have to be root to see it all.)\n"
++@@ -801,199 +714,223 @@ msgstr ""
++ "pouze o procesech, jich¾ jste vlastníkem. Aby jste mohl vidìt v¹e, musel\n"
++ "byste být superu¾ivatelem.)\n"
++ 
++-#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166
+++#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
++ msgid "LISTENING"
++ msgstr "NASLOUCHÁ"
++ 
++-#: ../netstat.c:395
+++#: ../netstat.c:446
++ msgid "CONN SENT"
++ msgstr "CONN ODESLÁN"
++ 
++-#: ../netstat.c:396 ../netstat.c:1168
+++#: ../netstat.c:447 ../netstat.c:1268
++ msgid "DISC SENT"
++ msgstr "DISC ODESLÁN"
++ 
++-#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169
+++#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
++ msgid "ESTABLISHED"
++ msgstr "SPOJENO"
++ 
++-#: ../netstat.c:419
+++#: ../netstat.c:470
+++#, c-format
++ msgid "Active NET/ROM sockets\n"
++ msgstr "Aktivní NET/ROM sokety\n"
++ 
++-#: ../netstat.c:420
+++#: ../netstat.c:471
+++#, c-format
++ msgid ""
++-"User       Dest       Source     Device  State        Vr/Vs    Send-Q  "
++-"Recv-Q\n"
+++"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
+++"Q\n"
++ msgstr ""
++-"U¾ivatel   Cíl        Zdroj      Zaøízení Stav        Vr/Vs    Odch-F "
++-"Pøích-F\n"
+++"U¾ivatel   Cíl        Zdroj      Zaøízení Stav        Vr/Vs    Odch-F Pøích-"
+++"F\n"
++ 
++-#: ../netstat.c:430 ../netstat.c:1208
+++#: ../netstat.c:481 ../netstat.c:1308
++ #, c-format
++ msgid "Problem reading data from %s\n"
++ msgstr "Chyba pøi ètení dat z %s\n"
++ 
++ # následující radìji ponechat v originále ?!
++-#: ../netstat.c:465
+++#: ../netstat.c:516
++ msgid "SYN_SENT"
++ msgstr "SYN_SENT"
++ 
++-#: ../netstat.c:466
+++#: ../netstat.c:517
++ msgid "SYN_RECV"
++ msgstr "SYN_RECV"
++ 
++-#: ../netstat.c:467
+++#: ../netstat.c:518
++ msgid "FIN_WAIT1"
++ msgstr "FIN_WAIT1"
++ 
++-#: ../netstat.c:468
+++#: ../netstat.c:519
++ msgid "FIN_WAIT2"
++ msgstr "FIN_WAIT2"
++ 
++-#: ../netstat.c:469
+++#: ../netstat.c:520
++ msgid "TIME_WAIT"
++ msgstr "TIME_WAIT"
++ 
++-#: ../netstat.c:470
+++#: ../netstat.c:521
++ msgid "CLOSE"
++ msgstr "ZAVØEN"
++ 
++-#: ../netstat.c:471
+++#: ../netstat.c:522
++ msgid "CLOSE_WAIT"
++ msgstr "CLOSE_WAIT"
++ 
++-#: ../netstat.c:472
+++#: ../netstat.c:523
++ msgid "LAST_ACK"
++ msgstr "POSLEDNÍ ACK"
++ 
++-#: ../netstat.c:473
+++#: ../netstat.c:524
++ msgid "LISTEN"
++ msgstr "LISTEN"
++ 
++-#: ../netstat.c:474
+++#: ../netstat.c:525
++ msgid "CLOSING"
++ msgstr "ZAVíRÁ"
++ 
++-#: ../netstat.c:544
+++#: ../netstat.c:596
++ #, c-format
++ msgid "warning, got bogus igmp6 line %d.\n"
++ msgstr "varování, nesmyslný igmp6 øádek %d.\n"
++ 
++-#: ../netstat.c:549 ../netstat.c:587 ../netstat.c:670 ../netstat.c:803
++-#: ../netstat.c:935 ../netstat.c:940
+++#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
+++#: ../netstat.c:1032 ../netstat.c:1037
++ #, c-format
++ msgid "netstat: unsupported address family %d !\n"
++ msgstr "netstat: tøída adres %d není podporována !\n"
++ 
++-#: ../netstat.c:562 ../netstat.c:567 ../netstat.c:575 ../netstat.c:582
+++#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
++ #, c-format
++ msgid "warning, got bogus igmp line %d.\n"
++ msgstr "varování, nesmyslný igmp øádek %d.\n"
++ 
++-#: ../netstat.c:666
+++#: ../netstat.c:677
+++#, fuzzy, c-format
+++msgid "Active X.25 sockets\n"
+++msgstr "Aktivní AX.25 sokety\n"
+++
+++#. IMHO, Vr/Vs is not very usefull --SF
+++#: ../netstat.c:679
+++#, fuzzy, c-format
+++msgid ""
+++"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
+++"Q\n"
+++msgstr "Cíl        Zdroj      Zaøíz   Stav         Vr/Vs    Odhod-F Pøích-F\n"
+++
+++#: ../netstat.c:759
+++#, c-format
++ msgid "warning, got bogus tcp line.\n"
++ msgstr "varování, nesmyslný tcp øádek.\n"
++ 
++-#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975
+++#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
++ #, c-format
++ msgid "off (0.00/%ld/%d)"
++ msgstr "vyp (0.00/%ld/%d)"
++ 
++-#: ../netstat.c:708
+++#: ../netstat.c:804
++ #, fuzzy, c-format
++ msgid "on (%2.2f/%ld/%d)"
++ msgstr "zap%d (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:713
+++#: ../netstat.c:809
++ #, fuzzy, c-format
++ msgid "keepalive (%2.2f/%ld/%d)"
++ msgstr "zap%d (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:718
+++#: ../netstat.c:814
++ #, fuzzy, c-format
++ msgid "timewait (%2.2f/%ld/%d)"
++ msgstr "zap%d (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985
+++#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
++ #, c-format
++ msgid "unkn-%d (%2.2f/%ld/%d)"
++ msgstr "nezn-%d (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:799
+++#: ../netstat.c:894
+++#, c-format
++ msgid "warning, got bogus udp line.\n"
++ msgstr "varování, nesmyslný udp øádek.\n"
++ 
++-#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108
+++#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
++ msgid "UNKNOWN"
++ msgstr "NEZNÁM"
++ 
++-#: ../netstat.c:860 ../netstat.c:980
+++#: ../netstat.c:958 ../netstat.c:1080
++ #, c-format
++ msgid "on%d (%2.2f/%ld/%d)"
++ msgstr "zap%d (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:949
+++#: ../netstat.c:1046
+++#, c-format
++ msgid "warning, got bogus raw line.\n"
++ msgstr "varování, nesmyslný 'raw' øádek.\n"
++ 
++-#: ../netstat.c:1028
+++#: ../netstat.c:1128
+++#, c-format
++ msgid "warning, got bogus unix line.\n"
++ msgstr "varování, netstat 'unix' øádek.\n"
++ 
++-#: ../netstat.c:1055
+++#: ../netstat.c:1155
++ msgid "STREAM"
++ msgstr "STREAM"
++ 
++-#: ../netstat.c:1059
+++#: ../netstat.c:1159
++ msgid "DGRAM"
++ msgstr "DGRAM"
++ 
++-#: ../netstat.c:1063
+++#: ../netstat.c:1163
++ msgid "RAW"
++ msgstr "RAW"
++ 
++-#: ../netstat.c:1067
+++#: ../netstat.c:1167
++ msgid "RDM"
++ msgstr "RDM"
++ 
++-#: ../netstat.c:1071
+++#: ../netstat.c:1171
++ msgid "SEQPACKET"
++ msgstr "SEQPACKET"
++ 
++-#: ../netstat.c:1080
+++#: ../netstat.c:1180
++ msgid "FREE"
++ msgstr "NEALOKOVÁN"
++ 
++-#: ../netstat.c:1096
+++#: ../netstat.c:1196
++ msgid "CONNECTING"
++ msgstr "SPOJUJE"
++ 
++-#: ../netstat.c:1100
+++#: ../netstat.c:1200
++ msgid "CONNECTED"
++ msgstr "SPOJEN"
++ 
++-#: ../netstat.c:1104
+++#: ../netstat.c:1204
++ msgid "DISCONNECTING"
++ msgstr "ODPOJUJE"
++ 
++-#: ../netstat.c:1135
+++#: ../netstat.c:1235
+++#, c-format
++ msgid "Active UNIX domain sockets "
++ msgstr "Aktivní sokety domény UNIX "
++ 
++-#: ../netstat.c:1137 ../netstat.c:1666
+++#: ../netstat.c:1237 ../netstat.c:1756
+++#, c-format
++ msgid "(servers and established)"
++ msgstr "(servery a navázaná spojení)"
++ 
++-#: ../netstat.c:1140 ../netstat.c:1669
+++#: ../netstat.c:1240 ../netstat.c:1759
+++#, c-format
++ msgid "(only servers)"
++ msgstr "(pouze servery)"
++ 
++-#: ../netstat.c:1142 ../netstat.c:1671
+++#: ../netstat.c:1242 ../netstat.c:1761
+++#, c-format
++ msgid "(w/o servers)"
++ msgstr "(w/o servery)"
++ 
++-#: ../netstat.c:1145
+++#: ../netstat.c:1245
+++#, c-format
++ msgid ""
++ "\n"
++ "Proto RefCnt Flags       Type       State         I-Node"
++@@ -1001,90 +938,92 @@ msgstr ""
++ "\n"
++ "Proto Èítaè  Pøíznaky    Typ        Stav          I-Uzel"
++ 
++-#: ../netstat.c:1147
+++#: ../netstat.c:1247
+++#, c-format
++ msgid " Path\n"
++ msgstr " Cesta\n"
++ 
++-#: ../netstat.c:1167
+++#: ../netstat.c:1267
++ msgid "SABM SENT"
++ msgstr "SABM ODESLÁN"
++ 
++-#: ../netstat.c:1170
+++#: ../netstat.c:1270
++ msgid "RECOVERY"
++ msgstr "OBNOVA"
++ 
++-#: ../netstat.c:1184
+++#: ../netstat.c:1284
+++#, c-format
++ msgid "Active AX.25 sockets\n"
++ msgstr "Aktivní AX.25 sokety\n"
++ 
++-#: ../netstat.c:1185
+++#: ../netstat.c:1285
+++#, c-format
++ msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
++ msgstr "Cíl        Zdroj      Zaøíz   Stav         Vr/Vs    Odhod-F Pøích-F\n"
++ 
++-#: ../netstat.c:1228
+++#: ../netstat.c:1328
++ #, c-format
++ msgid "problem reading data from %s\n"
++ msgstr "chyba pøi ètení dat z %s\n"
++ 
++-#: ../netstat.c:1279
+++#: ../netstat.c:1379
+++#, c-format
++ msgid ""
++ "Active IPX sockets\n"
++ "Proto Recv-Q Send-Q Local Address              Foreign Address            "
++ "State"
++ msgstr ""
++ "Aktivní IPX sokety\n"
++-"Proto Pøích-F Odch-F Lokál adresa              Vzdálená adresa               "
++-" Stav"
+++"Proto Pøích-F Odch-F Lokál adresa              Vzdálená "
+++"adresa                Stav"
++ 
++-#: ../netstat.c:1281
+++#: ../netstat.c:1381
+++#, c-format
++ msgid " User"
++ msgstr " U¾ivatel"
++ 
++-#: ../netstat.c:1315
+++#: ../netstat.c:1415
++ msgid "ESTAB"
++ msgstr "SPOJEN"
++ 
++-#: ../netstat.c:1323
+++#: ../netstat.c:1423
++ msgid "UNK."
++ msgstr "NEZ."
++ 
++-#: ../netstat.c:1367
++-msgid "     - no statistics available -"
++-msgstr "     - statistická data nejsou dostupná -"
++-
++-#: ../netstat.c:1370
++-msgid "[NO FLAGS]"
++-msgstr "[®ÁDNÉ PØÍZNAKY]"
++-
++-#: ../netstat.c:1400
+++#: ../netstat.c:1461
+++#, c-format
++ msgid "Kernel Interface table\n"
++ msgstr "Tabulka rozhraní v jádru\n"
++ 
++-#: ../netstat.c:1401
+++#: ../netstat.c:1465
+++#, fuzzy, c-format
++ msgid ""
++-"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
+++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
++ "Flg\n"
++ msgstr ""
++ "Rozhr   MTU Met    PØ-OK PØ-CHYB PØ-ZAH PØ-PØT   OD-OK OD-CHYB OD-ZAH OD-PØT "
++ "PØZ\n"
++ 
++-#: ../netstat.c:1404
+++#: ../netstat.c:1469
++ msgid "missing interface information"
++ msgstr "chybí informace o rozhraní"
++ 
++-#: ../netstat.c:1425
+++#: ../netstat.c:1492
+++#, c-format
++ msgid ""
++-"usage: netstat [-veenNcCF] [<Af>] -r         netstat "
++-"{-V|--version|-h|--help}\n"
+++"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
+++"help}\n"
++ msgstr ""
++-"Pou¾ití: netstat [--veenNcCF] [<TA>] -r       netstat "
++-"{-V|--version|-h|--help}\n"
+++"Pou¾ití: netstat [--veenNcCF] [<TA>] -r       netstat {-V|--version|-h|--"
+++"help}\n"
++ 
++-#: ../netstat.c:1426
+++#: ../netstat.c:1493
+++#, c-format
++ msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
++ msgstr "         netstat [-vnNcaeol] [<Soket> ...]\n"
++ 
++-#: ../netstat.c:1427
+++#: ../netstat.c:1494
+++#, c-format
++ msgid ""
++ "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
++ "\n"
++@@ -1092,27 +1031,32 @@ msgstr ""
++ "         netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
++ "\n"
++ 
++-#: ../netstat.c:1429
+++#: ../netstat.c:1496
+++#, c-format
++ msgid "        -r, --route              display routing table\n"
++ msgstr "         -r, --route              vypí¹e smìrovací tabulku\n"
++ 
++-#: ../netstat.c:1430
+++#: ../netstat.c:1497
+++#, c-format
++ msgid "        -i, --interfaces         display interface table\n"
++ msgstr "         -i, --interfaces         vypí¹e tabulku rozhraní\n"
++ 
++-#: ../netstat.c:1431
+++#: ../netstat.c:1498
+++#, c-format
++ msgid "        -g, --groups             display multicast group memberships\n"
++ msgstr ""
++ "         -g, --groups             vypí¹e èlenství v multicast skupinách\n"
++ 
++-#: ../netstat.c:1432
+++#: ../netstat.c:1499
+++#, c-format
++ msgid ""
++ "        -s, --statistics         display networking statistics (like SNMP)\n"
++ msgstr ""
++ "         -s, --statistics         vypí¹e statistiku sí»ové aktivity (jako "
++ "SNMP)\n"
++ 
++-#: ../netstat.c:1434
+++#: ../netstat.c:1501
+++#, c-format
++ msgid ""
++ "        -M, --masquerade         display masqueraded connections\n"
++ "\n"
++@@ -1120,20 +1064,45 @@ msgstr ""
++ "         -M, --masquerade         vypí¹e maskovaná spojení\n"
++ "\n"
++ 
++-#: ../netstat.c:1438 ../route.c:87
+++#: ../netstat.c:1505
+++#, fuzzy, c-format
+++msgid "        --numeric-hosts          don't resolve host names\n"
+++msgstr ""
+++"        -n, --numeric            nebude pøevádìt èíselné adresy\n"
+++"                                 na kanonická jména\n"
+++
+++#: ../netstat.c:1506
+++#, fuzzy, c-format
+++msgid "        --numeric-ports          don't resolve port names\n"
+++msgstr ""
+++"        -n, --numeric            nebude pøevádìt èíselné adresy\n"
+++"                                 na kanonická jména\n"
+++
+++#: ../netstat.c:1507
+++#, fuzzy, c-format
+++msgid "        --numeric-users          don't resolve user names\n"
+++msgstr ""
+++"        -n, --numeric            nebude pøevádìt èíselné adresy\n"
+++"                                 na kanonická jména\n"
+++
+++#: ../netstat.c:1508
+++#, c-format
++ msgid "        -N, --symbolic           resolve hardware names\n"
++ msgstr "         -N, --symbolic           pøevede hw jména\n"
++ 
++-#: ../netstat.c:1439 ../route.c:88
+++#: ../netstat.c:1509 ../route.c:88
+++#, c-format
++ msgid "        -e, --extend             display other/more information\n"
++ msgstr "         -e, --extend             vypí¹e podrobnìj¹í informace\n"
++ 
++-#: ../netstat.c:1440
+++#: ../netstat.c:1510
+++#, c-format
++ msgid "        -p, --programs           display PID/Program name for sockets\n"
++ msgstr ""
++ "         -p, --programs           vypí¹e PID/jméno programu pro sokety\n"
++ 
++-#: ../netstat.c:1441
+++#: ../netstat.c:1511
+++#, c-format
++ msgid ""
++ "        -c, --continuous         continuous listing\n"
++ "\n"
++@@ -1141,23 +1110,27 @@ msgstr ""
++ "         -c, --continuous         nepøeru¹ovaný výpis\n"
++ "\n"
++ 
++-#: ../netstat.c:1442
+++#: ../netstat.c:1512
+++#, c-format
++ msgid "        -l, --listening          display listening server sockets\n"
++ msgstr ""
++ "         -l, --listening          vypí¹e sokety, na nich¾ je nasloucháno\n"
++ 
++-#: ../netstat.c:1443
+++#: ../netstat.c:1513
+++#, c-format
++ msgid ""
++ "        -a, --all, --listening   display all sockets (default: connected)\n"
++ msgstr ""
++ "         -a, --all, --listening   vypí¹e v¹echny sokety (implicitnì: "
++ "spojené)\n"
++ 
++-#: ../netstat.c:1444
+++#: ../netstat.c:1514
+++#, c-format
++ msgid "        -o, --timers             display timers\n"
++ msgstr "         -o, --timers             zobrazí èasovaèe\n"
++ 
++-#: ../netstat.c:1445 ../route.c:89
+++#: ../netstat.c:1515 ../route.c:89
+++#, c-format
++ msgid ""
++ "        -F, --fib                display Forwarding Information Base "
++ "(default)\n"
++@@ -1165,112 +1138,126 @@ msgstr ""
++ "         -F, --fib                zobrazí Forwarding Infomation Base\n"
++ "                                  (implicitní)\n"
++ 
++-#: ../netstat.c:1446 ../route.c:90
+++#: ../netstat.c:1516 ../route.c:90
+++#, c-format
++ msgid ""
++ "        -C, --cache              display routing cache instead of FIB\n"
++ "\n"
++ msgstr "         -C, --cache              místo FIB zobrazí smìrovací cache\n"
++ 
++-#: ../netstat.c:1448
+++#: ../netstat.c:1518
+++#, c-format
++ msgid ""
++-"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
++-"--netrom\n"
+++"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
+++"netrom\n"
++ msgstr ""
++-"  <Soket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
++-"--netrom\n"
+++"  <Soket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
+++"netrom\n"
++ 
++-#: ../netstat.c:1449 ../route.c:92
++-#, c-format
++-msgid "  <AF>=Use '-A <af>' or '--<af>' Default: %s\n"
+++#: ../netstat.c:1519
+++#, fuzzy, c-format
+++msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
++ msgstr "   <AF>=Pou¾ijte '-A <af>' or '--<af>' Implicitní: %s\n"
++ 
++-#: ../netstat.c:1450 ../route.c:93
+++#: ../netstat.c:1520 ../route.c:93
+++#, c-format
++ msgid "  List of possible address families (which support routing):\n"
++ msgstr "  Seznam mo¾ných tøíd adres (podporujících smìrování):\n"
++ 
++-#: ../netstat.c:1663
+++#: ../netstat.c:1753
+++#, c-format
++ msgid "Active Internet connections "
++ msgstr "Aktivní Internetová spojení "
++ 
++-#: ../netstat.c:1673
+++#: ../netstat.c:1763
+++#, c-format
++ msgid ""
++ "\n"
++-"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
++-"  "
+++"Proto Recv-Q Send-Q Local Address           Foreign Address         "
+++"State      "
++ msgstr ""
++ "\n"
++ "Proto Pøích-F Odch-F Místní Adresa          Vzdálená Adresa         Stav     "
++ 
++-#: ../netstat.c:1675
+++#: ../netstat.c:1765
+++#, c-format
++ msgid " User       Inode     "
++ msgstr " U¾ivatel   I-uzel    "
++ 
++-#: ../netstat.c:1678
+++#: ../netstat.c:1768
+++#, c-format
++ msgid " Timer"
++ msgstr " Èasovaè"
++ 
++-#: ../netstat.c:1708
+++#: ../netstat.c:1798
+++#, c-format
++ msgid "IPv4 Group Memberships\n"
++ msgstr "Èlenství v IPv4 skupinách\n"
++ 
++-#: ../netstat.c:1709
+++#: ../netstat.c:1799
+++#, c-format
++ msgid "Interface       RefCnt Group\n"
++ msgstr "Rozhraní        Èítaè  Skupina\n"
++ 
++-#: ../rarp.c:43
+++#: ../rarp.c:44
++ msgid "This kernel does not support RARP.\n"
++ msgstr "Toto jádro nepodporuje RARP.\n"
++ 
++-#: ../rarp.c:82
+++#: ../rarp.c:83
++ #, c-format
++ msgid "no RARP entry for %s.\n"
++ msgstr "pro %s neexistuje RARP polo¾ka.\n"
++ 
++-#: ../rarp.c:95
+++#: ../rarp.c:96
++ #, c-format
++ msgid "%s: bad hardware address\n"
++ msgstr "hardwarová adresa %s je nesprávná\n"
++ 
++-#: ../rarp.c:127
+++#: ../rarp.c:128
++ #, c-format
++ msgid "rarp: cannot open file %s:%s.\n"
++ msgstr "rarp: soubor %s:%s nelze otevøít.\n"
++ 
++-#: ../rarp.c:139
+++#: ../rarp.c:140
++ #, c-format
++ msgid "rarp: format error at %s:%u\n"
++ msgstr "rarp: syntaktická chyba na øádku %2$u souboru %1$s\n"
++ 
++-#: ../rarp.c:143 ../rarp.c:287
+++#: ../rarp.c:144 ../rarp.c:289
++ #, c-format
++ msgid "rarp: %s: unknown host\n"
++ msgstr "rarp: poèítaè %s není znám\n"
++ 
++-#: ../rarp.c:146
+++#: ../rarp.c:147
++ #, c-format
++ msgid "rarp: cannot set entry from %s:%u\n"
++ msgstr "rarp: nelze nastavit polo¾ku z øádku %2$u souboru %1$s\n"
++ 
++-#: ../rarp.c:175
+++#: ../rarp.c:176
+++#, c-format
++ msgid "Usage: rarp -a                               list entries in cache.\n"
++ msgstr "Pou¾ití: rarp -a                            vypí¹e polo¾ky z cache.\n"
++ 
++-#: ../rarp.c:176
+++#: ../rarp.c:177
+++#, c-format
++ msgid "       rarp -d <hostname>                    delete entry from cache.\n"
++ msgstr "         rarp -d <jméno>                    sma¾e polo¾ku z cache.\n"
++ 
++-#: ../rarp.c:177
+++#: ../rarp.c:178
+++#, c-format
++ msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
++ msgstr ""
++ "         rarp [<HW>] -s <jméno> <hwadr>       pøidá polo¾ku do cache.\n"
++ 
++-#: ../rarp.c:178
+++#: ../rarp.c:179
+++#, c-format
++ msgid ""
++ "       rarp -f                               add entries from /etc/ethers.\n"
++ msgstr ""
++ "         rarp -f                               pøidá polo¾ky z /etc/ethers.\n"
++ 
++-#: ../rarp.c:179
+++#: ../rarp.c:180
+++#, c-format
++ msgid ""
++ "       rarp -V                               display program version.\n"
++ "\n"
++@@ -1279,24 +1266,26 @@ msgstr ""
++ "programu.\n"
++ "\n"
++ 
++-#: ../rarp.c:236
+++#: ../rarp.c:238
++ #, c-format
++ msgid "%s: illegal option mix.\n"
++ msgstr "Kombinace pøepínaèù %s je nesprávná.\n"
++ 
++-#: ../rarp.c:267
+++#: ../rarp.c:269
++ #, c-format
++ msgid "rarp: %s: unknown hardware type.\n"
++ msgstr "rarp: hardwarový typ %s není znám.\n"
++ 
++-#: ../route.c:79
+++#: ../route.c:80
+++#, c-format
++ msgid ""
++ "Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
++ msgstr ""
++ "Pou¾ití: route [-nNvee] [-FC] [<AF>]         Zobrazí smìrovací tabulky v "
++ "jádru\n"
++ 
++-#: ../route.c:80
+++#: ../route.c:81
+++#, c-format
++ msgid ""
++ "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
++ "\n"
++@@ -1305,14 +1294,16 @@ msgstr ""
++ "AF.\n"
++ "\n"
++ 
++-#: ../route.c:82
+++#: ../route.c:83
+++#, c-format
++ msgid ""
++ "       route {-h|--help} [<AF>]              Detailed usage syntax for "
++ "specified AF.\n"
++ msgstr ""
++ "       route {-h|--help [<AF>]               Nápovìda pro pou¾ití s AF.\n"
++ 
++-#: ../route.c:83
+++#: ../route.c:84
+++#, c-format
++ msgid ""
++ "       route {-V|--version}                  Display version/author and "
++ "exit.\n"
++@@ -1321,15 +1312,23 @@ msgstr ""
++ "       route {-V|--version}                  Vypí¹e oznaèení verze a autora\n"
++ "                                             programu.\n"
++ 
+++#: ../route.c:92
+++#, fuzzy, c-format
+++msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
+++msgstr "   <AF>=Pou¾ijte '-A <af>' or '--<af>' Implicitní: %s\n"
+++
++ #: ../plipconfig.c:66
+++#, c-format
++ msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
++ msgstr "Pou¾ití: plipconfig [-a] [-i] [-v] rozhraní\n"
++ 
++ #: ../plipconfig.c:67
+++#, c-format
++ msgid "                  [nibble NN] [trigger NN]\n"
++ msgstr "                  [nibble NN] [trigger NN]\n"
++ 
++ #: ../plipconfig.c:68
+++#, c-format
++ msgid "       plipconfig -V | --version\n"
++ msgstr "       plipconfig -V | --version\n"
++ 
++@@ -1338,25 +1337,30 @@ msgstr "       plipconfig -V | --version
++ msgid "%s\tnibble %lu  trigger %lu\n"
++ msgstr "%s\tnibble %lu  trigger %lu\n"
++ 
++-#: ../iptunnel.c:79
+++#: ../iptunnel.c:85
+++#, c-format
++ msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
++ msgstr "Pou¾ití: iptunnel { add | change | del | show } [ JMÉNO ]\n"
++ 
++-#: ../iptunnel.c:80
+++#: ../iptunnel.c:86
+++#, c-format
++ msgid ""
++ "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
++ msgstr ""
++ "          [ mode { ipip | gre | sit } ] [ vzdálená ADR ] [ místní ADR ]\n"
++ 
++-#: ../iptunnel.c:81
+++#: ../iptunnel.c:87
+++#, c-format
++ msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
++ msgstr "          [ [i|o]seq ] [ [i|o]key KLÍÈ ] [ [i|o]csum ]\n"
++ 
++-#: ../iptunnel.c:82
+++#: ../iptunnel.c:88
+++#, c-format
++ msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
++ msgstr "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev ZAØÍZENÍ ]\n"
++ 
++-#: ../iptunnel.c:83
+++#: ../iptunnel.c:89
+++#, c-format
++ msgid ""
++ "       iptunnel -V | --version\n"
++ "\n"
++@@ -1364,450 +1368,737 @@ msgstr ""
++ "       iptunnel -V | --version\n"
++ "\n"
++ 
++-#: ../iptunnel.c:84
+++#: ../iptunnel.c:90
+++#, c-format
++ msgid "Where: NAME := STRING\n"
++ msgstr "Kde: JMÉNO := ØETÌZEC\n"
++ 
++-#: ../iptunnel.c:85
+++#: ../iptunnel.c:91
+++#, c-format
++ msgid "       ADDR := { IP_ADDRESS | any }\n"
++ msgstr "       ADR := { IP-ADRESA | any }\n"
++ 
++-#: ../iptunnel.c:86
+++#: ../iptunnel.c:92
+++#, c-format
++ msgid "       TOS  := { NUMBER | inherit }\n"
++ msgstr "       TOS  := { ÈÍSLO | inherit }\n"
++ 
++-#: ../iptunnel.c:87
+++#: ../iptunnel.c:93
+++#, c-format
++ msgid "       TTL  := { 1..255 | inherit }\n"
++ msgstr "       TTL  := { 1..255 | inherit }\n"
++ 
++-#: ../iptunnel.c:88
+++#: ../iptunnel.c:94
+++#, c-format
++ msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
++ msgstr "       KLÍÈ  := { DOTTED_QUAD | ÈÍSLO }\n"
++ 
++-#: ../iptunnel.c:326
+++#: ../iptunnel.c:332
+++#, c-format
++ msgid "Keys are not allowed with ipip and sit.\n"
++ msgstr "S ipip a sit nejsou klíèe povoleny.\n"
++ 
++-#: ../iptunnel.c:346
+++#: ../iptunnel.c:352
+++#, c-format
++ msgid "Broadcast tunnel requires a source address.\n"
++ msgstr "Tunel se v¹esmìrovým vysíláním vy¾aduje zdrojovou adresu.\n"
++ 
++-#: ../iptunnel.c:361
+++#: ../iptunnel.c:367
+++#, c-format
++ msgid "ttl != 0 and noptmudisc are incompatible\n"
++ msgstr "ttl != 0 a noptmudisc se navzájem vyluèují\n"
++ 
++-#: ../iptunnel.c:373
+++#: ../iptunnel.c:379
+++#, c-format
++ msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
++ msgstr "re¾im tunelu (ipip, gre èi sit) nelze zjistit\n"
++ 
++-#: ../iptunnel.c:411
+++#: ../iptunnel.c:417
++ #, c-format
++ msgid "%s: %s/ip  remote %s  local %s "
++ msgstr "%s: %s/ip  vzdálený %s  místní %s "
++ 
++-#: ../iptunnel.c:415
+++#: ../iptunnel.c:421
++ msgid "unknown"
++ msgstr "Neznám."
++ 
++-#: ../iptunnel.c:447
+++#: ../iptunnel.c:453
+++#, c-format
++ msgid "  Drop packets out of sequence.\n"
++ msgstr "  Zahazuje pakety mimo poøadí.\n"
++ 
++-#: ../iptunnel.c:449
+++#: ../iptunnel.c:455
+++#, c-format
++ msgid "  Checksum in received packet is required.\n"
++ msgstr "  Pøijímané pakety musí mít kontrolní souèet.\n"
++ 
++ # ???
++-#: ../iptunnel.c:451
+++#: ../iptunnel.c:457
+++#, c-format
++ msgid "  Sequence packets on output.\n"
++ msgstr "  Øadí odchozí pakety.\n"
++ 
++-#: ../iptunnel.c:453
+++#: ../iptunnel.c:459
+++#, c-format
++ msgid "  Checksum output packets.\n"
++ msgstr "  Odchozí pakety budou mít kontrolní souèet.\n"
++ 
++-#: ../iptunnel.c:481
+++#: ../iptunnel.c:487
+++#, c-format
++ msgid "Wrong format of /proc/net/dev. Sorry.\n"
++ msgstr "Lituji, formát /proc/net/dev je chybný.\n"
++ 
++-#: ../iptunnel.c:494
+++#: ../iptunnel.c:500
++ #, c-format
++ msgid "Failed to get type of [%s]\n"
++ msgstr "Typ [%s] se nepodaøilo zjistit.\n"
++ 
++-#: ../iptunnel.c:510
+++#: ../iptunnel.c:516
+++#, c-format
++ msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
++ msgstr "RX: Pakety     Bajty        Chyby  CsumChyb MimoPoø  Mcasts\n"
++ 
++-#: ../iptunnel.c:513
+++#: ../iptunnel.c:519
+++#, c-format
++ msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
++ msgstr "TX: Pakety     Bajty        Chyby  DeadLoop NoRoute  NoBufs\n"
++ 
++-#: ../statistics.c:45
+++#: ../statistics.c:47
++ msgid "ICMP input histogram:"
++ msgstr "histogram ICMP vstupu:"
++ 
++-#: ../statistics.c:46
+++#: ../statistics.c:48
++ msgid "ICMP output histogram:"
++ msgstr "histogram ICMP výstupu:"
++ 
++-#: ../statistics.c:63
+++#: ../statistics.c:65
++ #, c-format
++ msgid "Forwarding is %s"
++ msgstr "Pøedávání je %s"
++ 
++-#: ../statistics.c:64
++-#, c-format
++-msgid "Default TTL is %d"
+++#: ../statistics.c:66
+++#, fuzzy, c-format
+++msgid "Default TTL is %u"
++ msgstr "Implicitní TTL je %d"
++ 
++-#: ../statistics.c:65
++-#, c-format
++-msgid "%d total packets received"
+++#: ../statistics.c:67
+++#, fuzzy, c-format
+++msgid "%u total packets received"
++ msgstr "celkem pøijmutých paketù: %d"
++ 
++-#: ../statistics.c:66
++-#, c-format
++-msgid "%d with invalid headers"
+++#: ../statistics.c:68
+++#, fuzzy, c-format
+++msgid "%u with invalid headers"
++ msgstr "s nesprávnými hlavièkami: %d"
++ 
++-#: ../statistics.c:67
++-#, c-format
++-msgid "%d with invalid addresses"
+++#: ../statistics.c:69
+++#, fuzzy, c-format
+++msgid "%u with invalid addresses"
++ msgstr "s nesprávnými adresami: %d"
++ 
++-#: ../statistics.c:68
++-#, c-format
++-msgid "%d forwarded"
+++#: ../statistics.c:70
+++#, fuzzy, c-format
+++msgid "%u forwarded"
++ msgstr "pøedáno: %d"
++ 
++-#: ../statistics.c:69
++-#, c-format
++-msgid "%d with unknown protocol"
+++#: ../statistics.c:71
+++#, fuzzy, c-format
+++msgid "%u with unknown protocol"
++ msgstr "s neznámým protokolem: %d"
++ 
++-#: ../statistics.c:70
++-#, c-format
++-msgid "%d incoming packets discarded"
+++#: ../statistics.c:72
+++#, fuzzy, c-format
+++msgid "%u incoming packets discarded"
++ msgstr "poèet zahozených pøíchozích paketù: %d"
++ 
++-#: ../statistics.c:71
++-#, c-format
++-msgid "%d incoming packets delivered"
+++#: ../statistics.c:73
+++#, fuzzy, c-format
+++msgid "%u incoming packets delivered"
++ msgstr "poèet doruèených pøíchozích paketù: %d"
++ 
++-#: ../statistics.c:72
++-#, c-format
++-msgid "%d requests sent out"
+++#: ../statistics.c:74
+++#, fuzzy, c-format
+++msgid "%u requests sent out"
++ msgstr "poèet odeslaných po¾adavkù: %d"
++ 
++ #. ?
++-#: ../statistics.c:73
++-#, c-format
++-msgid "%d outgoing packets dropped"
+++#: ../statistics.c:75
+++#, fuzzy, c-format
+++msgid "%u outgoing packets dropped"
++ msgstr "poèet zahozených odchozích paketù: %d"
++ 
++-#: ../statistics.c:74
++-#, c-format
++-msgid "%d dropped because of missing route"
+++#: ../statistics.c:76
+++#, fuzzy, c-format
+++msgid "%u dropped because of missing route"
++ msgstr "zahozeno kvùli chybìjící cestì: %d"
++ 
++-#: ../statistics.c:75
++-#, c-format
++-msgid "%d fragments dropped after timeout"
+++#: ../statistics.c:77
+++#, fuzzy, c-format
+++msgid "%u fragments dropped after timeout"
++ msgstr "poèet fragmentù zahozených po vypr¹ení èasu: %d"
++ 
++-#: ../statistics.c:76
++-#, c-format
++-msgid "%d reassemblies required"
+++#: ../statistics.c:78
+++#, fuzzy, c-format
+++msgid "%u reassemblies required"
++ msgstr "poèet nutných znovusestavení: %d"
++ 
++ #. ?
++-#: ../statistics.c:77
++-#, c-format
++-msgid "%d packets reassembled ok"
+++#: ../statistics.c:79
+++#, fuzzy, c-format
+++msgid "%u packets reassembled ok"
++ msgstr "poèet v poøádku znovu sestavených paketù: %d"
++ 
++-#: ../statistics.c:78
++-#, c-format
++-msgid "%d packet reassembles failed"
+++#: ../statistics.c:80
+++#, fuzzy, c-format
+++msgid "%u packet reassembles failed"
++ msgstr "poèet paketù, je¾ se nepodaøilo znovu sestavit: %d"
++ 
++-#: ../statistics.c:79
++-#, c-format
++-msgid "%d fragments received ok"
+++#: ../statistics.c:81
+++#, fuzzy, c-format
+++msgid "%u fragments received ok"
++ msgstr "poèet v poøádku pøijmutých fragmentù: %d"
++ 
++-#: ../statistics.c:80
++-#, c-format
++-msgid "%d fragments failed"
+++#: ../statistics.c:82
+++#, fuzzy, c-format
+++msgid "%u fragments failed"
++ msgstr "poèet chybných fragmentù: %d"
++ 
++-#: ../statistics.c:81
++-#, c-format
++-msgid "%d fragments created"
+++#: ../statistics.c:83
+++#, fuzzy, c-format
+++msgid "%u fragments created"
++ msgstr "poèet vytvoøených fragmentù: %d"
++ 
++-#: ../statistics.c:86
++-#, c-format
++-msgid "%d ICMP messages received"
+++#: ../statistics.c:88
+++#, fuzzy, c-format
+++msgid "%u ICMP messages received"
++ msgstr "poèet pøijmutých ICMP zpráv: %d"
++ 
++-#: ../statistics.c:87
++-#, c-format
++-msgid "%d input ICMP message failed."
+++#: ../statistics.c:89
+++#, fuzzy, c-format
+++msgid "%u input ICMP message failed."
++ msgstr "poèet chybných pøíchozích ICMP zpráv: %d"
++ 
++-#: ../statistics.c:88 ../statistics.c:101
++-#, c-format
++-msgid "destination unreachable: %d"
+++#: ../statistics.c:90 ../statistics.c:103
+++#, fuzzy, c-format
+++msgid "destination unreachable: %u"
++ msgstr "adresát nedostupný: %d"
++ 
++-#: ../statistics.c:89
++-#, c-format
++-msgid "timeout in transit: %d"
+++#: ../statistics.c:91
+++#, fuzzy, c-format
+++msgid "timeout in transit: %u"
++ msgstr "vypr¹el èas pøi pøenosu: %d"
++ 
++-#: ../statistics.c:90 ../statistics.c:103
++-#, c-format
++-msgid "wrong parameters: %d"
+++#: ../statistics.c:92 ../statistics.c:105
+++#, fuzzy, c-format
+++msgid "wrong parameters: %u"
++ msgstr "chybné parametry: %d"
++ 
++ #. ?
++-#: ../statistics.c:91
++-#, c-format
++-msgid "source quenchs: %d"
+++#: ../statistics.c:93
+++#, fuzzy, c-format
+++msgid "source quenches: %u"
++ msgstr "øízení toku dat: %d"
++ 
++-#: ../statistics.c:92
++-#, c-format
++-msgid "redirects: %d"
+++#: ../statistics.c:94
+++#, fuzzy, c-format
+++msgid "redirects: %u"
++ msgstr "zmìna cesty: %d"
++ 
++-#: ../statistics.c:93
++-#, c-format
++-msgid "echo requests: %d"
+++#: ../statistics.c:95
+++#, fuzzy, c-format
+++msgid "echo requests: %u"
++ msgstr "¾ádost o echo: %d"
++ 
++-#: ../statistics.c:94 ../statistics.c:107
++-#, c-format
++-msgid "echo replies: %d"
+++#: ../statistics.c:96 ../statistics.c:109
+++#, fuzzy, c-format
+++msgid "echo replies: %u"
++ msgstr "odpovìï na ¾ádost o echo: %d"
++ 
++-#: ../statistics.c:95
++-#, c-format
++-msgid "timestamp request: %d"
+++#: ../statistics.c:97
+++#, fuzzy, c-format
+++msgid "timestamp request: %u"
++ msgstr "¾ádost o èas: %d"
++ 
++-#: ../statistics.c:96
++-#, c-format
++-msgid "timestamp reply: %d"
+++#: ../statistics.c:98
+++#, fuzzy, c-format
+++msgid "timestamp reply: %u"
++ msgstr "odpovìï na ¾ádost o èas: %d"
++ 
++-#: ../statistics.c:97
++-#, c-format
++-msgid "address mask request: %d"
+++#: ../statistics.c:99
+++#, fuzzy, c-format
+++msgid "address mask request: %u"
++ msgstr "¾ádost o masku podsítì: %d"
++ 
++ #. ?
++-#: ../statistics.c:98
++-msgid "address mask replies"
++-msgstr "odpovìdi na ¾ádost o masku podsítì"
+++#: ../statistics.c:100 ../statistics.c:113
+++#, fuzzy, c-format
+++msgid "address mask replies: %u"
+++msgstr "odpovìï na ¾ádost o masku podsítì: %d"
++ 
++ #. ?
++-#: ../statistics.c:99
++-#, c-format
++-msgid "%d ICMP messages sent"
+++#: ../statistics.c:101
+++#, fuzzy, c-format
+++msgid "%u ICMP messages sent"
++ msgstr "poèet odeslaných ICMP zpráv: %d"
++ 
++-#: ../statistics.c:100
++-#, c-format
++-msgid "%d ICMP messages failed"
+++#: ../statistics.c:102
+++#, fuzzy, c-format
+++msgid "%u ICMP messages failed"
++ msgstr "poèet chybných ICMP zpráv: %d"
++ 
++-#: ../statistics.c:102
++-#, c-format
++-msgid "time exceeded: %d"
+++#: ../statistics.c:104
+++#, fuzzy, c-format
+++msgid "time exceeded: %u"
++ msgstr "vypr¹ení ¾ivotnosti: %d"
++ 
++ #. ?
++-#: ../statistics.c:104
++-#, c-format
++-msgid "source quench: %d"
+++#: ../statistics.c:106
+++#, fuzzy, c-format
+++msgid "source quench: %u"
++ msgstr "øízení toku dat: %d"
++ 
++-#: ../statistics.c:105
++-#, c-format
++-msgid "redirect: %d"
+++#: ../statistics.c:107
+++#, fuzzy, c-format
+++msgid "redirect: %u"
++ msgstr "zmìna cesty: %d"
++ 
++-#: ../statistics.c:106
++-#, c-format
++-msgid "echo request: %d"
+++#: ../statistics.c:108
+++#, fuzzy, c-format
+++msgid "echo request: %u"
++ msgstr "¾ádost o echo: %d"
++ 
++-#: ../statistics.c:108
++-#, c-format
++-msgid "timestamp requests: %d"
+++#: ../statistics.c:110
+++#, fuzzy, c-format
+++msgid "timestamp requests: %u"
++ msgstr "¾ádost o èas: %d"
++ 
++-#: ../statistics.c:109
++-#, c-format
++-msgid "timestamp replies: %d"
+++#: ../statistics.c:111
+++#, fuzzy, c-format
+++msgid "timestamp replies: %u"
++ msgstr "odpovìï na ¾ádost o èas: %d"
++ 
++-#: ../statistics.c:110
++-#, c-format
++-msgid "address mask requests: %d"
+++#: ../statistics.c:112
+++#, fuzzy, c-format
+++msgid "address mask requests: %u"
++ msgstr "¾ádost o masku podsítì: %d"
++ 
++-#: ../statistics.c:111
++-#, c-format
++-msgid "address mask replies: %d"
++-msgstr "odpovìï na ¾ádost o masku podsítì: %d"
++-
++-#: ../statistics.c:116
+++#: ../statistics.c:118
++ #, c-format
++ msgid "RTO algorithm is %s"
++ msgstr "RTO algoritmus je %s"
++ 
++-#: ../statistics.c:120
++-#, c-format
++-msgid "%d active connections openings"
+++#: ../statistics.c:122
+++#, fuzzy, c-format
+++msgid "%u active connections openings"
++ msgstr "poèet aktivnì navázaných spojení: %d"
++ 
++-#: ../statistics.c:121
++-#, c-format
++-msgid "%d passive connection openings"
+++#: ../statistics.c:123
+++#, fuzzy, c-format
+++msgid "%u passive connection openings"
++ msgstr "poèet pasivnì navázaných spojení: %d"
++ 
++-#: ../statistics.c:122
++-#, c-format
++-msgid "%d failed connection attempts"
+++#: ../statistics.c:124
+++#, fuzzy, c-format
+++msgid "%u failed connection attempts"
++ msgstr "poèet neúspì¹ných pokusù o spojení: %d"
++ 
++-#: ../statistics.c:123
++-#, c-format
++-msgid "%d connection resets received"
+++#: ../statistics.c:125
+++#, fuzzy, c-format
+++msgid "%u connection resets received"
++ msgstr "poèet pøijmutých resetù: %d"
++ 
++-#: ../statistics.c:124
++-#, c-format
++-msgid "%d connections established"
+++#: ../statistics.c:126
+++#, fuzzy, c-format
+++msgid "%u connections established"
++ msgstr "poèet navázaných spojení: %d"
++ 
++-#: ../statistics.c:125
++-#, c-format
++-msgid "%d segments received"
+++#: ../statistics.c:127
+++#, fuzzy, c-format
+++msgid "%u segments received"
++ msgstr "poèet pøijmutých segmentù: %d"
++ 
++-#: ../statistics.c:126
++-#, c-format
++-msgid "%d segments send out"
+++#: ../statistics.c:128
+++#, fuzzy, c-format
+++msgid "%u segments send out"
++ msgstr "poèet odeslaných segmentù: %d"
++ 
++-#: ../statistics.c:127
++-#, c-format
++-msgid "%d segments retransmited"
+++#: ../statistics.c:129
+++#, fuzzy, c-format
+++msgid "%u segments retransmited"
++ msgstr "poèet pøenesených segmentù: %d"
++ 
++-#: ../statistics.c:128
++-#, c-format
++-msgid "%d bad segments received."
+++#: ../statistics.c:130
+++#, fuzzy, c-format
+++msgid "%u bad segments received."
++ msgstr "poèet chybných pøíchozích segmentù: %d."
++ 
++-#: ../statistics.c:129
++-#, c-format
++-msgid "%d resets sent"
+++#: ../statistics.c:131
+++#, fuzzy, c-format
+++msgid "%u resets sent"
++ msgstr "poèet odeslaných resetù: %d"
++ 
++-#: ../statistics.c:134
++-#, c-format
++-msgid "%d packets received"
+++#: ../statistics.c:136
+++#, fuzzy, c-format
+++msgid "%u packets received"
++ msgstr "poèet pøijmutých paketù: %d"
++ 
++-#: ../statistics.c:135
++-#, c-format
++-msgid "%d packets to unknown port received."
+++#: ../statistics.c:137
+++#, fuzzy, c-format
+++msgid "%u packets to unknown port received."
++ msgstr "poèet paketù pøijmutých pro neznámý port: %d."
++ 
++-#: ../statistics.c:136
++-#, c-format
++-msgid "%d packet receive errors"
+++#: ../statistics.c:138
+++#, fuzzy, c-format
+++msgid "%u packet receive errors"
++ msgstr "poèet chyb pøi pøíjmu paketù: %d"
++ 
++-#: ../statistics.c:137
++-#, c-format
++-msgid "%d packets sent"
+++#: ../statistics.c:139
+++#, fuzzy, c-format
+++msgid "%u packets sent"
++ msgstr "poèet odeslaných paketù: %d"
++ 
++-#: ../statistics.c:142
++-#, c-format
++-msgid "%d SYN cookies sent"
+++#: ../statistics.c:144
+++#, fuzzy, c-format
+++msgid "%u SYN cookies sent"
++ msgstr "poèet odeslaných SYN cookies: %d"
++ 
++-#: ../statistics.c:143
++-#, c-format
++-msgid "%d SYN cookies received"
+++#: ../statistics.c:145
+++#, fuzzy, c-format
+++msgid "%u SYN cookies received"
++ msgstr "poèet pøijmutých SYN cookies: %d"
++ 
++-#: ../statistics.c:144
++-#, c-format
++-msgid "%d invalid SYN cookies received"
+++#: ../statistics.c:146
+++#, fuzzy, c-format
+++msgid "%u invalid SYN cookies received"
++ msgstr "poèet chybných pøíchozích SYN cookies: %d"
++ 
++-#: ../statistics.c:146
++-#, c-format
++-msgid "%d resets received for embryonic SYN_RECV sockets"
+++#: ../statistics.c:148
+++#, fuzzy, c-format
+++msgid "%u resets received for embryonic SYN_RECV sockets"
++ msgstr "poèet resetù pøijmutých pro sokety ve stavu SYN_PØÍCH: %d"
++ 
++-#: ../statistics.c:148
++-#, c-format
++-msgid "%d packets pruned from receive queue because of socket buffer overrun"
+++#: ../statistics.c:150
+++#, fuzzy, c-format
+++msgid "%u packets pruned from receive queue because of socket buffer overrun"
++ msgstr "poèet paketù odstranìných z fronty kvùli pøeteèení bufferu soketu: %d"
++ 
++ #. obsolete: 2.2.0 doesn't do that anymore
++-#: ../statistics.c:151
++-#, c-format
++-msgid "%d packets pruned from out-of-order queue"
+++#: ../statistics.c:153
+++#, fuzzy, c-format
+++msgid "%u packets pruned from receive queue"
++ msgstr "poèet paketù odstranìných z fronty mimo-poøadí: %d"
++ 
++-#: ../statistics.c:152
++-#, c-format
+++#: ../statistics.c:154
+++#, fuzzy, c-format
++ msgid ""
++-"%d packets dropped from out-of-order queue because of socket buffer overrun"
+++"%u packets dropped from out-of-order queue because of socket buffer overrun"
++ msgstr ""
++ "poèet paketù zahozených z fronty mimo-poøadí kvùli pøeteèení bufferu soketu: "
++ "%d"
++ 
++-#: ../statistics.c:154
++-#, c-format
++-msgid "%d ICMP packets dropped because they were out-of-window"
+++#: ../statistics.c:156
+++#, fuzzy, c-format
+++msgid "%u ICMP packets dropped because they were out-of-window"
++ msgstr "poèet ICMP paketù zahozených, proto¾e byly mimo-okno: %d"
++ 
++-#: ../statistics.c:156
++-#, c-format
++-msgid "%d ICMP packets dropped because socket was locked"
+++#: ../statistics.c:158
+++#, fuzzy, c-format
+++msgid "%u ICMP packets dropped because socket was locked"
++ msgstr "poèet ICMP paketù zahozených kvùli zamèenému soketu: %d"
++ 
+++#: ../statistics.c:160
+++#, c-format
+++msgid "%u TCP sockets finished time wait in fast timer"
+++msgstr ""
+++
+++#: ../statistics.c:161
+++#, c-format
+++msgid "%u time wait sockets recycled by time stamp"
+++msgstr ""
+++
+++#: ../statistics.c:162
+++#, c-format
+++msgid "%u TCP sockets finished time wait in slow timer"
+++msgstr ""
+++
+++#: ../statistics.c:163
+++#, c-format
+++msgid "%u passive connections rejected because of time stamp"
+++msgstr ""
+++
+++#: ../statistics.c:165
+++#, c-format
+++msgid "%u active connections rejected because of time stamp"
+++msgstr ""
+++
+++#: ../statistics.c:167
+++#, c-format
+++msgid "%u packets rejects in established connections because of timestamp"
+++msgstr ""
+++
+++#: ../statistics.c:169
+++#, fuzzy, c-format
+++msgid "%u delayed acks sent"
+++msgstr "poèet odeslaných paketù: %d"
+++
+++#: ../statistics.c:170
+++#, c-format
+++msgid "%u delayed acks further delayed because of locked socket"
+++msgstr ""
+++
+++#: ../statistics.c:172
+++#, c-format
+++msgid "Quick ack mode was activated %u times"
+++msgstr ""
+++
+++#: ../statistics.c:173
+++#, c-format
+++msgid "%u times the listen queue of a socket overflowed"
+++msgstr ""
+++
+++#: ../statistics.c:175
+++#, c-format
+++msgid "%u SYNs to LISTEN sockets ignored"
+++msgstr ""
+++
+++#: ../statistics.c:176
+++#, c-format
+++msgid "%u packets directly queued to recvmsg prequeue."
+++msgstr ""
+++
+++#: ../statistics.c:178
+++#, c-format
+++msgid "%u of bytes directly received from backlog"
+++msgstr ""
+++
+++#: ../statistics.c:180
+++#, c-format
+++msgid "%u of bytes directly received from prequeue"
+++msgstr ""
+++
+++#: ../statistics.c:182
+++#, fuzzy, c-format
+++msgid "%u packets dropped from prequeue"
+++msgstr "poèet paketù odstranìných z fronty mimo-poøadí: %d"
+++
+++#: ../statistics.c:183
+++#, fuzzy, c-format
+++msgid "%u packet headers predicted"
+++msgstr "poèet pøijmutých paketù: %d"
+++
+++#: ../statistics.c:184
+++#, c-format
+++msgid "%u packets header predicted and directly queued to user"
+++msgstr ""
+++
+++#: ../statistics.c:186
+++#, c-format
+++msgid "Ran %u times out of system memory during packet sending"
+++msgstr ""
+++
+++#: ../statistics.c:188
+++#, fuzzy, c-format
+++msgid "%u acknowledgments not containing data received"
+++msgstr "poèet paketù pøijmutých pro neznámý port: %d."
+++
+++#: ../statistics.c:189
+++#, c-format
+++msgid "%u predicted acknowledgments"
+++msgstr ""
+++
+++#: ../statistics.c:190
+++#, c-format
+++msgid "%u times recovered from packet loss due to fast retransmit"
+++msgstr ""
+++
+++#: ../statistics.c:191
+++#, c-format
+++msgid "%u times recovered from packet loss due to SACK data"
+++msgstr ""
+++
+++#: ../statistics.c:192
+++#, fuzzy, c-format
+++msgid "%u bad SACKs received"
+++msgstr "poèet chybných pøíchozích segmentù: %d."
+++
+++#: ../statistics.c:193
+++#, c-format
+++msgid "Detected reordering %u times using FACK"
+++msgstr ""
+++
+++#: ../statistics.c:194
+++#, c-format
+++msgid "Detected reordering %u times using SACK"
+++msgstr ""
+++
+++#: ../statistics.c:195
+++#, c-format
+++msgid "Detected reordering %u times using time stamp"
+++msgstr ""
+++
+++#: ../statistics.c:196
+++#, c-format
+++msgid "Detected reordering %u times using reno fast retransmit"
+++msgstr ""
+++
+++#: ../statistics.c:197
+++#, c-format
+++msgid "%u congestion windows fully recovered"
+++msgstr ""
+++
+++#: ../statistics.c:198
+++#, c-format
+++msgid "%u congestion windows partially recovered using Hoe heuristic"
+++msgstr ""
+++
+++#: ../statistics.c:199
+++#, c-format
+++msgid "%u congestion window recovered using DSACK"
+++msgstr ""
+++
+++#: ../statistics.c:200
+++#, c-format
+++msgid "%u congestion windows recovered after partial ack"
+++msgstr ""
+++
+++#: ../statistics.c:201
+++#, fuzzy, c-format
+++msgid "%u retransmits lost"
+++msgstr "poèet odeslaných resetù: %d"
+++
+++#: ../statistics.c:202
+++#, c-format
+++msgid "%u timeouts after reno fast retransmit"
+++msgstr ""
+++
+++#: ../statistics.c:203
+++#, c-format
+++msgid "%u timeouts after SACK recovery"
+++msgstr ""
+++
+++#: ../statistics.c:204
+++#, c-format
+++msgid "%u timeouts in loss state"
+++msgstr ""
+++
+++#: ../statistics.c:205
+++#, fuzzy, c-format
+++msgid "%u fast retransmits"
+++msgstr "poèet pøenesených segmentù: %d"
+++
+++#: ../statistics.c:206
+++#, c-format
+++msgid "%u forward retransmits"
+++msgstr ""
+++
+++#: ../statistics.c:207
+++#, c-format
+++msgid "%u retransmits in slow start"
+++msgstr ""
+++
+++#: ../statistics.c:208
+++#, c-format
+++msgid "%u other TCP timeouts"
+++msgstr ""
+++
+++#: ../statistics.c:209
+++#, fuzzy, c-format
+++msgid "%u reno fast retransmits failed"
+++msgstr "poèet pøenesených segmentù: %d"
+++
+++#: ../statistics.c:210
+++#, fuzzy, c-format
+++msgid "%u sack retransmits failed"
+++msgstr "poèet paketù, je¾ se nepodaøilo znovu sestavit: %d"
+++
+++#: ../statistics.c:211
+++#, c-format
+++msgid "%u times receiver scheduled too late for direct processing"
+++msgstr ""
+++
+++#: ../statistics.c:212
+++#, fuzzy, c-format
+++msgid "%u packets collapsed in receive queue due to low socket buffer"
+++msgstr "poèet paketù odstranìných z fronty kvùli pøeteèení bufferu soketu: %d"
+++
+++#: ../statistics.c:213
+++#, c-format
+++msgid "%u DSACKs sent for old packets"
+++msgstr ""
+++
+++#: ../statistics.c:214
+++#, c-format
+++msgid "%u DSACKs sent for out of order packets"
+++msgstr ""
+++
+++#: ../statistics.c:215
+++#, fuzzy, c-format
+++msgid "%u DSACKs received"
+++msgstr "poèet pøijmutých paketù: %d"
+++
+++#: ../statistics.c:216
+++#, fuzzy, c-format
+++msgid "%u DSACKs for out of order packets received"
+++msgstr "celkem pøijmutých paketù: %d"
+++
+++#: ../statistics.c:217
+++#, fuzzy, c-format
+++msgid "%u connections reset due to unexpected SYN"
+++msgstr "poèet pøijmutých resetù: %d"
+++
+++#: ../statistics.c:218
+++#, fuzzy, c-format
+++msgid "%u connections reset due to unexpected data"
+++msgstr "poèet pøijmutých resetù: %d"
+++
+++#: ../statistics.c:219
+++#, fuzzy, c-format
+++msgid "%u connections reset due to early user close"
+++msgstr "poèet pøijmutých resetù: %d"
+++
+++#: ../statistics.c:220
+++#, c-format
+++msgid "%u connections aborted due to memory pressure"
+++msgstr ""
+++
+++#: ../statistics.c:221
+++#, fuzzy, c-format
+++msgid "%u connections aborted due to timeout"
+++msgstr "poèet pøijmutých resetù: %d"
+++
++ #: ../statistics.c:222
+++#, c-format
+++msgid "%u connections aborted after user close in linger timeout"
+++msgstr ""
+++
+++#: ../statistics.c:223
+++#, c-format
+++msgid "%u times unabled to send RST due to no memory"
+++msgstr ""
+++
+++#: ../statistics.c:224
+++#, c-format
+++msgid "TCP ran low on memory %u times"
+++msgstr ""
+++
+++#: ../statistics.c:225
+++#, c-format
+++msgid "%u TCP data loss events"
+++msgstr ""
+++
+++#: ../statistics.c:292
++ msgid "enabled"
++ msgstr "zapnuto"
++ 
++-#: ../statistics.c:222
+++#: ../statistics.c:292
++ msgid "disabled"
++ msgstr "vypnuto"
++ 
++-#: ../statistics.c:272
++-#, c-format
++-msgid "unknown title %s\n"
++-msgstr "titulek %s je neznámý\n"
++-
++-#: ../statistics.c:298
+++#: ../statistics.c:375
++ msgid "error parsing /proc/net/snmp"
++ msgstr "chyba pøi zpracování /proc/net/snmp"
++ 
++-#: ../statistics.c:311
+++#: ../statistics.c:388
++ msgid "cannot open /proc/net/snmp"
++ msgstr "/proc/net/snmp nelze otevøít"
++ 
++@@ -1821,89 +2112,95 @@ msgstr "Hardwarový typ `%s' není podporo
++ msgid "Cannot change line discipline to `%s'.\n"
++ msgstr "Linkovou disciplínu nelze na `%s' zmìnit.\n"
++ 
++-#: ../lib/af.c:145 ../lib/hw.c:148
+++#: ../lib/af.c:153 ../lib/hw.c:161
++ msgid "UNSPEC"
++ msgstr "NEZNÁM"
++ 
++-#: ../lib/af.c:147
+++#: ../lib/af.c:155
++ msgid "UNIX Domain"
++ msgstr "Doména UNIX"
++ 
++-#: ../lib/af.c:150
+++#: ../lib/af.c:158
++ msgid "DARPA Internet"
++ msgstr "DARPA Internet"
++ 
++-#: ../lib/af.c:153
+++#: ../lib/af.c:161
++ msgid "IPv6"
++ msgstr "IPv6"
++ 
++-#: ../lib/af.c:156 ../lib/hw.c:169
+++#: ../lib/af.c:164 ../lib/hw.c:182
++ msgid "AMPR AX.25"
++ msgstr "AMPR AX.25"
++ 
++-#: ../lib/af.c:159 ../lib/hw.c:175
+++#: ../lib/af.c:167 ../lib/hw.c:188
++ msgid "AMPR NET/ROM"
++ msgstr "AMPR NET/ROM"
++ 
++-#: ../lib/af.c:162
+++#: ../lib/af.c:170
++ msgid "Novell IPX"
++ msgstr "Novell IPX"
++ 
++-#: ../lib/af.c:165
+++#: ../lib/af.c:173
++ msgid "Appletalk DDP"
++ msgstr "Appletalk DDP"
++ 
++-#: ../lib/af.c:168 ../lib/hw.c:207
+++#: ../lib/af.c:176 ../lib/hw.c:223
++ msgid "Econet"
++ msgstr "Econet"
++ 
++-#: ../lib/af.c:171 ../lib/hw.c:172
+++#: ../lib/af.c:179
+++msgid "CCITT X.25"
+++msgstr ""
+++
+++#: ../lib/af.c:182 ../lib/hw.c:185
++ msgid "AMPR ROSE"
++ msgstr "AMPR ROSE"
++ 
++-#: ../lib/af.c:174 ../lib/hw.c:160
+++#: ../lib/af.c:185 ../lib/hw.c:173
++ msgid "Ash"
++ msgstr "Ash"
++ 
++-#: ../lib/af.c:232
+++#: ../lib/af.c:243
+++#, c-format
++ msgid "Please don't supply more than one address family.\n"
++ msgstr "Nezadávejte více ne¾ jednu tøídu adres.\n"
++ 
++-#: ../lib/af.c:293
+++#: ../lib/af.c:304
+++#, c-format
++ msgid "Too much address family arguments.\n"
++ msgstr "Bylo zadáno pøíli¹ mnoho tøíd adres.\n"
++ 
++-#: ../lib/af.c:304
+++#: ../lib/af.c:315
++ #, c-format
++ msgid "Unknown address family `%s'.\n"
++ msgstr "Tøída adres `%s' není známa.\n"
++ 
++-#: ../lib/arcnet.c:53 ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52
++-#: ../lib/fddi.c:67 ../lib/hippi.c:68 ../lib/inet.c:244 ../lib/inet.c:259
++-#: ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ../lib/rose.c:71
++-#: ../lib/rose.c:126 ../lib/unix.c:56 ../lib/unix.c:76
++-msgid "[NONE SET]"
++-msgstr "[NENASTAVENO]"
++-
++-#: ../lib/arcnet.c:81 ../lib/arcnet.c:96
+++#: ../lib/arcnet.c:70 ../lib/arcnet.c:85
++ #, c-format
++ msgid "in_arcnet(%s): invalid arcnet address!\n"
++ msgstr "in_arcnet(%s): chybná arcnet adresa!\n"
++ 
++-#: ../lib/arcnet.c:108
+++#: ../lib/arcnet.c:97
++ #, c-format
++ msgid "in_arcnet(%s): trailing : ignored!\n"
++ msgstr "in_arcnet(%s): nadbyteèné : ignorováno!\n"
++ 
++-#: ../lib/arcnet.c:120
+++#: ../lib/arcnet.c:109
++ #, c-format
++ msgid "in_arcnet(%s): trailing junk!\n"
++ msgstr "in_arcnet(%s): nadbyteèné znaky!\n"
++ 
++ #: ../lib/ash.c:81
+++#, c-format
++ msgid "Malformed Ash address"
++ msgstr "Chybná Ash adresa"
++ 
+++#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244
+++#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78
+++#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76
+++msgid "[NONE SET]"
+++msgstr "[NENASTAVENO]"
+++
++ #: ../lib/ax25.c:97 ../lib/netrom.c:100
++ msgid "Invalid callsign"
++ msgstr "Nesprávný volací znak"
++@@ -1913,22 +2210,21 @@ msgid "Callsign too long"
++ msgstr "Volací znak je pøíli¹ dlouhý."
++ 
++ #: ../lib/ax25_gr.c:47
+++#, c-format
++ msgid "AX.25 not configured in this system.\n"
++ msgstr "AX.25 není na tomto systému nakonfigurováno.\n"
++ 
++ #: ../lib/ax25_gr.c:50
+++#, c-format
++ msgid "Kernel AX.25 routing table\n"
++ msgstr "Smìrovací tabulka v jádru pro AX.25\n"
++ 
++ #. xxx
++ #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
+++#, c-format
++ msgid "Destination  Iface    Use\n"
++ msgstr "Adresát      Rozhraní U¾ití\n"
++ 
++-#: ../lib/ddp_gr.c:21
++-msgid "Routing table for `ddp' not yet supported.\n"
++-msgstr "Smìrovací tabulka pro `ddp' není zatím podporována.\n"
++-
++ #: ../lib/ether.c:74 ../lib/ether.c:91
++ #, c-format
++ msgid "in_ether(%s): invalid ether address!\n"
++@@ -1944,153 +2240,171 @@ msgstr "in_ether(%s): nadbyteèné : ignor
++ msgid "in_ether(%s): trailing junk!\n"
++ msgstr "in_ether(%s): nadbyteèné znaky!\n"
++ 
++-#: ../lib/fddi.c:95 ../lib/fddi.c:110
+++#: ../lib/fddi.c:84 ../lib/fddi.c:99
++ #, c-format
++ msgid "in_fddi(%s): invalid fddi address!\n"
++ msgstr "in_fddi(%s): chybná fddi adresa!\n"
++ 
++-#: ../lib/fddi.c:122
+++#: ../lib/fddi.c:111
++ #, c-format
++ msgid "in_fddi(%s): trailing : ignored!\n"
++ msgstr "in_fddi(%s): nadbyteèné : ignorováno!\n"
++ 
++-#: ../lib/fddi.c:134
+++#: ../lib/fddi.c:123
++ #, c-format
++ msgid "in_fddi(%s): trailing junk!\n"
++ msgstr "in_fddi(%s): nadbyteèné znaky!\n"
++ 
++-#: ../lib/getroute.c:97 ../lib/setroute.c:76
+++#: ../lib/getroute.c:101 ../lib/setroute.c:80
++ #, c-format
++ msgid "Address family `%s' not supported.\n"
++ msgstr "Tøída adres `%s' není podporována.\n"
++ 
++-#: ../lib/getroute.c:103 ../lib/setroute.c:80
+++#: ../lib/getroute.c:107 ../lib/setroute.c:84
++ #, c-format
++ msgid "No routing for address family `%s'.\n"
++ msgstr "Pro tøídu adres `%s' není ¾ádné smìrování.\n"
++ 
++-#: ../lib/hippi.c:96 ../lib/hippi.c:111
+++#: ../lib/hippi.c:84 ../lib/hippi.c:99
++ #, c-format
++ msgid "in_hippi(%s): invalid hippi address!\n"
++ msgstr "in_hippi(%s): chybná hippi adresa!\n"
++ 
++-#: ../lib/hippi.c:123
+++#: ../lib/hippi.c:111
++ #, c-format
++ msgid "in_hippi(%s): trailing : ignored!\n"
++ msgstr "in_hippi(%s): nadbyteèné : ignorováno!\n"
++ 
++-#: ../lib/hippi.c:134
+++#: ../lib/hippi.c:122
++ #, c-format
++ msgid "in_hippi(%s): trailing junk!\n"
++ msgstr "in_hippi(%s): nadbyteèné znaky!\n"
++ 
++-#: ../lib/hw.c:147
+++#: ../lib/hw.c:160
++ msgid "Local Loopback"
++ msgstr "Místní smyèka"
++ 
++-#: ../lib/hw.c:150
+++#: ../lib/hw.c:163
++ msgid "Serial Line IP"
++ msgstr "IP po sériové lince"
++ 
++-#: ../lib/hw.c:151
+++#: ../lib/hw.c:164
++ msgid "VJ Serial Line IP"
++ msgstr "Vj IP po sériové lince"
++ 
++-#: ../lib/hw.c:152
+++#: ../lib/hw.c:165
++ msgid "6-bit Serial Line IP"
++ msgstr "6bitový IP po sériové lince"
++ 
++-#: ../lib/hw.c:153
+++#: ../lib/hw.c:166
++ msgid "VJ 6-bit Serial Line IP"
++ msgstr "6bitový VJ IP po sériové lince"
++ 
++-#: ../lib/hw.c:154
+++#: ../lib/hw.c:167
++ msgid "Adaptive Serial Line IP"
++ msgstr "Adaptivní IP po sériové lince"
++ 
++-#: ../lib/hw.c:157
+++#: ../lib/hw.c:170
++ msgid "Ethernet"
++ msgstr "Ethernet"
++ 
++-#: ../lib/hw.c:163
+++#: ../lib/hw.c:176
++ msgid "Fiber Distributed Data Interface"
++ msgstr "Fiber Distributed Data Interface"
++ 
++-#: ../lib/hw.c:166
+++#: ../lib/hw.c:179
++ msgid "HIPPI"
++ msgstr "HIPPI"
++ 
++-#: ../lib/hw.c:178
+++#: ../lib/hw.c:191
+++msgid "generic X.25"
+++msgstr ""
+++
+++#: ../lib/hw.c:194
++ msgid "IPIP Tunnel"
++ msgstr "IPIP Tunnel"
++ 
++-#: ../lib/hw.c:181
+++#: ../lib/hw.c:197
++ msgid "Point-to-Point Protocol"
++ msgstr "Point-to-Point Protokol"
++ 
++-#: ../lib/hw.c:184
+++#: ../lib/hw.c:200
++ msgid "(Cisco)-HDLC"
++ msgstr "(Cisco)-HDLC"
++ 
++-#: ../lib/hw.c:185
+++#: ../lib/hw.c:201
++ msgid "LAPB"
++ msgstr "LAPB"
++ 
++-#: ../lib/hw.c:188
+++#: ../lib/hw.c:204
++ msgid "ARCnet"
++ msgstr "ARCnet"
++ 
++-#: ../lib/hw.c:191
+++#: ../lib/hw.c:207
++ msgid "Frame Relay DLCI"
++ msgstr "Frame Relay DLCI"
++ 
++-#: ../lib/hw.c:192
+++#: ../lib/hw.c:208
++ msgid "Frame Relay Access Device"
++ msgstr "Pøístupové zaøízení Frame Relay"
++ 
++-#: ../lib/hw.c:195
+++#: ../lib/hw.c:211
++ msgid "IPv6-in-IPv4"
++ msgstr "IPv6-in-IPv4"
++ 
++-#: ../lib/hw.c:198
+++#: ../lib/hw.c:214
++ msgid "IrLAP"
++ msgstr "IrLAP"
++ 
++-#: ../lib/hw.c:201
+++#: ../lib/hw.c:217
++ msgid "16/4 Mbps Token Ring"
++ msgstr "Token Ring 16/4 Mb/s"
++ 
++-#: ../lib/hw.c:203
+++#: ../lib/hw.c:219
++ #, fuzzy
++ msgid "16/4 Mbps Token Ring (New)"
++ msgstr "Token Ring 16/4 Mb/s"
++ 
+++#: ../lib/hw.c:226
+++msgid "Generic EUI-64"
+++msgstr ""
+++
++ #: ../lib/inet.c:153 ../lib/inet6.c:79
++ #, c-format
++ msgid "rresolve: unsupport address family %d !\n"
++ msgstr "rresolve: tøída adres %d není podporována!\n"
++ 
++-#: ../lib/inet6_gr.c:79
+++#: ../lib/inet6.c:131
+++#, fuzzy
+++msgid "[UNKNOWN]"
+++msgstr "NEZNÁM"
+++
+++#: ../lib/inet6_gr.c:71
+++#, c-format
++ msgid "INET6 (IPv6) not configured in this system.\n"
++ msgstr "INET6 (IPv6) není na tomto systému nakonfigurováno.\n"
++ 
++-#: ../lib/inet6_gr.c:82
+++#: ../lib/inet6_gr.c:74
+++#, c-format
++ msgid "Kernel IPv6 routing table\n"
++ msgstr "Smìrovací tabulka v jádru pro IPv6\n"
++ 
++-#: ../lib/inet6_gr.c:84
+++#: ../lib/inet6_gr.c:76
+++#, c-format
++ msgid ""
++-"Destination                                 Next Hop                         "
++-"       Flags Metric Ref    Use Iface\n"
+++"Destination                                 Next "
+++"Hop                                Flags Metric Ref    Use Iface\n"
++ msgstr ""
++-"Adresát                                     Dal¹í Smìrovaè                   "
++-"       Pøízn Metrika Odkaz U¾it Rozhraní\n"
+++"Adresát                                     Dal¹í "
+++"Smìrovaè                          Pøízn Metrika Odkaz U¾it Rozhraní\n"
++ 
++-#: ../lib/inet6_gr.c:158
+++#: ../lib/inet6_gr.c:150
+++#, c-format
++ msgid "Kernel IPv6 Neighbour Cache\n"
++ msgstr "Cache sousedù v jádru pro IPv6\n"
++ 
++-#: ../lib/inet6_gr.c:161
+++#: ../lib/inet6_gr.c:153
+++#, c-format
++ msgid ""
++ "Neighbour                                   HW Address        Iface    Flags "
++ "Ref State\n"
++@@ -2098,7 +2412,8 @@ msgstr ""
++ "Soused                                      HW Adresa         Rozhraní Pøízn "
++ "Odkazy Stav\n"
++ 
++-#: ../lib/inet6_gr.c:165
+++#: ../lib/inet6_gr.c:157
+++#, c-format
++ msgid ""
++ "Neighbour                                   HW Address        Iface    Flags "
++ "Ref State            Stale(sec) Delete(sec)\n"
++@@ -2107,30 +2422,37 @@ msgstr ""
++ "Pøíznaky Odkazy Stav          Pro¹lý(sec) Smazat(sec)\n"
++ 
++ #: ../lib/inet6_sr.c:46
+++#, c-format
++ msgid "Usage: inet6_route [-vF] del Target\n"
++ msgstr "Pou¾ití: inet6_route [-vF] del Cíl\n"
++ 
++ #: ../lib/inet6_sr.c:47
+++#, c-format
++ msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
++ msgstr "       inet6_route [-vF] add Cíl [gw Gw] [metrika M] [[dev] If]\n"
++ 
++ #: ../lib/inet6_sr.c:48
+++#, c-format
++ msgid "       inet6_route [-FC] flush      NOT supported\n"
++ msgstr "       inet6_route [-FC] flush      NENÍ podporováno\n"
++ 
++-#: ../lib/inet6_sr.c:182
+++#: ../lib/inet6_sr.c:188
+++#, c-format
++ msgid "Flushing `inet6' routing table not supported\n"
++ msgstr "Smìrovací tabulku `inet6' nelze vyprazdòovat\n"
++ 
++ #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
+++#, c-format
++ msgid "INET (IPv4) not configured in this system.\n"
++ msgstr "INET (IPv4) není na tomto systému nakonfigurováno.\n"
++ 
++ #: ../lib/inet_gr.c:53
+++#, c-format
++ msgid "Kernel IP routing table\n"
++ msgstr "Smìrovací tabulka v jádru pro IP\n"
++ 
++ #: ../lib/inet_gr.c:56
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
++ "Iface\n"
++@@ -2139,6 +2461,7 @@ msgstr ""
++ "Rozhraní\n"
++ 
++ #: ../lib/inet_gr.c:59
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags   MSS Window  irtt "
++ "Iface\n"
++@@ -2147,6 +2470,7 @@ msgstr ""
++ "Rozhraní\n"
++ 
++ #: ../lib/inet_gr.c:62
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt\n"
++@@ -2155,10 +2479,12 @@ msgstr ""
++ "Rozhraní MSS   Okno   irtt\n"
++ 
++ #: ../lib/inet_gr.c:237
+++#, c-format
++ msgid "Kernel IP routing cache\n"
++ msgstr "Smìrovací cache v jádru pro IP\n"
++ 
++ #: ../lib/inet_gr.c:258
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface\n"
++@@ -2167,6 +2493,7 @@ msgstr ""
++ "Rozhraní\n"
++ 
++ #: ../lib/inet_gr.c:261
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags   MSS Window  irtt "
++ "Iface\n"
++@@ -2175,6 +2502,7 @@ msgstr ""
++ "Rozhraní\n"
++ 
++ #: ../lib/inet_gr.c:266
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt  HH  Arp\n"
++@@ -2183,6 +2511,7 @@ msgstr ""
++ "Rozhraní MSS   Okno   irtt HH   Arp\n"
++ 
++ #: ../lib/inet_gr.c:290
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
++@@ -2190,7 +2519,8 @@ msgstr ""
++ "Odesílatel      Adresát         Maska           Pøízn Metrik Odkazy U¾t "
++ "Rozhraní MSS    Okno irtt   TOS HHOdk HHAktuál    Zvlá¹tCíl\n"
++ 
++-#: ../lib/inet_sr.c:50
+++#: ../lib/inet_sr.c:51
+++#, c-format
++ msgid ""
++ "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
++ "[[dev] If]\n"
++@@ -2198,29 +2528,34 @@ msgstr ""
++ "Pou¾ití: inet_route [-vF] del {-host|-net} Cíl[/prefix] [gw Gw] [metrika M] "
++ "[[dev] If]\n"
++ 
++-#: ../lib/inet_sr.c:51
+++#: ../lib/inet_sr.c:52
+++#, c-format
++ msgid ""
++ "       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
++ msgstr ""
++ "       inet_route [-vF] add {-host|-net} Cíl[/prefix] [gw Gw] [metrika M]\n"
++ 
++-#: ../lib/inet_sr.c:52
+++#: ../lib/inet_sr.c:53
+++#, c-format
++ msgid ""
++ "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
++ msgstr ""
++ "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
++ 
++-#: ../lib/inet_sr.c:53
+++#: ../lib/inet_sr.c:54
+++#, c-format
++ msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
++ msgstr "                              [mod] [dyn] [reinstate] [[dev] If]\n"
++ 
++-#: ../lib/inet_sr.c:54
+++#: ../lib/inet_sr.c:55
+++#, c-format
++ msgid ""
++ "       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
++ msgstr ""
++ "       inet_route [-vF] add {-host|-net} Cíl/[prefix] [metrika M] reject\n"
++ 
++-#: ../lib/inet_sr.c:55
+++#: ../lib/inet_sr.c:56
+++#, c-format
++ msgid "       inet_route [-FC] flush      NOT supported\n"
++ msgstr "       inet_route [-FC] flush      NENÍ podporováno\n"
++ 
++@@ -2230,15 +2565,17 @@ msgid "route: %s: cannot use a NETWORK a
++ msgstr "route: %s: sí» nelze pou¾ít jako bránu!\n"
++ 
++ #: ../lib/inet_sr.c:174
++-#, fuzzy
+++#, fuzzy, c-format
++ msgid "route: Invalid MSS/MTU.\n"
++ msgstr "route: Nesprávné NSS.\n"
++ 
++ #: ../lib/inet_sr.c:187
+++#, c-format
++ msgid "route: Invalid window.\n"
++ msgstr "route: Nesprávné okno.\n"
++ 
++ #: ../lib/inet_sr.c:203
+++#, c-format
++ msgid "route: Invalid initial rtt.\n"
++ msgstr "route: Nesprávné zahajovací rtt.\n"
++ 
++@@ -2253,75 +2590,92 @@ msgid "route: bogus netmask %s\n"
++ msgstr "route: sí»ová maska %s je nesprávná\n"
++ 
++ #: ../lib/inet_sr.c:270
+++#, c-format
++ msgid "route: netmask doesn't match route address\n"
++ msgstr "route: sí»ová maska nevyhovuje adrese cesty\n"
++ 
++ #: ../lib/inet_sr.c:306
+++#, c-format
++ msgid "Flushing `inet' routing table not supported\n"
++ msgstr "Smìrovací cache `inet' nelze vyprazdòovat\n"
++ 
++ #: ../lib/inet_sr.c:310
+++#, c-format
++ msgid "Modifying `inet' routing cache not supported\n"
++ msgstr "Smìrovací cache `inet' nelze mìnit\n"
++ 
++ #: ../lib/ipx_gr.c:52
+++#, c-format
++ msgid "IPX not configured in this system.\n"
++ msgstr "IPX není na tomto systému nakonfigurováno.\n"
++ 
++ #: ../lib/ipx_gr.c:56
+++#, c-format
++ msgid "Kernel IPX routing table\n"
++ msgstr "Smìrovací tabulka v jádru pro IPX\n"
++ 
++ #. xxx
++ #: ../lib/ipx_gr.c:57
+++#, c-format
++ msgid "Destination               Router Net                Router Node\n"
++ msgstr "Cíl                       Smìrovaè Sí»              Smìrovaè Uzel\n"
++ 
++ #: ../lib/ipx_sr.c:33
+++#, c-format
++ msgid "IPX: this needs to be written\n"
++ msgstr "IPX: toto je tøeba ulo¾it\n"
++ 
++-#: ../lib/masq_info.c:197
+++#: ../lib/masq_info.c:198
+++#, c-format
++ msgid "IP masquerading entries\n"
++ msgstr "IP maskovací polo¾ky\n"
++ 
++-#: ../lib/masq_info.c:200
+++#: ../lib/masq_info.c:201
+++#, c-format
++ msgid "prot   expire source               destination          ports\n"
++ msgstr "prot   ¾ivot  zdroj                cíl                  porty\n"
++ 
++-#: ../lib/masq_info.c:203
+++#: ../lib/masq_info.c:204
+++#, c-format
++ msgid ""
++-"prot   expire    initseq delta prevd source               destination        "
++-"  ports\n"
+++"prot   expire    initseq delta prevd source               "
+++"destination          ports\n"
++ msgstr ""
++-"prot   ¾ivot     zahajsek delta pøedchd zdroj             cíl                "
++-"   porty\n"
+++"prot   ¾ivot     zahajsek delta pøedchd zdroj             "
+++"cíl                   porty\n"
++ 
++ #: ../lib/netrom_gr.c:48
+++#, c-format
++ msgid "NET/ROM not configured in this system.\n"
++ msgstr "NET/ROM není na tomto systému nakonfigurováno.\n"
++ 
++ #: ../lib/netrom_gr.c:51
+++#, c-format
++ msgid "Kernel NET/ROM routing table\n"
++ msgstr "Smìrovací tabulka v jádru pro NET/ROM\n"
++ 
++ #: ../lib/netrom_gr.c:52
+++#, c-format
++ msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
++ msgstr "Cíl          Mnemonika Kvalita  Soused     Rozhraní\n"
++ 
++ #: ../lib/netrom_sr.c:34
+++#, c-format
++ msgid "netrom usage\n"
++ msgstr "pou¾ití netrom\n"
++ 
++ #: ../lib/netrom_sr.c:44
+++#, c-format
++ msgid "NET/ROM: this needs to be written\n"
++ msgstr "NET/ROM: toto je potøeba ulo¾it\n"
++ 
++ #: ../lib/ppp.c:44
+++#, c-format
++ msgid "You cannot start PPP with this program.\n"
++ msgstr "Tímto programem nelze PPP spustit.\n"
++ 
++ #: ../lib/ppp_ac.c:38
+++#, c-format
++ msgid "Sorry, use pppd!\n"
++ msgstr "Lituji, pou¾ijte pppd!\n"
++ 
++@@ -2330,49 +2684,319 @@ msgid "Node address must be ten digits"
++ msgstr "Adresa uzlu musí mít 10 èíslic"
++ 
++ #: ../lib/rose_gr.c:51
+++#, c-format
++ msgid "ROSE not configured in this system.\n"
++ msgstr "ROSE není na tomto systému nakonfigurováno.\n"
++ 
++ #: ../lib/rose_gr.c:54
+++#, c-format
++ msgid "Kernel ROSE routing table\n"
++ msgstr "Smìrovací tabulka v jádru pro ROSE\n"
++ 
++-#: ../lib/tr.c:70 ../lib/tr.c:85
+++#: ../lib/tr.c:86 ../lib/tr.c:101
++ #, c-format
++ msgid "in_tr(%s): invalid token ring address!\n"
++ msgstr "in_tr(%s): nesprávná token ring adresa!\n"
++ 
++-#: ../lib/tr.c:97
+++#: ../lib/tr.c:113
++ #, c-format
++ msgid "in_tr(%s): trailing : ignored!\n"
++ msgstr "in_tr(%s): nadbyteèné: ignorováno!\n"
++ 
++-#: ../lib/tr.c:109
+++#: ../lib/tr.c:125
++ #, c-format
++ msgid "in_tr(%s): trailing junk!\n"
++ msgstr "in_tr(%s): nadbyteèné znaky!\n"
++ 
++-#: ../lib/interface.c:124
+++#: ../lib/interface.c:176
++ #, c-format
++ msgid "warning: no inet socket available: %s\n"
++ msgstr "varování: není dostupný ¾ádný inet soket: %s\n"
++ 
++-#: ../lib/interface.c:270
+++#: ../lib/interface.c:325
++ #, c-format
++ msgid "Warning: cannot open %s (%s). Limited output.\n"
++ msgstr ""
++ 
++ #. Give better error message for this case.
++-#: ../lib/interface.c:504
+++#: ../lib/interface.c:571
++ msgid "Device not found"
++ msgstr "Zaøízení nebylo nalezeno"
++ 
++-#: ../lib/interface.c:508
+++#: ../lib/interface.c:575
++ #, c-format
++ msgid "%s: error fetching interface information: %s\n"
++ msgstr "%s: chyba pøi získávání informací o rozhraní %s\n"
++ 
++-#: ../lib/sockets.c:59
+++#: ../lib/interface.c:608
+++msgid "     - no statistics available -"
+++msgstr "     - statistická data nejsou dostupná -"
+++
+++#: ../lib/interface.c:612
+++#, c-format
+++msgid "[NO FLAGS]"
+++msgstr "[®ÁDNÉ PØÍZNAKY]"
+++
+++#: ../lib/interface.c:688
+++#, c-format
+++msgid "%-9.9s Link encap:%s  "
+++msgstr "%-9.9s Zapouzdøení:%s  "
+++
+++#: ../lib/interface.c:693
+++#, c-format
+++msgid "HWaddr %s  "
+++msgstr "HWadr %s  "
+++
+++#: ../lib/interface.c:696
+++#, c-format
+++msgid "Media:%s"
+++msgstr "Médium:%s"
+++
+++#: ../lib/interface.c:698
+++#, c-format
+++msgid "(auto)"
+++msgstr "(auto)"
+++
+++#: ../lib/interface.c:705
+++#, c-format
+++msgid "          %s addr:%s "
+++msgstr "          %s adr:%s "
+++
+++#: ../lib/interface.c:708
+++#, c-format
+++msgid " P-t-P:%s "
+++msgstr " P-t-P:%s "
+++
+++# V ostatních katalozích se pøekládá Broadcast -> v¹esmìrové vysílání.
+++# Tudi¾ bcast -> V¹esmìr :)
+++#: ../lib/interface.c:711
+++#, c-format
+++msgid " Bcast:%s "
+++msgstr " V¹esmìr:%s "
+++
+++#: ../lib/interface.c:713
+++#, c-format
+++msgid " Mask:%s\n"
+++msgstr "Maska:%s\n"
+++
+++#: ../lib/interface.c:730
+++#, c-format
+++msgid "          inet6 addr: %s/%d"
+++msgstr "          inet6-adr: %s/%d"
+++
+++#: ../lib/interface.c:732
+++#, c-format
+++msgid " Scope:"
+++msgstr " Rozsah:"
+++
+++#: ../lib/interface.c:735
+++#, c-format
+++msgid "Global"
+++msgstr "Globál"
+++
+++#: ../lib/interface.c:738
+++#, c-format
+++msgid "Link"
+++msgstr "Linka"
+++
+++#: ../lib/interface.c:741
+++#, c-format
+++msgid "Site"
+++msgstr "Stanovi¹tì"
+++
+++#: ../lib/interface.c:744
+++#, c-format
+++msgid "Compat"
+++msgstr "Kompatibilita"
+++
+++#: ../lib/interface.c:747
+++#, c-format
+++msgid "Host"
+++msgstr "Poèítaè"
+++
+++#: ../lib/interface.c:750
+++#, c-format
+++msgid "Unknown"
+++msgstr "Neznám."
+++
+++#: ../lib/interface.c:765
+++#, c-format
+++msgid "          IPX/Ethernet II addr:%s\n"
+++msgstr "          IPX/Ethernet II adr: %s\n"
+++
+++#: ../lib/interface.c:768
+++#, c-format
+++msgid "          IPX/Ethernet SNAP addr:%s\n"
+++msgstr "          IPX/Ethernet SNAP adr:%s\n"
+++
+++#: ../lib/interface.c:771
+++#, c-format
+++msgid "          IPX/Ethernet 802.2 addr:%s\n"
+++msgstr "          IPX/Ethernet 802.2 adr:%s\n"
+++
+++#: ../lib/interface.c:774
+++#, c-format
+++msgid "          IPX/Ethernet 802.3 addr:%s\n"
+++msgstr "          IPX/Ethernet 802.3 adr:%s\n"
+++
+++#: ../lib/interface.c:784
+++#, c-format
+++msgid "          EtherTalk Phase 2 addr:%s\n"
+++msgstr "          EtherTalk Phase 2 adr:%s\n"
+++
+++#: ../lib/interface.c:793
+++#, c-format
+++msgid "          econet addr:%s\n"
+++msgstr "          econet adr:%s\n"
+++
+++# Hic sunt leones ...
+++#: ../lib/interface.c:800
+++#, c-format
+++msgid "[NO FLAGS] "
+++msgstr "[®ÁDNÉ PØÍZNAKY]"
+++
+++#: ../lib/interface.c:802
+++#, c-format
+++msgid "UP "
+++msgstr "AKTIVOVÁNO "
+++
+++#: ../lib/interface.c:804
+++#, c-format
+++msgid "BROADCAST "
+++msgstr "V©ESMÌROVÉ_VYSÍLÁNÍ "
+++
+++#: ../lib/interface.c:806
+++#, c-format
+++msgid "DEBUG "
+++msgstr "DEBUG "
+++
+++#: ../lib/interface.c:808
+++#, c-format
+++msgid "LOOPBACK "
+++msgstr "SMYÈKA "
+++
+++#: ../lib/interface.c:810
+++#, c-format
+++msgid "POINTOPOINT "
+++msgstr "POINTOPOINT "
+++
+++# ??
+++#: ../lib/interface.c:812
+++#, c-format
+++msgid "NOTRAILERS "
+++msgstr "NOTRAILERS "
+++
+++#: ../lib/interface.c:814
+++#, c-format
+++msgid "RUNNING "
+++msgstr "BÌ®Í "
+++
+++#: ../lib/interface.c:816
+++#, c-format
+++msgid "NOARP "
+++msgstr "NEARP "
+++
+++#: ../lib/interface.c:818
+++#, c-format
+++msgid "PROMISC "
+++msgstr "PROMISK "
+++
+++#: ../lib/interface.c:820
+++#, c-format
+++msgid "ALLMULTI "
+++msgstr "ALLMULTI "
+++
+++#: ../lib/interface.c:822
+++#, c-format
+++msgid "SLAVE "
+++msgstr "SLAVE "
+++
+++#: ../lib/interface.c:824
+++#, c-format
+++msgid "MASTER "
+++msgstr "MASTER "
+++
+++#: ../lib/interface.c:826
+++#, c-format
+++msgid "MULTICAST "
+++msgstr "MULTICAST "
+++
+++#: ../lib/interface.c:829
+++#, c-format
+++msgid "DYNAMIC "
+++msgstr "DYNAMIC "
+++
+++#. DONT FORGET TO ADD THE FLAGS IN ife_print_short
+++#: ../lib/interface.c:832
+++#, c-format
+++msgid " MTU:%d  Metric:%d"
+++msgstr " MTU:%d  Metrika:%d"
+++
+++#: ../lib/interface.c:836
+++#, c-format
+++msgid "  Outfill:%d  Keepalive:%d"
+++msgstr "  Outfill:%d  Keepalive:%d"
+++
+++#: ../lib/interface.c:850
+++#, fuzzy, c-format
+++msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
+++msgstr "pøijmutých paketù:%lu chyb:%lu zahozeno:%lu pøeteèení:%lu rámcù:%lu\n"
+++
+++#: ../lib/interface.c:855
+++#, c-format
+++msgid "             compressed:%lu\n"
+++msgstr "             komprimováno:%lu\n"
+++
+++# carrier?
+++#: ../lib/interface.c:895
+++#, fuzzy, c-format
+++msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
+++msgstr "odeslaných paketù:%lu chyb:%lu zahozeno:%lu pøeteèení:%lu pøenos:%lu\n"
+++
+++#: ../lib/interface.c:899
+++#, c-format
+++msgid "          collisions:%lu "
+++msgstr "          kolizí:%lu "
+++
+++#: ../lib/interface.c:901
+++#, c-format
+++msgid "compressed:%lu "
+++msgstr "komprimováno:%lu "
+++
+++#: ../lib/interface.c:903
+++#, c-format
+++msgid "txqueuelen:%d "
+++msgstr "délka odchozí fronty:%d "
+++
+++#: ../lib/interface.c:905
+++#, c-format
+++msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
+++msgstr ""
+++
+++#: ../lib/interface.c:916
+++#, c-format
+++msgid "Interrupt:%d "
+++msgstr "Pøeru¹ení:%d "
+++
+++#. Only print devices using it for
+++#. I/O maps
+++#: ../lib/interface.c:919
+++#, c-format
+++msgid "Base address:0x%x "
+++msgstr "Vstupnì/Výstupní port:0x%x "
+++
+++#: ../lib/interface.c:921
+++#, c-format
+++msgid "Memory:%lx-%lx "
+++msgstr "Pamì»:%lx-%lx "
+++
+++#: ../lib/interface.c:924
+++#, c-format
+++msgid "DMA chan:%x "
+++msgstr "Kanál DMA:%x "
+++
+++#: ../lib/sockets.c:63
+++#, c-format
++ msgid "No usable address families found.\n"
++ msgstr "Nebyla nalezena ¾ádná pou¾itelná tøída adres.\n"
++ 
++@@ -2396,29 +3020,32 @@ msgstr "ip: %s není platnou IPv4 adresou
++ msgid "ip: argument is wrong: %s\n"
++ msgstr "ip: argument %s je nesprávný\n"
++ 
++-#: ../ipmaddr.c:56
+++#: ../ipmaddr.c:61
+++#, c-format
++ msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
++ msgstr " Usage: ipmaddr [ add | del ] MULTIADR dev ØETÌZEC\n"
++ 
++-#: ../ipmaddr.c:57
+++#: ../ipmaddr.c:62
+++#, c-format
++ msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
++ msgstr "       ipmaddr show [ dev ØETÌZEC ] [ ipv4 | ipv6 | link | all ]\n"
++ 
++-#: ../ipmaddr.c:58
+++#: ../ipmaddr.c:63
+++#, c-format
++ msgid "       ipmaddr -V | -version\n"
++ msgstr "       ipmaddr -V | -version\n"
++ 
++-#: ../ipmaddr.c:258
+++#: ../ipmaddr.c:263
++ #, c-format
++ msgid "family %d "
++ msgstr "tøída %d "
++ 
++-#: ../ipmaddr.c:267
+++#: ../ipmaddr.c:272
++ #, c-format
++ msgid " users %d"
++ msgstr " u¾ivatelé %d"
++ 
++-#: ../ipmaddr.c:353
+++#: ../ipmaddr.c:358
++ msgid "Cannot create socket"
++ msgstr "Soket nelze vytvoøit"
++ 
++@@ -2433,6 +3060,7 @@ msgid "slattach: tty_lock: (%s): %s\n"
++ msgstr "slattach: tty_lock: (%s): %s\n"
++ 
++ #: ../slattach.c:192
+++#, c-format
++ msgid "slattach: cannot write PID file\n"
++ msgstr "slattach: do PID souboru nelze zapisovat\n"
++ 
++@@ -2451,44 +3079,77 @@ msgstr "slattach: tty_hangup(DROP): %s\n
++ msgid "slattach: tty_hangup(RAISE): %s\n"
++ msgstr "slattach: tty_hangup(RAISE): %s\n"
++ 
++-#: ../slattach.c:486
+++#: ../slattach.c:468
+++#, fuzzy, c-format
+++msgid "slattach: tty name too long\n"
+++msgstr "jméno %s je pøíli¹ dlouhé\n"
+++
+++#: ../slattach.c:498
+++#, c-format
++ msgid "slattach: tty_open: cannot get current state!\n"
++ msgstr "slattach: tty_open: aktuální stav nelze zjistit!\n"
++ 
++-#: ../slattach.c:493
+++#: ../slattach.c:505
+++#, c-format
++ msgid "slattach: tty_open: cannot get current line disc!\n"
++ msgstr "slattach: tty_open: aktuální linkovou disciplínu nelze zjistit!\n"
++ 
++-#: ../slattach.c:501
+++#: ../slattach.c:513
+++#, c-format
++ msgid "slattach: tty_open: cannot set RAW mode!\n"
++ msgstr "slattach: tty_open: re¾im RAW nelze nastavit!\n"
++ 
++-#: ../slattach.c:508
+++#: ../slattach.c:520
++ #, c-format
++ msgid "slattach: tty_open: cannot set %s bps!\n"
++ msgstr "slattach: tty_open: %s bps nelze nastavit!\n"
++ 
++-#: ../slattach.c:518
+++#: ../slattach.c:530
+++#, c-format
++ msgid "slattach: tty_open: cannot set 8N1 mode!\n"
++ msgstr "slattach: tty_open: re¾im 8N1 nelze nastavit!\n"
++ 
++-#: ../slattach.c:686
+++#: ../slattach.c:672
+++#, c-format
+++msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n"
+++msgstr ""
+++
+++#: ../slattach.c:704
++ #, c-format
++ msgid "%s started"
++ msgstr "protokol %s spu¹tìn"
++ 
++-#: ../slattach.c:687
+++#: ../slattach.c:705
++ #, c-format
++ msgid " on %s"
++ msgstr " na %s"
++ 
++-#: ../slattach.c:688
+++#: ../slattach.c:706
++ #, c-format
++ msgid " interface %s\n"
++ msgstr " rozhraní %s\n"
++ 
++ #~ msgid ""
++-#~ "   This comand can read or set the hostname or the NIS domainname. You can\n"
+++#~ "  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
+++#~ "<-''-\n"
+++#~ msgstr ""
+++#~ "  arp [-v]   [<HW>] [-i <if>] -s <soubor> <hwadr> [sí»mask <èís>]  <-''-\n"
+++
+++#~ msgid "%s: unknown interface: %s\n"
+++#~ msgstr "%s: rozhraní %s není známo\n"
+++
+++#~ msgid "address mask replies"
+++#~ msgstr "odpovìdi na ¾ádost o masku podsítì"
+++
+++#~ msgid "unknown title %s\n"
+++#~ msgstr "titulek %s je neznámý\n"
+++
+++#~ msgid "Routing table for `ddp' not yet supported.\n"
+++#~ msgstr "Smìrovací tabulka pro `ddp' není zatím podporována.\n"
+++
+++#~ msgid ""
+++#~ "   This comand can read or set the hostname or the NIS domainname. You "
+++#~ "can\n"
++ #~ msgstr ""
++ #~ "   Tento program zji¹»uje a nastavuje jméno poèítaèe èi NIS domény. Mù¾e "
++ #~ "také\n"
++@@ -2500,7 +3161,8 @@ msgstr " rozhraní %s\n"
++ #~ msgid ""
++ #~ "   Unless you are using bind or NIS for host lookups you can change the\n"
++ #~ msgstr ""
++-#~ "   Pokud nepou¾íváte bind èi NIS pro vyhledávání jmen poèítaèù, pak mù¾ete\n"
+++#~ "   Pokud nepou¾íváte bind èi NIS pro vyhledávání jmen poèítaèù, pak "
+++#~ "mù¾ete\n"
++ 
++ #~ msgid ""
++ #~ "   FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n"
++Index: net-tools/po/Makefile
++===================================================================
++--- net-tools.orig/po/Makefile
+++++ net-tools/po/Makefile
++@@ -3,13 +3,13 @@ INSTALL_PROGRAM= ${INSTALL}
++ INSTALL_DATA= ${INSTALL} -m 644
++ INSTALLNLSDIR=${BASEDIR}/usr/share/locale
++ 
++-TUPDATE = tupdate
+++TUPDATE = msgmerge
++ 
++ NLSPACKAGE = net-tools
++ 
++ -include ../config.make
++ ifeq ($(I18N),1)
++-CATALOGS = de.mo fr.mo pt_BR.mo et_EE.mo cs.mo
+++CATALOGS = de.mo fr.mo pt_BR.mo et_EE.mo cs.mo ja.mo
++ else
++ CATALOGS =
++ endif
++@@ -49,7 +49,7 @@ update-po: Makefile
++ 		lang=`echo $$cat | sed 's/.mo//'`; \
++ 		mv $$lang.po $$lang.old.po; \
++ 		echo "$$lang:"; \
++-		if $(TUPDATE) $(NLSPACKAGE).pot $$lang.old.po > $$lang.po; then \
+++		if $(TUPDATE) $$lang.old.po $(NLSPACKAGE).pot > $$lang.po; then \
++ 		rm -f $$lang.old.po; \
++ 	else \
++ 	 	echo "tupdate for $$cat failed!"; \
++Index: net-tools/po/de.po
++===================================================================
++--- net-tools.orig/po/de.po
+++++ net-tools/po/de.po
++@@ -1,106 +1,121 @@
++-# $Id: de.po,v 1.10 2000/08/01 03:19:48 ecki Exp $
+++# $Id: de.po,v 1.11 2003/10/25 21:15:09 ecki Exp $
++ # German translation for net-tools 1.51
++ # Copyright (C) 1999 Ralf Bächle <ralf@gnu.org>
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: net-tools 1.51\n"
++-"POT-Creation-Date: 2000-02-14 02:31+0100\n"
++-"PO-Revision-Date: 1998-03-01 00:02+0100\n"
+++"Report-Msgid-Bugs-To: \n"
+++"POT-Creation-Date: 2007-06-30 12:28+0900\n"
+++"PO-Revision-Date: 2005-06-13 00:02+0100\n"
++ "Last-Translator: Ralf Bächle <ralf@gnu.org>\n"
++ "Language-Team:\n"
++ "MIME-Version: 1.0\n"
++-"Content-Type: text/plain; charset=iso8859-1\n"
+++"Content-Type: text/plain; charset=iso-8859-1\n"
++ "Content-Transfer-Encoding: 8bit\n"
++ 
++-#: ../arp.c:110 ../arp.c:269
+++#: ../arp.c:112 ../arp.c:279
+++#, c-format
++ msgid "arp: need host name\n"
++-msgstr "arp: Hostname muß angegeben werden\n"
+++msgstr "arp: Hostname muss angegeben werden\n"
++ 
++-#: ../arp.c:207 ../arp.c:221
+++#: ../arp.c:215 ../arp.c:230
++ #, c-format
++ msgid "No ARP entry for %s\n"
++-msgstr "Kein ARP Eintrag für %s\n"
+++msgstr "Kein ARP-Eintrag für %s\n"
++ 
++-#: ../arp.c:239
+++#: ../arp.c:248
++ #, c-format
++ msgid "arp: cant get HW-Address for `%s': %s.\n"
++ msgstr "rarp: Kann Eintrag aus %s : %u nicht setzen.\n"
++ 
++-#: ../arp.c:243
+++#: ../arp.c:252
+++#, c-format
++ msgid "arp: protocol type mismatch.\n"
++ msgstr "arp: unpassende Protokolltypen.\n"
++ 
++-#: ../arp.c:252
+++#: ../arp.c:261
++ #, c-format
++ msgid "arp: device `%s' has HW address %s `%s'.\n"
++-msgstr "arp: Gerät ,,%s'' hat HW-Adresse %s ,,%s''.\n"
+++msgstr "arp: Gerät »%s« hat HW-Adresse %s »%s«.\n"
++ 
++-#: ../arp.c:282
+++#: ../arp.c:293
+++#, c-format
++ msgid "arp: need hardware address\n"
++-msgstr "arp: Hardwareadresse muß angegeben werden\n"
+++msgstr "arp: Hardwareadresse muss angegeben werden\n"
++ 
++-#: ../arp.c:290
+++#: ../arp.c:301
+++#, c-format
++ msgid "arp: invalid hardware address\n"
++ msgstr "arp: ungültige Hardwareadresse\n"
++ 
++-#: ../arp.c:387
+++#: ../arp.c:398
++ #, c-format
++ msgid "arp: cannot open etherfile %s !\n"
++ msgstr "arp: Kann %s nicht öffnen!\n"
++ 
++-#: ../arp.c:403
+++#: ../arp.c:414
++ #, c-format
++ msgid "arp: format error on line %u of etherfile %s !\n"
++ msgstr "arp: Formatfehler in Zeile %u von Etherfile %s.\n"
++ 
++-#: ../arp.c:416
+++#: ../arp.c:427
++ #, c-format
++ msgid "arp: cannot set entry on line %u of etherfile %s !\n"
++ msgstr "arp: Kann Eintrag auf Zeile %u von Etherdatei %s nicht setzen!\n"
++ 
++-#: ../arp.c:437
++-msgid "Address\t\t\tHWtype\tHWaddress\t    Flags Mask\t\t  Iface\n"
+++#: ../arp.c:448
+++#, fuzzy, c-format
+++msgid ""
+++"Address                  HWtype  HWaddress           Flags Mask            "
+++"Iface\n"
++ msgstr "Adresse\t\t\tHWTyp\tHWAdresse\t    Flags   Maske\t\t  Iface\n"
++ 
++-#: ../arp.c:467
+++#: ../arp.c:476
+++#, fuzzy
+++msgid "<from_interface>"
+++msgstr " Schnittstelle: %s\n"
+++
+++#: ../arp.c:478
++ msgid "(incomplete)"
++-msgstr "(unvollsändig)"
+++msgstr "(unvollständig)"
++ 
++-#: ../arp.c:484
+++#: ../arp.c:495
++ #, c-format
++ msgid "%s (%s) at "
++ msgstr "%s (%s) auf "
++ 
++-#: ../arp.c:490
+++#: ../arp.c:501
+++#, c-format
++ msgid "<incomplete> "
++ msgstr "<unvollständig> "
++ 
++-#: ../arp.c:496
+++#: ../arp.c:507
++ #, c-format
++ msgid "netmask %s "
++ msgstr "netzmaske %s "
++ 
++-#: ../arp.c:513
+++#: ../arp.c:524
++ #, c-format
++ msgid "on %s\n"
++ msgstr "auf %s\n"
++ 
++-#: ../arp.c:592
+++#: ../arp.c:605
++ #, c-format
++ msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
++ msgstr "Einträge: %d   Ignoriert: %d   Gefunden: %d\n"
++ 
++-#: ../arp.c:596
+++#: ../arp.c:609
++ #, c-format
++ msgid "%s (%s) -- no entry\n"
++ msgstr "%s (%s) -- kein Eintrag\n"
++ 
++-#: ../arp.c:598
+++#: ../arp.c:611
++ #, c-format
++ msgid "arp: in %d entries no match found.\n"
++-msgstr "arp: In %d Einträgen wurde kein Zutreffender gefunden.\n"
+++msgstr "arp: In %d Einträgen wurde kein zutreffender gefunden.\n"
++ 
++-#: ../arp.c:613
+++#: ../arp.c:626
+++#, c-format
++ msgid ""
++ "Usage:\n"
++ "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
++@@ -109,157 +124,165 @@ msgstr ""
++ "Benutzung:\n"
++ "  arp [-vn]  [<HW>] [-i <if>] [-a] [<Hostname>]\n"
++ 
++-#: ../arp.c:614
+++#: ../arp.c:627
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP "
+++"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
++ "entry\n"
++ msgstr "  arp [-v]          [-i <if>] -d  <Hostname> [pub][nopub]\n"
++ 
++-#: ../arp.c:615
+++#: ../arp.c:628
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from "
+++"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
++ "file\n"
++ msgstr "  arp [-vnD] [<HW>] [-i <if>] -f  <Dateiname>           <- Eintrag aus Datei hinzufügen\n"
++ 
++-#: ../arp.c:616
+++#: ../arp.c:629
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add "
+++"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
++ "entry\n"
++ msgstr ""
++ "  arp [-v]   [<HW>] [-i <if>] -s  <Rechnername> <hwaddr> [temp][nopub]\n"
++ 
++-#: ../arp.c:617
++-msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
++-"<-''-\n"
++-msgstr ""
++-"  arp [-v]   [<HW>] [-i <if>] -s  <Hostname> <hwaddr> [netmask <nm>] pub\n"
++-
++-#: ../arp.c:618
+++#: ../arp.c:630
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      "
+++"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
++ "<-''-\n"
++ "\n"
++ msgstr "  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub\n"
++ 
++-#: ../arp.c:620
+++#: ../arp.c:632
+++#, c-format
++ msgid ""
++ "        -a                       display (all) hosts in alternative (BSD) "
++ "style\n"
++ msgstr "        -a                       Alle Hosts im BSD-Format anzeigen\n"
++ 
++-#: ../arp.c:621
+++#: ../arp.c:633
+++#, c-format
++ msgid "        -s, --set                set a new ARP entry\n"
++ msgstr "        -s, --set                Neuen ARP-Eintrag setzen\n"
++ 
++-#: ../arp.c:622
+++#: ../arp.c:634
+++#, c-format
++ msgid "        -d, --delete             delete a specified entry\n"
++ msgstr "        -d, --delete             Einen bestimmten Eintrag löschen\n"
++ 
++-#: ../arp.c:623 ../netstat.c:1436 ../route.c:85
+++#: ../arp.c:635 ../netstat.c:1503 ../route.c:86
+++#, c-format
++ msgid "        -v, --verbose            be verbose\n"
++ msgstr "        -v, --verbose            Ausführliche Ausgaben\n"
++ 
++-#: ../arp.c:624 ../netstat.c:1437 ../route.c:86
++-msgid "        -n, --numeric            dont resolve names\n"
+++#: ../arp.c:636 ../netstat.c:1504 ../route.c:87
+++#, fuzzy, c-format
+++msgid "        -n, --numeric            don't resolve names\n"
++ msgstr "        -n, --numeric            Adressen nicht nach Namen auflösen\n"
++ 
++-#: ../arp.c:625
+++#: ../arp.c:637
+++#, c-format
++ msgid ""
++ "        -i, --device             specify network interface (e.g. eth0)\n"
++-msgstr "        -i, --device             Netzwerksgerät (z.B. eth0) angeben\n"
+++msgstr "        -i, --device             Netzwerkgerät (z.B. eth0) angeben\n"
++ 
++-#: ../arp.c:626
+++#: ../arp.c:638
+++#, c-format
++ msgid "        -D, --use-device         read <hwaddr> from given device\n"
++ msgstr "        -D, --use-device         <hwaddr> von gegebenem Gerät lesen\n"
++ 
++-#: ../arp.c:627
+++#: ../arp.c:639
+++#, c-format
++ msgid "        -A, -p, --protocol       specify protocol family\n"
++ msgstr "        -A, -p, --protocol              Routentabelle anzeigen\n"
++ 
++-#: ../arp.c:628
+++#: ../arp.c:640
+++#, c-format
++ msgid ""
++-"        -f, --file               read new entries from file or from "
++-"/etc/ethers\n"
+++"        -f, --file               read new entries from file or from /etc/"
+++"ethers\n"
++ "\n"
++ msgstr ""
++ "        -f, --file               Neue Einträge aus Datei lesen\n"
++ "\n"
++ 
++-#: ../arp.c:630 ../rarp.c:181
+++#: ../arp.c:642 ../rarp.c:182
++ #, c-format
++ msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
++ msgstr "  <HW>='-H <hw>' um Hardwareadresstyp anzugeben.  Standard: %s\n"
++ 
++-#: ../arp.c:631 ../rarp.c:182
+++#: ../arp.c:643 ../rarp.c:183
+++#, c-format
++ msgid "  List of possible hardware types (which support ARP):\n"
++ msgstr "  Liste möglicher Hardwaretypen, die ARP unterstützen:\n"
++ 
++-#: ../arp.c:664
+++#: ../arp.c:677 ../arp.c:762
++ #, c-format
++ msgid "%s: hardware type not supported!\n"
++ msgstr "%s: Hardwaretyp nicht unterstützt!\n"
++ 
++-#: ../arp.c:668
+++#: ../arp.c:681
++ #, c-format
++ msgid "%s: address family not supported!\n"
++ msgstr "%s: Adressfamilie nicht unterstützt!\n"
++ 
++-#: ../arp.c:703
+++#: ../arp.c:716
+++#, c-format
++ msgid "arp: -N not yet supported.\n"
++ msgstr "arp: -N noch nicht unterstützt.\n"
++ 
++-#: ../arp.c:713
+++#: ../arp.c:726
++ #, c-format
++ msgid "arp: %s: unknown address family.\n"
++ msgstr "arp: %s: unbekannte Adressfamilie.\n"
++ 
++-#: ../arp.c:722
+++#: ../arp.c:735
++ #, c-format
++ msgid "arp: %s: unknown hardware type.\n"
++ msgstr "arp: %s: unbekannter Hardwaretyp.\n"
++ 
++-#: ../arp.c:741
+++#: ../arp.c:754
++ #, c-format
++ msgid "arp: %s: kernel only supports 'inet'.\n"
++-msgstr "arp: %s: Kernel unterstützt nur ,,inet''.\n"
+++msgstr "arp: %s: Kernel unterstützt nur »inet«.\n"
++ 
++-#: ../arp.c:746
+++#: ../arp.c:767
++ #, c-format
++ msgid "arp: %s: hardware type without ARP support.\n"
++ msgstr "arp: %s: Hardware unterstützt kein ARP.\n"
++ 
++-#: ../hostname.c:69
+++#: ../hostname.c:71
++ #, c-format
++ msgid "Setting nodename to `%s'\n"
++-msgstr "Rechnernamen auf ,,%s'' setzen\n"
+++msgstr "Rechnernamen auf »%s« setzen\n"
++ 
++-#: ../hostname.c:74
+++#: ../hostname.c:76
++ #, c-format
++ msgid "%s: you must be root to change the node name\n"
++ msgstr "%s: Nur Root darf den Rechnernamen ändern\n"
++ 
++-#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116
+++#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117
++ #, c-format
++ msgid "%s: name too long\n"
++ msgstr "%s: name zu lang\n"
++ 
++-#: ../hostname.c:89
+++#: ../hostname.c:91
++ #, c-format
++ msgid "Setting hostname to `%s'\n"
++-msgstr "Setze Hostname auf ,,%s''\n"
+++msgstr "Setze Hostname auf »%s«\n"
++ 
++-#: ../hostname.c:94
+++#: ../hostname.c:96
++ #, c-format
++ msgid "%s: you must be root to change the host name\n"
++-msgstr "%s: Nur Root darf then Rechnernamen ändern\n"
+++msgstr "%s: Nur Root darf den Rechnernamen ändern\n"
++ 
++-#: ../hostname.c:108
+++#: ../hostname.c:109
++ #, c-format
++ msgid "Setting domainname to `%s'\n"
++-msgstr "Setze domainname auf ,,%s''\n"
+++msgstr "Setze domainname auf »%s«\n"
++ 
++-#: ../hostname.c:113
+++#: ../hostname.c:114
++ #, c-format
++ msgid "%s: you must be root to change the domain name\n"
++ msgstr "%s: Nur Root darf den Domainnamen ändern\n"
++@@ -267,51 +290,56 @@ msgstr "%s: Nur Root darf den Domainname
++ #: ../hostname.c:131
++ #, c-format
++ msgid "Resolving `%s' ...\n"
++-msgstr "Löse ,,%s'' auf ...\n"
+++msgstr "Löse »%s« auf ...\n"
++ 
++ #: ../hostname.c:137
++ #, c-format
++ msgid "Result: h_name=`%s'\n"
++-msgstr "Ergebnis: h_name=,,%s''\n"
+++msgstr "Ergebnis: h_name=»%s«\n"
++ 
++ #: ../hostname.c:142
++ #, c-format
++ msgid "Result: h_aliases=`%s'\n"
++-msgstr "Ergebnis: h_aliases=,,%s''\n"
+++msgstr "Ergebnis: h_aliases=»%s«\n"
++ 
++ #: ../hostname.c:147
++ #, c-format
++ msgid "Result: h_addr_list=`%s'\n"
++-msgstr "Ergebnis: h_addr_list=,,%s''\n"
+++msgstr "Ergebnis: h_addr_list=»%s«\n"
++ 
++-#: ../hostname.c:209
+++#: ../hostname.c:208
++ #, c-format
++ msgid "%s: can't open `%s'\n"
++-msgstr "%s: Kann ,,%s'' nicht öffnen\n"
+++msgstr "%s: Kann »%s« nicht öffnen\n"
++ 
++-#: ../hostname.c:223
+++#: ../hostname.c:222
+++#, c-format
++ msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
++ msgstr ""
++ "Benutzung: hostname [-v] {Hostname|-F Datei} Hostname (aus Datei) setzen\n"
++ 
++-#: ../hostname.c:224
+++#: ../hostname.c:223
+++#, c-format
++ msgid ""
++ "       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
++ msgstr ""
++-"       domainname [-v] {nisdomain|-F file}   NIS Domainname (aus Datei) "
+++"       domainname [-v] {nisdomain|-F file}   NIS-Domainname (aus Datei) "
++ "setzen.\n"
++ 
++-#: ../hostname.c:226
+++#: ../hostname.c:225
+++#, c-format
++ msgid ""
++ "       nodename [-v] {nodename|-F file}      set DECnet node name (from "
++ "file)\n"
++ msgstr "       nodename [-v] {Rechnername|-F Datei}\n"
++ 
++-#: ../hostname.c:228
+++#: ../hostname.c:227
+++#, c-format
++ msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
++ msgstr "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]\n"
++ 
++-#: ../hostname.c:229
+++#: ../hostname.c:228
+++#, c-format
++ msgid ""
++ "       hostname [-v]                         display hostname\n"
++ "\n"
++@@ -319,7 +347,8 @@ msgstr ""
++ "       hostname [-v]                         Hostnamen anzeigen\n"
++ "\n"
++ 
++-#: ../hostname.c:230
+++#: ../hostname.c:229
+++#, c-format
++ msgid ""
++ "       hostname -V|--version|-h|--help       print info and exit\n"
++ "\n"
++@@ -328,7 +357,8 @@ msgstr ""
++ "beenden.\n"
++ "\n"
++ 
++-#: ../hostname.c:231
+++#: ../hostname.c:230
+++#, c-format
++ msgid ""
++ "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
++ "\n"
++@@ -336,43 +366,52 @@ msgstr ""
++ "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
++ "\n"
++ 
++-#: ../hostname.c:232
+++#: ../hostname.c:231
+++#, c-format
++ msgid "    -s, --short           short host name\n"
++ msgstr "    -s, --short           Kurzer Hostname\n"
++ 
++-#: ../hostname.c:233
+++#: ../hostname.c:232
+++#, c-format
++ msgid "    -a, --alias           alias names\n"
++ msgstr "    -a, --alias           Namensalias\n"
++ 
++-#: ../hostname.c:234
+++#: ../hostname.c:233
+++#, c-format
++ msgid "    -i, --ip-address      addresses for the hostname\n"
++ msgstr "    -i, --ip-address      Adressen für den Hostnamen\n"
++ 
++-#: ../hostname.c:235
+++#: ../hostname.c:234
+++#, c-format
++ msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
++ msgstr "    -f, --fqdn, --long    Langer Hostname (FQDN)\n"
++ 
++-#: ../hostname.c:236
+++#: ../hostname.c:235
+++#, c-format
++ msgid "    -d, --domain          DNS domain name\n"
++-msgstr "    -d, --domain          DNS Domainname\n"
+++msgstr "    -d, --domain          DNS-Domainname\n"
++ 
++-#: ../hostname.c:237
+++#: ../hostname.c:236
+++#, c-format
++ msgid "    -y, --yp, --nis       NIS/YP domainname\n"
++-msgstr "    -y, --yp, --nis       NIS/YP Domainname\n"
+++msgstr "    -y, --yp, --nis       NIS/YP-Domainname\n"
++ 
++-#: ../hostname.c:239
+++#: ../hostname.c:238
+++#, c-format
++ msgid "    -n, --node            DECnet node name\n"
++-msgstr "    -n, --node            DECnet Knotennamen\n"
+++msgstr "    -n, --node            DECnet-Knotennamen\n"
++ 
++-#: ../hostname.c:241
+++#: ../hostname.c:240
+++#, c-format
++ msgid ""
++ "    -F, --file            read hostname or NIS domainname from given file\n"
++ "\n"
++ msgstr ""
++-"    -F, --file            Hostnamen oder NIS Domainnamen aus Datei lesen\n"
+++"    -F, --file            Hostnamen oder NIS-Domainnamen aus Datei lesen\n"
++ "\n"
++ 
++-#: ../hostname.c:243
+++#: ../hostname.c:242
+++#, c-format
++ msgid ""
++ "   This command can read or set the hostname or the NIS domainname. You can\n"
++ "   also read the DNS domain or the FQDN (fully qualified domain name).\n"
++@@ -380,395 +419,268 @@ msgid ""
++ "   FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n"
++ "   part of the FQDN) in the /etc/hosts file.\n"
++ msgstr ""
++-"   Dies Kommando setzt oder gibt den Hostnamen oder NIS Domainnamen aus.\n"
++-"   Es ist ebenfalls möglich die DNS Domain oder den FQDN (langen Hostnamen)\n"
+++"   Dies Kommando setzt oder gibt den Hostnamen oder NIS-Domainnamen aus.\n"
+++"   Es ist ebenfalls möglich die DNS-Domain oder den FQDN (langen Hostnamen)\n"
++ "   ausgeben zu lassen.  Außer wenn DNS oder NIS als Namensdienst verwendet\n"
++-"   wird, können FQDN (Fully Qualified Domain Name) und DNS Domainname (welcher\n"
+++"   wird, können FQDN (Fully Qualified Domain Name) und DNS-Domainname (welcher\n"
++ "   Teil des FQDNs ist) in /etc/hosts geändert werden.\n"
++ 
++ #: ../hostname.c:338
++ #, c-format
++ msgid "%s: You can't change the DNS domain name with this command\n"
++-msgstr "%s: Mit diesem Program kann der DNS Domainname nicht geändert werden\n"
+++msgstr "%s: Mit diesem Programm kann der DNS-Domainname nicht geändert werden\n"
++ 
++ #: ../hostname.c:339
+++#, c-format
++ msgid ""
++ "\n"
++ "Unless you are using bind or NIS for host lookups you can change the DNS\n"
++ msgstr ""
++ "\n"
++-"Wenn Bind oder NIS nicht zur Hostnamensauflösung benutzt werden, kann der "
++-"DNS\n"
+++"Wenn Bind oder NIS nicht zur Hostnamensauflösung benutzt werden, kann der DNS\n"
++ 
++ #: ../hostname.c:340
+++#, c-format
++ msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
++-msgstr ""
++-"Domainname (welcher Teil des FQDN ist) in der Datei /etc/hosts geändert "
++-"werden.\n"
+++msgstr "Domainname (welcher Teil des FQDN ist) in der Datei /etc/hosts geändert werden.\n"
++ 
++ #: ../hostname.c:357
++ #, c-format
++ msgid "gethostname()=`%s'\n"
++-msgstr "gethostname()=,,%s''\n"
+++msgstr "gethostname()=»%s«\n"
++ 
++ #: ../hostname.c:374
++ #, c-format
++ msgid "getdomainname()=`%s'\n"
++-msgstr "getdomainname()=,,%s''\n"
+++msgstr "getdomainname()=»%s«\n"
++ 
++ #: ../hostname.c:389
++ #, c-format
++ msgid "getnodename()=`%s'\n"
++-msgstr "getnodename()=,,%s''\n"
+++msgstr "getnodename()=»%s«\n"
++ 
++-#: ../ifconfig.c:159
++-#, c-format
++-msgid "%-9.9s Link encap:%s  "
++-msgstr "%-9.9s Protokoll:%s  "
+++#: ../ifconfig.c:107
+++#, fuzzy, c-format
+++msgid ""
+++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
+++"Flg\n"
+++msgstr "SStelle MTU Met    RX-OK RX-Feh RX-DRP RX-Ülf    TX-OK TX-Feh TX-DRP TX-Üb Flg\n"
++ 
++-#: ../ifconfig.c:164
++-#, c-format
++-msgid "HWaddr %s  "
++-msgstr "Hardware Adresse %s  "
+++#: ../ifconfig.c:129 ../ifconfig.c:161
+++#, fuzzy, c-format
+++msgid "%s: ERROR while getting interface flags: %s\n"
+++msgstr "%s: Fehler beim Auslesen der Schnittstelleninformation: %s\n"
++ 
++-#: ../ifconfig.c:167
+++#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
+++#: ../ifconfig.c:973
++ #, c-format
++-msgid "Media:%s"
++-msgstr "Medium:%s"
+++msgid "No support for INET on this system.\n"
+++msgstr "INET ist auf diesem System nicht verfügbar.\n"
++ 
++-#: ../ifconfig.c:169
++-msgid "(auto)"
++-msgstr "(auto)"
+++#: ../ifconfig.c:193
+++#, fuzzy, c-format
+++msgid "%s: ERROR while testing interface flags: %s\n"
+++msgstr "%s: Fehler beim Auslesen der Schnittstelleninformation: %s\n"
++ 
++-#: ../ifconfig.c:176
++-#, c-format
++-msgid "          %s addr:%s "
++-msgstr "          %s Adresse:%s "
+++#: ../ifconfig.c:202
+++#, fuzzy, c-format
+++msgid ""
+++"Usage:\n"
+++"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
+++msgstr ""
+++"Syntax:\n"
+++"  ifconfig [-a] [-i] [-v] <Schnittstelle> [[<AF>] <Adresse>]\n"
++ 
++-#: ../ifconfig.c:179
+++#: ../ifconfig.c:204
++ #, c-format
++-msgid " P-t-P:%s "
++-msgstr " P-z-P:%s "
+++msgid "  [add <address>[/<prefixlen>]]\n"
+++msgstr "  [add <Adresse>[/<Präfixlänge>]]\n"
++ 
++-#: ../ifconfig.c:182
+++#: ../ifconfig.c:205
++ #, c-format
++-msgid " Bcast:%s "
++-msgstr " Bcast:%s "
+++msgid "  [del <address>[/<prefixlen>]]\n"
+++msgstr "  [del <Adresse>[/<Präfixlänge>]]\n"
++ 
++-#: ../ifconfig.c:184
+++#: ../ifconfig.c:206
++ #, c-format
++-msgid " Mask:%s\n"
++-msgstr " Maske:%s\n"
+++msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
+++msgstr "  [[-]broadcast [<Adresse>]]  [[-]pointopoint [<Adresse>]]\n"
++ 
++-#: ../ifconfig.c:201
+++#: ../ifconfig.c:207
++ #, c-format
++-msgid "          inet6 addr: %s/%d"
++-msgstr "          inet6 Adresse: %s/%d"
++-
++-#: ../ifconfig.c:203
++-msgid " Scope:"
++-msgstr " Gültigkeitsbereich:"
++-
++-#: ../ifconfig.c:206
++-msgid "Global"
++-msgstr "Global"
+++msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
+++msgstr "  [netmask <Adresse>]  [dstaddr <Adresse>]  [tunnel <Adresse>]\n"
++ 
++-#: ../ifconfig.c:209
++-msgid "Link"
++-msgstr "Verbindung"
+++#: ../ifconfig.c:210
+++#, c-format
+++msgid "  [outfill <NN>] [keepalive <NN>]\n"
+++msgstr "  [outfill <NN>] [keepalive <NN>]\n"
++ 
++ #: ../ifconfig.c:212
++-msgid "Site"
++-msgstr "Standort"
++-
++-#: ../ifconfig.c:215
++-msgid "Compat"
++-msgstr "Kompatibilität"
++-
++-#: ../ifconfig.c:218
++-msgid "Host"
++-msgstr "Maschine"
++-
++-#: ../ifconfig.c:221
++-msgid "Unknown"
++-msgstr "Unbekannt"
++-
++-#: ../ifconfig.c:236
++ #, c-format
++-msgid "          IPX/Ethernet II addr:%s\n"
++-msgstr "          IPX/Ethernet II Adresse:%s\n"
+++msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
+++msgstr "  [hw <HW> <Adresse>]  [metric <NN>]  [mtu <NN>]\n"
++ 
++-#: ../ifconfig.c:239
+++#: ../ifconfig.c:213
++ #, c-format
++-msgid "          IPX/Ethernet SNAP addr:%s\n"
++-msgstr "          IPX/Ethernet SNAP Adresse:%s\n"
+++msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
+++msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
++ 
++-#: ../ifconfig.c:242
+++#: ../ifconfig.c:214
++ #, c-format
++-msgid "          IPX/Ethernet 802.2 addr:%s\n"
++-msgstr "          IPX/Ethernet 802.2 Adresse:%s\n"
+++msgid "  [multicast]  [[-]promisc]\n"
+++msgstr "  [multicast]  [[-]promisc]\n"
++ 
++-#: ../ifconfig.c:245
+++#: ../ifconfig.c:215
++ #, c-format
++-msgid "          IPX/Ethernet 802.3 addr:%s\n"
++-msgstr "          IPX/Ethernet 802.3 Adresse:%s\n"
+++msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
+++msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <Typ>]\n"
++ 
++-#: ../ifconfig.c:255
+++#: ../ifconfig.c:217
++ #, c-format
++-msgid "          EtherTalk Phase 2 addr:%s\n"
++-msgstr "          EtherTalk Phase 2 Adresse:%s\n"
+++msgid "  [txqueuelen <NN>]\n"
+++msgstr "  [txqueuelen <Länge>]\n"
++ 
++-#: ../ifconfig.c:264
+++#: ../ifconfig.c:220
++ #, c-format
++-msgid "          econet addr:%s\n"
++-msgstr "          econet Adresse:%s\n"
++-
++-#: ../ifconfig.c:270
++-msgid "[NO FLAGS] "
++-msgstr "[KEINE FLAGS] "
++-
++-#: ../ifconfig.c:272
++-msgid "UP "
++-msgstr "UP "
++-
++-#: ../ifconfig.c:274
++-msgid "BROADCAST "
++-msgstr "BROADCAST "
++-
++-#: ../ifconfig.c:276
++-msgid "DEBUG "
++-msgstr "DEBUG "
++-
++-#: ../ifconfig.c:278
++-msgid "LOOPBACK "
++-msgstr "LOOPBACK "
++-
++-#: ../ifconfig.c:280
++-msgid "POINTOPOINT "
++-msgstr "PUNKTZUPUNKT "
++-
++-#: ../ifconfig.c:282
++-msgid "NOTRAILERS "
++-msgstr "NOTRAILERS "
+++msgid "  [[-]dynamic]\n"
+++msgstr "  [[-]dynamic]\n"
++ 
++-#: ../ifconfig.c:284
++-msgid "RUNNING "
++-msgstr "RUNNING "
+++#: ../ifconfig.c:222
+++#, c-format
+++msgid ""
+++"  [up|down] ...\n"
+++"\n"
+++msgstr ""
+++"  [up|down] ...\n"
+++"\n"
++ 
++-#: ../ifconfig.c:286
++-msgid "NOARP "
++-msgstr "NOARP "
+++#: ../ifconfig.c:224
+++#, c-format
+++msgid "  <HW>=Hardware Type.\n"
+++msgstr "  <HW>=Hardwaretyp.\n"
++ 
++-#: ../ifconfig.c:288
++-msgid "PROMISC "
++-msgstr "PROMISC "
+++#: ../ifconfig.c:225
+++#, c-format
+++msgid "  List of possible hardware types:\n"
+++msgstr "  Liste möglicher Hardwaretypen:\n"
++ 
++-#: ../ifconfig.c:290
++-msgid "ALLMULTI "
++-msgstr "ALLMULTI "
+++#. 1 = ARPable
+++#: ../ifconfig.c:227
+++#, c-format
+++msgid "  <AF>=Address family. Default: %s\n"
+++msgstr "  <AF>=Adressfamilie.  Standardwert: %s\n"
++ 
++-#: ../ifconfig.c:292
++-msgid "SLAVE "
++-msgstr "SLAVE "
+++#: ../ifconfig.c:228
+++#, c-format
+++msgid "  List of possible address families:\n"
+++msgstr "  List der möglichen Adressfamilien:\n"
++ 
++-#: ../ifconfig.c:294
++-msgid "MASTER "
++-msgstr "MASTER "
+++#: ../ifconfig.c:303
+++#, c-format
+++msgid "ifconfig: option `%s' not recognised.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:296
++-msgid "MULTICAST "
++-msgstr "MULTICAST "
+++#: ../ifconfig.c:305 ../ifconfig.c:962
+++#, c-format
+++msgid "ifconfig: `--help' gives usage information.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:299
++-msgid "DYNAMIC "
++-msgstr "DYNAMIC "
+++#: ../ifconfig.c:380
+++#, c-format
+++msgid "Unknown media type.\n"
+++msgstr "Typ des Mediums unbekannt.\n"
++ 
++-#: ../ifconfig.c:302
+++#: ../ifconfig.c:417
++ #, c-format
++-msgid " MTU:%d  Metric:%d"
++-msgstr " MTU:%d  Metric:%d"
+++msgid ""
+++"Warning: Interface %s still in promisc mode... maybe other application is "
+++"running?\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:306
+++#: ../ifconfig.c:429
++ #, c-format
++-msgid "  Outfill:%d  Keepalive:%d"
++-msgstr "  Outfill:%d  Keepalive:%d"
+++msgid "Warning: Interface %s still in MULTICAST mode.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:320
+++#: ../ifconfig.c:441
++ #, c-format
++-msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
+++msgid "Warning: Interface %s still in ALLMULTI mode.\n"
++ msgstr ""
++-"Empfangene Pakete:%lu Fehler:%lu Weggeworfen:%lu Überlauf:%lu Rahmen:%lu\n"
++ 
++-#: ../ifconfig.c:325
+++#: ../ifconfig.c:465
++ #, c-format
++-msgid "             compressed:%lu\n"
++-msgstr "             komprimiert:%lu\n"
+++msgid "Warning: Interface %s still in DYNAMIC mode.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:329
+++#: ../ifconfig.c:523
++ #, c-format
++-msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
+++msgid "Warning: Interface %s still in BROADCAST mode.\n"
++ msgstr ""
++-"Verschickte Pakete:%lu Fehler:%lu Weggeworfen:%lu Überlauf:%lu Träger:%lu\n"
++ 
++-#: ../ifconfig.c:333
+++#: ../ifconfig.c:652
++ #, c-format
++-msgid "          collisions:%lu "
++-msgstr "          Kollisionen:%lu "
+++msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:335
+++#: ../ifconfig.c:684
++ #, c-format
++-msgid "compressed:%lu "
++-msgstr "Komprimiert:%lu "
+++msgid "hw address type `%s' has no handler to set address. failed.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:337
+++#: ../ifconfig.c:693
++ #, c-format
++-msgid "txqueuelen:%d "
++-msgstr "Sendewarteschlangenlänge:%d "
+++msgid "%s: invalid %s address.\n"
+++msgstr "%s: ungültige %s Adresse.\n"
++ 
++-#: ../ifconfig.c:345
+++#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
++ #, c-format
++-msgid "Interrupt:%d "
++-msgstr "Interrupt:%d "
++-
++-#. Only print devices using it for
++-#. I/O maps
++-#: ../ifconfig.c:348
++-#, c-format
++-msgid "Base address:0x%x "
++-msgstr "Basisadresse:0x%x "
++-
++-#: ../ifconfig.c:350
++-#, c-format
++-msgid "Memory:%lx-%lx "
++-msgstr "Speicher:%lx-%lx "
++-
++-#: ../ifconfig.c:353
++-#, c-format
++-msgid "DMA chan:%x "
++-msgstr "DMA Kanal:%x "
+++msgid "No support for INET6 on this system.\n"
+++msgstr "INET6 ist auf diesem System nicht verfügbar.\n"
++ 
++-#: ../ifconfig.c:384 ../ifconfig.c:405
+++#: ../ifconfig.c:780 ../ifconfig.c:871
++ #, c-format
++-msgid "%s: unknown interface: %s\n"
++-msgstr "%s: unbekannte Schnittstelle: %s\n"
++-
++-#: ../ifconfig.c:421
++-msgid ""
++-"Usage:\n"
++-"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <address>]\n"
++-msgstr ""
++-"Syntax:\n"
++-"  ifconfig [-a] [-i] [-v] <Schnittstelle> [[<AF>] <Adresse>]\n"
++-
++-#: ../ifconfig.c:425
++-msgid "  [add <address>[/<prefixlen>]]\n"
++-msgstr "  [add <Adresse>[/<Prefixlänge>]]\n"
++-
++-#: ../ifconfig.c:427
++-msgid "  [del <address>[/<prefixlen>]]\n"
++-msgstr "  [del <Adresse>[/<Prefixlänge>]]\n"
++-
++-#: ../ifconfig.c:432
++-msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
++-msgstr "  [[-]broadcast [<Adresse>]]  [[-]pointopoint [<Adresse>]]\n"
++-
++-#: ../ifconfig.c:433
++-msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
++-msgstr "  [netmask <Addresse>]  [dstaddr <Adresse>]  [tunnel <Adresse>]\n"
++-
++-#: ../ifconfig.c:436
++-msgid "  [outfill <NN>] [keepalive <NN>]\n"
++-msgstr "  [outfill <NN>] [keepalive <NN>]\n"
++-
++-#: ../ifconfig.c:438
++-msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
++-msgstr "  [hw <HW> <Adresse>]  [metric <NN>]  [mtu <NN>]\n"
++-
++-#: ../ifconfig.c:439
++-msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
++-msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
++-
++-#: ../ifconfig.c:440
++-msgid "  [multicast]  [[-]promisc]\n"
++-msgstr "  [multicast]  [[-]promisc]\n"
++-
++-#: ../ifconfig.c:441
++-msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
++-msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <Typ>]\n"
++-
++-#: ../ifconfig.c:443
++-msgid "  [txqueuelen <NN>]\n"
++-msgstr "  [txqueuelen <Länge>]\n"
++-
++-#: ../ifconfig.c:446
++-msgid "  [[-]dynamic]\n"
++-msgstr "  [[-]dynamic]\n"
++-
++-#: ../ifconfig.c:448
++-msgid ""
++-"  [up|down] ...\n"
++-"\n"
+++msgid "Interface %s not initialized\n"
++ msgstr ""
++-"  [up|down] ...\n"
++-"\n"
++-
++-#: ../ifconfig.c:450
++-msgid "  <HW>=Hardware Type.\n"
++-msgstr "  <HW>=Hardwaretyp.\n"
++-
++-#: ../ifconfig.c:451
++-msgid "  List of possible hardware types:\n"
++-msgstr "  Liste möglicher Hardwaretypen:\n"
++-
++-#. 1 = ARPable
++-#: ../ifconfig.c:453
++-#, c-format
++-msgid "  <AF>=Address family. Default: %s\n"
++-msgstr "  <AF>=Adressfamilie.  Standardwert: %s\n"
++-
++-#: ../ifconfig.c:454
++-msgid "  List of possible address families:\n"
++-msgstr "  List der möglichen Adressfamilien:\n"
++-
++-#: ../ifconfig.c:593
++-msgid "Unknown media type.\n"
++-msgstr "Typ des Mediums unbekannt.\n"
++ 
++-#: ../ifconfig.c:881
++-#, c-format
++-msgid "%s: invalid %s address.\n"
+++#: ../ifconfig.c:792 ../ifconfig.c:882
+++#, fuzzy, c-format
+++msgid "Bad address.\n"
++ msgstr "%s: ungültige %s Adresse.\n"
++ 
++-#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011
++-msgid "No support for INET6 on this system.\n"
++-msgstr "INET6 ist auf diesem System nicht verfügbar.\n"
++-
++-#: ../ifconfig.c:983
+++#: ../ifconfig.c:885
+++#, c-format
++ msgid "Address deletion not supported on this system.\n"
++-msgstr "Das Löschen von Adressen ist auf diesem System nicht unterstützt.\n"
+++msgstr "Das Löschen von Adressen wird auf diesem System nicht unterstützt.\n"
++ 
++-#: ../ifconfig.c:1066
++-msgid "No support for INET on this system.\n"
++-msgstr "INET ist auf diesem System nicht verfügbar.\n"
+++#: ../ifconfig.c:957
+++#, fuzzy, c-format
+++msgid "ifconfig: Cannot set address for this protocol family.\n"
+++msgstr "Kann die Adressen der Familie %d nicht setzen.\n"
++ 
++-#: ../ifconfig.c:1076
+++#: ../ifconfig.c:983
+++#, c-format
++ msgid "No support for ECONET on this system.\n"
++ msgstr "ECONET wird auf diesem System nicht unterstützt.\n"
++ 
++-#: ../ifconfig.c:1084
+++#: ../ifconfig.c:991
++ #, c-format
++ msgid "Don't know how to set addresses for family %d.\n"
++ msgstr "Kann die Adressen der Familie %d nicht setzen.\n"
++ 
++-#: ../netstat.c:383
+++#: ../ifconfig.c:1021
+++#, c-format
+++msgid "WARNING: at least one error occured. (%d)\n"
+++msgstr ""
+++
+++#: ../netstat.c:434
++ #, c-format
++ msgid ""
++ "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
++-msgstr ""
++-"(Für \"-p\": geteuid()=%d konnte keine Information gelesen werden; sie "
++-"sollten Root sein.)\n"
+++msgstr "(Für \"-p\": geteuid()=%d konnte keine Information gelesen werden; sie sollten Root sein.)\n"
++ 
++-#: ../netstat.c:387
+++#: ../netstat.c:438
+++#, c-format
++ msgid ""
++ "(Not all processes could be identified, non-owned process info\n"
++ " will not be shown, you would have to be root to see it all.)\n"
++@@ -776,198 +688,220 @@ msgstr ""
++ "(Es konnten nicht alle Prozesse identifiziert werden; Informationen über\n"
++ "nicht-eigene Processe werden nicht angezeigt; Root kann sie anzeigen.)\n"
++ 
++-#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166
+++#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
++ msgid "LISTENING"
++ msgstr "HÖRT"
++ 
++-#: ../netstat.c:395
+++#: ../netstat.c:446
++ msgid "CONN SENT"
++ msgstr "VERBINGSAUFBAU GESCHICKT"
++ 
++-#: ../netstat.c:396 ../netstat.c:1168
+++#: ../netstat.c:447 ../netstat.c:1268
++ msgid "DISC SENT"
++ msgstr "VERBINDUNGSABBAU GESCHICKT"
++ 
++-#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169
+++#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
++ msgid "ESTABLISHED"
++ msgstr "VERBUNDEN"
++ 
++-#: ../netstat.c:419
+++#: ../netstat.c:470
+++#, c-format
++ msgid "Active NET/ROM sockets\n"
++ msgstr "Aktive NET/ROM Sockets\n"
++ 
++-#: ../netstat.c:420
+++#: ../netstat.c:471
+++#, c-format
++ msgid ""
++-"User       Dest       Source     Device  State        Vr/Vs    Send-Q  "
++-"Recv-Q\n"
++-msgstr ""
++-"Benutzer   Ziel       Quelle     Gerät   Zustand      Vr/Vs    Send-Q  "
++-"Recv-Q\n"
+++"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
+++"Q\n"
+++msgstr "Benutzer   Ziel       Quelle     Gerät   Zustand      Vr/Vs    Send-Q  Recv-Q\n"
++ 
++-#: ../netstat.c:430 ../netstat.c:1208
+++#: ../netstat.c:481 ../netstat.c:1308
++ #, c-format
++ msgid "Problem reading data from %s\n"
++ msgstr "Probleme beim Lesen von %s\n"
++ 
++-#: ../netstat.c:465
+++#: ../netstat.c:516
++ msgid "SYN_SENT"
++ msgstr "SYN_SENT"
++ 
++-#: ../netstat.c:466
+++#: ../netstat.c:517
++ msgid "SYN_RECV"
++ msgstr "SYN_RECV"
++ 
++-#: ../netstat.c:467
+++#: ../netstat.c:518
++ msgid "FIN_WAIT1"
++ msgstr "FIN_WAIT1"
++ 
++-#: ../netstat.c:468
+++#: ../netstat.c:519
++ msgid "FIN_WAIT2"
++ msgstr "FIN_WAIT2"
++ 
++-#: ../netstat.c:469
+++#: ../netstat.c:520
++ msgid "TIME_WAIT"
++ msgstr "TIME_WAIT"
++ 
++-#: ../netstat.c:470
+++#: ../netstat.c:521
++ msgid "CLOSE"
++ msgstr "CLOSE"
++ 
++-#: ../netstat.c:471
+++#: ../netstat.c:522
++ msgid "CLOSE_WAIT"
++ msgstr "CLOSE_WAIT"
++ 
++-#: ../netstat.c:472
+++#: ../netstat.c:523
++ msgid "LAST_ACK"
++ msgstr "LAST_ACK"
++ 
++-#: ../netstat.c:473
+++#: ../netstat.c:524
++ msgid "LISTEN"
++ msgstr "LISTEN"
++ 
++-#: ../netstat.c:474
+++#: ../netstat.c:525
++ msgid "CLOSING"
++ msgstr "CLOSING"
++ 
++-#: ../netstat.c:544
+++#: ../netstat.c:596
++ #, c-format
++ msgid "warning, got bogus igmp6 line %d.\n"
++ msgstr "Warnung, fehlerhafte igmp6 line %d.\n"
++ 
++-#: ../netstat.c:549 ../netstat.c:587 ../netstat.c:670 ../netstat.c:803
++-#: ../netstat.c:935 ../netstat.c:940
+++#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
+++#: ../netstat.c:1032 ../netstat.c:1037
++ #, c-format
++ msgid "netstat: unsupported address family %d !\n"
++ msgstr "netstat: Nicht unterstützte Adressfamilie %d!\n"
++ 
++-#: ../netstat.c:562 ../netstat.c:567 ../netstat.c:575 ../netstat.c:582
+++#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
++ #, c-format
++ msgid "warning, got bogus igmp line %d.\n"
++ msgstr "Warnung, fehlerhafte igmp-Zeile %d.\n"
++ 
++-#: ../netstat.c:666
+++#: ../netstat.c:677
+++#, fuzzy, c-format
+++msgid "Active X.25 sockets\n"
+++msgstr "Aktive AX.25 Sockets\n"
+++
+++#. IMHO, Vr/Vs is not very usefull --SF
+++#: ../netstat.c:679
+++#, fuzzy, c-format
+++msgid ""
+++"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
+++"Q\n"
+++msgstr "Ziel       Quelle     Gerät   Zustand      Vr/Vs    Send-Q  Empf-Q\n"
+++
+++#: ../netstat.c:759
+++#, c-format
++ msgid "warning, got bogus tcp line.\n"
++ msgstr "Warnung, fehlerhafte TCP Zeile.\n"
++ 
++-#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975
+++#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
++ #, c-format
++ msgid "off (0.00/%ld/%d)"
++ msgstr "aus (0.00/%ld/%d)"
++ 
++-#: ../netstat.c:708
+++#: ../netstat.c:804
++ #, c-format
++ msgid "on (%2.2f/%ld/%d)"
++ msgstr "ein (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:713
+++#: ../netstat.c:809
++ #, fuzzy, c-format
++ msgid "keepalive (%2.2f/%ld/%d)"
++ msgstr "ein%d (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:718
+++#: ../netstat.c:814
++ #, fuzzy, c-format
++ msgid "timewait (%2.2f/%ld/%d)"
++ msgstr "ein%d (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985
+++#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
++ #, c-format
++ msgid "unkn-%d (%2.2f/%ld/%d)"
++ msgstr "unkn-%d (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:799
+++#: ../netstat.c:894
+++#, c-format
++ msgid "warning, got bogus udp line.\n"
++ msgstr "Warnung, fehlerhafe UDP-Zeile.\n"
++ 
++-#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108
+++#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
++ msgid "UNKNOWN"
++ msgstr "UNBEKANNT"
++ 
++-#: ../netstat.c:860 ../netstat.c:980
+++#: ../netstat.c:958 ../netstat.c:1080
++ #, c-format
++ msgid "on%d (%2.2f/%ld/%d)"
++ msgstr "ein%d (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:949
+++#: ../netstat.c:1046
+++#, c-format
++ msgid "warning, got bogus raw line.\n"
++ msgstr "Warnung, fehlerhafte raw-Zeile.\n"
++ 
++-#: ../netstat.c:1028
+++#: ../netstat.c:1128
+++#, c-format
++ msgid "warning, got bogus unix line.\n"
++ msgstr "Warnung, fehlerhafte UNIX-Zeile.\n"
++ 
++-#: ../netstat.c:1055
+++#: ../netstat.c:1155
++ msgid "STREAM"
++ msgstr "STREAM"
++ 
++-#: ../netstat.c:1059
+++#: ../netstat.c:1159
++ msgid "DGRAM"
++ msgstr "DGRAM"
++ 
++-#: ../netstat.c:1063
+++#: ../netstat.c:1163
++ msgid "RAW"
++ msgstr "RAW"
++ 
++-#: ../netstat.c:1067
+++#: ../netstat.c:1167
++ msgid "RDM"
++ msgstr "RDM"
++ 
++-#: ../netstat.c:1071
+++#: ../netstat.c:1171
++ msgid "SEQPACKET"
++-msgstr "SEQPACKET"
+++msgstr "SEQPAKET"
++ 
++-#: ../netstat.c:1080
+++#: ../netstat.c:1180
++ msgid "FREE"
++ msgstr "FREI"
++ 
++-#: ../netstat.c:1096
+++#: ../netstat.c:1196
++ msgid "CONNECTING"
++ msgstr "VERBINDUNGSAUFBAU"
++ 
++-#: ../netstat.c:1100
+++#: ../netstat.c:1200
++ msgid "CONNECTED"
++ msgstr "VERBUNDEN"
++ 
++-#: ../netstat.c:1104
+++#: ../netstat.c:1204
++ msgid "DISCONNECTING"
++ msgstr "VERBINDUNGSABBAU"
++ 
++-#: ../netstat.c:1135
+++#: ../netstat.c:1235
+++#, c-format
++ msgid "Active UNIX domain sockets "
++-msgstr "Aktive Sockets in der UNIX Domäne "
+++msgstr "Aktive Sockets in der UNIX-Domäne "
++ 
++-#: ../netstat.c:1137 ../netstat.c:1666
+++#: ../netstat.c:1237 ../netstat.c:1756
+++#, c-format
++ msgid "(servers and established)"
++ msgstr "(Server und stehende Verbindungen)"
++ 
++-#: ../netstat.c:1140 ../netstat.c:1669
+++#: ../netstat.c:1240 ../netstat.c:1759
+++#, c-format
++ msgid "(only servers)"
++ msgstr "(Nur Server)"
++ 
++-#: ../netstat.c:1142 ../netstat.c:1671
+++#: ../netstat.c:1242 ../netstat.c:1761
+++#, c-format
++ msgid "(w/o servers)"
++ msgstr "(ohne Server)"
++ 
++-#: ../netstat.c:1145
+++#: ../netstat.c:1245
+++#, c-format
++ msgid ""
++ "\n"
++ "Proto RefCnt Flags       Type       State         I-Node"
++@@ -975,90 +909,90 @@ msgstr ""
++ "\n"
++ "Proto RefZäh Flaggen     Typ        Zustand       I-Node"
++ 
++-#: ../netstat.c:1147
+++#: ../netstat.c:1247
+++#, c-format
++ msgid " Path\n"
++ msgstr " Pfad\n"
++ 
++-#: ../netstat.c:1167
+++#: ../netstat.c:1267
++ msgid "SABM SENT"
++ msgstr "SABM GESCHICKT"
++ 
++-#: ../netstat.c:1170
+++#: ../netstat.c:1270
++ msgid "RECOVERY"
++ msgstr "WIEDERHERSTELLUNG"
++ 
++-#: ../netstat.c:1184
+++#: ../netstat.c:1284
+++#, c-format
++ msgid "Active AX.25 sockets\n"
++ msgstr "Aktive AX.25 Sockets\n"
++ 
++-#: ../netstat.c:1185
+++#: ../netstat.c:1285
+++#, c-format
++ msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
++ msgstr "Ziel       Quelle     Gerät   Zustand      Vr/Vs    Send-Q  Empf-Q\n"
++ 
++-#: ../netstat.c:1228
+++#: ../netstat.c:1328
++ #, c-format
++ msgid "problem reading data from %s\n"
++ msgstr "Problem beim Lesen von Daten von %s\n"
++ 
++-#: ../netstat.c:1279
+++#: ../netstat.c:1379
+++#, c-format
++ msgid ""
++ "Active IPX sockets\n"
++ "Proto Recv-Q Send-Q Local Address              Foreign Address            "
++ "State"
++ msgstr ""
++ "Aktive IPX Sockets\n"
++-"Proto Recv-Q Send-Q Lokale Adresse             Gegenaddress               "
+++"Proto Recv-Q Send-Q Lokale Adresse             Gegenadresse               "
++ "Zustand"
++ 
++-#: ../netstat.c:1281
+++#: ../netstat.c:1381
+++#, c-format
++ msgid " User"
++ msgstr " Benutzer"
++ 
++-#: ../netstat.c:1315
+++#: ../netstat.c:1415
++ msgid "ESTAB"
++ msgstr "VERBUNDEN"
++ 
++-#: ../netstat.c:1323
+++#: ../netstat.c:1423
++ msgid "UNK."
++ msgstr "UNB."
++ 
++-#: ../netstat.c:1367
++-msgid "     - no statistics available -"
++-msgstr "     - keine Statistiken verfügbar -"
++-
++-#: ../netstat.c:1370
++-msgid "[NO FLAGS]"
++-msgstr "[KEINE FLAGS]"
++-
++-#: ../netstat.c:1400
+++#: ../netstat.c:1461
+++#, c-format
++ msgid "Kernel Interface table\n"
++-msgstr "Kernel Schnittstellentabelle\n"
+++msgstr "Kernel-Schnittstellentabelle\n"
++ 
++-#: ../netstat.c:1401
+++#: ../netstat.c:1465
+++#, fuzzy, c-format
++ msgid ""
++-"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
++-"Flg\n"
++-msgstr ""
++-"SStelle MTU Met    RX-OK RX-Feh RX-DRP RX-Ülf    TX-OK TX-Feh TX-DRP TX-Üb "
+++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
++ "Flg\n"
+++msgstr "SStelle MTU Met    RX-OK RX-Feh RX-DRP RX-Ülf    TX-OK TX-Feh TX-DRP TX-Üb Flg\n"
++ 
++-#: ../netstat.c:1404
+++#: ../netstat.c:1469
++ msgid "missing interface information"
++-msgstr "Fehlende Interfaceinformation"
+++msgstr "Fehlende Interfaceinformationen"
++ 
++-#: ../netstat.c:1425
+++#: ../netstat.c:1492
+++#, c-format
++ msgid ""
++-"usage: netstat [-veenNcCF] [<Af>] -r         netstat "
++-"{-V|--version|-h|--help}\n"
+++"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
+++"help}\n"
++ msgstr ""
++ "Benutzung: netstat [-veenNcCF] [<Af>] -r\n"
++ "           netstat {-V|--version|-h|--help}\n"
++ 
++-#: ../netstat.c:1426
+++#: ../netstat.c:1493
+++#, c-format
++ msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
++ msgstr "       netstat [-vnNcaeol] [<Socket> ...]\n"
++ 
++-#: ../netstat.c:1427
+++#: ../netstat.c:1494
+++#, c-format
++ msgid ""
++ "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
++ "\n"
++@@ -1066,27 +1000,32 @@ msgstr ""
++ "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
++ "\n"
++ 
++-#: ../netstat.c:1429
+++#: ../netstat.c:1496
+++#, c-format
++ msgid "        -r, --route              display routing table\n"
++ msgstr "        -r, --route              Routentabelle anzeigen\n"
++ 
++-#: ../netstat.c:1430
+++#: ../netstat.c:1497
+++#, c-format
++ msgid "        -i, --interfaces         display interface table\n"
++ msgstr "        -i, --interfaces         Schnittstellentabelle auflisten\n"
++ 
++-#: ../netstat.c:1431
+++#: ../netstat.c:1498
+++#, c-format
++ msgid "        -g, --groups             display multicast group memberships\n"
++ msgstr ""
++ "        -g, --groups             Mitgliedschaft in Multicastgruppen "
++ "anzeigen\n"
++ 
++-#: ../netstat.c:1432
+++#: ../netstat.c:1499
+++#, c-format
++ msgid ""
++ "        -s, --statistics         display networking statistics (like SNMP)\n"
++ msgstr ""
++ "        -s, --statistics         Netzwerksstatistiken anzeigen (wie SNMP)\n"
++ 
++-#: ../netstat.c:1434
+++#: ../netstat.c:1501
+++#, c-format
++ msgid ""
++ "        -M, --masquerade         display masqueraded connections\n"
++ "\n"
++@@ -1094,23 +1033,38 @@ msgstr ""
++ "        -M, --masquerade         Maskierte Verbindungen auflisten\n"
++ "\n"
++ 
++-#: ../netstat.c:1438 ../route.c:87
+++#: ../netstat.c:1505
+++#, fuzzy, c-format
+++msgid "        --numeric-hosts          don't resolve host names\n"
+++msgstr "        -n, --numeric            Adressen nicht nach Namen auflösen\n"
+++
+++#: ../netstat.c:1506
+++#, fuzzy, c-format
+++msgid "        --numeric-ports          don't resolve port names\n"
+++msgstr "        -n, --numeric            Adressen nicht nach Namen auflösen\n"
+++
+++#: ../netstat.c:1507
+++#, fuzzy, c-format
+++msgid "        --numeric-users          don't resolve user names\n"
+++msgstr "        -n, --numeric            Adressen nicht nach Namen auflösen\n"
+++
+++#: ../netstat.c:1508
+++#, c-format
++ msgid "        -N, --symbolic           resolve hardware names\n"
++ msgstr "        -N, --symbolic           Hardwarenamen auflösen\n"
++ 
++-#: ../netstat.c:1439 ../route.c:88
++-#, fuzzy
+++#: ../netstat.c:1509 ../route.c:88
+++#, fuzzy, c-format
++ msgid "        -e, --extend             display other/more information\n"
++-msgstr ""
++-"        -e, --extend             Weitere / zusätzliche Informationen "
++-"anzeigen\n"
+++msgstr "        -e, --extend             Weitere / zusätzliche Informationen anzeigen\n"
++ 
++-#: ../netstat.c:1440
+++#: ../netstat.c:1510
+++#, c-format
++ msgid "        -p, --programs           display PID/Program name for sockets\n"
++-msgstr ""
++-"        -p, --programs           PID/Programmnamen für Sockets anzeigen\n"
+++msgstr "        -p, --programs           PID/Programmnamen für Sockets anzeigen\n"
++ 
++-#: ../netstat.c:1441
+++#: ../netstat.c:1511
+++#, c-format
++ msgid ""
++ "        -c, --continuous         continuous listing\n"
++ "\n"
++@@ -1118,24 +1072,27 @@ msgstr ""
++ "        -c, --continuous         Anzeige laufend aktualisieren\n"
++ "\n"
++ 
++-#: ../netstat.c:1442
+++#: ../netstat.c:1512
+++#, c-format
++ msgid "        -l, --listening          display listening server sockets\n"
++ msgstr ""
++ "        -l, --listening          Empfangsbereite Serversockets auflisten\n"
++ 
++-#: ../netstat.c:1443
+++#: ../netstat.c:1513
+++#, c-format
++ msgid ""
++ "        -a, --all, --listening   display all sockets (default: connected)\n"
++ msgstr ""
++ "        -a, --all, --listening   Alle Sockets anzeigen (normal: nur "
++ "verbundene)\n"
++ 
++-#: ../netstat.c:1444
+++#: ../netstat.c:1514
+++#, c-format
++ msgid "        -o, --timers             display timers\n"
++ msgstr "        -o, --timers             Timer auflisten\n"
++ 
++-#: ../netstat.c:1445 ../route.c:89
++-#, fuzzy
+++#: ../netstat.c:1515 ../route.c:89
+++#, fuzzy, c-format
++ msgid ""
++ "        -F, --fib                display Forwarding Information Base "
++ "(default)\n"
++@@ -1143,7 +1100,8 @@ msgstr ""
++ "        -F, --fib                Forwarding Infomation Base anzeigen "
++ "(Standard)\n"
++ 
++-#: ../netstat.c:1446 ../route.c:90
+++#: ../netstat.c:1516 ../route.c:90
+++#, c-format
++ msgid ""
++ "        -C, --cache              display routing cache instead of FIB\n"
++ "\n"
++@@ -1151,110 +1109,118 @@ msgstr ""
++ "        -C, --cache              Routencache statt FIB anzeigen\n"
++ "\n"
++ 
++-#: ../netstat.c:1448
+++#: ../netstat.c:1518
+++#, c-format
++ msgid ""
++-"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
++-"--netrom\n"
+++"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
+++"netrom\n"
++ msgstr ""
++-"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
++-"--netrom\n"
+++"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
+++"netrom\n"
++ 
++-#: ../netstat.c:1449 ../route.c:92
++-#, c-format
++-msgid "  <AF>=Use '-A <af>' or '--<af>' Default: %s\n"
+++#: ../netstat.c:1519
+++#, fuzzy, c-format
+++msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
++ msgstr "  <AF>=,,-A <af>'' or ,,--<af>'' benutzen. Standard: %s\n"
++ 
++-#: ../netstat.c:1450 ../route.c:93
+++#: ../netstat.c:1520 ../route.c:93
+++#, c-format
++ msgid "  List of possible address families (which support routing):\n"
++ msgstr "  Liste möglicher Adressfamilien, die Routen unterstützen:\n"
++ 
++-#: ../netstat.c:1663
+++#: ../netstat.c:1753
+++#, c-format
++ msgid "Active Internet connections "
++ msgstr "Aktive Internetverbindungen "
++ 
++-#: ../netstat.c:1673
+++#: ../netstat.c:1763
+++#, c-format
++ msgid ""
++ "\n"
++-"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
++-"  "
+++"Proto Recv-Q Send-Q Local Address           Foreign Address         "
+++"State      "
++ msgstr ""
++ "\n"
++-"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
++-"  "
+++"Proto Recv-Q Send-Q Local Address           Foreign Address         "
+++"State      "
++ 
++-#: ../netstat.c:1675
+++#: ../netstat.c:1765
+++#, c-format
++ msgid " User       Inode     "
++ msgstr " Benutzer   Inode     "
++ 
++-#: ../netstat.c:1678
+++#: ../netstat.c:1768
+++#, c-format
++ msgid " Timer"
++ msgstr " Timer"
++ 
++-#: ../netstat.c:1708
+++#: ../netstat.c:1798
+++#, c-format
++ msgid "IPv4 Group Memberships\n"
++-msgstr "IPv4 Gruppenmitgliedschaften\n"
+++msgstr "IPv4-Gruppenmitgliedschaften\n"
++ 
++-#: ../netstat.c:1709
+++#: ../netstat.c:1799
+++#, c-format
++ msgid "Interface       RefCnt Group\n"
++ msgstr "Schnittstelle   RefZäh Grupp\n"
++ 
++-#: ../rarp.c:43
+++#: ../rarp.c:44
++ msgid "This kernel does not support RARP.\n"
++ msgstr "Dieser Kernel unterstützt kein RARP.\n"
++ 
++-#: ../rarp.c:82
+++#: ../rarp.c:83
++ #, c-format
++ msgid "no RARP entry for %s.\n"
++-msgstr "Kein RARP Eintrag für %s.\n"
+++msgstr "Kein RARP-Eintrag für %s.\n"
++ 
++-#: ../rarp.c:95
+++#: ../rarp.c:96
++ #, c-format
++ msgid "%s: bad hardware address\n"
++ msgstr "%s: fehlerhafte Hardwareadresse\n"
++ 
++-#: ../rarp.c:127
+++#: ../rarp.c:128
++ #, c-format
++ msgid "rarp: cannot open file %s:%s.\n"
++ msgstr "rarp: kann Datei %s:%s nicht öffnen.\n"
++ 
++-#: ../rarp.c:139
+++#: ../rarp.c:140
++ #, c-format
++ msgid "rarp: format error at %s:%u\n"
++ msgstr "rarp: Formatfehler bei %s:%u\n"
++ 
++-#: ../rarp.c:143 ../rarp.c:287
+++#: ../rarp.c:144 ../rarp.c:289
++ #, c-format
++ msgid "rarp: %s: unknown host\n"
++ msgstr "rarp: %s: Unbekannter Host\n"
++ 
++-#: ../rarp.c:146
+++#: ../rarp.c:147
++ #, c-format
++ msgid "rarp: cannot set entry from %s:%u\n"
++ msgstr "rarp: Kann Eintrag aus %s:%u nicht setzen.\n"
++ 
++-#: ../rarp.c:175
+++#: ../rarp.c:176
+++#, c-format
++ msgid "Usage: rarp -a                               list entries in cache.\n"
++-msgstr ""
++-"Benutzung: rarp -a                               Einträge im Cache listen.\n"
+++msgstr "Benutzung: rarp -a                               Einträge im Cache listen.\n"
++ 
++-#: ../rarp.c:176
+++#: ../rarp.c:177
+++#, c-format
++ msgid "       rarp -d <hostname>                    delete entry from cache.\n"
++-msgstr ""
++-"       rarp -d <hostname>                    Eintrag aus dem Cache löschen.\n"
+++msgstr "       rarp -d <hostname>                    Eintrag aus dem Cache löschen.\n"
++ 
++-#: ../rarp.c:177
+++#: ../rarp.c:178
+++#, c-format
++ msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
++-msgstr ""
++-"       rarp [<HW>] -s <hostname> <hwaddr>    Eintrag zum Cache zufügen.\n"
+++msgstr "       rarp [<HW>] -s <hostname> <hwaddr>    Eintrag zum Cache zufügen.\n"
++ 
++-#: ../rarp.c:178
+++#: ../rarp.c:179
+++#, c-format
++ msgid ""
++ "       rarp -f                               add entries from /etc/ethers.\n"
++-msgstr ""
++-"       rarp -f                               Einträge aus /etc/ethers "
++-"zufügen.\n"
+++msgstr "       rarp -f                               Einträge aus /etc/ethers zufügen.\n"
++ 
++-#: ../rarp.c:179
+++#: ../rarp.c:180
+++#, c-format
++ msgid ""
++ "       rarp -V                               display program version.\n"
++ "\n"
++@@ -1262,24 +1228,26 @@ msgstr ""
++ "       rarp -V                               Programmversion anzeigen.\n"
++ "\n"
++ 
++-#: ../rarp.c:236
+++#: ../rarp.c:238
++ #, c-format
++ msgid "%s: illegal option mix.\n"
++ msgstr "%s: Unerlaubte Mischung von Optionen.\n"
++ 
++-#: ../rarp.c:267
+++#: ../rarp.c:269
++ #, c-format
++ msgid "rarp: %s: unknown hardware type.\n"
++-msgstr "rarp: %s: unknown hardware type.\n"
+++msgstr "rarp: %s: unbekannter Hardwaretyp.\n"
++ 
++-#: ../route.c:79
+++#: ../route.c:80
+++#, c-format
++ msgid ""
++ "Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
++ msgstr ""
++ "Benutzung: route [-nNvee] [-FC] [<AF>]           Kernelroutentabelle "
++ "anzeigen\n"
++ 
++-#: ../route.c:80
+++#: ../route.c:81
+++#, c-format
++ msgid ""
++ "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
++ "\n"
++@@ -1287,14 +1255,15 @@ msgstr ""
++ "       route [-v] [-FC] {add|del|flush} ...  Routentabelle für AF ändern.\n"
++ "\n"
++ 
++-#: ../route.c:82
+++#: ../route.c:83
+++#, c-format
++ msgid ""
++ "       route {-h|--help} [<AF>]              Detailed usage syntax for "
++ "specified AF.\n"
++-msgstr ""
++-"       route {-h|--help} [<AF>]              Genaue Syntax für AF anzeigen.\n"
+++msgstr "       route {-h|--help} [<AF>]              Genaue Syntax für AF anzeigen.\n"
++ 
++-#: ../route.c:83
+++#: ../route.c:84
+++#, c-format
++ msgid ""
++ "       route {-V|--version}                  Display version/author and "
++ "exit.\n"
++@@ -1304,590 +1273,891 @@ msgstr ""
++ "Ende.\n"
++ "\n"
++ 
+++#: ../route.c:92
+++#, fuzzy, c-format
+++msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
+++msgstr "  <AF>=,,-A <af>'' or ,,--<af>'' benutzen. Standard: %s\n"
+++
++ #: ../plipconfig.c:66
+++#, c-format
++ msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
++ msgstr "Benutzung: plipconfig [-a] [-i] [-v] Interface\n"
++ 
++ #: ../plipconfig.c:67
+++#, c-format
++ msgid "                  [nibble NN] [trigger NN]\n"
++ msgstr "                  [nibble NN] [trigger NN]\n"
++ 
++ #: ../plipconfig.c:68
++-#, fuzzy
+++#, c-format
++ msgid "       plipconfig -V | --version\n"
++-msgstr "       plipconfig -V\n"
+++msgstr "       plipconfig -V | --version\n"
++ 
++ #: ../plipconfig.c:74
++ #, c-format
++ msgid "%s\tnibble %lu  trigger %lu\n"
++ msgstr "%s\tnibble %lu  trigger %lu\n"
++ 
++-#: ../iptunnel.c:79
+++#: ../iptunnel.c:85
+++#, c-format
++ msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
++ msgstr "Benutzung: iptunnel { add | change | del | show } [ NAME ]\n"
++ 
++-#: ../iptunnel.c:80
+++#: ../iptunnel.c:86
+++#, c-format
++ msgid ""
++ "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
++ msgstr "          [ mode { ipip | gre | sit } ] [ remote ADR ] [ local ADR ]\n"
++ 
++-#: ../iptunnel.c:81
+++#: ../iptunnel.c:87
+++#, c-format
++ msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
++ msgstr "          [ [i|o]seq ] [ [i|o]key SCHLÜSSEL ] [ [i|o]csum ]\n"
++ 
++-#: ../iptunnel.c:82
++-#, fuzzy
+++#: ../iptunnel.c:88
+++#, c-format
++ msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
++-msgstr ""
++-"          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_GERÄt ]\n"
++-"\n"
+++msgstr "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_GERÄt ]\n"
++ 
++-#: ../iptunnel.c:83
+++#: ../iptunnel.c:89
+++#, c-format
++ msgid ""
++ "       iptunnel -V | --version\n"
++ "\n"
++ msgstr ""
+++"       iptunnel -V | --version\n"
+++"\n"
++ 
++-#: ../iptunnel.c:84
+++#: ../iptunnel.c:90
+++#, c-format
++ msgid "Where: NAME := STRING\n"
++ msgstr "Wobei: NAME := ZEICHENKETTE\n"
++ 
++-#: ../iptunnel.c:85
+++#: ../iptunnel.c:91
+++#, c-format
++ msgid "       ADDR := { IP_ADDRESS | any }\n"
++ msgstr "       ADR := { IP_ADRESSE | any }\n"
++ 
++-#: ../iptunnel.c:86
+++#: ../iptunnel.c:92
+++#, c-format
++ msgid "       TOS  := { NUMBER | inherit }\n"
++ msgstr "       TOS  := { NUMBER | inherit }\n"
++ 
++-#: ../iptunnel.c:87
+++#: ../iptunnel.c:93
+++#, c-format
++ msgid "       TTL  := { 1..255 | inherit }\n"
++ msgstr "       TTL  := { 1..255 | inherit }\n"
++ 
++-#: ../iptunnel.c:88
+++#: ../iptunnel.c:94
+++#, c-format
++ msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
++ msgstr "       KEY  := { DOTTED_QUAD | ZAHL }\n"
++ 
++-#: ../iptunnel.c:326
+++#: ../iptunnel.c:332
+++#, c-format
++ msgid "Keys are not allowed with ipip and sit.\n"
++ msgstr "Schlüssel sind mit ipip und sit nicht erlaubt.\n"
++ 
++-#: ../iptunnel.c:346
+++#: ../iptunnel.c:352
+++#, c-format
++ msgid "Broadcast tunnel requires a source address.\n"
++ msgstr "Ein Broadcasttunnel ist nur mit einer Quelladresse möglich\n"
++ 
++-#: ../iptunnel.c:361
+++#: ../iptunnel.c:367
+++#, c-format
++ msgid "ttl != 0 and noptmudisc are incompatible\n"
++ msgstr "ttl != 0 und noptmudisc sind inkompatibel\n"
++ 
++-#: ../iptunnel.c:373
+++#: ../iptunnel.c:379
+++#, c-format
++ msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
++ msgstr ""
++ "Die Tunnelbetriebsart (ipip, fre oder sit) kann nicht festgestellt werden\n"
++ 
++-#: ../iptunnel.c:411
+++#: ../iptunnel.c:417
++ #, c-format
++ msgid "%s: %s/ip  remote %s  local %s "
++ msgstr "%s: %s/ip  Gegenseite %s  lokal %s "
++ 
++-#: ../iptunnel.c:415
+++#: ../iptunnel.c:421
++ msgid "unknown"
++ msgstr "Unbekannt"
++ 
++-#: ../iptunnel.c:447
+++#: ../iptunnel.c:453
+++#, c-format
++ msgid "  Drop packets out of sequence.\n"
++ msgstr "  Pakete außer der Reihenfolge fallenlassen.\n"
++ 
++-#: ../iptunnel.c:449
+++#: ../iptunnel.c:455
+++#, c-format
++ msgid "  Checksum in received packet is required.\n"
++ msgstr "  Prüfsumme im empfangenen Paket wird benötigt.\n"
++ 
++-#: ../iptunnel.c:451
+++#: ../iptunnel.c:457
+++#, c-format
++ msgid "  Sequence packets on output.\n"
++ msgstr "  Pakete in Reihenfolge ausgeben.\n"
++ 
++-#: ../iptunnel.c:453
+++#: ../iptunnel.c:459
+++#, c-format
++ msgid "  Checksum output packets.\n"
++ msgstr "  Prüfsumme für ausgegebene Pakete berechnen.\n"
++ 
++-#: ../iptunnel.c:481
+++#: ../iptunnel.c:487
+++#, c-format
++ msgid "Wrong format of /proc/net/dev. Sorry.\n"
++-msgstr "Falsches Format von /proc/net/dev. Tut mir leid\n"
+++msgstr "Falsches Format von /proc/net/dev. Tut mir leid.\n"
++ 
++-#: ../iptunnel.c:494
+++#: ../iptunnel.c:500
++ #, c-format
++ msgid "Failed to get type of [%s]\n"
++ msgstr "Kann den Typ von [%s] nicht holen\n"
++ 
++-#: ../iptunnel.c:510
+++#: ../iptunnel.c:516
+++#, c-format
++ msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
++ msgstr "RX: Pakete     Bytes        Fehler CsumErrs OutOfSeq Mcasts\n"
++ 
++-#: ../iptunnel.c:513
+++#: ../iptunnel.c:519
+++#, c-format
++ msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
++ msgstr "TX: Pakete     Bytes        Fehler DeadLoop NoRoute  NoBufs\n"
++ 
++-#: ../statistics.c:45
+++#: ../statistics.c:47
++ msgid "ICMP input histogram:"
++-msgstr "ICMP Eingabehistogramm:"
+++msgstr "ICMP-Eingabehistogramm:"
++ 
++-#: ../statistics.c:46
+++#: ../statistics.c:48
++ msgid "ICMP output histogram:"
++-msgstr "ICMP Ausgabehistogramm:"
+++msgstr "ICMP-Ausgabehistogramm:"
++ 
++-#: ../statistics.c:63
+++#: ../statistics.c:65
++ #, c-format
++ msgid "Forwarding is %s"
++ msgstr "Weiterleitung ist %s"
++ 
++-#: ../statistics.c:64
++-#, c-format
++-msgid "Default TTL is %d"
+++#: ../statistics.c:66
+++#, fuzzy, c-format
+++msgid "Default TTL is %u"
++ msgstr "Standard-TTL ist %d"
++ 
++-#: ../statistics.c:65
++-#, c-format
++-msgid "%d total packets received"
++-msgstr "%d Pakete insgesamt empfangen"
+++#: ../statistics.c:67
+++#, fuzzy, c-format
+++msgid "%u total packets received"
+++msgstr "%d Pakete insgesamt empfangen"
++ 
++-#: ../statistics.c:66
++-#, c-format
++-msgid "%d with invalid headers"
++-msgstr "%d with ungültigen Headern"
+++#: ../statistics.c:68
+++#, fuzzy, c-format
+++msgid "%u with invalid headers"
+++msgstr "%d mit ungültigen Headern"
++ 
++-#: ../statistics.c:67
++-#, c-format
++-msgid "%d with invalid addresses"
+++#: ../statistics.c:69
+++#, fuzzy, c-format
+++msgid "%u with invalid addresses"
++ msgstr "%d mit ungültigen Adressen"
++ 
++-#: ../statistics.c:68
++-#, c-format
++-msgid "%d forwarded"
+++#: ../statistics.c:70
+++#, fuzzy, c-format
+++msgid "%u forwarded"
++ msgstr "%d weitergeleitet"
++ 
++-#: ../statistics.c:69
++-#, c-format
++-msgid "%d with unknown protocol"
+++#: ../statistics.c:71
+++#, fuzzy, c-format
+++msgid "%u with unknown protocol"
++ msgstr "%d mit unbekanntem Protokoll"
++ 
++-#: ../statistics.c:70
++-#, c-format
++-msgid "%d incoming packets discarded"
+++#: ../statistics.c:72
+++#, fuzzy, c-format
+++msgid "%u incoming packets discarded"
++ msgstr "%d eingehende Pakete weggeworfen"
++ 
++-#: ../statistics.c:71
++-#, c-format
++-msgid "%d incoming packets delivered"
+++#: ../statistics.c:73
+++#, fuzzy, c-format
+++msgid "%u incoming packets delivered"
++ msgstr "%d eingehende Pakete zugestellt"
++ 
++-#: ../statistics.c:72
++-#, c-format
++-msgid "%d requests sent out"
+++#: ../statistics.c:74
+++#, fuzzy, c-format
+++msgid "%u requests sent out"
++ msgstr "%d Anfragen ausgesandt"
++ 
++ #. ?
++-#: ../statistics.c:73
++-#, c-format
++-msgid "%d outgoing packets dropped"
+++#: ../statistics.c:75
+++#, fuzzy, c-format
+++msgid "%u outgoing packets dropped"
++ msgstr "%d ausgehende Pakete weggeworfen"
++ 
++-#: ../statistics.c:74
++-#, c-format
++-msgid "%d dropped because of missing route"
+++#: ../statistics.c:76
+++#, fuzzy, c-format
+++msgid "%u dropped because of missing route"
++ msgstr "%d weggeworfen wegen fehlender Route"
++ 
++-#: ../statistics.c:75
++-#, c-format
++-msgid "%d fragments dropped after timeout"
+++#: ../statistics.c:77
+++#, fuzzy, c-format
+++msgid "%u fragments dropped after timeout"
++ msgstr "%d Fragmente nach Timeout weggeworfen"
++ 
++-#: ../statistics.c:76
++-#, c-format
++-msgid "%d reassemblies required"
+++#: ../statistics.c:78
+++#, fuzzy, c-format
+++msgid "%u reassemblies required"
++ msgstr "%d Wiederzusammenstellungen nötig"
++ 
++ #. ?
++-#: ../statistics.c:77
++-#, c-format
++-msgid "%d packets reassembled ok"
+++#: ../statistics.c:79
+++#, fuzzy, c-format
+++msgid "%u packets reassembled ok"
++ msgstr "%d Fragmente korrekt empfangen"
++ 
++-#: ../statistics.c:78
++-#, c-format
++-msgid "%d packet reassembles failed"
+++#: ../statistics.c:80
+++#, fuzzy, c-format
+++msgid "%u packet reassembles failed"
++ msgstr "%d fehlgeschlagene Paketdefragmentierungen"
++ 
++-#: ../statistics.c:79
++-#, c-format
++-msgid "%d fragments received ok"
+++#: ../statistics.c:81
+++#, fuzzy, c-format
+++msgid "%u fragments received ok"
++ msgstr "%d Fragmente korrekt empfangen"
++ 
++-#: ../statistics.c:80
++-#, c-format
++-msgid "%d fragments failed"
++-msgstr "%d Fragmente Fehlgeschlagen"
+++#: ../statistics.c:82
+++#, fuzzy, c-format
+++msgid "%u fragments failed"
+++msgstr "%d Fragmente fehlgeschlagen"
++ 
++-#: ../statistics.c:81
++-#, c-format
++-msgid "%d fragments created"
+++#: ../statistics.c:83
+++#, fuzzy, c-format
+++msgid "%u fragments created"
++ msgstr "%d Fragmente erzeugt"
++ 
++-#: ../statistics.c:86
++-#, c-format
++-msgid "%d ICMP messages received"
++-msgstr "%d ICMP Nachrichten empfangen"
+++#: ../statistics.c:88
+++#, fuzzy, c-format
+++msgid "%u ICMP messages received"
+++msgstr "%d ICMP-Nachrichten empfangen"
++ 
++-#: ../statistics.c:87
++-#, c-format
++-msgid "%d input ICMP message failed."
++-msgstr "%d eingegangene ICMP Nachrichten fehlgeschlagen"
+++#: ../statistics.c:89
+++#, fuzzy, c-format
+++msgid "%u input ICMP message failed."
+++msgstr "%d eingegangene ICMP-Nachrichten fehlgeschlagen"
++ 
++-#: ../statistics.c:88 ../statistics.c:101
++-#, c-format
++-msgid "destination unreachable: %d"
+++#: ../statistics.c:90 ../statistics.c:103
+++#, fuzzy, c-format
+++msgid "destination unreachable: %u"
++ msgstr "Ziel unerreichbar: %d"
++ 
++-#: ../statistics.c:89
++-#, c-format
++-msgid "timeout in transit: %d"
+++#: ../statistics.c:91
+++#, fuzzy, c-format
+++msgid "timeout in transit: %u"
++ msgstr "Timeout beim Transit: %d"
++ 
++-#: ../statistics.c:90 ../statistics.c:103
++-#, c-format
++-msgid "wrong parameters: %d"
+++#: ../statistics.c:92 ../statistics.c:105
+++#, fuzzy, c-format
+++msgid "wrong parameters: %u"
++ msgstr "Fehlerhafte Parameter: %d"
++ 
++ #. ?
++-#: ../statistics.c:91
++-#, c-format
++-msgid "source quenchs: %d"
+++#: ../statistics.c:93
+++#, fuzzy, c-format
+++msgid "source quenches: %u"
++ msgstr "Source Quenchs: %d"
++ 
++-#: ../statistics.c:92
++-#, c-format
++-msgid "redirects: %d"
+++#: ../statistics.c:94
+++#, fuzzy, c-format
+++msgid "redirects: %u"
++ msgstr "Umleitungen: %d"
++ 
++-#: ../statistics.c:93
++-#, c-format
++-msgid "echo requests: %d"
++-msgstr "Echo Requests: %d"
+++#: ../statistics.c:95
+++#, fuzzy, c-format
+++msgid "echo requests: %u"
+++msgstr "Echo Anfragen: %d"
++ 
++-#: ../statistics.c:94 ../statistics.c:107
++-#, c-format
++-msgid "echo replies: %d"
+++#: ../statistics.c:96 ../statistics.c:109
+++#, fuzzy, c-format
+++msgid "echo replies: %u"
++ msgstr "Echo Antworten: %d"
++ 
++-#: ../statistics.c:95
++-#, c-format
++-msgid "timestamp request: %d"
+++#: ../statistics.c:97
+++#, fuzzy, c-format
+++msgid "timestamp request: %u"
++ msgstr "Zeitstempelanfragen: %d"
++ 
++-#: ../statistics.c:96
++-#, c-format
++-msgid "timestamp reply: %d"
+++#: ../statistics.c:98
+++#, fuzzy, c-format
+++msgid "timestamp reply: %u"
++ msgstr "Zeitstempelantworten: %d"
++ 
++-#: ../statistics.c:97
++-#, c-format
++-msgid "address mask request: %d"
+++#: ../statistics.c:99
+++#, fuzzy, c-format
+++msgid "address mask request: %u"
++ msgstr "Adressmaskenanfragen: %d"
++ 
++ #. ?
++-#: ../statistics.c:98
++-msgid "address mask replies"
++-msgstr "Adressmaskenantworten"
+++#: ../statistics.c:100 ../statistics.c:113
+++#, fuzzy, c-format
+++msgid "address mask replies: %u"
+++msgstr "Adressmaskenantworten: %d"
++ 
++ #. ?
++-#: ../statistics.c:99
++-#, c-format
++-msgid "%d ICMP messages sent"
+++#: ../statistics.c:101
+++#, fuzzy, c-format
+++msgid "%u ICMP messages sent"
++ msgstr "%d ICMP-Nachrichten geschickt"
++ 
++-#: ../statistics.c:100
++-#, c-format
++-msgid "%d ICMP messages failed"
++-msgstr "%d ICMP Nachrichten fehlgeschlagen"
++-
++ #: ../statistics.c:102
++-#, c-format
++-msgid "time exceeded: %d"
+++#, fuzzy, c-format
+++msgid "%u ICMP messages failed"
+++msgstr "%d ICMP-Nachrichten fehlgeschlagen"
+++
+++#: ../statistics.c:104
+++#, fuzzy, c-format
+++msgid "time exceeded: %u"
++ msgstr "Zeitüberschreitung: %d"
++ 
++ #. ?
++-#: ../statistics.c:104
++-#, c-format
++-msgid "source quench: %d"
+++#: ../statistics.c:106
+++#, fuzzy, c-format
+++msgid "source quench: %u"
++ msgstr "Source Quench: %d"
++ 
++-#: ../statistics.c:105
++-#, c-format
++-msgid "redirect: %d"
+++#: ../statistics.c:107
+++#, fuzzy, c-format
+++msgid "redirect: %u"
++ msgstr "Umleitungen: %d"
++ 
++-#: ../statistics.c:106
++-#, c-format
++-msgid "echo request: %d"
+++#: ../statistics.c:108
+++#, fuzzy, c-format
+++msgid "echo request: %u"
++ msgstr "Echo Anfragen: %d"
++ 
++-#: ../statistics.c:108
++-#, c-format
++-msgid "timestamp requests: %d"
+++#: ../statistics.c:110
+++#, fuzzy, c-format
+++msgid "timestamp requests: %u"
++ msgstr "Zeitstempel Anfragen: %d"
++ 
++-#: ../statistics.c:109
++-#, c-format
++-msgid "timestamp replies: %d"
+++#: ../statistics.c:111
+++#, fuzzy, c-format
+++msgid "timestamp replies: %u"
++ msgstr "Zeitstempel Antworten: %d"
++ 
++-#: ../statistics.c:110
++-#, c-format
++-msgid "address mask requests: %d"
+++#: ../statistics.c:112
+++#, fuzzy, c-format
+++msgid "address mask requests: %u"
++ msgstr "Adressmaskenanfragen: %d"
++ 
++-#: ../statistics.c:111
+++#: ../statistics.c:118
++ #, c-format
++-msgid "address mask replies: %d"
++-msgstr "Adressmaskenantworten: %d"
+++msgid "RTO algorithm is %s"
+++msgstr "RTO-Algorithmus ist %s"
+++
+++#: ../statistics.c:122
+++#, fuzzy, c-format
+++msgid "%u active connections openings"
+++msgstr "%d Verbindungen aktiv geöffnet"
+++
+++#: ../statistics.c:123
+++#, fuzzy, c-format
+++msgid "%u passive connection openings"
+++msgstr "%d Verbindungen passiv geöffnet"
+++
+++#: ../statistics.c:124
+++#, fuzzy, c-format
+++msgid "%u failed connection attempts"
+++msgstr "%d fehlerhafte Verbindungsversuche"
+++
+++#: ../statistics.c:125
+++#, fuzzy, c-format
+++msgid "%u connection resets received"
+++msgstr "%d Verbindungsrücksetzungen empfangen"
+++
+++#: ../statistics.c:126
+++#, fuzzy, c-format
+++msgid "%u connections established"
+++msgstr "%d Verbindungen aufgebaut"
+++
+++#: ../statistics.c:127
+++#, fuzzy, c-format
+++msgid "%u segments received"
+++msgstr "%d Segmente empfangen"
+++
+++#: ../statistics.c:128
+++#, fuzzy, c-format
+++msgid "%u segments send out"
+++msgstr "%d Segmente abgeschickt"
+++
+++#: ../statistics.c:129
+++#, fuzzy, c-format
+++msgid "%u segments retransmited"
+++msgstr "%d Segmente erneut geschickt"
+++
+++#: ../statistics.c:130
+++#, fuzzy, c-format
+++msgid "%u bad segments received."
+++msgstr "%d fehlerhafte Segmente empfangen."
+++
+++#: ../statistics.c:131
+++#, fuzzy, c-format
+++msgid "%u resets sent"
+++msgstr "%d Rücksetzungen geschickt"
+++
+++#: ../statistics.c:136
+++#, fuzzy, c-format
+++msgid "%u packets received"
+++msgstr "%d Pakete empfangen"
+++
+++#: ../statistics.c:137
+++#, fuzzy, c-format
+++msgid "%u packets to unknown port received."
+++msgstr "%d Pakete für unbekannte Ports empfangen."
+++
+++#: ../statistics.c:138
+++#, fuzzy, c-format
+++msgid "%u packet receive errors"
+++msgstr "%d Paketempfangsfehler"
+++
+++#: ../statistics.c:139
+++#, fuzzy, c-format
+++msgid "%u packets sent"
+++msgstr "%d Pakete geschickt"
+++
+++#: ../statistics.c:144
+++#, fuzzy, c-format
+++msgid "%u SYN cookies sent"
+++msgstr "%d SYN-Cookies verschickt"
+++
+++#: ../statistics.c:145
+++#, fuzzy, c-format
+++msgid "%u SYN cookies received"
+++msgstr "%d SYN-Cookies empfangen"
++ 
++-#: ../statistics.c:116
+++#: ../statistics.c:146
+++#, fuzzy, c-format
+++msgid "%u invalid SYN cookies received"
+++msgstr "%d ungültige SYN-Cookies empfangen"
+++
+++#: ../statistics.c:148
+++#, fuzzy, c-format
+++msgid "%u resets received for embryonic SYN_RECV sockets"
+++msgstr "%d Rücksetzungen für embrionische SYN_RECV-Sockets"
+++
+++#: ../statistics.c:150
+++#, fuzzy, c-format
+++msgid "%u packets pruned from receive queue because of socket buffer overrun"
+++msgstr "%d Pakete wegen Socketpufferüberlauf aus der Empfangswarteschlange weggeworfen"
+++
+++#. obsolete: 2.2.0 doesn't do that anymore
+++#: ../statistics.c:153
+++#, fuzzy, c-format
+++msgid "%u packets pruned from receive queue"
+++msgstr "%d Pakete aus der ungeordneten Warteschlange weggeworfen"
+++
+++#: ../statistics.c:154
+++#, fuzzy, c-format
+++msgid ""
+++"%u packets dropped from out-of-order queue because of socket buffer overrun"
+++msgstr "%d Pakete aus der ungeordneten Warteschlange wegen Pufferüberlauf weggeworfen"
+++
+++#: ../statistics.c:156
+++#, fuzzy, c-format
+++msgid "%u ICMP packets dropped because they were out-of-window"
+++msgstr "%d ICMP-Pakete weggeworfen die außerhalb des Fensters waren"
+++
+++#: ../statistics.c:158
+++#, fuzzy, c-format
+++msgid "%u ICMP packets dropped because socket was locked"
+++msgstr "%d ICMP-Pakete verworfen weil Socket gesperrt war"
+++
+++#: ../statistics.c:160
++ #, c-format
++-msgid "RTO algorithm is %s"
++-msgstr "RTO Algorithmus is %s"
+++msgid "%u TCP sockets finished time wait in fast timer"
+++msgstr ""
++ 
++-#: ../statistics.c:120
+++#: ../statistics.c:161
++ #, c-format
++-msgid "%d active connections openings"
++-msgstr "%d Verbindungen aktiv geöffnet"
+++msgid "%u time wait sockets recycled by time stamp"
+++msgstr ""
++ 
++-#: ../statistics.c:121
+++#: ../statistics.c:162
++ #, c-format
++-msgid "%d passive connection openings"
++-msgstr "%d Verbindungen passiv geöffnet"
+++msgid "%u TCP sockets finished time wait in slow timer"
+++msgstr ""
++ 
++-#: ../statistics.c:122
+++#: ../statistics.c:163
++ #, c-format
++-msgid "%d failed connection attempts"
++-msgstr "%d fehlerhafte Verbindungsversuche"
+++msgid "%u passive connections rejected because of time stamp"
+++msgstr ""
++ 
++-#: ../statistics.c:123
+++#: ../statistics.c:165
++ #, c-format
++-msgid "%d connection resets received"
++-msgstr "%d Verbindungsrücksetzungen empfangen"
+++msgid "%u active connections rejected because of time stamp"
+++msgstr ""
++ 
++-#: ../statistics.c:124
+++#: ../statistics.c:167
++ #, c-format
++-msgid "%d connections established"
++-msgstr "%d Verbindungen aufgebaut"
+++msgid "%u packets rejects in established connections because of timestamp"
+++msgstr ""
++ 
++-#: ../statistics.c:125
+++#: ../statistics.c:169
+++#, fuzzy, c-format
+++msgid "%u delayed acks sent"
+++msgstr "%d Pakete geschickt"
+++
+++#: ../statistics.c:170
++ #, c-format
++-msgid "%d segments received"
++-msgstr "%d Segmente empfangen"
+++msgid "%u delayed acks further delayed because of locked socket"
+++msgstr ""
++ 
++-#: ../statistics.c:126
+++#: ../statistics.c:172
++ #, c-format
++-msgid "%d segments send out"
++-msgstr "%d Segmente abgeschickt"
+++msgid "Quick ack mode was activated %u times"
+++msgstr ""
++ 
++-#: ../statistics.c:127
+++#: ../statistics.c:173
++ #, c-format
++-msgid "%d segments retransmited"
++-msgstr "%d Segmente erneut geschickt"
+++msgid "%u times the listen queue of a socket overflowed"
+++msgstr ""
++ 
++-#: ../statistics.c:128
+++#: ../statistics.c:175
++ #, c-format
++-msgid "%d bad segments received."
++-msgstr "%d fehlerhafte Segmente empfangen."
+++msgid "%u SYNs to LISTEN sockets ignored"
+++msgstr ""
++ 
++-#: ../statistics.c:129
+++#: ../statistics.c:176
++ #, c-format
++-msgid "%d resets sent"
++-msgstr "%d Rücksetzungen geschickt"
+++msgid "%u packets directly queued to recvmsg prequeue."
+++msgstr ""
++ 
++-#: ../statistics.c:134
+++#: ../statistics.c:178
++ #, c-format
++-msgid "%d packets received"
+++msgid "%u of bytes directly received from backlog"
+++msgstr ""
+++
+++#: ../statistics.c:180
+++#, c-format
+++msgid "%u of bytes directly received from prequeue"
+++msgstr ""
+++
+++#: ../statistics.c:182
+++#, fuzzy, c-format
+++msgid "%u packets dropped from prequeue"
+++msgstr "%d Pakete aus der ungeordneten Warteschlange weggeworfen"
+++
+++#: ../statistics.c:183
+++#, fuzzy, c-format
+++msgid "%u packet headers predicted"
++ msgstr "%d Pakete empfangen"
++ 
++-#: ../statistics.c:135
+++#: ../statistics.c:184
++ #, c-format
++-msgid "%d packets to unknown port received."
+++msgid "%u packets header predicted and directly queued to user"
+++msgstr ""
+++
+++#: ../statistics.c:186
+++#, c-format
+++msgid "Ran %u times out of system memory during packet sending"
+++msgstr ""
+++
+++#: ../statistics.c:188
+++#, fuzzy, c-format
+++msgid "%u acknowledgments not containing data received"
++ msgstr "%d Pakete für unbekannte Ports empfangen."
++ 
++-#: ../statistics.c:136
+++#: ../statistics.c:189
++ #, c-format
++-msgid "%d packet receive errors"
++-msgstr "%d Paketempfangsfehler"
+++msgid "%u predicted acknowledgments"
+++msgstr ""
++ 
++-#: ../statistics.c:137
+++#: ../statistics.c:190
++ #, c-format
++-msgid "%d packets sent"
++-msgstr "%d Pakete geschickt"
+++msgid "%u times recovered from packet loss due to fast retransmit"
+++msgstr ""
++ 
++-#: ../statistics.c:142
+++#: ../statistics.c:191
++ #, c-format
++-msgid "%d SYN cookies sent"
++-msgstr "%d SYN-Cookies verschickt"
+++msgid "%u times recovered from packet loss due to SACK data"
+++msgstr ""
++ 
++-#: ../statistics.c:143
+++#: ../statistics.c:192
+++#, fuzzy, c-format
+++msgid "%u bad SACKs received"
+++msgstr "%d fehlerhafte Segmente empfangen."
+++
+++#: ../statistics.c:193
++ #, c-format
++-msgid "%d SYN cookies received"
++-msgstr "%d SYN-Cookies empfangen"
+++msgid "Detected reordering %u times using FACK"
+++msgstr ""
++ 
++-#: ../statistics.c:144
+++#: ../statistics.c:194
++ #, c-format
++-msgid "%d invalid SYN cookies received"
++-msgstr "%d ungültige SYN-Cookies empfangen"
+++msgid "Detected reordering %u times using SACK"
+++msgstr ""
++ 
++-#: ../statistics.c:146
+++#: ../statistics.c:195
++ #, c-format
++-msgid "%d resets received for embryonic SYN_RECV sockets"
++-msgstr "%d Rücksetzungen fuer embrionische SYN_RECV Sockets"
+++msgid "Detected reordering %u times using time stamp"
+++msgstr ""
++ 
++-#: ../statistics.c:148
+++#: ../statistics.c:196
++ #, c-format
++-msgid "%d packets pruned from receive queue because of socket buffer overrun"
+++msgid "Detected reordering %u times using reno fast retransmit"
++ msgstr ""
++-"%d Pakete wegen Socketpufferüberlauf aus der Empfangswarteschlange "
++-"weggeworfen"
++ 
++-#. obsolete: 2.2.0 doesn't do that anymore
++-#: ../statistics.c:151
+++#: ../statistics.c:197
++ #, c-format
++-msgid "%d packets pruned from out-of-order queue"
++-msgstr "%d Pakete aus der ungeordneten Warteschlange weggeworfen"
+++msgid "%u congestion windows fully recovered"
+++msgstr ""
++ 
++-#: ../statistics.c:152
+++#: ../statistics.c:198
++ #, c-format
++-msgid ""
++-"%d packets dropped from out-of-order queue because of socket buffer overrun"
+++msgid "%u congestion windows partially recovered using Hoe heuristic"
++ msgstr ""
++-"%d Pakete aus der ungeordneten Warteschlange wegen Pufferüberlauf weggeworfen"
++ 
++-#: ../statistics.c:154
+++#: ../statistics.c:199
++ #, c-format
++-msgid "%d ICMP packets dropped because they were out-of-window"
++-msgstr "%d ICMP Pakete weggeworfen die auserhalb des Fensters waren"
+++msgid "%u congestion window recovered using DSACK"
+++msgstr ""
++ 
++-#: ../statistics.c:156
+++#: ../statistics.c:200
+++#, c-format
+++msgid "%u congestion windows recovered after partial ack"
+++msgstr ""
+++
+++#: ../statistics.c:201
+++#, fuzzy, c-format
+++msgid "%u retransmits lost"
+++msgstr "%d Rücksetzungen geschickt"
+++
+++#: ../statistics.c:202
+++#, c-format
+++msgid "%u timeouts after reno fast retransmit"
+++msgstr ""
+++
+++#: ../statistics.c:203
+++#, c-format
+++msgid "%u timeouts after SACK recovery"
+++msgstr ""
+++
+++#: ../statistics.c:204
+++#, c-format
+++msgid "%u timeouts in loss state"
+++msgstr ""
+++
+++#: ../statistics.c:205
+++#, fuzzy, c-format
+++msgid "%u fast retransmits"
+++msgstr "%d Segmente erneut geschickt"
+++
+++#: ../statistics.c:206
+++#, c-format
+++msgid "%u forward retransmits"
+++msgstr ""
+++
+++#: ../statistics.c:207
+++#, c-format
+++msgid "%u retransmits in slow start"
+++msgstr ""
+++
+++#: ../statistics.c:208
+++#, c-format
+++msgid "%u other TCP timeouts"
+++msgstr ""
+++
+++#: ../statistics.c:209
+++#, fuzzy, c-format
+++msgid "%u reno fast retransmits failed"
+++msgstr "%d Segmente erneut geschickt"
+++
+++#: ../statistics.c:210
+++#, fuzzy, c-format
+++msgid "%u sack retransmits failed"
+++msgstr "%d fehlgeschlagene Paketdefragmentierungen"
+++
+++#: ../statistics.c:211
+++#, c-format
+++msgid "%u times receiver scheduled too late for direct processing"
+++msgstr ""
+++
+++#: ../statistics.c:212
+++#, fuzzy, c-format
+++msgid "%u packets collapsed in receive queue due to low socket buffer"
+++msgstr "%d Pakete wegen Socketpufferüberlauf aus der Empfangswarteschlange weggeworfen"
+++
+++#: ../statistics.c:213
+++#, c-format
+++msgid "%u DSACKs sent for old packets"
+++msgstr ""
+++
+++#: ../statistics.c:214
+++#, c-format
+++msgid "%u DSACKs sent for out of order packets"
+++msgstr ""
+++
+++#: ../statistics.c:215
+++#, fuzzy, c-format
+++msgid "%u DSACKs received"
+++msgstr "%d Pakete empfangen"
+++
+++#: ../statistics.c:216
+++#, fuzzy, c-format
+++msgid "%u DSACKs for out of order packets received"
+++msgstr "%d Pakete insgesamt empfangen"
+++
+++#: ../statistics.c:217
+++#, fuzzy, c-format
+++msgid "%u connections reset due to unexpected SYN"
+++msgstr "%d Verbindungsrücksetzungen empfangen"
+++
+++#: ../statistics.c:218
+++#, fuzzy, c-format
+++msgid "%u connections reset due to unexpected data"
+++msgstr "%d Verbindungsrücksetzungen empfangen"
+++
+++#: ../statistics.c:219
+++#, fuzzy, c-format
+++msgid "%u connections reset due to early user close"
+++msgstr "%d Verbindungsrücksetzungen empfangen"
+++
+++#: ../statistics.c:220
++ #, c-format
++-msgid "%d ICMP packets dropped because socket was locked"
++-msgstr "%d ICMP Pakete verworfen weil Socket gesperrt war"
+++msgid "%u connections aborted due to memory pressure"
+++msgstr ""
+++
+++#: ../statistics.c:221
+++#, fuzzy, c-format
+++msgid "%u connections aborted due to timeout"
+++msgstr "%d Verbindungsrücksetzungen empfangen"
++ 
++ #: ../statistics.c:222
+++#, c-format
+++msgid "%u connections aborted after user close in linger timeout"
+++msgstr ""
+++
+++#: ../statistics.c:223
+++#, c-format
+++msgid "%u times unabled to send RST due to no memory"
+++msgstr ""
+++
+++#: ../statistics.c:224
+++#, c-format
+++msgid "TCP ran low on memory %u times"
+++msgstr ""
+++
+++#: ../statistics.c:225
+++#, c-format
+++msgid "%u TCP data loss events"
+++msgstr ""
+++
+++#: ../statistics.c:292
++ msgid "enabled"
++ msgstr "aktiviert"
++ 
++-#: ../statistics.c:222
+++#: ../statistics.c:292
++ msgid "disabled"
++ msgstr "deaktiviert"
++ 
++-#: ../statistics.c:272
++-#, c-format
++-msgid "unknown title %s\n"
++-msgstr "Unbekannter Titel %s\n"
++-
++-#: ../statistics.c:298
+++#: ../statistics.c:375
++ msgid "error parsing /proc/net/snmp"
++ msgstr "Fehler beim Parsen von /proc/net/snmp"
++ 
++-#: ../statistics.c:311
+++#: ../statistics.c:388
++ msgid "cannot open /proc/net/snmp"
++ msgstr "Kann /proc/net/snmp nicht öffnen"
++ 
++ #: ../lib/activate.c:69
++ #, c-format
++ msgid "Hardware type `%s' not supported.\n"
++-msgstr "Hardwaretyp ,,%s'' nicht unterstützt.\n"
+++msgstr "Hardwaretyp »%s« nicht unterstützt.\n"
++ 
++ #: ../lib/activate.c:73
++ #, c-format
++ msgid "Cannot change line discipline to `%s'.\n"
++-msgstr "Kann line discipline nicht auf ``%s'' setzen.\n"
+++msgstr "Kann line discipline nicht auf »%s« setzen.\n"
++ 
++-#: ../lib/af.c:145 ../lib/hw.c:148
+++#: ../lib/af.c:153 ../lib/hw.c:161
++ msgid "UNSPEC"
++ msgstr "UNSPEC"
++ 
++-#: ../lib/af.c:147
+++#: ../lib/af.c:155
++ msgid "UNIX Domain"
++-msgstr "UNIX Domain"
+++msgstr "UNIX-Domain"
++ 
++-#: ../lib/af.c:150
+++#: ../lib/af.c:158
++ msgid "DARPA Internet"
++-msgstr "DARPA Internet"
+++msgstr "DARPA-Internet"
++ 
++-#: ../lib/af.c:153
+++#: ../lib/af.c:161
++ msgid "IPv6"
++ msgstr "IPv6"
++ 
++-#: ../lib/af.c:156 ../lib/hw.c:169
+++#: ../lib/af.c:164 ../lib/hw.c:182
++ msgid "AMPR AX.25"
++ msgstr "AMPR AX.25"
++ 
++-#: ../lib/af.c:159 ../lib/hw.c:175
+++#: ../lib/af.c:167 ../lib/hw.c:188
++ msgid "AMPR NET/ROM"
++ msgstr "AMPR NET/ROM"
++ 
++-#: ../lib/af.c:162
+++#: ../lib/af.c:170
++ msgid "Novell IPX"
++ msgstr ""
++ 
++-#: ../lib/af.c:165
+++#: ../lib/af.c:173
++ msgid "Appletalk DDP"
++ msgstr "Appletalk DDP"
++ 
++-#: ../lib/af.c:168 ../lib/hw.c:207
+++#: ../lib/af.c:176 ../lib/hw.c:223
++ msgid "Econet"
++ msgstr "Econet"
++ 
++-#: ../lib/af.c:171 ../lib/hw.c:172
+++#: ../lib/af.c:179
+++msgid "CCITT X.25"
+++msgstr ""
+++
+++#: ../lib/af.c:182 ../lib/hw.c:185
++ msgid "AMPR ROSE"
++ msgstr "AMPR ROSE"
++ 
++-#: ../lib/af.c:174 ../lib/hw.c:160
+++#: ../lib/af.c:185 ../lib/hw.c:173
++ msgid "Ash"
++ msgstr "Ash"
++ 
++-#: ../lib/af.c:232
+++#: ../lib/af.c:243
+++#, c-format
++ msgid "Please don't supply more than one address family.\n"
++ msgstr "Bitte nur eine Adressfamilie angeben.\n"
++ 
++-#: ../lib/af.c:293
+++#: ../lib/af.c:304
+++#, c-format
++ msgid "Too much address family arguments.\n"
++ msgstr "Zu viele Adressfamilien angegeben.\n"
++ 
++-#: ../lib/af.c:304
+++#: ../lib/af.c:315
++ #, c-format
++ msgid "Unknown address family `%s'.\n"
++-msgstr "Unbekannte Adressfamilie `%s'.\n"
++-
++-#: ../lib/arcnet.c:53 ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52
++-#: ../lib/fddi.c:67 ../lib/hippi.c:68 ../lib/inet.c:244 ../lib/inet.c:259
++-#: ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ../lib/rose.c:71
++-#: ../lib/rose.c:126 ../lib/unix.c:56 ../lib/unix.c:76
++-msgid "[NONE SET]"
++-msgstr "[NICHT GESETZT]"
+++msgstr "Unbekannte Adressfamilie »%s«.\n"
++ 
++-#: ../lib/arcnet.c:81 ../lib/arcnet.c:96
+++#: ../lib/arcnet.c:70 ../lib/arcnet.c:85
++ #, c-format
++ msgid "in_arcnet(%s): invalid arcnet address!\n"
++ msgstr "in_arcnet(%s): Ungültige ARCnet-Adresse!\n"
++ 
++-#: ../lib/arcnet.c:108
+++#: ../lib/arcnet.c:97
++ #, c-format
++ msgid "in_arcnet(%s): trailing : ignored!\n"
++ msgstr "in_arcnet(%s): angehängt : ignoriert!\n"
++ 
++-#: ../lib/arcnet.c:120
+++#: ../lib/arcnet.c:109
++ #, c-format
++ msgid "in_arcnet(%s): trailing junk!\n"
++ msgstr "in_arcnet(%s): Nachfolgender Müll!\n"
++ 
++ #: ../lib/ash.c:81
+++#, c-format
++ msgid "Malformed Ash address"
++-msgstr "Fehlerhafte Ash Adresse"
+++msgstr "Fehlerhafte Ash-Adresse"
+++
+++#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244
+++#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78
+++#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76
+++msgid "[NONE SET]"
+++msgstr "[NICHT GESETZT]"
++ 
++ #: ../lib/ax25.c:97 ../lib/netrom.c:100
++ msgid "Invalid callsign"
++@@ -1898,22 +2168,21 @@ msgid "Callsign too long"
++ msgstr "Rufzeichen zu lang"
++ 
++ #: ../lib/ax25_gr.c:47
+++#, c-format
++ msgid "AX.25 not configured in this system.\n"
++ msgstr "AX.25 ist auf diesem System nicht konfiguriert.\n"
++ 
++ #: ../lib/ax25_gr.c:50
+++#, c-format
++ msgid "Kernel AX.25 routing table\n"
++ msgstr "Kernel AX.25 Routentabelle\n"
++ 
++ #. xxx
++ #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
+++#, c-format
++ msgid "Destination  Iface    Use\n"
++ msgstr "Ziel         SStelle  Benutzer\n"
++ 
++-#: ../lib/ddp_gr.c:21
++-msgid "Routing table for `ddp' not yet supported.\n"
++-msgstr "DDP-Routentabelle wird noch nicht unterstützt.\n"
++-
++ #: ../lib/ether.c:74 ../lib/ether.c:91
++ #, c-format
++ msgid "in_ether(%s): invalid ether address!\n"
++@@ -1929,153 +2198,168 @@ msgstr "in_ether(%s): angehängt : ignori
++ msgid "in_ether(%s): trailing junk!\n"
++ msgstr "in_ether(%s): Nachfolgender Müll!\n"
++ 
++-#: ../lib/fddi.c:95 ../lib/fddi.c:110
+++#: ../lib/fddi.c:84 ../lib/fddi.c:99
++ #, c-format
++ msgid "in_fddi(%s): invalid fddi address!\n"
++ msgstr "in_fddi(%s): Ungültige FDDI-Adresse!\n"
++ 
++-#: ../lib/fddi.c:122
+++#: ../lib/fddi.c:111
++ #, c-format
++ msgid "in_fddi(%s): trailing : ignored!\n"
++ msgstr "in_fddi(%s): nachfolgend : ignoriert!\n"
++ 
++-#: ../lib/fddi.c:134
+++#: ../lib/fddi.c:123
++ #, c-format
++ msgid "in_fddi(%s): trailing junk!\n"
++ msgstr "in_fddi(%s): Nachfolgender Müll!\n"
++ 
++-#: ../lib/getroute.c:97 ../lib/setroute.c:76
+++#: ../lib/getroute.c:101 ../lib/setroute.c:80
++ #, c-format
++ msgid "Address family `%s' not supported.\n"
++ msgstr "Adressfamilie `%s' wird nicht unterstützt.\n"
++ 
++-#: ../lib/getroute.c:103 ../lib/setroute.c:80
+++#: ../lib/getroute.c:107 ../lib/setroute.c:84
++ #, c-format
++ msgid "No routing for address family `%s'.\n"
++ msgstr "Kein Routen für Adressfamilie `%s'.\n"
++ 
++-#: ../lib/hippi.c:96 ../lib/hippi.c:111
+++#: ../lib/hippi.c:84 ../lib/hippi.c:99
++ #, c-format
++ msgid "in_hippi(%s): invalid hippi address!\n"
++ msgstr "in_hippi(%s): Ungültige HIPPI-Adresse!\n"
++ 
++-#: ../lib/hippi.c:123
+++#: ../lib/hippi.c:111
++ #, c-format
++ msgid "in_hippi(%s): trailing : ignored!\n"
++ msgstr "in_hippi(%s): nachfolgend : ignoriert!\n"
++ 
++-#: ../lib/hippi.c:134
+++#: ../lib/hippi.c:122
++ #, c-format
++ msgid "in_hippi(%s): trailing junk!\n"
++ msgstr "in_hippi(%s): Nachfolgender Müll!\n"
++ 
++-#: ../lib/hw.c:147
+++#: ../lib/hw.c:160
++ msgid "Local Loopback"
++ msgstr "Lokale Schleife"
++ 
++-#: ../lib/hw.c:150
+++#: ../lib/hw.c:163
++ msgid "Serial Line IP"
++ msgstr "Serielle IP"
++ 
++-#: ../lib/hw.c:151
+++#: ../lib/hw.c:164
++ msgid "VJ Serial Line IP"
++ msgstr "Serielle VJ-IP"
++ 
++-#: ../lib/hw.c:152
+++#: ../lib/hw.c:165
++ msgid "6-bit Serial Line IP"
++ msgstr "6-bit Serielle IP"
++ 
++-#: ../lib/hw.c:153
+++#: ../lib/hw.c:166
++ msgid "VJ 6-bit Serial Line IP"
++ msgstr "VJ 6-bit Serielle IP"
++ 
++-#: ../lib/hw.c:154
+++#: ../lib/hw.c:167
++ msgid "Adaptive Serial Line IP"
++ msgstr "Adaptive Serielle IP"
++ 
++-#: ../lib/hw.c:157
+++#: ../lib/hw.c:170
++ msgid "Ethernet"
++ msgstr "Ethernet"
++ 
++-#: ../lib/hw.c:163
+++#: ../lib/hw.c:176
++ msgid "Fiber Distributed Data Interface"
++ msgstr "Fiber Distributed Data Interface"
++ 
++-#: ../lib/hw.c:166
+++#: ../lib/hw.c:179
++ msgid "HIPPI"
++ msgstr "HIPPI"
++ 
++-#: ../lib/hw.c:178
+++#: ../lib/hw.c:191
+++msgid "generic X.25"
+++msgstr ""
+++
+++#: ../lib/hw.c:194
++ msgid "IPIP Tunnel"
++ msgstr "IPIP Tunnel"
++ 
++-#: ../lib/hw.c:181
+++#: ../lib/hw.c:197
++ msgid "Point-to-Point Protocol"
++-msgstr "Punkt-zu-Punkt Verbindung"
+++msgstr "Punkt-zu-Punkt-Verbindung"
++ 
++-#: ../lib/hw.c:184
+++#: ../lib/hw.c:200
++ msgid "(Cisco)-HDLC"
++ msgstr "(Cisco)-HDLC"
++ 
++-#: ../lib/hw.c:185
+++#: ../lib/hw.c:201
++ msgid "LAPB"
++ msgstr "LAPB"
++ 
++-#: ../lib/hw.c:188
+++#: ../lib/hw.c:204
++ msgid "ARCnet"
++ msgstr "ARCnet"
++ 
++-#: ../lib/hw.c:191
+++#: ../lib/hw.c:207
++ msgid "Frame Relay DLCI"
++ msgstr "Frame Relay DLCI"
++ 
++-#: ../lib/hw.c:192
+++#: ../lib/hw.c:208
++ msgid "Frame Relay Access Device"
++ msgstr "Frame Relay Access Device"
++ 
++-#: ../lib/hw.c:195
+++#: ../lib/hw.c:211
++ msgid "IPv6-in-IPv4"
++ msgstr "IPv6-nach-IPv4"
++ 
++-#: ../lib/hw.c:198
++-#, fuzzy
+++#: ../lib/hw.c:214
++ msgid "IrLAP"
++-msgstr "LAPB"
+++msgstr "IrLAP"
++ 
++-#: ../lib/hw.c:201
+++#: ../lib/hw.c:217
++ msgid "16/4 Mbps Token Ring"
++ msgstr ""
++ 
++-#: ../lib/hw.c:203
+++#: ../lib/hw.c:219
++ msgid "16/4 Mbps Token Ring (New)"
++ msgstr ""
++ 
+++#: ../lib/hw.c:226
+++msgid "Generic EUI-64"
+++msgstr ""
+++
++ #: ../lib/inet.c:153 ../lib/inet6.c:79
++ #, c-format
++ msgid "rresolve: unsupport address family %d !\n"
++ msgstr "rresolve: nicht unterstützte Adressfamilie %d !\n"
++ 
++-#: ../lib/inet6_gr.c:79
+++#: ../lib/inet6.c:131
+++#, fuzzy
+++msgid "[UNKNOWN]"
+++msgstr "UNBEKANNT"
+++
+++#: ../lib/inet6_gr.c:71
+++#, c-format
++ msgid "INET6 (IPv6) not configured in this system.\n"
++ msgstr "INET6 (IPv6) ist auf diesem System nicht konfiguriert.\n"
++ 
++-#: ../lib/inet6_gr.c:82
+++#: ../lib/inet6_gr.c:74
+++#, c-format
++ msgid "Kernel IPv6 routing table\n"
++-msgstr "Kernel IPv6 Routentabelle\n"
+++msgstr "Kernel-IPv6-Routentabelle\n"
++ 
++-#: ../lib/inet6_gr.c:84
+++#: ../lib/inet6_gr.c:76
+++#, c-format
++ msgid ""
++-"Destination                                 Next Hop                         "
++-"       Flags Metric Ref    Use Iface\n"
++-msgstr ""
++-"Ziel                                        Nächster Hop                     "
++-"            Flags Metric Ref    Benutzer Iface\n"
+++"Destination                                 Next "
+++"Hop                                Flags Metric Ref    Use Iface\n"
+++msgstr "Ziel                                        Nächster Hop                                 Flags Metric Ref    Benutzer Iface\n"
++ 
++-#: ../lib/inet6_gr.c:158
+++#: ../lib/inet6_gr.c:150
+++#, c-format
++ msgid "Kernel IPv6 Neighbour Cache\n"
++ msgstr "Kernel IPv6 Nachbarcache\n"
++ 
++-#: ../lib/inet6_gr.c:161
+++#: ../lib/inet6_gr.c:153
+++#, c-format
++ msgid ""
++ "Neighbour                                   HW Address        Iface    Flags "
++ "Ref State\n"
++@@ -2083,39 +2367,45 @@ msgstr ""
++ "Nachbar                                     HW-Adresse        Iface    Flags "
++ "Ref Zustand\n"
++ 
++-#: ../lib/inet6_gr.c:165
+++#: ../lib/inet6_gr.c:157
+++#, c-format
++ msgid ""
++ "Neighbour                                   HW Address        Iface    Flags "
++ "Ref State            Stale(sec) Delete(sec)\n"
++-msgstr ""
++-"Nachbar                                     HW-Adresse        Iface    Flags "
++-"Ref Zustand          Stale(sec) Löschen(sec)\n"
+++msgstr "Nachbar                                     HW-Adresse        Iface    Flags Ref Zustand          Stale(sec) Löschen(sec)\n"
++ 
++ #: ../lib/inet6_sr.c:46
+++#, c-format
++ msgid "Usage: inet6_route [-vF] del Target\n"
++ msgstr "Benutzung: inet6_route [-vF] del Ziel\n"
++ 
++ #: ../lib/inet6_sr.c:47
+++#, c-format
++ msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
++ msgstr "       inet6_route [-vF] add Ziel [gw Gateway] [metric M] [[dev] If]\n"
++ 
++ #: ../lib/inet6_sr.c:48
+++#, c-format
++ msgid "       inet6_route [-FC] flush      NOT supported\n"
++ msgstr "       inet6_route [-FC] flush      NICHT unterstützt\n"
++ 
++-#: ../lib/inet6_sr.c:182
+++#: ../lib/inet6_sr.c:188
+++#, c-format
++ msgid "Flushing `inet6' routing table not supported\n"
++-msgstr ",,Flush'' für IPv6 Routentabelle nicht unterstützt\n"
+++msgstr "»Flush« für IPv6-Routentabelle nicht unterstützt\n"
++ 
++ #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
+++#, c-format
++ msgid "INET (IPv4) not configured in this system.\n"
++ msgstr "INET (IPv4) ist auf diesem System nicht konfiguriert.\n"
++ 
++ #: ../lib/inet_gr.c:53
+++#, c-format
++ msgid "Kernel IP routing table\n"
++-msgstr "Kernel IP Routentabelle\n"
+++msgstr "Kernel-IP-Routentabelle\n"
++ 
++ #: ../lib/inet_gr.c:56
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
++ "Iface\n"
++@@ -2124,6 +2414,7 @@ msgstr ""
++ "Iface\n"
++ 
++ #: ../lib/inet_gr.c:59
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags   MSS Window  irtt "
++ "Iface\n"
++@@ -2132,6 +2423,7 @@ msgstr ""
++ "Iface\n"
++ 
++ #: ../lib/inet_gr.c:62
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt\n"
++@@ -2140,10 +2432,12 @@ msgstr ""
++ "Iface    MSS   Fenster irtt\n"
++ 
++ #: ../lib/inet_gr.c:237
+++#, c-format
++ msgid "Kernel IP routing cache\n"
++-msgstr "Kernel IP Routencache\n"
+++msgstr "Kernel-IP-Routencache\n"
++ 
++ #: ../lib/inet_gr.c:258
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface\n"
++@@ -2152,6 +2446,7 @@ msgstr ""
++ "Iface\n"
++ 
++ #: ../lib/inet_gr.c:261
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags   MSS Window  irtt "
++ "Iface\n"
++@@ -2160,6 +2455,7 @@ msgstr ""
++ "Iface\n"
++ 
++ #: ../lib/inet_gr.c:266
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt  HH  Arp\n"
++@@ -2168,6 +2464,7 @@ msgstr ""
++ "Iface    MSS   Fenster irtt   HH  Arp\n"
++ 
++ #: ../lib/inet_gr.c:290
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
++@@ -2175,37 +2472,39 @@ msgstr ""
++ "Quelle          Ziel            Gateway         Flags Metrik Ref    Ben "
++ "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
++ 
++-#: ../lib/inet_sr.c:50
+++#: ../lib/inet_sr.c:51
+++#, c-format
++ msgid ""
++ "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
++ "[[dev] If]\n"
++-msgstr ""
++-"Benutzung: inet_route [-vF] del {-host|-net} Ziel[/prefix] [gw Gw] [metric "
++-"M] [[dev] If]\n"
+++msgstr "Benutzung: inet_route [-vF] del {-host|-net} Ziel[/Präfix] [gw Gw] [metric M] [[dev] If]\n"
++ 
++-#: ../lib/inet_sr.c:51
+++#: ../lib/inet_sr.c:52
+++#, c-format
++ msgid ""
++ "       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
++-msgstr ""
++-"       inet_route [-vF] add {-host|-net} Ziel[/Prefix] [gw Gw] [metric M]\n"
+++msgstr "       inet_route [-vF] add {-host|-net} Ziel[/Präfix] [gw Gw] [metric M]\n"
++ 
++-#: ../lib/inet_sr.c:52
+++#: ../lib/inet_sr.c:53
+++#, c-format
++ msgid ""
++ "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
++ msgstr ""
++ "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
++ 
++-#: ../lib/inet_sr.c:53
+++#: ../lib/inet_sr.c:54
+++#, c-format
++ msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
++ msgstr "                              [mod] [dyn] [reinstate] [[dev] If]\n"
++ 
++-#: ../lib/inet_sr.c:54
+++#: ../lib/inet_sr.c:55
+++#, c-format
++ msgid ""
++ "       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
++-msgstr ""
++-"       inet_route [-vF] add {-host|-net} Ziel[/Präfix] [metric M] reject\n"
+++msgstr "       inet_route [-vF] add {-host|-net} Ziel[/Präfix] [metric M] reject\n"
++ 
++-#: ../lib/inet_sr.c:55
+++#: ../lib/inet_sr.c:56
+++#, c-format
++ msgid "       inet_route [-FC] flush      NOT supported\n"
++ msgstr "       inet_route [-FC] flush      NICHT unterstützt\n"
++ 
++@@ -2215,15 +2514,17 @@ msgid "route: %s: cannot use a NETWORK a
++ msgstr "route: %s: Netzadresse als Gateway ungültig!\n"
++ 
++ #: ../lib/inet_sr.c:174
++-#, fuzzy
+++#, fuzzy, c-format
++ msgid "route: Invalid MSS/MTU.\n"
++ msgstr "route: Ungültige MSS.\n"
++ 
++ #: ../lib/inet_sr.c:187
+++#, c-format
++ msgid "route: Invalid window.\n"
++ msgstr "route: Ungültige Fenstergröße.\n"
++ 
++ #: ../lib/inet_sr.c:203
+++#, c-format
++ msgid "route: Invalid initial rtt.\n"
++ msgstr "route: Ungültige Start-RTT.\n"
++ 
++@@ -2238,126 +2539,408 @@ msgid "route: bogus netmask %s\n"
++ msgstr "Route: Fehlerhafte Netzmaske %s\n"
++ 
++ #: ../lib/inet_sr.c:270
+++#, c-format
++ msgid "route: netmask doesn't match route address\n"
++ msgstr "route: Netzmaske passt nicht zur Routenadresse\n"
++ 
++ #: ../lib/inet_sr.c:306
+++#, c-format
++ msgid "Flushing `inet' routing table not supported\n"
++-msgstr ",,Flush'' der Inet-Routentabelle nicht unterstützt\n"
+++msgstr "»Flush« der Inet-Routentabelle nicht unterstützt\n"
++ 
++ #: ../lib/inet_sr.c:310
+++#, c-format
++ msgid "Modifying `inet' routing cache not supported\n"
++-msgstr "Änderung des ,,Inet'' Routencaches nicht unterstützt\n"
+++msgstr "Änderung des »Inet« Routencaches nicht unterstützt\n"
++ 
++ #: ../lib/ipx_gr.c:52
+++#, c-format
++ msgid "IPX not configured in this system.\n"
++ msgstr "IPX ist auf diesem System nicht konfiguriert.\n"
++ 
++ #: ../lib/ipx_gr.c:56
+++#, c-format
++ msgid "Kernel IPX routing table\n"
++-msgstr "Kernel IPX Routentabelle\n"
+++msgstr "Kernel-IPX-Routentabelle\n"
++ 
++ #. xxx
++ #: ../lib/ipx_gr.c:57
+++#, c-format
++ msgid "Destination               Router Net                Router Node\n"
++-msgstr "Ziel                      Router Netz               Router Knoten\n"
+++msgstr "Ziel                      Router-Netz               Router-Knoten\n"
++ 
++ #: ../lib/ipx_sr.c:33
+++#, c-format
++ msgid "IPX: this needs to be written\n"
++-msgstr "IPX: dies muß noch geschrieben werden\n"
+++msgstr "IPX: dies muss noch geschrieben werden\n"
++ 
++-#: ../lib/masq_info.c:197
+++#: ../lib/masq_info.c:198
+++#, c-format
++ msgid "IP masquerading entries\n"
++ msgstr "IP-Maskierungseinträge\n"
++ 
++-#: ../lib/masq_info.c:200
+++#: ../lib/masq_info.c:201
+++#, c-format
++ msgid "prot   expire source               destination          ports\n"
++ msgstr "Prot   expire Quelle               Ziel                 Ports\n"
++ 
++-#: ../lib/masq_info.c:203
+++#: ../lib/masq_info.c:204
+++#, c-format
++ msgid ""
++-"prot   expire    initseq delta prevd source               destination        "
++-"  ports\n"
+++"prot   expire    initseq delta prevd source               "
+++"destination          ports\n"
++ msgstr ""
++-"Prot   Ablauf    Anf-Seq Delta Prevd Quelle               Ziel               "
++-"  Ports\n"
+++"Prot   Ablauf    Anf-Seq Delta Prevd Quelle               "
+++"Ziel                 Ports\n"
++ 
++ #: ../lib/netrom_gr.c:48
+++#, c-format
++ msgid "NET/ROM not configured in this system.\n"
++ msgstr "NET/ROM ist auf diesem System nicht verfügbar.\n"
++ 
++ #: ../lib/netrom_gr.c:51
+++#, c-format
++ msgid "Kernel NET/ROM routing table\n"
++-msgstr "Kernel NET/ROM Routentabelle\n"
+++msgstr "Kernel-NET/ROM-Routentabelle\n"
++ 
++ #: ../lib/netrom_gr.c:52
+++#, c-format
++ msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
++ msgstr "Ziel         Mnemonic  Qualität  Nachbar  Iface\n"
++ 
++ #: ../lib/netrom_sr.c:34
+++#, c-format
++ msgid "netrom usage\n"
++-msgstr "NET/ROM Benutzung\n"
+++msgstr "NET/ROM-Benutzung\n"
++ 
++ #: ../lib/netrom_sr.c:44
+++#, c-format
++ msgid "NET/ROM: this needs to be written\n"
++-msgstr "NET/ROM: Dies muß noch geschrieben werden\n"
+++msgstr "NET/ROM: Dies muss noch geschrieben werden\n"
++ 
++ #: ../lib/ppp.c:44
+++#, c-format
++ msgid "You cannot start PPP with this program.\n"
++ msgstr "Mit diesem Programm kann PPP nicht gestartet werden.\n"
++ 
++ #: ../lib/ppp_ac.c:38
+++#, c-format
++ msgid "Sorry, use pppd!\n"
++-msgstr "Bitte benutzen sie pppd.\n"
+++msgstr "Bitte benutzen Sie pppd.\n"
++ 
++ #: ../lib/rose.c:87
++ msgid "Node address must be ten digits"
++-msgstr "Knotenadresse muß zehn Ziffern haben"
+++msgstr "Knotenadresse muss zehn Ziffern haben"
++ 
++ #: ../lib/rose_gr.c:51
+++#, c-format
++ msgid "ROSE not configured in this system.\n"
++ msgstr "ROSE ist auf diesem System nicht verfügbar.\n"
++ 
++ #: ../lib/rose_gr.c:54
+++#, c-format
++ msgid "Kernel ROSE routing table\n"
++-msgstr "ROSE Kernel Routentabelle\n"
+++msgstr "ROSE-Kernel-Routentabelle\n"
++ 
++-#: ../lib/tr.c:70 ../lib/tr.c:85
+++#: ../lib/tr.c:86 ../lib/tr.c:101
++ #, c-format
++ msgid "in_tr(%s): invalid token ring address!\n"
++ msgstr "in_tr(%s): ungültige Tokenringadresse!\n"
++ 
++-#: ../lib/tr.c:97
+++#: ../lib/tr.c:113
++ #, c-format
++ msgid "in_tr(%s): trailing : ignored!\n"
++ msgstr "in_tr(%s): nachfolgend : ignoriert!\n"
++ 
++-#: ../lib/tr.c:109
+++#: ../lib/tr.c:125
++ #, c-format
++ msgid "in_tr(%s): trailing junk!\n"
++ msgstr "in_tr(%s): nachfolgender Müll!\n"
++ 
++-#: ../lib/interface.c:124
+++#: ../lib/interface.c:176
++ #, c-format
++ msgid "warning: no inet socket available: %s\n"
++-msgstr "Warnung: Keine INET Sockets verfügbar: %s\n"
+++msgstr "Warnung: Keine INET-Sockets verfügbar: %s\n"
++ 
++-#: ../lib/interface.c:270
+++#: ../lib/interface.c:325
++ #, c-format
++ msgid "Warning: cannot open %s (%s). Limited output.\n"
++ msgstr ""
++ 
++ #. Give better error message for this case.
++-#: ../lib/interface.c:504
+++#: ../lib/interface.c:571
++ msgid "Device not found"
++ msgstr "Gerät nicht gefunden"
++ 
++-#: ../lib/interface.c:508
+++#: ../lib/interface.c:575
++ #, c-format
++ msgid "%s: error fetching interface information: %s\n"
++ msgstr "%s: Fehler beim Auslesen der Schnittstelleninformation: %s\n"
++ 
++-#: ../lib/sockets.c:59
+++#: ../lib/interface.c:608
+++msgid "     - no statistics available -"
+++msgstr "     - keine Statistiken verfügbar -"
+++
+++#: ../lib/interface.c:612
+++#, c-format
+++msgid "[NO FLAGS]"
+++msgstr "[KEINE FLAGS]"
+++
+++#: ../lib/interface.c:688
+++#, c-format
+++msgid "%-9.9s Link encap:%s  "
+++msgstr "%-9.9s Protokoll:%s  "
+++
+++#: ../lib/interface.c:693
+++#, c-format
+++msgid "HWaddr %s  "
+++msgstr "Hardware Adresse %s  "
+++
+++#: ../lib/interface.c:696
+++#, c-format
+++msgid "Media:%s"
+++msgstr "Medium:%s"
+++
+++#: ../lib/interface.c:698
+++#, c-format
+++msgid "(auto)"
+++msgstr "(auto)"
+++
+++#: ../lib/interface.c:705
+++#, c-format
+++msgid "          %s addr:%s "
+++msgstr "          %s Adresse:%s "
+++
+++#: ../lib/interface.c:708
+++#, c-format
+++msgid " P-t-P:%s "
+++msgstr " P-z-P:%s "
+++
+++#: ../lib/interface.c:711
+++#, c-format
+++msgid " Bcast:%s "
+++msgstr " Bcast:%s "
+++
+++#: ../lib/interface.c:713
+++#, c-format
+++msgid " Mask:%s\n"
+++msgstr " Maske:%s\n"
+++
+++#: ../lib/interface.c:730
+++#, c-format
+++msgid "          inet6 addr: %s/%d"
+++msgstr "          inet6-Adresse: %s/%d"
+++
+++#: ../lib/interface.c:732
+++#, c-format
+++msgid " Scope:"
+++msgstr " Gültigkeitsbereich:"
+++
+++#: ../lib/interface.c:735
+++#, c-format
+++msgid "Global"
+++msgstr "Global"
+++
+++#: ../lib/interface.c:738
+++#, c-format
+++msgid "Link"
+++msgstr "Verbindung"
+++
+++#: ../lib/interface.c:741
+++#, c-format
+++msgid "Site"
+++msgstr "Standort"
+++
+++#: ../lib/interface.c:744
+++#, c-format
+++msgid "Compat"
+++msgstr "Kompatibilität"
+++
+++#: ../lib/interface.c:747
+++#, c-format
+++msgid "Host"
+++msgstr "Maschine"
+++
+++#: ../lib/interface.c:750
+++#, c-format
+++msgid "Unknown"
+++msgstr "Unbekannt"
+++
+++#: ../lib/interface.c:765
+++#, c-format
+++msgid "          IPX/Ethernet II addr:%s\n"
+++msgstr "          IPX/Ethernet II Adresse:%s\n"
+++
+++#: ../lib/interface.c:768
+++#, c-format
+++msgid "          IPX/Ethernet SNAP addr:%s\n"
+++msgstr "          IPX/Ethernet SNAP Adresse:%s\n"
+++
+++#: ../lib/interface.c:771
+++#, c-format
+++msgid "          IPX/Ethernet 802.2 addr:%s\n"
+++msgstr "          IPX/Ethernet 802.2 Adresse:%s\n"
+++
+++#: ../lib/interface.c:774
+++#, c-format
+++msgid "          IPX/Ethernet 802.3 addr:%s\n"
+++msgstr "          IPX/Ethernet 802.3 Adresse:%s\n"
+++
+++#: ../lib/interface.c:784
+++#, c-format
+++msgid "          EtherTalk Phase 2 addr:%s\n"
+++msgstr "          EtherTalk Phase 2 Adresse:%s\n"
+++
+++#: ../lib/interface.c:793
+++#, c-format
+++msgid "          econet addr:%s\n"
+++msgstr "          econet Adresse:%s\n"
+++
+++#: ../lib/interface.c:800
+++#, c-format
+++msgid "[NO FLAGS] "
+++msgstr "[KEINE FLAGS] "
+++
+++#: ../lib/interface.c:802
+++#, c-format
+++msgid "UP "
+++msgstr "UP "
+++
+++#: ../lib/interface.c:804
+++#, c-format
+++msgid "BROADCAST "
+++msgstr "BROADCAST "
+++
+++#: ../lib/interface.c:806
+++#, c-format
+++msgid "DEBUG "
+++msgstr "DEBUG "
+++
+++#: ../lib/interface.c:808
+++#, c-format
+++msgid "LOOPBACK "
+++msgstr "LOOPBACK "
+++
+++#: ../lib/interface.c:810
+++#, c-format
+++msgid "POINTOPOINT "
+++msgstr "PUNKTZUPUNKT "
+++
+++#: ../lib/interface.c:812
+++#, c-format
+++msgid "NOTRAILERS "
+++msgstr "NOTRAILERS "
+++
+++#: ../lib/interface.c:814
+++#, c-format
+++msgid "RUNNING "
+++msgstr "RUNNING "
+++
+++#: ../lib/interface.c:816
+++#, c-format
+++msgid "NOARP "
+++msgstr "NOARP "
+++
+++#: ../lib/interface.c:818
+++#, c-format
+++msgid "PROMISC "
+++msgstr "PROMISC "
+++
+++#: ../lib/interface.c:820
+++#, c-format
+++msgid "ALLMULTI "
+++msgstr "ALLMULTI "
+++
+++#: ../lib/interface.c:822
+++#, c-format
+++msgid "SLAVE "
+++msgstr "SLAVE "
+++
+++#: ../lib/interface.c:824
+++#, c-format
+++msgid "MASTER "
+++msgstr "MASTER "
+++
+++#: ../lib/interface.c:826
+++#, c-format
+++msgid "MULTICAST "
+++msgstr "MULTICAST "
+++
+++#: ../lib/interface.c:829
+++#, c-format
+++msgid "DYNAMIC "
+++msgstr "DYNAMIC "
+++
+++#. DONT FORGET TO ADD THE FLAGS IN ife_print_short
+++#: ../lib/interface.c:832
+++#, c-format
+++msgid " MTU:%d  Metric:%d"
+++msgstr " MTU:%d  Metrik:%d"
+++
+++#: ../lib/interface.c:836
+++#, c-format
+++msgid "  Outfill:%d  Keepalive:%d"
+++msgstr "  Outfill:%d  Keepalive:%d"
+++
+++#: ../lib/interface.c:850
+++#, fuzzy, c-format
+++msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
+++msgstr "Empfangene Pakete:%lu Fehler:%lu Weggeworfen:%lu Überlauf:%lu Rahmen:%lu\n"
+++
+++#: ../lib/interface.c:855
+++#, c-format
+++msgid "             compressed:%lu\n"
+++msgstr "             komprimiert:%lu\n"
+++
+++#: ../lib/interface.c:895
+++#, fuzzy, c-format
+++msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
+++msgstr "Verschickte Pakete:%lu Fehler:%lu Weggeworfen:%lu Überlauf:%lu Träger:%lu\n"
+++
+++#: ../lib/interface.c:899
+++#, c-format
+++msgid "          collisions:%lu "
+++msgstr "          Kollisionen:%lu "
+++
+++#: ../lib/interface.c:901
+++#, c-format
+++msgid "compressed:%lu "
+++msgstr "Komprimiert:%lu "
+++
+++#: ../lib/interface.c:903
+++#, c-format
+++msgid "txqueuelen:%d "
+++msgstr "Sendewarteschlangenlänge:%d "
+++
+++#: ../lib/interface.c:905
+++#, c-format
+++msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
+++msgstr ""
+++
+++#: ../lib/interface.c:916
+++#, c-format
+++msgid "Interrupt:%d "
+++msgstr "Interrupt:%d "
+++
+++#. Only print devices using it for
+++#. I/O maps
+++#: ../lib/interface.c:919
+++#, c-format
+++msgid "Base address:0x%x "
+++msgstr "Basisadresse:0x%x "
+++
+++#: ../lib/interface.c:921
+++#, c-format
+++msgid "Memory:%lx-%lx "
+++msgstr "Speicher:%lx-%lx "
+++
+++#: ../lib/interface.c:924
+++#, c-format
+++msgid "DMA chan:%x "
+++msgstr "DMA Kanal:%x "
+++
+++#: ../lib/sockets.c:63
+++#, c-format
++ msgid "No usable address families found.\n"
++ msgstr "Keine benutzbaren Adressfamilien gefunden.\n"
++ 
++@@ -2369,41 +2952,44 @@ msgstr "ip: %s ist eine ungültige INET-A
++ #: ../lib/util-ank.c:238
++ #, c-format
++ msgid "ip: %s is invalid inet prefix\n"
++-msgstr "ip: %s ist ein ungültiges INET-Prefix\n"
+++msgstr "ip: %s ist ein ungültiges INET-Präfix\n"
++ 
++ #: ../lib/util-ank.c:248
++ #, c-format
++ msgid "ip: %s is invalid IPv4 address\n"
++-msgstr "ip: %s ist eine ungültige IPv4 Adresse\n"
+++msgstr "ip: %s ist eine ungültige IPv4-Adresse\n"
++ 
++ #: ../lib/util-ank.c:256
++ #, c-format
++ msgid "ip: argument is wrong: %s\n"
++ msgstr "ip: Fehlerhaftes Argument: %s\n"
++ 
++-#: ../ipmaddr.c:56
+++#: ../ipmaddr.c:61
+++#, c-format
++ msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
++ msgstr "Benutzung: ipmaddr [ add | del ] MULTIADR dev NAME\n"
++ 
++-#: ../ipmaddr.c:57
+++#: ../ipmaddr.c:62
+++#, c-format
++ msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
++ msgstr "       ipmaddr show [ dev NAME ] [ ipv4 | ipv6 | link | all ]\n"
++ 
++-#: ../ipmaddr.c:58
+++#: ../ipmaddr.c:63
+++#, c-format
++ msgid "       ipmaddr -V | -version\n"
++ msgstr ""
++ 
++-#: ../ipmaddr.c:258
+++#: ../ipmaddr.c:263
++ #, c-format
++ msgid "family %d "
++ msgstr "familie %d "
++ 
++-#: ../ipmaddr.c:267
+++#: ../ipmaddr.c:272
++ #, c-format
++ msgid " users %d"
++ msgstr " Benutzer %d"
++ 
++-#: ../ipmaddr.c:353
+++#: ../ipmaddr.c:358
++ msgid "Cannot create socket"
++ msgstr "Kann Socket nicht öffnen"
++ 
++@@ -2418,13 +3004,14 @@ msgid "slattach: tty_lock: (%s): %s\n"
++ msgstr "slattach: tty_lock: (%s): %s\n"
++ 
++ #: ../slattach.c:192
+++#, c-format
++ msgid "slattach: cannot write PID file\n"
++ msgstr "slattach: Kann PID-Datei nicht schreiben\n"
++ 
++ #: ../slattach.c:202
++ #, c-format
++ msgid "slattach: tty_lock: UUCP user %s unknown!\n"
++-msgstr "slattach: tty_lock: UUCP Benutzer %s unbekannt!\n"
+++msgstr "slattach: tty_lock: UUCP-Benutzer %s unbekannt!\n"
++ 
++ #: ../slattach.c:430
++ #, c-format
++@@ -2436,39 +3023,71 @@ msgstr "slattach: tty_hangup(DROP): %s\n
++ msgid "slattach: tty_hangup(RAISE): %s\n"
++ msgstr "slattach: tty_hangup(RAISE): %s\n"
++ 
++-#: ../slattach.c:486
+++#: ../slattach.c:468
+++#, fuzzy, c-format
+++msgid "slattach: tty name too long\n"
+++msgstr "%s: name zu lang\n"
+++
+++#: ../slattach.c:498
+++#, c-format
++ msgid "slattach: tty_open: cannot get current state!\n"
++ msgstr "slattach: tty_open: kann aktuellen Zustand nicht auslesen!\n"
++ 
++-#: ../slattach.c:493
+++#: ../slattach.c:505
+++#, c-format
++ msgid "slattach: tty_open: cannot get current line disc!\n"
++ msgstr ""
++ "slattach: tty_open: Kann augenblicklichen Leitungszustand nicht auslesen!\n"
++ 
++-#: ../slattach.c:501
+++#: ../slattach.c:513
+++#, c-format
++ msgid "slattach: tty_open: cannot set RAW mode!\n"
++ msgstr "slattach: tty_open: Kann RAW-Modus nicht setzen!\n"
++ 
++-#: ../slattach.c:508
+++#: ../slattach.c:520
++ #, c-format
++ msgid "slattach: tty_open: cannot set %s bps!\n"
++ msgstr "slattach: tty_open: Kann %s bps nicht setzen!\n"
++ 
++-#: ../slattach.c:518
+++#: ../slattach.c:530
+++#, c-format
++ msgid "slattach: tty_open: cannot set 8N1 mode!\n"
++ msgstr "slattach: tty_open: Kann 8N1-Modus nicht setzen!\n"
++ 
++-#: ../slattach.c:686
+++#: ../slattach.c:672
+++#, c-format
+++msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n"
+++msgstr ""
+++
+++#: ../slattach.c:704
++ #, c-format
++ msgid "%s started"
++ msgstr "%s gestartet"
++ 
++-#: ../slattach.c:687
+++#: ../slattach.c:705
++ #, c-format
++ msgid " on %s"
++ msgstr " auf %s"
++ 
++-#: ../slattach.c:688
+++#: ../slattach.c:706
++ #, c-format
++ msgid " interface %s\n"
++ msgstr " Schnittstelle: %s\n"
+++
+++msgid ""
+++"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
+++"<-''-\n"
+++msgstr ""
+++"  arp [-v]   [<HW>] [-i <if>] -s  <Hostname> <hwaddr> [netmask <nm>] pub\n"
+++
+++msgid "%s: unknown interface: %s\n"
+++msgstr "%s: unbekannte Schnittstelle: %s\n"
+++
+++msgid "address mask replies"
+++msgstr "Adressmaskenantworten"
+++
+++msgid "unknown title %s\n"
+++msgstr "Unbekannter Titel %s\n"
+++
+++msgid "Routing table for `ddp' not yet supported.\n"
+++msgstr "DDP-Routentabelle wird noch nicht unterstützt.\n"
++Index: net-tools/po/ja.po
++===================================================================
++--- /dev/null
+++++ net-tools/po/ja.po
++@@ -0,0 +1,3133 @@
+++# Net-tool Japanese locale data
+++# Kenshi Muto <kmuto@debian.org>, 2007.
+++# Yasuyuki Furukawa <yasu@on.cs.keio.ac.jp>, 1999.
+++#
+++msgid ""
+++msgstr ""
+++"Report-Msgid-Bugs-To: \n"
+++"POT-Creation-Date: 2007-06-30 12:28+0900\n"
+++"PO-Revision-Date: 2007-07-04 20:47+0900\n"
+++"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
+++"Language-Team: Japanese\n"
+++"MIME-Version: 1.0\n"
+++"Content-Type: text/plain; charset=UTF-8\n"
+++"Content-Transfer-Encoding: 8-bit\n"
+++
+++#: ../arp.c:112 ../arp.c:279
+++#, c-format
+++msgid "arp: need host name\n"
+++msgstr "arp: ホスト��必���\n"
+++
+++#: ../arp.c:215 ../arp.c:230
+++#, c-format
+++msgid "No ARP entry for %s\n"
+++msgstr "%s�ARPエントリ��り��ん\n"
+++
+++#: ../arp.c:248
+++#, c-format
+++msgid "arp: cant get HW-Address for `%s': %s.\n"
+++msgstr "arp: '%s'��ードウェアアドレスを�得����ん: %s.\n"
+++
+++#: ../arp.c:252
+++#, c-format
+++msgid "arp: protocol type mismatch.\n"
+++msgstr "arp: プロトコルタイプ������ん.\n"
+++
+++#: ../arp.c:261
+++#, c-format
+++msgid "arp: device `%s' has HW address %s `%s'.\n"
+++msgstr "arp: デ�イス`%s'��ードウェアアドレス%s `%s'��.\n"
+++
+++#: ../arp.c:293
+++#, c-format
+++msgid "arp: need hardware address\n"
+++msgstr "arp: �ードウェアアドレス�必���\n"
+++
+++#: ../arp.c:301
+++#, c-format
+++msgid "arp: invalid hardware address\n"
+++msgstr "arp: �ードウェアアドレス���当��\n"
+++
+++#: ../arp.c:398
+++#, c-format
+++msgid "arp: cannot open etherfile %s !\n"
+++msgstr "arp: etherファイル%s�開���ん!\n"
+++
+++#: ../arp.c:414
+++#, c-format
+++msgid "arp: format error on line %u of etherfile %s !\n"
+++msgstr "arp: %u行(ファイル%s)�フォーマットエラー��り��!\n"
+++
+++#: ../arp.c:427
+++#, c-format
+++msgid "arp: cannot set entry on line %u of etherfile %s !\n"
+++msgstr "arp: etherファイル%u行(%s)�エントリを設定����ん!\n"
+++
+++#: ../arp.c:448
+++#, c-format
+++msgid ""
+++"Address                  HWtype  HWaddress           Flags Mask            "
+++"Iface\n"
+++msgstr "アドレス               HWタイプ  HWアドレス         フラグ マスク インタフェース\n"
+++
+++#: ../arp.c:476
+++msgid "<from_interface>"
+++msgstr "<起点インタフェース>"
+++
+++#: ../arp.c:478
+++msgid "(incomplete)"
+++msgstr "(�完全)"
+++
+++# translatable?
+++#: ../arp.c:495
+++#, c-format
+++msgid "%s (%s) at "
+++msgstr "%s (%s) at "
+++
+++#: ../arp.c:501
+++#, c-format
+++msgid "<incomplete> "
+++msgstr "<�完全> "
+++
+++#: ../arp.c:507
+++#, c-format
+++msgid "netmask %s "
+++msgstr "�ットマスク %s "
+++
+++# translatable?
+++#: ../arp.c:524
+++#, c-format
+++msgid "on %s\n"
+++msgstr "on %s\n"
+++
+++#: ../arp.c:605
+++#, c-format
+++msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
+++msgstr "エントリ: %d\tスキップ: %d\t発見: %d\n"
+++
+++#: ../arp.c:609
+++#, c-format
+++msgid "%s (%s) -- no entry\n"
+++msgstr "%s (%s) -- エントリ��\n"
+++
+++#: ../arp.c:611
+++#, c-format
+++msgid "arp: in %d entries no match found.\n"
+++msgstr "arp: %d�エントリ中, 一致�るも��見��り��ん.\n"
+++
+++#: ../arp.c:626
+++#, c-format
+++msgid ""
+++"Usage:\n"
+++"  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
+++"cache\n"
+++msgstr ""
+++"使用法:\n"
+++"  arp [-vn]  [<HW>] [-i <インタフェース>]\n"
+++"                                [-a] [<ホスト�>]   ‥‥ ARPキャッシュ�表"
+++"示\n"
+++
+++#: ../arp.c:627
+++#, c-format
+++msgid ""
+++"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
+++"entry\n"
+++msgstr "  arp [-v]    [-i <インタフェース>]  -d  <ホスト�> [pub] ‥‥ARPエントリを削除\n"
+++
+++#: ../arp.c:628
+++#, c-format
+++msgid ""
+++"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
+++"file\n"
+++msgstr ""
+++"  arp [-vnD] [<HW>] [-i <インタフェース>] \n"
+++"                              -f  <ファイル�>  ‥‥ファイル�らエントリを追加\n"
+++
+++#: ../arp.c:629
+++#, c-format
+++msgid ""
+++"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
+++"entry\n"
+++msgstr ""
+++"  arp [-v]   [<HW>] [-i <インタフェース>]\n"
+++"             -s <ホスト�> <�ードウェアアドレス> [temp] ‥‥エントリを追加\n"
+++
+++# FIXME:What does '' mean?
+++#: ../arp.c:630
+++#, c-format
+++msgid ""
+++"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
+++"<-''-\n"
+++"\n"
+++msgstr ""
+++"  arp [-v]   [<HW>] [-i <インタフェース>] -Ds <ホスト�>\n"
+++"              <インタフェース> [netmask <�ットマスク>] pub     ‥‥     〃\n"
+++
+++#: ../arp.c:632
+++#, c-format
+++msgid ""
+++"        -a                       display (all) hosts in alternative (BSD) "
+++"style\n"
+++msgstr ""
+++"        -a                 新��(BSD)スタイル�エントリ�れ�全ホストを表示"
+++"�る\n"
+++
+++#: ../arp.c:633
+++#, c-format
+++msgid "        -s, --set                set a new ARP entry\n"
+++msgstr "        -s, --set          新�ARPエントリを設定�る\n"
+++
+++#: ../arp.c:634
+++#, c-format
+++msgid "        -d, --delete             delete a specified entry\n"
+++msgstr "        -d, --delete       指定エントリを削除�る\n"
+++
+++#: ../arp.c:635 ../netstat.c:1503 ../route.c:86
+++#, c-format
+++msgid "        -v, --verbose            be verbose\n"
+++msgstr "        -v, --verbose            詳細表示を行��\n"
+++
+++#: ../arp.c:636 ../netstat.c:1504 ../route.c:87
+++#, c-format
+++msgid "        -n, --numeric            don't resolve names\n"
+++msgstr "        -n, --numeric            ���レゾルブを���\n"
+++
+++#: ../arp.c:637
+++#, c-format
+++msgid ""
+++"        -i, --device             specify network interface (e.g. eth0)\n"
+++msgstr "        -i, --device       �ットワークインタフェース�指定(例 eth0)\n"
+++
+++#: ../arp.c:638
+++#, c-format
+++msgid "        -D, --use-device         read <hwaddr> from given device\n"
+++msgstr ""
+++"        -D, --use-device   与�られ�デ�イス�ら\n"
+++"                                    <HWアドレス>を読�込む\n"
+++
+++#: ../arp.c:639
+++#, c-format
+++msgid "        -A, -p, --protocol       specify protocol family\n"
+++msgstr "        -A, -p, --protocol       プロトコルファミリを指定�る\n"
+++
+++#: ../arp.c:640
+++#, c-format
+++msgid ""
+++"        -f, --file               read new entries from file or from /etc/"
+++"ethers\n"
+++"\n"
+++msgstr "        -f, --file         /etc/ethersファイル�ら新�エントリを読�込む\n\n"
+++
+++#: ../arp.c:642 ../rarp.c:182
+++#, c-format
+++msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
+++msgstr "  <HW>=�ードウェアアドレスタイプを指定�る��'-H <hw>'を使��下��。標準: %s\n"
+++
+++#: ../arp.c:643 ../rarp.c:183
+++#, c-format
+++msgid "  List of possible hardware types (which support ARP):\n"
+++msgstr "  (ARPをサ�ート��)指定�能��ードウェアタイプ�リスト:\n"
+++
+++#: ../arp.c:677 ../arp.c:762
+++#, c-format
+++msgid "%s: hardware type not supported!\n"
+++msgstr "%s: �ードウェアタイプ�サ�ート�れ����ん!\n"
+++
+++#: ../arp.c:681
+++#, c-format
+++msgid "%s: address family not supported!\n"
+++msgstr "%s: アドレスファミリ�サ�ート�れ����ん!\n"
+++
+++#: ../arp.c:716
+++#, c-format
+++msgid "arp: -N not yet supported.\n"
+++msgstr "arp: -N���サ�ート�����ん.\n"
+++
+++#: ../arp.c:726
+++#, c-format
+++msgid "arp: %s: unknown address family.\n"
+++msgstr "arp: %s: �明�アドレスファミリ��.\n"
+++
+++#: ../arp.c:735
+++#, c-format
+++msgid "arp: %s: unknown hardware type.\n"
+++msgstr "arp: %s: �明��ードウェアタイプ��.\n"
+++
+++#: ../arp.c:754
+++#, c-format
+++msgid "arp: %s: kernel only supports 'inet'.\n"
+++msgstr "arp: %s: カー�ル�'inet'以外�サ�ート�����ん.\n"
+++
+++#: ../arp.c:767
+++#, c-format
+++msgid "arp: %s: hardware type without ARP support.\n"
+++msgstr "arp: %s: ARPサ�ート����ードウェアタイプ��.\n"
+++
+++#: ../hostname.c:71
+++#, c-format
+++msgid "Setting nodename to `%s'\n"
+++msgstr "ノード�を`%s'�設定����\n"
+++
+++#: ../hostname.c:76
+++#, c-format
+++msgid "%s: you must be root to change the node name\n"
+++msgstr "%s: ノード��変更�ルート���れ��り��ん\n"
+++
+++#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117
+++#, c-format
+++msgid "%s: name too long\n"
+++msgstr "%s: ���長����\n"
+++
+++#: ../hostname.c:91
+++#, c-format
+++msgid "Setting hostname to `%s'\n"
+++msgstr "ホスト�を`%s'�設定����\n"
+++
+++#: ../hostname.c:96
+++#, c-format
+++msgid "%s: you must be root to change the host name\n"
+++msgstr "%s: ホスト��変更�ルート���れ��り��ん\n"
+++
+++#: ../hostname.c:109
+++#, c-format
+++msgid "Setting domainname to `%s'\n"
+++msgstr "ドメインを`%s'�設定����\n"
+++
+++#: ../hostname.c:114
+++#, c-format
+++msgid "%s: you must be root to change the domain name\n"
+++msgstr "%s: ドメイン��変更�ルート���れ��り��ん\n"
+++
+++#: ../hostname.c:131
+++#, c-format
+++msgid "Resolving `%s' ...\n"
+++msgstr "`%s'をレゾルブ中 ...\n"
+++
+++#: ../hostname.c:137
+++#, c-format
+++msgid "Result: h_name=`%s'\n"
+++msgstr "�果: h_name=`%s'\n"
+++
+++#: ../hostname.c:142
+++#, c-format
+++msgid "Result: h_aliases=`%s'\n"
+++msgstr "�果: h_aliases=`%s'\n"
+++
+++#: ../hostname.c:147
+++#, c-format
+++msgid "Result: h_addr_list=`%s'\n"
+++msgstr "�果: h_addr_list=`%s'\n"
+++
+++#: ../hostname.c:208
+++#, c-format
+++msgid "%s: can't open `%s'\n"
+++msgstr "%s: `%s'を開���ん\n"
+++
+++#: ../hostname.c:222
+++#, c-format
+++msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
+++msgstr "使用法: hostname   [-v] {ホスト�|-F ファイル}    (ファイル�よる)ホスト��設定\n"
+++
+++#: ../hostname.c:223
+++#, c-format
+++msgid ""
+++"       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
+++msgstr "        domainname [-v] {NISドメイン|-F ファイル} (ファイル�よる)NISドメイン��設定\n"
+++
+++#: ../hostname.c:225
+++#, c-format
+++msgid ""
+++"       nodename [-v] {nodename|-F file}      set DECnet node name (from "
+++"file)\n"
+++msgstr ""
+++"nodename [-v] {ノード�|-F ファイル}  (ファイル�よる)DECnetノード��設定\n"
+++
+++#: ../hostname.c:227
+++#, c-format
+++msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
+++msgstr "        hostname [-v] [-d|-f|-s|-a|-i|-y]     形�を指定��表示\n"
+++
+++#: ../hostname.c:228
+++#, c-format
+++msgid ""
+++"       hostname [-v]                         display hostname\n"
+++"\n"
+++msgstr ""
+++"        hostname [-v]                         ホスト��出力\n"
+++"\n"
+++
+++#: ../hostname.c:229
+++#, c-format
+++msgid ""
+++"       hostname -V|--version|-h|--help       print info and exit\n"
+++"\n"
+++msgstr ""
+++"        hostname -V|--version|-h|--help       諸情報を出力��終了\n"
+++"\n"
+++"\n"
+++
+++#: ../hostname.c:230
+++#, c-format
+++msgid ""
+++"    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
+++"\n"
+++msgstr "    dnsdomainname=ホスト� -d, {yp,nis,}domainname=ホスト� -y\n\n"
+++
+++#: ../hostname.c:231
+++#, c-format
+++msgid "    -s, --short           short host name\n"
+++msgstr "    -s, --short           短縮ホスト�\n"
+++
+++#: ../hostname.c:232
+++#, c-format
+++msgid "    -a, --alias           alias names\n"
+++msgstr "    -a, --alias           エイリアス�\n"
+++
+++#: ../hostname.c:233
+++#, c-format
+++msgid "    -i, --ip-address      addresses for the hostname\n"
+++msgstr "    -i, --ip-address      ホスト��対�るアドレス\n"
+++
+++#: ../hostname.c:234
+++#, c-format
+++msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
+++msgstr "    -f, --fqdn, --long    ロングホスト�(FQDN)\n"
+++
+++#: ../hostname.c:235
+++#, c-format
+++msgid "    -d, --domain          DNS domain name\n"
+++msgstr "    -d, --domain          DNSドメイン�\n"
+++
+++#: ../hostname.c:236
+++#, c-format
+++msgid "    -y, --yp, --nis       NIS/YP domainname\n"
+++msgstr "    -y, --yp, --nis       NIS/YPドメイン�\n"
+++
+++#: ../hostname.c:238
+++#, c-format
+++msgid "    -n, --node            DECnet node name\n"
+++msgstr "    -n, --node            DECnetノード�\n"
+++
+++#: ../hostname.c:240
+++#, c-format
+++msgid ""
+++"    -F, --file            read hostname or NIS domainname from given file\n"
+++"\n"
+++msgstr "    -F, --file            指定�ファイル�らホスト��NISドメイン�を読�込む\n\n"
+++
+++#: ../hostname.c:242
+++#, c-format
+++msgid ""
+++"   This command can read or set the hostname or the NIS domainname. You can\n"
+++"   also read the DNS domain or the FQDN (fully qualified domain name).\n"
+++"   Unless you are using bind or NIS for host lookups you can change the\n"
+++"   FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n"
+++"   part of the FQDN) in the /etc/hosts file.\n"
+++msgstr ""
+++"   ��コマンド���ホスト����NISドメイン�を読�込����設定����。\n"
+++"   DNSドメイン���FDN(完全修飾ドメイン�)を読�込む��も����。\n"
+++"   ホスト���照�Bind�よ�, NISも使���場�, /etc/hostsファイル��る\n"
+++"   FQDNや, (FQDN�一部分�)ドメイン�を変更����.\n"
+++
+++#: ../hostname.c:338
+++#, c-format
+++msgid "%s: You can't change the DNS domain name with this command\n"
+++msgstr "%s: ��コマンド��DNSドメイン��変更����ん.\n"
+++
+++#: ../hostname.c:339
+++#, c-format
+++msgid ""
+++"\n"
+++"Unless you are using bind or NIS for host lookups you can change the DNS\n"
+++msgstr ""
+++"\n"
+++"ホスト���照�Bind�よ�, NISも使���場��/etc/hostsファイル\n"
+++
+++#: ../hostname.c:340
+++#, c-format
+++msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
+++msgstr "��るFQDNや, (FQDN�一部分�)ドメイン�を変更����.\n"
+++
+++#: ../hostname.c:357
+++#, c-format
+++msgid "gethostname()=`%s'\n"
+++msgstr "gethostname()=`%s'\n"
+++
+++#: ../hostname.c:374
+++#, c-format
+++msgid "getdomainname()=`%s'\n"
+++msgstr "getdomainname()=`%s'\n"
+++
+++#: ../hostname.c:389
+++#, c-format
+++msgid "getnodename()=`%s'\n"
+++msgstr "getnodename()=`%s'\n"
+++
+++#: ../ifconfig.c:107
+++#, c-format
+++msgid ""
+++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
+++"Flg\n"
+++msgstr "Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR フラグ\n"
+++
+++#: ../ifconfig.c:129 ../ifconfig.c:161
+++#, c-format
+++msgid "%s: ERROR while getting interface flags: %s\n"
+++msgstr "%s: インタフェースフラグ��得中�エラー�発生����:%s\n"
+++
+++#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
+++#: ../ifconfig.c:973
+++#, c-format
+++msgid "No support for INET on this system.\n"
+++msgstr "INET���システム��サ�ート�れ����ん.\n"
+++
+++#: ../ifconfig.c:193
+++#, c-format
+++msgid "%s: ERROR while testing interface flags: %s\n"
+++msgstr "%s: インタフェースフラグ�テスト中�エラー�発生����: %s\n"
+++
+++#: ../ifconfig.c:202
+++#, c-format
+++msgid ""
+++"Usage:\n"
+++"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
+++msgstr ""
+++"使用法:\n"
+++"  ifconfig [-a] [-v] [-s] <インタフェース> [[<AF>] <アドレス>]\n"
+++
+++#: ../ifconfig.c:204
+++#, c-format
+++msgid "  [add <address>[/<prefixlen>]]\n"
+++msgstr "  [add <アドレス>[/<プレフィックス長>]]\n"
+++
+++#: ../ifconfig.c:205
+++#, c-format
+++msgid "  [del <address>[/<prefixlen>]]\n"
+++msgstr "   [del <アドレス>[/<プレフィックス長>]]\n"
+++
+++#: ../ifconfig.c:206
+++#, c-format
+++msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
+++msgstr "  [[-]broadcast [<アドレス>]]  [[-]pointopoint [<アドレス>]]\n"
+++
+++#: ../ifconfig.c:207
+++#, c-format
+++msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
+++msgstr "  [netmask <アドレス>]  [dstaddr <アドレス>]  [tunnel <アドレス>]\n"
+++
+++#: ../ifconfig.c:210
+++#, c-format
+++msgid "  [outfill <NN>] [keepalive <NN>]\n"
+++msgstr "  [outfill <数値>] [keepalive <数値>]\n"
+++
+++#: ../ifconfig.c:212
+++#, c-format
+++msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
+++msgstr "  [hw <HW> <アドレス>]  [metric <数値>]  [mtu <数値>]\n"
+++
+++#: ../ifconfig.c:213
+++#, c-format
+++msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
+++msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
+++
+++#: ../ifconfig.c:214
+++#, c-format
+++msgid "  [multicast]  [[-]promisc]\n"
+++msgstr "  [multicast]  [[-]promisc]\n"
+++
+++#: ../ifconfig.c:215
+++#, c-format
+++msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
+++msgstr "  [mem_start <開始アドレス>] [io_addr <IOアドレス>] [irq <番�>] [media <タイプ>]\n"
+++
+++#: ../ifconfig.c:217
+++#, c-format
+++msgid "  [txqueuelen <NN>]\n"
+++msgstr "   [txqueuelen <TXキュー長>]\n"
+++
+++#: ../ifconfig.c:220
+++#, c-format
+++msgid "  [[-]dynamic]\n"
+++msgstr "  [[-]dynamic]\n"
+++
+++#: ../ifconfig.c:222
+++#, c-format
+++msgid ""
+++"  [up|down] ...\n"
+++"\n"
+++msgstr "  [up|down] ...\n\n"
+++
+++#: ../ifconfig.c:224
+++#, c-format
+++msgid "  <HW>=Hardware Type.\n"
+++msgstr "  <HW>=�ードウェアタイプ.\n"
+++
+++#: ../ifconfig.c:225
+++#, c-format
+++msgid "  List of possible hardware types:\n"
+++msgstr "  利用�能��ードウェアタイプ�リスト:\n"
+++
+++#. 1 = ARPable
+++#: ../ifconfig.c:227
+++#, c-format
+++msgid "  <AF>=Address family. Default: %s\n"
+++msgstr "  <AF>=アドレスファミリ. 標準: %s\n"
+++
+++#: ../ifconfig.c:228
+++#, c-format
+++msgid "  List of possible address families:\n"
+++msgstr "  利用�能�アドレスファミリ�リスト:\n"
+++
+++#: ../ifconfig.c:303
+++#, c-format
+++msgid "ifconfig: option `%s' not recognised.\n"
+++msgstr "ifconfig: オプション`%s'を解釈����ん.\n"
+++
+++#: ../ifconfig.c:305 ../ifconfig.c:962
+++#, c-format
+++msgid "ifconfig: `--help' gives usage information.\n"
+++msgstr "ifconfig: `--help'�使用法を見られ��.\n"
+++
+++#: ../ifconfig.c:380
+++#, c-format
+++msgid "Unknown media type.\n"
+++msgstr "�明�メディアタイプ��.\n"
+++
+++#: ../ifconfig.c:417
+++#, c-format
+++msgid ""
+++"Warning: Interface %s still in promisc mode... maybe other application is "
+++"running?\n"
+++msgstr "警告: インタフェース%s���promiscモード��...�ら�他�アプリケーション�実行中���り��ん�?\n"
+++
+++#: ../ifconfig.c:429
+++#, c-format
+++msgid "Warning: Interface %s still in MULTICAST mode.\n"
+++msgstr "警告: インタフェース%s���MULTICASTモード��.\n"
+++
+++#: ../ifconfig.c:441
+++#, c-format
+++msgid "Warning: Interface %s still in ALLMULTI mode.\n"
+++msgstr "警告: インタフェース%s���ALLMULTIモード��.\n"
+++
+++#: ../ifconfig.c:465
+++#, c-format
+++msgid "Warning: Interface %s still in DYNAMIC mode.\n"
+++msgstr "警告: インタフェース%s���DYNAMICモード��.\n"
+++
+++#: ../ifconfig.c:523
+++#, c-format
+++msgid "Warning: Interface %s still in BROADCAST mode.\n"
+++msgstr "警告: インタフェース%s���BROADCASTモード��.\n"
+++
+++#: ../ifconfig.c:652
+++#, c-format
+++msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
+++msgstr "警告: インタフェース%s���POINTOPOINTモード��.\n"
+++
+++#: ../ifconfig.c:684
+++#, c-format
+++msgid "hw address type `%s' has no handler to set address. failed.\n"
+++msgstr "�ードウェアアドレスタイプ`%s'�アドレスを設定�る�ンドラを������ん. 失敗����.\n"
+++
+++#: ../ifconfig.c:693
+++#, c-format
+++msgid "%s: invalid %s address.\n"
+++msgstr "%s: ��切�アドレス��(%s).\n"
+++
+++#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
+++#, c-format
+++msgid "No support for INET6 on this system.\n"
+++msgstr "INET6���システム��サ�ート�れ����ん.\n"
+++
+++#: ../ifconfig.c:780 ../ifconfig.c:871
+++#, c-format
+++msgid "Interface %s not initialized\n"
+++msgstr "インタフェース%s��期化�れ����ん.\n"
+++
+++#: ../ifconfig.c:792 ../ifconfig.c:882
+++#, c-format
+++msgid "Bad address.\n"
+++msgstr "��切�アドレス��.\n"
+++
+++#: ../ifconfig.c:885
+++#, c-format
+++msgid "Address deletion not supported on this system.\n"
+++msgstr "アドレス削除���システム��サ�ート�れ����ん.\n"
+++
+++#: ../ifconfig.c:957
+++#, c-format
+++msgid "ifconfig: Cannot set address for this protocol family.\n"
+++msgstr "ifconfig:��プロトコルファミリ�アドレスを設定����ん.\n"
+++
+++#: ../ifconfig.c:983
+++#, c-format
+++msgid "No support for ECONET on this system.\n"
+++msgstr "ECONET���システム��サ�ート�れ����ん.\n"
+++
+++#: ../ifconfig.c:991
+++#, c-format
+++msgid "Don't know how to set addresses for family %d.\n"
+++msgstr "ファミリ%d�アドレス�設定方法��明��.\n"
+++
+++#: ../ifconfig.c:1021
+++#, c-format
+++msgid "WARNING: at least one error occured. (%d)\n"
+++msgstr "警告: 少���も1��エラー�発生����. (%d)\n"
+++
+++#: ../netstat.c:434
+++#, c-format
+++msgid ""
+++"(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
+++msgstr "(\"-p\"�情報を読�込���ん���: geteuid()=%d ���ルート��る����.)\n"
+++
+++#: ../netstat.c:438
+++#, c-format
+++msgid ""
+++"(Not all processes could be identified, non-owned process info\n"
+++" will not be shown, you would have to be root to see it all.)\n"
+++msgstr ""
+++"(一部�プロセス�識別�れ���, 所有�����プロセス�情報�\n"
+++"表示�れ��ん。�れら全�を見る��ルート��る必���り��.)\n"
+++
+++# translatable?
+++#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
+++msgid "LISTENING"
+++msgstr "LISTENING"
+++
+++# translatable?
+++#: ../netstat.c:446
+++msgid "CONN SENT"
+++msgstr "CONN SENT"
+++
+++# translatable?
+++#: ../netstat.c:447 ../netstat.c:1268
+++msgid "DISC SENT"
+++msgstr "DISC SENT"
+++
+++# translatable?
+++#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
+++msgid "ESTABLISHED"
+++msgstr "ESTABLISHED"
+++
+++#: ../netstat.c:470
+++#, c-format
+++msgid "Active NET/ROM sockets\n"
+++msgstr "稼�中�NET/ROMソケット\n"
+++
+++#: ../netstat.c:471
+++#, c-format
+++msgid ""
+++"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
+++"Q\n"
+++msgstr "ユーザ     �信先     発信元    デ�イス  状態        Vr/Vs    �信-Q  �信-Q\n"
+++
+++#: ../netstat.c:481 ../netstat.c:1308
+++#, c-format
+++msgid "Problem reading data from %s\n"
+++msgstr "%s�ら�データ�読�込���題\n"
+++
+++# translatable?
+++#: ../netstat.c:516
+++msgid "SYN_SENT"
+++msgstr "SYN_SENT"
+++
+++# translatable?
+++#: ../netstat.c:517
+++msgid "SYN_RECV"
+++msgstr "SYN_RECV"
+++
+++# translatable?
+++#: ../netstat.c:518
+++msgid "FIN_WAIT1"
+++msgstr "FIN_WAIT1"
+++
+++# translatable?
+++#: ../netstat.c:519
+++msgid "FIN_WAIT2"
+++msgstr "FIN_WAIT2"
+++
+++# translatable?
+++#: ../netstat.c:520
+++msgid "TIME_WAIT"
+++msgstr "TIME_WAIT"
+++
+++# translatable?
+++#: ../netstat.c:521
+++msgid "CLOSE"
+++msgstr "CLOSE"
+++
+++# translatable?
+++#: ../netstat.c:522
+++msgid "CLOSE_WAIT"
+++msgstr "CLOSE_WAIT"
+++
+++# translatable?
+++#: ../netstat.c:523
+++msgid "LAST_ACK"
+++msgstr "LAST_ACK"
+++
+++# translatable?
+++#: ../netstat.c:524
+++msgid "LISTEN"
+++msgstr "LISTEN"
+++
+++# translatable?
+++#: ../netstat.c:525
+++msgid "CLOSING"
+++msgstr "CLOSING"
+++
+++#: ../netstat.c:596
+++#, c-format
+++msgid "warning, got bogus igmp6 line %d.\n"
+++msgstr "警告, ��igmp6ライン%dを得���.\n"
+++
+++#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
+++#: ../netstat.c:1032 ../netstat.c:1037
+++#, c-format
+++msgid "netstat: unsupported address family %d !\n"
+++msgstr "netstat: サ�ート����アドレスファミリ%d��!\n"
+++
+++# c-format
+++#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
+++#, c-format
+++msgid "warning, got bogus igmp line %d.\n"
+++msgstr "警告, ��igmpライン%dを得���.\n"
+++
+++#: ../netstat.c:677
+++#, c-format
+++msgid "Active X.25 sockets\n"
+++msgstr "稼�中�X.25ソケット\n"
+++
+++#. IMHO, Vr/Vs is not very usefull --SF
+++#: ../netstat.c:679
+++#, c-format
+++msgid ""
+++"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
+++"Q\n"
+++msgstr "�信先       発信元        デ�イス  LCI  状態         Vr/Vs  �信-Q  �信-Q\n"
+++
+++#: ../netstat.c:759
+++#, c-format
+++msgid "warning, got bogus tcp line.\n"
+++msgstr "警告, ��TCPラインを得���.\n"
+++
+++#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
+++#, c-format
+++msgid "off (0.00/%ld/%d)"
+++msgstr "オフ (0.00/%ld/%d)"
+++
+++#: ../netstat.c:804
+++#, c-format
+++msgid "on (%2.2f/%ld/%d)"
+++msgstr "オン (%2.2f/%ld/%d)"
+++
+++#: ../netstat.c:809
+++#, c-format
+++msgid "keepalive (%2.2f/%ld/%d)"
+++msgstr "キープアライブ (%2.2f/%ld/%d)"
+++
+++#: ../netstat.c:814
+++#, c-format
+++msgid "timewait (%2.2f/%ld/%d)"
+++msgstr "時間待� (%2.2f/%ld/%d)"
+++
+++#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
+++#, c-format
+++msgid "unkn-%d (%2.2f/%ld/%d)"
+++msgstr "�明-%d (%2.2f/%ld/%d)"
+++
+++#: ../netstat.c:894
+++#, c-format
+++msgid "warning, got bogus udp line.\n"
+++msgstr "警告, ��UDPラインを得���.\n"
+++
+++#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
+++msgid "UNKNOWN"
+++msgstr "�明"
+++
+++#: ../netstat.c:958 ../netstat.c:1080
+++#, c-format
+++msgid "on%d (%2.2f/%ld/%d)"
+++msgstr "オン%d (%2.2f/%ld/%d)"
+++
+++#: ../netstat.c:1046
+++#, c-format
+++msgid "warning, got bogus raw line.\n"
+++msgstr "警告, ��Rawラインを得���.\n"
+++
+++#: ../netstat.c:1128
+++#, c-format
+++msgid "warning, got bogus unix line.\n"
+++msgstr "警告, ��unixラインを得���.\n"
+++
+++# translatable?
+++#: ../netstat.c:1155
+++msgid "STREAM"
+++msgstr "STREAM"
+++
+++# translatable?
+++#: ../netstat.c:1159
+++msgid "DGRAM"
+++msgstr "DGRAM"
+++
+++# translatable?
+++#: ../netstat.c:1163
+++msgid "RAW"
+++msgstr "RAW"
+++
+++# translatable?
+++#: ../netstat.c:1167
+++msgid "RDM"
+++msgstr "RDM"
+++
+++# translatable?
+++#: ../netstat.c:1171
+++msgid "SEQPACKET"
+++msgstr "SEQPACKET"
+++
+++# translatable?
+++#: ../netstat.c:1180
+++msgid "FREE"
+++msgstr "FREE"
+++
+++# translatable?
+++#: ../netstat.c:1196
+++msgid "CONNECTING"
+++msgstr "CONNECTING"
+++
+++# translatable?
+++#: ../netstat.c:1200
+++msgid "CONNECTED"
+++msgstr "CONNECTED"
+++
+++# translatable?
+++#: ../netstat.c:1204
+++msgid "DISCONNECTING"
+++msgstr "DISCONNECTING"
+++
+++#: ../netstat.c:1235
+++#, c-format
+++msgid "Active UNIX domain sockets "
+++msgstr "稼�中�UNIXドメインソケット "
+++
+++#: ../netstat.c:1237 ../netstat.c:1756
+++#, c-format
+++msgid "(servers and established)"
+++msgstr "(サー��確立)"
+++
+++#: ../netstat.c:1240 ../netstat.c:1759
+++#, c-format
+++msgid "(only servers)"
+++msgstr "(サー���)"
+++
+++#: ../netstat.c:1242 ../netstat.c:1761
+++#, c-format
+++msgid "(w/o servers)"
+++msgstr "(w/oサー�)"
+++
+++#: ../netstat.c:1245
+++#, c-format
+++msgid ""
+++"\n"
+++"Proto RefCnt Flags       Type       State         I-Node"
+++msgstr ""
+++"\n"
+++"Proto RefCnt フラグ      タイプ     状態         Iノード"
+++
+++#: ../netstat.c:1247
+++#, c-format
+++msgid " Path\n"
+++msgstr " パス\n"
+++
+++# translatable?
+++#: ../netstat.c:1267
+++msgid "SABM SENT"
+++msgstr "SABM SENT"
+++
+++# translatable?
+++#: ../netstat.c:1270
+++msgid "RECOVERY"
+++msgstr "RECOVERY"
+++
+++#: ../netstat.c:1284
+++#, c-format
+++msgid "Active AX.25 sockets\n"
+++msgstr "稼�中�AX.25ソケット\n"
+++
+++#: ../netstat.c:1285
+++#, c-format
+++msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
+++msgstr "�信先     発信元     デ�イス 状態        Vr/Vs    �信-Q  �信-Q\n"
+++
+++#: ../netstat.c:1328
+++#, c-format
+++msgid "problem reading data from %s\n"
+++msgstr "%s�ら�データ読�込�中��題\n"
+++
+++#: ../netstat.c:1379
+++#, c-format
+++msgid ""
+++"Active IPX sockets\n"
+++"Proto Recv-Q Send-Q Local Address              Foreign Address            "
+++"State"
+++msgstr ""
+++"稼�中�IPXソケット\n"
+++"Proto �信-Q �信-Q 内部アドレス               外部アドレス               状"
+++"æ…‹"
+++
+++#: ../netstat.c:1381
+++#, c-format
+++msgid " User"
+++msgstr " ユーザ"
+++
+++# translatable?
+++#: ../netstat.c:1415
+++msgid "ESTAB"
+++msgstr "ESTAB"
+++
+++# translatable?
+++#: ../netstat.c:1423
+++msgid "UNK."
+++msgstr "UNK."
+++
+++#: ../netstat.c:1461
+++#, c-format
+++msgid "Kernel Interface table\n"
+++msgstr "カー�ルインタフェーステーブル\n"
+++
+++#: ../netstat.c:1465
+++#, c-format
+++msgid ""
+++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
+++"Flg\n"
+++msgstr "Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR フラグ\n"
+++
+++#: ../netstat.c:1469
+++msgid "missing interface information"
+++msgstr "インタフェース情報�足り��ん"
+++
+++#: ../netstat.c:1492
+++#, c-format
+++msgid ""
+++"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
+++"help}\n"
+++msgstr ""
+++"使用法: netstat [-veenNcCF] [<アドレスファミリ>] -r\n"
+++"        netstat {-V|--version|-h|--help}\n"
+++
+++#: ../netstat.c:1493
+++#, c-format
+++msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
+++msgstr "        netstat [-vnNcaeol] [<ソケット> ...]\n"
+++
+++#: ../netstat.c:1494
+++#, c-format
+++msgid ""
+++"       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
+++"\n"
+++msgstr "        netstat { [-veenNac] -i | [-cnNe] -M | -s }\n\n"
+++
+++#: ../netstat.c:1496
+++#, c-format
+++msgid "        -r, --route              display routing table\n"
+++msgstr "        -r, --routing            経路テーブル�表示\n"
+++
+++#: ../netstat.c:1497
+++#, c-format
+++msgid "        -i, --interfaces         display interface table\n"
+++msgstr "        -i, --interfaces         インタフェーステーブル�表示\n"
+++
+++#: ../netstat.c:1498
+++#, c-format
+++msgid "        -g, --groups             display multicast group memberships\n"
+++msgstr "        -g, --groups             マル�キャスト・グループメン�シップ�表示\n"
+++
+++#: ../netstat.c:1499
+++#, c-format
+++msgid ""
+++"        -s, --statistics         display networking statistics (like SNMP)\n"
+++msgstr ""
+++"        -s, --statistics         (SNMP�よ��)�ットワーク統計を表示\n"
+++
+++#: ../netstat.c:1501
+++#, c-format
+++msgid ""
+++"        -M, --masquerade         display masqueraded connections\n"
+++"\n"
+++msgstr ""
+++"        -M, --masquerade         マスカレード接続�表示\n"
+++"\n"
+++
+++#: ../netstat.c:1505
+++#, c-format
+++msgid "        --numeric-hosts          don't resolve host names\n"
+++msgstr "        --numeric-hosts          ホスト�をレゾルブ���\n"
+++
+++#: ../netstat.c:1506
+++#, c-format
+++msgid "        --numeric-ports          don't resolve port names\n"
+++msgstr "        --numeric-ports          �ート�をレゾルブ���\n"
+++
+++#: ../netstat.c:1507
+++#, c-format
+++msgid "        --numeric-users          don't resolve user names\n"
+++msgstr "        --numeric-users          ユーザ�をレゾルブ���\n"
+++
+++#: ../netstat.c:1508
+++#, c-format
+++msgid "        -N, --symbolic           resolve hardware names\n"
+++msgstr "        -N, --symbolic           �ードウェア�をレゾルブ�る\n"
+++
+++#: ../netstat.c:1509 ../route.c:88
+++#, c-format
+++msgid "        -e, --extend             display other/more information\n"
+++msgstr "        -e, --extend             他�情報や多��情報を表示�る\n"
+++
+++#: ../netstat.c:1510
+++#, c-format
+++msgid "        -p, --programs           display PID/Program name for sockets\n"
+++msgstr "        -p, --programs           ソケット�PID/プログラム�を表示�る\n"
+++
+++#: ../netstat.c:1511
+++#, c-format
+++msgid ""
+++"        -c, --continuous         continuous listing\n"
+++"\n"
+++msgstr ""
+++"        -c, --continous          継続的�表示\n"
+++"\n"
+++
+++#: ../netstat.c:1512
+++#, c-format
+++msgid "        -l, --listening          display listening server sockets\n"
+++msgstr "        -l, --listening          サー��listenソケット�表示\n"
+++
+++#: ../netstat.c:1513
+++#, c-format
+++msgid ""
+++"        -a, --all, --listening   display all sockets (default: connected)\n"
+++msgstr "        -a, --all, --listening   全��情報を表示 (標準: connected)\n"
+++
+++#: ../netstat.c:1514
+++#, c-format
+++msgid "        -o, --timers             display timers\n"
+++msgstr "        -o, --timers             タイマ�表示\n"
+++
+++#: ../netstat.c:1515 ../route.c:89
+++#, c-format
+++msgid ""
+++"        -F, --fib                display Forwarding Information Base "
+++"(default)\n"
+++msgstr "        -F, --fib                フォワード情報ベースを表示�る(標準)\n"
+++
+++#: ../netstat.c:1516 ../route.c:90
+++#, c-format
+++msgid ""
+++"        -C, --cache              display routing cache instead of FIB\n"
+++"\n"
+++msgstr "        -C, --cache              FIB���り�経路キャッシュを表示�る\n\n"
+++
+++#: ../netstat.c:1518
+++#, c-format
+++msgid ""
+++"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
+++"netrom\n"
+++msgstr ""
+++"  <ソケット>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
+++"netrom\n"
+++
+++#: ../netstat.c:1519
+++#, c-format
+++msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
+++msgstr "  <AF>='-6|-4'���'-A <af>'���'--<af>'を利用; 標準: %s\n"
+++
+++#: ../netstat.c:1520 ../route.c:93
+++#, c-format
+++msgid "  List of possible address families (which support routing):\n"
+++msgstr "  (ルーティングをサ�ート��)利用�能�アドレスファミリ�リスト:\n"
+++
+++#: ../netstat.c:1753
+++#, c-format
+++msgid "Active Internet connections "
+++msgstr "稼�中�インター�ット接続 "
+++
+++#: ../netstat.c:1763
+++#, c-format
+++msgid ""
+++"\n"
+++"Proto Recv-Q Send-Q Local Address           Foreign Address         "
+++"State      "
+++msgstr ""
+++"\n"
+++"Proto �信-Q �信-Q 内部アドレス            外部アドレス            状"
+++"æ…‹       "
+++
+++#: ../netstat.c:1765
+++#, c-format
+++msgid " User       Inode     "
+++msgstr " ユーザ    Iノード    "
+++
+++#: ../netstat.c:1768
+++#, c-format
+++msgid " Timer"
+++msgstr "タイマ"
+++
+++#: ../netstat.c:1798
+++#, c-format
+++msgid "IPv4 Group Memberships\n"
+++msgstr "IPv4グループメン�シップ\n"
+++
+++#: ../netstat.c:1799
+++#, c-format
+++msgid "Interface       RefCnt Group\n"
+++msgstr "インタフェース �照Cnt グループ\n"
+++
+++#: ../rarp.c:44
+++msgid "This kernel does not support RARP.\n"
+++msgstr "��カー�ル�RARPをサ�ート�����ん.\n"
+++
+++#: ../rarp.c:83
+++#, c-format
+++msgid "no RARP entry for %s.\n"
+++msgstr "%s�RARPエントリ��り��ん.\n"
+++
+++#: ../rarp.c:96
+++#, c-format
+++msgid "%s: bad hardware address\n"
+++msgstr "%s: �正��ードウェアアドレス��\n"
+++
+++#: ../rarp.c:128
+++#, c-format
+++msgid "rarp: cannot open file %s:%s.\n"
+++msgstr "rarp: ファイル%sを開���ん:%s.\n"
+++
+++#: ../rarp.c:140
+++#, c-format
+++msgid "rarp: format error at %s:%u\n"
+++msgstr "rarp: %s:%u行�フォーマットエラー��り��\n"
+++
+++#: ../rarp.c:144 ../rarp.c:289
+++#, c-format
+++msgid "rarp: %s: unknown host\n"
+++msgstr "rarp: %s: �明�ホスト��\n"
+++
+++#: ../rarp.c:147
+++#, c-format
+++msgid "rarp: cannot set entry from %s:%u\n"
+++msgstr "rarp: %s:%u行�らエントリを設定����ん\n"
+++
+++#: ../rarp.c:176
+++#, c-format
+++msgid "Usage: rarp -a                               list entries in cache.\n"
+++msgstr ""
+++"使用法: rarp -a                              キャッシュエントリ�表示.\n"
+++
+++#: ../rarp.c:177
+++#, c-format
+++msgid "       rarp -d <hostname>                    delete entry from cache.\n"
+++msgstr ""
+++"       rarp -d <ホスト�>                    キャッシュ�らエントリを削除�"
+++"ã‚‹.\n"
+++
+++#: ../rarp.c:178
+++#, c-format
+++msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
+++msgstr ""
+++"       rarp [<HW>] -s <ホスト�> <�ードウェアアドレス>\n"
+++"                                             キャッシュ�エントリを追加.\n"
+++
+++#: ../rarp.c:179
+++#, c-format
+++msgid ""
+++"       rarp -f                               add entries from /etc/ethers.\n"
+++msgstr ""
+++"       rarp -f                               /etc/ethers�らエントリ追加.\n"
+++
+++#: ../rarp.c:180
+++#, c-format
+++msgid ""
+++"       rarp -V                               display program version.\n"
+++"\n"
+++msgstr "       rarp -V                               �ージョン情報�出力.\n"
+++
+++#: ../rarp.c:238
+++#, c-format
+++msgid "%s: illegal option mix.\n"
+++msgstr "%s: オプション�組���間������.\n"
+++
+++#: ../rarp.c:269
+++#, c-format
+++msgid "rarp: %s: unknown hardware type.\n"
+++msgstr "rarp: %s: �ードウェアタイプ��明��.\n"
+++
+++#: ../route.c:80
+++#, c-format
+++msgid ""
+++"Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
+++msgstr "使用法:route [-nNvee] [-FC] [アドレスファミリ]  カー�ル経路テーブル�表示.\n"
+++
+++#: ../route.c:81
+++#, c-format
+++msgid ""
+++"       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
+++"\n"
+++msgstr ""
+++"       route [-v] [-FC] {add|del|flush}‥‥\n"
+++"\t\t\t\t   アドレスファミリ�経路テーブル�設定.\n"
+++"\n"
+++
+++#: ../route.c:83
+++#, c-format
+++msgid ""
+++"       route {-h|--help} [<AF>]              Detailed usage syntax for "
+++"specified AF.\n"
+++msgstr ""
+++"       route {-h|--help} [アドレスファミリ]\n"
+++"                                     アドレスファミリ特定�文法�説明.\n"
+++
+++#: ../route.c:84
+++#, c-format
+++msgid ""
+++"       route {-V|--version}                  Display version/author and "
+++"exit.\n"
+++"\n"
+++msgstr "       route {-V|--version}          �ージョン/作者情報�出力�終了.\n\n"
+++
+++#: ../route.c:92
+++#, c-format
+++msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
+++msgstr "  <AF>='-A <af>'���'--<af>'を利用; 標準: %s\n"
+++
+++#: ../plipconfig.c:66
+++#, c-format
+++msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
+++msgstr "使用法: plipconfig [-a] [-i] [-v] インタフェース\n"
+++
+++#: ../plipconfig.c:67
+++#, c-format
+++msgid "                  [nibble NN] [trigger NN]\n"
+++msgstr "                  [nibble 数値] [trigger 数値]\n"
+++
+++#: ../plipconfig.c:68
+++#, c-format
+++msgid "       plipconfig -V | --version\n"
+++msgstr "       plipconfig -V | --version\n"
+++
+++# translatable?
+++#: ../plipconfig.c:74
+++#, c-format
+++msgid "%s\tnibble %lu  trigger %lu\n"
+++msgstr "%s\tnibble %lu  trigger %lu\n"
+++
+++#: ../iptunnel.c:85
+++#, c-format
+++msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
+++msgstr "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
+++
+++#: ../iptunnel.c:86
+++#, c-format
+++msgid ""
+++"          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
+++msgstr "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
+++
+++#: ../iptunnel.c:87
+++#, c-format
+++msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
+++msgstr "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
+++
+++#: ../iptunnel.c:88
+++#, c-format
+++msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
+++msgstr "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
+++
+++#: ../iptunnel.c:89
+++#, c-format
+++msgid ""
+++"       iptunnel -V | --version\n"
+++"\n"
+++msgstr "       iptunnel -V | --version\n\n"
+++
+++#: ../iptunnel.c:90
+++#, c-format
+++msgid "Where: NAME := STRING\n"
+++msgstr "�味: NAME := STRING\n"
+++
+++#: ../iptunnel.c:91
+++#, c-format
+++msgid "       ADDR := { IP_ADDRESS | any }\n"
+++msgstr "       ADDR := { IP_ADDRESS | any }\n"
+++
+++#: ../iptunnel.c:92
+++#, c-format
+++msgid "       TOS  := { NUMBER | inherit }\n"
+++msgstr "       TOS  := { NUMBER | inherit }\n"
+++
+++#: ../iptunnel.c:93
+++#, c-format
+++msgid "       TTL  := { 1..255 | inherit }\n"
+++msgstr "       TTL  := { 1..255 | inherit }\n"
+++
+++#: ../iptunnel.c:94
+++#, c-format
+++msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
+++msgstr "       KEY  := { DOTTED_QUAD | NUMBER }\n"
+++
+++#: ../iptunnel.c:332
+++#, c-format
+++msgid "Keys are not allowed with ipip and sit.\n"
+++msgstr "キー�ipip�よ�sit��許��れ��ん.\n"
+++
+++#: ../iptunnel.c:352
+++#, c-format
+++msgid "Broadcast tunnel requires a source address.\n"
+++msgstr "ブロードキャストトン�ル�発信元アドレス�必���.\n"
+++
+++#: ../iptunnel.c:367
+++#, c-format
+++msgid "ttl != 0 and noptmudisc are incompatible\n"
+++msgstr "ttl != 0�よ�noptmudisc�矛盾���\n"
+++
+++#: ../iptunnel.c:379
+++#, c-format
+++msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
+++msgstr "トン�ルモードを決定����ん(ipip, gre���sit)\n"
+++
+++#: ../iptunnel.c:417
+++#, c-format
+++msgid "%s: %s/ip  remote %s  local %s "
+++msgstr "%s: %s/ip  リモート%s  ローカル%s "
+++
+++#: ../iptunnel.c:421
+++msgid "unknown"
+++msgstr "�明"
+++
+++# FIXME: what does it mean?
+++#: ../iptunnel.c:453
+++#, c-format
+++msgid "  Drop packets out of sequence.\n"
+++msgstr "  シーケンス�ら外れ�パケットをドロップ.\n"
+++
+++#: ../iptunnel.c:455
+++#, c-format
+++msgid "  Checksum in received packet is required.\n"
+++msgstr "  �信パケット��ェックサム�必須��.\n"
+++
+++# FIXME: what does it mean?
+++#: ../iptunnel.c:457
+++#, c-format
+++msgid "  Sequence packets on output.\n"
+++msgstr "  �信�シーケンスパケット.\n"
+++
+++# FIXME: what does it mean?
+++#: ../iptunnel.c:459
+++#, c-format
+++msgid "  Checksum output packets.\n"
+++msgstr "  �信パケット��ェックサム.\n"
+++
+++#: ../iptunnel.c:487
+++#, c-format
+++msgid "Wrong format of /proc/net/dev. Sorry.\n"
+++msgstr "/proc/net/dev��正�フォーマット��. ����ん.\n"
+++
+++#: ../iptunnel.c:500
+++#, c-format
+++msgid "Failed to get type of [%s]\n"
+++msgstr "[%s]�タイプ��得�失敗\n"
+++
+++#: ../iptunnel.c:516
+++#, c-format
+++msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
+++msgstr "RX: パケット   �イト      エラー  CsumErrs outOfSeq マル�キャスト\n"
+++
+++#: ../iptunnel.c:519
+++#, c-format
+++msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
+++msgstr "TX: パケット   �イト       エラー DeadLoop NoRoute  �ッファ��\n"
+++
+++#: ../statistics.c:47
+++msgid "ICMP input histogram:"
+++msgstr "ICMP入力ヒストグラム:"
+++
+++#: ../statistics.c:48
+++msgid "ICMP output histogram:"
+++msgstr "ICMP出力ヒストグラム:"
+++
+++#: ../statistics.c:65
+++#, c-format
+++msgid "Forwarding is %s"
+++msgstr "フォワード�%s��"
+++
+++#: ../statistics.c:66
+++#, c-format
+++msgid "Default TTL is %u"
+++msgstr "標準TTL�%u��"
+++
+++#: ../statistics.c:67
+++#, c-format
+++msgid "%u total packets received"
+++msgstr "�計%uパケットを�信"
+++
+++#: ../statistics.c:68
+++#, c-format
+++msgid "%u with invalid headers"
+++msgstr "��当�ヘッダ�%u"
+++
+++#: ../statistics.c:69
+++#, c-format
+++msgid "%u with invalid addresses"
+++msgstr "��当�アドレス�%u"
+++
+++#: ../statistics.c:70
+++#, c-format
+++msgid "%u forwarded"
+++msgstr "%u�転�"
+++
+++#: ../statistics.c:71
+++#, c-format
+++msgid "%u with unknown protocol"
+++msgstr "%u��明�プロトコル"
+++
+++#: ../statistics.c:72
+++#, c-format
+++msgid "%u incoming packets discarded"
+++msgstr "%u��信パケットを破棄"
+++
+++#: ../statistics.c:73
+++#, c-format
+++msgid "%u incoming packets delivered"
+++msgstr "%u��信パケットを��"
+++
+++#: ../statistics.c:74
+++#, c-format
+++msgid "%u requests sent out"
+++msgstr "%u��求を�信"
+++
+++#. ?
+++#: ../statistics.c:75
+++#, c-format
+++msgid "%u outgoing packets dropped"
+++msgstr "%u��信パケットをドロップ"
+++
+++#: ../statistics.c:76
+++#, c-format
+++msgid "%u dropped because of missing route"
+++msgstr "�明�経路�%uをドロップ"
+++
+++#: ../statistics.c:77
+++#, c-format
+++msgid "%u fragments dropped after timeout"
+++msgstr "タイムアウト後�%u�フラグメントをドロップ"
+++
+++#: ../statistics.c:78
+++#, c-format
+++msgid "%u reassemblies required"
+++msgstr "%u��構築�必�"
+++
+++#. ?
+++#: ../statistics.c:79
+++#, c-format
+++msgid "%u packets reassembled ok"
+++msgstr "%uパケット��構築��功"
+++
+++#: ../statistics.c:80
+++#, c-format
+++msgid "%u packet reassembles failed"
+++msgstr "%uパケット��構築�失敗"
+++
+++#: ../statistics.c:81
+++#, c-format
+++msgid "%u fragments received ok"
+++msgstr "%uフラグメント��信��功"
+++
+++#: ../statistics.c:82
+++#, c-format
+++msgid "%u fragments failed"
+++msgstr "%uフラグメント�失敗"
+++
+++#: ../statistics.c:83
+++#, c-format
+++msgid "%u fragments created"
+++msgstr "%uフラグメントを生�"
+++
+++#: ../statistics.c:88
+++#, c-format
+++msgid "%u ICMP messages received"
+++msgstr "%u�ICMPメッセージ�信"
+++
+++#: ../statistics.c:89
+++#, c-format
+++msgid "%u input ICMP message failed."
+++msgstr "%u�ICMPメッセージ入力失敗."
+++
+++#: ../statistics.c:90 ../statistics.c:103
+++#, c-format
+++msgid "destination unreachable: %u"
+++msgstr "�信先到���: %u"
+++
+++#: ../statistics.c:91
+++#, c-format
+++msgid "timeout in transit: %u"
+++msgstr "�信時間オー�: %u"
+++
+++#: ../statistics.c:92 ../statistics.c:105
+++#, c-format
+++msgid "wrong parameters: %u"
+++msgstr "���パラメータ: %u"
+++
+++#. ?
+++#: ../statistics.c:93
+++#, c-format
+++msgid "source quenches: %u"
+++msgstr "発信元消滅: %u"
+++
+++#: ../statistics.c:94
+++#, c-format
+++msgid "redirects: %u"
+++msgstr "リダイレクト: %u"
+++
+++#: ../statistics.c:95
+++#, c-format
+++msgid "echo requests: %u"
+++msgstr "エコー�求: %u"
+++
+++#: ../statistics.c:96 ../statistics.c:109
+++#, c-format
+++msgid "echo replies: %u"
+++msgstr "エコー応答: %u"
+++
+++#: ../statistics.c:97
+++#, c-format
+++msgid "timestamp request: %u"
+++msgstr "タイムスタンプ�求: %u"
+++
+++#: ../statistics.c:98
+++#, c-format
+++msgid "timestamp reply: %u"
+++msgstr "タイムスタンプ応答: %u"
+++
+++#: ../statistics.c:99
+++#, c-format
+++msgid "address mask request: %u"
+++msgstr "アドレスマスク�求: %u"
+++
+++#. ?
+++#: ../statistics.c:100 ../statistics.c:113
+++#, c-format
+++msgid "address mask replies: %u"
+++msgstr "アドレスマスク応答: %u"
+++
+++#. ?
+++#: ../statistics.c:101
+++#, c-format
+++msgid "%u ICMP messages sent"
+++msgstr "%u�ICMPメッセージ�信"
+++
+++#: ../statistics.c:102
+++#, c-format
+++msgid "%u ICMP messages failed"
+++msgstr "%u�ICMPメッセージ失敗"
+++
+++#: ../statistics.c:104
+++#, c-format
+++msgid "time exceeded: %u"
+++msgstr "時間切れ: %u"
+++
+++#. ?
+++#: ../statistics.c:106
+++#, c-format
+++msgid "source quench: %u"
+++msgstr "発信元消滅: %u"
+++
+++#: ../statistics.c:107
+++#, c-format
+++msgid "redirect: %u"
+++msgstr "リダイレクト: %u"
+++
+++#: ../statistics.c:108
+++#, c-format
+++msgid "echo request: %u"
+++msgstr "エコー�求: %u"
+++
+++#: ../statistics.c:110
+++#, c-format
+++msgid "timestamp requests: %u"
+++msgstr "タイムスタンプ�求: %u"
+++
+++#: ../statistics.c:111
+++#, c-format
+++msgid "timestamp replies: %u"
+++msgstr "タイムスタンプ応答: %u"
+++
+++#: ../statistics.c:112
+++#, c-format
+++msgid "address mask requests: %u"
+++msgstr "アドレスマスク�求: %u"
+++
+++#: ../statistics.c:118
+++#, c-format
+++msgid "RTO algorithm is %s"
+++msgstr "RTOアルゴリズム�%s��"
+++
+++#: ../statistics.c:122
+++#, c-format
+++msgid "%u active connections openings"
+++msgstr "%u�能動接続開始"
+++
+++#: ../statistics.c:123
+++#, c-format
+++msgid "%u passive connection openings"
+++msgstr "%u��動接続開始"
+++
+++#: ../statistics.c:124
+++#, c-format
+++msgid "%u failed connection attempts"
+++msgstr "%u�接続試行失敗"
+++
+++#: ../statistics.c:125
+++#, c-format
+++msgid "%u connection resets received"
+++msgstr "%u�接続リセット�信"
+++
+++#: ../statistics.c:126
+++#, c-format
+++msgid "%u connections established"
+++msgstr "%u�接続確立"
+++
+++#: ../statistics.c:127
+++#, c-format
+++msgid "%u segments received"
+++msgstr "%uセグメント��信"
+++
+++#: ../statistics.c:128
+++#, c-format
+++msgid "%u segments send out"
+++msgstr "%uセグメント��信"
+++
+++#: ../statistics.c:129
+++#, c-format
+++msgid "%u segments retransmited"
+++msgstr "%uセグメント��転�"
+++
+++#: ../statistics.c:130
+++#, c-format
+++msgid "%u bad segments received."
+++msgstr "%u��正セグメント�信."
+++
+++#: ../statistics.c:131
+++#, c-format
+++msgid "%u resets sent"
+++msgstr "%u�リセット�信"
+++
+++#: ../statistics.c:136
+++#, c-format
+++msgid "%u packets received"
+++msgstr "%uパケット�信"
+++
+++#: ../statistics.c:137
+++#, c-format
+++msgid "%u packets to unknown port received."
+++msgstr "�明��ート�ら�%uパケット��信."
+++
+++#: ../statistics.c:138
+++#, c-format
+++msgid "%u packet receive errors"
+++msgstr "%u�パケット�信エラー"
+++
+++#: ../statistics.c:139
+++#, c-format
+++msgid "%u packets sent"
+++msgstr "%u�パケットを�信"
+++
+++#: ../statistics.c:144
+++#, c-format
+++msgid "%u SYN cookies sent"
+++msgstr "%u�SYNクッキーを�信"
+++
+++#: ../statistics.c:145
+++#, c-format
+++msgid "%u SYN cookies received"
+++msgstr "%u�SYNクッキーを�信"
+++
+++#: ../statistics.c:146
+++#, c-format
+++msgid "%u invalid SYN cookies received"
+++msgstr "%u���当�SYNクッキーを�信"
+++
+++#: ../statistics.c:148
+++#, c-format
+++msgid "%u resets received for embryonic SYN_RECV sockets"
+++msgstr "%u�未完��SYN_RECVソケット�対�るリセットを�信"
+++
+++#: ../statistics.c:150
+++#, c-format
+++msgid "%u packets pruned from receive queue because of socket buffer overrun"
+++msgstr "%u�パケットをソケット�ッファオー�ラン����信キュー�ら除外"
+++
+++#. obsolete: 2.2.0 doesn't do that anymore
+++#: ../statistics.c:153
+++#, c-format
+++msgid "%u packets pruned from receive queue"
+++msgstr "%u�パケットを�信キュー�ら除外"
+++
+++#: ../statistics.c:154
+++#, c-format
+++msgid ""
+++"%u packets dropped from out-of-order queue because of socket buffer overrun"
+++msgstr "%u�パケット�ソケット�ッファオー�ーラン���out-of-orderキュー�らドロップ"
+++
+++#: ../statistics.c:156
+++#, c-format
+++msgid "%u ICMP packets dropped because they were out-of-window"
+++msgstr "%u�ICMPパケット�out-of-window���ドロップ"
+++
+++#: ../statistics.c:158
+++#, c-format
+++msgid "%u ICMP packets dropped because socket was locked"
+++msgstr "%u�ICMPパケットをソケット�ロック�よ��ドロップ"
+++
+++# FIXME: what does it mean?
+++#: ../statistics.c:160
+++#, c-format
+++msgid "%u TCP sockets finished time wait in fast timer"
+++msgstr "%u�TCPソケット�ファーストタイマ��時間待�を完了"
+++
+++# FIXME
+++#: ../statistics.c:161
+++#, c-format
+++msgid "%u time wait sockets recycled by time stamp"
+++msgstr "%u�時間待�ソケット�タイムスタンプ��利用"
+++
+++# FIXME
+++#: ../statistics.c:162
+++#, c-format
+++msgid "%u TCP sockets finished time wait in slow timer"
+++msgstr "%u�TCPソケット�スロータイマ��時間待�を完了"
+++
+++#: ../statistics.c:163
+++#, c-format
+++msgid "%u passive connections rejected because of time stamp"
+++msgstr "%u��動的接続�タイムスタンプ����拒�"
+++
+++#: ../statistics.c:165
+++#, c-format
+++msgid "%u active connections rejected because of time stamp"
+++msgstr "%u�能動的接続�タイムスタンプ����拒�"
+++
+++#: ../statistics.c:167
+++#, c-format
+++msgid "%u packets rejects in established connections because of timestamp"
+++msgstr "%u�パケット�タイムスタンプ����接続確立を拒�"
+++
+++#: ../statistics.c:169
+++#, c-format
+++msgid "%u delayed acks sent"
+++msgstr "%u��延ackを�信"
+++
+++# FIXME
+++#: ../statistics.c:170
+++#, c-format
+++msgid "%u delayed acks further delayed because of locked socket"
+++msgstr "%u��延ack�ロック�れ�ソケット�����ら��延"
+++
+++#: ../statistics.c:172
+++#, c-format
+++msgid "Quick ack mode was activated %u times"
+++msgstr "クイックackモード�%u回稼�"
+++
+++# FIXME
+++#: ../statistics.c:173
+++#, c-format
+++msgid "%u times the listen queue of a socket overflowed"
+++msgstr "ソケット�リスンキュー�%u回オー�フロー"
+++
+++# FIXME
+++#: ../statistics.c:175
+++#, c-format
+++msgid "%u SYNs to LISTEN sockets ignored"
+++msgstr "%u�ソケットリスンSYN�無視"
+++
+++#: ../statistics.c:176
+++#, c-format
+++msgid "%u packets directly queued to recvmsg prequeue."
+++msgstr "%uパケットをrecvmsgプレキュー�直接キュー."
+++
+++#: ../statistics.c:178
+++#, c-format
+++msgid "%u of bytes directly received from backlog"
+++msgstr "%u�イトを�ックログ�ら直接�信"
+++
+++#: ../statistics.c:180
+++#, c-format
+++msgid "%u of bytes directly received from prequeue"
+++msgstr "%u�イトをプレキュー�ら直接�信"
+++
+++#: ../statistics.c:182
+++#, c-format
+++msgid "%u packets dropped from prequeue"
+++msgstr "%u�パケットをプレキュー�らドロップ"
+++
+++#: ../statistics.c:183
+++#, c-format
+++msgid "%u packet headers predicted"
+++msgstr "%u�パケットヘッダを予測"
+++
+++#: ../statistics.c:184
+++#, c-format
+++msgid "%u packets header predicted and directly queued to user"
+++msgstr "%u�パケットヘッダを予測��ユーザ�直接キュー"
+++
+++#: ../statistics.c:186
+++#, c-format
+++msgid "Ran %u times out of system memory during packet sending"
+++msgstr "%u回�パケット�信中�システムメモリ��れ"
+++
+++#: ../statistics.c:188
+++#, c-format
+++msgid "%u acknowledgments not containing data received"
+++msgstr "データを����%u�承���信"
+++
+++#: ../statistics.c:189
+++#, c-format
+++msgid "%u predicted acknowledgments"
+++msgstr "%u�予測承�"
+++
+++#: ../statistics.c:190
+++#, c-format
+++msgid "%u times recovered from packet loss due to fast retransmit"
+++msgstr "高速����よるパケットロス�%u回�回復"
+++
+++#: ../statistics.c:191
+++#, c-format
+++msgid "%u times recovered from packet loss due to SACK data"
+++msgstr "SACKデータ�よるパケットロス�%u回�回復"
+++
+++#: ../statistics.c:192
+++#, c-format
+++msgid "%u bad SACKs received"
+++msgstr "%u��正�SACKを�信"
+++
+++#: ../statistics.c:193
+++#, c-format
+++msgid "Detected reordering %u times using FACK"
+++msgstr "FACKを使��%u回�検出�れ�並�替�"
+++
+++#: ../statistics.c:194
+++#, c-format
+++msgid "Detected reordering %u times using SACK"
+++msgstr "SACKを使��%u回�検出�れ�並�替�"
+++
+++#: ../statistics.c:195
+++#, c-format
+++msgid "Detected reordering %u times using time stamp"
+++msgstr "タイムスタンプを使��%u回�検出�れ�並�替�"
+++
+++# FIXME:what does it mean?
+++#: ../statistics.c:196
+++#, c-format
+++msgid "Detected reordering %u times using reno fast retransmit"
+++msgstr "高速��を使��%u回�検出�れ�並�替�"
+++
+++#: ../statistics.c:197
+++#, c-format
+++msgid "%u congestion windows fully recovered"
+++msgstr "%u�輻輳ウィンドウを完全�回復"
+++
+++#: ../statistics.c:198
+++#, c-format
+++msgid "%u congestion windows partially recovered using Hoe heuristic"
+++msgstr "Hoeヒューリスティックを使��%u�輻輳ウィンドウを部分的�回復"
+++
+++#: ../statistics.c:199
+++#, c-format
+++msgid "%u congestion window recovered using DSACK"
+++msgstr "DSACKを使��%u�輻輳ウィンドウを回復"
+++
+++#: ../statistics.c:200
+++#, c-format
+++msgid "%u congestion windows recovered after partial ack"
+++msgstr "部分ack後�%u�輻輳ウィンドウを回復"
+++
+++#: ../statistics.c:201
+++#, c-format
+++msgid "%u retransmits lost"
+++msgstr "%u���ロスト"
+++
+++# FIXME
+++#: ../statistics.c:202
+++#, c-format
+++msgid "%u timeouts after reno fast retransmit"
+++msgstr "高速��後�%u�タイムアウト"
+++
+++#: ../statistics.c:203
+++#, c-format
+++msgid "%u timeouts after SACK recovery"
+++msgstr "SACK復元後�%u�タイムアウト"
+++
+++#: ../statistics.c:204
+++#, c-format
+++msgid "%u timeouts in loss state"
+++msgstr "状態ロス��%u�タイムアウト"
+++
+++#: ../statistics.c:205
+++#, c-format
+++msgid "%u fast retransmits"
+++msgstr "%u�高速��"
+++
+++#: ../statistics.c:206
+++#, c-format
+++msgid "%u forward retransmits"
+++msgstr "%u�転���"
+++
+++#: ../statistics.c:207
+++#, c-format
+++msgid "%u retransmits in slow start"
+++msgstr "スロースタート��%u���"
+++
+++#: ../statistics.c:208
+++#, c-format
+++msgid "%u other TCP timeouts"
+++msgstr "%u���他�TCPタイムアウト"
+++
+++# FIXME
+++#: ../statistics.c:209
+++#, c-format
+++msgid "%u reno fast retransmits failed"
+++msgstr "%d�高速��失敗"
+++
+++#: ../statistics.c:210
+++#, c-format
+++msgid "%u sack retransmits failed"
+++msgstr "%u�sack��失敗"
+++
+++# FIXME
+++#: ../statistics.c:211
+++#, c-format
+++msgid "%u times receiver scheduled too late for direct processing"
+++msgstr "直接処������る�スケジュール�れ�%u回�レシー�"
+++
+++# FIXME
+++#: ../statistics.c:212
+++#, c-format
+++msgid "%u packets collapsed in receive queue due to low socket buffer"
+++msgstr "%u�パケットを低ソケット�ッファ�����信キュー�ら除外"
+++
+++#: ../statistics.c:213
+++#, c-format
+++msgid "%u DSACKs sent for old packets"
+++msgstr "%u�DSACKを��パケット����信"
+++
+++#: ../statistics.c:214
+++#, c-format
+++msgid "%u DSACKs sent for out of order packets"
+++msgstr "%u�DSACKを順�外パケット����信"
+++
+++#: ../statistics.c:215
+++#, c-format
+++msgid "%u DSACKs received"
+++msgstr "%u�DSACKを�信"
+++
+++#: ../statistics.c:216
+++#, c-format
+++msgid "%u DSACKs for out of order packets received"
+++msgstr "%u�DSACKを順�外パケット����信"
+++
+++#: ../statistics.c:217
+++#, c-format
+++msgid "%u connections reset due to unexpected SYN"
+++msgstr "予期��SYN����%u�接続をリセット"
+++
+++#: ../statistics.c:218
+++#, c-format
+++msgid "%u connections reset due to unexpected data"
+++msgstr "予期��データ����%u�接続をリセット"
+++
+++#: ../statistics.c:219
+++#, c-format
+++msgid "%u connections reset due to early user close"
+++msgstr "早期�ユーザ�クローズ����%u�接続をリセット"
+++
+++#: ../statistics.c:220
+++#, c-format
+++msgid "%u connections aborted due to memory pressure"
+++msgstr "メモリ�制約����%u�接続を中止"
+++
+++#: ../statistics.c:221
+++#, c-format
+++msgid "%u connections aborted due to timeout"
+++msgstr "タイムアウト����%u�接続を中止"
+++
+++# FIXME
+++#: ../statistics.c:222
+++#, c-format
+++msgid "%u connections aborted after user close in linger timeout"
+++msgstr "ユーザ�長期タイムアウト��クローズ後�%u�接続�中止"
+++
+++#: ../statistics.c:223
+++#, c-format
+++msgid "%u times unabled to send RST due to no memory"
+++msgstr "メモリ�足����RST��信�%u回�能"
+++
+++# FIXME
+++#: ../statistics.c:224
+++#, c-format
+++msgid "TCP ran low on memory %u times"
+++msgstr "TCP�少��メモリ�%u回実行"
+++
+++#: ../statistics.c:225
+++#, c-format
+++msgid "%u TCP data loss events"
+++msgstr "%u�TCPデータ�イベントをロス"
+++
+++#: ../statistics.c:292
+++msgid "enabled"
+++msgstr "有効"
+++
+++#: ../statistics.c:292
+++msgid "disabled"
+++msgstr "無効"
+++
+++#: ../statistics.c:375
+++msgid "error parsing /proc/net/snmp"
+++msgstr "/proc/net/snmp�処�中�エラー�発生����"
+++
+++#: ../statistics.c:388
+++msgid "cannot open /proc/net/snmp"
+++msgstr "/proc/net/snmpを開���ん"
+++
+++#: ../lib/activate.c:69
+++#, c-format
+++msgid "Hardware type `%s' not supported.\n"
+++msgstr "�ードウェアタイプ`%s'�サ�ート�れ����ん.\n"
+++
+++#: ../lib/activate.c:73
+++#, c-format
+++msgid "Cannot change line discipline to `%s'.\n"
+++msgstr "`%s'�line disciplineを変更����ん.\n"
+++
+++#: ../lib/af.c:153 ../lib/hw.c:161
+++msgid "UNSPEC"
+++msgstr "�明��ット"
+++
+++#: ../lib/af.c:155
+++msgid "UNIX Domain"
+++msgstr "UNIXドメイン"
+++
+++#: ../lib/af.c:158
+++msgid "DARPA Internet"
+++msgstr "DARPAインター�ット"
+++
+++#: ../lib/af.c:161
+++msgid "IPv6"
+++msgstr "IPv6"
+++
+++#: ../lib/af.c:164 ../lib/hw.c:182
+++msgid "AMPR AX.25"
+++msgstr "AMPR AX.25"
+++
+++#: ../lib/af.c:167 ../lib/hw.c:188
+++msgid "AMPR NET/ROM"
+++msgstr "AMPR NET/ROM"
+++
+++#: ../lib/af.c:170
+++msgid "Novell IPX"
+++msgstr "Novell IPX"
+++
+++#: ../lib/af.c:173
+++msgid "Appletalk DDP"
+++msgstr "アップルトークDDP"
+++
+++#: ../lib/af.c:176 ../lib/hw.c:223
+++msgid "Econet"
+++msgstr "エコ�ット"
+++
+++#: ../lib/af.c:179
+++msgid "CCITT X.25"
+++msgstr "CCITT X.25"
+++
+++#: ../lib/af.c:182 ../lib/hw.c:185
+++msgid "AMPR ROSE"
+++msgstr "AMPR ROSE"
+++
+++#: ../lib/af.c:185 ../lib/hw.c:173
+++msgid "Ash"
+++msgstr "Ash"
+++
+++#: ../lib/af.c:243
+++#, c-format
+++msgid "Please don't supply more than one address family.\n"
+++msgstr "複数�アドレスファミリを����下��.\n"
+++
+++#: ../lib/af.c:304
+++#, c-format
+++msgid "Too much address family arguments.\n"
+++msgstr "アドレスファミリ�引数�多����.\n"
+++
+++#: ../lib/af.c:315
+++#, c-format
+++msgid "Unknown address family `%s'.\n"
+++msgstr "�明�アドレスファミリ�� `%s'.\n"
+++
+++#: ../lib/arcnet.c:70 ../lib/arcnet.c:85
+++#, c-format
+++msgid "in_arcnet(%s): invalid arcnet address!\n"
+++msgstr "in_arcnet(%s): ��当�ARCNETアドレス��!\n"
+++
+++#: ../lib/arcnet.c:97
+++#, c-format
+++msgid "in_arcnet(%s): trailing : ignored!\n"
+++msgstr "in_arcnet(%s): trailing : 無効!\n"
+++
+++# translatable?
+++#: ../lib/arcnet.c:109
+++#, c-format
+++msgid "in_arcnet(%s): trailing junk!\n"
+++msgstr "in_arcnet(%s): trailing junk!\n"
+++
+++#: ../lib/ash.c:81
+++#, c-format
+++msgid "Malformed Ash address"
+++msgstr "異常�Ashアドレス��"
+++
+++#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244
+++#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78
+++#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76
+++msgid "[NONE SET]"
+++msgstr "[設定��]"
+++
+++#: ../lib/ax25.c:97 ../lib/netrom.c:100
+++msgid "Invalid callsign"
+++msgstr "��当�コールサイン��"
+++
+++#: ../lib/ax25.c:110 ../lib/netrom.c:113
+++msgid "Callsign too long"
+++msgstr "コールサイン�長����"
+++
+++#: ../lib/ax25_gr.c:47
+++#, c-format
+++msgid "AX.25 not configured in this system.\n"
+++msgstr "AX.25���システム��設定�れ����ん.\n"
+++
+++#: ../lib/ax25_gr.c:50
+++#, c-format
+++msgid "Kernel AX.25 routing table\n"
+++msgstr "カー�ル AX.25経路テーブル\n"
+++
+++#. xxx
+++#: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
+++#, c-format
+++msgid "Destination  Iface    Use\n"
+++msgstr "�信先サイト Iface    使用数\n"
+++
+++#: ../lib/ether.c:74 ../lib/ether.c:91
+++#, c-format
+++msgid "in_ether(%s): invalid ether address!\n"
+++msgstr "in_ether(%s): ��当�イーサアドレス!\n"
+++
+++#: ../lib/ether.c:105
+++#, c-format
+++msgid "in_ether(%s): trailing : ignored!\n"
+++msgstr "in_ether(%s): trailing : 無効!\n"
+++
+++# translatable?
+++#: ../lib/ether.c:117
+++#, c-format
+++msgid "in_ether(%s): trailing junk!\n"
+++msgstr "in_ether(%s): trailing junk!\n"
+++
+++#: ../lib/fddi.c:84 ../lib/fddi.c:99
+++#, c-format
+++msgid "in_fddi(%s): invalid fddi address!\n"
+++msgstr "in_fddi(%s): ��当�fddiアドレス!\n"
+++
+++#: ../lib/fddi.c:111
+++#, c-format
+++msgid "in_fddi(%s): trailing : ignored!\n"
+++msgstr "in_fddi(%s): trailing : 無効!\n"
+++
+++# translatable?
+++#: ../lib/fddi.c:123
+++#, c-format
+++msgid "in_fddi(%s): trailing junk!\n"
+++msgstr "in_fddi(%s): trailing junk!\n"
+++
+++#: ../lib/getroute.c:101 ../lib/setroute.c:80
+++#, c-format
+++msgid "Address family `%s' not supported.\n"
+++msgstr "アドレスファミリ`%s'�サ�ート�れ����ん.\n"
+++
+++#: ../lib/getroute.c:107 ../lib/setroute.c:84
+++#, c-format
+++msgid "No routing for address family `%s'.\n"
+++msgstr "アドレスファミリ`%s'��経路�見��り��ん.\n"
+++
+++#: ../lib/hippi.c:84 ../lib/hippi.c:99
+++#, c-format
+++msgid "in_hippi(%s): invalid hippi address!\n"
+++msgstr "in_hippi(%s): ��当�hippiアドレス��!\n"
+++
+++#: ../lib/hippi.c:111
+++#, c-format
+++msgid "in_hippi(%s): trailing : ignored!\n"
+++msgstr "in_hippi(%s): trailing : 無効!\n"
+++
+++# translatable?
+++#: ../lib/hippi.c:122
+++#, c-format
+++msgid "in_hippi(%s): trailing junk!\n"
+++msgstr "in_hippi(%s): trailing junk!\n"
+++
+++#: ../lib/hw.c:160
+++msgid "Local Loopback"
+++msgstr "ローカルループ�ック"
+++
+++#: ../lib/hw.c:163
+++msgid "Serial Line IP"
+++msgstr "シリアルラインIP"
+++
+++#: ../lib/hw.c:164
+++msgid "VJ Serial Line IP"
+++msgstr "VJシリアルラインIP"
+++
+++#: ../lib/hw.c:165
+++msgid "6-bit Serial Line IP"
+++msgstr "6ビットシリアルラインIP"
+++
+++#: ../lib/hw.c:166
+++msgid "VJ 6-bit Serial Line IP"
+++msgstr "VJ 6ビットシリアルラインIP"
+++
+++#: ../lib/hw.c:167
+++msgid "Adaptive Serial Line IP"
+++msgstr "AdaptiveシリアルラインIP"
+++
+++#: ../lib/hw.c:170
+++msgid "Ethernet"
+++msgstr "イーサ�ット"
+++
+++# translatable?
+++#: ../lib/hw.c:176
+++msgid "Fiber Distributed Data Interface"
+++msgstr "Fiber Distributed Data Interface"
+++
+++#: ../lib/hw.c:179
+++msgid "HIPPI"
+++msgstr "HIPPI"
+++
+++#: ../lib/hw.c:191
+++msgid "generic X.25"
+++msgstr "ジェ�リックX.25"
+++
+++#: ../lib/hw.c:194
+++msgid "IPIP Tunnel"
+++msgstr "IPIPトン�ル"
+++
+++#: ../lib/hw.c:197
+++msgid "Point-to-Point Protocol"
+++msgstr "Point-to-Pointプロトコル"
+++
+++#: ../lib/hw.c:200
+++msgid "(Cisco)-HDLC"
+++msgstr "(Cisco)-HDLC"
+++
+++#: ../lib/hw.c:201
+++msgid "LAPB"
+++msgstr "LAPB"
+++
+++#: ../lib/hw.c:204
+++msgid "ARCnet"
+++msgstr "ARC�ット"
+++
+++#: ../lib/hw.c:207
+++msgid "Frame Relay DLCI"
+++msgstr "フレームリレーDLCI"
+++
+++#: ../lib/hw.c:208
+++msgid "Frame Relay Access Device"
+++msgstr "フレームリレーアクセスデ�イス"
+++
+++#: ../lib/hw.c:211
+++msgid "IPv6-in-IPv4"
+++msgstr "IPv6-in-IPv4"
+++
+++#: ../lib/hw.c:214
+++msgid "IrLAP"
+++msgstr "IrLAP"
+++
+++#: ../lib/hw.c:217
+++msgid "16/4 Mbps Token Ring"
+++msgstr "16/4 Mbpsトークンリング"
+++
+++#: ../lib/hw.c:219
+++msgid "16/4 Mbps Token Ring (New)"
+++msgstr "16/4 Mbpsトークンリング(新)"
+++
+++#: ../lib/hw.c:226
+++msgid "Generic EUI-64"
+++msgstr "ジェ�リックEUI-64"
+++
+++#: ../lib/inet.c:153 ../lib/inet6.c:79
+++#, c-format
+++msgid "rresolve: unsupport address family %d !\n"
+++msgstr "rresolve: アドレスファミリ%dをサ�ート�����ん!\n"
+++
+++#: ../lib/inet6.c:131
+++msgid "[UNKNOWN]"
+++msgstr "[�明]"
+++
+++#: ../lib/inet6_gr.c:71
+++#, c-format
+++msgid "INET6 (IPv6) not configured in this system.\n"
+++msgstr "INET6(IPv6)���システム��利用��るよ�設定�れ����ん.\n"
+++
+++#: ../lib/inet6_gr.c:74
+++#, c-format
+++msgid "Kernel IPv6 routing table\n"
+++msgstr "カー�ルIPv6 経路テーブル\n"
+++
+++#: ../lib/inet6_gr.c:76
+++#, c-format
+++msgid ""
+++"Destination                                 Next "
+++"Hop                                Flags Metric Ref    Use Iface\n"
+++msgstr "�信先サイト                                次回ホップ                             フラグ Metric Ref 使用数 インタフェース\n"
+++
+++#: ../lib/inet6_gr.c:150
+++#, c-format
+++msgid "Kernel IPv6 Neighbour Cache\n"
+++msgstr "カー�ルIPv6 近隣�ットワーク�キャッシュ\n"
+++
+++#: ../lib/inet6_gr.c:153
+++#, c-format
+++msgid ""
+++"Neighbour                                   HW Address        Iface    Flags "
+++"Ref State\n"
+++msgstr ""
+++"近隣サイト                               �ードウェアアドレス Iface   フラグ "
+++"Ref 状態\n"
+++
+++#: ../lib/inet6_gr.c:157
+++#, c-format
+++msgid ""
+++"Neighbour                                   HW Address        Iface    Flags "
+++"Ref State            Stale(sec) Delete(sec)\n"
+++msgstr ""
+++"近隣サイト                               �ードウェアアドレス Iface   フラグ "
+++"Ref 状態             Stale[秒]  Delete[秒]\n"
+++
+++#: ../lib/inet6_sr.c:46
+++#, c-format
+++msgid "Usage: inet6_route [-vF] del Target\n"
+++msgstr "使用法: inet6_route [-vF] del ターゲット\n"
+++
+++#: ../lib/inet6_sr.c:47
+++#, c-format
+++msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
+++msgstr ""
+++"        inet6_route [-vF] add ターゲット \n"
+++"                    [gw ゲートウェイ] [metric メトリック]\n"
+++"                    [[dev] インタフェース]\n"
+++
+++#: ../lib/inet6_sr.c:48
+++#, c-format
+++msgid "       inet6_route [-FC] flush      NOT supported\n"
+++msgstr "        inet6_route [-FC] flush      サ�ート�����ん\n"
+++
+++#: ../lib/inet6_sr.c:188
+++#, c-format
+++msgid "Flushing `inet6' routing table not supported\n"
+++msgstr "`inet6'経路テーブル�フラッシュ�サ�ート�����ん\n"
+++
+++#: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
+++#, c-format
+++msgid "INET (IPv4) not configured in this system.\n"
+++msgstr "INET(IPv4)���システム��利用��るよ��設定�れ����ん.\n"
+++
+++#: ../lib/inet_gr.c:53
+++#, c-format
+++msgid "Kernel IP routing table\n"
+++msgstr "カー�ルIP経路テーブル\n"
+++
+++#: ../lib/inet_gr.c:56
+++#, c-format
+++msgid ""
+++"Destination     Gateway         Genmask         Flags Metric Ref    Use "
+++"Iface\n"
+++msgstr "�信先サイト    ゲートウェイ    �ットマスク   フラグ Metric Ref 使用数 インタフェース\n"
+++
+++#: ../lib/inet_gr.c:59
+++#, c-format
+++msgid ""
+++"Destination     Gateway         Genmask         Flags   MSS Window  irtt "
+++"Iface\n"
+++msgstr "�信先サイト    ゲートウェイ    �ットマスク   フラグ   MSS Window  irtt インタフェース\n"
+++
+++#: ../lib/inet_gr.c:62
+++#, c-format
+++msgid ""
+++"Destination     Gateway         Genmask         Flags Metric Ref    Use "
+++"Iface    MSS   Window irtt\n"
+++msgstr ""
+++"�信先サイト   ゲートウェイ    �ットマスク    フラグ Metric Ref 使用数 "
+++"Iface    MSS   Window irtt\n"
+++
+++#: ../lib/inet_gr.c:237
+++#, c-format
+++msgid "Kernel IP routing cache\n"
+++msgstr "カー�ルIP経路キャッシュ\n"
+++
+++#: ../lib/inet_gr.c:258
+++#, c-format
+++msgid ""
+++"Source          Destination     Gateway         Flags Metric Ref    Use "
+++"Iface\n"
+++msgstr "発信元サイト   �信先サイト    ゲートウェイ    フラグ Metric Ref 使用数 インタフェース\n"
+++
+++#: ../lib/inet_gr.c:261
+++#, c-format
+++msgid ""
+++"Source          Destination     Gateway         Flags   MSS Window  irtt "
+++"Iface\n"
+++msgstr "発信元サイト    �信先サイト    ゲートウェイ   フラグ   MSS Window  irtt インタフェース\n"
+++
+++#: ../lib/inet_gr.c:266
+++#, c-format
+++msgid ""
+++"Source          Destination     Gateway         Flags Metric Ref    Use "
+++"Iface    MSS   Window irtt  HH  Arp\n"
+++msgstr ""
+++"発信元サイト    �信先サイト    ゲートウェイ   フラグ Metric Ref 使用数 "
+++"Iface    MSS   Window irtt   HH  Arp\n"
+++
+++#: ../lib/inet_gr.c:290
+++#, c-format
+++msgid ""
+++"Source          Destination     Gateway         Flags Metric Ref    Use "
+++"Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
+++msgstr ""
+++"発信元サイト   �信先サイト     ゲートウェイ   フラグ Metric Ref 使用数 "
+++"Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
+++
+++#: ../lib/inet_sr.c:51
+++#, c-format
+++msgid ""
+++"Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
+++"[[dev] If]\n"
+++msgstr ""
+++"使用法:inet_route [-vF] del {-host|-net} �信先[/プレフィックス]\n"
+++"                   [gw ゲートウェイ] [metric メトリック]\n"
+++"                   [[dev] インタフェース]\n"
+++
+++#: ../lib/inet_sr.c:52
+++#, c-format
+++msgid ""
+++"       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
+++msgstr ""
+++"       inet_route [-vF] add {-host|-net} �信先[/プレフィックス]\n"
+++"                   [gw ゲートウェイ] [metric メトリック]\n"
+++
+++#: ../lib/inet_sr.c:53
+++#, c-format
+++msgid ""
+++"                              [netmask N] [mss Mss] [window W] [irtt I]\n"
+++msgstr "            [netmask �ットマスク] [mss Mss] [window W] [irtt I]\n"
+++
+++#: ../lib/inet_sr.c:54
+++#, c-format
+++msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
+++msgstr "            [mod] [dyn] [reinstate] [[dev] インタフェース]\n"
+++
+++#: ../lib/inet_sr.c:55
+++#, c-format
+++msgid ""
+++"       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
+++msgstr ""
+++"       inet_route [-vF] add {-host|-net} �信先[/プレフィックス]\n"
+++"                   [metric メトリック] reject\n"
+++
+++#: ../lib/inet_sr.c:56
+++#, c-format
+++msgid "       inet_route [-FC] flush      NOT supported\n"
+++msgstr "        inet_route [-FC] flush      サ�ート�����ん\n"
+++
+++#: ../lib/inet_sr.c:158
+++#, c-format
+++msgid "route: %s: cannot use a NETWORK as gateway!\n"
+++msgstr "route: %s: NETWORKをゲートウェイ���使���ん!\n"
+++
+++#: ../lib/inet_sr.c:174
+++#, c-format
+++msgid "route: Invalid MSS/MTU.\n"
+++msgstr "route: MSS/MTU���当��.\n"
+++
+++#: ../lib/inet_sr.c:187
+++#, c-format
+++msgid "route: Invalid window.\n"
+++msgstr "route: window���当��.\n"
+++
+++#: ../lib/inet_sr.c:203
+++#, c-format
+++msgid "route: Invalid initial rtt.\n"
+++msgstr "route: �期rtt���当��.\n"
+++
+++#: ../lib/inet_sr.c:261
+++#, c-format
+++msgid "route: netmask %.8x doesn't make sense with host route\n"
+++msgstr "route: �ットマスク%.8x�ホスト経路を検出���ん\n"
+++
+++#: ../lib/inet_sr.c:265
+++#, c-format
+++msgid "route: bogus netmask %s\n"
+++msgstr "route: ���ットマスク`%s'��\n"
+++
+++#: ../lib/inet_sr.c:270
+++#, c-format
+++msgid "route: netmask doesn't match route address\n"
+++msgstr "route: �ットマスク�経路アドレス�一致���ん\n"
+++
+++#: ../lib/inet_sr.c:306
+++#, c-format
+++msgid "Flushing `inet' routing table not supported\n"
+++msgstr "`inet'経路テーブル�フラッシュ�サ�ート�����ん\n"
+++
+++#: ../lib/inet_sr.c:310
+++#, c-format
+++msgid "Modifying `inet' routing cache not supported\n"
+++msgstr "`inet'経路テーブル�変更�サ�ート�����ん\n"
+++
+++#: ../lib/ipx_gr.c:52
+++#, c-format
+++msgid "IPX not configured in this system.\n"
+++msgstr "IPX���システム��設定�れ����ん.\n"
+++
+++#: ../lib/ipx_gr.c:56
+++#, c-format
+++msgid "Kernel IPX routing table\n"
+++msgstr "カー�ルIPX経路テーブル\n"
+++
+++#. xxx
+++#: ../lib/ipx_gr.c:57
+++#, c-format
+++msgid "Destination               Router Net                Router Node\n"
+++msgstr "�信先サイト              ルータ �ット             ルータノード\n"
+++
+++#: ../lib/ipx_sr.c:33
+++#, c-format
+++msgid "IPX: this needs to be written\n"
+++msgstr "IPX: �れ�書�込��必���\n"
+++
+++#: ../lib/masq_info.c:198
+++#, c-format
+++msgid "IP masquerading entries\n"
+++msgstr "IPマスカレード エントリ\n"
+++
+++#: ../lib/masq_info.c:201
+++#, c-format
+++msgid "prot   expire source               destination          ports\n"
+++msgstr "プロト expire 発信元サイト         �信先サイト         �ート\n"
+++
+++#: ../lib/masq_info.c:204
+++#, c-format
+++msgid ""
+++"prot   expire    initseq delta prevd source               "
+++"destination          ports\n"
+++msgstr ""
+++"プロト expire    �期seq delta prevd 発信元サイト         �信先サイ"
+++"ト         �ート\n"
+++
+++#: ../lib/netrom_gr.c:48
+++#, c-format
+++msgid "NET/ROM not configured in this system.\n"
+++msgstr "NET/ROM���システム��利用�能�よ��設定�れ����ん.\n"
+++
+++#: ../lib/netrom_gr.c:51
+++#, c-format
+++msgid "Kernel NET/ROM routing table\n"
+++msgstr "カー�ルNET/ROM経路テーブル\n"
+++
+++#: ../lib/netrom_gr.c:52
+++#, c-format
+++msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
+++msgstr "�信先サイト ニーモニック �質  近隣サイト インタフェース\n"
+++
+++#: ../lib/netrom_sr.c:34
+++#, c-format
+++msgid "netrom usage\n"
+++msgstr "netrom使用法\n"
+++
+++#: ../lib/netrom_sr.c:44
+++#, c-format
+++msgid "NET/ROM: this needs to be written\n"
+++msgstr "NET/ROM: �れ�書�込��必���\n"
+++
+++#: ../lib/ppp.c:44
+++#, c-format
+++msgid "You cannot start PPP with this program.\n"
+++msgstr "��プログラム��PPPを開始����ん. \n"
+++
+++#: ../lib/ppp_ac.c:38
+++#, c-format
+++msgid "Sorry, use pppd!\n"
+++msgstr "申�訳�り��ん�, pppdを使��下��!\n"
+++
+++#: ../lib/rose.c:87
+++msgid "Node address must be ten digits"
+++msgstr "ノードアドレス�10進数���れ��り��ん"
+++
+++#: ../lib/rose_gr.c:51
+++#, c-format
+++msgid "ROSE not configured in this system.\n"
+++msgstr "ROSE���システム��利用�能�よ��設定�れ����ん\n"
+++
+++#: ../lib/rose_gr.c:54
+++#, c-format
+++msgid "Kernel ROSE routing table\n"
+++msgstr "カー�ルROSE経路テーブル\n"
+++
+++#: ../lib/tr.c:86 ../lib/tr.c:101
+++#, c-format
+++msgid "in_tr(%s): invalid token ring address!\n"
+++msgstr "in_tr(%s): ��当�トークンリングアドレス��!\n"
+++
+++#: ../lib/tr.c:113
+++#, c-format
+++msgid "in_tr(%s): trailing : ignored!\n"
+++msgstr "in_tr(%s): trailing : 無効!\n"
+++
+++# translatable?
+++#: ../lib/tr.c:125
+++#, c-format
+++msgid "in_tr(%s): trailing junk!\n"
+++msgstr "in_tr(%s): trailing junk!\n"
+++
+++#: ../lib/interface.c:176
+++#, c-format
+++msgid "warning: no inet socket available: %s\n"
+++msgstr "警告: Inetソケット�利用����ん: %s\n"
+++
+++#: ../lib/interface.c:325
+++#, c-format
+++msgid "Warning: cannot open %s (%s). Limited output.\n"
+++msgstr "警告: %sを開���ん(%s). �定�れ�出力��.\n"
+++
+++#. Give better error message for this case.
+++#: ../lib/interface.c:571
+++msgid "Device not found"
+++msgstr "デ�イス�見��り��ん"
+++
+++#: ../lib/interface.c:575
+++#, c-format
+++msgid "%s: error fetching interface information: %s\n"
+++msgstr "%s: インタフェース情報を�得中�エラー�発生����: %s\n"
+++
+++#: ../lib/interface.c:608
+++msgid "     - no statistics available -"
+++msgstr "     - 統計情報を利用����ん -"
+++
+++#: ../lib/interface.c:612
+++#, c-format
+++msgid "[NO FLAGS]"
+++msgstr "[フラグ��]"
+++
+++#: ../lib/interface.c:688
+++#, c-format
+++msgid "%-9.9s Link encap:%s  "
+++msgstr "%-9.9s リンク方法:%s  "
+++
+++#: ../lib/interface.c:693
+++#, c-format
+++msgid "HWaddr %s  "
+++msgstr "�ードウェアアドレス %s "
+++
+++#: ../lib/interface.c:696
+++#, c-format
+++msgid "Media:%s"
+++msgstr "メディア:%s"
+++
+++#: ../lib/interface.c:698
+++#, c-format
+++msgid "(auto)"
+++msgstr "(自動)"
+++
+++#: ../lib/interface.c:705
+++#, c-format
+++msgid "          %s addr:%s "
+++msgstr "          %sアドレス:%s"
+++
+++#: ../lib/interface.c:708
+++#, c-format
+++msgid " P-t-P:%s "
+++msgstr " P-t-P:%s "
+++
+++#: ../lib/interface.c:711
+++#, c-format
+++msgid " Bcast:%s "
+++msgstr " ブロードキャスト:%s "
+++
+++#: ../lib/interface.c:713
+++#, c-format
+++msgid " Mask:%s\n"
+++msgstr " マスク:%s\n"
+++
+++#: ../lib/interface.c:730
+++#, c-format
+++msgid "          inet6 addr: %s/%d"
+++msgstr "          inet6アドレス: %s/%d"
+++
+++#: ../lib/interface.c:732
+++#, c-format
+++msgid " Scope:"
+++msgstr " 範囲:"
+++
+++#: ../lib/interface.c:735
+++#, c-format
+++msgid "Global"
+++msgstr "グロー�ル"
+++
+++#: ../lib/interface.c:738
+++#, c-format
+++msgid "Link"
+++msgstr "リンク"
+++
+++#: ../lib/interface.c:741
+++#, c-format
+++msgid "Site"
+++msgstr "サイト"
+++
+++# translatable?
+++#: ../lib/interface.c:744
+++#, c-format
+++msgid "Compat"
+++msgstr "Compat"
+++
+++#: ../lib/interface.c:747
+++#, c-format
+++msgid "Host"
+++msgstr "ホスト"
+++
+++#: ../lib/interface.c:750
+++#, c-format
+++msgid "Unknown"
+++msgstr "�明"
+++
+++#: ../lib/interface.c:765
+++#, c-format
+++msgid "          IPX/Ethernet II addr:%s\n"
+++msgstr "          IPX/イーサ�ットIIアドレス:%s\n"
+++
+++#: ../lib/interface.c:768
+++#, c-format
+++msgid "          IPX/Ethernet SNAP addr:%s\n"
+++msgstr "          IPX/イーサ�ットSNAPアドレス:%s\n"
+++
+++#: ../lib/interface.c:771
+++#, c-format
+++msgid "          IPX/Ethernet 802.2 addr:%s\n"
+++msgstr "          IPX/イーサ�ット802.2アドレス:%s\n"
+++
+++#: ../lib/interface.c:774
+++#, c-format
+++msgid "          IPX/Ethernet 802.3 addr:%s\n"
+++msgstr "          IPX/イーサ�ット802.3アドレス:%s\n"
+++
+++#: ../lib/interface.c:784
+++#, c-format
+++msgid "          EtherTalk Phase 2 addr:%s\n"
+++msgstr "          イーサトーク フェーズ2アドレス:%s\n"
+++
+++#: ../lib/interface.c:793
+++#, c-format
+++msgid "          econet addr:%s\n"
+++msgstr "          エコ�ットアドレス:%s\n"
+++
+++#: ../lib/interface.c:800
+++#, c-format
+++msgid "[NO FLAGS] "
+++msgstr "[フラグ��]"
+++
+++# translatable?
+++#: ../lib/interface.c:802
+++#, c-format
+++msgid "UP "
+++msgstr "UP "
+++
+++# translatable?
+++#: ../lib/interface.c:804
+++#, c-format
+++msgid "BROADCAST "
+++msgstr "BROADCAST "
+++
+++# translatable?
+++#: ../lib/interface.c:806
+++#, c-format
+++msgid "DEBUG "
+++msgstr "DEBUG "
+++
+++# translatable?
+++#: ../lib/interface.c:808
+++#, c-format
+++msgid "LOOPBACK "
+++msgstr "LOOPBACK "
+++
+++# translatable?
+++#: ../lib/interface.c:810
+++#, c-format
+++msgid "POINTOPOINT "
+++msgstr "POINTOPOINT "
+++
+++# translatable?
+++#: ../lib/interface.c:812
+++#, c-format
+++msgid "NOTRAILERS "
+++msgstr "NOTRAILERS "
+++
+++# translatable?
+++#: ../lib/interface.c:814
+++#, c-format
+++msgid "RUNNING "
+++msgstr "RUNNING "
+++
+++# translatable?
+++#: ../lib/interface.c:816
+++#, c-format
+++msgid "NOARP "
+++msgstr "NOARP "
+++
+++# translatable?
+++#: ../lib/interface.c:818
+++#, c-format
+++msgid "PROMISC "
+++msgstr "PROMISC "
+++
+++# translatable?
+++#: ../lib/interface.c:820
+++#, c-format
+++msgid "ALLMULTI "
+++msgstr "ALLMULTI "
+++
+++# translatable?
+++#: ../lib/interface.c:822
+++#, c-format
+++msgid "SLAVE "
+++msgstr "SLAVE "
+++
+++# translatable?
+++#: ../lib/interface.c:824
+++#, c-format
+++msgid "MASTER "
+++msgstr "MASTER "
+++
+++# translatable?
+++#: ../lib/interface.c:826
+++#, c-format
+++msgid "MULTICAST "
+++msgstr "MULTICAST "
+++
+++# translatable?
+++#: ../lib/interface.c:829
+++#, c-format
+++msgid "DYNAMIC "
+++msgstr "DYNAMIC "
+++
+++#. DONT FORGET TO ADD THE FLAGS IN ife_print_short
+++#: ../lib/interface.c:832
+++#, c-format
+++msgid " MTU:%d  Metric:%d"
+++msgstr " MTU:%d  メトリック:%d"
+++
+++# translatable?
+++#: ../lib/interface.c:836
+++#, c-format
+++msgid "  Outfill:%d  Keepalive:%d"
+++msgstr "  Outfill:%d  キープアライブ:%d"
+++
+++#: ../lib/interface.c:850
+++#, c-format
+++msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
+++msgstr "RXパケット:%llu エラー:%lu �失:%lu オー�ラン:%lu フレーム:%lu\n"
+++
+++#: ../lib/interface.c:855
+++#, c-format
+++msgid "             compressed:%lu\n"
+++msgstr "             圧縮:%lu\n"
+++
+++#: ../lib/interface.c:895
+++#, c-format
+++msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
+++msgstr "TXパケット:%llu エラー:%lu �失:%lu オー�ラン:%lu キャリア:%lu\n"
+++
+++#: ../lib/interface.c:899
+++#, c-format
+++msgid "          collisions:%lu "
+++msgstr "      ��(Collisions):%lu "
+++
+++#: ../lib/interface.c:901
+++#, c-format
+++msgid "compressed:%lu "
+++msgstr "圧縮:%lu "
+++
+++#: ../lib/interface.c:903
+++#, c-format
+++msgid "txqueuelen:%d "
+++msgstr "TXキュー長:%d "
+++
+++#: ../lib/interface.c:905
+++#, c-format
+++msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
+++msgstr "RX�イト:%llu (%lu.%lu %s)  TX�イト:%llu (%lu.%lu %s)\n"
+++
+++#: ../lib/interface.c:916
+++#, c-format
+++msgid "Interrupt:%d "
+++msgstr "割り込�:%d "
+++
+++#. Only print devices using it for
+++#. I/O maps
+++#: ../lib/interface.c:919
+++#, c-format
+++msgid "Base address:0x%x "
+++msgstr "ベースアドレス:0x%x "
+++
+++#: ../lib/interface.c:921
+++#, c-format
+++msgid "Memory:%lx-%lx "
+++msgstr "メモリ:%lx-%lx "
+++
+++#: ../lib/interface.c:924
+++#, c-format
+++msgid "DMA chan:%x "
+++msgstr "DMA�ェイン:%x "
+++
+++#: ../lib/sockets.c:63
+++#, c-format
+++msgid "No usable address families found.\n"
+++msgstr "利用�能�アドレスファミリ�見��り��ん.\n"
+++
+++#: ../lib/util-ank.c:229
+++#, c-format
+++msgid "ip: %s is invalid inet address\n"
+++msgstr "ip: %s���切�Inetアドレス��.\n"
+++
+++#: ../lib/util-ank.c:238
+++#, c-format
+++msgid "ip: %s is invalid inet prefix\n"
+++msgstr "ip: %s���切�Inetプレフィックス��\n"
+++
+++#: ../lib/util-ank.c:248
+++#, c-format
+++msgid "ip: %s is invalid IPv4 address\n"
+++msgstr "ip: %s���切�IPv4アドレス��.\n"
+++
+++#: ../lib/util-ank.c:256
+++#, c-format
+++msgid "ip: argument is wrong: %s\n"
+++msgstr "ip: 引数�間������: %s\n"
+++
+++#: ../ipmaddr.c:61
+++#, c-format
+++msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
+++msgstr "使用法: ipmaddr [ add | del ] マル�キャストアドレス dev 文字列\n"
+++
+++#: ../ipmaddr.c:62
+++#, c-format
+++msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
+++msgstr "        ipmaddr show [ dev 文字列 ] [ ipv4 | ipv6 | link | all ]\n"
+++
+++#: ../ipmaddr.c:63
+++#, c-format
+++msgid "       ipmaddr -V | -version\n"
+++msgstr "       ipmaddr -V | -version\n"
+++
+++#: ../ipmaddr.c:263
+++#, c-format
+++msgid "family %d "
+++msgstr "ファミリ %d "
+++
+++#: ../ipmaddr.c:272
+++#, c-format
+++msgid " users %d"
+++msgstr " ユーザ %d"
+++
+++#: ../ipmaddr.c:358
+++msgid "Cannot create socket"
+++msgstr "ソケットを作�����ん"
+++
+++#: ../slattach.c:180
+++#, c-format
+++msgid "slattach: /dev/%s already locked!\n"
+++msgstr "slattach: /dev/%s ����ロック�れ����!\n"
+++
+++#: ../slattach.c:186
+++#, c-format
+++msgid "slattach: tty_lock: (%s): %s\n"
+++msgstr "slattach: tty_lock: (%s): %s\n"
+++
+++#: ../slattach.c:192
+++#, c-format
+++msgid "slattach: cannot write PID file\n"
+++msgstr "slattach: PIDファイルを書�込���ん\n"
+++
+++#: ../slattach.c:202
+++#, c-format
+++msgid "slattach: tty_lock: UUCP user %s unknown!\n"
+++msgstr "slattach: tty_lock: UUCPユーザ%s��明��!\n"
+++
+++#: ../slattach.c:430
+++#, c-format
+++msgid "slattach: tty_hangup(DROP): %s\n"
+++msgstr "slattach: tty_hangup(DROP): %s\n"
+++
+++#: ../slattach.c:437
+++#, c-format
+++msgid "slattach: tty_hangup(RAISE): %s\n"
+++msgstr "slattach: tty_hangup(RAISE): %s\n"
+++
+++#: ../slattach.c:468
+++#, c-format
+++msgid "slattach: tty name too long\n"
+++msgstr "slattach: tty��長����\n"
+++
+++#: ../slattach.c:498
+++#, c-format
+++msgid "slattach: tty_open: cannot get current state!\n"
+++msgstr "slattach: tty_open: �在�状態を得られ��ん!\n"
+++
+++#: ../slattach.c:505
+++#, c-format
+++msgid "slattach: tty_open: cannot get current line disc!\n"
+++msgstr "slattach: tty_open: �在�ライン・ディスクを得られ��ん!\n"
+++
+++#: ../slattach.c:513
+++#, c-format
+++msgid "slattach: tty_open: cannot set RAW mode!\n"
+++msgstr "slattach: tty_open: RAWモードを設定����ん!\n"
+++
+++#: ../slattach.c:520
+++#, c-format
+++msgid "slattach: tty_open: cannot set %s bps!\n"
+++msgstr "slattach: tty_open: %s bpsを設定����ん!\n"
+++
+++#: ../slattach.c:530
+++#, c-format
+++msgid "slattach: tty_open: cannot set 8N1 mode!\n"
+++msgstr "slattach: tty_open: 8N1モード�設定����ん!\n"
+++
+++#: ../slattach.c:672
+++#, c-format
+++msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n"
+++msgstr "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n"
+++
+++#: ../slattach.c:704
+++#, c-format
+++msgid "%s started"
+++msgstr "%sを開始����"
+++
+++#: ../slattach.c:705
+++#, c-format
+++msgid " on %s"
+++msgstr "(%s上)"
+++
+++#: ../slattach.c:706
+++#, c-format
+++msgid " interface %s\n"
+++msgstr " インタフェース %s\n"
++Index: net-tools/po/fr.po
++===================================================================
++--- net-tools.orig/po/fr.po
+++++ net-tools/po/fr.po
++@@ -4,281 +4,286 @@
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: net-tools 1.51\n"
++-"POT-Creation-Date: 2000-02-14 02:31+0100\n"
+++"Report-Msgid-Bugs-To: \n"
+++"POT-Creation-Date: 2007-06-30 12:28+0900\n"
++ "PO-Revision-Date: 1998-03-01 00:02+0100\n"
++ "Last-Translator: J.M.Vansteene <vanstee@worldnet.fr>\n"
++ "Language-Team:\n"
++ "MIME-Version: 1.0\n"
++-"Content-Type: text/plain; charset=iso8859-1\n"
+++"Content-Type: text/plain; charset=iso-8859-1\n"
++ "Content-Transfer-Encoding: 8bit\n"
++ 
++-#: ../arp.c:110 ../arp.c:269
+++#: ../arp.c:112 ../arp.c:279
+++#, c-format
++ msgid "arp: need host name\n"
++ msgstr "arp: nécessite un nom d'hôte\n"
++ 
++-#: ../arp.c:207 ../arp.c:221
+++#: ../arp.c:215 ../arp.c:230
++ #, c-format
++ msgid "No ARP entry for %s\n"
++ msgstr "Pas d'entrée ARP pour %s\n"
++ 
++-#: ../arp.c:239
+++#: ../arp.c:248
++ #, fuzzy, c-format
++ msgid "arp: cant get HW-Address for `%s': %s.\n"
++ msgstr "rarp: ne peut définir l'entrée depuis %s:%u\n"
++ 
++-#: ../arp.c:243
+++#: ../arp.c:252
+++#, c-format
++ msgid "arp: protocol type mismatch.\n"
++ msgstr ""
++ 
++-#: ../arp.c:252
+++#: ../arp.c:261
++ #, c-format
++ msgid "arp: device `%s' has HW address %s `%s'.\n"
++ msgstr ""
++ 
++-#: ../arp.c:282
+++#: ../arp.c:293
+++#, c-format
++ msgid "arp: need hardware address\n"
++ msgstr "arp: nécessite une adresse matériel\n"
++ 
++-#: ../arp.c:290
+++#: ../arp.c:301
+++#, c-format
++ msgid "arp: invalid hardware address\n"
++ msgstr "arp: adresse matériel invalide\n"
++ 
++-#: ../arp.c:387
+++#: ../arp.c:398
++ #, c-format
++ msgid "arp: cannot open etherfile %s !\n"
++ msgstr "arp: ne peut ouvrir le fichier ether %s !\n"
++ 
++-#: ../arp.c:403
+++#: ../arp.c:414
++ #, c-format
++ msgid "arp: format error on line %u of etherfile %s !\n"
++ msgstr "arp: erreur de format ligne %u du fichier ether %s !\n"
++ 
++-#: ../arp.c:416
+++#: ../arp.c:427
++ #, c-format
++ msgid "arp: cannot set entry on line %u of etherfile %s !\n"
++ msgstr "arp: ne peut définir l'entrée en ligne %u du fichier ether %s !\n"
++ 
++-#: ../arp.c:437
++-msgid "Address\t\t\tHWtype\tHWaddress\t    Flags Mask\t\t  Iface\n"
+++#: ../arp.c:448
+++#, fuzzy, c-format
+++msgid ""
+++"Address                  HWtype  HWaddress           Flags Mask            "
+++"Iface\n"
++ msgstr "Adresse\t\t\tTypeMap\tAdresseMat\t   Indicateurs\t\t  Iface\n"
++ 
++-#: ../arp.c:467
+++#: ../arp.c:476
+++#, fuzzy
+++msgid "<from_interface>"
+++msgstr "%s: interface inconnue: %s\n"
+++
+++#: ../arp.c:478
++ msgid "(incomplete)"
++ msgstr ""
++ 
++-#: ../arp.c:484
+++#: ../arp.c:495
++ #, c-format
++ msgid "%s (%s) at "
++ msgstr ""
++ 
++-#: ../arp.c:490
+++#: ../arp.c:501
+++#, c-format
++ msgid "<incomplete> "
++ msgstr ""
++ 
++-#: ../arp.c:496
+++#: ../arp.c:507
++ #, c-format
++ msgid "netmask %s "
++ msgstr ""
++ 
++-#: ../arp.c:513
+++#: ../arp.c:524
++ #, c-format
++ msgid "on %s\n"
++ msgstr ""
++ 
++-#: ../arp.c:592
+++#: ../arp.c:605
++ #, c-format
++ msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
++ msgstr "Entrées: %d\tIgnorées: %d\tTrouvées: %d\n"
++ 
++-#: ../arp.c:596
+++#: ../arp.c:609
++ #, c-format
++ msgid "%s (%s) -- no entry\n"
++ msgstr ""
++ 
++-#: ../arp.c:598
+++#: ../arp.c:611
++ #, c-format
++ msgid "arp: in %d entries no match found.\n"
++ msgstr "arp: aucune correspondance trouvée dans %d entrées\n"
++ 
++-#: ../arp.c:613
+++#: ../arp.c:626
+++#, c-format
++ msgid ""
++ "Usage:\n"
++ "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
++ "cache\n"
++ msgstr ""
++ "Syntaxe:\n"
++-"  arp [-vn]  [<MAT>] [-i <if>] [-a] [<hôte>]              <-Affiche cache "
++-"ARP\n"
+++"  arp [-vn]  [<MAT>] [-i <if>] [-a] [<hôte>]              <-Affiche cache ARP\n"
++ 
++-#: ../arp.c:614
+++#: ../arp.c:627
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP "
+++"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
++ "entry\n"
++-msgstr ""
++-"  arp [-v]          [-i <if>] -d  <hôte> [pub][nopub]     <-Supprime entrée "
++-"ARP\n"
+++msgstr "  arp [-v]          [-i <if>] -d  <hôte> [pub][nopub]     <-Supprime entrée ARP\n"
++ 
++-#: ../arp.c:615
++-#, fuzzy
+++#: ../arp.c:628
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from "
+++"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
++ "file\n"
++-msgstr ""
++-"  arp [-vnD] [<MAT>] [-i <if>] -f  <fichier>              <-Ajout entrée "
++-"depuis fichier\n"
+++msgstr "  arp [-vnD] [<MAT>] [-i <if>] -f  <fichier>              <-Ajout entrée depuis fichier\n"
++ 
++-#: ../arp.c:616
+++#: ../arp.c:629
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add "
+++"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
++ "entry\n"
++-msgstr ""
++-"  arp [-v]   [<MAT>] [-i <if>] -s  <hôte> <adrmat> [temp][nopub] <-Ajout "
++-"entrée\n"
+++msgstr "  arp [-v]   [<MAT>] [-i <if>] -s  <hôte> <adrmat> [temp][nopub] <-Ajout entrée\n"
++ 
++-#: ../arp.c:617
++-msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
++-"<-''-\n"
++-msgstr ""
++-"  arp [-v]   [<MAT>] [-i <if>] -s  <hôte> <adrmat> [netmask <nm>] pub  "
++-"<-''-\n"
++-
++-#: ../arp.c:618
+++#: ../arp.c:630
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      "
+++"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
++ "<-''-\n"
++ "\n"
++ msgstr ""
++-"  arp [-v]   [<MAT>] [-i <if>] -Ds <hôte> <if> [netmask <nm>] pub      "
++-"<-''-\n"
+++"  arp [-v]   [<MAT>] [-i <if>] -Ds <hôte> <if> [netmask <nm>] pub      <-''-\n"
++ "\n"
++ 
++-#: ../arp.c:620
+++#: ../arp.c:632
+++#, c-format
++ msgid ""
++ "        -a                       display (all) hosts in alternative (BSD) "
++ "style\n"
++-msgstr ""
++-"        -a                       affiche (tous) les hôtes en style BSD\n"
+++msgstr "        -a                       affiche (tous) les hôtes en style BSD\n"
++ 
++-#: ../arp.c:621
+++#: ../arp.c:633
+++#, c-format
++ msgid "        -s, --set                set a new ARP entry\n"
++ msgstr "        -s, --set                définit une nouvelle entrée ARP\n"
++ 
++-#: ../arp.c:622
+++#: ../arp.c:634
+++#, c-format
++ msgid "        -d, --delete             delete a specified entry\n"
++ msgstr "        -d, --delete             supprime une entrée\n"
++ 
++-#: ../arp.c:623 ../netstat.c:1436 ../route.c:85
+++#: ../arp.c:635 ../netstat.c:1503 ../route.c:86
+++#, c-format
++ msgid "        -v, --verbose            be verbose\n"
++ msgstr "        -v, --verbose            mode verbeux\n"
++ 
++-#: ../arp.c:624 ../netstat.c:1437 ../route.c:86
++-msgid "        -n, --numeric            dont resolve names\n"
+++#: ../arp.c:636 ../netstat.c:1504 ../route.c:87
+++#, fuzzy, c-format
+++msgid "        -n, --numeric            don't resolve names\n"
++ msgstr "        -n, --numeric            ne résout pas les noms\n"
++ 
++-#: ../arp.c:625
+++#: ../arp.c:637
+++#, c-format
++ msgid ""
++ "        -i, --device             specify network interface (e.g. eth0)\n"
++-msgstr ""
++-"        -i, --device             spécifie l'interface réseau (p.ex. eth0)\n"
+++msgstr "        -i, --device             spécifie l'interface réseau (p.ex. eth0)\n"
++ 
++-#: ../arp.c:626
+++#: ../arp.c:638
+++#, c-format
++ msgid "        -D, --use-device         read <hwaddr> from given device\n"
++-msgstr ""
++-"        -D, --use-device         lit l'<adrmat> depuis le périphérique\n"
+++msgstr "        -D, --use-device         lit l'<adrmat> depuis le périphérique\n"
++ 
++-#: ../arp.c:627
++-#, fuzzy
+++#: ../arp.c:639
+++#, fuzzy, c-format
++ msgid "        -A, -p, --protocol       specify protocol family\n"
++ msgstr "        -r, --route              affiche la table de routage\n"
++ 
++-#: ../arp.c:628
++-#, fuzzy
+++#: ../arp.c:640
+++#, fuzzy, c-format
++ msgid ""
++-"        -f, --file               read new entries from file or from "
++-"/etc/ethers\n"
+++"        -f, --file               read new entries from file or from /etc/"
+++"ethers\n"
++ "\n"
++ msgstr ""
++ "        -f, --file               lit les nouvelles entrées dans le fichier\n"
++ "\n"
++ 
++-#: ../arp.c:630 ../rarp.c:181
+++#: ../arp.c:642 ../rarp.c:182
++ #, c-format
++ msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
++-msgstr ""
++-"  <HW>=Utilisez '-H <hw>' pour spécifier le type d'adresse matériel. Défaut: "
++-"%s\n"
+++msgstr "  <HW>=Utilisez '-H <hw>' pour spécifier le type d'adresse matériel. Défaut: %s\n"
++ 
++-#: ../arp.c:631 ../rarp.c:182
+++#: ../arp.c:643 ../rarp.c:183
+++#, c-format
++ msgid "  List of possible hardware types (which support ARP):\n"
++ msgstr "  Liste les types de matériels supportant ARP:\n"
++ 
++-#: ../arp.c:664
+++#: ../arp.c:677 ../arp.c:762
++ #, c-format
++ msgid "%s: hardware type not supported!\n"
++ msgstr "%s: type de matétiel non supporté !\n"
++ 
++-#: ../arp.c:668
+++#: ../arp.c:681
++ #, c-format
++ msgid "%s: address family not supported!\n"
++ msgstr "%s: famille d'adresses non supportée !\n"
++ 
++-#: ../arp.c:703
++-#, fuzzy
+++#: ../arp.c:716
+++#, fuzzy, c-format
++ msgid "arp: -N not yet supported.\n"
++ msgstr "Table de routage pour `ddp' pas encore supporté.\n"
++ 
++-#: ../arp.c:713
+++#: ../arp.c:726
++ #, c-format
++ msgid "arp: %s: unknown address family.\n"
++ msgstr "arp: %s: famille d'adresses inconnue.\n"
++ 
++-#: ../arp.c:722
+++#: ../arp.c:735
++ #, c-format
++ msgid "arp: %s: unknown hardware type.\n"
++ msgstr "arp: %s: type de matériel inconnu.\n"
++ 
++-#: ../arp.c:741
+++#: ../arp.c:754
++ #, c-format
++ msgid "arp: %s: kernel only supports 'inet'.\n"
++ msgstr "arp: %s: le noyau ne supporte que 'inet'.\n"
++ 
++-#: ../arp.c:746
+++#: ../arp.c:767
++ #, c-format
++ msgid "arp: %s: hardware type without ARP support.\n"
++ msgstr "arp: %s: type de matériel sans support ARP.\n"
++ 
++-#: ../hostname.c:69
+++#: ../hostname.c:71
++ #, c-format
++ msgid "Setting nodename to `%s'\n"
++ msgstr "Définit le nom de noeud à `%s'\n"
++ 
++-#: ../hostname.c:74
+++#: ../hostname.c:76
++ #, c-format
++ msgid "%s: you must be root to change the node name\n"
++ msgstr "%s: vous devez être root pour changer le nom de noeud\n"
++ 
++-#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116
+++#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117
++ #, c-format
++ msgid "%s: name too long\n"
++ msgstr "%s: nom trop long\n"
++ 
++-#: ../hostname.c:89
+++#: ../hostname.c:91
++ #, c-format
++ msgid "Setting hostname to `%s'\n"
++ msgstr "Définit le nom d'hôte à `%s'\n"
++ 
++-#: ../hostname.c:94
+++#: ../hostname.c:96
++ #, c-format
++ msgid "%s: you must be root to change the host name\n"
++ msgstr "%s: vous devez être root pour changer le nom d'hôte\n"
++ 
++-#: ../hostname.c:108
+++#: ../hostname.c:109
++ #, c-format
++ msgid "Setting domainname to `%s'\n"
++ msgstr "Définit le nom de domaine à `%s'\n"
++ 
++-#: ../hostname.c:113
+++#: ../hostname.c:114
++ #, c-format
++ msgid "%s: you must be root to change the domain name\n"
++ msgstr "%s: vous devez être root pour changer le nom de domaine\n"
++@@ -303,38 +308,36 @@ msgstr "Résultat : h_aliases=`%s'\n"
++ msgid "Result: h_addr_list=`%s'\n"
++ msgstr "Résultat : h_addr_list=`%s'\n"
++ 
++-#: ../hostname.c:209
+++#: ../hostname.c:208
++ #, c-format
++ msgid "%s: can't open `%s'\n"
++ msgstr "%s: ne peut ouvrir `%s'\n"
++ 
++-#: ../hostname.c:223
+++#: ../hostname.c:222
+++#, c-format
++ msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
++-msgstr ""
++-"Syntaxe : hostname [-v] {hôte|-F fichier}      définit le nom d'hôte (depuis "
++-"le fichier)\n"
+++msgstr "Syntaxe : hostname [-v] {hôte|-F fichier}      définit le nom d'hôte (depuis le fichier)\n"
++ 
++-#: ../hostname.c:224
+++#: ../hostname.c:223
+++#, c-format
++ msgid ""
++ "       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
++-msgstr ""
++-"       domainname [-v] {domaine_nis|-F fichier}   définit le domaine NIS "
++-"(depuis le fichier)\n"
+++msgstr "       domainname [-v] {domaine_nis|-F fichier}   définit le domaine NIS (depuis le fichier)\n"
++ 
++-#: ../hostname.c:226
++-#, fuzzy
+++#: ../hostname.c:225
+++#, fuzzy, c-format
++ msgid ""
++ "       nodename [-v] {nodename|-F file}      set DECnet node name (from "
++ "file)\n"
++-msgstr ""
++-"       nodename [-v] {nom_noeud|-F fichier}      Définit le nom de noeud "
++-"DECnet (depuis le fichier)\n"
+++msgstr "       nodename [-v] {nom_noeud|-F fichier}      Définit le nom de noeud DECnet (depuis le fichier)\n"
++ 
++-#: ../hostname.c:228
+++#: ../hostname.c:227
+++#, c-format
++ msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
++ msgstr "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  affiche le nom formatté\n"
++ 
++-#: ../hostname.c:229
+++#: ../hostname.c:228
+++#, c-format
++ msgid ""
++ "       hostname [-v]                         display hostname\n"
++ "\n"
++@@ -342,7 +345,8 @@ msgstr ""
++ "       hostname [-v]                         affiche le nom d'hôte\n"
++ "\n"
++ 
++-#: ../hostname.c:230
+++#: ../hostname.c:229
+++#, c-format
++ msgid ""
++ "       hostname -V|--version|-h|--help       print info and exit\n"
++ "\n"
++@@ -350,7 +354,8 @@ msgstr ""
++ "       hostname -V|--version|-h|--help       affiche des infos et termine\n"
++ "\n"
++ 
++-#: ../hostname.c:231
+++#: ../hostname.c:230
+++#, c-format
++ msgid ""
++ "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
++ "\n"
++@@ -358,45 +363,52 @@ msgstr ""
++ "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
++ "\n"
++ 
++-#: ../hostname.c:232
+++#: ../hostname.c:231
+++#, c-format
++ msgid "    -s, --short           short host name\n"
++ msgstr "    -s, --short           nom d'hôte court\n"
++ 
++-#: ../hostname.c:233
+++#: ../hostname.c:232
+++#, c-format
++ msgid "    -a, --alias           alias names\n"
++ msgstr "    -a, --alias           noms d'alias\n"
++ 
++-#: ../hostname.c:234
+++#: ../hostname.c:233
+++#, c-format
++ msgid "    -i, --ip-address      addresses for the hostname\n"
++ msgstr "    -i, --ip-address      adresses de l'hôte\n"
++ 
++-#: ../hostname.c:235
+++#: ../hostname.c:234
+++#, c-format
++ msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
++ msgstr "    -f, --fqdn, --long    nom d'hôte long (FQDN)\n"
++ 
++-#: ../hostname.c:236
+++#: ../hostname.c:235
+++#, c-format
++ msgid "    -d, --domain          DNS domain name\n"
++ msgstr "    -d, --domain          nom de domaine DNS\n"
++ 
++-#: ../hostname.c:237
+++#: ../hostname.c:236
+++#, c-format
++ msgid "    -y, --yp, --nis       NIS/YP domainname\n"
++ msgstr "    -y, --yp, --nis       nom de domaine NIS/YP\n"
++ 
++-#: ../hostname.c:239
+++#: ../hostname.c:238
+++#, c-format
++ msgid "    -n, --node            DECnet node name\n"
++ msgstr "    -n, --node            nom de noeud DECnet\n"
++ 
++-#: ../hostname.c:241
++-#, fuzzy
+++#: ../hostname.c:240
+++#, fuzzy, c-format
++ msgid ""
++ "    -F, --file            read hostname or NIS domainname from given file\n"
++ "\n"
++ msgstr ""
++-"    -F, --file            lit le nom d'hôte ou le nom de domaine NIS depuis "
++-"le fichier\n"
+++"    -F, --file            lit le nom d'hôte ou le nom de domaine NIS depuis le fichier\n"
++ "\n"
++ 
++-#: ../hostname.c:243
+++#: ../hostname.c:242
+++#, c-format
++ msgid ""
++ "   This command can read or set the hostname or the NIS domainname. You can\n"
++ "   also read the DNS domain or the FQDN (fully qualified domain name).\n"
++@@ -411,15 +423,16 @@ msgid "%s: You can't change the DNS doma
++ msgstr "%s: Vous ne pouvez changer le nom de domaine DNS avec cette commande\n"
++ 
++ #: ../hostname.c:339
+++#, c-format
++ msgid ""
++ "\n"
++ "Unless you are using bind or NIS for host lookups you can change the DNS\n"
++ msgstr ""
++ "\n"
++-"Sauf si vous utilisez bind ou NIS pour les recherches d'hôtes, vous pouvez "
++-"changer le\n"
+++"Sauf si vous utilisez bind ou NIS pour les recherches d'hôtes, vous pouvez changer le\n"
++ 
++ #: ../hostname.c:340
+++#, c-format
++ msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
++ msgstr ""
++ "nom de domaine DNS (qui fait partie du FQDN) dans le fichier /etc/hosts.\n"
++@@ -439,554 +452,453 @@ msgstr "getdomainname()=`%s'\n"
++ msgid "getnodename()=`%s'\n"
++ msgstr "getnodename()=`%s'\n"
++ 
++-#: ../ifconfig.c:159
++-#, c-format
++-msgid "%-9.9s Link encap:%s  "
++-msgstr "%-9.9s Lien encap:%s  "
+++#: ../ifconfig.c:107
+++#, fuzzy, c-format
+++msgid ""
+++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
+++"Flg\n"
+++msgstr ""
+++"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
+++"Indic\n"
++ 
++-#: ../ifconfig.c:164
++-#, c-format
++-msgid "HWaddr %s  "
++-msgstr "HWaddr %s  "
+++#: ../ifconfig.c:129 ../ifconfig.c:161
+++#, fuzzy, c-format
+++msgid "%s: ERROR while getting interface flags: %s\n"
+++msgstr "%s: erreur lors de la recherche d'infos sur l'interface: %s\n"
++ 
++-#: ../ifconfig.c:167
+++#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
+++#: ../ifconfig.c:973
++ #, c-format
++-msgid "Media:%s"
++-msgstr "Media:%s"
+++msgid "No support for INET on this system.\n"
+++msgstr "Pas de support de INET sur ce système.\n"
++ 
++-#: ../ifconfig.c:169
++-msgid "(auto)"
++-msgstr "(auto)"
+++#: ../ifconfig.c:193
+++#, fuzzy, c-format
+++msgid "%s: ERROR while testing interface flags: %s\n"
+++msgstr "%s: erreur lors de la recherche d'infos sur l'interface: %s\n"
++ 
++-#: ../ifconfig.c:176
++-#, c-format
++-msgid "          %s addr:%s "
++-msgstr "          %s adr:%s "
+++#: ../ifconfig.c:202
+++#, fuzzy, c-format
+++msgid ""
+++"Usage:\n"
+++"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
+++msgstr ""
+++"Syntaxe:\n"
+++"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <adresse>]\n"
++ 
++-#: ../ifconfig.c:179
+++#: ../ifconfig.c:204
++ #, c-format
++-msgid " P-t-P:%s "
++-msgstr " P-t-P:%s "
+++msgid "  [add <address>[/<prefixlen>]]\n"
+++msgstr "  [add <adresse>[/<lg_prefixe>]]\n"
++ 
++-#: ../ifconfig.c:182
+++#: ../ifconfig.c:205
++ #, c-format
++-msgid " Bcast:%s "
++-msgstr " Bcast:%s "
+++msgid "  [del <address>[/<prefixlen>]]\n"
+++msgstr "  [del <adresse>[/<lg_prefixe>]]\n"
++ 
++-#: ../ifconfig.c:184
+++#: ../ifconfig.c:206
++ #, c-format
++-msgid " Mask:%s\n"
++-msgstr " Masque:%s\n"
+++msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
+++msgstr "  [[-]broadcast [<adresse>]]  [[-]pointopoint [<adresse>]]\n"
++ 
++-#: ../ifconfig.c:201
++-#, c-format
++-msgid "          inet6 addr: %s/%d"
++-msgstr "          adr inet6: %s/%d"
+++#: ../ifconfig.c:207
+++#, fuzzy, c-format
+++msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
+++msgstr "  [netmask <adresse>]  [dstaddr <adresse>]  [tunnel <adresse>]\n"
++ 
++-#: ../ifconfig.c:203
++-msgid " Scope:"
++-msgstr " Scope:"
+++#: ../ifconfig.c:210
+++#, c-format
+++msgid "  [outfill <NN>] [keepalive <NN>]\n"
+++msgstr "  [outfill <NN>] [keepalive <NN>]\n"
++ 
++-#: ../ifconfig.c:206
++-msgid "Global"
++-msgstr "Global"
+++#: ../ifconfig.c:212
+++#, c-format
+++msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
+++msgstr "  [hw <HW> <adresse>]  [metric <NN>]  [mtu <NN>]\n"
++ 
++-#: ../ifconfig.c:209
++-msgid "Link"
++-msgstr "Lien"
+++#: ../ifconfig.c:213
+++#, c-format
+++msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
+++msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
++ 
++-#: ../ifconfig.c:212
++-msgid "Site"
++-msgstr "Site"
+++#: ../ifconfig.c:214
+++#, c-format
+++msgid "  [multicast]  [[-]promisc]\n"
+++msgstr "  [multicast]  [[-]promisc]\n"
++ 
++ #: ../ifconfig.c:215
++-msgid "Compat"
++-msgstr "Compat"
+++#, c-format
+++msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
+++msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
++ 
++-#: ../ifconfig.c:218
++-msgid "Host"
++-msgstr "Hôte"
+++#: ../ifconfig.c:217
+++#, fuzzy, c-format
+++msgid "  [txqueuelen <NN>]\n"
+++msgstr "  [txqueuelen longueur]\n"
++ 
++-#: ../ifconfig.c:221
++-msgid "Unknown"
++-msgstr "Inconnu"
+++#: ../ifconfig.c:220
+++#, c-format
+++msgid "  [[-]dynamic]\n"
+++msgstr "  [[-]dynamic]\n"
++ 
++-#: ../ifconfig.c:236
+++#: ../ifconfig.c:222
++ #, c-format
++-msgid "          IPX/Ethernet II addr:%s\n"
++-msgstr "          adr IPX/Ethernet II:%s\n"
+++msgid ""
+++"  [up|down] ...\n"
+++"\n"
+++msgstr ""
+++"  [up|down] ...\n"
+++"\n"
++ 
++-#: ../ifconfig.c:239
+++#: ../ifconfig.c:224
++ #, c-format
++-msgid "          IPX/Ethernet SNAP addr:%s\n"
++-msgstr "          adr IPX/Ethernet SNAP:%s\n"
+++msgid "  <HW>=Hardware Type.\n"
+++msgstr "  <HW>=Type de matériel.\n"
++ 
++-#: ../ifconfig.c:242
+++#: ../ifconfig.c:225
++ #, c-format
++-msgid "          IPX/Ethernet 802.2 addr:%s\n"
++-msgstr "          adr IPX/Ethernet 802.2:%s\n"
+++msgid "  List of possible hardware types:\n"
+++msgstr "  Liste des types de matériels possibles:\n"
++ 
++-#: ../ifconfig.c:245
+++#. 1 = ARPable
+++#: ../ifconfig.c:227
++ #, c-format
++-msgid "          IPX/Ethernet 802.3 addr:%s\n"
++-msgstr "          adr IPX/Ethernet 802.3:%s\n"
+++msgid "  <AF>=Address family. Default: %s\n"
+++msgstr "  <AF>=famille d'Adresses. Défaut: %s\n"
++ 
++-#: ../ifconfig.c:255
+++#: ../ifconfig.c:228
++ #, c-format
++-msgid "          EtherTalk Phase 2 addr:%s\n"
++-msgstr "          adr EtherTalk Phase 2:%s\n"
+++msgid "  List of possible address families:\n"
+++msgstr "  Liste des familles d'adresses possibles:\n"
++ 
++-#: ../ifconfig.c:264
+++#: ../ifconfig.c:303
++ #, c-format
++-msgid "          econet addr:%s\n"
++-msgstr "          adr econet:%s\n"
+++msgid "ifconfig: option `%s' not recognised.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:270
++-msgid "[NO FLAGS] "
++-msgstr "[PAS INDICATEURS] "
+++#: ../ifconfig.c:305 ../ifconfig.c:962
+++#, c-format
+++msgid "ifconfig: `--help' gives usage information.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:272
++-msgid "UP "
++-msgstr "UP "
+++#: ../ifconfig.c:380
+++#, c-format
+++msgid "Unknown media type.\n"
+++msgstr "Type de média inconnu.\n"
++ 
++-#: ../ifconfig.c:274
++-msgid "BROADCAST "
++-msgstr "BROADCAST "
+++#: ../ifconfig.c:417
+++#, c-format
+++msgid ""
+++"Warning: Interface %s still in promisc mode... maybe other application is "
+++"running?\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:276
++-msgid "DEBUG "
++-msgstr "DEBUG "
+++#: ../ifconfig.c:429
+++#, c-format
+++msgid "Warning: Interface %s still in MULTICAST mode.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:278
++-msgid "LOOPBACK "
++-msgstr "LOOPBACK "
+++#: ../ifconfig.c:441
+++#, c-format
+++msgid "Warning: Interface %s still in ALLMULTI mode.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:280
++-msgid "POINTOPOINT "
++-msgstr "POINTOPOINT "
+++#: ../ifconfig.c:465
+++#, c-format
+++msgid "Warning: Interface %s still in DYNAMIC mode.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:282
++-msgid "NOTRAILERS "
++-msgstr "NOTRAILERS "
+++#: ../ifconfig.c:523
+++#, c-format
+++msgid "Warning: Interface %s still in BROADCAST mode.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:284
++-msgid "RUNNING "
++-msgstr "RUNNING "
+++#: ../ifconfig.c:652
+++#, c-format
+++msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:286
++-msgid "NOARP "
++-msgstr "NOARP "
+++#: ../ifconfig.c:684
+++#, c-format
+++msgid "hw address type `%s' has no handler to set address. failed.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:288
++-msgid "PROMISC "
++-msgstr "PROMISC "
+++#: ../ifconfig.c:693
+++#, c-format
+++msgid "%s: invalid %s address.\n"
+++msgstr "%s: adresse %s invalide.\n"
++ 
++-#: ../ifconfig.c:290
++-msgid "ALLMULTI "
++-msgstr "ALLMULTI "
++-
++-#: ../ifconfig.c:292
++-msgid "SLAVE "
++-msgstr "SLAVE "
++-
++-#: ../ifconfig.c:294
++-msgid "MASTER "
++-msgstr "MASTER "
++-
++-#: ../ifconfig.c:296
++-msgid "MULTICAST "
++-msgstr "MULTICAST "
++-
++-#: ../ifconfig.c:299
++-msgid "DYNAMIC "
++-msgstr "DYNAMIC "
++-
++-#: ../ifconfig.c:302
++-#, c-format
++-msgid " MTU:%d  Metric:%d"
++-msgstr " MTU:%d  Metric:%d"
++-
++-#: ../ifconfig.c:306
++-#, c-format
++-msgid "  Outfill:%d  Keepalive:%d"
++-msgstr "  Outfill:%d  Keepalive:%d"
++-
++-#: ../ifconfig.c:320
++-#, c-format
++-msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
++-msgstr "Paquets Reçus:%lu erreurs:%lu jetés:%lu débordements:%lu trames:%lu\n"
++-
++-#: ../ifconfig.c:325
++-#, c-format
++-msgid "             compressed:%lu\n"
++-msgstr "             compressés:%lu\n"
++-
++-#: ../ifconfig.c:329
++-#, c-format
++-msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
++-msgstr ""
++-"Paquets transmis:%lu erreurs:%lu jetés:%lu débordements:%lu carrier:%lu\n"
++-
++-#: ../ifconfig.c:333
+++#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
++ #, c-format
++-msgid "          collisions:%lu "
++-msgstr "          collisions:%lu "
++-
++-#: ../ifconfig.c:335
++-#, c-format
++-msgid "compressed:%lu "
++-msgstr "compressés:%lu "
++-
++-#: ../ifconfig.c:337
++-#, c-format
++-msgid "txqueuelen:%d "
++-msgstr "lg file transmission:%d "
++-
++-#: ../ifconfig.c:345
++-#, c-format
++-msgid "Interrupt:%d "
++-msgstr "Interruption:%d "
++-
++-#. Only print devices using it for
++-#. I/O maps
++-#: ../ifconfig.c:348
++-#, c-format
++-msgid "Base address:0x%x "
++-msgstr "Adresse de base:0x%x "
++-
++-#: ../ifconfig.c:350
++-#, c-format
++-msgid "Memory:%lx-%lx "
++-msgstr "Mémoire:%lx-%lx "
++-
++-#: ../ifconfig.c:353
++-#, c-format
++-msgid "DMA chan:%x "
++-msgstr "Canal DMA:%x "
+++msgid "No support for INET6 on this system.\n"
+++msgstr "Pas de support de INET6 sur ce système.\n"
++ 
++-#: ../ifconfig.c:384 ../ifconfig.c:405
+++#: ../ifconfig.c:780 ../ifconfig.c:871
++ #, c-format
++-msgid "%s: unknown interface: %s\n"
++-msgstr "%s: interface inconnue: %s\n"
++-
++-#: ../ifconfig.c:421
++-msgid ""
++-"Usage:\n"
++-"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <address>]\n"
++-msgstr ""
++-"Syntaxe:\n"
++-"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <adresse>]\n"
++-
++-#: ../ifconfig.c:425
++-msgid "  [add <address>[/<prefixlen>]]\n"
++-msgstr "  [add <adresse>[/<lg_prefixe>]]\n"
++-
++-#: ../ifconfig.c:427
++-msgid "  [del <address>[/<prefixlen>]]\n"
++-msgstr "  [del <adresse>[/<lg_prefixe>]]\n"
++-
++-#: ../ifconfig.c:432
++-msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
++-msgstr "  [[-]broadcast [<adresse>]]  [[-]pointopoint [<adresse>]]\n"
++-
++-#: ../ifconfig.c:433
++-#, fuzzy
++-msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
++-msgstr "  [netmask <adresse>]  [dstaddr <adresse>]  [tunnel <adresse>]\n"
++-
++-#: ../ifconfig.c:436
++-msgid "  [outfill <NN>] [keepalive <NN>]\n"
++-msgstr "  [outfill <NN>] [keepalive <NN>]\n"
++-
++-#: ../ifconfig.c:438
++-msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
++-msgstr "  [hw <HW> <adresse>]  [metric <NN>]  [mtu <NN>]\n"
++-
++-#: ../ifconfig.c:439
++-msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
++-msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
++-
++-#: ../ifconfig.c:440
++-msgid "  [multicast]  [[-]promisc]\n"
++-msgstr "  [multicast]  [[-]promisc]\n"
++-
++-#: ../ifconfig.c:441
++-msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
++-msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
++-
++-#: ../ifconfig.c:443
++-#, fuzzy
++-msgid "  [txqueuelen <NN>]\n"
++-msgstr "  [txqueuelen longueur]\n"
++-
++-#: ../ifconfig.c:446
++-msgid "  [[-]dynamic]\n"
++-msgstr "  [[-]dynamic]\n"
++-
++-#: ../ifconfig.c:448
++-msgid ""
++-"  [up|down] ...\n"
++-"\n"
+++msgid "Interface %s not initialized\n"
++ msgstr ""
++-"  [up|down] ...\n"
++-"\n"
++-
++-#: ../ifconfig.c:450
++-msgid "  <HW>=Hardware Type.\n"
++-msgstr "  <HW>=Type de matériel.\n"
++-
++-#: ../ifconfig.c:451
++-msgid "  List of possible hardware types:\n"
++-msgstr "  Liste des types de matériels possibles:\n"
++-
++-#. 1 = ARPable
++-#: ../ifconfig.c:453
++-#, c-format
++-msgid "  <AF>=Address family. Default: %s\n"
++-msgstr "  <AF>=famille d'Adresses. Défaut: %s\n"
++-
++-#: ../ifconfig.c:454
++-msgid "  List of possible address families:\n"
++-msgstr "  Liste des familles d'adresses possibles:\n"
++-
++-#: ../ifconfig.c:593
++-msgid "Unknown media type.\n"
++-msgstr "Type de média inconnu.\n"
++ 
++-#: ../ifconfig.c:881
++-#, c-format
++-msgid "%s: invalid %s address.\n"
+++#: ../ifconfig.c:792 ../ifconfig.c:882
+++#, fuzzy, c-format
+++msgid "Bad address.\n"
++ msgstr "%s: adresse %s invalide.\n"
++ 
++-#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011
++-msgid "No support for INET6 on this system.\n"
++-msgstr "Pas de support de INET6 sur ce système.\n"
++-
++-#: ../ifconfig.c:983
+++#: ../ifconfig.c:885
+++#, c-format
++ msgid "Address deletion not supported on this system.\n"
++ msgstr "Suppression d'adresses pas supporté par ce système.\n"
++ 
++-#: ../ifconfig.c:1066
++-msgid "No support for INET on this system.\n"
++-msgstr "Pas de support de INET sur ce système.\n"
+++#: ../ifconfig.c:957
+++#, fuzzy, c-format
+++msgid "ifconfig: Cannot set address for this protocol family.\n"
+++msgstr "Ne sait pas comment définir les adresses pour la famille %d.\n"
++ 
++-#: ../ifconfig.c:1076
+++#: ../ifconfig.c:983
+++#, c-format
++ msgid "No support for ECONET on this system.\n"
++ msgstr "Pas de support de ECONET sur ce système.\n"
++ 
++-#: ../ifconfig.c:1084
+++#: ../ifconfig.c:991
++ #, c-format
++ msgid "Don't know how to set addresses for family %d.\n"
++ msgstr "Ne sait pas comment définir les adresses pour la famille %d.\n"
++ 
++-#: ../netstat.c:383
+++#: ../ifconfig.c:1021
+++#, c-format
+++msgid "WARNING: at least one error occured. (%d)\n"
+++msgstr ""
+++
+++#: ../netstat.c:434
++ #, c-format
++ msgid ""
++ "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
++-msgstr ""
++-"(Pas d'infos lues pour \"-p\": geteuid()=%d mais vous devez être root.)\n"
+++msgstr "(Pas d'infos lues pour \"-p\": geteuid()=%d mais vous devez être root.)\n"
++ 
++-#: ../netstat.c:387
+++#: ../netstat.c:438
+++#, c-format
++ msgid ""
++ "(Not all processes could be identified, non-owned process info\n"
++ " will not be shown, you would have to be root to see it all.)\n"
++ msgstr ""
++ "(Tous les processus ne peuvent être identifiés, les infos sur les processus\n"
++-"non possédés ne seront pas affichées, vous devez être root pour les voir "
++-"toutes.)\n"
+++"non possédés ne seront pas affichées, vous devez être root pour les voir toutes.)\n"
++ 
++-#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166
+++#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
++ msgid "LISTENING"
++ msgstr "LISTENING"
++ 
++-#: ../netstat.c:395
+++#: ../netstat.c:446
++ msgid "CONN SENT"
++ msgstr "CONN SENT"
++ 
++-#: ../netstat.c:396 ../netstat.c:1168
+++#: ../netstat.c:447 ../netstat.c:1268
++ msgid "DISC SENT"
++ msgstr "DISC SENT"
++ 
++-#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169
+++#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
++ msgid "ESTABLISHED"
++ msgstr "ESTABLISHED"
++ 
++-#: ../netstat.c:419
+++#: ../netstat.c:470
+++#, c-format
++ msgid "Active NET/ROM sockets\n"
++ msgstr "sockets NET/ROM actives\n"
++ 
++-#: ../netstat.c:420
+++#: ../netstat.c:471
+++#, c-format
++ msgid ""
++-"User       Dest       Source     Device  State        Vr/Vs    Send-Q  "
++-"Recv-Q\n"
+++"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
+++"Q\n"
++ msgstr ""
++-"Utilisatr  Dest       Source     Periph  Etat         Vr/Vs    Send-Q  "
++-"Recv-Q\n"
+++"Utilisatr  Dest       Source     Periph  Etat         Vr/Vs    Send-Q  Recv-"
+++"Q\n"
++ 
++-#: ../netstat.c:430 ../netstat.c:1208
+++#: ../netstat.c:481 ../netstat.c:1308
++ #, c-format
++ msgid "Problem reading data from %s\n"
++ msgstr ""
++ 
++-#: ../netstat.c:465
+++#: ../netstat.c:516
++ msgid "SYN_SENT"
++ msgstr "SYN_SENT"
++ 
++-#: ../netstat.c:466
+++#: ../netstat.c:517
++ msgid "SYN_RECV"
++ msgstr "SYN_RECV"
++ 
++-#: ../netstat.c:467
+++#: ../netstat.c:518
++ msgid "FIN_WAIT1"
++ msgstr "FIN_WAIT1"
++ 
++-#: ../netstat.c:468
+++#: ../netstat.c:519
++ msgid "FIN_WAIT2"
++ msgstr "FIN_WAIT2"
++ 
++-#: ../netstat.c:469
+++#: ../netstat.c:520
++ msgid "TIME_WAIT"
++ msgstr "TIME_WAIT"
++ 
++-#: ../netstat.c:470
+++#: ../netstat.c:521
++ msgid "CLOSE"
++ msgstr "CLOSE"
++ 
++-#: ../netstat.c:471
+++#: ../netstat.c:522
++ msgid "CLOSE_WAIT"
++ msgstr "CLOSE_WAIT"
++ 
++-#: ../netstat.c:472
+++#: ../netstat.c:523
++ msgid "LAST_ACK"
++ msgstr "LAST_ACK"
++ 
++-#: ../netstat.c:473
+++#: ../netstat.c:524
++ msgid "LISTEN"
++ msgstr "LISTEN"
++ 
++-#: ../netstat.c:474
+++#: ../netstat.c:525
++ msgid "CLOSING"
++ msgstr "CLOSING"
++ 
++-#: ../netstat.c:544
+++#: ../netstat.c:596
++ #, c-format
++ msgid "warning, got bogus igmp6 line %d.\n"
++ msgstr "attention, ligne igmp6 en erreur %d.\n"
++ 
++-#: ../netstat.c:549 ../netstat.c:587 ../netstat.c:670 ../netstat.c:803
++-#: ../netstat.c:935 ../netstat.c:940
+++#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
+++#: ../netstat.c:1032 ../netstat.c:1037
++ #, c-format
++ msgid "netstat: unsupported address family %d !\n"
++ msgstr "netstat: famille d'adresses pas supportée %d !\n"
++ 
++-#: ../netstat.c:562 ../netstat.c:567 ../netstat.c:575 ../netstat.c:582
+++#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
++ #, c-format
++ msgid "warning, got bogus igmp line %d.\n"
++ msgstr "attention, ligne igmp6 en erreur %d.\n"
++ 
++-#: ../netstat.c:666
+++#: ../netstat.c:677
+++#, fuzzy, c-format
+++msgid "Active X.25 sockets\n"
+++msgstr "Sockets AX.25 actives\n"
+++
+++#. IMHO, Vr/Vs is not very usefull --SF
+++#: ../netstat.c:679
+++#, fuzzy, c-format
+++msgid ""
+++"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
+++"Q\n"
+++msgstr "Dest       Source     Periph  Etat         Vr/Vs    Send-Q  Recv-Q\n"
+++
+++#: ../netstat.c:759
+++#, c-format
++ msgid "warning, got bogus tcp line.\n"
++ msgstr "attention, ligne tcp en erreur.\n"
++ 
++-#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975
+++#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
++ #, c-format
++ msgid "off (0.00/%ld/%d)"
++ msgstr "off (0.00/%ld/%d)"
++ 
++-#: ../netstat.c:708
+++#: ../netstat.c:804
++ #, fuzzy, c-format
++ msgid "on (%2.2f/%ld/%d)"
++ msgstr "on%d (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:713
+++#: ../netstat.c:809
++ #, fuzzy, c-format
++ msgid "keepalive (%2.2f/%ld/%d)"
++ msgstr "on%d (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:718
+++#: ../netstat.c:814
++ #, fuzzy, c-format
++ msgid "timewait (%2.2f/%ld/%d)"
++ msgstr "on%d (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985
+++#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
++ #, c-format
++ msgid "unkn-%d (%2.2f/%ld/%d)"
++ msgstr "unkn-%d (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:799
+++#: ../netstat.c:894
+++#, c-format
++ msgid "warning, got bogus udp line.\n"
++ msgstr "attention, ligne udp en erreur.\n"
++ 
++-#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108
+++#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
++ msgid "UNKNOWN"
++ msgstr "INCONNU"
++ 
++-#: ../netstat.c:860 ../netstat.c:980
+++#: ../netstat.c:958 ../netstat.c:1080
++ #, c-format
++ msgid "on%d (%2.2f/%ld/%d)"
++ msgstr "on%d (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:949
+++#: ../netstat.c:1046
+++#, c-format
++ msgid "warning, got bogus raw line.\n"
++ msgstr "attention, ligne raw en erreur.\n"
++ 
++-#: ../netstat.c:1028
+++#: ../netstat.c:1128
+++#, c-format
++ msgid "warning, got bogus unix line.\n"
++ msgstr "attention, ligne unix en erreur.\n"
++ 
++-#: ../netstat.c:1055
+++#: ../netstat.c:1155
++ msgid "STREAM"
++ msgstr "STREAM"
++ 
++-#: ../netstat.c:1059
+++#: ../netstat.c:1159
++ msgid "DGRAM"
++ msgstr "DGRAM"
++ 
++-#: ../netstat.c:1063
+++#: ../netstat.c:1163
++ msgid "RAW"
++ msgstr "RAW"
++ 
++-#: ../netstat.c:1067
+++#: ../netstat.c:1167
++ msgid "RDM"
++ msgstr "RDM"
++ 
++-#: ../netstat.c:1071
+++#: ../netstat.c:1171
++ msgid "SEQPACKET"
++ msgstr "SEQPACKET"
++ 
++-#: ../netstat.c:1080
+++#: ../netstat.c:1180
++ msgid "FREE"
++ msgstr "LIBRE"
++ 
++-#: ../netstat.c:1096
+++#: ../netstat.c:1196
++ msgid "CONNECTING"
++ msgstr "ENCONNEXION"
++ 
++-#: ../netstat.c:1100
+++#: ../netstat.c:1200
++ msgid "CONNECTED"
++ msgstr "CONNECTE"
++ 
++-#: ../netstat.c:1104
+++#: ../netstat.c:1204
++ msgid "DISCONNECTING"
++ msgstr "ENDECONNEXION"
++ 
++-#: ../netstat.c:1135
+++#: ../netstat.c:1235
+++#, c-format
++ msgid "Active UNIX domain sockets "
++ msgstr "Sockets du domaine UNIX actives"
++ 
++-#: ../netstat.c:1137 ../netstat.c:1666
+++#: ../netstat.c:1237 ../netstat.c:1756
+++#, c-format
++ msgid "(servers and established)"
++ msgstr "(serveurs et établies)"
++ 
++-#: ../netstat.c:1140 ../netstat.c:1669
+++#: ../netstat.c:1240 ../netstat.c:1759
+++#, c-format
++ msgid "(only servers)"
++ msgstr "(seulement serveurs)"
++ 
++-#: ../netstat.c:1142 ../netstat.c:1671
+++#: ../netstat.c:1242 ../netstat.c:1761
+++#, c-format
++ msgid "(w/o servers)"
++ msgstr "(sans serveurs)"
++ 
++-#: ../netstat.c:1145
+++#: ../netstat.c:1245
+++#, c-format
++ msgid ""
++ "\n"
++ "Proto RefCnt Flags       Type       State         I-Node"
++@@ -994,32 +906,36 @@ msgstr ""
++ "\n"
++ "Proto RefCpt Indicatrs   Type       Etat          I-Node"
++ 
++-#: ../netstat.c:1147
+++#: ../netstat.c:1247
+++#, c-format
++ msgid " Path\n"
++ msgstr " Chemin\n"
++ 
++-#: ../netstat.c:1167
+++#: ../netstat.c:1267
++ msgid "SABM SENT"
++ msgstr "SABM SENT"
++ 
++-#: ../netstat.c:1170
+++#: ../netstat.c:1270
++ msgid "RECOVERY"
++ msgstr "RECOVERY"
++ 
++-#: ../netstat.c:1184
+++#: ../netstat.c:1284
+++#, c-format
++ msgid "Active AX.25 sockets\n"
++ msgstr "Sockets AX.25 actives\n"
++ 
++-#: ../netstat.c:1185
+++#: ../netstat.c:1285
+++#, c-format
++ msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
++ msgstr "Dest       Source     Periph  Etat         Vr/Vs    Send-Q  Recv-Q\n"
++ 
++-#: ../netstat.c:1228
+++#: ../netstat.c:1328
++ #, c-format
++ msgid "problem reading data from %s\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1279
+++#: ../netstat.c:1379
+++#, c-format
++ msgid ""
++ "Active IPX sockets\n"
++ "Proto Recv-Q Send-Q Local Address              Foreign Address            "
++@@ -1029,55 +945,53 @@ msgstr ""
++ "Proto Recv-Q Send-Q Adresse locale             Adresse distante           "
++ "Etat"
++ 
++-#: ../netstat.c:1281
+++#: ../netstat.c:1381
+++#, c-format
++ msgid " User"
++ msgstr "Utilisatr"
++ 
++-#: ../netstat.c:1315
+++#: ../netstat.c:1415
++ msgid "ESTAB"
++ msgstr "ESTAB"
++ 
++-#: ../netstat.c:1323
+++#: ../netstat.c:1423
++ msgid "UNK."
++ msgstr "UNK."
++ 
++-#: ../netstat.c:1367
++-msgid "     - no statistics available -"
++-msgstr ""
++-
++-#: ../netstat.c:1370
++-msgid "[NO FLAGS]"
++-msgstr "[PAS INDICATEURS]"
++-
++-#: ../netstat.c:1400
+++#: ../netstat.c:1461
+++#, c-format
++ msgid "Kernel Interface table\n"
++ msgstr "Table d'interfaces noyau\n"
++ 
++-#: ../netstat.c:1401
+++#: ../netstat.c:1465
+++#, fuzzy, c-format
++ msgid ""
++-"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
+++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
++ "Flg\n"
++ msgstr ""
++ "Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
++ "Indic\n"
++ 
++-#: ../netstat.c:1404
+++#: ../netstat.c:1469
++ msgid "missing interface information"
++ msgstr "informations d'interface manquantes"
++ 
++-#: ../netstat.c:1425
+++#: ../netstat.c:1492
+++#, c-format
++ msgid ""
++-"usage: netstat [-veenNcCF] [<Af>] -r         netstat "
++-"{-V|--version|-h|--help}\n"
+++"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
+++"help}\n"
++ msgstr ""
++-"syntaxe: netstat [-veenNcCF] [<Af>] -r         netstat "
++-"{-V|--version|-h|--help}\n"
+++"syntaxe: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
+++"help}\n"
++ 
++-#: ../netstat.c:1426
+++#: ../netstat.c:1493
+++#, c-format
++ msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
++ msgstr "       netstat [-vnNcaeol] [<Socket> ...]\n"
++ 
++-#: ../netstat.c:1427
+++#: ../netstat.c:1494
+++#, c-format
++ msgid ""
++ "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
++ "\n"
++@@ -1085,27 +999,30 @@ msgstr ""
++ "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
++ "\n"
++ 
++-#: ../netstat.c:1429
+++#: ../netstat.c:1496
+++#, c-format
++ msgid "        -r, --route              display routing table\n"
++ msgstr "        -r, --route              affiche la table de routage\n"
++ 
++-#: ../netstat.c:1430
+++#: ../netstat.c:1497
+++#, c-format
++ msgid "        -i, --interfaces         display interface table\n"
++ msgstr "        -i, --interfaces         affiche la table d'interfaces\n"
++ 
++-#: ../netstat.c:1431
+++#: ../netstat.c:1498
+++#, c-format
++ msgid "        -g, --groups             display multicast group memberships\n"
++ msgstr ""
++ "        -g, --groups             affiche les membres d'un groupe multicast\n"
++ 
++-#: ../netstat.c:1432
+++#: ../netstat.c:1499
+++#, c-format
++ msgid ""
++ "        -s, --statistics         display networking statistics (like SNMP)\n"
++-msgstr ""
++-"        -s, --statistics         affiche les statistiques réseau (comme "
++-"SNMP)\n"
+++msgstr "        -s, --statistics         affiche les statistiques réseau (comme SNMP)\n"
++ 
++-#: ../netstat.c:1434
+++#: ../netstat.c:1501
+++#, c-format
++ msgid ""
++ "        -M, --masquerade         display masqueraded connections\n"
++ "\n"
++@@ -1113,23 +1030,41 @@ msgstr ""
++ "        -M, --masquerade         affiche les connexions masquées\n"
++ "\n"
++ 
++-#: ../netstat.c:1438 ../route.c:87
+++#: ../netstat.c:1505
+++#, fuzzy, c-format
+++msgid "        --numeric-hosts          don't resolve host names\n"
+++msgstr "        -n, --numeric            ne résout pas les noms\n"
+++
+++#: ../netstat.c:1506
+++#, fuzzy, c-format
+++msgid "        --numeric-ports          don't resolve port names\n"
+++msgstr "        -n, --numeric            ne résout pas les noms\n"
+++
+++#: ../netstat.c:1507
+++#, fuzzy, c-format
+++msgid "        --numeric-users          don't resolve user names\n"
+++msgstr "        -n, --numeric            ne résout pas les noms\n"
+++
+++#: ../netstat.c:1508
+++#, c-format
++ msgid "        -N, --symbolic           resolve hardware names\n"
++ msgstr "        -N, --symbolic           résoud les noms matériels\n"
++ 
++-#: ../netstat.c:1439 ../route.c:88
++-#, fuzzy
+++#: ../netstat.c:1509 ../route.c:88
+++#, fuzzy, c-format
++ msgid "        -e, --extend             display other/more information\n"
++ msgstr ""
++ "        -e, --extend             affiche d'autres/plus d'informations\n"
++ 
++-#: ../netstat.c:1440
+++#: ../netstat.c:1510
+++#, c-format
++ msgid "        -p, --programs           display PID/Program name for sockets\n"
++ msgstr ""
++ "        -p, --programs           affiche le nom du programme/PID des "
++ "sockets\n"
++ 
++-#: ../netstat.c:1441
+++#: ../netstat.c:1511
+++#, c-format
++ msgid ""
++ "        -c, --continuous         continuous listing\n"
++ "\n"
++@@ -1137,32 +1072,31 @@ msgstr ""
++ "        -c, --continuous         listing continu\n"
++ "\n"
++ 
++-#: ../netstat.c:1442
+++#: ../netstat.c:1512
+++#, c-format
++ msgid "        -l, --listening          display listening server sockets\n"
++-msgstr ""
++-"        -l, --listening          affiche les sockets du serveur à l'écoute\n"
+++msgstr "        -l, --listening          affiche les sockets du serveur à l'écoute\n"
++ 
++-#: ../netstat.c:1443
+++#: ../netstat.c:1513
+++#, c-format
++ msgid ""
++ "        -a, --all, --listening   display all sockets (default: connected)\n"
++-msgstr ""
++-"        -a, --all, --listening   affiche toutes les prises (défaut: "
++-"connectés)\n"
+++msgstr "        -a, --all, --listening   affiche toutes les prises (défaut: connectés)\n"
++ 
++-#: ../netstat.c:1444
+++#: ../netstat.c:1514
+++#, c-format
++ msgid "        -o, --timers             display timers\n"
++ msgstr "        -o, --timers             affiche les timers\n"
++ 
++-#: ../netstat.c:1445 ../route.c:89
++-#, fuzzy
+++#: ../netstat.c:1515 ../route.c:89
+++#, fuzzy, c-format
++ msgid ""
++ "        -F, --fib                display Forwarding Information Base "
++ "(default)\n"
++-msgstr ""
++-"        -F, --fib                affiche la Forwarding Infomation Base "
++-"(défaut)\n"
+++msgstr "        -F, --fib                affiche la Forwarding Infomation Base (défaut)\n"
++ 
++-#: ../netstat.c:1446 ../route.c:90
+++#: ../netstat.c:1516 ../route.c:90
+++#, c-format
++ msgid ""
++ "        -C, --cache              display routing cache instead of FIB\n"
++ "\n"
++@@ -1170,110 +1104,118 @@ msgstr ""
++ "        -C, --cache              affiche le cache de routage au lieu de FIB\n"
++ "\n"
++ 
++-#: ../netstat.c:1448
+++#: ../netstat.c:1518
+++#, c-format
++ msgid ""
++-"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
++-"--netrom\n"
+++"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
+++"netrom\n"
++ msgstr ""
++-"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
++-"--netrom\n"
+++"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
+++"netrom\n"
++ 
++-#: ../netstat.c:1449 ../route.c:92
++-#, c-format
++-msgid "  <AF>=Use '-A <af>' or '--<af>' Default: %s\n"
+++#: ../netstat.c:1519
+++#, fuzzy, c-format
+++msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
++ msgstr "  <AF>=Utiliser '-A <af>' ou '--<af>' Défaut: %s\n"
++ 
++-#: ../netstat.c:1450 ../route.c:93
+++#: ../netstat.c:1520 ../route.c:93
+++#, c-format
++ msgid "  List of possible address families (which support routing):\n"
++ msgstr "  Liste les familles d'adresses possibles (supportant le routage):\n"
++ 
++-#: ../netstat.c:1663
+++#: ../netstat.c:1753
+++#, c-format
++ msgid "Active Internet connections "
++ msgstr "Connexions Internet actives "
++ 
++-#: ../netstat.c:1673
+++#: ../netstat.c:1763
+++#, c-format
++ msgid ""
++ "\n"
++-"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
++-"  "
+++"Proto Recv-Q Send-Q Local Address           Foreign Address         "
+++"State      "
++ msgstr ""
++ "\n"
++-"Proto Recv-Q Send-Q Adresse locale          Adresse distante        Etat     "
++-"  "
+++"Proto Recv-Q Send-Q Adresse locale          Adresse distante        "
+++"Etat       "
++ 
++-#: ../netstat.c:1675
+++#: ../netstat.c:1765
+++#, c-format
++ msgid " User       Inode     "
++ msgstr " Utilisatr  Inode     "
++ 
++-#: ../netstat.c:1678
+++#: ../netstat.c:1768
+++#, c-format
++ msgid " Timer"
++ msgstr " Timer"
++ 
++-#: ../netstat.c:1708
+++#: ../netstat.c:1798
+++#, c-format
++ msgid "IPv4 Group Memberships\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1709
+++#: ../netstat.c:1799
+++#, c-format
++ msgid "Interface       RefCnt Group\n"
++ msgstr ""
++ 
++-#: ../rarp.c:43
+++#: ../rarp.c:44
++ msgid "This kernel does not support RARP.\n"
++ msgstr "Ce noyau ne supporte pas RARP.\n"
++ 
++-#: ../rarp.c:82
+++#: ../rarp.c:83
++ #, c-format
++ msgid "no RARP entry for %s.\n"
++ msgstr "pas d'entrée RARP pour %s.\n"
++ 
++-#: ../rarp.c:95
+++#: ../rarp.c:96
++ #, c-format
++ msgid "%s: bad hardware address\n"
++ msgstr "%s: mauvaise adresse matériel\n"
++ 
++-#: ../rarp.c:127
+++#: ../rarp.c:128
++ #, c-format
++ msgid "rarp: cannot open file %s:%s.\n"
++ msgstr "rarp: ne peut ouvrir le fichier %s:%s.\n"
++ 
++-#: ../rarp.c:139
+++#: ../rarp.c:140
++ #, c-format
++ msgid "rarp: format error at %s:%u\n"
++ msgstr "rarp: erreur de format à %s:%u\n"
++ 
++-#: ../rarp.c:143 ../rarp.c:287
+++#: ../rarp.c:144 ../rarp.c:289
++ #, c-format
++ msgid "rarp: %s: unknown host\n"
++ msgstr "rarp: %s: hôte inconnu\n"
++ 
++-#: ../rarp.c:146
+++#: ../rarp.c:147
++ #, c-format
++ msgid "rarp: cannot set entry from %s:%u\n"
++ msgstr "rarp: ne peut définir l'entrée depuis %s:%u\n"
++ 
++-#: ../rarp.c:175
+++#: ../rarp.c:176
+++#, c-format
++ msgid "Usage: rarp -a                               list entries in cache.\n"
++-msgstr ""
++-"Usage: rarp -a                               liste les entrées en cache.\n"
+++msgstr "Usage: rarp -a                               liste les entrées en cache.\n"
++ 
++-#: ../rarp.c:176
+++#: ../rarp.c:177
+++#, c-format
++ msgid "       rarp -d <hostname>                    delete entry from cache.\n"
++-msgstr ""
++-"       rarp -d <hostname>                    supprime l'entrée du cache.\n"
+++msgstr "       rarp -d <hostname>                    supprime l'entrée du cache.\n"
++ 
++-#: ../rarp.c:177
+++#: ../rarp.c:178
+++#, c-format
++ msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
++-msgstr ""
++-"       rarp [<HW>] -s <hostname> <adrmat>    ajoute l'entrée au cache.\n"
+++msgstr "       rarp [<HW>] -s <hostname> <adrmat>    ajoute l'entrée au cache.\n"
++ 
++-#: ../rarp.c:178
+++#: ../rarp.c:179
+++#, c-format
++ msgid ""
++ "       rarp -f                               add entries from /etc/ethers.\n"
++-msgstr ""
++-"       rarp -f                               ajoute les entrées depuis "
++-"/etc/ethers.\n"
+++msgstr "       rarp -f                               ajoute les entrées depuis /etc/ethers.\n"
++ 
++-#: ../rarp.c:179
+++#: ../rarp.c:180
+++#, c-format
++ msgid ""
++ "       rarp -V                               display program version.\n"
++ "\n"
++@@ -1281,24 +1223,26 @@ msgstr ""
++ "       rarp -V                               affiche la version.\n"
++ "\n"
++ 
++-#: ../rarp.c:236
+++#: ../rarp.c:238
++ #, c-format
++ msgid "%s: illegal option mix.\n"
++ msgstr "%s: combinaison d'options illégales.\n"
++ 
++-#: ../rarp.c:267
+++#: ../rarp.c:269
++ #, c-format
++ msgid "rarp: %s: unknown hardware type.\n"
++ msgstr "rarp: %s: type de matériel inconnu.\n"
++ 
++-#: ../route.c:79
+++#: ../route.c:80
+++#, c-format
++ msgid ""
++ "Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
++ msgstr ""
++ "Syntaxe: route [-nNvee] [-FC] [<AF>]           Liste les tables de routage "
++ "noyau\n"
++ 
++-#: ../route.c:80
+++#: ../route.c:81
+++#, c-format
++ msgid ""
++ "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
++ "\n"
++@@ -1307,15 +1251,15 @@ msgstr ""
++ "pour AF.\n"
++ "\n"
++ 
++-#: ../route.c:82
+++#: ../route.c:83
+++#, c-format
++ msgid ""
++ "       route {-h|--help} [<AF>]              Detailed usage syntax for "
++ "specified AF.\n"
++-msgstr ""
++-"       route {-h|--help} [<AF>]              Utilisation détaillée pour l'AF "
++-"spécifié.\n"
+++msgstr "       route {-h|--help} [<AF>]              Utilisation détaillée pour l'AF spécifié.\n"
++ 
++-#: ../route.c:83
+++#: ../route.c:84
+++#, c-format
++ msgid ""
++ "       route {-V|--version}                  Display version/author and "
++ "exit.\n"
++@@ -1325,16 +1269,23 @@ msgstr ""
++ "termine.\n"
++ "\n"
++ 
+++#: ../route.c:92
+++#, fuzzy, c-format
+++msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
+++msgstr "  <AF>=Utiliser '-A <af>' ou '--<af>' Défaut: %s\n"
+++
++ #: ../plipconfig.c:66
+++#, c-format
++ msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
++ msgstr "Syntaxe: plipconfig [-a] [-i] [-v] interface\n"
++ 
++ #: ../plipconfig.c:67
+++#, c-format
++ msgid "                  [nibble NN] [trigger NN]\n"
++ msgstr "                  [nibble NN] [trigger NN]\n"
++ 
++ #: ../plipconfig.c:68
++-#, fuzzy
+++#, fuzzy, c-format
++ msgid "       plipconfig -V | --version\n"
++ msgstr "       plipconfig -V\n"
++ 
++@@ -1343,474 +1294,763 @@ msgstr "       plipconfig -V\n"
++ msgid "%s\tnibble %lu  trigger %lu\n"
++ msgstr "%s\tnibble %lu  trigger %lu\n"
++ 
++-#: ../iptunnel.c:79
+++#: ../iptunnel.c:85
+++#, c-format
++ msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:80
+++#: ../iptunnel.c:86
+++#, c-format
++ msgid ""
++ "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:81
+++#: ../iptunnel.c:87
+++#, c-format
++ msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:82
+++#: ../iptunnel.c:88
+++#, c-format
++ msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:83
+++#: ../iptunnel.c:89
+++#, c-format
++ msgid ""
++ "       iptunnel -V | --version\n"
++ "\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:84
+++#: ../iptunnel.c:90
+++#, c-format
++ msgid "Where: NAME := STRING\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:85
+++#: ../iptunnel.c:91
+++#, c-format
++ msgid "       ADDR := { IP_ADDRESS | any }\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:86
+++#: ../iptunnel.c:92
+++#, c-format
++ msgid "       TOS  := { NUMBER | inherit }\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:87
+++#: ../iptunnel.c:93
+++#, c-format
++ msgid "       TTL  := { 1..255 | inherit }\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:88
+++#: ../iptunnel.c:94
+++#, c-format
++ msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:326
+++#: ../iptunnel.c:332
+++#, c-format
++ msgid "Keys are not allowed with ipip and sit.\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:346
+++#: ../iptunnel.c:352
+++#, c-format
++ msgid "Broadcast tunnel requires a source address.\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:361
+++#: ../iptunnel.c:367
+++#, c-format
++ msgid "ttl != 0 and noptmudisc are incompatible\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:373
+++#: ../iptunnel.c:379
+++#, c-format
++ msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:411
+++#: ../iptunnel.c:417
++ #, c-format
++ msgid "%s: %s/ip  remote %s  local %s "
++ msgstr ""
++ 
++-#: ../iptunnel.c:415
+++#: ../iptunnel.c:421
++ #, fuzzy
++ msgid "unknown"
++ msgstr "Inconnu"
++ 
++-#: ../iptunnel.c:447
+++#: ../iptunnel.c:453
+++#, c-format
++ msgid "  Drop packets out of sequence.\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:449
+++#: ../iptunnel.c:455
+++#, c-format
++ msgid "  Checksum in received packet is required.\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:451
+++#: ../iptunnel.c:457
+++#, c-format
++ msgid "  Sequence packets on output.\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:453
+++#: ../iptunnel.c:459
+++#, c-format
++ msgid "  Checksum output packets.\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:481
+++#: ../iptunnel.c:487
+++#, c-format
++ msgid "Wrong format of /proc/net/dev. Sorry.\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:494
+++#: ../iptunnel.c:500
++ #, c-format
++ msgid "Failed to get type of [%s]\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:510
+++#: ../iptunnel.c:516
+++#, c-format
++ msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:513
+++#: ../iptunnel.c:519
+++#, c-format
++ msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
++ msgstr ""
++ 
++-#: ../statistics.c:45
+++#: ../statistics.c:47
++ msgid "ICMP input histogram:"
++ msgstr "Histogramme d'entrée ICMP"
++ 
++-#: ../statistics.c:46
+++#: ../statistics.c:48
++ msgid "ICMP output histogram:"
++ msgstr "Histogramme de sortie ICMP"
++ 
++-#: ../statistics.c:63
+++#: ../statistics.c:65
++ #, c-format
++ msgid "Forwarding is %s"
++ msgstr "Réacheminement est %s"
++ 
++-#: ../statistics.c:64
++-#, c-format
++-msgid "Default TTL is %d"
+++#: ../statistics.c:66
+++#, fuzzy, c-format
+++msgid "Default TTL is %u"
++ msgstr "TTL par défaut est %d"
++ 
++-#: ../statistics.c:65
++-#, c-format
++-msgid "%d total packets received"
+++#: ../statistics.c:67
+++#, fuzzy, c-format
+++msgid "%u total packets received"
++ msgstr "%d paquets totaux reçus"
++ 
++-#: ../statistics.c:66
++-#, c-format
++-msgid "%d with invalid headers"
+++#: ../statistics.c:68
+++#, fuzzy, c-format
+++msgid "%u with invalid headers"
++ msgstr "%d avec en-tête invalides"
++ 
++-#: ../statistics.c:67
++-#, c-format
++-msgid "%d with invalid addresses"
+++#: ../statistics.c:69
+++#, fuzzy, c-format
+++msgid "%u with invalid addresses"
++ msgstr "%d avec adresses invalides"
++ 
++-#: ../statistics.c:68
++-#, c-format
++-msgid "%d forwarded"
+++#: ../statistics.c:70
+++#, fuzzy, c-format
+++msgid "%u forwarded"
++ msgstr "%d réacheminées"
++ 
++-#: ../statistics.c:69
++-#, c-format
++-msgid "%d with unknown protocol"
+++#: ../statistics.c:71
+++#, fuzzy, c-format
+++msgid "%u with unknown protocol"
++ msgstr "%d avec protocole inconnu"
++ 
++-#: ../statistics.c:70
++-#, c-format
++-msgid "%d incoming packets discarded"
+++#: ../statistics.c:72
+++#, fuzzy, c-format
+++msgid "%u incoming packets discarded"
++ msgstr "%d paquets entrant jetés"
++ 
++-#: ../statistics.c:71
++-#, c-format
++-msgid "%d incoming packets delivered"
+++#: ../statistics.c:73
+++#, fuzzy, c-format
+++msgid "%u incoming packets delivered"
++ msgstr "%d paquets entrant délivrés"
++ 
++-#: ../statistics.c:72
++-#, c-format
++-msgid "%d requests sent out"
+++#: ../statistics.c:74
+++#, fuzzy, c-format
+++msgid "%u requests sent out"
++ msgstr "%d requêtes envoyées"
++ 
++ #. ?
++-#: ../statistics.c:73
++-#, c-format
++-msgid "%d outgoing packets dropped"
+++#: ../statistics.c:75
+++#, fuzzy, c-format
+++msgid "%u outgoing packets dropped"
++ msgstr "%d paquets sortant jetés"
++ 
++-#: ../statistics.c:74
++-#, c-format
++-msgid "%d dropped because of missing route"
+++#: ../statistics.c:76
+++#, fuzzy, c-format
+++msgid "%u dropped because of missing route"
++ msgstr "%d jetés pour cause de route manquante"
++ 
++-#: ../statistics.c:75
++-#, c-format
++-msgid "%d fragments dropped after timeout"
+++#: ../statistics.c:77
+++#, fuzzy, c-format
+++msgid "%u fragments dropped after timeout"
++ msgstr "%d fragments jetés après timeout"
++ 
++-#: ../statistics.c:76
++-#, c-format
++-msgid "%d reassemblies required"
+++#: ../statistics.c:78
+++#, fuzzy, c-format
+++msgid "%u reassemblies required"
++ msgstr "%d nécessitant un réassemblage"
++ 
++ #. ?
++-#: ../statistics.c:77
++-#, c-format
++-msgid "%d packets reassembled ok"
+++#: ../statistics.c:79
+++#, fuzzy, c-format
+++msgid "%u packets reassembled ok"
++ msgstr "%d paquets réassemblés correctement"
++ 
++-#: ../statistics.c:78
++-#, c-format
++-msgid "%d packet reassembles failed"
+++#: ../statistics.c:80
+++#, fuzzy, c-format
+++msgid "%u packet reassembles failed"
++ msgstr "%d paquets mal réassemblés"
++ 
++-#: ../statistics.c:79
++-#, c-format
++-msgid "%d fragments received ok"
+++#: ../statistics.c:81
+++#, fuzzy, c-format
+++msgid "%u fragments received ok"
++ msgstr "%d fragments reçus correctement"
++ 
++-#: ../statistics.c:80
++-#, c-format
++-msgid "%d fragments failed"
+++#: ../statistics.c:82
+++#, fuzzy, c-format
+++msgid "%u fragments failed"
++ msgstr "%d fragments en échec"
++ 
++-#: ../statistics.c:81
++-#, c-format
++-msgid "%d fragments created"
+++#: ../statistics.c:83
+++#, fuzzy, c-format
+++msgid "%u fragments created"
++ msgstr "%d fragments créés"
++ 
++-#: ../statistics.c:86
++-#, c-format
++-msgid "%d ICMP messages received"
+++#: ../statistics.c:88
+++#, fuzzy, c-format
+++msgid "%u ICMP messages received"
++ msgstr "%d messages ICMP reçus"
++ 
++-#: ../statistics.c:87
++-#, c-format
++-msgid "%d input ICMP message failed."
+++#: ../statistics.c:89
+++#, fuzzy, c-format
+++msgid "%u input ICMP message failed."
++ msgstr "%d messages d'entrée ICMP en échec"
++ 
++-#: ../statistics.c:88 ../statistics.c:101
++-#, c-format
++-msgid "destination unreachable: %d"
+++#: ../statistics.c:90 ../statistics.c:103
+++#, fuzzy, c-format
+++msgid "destination unreachable: %u"
++ msgstr "destination injoignable: %d"
++ 
++-#: ../statistics.c:89
++-#, c-format
++-msgid "timeout in transit: %d"
+++#: ../statistics.c:91
+++#, fuzzy, c-format
+++msgid "timeout in transit: %u"
++ msgstr "timeout en transmission: %d"
++ 
++-#: ../statistics.c:90 ../statistics.c:103
++-#, c-format
++-msgid "wrong parameters: %d"
+++#: ../statistics.c:92 ../statistics.c:105
+++#, fuzzy, c-format
+++msgid "wrong parameters: %u"
++ msgstr "mauvais paramètre: %d"
++ 
++ #. ?
++-#: ../statistics.c:91
++-#, c-format
++-msgid "source quenchs: %d"
+++#: ../statistics.c:93
+++#, fuzzy, c-format
+++msgid "source quenches: %u"
++ msgstr "Source Quenchs: %d"
++ 
++-#: ../statistics.c:92
++-#, c-format
++-msgid "redirects: %d"
+++#: ../statistics.c:94
+++#, fuzzy, c-format
+++msgid "redirects: %u"
++ msgstr "Redirections: %d"
++ 
++-#: ../statistics.c:93
++-#, c-format
++-msgid "echo requests: %d"
+++#: ../statistics.c:95
+++#, fuzzy, c-format
+++msgid "echo requests: %u"
++ msgstr "requêtes echo: %d"
++ 
++-#: ../statistics.c:94 ../statistics.c:107
++-#, c-format
++-msgid "echo replies: %d"
+++#: ../statistics.c:96 ../statistics.c:109
+++#, fuzzy, c-format
+++msgid "echo replies: %u"
++ msgstr "réponses echo: %d"
++ 
++-#: ../statistics.c:95
++-#, c-format
++-msgid "timestamp request: %d"
+++#: ../statistics.c:97
+++#, fuzzy, c-format
+++msgid "timestamp request: %u"
++ msgstr "requêtes datées: %d"
++ 
++-#: ../statistics.c:96
++-#, c-format
++-msgid "timestamp reply: %d"
+++#: ../statistics.c:98
+++#, fuzzy, c-format
+++msgid "timestamp reply: %u"
++ msgstr "réponses datées: %d"
++ 
++-#: ../statistics.c:97
++-#, c-format
++-msgid "address mask request: %d"
+++#: ../statistics.c:99
+++#, fuzzy, c-format
+++msgid "address mask request: %u"
++ msgstr "requêtes de masque d'adresse: %d"
++ 
++ #. ?
++-#: ../statistics.c:98
++-msgid "address mask replies"
++-msgstr "réponses de masque d'adresses"
+++#: ../statistics.c:100 ../statistics.c:113
+++#, fuzzy, c-format
+++msgid "address mask replies: %u"
+++msgstr "réponses de masque d'adresse: %d"
++ 
++ #. ?
++-#: ../statistics.c:99
++-#, c-format
++-msgid "%d ICMP messages sent"
+++#: ../statistics.c:101
+++#, fuzzy, c-format
+++msgid "%u ICMP messages sent"
++ msgstr "%d messages ICMP envoyés"
++ 
++-#: ../statistics.c:100
++-#, c-format
++-msgid "%d ICMP messages failed"
+++#: ../statistics.c:102
+++#, fuzzy, c-format
+++msgid "%u ICMP messages failed"
++ msgstr "%d messages ICMP en échec"
++ 
++-#: ../statistics.c:102
++-#, c-format
++-msgid "time exceeded: %d"
+++#: ../statistics.c:104
+++#, fuzzy, c-format
+++msgid "time exceeded: %u"
++ msgstr "temps dépassé: %d"
++ 
++ #. ?
++-#: ../statistics.c:104
++-#, c-format
++-msgid "source quench: %d"
+++#: ../statistics.c:106
+++#, fuzzy, c-format
+++msgid "source quench: %u"
++ msgstr "Source Quench: %d"
++ 
++-#: ../statistics.c:105
++-#, c-format
++-msgid "redirect: %d"
+++#: ../statistics.c:107
+++#, fuzzy, c-format
+++msgid "redirect: %u"
++ msgstr "redirection: %d"
++ 
++-#: ../statistics.c:106
++-#, c-format
++-msgid "echo request: %d"
+++#: ../statistics.c:108
+++#, fuzzy, c-format
+++msgid "echo request: %u"
++ msgstr "requête echo: %d"
++ 
++-#: ../statistics.c:108
++-#, c-format
++-msgid "timestamp requests: %d"
+++#: ../statistics.c:110
+++#, fuzzy, c-format
+++msgid "timestamp requests: %u"
++ msgstr "requêtes datées: %d"
++ 
++-#: ../statistics.c:109
++-#, c-format
++-msgid "timestamp replies: %d"
+++#: ../statistics.c:111
+++#, fuzzy, c-format
+++msgid "timestamp replies: %u"
++ msgstr "réponses datées: %d"
++ 
++-#: ../statistics.c:110
++-#, c-format
++-msgid "address mask requests: %d"
+++#: ../statistics.c:112
+++#, fuzzy, c-format
+++msgid "address mask requests: %u"
++ msgstr "requêtes de masque d'adresse: %d"
++ 
++-#: ../statistics.c:111
++-#, c-format
++-msgid "address mask replies: %d"
++-msgstr "réponses de masque d'adresse: %d"
++-
++-#: ../statistics.c:116
+++#: ../statistics.c:118
++ #, c-format
++ msgid "RTO algorithm is %s"
++ msgstr "algorithme RTO est %s"
++ 
++-#: ../statistics.c:120
++-#, c-format
++-msgid "%d active connections openings"
+++#: ../statistics.c:122
+++#, fuzzy, c-format
+++msgid "%u active connections openings"
++ msgstr "%d ouvertures de connexions actives"
++ 
++-#: ../statistics.c:121
++-#, c-format
++-msgid "%d passive connection openings"
+++#: ../statistics.c:123
+++#, fuzzy, c-format
+++msgid "%u passive connection openings"
++ msgstr "%d ouvertures de connexions passives"
++ 
++-#: ../statistics.c:122
++-#, c-format
++-msgid "%d failed connection attempts"
+++#: ../statistics.c:124
+++#, fuzzy, c-format
+++msgid "%u failed connection attempts"
++ msgstr "%d tentatives de connexion échouées"
++ 
++-#: ../statistics.c:123
++-#, c-format
++-msgid "%d connection resets received"
+++#: ../statistics.c:125
+++#, fuzzy, c-format
+++msgid "%u connection resets received"
++ msgstr "%d réinitialisations de connexions reçues"
++ 
++-#: ../statistics.c:124
++-#, c-format
++-msgid "%d connections established"
+++#: ../statistics.c:126
+++#, fuzzy, c-format
+++msgid "%u connections established"
++ msgstr "%d connexions établies"
++ 
++-#: ../statistics.c:125
++-#, c-format
++-msgid "%d segments received"
+++#: ../statistics.c:127
+++#, fuzzy, c-format
+++msgid "%u segments received"
++ msgstr "%d segments reçus"
++ 
++-#: ../statistics.c:126
++-#, c-format
++-msgid "%d segments send out"
+++#: ../statistics.c:128
+++#, fuzzy, c-format
+++msgid "%u segments send out"
++ msgstr "%d segments envoyés"
++ 
++-#: ../statistics.c:127
++-#, c-format
++-msgid "%d segments retransmited"
+++#: ../statistics.c:129
+++#, fuzzy, c-format
+++msgid "%u segments retransmited"
++ msgstr "%d segments retransmis"
++ 
++-#: ../statistics.c:128
++-#, c-format
++-msgid "%d bad segments received."
+++#: ../statistics.c:130
+++#, fuzzy, c-format
+++msgid "%u bad segments received."
++ msgstr "%d mauvais segments reçus."
++ 
++-#: ../statistics.c:129
++-#, c-format
++-msgid "%d resets sent"
+++#: ../statistics.c:131
+++#, fuzzy, c-format
+++msgid "%u resets sent"
++ msgstr "%d réinitialisations envoyées"
++ 
++-#: ../statistics.c:134
++-#, c-format
++-msgid "%d packets received"
+++#: ../statistics.c:136
+++#, fuzzy, c-format
+++msgid "%u packets received"
++ msgstr "%d paquets reçus"
++ 
++-#: ../statistics.c:135
++-#, c-format
++-msgid "%d packets to unknown port received."
+++#: ../statistics.c:137
+++#, fuzzy, c-format
+++msgid "%u packets to unknown port received."
++ msgstr "%d paquets reçus pour un port inconnu"
++ 
++-#: ../statistics.c:136
++-#, c-format
++-msgid "%d packet receive errors"
+++#: ../statistics.c:138
+++#, fuzzy, c-format
+++msgid "%u packet receive errors"
++ msgstr "%d erreurs en réception de paquets"
++ 
++-#: ../statistics.c:137
+++#: ../statistics.c:139
+++#, fuzzy, c-format
+++msgid "%u packets sent"
+++msgstr "%d paquets envoyés"
+++
+++#: ../statistics.c:144
+++#, fuzzy, c-format
+++msgid "%u SYN cookies sent"
+++msgstr "%d SYN-Cookies reçus"
+++
+++#: ../statistics.c:145
+++#, fuzzy, c-format
+++msgid "%u SYN cookies received"
+++msgstr "%d SYN-Cookies reçus"
+++
+++#: ../statistics.c:146
+++#, fuzzy, c-format
+++msgid "%u invalid SYN cookies received"
+++msgstr "%d SYN-Cookies reçus incorrects"
+++
+++#: ../statistics.c:148
+++#, fuzzy, c-format
+++msgid "%u resets received for embryonic SYN_RECV sockets"
+++msgstr "%d réinitialisations reçues pour sockets SYN_RECV embryonnaires"
+++
+++#: ../statistics.c:150
+++#, fuzzy, c-format
+++msgid "%u packets pruned from receive queue because of socket buffer overrun"
+++msgstr "%d paquets supprimés de la file de réception en raison de tampon de sockets plein"
+++
+++#. obsolete: 2.2.0 doesn't do that anymore
+++#: ../statistics.c:153
+++#, fuzzy, c-format
+++msgid "%u packets pruned from receive queue"
+++msgstr "%d paquets supprimés de la file hors service"
+++
+++#: ../statistics.c:154
+++#, fuzzy, c-format
+++msgid ""
+++"%u packets dropped from out-of-order queue because of socket buffer overrun"
+++msgstr "%d paquets jetés de la file hors service en raison de tampon de sockets plein"
+++
+++#: ../statistics.c:156
+++#, fuzzy, c-format
+++msgid "%u ICMP packets dropped because they were out-of-window"
+++msgstr "%d ICMP paquets jetés car hors de la fenêtre"
+++
+++#: ../statistics.c:158
+++#, fuzzy, c-format
+++msgid "%u ICMP packets dropped because socket was locked"
+++msgstr "%d paquets ICMP jetés car la socket a été vérouillée"
+++
+++#: ../statistics.c:160
++ #, c-format
++-msgid "%d packets sent"
+++msgid "%u TCP sockets finished time wait in fast timer"
+++msgstr ""
+++
+++#: ../statistics.c:161
+++#, c-format
+++msgid "%u time wait sockets recycled by time stamp"
+++msgstr ""
+++
+++#: ../statistics.c:162
+++#, c-format
+++msgid "%u TCP sockets finished time wait in slow timer"
+++msgstr ""
+++
+++#: ../statistics.c:163
+++#, c-format
+++msgid "%u passive connections rejected because of time stamp"
+++msgstr ""
+++
+++#: ../statistics.c:165
+++#, c-format
+++msgid "%u active connections rejected because of time stamp"
+++msgstr ""
+++
+++#: ../statistics.c:167
+++#, c-format
+++msgid "%u packets rejects in established connections because of timestamp"
+++msgstr ""
+++
+++#: ../statistics.c:169
+++#, fuzzy, c-format
+++msgid "%u delayed acks sent"
++ msgstr "%d paquets envoyés"
++ 
++-#: ../statistics.c:142
+++#: ../statistics.c:170
++ #, c-format
++-msgid "%d SYN cookies sent"
+++msgid "%u delayed acks further delayed because of locked socket"
++ msgstr ""
++ 
++-#: ../statistics.c:143
+++#: ../statistics.c:172
++ #, c-format
++-msgid "%d SYN cookies received"
++-msgstr "%d SYN-Cookies reçus"
+++msgid "Quick ack mode was activated %u times"
+++msgstr ""
++ 
++-#: ../statistics.c:144
+++#: ../statistics.c:173
++ #, c-format
++-msgid "%d invalid SYN cookies received"
++-msgstr "%d SYN-Cookies reçus incorrects"
+++msgid "%u times the listen queue of a socket overflowed"
+++msgstr ""
++ 
++-#: ../statistics.c:146
+++#: ../statistics.c:175
++ #, c-format
++-msgid "%d resets received for embryonic SYN_RECV sockets"
++-msgstr "%d réinitialisations reçues pour sockets SYN_RECV embryonnaires"
+++msgid "%u SYNs to LISTEN sockets ignored"
+++msgstr ""
++ 
++-#: ../statistics.c:148
+++#: ../statistics.c:176
++ #, c-format
++-msgid "%d packets pruned from receive queue because of socket buffer overrun"
+++msgid "%u packets directly queued to recvmsg prequeue."
++ msgstr ""
++-"%d paquets supprimés de la file de réception en raison de tampon de sockets "
++-"plein"
++ 
++-#. obsolete: 2.2.0 doesn't do that anymore
++-#: ../statistics.c:151
+++#: ../statistics.c:178
+++#, c-format
+++msgid "%u of bytes directly received from backlog"
+++msgstr ""
+++
+++#: ../statistics.c:180
++ #, c-format
++-msgid "%d packets pruned from out-of-order queue"
+++msgid "%u of bytes directly received from prequeue"
+++msgstr ""
+++
+++#: ../statistics.c:182
+++#, fuzzy, c-format
+++msgid "%u packets dropped from prequeue"
++ msgstr "%d paquets supprimés de la file hors service"
++ 
++-#: ../statistics.c:152
+++#: ../statistics.c:183
+++#, fuzzy, c-format
+++msgid "%u packet headers predicted"
+++msgstr "%d paquets reçus"
+++
+++#: ../statistics.c:184
++ #, c-format
++-msgid ""
++-"%d packets dropped from out-of-order queue because of socket buffer overrun"
+++msgid "%u packets header predicted and directly queued to user"
++ msgstr ""
++-"%d paquets jetés de la file hors service en raison de tampon de sockets plein"
++ 
++-#: ../statistics.c:154
+++#: ../statistics.c:186
++ #, c-format
++-msgid "%d ICMP packets dropped because they were out-of-window"
++-msgstr "%d ICMP paquets jetés car hors de la fenêtre"
+++msgid "Ran %u times out of system memory during packet sending"
+++msgstr ""
++ 
++-#: ../statistics.c:156
+++#: ../statistics.c:188
+++#, fuzzy, c-format
+++msgid "%u acknowledgments not containing data received"
+++msgstr "%d paquets reçus pour un port inconnu"
+++
+++#: ../statistics.c:189
++ #, c-format
++-msgid "%d ICMP packets dropped because socket was locked"
++-msgstr "%d paquets ICMP jetés car la socket a été vérouillée"
+++msgid "%u predicted acknowledgments"
+++msgstr ""
+++
+++#: ../statistics.c:190
+++#, c-format
+++msgid "%u times recovered from packet loss due to fast retransmit"
+++msgstr ""
+++
+++#: ../statistics.c:191
+++#, c-format
+++msgid "%u times recovered from packet loss due to SACK data"
+++msgstr ""
+++
+++#: ../statistics.c:192
+++#, fuzzy, c-format
+++msgid "%u bad SACKs received"
+++msgstr "%d mauvais segments reçus."
+++
+++#: ../statistics.c:193
+++#, c-format
+++msgid "Detected reordering %u times using FACK"
+++msgstr ""
+++
+++#: ../statistics.c:194
+++#, c-format
+++msgid "Detected reordering %u times using SACK"
+++msgstr ""
+++
+++#: ../statistics.c:195
+++#, c-format
+++msgid "Detected reordering %u times using time stamp"
+++msgstr ""
+++
+++#: ../statistics.c:196
+++#, c-format
+++msgid "Detected reordering %u times using reno fast retransmit"
+++msgstr ""
+++
+++#: ../statistics.c:197
+++#, c-format
+++msgid "%u congestion windows fully recovered"
+++msgstr ""
+++
+++#: ../statistics.c:198
+++#, c-format
+++msgid "%u congestion windows partially recovered using Hoe heuristic"
+++msgstr ""
+++
+++#: ../statistics.c:199
+++#, c-format
+++msgid "%u congestion window recovered using DSACK"
+++msgstr ""
+++
+++#: ../statistics.c:200
+++#, c-format
+++msgid "%u congestion windows recovered after partial ack"
+++msgstr ""
+++
+++#: ../statistics.c:201
+++#, fuzzy, c-format
+++msgid "%u retransmits lost"
+++msgstr "%d réinitialisations envoyées"
+++
+++#: ../statistics.c:202
+++#, c-format
+++msgid "%u timeouts after reno fast retransmit"
+++msgstr ""
+++
+++#: ../statistics.c:203
+++#, c-format
+++msgid "%u timeouts after SACK recovery"
+++msgstr ""
+++
+++#: ../statistics.c:204
+++#, c-format
+++msgid "%u timeouts in loss state"
+++msgstr ""
+++
+++#: ../statistics.c:205
+++#, fuzzy, c-format
+++msgid "%u fast retransmits"
+++msgstr "%d segments retransmis"
+++
+++#: ../statistics.c:206
+++#, c-format
+++msgid "%u forward retransmits"
+++msgstr ""
+++
+++#: ../statistics.c:207
+++#, c-format
+++msgid "%u retransmits in slow start"
+++msgstr ""
+++
+++#: ../statistics.c:208
+++#, c-format
+++msgid "%u other TCP timeouts"
+++msgstr ""
+++
+++#: ../statistics.c:209
+++#, fuzzy, c-format
+++msgid "%u reno fast retransmits failed"
+++msgstr "%d segments retransmis"
+++
+++#: ../statistics.c:210
+++#, fuzzy, c-format
+++msgid "%u sack retransmits failed"
+++msgstr "%d paquets mal réassemblés"
+++
+++#: ../statistics.c:211
+++#, c-format
+++msgid "%u times receiver scheduled too late for direct processing"
+++msgstr ""
+++
+++#: ../statistics.c:212
+++#, fuzzy, c-format
+++msgid "%u packets collapsed in receive queue due to low socket buffer"
+++msgstr "%d paquets supprimés de la file de réception en raison de tampon de sockets plein"
+++
+++#: ../statistics.c:213
+++#, c-format
+++msgid "%u DSACKs sent for old packets"
+++msgstr ""
+++
+++#: ../statistics.c:214
+++#, c-format
+++msgid "%u DSACKs sent for out of order packets"
+++msgstr ""
+++
+++#: ../statistics.c:215
+++#, fuzzy, c-format
+++msgid "%u DSACKs received"
+++msgstr "%d paquets reçus"
+++
+++#: ../statistics.c:216
+++#, fuzzy, c-format
+++msgid "%u DSACKs for out of order packets received"
+++msgstr "%d paquets totaux reçus"
+++
+++#: ../statistics.c:217
+++#, fuzzy, c-format
+++msgid "%u connections reset due to unexpected SYN"
+++msgstr "%d réinitialisations de connexions reçues"
+++
+++#: ../statistics.c:218
+++#, fuzzy, c-format
+++msgid "%u connections reset due to unexpected data"
+++msgstr "%d réinitialisations de connexions reçues"
+++
+++#: ../statistics.c:219
+++#, fuzzy, c-format
+++msgid "%u connections reset due to early user close"
+++msgstr "%d réinitialisations de connexions reçues"
+++
+++#: ../statistics.c:220
+++#, c-format
+++msgid "%u connections aborted due to memory pressure"
+++msgstr ""
+++
+++#: ../statistics.c:221
+++#, fuzzy, c-format
+++msgid "%u connections aborted due to timeout"
+++msgstr "%d réinitialisations de connexions reçues"
++ 
++ #: ../statistics.c:222
+++#, c-format
+++msgid "%u connections aborted after user close in linger timeout"
+++msgstr ""
+++
+++#: ../statistics.c:223
+++#, c-format
+++msgid "%u times unabled to send RST due to no memory"
+++msgstr ""
+++
+++#: ../statistics.c:224
+++#, c-format
+++msgid "TCP ran low on memory %u times"
+++msgstr ""
+++
+++#: ../statistics.c:225
+++#, c-format
+++msgid "%u TCP data loss events"
+++msgstr ""
+++
+++#: ../statistics.c:292
++ msgid "enabled"
++ msgstr "activée"
++ 
++-#: ../statistics.c:222
+++#: ../statistics.c:292
++ msgid "disabled"
++ msgstr "désactivée"
++ 
++-#: ../statistics.c:272
++-#, c-format
++-msgid "unknown title %s\n"
++-msgstr "titre inconnu %s\n"
++-
++-#: ../statistics.c:298
+++#: ../statistics.c:375
++ msgid "error parsing /proc/net/snmp"
++ msgstr "erreur d'analyse de /proc/net/snmp"
++ 
++-#: ../statistics.c:311
+++#: ../statistics.c:388
++ msgid "cannot open /proc/net/snmp"
++ msgstr "ne peut ouvrir /proc/net/snmp"
++ 
++@@ -1824,89 +2064,95 @@ msgstr "Type de matériel `%s' pas suppor
++ msgid "Cannot change line discipline to `%s'.\n"
++ msgstr "Ne peut changer la discipline de ligne à `%s'.\n"
++ 
++-#: ../lib/af.c:145 ../lib/hw.c:148
+++#: ../lib/af.c:153 ../lib/hw.c:161
++ msgid "UNSPEC"
++ msgstr "UNSPEC"
++ 
++-#: ../lib/af.c:147
+++#: ../lib/af.c:155
++ msgid "UNIX Domain"
++ msgstr "Domaine UNIX"
++ 
++-#: ../lib/af.c:150
+++#: ../lib/af.c:158
++ msgid "DARPA Internet"
++ msgstr "DARPA Internet"
++ 
++-#: ../lib/af.c:153
+++#: ../lib/af.c:161
++ msgid "IPv6"
++ msgstr "IPv6"
++ 
++-#: ../lib/af.c:156 ../lib/hw.c:169
+++#: ../lib/af.c:164 ../lib/hw.c:182
++ msgid "AMPR AX.25"
++ msgstr "AMPR AX.25"
++ 
++-#: ../lib/af.c:159 ../lib/hw.c:175
+++#: ../lib/af.c:167 ../lib/hw.c:188
++ msgid "AMPR NET/ROM"
++ msgstr "AMPR NET/ROM"
++ 
++-#: ../lib/af.c:162
+++#: ../lib/af.c:170
++ msgid "Novell IPX"
++ msgstr ""
++ 
++-#: ../lib/af.c:165
+++#: ../lib/af.c:173
++ msgid "Appletalk DDP"
++ msgstr "Appletalk DDP"
++ 
++-#: ../lib/af.c:168 ../lib/hw.c:207
+++#: ../lib/af.c:176 ../lib/hw.c:223
++ msgid "Econet"
++ msgstr "Econet"
++ 
++-#: ../lib/af.c:171 ../lib/hw.c:172
+++#: ../lib/af.c:179
+++msgid "CCITT X.25"
+++msgstr ""
+++
+++#: ../lib/af.c:182 ../lib/hw.c:185
++ msgid "AMPR ROSE"
++ msgstr "AMPR ROSE"
++ 
++-#: ../lib/af.c:174 ../lib/hw.c:160
+++#: ../lib/af.c:185 ../lib/hw.c:173
++ msgid "Ash"
++ msgstr "Ash"
++ 
++-#: ../lib/af.c:232
+++#: ../lib/af.c:243
+++#, c-format
++ msgid "Please don't supply more than one address family.\n"
++ msgstr "Ne fournissez pas plus d'une famille d'adresses SVP.\n"
++ 
++-#: ../lib/af.c:293
+++#: ../lib/af.c:304
+++#, c-format
++ msgid "Too much address family arguments.\n"
++ msgstr "Trop d'arguments de familles d'adresses.\n"
++ 
++-#: ../lib/af.c:304
+++#: ../lib/af.c:315
++ #, c-format
++ msgid "Unknown address family `%s'.\n"
++ msgstr "Famille d'adresses inconnue `%s'.\n"
++ 
++-#: ../lib/arcnet.c:53 ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52
++-#: ../lib/fddi.c:67 ../lib/hippi.c:68 ../lib/inet.c:244 ../lib/inet.c:259
++-#: ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ../lib/rose.c:71
++-#: ../lib/rose.c:126 ../lib/unix.c:56 ../lib/unix.c:76
++-msgid "[NONE SET]"
++-msgstr "[INDEFINI]"
++-
++-#: ../lib/arcnet.c:81 ../lib/arcnet.c:96
+++#: ../lib/arcnet.c:70 ../lib/arcnet.c:85
++ #, c-format
++ msgid "in_arcnet(%s): invalid arcnet address!\n"
++ msgstr "in_arcnet(%s): adresse arcnet invalide !\n"
++ 
++-#: ../lib/arcnet.c:108
+++#: ../lib/arcnet.c:97
++ #, c-format
++ msgid "in_arcnet(%s): trailing : ignored!\n"
++ msgstr "in_arcnet(%s): restant : ignoré !\n"
++ 
++-#: ../lib/arcnet.c:120
+++#: ../lib/arcnet.c:109
++ #, c-format
++ msgid "in_arcnet(%s): trailing junk!\n"
++ msgstr "in_arcnet(%s): le restant à la poubelle !\n"
++ 
++ #: ../lib/ash.c:81
+++#, c-format
++ msgid "Malformed Ash address"
++ msgstr "Adresse Ash malformée"
++ 
+++#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244
+++#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78
+++#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76
+++msgid "[NONE SET]"
+++msgstr "[INDEFINI]"
+++
++ #: ../lib/ax25.c:97 ../lib/netrom.c:100
++ msgid "Invalid callsign"
++ msgstr "Signal d'appel invalide"
++@@ -1916,22 +2162,21 @@ msgid "Callsign too long"
++ msgstr "Signal d'appel trop long"
++ 
++ #: ../lib/ax25_gr.c:47
+++#, c-format
++ msgid "AX.25 not configured in this system.\n"
++ msgstr "AX.25 pas configuré sur ce système.\n"
++ 
++ #: ../lib/ax25_gr.c:50
+++#, c-format
++ msgid "Kernel AX.25 routing table\n"
++ msgstr "Table de routage AX.25 du noyau\n"
++ 
++ #. xxx
++ #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
+++#, c-format
++ msgid "Destination  Iface    Use\n"
++ msgstr "Destination  Iface    Utilisation\n"
++ 
++-#: ../lib/ddp_gr.c:21
++-msgid "Routing table for `ddp' not yet supported.\n"
++-msgstr "Table de routage pour `ddp' pas encore supporté.\n"
++-
++ #: ../lib/ether.c:74 ../lib/ether.c:91
++ #, c-format
++ msgid "in_ether(%s): invalid ether address!\n"
++@@ -1947,153 +2192,171 @@ msgstr "in_ether(%s): restant ignoré !\n
++ msgid "in_ether(%s): trailing junk!\n"
++ msgstr "in_ether(%s): le restant à la poubelle !\n"
++ 
++-#: ../lib/fddi.c:95 ../lib/fddi.c:110
+++#: ../lib/fddi.c:84 ../lib/fddi.c:99
++ #, c-format
++ msgid "in_fddi(%s): invalid fddi address!\n"
++ msgstr "in_fddi(%s): adresse fddi invalide!\n"
++ 
++-#: ../lib/fddi.c:122
+++#: ../lib/fddi.c:111
++ #, c-format
++ msgid "in_fddi(%s): trailing : ignored!\n"
++ msgstr "in_fddi(%s): restant ignoré !\n"
++ 
++-#: ../lib/fddi.c:134
+++#: ../lib/fddi.c:123
++ #, c-format
++ msgid "in_fddi(%s): trailing junk!\n"
++ msgstr "in_fddi(%s): le restant à la poubelle !\n"
++ 
++-#: ../lib/getroute.c:97 ../lib/setroute.c:76
+++#: ../lib/getroute.c:101 ../lib/setroute.c:80
++ #, c-format
++ msgid "Address family `%s' not supported.\n"
++ msgstr "Famille d'adresses `%s' non supportée.\n"
++ 
++-#: ../lib/getroute.c:103 ../lib/setroute.c:80
+++#: ../lib/getroute.c:107 ../lib/setroute.c:84
++ #, c-format
++ msgid "No routing for address family `%s'.\n"
++ msgstr "Pas de routage pour la famille d'adresses `%s'.\n"
++ 
++-#: ../lib/hippi.c:96 ../lib/hippi.c:111
+++#: ../lib/hippi.c:84 ../lib/hippi.c:99
++ #, c-format
++ msgid "in_hippi(%s): invalid hippi address!\n"
++ msgstr "in_hippi(%s): adresse hippi invalide!\n"
++ 
++-#: ../lib/hippi.c:123
+++#: ../lib/hippi.c:111
++ #, c-format
++ msgid "in_hippi(%s): trailing : ignored!\n"
++ msgstr "in_hippi(%s): restant ignoré !\n"
++ 
++-#: ../lib/hippi.c:134
+++#: ../lib/hippi.c:122
++ #, c-format
++ msgid "in_hippi(%s): trailing junk!\n"
++ msgstr "in_hippi(%s): le restant à la poubelle !\n"
++ 
++-#: ../lib/hw.c:147
+++#: ../lib/hw.c:160
++ msgid "Local Loopback"
++ msgstr "Boucle locale"
++ 
++-#: ../lib/hw.c:150
+++#: ../lib/hw.c:163
++ msgid "Serial Line IP"
++ msgstr "IP ligne série"
++ 
++-#: ../lib/hw.c:151
+++#: ../lib/hw.c:164
++ msgid "VJ Serial Line IP"
++ msgstr "IP ligne série - VJ "
++ 
++-#: ../lib/hw.c:152
+++#: ../lib/hw.c:165
++ msgid "6-bit Serial Line IP"
++ msgstr "IP ligne série - 6 bits"
++ 
++-#: ../lib/hw.c:153
+++#: ../lib/hw.c:166
++ msgid "VJ 6-bit Serial Line IP"
++ msgstr "IP ligne série - 6 bits VJ"
++ 
++-#: ../lib/hw.c:154
+++#: ../lib/hw.c:167
++ msgid "Adaptive Serial Line IP"
++ msgstr "IP ligne série adaptative"
++ 
++-#: ../lib/hw.c:157
+++#: ../lib/hw.c:170
++ msgid "Ethernet"
++ msgstr "Ethernet"
++ 
++-#: ../lib/hw.c:163
+++#: ../lib/hw.c:176
++ msgid "Fiber Distributed Data Interface"
++ msgstr "Fiber Distributed Data Interface"
++ 
++-#: ../lib/hw.c:166
+++#: ../lib/hw.c:179
++ msgid "HIPPI"
++ msgstr "HIPPI"
++ 
++-#: ../lib/hw.c:178
+++#: ../lib/hw.c:191
+++msgid "generic X.25"
+++msgstr ""
+++
+++#: ../lib/hw.c:194
++ msgid "IPIP Tunnel"
++ msgstr "IPIP Tunnel"
++ 
++-#: ../lib/hw.c:181
+++#: ../lib/hw.c:197
++ msgid "Point-to-Point Protocol"
++ msgstr "Protocole Point-à-Point"
++ 
++-#: ../lib/hw.c:184
+++#: ../lib/hw.c:200
++ msgid "(Cisco)-HDLC"
++ msgstr "(Cisco)-HDLC"
++ 
++-#: ../lib/hw.c:185
+++#: ../lib/hw.c:201
++ msgid "LAPB"
++ msgstr "LAPB"
++ 
++-#: ../lib/hw.c:188
+++#: ../lib/hw.c:204
++ msgid "ARCnet"
++ msgstr "ARCnet"
++ 
++-#: ../lib/hw.c:191
+++#: ../lib/hw.c:207
++ msgid "Frame Relay DLCI"
++ msgstr "Frame Relay DLCI"
++ 
++-#: ../lib/hw.c:192
+++#: ../lib/hw.c:208
++ msgid "Frame Relay Access Device"
++ msgstr "Périphériue d'accès Frame Relay"
++ 
++-#: ../lib/hw.c:195
+++#: ../lib/hw.c:211
++ msgid "IPv6-in-IPv4"
++ msgstr "IPv6-dans-IPv4"
++ 
++-#: ../lib/hw.c:198
+++#: ../lib/hw.c:214
++ #, fuzzy
++ msgid "IrLAP"
++ msgstr "LAPB"
++ 
++-#: ../lib/hw.c:201
+++#: ../lib/hw.c:217
++ msgid "16/4 Mbps Token Ring"
++ msgstr ""
++ 
++-#: ../lib/hw.c:203
+++#: ../lib/hw.c:219
++ msgid "16/4 Mbps Token Ring (New)"
++ msgstr ""
++ 
+++#: ../lib/hw.c:226
+++msgid "Generic EUI-64"
+++msgstr ""
+++
++ #: ../lib/inet.c:153 ../lib/inet6.c:79
++ #, c-format
++ msgid "rresolve: unsupport address family %d !\n"
++ msgstr "rresolve: famille d'adresses non suportée %d !\n"
++ 
++-#: ../lib/inet6_gr.c:79
+++#: ../lib/inet6.c:131
+++#, fuzzy
+++msgid "[UNKNOWN]"
+++msgstr "INCONNU"
+++
+++#: ../lib/inet6_gr.c:71
+++#, c-format
++ msgid "INET6 (IPv6) not configured in this system.\n"
++ msgstr "INET6 (IPv6) pas configuré sur ce système.\n"
++ 
++-#: ../lib/inet6_gr.c:82
+++#: ../lib/inet6_gr.c:74
+++#, c-format
++ msgid "Kernel IPv6 routing table\n"
++ msgstr "Table de routage IPv6 du noyau\n"
++ 
++-#: ../lib/inet6_gr.c:84
+++#: ../lib/inet6_gr.c:76
+++#, c-format
++ msgid ""
++-"Destination                                 Next Hop                         "
++-"       Flags Metric Ref    Use Iface\n"
+++"Destination                                 Next "
+++"Hop                                Flags Metric Ref    Use Iface\n"
++ msgstr ""
++-"Destination                                 Prochain Hop                     "
++-"       Indic Metric Ref    Utilis. Iface\n"
+++"Destination                                 Prochain "
+++"Hop                            Indic Metric Ref    Utilis. Iface\n"
++ 
++-#: ../lib/inet6_gr.c:158
+++#: ../lib/inet6_gr.c:150
+++#, c-format
++ msgid "Kernel IPv6 Neighbour Cache\n"
++ msgstr "Cache voisin IPv6 du noyau\n"
++ 
++-#: ../lib/inet6_gr.c:161
+++#: ../lib/inet6_gr.c:153
+++#, c-format
++ msgid ""
++ "Neighbour                                   HW Address        Iface    Flags "
++ "Ref State\n"
++@@ -2101,39 +2364,45 @@ msgstr ""
++ "Voisin                                      Adresse MAT       Iface    Indic "
++ "Ref Etat\n"
++ 
++-#: ../lib/inet6_gr.c:165
+++#: ../lib/inet6_gr.c:157
+++#, c-format
++ msgid ""
++ "Neighbour                                   HW Address        Iface    Flags "
++ "Ref State            Stale(sec) Delete(sec)\n"
++-msgstr ""
++-"Voisin                                      Adresse MAT       Iface    Indic "
++-"Ref Etat             Bloqué(sec) Détuit(sec)\n"
+++msgstr "Voisin                                      Adresse MAT       Iface    Indic Ref Etat             Bloqué(sec) Détuit(sec)\n"
++ 
++ #: ../lib/inet6_sr.c:46
+++#, c-format
++ msgid "Usage: inet6_route [-vF] del Target\n"
++ msgstr "Syntaxe: inet6_route [-vF] del Cible\n"
++ 
++ #: ../lib/inet6_sr.c:47
+++#, c-format
++ msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
++ msgstr "       inet6_route [-vF] add Cible [gw Gw] [metric M] [[dev] If]\n"
++ 
++ #: ../lib/inet6_sr.c:48
+++#, c-format
++ msgid "       inet6_route [-FC] flush      NOT supported\n"
++ msgstr "       inet6_route [-FC] flush      PAS supporté\n"
++ 
++-#: ../lib/inet6_sr.c:182
+++#: ../lib/inet6_sr.c:188
+++#, c-format
++ msgid "Flushing `inet6' routing table not supported\n"
++ msgstr "Flush de table de routage `inet6' pas supporté\n"
++ 
++ #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
+++#, c-format
++ msgid "INET (IPv4) not configured in this system.\n"
++ msgstr "INET (IPv4) pas configuré sur ce système.\n"
++ 
++ #: ../lib/inet_gr.c:53
+++#, c-format
++ msgid "Kernel IP routing table\n"
++ msgstr "Table de routage IP du noyau\n"
++ 
++ #: ../lib/inet_gr.c:56
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
++ "Iface\n"
++@@ -2142,26 +2411,26 @@ msgstr ""
++ "Iface\n"
++ 
++ #: ../lib/inet_gr.c:59
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags   MSS Window  irtt "
++ "Iface\n"
++-msgstr ""
++-"Destination     Passerelle      Genmask         Indic   MSS Fenêtre irtt "
++-"Iface\n"
+++msgstr "Destination     Passerelle      Genmask         Indic   MSS Fenêtre irtt Iface\n"
++ 
++ #: ../lib/inet_gr.c:62
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt\n"
++-msgstr ""
++-"Destination     Passerelle      Genmask         Indic Metric Ref    Use "
++-"Iface    MSS  Fenêtre irtt\n"
+++msgstr "Destination     Passerelle      Genmask         Indic Metric Ref    Use Iface    MSS  Fenêtre irtt\n"
++ 
++ #: ../lib/inet_gr.c:237
+++#, c-format
++ msgid "Kernel IP routing cache\n"
++ msgstr "cache de routage IP du noyau\n"
++ 
++ #: ../lib/inet_gr.c:258
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface\n"
++@@ -2170,30 +2439,28 @@ msgstr ""
++ "Iface\n"
++ 
++ #: ../lib/inet_gr.c:261
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags   MSS Window  irtt "
++ "Iface\n"
++-msgstr ""
++-"Source          Destination     Passerelle      Indic   MSS Fenêtre irtt "
++-"Iface\n"
+++msgstr "Source          Destination     Passerelle      Indic   MSS Fenêtre irtt Iface\n"
++ 
++ #: ../lib/inet_gr.c:266
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt  HH  Arp\n"
++-msgstr ""
++-"Source          Destination     Passerelle      Indic Metric Ref    Use "
++-"Iface    MSS  Fenêtre irtt  HH  Arp\n"
+++msgstr "Source          Destination     Passerelle      Indic Metric Ref    Use Iface    MSS  Fenêtre irtt  HH  Arp\n"
++ 
++ #: ../lib/inet_gr.c:290
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
++-msgstr ""
++-"Source          Destination     Passerelle      Flags Metric Ref    Use "
++-"Iface    MSS  Fenêtre irtt  TOS HHRef HHUptod     SpecDst\n"
+++msgstr "Source          Destination     Passerelle      Flags Metric Ref    Use Iface    MSS  Fenêtre irtt  TOS HHRef HHUptod     SpecDst\n"
++ 
++-#: ../lib/inet_sr.c:50
+++#: ../lib/inet_sr.c:51
+++#, c-format
++ msgid ""
++ "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
++ "[[dev] If]\n"
++@@ -2201,29 +2468,34 @@ msgstr ""
++ "Syntaxe: inet_route [-vF] del {-host|-net} Cible[/prefix] [gw Gw] [metric M] "
++ "[[dev] If]\n"
++ 
++-#: ../lib/inet_sr.c:51
+++#: ../lib/inet_sr.c:52
+++#, c-format
++ msgid ""
++ "       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
++ msgstr ""
++ "       inet_route [-vF] add {-host|-net} Cible[/prefix] [gw Gw] [metric M]\n"
++ 
++-#: ../lib/inet_sr.c:52
+++#: ../lib/inet_sr.c:53
+++#, c-format
++ msgid ""
++ "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
++ msgstr ""
++ "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
++ 
++-#: ../lib/inet_sr.c:53
+++#: ../lib/inet_sr.c:54
+++#, c-format
++ msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
++ msgstr "                              [mod] [dyn] [reinstate] [[dev] If]\n"
++ 
++-#: ../lib/inet_sr.c:54
+++#: ../lib/inet_sr.c:55
+++#, c-format
++ msgid ""
++ "       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
++ msgstr ""
++ "       inet_route [-vF] add {-host|-net} Cible[/prefix] [metric M] reject\n"
++ 
++-#: ../lib/inet_sr.c:55
+++#: ../lib/inet_sr.c:56
+++#, c-format
++ msgid "       inet_route [-FC] flush      NOT supported\n"
++ msgstr "       inet_route [-FC] flush      PAS supporté\n"
++ 
++@@ -2233,15 +2505,17 @@ msgid "route: %s: cannot use a NETWORK a
++ msgstr "route: %s: ne peut utiliser un RESEAU comme passerelle!\n"
++ 
++ #: ../lib/inet_sr.c:174
++-#, fuzzy
+++#, fuzzy, c-format
++ msgid "route: Invalid MSS/MTU.\n"
++ msgstr "route: MSS invalide.\n"
++ 
++ #: ../lib/inet_sr.c:187
+++#, c-format
++ msgid "route: Invalid window.\n"
++ msgstr "route: fenêtre invalide.\n"
++ 
++ #: ../lib/inet_sr.c:203
+++#, c-format
++ msgid "route: Invalid initial rtt.\n"
++ msgstr "route: rtt initial invalide.\n"
++ 
++@@ -2256,75 +2530,92 @@ msgid "route: bogus netmask %s\n"
++ msgstr "route: netmask bogué %s\n"
++ 
++ #: ../lib/inet_sr.c:270
+++#, c-format
++ msgid "route: netmask doesn't match route address\n"
++ msgstr "route: netmask ne correspond pas à l'adresse de route\n"
++ 
++ #: ../lib/inet_sr.c:306
+++#, c-format
++ msgid "Flushing `inet' routing table not supported\n"
++ msgstr "Flush de table de routage `inet' pas supporté\n"
++ 
++ #: ../lib/inet_sr.c:310
+++#, c-format
++ msgid "Modifying `inet' routing cache not supported\n"
++ msgstr "Modification de cache de routage `inet' pas supporté\n"
++ 
++ #: ../lib/ipx_gr.c:52
+++#, c-format
++ msgid "IPX not configured in this system.\n"
++ msgstr "IPX pas configuré sur ce système.\n"
++ 
++ #: ../lib/ipx_gr.c:56
+++#, c-format
++ msgid "Kernel IPX routing table\n"
++ msgstr "Table de routage IPX du noyau\n"
++ 
++ #. xxx
++ #: ../lib/ipx_gr.c:57
+++#, c-format
++ msgid "Destination               Router Net                Router Node\n"
++ msgstr "Destination               Réseau Routeur            Noeud Routeur\n"
++ 
++ #: ../lib/ipx_sr.c:33
+++#, c-format
++ msgid "IPX: this needs to be written\n"
++ msgstr "IPX: ceci doit être écrit\n"
++ 
++-#: ../lib/masq_info.c:197
+++#: ../lib/masq_info.c:198
+++#, c-format
++ msgid "IP masquerading entries\n"
++ msgstr "Entrées IP Masquerade\n"
++ 
++-#: ../lib/masq_info.c:200
+++#: ../lib/masq_info.c:201
+++#, c-format
++ msgid "prot   expire source               destination          ports\n"
++ msgstr "prot   expire source               destination          ports\n"
++ 
++-#: ../lib/masq_info.c:203
+++#: ../lib/masq_info.c:204
+++#, c-format
++ msgid ""
++-"prot   expire    initseq delta prevd source               destination        "
++-"  ports\n"
+++"prot   expire    initseq delta prevd source               "
+++"destination          ports\n"
++ msgstr ""
++-"prot   expire    initseq delta precd source               destination        "
++-"  ports\n"
+++"prot   expire    initseq delta precd source               "
+++"destination          ports\n"
++ 
++ #: ../lib/netrom_gr.c:48
+++#, c-format
++ msgid "NET/ROM not configured in this system.\n"
++ msgstr "NET/ROM pas configuré sur ce système.\n"
++ 
++ #: ../lib/netrom_gr.c:51
+++#, c-format
++ msgid "Kernel NET/ROM routing table\n"
++ msgstr "Table de routage NET/ROM du noyau\n"
++ 
++ #: ../lib/netrom_gr.c:52
+++#, c-format
++ msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
++ msgstr "Destination  Mnemoniq  Qualité  Voisin     Iface\n"
++ 
++ #: ../lib/netrom_sr.c:34
+++#, c-format
++ msgid "netrom usage\n"
++ msgstr "utilisation netrom\n"
++ 
++ #: ../lib/netrom_sr.c:44
+++#, c-format
++ msgid "NET/ROM: this needs to be written\n"
++ msgstr "NET/ROM: ceci doit être écrit\n"
++ 
++ #: ../lib/ppp.c:44
+++#, c-format
++ msgid "You cannot start PPP with this program.\n"
++ msgstr "Vous ne pouvez démarrer PPP avec ce programme.\n"
++ 
++ #: ../lib/ppp_ac.c:38
+++#, c-format
++ msgid "Sorry, use pppd!\n"
++ msgstr "Désolé, utilisez pppd !\n"
++ 
++@@ -2333,49 +2624,314 @@ msgid "Node address must be ten digits"
++ msgstr "L'adresse de noeud doit avoir 10 chiffres"
++ 
++ #: ../lib/rose_gr.c:51
+++#, c-format
++ msgid "ROSE not configured in this system.\n"
++ msgstr "ROSE pas configuré sur ce système.\n"
++ 
++ #: ../lib/rose_gr.c:54
+++#, c-format
++ msgid "Kernel ROSE routing table\n"
++ msgstr "Table de routage ROSE du noyau\n"
++ 
++-#: ../lib/tr.c:70 ../lib/tr.c:85
+++#: ../lib/tr.c:86 ../lib/tr.c:101
++ #, c-format
++ msgid "in_tr(%s): invalid token ring address!\n"
++ msgstr "in_tr(%s): adresse token-ring invalide !\n"
++ 
++-#: ../lib/tr.c:97
+++#: ../lib/tr.c:113
++ #, c-format
++ msgid "in_tr(%s): trailing : ignored!\n"
++ msgstr "in_tr(%s): restant : ignoré !\n"
++ 
++-#: ../lib/tr.c:109
+++#: ../lib/tr.c:125
++ #, c-format
++ msgid "in_tr(%s): trailing junk!\n"
++ msgstr "in_tr(%s): restant à la poubelle !\n"
++ 
++-#: ../lib/interface.c:124
+++#: ../lib/interface.c:176
++ #, c-format
++ msgid "warning: no inet socket available: %s\n"
++ msgstr "attention: pas de socket inet disponible: %s\n"
++ 
++-#: ../lib/interface.c:270
+++#: ../lib/interface.c:325
++ #, c-format
++ msgid "Warning: cannot open %s (%s). Limited output.\n"
++ msgstr ""
++ 
++ #. Give better error message for this case.
++-#: ../lib/interface.c:504
+++#: ../lib/interface.c:571
++ msgid "Device not found"
++ msgstr "Périphérique non trouvé"
++ 
++-#: ../lib/interface.c:508
+++#: ../lib/interface.c:575
++ #, c-format
++ msgid "%s: error fetching interface information: %s\n"
++ msgstr "%s: erreur lors de la recherche d'infos sur l'interface: %s\n"
++ 
++-#: ../lib/sockets.c:59
+++#: ../lib/interface.c:608
+++msgid "     - no statistics available -"
+++msgstr ""
+++
+++#: ../lib/interface.c:612
+++#, c-format
+++msgid "[NO FLAGS]"
+++msgstr "[PAS INDICATEURS]"
+++
+++#: ../lib/interface.c:688
+++#, c-format
+++msgid "%-9.9s Link encap:%s  "
+++msgstr "%-9.9s Lien encap:%s  "
+++
+++#: ../lib/interface.c:693
+++#, c-format
+++msgid "HWaddr %s  "
+++msgstr "HWaddr %s  "
+++
+++#: ../lib/interface.c:696
+++#, c-format
+++msgid "Media:%s"
+++msgstr "Media:%s"
+++
+++#: ../lib/interface.c:698
+++#, c-format
+++msgid "(auto)"
+++msgstr "(auto)"
+++
+++#: ../lib/interface.c:705
+++#, c-format
+++msgid "          %s addr:%s "
+++msgstr "          %s adr:%s "
+++
+++#: ../lib/interface.c:708
+++#, c-format
+++msgid " P-t-P:%s "
+++msgstr " P-t-P:%s "
+++
+++#: ../lib/interface.c:711
+++#, c-format
+++msgid " Bcast:%s "
+++msgstr " Bcast:%s "
+++
+++#: ../lib/interface.c:713
+++#, c-format
+++msgid " Mask:%s\n"
+++msgstr " Masque:%s\n"
+++
+++#: ../lib/interface.c:730
+++#, c-format
+++msgid "          inet6 addr: %s/%d"
+++msgstr "          adr inet6: %s/%d"
+++
+++#: ../lib/interface.c:732
+++#, c-format
+++msgid " Scope:"
+++msgstr " Scope:"
+++
+++#: ../lib/interface.c:735
+++#, c-format
+++msgid "Global"
+++msgstr "Global"
+++
+++#: ../lib/interface.c:738
+++#, c-format
+++msgid "Link"
+++msgstr "Lien"
+++
+++#: ../lib/interface.c:741
+++#, c-format
+++msgid "Site"
+++msgstr "Site"
+++
+++#: ../lib/interface.c:744
+++#, c-format
+++msgid "Compat"
+++msgstr "Compat"
+++
+++#: ../lib/interface.c:747
+++#, c-format
+++msgid "Host"
+++msgstr "Hôte"
+++
+++#: ../lib/interface.c:750
+++#, c-format
+++msgid "Unknown"
+++msgstr "Inconnu"
+++
+++#: ../lib/interface.c:765
+++#, c-format
+++msgid "          IPX/Ethernet II addr:%s\n"
+++msgstr "          adr IPX/Ethernet II:%s\n"
+++
+++#: ../lib/interface.c:768
+++#, c-format
+++msgid "          IPX/Ethernet SNAP addr:%s\n"
+++msgstr "          adr IPX/Ethernet SNAP:%s\n"
+++
+++#: ../lib/interface.c:771
+++#, c-format
+++msgid "          IPX/Ethernet 802.2 addr:%s\n"
+++msgstr "          adr IPX/Ethernet 802.2:%s\n"
+++
+++#: ../lib/interface.c:774
+++#, c-format
+++msgid "          IPX/Ethernet 802.3 addr:%s\n"
+++msgstr "          adr IPX/Ethernet 802.3:%s\n"
+++
+++#: ../lib/interface.c:784
+++#, c-format
+++msgid "          EtherTalk Phase 2 addr:%s\n"
+++msgstr "          adr EtherTalk Phase 2:%s\n"
+++
+++#: ../lib/interface.c:793
+++#, c-format
+++msgid "          econet addr:%s\n"
+++msgstr "          adr econet:%s\n"
+++
+++#: ../lib/interface.c:800
+++#, c-format
+++msgid "[NO FLAGS] "
+++msgstr "[PAS INDICATEURS] "
+++
+++#: ../lib/interface.c:802
+++#, c-format
+++msgid "UP "
+++msgstr "UP "
+++
+++#: ../lib/interface.c:804
+++#, c-format
+++msgid "BROADCAST "
+++msgstr "BROADCAST "
+++
+++#: ../lib/interface.c:806
+++#, c-format
+++msgid "DEBUG "
+++msgstr "DEBUG "
+++
+++#: ../lib/interface.c:808
+++#, c-format
+++msgid "LOOPBACK "
+++msgstr "LOOPBACK "
+++
+++#: ../lib/interface.c:810
+++#, c-format
+++msgid "POINTOPOINT "
+++msgstr "POINTOPOINT "
+++
+++#: ../lib/interface.c:812
+++#, c-format
+++msgid "NOTRAILERS "
+++msgstr "NOTRAILERS "
+++
+++#: ../lib/interface.c:814
+++#, c-format
+++msgid "RUNNING "
+++msgstr "RUNNING "
+++
+++#: ../lib/interface.c:816
+++#, c-format
+++msgid "NOARP "
+++msgstr "NOARP "
+++
+++#: ../lib/interface.c:818
+++#, c-format
+++msgid "PROMISC "
+++msgstr "PROMISC "
+++
+++#: ../lib/interface.c:820
+++#, c-format
+++msgid "ALLMULTI "
+++msgstr "ALLMULTI "
+++
+++#: ../lib/interface.c:822
+++#, c-format
+++msgid "SLAVE "
+++msgstr "SLAVE "
+++
+++#: ../lib/interface.c:824
+++#, c-format
+++msgid "MASTER "
+++msgstr "MASTER "
+++
+++#: ../lib/interface.c:826
+++#, c-format
+++msgid "MULTICAST "
+++msgstr "MULTICAST "
+++
+++#: ../lib/interface.c:829
+++#, c-format
+++msgid "DYNAMIC "
+++msgstr "DYNAMIC "
+++
+++#. DONT FORGET TO ADD THE FLAGS IN ife_print_short
+++#: ../lib/interface.c:832
+++#, c-format
+++msgid " MTU:%d  Metric:%d"
+++msgstr " MTU:%d  Metric:%d"
+++
+++#: ../lib/interface.c:836
+++#, c-format
+++msgid "  Outfill:%d  Keepalive:%d"
+++msgstr "  Outfill:%d  Keepalive:%d"
+++
+++#: ../lib/interface.c:850
+++#, fuzzy, c-format
+++msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
+++msgstr "Paquets Reçus:%lu erreurs:%lu jetés:%lu débordements:%lu trames:%lu\n"
+++
+++#: ../lib/interface.c:855
+++#, c-format
+++msgid "             compressed:%lu\n"
+++msgstr "             compressés:%lu\n"
+++
+++#: ../lib/interface.c:895
+++#, fuzzy, c-format
+++msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
+++msgstr "Paquets transmis:%lu erreurs:%lu jetés:%lu débordements:%lu carrier:%lu\n"
+++
+++#: ../lib/interface.c:899
+++#, c-format
+++msgid "          collisions:%lu "
+++msgstr "          collisions:%lu "
+++
+++#: ../lib/interface.c:901
+++#, c-format
+++msgid "compressed:%lu "
+++msgstr "compressés:%lu "
+++
+++#: ../lib/interface.c:903
+++#, c-format
+++msgid "txqueuelen:%d "
+++msgstr "lg file transmission:%d "
+++
+++#: ../lib/interface.c:905
+++#, c-format
+++msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
+++msgstr ""
+++
+++#: ../lib/interface.c:916
+++#, c-format
+++msgid "Interrupt:%d "
+++msgstr "Interruption:%d "
+++
+++#. Only print devices using it for
+++#. I/O maps
+++#: ../lib/interface.c:919
+++#, c-format
+++msgid "Base address:0x%x "
+++msgstr "Adresse de base:0x%x "
+++
+++#: ../lib/interface.c:921
+++#, c-format
+++msgid "Memory:%lx-%lx "
+++msgstr "Mémoire:%lx-%lx "
+++
+++#: ../lib/interface.c:924
+++#, c-format
+++msgid "DMA chan:%x "
+++msgstr "Canal DMA:%x "
+++
+++#: ../lib/sockets.c:63
+++#, c-format
++ msgid "No usable address families found.\n"
++ msgstr "Pas de famille d'adresses utilisable trouvée.\n"
++ 
++@@ -2399,29 +2955,32 @@ msgstr "ip: %s est une adresse IPv4 inva
++ msgid "ip: argument is wrong: %s\n"
++ msgstr "ip: argument incorrect: %s\n"
++ 
++-#: ../ipmaddr.c:56
+++#: ../ipmaddr.c:61
+++#, c-format
++ msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
++ msgstr "Syntaxe: ipmaddr [ add | del ] MULTIADR dev CHAINE\n"
++ 
++-#: ../ipmaddr.c:57
+++#: ../ipmaddr.c:62
+++#, c-format
++ msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
++ msgstr "       ipmaddr show [ dev CHAINE ] [ ipv4 | ipv6 | link | all ]\n"
++ 
++-#: ../ipmaddr.c:58
+++#: ../ipmaddr.c:63
+++#, c-format
++ msgid "       ipmaddr -V | -version\n"
++ msgstr ""
++ 
++-#: ../ipmaddr.c:258
+++#: ../ipmaddr.c:263
++ #, c-format
++ msgid "family %d "
++ msgstr ""
++ 
++-#: ../ipmaddr.c:267
+++#: ../ipmaddr.c:272
++ #, c-format
++ msgid " users %d"
++ msgstr ""
++ 
++-#: ../ipmaddr.c:353
+++#: ../ipmaddr.c:358
++ msgid "Cannot create socket"
++ msgstr "Ne peut créer une socket"
++ 
++@@ -2436,6 +2995,7 @@ msgid "slattach: tty_lock: (%s): %s\n"
++ msgstr ""
++ 
++ #: ../slattach.c:192
+++#, fuzzy, c-format
++ msgid "slattach: cannot write PID file\n"
++ msgstr "slattach: tty_lock: (%s): %s\n"
++ 
++@@ -2454,59 +3014,88 @@ msgstr "slattach: tty_hangup(DROP): %s\n
++ msgid "slattach: tty_hangup(RAISE): %s\n"
++ msgstr "slattach: tty_hangup(RAISE): %s\n"
++ 
++-#: ../slattach.c:486
+++#: ../slattach.c:468
+++#, fuzzy, c-format
+++msgid "slattach: tty name too long\n"
+++msgstr "%s: nom trop long\n"
+++
+++#: ../slattach.c:498
+++#, c-format
++ msgid "slattach: tty_open: cannot get current state!\n"
++ msgstr "slattach: tty_open: ne peut obtenir l'état courant !\n"
++ 
++-#: ../slattach.c:493
+++#: ../slattach.c:505
+++#, c-format
++ msgid "slattach: tty_open: cannot get current line disc!\n"
++ msgstr ""
++ "slattach: tty_open: ne peut obtenir la discipline de ligne actuelle !\n"
++ 
++-#: ../slattach.c:501
+++#: ../slattach.c:513
+++#, c-format
++ msgid "slattach: tty_open: cannot set RAW mode!\n"
++ msgstr "slattach: tty_open: ne peut activer le mode RAW !\n"
++ 
++-#: ../slattach.c:508
+++#: ../slattach.c:520
++ #, c-format
++ msgid "slattach: tty_open: cannot set %s bps!\n"
++ msgstr "slattach: tty_open: ne peut passer à %s bps!\n"
++ 
++-#: ../slattach.c:518
+++#: ../slattach.c:530
+++#, c-format
++ msgid "slattach: tty_open: cannot set 8N1 mode!\n"
++ msgstr "slattach: tty_open: ne peut activer le mode 8N1 !\n"
++ 
++-#: ../slattach.c:686
+++#: ../slattach.c:672
+++#, c-format
+++msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n"
+++msgstr ""
+++
+++#: ../slattach.c:704
++ #, c-format
++ msgid "%s started"
++ msgstr ""
++ 
++-#: ../slattach.c:687
+++#: ../slattach.c:705
++ #, c-format
++ msgid " on %s"
++ msgstr ""
++ 
++-#: ../slattach.c:688
+++#: ../slattach.c:706
++ #, fuzzy, c-format
++ msgid " interface %s\n"
++ msgstr "%s: interface inconnue: %s\n"
++ 
++ #~ msgid ""
++-#~ "   This comand can get or set the hostname or the NIS domainname. You can\n"
++-#~ msgstr ""
++-#~ "   Cette commande ne peut obtenir ou définir le nom d'hôte ou le domaine "
++-#~ "NIS. Vous pouvez\n"
+++#~ "  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
+++#~ "<-''-\n"
+++#~ msgstr "  arp [-v]   [<MAT>] [-i <if>] -s  <hôte> <adrmat> [netmask <nm>] pub  <-''-\n"
+++
+++#~ msgid "%s: unknown interface: %s\n"
+++#~ msgstr "%s: interface inconnue: %s\n"
+++
+++#~ msgid "address mask replies"
+++#~ msgstr "réponses de masque d'adresses"
+++
+++#~ msgid "unknown title %s\n"
+++#~ msgstr "titre inconnu %s\n"
+++
+++#~ msgid "Routing table for `ddp' not yet supported.\n"
+++#~ msgstr "Table de routage pour `ddp' pas encore supporté.\n"
+++
+++#~ msgid ""
+++#~ "   This comand can get or set the hostname or the NIS domainname. You "
+++#~ "can\n"
+++#~ msgstr "   Cette commande ne peut obtenir ou définir le nom d'hôte ou le domaine NIS. Vous pouvez\n"
++ 
++ #~ msgid ""
++ #~ "   also get the DNS domain or the FQDN (fully qualified domain name).\n"
++ #~ msgstr ""
++-#~ "   aussi obtenir le domaine DNS ou le FQDN (fully qualified domain name).\n"
+++#~ "   aussi obtenir le domaine DNS ou le FQDN (fully qualified domain "
+++#~ "name).\n"
++ 
++ #~ msgid ""
++ #~ "   Unless you are using bind or NIS for host lookups you can change the\n"
++-#~ msgstr ""
++-#~ "   Sauf si vous utilisez bind ou NIS pour les recherches d'hôtes, vous "
++-#~ "pouvez changer le\n"
+++#~ msgstr "   Sauf si vous utilisez bind ou NIS pour les recherches d'hôtes, vous pouvez changer le\n"
++ 
++ #~ msgid ""
++ #~ "   FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n"
+--- net-tools-1.60.orig/debian/patches/CVS-20030911-nameif.c_sync.patch
++++ net-tools-1.60/debian/patches/CVS-20030911-nameif.c_sync.patch
+@@ -0,0 +1,90 @@
++Sync with upstream CVS, complete log:
++
++Revision 1.4 - Thu Sep 11 03:46:49 2003 UTC by ak
++Fix off by one in name length checking
++
++Revision 1.3 - Thu Mar 6 23:26:52 2003 UTC by ecki
++Fix Debian Bug#178209, Fix RedHat Bug#85748: nameif segfaults
++
++Revision 1.2 - Sun Nov 25 06:55:06 2001 UTC by ecki
++fixed debian bug#111642 reported by Jonathan Amery <jdamery@pick.ucam.org>
++(newline missing in nameif usage)
++
++Index: net-tools/nameif.c
++===================================================================
++--- net-tools.orig/nameif.c
+++++ net-tools/nameif.c
++@@ -3,7 +3,7 @@
++  * Writen 2000 by Andi Kleen.
++  * Subject to the Gnu Public License, version 2.  
++  * TODO: make it support token ring etc.
++- * $Id: nameif.c,v 1.1 2000/10/18 17:26:29 ak Exp $
+++ * $Id: nameif.c,v 1.4 2003/09/11 03:46:49 ak Exp $
++  */ 
++ #ifndef _GNU_SOURCE 
++ #define _GNU_SOURCE
++@@ -117,7 +117,8 @@ int getmac(char *name, unsigned char *ma
++ }
++ 
++ struct change { 
++-	struct change *next,**pprev;
+++	struct change *next;
+++	int found;
++ 	char ifname[IFNAMSIZ+1];
++ 	unsigned char mac[6];
++ }; 
++@@ -139,10 +140,7 @@ int addchange(char *p, struct change *ch
++ 			ch->ifname, pos); 
++ 	if (parsemac(p,ch->mac) < 0) 
++ 		complain(_("cannot parse MAC `%s' at %s"), p, pos); 
++-	if (clist) 
++-		clist->pprev = &ch->next;
++ 	ch->next = clist;
++-	ch->pprev = &clist;
++ 	clist = ch;
++ 	return 0; 
++ }
++@@ -177,7 +175,7 @@ void readconf(void)
++ 		if (*p == '\0')
++ 			continue; 
++ 		n = strcspn(p, " \t"); 
++-		if (n > IFNAMSIZ) 
+++		if (n > IFNAMSIZ-1) 
++ 			complain(_("interface name too long at line %d"), line);  
++ 		memcpy(ch->ifname, p, n); 
++ 		ch->ifname[n] = 0; 
++@@ -200,7 +198,7 @@ struct option lopt[] = { 
++ 
++ void usage(void)
++ {
++-	fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}")); 
+++	fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}\n")); 
++ 	exit(1); 
++ }
++ 
++@@ -277,21 +275,21 @@ int main(int ac, char **av) 
++ 		ch = lookupmac(mac); 
++ 		if (!ch) 
++ 			continue;
++-			
++-		*ch->pprev = ch->next;
+++		
+++		ch->found = 1;	
++ 		if (strcmp(p, ch->ifname)) { 
++ 			if (setname(p, ch->ifname) < 0)  
++ 				complain(_("cannot change name of %s to %s: %s"),
++ 						p, ch->ifname, strerror(errno)); 
++ 		} 
++-		free(ch);
++ 	} 
++ 	fclose(ifh); 
++ 	
++ 	while (clist) { 
++ 		struct change *ch = clist;
++ 		clist = clist->next;
++-		warning(_("interface '%s' not found"), ch->ifname); 
+++		if (!ch->found)
+++			warning(_("interface '%s' not found"), ch->ifname); 
++ 		free(ch); 
++ 	}
++ 
+--- net-tools-1.60.orig/debian/patches/netstat.c-assorted_changes.patch
++++ net-tools-1.60/debian/patches/netstat.c-assorted_changes.patch
+@@ -0,0 +1,138 @@
++Unsyncable patches that are nevertheless already in upstream's CVS in the
++following revisions:
++
++* 1.57: Enable netstat -s for IPv6 (Debian Bug #453859 from Varun Chandramohan)
++* 1.55: use new page aliged proc_fopen for address families
++
++Index: net-tools/netstat.c
++===================================================================
++--- net-tools.orig/netstat.c
+++++ net-tools/netstat.c
++@@ -6,7 +6,7 @@
++  *              NET-3 Networking Distribution for the LINUX operating
++  *              system.
++  *
++- * Version:     $Id: netstat.c,v 1.54 2007/12/01 18:12:34 ecki Exp $
+++ * Version:     $Id: netstat.c,v 1.55 2007/12/01 19:00:40 ecki Exp $
++  *
++  * Authors:     Fred Baumgarten, <dc6iq@insu1.etec.uni-karlsruhe.de>
++  *              Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
++@@ -94,6 +94,7 @@
++ #include "sockets.h"
++ #include "interface.h"
++ #include "util.h"
+++#include "proc.h"
++ 
++ #define PROGNAME_WIDTH 20
++ 
++@@ -104,6 +105,8 @@
++ /* prototypes for statistics.c */
++ void parsesnmp(int, int, int);
++ void inittab(void);
+++void parsesnmp6(int, int, int);
+++void inittab6(void);
++ 
++ typedef enum {
++     SS_FREE = 0,		/* not allocated                */
++@@ -153,7 +156,7 @@ int flag_ver = 0;
++ FILE *procinfo;
++ 
++ #define INFO_GUTS1(file,name,proc)			\
++-  procinfo = fopen((file), "r");			\
+++  procinfo = proc_fopen((file));			\
++   if (procinfo == NULL) {				\
++     if (errno != ENOENT) {				\
++       perror((file));					\
++@@ -174,7 +177,7 @@ FILE *procinfo;
++ #if HAVE_AFINET6
++ #define INFO_GUTS2(file,proc)				\
++   lnr = 0;						\
++-  procinfo = fopen((file), "r");		       	\
+++  procinfo = proc_fopen((file));		       	\
++   if (procinfo != NULL) {				\
++     do {						\
++       if (fgets(buffer, sizeof(buffer), procinfo))	\
++@@ -454,7 +457,7 @@ static int netrom_info(void)
++     char buffer[256], dev[16];
++     int st, vs, vr, sendq, recvq, ret;
++ 
++-    f = fopen(_PATH_PROCNET_NR, "r");
+++    f = proc_fopen(_PATH_PROCNET_NR);
++     if (f == NULL) {
++ 	if (errno != ENOENT) {
++ 	    perror(_PATH_PROCNET_NR);
++@@ -650,7 +653,7 @@ static void igmp_do_one(int lnr, const c
++ #if HAVE_AFX25
++ static int x25_info(void)
++ {
++-       FILE *f=fopen(_PATH_PROCNET_X25, "r");
+++       FILE *f=proc_fopen(_PATH_PROCNET_X25);
++        char buffer[256],dev[16];
++        int st,vs,vr,sendq,recvq,lci;
++        static char *x25_state[5]=
++@@ -661,7 +664,7 @@ static int x25_info(void)
++                "ESTABLISHED",
++                "RECOVERY"
++        };
++-       if(!(f=fopen(_PATH_PROCNET_X25, "r")))
+++       if(!(f=proc_fopen(_PATH_PROCNET_X25)))
++        {
++                if (errno != ENOENT) {
++                        perror(_PATH_PROCNET_X25);
++@@ -1269,7 +1272,7 @@ static int ax25_info(void)
++ 	N_("ESTABLISHED"),
++ 	N_("RECOVERY")
++     };
++-    if (!(f = fopen(_PATH_PROCNET_AX25, "r"))) {
+++    if (!(f = proc_fopen(_PATH_PROCNET_AX25))) {
++ 	if (errno != ENOENT) {
++ 	    perror(_PATH_PROCNET_AX25);
++ 	    return (-1);
++@@ -1365,13 +1368,13 @@ static int ipx_info(void)
++     unsigned sport = 0, dport = 0;
++     struct stat s;
++     
++-    f = fopen(_PATH_PROCNET_IPX_SOCKET1, "r");
+++    f = proc_fopen(_PATH_PROCNET_IPX_SOCKET1);
++     if (!f) {
++         if (errno != ENOENT) {
++             perror(_PATH_PROCNET_IPX_SOCKET1);
++             return (-1);
++         }
++-        f = fopen(_PATH_PROCNET_IPX_SOCKET2, "r");
+++        f = proc_fopen(_PATH_PROCNET_IPX_SOCKET2);
++ 
++         /* We need to check for directory */
++         if (f) {
++@@ -1728,9 +1731,28 @@ int main
++     }
++ 
++     if (flag_sta) {
++-        inittab();
++-	parsesnmp(flag_raw, flag_tcp, flag_udp);
++-	exit(0);
+++        char *tmp1, *tmp2;
+++        char buf[256];
+++        if (!afname[0]) {
+++            inittab();
+++            parsesnmp(flag_raw, flag_tcp, flag_udp);
+++        } else {
+++            safe_strncpy(buf, afname, sizeof(buf));
+++            tmp1 = buf;
+++            if ((tmp2 = index(tmp1, ',')))
+++                 printf("Multiple interface\n");
+++            else if(!strncmp(buf,"inet6",5)) {
+++#if HAVE_AFINET6
+++                 inittab6();
+++                 parsesnmp6(flag_raw, flag_tcp, flag_udp);
+++#else
+++                 printf("Address type not supported for stats\n");
+++#endif
+++            }
+++            else
+++                 printf("Address type not supported for stats\n");
+++        }
+++        exit(1);
++     }
++     
++     if (flag_rou) {
diff --git a/source/n/netdate/netdate.SlackBuild b/source/n/netdate/netdate.SlackBuild
index 3d13e75e..f2fbe6a4 100755
--- a/source/n/netdate/netdate.SlackBuild
+++ b/source/n/netdate/netdate.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=bsd4
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-netdate
diff --git a/source/n/netkit-bootparamd/netkit-bootparamd.SlackBuild b/source/n/netkit-bootparamd/netkit-bootparamd.SlackBuild
index 2beca124..64cfafdf 100755
--- a/source/n/netkit-bootparamd/netkit-bootparamd.SlackBuild
+++ b/source/n/netkit-bootparamd/netkit-bootparamd.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2007-2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2007-2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=0.17
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-netkit-bootparamd
diff --git a/source/n/netkit-ftp/netkit-ftp.SlackBuild b/source/n/netkit-ftp/netkit-ftp.SlackBuild
index b97888bb..5ad8a161 100755
--- a/source/n/netkit-ftp/netkit-ftp.SlackBuild
+++ b/source/n/netkit-ftp/netkit-ftp.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2007-2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2007-2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=0.17
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-netkit-ftp
diff --git a/source/n/netkit-ntalk/netkit-ntalk.SlackBuild b/source/n/netkit-ntalk/netkit-ntalk.SlackBuild
index 9bc9937d..9b41fa2d 100755
--- a/source/n/netkit-ntalk/netkit-ntalk.SlackBuild
+++ b/source/n/netkit-ntalk/netkit-ntalk.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2007-2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2007-2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=0.17
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-3}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-netkit-ntalk
diff --git a/source/n/netkit-routed/netkit-routed.SlackBuild b/source/n/netkit-routed/netkit-routed.SlackBuild
index 326aa5ec..8881ba41 100755
--- a/source/n/netkit-routed/netkit-routed.SlackBuild
+++ b/source/n/netkit-routed/netkit-routed.SlackBuild
@@ -22,9 +22,18 @@
 
 
 VERSION=0.17
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-netkit-routed
diff --git a/source/n/netkit-rsh/netkit-rsh.SlackBuild b/source/n/netkit-rsh/netkit-rsh.SlackBuild
index 009775f3..ee1e8ce5 100755
--- a/source/n/netkit-rsh/netkit-rsh.SlackBuild
+++ b/source/n/netkit-rsh/netkit-rsh.SlackBuild
@@ -22,9 +22,18 @@
 
 
 VERSION=0.17
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-netkit-rsh
diff --git a/source/n/netkit-rsh/slack-desc b/source/n/netkit-rsh/slack-desc
index 8c05f481..8b5b7dc2 100644
--- a/source/n/netkit-rsh/slack-desc
+++ b/source/n/netkit-rsh/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
           |-----handy-ruler------------------------------------------------------|
-netkit-rsh: netket-rsh (the BSD rsh/rcp/rlogin clients and daemon)
+netkit-rsh: netkit-rsh (the BSD rsh/rcp/rlogin clients and daemon)
 netkit-rsh:
 netkit-rsh: The old BSD rsh suite.  Note that none of these programs provide
 netkit-rsh: encryption or strong authentication of network connections.  As such,
diff --git a/source/n/netkit-rusers/netkit-rusers.SlackBuild b/source/n/netkit-rusers/netkit-rusers.SlackBuild
index 2c87797c..b8b79fb6 100755
--- a/source/n/netkit-rusers/netkit-rusers.SlackBuild
+++ b/source/n/netkit-rusers/netkit-rusers.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2007-2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2007-2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=0.17
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-netkit-rusers
diff --git a/source/n/netkit-rwall/netkit-rwall.SlackBuild b/source/n/netkit-rwall/netkit-rwall.SlackBuild
index 67e73c26..5561e4fe 100755
--- a/source/n/netkit-rwall/netkit-rwall.SlackBuild
+++ b/source/n/netkit-rwall/netkit-rwall.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2007-2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2007-2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=0.17
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-netkit-rwall
diff --git a/source/n/netkit-rwho/netkit-rwho.SlackBuild b/source/n/netkit-rwho/netkit-rwho.SlackBuild
index e3b46a49..e4ba49b2 100755
--- a/source/n/netkit-rwho/netkit-rwho.SlackBuild
+++ b/source/n/netkit-rwho/netkit-rwho.SlackBuild
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=0.17
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-netkit-rwho
diff --git a/source/n/netkit-timed/netkit-timed.SlackBuild b/source/n/netkit-timed/netkit-timed.SlackBuild
index 3e703f84..bd511e30 100755
--- a/source/n/netkit-timed/netkit-timed.SlackBuild
+++ b/source/n/netkit-timed/netkit-timed.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2007-2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2007-2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=0.17
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-netkit-timed
diff --git a/source/n/netpipes/netpipes.SlackBuild b/source/n/netpipes/netpipes.SlackBuild
index 9dd2ebd8..17d81bbb 100755
--- a/source/n/netpipes/netpipes.SlackBuild
+++ b/source/n/netpipes/netpipes.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=4.2
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-netpipes
diff --git a/source/n/netwatch/netwatch.SlackBuild b/source/n/netwatch/netwatch.SlackBuild
index 878269cc..dd87b1d6 100755
--- a/source/n/netwatch/netwatch.SlackBuild
+++ b/source/n/netwatch/netwatch.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,9 +23,18 @@
 
 VERSION=1.3.0
 EXTRAVERSION=${EXTRAVERSION:-1}
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 if [ "$ARCH" = "i486" ]; then
@@ -34,6 +43,8 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 CWD=$(pwd)
diff --git a/source/n/netwrite/netwrite.SlackBuild b/source/n/netwrite/netwrite.SlackBuild
index edebb6cc..c667d3aa 100755
--- a/source/n/netwrite/netwrite.SlackBuild
+++ b/source/n/netwrite/netwrite.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=0.17
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
diff --git a/source/n/newspost/newspost.SlackBuild b/source/n/newspost/newspost.SlackBuild
index 99fee17e..cd01269a 100755
--- a/source/n/newspost/newspost.SlackBuild
+++ b/source/n/newspost/newspost.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=2.1.1
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
diff --git a/source/n/nfs-utils/doinst.sh b/source/n/nfs-utils/doinst.sh
new file mode 100644
index 00000000..214ff1b9
--- /dev/null
+++ b/source/n/nfs-utils/doinst.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+config var/lib/nfs/etab.new
+config var/lib/nfs/rmtab.new
+config var/lib/nfs/state.new
+config var/lib/nfs/xtab.new
+rm -f var/lib/nfs/*.new
+if [ -x etc/rc.d/rc.nfsd ]; then
+  chmod 755 etc/rc.d/rc.nfsd.new
+else
+  chmod 644 etc/rc.d/rc.nfsd.new
+fi
+config etc/rc.d/rc.nfsd.new
+config etc/nfsmount.conf.new
+config etc/exports.new
+# If you already had your own /etc/exports, this one is probably useless...
+rm -f etc/exports.new
+( cd sbin ; rm -rf umount.nfs )
+( cd sbin ; ln -sf mount.nfs umount.nfs )
+( cd usr/man/man8 ; rm -rf rpc.mountd.8.gz )
+( cd usr/man/man8 ; ln -sf mountd.8.gz rpc.mountd.8.gz )
+( cd usr/man/man8 ; rm -rf rpc.nfsd.8.gz )
+( cd usr/man/man8 ; ln -sf nfsd.8.gz rpc.nfsd.8.gz )
+( cd usr/man/man8 ; rm -rf rpc.statd.8.gz )
+( cd usr/man/man8 ; ln -sf statd.8.gz rpc.statd.8.gz )
+( cd usr/man/man8 ; rm -rf rpc.sm-notify.8.gz )
+( cd usr/man/man8 ; ln -sf sm-notify.8.gz rpc.sm-notify.8.gz )
+( cd usr/sbin ; rm -rf rpc.statd )
+( cd usr/sbin ; ln -sf ../../sbin/rpc.statd rpc.statd )
diff --git a/source/n/nfs-utils/nfs-utils-1.2.2.tar.bz2.sign b/source/n/nfs-utils/nfs-utils-1.2.2.tar.bz2.sign
deleted file mode 100644
index a4b95a79..00000000
--- a/source/n/nfs-utils/nfs-utils-1.2.2.tar.bz2.sign
+++ /dev/null
@@ -1,8 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-Comment: See http://www.kernel.org/signature.html for info
-
-iD8DBQBLfTsAyGugalF9Dw4RAgLSAJ0TnlJLHcU7dEWZ80LA775ZuQnrigCgjnWB
-bxbY8o9jiBY9G422Fh6b8bA=
-=dG1E
------END PGP SIGNATURE-----
diff --git a/source/n/nfs-utils/nfs-utils-1.2.3.tar.sign b/source/n/nfs-utils/nfs-utils-1.2.3.tar.sign
new file mode 100644
index 00000000..f159e0b6
--- /dev/null
+++ b/source/n/nfs-utils/nfs-utils-1.2.3.tar.sign
@@ -0,0 +1,8 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+Comment: See http://www.kernel.org/signature.html for info
+
+iD8DBQBMoeJcyGugalF9Dw4RApKyAJ91WfvKRivOd7XKaUXrNaIDlhwozACfacf5
+b0Maa5t3jk5Pnj+IQqvic+g=
+=cnNE
+-----END PGP SIGNATURE-----
diff --git a/source/n/nfs-utils/nfs-utils.SlackBuild b/source/n/nfs-utils/nfs-utils.SlackBuild
index 8f3e3ef8..2cf5a150 100755
--- a/source/n/nfs-utils/nfs-utils.SlackBuild
+++ b/source/n/nfs-utils/nfs-utils.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,8 +21,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=1.2.2
-BUILD=${BUILD:-1}
+VERSION=1.2.3
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -64,7 +64,7 @@ chmod 644 $PKG/etc/rc.d/rc.nfsd.new
 
 cd $TMP
 rm -rf nfs-utils-$VERSION
-tar xvf $CWD/nfs-utils-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/nfs-utils-$VERSION.tar.xz || exit 1
 cd nfs-utils-$VERSION || exit 1
 
 zcat $CWD/nfs-utils.lwrap.needs.lnsl.diff.gz | patch -p1 --verbose || exit 1
@@ -84,6 +84,7 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --with-statedir=/var/lib/nfs \
   --enable-nfsv3 \
+  --enable-mountconfig \
   --enable-nfsv4=no \
   --enable-gss=no \
   --enable-tirpc=no \
@@ -94,6 +95,13 @@ CFLAGS="$SLKCFLAGS" \
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
+# Add nfsmount.conf and man page:
+cat ./utils/mount/nfsmount.conf > $PKG/etc/nfsmount.conf.new
+mkdir -p $PKG/usr/man/man5
+cat ./utils/mount/nfsmount.conf.man > $PKG/usr/man/man5/nfsmount.conf.5
+# Set default protocol version 3:
+sed -i "s/# Defaultvers=4/Defaultvers=3/g" $PKG/etc/nfsmount.conf.new
+
 # These might be in use:
 ( cd $PKG/var/lib/nfs
   for config_file in etab rmtab state xtab ; do
@@ -114,13 +122,21 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \
 
 mkdir -p $PKG/usr/doc/nfs-utils-$VERSION
 cp -a \
-  AUTHORS COPYING INSTALL NEWS README \
+  AUTHORS COPYING* INSTALL NEWS README* \
   $PKG/usr/doc/nfs-utils-$VERSION
 mkdir -p $PKG/usr/doc/nfs-utils-$VERSION/statd
 cp -a \
   utils/statd/COPYING utils/statd/COPYRIGHT utils/statd/TODO \
   $PKG/usr/doc/nfs-utils-$VERSION/statd
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 # Compress and if needed symlink the man pages:
 if [ -d $PKG/usr/man ]; then
   ( cd $PKG/usr/man
@@ -138,38 +154,7 @@ fi
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat << EOF > $PKG/install/doinst.sh
-#!/bin/sh
-config() {
-  NEW="\$1"
-  OLD="\$(dirname \$NEW)/\$(basename \$NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r \$OLD ]; then
-    mv \$NEW \$OLD
-  elif [ "\$(cat \$OLD | md5sum)" = "\$(cat \$NEW | md5sum)" ]; then # toss the redundant copy
-    rm \$NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-EOF
-( cd $PKG/var/lib/nfs
-  for config_file in etab.new rmtab.new state.new xtab.new ; do
-    if [ -r ${config_file} ]; then
-      echo "config var/lib/nfs/${config_file}" >> $PKG/install/doinst.sh
-    fi
-  done
-)
-# If these aren't moved into place, they're junk:
-echo "rm -f var/lib/nfs/*.new" >> $PKG/install/doinst.sh
-cat << EOF >> $PKG/install/doinst.sh
-if [ -x etc/rc.d/rc.nfsd ]; then
-  chmod 755 etc/rc.d/rc.nfsd.new
-else
-  chmod 644 etc/rc.d/rc.nfsd.new
-fi
-config etc/rc.d/rc.nfsd.new
-config etc/exports.new
-EOF
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 
 # Build the package:
 cd $PKG
diff --git a/source/n/nfs-utils/rc.nfsd b/source/n/nfs-utils/rc.nfsd
index f2113382..b43bd3b8 100644
--- a/source/n/nfs-utils/rc.nfsd
+++ b/source/n/nfs-utils/rc.nfsd
@@ -16,9 +16,9 @@ nfsd_start() {
     exit # no uncommented shares in /etc/exports
   fi
 
-  # First, make sure the nfsd kernel module is loaded.  You can comment this
-  # part out if you've built nfsd support directly into the kernel.
-  if [ -z "`/sbin/lsmod | grep "^nfsd "`" ]; then
+  # If we do not detect nfsd support built into the kernel (or previously
+  # loaded as a module), we will try to load the nfsd.ko kernel module:
+  if [ ! -r /proc/1/net/rpc/nfsd ]; then
     /sbin/modprobe nfsd
   fi
 
diff --git a/source/n/nmap/nmap.SlackBuild b/source/n/nmap/nmap.SlackBuild
index 747836cc..d228e63a 100755
--- a/source/n/nmap/nmap.SlackBuild
+++ b/source/n/nmap/nmap.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,7 +20,7 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=${VERSION:-5.21}
+VERSION=${VERSION:-5.51}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -75,7 +75,8 @@ find . \
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-   --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --with-liblua=included \
   --mandir=/usr/man \
   --docdir=/usr/doc/nmap-$VERSION \
   --build=$ARCH-slackware-linux
@@ -84,7 +85,10 @@ make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
 mkdir -p $PKG/usr/doc/nmap-$VERSION
-cp -a COPYING* HACKING INSTALL $PKG/usr/doc/nmap-$VERSION
+cp -a COPYING* HACKING INSTALL \
+  docs/licenses/ \
+  docs/*.txt \
+  $PKG/usr/doc/nmap-$VERSION
 ( cd docs
   # It looks like all of these translations are gone from the 4.00+ tarball, and
   # most of them are not available on the web site.  Sorry -- I didn't do it.
diff --git a/source/n/ntp/ntp.conf b/source/n/ntp/ntp.conf
index b2476786..74aae4c1 100644
--- a/source/n/ntp/ntp.conf
+++ b/source/n/ntp/ntp.conf
@@ -13,7 +13,10 @@
 #
 server	127.127.1.0	# local clock
 fudge	127.127.1.0 stratum 10	
-#server  pool.ntp.org
+
+#
+# NTP server (list one or more) to synchronize with:
+#server pool.ntp.org iburst
 
 #
 # Drift file.  Put this in a directory which the daemon can write to.
@@ -22,8 +25,12 @@ fudge	127.127.1.0 stratum 10
 # it to the file.
 #
 driftfile /etc/ntp/drift
-multicastclient			# listen on default 224.0.1.1
-broadcastdelay	0.008
+
+#
+# Uncomment to use a multicast NTP server on the local subnet:
+#multicastclient 224.0.1.1		# listen on default 224.0.1.1
+# Set an optional compensation for broadcast packet delay:
+#broadcastdelay	0.008
 
 #
 # Keys file.  If you want to diddle your server at run time, make a
@@ -37,8 +44,11 @@ broadcastdelay	0.008
 #requestkey	65535
 #controlkey	65535
 
+#
 # Don't serve time or stats to anyone else by default (more secure)
 restrict default noquery nomodify
+
+#
 # Trust ourselves.  :-)
 restrict 127.0.0.1
 
diff --git a/source/n/obex-data-server/obex-data-server.SlackBuild b/source/n/obex-data-server/obex-data-server.SlackBuild
index 512b0e0d..e81a071a 100755
--- a/source/n/obex-data-server/obex-data-server.SlackBuild
+++ b/source/n/obex-data-server/obex-data-server.SlackBuild
@@ -23,7 +23,7 @@
 
 PKGNAM=obex-data-server
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/n/obexftp/obexftp.SlackBuild b/source/n/obexftp/obexftp.SlackBuild
index e2992d55..c6be7ccc 100755
--- a/source/n/obexftp/obexftp.SlackBuild
+++ b/source/n/obexftp/obexftp.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
 
 PKGNAM=obexftp
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-5}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
diff --git a/source/n/openssh/openssh.SlackBuild b/source/n/openssh/openssh.SlackBuild
index 3d0d1a98..89a968f9 100755
--- a/source/n/openssh/openssh.SlackBuild
+++ b/source/n/openssh/openssh.SlackBuild
@@ -2,7 +2,7 @@
 
 # Copyright 2000 BSDi, Inc. Concord, CA, USA
 # Copyright 2001, 2002, 2003, 2004  Slackware Linux, Inc. Concord, CA, USA
-# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/source/n/openssh/rc.sshd b/source/n/openssh/rc.sshd
index 8b496568..cb2dfa41 100644
--- a/source/n/openssh/rc.sshd
+++ b/source/n/openssh/rc.sshd
@@ -12,6 +12,9 @@ sshd_start() {
   if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
     /usr/bin/ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
   fi
+  if [ ! -f /etc/ssh/ssh_host_ecdsa_key ]; then
+    /usr/bin/ssh-keygen -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key -N ''
+  fi
   /usr/sbin/sshd
 }
 
diff --git a/source/n/openssl/certwatch b/source/n/openssl/certwatch
index ac8d8340..8fef1509 100644
--- a/source/n/openssl/certwatch
+++ b/source/n/openssl/certwatch
@@ -93,7 +93,7 @@ find $CERTDIR -type f -maxdepth 1 | while read certfile ; do
     continue
   fi
   echo "$certfile" | grep -q -i '\.der$'
-  if [ $? -eq 0 -o "$(file "$certfile" | grep ASCII)" == "" ]; then
+  if [ $? -eq 0 -o "$(file "$certfile" | egrep '(ASCII|PEM)')" == "" ]; then
     inform=DER
   fi
   # We wont use '-checkend' since it is not properly documented (as of
diff --git a/source/n/openssl/doinst.sh-openssl b/source/n/openssl/doinst.sh-openssl
index f73c5a51..c92e6076 100644
--- a/source/n/openssl/doinst.sh-openssl
+++ b/source/n/openssl/doinst.sh-openssl
@@ -9,7 +9,13 @@ config() {
   fi
   # Otherwise, we leave the .new copy for the admin to consider...
 }
+
+# If there is a known buggy certwatch script with no local
+# modifications, just replace it:
+if [ "$(md5sum etc/cron.daily/certwatch 2> /dev/null)" = "32556321806f1850d56cb2ef8384b7a1  etc/cron.daily/certwatch" ]; then
+  cat etc/cron.daily/certwatch.new > etc/cron.daily/certwatch
+  touch -r etc/cron.daily/certwatch.new etc/cron.daily/certwatch
+fi
+
 config etc/ssl/openssl.cnf.new
 config etc/cron.daily/certwatch.new
-# If the admin has modified this in any way, no need to keep the sample.
-rm -f etc/cron.daily/certwatch.new
diff --git a/source/n/openssl/openssl.SlackBuild b/source/n/openssl/openssl.SlackBuild
index 82aa87f3..f0e55b52 100755
--- a/source/n/openssl/openssl.SlackBuild
+++ b/source/n/openssl/openssl.SlackBuild
@@ -2,7 +2,7 @@
 
 # Copyright 2000 BSDi, Inc. Concord, CA, USA
 # Copyright 2001, 2002 Slackware Linux, Inc.  Concord, CA, USA
-# Copyright 2005, 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -28,7 +28,7 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp}
 
 VERSION=${VERSION:-$(echo openssl-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -65,6 +65,15 @@ elif [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 fi
 
+# OpenSSL has a (nasty?) habit of bumping the internal version number with
+# every release.  This wouldn't be so bad, but some applications are so
+# paranoid that they won't run against a different OpenSSL version than
+# what they were compiled against, whether or not the ABI has changed.
+#
+# So, we will use the OPENSSL_VERSION_NUMBER from openssl-0.9.8o unless ABI
+# breakage forces it to change.  Yes, we're finally using this old trick.  :)
+sed -i "s/#define OPENSSL_VERSION_NUMBER.*/\/* Use 0x009080efL (0.9.8o) below to avoid pointlessly breaking the ABI *\/\n#define OPENSSL_VERSION_NUMBER 0x009080efL/g" crypto/opensslv.h || exit 1
+
 chown -R root:root .
 mkdir -p $PKG1/usr/doc/openssl-$VERSION
 cp -a CHANGES CHANGES.SSLeay FAQ INSTALL INSTALL.MacOS INSTALL.VMS INSTALL.W32 \
diff --git a/source/n/openvpn/openvpn.SlackBuild b/source/n/openvpn/openvpn.SlackBuild
index 56e344c4..f0c78ce7 100755
--- a/source/n/openvpn/openvpn.SlackBuild
+++ b/source/n/openvpn/openvpn.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2006, Alan Hicks, Lizella, GA
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 
 
 PKGNAM=openvpn
-VERSION=2.1.1
-BUILD=${BUILD:-1}
+VERSION=2.1.4
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -83,6 +83,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/openvpn-${VERSION} \
   --enable-lzo \
+  --enable-iproute2 \
   --build=$ARCH-slackware-linux
 
 make $NUMJOBS || make || exit 1
@@ -124,8 +125,8 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a AUTHORS COPYING COPYRIGHT.GPL INSTALL INSTALL-win32.txt \
-  NEWS PORTS README sample-config-files sample-keys sample-scripts easy-rsa \
+cp -a AUTHORS COPYING* COPYRIGHT.GPL INSTALL INSTALL-win32.txt \
+  NEWS PORTS README* sample-config-files sample-keys sample-scripts easy-rsa \
   $PKG/usr/doc/$PKGNAM-$VERSION
 
 # If there's a ChangeLog, installing at least part of the recent history
diff --git a/source/n/php/doinst.sh b/source/n/php/doinst.sh
index 15f611b5..eda8b0de 100644
--- a/source/n/php/doinst.sh
+++ b/source/n/php/doinst.sh
@@ -4,5 +4,5 @@ elif [ "`cat etc/httpd/mod_php.conf 2> /dev/null`" = "" ]; then
   cp -a etc/httpd/mod_php.conf.example etc/httpd/mod_php.conf
 fi
 if [ ! -r etc/httpd/php.ini ]; then
-   cp -a etc/httpd/php.ini-recommended etc/httpd/php.ini
+   cp -a etc/httpd/php.ini-production etc/httpd/php.ini
 fi
diff --git a/source/n/php/fetch-php.sh b/source/n/php/fetch-php.sh
new file mode 100755
index 00000000..5833da49
--- /dev/null
+++ b/source/n/php/fetch-php.sh
@@ -0,0 +1 @@
+lftpget http://us2.php.net/distributions/php-5.3.6.tar.bz2 
diff --git a/source/n/php/php.SlackBuild b/source/n/php/php.SlackBuild
index dc0b74bb..7a1fc1fd 100755
--- a/source/n/php/php.SlackBuild
+++ b/source/n/php/php.SlackBuild
@@ -3,7 +3,7 @@
 # Build and package mod_php on Slackware.
 # by:  David Cantrell <david@slackware.com>
 # Modified for PHP 4-5 by volkerdi@slackware.com
-# Copyright 2007, 2008, 2009, 2010  Patrick Volkerding, Sebeka, MN, USA
+# Copyright 2007, 2008, 2009, 2010, 2011  Patrick Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,9 +24,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=5.2.13
+VERSION=5.3.6
 ALPINE=2.00
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-6}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -95,8 +95,8 @@ rm -rf php-$VERSION
 tar xvf $CWD/php-$VERSION.tar.?z* || exit 1
 cd php-$VERSION
 
-zcat $CWD/php.gmp5.diff.gz | patch -p1 --verbose || exit 1
-zcat $CWD/php.gd_libpng-1.4.diff.gz | patch -p1 --verbose || exit 1
+# cleanup:
+find . -name "*.orig" -delete
 
 # Add missing(?) PEAR modules back:
 if [ -d php-$VERSION/pear/packages ]; then
@@ -124,12 +124,9 @@ find . -name "*.h" -exec chmod 644 {} \;
 find . -name "*.orig" -exec rm {} \;
 
 # Patch ini files:
-zcat $CWD/php.ini.diff.gz \
-  | sed -e "s#usr/lib/php#usr/lib${LIBDIRSUFFIX}/php#" \
-  | patch -p1 --verbose --backup --suffix=.orig || exit 1
-zcat $CWD/php.recommended.ini.diff.gz \
-  | sed -e "s#usr/lib/php#usr/lib${LIBDIRSUFFIX}/php#" \
-  | patch -p1 --verbose --backup --suffix=.orig || exit 1
+zcat $CWD/php.ini-development.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/php.ini-development.diff.gz | patch -p1 --verbose php.ini-production || exit 1
+zcat $CWD/php.session.save_path.diff.gz | patch -p1 --verbose || exit 1
 
 # Generic "kitchen sink" configure function, with as many things as possible (and
 # maybe then some ;-) compiled as shared extensions:
@@ -155,7 +152,6 @@ CFLAGS="$SLKCFLAGS" \
   --enable-xml \
   --with-libxml-dir=/usr \
   --enable-simplexml \
-  --enable-spl \
   --enable-filter \
   --disable-debug \
   --with-openssl=shared \
@@ -171,7 +167,6 @@ CFLAGS="$SLKCFLAGS" \
   --enable-dba=shared \
   --with-gdbm=/usr \
   --with-db4=/usr \
-  --enable-dbase=shared \
   --enable-exif=shared \
   --enable-ftp=shared \
   --with-gd=shared \
@@ -191,19 +186,21 @@ CFLAGS="$SLKCFLAGS" \
   --with-ldap=shared \
   --enable-mbstring=shared \
   --enable-hash \
-  --with-mhash=shared,/usr \
-  --with-mysql=shared,/usr \
-  --with-mysqli=shared,/usr/bin/mysql_config \
+  --with-mysql=shared,mysqlnd \
+  --with-mysqli=shared,mysqlnd \
+  --with-mysql-sock=/var/run/mysql/mysql.sock \
   --enable-pdo=shared \
-  --with-pdo-mysql=shared,/usr \
+  --with-pdo-mysql=shared,mysqlnd \
   --with-pdo-sqlite=shared,/usr \
   --with-pspell=shared,/usr \
+  --with-enchant=shared,/usr \
   --with-mm=/usr \
   --enable-shmop=shared \
   --with-snmp=shared,/usr \
   --enable-soap=shared \
   --enable-sockets \
   --with-sqlite=shared \
+  --with-sqlite3=shared \
   --enable-sqlite-utf8 \
   --with-regex=php \
   --enable-sysvmsg \
@@ -232,44 +229,26 @@ php_configure \
 make $NUMJOBS || make || exit 1
 make install INSTALL_ROOT=$PKG || exit 1
 
-# Make the CLI version of PHP:
+# Make the CLI/CGI version of PHP:
 make distclean
 php_configure \
-  --enable-force-cgi-redirect \
   --enable-pcntl \
   --enable-sigchild
 make $NUMJOBS || make || exit 1
 mkdir -p $PKG/usr/bin
 cat ./sapi/cli/php > $PKG/usr/bin/php
+cat ./sapi/cgi/php-cgi > $PKG/usr/bin/php-cgi
 chmod 755 $PKG/usr/bin/php
-
-# Make the FastCGI interpreter:
-make distclean
-php_configure \
-  --enable-fastcgi \
-  --enable-pcntl \
-  --enable-sigchild
-make $NUMJOBS || make || exit 1
-mkdir -p $PKG/usr/bin
-cat sapi/cgi/php-cgi > $PKG/usr/bin/php-cgi
 chmod 755 $PKG/usr/bin/php-cgi
 
 # PHP (used to) install Pear with some strange permissions.
 chmod 755 $PKG/usr/bin/pear
-   
+
 # PHP sometimes puts junk in the root directory:
 ( cd $PKG
   rm -rf .channels .depdb .depdblock .filemap .lock .registry
 )
 
-## Fix a couple broken .reg files in php-5.2.10:
-#if ! grep -q Download $PKG/usr/lib${LIBDIRSUFFIX}/php/.channels/pear.php.net.reg ; then
-#  cat $CWD/channels/pear.php.net.reg > $PKG/usr/lib${LIBDIRSUFFIX}/php/.channels/pear.php.net.reg
-#fi
-#if ! grep -q Download $PKG/usr/lib${LIBDIRSUFFIX}/php/.channels/pecl.php.net.reg ; then
-#  cat $CWD/channels/pecl.php.net.reg > $PKG/usr/lib${LIBDIRSUFFIX}/php/.channels/pecl.php.net.reg
-#fi
-
 # Fix $PKG/usr/lib/php perms:
 ( cd $PKG/usr/lib${LIBDIRSUFFIX}/php
   find . \
@@ -281,13 +260,14 @@ chmod 755 $PKG/usr/bin/pear
 
 mkdir -p $PKG/usr/doc/php-$VERSION
 cp -a \
-  CODING_STANDARDS CREDITS EXTENSIONS INSTALL LICENSE NEWS README* TODO* \
+  CODING_STANDARDS CREDITS EXTENSIONS INSTALL LICENSE NEWS README* TODO* UPGRADING* \
   sapi/cgi/README.FastCGI \
   $PKG/usr/doc/php-$VERSION
 chown -R root:root $PKG/usr/doc/php-$VERSION
+chmod 644 $PKG/usr/doc/php-$VERSION/UPGRADING*
 
 mkdir -p $PKG/etc/httpd
-cp -a php.ini-dist php.ini-recommended $PKG/etc/httpd
+cp -a php.ini-development php.ini-production $PKG/etc/httpd
 cat $CWD/mod_php.conf.example | sed -e "s#lib/httpd#lib${LIBDIRSUFFIX}/httpd#" \
   > $PKG/etc/httpd/mod_php.conf.example
 chmod 644 $PKG/etc/httpd/*
diff --git a/source/n/php/php.gd_libpng-1.4.diff b/source/n/php/php.gd_libpng-1.4.diff
deleted file mode 100644
index a591b733..00000000
--- a/source/n/php/php.gd_libpng-1.4.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru php-5.2.13.orig/ext/gd/libgd/gd_png.c php-5.2.13/ext/gd/libgd/gd_png.c
---- php-5.2.13.orig/ext/gd/libgd/gd_png.c	2009-03-14 12:48:42.000000000 -0500
-+++ php-5.2.13/ext/gd/libgd/gd_png.c	2010-03-21 02:17:03.000000000 -0500
-@@ -139,7 +139,7 @@
- 		return NULL;
- 	}
- 
--	if (!png_check_sig (sig, 8)) { /* bad signature */
-+	if (png_sig_cmp (sig, 0, 8)) { /* bad signature */
- 		return NULL;
- 	}
- 
diff --git a/source/n/php/php.gmp5.diff b/source/n/php/php.gmp5.diff
deleted file mode 100644
index f77dd33a..00000000
--- a/source/n/php/php.gmp5.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./ext/gmp/gmp.c.orig	2010-01-03 03:23:27.000000000 -0600
-+++ ./ext/gmp/gmp.c	2010-03-05 21:27:46.000000000 -0600
-@@ -1396,7 +1396,7 @@
- 
- 		GMPG(rand_initialized) = 1;
- 	}
--	mpz_urandomb(*gmpnum_result, GMPG(rand_state), GMP_ABS (limiter) * __GMP_BITS_PER_MP_LIMB);
-+	mpz_urandomb(*gmpnum_result, GMPG(rand_state), GMP_ABS (limiter) * GMP_LIMB_BITS);
- 
- 	ZEND_REGISTER_RESOURCE(return_value, gmpnum_result, le_gmp);
- }
diff --git a/source/n/php/php.ini-development.diff b/source/n/php/php.ini-development.diff
new file mode 100644
index 00000000..49b441e6
--- /dev/null
+++ b/source/n/php/php.ini-development.diff
@@ -0,0 +1,47 @@
+--- ./php.ini-development.orig	2011-02-08 18:25:44.000000000 -0600
++++ ./php.ini-development	2011-04-01 22:42:50.000000000 -0500
+@@ -938,6 +938,44 @@
+ ; If you only provide the name of the extension, PHP will look for it in its
+ ; default extension directory.
+ ;
++
++; These are the extensions that are available for use on this PHP build.
++; If you do NOT need any of these extensions, you should comment them out.
++; That will probably increase both your security and performance.
++
++extension=bcmath.so
++extension=bz2.so
++extension=calendar.so
++extension=ctype.so
++extension=curl.so
++extension=dba.so
++extension=enchant.so
++extension=exif.so
++extension=ftp.so
++extension=gd.so
++extension=gettext.so
++extension=gmp.so
++extension=iconv.so
++extension=ldap.so
++extension=mbstring.so
++extension=mysql.so
++extension=mysqli.so
++extension=openssl.so
++extension=pdo.so
++extension=pdo_mysql.so
++extension=pdo_sqlite.so
++extension=pspell.so
++extension=shmop.so
++extension=snmp.so
++extension=soap.so
++extension=sqlite.so
++extension=sqlite3.so
++extension=tokenizer.so
++extension=wddx.so
++extension=xsl.so
++extension=zip.so
++extension=zlib.so
++
+ ; Windows Extensions
+ ; Note that ODBC support is built in, so no dll is needed for it.
+ ; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
diff --git a/source/n/php/php.ini.diff b/source/n/php/php.ini.diff
deleted file mode 100644
index fe01df22..00000000
--- a/source/n/php/php.ini.diff
+++ /dev/null
@@ -1,114 +0,0 @@
---- ./php.ini-dist.orig	2007-05-27 13:04:10.000000000 -0500
-+++ ./php.ini-dist	2007-06-28 23:43:02.000000000 -0500
-@@ -473,7 +473,7 @@
- user_dir =
- 
- ; Directory in which the loadable extensions (modules) reside.
--extension_dir = "./"
-+extension_dir = "/usr/lib/php/extensions/"
- 
- ; Whether or not to enable the dl() function.  The dl() function does NOT work
- ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
-@@ -585,58 +585,43 @@
- ; needs to go here.  Specify the location of the extension with the
- ; extension_dir directive above.
- 
-+; These are the extensions that are available for use on this PHP build.
-+; If you do NOT need any of these extensions, you should comment them out.
-+; That will probably increase both your security and performance.
-+
-+extension=bcmath.so
-+extension=bz2.so
-+extension=calendar.so
-+extension=ctype.so
-+extension=curl.so
-+extension=dba.so
-+extension=dbase.so
-+extension=exif.so
-+extension=ftp.so
-+extension=gettext.so
-+extension=gd.so
-+extension=gmp.so
-+extension=iconv.so
-+extension=ldap.so
-+extension=mbstring.so
-+extension=mhash.so
-+extension=mysql.so
-+extension=mysqli.so
-+extension=openssl.so
-+extension=pdo.so
-+extension=pdo_mysql.so
-+extension=pdo_sqlite.so
-+extension=pspell.so
-+extension=shmop.so
-+extension=snmp.so
-+extension=soap.so
-+extension=sqlite.so
-+extension=tokenizer.so
-+extension=wddx.so
-+extension=xsl.so
-+extension=zip.so
-+extension=zlib.so
- 
--; Windows Extensions
--; Note that ODBC support is built in, so no dll is needed for it.
--; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
--; extension folders as well as the separate PECL DLL download (PHP 5).
--; Be sure to appropriately set the extension_dir directive.
--
--;extension=php_bz2.dll
--;extension=php_curl.dll
--;extension=php_dba.dll
--;extension=php_dbase.dll
--;extension=php_exif.dll
--;extension=php_fdf.dll
--;extension=php_gd2.dll
--;extension=php_gettext.dll
--;extension=php_gmp.dll
--;extension=php_ifx.dll
--;extension=php_imap.dll
--;extension=php_interbase.dll
--;extension=php_ldap.dll
--;extension=php_mbstring.dll
--;extension=php_mcrypt.dll
--;extension=php_mhash.dll
--;extension=php_mime_magic.dll
--;extension=php_ming.dll
--;extension=php_msql.dll
--;extension=php_mssql.dll
--;extension=php_mysql.dll
--;extension=php_mysqli.dll
--;extension=php_oci8.dll
--;extension=php_openssl.dll
--;extension=php_pdo.dll
--;extension=php_pdo_firebird.dll
--;extension=php_pdo_mssql.dll
--;extension=php_pdo_mysql.dll
--;extension=php_pdo_oci.dll
--;extension=php_pdo_oci8.dll
--;extension=php_pdo_odbc.dll
--;extension=php_pdo_pgsql.dll
--;extension=php_pdo_sqlite.dll
--;extension=php_pgsql.dll
--;extension=php_pspell.dll
--;extension=php_shmop.dll
--;extension=php_snmp.dll
--;extension=php_soap.dll
--;extension=php_sockets.dll
--;extension=php_sqlite.dll
--;extension=php_sybase_ct.dll
--;extension=php_tidy.dll
--;extension=php_xmlrpc.dll
--;extension=php_xsl.dll
--;extension=php_zip.dll
- 
- ;;;;;;;;;;;;;;;;;;;
- ; Module Settings ;
-@@ -979,6 +964,7 @@
- ; where MODE is the octal representation of the mode. Note that this
- ; does not overwrite the process's umask.
- ;session.save_path = "/tmp"
-+session.save_path = "/var/lib/php"
- 
- ; Whether to use cookies.
- session.use_cookies = 1
diff --git a/source/n/php/php.recommended.ini.diff b/source/n/php/php.recommended.ini.diff
deleted file mode 100644
index 80469447..00000000
--- a/source/n/php/php.recommended.ini.diff
+++ /dev/null
@@ -1,114 +0,0 @@
---- ./php.ini-recommended.orig	2007-05-27 13:04:10.000000000 -0500
-+++ ./php.ini-recommended	2007-06-29 00:14:12.000000000 -0500
-@@ -521,7 +521,7 @@
- user_dir =
- 
- ; Directory in which the loadable extensions (modules) reside.
--extension_dir = "./"
-+extension_dir = "/usr/lib/php/extensions/"
- 
- ; Whether or not to enable the dl() function.  The dl() function does NOT work
- ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
-@@ -633,58 +633,43 @@
- ; needs to go here.  Specify the location of the extension with the
- ; extension_dir directive above.
- 
-+; These are the extensions that are available for use on this PHP build.
-+; If you do NOT need any of these extensions, you should comment them out.
-+; That will probably increase both your security and performance.
-+
-+extension=bcmath.so
-+extension=bz2.so
-+extension=calendar.so
-+extension=ctype.so
-+extension=curl.so
-+extension=dba.so
-+extension=dbase.so
-+extension=exif.so
-+extension=ftp.so
-+extension=gettext.so
-+extension=gd.so
-+extension=gmp.so
-+extension=iconv.so
-+extension=ldap.so
-+extension=mbstring.so
-+extension=mhash.so
-+extension=mysql.so
-+extension=mysqli.so
-+extension=openssl.so
-+extension=pdo.so
-+extension=pdo_mysql.so
-+extension=pdo_sqlite.so
-+extension=pspell.so
-+extension=shmop.so
-+extension=snmp.so
-+extension=soap.so
-+extension=sqlite.so
-+extension=tokenizer.so
-+extension=wddx.so
-+extension=xsl.so
-+extension=zip.so
-+extension=zlib.so
- 
--; Windows Extensions
--; Note that ODBC support is built in, so no dll is needed for it.
--; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
--; extension folders as well as the separate PECL DLL download (PHP 5).
--; Be sure to appropriately set the extension_dir directive.
--
--;extension=php_bz2.dll
--;extension=php_curl.dll
--;extension=php_dba.dll
--;extension=php_dbase.dll
--;extension=php_exif.dll
--;extension=php_fdf.dll
--;extension=php_gd2.dll
--;extension=php_gettext.dll
--;extension=php_gmp.dll
--;extension=php_ifx.dll
--;extension=php_imap.dll
--;extension=php_interbase.dll
--;extension=php_ldap.dll
--;extension=php_mbstring.dll
--;extension=php_mcrypt.dll
--;extension=php_mhash.dll
--;extension=php_mime_magic.dll
--;extension=php_ming.dll
--;extension=php_msql.dll
--;extension=php_mssql.dll
--;extension=php_mysql.dll
--;extension=php_mysqli.dll
--;extension=php_oci8.dll
--;extension=php_openssl.dll
--;extension=php_pdo.dll
--;extension=php_pdo_firebird.dll
--;extension=php_pdo_mssql.dll
--;extension=php_pdo_mysql.dll
--;extension=php_pdo_oci.dll
--;extension=php_pdo_oci8.dll
--;extension=php_pdo_odbc.dll
--;extension=php_pdo_pgsql.dll
--;extension=php_pdo_sqlite.dll
--;extension=php_pgsql.dll
--;extension=php_pspell.dll
--;extension=php_shmop.dll
--;extension=php_snmp.dll
--;extension=php_soap.dll
--;extension=php_sockets.dll
--;extension=php_sqlite.dll
--;extension=php_sybase_ct.dll
--;extension=php_tidy.dll
--;extension=php_xmlrpc.dll
--;extension=php_xsl.dll
--;extension=php_zip.dll
- 
- ;;;;;;;;;;;;;;;;;;;
- ; Module Settings ;
-@@ -1027,6 +1012,7 @@
- ; where MODE is the octal representation of the mode. Note that this
- ; does not overwrite the process's umask.
- ;session.save_path = "/tmp"
-+session.save_path = "/var/lib/php"
- 
- ; Whether to use cookies.
- session.use_cookies = 1
diff --git a/source/n/php/php.session.save_path.diff b/source/n/php/php.session.save_path.diff
new file mode 100644
index 00000000..60d6f072
--- /dev/null
+++ b/source/n/php/php.session.save_path.diff
@@ -0,0 +1,22 @@
+--- ./php.ini-development.orig	2011-04-14 14:26:44.551000001 -0500
++++ ./php.ini-development	2011-04-14 14:38:48.591000954 -0500
+@@ -1506,7 +1506,7 @@
+ ; where MODE is the octal representation of the mode. Note that this
+ ; does not overwrite the process's umask.
+ ; http://php.net/session.save-path
+-;session.save_path = "/tmp"
++session.save_path = "/var/lib/php"
+ 
+ ; Whether to use cookies.
+ ; http://php.net/session.use-cookies
+--- ./php.ini-production.orig	2011-04-14 14:26:44.558000001 -0500
++++ ./php.ini-production	2011-04-14 14:39:09.598999155 -0500
+@@ -1513,7 +1513,7 @@
+ ; where MODE is the octal representation of the mode. Note that this
+ ; does not overwrite the process's umask.
+ ; http://php.net/session.save-path
+-;session.save_path = "/tmp"
++session.save_path = "/var/lib/php"
+ 
+ ; Whether to use cookies.
+ ; http://php.net/session.use-cookies
diff --git a/source/n/pidentd/pidentd.SlackBuild b/source/n/pidentd/pidentd.SlackBuild
index f14fbe53..051fdeb5 100755
--- a/source/n/pidentd/pidentd.SlackBuild
+++ b/source/n/pidentd/pidentd.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=3.0.19
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
diff --git a/source/n/popa3d/popa3d.SlackBuild b/source/n/popa3d/popa3d.SlackBuild
index 5d574df6..fbf88a4f 100755
--- a/source/n/popa3d/popa3d.SlackBuild
+++ b/source/n/popa3d/popa3d.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=1.0.2
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
diff --git a/source/n/portmap/portmap.SlackBuild b/source/n/portmap/portmap.SlackBuild
index 3699bd9c..544dc9af 100755
--- a/source/n/portmap/portmap.SlackBuild
+++ b/source/n/portmap/portmap.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=${VERSION:-6.0}
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-portmap
diff --git a/source/n/procmail/procmail.SlackBuild b/source/n/procmail/procmail.SlackBuild
index 0d7456c2..3e7ac6fd 100755
--- a/source/n/procmail/procmail.SlackBuild
+++ b/source/n/procmail/procmail.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=3.22
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-procmail
@@ -66,8 +75,8 @@ cd ..
 
 mkdir -p $PKG/usr/doc/procmail-$VERSION
 cp -a \
-  Artistic COPYING FAQ FEATURES HISTORY INSTALL KNOWN_BUGS \
-  README examples \
+  Artistic COPYING* FAQ FEATURES HISTORY INSTALL KNOWN_BUGS \
+  README* examples \
   $PKG/usr/doc/procmail-$VERSION
 
 mkdir -p $PKG/install
diff --git a/source/n/proftpd/proftpd.SlackBuild b/source/n/proftpd/proftpd.SlackBuild
index e7227fda..17b2c908 100755
--- a/source/n/proftpd/proftpd.SlackBuild
+++ b/source/n/proftpd/proftpd.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=1.3.3
-DIRVER=1.3.3
-BUILD=${BUILD:-2}
+VERSION=1.3.3e
+DIRVER=1.3.3e
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -102,7 +102,7 @@ mkdir -p $PKG/home/ftp
 gzip -9 $PKG/usr/man/man?/*.?
 
 mkdir -p $PKG/usr/doc/proftpd-$VERSION
-cp -a COPYING CREDITS INSTALL NEWS README* \
+cp -a COPYING* CREDITS INSTALL NEWS README* \
   contrib/README.mod_wrap contrib/README.ratio \
   $PKG/usr/doc/proftpd-$VERSION
 # If there's a ChangeLog, installing at least part of the recent history
diff --git a/source/n/pssh/pssh.SlackBuild b/source/n/pssh/pssh.SlackBuild
index 25c19ae3..d0870d78 100755
--- a/source/n/pssh/pssh.SlackBuild
+++ b/source/n/pssh/pssh.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,9 @@
 
 # required: package "python" version 2.2 or higher installed
 
-VERSION=2.1.1
+VERSION=2.2
 BUILD=1
 
-# Note that the package will be created as 'noarch' !
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -61,34 +60,38 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-for binary in bin/* ; do
-  # Fix an error from the author
-  sed -r "s|basedir\)|basedir + \"/lib${LIBDIRSUFFIX}\")|" \
-    < $binary > $binary.tmp
-  cp $binary.tmp $binary
-  rm -f $binary.tmp
-done
-
-mkdir -p $PKG/$PREFIX/bin
-cp -a bin/* $PKG/$PREFIX/bin/.
-
 for library in psshlib/* ; do
   # This will force removepkg to remove all runtime-compiled *.pyc files
   touch ${library}c
 done
 
-mkdir -p $PKG/$PREFIX/lib${LIBDIRSUFFIX}
-cp -a psshlib $PKG/$PREFIX/lib${LIBDIRSUFFIX}/.
+# Install:
+python setup.py build install --root=$PKG
+
+# Compress manual pages:
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do
+  ln -s $( readlink $i ).gz $i.gz
+  rm $i
+done
 
 mkdir -p $PKG/$PREFIX/doc/pssh-$VERSION
 cp -a \
-  AUTHORS BUGS COPYING ChangeLog INSTALL PKG-INFO TODO \
+  AUTHORS BUGS COPYING* INSTALL PKG-INFO README* TODO \
   doc/pssh*html $PKG/$PREFIX/doc/pssh-$VERSION/.
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 # Build package:
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/pssh-$VERSION-noarch-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/pssh-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source/n/pssh/slack-desc b/source/n/pssh/slack-desc
index 8b69ec68..0a4f043e 100644
--- a/source/n/pssh/slack-desc
+++ b/source/n/pssh/slack-desc
@@ -16,4 +16,4 @@ pssh: kill command.
 pssh:
 pssh: Pssh has been written by Brent Chun <bnc at theether.org>, and is
 pssh: currently maintained by Andrew McNabb <amcnabb at mcnabbs.org>.
-pssh:
+pssh: Homepage:  http://parallel-ssh.googlecode.com
diff --git a/source/n/pth/pth.SlackBuild b/source/n/pth/pth.SlackBuild
index 1c2be605..f6f791a3 100755
--- a/source/n/pth/pth.SlackBuild
+++ b/source/n/pth/pth.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2006  Robby Workman  (http://rlworkman.net) 
-# Copyright 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,16 +21,25 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=pth
-VERSION=2.0.7
-ARCH=${ARCH:-x86_64}
+PKGNAM=pth
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/pkg-$PRGNAM
+PKG=$TMP/pkg-$PKGNAM
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -41,14 +50,17 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG 
 mkdir -p $TMP $PKG
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
-cd $PRGNAM-$VERSION
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1
+cd $PKGNAM-$VERSION
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -89,16 +101,23 @@ if [ -d $PKG/usr/info ]; then
   gzip -9 $PKG/usr/info/*.info
 fi
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  ANNOUNCE AUTHORS COPYING HACKING HISTORY INSTALL NEWS PORTING \
-  README SUPPORT TESTS THANKS USERS \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+  ANNOUNCE AUTHORS COPYING* HACKING HISTORY INSTALL NEWS PORTING \
+  README* SUPPORT TESTS THANKS USERS \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source/n/rfkill/rfkill.SlackBuild b/source/n/rfkill/rfkill.SlackBuild
new file mode 100755
index 00000000..de337167
--- /dev/null
+++ b/source/n/rfkill/rfkill.SlackBuild
@@ -0,0 +1,93 @@
+#!/bin/sh
+
+# Slackware build script for rfkill
+
+# Copyright 2010  Ray Gomez <ray.gomez{at}thetravelingcoder{dot}com>
+# Copyright 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+# 
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+# 
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PKGNAM=rfkill
+VERSION=${VERSION:-0.4}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION || exit 1
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+make \
+  CFLAGS="$SLKCFLAGS" \
+  PREFIX=/usr \
+  MANDIR=/usr/man || exit 1
+make install \
+  PREFIX=/usr \
+  MANDIR=/usr/man \
+  DESTDIR=$PKG || exit 1
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  COPYING* README* \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/n/rfkill/rfkill.url b/source/n/rfkill/rfkill.url
new file mode 100644
index 00000000..700aef45
--- /dev/null
+++ b/source/n/rfkill/rfkill.url
@@ -0,0 +1,2 @@
+http://linuxwireless.org/en/users/Documentation/rfkill
+http://wireless.kernel.org/download/rfkill/
diff --git a/source/n/rfkill/slack-desc b/source/n/rfkill/slack-desc
new file mode 100644
index 00000000..7055fc3b
--- /dev/null
+++ b/source/n/rfkill/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+      |-----handy-ruler------------------------------------------------------|
+rfkill: rfkill (tool to query subsystem interfaces)
+rfkill:
+rfkill: rfkill is a small tool to query the state of the rfkill switches,
+rfkill: buttons and subsystem interfaces.
+rfkill:
+rfkill: http://linuxwireless.org/en/users/Documentation/rfkill
+rfkill:
+rfkill:
+rfkill:
+rfkill:
+rfkill:
diff --git a/source/n/rp-pppoe/rp-pppoe.SlackBuild b/source/n/rp-pppoe/rp-pppoe.SlackBuild
index 7dfa839c..40fd4a01 100755
--- a/source/n/rp-pppoe/rp-pppoe.SlackBuild
+++ b/source/n/rp-pppoe/rp-pppoe.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=3.10
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 if [ "$ARCH" = "i486" ]; then
@@ -32,6 +41,8 @@ elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 CWD=$(pwd)
diff --git a/source/n/rsync/rsync.SlackBuild b/source/n/rsync/rsync.SlackBuild
index dadf3cd5..5c48629a 100755
--- a/source/n/rsync/rsync.SlackBuild
+++ b/source/n/rsync/rsync.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,7 +21,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=${VERSION:-$(echo rsync-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+PKGNAM=rsync
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -81,7 +82,7 @@ cat rsyncd.conf.5 | gzip -9c > $PKG/usr/man/man5/rsyncd.conf.5.gz
 
 mkdir -p $PKG/usr/doc/rsync-$VERSION/popt
 cp -a \
-  COPYING* INSTALL NEWS README TODO tech_report.tex \
+  COPYING* INSTALL NEWS README* TODO tech_report.tex \
   $PKG/usr/doc/rsync-$VERSION
 ( cd popt
   cp -a CHANGES COPYING README README.rsync $PKG/usr/doc/rsync-$VERSION/popt
diff --git a/source/n/samba/prune-samba.sh b/source/n/samba/prune-samba.sh
new file mode 100755
index 00000000..a6106df3
--- /dev/null
+++ b/source/n/samba/prune-samba.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+# Copyright 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Pare down the Samba sources to just Samba3 for now, and drop redundant docs.
+# This script expects the samba sources to be unpacked in the current
+# directory.  It will then "pare" them.  You'll be expected to repack them
+# afterwards.
+
+cd samba-?.?.? || cd samba-?.?.?? || exit 1
+
+rm --verbose WHATSNEW4.txt howto-ol-backend-s4.txt howto4.txt prog_guide4.txt 
+rm -r --verbose docs-xml packaging4 source4 swat2*
+rm --verbose docs/*.pdf
+
diff --git a/source/n/samba/samba.SlackBuild b/source/n/samba/samba.SlackBuild
index cf3918a1..b7cbeefd 100755
--- a/source/n/samba/samba.SlackBuild
+++ b/source/n/samba/samba.SlackBuild
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=${VERSION:-$(echo samba-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo samba-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -42,7 +42,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf samba-$VERSION
-tar xvf $CWD/samba-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/samba-$VERSION.tar.xz || exit 1
 cd samba-$VERSION || exit 1
 
 if [ ! -d source3/lib/cmdline ]; then
@@ -69,6 +69,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 # Some of these options could be auto-detected, but declaring them
@@ -93,6 +96,7 @@ CFLAGS="$SLKCFLAGS" \
   --with-swatdir=/usr/share/swat \
   --with-logfilebase=/var/log/samba \
   --enable-cups \
+  --enable-external-libtalloc=no \
   --enable-static=no \
   --enable-shared=yes \
   --with-acl-support=yes \
@@ -133,6 +137,12 @@ cp -a ../nsswitch/libnss_wins.so $PKG/lib${LIBDIRSUFFIX}/libnss_wins.so.2
   ln -sf libnss_wins.so.2 libnss_wins.so
 )
 
+# Install a pkgconfig file for libtalloc:
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
+if [ ! -r $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/talloc.pc ]; then
+  cat $CWD/talloc.pc | sed -e "s/\/lib/\/lib${LIBDIRSUFFIX}/" > $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/talloc.pc
+fi
+
 ## Make sure that other programs can link against libsmbclient:
 #( cd $PKG/usr/lib${LIBDIRSUFFIX}
 #  for FILE in samba/libsmbclient.so* ; do
diff --git a/source/n/samba/slack-desc b/source/n/samba/slack-desc
index dc42f2b6..c06b485d 100644
--- a/source/n/samba/slack-desc
+++ b/source/n/samba/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
      |-----handy-ruler------------------------------------------------------|
-samba: samba (SMB file and print server)
+samba: samba (SMB/CIFS file and print server)
 samba:
-samba: Samba is an SMB file and print server for SMB and CIFS clients.  It
-samba: allows you to make file space or printers on a Samba host available to
-samba: any PCs running SMB clients (such as PCs running Windows).
+samba: Samba is an SMB/CIFS file and print server for SMB and CIFS clients.
+samba: It allows you to make file space or printers on a Samba host
+samba: available to SMB/CIFS clients (such as PCs running Windows).
 samba:
-samba: If you have any SMB servers (such as Windows NT/2K Server), you may be
-samba: able to replace them by or supplement them with Samba. One of Samba's
-samba: big strengths is integration, so you can use it to tie together your
-samba: Linux hosts and Windows PC clients.
+samba: If you have any Windows file servers, you may be able to replace them
+samba: or supplement them with Samba.  One of Samba's big strengths is
+samba: integration, so you can use it to tie together your Linux hosts and
+samba: Windows PC clients.
 samba:
diff --git a/source/n/samba/talloc.pc b/source/n/samba/talloc.pc
new file mode 100644
index 00000000..7a23835c
--- /dev/null
+++ b/source/n/samba/talloc.pc
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: talloc 
+Description: A hierarchical pool based memory system with destructors
+Version: 2.0.1
+Libs: -L${libdir} -ltalloc
+Cflags: -I${includedir} 
+URL: http://talloc.samba.org/
diff --git a/source/n/tcp_wrappers/tcp_wrappers.SlackBuild b/source/n/tcp_wrappers/tcp_wrappers.SlackBuild
index a8cfbdcb..7f9ad0d4 100755
--- a/source/n/tcp_wrappers/tcp_wrappers.SlackBuild
+++ b/source/n/tcp_wrappers/tcp_wrappers.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=7.6
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 if [ "$ARCH" = "x86_64" ]; then
diff --git a/source/n/tcpdump/libpcap.20-fix-any-intf.diff b/source/n/tcpdump/libpcap.20-fix-any-intf.diff
deleted file mode 100644
index 84afa682..00000000
--- a/source/n/tcpdump/libpcap.20-fix-any-intf.diff
+++ /dev/null
@@ -1,159 +0,0 @@
-commit 8fa17a5a554aaeb85d3ec4118b45a31f1efd6808
-Author: guy <guy>
-Date:   Wed Nov 19 08:20:39 2008 +0000
-
-    Fix the handling of the "any" device, including making it reject
-    attempts to open it in monitor mode.
----
- pcap-linux.c |   68 ++++++++++++++++++++++++++++++++++++-----------------------
- 1 file changed, 42 insertions(+), 26 deletions(-)
-
---- a/pcap-linux.c
-+++ b/pcap-linux.c
-@@ -297,6 +297,12 @@
- {
- 	pcap_t *handle;
- 
-+	/*
-+	 * A null device name is equivalent to the "any" device.
-+	 */
-+	if (device == NULL)
-+		device = "any";
-+
- #ifdef HAVE_DAG_API
- 	if (strstr(device, "dag")) {
- 		return dag_create(device, ebuf);
-@@ -338,10 +344,9 @@
- 	struct iwreq ireq;
- #endif
- 
--	if (p->opt.source == NULL) {
-+	if (strcmp(p->opt.source, "any") == 0) {
- 		/*
--		 * This is equivalent to the "any" device, and we don't
--		 * support monitor mode on it.
-+		 * Monitor mode makes no sense on the "any" device.
- 		 */
- 		return 0;
- 	}
-@@ -518,12 +523,11 @@
- 	handle->stats_op = pcap_stats_linux;
- 
- 	/*
--	 * NULL and "any" are special devices which give us the hint to
--	 * monitor all devices.
-+	 * The "any" device is a special device which causes us not
-+	 * to bind to a particular device and thus to look at all
-+	 * devices.
- 	 */
--	if (!device || strcmp(device, "any") == 0) {
--		device			= NULL;
--		handle->md.device	= strdup("any");
-+	if (strcmp(device, "any") == 0) {
- 		if (handle->opt.promisc) {
- 			handle->opt.promisc = 0;
- 			/* Just a warning. */
-@@ -531,10 +535,9 @@
- 			    "Promiscuous mode not supported on the \"any\" device");
- 			status = PCAP_WARNING_PROMISC_NOTSUP;
- 		}
-+	}
- 
--	} else
--		handle->md.device	= strdup(device);
--
-+	handle->md.device	= strdup(device);
- 	if (handle->md.device == NULL) {
- 		snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "strdup: %s",
- 			 pcap_strerror(errno) );
-@@ -1657,19 +1660,21 @@
- activate_new(pcap_t *handle)
- {
- #ifdef HAVE_PF_PACKET_SOCKETS
-+	const char		*device = handle->opt.source;
-+	int			is_any_device = (strcmp(device, "any") == 0);
- 	int			sock_fd = -1, arptype, val;
- 	int			err = 0;
- 	struct packet_mreq	mr;
--	const char* device = handle->opt.source;
- 
- 	/*
--	 * Open a socket with protocol family packet. If a device is
--	 * given we try to open it in raw mode otherwise we use
--	 * the cooked interface.
--	 */
--	sock_fd = device ?
--		socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL))
--	      : socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_ALL));
-+	 * Open a socket with protocol family packet. If the
-+	 * "any" device was specified, we open a SOCK_DGRAM
-+	 * socket for the cooked interface, otherwise we first
-+	 * try a SOCK_RAW socket for the raw interface.
-+	 */
-+	sock_fd = is_any_device ?
-+		socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_ALL)) :
-+		socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL));
- 
- 	if (sock_fd == -1) {
- 		snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "socket: %s",
-@@ -1704,7 +1709,7 @@
- 	 * to cooked mode if we have an unknown interface type
- 	 * or a type we know doesn't work well in raw mode.
- 	 */
--	if (device) {
-+	if (!is_any_device) {
- 		/* Assume for now we don't need cooked mode. */
- 		handle->md.cooked = 0;
- 
-@@ -1819,15 +1824,23 @@
- 		}
- 	} else {
- 		/*
--		 * This is cooked mode.
-+		 * The "any" device.
-+		 */
-+		if (handle->opt.rfmon) {
-+			/*
-+			 * It doesn't support monitor mode.
-+			 */
-+			return PCAP_ERROR_RFMON_NOTSUP;
-+		}
-+
-+		/*
-+		 * It uses cooked mode.
- 		 */
- 		handle->md.cooked = 1;
- 		handle->linktype = DLT_LINUX_SLL;
- 
- 		/*
- 		 * We're not bound to a device.
--		 * XXX - true?  Or true only if we're using
--		 * the "any" device?
- 		 * For now, we're using this as an indication
- 		 * that we can't transmit; stop doing that only
- 		 * if we figure out how to transmit in cooked
-@@ -1852,10 +1865,13 @@
- 
- 	/*
- 	 * Hmm, how can we set promiscuous mode on all interfaces?
--	 * I am not sure if that is possible at all.
-+	 * I am not sure if that is possible at all.  For now, we
-+	 * silently ignore attempts to turn promiscuous mode on
-+	 * for the "any" device (so you don't have to explicitly
-+	 * disable it in programs such as tcpdump).
- 	 */
- 
--	if (device && handle->opt.promisc) {
-+	if (!is_any_device && handle->opt.promisc) {
- 		memset(&mr, 0, sizeof(mr));
- 		mr.mr_ifindex = handle->md.ifindex;
- 		mr.mr_type    = PACKET_MR_PROMISC;
-@@ -3118,7 +3134,7 @@
- 
- 	/* Bind to the given device */
- 
--	if (!device) {
-+	if (strcmp(device, "any") == 0) {
- 		strncpy(handle->errbuf, "pcap_activate: The \"any\" device isn't supported on 2.0[.x]-kernel systems",
- 			PCAP_ERRBUF_SIZE);
- 		return PCAP_ERROR;
diff --git a/source/n/tcpdump/slack-desc b/source/n/tcpdump/slack-desc
index 47bab9e7..1adda180 100644
--- a/source/n/tcpdump/slack-desc
+++ b/source/n/tcpdump/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
        |-----handy-ruler------------------------------------------------------|
-tcpdump: tcpdump (network monitor)
+tcpdump: tcpdump (network monitoring tool)
 tcpdump:
 tcpdump: Tcpdump is a tool for network monitoring and data acquisition.  You
 tcpdump: can use it to dump information on all the packets on a network that
 tcpdump: match a boolean expression.  Tcpdump uses libpcap, a system
 tcpdump: independent interface for user-level packet capture.
 tcpdump:
-tcpdump:
+tcpdump: Project homepage:          http://sourceforge.net/projects/tcpdump/
 tcpdump:
 tcpdump:
 tcpdump:
diff --git a/source/n/tcpdump/tcpdump.SlackBuild b/source/n/tcpdump/tcpdump.SlackBuild
index 15715c56..1ff4795f 100755
--- a/source/n/tcpdump/tcpdump.SlackBuild
+++ b/source/n/tcpdump/tcpdump.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,9 +20,9 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=4.0.0
-LIBVER=1.0.0
-BUILD=${BUILD:-2}
+PKGNAM=tcpdump
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.gz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -49,50 +49,6 @@ PKG=$TMP/package-tcpdump
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
-echo "+================+"
-echo "| libpcap-$LIBVER |"
-echo "+================+"
-cd $TMP
-rm -rf libpcap-$LIBVER
-tar xvf $CWD/libpcap-$LIBVER.tar.gz || exit 1
-cd libpcap-$LIBVER || exit 1
-
-zcat $CWD/libpcap.20-fix-any-intf.diff.gz | patch -p1 --verbose || exit 1
-
-find . -type d -name CVS -depth -exec rm -rf {} \;
-chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \; -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \;
-CFLAGS="$(getconf LFS_CFLAGS)" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/libpcap-$LIBVER \
-  --enable-ipv6 \
-  --build=$ARCH-slackware-linux
-make $NUMJOBS || make || exit 1
-make shared $NUMJOBS || make || exit 1
-mkdir -p $PKG/usr/bin  # otherwise it errors out on install
-make install DESTDIR=$PKG || exit 1
-strip --strip-debug libpcap.so.1.?.?
-cp libpcap.so.?.?.? $PKG/usr/lib${LIBDIRSUFFIX}
-( cd $PKG/usr/lib${LIBDIRSUFFIX}
-  ln -sf libpcap.so.1.?.? libpcap.so.1
-  ln -sf libpcap.so.1 libpcap.so.0
-  ln -sf libpcap.so.1 libpcap.so
-)
-mkdir -p $PKG/usr/doc/libpcap-$LIBVER
-cp -a \
-  CHANGES CREDITS FILES INSTALL.txt LICENSE README README.linux TODO VERSION \
-  $PKG/usr/doc/libpcap-$LIBVER
-
-echo "+================+"
-echo "| tcpdump-$VERSION |"
-echo "+================+"
 cd $TMP
 rm -rf tcpdump-$VERSION
 tar xvf $CWD/tcpdump-$VERSION.tar.gz || exit 1
@@ -104,6 +60,7 @@ find . \
   -exec chmod 755 {} \; -o \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
+
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -113,14 +70,16 @@ find . \
   --build=$ARCH-slackware-linux
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
+
 # Strange, two identical files:
 ( cd $PKG/usr/sbin
   rm -f tcpdump
   ln -s tcpdump.$VERSION tcpdump
 ) || exit 1
+
 mkdir -p $PKG/usr/doc/tcpdump-$VERSION
 cp -a \
-  CHANGES FILES INSTALL README \
+  CHANGES CREDITS FILES INSTALL.txt LICENSE README* VERSION \
   $PKG/usr/doc/tcpdump-$VERSION
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
diff --git a/source/n/telnet/telnet.SlackBuild b/source/n/telnet/telnet.SlackBuild
index e1b182a2..d5234930 100755
--- a/source/n/telnet/telnet.SlackBuild
+++ b/source/n/telnet/telnet.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2007-2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2007-2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=0.17
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-telnet
diff --git a/source/n/tin/tin-1.8.2.tar.bz2.sign b/source/n/tin/tin-1.8.2.tar.bz2.sign
deleted file mode 100644
index 29db525d..00000000
--- a/source/n/tin/tin-1.8.2.tar.bz2.sign
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN PGP MESSAGE-----
-Version: 2.6.3ia
-
-iQCVAwUARE4WY1pJVQ60kLTRAQFBSwQA1TZP/EcytcgrNvOmpsRqmOX/LBL7Pqt8
-8aviolzsXypalr71LmTZRK1y9TtrGNioHde1B7MEYCTWsoUV4t6r87RdSE2dgU+E
-/ieaHvTFOUK9vy8C3VmjvCm8rJGPNAnz7Pbh6xtpAmUIY9jKuPZ0et576gw4Fl1T
-YoyxRSmzb2E=
-=H2kb
------END PGP MESSAGE-----
diff --git a/source/n/tin/tin-1.8.3.tar.bz2.sign b/source/n/tin/tin-1.8.3.tar.bz2.sign
new file mode 100644
index 00000000..455fe0c8
--- /dev/null
+++ b/source/n/tin/tin-1.8.3.tar.bz2.sign
@@ -0,0 +1,9 @@
+-----BEGIN PGP MESSAGE-----
+Version: 2.6.3ia
+
+iQCVAwUARcHorlpJVQ60kLTRAQEqmwQA1i62sO941RPciwqfBIZiKbsoAUl/h/Mm
+WXSKPi+S6KzYEeHk7yOwCY+EP+2adL2eYGVTVZeWoT16YmlHGzYw8wsH2zUuDF4M
+sH6z2MyWv8IL5/ELlHnvg710SlkQQmJFHSxcXhiA2i0E7mKeJ1ozFmrwqo88kt4Y
+8S8uupIHbnE=
+=hwqI
+-----END PGP MESSAGE-----
diff --git a/source/n/tin/tin.SlackBuild b/source/n/tin/tin.SlackBuild
index 1339dc37..a344150d 100755
--- a/source/n/tin/tin.SlackBuild
+++ b/source/n/tin/tin.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,10 +21,20 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=1.8.2
-ARCH=${ARCH:-x86_64}
+PKGNAM=tin
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-tin
@@ -49,7 +59,7 @@ find . \
   --with-ispell=/usr/bin/ispell \
   --with-defaults-dir=/etc/tin \
   --with-libdir=/var/lib/news \
-  --with-ncurses
+  --with-screen=ncursesw
 make clean
 make build || exit 1
 make install DESTDIR=$PKG || exit 1
diff --git a/source/n/trn/trn.SlackBuild b/source/n/trn/trn.SlackBuild
index ed9b3146..4857e514 100755
--- a/source/n/trn/trn.SlackBuild
+++ b/source/n/trn/trn.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=3.6
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-trn
diff --git a/source/n/uucp/uucp.SlackBuild b/source/n/uucp/uucp.SlackBuild
index 431bfd12..c45109d6 100755
--- a/source/n/uucp/uucp.SlackBuild
+++ b/source/n/uucp/uucp.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,15 +21,26 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=1.07
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 CWD=$(pwd)
diff --git a/source/n/vlan/vlan.SlackBuild b/source/n/vlan/vlan.SlackBuild
index 1b1064a8..63f4d53f 100755
--- a/source/n/vlan/vlan.SlackBuild
+++ b/source/n/vlan/vlan.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=1.9
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-vlan
diff --git a/source/n/vsftpd/vsftpd.SlackBuild b/source/n/vsftpd/vsftpd.SlackBuild
index 06b56763..93582dbb 100755
--- a/source/n/vsftpd/vsftpd.SlackBuild
+++ b/source/n/vsftpd/vsftpd.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,7 +20,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=${VERSION:-$(echo vsftpd-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+PKGNAM=vsftpd
+VERSION=${VERSION:-$(echo ${PKGNAM}-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
diff --git a/source/n/whois/whois.SlackBuild b/source/n/whois/whois.SlackBuild
index 589b57db..4b024015 100755
--- a/source/n/whois/whois.SlackBuild
+++ b/source/n/whois/whois.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -50,7 +50,7 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-make || exit
+make HAVE_LIBIDN=y || exit
 make install install-pos BASEDIR=$PKG || exit 1
 
 mv $PKG/usr/share/man $PKG/usr
@@ -61,7 +61,7 @@ find $PKG -iname "mkpasswd*" -exec rm -f {} \;
 
 mkdir -p $PKG/usr/doc/whois-$VERSION
 cp -a \
-  COPYING README \
+  COPYING* README* \
   $PKG/usr/doc/whois-$VERSION
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/source/n/wpa_supplicant/fi.epitest.hostap.WPASupplicant.service b/source/n/wpa_supplicant/fi.epitest.hostap.WPASupplicant.service
new file mode 100644
index 00000000..e8b4250b
--- /dev/null
+++ b/source/n/wpa_supplicant/fi.epitest.hostap.WPASupplicant.service
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=fi.epitest.hostap.WPASupplicant
+Exec=/usr/sbin/wpa_supplicant -u
+User=root
diff --git a/source/n/wpa_supplicant/hostap-07.git-b80b5639935d37b95d00f86b57f2844a9c775f57.patch b/source/n/wpa_supplicant/hostap-07.git-b80b5639935d37b95d00f86b57f2844a9c775f57.patch
new file mode 100644
index 00000000..4c500200
--- /dev/null
+++ b/source/n/wpa_supplicant/hostap-07.git-b80b5639935d37b95d00f86b57f2844a9c775f57.patch
@@ -0,0 +1,61 @@
+From b80b5639935d37b95d00f86b57f2844a9c775f57 Mon Sep 17 00:00:00 2001
+From: Dan Williams <dcbw@redhat.com>
+Date: Fri, 17 Dec 2010 15:56:01 +0200
+Subject: [PATCH] dbus: Emit property changed events when adding/removing BSSes
+
+The supplicant was not emitting property changed events when the BSSs
+property changed.
+
+Signed-off-by: Dan Williams <dcbw@redhat.com>
+(cherry picked from commit 1e6288df6b07a353a9246b77e0de2a840b5f2c72)
+---
+ wpa_supplicant/dbus/dbus_new.c |    6 ++++++
+ wpa_supplicant/dbus/dbus_new.h |    1 +
+ 2 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c
+index bdfbbac..c66640a 100644
+--- a/wpa_supplicant/dbus/dbus_new.c
++++ b/wpa_supplicant/dbus/dbus_new.c
+@@ -691,6 +691,10 @@ void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s,
+ 			wpas_dbus_getter_current_network;
+ 		prop = "CurrentNetwork";
+ 		break;
++	case WPAS_DBUS_PROP_BSSS:
++		getter = (WPADBusPropertyAccessor) wpas_dbus_getter_bsss;
++		prop = "BSSs";
++		break;
+ 	default:
+ 		wpa_printf(MSG_ERROR, "dbus: %s: Unknown Property value %d",
+ 			   __func__, property);
+@@ -1199,6 +1203,7 @@ int wpas_dbus_unregister_bss(struct wpa_supplicant *wpa_s,
+ 	}
+ 
+ 	wpas_dbus_signal_bss_removed(wpa_s, bss_obj_path);
++	wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS);
+ 
+ 	return 0;
+ }
+@@ -1263,6 +1268,7 @@ int wpas_dbus_register_bss(struct wpa_supplicant *wpa_s,
+ 	}
+ 
+ 	wpas_dbus_signal_bss_added(wpa_s, bss_obj_path);
++	wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS);
+ 
+ 	return 0;
+ 
+diff --git a/wpa_supplicant/dbus/dbus_new.h b/wpa_supplicant/dbus/dbus_new.h
+index 80ea98c..9cdefcb 100644
+--- a/wpa_supplicant/dbus/dbus_new.h
++++ b/wpa_supplicant/dbus/dbus_new.h
+@@ -30,6 +30,7 @@ enum wpas_dbus_prop {
+ 	WPAS_DBUS_PROP_STATE,
+ 	WPAS_DBUS_PROP_CURRENT_BSS,
+ 	WPAS_DBUS_PROP_CURRENT_NETWORK,
++	WPAS_DBUS_PROP_BSSS,
+ };
+ 
+ enum wpas_dbus_bss_prop {
+-- 
+1.7.4-rc1
+
diff --git a/source/n/wpa_supplicant/wpa_supplicant.SlackBuild b/source/n/wpa_supplicant/wpa_supplicant.SlackBuild
index b3acc583..8bbf01db 100755
--- a/source/n/wpa_supplicant/wpa_supplicant.SlackBuild
+++ b/source/n/wpa_supplicant/wpa_supplicant.SlackBuild
@@ -23,7 +23,7 @@
 
 PKGNAM=wpa_supplicant
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -95,6 +95,8 @@ find . \
 #  "s/^#define VERSION_STR \"\(.*\)\"/#define VERSION_STR \"\1_$VERSION\"/" \
 #  src/common/version.h
 
+zcat $CWD/hostap-07.git-b80b5639935d37b95d00f86b57f2844a9c775f57.patch.gz | patch -p1 --verbose || exit 1
+
 # The source code has been re-organized:
 cd wpa_supplicant
 
@@ -146,8 +148,16 @@ cp wpa_gui-qt4/wpa_gui $PKG/usr/bin/
 
 # Install dbus configuration file:
 mkdir -p $PKG/etc/dbus-1/system.d/
-cp dbus-wpa_supplicant.conf \
-  $PKG/etc/dbus-1/system.d/dbus-wpa_supplicant.conf.new
+cp dbus/dbus-wpa_supplicant.conf \
+  $PKG/etc/dbus-1/system.d/dbus-wpa_supplicant.conf
+
+# This file should actually be shipped with Slackware's wpa_supplicant
+# package, but since we missed it there (just kidding), we'll do it here:
+mkdir -p $PKG/usr/share/dbus-1/system-services
+install -m644 dbus/{fi.epitest.hostap.WPASupplicant.service,fi.w1.wpa_supplicant1.service} \
+  $PKG/usr/share/dbus-1/system-services/
+sed -e 's#Exec=/sbin/wpa_supplicant#Exec=/usr/sbin/wpa_supplicant#g' \
+  -i $PKG/usr/share/dbus-1/system-services/*.service
 
 # Install a .desktop file for wpa_gui:
 mkdir -p $PKG/usr/share/applications
@@ -226,7 +236,6 @@ config() {
   done
 }
 config etc/wpa_supplicant.conf.new
-config etc/dbus-1/system.d/dbus-wpa_supplicant.conf.new
 
 EOINS
 
diff --git a/source/n/wpa_supplicant/wpa_supplicant.defconfig b/source/n/wpa_supplicant/wpa_supplicant.defconfig
index 4241be9f..2c530fdc 100644
--- a/source/n/wpa_supplicant/wpa_supplicant.defconfig
+++ b/source/n/wpa_supplicant/wpa_supplicant.defconfig
@@ -23,3 +23,5 @@ CONFIG_READLINE=y
 CONFIG_BACKEND=file
 CONFIG_PEERKEY=y
 CONFIG_CTRL_IFACE_DBUS=y
+CONFIG_CTRL_IFACE_DBUS_NEW=y
+CONFIG_CTRL_IFACE_DBUS_INTRO=y
diff --git a/source/n/yptools/ypbind-mt-1.31.tar.bz2.sign b/source/n/yptools/ypbind-mt-1.31.tar.bz2.sign
deleted file mode 100644
index 1e40e59d..00000000
--- a/source/n/yptools/ypbind-mt-1.31.tar.bz2.sign
+++ /dev/null
@@ -1,8 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-Comment: See http://www.kernel.org/signature.html for info
-
-iD4DBQBLE+GAyGugalF9Dw4RAtllAJdwcdicAyMwnl/BtkHP+DnYseD9AJ4vS2ly
-HHNnyMFZ2A0tun7/Lt7Psw==
-=ob7L
------END PGP SIGNATURE-----
diff --git a/source/n/yptools/ypbind-mt-1.32.tar.sign b/source/n/yptools/ypbind-mt-1.32.tar.sign
new file mode 100644
index 00000000..4db7167e
--- /dev/null
+++ b/source/n/yptools/ypbind-mt-1.32.tar.sign
@@ -0,0 +1,8 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+Comment: See http://www.kernel.org/signature.html for info
+
+iD8DBQBMNHqQyGugalF9Dw4RAiHyAKCMjVXlCljwufPauK/O88jDzHZzsQCePyhN
+lqHDK8Fw5zaXPE4744ydtXY=
+=JpZO
+-----END PGP SIGNATURE-----
diff --git a/source/n/yptools/ypserv-2.23.tar.bz2.sign b/source/n/yptools/ypserv-2.23.tar.bz2.sign
deleted file mode 100644
index 9687e760..00000000
--- a/source/n/yptools/ypserv-2.23.tar.bz2.sign
+++ /dev/null
@@ -1,8 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-Comment: See http://www.kernel.org/signature.html for info
-
-iD8DBQBLg+CRyGugalF9Dw4RAlGVAJ0Sokt5e5bQg6J8Hq4zUyrTY8g2kQCfaNyD
-sBJmO9Igqzku/yLWqtU2WKw=
-=dTwr
------END PGP SIGNATURE-----
diff --git a/source/n/yptools/ypserv-2.24.tar.sign b/source/n/yptools/ypserv-2.24.tar.sign
new file mode 100644
index 00000000..061f0978
--- /dev/null
+++ b/source/n/yptools/ypserv-2.24.tar.sign
@@ -0,0 +1,8 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+Comment: See http://www.kernel.org/signature.html for info
+
+iD8DBQBMnHqzyGugalF9Dw4RAtUtAJ4gowJGR0cUlcNEhtLR1EOs6BDvcgCfRu0r
+yTGYZzi5YnUQctBC1d9qgs0=
+=r3GH
+-----END PGP SIGNATURE-----
diff --git a/source/n/yptools/yptools.SlackBuild b/source/n/yptools/yptools.SlackBuild
index 3c98a8e3..6a213b2a 100755
--- a/source/n/yptools/yptools.SlackBuild
+++ b/source/n/yptools/yptools.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,12 +23,12 @@
 
 # Package version number:
 VERSION=2.12
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 YPTOOLS=$VERSION
-YPBINDMT=1.31
+YPBINDMT=1.32
 #YPMAKE=0.11
-YPSERV=2.23
+YPSERV=2.24
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/n/ytalk/ytalk.SlackBuild b/source/n/ytalk/ytalk.SlackBuild
index 07c147b0..c50917e3 100755
--- a/source/n/ytalk/ytalk.SlackBuild
+++ b/source/n/ytalk/ytalk.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=${VERSION:-3.3.0}
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 if [ "$ARCH" = "i486" ]; then
@@ -32,6 +41,8 @@ elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 CWD=$(pwd)
@@ -68,7 +79,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \
 
 mkdir -p $PKG/usr/doc/ytalk-$VERSION
 cp -a \
-  AUTHORS COPYING ChangeLog INSTALL README \
+  AUTHORS COPYING* ChangeLog INSTALL README* \
   $PKG/usr/doc/ytalk-$VERSION
 
 gzip -9 $PKG/usr/man/man?/*.?
diff --git a/source/tcl/expect/expect.SlackBuild b/source/tcl/expect/expect.SlackBuild
index 27562037..eb480686 100755
--- a/source/tcl/expect/expect.SlackBuild
+++ b/source/tcl/expect/expect.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +22,21 @@
 
 
 PKGNAM=expect
-VERSION=5.44.1.11
-TCLVER=8.5.7
-ARCH=${ARCH:-x86_64}
+VERSION=5.44.1.15
+TCLVER=8.5.8
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-4}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -43,6 +53,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 if [ ! -d $TMP/tcl${TCLVER} ]; then
diff --git a/source/tcl/hfsutils/hfsutils.SlackBuild b/source/tcl/hfsutils/hfsutils.SlackBuild
index 7a813e99..5ab0f11d 100755
--- a/source/tcl/hfsutils/hfsutils.SlackBuild
+++ b/source/tcl/hfsutils/hfsutils.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,19 @@
 
 PKGNAM=hfsutils
 VERSION=${VERSION:-3.2.6}
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
 BUILD=${BUILD:-4}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -43,6 +52,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 cd $TMP
diff --git a/source/tcl/tcl/tcl.SlackBuild b/source/tcl/tcl/tcl.SlackBuild
index 596305f0..03d51ca3 100755
--- a/source/tcl/tcl/tcl.SlackBuild
+++ b/source/tcl/tcl/tcl.SlackBuild
@@ -21,9 +21,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=${VERSION:-8.5.8}
+VERSION=${VERSION:-8.5.9}
 # See also version number 8.5 in the symlinks below...)
-BUILD=1
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -38,8 +38,6 @@ fi
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-tcl
-rm -rf $PKG
-mkdir -p $TMP $PKG
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -63,6 +61,8 @@ elif [ "$ARCH" = "armel" ]; then
   CONFARGS=""
 fi
 
+rm -rf $PKG
+mkdir -p $TMP $PKG
 cd $TMP
 rm -rf tcl$VERSION
 tar xvf $CWD/tcl$VERSION-src.tar.?z* || exit 1
diff --git a/source/tcl/tk/tk.SlackBuild b/source/tcl/tk/tk.SlackBuild
index 32a183d3..a100a8a2 100755
--- a/source/tcl/tk/tk.SlackBuild
+++ b/source/tcl/tk/tk.SlackBuild
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=${VERSION:-8.5.8}
+VERSION=${VERSION:-8.5.9}
 # See also version number 8.5 in the symlinks below...)
 BUILD=${BUILD:-1}
 
@@ -57,9 +57,9 @@ fi
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-tk
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
-
 cd $TMP
 rm -rf tk$VERSION
 tar xvf $CWD/tk$VERSION-src.tar.?z* || exit 1
@@ -78,7 +78,6 @@ mkdir -p $PKG/usr/doc/tk$VERSION
 cp -a README license.terms $PKG/usr/doc/tk$VERSION
 
 cd unix
-make clean
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
diff --git a/source/x/anthy/anthy.SlackBuild b/source/x/anthy/anthy.SlackBuild
index ab402cd0..6436db76 100755
--- a/source/x/anthy/anthy.SlackBuild
+++ b/source/x/anthy/anthy.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN  USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN  USA
 # Copyright 2008, 2009  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
@@ -33,12 +33,22 @@
 # -----------------------------------------------------------------------------
 
 
-PRGNAM=anthy
-VERSION=${VERSION:-9100e}
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+PKGNAM=anthy
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -48,19 +58,22 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
 
 rm -rf $PKG
-mkdir -p $TMP PKG
+mkdir -p $TMP $PKG
 
 cd $TMP
-rm -rf ${PRGNAM}-${VERSION}
-tar -xvf $CWD/${PRGNAM}-${VERSION}.tar.gz || exit 1
-cd ${PRGNAM}-${VERSION} || exit 1
+rm -rf ${PKGNAM}-${VERSION}
+tar xvf $CWD/${PKGNAM}-${VERSION}.tar.?z* || exit 1
+cd ${PKGNAM}-${VERSION} || exit 1
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -76,7 +89,7 @@ CFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --sysconfdir=/etc \
   --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
   --disable-static \
   --program-prefix= \
   --program-suffix= \
@@ -86,12 +99,20 @@ make $NUMJOBS || make || exit 1
 make DESTDIR=$PKG install || exit 1
 
 # Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING ChangeLog DIARY INSTALL NEWS README* \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+  AUTHORS COPYING* DIARY INSTALL NEWS README* \
+  $PKG/usr/doc/$PKGNAM-$VERSION
 find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 # Compress the man page(s):
 if [ -d $PKG/usr/man ]; then
   find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
@@ -111,5 +132,5 @@ fi
 
 # Build the package:
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
 
diff --git a/source/x/dejavu-fonts-ttf/dejavu-fonts-ttf.SlackBuild b/source/x/dejavu-fonts-ttf/dejavu-fonts-ttf.SlackBuild
index 6bbaa821..834523bf 100755
--- a/source/x/dejavu-fonts-ttf/dejavu-fonts-ttf.SlackBuild
+++ b/source/x/dejavu-fonts-ttf/dejavu-fonts-ttf.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,7 +21,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=${VERSION:-2.30}
+PKGNAM=dejavu-fonts-ttf
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 ARCH=noarch
 BUILD=1
 
@@ -33,19 +34,21 @@ PKG=$TMP/package-dejavu-fonts-ttf
 # you know the version you want.
 if [ ! -e $CWD/dejavu-fonts-ttf-$VERSION.tar.gz ]; then
   if [ ! -e $CWD/dejavu-fonts-ttf-$VERSION.tar.bz2 ]; then
-    lftpget http://dejavu.sourceforge.net/snapshots/dejavu-fonts-ttf-$VERSION.tar.gz
+    if [ ! -e $CWD/dejavu-fonts-ttf-$VERSION.tar.xz ]; then
+      lftpget http://dejavu.sourceforge.net/snapshots/dejavu-fonts-ttf-$VERSION.tar.gz
+    fi
   fi
 fi
 if [ -e $CWD/dejavu-fonts-ttf-$VERSION.tar.gz ]; then
   gzip -d $CWD/dejavu-fonts-ttf-$VERSION.tar.gz
-  bzip2 -9 $CWD/dejavu-fonts-ttf-$VERSION.tar
+  xz -9 $CWD/dejavu-fonts-ttf-$VERSION.tar
 fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf dejavu-fonts-ttf-$VERSION
-tar xvf $CWD/dejavu-fonts-ttf-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/dejavu-fonts-ttf-$VERSION.tar.?z* || exit 1
 cd dejavu-fonts-ttf-$VERSION || exit 1
 
 chown -R root:root .
@@ -69,7 +72,7 @@ mkdir -p $PKG/etc/fonts/conf.d
 
 mkdir -p $PKG/usr/doc/dejavu-fonts-ttf-$VERSION
 cp -a \
-  AUTHORS LICENSE NEWS README* *.txt \
+  AUTHORS BUGS LICENSE NEWS README* *.txt \
   $PKG/usr/doc/dejavu-fonts-ttf-$VERSION
 
 mkdir -p $PKG/install
diff --git a/source/x/glew/glew.SlackBuild b/source/x/glew/glew.SlackBuild
index 75b22af6..d210557f 100755
--- a/source/x/glew/glew.SlackBuild
+++ b/source/x/glew/glew.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,19 @@
 
 # Slackware build script for glew
 
-VERSION=1.5.1
-ARCH=${ARCH:-x86_64}
+VERSION=1.5.7
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:--j8}
 
 CWD=$(pwd)
@@ -50,8 +59,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP || exit 1
 rm -rf glew-$VERSION
-tar xvf $CWD/glew-${VERSION}-src.tar.?z* || exit 1
-cd glew || exit 1
+tar xvf $CWD/glew-${VERSION}.tar.?z* || exit 1
+cd glew-${VERSION} || exit 1
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -76,7 +85,7 @@ make install GLEW_DEST=$PKG/usr || exit 1
 
 mkdir -p $PKG/usr/doc/glew-$VERSION
 cp -a \
-  LICENSE.txt README.txt doc/* \
+  LICENSE* README* doc/* \
     $PKG/usr/doc/glew-$VERSION
 
 mkdir -p $PKG/install
diff --git a/source/x/glew/glew.url b/source/x/glew/glew.url
index 5ef20740..8cc43579 100644
--- a/source/x/glew/glew.url
+++ b/source/x/glew/glew.url
@@ -1,2 +1,2 @@
 http://glew.sourceforge.net
-http://downloads.sourceforge.net/glew/glew-1.5.1-src.tgz
+http://downloads.sourceforge.net/glew/glew-1.5.5.tgz
diff --git a/source/x/liberation-fonts-ttf/60-liberation.conf b/source/x/liberation-fonts-ttf/60-liberation.conf
index a15b9f61..1e7212c6 100644
--- a/source/x/liberation-fonts-ttf/60-liberation.conf
+++ b/source/x/liberation-fonts-ttf/60-liberation.conf
@@ -20,6 +20,10 @@
 		<test qual="any" name="family"><string>Courier</string></test>
 		<edit name="family" mode="assign"><string>Liberation Mono</string></edit>
 	</match>
+	<match target="pattern">
+		<test qual="any" name="family"><string>Courier New</string></test>
+		<edit name="family" mode="assign"><string>Liberation Mono</string></edit>
+	</match>
 
 
 </fontconfig>
diff --git a/source/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild b/source/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild
index 211bbeff..9dcecac1 100755
--- a/source/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild
+++ b/source/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=1.04
+VERSION=1.06.0.20100721
 ARCH=noarch
-BUILD=1
+BUILD=3
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -33,8 +33,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf liberation-fonts-ttf-$VERSION
-tar xvf $CWD/liberation-fonts-${VERSION}.tar.* || exit 1
-cd liberation-fonts-${VERSION} || exit 1
+tar xvf $CWD/liberation-fonts-ttf-${VERSION}.tar.* || exit 1
+cd liberation-fonts-ttf-${VERSION} || exit 1
 
 chown -R root:root .
 find . \
@@ -48,9 +48,17 @@ cp -a *.ttf $PKG/usr/share/fonts/TTF/
 
 mkdir -p $PKG/usr/doc/liberation-fonts-ttf-$VERSION
 cp -a \
-  AUTHORS COPYING* ChangeLog License.txt README \
+  AUTHORS COPYING* License.txt README* TODO \
   $PKG/usr/doc/liberation-fonts-ttf-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/etc/fonts/conf.{d,avail}
 cat $CWD/60-liberation.conf > $PKG/etc/fonts/conf.avail/60-liberation.conf
 ( cd $PKG/etc/fonts/conf.d && \
diff --git a/source/x/libhangul/libhangul.SlackBuild b/source/x/libhangul/libhangul.SlackBuild
index feeae408..92a9ed16 100755
--- a/source/x/libhangul/libhangul.SlackBuild
+++ b/source/x/libhangul/libhangul.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2008, 2009  Eric Hameleers , Eindhoven, NL
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN  USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN  USA
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -33,12 +33,22 @@
 # -----------------------------------------------------------------------------
 
 
-PRGNAM=libhangul
-VERSION=${VERSION:-0.0.7}
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+PKGNAM=libhangul
+VERSION=${VERSION:-0.0.12}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -48,19 +58,22 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
 cd $TMP
-rm -rf ${PRGNAM}-${VERSION}
-tar -xvf $CWD/${PRGNAM}-${VERSION}.tar.gz || exit 1
-cd ${PRGNAM}-${VERSION} || exit 1
+rm -rf ${PKGNAM}-${VERSION}
+tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.?z* || exit 1
+cd ${PKGNAM}-${VERSION} || exit 1
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -86,12 +99,20 @@ make $NUMJOBS || make || exit 1
 make DESTDIR=$PKG install || exit 1
 
 # Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING ChangeLog NEWS README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+  AUTHORS COPYING* NEWS README* \
+  $PKG/usr/doc/$PKGNAM-$VERSION
 find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 # Compress the man page(s):
 if [ -d $PKG/usr/man ]; then
   find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
@@ -108,5 +129,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 # Build the package:
 cd $PKG
-/sbin/makepkg --linkadd y --chown n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
+/sbin/makepkg --linkadd y --chown n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
 
diff --git a/source/x/m17n-lib/internal-flt.h b/source/x/m17n-lib/internal-flt.h
deleted file mode 100644
index e47dbb1f..00000000
--- a/source/x/m17n-lib/internal-flt.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* internal-flt.h -- common header file for the internal FLT API.
-   Copyright (C) 2007
-     National Institute of Advanced Industrial Science and Technology (AIST)
-     Registration Number H15PRO112
-
-   This file is part of the m17n library.
-
-   The m17n library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public License
-   as published by the Free Software Foundation; either version 2.1 of
-   the License, or (at your option) any later version.
-
-   The m17n 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the m17n library; if not, write to the Free
-   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   02111-1307, USA.  */
-
-#ifndef _M_INTERNAL_FLT_H
-#define _M_INTERNAL_FLT_H
-
-#define MAKE_COMBINING_CODE(base_y, base_x, add_y, add_x, off_y, off_x)	\
-  (((off_y) << 16)							\
-   | ((off_x) << 8)							\
-   | ((base_x) << 6)							\
-   | ((base_y) << 4)							\
-   | ((add_x) << 2)							\
-   | (add_y))
-
-#define COMBINING_CODE_OFF_Y(code) ((((code) >> 16) & 0xFF) - 128)
-#define COMBINING_CODE_OFF_X(code) ((((code) >> 8) & 0xFF) - 128)
-#define COMBINING_CODE_BASE_X(code) (((code) >> 6) & 0x3)
-#define COMBINING_CODE_BASE_Y(code) (((code) >> 4) & 0x3)
-#define COMBINING_CODE_ADD_X(code) (((code) >> 2) & 0x3)
-#define COMBINING_CODE_ADD_Y(code) ((code) & 0x3)
-
-#define MAKE_COMBINING_CODE_BY_CLASS(class) (0x1000000 | class)
-
-#define COMBINING_BY_CLASS_P(code) ((code) & 0x1000000)
-
-#define COMBINING_CODE_CLASS(code) ((code) & 0xFFFFFF)
-
-#define MAKE_PRECOMPUTED_COMBINDING_CODE() (0x2000000)
-
-#define COMBINING_PRECOMPUTED_P(code) ((code) & 0x2000000)
-
-extern MSymbol Mcombining;
-
-#endif /* _M_INTERNAL_FLT_H */
diff --git a/source/x/m17n-lib/m17n-docs_makefile.patch b/source/x/m17n-lib/m17n-docs_makefile.patch
deleted file mode 100644
index 11f88ef3..00000000
--- a/source/x/m17n-lib/m17n-docs_makefile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- Makefile.in.orig	2007-12-28 02:15:49.000000000 +0100
-+++ Makefile.in	2008-01-29 13:43:46.000000000 +0100
-@@ -676,20 +676,20 @@
- 
- 
- install-pkgdataDATA: $(pkgdata_DATA)
--	$(mkinstalldirs) $(pkgdatadir)/html
--	$(mkinstalldirs) $(mandir)/man1 $(mandir)/man3 $(mandir)/man5
--	$(INSTALL_DATA) usr/latex/m17n-lib.dvi $(pkgdatadir)/m17n-lib.dvi
--	$(INSTALL_DATA) usr/latex/m17n-lib.ps $(pkgdatadir)/m17n-lib.ps
-+	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/html
-+	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man3 $(DESTDIR)$(mandir)/man5
-+	$(INSTALL_DATA) usr/latex/m17n-lib.dvi $(DESTDIR)$(pkgdatadir)/m17n-lib.dvi
-+	$(INSTALL_DATA) usr/latex/m17n-lib.ps $(DESTDIR)$(pkgdatadir)/m17n-lib.ps
- 	cd usr/html; \
- 	  for f in *.html *.png; do \
--	    $(INSTALL_DATA) $$f $(pkgdatadir)/html/$$f; \
-+	    $(INSTALL_DATA) $$f $(DESTDIR)$(pkgdatadir)/html/$$f; \
- 	  done
- 	cd man/man1; \
--	  for f in *.1; do $(INSTALL_DATA) $$f $(mandir)/man1/$$f; done
-+	  for f in *.1; do $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man1/$$f; done
- 	cd man/man3; \
--	  for f in *.3m17n; do $(INSTALL_DATA) $$f $(mandir)/man3/$$f; done
-+	  for f in *.3m17n; do $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man3/$$f; done
- 	cd man/man5; \
--	  for f in *.5; do $(INSTALL_DATA) $$f $(mandir)/man5/$$f; done
-+	  for f in *.5; do $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man5/$$f; done
- 
- @MAINTAINER_MODE_TRUE@usr-html html-usr: ${HTML_USR_TARGET}
- @MAINTAINER_MODE_TRUE@ja-html html-ja: ${HTML_JA_TARGET}
diff --git a/source/x/m17n-lib/m17n-lib.SlackBuild b/source/x/m17n-lib/m17n-lib.SlackBuild
index 02a5d29d..82cc38ad 100755
--- a/source/x/m17n-lib/m17n-lib.SlackBuild
+++ b/source/x/m17n-lib/m17n-lib.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2008, 2009  Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN  USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN  USA
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -33,14 +33,24 @@
 # -----------------------------------------------------------------------------
 
 
-PRGNAM=m17n-lib
+PKGNAM=m17n-lib
 SHORTNAM=m17n
-VERSION=${VERSION:-1.5.4}
-DBVERSION=${DBVERSION:-1.5.4}
-DOCVERSION=${DOCVERSION:-1.5.2}
-ARCH=${ARCH:-x86_64}
+VERSION=${VERSION:-1.6.1}
+DBVERSION=${DBVERSION:-1.6.1}
+# Won't build && are not maintained for current version
+#DOCVERSION=${DOCVERSION:-1.5.5}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 DOCS="ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO"
@@ -49,11 +59,11 @@ DOCS_DOC="AUTHORS COPYING ChangeLog INSTALL NEWS README"
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
 
-SOURCE[0]="$CWD/${PRGNAM}-${VERSION}.tar.gz"
-SOURCE[1]="$CWD/${SHORTNAM}-db-${DBVERSION}.tar.gz"
-SOURCE[2]="$CWD/${SHORTNAM}-docs-${DOCVERSION}.tar.gz"
+SOURCE[0]="$CWD/${PKGNAM}-${VERSION}.tar.xz"
+SOURCE[1]="$CWD/${SHORTNAM}-db-${DBVERSION}.tar.xz"
+#SOURCE[2]="$CWD/${SHORTNAM}-docs-${DOCVERSION}.tar.xz"
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -73,19 +83,16 @@ elif [ "$ARCH" = "armel" ]; then
 fi
 
 rm -rf $PKG
-mkdir -p $TMP/build-${PRGNAM} $PKG
+mkdir -p $TMP/build-${PKGNAM} $PKG
 
-cd $TMP/build-${PRGNAM}
+cd $TMP/build-${PKGNAM}
 for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do
-  tar -xvf ${SOURCE[$i]} || exit 1
+  tar xvf ${SOURCE[$i]} || exit 1
 done
 chown -R root:root *
 chmod -R u+w,go+r-w,a-s *
-# Patch the docs makefile:
-( cd $SHORTNAM-docs-$DOCVERSION
-  cat $CWD/${SHORTNAM}-docs_makefile.patch | patch -p0 --verbose || exit 1
-)
-cd ${PRGNAM}-${VERSION}
+
+cd ${PKGNAM}-${VERSION}
 # Add the missing internal-flt.h file:
 [ ! -r src/internal-flt.h ] && cp $CWD/internal-flt.h src/
 
@@ -125,32 +132,32 @@ make $NUMJOBS || make || exit 1
 make DESTDIR=$PKG install || exit 1
 cd ..
 
-# Compile and install the m17n user documentation:
-echo "Building the m17n user docs..."
-cd ${SHORTNAM}-docs-${DOCVERSION}
-CXXFLAGS="$SLKCFLAGS" \
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --localstatedir=/var \
-  --sysconfdir=/etc \
-  --mandir=/usr/man \
-  --program-prefix= \
-  --program-suffix= \
-  --build=$ARCH-slackware-linux
-make $NUMJOBS || make || exit 1
-make DESTDIR=$PKG install || exit 1
-cd ..
+## Compile and install the m17n user documentation:
+#echo "Building the m17n user docs..."
+#cd ${SHORTNAM}-docs-${DOCVERSION}
+#CXXFLAGS="$SLKCFLAGS" \
+#CFLAGS="$SLKCFLAGS" \
+#./configure \
+#  --prefix=/usr \
+#  --libdir=/usr/lib${LIBDIRSUFFIX} \
+#  --localstatedir=/var \
+#  --sysconfdir=/etc \
+#  --mandir=/usr/man \
+#  --program-prefix= \
+#  --program-suffix= \
+#  --build=$ARCH-slackware-linux
+#make $NUMJOBS || make || exit 1
+#make DESTDIR=$PKG install || exit 1
+#cd ..
 
 # Add package documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/{db,docs}
-cd ${PRGNAM}-${VERSION}
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/{db,docs}
+cd ${PKGNAM}-${VERSION}
+cp -a $DOCS $PKG/usr/doc/$PKGNAM-$VERSION
 cd ../${SHORTNAM}-db-${DBVERSION}
-cp -a $DOCS_DB $PKG/usr/doc/$PRGNAM-$VERSION/db
+cp -a $DOCS_DB $PKG/usr/doc/$PKGNAM-$VERSION/db
 cd ../${SHORTNAM}-docs-${DOCVERSION}
-cp -a $DOCS_DOC $PKG/usr/doc/$PRGNAM-$VERSION/docs
+cp -a $DOCS_DOC $PKG/usr/doc/$PKGNAM-$VERSION/docs
 cd ..
 find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
@@ -178,5 +185,5 @@ fi
 
 # Build the package:
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
 
diff --git a/source/x/mesa/get-mesa.sh b/source/x/mesa/get-mesa.sh
index 710043c6..c014d8a1 100644..100755
--- a/source/x/mesa/get-mesa.sh
+++ b/source/x/mesa/get-mesa.sh
@@ -1,8 +1,20 @@
+# Pull a stable branch + patches
+BRANCH=7.9
+
 rm -rf mesa
 git clone git://anongit.freedesktop.org/git/mesa/mesa
 # package the source archive and clean up:
-( cd mesa ; find . -type d -name .git -exec rm -rf {} \; 2> /dev/null )
+( cd mesa 
+  git checkout $BRANCH || exit 1
+)
+HEADISAT="$(cat mesa/.git/packed-refs | grep "refs/remotes/origin/${BRANCH}$" | cut -b1-7)"
+# Cleanup.  We're not packing up the whole git repo.
+( cd mesa && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null )
 DATE=$(date +%Y%m%d)
-mv mesa mesa-${DATE}_git
-tar cjf mesa-${DATE}_git.tar.bz2 mesa-${DATE}_git
-rm -rf mesa-${DATE}_git
+mv mesa Mesa-${BRANCH}_${HEADISAT}
+tar cf MesaLib-${BRANCH}_${HEADISAT}.tar Mesa-${BRANCH}_${HEADISAT}
+xz -9 MesaLib-${BRANCH}_${HEADISAT}.tar
+rm -rf MesaLib-${BRANCH}_${HEADISAT}
+echo
+echo "Mesa branch $BRANCH with HEAD at $HEADISAT packaged as MesaLib-${BRANCH}_${HEADISAT}.tar.xz"
+echo
diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild
index d4579625..7bdc273e 100755
--- a/source/x/mesa/mesa.SlackBuild
+++ b/source/x/mesa/mesa.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,26 +21,23 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PKGNAM=mesa
-VERSION=${VERSION:-$(echo MesaLib-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=7.9.2
+DEMOVERS=8.0.1
 BUILD=${BUILD:-1}
 
-PKG_VERSION=${VERSION}
+NUMJOBS=${NUMJOBS:--j8}
+
+# Be sure this list is up-to-date:
+DRI_DRIVERS="i810,i915,i965,mach64,mga,nouveau,r128,r200,r300,r600,radeon,savage,sis,tdfx,unichrome,swrast"
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) export ARCH=i486 ;;
     arm*) export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
   esac
 fi
 
-# Be sure this list is up-to-date:
-DRI_DRIVERS="i810,i915,i965,mach64,mga,r128,r200,r300,r600,radeon,savage,sis,tdfx,unichrome,swrast"
-
-NUMJOBS=${NUMJOBS:--j8}
-
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-mesa
@@ -60,9 +57,13 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf Mesa-${VERSION}
-tar xvf $CWD/MesaLib-${PKG_VERSION}.tar.?z* || exit 1
-tar xvf $CWD/MesaGLUT-${PKG_VERSION}.tar.?z* || exit 1
-tar xvf $CWD/MesaDemos-${PKG_VERSION}.tar.?z* || exit 1
+
+tar xvf $CWD/MesaLib-${VERSION}.tar.?z* || exit 1
+# If MesaLib came from git, we might already have GLUT.
+if [ ! -d Mesa-${VERSION}/src/glut/glx ]; then
+  tar xvf $CWD/MesaGLUT-${VERSION}.tar.?z* || exit 1
+fi
+
 cd Mesa-$VERSION
 
 # Make sure ownerships and permissions are sane:
@@ -73,6 +74,27 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
+# Apply patches from git (and maybe elsewhere):
+# Patches obtained by:
+#   git checkout origin/7.9
+#   git format-patch 67aeab0b77fb6be864088e69ea74a010b6543fa1..
+if /bin/ls $CWD/patches/*.patch 1> /dev/null 2> /dev/null ; then
+  for patch in $CWD/patches/*.patch ; do
+    patch -p1 < $patch || exit 1 ; 
+  done
+fi
+
+# Revert "i915: Enable ARB_fragment_shader by default."
+# https://bugzilla.redhat.com/show_bug.cgi?id=643399 
+zcat $CWD/patches/i915_fragment_shader_disable.patch.gz | patch -p1 || exit 1
+
+# Allow to build against libdrm-2.4.23:
+zcat $CWD/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch.gz | patch -p1 || exit 1
+
+if [ ! -r configure ]; then
+  autoreconf || exit 1
+fi
+
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -82,64 +104,72 @@ CFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/mesa-$VERSION \
   --with-dri-driverdir=/usr/lib${LIBDIRSUFFIX}/xorg/modules/dri \
   --with-dri-drivers="$DRI_DRIVERS" \
+  --enable-xcb \
+  --enable-gallium-nouveau \
   --build=$ARCH-slackware-linux
 
-# Nobody else is enabling this.  Seems like it's asking for trouble.
-#  --enable-xcb
-
-# This doesn't seem to build - maybe it needs something else...
-#  --enable-gallium-nouveau 
+#  --enable-gallium-llvm \
+#  --enable-gallium-swrast \
+#  --disable-gallium-svga \
+#  --disable-gallium-i915 \
+#  --disable-gallium-i965 \
+#  --disable-gallium-radeon \
+#  --disable-gallium-r600 \
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
-# Install gears and glinfo:
-mkdir -p $PKG/usr/bin
-cp -a progs/demos/gears $PKG/usr/bin/gears
-cp -a progs/demos/glinfo $PKG/usr/bin/glinfo
-
-# Install some "demos":
-( cd progs/xdemos
-  cp glthreads glxcontexts glxdemo glxgears glxgears_fbconfig glxheads \
-    glxinfo glxpbdemo glxpixmap \
-    $PKG/usr/bin
+# Now install the demos
+( cd $TMP
+  rm -rf mesa-demos-$DEMOVERS
+  tar xvf $CWD/mesa-demos-$DEMOVERS.tar.?z* || exit 1
+  cd mesa-demos-$DEMOVERS
+  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 \
+    --build=$ARCH-slackware-linux
+  # Build and install gears and glinfo, as well as a few other demos
+  make -C src/demos gears glinfo
+  make -C src/xdemos \
+    glthreads glxcontexts glxdemo glxgears glxgears_fbconfig \
+    glxheads glxinfo glxpbdemo glxpixmap
+  mkdir -p $PKG/usr/bin
+  cp -a src/demos/{gears,glinfo} $PKG/usr/bin
+  for i in glthreads glxcontexts glxdemo glxgears glxgears_fbconfig \
+      glxheads glxinfo glxpbdemo glxpixmap ; do
+        cp -a src/xdemos/$i $PKG/usr/bin ;
+  done
 )
-
+  
 # 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
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 # Compress info files, if any:
 if [ -d $PKG/usr/info ]; then
-  ( cd $PKG/usr/info
-    rm -f dir
-    gzip -9 *
-  )
+  rm -f $PKG/usr/info/dir
+  gzip -9 $PKG/usr/info/*
 fi
 
-mkdir -p $PKG/usr/doc/Mesa-$PKG_VERSION/html
-cp -a COPYING docs/relnotes-$VERSION.html $PKG/usr/doc/Mesa-$PKG_VERSION
-rm -f docs/relnotes*.html docs/RELNOTES*
-cp -a docs/*.html $PKG/usr/doc/Mesa-$PKG_VERSION/html
+mkdir -p $PKG/usr/doc/Mesa-$VERSION/html
+cp -a \
+  docs/COPYING* docs/relnotes-${VERSION}*.html docs/README* docs/GL* \
+  $PKG/usr/doc/Mesa-$VERSION
+cp -a docs/*.html $PKG/usr/doc/Mesa-$VERSION/html
+rm -f $PKG/usr/doc/Mesa-$VERSION/html/relnotes*.html
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$PKG_VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source/x/mesa/mesa.url b/source/x/mesa/mesa.url
index f4efeae6..3f30cc84 100644
--- a/source/x/mesa/mesa.url
+++ b/source/x/mesa/mesa.url
@@ -1 +1,2 @@
 ftp://ftp.freedesktop.org/pub/mesa/
+ftp://ftp.freedesktop.org/pub/mesa/demos/
diff --git a/source/x/mesa/patches/i915_fragment_shader_disable.patch b/source/x/mesa/patches/i915_fragment_shader_disable.patch
new file mode 100644
index 00000000..d2aee8e7
--- /dev/null
+++ b/source/x/mesa/patches/i915_fragment_shader_disable.patch
@@ -0,0 +1,26 @@
+From e5a4106be7c8b87821f6b5d21fec99a402825740 Mon Sep 17 00:00:00 2001
+From: Robert Hooker <sarvatt@ubuntu.com>
+Date: Wed, 8 Sep 2010 12:33:09 -0400
+Subject: [PATCH] Revert "i915: Enable ARB_fragment_shader by default."
+
+This reverts commit a58514cc9c5cc5867f9140700462c5ac5749550d.
+---
+ src/mesa/drivers/dri/intel/intel_screen.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
+index 0a542a7..8ae2cd2 100644
+--- a/src/mesa/drivers/dri/intel/intel_screen.c
++++ b/src/mesa/drivers/dri/intel/intel_screen.c
+@@ -70,7 +70,7 @@ PUBLIC const char __driConfigOptions[] =
+ 	 DRI_CONF_DESC(en, "Enable early Z in classic mode (unstable, 945-only).")
+       DRI_CONF_OPT_END
+ 
+-      DRI_CONF_OPT_BEGIN(fragment_shader, bool, true)
++      DRI_CONF_OPT_BEGIN(fragment_shader, bool, false)
+ 	 DRI_CONF_DESC(en, "Enable limited ARB_fragment_shader support on 915/945.")
+       DRI_CONF_OPT_END
+ 
+-- 
+1.7.2
+
diff --git a/source/x/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch b/source/x/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch
new file mode 100644
index 00000000..d0ce04d2
--- /dev/null
+++ b/source/x/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch
@@ -0,0 +1,89 @@
+diff -ur a/src/gallium/drivers/nouveau/nouveau_screen.c b/src/gallium/drivers/nouveau/nouveau_screen.c
+--- a/src/gallium/drivers/nouveau/nouveau_screen.c	2010-10-02 00:51:28.000000000 +0200
++++ b/src/gallium/drivers/nouveau/nouveau_screen.c	2010-12-11 18:18:20.527000045 +0100
+@@ -236,7 +236,7 @@
+ 	int ret;
+ 
+ 	ret = nouveau_channel_alloc(dev, 0xbeef0201, 0xbeef0202,
+-				    &screen->channel);
++				    512*1024, &screen->channel);
+ 	if (ret)
+ 		return ret;
+ 	screen->device = dev;
+diff -ur a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c
+--- a/src/mesa/drivers/dri/nouveau/nouveau_context.c	2010-10-05 03:58:00.000000000 +0200
++++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c	2010-12-11 18:18:20.528000045 +0100
+@@ -129,7 +129,7 @@
+ 
+ 	/* Allocate a hardware channel. */
+ 	ret = nouveau_channel_alloc(context_dev(ctx), 0xbeef0201, 0xbeef0202,
+-				    &nctx->hw.chan);
++				    512*1024, &nctx->hw.chan);
+ 	if (ret) {
+ 		nouveau_error("Error initializing the FIFO.\n");
+ 		return GL_FALSE;
+Nur in b/src/mesa/drivers/dri/nouveau: nouveau_context.c.orig.
+diff -ur a/src/mesa/drivers/dri/nouveau/nouveau_surface.c b/src/mesa/drivers/dri/nouveau/nouveau_surface.c
+--- a/src/mesa/drivers/dri/nouveau/nouveau_surface.c	2010-04-27 23:41:21.000000000 +0200
++++ b/src/mesa/drivers/dri/nouveau/nouveau_surface.c	2010-12-11 18:09:19.750000046 +0100
+@@ -34,8 +34,8 @@
+ 		      unsigned flags, unsigned format,
+ 		      unsigned width, unsigned height)
+ {
+-	unsigned tile_mode, cpp = _mesa_get_format_bytes(format);
+-	int ret;
++	unsigned tile_mode = 0, tile_flags = 0;
++	int ret, cpp = _mesa_get_format_bytes(format);
+ 
+ 	nouveau_bo_ref(NULL, &s->bo);
+ 
+@@ -51,13 +51,21 @@
+ 	if (layout == TILED) {
+ 		s->pitch = align(s->pitch, 256);
+ 		tile_mode = s->pitch;
++
++		if (cpp == 4)
++			tile_flags = NOUVEAU_BO_TILE_32BPP;
++		else if (cpp == 2)
++			tile_flags = NOUVEAU_BO_TILE_16BPP;
++
++		if (_mesa_get_format_bits(format, GL_DEPTH_BITS))
++			tile_flags |= NOUVEAU_BO_TILE_ZETA;
++
+ 	} else {
+ 		s->pitch = align(s->pitch, 64);
+-		tile_mode = 0;
+ 	}
+ 
+ 	ret = nouveau_bo_new_tile(context_dev(ctx), flags, 0, s->pitch * height,
+-				  tile_mode, 0, &s->bo);
++				  tile_mode, tile_flags, &s->bo);
+ 	assert(!ret);
+ }
+ 
+diff -ur a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c
+--- a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c	2010-10-05 03:58:00.000000000 +0200
++++ b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c	2010-12-11 18:18:20.528000045 +0100
+@@ -32,7 +32,7 @@
+ 
+ /* Arbitrary pushbuf length we can assume we can get with a single
+  * WAIT_RING. */
+-#define PUSHBUF_DWORDS 2048
++#define PUSHBUF_DWORDS 65536
+ 
+ /* Functions to set up struct nouveau_array_state from something like
+  * a GL array or index buffer. */
+diff -ur a/src/mesa/drivers/dri/nouveau/nv10_state_fb.c b/src/mesa/drivers/dri/nouveau/nv10_state_fb.c
+--- a/src/mesa/drivers/dri/nouveau/nv10_state_fb.c	2010-10-05 03:58:00.000000000 +0200
++++ b/src/mesa/drivers/dri/nouveau/nv10_state_fb.c	2010-12-11 18:15:17.756000046 +0100
+@@ -64,8 +64,8 @@
+ 
+ 	if (!nfb->lma_bo || nfb->lma_bo->size != size) {
+ 		nouveau_bo_ref(NULL, &nfb->lma_bo);
+-		nouveau_bo_new(context_dev(ctx), NOUVEAU_BO_VRAM, 0, size,
+-			       &nfb->lma_bo);
++		nouveau_bo_new_tile(context_dev(ctx), NOUVEAU_BO_VRAM, 0, size,
++				    0, NOUVEAU_BO_TILE_ZETA, &nfb->lma_bo);
+ 	}
+ 
+ 	nouveau_bo_markl(bctx, celsius, NV17TCL_LMA_DEPTH_BUFFER_OFFSET,
diff --git a/source/x/radeon_ucode/radeon_ucode.SlackBuild b/source/x/radeon_ucode/radeon_ucode.SlackBuild
new file mode 100755
index 00000000..7482b4cc
--- /dev/null
+++ b/source/x/radeon_ucode/radeon_ucode.SlackBuild
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# Slackware build script for radeon_ucode
+
+# Copyright 2010  Robby Workman, Northport, Alabama, USA
+# Copyright 2010, 2011  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.
+
+PKGNAM=radeon_ucode
+VERSION=20110302
+BUILD=${BUILD:-1}
+
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $PKG/lib/firmware/radeon $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a $CWD/ucode-$VERSION/* $PKG/lib/firmware/radeon
+mv $PKG/lib/firmware/radeon/LICENSE.radeon $PKG/usr/doc/$PKGNAM-$VERSION
+
+chown -R root:root $PKG
+find $PKG \
+ \( -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/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/x/radeon_ucode/slack-desc b/source/x/radeon_ucode/slack-desc
new file mode 100644
index 00000000..01810b94
--- /dev/null
+++ b/source/x/radeon_ucode/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+            |-----handy-ruler------------------------------------------------------|
+radeon_ucode: radeon_ucode (microcode/firmware for some Radeon graphics cards)
+radeon_ucode:
+radeon_ucode: radeon_ucode contains the microcode/firmware for some models of
+radeon_ucode: ATI/AMD Radeon graphics cards.  
+radeon_ucode:
+radeon_ucode: http://people.freedesktop.org/~agd5f/radeon_ucode/
+radeon_ucode:
+radeon_ucode:
+radeon_ucode:
+radeon_ucode:
+radeon_ucode:
diff --git a/source/x/radeon_ucode/ucode-20110302/LICENSE.radeon b/source/x/radeon_ucode/ucode-20110302/LICENSE.radeon
new file mode 100644
index 00000000..2542d649
--- /dev/null
+++ b/source/x/radeon_ucode/ucode-20110302/LICENSE.radeon
@@ -0,0 +1,51 @@
+Copyright (C) 2009-2011  Advanced Micro Devices, Inc. All rights reserved.
+
+REDISTRIBUTION: Permission is hereby granted, free of any license fees,
+to any person obtaining a copy of this microcode (the "Software"), to
+install, reproduce, copy and distribute copies, in binary form only, of
+the Software and to permit persons to whom the Software is provided to
+do the same, provided that the following conditions are met:
+
+No reverse engineering, decompilation, or disassembly of this Software
+is permitted.
+
+Redistributions must reproduce the above copyright notice, this
+permission notice, and the following disclaimers and notices in the
+Software documentation and/or other materials provided with the
+Software.
+
+DISCLAIMER: THE USE OF THE SOFTWARE IS AT YOUR SOLE RISK.  THE SOFTWARE
+IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND AND COPYRIGHT
+HOLDER AND ITS LICENSORS EXPRESSLY DISCLAIM ALL WARRANTIES, EXPRESS AND
+IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+COPYRIGHT HOLDER AND ITS LICENSORS DO NOT WARRANT THAT THE SOFTWARE WILL
+MEET YOUR REQUIREMENTS, OR THAT THE OPERATION OF THE SOFTWARE WILL BE
+UNINTERRUPTED OR ERROR-FREE.  THE ENTIRE RISK ASSOCIATED WITH THE USE OF
+THE SOFTWARE IS ASSUMED BY YOU.  FURTHERMORE, COPYRIGHT HOLDER AND ITS
+LICENSORS DO NOT WARRANT OR MAKE ANY REPRESENTATIONS REGARDING THE USE
+OR THE RESULTS OF THE USE OF THE SOFTWARE IN TERMS OF ITS CORRECTNESS,
+ACCURACY, RELIABILITY, CURRENTNESS, OR OTHERWISE.
+
+DISCLAIMER: UNDER NO CIRCUMSTANCES INCLUDING NEGLIGENCE, SHALL COPYRIGHT
+HOLDER AND ITS LICENSORS OR ITS DIRECTORS, OFFICERS, EMPLOYEES OR AGENTS
+("AUTHORIZED REPRESENTATIVES") BE LIABLE FOR ANY INCIDENTAL, INDIRECT,
+SPECIAL OR CONSEQUENTIAL DAMAGES (INCLUDING DAMAGES FOR LOSS OF BUSINESS
+PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS INFORMATION, AND THE
+LIKE) ARISING OUT OF THE USE, MISUSE OR INABILITY TO USE THE SOFTWARE,
+BREACH OR DEFAULT, INCLUDING THOSE ARISING FROM INFRINGEMENT OR ALLEGED
+INFRINGEMENT OF ANY PATENT, TRADEMARK, COPYRIGHT OR OTHER INTELLECTUAL
+PROPERTY RIGHT EVEN IF COPYRIGHT HOLDER AND ITS AUTHORIZED
+REPRESENTATIVES HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.  IN
+NO EVENT SHALL COPYRIGHT HOLDER OR ITS AUTHORIZED REPRESENTATIVES TOTAL
+LIABILITY FOR ALL DAMAGES, LOSSES, AND CAUSES OF ACTION (WHETHER IN
+CONTRACT, TORT (INCLUDING NEGLIGENCE) OR OTHERWISE) EXCEED THE AMOUNT OF
+US$10.
+
+Notice:  The Software is subject to United States export laws and
+regulations.  You agree to comply with all domestic and international
+export laws and regulations that apply to the Software, including but
+not limited to the Export Administration Regulations administered by the
+U.S. Department of Commerce and International Traffic in Arm Regulations
+administered by the U.S. Department of State.  These laws include
+restrictions on destinations, end users and end use.
diff --git a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-application.cpp.patch b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-application.cpp.patch
new file mode 100644
index 00000000..f925507a
--- /dev/null
+++ b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-application.cpp.patch
@@ -0,0 +1,11 @@
+--- scim-bridge-0.4.16/agent/scim-bridge-agent-application.cpp.bak	2009-01-18 01:04:20.000000000 +0800
++++ scim-bridge-0.4.16/agent/scim-bridge-agent-application.cpp	2010-09-11 22:38:27.196979199 +0800
+@@ -65,7 +65,7 @@
+     unsigned int tmp_uint;
+ 
+     int option = 0;
+-    while (option != EOF) {
++    while (option != -1) {
+         option = getopt_long (argc, argv, short_options, long_options, NULL);
+         switch (option) {
+             case 'v':
diff --git a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.cpp.patch b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.cpp.patch
new file mode 100644
index 00000000..85732013
--- /dev/null
+++ b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.cpp.patch
@@ -0,0 +1,48 @@
+--- scim-bridge-0.4.16/agent/scim-bridge-agent-imcontext.cpp.bak	2009-02-03 22:36:14.000000000 +0800
++++ scim-bridge-0.4.16/agent/scim-bridge-agent-imcontext.cpp	2010-09-11 23:25:00.636978519 +0800
+@@ -60,6 +60,8 @@
+ 
+ static bool on_the_spot_enabled = true;
+ 
++static String help_hotkeys = "";
++
+ /* Class definition */
+ class ScimBridgeAgentIMContextImpl: public ScimBridgeAgentIMContext
+ {
+@@ -274,6 +276,12 @@
+ }
+ 
+ 
++void ScimBridgeAgentIMContext::set_help_hotkeys (const String &hotkey_str)
++{
++    help_hotkeys = hotkey_str;
++}
++
++
+ ScimBridgeAgentIMContextImpl::ScimBridgeAgentIMContextImpl (ScimBridgeAgentClientListener *new_client_listener):
+ client_listener (new_client_listener), imengine (NULL), enabled (false), focused(false) ,preedit_mode (PREEDIT_ANY),
+ preedit_shown (false), preedit_cursor_position (0)
+@@ -654,6 +662,8 @@
+ 
+ void ScimBridgeAgentIMContextImpl::focus_out ()
+ {
++    if (!imengine_shared && imengine == NULL) alloc_imengine ();
++
+     ScimBridgeAgentIMContext *focused_imcontext = static_cast<ScimBridgeAgentIMContext*> (get_imengine ()->get_frontend_data ());
+ 
+ 	if ( !focused )
+@@ -923,9 +933,11 @@
+ 
+ void ScimBridgeAgentIMContextImpl::panel_request_help ()
+ {
+-    String help =  String ("Smart Common Input Method platform ") +
+-        String (SCIM_VERSION) +
+-        String ("\n(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n\n");
++    String help =  String ("SCIM Bridge") + 
++        String (VERSION) +
++        String ("\n(C) 2006-2008 Ryo Dairiki <ryo-dairiki@users.sourceforge.net>\n") +
++        help_hotkeys +
++        String ("\n\n");
+ 
+         IMEngineFactoryPointer factory = scim_backend->get_factory (get_imengine ()->get_factory_uuid ());
+         if (factory.null ()) factory = fallback_imengine_factory;
diff --git a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.h.patch b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.h.patch
new file mode 100644
index 00000000..f16b34c1
--- /dev/null
+++ b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.h.patch
@@ -0,0 +1,24 @@
+--- scim-bridge-0.4.16/agent/scim-bridge-agent-imcontext.h.bak	2008-11-02 14:44:49.000000000 +0800
++++ scim-bridge-0.4.16/agent/scim-bridge-agent-imcontext.h	2010-09-11 23:12:18.085979961 +0800
+@@ -130,6 +130,21 @@
+         static void set_enabled_by_default (bool enabled);
+ 
+         /**
++         * Get the hotkey help messages.
++         *
++         * @return help messages about hotkeys.
++         */
++        static scim::String get_help_hotkeys ();
++
++        /**
++         * Set the hotkey help messages.
++         *
++         * @param hotkey_str Help message about hotkeys.
++         *
++         */
++        static void set_help_hotkeys (const scim::String &hotkey_str);
++
++        /**
+          * Destructor.
+          */
+         virtual ~ScimBridgeAgentIMContext () {}
diff --git a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent.cpp.patch b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent.cpp.patch
new file mode 100644
index 00000000..27c5cb73
--- /dev/null
+++ b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent.cpp.patch
@@ -0,0 +1,30 @@
+--- scim-bridge-0.4.16/agent/scim-bridge-agent.cpp.bak	2009-03-08 21:07:29.000000000 +0800
++++ scim-bridge-0.4.16/agent/scim-bridge-agent.cpp	2010-09-11 22:59:34.476979479 +0800
+@@ -542,6 +542,27 @@
+     scim_global_config_flush ();
+ 
+     scim_keyboard_layout = scim_get_default_keyboard_layout ();
++
++    // Hot key name, hot key config key.
++    // ! Update hotkey_list_length according to updated list length.
++    int hotkey_list_length = 6;
++    String hotkey_list[][2] = {
++        { "Toggle on/off - ", "/Hotkeys/FrontEnd/Trigger" },
++        { "Turn on - ", "/Hotkeys/FrontEnd/On" },
++        { "Turn off - ", "/Hotkeys/FrontEnd/Off" },
++        { "Next input method - ", "/Hotkeys/FrontEnd/NextFactory" },
++        { "Previous input method - ", "/Hotkeys/FrontEnd/PreviousFactory" },
++        { "Show input method menu - ", "/Hotkeys/FrontEnd/ShowFactoryMenu" }
++    };
++                           
++    // Undefined hot keys are hidden from help window.
++    String help_hotkeys = "\nGlobal Hotkeys:";
++    for ( int i = 0; i < hotkey_list_length; i++ ) {
++        String tmp_hotkeys = scim_config->read (String (hotkey_list[i][1]), String (""));
++        if ( tmp_hotkeys != "" )
++            help_hotkeys += "\n" + hotkey_list[i][0] + "<" + tmp_hotkeys + ">";
++    }
++    ScimBridgeAgentIMContext::set_help_hotkeys (help_hotkeys);
+ }
+ 
+ 
diff --git a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-gtk.c.patch b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-gtk.c.patch
new file mode 100644
index 00000000..21f1f824
--- /dev/null
+++ b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-gtk.c.patch
@@ -0,0 +1,47 @@
+--- scim-bridge-0.4.16/client-gtk/scim-bridge-client-imcontext-gtk.c.bak	2008-11-02 14:44:23.000000000 +0800
++++ scim-bridge-0.4.16/client-gtk/scim-bridge-client-imcontext-gtk.c	2010-09-11 23:19:10.556978680 +0800
+@@ -35,6 +35,8 @@
+ #include "scim-bridge-output.h"
+ #include "scim-bridge-string.h"
+ 
++#define SEND_EVENT_MASK 0x02
++
+ /* Typedef */
+ struct _ScimBridgeClientIMContext
+ {
+@@ -200,7 +202,7 @@
+ {
+     scim_bridge_pdebugln (7, "key_snooper ()");
+ 
+-    if (!event->send_event && scim_bridge_client_is_messenger_opened () && focused_imcontext != NULL) {
++    if (!(event->send_event & SEND_EVENT_MASK)  && scim_bridge_client_is_messenger_opened () && focused_imcontext != NULL) {
+         if (focused_imcontext->client_window != NULL) {
+             int new_window_x;
+             int new_window_y;
+@@ -556,7 +558,7 @@
+ { 
+     GdkEventKey gdk_event;
+     scim_bridge_key_event_bridge_to_gdk (&gdk_event, imcontext->client_window, key_event);
+-    gdk_event.send_event = TRUE;
++    gdk_event.send_event |= SEND_EVENT_MASK;
+     if (imcontext == focused_imcontext && focused_widget != NULL) {
+         const char *signal_name = NULL;
+         if (scim_bridge_key_event_is_pressed (key_event)) {
+@@ -762,7 +764,7 @@
+ 
+     ScimBridgeClientIMContext *imcontext = SCIM_BRIDGE_CLIENT_IMCONTEXT (context);
+     
+-    if (!event->send_event && scim_bridge_client_is_messenger_opened () && imcontext != NULL && !key_snooper_used) {
++    if (!(event->send_event & SEND_EVENT_MASK) && scim_bridge_client_is_messenger_opened () && imcontext != NULL && !key_snooper_used) {
+ 
+         if (imcontext->client_window != NULL) {
+             int new_window_x;
+@@ -875,7 +877,7 @@
+         scim_bridge_client_open_messenger ();
+     }
+ 
+-    if (is_key_snooper_enabled ()) {
++    if (!key_snooper_used && is_key_snooper_enabled ()) {
+         key_snooper_id = gtk_key_snooper_install ((GtkKeySnoopFunc) &key_snooper, NULL);
+         key_snooper_used = TRUE;
+     }
diff --git a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-qt.cpp.patch b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-qt.cpp.patch
new file mode 100644
index 00000000..74a3252e
--- /dev/null
+++ b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-qt.cpp.patch
@@ -0,0 +1,31 @@
+--- scim-bridge-0.4.16/client-qt/scim-bridge-client-imcontext-qt.cpp.bak	2008-11-02 14:44:46.000000000 +0800
++++ scim-bridge-0.4.16/client-qt/scim-bridge-client-imcontext-qt.cpp	2010-09-11 22:46:10.396979441 +0800
+@@ -220,7 +220,12 @@
+ {
+     scim_bridge_pdebugln (4, "ScimBridgeClientIMContextImpl::setFocusWidget ()");
+     QInputContext::setFocusWidget (widget);
+-    focus_in ();
++       if (widget == NULL) {
++       focus_out ();
++       }
++       else {
++       focus_in ();
++       }
+     update ();
+ }
+ 
+@@ -442,9 +447,11 @@
+         }
+     }
+ 
+-    set_preedit_shown (false);
+-    update_preedit ();
+-
++       if (preedit_shown) {
++       set_preedit_shown (false);
++       update_preedit ();
++       }
++       
+     focused_imcontext = NULL;
+ }
+ 
diff --git a/source/x/scim-bridge/scim-bridge.SlackBuild b/source/x/scim-bridge/scim-bridge.SlackBuild
index 90354fd7..c3494c8b 100755
--- a/source/x/scim-bridge/scim-bridge.SlackBuild
+++ b/source/x/scim-bridge/scim-bridge.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2008, 2009  Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN  USA
+# Copyright 2008, 2009, 2011  Patrick J. Volkerding, Sebeka, MN  USA
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -35,8 +35,17 @@
 
 PRGNAM=scim-bridge
 VERSION=${VERSION:-0.4.16}
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -68,6 +77,14 @@ rm -rf ${PRGNAM}-${VERSION}
 tar -xvf $CWD/${PRGNAM}-${VERSION}.tar.gz || exit 1
 cd ${PRGNAM}-${VERSION} || exit 1
 #sed -i -e "s/ -doxygen / doxygen /" $( grep -lr ' -doxygen ' * )
+
+zcat $CWD/patches/scim-bridge-0.4.16-scim-bridge-agent-application.cpp.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.cpp.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.h.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/scim-bridge-0.4.16-scim-bridge-agent.cpp.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-gtk.c.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-qt.cpp.patch.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 \) \
@@ -114,7 +131,7 @@ EOINS
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING ChangeLog INSTALL NEWS README doc/LICENSE.* \
+  AUTHORS COPYING* ChangeLog INSTALL NEWS README* doc/LICENSE.* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
diff --git a/source/x/scim/scim-1.4.9-fix-ltdl.cpp.patch b/source/x/scim/scim-1.4.9-fix-ltdl.cpp.patch
new file mode 100644
index 00000000..1d9590fd
--- /dev/null
+++ b/source/x/scim/scim-1.4.9-fix-ltdl.cpp.patch
@@ -0,0 +1,11 @@
+--- scim-1.4.9/src/ltdl.cpp.bak	2008-11-02 14:42:40.000000000 +0800
++++ scim-1.4.9/src/ltdl.cpp	2010-09-12 00:23:24.085978400 +0800
+@@ -3361,7 +3361,7 @@
+ {
+   lt_dlhandle	handle		= 0;
+   char *	tmp		= 0;
+-  char *	ext		= 0;
++  const char *	ext		= 0;
+   size_t	len;
+   int		errors		= 0;
+ 
diff --git a/source/x/scim/scim.SlackBuild b/source/x/scim/scim.SlackBuild
index 168ae991..c0c50fb4 100755
--- a/source/x/scim/scim.SlackBuild
+++ b/source/x/scim/scim.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2006,2007,2008  Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN  USA
+# Copyright 2008, 2009, 2011  Patrick J. Volkerding, Sebeka, MN  USA
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -35,9 +35,17 @@
 
 PRGNAM=scim
 VERSION=${VERSION:-1.4.9}
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -56,6 +64,8 @@ elif [ "$ARCH" = "armel" ]; then
   LIBDIRSUFFIX=""
 fi
 
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PRGNAM
@@ -65,8 +75,11 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf ${PRGNAM}-${VERSION}
-tar -xvf $CWD/${PRGNAM}-${VERSION}.tar.gz
+tar xvf $CWD/${PRGNAM}-${VERSION}.tar.?z* || exit 1
 cd ${PRGNAM}-${VERSION} || exit 1
+
+zcat $CWD/scim-1.4.9-fix-ltdl.cpp.patch.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 \) \
diff --git a/source/x/tibmachuni-font-ttf/tibmachuni-font-ttf.SlackBuild b/source/x/tibmachuni-font-ttf/tibmachuni-font-ttf.SlackBuild
index e553bdcf..8b31393f 100755
--- a/source/x/tibmachuni-font-ttf/tibmachuni-font-ttf.SlackBuild
+++ b/source/x/tibmachuni-font-ttf/tibmachuni-font-ttf.SlackBuild
@@ -34,7 +34,7 @@
 
 
 PRGNAM=tibmachuni-font-ttf
-VERSION=${VERSION:-1.901}
+VERSION=${VERSION:-1.901b}
 ARCH=noarch
 BUILD=${BUILD:-1}
 
@@ -68,6 +68,7 @@ find . \
   -exec chmod 755 {} \; -o \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
+cd TibetanMachineUnicodeFont
 
 # Install font:
 if [ ! -r TibMachUni-${VERSION}.ttf ]; then
diff --git a/source/x/x11-skel/doinst.sh b/source/x/x11-skel/doinst.sh
index 05e7fb0f..a2d2d8c6 100644
--- a/source/x/x11-skel/doinst.sh
+++ b/source/x/x11-skel/doinst.sh
@@ -15,7 +15,7 @@
 # your /usr/X11R6 directory will be moved to /usr/X11R6.bak.
 # Anything you really want want to keep will need to be merged back
 # by hand.
-if [ ! -L /usr/X11R6/bin ]; then
+if [ ! -L usr/X11R6/bin ]; then
   if [ -d usr/X11R6 ]; then
     mv usr/X11R6 usr/X11R6.bak
   fi
diff --git a/source/x/x11-skel/x11-skel.SlackBuild b/source/x/x11-skel/x11-skel.SlackBuild
index b21b325c..cd8559b7 100755
--- a/source/x/x11-skel/x11-skel.SlackBuild
+++ b/source/x/x11-skel/x11-skel.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,8 +22,17 @@
 
 
 VERSION=7.4
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 if [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
diff --git a/source/x/x11/build/ico b/source/x/x11/build/libX11
index 0cfbf088..0cfbf088 100644
--- a/source/x/x11/build/ico
+++ b/source/x/x11/build/libX11
diff --git a/source/x/x11/build/lndir b/source/x/x11/build/lndir
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/lndir
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/oclock b/source/x/x11/build/oclock
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/oclock
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/printproto b/source/x/x11/build/printproto
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/printproto
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/proxymngr b/source/x/x11/build/proxymngr
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/proxymngr
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/rendercheck b/source/x/x11/build/rendercheck
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/rendercheck
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/scripts b/source/x/x11/build/scripts
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/scripts
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/trapproto b/source/x/x11/build/trapproto
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/trapproto
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/twm b/source/x/x11/build/twm
deleted file mode 100644
index 00750edc..00000000
--- a/source/x/x11/build/twm
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/x/x11/build/libXTrap b/source/x/x11/build/xcompmgr
index 0cfbf088..0cfbf088 100644
--- a/source/x/x11/build/libXTrap
+++ b/source/x/x11/build/xcompmgr
diff --git a/source/x/x11/build/xconsole b/source/x/x11/build/xconsole
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xconsole
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xdbedizzy b/source/x/x11/build/xdbedizzy
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xdbedizzy
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xditview b/source/x/x11/build/xditview
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xditview
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/libXevie b/source/x/x11/build/xf86-input-acecad
index 0cfbf088..0cfbf088 100644
--- a/source/x/x11/build/libXevie
+++ b/source/x/x11/build/xf86-input-acecad
diff --git a/source/x/x11/build/xf86-input-elographics b/source/x/x11/build/xf86-input-elographics
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xf86-input-elographics
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xf86-input-mutouch b/source/x/x11/build/xf86-input-mutouch
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xf86-input-mutouch
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/libXp b/source/x/x11/build/xf86-input-penmount
index 0cfbf088..0cfbf088 100644
--- a/source/x/x11/build/libXp
+++ b/source/x/x11/build/xf86-input-penmount
diff --git a/source/x/x11/build/xf86-input-vmmouse b/source/x/x11/build/xf86-input-vmmouse
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xf86-input-vmmouse
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xf86-video-apm b/source/x/x11/build/xf86-video-apm
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xf86-video-apm
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xf86-video-ast b/source/x/x11/build/xf86-video-ast
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xf86-video-ast
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xf86-video-cirrus b/source/x/x11/build/xf86-video-cirrus
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xf86-video-cirrus
+++ b/source/x/x11/build/xf86-video-cirrus
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xf86-video-glint b/source/x/x11/build/xf86-video-glint
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xf86-video-glint
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xf86-video-i128 b/source/x/x11/build/xf86-video-i128
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xf86-video-i128
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xf86-video-i740 b/source/x/x11/build/xf86-video-i740
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xf86-video-i740
+++ b/source/x/x11/build/xf86-video-i740
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xf86-video-mach64 b/source/x/x11/build/xf86-video-mach64
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xf86-video-mach64
+++ b/source/x/x11/build/xf86-video-mach64
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xf86-video-mga b/source/x/x11/build/xf86-video-mga
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xf86-video-mga
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xf86-video-neomagic b/source/x/x11/build/xf86-video-neomagic
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xf86-video-neomagic
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/libXprintAppUtil b/source/x/x11/build/xf86-video-openchrome
index 0cfbf088..0cfbf088 100644
--- a/source/x/x11/build/libXprintAppUtil
+++ b/source/x/x11/build/xf86-video-openchrome
diff --git a/source/x/x11/build/xf86-video-r128 b/source/x/x11/build/xf86-video-r128
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xf86-video-r128
+++ b/source/x/x11/build/xf86-video-r128
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libXprintUtil b/source/x/x11/build/xf86-video-radeonhd
index 0cfbf088..0cfbf088 100644
--- a/source/x/x11/build/libXprintUtil
+++ b/source/x/x11/build/xf86-video-radeonhd
diff --git a/source/x/x11/build/xf86-video-s3 b/source/x/x11/build/xf86-video-s3
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xf86-video-s3
+++ b/source/x/x11/build/xf86-video-s3
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xf86-video-s3virge b/source/x/x11/build/xf86-video-s3virge
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xf86-video-s3virge
+++ b/source/x/x11/build/xf86-video-s3virge
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xf86-video-savage b/source/x/x11/build/xf86-video-savage
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xf86-video-savage
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xf86-video-sis b/source/x/x11/build/xf86-video-sis
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xf86-video-sis
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xf86-video-sisusb b/source/x/x11/build/xf86-video-sisusb
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xf86-video-sisusb
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xf86-video-tdfx b/source/x/x11/build/xf86-video-tdfx
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xf86-video-tdfx
+++ b/source/x/x11/build/xf86-video-tdfx
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libxkbui b/source/x/x11/build/xf86-video-tga
index 0cfbf088..0cfbf088 100644
--- a/source/x/x11/build/libxkbui
+++ b/source/x/x11/build/xf86-video-tga
diff --git a/source/x/x11/build/xf86-video-v4l b/source/x/x11/build/xf86-video-v4l
index 00750edc..b8626c4c 100644
--- a/source/x/x11/build/xf86-video-v4l
+++ b/source/x/x11/build/xf86-video-v4l
@@ -1 +1 @@
-3
+4
diff --git a/source/x/x11/build/xf86-video-vesa b/source/x/x11/build/xf86-video-vesa
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xf86-video-vesa
+++ b/source/x/x11/build/xf86-video-vesa
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xf86-video-vmware b/source/x/x11/build/xf86-video-vmware
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xf86-video-vmware
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xf86-video-voodoo b/source/x/x11/build/xf86-video-voodoo
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xf86-video-voodoo
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xf86dga b/source/x/x11/build/xf86dga
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xf86dga
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xf86rushproto b/source/x/x11/build/xf86rushproto
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xf86rushproto
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xfd b/source/x/x11/build/xfd
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xfd
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xfindproxy b/source/x/x11/build/xfindproxy
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xfindproxy
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xfontsel b/source/x/x11/build/xfontsel
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xfontsel
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xfwp b/source/x/x11/build/xfwp
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xfwp
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xgc b/source/x/x11/build/xgc
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xgc
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xload b/source/x/x11/build/xload
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xload
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xlsfonts b/source/x/x11/build/xlsfonts
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xlsfonts
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xmh b/source/x/x11/build/xmh
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xmh
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xmore b/source/x/x11/build/xmore
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xmore
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xplsprinters b/source/x/x11/build/xplsprinters
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xplsprinters
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xprehashprinterlist b/source/x/x11/build/xprehashprinterlist
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xprehashprinterlist
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xsetmode b/source/x/x11/build/xsetmode
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xsetmode
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xsetpointer b/source/x/x11/build/xsetpointer
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xsetpointer
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xsm b/source/x/x11/build/xsm
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xsm
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xstdcmap b/source/x/x11/build/xstdcmap
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xstdcmap
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xtrap b/source/x/x11/build/xtrap
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xtrap
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/configure/compiz b/source/x/x11/configure/compiz
index 21d8270d..aebd49a2 100644
--- a/source/x/x11/configure/compiz
+++ b/source/x/x11/configure/compiz
@@ -1,3 +1,4 @@
+# Use ./autogen.sh for git, or ./configure for releases:
 CFLAGS=$SLKCFLAGS \
 CXXFLAGS=$SLKCFLAGS \
 ./configure \
diff --git a/source/x/x11/configure/configure b/source/x/x11/configure/configure
index eb3fd59c..0f3bccf2 100644
--- a/source/x/x11/configure/configure
+++ b/source/x/x11/configure/configure
@@ -7,5 +7,6 @@ CXXFLAGS=$SLKCFLAGS \
   --localstatedir=/var \
   --infodir=/usr/info \
   --mandir=/usr/man \
+  --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \
   --disable-static \
   --build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/font-bh-ttf b/source/x/x11/configure/font-bh-ttf
new file mode 100644
index 00000000..9e498859
--- /dev/null
+++ b/source/x/x11/configure/font-bh-ttf
@@ -0,0 +1,13 @@
+FC_CONFDIR=/etc/fonts \
+CFLAGS=$SLKCFLAGS \
+CXXFLAGS=$SLKCFLAGS \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --infodir=/usr/info \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \
+  --disable-static \
+  --build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/gccmakedep b/source/x/x11/configure/gccmakedep
new file mode 100644
index 00000000..181ae81e
--- /dev/null
+++ b/source/x/x11/configure/gccmakedep
@@ -0,0 +1,14 @@
+CFLAGS=$SLKCFLAGS \
+CXXFLAGS=$SLKCFLAGS \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --infodir=/usr/info \
+  --mandir=/usr/man \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+#
+#  --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION}
+#
diff --git a/source/x/x11/configure/libX11 b/source/x/x11/configure/libX11
index 093c6044..cf85e58d 100644
--- a/source/x/x11/configure/libX11
+++ b/source/x/x11/configure/libX11
@@ -3,10 +3,10 @@ CXXFLAGS=$SLKCFLAGS \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --infodir=/usr/info \
   --mandir=/usr/man \
   --disable-static \
-  --with-xcb=yes \
   --build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/libXp b/source/x/x11/configure/libXp
new file mode 100644
index 00000000..181ae81e
--- /dev/null
+++ b/source/x/x11/configure/libXp
@@ -0,0 +1,14 @@
+CFLAGS=$SLKCFLAGS \
+CXXFLAGS=$SLKCFLAGS \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --infodir=/usr/info \
+  --mandir=/usr/man \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+#
+#  --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION}
+#
diff --git a/source/x/x11/configure/xf86-video-ati b/source/x/x11/configure/xf86-video-ati
index ae245884..0eacb0c3 100644
--- a/source/x/x11/configure/xf86-video-ati
+++ b/source/x/x11/configure/xf86-video-ati
@@ -1,4 +1,4 @@
-xserver_source="/tmp/x11-build/xorg-server-1.7.5"
+xserver_source="/tmp/x11-build/xorg-server-1.9.3"
 
 # Let these just fail to build.  In any case, an "exit 1"
 # here is just plain wrong.
diff --git a/source/x/x11/configure/xf86-video-nouveau b/source/x/x11/configure/xf86-video-nouveau
new file mode 100644
index 00000000..e050771b
--- /dev/null
+++ b/source/x/x11/configure/xf86-video-nouveau
@@ -0,0 +1,11 @@
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./autogen.sh \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --infodir=/usr/info \
+  --mandir=/usr/man \
+  --disable-static \
+  --build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/xf86-video-nv b/source/x/x11/configure/xf86-video-nv
deleted file mode 100644
index ae245884..00000000
--- a/source/x/x11/configure/xf86-video-nv
+++ /dev/null
@@ -1,21 +0,0 @@
-xserver_source="/tmp/x11-build/xorg-server-1.7.5"
-
-# Let these just fail to build.  In any case, an "exit 1"
-# here is just plain wrong.
-#if [ ! -d "$xserver_source" ]; then
-#  echo "$xserver_source does not exist, and you need it."
-#  exit 1
-#fi
-
-CFLAGS="$SLKCFLAGS -I${xserver_source}/hw/xfree86/ramdac" \
-CXXFLAGS="$SLKCFLAGS -I${xserver_source}/hw/xfree86/ramdac" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --infodir=/usr/info \
-  --mandir=/usr/man \
-  --disable-static \
-  --with-xserver-source=${xserver_source} \
-  --build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/xorg-docs b/source/x/x11/configure/xorg-docs
index 77bb98d8..ff88ae97 100644
--- a/source/x/x11/configure/xorg-docs
+++ b/source/x/x11/configure/xorg-docs
@@ -7,6 +7,7 @@ CXXFLAGS=$SLKCFLAGS \
   --localstatedir=/var \
   --infodir=/usr/info \
   --mandir=/usr/man \
+  --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \
   --disable-static \
   --enable-pdf=no \
   --enable-ps=no \
diff --git a/source/x/x11/configure/xorg-server b/source/x/x11/configure/xorg-server
index 943797bf..cf9bd843 100644
--- a/source/x/x11/configure/xorg-server
+++ b/source/x/x11/configure/xorg-server
@@ -1,13 +1,15 @@
 # Servers to build:
 BUILD_SERVERS="--enable-xorg \
+  --enable-dmx \
   --enable-xvfb \
   --enable-xnest \
   --enable-kdrive \
   --enable-xephyr \
-  --enable-xsdl \
-  --enable-xfbdev"
+  --enable-xfbdev \
+  --enable-config-udev \
+  --disable-config-hal"
 
-MESA_VERSION=${MESA_VERSION:-7.5}	# unused in 1.7.x
+MESA_VERSION=${MESA_VERSION:-7.5}	# unused in 1.7+
 
 # Default font paths to be used by the X server
 DEF_FONTPATH="/usr/share/fonts/local,/usr/share/fonts/TTF,/usr/share/fonts/OTF,/usr/share/fonts/Type1,/usr/share/fonts/misc,/usr/share/fonts/CID,/usr/share/fonts/75dpi/:unscaled,/usr/share/fonts/100dpi/:unscaled,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/cyrillic"
@@ -26,7 +28,7 @@ CFLAGS="$SLKCFLAGS" \
   --with-default-font-path="${DEF_FONTPATH}" \
   --with-module-dir=/usr/lib${LIBDIRSUFFIX}/xorg/modules \
   --with-dri-driver-path=/usr/lib${LIBDIRSUFFIX}/xorg/modules/dri \
-  --with-os-name="Slackware 13.1" \
+  --with-os-name="Slackware 13.37" \
   --with-os-vendor="Slackware Linux Project" \
   --with-xkb-path=/etc/X11/xkb \
   --with-xkb-output=/var/lib/xkb \
diff --git a/source/x/x11/modularize b/source/x/x11/modularize
index d915fd21..47da583f 100644
--- a/source/x/x11/modularize
+++ b/source/x/x11/modularize
@@ -169,31 +169,13 @@ xextproto
 xeyes
 xf86-input-acecad
 xf86-input-aiptek
-xf86-input-calcomp
 xf86-input-citron
-xf86-input-digitaledge
-xf86-input-dmc
-xf86-input-dynapro
-xf86-input-elo2300
-xf86-input-elographics
 xf86-input-evdev
-xf86-input-fpit
-xf86-input-hyperpen
-xf86-input-jamstudio
 xf86-input-joystick
 xf86-input-keyboard
-xf86-input-magellan
-xf86-input-magictouch
-xf86-input-microtouch
 xf86-input-mouse
-xf86-input-mutouch
-xf86-input-palmax
 xf86-input-penmount
-xf86-input-spaceorb
-xf86-input-summa
 xf86-input-synaptics
-xf86-input-tek4957
-xf86-input-ur98
 xf86-input-vmmouse
 xf86-input-void
 xf86-input-wacom
@@ -204,24 +186,20 @@ xf86-video-ast
 xf86-video-ati
 xf86-video-chips
 xf86-video-cirrus
-xf86-video-cyrix
 xf86-video-dummy
 xf86-video-fbdev
 xf86-video-glint
 xf86-video-i128
 xf86-video-i740
 xf86-video-i810
-xf86-video-impact
-xf86-video-imstt
 xf86-video-intel
 xf86-video-mach64
 xf86-video-mga
 xf86-video-neomagic
-xf86-video-newport
+xf86-video-nouveau
 xf86-video-nsc
 xf86-video-nv
 xf86-video-openchrome
-xf86-video-radeonhd
 xf86-video-r128
 xf86-video-rendition
 xf86-video-s3
@@ -243,7 +221,6 @@ xf86-video-trident
 xf86-video-tseng
 xf86-video-v4l
 xf86-video-vesa
-xf86-video-vga
 xf86-video-vmware
 xf86-video-voodoo
 xf86-video-wsfb
diff --git a/source/x/x11/noarch b/source/x/x11/noarch
index 2a07c677..79eb0e56 100644
--- a/source/x/x11/noarch
+++ b/source/x/x11/noarch
@@ -7,7 +7,6 @@ dejavu-ttf
 dmxproto
 encodings
 evieext
-fixesproto
 font-adobe-100dpi
 font-adobe-75dpi
 font-adobe-utopia-100dpi
@@ -64,11 +63,9 @@ ttf-indic-fonts
 util-macros
 videoproto
 x11-skel
-xbitmaps
 xcb-proto
 xcmiscproto
 xcursor-themes
-xextproto
 xf86bigfontproto
 xf86dgaproto
 xf86driproto
@@ -79,7 +76,6 @@ xineramaproto
 xkeyboard-config
 xorg-cf-files
 xorg-docs
-xorg-sgml-doctools
 xproto
 xproxymanagementprotocol
 xtrans
diff --git a/source/x/x11/patch/README b/source/x/x11/patch/README
new file mode 100644
index 00000000..c5af64b3
--- /dev/null
+++ b/source/x/x11/patch/README
@@ -0,0 +1,18 @@
+
+IMPORTANT!
+
+To fail/exit a script, use this:
+
+[command that fails] || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
+DO NOT USE THIS:
+
+[command that fails] || exit 1
+
+as it will cause the parent script to exit in the wrong location and possibly
+silently skip building some packages.
+
+Thanks,
+
+The Management
+
diff --git a/source/x/x11/patch/xcompmgr.patch b/source/x/x11/patch/xcompmgr.patch
new file mode 100644
index 00000000..6097b12a
--- /dev/null
+++ b/source/x/x11/patch/xcompmgr.patch
@@ -0,0 +1,2 @@
+zcat $CWD/patch/xcompmgr/xcompmgr-follow-icccm-spec.diff.gz | patch -p1 --verbose \
+     || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/xcompmgr/xcompmgr-follow-icccm-spec.diff b/source/x/x11/patch/xcompmgr/xcompmgr-follow-icccm-spec.diff
new file mode 100644
index 00000000..a69b0704
--- /dev/null
+++ b/source/x/x11/patch/xcompmgr/xcompmgr-follow-icccm-spec.diff
@@ -0,0 +1,26 @@
+# Bug 26090 - xcompmgr and ICCCM manager spec
+https://bugs.freedesktop.org/show_bug.cgi?id=26090
+https://bugs.freedesktop.org/attachment.cgi?id=32702
+
+diff -u xcompmgr-1.1.5/xcompmgr.c xcompmgr.new/xcompmgr.c
+--- xcompmgr-1.1.5/xcompmgr.c	2009-10-20 00:44:23.000000000 +0200
++++ xcompmgr.new/xcompmgr.c	2010-01-17 22:44:31.261276441 +0100
+@@ -1924,6 +1924,18 @@
+ 
+     XSetSelectionOwner (dpy, a, w, 0);
+ 
++    XClientMessageEvent ev;
++    ev.type = ClientMessage;
++    ev.window = RootWindow (dpy, scr);
++    ev.message_type = a;
++    ev.format = 32;
++    ev.data.l[0] = CurrentTime;
++    ev.data.l[1] = a;
++    ev.data.l[2] = w;
++    ev.data.l[3] = 0;
++    ev.data.l[4] = 0;
++    XSendEvent(dpy, RootWindow (dpy, scr), False, StructureNotifyMask, (XEvent*)&ev);
++
+     return True;
+ }
+ 
diff --git a/source/x/x11/patch/xcursorgen.patch b/source/x/x11/patch/xcursorgen.patch
deleted file mode 100644
index 5aa46dee..00000000
--- a/source/x/x11/patch/xcursorgen.patch
+++ /dev/null
@@ -1 +0,0 @@
-zcat $CWD/patch/xcursorgen/xcursorgen.png14.configure.kludge.diff.gz | patch -p1 --verbose || exit 1
diff --git a/source/x/x11/patch/xcursorgen/xcursorgen.png14.configure.kludge.diff b/source/x/x11/patch/xcursorgen/xcursorgen.png14.configure.kludge.diff
deleted file mode 100644
index ad7ae105..00000000
--- a/source/x/x11/patch/xcursorgen/xcursorgen.png14.configure.kludge.diff
+++ /dev/null
@@ -1,61 +0,0 @@
---- ./configure.orig	2009-10-16 19:42:25.000000000 -0500
-+++ ./configure	2010-02-21 13:57:53.000000000 -0600
-@@ -5043,12 +5043,12 @@
-     pkg_cv_XCURSORGEN_CFLAGS="$XCURSORGEN_CFLAGS"
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xcursor libpng12\"") >&5
--  ($PKG_CONFIG --exists --print-errors "x11 xcursor libpng12") 2>&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xcursor libpng14\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "x11 xcursor libpng14") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_XCURSORGEN_CFLAGS=`$PKG_CONFIG --cflags "x11 xcursor libpng12" 2>/dev/null`
-+  pkg_cv_XCURSORGEN_CFLAGS=`$PKG_CONFIG --cflags "x11 xcursor libpng14" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -5059,12 +5059,12 @@
-     pkg_cv_XCURSORGEN_LIBS="$XCURSORGEN_LIBS"
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xcursor libpng12\"") >&5
--  ($PKG_CONFIG --exists --print-errors "x11 xcursor libpng12") 2>&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xcursor libpng14\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "x11 xcursor libpng14") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_XCURSORGEN_LIBS=`$PKG_CONFIG --libs "x11 xcursor libpng12" 2>/dev/null`
-+  pkg_cv_XCURSORGEN_LIBS=`$PKG_CONFIG --libs "x11 xcursor libpng14" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -5082,14 +5082,14 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        XCURSORGEN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xcursor libpng12" 2>&1`
-+	        XCURSORGEN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xcursor libpng14" 2>&1`
-         else
--	        XCURSORGEN_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xcursor libpng12" 2>&1`
-+	        XCURSORGEN_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xcursor libpng14" 2>&1`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$XCURSORGEN_PKG_ERRORS" >&5
- 
--	{ { $as_echo "$as_me:$LINENO: error: Package requirements (x11 xcursor libpng12) were not met:
-+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (x11 xcursor libpng14) were not met:
- 
- $XCURSORGEN_PKG_ERRORS
- 
-@@ -5100,7 +5100,7 @@
- and XCURSORGEN_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements (x11 xcursor libpng12) were not met:
-+$as_echo "$as_me: error: Package requirements (x11 xcursor libpng14) were not met:
- 
- $XCURSORGEN_PKG_ERRORS
- 
diff --git a/source/x/x11/patch/xf86-input-synaptics.patch b/source/x/x11/patch/xf86-input-synaptics.patch
deleted file mode 100644
index f41034c3..00000000
--- a/source/x/x11/patch/xf86-input-synaptics.patch
+++ /dev/null
@@ -1,4 +0,0 @@
-# Enable tap-to-click out of the box, closing one of the
-# most reported bugs of the last 2 years or so.
-# Thanks to Piter Punk for figuring out the proper fix!
-zcat $CWD/patch/xf86-input-synaptics/xf86-input-synaptics.tap-to-click.diff.gz | patch -p1 --verbose || exit 1
diff --git a/source/x/x11/patch/xf86-input-synaptics/xf86-input-synaptics.tap-to-click.diff b/source/x/x11/patch/xf86-input-synaptics/xf86-input-synaptics.tap-to-click.diff
deleted file mode 100644
index 2fdf4e0d..00000000
--- a/source/x/x11/patch/xf86-input-synaptics/xf86-input-synaptics.tap-to-click.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./fdi/11-x11-synaptics.fdi.orig	2009-10-11 18:11:21.000000000 -0500
-+++ ./fdi/11-x11-synaptics.fdi	2010-04-24 12:59:37.000000000 -0500
-@@ -3,6 +3,8 @@
-   <device>
-     <match key="info.capabilities" contains="input.touchpad">
-         <merge key="input.x11_driver" type="string">synaptics</merge>
-+        <!-- Enable tap click by default: -->
-+        <merge key="input.x11_options.TapButton1" type="string">1</merge>
-         <!-- Arbitrary options can be passed to the driver using
-              the input.x11_options property since xorg-server-1.5. -->
-         <!-- EXAMPLES:
diff --git a/source/x/x11/patch/xorg-server.patch b/source/x/x11/patch/xorg-server.patch
index 16cf61e3..e3218a03 100644
--- a/source/x/x11/patch/xorg-server.patch
+++ b/source/x/x11/patch/xorg-server.patch
@@ -1,2 +1,3 @@
-zcat $CWD/patch/xorg-server/x11.startwithblackscreen.diff.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patch/xorg-server/x11.startwithblackscreen.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+zcat $CWD/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+zcat $CWD/patch/xorg-server/xorg-server.try_nouveau.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/xorg-server/xorg-server.try_nouveau.diff b/source/x/x11/patch/xorg-server/xorg-server.try_nouveau.diff
new file mode 100644
index 00000000..74f799a1
--- /dev/null
+++ b/source/x/x11/patch/xorg-server/xorg-server.try_nouveau.diff
@@ -0,0 +1,11 @@
+--- ./hw/xfree86/common/xf86pciBus.c.orig	2010-07-01 12:17:35.000000000 -0500
++++ ./hw/xfree86/common/xf86pciBus.c	2010-11-18 16:56:57.633003654 -0600
+@@ -1118,7 +1118,7 @@
+ 	    break;
+ 	case 0x102b:		    driverList[0] = "mga";	break;
+ 	case 0x10c8:		    driverList[0] = "neomagic"; break;
+-	case 0x10de: case 0x12d2:   driverList[0] = "nv";	break;
++	case 0x10de: case 0x12d2:   driverList[0] = "nouveau" ; driverList[1] = "nv";	break;
+ 	case 0x1106:		    driverList[0] = "openchrome"; break;
+         case 0x1b36:		    driverList[0] = "qxl"; break;
+ 	case 0x1163:		    driverList[0] = "rendition"; break;
diff --git a/source/x/x11/post-install/libSM.post-install b/source/x/x11/post-install/libSM.post-install
new file mode 100644
index 00000000..6cc5edc0
--- /dev/null
+++ b/source/x/x11/post-install/libSM.post-install
@@ -0,0 +1 @@
+rm -f $PKG/usr/doc/libSM-${MODULAR_PACKAGE_VERSION}/*.xml
diff --git a/source/x/x11/post-install/libX11.post-install b/source/x/x11/post-install/libX11.post-install
new file mode 100644
index 00000000..7232b680
--- /dev/null
+++ b/source/x/x11/post-install/libX11.post-install
@@ -0,0 +1,2 @@
+mkdir -p $PKG/usr/share/X11
+zcat $CWD/post-install/libX11/XKeysymDB.gz > $PKG/usr/share/X11/XKeysymDB
diff --git a/source/x/x11/post-install/libX11/XKeysymDB b/source/x/x11/post-install/libX11/XKeysymDB
new file mode 100644
index 00000000..45d89297
--- /dev/null
+++ b/source/x/x11/post-install/libX11/XKeysymDB
@@ -0,0 +1,380 @@
+! Copyright 1993 Massachusetts Institute of Technology
+!
+! Permission to use, copy, modify, distribute, and sell this software and
+! its documentation for any purpose is hereby granted without fee, provided
+! that the above copyright notice appear in all copies and that both that
+! copyright notice and this permission notice appear in supporting
+! documentation, and that the name of M.I.T. not be used in advertising or
+! publicity pertaining to distribution of the software without specific,
+! written prior permission.  M.I.T. makes no representations about the
+! suitability of this software for any purpose.  It is provided "as is"
+! without express or implied warranty.
+!
+
+hpmute_acute		:100000A8
+hpmute_grave		:100000A9
+hpmute_asciicircum	:100000AA
+hpmute_diaeresis	:100000AB
+hpmute_asciitilde	:100000AC
+hplira			:100000AF
+hpguilder		:100000BE
+hpYdiaeresis		:100000EE
+hpIO			:100000EE
+hplongminus		:100000F6
+hpblock			:100000FC
+apLineDel		:1000FF00
+apCharDel		:1000FF01
+apCopy			:1000FF02
+apCut			:1000FF03
+apPaste			:1000FF04
+apMove			:1000FF05
+apGrow			:1000FF06
+apCmd			:1000FF07
+apShell			:1000FF08
+apLeftBar		:1000FF09
+apRightBar		:1000FF0A
+apLeftBox		:1000FF0B
+apRightBox		:1000FF0C
+apUpBox			:1000FF0D
+apDownBox		:1000FF0E
+apPop			:1000FF0F
+apRead			:1000FF10
+apEdit			:1000FF11
+apSave			:1000FF12
+apExit			:1000FF13
+apRepeat		:1000FF14
+hpModelock1		:1000FF48
+hpModelock2		:1000FF49
+hpReset			:1000FF6C
+hpSystem		:1000FF6D
+hpUser			:1000FF6E
+hpClearLine		:1000FF6F
+hpInsertLine		:1000FF70
+hpDeleteLine		:1000FF71
+hpInsertChar		:1000FF72
+hpDeleteChar		:1000FF73
+hpBackTab		:1000FF74
+hpKP_BackTab		:1000FF75
+apKP_parenleft		:1000FFA8
+apKP_parenright		:1000FFA9
+
+I2ND_FUNC_L		:10004001
+I2ND_FUNC_R		:10004002
+IREMOVE			:10004003
+IREPEAT			:10004004
+IA1			:10004101
+IA2			:10004102
+IA3			:10004103
+IA4			:10004104
+IA5			:10004105
+IA6			:10004106
+IA7			:10004107
+IA8			:10004108
+IA9			:10004109
+IA10			:1000410A
+IA11			:1000410B
+IA12			:1000410C
+IA13			:1000410D
+IA14			:1000410E
+IA15			:1000410F
+IB1			:10004201
+IB2			:10004202
+IB3			:10004203
+IB4			:10004204
+IB5			:10004205
+IB6			:10004206
+IB7			:10004207
+IB8			:10004208
+IB9			:10004209
+IB10			:1000420A
+IB11			:1000420B
+IB12			:1000420C
+IB13			:1000420D
+IB14			:1000420E
+IB15			:1000420F
+IB16			:10004210
+
+DRemove			:1000FF00
+Dring_accent		:1000FEB0
+Dcircumflex_accent	:1000FE5E
+Dcedilla_accent		:1000FE2C
+Dacute_accent		:1000FE27
+Dgrave_accent		:1000FE60
+Dtilde			:1000FE7E
+Ddiaeresis		:1000FE22
+
+osfCopy			:1004FF02
+osfCut			:1004FF03
+osfPaste		:1004FF04
+osfBackTab		:1004FF07
+osfBackSpace		:1004FF08
+osfClear		:1004FF0B
+osfEscape		:1004FF1B
+osfAddMode		:1004FF31
+osfPrimaryPaste		:1004FF32
+osfQuickPaste		:1004FF33
+osfPageLeft		:1004FF40
+osfPageUp		:1004FF41
+osfPageDown		:1004FF42
+osfPageRight		:1004FF43
+osfActivate		:1004FF44
+osfMenuBar		:1004FF45
+osfLeft			:1004FF51
+osfUp			:1004FF52
+osfRight		:1004FF53
+osfDown			:1004FF54
+osfPrior		:1004FF55
+osfNext			:1004FF56
+osfEndLine		:1004FF57
+osfBeginLine		:1004FF58
+osfEndData		:1004FF59
+osfBeginData		:1004FF5A
+osfPrevMenu		:1004FF5B
+osfNextMenu		:1004FF5C
+osfPrevField		:1004FF5D
+osfNextField		:1004FF5E
+osfSelect		:1004FF60
+osfInsert		:1004FF63
+osfUndo			:1004FF65
+osfMenu			:1004FF67
+osfCancel		:1004FF69
+osfHelp			:1004FF6A
+osfSelectAll		:1004FF71
+osfDeselectAll		:1004FF72
+osfReselect		:1004FF73
+osfExtend		:1004FF74
+osfRestore		:1004FF78
+osfSwitchDirection	:1004FF7E
+osfPriorMinor		:1004FFF5
+osfNextMinor		:1004FFF6
+osfRightLine		:1004FFF7
+osfLeftLine		:1004FFF8
+osfDelete		:1004FFFF
+
+SunFA_Grave		:1005FF00
+SunFA_Circum		:1005FF01
+SunFA_Tilde		:1005FF02
+SunFA_Acute		:1005FF03
+SunFA_Diaeresis		:1005FF04
+SunFA_Cedilla		:1005FF05
+SunF36			:1005FF10
+SunF37			:1005FF11
+SunSys_Req		:1005FF60
+SunProps		:1005FF70
+SunFront		:1005FF71
+SunCopy			:1005FF72
+SunOpen			:1005FF73
+SunPaste		:1005FF74
+SunCut			:1005FF75
+SunPowerSwitch		:1005FF76
+SunAudioLowerVolume	:1005FF77
+SunAudioMute		:1005FF78
+SunAudioRaiseVolume	:1005FF79
+SunVideoDegauss		:1005FF7A
+SunVideoLowerBrightness	:1005FF7B
+SunVideoRaiseBrightness	:1005FF7C
+SunPowerSwitchShift	:1005FF7D
+
+SunCompose		:FF20
+SunPageUp		:FF55
+SunPageDown		:FF56
+SunPrint_Screen		:FF61
+SunUndo			:FF65
+SunAgain		:FF66
+SunFind			:FF68
+SunStop			:FF69
+SunAltGraph		:FF7E
+
+WYSetup			:1006FF00
+
+ncdSetup		:1006FF00
+
+XeroxPointerButton1	:10070001
+XeroxPointerButton2	:10070002
+XeroxPointerButton3	:10070003
+XeroxPointerButton4	:10070004
+XeroxPointerButton5	:10070005
+
+! The definitions here should match <X11/XF86keysym.h>
+XF86ModeLock		:1008FF01
+XF86MonBrightnessUp	:1008FF02
+XF86MonBrightnessDown	:1008FF03
+XF86KbdLightOnOff	:1008FF04
+XF86KbdBrightnessUp	:1008FF05
+XF86KbdBrightnessDown	:1008FF06
+XF86Standby		:1008FF10
+XF86AudioLowerVolume	:1008FF11
+XF86AudioMute		:1008FF12
+XF86AudioRaiseVolume	:1008FF13
+XF86AudioPlay		:1008FF14
+XF86AudioStop		:1008FF15
+XF86AudioPrev		:1008FF16
+XF86AudioNext		:1008FF17
+XF86HomePage		:1008FF18
+XF86Mail		:1008FF19
+XF86Start		:1008FF1A
+XF86Search		:1008FF1B
+XF86AudioRecord		:1008FF1C
+XF86Calculator		:1008FF1D
+XF86Memo		:1008FF1E
+XF86ToDoList		:1008FF1F
+XF86Calendar		:1008FF20
+XF86PowerDown		:1008FF21
+XF86ContrastAdjust	:1008FF22
+XF86RockerUp		:1008FF23
+XF86RockerDown		:1008FF24
+XF86RockerEnter		:1008FF25
+XF86Back		:1008FF26
+XF86Forward		:1008FF27
+XF86Stop		:1008FF28
+XF86Refresh		:1008FF29
+XF86PowerOff		:1008FF2A
+XF86WakeUp		:1008FF2B
+XF86Eject               :1008FF2C
+XF86ScreenSaver         :1008FF2D
+XF86WWW                 :1008FF2E
+XF86Sleep               :1008FF2F
+XF86Favorites		:1008FF30
+XF86AudioPause		:1008FF31
+XF86AudioMedia		:1008FF32
+XF86MyComputer		:1008FF33
+XF86VendorHome		:1008FF34
+XF86LightBulb		:1008FF35
+XF86Shop		:1008FF36
+XF86History		:1008FF37
+XF86OpenURL		:1008FF38
+XF86AddFavorite		:1008FF39
+XF86HotLinks		:1008FF3A
+XF86BrightnessAdjust	:1008FF3B
+XF86Finance		:1008FF3C
+XF86Community		:1008FF3D
+XF86AudioRewind		:1008FF3E
+XF86BackForward		:1008FF3F
+XF86Launch0		:1008FF40
+XF86Launch1		:1008FF41
+XF86Launch2		:1008FF42
+XF86Launch3		:1008FF43
+XF86Launch4		:1008FF44
+XF86Launch5		:1008FF45
+XF86Launch6		:1008FF46
+XF86Launch7		:1008FF47
+XF86Launch8		:1008FF48
+XF86Launch9		:1008FF49
+XF86LaunchA		:1008FF4A
+XF86LaunchB		:1008FF4B
+XF86LaunchC		:1008FF4C
+XF86LaunchD		:1008FF4D
+XF86LaunchE		:1008FF4E
+XF86LaunchF		:1008FF4F
+XF86ApplicationLeft	:1008FF50
+XF86ApplicationRight	:1008FF51
+XF86Book		:1008FF52
+XF86CD			:1008FF53
+XF86Calculater		:1008FF54
+XF86Clear		:1008FF55
+XF86Close		:1008FF56
+XF86Copy		:1008FF57
+XF86Cut			:1008FF58
+XF86Display		:1008FF59
+XF86DOS			:1008FF5A
+XF86Documents		:1008FF5B
+XF86Excel		:1008FF5C
+XF86Explorer		:1008FF5D
+XF86Game		:1008FF5E
+XF86Go			:1008FF5F
+XF86iTouch		:1008FF60
+XF86LogOff		:1008FF61
+XF86Market		:1008FF62
+XF86Meeting		:1008FF63
+XF86MenuKB		:1008FF65
+XF86MenuPB		:1008FF66
+XF86MySites		:1008FF67
+XF86New			:1008FF68
+XF86News		:1008FF69
+XF86OfficeHome		:1008FF6A
+XF86Open		:1008FF6B
+XF86Option		:1008FF6C
+XF86Paste		:1008FF6D
+XF86Phone		:1008FF6E
+XF86Q			:1008FF70
+XF86Reply		:1008FF72
+XF86Reload		:1008FF73
+XF86RotateWindows	:1008FF74
+XF86RotationPB		:1008FF75
+XF86RotationKB		:1008FF76
+XF86Save		:1008FF77
+XF86ScrollUp		:1008FF78
+XF86ScrollDown		:1008FF79
+XF86ScrollClick		:1008FF7A
+XF86Send		:1008FF7B
+XF86Spell		:1008FF7C
+XF86SplitScreen		:1008FF7D
+XF86Support		:1008FF7E
+XF86TaskPane		:1008FF7F
+XF86Terminal		:1008FF80
+XF86Tools		:1008FF81
+XF86Travel		:1008FF82
+XF86UserPB		:1008FF84
+XF86User1KB		:1008FF85
+XF86User2KB		:1008FF86
+XF86Video		:1008FF87
+XF86WheelButton		:1008FF88
+XF86Word		:1008FF89
+XF86Xfer		:1008FF8A
+XF86ZoomIn		:1008FF8B
+XF86ZoomOut		:1008FF8C
+XF86Away		:1008FF8D
+XF86Messenger		:1008FF8E
+XF86WebCam		:1008FF8F
+XF86MailForward		:1008FF90
+XF86Pictures		:1008FF91
+XF86Music		:1008FF92
+XF86Battery		:1008FF93
+XF86Bluetooth		:1008FF94
+XF86WLAN		:1008FF95
+XF86UWB			:1008FF96
+XF86AudioForward	:1008FF97
+XF86AudioRepeat		:1008FF98
+XF86AudioRandomPlay	:1008FF99
+XF86Subtitle		:1008FF9A
+XF86AudioCycleTrack	:1008FF9B
+XF86CycleAngle		:1008FF9C
+XF86FrameBack		:1008FF9D
+XF86FrameForward	:1008FF9E
+XF86Time		:1008FF9F
+XF86Select		:1008FFA0
+XF86View		:1008FFA1
+XF86TopMenu		:1008FFA2
+XF86Red			:1008FFA3
+XF86Green		:1008FFA4
+XF86Yellow		:1008FFA5
+XF86Blue             	:1008FFA6
+XF86Suspend		:1008FFA7
+XF86Hibernate		:1008FFA8
+XF86TouchpadToggle	:1008FFA9
+
+! XFree86 special action keys
+XF86_Switch_VT_1	:1008FE01
+XF86_Switch_VT_2	:1008FE02
+XF86_Switch_VT_3	:1008FE03
+XF86_Switch_VT_4	:1008FE04
+XF86_Switch_VT_5	:1008FE05
+XF86_Switch_VT_6	:1008FE06
+XF86_Switch_VT_7	:1008FE07
+XF86_Switch_VT_8	:1008FE08
+XF86_Switch_VT_9	:1008FE09
+XF86_Switch_VT_10	:1008FE0A
+XF86_Switch_VT_11	:1008FE0B
+XF86_Switch_VT_12	:1008FE0C
+XF86_Ungrab		:1008FE20
+XF86_ClearGrab		:1008FE21
+XF86_Next_VMode		:1008FE22
+XF86_Prev_VMode		:1008FE23
+
+usldead_acute		:100000A8
+usldead_grave		:100000A9
+usldead_diaeresis	:100000AB
+usldead_asciicircum	:100000AA
+usldead_asciitilde	:100000AC
+usldead_cedilla		:1000FE2C
+usldead_ring		:1000FEB0
diff --git a/source/x/x11/post-install/xbitmaps.post-install b/source/x/x11/post-install/xbitmaps.post-install
new file mode 100644
index 00000000..b25fb344
--- /dev/null
+++ b/source/x/x11/post-install/xbitmaps.post-install
@@ -0,0 +1,2 @@
+mkdir -p $PKG/usr/lib
+mv $PKG/usr/share/pkgconfig $PKG/usr/lib
diff --git a/source/x/x11/post-install/xdm/Xsession b/source/x/x11/post-install/xdm/Xsession
index 6484b096..22fcde8f 100755
--- a/source/x/x11/post-install/xdm/Xsession
+++ b/source/x/x11/post-install/xdm/Xsession
@@ -10,6 +10,7 @@
 # Fixes for $PATH (from Jim Diamond), GDM/KDM/XDM, 2003-02-07 volkerdi
 # Use absolute paths until $PATH is set, 2006-01-11 (Al's 100th :-) volkerdi
 # merged changes from # $Xorg: Xsession,v 1.4 2000/08/17 19:54:17 cpqbld Exp $, 2007-02-13 volkerdi
+# Changed /usr/lib/X11/xinit/ paths to /etc/X11/xinit/   2011-01-23 rworkman
 
 # redirect errors to a file in user's home directory if we can
 errfile="$HOME/.xsession-errors"
@@ -32,8 +33,8 @@ fi
 
 userresources=$HOME/.Xresources
 usermodmap=$HOME/.Xmodmap
-sysresources=/usr/lib/X11/xinit/.Xresources
-sysmodmap=/usr/lib/X11/xinit/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
 
 # merge in defaults and keymaps
 
diff --git a/source/x/x11/post-install/xf86-input-synaptics.post-install b/source/x/x11/post-install/xf86-input-synaptics.post-install
index 00250982..e6352cb4 100644
--- a/source/x/x11/post-install/xf86-input-synaptics.post-install
+++ b/source/x/x11/post-install/xf86-input-synaptics.post-install
@@ -1,6 +1,7 @@
-mkdir -p $PKG/usr/share/hal/fdi/policy/10osvendor
-cat fdi/11-x11-synaptics.fdi > \
-  $PKG/usr/share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
+# Overwrite the default 50-syaptics.conf with our slightly enhanced and
+# better-commented version
+cat $CWD/post-install/xf86-input-synaptics/50-synaptics.conf > \
+   $PKG/usr/share/X11/xorg.conf.d/50-synaptics.conf
 
 mkdir -p $PKG/usr/doc/xf86-input-synaptics-$MODULAR_PACKAGE_VERSION
 cp -a \
diff --git a/source/x/x11/post-install/xf86-input-synaptics/50-synaptics.conf b/source/x/x11/post-install/xf86-input-synaptics/50-synaptics.conf
new file mode 100644
index 00000000..09c37642
--- /dev/null
+++ b/source/x/x11/post-install/xf86-input-synaptics/50-synaptics.conf
@@ -0,0 +1,15 @@
+# DO NOT EDIT THIS FILE - IT WILL BE OVERWRITTEN ON UPGRADES
+# Copy this file to /etc/X11/xorg.conf.d/ and edit the copy
+#
+# Use "synclient -l" to see all available options
+# Use "man synaptics" for details about what the options do
+#
+Section "InputClass"
+	Identifier "touchpad"
+	Driver "synaptics"
+	MatchDevicePath "/dev/input/event*"
+	MatchIsTouchpad "on"
+	Option "TapButton1" "1"
+	Option "TapButton2" "2"
+	Option "TapButton3" "3"
+EndSection
diff --git a/source/x/x11/post-install/xf86-input-wacom.post-install b/source/x/x11/post-install/xf86-input-wacom.post-install
deleted file mode 100644
index 226678f4..00000000
--- a/source/x/x11/post-install/xf86-input-wacom.post-install
+++ /dev/null
@@ -1,4 +0,0 @@
-mv $PKG/usr/share/hal/fdi/policy/20thirdparty \
-   $PKG/usr/share/hal/fdi/policy/10osvendor
-mv $PKG/usr/share/hal/fdi/policy/10osvendor/wacom.fdi \
-   $PKG/usr/share/hal/fdi/policy/10osvendor/11-x11-wacom.fdi
diff --git a/source/x/x11/post-install/xorg-docs.post-install b/source/x/x11/post-install/xorg-docs.post-install
deleted file mode 100644
index 9857acaf..00000000
--- a/source/x/x11/post-install/xorg-docs.post-install
+++ /dev/null
@@ -1 +0,0 @@
-rm $PKG/usr/man/man7/Xprint.7
diff --git a/source/x/x11/post-install/xorg-server.post-install b/source/x/x11/post-install/xorg-server.post-install
index 0185cb70..e21a0f03 100644
--- a/source/x/x11/post-install/xorg-server.post-install
+++ b/source/x/x11/post-install/xorg-server.post-install
@@ -1,3 +1,52 @@
+# Create the configuration directories for xorg-server 1.9.x
+mkdir -p $PKG/etc/X11/xorg.conf.d $PKG/usr/share/X11/xorg.conf.d
+
+# Create a sample keyboard layout 
+# Enable zapping by default
+cat << EOF > $PKG/usr/share/X11/xorg.conf.d/90-keyboard-layout.conf
+Section "InputClass"
+	Identifier "keyboard-all"
+	MatchIsKeyboard "on"
+	MatchDevicePath "/dev/input/event*"
+	Driver "evdev"
+	Option "XkbLayout" "us"
+	#Option "XkbVariant" ""
+	Option "XkbOptions" "terminate:ctrl_alt_bksp"
+EndSection
+
+# READ THIS FOR CUSTOM KEYBOARD INFORMATION
+#
+#  If you want to add a custom model/layout/variant to X, you will need to COPY
+#  this file to /etc/X11/xorg.conf.d/ and edit that copy.  After editing it to
+#  suit, you will need to restart X.
+#
+#  Here's an example of the lines from above:
+#
+# Section "InputClass"
+#	Identifier "keyboard-all"
+#	MatchIsKeyboard "on"
+#	MatchDevicePath "/dev/input/event*"
+#	Driver "evdev"
+#	Option "XkbLayout" "us"
+#	Option "XkbVariant" "intl"
+#	Option "XkbOptions" "compose:rwin,terminate:ctrl_alt_bksp"
+# EndSection
+#
+#  Many desktop environments, including KDE and Xfce, have their own methods to
+#  configure keyboard layouts and such if you'd like to use them.
+#
+#  If you prefer to use the "old" way of configuring keyboards (without input 
+#  device hotplugging), then you'll need to add the following lines to the 
+#  ServerFlags section of /etc/X11/xorg.conf:
+#    Option   "AllowEmptyInput"     "false"
+#    Option   "AutoAddDevices"      "false"
+#    Option   "AutoEnableDevices"   "false"
+#  Alternatively, you can break this up into separate "stubs" in the xorg.conf.d/
+#  directory, but that's your call.  Assuming you elect to keep a monolithic 
+#  /etc/X11/xorg.conf file, you can now edit the Keyboard section as usual.
+
+EOF
+
 # Add COPYING file:
 mkdir -p $PKG/usr/doc/xorg-server-$MODULAR_PACKAGE_VERSION
 cp -a COPYING $PKG/usr/doc/xorg-server-$MODULAR_PACKAGE_VERSION
diff --git a/source/x/x11/post-install/xorg-sgml-doctools.post-install b/source/x/x11/post-install/xorg-sgml-doctools.post-install
new file mode 100644
index 00000000..b25fb344
--- /dev/null
+++ b/source/x/x11/post-install/xorg-sgml-doctools.post-install
@@ -0,0 +1,2 @@
+mkdir -p $PKG/usr/lib
+mv $PKG/usr/share/pkgconfig $PKG/usr/lib
diff --git a/source/x/x11/post-install/xproto.post-install b/source/x/x11/post-install/xproto.post-install
new file mode 100644
index 00000000..5a3b79b3
--- /dev/null
+++ b/source/x/x11/post-install/xproto.post-install
@@ -0,0 +1,2 @@
+# bloat
+rm -rf $PKG/usr/doc/xproto
diff --git a/source/x/x11/slack-desc/mkcfm b/source/x/x11/slack-desc/mkcfm
deleted file mode 100644
index fa3a212c..00000000
--- a/source/x/x11/slack-desc/mkcfm
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-     |-----handy-ruler------------------------------------------------------|
-mkcfm: mkcfm
-mkcfm:
-mkcfm: mkcfm is part of X11.
-mkcfm:
-mkcfm: For more information about the X.Org Foundation (the providers of the
-mkcfm: X.Org implementation of the X Window System), see their website:
-mkcfm:
-mkcfm: http://www.x.org
-mkcfm:
-mkcfm:
-mkcfm:
diff --git a/source/x/x11/slack-desc/xf86-video-nouveau b/source/x/x11/slack-desc/xf86-video-nouveau
new file mode 100644
index 00000000..8697a60e
--- /dev/null
+++ b/source/x/x11/slack-desc/xf86-video-nouveau
@@ -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------------------------------------------------------|
+xf86-video-nouveau: xf86-video-nouveau
+xf86-video-nouveau:
+xf86-video-nouveau: xf86-video-nouveau is part of X11.
+xf86-video-nouveau:
+xf86-video-nouveau: For more information about the X.Org Foundation (the providers of the
+xf86-video-nouveau: X.Org implementation of the X Window System), see their website:
+xf86-video-nouveau:
+xf86-video-nouveau: http://www.x.org
+xf86-video-nouveau:
+xf86-video-nouveau:
+xf86-video-nouveau:
diff --git a/source/x/x11/src/get-xf86-video-nouveau.sh b/source/x/x11/src/get-xf86-video-nouveau.sh
new file mode 100755
index 00000000..72d3efd3
--- /dev/null
+++ b/source/x/x11/src/get-xf86-video-nouveau.sh
@@ -0,0 +1,22 @@
+# Pull a stable branch + patches
+BRANCH=master
+
+rm -rf xf86-video-nouveau
+git clone git://anongit.freedesktop.org/git/nouveau/xf86-video-nouveau/
+
+# use master branch
+#( cd xf86-video-nouveau 
+#  git checkout $BRANCH || exit 1
+#)
+
+HEADISAT="$(cat xf86-video-nouveau/.git/packed-refs | grep refs/remotes/origin/$BRANCH | cut -b1-7)"
+# Cleanup.  We're not packing up the whole git repo.
+( cd xf86-video-nouveau && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null )
+DATE=$(date +%Y%m%d)
+mv xf86-video-nouveau xf86-video-nouveau-git_${DATE}_${HEADISAT}
+tar cf xf86-video-nouveau-git_${DATE}_${HEADISAT}.tar xf86-video-nouveau-git_${DATE}_${HEADISAT}
+xz -9 xf86-video-nouveau-git_${DATE}_${HEADISAT}.tar
+rm -rf xf86-video-nouveau-git_${DATE}_${HEADISAT}
+echo
+echo "xf86-video-nouveau branch $BRANCH with HEAD at $HEADISAT packaged as xf86-video-nouveau-git_${DATE}_${HEADISAT}.tar.xz"
+echo
diff --git a/source/x/xaw3d/Xaw3d-1.5-debian-fixes.diff b/source/x/xaw3d/Xaw3d-1.5-debian-fixes.diff
deleted file mode 100644
index 5593f249..00000000
--- a/source/x/xaw3d/Xaw3d-1.5-debian-fixes.diff
+++ /dev/null
@@ -1,647 +0,0 @@
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrc.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrc.c
---- Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrc.c.debian	2000-11-27 14:19:36.000000000 +0100
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrc.c	2008-10-06 11:42:13.000000000 +0200
-@@ -51,11 +51,17 @@ in this Software without prior written a
- #include <X11/Xaw3d/MultiSrcP.h> 
- #endif
- 
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
- 
- #if (defined(ASCII_STRING) || defined(ASCII_DISK))
- #  include <X11/Xaw3d/AsciiText.h> /* for Widget Classes. */
- #endif
- 
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
- 
- /****************************************************************
-  *
-@@ -1007,7 +1013,9 @@ InitStringOrFile(src, newString)
- AsciiSrcObject src;
- Boolean newString;
- {
--    char * open_mode = NULL;
-+    mode_t open_mode = 0;
-+    const char *fdopen_mode = NULL;
-+    int fd;
-     FILE * file;
-     char fileName[TMPSIZ];
- 
-@@ -1049,7 +1057,8 @@ Boolean newString;
- 	    XtErrorMsg("NoFile", "asciiSourceCreate", "XawError",
- 		     "Creating a read only disk widget and no file specified.",
- 		       NULL, 0);
--	open_mode = "r";
-+	open_mode = O_RDONLY;
-+	fdopen_mode = "r";
- 	break;
-     case XawtextAppend:
-     case XawtextEdit:
-@@ -1057,9 +1066,17 @@ Boolean newString;
- 	    src->ascii_src.string = fileName;
- 	    (void) tmpnam(src->ascii_src.string);
- 	    src->ascii_src.is_tempfile = TRUE;
--	    open_mode = "w";
--	} else
--	    open_mode = "r+";
-+	    open_mode = O_WRONLY | O_CREAT | O_EXCL;
-+	    fdopen_mode = "w";
-+	} else {
-+/* O_NOFOLLOW is a BSD & Linux extension */
-+#ifdef O_NOFOLLOW
-+		open_mode = O_RDWR | O_NOFOLLOW;
-+#else
-+		open_mode = O_RDWR; /* unsafe; subject to race conditions */
-+#endif
-+		fdopen_mode = "r+";
-+	}
- 	break;
-     default:
- 	XtErrorMsg("badMode", "asciiSourceCreate", "XawError",
-@@ -1078,11 +1095,14 @@ Boolean newString;
-     }
-     
-     if (!src->ascii_src.is_tempfile) {
--	if ((file = fopen(src->ascii_src.string, open_mode)) != 0) {
--	    (void) fseek(file, (Off_t)0, 2);
--	    src->ascii_src.length = (XawTextPosition) ftell(file);
--	    return file;
--	} else {
-+	if ((fd = open(src->ascii_src.string, open_mode, 0666))) {
-+	    if ((file = fdopen(fd, fdopen_mode)) != NULL) {
-+		    (void)fseek(file, 0, SEEK_END);
-+		    src->ascii_src.length = (XawTextPosition)ftell(file);
-+		    return (file);
-+	    }
-+	}
-+	{	    
- 	    String params[2];
- 	    Cardinal num_params = 2;
- 	    
-@@ -1094,7 +1114,7 @@ Boolean newString;
- 	}
-     } 
-     src->ascii_src.length = 0;
--    return((FILE *)NULL);
-+    return(NULL);
- }
- 
- static void
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrcP.h.debian Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrcP.h
---- Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrcP.h.debian	1996-10-15 16:41:18.000000000 +0200
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrcP.h	2008-10-06 11:42:13.000000000 +0200
-@@ -85,7 +85,11 @@ SOFTWARE.
- #ifdef L_tmpnam
- #define TMPSIZ L_tmpnam
- #else
--#define TMPSIZ 32		/* bytes to allocate for tmpnam */
-+#ifdef PATH_MAX
-+#define TMPSIZ PATH_MAX
-+#else
-+#define TMPSIZ 1024		/* bytes to allocate for tmpnam */
-+#endif
- #endif
- 
- #define MAGIC_VALUE ((XawTextPosition) -1) /* Magic value. */
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/MenuButton.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/MenuButton.c
---- Xaw3d-1.5E/xc/lib/Xaw3d/MenuButton.c.debian	1996-10-15 16:41:20.000000000 +0200
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/MenuButton.c	2008-10-06 11:42:13.000000000 +0200
-@@ -53,6 +53,8 @@ in this Software without prior written a
- #include <X11/Xaw3d/XawInit.h>
- #include <X11/Xaw3d/MenuButtoP.h>
- 
-+#include "XawAlloc.h"
-+
- static void ClassInitialize();
- static void PopupMenu();
- 
-@@ -179,9 +181,16 @@ Cardinal * num_params;
- 
-   if (menu == NULL) {
-     char error_buf[BUFSIZ];
--    (void) sprintf(error_buf, "MenuButton: %s %s.",
--	    "Could not find menu widget named", mbw->menu_button.menu_name);
--    XtAppWarning(XtWidgetToApplicationContext(w), error_buf);
-+    char *err1 = "MenuButton: Could not find menu widget named ";
-+    char *perr;
-+    int len;
-+
-+    len = strlen(err1) + strlen(mbw->menu_button.menu_name) + 1 + 1;
-+    perr = XtStackAlloc(len, error_buf);
-+    if (perr == NULL) return;
-+    sprintf(perr, "%s%s.", err1, mbw->menu_button.menu_name);
-+    XtAppWarning(XtWidgetToApplicationContext(w), perr);
-+    XtStackFree(perr, error_buf);
-     return;
-   }
-   if (!XtIsRealized(menu))
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrc.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrc.c
---- Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrc.c.debian	2008-10-06 11:42:13.000000000 +0200
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrc.c	2008-10-06 11:42:13.000000000 +0200
-@@ -74,6 +74,9 @@ in this Software without prior written a
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
- 
- /****************************************************************
-  *
-@@ -1077,7 +1080,9 @@ InitStringOrFile(src, newString)
-     MultiSrcObject src;
-     Boolean newString;
- {
--    char * open_mode = NULL;
-+    mode_t open_mode = 0;
-+    const char *fdopen_mode = NULL;
-+    int fd;
-     FILE * file;
-     char fileName[TMPSIZ];
-     Display *d = XtDisplayOfObject((Widget)src);
-@@ -1128,7 +1133,8 @@ InitStringOrFile(src, newString)
- 	    XtErrorMsg("NoFile", "multiSourceCreate", "XawError",
- 		     "Creating a read only disk widget and no file specified.",
- 		       NULL, 0);
--	open_mode = "r";
-+	open_mode = O_RDONLY;
-+	fdopen_mode = "r";
- 	break;
-     case XawtextAppend:
-     case XawtextEdit:
-@@ -1141,9 +1147,17 @@ InitStringOrFile(src, newString)
- 
- 	    (void) tmpnam(src->multi_src.string);
- 	    src->multi_src.is_tempfile = TRUE;
--	    open_mode = "w";
--	} else
--	    open_mode = "r+";
-+	    open_mode = O_WRONLY | O_CREAT | O_EXCL;
-+	    fdopen_mode = "w";
-+	} else {
-+/* O_NOFOLLOW is a BSD & Linux extension */
-+#ifdef O_NOFOLLOW 
-+		open_mode = O_RDWR | O_NOFOLLOW;
-+#else
-+		open_mode = O_RDWR; /* unsafe; subject to race conditions */
-+#endif
-+		fdopen_mode = "r+";
-+	}
- 	break;
-     default:
- 	XtErrorMsg("badMode", "multiSourceCreate", "XawError",
-@@ -1162,11 +1176,14 @@ InitStringOrFile(src, newString)
-     }
-     
-     if (!src->multi_src.is_tempfile) {
--	if ((file = fopen(src->multi_src.string, open_mode)) != 0) {
--	    (void) fseek(file, (Off_t)0, 2);
--            src->multi_src.length = ftell (file);
--	    return file;
--	} else {
-+	if ((fd = open(src->multi_src.string, open_mode, 0666))) {
-+		if ((file = fdopen(fd, fdopen_mode)) != NULL) {
-+			(void)fseek(file, 0, SEEK_END);
-+			src->multi_src.length = (XawTextPosition)ftell(file);
-+			return (file);
-+		}
-+	}
-+	{
- 	    String params[2];
- 	    Cardinal num_params = 2;
- 	    
-@@ -1178,7 +1195,7 @@ InitStringOrFile(src, newString)
- 	}
-     } 
-     src->multi_src.length = 0;
--    return((FILE *)NULL);
-+    return(NULL);
- #undef StrLen
- }
- 
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrcP.h.debian Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrcP.h
---- Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrcP.h.debian	1996-10-15 16:41:21.000000000 +0200
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrcP.h	2008-10-06 11:42:13.000000000 +0200
-@@ -113,7 +113,11 @@ SOFTWARE.
- #ifdef L_tmpnam
- #define TMPSIZ L_tmpnam
- #else
--#define TMPSIZ 32		/* bytes to allocate for tmpnam */
-+#ifdef PATH_MAX
-+#define TMPSIZ PATH_MAX
-+#else
-+#define TMPSIZ 1024		/* bytes to allocate for tmpnam */
-+#endif
- #endif
- 
- #define MAGIC_VALUE ((XawTextPosition) -1) /* Magic value. */
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/Simple.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/Simple.c
---- Xaw3d-1.5E/xc/lib/Xaw3d/Simple.c.debian	2000-11-27 14:19:36.000000000 +0100
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/Simple.c	2008-10-06 11:42:13.000000000 +0200
-@@ -56,6 +56,8 @@ SOFTWARE.
- #include <X11/Xaw3d/SimpleP.h>
- #include <X11/Xmu/Drawing.h>
- 
-+#include "XawAlloc.h"
-+
- #define offset(field) XtOffsetOf(SimpleRec, simple.field)
- 
- static XtResource resources[] = {
-@@ -148,11 +150,17 @@ static void ClassPartInitialize(class)
- 
-     if (c->simple_class.change_sensitive == NULL) {
- 	char buf[BUFSIZ];
--
--	(void) sprintf(buf,
--		"%s Widget: The Simple Widget class method 'change_sensitive' is undefined.\nA function must be defined or inherited.",
--		c->core_class.class_name);
--	XtWarning(buf);
-+	char *pbuf;
-+	char *msg1 = " Widget: The Simple Widget class method 'change_sensitive' is undefined.\nA function must be defined or inherited.";
-+	int len;
-+
-+	len = strlen(msg1) + strlen(c->core_class.class_name) + 1;
-+	pbuf = XtStackAlloc(len, buf);
-+	if (pbuf != NULL) {
-+	    sprintf(pbuf, "%s%s", c->core_class.class_name, msg1);
-+	    XtWarning(pbuf);
-+	    XtStackFree(pbuf, buf);
-+	}
- 	c->simple_class.change_sensitive = ChangeSensitive;
-     }
- 
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/SimpleMenu.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/SimpleMenu.c
---- Xaw3d-1.5E/xc/lib/Xaw3d/SimpleMenu.c.debian	2003-02-17 07:45:07.000000000 +0100
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/SimpleMenu.c	2008-10-06 11:42:13.000000000 +0200
-@@ -51,6 +51,8 @@ in this Software without prior written a
- #include <X11/Xmu/Initer.h>
- #include <X11/Xmu/CharSet.h>
- 
-+#include "XawAlloc.h"
-+
- #define streq(a, b)        ( strcmp((a), (b)) == 0 )
- 
- #define offset(field) XtOffsetOf(SimpleMenuRec, simple_menu.field)
-@@ -755,9 +757,17 @@ Cardinal * num_params;
- 
-   if ( (menu = FindMenu(w, params[0])) == NULL) {
-     char error_buf[BUFSIZ];
--    (void) sprintf(error_buf, "%s '%s'",
--	    "Xaw - SimpleMenuWidget: could not find menu named: ", params[0]);
--    XtAppWarning(XtWidgetToApplicationContext(w), error_buf);
-+    char *err1 = "Xaw - SimpleMenuWidget: could not find menu named: ";
-+    char *perr;
-+    int len;
-+
-+    len = strlen(err1) + strlen(params[0]) + 2 + 1;
-+    perr = XtStackAlloc(len, error_buf);
-+    if (perr == NULL)
-+	return;
-+    sprintf(perr, "%s'%s'", err1, params[0]);
-+    XtAppWarning(XtWidgetToApplicationContext(w), perr);
-+    XtStackFree(perr, error_buf);
-     return;
-   }
-   
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/StripChart.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/StripChart.c
---- Xaw3d-1.5E/xc/lib/Xaw3d/StripChart.c.debian	2003-02-10 18:18:00.000000000 +0100
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/StripChart.c	2008-10-06 11:42:13.000000000 +0200
-@@ -315,7 +315,15 @@ XtIntervalId *id;		/* unused */
-        if (w->strip_chart.points != NULL) {
- 	   w->strip_chart.points[0].x = w->strip_chart.interval + s;
- 	   XDrawPoints(XtDisplay(w), XtWindow(w), w->strip_chart.hiGC,
--		       w->strip_chart.points, w->strip_chart.scale,
-+		/*
-+		 * patch:
-+		 *
-+		 *     w->strip_chart.points, w->strip_chart.scale,
-+		 * 
-+		 * this to avoid a subdle bug of extra spurios scan
-+		 * line in this widget.
-+		 */
-+		       w->strip_chart.points, w->strip_chart.scale - 1, 
- 		       CoordModePrevious);
-        }
- 
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/Text.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/Text.c
---- Xaw3d-1.5E/xc/lib/Xaw3d/Text.c.debian	2008-10-06 11:42:13.000000000 +0200
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/Text.c	2008-10-06 11:43:16.000000000 +0200
-@@ -76,6 +76,8 @@ SOFTWARE.
- #include <ctype.h>		/* for isprint() */
- #include <stdlib.h>
- 
-+#include "XawAlloc.h"
-+
- #ifndef MAX_LEN_CT
- #define MAX_LEN_CT 6		/* for sequence: ESC $ ( A \xx \xx */
- #endif
-@@ -521,6 +523,8 @@ Cardinal *num_args;		/* unused */
-   TextWidget ctx = (TextWidget) new;
-   char error_buf[BUFSIZ];
-   int s;
-+  char *perr; /* frankie */
-+  size_t len; /* frankie */
- 
-   ctx->text.threeD = XtVaCreateWidget("threeD", threeDWidgetClass, new,
-                                  XtNx, 0, XtNy, 0,
-@@ -569,10 +573,17 @@ Cardinal *num_args;		/* unused */
-   if (ctx->text.scroll_vert != XawtextScrollNever) 
-     if ( (ctx->text.resize == XawtextResizeHeight) ||
-      	 (ctx->text.resize == XawtextResizeBoth) ) {
--      (void) sprintf(error_buf, "Xaw Text Widget %s:\n %s %s.", ctx->core.name,
--	      "Vertical scrolling not allowed with height resize.\n",
--	      "Vertical scrolling has been DEACTIVATED.");
--      XtAppWarning(XtWidgetToApplicationContext(new), error_buf);
-+      char *err1 = "Xaw Text Widget ";
-+      char *err2 = ":\nVertical scrolling not allowed with height resize.\n";
-+      char *err3 = "Vertical scrolling has been DEACTIVATED.";
-+      len = strlen(err1) + strlen(err2) + strlen(err3) +
-+		strlen(ctx->core.name) + 1;
-+      perr = XtStackAlloc(len, error_buf);
-+      if (perr != NULL) {
-+	(void) sprintf(perr, "%s%s%s%s", err1, ctx->core.name, err2, err3);
-+	XtAppWarning(XtWidgetToApplicationContext(new), perr);
-+	XtStackFree(perr, error_buf);
-+      }
-       ctx->text.scroll_vert = XawtextScrollNever;
-     }
-     else if (ctx->text.scroll_vert == XawtextScrollAlways)
-@@ -580,18 +591,32 @@ Cardinal *num_args;		/* unused */
- 
-   if (ctx->text.scroll_horiz != XawtextScrollNever) 
-     if (ctx->text.wrap != XawtextWrapNever) {
--      (void) sprintf(error_buf, "Xaw Text Widget %s:\n %s %s.", ctx->core.name,
--	      "Horizontal scrolling not allowed with wrapping active.\n",
--	      "Horizontal scrolling has been DEACTIVATED.");
--      XtAppWarning(XtWidgetToApplicationContext(new), error_buf);
-+      char *err1 = "Xaw Text Widget ";
-+      char *err2 = ":\nHorizontal scrolling not allowed with wrapping active.";
-+      char *err3 = "\nHorizontal scrolling has been DEACTIVATED.";
-+      len = strlen(err1) + strlen(err2) + strlen(err3) +
-+		strlen(ctx->core.name) + 1;
-+      perr = XtStackAlloc(len, error_buf);
-+      if (perr != NULL) {
-+	(void) sprintf(perr, "%s%s%s%s", err1, ctx->core.name, err2, err3);
-+	XtAppWarning(XtWidgetToApplicationContext(new), perr);
-+	XtStackFree(perr, error_buf);
-+      }
-       ctx->text.scroll_horiz = XawtextScrollNever;
-     }
-     else if ( (ctx->text.resize == XawtextResizeWidth) ||
- 	      (ctx->text.resize == XawtextResizeBoth) ) {
--      (void) sprintf(error_buf, "Xaw Text Widget %s:\n %s %s.", ctx->core.name,
--	      "Horizontal scrolling not allowed with width resize.\n",
--	      "Horizontal scrolling has been DEACTIVATED.");
--      XtAppWarning(XtWidgetToApplicationContext(new), error_buf);
-+      char *err1 = "Xaw Text Widget ";
-+      char *err2 = ":\nHorizontal scrolling not allowed with width resize.\n";
-+      char *err3 = "Horizontal scrolling has been DEACTIVATED.";
-+      len = strlen(err1) + strlen(err2) + strlen(err3) +
-+		strlen(ctx->core.name) + 1;
-+      perr = XtStackAlloc(len, error_buf);
-+      if (perr != NULL) {
-+	(void) sprintf(perr, "%s%s%s%s", err1, ctx->core.name, err2, err3);
-+	XtAppWarning(XtWidgetToApplicationContext(new), perr);
-+	XtStackFree(perr, error_buf);
-+      }
-       ctx->text.scroll_horiz = XawtextScrollNever;
-     }
-     else if (ctx->text.scroll_horiz == XawtextScrollAlways)
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/TextPop.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/TextPop.c
---- Xaw3d-1.5E/xc/lib/Xaw3d/TextPop.c.debian	2000-11-27 14:19:36.000000000 +0100
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/TextPop.c	2008-10-06 11:42:13.000000000 +0200
-@@ -66,6 +66,8 @@ in this Software without prior written a
- #include <X11/Xos.h>		/* for O_RDONLY */
- #include <errno.h>
- 
-+#include "XawAlloc.h"
-+
- #ifdef X_NOT_STDC_ENV
- extern int errno;
- #endif
-@@ -809,6 +811,8 @@ DoSearch(search)
- struct SearchAndReplace * search;
- {
-   char msg[BUFSIZ];
-+  char *pmsg;
-+  int len;
-   Widget tw = XtParent(search->search_popup);
-   XawTextPosition pos;
-   XawTextScanDirection dir;
-@@ -835,9 +839,20 @@ struct SearchAndReplace * search;
-    /* The Raw string in find.ptr may be WC I can't use here, so I re - call 
-    GetString to get a tame version. */
- 
--  if (pos == XawTextSearchError) 
--    (void) sprintf( msg, "Could not find string ``%s''.", GetString( search->search_text ) );
--  else {
-+  if (pos == XawTextSearchError) {
-+    char *msg1 = "Could not find string ``";
-+    char *msg2 = "''.";
-+    len = strlen(msg1) + strlen(msg2) +
-+		strlen(GetString( search->search_text )) + 1;
-+    pmsg = XtStackAlloc(len, msg);
-+    if (pmsg != NULL) {
-+      (void) sprintf( pmsg, "%s%s%s", msg1, GetString( search->search_text ),
-+			msg2);
-+    } else {
-+      pmsg = msg;
-+      (void) sprintf( pmsg, "Could not find string");
-+    }
-+  } else {
-     if (dir == XawsdRight)
-       XawTextSetInsertionPoint( tw, pos + text.length);
-     else
-@@ -849,7 +864,8 @@ struct SearchAndReplace * search;
-   }
-   
-   XawTextUnsetSelection(tw);
--  SetSearchLabels(search, msg, "", TRUE);
-+  SetSearchLabels(search, pmsg, "", TRUE);
-+  XtStackFree(pmsg, msg);
-   return(FALSE);
- }
- 
-@@ -982,13 +998,26 @@ Boolean once_only, show_current;
-       if ( (new_pos == XawTextSearchError) ) {
- 	if (count == 0) {
- 	  char msg[BUFSIZ];
-+	  char *pmsg;
-+	  int len;
-+	  char *msg1 = "*** Error: Could not find string ``";
-+	  char *msg2 = "''. ***";
- 
-              /* The Raw string in find.ptr may be WC I can't use here, 
- 		so I call GetString to get a tame version.*/
- 
--	  (void) sprintf( msg, "%s %s %s", "*** Error: Could not find string ``",
--		  GetString( search->search_text ), "''. ***");
--	  SetSearchLabels(search, msg, "", TRUE);
-+	  len = strlen(msg1) + strlen(msg2) +
-+		strlen(GetString( search->search_text )) + 1;
-+	  pmsg = XtStackAlloc(len, msg);
-+	  if (pmsg != NULL) {
-+	    (void) sprintf( pmsg, "%s%s%s", msg1,
-+				GetString( search->search_text ), msg2);
-+	  } else {
-+	    pmsg = msg;
-+	    (void) sprintf(pmsg, "*** Error: Could not find string ***");
-+	  }
-+	  SetSearchLabels(search, pmsg, "", TRUE);
-+	  XtStackFree(pmsg, msg);
- 	  return(FALSE);
- 	}
- 	else
-@@ -1011,9 +1040,22 @@ Boolean once_only, show_current;
- 
-     if (XawTextReplace(tw, pos, end_pos, &replace) != XawEditDone) {
-       char msg[BUFSIZ];
--      
--      (void) sprintf( msg, "'%s' with '%s'. ***", find.ptr, replace.ptr);
-+      char *pmsg;
-+      int len;
-+      char *msg1 = "' with '";
-+      char *msg2 = "'. ***";
-+
-+      len = 1 + strlen(msg1) + strlen(msg2) + strlen(find.ptr) +
-+		strlen(replace.ptr) + 1;
-+      pmsg = XtStackAlloc(len, msg);
-+      if (pmsg != NULL) {
-+	(void) sprintf( pmsg, "`%s%s%s%s", find.ptr, msg1, replace.ptr, msg2);
-+      } else {
-+	pmsg = msg;
-+	(void) sprintf(pmsg, "string ***");
-+      }
-       SetSearchLabels(search, "*** Error while replacing", msg, TRUE);
-+      XtStackFree(pmsg, msg);
-       return(FALSE);
-     }      
- 
-@@ -1164,13 +1206,20 @@ XtArgVal value;
- {
-   Widget temp_widget;
-   char buf[BUFSIZ];
-+  char *pbuf;
-+  int len;
- 
--  (void) sprintf(buf, "%s.%s", FORM_NAME, name);
-+  len = strlen(FORM_NAME) + strlen(name) + 2;
-+  pbuf = XtStackAlloc(len, buf);
-+  if (pbuf == NULL) return FALSE;
-+  (void) sprintf(pbuf, "%s.%s", FORM_NAME, name);
- 
--  if ( (temp_widget = XtNameToWidget(shell, buf)) != NULL) {
-+  if ( (temp_widget = XtNameToWidget(shell, pbuf)) != NULL) {
-     SetResource(temp_widget, res_name, value);
-+    XtStackFree(pbuf, buf);
-     return(TRUE);
-   }
-+  XtStackFree(pbuf, buf);
-   return(FALSE);
- }
- 
-diff -up /dev/null Xaw3d-1.5E/xc/lib/Xaw3d/XawAlloc.h
---- /dev/null	2008-10-06 08:37:32.418005377 +0200
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/XawAlloc.h	2008-10-06 11:42:13.000000000 +0200
-@@ -0,0 +1,10 @@
-+/* $XFree86: xc/lib/Xaw/XawAlloc.h,v 1.1.2.1 1998/05/16 09:05:23 dawes Exp $ */
-+
-+#define XtStackAlloc(size, stack_cache_array)     \
-+    ((size) <= sizeof(stack_cache_array)          \
-+    ?  (XtPointer)(stack_cache_array)             \
-+    :  XtMalloc((unsigned)(size)))
-+     
-+#define XtStackFree(pointer, stack_cache_array) \
-+    if ((pointer) != ((XtPointer)(stack_cache_array))) XtFree(pointer); else
-+
---- xaw3d-1.5e/xc/lib/Xaw3d/SmeBSB.c	2003-08-04 17:27:58.000000000 +0200
-+++ xaw3d-1.5e/xc/lib/Xaw3d/SmeBSB.c	2003-08-07 15:02:39.000000000 +0200
-@@ -52,6 +52,8 @@
- #include <X11/Xaw3d/Cardinals.h>
- #include <stdio.h>
- 
-+#include "XawAlloc.h"
-+
- /* needed for abs() */
- #ifndef X_NOT_STDC_ENV
- #include <stdlib.h>
-@@ -712,6 +714,8 @@
-     int x, y;
-     unsigned int width, height, bw;
-     char buf[BUFSIZ];
-+    char *pbuf;
-+    int len;
-     
-     if (is_left) {
- 	width = height = 0;
-@@ -720,18 +724,24 @@
- 	    if (!XGetGeometry(XtDisplayOfObject(w), 
- 			    entry->sme_bsb.left_bitmap, &root, &x, &y,
- 			    &width, &height, &bw, &entry->sme_bsb.left_depth)) {
--		(void) sprintf(buf, "Xaw SmeBSB Object: %s %s \"%s\".",
--			"Could not get Left Bitmap",
--			"geometry information for menu entry",
--			XtName(w));
--		XtAppError(XtWidgetToApplicationContext(w), buf);
-+               char *err1 = "Xaw SmeBSB Object: Could not get Left Bitmap geometry information for menu entry ";
-+	       len = strlen(err1) + strlen(XtName(w)) + 3 + 1;
-+               pbuf = XtStackAlloc(len, buf);
-+               if (pbuf == NULL) return;
-+               sprintf(pbuf, "%s\"%s\".", err1, XtName(w));
-+               XtAppError(XtWidgetToApplicationContext(w), pbuf);
-+               XtStackFree(pbuf, buf);
- 	    }
- #ifdef NEVER
- 	    if (entry->sme_bsb.left_depth != 1) {
--		(void) sprintf(buf, "Xaw SmeBSB Object: %s \"%s\" %s.", 
--			"Left Bitmap of entry",  XtName(w),
--			"is not one bit deep");
--		XtAppError(XtWidgetToApplicationContext(w), buf);
-+               char *err1 = "Xaw SmeBSB Object: Left Bitmap of entry ";
-+               char *err2 = " is not one bit deep.";
-+               len = strlen(err1) + strlen(err2) + strlen(XtName(w)) + 2 + 1;
-+               pbuf = XtStackAlloc(len, buf);
-+               if (pbuf == NULL) return;
-+               sprintf(pbuf, "%s\"%s\"%s", err1, XtName(w), err2);
-+               XtAppError(XtWidgetToApplicationContext(w), pbuf);
-+               XtStackFree(pbuf, buf);
- 	    }
- #endif
- 	}
-@@ -745,18 +755,24 @@
- 	    if (!XGetGeometry(XtDisplayOfObject(w),
- 			    entry->sme_bsb.right_bitmap, &root, &x, &y,
- 			    &width, &height, &bw, &entry->sme_bsb.right_depth)) {
--		(void) sprintf(buf, "Xaw SmeBSB Object: %s %s \"%s\".",
--			"Could not get Right Bitmap",
--			"geometry information for menu entry",
--			XtName(w));
--		XtAppError(XtWidgetToApplicationContext(w), buf);
-+            char *err1 = "Xaw SmeBSB Object: Could not get Right Bitmap geometry information for menu entry ";
-+            len = strlen(err1) + strlen(XtName(w)) + 3 + 1;
-+            pbuf = XtStackAlloc(len, buf);
-+            if (pbuf == NULL) return;
-+            sprintf(pbuf, "%s\"%s\".", err1, XtName(w));
-+            XtAppError(XtWidgetToApplicationContext(w), pbuf);
-+            XtStackFree(pbuf, buf);
- 	    }
- #ifdef NEVER
- 	    if (entry->sme_bsb.right_depth != 1) {
--		(void) sprintf(buf, "Xaw SmeBSB Object: %s \"%s\" %s.", 
--			"Right Bitmap of entry", XtName(w),
--			"is not one bit deep");
--		XtAppError(XtWidgetToApplicationContext(w), buf);
-+            char *err1 = "Xaw SmeBSB Object: Right Bitmap of entry ";
-+            char *err2 = " is not one bit deep.";
-+            len = strlen(err1) + strlen(err2) + strlen(XtName(w)) + 2 + 1;
-+            pbuf = XtStackAlloc(len, buf);
-+            if (pbuf == NULL) return;
-+            sprintf(pbuf, "%s\"%s\"%s", err1, XtName(w), err2);
-+            XtAppError(XtWidgetToApplicationContext(w), pbuf);
-+            XtStackFree(pbuf, buf);
- 	    }
- #endif
- 	}
diff --git a/source/x/xaw3d/Xaw3d-1.5E.diff b/source/x/xaw3d/Xaw3d-1.5E.diff
deleted file mode 100644
index e476b5c4..00000000
--- a/source/x/xaw3d/Xaw3d-1.5E.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/Scrollbar.c.orig Xaw3d-1.5E/xc/lib/Xaw3d/Scrollbar.c
---- Xaw3d-1.5E/xc/lib/Xaw3d/Scrollbar.c.orig	2003-02-10 18:22:26.000000000 +0100
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/Scrollbar.c	2008-10-06 10:07:46.000000000 +0200
-@@ -1087,7 +1087,11 @@ static void NotifyThumb (w, event, param
-     Cardinal *num_params;	/* unused */
- {
-     register ScrollbarWidget sbw = (ScrollbarWidget) w;
--    float top = sbw->scrollbar.top;
-+    union {
-+	XtPointer pt;
-+	float	  top;
-+    } foo;
-+    foo.top = sbw->scrollbar.top;
- 
- #ifndef XAW_ARROW_SCROLLBARS
-     if (sbw->scrollbar.direction == 0) return; /* if no StartScroll */
-@@ -1116,10 +1120,10 @@ static void NotifyThumb (w, event, param
-     /* Removed the dependancy on scrollbar arrows. Xterm as distributed in
-        X11R6.6 by The XFree86 Project wants this correction, with or without
-        the arrows. */
--    top += 0.0001;
-+    foo.top += 0.0001;
- /* #endif */
--    XtCallCallbacks (w, XtNthumbProc, *(XtPointer*)&top);
--    XtCallCallbacks (w, XtNjumpProc, (XtPointer)&top);
-+    XtCallCallbacks (w, XtNthumbProc, foo.pt);
-+    XtCallCallbacks (w, XtNjumpProc, (XtPointer)&sbw->scrollbar.top);
- }
- 
-
diff --git a/source/x/xaw3d/pull-xaw3d.sh b/source/x/xaw3d/pull-xaw3d.sh
new file mode 100755
index 00000000..96141a6d
--- /dev/null
+++ b/source/x/xaw3d/pull-xaw3d.sh
@@ -0,0 +1,7 @@
+rm -rf xaw3d
+git clone git://gitorious.org/xaw3d/xaw3d.git
+( cd xaw3d && rm -rf .git* )
+mv xaw3d xaw3d-$(date +%Y%m%d)git
+tar cf xaw3d-$(date +%Y%m%d)git.tar xaw3d-$(date +%Y%m%d)git
+xz -9 xaw3d-$(date +%Y%m%d)git.tar
+
diff --git a/source/x/xaw3d/xaw3d.SlackBuild b/source/x/xaw3d/xaw3d.SlackBuild
index 2991fe7a..1574d7f3 100755
--- a/source/x/xaw3d/xaw3d.SlackBuild
+++ b/source/x/xaw3d/xaw3d.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,11 +21,20 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=${VERSION:-1.5E}
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+PKGNAM=xaw3d
+VERSION=${VERSION:-20110415git}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686" 
   LIBDIRSUFFIX=""
@@ -37,6 +46,8 @@ elif [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 fi
 
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-xaw3d
@@ -44,11 +55,9 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 
 cd $TMP
-rm -rf $TMP/xc
-tar xvf $CWD/Xaw3d-$VERSION.tar.gz || exit 1
-( cd xc ; zcat $CWD/Xaw3d-$VERSION.diff.gz | patch -p2 --verbose --backup --suffix=.orig )
-( cd xc ; zcat $CWD/Xaw3d-1.5-debian-fixes.diff.gz | patch -p2 --verbose --backup --suffix=.orig )
-cd xc
+rm -rf $TMP/xaw3d-$VERSION
+tar xvf $CWD/xaw3d-$VERSION.tar.?z* || exit 1
+cd xaw3d-$VERSION/xc || exit 1
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -60,35 +69,19 @@ cd lib/Xaw3d
 ln -s .. X11
 xmkmf
 make CCOPTIONS="$SLKCFLAGS -I." || exit 1
-strip --strip-unneeded libXaw3d.so.8.0
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
-cat libXaw3d.so.8.0 > $PKG/usr/lib${LIBDIRSUFFIX}/libXaw3d.so.8.0
-chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/libXaw3d.so.8.0
-# Make compat symlinks:
+make install DESTDIR=$PKG
+
+strip --strip-unneeded $PKG/usr/lib${LIBDIRSUFFIX}/libXaw3d.so.*
+# Make compat symlinks.  For whatever reason, Xaw3d has had more random
+# numbers assigned to it over the years than about anything, so we need
+# to make links that work for at least .6 and .8 in addition to .7.
 ( cd $PKG/usr/lib${LIBDIRSUFFIX}
-  ln -sf libXaw3d.so.8.0 libXaw3d.so.8
-  ln -sf libXaw3d.so.8 libXaw3d.so
-  ln -sf libXaw3d.so.8 libXaw3d.so.7
+  ln -sf libXaw3d.so.7 libXaw3d.so.8
   ln -sf libXaw3d.so.7 libXaw3d.so.6
 )
 mkdir -p $PKG/usr/doc/Xaw3d-$VERSION
 cp -a README.XAW3D $PKG/usr/doc/Xaw3d-$VERSION
 chmod 644 $PKG/usr/doc/Xaw3d-$VERSION/README.XAW3D
-mkdir -p $PKG/usr/include/X11/Xaw3d
-for header in AllWidgets.h AsciiSink.h AsciiSinkP.h AsciiSrc.h AsciiSrcP.h \
-AsciiText.h AsciiTextP.h Box.h BoxP.h Cardinals.h Command.h CommandP.h \
-Dialog.h DialogP.h Form.h FormP.h Grip.h GripP.h Label.h LabelP.h Layout.h \
-LayoutP.h List.h ListP.h MenuButton.h MenuButtoP.h MultiSrc.h MultiSrcP.h \
-MultiSink.h MultiSinkP.h Paned.h PanedP.h Panner.h PannerP.h Porthole.h \
-PortholeP.h Repeater.h RepeaterP.h Reports.h Scrollbar.h ScrollbarP.h \
-Simple.h SimpleP.h SimpleMenu.h SimpleMenP.h Sme.h SmeP.h SmeBSB.h SmeBSBP.h \
-SmeLine.h SmeLineP.h SmeThreeD.h SmeThreeDP.h StripChart.h StripCharP.h \
-Template.c Template.h TemplateP.h Text.h TextP.h TextSink.h TextSinkP.h \
-TextSrc.h TextSrcP.h ThreeD.h ThreeDP.h Tip.h TipP.h Toggle.h ToggleP.h Tree.h \
-TreeP.h VendorEP.h Viewport.h ViewportP.h Xaw3dP.h XawImP.h XawInit.h ; do
- cp -a $header $PKG/usr/include/X11/Xaw3d/$header
- chmod 644 $PKG/usr/include/X11/Xaw3d/$header
-done
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/x/xdg-user-dirs/doinst.sh b/source/x/xdg-user-dirs/doinst.sh
new file mode 100644
index 00000000..de72d567
--- /dev/null
+++ b/source/x/xdg-user-dirs/doinst.sh
@@ -0,0 +1,15 @@
+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/xdg/user-dirs.conf.new
+config etc/xdg/user-dirs.defaults.new
diff --git a/source/x/xdg-user-dirs/slack-desc b/source/x/xdg-user-dirs/slack-desc
new file mode 100644
index 00000000..543415cb
--- /dev/null
+++ b/source/x/xdg-user-dirs/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------------------------------------------------------|
+xdg-user-dirs: xdg-user-dirs (manage XDG user directories)
+xdg-user-dirs:
+xdg-user-dirs: xdg-user-dirs is a tool used by various XDG compliant desktop
+xdg-user-dirs: environments to locate user well-known user directories such as
+xdg-user-dirs: the Desktop folder.  It also handles localization/translation of the
+xdg-user-dirs: filenames.
+xdg-user-dirs:
+xdg-user-dirs: Homepage: http://freedesktop.org/wiki/Software/xdg-user-dirs
+xdg-user-dirs:
+xdg-user-dirs:
+xdg-user-dirs:
diff --git a/source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild b/source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild
new file mode 100755
index 00000000..d3b96542
--- /dev/null
+++ b/source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# Slackware build script for xdg-user-dirs
+
+# Copyright 2010  Robby Workman, Northport, Alabama, 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=xdg-user-dirs
+VERSION=${VERSION:-0.13}
+BUILD=${BUILD:-1}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION || exit 1
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+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 || true
+
+mv $PKG/etc/xdg/user-dirs.conf $PKG/etc/xdg/user-dirs.conf.new
+mv $PKG/etc/xdg/user-dirs.defaults $PKG/etc/xdg/user-dirs.defaults.new
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* INSTALL NEWS README* TODO \
+  $PKG/usr/doc/$PKGNAM-$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/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/x/xdg-utils/xdg-utils.SlackBuild b/source/x/xdg-utils/xdg-utils.SlackBuild
index 630746e0..ad05d704 100755
--- a/source/x/xdg-utils/xdg-utils.SlackBuild
+++ b/source/x/xdg-utils/xdg-utils.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xdg-utils
 # Written by Erik Hanson  erik@slackbuilds.org
-# Modified for CVS version by Patrick Volkerding <volkerdi@slackware.com>
+# Modified for VERSION version by Patrick Volkerding <volkerdi@slackware.com>
 
 # Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
@@ -25,26 +25,28 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-PRGNAM=xdg-utils
-VERSION=1.0.2
-CVS=20100506cvs
+PKGNAM=xdg-utils
+VERSION=1.1.0-rc1
 ARCH=noarch
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
+
+PKG_VERSION=${VERSION/-/_}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
 cd $TMP || exit 1
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$CVS.tar.bz2 || exit 1
-cd $PRGNAM || exit 1
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1
+cd $PKGNAM-$VERSION || exit 1
+
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -63,15 +65,23 @@ make install DESTDIR=$PKG || exit 1
 
 gzip -9 $PKG/usr/man/man1/*
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION 
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   LICENSE README RELEASE_NOTES TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$PKG_VERSION-$ARCH-$BUILD.txz
 
diff --git a/source/x/xf86-video-nouveau/this_is_NOT_a_driver.txt b/source/x/xf86-video-nouveau/this_is_NOT_a_driver.txt
deleted file mode 100644
index ea6e0e48..00000000
--- a/source/x/xf86-video-nouveau/this_is_NOT_a_driver.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-
-This is not the experimental nouveau driver for nVidia cards.
-
-It is a stub package that installs /etc/modprobe.d/nouveau-blacklist.conf,
-to prevent the nouveau dri module shipped with our kernel from preventing
-the nv driver and/or the binary nVidia driver from working.
-
-If you want to use nouveau, remove this package.
-
-Sorry if it interferes with anyone's xf86-video-nouveau package that they
-didn't get from us, but this seems like the best default.  When a real
-xf86-video-nouveau package appears someday, installing it will remove
-the module blacklist file.
-
diff --git a/source/xap/MPlayer/MPlayer.SlackBuild b/source/xap/MPlayer/MPlayer.SlackBuild
index 0ce4b79e..17b8b036 100755
--- a/source/xap/MPlayer/MPlayer.SlackBuild
+++ b/source/xap/MPlayer/MPlayer.SlackBuild
@@ -32,7 +32,7 @@
 # -----------------------------------------------------------------------------
 
 PRGNAM=MPlayer
-VERSION=${VERSION:-20100218}
+VERSION=${VERSION:-20101218}
 BUILD=${BUILD:-1}
 TAG=${TAG:-}
 
@@ -274,8 +274,6 @@ echo Building ...
             --enable-largefiles \
             --disable-arts \
             --codecsdir=${CODECSDIR} \
-            --win32codecsdir=${CODECSDIR} \
-            --realcodecsdir=${CODECSDIR} \
             --language="${LANGUAGES}" \
             ${EXTRACONFIGUREOPTIONS} \
             ${DO_PATENTED} \
diff --git a/source/xap/audacious-plugins/audacious-plugins.SlackBuild b/source/xap/audacious-plugins/audacious-plugins.SlackBuild
index 84417ccb..50274f1f 100755
--- a/source/xap/audacious-plugins/audacious-plugins.SlackBuild
+++ b/source/xap/audacious-plugins/audacious-plugins.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
 
 
 PKGNAM=audacious-plugins
-VERSION=${VERSION:-2.3}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -66,6 +66,8 @@ rm -rf ${PKGNAM}-${VERSION}
 tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1
 cd ${PKGNAM}-$VERSION || exit 1
 
+zcat $CWD/audacious-plugins.alsa.noise.is.not.helpful.diff.gz | patch -p1 --verbose || exit 1
+
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
 find . \
diff --git a/source/xap/audacious-plugins/audacious-plugins.alsa.noise.is.not.helpful.diff b/source/xap/audacious-plugins/audacious-plugins.alsa.noise.is.not.helpful.diff
new file mode 100644
index 00000000..e904ab8d
--- /dev/null
+++ b/source/xap/audacious-plugins/audacious-plugins.alsa.noise.is.not.helpful.diff
@@ -0,0 +1,25 @@
+--- ./src/alsa/alsa.c.orig	2011-02-22 11:29:46.000000000 -0600
++++ ./src/alsa/alsa.c	2011-03-11 15:02:53.340999637 -0600
+@@ -207,10 +207,20 @@
+             static gboolean warned = FALSE;
+             if (! warned)
+             {
+-                fprintf (stderr, "\n** WARNING **\nAudacious has detected that "
++                /* fprintf (stderr, "\n** WARNING **\nAudacious has detected that "
+                  "your ALSA device has a broken timer.  A workaround\nis being "
+                  "used to prevent CPU overload.  Please report this problem to "
+-                 "your\nLinux distributor or to the ALSA developers.\n\n");
++                 "your\nLinux distributor or to the ALSA developers.\n\n"); */
++                  /* ^^^ COMMENTED OUT ^^^ */
++
++                /* I'm glad there is a workaround for this, and the reports
++                   are that it works, so spamming the console about it seems
++                   a little bit extreme.  It's not an issue to be solved here
++                   by Slackware, and I would be surprised if the ALSA
++                   developers did not know by now, given this warning.
++                   FWIW, this seems a strange method of communicating with the
++                   ALSA developers.  Did they report the bug to them? */
++
+                 warned = TRUE;
+             }
+ 
diff --git a/source/xap/audacious/audacious.SlackBuild b/source/xap/audacious/audacious.SlackBuild
index 45b5c171..4a651490 100755
--- a/source/xap/audacious/audacious.SlackBuild
+++ b/source/xap/audacious/audacious.SlackBuild
@@ -22,7 +22,7 @@
 
 
 PKGNAM=audacious
-VERSION=${VERSION:-2.3}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
diff --git a/source/xap/blackbox/blackbox.SlackBuild b/source/xap/blackbox/blackbox.SlackBuild
index 130355f4..af000496 100755
--- a/source/xap/blackbox/blackbox.SlackBuild
+++ b/source/xap/blackbox/blackbox.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@
 PKGNAM=blackbox
 VERSION=${VERSION:-0.70.1}
 BBKEYSVER=${BBKEYSVER:-0.9.1}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 NUMJOBS=${NUMJOBS:-" -j7 "}
 PKGEXT=${PKGEXT:-txz}
 
diff --git a/source/xap/blackbox/xinitrc.blackbox b/source/xap/blackbox/xinitrc.blackbox
index fbe0997b..58bd9259 100644
--- a/source/xap/blackbox/xinitrc.blackbox
+++ b/source/xap/blackbox/xinitrc.blackbox
@@ -25,4 +25,8 @@ if [ -f $usermodmap ]; then
 fi
 
 # Start the window manager:
-exec /usr/bin/blackbox
+if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
+  exec ck-launch-session /usr/bin/blackbox
+else
+  exec /usr/bin/blackbox
+fi
diff --git a/source/xap/blueman/blueman.SlackBuild b/source/xap/blueman/blueman.SlackBuild
index bdb134e0..737dae98 100755
--- a/source/xap/blueman/blueman.SlackBuild
+++ b/source/xap/blueman/blueman.SlackBuild
@@ -26,7 +26,6 @@
 PKGNAM=blueman
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
-POLKIT_OPTION=" --disable-polkit "
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -71,17 +70,13 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-# Address a couple of bugs that have been fixed in the bzr repo
-zcat $CWD/no_hide_applet.diff.gz | patch -p0 --verbose || exit 1
-zcat $CWD/fix_on_off_loop.diff.gz | patch -p0 --verbose || exit 1
-
 # Use blueman-open, a modified version of this, to browse obexfs shares:
 # http://www.kde-apps.org/content/show.php/kde4+bluetooth+files+open?content=108869
 zcat $CWD/blueman-use_blueman-open_for_obexfs.diff.gz | patch -p1 || exit 1
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./configure \
+./autogen.sh \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
@@ -90,18 +85,13 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PKGNAM-$VERSION \
   --disable-static \
   --with-dhcp-config=/etc/dhcpd.conf \
-  --enable-hal \
-  $POLKIT_OPTION \
+  --disable-hal \
+  --enable-polkit \
   --build=$ARCH-slackware-linux
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
-if echo $POLKIT_OPTION | grep -q '\--disable-polkit' ; then
-  # Remove unneeded junk
-  rm -rf $PKG/usr/share/polkit-1
-fi
-
 # Add the blueman-open script to /usr/libexec for browsing obexfs shares
 # I don't want to put this in PATH and have someone accidentally run it
 mkdir -p $PKG/usr/libexec
diff --git a/source/xap/blueman/fix_on_off_loop.diff b/source/xap/blueman/fix_on_off_loop.diff
deleted file mode 100644
index ac11c135..00000000
--- a/source/xap/blueman/fix_on_off_loop.diff
+++ /dev/null
@@ -1,58 +0,0 @@
-revno: 602
-committer: walmis
-timestamp: Sun 2009-10-25 15:49:33 +0000
-message:
-  fix bluetooth on/off loop 
-
-=== modified file 'blueman/plugins/applet/PowerManager.py'
---- blueman/plugins/applet/PowerManager.py	2009-10-25 15:16:14 +0000
-+++ blueman/plugins/applet/PowerManager.py	2009-10-25 15:49:33 +0000
-@@ -66,22 +66,6 @@
- 				dprint("adapter powered on while in off state, turning bluetooth on")
- 				self.bluetooth_off = False
- 
--		
--	def on_manager_state_changed(self, state):
--		if state:
--			adapters = self.Applet.Manager.ListAdapters()
--			for adapter in adapters:
--				props = adapter.GetProperties()
--				if not props["Powered"]:
--					self.bluetooth_off = True
--					if self.state_change_deferred != -1:
--						break
--					else:
--						return
--			
--			if self.state_change_deferred != -1:
--				self.bluetooth_off = self.state_change_deferred
--				self.state_change_deferred = -1
- 	
- 	def on_bluetooth_toggled(self):
- 		self.bluetooth_off = not self.bluetooth_off
-@@ -97,9 +81,17 @@
- 		
- 		return pixbuf
- 		
-+	def process_deferred(self):
-+		if self.state_change_deferred != -1:
-+			dprint("Setting deferred status")
-+			self.bluetooth_off = self.state_change_deferred
-+			self.state_change_deferred = -1
-+		
- 	def on_adapter_added(self, path):
- 		adapter = Bluez.Adapter(path)
- 		def on_ready():
-+			self.process_deferred()
-+			
- 			if self.bluetooth_off:
- 				adapter.SetProperty("Powered", False)
- 			else:
-@@ -134,6 +126,7 @@
- 				self.__dict__[key] = value
- 			
- 			if not self.Applet.Manager:
-+				dprint("deferring status change")
- 				self.state_change_deferred = value
- 				return
- 			
diff --git a/source/xap/blueman/no_hide_applet.diff b/source/xap/blueman/no_hide_applet.diff
deleted file mode 100644
index a57a2b8f..00000000
--- a/source/xap/blueman/no_hide_applet.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-revno: 647
-committer: Valmantas Palikša <walmis@balticum-tv.lt>
-branch nick: trunk
-timestamp: Wed 2009-12-02 21:31:16 +0200
-message:
-  don't force hide the applet if bluez manager is not initialized
-
-=== modified file 'blueman/plugins/applet/StatusIcon.py'
---- blueman/plugins/applet/StatusIcon.py	2009-10-27 16:10:53 +0000
-+++ blueman/plugins/applet/StatusIcon.py	2009-12-02 19:31:16 +0000
-@@ -55,15 +55,16 @@
- 		self.Query()
- 	
- 	def Query(self):
--		if not self.Applet.Manager:
--			self.props.visible = False
--			return
- 			
- 		rets = self.Applet.Plugins.Run("on_query_status_icon_visibility")
- 		if not StatusIcon.FORCE_HIDE in rets:
- 			if StatusIcon.FORCE_SHOW in rets:
- 				self.props.visible = True
- 			else:
-+				if not self.Applet.Manager:
-+					self.props.visible = False
-+					return
-+					
- 				try:
- 					if self.Applet.Manager.ListAdapters() == []:
- 						self.props.visible = False
diff --git a/source/xap/fluxbox/fluxbox.SlackBuild b/source/xap/fluxbox/fluxbox.SlackBuild
index 9685e3f6..2be30410 100755
--- a/source/xap/fluxbox/fluxbox.SlackBuild
+++ b/source/xap/fluxbox/fluxbox.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,8 +21,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=1.1.1
-BUILD=${BUILD:-2}
+PKGNAM=fluxbox
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -76,7 +77,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-xinerama \
   --enable-shape \
   --enable-slit \
-  --enable-interlace \
   --enable-nls \
   --enable-timed-cache \
   --build=$ARCH-slackware-linux
@@ -91,12 +91,20 @@ gzip -9 $PKG/usr/man/man?/*
 
 mkdir -p $PKG/etc/X11/xinit
 zcat $CWD/xinitrc.fluxbox.gz > $PKG/etc/X11/xinit/xinitrc.fluxbox
-chmod 755 $PKG/etc/X11/xinit/xinitrc.fluxbox
+chmod 0755 $PKG/etc/X11/xinit/xinitrc.fluxbox
 
 mkdir -p $PKG/usr/doc/fluxbox-$VERSION
 cp -a AUTHORS COPYING* INSTALL NEWS README* TODO \
   $PKG/usr/doc/fluxbox-$VERSION
-chmod 644 $PKG/usr/doc/fluxbox-$VERSION/*
+chmod 0644 $PKG/usr/doc/fluxbox-$VERSION/*
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/xap/fluxbox/xinitrc.fluxbox b/source/xap/fluxbox/xinitrc.fluxbox
index 593875db..62e425b3 100644
--- a/source/xap/fluxbox/xinitrc.fluxbox
+++ b/source/xap/fluxbox/xinitrc.fluxbox
@@ -25,4 +25,8 @@ if [ -f $usermodmap ]; then
 fi
 
 # Start the window manager:
-exec /usr/bin/startfluxbox
+if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
+  exec ck-launch-session /usr/bin/startfluxbox
+else
+  exec /usr/bin/startfluxbox
+fi
diff --git a/source/xap/fvwm/fvwm.SlackBuild b/source/xap/fvwm/fvwm.SlackBuild
index c990f1a0..7906a473 100755
--- a/source/xap/fvwm/fvwm.SlackBuild
+++ b/source/xap/fvwm/fvwm.SlackBuild
@@ -23,11 +23,19 @@
 
 PKGNAM=fvwm
 VERSION=${VERSION:-2.4.20}
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -43,9 +51,9 @@ 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
diff --git a/source/xap/fvwm/xinitrc.fvwm2 b/source/xap/fvwm/xinitrc.fvwm2
index 955629fc..788a4e43 100644
--- a/source/xap/fvwm/xinitrc.fvwm2
+++ b/source/xap/fvwm/xinitrc.fvwm2
@@ -27,4 +27,9 @@ fi
 # start some nice programs
 
 xsetroot -solid SteelBlue
-fvwm2
+if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
+  ck-launch-session fvwm2
+else
+  fvwm2
+fi
+
diff --git a/source/xap/geeqie/geeqie.SlackBuild b/source/xap/geeqie/geeqie.SlackBuild
index 55b0b69d..dbde32bb 100755
--- a/source/xap/geeqie/geeqie.SlackBuild
+++ b/source/xap/geeqie/geeqie.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2010  Patrick Volkerding, Sebeka, MN, USA
+# Copyright 2010, 2011  Patrick Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 
 PKGNAM=geeqie
 VERSION=1.0
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -40,15 +40,15 @@ fi
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  SLKCFLAGS="-O2 -D_FILE_OFFSET_BITS=64 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686"
+  SLKCFLAGS="-O2 -D_FILE_OFFSET_BITS=64 -march=i686"
 elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -D_FILE_OFFSET_BITS=64"
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O2 -D_FILE_OFFSET_BITS=64 -fPIC"
 else
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -D_FILE_OFFSET_BITS=64"
 fi
 
 CWD=$(pwd)
diff --git a/source/xap/gimp/gimp.SlackBuild b/source/xap/gimp/gimp.SlackBuild
index 377f519c..330ca4f1 100755
--- a/source/xap/gimp/gimp.SlackBuild
+++ b/source/xap/gimp/gimp.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,8 +21,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=2.6.8
-BUILD=${BUILD:-2}
+PKGNAM=gimp
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -51,6 +52,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 cd $TMP
@@ -58,8 +62,6 @@ rm -rf gimp-$VERSION
 tar xvf $CWD/gimp-$VERSION.tar.?z* || exit 1
 cd gimp-$VERSION || exit 1
 
-zcat $CWD/gimp.png14.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 \) \
@@ -96,7 +98,7 @@ make install DESTDIR=$PKG || exit 1
 
 mkdir -p $PKG/usr/doc/gimp-$VERSION
 cp -a \
-  AUTHORS COPYING HACKING INSTALL LICENSE NEWS README* docs/Wilber* \
+  AUTHORS COPYING* HACKING INSTALL LICENSE NEWS README* docs/Wilber* \
   $PKG/usr/doc/gimp-$VERSION
 ( cd $PKG/usr/doc/gimp-$VERSION
   for i in \
diff --git a/source/xap/gimp/gimp.png14.diff b/source/xap/gimp/gimp.png14.diff
deleted file mode 100644
index 5af06d6e..00000000
--- a/source/xap/gimp/gimp.png14.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./plug-ins/file-ico/ico-load.c.orig	2009-07-20 15:20:51.000000000 -0500
-+++ ./plug-ins/file-ico/ico-load.c	2010-02-15 22:54:44.000000000 -0600
-@@ -287,14 +287,14 @@
-   switch (color_type)
-     {
-     case PNG_COLOR_TYPE_GRAY:
--      png_set_gray_1_2_4_to_8 (png_ptr);
-+      png_set_expand_gray_1_2_4_to_8 (png_ptr);
-       if ( bit_depth == 16 )
-         png_set_strip_16 (png_ptr);
-       png_set_gray_to_rgb (png_ptr);
-       png_set_add_alpha (png_ptr, 0xff, PNG_FILLER_AFTER);
-       break;
-     case PNG_COLOR_TYPE_GRAY_ALPHA:
--      png_set_gray_1_2_4_to_8 (png_ptr);
-+      png_set_expand_gray_1_2_4_to_8 (png_ptr);
-       if ( bit_depth == 16 )
-         png_set_strip_16 (png_ptr);
-       png_set_gray_to_rgb (png_ptr);
diff --git a/source/xap/gkrellm/gkrellm.SlackBuild b/source/xap/gkrellm/gkrellm.SlackBuild
index f5243b75..e156f181 100755
--- a/source/xap/gkrellm/gkrellm.SlackBuild
+++ b/source/xap/gkrellm/gkrellm.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,8 +20,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=2.3.4
-PKGVER=2.3.4
+VERSION=2.3.5
+PKGVER=2.3.5
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
diff --git a/source/xap/gnuchess/gnuchess.SlackBuild b/source/xap/gnuchess/gnuchess.SlackBuild
index 99cb5c06..b27193dc 100755
--- a/source/xap/gnuchess/gnuchess.SlackBuild
+++ b/source/xap/gnuchess/gnuchess.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,11 +21,11 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERGNUCHESS=5.07
+VERGNUCHESS=5.08
 VERSJENG=11.2
 VEREBOARD=1.1.1
-VERXBOARD=4.4.2
-BUILD=${BUILD:-5}
+VERXBOARD=4.5.1
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -59,11 +59,8 @@ mkdir -p $TMP $PKG
 ### gnuchess
 cd $TMP
 rm -rf gnuchess-$VERGNUCHESS
-tar xvf $CWD/gnuchess-$VERGNUCHESS.tar.bz2 || exit 1
+tar xvf $CWD/gnuchess-$VERGNUCHESS.tar.?z* || exit 1
 cd gnuchess-$VERGNUCHESS || exit 1
-# make gnuchess compile with gcc4
-zcat $CWD/gnuchess.gcc4_fix.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
-zcat $CWD/gnuchess.getline.glibc.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 \) \
@@ -80,8 +77,8 @@ make install DESTDIR=$PKG || exit 1
 
 mkdir -p $PKG/usr/doc/gnuchess-$VERGNUCHESS
 cp -a \
-  doc/README \
-  AUTHORS COPYING INSTALL NEWS TODO \
+  doc/README* \
+  AUTHORS COPYING* INSTALL NEWS TODO \
   $PKG/usr/doc/gnuchess-$VERGNUCHESS
 
 ### Sjeng
@@ -105,7 +102,7 @@ make install DESTDIR=$PKG || exit 1
 
 mkdir -p $PKG/usr/doc/Sjeng-Free-$VERSJENG
 cp -a \
-  AUTHORS BUGS COPYING NEWS README THANKS TODO \
+  AUTHORS BUGS COPYING* NEWS README* THANKS TODO \
   $PKG/usr/doc/Sjeng-Free-$VERSJENG
 
 ### eboard
@@ -129,7 +126,7 @@ make install DESTDIR=$PKG || exit 1
 
 mkdir -p $PKG/usr/doc/eboard-$VEREBOARD
 cp -a \
-  AUTHORS COPYING README TODO Documentation/*.txt \
+  AUTHORS COPYING* README* TODO Documentation/*.txt \
   $PKG/usr/doc/eboard-$VEREBOARD
 
 ### XBoard
@@ -146,9 +143,6 @@ find . \
 
 # --infodir is fubar.
 #zcat $CWD/xboard.infodir.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
-# Taken from Debian to fix CVE-2004-2552
-# FOR WHICH THERE IS NO ATTACK VECTOR!!!
-#zcat $CWD/xboard.buffer_overflow_fix.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
 CFLAGS="$SLKCFLAGS" \
 ./configure \
    --prefix=/usr \
diff --git a/source/xap/gnuchess/gnuchess.SlackBuild.diff b/source/xap/gnuchess/gnuchess.SlackBuild.diff
deleted file mode 100644
index 0112a9d2..00000000
--- a/source/xap/gnuchess/gnuchess.SlackBuild.diff
+++ /dev/null
@@ -1,89 +0,0 @@
---- gnuchess.SlackBuild	2006-04-04 03:47:10.000000000 +0300
-+++ gnuchess.SlackBuild	2007-05-08 17:06:11.000000000 +0300
-@@ -4,10 +4,10 @@
- 
- VERGNUCHESS=5.07
- VERSJENG=11.2
--VEREBOARD=0.9.5
-+VEREBOARD=1.0.3
- VERXBOARD=4.2.7
- ARCH=${ARCH:-i486}
--BUILD=${BUILD:-2}
-+BUILD=${BUILD:-3}
- 
- if [ "$ARCH" = "i386" ]; then
-   SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
-@@ -27,6 +27,8 @@
- rm -rf gnuchess-$VERGNUCHESS
- tar xjvf $CWD/gnuchess-$VERGNUCHESS.tar.bz2
- cd gnuchess-$VERGNUCHESS
-+# make gnuchess compile with gcc4
-+zcat $CWD/gnuchess.gcc4_fix.diff.gz | patch -p1 --verbose --backup --suffix=.orig
- chown -R root:root .
- find . -perm 664 -exec chmod 644 {} \;
- find . -perm 600 -exec chmod 644 {} \;
-@@ -93,33 +95,13 @@
- find . -perm 511 -exec chmod 755 {} \;
- find . -perm 711 -exec chmod 755 {} \;
- find . -perm 555 -exec chmod 755 {} \;
--CFLAGS="$SLKCFLAGS" \
- ./configure \
--  --prefix=/usr
-+  --prefix=/usr --extra-flags=`echo $SLKCFLAGS | sed -e "y/ /:/"`
- make -j3
--#make install DESTDIR=$PKG
--install -d $PKG/usr/bin
--install -m 0755 eboard $PKG/usr/bin/eboard
--install -m 0755 eboard-config   $PKG/usr/bin/eboard-config
--install -m 0755 eboard-addtheme $PKG/usr/bin/eboard-addtheme
--install -d $PKG/usr/man/man1
--install -d $PKG/usr/man/man6
--install -m 0644 eboard.6 $PKG/usr/man/man6
--install -m 0644 eboard-addtheme.1 $PKG/usr/man/man1
--install -m 0644 eboard-config.1 $PKG/usr/man/man1
--install -d $PKG/usr/share/eboard
--install -m 0644 classic.png $PKG/usr/share/eboard/classic.png
--install -m 0644 ghouls.png $PKG/usr/share/eboard/ghouls.png
--install -m 0644 plastic.png $PKG/usr/share/eboard/plastic.png
--install -m 0644 eboard_themes.conf $PKG/usr/share/eboard/eboard_themes.conf
--install -m 0644 NAG.en.txt  $PKG/usr/share/eboard/NAG.en.txt
--( cd multilang
--  install -d $PKG/usr/share/eboard
--  install -m 0644 eboard.cs.dict eboard.de.dict eboard.es.dict eboard.it.dict eboard.pt_BR.dict $PKG/usr/share/eboard
--)
-+make install DESTDIR=$PKG
- mkdir -p $PKG/usr/doc/eboard-$VEREBOARD
- cp -a \
--  AUTHORS COPYING README TODO \
-+  AUTHORS COPYING README TODO Documentation/*.txt \
-   $PKG/usr/doc/eboard-$VEREBOARD
- 
- ### XBoard
-@@ -140,6 +122,8 @@
- find . -perm 555 -exec chmod 755 {} \;
- # --infodir is fubar.
- zcat $CWD/xboard.infodir.diff.gz | patch -p1 --verbose --backup --suffix=.orig
-+# Taken from Debian to fix CVE-2004-2552
-+zcat $CWD/xboard.buffer_overflow_fix.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
- CFLAGS="$SLKCFLAGS" \
- ./configure \
-    --prefix=/usr \
-@@ -153,6 +137,7 @@
- install -c ./pxboard $PKG/usr/bin/pxboard
- install -c -m 644 ./xboard.man $PKG/usr/man/man6/xboard.6
- install -c -m 644 ./zic2xpm.man $PKG/usr/man/man6/zic2xpm.6
-+mkdir -p $PKG/usr/info
- install -c -m 644 xboard.info $PKG/usr/info/xboard.info
- mkdir -p $PKG/usr/doc/xboard-$VERXBOARD
- cp -a \
-@@ -165,8 +150,9 @@
-   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
- )
- gzip -9 $PKG/usr/man/man?/*.?
-+gzip -9 $PKG/usr/info/*.info
- mkdir -p $PKG/usr/share/pixmaps
--cat $CWD/chess.png > $PKG/usr/share/pixmaps/chess.png
-+cp $CWD/chess.png $PKG/usr/share/pixmaps/chess.png
- mkdir -p $PKG/usr/share/applications
- cat $CWD/eboard.desktop > $PKG/usr/share/applications/eboard.desktop
- cat $CWD/xboard.desktop > $PKG/usr/share/applications/xboard.desktop
diff --git a/source/xap/gnuchess/gnuchess.gcc4_fix.diff b/source/xap/gnuchess/gnuchess.gcc4_fix.diff
deleted file mode 100644
index a6835194..00000000
--- a/source/xap/gnuchess/gnuchess.gcc4_fix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnuchess-5.07/src/input.c	2007-05-08 15:55:16.688003280 +0300
-+++ gnuchess-5.07/src/input.c	2007-05-08 15:55:29.238088685 +0300
-@@ -92,7 +92,7 @@
-   fgets(inputstr, MAXSTR, stdin);
- }
- 
--static pthread_t input_thread;
-+pthread_t input_thread;
- 
- /* Mutex and condition variable for thread communication */
- 
diff --git a/source/xap/gnuchess/gnuchess.getline.glibc.diff b/source/xap/gnuchess/gnuchess.getline.glibc.diff
deleted file mode 100644
index 51a45df1..00000000
--- a/source/xap/gnuchess/gnuchess.getline.glibc.diff
+++ /dev/null
@@ -1,39 +0,0 @@
---- ./src/input.c.orig	2010-02-19 21:34:10.000000000 -0600
-+++ ./src/input.c	2010-02-19 21:36:33.000000000 -0600
-@@ -127,7 +127,7 @@
- 	      (RealGameCnt+1)/2 + 1 );
-     }
-     pthread_mutex_lock(&input_mutex);
--    getline(prompt);
-+    chess_getline(prompt);
-     input_status = INPUT_AVAILABLE;
-     pthread_cond_signal(&input_cond);
-     pthread_mutex_unlock(&input_mutex);
-@@ -173,13 +173,13 @@
- {
- #ifdef HAVE_LIBREADLINE
-   if (isatty(STDIN_FILENO)) {
--    getline = getline_readline;
-+    chess_getline = getline_readline;
-     using_history();
-   } else {
--    getline = getline_standard;
-+    chess_getline = getline_standard;
-   }
- #else
--  getline = getline_standard;
-+  chess_getline = getline_standard;
- #endif
-   /* Start input thread */
-   pthread_create(&input_thread, NULL, input_func, NULL);
---- ./src/common.h.orig	2003-06-30 06:28:38.000000000 -0500
-+++ ./src/common.h	2010-02-19 21:35:33.000000000 -0600
-@@ -745,7 +745,7 @@
-  * Input routine, initialized to one of the specific
-  * input routines. The given argument is the prompt.
-  */
--void (*getline) (char *);
-+void (*chess_getline) (char *);
- 
- #define MAXSTR 128
- extern char inputstr[MAXSTR];
diff --git a/source/xap/gnuchess/xboard.desktop b/source/xap/gnuchess/xboard.desktop
index 6336cb63..c1b2a2d3 100644
--- a/source/xap/gnuchess/xboard.desktop
+++ b/source/xap/gnuchess/xboard.desktop
@@ -3,7 +3,7 @@ Encoding=UTF-8
 Name=XBoard
 GenericName=Chess Game
 Comment=A graphical chess engine frontend
-Exec=xboard
+Exec=xboard -fcp gnuchess
 Icon=/usr/share/pixmaps/chess.png
 Terminal=false
 Type=Application
diff --git a/source/xap/gnuplot/gnuplot.SlackBuild b/source/xap/gnuplot/gnuplot.SlackBuild
index 18033683..47cf5eb7 100755
--- a/source/xap/gnuplot/gnuplot.SlackBuild
+++ b/source/xap/gnuplot/gnuplot.SlackBuild
@@ -20,8 +20,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
-VERSION=4.2.6
+PKGNAM=gnuplot
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -113,12 +113,20 @@ fi
 
 mkdir -p $PKG/usr/doc/gnuplot-$VERSION
 cp -a \
-  BUGS CodeStyle Copyright FAQ INSTALL NEWS PATCHLEVEL PGPKEYS PORTING \
+  BUGS CodeStyle Copyright FAQ.bloat INSTALL NEWS PATCHLEVEL PGPKEYS PORTING \
   README* TODO VERSION \
   $PKG/usr/doc/gnuplot-$VERSION
 cp -a demo $PKG/usr/doc/gnuplot-$VERSION
 rm -f $PKG/usr/doc/gnuplot-$VERSION/demo/Make*
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source/xap/gucharmap/gucharmap.SlackBuild b/source/xap/gucharmap/gucharmap.SlackBuild
index f9576662..13b249a9 100755
--- a/source/xap/gucharmap/gucharmap.SlackBuild
+++ b/source/xap/gucharmap/gucharmap.SlackBuild
@@ -76,7 +76,6 @@ CFLAGS="$SLKCFLAGS" \
   --localstatedir=/var/lib \
   --docdir=/usr/doc/gucharmap-$VERSION \
   --enable-static=no \
-  --enable-python-bindings \
   --disable-gconf \
   --disable-schemas-install \
   --disable-scrollkeeper \
diff --git a/source/xap/gv/gv.SlackBuild b/source/xap/gv/gv.SlackBuild
index b30eb321..1f300165 100755
--- a/source/xap/gv/gv.SlackBuild
+++ b/source/xap/gv/gv.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 
 PKGNAM=gv
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -58,6 +58,8 @@ rm -rf ${PKGNAM}-${VERSION}
 tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
 cd ${PKGNAM}-$VERSION || exit 1
 
+zcat $CWD/gv.keysym.diff.gz | patch -p1 --verbose || exit 1
+
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
 find . \
diff --git a/source/xap/gv/gv.keysym.diff b/source/xap/gv/gv.keysym.diff
new file mode 100644
index 00000000..f2e0a7ca
--- /dev/null
+++ b/source/xap/gv/gv.keysym.diff
@@ -0,0 +1,12 @@
+diff -ur a/src/gv_misc_res.dat b/src/gv_misc_res.dat
+--- a/src/gv_misc_res.dat	2010-10-15 09:21:36.000000000 +0200
++++ b/src/gv_misc_res.dat	2010-10-15 09:21:48.000000000 +0200
+@@ -476,7 +476,6 @@
+  <Key>BackSpace:	GV_Page(up,left-bottom,!page-1,bottom-rightedge)\n\
+  <Key>Insert:		GV_Page(page-5)		\n\
+  <Key>Delete:		GV_Page(page+5)		\n\
+- <Key>apLineDel:	GV_Page(page+5)		\n\
+  <Key>Home:		GV_Page(page=0)		\n\
+  <Key>End:		GV_Page(page=99999)	\n\
+  <Key>Prior:		GV_Page(page-1)		\n\
+
diff --git a/source/xap/gxine/gxine.SlackBuild b/source/xap/gxine/gxine.SlackBuild
deleted file mode 100755
index d9b75d0b..00000000
--- a/source/xap/gxine/gxine.SlackBuild
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-VERSION=0.5.903
-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-gxine
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-cd $TMP
-rm -rf gxine-$VERSION
-tar xvf $CWD/gxine-$VERSION.tar.bz2 || exit 1
-cd gxine-$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 \
-  --localstatedir=/var/lib \
-  --mandir=/usr/man \
-  --disable-static \
-  --with-browser-plugin \
-  --build=$ARCH-slackware-linux
-
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-#zcat $CWD/gxine.desktop.gz > $PKG/usr/share/applications/gxine.desktop
-#if [ ! -r $PKG/usr/share/pixmaps/gxine.png ]; then
-#  exit 1
-#fi
-
-# I'm sorry, but making this link was the worst suggestion I ever
-# went along with.  I'll continue to include it (for now), but having
-# (buggy) gxine pop up without prompting all the time is ANNOYING!!!
-#mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
-#( cd $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
-#  ln -sf /usr/lib${LIBDIRSUFFIX}/gxine/gxineplugin.so .
-#)
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-
-mkdir -p $PKG/usr/doc/gxine-$VERSION
-cp -a \
-  ABOUT-NLS AUTHORS COPYING* INSTALL NEWS README TODO \
-  $PKG/usr/doc/gxine-$VERSION
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/gxine-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/xap/imagemagick/imagemagick.SlackBuild b/source/xap/imagemagick/imagemagick.SlackBuild
index eb285daf..565d3a0a 100755
--- a/source/xap/imagemagick/imagemagick.SlackBuild
+++ b/source/xap/imagemagick/imagemagick.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -29,14 +29,14 @@ BUILD=${BUILD:-1}
 # This is a bit messy, so we'll explain it well.  :-)
 
 # This is the base version number, which is needed to cd into the source tree
-BASEVER=6.5.9-6
+BASEVER=6.6.6-10
 
 # This is the version number used in the source tarball filename
-FILEVER=6.5.9-6
+FILEVER=6.6.6-10
 
 # This is the version number used in the package, where a version number cannot
 # contain a '-'
-PKGVER=6.5.9_6
+PKGVER=6.6.6_10
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -108,7 +108,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-static=no \
   --enable-shared \
   --with-perl \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS INSTALLDIRS=vendor || make INSTALLDIRS=vendor || exit 1
 make install INSTALLDIRS=vendor DESTDIR=$PKG || exit 1
diff --git a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
index 4de24038..812a7b16 100755
--- a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
+++ b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,9 +23,6 @@
 # Thanks to the folks at the Mozilla Foundation for permission to
 # distribute this, and for all the great work!  :-)
 
-# This is a source build script. Unfortunately, there is no official
-# binary tarball available for x86_64
-
 VERSION=$(basename $(ls firefox-*.tar.bz2 | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source)
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -36,9 +33,10 @@ if [ -z "$ARCH" ]; then
        *) export ARCH=$( uname -m ) ;;
   esac
 fi
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
-MOZVERS=${MOZVERS:-1.9.2}
+MOZVERS=${MOZVERS:-2.0}
+RELEASEVER=$(echo $VERSION | cut -f 1 -d r)
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -103,26 +101,28 @@ export CXXFLAGS="$SLKCFLAGS" &&
   --enable-official-branding \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --with-default-mozilla-five-home=/usr/lib${LIBDIRSUFFIX}/firefox-$VERSION \
+  --with-default-mozilla-five-home=/usr/lib${LIBDIRSUFFIX}/firefox-$RELEASEVER \
   --with-system-zlib \
   --enable-application=browser \
   --enable-default-toolkit=cairo-gtk2 \
+  --enable-system-cairo \
+  --enable-startup-notification \
   --enable-crypto \
   --enable-svg \
   --enable-canvas \
+  --enable-logging \
   --enable-xft \
+  --enable-webm \
   --enable-xinerama \
   --enable-optimize \
   --enable-reorder \
   --enable-strip \
-  --enable-system-cairo \
   --enable-cpp-rtti \
   --enable-single-profile \
   --disable-ldap \
   --disable-accessibility \
   --disable-debug \
   --disable-tests \
-  --disable-logging \
   --disable-pedantic \
   --disable-installer \
   --disable-mailnews \
@@ -136,14 +136,16 @@ make MOZ_MAKE_FLAGS="$NUMJOBS" || exit 1
 make install DESTDIR=$PKG || exit 1
 
 # We don't need these (just symlinks anyway):
-rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/firefox-devel-$VERSION
+rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/firefox-devel-$RELEASEVER
 
 # Nor these:
 rm -rf $PKG/usr/include
 
-( cd $PKG/usr/lib${LIBDIRSUFFIX}/firefox-$VERSION
+( cd $PKG/usr/lib${LIBDIRSUFFIX}/firefox-$RELEASEVER
   #mv defaults/profile/mimeTypes.rdf defaults/profile/mimeTypes.rdf.orig || exit 1
-  zcat $CWD/mimeTypes.rdf > defaults/profile/mimeTypes.rdf || exit 1
+  if [ -d defaults/profile ]; then
+    zcat $CWD/mimeTypes.rdf > defaults/profile/mimeTypes.rdf || exit 1
+  fi
   zcat $CWD/firefox.moz_plugin_path.diff.gz \
     | sed -e "s#usr/lib#usr/lib${LIBDIRSUFFIX}#g" \
     | patch -p1 --verbose --backup --suffix=.orig || exit 1
@@ -160,7 +162,7 @@ cat $CWD/firefox.png > $PKG/usr/share/pixmaps/firefox.png
 # These files/directories are usually created if Firefox is run as root,
 # which on many systems might (and possibly should) be never.  Therefore, if we
 # don't see them we'll put stubs in place to prevent startup errors.
-( cd $PKG/usr/lib${LIBDIRSUFFIX}/firefox-$VERSION
+( cd $PKG/usr/lib${LIBDIRSUFFIX}/firefox-$RELEASEVER
   if [ -d extensions/talkback\@mozilla.org ]; then
     if [ ! -r extensions/talkback\@mozilla.org/chrome.manifest ]; then
       echo > extensions/talkback\@mozilla.org/chrome.manifest
@@ -172,17 +174,17 @@ cat $CWD/firefox.png > $PKG/usr/share/pixmaps/firefox.png
 )
 
 # Need some default icons in the right place:
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/firefox-$VERSION/chrome/icons/default
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/firefox-$RELEASEVER/chrome/icons/default
 install -m 644 other-licenses/branding/firefox/default16.png \
-  $PKG/usr/lib${LIBDIRSUFFIX}/firefox-$VERSION/icons/
+  $PKG/usr/lib${LIBDIRSUFFIX}/firefox-$RELEASEVER/icons/
 install -m 644 other-licenses/branding/firefox/default16.png \
-  $PKG/usr/lib${LIBDIRSUFFIX}/firefox-$VERSION/chrome/icons/default/ 
-( cd $PKG/usr/lib${LIBDIRSUFFIX}/firefox-$VERSION
+  $PKG/usr/lib${LIBDIRSUFFIX}/firefox-$RELEASEVER/chrome/icons/default/ 
+( cd $PKG/usr/lib${LIBDIRSUFFIX}/firefox-$RELEASEVER
   install -m 644 icons/{default,mozicon50}.xpm chrome/icons/default/
 )
 
 # Copy over the LICENSE
-install -p -c -m 644 LICENSE $PKG/usr/lib${LIBDIRSUFFIX}/firefox-$VERSION/
+install -p -c -m 644 LICENSE $PKG/usr/lib${LIBDIRSUFFIX}/firefox-$RELEASEVER/
 
 mkdir $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
index 0a521dd7..d36fe937 100755
--- a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
+++ b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,8 @@
 # Thanks to the folks at the Mozilla Foundation for permission to
 # distribute this, and for all the great work!  :-)
 
-# This is a source build script. Unfortunately, there is no official
-# binary tarball available for x86_64
-
 VERSION=$(basename $(ls thunderbird-*.tar.bz2 | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source)
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -37,9 +35,8 @@ if [ -z "$ARCH" ]; then
        *) export ARCH=$( uname -m ) ;;
   esac
 fi
-BUILD=${BUILD:-1}
 
-MOZVERS=${MOZVERS:-1.9.1}
+MOZVERS=${MOZVERS:-1.9.2}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -103,11 +100,13 @@ export CXXFLAGS="$SLKCFLAGS" &&
   --with-system-zlib \
   --enable-application=mail \
   --enable-default-toolkit=cairo-gtk2 \
+  --enable-startup-notification \
   --enable-crypto \
   --enable-svg \
   --enable-canvas \
   --enable-xft \
   --enable-xinerama \
+  --enable-ldap \
   --enable-optimize \
   --enable-reorder \
   --enable-static \
@@ -115,7 +114,6 @@ export CXXFLAGS="$SLKCFLAGS" &&
   --enable-system-cairo \
   --enable-cpp-rtti \
   --enable-single-profile \
-  --disable-ldap \
   --disable-accessibility \
   --disable-debug \
   --disable-tests \
diff --git a/source/xap/pan/pan.SlackBuild b/source/xap/pan/pan.SlackBuild
index 4bfbcf7f..0aab423c 100755
--- a/source/xap/pan/pan.SlackBuild
+++ b/source/xap/pan/pan.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 
 PKGNAM=pan
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -56,12 +56,9 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
 cd ${PKGNAM}-$VERSION || exit 1
 
-zcat $CWD/pan.gmime2.4.diff.gz | patch -p1 || exit 1
-zcat $CWD/pan.gcc44.diff.gz | patch -p1 || exit 1
-
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
 find . \
@@ -115,8 +112,18 @@ fi
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  AUTHORS COPYING* INSTALL NEWS README TODO \
+  AUTHORS COPYING* NEWS README* TODO \
   $PKG/usr/doc/${PKGNAM}-$VERSION
+# junk removal
+rm -f $PKG/usr/doc/${PKGNAM}-$VERSION/{README.mingw,README.windows*}
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
 
 mkdir -p $PKG/install
 #zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
diff --git a/source/xap/pan/pan.gcc44.diff b/source/xap/pan/pan.gcc44.diff
deleted file mode 100644
index 22df125f..00000000
--- a/source/xap/pan/pan.gcc44.diff
+++ /dev/null
@@ -1,50 +0,0 @@
---- ./pan/usenet-utils/numbers.cc.orig	2008-07-04 10:01:53.000000000 -0500
-+++ ./pan/usenet-utils/numbers.cc	2010-02-03 18:06:16.000000000 -0600
-@@ -19,6 +19,7 @@
- 
- #include <config.h>
- #include <cctype>
-+#include <cstdio>
- #include <pan/general/string-view.h>
- #include "numbers.h"
- #include <algorithm>
---- ./pan/tasks/nntp.cc.orig	2008-07-05 14:16:06.000000000 -0500
-+++ ./pan/tasks/nntp.cc	2010-02-03 18:07:19.000000000 -0600
-@@ -20,6 +20,7 @@
- #include <config.h>
- #include <cassert>
- #include <cstdarg>
-+#include <cstdio>
- #include <cstdlib> // abort, atoi, strtoul
- extern "C" {
-   #include <glib.h>
---- ./pan/tasks/nntp-pool.cc.orig	2008-07-05 01:39:27.000000000 -0500
-+++ ./pan/tasks/nntp-pool.cc	2010-02-03 18:07:55.000000000 -0600
-@@ -19,6 +19,7 @@
- 
- #include <config.h>
- #include <ctime>
-+#include <cstdio>
- #include <glib/gi18n.h>
- #include <pan/general/debug.h>
- #include <pan/general/log.h>
---- ./pan/general/progress.cc.orig	2007-08-01 12:00:01.000000000 -0500
-+++ ./pan/general/progress.cc	2010-02-03 18:05:38.000000000 -0600
-@@ -19,6 +19,7 @@
- 
- #include <config.h>
- #include <cstdarg>
-+#include <cstdio>
- #include "progress.h"
- #include "string-view.h"
- 
---- ./pan/general/log.cc.orig	2007-08-01 12:00:01.000000000 -0500
-+++ ./pan/general/log.cc	2010-02-03 18:05:19.000000000 -0600
-@@ -20,6 +20,7 @@
- #include <config.h>
- #include <iostream>
- #include <cstdarg>
-+#include <cstdio>
- #include "log.h"
- 
- using namespace pan;
diff --git a/source/xap/pan/pan.gmime2.4.diff b/source/xap/pan/pan.gmime2.4.diff
deleted file mode 100644
index 4816ea6c..00000000
--- a/source/xap/pan/pan.gmime2.4.diff
+++ /dev/null
@@ -1,1271 +0,0 @@
-diff -ru pan-0.133.orig/configure pan-0.133/configure
---- pan-0.133.orig/configure	2008-07-29 19:02:08.000000000 -0700
-+++ pan-0.133/configure	2009-09-12 14:58:05.000000000 -0700
-@@ -2377,7 +2377,7 @@
- 
- PCRE_REQUIRED=5.0
- GLIB_REQUIRED=2.4.0
--GMIME_REQUIRED=2.1.9
-+GMIME_REQUIRED=2.3.5
- GTK_REQUIRED=2.4.0
- GTKSPELL_REQUIRED=2.0.7
- 
-@@ -7957,12 +7957,12 @@
-     pkg_cv_GMIME_CFLAGS="$GMIME_CFLAGS"
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmime-2.0    >= \$GMIME_REQUIRED\"") >&5
--  ($PKG_CONFIG --exists --print-errors "gmime-2.0    >= $GMIME_REQUIRED") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmime-2.4    >= \$GMIME_REQUIRED\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "gmime-2.4    >= $GMIME_REQUIRED") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_GMIME_CFLAGS=`$PKG_CONFIG --cflags "gmime-2.0    >= $GMIME_REQUIRED" 2>/dev/null`
-+  pkg_cv_GMIME_CFLAGS=`$PKG_CONFIG --cflags "gmime-2.4    >= $GMIME_REQUIRED" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -7973,12 +7973,12 @@
-     pkg_cv_GMIME_LIBS="$GMIME_LIBS"
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmime-2.0    >= \$GMIME_REQUIRED\"") >&5
--  ($PKG_CONFIG --exists --print-errors "gmime-2.0    >= $GMIME_REQUIRED") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmime-2.4    >= \$GMIME_REQUIRED\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "gmime-2.4    >= $GMIME_REQUIRED") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_GMIME_LIBS=`$PKG_CONFIG --libs "gmime-2.0    >= $GMIME_REQUIRED" 2>/dev/null`
-+  pkg_cv_GMIME_LIBS=`$PKG_CONFIG --libs "gmime-2.4    >= $GMIME_REQUIRED" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -7996,14 +7996,14 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        GMIME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gmime-2.0    >= $GMIME_REQUIRED" 2>&1`
-+	        GMIME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gmime-2.4    >= $GMIME_REQUIRED" 2>&1`
-         else
--	        GMIME_PKG_ERRORS=`$PKG_CONFIG --print-errors "gmime-2.0    >= $GMIME_REQUIRED" 2>&1`
-+	        GMIME_PKG_ERRORS=`$PKG_CONFIG --print-errors "gmime-2.4    >= $GMIME_REQUIRED" 2>&1`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$GMIME_PKG_ERRORS" >&5
- 
--	{ { echo "$as_me:$LINENO: error: Package requirements (gmime-2.0    >= $GMIME_REQUIRED) were not met:
-+	{ { echo "$as_me:$LINENO: error: Package requirements (gmime-2.4    >= $GMIME_REQUIRED) were not met:
- 
- $GMIME_PKG_ERRORS
- 
-@@ -8014,7 +8014,7 @@
- and GMIME_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--echo "$as_me: error: Package requirements (gmime-2.0    >= $GMIME_REQUIRED) were not met:
-+echo "$as_me: error: Package requirements (gmime-2.4    >= $GMIME_REQUIRED) were not met:
- 
- $GMIME_PKG_ERRORS
- 
-diff -ru pan-0.133.orig/configure.in pan-0.133/configure.in
---- pan-0.133.orig/configure.in	2008-07-29 19:00:01.000000000 -0700
-+++ pan-0.133/configure.in	2009-09-12 14:52:37.000000000 -0700
-@@ -18,7 +18,7 @@
- 
- PCRE_REQUIRED=5.0
- GLIB_REQUIRED=2.4.0
--GMIME_REQUIRED=2.1.9
-+GMIME_REQUIRED=2.3.5
- GTK_REQUIRED=2.4.0
- GTKSPELL_REQUIRED=2.0.7
- AC_SUBST(PCRE_REQUIRED)
-@@ -50,7 +50,7 @@
- 
- PKG_CHECK_MODULES(PCRE,  libpcre      >= $PCRE_REQUIRED)
- AM_PATH_GLIB_2_0($GLIB_REQUIRED,,exit 1,gobject gmodule gthread)
--PKG_CHECK_MODULES(GMIME, gmime-2.0    >= $GMIME_REQUIRED)
-+PKG_CHECK_MODULES(GMIME, gmime-2.4    >= $GMIME_REQUIRED)
- AM_PATH_GTK_2_0($GTK_REQUIRED,,exit 1,gthread)
- 
- 
---- pan-0.133.orig/pan/general/utf8-utils.cc	2008-07-04 23:13:14.000000000 -0700
-+++ pan-0.133/pan/general/utf8-utils.cc	2009-09-12 14:38:13.000000000 -0700
-@@ -136,7 +136,7 @@
- {
-   std::string s = content_to_utf8 (header, fallback_charset1, fallback_charset2);
-   if (header.strstr ("=?")) {
--    char * decoded (g_mime_utils_8bit_header_decode ((const guchar*) s.c_str()));
-+    char * decoded (g_mime_utils_header_decode_text (s.c_str()));
-     s = clean_utf8 (decoded);
-     g_free (decoded);
-   }
-@@ -147,15 +147,26 @@
- pan :: mime_part_to_utf8 (GMimePart     * part,
-                           const char    * fallback_charset)
- {
-+  GMimeDataWrapper *content;
-+  GMimeStream *stream;
-+  const char *charset;
-+  GByteArray *buffer;
-   std::string ret;
- 
-   g_return_val_if_fail (GMIME_IS_PART(part), ret);
- 
--  size_t content_len (0);
--  const char * specified_charset (g_mime_object_get_content_type_parameter (GMIME_OBJECT (part), "charset"));
--  const char * content = g_mime_part_get_content (part, &content_len);
--  if (content && content_len)
--    ret = content_to_utf8 (StringView (content, content_len), specified_charset, fallback_charset);
-+  charset = g_mime_object_get_content_type_parameter (GMIME_OBJECT (part), "charset");
-+  content = g_mime_part_get_content_object (part);
-+
-+  stream = g_mime_stream_mem_new ();
-+  g_mime_data_wrapper_write_to_stream (content, stream);
-+//g_object_unref(content);  //SKG gmime 2.4 don't unref returned data wrapper
-+  
-+  buffer = ((GMimeStreamMem *) stream)->buffer;
-+  
-+  ret = content_to_utf8 (StringView ((const char *) buffer->data, buffer->len), charset, fallback_charset);
-+  
-+  g_object_unref (stream);
- 
-   return ret;
- }
-diff -ru pan-0.133.orig/pan/gui/body-pane.cc pan-0.133/pan/gui/body-pane.cc
---- pan-0.133.orig/pan/gui/body-pane.cc	2008-07-06 07:20:54.000000000 -0700
-+++ pan-0.133/pan/gui/body-pane.cc	2009-09-12 14:41:46.000000000 -0700
-@@ -837,7 +837,7 @@
-       }
- 
-       g_object_unref (mem_stream);
--      g_object_unref (wrapper);
-+      //g_object_unref (wrapper);  //SKG gmime 2.4 don't unref returned data wrapper
-     }
- 
-     // flush the loader
-@@ -874,7 +874,7 @@
-     return;
- 
-   GMimePart * part = GMIME_PART (obj);
--  const GMimeContentType * type = g_mime_object_get_content_type (GMIME_OBJECT (part));
-+  GMimeContentType * type = g_mime_object_get_content_type (GMIME_OBJECT (part));
- 
-   // decide whether or not this part is a picture
-   bool is_image (g_mime_content_type_is_type (type, "image", "*"));
-@@ -952,11 +952,11 @@
-     GtkTextIter iter;
-     gtk_text_buffer_get_end_iter (_buffer, &iter);
-     gtk_text_buffer_insert (_buffer, &iter, pch, -1);
--    g_free (pch);
-+//    g_free (pch); //SKG don't unref returned const char *
-   }
- }
- void
--BodyPane :: foreach_part_cb (GMimeObject* o, gpointer self)
-+BodyPane :: foreach_part_cb (GMimeObject* /*parent*/, GMimeObject* o, gpointer self)
- {
-   if (GMIME_IS_MULTIPART (o))
-     g_mime_multipart_foreach (GMIME_MULTIPART (o), foreach_part_cb, self);
-@@ -978,7 +978,7 @@
-                               const char    * key,
-                               const char    * fallback_charset)
-   {
--    const char * val (message ? g_mime_message_get_header (message, key) : "");
-+    const char * val (message ? g_mime_object_get_header ((GMimeObject *) message, key) : "");
-     const std::string utf8_val (header_to_utf8 (val, fallback_charset));
-     char * e (0);
-     if (strcmp (key, "From"))
-@@ -1015,7 +1015,7 @@
-                           const char    * key,
-                           const char    * fallback_charset)
-   {
--    const char * val (msg ? g_mime_message_get_header (msg, key) : "");
-+    const char * val (msg ? g_mime_object_get_header ((GMimeObject *) msg, key) : "");
-     return add_header_line (s, key_i18n, key, val, fallback_charset);
-   }
- }
-@@ -1037,19 +1037,19 @@
- 
-   // conditional headers...
-   if (message) {
--    const StringView newsgroups (g_mime_message_get_header (message, "Newsgroups"));
-+    const StringView newsgroups (g_mime_object_get_header ((GMimeObject *) message, "Newsgroups"));
-     if (newsgroups.strchr(',')) {
-       l = add_header_line (s, message, _("Newsgroups"), "Newsgroups", fallback_charset);
-       w = std::max (w, l);
-     }
--    const StringView followup_to (g_mime_message_get_header (message, "Followup-To"));
-+    const StringView followup_to (g_mime_object_get_header ((GMimeObject *) message, "Followup-To"));
-     if (!followup_to.empty() && (followup_to!=newsgroups)) {
-       l = add_header_line (s, message, _("Followup-To"), "Followup-To", fallback_charset);
-       w = std::max (w, l);
-     }
--    const StringView reply_to (g_mime_message_get_header (message, "Reply-To"));
-+    const StringView reply_to (g_mime_object_get_header ((GMimeObject *) message, "Reply-To"));
-     if (!reply_to.empty()) {
--      const StringView from (g_mime_message_get_header (message, "From"));
-+      const StringView from (g_mime_object_get_header ((GMimeObject *) message, "From"));
-       StringView f_addr, f_name, rt_addr, rt_name;
-       GNKSA :: do_check_from (from, f_addr, f_name, false);
-       GNKSA :: do_check_from (reply_to, rt_addr, rt_name, false);
-@@ -1070,7 +1070,7 @@
- 
-   // set the x-face...
-   GdkPixbuf * pixbuf (0);
--  const char * pch = message ? g_mime_message_get_header (message, "X-Face") : 0;
-+  const char * pch = message ? g_mime_object_get_header ((GMimeObject *) message, "X-Face") : 0;
-   if (pch && _xface->window)
-     pixbuf = pan_gdk_pixbuf_create_from_x_face (gtk_widget_get_colormap(_xface), _xface->window, pch);
-   gtk_image_set_from_pixbuf (GTK_IMAGE(_xface), pixbuf);
-@@ -1101,7 +1101,7 @@
-   // maybe add the headers
-   const bool do_show_headers (_prefs.get_flag ("show-all-headers", false));
-   if (message && do_show_headers) {
--    char * headers (g_mime_message_get_headers (message));
-+    char * headers (g_mime_object_get_headers ((GMimeObject *) message));
-     GtkTextIter end;
-     gtk_text_buffer_get_end_iter (_buffer, &end);
-     StringView line, v(headers);
-@@ -1119,7 +1119,7 @@
- 
-   // set the text buffer...
-   if (message)
--    g_mime_message_foreach_part (message, foreach_part_cb, this);
-+    g_mime_message_foreach (message, foreach_part_cb, this);
- 
-   // if there was a picture, scroll to it.
-   // otherwise scroll to the top of the body.
-@@ -1514,7 +1514,7 @@
-                           const char   * fallback_charset_1,
-                           const char   * fallback_charset_2)
-   {
--    const StringView v (g_mime_message_get_header (msg, key));
-+    const StringView v (g_mime_object_get_header ((GMimeObject *) msg, key));
-     std::string s;
-     if (!v.empty())
-       s = header_to_utf8 (v, fallback_charset_1, fallback_charset_2);
-@@ -1527,7 +1527,7 @@
-     std::string body;
-   };
- 
--  void get_utf8_body_foreach_part (GMimeObject *o, gpointer user_data)
-+  void get_utf8_body_foreach_part (GMimeObject * /*parent*/, GMimeObject *o, gpointer user_data)
-   {
-     if (GMIME_IS_MULTIPART(o))
-     {
-@@ -1538,7 +1538,7 @@
-     else
-     {
-       GMimePart * part = GMIME_PART (o);
--      const GMimeContentType * type = g_mime_object_get_content_type (o);
-+      GMimeContentType * type = g_mime_object_get_content_type (o);
-       const bool is_text (g_mime_content_type_is_type (type, "text", "*"));
-       if (is_text)
-       {
-@@ -1555,7 +1555,7 @@
-     if (fallback_charset)
-       tmp.fallback_charset = fallback_charset;
-     if (source)
--      g_mime_message_foreach_part (source, get_utf8_body_foreach_part, &tmp);
-+      g_mime_message_foreach (source, get_utf8_body_foreach_part, &tmp);
-     return tmp.body;
-   }
- }
-@@ -1571,7 +1571,7 @@
- 
-     // fallback character encodings
-     const char * group_charset (_charset.c_str());
--    const GMimeContentType * type (g_mime_object_get_content_type (GMIME_OBJECT(_message)));
-+    GMimeContentType * type (g_mime_object_get_content_type (GMIME_OBJECT(_message)));
-     const char * message_charset (type ? g_mime_content_type_get_parameter (type, "charset") : 0);
- 
-     ///
-@@ -1585,14 +1585,14 @@
-     const std::string reply_to   (get_header (_message, "Reply-To",    message_charset, group_charset));
-     if (is_reply || fup_to=="poster") {
-       const std::string& to (reply_to.empty() ? from : reply_to);
--      g_mime_message_add_recipients_from_string (msg, (char*)GMIME_RECIPIENT_TYPE_TO, to.c_str());
-+      g_mime_message_add_recipients_from_string (msg, GMIME_RECIPIENT_TYPE_TO, to.c_str());
-     } else {
-       const std::string& groups (fup_to.empty() ? newsgroups : fup_to);
--      g_mime_message_add_header (msg, "Newsgroups", groups.c_str());
-+      g_mime_object_append_header ((GMimeObject *) msg, "Newsgroups", groups.c_str());
-     }
- 
-     // Subject:
--    StringView v = g_mime_message_get_header (_message, "Subject");
-+    StringView v = g_mime_object_get_header ((GMimeObject *) _message, "Subject");
-     std::string h = header_to_utf8 (v, message_charset, group_charset);
-     std::string val (normalize_subject_re (h));
-     if (val.find ("Re:") != 0) // add "Re: " if we don't have one
-@@ -1601,22 +1601,22 @@
- 
-     // attribution lines
- 
--    const char * cpch = g_mime_message_get_header (_message, "From");
-+    const char * cpch = g_mime_object_get_header ((GMimeObject *) _message, "From");
-     h = header_to_utf8 (cpch, message_charset, group_charset);
--    g_mime_message_add_header (msg, "X-Draft-Attribution-Author", h.c_str());
-+    g_mime_object_append_header ((GMimeObject *) msg, "X-Draft-Attribution-Author", h.c_str());
- 
-     cpch = g_mime_message_get_message_id (_message);
-     h = header_to_utf8 (cpch, message_charset, group_charset);
--    g_mime_message_add_header (msg, "X-Draft-Attribution-Id", h.c_str());
-+    g_mime_object_append_header ((GMimeObject *) msg, "X-Draft-Attribution-Id", h.c_str());
- 
--    char * tmp = g_mime_message_get_date_string (_message);
-+    char * tmp = g_mime_message_get_date_as_string (_message);
-     h = header_to_utf8 (tmp, message_charset, group_charset);
--    g_mime_message_add_header (msg, "X-Draft-Attribution-Date", h.c_str());
-+    g_mime_object_append_header ((GMimeObject *) msg, "X-Draft-Attribution-Date", h.c_str());
-     g_free (tmp);
- 
-     // references
-     const char * header = "References";
--    v = g_mime_message_get_header (_message, header);
-+    v = g_mime_object_get_header ((GMimeObject *) _message, header);
-     val.assign (v.str, v.len);
-     if (!val.empty())
-       val += ' ';
-@@ -1624,7 +1624,7 @@
-     val += g_mime_message_get_message_id (_message);
-     val += ">";
-     val = GNKSA :: trim_references (val);
--    g_mime_message_add_header (msg, header, val.c_str());
-+    g_mime_object_append_header ((GMimeObject *) msg, header, val.c_str());
- 
-     ///
-     ///  BODY
-@@ -1660,17 +1660,17 @@
-     // set the clone's content object with our modified body
-     GMimeStream * stream = g_mime_stream_mem_new ();
-     g_mime_stream_write_string (stream, s.c_str());
--    GMimeDataWrapper * wrapper = g_mime_data_wrapper_new_with_stream (stream, GMIME_PART_ENCODING_8BIT);
-+    GMimeDataWrapper * wrapper = g_mime_data_wrapper_new_with_stream (stream, GMIME_CONTENT_ENCODING_8BIT);
-     GMimePart * part = g_mime_part_new ();
-     GMimeContentType * new_type = g_mime_content_type_new_from_string ("text/plain; charset=UTF-8");
--    g_mime_part_set_content_type (part, new_type);
-+    g_mime_object_set_content_type ((GMimeObject *) part, new_type);
-     g_mime_part_set_content_object (part, wrapper);
--    g_mime_part_set_encoding (part, GMIME_PART_ENCODING_8BIT);
-+    g_mime_part_set_content_encoding (part, GMIME_CONTENT_ENCODING_8BIT);
-     g_mime_message_set_mime_part (msg, GMIME_OBJECT(part));
-     g_object_unref (wrapper);
-     g_object_unref (part);
-     g_object_unref (stream);
--//std::cerr << LINE_ID << " here is the modified clone\n [" << g_mime_message_to_string(msg) << ']' << std::endl;
-+//std::cerr << LINE_ID << " here is the modified clone\n [" << g_mime_object_to_string((GMimeObject *) msg) << ']' << std::endl;
-   }
- 
-   return msg;
-diff -ru pan-0.133.orig/pan/gui/body-pane.h pan-0.133/pan/gui/body-pane.h
---- pan-0.133.orig/pan/gui/body-pane.h	2008-07-04 10:57:39.000000000 -0700
-+++ pan-0.133/pan/gui/body-pane.h	2009-09-08 20:40:40.000000000 -0700
-@@ -86,7 +86,7 @@
-       void append_part (GMimeObject*, GtkAllocation*);
-       static gboolean expander_activated_idle (gpointer self);
-       static void expander_activated_cb (GtkExpander*, gpointer self);
--      static void foreach_part_cb (GMimeObject*, gpointer self);
-+      static void foreach_part_cb (GMimeObject*, GMimeObject*, gpointer self);
-       static void text_size_allocated (GtkWidget*, GtkAllocation*, gpointer);
-       static gboolean text_size_allocated_idle_cb (gpointer p);
-       void text_size_allocated_idle ();
-diff -ru pan-0.133.orig/pan/gui/gui.cc pan-0.133/pan/gui/gui.cc
---- pan-0.133.orig/pan/gui/gui.cc	2008-07-05 00:14:56.000000000 -0700
-+++ pan-0.133/pan/gui/gui.cc	2009-09-12 14:44:06.000000000 -0700
-@@ -31,6 +31,7 @@
- #include <pan/general/file-util.h>
- #include <pan/general/macros.h>
- #include <pan/usenet-utils/scorefile.h>
-+#include <pan/usenet-utils/mime-utils.h>
- #include <pan/tasks/task-article.h>
- #include <pan/tasks/task-groups.h>
- #include <pan/tasks/task-xover.h>
-@@ -567,7 +568,7 @@
-                          ArticleCache& c, const Article& a, const std::string& path):
-       _data(d), _queue(q), _root(r), _prefs(p), _cache(c), _article(a), _path(path) {}
- 
--    static void foreach_part_cb (GMimeObject *o, gpointer self)
-+    static void foreach_part_cb (GMimeObject * /*parent*/, GMimeObject *o, gpointer self)
-     {
-       static_cast<SaveArticlesFromNZB*>(self)->foreach_part (o);
-     }
-@@ -591,7 +592,7 @@
-         if (!tasks.empty())
-           _queue.add_tasks (tasks, Queue::BOTTOM);
-         g_object_unref (mem_stream);
--        g_object_unref (wrapper);
-+//        g_object_unref (wrapper); //SKG gmime 2.4 don't unref returned data wrapper
-       }
-     }
- 
-@@ -601,7 +602,7 @@
-     {
-       if (status == OK) {
-         GMimeMessage * message = _cache.get_message (_article.get_part_mids());
--        g_mime_message_foreach_part (message, foreach_part_cb, this);
-+        g_mime_message_foreach (message, foreach_part_cb, this);
-         g_object_unref (message);
-       }
-       delete this;
-@@ -1041,19 +1042,19 @@
-   const char * cpch;
-   char * old_mid (g_strdup_printf ("<%s>", g_mime_message_get_message_id(message)));
-   GMimeMessage * new_message (g_mime_message_new (false));
--  g_mime_message_set_header (new_message, "Supersedes", old_mid);
-+  g_mime_object_set_header ((GMimeObject *) new_message, "Supersedes", old_mid);
-   g_mime_message_set_sender (new_message, g_mime_message_get_sender (message));
-   g_mime_message_set_subject (new_message, g_mime_message_get_subject (message));
--  g_mime_message_set_header (new_message, "Newsgroups", g_mime_message_get_header (message, "Newsgroups"));
--  g_mime_message_set_header (new_message, "References", g_mime_message_get_header (message, "References"));
-+  g_mime_object_set_header ((GMimeObject *) new_message, "Newsgroups", g_mime_object_get_header ((GMimeObject *) message, "Newsgroups"));
-+  g_mime_object_set_header ((GMimeObject *) new_message, "References", g_mime_object_get_header ((GMimeObject *) message, "References"));
-   if ((cpch = g_mime_message_get_reply_to (message)))
-               g_mime_message_set_reply_to (new_message, cpch);
--  if ((cpch = g_mime_message_get_header (message,     "Followup-To")))
--              g_mime_message_set_header (new_message, "Followup-To", cpch);
-+  if ((cpch = g_mime_object_get_header ((GMimeObject *) message,     "Followup-To")))
-+    g_mime_object_set_header ((GMimeObject *) new_message, "Followup-To", cpch);
-   gboolean  unused (false);
--  char * body (g_mime_message_get_body (message, true, &unused));
-+  char * body (g_mime_message_get_body (message, &unused));
-   GMimeStream * stream = g_mime_stream_mem_new_with_buffer (body, strlen(body));
--  GMimeDataWrapper * content_object = g_mime_data_wrapper_new_with_stream (stream, GMIME_PART_ENCODING_DEFAULT);
-+  GMimeDataWrapper * content_object = g_mime_data_wrapper_new_with_stream (stream, GMIME_CONTENT_ENCODING_DEFAULT);
-   GMimePart * part = g_mime_part_new ();
-   g_mime_part_set_content_object (part, content_object);
-   g_mime_message_set_mime_part (new_message, GMIME_OBJECT(part));
-@@ -1111,11 +1112,11 @@
-   char * cancel_message = g_strdup_printf ("cancel <%s>", g_mime_message_get_message_id(message));
-   g_mime_message_set_sender (cancel, g_mime_message_get_sender (message));
-   g_mime_message_set_subject (cancel, "Cancel");
--  g_mime_message_set_header (cancel, "Newsgroups", g_mime_message_get_header (message, "Newsgroups"));
--  g_mime_message_set_header (cancel, "Control", cancel_message);
-+  g_mime_object_set_header ((GMimeObject *) cancel, "Newsgroups", g_mime_object_get_header ((GMimeObject *) message, "Newsgroups"));
-+  g_mime_object_set_header ((GMimeObject *) cancel, "Control", cancel_message);
-   const char * body ("Ignore\r\nArticle canceled by author using " PACKAGE_STRING "\r\n");
-   GMimeStream * stream = g_mime_stream_mem_new_with_buffer (body, strlen(body));
--  GMimeDataWrapper * content_object = g_mime_data_wrapper_new_with_stream (stream, GMIME_PART_ENCODING_DEFAULT);
-+  GMimeDataWrapper * content_object = g_mime_data_wrapper_new_with_stream (stream, GMIME_CONTENT_ENCODING_DEFAULT);
-   GMimePart * part = g_mime_part_new ();
-   g_mime_part_set_content_object (part, content_object);
-   g_mime_message_set_mime_part (cancel, GMIME_OBJECT(part));
-@@ -1194,12 +1195,12 @@
-       newsgroups = group;
-   }
-   if (!newsgroups.empty())
--    g_mime_message_add_header (message, "Newsgroups", newsgroups.c_str());
-+    g_mime_object_append_header ((GMimeObject *) message, "Newsgroups", newsgroups.c_str());
- 
-   // content type
-   GMimePart * part = g_mime_part_new ();
--  g_mime_part_set_content_type (part, g_mime_content_type_new_from_string ("text/plain; charset=UTF-8"));
--  g_mime_part_set_encoding (part, GMIME_PART_ENCODING_8BIT);
-+  g_mime_object_set_content_type ((GMimeObject *) part, g_mime_content_type_new_from_string ("text/plain; charset=UTF-8"));
-+  g_mime_part_set_content_encoding (part, GMIME_CONTENT_ENCODING_8BIT);
-   g_mime_message_set_mime_part (message, GMIME_OBJECT(part));
-   g_object_unref (part);
- 
-@@ -1754,8 +1755,8 @@
-     g_snprintf (str, sizeof(str), "%s: %u/%u", _("Tasks"), running, size);
- 
-   // build the tooltip
--  gulong queued, unused, stopped;
--  guint64 KiB_remain;
-+  long unsigned int queued, unused, stopped;  //SKG MacPorts can't find function
-+  uint64_t KiB_remain;                        //SKG using gulong and guint64 types.
-   double KiBps;
-   int hr, min, sec;
-   _queue.get_stats (queued, unused, stopped,
-diff -ru pan-0.133.orig/pan/gui/pan.cc pan-0.133/pan/gui/pan.cc
---- pan-0.133.orig/pan/gui/pan.cc	2008-07-04 11:30:29.000000000 -0700
-+++ pan-0.133/pan/gui/pan.cc	2009-09-12 13:39:13.000000000 -0700
-@@ -211,7 +211,7 @@
-   textdomain (GETTEXT_PACKAGE);
- 
-   g_thread_init (0);
--  g_mime_init (GMIME_INIT_FLAG_UTF8);
-+  g_mime_init (GMIME_ENABLE_RFC2047_WORKAROUNDS);
- 
-   bool gui(true), nzb(false);
-   std::string url;
-diff -ru pan-0.133.orig/pan/gui/post-ui.cc pan-0.133/pan/gui/post-ui.cc
---- pan-0.133.orig/pan/gui/post-ui.cc	2008-07-13 06:32:11.000000000 -0700
-+++ pan-0.133/pan/gui/post-ui.cc	2009-09-12 13:04:51.000000000 -0700
-@@ -529,8 +529,8 @@
- {
-   std::string url, to, groups;
-   gboolean unused;
--  char * headers (g_mime_message_get_headers (message));
--  char * body (g_mime_message_get_body (message, true, &unused));
-+  char * headers (g_mime_object_get_headers ((GMimeObject *) message));
-+  char * body (g_mime_message_get_body (message, &unused));
-   StringView key, val, v(headers);
-   v.trim ();
-   while (v.pop_token (val, '\n') && val.pop_token(key,':')) {
-@@ -629,7 +629,7 @@
-   *** If this is email only, skip the rest of the posting...
-   *** we only stayed this long to get check_message()
-   **/
--  const StringView groups (g_mime_message_get_header (message, "Newsgroups"));
-+  const StringView groups (g_mime_object_get_header ((GMimeObject *) message, "Newsgroups"));
-   if (groups.empty()) {
-     maybe_mail_message (message);
-     return true;
-@@ -903,9 +903,9 @@
-    */
-   void pan_g_mime_message_set_message_id (GMimeMessage *msg, const char *mid)
-   {
--    g_mime_message_add_header (msg, "Message-ID", mid);
-+    g_mime_object_append_header ((GMimeObject *) msg, "Message-ID", mid);
-     char * bracketed = g_strdup_printf ("<%s>", mid);
--    g_mime_header_set (GMIME_OBJECT(msg)->headers, "Message-ID", bracketed);
-+    g_mime_header_list_set (GMIME_OBJECT(msg)->headers, "Message-ID", bracketed);
-     g_free (bracketed);
-   }
- }
-@@ -928,27 +928,27 @@
-   // headers from the ui: To
-   const StringView to (gtk_entry_get_text (GTK_ENTRY(_to_entry)));
-   if (!to.empty())
--    g_mime_message_add_recipients_from_string (msg, (char*)GMIME_RECIPIENT_TYPE_TO, to.str);
-+    g_mime_message_add_recipients_from_string (msg, GMIME_RECIPIENT_TYPE_TO, to.str);
- 
-   // headers from the ui: Newsgroups
-   const StringView groups (gtk_entry_get_text (GTK_ENTRY(_groups_entry)));
-   if (!groups.empty())
--    g_mime_message_set_header (msg, "Newsgroups", groups.str);
-+    g_mime_object_set_header ((GMimeObject *) msg, "Newsgroups", groups.str);
- 
-   // headers from the ui: Followup-To
-   const StringView followupto (gtk_entry_get_text (GTK_ENTRY(_followupto_entry)));
-   if (!followupto.empty())
--    g_mime_message_set_header (msg, "Followup-To", followupto.str);
-+    g_mime_object_set_header ((GMimeObject *) msg, "Followup-To", followupto.str);
- 
-   // headers from the ui: Reply-To
-   const StringView replyto (gtk_entry_get_text (GTK_ENTRY(_replyto_entry)));
-   if (!replyto.empty())
--    g_mime_message_set_header (msg, "Reply-To", replyto.str);
-+    g_mime_object_set_header ((GMimeObject *) msg, "Reply-To", replyto.str);
- 
-   // add the 'hidden headers'
-   foreach_const (str2str_t, _hidden_headers, it)
-     if ((mode==DRAFTING) || (it->first.find ("X-Draft-")!=0))
--      g_mime_message_set_header (msg, it->first.c_str(), it->second.c_str());
-+      g_mime_object_set_header ((GMimeObject *) msg, it->first.c_str(), it->second.c_str());
- 
-   // build headers from the 'more headers' entry field
-   std::map<std::string,std::string> headers;
-@@ -964,14 +964,14 @@
-     val.trim ();
-     std::string key_str (key.to_string());
-     if (extra_header_is_editable (key, val))
--      g_mime_message_set_header (msg, key.to_string().c_str(),
--                                      val.to_string().c_str());
-+      g_mime_object_set_header ((GMimeObject *) msg, key.to_string().c_str(),
-+                                val.to_string().c_str());
-   }
-   g_free (pch);
- 
-   // User-Agent
-   if (mode==POSTING && _prefs.get_flag (USER_AGENT_PREFS_KEY, true))
--    g_mime_message_set_header (msg, "User-Agent", get_user_agent());
-+    g_mime_object_set_header ((GMimeObject *) msg, "User-Agent", get_user_agent());
- 
-   // Message-ID
-   if (mode==POSTING && _prefs.get_flag (MESSAGE_ID_PREFS_KEY, false)) {
-@@ -987,22 +987,22 @@
-   const std::string charset ((mode==POSTING && !_charset.empty()) ? _charset : "UTF-8");
-   if (charset != "UTF-8") {
-     // add a wrapper to convert from UTF-8 to $charset
--    GMimeStream * tmp = g_mime_stream_filter_new_with_stream (stream);
-+    GMimeStream * tmp = g_mime_stream_filter_new (stream);
-     g_object_unref (stream);
-     GMimeFilter * filter = g_mime_filter_charset_new ("UTF-8", charset.c_str());
-     g_mime_stream_filter_add (GMIME_STREAM_FILTER(tmp), filter);
-     g_object_unref (filter);
-     stream = tmp;
-   }
--  GMimeDataWrapper * content_object = g_mime_data_wrapper_new_with_stream (stream, GMIME_PART_ENCODING_DEFAULT);
-+  GMimeDataWrapper * content_object = g_mime_data_wrapper_new_with_stream (stream, GMIME_CONTENT_ENCODING_DEFAULT);
-   g_object_unref (stream);
-   GMimePart * part = g_mime_part_new ();
-   pch = g_strdup_printf ("text/plain; charset=%s", charset.c_str());
-   GMimeContentType * type = g_mime_content_type_new_from_string (pch);
-   g_free (pch);
--  g_mime_part_set_content_type (part, type); // part owns type now. type isn't refcounted.
-+  g_mime_object_set_content_type ((GMimeObject *) part, type); // part owns type now. type isn't refcounted.
-   g_mime_part_set_content_object (part, content_object);
--  g_mime_part_set_encoding (part, GMIME_PART_ENCODING_8BIT);
-+  g_mime_part_set_content_encoding (part, GMIME_CONTENT_ENCODING_8BIT);
-   g_object_unref (content_object);
-   g_mime_message_set_mime_part (msg, GMIME_OBJECT(part));
-   g_object_unref (part);
-@@ -1036,7 +1036,7 @@
- 
-     errno = 0;
-     std::ofstream o (filename);
--    char * pch = g_mime_message_to_string (msg);
-+    char * pch = g_mime_object_to_string ((GMimeObject *) msg);
-     o << pch;
-     o.close ();
- 
-@@ -1504,16 +1504,16 @@
-   std::string s = utf8ize (g_mime_message_get_subject (message));
-   gtk_entry_set_text (GTK_ENTRY(_subject_entry), s.c_str());
- 
--  s = utf8ize (g_mime_message_get_header (message, "Newsgroups"));
-+  s = utf8ize (g_mime_object_get_header ((GMimeObject *) message, "Newsgroups"));
-   gtk_entry_set_text (GTK_ENTRY(_groups_entry), s.c_str());
- 
--  s = utf8ize (g_mime_message_get_header (message, "Followup-To"));
-+  s = utf8ize (g_mime_object_get_header ((GMimeObject *) message, "Followup-To"));
-   gtk_entry_set_text (GTK_ENTRY(_followupto_entry), s.c_str());
- 
--  s = utf8ize (g_mime_message_get_header (message, "Reply-To"));
-+  s = utf8ize (g_mime_object_get_header ((GMimeObject *) message, "Reply-To"));
-   gtk_entry_set_text (GTK_ENTRY(_replyto_entry), s.c_str());
- 
--  const InternetAddressList * addresses = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO);
-+  InternetAddressList * addresses = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO);
-   char * pch  = internet_address_list_to_string (addresses, true);
-   s = utf8ize (pch);
-   gtk_entry_set_text (GTK_ENTRY(_to_entry), s.c_str());
-@@ -1521,16 +1521,34 @@
- 
-   // update 'other headers'
-   SetMessageForeachHeaderData data;
--  if (message->mime_part && g_mime_header_has_raw (message->mime_part->headers))
--    g_mime_header_foreach (message->mime_part->headers, set_message_foreach_header_func, &data);
--  g_mime_header_foreach (GMIME_OBJECT(message)->headers, set_message_foreach_header_func, &data);
-+  const char *name, *value;
-+  GMimeHeaderIter iter;
-+  
-+  if (message->mime_part && g_mime_header_list_has_raw (message->mime_part->headers)) {
-+    if (g_mime_header_list_get_iter (message->mime_part->headers, &iter)) {
-+      do {
-+        value = g_mime_header_iter_get_value (&iter);
-+        name = g_mime_header_iter_get_name (&iter);
-+        set_message_foreach_header_func (name, value, &data);
-+      } while (g_mime_header_iter_next (&iter));
-+    }
-+  }
-+  
-+  if (g_mime_header_list_get_iter (GMIME_OBJECT (message)->headers, &iter)) {
-+    do {
-+      value = g_mime_header_iter_get_value (&iter);
-+      name = g_mime_header_iter_get_name (&iter);
-+      set_message_foreach_header_func (name, value, &data);
-+    } while (g_mime_header_iter_next (&iter));
-+  }
-+  
-   s = utf8ize (data.visible_headers);
-   gtk_text_buffer_set_text (_headers_buf, s.c_str(), -1);
-   _hidden_headers = data.hidden_headers;
- 
-   // update body
-   int ignored;
--  char * tmp = g_mime_message_get_body (message, true, &ignored);
-+  char * tmp = g_mime_message_get_body (message, &ignored);
-   s = utf8ize (tmp);
-   g_free (tmp);
-   if (!s.empty()) {
-diff -ru pan-0.133.orig/pan/usenet-utils/message-check-test.cc pan-0.133/pan/usenet-utils/message-check-test.cc
---- pan-0.133.orig/pan/usenet-utils/message-check-test.cc	2007-08-01 09:59:59.000000000 -0700
-+++ pan-0.133/pan/usenet-utils/message-check-test.cc	2009-09-12 13:41:22.000000000 -0700
-@@ -22,6 +22,20 @@
-       std::cerr << LINE_ID << " [" << i << "][" << *it << ']' << std::endl; \
-   }
- 
-+static void
-+mime_part_set_content (GMimePart *part, const char *str)
-+{
-+	GMimeDataWrapper *content;
-+	GMimeStream *stream;
-+	
-+	stream = g_mime_stream_mem_new_with_buffer (str, strlen (str));
-+	content = g_mime_data_wrapper_new_with_stream (stream, GMIME_CONTENT_ENCODING_DEFAULT);
-+	g_object_unref (stream);
-+	
-+	g_mime_part_set_content_object (part, content);
-+	g_object_unref (content);
-+}
-+
- int main (void)
- {
-   g_mime_init (0);
-@@ -41,11 +55,11 @@
-   std::string message_id = GNKSA :: generate_message_id ("rebelbase.com");
-   g_mime_message_set_message_id (msg, message_id.c_str());
-   g_mime_message_set_subject (msg, "MAKE MONEY FAST");
--  g_mime_message_set_header (msg, "Organization", "Lazars Android Works");
--  g_mime_message_set_header (msg, "Newsgroups", "alt.test");
-+  g_mime_object_set_header ((GMimeObject *) msg, "Organization", "Lazars Android Works");
-+  g_mime_object_set_header ((GMimeObject *) msg, "Newsgroups", "alt.test");
-   GMimePart * part = g_mime_part_new_with_type ("text", "plain");
-   const char * cpch = "Hello World!";
--  g_mime_part_set_content (part, cpch, strlen(cpch));
-+  mime_part_set_content (part, cpch);
-   g_mime_message_set_mime_part (msg, GMIME_OBJECT(part));
-   // this should pass the tests
-   MessageCheck :: message_check (msg, attribution, groups_our_server_has, errors, goodness);
-@@ -54,7 +68,7 @@
- 
-   // all quoted
-   cpch = "> Hello World!\n> All quoted text.";
--  g_mime_part_set_content (part, cpch, strlen(cpch));
-+  mime_part_set_content (part, cpch);
-   MessageCheck :: message_check (msg, attribution, groups_our_server_has, errors, goodness);
-   std::vector<std::string> e (errors.begin(), errors.end());
-   check (errors.size() == 2)
-@@ -64,7 +78,7 @@
- 
-   // mostly quoted
-   cpch = "> Hello World!\n> quoted\n> text\n> foo\n> bar\nnew text";
--  g_mime_part_set_content (part, cpch, strlen(cpch));
-+  mime_part_set_content (part, cpch);
-   MessageCheck :: message_check (msg, attribution, groups_our_server_has, errors, goodness);
-   e.assign (errors.begin(), errors.end());
-   check (errors.size() == 1)
-@@ -73,14 +87,14 @@
- 
-   // mostly quoted border condition: 20% of message is new content (should pass)
-   cpch = "> Hello World!\n> quoted\n> text\n> foo\nnew text";
--  g_mime_part_set_content (part, cpch, strlen(cpch));
-+  mime_part_set_content (part, cpch);
-   MessageCheck :: message_check (msg, attribution, groups_our_server_has, errors, goodness);
-   check (errors.empty())
-   check (goodness.is_ok())
- 
-   // sig check: too long
-   cpch = "Hello!\n\n-- \nThis\nSig\nIs\nToo\nLong\n";
--  g_mime_part_set_content (part, cpch, strlen(cpch));
-+  mime_part_set_content (part, cpch);
-   MessageCheck :: message_check (msg, attribution, groups_our_server_has, errors, goodness);
-   e.assign (errors.begin(), errors.end());
-   check (errors.size() == 1)
-@@ -95,7 +109,7 @@
-          "This sig line is greater than 80 characters wide.  In fact, it's 84 characters wide.\n"
-          "This sig line is greater than 80 characters wide.  In fact, it measures 95 characters in width!\n"
-          "This sig line is less than 80 characters wide.";
--  g_mime_part_set_content (part, cpch, strlen(cpch));
-+  mime_part_set_content (part, cpch);
-   MessageCheck :: message_check (msg, attribution, groups_our_server_has, errors, goodness);
-   e.assign (errors.begin(), errors.end());
-   check (errors.size() == 1)
-@@ -104,7 +118,7 @@
- 
-   // sig check: sig marker, no sig
-   cpch = "Hello!\n\n-- \n";
--  g_mime_part_set_content (part, cpch, strlen(cpch));
-+  mime_part_set_content (part, cpch);
-   MessageCheck :: message_check (msg, attribution, groups_our_server_has, errors, goodness);
-   e.assign (errors.begin(), errors.end());
-   check (errors.size() == 1)
-@@ -113,7 +127,7 @@
- 
-   // sig check: okay sig
-   cpch = "Hello!\n\n-- \nThis is a short, narrow sig.\nIt should pass.\n";
--  g_mime_part_set_content (part, cpch, strlen(cpch));
-+  mime_part_set_content (part, cpch);
-   MessageCheck :: message_check (msg, attribution, groups_our_server_has, errors, goodness);
-   check (errors.empty())
-   check (goodness.is_ok())
-@@ -146,7 +160,7 @@
-          "This sig line is greater than 80 characters wide.  In fact, it's 84 characters wide.\n"
-          "This sig line is greater than 80 characters wide.  In fact, it measures 95 characters in width!\n"
-          "This sig line is less than 80 characters wide.";
--  g_mime_part_set_content (part, cpch, strlen(cpch));
-+  mime_part_set_content (part, cpch);
-   MessageCheck :: message_check (msg, attribution, groups_our_server_has, errors, goodness);
-   e.assign (errors.begin(), errors.end());
-   check (errors.size() == 1)
-@@ -155,7 +169,7 @@
- 
-   // body empty
-   cpch = "\n\t\n   \n-- \nThis is the sig.";
--  g_mime_part_set_content (part, cpch, strlen(cpch));
-+  mime_part_set_content (part, cpch);
-   MessageCheck :: message_check (msg, attribution, groups_our_server_has, errors, goodness);
-   e.assign (errors.begin(), errors.end());
-   check (errors.size() == 2)
-@@ -163,7 +177,7 @@
-   check (e[0] == "Error: Message appears to have no new content.");
-   check (e[1] == "Error: Message is empty.");
-   cpch = "Some valid message.";
--  g_mime_part_set_content (part, cpch, strlen(cpch));
-+  mime_part_set_content (part, cpch);
- 
-   // empty subject
-   g_mime_message_set_subject (msg, "");
-@@ -175,17 +189,17 @@
-   g_mime_message_set_subject (msg, "Happy Lucky Feeling");
- 
-   // newsgroups
--  g_mime_message_set_header (msg, "Newsgroups", "alt.test,unknown.group");
-+  g_mime_object_set_header ((GMimeObject *) msg, "Newsgroups", "alt.test,unknown.group");
-   MessageCheck :: message_check (msg, attribution, groups_our_server_has, errors, goodness);
-   e.assign (errors.begin(), errors.end());
-   check (errors.size() == 1)
-   check (goodness.is_warn())
-   check (e[0] == "Warning: The posting profile's server doesn't carry newsgroup\n\t\"unknown.group\".\n\tIf the group name is correct, switch profiles in the \"From:\"\n\tline or edit the profile with \"Edit|Manage Posting Profiles\".")
--  g_mime_message_set_header (msg, "Newsgroups", "alt.test");
-+	  g_mime_object_set_header ((GMimeObject *) msg, "Newsgroups", "alt.test");
- 
-   // newsgroups w/o followup
--  g_mime_message_set_header (msg, "Newsgroups", "alt.test,alt.religion.kibology,alt.binaries.sounds.mp3.indie");
--  g_mime_header_remove (GMIME_OBJECT(msg)->headers, "Followup-To");
-+  g_mime_object_set_header ((GMimeObject *) msg, "Newsgroups", "alt.test,alt.religion.kibology,alt.binaries.sounds.mp3.indie");
-+  g_mime_header_list_remove (GMIME_OBJECT(msg)->headers, "Followup-To");
-   MessageCheck :: message_check (msg, attribution, groups_our_server_has, errors, goodness);
-   e.assign (errors.begin(), errors.end());
-   check (errors.size() == 1)
-@@ -193,8 +207,8 @@
-   check (e[0] == "Warning: Crossposting without setting Followup-To header.")
- 
-   // unknown follow-up
--  g_mime_message_set_header (msg, "Newsgroups", "alt.test");
--  g_mime_message_set_header (msg, "Followup-To", "alt.test,unknown.group");
-+	  g_mime_object_set_header ((GMimeObject *) msg, "Newsgroups", "alt.test");
-+  g_mime_object_set_header ((GMimeObject *) msg, "Followup-To", "alt.test,unknown.group");
-   MessageCheck :: message_check (msg, attribution, groups_our_server_has, errors, goodness);
-   e.assign (errors.begin(), errors.end());
-   check (errors.size() == 1)
-@@ -203,11 +217,11 @@
-   g_mime_object_remove_header (GMIME_OBJECT(msg), "Followup-To");
- 
-   // top posting
--  g_mime_message_set_header (msg, "References", "<asdf@foo.com>");
-+  g_mime_object_set_header ((GMimeObject *) msg, "References", "<asdf@foo.com>");
-   cpch = "How Fascinating!\n"
-          "\n"
-          "> Blah blah blah.\n";
--  g_mime_part_set_content (part, cpch, strlen(cpch));
-+  mime_part_set_content (part, cpch);
-   MessageCheck :: message_check (msg, attribution, groups_our_server_has, errors, goodness);
-   e.assign (errors.begin(), errors.end());
-   check (errors.size() == 1)
-@@ -216,7 +230,7 @@
-   g_mime_object_remove_header (GMIME_OBJECT(msg), "References");
- 
-   // top posting
--  g_mime_message_set_header (msg, "References", "<asdf@foo.com>");
-+  g_mime_object_set_header ((GMimeObject *) msg, "References", "<asdf@foo.com>");
-   cpch = "How Fascinating!\n"
-          "\n"
-          "> Blah blah blah.\n"
-@@ -224,7 +238,7 @@
-          "-- \n"
-          "Pan shouldn't mistake this signature for\n"
-          "original content in the top-posting check.\n";
--  g_mime_part_set_content (part, cpch, strlen(cpch));
-+  mime_part_set_content (part, cpch);
-   MessageCheck :: message_check (msg, attribution, groups_our_server_has, errors, goodness);
-   e.assign (errors.begin(), errors.end());
-   check (errors.size() == 1)
-@@ -238,7 +252,7 @@
-          "\n"
-          "--\n"
-          "This is my signature.\n";
--  g_mime_part_set_content (part, cpch, strlen(cpch));
-+  mime_part_set_content (part, cpch);
-   MessageCheck :: message_check (msg, attribution, groups_our_server_has, errors, goodness);
-   e.assign (errors.begin(), errors.end());
-   check (errors.size() == 1)
-diff -ru pan-0.133.orig/pan/usenet-utils/message-check.cc pan-0.133/pan/usenet-utils/message-check.cc
---- pan-0.133.orig/pan/usenet-utils/message-check.cc	2008-07-04 23:15:22.000000000 -0700
-+++ pan-0.133/pan/usenet-utils/message-check.cc	2009-09-12 13:42:37.000000000 -0700
-@@ -30,6 +30,7 @@
- #include "gnksa.h"
- #include "message-check.h"
- #include "text-massager.h"
-+#include "mime-utils.h"
- 
- using namespace pan;
- 
-@@ -62,7 +63,7 @@
-       std::string body (body_in.to_string());
- 
-       // strip attribution
--      const char * attribution = g_mime_message_get_header (message, PAN_ATTRIBUTION);
-+      const char * attribution = g_mime_object_get_header ((GMimeObject *) message, PAN_ATTRIBUTION);
-       if (attribution && *attribution)
-       {
-          std::string::size_type attrib_start_pos = body.find (attribution);
-@@ -99,7 +100,7 @@
-                     GMimeMessage           * message)
-   {
-     // if it's not a reply, then top-posting check is moot
--    if (g_mime_message_get_header (message, "References") == NULL)
-+    if (g_mime_object_get_header ((GMimeObject *) message, "References") == NULL)
-       return;
- 
-     bool quoted_found (false);
-@@ -414,7 +415,6 @@
-   }
- }
- 
--
- void
- MessageCheck :: message_check (const GMimeMessage * message_const,
-                                const StringView   & attribution,
-@@ -432,7 +432,7 @@
-   check_subject (errors, goodness, g_mime_message_get_subject (message));
- 
-   // check the author...
--  if (GNKSA::check_from (g_mime_message_get_header (message, "From"), true)) {
-+  if (GNKSA::check_from (g_mime_object_get_header ((GMimeObject *) message, "From"), true)) {
-     errors.insert (_("Error: Bad email address."));
-     goodness.raise_to_warn ();
-   }
-@@ -440,17 +440,17 @@
-   // check the body...
-   TextMassager tm;
-   gboolean is_html;
--  char * body = g_mime_message_get_body (message, true, &is_html);
-+  char * body = g_mime_message_get_body (message, &is_html);
-   if (is_html) {
-     errors.insert (_("Warning: Most newsgroups frown upon HTML posts."));
-     goodness.raise_to_warn ();
-   }
-   check_body (errors, goodness, tm, message, body, attribution);
-   g_free (body);
--
-+  
-   // check the optional followup-to...
-   bool followup_to_set (false);
--  const char * cpch = g_mime_message_get_header (message, "Followup-To");
-+  const char * cpch = g_mime_object_get_header ((GMimeObject *) message, "Followup-To");
-   if (cpch && *cpch) {
-     quarks_t groups;
-     get_nntp_rcpts (cpch, groups);
-@@ -460,7 +460,7 @@
- 
-   // check the groups...
-   size_t group_qty (0);
--  cpch = g_mime_message_get_header (message, "Newsgroups");
-+  cpch = g_mime_object_get_header ((GMimeObject *) message, "Newsgroups");
-   if (cpch && *cpch) {
-     quarks_t groups;
-     get_nntp_rcpts (cpch, groups);
-@@ -469,7 +469,7 @@
-   }
- 
-   // one last error check
--  const InternetAddressList * list (g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO));
-+  InternetAddressList * list (g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO));
-   const int n_to (internet_address_list_length (list));
-   if (!group_qty && !n_to) {
-     errors.insert (_("Error: No Recipients."));
-diff -ru pan-0.133.orig/pan/usenet-utils/mime-utils.cc pan-0.133/pan/usenet-utils/mime-utils.cc
---- pan-0.133.orig/pan/usenet-utils/mime-utils.cc	2008-07-04 23:15:24.000000000 -0700
-+++ pan-0.133/pan/usenet-utils/mime-utils.cc	2009-09-12 14:46:25.000000000 -0700
-@@ -455,10 +455,10 @@
-       part->stream = g_mime_stream_mem_new ();
-       if (part->type != ENC_PLAIN) {
- 	part->filter_stream =
--	  g_mime_stream_filter_new_with_stream (part->stream);
-+	  g_mime_stream_filter_new (part->stream);
-         part->filter = part->type == ENC_UU
--	  ? g_mime_filter_basic_new_type (GMIME_FILTER_BASIC_UU_DEC)
--	  : g_mime_filter_yenc_new (GMIME_FILTER_YENC_DIRECTION_DECODE);
-+	  ? g_mime_filter_basic_new (GMIME_CONTENT_ENCODING_UUENCODE, FALSE)
-+	  : g_mime_filter_yenc_new (FALSE);
- 	g_mime_stream_filter_add (GMIME_STREAM_FILTER(part->filter_stream),
-                                   part->filter);
-       }
-@@ -722,18 +722,21 @@
-   {
-     // if the part is a multipart, check its subparts
-     if (GMIME_IS_MULTIPART (*part)) {
--      GList * subparts = GMIME_MULTIPART (*part)->subparts;
--      while (subparts) {
--        GMimeObject * subpart = (GMimeObject *) subparts->data;
-+      GMimeMultipart *multipart = (GMimeMultipart *) *part;
-+      int count = g_mime_multipart_get_count(multipart);
-+      int i;
-+      
-+      for (i = 0; i < count; i++) {
-+        GMimeObject * subpart = g_mime_multipart_remove_at (multipart, i);
-         handle_uu_and_yenc_in_text_plain (&subpart);
--        subparts->data = subpart;
--        subparts = subparts->next;
-+        g_mime_multipart_insert (multipart, i, subpart);
-+        g_object_unref (subpart);
-       }
-       return;
-     }
- 
-     // we assume that inlined yenc and uu are only in text/plain blocks
--    const GMimeContentType * content_type = g_mime_object_get_content_type (*part);
-+    GMimeContentType * content_type = g_mime_object_get_content_type (*part);
-     if (!g_mime_content_type_is_type (content_type, "text", "plain"))
-       return;
- 
-@@ -746,8 +749,8 @@
-     GMimeStream * stream = g_mime_data_wrapper_get_stream (content);
-     g_mime_stream_reset (stream);
-     GMimeStream * istream = g_mime_stream_buffer_new (stream, GMIME_STREAM_BUFFER_BLOCK_READ);
--    g_object_unref (stream);
--    g_object_unref (content);
-+//    g_object_unref (stream); //SKG if this is unrefed, when istream is unrefed below, content loses its stream
-+//    g_object_unref (content); //SKG gmime 2.4 don't unref returned data wrapper
- 
-     // break it into separate parts for text, uu, and yenc pieces.
-     temp_parts_t parts;
-@@ -774,22 +777,22 @@
-           g_mime_part_set_filename (subpart, filename);
- 
-         GMimeStream * subpart_stream = tmp_part->stream;
--        content = g_mime_data_wrapper_new_with_stream (subpart_stream, GMIME_PART_ENCODING_DEFAULT);
-+        content = g_mime_data_wrapper_new_with_stream (subpart_stream, GMIME_CONTENT_ENCODING_DEFAULT);
-         g_mime_part_set_content_object (subpart, content);
--        g_mime_multipart_add_part (GMIME_MULTIPART (multipart), GMIME_OBJECT (subpart));
-+        g_mime_multipart_add (GMIME_MULTIPART (multipart), GMIME_OBJECT (subpart));
- 
-         g_object_unref (content);
-         g_object_unref (subpart);
-       }
- 		
-       // replace the old part with the new multipart
--      g_mime_object_unref (*part);
-+      g_object_unref (*part);
-       *part = GMIME_OBJECT (multipart);
-     }
- 
-     foreach (temp_parts_t, parts, it)
-       delete *it;
--    g_mime_stream_unref (istream);
-+    g_object_unref (istream);
-   }
- }
- 
-@@ -831,15 +834,15 @@
-       GMimeStream * stream = g_mime_data_wrapper_get_stream (wrapper);
-       g_mime_stream_reset (stream);
-       g_mime_stream_cat_add_source (GMIME_STREAM_CAT (cat), stream);
--      g_object_unref (stream);
--      g_object_unref (wrapper);
-+//      g_object_unref (stream); //SKG if this is unrefed cat loses its stream
-+//      g_object_unref (wrapper); //SKG gmime 2.4 don't unref returned data wrapper
-     }
- 
-     GMimeMessage * message = messages[0];
-     GMimeDataWrapper * wrapper = g_mime_part_get_content_object (GMIME_PART(message->mime_part));
-     g_mime_stream_reset (cat);
-     g_mime_data_wrapper_set_stream (wrapper, cat);
--    g_object_unref (wrapper);
-+//    g_object_unref (wrapper); //SKG gmime 2.4 don't unref returned data wrapper
-     g_object_unref (cat);
-   }
- 
-@@ -1007,3 +1010,174 @@
- {
-   normalize_subject (subject, STRIP_MULTIPART_NUMERATOR, setme);
- }
-+
-+static GMimeObject *
-+handle_multipart_mixed (GMimeMultipart *multipart, gboolean *is_html);
-+
-+static GMimeObject *
-+handle_multipart_alternative (GMimeMultipart *multipart, gboolean *is_html)
-+{
-+        GMimeObject *mime_part, *text_part = NULL;
-+        GMimeContentType *type;
-+        int count = g_mime_multipart_get_count (multipart);
-+
-+        for (int i = 0; i < count; ++i) {
-+                mime_part = g_mime_multipart_get_part (multipart, i);
-+
-+                type = g_mime_object_get_content_type (mime_part);
-+                if (g_mime_content_type_is_type (type, "text", "*")) {
-+                        if (!text_part || !g_ascii_strcasecmp (type->subtype, "plain")) {
-+                                *is_html = !g_ascii_strcasecmp (type->subtype, "html");
-+                                text_part = mime_part;
-+                        }
-+                }
-+        }
-+
-+        return text_part;
-+}
-+
-+static GMimeObject *
-+handle_multipart_mixed (GMimeMultipart *multipart, gboolean *is_html)
-+{
-+        GMimeObject *mime_part, *text_part = NULL;
-+        GMimeContentType *type, *first_type = NULL;
-+        int count = g_mime_multipart_get_count (multipart);
-+
-+        for (int i = 0; i < count; ++i) {
-+                mime_part = g_mime_multipart_get_part (multipart, i);
-+
-+                type = g_mime_object_get_content_type (mime_part);
-+                if (GMIME_IS_MULTIPART (mime_part)) {
-+                        multipart = GMIME_MULTIPART (mime_part);
-+                        if (g_mime_content_type_is_type (type, "multipart", "alternative")) {
-+                                mime_part = handle_multipart_alternative (multipart, is_html);
-+                                if (mime_part)
-+                                        return mime_part;
-+                        } else {
-+                                mime_part = handle_multipart_mixed (multipart, is_html);
-+                                if (mime_part && !text_part)
-+                                        text_part = mime_part;
-+                        }
-+                } else if (g_mime_content_type_is_type (type, "text", "*")) {
-+                        if (!g_ascii_strcasecmp (type->subtype, "plain")) {
-+                                /* we got what we came for */
-+                                *is_html = !g_ascii_strcasecmp (type->subtype, "html");
-+                                return mime_part;
-+                        }
-+
-+                        /* if we haven't yet found a text part or if it is a type we can
-+ *                          * understand and it is the first of that type, save it */
-+                        if (!text_part || (!g_ascii_strcasecmp (type->subtype, "plain") && (first_type &&
-+                                           g_ascii_strcasecmp (type->subtype, first_type->subtype) != 0))) {
-+                                *is_html = !g_ascii_strcasecmp (type->subtype, "html");
-+                                text_part = mime_part;
-+                                first_type = type;
-+                        }
-+                }
-+        }
-+
-+        return text_part;
-+}
-+
-+#define NEEDS_DECODING(encoding) ((encoding == GMIME_CONTENT_ENCODING_BASE64) ||   \
-+                                  (encoding == GMIME_CONTENT_ENCODING_UUENCODE) || \
-+                                  (encoding == GMIME_CONTENT_ENCODING_QUOTEDPRINTABLE))
-+
-+static const char *
-+g_mime_part_get_content (const GMimePart *mime_part, size_t *len)
-+{
-+        const char *retval = NULL;
-+        GMimeStream *stream;
-+
-+        g_return_val_if_fail (GMIME_IS_PART (mime_part), NULL);
-+
-+        if (!mime_part->content || !mime_part->content->stream) {
-+                g_warning ("no content set on this mime part");
-+                return NULL;
-+        }
-+
-+        stream = mime_part->content->stream;
-+        if (!GMIME_IS_STREAM_MEM (stream) || NEEDS_DECODING (mime_part->content->encoding)) {
-+                /* Decode and cache this mime part's contents... */
-+                GMimeStream *cache;
-+                GByteArray *buf;
-+
-+                buf = g_byte_array_new ();
-+                cache = g_mime_stream_mem_new_with_byte_array (buf);
-+
-+                g_mime_data_wrapper_write_to_stream (mime_part->content, cache);
-+
-+                g_mime_data_wrapper_set_stream (mime_part->content, cache);
-+                g_mime_data_wrapper_set_encoding (mime_part->content, GMIME_CONTENT_ENCODING_DEFAULT);
-+                g_object_unref (cache);
-+
-+                *len = buf->len;
-+                retval = (char *) buf->data;
-+        } else {
-+                GByteArray *buf = GMIME_STREAM_MEM (stream)->buffer;
-+                off_t end_index = (off_t) buf->len;
-+                off_t start_index = 0;
-+
-+                /* check boundaries */
-+                if (stream->bound_start >= 0)
-+                        start_index = CLAMP (stream->bound_start, 0, (off_t) buf->len);
-+                if (stream->bound_end >= 0)
-+                        end_index = CLAMP (stream->bound_end, 0, (off_t) buf->len);
-+                if (end_index < start_index)
-+                        end_index = start_index;
-+
-+                *len = end_index - start_index;
-+                retval = (char *) buf->data + start_index;
-+        }
-+
-+        return retval;
-+}
-+
-+char *g_mime_message_get_body (GMimeMessage *message, gboolean *is_html)
-+{
-+        GMimeObject *mime_part = NULL;
-+        GMimeContentType *type;
-+        GMimeMultipart *multipart;
-+        const char *content;
-+        char *body = NULL;
-+        size_t len = 0;
-+
-+        g_return_val_if_fail (GMIME_IS_MESSAGE (message), NULL);
-+        g_return_val_if_fail (is_html != NULL, NULL);
-+
-+        type = g_mime_object_get_content_type (message->mime_part);
-+        if (GMIME_IS_MULTIPART (message->mime_part)) {
-+                /* let's see if we can find a body in the multipart */
-+                multipart = GMIME_MULTIPART (message->mime_part);
-+                if (g_mime_content_type_is_type (type, "multipart", "alternative"))
-+                        mime_part = handle_multipart_alternative (multipart, is_html);
-+                else
-+                        mime_part = handle_multipart_mixed (multipart, is_html);
-+        } else if (g_mime_content_type_is_type (type, "text", "*")) {
-+                /* this *has* to be the message body */
-+                if (g_mime_content_type_is_type (type, "text", "html"))
-+                        *is_html = TRUE;
-+                else
-+                        *is_html = FALSE;
-+                mime_part = message->mime_part;
-+        }
-+
-+        if (mime_part != NULL) {
-+                content = g_mime_part_get_content (GMIME_PART (mime_part), &len);
-+                body = g_strndup (content, len);
-+        }
-+
-+        return body;
-+}
-+
-+void g_mime_message_add_recipients_from_string (GMimeMessage *message, GMimeRecipientType type, const char *string)
-+{
-+        InternetAddressList *addrlist;
-+        if ((addrlist = internet_address_list_parse_string (string))) {
-+        	for (int i = 0; i < internet_address_list_length (addrlist); ++i) {
-+                	InternetAddress *ia = internet_address_list_get_address (addrlist, i);
-+                	if (INTERNET_ADDRESS_IS_MAILBOX(ia))
-+				g_mime_message_add_recipient (message, type, internet_address_get_name(ia), internet_address_mailbox_get_addr(INTERNET_ADDRESS_MAILBOX(ia)));
-+		}
-+        }
-+}
-diff -ru pan-0.133.orig/pan/usenet-utils/mime-utils.h pan-0.133/pan/usenet-utils/mime-utils.h
---- pan-0.133.orig/pan/usenet-utils/mime-utils.h	2007-08-01 09:59:59.000000000 -0700
-+++ pan-0.133/pan/usenet-utils/mime-utils.h	2009-09-12 13:20:11.000000000 -0700
-@@ -64,4 +64,8 @@
-   };
- }
- 
-+char *g_mime_message_get_body (GMimeMessage *message, gboolean *is_html);
-+void g_mime_message_add_recipients_from_string (GMimeMessage *message, GMimeRecipientType type, const char *string);
-+
-+
- #endif
-diff -ru pan-0.133.orig/pan.spec pan-0.133/pan.spec
---- pan-0.133.orig/pan.spec	2008-07-29 19:05:05.000000000 -0700
-+++ pan-0.133/pan.spec	2009-09-12 14:58:20.000000000 -0700
-@@ -15,14 +15,14 @@
- 
- BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
- BuildRequires: glib2-devel >= 2.4.0
--BuildRequires: gmime-devel >= 2.1.9
-+BuildRequires: gmime-devel >= 2.3.5
- BuildRequires: gtk2-devel >= 2.4.0
- BuildRequires: pcre-devel >= 5.0
- %{!?_without_gtkspell:BuildRequires: gtkspell-devel >= 2.0.7}
- 
- Requires: pcre >= 5.0
- Requires: glib2 >= 2.4.0
--Requires: gmime >= 2.1.9
-+Requires: gmime >= 2.3.5
- Requires: gtk2 >= 2.4.0
- %{!?_without_gtkspell:Requires: gtkspell >= 2.0.7}
- 
diff --git a/source/xap/pidgin/pidgin.SlackBuild b/source/xap/pidgin/pidgin.SlackBuild
index d61713b6..bfefef2e 100755
--- a/source/xap/pidgin/pidgin.SlackBuild
+++ b/source/xap/pidgin/pidgin.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
 
 
 PKGNAM=pidgin
-VERSION=${VERSION:-2.7.0}
+VERSION=${VERSION:-$(echo $PKGNAM-2.*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 PIDGINENC=${PIDGINENC:-3.1}
 BUILD=${BUILD:-1}
 
diff --git a/source/xap/rdesktop/rdesktop.CVE-2011-1595.diff b/source/xap/rdesktop/rdesktop.CVE-2011-1595.diff
new file mode 100644
index 00000000..0db8c3bc
--- /dev/null
+++ b/source/xap/rdesktop/rdesktop.CVE-2011-1595.diff
@@ -0,0 +1,22 @@
+--- ./disk.c.orig	2008-02-15 18:13:25.000000000 -0600
++++ ./disk.c	2011-04-20 20:27:55.978000772 -0500
+@@ -356,6 +356,19 @@
+ 		filename[strlen(filename) - 1] = 0;
+ 	sprintf(path, "%s%s", g_rdpdr_device[device_id].local_path, filename);
+ 
++        /* Protect against mailicous servers:
++           somelongpath/..     not allowed
++           somelongpath/../b   not allowed
++           somelongpath/..b    in principle ok, but currently not allowed
++           somelongpath/b..    ok
++           somelongpath/b..b   ok
++           somelongpath/b../c  ok
++         */
++        if (strstr(path, "/.."))
++        {
++                return RD_STATUS_ACCESS_DENIED;
++        }
++
+ 	switch (create_disposition)
+ 	{
+ 		case CREATE_ALWAYS:
diff --git a/source/xap/rdesktop/rdesktop.SlackBuild b/source/xap/rdesktop/rdesktop.SlackBuild
index cbfc1498..5e1ae2e2 100755
--- a/source/xap/rdesktop/rdesktop.SlackBuild
+++ b/source/xap/rdesktop/rdesktop.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2008, 2009, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,17 @@
 
 PKGNAM=rdesktop
 VERSION=${VERSION:-1.6.0}
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-1}
-
+BUILD=${BUILD:-2}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -39,6 +46,8 @@ elif [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 fi
 
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-${PKGNAM}
@@ -50,6 +59,8 @@ rm -rf ${PKGNAM}-${VERSION}
 tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
 cd ${PKGNAM}-$VERSION || exit 1
 
+zcat $CWD/rdesktop.CVE-2011-1595.diff.gz | patch -p1 --verbose || exit 1
+
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
 find . \
diff --git a/source/xap/sane/sane.SlackBuild b/source/xap/sane/sane.SlackBuild
index 95daed9d..613393dc 100755
--- a/source/xap/sane/sane.SlackBuild
+++ b/source/xap/sane/sane.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,10 +20,10 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=1.0.21
-BACKVER=1.0.21
+VERSION=1.0.22
+BACKVER=1.0.22
 FRONTVER=1.0.14
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -80,6 +80,7 @@ CFLAGS="$SLKCFLAGS" \
   --enable-locking \
   --with-lockdir=/var/lock/sane \
   --with-group=scanner \
+  --enable-libusb_1_0 \
   --build=$ARCH-slackware-linux
 
 make $NUMJOBS || make || exit 1
diff --git a/source/xap/seamonkey/seamonkey.SlackBuild b/source/xap/seamonkey/seamonkey.SlackBuild
index af563c09..6b4173e2 100755
--- a/source/xap/seamonkey/seamonkey.SlackBuild
+++ b/source/xap/seamonkey/seamonkey.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,8 +21,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=${VERSION:-$(basename $(ls seamonkey-*.tar.* | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source)}
-BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+COMM=${COMM:-central}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -40,6 +40,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-seamonkey
@@ -47,9 +49,9 @@ rm -rf $PKG
 mkdir -p $TMP $PKG/usr
 
 cd $TMP
-rm -rf comm-1.9.1
+rm -rf comm-$COMM
 tar xvf $CWD/seamonkey-${VERSION}.source.tar.?z* || exit 1
-cd comm-1.9.1 || exit 1
+cd comm-$COMM || exit 1
 
 # Make sure the perms/ownerships are sane:
 chown -R root:root .
@@ -79,12 +81,13 @@ BUILD_OFFICIAL=1 MOZILLA_OFFICIAL=1 \
   --enable-strip \
   --disable-tests \
   --enable-svg \
-  --enable-system-cairo \
   --enable-canvas \
   --disable-short-wchar \
   --enable-nspr-autoconf \
   --enable-extensions=default,irc \
   --enable-crypto \
+  --enable-shared-js \
+  --enable-libxul \
   --disable-xprint \
   --without-system-nspr \
   --with-system-zlib \
@@ -101,18 +104,25 @@ make $NUMJOBS || exit 1
 DESTDIR=$PKG make install || exit 1
 
 # Install js/nspr/nss headers.
-for includedir in js nspr nspr/obsolete nspr/private nss plugin xpcom ; do
+for includedir in nspr nspr/obsolete nspr/private ; do
   mkdir -p $PKG/usr/include/seamonkey-${VERSION}/$includedir
   cp -aL mozilla/dist/include/${includedir}/*.h $PKG/usr/include/seamonkey-${VERSION}/$includedir
 done
-cp -aL mozilla/dist/include/js/*.tbl mozilla/dist/include/js/*.msg $PKG/usr/include/seamonkey-${VERSION}/js
+cp -aL mozilla/dist/include/*.tbl mozilla/dist/include/*.msg $PKG/usr/include/seamonkey-${VERSION}
 cp -aL mozilla/dist/include/*.h $PKG/usr/include/seamonkey-${VERSION}
 cp -aL mozilla/dist/sdk/include/* $PKG/usr/include/seamonkey-${VERSION}
-( cd $PKG/usr/include/seamonkey-${VERSION}/plugin
-  for file in ../j*.h ; do
-    ln -sf $file .
-  done
+# compat symlinks
+( cd $PKG/usr/include/seamonkey-${VERSION}
+  ln -sf . js
+  ln -sf . nss
+  ln -sf . plugin
+  ln -sf . xpcom
 )
+#( cd $PKG/usr/include/seamonkey-${VERSION}/plugin
+#  for file in ../j*.h ; do
+#    ln -sf $file .
+#  done
+#)
 chown -R root:root $PKG/usr/include/seamonkey-${VERSION}
 find $PKG/usr/include/seamonkey-${VERSION} -name "*.h" -type f -exec chmod 644 {} \;
 # Create a more generic include files symlink:
@@ -198,9 +208,9 @@ rm -r $TMP/package-seamonkey-solibs
 mkdir -p $TMP/package-seamonkey-solibs/usr/doc
 cp -a $PKG/usr/doc/seamonkey-$VERSION $TMP/package-seamonkey-solibs/usr/doc
 mkdir -p $TMP/package-seamonkey-solibs/usr/lib${LIBDIRSUFFIX}/seamonkey-${VERSION}
-for file in libfreebl3.chk libfreebl3.so libmozjs.so libnspr4.so libnss3.so \
-  libnssckbi.so libnssutil3.so libplc4.so libplds4.so libsmime3.so \
-  libsoftokn3.chk libsoftokn3.so libssl3.so ; do
+for file in libfreebl3.chk libfreebl3.so libmozjs.so libmozsqlite3.so \
+  libnspr4.so libnss* libplc4.so libplds4.so libsmime3.so libsoftokn3.chk \
+  libsoftokn3.so libssl3.so ; do
   cp -a $PKG/usr/lib${LIBDIRSUFFIX}/seamonkey-${VERSION}/$file \
   $TMP/package-seamonkey-solibs/usr/lib${LIBDIRSUFFIX}/seamonkey-${VERSION}
 done
diff --git a/source/xap/windowmaker/windowmaker.SlackBuild b/source/xap/windowmaker/windowmaker.SlackBuild
index 15e32edf..74462e28 100755
--- a/source/xap/windowmaker/windowmaker.SlackBuild
+++ b/source/xap/windowmaker/windowmaker.SlackBuild
@@ -22,7 +22,7 @@
 
 
 VERSION=20060427cvs
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
diff --git a/source/xap/windowmaker/xinitrc.wmaker b/source/xap/windowmaker/xinitrc.wmaker
index 09ca61b4..2c43c1eb 100644
--- a/source/xap/windowmaker/xinitrc.wmaker
+++ b/source/xap/windowmaker/xinitrc.wmaker
@@ -35,4 +35,8 @@ if [ ! -x /usr/bin/cpp ]; then
 fi
 
 # Start the window manager:
-exec /usr/bin/wmaker $NOCPP
+if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
+  exec ck-launch-session /usr/bin/wmaker $NOCPP
+else
+  exec /usr/bin/wmaker $NOCPP
+fi
diff --git a/source/xap/x11-ssh-askpass/x11-ssh-askpass.SlackBuild b/source/xap/x11-ssh-askpass/x11-ssh-askpass.SlackBuild
index 837b7f8a..015c489f 100755
--- a/source/xap/x11-ssh-askpass/x11-ssh-askpass.SlackBuild
+++ b/source/xap/x11-ssh-askpass/x11-ssh-askpass.SlackBuild
@@ -3,17 +3,23 @@
 # Slackware build script for x11-ssh-askpass
 # Written by "Vincent Batts <vbatts@batts.mine.nu>"
 
-# Modified by Robby Workman <rworkman@slackbuilds.org>
-
 VERSION=1.2.4.1
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-x11-ssh-askpass
-OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -24,14 +30,17 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf x11-ssh-askpass-$VERSION
-tar xvf $CWD/x11-ssh-askpass-$VERSION.tar.gz
-cd x11-ssh-askpass-$VERSION
+tar xvf $CWD/x11-ssh-askpass-$VERSION.tar.gz || exit 1
+cd x11-ssh-askpass-$VERSION || exit 1
 chown -R root:root .
 chmod -R a-s,u+rw,go+r-w .
 
@@ -48,20 +57,20 @@ make || exit 1
 make install DESTDIR=$PKG || exit 1
 make install.man 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
-)
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-gzip -9 $PKG/usr/man/man1/x11-ssh-askpass.1x
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/x11-ssh-askpass-$VERSION
-cp README $CWD/xprofile.sample $PKG/usr/doc/x11-ssh-askpass-$VERSION
+cp -a \
+  README TODO ChangeLog $CWD/xprofile.sample \
+  $PKG/usr/doc/x11-ssh-askpass-$VERSION
+chown -R root:root $PKG/usr/doc/x11-ssh-askpass-$VERSION
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/x11-ssh-askpass-$VERSION-$ARCH-$BUILD$TAG.txz
+/sbin/makepkg -l y -c n $TMP/x11-ssh-askpass-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/xap/xaos/slack-desc b/source/xap/xaos/slack-desc
new file mode 100644
index 00000000..a35a1fdf
--- /dev/null
+++ b/source/xap/xaos/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------------------------------------------------------|
+xaos: xaos (an interactive fractal zoomer)
+xaos:
+xaos: XaoS is a fast portable real-time interactive fractal zoomer.  It
+xaos: displays the Mandelbrot set (and other popular fractals), and allows
+xaos: the user to smoothly zoom in or out of a fractal.  Other features
+xaos: include autopilot mode, palette changing, PNG saving, and fractal
+xaos: inversion.
+xaos:
+xaos: Visit XaoS online:  http://xaos.sf.net
+xaos:
+xaos:
diff --git a/source/xap/xaos/xaos.6 b/source/xap/xaos/xaos.6
new file mode 100644
index 00000000..a0544a57
--- /dev/null
+++ b/source/xap/xaos/xaos.6
@@ -0,0 +1,266 @@
+.TH XaoS 6 "16 Oct 2010" "XaoS" "Demos"
+
+.SH NAME
+xaos - Fast interactive real-time fractal zoomer/morpher
+
+.SH SYNOPSIS
+xaos [\fIOPTIONS\fR]
+
+.SH DESCRIPTION
+XaoS is a fast portable real-time interactive fractal zoomer. It
+displays the Mandelbrot set (among other escape time fractals) and
+allows you to zoom smoothly into the fractal. Various coloring modes are
+provided for both the points inside and outside the selected set. In
+addition, switching between Julia and Mandelbrot fractal types and
+displaying planes is provided. The first version was a poorly written
+Mandelbrot viewer by Thomas later modified by Jan to support high
+frame-rate zooming. Other additions were later made including autopilot
+(for those of you without driver licenses), palette changing, PNG
+saving, and fractal inversion.
+
+.SH OPTIONS
+
+ -delay          number
+                  Delay screen updates (milliseconds)
+ -driver         string
+                  Select driver
+ -list            List available drivers. Then exit
+ -config          Print configuration. Then exit
+ -speedtest       Test speed of calculation loop. Then exit
+ -threads        number
+                  Set number of threads (CPUs) to use
+ -pipe           string
+                  Accept commands from pipe (use "-" for stdin)
+ -maxframerate   number
+                  Maximal framerate (0 for unlimited - default)
+
+Screen size options: 
+
+  Knowledge of exact screen size makes random dot stereogram look better. 
+  Also is used for choosing correct view area
+
+ -screenwidth    f.point
+                  exact size of screen in centimeters
+ -screenheight   f.point
+                  exact size of screen in centimeters
+
+  Use this option in case you use some kind of virtual screen
+  or something similiar that confuses previous options
+
+ -pixelwidth     f.point
+                  exact size of one pixel in centimeters
+ -pixelheight    f.point
+                  exact size of one pixel in centimeters
+
+Animation rendering:
+
+ -render         string
+                  Render animation into seqence of .png files
+ -basename       string
+                  Name for .png files (XaoS will add 4 digit number and extension
+ -size           string
+                  widthxheight
+ -renderimage    string
+                  256 or truecolor
+ -renderframerate  f.point
+                  framerate
+ -antialiasing    Perform antialiasing (slow, requires quite lot of memory)
+ -alwaysrecalc    Always recalculate whole image (slowes down rendering, increases quality)
+ -rendervectors   Render motion vectors (should be used for MPEG encoding)
+ -iframedist     number
+                  Recommended distance between I frames in pat file (should be used for MPEG encoding)
+
+X11 driver options:
+
+ -display        string
+                  Select display
+ -size           string
+                  Select size of window (WIDTHxHEIGHT).
+ -sync            Generate sync signals before looking for events. This
+			helps on old and buggy HP-UX X servers.
+ -shared          Use shared colormap on pseudocolor display.
+ -usedefault      Use default visual if autodetection causes troubles.
+ -nomitshm        Disable MITSHM extension.
+ -fullscreen      Enable fullscreen mode.
+ -windowid       number
+                  Use selected window.
+ -window-id      number
+                  Use selected window.
+ -root            Use root window.
+
+Command line options only
+
+ -print_menus     print menus specifications of all menus
+ -print_menu     string 
+                  print menu specification
+ -xshl_print_menustring 
+                  print menu specification in xshl format
+ -xshl_print_menus print all menu specifications in xshl format
+ -print_dialog   string 
+                  print dialog specification
+
+File
+
+ -loadpos        input_file 
+                  Load
+ -savepos        output_file 
+                  Save
+ -record         output_file 
+                  Record
+ -play           input_file 
+                  Replay
+ -saveimg        output_file 
+                  Save image
+ -loadexample     Load random example
+ -savecfg         Save configuration
+
+Fractal
+
+ -perturbation   real_number  real_number 
+                  Perturbation
+ -initstate       Reset to defaults
+ -julia          on|off 
+                  Julia mode
+ -view           real_number real_number real_number real_number 
+                  View
+ -angle          real_number 
+                  Set angle
+ -plane          integer 
+                  Set plane
+ -incoloring     integer 
+                  Inside coloring mode
+ -outcoloring    integer 
+                  Outside coloring mode
+ -intcoloring    integer 
+                  Inside truecolor coloring mode
+ -outtcoloring   integer 
+                  Outside truecolor coloring mode
+ -juliaseed      real_number  real_number 
+                  Julia seed
+
+Calculation
+
+ -periodicity     Periodicity checking
+ -maxiter        integer 
+                  Iterations
+ -bailout        real_number 
+                  Bailout
+ -fastjulia       Fast julia mode
+ -range          integer 
+                  Solid guessing range
+
+Filters
+
+ -edge            Edge detection
+ -edge2           Edge detection2
+ -threed          Pseudo 3d
+ -starfield       Starfield
+ -stereogram      Random dot stereogram
+ -interlace       Interlace filter
+ -blur            Motionblur
+ -emboss          Emboss
+ -palettef        Palette emulator
+ -anti            Antialiasing
+ -truecolor       Truecolor emulator
+
+UI
+
+ -letterspersec  integer 
+                  Letters per second
+ -autopilot       Autopilot
+ -inhibittextoutput VJ mode
+ -recalculate     Recalculate
+ -interrupt       Interrupt
+ -speed          real_number 
+                  Zooming speed
+ -fixedstep       Fixed step
+ -nogui           Disable XaoS's builtin GUI
+ -status          Status
+ -ministatus      Ministatus
+
+Misc
+
+ -playstr        string 
+                  Play string
+ -text           string 
+                  Display text
+ -color          white|black|red 
+                  Color
+ -textposition   left|center|right top|middle|bottom 
+                  Text position
+ -message        string 
+                  Message
+
+Help
+
+ -help            Help
+
+Formulae
+
+ -mandel          Mandelbrot
+ -mandel3         Mandelbrot^3
+ -mandel4         Mandelbrot^4
+ -mandel5         Mandelbrot^5
+ -mandel6         Mandelbrot^6
+ -newton          Newton
+ -newton4         Newton^4
+ -barnsley        Barnsley1
+ -barnsley2       Barnsley2
+ -barnsley3       Barnsley3
+ -octal           Octal
+ -phoenix         Phoenix
+ -magnet          Magnet
+ -magnet2         Magnet2
+
+More formulae
+
+ -trice           Triceratops
+ -catseye         Catseye
+ -mbar            Mandelbar
+ -mlambda         Lambda
+ -manowar         Manowar
+ -spider          Spider
+ -sier            Sierpinski
+ -carpet          S.Carpet
+ -koch            Koch Snowflake
+ -hornflake       Spidron hornflake
+
+Palette
+
+ -defpalette      Default palette
+ -randompalette   Random palette
+ -palette        integer integer integer 
+                  Custom palette
+ -cycling         Color cycling
+ -cyclingspeed   integer 
+                  Color cycling speed
+ -shiftpalette   integer 
+                  Shift palette
+
+Dynamic resolution
+
+ -fastmode       zero|never|animation|new|allways 
+                  Dynamic resolution mode
+
+Rotation
+
+ -rotationspeed  real_number 
+                  Rotation speed
+ -autorotate     on|off 
+                  Automatic rotation
+ -fastrotate     on|off 
+                  Fast rotation mode
+
+Quit
+
+ -quit            Exit now
+
+.SH DETAILS
+This manual page is obsolete and no longer maintained.
+Please read the full documentation running
+XaoS. You can start it typing 'xaos'. (Press 'h' 3
+times to get into the help system.)
+.P
+In addition,
+.B xaos --help
+should give a detailed list about the command line options.
diff --git a/source/xap/xaos/xaos.SlackBuild b/source/xap/xaos/xaos.SlackBuild
new file mode 100755
index 00000000..c562b681
--- /dev/null
+++ b/source/xap/xaos/xaos.SlackBuild
@@ -0,0 +1,152 @@
+#!/bin/sh
+
+# Copyright 2010 B. Watson (yalhcru@gmail.com)
+# Copyright 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Slackware build script for xaos
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# A few notes:
+#
+# Package really wants to use its own CFLAGS (even checks for them
+# in the configure script). Let it...
+# 
+# SFFE is the user formula evaluator, which allows users to define their
+# own fractals. On x86 platforms, an assembly-language implementation of
+# SFFE is used. On non-x86 platforms, SFFE requires a library called GSL
+# (GNU Scientific Library, available from SBo).
+# 
+# xaos is still interesting and useful without SFFE support (most users
+# probably don't know/care about the math, so they'll never use the SFFE
+# stuff anyway), so we'll just disable it on non-x86 platforms by default.
+# 
+# If you really want to use it, set USE_GSL=yes in the environment before
+# running this script. There's no need to use GSL on x86 platforms, since
+# the asm code is (or should be) faster, but the option is there if you
+# want to use it anyway.
+# 
+# Multilib users also have the option of building on a 32-bit Slackware system
+# (or in a chroot) and the resulting package will run just fine on 64-bit.
+#
+# If the preceding didn't make any sense, here's the bottom line:
+# 
+# - Regular Slackware (x86) users can just run this script and ignore the junk
+#   above.
+#
+# - Everyone else (Slamd64, Bluewhite64, Slackware64, ???) can just
+#   run this script and probably never notice the missing functionality.
+#
+# - If you're not on x86, but you want the formula evaluator, install GSL
+#   and then run this script with USE_GSL=yes in the environment.
+
+PKGNAM=xaos
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    # might as well use i686 since it won't listen to our CFLAGS anyway
+    i?86) ARCH=i686 ;;
+    arm*) ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+USE_GSL=${USE_GSL:-no}
+
+if [ "$USE_GSL" = "yes" ]; then
+	GSL_OPT="yes"
+	SFFE_OPT="yes"
+elif [ "$ARCH" = "i486" -o "$ARCH" = "i686" ]; then
+	GSL_OPT="no"
+	SFFE_OPT="yes"
+else
+	GSL_OPT="no"
+	SFFE_OPT="no"
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION || exit 1
+chown -R root:root .
+chmod -R a-s,u+w,go+r-w .
+
+./configure \
+  --prefix=/usr \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --infodir=/usr/info \
+  --mandir=/usr/man \
+  --with-gsl=$GSL_OPT \
+  --with-sffe=$SFFE_OPT \
+  --with-pthread=yes \
+  --build=$ARCH-slackware-linux
+
+make || exit 1
+# binary already stripped, yay!
+make install DESTDIR=$PKG || exit 1
+
+# Replace bogus manpage:
+zcat $CWD/xaos.6.gz > $PKG/usr/man/man6/xaos.6
+
+gzip -9 $PKG/usr/man/man6/xaos.6
+rm -f $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*.info*
+
+mkdir -p $PKG/usr/doc
+mv $PKG/usr/share/XaoS/doc $PKG/usr/doc/xaos-$VERSION
+( cd $PKG/usr/share/XaoS ; ln -sf ../../doc/xaos-$VERSION doc )
+
+mkdir -p $PKG/usr/share/applications
+cat $CWD/xaos.desktop > $PKG/usr/share/applications/xaos.desktop
+
+mkdir -p $PKG/usr/share/pixmaps
+cat $CWD/xaos.png > $PKG/usr/share/pixmaps/xaos.png
+
+chmod 644 $PKG/usr/doc/xaos-$VERSION/*
+rm -f $PKG/usr/doc/xaos-$VERSION/ChangeLog.old
+cp -a \
+  AUTHORS COPYING* INSTALL NEWS README* TODO \
+  $PKG/usr/doc/xaos-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/xap/xaos/xaos.desktop b/source/xap/xaos/xaos.desktop
new file mode 100644
index 00000000..5157bf9d
--- /dev/null
+++ b/source/xap/xaos/xaos.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Name=XaoS
+GenericName=XaoS Fractal Explorer
+Type=Application
+Exec=xaos
+Icon=xaos
+Terminal=false
+StartupNotify=false
+Categories=Game;
diff --git a/source/xap/xaos/xaos.png b/source/xap/xaos/xaos.png
new file mode 100644
index 00000000..9aa39b81
--- /dev/null
+++ b/source/xap/xaos/xaos.png
diff --git a/source/xap/xchat/patches/patches.url b/source/xap/xchat/patches/patches.url
deleted file mode 100644
index 33531f7c..00000000
--- a/source/xap/xchat/patches/patches.url
+++ /dev/null
@@ -1 +0,0 @@
-http://xchat.org/files/source/2.8/patches/
diff --git a/source/xap/xchat/patches/xc286-smallfixes.diff b/source/xap/xchat/patches/xc286-smallfixes.diff
deleted file mode 100644
index da900152..00000000
--- a/source/xap/xchat/patches/xc286-smallfixes.diff
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# Various small fixes from CVS that are considered safe to apply to 2.8.6.
-#
---- xchat-2.8.6/src/common/cfgfiles.c	2008-02-05 21:02:47.000000000 +1100
-+++ xchat-2.8.6p1/src/common/cfgfiles.c	2008-06-15 13:45:43.000000000 +1000
-@@ -886,7 +886,6 @@
- set_showval (session *sess, const struct prefs *var, char *tbuf)
- {
- 	int len, dots, j;
--	static const char *offon[] = { "OFF", "ON" };
- 
- 	len = strlen (var->name);
- 	memcpy (tbuf, var->name, len);
-@@ -909,8 +908,10 @@
- 					*((int *) &prefs + var->offset));
- 		break;
- 	case TYPE_BOOL:
--		sprintf (tbuf + len, "\0033:\017 %s\n", offon[
--					*((int *) &prefs + var->offset)]);
-+		if (*((int *) &prefs + var->offset))
-+			sprintf (tbuf + len, "\0033:\017 %s\n", "ON");
-+		else
-+			sprintf (tbuf + len, "\0033:\017 %s\n", "OFF");
- 		break;
- 	}
- 	PrintText (sess, tbuf);
---- xchat-2.8.6/src/common/chanopt.c	2008-06-10 22:00:55.000000000 +1000
-+++ xchat-2.8.6p1/src/common/chanopt.c	2008-06-15 13:48:04.000000000 +1000
-@@ -32,7 +32,7 @@
- 
- #define S_F(xx) STRUCT_OFFSET_STR(struct session,xx)
- 
--channel_options chanopt[] =
-+static const channel_options chanopt[] =
- {
- 	{"alert_beep", "BEEP", S_F(alert_beep)},
- 	{"alert_taskbar", NULL, S_F(alert_taskbar)},
---- xchat-2.8.6/src/common/servlist.c	2008-04-01 19:22:34.000000000 +1100
-+++ xchat-2.8.6p1/src/common/servlist.c	2008-06-15 13:57:41.000000000 +1000
-@@ -509,6 +509,8 @@
- 	list = g_slist_nth (net->servlist, net->selected);
- 	if (!list)
- 		list = net->servlist;
-+	if (!list)
-+		return;
- 	ircserv = list->data;
- 
- 	/* incase a protocol switch is added to the servlist gui */
---- xchat-2.8.6/src/common/text.c	2008-03-28 13:20:04.000000000 +1100
-+++ xchat-2.8.6p1/src/common/text.c	2008-06-15 13:59:59.000000000 +1000
-@@ -216,7 +216,7 @@
- static void
- scrollback_save (session *sess, char *text)
- {
--	char buf[1024];
-+	char buf[512 * 4];
- 	time_t stamp;
- 	int len;
- 
-@@ -266,7 +266,7 @@
- scrollback_load (session *sess)
- {
- 	int fh;
--	char buf[1024];
-+	char buf[512 * 4];
- 	char *text;
- 	time_t stamp;
- 	int lines;
diff --git a/source/xap/xchat/patches/xchat.gtk_2_14.diff b/source/xap/xchat/patches/xchat.gtk_2_14.diff
deleted file mode 100644
index f0a42a1c..00000000
--- a/source/xap/xchat/patches/xchat.gtk_2_14.diff
+++ /dev/null
@@ -1,191 +0,0 @@
-diff -ur xchat-2.8.6.orig/src/fe-gtk/about.c xchat-2.8.6/src/fe-gtk/about.c
---- xchat-2.8.6.orig/src/fe-gtk/about.c	2008-04-01 10:58:38.000000000 +0200
-+++ xchat-2.8.6/src/fe-gtk/about.c	2008-10-12 14:12:59.329706289 +0200
-@@ -16,7 +16,7 @@
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-  */
- 
--#define GTK_DISABLE_DEPRECATED
-+/* #define GTK_DISABLE_DEPRECATED */
- 
- #include <stdio.h>
- #include <stdlib.h>
-diff -ur xchat-2.8.6.orig/src/fe-gtk/ascii.c xchat-2.8.6/src/fe-gtk/ascii.c
---- xchat-2.8.6.orig/src/fe-gtk/ascii.c	2008-02-05 11:02:50.000000000 +0100
-+++ xchat-2.8.6/src/fe-gtk/ascii.c	2008-10-12 14:12:59.329706289 +0200
-@@ -16,7 +16,7 @@
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-  */
- 
--#define GTK_DISABLE_DEPRECATED
-+/* #define GTK_DISABLE_DEPRECATED */
- 
- #include <stdio.h>
- #include <stdlib.h>
-diff -ur xchat-2.8.6.orig/src/fe-gtk/banlist.c xchat-2.8.6/src/fe-gtk/banlist.c
---- xchat-2.8.6.orig/src/fe-gtk/banlist.c	2008-02-05 11:02:50.000000000 +0100
-+++ xchat-2.8.6/src/fe-gtk/banlist.c	2008-10-12 14:12:59.329706289 +0200
-@@ -16,7 +16,7 @@
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-  */
- 
--#define GTK_DISABLE_DEPRECATED
-+/* #define GTK_DISABLE_DEPRECATED */
- 
- #include <stdio.h>
- #include <stdlib.h>
-diff -ur xchat-2.8.6.orig/src/fe-gtk/fe-gtk.c xchat-2.8.6/src/fe-gtk/fe-gtk.c
---- xchat-2.8.6.orig/src/fe-gtk/fe-gtk.c	2008-02-24 09:39:44.000000000 +0100
-+++ xchat-2.8.6/src/fe-gtk/fe-gtk.c	2008-10-12 14:12:59.339702951 +0200
-@@ -16,7 +16,7 @@
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-  */
- 
--#define GTK_DISABLE_DEPRECATED
-+/* #define GTK_DISABLE_DEPRECATED */
- 
- #include <stdio.h>
- #include <string.h>
-diff -ur xchat-2.8.6.orig/src/fe-gtk/ignoregui.c xchat-2.8.6/src/fe-gtk/ignoregui.c
---- xchat-2.8.6.orig/src/fe-gtk/ignoregui.c	2008-02-05 11:02:52.000000000 +0100
-+++ xchat-2.8.6/src/fe-gtk/ignoregui.c	2008-10-12 14:12:59.343034799 +0200
-@@ -16,7 +16,7 @@
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-  */
- 
--#define GTK_DISABLE_DEPRECATED
-+/* #define GTK_DISABLE_DEPRECATED */
- 
- #include <stdio.h>
- #include <stdlib.h>
-diff -ur xchat-2.8.6.orig/src/fe-gtk/maingui.c xchat-2.8.6/src/fe-gtk/maingui.c
---- xchat-2.8.6.orig/src/fe-gtk/maingui.c	2008-04-01 10:53:41.000000000 +0200
-+++ xchat-2.8.6/src/fe-gtk/maingui.c	2008-10-12 14:12:59.349699891 +0200
-@@ -16,7 +16,7 @@
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-  */
- 
--#define GTK_DISABLE_DEPRECATED
-+/* #define GTK_DISABLE_DEPRECATED */
- 
- #include <stdlib.h>
- #include <string.h>
-diff -ur xchat-2.8.6.orig/src/fe-gtk/menu.c xchat-2.8.6/src/fe-gtk/menu.c
---- xchat-2.8.6.orig/src/fe-gtk/menu.c	2008-06-08 09:59:37.000000000 +0200
-+++ xchat-2.8.6/src/fe-gtk/menu.c	2008-10-12 14:12:59.349699891 +0200
-@@ -16,7 +16,7 @@
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-  */
- 
--#define GTK_DISABLE_DEPRECATED
-+/* #define GTK_DISABLE_DEPRECATED */
- 
- #include <stdio.h>
- #include <stdlib.h>
-diff -ur xchat-2.8.6.orig/src/fe-gtk/notifygui.c xchat-2.8.6/src/fe-gtk/notifygui.c
---- xchat-2.8.6.orig/src/fe-gtk/notifygui.c	2008-02-05 11:03:34.000000000 +0100
-+++ xchat-2.8.6/src/fe-gtk/notifygui.c	2008-10-12 14:12:59.363033500 +0200
-@@ -16,7 +16,7 @@
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-  */
- 
--#define GTK_DISABLE_DEPRECATED
-+/* #define GTK_DISABLE_DEPRECATED */
- 
- #include <stdio.h>
- #include <stdlib.h>
-diff -ur xchat-2.8.6.orig/src/fe-gtk/palette.c xchat-2.8.6/src/fe-gtk/palette.c
---- xchat-2.8.6.orig/src/fe-gtk/palette.c	2008-02-05 11:02:52.000000000 +0100
-+++ xchat-2.8.6/src/fe-gtk/palette.c	2008-10-12 14:12:59.363033500 +0200
-@@ -16,7 +16,7 @@
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-  */
- 
--#define GTK_DISABLE_DEPRECATED
-+/* #define GTK_DISABLE_DEPRECATED */
- 
- #include <stdio.h>
- #include <stdlib.h>
-diff -ur xchat-2.8.6.orig/src/fe-gtk/pixmaps.c xchat-2.8.6/src/fe-gtk/pixmaps.c
---- xchat-2.8.6.orig/src/fe-gtk/pixmaps.c	2008-02-05 11:02:52.000000000 +0100
-+++ xchat-2.8.6/src/fe-gtk/pixmaps.c	2008-10-12 14:12:59.363033500 +0200
-@@ -16,7 +16,7 @@
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-  */
- 
--#define GTK_DISABLE_DEPRECATED
-+/* #define GTK_DISABLE_DEPRECATED */
- 
- #include <stdio.h>
- #include <string.h>
-diff -ur xchat-2.8.6.orig/src/fe-gtk/plugingui.c xchat-2.8.6/src/fe-gtk/plugingui.c
---- xchat-2.8.6.orig/src/fe-gtk/plugingui.c	2008-02-05 11:02:52.000000000 +0100
-+++ xchat-2.8.6/src/fe-gtk/plugingui.c	2008-10-12 14:12:59.363033500 +0200
-@@ -16,7 +16,7 @@
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-  */
- 
--#define GTK_DISABLE_DEPRECATED
-+/* #define GTK_DISABLE_DEPRECATED */
- 
- #include <string.h>
- #include <stdio.h>
-diff -ur xchat-2.8.6.orig/src/fe-gtk/rawlog.c xchat-2.8.6/src/fe-gtk/rawlog.c
---- xchat-2.8.6.orig/src/fe-gtk/rawlog.c	2008-02-24 05:49:37.000000000 +0100
-+++ xchat-2.8.6/src/fe-gtk/rawlog.c	2008-10-12 14:12:59.366369608 +0200
-@@ -16,7 +16,7 @@
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-  */
- 
--#define GTK_DISABLE_DEPRECATED
-+/* #define GTK_DISABLE_DEPRECATED */
- 
- #include <stdio.h>
- #include <string.h>
-diff -ur xchat-2.8.6.orig/src/fe-gtk/search.c xchat-2.8.6/src/fe-gtk/search.c
---- xchat-2.8.6.orig/src/fe-gtk/search.c	2008-02-05 11:02:53.000000000 +0100
-+++ xchat-2.8.6/src/fe-gtk/search.c	2008-10-12 14:12:59.369703062 +0200
-@@ -16,7 +16,7 @@
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-  */
- 
--#define GTK_DISABLE_DEPRECATED
-+/* #define GTK_DISABLE_DEPRECATED */
- 
- #include <stdio.h>
- #include <string.h>
-diff -ur xchat-2.8.6.orig/src/fe-gtk/urlgrab.c xchat-2.8.6/src/fe-gtk/urlgrab.c
---- xchat-2.8.6.orig/src/fe-gtk/urlgrab.c	2008-02-05 11:02:53.000000000 +0100
-+++ xchat-2.8.6/src/fe-gtk/urlgrab.c	2008-10-12 14:12:59.376368714 +0200
-@@ -16,7 +16,7 @@
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-  */
- 
--#define GTK_DISABLE_DEPRECATED
-+/* #define GTK_DISABLE_DEPRECATED */
- 
- #include <stdio.h>
- #include <string.h>
-diff -ur xchat-2.8.6.orig/src/fe-gtk/userlistgui.c xchat-2.8.6/src/fe-gtk/userlistgui.c
---- xchat-2.8.6.orig/src/fe-gtk/userlistgui.c	2008-02-05 11:02:53.000000000 +0100
-+++ xchat-2.8.6/src/fe-gtk/userlistgui.c	2008-10-12 14:12:59.379703216 +0200
-@@ -16,7 +16,7 @@
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-  */
- 
--#define GTK_DISABLE_DEPRECATED
-+/* #define GTK_DISABLE_DEPRECATED */
- 
- #include <stdio.h>
- #include <string.h>
-diff -ur xchat-2.8.6.orig/src/fe-gtk/xtext.h xchat-2.8.6/src/fe-gtk/xtext.h
---- xchat-2.8.6.orig/src/fe-gtk/xtext.h	2008-02-24 05:48:02.000000000 +0100
-+++ xchat-2.8.6/src/fe-gtk/xtext.h	2008-10-12 14:10:49.203049619 +0200
-@@ -1,6 +1,7 @@
- #ifndef __XTEXT_H__
- #define __XTEXT_H__
- 
-+#include <gtk/gtktypeutils.h>
- #include <gtk/gtkadjustment.h>
- #ifdef USE_XFT
- #include <X11/Xft/Xft.h>
diff --git a/source/xap/xchat/xchat.SlackBuild b/source/xap/xchat/xchat.SlackBuild
index 8058f904..cc7b5e1a 100755
--- a/source/xap/xchat/xchat.SlackBuild
+++ b/source/xap/xchat/xchat.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,8 +21,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=2.8.6
-BUILD=${BUILD:-5}
+VERSION=2.8.8
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/xap/xfce/patches/Thunar.thunar-vfs-io-local.diff b/source/xap/xfce/patches/Thunar.thunar-vfs-io-local.diff
new file mode 100644
index 00000000..7d92c3e4
--- /dev/null
+++ b/source/xap/xfce/patches/Thunar.thunar-vfs-io-local.diff
@@ -0,0 +1,20 @@
+--- thunar-vfs/thunar-vfs-io-local.c.old        2008-06-13 12:43:52.000000000 +0200
++++ thunar-vfs/thunar-vfs-io-local.c    2008-06-13 14:41:46.000000000 +0200
+@@ -301,7 +301,7 @@
+     }
+
+   /* check whether we have a hidden file here */
+-  if ((s - (const guchar *) name) > 1 && (*name == '.' || *(s - 1) == '~'))
++  if ((s - (const guchar *) name) > 1 && (*name == '.' ))
+     info->flags = THUNAR_VFS_FILE_FLAGS_HIDDEN;
+   else
+     info->flags = THUNAR_VFS_FILE_FLAGS_NONE;
+@@ -1029,7 +1029,7 @@
+       info->display_name = g_strdup (name);
+
+       /* check if this is a hidden file now */
+-      if (strlen (name) > 1 && (name[0] == '.' || name[strlen (name) - 1] == '~'))
++      if (strlen (name) > 1 && (name[0] == '.'))
+         info->flags |= THUNAR_VFS_FILE_FLAGS_HIDDEN;
+       else
+         info->flags &= ~THUNAR_VFS_FILE_FLAGS_HIDDEN;
diff --git a/source/xap/xfce/patches/fixup_comments_in_xfce-utils-Xft.xrdb.diff b/source/xap/xfce/patches/fixup_comments_in_xfce-utils-Xft.xrdb.diff
new file mode 100644
index 00000000..be64a2da
--- /dev/null
+++ b/source/xap/xfce/patches/fixup_comments_in_xfce-utils-Xft.xrdb.diff
@@ -0,0 +1,24 @@
+From b55be8ded0c7e1119eb062a5831b246b618c89e8 Mon Sep 17 00:00:00 2001
+From: Mike Massonnet <mmassonnet@gmail.com>
+Date: Thu, 8 Apr 2010 22:38:50 +0200
+Subject: [PATCH] use right comment character (! and not #) in Xft.xrdb file (bug 6314)
+
+ scripts/Xft.xrdb |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/scripts/Xft.xrdb b/scripts/Xft.xrdb
+index af45361..cd26513 100644
+--- a/scripts/Xft.xrdb
++++ b/scripts/Xft.xrdb
+@@ -1,7 +1,7 @@
+-# Those are fallback settings, use the ui plugin to change it
+-# or add your overrides to ~/.Xresources
+-# Xft.hintstyle: hintnone/hintslight/hintmedium/hintfull
+-# Xft hinting: 1/0
++! Those are fallback settings, use the ui plugin to change it
++! or add your overrides to ~/.Xresources
++! Xft.hintstyle: hintnone/hintslight/hintmedium/hintfull
++! Xft hinting: 1/0
+ 
+ Xft.hinting: 1
+ Xft.hintstyle: hintmedium
diff --git a/source/xap/xfce/patches/mousepad-fix_find.diff b/source/xap/xfce/patches/mousepad-fix_find.diff
new file mode 100644
index 00000000..6477cd78
--- /dev/null
+++ b/source/xap/xfce/patches/mousepad-fix_find.diff
@@ -0,0 +1,43 @@
+commit a6383ccf4e3ba425ffb6489a795785e6a626c048
+Author: Nick Schermer <nick@xfce.org>
+Date:   Tue Jul 6 17:53:54 2010 +0200
+
+    Also fix find (bug #6544).
+
+diff --git a/src/search.c b/src/search.c
+index 4fb1c5b..91f69cf 100644
+--- a/src/search.c
++++ b/src/search.c
+@@ -78,7 +78,7 @@ gboolean document_search_real(StructData *sd, gint direction)
+ static gint document_replace_real(StructData *sd)
+ {
+ 	GtkTextIter iter, match_start, match_end;
+-	GtkTextMark *mark_init = NULL;
++	GtkTextMark *mark_init = NULL, *mark_start, *mark_end;
+ 	gboolean res;
+ 	gint num = 0;
+ 	GtkWidget *q_dialog = NULL;
+@@ -113,6 +113,11 @@ static gint document_replace_real(StructData *sd)
+ 				if (num == 0 && q_dialog == NULL)
+ 					q_dialog = create_dialog_message_question(
+ 						gtk_widget_get_toplevel(sd->mainwin->textview), _("Replace?"));
++
++				gtk_text_buffer_get_selection_bounds(textbuffer, &match_start, &match_end);
++				mark_start = gtk_text_buffer_create_mark(textbuffer, NULL, &match_start, FALSE);
++				mark_end = gtk_text_buffer_create_mark(textbuffer, NULL, &match_end, FALSE);
++
+ 				switch (gtk_dialog_run(GTK_DIALOG(q_dialog))) {
+ 				case GTK_RESPONSE_CANCEL:
+ 					res = 0;
+@@ -122,6 +127,11 @@ static gint document_replace_real(StructData *sd)
+ 				case GTK_RESPONSE_NO:
+ 					continue;
+ 				}
++
++				gtk_text_buffer_get_iter_at_mark(textbuffer, &match_start, mark_start);
++				gtk_text_buffer_get_iter_at_mark(textbuffer, &match_end, mark_end);
++				gtk_text_buffer_move_mark_by_name(textbuffer, "selection_bound", &match_start);
++				gtk_text_buffer_move_mark_by_name(textbuffer, "insert", &match_end);
+ 			}
+ 			gtk_text_buffer_delete_selection(textbuffer, TRUE, TRUE);
+ 			undo_set_sequency(TRUE);
diff --git a/source/xap/xfce/patches/mousepad-fix_find_and_replace.diff b/source/xap/xfce/patches/mousepad-fix_find_and_replace.diff
new file mode 100644
index 00000000..5db73b1e
--- /dev/null
+++ b/source/xap/xfce/patches/mousepad-fix_find_and_replace.diff
@@ -0,0 +1,36 @@
+commit 80819d447df5661ee6c9e9cd22f501cee612da8b
+Author: Lionel Le Folgoc <mrpouit@gmail.com>
+Date:   Mon Jul 5 19:57:53 2010 +0200
+
+    Fix find and replace (bug #5831).
+
+diff --git a/src/search.c b/src/search.c
+index 07e29c7..4fb1c5b 100644
+--- a/src/search.c
++++ b/src/search.c
+@@ -210,8 +210,11 @@ gint run_dialog_find(StructData *sd)
+ 		G_CALLBACK(toggle_sensitivity), NULL);
+ 	 g_signal_connect(G_OBJECT(entry_find), "delete-text",
+ 		G_CALLBACK(toggle_sensitivity), NULL);
+-	 if (sd->search.string_find) 
++	 if (sd->search.string_find) {
+ 		 gtk_entry_set_text(GTK_ENTRY(entry_find), sd->search.string_find);
++		 gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog),
++			GTK_RESPONSE_OK, TRUE);
++	 }
+ 
+ 	gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
+ 	gtk_entry_set_activates_default(GTK_ENTRY(entry_find), TRUE);
+@@ -275,8 +278,11 @@ gint run_dialog_replace(StructData *sd)
+ 		G_CALLBACK(toggle_sensitivity), NULL);
+ 	 g_signal_connect(G_OBJECT(entry_find), "delete-text",
+ 		G_CALLBACK(toggle_sensitivity), NULL);
+-	 if (sd->search.string_find) 
++	 if (sd->search.string_find) {
+ 		 gtk_entry_set_text(GTK_ENTRY(entry_find), sd->search.string_find);
++		 gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog),
++			GTK_RESPONSE_OK, TRUE);
++	}
+ 	label_replace = gtk_label_new_with_mnemonic(_("Re_place with: "));
+ 	 gtk_misc_set_alignment(GTK_MISC(label_replace), 0, 0.5);
+ 	 gtk_table_attach_defaults(GTK_TABLE(table), label_replace, 0, 1, 1, 2);
diff --git a/source/xap/xfce/patches/no_sensitive_panel_during_plugin_moves.patch b/source/xap/xfce/patches/no_sensitive_panel_during_plugin_moves.patch
new file mode 100644
index 00000000..6e5b4a9a
--- /dev/null
+++ b/source/xap/xfce/patches/no_sensitive_panel_during_plugin_moves.patch
@@ -0,0 +1,26 @@
+From 8ae5177d843802b49e90ecf801d8a4fac00b866a Mon Sep 17 00:00:00 2001
+From: Robby Workman <rworkman@slackware.com>
+Date: Tue, 22 Feb 2011 21:48:56 -0600
+Subject: [PATCH] panel/panel.c: Don't make panel insensitive during plugin moves
+
+This fixes http://bugzilla.xfce.org/show_bug.cgi?id=6818 while
+working around https://bugzilla.gnome.org/show_bug.cgi?id=634765
+---
+ panel/panel.c |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/panel/panel.c b/panel/panel.c
+index fa0709b..e7a9eac 100644
+--- a/panel/panel.c
++++ b/panel/panel.c
+@@ -811,7 +811,6 @@ _item_start_move (GtkWidget *item,
+ 
+         if (!priv->edit_mode)
+         {
+-            panel_set_items_sensitive (p, FALSE);
+             xfce_itembar_raise_event_window (XFCE_ITEMBAR (priv->itembar));
+             panel_block_autohide (p);
+         }
+-- 
+1.7.4.1
+
diff --git a/source/xap/xfce/patches/terminal.gtk.2.18.fix.diff b/source/xap/xfce/patches/terminal.gtk.2.18.fix.diff
deleted file mode 100644
index 69a9e70e..00000000
--- a/source/xap/xfce/patches/terminal.gtk.2.18.fix.diff
+++ /dev/null
@@ -1,101 +0,0 @@
-From 028dc2efd846defe796c7fa097ed84818bb43431 Mon Sep 17 00:00:00 2001
-From: Nick Schermer <nick@xfce.org>
-Date: Sun, 21 Mar 2010 22:05:31 +0000
-Subject: Disconnect bindings before closing the dialog.
-
-This avoids possible problems when Gtk+ emits property
-changes before the widgets are destroyed. This is currently
-the case for text entries in some Gtk 2.18 releases.
----
-diff --git a/terminal/terminal-preferences-dialog.c b/terminal/terminal-preferences-dialog.c
-index 587bd92..8f33628 100644
---- a/terminal/terminal-preferences-dialog.c
-+++ b/terminal/terminal-preferences-dialog.c
-@@ -64,24 +64,28 @@ terminal_preferences_dialog_class_init (TerminalPreferencesDialogClass *klass)
- 
- 
- #define BIND_PROPERTIES(name, property) \
--  { object = gtk_builder_get_object (GTK_BUILDER (dialog), name); \
-+  G_STMT_START { \
-+  object = gtk_builder_get_object (GTK_BUILDER (dialog), name); \
-   terminal_return_if_fail (G_IS_OBJECT (object)); \
--  exo_mutual_binding_new (G_OBJECT (dialog->preferences), name, \
--                          G_OBJECT (object), property); }
-+  binding = exo_mutual_binding_new (G_OBJECT (dialog->preferences), name, \
-+                                    G_OBJECT (object), property); \
-+  dialog->bindings = g_slist_prepend (dialog->bindings, binding); \
-+  } G_STMT_END
- 
- 
- 
- static void
- terminal_preferences_dialog_init (TerminalPreferencesDialog *dialog)
- {
--  GError        *error = NULL;
--  guint          i;
--  GObject       *object, *object2;
--  GtkWidget     *editor;
--  gchar          palette_name[16];
--  GtkFileFilter *filter;
--  gchar         *file;
--  const gchar   *props_active[] = { "title-mode", "command-login-shell",
-+  GError           *error = NULL;
-+  guint             i;
-+  GObject          *object, *object2;
-+  GtkWidget        *editor;
-+  gchar             palette_name[16];
-+  GtkFileFilter    *filter;
-+  gchar            *file;
-+  ExoMutualBinding *binding;
-+  const gchar      *props_active[] = { "title-mode", "command-login-shell",
-                                     "command-update-records", "scrolling-single-line",
-                                     "scrolling-on-output", "scrolling-on-keystroke",
-                                     "scrolling-bar", "font-allow-bold",
-@@ -94,9 +98,9 @@ terminal_preferences_dialog_init (TerminalPreferencesDialog *dialog)
-                                     , "font-anti-alias"
- #endif
-                                     };
--  const gchar   *props_color[] =  { "color-foreground", "color-cursor",
--                                    "color-background", "tab-activity-color",
--                                    "color-selection" };
-+  const gchar      *props_color[] =  { "color-foreground", "color-cursor",
-+                                       "color-background", "tab-activity-color",
-+                                       "color-selection" };
- 
-   dialog->preferences = terminal_preferences_get ();
- 
-@@ -248,6 +252,8 @@ terminal_preferences_dialog_response (GtkWidget                 *widget,
-                                       gint                       response,
-                                       TerminalPreferencesDialog *dialog)
- {
-+  GSList *li;
-+
-   /* check if we should open the user manual */
-   if (G_UNLIKELY (response == 1))
-     {
-@@ -256,6 +262,11 @@ terminal_preferences_dialog_response (GtkWidget                 *widget,
-     }
-   else
-     {
-+      /* disconnect all the bindings */
-+      for (li = dialog->bindings; li != NULL; li = li->next)
-+        exo_mutual_binding_unbind (li->data);
-+      g_slist_free (dialog->bindings);
-+
-       /* close the preferences dialog */
-       gtk_widget_destroy (widget);
-     }
-diff --git a/terminal/terminal-preferences-dialog.h b/terminal/terminal-preferences-dialog.h
-index b2db4f5..268d70a 100644
---- a/terminal/terminal-preferences-dialog.h
-+++ b/terminal/terminal-preferences-dialog.h
-@@ -48,6 +48,7 @@ struct _TerminalPreferencesDialog
- 
-   TerminalPreferences *preferences;
-   guint                signal_id;
-+  GSList              *bindings;
- };
- 
- GType      terminal_preferences_dialog_get_type (void) G_GNUC_CONST;
---
-cgit v0.8.2.1
diff --git a/source/xap/xfce/patches/thunar-1.0.1-fixup_docdir.diff b/source/xap/xfce/patches/thunar-1.0.1-fixup_docdir.diff
deleted file mode 100644
index 52d076d9..00000000
--- a/source/xap/xfce/patches/thunar-1.0.1-fixup_docdir.diff
+++ /dev/null
@@ -1,360 +0,0 @@
-diff -Nur Thunar-1.0.1.orig/Makefile.in Thunar-1.0.1/Makefile.in
---- Thunar-1.0.1.orig/Makefile.in	2009-04-18 09:41:09.000000000 -0500
-+++ Thunar-1.0.1/Makefile.in	2009-07-20 19:36:55.895440657 -0500
-@@ -932,7 +932,7 @@
- 
- ThunarHelp: ThunarHelp.in Makefile
- 	rm -f ThunarHelp.gen ThunarHelp
--	sed -e "s,\@datadir\@,$(datadir),g" 				\
-+	sed -e "s,\@htmldir\@,$(htmldir),g" 				\
- 		< $(srcdir)/ThunarHelp.in				\
- 		> ThunarHelp.gen
- 	mv ThunarHelp.gen ThunarHelp
-diff -Nur Thunar-1.0.1.orig/ThunarHelp.in Thunar-1.0.1/ThunarHelp.in
---- Thunar-1.0.1.orig/ThunarHelp.in	2008-10-22 01:43:23.000000000 -0500
-+++ Thunar-1.0.1/ThunarHelp.in	2009-07-20 19:36:38.235721255 -0500
-@@ -19,7 +19,7 @@
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- #
- 
--HELPDIR="@datadir@/doc/Thunar/html/"
-+HELPDIR="@htmldir@/"
- 
- if test -n "$LC_ALL"; then
-   LC=$LC_ALL
-diff -Nur Thunar-1.0.1.orig/docs/Makefile.in Thunar-1.0.1/docs/Makefile.in
---- Thunar-1.0.1.orig/docs/Makefile.in	2009-04-18 09:40:14.000000000 -0500
-+++ Thunar-1.0.1/docs/Makefile.in	2009-07-20 19:36:38.235721255 -0500
-@@ -292,7 +292,7 @@
- builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
--docdir = $(datadir)/doc/Thunar
-+docdir = @docdir@
- dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
-diff -Nur Thunar-1.0.1.orig/docs/manual/C/Makefile.in Thunar-1.0.1/docs/manual/C/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/C/Makefile.in	2009-04-18 09:40:19.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/C/Makefile.in	2009-07-20 19:36:38.235721255 -0500
-@@ -319,7 +319,7 @@
- SUBDIRS = \
- 	images
- 
--TARGET_DIR = $(datadir)/doc/Thunar/html/C
-+TARGET_DIR = $(htmldir)/C
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
- 
-diff -Nur Thunar-1.0.1.orig/docs/manual/C/images/Makefile.in Thunar-1.0.1/docs/manual/C/images/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/C/images/Makefile.in	2009-04-18 09:40:21.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/C/images/Makefile.in	2009-07-20 19:36:38.235721255 -0500
-@@ -313,7 +313,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/C/images
-+imagesdir = $(htmldir)/C/images
- images_DATA = \
- 	bulk-rename.png							\
- 	file-manager-window.png						\
-diff -Nur Thunar-1.0.1.orig/docs/manual/Makefile.in Thunar-1.0.1/docs/manual/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/Makefile.in	2009-04-18 09:40:22.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/Makefile.in	2009-07-20 19:36:38.235721255 -0500
-@@ -338,7 +338,7 @@
- 	tr								\
- 	zh_TW
- 
--cssdir = $(datadir)/doc/Thunar/html
-+cssdir = $(htmldir)
- css_DATA = \
- 	thunar.css
- 
-diff -Nur Thunar-1.0.1.orig/docs/manual/da/Makefile.in Thunar-1.0.1/docs/manual/da/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/da/Makefile.in	2009-04-18 09:40:22.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/da/Makefile.in	2009-07-20 19:36:38.239694094 -0500
-@@ -317,7 +317,7 @@
- SUBDIRS = \
- 	images
- 
--TARGET_DIR = $(datadir)/doc/Thunar/html/da
-+TARGET_DIR = $(htmldir)/da
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
- 
-diff -Nur Thunar-1.0.1.orig/docs/manual/da/images/Makefile.in Thunar-1.0.1/docs/manual/da/images/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/da/images/Makefile.in	2009-04-18 09:40:24.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/da/images/Makefile.in	2009-07-20 19:36:38.239694094 -0500
-@@ -311,7 +311,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/da/images
-+imagesdir = $(htmldir)/da/images
- images_DATA = \
- 	bulk-rename.png							\
- 	file-manager-window.png					\
-diff -Nur Thunar-1.0.1.orig/docs/manual/es/Makefile.in Thunar-1.0.1/docs/manual/es/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/es/Makefile.in	2009-04-18 09:40:24.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/es/Makefile.in	2009-07-20 19:36:38.239694094 -0500
-@@ -319,7 +319,7 @@
- SUBDIRS = \
- 	images
- 
--TARGET_DIR = $(datadir)/doc/Thunar/html/es
-+TARGET_DIR = $(htmldir)/es
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
- 
-diff -Nur Thunar-1.0.1.orig/docs/manual/es/images/Makefile.in Thunar-1.0.1/docs/manual/es/images/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/es/images/Makefile.in	2009-04-18 09:40:25.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/es/images/Makefile.in	2009-07-20 19:36:38.239694094 -0500
-@@ -313,7 +313,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/es/images
-+imagesdir = $(htmldir)/es/images
- images_DATA = \
- 	bulk-rename.png							\
- 	file-manager-window.png						\
-diff -Nur Thunar-1.0.1.orig/docs/manual/eu/Makefile.in Thunar-1.0.1/docs/manual/eu/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/eu/Makefile.in	2009-04-18 09:40:25.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/eu/Makefile.in	2009-07-20 19:36:38.239694094 -0500
-@@ -319,7 +319,7 @@
- SUBDIRS = \
- 	images
- 
--TARGET_DIR = $(datadir)/doc/Thunar/html/eu
-+TARGET_DIR = $(htmldir)/eu
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
- 
-diff -Nur Thunar-1.0.1.orig/docs/manual/eu/images/Makefile.in Thunar-1.0.1/docs/manual/eu/images/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/eu/images/Makefile.in	2009-04-18 09:40:26.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/eu/images/Makefile.in	2009-07-20 19:36:38.239694094 -0500
-@@ -313,7 +313,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/eu/images
-+imagesdir = $(htmldir)/eu/images
- images_DATA = \
- 	bulk-rename.png							\
- 	file-manager-window.png						\
-diff -Nur Thunar-1.0.1.orig/docs/manual/fr/Makefile.in Thunar-1.0.1/docs/manual/fr/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/fr/Makefile.in	2009-04-18 09:40:26.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/fr/Makefile.in	2009-07-20 19:36:38.243692845 -0500
-@@ -319,7 +319,7 @@
- SUBDIRS = \
- 	images
- 
--TARGET_DIR = $(datadir)/doc/Thunar/html/fr
-+TARGET_DIR = $(htmldir)/fr
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
- 
-diff -Nur Thunar-1.0.1.orig/docs/manual/fr/images/Makefile.in Thunar-1.0.1/docs/manual/fr/images/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/fr/images/Makefile.in	2009-04-18 09:40:27.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/fr/images/Makefile.in	2009-07-20 19:36:38.243692845 -0500
-@@ -313,7 +313,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/fr/images
-+imagesdir = $(htmldir)/fr/images
- images_DATA = \
- 	bulk-rename.png							\
- 	file-manager-window.png						\
-diff -Nur Thunar-1.0.1.orig/docs/manual/gl/Makefile.in Thunar-1.0.1/docs/manual/gl/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/gl/Makefile.in	2009-04-18 09:40:27.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/gl/Makefile.in	2009-07-20 19:36:38.243692845 -0500
-@@ -319,7 +319,7 @@
- SUBDIRS = \
- 	images
- 
--TARGET_DIR = $(datadir)/doc/Thunar/html/gl
-+TARGET_DIR = $(htmldir)/gl
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
- 
-diff -Nur Thunar-1.0.1.orig/docs/manual/gl/images/Makefile.in Thunar-1.0.1/docs/manual/gl/images/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/gl/images/Makefile.in	2009-04-18 09:40:29.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/gl/images/Makefile.in	2009-07-20 19:36:38.243692845 -0500
-@@ -313,7 +313,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/C/images
-+imagesdir = $(htmldir)/C/images
- images_DATA = \
- 	bulk-rename.png							\
- 	file-manager-window.png						\
-diff -Nur Thunar-1.0.1.orig/docs/manual/it/Makefile.in Thunar-1.0.1/docs/manual/it/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/it/Makefile.in	2009-04-18 09:40:30.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/it/Makefile.in	2009-07-20 19:36:38.243692845 -0500
-@@ -317,7 +317,7 @@
- SUBDIRS = \
- 	images
- 
--TARGET_DIR = $(datadir)/doc/Thunar/html/it
-+TARGET_DIR = $(htmldir)/it
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
- 
-diff -Nur Thunar-1.0.1.orig/docs/manual/it/images/Makefile.in Thunar-1.0.1/docs/manual/it/images/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/it/images/Makefile.in	2009-04-18 09:40:31.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/it/images/Makefile.in	2009-07-20 19:36:38.243692845 -0500
-@@ -311,7 +311,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/it/images
-+imagesdir = $(htmldir)/it/images
- images_DATA = \
- 	bulk-rename.png							\
- 	file-manager-window.png						\
-diff -Nur Thunar-1.0.1.orig/docs/manual/ja/Makefile.in Thunar-1.0.1/docs/manual/ja/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/ja/Makefile.in	2009-04-18 09:40:32.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/ja/Makefile.in	2009-07-20 19:36:38.247717296 -0500
-@@ -319,7 +319,7 @@
- SUBDIRS = \
- 	images
- 
--TARGET_DIR = $(datadir)/doc/Thunar/html/ja
-+TARGET_DIR = $(htmldir)/ja
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
- 
-diff -Nur Thunar-1.0.1.orig/docs/manual/ja/images/Makefile.in Thunar-1.0.1/docs/manual/ja/images/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/ja/images/Makefile.in	2009-04-18 09:40:33.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/ja/images/Makefile.in	2009-07-20 19:36:38.247717296 -0500
-@@ -313,7 +313,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/ja/images
-+imagesdir = $(htmldir)/ja/images
- images_DATA = \
- 	bulk-rename.png							\
- 	file-manager-window.png						\
-diff -Nur Thunar-1.0.1.orig/docs/manual/nl/Makefile.in Thunar-1.0.1/docs/manual/nl/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/nl/Makefile.in	2009-04-18 09:40:34.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/nl/Makefile.in	2009-07-20 19:36:38.247717296 -0500
-@@ -319,7 +319,7 @@
- SUBDIRS = \
- 	images
- 
--TARGET_DIR = $(datadir)/doc/Thunar/html/nl
-+TARGET_DIR = $(htmldir)/nl
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
- 
-diff -Nur Thunar-1.0.1.orig/docs/manual/nl/images/Makefile.in Thunar-1.0.1/docs/manual/nl/images/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/nl/images/Makefile.in	2009-04-18 09:40:34.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/nl/images/Makefile.in	2009-07-20 19:36:38.247717296 -0500
-@@ -313,7 +313,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/nl/images
-+imagesdir = $(htmldir)/nl/images
- images_DATA = \
- 	bulk-rename.png							\
- 	file-manager-window.png						\
-diff -Nur Thunar-1.0.1.orig/docs/manual/pl/Makefile.in Thunar-1.0.1/docs/manual/pl/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/pl/Makefile.in	2009-04-18 09:40:34.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/pl/Makefile.in	2009-07-20 19:36:38.247717296 -0500
-@@ -319,7 +319,7 @@
- SUBDIRS = \
- 	images
- 
--TARGET_DIR = $(datadir)/doc/Thunar/html/pl
-+TARGET_DIR = $(htmldir)/pl
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
- 
-diff -Nur Thunar-1.0.1.orig/docs/manual/pl/images/Makefile.in Thunar-1.0.1/docs/manual/pl/images/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/pl/images/Makefile.in	2009-04-18 09:40:34.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/pl/images/Makefile.in	2009-07-20 19:36:38.247717296 -0500
-@@ -313,7 +313,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/pl/images
-+imagesdir = $(htmldir)/pl/images
- images_DATA = \
- 	bulk-rename.png							\
- 	file-manager-window.png						\
-diff -Nur Thunar-1.0.1.orig/docs/manual/ru/Makefile.in Thunar-1.0.1/docs/manual/ru/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/ru/Makefile.in	2009-04-18 09:40:35.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/ru/Makefile.in	2009-07-20 19:36:38.251717303 -0500
-@@ -319,7 +319,7 @@
- SUBDIRS = \
- 	images
- 
--TARGET_DIR = $(datadir)/doc/Thunar/html/ru
-+TARGET_DIR = $(htmldir)/ru
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
- 
-diff -Nur Thunar-1.0.1.orig/docs/manual/ru/images/Makefile.in Thunar-1.0.1/docs/manual/ru/images/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/ru/images/Makefile.in	2009-04-18 09:40:35.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/ru/images/Makefile.in	2009-07-20 19:36:38.251717303 -0500
-@@ -313,7 +313,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/ru/images
-+imagesdir = $(htmldir)/ru/images
- images_DATA = \
- 	bulk-rename.png							\
- 	file-manager-window.png						\
-diff -Nur Thunar-1.0.1.orig/docs/manual/tr/Makefile.in Thunar-1.0.1/docs/manual/tr/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/tr/Makefile.in	2009-04-18 09:40:35.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/tr/Makefile.in	2009-07-20 19:36:38.251717303 -0500
-@@ -317,7 +317,7 @@
- SUBDIRS = \
- 	images
- 
--TARGET_DIR = $(datadir)/doc/Thunar/html/tr
-+TARGET_DIR = $(htmldir)/tr
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
- 
-diff -Nur Thunar-1.0.1.orig/docs/manual/tr/images/Makefile.in Thunar-1.0.1/docs/manual/tr/images/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/tr/images/Makefile.in	2009-04-18 09:40:36.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/tr/images/Makefile.in	2009-07-20 19:36:38.251717303 -0500
-@@ -311,7 +311,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/tr/images
-+imagesdir = $(htmldir)/tr/images
- images_DATA = \
- 	bulk-rename.png							\
- 	file-manager-window.png						\
-diff -Nur Thunar-1.0.1.orig/docs/manual/zh_TW/Makefile.in Thunar-1.0.1/docs/manual/zh_TW/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/zh_TW/Makefile.in	2009-04-18 09:40:36.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/zh_TW/Makefile.in	2009-07-20 19:36:38.251717303 -0500
-@@ -319,7 +319,7 @@
- SUBDIRS = \
- 	images
- 
--TARGET_DIR = $(datadir)/doc/Thunar/html/zh_TW
-+TARGET_DIR = $(htmldir)/zh_TW
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
- 
-diff -Nur Thunar-1.0.1.orig/docs/manual/zh_TW/images/Makefile.in Thunar-1.0.1/docs/manual/zh_TW/images/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/zh_TW/images/Makefile.in	2009-04-18 09:40:36.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/zh_TW/images/Makefile.in	2009-07-20 19:36:38.251717303 -0500
-@@ -313,7 +313,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/zh_TW/images
-+imagesdir = $(htmldir)/zh_TW/images
- images_DATA = \
- 	bulk-rename.png							\
- 	file-manager-window.png						\
diff --git a/source/xap/xfce/patches/thunar-1.0.1-png14.diff b/source/xap/xfce/patches/thunar-1.0.1-png14.diff
deleted file mode 100644
index 6c67a407..00000000
--- a/source/xap/xfce/patches/thunar-1.0.1-png14.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./thunar-vfs/thunar-vfs-thumb.c.orig	2009-01-12 14:38:49.000000000 -0600
-+++ ./thunar-vfs/thunar-vfs-thumb.c	2010-02-12 13:24:33.000000000 -0600
-@@ -1169,7 +1169,7 @@
-     goto done0;
- 
-   /* verify the png signature */
--  if (G_LIKELY (png_check_sig ((png_bytep) signature, sizeof (signature))))
-+  if (G_LIKELY (png_sig_cmp ((png_bytep) signature, 0, sizeof (signature)) == 0))
-     rewind (fp);
-   else
-     goto done0;
diff --git a/source/xap/xfce/patches/thunar-1.0.2-fixup_docdir.diff b/source/xap/xfce/patches/thunar-1.0.2-fixup_docdir.diff
new file mode 100644
index 00000000..7315ecea
--- /dev/null
+++ b/source/xap/xfce/patches/thunar-1.0.2-fixup_docdir.diff
@@ -0,0 +1,384 @@
+diff -Nur Thunar-1.0.2.orig//Makefile.in Thunar-1.0.2/Makefile.in
+--- Thunar-1.0.2.orig//Makefile.in	2010-05-21 12:11:02.000000000 -0500
++++ Thunar-1.0.2/Makefile.in	2010-05-23 17:44:59.068552125 -0500
+@@ -1040,7 +1040,7 @@
+ 
+ ThunarHelp: ThunarHelp.in Makefile
+ 	rm -f ThunarHelp.gen ThunarHelp
+-	sed -e "s,\@datadir\@,$(datadir),g" 				\
++	sed -e "s,\@htmldir\@,$(htmldir),g" 				\
+ 		< $(srcdir)/ThunarHelp.in				\
+ 		> ThunarHelp.gen
+ 	mv ThunarHelp.gen ThunarHelp
+diff -Nur Thunar-1.0.2.orig//ThunarHelp.in Thunar-1.0.2/ThunarHelp.in
+--- Thunar-1.0.2.orig//ThunarHelp.in	2010-05-21 12:10:52.000000000 -0500
++++ Thunar-1.0.2/ThunarHelp.in	2010-05-23 17:45:26.207677481 -0500
+@@ -19,7 +19,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ #
+ 
+-HELPDIR="@datadir@/doc/Thunar/html/"
++HELPDIR="@htmldir@/"
+ 
+ if test -n "$LC_ALL"; then
+   LC=$LC_ALL
+diff -Nur Thunar-1.0.2.orig//docs/Makefile.in Thunar-1.0.2/docs/Makefile.in
+--- Thunar-1.0.2.orig//docs/Makefile.in	2010-05-21 12:10:57.000000000 -0500
++++ Thunar-1.0.2/docs/Makefile.in	2010-05-23 17:46:08.776567272 -0500
+@@ -322,7 +322,7 @@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-docdir = $(datadir)/doc/Thunar
++docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+diff -Nur Thunar-1.0.2.orig//docs/manual/C/Makefile.in Thunar-1.0.2/docs/manual/C/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/C/Makefile.in	2010-05-21 12:10:57.000000000 -0500
++++ Thunar-1.0.2/docs/manual/C/Makefile.in	2010-05-23 17:46:52.539542089 -0500
+@@ -336,7 +336,7 @@
+ SUBDIRS = \
+ 	images
+ 
+-TARGET_DIR = $(datadir)/doc/Thunar/html/C
++TARGET_DIR = $(htmldir)/C
+ STYLESHEET = ../thunar.xsl
+ DOCUMENT = Thunar.xml
+ 
+diff -Nur Thunar-1.0.2.orig//docs/manual/C/images/Makefile.in Thunar-1.0.2/docs/manual/C/images/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/C/images/Makefile.in	2010-05-21 12:10:57.000000000 -0500
++++ Thunar-1.0.2/docs/manual/C/images/Makefile.in	2010-05-23 17:47:25.359542363 -0500
+@@ -316,7 +316,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ xfconf_query_found = @xfconf_query_found@
+-imagesdir = $(datadir)/doc/Thunar/html/C/images
++imagesdir = $(htmldir)/C/images
+ images_DATA = \
+ 	bulk-rename.png							\
+ 	file-manager-window.png						\
+diff -Nur Thunar-1.0.2.orig//docs/manual/Makefile.in Thunar-1.0.2/docs/manual/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/Makefile.in	2010-05-21 12:10:57.000000000 -0500
++++ Thunar-1.0.2/docs/manual/Makefile.in	2010-05-23 17:48:04.650570173 -0500
+@@ -370,7 +370,7 @@
+ 	tr								\
+ 	zh_TW
+ 
+-cssdir = $(datadir)/doc/Thunar/html
++cssdir = $(htmldir)
+ css_DATA = \
+ 	thunar.css
+ 
+diff -Nur Thunar-1.0.2.orig//docs/manual/am/Makefile.in Thunar-1.0.2/docs/manual/am/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/am/Makefile.in	2010-05-21 12:10:58.000000000 -0500
++++ Thunar-1.0.2/docs/manual/am/Makefile.in	2010-05-23 17:48:35.304542671 -0500
+@@ -336,7 +336,7 @@
+ SUBDIRS = \
+ 	images
+ 
+-TARGET_DIR = $(datadir)/doc/Thunar/html/am
++TARGET_DIR = $(htmldir)/am
+ STYLESHEET = ../thunar.xsl
+ DOCUMENT = Thunar.xml
+ 
+diff -Nur Thunar-1.0.2.orig//docs/manual/am/images/Makefile.in Thunar-1.0.2/docs/manual/am/images/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/am/images/Makefile.in	2010-05-21 12:10:58.000000000 -0500
++++ Thunar-1.0.2/docs/manual/am/images/Makefile.in	2010-05-23 17:51:21.111542305 -0500
+@@ -316,7 +316,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ xfconf_query_found = @xfconf_query_found@
+-imagesdir = $(datadir)/doc/Thunar/html/am/images
++imagesdir = $(htmldir)/am/images
+ images_DATA = \
+ 	bulk-rename.png							\
+ 	file-manager-window.png						\
+diff -Nur Thunar-1.0.2.orig//docs/manual/da/Makefile.in Thunar-1.0.2/docs/manual/da/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/da/Makefile.in	2010-05-21 12:10:58.000000000 -0500
++++ Thunar-1.0.2/docs/manual/da/Makefile.in	2010-05-23 17:48:52.108550193 -0500
+@@ -334,7 +334,7 @@
+ SUBDIRS = \
+ 	images
+ 
+-TARGET_DIR = $(datadir)/doc/Thunar/html/da
++TARGET_DIR = $(htmldir)/da
+ STYLESHEET = ../thunar.xsl
+ DOCUMENT = Thunar.xml
+ 
+diff -Nur Thunar-1.0.2.orig//docs/manual/da/images/Makefile.in Thunar-1.0.2/docs/manual/da/images/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/da/images/Makefile.in	2010-05-21 12:10:58.000000000 -0500
++++ Thunar-1.0.2/docs/manual/da/images/Makefile.in	2010-05-23 17:51:27.753542103 -0500
+@@ -314,7 +314,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ xfconf_query_found = @xfconf_query_found@
+-imagesdir = $(datadir)/doc/Thunar/html/da/images
++imagesdir = $(htmldir)/da/images
+ images_DATA = \
+ 	bulk-rename.png							\
+ 	file-manager-window.png					\
+diff -Nur Thunar-1.0.2.orig//docs/manual/es/Makefile.in Thunar-1.0.2/docs/manual/es/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/es/Makefile.in	2010-05-21 12:10:58.000000000 -0500
++++ Thunar-1.0.2/docs/manual/es/Makefile.in	2010-05-23 17:48:58.300552519 -0500
+@@ -336,7 +336,7 @@
+ SUBDIRS = \
+ 	images
+ 
+-TARGET_DIR = $(datadir)/doc/Thunar/html/es
++TARGET_DIR = $(htmldir)/es
+ STYLESHEET = ../thunar.xsl
+ DOCUMENT = Thunar.xml
+ 
+diff -Nur Thunar-1.0.2.orig//docs/manual/es/images/Makefile.in Thunar-1.0.2/docs/manual/es/images/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/es/images/Makefile.in	2010-05-21 12:10:58.000000000 -0500
++++ Thunar-1.0.2/docs/manual/es/images/Makefile.in	2010-05-23 17:51:34.373542961 -0500
+@@ -316,7 +316,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ xfconf_query_found = @xfconf_query_found@
+-imagesdir = $(datadir)/doc/Thunar/html/es/images
++imagesdir = $(htmldir)/es/images
+ images_DATA = \
+ 	bulk-rename.png							\
+ 	file-manager-window.png						\
+diff -Nur Thunar-1.0.2.orig//docs/manual/eu/Makefile.in Thunar-1.0.2/docs/manual/eu/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/eu/Makefile.in	2010-05-21 12:10:58.000000000 -0500
++++ Thunar-1.0.2/docs/manual/eu/Makefile.in	2010-05-23 17:49:05.977677434 -0500
+@@ -336,7 +336,7 @@
+ SUBDIRS = \
+ 	images
+ 
+-TARGET_DIR = $(datadir)/doc/Thunar/html/eu
++TARGET_DIR = $(htmldir)/eu
+ STYLESHEET = ../thunar.xsl
+ DOCUMENT = Thunar.xml
+ 
+diff -Nur Thunar-1.0.2.orig//docs/manual/eu/images/Makefile.in Thunar-1.0.2/docs/manual/eu/images/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/eu/images/Makefile.in	2010-05-21 12:10:58.000000000 -0500
++++ Thunar-1.0.2/docs/manual/eu/images/Makefile.in	2010-05-23 17:51:42.643542360 -0500
+@@ -316,7 +316,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ xfconf_query_found = @xfconf_query_found@
+-imagesdir = $(datadir)/doc/Thunar/html/eu/images
++imagesdir = $(htmldir)/eu/images
+ images_DATA = \
+ 	bulk-rename.png							\
+ 	file-manager-window.png						\
+diff -Nur Thunar-1.0.2.orig//docs/manual/fr/Makefile.in Thunar-1.0.2/docs/manual/fr/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/fr/Makefile.in	2010-05-21 12:10:58.000000000 -0500
++++ Thunar-1.0.2/docs/manual/fr/Makefile.in	2010-05-23 17:49:12.495542046 -0500
+@@ -336,7 +336,7 @@
+ SUBDIRS = \
+ 	images
+ 
+-TARGET_DIR = $(datadir)/doc/Thunar/html/fr
++TARGET_DIR = $(htmldir)/fr
+ STYLESHEET = ../thunar.xsl
+ DOCUMENT = Thunar.xml
+ 
+diff -Nur Thunar-1.0.2.orig//docs/manual/fr/images/Makefile.in Thunar-1.0.2/docs/manual/fr/images/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/fr/images/Makefile.in	2010-05-21 12:10:58.000000000 -0500
++++ Thunar-1.0.2/docs/manual/fr/images/Makefile.in	2010-05-23 17:51:51.116702819 -0500
+@@ -316,7 +316,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ xfconf_query_found = @xfconf_query_found@
+-imagesdir = $(datadir)/doc/Thunar/html/fr/images
++imagesdir = $(htmldir)/fr/images
+ images_DATA = \
+ 	bulk-rename.png							\
+ 	file-manager-window.png						\
+diff -Nur Thunar-1.0.2.orig//docs/manual/gl/Makefile.in Thunar-1.0.2/docs/manual/gl/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/gl/Makefile.in	2010-05-21 12:10:58.000000000 -0500
++++ Thunar-1.0.2/docs/manual/gl/Makefile.in	2010-05-23 17:49:19.882542284 -0500
+@@ -336,7 +336,7 @@
+ SUBDIRS = \
+ 	images
+ 
+-TARGET_DIR = $(datadir)/doc/Thunar/html/gl
++TARGET_DIR = $(htmldir)/gl
+ STYLESHEET = ../thunar.xsl
+ DOCUMENT = Thunar.xml
+ 
+diff -Nur Thunar-1.0.2.orig//docs/manual/gl/images/Makefile.in Thunar-1.0.2/docs/manual/gl/images/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/gl/images/Makefile.in	2010-05-21 12:10:58.000000000 -0500
++++ Thunar-1.0.2/docs/manual/gl/images/Makefile.in	2010-05-23 17:51:57.596588720 -0500
+@@ -316,7 +316,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ xfconf_query_found = @xfconf_query_found@
+-imagesdir = $(datadir)/doc/Thunar/html/gl/images
++imagesdir = $(htmldir)/gl/images
+ images_DATA = \
+ 	bulk-rename.png							\
+ 	file-manager-window.png						\
+diff -Nur Thunar-1.0.2.orig//docs/manual/it/Makefile.in Thunar-1.0.2/docs/manual/it/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/it/Makefile.in	2010-05-21 12:10:58.000000000 -0500
++++ Thunar-1.0.2/docs/manual/it/Makefile.in	2010-05-23 17:49:27.597676807 -0500
+@@ -334,7 +334,7 @@
+ SUBDIRS = \
+ 	images
+ 
+-TARGET_DIR = $(datadir)/doc/Thunar/html/it
++TARGET_DIR = $(htmldir)/it
+ STYLESHEET = ../thunar.xsl
+ DOCUMENT = Thunar.xml
+ 
+diff -Nur Thunar-1.0.2.orig//docs/manual/it/images/Makefile.in Thunar-1.0.2/docs/manual/it/images/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/it/images/Makefile.in	2010-05-21 12:10:58.000000000 -0500
++++ Thunar-1.0.2/docs/manual/it/images/Makefile.in	2010-05-23 17:52:05.152568701 -0500
+@@ -314,7 +314,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ xfconf_query_found = @xfconf_query_found@
+-imagesdir = $(datadir)/doc/Thunar/html/it/images
++imagesdir = $(htmldir)/it/images
+ images_DATA = \
+ 	bulk-rename.png							\
+ 	file-manager-window.png						\
+diff -Nur Thunar-1.0.2.orig//docs/manual/ja/Makefile.in Thunar-1.0.2/docs/manual/ja/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/ja/Makefile.in	2010-05-21 12:10:59.000000000 -0500
++++ Thunar-1.0.2/docs/manual/ja/Makefile.in	2010-05-23 17:49:35.728552141 -0500
+@@ -336,7 +336,7 @@
+ SUBDIRS = \
+ 	images
+ 
+-TARGET_DIR = $(datadir)/doc/Thunar/html/ja
++TARGET_DIR = $(htmldir)/ja
+ STYLESHEET = ../thunar.xsl
+ DOCUMENT = Thunar.xml
+ 
+diff -Nur Thunar-1.0.2.orig//docs/manual/ja/images/Makefile.in Thunar-1.0.2/docs/manual/ja/images/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/ja/images/Makefile.in	2010-05-21 12:10:59.000000000 -0500
++++ Thunar-1.0.2/docs/manual/ja/images/Makefile.in	2010-05-23 17:52:13.534542157 -0500
+@@ -316,7 +316,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ xfconf_query_found = @xfconf_query_found@
+-imagesdir = $(datadir)/doc/Thunar/html/ja/images
++imagesdir = $(htmldir)/ja/images
+ images_DATA = \
+ 	bulk-rename.png							\
+ 	file-manager-window.png						\
+diff -Nur Thunar-1.0.2.orig//docs/manual/nl/Makefile.in Thunar-1.0.2/docs/manual/nl/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/nl/Makefile.in	2010-05-21 12:10:59.000000000 -0500
++++ Thunar-1.0.2/docs/manual/nl/Makefile.in	2010-05-23 17:49:42.981677782 -0500
+@@ -336,7 +336,7 @@
+ SUBDIRS = \
+ 	images
+ 
+-TARGET_DIR = $(datadir)/doc/Thunar/html/nl
++TARGET_DIR = $(htmldir)/nl
+ STYLESHEET = ../thunar.xsl
+ DOCUMENT = Thunar.xml
+ 
+diff -Nur Thunar-1.0.2.orig//docs/manual/nl/images/Makefile.in Thunar-1.0.2/docs/manual/nl/images/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/nl/images/Makefile.in	2010-05-21 12:10:59.000000000 -0500
++++ Thunar-1.0.2/docs/manual/nl/images/Makefile.in	2010-05-23 17:52:19.353553300 -0500
+@@ -316,7 +316,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ xfconf_query_found = @xfconf_query_found@
+-imagesdir = $(datadir)/doc/Thunar/html/nl/images
++imagesdir = $(htmldir)/nl/images
+ images_DATA = \
+ 	bulk-rename.png							\
+ 	file-manager-window.png						\
+diff -Nur Thunar-1.0.2.orig//docs/manual/pl/Makefile.in Thunar-1.0.2/docs/manual/pl/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/pl/Makefile.in	2010-05-21 12:10:59.000000000 -0500
++++ Thunar-1.0.2/docs/manual/pl/Makefile.in	2010-05-23 17:49:51.863542378 -0500
+@@ -336,7 +336,7 @@
+ SUBDIRS = \
+ 	images
+ 
+-TARGET_DIR = $(datadir)/doc/Thunar/html/pl
++TARGET_DIR = $(htmldir)/pl
+ STYLESHEET = ../thunar.xsl
+ DOCUMENT = Thunar.xml
+ 
+diff -Nur Thunar-1.0.2.orig//docs/manual/pl/images/Makefile.in Thunar-1.0.2/docs/manual/pl/images/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/pl/images/Makefile.in	2010-05-21 12:10:59.000000000 -0500
++++ Thunar-1.0.2/docs/manual/pl/images/Makefile.in	2010-05-23 17:52:27.285677594 -0500
+@@ -316,7 +316,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ xfconf_query_found = @xfconf_query_found@
+-imagesdir = $(datadir)/doc/Thunar/html/pl/images
++imagesdir = $(htmldir)/pl/images
+ images_DATA = \
+ 	bulk-rename.png							\
+ 	file-manager-window.png						\
+diff -Nur Thunar-1.0.2.orig//docs/manual/ru/Makefile.in Thunar-1.0.2/docs/manual/ru/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/ru/Makefile.in	2010-05-21 12:10:59.000000000 -0500
++++ Thunar-1.0.2/docs/manual/ru/Makefile.in	2010-05-23 17:49:59.951552903 -0500
+@@ -336,7 +336,7 @@
+ SUBDIRS = \
+ 	images
+ 
+-TARGET_DIR = $(datadir)/doc/Thunar/html/ru
++TARGET_DIR = $(htmldir)/ru
+ STYLESHEET = ../thunar.xsl
+ DOCUMENT = Thunar.xml
+ 
+diff -Nur Thunar-1.0.2.orig//docs/manual/ru/images/Makefile.in Thunar-1.0.2/docs/manual/ru/images/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/ru/images/Makefile.in	2010-05-21 12:10:59.000000000 -0500
++++ Thunar-1.0.2/docs/manual/ru/images/Makefile.in	2010-05-23 17:52:33.673677284 -0500
+@@ -316,7 +316,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ xfconf_query_found = @xfconf_query_found@
+-imagesdir = $(datadir)/doc/Thunar/html/ru/images
++imagesdir = $(htmldir)/ru/images
+ images_DATA = \
+ 	bulk-rename.png							\
+ 	file-manager-window.png						\
+diff -Nur Thunar-1.0.2.orig//docs/manual/tr/Makefile.in Thunar-1.0.2/docs/manual/tr/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/tr/Makefile.in	2010-05-21 12:10:59.000000000 -0500
++++ Thunar-1.0.2/docs/manual/tr/Makefile.in	2010-05-23 17:50:08.415553080 -0500
+@@ -334,7 +334,7 @@
+ SUBDIRS = \
+ 	images
+ 
+-TARGET_DIR = $(datadir)/doc/Thunar/html/tr
++TARGET_DIR = $(htmldir)/tr
+ STYLESHEET = ../thunar.xsl
+ DOCUMENT = Thunar.xml
+ 
+diff -Nur Thunar-1.0.2.orig//docs/manual/tr/images/Makefile.in Thunar-1.0.2/docs/manual/tr/images/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/tr/images/Makefile.in	2010-05-21 12:10:59.000000000 -0500
++++ Thunar-1.0.2/docs/manual/tr/images/Makefile.in	2010-05-23 17:52:40.320542409 -0500
+@@ -314,7 +314,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ xfconf_query_found = @xfconf_query_found@
+-imagesdir = $(datadir)/doc/Thunar/html/tr/images
++imagesdir = $(htmldir)/tr/images
+ images_DATA = \
+ 	bulk-rename.png							\
+ 	file-manager-window.png						\
+diff -Nur Thunar-1.0.2.orig//docs/manual/zh_TW/Makefile.in Thunar-1.0.2/docs/manual/zh_TW/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/zh_TW/Makefile.in	2010-05-21 12:10:59.000000000 -0500
++++ Thunar-1.0.2/docs/manual/zh_TW/Makefile.in	2010-05-23 17:50:20.989569041 -0500
+@@ -336,7 +336,7 @@
+ SUBDIRS = \
+ 	images
+ 
+-TARGET_DIR = $(datadir)/doc/Thunar/html/zh_TW
++TARGET_DIR = $(htmldir)/zh_TW
+ STYLESHEET = ../thunar.xsl
+ DOCUMENT = Thunar.xml
+ 
+diff -Nur Thunar-1.0.2.orig//docs/manual/zh_TW/images/Makefile.in Thunar-1.0.2/docs/manual/zh_TW/images/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/zh_TW/images/Makefile.in	2010-05-21 12:10:59.000000000 -0500
++++ Thunar-1.0.2/docs/manual/zh_TW/images/Makefile.in	2010-05-23 17:52:47.172552372 -0500
+@@ -316,7 +316,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ xfconf_query_found = @xfconf_query_found@
+-imagesdir = $(datadir)/doc/Thunar/html/zh_TW/images
++imagesdir = $(htmldir)/zh_TW/images
+ images_DATA = \
+ 	bulk-rename.png							\
+ 	file-manager-window.png						\
diff --git a/source/xap/xfce/patches/thunar-fix_umask_properly.diff b/source/xap/xfce/patches/thunar-fix_umask_properly.diff
deleted file mode 100644
index 2070b580..00000000
--- a/source/xap/xfce/patches/thunar-fix_umask_properly.diff
+++ /dev/null
@@ -1,52 +0,0 @@
-commit eb58c6a6ba7f77c2c16016db064524df598ef421
-Author: Jannis Pohlmann <jannis@xfce.org>
-Date:   Sat Oct 3 11:49:41 2009 +0200
-
-    Fix bugs #3532 (umask < 0022 not honoured) and #5813 properly (I hope).
-    
-    The previous patch applied in e53de71e6add9b28ba034111a1d19db7def8f7e7
-    made things worse than before: it used DEFFILEMODE which seems to be
-    BSD-specific for creating files. It also reset the umask to 0 when
-    creating the first directory with _thunar_vfs_io_jobs_mkdir().
-    
-    What we really want is to use 0777 (dirs) and 0666 (files) and let the
-    standard C system calls like open() apply the umask value. This should
-    work on all POSIX-compliant systems.
-    
-    Patch provided by Craig Ringer <craig@postnewspapers.com.au>.
-
-diff --git a/thunar-vfs/thunar-vfs-io-jobs.c b/thunar-vfs/thunar-vfs-io-jobs.c
-index 8d70812..c94523a 100644
---- a/thunar-vfs/thunar-vfs-io-jobs.c
-+++ b/thunar-vfs/thunar-vfs-io-jobs.c
-@@ -432,8 +432,12 @@ _thunar_vfs_io_jobs_create (ThunarVfsJob *job,
-       absolute_path = thunar_vfs_path_dup_string (lp->data);
- 
- again:
--      /* try to create the file at the given path */
--      fd = g_open (absolute_path, O_CREAT | O_EXCL | O_WRONLY, DEFFILEMODE);
-+      /* Try to create the file at the given path.
-+       *
-+       * Note that despite the 0666 mask, we won't really create a world-writable
-+       * file unless the user's umask permits it (ie the umask is 0000).
-+       */
-+      fd = g_open (absolute_path, O_CREAT | O_EXCL | O_WRONLY, 0666);
-       if (G_UNLIKELY (fd < 0))
-         {
-           /* check if the file already exists */
-@@ -707,8 +711,13 @@ _thunar_vfs_io_jobs_mkdir (ThunarVfsJob *job,
-       /* update the progress information */
-       _thunar_vfs_job_process_path (job, lp);
- 
--      /* try to create the target directory */
--      if (!_thunar_vfs_io_ops_mkdir (lp->data, 0777 & ~umask(0), THUNAR_VFS_IO_OPS_NONE, error))
-+      /* try to create the target directory
-+       *
-+       * Note that the mode specified here is limited by the user's umask, so we will not
-+       * actually be creating a world writable directory unless the user's umask permits
-+       * it.
-+       */
-+      if (!_thunar_vfs_io_ops_mkdir (lp->data, 0777, THUNAR_VFS_IO_OPS_NONE, error))
-         return FALSE;
-     }
- 
diff --git a/source/xap/xfce/patches/xfce-utils-load_systemwide_Xmodmap.diff b/source/xap/xfce/patches/xfce-utils-load_systemwide_Xmodmap.diff
new file mode 100644
index 00000000..fde47a9e
--- /dev/null
+++ b/source/xap/xfce/patches/xfce-utils-load_systemwide_Xmodmap.diff
@@ -0,0 +1,11 @@
+diff -Nur xfce-utils-4.6.2.orig//scripts/xinitrc.in.in xfce-utils-4.6.2/scripts/xinitrc.in.in
+--- xfce-utils-4.6.2.orig//scripts/xinitrc.in.in	2010-05-21 11:56:26.000000000 -0500
++++ xfce-utils-4.6.2/scripts/xinitrc.in.in	2011-03-09 22:56:18.687297854 -0600
+@@ -97,6 +97,7 @@
+ cat /dev/null $XRESOURCES | xrdb -nocpp -merge -
+ 
+ # load local modmap
++test -r /etc/X11/xinit/.Xmodmap && xmodmap /etc/X11/xinit/.Xmodmap
+ test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
+ 
+ # Launch xscreensaver (if available), but only as non-root user
diff --git a/source/xap/xfce/patches/xfce-utils.xinitrc.consolekit.diff b/source/xap/xfce/patches/xfce-utils.xinitrc.consolekit.diff
index a8d5b2a5..206f6607 100644
--- a/source/xap/xfce/patches/xfce-utils.xinitrc.consolekit.diff
+++ b/source/xap/xfce/patches/xfce-utils.xinitrc.consolekit.diff
@@ -1,11 +1,15 @@
 --- ./scripts/xinitrc.in.in.orig	2009-04-09 18:21:13.000000000 -0500
-+++ ./scripts/xinitrc.in.in	2010-05-06 03:06:02.000000000 -0500
-@@ -131,7 +131,7 @@
++++ ./scripts/xinitrc.in.in	2010-06-18 11:33:37.000000000 -0500
+@@ -131,7 +131,11 @@
  	x|xno*)
  		;;
  	*)
 -		$xfcesm
-+		ck-launch-session $xfcesm
++                if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
++                        ck-launch-session $xfcesm
++                else
++                        $xfcesm
++                fi
  
  		if test $kill_sshagent -eq 1; then
  			eval `$sshagent -k`
diff --git a/source/xap/xfce/patches/xfce4-settings.libxklavier5.diff b/source/xap/xfce/patches/xfce4-settings.libxklavier5.diff
deleted file mode 100644
index d5f8ed8c..00000000
--- a/source/xap/xfce/patches/xfce4-settings.libxklavier5.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./dialogs/keyboard-settings/xfce-keyboard-settings.c.orig	2010-01-02 07:31:06.000000000 -0600
-+++ ./dialogs/keyboard-settings/xfce-keyboard-settings.c	2010-02-12 02:11:05.000000000 -0600
-@@ -457,7 +457,7 @@
- 
- #ifdef HAVE_LIBXKLAVIER
-   /* Stop xklavier engine */
--  xkl_engine_stop_listen (settings->priv->xkl_engine);
-+  xkl_engine_stop_listen (settings->priv->xkl_engine, XKLL_TRACK_KEYBOARD_STATE);
- #endif /* HAVE_LIBXKLAVIER */
- 
-   g_object_unref (settings->priv->provider);
diff --git a/source/xap/xfce/patches/xfsm-compat-kde.c-start-kde4-services.diff b/source/xap/xfce/patches/xfsm-compat-kde.c-start-kde4-services.diff
new file mode 100644
index 00000000..9c54cf9a
--- /dev/null
+++ b/source/xap/xfce/patches/xfsm-compat-kde.c-start-kde4-services.diff
@@ -0,0 +1,49 @@
+From 51ee1e872e8671bf439e5d391b86432904cbc5ef Mon Sep 17 00:00:00 2001
+From: Robby Workman <rworkman@slackware.com>
+Date: Sun, 6 Mar 2011 23:55:35 -0600
+Subject: [PATCH] xfsm-compat-kde.c: Start KDE4 services instead of KDE3
+
+---
+ xfce4-session/xfsm-compat-kde.c |   10 ++++------
+ 1 files changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/xfce4-session/xfsm-compat-kde.c b/xfce4-session/xfsm-compat-kde.c
+index ced6ece..b51387e 100644
+--- a/xfce4-session/xfsm-compat-kde.c
++++ b/xfce4-session/xfsm-compat-kde.c
+@@ -123,10 +123,10 @@ xfsm_compat_kde_startup (XfsmSplashScreen *splash)
+   if (G_LIKELY (splash != NULL))
+     xfsm_splash_screen_next (splash, _("Starting KDE services"));
+ 
+-  run ("kdeinit");
++  run ("kdeinit4");
+ 
+   /* tell klauncher about the session manager */
+-  g_snprintf (command, 256, "dcop klauncher klauncher setLaunchEnv "
++  g_snprintf (command, 256, "qdbus org.kde.klauncher /KLauncher setLaunchEnv "
+                             "SESSION_MANAGER \"%s\"",
+                             g_getenv ("SESSION_MANAGER"));
+   run (command);
+@@ -134,7 +134,7 @@ xfsm_compat_kde_startup (XfsmSplashScreen *splash)
+   /* tell kde if we are running multi-head */
+   if (gdk_display_get_n_screens (gdk_display_get_default ()) > 1)
+     {
+-      g_snprintf (command, 256, "dcop klauncher klauncher setLaunchEnv "
++      g_snprintf (command, 256, "qdbus org.kde.klauncher /KLauncher setLaunchEnv "
+                                 "KDE_MULTIHEAD \"true\"");
+       run (command);
+     }
+@@ -150,9 +150,7 @@ xfsm_compat_kde_shutdown (void)
+     return;
+ 
+   /* shutdown KDE services */
+-  run ("kdeinit_shutdown");
+-  run ("dcopserver_shutdown");
+-  run ("artsshell -q terminate");
++  run ("kdeinit4_shutdown");
+ 
+   kde_compat_started = FALSE;
+ }
+-- 
+1.7.4.1
+
diff --git a/source/xap/xfce/xfce.SlackBuild b/source/xap/xfce/xfce.SlackBuild
index a59aa949..aaa38f99 100755
--- a/source/xap/xfce/xfce.SlackBuild
+++ b/source/xap/xfce/xfce.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2003  Slackware Linux, Inc., Concord, CA, USA
-# Copyright 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,23 +21,34 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=4.6.1
-BUILD=${BUILD:-8}
+VERSION=4.6.2
+BUILD=${BUILD:-5}
 
 # A few tarballs have different versions; handle them here
-XDT_VERS=4.7.2		# xfce4-dev-tools version
-# We're going to ship xdt from git (targeting xfce-4.8) since it's not used 
-# for building release tarballs anyway, but it's handy to have around for
-# building from git, and some folks might want to do that later...
-EXO_VERS=0.3.106	# exo version
-THUNAR_VERS=1.0.1	# thunar version
+XDT_VERS=4.8.0		# xfce4-dev-tools version
+# We're going to ship xdt from xfce-4.8 since it's not used for building
+# release tarballs anyway, but it's handy to have around for building from 
+# git, and some folks might want to do that later...
+EXO_VERS=0.3.107	# exo version
+THUNAR_VERS=1.0.2	# thunar version
 GXE_VERS=2.6.0		# gtk-xfce-engine version
-TERM_VERS=0.4.4		# terminal version
+TERM_VERS=0.4.6		# terminal version
 MPAD_VERS=0.2.16	# mousepad version
+XFWM_VERS=4.6.2		# xfwm4 version
 XFWMTHEME_VERS=4.6.0	# xfwm4-themes version
-SETTINGS_VERS=4.6.4	# xfce4-settings version
-PANEL_VERS=4.6.3	# xfce4-panel version
-XFCEGUI_VERS=4.6.3	# libxfcegui4 version
+SETTINGS_VERS=4.6.5	# xfce4-settings version
+SESSION_VERS=4.6.2	# xfce4-settings version
+PANEL_VERS=4.6.4	# xfce4-panel version
+XFCEGUI_VERS=4.6.4	# libxfcegui4 version
+XFCEMENU_VERS=4.6.2	# libxfce4menu version
+LIBUTIL_VERS=4.6.2	# libxfce4util version
+UTILS_VERS=4.6.2	# xfce-utils version
+APPFINDER_VERS=4.6.2	# xfce4-appfinder version
+XFCONF_VERS=4.6.2	# xfconf version
+XFDESKTOP_VERS=4.6.2	# xfdesktop version
+MIXER_VERS=4.6.1	# xfce4-mixer version
+XFPRINT_VERS=4.6.1	# xfprint version
+ORAGE_VERS=4.6.1	# orage version
 
 NUMJOBS=${NUMJOBS:--j6}
 
@@ -76,32 +87,28 @@ cd $TMP || exit 1
 COMPRESSION=xz
 COMPRESSUTIL=xz
 
-# The Rodent theme isn't xdg-compliant, so they're not shipping it
-# xfce4-icon-theme-$VERSION.tar.$COMPRESSION
-# We'll set Tango as the system default instead...
-
 for file in \
  xfce4-dev-tools-$XDT_VERS.tar.$COMPRESSION \
- libxfce4util-$VERSION.tar.$COMPRESSION \
- xfconf-$VERSION.tar.$COMPRESSION \
+ libxfce4util-$LIBUTIL_VERS.tar.$COMPRESSION \
+ xfconf-$XFCONF_VERS.tar.$COMPRESSION \
  libxfcegui4-$XFCEGUI_VERS.tar.$COMPRESSION \
- libxfce4menu-$VERSION.tar.$COMPRESSION \
+ libxfce4menu-$XFCEMENU_VERS.tar.$COMPRESSION \
  exo-$EXO_VERS.tar.$COMPRESSION \
  xfce4-panel-$PANEL_VERS.tar.$COMPRESSION \
  Thunar-$THUNAR_VERS.tar.$COMPRESSION \
  xfce4-settings-$SETTINGS_VERS.tar.$COMPRESSION \
- xfce4-session-$VERSION.tar.$COMPRESSION \
- xfdesktop-$VERSION.tar.$COMPRESSION \
- xfwm4-$VERSION.tar.$COMPRESSION \
- xfce-utils-$VERSION.tar.$COMPRESSION \
- xfce4-mixer-$VERSION.tar.$COMPRESSION \
- xfprint-$VERSION.tar.$COMPRESSION \
- xfce4-appfinder-$VERSION.tar.$COMPRESSION \
+ xfce4-session-$SESSION_VERS.tar.$COMPRESSION \
+ xfdesktop-$XFDESKTOP_VERS.tar.$COMPRESSION \
+ xfwm4-$XFWM_VERS.tar.$COMPRESSION \
+ xfce-utils-$UTILS_VERS.tar.$COMPRESSION \
+ xfce4-mixer-$MIXER_VERS.tar.$COMPRESSION \
+ xfprint-$XFPRINT_VERS.tar.$COMPRESSION \
+ xfce4-appfinder-$APPFINDER_VERS.tar.$COMPRESSION \
  gtk-xfce-engine-$GXE_VERS.tar.$COMPRESSION \
  Terminal-$TERM_VERS.tar.$COMPRESSION \
  xfwm4-themes-$XFWMTHEME_VERS.tar.$COMPRESSION \
  mousepad-$MPAD_VERS.tar.$COMPRESSION \
- orage-$VERSION.tar.$COMPRESSION ;
+ orage-$ORAGE_VERS.tar.$COMPRESSION ;
 do
   $COMPRESSUTIL -dc $CWD/src/$file | tar xvf - || exit 1
   cd $(basename $file .tar.$COMPRESSION) || exit 1
@@ -115,31 +122,40 @@ do
     # Here's where we patch or set up any other package-specific stuff:
       # Patch to only show xfcalendar in XFce (otherwise it shows up in
       # KDE's Lost & Found and does not work):
-      if [ "$file" = "orage-$VERSION.tar.$COMPRESSION" ]; then
-        zcat $CWD/patches/xfcalendar.desktop.in.diff.gz | patch -p1 || exit 1
-      fi
-      # Fix Terminal's title bar and preferences problems with GTK+ 2.18:
-      if [ "$file" = "Terminal-$TERM_VERS.tar.$COMPRESSION" ]; then
-        zcat $CWD/patches/terminal.gtk.2.18.fix.diff.gz | patch -p1 || exit 1
+      if [ "$file" = "orage-$ORAGE_VERS.tar.$COMPRESSION" ]; then
+        zcat $CWD/patches/xfcalendar.desktop.in.diff.gz | patch -p1 --verbose || exit 1
       fi
       # Make Thunar respect --docdir
       if [ "$file" = "Thunar-$THUNAR_VERS.tar.$COMPRESSION" ]; then
-        zcat $CWD/patches/thunar-1.0.1-fixup_docdir.diff.gz | patch -p1 || exit 1
-        zcat $CWD/patches/thunar-fix_umask_properly.diff.gz | patch -p1 || exit 1
-        # Port to PNG 1.4.0:
-        zcat $CWD/patches/thunar-1.0.1-png14.diff.gz | patch -p1 || exit 1
+        zcat $CWD/patches/thunar-1.0.2-fixup_docdir.diff.gz | patch -p1 --verbose || exit 1
+        zcat $CWD/patches/Thunar.thunar-vfs-io-local.diff.gz | patch -p0 --verbose || exit 1
       fi
       # Fix the missing education icon in the desktop menu
-      if [ "$file" = "xfdesktop-$VERSION.tar.$COMPRESSION" ]; then
-        zcat $CWD/patches/xfdesktop-fix_education_icon.diff.gz | patch -p1 || exit 1
+      if [ "$file" = "xfdesktop-$XFDESKTOP_VERS.tar.$COMPRESSION" ]; then
+        zcat $CWD/patches/xfdesktop-fix_education_icon.diff.gz | patch -p1 --verbose || exit 1
+      fi
+      # 1) Launch xfce through consolekit so that ck enabled stuff works in xfce
+      # 2) Fix comments in /etc/xfce/xdg/xfce4/Xft.xrdb 
+      #    http://bugzilla.xfce.org/show_bug.cgi?id=6314
+      # 3) Load system-wide .Xmodmap, not just the one in $HOME
+      if [ "$file" = "xfce-utils-$UTILS_VERS.tar.$COMPRESSION" ]; then
+        zcat $CWD/patches/xfce-utils.xinitrc.consolekit.diff.gz | patch -p1 --verbose || exit 1
+        zcat $CWD/patches/fixup_comments_in_xfce-utils-Xft.xrdb.diff.gz | patch -p1 --verbose || exit 1
+        zcat $CWD/patches/xfce-utils-load_systemwide_Xmodmap.diff.gz | patch -p1 --verbose || exit 1
+      fi
+      # Fix a couple of bugs from mousepad git
+      if [ "$file" = "mousepad-$MPAD_VERS.tar.$COMPRESSION" ]; then
+        zcat $CWD/patches/mousepad-fix_find_and_replace.diff.gz | patch -p1 --verbose || exit 1
+        zcat $CWD/patches/mousepad-fix_find.diff.gz | patch -p1 --verbose || exit 1
       fi
-      # Port xfce4-settings to libxklavier-5.x:
-      if [ "$file" = "xfce4-settings-$SETTINGS_VERS.tar.$COMPRESSION" ]; then
-        zcat $CWD/patches/xfce4-settings.libxklavier5.diff.gz | patch -p1 || exit 1
+      # Fix a plugin moving bug in the panel
+      if [ "$file" = "xfce4-panel-$PANEL_VERS.tar.$COMPRESSION" ]; then
+        zcat $CWD/patches/no_sensitive_panel_during_plugin_moves.patch.gz | patch -p1 --verbose || exit 1
       fi
-      # Launch xfce through consolekit so that ck enabled stuff works in xfce:
-      if [ "$file" = "xfce-utils-$VERSION.tar.$COMPRESSION" ]; then
-        zcat $CWD/patches/xfce-utils.xinitrc.consolekit.diff.gz | patch -p1 || exit 1
+      # Start kde4 services instead of kde3
+      # http://bugzilla.xfce.org/show_bug.cgi?id=7382
+      if [ "$file" = "xfce4-session-$SESSION_VERS.tar.$COMPRESSION" ]; then
+        zcat $CWD/patches/xfsm-compat-kde.c-start-kde4-services.diff.gz | patch -p1 --verbose || exit 1
       fi
     # End patches/package-specific stuff
 
@@ -187,12 +203,12 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 
 # The Rodent icon theme isn't xdg compliant, so it spews errors quite often
 # and just flat breaks some things here and there, so the Xfce team elected
-# not to ship it with 4.6.0.   In the meantime, we'll default to Tango.
-sed -i s/Rodent/Tango/ \
+# not to ship it with 4.6.x.   In the meantime, we'll default to gnome.
+sed -i s/Rodent/gnome/ \
   $PKG/etc/xfce/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
 
 # We're going to borrow the "applications-education" icons (six of them)
-# from kde's oxygen icon theme (it's LGPL)
+# from the kde oxygen icon theme (it's LGPL)
 tar xf $CWD/icons.tar.xz -C $PKG/usr/share
 
 # We don't want any of those icon caches
diff --git a/source/xap/xgames/xgames.SlackBuild b/source/xap/xgames/xgames.SlackBuild
index e2514f81..e313d468 100755
--- a/source/xap/xgames/xgames.SlackBuild
+++ b/source/xap/xgames/xgames.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,8 +21,17 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=0.3
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-4}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -128,8 +137,8 @@ cp -a README.linux $PKG/usr/doc/xgames-$VERSION/xroach
 
 # Build xsnow:
 cd $TMP
-tar xvf $CWD/xsnow-1.40.tar.gz || exit 1
-cd xsnow-1.40 || exit 1
+tar xvf $CWD/xsnow-1.42.tar.gz || exit 1
+cd xsnow-1.42 || exit 1
 xmkmf
 make $NUMJOBS || make || exit 1
 cat xsnow > $PKG/usr/bin/xsnow
diff --git a/source/xap/xine-lib/xine-lib-1.1.17.ff.diff b/source/xap/xine-lib/xine-lib-1.1.17.ff.diff
deleted file mode 100644
index c08913ea..00000000
--- a/source/xap/xine-lib/xine-lib-1.1.17.ff.diff
+++ /dev/null
@@ -1,1044 +0,0 @@
---- ./src/combined/ffmpeg/ff_video_decoder.c.orig	2009-11-30 14:55:46.000000000 -0600
-+++ ./src/combined/ffmpeg/ff_video_decoder.c	2009-04-02 13:44:01.000000000 -0500
-@@ -1,25 +1,25 @@
- /*
-  * Copyright (C) 2001-2008 the xine project
-- *
-+ * 
-  * This file is part of xine, a free video player.
-- *
-+ * 
-  * xine 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.
-- *
-+ * 
-  * xine 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, USA
-  *
-  * xine video decoder plugin using ffmpeg
-  */
--
-+ 
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #include "../../libffmpeg/ffmpeg_config.h"
-@@ -73,7 +73,7 @@
-   int                     thread_count;
-   int8_t                  skip_loop_filter_enum;
-   int8_t                  choose_speed_over_accuracy;
--
-+  
-   xine_t                 *xine;
- } ff_video_class_t;
- 
-@@ -107,13 +107,13 @@
-   int               bufsize;
-   int               size;
-   int               skipframes;
--
-+  
-   int               slice_offset_size;
- 
-   AVFrame          *av_frame;
-   AVCodecContext   *context;
-   AVCodec          *codec;
--
-+  
-   int               pp_quality;
-   int               pp_flags;
-   pp_context_t     *pp_context;
-@@ -126,7 +126,7 @@
-   int               aspect_ratio_prio;
-   int               frame_flags;
-   int               crop_right, crop_bottom;
--
-+  
-   int               output_format;
- 
-   xine_list_t       *dr1_frames;
-@@ -154,7 +154,7 @@
-   vo_frame_t *img;
-   int width  = context->width;
-   int height = context->height;
--
-+        
-   if (!this->bih.biWidth || !this->bih.biHeight) {
-     this->bih.biWidth = width;
-     this->bih.biHeight = height;
-@@ -166,12 +166,12 @@
-       set_stream_info(this);
-     }
-   }
--
-+  
-   avcodec_align_dimensions(context, &width, &height);
- 
-   if( this->context->pix_fmt != PIX_FMT_YUV420P && this->context->pix_fmt != PIX_FMT_YUVJ420P ) {
-     if (!this->is_direct_rendering_disabled) {
--      xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
-+      xprintf(this->stream->xine, XINE_VERBOSITY_LOG, 
-               _("ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"));
-       this->is_direct_rendering_disabled = 1;
-     }
-@@ -182,14 +182,14 @@
-     av_frame->data[2]= NULL;
-     return avcodec_default_get_buffer(context, av_frame);
-   }
--
-+  
-   if((width != this->bih.biWidth) || (height != this->bih.biHeight)) {
-     if(this->stream->video_out->get_capabilities(this->stream->video_out) & VO_CAP_CROP) {
-       this->crop_right = width - this->bih.biWidth;
-       this->crop_bottom = height - this->bih.biHeight;
-     } else {
-       if (!this->is_direct_rendering_disabled) {
--        xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
-+        xprintf(this->stream->xine, XINE_VERBOSITY_LOG, 
-                 _("ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"));
-         this->is_direct_rendering_disabled = 1;
-       }
-@@ -204,7 +204,7 @@
-   img = this->stream->video_out->get_frame (this->stream->video_out,
-                                             width,
-                                             height,
--                                            this->aspect_ratio,
-+                                            this->aspect_ratio, 
-                                             this->output_format,
-                                             VO_BOTH_FIELDS|this->frame_flags);
- 
-@@ -246,7 +246,7 @@
-     }
- 
-     xine_list_iterator_t it;
--
-+    
-     it = xine_list_find(this->dr1_frames, av_frame);
-     assert(it);
-     if( it != NULL )
-@@ -300,7 +300,7 @@
-     }
- 
-   if (!this->codec) {
--    xprintf (this->stream->xine, XINE_VERBOSITY_LOG,
-+    xprintf (this->stream->xine, XINE_VERBOSITY_LOG, 
-             _("ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"),
-             codec_type);
-     _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HANDLED, 0);
-@@ -309,14 +309,14 @@
- 
-   lprintf("lavc decoder found\n");
- 
--  /* force (width % 8 == 0), otherwise there will be
--   * display problems with Xv.
--   */
-+  /* force (width % 8 == 0), otherwise there will be 
-+   * display problems with Xv. 
-+   */ 
-   this->bih.biWidth = (this->bih.biWidth + 1) & (~1);
- 
-   this->context->width = this->bih.biWidth;
-   this->context->height = this->bih.biHeight;
--  this->context->stream_codec_tag = this->context->codec_tag =
-+  this->context->stream_codec_tag = this->context->codec_tag = 
-     _x_stream_info_get(this->stream, XINE_STREAM_INFO_VIDEO_FOURCC);
- 
- 
-@@ -325,14 +325,14 @@
-   if(this->codec->capabilities & CODEC_CAP_DR1 && this->codec->id != CODEC_ID_H264) {
-     this->context->flags |= CODEC_FLAG_EMU_EDGE;
-   }
--
-+ 
-   if (this->class->choose_speed_over_accuracy)
-     this->context->flags2 |= CODEC_FLAG2_FAST;
- 
-   pthread_mutex_lock(&ffmpeg_lock);
-   if (avcodec_open (this->context, this->codec) < 0) {
-     pthread_mutex_unlock(&ffmpeg_lock);
--    xprintf (this->stream->xine, XINE_VERBOSITY_LOG,
-+    xprintf (this->stream->xine, XINE_VERBOSITY_LOG, 
-              _("ffmpeg_video_dec: couldn't open decoder\n"));
-     free(this->context);
-     this->context = NULL;
-@@ -340,22 +340,6 @@
-     return;
-   }
- 
--  if (this->codec->id == CODEC_ID_VC1 &&
--      (!this->bih.biWidth || !this->bih.biHeight)) {
--    /* VC1 codec must be re-opened with correct width and height. */
--    avcodec_close(this->context);
--
--    if (avcodec_open (this->context, this->codec) < 0) {
--      pthread_mutex_unlock(&ffmpeg_lock);
--      xprintf (this->stream->xine, XINE_VERBOSITY_LOG,
--	       _("ffmpeg_video_dec: couldn't open decoder (pass 2)\n"));
--      free(this->context);
--      this->context = NULL;
--      _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HANDLED, 0);
--      return;
--    }
--  }
--
-   if (this->class->thread_count > 1) {
-     avcodec_thread_init(this->context, this->class->thread_count);
-     this->context->thread_count = this->class->thread_count;
-@@ -384,14 +368,14 @@
-   (this->stream->video_out->open) (this->stream->video_out, this->stream);
- 
-   this->skipframes = 0;
--
-+  
-   /* enable direct rendering by default */
-   this->output_format = XINE_IMGFMT_YV12;
- #ifdef ENABLE_DIRECT_RENDERING
-   if( this->codec->capabilities & CODEC_CAP_DR1 && this->codec->id != CODEC_ID_H264 ) {
-     this->context->get_buffer = get_buffer;
-     this->context->release_buffer = release_buffer;
--    xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
-+    xprintf(this->stream->xine, XINE_VERBOSITY_LOG, 
- 	    _("ffmpeg_video_dec: direct rendering enabled\n"));
-   }
- #endif
-@@ -422,25 +406,25 @@
- 
- static void choose_speed_over_accuracy_cb(void *user_data, xine_cfg_entry_t *entry) {
-   ff_video_class_t   *class = (ff_video_class_t *) user_data;
--
-+  
-   class->choose_speed_over_accuracy = entry->num_value;
- }
- 
- static void skip_loop_filter_enum_cb(void *user_data, xine_cfg_entry_t *entry) {
-   ff_video_class_t   *class = (ff_video_class_t *) user_data;
--
-+  
-   class->skip_loop_filter_enum = entry->num_value;
- }
- 
- static void thread_count_cb(void *user_data, xine_cfg_entry_t *entry) {
-   ff_video_class_t   *class = (ff_video_class_t *) user_data;
--
-+  
-   class->thread_count = entry->num_value;
- }
- 
- static void pp_quality_cb(void *user_data, xine_cfg_entry_t *entry) {
-   ff_video_class_t   *class = (ff_video_class_t *) user_data;
--
-+  
-   class->pp_quality = entry->num_value;
- }
- 
-@@ -453,15 +437,15 @@
-                                         this->pp_flags);
-     if(this->pp_mode)
-       pp_free_mode(this->pp_mode);
--
--    this->pp_mode = pp_get_mode_by_name_and_quality("hb:a,vb:a,dr:a",
-+      
-+    this->pp_mode = pp_get_mode_by_name_and_quality("hb:a,vb:a,dr:a", 
-                                                     this->pp_quality);
-   } else {
-     if(this->pp_mode) {
-       pp_free_mode(this->pp_mode);
-       this->pp_mode = NULL;
-     }
--
-+    
-     if(this->pp_context) {
-       pp_free_context(this->pp_context);
-       this->pp_context = NULL;
-@@ -486,22 +470,22 @@
-       this->pp_available = 0;
-       break;
-   }
--
-+  
-   /* Detect what cpu accel we have */
-   cpu_caps = xine_mm_accel();
-   this->pp_flags = PP_FORMAT_420;
--
-+ 
-   if(cpu_caps & MM_ACCEL_X86_MMX)
-     this->pp_flags |= PP_CPU_CAPS_MMX;
--
-+    
-   if(cpu_caps & MM_ACCEL_X86_MMXEXT)
-     this->pp_flags |= PP_CPU_CAPS_MMX2;
--
--  if(cpu_caps & MM_ACCEL_X86_3DNOW)
-+  
-+  if(cpu_caps & MM_ACCEL_X86_3DNOW)  
-     this->pp_flags |= PP_CPU_CAPS_3DNOW;
--
-+   
-   /* Set level */
--  pp_change_quality(this);
-+  pp_change_quality(this);    
- }
- 
- static int ff_handle_mpeg_sequence(ff_video_decoder_t *this, mpeg_parser_t *parser) {
-@@ -510,13 +494,13 @@
-    * init codec
-    */
-   if (this->decoder_init_mode) {
--    _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC,
-+    _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, 
-                           "mpeg-1 (ffmpeg)");
- 
-     init_video_codec (this, BUF_VIDEO_MPEG);
-     this->decoder_init_mode = 0;
-   }
--
-+  
-   /* frame format change */
-   if ((parser->width != this->bih.biWidth) ||
-       (parser->height != this->bih.biHeight) ||
-@@ -542,7 +526,7 @@
-     xine_event_send(this->stream, &event);
-   }
-   this->video_step = this->mpeg_parser->frame_duration;
--
-+  
-   return 1;
- }
- 
-@@ -611,7 +595,7 @@
-       this->bih.biHeight);
- 
-   } else if (this->context->pix_fmt == PIX_FMT_RGB32) {
--
-+          
-     int x, plane_ptr = 0;
-     uint32_t *argb_pixels;
-     uint32_t argb;
-@@ -620,7 +604,7 @@
-       argb_pixels = (uint32_t *)sy;
-       for(x = 0; x < img->width; x++) {
-         uint8_t r, g, b;
--
-+              
-         /* this is endian-safe as the ARGB pixels are stored in
-          * machine order */
-         argb = *argb_pixels++;
-@@ -635,9 +619,9 @@
-       }
-       sy += this->av_frame->linesize[0];
-     }
--
-+            
-     yuv444_to_yuy2(&this->yuv, img->base[0], img->pitches[0]);
--
-+          
-   } else if (this->context->pix_fmt == PIX_FMT_RGB565) {
- 
-     int x, plane_ptr = 0;
-@@ -648,7 +632,7 @@
-       src = sy;
-       for(x = 0; x < img->width; x++) {
-         uint8_t r, g, b;
--
-+              
-         /* a 16-bit RGB565 pixel is supposed to be stored in native-endian
-          * byte order; the following should be endian-safe */
-         pixel16 = *((uint16_t *)src);
-@@ -664,20 +648,20 @@
-       }
-       sy += this->av_frame->linesize[0];
-     }
--
-+            
-     yuv444_to_yuy2(&this->yuv, img->base[0], img->pitches[0]);
--
-+          
-   } else if (this->context->pix_fmt == PIX_FMT_RGB555) {
--
-+          
-     int x, plane_ptr = 0;
-     uint8_t *src;
-     uint16_t pixel16;
--
-+            
-     for(y = 0; y < this->bih.biHeight; y++) {
-       src = sy;
-       for(x = 0; x < img->width; x++) {
-         uint8_t r, g, b;
--
-+              
-         /* a 16-bit RGB555 pixel is supposed to be stored in native-endian
-          * byte order; the following should be endian-safe */
-         pixel16 = *((uint16_t *)src);
-@@ -693,9 +677,9 @@
-       }
-       sy += this->av_frame->linesize[0];
-     }
--
-+            
-     yuv444_to_yuy2(&this->yuv, img->base[0], img->pitches[0]);
--
-+          
-   } else if (this->context->pix_fmt == PIX_FMT_BGR24) {
- 
-     int x, plane_ptr = 0;
-@@ -705,7 +689,7 @@
-       src = sy;
-       for(x = 0; x < img->width; x++) {
-         uint8_t r, g, b;
--
-+              
-         b = *src++;
-         g = *src++;
-         r = *src++;
-@@ -717,9 +701,9 @@
-       }
-       sy += this->av_frame->linesize[0];
-     }
--
-+            
-     yuv444_to_yuy2(&this->yuv, img->base[0], img->pitches[0]);
--
-+          
-   } else if (this->context->pix_fmt == PIX_FMT_RGB24) {
- 
-     int x, plane_ptr = 0;
-@@ -729,7 +713,7 @@
-       src = sy;
-       for(x = 0; x < img->width; x++) {
-         uint8_t r, g, b;
--
-+              
-         r = *src++;
-         g = *src++;
-         b = *src++;
-@@ -741,11 +725,11 @@
-       }
-       sy += this->av_frame->linesize[0];
-     }
--
-+            
-     yuv444_to_yuy2(&this->yuv, img->base[0], img->pitches[0]);
--
-+          
-   } else if (this->context->pix_fmt == PIX_FMT_PAL8) {
--
-+          
-     int x, plane_ptr = 0;
-     uint8_t *src;
-     uint8_t pixel;
-@@ -780,34 +764,34 @@
-       }
-       sy += this->av_frame->linesize[0];
-     }
--
-+            
-     yuv444_to_yuy2(&this->yuv, img->base[0], img->pitches[0]);
--
-+          
-   } else {
--
-+          
-     for (y = 0; y < this->bih.biHeight; y++) {
-       xine_fast_memcpy (dy, sy, img->width);
--
-+  
-       dy += img->pitches[0];
--
-+  
-       sy += this->av_frame->linesize[0];
-     }
- 
-     for (y = 0; y < this->bih.biHeight / 2; y++) {
--
-+      
-       if (this->context->pix_fmt != PIX_FMT_YUV444P) {
--
-+        
-         xine_fast_memcpy (du, su, img->width/2);
-         xine_fast_memcpy (dv, sv, img->width/2);
--
-+        
-       } else {
--
-+        
-         int x;
-         uint8_t *src;
-         uint8_t *dst;
--
-+      
-         /* subsample */
--
-+        
-         src = su; dst = du;
-         for (x=0; x<(img->width/2); x++) {
-           *dst = *src;
-@@ -822,7 +806,7 @@
-         }
- 
-       }
--
-+  
-       du += img->pitches[1];
-       dv += img->pitches[2];
- 
-@@ -840,8 +824,8 @@
- static void ff_check_bufsize (ff_video_decoder_t *this, int size) {
-   if (size > this->bufsize) {
-     this->bufsize = size + size / 2;
--    xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
--	    _("ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"),
-+    xprintf(this->stream->xine, XINE_VERBOSITY_LOG, 
-+	    _("ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"), 
- 	    this->bufsize);
-     this->buf = realloc(this->buf, this->bufsize + FF_INPUT_BUFFER_PADDING_SIZE );
-   }
-@@ -887,28 +871,28 @@
-     if (buf->decoder_flags & BUF_FLAG_STDHEADER) {
- 
-       lprintf("standard header\n");
--
-+    
-       /* init package containing bih */
-       memcpy ( &this->bih, this->buf, sizeof(xine_bmiheader) );
- 
-       if (this->bih.biSize > sizeof(xine_bmiheader)) {
-       this->context->extradata_size = this->bih.biSize - sizeof(xine_bmiheader);
--        this->context->extradata = malloc(this->context->extradata_size +
-+        this->context->extradata = malloc(this->context->extradata_size + 
-                                           FF_INPUT_BUFFER_PADDING_SIZE);
-         memcpy(this->context->extradata, this->buf + sizeof(xine_bmiheader),
-               this->context->extradata_size);
-       }
--
-+      
-       this->context->bits_per_sample = this->bih.biBitCount;
--
-+            
-     } else {
--
-+    
-       switch (codec_type) {
-       case BUF_VIDEO_RV10:
-       case BUF_VIDEO_RV20:
-         this->bih.biWidth  = _X_BE_16(&this->buf[12]);
-         this->bih.biHeight = _X_BE_16(&this->buf[14]);
--
-+        
-         this->context->sub_id = _X_BE_32(&this->buf[30]);
- 
-         this->context->slice_offset = calloc(SLICE_OFFSET_SIZE, sizeof(int));
-@@ -950,7 +934,7 @@
- }
- 
- static void ff_handle_special_buffer (ff_video_decoder_t *this, buf_element_t *buf) {
--  /* take care of all the various types of special buffers
-+  /* take care of all the various types of special buffers 
-   * note that order is important here */
-   lprintf("special buffer\n");
- 
-@@ -959,34 +943,34 @@
- 
-     lprintf("BUF_SPECIAL_STSD_ATOM\n");
-     this->context->extradata_size = buf->decoder_info[2];
--    this->context->extradata = malloc(buf->decoder_info[2] +
-+    this->context->extradata = malloc(buf->decoder_info[2] + 
- 				      FF_INPUT_BUFFER_PADDING_SIZE);
-     memcpy(this->context->extradata, buf->decoder_info_ptr[2],
-       buf->decoder_info[2]);
- 
-   } else if (buf->decoder_info[1] == BUF_SPECIAL_DECODER_CONFIG &&
-             !this->context->extradata_size) {
--
-+    
-     lprintf("BUF_SPECIAL_DECODER_CONFIG\n");
-     this->context->extradata_size = buf->decoder_info[2];
-     this->context->extradata = malloc(buf->decoder_info[2] +
- 				      FF_INPUT_BUFFER_PADDING_SIZE);
-     memcpy(this->context->extradata, buf->decoder_info_ptr[2],
-       buf->decoder_info[2]);
--
-+      
-   } else if (buf->decoder_info[1] == BUF_SPECIAL_PALETTE) {
-     unsigned int i;
- 
-     palette_entry_t *demuxer_palette;
-     AVPaletteControl *decoder_palette;
--
-+    
-     lprintf("BUF_SPECIAL_PALETTE\n");
-     this->context->palctrl = &this->palette_control;
-     decoder_palette = (AVPaletteControl *)this->context->palctrl;
-     demuxer_palette = (palette_entry_t *)buf->decoder_info_ptr[2];
- 
-     for (i = 0; i < buf->decoder_info[2]; i++) {
--      decoder_palette->palette[i] =
-+      decoder_palette->palette[i] = 
-         (demuxer_palette[i].r << 16) |
-         (demuxer_palette[i].g <<  8) |
-         (demuxer_palette[i].b <<  0);
-@@ -995,20 +979,20 @@
- 
-   } else if (buf->decoder_info[1] == BUF_SPECIAL_RV_CHUNK_TABLE) {
-     int i;
--
-+  
-     lprintf("BUF_SPECIAL_RV_CHUNK_TABLE\n");
-     this->context->slice_count = buf->decoder_info[2]+1;
- 
-     lprintf("slice_count=%d\n", this->context->slice_count);
--
-+    
-     if(this->context->slice_count > this->slice_offset_size) {
-       this->context->slice_offset = realloc(this->context->slice_offset,
-                                             sizeof(int)*this->context->slice_count);
-       this->slice_offset_size = this->context->slice_count;
-     }
--
-+    
-     for(i = 0; i < this->context->slice_count; i++) {
--      this->context->slice_offset[i] =
-+      this->context->slice_offset[i] = 
-         ((uint32_t *) buf->decoder_info_ptr[2])[(2*i)+1];
-       lprintf("slice_offset[%d]=%d\n", i, this->context->slice_offset[i]);
-     }
-@@ -1051,7 +1035,7 @@
- 
-     if (!this->decoder_ok)
-       return;
--
-+    
-     if (flush) {
-       lprintf("flush lavc buffers\n");
-       /* hack: ffmpeg outputs the last frame if size=0 */
-@@ -1069,11 +1053,11 @@
-             len, got_picture);
-     len = current - buf->content - offset;
-     lprintf("avcodec_decode_video: consumed_size=%d\n", len);
--
-+    
-     flush = next_flush;
- 
-     if ((len < 0) || (len > buf->size)) {
--      xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
-+      xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, 
-                 "ffmpeg_video_dec: error decompressing frame\n");
-       size = 0; /* draw a bad frame and exit */
-     } else {
-@@ -1088,7 +1072,7 @@
-         img = this->stream->video_out->get_frame (this->stream->video_out,
-                                                   this->bih.biWidth,
-                                                   this->bih.biHeight,
--                                                  this->aspect_ratio,
-+                                                  this->aspect_ratio, 
-                                                   this->output_format,
-                                                   VO_BOTH_FIELDS|this->frame_flags);
-         free_img = 1;
-@@ -1108,7 +1092,7 @@
- 
-       img->crop_right  = this->crop_right;
-       img->crop_bottom = this->crop_bottom;
--
-+      
-       this->skipframes = img->draw(img, this->stream);
- 
-       if(free_img)
-@@ -1121,7 +1105,7 @@
-         img = this->stream->video_out->get_frame (this->stream->video_out,
-                                                   this->bih.biWidth,
-                                                   this->bih.biHeight,
--                                                  this->aspect_ratio,
-+                                                  this->aspect_ratio, 
-                                                   this->output_format,
-                                                   VO_BOTH_FIELDS|this->frame_flags);
-         img->pts       = 0;
-@@ -1181,49 +1165,6 @@
-   }
- }
- 
--static int ff_vc1_find_header(ff_video_decoder_t *this, buf_element_t *buf)
--{
--  uint8_t *p = buf->content;
--
--  if (!p[0] && !p[1] && p[2] == 1 && p[3] == 0x0f) {
--    int i;
--
--    this->context->extradata = calloc(1, buf->size);
--    this->context->extradata_size = 0;
--
--    for (i = 0; i < buf->size && i < 128; i++) {
--      if (!p[i] && !p[i+1] && p[i+2]) {
--	lprintf("00 00 01 %02x at %d\n", p[i+3], i);
--	if (p[i+3] != 0x0e && p[i+3] != 0x0f)
--	  break;
--      }
--      this->context->extradata[i] = p[i];
--      this->context->extradata_size++;
--    }
--
--    lprintf("ff_video_decoder: found VC1 sequence header\n");
--    return 1;
--  }
--
--  xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
--	  "ffmpeg_video_dec: VC1 extradata missing !\n");
--  return 0;
--}
--
--static int ff_check_extradata(ff_video_decoder_t *this, unsigned int codec_type, buf_element_t *buf)
--{
--  if (this->context && this->context->extradata)
--    return 1;
--
--  switch (codec_type) {
--  case BUF_VIDEO_VC1:
--    return ff_vc1_find_header(this, buf);
--  default:;
--  }
--
--  return 1;
--}
--
- #endif /* AVCODEC_HAS_REORDERED_OPAQUE */
- static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) {
-   uint8_t *chunk_buf = this->buf;
-@@ -1235,9 +1176,6 @@
-     if (this->decoder_init_mode) {
-       int codec_type = buf->type & 0xFFFF0000;
- 
--      if (!ff_check_extradata(this, codec_type, buf))
--	return;
--
-       /* init ffmpeg decoder */
-       init_video_codec(this, codec_type);
-       init_postprocess(this);
-@@ -1256,8 +1194,7 @@
-   if (this->size == 0) {
-     /* take over pts when we are about to buffer a frame */
-     this->av_frame->reordered_opaque = ff_tag_pts(this, this->pts);
--    if (this->context) /* shouldn't be NULL */
--      this->context->reordered_opaque = ff_tag_pts(this, this->pts);
-+    this->context->reordered_opaque = ff_tag_pts(this, this->pts);
-     this->pts = 0;
-   }
- #endif /* AVCODEC_HAS_REORDERED_OPAQUE */
-@@ -1265,7 +1202,7 @@
-   /* data accumulation */
-   if (buf->size > 0) {
-     if ((this->size == 0) &&
--	((buf->size + FF_INPUT_BUFFER_PADDING_SIZE) < buf->max_size) &&
-+	((buf->size + FF_INPUT_BUFFER_PADDING_SIZE) < buf->max_size) && 
- 	(buf->decoder_flags & BUF_FLAG_FRAME_END)) {
-       /* buf contains a complete frame */
-       /* no memcpy needed */
-@@ -1278,7 +1215,7 @@
-       chunk_buf = this->buf; /* ff_check_bufsize might realloc this->buf */
- 
-       xine_fast_memcpy (&this->buf[this->size], buf->content, buf->size);
--
-+      
-       this->size += buf->size;
-       lprintf("accumulate data into this->buf\n");
-     }
-@@ -1301,7 +1238,7 @@
-     memset(&chunk_buf[this->size], 0, FF_INPUT_BUFFER_PADDING_SIZE);
- 
-     while (this->size > 0) {
--
-+      
-       /* DV frames can be completely skipped */
-       if( codec_type == BUF_VIDEO_DV && this->skipframes ) {
-         this->size = 0;
-@@ -1322,7 +1259,7 @@
- 
-         lprintf("consumed size: %d, got_picture: %d\n", len, got_picture);
-         if ((len <= 0) || (len > this->size)) {
--          xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
-+          xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, 
-                     "ffmpeg_video_dec: error decompressing frame\n");
-           this->size = 0;
- 
-@@ -1366,7 +1303,7 @@
-           this->bih.biHeight = this->context->height;
-         }
- 
--	this->aspect_ratio = av_q2d(this->context->sample_aspect_ratio) *
-+	this->aspect_ratio = av_q2d(this->context->sample_aspect_ratio) * 
- 	  (double)this->bih.biWidth / (double)this->bih.biHeight;
- 	this->aspect_ratio_prio = 2;
- 	lprintf("ffmpeg aspect ratio: %f\n", this->aspect_ratio);
-@@ -1405,7 +1342,7 @@
-           img = this->stream->video_out->get_frame (this->stream->video_out,
-                                                     (this->bih.biWidth  + 15) & ~15,
-                                                     (this->bih.biHeight + 15) & ~15,
--                                                    this->aspect_ratio,
-+                                                    this->aspect_ratio, 
-                                                     this->output_format,
-                                                     VO_BOTH_FIELDS|this->frame_flags);
-           free_img = 1;
-@@ -1426,17 +1363,17 @@
-             img = this->stream->video_out->get_frame (this->stream->video_out,
-                                                       (img->width  + 15) & ~15,
-                                                       (img->height + 15) & ~15,
--                                                      this->aspect_ratio,
-+                                                      this->aspect_ratio, 
-                                                       this->output_format,
-                                                       VO_BOTH_FIELDS|this->frame_flags);
-             free_img = 1;
-           }
- 
--          pp_postprocess(this->av_frame->data, this->av_frame->linesize,
--                        img->base, img->pitches,
-+          pp_postprocess(this->av_frame->data, this->av_frame->linesize, 
-+                        img->base, img->pitches, 
-                         img->width, img->height,
-                         this->av_frame->qscale_table, this->av_frame->qstride,
--                        this->pp_mode, this->pp_context,
-+                        this->pp_mode, this->pp_context, 
-                         this->av_frame->pict_type);
- 
-         } else if (!this->av_frame->opaque) {
-@@ -1476,7 +1413,7 @@
-         img->top_field_first   = this->av_frame->top_field_first;
- 
-         this->skipframes = img->draw(img, this->stream);
--
-+        
-         if(free_img)
-           img->free(img);
-       }
-@@ -1490,7 +1427,7 @@
-       img = this->stream->video_out->get_frame (this->stream->video_out,
-                                                 (this->bih.biWidth  <= 0) ? 16 : ((this->bih.biWidth  + 15) & ~15),
-                                                 (this->bih.biHeight <= 0) ? 16 : ((this->bih.biHeight + 15) & ~15),
--                                                this->aspect_ratio,
-+                                                this->aspect_ratio, 
-                                                 this->output_format,
-                                                 VO_BOTH_FIELDS|this->frame_flags);
-       /* set PTS to allow early syncing */
-@@ -1520,7 +1457,7 @@
- static void ff_decode_data (video_decoder_t *this_gen, buf_element_t *buf) {
-   ff_video_decoder_t *this = (ff_video_decoder_t *) this_gen;
- 
--  lprintf ("processing packet type = %08x, len = %d, decoder_flags=%08x\n",
-+  lprintf ("processing packet type = %08x, len = %d, decoder_flags=%08x\n", 
-            buf->type, buf->size, buf->decoder_flags);
- 
-   if (buf->decoder_flags & BUF_FLAG_FRAMERATE) {
-@@ -1529,7 +1466,7 @@
-   }
- 
-   if (buf->decoder_flags & BUF_FLAG_PREVIEW) {
--
-+  
-     ff_handle_preview_buffer(this, buf);
- 
-   } else {
-@@ -1537,7 +1474,7 @@
-     if (buf->decoder_flags & BUF_FLAG_SPECIAL) {
- 
-       ff_handle_special_buffer(this, buf);
--
-+		     
-     }
- 
-     if (buf->decoder_flags & BUF_FLAG_HEADER) {
-@@ -1551,7 +1488,7 @@
- 	  lprintf("aspect ratio: %f\n", this->aspect_ratio);
- 	  set_stream_info(this);
- 	}
--      }
-+      }  
- 
-     } else {
- 
-@@ -1582,7 +1519,7 @@
- 
-   if(this->context && this->decoder_ok)
-     avcodec_flush_buffers(this->context);
--
-+  
-   if (this->is_mpeg12)
-     mpeg_parser_reset(this->mpeg_parser);
- 
-@@ -1596,14 +1533,14 @@
- 
- static void ff_discontinuity (video_decoder_t *this_gen) {
-   ff_video_decoder_t *this = (ff_video_decoder_t *) this_gen;
--
-+  
-   lprintf ("ff_discontinuity\n");
-   this->pts = 0;
- 
- #ifdef AVCODEC_HAS_REORDERED_OPAQUE
-   /*
-    * there is currently no way to reset all the pts which are stored in the decoder.
--   * therefore, we add a unique tag (generated from pts_tag_counter) to pts (see
-+   * therefore, we add a unique tag (generated from pts_tag_counter) to pts (see 
-    * ff_tag_pts()) and wait for it to appear on returned frames.
-    * until then, any retrieved pts value will be reset to 0 (see ff_untag_pts()).
-    * when we see the tag returned, pts_tag will be reset to 0. from now on, any
-@@ -1640,15 +1577,15 @@
-   ff_video_decoder_t *this = (ff_video_decoder_t *) this_gen;
- 
-   lprintf ("ff_dispose\n");
--
-+  
-   if (this->decoder_ok) {
-     xine_list_iterator_t it;
-     AVFrame *av_frame;
--
-+        
-     pthread_mutex_lock(&ffmpeg_lock);
-     avcodec_close (this->context);
-     pthread_mutex_unlock(&ffmpeg_lock);
--
-+    
-     /* frame garbage collector here - workaround for buggy ffmpeg codecs that
-      * don't release their DR1 frames */
-     while( (it = xine_list_front(this->dr1_frames)) != NULL )
-@@ -1656,7 +1593,7 @@
-       av_frame = (AVFrame *)xine_list_get_value(this->dr1_frames, it);
-       release_buffer(this->context, av_frame);
-     }
--
-+    
-     this->stream->video_out->close(this->stream->video_out, this->stream);
-     this->decoder_ok = 0;
-   }
-@@ -1669,27 +1606,27 @@
- 
-   if(this->yuv_init)
-     free_yuv_planes(&this->yuv);
--
-+  
-   if( this->context )
-     av_free( this->context );
- 
-   if( this->av_frame )
-     av_free( this->av_frame );
--
-+  
-   if (this->buf)
-     free(this->buf);
-   this->buf = NULL;
--
-+  
-   if(this->pp_context)
-     pp_free_context(this->pp_context);
--
-+    
-   if(this->pp_mode)
-     pp_free_mode(this->pp_mode);
- 
-   mpeg_parser_dispose(this->mpeg_parser);
--
-+    
-   xine_list_delete(this->dr1_frames);
--
-+  
-   free (this_gen);
- }
- 
-@@ -1715,7 +1652,7 @@
-   this->context           = avcodec_alloc_context();
-   this->context->opaque   = this;
-   this->context->palctrl  = NULL;
--
-+  
-   this->decoder_ok        = 0;
-   this->decoder_init_mode = 1;
-   this->buf               = calloc(1, VIDEOBUFSIZE + FF_INPUT_BUFFER_PADDING_SIZE);
-@@ -1727,9 +1664,9 @@
-   this->pp_quality        = 0;
-   this->pp_context        = NULL;
-   this->pp_mode           = NULL;
--
-+  
-   this->mpeg_parser       = NULL;
--
-+  
-   this->dr1_frames        = xine_list_new();
- 
- #ifdef LOG
-@@ -1755,7 +1692,7 @@
- 
-   ff_video_class_t *this;
-   config_values_t  *config;
--
-+  
-   this = calloc(1, sizeof (ff_video_class_t));
- 
-   this->decoder_class.open_plugin     = ff_video_open_plugin;
-@@ -1765,12 +1702,12 @@
-   this->xine                          = xine;
- 
-   pthread_once( &once_control, init_once_routine );
--
-+  
-   /* Configuration for post processing quality - default to mid (3) for the
-    * moment */
-   config = xine->config;
--
--  this->pp_quality = xine->config->register_range(config, "video.processing.ffmpeg_pp_quality", 3,
-+  
-+  this->pp_quality = xine->config->register_range(config, "video.processing.ffmpeg_pp_quality", 3, 
-     0, PP_QUALITY_MAX,
-     _("MPEG-4 postprocessing quality"),
-     _("You can adjust the amount of post processing applied to MPEG-4 video.\n"
-@@ -1779,8 +1716,8 @@
-       "too heavy post processing can actually make the image worse by blurring it "
-       "too much."),
-     10, pp_quality_cb, this);
--
--  this->thread_count = xine->config->register_num(config, "video.processing.ffmpeg_thread_count", 1,
-+  
-+  this->thread_count = xine->config->register_num(config, "video.processing.ffmpeg_thread_count", 1, 
-     _("FFmpeg video decoding thread count"),
-     _("You can adjust the number of video decoding threads which FFmpeg may use.\n"
-       "Higher values should speed up decoding but it depends on the codec used "
-@@ -1789,7 +1726,7 @@
-       "A change of this setting will take effect with playing the next stream."),
-     10, thread_count_cb, this);
- 
--  this->skip_loop_filter_enum = xine->config->register_enum(config, "video.processing.ffmpeg_skip_loop_filter", 0,
-+  this->skip_loop_filter_enum = xine->config->register_enum(config, "video.processing.ffmpeg_skip_loop_filter", 0, 
-     (char **)skip_loop_filter_enum_names,
-     _("Skip loop filter"),
-     _("You can control for which frames the loop filter shall be skipped after "
-@@ -1800,7 +1737,7 @@
-       "A change of this setting will take effect with playing the next stream."),
-     10, skip_loop_filter_enum_cb, this);
- 
--  this->choose_speed_over_accuracy = xine->config->register_bool(config, "video.processing.ffmpeg_choose_speed_over_accuracy", 0,
-+  this->choose_speed_over_accuracy = xine->config->register_bool(config, "video.processing.ffmpeg_choose_speed_over_accuracy", 0, 
-     _("Choose speed over specification compliance"),
-     _("You may want to allow speed cheats which violate codec specification.\n"
-       "Cheating may speed up decoding but can also lead to decoding artefacts.\n"
-@@ -1810,14 +1747,14 @@
-   return this;
- }
- 
--static uint32_t wmv8_video_types[] = {
-+static uint32_t wmv8_video_types[] = { 
-   BUF_VIDEO_WMV8,
--  0
-+  0 
- };
- 
--static uint32_t wmv9_video_types[] = {
-+static uint32_t wmv9_video_types[] = { 
-   BUF_VIDEO_WMV9,
--  0
-+  0 
- };
- 
- decoder_info_t dec_info_ffmpeg_video = {
diff --git a/source/xap/xine-lib/xine-lib.SlackBuild b/source/xap/xine-lib/xine-lib.SlackBuild
index 50bc2ede..c1127593 100755
--- a/source/xap/xine-lib/xine-lib.SlackBuild
+++ b/source/xap/xine-lib/xine-lib.SlackBuild
@@ -22,11 +22,11 @@
 
 
 # Version on the tarball
-VERSION=1.1.17
+VERSION=1.1.19
 # Version used in the source directory to cd into
-DIRVER=1.1.17
+DIRVER=1.1.19
 # Version used for the Slackware package
-PKGVER=1.1.17
+PKGVER=1.1.19
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -59,12 +59,10 @@ mkdir -p $TMP $PKG/usr
 
 cd $TMP
 rm -rf xine-lib-$VERSION
-tar xvf $CWD/xine-lib-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/xine-lib-$VERSION.tar.xz || exit 1
 cd xine-lib-$DIRVER || exit 1
 
-# revert to xine-lib-1.1.16.3 ffmpeg video decoder...
-# the new one doesn't compile:
-zcat $CWD/xine-lib-1.1.17.ff.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/xine-lib.XvMClib.h.diff.gz | patch -p1 --verbose || exit 1
 
 chown -R root:root .
 find . \
diff --git a/source/xap/xine-lib/xine-lib.XvMClib.h.diff b/source/xap/xine-lib/xine-lib.XvMClib.h.diff
new file mode 100644
index 00000000..663e7a76
--- /dev/null
+++ b/source/xap/xine-lib/xine-lib.XvMClib.h.diff
@@ -0,0 +1,22 @@
+diff -u -r --new-file xine-lib-1.1.19.orig/src/video_out/video_out_xxmc.c xine-lib-1.1.19/src/video_out/video_out_xxmc.c
+--- xine-lib-1.1.19.orig/src/video_out/video_out_xxmc.c	2010-04-08 09:52:43.000000000 -0500
++++ xine-lib-1.1.19/src/video_out/video_out_xxmc.c	2010-11-06 16:01:34.278017097 -0500
+@@ -35,6 +35,7 @@
+ 
+ 
+ #include "xxmc.h"
++#include <X11/extensions/XvMClib.h>
+ #include <unistd.h>
+ #include "xv_common.h"
+ 
+diff -u -r --new-file xine-lib-1.1.19.orig/src/video_out/xvmc_mocomp.c xine-lib-1.1.19/src/video_out/xvmc_mocomp.c
+--- xine-lib-1.1.19.orig/src/video_out/xvmc_mocomp.c	2010-03-09 16:17:05.000000000 -0600
++++ xine-lib-1.1.19/src/video_out/xvmc_mocomp.c	2010-11-06 16:01:34.272017924 -0500
+@@ -21,6 +21,7 @@
+  */
+ 
+ #include "xxmc.h"
++#include <X11/extensions/XvMClib.h>
+ 
+ 
+ static void calc_DMV(int DMV[][2], int *dmvector,
diff --git a/source/xap/xlockmore/xlockmore.SlackBuild b/source/xap/xlockmore/xlockmore.SlackBuild
index f25bf14e..09ce261f 100755
--- a/source/xap/xlockmore/xlockmore.SlackBuild
+++ b/source/xap/xlockmore/xlockmore.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,19 +21,36 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=5.28
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+PKGNAM=xlockmore
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC -lcrypt"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-xlockmore
@@ -74,14 +91,13 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --without-dtsaver \
   --without-ttf \
-  --without-gtk \
   --without-rplay \
   --without-nas \
   --disable-bomb \
   --without-motif \
   --without-esound \
   --without-gtk \
-  $ARCH-slackware-linux
+  --build=$ARCH-slackware-linux
 
 make $NUMJOBS || make || exit 1
 cd xlock
diff --git a/source/xap/xpdf/patches/xpdf-3.02pl5.patch b/source/xap/xpdf/patches/xpdf-3.02pl5.patch
new file mode 100644
index 00000000..558eac55
--- /dev/null
+++ b/source/xap/xpdf/patches/xpdf-3.02pl5.patch
@@ -0,0 +1,41 @@
+*** xpdf-3.02.orig/xpdf/Gfx.cc	Tue Feb 27 14:05:52 2007
+--- xpdf-3.02/xpdf/Gfx.cc	Mon Oct 11 15:39:52 2010
+***************
+*** 461,466 ****
+--- 461,467 ----
+      baseMatrix[i] = state->getCTM()[i];
+    }
+    formDepth = 0;
++   parser = NULL;
+    abortCheckCbk = abortCheckCbkA;
+    abortCheckCbkData = abortCheckCbkDataA;
+  
+***************
+*** 500,505 ****
+--- 501,507 ----
+      baseMatrix[i] = state->getCTM()[i];
+    }
+    formDepth = 0;
++   parser = NULL;
+    abortCheckCbk = abortCheckCbkA;
+    abortCheckCbkData = abortCheckCbkDataA;
+  
+*** xpdf-3.02.orig/fofi/FoFiType1.cc	Tue Feb 27 14:05:51 2007
+--- xpdf-3.02/fofi/FoFiType1.cc	Mon Oct 11 15:44:13 2010
+***************
+*** 224,230 ****
+  		code = code * 8 + (*p2 - '0');
+  	      }
+  	    }
+! 	    if (code < 256) {
+  	      for (p = p2; *p == ' ' || *p == '\t'; ++p) ;
+  	      if (*p == '/') {
+  		++p;
+--- 224,230 ----
+  		code = code * 8 + (*p2 - '0');
+  	      }
+  	    }
+! 	    if (code >= 0 && code < 256) {
+  	      for (p = p2; *p == ' ' || *p == '\t'; ++p) ;
+  	      if (*p == '/') {
+  		++p;
diff --git a/source/xap/xpdf/patches/xpdf-3.02pl6.patch b/source/xap/xpdf/patches/xpdf-3.02pl6.patch
new file mode 100644
index 00000000..b3649102
--- /dev/null
+++ b/source/xap/xpdf/patches/xpdf-3.02pl6.patch
@@ -0,0 +1 @@
+# There is not a patch 6...  just a recompile without t1lib
diff --git a/source/xap/xpdf/slack-desc b/source/xap/xpdf/slack-desc
index 164302aa..58072776 100644
--- a/source/xap/xpdf/slack-desc
+++ b/source/xap/xpdf/slack-desc
@@ -12,7 +12,7 @@ xpdf: Xpdf is a viewer for Portable Document Format (PDF) files.
 xpdf:
 xpdf: xpdf was written by Derek B. Noonburg.
 xpdf:
-xpdf: The xpdf package requires the t1lib package to render Type 1 fonts.
+xpdf:
 xpdf:
 xpdf:
 xpdf:
diff --git a/source/xap/xpdf/xpdf.SlackBuild b/source/xap/xpdf/xpdf.SlackBuild
index 5acf7c06..b19b3aca 100755
--- a/source/xap/xpdf/xpdf.SlackBuild
+++ b/source/xap/xpdf/xpdf.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,8 +22,8 @@
 
 
 VERSION=3.02
-PATCHLEVEL=pl4
-BUILD=${BUILD:-2}
+PATCHLEVEL=pl6
+BUILD=${BUILD:-3}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -75,6 +75,7 @@ cat $CWD/patches/xpdf-3.02pl1.patch | patch -p1 --verbose || exit 1
 cat $CWD/patches/xpdf-3.02pl2.patch | patch -p1 --verbose || exit 1
 cat $CWD/patches/xpdf-3.02pl3.patch | patch -p1 --verbose || exit 1
 cat $CWD/patches/xpdf-3.02pl4.patch | patch -p1 --verbose || exit 1
+cat $CWD/patches/xpdf-3.02pl5.patch | patch -p1 --verbose || exit 1
 zcat $CWD/patches/xpdf_3.02-1.3.diff.gz | patch -p1 --verbose || exit 1
 zcat $CWD/patches/xpdfrc.diff.gz | patch -p1 --verbose || exit 1
 
@@ -87,6 +88,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --with-gzip \
   --with-freetype2-includes=/usr/include/freetype2 \
+  --without-t1-library \
   --build=$ARCH-slackware-linux
 
 make $NUMJOBS || make || exit 1
diff --git a/source/xap/xsane/xsane.SlackBuild b/source/xap/xsane/xsane.SlackBuild
index 444700c5..1b711715 100755
--- a/source/xap/xsane/xsane.SlackBuild
+++ b/source/xap/xsane/xsane.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,8 +21,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=0.996
-BUILD=${BUILD:-2}
+VERSION=0.998
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -54,7 +54,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf xsane-$VERSION
-tar xvf $CWD/xsane-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/xsane-$VERSION.tar.?z* || exit 1
 cd xsane-$VERSION || exit 1
 chown -R root:root .
 find . \
diff --git a/source/xap/xscreensaver/xscreensaver.SlackBuild b/source/xap/xscreensaver/xscreensaver.SlackBuild
index 6d01ced0..57943911 100755
--- a/source/xap/xscreensaver/xscreensaver.SlackBuild
+++ b/source/xap/xscreensaver/xscreensaver.SlackBuild
@@ -77,7 +77,6 @@ find . \
   -exec chmod 644 {} \;
 
 xml_config=/usr/bin/xml-config xml2_config=/usr/bin/xml2-config \
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/source/xap/xxgdb/xxgdb-1.08-glibc.patch b/source/xap/xxgdb/xxgdb-1.08-glibc.patch
new file mode 100644
index 00000000..6ec7032c
--- /dev/null
+++ b/source/xap/xxgdb/xxgdb-1.08-glibc.patch
@@ -0,0 +1,10 @@
+--- xxgdb/calldbx.c.ewt	Thu Aug 29 15:39:07 1996
++++ xxgdb/calldbx.c	Thu Aug 29 15:39:31 1996
+@@ -76,6 +76,7 @@
+ #include "global.h"
+ #if !(defined(OLDSUNOS) || defined(BSD))
+ #include <termio.h>
++#include <sys/ioctl.h>
+ #else
+ #include <sgtty.h>
+ #endif
diff --git a/source/xap/xxgdb/xxgdb-1.12-debian-filemenu.patch b/source/xap/xxgdb/xxgdb-1.12-debian-filemenu.patch
new file mode 100644
index 00000000..c8595731
--- /dev/null
+++ b/source/xap/xxgdb/xxgdb-1.12-debian-filemenu.patch
@@ -0,0 +1,10 @@
+--- xxgdb-1.12/filemenu.c.build	2009-03-29 12:26:26.000000000 +0200
++++ xxgdb-1.12/filemenu.c	2009-03-29 12:26:26.000000000 +0200
+@@ -83,6 +83,7 @@
+ 
+ #ifdef SYSV 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <sys/param.h>
+ #include <sys/types.h>
+ #include <dirent.h>
diff --git a/source/xap/xxgdb/xxgdb-1.12-debian-pty.patch b/source/xap/xxgdb/xxgdb-1.12-debian-pty.patch
new file mode 100644
index 00000000..7a56971f
--- /dev/null
+++ b/source/xap/xxgdb/xxgdb-1.12-debian-pty.patch
@@ -0,0 +1,76 @@
+diff -urNad xxgdb-1.12~/calldbx.c xxgdb-1.12/calldbx.c
+--- xxgdb-1.12~/calldbx.c	1996-10-02 10:59:45.000000000 +0200
++++ xxgdb-1.12/calldbx.c	2008-05-16 17:44:05.000000000 +0200
+@@ -85,8 +85,10 @@
+ #include        <sys/un.h>
+ #endif /* CREATE_IO_WINDOW */
+ 
+-#ifdef SVR4
++#if defined(SVR4) || defined(UNIX98)
+ #define MASTER_CLONE "/dev/ptmx"
++#endif
++#ifdef SVR4
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/stropts.h>
+@@ -125,13 +127,14 @@
+ {
+     int master;
+     
+-#ifdef SVR4				/* (MJH) Use STREAMS */
++#if defined(SVR4) || defined(UNIX98)
+ 
+     if((master = open(MASTER_CLONE, O_RDWR)) < 0)
+ 	perror(MASTER_CLONE);
+     else
+ 	return master;
+-#else
++#endif
++#if !defined(SVR4) && !defined(UNIX98)
+     int  i;
+     char c;
+ 
+@@ -150,7 +153,7 @@
+ #ifndef sco
+ 	}
+ #endif
+-#endif /* SVR4 */
++#endif /* !defined(SVR4) && !defined(UNIX98) */
+ 
+ #ifdef GDB
+     fprintf(stderr, "xxgdb: all ptys in use\n");
+@@ -166,6 +169,25 @@
+ {
+     int slave;
+ 
++#if defined(UNIX98)
++
++    int n;
++    int zero=0;
++    char ptsname[16];
++
++    if (ioctl(master, TIOCGPTN, &n) < 0)
++	exit(2);
++    snprintf(ptsname,sizeof(ptsname),"/dev/pts/%i", n);
++    if (ioctl(master, TIOCSPTLCK, &zero) < 0)
++	exit(3);
++    if ((slave = open(ptsname, O_RDWR)) < 0) {
++	perror(ptsname);
++	exit(4);
++    }
++    return slave;
++
++#else
++    
+ #ifdef SVR4				/* (MJH) */
+     char *slave_name = "unknown";
+     extern char *ptsname(int master);
+@@ -193,6 +215,8 @@
+ 	    }
+     return slave;
+ #endif /* SVR4 */
++
++#endif /* UNIX98 */
+ }
+ 
+ #ifdef CREATE_IO_WINDOW 
diff --git a/source/xap/xxgdb/xxgdb-1.12-mandriva.patch b/source/xap/xxgdb/xxgdb-1.12-mandriva.patch
new file mode 100644
index 00000000..3d384f32
--- /dev/null
+++ b/source/xap/xxgdb/xxgdb-1.12-mandriva.patch
@@ -0,0 +1,993 @@
+diff -p -up xxgdb-1.12/command.c.orig xxgdb-1.12/command.c
+--- xxgdb-1.12/command.c.orig	2010-05-06 21:43:37.932032547 -0300
++++ xxgdb-1.12/command.c	2010-05-06 21:43:56.618036569 -0300
+@@ -74,7 +74,7 @@
+  *
+  *    forwardSearch() :		forward string search
+  *    reverseSearch() :		reverse string search
+- *    Search() :		call either forwardSearch() or reverseSearch()
++ *    search() :		call either forwardSearch() or reverseSearch()
+  *    PopupSearch() :		command callback for search button
+  *    DoneSearch() :		command callback for DONE button in search panel
+  *    CreateSearchPopup() :	create search panel
+@@ -657,10 +657,8 @@ void PopupSearch(w, client_data, call_da
+  *  If no text has been entered, the contents of the cut buffer are used
+  *  for searching.
+  */ 
+-static void Search(w, direction, call_data)
+-    Widget w;
+-    XtPointer direction;
+-    XtPointer call_data;
++static void
++search(Widget w, XtPointer direction, XtPointer call_data)
+ {
+     XawTextBlock    	textblock;
+     XawTextPosition	pos, left, right;
+@@ -716,7 +714,7 @@ static void Activate(w, event, params, n
+     String *params;
+     Cardinal *num_params;
+ {
+-    Search(w, (XtPointer)FORWARD, NULL);
++    search(w, (XtPointer)FORWARD, NULL);
+     DoneSearch(w, (XtPointer)searchPopupShell, NULL);
+ }
+ 
+@@ -747,8 +745,8 @@ static void CreateSearchPopup()
+     searchPopup = XtCreateManagedWidget("searchPopup", dialogWidgetClass, 
+ 	searchPopupShell, args, n);
+     
+-    AddButton(searchPopup, "<<", Search, (XtPointer) REVERSE);
+-    AddButton(searchPopup, ">>", Search, (XtPointer) FORWARD);
++    AddButton(searchPopup, "<<", search, (XtPointer) REVERSE);
++    AddButton(searchPopup, ">>", search, (XtPointer) FORWARD);
+     AddButton(searchPopup, "DONE", DoneSearch, (XtPointer)searchPopupShell);
+ 
+     dialogValue = XtNameToWidget(searchPopup, "value");
+diff -p -up xxgdb-1.12/dialog.c.orig xxgdb-1.12/dialog.c
+--- xxgdb-1.12/dialog.c.orig	2010-05-06 21:43:37.934032296 -0300
++++ xxgdb-1.12/dialog.c	2010-05-06 21:44:28.258027728 -0300
+@@ -86,6 +86,12 @@ Boolean FalseSignal = FALSE;		/* set to
+ static char DialogText[DIALOGSIZE];	/* text buffer for widget */
+ static XawTextPosition  StartPos;      	/* starting position of input text */
+ 
++static XawTextEditType
++BeginDelete(Widget w);
++
++static void
++EndDelete(Widget w, XawTextEditType type);
++
+ 
+ /*  This procedure prevents the user from deleting past the prompt, or
+  *  any text appended by AppendDialogText() to the dialog window.
+@@ -94,11 +100,8 @@ static XawTextPosition  StartPos;
+  *  character() can only delete the space character.
+  */
+ /* ARGSUSED */
+-static void InsertSpace(w, event, params, num_params)
+-    Widget w;
+-    XEvent *event;
+-    String *params;
+-    Cardinal *num_params;
++void
++InsertSpace(Widget w, XEvent *event, String *params, Cardinal *num_params)
+ {
+     XawTextBlock    textblock;
+     XawTextPosition lastPos;
+@@ -115,16 +118,70 @@ static void InsertSpace(w, event, params
+     }
+ }
+ 
++static XawTextEditType
++BeginDelete(Widget w)
++{
++    Widget		src;
++    XawTextEditType	type;
++    Arg			args[1];
++
++    src = XawTextGetSource(w);
++    XtSetArg(args[0], XtNeditType, &type);
++    XtGetValues(src, args, 1);
++    if (type != XawtextEdit) {
++	XtSetArg(args[0], XtNeditType, XawtextEdit);
++	XtSetValues(src, args, 1);
++    }
++
++    return (type);
++}
++
++static void
++EndDelete(Widget w, XawTextEditType type)
++{
++    Widget		src;
++    Arg			args[1];
++
++    if (type != XawtextEdit) {
++	src = XawTextGetSource(w);
++	XtSetArg(args[0], XtNeditType, type);
++	XtSetValues(src, args, 1);
++    }
++}
++
++/*
++ * Previous logic of calling actions:
++ *	InsertSpace() delete-previous-char()
++ * is not going to work because it must create a text in append only
++ * mode, so, hack it here to actually delete a character...
++ */
++void
++DeleteChar(Widget w, XEvent *event, String *params, Cardinal *num_params)
++{
++    XawTextEditType	type;
++    XawTextBlock	block;
++    XawTextPosition	point;
++
++    if (StartPos < (point = XawTextGetInsertionPoint(w))) {
++	type = BeginDelete(w);
++	block.firstPos = 0;
++	block.length = 0;
++	block.ptr = "";
++	block.format = 8;
++	XawTextReplace(w, point - 1, point, &block);
++	XawTextSetInsertionPoint(w, point - 1);
++	EndDelete(w, type);
++    }
++}
++
+ /*  Erases the preceding word.
+  *  Simulates the action of the WERASE character (ctrl-W).
+  */
+ /* ARGSUSED */
+-void DeleteWord(w, event, params, num_params)
+-    Widget w;
+-    XEvent *event;
+-    String *params;
+-    Cardinal *num_params;
++void
++DeleteWord(Widget w, XEvent *event, String *params, Cardinal *num_params)
+ {
++    XawTextEditType	type;
+     XawTextBlock    	textblock;
+     XawTextPosition	pos;
+     Cardinal	 	i;
+@@ -138,8 +195,10 @@ void DeleteWord(w, event, params, num_pa
+         pos = TextGetLastPos(w); 
+     for (i=pos; i > StartPos && DialogText[i-1] == ' '; i--);
+     for (; i > StartPos && DialogText[i-1] != ' '; i--);
++    type = BeginDelete(w);
+     XawTextReplace(w, i, pos, &textblock);
+     XawTextSetInsertionPoint(w, i);
++    EndDelete(w, type);
+ }
+ 
+ 
+@@ -147,12 +206,10 @@ void DeleteWord(w, event, params, num_pa
+  *  simulates the action of the KILL character (ctrl-U).
+  */
+ /* ARGSUSED */
+-void DeleteLine(w, event, params, num_params)
+-    Widget w;
+-    XEvent *event;
+-    String *params;
+-    Cardinal *num_params;
++void
++DeleteLine(Widget w, XEvent *event, String *params, Cardinal *num_params)
+ {
++    XawTextEditType	type;
+     XawTextBlock    	textblock;
+     XawTextPosition 	pos, beginPos;
+     Cardinal	 	i;
+@@ -172,8 +229,10 @@ void DeleteLine(w, event, params, num_pa
+ 		return;
+ 	}
+     for (i=pos; i > beginPos && s[i-1] != '\n'; i--);
++    type = BeginDelete(w);
+     XawTextReplace(w, i, pos, &textblock);
+     XawTextSetInsertionPoint(w, i);
++    EndDelete(w, type);
+ }
+ 
+ 
+@@ -183,11 +242,8 @@ void DeleteLine(w, event, params, num_pa
+  *  it is stored in the global variable, Command.
+  */
+ /* ARGSUSED */
+-static void Dispatch(w, event, params, num_params)
+-    Widget w;
+-    XEvent *event;
+-    String *params;
+-    Cardinal *num_params; 
++void
++Dispatch(Widget w, XEvent *event, String *params, Cardinal *num_params)
+ {
+ #ifdef GDB
+ 	/* 
+@@ -249,22 +305,16 @@ void signal_interrupt_dbx()
+  *  Simulates the action of the INTR character (ctrl-C).
+  */
+ /* ARGSUSED */
+-static void SigInt(w, event, params, num_params)
+-    Widget w;
+-    XEvent *event;
+-    String *params;
+-    Cardinal *num_params;
++void
++SigInt(Widget w, XEvent *event, String *params, Cardinal *num_params)
+ {
+   signal_interrupt_dbx ();
+ }
+ 
+ /*  Sends an EOF signal to dbx. (ctrl-D) */
+ /* ARGSUSED */
+-static void SigEof(w, event, params, num_params)
+-    Widget w;
+-    XEvent *event;
+-    String *params;
+-    Cardinal *num_params;
++void
++SigEof(Widget w, XEvent *event, String *params, Cardinal *num_params)
+ {
+     write_dbx("\04");
+ }
+@@ -274,11 +324,8 @@ static void SigEof(w, event, params, num
+  *  Simulates the action of the QUIT character (ctrl-\) 
+  */
+ /* ARGSUSED */
+-static void SigQuit(w, event, params, num_params)
+-    Widget w;
+-    XEvent *event;
+-    String *params;
+-    Cardinal *num_params;
++void
++SigQuit(Widget w, XEvent *event, String *params, Cardinal *num_params)
+ {
+     FalseSignal = TRUE;
+ 
+@@ -301,29 +348,8 @@ Widget parent;
+     Arg 	args[MAXARGS];
+     Cardinal 	n;
+ 
+-    static XtActionsRec dialog_actions[] = {
+-	{"SigInt", 	(XtActionProc) SigInt},
+-	{"SigEof", 	(XtActionProc) SigEof},
+-	{"SigQuit", 	(XtActionProc) SigQuit},
+-	{"InsertSpace", (XtActionProc) InsertSpace},
+-	{"Dispatch", 	(XtActionProc) Dispatch},
+-        {NULL, NULL}
+-    };
+-
+-    static String translations = "#override\n\
+- 	Ctrl<Key>C:	SigInt()\n\
+- 	Ctrl<Key>D:	SigEof()\n\
+- 	Ctrl<Key>|:	SigQuit()\n\
+- 	Ctrl<Key>W:	DeleteWord()\n\
+- 	Ctrl<Key>U:	DeleteLine()\n\
+- 	Ctrl<Key>H:	InsertSpace() delete-previous-character()\n\
+- 	<Key>Delete:	InsertSpace() delete-previous-character()\n\
+- 	<Key>BackSpace:	InsertSpace() delete-previous-character()\n\
+- 	<Key>Return:	newline() Dispatch()\n\
+-    ";
+-
+     n = 0;
+-    XtSetArg(args[n], XtNuseStringInPlace, True);                       n++;
++    XtSetArg(args[n], XtNuseStringInPlace, True);			n++;
+     XtSetArg(args[n], XtNstring, (XtArgVal) DialogText);		n++;
+     XtSetArg(args[n], XtNlength, (XtArgVal) DIALOGSIZE);		n++;
+     XtSetArg(args[n], XtNeditType, (XtArgVal) XawtextAppend);		n++;
+@@ -331,8 +357,6 @@ Widget parent;
+     XtSetArg(args[n], XtNwrap, XawtextWrapWord);			n++;
+     dialogWindow = XtCreateManagedWidget("dialogWindow", asciiTextWidgetClass,
+ 					 parent, args, n );
+-    XtOverrideTranslations(dialogWindow, XtParseTranslationTable(translations));
+-    XtAppAddActions(app_context, dialog_actions, XtNumber(dialog_actions));
+ }
+ 
+ #if 0 /* never used */
+diff -p -up xxgdb-1.12/gdb_parser.c.orig xxgdb-1.12/gdb_parser.c
+--- xxgdb-1.12/gdb_parser.c.orig	2010-05-06 21:43:37.936032292 -0300
++++ xxgdb-1.12/gdb_parser.c	2010-05-06 21:44:36.001027757 -0300
+@@ -1053,7 +1053,6 @@ FILE *f;
+ 			if(errno == EAGAIN || errno == EWOULDBLOCK) {
+ 				break;
+ 			}
+-			perror("read from gdb");
+ 			exit(1);
+ 			/*NOTREACHED*/
+ 		}
+diff -p -up xxgdb-1.12/global.h.orig xxgdb-1.12/global.h
+--- xxgdb-1.12/global.h.orig	2010-05-06 21:43:37.938031470 -0300
++++ xxgdb-1.12/global.h	2010-05-06 21:44:48.480028375 -0300
+@@ -111,10 +111,34 @@ extern void 		read_dbx();		/* get data f
+ extern void 		write_dbx();		/* send data to dbx */
+ extern void		query_dbx();		/* ask dbx for info */
+ 
++extern void
++PopupSearch(Widget w, XtPointer client_data, XtPointer call_data);
++
+ /* dialog.c */
++extern void
++DeleteChar(Widget w, XEvent *event, String *params, Cardinal *num_params);
++
++extern void
++DeleteLine(Widget w, XEvent *event, String *params, Cardinal *num_params);
++
++extern void
++DeleteWord(Widget w, XEvent *event, String *params, Cardinal *num_params);
++
++extern void
++Dispatch(Widget w, XEvent *event, String *params, Cardinal *num_params);
++
++extern void
++InsertSpace(Widget w, XEvent *event, String *params, Cardinal *num_params);
++
++extern void
++SigInt(Widget w, XEvent *event, String *params, Cardinal *num_params);
++
++extern void
++SigEof(Widget w, XEvent *event, String *params, Cardinal *num_params);
++
++extern void
++SigQuit(Widget w, XEvent *event, String *params, Cardinal *num_params);
+ 
+-extern void		DeleteLine();		/* delete line action proc */
+-extern void		DeleteWord();		/* delete word action proc */
+ extern void		CreateDialogWindow();
+ extern void 		AppendDialogText();	/* append text to buffer */
+ 
+@@ -163,18 +187,53 @@ extern void 		UpdateUpdown();		/* update
+ extern void 		UpdateBomb();		/* update position of bomb */
+ 
+ /* source.c */
++extern void
++CreateSourceWindow(Widget parent);
++
++extern char *
++GetPathname(char *filename);
++
++extern int
++LoadCurrentFile(void);
++
++extern int
++LoadFile(char *filename);
++
++extern void
++MakeDirList(char *output);
++
++extern void
++NotifyResize(Widget w, XEvent *event, String *params, Cardinal *num_params);
++
++extern void
++PrintSelection(Widget w, XEvent *event, String *params, Cardinal *num_params);
++
++extern void
++Search(Widget w, XEvent *event, String *params, Cardinal *num_params);
++
++extern void
++SelectEnd(Widget w, XEvent *event, String *params, Cardinal *num_params);
++
++extern void
++SelectStart(Widget w, XEvent *event, String *params, Cardinal *num_params);
++
++extern void
++SelectWord(Widget w, XEvent *event, String *params, Cardinal *num_params);
++
++extern void
++source_init(void);
++
++extern void
++Update(Widget w, XEvent *event, String *params, Cardinal *num_params);
++
++#ifdef EDIT_BUTTON
++extern void
++EdAction(Widget w, XEvent *event, String *params, Cardinal *num_params);
++
++extern void
++StartEditor(void);
++#endif
+ 
+-extern void		SelectStart();		/* modified select-start */
+-extern void		SelectEnd();		/* modified select-end */
+-extern void		SelectWord();		/* my select word */
+-extern void		PrintSelection();	/* select variable and print */
+-extern void		Update();		/* update line label */
+-extern void		source_init();		/* init routine */
+-extern void 		CreateSourceWindow();
+-extern int 		LoadFile();		/* display source file */
+-extern int 		LoadCurrentFile();	/* display source file */
+-extern char		*GetPathname();		/* get full path name of file */
+-extern void		MakeDirList();		/* maintain list of dirs */
+ 
+ /* utils.c */
+ 
+diff -p -up xxgdb-1.12/source.c.orig xxgdb-1.12/source.c
+--- xxgdb-1.12/source.c.orig	2010-05-06 21:43:37.940032123 -0300
++++ xxgdb-1.12/source.c	2010-05-06 21:43:56.626028358 -0300
+@@ -106,7 +106,8 @@ static FileRec	**fileTable;		/* table of
+ static int	fileTableSize;		/* size of file table */
+ static char 	*dirList[MAXDIRS];	/* list of dirs for searching files */
+ 
+-void source_init()
++void
++source_init(void)
+ {
+     dirList[0] = NULL;
+ }
+@@ -116,11 +117,8 @@ void source_init()
+  *  line label.
+  */
+ /* ARGSUSED */
+-void Update(w, event, params, num_params)
+-    Widget w;
+-    XEvent *event;
+-    String *params;
+-    Cardinal *num_params;
++extern void
++Update(Widget w, XEvent *event, String *params, Cardinal *num_params)
+ {
+     XawTextPosition     pos;
+     int			topline;
+@@ -171,11 +169,8 @@ void Update(w, event, params, num_params
+  *  Invoked by ConfigureNotify event.
+  */
+ /* ARGSUSED */
+-static void NotifyResize(w, event, params, num_params)
+-    Widget w;
+-    XEvent *event;
+-    String *params;
+-    Cardinal *num_params;
++void
++NotifyResize(Widget w, XEvent *event, String *params, Cardinal *num_params)
+ {
+     XawTextPosition pos;
+     TextWidget  ctx = (TextWidget) sourceWindow;
+@@ -216,11 +211,8 @@ void UpdateLine(w, event, params, num_pa
+  *  near the bottom of an Athena text widget window.
+  */
+ /*  ARGSUSED */
+-void SelectStart(w, event, params, num_params)
+-    Widget w;
+-    XEvent *event;
+-    String *params;
+-    Cardinal *num_params;
++void
++SelectStart(Widget w, XEvent *event, String *params, Cardinal *num_params)
+ {
+     XawTextPosition topPosition;
+ 
+@@ -241,11 +233,8 @@ void SelectStart(w, event, params, num_p
+  *  selection and cut buffer 0. 
+  */
+ /*  ARGSUSED */
+-void SelectEnd(w, event, params, num_params)
+-    Widget w;
+-    XEvent *event;
+-    String *params;
+-    Cardinal *num_params;
++extern void
++SelectEnd(Widget w, XEvent *event, String *params, Cardinal *num_params)
+ {
+     XawTextPosition begin, end, start;
+     Widget textsrc;
+@@ -274,11 +263,8 @@ void SelectEnd(w, event, params, num_par
+  *  It selects a word delimited by DELIMITERS, not whitespace.
+  */
+ /* ARGSUSED */
+-void SelectWord(w, event, params, num_params)
+-    Widget w;
+-    XEvent *event;
+-    String *params;
+-    Cardinal *num_params;
++void
++SelectWord(Widget w, XEvent *event, String *params, Cardinal *num_params)
+ {
+     XawTextPosition pos, left, right, start;
+     XawTextBlock buffer;
+@@ -328,11 +314,8 @@ void SelectWord(w, event, params, num_pa
+ 
+ /*  Print the value of the expression  in cut buffer 0. */
+ /*  ARGSUSED */
+-void PrintSelection(w, event, params, num_params)
+-    Widget w;
+-    XEvent *event;
+-    String *params;
+-    Cardinal *num_params;
++void
++PrintSelection(Widget w, XEvent *event, String *params, Cardinal *num_params)
+ {
+     char command[LINESIZ];
+     char *string;
+@@ -351,24 +334,16 @@ void PrintSelection(w, event, params, nu
+ 
+ #ifdef EDIT_BUTTON
+ /* allow invocation of favorite editor from within interface */
+-extern void StartEditor();
+-void EdAction(w, event, params, num_params)
+-    Widget w;
+-    XEvent *event;
+-    String *params;
+-    Cardinal *num_params;
++void
++EdAction(Widget w, XEvent *event, String *params, Cardinal *num_params)
+ {
+   StartEditor();
+ }
+ #endif /* EDIT_BUTTON */
+ 
+ /* fixes keybindings in source window */
+-extern PopupSearch();
+-void Search(w, event, params, num_params)
+-    Widget w;
+-    XEvent *event;
+-    String *params;
+-    Cardinal *num_params;
++void
++Search(Widget w, XEvent *event, String *params, Cardinal *num_params)
+ {
+   PopupSearch(w, NULL, NULL);
+ }
+@@ -383,134 +358,12 @@ void Search(w, event, params, num_params
+ have operative keys in the editor window for moving around (move stop
+ signs and such around too) */
+ 
+-void CreateSourceWindow(parent)
+-Widget parent;
++void
++CreateSourceWindow(Widget parent)
+ {
+-    TextWidget ctx;
+     Arg args[MAXARGS];
+     Cardinal n;
+ 
+-    static XtActionsRec sbar_actions[] = {
+-        {"NotifyResize",   NotifyResize},
+-        {"Update", 	   Update},
+-        {NULL, NULL}
+-    };
+-
+-    /* fixes keybindings in source window */
+-    static XtActionsRec text_actions[] = {
+-        {"Update", 	   Update},
+-#ifdef EDIT_BUTTON
+-        {"Editor",         EdAction},
+-#endif
+-		{"Search",         Search},
+-        {NULL, NULL}
+-    };
+-
+-#ifdef EDIT_BUTTON
+-
+-    static String eTextTranslations = "#override \n\
+-        Ctrl<Key>V:    next-page() Update(warp) \n\
+-        Meta<Key>V:    previous-page() Update(warp) \n\
+-        Ctrl<Key>N:    next-line() Update() \n\
+-        Ctrl<Key>P:    previous-line() Update() \n\
+-        Ctrl<Key>Z:    scroll-one-line-up() Update(warp) \n\
+-        Meta<Key>Z:    scroll-one-line-down() Update(warp) \n\
+-        Meta<Key>]:    forward-paragraph() Update(warp) \n\
+-        Meta<Key>[:    backward-paragraph() Update(warp) \n\
+-        Meta<Key>F:    forward-word() Update() \n\
+-        Meta<Key>B:    backward-word() Update() \n\
+-        Ctrl<Key>F:    forward-character() Update() \n\
+-        Ctrl<Key>B:    backward-character() Update() \n\
+-        Meta<Key>E:    Editor() \n\
+-        Meta<Key><:   beginning-of-file() Update(warp) \n\
+-        Meta<Key>>:   end-of-file() Update(warp) \n\
+-        <Key>L:        redraw-display() Update() \n\
+-        <Key>S:        Search() Update() \n\
+-        <Key>R:        Search() Update() \n\
+-        <Btn1Down>:             SelectStart() SelectWord() \n\
+-	Shift<Btn1Up>:          Update() SelectEnd() PrintSelection() \n\
+-	<Btn1Up>:               Update() SelectEnd() \n\
+-      ";
+-  
+-    static String vTextTranslations = "#override \n\
+-        Ctrl<Key>F:    next-page() Update(warp) \n\
+-        Ctrl<Key>B:    previous-page() Update(warp) \n\
+-        Ctrl<Key>D:    next-page() Update() \n\
+-        Ctrl<Key>U:    previous-page() Update() \n\
+-        <Key>Return:   next-line() Update() \n\
+-        <Key>-:        previous-line() Update() \n\
+-        <Key>j:        next-line() Update() \n\
+-        <Key>k:        previous-line() Update() \n\
+-        <Key>space:    forward-character() Update() \n\
+-        <Key>BackSpace: backward-character() Update() \n\
+-        <Key>1:        beginning-of-file() Update(warp) \n\
+-        <Key>G:        end-of-file() Update(warp) \n\
+-        <Key>E:        Editor() \n\
+-        <Key>L:        redraw-display() Update() \n\
+-        <Key>/:        Search() Update() \n\
+-        <Key>?:        Search() Update() \n\
+-        <Btn1Down>:             SelectStart() SelectWord() \n\
+-	Shift<Btn1Up>:          Update() SelectEnd() PrintSelection() \n\
+-	<Btn1Up>:               Update() SelectEnd() \n\
+-    ";
+-
+-#else /* not EDIT_BUTTON */
+-
+-    static String eTextTranslations = "#override \n\
+-        Ctrl<Key>V:    next-page() Update(warp) \n\
+-        Meta<Key>V:    previous-page() Update(warp) \n\
+-        Ctrl<Key>N:    next-line() Update() \n\
+-        Ctrl<Key>P:    previous-line() Update() \n\
+-        Ctrl<Key>Z:    scroll-one-line-up() Update(warp) \n\
+-        Meta<Key>Z:    scroll-one-line-down() Update(warp) \n\
+-        Meta<Key>]:    forward-paragraph() Update(warp) \n\
+-        Meta<Key>[:    backward-paragraph() Update(warp) \n\
+-        Meta<Key>F:    forward-word() Update() \n\
+-        Meta<Key>B:    backward-word() Update() \n\
+-        Ctrl<Key>F:    forward-character() Update() \n\
+-        Ctrl<Key>B:    backward-character() Update() \n\
+-        Meta<Key><:   beginning-of-file() Update(warp) \n\
+-        Meta<Key>>:   end-of-file() Update(warp) \n\
+-        <Key>L:        redraw-display() Update() \n\
+-        <Key>S:        Search() Update() \n\
+-        <Key>R:        Search() Update() \n\
+-        <Btn1Down>:             SelectStart() SelectWord() \n\
+-	Shift<Btn1Up>:          Update() SelectEnd() PrintSelection() \n\
+-	<Btn1Up>:               Update() SelectEnd() \n\
+-      ";
+-  
+-    static String vTextTranslations = "#override \n\
+-        Ctrl<Key>F:    next-page() Update(warp) \n\
+-        Ctrl<Key>B:    previous-page() Update(warp) \n\
+-        Ctrl<Key>D:    next-page() Update() \n\
+-        Ctrl<Key>U:    previous-page() Update() \n\
+-        <Key>Return:   next-line() Update() \n\
+-        <Key>-:        previous-line() Update() \n\
+-        <Key>j:        next-line() Update() \n\
+-        <Key>k:        previous-line() Update() \n\
+-        <Key>space:    forward-character() Update() \n\
+-        <Key>BackSpace: backward-character() Update() \n\
+-        <Key>1:        beginning-of-file() Update(warp) \n\
+-        <Key>G:        end-of-file() Update(warp) \n\
+-        <Key>L:        redraw-display() Update() \n\
+-        <Key>/:        Search() Update() \n\
+-        <Key>?:        Search() Update() \n\
+-        <Btn1Down>:             SelectStart() SelectWord() \n\
+-	Shift<Btn1Up>:          Update() SelectEnd() PrintSelection() \n\
+-	<Btn1Up>:               Update() SelectEnd() \n\
+-    ";
+-
+-#endif /* EDIT_BUTTON */
+-
+-    /* fixes keybindings in source window */
+-    static String sbarTranslations = "\
+-        <Configure>:    NotifyResize() \n\
+-        <Btn2Down>:     StartScroll(Continuous) MoveThumb() NotifyThumb() \
+-                        Update() \n\
+-        <Btn2Motion>:   MoveThumb() NotifyThumb() Update() \n\
+-        <BtnUp>:        NotifyScroll(Proportional) EndScroll() Update() \n\
+-    ";
+-
+     n = 0;
+     XtSetArg(args[n], XtNdefaultDistance, 0);                           n++;
+     sourceForm = XtCreateManagedWidget("sourceForm", formWidgetClass, 
+@@ -523,27 +376,6 @@ Widget parent;
+     XtSetArg(args[n], XtNscrollVertical, (XtArgVal) XawtextScrollAlways);n++;
+     sourceWindow = XtCreateManagedWidget("sourceWindow", asciiTextWidgetClass,
+ 					  sourceForm, args, n);
+-
+-    ctx = (TextWidget) sourceWindow;
+-    if (ctx->text.vbar)
+-    	XtOverrideTranslations(ctx->text.vbar, 
+-				XtParseTranslationTable(sbarTranslations));
+-    XtAppAddActions(app_context, sbar_actions, XtNumber(sbar_actions));
+-
+-    /* fixes keybindings in source window */
+-    XtAppAddActions(app_context, text_actions, XtNumber(text_actions));
+-    if (app_resources.bindings && strcmp(app_resources.bindings, "vi") == 0)
+-      XtOverrideTranslations((Widget) ctx, XtParseTranslationTable(vTextTranslations));
+-    else
+-      XtOverrideTranslations((Widget) ctx, XtParseTranslationTable(eTextTranslations));
+-
+-	/* setup tabulation */
+-	if (app_resources.tabstop >= 0) {
+-		int tab, tabs[256];
+-		for (n = 0, tab = 0; n < sizeof tabs / sizeof *tabs; n++)
+-			tabs[n] = (tab += app_resources.tabstop);
+-		XawTextSinkSetTabs(ctx->text.sink, sizeof tabs / sizeof *tabs, tabs);
+-	}
+ }
+ 
+ 
+@@ -553,8 +385,8 @@ Widget parent;
+  *  > Starting position of line #1 is 0, and is stored in linepos[1].
+  *  > Search for '\n' till end of buffer.
+  */
+-static void BuildLinePos(file)
+-FileRec *file;
++static void
++BuildLinePos(FileRec *file)
+ {
+     char *p;
+     int	 line, nlines;
+@@ -587,7 +419,8 @@ FileRec *file;
+  * there might be another path to the same files.
+  */
+ 
+-static void CheckLookUpFileTable()
++static void
++CheckLookUpFileTable(void)
+ {
+ 	int i;
+ 	char * newfullname;
+@@ -639,7 +472,8 @@ static void CheckLookUpFileTable()
+  * display if necessary.
+  *
+  */
+-void CleanUpFileTable ()
++void
++CleanUpFileTable(void)
+ {
+ 	CheckLookUpFileTable();
+ 	if (displayedFile == NULL)
+@@ -651,9 +485,8 @@ void CleanUpFileTable ()
+  * If not found, create an entry and initialize proper fields,
+  * else, return pointer to entry found.
+  */
+-static int LookUpFileTable(pathname, filename, file)
+-char *pathname, *filename;
+-FileRec **file;
++static int
++LookUpFileTable(char *pathname, char *filename, FileRec **file)
+ {
+     struct stat fileinfo;
+     int  	fd;
+@@ -754,7 +587,8 @@ FileRec **file;
+ /*  
+  *  Remember file position and current line before closing.
+  */
+-static void SaveDisplayedFileInfo()
++static void
++SaveDisplayedFileInfo(void)
+ {
+     XawTextPosition pos;
+ 
+@@ -771,8 +605,8 @@ static void SaveDisplayedFileInfo()
+  *     must recalculate bottomline because the window size might be
+  *     different.
+  */
+-static void DisplayFile(file)
+-FileRec *file;
++static void
++DisplayFile(FileRec *file)
+ {
+     Arg 	args[MAXARGS];
+     Cardinal 	n;
+@@ -792,8 +626,8 @@ FileRec *file;
+  *  the home directory of that user, or to the login home directory if user
+  *  is not specified.
+  */
+-static char *expand(filename)
+-char *filename;
++static char *
++expand(char *filename)
+ {
+     struct passwd *pwd;
+     char 	  *string, *name, newfile[MAXNAME];
+@@ -821,8 +655,8 @@ char *filename;
+  *
+  *  With fix from Dave Gagne (daveg@fs1.ee.ubc.ca) 7/30/90
+  */
+-void MakeDirList(output)
+-char *output;
++void
++MakeDirList(char *output)
+ {
+     /* fix bug where if text of a directories command is > 1k, crashes.  Now works to 4k */
+     char *s, list[LINESIZ], command[LINESIZ];
+@@ -889,8 +723,8 @@ char *output;
+ /*  Returns the full pathname of a given file.
+  *  It searches for the file from a list of directories.
+  */
+-char *GetPathname(filename)
+-char *filename;
++char *
++GetPathname(char *filename)
+ {
+     char	pathname[LINESIZ];
+     int 	i;
+@@ -949,8 +783,8 @@ char *filename;
+  *   5. update the file label and the various signs on the source window.
+  *  LoadFile returns 0 upon successful completion, -1 otherwise.
+  */
+-int LoadFile(filename)
+-char *filename;
++int
++LoadFile(char *filename)
+ {
+     FileRec 	*file;
+     char	*pathname;
+@@ -980,7 +814,8 @@ char *filename;
+     }
+ }
+ 
+-int LoadCurrentFile()
++int
++LoadCurrentFile(void)
+ {
+ #ifdef GDB
+     query_gdb ("info line\n", PARSE_ON | ECHO_OFF | FILTER_OFF);
+@@ -991,10 +826,11 @@ int LoadCurrentFile()
+ }
+ 
+ #ifdef EDIT_BUTTON
+-/* simply add editor button that calls  $XXGDBWINEDIT, $WINEDIT, xxgdbedit in that order */
++/* simply add editor button that calls  $EDITOR and xedit in that order */
+ /* allow invocation of fav. editor from within interface */
+ /* button and the EdAction action procedure for the source window */
+-void StartEditor ()
++void
++StartEditor(void)
+ {
+   XawTextPosition pos;
+   char* editor;
+@@ -1002,11 +838,9 @@ void StartEditor ()
+   int result;
+   
+   if (displayedFile == NULL) return;
+-  editor = (char *) getenv("XXGDBWINEDIT");
+-  if (editor == NULL)
+-    editor = (char *) getenv("WINEDIT");
++  editor = (char *) getenv("EDITOR");
+   if (editor == NULL)
+-    editor = "xxgdbedit";
++    editor = "xedit";
+   pos = XawTextGetInsertionPoint(sourceWindow);
+   displayedFile->currentline = TextPositionToLine(pos);
+   sprintf(string, "nohup %s +%d %s&\n",
+@@ -1043,8 +877,7 @@ void StartEditor ()
+  *
+  */
+ char *
+-GetSourcePathname (filename)
+-char *filename;
++GetSourcePathname(char *filename)
+ {
+ char *srcpath;
+ char curr_src [MAXPATHLEN];
+diff -p -up xxgdb-1.12/XDbx.ad.orig xxgdb-1.12/XDbx.ad
+--- xxgdb-1.12/XDbx.ad.orig	2010-05-06 21:43:37.942032512 -0300
++++ xxgdb-1.12/XDbx.ad	2010-05-06 21:43:56.626028358 -0300
+@@ -19,31 +19,41 @@
+ *sourceForm.preferredPaneSize:  	320
+ *sourceWindow.leftMargin:       	35
+ *sourceWindow.scrollHorizontal:		whenNeeded
+-*sourceWindow.translations:		#override \n\
+-	<Btn1Down>:     SelectStart() SelectWord() \n\
+-	Shift<Btn1Up>:  Update(warp) SelectEnd() PrintSelection() \n\
+-	<Btn1Up>:       Update(warp) SelectEnd() \n\
+-	<Key>Down:      next-line() Update()\n\
+-	<Key>Up:        previous-line() Update() \n\
+-	Ctrl<Key>L:     redraw-display() Update() \n\
+-	Ctrl<Key>N:     next-line() Update() \n\
+-	Ctrl<Key>P:     previous-line() Update() \n\
+-	Ctrl<Key>V:     next-page() Update() \n\
+-	Ctrl<Key>Z:     scroll-one-line-up() Update() \n\
+-	Meta<Key>V:     previous-page() Update() \n\
+-	Meta<Key>Z:     scroll-one-line-down() Update() \n\
+-	:Meta<Key>\>:   end-of-file() Update() \n\
+-	:Meta<Key>]:    forward-paragraph() Update() \n\
+-	:Meta<Key>[:    backward-paragraph() Update()
++*sourceWindow.translations:		#override \
++	<Btn1Down>:	set-keyboard-focus() SelectStart() SelectWord()\n\
++	Shift<Btn1Up>:	Update(warp) SelectEnd() PrintSelection()\n\
++	<Btn1Up>:	Update(warp) SelectEnd()\n\
++	<Key>Down:	next-line() Update()\n\
++	<Key>Up:	previous-line() Update()\n\
++	Ctrl<Key>L:	redraw-display() Update()\n\
++	Ctrl<Key>N:	next-line() Update()\n\
++	Ctrl<Key>P:	previous-line() Update()\n\
++	Ctrl<Key>V:	next-page() Update()\n\
++	Ctrl<Key>Z:	scroll-one-line-up() Update()\n\
++	Meta<Key>V:	previous-page() Update()\n\
++	Meta<Key>Z:	scroll-one-line-down() Update()\n\
++	:Meta<Key>\>:	end-of-file() Update()\n\
++	:Meta<Key>]:	forward-paragraph() Update()\n\
++	:Meta<Key>[:	backward-paragraph() Update()
+ *messageWindow*font:  			variable
+ *messageWindow.min:  			30
+ *messageWindow.max:  			30
+ *dialogWindow.preferredPaneSize:	200
+ *dialogWindow.resizeToPreferred:	True
+-*dialogWindow.translations:		#override \n\
+-	<Btn1Down>:     SelectStart() SelectWord() \n\
+-	Shift<Btn1Up>:  SelectEnd() PrintSelection() \n\
+-	<Btn1Up>:       SelectEnd() \n
++*dialogWindow.translations:		#override \
++	<Btn1Down>:	set-keyboard-focus() SelectStart() SelectWord()\n\
++	Shift<Btn1Up>:	SelectEnd() PrintSelection()\n\
++	<Btn1Up>:	SelectEnd()\n\
++	Ctrl<Key>C:	SigInt()\n\
++	Ctrl<Key>D:	SigEof()\n\
++	Ctrl<Key>|:	SigQuit()\n\
++	<Key>Tab:	no-op(r)\n\
++	Ctrl<Key>W:	DeleteWord()\n\
++	Ctrl<Key>U:	DeleteLine()\n\
++	Ctrl<Key>H:	DeleteChar()\n\
++	<Key>Delete:	DeleteChar()\n\
++	<Key>BackSpace:	DeleteChar()\n\
++	<Key>Return:	newline() Dispatch()
+ *commandWindow.preferredPaneSize:	135
+ *commandWindow.skipAdjust:		True
+ !*commandWindow.hSpace:			14
+@@ -55,8 +65,8 @@
+ *displayWindow.skipAdjust:      	True
+ *displayWindow.scrollVertical:		whenNeeded
+ *displayWindow.scrollHorizontal:	whenNeeded
+-*displayWindow.translations:		#override \n\
+-	<Btn1Down>:             SelectStart() SelectWord() \n\
+-	Shift<Btn1Up>:          SelectEnd() PrintSelection() \n\
+-	<Btn1Up>:               SelectEnd() \n
++*displayWindow.translations:		#override \
++	<Btn1Down>:	set-keyboard-focus()  SelectStart() SelectWord()\n\
++	Shift<Btn1Up>:	SelectEnd() PrintSelection()\n\
++	<Btn1Up>:	SelectEnd()
+ *popup*showGrip:			False
+diff -p -up xxgdb-1.12/xdbx.c.orig xxgdb-1.12/xdbx.c
+--- xxgdb-1.12/xdbx.c.orig	2010-05-06 21:43:37.944031595 -0300
++++ xxgdb-1.12/xdbx.c	2010-05-06 21:43:56.628036652 -0300
+@@ -191,19 +191,11 @@ String fallback_resources[] = {
+ #endif
+     "*sourceWindow.leftMargin:          35",
+     "*sourceWindow.scrollHorizontal:	whenNeeded",
+-    "*sourceWindow.translations:	#override \\n\
+-        <Btn1Down>:             SelectStart() SelectWord() \\n\
+-        Shift<Btn1Up>:          Update() SelectEnd() PrintSelection() \\n\
+-        <Btn1Up>:               Update() SelectEnd() \\n",
+     "*messageWindow*font:  		variable",
+     "*messageWindow.min:  		30",
+     "*messageWindow.max:  		30",
+     "*dialogWindow.preferredPaneSize:	240",
+     "*dialogWindow.resizeToPreferred:	True",
+-    "*dialogWindow.translations:	#override \\n\
+-        <Btn1Down>:     SelectStart() SelectWord() \\n\
+-        Shift<Btn1Up>:  SelectEnd() PrintSelection() \\n\
+-        <Btn1Up>:       SelectEnd() \\n",
+ #ifdef NEW_INTERFACE
+     "*commandShell.geometry:            190x370+590+0",
+ #else
+@@ -229,10 +221,6 @@ String fallback_resources[] = {
+ #endif
+     "*displayWindow.scrollVertical:	whenNeeded",
+     "*displayWindow.scrollHorizontal:	whenNeeded",
+-    "*displayWindow.translations:	#override \\n\
+-        <Btn1Down>:             SelectStart() SelectWord() \\n\
+-        Shift<Btn1Up>:          SelectEnd() PrintSelection() \\n\
+-        <Btn1Up>:               SelectEnd() \\n",
+     "*popup*showGrip:  			False",
+     "*bindings:                         emacs",
+     NULL,
+@@ -271,14 +259,25 @@ static XrmOptionDescRec options[] = {
+ };
+ 
+ XtActionsRec xdbx_actions[] = {
+-    {"SelectStart",	(XtActionProc) SelectStart},
+-    {"SelectEnd",	(XtActionProc) SelectEnd},
+-    {"SelectWord",	(XtActionProc) SelectWord},
+-    {"PrintSelection",	(XtActionProc) PrintSelection},
+-    {"Update",		(XtActionProc) Update},
+-    {"DeleteWord",	(XtActionProc) DeleteWord},
+-    {"DeleteLine",	(XtActionProc) DeleteLine},
+-    {NULL, NULL}
++#ifdef EDIT_BUTTON
++    {"Editor",		EdAction},
++#endif
++    {"DeleteChar",	DeleteChar},
++    {"DeleteLine",	DeleteLine},
++    {"DeleteWord",	DeleteWord},
++    {"Dispatch",	Dispatch},
++    {"InsertSpace",	InsertSpace},
++    {"NotifyResize",	NotifyResize},
++    {"PrintSelection",	PrintSelection},
++    {"Search",		Search},
++    {"SelectEnd",	SelectEnd},
++    {"SelectStart",	SelectStart},
++    {"SelectWord",	SelectWord},
++    {"SigEof",		SigEof},
++    {"SigInt",		SigInt},
++    {"SigQuit", 	SigQuit},
++    {"Update",		Update},
++    {NULL,		NULL}
+ };
+ 
+ static void Syntax(call)
diff --git a/source/xap/xxgdb/xxgdb-1.12-sysv.patch b/source/xap/xxgdb/xxgdb-1.12-sysv.patch
new file mode 100644
index 00000000..e8b14b78
--- /dev/null
+++ b/source/xap/xxgdb/xxgdb-1.12-sysv.patch
@@ -0,0 +1,24 @@
+--- xxgdb-1.12/source.c~	Fri Apr 21 12:16:02 1995
++++ xxgdb-1.12/source.c	Mon Dec  2 17:42:39 1996
+@@ -79,7 +79,7 @@
+ #endif
+ #include <stdlib.h>
+ 
+-#include <X11/Xos.h>
++/* #include <X11/Xos.h> */
+ #include <sys/stat.h>
+ #include <pwd.h>
+ #include "global.h"
+--- xxgdb-1.12/global.h~	Thu Apr  6 12:23:42 1995
++++ xxgdb-1.12/global.h	Mon Dec  2 17:38:21 1996
+@@ -62,8 +62,9 @@
+  *
+  *    Contain extern declarations of variables and functions.
+  */
+-
++#undef SYSV
+ #include "defs.h"
++#define SYSV
+ 
+ 
+ #if defined(__GNUC__) && !defined(alloca)
diff --git a/source/xap/xxgdb/xxgdb.SlackBuild b/source/xap/xxgdb/xxgdb.SlackBuild
index 97c130f6..a1453e05 100755
--- a/source/xap/xxgdb/xxgdb.SlackBuild
+++ b/source/xap/xxgdb/xxgdb.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009-2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -19,11 +19,11 @@
 #  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=xxgdb
 VERSION=${VERSION:-1.12}
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -31,6 +31,17 @@ PKG=$TMP/package-${PKGNAM}
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# Set compile flags:
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-march=i486 -mtune=i686"
 elif [ "$ARCH" = "s390" ]; then
@@ -39,12 +50,18 @@ elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
 fi
 
+# Extract source:
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.gz || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1
 cd ${PKGNAM}-$VERSION || exit 1
 
-zcat $CWD/xxgdb.fix_glibc_and_gcc.diff.gz | patch -p1 --verbose --backup --suffix=.orig
+# Apply patches:
+# The patches were taken from Mandriva's SRPM and address build issues
+# and run-time issues on x86_64. 
+for pf in $CWD/*patch.xz ; do
+  { xz -dc $pf | patch -p1 ;} || exit 1
+done
 
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
@@ -89,7 +106,7 @@ fi
 # Add a documentation directory:
 mkdir -p ${PKG}/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  README README.NEW_INTERFACE XDBX_README XDbx.NEW_INTERFACE XXGDB_README \
+  *README* XDbx.NEW_INTERFACE \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 
 mkdir -p $PKG/install
diff --git a/source/xap/xxgdb/xxgdb.fix_glibc_and_gcc.diff b/source/xap/xxgdb/xxgdb.fix_glibc_and_gcc.diff
deleted file mode 100644
index b61d57ce..00000000
--- a/source/xap/xxgdb/xxgdb.fix_glibc_and_gcc.diff
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Naur xxgdb-1.12/Imakefile xxgdb-1.12.fixed/Imakefile
---- xxgdb-1.12/Imakefile	1995-06-19 19:20:55.000000000 -0300
-+++ xxgdb-1.12.fixed/Imakefile	2007-02-21 10:40:57.000000000 -0200
-@@ -59,7 +59,7 @@
- #endif
- 
- #ifdef LinuxArchitecture
--DEFINES = -DSYSV $(DEFGDB)
-+DEFINES = $(DEFGDB)
- #endif
- 
- #if defined(NeXTArchitecture) || defined(NextArchitecture)
-diff -Naur xxgdb-1.12/filemenu.c xxgdb-1.12.fixed/filemenu.c
---- xxgdb-1.12/filemenu.c	1994-08-29 16:38:28.000000000 -0300
-+++ xxgdb-1.12.fixed/filemenu.c	2007-02-21 10:47:47.000000000 -0200
-@@ -207,12 +207,12 @@
- 	return False;
-     if (statbuf.st_mode & S_IFDIR) {		/* is directory */
- 	strcat(entry->d_name, "/");
--	++(entry->d_namlen);
-+	++(entry->d_reclen);
- 	return True;
-     }
-     if (statbuf.st_mode & S_IEXEC) {		/* is executable */
- 	strcat(entry->d_name, "*");
--	++(entry->d_namlen);
-+	++(entry->d_reclen);
- 	return True;
-     }
-     return True;
-diff -Naur xxgdb-1.12/gdb_handler.c xxgdb-1.12.fixed/gdb_handler.c
---- xxgdb-1.12/gdb_handler.c	1995-04-19 13:46:22.000000000 -0300
-+++ xxgdb-1.12.fixed/gdb_handler.c	2007-02-21 10:51:30.000000000 -0200
-@@ -85,10 +85,7 @@
-  *    query_gdb():			Send command to gdb.
-  */
- 
--#ifdef SYSV 
--#   include <signal.h>
--#endif
--
-+#include <signal.h>
- 
- /*  
-  *  Display an outlined arrow to locate the calling routine in a stack
diff --git a/testing/source/btrfs-progs/btrfs-progs.SlackBuild b/testing/source/btrfs-progs/btrfs-progs.SlackBuild
deleted file mode 100755
index 708e1584..00000000
--- a/testing/source/btrfs-progs/btrfs-progs.SlackBuild
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/sh
-# Copyright 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-CWD=$(pwd)
-
-PKGNAM=btrfs-progs
-BUILD=${BUILD:-1}
-
-NUMJOBS=${NUMJOBS:-" -j7 "}
-
-# Download the btrfs-progs-unstable Git head if there's no tarball:
-if ! /bin/ls $CWD/btrfs-progs*tar* 1> /dev/null 2> /dev/null ; then
-  git clone git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs-unstable.git
-  rm -r btrfs-progs-unstable/.git
-  tar cf btrfs-progs-$(date +%Y%m%d).tar btrfs-progs-unstable
-  xz -9 btrfs-progs-$(date +%Y%m%d).tar
-  rm -r $CWD/btrfs-progs-unstable
-fi
-
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | cut -f 3 -d - | cut -f 1 -d .)}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
-    arm*) export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-       *) export ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ "$TMP" = "" ]; then
-  TMP=/tmp
-fi
-PKG=$TMP/package-${PKGNAM}
-rm -rf $PKG
-mkdir -p $PKG
-
-cd $TMP
-rm -rf btrfs-progs-unstable
-tar xf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
-cd btrfs-progs-unstable
-
-# 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 {} \;
-
-# Build and install:
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-# Strip binaries:
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
-
-# Move stuff out of /usr/local:
-mv $PKG/usr/local/bin $PKG/sbin
-mv $PKG/usr/local/man $PKG/usr/man
-rmdir $PKG/usr/local
-
-( cd $PKG/sbin ; ln -sf btrfsck fsck.btrfs )
-
-# 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 \
-  COPYING INSTALL \
-  $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 ../${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/testing/source/libdrm/libdrm.SlackBuild b/testing/source/libdrm/libdrm.SlackBuild
new file mode 100755
index 00000000..81d04f86
--- /dev/null
+++ b/testing/source/libdrm/libdrm.SlackBuild
@@ -0,0 +1,123 @@
+#!/bin/sh
+
+# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# 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=libdrm
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# 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
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-${PKGNAM}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf ${PKGNAM}-${VERSION}
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
+cd ${PKGNAM}-$VERSION
+
+# 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} \
+  --enable-udev \
+  --enable-nouveau-experimental-api \
+  --enable-vmwgfx-experimental-api \
+  --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 \
+  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/testing/source/libdrm/slack-desc b/testing/source/libdrm/slack-desc
new file mode 100644
index 00000000..93530f5a
--- /dev/null
+++ b/testing/source/libdrm/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------------------------------------------------------|
+libdrm: libdrm (A library to support Direct Rendering)
+libdrm:
+libdrm: This library implements an interface to the kernel's DRM services.
+libdrm: It is used to support hardware accelerated 3-D rendering.
+libdrm:
+libdrm:
+libdrm:
+libdrm:
+libdrm:
+libdrm:
+libdrm:
diff --git a/testing/source/linux-2.6.35.12-configs/config-generic-2.6.35.12 b/testing/source/linux-2.6.35.12-configs/config-generic-2.6.35.12
new file mode 100644
index 00000000..768077fa
--- /dev/null
+++ b/testing/source/linux-2.6.35.12-configs/config-generic-2.6.35.12
@@ -0,0 +1,4922 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.35.12
+# Fri Apr 22 13:03:08 2011
+#
+CONFIG_64BIT=y
+# CONFIG_X86_32 is not set
+CONFIG_X86_64=y
+CONFIG_X86=y
+CONFIG_INSTRUCTION_DECODER=y
+CONFIG_OUTPUT_FORMAT="elf64-x86-64"
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_MMU=y
+CONFIG_ZONE_DMA=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_DEFAULT_IDLE=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ZONE_DMA32=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_AUDIT_ARCH=y
+CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_HAVE_EARLY_RES=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_X86_64_SMP=y
+CONFIG_X86_HT=y
+CONFIG_X86_TRAMPOLINE=y
+CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
+# CONFIG_KTIME_SCALAR is not set
+CONFIG_ARCH_CPU_PROBE_RELEASE=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_CONSTRUCTORS=y
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_CROSS_COMPILE=""
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_LZO=y
+# CONFIG_KERNEL_GZIP is not set
+# CONFIG_KERNEL_BZIP2 is not set
+CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_LZO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_AUDIT=y
+CONFIG_AUDITSYSCALL=y
+CONFIG_AUDIT_TREE=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_TINY_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_RCU_FAST_NO_HZ is not set
+# CONFIG_TREE_RCU_TRACE is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=15
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+CONFIG_CGROUPS=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_CGROUP_NS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_RESOURCE_COUNTERS=y
+CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_RT_GROUP_SCHED=y
+CONFIG_BLK_CGROUP=y
+# CONFIG_DEBUG_BLK_CGROUP is not set
+CONFIG_MM_OWNER=y
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
+CONFIG_RELAY=y
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_LZO=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_HAVE_PERF_EVENTS=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_PERF_COUNTERS is not set
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_PCI_QUIRKS=y
+CONFIG_SLUB_DEBUG=y
+CONFIG_COMPAT_BRK=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+CONFIG_OPROFILE=m
+# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_SLOW_WORK=y
+# CONFIG_SLOW_WORK_DEBUG is not set
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_STOP_MACHINE=y
+CONFIG_BLOCK=y
+CONFIG_BLK_DEV_BSG=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
+CONFIG_BLOCK_COMPAT=y
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_CFQ_GROUP_IOSCHED=y
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_PADATA=y
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_FREEZER=y
+
+#
+# Processor type and features
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_SMP=y
+# CONFIG_SPARSE_IRQ is not set
+CONFIG_X86_MPPARSE=y
+# CONFIG_X86_EXTENDED_PLATFORM is not set
+CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+# CONFIG_PARAVIRT_GUEST is not set
+# CONFIG_NO_BOOTMEM is not set
+CONFIG_MEMTEST=y
+# CONFIG_M386 is not set
+# CONFIG_M486 is not set
+# CONFIG_M586 is not set
+# CONFIG_M586TSC is not set
+# CONFIG_M586MMX is not set
+# CONFIG_M686 is not set
+# CONFIG_MPENTIUMII is not set
+# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMM is not set
+# CONFIG_MPENTIUM4 is not set
+# CONFIG_MK6 is not set
+# CONFIG_MK7 is not set
+# CONFIG_MK8 is not set
+# CONFIG_MCRUSOE is not set
+# CONFIG_MEFFICEON is not set
+# CONFIG_MWINCHIPC6 is not set
+# CONFIG_MWINCHIP3D is not set
+# CONFIG_MGEODEGX1 is not set
+# CONFIG_MGEODE_LX is not set
+# CONFIG_MCYRIXIII is not set
+# CONFIG_MVIAC3_2 is not set
+# CONFIG_MVIAC7 is not set
+# CONFIG_MPSC is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
+CONFIG_GENERIC_CPU=y
+CONFIG_X86_CPU=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_CMPXCHG=y
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_XADD=y
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_TSC=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=64
+CONFIG_X86_DEBUGCTLMSR=y
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_DMI=y
+CONFIG_GART_IOMMU=y
+# CONFIG_CALGARY_IOMMU is not set
+# CONFIG_AMD_IOMMU is not set
+CONFIG_SWIOTLB=y
+CONFIG_IOMMU_HELPER=y
+# CONFIG_IOMMU_API is not set
+# CONFIG_MAXSMP is not set
+CONFIG_NR_CPUS=32
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_MCE=y
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_AMD=y
+CONFIG_X86_MCE_THRESHOLD=y
+CONFIG_X86_MCE_INJECT=m
+CONFIG_X86_THERMAL_VECTOR=y
+CONFIG_I8K=m
+CONFIG_MICROCODE=m
+CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_AMD=y
+CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=m
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_DIRECT_GBPAGES=y
+# CONFIG_NUMA is not set
+CONFIG_ARCH_PROC_KCORE_TEXT=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_MEMORY_PROBE=y
+CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
+CONFIG_SELECT_MEMORY_MODEL=y
+# CONFIG_FLATMEM_MANUAL is not set
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_HAVE_MEMORY_PRESENT=y
+CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
+CONFIG_SPARSEMEM_VMEMMAP=y
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_SPARSE=y
+CONFIG_MEMORY_HOTREMOVE=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_MIGRATION=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_MMU_NOTIFIER=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=98304
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+# CONFIG_MEMORY_FAILURE is not set
+# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
+CONFIG_X86_RESERVE_LOW_64K=y
+CONFIG_MTRR=y
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
+CONFIG_X86_PAT=y
+CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_EFI=y
+CONFIG_SECCOMP=y
+CONFIG_CC_STACKPROTECTOR=y
+CONFIG_HZ_100=y
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=100
+CONFIG_SCHED_HRTICK=y
+# CONFIG_KEXEC is not set
+# CONFIG_CRASH_DUMP is not set
+CONFIG_PHYSICAL_START=0x1000000
+# CONFIG_RELOCATABLE is not set
+CONFIG_PHYSICAL_ALIGN=0x1000000
+CONFIG_HOTPLUG_CPU=y
+CONFIG_COMPAT_VDSO=y
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+
+#
+# Power management and ACPI options
+#
+CONFIG_ARCH_HIBERNATION_HEADER=y
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_SLEEP_SMP=y
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND_NVS=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+CONFIG_HIBERNATION=y
+CONFIG_PM_STD_PARTITION="\"\""
+CONFIG_PM_RUNTIME=y
+CONFIG_PM_OPS=y
+CONFIG_ACPI=y
+CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_PROCFS=y
+CONFIG_ACPI_PROCFS_POWER=y
+CONFIG_ACPI_POWER_METER=m
+CONFIG_ACPI_SYSFS_POWER=y
+CONFIG_ACPI_PROC_EVENT=y
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=m
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_PROCESSOR=m
+CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
+CONFIG_ACPI_THERMAL=m
+# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_BLACKLIST_YEAR=0
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_PCI_SLOT=m
+CONFIG_X86_PM_TIMER=y
+CONFIG_ACPI_CONTAINER=m
+CONFIG_ACPI_HOTPLUG_MEMORY=m
+CONFIG_ACPI_SBS=m
+CONFIG_ACPI_HED=m
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=m
+CONFIG_ACPI_APEI_EINJ=m
+CONFIG_SFI=y
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=m
+# CONFIG_CPU_FREQ_DEBUG is not set
+CONFIG_CPU_FREQ_STAT=m
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=m
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+
+#
+# CPUFreq processor drivers
+#
+CONFIG_X86_PCC_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_SPEEDSTEP_CENTRINO=m
+CONFIG_X86_P4_CLOCKMOD=m
+
+#
+# shared options
+#
+CONFIG_X86_SPEEDSTEP_LIB=m
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_INTEL_IDLE=m
+
+#
+# Memory power savings
+#
+CONFIG_I7300_IDLE_IOAT_CHANNEL=y
+CONFIG_I7300_IDLE=m
+
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_DOMAINS=y
+# CONFIG_PCI_CNB20LE_QUIRK is not set
+# CONFIG_DMAR is not set
+# CONFIG_INTR_REMAP is not set
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=m
+CONFIG_PCIEAER=y
+# CONFIG_PCIE_ECRC is not set
+CONFIG_PCIEAER_INJECT=m
+# CONFIG_PCIEASPM is not set
+CONFIG_PCIE_PME=y
+CONFIG_ARCH_SUPPORTS_MSI=y
+CONFIG_PCI_MSI=y
+# CONFIG_PCI_DEBUG is not set
+CONFIG_PCI_STUB=m
+CONFIG_HT_IRQ=y
+# CONFIG_PCI_IOV is not set
+CONFIG_PCI_IOAPIC=y
+CONFIG_ISA_DMA_API=y
+CONFIG_K8_NB=y
+CONFIG_PCCARD=m
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_PCCARD_NONSTATIC=y
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_FAKE=m
+CONFIG_HOTPLUG_PCI_ACPI=m
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
+# CONFIG_HOTPLUG_PCI_CPCI is not set
+CONFIG_HOTPLUG_PCI_SHPC=m
+
+#
+# Executable file formats / Emulations
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_COMPAT_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_HAVE_AOUT is not set
+CONFIG_BINFMT_MISC=m
+CONFIG_IA32_EMULATION=y
+# CONFIG_IA32_AOUT is not set
+CONFIG_COMPAT=y
+CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
+CONFIG_SYSVIPC_COMPAT=y
+CONFIG_NET=y
+CONFIG_COMPAT_NETLINK_MESSAGES=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=y
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+# CONFIG_NET_KEY_MIGRATE is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_INET_LRO=y
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=m
+CONFIG_IPV6_PRIVACY=y
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_SIT_6RD is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_NETLABEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CT_ACCT=y
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+# CONFIG_NF_CONNTRACK_EVENTS is not set
+CONFIG_NF_CT_PROTO_DCCP=m
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_TPROXY=m
+CONFIG_NETFILTER_XTABLES=m
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_VS=m
+# CONFIG_IP_VS_IPV6 is not set
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_DCCP=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_QUEUE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+
+#
+# DECnet: Netfilter Configuration
+#
+# CONFIG_DECNET_NF_GRABULATOR is not set
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_ULOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+# CONFIG_IP_DCCP_CCID3 is not set
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_MSG is not set
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_HMAC_NONE is not set
+# CONFIG_SCTP_HMAC_SHA1 is not set
+CONFIG_SCTP_HMAC_MD5=y
+CONFIG_RDS=m
+CONFIG_RDS_RDMA=m
+CONFIG_RDS_TCP=m
+# CONFIG_RDS_DEBUG is not set
+CONFIG_TIPC=m
+# CONFIG_TIPC_ADVANCED is not set
+# CONFIG_TIPC_DEBUG is not set
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_GARP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+# CONFIG_NET_DSA is not set
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_DECNET=m
+# CONFIG_DECNET_ROUTER is not set
+CONFIG_LLC=m
+CONFIG_LLC2=m
+CONFIG_IPX=m
+# CONFIG_IPX_INTERN is not set
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_IPDDP_DECAP=y
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+CONFIG_WAN_ROUTER=m
+# CONFIG_PHONET is not set
+CONFIG_IEEE802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_INGRESS=m
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_ROUTE=y
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=y
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=y
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+# CONFIG_NET_CLS_IND is not set
+CONFIG_NET_SCH_FIFO=y
+# CONFIG_DCB is not set
+CONFIG_RPS=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NET_DROP_MONITOR is not set
+CONFIG_HAMRADIO=y
+
+#
+# Packet Radio protocols
+#
+CONFIG_AX25=m
+# CONFIG_AX25_DAMA_SLAVE is not set
+CONFIG_NETROM=m
+CONFIG_ROSE=m
+
+#
+# AX.25 network device drivers
+#
+CONFIG_MKISS=m
+CONFIG_6PACK=m
+CONFIG_BPQETHER=m
+CONFIG_BAYCOM_SER_FDX=m
+CONFIG_BAYCOM_SER_HDX=m
+CONFIG_BAYCOM_PAR=m
+CONFIG_YAM=m
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+
+#
+# CAN Device Drivers
+#
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_DEV=m
+# CONFIG_CAN_CALC_BITTIMING is not set
+CONFIG_CAN_JANZ_ICAN3=m
+CONFIG_CAN_SJA1000=m
+CONFIG_CAN_SJA1000_PLATFORM=m
+CONFIG_CAN_EMS_PCI=m
+CONFIG_CAN_KVASER_PCI=m
+CONFIG_CAN_PLX_PCI=m
+
+#
+# CAN USB interfaces
+#
+CONFIG_CAN_EMS_USB=m
+# CONFIG_CAN_DEBUG_DEVICES is not set
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+# CONFIG_IRDA_ULTRA is not set
+
+#
+# IrDA options
+#
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+# CONFIG_IRDA_DEBUG is not set
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+CONFIG_IRTTY_SIR=m
+
+#
+# Dongle support
+#
+CONFIG_DONGLE=y
+CONFIG_ESI_DONGLE=m
+CONFIG_ACTISYS_DONGLE=m
+CONFIG_TEKRAM_DONGLE=m
+CONFIG_TOIM3232_DONGLE=m
+CONFIG_LITELINK_DONGLE=m
+CONFIG_MA600_DONGLE=m
+CONFIG_GIRBIL_DONGLE=m
+CONFIG_MCP2120_DONGLE=m
+CONFIG_OLD_BELKIN_DONGLE=m
+CONFIG_ACT200L_DONGLE=m
+CONFIG_KINGSUN_DONGLE=m
+CONFIG_KSDAZZLE_DONGLE=m
+CONFIG_KS959_DONGLE=m
+
+#
+# FIR device drivers
+#
+CONFIG_USB_IRDA=m
+CONFIG_SIGMATEL_FIR=m
+CONFIG_NSC_FIR=m
+CONFIG_WINBOND_FIR=m
+CONFIG_SMC_IRCC_FIR=m
+CONFIG_ALI_FIR=m
+CONFIG_VLSI_FIR=m
+CONFIG_VIA_FIR=m
+CONFIG_MCS_FIR=m
+CONFIG_BT=m
+CONFIG_BT_L2CAP=m
+CONFIG_BT_L2CAP_EXT_FEATURES=y
+CONFIG_BT_SCO=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIBTUART=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_AF_RXRPC=m
+# CONFIG_AF_RXRPC_DEBUG is not set
+CONFIG_RXKAD=m
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_REG_DEBUG is not set
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+# CONFIG_CFG80211_INTERNAL_REGDB is not set
+CONFIG_CFG80211_WEXT=y
+CONFIG_WIRELESS_EXT_SYSFS=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+# CONFIG_MAC80211_RC_DEFAULT_PID is not set
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+CONFIG_NET_9P_RDMA=m
+# CONFIG_NET_9P_DEBUG is not set
+# CONFIG_CAIF is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+CONFIG_CONNECTOR=m
+CONFIG_MTD=m
+# CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_TESTS=m
+CONFIG_MTD_CONCAT=m
+CONFIG_MTD_PARTITIONS=y
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+CONFIG_MTD_AR7_PARTS=m
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=m
+CONFIG_HAVE_MTD_OTP=y
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+CONFIG_FTL=m
+CONFIG_NFTL=m
+CONFIG_NFTL_RW=y
+CONFIG_INFTL=m
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
+CONFIG_SM_FTL=m
+CONFIG_MTD_OOPS=m
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_GEN_PROBE=m
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+CONFIG_MTD_MAP_BANK_WIDTH_8=y
+CONFIG_MTD_MAP_BANK_WIDTH_16=y
+CONFIG_MTD_MAP_BANK_WIDTH_32=y
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+CONFIG_MTD_CFI_I4=y
+CONFIG_MTD_CFI_I8=y
+CONFIG_MTD_OTP=y
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_CFI_UTIL=m
+CONFIG_MTD_RAM=m
+CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_PHYSMAP=m
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+CONFIG_MTD_SC520CDP=m
+CONFIG_MTD_NETSC520=m
+CONFIG_MTD_TS5500=m
+CONFIG_MTD_SBC_GXX=m
+CONFIG_MTD_AMD76XROM=m
+CONFIG_MTD_ICHXROM=m
+CONFIG_MTD_ESB2ROM=m
+CONFIG_MTD_CK804XROM=m
+CONFIG_MTD_SCB2_FLASH=m
+CONFIG_MTD_NETtel=m
+CONFIG_MTD_L440GX=m
+CONFIG_MTD_PCI=m
+CONFIG_MTD_PCMCIA=m
+# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
+CONFIG_MTD_GPIO_ADDR=m
+CONFIG_MTD_INTEL_VR_NOR=m
+CONFIG_MTD_PLATRAM=m
+
+#
+# Self-contained MTD device drivers
+#
+CONFIG_MTD_PMC551=m
+CONFIG_MTD_PMC551_BUGFIX=y
+# CONFIG_MTD_PMC551_DEBUG is not set
+CONFIG_MTD_SLRAM=m
+CONFIG_MTD_PHRAM=m
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=4096
+CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTD_BLOCK2MTD=m
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+CONFIG_MTD_DOC2001PLUS=m
+CONFIG_MTD_DOCPROBE=m
+CONFIG_MTD_DOCECC=m
+CONFIG_MTD_DOCPROBE_ADVANCED=y
+CONFIG_MTD_DOCPROBE_ADDRESS=0x0000
+CONFIG_MTD_DOCPROBE_HIGH=y
+CONFIG_MTD_DOCPROBE_55AA=y
+CONFIG_MTD_NAND_ECC=m
+CONFIG_MTD_NAND_ECC_SMC=y
+CONFIG_MTD_NAND=m
+CONFIG_MTD_NAND_VERIFY_WRITE=y
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_MUSEUM_IDS=y
+CONFIG_MTD_NAND_DENALI=m
+CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xFF108018
+CONFIG_MTD_NAND_IDS=m
+CONFIG_MTD_NAND_RICOH=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y
+CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y
+CONFIG_MTD_NAND_CAFE=m
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_PLATFORM=m
+CONFIG_MTD_ALAUDA=m
+CONFIG_MTD_ONENAND=m
+CONFIG_MTD_ONENAND_VERIFY_WRITE=y
+CONFIG_MTD_ONENAND_GENERIC=m
+CONFIG_MTD_ONENAND_OTP=y
+CONFIG_MTD_ONENAND_2X_PROGRAM=y
+CONFIG_MTD_ONENAND_SIM=m
+
+#
+# LPDDR flash memory drivers
+#
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+
+#
+# UBI - Unsorted block images
+#
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_RESERVE=1
+CONFIG_MTD_UBI_GLUEBI=m
+
+#
+# UBI debugging options
+#
+# CONFIG_MTD_UBI_DEBUG is not set
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
+CONFIG_PARPORT_PC_PCMCIA=m
+# CONFIG_PARPORT_GSC is not set
+CONFIG_PARPORT_AX88796=m
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_PNP=y
+CONFIG_PNP_DEBUG_MESSAGES=y
+
+#
+# Protocols
+#
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_FD=y
+CONFIG_PARIDE=m
+
+#
+# Parallel IDE high-level drivers
+#
+CONFIG_PARIDE_PD=m
+CONFIG_PARIDE_PCD=m
+CONFIG_PARIDE_PF=m
+CONFIG_PARIDE_PT=m
+CONFIG_PARIDE_PG=m
+
+#
+# Parallel IDE protocol modules
+#
+CONFIG_PARIDE_ATEN=m
+CONFIG_PARIDE_BPCK=m
+CONFIG_PARIDE_COMM=m
+CONFIG_PARIDE_DSTR=m
+CONFIG_PARIDE_FIT2=m
+CONFIG_PARIDE_FIT3=m
+CONFIG_PARIDE_EPAT=m
+CONFIG_PARIDE_EPATC8=y
+CONFIG_PARIDE_EPIA=m
+CONFIG_PARIDE_FRIQ=m
+CONFIG_PARIDE_FRPW=m
+CONFIG_PARIDE_KBIC=m
+CONFIG_PARIDE_KTTI=m
+CONFIG_PARIDE_ON20=m
+CONFIG_PARIDE_ON26=m
+CONFIG_BLK_CPQ_DA=m
+CONFIG_BLK_CPQ_CISS_DA=m
+CONFIG_CISS_SCSI_TAPE=y
+CONFIG_BLK_DEV_DAC960=m
+CONFIG_BLK_DEV_UMEM=m
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_OSD=m
+CONFIG_BLK_DEV_SX8=m
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=16384
+# CONFIG_BLK_DEV_XIP is not set
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_ATA_OVER_ETH=m
+CONFIG_VIRTIO_BLK=m
+# CONFIG_BLK_DEV_HD is not set
+CONFIG_MISC_DEVICES=y
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+CONFIG_IBM_ASM=m
+CONFIG_PHANTOM=m
+CONFIG_SGI_IOC4=m
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+CONFIG_ICS932S401=m
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_CS5535_MFGPT=m
+CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
+CONFIG_CS5535_CLOCK_EVENT_SRC=m
+CONFIG_HP_ILO=m
+CONFIG_ISL29003=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_DS1682=m
+CONFIG_VMWARE_BALLOON=m
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+CONFIG_IWMC3200TOP=m
+# CONFIG_IWMC3200TOP_DEBUG is not set
+# CONFIG_IWMC3200TOP_DEBUGFS is not set
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=y
+CONFIG_RAID_ATTRS=y
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_TGT=y
+CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=m
+CONFIG_CHR_DEV_OSST=m
+CONFIG_BLK_DEV_SR=y
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=y
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_FC_TGT_ATTRS=y
+CONFIG_SCSI_ISCSI_ATTRS=y
+CONFIG_SCSI_SAS_ATTRS=y
+CONFIG_SCSI_SAS_LIBSAS=y
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
+CONFIG_SCSI_SRP_ATTRS=m
+CONFIG_SCSI_SRP_TGT_ATTRS=y
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_BE2ISCSI=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_HPSA=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=4
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
+CONFIG_AIC7XXX_DEBUG_MASK=0
+# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
+CONFIG_SCSI_AIC7XXX_OLD=m
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_CMDS_PER_DEVICE=4
+CONFIG_AIC79XX_RESET_DELAY_MS=15000
+# CONFIG_AIC79XX_DEBUG_ENABLE is not set
+CONFIG_AIC79XX_DEBUG_MASK=0
+# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_MVSAS=m
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_ADVANSYS=m
+CONFIG_SCSI_ARCMSR=m
+# CONFIG_SCSI_ARCMSR_AER is not set
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+CONFIG_MEGARAID_LEGACY=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+# CONFIG_SCSI_MPT2SAS_LOGGING is not set
+CONFIG_SCSI_HPTIOP=m
+CONFIG_SCSI_BUSLOGIC=m
+CONFIG_VMWARE_PVSCSI=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_FCOE_FNIC=m
+CONFIG_SCSI_DMX3191D=m
+CONFIG_SCSI_EATA=m
+# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
+# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
+CONFIG_SCSI_EATA_MAX_TAGS=16
+CONFIG_SCSI_FUTURE_DOMAIN=m
+CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
+CONFIG_SCSI_PPA=m
+CONFIG_SCSI_IMM=m
+# CONFIG_SCSI_IZIP_EPP16 is not set
+# CONFIG_SCSI_IZIP_SLOW_CTR is not set
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_SCSI_IPR=m
+# CONFIG_SCSI_IPR_TRACE is not set
+# CONFIG_SCSI_IPR_DUMP is not set
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLA_FC=m
+CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_SCSI_LPFC=m
+# CONFIG_SCSI_LPFC_DEBUG_FS is not set
+CONFIG_SCSI_DC395x=m
+CONFIG_SCSI_DC390T=m
+CONFIG_SCSI_DEBUG=m
+CONFIG_SCSI_PMCRAID=m
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_SRP=m
+CONFIG_SCSI_BFA_FC=m
+CONFIG_SCSI_LOWLEVEL_PCMCIA=y
+CONFIG_PCMCIA_FDOMAIN=m
+CONFIG_PCMCIA_QLOGIC=m
+CONFIG_PCMCIA_SYM53C500=m
+CONFIG_SCSI_DH=m
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+CONFIG_SCSI_OSD_INITIATOR=m
+CONFIG_SCSI_OSD_ULD=m
+CONFIG_SCSI_OSD_DPRINT_SENSE=1
+# CONFIG_SCSI_OSD_DEBUG is not set
+CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_ACPI=y
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=y
+CONFIG_SATA_AHCI_PLATFORM=y
+CONFIG_SATA_INIC162X=y
+CONFIG_SATA_SIL24=y
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=y
+CONFIG_SATA_QSTOR=y
+CONFIG_SATA_SX4=y
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=y
+CONFIG_SATA_MV=y
+CONFIG_SATA_NV=y
+CONFIG_SATA_PROMISE=y
+CONFIG_SATA_SIL=y
+CONFIG_SATA_SIS=y
+CONFIG_SATA_SVW=y
+CONFIG_SATA_ULI=y
+CONFIG_SATA_VIA=y
+CONFIG_SATA_VITESSE=y
+
+#
+# PATA SFF controllers with BMDMA
+#
+CONFIG_PATA_ALI=y
+CONFIG_PATA_AMD=y
+CONFIG_PATA_ARTOP=y
+CONFIG_PATA_ATIIXP=y
+CONFIG_PATA_ATP867X=y
+CONFIG_PATA_CMD64X=y
+CONFIG_PATA_CS5520=y
+CONFIG_PATA_CS5530=y
+CONFIG_PATA_CYPRESS=y
+CONFIG_PATA_EFAR=y
+CONFIG_PATA_HPT366=y
+CONFIG_PATA_HPT37X=y
+CONFIG_PATA_HPT3X2N=y
+CONFIG_PATA_HPT3X3=y
+CONFIG_PATA_HPT3X3_DMA=y
+CONFIG_PATA_IT8213=y
+CONFIG_PATA_IT821X=y
+CONFIG_PATA_JMICRON=y
+CONFIG_PATA_MARVELL=y
+CONFIG_PATA_NETCELL=y
+CONFIG_PATA_NINJA32=y
+CONFIG_PATA_NS87415=y
+CONFIG_PATA_OLDPIIX=y
+CONFIG_PATA_OPTIDMA=y
+CONFIG_PATA_PDC2027X=y
+CONFIG_PATA_PDC_OLD=y
+CONFIG_PATA_RADISYS=y
+CONFIG_PATA_RDC=y
+CONFIG_PATA_SC1200=y
+CONFIG_PATA_SCH=y
+CONFIG_PATA_SERVERWORKS=y
+CONFIG_PATA_SIL680=y
+CONFIG_PATA_SIS=y
+CONFIG_PATA_TOSHIBA=m
+CONFIG_PATA_TRIFLEX=y
+CONFIG_PATA_VIA=y
+CONFIG_PATA_WINBOND=y
+
+#
+# PIO-only SFF controllers
+#
+CONFIG_PATA_CMD640_PCI=y
+CONFIG_PATA_MPIIX=y
+CONFIG_PATA_NS87410=y
+CONFIG_PATA_OPTI=y
+CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_RZ1000=y
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_PATA_ACPI=y
+CONFIG_ATA_GENERIC=y
+CONFIG_PATA_LEGACY=y
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_AUTODETECT=y
+CONFIG_MD_LINEAR=y
+CONFIG_MD_RAID0=y
+CONFIG_MD_RAID1=y
+CONFIG_MD_RAID10=y
+CONFIG_MD_RAID456=y
+# CONFIG_MULTICORE_RAID456 is not set
+CONFIG_MD_RAID6_PQ=y
+CONFIG_ASYNC_RAID6_TEST=m
+CONFIG_MD_MULTIPATH=y
+CONFIG_MD_FAULTY=m
+CONFIG_BLK_DEV_DM=y
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_CRYPT=y
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_MIRROR=y
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+# CONFIG_DM_DELAY is not set
+CONFIG_DM_UEVENT=y
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+CONFIG_FUSION_LAN=m
+# CONFIG_FUSION_LOGGING is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# You can enable one or both FireWire driver stacks.
+#
+
+#
+# The newer stack is recommended.
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_OHCI_DEBUG=y
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_IEEE1394=m
+CONFIG_IEEE1394_OHCI1394=m
+CONFIG_IEEE1394_PCILYNX=m
+CONFIG_IEEE1394_SBP2=m
+# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
+CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y
+CONFIG_IEEE1394_ETH1394=m
+CONFIG_IEEE1394_RAWIO=m
+CONFIG_IEEE1394_VIDEO1394=m
+CONFIG_IEEE1394_DV1394=m
+# CONFIG_IEEE1394_VERBOSEDEBUG is not set
+CONFIG_I2O=m
+CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
+CONFIG_I2O_EXT_ADAPTEC=y
+CONFIG_I2O_EXT_ADAPTEC_DMA64=y
+CONFIG_I2O_CONFIG=m
+# CONFIG_I2O_CONFIG_OLD_IOCTL is not set
+CONFIG_I2O_BUS=m
+CONFIG_I2O_BLOCK=m
+CONFIG_I2O_SCSI=m
+CONFIG_I2O_PROC=m
+CONFIG_MACINTOSH_DRIVERS=y
+CONFIG_MAC_EMUMOUSEBTN=y
+CONFIG_NETDEVICES=y
+CONFIG_IFB=m
+CONFIG_DUMMY=m
+CONFIG_BONDING=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_EQUALIZER=m
+CONFIG_TUN=m
+CONFIG_VETH=m
+CONFIG_NET_SB1000=m
+CONFIG_ARCNET=m
+CONFIG_ARCNET_1201=m
+CONFIG_ARCNET_1051=m
+CONFIG_ARCNET_RAW=m
+CONFIG_ARCNET_CAP=m
+CONFIG_ARCNET_COM90xx=m
+CONFIG_ARCNET_COM90xxIO=m
+CONFIG_ARCNET_RIM_I=m
+CONFIG_ARCNET_COM20020=m
+CONFIG_ARCNET_COM20020_PCI=m
+CONFIG_PHYLIB=m
+
+#
+# MII PHY device drivers
+#
+CONFIG_MARVELL_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_STE10XP=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MICREL_PHY=m
+CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_GPIO=m
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=m
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_ETHOC=m
+CONFIG_DNET=m
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+CONFIG_TULIP_MMIO=y
+# CONFIG_TULIP_NAPI is not set
+CONFIG_DE4X5=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_PCMCIA_XIRCOM=m
+CONFIG_HP100=m
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
+CONFIG_NET_PCI=y
+CONFIG_PCNET32=m
+CONFIG_AMD8111_ETH=m
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_KSZ884X_PCI=m
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_FORCEDETH=m
+CONFIG_E100=m
+CONFIG_FEALNX=m
+CONFIG_NATSEMI=m
+CONFIG_NE2K_PCI=m
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+CONFIG_8139TOO_PIO=y
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R6040=m
+CONFIG_SIS900=m
+CONFIG_EPIC100=m
+CONFIG_SMSC9420=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_TLAN=m
+CONFIG_KS8842=m
+CONFIG_KS8851_MLL=m
+CONFIG_VIA_RHINE=m
+CONFIG_VIA_RHINE_MMIO=y
+CONFIG_SC92031=m
+CONFIG_NET_POCKET=y
+CONFIG_ATP=m
+CONFIG_DE600=m
+CONFIG_DE620=m
+CONFIG_ATL2=m
+CONFIG_NETDEV_1000=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_DL2K=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IP1000=m
+CONFIG_IGB=m
+CONFIG_IGB_DCA=y
+CONFIG_IGBVF=m
+CONFIG_NS83820=m
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_R8169=m
+CONFIG_R8169_VLAN=y
+CONFIG_SIS190=m
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_VIA_VELOCITY=m
+CONFIG_TIGON3=m
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_QLA3XXX=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_JME=m
+CONFIG_NETDEV_10000=y
+CONFIG_MDIO=m
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3_DEPENDS=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4_DEPENDS=y
+CONFIG_CHELSIO_T4=m
+CONFIG_ENIC=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_DCA=y
+CONFIG_IXGBEVF=m
+CONFIG_IXGB=m
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+CONFIG_MYRI10GE=m
+CONFIG_MYRI10GE_DCA=y
+CONFIG_NETXEN_NIC=m
+CONFIG_NIU=m
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_TEHUTI=m
+CONFIG_BNX2X=m
+CONFIG_QLCNIC=m
+CONFIG_QLGE=m
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_BE2NET=m
+CONFIG_TR=m
+CONFIG_IBMOL=m
+CONFIG_3C359=m
+CONFIG_TMS380TR=m
+CONFIG_TMSPCI=m
+CONFIG_ABYSS=m
+CONFIG_WLAN=y
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_AIRO=m
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_PCMCIA_ATMEL=m
+CONFIG_AT76C50X_USB=m
+CONFIG_AIRO_CS=m
+CONFIG_PCMCIA_WL3501=m
+CONFIG_PRISM54=m
+CONFIG_USB_ZD1201=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_ADM8211=m
+# CONFIG_MAC80211_HWSIM is not set
+CONFIG_MWL8K=m
+CONFIG_ATH_COMMON=m
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K=m
+# CONFIG_ATH9K_DEBUGFS is not set
+CONFIG_ATH9K_HTC=m
+# CONFIG_ATH9K_HTC_DEBUGFS is not set
+CONFIG_AR9170_USB=m
+CONFIG_AR9170_LEDS=y
+CONFIG_B43=m
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_PCMCIA=y
+CONFIG_B43_SDIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+# CONFIG_B43LEGACY_DEBUG is not set
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_IWLWIFI=m
+# CONFIG_IWLWIFI_DEBUG is not set
+# CONFIG_IWLWIFI_DEVICE_TRACING is not set
+CONFIG_IWLAGN=m
+CONFIG_IWL4965=y
+CONFIG_IWL5000=y
+CONFIG_IWL3945=m
+CONFIG_IWM=m
+# CONFIG_IWM_DEBUG is not set
+# CONFIG_IWM_TRACING is not set
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
+CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_HERMES=m
+# CONFIG_HERMES_PRISM is not set
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_ORINOCO_USB=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_P54_LEDS=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI_PCI=y
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT30XX=y
+CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT30XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RT2800_LIB=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_HT=y
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_WL12XX=m
+CONFIG_WL1251=m
+CONFIG_WL1251_SDIO=m
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+
+#
+# WiMAX Wireless Broadband devices
+#
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_SDIO=m
+# CONFIG_WIMAX_IWMC3200_SDIO is not set
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+
+#
+# USB Network Adapters
+#
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+# CONFIG_USB_EPSON2888 is not set
+# CONFIG_USB_KC2190 is not set
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_NET_PCMCIA=y
+CONFIG_PCMCIA_3C589=m
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_PCMCIA_XIRC2PS=m
+CONFIG_PCMCIA_AXNET=m
+CONFIG_ARCNET_COM20020_CS=m
+CONFIG_PCMCIA_IBMTR=m
+CONFIG_WAN=y
+CONFIG_LANMEDIA=m
+CONFIG_HDLC=m
+CONFIG_HDLC_RAW=m
+CONFIG_HDLC_RAW_ETH=m
+CONFIG_HDLC_CISCO=m
+CONFIG_HDLC_FR=m
+CONFIG_HDLC_PPP=m
+
+#
+# X.25/LAPB support is disabled
+#
+CONFIG_PCI200SYN=m
+CONFIG_WANXL=m
+# CONFIG_PC300TOO is not set
+CONFIG_FARSYNC=m
+CONFIG_DSCC4=m
+# CONFIG_DSCC4_PCISYNC is not set
+# CONFIG_DSCC4_PCI_RST is not set
+CONFIG_DLCI=m
+CONFIG_DLCI_MAX=8
+CONFIG_WAN_ROUTER_DRIVERS=m
+CONFIG_CYCLADES_SYNC=m
+CONFIG_CYCLOMX_X25=y
+CONFIG_SBNI=m
+# CONFIG_SBNI_MULTILINE is not set
+CONFIG_ATM_DRIVERS=y
+CONFIG_ATM_DUMMY=m
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+# CONFIG_ATM_ENI_TUNE_BURST is not set
+CONFIG_ATM_FIRESTREAM=m
+CONFIG_ATM_ZATM=m
+# CONFIG_ATM_ZATM_DEBUG is not set
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_AMBASSADOR=m
+# CONFIG_ATM_AMBASSADOR_DEBUG is not set
+CONFIG_ATM_HORIZON=m
+# CONFIG_ATM_HORIZON_DEBUG is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+# CONFIG_ATM_FORE200E_USE_TASKLET is not set
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+# CONFIG_ATM_HE_USE_SUNI is not set
+CONFIG_ATM_SOLOS=m
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKEHARD=m
+CONFIG_FDDI=y
+CONFIG_DEFXX=m
+# CONFIG_DEFXX_MMIO is not set
+CONFIG_SKFP=m
+CONFIG_HIPPI=y
+CONFIG_ROADRUNNER=m
+# CONFIG_ROADRUNNER_LARGE_RINGS is not set
+CONFIG_PLIP=m
+CONFIG_PPP=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPPOE=m
+CONFIG_PPPOATM=m
+CONFIG_PPPOL2TP=m
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLHC=m
+CONFIG_SLIP_SMART=y
+# CONFIG_SLIP_MODE_SLIP6 is not set
+CONFIG_NET_FC=y
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+# CONFIG_NETPOLL_TRAP is not set
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_VIRTIO_NET=m
+CONFIG_VMXNET3=m
+CONFIG_ISDN=y
+CONFIG_ISDN_I4L=m
+CONFIG_ISDN_PPP=y
+CONFIG_ISDN_PPP_VJ=y
+CONFIG_ISDN_MPP=y
+CONFIG_IPPP_FILTER=y
+CONFIG_ISDN_PPP_BSDCOMP=m
+CONFIG_ISDN_AUDIO=y
+CONFIG_ISDN_TTY_FAX=y
+
+#
+# ISDN feature submodules
+#
+CONFIG_ISDN_DIVERSION=m
+
+#
+# ISDN4Linux hardware drivers
+#
+
+#
+# Passive cards
+#
+CONFIG_ISDN_DRV_HISAX=m
+
+#
+# D-channel protocol features
+#
+CONFIG_HISAX_EURO=y
+CONFIG_DE_AOC=y
+CONFIG_HISAX_NO_SENDCOMPLETE=y
+CONFIG_HISAX_NO_LLC=y
+CONFIG_HISAX_NO_KEYPAD=y
+CONFIG_HISAX_1TR6=y
+CONFIG_HISAX_NI1=y
+CONFIG_HISAX_MAX_CARDS=8
+
+#
+# HiSax supported cards
+#
+CONFIG_HISAX_16_3=y
+CONFIG_HISAX_TELESPCI=y
+CONFIG_HISAX_S0BOX=y
+CONFIG_HISAX_FRITZPCI=y
+CONFIG_HISAX_AVM_A1_PCMCIA=y
+CONFIG_HISAX_ELSA=y
+CONFIG_HISAX_DIEHLDIVA=y
+CONFIG_HISAX_SEDLBAUER=y
+CONFIG_HISAX_NETJET=y
+CONFIG_HISAX_NETJET_U=y
+CONFIG_HISAX_NICCY=y
+CONFIG_HISAX_BKM_A4T=y
+CONFIG_HISAX_SCT_QUADRO=y
+CONFIG_HISAX_GAZEL=y
+CONFIG_HISAX_HFC_PCI=y
+CONFIG_HISAX_W6692=y
+CONFIG_HISAX_HFC_SX=y
+CONFIG_HISAX_ENTERNOW_PCI=y
+# CONFIG_HISAX_DEBUG is not set
+
+#
+# HiSax PCMCIA card service modules
+#
+CONFIG_HISAX_SEDLBAUER_CS=m
+CONFIG_HISAX_ELSA_CS=m
+CONFIG_HISAX_AVM_A1_CS=m
+CONFIG_HISAX_TELES_CS=m
+
+#
+# HiSax sub driver modules
+#
+CONFIG_HISAX_ST5481=m
+CONFIG_HISAX_HFCUSB=m
+CONFIG_HISAX_HFC4S8S=m
+CONFIG_HISAX_FRITZ_PCIPNP=m
+
+#
+# Active cards
+#
+CONFIG_ISDN_CAPI=m
+CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
+CONFIG_CAPI_TRACE=y
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
+CONFIG_ISDN_CAPI_CAPIFS=m
+CONFIG_ISDN_CAPI_CAPIDRV=m
+
+#
+# CAPI hardware drivers
+#
+CONFIG_CAPI_AVM=y
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
+CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_CAPI_EICON=y
+CONFIG_ISDN_DIVAS=m
+CONFIG_ISDN_DIVAS_BRIPCI=y
+CONFIG_ISDN_DIVAS_PRIPCI=y
+CONFIG_ISDN_DIVAS_DIVACAPI=m
+CONFIG_ISDN_DIVAS_USERIDI=m
+CONFIG_ISDN_DIVAS_MAINT=m
+CONFIG_ISDN_DRV_GIGASET=m
+# CONFIG_GIGASET_CAPI is not set
+CONFIG_GIGASET_I4L=y
+# CONFIG_GIGASET_DUMMYLL is not set
+CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M105=m
+# CONFIG_GIGASET_M101 is not set
+# CONFIG_GIGASET_DEBUG is not set
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
+CONFIG_MISDN=m
+CONFIG_MISDN_DSP=m
+CONFIG_MISDN_L1OIP=m
+
+#
+# mISDN hardware drivers
+#
+CONFIG_MISDN_HFCPCI=m
+CONFIG_MISDN_HFCMULTI=m
+CONFIG_MISDN_HFCUSB=m
+CONFIG_MISDN_AVMFRITZ=m
+CONFIG_MISDN_SPEEDFAX=m
+CONFIG_MISDN_INFINEON=m
+CONFIG_MISDN_W6692=m
+CONFIG_MISDN_NETJET=m
+CONFIG_MISDN_IPAC=m
+CONFIG_MISDN_ISAR=m
+CONFIG_ISDN_HDLC=m
+CONFIG_PHONE=m
+CONFIG_PHONE_IXJ=m
+CONFIG_PHONE_IXJ_PCMCIA=m
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_FF_MEMLESS=y
+CONFIG_INPUT_POLLDEV=m
+CONFIG_INPUT_SPARSEKMAP=m
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT2160=m
+# CONFIG_KEYBOARD_LKKBD is not set
+CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_MATRIX=m
+CONFIG_KEYBOARD_LM8323=m
+CONFIG_KEYBOARD_MAX7359=m
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_KEYBOARD_OPENCORES=m
+CONFIG_KEYBOARD_STOWAWAY=m
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_SENTELIC=y
+CONFIG_MOUSE_PS2_TOUCHKIT=y
+CONFIG_MOUSE_SERIAL=m
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_VSXXXAA=m
+CONFIG_MOUSE_GPIO=m
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_JOYSTICK_ANALOG=m
+CONFIG_JOYSTICK_A3D=m
+CONFIG_JOYSTICK_ADI=m
+CONFIG_JOYSTICK_COBRA=m
+CONFIG_JOYSTICK_GF2K=m
+CONFIG_JOYSTICK_GRIP=m
+CONFIG_JOYSTICK_GRIP_MP=m
+CONFIG_JOYSTICK_GUILLEMOT=m
+CONFIG_JOYSTICK_INTERACT=m
+CONFIG_JOYSTICK_SIDEWINDER=m
+CONFIG_JOYSTICK_TMDC=m
+CONFIG_JOYSTICK_IFORCE=m
+CONFIG_JOYSTICK_IFORCE_USB=y
+CONFIG_JOYSTICK_IFORCE_232=y
+CONFIG_JOYSTICK_WARRIOR=m
+CONFIG_JOYSTICK_MAGELLAN=m
+CONFIG_JOYSTICK_SPACEORB=m
+CONFIG_JOYSTICK_SPACEBALL=m
+CONFIG_JOYSTICK_STINGER=m
+CONFIG_JOYSTICK_TWIDJOY=m
+CONFIG_JOYSTICK_ZHENHUA=m
+CONFIG_JOYSTICK_DB9=m
+CONFIG_JOYSTICK_GAMECON=m
+CONFIG_JOYSTICK_TURBOGRAFX=m
+CONFIG_JOYSTICK_JOYDUMP=m
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+# CONFIG_JOYSTICK_WALKERA0701 is not set
+CONFIG_INPUT_TABLET=y
+CONFIG_TABLET_USB_ACECAD=m
+CONFIG_TABLET_USB_AIPTEK=m
+CONFIG_TABLET_USB_GTCO=m
+CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_USB_WACOM=m
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_GUNZE=m
+CONFIG_TOUCHSCREEN_ELO=m
+CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TOUCHSCREEN_MCS5000=m
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_MK712=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_UCB1400=m
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
+CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
+CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
+CONFIG_TOUCHSCREEN_USB_GOTOP=y
+CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_E2I=y
+CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
+CONFIG_TOUCHSCREEN_USB_ETT_TC5UH=y
+CONFIG_TOUCHSCREEN_USB_NEXIO=y
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC2007=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_APANEL=m
+CONFIG_INPUT_ATLAS_BTNS=m
+CONFIG_INPUT_ATI_REMOTE=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_WINBOND_CIR=m
+CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_PCF8574=m
+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_CT82C710=m
+CONFIG_SERIO_PARKBD=m
+CONFIG_SERIO_PCIPS2=m
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_RAW=m
+CONFIG_SERIO_ALTERA_PS2=m
+CONFIG_GAMEPORT=m
+CONFIG_GAMEPORT_NS558=m
+CONFIG_GAMEPORT_L4=m
+CONFIG_GAMEPORT_EMU10K1=m
+CONFIG_GAMEPORT_FM801=m
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_DEVKMEM=y
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_COMPUTONE=m
+CONFIG_ROCKETPORT=m
+CONFIG_CYCLADES=m
+# CONFIG_CYZ_INTR is not set
+CONFIG_DIGIEPCA=m
+CONFIG_MOXA_INTELLIO=m
+CONFIG_MOXA_SMARTIO=m
+CONFIG_ISI=m
+CONFIG_SYNCLINK=m
+CONFIG_SYNCLINKMP=m
+CONFIG_SYNCLINK_GT=m
+CONFIG_N_HDLC=m
+CONFIG_N_GSM=m
+CONFIG_RISCOM8=m
+CONFIG_SPECIALIX=m
+CONFIG_STALDRV=y
+CONFIG_STALLION=m
+CONFIG_ISTALLION=m
+CONFIG_NOZOMI=m
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_PNP=y
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_DETECT_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_UARTLITE=m
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_TIMBERDALE=m
+CONFIG_SERIAL_ALTERA_JTAGUART=m
+CONFIG_SERIAL_ALTERA_UART=m
+CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
+CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+CONFIG_UNIX98_PTYS=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=32
+CONFIG_PRINTER=m
+CONFIG_LP_CONSOLE=y
+CONFIG_PPDEV=m
+CONFIG_HVC_DRIVER=y
+CONFIG_VIRTIO_CONSOLE=m
+CONFIG_IPMI_HANDLER=m
+# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_INTEL=m
+CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_VIA=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_NVRAM=m
+CONFIG_R3964=m
+CONFIG_APPLICOM=m
+
+#
+# PCMCIA character devices
+#
+CONFIG_SYNCLINK_CS=m
+CONFIG_CARDMAN_4000=m
+CONFIG_CARDMAN_4040=m
+CONFIG_IPWIRELESS=m
+CONFIG_MWAVE=m
+CONFIG_PC8736x_GPIO=m
+CONFIG_NSC_GPIO=m
+CONFIG_RAW_DRIVER=m
+CONFIG_MAX_RAW_DEVS=256
+CONFIG_HPET=y
+CONFIG_HPET_MMAP=y
+CONFIG_HANGCHECK_TIMER=m
+CONFIG_TCG_TPM=m
+# CONFIG_TCG_TIS is not set
+# CONFIG_TCG_NSC is not set
+CONFIG_TCG_ATMEL=m
+# CONFIG_TCG_INFINEON is not set
+CONFIG_TELCLOCK=m
+CONFIG_DEVPORT=y
+CONFIG_RAMOOPS=m
+CONFIG_I2C=m
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD756_S4882=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NFORCE2_S4985=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+
+#
+# ACPI drivers
+#
+CONFIG_I2C_SCMI=m
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+CONFIG_I2C_GPIO=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_XILINX=m
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_I2C_STUB=m
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_SPI is not set
+
+#
+# PPS support
+#
+CONFIG_PPS=m
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_KTIMER is not set
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_GPIOLIB=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_MAX730X=m
+
+#
+# Memory mapped GPIO expanders:
+#
+CONFIG_GPIO_IT8761E=m
+CONFIG_GPIO_SCH=m
+
+#
+# I2C GPIO expanders:
+#
+CONFIG_GPIO_MAX7300=m
+CONFIG_GPIO_MAX732X=m
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_ADP5588=m
+
+#
+# PCI GPIO expanders:
+#
+CONFIG_GPIO_CS5535=m
+# CONFIG_GPIO_LANGWELL is not set
+# CONFIG_GPIO_TIMBERDALE is not set
+CONFIG_GPIO_RDC321X=m
+
+#
+# SPI GPIO expanders:
+#
+
+#
+# AC97 GPIO expanders:
+#
+# CONFIG_GPIO_UCB1400 is not set
+
+#
+# MODULbus GPIO expanders:
+#
+CONFIG_GPIO_JANZ_TTL=m
+CONFIG_W1=m
+CONFIG_W1_CON=y
+
+#
+# 1-wire Bus Masters
+#
+CONFIG_W1_MASTER_MATROX=m
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_GPIO=m
+
+#
+# 1-wire Slaves
+#
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2431=m
+CONFIG_W1_SLAVE_DS2433=m
+CONFIG_W1_SLAVE_DS2433_CRC=y
+CONFIG_W1_SLAVE_DS2760=m
+CONFIG_W1_SLAVE_BQ27000=m
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_PDA_POWER=m
+CONFIG_TEST_POWER=m
+CONFIG_BATTERY_DS2760=m
+CONFIG_BATTERY_DS2782=m
+CONFIG_BATTERY_BQ27x00=m
+CONFIG_BATTERY_MAX17040=m
+CONFIG_CHARGER_PCF50633=m
+CONFIG_HWMON=m
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_ABITUGURU=m
+CONFIG_SENSORS_ABITUGURU3=m
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_K10TEMP=m
+CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_I5K_AMB=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_LM63=m
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_VIA_CPUTEMP=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_HDAPS=m
+CONFIG_SENSORS_LIS3_I2C=m
+CONFIG_SENSORS_APPLESMC=m
+
+#
+# ACPI drivers
+#
+CONFIG_SENSORS_ATK0110=m
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_THERMAL=m
+CONFIG_THERMAL_HWMON=y
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_ALIM1535_WDT=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_GEODE_WDT=m
+CONFIG_SC520_WDT=m
+CONFIG_SBC_FITPC2_WATCHDOG=m
+CONFIG_EUROTECH_WDT=m
+CONFIG_IB700_WDT=m
+CONFIG_IBMASR=m
+CONFIG_WAFER_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_ITCO_WDT=m
+CONFIG_ITCO_VENDOR_SUPPORT=y
+CONFIG_IT8712F_WDT=m
+CONFIG_IT87_WDT=m
+CONFIG_HP_WATCHDOG=m
+CONFIG_SC1200_WDT=m
+CONFIG_PC87413_WDT=m
+CONFIG_60XX_WDT=m
+CONFIG_SBC8360_WDT=m
+CONFIG_CPU5_WDT=m
+CONFIG_SMSC_SCH311X_WDT=m
+CONFIG_SMSC37B787_WDT=m
+CONFIG_W83627HF_WDT=m
+CONFIG_W83697HF_WDT=m
+CONFIG_W83697UG_WDT=m
+CONFIG_W83877F_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_MACHZ_WDT=m
+CONFIG_SBC_EPX_C3_WATCHDOG=m
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+CONFIG_SSB_PCMCIAHOST=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_MFD_SUPPORT=y
+CONFIG_MFD_CORE=m
+# CONFIG_MFD_SM501 is not set
+CONFIG_HTC_PASIC3=m
+CONFIG_UCB1400_CORE=m
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
+# CONFIG_MFD_TMIO is not set
+CONFIG_MFD_WM8400=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+# CONFIG_ABX500_CORE is not set
+CONFIG_MFD_TIMBERDALE=m
+CONFIG_LPC_SCH=m
+CONFIG_MFD_RDC321X=m
+CONFIG_MFD_JANZ_CMODIO=m
+# CONFIG_REGULATOR is not set
+CONFIG_MEDIA_SUPPORT=m
+
+#
+# Multimedia core support
+#
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_VIDEO_ALLOW_V4L1=y
+CONFIG_VIDEO_V4L1_COMPAT=y
+CONFIG_DVB_CORE=m
+CONFIG_VIDEO_MEDIA=m
+
+#
+# Multimedia drivers
+#
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_IR_CORE=m
+CONFIG_VIDEO_IR=m
+CONFIG_RC_MAP=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_IMON=m
+CONFIG_MEDIA_ATTACH=y
+CONFIG_MEDIA_TUNER=m
+# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEO_V4L1=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEOBUF_DMA_CONTIG=m
+CONFIG_VIDEOBUF_DVB=m
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# Encoders/decoders and other helper chips
+#
+
+#
+# Audio decoders
+#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TDA9875=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_M52790=m
+CONFIG_VIDEO_TLV320AIC23B=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+
+#
+# Video decoders
+#
+CONFIG_VIDEO_ADV7180=m
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_BT866=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_MT9V011=m
+CONFIG_VIDEO_TCM825X=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_SAA7191=m
+CONFIG_VIDEO_TVP514X=m
+CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_TVP7002=m
+CONFIG_VIDEO_VPX3220=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_CX25840=m
+
+#
+# MPEG video encoders
+#
+CONFIG_VIDEO_CX2341X=m
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+CONFIG_VIDEO_THS7303=m
+CONFIG_VIDEO_ADV7343=m
+CONFIG_VIDEO_AK881X=m
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+CONFIG_VIDEO_VIVI=m
+CONFIG_VIDEO_BT848=m
+CONFIG_VIDEO_BT848_DVB=y
+CONFIG_VIDEO_BWQCAM=m
+CONFIG_VIDEO_CQCAM=m
+CONFIG_VIDEO_W9966=m
+CONFIG_VIDEO_CPIA=m
+CONFIG_VIDEO_CPIA_PP=m
+CONFIG_VIDEO_CPIA_USB=m
+CONFIG_VIDEO_CPIA2=m
+CONFIG_VIDEO_SAA5246A=m
+CONFIG_VIDEO_SAA5249=m
+CONFIG_VIDEO_STRADIS=m
+CONFIG_VIDEO_ZORAN=m
+CONFIG_VIDEO_ZORAN_DC30=m
+CONFIG_VIDEO_ZORAN_ZR36060=m
+CONFIG_VIDEO_ZORAN_BUZ=m
+CONFIG_VIDEO_ZORAN_DC10=m
+CONFIG_VIDEO_ZORAN_LML33=m
+CONFIG_VIDEO_ZORAN_LML33R10=m
+CONFIG_VIDEO_ZORAN_AVS6EYES=m
+CONFIG_VIDEO_MEYE=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_FB_IVTV=m
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_SAA7164=m
+CONFIG_VIDEO_CAFE_CCIC=m
+CONFIG_SOC_CAMERA=m
+CONFIG_SOC_CAMERA_MT9M001=m
+CONFIG_SOC_CAMERA_MT9M111=m
+CONFIG_SOC_CAMERA_MT9T031=m
+CONFIG_SOC_CAMERA_MT9T112=m
+CONFIG_SOC_CAMERA_MT9V022=m
+CONFIG_SOC_CAMERA_RJ54N1=m
+CONFIG_SOC_CAMERA_TW9910=m
+CONFIG_SOC_CAMERA_PLATFORM=m
+CONFIG_SOC_CAMERA_OV772X=m
+CONFIG_SOC_CAMERA_OV9640=m
+CONFIG_V4L_USB_DRIVERS=y
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_TLG2300=m
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_VIDEO_USBVIDEO=m
+CONFIG_USB_VICAM=m
+CONFIG_USB_IBMCAM=m
+CONFIG_USB_KONICAWC=m
+CONFIG_USB_QUICKCAM_MESSENGER=m
+CONFIG_USB_ET61X251=m
+CONFIG_VIDEO_OVCAMCHIP=m
+CONFIG_USB_W9968CF=m
+CONFIG_USB_OV511=m
+CONFIG_USB_SE401=m
+CONFIG_USB_SN9C102=m
+CONFIG_USB_STV680=m
+CONFIG_USB_ZC0301=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_MEM2MEM_TESTDEV=m
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_GEMTEK_PCI=m
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_MAESTRO=m
+CONFIG_I2C_SI4713=m
+CONFIG_RADIO_SI4713=m
+CONFIG_USB_DSBR=m
+# CONFIG_RADIO_SI470X is not set
+CONFIG_USB_MR800=m
+CONFIG_RADIO_TEA5764=m
+CONFIG_RADIO_SAA7706H=m
+CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_TIMBERDALE=m
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
+CONFIG_DVB_CAPTURE_DRIVERS=y
+
+#
+# Supported SAA7146 based PCI Adapters
+#
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_BUDGET_PATCH=m
+
+#
+# Supported USB Adapters
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_FRIIO=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_SMS_SIANO_MDTV=m
+
+#
+# Siano module components
+#
+CONFIG_SMS_USB_DRV=m
+CONFIG_SMS_SDIO_DRV=m
+
+#
+# Supported FlexCopII (B2C2) Adapters
+#
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
+
+#
+# Supported BT878 Adapters
+#
+CONFIG_DVB_BT8XX=m
+
+#
+# Supported Pluto2 Adapters
+#
+CONFIG_DVB_PLUTO2=m
+
+#
+# Supported SDMC DM1105 Adapters
+#
+CONFIG_DVB_DM1105=m
+
+#
+# Supported FireWire (IEEE 1394) Adapters
+#
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_FIREWIRE=y
+CONFIG_DVB_FIREDTV_IEEE1394=y
+CONFIG_DVB_FIREDTV_INPUT=y
+
+#
+# Supported Earthsoft PT1 Adapters
+#
+CONFIG_DVB_PT1=m
+
+#
+# Supported Mantis Adapters
+#
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+
+#
+# Supported nGene Adapters
+#
+CONFIG_DVB_NGENE=m
+
+#
+# Supported DVB Frontends
+#
+CONFIG_DVB_FE_CUSTOMISE=y
+
+#
+# Customise DVB Frontends
+#
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV6110x=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_SP8870=m
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_DRX397XD=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3304=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_S5H1411=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_S921=m
+CONFIG_DVB_DIB8000=m
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_TDA665x=m
+
+#
+# Tools to develop new frontends
+#
+# CONFIG_DVB_DUMMY_FE is not set
+CONFIG_DAB=y
+CONFIG_USB_DABUSB=m
+
+#
+# Graphics support
+#
+CONFIG_AGP=m
+CONFIG_AGP_AMD64=m
+CONFIG_AGP_INTEL=m
+CONFIG_AGP_SIS=m
+CONFIG_AGP_VIA=m
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_VGA_SWITCHEROO=y
+CONFIG_DRM=m
+CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_TTM=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_RADEON=m
+CONFIG_DRM_RADEON_KMS=y
+CONFIG_DRM_I810=m
+CONFIG_DRM_I830=m
+CONFIG_DRM_I915=m
+CONFIG_DRM_I915_KMS=y
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
+CONFIG_VGASTATE=m
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_DDC=m
+CONFIG_FB_BOOT_VESA_SUPPORT=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=m
+CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_HECUBA=m
+CONFIG_FB_SVGALIB=m
+# CONFIG_FB_MACMODES is not set
+CONFIG_FB_BACKLIGHT=y
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+CONFIG_FB_CIRRUS=m
+CONFIG_FB_PM2=m
+# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
+CONFIG_FB_CYBER2000=m
+CONFIG_FB_ARC=m
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+CONFIG_FB_VGA16=m
+# CONFIG_FB_UVESA is not set
+CONFIG_FB_VESA=y
+# CONFIG_FB_EFI is not set
+CONFIG_FB_N411=m
+CONFIG_FB_HGA=m
+# CONFIG_FB_HGA_ACCEL is not set
+CONFIG_FB_S1D13XXX=m
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_NVIDIA_DEBUG is not set
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA=m
+CONFIG_FB_RIVA_I2C=y
+# CONFIG_FB_RIVA_DEBUG is not set
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_LE80578=m
+CONFIG_FB_CARILLO_RANCH=m
+CONFIG_FB_MATROX=m
+CONFIG_FB_MATROX_MILLENIUM=y
+CONFIG_FB_MATROX_MYSTIQUE=y
+CONFIG_FB_MATROX_G=y
+CONFIG_FB_MATROX_I2C=m
+CONFIG_FB_MATROX_MAVEN=m
+CONFIG_FB_RADEON=m
+CONFIG_FB_RADEON_I2C=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+# CONFIG_FB_RADEON_DEBUG is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_BACKLIGHT=y
+CONFIG_FB_S3=m
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
+CONFIG_FB_SIS=m
+CONFIG_FB_SIS_300=y
+CONFIG_FB_SIS_315=y
+CONFIG_FB_VIA=m
+# CONFIG_FB_VIA_DIRECT_PROCFS is not set
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_KYRO=m
+CONFIG_FB_3DFX=m
+# CONFIG_FB_3DFX_ACCEL is not set
+CONFIG_FB_3DFX_I2C=y
+CONFIG_FB_VOODOO1=m
+CONFIG_FB_VT8623=m
+CONFIG_FB_TRIDENT=m
+CONFIG_FB_ARK=m
+CONFIG_FB_PM3=m
+CONFIG_FB_CARMINE=m
+CONFIG_FB_CARMINE_DRAM_EVAL=y
+# CONFIG_CARMINE_DRAM_CUSTOM is not set
+CONFIG_FB_GEODE=y
+CONFIG_FB_GEODE_LX=m
+CONFIG_FB_GEODE_GX=m
+CONFIG_FB_GEODE_GX1=m
+CONFIG_FB_TMIO=m
+CONFIG_FB_TMIO_ACCELL=y
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_METRONOME=m
+CONFIG_FB_MB862XX=m
+CONFIG_FB_MB862XX_PCI_GDC=y
+CONFIG_FB_BROADSHEET=m
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_PLATFORM=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_GENERIC=m
+CONFIG_BACKLIGHT_PROGEAR=m
+CONFIG_BACKLIGHT_CARILLO_RANCH=m
+CONFIG_BACKLIGHT_MBP_NVIDIA=m
+CONFIG_BACKLIGHT_SAHARA=m
+CONFIG_BACKLIGHT_ADP8860=m
+CONFIG_BACKLIGHT_PCF50633=m
+
+#
+# Display device support
+#
+CONFIG_DISPLAY_SUPPORT=m
+
+#
+# Display hardware drivers
+#
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+CONFIG_VGACON_SOFT_SCROLLBACK=y
+CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+CONFIG_LOGO_LINUX_CLUT224=y
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_JACK=y
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_SEQUENCER_OSS=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_DYNAMIC_MINORS=y
+# CONFIG_SND_SUPPORT_OLD_API is not set
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_DMA_SGBUF=y
+CONFIG_SND_RAWMIDI_SEQ=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_VX_LIB=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_PCSP is not set
+CONFIG_SND_DUMMY=m
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+CONFIG_SND_SB_COMMON=m
+CONFIG_SND_SB16_DSP=m
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ALI5451=m
+CONFIG_SND_ASIHPI=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
+CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_CS5530=m
+CONFIG_SND_CS5535AUDIO=m
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_ES1968_INPUT=y
+CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
+CONFIG_SND_FM801_TEA575X=m
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+# CONFIG_SND_HDA_INPUT_BEEP is not set
+CONFIG_SND_HDA_INPUT_JACK=y
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_CODEC_REALTEK=y
+CONFIG_SND_HDA_CODEC_ANALOG=y
+CONFIG_SND_HDA_CODEC_SIGMATEL=y
+CONFIG_SND_HDA_CODEC_VIA=y
+CONFIG_SND_HDA_CODEC_ATIHDMI=y
+CONFIG_SND_HDA_CODEC_NVHDMI=y
+CONFIG_SND_HDA_CODEC_INTELHDMI=y
+CONFIG_SND_HDA_ELD=y
+CONFIG_SND_HDA_CODEC_CIRRUS=y
+CONFIG_SND_HDA_CODEC_CONEXANT=y
+CONFIG_SND_HDA_CODEC_CA0110=y
+CONFIG_SND_HDA_CODEC_CMEDIA=y
+CONFIG_SND_HDA_CODEC_SI3054=y
+CONFIG_SND_HDA_GENERIC=y
+# CONFIG_SND_HDA_POWER_SAVE is not set
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_HIFIER=m
+CONFIG_SND_ICE1712=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_LX6464ES=m
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MAESTRO3_INPUT=y
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
+CONFIG_SND_USB_US122L=m
+CONFIG_SND_PCMCIA=y
+CONFIG_SND_VXPOCKET=m
+CONFIG_SND_PDAUDIOCF=m
+# CONFIG_SND_SOC is not set
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=m
+CONFIG_HIDRAW=y
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# Special HID drivers
+#
+CONFIG_HID_3M_PCT=m
+CONFIG_HID_A4TECH=m
+CONFIG_HID_APPLE=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_CANDO=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EGALAX=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_KYE=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LOGITECH=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MOSART=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_QUANTA=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_ROCCAT_KONE=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SONY=m
+CONFIG_HID_STANTUM=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_GREENASIA=m
+CONFIG_GREENASIA_FF=y
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_WACOM=m
+CONFIG_HID_WACOM_POWER_SUPPLY=y
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
+CONFIG_HID_ZYDACRON=m
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+CONFIG_USB_SUSPEND=y
+# CONFIG_USB_OTG is not set
+CONFIG_USB_MON=y
+CONFIG_USB_WUSB=m
+CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_C67X00_HCD=m
+CONFIG_USB_XHCI_HCD=m
+# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_ISP1760_HCD=m
+CONFIG_USB_ISP1362_HCD=m
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_SSB=y
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_U132_HCD=m
+CONFIG_USB_SL811_HCD=m
+CONFIG_USB_SL811_CS=m
+CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_WHCI_HCD=m
+CONFIG_USB_HWA_HCD=m
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+
+#
+# USB port drivers
+#
+CONFIG_USB_USS720=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_EZUSB=y
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_FUNSOFT=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MOTOROLA=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_HP4X=m
+CONFIG_USB_SERIAL_SAFE=m
+CONFIG_USB_SERIAL_SAFE_PADDED=y
+CONFIG_USB_SERIAL_SIEMENS_MPI=m
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
+CONFIG_USB_SERIAL_ZIO=m
+CONFIG_USB_SERIAL_DEBUG=m
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_RIO500=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_LED=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_FTDI_ELAN=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_SISUSBVGA_CON=y
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+# CONFIG_USB_GADGET is not set
+
+#
+# OTG and related infrastructure
+#
+CONFIG_USB_OTG_UTILS=y
+CONFIG_USB_GPIO_VBUS=m
+CONFIG_NOP_USB_XCEIV=m
+CONFIG_UWB=m
+CONFIG_UWB_HWA=m
+CONFIG_UWB_WHCI=m
+CONFIG_UWB_WLP=m
+CONFIG_UWB_I1480U=m
+CONFIG_UWB_I1480U_WLP=m
+CONFIG_MMC=m
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+
+#
+# MMC/SD/SDIO Card Drivers
+#
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_BOUNCE=y
+CONFIG_SDIO_UART=m
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_WBSD=m
+CONFIG_MMC_TIFM_SD=m
+CONFIG_MMC_SDRICOH_CS=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=m
+
+#
+# LED drivers
+#
+CONFIG_LEDS_NET5501=m
+CONFIG_LEDS_ALIX2=m
+CONFIG_LEDS_PCA9532=m
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GPIO_PLATFORM=y
+CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_CLEVO_MAIL=m
+CONFIG_LEDS_PCA955X=m
+CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_INTEL_SS4200=m
+CONFIG_LEDS_LT3593=m
+CONFIG_LEDS_DELL_NETBOOKS=m
+CONFIG_LEDS_TRIGGERS=y
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+CONFIG_ACCESSIBILITY=y
+CONFIG_A11Y_BRAILLE_CONSOLE=y
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_USER_MEM=y
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_MTHCA=m
+CONFIG_INFINIBAND_MTHCA_DEBUG=y
+# CONFIG_INFINIBAND_IPATH is not set
+CONFIG_INFINIBAND_QIB=m
+CONFIG_INFINIBAND_AMSO1100=m
+# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
+# CONFIG_INFINIBAND_CXGB3 is not set
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_INFINIBAND_NES=m
+# CONFIG_INFINIBAND_NES_DEBUG is not set
+CONFIG_INFINIBAND_IPOIB=m
+# CONFIG_INFINIBAND_IPOIB_CM is not set
+CONFIG_INFINIBAND_IPOIB_DEBUG=y
+# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_EDAC=y
+
+#
+# Reporting subsystems
+#
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_DECODE_MCE=y
+# CONFIG_EDAC_MM_EDAC is not set
+CONFIG_RTC_LIB=m
+CONFIG_RTC_CLASS=m
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+CONFIG_RTC_DRV_TEST=m
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_PCF50633=m
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_ASYNC_TX_DISABLE_CHANNEL_SWITCH=y
+CONFIG_INTEL_IOATDMA=m
+CONFIG_TIMB_DMA=m
+CONFIG_DMA_ENGINE=y
+
+#
+# DMA Clients
+#
+CONFIG_NET_DMA=y
+# CONFIG_ASYNC_TX_DMA is not set
+CONFIG_DMATEST=m
+CONFIG_DCA=m
+CONFIG_AUXDISPLAY=y
+# CONFIG_KS0108 is not set
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_PDRV=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+CONFIG_STAGING=y
+# CONFIG_STAGING_EXCLUDE_BUILD is not set
+# CONFIG_ET131X is not set
+# CONFIG_SLICOSS is not set
+# CONFIG_VIDEO_GO7007 is not set
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=y
+# CONFIG_USB_IP_COMMON is not set
+# CONFIG_W35UND is not set
+# CONFIG_PRISM2_USB is not set
+# CONFIG_ECHO is not set
+# CONFIG_OTUS is not set
+CONFIG_RT2860=m
+CONFIG_RT2870=m
+# CONFIG_COMEDI is not set
+# CONFIG_ASUS_OLED is not set
+# CONFIG_PANEL is not set
+CONFIG_R8187SE=m
+CONFIG_RTL8192SU=m
+CONFIG_RTL8192U=m
+CONFIG_RTL8192E=m
+# CONFIG_TRANZPORT is not set
+CONFIG_POHMELFS=m
+# CONFIG_POHMELFS_DEBUG is not set
+CONFIG_POHMELFS_CRYPTO=y
+CONFIG_IDE_PHISON=m
+CONFIG_LINE6_USB=m
+CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_NOUVEAU=m
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+CONFIG_DRM_NOUVEAU_DEBUG=y
+
+#
+# I2C encoder or helper chips
+#
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_USB_SERIAL_QUATECH2=m
+CONFIG_USB_SERIAL_QUATECH_USB2=m
+CONFIG_VT6655=m
+CONFIG_VT6656=m
+CONFIG_FB_UDL=m
+# CONFIG_HYPERV is not set
+# CONFIG_VME_BUS is not set
+
+#
+# RAR Register Driver
+#
+CONFIG_RAR_REGISTER=m
+# CONFIG_MRST_RAR_HANDLER is not set
+# CONFIG_DX_SEP is not set
+# CONFIG_IIO is not set
+CONFIG_RAMZSWAP=m
+CONFIG_RAMZSWAP_STATS=y
+CONFIG_WLAGS49_H2=m
+CONFIG_WLAGS49_H25=m
+CONFIG_BATMAN_ADV=m
+# CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_SAMSUNG_LAPTOP=m
+CONFIG_FB_SM7XX=m
+CONFIG_DT3155=m
+CONFIG_VIDEO_DT3155=m
+CONFIG_DT3155_CCIR=y
+CONFIG_CRYSTALHD=m
+# CONFIG_CXT1E1 is not set
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
+CONFIG_ST_BT=m
+CONFIG_FB_XGI=m
+CONFIG_X86_PLATFORM_DEVICES=y
+CONFIG_ACER_WMI=m
+CONFIG_ACERHDF=m
+CONFIG_ASUS_LAPTOP=m
+CONFIG_DELL_LAPTOP=m
+CONFIG_DELL_WMI=m
+CONFIG_FUJITSU_LAPTOP=m
+# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
+CONFIG_HP_WMI=m
+CONFIG_MSI_LAPTOP=m
+CONFIG_PANASONIC_LAPTOP=m
+CONFIG_COMPAL_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
+CONFIG_SONYPI_COMPAT=y
+CONFIG_THINKPAD_ACPI=m
+CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
+# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
+# CONFIG_THINKPAD_ACPI_DEBUG is not set
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
+CONFIG_THINKPAD_ACPI_VIDEO=y
+CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+CONFIG_INTEL_MENLOW=m
+CONFIG_EEEPC_LAPTOP=m
+CONFIG_EEEPC_WMI=m
+CONFIG_ACPI_WMI=m
+CONFIG_MSI_WMI=m
+CONFIG_ACPI_ASUS=m
+CONFIG_TOPSTAR_LAPTOP=m
+CONFIG_ACPI_TOSHIBA=m
+CONFIG_TOSHIBA_BT_RFKILL=m
+CONFIG_ACPI_CMPC=m
+
+#
+# Firmware Drivers
+#
+CONFIG_EDD=m
+CONFIG_EDD_OFF=y
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_EFI_VARS=m
+CONFIG_DELL_RBU=m
+CONFIG_DCDBAS=m
+CONFIG_DMIID=y
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=m
+CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
+CONFIG_EXT3_FS_XATTR=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_EXT4_FS=m
+CONFIG_EXT4_FS_XATTR=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD=m
+# CONFIG_JBD_DEBUG is not set
+CONFIG_JBD2=m
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=m
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_FS_POSIX_ACL=y
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_OCFS2_FS_O2CB=m
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+# CONFIG_OCFS2_FS_STATS is not set
+CONFIG_OCFS2_DEBUG_MASKLOG=y
+# CONFIG_OCFS2_DEBUG_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+CONFIG_NILFS2_FS=m
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=m
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_QUOTACTL_COMPAT=y
+CONFIG_AUTOFS_FS=m
+CONFIG_AUTOFS4_FS=m
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_GENERIC_ACL=y
+
+#
+# Caches
+#
+CONFIG_FSCACHE=m
+# CONFIG_FSCACHE_STATS is not set
+# CONFIG_FSCACHE_HISTOGRAM is not set
+# CONFIG_FSCACHE_DEBUG is not set
+# CONFIG_FSCACHE_OBJECT_LIST is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_HISTOGRAM is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+CONFIG_NTFS_RW=y
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_CONFIGFS_FS=y
+CONFIG_MISC_FILESYSTEMS=y
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+CONFIG_AFFS_FS=m
+# CONFIG_ECRYPT_FS is not set
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+CONFIG_BFS_FS=m
+CONFIG_EFS_FS=m
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_UBIFS_FS=m
+CONFIG_UBIFS_FS_XATTR=y
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+# CONFIG_UBIFS_FS_DEBUG is not set
+CONFIG_LOGFS=m
+CONFIG_CRAMFS=m
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_XATTRS=y
+CONFIG_SQUASHFS_EMBEDDED=y
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+CONFIG_VXFS_FS=m
+CONFIG_MINIX_FS=m
+CONFIG_OMFS_FS=m
+CONFIG_HPFS_FS=m
+CONFIG_QNX4FS_FS=m
+CONFIG_ROMFS_FS=y
+CONFIG_ROMFS_BACKED_BY_BLOCK=y
+# CONFIG_ROMFS_BACKED_BY_MTD is not set
+# CONFIG_ROMFS_BACKED_BY_BOTH is not set
+CONFIG_ROMFS_ON_BLOCK=y
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+CONFIG_EXOFS_FS=m
+# CONFIG_EXOFS_DEBUG is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V4=y
+# CONFIG_NFS_V4_1 is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+CONFIG_NFSD_V4=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+CONFIG_SUNRPC_XPRT_RDMA=m
+CONFIG_RPCSEC_GSS_KRB5=y
+CONFIG_RPCSEC_GSS_SPKM3=m
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FS_PRETTYDEBUG=y
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+CONFIG_CIFS_WEAK_PW_HASH=y
+# CONFIG_CIFS_UPCALL is not set
+# CONFIG_CIFS_XATTR is not set
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_DFS_UPCALL is not set
+# CONFIG_CIFS_EXPERIMENTAL is not set
+CONFIG_NCP_FS=m
+CONFIG_NCPFS_PACKET_SIGNING=y
+CONFIG_NCPFS_IOCTL_LOCKING=y
+CONFIG_NCPFS_STRONG=y
+CONFIG_NCPFS_NFS_NS=y
+CONFIG_NCPFS_OS2_NS=y
+CONFIG_NCPFS_SMALLDOS=y
+CONFIG_NCPFS_NLS=y
+CONFIG_NCPFS_EXTRAS=y
+CONFIG_CODA_FS=m
+CONFIG_AFS_FS=m
+# CONFIG_AFS_DEBUG is not set
+# CONFIG_AFS_FSCACHE is not set
+CONFIG_9P_FS=m
+# CONFIG_9P_FSCACHE is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+CONFIG_OSF_PARTITION=y
+CONFIG_AMIGA_PARTITION=y
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_UNIXWARE_DISKLABEL=y
+# CONFIG_LDM_PARTITION is not set
+CONFIG_SGI_PARTITION=y
+# CONFIG_ULTRIX_PARTITION is not set
+CONFIG_SUN_PARTITION=y
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_UTF8=m
+CONFIG_DLM=m
+# CONFIG_DLM_DEBUG is not set
+
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_PRINTK_TIME=y
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=0
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_STRIP_ASM_SYMS=y
+CONFIG_UNUSED_SYMBOLS=y
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+CONFIG_TIMER_STATS=y
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+CONFIG_STACKTRACE=y
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# CONFIG_LKDTM is not set
+CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_LATENCYTOP is not set
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FTRACE_NMI_ENTER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
+CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_RING_BUFFER=y
+CONFIG_FTRACE_NMI_ENTER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
+# CONFIG_IRQSOFF_TRACER is not set
+CONFIG_SYSPROF_TRACER=y
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_FTRACE_SYSCALLS is not set
+# CONFIG_BOOT_TRACER is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+# CONFIG_KSYM_TRACER is not set
+# CONFIG_STACK_TRACER is not set
+# CONFIG_KMEMTRACE is not set
+# CONFIG_WORKQUEUE_TRACER is not set
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_DYNAMIC_FTRACE=y
+# CONFIG_FUNCTION_PROFILER is not set
+CONFIG_FTRACE_MCOUNT_RECORD=y
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_MMIOTRACE is not set
+CONFIG_RING_BUFFER_BENCHMARK=m
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_DMA_API_DEBUG is not set
+CONFIG_ATOMIC64_SELFTEST=y
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+CONFIG_HAVE_ARCH_KMEMCHECK=y
+CONFIG_STRICT_DEVMEM=y
+CONFIG_X86_VERBOSE_BOOTUP=y
+CONFIG_EARLY_PRINTK=y
+# CONFIG_EARLY_PRINTK_DBGP is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_X86_PTDUMP is not set
+CONFIG_DEBUG_RODATA=y
+CONFIG_DEBUG_RODATA_TEST=y
+# CONFIG_DEBUG_NX_TEST is not set
+# CONFIG_IOMMU_DEBUG is not set
+# CONFIG_IOMMU_STRESS is not set
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+CONFIG_IO_DELAY_TYPE_0X80=0
+CONFIG_IO_DELAY_TYPE_0XED=1
+CONFIG_IO_DELAY_TYPE_UDELAY=2
+CONFIG_IO_DELAY_TYPE_NONE=3
+CONFIG_IO_DELAY_0X80=y
+# CONFIG_IO_DELAY_0XED is not set
+# CONFIG_IO_DELAY_UDELAY is not set
+# CONFIG_IO_DELAY_NONE is not set
+CONFIG_DEFAULT_IO_DELAY_TYPE=0
+# CONFIG_DEBUG_BOOT_PARAMS is not set
+# CONFIG_CPA_DEBUG is not set
+CONFIG_OPTIMIZE_INLINING=y
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_NETWORK_XFRM=y
+# CONFIG_SECURITY_PATH is not set
+# CONFIG_SECURITY_SELINUX is not set
+# CONFIG_SECURITY_TOMOYO is not set
+# CONFIG_IMA is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_XOR_BLOCKS=y
+CONFIG_ASYNC_CORE=y
+CONFIG_ASYNC_MEMCPY=y
+CONFIG_ASYNC_XOR=y
+CONFIG_ASYNC_PQ=y
+CONFIG_ASYNC_RAID6_RECOV=y
+CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
+CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_FIPS=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_MANAGER_TESTS=y
+CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_WORKQUEUE=y
+CONFIG_CRYPTO_CRYPTD=y
+CONFIG_CRYPTO_AUTHENC=y
+CONFIG_CRYPTO_TEST=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_SEQIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_LRW=y
+CONFIG_CRYPTO_PCBC=y
+CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_FPU=y
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=y
+CONFIG_CRYPTO_VMAC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_MD4=y
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=y
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_TGR192=y
+CONFIG_CRYPTO_WP512=y
+CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_X86_64=y
+CONFIG_CRYPTO_AES_NI_INTEL=y
+CONFIG_CRYPTO_ANUBIS=y
+CONFIG_CRYPTO_ARC4=y
+CONFIG_CRYPTO_BLOWFISH=y
+CONFIG_CRYPTO_CAMELLIA=y
+CONFIG_CRYPTO_CAST5=y
+CONFIG_CRYPTO_CAST6=y
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_FCRYPT=y
+CONFIG_CRYPTO_KHAZAD=y
+CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_SALSA20_X86_64=m
+CONFIG_CRYPTO_SEED=y
+CONFIG_CRYPTO_SERPENT=y
+CONFIG_CRYPTO_TEA=y
+CONFIG_CRYPTO_TWOFISH=y
+CONFIG_CRYPTO_TWOFISH_COMMON=y
+CONFIG_CRYPTO_TWOFISH_X86_64=y
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_ZLIB=m
+CONFIG_CRYPTO_LZO=m
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_CRYPTO_DEV_HIFN_795X=m
+CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+CONFIG_HAVE_KVM=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_APIC_ARCHITECTURE=y
+CONFIG_KVM_MMIO=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
+CONFIG_VHOST_NET=m
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_RING=m
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=m
+CONFIG_CRC_ITU_T=y
+CONFIG_CRC32=y
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=y
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=m
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_BTREE=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_CHECK_SIGNATURE=y
+CONFIG_NLATTR=y
+CONFIG_LRU_CACHE=m
diff --git a/testing/source/linux-2.6.35.12-configs/config-huge-2.6.35.12 b/testing/source/linux-2.6.35.12-configs/config-huge-2.6.35.12
new file mode 100644
index 00000000..d9331fe0
--- /dev/null
+++ b/testing/source/linux-2.6.35.12-configs/config-huge-2.6.35.12
@@ -0,0 +1,4921 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.35.12
+# Fri Apr 22 13:03:06 2011
+#
+CONFIG_64BIT=y
+# CONFIG_X86_32 is not set
+CONFIG_X86_64=y
+CONFIG_X86=y
+CONFIG_INSTRUCTION_DECODER=y
+CONFIG_OUTPUT_FORMAT="elf64-x86-64"
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_MMU=y
+CONFIG_ZONE_DMA=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_DEFAULT_IDLE=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ZONE_DMA32=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_AUDIT_ARCH=y
+CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_HAVE_EARLY_RES=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_X86_64_SMP=y
+CONFIG_X86_HT=y
+CONFIG_X86_TRAMPOLINE=y
+CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
+# CONFIG_KTIME_SCALAR is not set
+CONFIG_ARCH_CPU_PROBE_RELEASE=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_CONSTRUCTORS=y
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_CROSS_COMPILE=""
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_LZO=y
+# CONFIG_KERNEL_GZIP is not set
+# CONFIG_KERNEL_BZIP2 is not set
+CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_LZO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_AUDIT=y
+CONFIG_AUDITSYSCALL=y
+CONFIG_AUDIT_TREE=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_TINY_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_RCU_FAST_NO_HZ is not set
+# CONFIG_TREE_RCU_TRACE is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=15
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+CONFIG_CGROUPS=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_CGROUP_NS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_RESOURCE_COUNTERS=y
+CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_RT_GROUP_SCHED=y
+CONFIG_BLK_CGROUP=y
+# CONFIG_DEBUG_BLK_CGROUP is not set
+CONFIG_MM_OWNER=y
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
+CONFIG_RELAY=y
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_LZO=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_HAVE_PERF_EVENTS=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_PERF_COUNTERS is not set
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_PCI_QUIRKS=y
+CONFIG_SLUB_DEBUG=y
+CONFIG_COMPAT_BRK=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+CONFIG_OPROFILE=m
+# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_SLOW_WORK=y
+# CONFIG_SLOW_WORK_DEBUG is not set
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_STOP_MACHINE=y
+CONFIG_BLOCK=y
+CONFIG_BLK_DEV_BSG=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
+CONFIG_BLOCK_COMPAT=y
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_CFQ_GROUP_IOSCHED=y
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_PADATA=y
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_FREEZER=y
+
+#
+# Processor type and features
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_SMP=y
+# CONFIG_SPARSE_IRQ is not set
+CONFIG_X86_MPPARSE=y
+# CONFIG_X86_EXTENDED_PLATFORM is not set
+CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+# CONFIG_PARAVIRT_GUEST is not set
+# CONFIG_NO_BOOTMEM is not set
+CONFIG_MEMTEST=y
+# CONFIG_M386 is not set
+# CONFIG_M486 is not set
+# CONFIG_M586 is not set
+# CONFIG_M586TSC is not set
+# CONFIG_M586MMX is not set
+# CONFIG_M686 is not set
+# CONFIG_MPENTIUMII is not set
+# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMM is not set
+# CONFIG_MPENTIUM4 is not set
+# CONFIG_MK6 is not set
+# CONFIG_MK7 is not set
+# CONFIG_MK8 is not set
+# CONFIG_MCRUSOE is not set
+# CONFIG_MEFFICEON is not set
+# CONFIG_MWINCHIPC6 is not set
+# CONFIG_MWINCHIP3D is not set
+# CONFIG_MGEODEGX1 is not set
+# CONFIG_MGEODE_LX is not set
+# CONFIG_MCYRIXIII is not set
+# CONFIG_MVIAC3_2 is not set
+# CONFIG_MVIAC7 is not set
+# CONFIG_MPSC is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
+CONFIG_GENERIC_CPU=y
+CONFIG_X86_CPU=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_CMPXCHG=y
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_XADD=y
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_TSC=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=64
+CONFIG_X86_DEBUGCTLMSR=y
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_DMI=y
+CONFIG_GART_IOMMU=y
+# CONFIG_CALGARY_IOMMU is not set
+# CONFIG_AMD_IOMMU is not set
+CONFIG_SWIOTLB=y
+CONFIG_IOMMU_HELPER=y
+# CONFIG_IOMMU_API is not set
+# CONFIG_MAXSMP is not set
+CONFIG_NR_CPUS=32
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_MCE=y
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_AMD=y
+CONFIG_X86_MCE_THRESHOLD=y
+CONFIG_X86_MCE_INJECT=m
+CONFIG_X86_THERMAL_VECTOR=y
+CONFIG_I8K=m
+CONFIG_MICROCODE=m
+CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_AMD=y
+CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=m
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_DIRECT_GBPAGES=y
+# CONFIG_NUMA is not set
+CONFIG_ARCH_PROC_KCORE_TEXT=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_MEMORY_PROBE=y
+CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
+CONFIG_SELECT_MEMORY_MODEL=y
+# CONFIG_FLATMEM_MANUAL is not set
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_HAVE_MEMORY_PRESENT=y
+CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
+CONFIG_SPARSEMEM_VMEMMAP=y
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_SPARSE=y
+CONFIG_MEMORY_HOTREMOVE=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_MIGRATION=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_MMU_NOTIFIER=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=98304
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+# CONFIG_MEMORY_FAILURE is not set
+# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
+CONFIG_X86_RESERVE_LOW_64K=y
+CONFIG_MTRR=y
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
+CONFIG_X86_PAT=y
+CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_EFI=y
+CONFIG_SECCOMP=y
+CONFIG_CC_STACKPROTECTOR=y
+CONFIG_HZ_100=y
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=100
+CONFIG_SCHED_HRTICK=y
+# CONFIG_KEXEC is not set
+# CONFIG_CRASH_DUMP is not set
+CONFIG_PHYSICAL_START=0x1000000
+# CONFIG_RELOCATABLE is not set
+CONFIG_PHYSICAL_ALIGN=0x1000000
+CONFIG_HOTPLUG_CPU=y
+CONFIG_COMPAT_VDSO=y
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+
+#
+# Power management and ACPI options
+#
+CONFIG_ARCH_HIBERNATION_HEADER=y
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_SLEEP_SMP=y
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND_NVS=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+CONFIG_HIBERNATION=y
+CONFIG_PM_STD_PARTITION="\"\""
+CONFIG_PM_RUNTIME=y
+CONFIG_PM_OPS=y
+CONFIG_ACPI=y
+CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_PROCFS=y
+CONFIG_ACPI_PROCFS_POWER=y
+CONFIG_ACPI_POWER_METER=m
+CONFIG_ACPI_SYSFS_POWER=y
+CONFIG_ACPI_PROC_EVENT=y
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=m
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_PROCESSOR=m
+CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
+CONFIG_ACPI_THERMAL=m
+# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_BLACKLIST_YEAR=0
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_PCI_SLOT=m
+CONFIG_X86_PM_TIMER=y
+CONFIG_ACPI_CONTAINER=m
+CONFIG_ACPI_HOTPLUG_MEMORY=m
+CONFIG_ACPI_SBS=m
+CONFIG_ACPI_HED=m
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=m
+CONFIG_ACPI_APEI_EINJ=m
+CONFIG_SFI=y
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=m
+# CONFIG_CPU_FREQ_DEBUG is not set
+CONFIG_CPU_FREQ_STAT=m
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=m
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+
+#
+# CPUFreq processor drivers
+#
+CONFIG_X86_PCC_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_SPEEDSTEP_CENTRINO=m
+CONFIG_X86_P4_CLOCKMOD=m
+
+#
+# shared options
+#
+CONFIG_X86_SPEEDSTEP_LIB=m
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_INTEL_IDLE=m
+
+#
+# Memory power savings
+#
+CONFIG_I7300_IDLE_IOAT_CHANNEL=y
+CONFIG_I7300_IDLE=m
+
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_DOMAINS=y
+# CONFIG_PCI_CNB20LE_QUIRK is not set
+# CONFIG_DMAR is not set
+# CONFIG_INTR_REMAP is not set
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=m
+CONFIG_PCIEAER=y
+# CONFIG_PCIE_ECRC is not set
+CONFIG_PCIEAER_INJECT=m
+# CONFIG_PCIEASPM is not set
+CONFIG_PCIE_PME=y
+CONFIG_ARCH_SUPPORTS_MSI=y
+CONFIG_PCI_MSI=y
+# CONFIG_PCI_DEBUG is not set
+CONFIG_PCI_STUB=m
+CONFIG_HT_IRQ=y
+# CONFIG_PCI_IOV is not set
+CONFIG_PCI_IOAPIC=y
+CONFIG_ISA_DMA_API=y
+CONFIG_K8_NB=y
+CONFIG_PCCARD=m
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_PCCARD_NONSTATIC=y
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_FAKE=m
+CONFIG_HOTPLUG_PCI_ACPI=m
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
+# CONFIG_HOTPLUG_PCI_CPCI is not set
+CONFIG_HOTPLUG_PCI_SHPC=m
+
+#
+# Executable file formats / Emulations
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_COMPAT_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_HAVE_AOUT is not set
+CONFIG_BINFMT_MISC=m
+CONFIG_IA32_EMULATION=y
+# CONFIG_IA32_AOUT is not set
+CONFIG_COMPAT=y
+CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
+CONFIG_SYSVIPC_COMPAT=y
+CONFIG_NET=y
+CONFIG_COMPAT_NETLINK_MESSAGES=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=y
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+# CONFIG_NET_KEY_MIGRATE is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_INET_LRO=y
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=m
+CONFIG_IPV6_PRIVACY=y
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_SIT_6RD is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_NETLABEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CT_ACCT=y
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+# CONFIG_NF_CONNTRACK_EVENTS is not set
+CONFIG_NF_CT_PROTO_DCCP=m
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_TPROXY=m
+CONFIG_NETFILTER_XTABLES=m
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_VS=m
+# CONFIG_IP_VS_IPV6 is not set
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_DCCP=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_QUEUE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+
+#
+# DECnet: Netfilter Configuration
+#
+# CONFIG_DECNET_NF_GRABULATOR is not set
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_ULOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+# CONFIG_IP_DCCP_CCID3 is not set
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_MSG is not set
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_HMAC_NONE is not set
+# CONFIG_SCTP_HMAC_SHA1 is not set
+CONFIG_SCTP_HMAC_MD5=y
+CONFIG_RDS=m
+CONFIG_RDS_RDMA=m
+CONFIG_RDS_TCP=m
+# CONFIG_RDS_DEBUG is not set
+CONFIG_TIPC=m
+# CONFIG_TIPC_ADVANCED is not set
+# CONFIG_TIPC_DEBUG is not set
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_GARP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+# CONFIG_NET_DSA is not set
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_DECNET=m
+# CONFIG_DECNET_ROUTER is not set
+CONFIG_LLC=m
+CONFIG_LLC2=m
+CONFIG_IPX=m
+# CONFIG_IPX_INTERN is not set
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_IPDDP_DECAP=y
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+CONFIG_WAN_ROUTER=m
+# CONFIG_PHONET is not set
+CONFIG_IEEE802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_INGRESS=m
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_ROUTE=y
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=y
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=y
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+# CONFIG_NET_CLS_IND is not set
+CONFIG_NET_SCH_FIFO=y
+# CONFIG_DCB is not set
+CONFIG_RPS=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NET_DROP_MONITOR is not set
+CONFIG_HAMRADIO=y
+
+#
+# Packet Radio protocols
+#
+CONFIG_AX25=m
+# CONFIG_AX25_DAMA_SLAVE is not set
+CONFIG_NETROM=m
+CONFIG_ROSE=m
+
+#
+# AX.25 network device drivers
+#
+CONFIG_MKISS=m
+CONFIG_6PACK=m
+CONFIG_BPQETHER=m
+CONFIG_BAYCOM_SER_FDX=m
+CONFIG_BAYCOM_SER_HDX=m
+CONFIG_BAYCOM_PAR=m
+CONFIG_YAM=m
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+
+#
+# CAN Device Drivers
+#
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_DEV=m
+# CONFIG_CAN_CALC_BITTIMING is not set
+CONFIG_CAN_JANZ_ICAN3=m
+CONFIG_CAN_SJA1000=m
+CONFIG_CAN_SJA1000_PLATFORM=m
+CONFIG_CAN_EMS_PCI=m
+CONFIG_CAN_KVASER_PCI=m
+CONFIG_CAN_PLX_PCI=m
+
+#
+# CAN USB interfaces
+#
+CONFIG_CAN_EMS_USB=m
+# CONFIG_CAN_DEBUG_DEVICES is not set
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+# CONFIG_IRDA_ULTRA is not set
+
+#
+# IrDA options
+#
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+# CONFIG_IRDA_DEBUG is not set
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+CONFIG_IRTTY_SIR=m
+
+#
+# Dongle support
+#
+CONFIG_DONGLE=y
+CONFIG_ESI_DONGLE=m
+CONFIG_ACTISYS_DONGLE=m
+CONFIG_TEKRAM_DONGLE=m
+CONFIG_TOIM3232_DONGLE=m
+CONFIG_LITELINK_DONGLE=m
+CONFIG_MA600_DONGLE=m
+CONFIG_GIRBIL_DONGLE=m
+CONFIG_MCP2120_DONGLE=m
+CONFIG_OLD_BELKIN_DONGLE=m
+CONFIG_ACT200L_DONGLE=m
+CONFIG_KINGSUN_DONGLE=m
+CONFIG_KSDAZZLE_DONGLE=m
+CONFIG_KS959_DONGLE=m
+
+#
+# FIR device drivers
+#
+CONFIG_USB_IRDA=m
+CONFIG_SIGMATEL_FIR=m
+CONFIG_NSC_FIR=m
+CONFIG_WINBOND_FIR=m
+CONFIG_SMC_IRCC_FIR=m
+CONFIG_ALI_FIR=m
+CONFIG_VLSI_FIR=m
+CONFIG_VIA_FIR=m
+CONFIG_MCS_FIR=m
+CONFIG_BT=m
+CONFIG_BT_L2CAP=m
+CONFIG_BT_L2CAP_EXT_FEATURES=y
+CONFIG_BT_SCO=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIBTUART=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_AF_RXRPC=m
+# CONFIG_AF_RXRPC_DEBUG is not set
+CONFIG_RXKAD=m
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_REG_DEBUG is not set
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+# CONFIG_CFG80211_INTERNAL_REGDB is not set
+CONFIG_CFG80211_WEXT=y
+CONFIG_WIRELESS_EXT_SYSFS=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+# CONFIG_MAC80211_RC_DEFAULT_PID is not set
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+CONFIG_NET_9P_RDMA=m
+# CONFIG_NET_9P_DEBUG is not set
+# CONFIG_CAIF is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+CONFIG_CONNECTOR=m
+CONFIG_MTD=m
+# CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_TESTS=m
+CONFIG_MTD_CONCAT=m
+CONFIG_MTD_PARTITIONS=y
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+CONFIG_MTD_AR7_PARTS=m
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=m
+CONFIG_HAVE_MTD_OTP=y
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+CONFIG_FTL=m
+CONFIG_NFTL=m
+CONFIG_NFTL_RW=y
+CONFIG_INFTL=m
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
+CONFIG_SM_FTL=m
+CONFIG_MTD_OOPS=m
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_GEN_PROBE=m
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+CONFIG_MTD_MAP_BANK_WIDTH_8=y
+CONFIG_MTD_MAP_BANK_WIDTH_16=y
+CONFIG_MTD_MAP_BANK_WIDTH_32=y
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+CONFIG_MTD_CFI_I4=y
+CONFIG_MTD_CFI_I8=y
+CONFIG_MTD_OTP=y
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_CFI_UTIL=m
+CONFIG_MTD_RAM=m
+CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_PHYSMAP=m
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+CONFIG_MTD_SC520CDP=m
+CONFIG_MTD_NETSC520=m
+CONFIG_MTD_TS5500=m
+CONFIG_MTD_SBC_GXX=m
+CONFIG_MTD_AMD76XROM=m
+CONFIG_MTD_ICHXROM=m
+CONFIG_MTD_ESB2ROM=m
+CONFIG_MTD_CK804XROM=m
+CONFIG_MTD_SCB2_FLASH=m
+CONFIG_MTD_NETtel=m
+CONFIG_MTD_L440GX=m
+CONFIG_MTD_PCI=m
+CONFIG_MTD_PCMCIA=m
+# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
+CONFIG_MTD_GPIO_ADDR=m
+CONFIG_MTD_INTEL_VR_NOR=m
+CONFIG_MTD_PLATRAM=m
+
+#
+# Self-contained MTD device drivers
+#
+CONFIG_MTD_PMC551=m
+CONFIG_MTD_PMC551_BUGFIX=y
+# CONFIG_MTD_PMC551_DEBUG is not set
+CONFIG_MTD_SLRAM=m
+CONFIG_MTD_PHRAM=m
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=4096
+CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTD_BLOCK2MTD=m
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+CONFIG_MTD_DOC2001PLUS=m
+CONFIG_MTD_DOCPROBE=m
+CONFIG_MTD_DOCECC=m
+CONFIG_MTD_DOCPROBE_ADVANCED=y
+CONFIG_MTD_DOCPROBE_ADDRESS=0x0000
+CONFIG_MTD_DOCPROBE_HIGH=y
+CONFIG_MTD_DOCPROBE_55AA=y
+CONFIG_MTD_NAND_ECC=m
+CONFIG_MTD_NAND_ECC_SMC=y
+CONFIG_MTD_NAND=m
+CONFIG_MTD_NAND_VERIFY_WRITE=y
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_MUSEUM_IDS=y
+CONFIG_MTD_NAND_DENALI=m
+CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xFF108018
+CONFIG_MTD_NAND_IDS=m
+CONFIG_MTD_NAND_RICOH=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y
+CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y
+CONFIG_MTD_NAND_CAFE=m
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_PLATFORM=m
+CONFIG_MTD_ALAUDA=m
+CONFIG_MTD_ONENAND=m
+CONFIG_MTD_ONENAND_VERIFY_WRITE=y
+CONFIG_MTD_ONENAND_GENERIC=m
+CONFIG_MTD_ONENAND_OTP=y
+CONFIG_MTD_ONENAND_2X_PROGRAM=y
+CONFIG_MTD_ONENAND_SIM=m
+
+#
+# LPDDR flash memory drivers
+#
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+
+#
+# UBI - Unsorted block images
+#
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_RESERVE=1
+CONFIG_MTD_UBI_GLUEBI=m
+
+#
+# UBI debugging options
+#
+# CONFIG_MTD_UBI_DEBUG is not set
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
+CONFIG_PARPORT_PC_PCMCIA=m
+# CONFIG_PARPORT_GSC is not set
+CONFIG_PARPORT_AX88796=m
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_PNP=y
+CONFIG_PNP_DEBUG_MESSAGES=y
+
+#
+# Protocols
+#
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_FD=y
+CONFIG_PARIDE=m
+
+#
+# Parallel IDE high-level drivers
+#
+CONFIG_PARIDE_PD=m
+CONFIG_PARIDE_PCD=m
+CONFIG_PARIDE_PF=m
+CONFIG_PARIDE_PT=m
+CONFIG_PARIDE_PG=m
+
+#
+# Parallel IDE protocol modules
+#
+CONFIG_PARIDE_ATEN=m
+CONFIG_PARIDE_BPCK=m
+CONFIG_PARIDE_COMM=m
+CONFIG_PARIDE_DSTR=m
+CONFIG_PARIDE_FIT2=m
+CONFIG_PARIDE_FIT3=m
+CONFIG_PARIDE_EPAT=m
+CONFIG_PARIDE_EPATC8=y
+CONFIG_PARIDE_EPIA=m
+CONFIG_PARIDE_FRIQ=m
+CONFIG_PARIDE_FRPW=m
+CONFIG_PARIDE_KBIC=m
+CONFIG_PARIDE_KTTI=m
+CONFIG_PARIDE_ON20=m
+CONFIG_PARIDE_ON26=m
+CONFIG_BLK_CPQ_DA=y
+CONFIG_BLK_CPQ_CISS_DA=y
+CONFIG_CISS_SCSI_TAPE=y
+CONFIG_BLK_DEV_DAC960=y
+CONFIG_BLK_DEV_UMEM=m
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_OSD=m
+CONFIG_BLK_DEV_SX8=y
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=16384
+# CONFIG_BLK_DEV_XIP is not set
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_ATA_OVER_ETH=m
+CONFIG_VIRTIO_BLK=m
+# CONFIG_BLK_DEV_HD is not set
+CONFIG_MISC_DEVICES=y
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+CONFIG_IBM_ASM=m
+CONFIG_PHANTOM=m
+CONFIG_SGI_IOC4=m
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+CONFIG_ICS932S401=m
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_CS5535_MFGPT=m
+CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
+CONFIG_CS5535_CLOCK_EVENT_SRC=m
+CONFIG_HP_ILO=m
+CONFIG_ISL29003=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_DS1682=m
+CONFIG_VMWARE_BALLOON=m
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+CONFIG_IWMC3200TOP=m
+# CONFIG_IWMC3200TOP_DEBUG is not set
+# CONFIG_IWMC3200TOP_DEBUGFS is not set
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=y
+CONFIG_RAID_ATTRS=y
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_TGT=y
+CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=y
+CONFIG_CHR_DEV_OSST=m
+CONFIG_BLK_DEV_SR=y
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=y
+CONFIG_SCSI_FC_ATTRS=y
+CONFIG_SCSI_FC_TGT_ATTRS=y
+CONFIG_SCSI_ISCSI_ATTRS=y
+CONFIG_SCSI_SAS_ATTRS=y
+CONFIG_SCSI_SAS_LIBSAS=y
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
+CONFIG_SCSI_SRP_ATTRS=m
+CONFIG_SCSI_SRP_TGT_ATTRS=y
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_BE2ISCSI=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=y
+CONFIG_SCSI_HPSA=y
+CONFIG_SCSI_3W_9XXX=y
+CONFIG_SCSI_3W_SAS=y
+CONFIG_SCSI_ACARD=y
+CONFIG_SCSI_AACRAID=y
+CONFIG_SCSI_AIC7XXX=y
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=4
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
+CONFIG_AIC7XXX_DEBUG_MASK=0
+# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
+CONFIG_SCSI_AIC7XXX_OLD=y
+CONFIG_SCSI_AIC79XX=y
+CONFIG_AIC79XX_CMDS_PER_DEVICE=4
+CONFIG_AIC79XX_RESET_DELAY_MS=15000
+# CONFIG_AIC79XX_DEBUG_ENABLE is not set
+CONFIG_AIC79XX_DEBUG_MASK=0
+# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
+CONFIG_SCSI_AIC94XX=y
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_MVSAS=y
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_ADVANSYS=y
+CONFIG_SCSI_ARCMSR=y
+# CONFIG_SCSI_ARCMSR_AER is not set
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=y
+CONFIG_MEGARAID_MAILBOX=y
+CONFIG_MEGARAID_LEGACY=y
+CONFIG_MEGARAID_SAS=y
+CONFIG_SCSI_MPT2SAS=y
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+# CONFIG_SCSI_MPT2SAS_LOGGING is not set
+CONFIG_SCSI_HPTIOP=y
+CONFIG_SCSI_BUSLOGIC=y
+CONFIG_VMWARE_PVSCSI=m
+CONFIG_LIBFC=y
+CONFIG_LIBFCOE=y
+CONFIG_FCOE=y
+CONFIG_FCOE_FNIC=y
+CONFIG_SCSI_DMX3191D=y
+CONFIG_SCSI_EATA=y
+# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
+# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
+CONFIG_SCSI_EATA_MAX_TAGS=16
+CONFIG_SCSI_FUTURE_DOMAIN=y
+CONFIG_SCSI_GDTH=y
+CONFIG_SCSI_IPS=y
+CONFIG_SCSI_INITIO=y
+CONFIG_SCSI_INIA100=y
+CONFIG_SCSI_PPA=m
+CONFIG_SCSI_IMM=m
+# CONFIG_SCSI_IZIP_EPP16 is not set
+# CONFIG_SCSI_IZIP_SLOW_CTR is not set
+CONFIG_SCSI_STEX=y
+CONFIG_SCSI_SYM53C8XX_2=y
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_SCSI_IPR=y
+# CONFIG_SCSI_IPR_TRACE is not set
+# CONFIG_SCSI_IPR_DUMP is not set
+CONFIG_SCSI_QLOGIC_1280=y
+CONFIG_SCSI_QLA_FC=y
+CONFIG_SCSI_QLA_ISCSI=y
+CONFIG_SCSI_LPFC=y
+# CONFIG_SCSI_LPFC_DEBUG_FS is not set
+CONFIG_SCSI_DC395x=y
+CONFIG_SCSI_DC390T=y
+CONFIG_SCSI_DEBUG=m
+CONFIG_SCSI_PMCRAID=y
+CONFIG_SCSI_PM8001=y
+CONFIG_SCSI_SRP=y
+CONFIG_SCSI_BFA_FC=y
+CONFIG_SCSI_LOWLEVEL_PCMCIA=y
+CONFIG_PCMCIA_FDOMAIN=m
+CONFIG_PCMCIA_QLOGIC=m
+CONFIG_PCMCIA_SYM53C500=m
+CONFIG_SCSI_DH=m
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+CONFIG_SCSI_OSD_INITIATOR=m
+CONFIG_SCSI_OSD_ULD=m
+CONFIG_SCSI_OSD_DPRINT_SENSE=1
+# CONFIG_SCSI_OSD_DEBUG is not set
+CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_ACPI=y
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=y
+CONFIG_SATA_AHCI_PLATFORM=y
+CONFIG_SATA_INIC162X=y
+CONFIG_SATA_SIL24=y
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=y
+CONFIG_SATA_QSTOR=y
+CONFIG_SATA_SX4=y
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=y
+CONFIG_SATA_MV=y
+CONFIG_SATA_NV=y
+CONFIG_SATA_PROMISE=y
+CONFIG_SATA_SIL=y
+CONFIG_SATA_SIS=y
+CONFIG_SATA_SVW=y
+CONFIG_SATA_ULI=y
+CONFIG_SATA_VIA=y
+CONFIG_SATA_VITESSE=y
+
+#
+# PATA SFF controllers with BMDMA
+#
+CONFIG_PATA_ALI=y
+CONFIG_PATA_AMD=y
+CONFIG_PATA_ARTOP=y
+CONFIG_PATA_ATIIXP=y
+CONFIG_PATA_ATP867X=y
+CONFIG_PATA_CMD64X=y
+CONFIG_PATA_CS5520=y
+CONFIG_PATA_CS5530=y
+CONFIG_PATA_CYPRESS=y
+CONFIG_PATA_EFAR=y
+CONFIG_PATA_HPT366=y
+CONFIG_PATA_HPT37X=y
+CONFIG_PATA_HPT3X2N=y
+CONFIG_PATA_HPT3X3=y
+CONFIG_PATA_HPT3X3_DMA=y
+CONFIG_PATA_IT8213=y
+CONFIG_PATA_IT821X=y
+CONFIG_PATA_JMICRON=y
+CONFIG_PATA_MARVELL=y
+CONFIG_PATA_NETCELL=y
+CONFIG_PATA_NINJA32=y
+CONFIG_PATA_NS87415=y
+CONFIG_PATA_OLDPIIX=y
+CONFIG_PATA_OPTIDMA=y
+CONFIG_PATA_PDC2027X=y
+CONFIG_PATA_PDC_OLD=y
+CONFIG_PATA_RADISYS=y
+CONFIG_PATA_RDC=y
+CONFIG_PATA_SC1200=y
+CONFIG_PATA_SCH=y
+CONFIG_PATA_SERVERWORKS=y
+CONFIG_PATA_SIL680=y
+CONFIG_PATA_SIS=y
+CONFIG_PATA_TOSHIBA=m
+CONFIG_PATA_TRIFLEX=y
+CONFIG_PATA_VIA=y
+CONFIG_PATA_WINBOND=y
+
+#
+# PIO-only SFF controllers
+#
+CONFIG_PATA_CMD640_PCI=y
+CONFIG_PATA_MPIIX=y
+CONFIG_PATA_NS87410=y
+CONFIG_PATA_OPTI=y
+CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_RZ1000=y
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_PATA_ACPI=y
+CONFIG_ATA_GENERIC=y
+CONFIG_PATA_LEGACY=y
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_AUTODETECT=y
+CONFIG_MD_LINEAR=y
+CONFIG_MD_RAID0=y
+CONFIG_MD_RAID1=y
+CONFIG_MD_RAID10=y
+CONFIG_MD_RAID456=y
+# CONFIG_MULTICORE_RAID456 is not set
+CONFIG_MD_RAID6_PQ=y
+CONFIG_ASYNC_RAID6_TEST=m
+CONFIG_MD_MULTIPATH=y
+CONFIG_MD_FAULTY=m
+CONFIG_BLK_DEV_DM=y
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_CRYPT=y
+CONFIG_DM_SNAPSHOT=y
+CONFIG_DM_MIRROR=y
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+# CONFIG_DM_DELAY is not set
+CONFIG_DM_UEVENT=y
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=y
+CONFIG_FUSION_FC=y
+CONFIG_FUSION_SAS=y
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=y
+CONFIG_FUSION_LAN=y
+# CONFIG_FUSION_LOGGING is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# You can enable one or both FireWire driver stacks.
+#
+
+#
+# The newer stack is recommended.
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_OHCI_DEBUG=y
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_IEEE1394=m
+CONFIG_IEEE1394_OHCI1394=m
+CONFIG_IEEE1394_PCILYNX=m
+CONFIG_IEEE1394_SBP2=m
+# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
+CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y
+CONFIG_IEEE1394_ETH1394=m
+CONFIG_IEEE1394_RAWIO=m
+CONFIG_IEEE1394_VIDEO1394=m
+CONFIG_IEEE1394_DV1394=m
+# CONFIG_IEEE1394_VERBOSEDEBUG is not set
+CONFIG_I2O=y
+CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
+CONFIG_I2O_EXT_ADAPTEC=y
+CONFIG_I2O_EXT_ADAPTEC_DMA64=y
+CONFIG_I2O_CONFIG=y
+# CONFIG_I2O_CONFIG_OLD_IOCTL is not set
+CONFIG_I2O_BUS=y
+CONFIG_I2O_BLOCK=y
+CONFIG_I2O_SCSI=y
+CONFIG_I2O_PROC=y
+CONFIG_MACINTOSH_DRIVERS=y
+CONFIG_MAC_EMUMOUSEBTN=y
+CONFIG_NETDEVICES=y
+CONFIG_IFB=m
+CONFIG_DUMMY=m
+CONFIG_BONDING=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_EQUALIZER=m
+CONFIG_TUN=m
+CONFIG_VETH=m
+CONFIG_NET_SB1000=m
+CONFIG_ARCNET=m
+CONFIG_ARCNET_1201=m
+CONFIG_ARCNET_1051=m
+CONFIG_ARCNET_RAW=m
+CONFIG_ARCNET_CAP=m
+CONFIG_ARCNET_COM90xx=m
+CONFIG_ARCNET_COM90xxIO=m
+CONFIG_ARCNET_RIM_I=m
+CONFIG_ARCNET_COM20020=m
+CONFIG_ARCNET_COM20020_PCI=m
+CONFIG_PHYLIB=m
+
+#
+# MII PHY device drivers
+#
+CONFIG_MARVELL_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_STE10XP=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MICREL_PHY=m
+CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_GPIO=m
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=m
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_ETHOC=m
+CONFIG_DNET=m
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+CONFIG_TULIP_MMIO=y
+# CONFIG_TULIP_NAPI is not set
+CONFIG_DE4X5=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_PCMCIA_XIRCOM=m
+CONFIG_HP100=m
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
+CONFIG_NET_PCI=y
+CONFIG_PCNET32=m
+CONFIG_AMD8111_ETH=m
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_KSZ884X_PCI=m
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_FORCEDETH=m
+CONFIG_E100=m
+CONFIG_FEALNX=m
+CONFIG_NATSEMI=m
+CONFIG_NE2K_PCI=m
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+CONFIG_8139TOO_PIO=y
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R6040=m
+CONFIG_SIS900=m
+CONFIG_EPIC100=m
+CONFIG_SMSC9420=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_TLAN=m
+CONFIG_KS8842=m
+CONFIG_KS8851_MLL=m
+CONFIG_VIA_RHINE=m
+CONFIG_VIA_RHINE_MMIO=y
+CONFIG_SC92031=m
+CONFIG_NET_POCKET=y
+CONFIG_ATP=m
+CONFIG_DE600=m
+CONFIG_DE620=m
+CONFIG_ATL2=m
+CONFIG_NETDEV_1000=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_DL2K=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IP1000=m
+CONFIG_IGB=m
+CONFIG_IGB_DCA=y
+CONFIG_IGBVF=m
+CONFIG_NS83820=m
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_R8169=m
+CONFIG_R8169_VLAN=y
+CONFIG_SIS190=m
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_VIA_VELOCITY=m
+CONFIG_TIGON3=m
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_QLA3XXX=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_JME=m
+CONFIG_NETDEV_10000=y
+CONFIG_MDIO=m
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3_DEPENDS=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4_DEPENDS=y
+CONFIG_CHELSIO_T4=m
+CONFIG_ENIC=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_DCA=y
+CONFIG_IXGBEVF=m
+CONFIG_IXGB=m
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+CONFIG_MYRI10GE=m
+CONFIG_MYRI10GE_DCA=y
+CONFIG_NETXEN_NIC=m
+CONFIG_NIU=m
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_TEHUTI=m
+CONFIG_BNX2X=m
+CONFIG_QLCNIC=m
+CONFIG_QLGE=m
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_BE2NET=m
+CONFIG_TR=m
+CONFIG_IBMOL=m
+CONFIG_3C359=m
+CONFIG_TMS380TR=m
+CONFIG_TMSPCI=m
+CONFIG_ABYSS=m
+CONFIG_WLAN=y
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_AIRO=m
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_PCMCIA_ATMEL=m
+CONFIG_AT76C50X_USB=m
+CONFIG_AIRO_CS=m
+CONFIG_PCMCIA_WL3501=m
+CONFIG_PRISM54=m
+CONFIG_USB_ZD1201=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_ADM8211=m
+# CONFIG_MAC80211_HWSIM is not set
+CONFIG_MWL8K=m
+CONFIG_ATH_COMMON=m
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K=m
+# CONFIG_ATH9K_DEBUGFS is not set
+CONFIG_ATH9K_HTC=m
+# CONFIG_ATH9K_HTC_DEBUGFS is not set
+CONFIG_AR9170_USB=m
+CONFIG_AR9170_LEDS=y
+CONFIG_B43=m
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_PCMCIA=y
+CONFIG_B43_SDIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+# CONFIG_B43LEGACY_DEBUG is not set
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_IWLWIFI=m
+# CONFIG_IWLWIFI_DEBUG is not set
+# CONFIG_IWLWIFI_DEVICE_TRACING is not set
+CONFIG_IWLAGN=m
+CONFIG_IWL4965=y
+CONFIG_IWL5000=y
+CONFIG_IWL3945=m
+CONFIG_IWM=m
+# CONFIG_IWM_DEBUG is not set
+# CONFIG_IWM_TRACING is not set
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
+CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_HERMES=m
+# CONFIG_HERMES_PRISM is not set
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_ORINOCO_USB=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_P54_LEDS=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI_PCI=y
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT30XX=y
+CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT30XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RT2800_LIB=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_HT=y
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_WL12XX=m
+CONFIG_WL1251=m
+CONFIG_WL1251_SDIO=m
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+
+#
+# WiMAX Wireless Broadband devices
+#
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_SDIO=m
+# CONFIG_WIMAX_IWMC3200_SDIO is not set
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+
+#
+# USB Network Adapters
+#
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+# CONFIG_USB_EPSON2888 is not set
+# CONFIG_USB_KC2190 is not set
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_NET_PCMCIA=y
+CONFIG_PCMCIA_3C589=m
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_PCMCIA_XIRC2PS=m
+CONFIG_PCMCIA_AXNET=m
+CONFIG_ARCNET_COM20020_CS=m
+CONFIG_PCMCIA_IBMTR=m
+CONFIG_WAN=y
+CONFIG_LANMEDIA=m
+CONFIG_HDLC=m
+CONFIG_HDLC_RAW=m
+CONFIG_HDLC_RAW_ETH=m
+CONFIG_HDLC_CISCO=m
+CONFIG_HDLC_FR=m
+CONFIG_HDLC_PPP=m
+
+#
+# X.25/LAPB support is disabled
+#
+CONFIG_PCI200SYN=m
+CONFIG_WANXL=m
+# CONFIG_PC300TOO is not set
+CONFIG_FARSYNC=m
+CONFIG_DSCC4=m
+# CONFIG_DSCC4_PCISYNC is not set
+# CONFIG_DSCC4_PCI_RST is not set
+CONFIG_DLCI=m
+CONFIG_DLCI_MAX=8
+CONFIG_WAN_ROUTER_DRIVERS=m
+CONFIG_CYCLADES_SYNC=m
+CONFIG_CYCLOMX_X25=y
+CONFIG_SBNI=m
+# CONFIG_SBNI_MULTILINE is not set
+CONFIG_ATM_DRIVERS=y
+CONFIG_ATM_DUMMY=m
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+# CONFIG_ATM_ENI_TUNE_BURST is not set
+CONFIG_ATM_FIRESTREAM=m
+CONFIG_ATM_ZATM=m
+# CONFIG_ATM_ZATM_DEBUG is not set
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_AMBASSADOR=m
+# CONFIG_ATM_AMBASSADOR_DEBUG is not set
+CONFIG_ATM_HORIZON=m
+# CONFIG_ATM_HORIZON_DEBUG is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+# CONFIG_ATM_FORE200E_USE_TASKLET is not set
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+# CONFIG_ATM_HE_USE_SUNI is not set
+CONFIG_ATM_SOLOS=m
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKEHARD=m
+CONFIG_FDDI=y
+CONFIG_DEFXX=m
+# CONFIG_DEFXX_MMIO is not set
+CONFIG_SKFP=m
+CONFIG_HIPPI=y
+CONFIG_ROADRUNNER=m
+# CONFIG_ROADRUNNER_LARGE_RINGS is not set
+CONFIG_PLIP=m
+CONFIG_PPP=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPPOE=m
+CONFIG_PPPOATM=m
+CONFIG_PPPOL2TP=m
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLHC=m
+CONFIG_SLIP_SMART=y
+# CONFIG_SLIP_MODE_SLIP6 is not set
+CONFIG_NET_FC=y
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+# CONFIG_NETPOLL_TRAP is not set
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_VIRTIO_NET=m
+CONFIG_VMXNET3=m
+CONFIG_ISDN=y
+CONFIG_ISDN_I4L=m
+CONFIG_ISDN_PPP=y
+CONFIG_ISDN_PPP_VJ=y
+CONFIG_ISDN_MPP=y
+CONFIG_IPPP_FILTER=y
+CONFIG_ISDN_PPP_BSDCOMP=m
+CONFIG_ISDN_AUDIO=y
+CONFIG_ISDN_TTY_FAX=y
+
+#
+# ISDN feature submodules
+#
+CONFIG_ISDN_DIVERSION=m
+
+#
+# ISDN4Linux hardware drivers
+#
+
+#
+# Passive cards
+#
+CONFIG_ISDN_DRV_HISAX=m
+
+#
+# D-channel protocol features
+#
+CONFIG_HISAX_EURO=y
+CONFIG_DE_AOC=y
+CONFIG_HISAX_NO_SENDCOMPLETE=y
+CONFIG_HISAX_NO_LLC=y
+CONFIG_HISAX_NO_KEYPAD=y
+CONFIG_HISAX_1TR6=y
+CONFIG_HISAX_NI1=y
+CONFIG_HISAX_MAX_CARDS=8
+
+#
+# HiSax supported cards
+#
+CONFIG_HISAX_16_3=y
+CONFIG_HISAX_TELESPCI=y
+CONFIG_HISAX_S0BOX=y
+CONFIG_HISAX_FRITZPCI=y
+CONFIG_HISAX_AVM_A1_PCMCIA=y
+CONFIG_HISAX_ELSA=y
+CONFIG_HISAX_DIEHLDIVA=y
+CONFIG_HISAX_SEDLBAUER=y
+CONFIG_HISAX_NETJET=y
+CONFIG_HISAX_NETJET_U=y
+CONFIG_HISAX_NICCY=y
+CONFIG_HISAX_BKM_A4T=y
+CONFIG_HISAX_SCT_QUADRO=y
+CONFIG_HISAX_GAZEL=y
+CONFIG_HISAX_HFC_PCI=y
+CONFIG_HISAX_W6692=y
+CONFIG_HISAX_HFC_SX=y
+CONFIG_HISAX_ENTERNOW_PCI=y
+# CONFIG_HISAX_DEBUG is not set
+
+#
+# HiSax PCMCIA card service modules
+#
+CONFIG_HISAX_SEDLBAUER_CS=m
+CONFIG_HISAX_ELSA_CS=m
+CONFIG_HISAX_AVM_A1_CS=m
+CONFIG_HISAX_TELES_CS=m
+
+#
+# HiSax sub driver modules
+#
+CONFIG_HISAX_ST5481=m
+CONFIG_HISAX_HFCUSB=m
+CONFIG_HISAX_HFC4S8S=m
+CONFIG_HISAX_FRITZ_PCIPNP=m
+
+#
+# Active cards
+#
+CONFIG_ISDN_CAPI=m
+CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
+CONFIG_CAPI_TRACE=y
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
+CONFIG_ISDN_CAPI_CAPIFS=m
+CONFIG_ISDN_CAPI_CAPIDRV=m
+
+#
+# CAPI hardware drivers
+#
+CONFIG_CAPI_AVM=y
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
+CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_CAPI_EICON=y
+CONFIG_ISDN_DIVAS=m
+CONFIG_ISDN_DIVAS_BRIPCI=y
+CONFIG_ISDN_DIVAS_PRIPCI=y
+CONFIG_ISDN_DIVAS_DIVACAPI=m
+CONFIG_ISDN_DIVAS_USERIDI=m
+CONFIG_ISDN_DIVAS_MAINT=m
+CONFIG_ISDN_DRV_GIGASET=m
+# CONFIG_GIGASET_CAPI is not set
+CONFIG_GIGASET_I4L=y
+# CONFIG_GIGASET_DUMMYLL is not set
+CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M105=m
+# CONFIG_GIGASET_M101 is not set
+# CONFIG_GIGASET_DEBUG is not set
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
+CONFIG_MISDN=m
+CONFIG_MISDN_DSP=m
+CONFIG_MISDN_L1OIP=m
+
+#
+# mISDN hardware drivers
+#
+CONFIG_MISDN_HFCPCI=m
+CONFIG_MISDN_HFCMULTI=m
+CONFIG_MISDN_HFCUSB=m
+CONFIG_MISDN_AVMFRITZ=m
+CONFIG_MISDN_SPEEDFAX=m
+CONFIG_MISDN_INFINEON=m
+CONFIG_MISDN_W6692=m
+CONFIG_MISDN_NETJET=m
+CONFIG_MISDN_IPAC=m
+CONFIG_MISDN_ISAR=m
+CONFIG_ISDN_HDLC=m
+CONFIG_PHONE=m
+CONFIG_PHONE_IXJ=m
+CONFIG_PHONE_IXJ_PCMCIA=m
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_FF_MEMLESS=y
+CONFIG_INPUT_POLLDEV=m
+CONFIG_INPUT_SPARSEKMAP=m
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT2160=m
+# CONFIG_KEYBOARD_LKKBD is not set
+CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_MATRIX=m
+CONFIG_KEYBOARD_LM8323=m
+CONFIG_KEYBOARD_MAX7359=m
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_KEYBOARD_OPENCORES=m
+CONFIG_KEYBOARD_STOWAWAY=m
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_SENTELIC=y
+CONFIG_MOUSE_PS2_TOUCHKIT=y
+CONFIG_MOUSE_SERIAL=m
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_VSXXXAA=m
+CONFIG_MOUSE_GPIO=m
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_JOYSTICK_ANALOG=m
+CONFIG_JOYSTICK_A3D=m
+CONFIG_JOYSTICK_ADI=m
+CONFIG_JOYSTICK_COBRA=m
+CONFIG_JOYSTICK_GF2K=m
+CONFIG_JOYSTICK_GRIP=m
+CONFIG_JOYSTICK_GRIP_MP=m
+CONFIG_JOYSTICK_GUILLEMOT=m
+CONFIG_JOYSTICK_INTERACT=m
+CONFIG_JOYSTICK_SIDEWINDER=m
+CONFIG_JOYSTICK_TMDC=m
+CONFIG_JOYSTICK_IFORCE=m
+CONFIG_JOYSTICK_IFORCE_USB=y
+CONFIG_JOYSTICK_IFORCE_232=y
+CONFIG_JOYSTICK_WARRIOR=m
+CONFIG_JOYSTICK_MAGELLAN=m
+CONFIG_JOYSTICK_SPACEORB=m
+CONFIG_JOYSTICK_SPACEBALL=m
+CONFIG_JOYSTICK_STINGER=m
+CONFIG_JOYSTICK_TWIDJOY=m
+CONFIG_JOYSTICK_ZHENHUA=m
+CONFIG_JOYSTICK_DB9=m
+CONFIG_JOYSTICK_GAMECON=m
+CONFIG_JOYSTICK_TURBOGRAFX=m
+CONFIG_JOYSTICK_JOYDUMP=m
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+# CONFIG_JOYSTICK_WALKERA0701 is not set
+CONFIG_INPUT_TABLET=y
+CONFIG_TABLET_USB_ACECAD=m
+CONFIG_TABLET_USB_AIPTEK=m
+CONFIG_TABLET_USB_GTCO=m
+CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_USB_WACOM=m
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_GUNZE=m
+CONFIG_TOUCHSCREEN_ELO=m
+CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TOUCHSCREEN_MCS5000=m
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_MK712=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_UCB1400=m
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
+CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
+CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
+CONFIG_TOUCHSCREEN_USB_GOTOP=y
+CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_E2I=y
+CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
+CONFIG_TOUCHSCREEN_USB_ETT_TC5UH=y
+CONFIG_TOUCHSCREEN_USB_NEXIO=y
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC2007=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_APANEL=m
+CONFIG_INPUT_ATLAS_BTNS=m
+CONFIG_INPUT_ATI_REMOTE=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_WINBOND_CIR=m
+CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_PCF8574=m
+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_CT82C710=m
+CONFIG_SERIO_PARKBD=m
+CONFIG_SERIO_PCIPS2=m
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_RAW=m
+CONFIG_SERIO_ALTERA_PS2=m
+CONFIG_GAMEPORT=m
+CONFIG_GAMEPORT_NS558=m
+CONFIG_GAMEPORT_L4=m
+CONFIG_GAMEPORT_EMU10K1=m
+CONFIG_GAMEPORT_FM801=m
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_DEVKMEM=y
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_COMPUTONE=m
+CONFIG_ROCKETPORT=m
+CONFIG_CYCLADES=m
+# CONFIG_CYZ_INTR is not set
+CONFIG_DIGIEPCA=m
+CONFIG_MOXA_INTELLIO=m
+CONFIG_MOXA_SMARTIO=m
+CONFIG_ISI=m
+CONFIG_SYNCLINK=m
+CONFIG_SYNCLINKMP=m
+CONFIG_SYNCLINK_GT=m
+CONFIG_N_HDLC=m
+CONFIG_N_GSM=m
+CONFIG_RISCOM8=m
+CONFIG_SPECIALIX=m
+CONFIG_STALDRV=y
+CONFIG_STALLION=m
+CONFIG_ISTALLION=m
+CONFIG_NOZOMI=m
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_PNP=y
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_DETECT_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_UARTLITE=m
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_TIMBERDALE=m
+CONFIG_SERIAL_ALTERA_JTAGUART=m
+CONFIG_SERIAL_ALTERA_UART=m
+CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
+CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+CONFIG_UNIX98_PTYS=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=32
+CONFIG_PRINTER=m
+CONFIG_LP_CONSOLE=y
+CONFIG_PPDEV=m
+CONFIG_HVC_DRIVER=y
+CONFIG_VIRTIO_CONSOLE=m
+CONFIG_IPMI_HANDLER=m
+# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_INTEL=m
+CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_VIA=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_NVRAM=m
+CONFIG_R3964=m
+CONFIG_APPLICOM=m
+
+#
+# PCMCIA character devices
+#
+CONFIG_SYNCLINK_CS=m
+CONFIG_CARDMAN_4000=m
+CONFIG_CARDMAN_4040=m
+CONFIG_IPWIRELESS=m
+CONFIG_MWAVE=m
+CONFIG_PC8736x_GPIO=m
+CONFIG_NSC_GPIO=m
+CONFIG_RAW_DRIVER=m
+CONFIG_MAX_RAW_DEVS=256
+CONFIG_HPET=y
+CONFIG_HPET_MMAP=y
+CONFIG_HANGCHECK_TIMER=m
+CONFIG_TCG_TPM=m
+# CONFIG_TCG_TIS is not set
+# CONFIG_TCG_NSC is not set
+CONFIG_TCG_ATMEL=m
+# CONFIG_TCG_INFINEON is not set
+CONFIG_TELCLOCK=m
+CONFIG_DEVPORT=y
+CONFIG_RAMOOPS=m
+CONFIG_I2C=m
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD756_S4882=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NFORCE2_S4985=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+
+#
+# ACPI drivers
+#
+CONFIG_I2C_SCMI=m
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+CONFIG_I2C_GPIO=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_XILINX=m
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_I2C_STUB=m
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_SPI is not set
+
+#
+# PPS support
+#
+CONFIG_PPS=m
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_KTIMER is not set
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_GPIOLIB=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_MAX730X=m
+
+#
+# Memory mapped GPIO expanders:
+#
+CONFIG_GPIO_IT8761E=m
+CONFIG_GPIO_SCH=m
+
+#
+# I2C GPIO expanders:
+#
+CONFIG_GPIO_MAX7300=m
+CONFIG_GPIO_MAX732X=m
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_ADP5588=m
+
+#
+# PCI GPIO expanders:
+#
+CONFIG_GPIO_CS5535=m
+# CONFIG_GPIO_LANGWELL is not set
+# CONFIG_GPIO_TIMBERDALE is not set
+CONFIG_GPIO_RDC321X=m
+
+#
+# SPI GPIO expanders:
+#
+
+#
+# AC97 GPIO expanders:
+#
+# CONFIG_GPIO_UCB1400 is not set
+
+#
+# MODULbus GPIO expanders:
+#
+CONFIG_GPIO_JANZ_TTL=m
+CONFIG_W1=m
+CONFIG_W1_CON=y
+
+#
+# 1-wire Bus Masters
+#
+CONFIG_W1_MASTER_MATROX=m
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_GPIO=m
+
+#
+# 1-wire Slaves
+#
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2431=m
+CONFIG_W1_SLAVE_DS2433=m
+CONFIG_W1_SLAVE_DS2433_CRC=y
+CONFIG_W1_SLAVE_DS2760=m
+CONFIG_W1_SLAVE_BQ27000=m
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_PDA_POWER=m
+CONFIG_TEST_POWER=m
+CONFIG_BATTERY_DS2760=m
+CONFIG_BATTERY_DS2782=m
+CONFIG_BATTERY_BQ27x00=m
+CONFIG_BATTERY_MAX17040=m
+CONFIG_CHARGER_PCF50633=m
+CONFIG_HWMON=m
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_ABITUGURU=m
+CONFIG_SENSORS_ABITUGURU3=m
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_K10TEMP=m
+CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_I5K_AMB=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_LM63=m
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_VIA_CPUTEMP=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_HDAPS=m
+CONFIG_SENSORS_LIS3_I2C=m
+CONFIG_SENSORS_APPLESMC=m
+
+#
+# ACPI drivers
+#
+CONFIG_SENSORS_ATK0110=m
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_THERMAL=m
+CONFIG_THERMAL_HWMON=y
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_ALIM1535_WDT=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_GEODE_WDT=m
+CONFIG_SC520_WDT=m
+CONFIG_SBC_FITPC2_WATCHDOG=m
+CONFIG_EUROTECH_WDT=m
+CONFIG_IB700_WDT=m
+CONFIG_IBMASR=m
+CONFIG_WAFER_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_ITCO_WDT=m
+CONFIG_ITCO_VENDOR_SUPPORT=y
+CONFIG_IT8712F_WDT=m
+CONFIG_IT87_WDT=m
+CONFIG_HP_WATCHDOG=m
+CONFIG_SC1200_WDT=m
+CONFIG_PC87413_WDT=m
+CONFIG_60XX_WDT=m
+CONFIG_SBC8360_WDT=m
+CONFIG_CPU5_WDT=m
+CONFIG_SMSC_SCH311X_WDT=m
+CONFIG_SMSC37B787_WDT=m
+CONFIG_W83627HF_WDT=m
+CONFIG_W83697HF_WDT=m
+CONFIG_W83697UG_WDT=m
+CONFIG_W83877F_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_MACHZ_WDT=m
+CONFIG_SBC_EPX_C3_WATCHDOG=m
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+CONFIG_SSB_PCMCIAHOST=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_MFD_SUPPORT=y
+CONFIG_MFD_CORE=m
+# CONFIG_MFD_SM501 is not set
+CONFIG_HTC_PASIC3=m
+CONFIG_UCB1400_CORE=m
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
+# CONFIG_MFD_TMIO is not set
+CONFIG_MFD_WM8400=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+# CONFIG_ABX500_CORE is not set
+CONFIG_MFD_TIMBERDALE=m
+CONFIG_LPC_SCH=m
+CONFIG_MFD_RDC321X=m
+CONFIG_MFD_JANZ_CMODIO=m
+# CONFIG_REGULATOR is not set
+CONFIG_MEDIA_SUPPORT=m
+
+#
+# Multimedia core support
+#
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_VIDEO_ALLOW_V4L1=y
+CONFIG_VIDEO_V4L1_COMPAT=y
+CONFIG_DVB_CORE=m
+CONFIG_VIDEO_MEDIA=m
+
+#
+# Multimedia drivers
+#
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_IR_CORE=m
+CONFIG_VIDEO_IR=m
+CONFIG_RC_MAP=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_IMON=m
+CONFIG_MEDIA_ATTACH=y
+CONFIG_MEDIA_TUNER=m
+# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEO_V4L1=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEOBUF_DMA_CONTIG=m
+CONFIG_VIDEOBUF_DVB=m
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# Encoders/decoders and other helper chips
+#
+
+#
+# Audio decoders
+#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TDA9875=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_M52790=m
+CONFIG_VIDEO_TLV320AIC23B=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+
+#
+# Video decoders
+#
+CONFIG_VIDEO_ADV7180=m
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_BT866=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_MT9V011=m
+CONFIG_VIDEO_TCM825X=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_SAA7191=m
+CONFIG_VIDEO_TVP514X=m
+CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_TVP7002=m
+CONFIG_VIDEO_VPX3220=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_CX25840=m
+
+#
+# MPEG video encoders
+#
+CONFIG_VIDEO_CX2341X=m
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+CONFIG_VIDEO_THS7303=m
+CONFIG_VIDEO_ADV7343=m
+CONFIG_VIDEO_AK881X=m
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+CONFIG_VIDEO_VIVI=m
+CONFIG_VIDEO_BT848=m
+CONFIG_VIDEO_BT848_DVB=y
+CONFIG_VIDEO_BWQCAM=m
+CONFIG_VIDEO_CQCAM=m
+CONFIG_VIDEO_W9966=m
+CONFIG_VIDEO_CPIA=m
+CONFIG_VIDEO_CPIA_PP=m
+CONFIG_VIDEO_CPIA_USB=m
+CONFIG_VIDEO_CPIA2=m
+CONFIG_VIDEO_SAA5246A=m
+CONFIG_VIDEO_SAA5249=m
+CONFIG_VIDEO_STRADIS=m
+CONFIG_VIDEO_ZORAN=m
+CONFIG_VIDEO_ZORAN_DC30=m
+CONFIG_VIDEO_ZORAN_ZR36060=m
+CONFIG_VIDEO_ZORAN_BUZ=m
+CONFIG_VIDEO_ZORAN_DC10=m
+CONFIG_VIDEO_ZORAN_LML33=m
+CONFIG_VIDEO_ZORAN_LML33R10=m
+CONFIG_VIDEO_ZORAN_AVS6EYES=m
+CONFIG_VIDEO_MEYE=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_FB_IVTV=m
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_SAA7164=m
+CONFIG_VIDEO_CAFE_CCIC=m
+CONFIG_SOC_CAMERA=m
+CONFIG_SOC_CAMERA_MT9M001=m
+CONFIG_SOC_CAMERA_MT9M111=m
+CONFIG_SOC_CAMERA_MT9T031=m
+CONFIG_SOC_CAMERA_MT9T112=m
+CONFIG_SOC_CAMERA_MT9V022=m
+CONFIG_SOC_CAMERA_RJ54N1=m
+CONFIG_SOC_CAMERA_TW9910=m
+CONFIG_SOC_CAMERA_PLATFORM=m
+CONFIG_SOC_CAMERA_OV772X=m
+CONFIG_SOC_CAMERA_OV9640=m
+CONFIG_V4L_USB_DRIVERS=y
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_TLG2300=m
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_VIDEO_USBVIDEO=m
+CONFIG_USB_VICAM=m
+CONFIG_USB_IBMCAM=m
+CONFIG_USB_KONICAWC=m
+CONFIG_USB_QUICKCAM_MESSENGER=m
+CONFIG_USB_ET61X251=m
+CONFIG_VIDEO_OVCAMCHIP=m
+CONFIG_USB_W9968CF=m
+CONFIG_USB_OV511=m
+CONFIG_USB_SE401=m
+CONFIG_USB_SN9C102=m
+CONFIG_USB_STV680=m
+CONFIG_USB_ZC0301=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_MEM2MEM_TESTDEV=m
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_GEMTEK_PCI=m
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_MAESTRO=m
+CONFIG_I2C_SI4713=m
+CONFIG_RADIO_SI4713=m
+CONFIG_USB_DSBR=m
+# CONFIG_RADIO_SI470X is not set
+CONFIG_USB_MR800=m
+CONFIG_RADIO_TEA5764=m
+CONFIG_RADIO_SAA7706H=m
+CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_TIMBERDALE=m
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
+CONFIG_DVB_CAPTURE_DRIVERS=y
+
+#
+# Supported SAA7146 based PCI Adapters
+#
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_BUDGET_PATCH=m
+
+#
+# Supported USB Adapters
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_FRIIO=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_SMS_SIANO_MDTV=m
+
+#
+# Siano module components
+#
+CONFIG_SMS_USB_DRV=m
+CONFIG_SMS_SDIO_DRV=m
+
+#
+# Supported FlexCopII (B2C2) Adapters
+#
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
+
+#
+# Supported BT878 Adapters
+#
+CONFIG_DVB_BT8XX=m
+
+#
+# Supported Pluto2 Adapters
+#
+CONFIG_DVB_PLUTO2=m
+
+#
+# Supported SDMC DM1105 Adapters
+#
+CONFIG_DVB_DM1105=m
+
+#
+# Supported FireWire (IEEE 1394) Adapters
+#
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_FIREWIRE=y
+CONFIG_DVB_FIREDTV_IEEE1394=y
+CONFIG_DVB_FIREDTV_INPUT=y
+
+#
+# Supported Earthsoft PT1 Adapters
+#
+CONFIG_DVB_PT1=m
+
+#
+# Supported Mantis Adapters
+#
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+
+#
+# Supported nGene Adapters
+#
+CONFIG_DVB_NGENE=m
+
+#
+# Supported DVB Frontends
+#
+CONFIG_DVB_FE_CUSTOMISE=y
+
+#
+# Customise DVB Frontends
+#
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV6110x=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_SP8870=m
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_DRX397XD=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3304=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_S5H1411=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_S921=m
+CONFIG_DVB_DIB8000=m
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_TDA665x=m
+
+#
+# Tools to develop new frontends
+#
+# CONFIG_DVB_DUMMY_FE is not set
+CONFIG_DAB=y
+CONFIG_USB_DABUSB=m
+
+#
+# Graphics support
+#
+CONFIG_AGP=m
+CONFIG_AGP_AMD64=m
+CONFIG_AGP_INTEL=m
+CONFIG_AGP_SIS=m
+CONFIG_AGP_VIA=m
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_VGA_SWITCHEROO=y
+CONFIG_DRM=m
+CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_TTM=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_RADEON=m
+CONFIG_DRM_RADEON_KMS=y
+CONFIG_DRM_I810=m
+CONFIG_DRM_I830=m
+CONFIG_DRM_I915=m
+CONFIG_DRM_I915_KMS=y
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
+CONFIG_VGASTATE=m
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_DDC=m
+CONFIG_FB_BOOT_VESA_SUPPORT=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=m
+CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_HECUBA=m
+CONFIG_FB_SVGALIB=m
+# CONFIG_FB_MACMODES is not set
+CONFIG_FB_BACKLIGHT=y
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+CONFIG_FB_CIRRUS=m
+CONFIG_FB_PM2=m
+# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
+CONFIG_FB_CYBER2000=m
+CONFIG_FB_ARC=m
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+CONFIG_FB_VGA16=m
+# CONFIG_FB_UVESA is not set
+CONFIG_FB_VESA=y
+# CONFIG_FB_EFI is not set
+CONFIG_FB_N411=m
+CONFIG_FB_HGA=m
+# CONFIG_FB_HGA_ACCEL is not set
+CONFIG_FB_S1D13XXX=m
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_NVIDIA_DEBUG is not set
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA=m
+CONFIG_FB_RIVA_I2C=y
+# CONFIG_FB_RIVA_DEBUG is not set
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_LE80578=m
+CONFIG_FB_CARILLO_RANCH=m
+CONFIG_FB_MATROX=m
+CONFIG_FB_MATROX_MILLENIUM=y
+CONFIG_FB_MATROX_MYSTIQUE=y
+CONFIG_FB_MATROX_G=y
+CONFIG_FB_MATROX_I2C=m
+CONFIG_FB_MATROX_MAVEN=m
+CONFIG_FB_RADEON=m
+CONFIG_FB_RADEON_I2C=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+# CONFIG_FB_RADEON_DEBUG is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_BACKLIGHT=y
+CONFIG_FB_S3=m
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
+CONFIG_FB_SIS=m
+CONFIG_FB_SIS_300=y
+CONFIG_FB_SIS_315=y
+CONFIG_FB_VIA=m
+# CONFIG_FB_VIA_DIRECT_PROCFS is not set
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_KYRO=m
+CONFIG_FB_3DFX=m
+# CONFIG_FB_3DFX_ACCEL is not set
+CONFIG_FB_3DFX_I2C=y
+CONFIG_FB_VOODOO1=m
+CONFIG_FB_VT8623=m
+CONFIG_FB_TRIDENT=m
+CONFIG_FB_ARK=m
+CONFIG_FB_PM3=m
+CONFIG_FB_CARMINE=m
+CONFIG_FB_CARMINE_DRAM_EVAL=y
+# CONFIG_CARMINE_DRAM_CUSTOM is not set
+CONFIG_FB_GEODE=y
+CONFIG_FB_GEODE_LX=m
+CONFIG_FB_GEODE_GX=m
+CONFIG_FB_GEODE_GX1=m
+CONFIG_FB_TMIO=m
+CONFIG_FB_TMIO_ACCELL=y
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_METRONOME=m
+CONFIG_FB_MB862XX=m
+CONFIG_FB_MB862XX_PCI_GDC=y
+CONFIG_FB_BROADSHEET=m
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_PLATFORM=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_GENERIC=m
+CONFIG_BACKLIGHT_PROGEAR=m
+CONFIG_BACKLIGHT_CARILLO_RANCH=m
+CONFIG_BACKLIGHT_MBP_NVIDIA=m
+CONFIG_BACKLIGHT_SAHARA=m
+CONFIG_BACKLIGHT_ADP8860=m
+CONFIG_BACKLIGHT_PCF50633=m
+
+#
+# Display device support
+#
+CONFIG_DISPLAY_SUPPORT=m
+
+#
+# Display hardware drivers
+#
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+CONFIG_VGACON_SOFT_SCROLLBACK=y
+CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+CONFIG_LOGO_LINUX_CLUT224=y
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_JACK=y
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_SEQUENCER_OSS=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_DYNAMIC_MINORS=y
+# CONFIG_SND_SUPPORT_OLD_API is not set
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_DMA_SGBUF=y
+CONFIG_SND_RAWMIDI_SEQ=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_VX_LIB=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_PCSP is not set
+CONFIG_SND_DUMMY=m
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+CONFIG_SND_SB_COMMON=m
+CONFIG_SND_SB16_DSP=m
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ALI5451=m
+CONFIG_SND_ASIHPI=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
+CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_CS5530=m
+CONFIG_SND_CS5535AUDIO=m
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_ES1968_INPUT=y
+CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
+CONFIG_SND_FM801_TEA575X=m
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+# CONFIG_SND_HDA_INPUT_BEEP is not set
+CONFIG_SND_HDA_INPUT_JACK=y
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_CODEC_REALTEK=y
+CONFIG_SND_HDA_CODEC_ANALOG=y
+CONFIG_SND_HDA_CODEC_SIGMATEL=y
+CONFIG_SND_HDA_CODEC_VIA=y
+CONFIG_SND_HDA_CODEC_ATIHDMI=y
+CONFIG_SND_HDA_CODEC_NVHDMI=y
+CONFIG_SND_HDA_CODEC_INTELHDMI=y
+CONFIG_SND_HDA_ELD=y
+CONFIG_SND_HDA_CODEC_CIRRUS=y
+CONFIG_SND_HDA_CODEC_CONEXANT=y
+CONFIG_SND_HDA_CODEC_CA0110=y
+CONFIG_SND_HDA_CODEC_CMEDIA=y
+CONFIG_SND_HDA_CODEC_SI3054=y
+CONFIG_SND_HDA_GENERIC=y
+# CONFIG_SND_HDA_POWER_SAVE is not set
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_HIFIER=m
+CONFIG_SND_ICE1712=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_LX6464ES=m
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MAESTRO3_INPUT=y
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
+CONFIG_SND_USB_US122L=m
+CONFIG_SND_PCMCIA=y
+CONFIG_SND_VXPOCKET=m
+CONFIG_SND_PDAUDIOCF=m
+# CONFIG_SND_SOC is not set
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=m
+CONFIG_HIDRAW=y
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# Special HID drivers
+#
+CONFIG_HID_3M_PCT=m
+CONFIG_HID_A4TECH=m
+CONFIG_HID_APPLE=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_CANDO=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EGALAX=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_KYE=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LOGITECH=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MOSART=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_QUANTA=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_ROCCAT_KONE=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SONY=m
+CONFIG_HID_STANTUM=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_GREENASIA=m
+CONFIG_GREENASIA_FF=y
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_WACOM=m
+CONFIG_HID_WACOM_POWER_SUPPLY=y
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
+CONFIG_HID_ZYDACRON=m
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+CONFIG_USB_SUSPEND=y
+# CONFIG_USB_OTG is not set
+CONFIG_USB_MON=y
+CONFIG_USB_WUSB=m
+CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_C67X00_HCD=y
+CONFIG_USB_XHCI_HCD=y
+# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_OXU210HP_HCD=y
+CONFIG_USB_ISP116X_HCD=y
+CONFIG_USB_ISP1760_HCD=y
+CONFIG_USB_ISP1362_HCD=y
+CONFIG_USB_OHCI_HCD=y
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_UHCI_HCD=y
+CONFIG_USB_U132_HCD=m
+CONFIG_USB_SL811_HCD=y
+CONFIG_USB_SL811_CS=m
+CONFIG_USB_R8A66597_HCD=y
+CONFIG_USB_WHCI_HCD=m
+CONFIG_USB_HWA_HCD=m
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_DATAFAB=y
+CONFIG_USB_STORAGE_FREECOM=y
+CONFIG_USB_STORAGE_ISD200=y
+CONFIG_USB_STORAGE_USBAT=y
+CONFIG_USB_STORAGE_SDDR09=y
+CONFIG_USB_STORAGE_SDDR55=y
+CONFIG_USB_STORAGE_JUMPSHOT=y
+CONFIG_USB_STORAGE_ALAUDA=y
+CONFIG_USB_STORAGE_ONETOUCH=y
+CONFIG_USB_STORAGE_KARMA=y
+CONFIG_USB_STORAGE_CYPRESS_ATACB=y
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+
+#
+# USB port drivers
+#
+CONFIG_USB_USS720=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_EZUSB=y
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_FUNSOFT=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MOTOROLA=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_HP4X=m
+CONFIG_USB_SERIAL_SAFE=m
+CONFIG_USB_SERIAL_SAFE_PADDED=y
+CONFIG_USB_SERIAL_SIEMENS_MPI=m
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
+CONFIG_USB_SERIAL_ZIO=m
+CONFIG_USB_SERIAL_DEBUG=m
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_RIO500=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_LED=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_FTDI_ELAN=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_SISUSBVGA_CON=y
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+# CONFIG_USB_GADGET is not set
+
+#
+# OTG and related infrastructure
+#
+CONFIG_USB_OTG_UTILS=y
+CONFIG_USB_GPIO_VBUS=m
+CONFIG_NOP_USB_XCEIV=m
+CONFIG_UWB=m
+CONFIG_UWB_HWA=m
+CONFIG_UWB_WHCI=m
+CONFIG_UWB_WLP=m
+CONFIG_UWB_I1480U=m
+CONFIG_UWB_I1480U_WLP=m
+CONFIG_MMC=m
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+
+#
+# MMC/SD/SDIO Card Drivers
+#
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_BOUNCE=y
+CONFIG_SDIO_UART=m
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_WBSD=m
+CONFIG_MMC_TIFM_SD=m
+CONFIG_MMC_SDRICOH_CS=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=m
+
+#
+# LED drivers
+#
+CONFIG_LEDS_NET5501=m
+CONFIG_LEDS_ALIX2=m
+CONFIG_LEDS_PCA9532=m
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GPIO_PLATFORM=y
+CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_CLEVO_MAIL=m
+CONFIG_LEDS_PCA955X=m
+CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_INTEL_SS4200=m
+CONFIG_LEDS_LT3593=m
+CONFIG_LEDS_DELL_NETBOOKS=m
+CONFIG_LEDS_TRIGGERS=y
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+CONFIG_ACCESSIBILITY=y
+CONFIG_A11Y_BRAILLE_CONSOLE=y
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_USER_MEM=y
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_MTHCA=m
+CONFIG_INFINIBAND_MTHCA_DEBUG=y
+# CONFIG_INFINIBAND_IPATH is not set
+CONFIG_INFINIBAND_QIB=m
+CONFIG_INFINIBAND_AMSO1100=m
+# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
+# CONFIG_INFINIBAND_CXGB3 is not set
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_INFINIBAND_NES=m
+# CONFIG_INFINIBAND_NES_DEBUG is not set
+CONFIG_INFINIBAND_IPOIB=m
+# CONFIG_INFINIBAND_IPOIB_CM is not set
+CONFIG_INFINIBAND_IPOIB_DEBUG=y
+# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_EDAC=y
+
+#
+# Reporting subsystems
+#
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_DECODE_MCE=y
+# CONFIG_EDAC_MM_EDAC is not set
+CONFIG_RTC_LIB=m
+CONFIG_RTC_CLASS=m
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+CONFIG_RTC_DRV_TEST=m
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_PCF50633=m
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_ASYNC_TX_DISABLE_CHANNEL_SWITCH=y
+CONFIG_INTEL_IOATDMA=m
+CONFIG_TIMB_DMA=m
+CONFIG_DMA_ENGINE=y
+
+#
+# DMA Clients
+#
+CONFIG_NET_DMA=y
+# CONFIG_ASYNC_TX_DMA is not set
+CONFIG_DMATEST=m
+CONFIG_DCA=m
+CONFIG_AUXDISPLAY=y
+# CONFIG_KS0108 is not set
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_PDRV=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+CONFIG_STAGING=y
+# CONFIG_STAGING_EXCLUDE_BUILD is not set
+# CONFIG_ET131X is not set
+# CONFIG_SLICOSS is not set
+# CONFIG_VIDEO_GO7007 is not set
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=y
+# CONFIG_USB_IP_COMMON is not set
+# CONFIG_W35UND is not set
+# CONFIG_PRISM2_USB is not set
+# CONFIG_ECHO is not set
+# CONFIG_OTUS is not set
+CONFIG_RT2860=m
+CONFIG_RT2870=m
+# CONFIG_COMEDI is not set
+# CONFIG_ASUS_OLED is not set
+# CONFIG_PANEL is not set
+CONFIG_R8187SE=m
+CONFIG_RTL8192SU=m
+CONFIG_RTL8192U=m
+CONFIG_RTL8192E=m
+# CONFIG_TRANZPORT is not set
+CONFIG_POHMELFS=m
+# CONFIG_POHMELFS_DEBUG is not set
+CONFIG_POHMELFS_CRYPTO=y
+CONFIG_IDE_PHISON=m
+CONFIG_LINE6_USB=m
+CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_NOUVEAU=m
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+CONFIG_DRM_NOUVEAU_DEBUG=y
+
+#
+# I2C encoder or helper chips
+#
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_USB_SERIAL_QUATECH2=m
+CONFIG_USB_SERIAL_QUATECH_USB2=m
+CONFIG_VT6655=m
+CONFIG_VT6656=m
+CONFIG_FB_UDL=m
+# CONFIG_HYPERV is not set
+# CONFIG_VME_BUS is not set
+
+#
+# RAR Register Driver
+#
+CONFIG_RAR_REGISTER=m
+# CONFIG_MRST_RAR_HANDLER is not set
+# CONFIG_DX_SEP is not set
+# CONFIG_IIO is not set
+CONFIG_RAMZSWAP=m
+CONFIG_RAMZSWAP_STATS=y
+CONFIG_WLAGS49_H2=m
+CONFIG_WLAGS49_H25=m
+CONFIG_BATMAN_ADV=m
+# CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_SAMSUNG_LAPTOP=m
+CONFIG_FB_SM7XX=m
+CONFIG_DT3155=m
+CONFIG_VIDEO_DT3155=m
+CONFIG_DT3155_CCIR=y
+CONFIG_CRYSTALHD=m
+# CONFIG_CXT1E1 is not set
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
+CONFIG_ST_BT=m
+CONFIG_FB_XGI=m
+CONFIG_X86_PLATFORM_DEVICES=y
+CONFIG_ACER_WMI=m
+CONFIG_ACERHDF=m
+CONFIG_ASUS_LAPTOP=m
+CONFIG_DELL_LAPTOP=m
+CONFIG_DELL_WMI=m
+CONFIG_FUJITSU_LAPTOP=m
+# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
+CONFIG_HP_WMI=m
+CONFIG_MSI_LAPTOP=m
+CONFIG_PANASONIC_LAPTOP=m
+CONFIG_COMPAL_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
+CONFIG_SONYPI_COMPAT=y
+CONFIG_THINKPAD_ACPI=m
+CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
+# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
+# CONFIG_THINKPAD_ACPI_DEBUG is not set
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
+CONFIG_THINKPAD_ACPI_VIDEO=y
+CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+CONFIG_INTEL_MENLOW=m
+CONFIG_EEEPC_LAPTOP=m
+CONFIG_EEEPC_WMI=m
+CONFIG_ACPI_WMI=m
+CONFIG_MSI_WMI=m
+CONFIG_ACPI_ASUS=m
+CONFIG_TOPSTAR_LAPTOP=m
+CONFIG_ACPI_TOSHIBA=m
+CONFIG_TOSHIBA_BT_RFKILL=m
+CONFIG_ACPI_CMPC=m
+
+#
+# Firmware Drivers
+#
+CONFIG_EDD=m
+CONFIG_EDD_OFF=y
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_EFI_VARS=m
+CONFIG_DELL_RBU=m
+CONFIG_DCDBAS=m
+CONFIG_DMIID=y
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
+CONFIG_EXT3_FS_XATTR=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_FS_XATTR=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_JBD2=y
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+CONFIG_REISERFS_FS=y
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=y
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_FS_POSIX_ACL=y
+CONFIG_XFS_FS=y
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=y
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=y
+CONFIG_OCFS2_FS_O2CB=y
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=y
+# CONFIG_OCFS2_FS_STATS is not set
+CONFIG_OCFS2_DEBUG_MASKLOG=y
+# CONFIG_OCFS2_DEBUG_FS is not set
+CONFIG_BTRFS_FS=y
+CONFIG_BTRFS_FS_POSIX_ACL=y
+CONFIG_NILFS2_FS=m
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=y
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=y
+CONFIG_QUOTACTL=y
+CONFIG_QUOTACTL_COMPAT=y
+CONFIG_AUTOFS_FS=m
+CONFIG_AUTOFS4_FS=m
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_GENERIC_ACL=y
+
+#
+# Caches
+#
+CONFIG_FSCACHE=m
+# CONFIG_FSCACHE_STATS is not set
+# CONFIG_FSCACHE_HISTOGRAM is not set
+# CONFIG_FSCACHE_DEBUG is not set
+# CONFIG_FSCACHE_OBJECT_LIST is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_HISTOGRAM is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=y
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=y
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=y
+# CONFIG_NTFS_DEBUG is not set
+CONFIG_NTFS_RW=y
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_CONFIGFS_FS=y
+CONFIG_MISC_FILESYSTEMS=y
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+CONFIG_AFFS_FS=m
+# CONFIG_ECRYPT_FS is not set
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+CONFIG_BFS_FS=m
+CONFIG_EFS_FS=m
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_UBIFS_FS=m
+CONFIG_UBIFS_FS_XATTR=y
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+# CONFIG_UBIFS_FS_DEBUG is not set
+CONFIG_LOGFS=m
+CONFIG_CRAMFS=m
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_XATTRS=y
+CONFIG_SQUASHFS_EMBEDDED=y
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+CONFIG_VXFS_FS=m
+CONFIG_MINIX_FS=m
+CONFIG_OMFS_FS=m
+CONFIG_HPFS_FS=m
+CONFIG_QNX4FS_FS=m
+CONFIG_ROMFS_FS=y
+CONFIG_ROMFS_BACKED_BY_BLOCK=y
+# CONFIG_ROMFS_BACKED_BY_MTD is not set
+# CONFIG_ROMFS_BACKED_BY_BOTH is not set
+CONFIG_ROMFS_ON_BLOCK=y
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+CONFIG_EXOFS_FS=m
+# CONFIG_EXOFS_DEBUG is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V4=y
+# CONFIG_NFS_V4_1 is not set
+CONFIG_NFSD=y
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+CONFIG_NFSD_V4=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+CONFIG_SUNRPC_XPRT_RDMA=m
+CONFIG_RPCSEC_GSS_KRB5=y
+CONFIG_RPCSEC_GSS_SPKM3=m
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FS_PRETTYDEBUG=y
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+CONFIG_CIFS_WEAK_PW_HASH=y
+# CONFIG_CIFS_UPCALL is not set
+# CONFIG_CIFS_XATTR is not set
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_DFS_UPCALL is not set
+# CONFIG_CIFS_EXPERIMENTAL is not set
+CONFIG_NCP_FS=m
+CONFIG_NCPFS_PACKET_SIGNING=y
+CONFIG_NCPFS_IOCTL_LOCKING=y
+CONFIG_NCPFS_STRONG=y
+CONFIG_NCPFS_NFS_NS=y
+CONFIG_NCPFS_OS2_NS=y
+CONFIG_NCPFS_SMALLDOS=y
+CONFIG_NCPFS_NLS=y
+CONFIG_NCPFS_EXTRAS=y
+CONFIG_CODA_FS=m
+CONFIG_AFS_FS=m
+# CONFIG_AFS_DEBUG is not set
+# CONFIG_AFS_FSCACHE is not set
+CONFIG_9P_FS=m
+# CONFIG_9P_FSCACHE is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+CONFIG_OSF_PARTITION=y
+CONFIG_AMIGA_PARTITION=y
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_UNIXWARE_DISKLABEL=y
+# CONFIG_LDM_PARTITION is not set
+CONFIG_SGI_PARTITION=y
+# CONFIG_ULTRIX_PARTITION is not set
+CONFIG_SUN_PARTITION=y
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_UTF8=y
+CONFIG_DLM=y
+# CONFIG_DLM_DEBUG is not set
+
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_PRINTK_TIME=y
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=0
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_STRIP_ASM_SYMS=y
+CONFIG_UNUSED_SYMBOLS=y
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+CONFIG_TIMER_STATS=y
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+CONFIG_STACKTRACE=y
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# CONFIG_LKDTM is not set
+CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_LATENCYTOP is not set
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FTRACE_NMI_ENTER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
+CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_RING_BUFFER=y
+CONFIG_FTRACE_NMI_ENTER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
+# CONFIG_IRQSOFF_TRACER is not set
+CONFIG_SYSPROF_TRACER=y
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_FTRACE_SYSCALLS is not set
+# CONFIG_BOOT_TRACER is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+# CONFIG_KSYM_TRACER is not set
+# CONFIG_STACK_TRACER is not set
+# CONFIG_KMEMTRACE is not set
+# CONFIG_WORKQUEUE_TRACER is not set
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_DYNAMIC_FTRACE=y
+# CONFIG_FUNCTION_PROFILER is not set
+CONFIG_FTRACE_MCOUNT_RECORD=y
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_MMIOTRACE is not set
+CONFIG_RING_BUFFER_BENCHMARK=m
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_DMA_API_DEBUG is not set
+CONFIG_ATOMIC64_SELFTEST=y
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+CONFIG_HAVE_ARCH_KMEMCHECK=y
+CONFIG_STRICT_DEVMEM=y
+CONFIG_X86_VERBOSE_BOOTUP=y
+CONFIG_EARLY_PRINTK=y
+# CONFIG_EARLY_PRINTK_DBGP is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_X86_PTDUMP is not set
+CONFIG_DEBUG_RODATA=y
+CONFIG_DEBUG_RODATA_TEST=y
+# CONFIG_DEBUG_NX_TEST is not set
+# CONFIG_IOMMU_DEBUG is not set
+# CONFIG_IOMMU_STRESS is not set
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+CONFIG_IO_DELAY_TYPE_0X80=0
+CONFIG_IO_DELAY_TYPE_0XED=1
+CONFIG_IO_DELAY_TYPE_UDELAY=2
+CONFIG_IO_DELAY_TYPE_NONE=3
+CONFIG_IO_DELAY_0X80=y
+# CONFIG_IO_DELAY_0XED is not set
+# CONFIG_IO_DELAY_UDELAY is not set
+# CONFIG_IO_DELAY_NONE is not set
+CONFIG_DEFAULT_IO_DELAY_TYPE=0
+# CONFIG_DEBUG_BOOT_PARAMS is not set
+# CONFIG_CPA_DEBUG is not set
+CONFIG_OPTIMIZE_INLINING=y
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_NETWORK_XFRM=y
+# CONFIG_SECURITY_PATH is not set
+# CONFIG_SECURITY_SELINUX is not set
+# CONFIG_SECURITY_TOMOYO is not set
+# CONFIG_IMA is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_XOR_BLOCKS=y
+CONFIG_ASYNC_CORE=y
+CONFIG_ASYNC_MEMCPY=y
+CONFIG_ASYNC_XOR=y
+CONFIG_ASYNC_PQ=y
+CONFIG_ASYNC_RAID6_RECOV=y
+CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
+CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_FIPS=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_MANAGER_TESTS=y
+CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_WORKQUEUE=y
+CONFIG_CRYPTO_CRYPTD=y
+CONFIG_CRYPTO_AUTHENC=y
+CONFIG_CRYPTO_TEST=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_SEQIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_LRW=y
+CONFIG_CRYPTO_PCBC=y
+CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_FPU=y
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=y
+CONFIG_CRYPTO_VMAC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_MD4=y
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=y
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_TGR192=y
+CONFIG_CRYPTO_WP512=y
+CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_X86_64=y
+CONFIG_CRYPTO_AES_NI_INTEL=y
+CONFIG_CRYPTO_ANUBIS=y
+CONFIG_CRYPTO_ARC4=y
+CONFIG_CRYPTO_BLOWFISH=y
+CONFIG_CRYPTO_CAMELLIA=y
+CONFIG_CRYPTO_CAST5=y
+CONFIG_CRYPTO_CAST6=y
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_FCRYPT=y
+CONFIG_CRYPTO_KHAZAD=y
+CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_SALSA20_X86_64=m
+CONFIG_CRYPTO_SEED=y
+CONFIG_CRYPTO_SERPENT=y
+CONFIG_CRYPTO_TEA=y
+CONFIG_CRYPTO_TWOFISH=y
+CONFIG_CRYPTO_TWOFISH_COMMON=y
+CONFIG_CRYPTO_TWOFISH_X86_64=y
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_ZLIB=m
+CONFIG_CRYPTO_LZO=m
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_CRYPTO_DEV_HIFN_795X=m
+CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+CONFIG_HAVE_KVM=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_APIC_ARCHITECTURE=y
+CONFIG_KVM_MMIO=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
+CONFIG_VHOST_NET=m
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_RING=m
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=m
+CONFIG_CRC_ITU_T=y
+CONFIG_CRC32=y
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=y
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=m
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_BTREE=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_CHECK_SIGNATURE=y
+CONFIG_NLATTR=y
+CONFIG_LRU_CACHE=m
diff --git a/testing/source/linux-2.6.38.4-configs/config-generic-2.6.38.4 b/testing/source/linux-2.6.38.4-configs/config-generic-2.6.38.4
new file mode 100644
index 00000000..9d3a83e6
--- /dev/null
+++ b/testing/source/linux-2.6.38.4-configs/config-generic-2.6.38.4
@@ -0,0 +1,5134 @@
+#
+# Automatically generated make config: don't edit
+# Linux/x86_64 2.6.38.4 Kernel Configuration
+# Thu Apr 21 20:32:02 2011
+#
+CONFIG_64BIT=y
+# CONFIG_X86_32 is not set
+CONFIG_X86_64=y
+CONFIG_X86=y
+CONFIG_INSTRUCTION_DECODER=y
+CONFIG_OUTPUT_FORMAT="elf64-x86-64"
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_MMU=y
+CONFIG_ZONE_DMA=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_DEFAULT_IDLE=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ZONE_DMA32=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_AUDIT_ARCH=y
+CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_X86_64_SMP=y
+CONFIG_X86_HT=y
+CONFIG_X86_TRAMPOLINE=y
+CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
+# CONFIG_KTIME_SCALAR is not set
+CONFIG_ARCH_CPU_PROBE_RELEASE=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_CONSTRUCTORS=y
+CONFIG_HAVE_IRQ_WORK=y
+CONFIG_IRQ_WORK=y
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_CROSS_COMPILE=""
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_LZO=y
+# CONFIG_KERNEL_GZIP is not set
+# CONFIG_KERNEL_BZIP2 is not set
+CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_XZ is not set
+# CONFIG_KERNEL_LZO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_AUDIT=y
+CONFIG_AUDITSYSCALL=y
+CONFIG_AUDIT_WATCH=y
+CONFIG_AUDIT_TREE=y
+CONFIG_HAVE_GENERIC_HARDIRQS=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_HARDIRQS=y
+# CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED is not set
+CONFIG_HAVE_SPARSE_IRQ=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_PENDING_IRQ=y
+# CONFIG_AUTO_IRQ_AFFINITY is not set
+# CONFIG_IRQ_PER_CPU is not set
+# CONFIG_HARDIRQS_SW_RESEND is not set
+# CONFIG_SPARSE_IRQ is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_PREEMPT_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_RCU_FAST_NO_HZ is not set
+# CONFIG_TREE_RCU_TRACE is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=15
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+CONFIG_CGROUPS=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_CGROUP_NS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_RESOURCE_COUNTERS=y
+CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_RT_GROUP_SCHED=y
+CONFIG_BLK_CGROUP=y
+# CONFIG_DEBUG_BLK_CGROUP is not set
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_SCHED_AUTOGROUP=y
+CONFIG_MM_OWNER=y
+# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+# CONFIG_EXPERT is not set
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_HAVE_PERF_EVENTS=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_PERF_COUNTERS is not set
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_PCI_QUIRKS=y
+CONFIG_SLUB_DEBUG=y
+CONFIG_COMPAT_BRK=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+CONFIG_OPROFILE=m
+# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+# CONFIG_JUMP_LABEL is not set
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_STOP_MACHINE=y
+CONFIG_BLOCK=y
+CONFIG_BLK_DEV_BSG=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
+CONFIG_BLK_DEV_THROTTLING=y
+CONFIG_BLOCK_COMPAT=y
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_CFQ_GROUP_IOSCHED=y
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_PADATA=y
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_FREEZER=y
+
+#
+# Processor type and features
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_SMP=y
+CONFIG_X86_MPPARSE=y
+# CONFIG_X86_EXTENDED_PLATFORM is not set
+CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+# CONFIG_PARAVIRT_GUEST is not set
+CONFIG_NO_BOOTMEM=y
+CONFIG_MEMTEST=y
+# CONFIG_MK8 is not set
+# CONFIG_MPSC is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
+CONFIG_GENERIC_CPU=y
+CONFIG_X86_CPU=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_CMPXCHG=y
+CONFIG_CMPXCHG_LOCAL=y
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_XADD=y
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_TSC=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=64
+CONFIG_X86_DEBUGCTLMSR=y
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_DMI=y
+CONFIG_GART_IOMMU=y
+# CONFIG_CALGARY_IOMMU is not set
+# CONFIG_AMD_IOMMU is not set
+CONFIG_SWIOTLB=y
+CONFIG_IOMMU_HELPER=y
+# CONFIG_IOMMU_API is not set
+# CONFIG_MAXSMP is not set
+CONFIG_NR_CPUS=32
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_MCE=y
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_AMD=y
+CONFIG_X86_MCE_THRESHOLD=y
+CONFIG_X86_MCE_INJECT=m
+CONFIG_X86_THERMAL_VECTOR=y
+CONFIG_I8K=m
+CONFIG_MICROCODE=m
+CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_AMD=y
+CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=m
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_DIRECT_GBPAGES=y
+# CONFIG_NUMA is not set
+CONFIG_ARCH_PROC_KCORE_TEXT=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_MEMORY_PROBE=y
+CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_HAVE_MEMORY_PRESENT=y
+CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
+CONFIG_SPARSEMEM_VMEMMAP=y
+CONFIG_HAVE_MEMBLOCK=y
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_SPARSE=y
+CONFIG_MEMORY_HOTREMOVE=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_COMPACTION=y
+CONFIG_MIGRATION=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_MMU_NOTIFIER=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=98304
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+# CONFIG_MEMORY_FAILURE is not set
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
+CONFIG_X86_RESERVE_LOW=64
+CONFIG_MTRR=y
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
+CONFIG_X86_PAT=y
+CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_EFI=y
+CONFIG_SECCOMP=y
+CONFIG_CC_STACKPROTECTOR=y
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
+CONFIG_HZ_1000=y
+CONFIG_HZ=1000
+CONFIG_SCHED_HRTICK=y
+# CONFIG_KEXEC is not set
+# CONFIG_CRASH_DUMP is not set
+CONFIG_PHYSICAL_START=0x1000000
+# CONFIG_RELOCATABLE is not set
+CONFIG_PHYSICAL_ALIGN=0x1000000
+CONFIG_HOTPLUG_CPU=y
+CONFIG_COMPAT_VDSO=y
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+
+#
+# Power management and ACPI options
+#
+CONFIG_ARCH_HIBERNATION_HEADER=y
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_SLEEP_SMP=y
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+CONFIG_HIBERNATION=y
+CONFIG_PM_STD_PARTITION="\"\""
+CONFIG_PM_RUNTIME=y
+CONFIG_PM_OPS=y
+CONFIG_ACPI=y
+CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_PROCFS=y
+CONFIG_ACPI_PROCFS_POWER=y
+CONFIG_ACPI_POWER_METER=m
+CONFIG_ACPI_EC_DEBUGFS=m
+CONFIG_ACPI_PROC_EVENT=y
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=m
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_PROCESSOR=m
+CONFIG_ACPI_IPMI=m
+CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
+CONFIG_ACPI_THERMAL=m
+# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_BLACKLIST_YEAR=0
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_PCI_SLOT=m
+CONFIG_X86_PM_TIMER=y
+CONFIG_ACPI_CONTAINER=m
+CONFIG_ACPI_HOTPLUG_MEMORY=m
+CONFIG_ACPI_SBS=m
+CONFIG_ACPI_HED=m
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=m
+CONFIG_ACPI_APEI_EINJ=m
+CONFIG_ACPI_APEI_ERST_DEBUG=m
+CONFIG_SFI=y
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=m
+# CONFIG_CPU_FREQ_DEBUG is not set
+CONFIG_CPU_FREQ_STAT=m
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=m
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+
+#
+# CPUFreq processor drivers
+#
+CONFIG_X86_PCC_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_SPEEDSTEP_CENTRINO=m
+CONFIG_X86_P4_CLOCKMOD=m
+
+#
+# shared options
+#
+CONFIG_X86_SPEEDSTEP_LIB=m
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_INTEL_IDLE=y
+
+#
+# Memory power savings
+#
+CONFIG_I7300_IDLE_IOAT_CHANNEL=y
+CONFIG_I7300_IDLE=m
+
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_DOMAINS=y
+# CONFIG_PCI_CNB20LE_QUIRK is not set
+# CONFIG_DMAR is not set
+# CONFIG_INTR_REMAP is not set
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=m
+CONFIG_PCIEAER=y
+# CONFIG_PCIE_ECRC is not set
+CONFIG_PCIEAER_INJECT=m
+CONFIG_PCIEASPM=y
+# CONFIG_PCIEASPM_DEBUG is not set
+CONFIG_PCIE_PME=y
+CONFIG_ARCH_SUPPORTS_MSI=y
+CONFIG_PCI_MSI=y
+# CONFIG_PCI_DEBUG is not set
+CONFIG_PCI_STUB=m
+CONFIG_HT_IRQ=y
+# CONFIG_PCI_IOV is not set
+CONFIG_PCI_IOAPIC=y
+CONFIG_ISA_DMA_API=y
+CONFIG_AMD_NB=y
+CONFIG_PCCARD=m
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_PCCARD_NONSTATIC=y
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_FAKE=m
+CONFIG_HOTPLUG_PCI_ACPI=m
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
+# CONFIG_HOTPLUG_PCI_CPCI is not set
+CONFIG_HOTPLUG_PCI_SHPC=m
+
+#
+# Executable file formats / Emulations
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_COMPAT_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_HAVE_AOUT is not set
+CONFIG_BINFMT_MISC=m
+CONFIG_IA32_EMULATION=y
+# CONFIG_IA32_AOUT is not set
+CONFIG_COMPAT=y
+CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
+CONFIG_SYSVIPC_COMPAT=y
+CONFIG_HAVE_TEXT_POKE_SMP=y
+CONFIG_NET=y
+CONFIG_COMPAT_NETLINK_MESSAGES=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=y
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+# CONFIG_NET_KEY_MIGRATE is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_INET_LRO=y
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=m
+CONFIG_IPV6_PRIVACY=y
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_SIT_6RD is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_NETLABEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+# CONFIG_NF_CONNTRACK_EVENTS is not set
+CONFIG_NF_CT_PROTO_DCCP=m
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_TPROXY=m
+CONFIG_NETFILTER_XTABLES=m
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_VS=m
+# CONFIG_IP_VS_IPV6 is not set
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_NFCT=y
+CONFIG_IP_VS_PE_SIP=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_DCCP=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_QUEUE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+
+#
+# DECnet: Netfilter Configuration
+#
+# CONFIG_DECNET_NF_GRABULATOR is not set
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_ULOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+# CONFIG_IP_DCCP_CCID3 is not set
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_MSG is not set
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_HMAC_NONE is not set
+# CONFIG_SCTP_HMAC_SHA1 is not set
+CONFIG_SCTP_HMAC_MD5=y
+CONFIG_RDS=m
+CONFIG_RDS_RDMA=m
+CONFIG_RDS_TCP=m
+# CONFIG_RDS_DEBUG is not set
+CONFIG_TIPC=m
+# CONFIG_TIPC_ADVANCED is not set
+# CONFIG_TIPC_DEBUG is not set
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_GARP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+# CONFIG_NET_DSA is not set
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_DECNET=m
+# CONFIG_DECNET_ROUTER is not set
+CONFIG_LLC=m
+CONFIG_LLC2=m
+CONFIG_IPX=m
+# CONFIG_IPX_INTERN is not set
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_IPDDP_DECAP=y
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+CONFIG_WAN_ROUTER=m
+# CONFIG_PHONET is not set
+CONFIG_IEEE802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_INGRESS=m
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_ROUTE=y
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=y
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=y
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+# CONFIG_NET_CLS_IND is not set
+CONFIG_NET_SCH_FIFO=y
+# CONFIG_DCB is not set
+CONFIG_DNS_RESOLVER=y
+CONFIG_BATMAN_ADV=m
+# CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_RPS=y
+CONFIG_XPS=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NET_DROP_MONITOR is not set
+CONFIG_HAMRADIO=y
+
+#
+# Packet Radio protocols
+#
+CONFIG_AX25=m
+# CONFIG_AX25_DAMA_SLAVE is not set
+CONFIG_NETROM=m
+CONFIG_ROSE=m
+
+#
+# AX.25 network device drivers
+#
+CONFIG_MKISS=m
+CONFIG_6PACK=m
+CONFIG_BPQETHER=m
+CONFIG_BAYCOM_SER_FDX=m
+CONFIG_BAYCOM_SER_HDX=m
+CONFIG_BAYCOM_PAR=m
+CONFIG_YAM=m
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+
+#
+# CAN Device Drivers
+#
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_SLCAN=m
+CONFIG_CAN_DEV=m
+# CONFIG_CAN_CALC_BITTIMING is not set
+CONFIG_CAN_JANZ_ICAN3=m
+CONFIG_PCH_CAN=m
+CONFIG_CAN_SJA1000=m
+CONFIG_CAN_SJA1000_PLATFORM=m
+CONFIG_CAN_EMS_PCI=m
+CONFIG_CAN_KVASER_PCI=m
+CONFIG_CAN_PLX_PCI=m
+
+#
+# CAN USB interfaces
+#
+CONFIG_CAN_EMS_USB=m
+CONFIG_CAN_ESD_USB2=m
+CONFIG_CAN_SOFTING=m
+CONFIG_CAN_SOFTING_CS=m
+# CONFIG_CAN_DEBUG_DEVICES is not set
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+# CONFIG_IRDA_ULTRA is not set
+
+#
+# IrDA options
+#
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+# CONFIG_IRDA_DEBUG is not set
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+CONFIG_IRTTY_SIR=m
+
+#
+# Dongle support
+#
+CONFIG_DONGLE=y
+CONFIG_ESI_DONGLE=m
+CONFIG_ACTISYS_DONGLE=m
+CONFIG_TEKRAM_DONGLE=m
+CONFIG_TOIM3232_DONGLE=m
+CONFIG_LITELINK_DONGLE=m
+CONFIG_MA600_DONGLE=m
+CONFIG_GIRBIL_DONGLE=m
+CONFIG_MCP2120_DONGLE=m
+CONFIG_OLD_BELKIN_DONGLE=m
+CONFIG_ACT200L_DONGLE=m
+CONFIG_KINGSUN_DONGLE=m
+CONFIG_KSDAZZLE_DONGLE=m
+CONFIG_KS959_DONGLE=m
+
+#
+# FIR device drivers
+#
+CONFIG_USB_IRDA=m
+CONFIG_SIGMATEL_FIR=m
+CONFIG_NSC_FIR=m
+CONFIG_WINBOND_FIR=m
+CONFIG_SMC_IRCC_FIR=m
+CONFIG_ALI_FIR=m
+CONFIG_VLSI_FIR=m
+CONFIG_VIA_FIR=m
+CONFIG_MCS_FIR=m
+CONFIG_BT=m
+CONFIG_BT_L2CAP=m
+CONFIG_BT_SCO=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIBTUART=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_AF_RXRPC=m
+# CONFIG_AF_RXRPC_DEBUG is not set
+CONFIG_RXKAD=m
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_REG_DEBUG is not set
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+# CONFIG_CFG80211_INTERNAL_REGDB is not set
+CONFIG_CFG80211_WEXT=y
+CONFIG_WIRELESS_EXT_SYSFS=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_MINSTREL_HT=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+CONFIG_NET_9P_RDMA=m
+# CONFIG_NET_9P_DEBUG is not set
+# CONFIG_CAIF is not set
+CONFIG_CEPH_LIB=m
+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+CONFIG_CONNECTOR=m
+CONFIG_MTD=m
+# CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_TESTS=m
+CONFIG_MTD_CONCAT=m
+CONFIG_MTD_PARTITIONS=y
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+CONFIG_MTD_AR7_PARTS=m
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=m
+CONFIG_HAVE_MTD_OTP=y
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+CONFIG_FTL=m
+CONFIG_NFTL=m
+CONFIG_NFTL_RW=y
+CONFIG_INFTL=m
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
+CONFIG_SM_FTL=m
+CONFIG_MTD_OOPS=m
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_GEN_PROBE=m
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+CONFIG_MTD_MAP_BANK_WIDTH_8=y
+CONFIG_MTD_MAP_BANK_WIDTH_16=y
+CONFIG_MTD_MAP_BANK_WIDTH_32=y
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+CONFIG_MTD_CFI_I4=y
+CONFIG_MTD_CFI_I8=y
+CONFIG_MTD_OTP=y
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_CFI_UTIL=m
+CONFIG_MTD_RAM=m
+CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_PHYSMAP=m
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+CONFIG_MTD_SC520CDP=m
+CONFIG_MTD_NETSC520=m
+CONFIG_MTD_TS5500=m
+CONFIG_MTD_SBC_GXX=m
+CONFIG_MTD_AMD76XROM=m
+CONFIG_MTD_ICHXROM=m
+CONFIG_MTD_ESB2ROM=m
+CONFIG_MTD_CK804XROM=m
+CONFIG_MTD_SCB2_FLASH=m
+CONFIG_MTD_NETtel=m
+CONFIG_MTD_L440GX=m
+CONFIG_MTD_PCI=m
+CONFIG_MTD_PCMCIA=m
+# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
+CONFIG_MTD_GPIO_ADDR=m
+CONFIG_MTD_INTEL_VR_NOR=m
+CONFIG_MTD_PLATRAM=m
+
+#
+# Self-contained MTD device drivers
+#
+CONFIG_MTD_PMC551=m
+CONFIG_MTD_PMC551_BUGFIX=y
+# CONFIG_MTD_PMC551_DEBUG is not set
+CONFIG_MTD_SLRAM=m
+CONFIG_MTD_PHRAM=m
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=4096
+CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTD_BLOCK2MTD=m
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+CONFIG_MTD_DOC2001PLUS=m
+CONFIG_MTD_DOCPROBE=m
+CONFIG_MTD_DOCECC=m
+CONFIG_MTD_DOCPROBE_ADVANCED=y
+CONFIG_MTD_DOCPROBE_ADDRESS=0x0000
+CONFIG_MTD_DOCPROBE_HIGH=y
+CONFIG_MTD_DOCPROBE_55AA=y
+CONFIG_MTD_NAND_ECC=m
+CONFIG_MTD_NAND_ECC_SMC=y
+CONFIG_MTD_NAND=m
+CONFIG_MTD_NAND_VERIFY_WRITE=y
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_MUSEUM_IDS=y
+CONFIG_MTD_NAND_DENALI=m
+CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xFF108018
+CONFIG_MTD_NAND_IDS=m
+CONFIG_MTD_NAND_RICOH=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y
+CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y
+CONFIG_MTD_NAND_CAFE=m
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_PLATFORM=m
+CONFIG_MTD_ALAUDA=m
+CONFIG_MTD_ONENAND=m
+CONFIG_MTD_ONENAND_VERIFY_WRITE=y
+CONFIG_MTD_ONENAND_GENERIC=m
+CONFIG_MTD_ONENAND_OTP=y
+CONFIG_MTD_ONENAND_2X_PROGRAM=y
+CONFIG_MTD_ONENAND_SIM=m
+
+#
+# LPDDR flash memory drivers
+#
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_RESERVE=1
+CONFIG_MTD_UBI_GLUEBI=m
+
+#
+# UBI debugging options
+#
+# CONFIG_MTD_UBI_DEBUG is not set
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
+CONFIG_PARPORT_PC_PCMCIA=m
+# CONFIG_PARPORT_GSC is not set
+CONFIG_PARPORT_AX88796=m
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_PNP=y
+CONFIG_PNP_DEBUG_MESSAGES=y
+
+#
+# Protocols
+#
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_FD=y
+CONFIG_PARIDE=m
+
+#
+# Parallel IDE high-level drivers
+#
+CONFIG_PARIDE_PD=m
+CONFIG_PARIDE_PCD=m
+CONFIG_PARIDE_PF=m
+CONFIG_PARIDE_PT=m
+CONFIG_PARIDE_PG=m
+
+#
+# Parallel IDE protocol modules
+#
+CONFIG_PARIDE_ATEN=m
+CONFIG_PARIDE_BPCK=m
+CONFIG_PARIDE_COMM=m
+CONFIG_PARIDE_DSTR=m
+CONFIG_PARIDE_FIT2=m
+CONFIG_PARIDE_FIT3=m
+CONFIG_PARIDE_EPAT=m
+CONFIG_PARIDE_EPATC8=y
+CONFIG_PARIDE_EPIA=m
+CONFIG_PARIDE_FRIQ=m
+CONFIG_PARIDE_FRPW=m
+CONFIG_PARIDE_KBIC=m
+CONFIG_PARIDE_KTTI=m
+CONFIG_PARIDE_ON20=m
+CONFIG_PARIDE_ON26=m
+CONFIG_BLK_CPQ_DA=m
+CONFIG_BLK_CPQ_CISS_DA=m
+CONFIG_CISS_SCSI_TAPE=y
+CONFIG_BLK_DEV_DAC960=m
+CONFIG_BLK_DEV_UMEM=m
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_OSD=m
+CONFIG_BLK_DEV_SX8=m
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=16384
+# CONFIG_BLK_DEV_XIP is not set
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_ATA_OVER_ETH=m
+CONFIG_VIRTIO_BLK=m
+# CONFIG_BLK_DEV_HD is not set
+CONFIG_BLK_DEV_RBD=m
+CONFIG_MISC_DEVICES=y
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+CONFIG_IBM_ASM=m
+CONFIG_PHANTOM=m
+CONFIG_SGI_IOC4=m
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+CONFIG_ICS932S401=m
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_CS5535_MFGPT=m
+CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
+CONFIG_CS5535_CLOCK_EVENT_SRC=m
+CONFIG_HP_ILO=m
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1780=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
+CONFIG_VMWARE_BALLOON=m
+CONFIG_BMP085=m
+CONFIG_PCH_PHUB=m
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+CONFIG_IWMC3200TOP=m
+# CONFIG_IWMC3200TOP_DEBUG is not set
+# CONFIG_IWMC3200TOP_DEBUGFS is not set
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=y
+CONFIG_RAID_ATTRS=y
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_TGT=y
+CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=m
+CONFIG_CHR_DEV_OSST=m
+CONFIG_BLK_DEV_SR=y
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=y
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_FC_TGT_ATTRS=y
+CONFIG_SCSI_ISCSI_ATTRS=y
+CONFIG_SCSI_SAS_ATTRS=y
+CONFIG_SCSI_SAS_LIBSAS=y
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
+CONFIG_SCSI_SRP_ATTRS=m
+CONFIG_SCSI_SRP_TGT_ATTRS=y
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_ISCSI_BOOT_SYSFS=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_BE2ISCSI=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_HPSA=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=4
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
+CONFIG_AIC7XXX_DEBUG_MASK=0
+# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
+CONFIG_SCSI_AIC7XXX_OLD=m
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_CMDS_PER_DEVICE=4
+CONFIG_AIC79XX_RESET_DELAY_MS=15000
+# CONFIG_AIC79XX_DEBUG_ENABLE is not set
+CONFIG_AIC79XX_DEBUG_MASK=0
+# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_MVSAS=m
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_ADVANSYS=m
+CONFIG_SCSI_ARCMSR=m
+# CONFIG_SCSI_ARCMSR_AER is not set
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+CONFIG_MEGARAID_LEGACY=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+# CONFIG_SCSI_MPT2SAS_LOGGING is not set
+CONFIG_SCSI_HPTIOP=m
+CONFIG_SCSI_BUSLOGIC=m
+CONFIG_VMWARE_PVSCSI=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_FCOE_FNIC=m
+CONFIG_SCSI_DMX3191D=m
+CONFIG_SCSI_EATA=m
+# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
+# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
+CONFIG_SCSI_EATA_MAX_TAGS=16
+CONFIG_SCSI_FUTURE_DOMAIN=m
+CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
+CONFIG_SCSI_PPA=m
+CONFIG_SCSI_IMM=m
+# CONFIG_SCSI_IZIP_EPP16 is not set
+# CONFIG_SCSI_IZIP_SLOW_CTR is not set
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_SCSI_IPR=m
+# CONFIG_SCSI_IPR_TRACE is not set
+# CONFIG_SCSI_IPR_DUMP is not set
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLA_FC=m
+CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_SCSI_LPFC=m
+# CONFIG_SCSI_LPFC_DEBUG_FS is not set
+CONFIG_SCSI_DC395x=m
+CONFIG_SCSI_DC390T=m
+CONFIG_SCSI_DEBUG=m
+CONFIG_SCSI_PMCRAID=m
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_SRP=m
+CONFIG_SCSI_BFA_FC=m
+CONFIG_SCSI_LOWLEVEL_PCMCIA=y
+CONFIG_PCMCIA_AHA152X=m
+CONFIG_PCMCIA_FDOMAIN=m
+CONFIG_PCMCIA_QLOGIC=m
+CONFIG_PCMCIA_SYM53C500=m
+CONFIG_SCSI_DH=m
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+CONFIG_SCSI_OSD_INITIATOR=m
+CONFIG_SCSI_OSD_ULD=m
+CONFIG_SCSI_OSD_DPRINT_SENSE=1
+# CONFIG_SCSI_OSD_DEBUG is not set
+CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_ACPI=y
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=y
+CONFIG_SATA_AHCI_PLATFORM=y
+CONFIG_SATA_INIC162X=y
+CONFIG_SATA_ACARD_AHCI=y
+CONFIG_SATA_SIL24=y
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=y
+CONFIG_SATA_QSTOR=y
+CONFIG_SATA_SX4=y
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=y
+CONFIG_SATA_MV=y
+CONFIG_SATA_NV=y
+CONFIG_SATA_PROMISE=y
+CONFIG_SATA_SIL=y
+CONFIG_SATA_SIS=y
+CONFIG_SATA_SVW=y
+CONFIG_SATA_ULI=y
+CONFIG_SATA_VIA=y
+CONFIG_SATA_VITESSE=y
+
+#
+# PATA SFF controllers with BMDMA
+#
+CONFIG_PATA_ALI=y
+CONFIG_PATA_AMD=y
+CONFIG_PATA_ARTOP=y
+CONFIG_PATA_ATIIXP=y
+CONFIG_PATA_ATP867X=y
+CONFIG_PATA_CMD64X=y
+CONFIG_PATA_CS5520=y
+CONFIG_PATA_CS5530=y
+CONFIG_PATA_CS5536=y
+CONFIG_PATA_CYPRESS=y
+CONFIG_PATA_EFAR=y
+CONFIG_PATA_HPT366=y
+CONFIG_PATA_HPT37X=y
+CONFIG_PATA_HPT3X2N=y
+CONFIG_PATA_HPT3X3=y
+CONFIG_PATA_HPT3X3_DMA=y
+CONFIG_PATA_IT8213=y
+CONFIG_PATA_IT821X=y
+CONFIG_PATA_JMICRON=y
+CONFIG_PATA_MARVELL=y
+CONFIG_PATA_NETCELL=y
+CONFIG_PATA_NINJA32=y
+CONFIG_PATA_NS87415=y
+CONFIG_PATA_OLDPIIX=y
+CONFIG_PATA_OPTIDMA=y
+CONFIG_PATA_PDC2027X=y
+CONFIG_PATA_PDC_OLD=y
+CONFIG_PATA_RADISYS=y
+CONFIG_PATA_RDC=y
+CONFIG_PATA_SC1200=y
+CONFIG_PATA_SCH=y
+CONFIG_PATA_SERVERWORKS=y
+CONFIG_PATA_SIL680=y
+CONFIG_PATA_SIS=y
+CONFIG_PATA_TOSHIBA=m
+CONFIG_PATA_TRIFLEX=y
+CONFIG_PATA_VIA=y
+CONFIG_PATA_WINBOND=y
+
+#
+# PIO-only SFF controllers
+#
+CONFIG_PATA_CMD640_PCI=y
+CONFIG_PATA_MPIIX=y
+CONFIG_PATA_NS87410=y
+CONFIG_PATA_OPTI=y
+CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_RZ1000=y
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_PATA_ACPI=y
+CONFIG_ATA_GENERIC=y
+CONFIG_PATA_LEGACY=y
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_AUTODETECT=y
+CONFIG_MD_LINEAR=y
+CONFIG_MD_RAID0=y
+CONFIG_MD_RAID1=y
+CONFIG_MD_RAID10=y
+CONFIG_MD_RAID456=y
+# CONFIG_MULTICORE_RAID456 is not set
+CONFIG_MD_MULTIPATH=y
+CONFIG_MD_FAULTY=m
+CONFIG_BLK_DEV_DM=y
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_CRYPT=y
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_MIRROR=y
+CONFIG_DM_RAID=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+# CONFIG_DM_DELAY is not set
+CONFIG_DM_UEVENT=y
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+CONFIG_FUSION_LAN=m
+# CONFIG_FUSION_LOGGING is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_OHCI_DEBUG=y
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_FIREWIRE_NOSY=m
+CONFIG_I2O=m
+CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
+CONFIG_I2O_EXT_ADAPTEC=y
+CONFIG_I2O_EXT_ADAPTEC_DMA64=y
+CONFIG_I2O_CONFIG=m
+# CONFIG_I2O_CONFIG_OLD_IOCTL is not set
+CONFIG_I2O_BUS=m
+CONFIG_I2O_BLOCK=m
+CONFIG_I2O_SCSI=m
+CONFIG_I2O_PROC=m
+CONFIG_MACINTOSH_DRIVERS=y
+CONFIG_MAC_EMUMOUSEBTN=y
+CONFIG_NETDEVICES=y
+CONFIG_IFB=m
+CONFIG_DUMMY=m
+CONFIG_BONDING=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_EQUALIZER=m
+CONFIG_TUN=m
+CONFIG_VETH=m
+CONFIG_NET_SB1000=m
+CONFIG_ARCNET=m
+CONFIG_ARCNET_1201=m
+CONFIG_ARCNET_1051=m
+CONFIG_ARCNET_RAW=m
+CONFIG_ARCNET_CAP=m
+CONFIG_ARCNET_COM90xx=m
+CONFIG_ARCNET_COM90xxIO=m
+CONFIG_ARCNET_RIM_I=m
+CONFIG_ARCNET_COM20020=m
+CONFIG_ARCNET_COM20020_PCI=m
+CONFIG_MII=m
+CONFIG_PHYLIB=m
+
+#
+# MII PHY device drivers
+#
+CONFIG_MARVELL_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM63XX_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_STE10XP=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MICREL_PHY=m
+CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_GPIO=m
+CONFIG_NET_ETHERNET=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_ETHOC=m
+CONFIG_DNET=m
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+CONFIG_TULIP_MMIO=y
+# CONFIG_TULIP_NAPI is not set
+CONFIG_DE4X5=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_PCMCIA_XIRCOM=m
+CONFIG_HP100=m
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
+CONFIG_NET_PCI=y
+CONFIG_PCNET32=m
+CONFIG_AMD8111_ETH=m
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_KSZ884X_PCI=m
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_FORCEDETH=m
+CONFIG_E100=m
+CONFIG_FEALNX=m
+CONFIG_NATSEMI=m
+CONFIG_NE2K_PCI=m
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+CONFIG_8139TOO_PIO=y
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R6040=m
+CONFIG_SIS900=m
+CONFIG_EPIC100=m
+CONFIG_SMSC9420=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_TLAN=m
+CONFIG_KS8842=m
+CONFIG_KS8851_MLL=m
+CONFIG_VIA_RHINE=m
+CONFIG_VIA_RHINE_MMIO=y
+CONFIG_SC92031=m
+CONFIG_NET_POCKET=y
+CONFIG_ATP=m
+CONFIG_DE600=m
+CONFIG_DE620=m
+CONFIG_ATL2=m
+CONFIG_NETDEV_1000=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_DL2K=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IP1000=m
+CONFIG_IGB=m
+CONFIG_IGB_DCA=y
+CONFIG_IGBVF=m
+CONFIG_NS83820=m
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_R8169=m
+CONFIG_R8169_VLAN=y
+CONFIG_SIS190=m
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_VIA_VELOCITY=m
+CONFIG_TIGON3=m
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_QLA3XXX=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_JME=m
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_DA is not set
+CONFIG_STMMAC_DUAL_MAC=y
+CONFIG_PCH_GBE=m
+CONFIG_NETDEV_10000=y
+CONFIG_MDIO=m
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3_DEPENDS=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4_DEPENDS=y
+CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4VF_DEPENDS=y
+CONFIG_CHELSIO_T4VF=m
+CONFIG_ENIC=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_DCA=y
+CONFIG_IXGBEVF=m
+CONFIG_IXGB=m
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+CONFIG_MYRI10GE=m
+CONFIG_MYRI10GE_DCA=y
+CONFIG_NETXEN_NIC=m
+CONFIG_NIU=m
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_TEHUTI=m
+CONFIG_BNX2X=m
+CONFIG_QLCNIC=m
+CONFIG_QLGE=m
+CONFIG_BNA=m
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_BE2NET=m
+CONFIG_TR=m
+CONFIG_IBMOL=m
+CONFIG_3C359=m
+CONFIG_TMS380TR=m
+CONFIG_TMSPCI=m
+CONFIG_ABYSS=m
+CONFIG_WLAN=y
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_AIRO=m
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_PCMCIA_ATMEL=m
+CONFIG_AT76C50X_USB=m
+CONFIG_AIRO_CS=m
+CONFIG_PCMCIA_WL3501=m
+CONFIG_PRISM54=m
+CONFIG_USB_ZD1201=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_ADM8211=m
+# CONFIG_MAC80211_HWSIM is not set
+CONFIG_MWL8K=m
+CONFIG_ATH_COMMON=m
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+CONFIG_ATH5K_PCI=y
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K=m
+# CONFIG_ATH9K_DEBUGFS is not set
+CONFIG_ATH9K_RATE_CONTROL=y
+CONFIG_ATH9K_HTC=m
+# CONFIG_ATH9K_HTC_DEBUGFS is not set
+CONFIG_AR9170_USB=m
+CONFIG_AR9170_LEDS=y
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+CONFIG_CARL9170_WPC=y
+CONFIG_B43=m
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_PCMCIA=y
+CONFIG_B43_SDIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_N=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+# CONFIG_B43LEGACY_DEBUG is not set
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_IWLWIFI=m
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_DEBUG is not set
+# CONFIG_IWLWIFI_DEVICE_TRACING is not set
+CONFIG_IWLAGN=m
+CONFIG_IWL4965=y
+CONFIG_IWL5000=y
+CONFIG_IWL3945=m
+CONFIG_IWM=m
+# CONFIG_IWM_DEBUG is not set
+# CONFIG_IWM_TRACING is not set
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
+CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_HERMES=m
+# CONFIG_HERMES_PRISM is not set
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_ORINOCO_USB=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_P54_LEDS=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT33XX=y
+CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RT2800_LIB=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_HT=y
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_RTL8192CE=m
+CONFIG_RTLWIFI=m
+CONFIG_WL1251=m
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX_MENU=m
+CONFIG_WL12XX=m
+# CONFIG_WL12XX_HT is not set
+CONFIG_WL12XX_SDIO=m
+CONFIG_WL12XX_SDIO_TEST=m
+CONFIG_WL12XX_PLATFORM_DATA=y
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+
+#
+# WiMAX Wireless Broadband devices
+#
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_SDIO=m
+# CONFIG_WIMAX_IWMC3200_SDIO is not set
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+
+#
+# USB Network Adapters
+#
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+# CONFIG_USB_EPSON2888 is not set
+# CONFIG_USB_KC2190 is not set
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_NET_PCMCIA=y
+CONFIG_PCMCIA_3C589=m
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_PCMCIA_XIRC2PS=m
+CONFIG_PCMCIA_AXNET=m
+CONFIG_ARCNET_COM20020_CS=m
+CONFIG_PCMCIA_IBMTR=m
+CONFIG_WAN=y
+CONFIG_LANMEDIA=m
+CONFIG_HDLC=m
+CONFIG_HDLC_RAW=m
+CONFIG_HDLC_RAW_ETH=m
+CONFIG_HDLC_CISCO=m
+CONFIG_HDLC_FR=m
+CONFIG_HDLC_PPP=m
+
+#
+# X.25/LAPB support is disabled
+#
+CONFIG_PCI200SYN=m
+CONFIG_WANXL=m
+# CONFIG_PC300TOO is not set
+CONFIG_FARSYNC=m
+CONFIG_DSCC4=m
+# CONFIG_DSCC4_PCISYNC is not set
+# CONFIG_DSCC4_PCI_RST is not set
+CONFIG_DLCI=m
+CONFIG_DLCI_MAX=8
+CONFIG_WAN_ROUTER_DRIVERS=m
+CONFIG_CYCLADES_SYNC=m
+CONFIG_CYCLOMX_X25=y
+CONFIG_SBNI=m
+# CONFIG_SBNI_MULTILINE is not set
+CONFIG_ATM_DRIVERS=y
+CONFIG_ATM_DUMMY=m
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+# CONFIG_ATM_ENI_TUNE_BURST is not set
+CONFIG_ATM_FIRESTREAM=m
+CONFIG_ATM_ZATM=m
+# CONFIG_ATM_ZATM_DEBUG is not set
+CONFIG_ATM_NICSTAR=m
+# CONFIG_ATM_NICSTAR_USE_SUNI is not set
+# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_AMBASSADOR=m
+# CONFIG_ATM_AMBASSADOR_DEBUG is not set
+CONFIG_ATM_HORIZON=m
+# CONFIG_ATM_HORIZON_DEBUG is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+# CONFIG_ATM_FORE200E_USE_TASKLET is not set
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+# CONFIG_ATM_HE_USE_SUNI is not set
+CONFIG_ATM_SOLOS=m
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKEHARD=m
+
+#
+# CAIF transport drivers
+#
+CONFIG_FDDI=y
+CONFIG_DEFXX=m
+# CONFIG_DEFXX_MMIO is not set
+CONFIG_SKFP=m
+CONFIG_HIPPI=y
+CONFIG_ROADRUNNER=m
+# CONFIG_ROADRUNNER_LARGE_RINGS is not set
+CONFIG_PLIP=m
+CONFIG_PPP=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOATM=m
+CONFIG_PPPOL2TP=m
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLHC=m
+CONFIG_SLIP_SMART=y
+# CONFIG_SLIP_MODE_SLIP6 is not set
+CONFIG_NET_FC=y
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+# CONFIG_NETPOLL_TRAP is not set
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_VIRTIO_NET=m
+CONFIG_VMXNET3=m
+CONFIG_ISDN=y
+CONFIG_ISDN_I4L=m
+CONFIG_ISDN_PPP=y
+CONFIG_ISDN_PPP_VJ=y
+CONFIG_ISDN_MPP=y
+CONFIG_IPPP_FILTER=y
+CONFIG_ISDN_PPP_BSDCOMP=m
+CONFIG_ISDN_AUDIO=y
+CONFIG_ISDN_TTY_FAX=y
+
+#
+# ISDN feature submodules
+#
+CONFIG_ISDN_DIVERSION=m
+
+#
+# ISDN4Linux hardware drivers
+#
+
+#
+# Passive cards
+#
+CONFIG_ISDN_DRV_HISAX=m
+
+#
+# D-channel protocol features
+#
+CONFIG_HISAX_EURO=y
+CONFIG_DE_AOC=y
+CONFIG_HISAX_NO_SENDCOMPLETE=y
+CONFIG_HISAX_NO_LLC=y
+CONFIG_HISAX_NO_KEYPAD=y
+CONFIG_HISAX_1TR6=y
+CONFIG_HISAX_NI1=y
+CONFIG_HISAX_MAX_CARDS=8
+
+#
+# HiSax supported cards
+#
+CONFIG_HISAX_16_3=y
+CONFIG_HISAX_TELESPCI=y
+CONFIG_HISAX_S0BOX=y
+CONFIG_HISAX_FRITZPCI=y
+CONFIG_HISAX_AVM_A1_PCMCIA=y
+CONFIG_HISAX_ELSA=y
+CONFIG_HISAX_DIEHLDIVA=y
+CONFIG_HISAX_SEDLBAUER=y
+CONFIG_HISAX_NETJET=y
+CONFIG_HISAX_NETJET_U=y
+CONFIG_HISAX_NICCY=y
+CONFIG_HISAX_BKM_A4T=y
+CONFIG_HISAX_SCT_QUADRO=y
+CONFIG_HISAX_GAZEL=y
+CONFIG_HISAX_HFC_PCI=y
+CONFIG_HISAX_W6692=y
+CONFIG_HISAX_HFC_SX=y
+CONFIG_HISAX_ENTERNOW_PCI=y
+# CONFIG_HISAX_DEBUG is not set
+
+#
+# HiSax PCMCIA card service modules
+#
+CONFIG_HISAX_SEDLBAUER_CS=m
+CONFIG_HISAX_ELSA_CS=m
+CONFIG_HISAX_AVM_A1_CS=m
+CONFIG_HISAX_TELES_CS=m
+
+#
+# HiSax sub driver modules
+#
+CONFIG_HISAX_ST5481=m
+CONFIG_HISAX_HFCUSB=m
+CONFIG_HISAX_HFC4S8S=m
+CONFIG_HISAX_FRITZ_PCIPNP=m
+
+#
+# Active cards
+#
+CONFIG_ISDN_CAPI=m
+CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
+CONFIG_CAPI_TRACE=y
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
+CONFIG_ISDN_CAPI_CAPIFS=m
+CONFIG_ISDN_CAPI_CAPIDRV=m
+
+#
+# CAPI hardware drivers
+#
+CONFIG_CAPI_AVM=y
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
+CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_CAPI_EICON=y
+CONFIG_ISDN_DIVAS=m
+CONFIG_ISDN_DIVAS_BRIPCI=y
+CONFIG_ISDN_DIVAS_PRIPCI=y
+CONFIG_ISDN_DIVAS_DIVACAPI=m
+CONFIG_ISDN_DIVAS_USERIDI=m
+CONFIG_ISDN_DIVAS_MAINT=m
+CONFIG_ISDN_DRV_GIGASET=m
+# CONFIG_GIGASET_CAPI is not set
+CONFIG_GIGASET_I4L=y
+# CONFIG_GIGASET_DUMMYLL is not set
+CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M105=m
+# CONFIG_GIGASET_M101 is not set
+# CONFIG_GIGASET_DEBUG is not set
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
+CONFIG_MISDN=m
+CONFIG_MISDN_DSP=m
+CONFIG_MISDN_L1OIP=m
+
+#
+# mISDN hardware drivers
+#
+CONFIG_MISDN_HFCPCI=m
+CONFIG_MISDN_HFCMULTI=m
+CONFIG_MISDN_HFCUSB=m
+CONFIG_MISDN_AVMFRITZ=m
+CONFIG_MISDN_SPEEDFAX=m
+CONFIG_MISDN_INFINEON=m
+CONFIG_MISDN_W6692=m
+CONFIG_MISDN_NETJET=m
+CONFIG_MISDN_IPAC=m
+CONFIG_MISDN_ISAR=m
+CONFIG_ISDN_HDLC=m
+CONFIG_PHONE=m
+CONFIG_PHONE_IXJ=m
+CONFIG_PHONE_IXJ_PCMCIA=m
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_FF_MEMLESS=y
+CONFIG_INPUT_POLLDEV=m
+CONFIG_INPUT_SPARSEKMAP=m
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT2160=m
+# CONFIG_KEYBOARD_LKKBD is not set
+CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
+CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_MATRIX=m
+CONFIG_KEYBOARD_LM8323=m
+CONFIG_KEYBOARD_MAX7359=m
+CONFIG_KEYBOARD_MCS=m
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_KEYBOARD_OPENCORES=m
+CONFIG_KEYBOARD_STOWAWAY=m
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_SENTELIC=y
+CONFIG_MOUSE_PS2_TOUCHKIT=y
+CONFIG_MOUSE_SERIAL=m
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_VSXXXAA=m
+CONFIG_MOUSE_GPIO=m
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_JOYSTICK_ANALOG=m
+CONFIG_JOYSTICK_A3D=m
+CONFIG_JOYSTICK_ADI=m
+CONFIG_JOYSTICK_COBRA=m
+CONFIG_JOYSTICK_GF2K=m
+CONFIG_JOYSTICK_GRIP=m
+CONFIG_JOYSTICK_GRIP_MP=m
+CONFIG_JOYSTICK_GUILLEMOT=m
+CONFIG_JOYSTICK_INTERACT=m
+CONFIG_JOYSTICK_SIDEWINDER=m
+CONFIG_JOYSTICK_TMDC=m
+CONFIG_JOYSTICK_IFORCE=m
+CONFIG_JOYSTICK_IFORCE_USB=y
+CONFIG_JOYSTICK_IFORCE_232=y
+CONFIG_JOYSTICK_WARRIOR=m
+CONFIG_JOYSTICK_MAGELLAN=m
+CONFIG_JOYSTICK_SPACEORB=m
+CONFIG_JOYSTICK_SPACEBALL=m
+CONFIG_JOYSTICK_STINGER=m
+CONFIG_JOYSTICK_TWIDJOY=m
+CONFIG_JOYSTICK_ZHENHUA=m
+CONFIG_JOYSTICK_DB9=m
+CONFIG_JOYSTICK_GAMECON=m
+CONFIG_JOYSTICK_TURBOGRAFX=m
+CONFIG_JOYSTICK_AS5011=m
+CONFIG_JOYSTICK_JOYDUMP=m
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+# CONFIG_JOYSTICK_WALKERA0701 is not set
+CONFIG_INPUT_TABLET=y
+CONFIG_TABLET_USB_ACECAD=m
+CONFIG_TABLET_USB_AIPTEK=m
+CONFIG_TABLET_USB_GTCO=m
+CONFIG_TABLET_USB_HANWANG=m
+CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_USB_WACOM=m
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+CONFIG_TOUCHSCREEN_BU21013=m
+CONFIG_TOUCHSCREEN_CY8CTMG110=m
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_GUNZE=m
+CONFIG_TOUCHSCREEN_ELO=m
+CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TOUCHSCREEN_MCS5000=m
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_MK712=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_QT602240=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_UCB1400=m
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
+CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
+CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
+CONFIG_TOUCHSCREEN_USB_GOTOP=y
+CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_E2I=y
+CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
+CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
+CONFIG_TOUCHSCREEN_USB_NEXIO=y
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC2007=m
+CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_APANEL=m
+CONFIG_INPUT_ATLAS_BTNS=m
+CONFIG_INPUT_ATI_REMOTE=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_PCF8574=m
+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
+CONFIG_INPUT_ADXL34X=m
+CONFIG_INPUT_ADXL34X_I2C=m
+CONFIG_INPUT_CMA3000=m
+CONFIG_INPUT_CMA3000_I2C=m
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_CT82C710=m
+CONFIG_SERIO_PARKBD=m
+CONFIG_SERIO_PCIPS2=m
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_RAW=m
+CONFIG_SERIO_ALTERA_PS2=m
+CONFIG_SERIO_PS2MULT=m
+CONFIG_GAMEPORT=m
+CONFIG_GAMEPORT_NS558=m
+CONFIG_GAMEPORT_L4=m
+CONFIG_GAMEPORT_EMU10K1=m
+CONFIG_GAMEPORT_FM801=m
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_DEVKMEM=y
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_COMPUTONE=m
+CONFIG_ROCKETPORT=m
+CONFIG_CYCLADES=m
+# CONFIG_CYZ_INTR is not set
+CONFIG_DIGIEPCA=m
+CONFIG_MOXA_INTELLIO=m
+CONFIG_MOXA_SMARTIO=m
+CONFIG_ISI=m
+CONFIG_SYNCLINK=m
+CONFIG_SYNCLINKMP=m
+CONFIG_SYNCLINK_GT=m
+CONFIG_N_HDLC=m
+CONFIG_N_GSM=m
+CONFIG_RISCOM8=m
+CONFIG_SPECIALIX=m
+CONFIG_STALDRV=y
+CONFIG_STALLION=m
+CONFIG_ISTALLION=m
+CONFIG_NOZOMI=m
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_PNP=y
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_DETECT_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_MFD_HSU=m
+CONFIG_SERIAL_UARTLITE=m
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_TIMBERDALE=m
+CONFIG_SERIAL_ALTERA_JTAGUART=m
+CONFIG_SERIAL_ALTERA_UART=m
+CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
+CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+CONFIG_SERIAL_PCH_UART=m
+CONFIG_UNIX98_PTYS=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=32
+CONFIG_PRINTER=m
+CONFIG_LP_CONSOLE=y
+CONFIG_PPDEV=m
+CONFIG_HVC_DRIVER=y
+CONFIG_VIRTIO_CONSOLE=m
+CONFIG_IPMI_HANDLER=m
+# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_INTEL=m
+CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_VIA=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_NVRAM=m
+CONFIG_R3964=m
+CONFIG_APPLICOM=m
+
+#
+# PCMCIA character devices
+#
+CONFIG_SYNCLINK_CS=m
+CONFIG_CARDMAN_4000=m
+CONFIG_CARDMAN_4040=m
+CONFIG_IPWIRELESS=m
+CONFIG_MWAVE=m
+CONFIG_RAW_DRIVER=m
+CONFIG_MAX_RAW_DEVS=256
+CONFIG_HPET=y
+CONFIG_HPET_MMAP=y
+CONFIG_HANGCHECK_TIMER=m
+CONFIG_TCG_TPM=m
+# CONFIG_TCG_TIS is not set
+# CONFIG_TCG_NSC is not set
+CONFIG_TCG_ATMEL=m
+# CONFIG_TCG_INFINEON is not set
+CONFIG_TELCLOCK=m
+CONFIG_DEVPORT=y
+CONFIG_RAMOOPS=m
+CONFIG_I2C=m
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_MUX=m
+
+#
+# Multiplexer I2C Chip support
+#
+CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD756_S4882=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NFORCE2_S4985=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+
+#
+# ACPI drivers
+#
+CONFIG_I2C_SCMI=m
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+CONFIG_I2C_GPIO=m
+CONFIG_I2C_INTEL_MID=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_XILINX=m
+CONFIG_I2C_EG20T=m
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_I2C_STUB=m
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_SPI is not set
+
+#
+# PPS support
+#
+CONFIG_PPS=m
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_KTIMER is not set
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_PPS_CLIENT_PARPORT=m
+
+#
+# PPS generators support
+#
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_GPIOLIB=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_MAX730X=m
+
+#
+# Memory mapped GPIO expanders:
+#
+CONFIG_GPIO_BASIC_MMIO=m
+CONFIG_GPIO_IT8761E=m
+CONFIG_GPIO_SCH=m
+CONFIG_GPIO_VX855=m
+
+#
+# I2C GPIO expanders:
+#
+CONFIG_GPIO_MAX7300=m
+CONFIG_GPIO_MAX732X=m
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_ADP5588=m
+
+#
+# PCI GPIO expanders:
+#
+CONFIG_GPIO_CS5535=m
+# CONFIG_GPIO_LANGWELL is not set
+CONFIG_GPIO_PCH=m
+CONFIG_GPIO_ML_IOH=m
+# CONFIG_GPIO_TIMBERDALE is not set
+CONFIG_GPIO_RDC321X=m
+
+#
+# SPI GPIO expanders:
+#
+
+#
+# AC97 GPIO expanders:
+#
+# CONFIG_GPIO_UCB1400 is not set
+
+#
+# MODULbus GPIO expanders:
+#
+CONFIG_GPIO_JANZ_TTL=m
+CONFIG_W1=m
+CONFIG_W1_CON=y
+
+#
+# 1-wire Bus Masters
+#
+CONFIG_W1_MASTER_MATROX=m
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_GPIO=m
+
+#
+# 1-wire Slaves
+#
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2423=m
+CONFIG_W1_SLAVE_DS2431=m
+CONFIG_W1_SLAVE_DS2433=m
+CONFIG_W1_SLAVE_DS2433_CRC=y
+CONFIG_W1_SLAVE_DS2760=m
+CONFIG_W1_SLAVE_BQ27000=m
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_PDA_POWER=m
+CONFIG_TEST_POWER=m
+CONFIG_BATTERY_DS2760=m
+CONFIG_BATTERY_DS2782=m
+CONFIG_BATTERY_BQ20Z75=m
+CONFIG_BATTERY_BQ27x00=m
+CONFIG_BATTERY_MAX17040=m
+CONFIG_BATTERY_MAX17042=m
+CONFIG_CHARGER_PCF50633=m
+CONFIG_CHARGER_ISP1704=m
+CONFIG_CHARGER_GPIO=m
+CONFIG_HWMON=m
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_ABITUGURU=m
+CONFIG_SENSORS_ABITUGURU3=m
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_K10TEMP=m
+CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_DS620=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_I5K_AMB=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_GPIO_FAN=m
+CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_PKGTEMP=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_LM63=m
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SHT21=m
+CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_SMM665=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_VIA_CPUTEMP=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+# CONFIG_SENSORS_W83795_FANCTRL is not set
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_LIS3_I2C=m
+CONFIG_SENSORS_APPLESMC=m
+
+#
+# ACPI drivers
+#
+CONFIG_SENSORS_ATK0110=m
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_THERMAL=m
+CONFIG_THERMAL_HWMON=y
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_ALIM1535_WDT=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_F71808E_WDT=m
+CONFIG_SP5100_TCO=m
+CONFIG_GEODE_WDT=m
+CONFIG_SC520_WDT=m
+CONFIG_SBC_FITPC2_WATCHDOG=m
+CONFIG_EUROTECH_WDT=m
+CONFIG_IB700_WDT=m
+CONFIG_IBMASR=m
+CONFIG_WAFER_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_ITCO_WDT=m
+CONFIG_ITCO_VENDOR_SUPPORT=y
+CONFIG_IT8712F_WDT=m
+CONFIG_IT87_WDT=m
+CONFIG_HP_WATCHDOG=m
+CONFIG_HPWDT_NMI_DECODING=y
+CONFIG_SC1200_WDT=m
+CONFIG_PC87413_WDT=m
+CONFIG_NV_TCO=m
+CONFIG_60XX_WDT=m
+CONFIG_SBC8360_WDT=m
+CONFIG_CPU5_WDT=m
+CONFIG_SMSC_SCH311X_WDT=m
+CONFIG_SMSC37B787_WDT=m
+CONFIG_W83627HF_WDT=m
+CONFIG_W83697HF_WDT=m
+CONFIG_W83697UG_WDT=m
+CONFIG_W83877F_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_MACHZ_WDT=m
+CONFIG_SBC_EPX_C3_WATCHDOG=m
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+CONFIG_SSB_PCMCIAHOST=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_MFD_SUPPORT=y
+CONFIG_MFD_CORE=m
+# CONFIG_MFD_SM501 is not set
+CONFIG_HTC_PASIC3=m
+CONFIG_UCB1400_CORE=m
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
+# CONFIG_MFD_TMIO is not set
+CONFIG_MFD_WM8400=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+# CONFIG_ABX500_CORE is not set
+CONFIG_MFD_CS5535=m
+CONFIG_MFD_TIMBERDALE=m
+CONFIG_LPC_SCH=m
+CONFIG_MFD_RDC321X=m
+CONFIG_MFD_JANZ_CMODIO=m
+CONFIG_MFD_VX855=m
+CONFIG_MFD_WL1273_CORE=m
+# CONFIG_REGULATOR is not set
+CONFIG_MEDIA_SUPPORT=m
+
+#
+# Multimedia core support
+#
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_DVB_CORE=m
+CONFIG_VIDEO_MEDIA=m
+
+#
+# Multimedia drivers
+#
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_RC_CORE=m
+CONFIG_LIRC=m
+CONFIG_RC_MAP=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_RC5_SZ_DECODER=m
+CONFIG_IR_LIRC_CODEC=m
+CONFIG_IR_ENE=m
+CONFIG_IR_IMON=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_NUVOTON=m
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_WINBOND_CIR=m
+CONFIG_RC_LOOPBACK=m
+CONFIG_MEDIA_ATTACH=y
+CONFIG_MEDIA_TUNER=m
+# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEOBUF_DMA_CONTIG=m
+CONFIG_VIDEOBUF_DVB=m
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# Encoders/decoders and other helper chips
+#
+
+#
+# Audio decoders
+#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_M52790=m
+CONFIG_VIDEO_TLV320AIC23B=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+
+#
+# Video decoders
+#
+CONFIG_VIDEO_ADV7180=m
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_BT866=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_MT9V011=m
+CONFIG_VIDEO_TCM825X=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_SAA7191=m
+CONFIG_VIDEO_TVP514X=m
+CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_TVP7002=m
+CONFIG_VIDEO_VPX3220=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_CX25840=m
+
+#
+# MPEG video encoders
+#
+CONFIG_VIDEO_CX2341X=m
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+CONFIG_VIDEO_THS7303=m
+CONFIG_VIDEO_ADV7343=m
+CONFIG_VIDEO_AK881X=m
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+CONFIG_VIDEO_VIVI=m
+CONFIG_VIDEO_BT848=m
+CONFIG_VIDEO_BT848_DVB=y
+CONFIG_VIDEO_BWQCAM=m
+CONFIG_VIDEO_CQCAM=m
+CONFIG_VIDEO_W9966=m
+CONFIG_VIDEO_CPIA2=m
+CONFIG_VIDEO_ZORAN=m
+CONFIG_VIDEO_ZORAN_DC30=m
+CONFIG_VIDEO_ZORAN_ZR36060=m
+CONFIG_VIDEO_ZORAN_BUZ=m
+CONFIG_VIDEO_ZORAN_DC10=m
+CONFIG_VIDEO_ZORAN_LML33=m
+CONFIG_VIDEO_ZORAN_LML33R10=m
+CONFIG_VIDEO_ZORAN_AVS6EYES=m
+CONFIG_VIDEO_MEYE=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_TIMBERDALE=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_FB_IVTV=m
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_SAA7164=m
+CONFIG_VIDEO_CAFE_CCIC=m
+CONFIG_VIDEO_SR030PC30=m
+CONFIG_VIDEO_VIA_CAMERA=m
+CONFIG_SOC_CAMERA=m
+CONFIG_SOC_CAMERA_IMX074=m
+CONFIG_SOC_CAMERA_MT9M001=m
+CONFIG_SOC_CAMERA_MT9M111=m
+CONFIG_SOC_CAMERA_MT9T031=m
+CONFIG_SOC_CAMERA_MT9T112=m
+CONFIG_SOC_CAMERA_MT9V022=m
+CONFIG_SOC_CAMERA_RJ54N1=m
+CONFIG_SOC_CAMERA_TW9910=m
+CONFIG_SOC_CAMERA_PLATFORM=m
+CONFIG_SOC_CAMERA_OV2640=m
+CONFIG_SOC_CAMERA_OV6650=m
+CONFIG_SOC_CAMERA_OV772X=m
+CONFIG_SOC_CAMERA_OV9640=m
+CONFIG_V4L_USB_DRIVERS=y
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_KONICA=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_TLG2300=m
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_USB_ET61X251=m
+CONFIG_USB_SN9C102=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_MEM2MEM_TESTDEV=m
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_MAESTRO=m
+CONFIG_I2C_SI4713=m
+CONFIG_RADIO_SI4713=m
+CONFIG_USB_DSBR=m
+# CONFIG_RADIO_SI470X is not set
+CONFIG_USB_MR800=m
+CONFIG_RADIO_TEA5764=m
+CONFIG_RADIO_SAA7706H=m
+CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_TIMBERDALE=m
+CONFIG_RADIO_WL1273=m
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
+CONFIG_DVB_CAPTURE_DRIVERS=y
+
+#
+# Supported SAA7146 based PCI Adapters
+#
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_BUDGET_PATCH=m
+
+#
+# Supported USB Adapters
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_FRIIO=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_SMS_SIANO_MDTV=m
+
+#
+# Siano module components
+#
+CONFIG_SMS_USB_DRV=m
+CONFIG_SMS_SDIO_DRV=m
+
+#
+# Supported FlexCopII (B2C2) Adapters
+#
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
+
+#
+# Supported BT878 Adapters
+#
+CONFIG_DVB_BT8XX=m
+
+#
+# Supported Pluto2 Adapters
+#
+CONFIG_DVB_PLUTO2=m
+
+#
+# Supported SDMC DM1105 Adapters
+#
+CONFIG_DVB_DM1105=m
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_FIREWIRE=y
+# CONFIG_DVB_FIREDTV_IEEE1394 is not set
+CONFIG_DVB_FIREDTV_INPUT=y
+
+#
+# Supported Earthsoft PT1 Adapters
+#
+CONFIG_DVB_PT1=m
+
+#
+# Supported Mantis Adapters
+#
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+
+#
+# Supported nGene Adapters
+#
+CONFIG_DVB_NGENE=m
+
+#
+# Supported DVB Frontends
+#
+CONFIG_DVB_FE_CUSTOMISE=y
+
+#
+# Customise DVB Frontends
+#
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV6110x=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_SP8870=m
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_S5H1432=m
+CONFIG_DVB_DRX397XD=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_S5H1411=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_S921=m
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
+
+#
+# Tools to develop new frontends
+#
+CONFIG_DVB_DUMMY_FE=m
+
+#
+# Graphics support
+#
+CONFIG_AGP=m
+CONFIG_AGP_AMD64=m
+CONFIG_AGP_INTEL=m
+CONFIG_AGP_SIS=m
+CONFIG_AGP_VIA=m
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_VGA_SWITCHEROO=y
+CONFIG_DRM=m
+CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_TTM=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_RADEON=m
+CONFIG_DRM_RADEON_KMS=y
+CONFIG_DRM_I810=m
+CONFIG_DRM_I830=m
+CONFIG_DRM_I915=m
+CONFIG_DRM_I915_KMS=y
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
+CONFIG_STUB_POULSBO=m
+CONFIG_VGASTATE=m
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_DDC=m
+CONFIG_FB_BOOT_VESA_SUPPORT=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=m
+# CONFIG_FB_WMT_GE_ROPS is not set
+CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_HECUBA=m
+CONFIG_FB_SVGALIB=m
+# CONFIG_FB_MACMODES is not set
+CONFIG_FB_BACKLIGHT=y
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+CONFIG_FB_CIRRUS=m
+CONFIG_FB_PM2=m
+# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
+CONFIG_FB_CYBER2000=m
+CONFIG_FB_ARC=m
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+CONFIG_FB_VGA16=m
+# CONFIG_FB_UVESA is not set
+CONFIG_FB_VESA=y
+# CONFIG_FB_EFI is not set
+CONFIG_FB_N411=m
+CONFIG_FB_HGA=m
+CONFIG_FB_S1D13XXX=m
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_NVIDIA_DEBUG is not set
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA=m
+CONFIG_FB_RIVA_I2C=y
+# CONFIG_FB_RIVA_DEBUG is not set
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_LE80578=m
+CONFIG_FB_CARILLO_RANCH=m
+CONFIG_FB_MATROX=m
+CONFIG_FB_MATROX_MILLENIUM=y
+CONFIG_FB_MATROX_MYSTIQUE=y
+CONFIG_FB_MATROX_G=y
+CONFIG_FB_MATROX_I2C=m
+CONFIG_FB_MATROX_MAVEN=m
+CONFIG_FB_RADEON=m
+CONFIG_FB_RADEON_I2C=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+# CONFIG_FB_RADEON_DEBUG is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_BACKLIGHT=y
+CONFIG_FB_S3=m
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
+CONFIG_FB_SIS=m
+CONFIG_FB_SIS_300=y
+CONFIG_FB_SIS_315=y
+CONFIG_FB_VIA=m
+# CONFIG_FB_VIA_DIRECT_PROCFS is not set
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_KYRO=m
+CONFIG_FB_3DFX=m
+# CONFIG_FB_3DFX_ACCEL is not set
+CONFIG_FB_3DFX_I2C=y
+CONFIG_FB_VOODOO1=m
+CONFIG_FB_VT8623=m
+CONFIG_FB_TRIDENT=m
+CONFIG_FB_ARK=m
+CONFIG_FB_PM3=m
+CONFIG_FB_CARMINE=m
+CONFIG_FB_CARMINE_DRAM_EVAL=y
+# CONFIG_CARMINE_DRAM_CUSTOM is not set
+CONFIG_FB_GEODE=y
+CONFIG_FB_GEODE_LX=m
+CONFIG_FB_GEODE_GX=m
+CONFIG_FB_GEODE_GX1=m
+CONFIG_FB_TMIO=m
+CONFIG_FB_TMIO_ACCELL=y
+CONFIG_FB_UDL=m
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_METRONOME=m
+CONFIG_FB_MB862XX=m
+CONFIG_FB_MB862XX_PCI_GDC=y
+CONFIG_FB_BROADSHEET=m
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_PLATFORM=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_GENERIC=m
+CONFIG_BACKLIGHT_PROGEAR=m
+CONFIG_BACKLIGHT_CARILLO_RANCH=m
+CONFIG_BACKLIGHT_MBP_NVIDIA=m
+CONFIG_BACKLIGHT_SAHARA=m
+CONFIG_BACKLIGHT_ADP8860=m
+CONFIG_BACKLIGHT_PCF50633=m
+
+#
+# Display device support
+#
+CONFIG_DISPLAY_SUPPORT=m
+
+#
+# Display hardware drivers
+#
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+CONFIG_VGACON_SOFT_SCROLLBACK=y
+CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+CONFIG_LOGO_LINUX_CLUT224=y
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_JACK=y
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_SEQUENCER_OSS=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_DYNAMIC_MINORS=y
+# CONFIG_SND_SUPPORT_OLD_API is not set
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_DMA_SGBUF=y
+CONFIG_SND_RAWMIDI_SEQ=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_VX_LIB=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_PCSP is not set
+CONFIG_SND_DUMMY=m
+CONFIG_SND_ALOOP=m
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+CONFIG_SND_SB_COMMON=m
+CONFIG_SND_SB16_DSP=m
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ALI5451=m
+CONFIG_SND_ASIHPI=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
+CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_CS5530=m
+CONFIG_SND_CS5535AUDIO=m
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_ES1968_INPUT=y
+CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
+CONFIG_SND_FM801_TEA575X=m
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+# CONFIG_SND_HDA_INPUT_BEEP is not set
+CONFIG_SND_HDA_INPUT_JACK=y
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_CODEC_REALTEK=y
+CONFIG_SND_HDA_CODEC_ANALOG=y
+CONFIG_SND_HDA_CODEC_SIGMATEL=y
+CONFIG_SND_HDA_CODEC_VIA=y
+CONFIG_SND_HDA_CODEC_HDMI=y
+CONFIG_SND_HDA_CODEC_CIRRUS=y
+CONFIG_SND_HDA_CODEC_CONEXANT=y
+CONFIG_SND_HDA_CODEC_CA0110=y
+CONFIG_SND_HDA_CODEC_CMEDIA=y
+CONFIG_SND_HDA_CODEC_SI3054=y
+CONFIG_SND_HDA_GENERIC=y
+# CONFIG_SND_HDA_POWER_SAVE is not set
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1712=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_LX6464ES=m
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MAESTRO3_INPUT=y
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
+CONFIG_SND_USB_US122L=m
+CONFIG_SND_PCMCIA=y
+CONFIG_SND_VXPOCKET=m
+CONFIG_SND_PDAUDIOCF=m
+# CONFIG_SND_SOC is not set
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=m
+CONFIG_HIDRAW=y
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# Special HID drivers
+#
+CONFIG_HID_3M_PCT=m
+CONFIG_HID_A4TECH=m
+CONFIG_HID_ACRUX=m
+CONFIG_HID_ACRUX_FF=m
+CONFIG_HID_APPLE=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_CANDO=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EMS_FF=m
+CONFIG_HID_EGALAX=m
+CONFIG_HID_ELECOM=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LOGITECH=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_LOGIWII_FF=y
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MOSART=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_QUANTA=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_ROCCAT_KONE=m
+CONFIG_HID_ROCCAT_KONEPLUS=m
+CONFIG_HID_ROCCAT_PYRA=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SONY=m
+CONFIG_HID_STANTUM=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_GREENASIA=m
+CONFIG_GREENASIA_FF=y
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_WACOM=m
+CONFIG_HID_WACOM_POWER_SUPPLY=y
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
+CONFIG_HID_ZYDACRON=m
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+CONFIG_USB_SUSPEND=y
+# CONFIG_USB_OTG is not set
+CONFIG_USB_MON=y
+CONFIG_USB_WUSB=m
+CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_C67X00_HCD=m
+CONFIG_USB_XHCI_HCD=m
+# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_ISP1760_HCD=m
+CONFIG_USB_ISP1362_HCD=m
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_SSB=y
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_U132_HCD=m
+CONFIG_USB_SL811_HCD=m
+CONFIG_USB_SL811_CS=m
+CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_WHCI_HCD=m
+CONFIG_USB_HWA_HCD=m
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_UAS=m
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+
+#
+# USB port drivers
+#
+CONFIG_USB_USS720=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_EZUSB=y
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_FUNSOFT=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MOTOROLA=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_HP4X=m
+CONFIG_USB_SERIAL_SAFE=m
+CONFIG_USB_SERIAL_SAFE_PADDED=y
+CONFIG_USB_SERIAL_SAMBA=m
+CONFIG_USB_SERIAL_SIEMENS_MPI=m
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
+CONFIG_USB_SERIAL_ZIO=m
+CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_DEBUG=m
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_RIO500=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_LED=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_FTDI_ELAN=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_SISUSBVGA_CON=y
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_YUREX=m
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+# CONFIG_USB_GADGET is not set
+
+#
+# OTG and related infrastructure
+#
+CONFIG_USB_OTG_UTILS=y
+CONFIG_USB_GPIO_VBUS=m
+CONFIG_NOP_USB_XCEIV=m
+CONFIG_UWB=m
+CONFIG_UWB_HWA=m
+CONFIG_UWB_WHCI=m
+CONFIG_UWB_I1480U=m
+CONFIG_MMC=m
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+# CONFIG_MMC_CLKGATE is not set
+
+#
+# MMC/SD/SDIO Card Drivers
+#
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_MINORS=8
+CONFIG_MMC_BLOCK_BOUNCE=y
+CONFIG_SDIO_UART=m
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_WBSD=m
+CONFIG_MMC_TIFM_SD=m
+CONFIG_MMC_SDRICOH_CS=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_USHC=m
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+CONFIG_LEDS_NET5501=m
+CONFIG_LEDS_ALIX2=m
+CONFIG_LEDS_PCA9532=m
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GPIO_PLATFORM=y
+CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP5521=m
+CONFIG_LEDS_LP5523=m
+CONFIG_LEDS_CLEVO_MAIL=m
+CONFIG_LEDS_PCA955X=m
+CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_INTEL_SS4200=m
+CONFIG_LEDS_LT3593=m
+CONFIG_LEDS_DELL_NETBOOKS=m
+CONFIG_LEDS_TRIGGERS=y
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+# CONFIG_NFC_DEVICES is not set
+CONFIG_ACCESSIBILITY=y
+CONFIG_A11Y_BRAILLE_CONSOLE=y
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_USER_MEM=y
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_MTHCA=m
+CONFIG_INFINIBAND_MTHCA_DEBUG=y
+# CONFIG_INFINIBAND_IPATH is not set
+CONFIG_INFINIBAND_QIB=m
+CONFIG_INFINIBAND_AMSO1100=m
+# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
+# CONFIG_INFINIBAND_CXGB3 is not set
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_INFINIBAND_NES=m
+# CONFIG_INFINIBAND_NES_DEBUG is not set
+CONFIG_INFINIBAND_IPOIB=m
+# CONFIG_INFINIBAND_IPOIB_CM is not set
+CONFIG_INFINIBAND_IPOIB_DEBUG=y
+# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_EDAC=y
+
+#
+# Reporting subsystems
+#
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_DECODE_MCE=y
+CONFIG_EDAC_MCE_INJ=m
+# CONFIG_EDAC_MM_EDAC is not set
+CONFIG_RTC_LIB=m
+CONFIG_RTC_CLASS=m
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+CONFIG_RTC_DRV_TEST=m
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_ISL12022=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_PCF50633=m
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_INTEL_MID_DMAC=m
+CONFIG_INTEL_IOATDMA=m
+CONFIG_TIMB_DMA=m
+CONFIG_PCH_DMA=m
+CONFIG_DMA_ENGINE=y
+
+#
+# DMA Clients
+#
+CONFIG_NET_DMA=y
+# CONFIG_ASYNC_TX_DMA is not set
+CONFIG_DMATEST=m
+CONFIG_DCA=m
+CONFIG_AUXDISPLAY=y
+# CONFIG_KS0108 is not set
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_PDRV=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+CONFIG_STAGING=y
+# CONFIG_STAGING_EXCLUDE_BUILD is not set
+# CONFIG_ET131X is not set
+# CONFIG_SLICOSS is not set
+# CONFIG_VIDEO_GO7007 is not set
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=m
+CONFIG_USB_DABUSB=m
+CONFIG_USB_SE401=m
+CONFIG_VIDEO_USBVIDEO=m
+CONFIG_USB_VICAM=m
+# CONFIG_USB_IP_COMMON is not set
+# CONFIG_W35UND is not set
+# CONFIG_PRISM2_USB is not set
+# CONFIG_ECHO is not set
+CONFIG_BRCM80211=m
+CONFIG_BRCM80211_PCI=y
+# CONFIG_BRCMFMAC is not set
+CONFIG_RT2860=m
+CONFIG_RT2870=m
+# CONFIG_COMEDI is not set
+# CONFIG_ASUS_OLED is not set
+# CONFIG_PANEL is not set
+CONFIG_R8187SE=m
+CONFIG_RTL8192U=m
+CONFIG_RTL8192E=m
+CONFIG_R8712U=m
+# CONFIG_R8712_AP is not set
+# CONFIG_TRANZPORT is not set
+CONFIG_POHMELFS=m
+# CONFIG_POHMELFS_DEBUG is not set
+CONFIG_POHMELFS_CRYPTO=y
+CONFIG_AUTOFS_FS=m
+CONFIG_IDE_PHISON=m
+CONFIG_LINE6_USB=m
+# CONFIG_LINE6_USB_DEBUG is not set
+# CONFIG_LINE6_USB_DUMP_CTRL is not set
+# CONFIG_LINE6_USB_DUMP_MIDI is not set
+# CONFIG_LINE6_USB_DUMP_PCM is not set
+# CONFIG_LINE6_USB_RAW is not set
+# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
+CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_NOUVEAU=m
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+CONFIG_DRM_NOUVEAU_DEBUG=y
+
+#
+# I2C encoder or helper chips
+#
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+CONFIG_USB_SERIAL_QUATECH2=m
+CONFIG_USB_SERIAL_QUATECH_USB2=m
+CONFIG_VT6655=m
+CONFIG_VT6656=m
+# CONFIG_HYPERV is not set
+# CONFIG_VME_BUS is not set
+CONFIG_DX_SEP=m
+# CONFIG_IIO is not set
+CONFIG_ZRAM=m
+CONFIG_WLAGS49_H2=m
+CONFIG_WLAGS49_H25=m
+CONFIG_SAMSUNG_LAPTOP=m
+CONFIG_FB_SM7XX=m
+CONFIG_VIDEO_DT3155=m
+CONFIG_DT3155_CCIR=y
+CONFIG_CRYSTALHD=m
+# CONFIG_CXT1E1 is not set
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_ST_BT=m
+CONFIG_FB_XGI=m
+CONFIG_LIRC_STAGING=y
+CONFIG_LIRC_BT829=m
+CONFIG_LIRC_IGORPLUGUSB=m
+CONFIG_LIRC_IMON=m
+CONFIG_LIRC_IT87=m
+CONFIG_LIRC_ITE8709=m
+CONFIG_LIRC_PARALLEL=m
+CONFIG_LIRC_SASEM=m
+CONFIG_LIRC_SERIAL=m
+CONFIG_LIRC_SERIAL_TRANSMITTER=y
+CONFIG_LIRC_SIR=m
+CONFIG_LIRC_TTUSBIR=m
+CONFIG_LIRC_ZILOG=m
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
+CONFIG_EASYCAP=m
+CONFIG_SOLO6X10=m
+CONFIG_ACPI_QUICKSTART=m
+CONFIG_MACH_NO_WESTBRIDGE=y
+CONFIG_SBE_2T3E3=m
+CONFIG_ATH6K_LEGACY=m
+CONFIG_AR600x_SD31_XXX=y
+# CONFIG_AR600x_WB31_XXX is not set
+# CONFIG_AR600x_SD32_XXX is not set
+# CONFIG_AR600x_CUSTOM_XXX is not set
+# CONFIG_ATH6KL_ENABLE_COEXISTENCE is not set
+# CONFIG_ATH6KL_HCI_BRIDGE is not set
+# CONFIG_ATH6KL_CFG80211 is not set
+# CONFIG_ATH6KL_HTC_RAW_INTERFACE is not set
+# CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER is not set
+# CONFIG_ATH6KL_SKIP_ABI_VERSION_CHECK is not set
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_USB_ENESTORAGE is not set
+# CONFIG_BCM_WIMAX is not set
+# CONFIG_FT1000 is not set
+
+#
+# Speakup console speech
+#
+CONFIG_SPEAKUP=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_ACNTPC=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_DECPC=m
+CONFIG_SPEAKUP_SYNTH_DTLK=m
+CONFIG_SPEAKUP_SYNTH_KEYPC=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
+CONFIG_SPEAKUP_SYNTH_DUMMY=m
+CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
+CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
+CONFIG_X86_PLATFORM_DEVICES=y
+CONFIG_ACER_WMI=m
+CONFIG_ACERHDF=m
+CONFIG_ASUS_LAPTOP=m
+CONFIG_DELL_LAPTOP=m
+CONFIG_DELL_WMI=m
+CONFIG_FUJITSU_LAPTOP=m
+# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
+CONFIG_HP_WMI=m
+CONFIG_MSI_LAPTOP=m
+CONFIG_PANASONIC_LAPTOP=m
+CONFIG_COMPAL_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
+CONFIG_SONYPI_COMPAT=y
+CONFIG_IDEAPAD_LAPTOP=m
+CONFIG_THINKPAD_ACPI=m
+CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
+# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
+# CONFIG_THINKPAD_ACPI_DEBUG is not set
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
+CONFIG_THINKPAD_ACPI_VIDEO=y
+CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+CONFIG_SENSORS_HDAPS=m
+CONFIG_INTEL_MENLOW=m
+CONFIG_EEEPC_LAPTOP=m
+CONFIG_EEEPC_WMI=m
+CONFIG_ACPI_WMI=m
+CONFIG_MSI_WMI=m
+CONFIG_ACPI_ASUS=m
+CONFIG_TOPSTAR_LAPTOP=m
+CONFIG_ACPI_TOSHIBA=m
+CONFIG_TOSHIBA_BT_RFKILL=m
+CONFIG_ACPI_CMPC=m
+CONFIG_INTEL_IPS=m
+# CONFIG_IBM_RTL is not set
+
+#
+# Firmware Drivers
+#
+CONFIG_EDD=m
+CONFIG_EDD_OFF=y
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_EFI_VARS=m
+CONFIG_DELL_RBU=m
+CONFIG_DCDBAS=m
+CONFIG_DMIID=y
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=m
+CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
+CONFIG_EXT3_FS_XATTR=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_EXT4_FS=m
+CONFIG_EXT4_FS_XATTR=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD=m
+# CONFIG_JBD_DEBUG is not set
+CONFIG_JBD2=m
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=m
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_OCFS2_FS_O2CB=m
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+# CONFIG_OCFS2_FS_STATS is not set
+CONFIG_OCFS2_DEBUG_MASKLOG=y
+# CONFIG_OCFS2_DEBUG_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+CONFIG_NILFS2_FS=m
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=m
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=m
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_QUOTACTL_COMPAT=y
+CONFIG_AUTOFS4_FS=m
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_GENERIC_ACL=y
+
+#
+# Caches
+#
+CONFIG_FSCACHE=m
+# CONFIG_FSCACHE_STATS is not set
+# CONFIG_FSCACHE_HISTOGRAM is not set
+# CONFIG_FSCACHE_DEBUG is not set
+# CONFIG_FSCACHE_OBJECT_LIST is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_HISTOGRAM is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+CONFIG_NTFS_RW=y
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_CONFIGFS_FS=y
+CONFIG_MISC_FILESYSTEMS=y
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+CONFIG_AFFS_FS=m
+# CONFIG_ECRYPT_FS is not set
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+CONFIG_BFS_FS=m
+CONFIG_EFS_FS=m
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_UBIFS_FS=m
+CONFIG_UBIFS_FS_XATTR=y
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+# CONFIG_UBIFS_FS_DEBUG is not set
+CONFIG_LOGFS=m
+CONFIG_CRAMFS=m
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_SQUASHFS_EMBEDDED=y
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+CONFIG_VXFS_FS=m
+CONFIG_MINIX_FS=m
+CONFIG_OMFS_FS=m
+CONFIG_HPFS_FS=m
+CONFIG_QNX4FS_FS=m
+CONFIG_ROMFS_FS=y
+CONFIG_ROMFS_BACKED_BY_BLOCK=y
+CONFIG_ROMFS_ON_BLOCK=y
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+CONFIG_EXOFS_FS=m
+# CONFIG_EXOFS_DEBUG is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V4=y
+# CONFIG_NFS_V4_1 is not set
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+# CONFIG_NFS_USE_NEW_IDMAPPER is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_DEPRECATED=y
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+CONFIG_NFSD_V4=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+CONFIG_SUNRPC_XPRT_RDMA=m
+CONFIG_RPCSEC_GSS_KRB5=y
+CONFIG_CEPH_FS=m
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+CONFIG_CIFS_WEAK_PW_HASH=y
+# CONFIG_CIFS_UPCALL is not set
+# CONFIG_CIFS_XATTR is not set
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_DFS_UPCALL is not set
+CONFIG_CIFS_FSCACHE=y
+# CONFIG_CIFS_EXPERIMENTAL is not set
+CONFIG_NCP_FS=m
+CONFIG_NCPFS_PACKET_SIGNING=y
+CONFIG_NCPFS_IOCTL_LOCKING=y
+CONFIG_NCPFS_STRONG=y
+CONFIG_NCPFS_NFS_NS=y
+CONFIG_NCPFS_OS2_NS=y
+CONFIG_NCPFS_SMALLDOS=y
+CONFIG_NCPFS_NLS=y
+CONFIG_NCPFS_EXTRAS=y
+CONFIG_CODA_FS=m
+CONFIG_AFS_FS=m
+# CONFIG_AFS_DEBUG is not set
+# CONFIG_AFS_FSCACHE is not set
+CONFIG_9P_FS=m
+# CONFIG_9P_FSCACHE is not set
+# CONFIG_9P_FS_POSIX_ACL is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+CONFIG_OSF_PARTITION=y
+CONFIG_AMIGA_PARTITION=y
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_UNIXWARE_DISKLABEL=y
+# CONFIG_LDM_PARTITION is not set
+CONFIG_SGI_PARTITION=y
+# CONFIG_ULTRIX_PARTITION is not set
+CONFIG_SUN_PARTITION=y
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_UTF8=m
+CONFIG_DLM=m
+# CONFIG_DLM_DEBUG is not set
+
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_PRINTK_TIME=y
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=0
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_STRIP_ASM_SYMS=y
+CONFIG_UNUSED_SYMBOLS=y
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+# CONFIG_LOCKUP_DETECTOR is not set
+# CONFIG_HARDLOCKUP_DETECTOR is not set
+CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+CONFIG_TIMER_STATS=y
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+CONFIG_BKL=y
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+CONFIG_STACKTRACE=y
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# CONFIG_LKDTM is not set
+CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_LATENCYTOP is not set
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FTRACE_NMI_ENTER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
+CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_RING_BUFFER=y
+CONFIG_FTRACE_NMI_ENTER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_FTRACE_SYSCALLS is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+# CONFIG_STACK_TRACER is not set
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_DYNAMIC_FTRACE=y
+# CONFIG_FUNCTION_PROFILER is not set
+CONFIG_FTRACE_MCOUNT_RECORD=y
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_MMIOTRACE is not set
+CONFIG_RING_BUFFER_BENCHMARK=m
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_DMA_API_DEBUG is not set
+CONFIG_ATOMIC64_SELFTEST=y
+CONFIG_ASYNC_RAID6_TEST=m
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+CONFIG_HAVE_ARCH_KMEMCHECK=y
+# CONFIG_TEST_KSTRTOX is not set
+CONFIG_STRICT_DEVMEM=y
+CONFIG_X86_VERBOSE_BOOTUP=y
+CONFIG_EARLY_PRINTK=y
+# CONFIG_EARLY_PRINTK_DBGP is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_X86_PTDUMP is not set
+CONFIG_DEBUG_RODATA=y
+CONFIG_DEBUG_RODATA_TEST=y
+# CONFIG_DEBUG_SET_MODULE_RONX is not set
+# CONFIG_DEBUG_NX_TEST is not set
+# CONFIG_IOMMU_DEBUG is not set
+# CONFIG_IOMMU_STRESS is not set
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+CONFIG_IO_DELAY_TYPE_0X80=0
+CONFIG_IO_DELAY_TYPE_0XED=1
+CONFIG_IO_DELAY_TYPE_UDELAY=2
+CONFIG_IO_DELAY_TYPE_NONE=3
+CONFIG_IO_DELAY_0X80=y
+# CONFIG_IO_DELAY_0XED is not set
+# CONFIG_IO_DELAY_UDELAY is not set
+# CONFIG_IO_DELAY_NONE is not set
+CONFIG_DEFAULT_IO_DELAY_TYPE=0
+# CONFIG_DEBUG_BOOT_PARAMS is not set
+# CONFIG_CPA_DEBUG is not set
+CONFIG_OPTIMIZE_INLINING=y
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+CONFIG_TRUSTED_KEYS=m
+CONFIG_ENCRYPTED_KEYS=m
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
+CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_NETWORK_XFRM=y
+# CONFIG_SECURITY_PATH is not set
+# CONFIG_SECURITY_SELINUX is not set
+# CONFIG_SECURITY_TOMOYO is not set
+# CONFIG_SECURITY_APPARMOR is not set
+# CONFIG_IMA is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_XOR_BLOCKS=y
+CONFIG_ASYNC_CORE=y
+CONFIG_ASYNC_MEMCPY=y
+CONFIG_ASYNC_XOR=y
+CONFIG_ASYNC_PQ=y
+CONFIG_ASYNC_RAID6_RECOV=y
+CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
+CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=m
+CONFIG_CRYPTO_PCOMP2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_WORKQUEUE=y
+CONFIG_CRYPTO_CRYPTD=y
+CONFIG_CRYPTO_AUTHENC=y
+CONFIG_CRYPTO_TEST=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_SEQIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_LRW=y
+CONFIG_CRYPTO_PCBC=y
+CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_FPU=y
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=y
+CONFIG_CRYPTO_VMAC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_MD4=y
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=y
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_TGR192=y
+CONFIG_CRYPTO_WP512=y
+CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_X86_64=y
+CONFIG_CRYPTO_AES_NI_INTEL=y
+CONFIG_CRYPTO_ANUBIS=y
+CONFIG_CRYPTO_ARC4=y
+CONFIG_CRYPTO_BLOWFISH=y
+CONFIG_CRYPTO_CAMELLIA=y
+CONFIG_CRYPTO_CAST5=y
+CONFIG_CRYPTO_CAST6=y
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_FCRYPT=y
+CONFIG_CRYPTO_KHAZAD=y
+CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_SALSA20_X86_64=m
+CONFIG_CRYPTO_SEED=y
+CONFIG_CRYPTO_SERPENT=y
+CONFIG_CRYPTO_TEA=y
+CONFIG_CRYPTO_TWOFISH=y
+CONFIG_CRYPTO_TWOFISH_COMMON=y
+CONFIG_CRYPTO_TWOFISH_X86_64=y
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_ZLIB=m
+CONFIG_CRYPTO_LZO=m
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_CRYPTO_DEV_HIFN_795X=m
+CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+CONFIG_HAVE_KVM=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_APIC_ARCHITECTURE=y
+CONFIG_KVM_MMIO=y
+CONFIG_KVM_ASYNC_PF=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
+CONFIG_KVM_MMU_AUDIT=y
+CONFIG_VHOST_NET=m
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_RING=m
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=y
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=m
+CONFIG_CRC_ITU_T=y
+CONFIG_CRC32=y
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=y
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_BCJ=y
+# CONFIG_XZ_DEC_TEST is not set
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_BTREE=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_CHECK_SIGNATURE=y
+CONFIG_NLATTR=y
+CONFIG_LRU_CACHE=m
+CONFIG_AVERAGE=y
diff --git a/testing/source/linux-2.6.38.4-configs/config-huge-2.6.38.4 b/testing/source/linux-2.6.38.4-configs/config-huge-2.6.38.4
new file mode 100644
index 00000000..062fa02e
--- /dev/null
+++ b/testing/source/linux-2.6.38.4-configs/config-huge-2.6.38.4
@@ -0,0 +1,5133 @@
+#
+# Automatically generated make config: don't edit
+# Linux/x86_64 2.6.38.4 Kernel Configuration
+# Thu Apr 21 22:56:33 2011
+#
+CONFIG_64BIT=y
+# CONFIG_X86_32 is not set
+CONFIG_X86_64=y
+CONFIG_X86=y
+CONFIG_INSTRUCTION_DECODER=y
+CONFIG_OUTPUT_FORMAT="elf64-x86-64"
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_MMU=y
+CONFIG_ZONE_DMA=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_DEFAULT_IDLE=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ZONE_DMA32=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_AUDIT_ARCH=y
+CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_X86_64_SMP=y
+CONFIG_X86_HT=y
+CONFIG_X86_TRAMPOLINE=y
+CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
+# CONFIG_KTIME_SCALAR is not set
+CONFIG_ARCH_CPU_PROBE_RELEASE=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_CONSTRUCTORS=y
+CONFIG_HAVE_IRQ_WORK=y
+CONFIG_IRQ_WORK=y
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_CROSS_COMPILE=""
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_LZO=y
+# CONFIG_KERNEL_GZIP is not set
+# CONFIG_KERNEL_BZIP2 is not set
+CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_XZ is not set
+# CONFIG_KERNEL_LZO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_AUDIT=y
+CONFIG_AUDITSYSCALL=y
+CONFIG_AUDIT_WATCH=y
+CONFIG_AUDIT_TREE=y
+CONFIG_HAVE_GENERIC_HARDIRQS=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_HARDIRQS=y
+# CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED is not set
+CONFIG_HAVE_SPARSE_IRQ=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_PENDING_IRQ=y
+# CONFIG_AUTO_IRQ_AFFINITY is not set
+# CONFIG_IRQ_PER_CPU is not set
+# CONFIG_HARDIRQS_SW_RESEND is not set
+# CONFIG_SPARSE_IRQ is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_PREEMPT_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_RCU_FAST_NO_HZ is not set
+# CONFIG_TREE_RCU_TRACE is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=15
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+CONFIG_CGROUPS=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_CGROUP_NS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_RESOURCE_COUNTERS=y
+CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_RT_GROUP_SCHED=y
+CONFIG_BLK_CGROUP=y
+# CONFIG_DEBUG_BLK_CGROUP is not set
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_SCHED_AUTOGROUP=y
+CONFIG_MM_OWNER=y
+# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+# CONFIG_EXPERT is not set
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_HAVE_PERF_EVENTS=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_PERF_COUNTERS is not set
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_PCI_QUIRKS=y
+CONFIG_SLUB_DEBUG=y
+CONFIG_COMPAT_BRK=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+CONFIG_OPROFILE=m
+# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+# CONFIG_JUMP_LABEL is not set
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_STOP_MACHINE=y
+CONFIG_BLOCK=y
+CONFIG_BLK_DEV_BSG=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
+CONFIG_BLK_DEV_THROTTLING=y
+CONFIG_BLOCK_COMPAT=y
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_CFQ_GROUP_IOSCHED=y
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_PADATA=y
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_FREEZER=y
+
+#
+# Processor type and features
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_SMP=y
+CONFIG_X86_MPPARSE=y
+# CONFIG_X86_EXTENDED_PLATFORM is not set
+CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+# CONFIG_PARAVIRT_GUEST is not set
+CONFIG_NO_BOOTMEM=y
+CONFIG_MEMTEST=y
+# CONFIG_MK8 is not set
+# CONFIG_MPSC is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
+CONFIG_GENERIC_CPU=y
+CONFIG_X86_CPU=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_CMPXCHG=y
+CONFIG_CMPXCHG_LOCAL=y
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_XADD=y
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_TSC=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=64
+CONFIG_X86_DEBUGCTLMSR=y
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_DMI=y
+CONFIG_GART_IOMMU=y
+# CONFIG_CALGARY_IOMMU is not set
+# CONFIG_AMD_IOMMU is not set
+CONFIG_SWIOTLB=y
+CONFIG_IOMMU_HELPER=y
+# CONFIG_IOMMU_API is not set
+# CONFIG_MAXSMP is not set
+CONFIG_NR_CPUS=32
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_MCE=y
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_AMD=y
+CONFIG_X86_MCE_THRESHOLD=y
+CONFIG_X86_MCE_INJECT=m
+CONFIG_X86_THERMAL_VECTOR=y
+CONFIG_I8K=m
+CONFIG_MICROCODE=m
+CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_AMD=y
+CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=m
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_DIRECT_GBPAGES=y
+# CONFIG_NUMA is not set
+CONFIG_ARCH_PROC_KCORE_TEXT=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_MEMORY_PROBE=y
+CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_HAVE_MEMORY_PRESENT=y
+CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
+CONFIG_SPARSEMEM_VMEMMAP=y
+CONFIG_HAVE_MEMBLOCK=y
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_SPARSE=y
+CONFIG_MEMORY_HOTREMOVE=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_COMPACTION=y
+CONFIG_MIGRATION=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_MMU_NOTIFIER=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=98304
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+# CONFIG_MEMORY_FAILURE is not set
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
+CONFIG_X86_RESERVE_LOW=64
+CONFIG_MTRR=y
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
+CONFIG_X86_PAT=y
+CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_EFI=y
+CONFIG_SECCOMP=y
+CONFIG_CC_STACKPROTECTOR=y
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
+CONFIG_HZ_1000=y
+CONFIG_HZ=1000
+CONFIG_SCHED_HRTICK=y
+# CONFIG_KEXEC is not set
+# CONFIG_CRASH_DUMP is not set
+CONFIG_PHYSICAL_START=0x1000000
+# CONFIG_RELOCATABLE is not set
+CONFIG_PHYSICAL_ALIGN=0x1000000
+CONFIG_HOTPLUG_CPU=y
+CONFIG_COMPAT_VDSO=y
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+
+#
+# Power management and ACPI options
+#
+CONFIG_ARCH_HIBERNATION_HEADER=y
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_SLEEP_SMP=y
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+CONFIG_HIBERNATION=y
+CONFIG_PM_STD_PARTITION="\"\""
+CONFIG_PM_RUNTIME=y
+CONFIG_PM_OPS=y
+CONFIG_ACPI=y
+CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_PROCFS=y
+CONFIG_ACPI_PROCFS_POWER=y
+CONFIG_ACPI_POWER_METER=m
+CONFIG_ACPI_EC_DEBUGFS=m
+CONFIG_ACPI_PROC_EVENT=y
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=m
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_PROCESSOR=m
+CONFIG_ACPI_IPMI=m
+CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
+CONFIG_ACPI_THERMAL=m
+# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_BLACKLIST_YEAR=0
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_PCI_SLOT=m
+CONFIG_X86_PM_TIMER=y
+CONFIG_ACPI_CONTAINER=m
+CONFIG_ACPI_HOTPLUG_MEMORY=m
+CONFIG_ACPI_SBS=m
+CONFIG_ACPI_HED=m
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=m
+CONFIG_ACPI_APEI_EINJ=m
+CONFIG_ACPI_APEI_ERST_DEBUG=m
+CONFIG_SFI=y
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=m
+# CONFIG_CPU_FREQ_DEBUG is not set
+CONFIG_CPU_FREQ_STAT=m
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=m
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+
+#
+# CPUFreq processor drivers
+#
+CONFIG_X86_PCC_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_SPEEDSTEP_CENTRINO=m
+CONFIG_X86_P4_CLOCKMOD=m
+
+#
+# shared options
+#
+CONFIG_X86_SPEEDSTEP_LIB=m
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_INTEL_IDLE=y
+
+#
+# Memory power savings
+#
+CONFIG_I7300_IDLE_IOAT_CHANNEL=y
+CONFIG_I7300_IDLE=m
+
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_DOMAINS=y
+# CONFIG_PCI_CNB20LE_QUIRK is not set
+# CONFIG_DMAR is not set
+# CONFIG_INTR_REMAP is not set
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=m
+CONFIG_PCIEAER=y
+# CONFIG_PCIE_ECRC is not set
+CONFIG_PCIEAER_INJECT=m
+CONFIG_PCIEASPM=y
+# CONFIG_PCIEASPM_DEBUG is not set
+CONFIG_PCIE_PME=y
+CONFIG_ARCH_SUPPORTS_MSI=y
+CONFIG_PCI_MSI=y
+# CONFIG_PCI_DEBUG is not set
+CONFIG_PCI_STUB=m
+CONFIG_HT_IRQ=y
+# CONFIG_PCI_IOV is not set
+CONFIG_PCI_IOAPIC=y
+CONFIG_ISA_DMA_API=y
+CONFIG_AMD_NB=y
+CONFIG_PCCARD=m
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_PCCARD_NONSTATIC=y
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_FAKE=m
+CONFIG_HOTPLUG_PCI_ACPI=m
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
+# CONFIG_HOTPLUG_PCI_CPCI is not set
+CONFIG_HOTPLUG_PCI_SHPC=m
+
+#
+# Executable file formats / Emulations
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_COMPAT_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_HAVE_AOUT is not set
+CONFIG_BINFMT_MISC=m
+CONFIG_IA32_EMULATION=y
+# CONFIG_IA32_AOUT is not set
+CONFIG_COMPAT=y
+CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
+CONFIG_SYSVIPC_COMPAT=y
+CONFIG_HAVE_TEXT_POKE_SMP=y
+CONFIG_NET=y
+CONFIG_COMPAT_NETLINK_MESSAGES=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=y
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+# CONFIG_NET_KEY_MIGRATE is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_INET_LRO=y
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=m
+CONFIG_IPV6_PRIVACY=y
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_SIT_6RD is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_NETLABEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+# CONFIG_NF_CONNTRACK_EVENTS is not set
+CONFIG_NF_CT_PROTO_DCCP=m
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_TPROXY=m
+CONFIG_NETFILTER_XTABLES=m
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_VS=m
+# CONFIG_IP_VS_IPV6 is not set
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_NFCT=y
+CONFIG_IP_VS_PE_SIP=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_DCCP=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_QUEUE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+
+#
+# DECnet: Netfilter Configuration
+#
+# CONFIG_DECNET_NF_GRABULATOR is not set
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_ULOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+# CONFIG_IP_DCCP_CCID3 is not set
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_MSG is not set
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_HMAC_NONE is not set
+# CONFIG_SCTP_HMAC_SHA1 is not set
+CONFIG_SCTP_HMAC_MD5=y
+CONFIG_RDS=m
+CONFIG_RDS_RDMA=m
+CONFIG_RDS_TCP=m
+# CONFIG_RDS_DEBUG is not set
+CONFIG_TIPC=m
+# CONFIG_TIPC_ADVANCED is not set
+# CONFIG_TIPC_DEBUG is not set
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_GARP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+# CONFIG_NET_DSA is not set
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_DECNET=m
+# CONFIG_DECNET_ROUTER is not set
+CONFIG_LLC=m
+CONFIG_LLC2=m
+CONFIG_IPX=m
+# CONFIG_IPX_INTERN is not set
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_IPDDP_DECAP=y
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+CONFIG_WAN_ROUTER=m
+# CONFIG_PHONET is not set
+CONFIG_IEEE802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_INGRESS=m
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_ROUTE=y
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=y
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=y
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+# CONFIG_NET_CLS_IND is not set
+CONFIG_NET_SCH_FIFO=y
+# CONFIG_DCB is not set
+CONFIG_DNS_RESOLVER=y
+CONFIG_BATMAN_ADV=m
+# CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_RPS=y
+CONFIG_XPS=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NET_DROP_MONITOR is not set
+CONFIG_HAMRADIO=y
+
+#
+# Packet Radio protocols
+#
+CONFIG_AX25=m
+# CONFIG_AX25_DAMA_SLAVE is not set
+CONFIG_NETROM=m
+CONFIG_ROSE=m
+
+#
+# AX.25 network device drivers
+#
+CONFIG_MKISS=m
+CONFIG_6PACK=m
+CONFIG_BPQETHER=m
+CONFIG_BAYCOM_SER_FDX=m
+CONFIG_BAYCOM_SER_HDX=m
+CONFIG_BAYCOM_PAR=m
+CONFIG_YAM=m
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+
+#
+# CAN Device Drivers
+#
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_SLCAN=m
+CONFIG_CAN_DEV=m
+# CONFIG_CAN_CALC_BITTIMING is not set
+CONFIG_CAN_JANZ_ICAN3=m
+CONFIG_PCH_CAN=m
+CONFIG_CAN_SJA1000=m
+CONFIG_CAN_SJA1000_PLATFORM=m
+CONFIG_CAN_EMS_PCI=m
+CONFIG_CAN_KVASER_PCI=m
+CONFIG_CAN_PLX_PCI=m
+
+#
+# CAN USB interfaces
+#
+CONFIG_CAN_EMS_USB=m
+CONFIG_CAN_ESD_USB2=m
+CONFIG_CAN_SOFTING=m
+CONFIG_CAN_SOFTING_CS=m
+# CONFIG_CAN_DEBUG_DEVICES is not set
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+# CONFIG_IRDA_ULTRA is not set
+
+#
+# IrDA options
+#
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+# CONFIG_IRDA_DEBUG is not set
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+CONFIG_IRTTY_SIR=m
+
+#
+# Dongle support
+#
+CONFIG_DONGLE=y
+CONFIG_ESI_DONGLE=m
+CONFIG_ACTISYS_DONGLE=m
+CONFIG_TEKRAM_DONGLE=m
+CONFIG_TOIM3232_DONGLE=m
+CONFIG_LITELINK_DONGLE=m
+CONFIG_MA600_DONGLE=m
+CONFIG_GIRBIL_DONGLE=m
+CONFIG_MCP2120_DONGLE=m
+CONFIG_OLD_BELKIN_DONGLE=m
+CONFIG_ACT200L_DONGLE=m
+CONFIG_KINGSUN_DONGLE=m
+CONFIG_KSDAZZLE_DONGLE=m
+CONFIG_KS959_DONGLE=m
+
+#
+# FIR device drivers
+#
+CONFIG_USB_IRDA=m
+CONFIG_SIGMATEL_FIR=m
+CONFIG_NSC_FIR=m
+CONFIG_WINBOND_FIR=m
+CONFIG_SMC_IRCC_FIR=m
+CONFIG_ALI_FIR=m
+CONFIG_VLSI_FIR=m
+CONFIG_VIA_FIR=m
+CONFIG_MCS_FIR=m
+CONFIG_BT=m
+CONFIG_BT_L2CAP=m
+CONFIG_BT_SCO=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIBTUART=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_AF_RXRPC=m
+# CONFIG_AF_RXRPC_DEBUG is not set
+CONFIG_RXKAD=m
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_REG_DEBUG is not set
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+# CONFIG_CFG80211_INTERNAL_REGDB is not set
+CONFIG_CFG80211_WEXT=y
+CONFIG_WIRELESS_EXT_SYSFS=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_MINSTREL_HT=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+CONFIG_NET_9P_RDMA=m
+# CONFIG_NET_9P_DEBUG is not set
+# CONFIG_CAIF is not set
+CONFIG_CEPH_LIB=m
+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+CONFIG_CONNECTOR=m
+CONFIG_MTD=m
+# CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_TESTS=m
+CONFIG_MTD_CONCAT=m
+CONFIG_MTD_PARTITIONS=y
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+CONFIG_MTD_AR7_PARTS=m
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=m
+CONFIG_HAVE_MTD_OTP=y
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+CONFIG_FTL=m
+CONFIG_NFTL=m
+CONFIG_NFTL_RW=y
+CONFIG_INFTL=m
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
+CONFIG_SM_FTL=m
+CONFIG_MTD_OOPS=m
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_GEN_PROBE=m
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+CONFIG_MTD_MAP_BANK_WIDTH_8=y
+CONFIG_MTD_MAP_BANK_WIDTH_16=y
+CONFIG_MTD_MAP_BANK_WIDTH_32=y
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+CONFIG_MTD_CFI_I4=y
+CONFIG_MTD_CFI_I8=y
+CONFIG_MTD_OTP=y
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_CFI_UTIL=m
+CONFIG_MTD_RAM=m
+CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_PHYSMAP=m
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+CONFIG_MTD_SC520CDP=m
+CONFIG_MTD_NETSC520=m
+CONFIG_MTD_TS5500=m
+CONFIG_MTD_SBC_GXX=m
+CONFIG_MTD_AMD76XROM=m
+CONFIG_MTD_ICHXROM=m
+CONFIG_MTD_ESB2ROM=m
+CONFIG_MTD_CK804XROM=m
+CONFIG_MTD_SCB2_FLASH=m
+CONFIG_MTD_NETtel=m
+CONFIG_MTD_L440GX=m
+CONFIG_MTD_PCI=m
+CONFIG_MTD_PCMCIA=m
+# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
+CONFIG_MTD_GPIO_ADDR=m
+CONFIG_MTD_INTEL_VR_NOR=m
+CONFIG_MTD_PLATRAM=m
+
+#
+# Self-contained MTD device drivers
+#
+CONFIG_MTD_PMC551=m
+CONFIG_MTD_PMC551_BUGFIX=y
+# CONFIG_MTD_PMC551_DEBUG is not set
+CONFIG_MTD_SLRAM=m
+CONFIG_MTD_PHRAM=m
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=4096
+CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTD_BLOCK2MTD=m
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+CONFIG_MTD_DOC2001PLUS=m
+CONFIG_MTD_DOCPROBE=m
+CONFIG_MTD_DOCECC=m
+CONFIG_MTD_DOCPROBE_ADVANCED=y
+CONFIG_MTD_DOCPROBE_ADDRESS=0x0000
+CONFIG_MTD_DOCPROBE_HIGH=y
+CONFIG_MTD_DOCPROBE_55AA=y
+CONFIG_MTD_NAND_ECC=m
+CONFIG_MTD_NAND_ECC_SMC=y
+CONFIG_MTD_NAND=m
+CONFIG_MTD_NAND_VERIFY_WRITE=y
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_MUSEUM_IDS=y
+CONFIG_MTD_NAND_DENALI=m
+CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xFF108018
+CONFIG_MTD_NAND_IDS=m
+CONFIG_MTD_NAND_RICOH=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y
+CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y
+CONFIG_MTD_NAND_CAFE=m
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_PLATFORM=m
+CONFIG_MTD_ALAUDA=m
+CONFIG_MTD_ONENAND=m
+CONFIG_MTD_ONENAND_VERIFY_WRITE=y
+CONFIG_MTD_ONENAND_GENERIC=m
+CONFIG_MTD_ONENAND_OTP=y
+CONFIG_MTD_ONENAND_2X_PROGRAM=y
+CONFIG_MTD_ONENAND_SIM=m
+
+#
+# LPDDR flash memory drivers
+#
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_RESERVE=1
+CONFIG_MTD_UBI_GLUEBI=m
+
+#
+# UBI debugging options
+#
+# CONFIG_MTD_UBI_DEBUG is not set
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
+CONFIG_PARPORT_PC_PCMCIA=m
+# CONFIG_PARPORT_GSC is not set
+CONFIG_PARPORT_AX88796=m
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_PNP=y
+CONFIG_PNP_DEBUG_MESSAGES=y
+
+#
+# Protocols
+#
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_FD=y
+CONFIG_PARIDE=m
+
+#
+# Parallel IDE high-level drivers
+#
+CONFIG_PARIDE_PD=m
+CONFIG_PARIDE_PCD=m
+CONFIG_PARIDE_PF=m
+CONFIG_PARIDE_PT=m
+CONFIG_PARIDE_PG=m
+
+#
+# Parallel IDE protocol modules
+#
+CONFIG_PARIDE_ATEN=m
+CONFIG_PARIDE_BPCK=m
+CONFIG_PARIDE_COMM=m
+CONFIG_PARIDE_DSTR=m
+CONFIG_PARIDE_FIT2=m
+CONFIG_PARIDE_FIT3=m
+CONFIG_PARIDE_EPAT=m
+CONFIG_PARIDE_EPATC8=y
+CONFIG_PARIDE_EPIA=m
+CONFIG_PARIDE_FRIQ=m
+CONFIG_PARIDE_FRPW=m
+CONFIG_PARIDE_KBIC=m
+CONFIG_PARIDE_KTTI=m
+CONFIG_PARIDE_ON20=m
+CONFIG_PARIDE_ON26=m
+CONFIG_BLK_CPQ_DA=y
+CONFIG_BLK_CPQ_CISS_DA=y
+CONFIG_CISS_SCSI_TAPE=y
+CONFIG_BLK_DEV_DAC960=y
+CONFIG_BLK_DEV_UMEM=m
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_OSD=m
+CONFIG_BLK_DEV_SX8=y
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=16384
+# CONFIG_BLK_DEV_XIP is not set
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_ATA_OVER_ETH=m
+CONFIG_VIRTIO_BLK=m
+# CONFIG_BLK_DEV_HD is not set
+CONFIG_BLK_DEV_RBD=m
+CONFIG_MISC_DEVICES=y
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+CONFIG_IBM_ASM=m
+CONFIG_PHANTOM=m
+CONFIG_SGI_IOC4=m
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+CONFIG_ICS932S401=m
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_CS5535_MFGPT=m
+CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
+CONFIG_CS5535_CLOCK_EVENT_SRC=m
+CONFIG_HP_ILO=m
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1780=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
+CONFIG_VMWARE_BALLOON=m
+CONFIG_BMP085=m
+CONFIG_PCH_PHUB=m
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+CONFIG_IWMC3200TOP=m
+# CONFIG_IWMC3200TOP_DEBUG is not set
+# CONFIG_IWMC3200TOP_DEBUGFS is not set
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=y
+CONFIG_RAID_ATTRS=y
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_TGT=y
+CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=y
+CONFIG_CHR_DEV_OSST=m
+CONFIG_BLK_DEV_SR=y
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=y
+CONFIG_SCSI_FC_ATTRS=y
+CONFIG_SCSI_FC_TGT_ATTRS=y
+CONFIG_SCSI_ISCSI_ATTRS=y
+CONFIG_SCSI_SAS_ATTRS=y
+CONFIG_SCSI_SAS_LIBSAS=y
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
+CONFIG_SCSI_SRP_ATTRS=m
+CONFIG_SCSI_SRP_TGT_ATTRS=y
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_ISCSI_BOOT_SYSFS=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_BE2ISCSI=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=y
+CONFIG_SCSI_HPSA=y
+CONFIG_SCSI_3W_9XXX=y
+CONFIG_SCSI_3W_SAS=y
+CONFIG_SCSI_ACARD=y
+CONFIG_SCSI_AACRAID=y
+CONFIG_SCSI_AIC7XXX=y
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=4
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
+CONFIG_AIC7XXX_DEBUG_MASK=0
+# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
+CONFIG_SCSI_AIC7XXX_OLD=y
+CONFIG_SCSI_AIC79XX=y
+CONFIG_AIC79XX_CMDS_PER_DEVICE=4
+CONFIG_AIC79XX_RESET_DELAY_MS=15000
+# CONFIG_AIC79XX_DEBUG_ENABLE is not set
+CONFIG_AIC79XX_DEBUG_MASK=0
+# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
+CONFIG_SCSI_AIC94XX=y
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_MVSAS=y
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_ADVANSYS=y
+CONFIG_SCSI_ARCMSR=y
+# CONFIG_SCSI_ARCMSR_AER is not set
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=y
+CONFIG_MEGARAID_MAILBOX=y
+CONFIG_MEGARAID_LEGACY=y
+CONFIG_MEGARAID_SAS=y
+CONFIG_SCSI_MPT2SAS=y
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+# CONFIG_SCSI_MPT2SAS_LOGGING is not set
+CONFIG_SCSI_HPTIOP=y
+CONFIG_SCSI_BUSLOGIC=y
+CONFIG_VMWARE_PVSCSI=m
+CONFIG_LIBFC=y
+CONFIG_LIBFCOE=y
+CONFIG_FCOE=y
+CONFIG_FCOE_FNIC=y
+CONFIG_SCSI_DMX3191D=y
+CONFIG_SCSI_EATA=y
+# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
+# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
+CONFIG_SCSI_EATA_MAX_TAGS=16
+CONFIG_SCSI_FUTURE_DOMAIN=y
+CONFIG_SCSI_GDTH=y
+CONFIG_SCSI_IPS=y
+CONFIG_SCSI_INITIO=y
+CONFIG_SCSI_INIA100=y
+CONFIG_SCSI_PPA=m
+CONFIG_SCSI_IMM=m
+# CONFIG_SCSI_IZIP_EPP16 is not set
+# CONFIG_SCSI_IZIP_SLOW_CTR is not set
+CONFIG_SCSI_STEX=y
+CONFIG_SCSI_SYM53C8XX_2=y
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_SCSI_IPR=y
+# CONFIG_SCSI_IPR_TRACE is not set
+# CONFIG_SCSI_IPR_DUMP is not set
+CONFIG_SCSI_QLOGIC_1280=y
+CONFIG_SCSI_QLA_FC=y
+CONFIG_SCSI_QLA_ISCSI=y
+CONFIG_SCSI_LPFC=y
+# CONFIG_SCSI_LPFC_DEBUG_FS is not set
+CONFIG_SCSI_DC395x=y
+CONFIG_SCSI_DC390T=y
+CONFIG_SCSI_DEBUG=m
+CONFIG_SCSI_PMCRAID=y
+CONFIG_SCSI_PM8001=y
+CONFIG_SCSI_SRP=y
+CONFIG_SCSI_BFA_FC=y
+CONFIG_SCSI_LOWLEVEL_PCMCIA=y
+CONFIG_PCMCIA_AHA152X=m
+CONFIG_PCMCIA_FDOMAIN=m
+CONFIG_PCMCIA_QLOGIC=m
+CONFIG_PCMCIA_SYM53C500=m
+CONFIG_SCSI_DH=m
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+CONFIG_SCSI_OSD_INITIATOR=m
+CONFIG_SCSI_OSD_ULD=m
+CONFIG_SCSI_OSD_DPRINT_SENSE=1
+# CONFIG_SCSI_OSD_DEBUG is not set
+CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_ACPI=y
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=y
+CONFIG_SATA_AHCI_PLATFORM=y
+CONFIG_SATA_INIC162X=y
+CONFIG_SATA_ACARD_AHCI=y
+CONFIG_SATA_SIL24=y
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=y
+CONFIG_SATA_QSTOR=y
+CONFIG_SATA_SX4=y
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=y
+CONFIG_SATA_MV=y
+CONFIG_SATA_NV=y
+CONFIG_SATA_PROMISE=y
+CONFIG_SATA_SIL=y
+CONFIG_SATA_SIS=y
+CONFIG_SATA_SVW=y
+CONFIG_SATA_ULI=y
+CONFIG_SATA_VIA=y
+CONFIG_SATA_VITESSE=y
+
+#
+# PATA SFF controllers with BMDMA
+#
+CONFIG_PATA_ALI=y
+CONFIG_PATA_AMD=y
+CONFIG_PATA_ARTOP=y
+CONFIG_PATA_ATIIXP=y
+CONFIG_PATA_ATP867X=y
+CONFIG_PATA_CMD64X=y
+CONFIG_PATA_CS5520=y
+CONFIG_PATA_CS5530=y
+CONFIG_PATA_CS5536=y
+CONFIG_PATA_CYPRESS=y
+CONFIG_PATA_EFAR=y
+CONFIG_PATA_HPT366=y
+CONFIG_PATA_HPT37X=y
+CONFIG_PATA_HPT3X2N=y
+CONFIG_PATA_HPT3X3=y
+CONFIG_PATA_HPT3X3_DMA=y
+CONFIG_PATA_IT8213=y
+CONFIG_PATA_IT821X=y
+CONFIG_PATA_JMICRON=y
+CONFIG_PATA_MARVELL=y
+CONFIG_PATA_NETCELL=y
+CONFIG_PATA_NINJA32=y
+CONFIG_PATA_NS87415=y
+CONFIG_PATA_OLDPIIX=y
+CONFIG_PATA_OPTIDMA=y
+CONFIG_PATA_PDC2027X=y
+CONFIG_PATA_PDC_OLD=y
+CONFIG_PATA_RADISYS=y
+CONFIG_PATA_RDC=y
+CONFIG_PATA_SC1200=y
+CONFIG_PATA_SCH=y
+CONFIG_PATA_SERVERWORKS=y
+CONFIG_PATA_SIL680=y
+CONFIG_PATA_SIS=y
+CONFIG_PATA_TOSHIBA=m
+CONFIG_PATA_TRIFLEX=y
+CONFIG_PATA_VIA=y
+CONFIG_PATA_WINBOND=y
+
+#
+# PIO-only SFF controllers
+#
+CONFIG_PATA_CMD640_PCI=y
+CONFIG_PATA_MPIIX=y
+CONFIG_PATA_NS87410=y
+CONFIG_PATA_OPTI=y
+CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_RZ1000=y
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_PATA_ACPI=y
+CONFIG_ATA_GENERIC=y
+CONFIG_PATA_LEGACY=y
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_AUTODETECT=y
+CONFIG_MD_LINEAR=y
+CONFIG_MD_RAID0=y
+CONFIG_MD_RAID1=y
+CONFIG_MD_RAID10=y
+CONFIG_MD_RAID456=y
+# CONFIG_MULTICORE_RAID456 is not set
+CONFIG_MD_MULTIPATH=y
+CONFIG_MD_FAULTY=m
+CONFIG_BLK_DEV_DM=y
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_CRYPT=y
+CONFIG_DM_SNAPSHOT=y
+CONFIG_DM_MIRROR=y
+CONFIG_DM_RAID=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+# CONFIG_DM_DELAY is not set
+CONFIG_DM_UEVENT=y
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=y
+CONFIG_FUSION_FC=y
+CONFIG_FUSION_SAS=y
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=y
+CONFIG_FUSION_LAN=y
+# CONFIG_FUSION_LOGGING is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_OHCI_DEBUG=y
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_FIREWIRE_NOSY=m
+CONFIG_I2O=y
+CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
+CONFIG_I2O_EXT_ADAPTEC=y
+CONFIG_I2O_EXT_ADAPTEC_DMA64=y
+CONFIG_I2O_CONFIG=y
+# CONFIG_I2O_CONFIG_OLD_IOCTL is not set
+CONFIG_I2O_BUS=y
+CONFIG_I2O_BLOCK=y
+CONFIG_I2O_SCSI=y
+CONFIG_I2O_PROC=y
+CONFIG_MACINTOSH_DRIVERS=y
+CONFIG_MAC_EMUMOUSEBTN=y
+CONFIG_NETDEVICES=y
+CONFIG_IFB=m
+CONFIG_DUMMY=m
+CONFIG_BONDING=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_EQUALIZER=m
+CONFIG_TUN=m
+CONFIG_VETH=m
+CONFIG_NET_SB1000=m
+CONFIG_ARCNET=m
+CONFIG_ARCNET_1201=m
+CONFIG_ARCNET_1051=m
+CONFIG_ARCNET_RAW=m
+CONFIG_ARCNET_CAP=m
+CONFIG_ARCNET_COM90xx=m
+CONFIG_ARCNET_COM90xxIO=m
+CONFIG_ARCNET_RIM_I=m
+CONFIG_ARCNET_COM20020=m
+CONFIG_ARCNET_COM20020_PCI=m
+CONFIG_MII=m
+CONFIG_PHYLIB=m
+
+#
+# MII PHY device drivers
+#
+CONFIG_MARVELL_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM63XX_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_STE10XP=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MICREL_PHY=m
+CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_GPIO=m
+CONFIG_NET_ETHERNET=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_ETHOC=m
+CONFIG_DNET=m
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+CONFIG_TULIP_MMIO=y
+# CONFIG_TULIP_NAPI is not set
+CONFIG_DE4X5=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_PCMCIA_XIRCOM=m
+CONFIG_HP100=m
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
+CONFIG_NET_PCI=y
+CONFIG_PCNET32=m
+CONFIG_AMD8111_ETH=m
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_KSZ884X_PCI=m
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_FORCEDETH=m
+CONFIG_E100=m
+CONFIG_FEALNX=m
+CONFIG_NATSEMI=m
+CONFIG_NE2K_PCI=m
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+CONFIG_8139TOO_PIO=y
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R6040=m
+CONFIG_SIS900=m
+CONFIG_EPIC100=m
+CONFIG_SMSC9420=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_TLAN=m
+CONFIG_KS8842=m
+CONFIG_KS8851_MLL=m
+CONFIG_VIA_RHINE=m
+CONFIG_VIA_RHINE_MMIO=y
+CONFIG_SC92031=m
+CONFIG_NET_POCKET=y
+CONFIG_ATP=m
+CONFIG_DE600=m
+CONFIG_DE620=m
+CONFIG_ATL2=m
+CONFIG_NETDEV_1000=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_DL2K=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IP1000=m
+CONFIG_IGB=m
+CONFIG_IGB_DCA=y
+CONFIG_IGBVF=m
+CONFIG_NS83820=m
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_R8169=m
+CONFIG_R8169_VLAN=y
+CONFIG_SIS190=m
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_VIA_VELOCITY=m
+CONFIG_TIGON3=m
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_QLA3XXX=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_JME=m
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_DA is not set
+CONFIG_STMMAC_DUAL_MAC=y
+CONFIG_PCH_GBE=m
+CONFIG_NETDEV_10000=y
+CONFIG_MDIO=m
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3_DEPENDS=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4_DEPENDS=y
+CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4VF_DEPENDS=y
+CONFIG_CHELSIO_T4VF=m
+CONFIG_ENIC=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_DCA=y
+CONFIG_IXGBEVF=m
+CONFIG_IXGB=m
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+CONFIG_MYRI10GE=m
+CONFIG_MYRI10GE_DCA=y
+CONFIG_NETXEN_NIC=m
+CONFIG_NIU=m
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_TEHUTI=m
+CONFIG_BNX2X=m
+CONFIG_QLCNIC=m
+CONFIG_QLGE=m
+CONFIG_BNA=m
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_BE2NET=m
+CONFIG_TR=m
+CONFIG_IBMOL=m
+CONFIG_3C359=m
+CONFIG_TMS380TR=m
+CONFIG_TMSPCI=m
+CONFIG_ABYSS=m
+CONFIG_WLAN=y
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_AIRO=m
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_PCMCIA_ATMEL=m
+CONFIG_AT76C50X_USB=m
+CONFIG_AIRO_CS=m
+CONFIG_PCMCIA_WL3501=m
+CONFIG_PRISM54=m
+CONFIG_USB_ZD1201=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_ADM8211=m
+# CONFIG_MAC80211_HWSIM is not set
+CONFIG_MWL8K=m
+CONFIG_ATH_COMMON=m
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+CONFIG_ATH5K_PCI=y
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K=m
+# CONFIG_ATH9K_DEBUGFS is not set
+CONFIG_ATH9K_RATE_CONTROL=y
+CONFIG_ATH9K_HTC=m
+# CONFIG_ATH9K_HTC_DEBUGFS is not set
+CONFIG_AR9170_USB=m
+CONFIG_AR9170_LEDS=y
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+CONFIG_CARL9170_WPC=y
+CONFIG_B43=m
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_PCMCIA=y
+CONFIG_B43_SDIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_N=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+# CONFIG_B43LEGACY_DEBUG is not set
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_IWLWIFI=m
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_DEBUG is not set
+# CONFIG_IWLWIFI_DEVICE_TRACING is not set
+CONFIG_IWLAGN=m
+CONFIG_IWL4965=y
+CONFIG_IWL5000=y
+CONFIG_IWL3945=m
+CONFIG_IWM=m
+# CONFIG_IWM_DEBUG is not set
+# CONFIG_IWM_TRACING is not set
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
+CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_HERMES=m
+# CONFIG_HERMES_PRISM is not set
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_ORINOCO_USB=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_P54_LEDS=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT33XX=y
+CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RT2800_LIB=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_HT=y
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_RTL8192CE=m
+CONFIG_RTLWIFI=m
+CONFIG_WL1251=m
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX_MENU=m
+CONFIG_WL12XX=m
+# CONFIG_WL12XX_HT is not set
+CONFIG_WL12XX_SDIO=m
+CONFIG_WL12XX_SDIO_TEST=m
+CONFIG_WL12XX_PLATFORM_DATA=y
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+
+#
+# WiMAX Wireless Broadband devices
+#
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_SDIO=m
+# CONFIG_WIMAX_IWMC3200_SDIO is not set
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+
+#
+# USB Network Adapters
+#
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+# CONFIG_USB_EPSON2888 is not set
+# CONFIG_USB_KC2190 is not set
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_NET_PCMCIA=y
+CONFIG_PCMCIA_3C589=m
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_PCMCIA_XIRC2PS=m
+CONFIG_PCMCIA_AXNET=m
+CONFIG_ARCNET_COM20020_CS=m
+CONFIG_PCMCIA_IBMTR=m
+CONFIG_WAN=y
+CONFIG_LANMEDIA=m
+CONFIG_HDLC=m
+CONFIG_HDLC_RAW=m
+CONFIG_HDLC_RAW_ETH=m
+CONFIG_HDLC_CISCO=m
+CONFIG_HDLC_FR=m
+CONFIG_HDLC_PPP=m
+
+#
+# X.25/LAPB support is disabled
+#
+CONFIG_PCI200SYN=m
+CONFIG_WANXL=m
+# CONFIG_PC300TOO is not set
+CONFIG_FARSYNC=m
+CONFIG_DSCC4=m
+# CONFIG_DSCC4_PCISYNC is not set
+# CONFIG_DSCC4_PCI_RST is not set
+CONFIG_DLCI=m
+CONFIG_DLCI_MAX=8
+CONFIG_WAN_ROUTER_DRIVERS=m
+CONFIG_CYCLADES_SYNC=m
+CONFIG_CYCLOMX_X25=y
+CONFIG_SBNI=m
+# CONFIG_SBNI_MULTILINE is not set
+CONFIG_ATM_DRIVERS=y
+CONFIG_ATM_DUMMY=m
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+# CONFIG_ATM_ENI_TUNE_BURST is not set
+CONFIG_ATM_FIRESTREAM=m
+CONFIG_ATM_ZATM=m
+# CONFIG_ATM_ZATM_DEBUG is not set
+CONFIG_ATM_NICSTAR=m
+# CONFIG_ATM_NICSTAR_USE_SUNI is not set
+# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_AMBASSADOR=m
+# CONFIG_ATM_AMBASSADOR_DEBUG is not set
+CONFIG_ATM_HORIZON=m
+# CONFIG_ATM_HORIZON_DEBUG is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+# CONFIG_ATM_FORE200E_USE_TASKLET is not set
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+# CONFIG_ATM_HE_USE_SUNI is not set
+CONFIG_ATM_SOLOS=m
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKEHARD=m
+
+#
+# CAIF transport drivers
+#
+CONFIG_FDDI=y
+CONFIG_DEFXX=m
+# CONFIG_DEFXX_MMIO is not set
+CONFIG_SKFP=m
+CONFIG_HIPPI=y
+CONFIG_ROADRUNNER=m
+# CONFIG_ROADRUNNER_LARGE_RINGS is not set
+CONFIG_PLIP=m
+CONFIG_PPP=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOATM=m
+CONFIG_PPPOL2TP=m
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLHC=m
+CONFIG_SLIP_SMART=y
+# CONFIG_SLIP_MODE_SLIP6 is not set
+CONFIG_NET_FC=y
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+# CONFIG_NETPOLL_TRAP is not set
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_VIRTIO_NET=m
+CONFIG_VMXNET3=m
+CONFIG_ISDN=y
+CONFIG_ISDN_I4L=m
+CONFIG_ISDN_PPP=y
+CONFIG_ISDN_PPP_VJ=y
+CONFIG_ISDN_MPP=y
+CONFIG_IPPP_FILTER=y
+CONFIG_ISDN_PPP_BSDCOMP=m
+CONFIG_ISDN_AUDIO=y
+CONFIG_ISDN_TTY_FAX=y
+
+#
+# ISDN feature submodules
+#
+CONFIG_ISDN_DIVERSION=m
+
+#
+# ISDN4Linux hardware drivers
+#
+
+#
+# Passive cards
+#
+CONFIG_ISDN_DRV_HISAX=m
+
+#
+# D-channel protocol features
+#
+CONFIG_HISAX_EURO=y
+CONFIG_DE_AOC=y
+CONFIG_HISAX_NO_SENDCOMPLETE=y
+CONFIG_HISAX_NO_LLC=y
+CONFIG_HISAX_NO_KEYPAD=y
+CONFIG_HISAX_1TR6=y
+CONFIG_HISAX_NI1=y
+CONFIG_HISAX_MAX_CARDS=8
+
+#
+# HiSax supported cards
+#
+CONFIG_HISAX_16_3=y
+CONFIG_HISAX_TELESPCI=y
+CONFIG_HISAX_S0BOX=y
+CONFIG_HISAX_FRITZPCI=y
+CONFIG_HISAX_AVM_A1_PCMCIA=y
+CONFIG_HISAX_ELSA=y
+CONFIG_HISAX_DIEHLDIVA=y
+CONFIG_HISAX_SEDLBAUER=y
+CONFIG_HISAX_NETJET=y
+CONFIG_HISAX_NETJET_U=y
+CONFIG_HISAX_NICCY=y
+CONFIG_HISAX_BKM_A4T=y
+CONFIG_HISAX_SCT_QUADRO=y
+CONFIG_HISAX_GAZEL=y
+CONFIG_HISAX_HFC_PCI=y
+CONFIG_HISAX_W6692=y
+CONFIG_HISAX_HFC_SX=y
+CONFIG_HISAX_ENTERNOW_PCI=y
+# CONFIG_HISAX_DEBUG is not set
+
+#
+# HiSax PCMCIA card service modules
+#
+CONFIG_HISAX_SEDLBAUER_CS=m
+CONFIG_HISAX_ELSA_CS=m
+CONFIG_HISAX_AVM_A1_CS=m
+CONFIG_HISAX_TELES_CS=m
+
+#
+# HiSax sub driver modules
+#
+CONFIG_HISAX_ST5481=m
+CONFIG_HISAX_HFCUSB=m
+CONFIG_HISAX_HFC4S8S=m
+CONFIG_HISAX_FRITZ_PCIPNP=m
+
+#
+# Active cards
+#
+CONFIG_ISDN_CAPI=m
+CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
+CONFIG_CAPI_TRACE=y
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
+CONFIG_ISDN_CAPI_CAPIFS=m
+CONFIG_ISDN_CAPI_CAPIDRV=m
+
+#
+# CAPI hardware drivers
+#
+CONFIG_CAPI_AVM=y
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
+CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_CAPI_EICON=y
+CONFIG_ISDN_DIVAS=m
+CONFIG_ISDN_DIVAS_BRIPCI=y
+CONFIG_ISDN_DIVAS_PRIPCI=y
+CONFIG_ISDN_DIVAS_DIVACAPI=m
+CONFIG_ISDN_DIVAS_USERIDI=m
+CONFIG_ISDN_DIVAS_MAINT=m
+CONFIG_ISDN_DRV_GIGASET=m
+# CONFIG_GIGASET_CAPI is not set
+CONFIG_GIGASET_I4L=y
+# CONFIG_GIGASET_DUMMYLL is not set
+CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M105=m
+# CONFIG_GIGASET_M101 is not set
+# CONFIG_GIGASET_DEBUG is not set
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
+CONFIG_MISDN=m
+CONFIG_MISDN_DSP=m
+CONFIG_MISDN_L1OIP=m
+
+#
+# mISDN hardware drivers
+#
+CONFIG_MISDN_HFCPCI=m
+CONFIG_MISDN_HFCMULTI=m
+CONFIG_MISDN_HFCUSB=m
+CONFIG_MISDN_AVMFRITZ=m
+CONFIG_MISDN_SPEEDFAX=m
+CONFIG_MISDN_INFINEON=m
+CONFIG_MISDN_W6692=m
+CONFIG_MISDN_NETJET=m
+CONFIG_MISDN_IPAC=m
+CONFIG_MISDN_ISAR=m
+CONFIG_ISDN_HDLC=m
+CONFIG_PHONE=m
+CONFIG_PHONE_IXJ=m
+CONFIG_PHONE_IXJ_PCMCIA=m
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_FF_MEMLESS=y
+CONFIG_INPUT_POLLDEV=m
+CONFIG_INPUT_SPARSEKMAP=m
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT2160=m
+# CONFIG_KEYBOARD_LKKBD is not set
+CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
+CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_MATRIX=m
+CONFIG_KEYBOARD_LM8323=m
+CONFIG_KEYBOARD_MAX7359=m
+CONFIG_KEYBOARD_MCS=m
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_KEYBOARD_OPENCORES=m
+CONFIG_KEYBOARD_STOWAWAY=m
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_SENTELIC=y
+CONFIG_MOUSE_PS2_TOUCHKIT=y
+CONFIG_MOUSE_SERIAL=m
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_VSXXXAA=m
+CONFIG_MOUSE_GPIO=m
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_JOYSTICK_ANALOG=m
+CONFIG_JOYSTICK_A3D=m
+CONFIG_JOYSTICK_ADI=m
+CONFIG_JOYSTICK_COBRA=m
+CONFIG_JOYSTICK_GF2K=m
+CONFIG_JOYSTICK_GRIP=m
+CONFIG_JOYSTICK_GRIP_MP=m
+CONFIG_JOYSTICK_GUILLEMOT=m
+CONFIG_JOYSTICK_INTERACT=m
+CONFIG_JOYSTICK_SIDEWINDER=m
+CONFIG_JOYSTICK_TMDC=m
+CONFIG_JOYSTICK_IFORCE=m
+CONFIG_JOYSTICK_IFORCE_USB=y
+CONFIG_JOYSTICK_IFORCE_232=y
+CONFIG_JOYSTICK_WARRIOR=m
+CONFIG_JOYSTICK_MAGELLAN=m
+CONFIG_JOYSTICK_SPACEORB=m
+CONFIG_JOYSTICK_SPACEBALL=m
+CONFIG_JOYSTICK_STINGER=m
+CONFIG_JOYSTICK_TWIDJOY=m
+CONFIG_JOYSTICK_ZHENHUA=m
+CONFIG_JOYSTICK_DB9=m
+CONFIG_JOYSTICK_GAMECON=m
+CONFIG_JOYSTICK_TURBOGRAFX=m
+CONFIG_JOYSTICK_AS5011=m
+CONFIG_JOYSTICK_JOYDUMP=m
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+# CONFIG_JOYSTICK_WALKERA0701 is not set
+CONFIG_INPUT_TABLET=y
+CONFIG_TABLET_USB_ACECAD=m
+CONFIG_TABLET_USB_AIPTEK=m
+CONFIG_TABLET_USB_GTCO=m
+CONFIG_TABLET_USB_HANWANG=m
+CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_USB_WACOM=m
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+CONFIG_TOUCHSCREEN_BU21013=m
+CONFIG_TOUCHSCREEN_CY8CTMG110=m
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_GUNZE=m
+CONFIG_TOUCHSCREEN_ELO=m
+CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TOUCHSCREEN_MCS5000=m
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_MK712=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_QT602240=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_UCB1400=m
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
+CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
+CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
+CONFIG_TOUCHSCREEN_USB_GOTOP=y
+CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_E2I=y
+CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
+CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
+CONFIG_TOUCHSCREEN_USB_NEXIO=y
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC2007=m
+CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_APANEL=m
+CONFIG_INPUT_ATLAS_BTNS=m
+CONFIG_INPUT_ATI_REMOTE=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_PCF8574=m
+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
+CONFIG_INPUT_ADXL34X=m
+CONFIG_INPUT_ADXL34X_I2C=m
+CONFIG_INPUT_CMA3000=m
+CONFIG_INPUT_CMA3000_I2C=m
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_CT82C710=m
+CONFIG_SERIO_PARKBD=m
+CONFIG_SERIO_PCIPS2=m
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_RAW=m
+CONFIG_SERIO_ALTERA_PS2=m
+CONFIG_SERIO_PS2MULT=m
+CONFIG_GAMEPORT=m
+CONFIG_GAMEPORT_NS558=m
+CONFIG_GAMEPORT_L4=m
+CONFIG_GAMEPORT_EMU10K1=m
+CONFIG_GAMEPORT_FM801=m
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_DEVKMEM=y
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_COMPUTONE=m
+CONFIG_ROCKETPORT=m
+CONFIG_CYCLADES=m
+# CONFIG_CYZ_INTR is not set
+CONFIG_DIGIEPCA=m
+CONFIG_MOXA_INTELLIO=m
+CONFIG_MOXA_SMARTIO=m
+CONFIG_ISI=m
+CONFIG_SYNCLINK=m
+CONFIG_SYNCLINKMP=m
+CONFIG_SYNCLINK_GT=m
+CONFIG_N_HDLC=m
+CONFIG_N_GSM=m
+CONFIG_RISCOM8=m
+CONFIG_SPECIALIX=m
+CONFIG_STALDRV=y
+CONFIG_STALLION=m
+CONFIG_ISTALLION=m
+CONFIG_NOZOMI=m
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_PNP=y
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_DETECT_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_MFD_HSU=m
+CONFIG_SERIAL_UARTLITE=m
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_TIMBERDALE=m
+CONFIG_SERIAL_ALTERA_JTAGUART=m
+CONFIG_SERIAL_ALTERA_UART=m
+CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
+CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+CONFIG_SERIAL_PCH_UART=m
+CONFIG_UNIX98_PTYS=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=32
+CONFIG_PRINTER=m
+CONFIG_LP_CONSOLE=y
+CONFIG_PPDEV=m
+CONFIG_HVC_DRIVER=y
+CONFIG_VIRTIO_CONSOLE=m
+CONFIG_IPMI_HANDLER=m
+# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_INTEL=m
+CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_VIA=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_NVRAM=m
+CONFIG_R3964=m
+CONFIG_APPLICOM=m
+
+#
+# PCMCIA character devices
+#
+CONFIG_SYNCLINK_CS=m
+CONFIG_CARDMAN_4000=m
+CONFIG_CARDMAN_4040=m
+CONFIG_IPWIRELESS=m
+CONFIG_MWAVE=m
+CONFIG_RAW_DRIVER=m
+CONFIG_MAX_RAW_DEVS=256
+CONFIG_HPET=y
+CONFIG_HPET_MMAP=y
+CONFIG_HANGCHECK_TIMER=m
+CONFIG_TCG_TPM=m
+# CONFIG_TCG_TIS is not set
+# CONFIG_TCG_NSC is not set
+CONFIG_TCG_ATMEL=m
+# CONFIG_TCG_INFINEON is not set
+CONFIG_TELCLOCK=m
+CONFIG_DEVPORT=y
+CONFIG_RAMOOPS=m
+CONFIG_I2C=m
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_MUX=m
+
+#
+# Multiplexer I2C Chip support
+#
+CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD756_S4882=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NFORCE2_S4985=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+
+#
+# ACPI drivers
+#
+CONFIG_I2C_SCMI=m
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+CONFIG_I2C_GPIO=m
+CONFIG_I2C_INTEL_MID=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_XILINX=m
+CONFIG_I2C_EG20T=m
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_I2C_STUB=m
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_SPI is not set
+
+#
+# PPS support
+#
+CONFIG_PPS=m
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_KTIMER is not set
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_PPS_CLIENT_PARPORT=m
+
+#
+# PPS generators support
+#
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_GPIOLIB=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_MAX730X=m
+
+#
+# Memory mapped GPIO expanders:
+#
+CONFIG_GPIO_BASIC_MMIO=m
+CONFIG_GPIO_IT8761E=m
+CONFIG_GPIO_SCH=m
+CONFIG_GPIO_VX855=m
+
+#
+# I2C GPIO expanders:
+#
+CONFIG_GPIO_MAX7300=m
+CONFIG_GPIO_MAX732X=m
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_ADP5588=m
+
+#
+# PCI GPIO expanders:
+#
+CONFIG_GPIO_CS5535=m
+# CONFIG_GPIO_LANGWELL is not set
+CONFIG_GPIO_PCH=m
+CONFIG_GPIO_ML_IOH=m
+# CONFIG_GPIO_TIMBERDALE is not set
+CONFIG_GPIO_RDC321X=m
+
+#
+# SPI GPIO expanders:
+#
+
+#
+# AC97 GPIO expanders:
+#
+# CONFIG_GPIO_UCB1400 is not set
+
+#
+# MODULbus GPIO expanders:
+#
+CONFIG_GPIO_JANZ_TTL=m
+CONFIG_W1=m
+CONFIG_W1_CON=y
+
+#
+# 1-wire Bus Masters
+#
+CONFIG_W1_MASTER_MATROX=m
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_GPIO=m
+
+#
+# 1-wire Slaves
+#
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2423=m
+CONFIG_W1_SLAVE_DS2431=m
+CONFIG_W1_SLAVE_DS2433=m
+CONFIG_W1_SLAVE_DS2433_CRC=y
+CONFIG_W1_SLAVE_DS2760=m
+CONFIG_W1_SLAVE_BQ27000=m
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_PDA_POWER=m
+CONFIG_TEST_POWER=m
+CONFIG_BATTERY_DS2760=m
+CONFIG_BATTERY_DS2782=m
+CONFIG_BATTERY_BQ20Z75=m
+CONFIG_BATTERY_BQ27x00=m
+CONFIG_BATTERY_MAX17040=m
+CONFIG_BATTERY_MAX17042=m
+CONFIG_CHARGER_PCF50633=m
+CONFIG_CHARGER_ISP1704=m
+CONFIG_CHARGER_GPIO=m
+CONFIG_HWMON=m
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_ABITUGURU=m
+CONFIG_SENSORS_ABITUGURU3=m
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_K10TEMP=m
+CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_DS620=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_I5K_AMB=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_GPIO_FAN=m
+CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_PKGTEMP=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_LM63=m
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SHT21=m
+CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_SMM665=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_VIA_CPUTEMP=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+# CONFIG_SENSORS_W83795_FANCTRL is not set
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_LIS3_I2C=m
+CONFIG_SENSORS_APPLESMC=m
+
+#
+# ACPI drivers
+#
+CONFIG_SENSORS_ATK0110=m
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_THERMAL=m
+CONFIG_THERMAL_HWMON=y
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_ALIM1535_WDT=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_F71808E_WDT=m
+CONFIG_SP5100_TCO=m
+CONFIG_GEODE_WDT=m
+CONFIG_SC520_WDT=m
+CONFIG_SBC_FITPC2_WATCHDOG=m
+CONFIG_EUROTECH_WDT=m
+CONFIG_IB700_WDT=m
+CONFIG_IBMASR=m
+CONFIG_WAFER_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_ITCO_WDT=m
+CONFIG_ITCO_VENDOR_SUPPORT=y
+CONFIG_IT8712F_WDT=m
+CONFIG_IT87_WDT=m
+CONFIG_HP_WATCHDOG=m
+CONFIG_HPWDT_NMI_DECODING=y
+CONFIG_SC1200_WDT=m
+CONFIG_PC87413_WDT=m
+CONFIG_NV_TCO=m
+CONFIG_60XX_WDT=m
+CONFIG_SBC8360_WDT=m
+CONFIG_CPU5_WDT=m
+CONFIG_SMSC_SCH311X_WDT=m
+CONFIG_SMSC37B787_WDT=m
+CONFIG_W83627HF_WDT=m
+CONFIG_W83697HF_WDT=m
+CONFIG_W83697UG_WDT=m
+CONFIG_W83877F_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_MACHZ_WDT=m
+CONFIG_SBC_EPX_C3_WATCHDOG=m
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+CONFIG_SSB_PCMCIAHOST=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_MFD_SUPPORT=y
+CONFIG_MFD_CORE=m
+# CONFIG_MFD_SM501 is not set
+CONFIG_HTC_PASIC3=m
+CONFIG_UCB1400_CORE=m
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
+# CONFIG_MFD_TMIO is not set
+CONFIG_MFD_WM8400=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+# CONFIG_ABX500_CORE is not set
+CONFIG_MFD_CS5535=m
+CONFIG_MFD_TIMBERDALE=m
+CONFIG_LPC_SCH=m
+CONFIG_MFD_RDC321X=m
+CONFIG_MFD_JANZ_CMODIO=m
+CONFIG_MFD_VX855=m
+CONFIG_MFD_WL1273_CORE=m
+# CONFIG_REGULATOR is not set
+CONFIG_MEDIA_SUPPORT=m
+
+#
+# Multimedia core support
+#
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_DVB_CORE=m
+CONFIG_VIDEO_MEDIA=m
+
+#
+# Multimedia drivers
+#
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_RC_CORE=m
+CONFIG_LIRC=m
+CONFIG_RC_MAP=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_RC5_SZ_DECODER=m
+CONFIG_IR_LIRC_CODEC=m
+CONFIG_IR_ENE=m
+CONFIG_IR_IMON=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_NUVOTON=m
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_WINBOND_CIR=m
+CONFIG_RC_LOOPBACK=m
+CONFIG_MEDIA_ATTACH=y
+CONFIG_MEDIA_TUNER=m
+# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEOBUF_DMA_CONTIG=m
+CONFIG_VIDEOBUF_DVB=m
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# Encoders/decoders and other helper chips
+#
+
+#
+# Audio decoders
+#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_M52790=m
+CONFIG_VIDEO_TLV320AIC23B=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+
+#
+# Video decoders
+#
+CONFIG_VIDEO_ADV7180=m
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_BT866=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_MT9V011=m
+CONFIG_VIDEO_TCM825X=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_SAA7191=m
+CONFIG_VIDEO_TVP514X=m
+CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_TVP7002=m
+CONFIG_VIDEO_VPX3220=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_CX25840=m
+
+#
+# MPEG video encoders
+#
+CONFIG_VIDEO_CX2341X=m
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+CONFIG_VIDEO_THS7303=m
+CONFIG_VIDEO_ADV7343=m
+CONFIG_VIDEO_AK881X=m
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+CONFIG_VIDEO_VIVI=m
+CONFIG_VIDEO_BT848=m
+CONFIG_VIDEO_BT848_DVB=y
+CONFIG_VIDEO_BWQCAM=m
+CONFIG_VIDEO_CQCAM=m
+CONFIG_VIDEO_W9966=m
+CONFIG_VIDEO_CPIA2=m
+CONFIG_VIDEO_ZORAN=m
+CONFIG_VIDEO_ZORAN_DC30=m
+CONFIG_VIDEO_ZORAN_ZR36060=m
+CONFIG_VIDEO_ZORAN_BUZ=m
+CONFIG_VIDEO_ZORAN_DC10=m
+CONFIG_VIDEO_ZORAN_LML33=m
+CONFIG_VIDEO_ZORAN_LML33R10=m
+CONFIG_VIDEO_ZORAN_AVS6EYES=m
+CONFIG_VIDEO_MEYE=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_TIMBERDALE=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_FB_IVTV=m
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_SAA7164=m
+CONFIG_VIDEO_CAFE_CCIC=m
+CONFIG_VIDEO_SR030PC30=m
+CONFIG_VIDEO_VIA_CAMERA=m
+CONFIG_SOC_CAMERA=m
+CONFIG_SOC_CAMERA_IMX074=m
+CONFIG_SOC_CAMERA_MT9M001=m
+CONFIG_SOC_CAMERA_MT9M111=m
+CONFIG_SOC_CAMERA_MT9T031=m
+CONFIG_SOC_CAMERA_MT9T112=m
+CONFIG_SOC_CAMERA_MT9V022=m
+CONFIG_SOC_CAMERA_RJ54N1=m
+CONFIG_SOC_CAMERA_TW9910=m
+CONFIG_SOC_CAMERA_PLATFORM=m
+CONFIG_SOC_CAMERA_OV2640=m
+CONFIG_SOC_CAMERA_OV6650=m
+CONFIG_SOC_CAMERA_OV772X=m
+CONFIG_SOC_CAMERA_OV9640=m
+CONFIG_V4L_USB_DRIVERS=y
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_KONICA=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_TLG2300=m
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_USB_ET61X251=m
+CONFIG_USB_SN9C102=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_MEM2MEM_TESTDEV=m
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_MAESTRO=m
+CONFIG_I2C_SI4713=m
+CONFIG_RADIO_SI4713=m
+CONFIG_USB_DSBR=m
+# CONFIG_RADIO_SI470X is not set
+CONFIG_USB_MR800=m
+CONFIG_RADIO_TEA5764=m
+CONFIG_RADIO_SAA7706H=m
+CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_TIMBERDALE=m
+CONFIG_RADIO_WL1273=m
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
+CONFIG_DVB_CAPTURE_DRIVERS=y
+
+#
+# Supported SAA7146 based PCI Adapters
+#
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_BUDGET_PATCH=m
+
+#
+# Supported USB Adapters
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_FRIIO=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_SMS_SIANO_MDTV=m
+
+#
+# Siano module components
+#
+CONFIG_SMS_USB_DRV=m
+CONFIG_SMS_SDIO_DRV=m
+
+#
+# Supported FlexCopII (B2C2) Adapters
+#
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
+
+#
+# Supported BT878 Adapters
+#
+CONFIG_DVB_BT8XX=m
+
+#
+# Supported Pluto2 Adapters
+#
+CONFIG_DVB_PLUTO2=m
+
+#
+# Supported SDMC DM1105 Adapters
+#
+CONFIG_DVB_DM1105=m
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_FIREWIRE=y
+# CONFIG_DVB_FIREDTV_IEEE1394 is not set
+CONFIG_DVB_FIREDTV_INPUT=y
+
+#
+# Supported Earthsoft PT1 Adapters
+#
+CONFIG_DVB_PT1=m
+
+#
+# Supported Mantis Adapters
+#
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+
+#
+# Supported nGene Adapters
+#
+CONFIG_DVB_NGENE=m
+
+#
+# Supported DVB Frontends
+#
+CONFIG_DVB_FE_CUSTOMISE=y
+
+#
+# Customise DVB Frontends
+#
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV6110x=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_SP8870=m
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_S5H1432=m
+CONFIG_DVB_DRX397XD=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_S5H1411=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_S921=m
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
+
+#
+# Tools to develop new frontends
+#
+CONFIG_DVB_DUMMY_FE=m
+
+#
+# Graphics support
+#
+CONFIG_AGP=m
+CONFIG_AGP_AMD64=m
+CONFIG_AGP_INTEL=m
+CONFIG_AGP_SIS=m
+CONFIG_AGP_VIA=m
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_VGA_SWITCHEROO=y
+CONFIG_DRM=m
+CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_TTM=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_RADEON=m
+CONFIG_DRM_RADEON_KMS=y
+CONFIG_DRM_I810=m
+CONFIG_DRM_I830=m
+CONFIG_DRM_I915=m
+CONFIG_DRM_I915_KMS=y
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
+CONFIG_STUB_POULSBO=m
+CONFIG_VGASTATE=m
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_DDC=m
+CONFIG_FB_BOOT_VESA_SUPPORT=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=m
+# CONFIG_FB_WMT_GE_ROPS is not set
+CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_HECUBA=m
+CONFIG_FB_SVGALIB=m
+# CONFIG_FB_MACMODES is not set
+CONFIG_FB_BACKLIGHT=y
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+CONFIG_FB_CIRRUS=m
+CONFIG_FB_PM2=m
+# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
+CONFIG_FB_CYBER2000=m
+CONFIG_FB_ARC=m
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+CONFIG_FB_VGA16=m
+# CONFIG_FB_UVESA is not set
+CONFIG_FB_VESA=y
+# CONFIG_FB_EFI is not set
+CONFIG_FB_N411=m
+CONFIG_FB_HGA=m
+CONFIG_FB_S1D13XXX=m
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_NVIDIA_DEBUG is not set
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA=m
+CONFIG_FB_RIVA_I2C=y
+# CONFIG_FB_RIVA_DEBUG is not set
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_LE80578=m
+CONFIG_FB_CARILLO_RANCH=m
+CONFIG_FB_MATROX=m
+CONFIG_FB_MATROX_MILLENIUM=y
+CONFIG_FB_MATROX_MYSTIQUE=y
+CONFIG_FB_MATROX_G=y
+CONFIG_FB_MATROX_I2C=m
+CONFIG_FB_MATROX_MAVEN=m
+CONFIG_FB_RADEON=m
+CONFIG_FB_RADEON_I2C=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+# CONFIG_FB_RADEON_DEBUG is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_BACKLIGHT=y
+CONFIG_FB_S3=m
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
+CONFIG_FB_SIS=m
+CONFIG_FB_SIS_300=y
+CONFIG_FB_SIS_315=y
+CONFIG_FB_VIA=m
+# CONFIG_FB_VIA_DIRECT_PROCFS is not set
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_KYRO=m
+CONFIG_FB_3DFX=m
+# CONFIG_FB_3DFX_ACCEL is not set
+CONFIG_FB_3DFX_I2C=y
+CONFIG_FB_VOODOO1=m
+CONFIG_FB_VT8623=m
+CONFIG_FB_TRIDENT=m
+CONFIG_FB_ARK=m
+CONFIG_FB_PM3=m
+CONFIG_FB_CARMINE=m
+CONFIG_FB_CARMINE_DRAM_EVAL=y
+# CONFIG_CARMINE_DRAM_CUSTOM is not set
+CONFIG_FB_GEODE=y
+CONFIG_FB_GEODE_LX=m
+CONFIG_FB_GEODE_GX=m
+CONFIG_FB_GEODE_GX1=m
+CONFIG_FB_TMIO=m
+CONFIG_FB_TMIO_ACCELL=y
+CONFIG_FB_UDL=m
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_METRONOME=m
+CONFIG_FB_MB862XX=m
+CONFIG_FB_MB862XX_PCI_GDC=y
+CONFIG_FB_BROADSHEET=m
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_PLATFORM=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_GENERIC=m
+CONFIG_BACKLIGHT_PROGEAR=m
+CONFIG_BACKLIGHT_CARILLO_RANCH=m
+CONFIG_BACKLIGHT_MBP_NVIDIA=m
+CONFIG_BACKLIGHT_SAHARA=m
+CONFIG_BACKLIGHT_ADP8860=m
+CONFIG_BACKLIGHT_PCF50633=m
+
+#
+# Display device support
+#
+CONFIG_DISPLAY_SUPPORT=m
+
+#
+# Display hardware drivers
+#
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+CONFIG_VGACON_SOFT_SCROLLBACK=y
+CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+CONFIG_LOGO_LINUX_CLUT224=y
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_JACK=y
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_SEQUENCER_OSS=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_DYNAMIC_MINORS=y
+# CONFIG_SND_SUPPORT_OLD_API is not set
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_DMA_SGBUF=y
+CONFIG_SND_RAWMIDI_SEQ=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_VX_LIB=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_PCSP is not set
+CONFIG_SND_DUMMY=m
+CONFIG_SND_ALOOP=m
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+CONFIG_SND_SB_COMMON=m
+CONFIG_SND_SB16_DSP=m
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ALI5451=m
+CONFIG_SND_ASIHPI=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
+CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_CS5530=m
+CONFIG_SND_CS5535AUDIO=m
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_ES1968_INPUT=y
+CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
+CONFIG_SND_FM801_TEA575X=m
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+# CONFIG_SND_HDA_INPUT_BEEP is not set
+CONFIG_SND_HDA_INPUT_JACK=y
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_CODEC_REALTEK=y
+CONFIG_SND_HDA_CODEC_ANALOG=y
+CONFIG_SND_HDA_CODEC_SIGMATEL=y
+CONFIG_SND_HDA_CODEC_VIA=y
+CONFIG_SND_HDA_CODEC_HDMI=y
+CONFIG_SND_HDA_CODEC_CIRRUS=y
+CONFIG_SND_HDA_CODEC_CONEXANT=y
+CONFIG_SND_HDA_CODEC_CA0110=y
+CONFIG_SND_HDA_CODEC_CMEDIA=y
+CONFIG_SND_HDA_CODEC_SI3054=y
+CONFIG_SND_HDA_GENERIC=y
+# CONFIG_SND_HDA_POWER_SAVE is not set
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1712=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_LX6464ES=m
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MAESTRO3_INPUT=y
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
+CONFIG_SND_USB_US122L=m
+CONFIG_SND_PCMCIA=y
+CONFIG_SND_VXPOCKET=m
+CONFIG_SND_PDAUDIOCF=m
+# CONFIG_SND_SOC is not set
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=m
+CONFIG_HIDRAW=y
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# Special HID drivers
+#
+CONFIG_HID_3M_PCT=m
+CONFIG_HID_A4TECH=m
+CONFIG_HID_ACRUX=m
+CONFIG_HID_ACRUX_FF=m
+CONFIG_HID_APPLE=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_CANDO=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EMS_FF=m
+CONFIG_HID_EGALAX=m
+CONFIG_HID_ELECOM=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LOGITECH=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_LOGIWII_FF=y
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MOSART=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_QUANTA=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_ROCCAT_KONE=m
+CONFIG_HID_ROCCAT_KONEPLUS=m
+CONFIG_HID_ROCCAT_PYRA=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SONY=m
+CONFIG_HID_STANTUM=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_GREENASIA=m
+CONFIG_GREENASIA_FF=y
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_WACOM=m
+CONFIG_HID_WACOM_POWER_SUPPLY=y
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
+CONFIG_HID_ZYDACRON=m
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+CONFIG_USB_SUSPEND=y
+# CONFIG_USB_OTG is not set
+CONFIG_USB_MON=y
+CONFIG_USB_WUSB=m
+CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_C67X00_HCD=y
+CONFIG_USB_XHCI_HCD=y
+# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_OXU210HP_HCD=y
+CONFIG_USB_ISP116X_HCD=y
+CONFIG_USB_ISP1760_HCD=y
+CONFIG_USB_ISP1362_HCD=y
+CONFIG_USB_OHCI_HCD=y
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_UHCI_HCD=y
+CONFIG_USB_U132_HCD=m
+CONFIG_USB_SL811_HCD=y
+CONFIG_USB_SL811_CS=m
+CONFIG_USB_R8A66597_HCD=y
+CONFIG_USB_WHCI_HCD=m
+CONFIG_USB_HWA_HCD=m
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_DATAFAB=y
+CONFIG_USB_STORAGE_FREECOM=y
+CONFIG_USB_STORAGE_ISD200=y
+CONFIG_USB_STORAGE_USBAT=y
+CONFIG_USB_STORAGE_SDDR09=y
+CONFIG_USB_STORAGE_SDDR55=y
+CONFIG_USB_STORAGE_JUMPSHOT=y
+CONFIG_USB_STORAGE_ALAUDA=y
+CONFIG_USB_STORAGE_ONETOUCH=y
+CONFIG_USB_STORAGE_KARMA=y
+CONFIG_USB_STORAGE_CYPRESS_ATACB=y
+CONFIG_USB_UAS=m
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+
+#
+# USB port drivers
+#
+CONFIG_USB_USS720=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_EZUSB=y
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_FUNSOFT=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MOTOROLA=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_HP4X=m
+CONFIG_USB_SERIAL_SAFE=m
+CONFIG_USB_SERIAL_SAFE_PADDED=y
+CONFIG_USB_SERIAL_SAMBA=m
+CONFIG_USB_SERIAL_SIEMENS_MPI=m
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
+CONFIG_USB_SERIAL_ZIO=m
+CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_DEBUG=m
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_RIO500=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_LED=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_FTDI_ELAN=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_SISUSBVGA_CON=y
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_YUREX=m
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+# CONFIG_USB_GADGET is not set
+
+#
+# OTG and related infrastructure
+#
+CONFIG_USB_OTG_UTILS=y
+CONFIG_USB_GPIO_VBUS=m
+CONFIG_NOP_USB_XCEIV=m
+CONFIG_UWB=m
+CONFIG_UWB_HWA=m
+CONFIG_UWB_WHCI=m
+CONFIG_UWB_I1480U=m
+CONFIG_MMC=m
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+# CONFIG_MMC_CLKGATE is not set
+
+#
+# MMC/SD/SDIO Card Drivers
+#
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_MINORS=8
+CONFIG_MMC_BLOCK_BOUNCE=y
+CONFIG_SDIO_UART=m
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_WBSD=m
+CONFIG_MMC_TIFM_SD=m
+CONFIG_MMC_SDRICOH_CS=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_USHC=m
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+CONFIG_LEDS_NET5501=m
+CONFIG_LEDS_ALIX2=m
+CONFIG_LEDS_PCA9532=m
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GPIO_PLATFORM=y
+CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP5521=m
+CONFIG_LEDS_LP5523=m
+CONFIG_LEDS_CLEVO_MAIL=m
+CONFIG_LEDS_PCA955X=m
+CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_INTEL_SS4200=m
+CONFIG_LEDS_LT3593=m
+CONFIG_LEDS_DELL_NETBOOKS=m
+CONFIG_LEDS_TRIGGERS=y
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+# CONFIG_NFC_DEVICES is not set
+CONFIG_ACCESSIBILITY=y
+CONFIG_A11Y_BRAILLE_CONSOLE=y
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_USER_MEM=y
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_MTHCA=m
+CONFIG_INFINIBAND_MTHCA_DEBUG=y
+# CONFIG_INFINIBAND_IPATH is not set
+CONFIG_INFINIBAND_QIB=m
+CONFIG_INFINIBAND_AMSO1100=m
+# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
+# CONFIG_INFINIBAND_CXGB3 is not set
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_INFINIBAND_NES=m
+# CONFIG_INFINIBAND_NES_DEBUG is not set
+CONFIG_INFINIBAND_IPOIB=m
+# CONFIG_INFINIBAND_IPOIB_CM is not set
+CONFIG_INFINIBAND_IPOIB_DEBUG=y
+# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_EDAC=y
+
+#
+# Reporting subsystems
+#
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_DECODE_MCE=y
+CONFIG_EDAC_MCE_INJ=m
+# CONFIG_EDAC_MM_EDAC is not set
+CONFIG_RTC_LIB=m
+CONFIG_RTC_CLASS=m
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+CONFIG_RTC_DRV_TEST=m
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_ISL12022=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_PCF50633=m
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_INTEL_MID_DMAC=m
+CONFIG_INTEL_IOATDMA=m
+CONFIG_TIMB_DMA=m
+CONFIG_PCH_DMA=m
+CONFIG_DMA_ENGINE=y
+
+#
+# DMA Clients
+#
+CONFIG_NET_DMA=y
+# CONFIG_ASYNC_TX_DMA is not set
+CONFIG_DMATEST=m
+CONFIG_DCA=m
+CONFIG_AUXDISPLAY=y
+# CONFIG_KS0108 is not set
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_PDRV=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+CONFIG_STAGING=y
+# CONFIG_STAGING_EXCLUDE_BUILD is not set
+# CONFIG_ET131X is not set
+# CONFIG_SLICOSS is not set
+# CONFIG_VIDEO_GO7007 is not set
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=m
+CONFIG_USB_DABUSB=m
+CONFIG_USB_SE401=m
+CONFIG_VIDEO_USBVIDEO=m
+CONFIG_USB_VICAM=m
+# CONFIG_USB_IP_COMMON is not set
+# CONFIG_W35UND is not set
+# CONFIG_PRISM2_USB is not set
+# CONFIG_ECHO is not set
+CONFIG_BRCM80211=m
+CONFIG_BRCM80211_PCI=y
+# CONFIG_BRCMFMAC is not set
+CONFIG_RT2860=m
+CONFIG_RT2870=m
+# CONFIG_COMEDI is not set
+# CONFIG_ASUS_OLED is not set
+# CONFIG_PANEL is not set
+CONFIG_R8187SE=m
+CONFIG_RTL8192U=m
+CONFIG_RTL8192E=m
+CONFIG_R8712U=m
+# CONFIG_R8712_AP is not set
+# CONFIG_TRANZPORT is not set
+CONFIG_POHMELFS=m
+# CONFIG_POHMELFS_DEBUG is not set
+CONFIG_POHMELFS_CRYPTO=y
+CONFIG_AUTOFS_FS=m
+CONFIG_IDE_PHISON=m
+CONFIG_LINE6_USB=m
+# CONFIG_LINE6_USB_DEBUG is not set
+# CONFIG_LINE6_USB_DUMP_CTRL is not set
+# CONFIG_LINE6_USB_DUMP_MIDI is not set
+# CONFIG_LINE6_USB_DUMP_PCM is not set
+# CONFIG_LINE6_USB_RAW is not set
+# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
+CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_NOUVEAU=m
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+CONFIG_DRM_NOUVEAU_DEBUG=y
+
+#
+# I2C encoder or helper chips
+#
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+CONFIG_USB_SERIAL_QUATECH2=m
+CONFIG_USB_SERIAL_QUATECH_USB2=m
+CONFIG_VT6655=m
+CONFIG_VT6656=m
+# CONFIG_HYPERV is not set
+# CONFIG_VME_BUS is not set
+CONFIG_DX_SEP=m
+# CONFIG_IIO is not set
+CONFIG_ZRAM=m
+CONFIG_WLAGS49_H2=m
+CONFIG_WLAGS49_H25=m
+CONFIG_SAMSUNG_LAPTOP=m
+CONFIG_FB_SM7XX=m
+CONFIG_VIDEO_DT3155=m
+CONFIG_DT3155_CCIR=y
+CONFIG_CRYSTALHD=m
+# CONFIG_CXT1E1 is not set
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_ST_BT=m
+CONFIG_FB_XGI=m
+CONFIG_LIRC_STAGING=y
+CONFIG_LIRC_BT829=m
+CONFIG_LIRC_IGORPLUGUSB=m
+CONFIG_LIRC_IMON=m
+CONFIG_LIRC_IT87=m
+CONFIG_LIRC_ITE8709=m
+CONFIG_LIRC_PARALLEL=m
+CONFIG_LIRC_SASEM=m
+CONFIG_LIRC_SERIAL=m
+CONFIG_LIRC_SERIAL_TRANSMITTER=y
+CONFIG_LIRC_SIR=m
+CONFIG_LIRC_TTUSBIR=m
+CONFIG_LIRC_ZILOG=m
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
+CONFIG_EASYCAP=m
+CONFIG_SOLO6X10=m
+CONFIG_ACPI_QUICKSTART=m
+CONFIG_MACH_NO_WESTBRIDGE=y
+CONFIG_SBE_2T3E3=m
+CONFIG_ATH6K_LEGACY=m
+CONFIG_AR600x_SD31_XXX=y
+# CONFIG_AR600x_WB31_XXX is not set
+# CONFIG_AR600x_SD32_XXX is not set
+# CONFIG_AR600x_CUSTOM_XXX is not set
+# CONFIG_ATH6KL_ENABLE_COEXISTENCE is not set
+# CONFIG_ATH6KL_HCI_BRIDGE is not set
+# CONFIG_ATH6KL_CFG80211 is not set
+# CONFIG_ATH6KL_HTC_RAW_INTERFACE is not set
+# CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER is not set
+# CONFIG_ATH6KL_SKIP_ABI_VERSION_CHECK is not set
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_USB_ENESTORAGE is not set
+# CONFIG_BCM_WIMAX is not set
+# CONFIG_FT1000 is not set
+
+#
+# Speakup console speech
+#
+CONFIG_SPEAKUP=y
+CONFIG_SPEAKUP_SYNTH_ACNTSA=y
+CONFIG_SPEAKUP_SYNTH_ACNTPC=y
+CONFIG_SPEAKUP_SYNTH_APOLLO=y
+CONFIG_SPEAKUP_SYNTH_AUDPTR=y
+CONFIG_SPEAKUP_SYNTH_BNS=y
+CONFIG_SPEAKUP_SYNTH_DECTLK=y
+CONFIG_SPEAKUP_SYNTH_DECEXT=y
+CONFIG_SPEAKUP_SYNTH_DECPC=m
+CONFIG_SPEAKUP_SYNTH_DTLK=y
+CONFIG_SPEAKUP_SYNTH_KEYPC=y
+CONFIG_SPEAKUP_SYNTH_LTLK=y
+CONFIG_SPEAKUP_SYNTH_SOFT=y
+CONFIG_SPEAKUP_SYNTH_SPKOUT=y
+CONFIG_SPEAKUP_SYNTH_TXPRT=y
+CONFIG_SPEAKUP_SYNTH_DUMMY=y
+CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
+CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
+CONFIG_X86_PLATFORM_DEVICES=y
+CONFIG_ACER_WMI=m
+CONFIG_ACERHDF=m
+CONFIG_ASUS_LAPTOP=m
+CONFIG_DELL_LAPTOP=m
+CONFIG_DELL_WMI=m
+CONFIG_FUJITSU_LAPTOP=m
+# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
+CONFIG_HP_WMI=m
+CONFIG_MSI_LAPTOP=m
+CONFIG_PANASONIC_LAPTOP=m
+CONFIG_COMPAL_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
+CONFIG_SONYPI_COMPAT=y
+CONFIG_IDEAPAD_LAPTOP=m
+CONFIG_THINKPAD_ACPI=m
+CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
+# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
+# CONFIG_THINKPAD_ACPI_DEBUG is not set
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
+CONFIG_THINKPAD_ACPI_VIDEO=y
+CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+CONFIG_SENSORS_HDAPS=m
+CONFIG_INTEL_MENLOW=m
+CONFIG_EEEPC_LAPTOP=m
+CONFIG_EEEPC_WMI=m
+CONFIG_ACPI_WMI=m
+CONFIG_MSI_WMI=m
+CONFIG_ACPI_ASUS=m
+CONFIG_TOPSTAR_LAPTOP=m
+CONFIG_ACPI_TOSHIBA=m
+CONFIG_TOSHIBA_BT_RFKILL=m
+CONFIG_ACPI_CMPC=m
+CONFIG_INTEL_IPS=m
+# CONFIG_IBM_RTL is not set
+
+#
+# Firmware Drivers
+#
+CONFIG_EDD=m
+CONFIG_EDD_OFF=y
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_EFI_VARS=m
+CONFIG_DELL_RBU=m
+CONFIG_DCDBAS=m
+CONFIG_DMIID=y
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
+CONFIG_EXT3_FS_XATTR=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_FS_XATTR=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_JBD2=y
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+CONFIG_REISERFS_FS=y
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=y
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_XFS_FS=y
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=y
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=y
+CONFIG_OCFS2_FS_O2CB=y
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=y
+# CONFIG_OCFS2_FS_STATS is not set
+CONFIG_OCFS2_DEBUG_MASKLOG=y
+# CONFIG_OCFS2_DEBUG_FS is not set
+CONFIG_BTRFS_FS=y
+CONFIG_BTRFS_FS_POSIX_ACL=y
+CONFIG_NILFS2_FS=m
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=y
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=y
+CONFIG_QUOTACTL=y
+CONFIG_QUOTACTL_COMPAT=y
+CONFIG_AUTOFS4_FS=m
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_GENERIC_ACL=y
+
+#
+# Caches
+#
+CONFIG_FSCACHE=m
+# CONFIG_FSCACHE_STATS is not set
+# CONFIG_FSCACHE_HISTOGRAM is not set
+# CONFIG_FSCACHE_DEBUG is not set
+# CONFIG_FSCACHE_OBJECT_LIST is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_HISTOGRAM is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=y
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=y
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=y
+# CONFIG_NTFS_DEBUG is not set
+CONFIG_NTFS_RW=y
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_CONFIGFS_FS=y
+CONFIG_MISC_FILESYSTEMS=y
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+CONFIG_AFFS_FS=m
+# CONFIG_ECRYPT_FS is not set
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+CONFIG_BFS_FS=m
+CONFIG_EFS_FS=m
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_UBIFS_FS=m
+CONFIG_UBIFS_FS_XATTR=y
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+# CONFIG_UBIFS_FS_DEBUG is not set
+CONFIG_LOGFS=m
+CONFIG_CRAMFS=m
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_SQUASHFS_EMBEDDED=y
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+CONFIG_VXFS_FS=m
+CONFIG_MINIX_FS=m
+CONFIG_OMFS_FS=m
+CONFIG_HPFS_FS=m
+CONFIG_QNX4FS_FS=m
+CONFIG_ROMFS_FS=y
+CONFIG_ROMFS_BACKED_BY_BLOCK=y
+CONFIG_ROMFS_ON_BLOCK=y
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+CONFIG_EXOFS_FS=m
+# CONFIG_EXOFS_DEBUG is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V4=y
+# CONFIG_NFS_V4_1 is not set
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+# CONFIG_NFS_USE_NEW_IDMAPPER is not set
+CONFIG_NFSD=y
+CONFIG_NFSD_DEPRECATED=y
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+CONFIG_NFSD_V4=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+CONFIG_SUNRPC_XPRT_RDMA=m
+CONFIG_RPCSEC_GSS_KRB5=y
+CONFIG_CEPH_FS=m
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+CONFIG_CIFS_WEAK_PW_HASH=y
+# CONFIG_CIFS_UPCALL is not set
+# CONFIG_CIFS_XATTR is not set
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_DFS_UPCALL is not set
+CONFIG_CIFS_FSCACHE=y
+# CONFIG_CIFS_EXPERIMENTAL is not set
+CONFIG_NCP_FS=m
+CONFIG_NCPFS_PACKET_SIGNING=y
+CONFIG_NCPFS_IOCTL_LOCKING=y
+CONFIG_NCPFS_STRONG=y
+CONFIG_NCPFS_NFS_NS=y
+CONFIG_NCPFS_OS2_NS=y
+CONFIG_NCPFS_SMALLDOS=y
+CONFIG_NCPFS_NLS=y
+CONFIG_NCPFS_EXTRAS=y
+CONFIG_CODA_FS=m
+CONFIG_AFS_FS=m
+# CONFIG_AFS_DEBUG is not set
+# CONFIG_AFS_FSCACHE is not set
+CONFIG_9P_FS=m
+# CONFIG_9P_FSCACHE is not set
+# CONFIG_9P_FS_POSIX_ACL is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+CONFIG_OSF_PARTITION=y
+CONFIG_AMIGA_PARTITION=y
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_UNIXWARE_DISKLABEL=y
+# CONFIG_LDM_PARTITION is not set
+CONFIG_SGI_PARTITION=y
+# CONFIG_ULTRIX_PARTITION is not set
+CONFIG_SUN_PARTITION=y
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_UTF8=y
+CONFIG_DLM=y
+# CONFIG_DLM_DEBUG is not set
+
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_PRINTK_TIME=y
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=0
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_STRIP_ASM_SYMS=y
+CONFIG_UNUSED_SYMBOLS=y
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+# CONFIG_LOCKUP_DETECTOR is not set
+# CONFIG_HARDLOCKUP_DETECTOR is not set
+CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+CONFIG_TIMER_STATS=y
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+CONFIG_BKL=y
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+CONFIG_STACKTRACE=y
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# CONFIG_LKDTM is not set
+CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_LATENCYTOP is not set
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FTRACE_NMI_ENTER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
+CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_RING_BUFFER=y
+CONFIG_FTRACE_NMI_ENTER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_FTRACE_SYSCALLS is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+# CONFIG_STACK_TRACER is not set
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_DYNAMIC_FTRACE=y
+# CONFIG_FUNCTION_PROFILER is not set
+CONFIG_FTRACE_MCOUNT_RECORD=y
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_MMIOTRACE is not set
+CONFIG_RING_BUFFER_BENCHMARK=m
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_DMA_API_DEBUG is not set
+CONFIG_ATOMIC64_SELFTEST=y
+CONFIG_ASYNC_RAID6_TEST=m
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+CONFIG_HAVE_ARCH_KMEMCHECK=y
+# CONFIG_TEST_KSTRTOX is not set
+CONFIG_STRICT_DEVMEM=y
+CONFIG_X86_VERBOSE_BOOTUP=y
+CONFIG_EARLY_PRINTK=y
+# CONFIG_EARLY_PRINTK_DBGP is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_X86_PTDUMP is not set
+CONFIG_DEBUG_RODATA=y
+CONFIG_DEBUG_RODATA_TEST=y
+# CONFIG_DEBUG_SET_MODULE_RONX is not set
+# CONFIG_DEBUG_NX_TEST is not set
+# CONFIG_IOMMU_DEBUG is not set
+# CONFIG_IOMMU_STRESS is not set
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+CONFIG_IO_DELAY_TYPE_0X80=0
+CONFIG_IO_DELAY_TYPE_0XED=1
+CONFIG_IO_DELAY_TYPE_UDELAY=2
+CONFIG_IO_DELAY_TYPE_NONE=3
+CONFIG_IO_DELAY_0X80=y
+# CONFIG_IO_DELAY_0XED is not set
+# CONFIG_IO_DELAY_UDELAY is not set
+# CONFIG_IO_DELAY_NONE is not set
+CONFIG_DEFAULT_IO_DELAY_TYPE=0
+# CONFIG_DEBUG_BOOT_PARAMS is not set
+# CONFIG_CPA_DEBUG is not set
+CONFIG_OPTIMIZE_INLINING=y
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+CONFIG_TRUSTED_KEYS=m
+CONFIG_ENCRYPTED_KEYS=m
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
+CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_NETWORK_XFRM=y
+# CONFIG_SECURITY_PATH is not set
+# CONFIG_SECURITY_SELINUX is not set
+# CONFIG_SECURITY_TOMOYO is not set
+# CONFIG_SECURITY_APPARMOR is not set
+# CONFIG_IMA is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_XOR_BLOCKS=y
+CONFIG_ASYNC_CORE=y
+CONFIG_ASYNC_MEMCPY=y
+CONFIG_ASYNC_XOR=y
+CONFIG_ASYNC_PQ=y
+CONFIG_ASYNC_RAID6_RECOV=y
+CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
+CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=m
+CONFIG_CRYPTO_PCOMP2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_WORKQUEUE=y
+CONFIG_CRYPTO_CRYPTD=y
+CONFIG_CRYPTO_AUTHENC=y
+CONFIG_CRYPTO_TEST=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_SEQIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_LRW=y
+CONFIG_CRYPTO_PCBC=y
+CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_FPU=y
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=y
+CONFIG_CRYPTO_VMAC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_MD4=y
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=y
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_TGR192=y
+CONFIG_CRYPTO_WP512=y
+CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_X86_64=y
+CONFIG_CRYPTO_AES_NI_INTEL=y
+CONFIG_CRYPTO_ANUBIS=y
+CONFIG_CRYPTO_ARC4=y
+CONFIG_CRYPTO_BLOWFISH=y
+CONFIG_CRYPTO_CAMELLIA=y
+CONFIG_CRYPTO_CAST5=y
+CONFIG_CRYPTO_CAST6=y
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_FCRYPT=y
+CONFIG_CRYPTO_KHAZAD=y
+CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_SALSA20_X86_64=m
+CONFIG_CRYPTO_SEED=y
+CONFIG_CRYPTO_SERPENT=y
+CONFIG_CRYPTO_TEA=y
+CONFIG_CRYPTO_TWOFISH=y
+CONFIG_CRYPTO_TWOFISH_COMMON=y
+CONFIG_CRYPTO_TWOFISH_X86_64=y
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_ZLIB=m
+CONFIG_CRYPTO_LZO=m
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_CRYPTO_DEV_HIFN_795X=m
+CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+CONFIG_HAVE_KVM=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_APIC_ARCHITECTURE=y
+CONFIG_KVM_MMIO=y
+CONFIG_KVM_ASYNC_PF=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
+CONFIG_KVM_MMU_AUDIT=y
+CONFIG_VHOST_NET=m
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_RING=m
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=y
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=m
+CONFIG_CRC_ITU_T=y
+CONFIG_CRC32=y
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=y
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_BCJ=y
+# CONFIG_XZ_DEC_TEST is not set
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_BTREE=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_CHECK_SIGNATURE=y
+CONFIG_NLATTR=y
+CONFIG_LRU_CACHE=m
+CONFIG_AVERAGE=y
diff --git a/testing/source/linux-2.6.39-rc4-configs/config-generic-2.6.39-rc4 b/testing/source/linux-2.6.39-rc4-configs/config-generic-2.6.39-rc4
new file mode 100644
index 00000000..2fcb5c64
--- /dev/null
+++ b/testing/source/linux-2.6.39-rc4-configs/config-generic-2.6.39-rc4
@@ -0,0 +1,5247 @@
+#
+# Automatically generated make config: don't edit
+# Linux/x86_64 2.6.39-rc4 Kernel Configuration
+# Tue Apr 19 13:15:01 2011
+#
+CONFIG_64BIT=y
+# CONFIG_X86_32 is not set
+CONFIG_X86_64=y
+CONFIG_X86=y
+CONFIG_INSTRUCTION_DECODER=y
+CONFIG_OUTPUT_FORMAT="elf64-x86-64"
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_MMU=y
+CONFIG_ZONE_DMA=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_DEFAULT_IDLE=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ZONE_DMA32=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_AUDIT_ARCH=y
+CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_X86_64_SMP=y
+CONFIG_X86_HT=y
+CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
+# CONFIG_KTIME_SCALAR is not set
+CONFIG_ARCH_CPU_PROBE_RELEASE=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_CONSTRUCTORS=y
+CONFIG_HAVE_IRQ_WORK=y
+CONFIG_IRQ_WORK=y
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_CROSS_COMPILE=""
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_LZO=y
+# CONFIG_KERNEL_GZIP is not set
+# CONFIG_KERNEL_BZIP2 is not set
+CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_XZ is not set
+# CONFIG_KERNEL_LZO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+# CONFIG_FHANDLE is not set
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_AUDIT=y
+CONFIG_AUDITSYSCALL=y
+CONFIG_AUDIT_WATCH=y
+CONFIG_AUDIT_TREE=y
+CONFIG_HAVE_GENERIC_HARDIRQS=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_HAVE_SPARSE_IRQ=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_IRQ_FORCED_THREADING=y
+# CONFIG_SPARSE_IRQ is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_PREEMPT_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_RCU_FAST_NO_HZ is not set
+# CONFIG_TREE_RCU_TRACE is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=15
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+CONFIG_CGROUPS=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_CGROUP_NS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_RESOURCE_COUNTERS=y
+CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_RT_GROUP_SCHED=y
+CONFIG_BLK_CGROUP=y
+# CONFIG_DEBUG_BLK_CGROUP is not set
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_SCHED_AUTOGROUP=y
+CONFIG_MM_OWNER=y
+# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+# CONFIG_EXPERT is not set
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_HAVE_PERF_EVENTS=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_PERF_COUNTERS is not set
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_PCI_QUIRKS=y
+CONFIG_SLUB_DEBUG=y
+CONFIG_COMPAT_BRK=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+CONFIG_OPROFILE=m
+# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+# CONFIG_JUMP_LABEL is not set
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_STOP_MACHINE=y
+CONFIG_BLOCK=y
+CONFIG_BLK_DEV_BSG=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
+CONFIG_BLK_DEV_THROTTLING=y
+CONFIG_BLOCK_COMPAT=y
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_CFQ_GROUP_IOSCHED=y
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_PADATA=y
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_FREEZER=y
+
+#
+# Processor type and features
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_SMP=y
+CONFIG_X86_MPPARSE=y
+# CONFIG_X86_EXTENDED_PLATFORM is not set
+CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+# CONFIG_PARAVIRT_GUEST is not set
+CONFIG_NO_BOOTMEM=y
+CONFIG_MEMTEST=y
+# CONFIG_MK8 is not set
+# CONFIG_MPSC is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
+CONFIG_GENERIC_CPU=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_CMPXCHG=y
+CONFIG_CMPXCHG_LOCAL=y
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_XADD=y
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_TSC=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=64
+CONFIG_X86_DEBUGCTLMSR=y
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_DMI=y
+CONFIG_GART_IOMMU=y
+# CONFIG_CALGARY_IOMMU is not set
+# CONFIG_AMD_IOMMU is not set
+CONFIG_SWIOTLB=y
+CONFIG_IOMMU_HELPER=y
+# CONFIG_IOMMU_API is not set
+# CONFIG_MAXSMP is not set
+CONFIG_NR_CPUS=32
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_MCE=y
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_AMD=y
+CONFIG_X86_MCE_THRESHOLD=y
+CONFIG_X86_MCE_INJECT=m
+CONFIG_X86_THERMAL_VECTOR=y
+CONFIG_I8K=m
+CONFIG_MICROCODE=m
+CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_AMD=y
+CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=m
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_DIRECT_GBPAGES=y
+# CONFIG_NUMA is not set
+CONFIG_ARCH_PROC_KCORE_TEXT=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_MEMORY_PROBE=y
+CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_HAVE_MEMORY_PRESENT=y
+CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
+CONFIG_SPARSEMEM_VMEMMAP=y
+CONFIG_HAVE_MEMBLOCK=y
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_SPARSE=y
+CONFIG_MEMORY_HOTREMOVE=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_COMPACTION=y
+CONFIG_MIGRATION=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_MMU_NOTIFIER=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=98304
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+# CONFIG_MEMORY_FAILURE is not set
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
+CONFIG_X86_RESERVE_LOW=64
+CONFIG_MTRR=y
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
+CONFIG_X86_PAT=y
+CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_EFI=y
+CONFIG_SECCOMP=y
+CONFIG_CC_STACKPROTECTOR=y
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
+CONFIG_HZ_1000=y
+CONFIG_HZ=1000
+CONFIG_SCHED_HRTICK=y
+# CONFIG_KEXEC is not set
+# CONFIG_CRASH_DUMP is not set
+CONFIG_PHYSICAL_START=0x1000000
+# CONFIG_RELOCATABLE is not set
+CONFIG_PHYSICAL_ALIGN=0x1000000
+CONFIG_HOTPLUG_CPU=y
+CONFIG_COMPAT_VDSO=y
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+
+#
+# Power management and ACPI options
+#
+CONFIG_ARCH_HIBERNATION_HEADER=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+CONFIG_HIBERNATE_CALLBACKS=y
+CONFIG_HIBERNATION=y
+CONFIG_PM_STD_PARTITION="\"\""
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_ACPI=y
+CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_PROCFS=y
+CONFIG_ACPI_PROCFS_POWER=y
+CONFIG_ACPI_POWER_METER=m
+CONFIG_ACPI_EC_DEBUGFS=m
+CONFIG_ACPI_PROC_EVENT=y
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=m
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_PROCESSOR=m
+CONFIG_ACPI_IPMI=m
+CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
+CONFIG_ACPI_THERMAL=m
+# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_BLACKLIST_YEAR=0
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_PCI_SLOT=m
+CONFIG_X86_PM_TIMER=y
+CONFIG_ACPI_CONTAINER=m
+CONFIG_ACPI_HOTPLUG_MEMORY=m
+CONFIG_ACPI_SBS=m
+CONFIG_ACPI_HED=m
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=m
+CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_APEI_EINJ=m
+CONFIG_ACPI_APEI_ERST_DEBUG=m
+CONFIG_SFI=y
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=m
+# CONFIG_CPU_FREQ_DEBUG is not set
+CONFIG_CPU_FREQ_STAT=m
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=m
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+
+#
+# CPUFreq processor drivers
+#
+CONFIG_X86_PCC_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_SPEEDSTEP_CENTRINO=m
+CONFIG_X86_P4_CLOCKMOD=m
+
+#
+# shared options
+#
+CONFIG_X86_SPEEDSTEP_LIB=m
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_INTEL_IDLE=y
+
+#
+# Memory power savings
+#
+CONFIG_I7300_IDLE_IOAT_CHANNEL=y
+CONFIG_I7300_IDLE=m
+
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_DOMAINS=y
+# CONFIG_PCI_CNB20LE_QUIRK is not set
+# CONFIG_DMAR is not set
+# CONFIG_INTR_REMAP is not set
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=m
+CONFIG_PCIEAER=y
+# CONFIG_PCIE_ECRC is not set
+CONFIG_PCIEAER_INJECT=m
+CONFIG_PCIEASPM=y
+# CONFIG_PCIEASPM_DEBUG is not set
+CONFIG_PCIE_PME=y
+CONFIG_ARCH_SUPPORTS_MSI=y
+CONFIG_PCI_MSI=y
+# CONFIG_PCI_DEBUG is not set
+CONFIG_PCI_STUB=m
+CONFIG_HT_IRQ=y
+# CONFIG_PCI_IOV is not set
+CONFIG_PCI_IOAPIC=y
+CONFIG_ISA_DMA_API=y
+CONFIG_AMD_NB=y
+CONFIG_PCCARD=m
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_PCCARD_NONSTATIC=y
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_FAKE=m
+CONFIG_HOTPLUG_PCI_ACPI=m
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
+# CONFIG_HOTPLUG_PCI_CPCI is not set
+CONFIG_HOTPLUG_PCI_SHPC=m
+# CONFIG_RAPIDIO is not set
+
+#
+# Executable file formats / Emulations
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_COMPAT_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_HAVE_AOUT is not set
+CONFIG_BINFMT_MISC=m
+CONFIG_IA32_EMULATION=y
+# CONFIG_IA32_AOUT is not set
+CONFIG_COMPAT=y
+CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
+CONFIG_SYSVIPC_COMPAT=y
+CONFIG_KEYS_COMPAT=y
+CONFIG_HAVE_TEXT_POKE_SMP=y
+CONFIG_NET=y
+CONFIG_COMPAT_NETLINK_MESSAGES=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=y
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+# CONFIG_NET_KEY_MIGRATE is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+# CONFIG_IP_FIB_TRIE_STATS is not set
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_INET_LRO=y
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=m
+CONFIG_IPV6_PRIVACY=y
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_SIT_6RD is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_NETLABEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+# CONFIG_NF_CONNTRACK_EVENTS is not set
+# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
+CONFIG_NF_CT_PROTO_DCCP=m
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_TPROXY=m
+CONFIG_NETFILTER_XTABLES=m
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+CONFIG_NETFILTER_XT_SET=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+# CONFIG_IP_VS_IPV6 is not set
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_NFCT=y
+CONFIG_IP_VS_PE_SIP=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_DCCP=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_QUEUE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+
+#
+# DECnet: Netfilter Configuration
+#
+# CONFIG_DECNET_NF_GRABULATOR is not set
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_ULOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+# CONFIG_IP_DCCP_CCID3 is not set
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_MSG is not set
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_HMAC_NONE is not set
+# CONFIG_SCTP_HMAC_SHA1 is not set
+CONFIG_SCTP_HMAC_MD5=y
+CONFIG_RDS=m
+CONFIG_RDS_RDMA=m
+CONFIG_RDS_TCP=m
+# CONFIG_RDS_DEBUG is not set
+CONFIG_TIPC=m
+# CONFIG_TIPC_ADVANCED is not set
+# CONFIG_TIPC_DEBUG is not set
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_GARP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+# CONFIG_NET_DSA is not set
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_DECNET=m
+# CONFIG_DECNET_ROUTER is not set
+CONFIG_LLC=m
+CONFIG_LLC2=m
+CONFIG_IPX=m
+# CONFIG_IPX_INTERN is not set
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_IPDDP_DECAP=y
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+CONFIG_WAN_ROUTER=m
+# CONFIG_PHONET is not set
+CONFIG_IEEE802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_INGRESS=m
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=y
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=y
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+# CONFIG_NET_CLS_IND is not set
+CONFIG_NET_SCH_FIFO=y
+# CONFIG_DCB is not set
+CONFIG_DNS_RESOLVER=y
+CONFIG_BATMAN_ADV=m
+# CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_XPS=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NET_DROP_MONITOR is not set
+CONFIG_HAMRADIO=y
+
+#
+# Packet Radio protocols
+#
+CONFIG_AX25=m
+# CONFIG_AX25_DAMA_SLAVE is not set
+CONFIG_NETROM=m
+CONFIG_ROSE=m
+
+#
+# AX.25 network device drivers
+#
+CONFIG_MKISS=m
+CONFIG_6PACK=m
+CONFIG_BPQETHER=m
+CONFIG_BAYCOM_SER_FDX=m
+CONFIG_BAYCOM_SER_HDX=m
+CONFIG_BAYCOM_PAR=m
+CONFIG_YAM=m
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+
+#
+# CAN Device Drivers
+#
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_SLCAN=m
+CONFIG_CAN_DEV=m
+# CONFIG_CAN_CALC_BITTIMING is not set
+CONFIG_CAN_JANZ_ICAN3=m
+CONFIG_PCH_CAN=m
+CONFIG_CAN_SJA1000=m
+CONFIG_CAN_SJA1000_PLATFORM=m
+CONFIG_CAN_EMS_PCI=m
+CONFIG_CAN_KVASER_PCI=m
+CONFIG_CAN_PLX_PCI=m
+# CONFIG_CAN_C_CAN is not set
+
+#
+# CAN USB interfaces
+#
+CONFIG_CAN_EMS_USB=m
+CONFIG_CAN_ESD_USB2=m
+CONFIG_CAN_SOFTING=m
+CONFIG_CAN_SOFTING_CS=m
+# CONFIG_CAN_DEBUG_DEVICES is not set
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+# CONFIG_IRDA_ULTRA is not set
+
+#
+# IrDA options
+#
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+# CONFIG_IRDA_DEBUG is not set
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+CONFIG_IRTTY_SIR=m
+
+#
+# Dongle support
+#
+CONFIG_DONGLE=y
+CONFIG_ESI_DONGLE=m
+CONFIG_ACTISYS_DONGLE=m
+CONFIG_TEKRAM_DONGLE=m
+CONFIG_TOIM3232_DONGLE=m
+CONFIG_LITELINK_DONGLE=m
+CONFIG_MA600_DONGLE=m
+CONFIG_GIRBIL_DONGLE=m
+CONFIG_MCP2120_DONGLE=m
+CONFIG_OLD_BELKIN_DONGLE=m
+CONFIG_ACT200L_DONGLE=m
+CONFIG_KINGSUN_DONGLE=m
+CONFIG_KSDAZZLE_DONGLE=m
+CONFIG_KS959_DONGLE=m
+
+#
+# FIR device drivers
+#
+CONFIG_USB_IRDA=m
+CONFIG_SIGMATEL_FIR=m
+CONFIG_NSC_FIR=m
+CONFIG_WINBOND_FIR=m
+CONFIG_SMC_IRCC_FIR=m
+CONFIG_ALI_FIR=m
+CONFIG_VLSI_FIR=m
+CONFIG_VIA_FIR=m
+CONFIG_MCS_FIR=m
+CONFIG_BT=m
+CONFIG_BT_L2CAP=y
+CONFIG_BT_SCO=y
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIBTUART=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_BT_WILINK=m
+CONFIG_AF_RXRPC=m
+# CONFIG_AF_RXRPC_DEBUG is not set
+CONFIG_RXKAD=m
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_REG_DEBUG is not set
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+# CONFIG_CFG80211_INTERNAL_REGDB is not set
+CONFIG_CFG80211_WEXT=y
+CONFIG_WIRELESS_EXT_SYSFS=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_MINSTREL_HT=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+CONFIG_NET_9P_RDMA=m
+# CONFIG_NET_9P_DEBUG is not set
+# CONFIG_CAIF is not set
+CONFIG_CEPH_LIB=m
+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+CONFIG_ARCH_NO_SYSDEV_OPS=y
+CONFIG_CONNECTOR=m
+CONFIG_MTD=m
+# CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_TESTS=m
+CONFIG_MTD_PARTITIONS=y
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+CONFIG_MTD_AR7_PARTS=m
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=m
+CONFIG_HAVE_MTD_OTP=y
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+CONFIG_FTL=m
+CONFIG_NFTL=m
+CONFIG_NFTL_RW=y
+CONFIG_INFTL=m
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
+CONFIG_SM_FTL=m
+CONFIG_MTD_OOPS=m
+CONFIG_MTD_SWAP=m
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_GEN_PROBE=m
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+CONFIG_MTD_MAP_BANK_WIDTH_8=y
+CONFIG_MTD_MAP_BANK_WIDTH_16=y
+CONFIG_MTD_MAP_BANK_WIDTH_32=y
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+CONFIG_MTD_CFI_I4=y
+CONFIG_MTD_CFI_I8=y
+CONFIG_MTD_OTP=y
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_CFI_UTIL=m
+CONFIG_MTD_RAM=m
+CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_PHYSMAP=m
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+CONFIG_MTD_SC520CDP=m
+CONFIG_MTD_NETSC520=m
+CONFIG_MTD_TS5500=m
+CONFIG_MTD_SBC_GXX=m
+CONFIG_MTD_AMD76XROM=m
+CONFIG_MTD_ICHXROM=m
+CONFIG_MTD_ESB2ROM=m
+CONFIG_MTD_CK804XROM=m
+CONFIG_MTD_SCB2_FLASH=m
+CONFIG_MTD_NETtel=m
+CONFIG_MTD_L440GX=m
+CONFIG_MTD_PCI=m
+CONFIG_MTD_PCMCIA=m
+# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
+CONFIG_MTD_GPIO_ADDR=m
+CONFIG_MTD_INTEL_VR_NOR=m
+CONFIG_MTD_PLATRAM=m
+CONFIG_MTD_LATCH_ADDR=m
+
+#
+# Self-contained MTD device drivers
+#
+CONFIG_MTD_PMC551=m
+CONFIG_MTD_PMC551_BUGFIX=y
+# CONFIG_MTD_PMC551_DEBUG is not set
+CONFIG_MTD_SLRAM=m
+CONFIG_MTD_PHRAM=m
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=4096
+CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTD_BLOCK2MTD=m
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+CONFIG_MTD_DOC2001PLUS=m
+CONFIG_MTD_DOCPROBE=m
+CONFIG_MTD_DOCECC=m
+CONFIG_MTD_DOCPROBE_ADVANCED=y
+CONFIG_MTD_DOCPROBE_ADDRESS=0x0000
+CONFIG_MTD_DOCPROBE_HIGH=y
+CONFIG_MTD_DOCPROBE_55AA=y
+CONFIG_MTD_NAND_ECC=m
+CONFIG_MTD_NAND_ECC_SMC=y
+CONFIG_MTD_NAND=m
+CONFIG_MTD_NAND_VERIFY_WRITE=y
+CONFIG_MTD_NAND_BCH=m
+CONFIG_MTD_NAND_ECC_BCH=y
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_MUSEUM_IDS=y
+CONFIG_MTD_NAND_DENALI=m
+CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xFF108018
+CONFIG_MTD_NAND_IDS=m
+CONFIG_MTD_NAND_RICOH=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y
+CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y
+CONFIG_MTD_NAND_CAFE=m
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_PLATFORM=m
+CONFIG_MTD_ALAUDA=m
+CONFIG_MTD_ONENAND=m
+CONFIG_MTD_ONENAND_VERIFY_WRITE=y
+CONFIG_MTD_ONENAND_GENERIC=m
+CONFIG_MTD_ONENAND_OTP=y
+CONFIG_MTD_ONENAND_2X_PROGRAM=y
+CONFIG_MTD_ONENAND_SIM=m
+
+#
+# LPDDR flash memory drivers
+#
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_RESERVE=1
+CONFIG_MTD_UBI_GLUEBI=m
+# CONFIG_MTD_UBI_DEBUG is not set
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
+CONFIG_PARPORT_PC_PCMCIA=m
+# CONFIG_PARPORT_GSC is not set
+CONFIG_PARPORT_AX88796=m
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_PNP=y
+CONFIG_PNP_DEBUG_MESSAGES=y
+
+#
+# Protocols
+#
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_FD=y
+CONFIG_PARIDE=m
+
+#
+# Parallel IDE high-level drivers
+#
+CONFIG_PARIDE_PD=m
+CONFIG_PARIDE_PCD=m
+CONFIG_PARIDE_PF=m
+CONFIG_PARIDE_PT=m
+CONFIG_PARIDE_PG=m
+
+#
+# Parallel IDE protocol modules
+#
+CONFIG_PARIDE_ATEN=m
+CONFIG_PARIDE_BPCK=m
+CONFIG_PARIDE_COMM=m
+CONFIG_PARIDE_DSTR=m
+CONFIG_PARIDE_FIT2=m
+CONFIG_PARIDE_FIT3=m
+CONFIG_PARIDE_EPAT=m
+CONFIG_PARIDE_EPATC8=y
+CONFIG_PARIDE_EPIA=m
+CONFIG_PARIDE_FRIQ=m
+CONFIG_PARIDE_FRPW=m
+CONFIG_PARIDE_KBIC=m
+CONFIG_PARIDE_KTTI=m
+CONFIG_PARIDE_ON20=m
+CONFIG_PARIDE_ON26=m
+CONFIG_BLK_CPQ_DA=m
+CONFIG_BLK_CPQ_CISS_DA=m
+CONFIG_CISS_SCSI_TAPE=y
+CONFIG_BLK_DEV_DAC960=m
+CONFIG_BLK_DEV_UMEM=m
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_OSD=m
+CONFIG_BLK_DEV_SX8=m
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=16384
+# CONFIG_BLK_DEV_XIP is not set
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_ATA_OVER_ETH=m
+CONFIG_VIRTIO_BLK=m
+# CONFIG_BLK_DEV_HD is not set
+CONFIG_BLK_DEV_RBD=m
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_MISC_DEVICES=y
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+CONFIG_IBM_ASM=m
+CONFIG_PHANTOM=m
+CONFIG_SGI_IOC4=m
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+CONFIG_ICS932S401=m
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_CS5535_MFGPT=m
+CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
+CONFIG_CS5535_CLOCK_EVENT_SRC=m
+CONFIG_HP_ILO=m
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1780=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
+CONFIG_VMWARE_BALLOON=m
+CONFIG_BMP085=m
+CONFIG_PCH_PHUB=m
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+CONFIG_IWMC3200TOP=m
+# CONFIG_IWMC3200TOP_DEBUG is not set
+# CONFIG_IWMC3200TOP_DEBUGFS is not set
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
+CONFIG_SENSORS_LIS3_I2C=m
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=y
+CONFIG_RAID_ATTRS=y
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_TGT=y
+CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=m
+CONFIG_CHR_DEV_OSST=m
+CONFIG_BLK_DEV_SR=y
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=y
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_FC_TGT_ATTRS=y
+CONFIG_SCSI_ISCSI_ATTRS=y
+CONFIG_SCSI_SAS_ATTRS=y
+CONFIG_SCSI_SAS_LIBSAS=y
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+CONFIG_SCSI_SRP_ATTRS=m
+CONFIG_SCSI_SRP_TGT_ATTRS=y
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_ISCSI_BOOT_SYSFS=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
+CONFIG_BE2ISCSI=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_HPSA=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=4
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
+CONFIG_AIC7XXX_DEBUG_MASK=0
+# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
+CONFIG_SCSI_AIC7XXX_OLD=m
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_CMDS_PER_DEVICE=4
+CONFIG_AIC79XX_RESET_DELAY_MS=15000
+# CONFIG_AIC79XX_DEBUG_ENABLE is not set
+CONFIG_AIC79XX_DEBUG_MASK=0
+# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_MVSAS=m
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_ADVANSYS=m
+CONFIG_SCSI_ARCMSR=m
+# CONFIG_SCSI_ARCMSR_AER is not set
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+CONFIG_MEGARAID_LEGACY=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+# CONFIG_SCSI_MPT2SAS_LOGGING is not set
+CONFIG_SCSI_HPTIOP=m
+CONFIG_SCSI_BUSLOGIC=m
+CONFIG_VMWARE_PVSCSI=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_FCOE_FNIC=m
+CONFIG_SCSI_DMX3191D=m
+CONFIG_SCSI_EATA=m
+# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
+# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
+CONFIG_SCSI_EATA_MAX_TAGS=16
+CONFIG_SCSI_FUTURE_DOMAIN=m
+CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
+CONFIG_SCSI_PPA=m
+CONFIG_SCSI_IMM=m
+# CONFIG_SCSI_IZIP_EPP16 is not set
+# CONFIG_SCSI_IZIP_SLOW_CTR is not set
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_SCSI_IPR=m
+# CONFIG_SCSI_IPR_TRACE is not set
+# CONFIG_SCSI_IPR_DUMP is not set
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLA_FC=m
+CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_SCSI_LPFC=m
+# CONFIG_SCSI_LPFC_DEBUG_FS is not set
+CONFIG_SCSI_DC395x=m
+CONFIG_SCSI_DC390T=m
+CONFIG_SCSI_DEBUG=m
+CONFIG_SCSI_PMCRAID=m
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_SRP=m
+CONFIG_SCSI_BFA_FC=m
+CONFIG_SCSI_LOWLEVEL_PCMCIA=y
+CONFIG_PCMCIA_AHA152X=m
+CONFIG_PCMCIA_FDOMAIN=m
+CONFIG_PCMCIA_QLOGIC=m
+CONFIG_PCMCIA_SYM53C500=m
+CONFIG_SCSI_DH=m
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+CONFIG_SCSI_OSD_INITIATOR=m
+CONFIG_SCSI_OSD_ULD=m
+CONFIG_SCSI_OSD_DPRINT_SENSE=1
+# CONFIG_SCSI_OSD_DEBUG is not set
+CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_ACPI=y
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=y
+CONFIG_SATA_AHCI_PLATFORM=y
+CONFIG_SATA_INIC162X=y
+CONFIG_SATA_ACARD_AHCI=y
+CONFIG_SATA_SIL24=y
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=y
+CONFIG_SATA_QSTOR=y
+CONFIG_SATA_SX4=y
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=y
+CONFIG_SATA_MV=y
+CONFIG_SATA_NV=y
+CONFIG_SATA_PROMISE=y
+CONFIG_SATA_SIL=y
+CONFIG_SATA_SIS=y
+CONFIG_SATA_SVW=y
+CONFIG_SATA_ULI=y
+CONFIG_SATA_VIA=y
+CONFIG_SATA_VITESSE=y
+
+#
+# PATA SFF controllers with BMDMA
+#
+CONFIG_PATA_ALI=y
+CONFIG_PATA_AMD=y
+CONFIG_PATA_ARASAN_CF=m
+CONFIG_PATA_ARTOP=y
+CONFIG_PATA_ATIIXP=y
+CONFIG_PATA_ATP867X=y
+CONFIG_PATA_CMD64X=y
+CONFIG_PATA_CS5520=y
+CONFIG_PATA_CS5530=y
+CONFIG_PATA_CS5536=y
+CONFIG_PATA_CYPRESS=y
+CONFIG_PATA_EFAR=y
+CONFIG_PATA_HPT366=y
+CONFIG_PATA_HPT37X=y
+CONFIG_PATA_HPT3X2N=y
+CONFIG_PATA_HPT3X3=y
+CONFIG_PATA_HPT3X3_DMA=y
+CONFIG_PATA_IT8213=y
+CONFIG_PATA_IT821X=y
+CONFIG_PATA_JMICRON=y
+CONFIG_PATA_MARVELL=y
+CONFIG_PATA_NETCELL=y
+CONFIG_PATA_NINJA32=y
+CONFIG_PATA_NS87415=y
+CONFIG_PATA_OLDPIIX=y
+CONFIG_PATA_OPTIDMA=y
+CONFIG_PATA_PDC2027X=y
+CONFIG_PATA_PDC_OLD=y
+CONFIG_PATA_RADISYS=y
+CONFIG_PATA_RDC=y
+CONFIG_PATA_SC1200=y
+CONFIG_PATA_SCH=y
+CONFIG_PATA_SERVERWORKS=y
+CONFIG_PATA_SIL680=y
+CONFIG_PATA_SIS=y
+CONFIG_PATA_TOSHIBA=m
+CONFIG_PATA_TRIFLEX=y
+CONFIG_PATA_VIA=y
+CONFIG_PATA_WINBOND=y
+
+#
+# PIO-only SFF controllers
+#
+CONFIG_PATA_CMD640_PCI=y
+CONFIG_PATA_MPIIX=y
+CONFIG_PATA_NS87410=y
+CONFIG_PATA_OPTI=y
+CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_RZ1000=y
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_PATA_ACPI=y
+CONFIG_ATA_GENERIC=y
+CONFIG_PATA_LEGACY=y
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_AUTODETECT=y
+CONFIG_MD_LINEAR=y
+CONFIG_MD_RAID0=y
+CONFIG_MD_RAID1=y
+CONFIG_MD_RAID10=y
+CONFIG_MD_RAID456=y
+# CONFIG_MULTICORE_RAID456 is not set
+CONFIG_MD_MULTIPATH=y
+CONFIG_MD_FAULTY=m
+CONFIG_BLK_DEV_DM=y
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_CRYPT=y
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_MIRROR=y
+CONFIG_DM_RAID=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+# CONFIG_DM_DELAY is not set
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_LOOPBACK_TARGET=m
+# CONFIG_LOOPBACK_TARGET_CDB_DEBUG is not set
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+CONFIG_FUSION_LAN=m
+# CONFIG_FUSION_LOGGING is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_OHCI_DEBUG=y
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_FIREWIRE_NOSY=m
+CONFIG_I2O=m
+CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
+CONFIG_I2O_EXT_ADAPTEC=y
+CONFIG_I2O_EXT_ADAPTEC_DMA64=y
+CONFIG_I2O_CONFIG=m
+# CONFIG_I2O_CONFIG_OLD_IOCTL is not set
+CONFIG_I2O_BUS=m
+CONFIG_I2O_BLOCK=m
+CONFIG_I2O_SCSI=m
+CONFIG_I2O_PROC=m
+CONFIG_MACINTOSH_DRIVERS=y
+CONFIG_MAC_EMUMOUSEBTN=y
+CONFIG_NETDEVICES=y
+CONFIG_IFB=m
+CONFIG_DUMMY=m
+CONFIG_BONDING=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_EQUALIZER=m
+CONFIG_TUN=m
+CONFIG_VETH=m
+CONFIG_NET_SB1000=m
+CONFIG_ARCNET=m
+CONFIG_ARCNET_1201=m
+CONFIG_ARCNET_1051=m
+CONFIG_ARCNET_RAW=m
+CONFIG_ARCNET_CAP=m
+CONFIG_ARCNET_COM90xx=m
+CONFIG_ARCNET_COM90xxIO=m
+CONFIG_ARCNET_RIM_I=m
+CONFIG_ARCNET_COM20020=m
+CONFIG_ARCNET_COM20020_PCI=m
+CONFIG_MII=m
+CONFIG_PHYLIB=m
+
+#
+# MII PHY device drivers
+#
+CONFIG_MARVELL_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM63XX_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_STE10XP=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MICREL_PHY=m
+CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_GPIO=m
+CONFIG_NET_ETHERNET=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_ETHOC=m
+CONFIG_DNET=m
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+CONFIG_TULIP_MMIO=y
+# CONFIG_TULIP_NAPI is not set
+CONFIG_DE4X5=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_PCMCIA_XIRCOM=m
+CONFIG_HP100=m
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
+CONFIG_NET_PCI=y
+CONFIG_PCNET32=m
+CONFIG_AMD8111_ETH=m
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_KSZ884X_PCI=m
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_FORCEDETH=m
+CONFIG_E100=m
+CONFIG_FEALNX=m
+CONFIG_NATSEMI=m
+CONFIG_NE2K_PCI=m
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+CONFIG_8139TOO_PIO=y
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R6040=m
+CONFIG_SIS900=m
+CONFIG_EPIC100=m
+CONFIG_SMSC9420=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_TLAN=m
+CONFIG_KS8842=m
+CONFIG_KS8851_MLL=m
+CONFIG_VIA_RHINE=m
+CONFIG_VIA_RHINE_MMIO=y
+CONFIG_SC92031=m
+CONFIG_NET_POCKET=y
+CONFIG_ATP=m
+CONFIG_DE600=m
+CONFIG_DE620=m
+CONFIG_ATL2=m
+CONFIG_NETDEV_1000=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_DL2K=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IP1000=m
+CONFIG_IGB=m
+CONFIG_IGB_DCA=y
+CONFIG_IGBVF=m
+CONFIG_NS83820=m
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_R8169=m
+CONFIG_SIS190=m
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_VIA_VELOCITY=m
+CONFIG_TIGON3=m
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_QLA3XXX=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_JME=m
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_DA is not set
+CONFIG_STMMAC_DUAL_MAC=y
+CONFIG_PCH_GBE=m
+CONFIG_NETDEV_10000=y
+CONFIG_MDIO=m
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4VF=m
+CONFIG_ENIC=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_DCA=y
+CONFIG_IXGBEVF=m
+CONFIG_IXGB=m
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+CONFIG_MYRI10GE=m
+CONFIG_MYRI10GE_DCA=y
+CONFIG_NETXEN_NIC=m
+CONFIG_NIU=m
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_TEHUTI=m
+CONFIG_BNX2X=m
+CONFIG_QLCNIC=m
+CONFIG_QLGE=m
+CONFIG_BNA=m
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_BE2NET=m
+CONFIG_TR=m
+CONFIG_IBMOL=m
+CONFIG_3C359=m
+CONFIG_TMS380TR=m
+CONFIG_TMSPCI=m
+CONFIG_ABYSS=m
+CONFIG_WLAN=y
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_AIRO=m
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_PCMCIA_ATMEL=m
+CONFIG_AT76C50X_USB=m
+CONFIG_AIRO_CS=m
+CONFIG_PCMCIA_WL3501=m
+CONFIG_PRISM54=m
+CONFIG_USB_ZD1201=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_ADM8211=m
+# CONFIG_MAC80211_HWSIM is not set
+CONFIG_MWL8K=m
+CONFIG_ATH_COMMON=m
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+# CONFIG_ATH5K_TRACER is not set
+CONFIG_ATH5K_PCI=y
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K=m
+# CONFIG_ATH9K_DEBUGFS is not set
+CONFIG_ATH9K_RATE_CONTROL=y
+CONFIG_ATH9K_HTC=m
+# CONFIG_ATH9K_HTC_DEBUGFS is not set
+CONFIG_AR9170_USB=m
+CONFIG_AR9170_LEDS=y
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+CONFIG_CARL9170_WPC=y
+CONFIG_B43=m
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_PCMCIA=y
+CONFIG_B43_SDIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_N=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+# CONFIG_B43LEGACY_DEBUG is not set
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_IWLAGN=m
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_DEBUG is not set
+# CONFIG_IWLWIFI_DEVICE_TRACING is not set
+# CONFIG_IWL_P2P is not set
+CONFIG_IWLWIFI_LEGACY=m
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_LEGACY_DEBUG is not set
+# CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING is not set
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+CONFIG_IWM=m
+# CONFIG_IWM_DEBUG is not set
+# CONFIG_IWM_TRACING is not set
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
+CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_HERMES=m
+# CONFIG_HERMES_PRISM is not set
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_ORINOCO_USB=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_P54_LEDS=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT33XX=y
+CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RT2800_LIB=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_HT=y
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTL8192C_COMMON=m
+CONFIG_WL1251=m
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX_MENU=m
+CONFIG_WL12XX=m
+# CONFIG_WL12XX_HT is not set
+CONFIG_WL12XX_SDIO=m
+CONFIG_WL12XX_SDIO_TEST=m
+CONFIG_WL12XX_PLATFORM_DATA=y
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+
+#
+# WiMAX Wireless Broadband devices
+#
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_SDIO=m
+# CONFIG_WIMAX_IWMC3200_SDIO is not set
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+
+#
+# USB Network Adapters
+#
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+# CONFIG_USB_EPSON2888 is not set
+# CONFIG_USB_KC2190 is not set
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_NET_PCMCIA=y
+CONFIG_PCMCIA_3C589=m
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_PCMCIA_XIRC2PS=m
+CONFIG_PCMCIA_AXNET=m
+CONFIG_ARCNET_COM20020_CS=m
+CONFIG_PCMCIA_IBMTR=m
+CONFIG_WAN=y
+CONFIG_LANMEDIA=m
+CONFIG_HDLC=m
+CONFIG_HDLC_RAW=m
+CONFIG_HDLC_RAW_ETH=m
+CONFIG_HDLC_CISCO=m
+CONFIG_HDLC_FR=m
+CONFIG_HDLC_PPP=m
+
+#
+# X.25/LAPB support is disabled
+#
+CONFIG_PCI200SYN=m
+CONFIG_WANXL=m
+# CONFIG_PC300TOO is not set
+CONFIG_FARSYNC=m
+CONFIG_DSCC4=m
+# CONFIG_DSCC4_PCISYNC is not set
+# CONFIG_DSCC4_PCI_RST is not set
+CONFIG_DLCI=m
+CONFIG_DLCI_MAX=8
+CONFIG_WAN_ROUTER_DRIVERS=m
+CONFIG_CYCLADES_SYNC=m
+CONFIG_CYCLOMX_X25=y
+CONFIG_SBNI=m
+# CONFIG_SBNI_MULTILINE is not set
+CONFIG_ATM_DRIVERS=y
+CONFIG_ATM_DUMMY=m
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+# CONFIG_ATM_ENI_TUNE_BURST is not set
+CONFIG_ATM_FIRESTREAM=m
+CONFIG_ATM_ZATM=m
+# CONFIG_ATM_ZATM_DEBUG is not set
+CONFIG_ATM_NICSTAR=m
+# CONFIG_ATM_NICSTAR_USE_SUNI is not set
+# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_AMBASSADOR=m
+# CONFIG_ATM_AMBASSADOR_DEBUG is not set
+CONFIG_ATM_HORIZON=m
+# CONFIG_ATM_HORIZON_DEBUG is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+# CONFIG_ATM_FORE200E_USE_TASKLET is not set
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+# CONFIG_ATM_HE_USE_SUNI is not set
+CONFIG_ATM_SOLOS=m
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKEHARD=m
+
+#
+# CAIF transport drivers
+#
+CONFIG_FDDI=y
+CONFIG_DEFXX=m
+# CONFIG_DEFXX_MMIO is not set
+CONFIG_SKFP=m
+CONFIG_HIPPI=y
+CONFIG_ROADRUNNER=m
+# CONFIG_ROADRUNNER_LARGE_RINGS is not set
+CONFIG_PLIP=m
+CONFIG_PPP=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOATM=m
+CONFIG_PPPOL2TP=m
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLHC=m
+CONFIG_SLIP_SMART=y
+# CONFIG_SLIP_MODE_SLIP6 is not set
+CONFIG_NET_FC=y
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+# CONFIG_NETPOLL_TRAP is not set
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_VIRTIO_NET=m
+CONFIG_VMXNET3=m
+CONFIG_ISDN=y
+CONFIG_ISDN_I4L=m
+CONFIG_ISDN_PPP=y
+CONFIG_ISDN_PPP_VJ=y
+CONFIG_ISDN_MPP=y
+CONFIG_IPPP_FILTER=y
+CONFIG_ISDN_PPP_BSDCOMP=m
+CONFIG_ISDN_AUDIO=y
+CONFIG_ISDN_TTY_FAX=y
+
+#
+# ISDN feature submodules
+#
+CONFIG_ISDN_DIVERSION=m
+
+#
+# ISDN4Linux hardware drivers
+#
+
+#
+# Passive cards
+#
+CONFIG_ISDN_DRV_HISAX=m
+
+#
+# D-channel protocol features
+#
+CONFIG_HISAX_EURO=y
+CONFIG_DE_AOC=y
+CONFIG_HISAX_NO_SENDCOMPLETE=y
+CONFIG_HISAX_NO_LLC=y
+CONFIG_HISAX_NO_KEYPAD=y
+CONFIG_HISAX_1TR6=y
+CONFIG_HISAX_NI1=y
+CONFIG_HISAX_MAX_CARDS=8
+
+#
+# HiSax supported cards
+#
+CONFIG_HISAX_16_3=y
+CONFIG_HISAX_TELESPCI=y
+CONFIG_HISAX_S0BOX=y
+CONFIG_HISAX_FRITZPCI=y
+CONFIG_HISAX_AVM_A1_PCMCIA=y
+CONFIG_HISAX_ELSA=y
+CONFIG_HISAX_DIEHLDIVA=y
+CONFIG_HISAX_SEDLBAUER=y
+CONFIG_HISAX_NETJET=y
+CONFIG_HISAX_NETJET_U=y
+CONFIG_HISAX_NICCY=y
+CONFIG_HISAX_BKM_A4T=y
+CONFIG_HISAX_SCT_QUADRO=y
+CONFIG_HISAX_GAZEL=y
+CONFIG_HISAX_HFC_PCI=y
+CONFIG_HISAX_W6692=y
+CONFIG_HISAX_HFC_SX=y
+CONFIG_HISAX_ENTERNOW_PCI=y
+# CONFIG_HISAX_DEBUG is not set
+
+#
+# HiSax PCMCIA card service modules
+#
+CONFIG_HISAX_SEDLBAUER_CS=m
+CONFIG_HISAX_ELSA_CS=m
+CONFIG_HISAX_AVM_A1_CS=m
+CONFIG_HISAX_TELES_CS=m
+
+#
+# HiSax sub driver modules
+#
+CONFIG_HISAX_ST5481=m
+CONFIG_HISAX_HFCUSB=m
+CONFIG_HISAX_HFC4S8S=m
+CONFIG_HISAX_FRITZ_PCIPNP=m
+
+#
+# Active cards
+#
+CONFIG_ISDN_CAPI=m
+CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
+CONFIG_CAPI_TRACE=y
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
+CONFIG_ISDN_CAPI_CAPIFS=m
+CONFIG_ISDN_CAPI_CAPIDRV=m
+
+#
+# CAPI hardware drivers
+#
+CONFIG_CAPI_AVM=y
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
+CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_CAPI_EICON=y
+CONFIG_ISDN_DIVAS=m
+CONFIG_ISDN_DIVAS_BRIPCI=y
+CONFIG_ISDN_DIVAS_PRIPCI=y
+CONFIG_ISDN_DIVAS_DIVACAPI=m
+CONFIG_ISDN_DIVAS_USERIDI=m
+CONFIG_ISDN_DIVAS_MAINT=m
+CONFIG_ISDN_DRV_GIGASET=m
+# CONFIG_GIGASET_CAPI is not set
+CONFIG_GIGASET_I4L=y
+# CONFIG_GIGASET_DUMMYLL is not set
+CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M105=m
+# CONFIG_GIGASET_M101 is not set
+# CONFIG_GIGASET_DEBUG is not set
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
+CONFIG_MISDN=m
+CONFIG_MISDN_DSP=m
+CONFIG_MISDN_L1OIP=m
+
+#
+# mISDN hardware drivers
+#
+CONFIG_MISDN_HFCPCI=m
+CONFIG_MISDN_HFCMULTI=m
+CONFIG_MISDN_HFCUSB=m
+CONFIG_MISDN_AVMFRITZ=m
+CONFIG_MISDN_SPEEDFAX=m
+CONFIG_MISDN_INFINEON=m
+CONFIG_MISDN_W6692=m
+CONFIG_MISDN_NETJET=m
+CONFIG_MISDN_IPAC=m
+CONFIG_MISDN_ISAR=m
+CONFIG_ISDN_HDLC=m
+CONFIG_PHONE=m
+CONFIG_PHONE_IXJ=m
+CONFIG_PHONE_IXJ_PCMCIA=m
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_FF_MEMLESS=y
+CONFIG_INPUT_POLLDEV=m
+CONFIG_INPUT_SPARSEKMAP=m
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1070=m
+CONFIG_KEYBOARD_QT2160=m
+# CONFIG_KEYBOARD_LKKBD is not set
+CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
+CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_MATRIX=m
+CONFIG_KEYBOARD_LM8323=m
+CONFIG_KEYBOARD_MAX7359=m
+CONFIG_KEYBOARD_MCS=m
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_KEYBOARD_OPENCORES=m
+CONFIG_KEYBOARD_STOWAWAY=m
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_ELANTECH is not set
+CONFIG_MOUSE_PS2_SENTELIC=y
+CONFIG_MOUSE_PS2_TOUCHKIT=y
+CONFIG_MOUSE_SERIAL=m
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_VSXXXAA=m
+CONFIG_MOUSE_GPIO=m
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_JOYSTICK_ANALOG=m
+CONFIG_JOYSTICK_A3D=m
+CONFIG_JOYSTICK_ADI=m
+CONFIG_JOYSTICK_COBRA=m
+CONFIG_JOYSTICK_GF2K=m
+CONFIG_JOYSTICK_GRIP=m
+CONFIG_JOYSTICK_GRIP_MP=m
+CONFIG_JOYSTICK_GUILLEMOT=m
+CONFIG_JOYSTICK_INTERACT=m
+CONFIG_JOYSTICK_SIDEWINDER=m
+CONFIG_JOYSTICK_TMDC=m
+CONFIG_JOYSTICK_IFORCE=m
+CONFIG_JOYSTICK_IFORCE_USB=y
+CONFIG_JOYSTICK_IFORCE_232=y
+CONFIG_JOYSTICK_WARRIOR=m
+CONFIG_JOYSTICK_MAGELLAN=m
+CONFIG_JOYSTICK_SPACEORB=m
+CONFIG_JOYSTICK_SPACEBALL=m
+CONFIG_JOYSTICK_STINGER=m
+CONFIG_JOYSTICK_TWIDJOY=m
+CONFIG_JOYSTICK_ZHENHUA=m
+CONFIG_JOYSTICK_DB9=m
+CONFIG_JOYSTICK_GAMECON=m
+CONFIG_JOYSTICK_TURBOGRAFX=m
+CONFIG_JOYSTICK_AS5011=m
+CONFIG_JOYSTICK_JOYDUMP=m
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+# CONFIG_JOYSTICK_WALKERA0701 is not set
+CONFIG_INPUT_TABLET=y
+CONFIG_TABLET_USB_ACECAD=m
+CONFIG_TABLET_USB_AIPTEK=m
+CONFIG_TABLET_USB_GTCO=m
+CONFIG_TABLET_USB_HANWANG=m
+CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_USB_WACOM=m
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+CONFIG_TOUCHSCREEN_BU21013=m
+CONFIG_TOUCHSCREEN_CY8CTMG110=m
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_GUNZE=m
+CONFIG_TOUCHSCREEN_ELO=m
+CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TOUCHSCREEN_MCS5000=m
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_MK712=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_UCB1400=m
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
+CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
+CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
+CONFIG_TOUCHSCREEN_USB_GOTOP=y
+CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_E2I=y
+CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
+CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
+CONFIG_TOUCHSCREEN_USB_NEXIO=y
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC2007=m
+CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_APANEL=m
+CONFIG_INPUT_ATLAS_BTNS=m
+CONFIG_INPUT_ATI_REMOTE=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_PCF8574=m
+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
+CONFIG_INPUT_ADXL34X=m
+CONFIG_INPUT_ADXL34X_I2C=m
+CONFIG_INPUT_CMA3000=m
+CONFIG_INPUT_CMA3000_I2C=m
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_CT82C710=m
+CONFIG_SERIO_PARKBD=m
+CONFIG_SERIO_PCIPS2=m
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_RAW=m
+CONFIG_SERIO_ALTERA_PS2=m
+CONFIG_SERIO_PS2MULT=m
+CONFIG_GAMEPORT=m
+CONFIG_GAMEPORT_NS558=m
+CONFIG_GAMEPORT_L4=m
+CONFIG_GAMEPORT_EMU10K1=m
+CONFIG_GAMEPORT_FM801=m
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=32
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_ROCKETPORT=m
+CONFIG_CYCLADES=m
+# CONFIG_CYZ_INTR is not set
+CONFIG_MOXA_INTELLIO=m
+CONFIG_MOXA_SMARTIO=m
+CONFIG_SYNCLINK=m
+CONFIG_SYNCLINKMP=m
+CONFIG_SYNCLINK_GT=m
+CONFIG_NOZOMI=m
+CONFIG_ISI=m
+CONFIG_N_HDLC=m
+CONFIG_N_GSM=m
+CONFIG_DEVKMEM=y
+CONFIG_STALDRV=y
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_PNP=y
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_DETECT_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_MFD_HSU=m
+CONFIG_SERIAL_UARTLITE=m
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_TIMBERDALE=m
+CONFIG_SERIAL_ALTERA_JTAGUART=m
+CONFIG_SERIAL_ALTERA_UART=m
+CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
+CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+CONFIG_SERIAL_PCH_UART=m
+CONFIG_PRINTER=m
+CONFIG_LP_CONSOLE=y
+CONFIG_PPDEV=m
+CONFIG_HVC_DRIVER=y
+CONFIG_VIRTIO_CONSOLE=m
+CONFIG_IPMI_HANDLER=m
+# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_INTEL=m
+CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_VIA=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_NVRAM=m
+CONFIG_R3964=m
+CONFIG_APPLICOM=m
+
+#
+# PCMCIA character devices
+#
+CONFIG_SYNCLINK_CS=m
+CONFIG_CARDMAN_4000=m
+CONFIG_CARDMAN_4040=m
+CONFIG_IPWIRELESS=m
+CONFIG_MWAVE=m
+CONFIG_RAW_DRIVER=m
+CONFIG_MAX_RAW_DEVS=256
+CONFIG_HPET=y
+CONFIG_HPET_MMAP=y
+CONFIG_HANGCHECK_TIMER=m
+CONFIG_TCG_TPM=m
+# CONFIG_TCG_TIS is not set
+# CONFIG_TCG_NSC is not set
+CONFIG_TCG_ATMEL=m
+# CONFIG_TCG_INFINEON is not set
+CONFIG_TELCLOCK=m
+CONFIG_DEVPORT=y
+CONFIG_RAMOOPS=m
+CONFIG_I2C=m
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_MUX=m
+
+#
+# Multiplexer I2C Chip support
+#
+CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD756_S4882=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NFORCE2_S4985=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+
+#
+# ACPI drivers
+#
+CONFIG_I2C_SCMI=m
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+CONFIG_I2C_GPIO=m
+CONFIG_I2C_INTEL_MID=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
+# CONFIG_I2C_PXA_PCI is not set
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_XILINX=m
+CONFIG_I2C_EG20T=m
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_I2C_STUB=m
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_SPI is not set
+
+#
+# PPS support
+#
+CONFIG_PPS=m
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_KTIMER is not set
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_PPS_CLIENT_PARPORT=m
+
+#
+# PPS generators support
+#
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_GPIOLIB=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_MAX730X=m
+
+#
+# Memory mapped GPIO expanders:
+#
+CONFIG_GPIO_BASIC_MMIO=m
+CONFIG_GPIO_IT8761E=m
+CONFIG_GPIO_SCH=m
+CONFIG_GPIO_VX855=m
+
+#
+# I2C GPIO expanders:
+#
+CONFIG_GPIO_MAX7300=m
+CONFIG_GPIO_MAX732X=m
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_ADP5588=m
+
+#
+# PCI GPIO expanders:
+#
+CONFIG_GPIO_CS5535=m
+# CONFIG_GPIO_LANGWELL is not set
+CONFIG_GPIO_PCH=m
+CONFIG_GPIO_ML_IOH=m
+# CONFIG_GPIO_TIMBERDALE is not set
+CONFIG_GPIO_RDC321X=m
+
+#
+# SPI GPIO expanders:
+#
+
+#
+# AC97 GPIO expanders:
+#
+# CONFIG_GPIO_UCB1400 is not set
+
+#
+# MODULbus GPIO expanders:
+#
+CONFIG_GPIO_JANZ_TTL=m
+CONFIG_W1=m
+CONFIG_W1_CON=y
+
+#
+# 1-wire Bus Masters
+#
+CONFIG_W1_MASTER_MATROX=m
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_GPIO=m
+
+#
+# 1-wire Slaves
+#
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2423=m
+CONFIG_W1_SLAVE_DS2431=m
+CONFIG_W1_SLAVE_DS2433=m
+CONFIG_W1_SLAVE_DS2433_CRC=y
+CONFIG_W1_SLAVE_DS2760=m
+CONFIG_W1_SLAVE_BQ27000=m
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_PDA_POWER=m
+CONFIG_TEST_POWER=m
+CONFIG_BATTERY_DS2760=m
+CONFIG_BATTERY_DS2782=m
+CONFIG_BATTERY_BQ20Z75=m
+CONFIG_BATTERY_BQ27x00=m
+CONFIG_BATTERY_BQ27X00_I2C=y
+CONFIG_BATTERY_BQ27X00_PLATFORM=y
+CONFIG_BATTERY_MAX17040=m
+CONFIG_BATTERY_MAX17042=m
+CONFIG_CHARGER_PCF50633=m
+CONFIG_CHARGER_ISP1704=m
+CONFIG_CHARGER_GPIO=m
+CONFIG_HWMON=m
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_ABITUGURU=m
+CONFIG_SENSORS_ABITUGURU3=m
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_K10TEMP=m
+CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_DS620=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_I5K_AMB=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_GPIO_FAN=m
+CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_PKGTEMP=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_LINEAGE=m
+CONFIG_SENSORS_LM63=m
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LTC4151=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_PMBUS=m
+CONFIG_SENSORS_PMBUS=m
+CONFIG_SENSORS_MAX16064=m
+CONFIG_SENSORS_MAX34440=m
+CONFIG_SENSORS_MAX8688=m
+CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SHT21=m
+CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_SMM665=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_ADS1015=m
+CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_VIA_CPUTEMP=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+# CONFIG_SENSORS_W83795_FANCTRL is not set
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_APPLESMC=m
+
+#
+# ACPI drivers
+#
+CONFIG_SENSORS_ATK0110=m
+CONFIG_THERMAL=m
+CONFIG_THERMAL_HWMON=y
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_ALIM1535_WDT=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_F71808E_WDT=m
+CONFIG_SP5100_TCO=m
+CONFIG_GEODE_WDT=m
+CONFIG_SC520_WDT=m
+CONFIG_SBC_FITPC2_WATCHDOG=m
+CONFIG_EUROTECH_WDT=m
+CONFIG_IB700_WDT=m
+CONFIG_IBMASR=m
+CONFIG_WAFER_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_ITCO_WDT=m
+CONFIG_ITCO_VENDOR_SUPPORT=y
+CONFIG_IT8712F_WDT=m
+CONFIG_IT87_WDT=m
+CONFIG_HP_WATCHDOG=m
+CONFIG_HPWDT_NMI_DECODING=y
+CONFIG_SC1200_WDT=m
+CONFIG_PC87413_WDT=m
+CONFIG_NV_TCO=m
+CONFIG_60XX_WDT=m
+CONFIG_SBC8360_WDT=m
+CONFIG_CPU5_WDT=m
+CONFIG_SMSC_SCH311X_WDT=m
+CONFIG_SMSC37B787_WDT=m
+CONFIG_W83627HF_WDT=m
+CONFIG_W83697HF_WDT=m
+CONFIG_W83697UG_WDT=m
+CONFIG_W83877F_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_MACHZ_WDT=m
+CONFIG_SBC_EPX_C3_WATCHDOG=m
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+CONFIG_SSB_PCMCIAHOST=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_MFD_SUPPORT=y
+CONFIG_MFD_CORE=m
+# CONFIG_MFD_SM501 is not set
+CONFIG_HTC_PASIC3=m
+CONFIG_UCB1400_CORE=m
+CONFIG_TPS6105X=m
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
+# CONFIG_MFD_TMIO is not set
+CONFIG_MFD_WM8400=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+# CONFIG_ABX500_CORE is not set
+CONFIG_MFD_CS5535=m
+CONFIG_MFD_TIMBERDALE=m
+CONFIG_LPC_SCH=m
+CONFIG_MFD_RDC321X=m
+CONFIG_MFD_JANZ_CMODIO=m
+CONFIG_MFD_VX855=m
+CONFIG_MFD_WL1273_CORE=m
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+# CONFIG_REGULATOR_DUMMY is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=m
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+CONFIG_REGULATOR_USERSPACE_CONSUMER=m
+CONFIG_REGULATOR_BQ24022=m
+CONFIG_REGULATOR_MAX1586=m
+CONFIG_REGULATOR_MAX8649=m
+CONFIG_REGULATOR_MAX8660=m
+CONFIG_REGULATOR_MAX8952=m
+CONFIG_REGULATOR_WM8400=m
+CONFIG_REGULATOR_PCF50633=m
+CONFIG_REGULATOR_LP3971=m
+CONFIG_REGULATOR_LP3972=m
+CONFIG_REGULATOR_TPS6105X=m
+CONFIG_REGULATOR_TPS65023=m
+CONFIG_REGULATOR_TPS6507X=m
+CONFIG_REGULATOR_ISL6271A=m
+CONFIG_REGULATOR_AD5398=m
+CONFIG_MEDIA_SUPPORT=m
+
+#
+# Multimedia core support
+#
+# CONFIG_MEDIA_CONTROLLER is not set
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_DVB_CORE=m
+CONFIG_VIDEO_MEDIA=m
+
+#
+# Multimedia drivers
+#
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_RC_CORE=m
+CONFIG_LIRC=m
+CONFIG_RC_MAP=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_RC5_SZ_DECODER=m
+CONFIG_IR_LIRC_CODEC=m
+CONFIG_IR_ENE=m
+CONFIG_IR_IMON=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_ITE_CIR=m
+CONFIG_IR_NUVOTON=m
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_WINBOND_CIR=m
+CONFIG_RC_LOOPBACK=m
+CONFIG_MEDIA_ATTACH=y
+CONFIG_MEDIA_TUNER=m
+# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEOBUF_DMA_CONTIG=m
+CONFIG_VIDEOBUF_DVB=m
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# Encoders/decoders and other helper chips
+#
+
+#
+# Audio decoders
+#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_M52790=m
+CONFIG_VIDEO_TLV320AIC23B=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+
+#
+# Video decoders
+#
+CONFIG_VIDEO_ADV7180=m
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_BT866=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_MT9V011=m
+CONFIG_VIDEO_TCM825X=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_SAA7191=m
+CONFIG_VIDEO_TVP514X=m
+CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_TVP7002=m
+CONFIG_VIDEO_VPX3220=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_CX25840=m
+
+#
+# MPEG video encoders
+#
+CONFIG_VIDEO_CX2341X=m
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+CONFIG_VIDEO_THS7303=m
+CONFIG_VIDEO_ADV7343=m
+CONFIG_VIDEO_AK881X=m
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+CONFIG_VIDEO_VIVI=m
+CONFIG_VIDEO_BT848=m
+CONFIG_VIDEO_BT848_DVB=y
+CONFIG_VIDEO_BWQCAM=m
+CONFIG_VIDEO_CQCAM=m
+CONFIG_VIDEO_W9966=m
+CONFIG_VIDEO_CPIA2=m
+CONFIG_VIDEO_ZORAN=m
+CONFIG_VIDEO_ZORAN_DC30=m
+CONFIG_VIDEO_ZORAN_ZR36060=m
+CONFIG_VIDEO_ZORAN_BUZ=m
+CONFIG_VIDEO_ZORAN_DC10=m
+CONFIG_VIDEO_ZORAN_LML33=m
+CONFIG_VIDEO_ZORAN_LML33R10=m
+CONFIG_VIDEO_ZORAN_AVS6EYES=m
+CONFIG_VIDEO_MEYE=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_TIMBERDALE=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_FB_IVTV=m
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_SAA7164=m
+CONFIG_VIDEO_CAFE_CCIC=m
+CONFIG_VIDEO_SR030PC30=m
+CONFIG_VIDEO_VIA_CAMERA=m
+CONFIG_VIDEO_NOON010PC30=m
+CONFIG_SOC_CAMERA=m
+CONFIG_SOC_CAMERA_IMX074=m
+CONFIG_SOC_CAMERA_MT9M001=m
+CONFIG_SOC_CAMERA_MT9M111=m
+CONFIG_SOC_CAMERA_MT9T031=m
+CONFIG_SOC_CAMERA_MT9T112=m
+CONFIG_SOC_CAMERA_MT9V022=m
+CONFIG_SOC_CAMERA_RJ54N1=m
+CONFIG_SOC_CAMERA_TW9910=m
+CONFIG_SOC_CAMERA_PLATFORM=m
+CONFIG_SOC_CAMERA_OV2640=m
+CONFIG_SOC_CAMERA_OV6650=m
+CONFIG_SOC_CAMERA_OV772X=m
+CONFIG_SOC_CAMERA_OV9640=m
+CONFIG_SOC_CAMERA_OV9740=m
+CONFIG_V4L_USB_DRIVERS=y
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_KONICA=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_TLG2300=m
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_USB_ET61X251=m
+CONFIG_USB_SN9C102=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_MEM2MEM_TESTDEV=m
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_MAESTRO=m
+CONFIG_I2C_SI4713=m
+CONFIG_RADIO_SI4713=m
+CONFIG_USB_DSBR=m
+# CONFIG_RADIO_SI470X is not set
+CONFIG_USB_MR800=m
+CONFIG_RADIO_TEA5764=m
+CONFIG_RADIO_SAA7706H=m
+CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_TIMBERDALE=m
+CONFIG_RADIO_WL1273=m
+
+#
+# Texas Instruments WL128x FM driver (ST based)
+#
+CONFIG_RADIO_WL128X=m
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
+CONFIG_DVB_CAPTURE_DRIVERS=y
+
+#
+# Supported SAA7146 based PCI Adapters
+#
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_BUDGET_PATCH=m
+
+#
+# Supported USB Adapters
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_FRIIO=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_SMS_SIANO_MDTV=m
+
+#
+# Siano module components
+#
+CONFIG_SMS_USB_DRV=m
+CONFIG_SMS_SDIO_DRV=m
+
+#
+# Supported FlexCopII (B2C2) Adapters
+#
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
+
+#
+# Supported BT878 Adapters
+#
+CONFIG_DVB_BT8XX=m
+
+#
+# Supported Pluto2 Adapters
+#
+CONFIG_DVB_PLUTO2=m
+
+#
+# Supported SDMC DM1105 Adapters
+#
+CONFIG_DVB_DM1105=m
+
+#
+# Supported FireWire (IEEE 1394) Adapters
+#
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_INPUT=y
+
+#
+# Supported Earthsoft PT1 Adapters
+#
+CONFIG_DVB_PT1=m
+
+#
+# Supported Mantis Adapters
+#
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+
+#
+# Supported nGene Adapters
+#
+CONFIG_DVB_NGENE=m
+
+#
+# Supported DVB Frontends
+#
+CONFIG_DVB_FE_CUSTOMISE=y
+
+#
+# Customise DVB Frontends
+#
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV6110x=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_SP8870=m
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_S5H1432=m
+CONFIG_DVB_DRX397XD=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_DIB9000=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+CONFIG_DVB_STV0367=m
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_S5H1411=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_S921=m
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
+
+#
+# Tools to develop new frontends
+#
+CONFIG_DVB_DUMMY_FE=m
+
+#
+# Graphics support
+#
+CONFIG_AGP=m
+CONFIG_AGP_AMD64=m
+CONFIG_AGP_INTEL=m
+CONFIG_AGP_SIS=m
+CONFIG_AGP_VIA=m
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_VGA_SWITCHEROO=y
+CONFIG_DRM=m
+CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_TTM=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_RADEON=m
+CONFIG_DRM_RADEON_KMS=y
+CONFIG_DRM_I810=m
+CONFIG_DRM_I915=m
+CONFIG_DRM_I915_KMS=y
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
+CONFIG_STUB_POULSBO=m
+CONFIG_VGASTATE=m
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_DDC=m
+CONFIG_FB_BOOT_VESA_SUPPORT=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=m
+# CONFIG_FB_WMT_GE_ROPS is not set
+CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_HECUBA=m
+CONFIG_FB_SVGALIB=m
+# CONFIG_FB_MACMODES is not set
+CONFIG_FB_BACKLIGHT=y
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+CONFIG_FB_CIRRUS=m
+CONFIG_FB_PM2=m
+# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
+CONFIG_FB_CYBER2000=m
+CONFIG_FB_CYBER2000_DDC=y
+CONFIG_FB_ARC=m
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+CONFIG_FB_VGA16=m
+# CONFIG_FB_UVESA is not set
+CONFIG_FB_VESA=y
+# CONFIG_FB_EFI is not set
+CONFIG_FB_N411=m
+CONFIG_FB_HGA=m
+CONFIG_FB_S1D13XXX=m
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_NVIDIA_DEBUG is not set
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA=m
+CONFIG_FB_RIVA_I2C=y
+# CONFIG_FB_RIVA_DEBUG is not set
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_LE80578=m
+CONFIG_FB_CARILLO_RANCH=m
+CONFIG_FB_MATROX=m
+CONFIG_FB_MATROX_MILLENIUM=y
+CONFIG_FB_MATROX_MYSTIQUE=y
+CONFIG_FB_MATROX_G=y
+CONFIG_FB_MATROX_I2C=m
+CONFIG_FB_MATROX_MAVEN=m
+CONFIG_FB_RADEON=m
+CONFIG_FB_RADEON_I2C=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+# CONFIG_FB_RADEON_DEBUG is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_BACKLIGHT=y
+CONFIG_FB_S3=m
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
+CONFIG_FB_SIS=m
+CONFIG_FB_SIS_300=y
+CONFIG_FB_SIS_315=y
+CONFIG_FB_VIA=m
+# CONFIG_FB_VIA_DIRECT_PROCFS is not set
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_KYRO=m
+CONFIG_FB_3DFX=m
+# CONFIG_FB_3DFX_ACCEL is not set
+CONFIG_FB_3DFX_I2C=y
+CONFIG_FB_VOODOO1=m
+CONFIG_FB_VT8623=m
+CONFIG_FB_TRIDENT=m
+CONFIG_FB_ARK=m
+CONFIG_FB_PM3=m
+CONFIG_FB_CARMINE=m
+CONFIG_FB_CARMINE_DRAM_EVAL=y
+# CONFIG_CARMINE_DRAM_CUSTOM is not set
+CONFIG_FB_GEODE=y
+CONFIG_FB_GEODE_LX=m
+CONFIG_FB_GEODE_GX=m
+CONFIG_FB_GEODE_GX1=m
+CONFIG_FB_TMIO=m
+CONFIG_FB_TMIO_ACCELL=y
+CONFIG_FB_UDL=m
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_METRONOME=m
+CONFIG_FB_MB862XX=m
+CONFIG_FB_MB862XX_PCI_GDC=y
+CONFIG_FB_BROADSHEET=m
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_PLATFORM=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_GENERIC=m
+CONFIG_BACKLIGHT_PROGEAR=m
+CONFIG_BACKLIGHT_CARILLO_RANCH=m
+CONFIG_BACKLIGHT_APPLE=m
+CONFIG_BACKLIGHT_SAHARA=m
+CONFIG_BACKLIGHT_ADP8860=m
+CONFIG_BACKLIGHT_PCF50633=m
+
+#
+# Display device support
+#
+CONFIG_DISPLAY_SUPPORT=m
+
+#
+# Display hardware drivers
+#
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+CONFIG_VGACON_SOFT_SCROLLBACK=y
+CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+CONFIG_LOGO_LINUX_CLUT224=y
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_JACK=y
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_SEQUENCER_OSS=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_DYNAMIC_MINORS=y
+# CONFIG_SND_SUPPORT_OLD_API is not set
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_DMA_SGBUF=y
+CONFIG_SND_RAWMIDI_SEQ=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_VX_LIB=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_PCSP is not set
+CONFIG_SND_DUMMY=m
+CONFIG_SND_ALOOP=m
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+CONFIG_SND_SB_COMMON=m
+CONFIG_SND_SB16_DSP=m
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ALI5451=m
+CONFIG_SND_ASIHPI=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
+CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_CS5530=m
+CONFIG_SND_CS5535AUDIO=m
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_ES1968_INPUT=y
+CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
+CONFIG_SND_FM801_TEA575X=m
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+# CONFIG_SND_HDA_INPUT_BEEP is not set
+CONFIG_SND_HDA_INPUT_JACK=y
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_CODEC_REALTEK=y
+CONFIG_SND_HDA_CODEC_ANALOG=y
+CONFIG_SND_HDA_CODEC_SIGMATEL=y
+CONFIG_SND_HDA_CODEC_VIA=y
+CONFIG_SND_HDA_CODEC_HDMI=y
+CONFIG_SND_HDA_CODEC_CIRRUS=y
+CONFIG_SND_HDA_CODEC_CONEXANT=y
+CONFIG_SND_HDA_CODEC_CA0110=y
+CONFIG_SND_HDA_CODEC_CMEDIA=y
+CONFIG_SND_HDA_CODEC_SI3054=y
+CONFIG_SND_HDA_GENERIC=y
+# CONFIG_SND_HDA_POWER_SAVE is not set
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1712=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_LX6464ES=m
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MAESTRO3_INPUT=y
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
+CONFIG_SND_USB_US122L=m
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_FIREWIRE=y
+CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_FIREWIRE_SPEAKERS=m
+CONFIG_SND_PCMCIA=y
+CONFIG_SND_VXPOCKET=m
+CONFIG_SND_PDAUDIOCF=m
+# CONFIG_SND_SOC is not set
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=m
+CONFIG_HIDRAW=y
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# Special HID drivers
+#
+CONFIG_HID_3M_PCT=m
+CONFIG_HID_A4TECH=m
+CONFIG_HID_ACRUX=m
+CONFIG_HID_ACRUX_FF=m
+CONFIG_HID_APPLE=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_CANDO=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EMS_FF=m
+CONFIG_HID_ELECOM=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LOGITECH=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_LOGIWII_FF=y
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MOSART=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_QUANTA=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_ROCCAT_COMMON=m
+CONFIG_HID_ROCCAT_ARVO=m
+CONFIG_HID_ROCCAT_KONE=m
+CONFIG_HID_ROCCAT_KONEPLUS=m
+CONFIG_HID_ROCCAT_KOVAPLUS=m
+CONFIG_HID_ROCCAT_PYRA=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SONY=m
+CONFIG_HID_STANTUM=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_GREENASIA=m
+CONFIG_GREENASIA_FF=y
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_WACOM=m
+CONFIG_HID_WACOM_POWER_SUPPLY=y
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
+CONFIG_HID_ZYDACRON=m
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+CONFIG_USB_SUSPEND=y
+# CONFIG_USB_OTG is not set
+CONFIG_USB_MON=y
+CONFIG_USB_WUSB=m
+CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_C67X00_HCD=m
+CONFIG_USB_XHCI_HCD=m
+# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_ISP1760_HCD=m
+CONFIG_USB_ISP1362_HCD=m
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_SSB=y
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_U132_HCD=m
+CONFIG_USB_SL811_HCD=m
+CONFIG_USB_SL811_CS=m
+CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_WHCI_HCD=m
+CONFIG_USB_HWA_HCD=m
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+CONFIG_USB_UAS=m
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+
+#
+# USB port drivers
+#
+CONFIG_USB_USS720=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_EZUSB=y
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_FUNSOFT=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MOTOROLA=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_HP4X=m
+CONFIG_USB_SERIAL_SAFE=m
+CONFIG_USB_SERIAL_SAFE_PADDED=y
+CONFIG_USB_SERIAL_SAMBA=m
+CONFIG_USB_SERIAL_SIEMENS_MPI=m
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
+CONFIG_USB_SERIAL_ZIO=m
+CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_DEBUG=m
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_RIO500=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_LED=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_FTDI_ELAN=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_SISUSBVGA_CON=y
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_YUREX=m
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+# CONFIG_USB_GADGET is not set
+
+#
+# OTG and related infrastructure
+#
+CONFIG_USB_OTG_UTILS=y
+CONFIG_USB_GPIO_VBUS=m
+CONFIG_NOP_USB_XCEIV=m
+CONFIG_UWB=m
+CONFIG_UWB_HWA=m
+CONFIG_UWB_WHCI=m
+CONFIG_UWB_I1480U=m
+CONFIG_MMC=m
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+# CONFIG_MMC_CLKGATE is not set
+
+#
+# MMC/SD/SDIO Card Drivers
+#
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_MINORS=8
+CONFIG_MMC_BLOCK_BOUNCE=y
+CONFIG_SDIO_UART=m
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_WBSD=m
+CONFIG_MMC_TIFM_SD=m
+CONFIG_MMC_SDRICOH_CS=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_USHC=m
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_MEMSTICK_R592=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_NET5501=m
+CONFIG_LEDS_ALIX2=m
+CONFIG_LEDS_PCA9532=m
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GPIO_PLATFORM=y
+CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP5521=m
+CONFIG_LEDS_LP5523=m
+CONFIG_LEDS_CLEVO_MAIL=m
+CONFIG_LEDS_PCA955X=m
+CONFIG_LEDS_REGULATOR=m
+CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_INTEL_SS4200=m
+CONFIG_LEDS_LT3593=m
+CONFIG_LEDS_DELL_NETBOOKS=m
+CONFIG_LEDS_TRIGGERS=y
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+# CONFIG_NFC_DEVICES is not set
+CONFIG_ACCESSIBILITY=y
+CONFIG_A11Y_BRAILLE_CONSOLE=y
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_USER_MEM=y
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_MTHCA=m
+CONFIG_INFINIBAND_MTHCA_DEBUG=y
+# CONFIG_INFINIBAND_IPATH is not set
+CONFIG_INFINIBAND_QIB=m
+CONFIG_INFINIBAND_AMSO1100=m
+# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
+# CONFIG_INFINIBAND_CXGB3 is not set
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_INFINIBAND_NES=m
+# CONFIG_INFINIBAND_NES_DEBUG is not set
+CONFIG_INFINIBAND_IPOIB=m
+# CONFIG_INFINIBAND_IPOIB_CM is not set
+CONFIG_INFINIBAND_IPOIB_DEBUG=y
+# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_EDAC=y
+
+#
+# Reporting subsystems
+#
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_DECODE_MCE=y
+CONFIG_EDAC_MCE_INJ=m
+# CONFIG_EDAC_MM_EDAC is not set
+CONFIG_RTC_LIB=m
+CONFIG_RTC_CLASS=m
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+CONFIG_RTC_DRV_TEST=m
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_ISL12022=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_PCF50633=m
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_INTEL_MID_DMAC=m
+CONFIG_INTEL_IOATDMA=m
+CONFIG_TIMB_DMA=m
+CONFIG_PCH_DMA=m
+CONFIG_DMA_ENGINE=y
+
+#
+# DMA Clients
+#
+CONFIG_NET_DMA=y
+# CONFIG_ASYNC_TX_DMA is not set
+CONFIG_DMATEST=m
+CONFIG_DCA=m
+CONFIG_AUXDISPLAY=y
+# CONFIG_KS0108 is not set
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_PDRV=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+CONFIG_STAGING=y
+# CONFIG_STAGING_EXCLUDE_BUILD is not set
+CONFIG_STALLION=m
+CONFIG_ISTALLION=m
+CONFIG_DIGIEPCA=m
+CONFIG_RISCOM8=m
+CONFIG_SPECIALIX=m
+CONFIG_COMPUTONE=m
+# CONFIG_ET131X is not set
+# CONFIG_SLICOSS is not set
+# CONFIG_VIDEO_GO7007 is not set
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=m
+CONFIG_DVB_CXD2099=m
+# CONFIG_USB_IP_COMMON is not set
+# CONFIG_W35UND is not set
+# CONFIG_PRISM2_USB is not set
+# CONFIG_ECHO is not set
+CONFIG_BRCM80211=m
+CONFIG_BRCMSMAC=y
+# CONFIG_BRCMFMAC is not set
+# CONFIG_BRCMDBG is not set
+CONFIG_RT2860=m
+CONFIG_RT2870=m
+# CONFIG_COMEDI is not set
+# CONFIG_ASUS_OLED is not set
+# CONFIG_PANEL is not set
+CONFIG_R8187SE=m
+CONFIG_RTL8192U=m
+CONFIG_RTL8192E=m
+CONFIG_R8712U=m
+# CONFIG_R8712_AP is not set
+CONFIG_RTS_PSTOR=m
+# CONFIG_RTS_PSTOR_DEBUG is not set
+# CONFIG_TRANZPORT is not set
+CONFIG_POHMELFS=m
+# CONFIG_POHMELFS_DEBUG is not set
+CONFIG_POHMELFS_CRYPTO=y
+CONFIG_IDE_PHISON=m
+CONFIG_LINE6_USB=m
+# CONFIG_LINE6_USB_DEBUG is not set
+# CONFIG_LINE6_USB_DUMP_CTRL is not set
+# CONFIG_LINE6_USB_DUMP_MIDI is not set
+# CONFIG_LINE6_USB_DUMP_PCM is not set
+# CONFIG_LINE6_USB_RAW is not set
+# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
+CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_NOUVEAU=m
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+CONFIG_DRM_NOUVEAU_DEBUG=y
+
+#
+# I2C encoder or helper chips
+#
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+CONFIG_USB_SERIAL_QUATECH2=m
+CONFIG_USB_SERIAL_QUATECH_USB2=m
+CONFIG_VT6655=m
+CONFIG_VT6656=m
+# CONFIG_HYPERV is not set
+# CONFIG_VME_BUS is not set
+CONFIG_DX_SEP=m
+# CONFIG_IIO is not set
+CONFIG_XVMALLOC=y
+CONFIG_ZRAM=m
+# CONFIG_ZRAM_DEBUG is not set
+CONFIG_WLAGS49_H2=m
+CONFIG_WLAGS49_H25=m
+CONFIG_FB_SM7XX=m
+CONFIG_VIDEO_DT3155=m
+CONFIG_DT3155_CCIR=y
+CONFIG_CRYSTALHD=m
+# CONFIG_CXT1E1 is not set
+CONFIG_FB_XGI=m
+CONFIG_LIRC_STAGING=y
+CONFIG_LIRC_BT829=m
+CONFIG_LIRC_IGORPLUGUSB=m
+CONFIG_LIRC_IMON=m
+CONFIG_LIRC_PARALLEL=m
+CONFIG_LIRC_SASEM=m
+CONFIG_LIRC_SERIAL=m
+CONFIG_LIRC_SERIAL_TRANSMITTER=y
+CONFIG_LIRC_SIR=m
+CONFIG_LIRC_TTUSBIR=m
+CONFIG_LIRC_ZILOG=m
+CONFIG_EASYCAP=m
+CONFIG_EASYCAP_SND=y
+# CONFIG_EASYCAP_OSS is not set
+# CONFIG_EASYCAP_DEBUG is not set
+CONFIG_SOLO6X10=m
+CONFIG_ACPI_QUICKSTART=m
+CONFIG_MACH_NO_WESTBRIDGE=y
+CONFIG_SBE_2T3E3=m
+CONFIG_ATH6K_LEGACY=m
+CONFIG_AR600x_SD31_XXX=y
+# CONFIG_AR600x_WB31_XXX is not set
+# CONFIG_AR600x_SD32_XXX is not set
+# CONFIG_AR600x_CUSTOM_XXX is not set
+# CONFIG_ATH6KL_ENABLE_COEXISTENCE is not set
+# CONFIG_ATH6KL_HCI_BRIDGE is not set
+# CONFIG_ATH6KL_CFG80211 is not set
+# CONFIG_ATH6KL_HTC_RAW_INTERFACE is not set
+# CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER is not set
+# CONFIG_ATH6KL_SKIP_ABI_VERSION_CHECK is not set
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_USB_ENESTORAGE is not set
+# CONFIG_BCM_WIMAX is not set
+# CONFIG_FT1000 is not set
+
+#
+# Speakup console speech
+#
+CONFIG_SPEAKUP=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_ACNTPC=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_DECPC=m
+CONFIG_SPEAKUP_SYNTH_DTLK=m
+CONFIG_SPEAKUP_SYNTH_KEYPC=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
+CONFIG_SPEAKUP_SYNTH_DUMMY=m
+CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
+CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
+CONFIG_DRM_PSB=m
+
+#
+# Altera FPGA firmware download module
+#
+# CONFIG_ALTERA_STAPL is not set
+CONFIG_X86_PLATFORM_DEVICES=y
+CONFIG_ACER_WMI=m
+CONFIG_ACERHDF=m
+CONFIG_ASUS_LAPTOP=m
+CONFIG_DELL_LAPTOP=m
+CONFIG_DELL_WMI=m
+CONFIG_DELL_WMI_AIO=m
+CONFIG_FUJITSU_LAPTOP=m
+# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
+CONFIG_HP_ACCEL=m
+CONFIG_HP_WMI=m
+CONFIG_MSI_LAPTOP=m
+CONFIG_PANASONIC_LAPTOP=m
+CONFIG_COMPAL_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
+CONFIG_SONYPI_COMPAT=y
+CONFIG_IDEAPAD_LAPTOP=m
+CONFIG_THINKPAD_ACPI=m
+CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
+# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
+# CONFIG_THINKPAD_ACPI_DEBUG is not set
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
+CONFIG_THINKPAD_ACPI_VIDEO=y
+CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+CONFIG_SENSORS_HDAPS=m
+CONFIG_INTEL_MENLOW=m
+CONFIG_EEEPC_LAPTOP=m
+CONFIG_ASUS_WMI=m
+CONFIG_ASUS_NB_WMI=m
+CONFIG_EEEPC_WMI=m
+CONFIG_ACPI_WMI=m
+CONFIG_MSI_WMI=m
+CONFIG_ACPI_ASUS=m
+CONFIG_TOPSTAR_LAPTOP=m
+CONFIG_ACPI_TOSHIBA=m
+CONFIG_TOSHIBA_BT_RFKILL=m
+CONFIG_ACPI_CMPC=m
+CONFIG_INTEL_IPS=m
+# CONFIG_IBM_RTL is not set
+# CONFIG_XO15_EBOOK is not set
+CONFIG_SAMSUNG_LAPTOP=m
+
+#
+# Firmware Drivers
+#
+CONFIG_EDD=m
+CONFIG_EDD_OFF=y
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_EFI_VARS=m
+CONFIG_DELL_RBU=m
+CONFIG_DCDBAS=m
+CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=m
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
+CONFIG_SIGMA=m
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=m
+CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
+CONFIG_EXT3_FS_XATTR=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_EXT4_FS=m
+CONFIG_EXT4_FS_XATTR=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD=m
+# CONFIG_JBD_DEBUG is not set
+CONFIG_JBD2=m
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=m
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_OCFS2_FS_O2CB=m
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+# CONFIG_OCFS2_FS_STATS is not set
+CONFIG_OCFS2_DEBUG_MASKLOG=y
+# CONFIG_OCFS2_DEBUG_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+CONFIG_NILFS2_FS=m
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=m
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_QUOTACTL_COMPAT=y
+CONFIG_AUTOFS4_FS=m
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_GENERIC_ACL=y
+
+#
+# Caches
+#
+CONFIG_FSCACHE=m
+# CONFIG_FSCACHE_STATS is not set
+# CONFIG_FSCACHE_HISTOGRAM is not set
+# CONFIG_FSCACHE_DEBUG is not set
+# CONFIG_FSCACHE_OBJECT_LIST is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_HISTOGRAM is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+CONFIG_NTFS_RW=y
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_CONFIGFS_FS=y
+CONFIG_MISC_FILESYSTEMS=y
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+CONFIG_AFFS_FS=m
+# CONFIG_ECRYPT_FS is not set
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+CONFIG_BFS_FS=m
+CONFIG_EFS_FS=m
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_UBIFS_FS=m
+CONFIG_UBIFS_FS_XATTR=y
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+# CONFIG_UBIFS_FS_DEBUG is not set
+CONFIG_LOGFS=m
+CONFIG_CRAMFS=m
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_SQUASHFS_EMBEDDED=y
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+CONFIG_VXFS_FS=m
+CONFIG_MINIX_FS=m
+CONFIG_OMFS_FS=m
+CONFIG_HPFS_FS=m
+CONFIG_QNX4FS_FS=m
+CONFIG_ROMFS_FS=y
+CONFIG_ROMFS_BACKED_BY_BLOCK=y
+CONFIG_ROMFS_ON_BLOCK=y
+CONFIG_PSTORE=y
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+CONFIG_EXOFS_FS=m
+# CONFIG_EXOFS_DEBUG is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V4=y
+# CONFIG_NFS_V4_1 is not set
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+# CONFIG_NFS_USE_NEW_IDMAPPER is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_DEPRECATED=y
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+CONFIG_NFSD_V4=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+CONFIG_SUNRPC_XPRT_RDMA=m
+CONFIG_RPCSEC_GSS_KRB5=y
+CONFIG_CEPH_FS=m
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+CONFIG_CIFS_WEAK_PW_HASH=y
+# CONFIG_CIFS_UPCALL is not set
+# CONFIG_CIFS_XATTR is not set
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_DFS_UPCALL is not set
+CONFIG_CIFS_FSCACHE=y
+# CONFIG_CIFS_EXPERIMENTAL is not set
+CONFIG_NCP_FS=m
+CONFIG_NCPFS_PACKET_SIGNING=y
+CONFIG_NCPFS_IOCTL_LOCKING=y
+CONFIG_NCPFS_STRONG=y
+CONFIG_NCPFS_NFS_NS=y
+CONFIG_NCPFS_OS2_NS=y
+CONFIG_NCPFS_SMALLDOS=y
+CONFIG_NCPFS_NLS=y
+CONFIG_NCPFS_EXTRAS=y
+CONFIG_CODA_FS=m
+CONFIG_AFS_FS=m
+# CONFIG_AFS_DEBUG is not set
+# CONFIG_AFS_FSCACHE is not set
+CONFIG_9P_FS=m
+# CONFIG_9P_FSCACHE is not set
+# CONFIG_9P_FS_POSIX_ACL is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+CONFIG_OSF_PARTITION=y
+CONFIG_AMIGA_PARTITION=y
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_UNIXWARE_DISKLABEL=y
+# CONFIG_LDM_PARTITION is not set
+CONFIG_SGI_PARTITION=y
+# CONFIG_ULTRIX_PARTITION is not set
+CONFIG_SUN_PARTITION=y
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_UTF8=m
+CONFIG_DLM=m
+# CONFIG_DLM_DEBUG is not set
+
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_PRINTK_TIME=y
+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=0
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_STRIP_ASM_SYMS=y
+CONFIG_UNUSED_SYMBOLS=y
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+# CONFIG_LOCKUP_DETECTOR is not set
+# CONFIG_HARDLOCKUP_DETECTOR is not set
+CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+CONFIG_TIMER_STATS=y
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+CONFIG_STACKTRACE=y
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# CONFIG_LKDTM is not set
+CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_LATENCYTOP is not set
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FTRACE_NMI_ENTER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
+CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_RING_BUFFER=y
+CONFIG_FTRACE_NMI_ENTER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_FTRACE_SYSCALLS is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+# CONFIG_STACK_TRACER is not set
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_DYNAMIC_FTRACE=y
+# CONFIG_FUNCTION_PROFILER is not set
+CONFIG_FTRACE_MCOUNT_RECORD=y
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_MMIOTRACE is not set
+CONFIG_RING_BUFFER_BENCHMARK=m
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_DMA_API_DEBUG is not set
+CONFIG_ATOMIC64_SELFTEST=y
+CONFIG_ASYNC_RAID6_TEST=m
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+CONFIG_HAVE_ARCH_KMEMCHECK=y
+# CONFIG_TEST_KSTRTOX is not set
+CONFIG_STRICT_DEVMEM=y
+CONFIG_X86_VERBOSE_BOOTUP=y
+CONFIG_EARLY_PRINTK=y
+# CONFIG_EARLY_PRINTK_DBGP is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_X86_PTDUMP is not set
+CONFIG_DEBUG_RODATA=y
+CONFIG_DEBUG_RODATA_TEST=y
+# CONFIG_DEBUG_SET_MODULE_RONX is not set
+# CONFIG_DEBUG_NX_TEST is not set
+# CONFIG_IOMMU_DEBUG is not set
+# CONFIG_IOMMU_STRESS is not set
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+CONFIG_IO_DELAY_TYPE_0X80=0
+CONFIG_IO_DELAY_TYPE_0XED=1
+CONFIG_IO_DELAY_TYPE_UDELAY=2
+CONFIG_IO_DELAY_TYPE_NONE=3
+CONFIG_IO_DELAY_0X80=y
+# CONFIG_IO_DELAY_0XED is not set
+# CONFIG_IO_DELAY_UDELAY is not set
+# CONFIG_IO_DELAY_NONE is not set
+CONFIG_DEFAULT_IO_DELAY_TYPE=0
+# CONFIG_DEBUG_BOOT_PARAMS is not set
+# CONFIG_CPA_DEBUG is not set
+CONFIG_OPTIMIZE_INLINING=y
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+CONFIG_TRUSTED_KEYS=m
+CONFIG_ENCRYPTED_KEYS=m
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
+CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_NETWORK_XFRM=y
+# CONFIG_SECURITY_PATH is not set
+# CONFIG_SECURITY_SELINUX is not set
+# CONFIG_SECURITY_TOMOYO is not set
+# CONFIG_SECURITY_APPARMOR is not set
+# CONFIG_IMA is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_XOR_BLOCKS=y
+CONFIG_ASYNC_CORE=y
+CONFIG_ASYNC_MEMCPY=y
+CONFIG_ASYNC_XOR=y
+CONFIG_ASYNC_PQ=y
+CONFIG_ASYNC_RAID6_RECOV=y
+CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
+CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=m
+CONFIG_CRYPTO_PCOMP2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_WORKQUEUE=y
+CONFIG_CRYPTO_CRYPTD=y
+CONFIG_CRYPTO_AUTHENC=y
+CONFIG_CRYPTO_TEST=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_SEQIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_LRW=y
+CONFIG_CRYPTO_PCBC=y
+CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_FPU=y
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=y
+CONFIG_CRYPTO_VMAC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_MD4=y
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=y
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_TGR192=y
+CONFIG_CRYPTO_WP512=y
+CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_X86_64=y
+CONFIG_CRYPTO_AES_NI_INTEL=y
+CONFIG_CRYPTO_ANUBIS=y
+CONFIG_CRYPTO_ARC4=y
+CONFIG_CRYPTO_BLOWFISH=y
+CONFIG_CRYPTO_CAMELLIA=y
+CONFIG_CRYPTO_CAST5=y
+CONFIG_CRYPTO_CAST6=y
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_FCRYPT=y
+CONFIG_CRYPTO_KHAZAD=y
+CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_SALSA20_X86_64=m
+CONFIG_CRYPTO_SEED=y
+CONFIG_CRYPTO_SERPENT=y
+CONFIG_CRYPTO_TEA=y
+CONFIG_CRYPTO_TWOFISH=y
+CONFIG_CRYPTO_TWOFISH_COMMON=y
+CONFIG_CRYPTO_TWOFISH_X86_64=y
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_ZLIB=m
+CONFIG_CRYPTO_LZO=m
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_CRYPTO_DEV_HIFN_795X=m
+CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+CONFIG_HAVE_KVM=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_APIC_ARCHITECTURE=y
+CONFIG_KVM_MMIO=y
+CONFIG_KVM_ASYNC_PF=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
+CONFIG_KVM_MMU_AUDIT=y
+CONFIG_VHOST_NET=m
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_RING=m
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=y
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=m
+CONFIG_CRC_ITU_T=y
+CONFIG_CRC32=y
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=y
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_BCJ=y
+# CONFIG_XZ_DEC_TEST is not set
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_BCH=m
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_BTREE=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_CHECK_SIGNATURE=y
+CONFIG_CPU_RMAP=y
+CONFIG_NLATTR=y
+CONFIG_LRU_CACHE=m
+CONFIG_AVERAGE=y
diff --git a/testing/source/linux-2.6.39-rc4-configs/config-huge-2.6.39-rc4 b/testing/source/linux-2.6.39-rc4-configs/config-huge-2.6.39-rc4
new file mode 100644
index 00000000..c812683d
--- /dev/null
+++ b/testing/source/linux-2.6.39-rc4-configs/config-huge-2.6.39-rc4
@@ -0,0 +1,5246 @@
+#
+# Automatically generated make config: don't edit
+# Linux/x86_64 2.6.39-rc4 Kernel Configuration
+# Tue Apr 19 13:14:59 2011
+#
+CONFIG_64BIT=y
+# CONFIG_X86_32 is not set
+CONFIG_X86_64=y
+CONFIG_X86=y
+CONFIG_INSTRUCTION_DECODER=y
+CONFIG_OUTPUT_FORMAT="elf64-x86-64"
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_MMU=y
+CONFIG_ZONE_DMA=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_DEFAULT_IDLE=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ZONE_DMA32=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_AUDIT_ARCH=y
+CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_X86_64_SMP=y
+CONFIG_X86_HT=y
+CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
+# CONFIG_KTIME_SCALAR is not set
+CONFIG_ARCH_CPU_PROBE_RELEASE=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_CONSTRUCTORS=y
+CONFIG_HAVE_IRQ_WORK=y
+CONFIG_IRQ_WORK=y
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_CROSS_COMPILE=""
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_LZO=y
+# CONFIG_KERNEL_GZIP is not set
+# CONFIG_KERNEL_BZIP2 is not set
+CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_XZ is not set
+# CONFIG_KERNEL_LZO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+# CONFIG_FHANDLE is not set
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_AUDIT=y
+CONFIG_AUDITSYSCALL=y
+CONFIG_AUDIT_WATCH=y
+CONFIG_AUDIT_TREE=y
+CONFIG_HAVE_GENERIC_HARDIRQS=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_HAVE_SPARSE_IRQ=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_IRQ_FORCED_THREADING=y
+# CONFIG_SPARSE_IRQ is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_PREEMPT_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_RCU_FAST_NO_HZ is not set
+# CONFIG_TREE_RCU_TRACE is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=15
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+CONFIG_CGROUPS=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_CGROUP_NS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_RESOURCE_COUNTERS=y
+CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_RT_GROUP_SCHED=y
+CONFIG_BLK_CGROUP=y
+# CONFIG_DEBUG_BLK_CGROUP is not set
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_SCHED_AUTOGROUP=y
+CONFIG_MM_OWNER=y
+# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+# CONFIG_EXPERT is not set
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_HAVE_PERF_EVENTS=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_PERF_COUNTERS is not set
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_PCI_QUIRKS=y
+CONFIG_SLUB_DEBUG=y
+CONFIG_COMPAT_BRK=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+CONFIG_OPROFILE=m
+# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+# CONFIG_JUMP_LABEL is not set
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_STOP_MACHINE=y
+CONFIG_BLOCK=y
+CONFIG_BLK_DEV_BSG=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
+CONFIG_BLK_DEV_THROTTLING=y
+CONFIG_BLOCK_COMPAT=y
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_CFQ_GROUP_IOSCHED=y
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_PADATA=y
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_FREEZER=y
+
+#
+# Processor type and features
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_SMP=y
+CONFIG_X86_MPPARSE=y
+# CONFIG_X86_EXTENDED_PLATFORM is not set
+CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+# CONFIG_PARAVIRT_GUEST is not set
+CONFIG_NO_BOOTMEM=y
+CONFIG_MEMTEST=y
+# CONFIG_MK8 is not set
+# CONFIG_MPSC is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
+CONFIG_GENERIC_CPU=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_CMPXCHG=y
+CONFIG_CMPXCHG_LOCAL=y
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_XADD=y
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_TSC=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=64
+CONFIG_X86_DEBUGCTLMSR=y
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_DMI=y
+CONFIG_GART_IOMMU=y
+# CONFIG_CALGARY_IOMMU is not set
+# CONFIG_AMD_IOMMU is not set
+CONFIG_SWIOTLB=y
+CONFIG_IOMMU_HELPER=y
+# CONFIG_IOMMU_API is not set
+# CONFIG_MAXSMP is not set
+CONFIG_NR_CPUS=32
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_MCE=y
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_AMD=y
+CONFIG_X86_MCE_THRESHOLD=y
+CONFIG_X86_MCE_INJECT=m
+CONFIG_X86_THERMAL_VECTOR=y
+CONFIG_I8K=m
+CONFIG_MICROCODE=m
+CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_AMD=y
+CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=m
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_DIRECT_GBPAGES=y
+# CONFIG_NUMA is not set
+CONFIG_ARCH_PROC_KCORE_TEXT=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_MEMORY_PROBE=y
+CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_HAVE_MEMORY_PRESENT=y
+CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
+CONFIG_SPARSEMEM_VMEMMAP=y
+CONFIG_HAVE_MEMBLOCK=y
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_SPARSE=y
+CONFIG_MEMORY_HOTREMOVE=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_COMPACTION=y
+CONFIG_MIGRATION=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_MMU_NOTIFIER=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=98304
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+# CONFIG_MEMORY_FAILURE is not set
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
+CONFIG_X86_RESERVE_LOW=64
+CONFIG_MTRR=y
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
+CONFIG_X86_PAT=y
+CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_EFI=y
+CONFIG_SECCOMP=y
+CONFIG_CC_STACKPROTECTOR=y
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
+CONFIG_HZ_1000=y
+CONFIG_HZ=1000
+CONFIG_SCHED_HRTICK=y
+# CONFIG_KEXEC is not set
+# CONFIG_CRASH_DUMP is not set
+CONFIG_PHYSICAL_START=0x1000000
+# CONFIG_RELOCATABLE is not set
+CONFIG_PHYSICAL_ALIGN=0x1000000
+CONFIG_HOTPLUG_CPU=y
+CONFIG_COMPAT_VDSO=y
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+
+#
+# Power management and ACPI options
+#
+CONFIG_ARCH_HIBERNATION_HEADER=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+CONFIG_HIBERNATE_CALLBACKS=y
+CONFIG_HIBERNATION=y
+CONFIG_PM_STD_PARTITION="\"\""
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_ACPI=y
+CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_PROCFS=y
+CONFIG_ACPI_PROCFS_POWER=y
+CONFIG_ACPI_POWER_METER=m
+CONFIG_ACPI_EC_DEBUGFS=m
+CONFIG_ACPI_PROC_EVENT=y
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=m
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_PROCESSOR=m
+CONFIG_ACPI_IPMI=m
+CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
+CONFIG_ACPI_THERMAL=m
+# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_BLACKLIST_YEAR=0
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_PCI_SLOT=m
+CONFIG_X86_PM_TIMER=y
+CONFIG_ACPI_CONTAINER=m
+CONFIG_ACPI_HOTPLUG_MEMORY=m
+CONFIG_ACPI_SBS=m
+CONFIG_ACPI_HED=m
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=m
+CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_APEI_EINJ=m
+CONFIG_ACPI_APEI_ERST_DEBUG=m
+CONFIG_SFI=y
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=m
+# CONFIG_CPU_FREQ_DEBUG is not set
+CONFIG_CPU_FREQ_STAT=m
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=m
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+
+#
+# CPUFreq processor drivers
+#
+CONFIG_X86_PCC_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_SPEEDSTEP_CENTRINO=m
+CONFIG_X86_P4_CLOCKMOD=m
+
+#
+# shared options
+#
+CONFIG_X86_SPEEDSTEP_LIB=m
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_INTEL_IDLE=y
+
+#
+# Memory power savings
+#
+CONFIG_I7300_IDLE_IOAT_CHANNEL=y
+CONFIG_I7300_IDLE=m
+
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_DOMAINS=y
+# CONFIG_PCI_CNB20LE_QUIRK is not set
+# CONFIG_DMAR is not set
+# CONFIG_INTR_REMAP is not set
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=m
+CONFIG_PCIEAER=y
+# CONFIG_PCIE_ECRC is not set
+CONFIG_PCIEAER_INJECT=m
+CONFIG_PCIEASPM=y
+# CONFIG_PCIEASPM_DEBUG is not set
+CONFIG_PCIE_PME=y
+CONFIG_ARCH_SUPPORTS_MSI=y
+CONFIG_PCI_MSI=y
+# CONFIG_PCI_DEBUG is not set
+CONFIG_PCI_STUB=m
+CONFIG_HT_IRQ=y
+# CONFIG_PCI_IOV is not set
+CONFIG_PCI_IOAPIC=y
+CONFIG_ISA_DMA_API=y
+CONFIG_AMD_NB=y
+CONFIG_PCCARD=m
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_PCCARD_NONSTATIC=y
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_FAKE=m
+CONFIG_HOTPLUG_PCI_ACPI=m
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
+# CONFIG_HOTPLUG_PCI_CPCI is not set
+CONFIG_HOTPLUG_PCI_SHPC=m
+# CONFIG_RAPIDIO is not set
+
+#
+# Executable file formats / Emulations
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_COMPAT_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_HAVE_AOUT is not set
+CONFIG_BINFMT_MISC=m
+CONFIG_IA32_EMULATION=y
+# CONFIG_IA32_AOUT is not set
+CONFIG_COMPAT=y
+CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
+CONFIG_SYSVIPC_COMPAT=y
+CONFIG_KEYS_COMPAT=y
+CONFIG_HAVE_TEXT_POKE_SMP=y
+CONFIG_NET=y
+CONFIG_COMPAT_NETLINK_MESSAGES=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=y
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+# CONFIG_NET_KEY_MIGRATE is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+# CONFIG_IP_FIB_TRIE_STATS is not set
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_INET_LRO=y
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=m
+CONFIG_IPV6_PRIVACY=y
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_SIT_6RD is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_NETLABEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+# CONFIG_NF_CONNTRACK_EVENTS is not set
+# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
+CONFIG_NF_CT_PROTO_DCCP=m
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_TPROXY=m
+CONFIG_NETFILTER_XTABLES=m
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+CONFIG_NETFILTER_XT_SET=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+# CONFIG_IP_VS_IPV6 is not set
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_NFCT=y
+CONFIG_IP_VS_PE_SIP=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_DCCP=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_QUEUE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+
+#
+# DECnet: Netfilter Configuration
+#
+# CONFIG_DECNET_NF_GRABULATOR is not set
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_ULOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+# CONFIG_IP_DCCP_CCID3 is not set
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_MSG is not set
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_HMAC_NONE is not set
+# CONFIG_SCTP_HMAC_SHA1 is not set
+CONFIG_SCTP_HMAC_MD5=y
+CONFIG_RDS=m
+CONFIG_RDS_RDMA=m
+CONFIG_RDS_TCP=m
+# CONFIG_RDS_DEBUG is not set
+CONFIG_TIPC=m
+# CONFIG_TIPC_ADVANCED is not set
+# CONFIG_TIPC_DEBUG is not set
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_GARP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+# CONFIG_NET_DSA is not set
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_DECNET=m
+# CONFIG_DECNET_ROUTER is not set
+CONFIG_LLC=m
+CONFIG_LLC2=m
+CONFIG_IPX=m
+# CONFIG_IPX_INTERN is not set
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_IPDDP_DECAP=y
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+CONFIG_WAN_ROUTER=m
+# CONFIG_PHONET is not set
+CONFIG_IEEE802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_INGRESS=m
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=y
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=y
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+# CONFIG_NET_CLS_IND is not set
+CONFIG_NET_SCH_FIFO=y
+# CONFIG_DCB is not set
+CONFIG_DNS_RESOLVER=y
+CONFIG_BATMAN_ADV=m
+# CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_XPS=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NET_DROP_MONITOR is not set
+CONFIG_HAMRADIO=y
+
+#
+# Packet Radio protocols
+#
+CONFIG_AX25=m
+# CONFIG_AX25_DAMA_SLAVE is not set
+CONFIG_NETROM=m
+CONFIG_ROSE=m
+
+#
+# AX.25 network device drivers
+#
+CONFIG_MKISS=m
+CONFIG_6PACK=m
+CONFIG_BPQETHER=m
+CONFIG_BAYCOM_SER_FDX=m
+CONFIG_BAYCOM_SER_HDX=m
+CONFIG_BAYCOM_PAR=m
+CONFIG_YAM=m
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+
+#
+# CAN Device Drivers
+#
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_SLCAN=m
+CONFIG_CAN_DEV=m
+# CONFIG_CAN_CALC_BITTIMING is not set
+CONFIG_CAN_JANZ_ICAN3=m
+CONFIG_PCH_CAN=m
+CONFIG_CAN_SJA1000=m
+CONFIG_CAN_SJA1000_PLATFORM=m
+CONFIG_CAN_EMS_PCI=m
+CONFIG_CAN_KVASER_PCI=m
+CONFIG_CAN_PLX_PCI=m
+# CONFIG_CAN_C_CAN is not set
+
+#
+# CAN USB interfaces
+#
+CONFIG_CAN_EMS_USB=m
+CONFIG_CAN_ESD_USB2=m
+CONFIG_CAN_SOFTING=m
+CONFIG_CAN_SOFTING_CS=m
+# CONFIG_CAN_DEBUG_DEVICES is not set
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+# CONFIG_IRDA_ULTRA is not set
+
+#
+# IrDA options
+#
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+# CONFIG_IRDA_DEBUG is not set
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+CONFIG_IRTTY_SIR=m
+
+#
+# Dongle support
+#
+CONFIG_DONGLE=y
+CONFIG_ESI_DONGLE=m
+CONFIG_ACTISYS_DONGLE=m
+CONFIG_TEKRAM_DONGLE=m
+CONFIG_TOIM3232_DONGLE=m
+CONFIG_LITELINK_DONGLE=m
+CONFIG_MA600_DONGLE=m
+CONFIG_GIRBIL_DONGLE=m
+CONFIG_MCP2120_DONGLE=m
+CONFIG_OLD_BELKIN_DONGLE=m
+CONFIG_ACT200L_DONGLE=m
+CONFIG_KINGSUN_DONGLE=m
+CONFIG_KSDAZZLE_DONGLE=m
+CONFIG_KS959_DONGLE=m
+
+#
+# FIR device drivers
+#
+CONFIG_USB_IRDA=m
+CONFIG_SIGMATEL_FIR=m
+CONFIG_NSC_FIR=m
+CONFIG_WINBOND_FIR=m
+CONFIG_SMC_IRCC_FIR=m
+CONFIG_ALI_FIR=m
+CONFIG_VLSI_FIR=m
+CONFIG_VIA_FIR=m
+CONFIG_MCS_FIR=m
+CONFIG_BT=m
+CONFIG_BT_L2CAP=y
+CONFIG_BT_SCO=y
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIBTUART=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_BT_WILINK=m
+CONFIG_AF_RXRPC=m
+# CONFIG_AF_RXRPC_DEBUG is not set
+CONFIG_RXKAD=m
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_REG_DEBUG is not set
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+# CONFIG_CFG80211_INTERNAL_REGDB is not set
+CONFIG_CFG80211_WEXT=y
+CONFIG_WIRELESS_EXT_SYSFS=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_MINSTREL_HT=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+CONFIG_NET_9P_RDMA=m
+# CONFIG_NET_9P_DEBUG is not set
+# CONFIG_CAIF is not set
+CONFIG_CEPH_LIB=m
+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+CONFIG_ARCH_NO_SYSDEV_OPS=y
+CONFIG_CONNECTOR=m
+CONFIG_MTD=m
+# CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_TESTS=m
+CONFIG_MTD_PARTITIONS=y
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+CONFIG_MTD_AR7_PARTS=m
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=m
+CONFIG_HAVE_MTD_OTP=y
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+CONFIG_FTL=m
+CONFIG_NFTL=m
+CONFIG_NFTL_RW=y
+CONFIG_INFTL=m
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
+CONFIG_SM_FTL=m
+CONFIG_MTD_OOPS=m
+CONFIG_MTD_SWAP=m
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_GEN_PROBE=m
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+CONFIG_MTD_MAP_BANK_WIDTH_8=y
+CONFIG_MTD_MAP_BANK_WIDTH_16=y
+CONFIG_MTD_MAP_BANK_WIDTH_32=y
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+CONFIG_MTD_CFI_I4=y
+CONFIG_MTD_CFI_I8=y
+CONFIG_MTD_OTP=y
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_CFI_UTIL=m
+CONFIG_MTD_RAM=m
+CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_PHYSMAP=m
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+CONFIG_MTD_SC520CDP=m
+CONFIG_MTD_NETSC520=m
+CONFIG_MTD_TS5500=m
+CONFIG_MTD_SBC_GXX=m
+CONFIG_MTD_AMD76XROM=m
+CONFIG_MTD_ICHXROM=m
+CONFIG_MTD_ESB2ROM=m
+CONFIG_MTD_CK804XROM=m
+CONFIG_MTD_SCB2_FLASH=m
+CONFIG_MTD_NETtel=m
+CONFIG_MTD_L440GX=m
+CONFIG_MTD_PCI=m
+CONFIG_MTD_PCMCIA=m
+# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
+CONFIG_MTD_GPIO_ADDR=m
+CONFIG_MTD_INTEL_VR_NOR=m
+CONFIG_MTD_PLATRAM=m
+CONFIG_MTD_LATCH_ADDR=m
+
+#
+# Self-contained MTD device drivers
+#
+CONFIG_MTD_PMC551=m
+CONFIG_MTD_PMC551_BUGFIX=y
+# CONFIG_MTD_PMC551_DEBUG is not set
+CONFIG_MTD_SLRAM=m
+CONFIG_MTD_PHRAM=m
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=4096
+CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTD_BLOCK2MTD=m
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+CONFIG_MTD_DOC2001PLUS=m
+CONFIG_MTD_DOCPROBE=m
+CONFIG_MTD_DOCECC=m
+CONFIG_MTD_DOCPROBE_ADVANCED=y
+CONFIG_MTD_DOCPROBE_ADDRESS=0x0000
+CONFIG_MTD_DOCPROBE_HIGH=y
+CONFIG_MTD_DOCPROBE_55AA=y
+CONFIG_MTD_NAND_ECC=m
+CONFIG_MTD_NAND_ECC_SMC=y
+CONFIG_MTD_NAND=m
+CONFIG_MTD_NAND_VERIFY_WRITE=y
+CONFIG_MTD_NAND_BCH=m
+CONFIG_MTD_NAND_ECC_BCH=y
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_MUSEUM_IDS=y
+CONFIG_MTD_NAND_DENALI=m
+CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xFF108018
+CONFIG_MTD_NAND_IDS=m
+CONFIG_MTD_NAND_RICOH=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y
+CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y
+CONFIG_MTD_NAND_CAFE=m
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_PLATFORM=m
+CONFIG_MTD_ALAUDA=m
+CONFIG_MTD_ONENAND=m
+CONFIG_MTD_ONENAND_VERIFY_WRITE=y
+CONFIG_MTD_ONENAND_GENERIC=m
+CONFIG_MTD_ONENAND_OTP=y
+CONFIG_MTD_ONENAND_2X_PROGRAM=y
+CONFIG_MTD_ONENAND_SIM=m
+
+#
+# LPDDR flash memory drivers
+#
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_RESERVE=1
+CONFIG_MTD_UBI_GLUEBI=m
+# CONFIG_MTD_UBI_DEBUG is not set
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
+CONFIG_PARPORT_PC_PCMCIA=m
+# CONFIG_PARPORT_GSC is not set
+CONFIG_PARPORT_AX88796=m
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_PNP=y
+CONFIG_PNP_DEBUG_MESSAGES=y
+
+#
+# Protocols
+#
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_FD=y
+CONFIG_PARIDE=m
+
+#
+# Parallel IDE high-level drivers
+#
+CONFIG_PARIDE_PD=m
+CONFIG_PARIDE_PCD=m
+CONFIG_PARIDE_PF=m
+CONFIG_PARIDE_PT=m
+CONFIG_PARIDE_PG=m
+
+#
+# Parallel IDE protocol modules
+#
+CONFIG_PARIDE_ATEN=m
+CONFIG_PARIDE_BPCK=m
+CONFIG_PARIDE_COMM=m
+CONFIG_PARIDE_DSTR=m
+CONFIG_PARIDE_FIT2=m
+CONFIG_PARIDE_FIT3=m
+CONFIG_PARIDE_EPAT=m
+CONFIG_PARIDE_EPATC8=y
+CONFIG_PARIDE_EPIA=m
+CONFIG_PARIDE_FRIQ=m
+CONFIG_PARIDE_FRPW=m
+CONFIG_PARIDE_KBIC=m
+CONFIG_PARIDE_KTTI=m
+CONFIG_PARIDE_ON20=m
+CONFIG_PARIDE_ON26=m
+CONFIG_BLK_CPQ_DA=y
+CONFIG_BLK_CPQ_CISS_DA=y
+CONFIG_CISS_SCSI_TAPE=y
+CONFIG_BLK_DEV_DAC960=y
+CONFIG_BLK_DEV_UMEM=m
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_OSD=m
+CONFIG_BLK_DEV_SX8=y
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=16384
+# CONFIG_BLK_DEV_XIP is not set
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_ATA_OVER_ETH=m
+CONFIG_VIRTIO_BLK=m
+# CONFIG_BLK_DEV_HD is not set
+CONFIG_BLK_DEV_RBD=m
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_MISC_DEVICES=y
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+CONFIG_IBM_ASM=m
+CONFIG_PHANTOM=m
+CONFIG_SGI_IOC4=m
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+CONFIG_ICS932S401=m
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_CS5535_MFGPT=m
+CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
+CONFIG_CS5535_CLOCK_EVENT_SRC=m
+CONFIG_HP_ILO=m
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1780=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
+CONFIG_VMWARE_BALLOON=m
+CONFIG_BMP085=m
+CONFIG_PCH_PHUB=m
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+CONFIG_IWMC3200TOP=m
+# CONFIG_IWMC3200TOP_DEBUG is not set
+# CONFIG_IWMC3200TOP_DEBUGFS is not set
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
+CONFIG_SENSORS_LIS3_I2C=m
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=y
+CONFIG_RAID_ATTRS=y
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_TGT=y
+CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=y
+CONFIG_CHR_DEV_OSST=m
+CONFIG_BLK_DEV_SR=y
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=y
+CONFIG_SCSI_FC_ATTRS=y
+CONFIG_SCSI_FC_TGT_ATTRS=y
+CONFIG_SCSI_ISCSI_ATTRS=y
+CONFIG_SCSI_SAS_ATTRS=y
+CONFIG_SCSI_SAS_LIBSAS=y
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+CONFIG_SCSI_SRP_ATTRS=m
+CONFIG_SCSI_SRP_TGT_ATTRS=y
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_ISCSI_BOOT_SYSFS=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
+CONFIG_BE2ISCSI=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=y
+CONFIG_SCSI_HPSA=y
+CONFIG_SCSI_3W_9XXX=y
+CONFIG_SCSI_3W_SAS=y
+CONFIG_SCSI_ACARD=y
+CONFIG_SCSI_AACRAID=y
+CONFIG_SCSI_AIC7XXX=y
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=4
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
+CONFIG_AIC7XXX_DEBUG_MASK=0
+# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
+CONFIG_SCSI_AIC7XXX_OLD=y
+CONFIG_SCSI_AIC79XX=y
+CONFIG_AIC79XX_CMDS_PER_DEVICE=4
+CONFIG_AIC79XX_RESET_DELAY_MS=15000
+# CONFIG_AIC79XX_DEBUG_ENABLE is not set
+CONFIG_AIC79XX_DEBUG_MASK=0
+# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
+CONFIG_SCSI_AIC94XX=y
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_MVSAS=y
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_ADVANSYS=y
+CONFIG_SCSI_ARCMSR=y
+# CONFIG_SCSI_ARCMSR_AER is not set
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=y
+CONFIG_MEGARAID_MAILBOX=y
+CONFIG_MEGARAID_LEGACY=y
+CONFIG_MEGARAID_SAS=y
+CONFIG_SCSI_MPT2SAS=y
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+# CONFIG_SCSI_MPT2SAS_LOGGING is not set
+CONFIG_SCSI_HPTIOP=y
+CONFIG_SCSI_BUSLOGIC=y
+CONFIG_VMWARE_PVSCSI=m
+CONFIG_LIBFC=y
+CONFIG_LIBFCOE=y
+CONFIG_FCOE=y
+CONFIG_FCOE_FNIC=y
+CONFIG_SCSI_DMX3191D=y
+CONFIG_SCSI_EATA=y
+# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
+# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
+CONFIG_SCSI_EATA_MAX_TAGS=16
+CONFIG_SCSI_FUTURE_DOMAIN=y
+CONFIG_SCSI_GDTH=y
+CONFIG_SCSI_IPS=y
+CONFIG_SCSI_INITIO=y
+CONFIG_SCSI_INIA100=y
+CONFIG_SCSI_PPA=m
+CONFIG_SCSI_IMM=m
+# CONFIG_SCSI_IZIP_EPP16 is not set
+# CONFIG_SCSI_IZIP_SLOW_CTR is not set
+CONFIG_SCSI_STEX=y
+CONFIG_SCSI_SYM53C8XX_2=y
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_SCSI_IPR=y
+# CONFIG_SCSI_IPR_TRACE is not set
+# CONFIG_SCSI_IPR_DUMP is not set
+CONFIG_SCSI_QLOGIC_1280=y
+CONFIG_SCSI_QLA_FC=y
+CONFIG_SCSI_QLA_ISCSI=y
+CONFIG_SCSI_LPFC=y
+# CONFIG_SCSI_LPFC_DEBUG_FS is not set
+CONFIG_SCSI_DC395x=y
+CONFIG_SCSI_DC390T=y
+CONFIG_SCSI_DEBUG=m
+CONFIG_SCSI_PMCRAID=y
+CONFIG_SCSI_PM8001=y
+CONFIG_SCSI_SRP=y
+CONFIG_SCSI_BFA_FC=y
+CONFIG_SCSI_LOWLEVEL_PCMCIA=y
+CONFIG_PCMCIA_AHA152X=m
+CONFIG_PCMCIA_FDOMAIN=m
+CONFIG_PCMCIA_QLOGIC=m
+CONFIG_PCMCIA_SYM53C500=m
+CONFIG_SCSI_DH=m
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+CONFIG_SCSI_OSD_INITIATOR=m
+CONFIG_SCSI_OSD_ULD=m
+CONFIG_SCSI_OSD_DPRINT_SENSE=1
+# CONFIG_SCSI_OSD_DEBUG is not set
+CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_ACPI=y
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=y
+CONFIG_SATA_AHCI_PLATFORM=y
+CONFIG_SATA_INIC162X=y
+CONFIG_SATA_ACARD_AHCI=y
+CONFIG_SATA_SIL24=y
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=y
+CONFIG_SATA_QSTOR=y
+CONFIG_SATA_SX4=y
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=y
+CONFIG_SATA_MV=y
+CONFIG_SATA_NV=y
+CONFIG_SATA_PROMISE=y
+CONFIG_SATA_SIL=y
+CONFIG_SATA_SIS=y
+CONFIG_SATA_SVW=y
+CONFIG_SATA_ULI=y
+CONFIG_SATA_VIA=y
+CONFIG_SATA_VITESSE=y
+
+#
+# PATA SFF controllers with BMDMA
+#
+CONFIG_PATA_ALI=y
+CONFIG_PATA_AMD=y
+CONFIG_PATA_ARASAN_CF=m
+CONFIG_PATA_ARTOP=y
+CONFIG_PATA_ATIIXP=y
+CONFIG_PATA_ATP867X=y
+CONFIG_PATA_CMD64X=y
+CONFIG_PATA_CS5520=y
+CONFIG_PATA_CS5530=y
+CONFIG_PATA_CS5536=y
+CONFIG_PATA_CYPRESS=y
+CONFIG_PATA_EFAR=y
+CONFIG_PATA_HPT366=y
+CONFIG_PATA_HPT37X=y
+CONFIG_PATA_HPT3X2N=y
+CONFIG_PATA_HPT3X3=y
+CONFIG_PATA_HPT3X3_DMA=y
+CONFIG_PATA_IT8213=y
+CONFIG_PATA_IT821X=y
+CONFIG_PATA_JMICRON=y
+CONFIG_PATA_MARVELL=y
+CONFIG_PATA_NETCELL=y
+CONFIG_PATA_NINJA32=y
+CONFIG_PATA_NS87415=y
+CONFIG_PATA_OLDPIIX=y
+CONFIG_PATA_OPTIDMA=y
+CONFIG_PATA_PDC2027X=y
+CONFIG_PATA_PDC_OLD=y
+CONFIG_PATA_RADISYS=y
+CONFIG_PATA_RDC=y
+CONFIG_PATA_SC1200=y
+CONFIG_PATA_SCH=y
+CONFIG_PATA_SERVERWORKS=y
+CONFIG_PATA_SIL680=y
+CONFIG_PATA_SIS=y
+CONFIG_PATA_TOSHIBA=m
+CONFIG_PATA_TRIFLEX=y
+CONFIG_PATA_VIA=y
+CONFIG_PATA_WINBOND=y
+
+#
+# PIO-only SFF controllers
+#
+CONFIG_PATA_CMD640_PCI=y
+CONFIG_PATA_MPIIX=y
+CONFIG_PATA_NS87410=y
+CONFIG_PATA_OPTI=y
+CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_RZ1000=y
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_PATA_ACPI=y
+CONFIG_ATA_GENERIC=y
+CONFIG_PATA_LEGACY=y
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_AUTODETECT=y
+CONFIG_MD_LINEAR=y
+CONFIG_MD_RAID0=y
+CONFIG_MD_RAID1=y
+CONFIG_MD_RAID10=y
+CONFIG_MD_RAID456=y
+# CONFIG_MULTICORE_RAID456 is not set
+CONFIG_MD_MULTIPATH=y
+CONFIG_MD_FAULTY=m
+CONFIG_BLK_DEV_DM=y
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_CRYPT=y
+CONFIG_DM_SNAPSHOT=y
+CONFIG_DM_MIRROR=y
+CONFIG_DM_RAID=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+# CONFIG_DM_DELAY is not set
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_LOOPBACK_TARGET=m
+# CONFIG_LOOPBACK_TARGET_CDB_DEBUG is not set
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=y
+CONFIG_FUSION_FC=y
+CONFIG_FUSION_SAS=y
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=y
+CONFIG_FUSION_LAN=y
+# CONFIG_FUSION_LOGGING is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_OHCI_DEBUG=y
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_FIREWIRE_NOSY=m
+CONFIG_I2O=y
+CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
+CONFIG_I2O_EXT_ADAPTEC=y
+CONFIG_I2O_EXT_ADAPTEC_DMA64=y
+CONFIG_I2O_CONFIG=y
+# CONFIG_I2O_CONFIG_OLD_IOCTL is not set
+CONFIG_I2O_BUS=y
+CONFIG_I2O_BLOCK=y
+CONFIG_I2O_SCSI=y
+CONFIG_I2O_PROC=y
+CONFIG_MACINTOSH_DRIVERS=y
+CONFIG_MAC_EMUMOUSEBTN=y
+CONFIG_NETDEVICES=y
+CONFIG_IFB=m
+CONFIG_DUMMY=m
+CONFIG_BONDING=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_EQUALIZER=m
+CONFIG_TUN=m
+CONFIG_VETH=m
+CONFIG_NET_SB1000=m
+CONFIG_ARCNET=m
+CONFIG_ARCNET_1201=m
+CONFIG_ARCNET_1051=m
+CONFIG_ARCNET_RAW=m
+CONFIG_ARCNET_CAP=m
+CONFIG_ARCNET_COM90xx=m
+CONFIG_ARCNET_COM90xxIO=m
+CONFIG_ARCNET_RIM_I=m
+CONFIG_ARCNET_COM20020=m
+CONFIG_ARCNET_COM20020_PCI=m
+CONFIG_MII=m
+CONFIG_PHYLIB=m
+
+#
+# MII PHY device drivers
+#
+CONFIG_MARVELL_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM63XX_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_STE10XP=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MICREL_PHY=m
+CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_GPIO=m
+CONFIG_NET_ETHERNET=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_ETHOC=m
+CONFIG_DNET=m
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+CONFIG_TULIP_MMIO=y
+# CONFIG_TULIP_NAPI is not set
+CONFIG_DE4X5=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_PCMCIA_XIRCOM=m
+CONFIG_HP100=m
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
+CONFIG_NET_PCI=y
+CONFIG_PCNET32=m
+CONFIG_AMD8111_ETH=m
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_KSZ884X_PCI=m
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_FORCEDETH=m
+CONFIG_E100=m
+CONFIG_FEALNX=m
+CONFIG_NATSEMI=m
+CONFIG_NE2K_PCI=m
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+CONFIG_8139TOO_PIO=y
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R6040=m
+CONFIG_SIS900=m
+CONFIG_EPIC100=m
+CONFIG_SMSC9420=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_TLAN=m
+CONFIG_KS8842=m
+CONFIG_KS8851_MLL=m
+CONFIG_VIA_RHINE=m
+CONFIG_VIA_RHINE_MMIO=y
+CONFIG_SC92031=m
+CONFIG_NET_POCKET=y
+CONFIG_ATP=m
+CONFIG_DE600=m
+CONFIG_DE620=m
+CONFIG_ATL2=m
+CONFIG_NETDEV_1000=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_DL2K=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IP1000=m
+CONFIG_IGB=m
+CONFIG_IGB_DCA=y
+CONFIG_IGBVF=m
+CONFIG_NS83820=m
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_R8169=m
+CONFIG_SIS190=m
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_VIA_VELOCITY=m
+CONFIG_TIGON3=m
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_QLA3XXX=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_JME=m
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_DA is not set
+CONFIG_STMMAC_DUAL_MAC=y
+CONFIG_PCH_GBE=m
+CONFIG_NETDEV_10000=y
+CONFIG_MDIO=m
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4VF=m
+CONFIG_ENIC=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_DCA=y
+CONFIG_IXGBEVF=m
+CONFIG_IXGB=m
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+CONFIG_MYRI10GE=m
+CONFIG_MYRI10GE_DCA=y
+CONFIG_NETXEN_NIC=m
+CONFIG_NIU=m
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_TEHUTI=m
+CONFIG_BNX2X=m
+CONFIG_QLCNIC=m
+CONFIG_QLGE=m
+CONFIG_BNA=m
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_BE2NET=m
+CONFIG_TR=m
+CONFIG_IBMOL=m
+CONFIG_3C359=m
+CONFIG_TMS380TR=m
+CONFIG_TMSPCI=m
+CONFIG_ABYSS=m
+CONFIG_WLAN=y
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_AIRO=m
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_PCMCIA_ATMEL=m
+CONFIG_AT76C50X_USB=m
+CONFIG_AIRO_CS=m
+CONFIG_PCMCIA_WL3501=m
+CONFIG_PRISM54=m
+CONFIG_USB_ZD1201=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_ADM8211=m
+# CONFIG_MAC80211_HWSIM is not set
+CONFIG_MWL8K=m
+CONFIG_ATH_COMMON=m
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+# CONFIG_ATH5K_TRACER is not set
+CONFIG_ATH5K_PCI=y
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K=m
+# CONFIG_ATH9K_DEBUGFS is not set
+CONFIG_ATH9K_RATE_CONTROL=y
+CONFIG_ATH9K_HTC=m
+# CONFIG_ATH9K_HTC_DEBUGFS is not set
+CONFIG_AR9170_USB=m
+CONFIG_AR9170_LEDS=y
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+CONFIG_CARL9170_WPC=y
+CONFIG_B43=m
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_PCMCIA=y
+CONFIG_B43_SDIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_N=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+# CONFIG_B43LEGACY_DEBUG is not set
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_IWLAGN=m
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_DEBUG is not set
+# CONFIG_IWLWIFI_DEVICE_TRACING is not set
+# CONFIG_IWL_P2P is not set
+CONFIG_IWLWIFI_LEGACY=m
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_LEGACY_DEBUG is not set
+# CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING is not set
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+CONFIG_IWM=m
+# CONFIG_IWM_DEBUG is not set
+# CONFIG_IWM_TRACING is not set
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
+CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_HERMES=m
+# CONFIG_HERMES_PRISM is not set
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_ORINOCO_USB=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_P54_LEDS=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT33XX=y
+CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RT2800_LIB=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_HT=y
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTL8192C_COMMON=m
+CONFIG_WL1251=m
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX_MENU=m
+CONFIG_WL12XX=m
+# CONFIG_WL12XX_HT is not set
+CONFIG_WL12XX_SDIO=m
+CONFIG_WL12XX_SDIO_TEST=m
+CONFIG_WL12XX_PLATFORM_DATA=y
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+
+#
+# WiMAX Wireless Broadband devices
+#
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_SDIO=m
+# CONFIG_WIMAX_IWMC3200_SDIO is not set
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+
+#
+# USB Network Adapters
+#
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+# CONFIG_USB_EPSON2888 is not set
+# CONFIG_USB_KC2190 is not set
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_NET_PCMCIA=y
+CONFIG_PCMCIA_3C589=m
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_PCMCIA_XIRC2PS=m
+CONFIG_PCMCIA_AXNET=m
+CONFIG_ARCNET_COM20020_CS=m
+CONFIG_PCMCIA_IBMTR=m
+CONFIG_WAN=y
+CONFIG_LANMEDIA=m
+CONFIG_HDLC=m
+CONFIG_HDLC_RAW=m
+CONFIG_HDLC_RAW_ETH=m
+CONFIG_HDLC_CISCO=m
+CONFIG_HDLC_FR=m
+CONFIG_HDLC_PPP=m
+
+#
+# X.25/LAPB support is disabled
+#
+CONFIG_PCI200SYN=m
+CONFIG_WANXL=m
+# CONFIG_PC300TOO is not set
+CONFIG_FARSYNC=m
+CONFIG_DSCC4=m
+# CONFIG_DSCC4_PCISYNC is not set
+# CONFIG_DSCC4_PCI_RST is not set
+CONFIG_DLCI=m
+CONFIG_DLCI_MAX=8
+CONFIG_WAN_ROUTER_DRIVERS=m
+CONFIG_CYCLADES_SYNC=m
+CONFIG_CYCLOMX_X25=y
+CONFIG_SBNI=m
+# CONFIG_SBNI_MULTILINE is not set
+CONFIG_ATM_DRIVERS=y
+CONFIG_ATM_DUMMY=m
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+# CONFIG_ATM_ENI_TUNE_BURST is not set
+CONFIG_ATM_FIRESTREAM=m
+CONFIG_ATM_ZATM=m
+# CONFIG_ATM_ZATM_DEBUG is not set
+CONFIG_ATM_NICSTAR=m
+# CONFIG_ATM_NICSTAR_USE_SUNI is not set
+# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_AMBASSADOR=m
+# CONFIG_ATM_AMBASSADOR_DEBUG is not set
+CONFIG_ATM_HORIZON=m
+# CONFIG_ATM_HORIZON_DEBUG is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+# CONFIG_ATM_FORE200E_USE_TASKLET is not set
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+# CONFIG_ATM_HE_USE_SUNI is not set
+CONFIG_ATM_SOLOS=m
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKEHARD=m
+
+#
+# CAIF transport drivers
+#
+CONFIG_FDDI=y
+CONFIG_DEFXX=m
+# CONFIG_DEFXX_MMIO is not set
+CONFIG_SKFP=m
+CONFIG_HIPPI=y
+CONFIG_ROADRUNNER=m
+# CONFIG_ROADRUNNER_LARGE_RINGS is not set
+CONFIG_PLIP=m
+CONFIG_PPP=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOATM=m
+CONFIG_PPPOL2TP=m
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLHC=m
+CONFIG_SLIP_SMART=y
+# CONFIG_SLIP_MODE_SLIP6 is not set
+CONFIG_NET_FC=y
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+# CONFIG_NETPOLL_TRAP is not set
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_VIRTIO_NET=m
+CONFIG_VMXNET3=m
+CONFIG_ISDN=y
+CONFIG_ISDN_I4L=m
+CONFIG_ISDN_PPP=y
+CONFIG_ISDN_PPP_VJ=y
+CONFIG_ISDN_MPP=y
+CONFIG_IPPP_FILTER=y
+CONFIG_ISDN_PPP_BSDCOMP=m
+CONFIG_ISDN_AUDIO=y
+CONFIG_ISDN_TTY_FAX=y
+
+#
+# ISDN feature submodules
+#
+CONFIG_ISDN_DIVERSION=m
+
+#
+# ISDN4Linux hardware drivers
+#
+
+#
+# Passive cards
+#
+CONFIG_ISDN_DRV_HISAX=m
+
+#
+# D-channel protocol features
+#
+CONFIG_HISAX_EURO=y
+CONFIG_DE_AOC=y
+CONFIG_HISAX_NO_SENDCOMPLETE=y
+CONFIG_HISAX_NO_LLC=y
+CONFIG_HISAX_NO_KEYPAD=y
+CONFIG_HISAX_1TR6=y
+CONFIG_HISAX_NI1=y
+CONFIG_HISAX_MAX_CARDS=8
+
+#
+# HiSax supported cards
+#
+CONFIG_HISAX_16_3=y
+CONFIG_HISAX_TELESPCI=y
+CONFIG_HISAX_S0BOX=y
+CONFIG_HISAX_FRITZPCI=y
+CONFIG_HISAX_AVM_A1_PCMCIA=y
+CONFIG_HISAX_ELSA=y
+CONFIG_HISAX_DIEHLDIVA=y
+CONFIG_HISAX_SEDLBAUER=y
+CONFIG_HISAX_NETJET=y
+CONFIG_HISAX_NETJET_U=y
+CONFIG_HISAX_NICCY=y
+CONFIG_HISAX_BKM_A4T=y
+CONFIG_HISAX_SCT_QUADRO=y
+CONFIG_HISAX_GAZEL=y
+CONFIG_HISAX_HFC_PCI=y
+CONFIG_HISAX_W6692=y
+CONFIG_HISAX_HFC_SX=y
+CONFIG_HISAX_ENTERNOW_PCI=y
+# CONFIG_HISAX_DEBUG is not set
+
+#
+# HiSax PCMCIA card service modules
+#
+CONFIG_HISAX_SEDLBAUER_CS=m
+CONFIG_HISAX_ELSA_CS=m
+CONFIG_HISAX_AVM_A1_CS=m
+CONFIG_HISAX_TELES_CS=m
+
+#
+# HiSax sub driver modules
+#
+CONFIG_HISAX_ST5481=m
+CONFIG_HISAX_HFCUSB=m
+CONFIG_HISAX_HFC4S8S=m
+CONFIG_HISAX_FRITZ_PCIPNP=m
+
+#
+# Active cards
+#
+CONFIG_ISDN_CAPI=m
+CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
+CONFIG_CAPI_TRACE=y
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
+CONFIG_ISDN_CAPI_CAPIFS=m
+CONFIG_ISDN_CAPI_CAPIDRV=m
+
+#
+# CAPI hardware drivers
+#
+CONFIG_CAPI_AVM=y
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
+CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_CAPI_EICON=y
+CONFIG_ISDN_DIVAS=m
+CONFIG_ISDN_DIVAS_BRIPCI=y
+CONFIG_ISDN_DIVAS_PRIPCI=y
+CONFIG_ISDN_DIVAS_DIVACAPI=m
+CONFIG_ISDN_DIVAS_USERIDI=m
+CONFIG_ISDN_DIVAS_MAINT=m
+CONFIG_ISDN_DRV_GIGASET=m
+# CONFIG_GIGASET_CAPI is not set
+CONFIG_GIGASET_I4L=y
+# CONFIG_GIGASET_DUMMYLL is not set
+CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M105=m
+# CONFIG_GIGASET_M101 is not set
+# CONFIG_GIGASET_DEBUG is not set
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
+CONFIG_MISDN=m
+CONFIG_MISDN_DSP=m
+CONFIG_MISDN_L1OIP=m
+
+#
+# mISDN hardware drivers
+#
+CONFIG_MISDN_HFCPCI=m
+CONFIG_MISDN_HFCMULTI=m
+CONFIG_MISDN_HFCUSB=m
+CONFIG_MISDN_AVMFRITZ=m
+CONFIG_MISDN_SPEEDFAX=m
+CONFIG_MISDN_INFINEON=m
+CONFIG_MISDN_W6692=m
+CONFIG_MISDN_NETJET=m
+CONFIG_MISDN_IPAC=m
+CONFIG_MISDN_ISAR=m
+CONFIG_ISDN_HDLC=m
+CONFIG_PHONE=m
+CONFIG_PHONE_IXJ=m
+CONFIG_PHONE_IXJ_PCMCIA=m
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_FF_MEMLESS=y
+CONFIG_INPUT_POLLDEV=m
+CONFIG_INPUT_SPARSEKMAP=m
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1070=m
+CONFIG_KEYBOARD_QT2160=m
+# CONFIG_KEYBOARD_LKKBD is not set
+CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
+CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_MATRIX=m
+CONFIG_KEYBOARD_LM8323=m
+CONFIG_KEYBOARD_MAX7359=m
+CONFIG_KEYBOARD_MCS=m
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_KEYBOARD_OPENCORES=m
+CONFIG_KEYBOARD_STOWAWAY=m
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_ELANTECH is not set
+CONFIG_MOUSE_PS2_SENTELIC=y
+CONFIG_MOUSE_PS2_TOUCHKIT=y
+CONFIG_MOUSE_SERIAL=m
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_VSXXXAA=m
+CONFIG_MOUSE_GPIO=m
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_JOYSTICK_ANALOG=m
+CONFIG_JOYSTICK_A3D=m
+CONFIG_JOYSTICK_ADI=m
+CONFIG_JOYSTICK_COBRA=m
+CONFIG_JOYSTICK_GF2K=m
+CONFIG_JOYSTICK_GRIP=m
+CONFIG_JOYSTICK_GRIP_MP=m
+CONFIG_JOYSTICK_GUILLEMOT=m
+CONFIG_JOYSTICK_INTERACT=m
+CONFIG_JOYSTICK_SIDEWINDER=m
+CONFIG_JOYSTICK_TMDC=m
+CONFIG_JOYSTICK_IFORCE=m
+CONFIG_JOYSTICK_IFORCE_USB=y
+CONFIG_JOYSTICK_IFORCE_232=y
+CONFIG_JOYSTICK_WARRIOR=m
+CONFIG_JOYSTICK_MAGELLAN=m
+CONFIG_JOYSTICK_SPACEORB=m
+CONFIG_JOYSTICK_SPACEBALL=m
+CONFIG_JOYSTICK_STINGER=m
+CONFIG_JOYSTICK_TWIDJOY=m
+CONFIG_JOYSTICK_ZHENHUA=m
+CONFIG_JOYSTICK_DB9=m
+CONFIG_JOYSTICK_GAMECON=m
+CONFIG_JOYSTICK_TURBOGRAFX=m
+CONFIG_JOYSTICK_AS5011=m
+CONFIG_JOYSTICK_JOYDUMP=m
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+# CONFIG_JOYSTICK_WALKERA0701 is not set
+CONFIG_INPUT_TABLET=y
+CONFIG_TABLET_USB_ACECAD=m
+CONFIG_TABLET_USB_AIPTEK=m
+CONFIG_TABLET_USB_GTCO=m
+CONFIG_TABLET_USB_HANWANG=m
+CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_USB_WACOM=m
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+CONFIG_TOUCHSCREEN_BU21013=m
+CONFIG_TOUCHSCREEN_CY8CTMG110=m
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_GUNZE=m
+CONFIG_TOUCHSCREEN_ELO=m
+CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TOUCHSCREEN_MCS5000=m
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_MK712=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_UCB1400=m
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
+CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
+CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
+CONFIG_TOUCHSCREEN_USB_GOTOP=y
+CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_E2I=y
+CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
+CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
+CONFIG_TOUCHSCREEN_USB_NEXIO=y
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC2007=m
+CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_APANEL=m
+CONFIG_INPUT_ATLAS_BTNS=m
+CONFIG_INPUT_ATI_REMOTE=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_PCF8574=m
+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
+CONFIG_INPUT_ADXL34X=m
+CONFIG_INPUT_ADXL34X_I2C=m
+CONFIG_INPUT_CMA3000=m
+CONFIG_INPUT_CMA3000_I2C=m
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_CT82C710=m
+CONFIG_SERIO_PARKBD=m
+CONFIG_SERIO_PCIPS2=m
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_RAW=m
+CONFIG_SERIO_ALTERA_PS2=m
+CONFIG_SERIO_PS2MULT=m
+CONFIG_GAMEPORT=m
+CONFIG_GAMEPORT_NS558=m
+CONFIG_GAMEPORT_L4=m
+CONFIG_GAMEPORT_EMU10K1=m
+CONFIG_GAMEPORT_FM801=m
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=32
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_ROCKETPORT=m
+CONFIG_CYCLADES=m
+# CONFIG_CYZ_INTR is not set
+CONFIG_MOXA_INTELLIO=m
+CONFIG_MOXA_SMARTIO=m
+CONFIG_SYNCLINK=m
+CONFIG_SYNCLINKMP=m
+CONFIG_SYNCLINK_GT=m
+CONFIG_NOZOMI=m
+CONFIG_ISI=m
+CONFIG_N_HDLC=m
+CONFIG_N_GSM=m
+CONFIG_DEVKMEM=y
+CONFIG_STALDRV=y
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_PNP=y
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_DETECT_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_MFD_HSU=m
+CONFIG_SERIAL_UARTLITE=m
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_TIMBERDALE=m
+CONFIG_SERIAL_ALTERA_JTAGUART=m
+CONFIG_SERIAL_ALTERA_UART=m
+CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
+CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+CONFIG_SERIAL_PCH_UART=m
+CONFIG_PRINTER=m
+CONFIG_LP_CONSOLE=y
+CONFIG_PPDEV=m
+CONFIG_HVC_DRIVER=y
+CONFIG_VIRTIO_CONSOLE=m
+CONFIG_IPMI_HANDLER=m
+# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_INTEL=m
+CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_VIA=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_NVRAM=m
+CONFIG_R3964=m
+CONFIG_APPLICOM=m
+
+#
+# PCMCIA character devices
+#
+CONFIG_SYNCLINK_CS=m
+CONFIG_CARDMAN_4000=m
+CONFIG_CARDMAN_4040=m
+CONFIG_IPWIRELESS=m
+CONFIG_MWAVE=m
+CONFIG_RAW_DRIVER=m
+CONFIG_MAX_RAW_DEVS=256
+CONFIG_HPET=y
+CONFIG_HPET_MMAP=y
+CONFIG_HANGCHECK_TIMER=m
+CONFIG_TCG_TPM=m
+# CONFIG_TCG_TIS is not set
+# CONFIG_TCG_NSC is not set
+CONFIG_TCG_ATMEL=m
+# CONFIG_TCG_INFINEON is not set
+CONFIG_TELCLOCK=m
+CONFIG_DEVPORT=y
+CONFIG_RAMOOPS=m
+CONFIG_I2C=m
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_MUX=m
+
+#
+# Multiplexer I2C Chip support
+#
+CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD756_S4882=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NFORCE2_S4985=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+
+#
+# ACPI drivers
+#
+CONFIG_I2C_SCMI=m
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+CONFIG_I2C_GPIO=m
+CONFIG_I2C_INTEL_MID=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
+# CONFIG_I2C_PXA_PCI is not set
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_XILINX=m
+CONFIG_I2C_EG20T=m
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_I2C_STUB=m
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_SPI is not set
+
+#
+# PPS support
+#
+CONFIG_PPS=m
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_KTIMER is not set
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_PPS_CLIENT_PARPORT=m
+
+#
+# PPS generators support
+#
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_GPIOLIB=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_MAX730X=m
+
+#
+# Memory mapped GPIO expanders:
+#
+CONFIG_GPIO_BASIC_MMIO=m
+CONFIG_GPIO_IT8761E=m
+CONFIG_GPIO_SCH=m
+CONFIG_GPIO_VX855=m
+
+#
+# I2C GPIO expanders:
+#
+CONFIG_GPIO_MAX7300=m
+CONFIG_GPIO_MAX732X=m
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_ADP5588=m
+
+#
+# PCI GPIO expanders:
+#
+CONFIG_GPIO_CS5535=m
+# CONFIG_GPIO_LANGWELL is not set
+CONFIG_GPIO_PCH=m
+CONFIG_GPIO_ML_IOH=m
+# CONFIG_GPIO_TIMBERDALE is not set
+CONFIG_GPIO_RDC321X=m
+
+#
+# SPI GPIO expanders:
+#
+
+#
+# AC97 GPIO expanders:
+#
+# CONFIG_GPIO_UCB1400 is not set
+
+#
+# MODULbus GPIO expanders:
+#
+CONFIG_GPIO_JANZ_TTL=m
+CONFIG_W1=m
+CONFIG_W1_CON=y
+
+#
+# 1-wire Bus Masters
+#
+CONFIG_W1_MASTER_MATROX=m
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_GPIO=m
+
+#
+# 1-wire Slaves
+#
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2423=m
+CONFIG_W1_SLAVE_DS2431=m
+CONFIG_W1_SLAVE_DS2433=m
+CONFIG_W1_SLAVE_DS2433_CRC=y
+CONFIG_W1_SLAVE_DS2760=m
+CONFIG_W1_SLAVE_BQ27000=m
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_PDA_POWER=m
+CONFIG_TEST_POWER=m
+CONFIG_BATTERY_DS2760=m
+CONFIG_BATTERY_DS2782=m
+CONFIG_BATTERY_BQ20Z75=m
+CONFIG_BATTERY_BQ27x00=m
+CONFIG_BATTERY_BQ27X00_I2C=y
+CONFIG_BATTERY_BQ27X00_PLATFORM=y
+CONFIG_BATTERY_MAX17040=m
+CONFIG_BATTERY_MAX17042=m
+CONFIG_CHARGER_PCF50633=m
+CONFIG_CHARGER_ISP1704=m
+CONFIG_CHARGER_GPIO=m
+CONFIG_HWMON=m
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_ABITUGURU=m
+CONFIG_SENSORS_ABITUGURU3=m
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_K10TEMP=m
+CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_DS620=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_I5K_AMB=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_GPIO_FAN=m
+CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_PKGTEMP=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_LINEAGE=m
+CONFIG_SENSORS_LM63=m
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LTC4151=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_PMBUS=m
+CONFIG_SENSORS_PMBUS=m
+CONFIG_SENSORS_MAX16064=m
+CONFIG_SENSORS_MAX34440=m
+CONFIG_SENSORS_MAX8688=m
+CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SHT21=m
+CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_SMM665=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_ADS1015=m
+CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_VIA_CPUTEMP=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+# CONFIG_SENSORS_W83795_FANCTRL is not set
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_APPLESMC=m
+
+#
+# ACPI drivers
+#
+CONFIG_SENSORS_ATK0110=m
+CONFIG_THERMAL=m
+CONFIG_THERMAL_HWMON=y
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_ALIM1535_WDT=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_F71808E_WDT=m
+CONFIG_SP5100_TCO=m
+CONFIG_GEODE_WDT=m
+CONFIG_SC520_WDT=m
+CONFIG_SBC_FITPC2_WATCHDOG=m
+CONFIG_EUROTECH_WDT=m
+CONFIG_IB700_WDT=m
+CONFIG_IBMASR=m
+CONFIG_WAFER_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_ITCO_WDT=m
+CONFIG_ITCO_VENDOR_SUPPORT=y
+CONFIG_IT8712F_WDT=m
+CONFIG_IT87_WDT=m
+CONFIG_HP_WATCHDOG=m
+CONFIG_HPWDT_NMI_DECODING=y
+CONFIG_SC1200_WDT=m
+CONFIG_PC87413_WDT=m
+CONFIG_NV_TCO=m
+CONFIG_60XX_WDT=m
+CONFIG_SBC8360_WDT=m
+CONFIG_CPU5_WDT=m
+CONFIG_SMSC_SCH311X_WDT=m
+CONFIG_SMSC37B787_WDT=m
+CONFIG_W83627HF_WDT=m
+CONFIG_W83697HF_WDT=m
+CONFIG_W83697UG_WDT=m
+CONFIG_W83877F_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_MACHZ_WDT=m
+CONFIG_SBC_EPX_C3_WATCHDOG=m
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+CONFIG_SSB_PCMCIAHOST=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_MFD_SUPPORT=y
+CONFIG_MFD_CORE=m
+# CONFIG_MFD_SM501 is not set
+CONFIG_HTC_PASIC3=m
+CONFIG_UCB1400_CORE=m
+CONFIG_TPS6105X=m
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
+# CONFIG_MFD_TMIO is not set
+CONFIG_MFD_WM8400=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+# CONFIG_ABX500_CORE is not set
+CONFIG_MFD_CS5535=m
+CONFIG_MFD_TIMBERDALE=m
+CONFIG_LPC_SCH=m
+CONFIG_MFD_RDC321X=m
+CONFIG_MFD_JANZ_CMODIO=m
+CONFIG_MFD_VX855=m
+CONFIG_MFD_WL1273_CORE=m
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+# CONFIG_REGULATOR_DUMMY is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=m
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+CONFIG_REGULATOR_USERSPACE_CONSUMER=m
+CONFIG_REGULATOR_BQ24022=m
+CONFIG_REGULATOR_MAX1586=m
+CONFIG_REGULATOR_MAX8649=m
+CONFIG_REGULATOR_MAX8660=m
+CONFIG_REGULATOR_MAX8952=m
+CONFIG_REGULATOR_WM8400=m
+CONFIG_REGULATOR_PCF50633=m
+CONFIG_REGULATOR_LP3971=m
+CONFIG_REGULATOR_LP3972=m
+CONFIG_REGULATOR_TPS6105X=m
+CONFIG_REGULATOR_TPS65023=m
+CONFIG_REGULATOR_TPS6507X=m
+CONFIG_REGULATOR_ISL6271A=m
+CONFIG_REGULATOR_AD5398=m
+CONFIG_MEDIA_SUPPORT=m
+
+#
+# Multimedia core support
+#
+# CONFIG_MEDIA_CONTROLLER is not set
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_DVB_CORE=m
+CONFIG_VIDEO_MEDIA=m
+
+#
+# Multimedia drivers
+#
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_RC_CORE=m
+CONFIG_LIRC=m
+CONFIG_RC_MAP=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_RC5_SZ_DECODER=m
+CONFIG_IR_LIRC_CODEC=m
+CONFIG_IR_ENE=m
+CONFIG_IR_IMON=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_ITE_CIR=m
+CONFIG_IR_NUVOTON=m
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_WINBOND_CIR=m
+CONFIG_RC_LOOPBACK=m
+CONFIG_MEDIA_ATTACH=y
+CONFIG_MEDIA_TUNER=m
+# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEOBUF_DMA_CONTIG=m
+CONFIG_VIDEOBUF_DVB=m
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# Encoders/decoders and other helper chips
+#
+
+#
+# Audio decoders
+#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_M52790=m
+CONFIG_VIDEO_TLV320AIC23B=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+
+#
+# Video decoders
+#
+CONFIG_VIDEO_ADV7180=m
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_BT866=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_MT9V011=m
+CONFIG_VIDEO_TCM825X=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_SAA7191=m
+CONFIG_VIDEO_TVP514X=m
+CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_TVP7002=m
+CONFIG_VIDEO_VPX3220=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_CX25840=m
+
+#
+# MPEG video encoders
+#
+CONFIG_VIDEO_CX2341X=m
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+CONFIG_VIDEO_THS7303=m
+CONFIG_VIDEO_ADV7343=m
+CONFIG_VIDEO_AK881X=m
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+CONFIG_VIDEO_VIVI=m
+CONFIG_VIDEO_BT848=m
+CONFIG_VIDEO_BT848_DVB=y
+CONFIG_VIDEO_BWQCAM=m
+CONFIG_VIDEO_CQCAM=m
+CONFIG_VIDEO_W9966=m
+CONFIG_VIDEO_CPIA2=m
+CONFIG_VIDEO_ZORAN=m
+CONFIG_VIDEO_ZORAN_DC30=m
+CONFIG_VIDEO_ZORAN_ZR36060=m
+CONFIG_VIDEO_ZORAN_BUZ=m
+CONFIG_VIDEO_ZORAN_DC10=m
+CONFIG_VIDEO_ZORAN_LML33=m
+CONFIG_VIDEO_ZORAN_LML33R10=m
+CONFIG_VIDEO_ZORAN_AVS6EYES=m
+CONFIG_VIDEO_MEYE=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_TIMBERDALE=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_FB_IVTV=m
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_SAA7164=m
+CONFIG_VIDEO_CAFE_CCIC=m
+CONFIG_VIDEO_SR030PC30=m
+CONFIG_VIDEO_VIA_CAMERA=m
+CONFIG_VIDEO_NOON010PC30=m
+CONFIG_SOC_CAMERA=m
+CONFIG_SOC_CAMERA_IMX074=m
+CONFIG_SOC_CAMERA_MT9M001=m
+CONFIG_SOC_CAMERA_MT9M111=m
+CONFIG_SOC_CAMERA_MT9T031=m
+CONFIG_SOC_CAMERA_MT9T112=m
+CONFIG_SOC_CAMERA_MT9V022=m
+CONFIG_SOC_CAMERA_RJ54N1=m
+CONFIG_SOC_CAMERA_TW9910=m
+CONFIG_SOC_CAMERA_PLATFORM=m
+CONFIG_SOC_CAMERA_OV2640=m
+CONFIG_SOC_CAMERA_OV6650=m
+CONFIG_SOC_CAMERA_OV772X=m
+CONFIG_SOC_CAMERA_OV9640=m
+CONFIG_SOC_CAMERA_OV9740=m
+CONFIG_V4L_USB_DRIVERS=y
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_KONICA=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_TLG2300=m
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_USB_ET61X251=m
+CONFIG_USB_SN9C102=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_MEM2MEM_TESTDEV=m
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_MAESTRO=m
+CONFIG_I2C_SI4713=m
+CONFIG_RADIO_SI4713=m
+CONFIG_USB_DSBR=m
+# CONFIG_RADIO_SI470X is not set
+CONFIG_USB_MR800=m
+CONFIG_RADIO_TEA5764=m
+CONFIG_RADIO_SAA7706H=m
+CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_TIMBERDALE=m
+CONFIG_RADIO_WL1273=m
+
+#
+# Texas Instruments WL128x FM driver (ST based)
+#
+CONFIG_RADIO_WL128X=m
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
+CONFIG_DVB_CAPTURE_DRIVERS=y
+
+#
+# Supported SAA7146 based PCI Adapters
+#
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_BUDGET_PATCH=m
+
+#
+# Supported USB Adapters
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_FRIIO=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_SMS_SIANO_MDTV=m
+
+#
+# Siano module components
+#
+CONFIG_SMS_USB_DRV=m
+CONFIG_SMS_SDIO_DRV=m
+
+#
+# Supported FlexCopII (B2C2) Adapters
+#
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
+
+#
+# Supported BT878 Adapters
+#
+CONFIG_DVB_BT8XX=m
+
+#
+# Supported Pluto2 Adapters
+#
+CONFIG_DVB_PLUTO2=m
+
+#
+# Supported SDMC DM1105 Adapters
+#
+CONFIG_DVB_DM1105=m
+
+#
+# Supported FireWire (IEEE 1394) Adapters
+#
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_INPUT=y
+
+#
+# Supported Earthsoft PT1 Adapters
+#
+CONFIG_DVB_PT1=m
+
+#
+# Supported Mantis Adapters
+#
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+
+#
+# Supported nGene Adapters
+#
+CONFIG_DVB_NGENE=m
+
+#
+# Supported DVB Frontends
+#
+CONFIG_DVB_FE_CUSTOMISE=y
+
+#
+# Customise DVB Frontends
+#
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV6110x=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_SP8870=m
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_S5H1432=m
+CONFIG_DVB_DRX397XD=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_DIB9000=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+CONFIG_DVB_STV0367=m
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_S5H1411=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_S921=m
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
+
+#
+# Tools to develop new frontends
+#
+CONFIG_DVB_DUMMY_FE=m
+
+#
+# Graphics support
+#
+CONFIG_AGP=m
+CONFIG_AGP_AMD64=m
+CONFIG_AGP_INTEL=m
+CONFIG_AGP_SIS=m
+CONFIG_AGP_VIA=m
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_VGA_SWITCHEROO=y
+CONFIG_DRM=m
+CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_TTM=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_RADEON=m
+CONFIG_DRM_RADEON_KMS=y
+CONFIG_DRM_I810=m
+CONFIG_DRM_I915=m
+CONFIG_DRM_I915_KMS=y
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
+CONFIG_STUB_POULSBO=m
+CONFIG_VGASTATE=m
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_DDC=m
+CONFIG_FB_BOOT_VESA_SUPPORT=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=m
+# CONFIG_FB_WMT_GE_ROPS is not set
+CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_HECUBA=m
+CONFIG_FB_SVGALIB=m
+# CONFIG_FB_MACMODES is not set
+CONFIG_FB_BACKLIGHT=y
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+CONFIG_FB_CIRRUS=m
+CONFIG_FB_PM2=m
+# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
+CONFIG_FB_CYBER2000=m
+CONFIG_FB_CYBER2000_DDC=y
+CONFIG_FB_ARC=m
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+CONFIG_FB_VGA16=m
+# CONFIG_FB_UVESA is not set
+CONFIG_FB_VESA=y
+# CONFIG_FB_EFI is not set
+CONFIG_FB_N411=m
+CONFIG_FB_HGA=m
+CONFIG_FB_S1D13XXX=m
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_NVIDIA_DEBUG is not set
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA=m
+CONFIG_FB_RIVA_I2C=y
+# CONFIG_FB_RIVA_DEBUG is not set
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_LE80578=m
+CONFIG_FB_CARILLO_RANCH=m
+CONFIG_FB_MATROX=m
+CONFIG_FB_MATROX_MILLENIUM=y
+CONFIG_FB_MATROX_MYSTIQUE=y
+CONFIG_FB_MATROX_G=y
+CONFIG_FB_MATROX_I2C=m
+CONFIG_FB_MATROX_MAVEN=m
+CONFIG_FB_RADEON=m
+CONFIG_FB_RADEON_I2C=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+# CONFIG_FB_RADEON_DEBUG is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_BACKLIGHT=y
+CONFIG_FB_S3=m
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
+CONFIG_FB_SIS=m
+CONFIG_FB_SIS_300=y
+CONFIG_FB_SIS_315=y
+CONFIG_FB_VIA=m
+# CONFIG_FB_VIA_DIRECT_PROCFS is not set
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_KYRO=m
+CONFIG_FB_3DFX=m
+# CONFIG_FB_3DFX_ACCEL is not set
+CONFIG_FB_3DFX_I2C=y
+CONFIG_FB_VOODOO1=m
+CONFIG_FB_VT8623=m
+CONFIG_FB_TRIDENT=m
+CONFIG_FB_ARK=m
+CONFIG_FB_PM3=m
+CONFIG_FB_CARMINE=m
+CONFIG_FB_CARMINE_DRAM_EVAL=y
+# CONFIG_CARMINE_DRAM_CUSTOM is not set
+CONFIG_FB_GEODE=y
+CONFIG_FB_GEODE_LX=m
+CONFIG_FB_GEODE_GX=m
+CONFIG_FB_GEODE_GX1=m
+CONFIG_FB_TMIO=m
+CONFIG_FB_TMIO_ACCELL=y
+CONFIG_FB_UDL=m
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_METRONOME=m
+CONFIG_FB_MB862XX=m
+CONFIG_FB_MB862XX_PCI_GDC=y
+CONFIG_FB_BROADSHEET=m
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_PLATFORM=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_GENERIC=m
+CONFIG_BACKLIGHT_PROGEAR=m
+CONFIG_BACKLIGHT_CARILLO_RANCH=m
+CONFIG_BACKLIGHT_APPLE=m
+CONFIG_BACKLIGHT_SAHARA=m
+CONFIG_BACKLIGHT_ADP8860=m
+CONFIG_BACKLIGHT_PCF50633=m
+
+#
+# Display device support
+#
+CONFIG_DISPLAY_SUPPORT=m
+
+#
+# Display hardware drivers
+#
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+CONFIG_VGACON_SOFT_SCROLLBACK=y
+CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+CONFIG_LOGO_LINUX_CLUT224=y
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_JACK=y
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_SEQUENCER_OSS=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_DYNAMIC_MINORS=y
+# CONFIG_SND_SUPPORT_OLD_API is not set
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_DMA_SGBUF=y
+CONFIG_SND_RAWMIDI_SEQ=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_VX_LIB=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_PCSP is not set
+CONFIG_SND_DUMMY=m
+CONFIG_SND_ALOOP=m
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+CONFIG_SND_SB_COMMON=m
+CONFIG_SND_SB16_DSP=m
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ALI5451=m
+CONFIG_SND_ASIHPI=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
+CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_CS5530=m
+CONFIG_SND_CS5535AUDIO=m
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_ES1968_INPUT=y
+CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
+CONFIG_SND_FM801_TEA575X=m
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+# CONFIG_SND_HDA_INPUT_BEEP is not set
+CONFIG_SND_HDA_INPUT_JACK=y
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_CODEC_REALTEK=y
+CONFIG_SND_HDA_CODEC_ANALOG=y
+CONFIG_SND_HDA_CODEC_SIGMATEL=y
+CONFIG_SND_HDA_CODEC_VIA=y
+CONFIG_SND_HDA_CODEC_HDMI=y
+CONFIG_SND_HDA_CODEC_CIRRUS=y
+CONFIG_SND_HDA_CODEC_CONEXANT=y
+CONFIG_SND_HDA_CODEC_CA0110=y
+CONFIG_SND_HDA_CODEC_CMEDIA=y
+CONFIG_SND_HDA_CODEC_SI3054=y
+CONFIG_SND_HDA_GENERIC=y
+# CONFIG_SND_HDA_POWER_SAVE is not set
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1712=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_LX6464ES=m
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MAESTRO3_INPUT=y
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
+CONFIG_SND_USB_US122L=m
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_FIREWIRE=y
+CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_FIREWIRE_SPEAKERS=m
+CONFIG_SND_PCMCIA=y
+CONFIG_SND_VXPOCKET=m
+CONFIG_SND_PDAUDIOCF=m
+# CONFIG_SND_SOC is not set
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=m
+CONFIG_HIDRAW=y
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# Special HID drivers
+#
+CONFIG_HID_3M_PCT=m
+CONFIG_HID_A4TECH=m
+CONFIG_HID_ACRUX=m
+CONFIG_HID_ACRUX_FF=m
+CONFIG_HID_APPLE=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_CANDO=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EMS_FF=m
+CONFIG_HID_ELECOM=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LOGITECH=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_LOGIWII_FF=y
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MOSART=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_QUANTA=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_ROCCAT_COMMON=m
+CONFIG_HID_ROCCAT_ARVO=m
+CONFIG_HID_ROCCAT_KONE=m
+CONFIG_HID_ROCCAT_KONEPLUS=m
+CONFIG_HID_ROCCAT_KOVAPLUS=m
+CONFIG_HID_ROCCAT_PYRA=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SONY=m
+CONFIG_HID_STANTUM=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_GREENASIA=m
+CONFIG_GREENASIA_FF=y
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_WACOM=m
+CONFIG_HID_WACOM_POWER_SUPPLY=y
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
+CONFIG_HID_ZYDACRON=m
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+CONFIG_USB_SUSPEND=y
+# CONFIG_USB_OTG is not set
+CONFIG_USB_MON=y
+CONFIG_USB_WUSB=m
+CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_C67X00_HCD=y
+CONFIG_USB_XHCI_HCD=y
+# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_OXU210HP_HCD=y
+CONFIG_USB_ISP116X_HCD=y
+CONFIG_USB_ISP1760_HCD=y
+CONFIG_USB_ISP1362_HCD=y
+CONFIG_USB_OHCI_HCD=y
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_UHCI_HCD=y
+CONFIG_USB_U132_HCD=m
+CONFIG_USB_SL811_HCD=y
+CONFIG_USB_SL811_CS=m
+CONFIG_USB_R8A66597_HCD=y
+CONFIG_USB_WHCI_HCD=m
+CONFIG_USB_HWA_HCD=m
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_USB_STORAGE_DATAFAB=y
+CONFIG_USB_STORAGE_FREECOM=y
+CONFIG_USB_STORAGE_ISD200=y
+CONFIG_USB_STORAGE_USBAT=y
+CONFIG_USB_STORAGE_SDDR09=y
+CONFIG_USB_STORAGE_SDDR55=y
+CONFIG_USB_STORAGE_JUMPSHOT=y
+CONFIG_USB_STORAGE_ALAUDA=y
+CONFIG_USB_STORAGE_ONETOUCH=y
+CONFIG_USB_STORAGE_KARMA=y
+CONFIG_USB_STORAGE_CYPRESS_ATACB=y
+CONFIG_USB_STORAGE_ENE_UB6250=m
+CONFIG_USB_UAS=m
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+
+#
+# USB port drivers
+#
+CONFIG_USB_USS720=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_EZUSB=y
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_FUNSOFT=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MOTOROLA=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_HP4X=m
+CONFIG_USB_SERIAL_SAFE=m
+CONFIG_USB_SERIAL_SAFE_PADDED=y
+CONFIG_USB_SERIAL_SAMBA=m
+CONFIG_USB_SERIAL_SIEMENS_MPI=m
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
+CONFIG_USB_SERIAL_ZIO=m
+CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_DEBUG=m
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_RIO500=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_LED=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_FTDI_ELAN=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_SISUSBVGA_CON=y
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_YUREX=m
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+# CONFIG_USB_GADGET is not set
+
+#
+# OTG and related infrastructure
+#
+CONFIG_USB_OTG_UTILS=y
+CONFIG_USB_GPIO_VBUS=m
+CONFIG_NOP_USB_XCEIV=m
+CONFIG_UWB=m
+CONFIG_UWB_HWA=m
+CONFIG_UWB_WHCI=m
+CONFIG_UWB_I1480U=m
+CONFIG_MMC=m
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+# CONFIG_MMC_CLKGATE is not set
+
+#
+# MMC/SD/SDIO Card Drivers
+#
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_MINORS=8
+CONFIG_MMC_BLOCK_BOUNCE=y
+CONFIG_SDIO_UART=m
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_WBSD=m
+CONFIG_MMC_TIFM_SD=m
+CONFIG_MMC_SDRICOH_CS=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_USHC=m
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_MEMSTICK_R592=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_NET5501=m
+CONFIG_LEDS_ALIX2=m
+CONFIG_LEDS_PCA9532=m
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GPIO_PLATFORM=y
+CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP5521=m
+CONFIG_LEDS_LP5523=m
+CONFIG_LEDS_CLEVO_MAIL=m
+CONFIG_LEDS_PCA955X=m
+CONFIG_LEDS_REGULATOR=m
+CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_INTEL_SS4200=m
+CONFIG_LEDS_LT3593=m
+CONFIG_LEDS_DELL_NETBOOKS=m
+CONFIG_LEDS_TRIGGERS=y
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+# CONFIG_NFC_DEVICES is not set
+CONFIG_ACCESSIBILITY=y
+CONFIG_A11Y_BRAILLE_CONSOLE=y
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_USER_MEM=y
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_MTHCA=m
+CONFIG_INFINIBAND_MTHCA_DEBUG=y
+# CONFIG_INFINIBAND_IPATH is not set
+CONFIG_INFINIBAND_QIB=m
+CONFIG_INFINIBAND_AMSO1100=m
+# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
+# CONFIG_INFINIBAND_CXGB3 is not set
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_INFINIBAND_NES=m
+# CONFIG_INFINIBAND_NES_DEBUG is not set
+CONFIG_INFINIBAND_IPOIB=m
+# CONFIG_INFINIBAND_IPOIB_CM is not set
+CONFIG_INFINIBAND_IPOIB_DEBUG=y
+# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_EDAC=y
+
+#
+# Reporting subsystems
+#
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_DECODE_MCE=y
+CONFIG_EDAC_MCE_INJ=m
+# CONFIG_EDAC_MM_EDAC is not set
+CONFIG_RTC_LIB=m
+CONFIG_RTC_CLASS=m
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+CONFIG_RTC_DRV_TEST=m
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_ISL12022=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_PCF50633=m
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_INTEL_MID_DMAC=m
+CONFIG_INTEL_IOATDMA=m
+CONFIG_TIMB_DMA=m
+CONFIG_PCH_DMA=m
+CONFIG_DMA_ENGINE=y
+
+#
+# DMA Clients
+#
+CONFIG_NET_DMA=y
+# CONFIG_ASYNC_TX_DMA is not set
+CONFIG_DMATEST=m
+CONFIG_DCA=m
+CONFIG_AUXDISPLAY=y
+# CONFIG_KS0108 is not set
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_PDRV=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+CONFIG_STAGING=y
+# CONFIG_STAGING_EXCLUDE_BUILD is not set
+CONFIG_STALLION=m
+CONFIG_ISTALLION=m
+CONFIG_DIGIEPCA=m
+CONFIG_RISCOM8=m
+CONFIG_SPECIALIX=m
+CONFIG_COMPUTONE=m
+# CONFIG_ET131X is not set
+# CONFIG_SLICOSS is not set
+# CONFIG_VIDEO_GO7007 is not set
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=m
+CONFIG_DVB_CXD2099=m
+# CONFIG_USB_IP_COMMON is not set
+# CONFIG_W35UND is not set
+# CONFIG_PRISM2_USB is not set
+# CONFIG_ECHO is not set
+CONFIG_BRCM80211=m
+CONFIG_BRCMSMAC=y
+# CONFIG_BRCMFMAC is not set
+# CONFIG_BRCMDBG is not set
+CONFIG_RT2860=m
+CONFIG_RT2870=m
+# CONFIG_COMEDI is not set
+# CONFIG_ASUS_OLED is not set
+# CONFIG_PANEL is not set
+CONFIG_R8187SE=m
+CONFIG_RTL8192U=m
+CONFIG_RTL8192E=m
+CONFIG_R8712U=m
+# CONFIG_R8712_AP is not set
+CONFIG_RTS_PSTOR=m
+# CONFIG_RTS_PSTOR_DEBUG is not set
+# CONFIG_TRANZPORT is not set
+CONFIG_POHMELFS=m
+# CONFIG_POHMELFS_DEBUG is not set
+CONFIG_POHMELFS_CRYPTO=y
+CONFIG_IDE_PHISON=m
+CONFIG_LINE6_USB=m
+# CONFIG_LINE6_USB_DEBUG is not set
+# CONFIG_LINE6_USB_DUMP_CTRL is not set
+# CONFIG_LINE6_USB_DUMP_MIDI is not set
+# CONFIG_LINE6_USB_DUMP_PCM is not set
+# CONFIG_LINE6_USB_RAW is not set
+# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
+CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_NOUVEAU=m
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+CONFIG_DRM_NOUVEAU_DEBUG=y
+
+#
+# I2C encoder or helper chips
+#
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+CONFIG_USB_SERIAL_QUATECH2=m
+CONFIG_USB_SERIAL_QUATECH_USB2=m
+CONFIG_VT6655=m
+CONFIG_VT6656=m
+# CONFIG_HYPERV is not set
+# CONFIG_VME_BUS is not set
+CONFIG_DX_SEP=m
+# CONFIG_IIO is not set
+CONFIG_XVMALLOC=y
+CONFIG_ZRAM=m
+# CONFIG_ZRAM_DEBUG is not set
+CONFIG_WLAGS49_H2=m
+CONFIG_WLAGS49_H25=m
+CONFIG_FB_SM7XX=m
+CONFIG_VIDEO_DT3155=m
+CONFIG_DT3155_CCIR=y
+CONFIG_CRYSTALHD=m
+# CONFIG_CXT1E1 is not set
+CONFIG_FB_XGI=m
+CONFIG_LIRC_STAGING=y
+CONFIG_LIRC_BT829=m
+CONFIG_LIRC_IGORPLUGUSB=m
+CONFIG_LIRC_IMON=m
+CONFIG_LIRC_PARALLEL=m
+CONFIG_LIRC_SASEM=m
+CONFIG_LIRC_SERIAL=m
+CONFIG_LIRC_SERIAL_TRANSMITTER=y
+CONFIG_LIRC_SIR=m
+CONFIG_LIRC_TTUSBIR=m
+CONFIG_LIRC_ZILOG=m
+CONFIG_EASYCAP=m
+CONFIG_EASYCAP_SND=y
+# CONFIG_EASYCAP_OSS is not set
+# CONFIG_EASYCAP_DEBUG is not set
+CONFIG_SOLO6X10=m
+CONFIG_ACPI_QUICKSTART=m
+CONFIG_MACH_NO_WESTBRIDGE=y
+CONFIG_SBE_2T3E3=m
+CONFIG_ATH6K_LEGACY=m
+CONFIG_AR600x_SD31_XXX=y
+# CONFIG_AR600x_WB31_XXX is not set
+# CONFIG_AR600x_SD32_XXX is not set
+# CONFIG_AR600x_CUSTOM_XXX is not set
+# CONFIG_ATH6KL_ENABLE_COEXISTENCE is not set
+# CONFIG_ATH6KL_HCI_BRIDGE is not set
+# CONFIG_ATH6KL_CFG80211 is not set
+# CONFIG_ATH6KL_HTC_RAW_INTERFACE is not set
+# CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER is not set
+# CONFIG_ATH6KL_SKIP_ABI_VERSION_CHECK is not set
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_USB_ENESTORAGE is not set
+# CONFIG_BCM_WIMAX is not set
+# CONFIG_FT1000 is not set
+
+#
+# Speakup console speech
+#
+CONFIG_SPEAKUP=y
+CONFIG_SPEAKUP_SYNTH_ACNTSA=y
+CONFIG_SPEAKUP_SYNTH_ACNTPC=y
+CONFIG_SPEAKUP_SYNTH_APOLLO=y
+CONFIG_SPEAKUP_SYNTH_AUDPTR=y
+CONFIG_SPEAKUP_SYNTH_BNS=y
+CONFIG_SPEAKUP_SYNTH_DECTLK=y
+CONFIG_SPEAKUP_SYNTH_DECEXT=y
+CONFIG_SPEAKUP_SYNTH_DECPC=m
+CONFIG_SPEAKUP_SYNTH_DTLK=y
+CONFIG_SPEAKUP_SYNTH_KEYPC=y
+CONFIG_SPEAKUP_SYNTH_LTLK=y
+CONFIG_SPEAKUP_SYNTH_SOFT=y
+CONFIG_SPEAKUP_SYNTH_SPKOUT=y
+CONFIG_SPEAKUP_SYNTH_TXPRT=y
+CONFIG_SPEAKUP_SYNTH_DUMMY=y
+CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
+CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
+CONFIG_DRM_PSB=m
+
+#
+# Altera FPGA firmware download module
+#
+# CONFIG_ALTERA_STAPL is not set
+CONFIG_X86_PLATFORM_DEVICES=y
+CONFIG_ACER_WMI=m
+CONFIG_ACERHDF=m
+CONFIG_ASUS_LAPTOP=m
+CONFIG_DELL_LAPTOP=m
+CONFIG_DELL_WMI=m
+CONFIG_DELL_WMI_AIO=m
+CONFIG_FUJITSU_LAPTOP=m
+# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
+CONFIG_HP_ACCEL=m
+CONFIG_HP_WMI=m
+CONFIG_MSI_LAPTOP=m
+CONFIG_PANASONIC_LAPTOP=m
+CONFIG_COMPAL_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
+CONFIG_SONYPI_COMPAT=y
+CONFIG_IDEAPAD_LAPTOP=m
+CONFIG_THINKPAD_ACPI=m
+CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
+# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
+# CONFIG_THINKPAD_ACPI_DEBUG is not set
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
+CONFIG_THINKPAD_ACPI_VIDEO=y
+CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+CONFIG_SENSORS_HDAPS=m
+CONFIG_INTEL_MENLOW=m
+CONFIG_EEEPC_LAPTOP=m
+CONFIG_ASUS_WMI=m
+CONFIG_ASUS_NB_WMI=m
+CONFIG_EEEPC_WMI=m
+CONFIG_ACPI_WMI=m
+CONFIG_MSI_WMI=m
+CONFIG_ACPI_ASUS=m
+CONFIG_TOPSTAR_LAPTOP=m
+CONFIG_ACPI_TOSHIBA=m
+CONFIG_TOSHIBA_BT_RFKILL=m
+CONFIG_ACPI_CMPC=m
+CONFIG_INTEL_IPS=m
+# CONFIG_IBM_RTL is not set
+# CONFIG_XO15_EBOOK is not set
+CONFIG_SAMSUNG_LAPTOP=m
+
+#
+# Firmware Drivers
+#
+CONFIG_EDD=m
+CONFIG_EDD_OFF=y
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_EFI_VARS=m
+CONFIG_DELL_RBU=m
+CONFIG_DCDBAS=m
+CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=m
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
+CONFIG_SIGMA=m
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
+CONFIG_EXT3_FS_XATTR=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_FS_XATTR=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_JBD2=y
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+CONFIG_REISERFS_FS=y
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=y
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_XFS_FS=y
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=y
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=y
+CONFIG_OCFS2_FS_O2CB=y
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=y
+# CONFIG_OCFS2_FS_STATS is not set
+CONFIG_OCFS2_DEBUG_MASKLOG=y
+# CONFIG_OCFS2_DEBUG_FS is not set
+CONFIG_BTRFS_FS=y
+CONFIG_BTRFS_FS_POSIX_ACL=y
+CONFIG_NILFS2_FS=m
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=y
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=y
+CONFIG_QUOTACTL=y
+CONFIG_QUOTACTL_COMPAT=y
+CONFIG_AUTOFS4_FS=m
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_GENERIC_ACL=y
+
+#
+# Caches
+#
+CONFIG_FSCACHE=m
+# CONFIG_FSCACHE_STATS is not set
+# CONFIG_FSCACHE_HISTOGRAM is not set
+# CONFIG_FSCACHE_DEBUG is not set
+# CONFIG_FSCACHE_OBJECT_LIST is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_HISTOGRAM is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=y
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=y
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=y
+# CONFIG_NTFS_DEBUG is not set
+CONFIG_NTFS_RW=y
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_CONFIGFS_FS=y
+CONFIG_MISC_FILESYSTEMS=y
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+CONFIG_AFFS_FS=m
+# CONFIG_ECRYPT_FS is not set
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+CONFIG_BFS_FS=m
+CONFIG_EFS_FS=m
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_UBIFS_FS=m
+CONFIG_UBIFS_FS_XATTR=y
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+# CONFIG_UBIFS_FS_DEBUG is not set
+CONFIG_LOGFS=m
+CONFIG_CRAMFS=m
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_SQUASHFS_EMBEDDED=y
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+CONFIG_VXFS_FS=m
+CONFIG_MINIX_FS=m
+CONFIG_OMFS_FS=m
+CONFIG_HPFS_FS=m
+CONFIG_QNX4FS_FS=m
+CONFIG_ROMFS_FS=y
+CONFIG_ROMFS_BACKED_BY_BLOCK=y
+CONFIG_ROMFS_ON_BLOCK=y
+CONFIG_PSTORE=y
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+CONFIG_EXOFS_FS=m
+# CONFIG_EXOFS_DEBUG is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V4=y
+# CONFIG_NFS_V4_1 is not set
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+# CONFIG_NFS_USE_NEW_IDMAPPER is not set
+CONFIG_NFSD=y
+CONFIG_NFSD_DEPRECATED=y
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+CONFIG_NFSD_V4=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+CONFIG_SUNRPC_XPRT_RDMA=m
+CONFIG_RPCSEC_GSS_KRB5=y
+CONFIG_CEPH_FS=m
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+CONFIG_CIFS_WEAK_PW_HASH=y
+# CONFIG_CIFS_UPCALL is not set
+# CONFIG_CIFS_XATTR is not set
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_DFS_UPCALL is not set
+CONFIG_CIFS_FSCACHE=y
+# CONFIG_CIFS_EXPERIMENTAL is not set
+CONFIG_NCP_FS=m
+CONFIG_NCPFS_PACKET_SIGNING=y
+CONFIG_NCPFS_IOCTL_LOCKING=y
+CONFIG_NCPFS_STRONG=y
+CONFIG_NCPFS_NFS_NS=y
+CONFIG_NCPFS_OS2_NS=y
+CONFIG_NCPFS_SMALLDOS=y
+CONFIG_NCPFS_NLS=y
+CONFIG_NCPFS_EXTRAS=y
+CONFIG_CODA_FS=m
+CONFIG_AFS_FS=m
+# CONFIG_AFS_DEBUG is not set
+# CONFIG_AFS_FSCACHE is not set
+CONFIG_9P_FS=m
+# CONFIG_9P_FSCACHE is not set
+# CONFIG_9P_FS_POSIX_ACL is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+CONFIG_OSF_PARTITION=y
+CONFIG_AMIGA_PARTITION=y
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_UNIXWARE_DISKLABEL=y
+# CONFIG_LDM_PARTITION is not set
+CONFIG_SGI_PARTITION=y
+# CONFIG_ULTRIX_PARTITION is not set
+CONFIG_SUN_PARTITION=y
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_UTF8=y
+CONFIG_DLM=y
+# CONFIG_DLM_DEBUG is not set
+
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_PRINTK_TIME=y
+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=0
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_STRIP_ASM_SYMS=y
+CONFIG_UNUSED_SYMBOLS=y
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+# CONFIG_LOCKUP_DETECTOR is not set
+# CONFIG_HARDLOCKUP_DETECTOR is not set
+CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+CONFIG_TIMER_STATS=y
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+CONFIG_STACKTRACE=y
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# CONFIG_LKDTM is not set
+CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_LATENCYTOP is not set
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FTRACE_NMI_ENTER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
+CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_RING_BUFFER=y
+CONFIG_FTRACE_NMI_ENTER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_FTRACE_SYSCALLS is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+# CONFIG_STACK_TRACER is not set
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_DYNAMIC_FTRACE=y
+# CONFIG_FUNCTION_PROFILER is not set
+CONFIG_FTRACE_MCOUNT_RECORD=y
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_MMIOTRACE is not set
+CONFIG_RING_BUFFER_BENCHMARK=m
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_DMA_API_DEBUG is not set
+CONFIG_ATOMIC64_SELFTEST=y
+CONFIG_ASYNC_RAID6_TEST=m
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+CONFIG_HAVE_ARCH_KMEMCHECK=y
+# CONFIG_TEST_KSTRTOX is not set
+CONFIG_STRICT_DEVMEM=y
+CONFIG_X86_VERBOSE_BOOTUP=y
+CONFIG_EARLY_PRINTK=y
+# CONFIG_EARLY_PRINTK_DBGP is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_X86_PTDUMP is not set
+CONFIG_DEBUG_RODATA=y
+CONFIG_DEBUG_RODATA_TEST=y
+# CONFIG_DEBUG_SET_MODULE_RONX is not set
+# CONFIG_DEBUG_NX_TEST is not set
+# CONFIG_IOMMU_DEBUG is not set
+# CONFIG_IOMMU_STRESS is not set
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+CONFIG_IO_DELAY_TYPE_0X80=0
+CONFIG_IO_DELAY_TYPE_0XED=1
+CONFIG_IO_DELAY_TYPE_UDELAY=2
+CONFIG_IO_DELAY_TYPE_NONE=3
+CONFIG_IO_DELAY_0X80=y
+# CONFIG_IO_DELAY_0XED is not set
+# CONFIG_IO_DELAY_UDELAY is not set
+# CONFIG_IO_DELAY_NONE is not set
+CONFIG_DEFAULT_IO_DELAY_TYPE=0
+# CONFIG_DEBUG_BOOT_PARAMS is not set
+# CONFIG_CPA_DEBUG is not set
+CONFIG_OPTIMIZE_INLINING=y
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+CONFIG_TRUSTED_KEYS=m
+CONFIG_ENCRYPTED_KEYS=m
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
+CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_NETWORK_XFRM=y
+# CONFIG_SECURITY_PATH is not set
+# CONFIG_SECURITY_SELINUX is not set
+# CONFIG_SECURITY_TOMOYO is not set
+# CONFIG_SECURITY_APPARMOR is not set
+# CONFIG_IMA is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_XOR_BLOCKS=y
+CONFIG_ASYNC_CORE=y
+CONFIG_ASYNC_MEMCPY=y
+CONFIG_ASYNC_XOR=y
+CONFIG_ASYNC_PQ=y
+CONFIG_ASYNC_RAID6_RECOV=y
+CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
+CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=m
+CONFIG_CRYPTO_PCOMP2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_WORKQUEUE=y
+CONFIG_CRYPTO_CRYPTD=y
+CONFIG_CRYPTO_AUTHENC=y
+CONFIG_CRYPTO_TEST=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_SEQIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_LRW=y
+CONFIG_CRYPTO_PCBC=y
+CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_FPU=y
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=y
+CONFIG_CRYPTO_VMAC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_MD4=y
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=y
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_TGR192=y
+CONFIG_CRYPTO_WP512=y
+CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_X86_64=y
+CONFIG_CRYPTO_AES_NI_INTEL=y
+CONFIG_CRYPTO_ANUBIS=y
+CONFIG_CRYPTO_ARC4=y
+CONFIG_CRYPTO_BLOWFISH=y
+CONFIG_CRYPTO_CAMELLIA=y
+CONFIG_CRYPTO_CAST5=y
+CONFIG_CRYPTO_CAST6=y
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_FCRYPT=y
+CONFIG_CRYPTO_KHAZAD=y
+CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_SALSA20_X86_64=m
+CONFIG_CRYPTO_SEED=y
+CONFIG_CRYPTO_SERPENT=y
+CONFIG_CRYPTO_TEA=y
+CONFIG_CRYPTO_TWOFISH=y
+CONFIG_CRYPTO_TWOFISH_COMMON=y
+CONFIG_CRYPTO_TWOFISH_X86_64=y
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_ZLIB=m
+CONFIG_CRYPTO_LZO=m
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_CRYPTO_DEV_HIFN_795X=m
+CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+CONFIG_HAVE_KVM=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_APIC_ARCHITECTURE=y
+CONFIG_KVM_MMIO=y
+CONFIG_KVM_ASYNC_PF=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
+CONFIG_KVM_MMU_AUDIT=y
+CONFIG_VHOST_NET=m
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_RING=m
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=y
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=m
+CONFIG_CRC_ITU_T=y
+CONFIG_CRC32=y
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=y
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_BCJ=y
+# CONFIG_XZ_DEC_TEST is not set
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_BCH=m
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_BTREE=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_CHECK_SIGNATURE=y
+CONFIG_CPU_RMAP=y
+CONFIG_NLATTR=y
+CONFIG_LRU_CACHE=m
+CONFIG_AVERAGE=y
diff --git a/testing/source/mesa/README.GIT b/testing/source/mesa/README.GIT
new file mode 100644
index 00000000..4e79f374
--- /dev/null
+++ b/testing/source/mesa/README.GIT
@@ -0,0 +1,16 @@
+Anonymous git Access
+
+   To get the Mesa sources anonymously (read-only):
+
+    1. Install the git software on your computer if needed.
+
+    2. Get an initial, local copy of the repository with:
+
+     git clone git://anongit.freedesktop.org/git/mesa/mesa
+
+
+    3. Later, you can update your tree from the master repository with:
+
+     git pull origin
+
+
diff --git a/testing/source/mesa/get-mesa.sh b/testing/source/mesa/get-mesa.sh
new file mode 100755
index 00000000..253deeb4
--- /dev/null
+++ b/testing/source/mesa/get-mesa.sh
@@ -0,0 +1,20 @@
+# Pull a stable branch + patches
+BRANCH=7.10
+
+rm -rf mesa
+git clone git://anongit.freedesktop.org/git/mesa/mesa
+# package the source archive and clean up:
+( cd mesa 
+  git checkout $BRANCH || exit 1
+)
+HEADISAT="$(cat mesa/.git/packed-refs | grep "refs/remotes/origin/${BRANCH}$" | cut -b1-7)"
+# Cleanup.  We're not packing up the whole git repo.
+( cd mesa && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null )
+DATE=$(date +%Y%m%d)
+mv mesa Mesa-${BRANCH}_${HEADISAT}
+tar cf MesaLib-${BRANCH}_${HEADISAT}.tar Mesa-${BRANCH}_${HEADISAT}
+xz -9 MesaLib-${BRANCH}_${HEADISAT}.tar
+rm -rf MesaLib-${BRANCH}_${HEADISAT}
+echo
+echo "Mesa branch $BRANCH with HEAD at $HEADISAT packaged as MesaLib-${BRANCH}_${HEADISAT}.tar.xz"
+echo
diff --git a/testing/source/mesa/mesa.SlackBuild b/testing/source/mesa/mesa.SlackBuild
new file mode 100755
index 00000000..7d612e79
--- /dev/null
+++ b/testing/source/mesa/mesa.SlackBuild
@@ -0,0 +1,175 @@
+#!/bin/sh
+
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# 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=mesa
+VERSION=7.10.2
+DEMOVERS=8.0.1
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j8}
+
+# Be sure this list is up-to-date:
+DRI_DRIVERS="i810,i915,i965,mach64,mga,nouveau,r128,r200,r300,r600,radeon,savage,sis,tdfx,unichrome,swrast"
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-mesa
+
+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 Mesa-${VERSION}
+
+tar xvf $CWD/MesaLib-${VERSION}.tar.?z* || exit 1
+# If MesaLib came from git, we might already have GLUT.
+if [ ! -d Mesa-${VERSION}/src/glut/glx ]; then
+  tar xvf $CWD/MesaGLUT-${VERSION}.tar.?z* || exit 1
+fi
+
+cd Mesa-$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 {} \;
+
+# Apply patches from git (and maybe elsewhere):
+# Patches obtained by:
+#   git checkout origin/7.9
+#   git format-patch 67aeab0b77fb6be864088e69ea74a010b6543fa1..
+if /bin/ls $CWD/patches/*.patch 1> /dev/null 2> /dev/null ; then
+  for patch in $CWD/patches/*.patch ; do
+    patch -p1 < $patch || exit 1 ; 
+  done
+fi
+
+# Revert "i915: Enable ARB_fragment_shader by default."
+# https://bugzilla.redhat.com/show_bug.cgi?id=643399 
+zcat $CWD/patches/i915_fragment_shader_disable.patch.gz | patch -p1 || exit 1
+
+## Allow Mesa 7.9.x to build against libdrm-2.4.23:
+#zcat $CWD/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch.gz | patch -p1 || exit 1
+
+if [ ! -r configure ]; then
+  autoreconf || exit 1
+fi
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --sysconfdir=/etc \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/mesa-$VERSION \
+  --with-dri-driverdir=/usr/lib${LIBDIRSUFFIX}/xorg/modules/dri \
+  --with-dri-drivers="$DRI_DRIVERS" \
+  --enable-xcb \
+  --enable-gallium-nouveau \
+  --build=$ARCH-slackware-linux
+
+#  --enable-gallium-llvm \
+#  --enable-gallium-swrast \
+#  --disable-gallium-svga \
+#  --disable-gallium-i915 \
+#  --disable-gallium-i965 \
+#  --disable-gallium-radeon \
+#  --disable-gallium-r600 \
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Now install the demos
+( cd $TMP
+  rm -rf mesa-demos-$DEMOVERS
+  tar xvf $CWD/mesa-demos-$DEMOVERS.tar.?z* || exit 1
+  cd mesa-demos-$DEMOVERS
+  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 \
+    --build=$ARCH-slackware-linux
+  # Build and install gears and glinfo, as well as a few other demos
+  make -C src/demos gears glinfo
+  make -C src/xdemos \
+    glthreads glxcontexts glxdemo glxgears glxgears_fbconfig \
+    glxheads glxinfo glxpbdemo glxpixmap
+  mkdir -p $PKG/usr/bin
+  cp -a src/demos/{gears,glinfo} $PKG/usr/bin
+  for i in glthreads glxcontexts glxdemo glxgears glxgears_fbconfig \
+      glxheads glxinfo glxpbdemo glxpixmap ; do
+        cp -a src/xdemos/$i $PKG/usr/bin ;
+  done
+)
+  
+# 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
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+# Compress info files, if any:
+if [ -d $PKG/usr/info ]; then
+  rm -f $PKG/usr/info/dir
+  gzip -9 $PKG/usr/info/*
+fi
+
+mkdir -p $PKG/usr/doc/Mesa-$VERSION/html
+cp -a \
+  docs/COPYING* docs/relnotes-${VERSION}*.html docs/README* docs/GL* \
+  $PKG/usr/doc/Mesa-$VERSION
+cp -a docs/*.html $PKG/usr/doc/Mesa-$VERSION/html
+rm -f $PKG/usr/doc/Mesa-$VERSION/html/relnotes*.html
+
+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/testing/source/mesa/mesa.url b/testing/source/mesa/mesa.url
new file mode 100644
index 00000000..3f30cc84
--- /dev/null
+++ b/testing/source/mesa/mesa.url
@@ -0,0 +1,2 @@
+ftp://ftp.freedesktop.org/pub/mesa/
+ftp://ftp.freedesktop.org/pub/mesa/demos/
diff --git a/testing/source/mesa/patches/i915_fragment_shader_disable.patch b/testing/source/mesa/patches/i915_fragment_shader_disable.patch
new file mode 100644
index 00000000..d2aee8e7
--- /dev/null
+++ b/testing/source/mesa/patches/i915_fragment_shader_disable.patch
@@ -0,0 +1,26 @@
+From e5a4106be7c8b87821f6b5d21fec99a402825740 Mon Sep 17 00:00:00 2001
+From: Robert Hooker <sarvatt@ubuntu.com>
+Date: Wed, 8 Sep 2010 12:33:09 -0400
+Subject: [PATCH] Revert "i915: Enable ARB_fragment_shader by default."
+
+This reverts commit a58514cc9c5cc5867f9140700462c5ac5749550d.
+---
+ src/mesa/drivers/dri/intel/intel_screen.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
+index 0a542a7..8ae2cd2 100644
+--- a/src/mesa/drivers/dri/intel/intel_screen.c
++++ b/src/mesa/drivers/dri/intel/intel_screen.c
+@@ -70,7 +70,7 @@ PUBLIC const char __driConfigOptions[] =
+ 	 DRI_CONF_DESC(en, "Enable early Z in classic mode (unstable, 945-only).")
+       DRI_CONF_OPT_END
+ 
+-      DRI_CONF_OPT_BEGIN(fragment_shader, bool, true)
++      DRI_CONF_OPT_BEGIN(fragment_shader, bool, false)
+ 	 DRI_CONF_DESC(en, "Enable limited ARB_fragment_shader support on 915/945.")
+       DRI_CONF_OPT_END
+ 
+-- 
+1.7.2
+
diff --git a/testing/source/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch b/testing/source/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch
new file mode 100644
index 00000000..d0ce04d2
--- /dev/null
+++ b/testing/source/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch
@@ -0,0 +1,89 @@
+diff -ur a/src/gallium/drivers/nouveau/nouveau_screen.c b/src/gallium/drivers/nouveau/nouveau_screen.c
+--- a/src/gallium/drivers/nouveau/nouveau_screen.c	2010-10-02 00:51:28.000000000 +0200
++++ b/src/gallium/drivers/nouveau/nouveau_screen.c	2010-12-11 18:18:20.527000045 +0100
+@@ -236,7 +236,7 @@
+ 	int ret;
+ 
+ 	ret = nouveau_channel_alloc(dev, 0xbeef0201, 0xbeef0202,
+-				    &screen->channel);
++				    512*1024, &screen->channel);
+ 	if (ret)
+ 		return ret;
+ 	screen->device = dev;
+diff -ur a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c
+--- a/src/mesa/drivers/dri/nouveau/nouveau_context.c	2010-10-05 03:58:00.000000000 +0200
++++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c	2010-12-11 18:18:20.528000045 +0100
+@@ -129,7 +129,7 @@
+ 
+ 	/* Allocate a hardware channel. */
+ 	ret = nouveau_channel_alloc(context_dev(ctx), 0xbeef0201, 0xbeef0202,
+-				    &nctx->hw.chan);
++				    512*1024, &nctx->hw.chan);
+ 	if (ret) {
+ 		nouveau_error("Error initializing the FIFO.\n");
+ 		return GL_FALSE;
+Nur in b/src/mesa/drivers/dri/nouveau: nouveau_context.c.orig.
+diff -ur a/src/mesa/drivers/dri/nouveau/nouveau_surface.c b/src/mesa/drivers/dri/nouveau/nouveau_surface.c
+--- a/src/mesa/drivers/dri/nouveau/nouveau_surface.c	2010-04-27 23:41:21.000000000 +0200
++++ b/src/mesa/drivers/dri/nouveau/nouveau_surface.c	2010-12-11 18:09:19.750000046 +0100
+@@ -34,8 +34,8 @@
+ 		      unsigned flags, unsigned format,
+ 		      unsigned width, unsigned height)
+ {
+-	unsigned tile_mode, cpp = _mesa_get_format_bytes(format);
+-	int ret;
++	unsigned tile_mode = 0, tile_flags = 0;
++	int ret, cpp = _mesa_get_format_bytes(format);
+ 
+ 	nouveau_bo_ref(NULL, &s->bo);
+ 
+@@ -51,13 +51,21 @@
+ 	if (layout == TILED) {
+ 		s->pitch = align(s->pitch, 256);
+ 		tile_mode = s->pitch;
++
++		if (cpp == 4)
++			tile_flags = NOUVEAU_BO_TILE_32BPP;
++		else if (cpp == 2)
++			tile_flags = NOUVEAU_BO_TILE_16BPP;
++
++		if (_mesa_get_format_bits(format, GL_DEPTH_BITS))
++			tile_flags |= NOUVEAU_BO_TILE_ZETA;
++
+ 	} else {
+ 		s->pitch = align(s->pitch, 64);
+-		tile_mode = 0;
+ 	}
+ 
+ 	ret = nouveau_bo_new_tile(context_dev(ctx), flags, 0, s->pitch * height,
+-				  tile_mode, 0, &s->bo);
++				  tile_mode, tile_flags, &s->bo);
+ 	assert(!ret);
+ }
+ 
+diff -ur a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c
+--- a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c	2010-10-05 03:58:00.000000000 +0200
++++ b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c	2010-12-11 18:18:20.528000045 +0100
+@@ -32,7 +32,7 @@
+ 
+ /* Arbitrary pushbuf length we can assume we can get with a single
+  * WAIT_RING. */
+-#define PUSHBUF_DWORDS 2048
++#define PUSHBUF_DWORDS 65536
+ 
+ /* Functions to set up struct nouveau_array_state from something like
+  * a GL array or index buffer. */
+diff -ur a/src/mesa/drivers/dri/nouveau/nv10_state_fb.c b/src/mesa/drivers/dri/nouveau/nv10_state_fb.c
+--- a/src/mesa/drivers/dri/nouveau/nv10_state_fb.c	2010-10-05 03:58:00.000000000 +0200
++++ b/src/mesa/drivers/dri/nouveau/nv10_state_fb.c	2010-12-11 18:15:17.756000046 +0100
+@@ -64,8 +64,8 @@
+ 
+ 	if (!nfb->lma_bo || nfb->lma_bo->size != size) {
+ 		nouveau_bo_ref(NULL, &nfb->lma_bo);
+-		nouveau_bo_new(context_dev(ctx), NOUVEAU_BO_VRAM, 0, size,
+-			       &nfb->lma_bo);
++		nouveau_bo_new_tile(context_dev(ctx), NOUVEAU_BO_VRAM, 0, size,
++				    0, NOUVEAU_BO_TILE_ZETA, &nfb->lma_bo);
+ 	}
+ 
+ 	nouveau_bo_markl(bctx, celsius, NV17TCL_LMA_DEPTH_BUFFER_OFFSET,
diff --git a/testing/source/mesa/slack-desc b/testing/source/mesa/slack-desc
new file mode 100644
index 00000000..113964bd
--- /dev/null
+++ b/testing/source/mesa/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------------------------------------------------------|
+mesa: mesa (a 3-D graphics library)
+mesa:
+mesa: Mesa is a 3-D graphics library with an API very similar to that of
+mesa: another well-known 3-D graphics library.  :-)  The Mesa libraries are
+mesa: used by X to provide both software and hardware accelerated graphics.
+mesa:
+mesa: Mesa was written by Brian Paul.
+mesa:
+mesa:
+mesa:
+mesa:
diff --git a/testing/source/xf86-video-nouveau/arch.use.flags b/testing/source/xf86-video-nouveau/arch.use.flags
new file mode 100644
index 00000000..f28a6cca
--- /dev/null
+++ b/testing/source/xf86-video-nouveau/arch.use.flags
@@ -0,0 +1,7 @@
+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
diff --git a/testing/source/xf86-video-nouveau/configure/xf86-video-nouveau b/testing/source/xf86-video-nouveau/configure/xf86-video-nouveau
new file mode 100644
index 00000000..e050771b
--- /dev/null
+++ b/testing/source/xf86-video-nouveau/configure/xf86-video-nouveau
@@ -0,0 +1,11 @@
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./autogen.sh \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --infodir=/usr/info \
+  --mandir=/usr/man \
+  --disable-static \
+  --build=$ARCH-slackware-linux
diff --git a/testing/source/xf86-video-nouveau/get-xf86-video-nouveau.sh b/testing/source/xf86-video-nouveau/get-xf86-video-nouveau.sh
new file mode 100755
index 00000000..72d3efd3
--- /dev/null
+++ b/testing/source/xf86-video-nouveau/get-xf86-video-nouveau.sh
@@ -0,0 +1,22 @@
+# Pull a stable branch + patches
+BRANCH=master
+
+rm -rf xf86-video-nouveau
+git clone git://anongit.freedesktop.org/git/nouveau/xf86-video-nouveau/
+
+# use master branch
+#( cd xf86-video-nouveau 
+#  git checkout $BRANCH || exit 1
+#)
+
+HEADISAT="$(cat xf86-video-nouveau/.git/packed-refs | grep refs/remotes/origin/$BRANCH | cut -b1-7)"
+# Cleanup.  We're not packing up the whole git repo.
+( cd xf86-video-nouveau && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null )
+DATE=$(date +%Y%m%d)
+mv xf86-video-nouveau xf86-video-nouveau-git_${DATE}_${HEADISAT}
+tar cf xf86-video-nouveau-git_${DATE}_${HEADISAT}.tar xf86-video-nouveau-git_${DATE}_${HEADISAT}
+xz -9 xf86-video-nouveau-git_${DATE}_${HEADISAT}.tar
+rm -rf xf86-video-nouveau-git_${DATE}_${HEADISAT}
+echo
+echo "xf86-video-nouveau branch $BRANCH with HEAD at $HEADISAT packaged as xf86-video-nouveau-git_${DATE}_${HEADISAT}.tar.xz"
+echo
diff --git a/testing/source/xf86-video-nouveau/modularize b/testing/source/xf86-video-nouveau/modularize
new file mode 100644
index 00000000..47da583f
--- /dev/null
+++ b/testing/source/xf86-video-nouveau/modularize
@@ -0,0 +1,293 @@
+# If a package is listed here, it will be built apart from the
+# usual "grab bag" package that's made from each source directory.
+
+applewmproto
+appres
+bdftopcf
+beforelight
+bigreqsproto
+bitmap
+compiz
+compositeproto
+constype
+damageproto
+dmxproto
+dri2proto
+editres
+encodings
+evieext
+fixesproto
+font-adobe-100dpi
+font-adobe-75dpi
+font-adobe-utopia-100dpi
+font-adobe-utopia-75dpi
+font-adobe-utopia-type1
+font-alias
+font-arabic-misc
+font-bh-100dpi
+font-bh-75dpi
+font-bh-lucidatypewriter-100dpi
+font-bh-lucidatypewriter-75dpi
+font-bh-ttf
+font-bh-type1
+font-bitstream-100dpi
+font-bitstream-75dpi
+font-bitstream-speedo
+font-bitstream-type1
+font-cronyx-cyrillic
+font-cursor-misc
+font-daewoo-misc
+font-dec-misc
+font-ibm-type1
+font-isas-misc
+font-jis-misc
+font-micro-misc
+font-misc-cyrillic
+font-misc-ethiopic
+font-misc-meltho
+font-misc-misc
+font-mutt-misc
+font-schumacher-misc
+font-screen-cyrillic
+font-sony-misc
+font-sun-misc
+font-util
+font-winitzki-cyrillic
+font-xfree86-type1
+fontcacheproto
+fontsproto
+fonttosfnt
+fslsfonts
+fstobdf
+gccmakedep
+glproto
+iceauth
+ico
+imake
+inputproto
+intel-gpu-tools
+kbproto
+libAppleWM
+libFS
+libICE
+libSM
+libWindowsWM
+libX11
+libXScrnSaver
+libXTrap
+libXau
+libXaw
+libXcomposite
+libXcursor
+libXdamage
+libXdmcp
+libXevie
+libXext
+libXfixes
+libXfont
+libXfontcache
+libXft
+libXi
+libXinerama
+libXmu
+libXp
+libXpm
+libXprintAppUtil
+libXprintUtil
+libXrandr
+libXrender
+libXres
+libXt
+libXtst
+libXv
+libXvMC
+libXxf86dga
+libXxf86misc
+libXxf86vm
+libdmx
+libfontenc
+libpciaccess
+libpthread-stubs
+libxcb
+libxkbfile
+libxkbui
+listres
+lndir
+luit
+makedepend
+mkcfm
+mkcomposecache
+mkfontdir
+mkfontscale
+oclock
+pixman
+printproto
+proxymngr
+randrproto
+recordproto
+rendercheck
+renderproto
+resourceproto
+rgb
+rstart
+scripts
+scrnsaverproto
+sessreg
+setxkbmap
+showfont
+smproxy
+trapproto
+twm
+util-macros
+videoproto
+viewres
+windowswmproto
+x11perf
+xauth
+xbacklight
+xbiff
+xbitmaps
+xcalc
+xcb-proto
+xcb-util
+xclipboard
+xclock
+xcmiscproto
+xcmsdb
+xcompmgr
+xconsole
+xcursor-themes
+xcursorgen
+xdbedizzy
+xditview
+xdm
+xdpyinfo
+xdriinfo
+xedit
+xev
+xextproto
+xeyes
+xf86-input-acecad
+xf86-input-aiptek
+xf86-input-citron
+xf86-input-evdev
+xf86-input-joystick
+xf86-input-keyboard
+xf86-input-mouse
+xf86-input-penmount
+xf86-input-synaptics
+xf86-input-vmmouse
+xf86-input-void
+xf86-input-wacom
+xf86-video-geode
+xf86-video-apm
+xf86-video-ark
+xf86-video-ast
+xf86-video-ati
+xf86-video-chips
+xf86-video-cirrus
+xf86-video-dummy
+xf86-video-fbdev
+xf86-video-glint
+xf86-video-i128
+xf86-video-i740
+xf86-video-i810
+xf86-video-intel
+xf86-video-mach64
+xf86-video-mga
+xf86-video-neomagic
+xf86-video-nouveau
+xf86-video-nsc
+xf86-video-nv
+xf86-video-openchrome
+xf86-video-r128
+xf86-video-rendition
+xf86-video-s3
+xf86-video-s3virge
+xf86-video-savage
+xf86-video-siliconmotion
+xf86-video-sis
+xf86-video-sisusb
+xf86-video-sunbw2
+xf86-video-suncg14
+xf86-video-suncg3
+xf86-video-suncg6
+xf86-video-sunffb
+xf86-video-sunleo
+xf86-video-suntcx
+xf86-video-tdfx
+xf86-video-tga
+xf86-video-trident
+xf86-video-tseng
+xf86-video-v4l
+xf86-video-vesa
+xf86-video-vmware
+xf86-video-voodoo
+xf86-video-wsfb
+xf86-video-xgi
+xf86-video-xgixp
+xf86bigfontproto
+xf86dga
+xf86dgaproto
+xf86driproto
+xf86miscproto
+xf86rushproto
+xf86vidmodeproto
+xfd
+xfindproxy
+xfontsel
+xfs
+xfsinfo
+xfwp
+xgamma
+xgc
+xhost
+xineramaproto
+xinit
+xinput
+xkbcomp
+xkbevd
+xkbprint
+xkbutils
+xkeyboard-config
+xkill
+xload
+xlogo
+xlsatoms
+xlsclients
+xlsfonts
+xmag
+xman
+xmessage
+xmh
+xmodmap
+xmore
+xorg-cf-files
+xorg-docs
+xorg-server
+xorg-sgml-doctools
+xphelloworld
+xplsprinters
+xpr
+xprehashprinterlist
+xprop
+xproto
+xproxymanagementprotocol
+xpyb
+xrandr
+xrdb
+xrefresh
+xscope
+xset
+xsetmode
+xsetpointer
+xsetroot
+xsm
+xstdcmap
+xtrans
+xtrap
+xvidtune
+xvinfo
+xwd
+xwininfo
+xwud
diff --git a/testing/source/xf86-video-nouveau/noarch b/testing/source/xf86-video-nouveau/noarch
new file mode 100644
index 00000000..79eb0e56
--- /dev/null
+++ b/testing/source/xf86-video-nouveau/noarch
@@ -0,0 +1,81 @@
+# List packages with an $ARCH of "noarch" (i.e. packages
+# that contain no binaries) here:
+bigreqsproto
+compositeproto
+damageproto
+dejavu-ttf
+dmxproto
+encodings
+evieext
+font-adobe-100dpi
+font-adobe-75dpi
+font-adobe-utopia-100dpi
+font-adobe-utopia-75dpi
+font-adobe-utopia-type1
+font-alias
+font-arabic-misc
+font-bh-100dpi
+font-bh-75dpi
+font-bh-lucidatypewriter-100dpi
+font-bh-lucidatypewriter-75dpi
+font-bh-ttf
+font-bh-type1
+font-bitstream-100dpi
+font-bitstream-75dpi
+font-bitstream-speedo
+font-bitstream-type1
+font-cronyx-cyrillic
+font-cursor-misc
+font-daewoo-misc
+font-dec-misc
+font-ibm-type1
+font-isas-misc
+font-jis-misc
+font-micro-misc
+font-misc-cyrillic
+font-misc-ethiopic
+font-misc-meltho
+font-misc-misc
+font-mutt-misc
+font-schumacher-misc
+font-screen-cyrillic
+font-sony-misc
+font-sun-misc
+font-winitzki-cyrillic
+font-xfree86-type1
+fontcacheproto
+fontsproto
+gccmakedep
+glproto
+inputproto
+kbproto
+libpthread-stubs
+mkfontdir
+printproto
+randrproto
+recordproto
+renderproto
+resourceproto
+scripts
+scrnsaverproto
+trapproto
+ttf-indic-fonts
+util-macros
+videoproto
+x11-skel
+xcb-proto
+xcmiscproto
+xcursor-themes
+xf86bigfontproto
+xf86dgaproto
+xf86driproto
+xf86miscproto
+xf86rushproto
+xf86vidmodeproto
+xineramaproto
+xkeyboard-config
+xorg-cf-files
+xorg-docs
+xproto
+xproxymanagementprotocol
+xtrans
diff --git a/testing/source/xf86-video-nouveau/package-blacklist b/testing/source/xf86-video-nouveau/package-blacklist
new file mode 100644
index 00000000..37762499
--- /dev/null
+++ b/testing/source/xf86-video-nouveau/package-blacklist
@@ -0,0 +1,39 @@
+# Enter packages to skip (perhaps because they aren't used on
+# this platform) below.  Just the package name -- no version
+# number is needed.
+
+# MacOS related packages:
+applewmproto
+windowswmproto
+libAppleWM
+libWindowsWM
+
+# Sun video cards:
+xf86-video-sunbw2
+xf86-video-suncg14
+xf86-video-suncg3
+xf86-video-suncg6
+xf86-video-sunffb
+xf86-video-sunleo
+xf86-video-suntcx
+
+# Obsolete packages:
+liboldX
+xf86-video-amd
+xf86-video-via
+xkbdata
+xphelloworld
+xrx
+
+# Not applicable to us
+grandr
+constype
+
+# CAREFUL NOT TO "SHIP" THE STUFF BELOW IN THE MAIN X PACKAGES DIR!
+
+# This is probably obsolete, and kills "X -configure" too
+xf86-video-nsc
+
+# We don't want this one, as it causes failure of X with no xorg.conf
+xf86-video-fbdev
+
diff --git a/testing/source/xf86-video-nouveau/slack-desc/xf86-video-nouveau b/testing/source/xf86-video-nouveau/slack-desc/xf86-video-nouveau
new file mode 100644
index 00000000..8697a60e
--- /dev/null
+++ b/testing/source/xf86-video-nouveau/slack-desc/xf86-video-nouveau
@@ -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------------------------------------------------------|
+xf86-video-nouveau: xf86-video-nouveau
+xf86-video-nouveau:
+xf86-video-nouveau: xf86-video-nouveau is part of X11.
+xf86-video-nouveau:
+xf86-video-nouveau: For more information about the X.Org Foundation (the providers of the
+xf86-video-nouveau: X.Org implementation of the X Window System), see their website:
+xf86-video-nouveau:
+xf86-video-nouveau: http://www.x.org
+xf86-video-nouveau:
+xf86-video-nouveau:
+xf86-video-nouveau:
diff --git a/testing/source/xf86-video-nouveau/x11.SlackBuild b/testing/source/xf86-video-nouveau/x11.SlackBuild
new file mode 100755
index 00000000..ca729708
--- /dev/null
+++ b/testing/source/xf86-video-nouveau/x11.SlackBuild
@@ -0,0 +1,364 @@
+#!/bin/sh
+# Copyright 2007-2010  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# To build only a single package group, specify it as $1, like:
+# ./x11.SlackBuild lib
+# To build only a single package, specify both the source directory
+# and the name of the package, like:
+# ./x11.SlackBuild lib libX11
+
+pkgbase() {
+  PKGEXT=$(echo $1 | rev | cut -f 1 -d . | rev)
+  case $PKGEXT in
+  'gz' )
+    PKGRETURN=$(basename $1 .tar.gz)
+    ;;
+  'bz2' )
+    PKGRETURN=$(basename $1 .tar.bz2)
+    ;;
+  'lzma' )
+    PKGRETURN=$(basename $1 .tar.lzma)
+    ;;
+  'xz' )
+    PKGRETURN=$(basename $1 .tar.xz)
+    ;;
+  *)
+    PKGRETURN=$(basename $1)
+    ;;
+  esac
+  echo $PKGRETURN
+}
+
+# Set initial variables:
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# A lot of this stuff just controls the package names this time:
+VERSION=${VERSION:-7.5}
+BUILD=${BUILD:-1}
+PKGARCH=$ARCH
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+# Set up a few useful functions:
+
+fix_perms() {
+  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 {} \;
+}
+
+process_man_pages() {
+  # Compress and if needed symlink the man pages:
+  if [ -d usr/man ]; then
+    ( cd 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
+}
+
+process_info_pages() {
+  # Compress info pages and purge "dir" file from the package:
+  if [ -d usr/info ]; then
+    ( cd usr/info
+      rm -f dir
+      gzip -9 *
+    )
+  fi
+}
+
+no_usr_share_doc() {
+  # If there are docs, move them:
+  if [ -d usr/share/doc ]; then
+    mkdir -p usr/doc
+    mv usr/share/doc/* usr/doc
+    rmdir usr/share/doc
+  fi
+}
+
+# Set the compile options for the $ARCH being used:
+. $CWD/arch.use.flags
+
+SLACK_X_BUILD_DIR=$TMP/x11-build
+mkdir -p $SLACK_X_BUILD_DIR
+
+# Better have some binaries installed first, as this may not be
+# in the "magic order".  I built mine by hand through trial-and-error
+# before getting this script to work.  It wasn't that hard...  I think.  ;-)
+( cd src
+  for x_source_dir in proto data util xcb lib app doc driver font xserver ; do
+    # See if $1 is a source directory like "lib":
+    if [ ! -z "$1" ]; then
+      if [ ! "$1" = "${x_source_dir}" ]; then
+        continue
+      fi
+    fi
+    PKG=${SLACK_X_BUILD_DIR}/package-${x_source_dir}
+    rm -rf $PKG
+    mkdir -p $PKG
+    ( cd $x_source_dir
+      for x_pkg in *.tar.?z* ; do
+        # Reset $PKGARCH to its initial value:
+        PKGARCH=$ARCH
+        PKGNAME=$(echo $x_pkg | rev | cut -f 2- -d - | rev)
+        # Perhaps $PKGARCH should be something different:
+        if grep -wq "^$PKGNAME" ${CWD}/noarch ; then
+          PKGARCH=noarch
+        fi 
+        if grep -wq "^$PKGNAME" ${CWD}/package-blacklist ; then
+          continue
+        fi
+        cd $SLACK_X_BUILD_DIR
+        # If $2 is set, we only want to build one package:
+        if [ ! -z "$2" ]; then
+          if [ "$2" = "$PKGNAME" ]; then
+            # Set $PKG to a private dir for the modular package build:
+            PKG=$SLACK_X_BUILD_DIR/package-$PKGNAME
+            rm -rf $PKG
+            mkdir -p $PKG
+          else
+            continue
+          fi
+        else
+          echo
+          echo "Building from source ${x_pkg}"
+          echo
+        fi
+        if grep -wq "^$PKGNAME" ${CWD}/modularize ; then
+          # Set $PKG to a private dir for the modular package build:
+          PKG=$SLACK_X_BUILD_DIR/package-$PKGNAME
+          rm -rf $PKG
+          mkdir -p $PKG
+        fi
+
+        # Let's figure out the version number on the modular package:
+        MODULAR_PACKAGE_VERSION=$(echo $x_pkg | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
+
+        rm -rf $(pkgbase $x_pkg)
+        tar xf $CWD/src/${x_source_dir}/${x_pkg} || exit 1
+        cd $(pkgbase $x_pkg) || exit 1
+
+        fix_perms
+
+        # If any patches are needed, call this script to apply them:
+        if [ -r $CWD/patch/${PKGNAME}.patch ]; then
+          . $CWD/patch/${PKGNAME}.patch
+        fi
+
+        # I heard somewhere that -O2 breaks some chipset or another.  If you encounter
+        # problems, please contact volkerdi@slackware.com.  Thanks! :-)
+
+        # ./configure, using custom configure script if needed:
+        if [ -r $CWD/configure/${PKGNAME} ]; then
+          . $CWD/configure/${PKGNAME}
+        else
+          # This is the default configure script:
+          . $CWD/configure/configure
+        fi
+
+        if ! make $NUMJOBS ; then
+          touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed
+          continue
+        fi
+
+        make install DESTDIR=$PKG
+
+        mkdir -p $PKG/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION}
+        cp -a \
+          AUTHORS* COPYING* INSTALL* README* NEWS* TODO* \
+          $PKG/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION}
+
+        # If there's a ChangeLog, installing at least part of the recent history
+        # is useful, but don't let it get totally out of control:
+        if [ -r ChangeLog ]; then
+          DOCSDIR=$(echo $PKG/usr/doc/${PKGNAME}-$MODULAR_PACKAGE_VERSION)
+          cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+          touch -r ChangeLog $DOCSDIR/ChangeLog
+        fi
+
+        # Get rid of zero-length junk files:
+        find $PKG/usr/doc/${PKGNAME}-$MODULAR_PACKAGE_VERSION -type f -size 0 -exec rm --verbose "{}" \;
+        rmdir --verbose $PKG/usr/doc/${PKGNAME}-$MODULAR_PACKAGE_VERSION 2> /dev/null
+   
+        # Strip binaries:
+        ( cd $PKG
+          find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+          find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+          find . | xargs file | grep "current ar archive" | grep ELF | cut -f 1 -d : | xargs strip -g 2> /dev/null
+        )
+
+        # If there's any special post-install things to do, do them:
+        if [ -r $CWD/post-install/${PKGNAME}.post-install ]; then
+          RUNSCRIPT=$(mktemp -p $TMP) || exit 1
+          cat $CWD/post-install/${PKGNAME}.post-install \
+            | sed -e "s#usr/lib#usr/lib${LIBDIRSUFFIX}#g" > $RUNSCRIPT
+          . $RUNSCRIPT
+          rm -f $RUNSCRIPT
+        fi
+
+        # If this package requires some doinst.sh material, add it here:
+        if [ -r $CWD/doinst.sh/${PKGNAME} ]; then
+          mkdir -p $PKG/install
+          cat $CWD/doinst.sh/${PKGNAME} \
+            | sed -e "s#usr/lib#usr/lib${LIBDIRSUFFIX}#g" \
+            >> $PKG/install/doinst.sh
+        fi
+
+        # If this is a modular package, build it here:
+        if [ -d $SLACK_X_BUILD_DIR/package-$PKGNAME ]; then
+          cd $PKG
+          process_man_pages
+          process_info_pages
+          no_usr_share_doc          
+          mkdir -p $PKG/install
+          if [ -r $CWD/slack-desc/${PKGNAME} ]; then
+            cat $CWD/slack-desc/${PKGNAME} > $PKG/install/slack-desc
+          else
+            touch $PKG/install/slack-desc-missing
+          fi
+          if [ -r $CWD/build/${PKGNAME} ]; then
+            MODBUILD=$(cat $CWD/build/${PKGNAME})
+          else
+            MODBUILD=$BUILD
+          fi
+          if [ -r $CWD/makepkg/${PKGNAME} ]; then
+            BUILD=$MODBUILD . $CWD/makepkg/${PKGNAME}
+          else
+            /sbin/makepkg -l y -c n ${SLACK_X_BUILD_DIR}/${PKGNAME}-${MODULAR_PACKAGE_VERSION}-${PKGARCH}-${MODBUILD}.txz
+          fi
+        fi
+
+        # Reset $PKG to assume we're building the whole source dir:
+        PKG=${SLACK_X_BUILD_DIR}/package-${x_source_dir}
+
+      done
+
+      # Nothing here?  Must have been fully modular. :-)
+      if [ ! -d ${SLACK_X_BUILD_DIR}/package-${x_source_dir}/etc -a \
+        ! -d ${SLACK_X_BUILD_DIR}/package-${x_source_dir}/usr ]; then
+        continue
+      fi
+
+      # Build an "x11-<sourcedir>" package for anything that wasn't built modular:
+      # It's safer to consider these to have binaries in them. ;-)
+      PKGARCH=$ARCH
+      cd $PKG
+      process_man_pages
+      process_info_pages
+      no_usr_share_doc
+      # If there are post-install things to do for the combined package,
+      # we do them here.  This could be used for things like making a
+      # VERSION number for a combined package.  :-)
+      if [ -r $CWD/post-install/x11-${x_source_dir}.post-install ]; then
+        RUNSCRIPT=$(mktemp -p $TMP) || exit 1
+        cat $CWD/post-install/x11-${x_source_dir}.post-install \
+          | sed -e "s#usr/lib#usr/lib${LIBDIRSUFFIX}#g" > $RUNSCRIPT
+        . $RUNSCRIPT
+        rm -f $RUNSCRIPT
+      fi
+      mkdir -p $PKG/install
+      if [ -r $CWD/slack-desc/x11-${x_source_dir} ]; then
+        cat $CWD/slack-desc/x11-${x_source_dir} > $PKG/install/slack-desc
+      else
+        touch $PKG/install/slack-desc-missing
+      fi
+      if [ -r $CWD/doinst.sh/x11-${x_source_dir} ]; then
+        cat $CWD/doinst.sh/x11-${x_source_dir} \
+          | sed -e "s#usr/lib#usr/lib${LIBDIRSUFFIX}#g" \
+          >> $PKG/install/doinst.sh
+      fi
+      if [ -r $CWD/build/x11-${PKGNAME} ]; then
+        SRCDIRBUILD=$(cat $CWD/build/x11-${PKGNAME})
+      else
+        SRCDIRBUILD=$BUILD
+      fi
+      if [ -r $CWD/makepkg/${PKGNAME} ]; then
+        BUILD=$MODBUILD . $CWD/makepkg/${PKGNAME}
+      else
+        /sbin/makepkg -l y -c n ${SLACK_X_BUILD_DIR}/x11-${x_source_dir}-${VERSION}-${PKGARCH}-${SRCDIRBUILD}.txz
+      fi
+    )
+  done
+)
+
+exit 0
+
+# I don't think I'll be using the following stuff, since I went for the latest in
+# "individual", rather than a release.  That was mostly because version 7.1 depends
+# on a version of Mesa that won't build against kernel headers this new (&etc.).
+
+# If environment variable "REFRESH" is exported, start by refreshing the source tree:
+# export REFRESH yes
+if [ ! -z "$REFRESH" ]; then
+  # Only works once, unless you uncomment above.
+  unset REFRESH
+  ( cd patches
+    lftp -c \
+    "lftp ftp://ftp.x.org:/pub/X11R7.1/patches
+     mirror --delete --dereference .
+     exit"
+    chmod 644 *
+  )
+  ( cd src
+    mkdir -p update everything
+    for dir in app data deprecated doc driver extras font lib proto util xserver ; do
+      # We won't really download "update", as problems ensue.  Plus, --dereference is
+      # bringing us updated files when needed, so it's redundant (like "everything").
+      if [ ! -d $dir ]; then
+        mkdir $dir
+      fi
+      ( cd $dir
+        lftp -c \
+        "lftp ftp://ftp.x.org:/pub/X11R7.1/src/$dir
+         mirror -c --delete --dereference --include-glob "*.tar.bz2" .
+         exit"
+        chmod 644 *
+      )
+    done
+  )
+fi
+
diff --git a/testing/source/xf86-video-nouveau/xf86-video-nouveau.SlackBuild b/testing/source/xf86-video-nouveau/xf86-video-nouveau.SlackBuild
new file mode 100755
index 00000000..70f93a30
--- /dev/null
+++ b/testing/source/xf86-video-nouveau/xf86-video-nouveau.SlackBuild
@@ -0,0 +1 @@
+./x11.SlackBuild driver xf86-video-nouveau
diff --git a/usb-and-pxe-installers/README_PXE.TXT b/usb-and-pxe-installers/README_PXE.TXT
index 1912f3e9..078e4a55 100644
--- a/usb-and-pxe-installers/README_PXE.TXT
+++ b/usb-and-pxe-installers/README_PXE.TXT
@@ -106,12 +106,13 @@ The stages of a Slackware PXE install
     PXE firmware has done its job and is no longer in the picture.  So:

 

 (5) We need to load a kernel driver for our network card and locate a network 

-    server that holds the Slackware package tree.  Currently, you can choose

-    between installing from a NFS server, a Samba server or a HTTP/FTP

-    server.  Before starting cfdisk and setup, we need to run the ('pcmcia'

-    and/or) 'network' command to probe the network card and load a suitable

-    driver.  If your network card is not supported by any of the available

-    drivers, you are out of luck and will have to rethink your options.

+    server that holds the Slackware package tree (called the "SOURCE").

+    Currently, you can choose between installing from a NFS server, a Samba

+    server or a HTTP/FTP server.  By starting setup and selecting one of

+    these network package SOURCEs, you will get the opportunity to configure

+    the network card.  If your network card is not supported by any of the

+    available drivers, you are out of luck and will have to rethink your

+    options.

 

 (6) From here on, installation proceeds as usual, under the condition that 

     you select 'Install from NFS (Network File System)', 'Install from

@@ -146,11 +147,12 @@ components.  We need:
     broadcast on the network its desire to find a suitable server to download 

     the bootstrap code from.  The DHCP Server packages that are part of

     Slackware fulfill this requirement, since they talk BOOTP as well as DHCP.

-    The packages are dhcpd and dnsmasq; pick the one you like most.

+    These packages are 'dhcpd' and 'dnsmasq'; pick the one you like most.

 

 (2) A download service for the bootstrap code.  A TFTP (trivial file 

-    transfer protocol) server is needed for this.  Slackware ships with an 

-    implementation of a TFTP server called tftpd-hpa which does what we need.

+    transfer protocol) server is needed for this.  Slackware ships with

+    an implementation of a TFTP server called 'tftpd-hpa' which does what

+    we need.

 

 (3) And for the Slackware installer, a NFS, HTTP, FTP or Samba server is

     required because we must perform a network install.  We can use

@@ -166,8 +168,8 @@ an excercise for the user to find out how to configure Apache (HTTP) or
 proftpd (FTP) in case installation over HTTP or FTP is preferred.  In later

 examples, I will assume that the following URL's are valid for your HTTP/FTP

 server:

-        http://192.168.0.1/mirror/slackware/slackware-13.0

-        ftp://192.168.0.1/pub/mirror/slackware/slackware-13.0

+        http://192.168.0.1/mirror/slackware/slackware-13.37

+        ftp://192.168.0.1/pub/mirror/slackware/slackware-13.37

 

     The server will run all required services, i.e. acts as the LANs 

 DNS, DHCP, TFTP and NFS (or HTTP/FTP/Samba) server.  If you decide to

@@ -198,12 +200,12 @@ that apply to your own network.
 (*) The DNS domain will be "my.lan".

 

 (*) Directories are used as follows:

-    Top level of the complete Slackware 13.0 directory tree (excluding the 

-    source code if you're short on disk space) is 

-    "/mirror/slackware/slackware-13.0"

+    Top level of the complete Slackware 13.37 directory tree (excluding

+    the source code if you're short on disk space) is 

+    "/mirror/slackware/slackware-13.37"

 

 (*) The directory where we store the boot files for the TFTP server is 

-    "/tftpboot/slackware-13.0"

+    "/tftpboot/slackware-13.37"

 

 

 DHCP

@@ -255,7 +257,7 @@ group {
   next-server 192.168.0.1;

   use-host-decl-names on;

   if substring (option vendor-class-identifier, 0, 9) = "PXEClient" {

-    filename "/slackware-13.0/pxelinux.0";

+    filename "/slackware-13.37/pxelinux.0";

   }

 

   host ABC {

@@ -269,7 +271,7 @@ group {
 

     This enables the DHCP server to detect network boot clients that use PXE 

 and serves them the PXElinux boot loader we make available at

-"/slackware-13.0/pxelinux.0".  What this boot loader does will be explained

+"/slackware-13.37/pxelinux.0".  What this boot loader does will be explained

 further down the article.

 

     The 'next-server' parameter contains the IP address of the TFTP server.  

@@ -297,11 +299,11 @@ will stall at the point of looking for a TFTP server.
 above instructions for the ISC DHCP server are not applicable to your 

 setup. Instead, you have to configure dnsmasq with this equivalent parameter:

 

-  dnsmasq --dhcp-boot=/slackware-13.0/pxelinux.0,"192.168.0.1",192.168.0.1

+  dnsmasq --dhcp-boot=/slackware-13.37/pxelinux.0,"192.168.0.1",192.168.0.1

 

 or add this line to your /etc/dnsmasq.conf:

 

-  dhcp-boot=/slackware-13.0/pxelinux.0,"192.168.0.1",192.168.0.1

+  dhcp-boot=/slackware-13.37/pxelinux.0,"192.168.0.1",192.168.0.1

 

 The IP address "192.168.0.1" occurs twice; they should always be identical,

 and be the address of your TFTP server.

@@ -371,7 +373,7 @@ that are used here apply to our example network - adjust as needed):
 

 (*) The directory mentioned in /etc/exports is the target where

     you copy (or move) your Slackware files to: The directory

-    "/mirror/slackware/slackware-13.0" should be the root of the Slackware

+    "/mirror/slackware/slackware-13.37" should be the root of the Slackware

     tree, containing such files as ChangeLog.txt and subdirectories like

     "slackware" (or "slackware64" if you are working with the 64bit port)

     and "kernels".

@@ -402,36 +404,36 @@ The tftp directory structure:
 

     As you can see in the DHCP section, the DHCP server has been configured

 to offer any interested PXE client (i.e. your computers network card) the

-file "/slackware-13.0/pxelinux.0" - this file contains the bootable code

+file "/slackware-13.37/pxelinux.0" - this file contains the bootable code

 that first downloads and starts a Linux kernel, and then downloads and

 extracts the root filesystem containing the setup program and everything

-else that we need.  This filename "/slackware-13.0/pxelinux.0" indicates

+else that we need.  This filename "/slackware-13.37/pxelinux.0" indicates

 a pathname relative to the root of the TFTP server.  The PXE client will

 use the tftp protocol to fetch this bootloader.  So this is what we do:

-create this directory "slackware-13.0" and copy the required files into it.

+create this directory "slackware-13.37" and copy the required files into it.

 First, the pxelinux bootloader itself:

 

-  mkdir /tftpboot/slackware-13.0

-  mkdir /tftpboot/slackware-13.0/pxelinux.cfg

-  cp /usr/lib/syslinux/pxelinux.0 /tftpboot/slackware-13.0/

+  mkdir /tftpboot/slackware-13.37

+  mkdir /tftpboot/slackware-13.37/pxelinux.cfg

+  cp /usr/share/syslinux/pxelinux.0 /tftpboot/slackware-13.37/

 

 Also, we need the files from the Slackware CDROM that show the 

 informative messages in the beginning.  Assuming your local copy of the 

-Slackware release can be found in "/mirror/slackware/slackware-13.0"

+Slackware release can be found in "/mirror/slackware/slackware-13.37"

 (change paths in the below commands if your location is different) :

 

-  cp /mirror/slackware/slackware-13.0/isolinux/message.txt /tftpboot/slackware-13.0/

-  cp /mirror/slackware/slackware-13.0/isolinux/f2.txt /tftpboot/slackware-13.0/

+  cp /mirror/slackware/slackware-13.37/isolinux/message.txt /tftpboot/slackware-13.37/

+  cp /mirror/slackware/slackware-13.37/isolinux/f2.txt /tftpboot/slackware-13.37/

 

 Very important: we need the initial ramdisk image (initrd.img) and the pxelinux configuration file that contains the instructions for the PXE clients:

 

-  cp /mirror/slackware/slackware-13.0/isolinux/initrd.img /tftpboot/slackware-13.0/

-  cp /mirror/slackware/slackware-13.0/usb-and-pxe-installers/pxelinux.cfg_default /tftpboot/slackware-13.0/pxelinux.cfg/default

+  cp /mirror/slackware/slackware-13.37/isolinux/initrd.img /tftpboot/slackware-13.37/

+  cp /mirror/slackware/slackware-13.37/usb-and-pxe-installers/pxelinux.cfg_default /tftpboot/slackware-13.37/pxelinux.cfg/default

 

 And lastly, we need all the kernels that the Slackware installer lets you

 choose from:

 

-  cp -a /mirror/slackware/slackware-13.0/kernels /tftpboot/slackware-13.0/

+  cp -a /mirror/slackware/slackware-13.37/kernels /tftpboot/slackware-13.37/

 

 

 Trying it out

@@ -482,7 +484,7 @@ Your IP Address (pick any unused): 192.168.0.111
 Your netmask:                      255.255.255.0

 The gateway:                       192.168.0.10

 NFS server address:                192.168.0.1

-Slackware directory on NFS server: /mirror/slackware/slackware-13.0/slackware

+Slackware directory on NFS server: /mirror/slackware/slackware-13.37/slackware

 

 Next, some values to use with a FTP server (for our example network):

 

@@ -490,7 +492,7 @@ Your IP Address (pick any unused): 192.168.0.111
 Your netmask:                      255.255.255.0

 The gateway:                       192.168.0.10

 FTP server address:                ftp://192.168.0.1

-Slackware directory on ftpserver:  /pub/mirror/slackware/slackware-13.0

+Slackware directory on ftpserver:  /pub/mirror/slackware/slackware-13.37

 

 Next, example values to use with a HTTP server (for our example network):

 

@@ -498,7 +500,7 @@ Your IP Address (pick any unused): 192.168.0.111
 Your netmask:                      255.255.255.0

 The gateway:                       192.168.0.10

 HTTP server address:               http://192.168.0.1

-Slackware directory on webserver:  /mirror/slackware/slackware-13.0

+Slackware directory on webserver:  /mirror/slackware/slackware-13.37

 

 Finally, example values to use with a Samba share (for our example network):

 

@@ -506,7 +508,7 @@ Your IP Address (pick any unused): 192.168.0.111
 Your netmask:                      255.255.255.0

 The gateway:                       192.168.0.10

 Samba share:                       //192.168.0.1/mirror

-Slackware directory on webserver:  /slackware/slackware-13.0

+Slackware directory on webserver:  /slackware/slackware-13.37

 

     Note #1 - if you chose automatic network configuration using DHCP in an

 earlier step, you can probably use actual hostnames instead of IP addresses.

@@ -517,7 +519,7 @@ IP address.
     Note #2 - in the case of the NFS server, you will have to supply the

 path to the Slackware package tree _including_ the '/slackware' subdirectory.

 For HTTP and FTP servers, it is sufficient to supply the root of the

-slackware-13.0 tree and leave the 'slackware' subdirectory out. The installer

+slackware-13.37 tree and leave the 'slackware' subdirectory out. The installer

 will figure out where the packages are.

 

     From this point onwards, the installation proceeds just as when the 

@@ -566,7 +568,7 @@ subnet 192.168.0.0 netmask 255.255.255.0 {
     range dynamic-bootp 192.168.0.50 192.168.0.100;

     use-host-decl-names on;

     if substring (option vendor-class-identifier, 0, 9) = "PXEClient" {

-      filename "/slackware-13.0/pxelinux.0";

+      filename "/slackware-13.37/pxelinux.0";

     }

 }

 

@@ -673,10 +675,10 @@ group {
   use-host-decl-names on;

 

   if substring (option vendor-class-identifier, 0, 9) = "PXEClient" {

-    filename "/slackware-13.0/pxelinux.0";

+    filename "/slackware-13.37/pxelinux.0";

   }

   else if substring (option vendor-class-identifier, 0, 9) = "Etherboot" {

-    filename "/slackware-13.0/kernels/hugesmp.s/bzImage";

+    filename "/slackware-13.37/kernels/hugesmp.s/bzImage";

   }

 

   host t43 {

@@ -771,6 +773,6 @@ exit 0
 

 ========================================================

 Author:

-  Eric Hameleers <alien@slackware.com> 22-jul-2009

+  Eric Hameleers <alien@slackware.com> 21-mar-2011

 Wiki URLs:

   http://www.slackware.com/~alien/dokuwiki/doku.php?id=slackware:pxe

diff --git a/usb-and-pxe-installers/README_USB.TXT b/usb-and-pxe-installers/README_USB.TXT
index a1f436dd..a8079fee 100644
--- a/usb-and-pxe-installers/README_USB.TXT
+++ b/usb-and-pxe-installers/README_USB.TXT
@@ -127,8 +127,28 @@ raw device, it did not create partitions at all.  Fdisk reads the information
 in the first sector and incorrectly interprets that as a messed-up device.

 

 

-Restoring a USB stick to its original state

--------------------------------------------

+Create a bootable USB stick non-destructively

+---------------------------------------------

+

+    If you do not want to sacrifice a USB thumb drive for this (note that

+dumping the image file on the USB stick will destroy all data already

+present on the stick), there is a solution: Slackware also ships with a

+script usbimg2disk.sh since the 13.0 release (actually, it is the file

+/usb-and-pxe-installers/usbimg2disk.sh ).  This script extracts the content

+from the 'usbboot.img' image file and uses this to transform a regular USB

+thumb drive into a bootable Slackware installer non-destructively (i.e. any

+existing files on the stick will not be touched).  The only requirement is,

+that there is at least 30 MB of available free space on the stick.

+

+    The usbimg2disk.sh script is also convenient if your computer refuses to

+boot from a USB stick loaded with the usbboot.img file. The BIOS of some

+computers will not understand the format of the default Slackware USB

+image. Using the usbimg2disk.sh script, you create an alternative bootable

+USB stick that will be recognized by your computers BIOS.

+

+

+Restoring a USB stick to its original state (empty VFAT partition)

+------------------------------------------------------------------

 

     When you have used the small 25 MB image to create a USB installer, 

 your USB stick is no longer useful for anything else.  Any remaining 

@@ -171,6 +191,7 @@ mkdosfs -F32 /dev/sdx1
     and create a partition interactively :-)

 

 ==========================================================

-Author:   Eric Hameleers <alien@slackware.com> 22-jul-2009

+Author:   Eric Hameleers <alien@slackware.com> 17-feb-2011

+Blog post: http://alien.slackbook.org/blog/installing-slackware-using-usb-thumb-drive/

 Wiki URL: http://www.slackware.com/~alien/dokuwiki/doku.php?id=slackware:usbboot

 

diff --git a/usb-and-pxe-installers/pxelinux.cfg_default b/usb-and-pxe-installers/pxelinux.cfg_default
index de1e34cc..4842df82 100644
--- a/usb-and-pxe-installers/pxelinux.cfg_default
+++ b/usb-and-pxe-installers/pxelinux.cfg_default
@@ -6,7 +6,9 @@ F1 message.txt
 F2 f2.txt
 label huge.s
   kernel kernels/huge.s/bzImage
-  append initrd=initrd.img load_ramdisk=1 prompt_ramdisk=0 rw SLACK_KERNEL=huge.s
+  append initrd=initrd.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 SLACK_KERNEL=huge.s
 label speakup.s
-  kernel kernels/speakup.s/bzImage
-  append initrd=initrd.img load_ramdisk=1 prompt_ramdisk=0 rw SLACK_KERNEL=speakup.s
+  kernel kernels/huge.s/bzImage
+  append initrd=initrd.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 SLACK_KERNEL=huge.s
+label memtest
+  kernel kernels/memtest/memtest
diff --git a/usb-and-pxe-installers/usbimg2disk.sh b/usb-and-pxe-installers/usbimg2disk.sh
index aed32c51..f806c5ed 100644
--- a/usb-and-pxe-installers/usbimg2disk.sh
+++ b/usb-and-pxe-installers/usbimg2disk.sh
@@ -1,7 +1,7 @@
-#!/bin/sh
-# $Id: usbimg2disk.sh,v 1.9 2010/04/24 18:21:53 eha Exp eha $
+#!/bin/bash
+# $Id: usbimg2disk.sh,v 1.20 2011/04/16 19:11:27 eha Exp eha $
 #
-# Copyright 2009, 2010  Eric Hameleers, Eindhoven, NL
+# Copyright 2009, 2010, 2011  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,15 +24,19 @@
 # Paranoid as usual:
 set -e
 
+# Define some variables ahead of time, so that cleanup knows about them:
+MNTDIR1=""
+MNTDIR2=""
+MNTDIR3=""
+
 # Clean up in case of failure:
 cleanup() {
   # Clean up by unmounting our loopmounts, deleting tempfiles:
   echo "--- Cleaning up the staging area..."
   sync
-  umount -f ${MNTDIR1} 2>/dev/null || true
-  umount -f ${MNTDIR2} 2>/dev/null || true
-  rm -rf ${MNTDIR3}
-  rmdir $MNTDIR1 $MNTDIR2
+  [ ! -z "${MNTDIR1}" ] && ( umount -f ${MNTDIR1} ; rmdir $MNTDIR1 )
+  [ ! -z "${MNTDIR2}" ] && ( umount -f ${MNTDIR2} ; rmdir $MNTDIR2 )
+  [ ! -z "${MNTDIR3}" ] && rm -rf ${MNTDIR3} || true
 }
 trap "echo \"*** $0 FAILED at line $LINENO ***\"; cleanup; exit 1" ERR INT TERM
 
@@ -60,7 +64,7 @@ showhelp() {
   echo "#   -o|--outdev <filename>     The device name of your USB drive"
   echo "#   -s|--slackdir <dir>        Use 'dir' as the root of Slackware tree"
   echo "#   -u|--unattended            Do not ask any questions"
-  echo "#   -L|--label                 FAT label when formatting the USB drive"
+  echo "#   -L|--label <labelname>     FAT label when formatting the USB drive"
 
   echo "# "
   echo "# Examples:"
@@ -90,6 +94,9 @@ reformat() {
   # Wipe the MBR:
   dd if=/dev/zero of=$TOWIPE bs=512 count=1
 
+  # Temporarily accept errors (so that we can examine them):
+  set +e
+
   # create a FAT32 partition (type 'b')
   /sbin/fdisk $TOWIPE <<EOF
 n
@@ -102,6 +109,27 @@ b
 w
 EOF
 
+  # Check if fdisk gave an error (like "error closing file").
+  # Some desktop environments auto-mount the partition on sight...:
+  if [ $? -ne 0 ]; then
+    echo "*** The fdisk command had an error."
+    echo "*** Some desktop environments (KDE, GNOME) may automatically mount"
+    echo "*** the new FAT partition on your USB drive, causing the fdisk error."
+    if [ $UNATTENDED -eq 0 ]; then
+      # if we are running interactively, allow to chicken out now:
+      echo "*** Perhaps you want to format the device '$TOWIPE' yourself first?"
+      read -p "*** Press ENTER to continue anyway or Ctrl-C to quit now: " JUNK
+    fi
+  fi
+
+  # Fail on errors again:
+  set -e
+
+  if mount | grep -q ${TOWIPE}1 ; then
+    echo "--- Un-mounting ${TOWIPE}1 because your desktop auto-mounted it..."
+    umount -f ${TOWIPE}1
+  fi
+
   # We set the fat label to '$THELABEL' when formatting.
   # It will enable the installer to mount the fat partition automatically
   # and pre-fill the correct pathname for the "SOURCE" dialog.
@@ -115,14 +143,12 @@ makebootable() {
 
   # Sanity checks:
   if [ ! -b $USBDRV ]; then
-    echo "Not a block device: '$USBDRV' !"
+    echo "*** Not a block device: '$USBDRV' !"
     exit 1
   fi
 
-  # Set the bootable flag for the first (and only...) partition:
-  /sbin/sfdisk $USBDRV -N1 <<EOF
-,,,*
-EOF
+  # Set the bootable flag for the first partition:
+  /sbin/sfdisk -A $USBDRV 1
 }
 
 # Parse the commandline parameters:
@@ -154,7 +180,7 @@ while [ ! -z "$1" ]; do
       shift 2
       ;;
     -s|--slackdir)
-      REPOSROOT="$(cd $(dirname $2); pwd)/$(basename $2)"
+      REPODIR="$2"
       FULLINSTALLER="yes"
       shift 2
       ;;
@@ -163,11 +189,11 @@ while [ ! -z "$1" ]; do
       shift
       ;;
     -L|--label)
-      FATLABEL="$2"
+      CUSTOMLABEL="$2"
       shift 2
       ;;
     *)
-      echo "Unknown parameter '$1'!"
+      echo "*** Unknown parameter '$1'!"
       exit 1
       ;;
   esac
@@ -176,18 +202,32 @@ 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)."
+  echo "*** You need to be root to run $(basename $0)."
   exit 1
 fi
 
+# Check existence of the package repository if that was passed as a parameter:
+if [ -n "$REPODIR" ]; then
+  if [ ! -d "$REPODIR" ]; then
+    echo "*** This is not a directory: '$REPODIR' !"
+    exit 1
+  else
+    # This also takes care of stripping a trailing '/', which is required
+    # for the rsync command to work as intended:
+    REPOSROOT="$(cd $(dirname $REPODIR); pwd)/$(basename $REPODIR)"
+  fi
+fi
+
 # Check FAT label:
-if [ -n "${FATLABEL}" ]; then
-  if [ "x$(echo '${FATLABEL}'| tr -d '[:alnum:]_-.')" != "x" ]; then
-    echo "FAT label '${FATLABEL}' is not an acceptible name!"
+if [ -n "${CUSTOMLABEL}" ]; then
+  if [ "x$(echo "${CUSTOMLABEL}"| tr -d '[:alnum:]._-')" != "x" ]; then
+    echo "*** FAT label '${CUSTOMLABEL}' is not an acceptible name!"
     exit 1
-  elif [ ${#FATLABEL} gt 11 ]; then
-    echo "FAT label '${FATLABEL}' must be less than 12 characters!"
+  elif [ ${#CUSTOMLABEL} -gt 11 ]; then
+    echo "*** FAT label '${CUSTOMLABEL}' must be less than 12 characters!"
     exit 1
+  else
+  FATLABEL="${CUSTOMLABEL}"
   fi
 else
   FATLABEL="USBSLACKINS"
@@ -230,17 +270,15 @@ if [ ! -f $USBIMG ]; then
   exit 1
 fi
 
-if [ $REFORMAT -eq 0 ]; then
+if [ ! -b $TARGET ]; then
+  echo "*** Not a block device: '$TARGET' !"
+  exit 1
+elif [ $REFORMAT -eq 0 ]; then
   if ! /sbin/blkid -t TYPE=vfat $TARGETPART 1>/dev/null 2>/dev/null ; then
     echo "*** I fail to find a 'vfat' partition: '$TARGETPART' !"
     echo "*** If you want to format the USB thumb drive, add the '-f' parameter"
     exit 1
   fi
-else
-  if [ ! -b $TARGET ]; then
-    echo "*** Not a block device: '$TARGET' !"
-    exit 1
-  fi
 fi
 
 if mount | grep -q $TARGETPART ; then
@@ -267,6 +305,11 @@ if [ $UNATTENDED -eq 0 ]; then
 
   echo ""
   echo "# We are going to ${DOFRMT}use this device - '$TARGET':"
+  echo "# Vendor : $(cat /sys/block/$(basename $TARGET)/device/vendor)"
+  echo "# Model  : $(cat /sys/block/$(basename $TARGET)/device/model)"
+  echo "# Size   : $(( $(cat /sys/block/$(basename $TARGET)/size) / 2048)) MB"
+  echo "# "
+  echo "# FDISK OUTPUT:"
   /sbin/fdisk -l $TARGET | while read LINE ; do echo "# $LINE" ; done
   echo ""
 
@@ -283,12 +326,37 @@ cat /dev/null > $LOGFILE
 
 # If we need to format the USB drive, do it now:
 if [ $REFORMAT -eq 1 ]; then
-  echo "--- Formatting $TARGET and creating VFAT partition..."
+  echo "--- Formatting $TARGET with VFAT partition label '${FATLABEL}'..."
   if [ $UNATTENDED -eq 0 ]; then
     echo "--- Last chance! Press CTRL-C to abort!"
     read -p "Or press ENTER to continue: " JUNK
   fi
   ( reformat $TARGET ${FATLABEL} ) 1>>$LOGFILE 2>&1
+else
+  # We do not format the drive, but apply a FAT label if required.
+
+  # Prepare for using mlabel to change the FAT label:
+  MTOOLSRCFILE=$(mktemp -p /tmp -t mtoolsrc.XXXXXX)
+  echo "drive s: file=\"$TARGETPART\"" > $MTOOLSRCFILE
+
+  if [ -n "$CUSTOMLABEL" ]; then
+    # User gave us a FAT label to use, so we will force that upon the drive:
+    echo "--- Setting FAT partition label to '$FATLABEL'"
+    MTOOLSRC=$MTOOLSRCFILE mlabel s:${FATLABEL}
+  elif [ -n "$(/sbin/blkid -t TYPE=vfat -s LABEL -o export $TARGETPART)" ] ; then
+    # User did not care, but the USB stick has a FAT label that we will use:
+    eval $(/sbin/blkid -t TYPE=vfat -s LABEL -o export $TARGETPART)
+    FATLABEL=$LABEL
+    echo "--- Using current FAT partition label '$FATLABEL'"
+    unset LABEL
+  else
+    # No user-supplied label, nor a drive label present. We apply our default:
+    echo "--- Setting FAT partition label to '$FATLABEL'"
+    MTOOLSRC=$MTOOLSRCFILE mlabel s:${FATLABEL}
+  fi
+
+  # Cleanup:
+  rm -f $MTOOLSRCFILE
 fi
 
 # Create a temporary mount point for the image file:
@@ -298,7 +366,7 @@ if [ ! -d $MNTDIR1 ]; then
   echo "*** Failed to create a temporary mount point for the image!"
   exit 1
 else
-  chmod 700 $MNTDIR1
+  chmod 711 $MNTDIR1
 fi
 
 # Create a temporary mount point for the USB thumb drive partition:
@@ -307,7 +375,7 @@ if [ ! -d $MNTDIR2 ]; then
   echo "*** Failed to create a temporary mount point for the usb thumb drive!"
   exit 1
 else
-  chmod 700 $MNTDIR2
+  chmod 711 $MNTDIR2
 fi
 
 # Create a temporary directory to extract the initrd if needed:
@@ -316,7 +384,7 @@ if [ ! -d $MNTDIR3 ]; then
   echo "*** Failed to create a temporary directory to extract the initrd!"
   exit 1
 else
-  chmod 700 $MNTDIR3
+  chmod 711 $MNTDIR3
 fi
 
 # Mount the image file:
@@ -369,7 +437,7 @@ fi
 # Copy boot image files to the USB disk in its own subdirectory '/syslinux':
 echo "--- Copying boot files to the USB drive..."
 mkdir -p $MNTDIR2/syslinux
-cp -a $MNTDIR1/* $MNTDIR2/syslinux/
+cp -R $MNTDIR1/* $MNTDIR2/syslinux/
 rm -f $MNTDIR2/syslinux/ldlinux.sys
 
 # If we are creating a full Slackware installer, there is a lot more to do:
@@ -389,10 +457,13 @@ if [ "$FULLINSTALLER" = "yes" ]; then
     # Adapt the dialogs so that pressing [OK] will be all there is to it:
     sed -i -e 's# --menu# --default-item 6 --menu#' usr/lib/setup/SeTmedia
     sed -i -e "s# 2> \$TMP/sourcedir# /usbinstall/$(basename $REPOSROOT)/$PKGDIR 2> \$TMP/sourcedir#" usr/lib/setup/INSdir
+    FIXF=$(find usr/lib/setup -name SeTp*media)
+    sed -i -e 's# --menu# --default-item 3 --menu#' $FIXF
   ) 2>>$LOGFILE
 
   # Recreate the initrd:
   echo "--- Gzipping the initrd image again:"
+  chmod 0755 ${MNTDIR3}
   ( cd ${MNTDIR3}/
     find . |cpio -o -H newc |gzip > ${MNTDIR2}/syslinux/initrd.img
   ) 2>>$LOGFILE
@@ -400,11 +471,10 @@ if [ "$FULLINSTALLER" = "yes" ]; then
   # Copy Slackware package tree (no sources) to the USB disk -
   # we already made sure that ${REPOSROOT} does not end with a '/'
   echo "--- Copying Slackware package tree to the USB drive..."
-  rsync -rptHDL $EXCLUDES $REPOSROOT $MNTDIR2/
+  rsync -rpthDL --delete $EXCLUDES $REPOSROOT $MNTDIR2/
 fi
 
 # Unmount/remove stuff:
-sync
 cleanup
 
 # Run syslinux and write a good MBR: